Diff of the two buildlogs:

--
--- b1/build.log	2025-02-09 06:59:07.539834064 +0000
+++ b2/build.log	2025-02-09 07:28:30.703962507 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sat Feb  8 18:51:19 -12 2025
-I: pbuilder-time-stamp: 1739083879
+I: Current time: Sun Mar 15 03:22:11 +14 2026
+I: pbuilder-time-stamp: 1773494531
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/experimental-reproducible-base.tgz]
 I: copying local configuration
@@ -25,52 +25,84 @@
 dpkg-source: info: applying 0002-t-Makefile-make-check-meson-work-with-Dash.diff
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/1420282/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/3986920/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink03-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Mar 14 13:22 /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/3986920/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/3986920/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 '
-  DISTRIBUTION='experimental'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=experimental
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='f08744ea474849a9baff4cb64801271d'
-  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='1420282'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=e4231fdf28fb4a0b8d99c67fc3eb89fa
+  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=3986920
   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.oWuYmXFC/pbuilderrc_Xi6U --distribution experimental --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/experimental-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.oWuYmXFC/b1 --logfile b1/build.log git_2.48.0~rc1+next.20250101-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.oWuYmXFC/pbuilderrc_17Ey --distribution experimental --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/experimental-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.oWuYmXFC/b2 --logfile b2/build.log git_2.48.0~rc1+next.20250101-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 codethink04-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 14:40 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/1420282/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Nov 22  2024 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/3986920/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -312,7 +344,7 @@
 Get: 154 http://deb.debian.org/debian unstable/main arm64 tcl arm64 8.6.14 [4032 B]
 Get: 155 http://deb.debian.org/debian unstable/main arm64 unzip arm64 6.0-28+b1 [158 kB]
 Get: 156 http://deb.debian.org/debian unstable/main arm64 xmlto arm64 0.0.28-3.1 [26.9 kB]
-Fetched 60.3 MB in 0s (123 MB/s)
+Fetched 60.3 MB in 1s (89.6 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 ... 19920 files and directories currently installed.)
@@ -825,8 +857,8 @@
 Setting up tzdata (2025a-2) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Sun Feb  9 06:51:48 UTC 2025.
-Universal Time is now:  Sun Feb  9 06:51:48 UTC 2025.
+Local time is now:      Sat Mar 14 13:23:13 UTC 2026.
+Universal Time is now:  Sat Mar 14 13:23:13 UTC 2026.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17029-2) ...
@@ -973,7 +1005,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.48.0~rc1+next.20250101/ && 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.48.0~rc1+next.20250101-1_source.changes
+I: user script /srv/workspace/pbuilder/3986920/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for experimental
+I: user script /srv/workspace/pbuilder/3986920/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/git-2.48.0~rc1+next.20250101/ && 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.48.0~rc1+next.20250101-1_source.changes
 dpkg-buildpackage: info: source package git
 dpkg-buildpackage: info: source version 1:2.48.0~rc1+next.20250101-1
 dpkg-buildpackage: info: source distribution experimental
@@ -1001,7 +1037,8 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
 /usr/bin/make clean NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man htmldir=/usr/share/doc/git/html INSTALLDIRS=vendor SANE_TOOL_PATH= INSTALL=install TAR=tar NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 NO_PERL_CPAN_FALLBACKS=1 PYTHON_PATH=/usr/bin/python3 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-z,relro' HOST_CPU='aarch64' V=1 USE_LIBPCRE2=1
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f gitweb/gitweb.cgi gitweb/static/gitweb.js gitweb/static/gitweb.min.js gitweb/static/gitweb.min.css gitweb/GITWEB-BUILD-OPTIONS
+rm -f /build/reproducible-path/git-2.48.0~rc1+next.20250101/./*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/builtin/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/linux/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/simple-ipc/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/ewah/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/negotiator/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/oss-fuzz/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/refs/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/reftable/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha1dc/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha256/block/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/helper/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/clar/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/trace2/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/xdiff/*.gcda
+rm -f /build/reproducible-path/git-2.48.0~rc1+next.20250101/./*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/builtin/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/linux/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/simple-ipc/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/ewah/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/negotiator/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/oss-fuzz/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/refs/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/reftable/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha1dc/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha256/block/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/helper/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/clar/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/trace2/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/xdiff/*.gcno
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f GIT-SPATCH-DEFINES
@@ -1009,10 +1046,6 @@
 rm -f contrib/coccinelle/*.cocci.patch
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f /build/reproducible-path/git-2.48.0~rc1+next.20250101/./*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/builtin/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/linux/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/simple-ipc/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/ewah/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/negotiator/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/oss-fuzz/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/refs/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/reftable/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha1dc/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha256/block/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/helper/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/clar/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/trace2/*.gcda /build/reproducible-path/git-2.48.0~rc1+next.20250101/xdiff/*.gcda
-rm -f /build/reproducible-path/git-2.48.0~rc1+next.20250101/./*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/builtin/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/linux/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/compat/simple-ipc/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/ewah/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/negotiator/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/oss-fuzz/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/refs/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/reftable/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha1dc/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/sha256/block/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/helper/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/unit-tests/clar/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/trace2/*.gcno /build/reproducible-path/git-2.48.0~rc1+next.20250101/xdiff/*.gcno
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f ./*.gcov builtin/*.gcov compat/*.gcov compat/linux/*.gcov compat/simple-ipc/*.gcov ewah/*.gcov negotiator/*.gcov oss-fuzz/*.gcov refs/*.gcov reftable/*.gcov sha1dc/*.gcov sha256/block/*.gcov t/helper/*.gcov t/unit-tests/*.gcov t/unit-tests/clar/*.gcov trace2/*.gcov xdiff/*.gcov
 rm -f ./*.gcda builtin/*.gcda compat/*.gcda compat/linux/*.gcda compat/simple-ipc/*.gcda ewah/*.gcda negotiator/*.gcda oss-fuzz/*.gcda refs/*.gcda reftable/*.gcda sha1dc/*.gcda sha256/block/*.gcda t/helper/*.gcda t/unit-tests/*.gcda t/unit-tests/clar/*.gcda trace2/*.gcda xdiff/*.gcda
 rm -f coverage-untested-functions
@@ -1021,6 +1054,9 @@
 rm -f coverage-test.made
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -1131,1258 +1167,1247 @@
     * new prefix flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh ./generate-cmdlist.sh \
-	 \
-	. command-list.h
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ident.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ls-refs.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-blobs.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o negotiator/skipping.o -c -MF negotiator/.depend/skipping.o.d -MQ negotiator/skipping.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/skipping.c
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-cache.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailinfo.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-objects.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DPAGER_ENV='"LESS=FRX LV=-c"' pager.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-no-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  preload-index.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  environment.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pkt-line.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pathspec.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  git-zlib.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+/bin/sh ./generate-cmdlist.sh \
+	 \
+	. command-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o reflog.o -c -MF ./.depend/reflog.o.d -MQ reflog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reflog.c
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/debug.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  replace-object.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/iterator.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o refs/ref-cache.o -c -MF refs/.depend/ref-cache.o.d -MQ refs/ref-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/ref-cache.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/packed-backend.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  send-pack.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/reftable-backend.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sparse-index.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  streaming.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strvec.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o shallow.o -c -MF ./.depend/shallow.o.d -MQ shallow.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shallow.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 negotiator/skipping.o -c -MF negotiator/.depend/skipping.o.d -MQ negotiator/skipping.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/skipping.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_ctr.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule-config.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sid.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tbuf.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_perf.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  url.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  varint.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  urlmatch.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  utf8.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  write-or-die.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff-interface.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-stream-server.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 reflog.o -c -MF ./.depend/reflog.o.d -MQ reflog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reflog.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-unix-socket.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/iterator.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 refs/ref-cache.o -c -MF refs/.depend/ref-cache.o.d -MQ refs/ref-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/ref-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repository.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha256/block/sha256.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/error.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xdiffi.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/iter.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o reftable/system.o -c -MF reftable/.depend/system.o.d -MQ reftable/system.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/system.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/tree.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-fetch.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 shallow.o -c -MF ./.depend/shallow.o.d -MQ shallow.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shallow.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/record.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strvec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-    * new script parameters
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-    * new perl-specific parameters
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-backend.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
-chmod +x git-instaweb+ && \
-mv git-instaweb+ git-instaweb
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh ./generate-hooklist.sh . hook-list.h
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/add.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-push.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bisect.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o remote-curl.o -c -MF ./.depend/remote-curl.o.d -MQ remote-curl.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote-curl.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout--worker.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/cat-file.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/column.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout-index.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-graph.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diagnose.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  utf8.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wrapper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh ./generate-configlist.sh . config-list.h
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xemit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hash-object.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/interpret-trailers.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-remote.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mailsplit.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/blocksource.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-index.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-file.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-recursive.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 reftable/system.o -c -MF reftable/.depend/system.o.d -MQ reftable/system.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/system.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/multi-pack-index.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+    * new script parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/patch-id.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+    * new perl-specific parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-redundant.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/apply.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+/bin/sh ./generate-hooklist.sh . hook-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/push.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-ext.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reflog.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/notes.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-push.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 remote-curl.o -c -MF ./.depend/remote-curl.o.d -MQ remote-curl.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote-curl.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/repack.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-objects.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-pack.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool--lib+ git-mergetool--lib
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-i18n+ git-sh-i18n
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-setup+ git-sh-setup
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/write-tree.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+/bin/sh ./generate-configlist.sh . config-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-main.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/get-tar-commit-id.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  abspath.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alloc.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  scalar.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/interpret-trailers.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-objects.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/worktree.c
+gcc -o builtin/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-patch.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connected.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ctype.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  decorate.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diagnose.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/revert.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-no-index.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  editor.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  environment.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_bitmap.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
+mv git-mergetool--lib+ git-mergetool--lib
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
+mv git-sh-i18n+ git-sh-i18n
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
+mv git-sh-setup+ git-sh-setup
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="git/2.48.0.rc1.219.gb6b6757d772" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.48.0~rc1+next.20250101"/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.48.0~rc1+next.20250101"" "version-def.h.in" "version-def.h"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f reftable/libreftable.a && ar rcs reftable/libreftable.a reftable/basics.o reftable/error.o reftable/block.o reftable/blocksource.o reftable/iter.o reftable/merged.o reftable/pq.o reftable/reader.o reftable/record.o reftable/stack.o reftable/system.o reftable/tree.o reftable/writer.o
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="git/2.48.0.rc1.219.gb6b6757d772" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.48.0~rc1+next.20250101"/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.48.0~rc1+next.20250101"" "version-def.h.in" "version-def.h"
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-difftool--helper.sh" "git-difftool--helper+" ./GIT-BUILD-OPTIONS && \
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -2391,22 +2416,22 @@
 mv git-filter-branch+ git-filter-branch
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-merge-octopus.sh" "git-merge-octopus+" ./GIT-BUILD-OPTIONS && \
 mv git-merge-octopus+ git-merge-octopus
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-merge-one-file.sh" "git-merge-one-file+" ./GIT-BUILD-OPTIONS && \
-mv git-merge-one-file+ git-merge-one-file
+./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
+mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+./generate-script.sh "git-merge-one-file.sh" "git-merge-one-file+" ./GIT-BUILD-OPTIONS && \
+mv git-merge-one-file+ git-merge-one-file
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
-mv git-merge-resolve+ git-merge-resolve
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
@@ -2421,8 +2446,8 @@
 mv git-request-pull+ git-request-pull
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-web--browse.sh" "git-web--browse+" ./GIT-BUILD-OPTIONS && \
-mv git-web--browse+ git-web--browse
+./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
+mv git-submodule+ git-submodule
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 \
@@ -2438,8 +2463,19 @@
 mv GIT-PERL-HEADER+ GIT-PERL-HEADER
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
-mv git-submodule+ git-submodule
+./generate-script.sh "git-web--browse.sh" "git-web--browse+" ./GIT-BUILD-OPTIONS && \
+mv git-web--browse+ git-web--browse
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
+chmod +x git-instaweb+ && \
+mv git-instaweb+ git-instaweb
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
@@ -2450,69 +2486,70 @@
 mv git-cvsexportcommit+ git-cvsexportcommit
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsimport.perl" "git-cvsimport+" && \
-mv git-cvsimport+ git-cvsimport
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  version.c
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsimport.perl" "git-cvsimport+" && \
+mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
 mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-svn.perl" "git-svn+" && \
-mv git-svn+ git-svn
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
 mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-svn.perl" "git-svn+" && \
+mv git-svn+ git-svn
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bugreport.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  version.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' builtin/help.c
+gcc -o builtin/bugreport.o -c -MF builtin/.depend/bugreport.o.d -MQ builtin/bugreport.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff.c
+gcc -o 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 \
@@ -2523,36 +2560,35 @@
 	-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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-remote-https && \
 ln git-remote-http git-remote-https 2>/dev/null || \
 ln -s git-remote-http git-remote-https 2>/dev/null || \
 cp git-remote-http git-remote-https
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-remote-ftps && \
-ln git-remote-http git-remote-ftps 2>/dev/null || \
-ln -s git-remote-http git-remote-ftps 2>/dev/null || \
-cp git-remote-http git-remote-ftps
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-remote-ftp && \
 ln git-remote-http git-remote-ftp 2>/dev/null || \
 ln -s git-remote-http git-remote-ftp 2>/dev/null || \
 cp git-remote-http git-remote-ftp
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+rm -f git-remote-ftps && \
+ln git-remote-http git-remote-ftps 2>/dev/null || \
+ln -s git-remote-http git-remote-ftps 2>/dev/null || \
+cp git-remote-http git-remote-ftps
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git -Wl,-z,relro   \
 	git.o builtin/add.o builtin/am.o builtin/annotate.o builtin/apply.o builtin/archive.o builtin/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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-add && \
 ln git git-add 2>/dev/null || \
 ln -s git git-add 2>/dev/null || \
@@ -2577,18 +2613,18 @@
 cp git git-apply
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-blame && \
 ln git git-blame 2>/dev/null || \
 ln -s git git-blame 2>/dev/null || \
@@ -2661,18 +2697,18 @@
 cp git git-checkout
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-clean && \
 ln git git-clean 2>/dev/null || \
 ln -s git git-clean 2>/dev/null || \
 cp git git-clean
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-column && \
 ln git git-column 2>/dev/null || \
 ln -s git git-column 2>/dev/null || \
@@ -2703,18 +2739,18 @@
 cp git git-config
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-credential-cache--daemon && \
-ln git git-credential-cache--daemon 2>/dev/null || \
-ln -s git git-credential-cache--daemon 2>/dev/null || \
-cp git git-credential-cache--daemon
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-count-objects && \
 ln git git-count-objects 2>/dev/null || \
 ln -s git git-count-objects 2>/dev/null || \
 cp git git-count-objects
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-credential-cache--daemon && \
+ln git git-credential-cache--daemon 2>/dev/null || \
+ln -s git git-credential-cache--daemon 2>/dev/null || \
+cp git git-credential-cache--daemon
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-credential-cache && \
 ln git git-credential-cache 2>/dev/null || \
 ln -s git git-credential-cache 2>/dev/null || \
@@ -2769,18 +2805,18 @@
 cp git git-diff
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-fast-export && \
-ln git git-fast-export 2>/dev/null || \
-ln -s git git-fast-export 2>/dev/null || \
-cp git git-fast-export
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-difftool && \
 ln git git-difftool 2>/dev/null || \
 ln -s git git-difftool 2>/dev/null || \
 cp git git-difftool
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-fast-export && \
+ln git git-fast-export 2>/dev/null || \
+ln -s git git-fast-export 2>/dev/null || \
+cp git git-fast-export
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-fast-import && \
 ln git git-fast-import 2>/dev/null || \
 ln -s git git-fast-import 2>/dev/null || \
@@ -3015,28 +3051,28 @@
 cp git git-pack-refs
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-prune-packed && \
-ln git git-prune-packed 2>/dev/null || \
-ln -s git git-prune-packed 2>/dev/null || \
-cp git git-prune-packed
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-patch-id && \
 ln git git-patch-id 2>/dev/null || \
 ln -s git git-patch-id 2>/dev/null || \
 cp git git-patch-id
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-prune-packed && \
+ln git git-prune-packed 2>/dev/null || \
+ln -s git git-prune-packed 2>/dev/null || \
+cp git git-prune-packed
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-prune && \
 ln git git-prune 2>/dev/null || \
 ln -s git git-prune 2>/dev/null || \
 cp git git-prune
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-range-diff && \
-ln git git-range-diff 2>/dev/null || \
-ln -s git git-range-diff 2>/dev/null || \
-cp git git-range-diff
+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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-push && \
@@ -3045,16 +3081,10 @@
 cp git git-push
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-rebase && \
-ln git git-rebase 2>/dev/null || \
-ln -s git git-rebase 2>/dev/null || \
-cp git git-rebase
+rm -f git-range-diff && \
+ln git git-range-diff 2>/dev/null || \
+ln -s git git-range-diff 2>/dev/null || \
+cp git git-range-diff
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-read-tree && \
@@ -3063,10 +3093,10 @@
 cp git git-read-tree
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-reflog && \
-ln git git-reflog 2>/dev/null || \
-ln -s git git-reflog 2>/dev/null || \
-cp git git-reflog
+rm -f git-rebase && \
+ln git git-rebase 2>/dev/null || \
+ln -s git git-rebase 2>/dev/null || \
+cp git git-rebase
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-receive-pack && \
@@ -3075,12 +3105,6 @@
 cp git git-receive-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-refs && \
-ln git git-refs 2>/dev/null || \
-ln -s git git-refs 2>/dev/null || \
-cp git git-refs
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-remote-ext && \
 ln git git-remote-ext 2>/dev/null || \
 ln -s git git-remote-ext 2>/dev/null || \
@@ -3093,6 +3117,18 @@
 cp git git-remote-fd
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-reflog && \
+ln git git-reflog 2>/dev/null || \
+ln -s git git-reflog 2>/dev/null || \
+cp git git-reflog
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-refs && \
+ln git git-refs 2>/dev/null || \
+ln -s git git-refs 2>/dev/null || \
+cp git git-refs
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-remote && \
 ln git git-remote 2>/dev/null || \
 ln -s git git-remote 2>/dev/null || \
@@ -3111,18 +3147,18 @@
 cp git git-replace
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-replay && \
-ln git git-replay 2>/dev/null || \
-ln -s git git-replay 2>/dev/null || \
-cp git git-replay
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-replay && \
+ln git git-replay 2>/dev/null || \
+ln -s git git-replay 2>/dev/null || \
+cp git git-replay
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-reset && \
 ln git git-reset 2>/dev/null || \
 ln -s git git-reset 2>/dev/null || \
@@ -3147,36 +3183,36 @@
 cp git git-rm
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-send-pack && \
-ln git git-send-pack 2>/dev/null || \
-ln -s git git-send-pack 2>/dev/null || \
-cp git git-send-pack
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-revert && \
 ln git git-revert 2>/dev/null || \
 ln -s git git-revert 2>/dev/null || \
 cp git git-revert
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-send-pack && \
+ln git git-send-pack 2>/dev/null || \
+ln -s git git-send-pack 2>/dev/null || \
+cp git git-send-pack
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-shortlog && \
 ln git git-shortlog 2>/dev/null || \
 ln -s git git-shortlog 2>/dev/null || \
 cp git git-shortlog
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-show-index && \
-ln git git-show-index 2>/dev/null || \
-ln -s git git-show-index 2>/dev/null || \
-cp git git-show-index
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-show-branch && \
 ln git git-show-branch 2>/dev/null || \
 ln -s git git-show-branch 2>/dev/null || \
 cp git git-show-branch
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-show-index && \
+ln git git-show-index 2>/dev/null || \
+ln -s git git-show-index 2>/dev/null || \
+cp git git-show-index
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-show-ref && \
 ln git git-show-ref 2>/dev/null || \
 ln -s git git-show-ref 2>/dev/null || \
@@ -3201,22 +3237,16 @@
 cp git git-stripspace
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-symbolic-ref && \
-ln git git-symbolic-ref 2>/dev/null || \
-ln -s git git-symbolic-ref 2>/dev/null || \
-cp git git-symbolic-ref
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-submodule--helper && \
 ln git git-submodule--helper 2>/dev/null || \
 ln -s git git-submodule--helper 2>/dev/null || \
 cp git git-submodule--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-unpack-file && \
-ln git git-unpack-file 2>/dev/null || \
-ln -s git git-unpack-file 2>/dev/null || \
-cp git git-unpack-file
+rm -f git-symbolic-ref && \
+ln git git-symbolic-ref 2>/dev/null || \
+ln -s git git-symbolic-ref 2>/dev/null || \
+cp git git-symbolic-ref
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-tag && \
@@ -3225,6 +3255,12 @@
 cp git git-tag
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-unpack-file && \
+ln git git-unpack-file 2>/dev/null || \
+ln -s git git-unpack-file 2>/dev/null || \
+cp git git-unpack-file
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-unpack-objects && \
 ln git git-unpack-objects 2>/dev/null || \
 ln -s git git-unpack-objects 2>/dev/null || \
@@ -3261,12 +3297,6 @@
 cp git git-upload-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-verify-pack && \
-ln git git-verify-pack 2>/dev/null || \
-ln -s git git-verify-pack 2>/dev/null || \
-cp git git-verify-pack
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-var && \
 ln git git-var 2>/dev/null || \
 ln -s git git-var 2>/dev/null || \
@@ -3279,6 +3309,12 @@
 cp git git-verify-commit
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-verify-pack && \
+ln git git-verify-pack 2>/dev/null || \
+ln -s git git-verify-pack 2>/dev/null || \
+cp git git-verify-pack
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-verify-tag && \
 ln git git-verify-tag 2>/dev/null || \
 ln -s git git-verify-tag 2>/dev/null || \
@@ -3309,18 +3345,18 @@
 cp git git-cherry-pick
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-fsck-objects && \
-ln git git-fsck-objects 2>/dev/null || \
-ln -s git git-fsck-objects 2>/dev/null || \
-cp git git-fsck-objects
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-fsck-objects && \
+ln git git-fsck-objects 2>/dev/null || \
+ln -s git git-fsck-objects 2>/dev/null || \
+cp git git-fsck-objects
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-init && \
 ln git git-init 2>/dev/null || \
 ln -s git git-init 2>/dev/null || \
@@ -3333,36 +3369,36 @@
 cp git git-maintenance
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-restore && \
-ln git git-restore 2>/dev/null || \
-ln -s git git-restore 2>/dev/null || \
-cp git git-restore
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-merge-subtree && \
 ln git git-merge-subtree 2>/dev/null || \
 ln -s git git-merge-subtree 2>/dev/null || \
 cp git git-merge-subtree
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-restore && \
+ln git git-restore 2>/dev/null || \
+ln -s git git-restore 2>/dev/null || \
+cp git git-restore
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-show && \
 ln git git-show 2>/dev/null || \
 ln -s git git-show 2>/dev/null || \
 cp git git-show
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-rm -f git-status && \
-ln git git-status 2>/dev/null || \
-ln -s git git-status 2>/dev/null || \
-cp git git-status
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-stage && \
 ln git git-stage 2>/dev/null || \
 ln -s git git-stage 2>/dev/null || \
 cp git git-stage
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+rm -f git-status && \
+ln git git-status 2>/dev/null || \
+ln -s git git-status 2>/dev/null || \
+cp git git-status
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 rm -f git-switch && \
 ln git git-switch 2>/dev/null || \
 ln -s git git-switch 2>/dev/null || \
@@ -3388,6 +3424,10 @@
     * new locations or Tcl/Tk interpreter
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+msgfmt --statistics --tcl -l bg -d po/ po/bg.po 
+565 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 msgfmt --statistics --tcl -l de -d po/ po/de.po 
 579 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
@@ -3404,10 +3444,6 @@
 514 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-msgfmt --statistics --tcl -l bg -d po/ po/bg.po 
-565 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 msgfmt --statistics --tcl -l it -d po/ po/it.po 
 519 translated messages, 1 untranslated message.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
@@ -3428,6 +3464,22 @@
 550 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
+579 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+msgfmt --statistics --tcl -l sv -d po/ po/sv.po 
+576 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
+543 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+msgfmt --statistics --tcl -l zh_cn -d po/ po/zh_cn.po 
+366 translated messages, 7 fuzzy translations, 17 untranslated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 rm -f git-gui git-gui+ && \
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
 	-e 's|@@SHELL_PATH@@|/bin/sh|' \
@@ -3441,22 +3493,6 @@
 mv git-gui+ git-gui
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-msgfmt --statistics --tcl -l zh_cn -d po/ po/zh_cn.po 
-366 translated messages, 7 fuzzy translations, 17 untranslated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
-579 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-msgfmt --statistics --tcl -l sv -d po/ po/sv.po 
-576 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
-543 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 if echo \
   source lib/class.tcl\; \
   auto_mkindex lib about.tcl blame.tcl branch.tcl branch_checkout.tcl branch_create.tcl branch_delete.tcl branch_rename.tcl browser.tcl checkout_op.tcl choose_font.tcl choose_repository.tcl choose_rev.tcl chord.tcl class.tcl commit.tcl console.tcl database.tcl date.tcl diff.tcl encoding.tcl error.tcl index.tcl line.tcl logo.tcl merge.tcl mergetool.tcl option.tcl remote.tcl remote_add.tcl remote_branch_delete.tcl search.tcl shortcut.tcl spellcheck.tcl sshkey.tcl status_bar.tcl themed.tcl tools.tcl tools_dlg.tcl transport.tcl win32.tcl \
@@ -3495,11 +3531,6 @@
 184 translated messages, 46 fuzzy translations, 77 untranslated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
-Generating catalog po/it.msg
-msgfmt --statistics --tcl po/it.po -l it -d po/
-274 translated messages, 17 fuzzy translations, 16 untranslated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 Generating catalog po/fr.msg
 msgfmt --statistics --tcl po/fr.po -l fr -d po/
 311 translated messages.
@@ -3510,6 +3541,11 @@
 277 translated messages, 18 fuzzy translations, 12 untranslated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
+Generating catalog po/it.msg
+msgfmt --statistics --tcl po/it.po -l it -d po/
+274 translated messages, 17 fuzzy translations, 16 untranslated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 Generating catalog po/ja.msg
 msgfmt --statistics --tcl po/ja.po -l ja -d po/
 311 translated messages.
@@ -3525,10 +3561,9 @@
 311 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
-rm -f gitk-wish gitk-wish+ && \
-sed -e '1,3s|^exec .* "$0"|exec wish "$0"|' <gitk >gitk-wish+ && \
-chmod +x gitk-wish+ && \
-mv -f gitk-wish+ gitk-wish
+Generating catalog po/ru.msg
+msgfmt --statistics --tcl po/ru.po -l ru -d po/
+317 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 Generating catalog po/sv.msg
@@ -3536,11 +3571,6 @@
 323 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
-Generating catalog po/ru.msg
-msgfmt --statistics --tcl po/ru.po -l ru -d po/
-317 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 Generating catalog po/vi.msg
 msgfmt --statistics --tcl po/vi.po -l vi -d po/
 307 translated messages.
@@ -3550,6 +3580,12 @@
 msgfmt --statistics --tcl po/zh_cn.po -l zh_cn -d po/
 317 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
+rm -f gitk-wish gitk-wish+ && \
+sed -e '1,3s|^exec .* "$0"|exec wish "$0"|' <gitk >gitk-wish+ && \
+chmod +x gitk-wish+ && \
+mv -f gitk-wish+ gitk-wish
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 /usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
 : no custom templates yet
@@ -3569,22 +3605,22 @@
 date >boilerplates.made
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc -o oss-fuzz/fuzz-credential-from-url-gently.o -c -MF oss-fuzz/.depend/fuzz-credential-from-url-gently.o.d -MQ oss-fuzz/fuzz-credential-from-url-gently.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-credential-from-url-gently.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o oss-fuzz/fuzz-credential-from-url-gently.o -c -MF oss-fuzz/.depend/fuzz-credential-from-url-gently.o.d -MQ oss-fuzz/fuzz-credential-from-url-gently.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-credential-from-url-gently.c
+gcc -o oss-fuzz/fuzz-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o oss-fuzz/fuzz-url-decode-mem.o -c -MF oss-fuzz/.depend/fuzz-url-decode-mem.o.d -MQ oss-fuzz/fuzz-url-decode-mem.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-url-decode-mem.c
+gcc -o oss-fuzz/fuzz-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc -o oss-fuzz/fuzz-parse-attr-line.o -c -MF oss-fuzz/.depend/fuzz-parse-attr-line.o.d -MQ oss-fuzz/fuzz-parse-attr-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-parse-attr-line.c
@@ -3593,17 +3629,12 @@
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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-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 
+gcc -o oss-fuzz/fuzz-url-decode-mem.o -c -MF oss-fuzz/.depend/fuzz-url-decode-mem.o.d -MQ oss-fuzz/fuzz-url-decode-mem.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-url-decode-mem.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-credential-from-url-gently -Wl,-z,relro   \
@@ -3616,9 +3647,9 @@
 	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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-url-decode-mem -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-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-url-decode-mem.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-parse-attr-line -Wl,-z,relro   \
@@ -3626,9 +3657,14 @@
 	oss-fuzz/fuzz-parse-attr-line.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-url-decode-mem -Wl,-z,relro   \
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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-url-decode-mem.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+	oss-fuzz/fuzz-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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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-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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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   \
@@ -3636,25 +3672,25 @@
 	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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
+msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
+msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
+msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
+msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
+msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
+msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
+msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 msgfmt --check -o po/build/locale/id/LC_MESSAGES/git.mo po/id.po
@@ -3675,19 +3711,19 @@
 msgfmt --check -o po/build/locale/ru/LC_MESSAGES/git.mo po/ru.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/tr/LC_MESSAGES/git.mo po/tr.po
+msgfmt --check -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
+msgfmt --check -o po/build/locale/tr/LC_MESSAGES/git.mo po/tr.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/zh_CN/LC_MESSAGES/git.mo po/zh_CN.po
+msgfmt --check -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-msgfmt --check -o po/build/locale/uk/LC_MESSAGES/git.mo po/uk.po
+msgfmt --check -o po/build/locale/zh_CN/LC_MESSAGES/git.mo po/zh_CN.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 msgfmt --check -o po/build/locale/zh_TW/LC_MESSAGES/git.mo po/zh_TW.po
@@ -3723,10 +3759,10 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/GlobSpec.pm" "perl/build/lib/Git/SVN/GlobSpec.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Migration.pm" "perl/build/lib/Git/SVN/Migration.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Log.pm" "perl/build/lib/Git/SVN/Log.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Log.pm" "perl/build/lib/Git/SVN/Log.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Migration.pm" "perl/build/lib/Git/SVN/Migration.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Prompt.pm" "perl/build/lib/Git/SVN/Prompt.pm"
@@ -3744,55 +3780,52 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Memoize/YAML.pm" "perl/build/lib/Git/SVN/Memoize/YAML.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fake-ssh.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-chmtime.c
+gcc -o t/helper/test-csprng.o -c -MF t/helper/.depend/test-csprng.o.d -MQ t/helper/test-csprng.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-csprng.c
+gcc -o t/helper/test-bloom.o -c -MF t/helper/.depend/test-bloom.o.d -MQ t/helper/test-bloom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o t/helper/test-dir-iterator.o -c -MF t/helper/.depend/test-dir-iterator.o.d -MQ t/helper/test-dir-iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dir-iterator.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-dir-iterator.o -c -MF t/helper/.depend/test-dir-iterator.o.d -MQ t/helper/test-dir-iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dir-iterator.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
@@ -3801,31 +3834,34 @@
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc -o t/helper/test-genzeros.o -c -MF t/helper/.depend/test-genzeros.o.d -MQ t/helper/test-genzeros.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-genzeros.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-env-helper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o t/helper/test-genzeros.o -c -MF t/helper/.depend/test-genzeros.o.d -MQ t/helper/test-genzeros.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-genzeros.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-hash-speed.o -c -MF t/helper/.depend/test-hash-speed.o.d -MQ t/helper/test-hash-speed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash-speed.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fsmonitor-client.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o t/helper/test-hash-speed.o -c -MF t/helper/.depend/test-hash-speed.o.d -MQ t/helper/test-hash-speed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash-speed.c
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
@@ -3837,112 +3873,112 @@
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o t/helper/test-pkt-line.o -c -MF t/helper/.depend/test-pkt-line.o.d -MQ t/helper/test-pkt-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pkt-line.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o t/helper/test-json-writer.o -c -MF t/helper/.depend/test-json-writer.o.d -MQ t/helper/test-json-writer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-json-writer.c
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-progress.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-pkt-line.o -c -MF t/helper/.depend/test-pkt-line.o.d -MQ t/helper/test-pkt-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pkt-line.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reach.c
+gcc -o t/helper/test-json-writer.o -c -MF t/helper/.depend/test-json-writer.o.d -MQ t/helper/test-json-writer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-json-writer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mergesort.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-midx.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-regex.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-revision-walking.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-scrap-cache-tree.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha256.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-wildmatch.c
+gcc -o t/helper/test-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-truncate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3955,9 +3991,18 @@
 chmod +x bin-wrappers/git
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101/po/build/locale|' \
@@ -3968,6 +4013,15 @@
 chmod +x bin-wrappers/scalar
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101/po/build/locale|' \
@@ -3978,10 +4032,7 @@
 chmod +x bin-wrappers/git-receive-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3994,9 +4045,6 @@
 chmod +x bin-wrappers/git-shell
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101/po/build/locale|' \
@@ -4007,9 +4055,6 @@
 chmod +x bin-wrappers/git-upload-archive
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101/po/build/locale|' \
@@ -4030,6 +4075,9 @@
 chmod +x bin-wrappers/git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101/po/build/locale|' \
@@ -4040,9 +4088,6 @@
 chmod +x bin-wrappers/test-fake-ssh
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.48.0~rc1+next.20250101/po/build/locale|' \
@@ -4053,67 +4098,55 @@
 chmod +x bin-wrappers/test-tool
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/lib-reftable.c
+gcc -o t/unit-tests/t-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
     * new test suites
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-trailer.c
+gcc -o t/unit-tests/t-reftable-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-merged.c
+gcc -o t/unit-tests/t-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
@@ -4122,57 +4155,56 @@
 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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 -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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-fake-ssh -Wl,-z,relro   t/helper/test-fake-ssh.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/t-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
@@ -4181,37 +4213,41 @@
 	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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh t/unit-tests/generate-clar-decls.sh "t/unit-tests/clar-decls.h" t/unit-tests/u-ctype.c t/unit-tests/u-strvec.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-readwrite -Wl,-z,relro   \
+	t/unit-tests/t-reftable-readwrite.o t/unit-tests/test-lib.o t/unit-tests/lib-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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh t/unit-tests/generate-clar-suites.sh t/unit-tests/clar-decls.h t/unit-tests/clar.suite
+/bin/sh t/unit-tests/generate-clar-decls.sh "t/unit-tests/clar-decls.h" t/unit-tests/u-ctype.c t/unit-tests/u-strvec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+/bin/sh t/unit-tests/generate-clar-suites.sh t/unit-tests/clar-decls.h t/unit-tests/clar.suite
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-readwrite -Wl,-z,relro   \
-	t/unit-tests/t-reftable-readwrite.o t/unit-tests/test-lib.o t/unit-tests/lib-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 -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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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   \
@@ -4222,24 +4258,24 @@
 	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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/unit-test.c
+gcc -o t/unit-tests/u-ctype.o -c -MF t/unit-tests/.depend/u-ctype.o.d -MQ t/unit-tests/u-ctype.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-ctype.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o t/unit-tests/u-ctype.o -c -MF t/unit-tests/.depend/u-ctype.o.d -MQ t/unit-tests/u-ctype.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-ctype.c
+gcc -o t/unit-tests/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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 -o t/unit-tests/u-strvec.o -c -MF t/unit-tests/.depend/u-strvec.o.d -MQ t/unit-tests/u-strvec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-strvec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-gcc -o t/unit-tests/u-strvec.o -c -MF t/unit-tests/.depend/u-strvec.o.d -MQ t/unit-tests/u-strvec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-strvec.c
+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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-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.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/unit-tests -Wl,-z,relro   t/unit-tests/u-ctype.o t/unit-tests/u-strvec.o t/unit-tests/clar/clar.o t/unit-tests/unit-test.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
@@ -4277,10 +4313,10 @@
 date >cmd-list.made
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-/bin/sh ./generate-mergetool-list.sh .. diff mergetools-diff.txt
+/bin/sh ./generate-mergetool-list.sh .. merge mergetools-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-/bin/sh ./generate-mergetool-list.sh .. merge mergetools-merge.txt
+/bin/sh ./generate-mergetool-list.sh .. diff mergetools-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 /usr/bin/perl ./build-docdep.perl "/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation" >doc.dep 
@@ -4289,10 +4325,10 @@
     * new asciidoc flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-rm -f docinfo.html && cat docinfo-html.in >docinfo.html
+cp SubmittingPatches SubmittingPatches.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-cp SubmittingPatches SubmittingPatches.txt
+rm -f docinfo.html && cat docinfo-html.in >docinfo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation/.."/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation/.."" "asciidoc.conf.in" "asciidoc.conf"
@@ -4301,97 +4337,97 @@
 cd technical && '/bin/sh' ./api-index.sh
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archive.xml git-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.txt
@@ -4400,7 +4436,10 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential.xml git-credential.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.txt
@@ -4409,358 +4448,346 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-daemon.xml git-daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-difftool.xml git-difftool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-push.xml git-http-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mv.xml git-mv.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mv.xml git-mv.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-p4.xml git-p4.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reflog.xml git-reflog.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-refs.xml git-refs.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-p4.xml git-p4.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-refs.xml git-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reflog.xml git-reflog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rerere.xml git-rerere.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-restore.xml git-restore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shell.xml git-shell.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-index.xml git-show-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-index.xml git-show-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-status.xml git-status.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.txt
@@ -4769,31 +4796,34 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-version.xml git-version.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-write-tree.xml git-write-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitk.xml gitk.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-write-tree.xml git-write-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitk.xml gitk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.txt
@@ -4802,154 +4832,151 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-index.xml gitformat-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitattributes.xml gitattributes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmodules.xml gitmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitattributes.xml gitattributes.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git.xml git.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitfaq.xml gitfaq.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o giteveryday.xml giteveryday.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitpacking.xml gitpacking.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitfaq.xml gitfaq.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-add.html git-add.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archimport.html git-archimport.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-annotate.html git-annotate.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-apply.html git-apply.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-annotate.html git-annotate.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-apply.html git-apply.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-add.html git-add.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-am.html git-am.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archive.html git-archive.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archimport.html git-archimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-attr.html git-check-attr.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-blame.html git-blame.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archive.html git-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bisect.html git-bisect.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bundle.html git-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-branch.html git-branch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-mailmap.html git-check-mailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-mailmap.html git-check-mailmap.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-blame.html git-blame.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-attr.html git-check-attr.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-am.html git-am.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clean.html git-clean.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-citool.html git-citool.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d manpage -o git.xml git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-branch.html git-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cherry-pick.html git-cherry-pick.txt
@@ -4961,136 +4988,139 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cherry.html git-cherry.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-column.html git-column.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-citool.html git-citool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clone.html git-clone.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clean.html git-clean.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-column.html git-column.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout.html git-checkout.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bisect.html git-bisect.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-graph.html git-commit-graph.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-cache--daemon.html git-credential-cache--daemon.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-graph.html git-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-cache.html git-credential-cache.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-cache--daemon.html git-credential-cache--daemon.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout.html git-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-store.html git-credential-store.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential.html git-credential.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsimport.html git-cvsimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsserver.html git-cvsserver.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clone.html git-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-daemon.html git-daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsimport.html git-cvsimport.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential.html git-credential.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-describe.html git-describe.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit.html git-commit.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-describe.html git-describe.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch-pack.html git-fetch-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-difftool.html git-difftool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit.html git-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-difftool.html git-difftool.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsserver.html git-cvsserver.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-for-each-repo.html git-for-each-repo.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fmt-merge-msg.html git-fmt-merge-msg.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-filter-branch.html git-filter-branch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch-pack.html git-fetch-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck-objects.html git-fsck-objects.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-filter-branch.html git-filter-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-for-each-ref.html git-for-each-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsmonitor--daemon.html git-fsmonitor--daemon.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-for-each-repo.html git-for-each-repo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-import.html git-fast-import.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsmonitor--daemon.html git-fsmonitor--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-index.html git-diff-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck-objects.html git-fsck-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch.html git-fetch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-files.html git-diff-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff.html git-diff.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-get-tar-commit-id.html git-get-tar-commit-id.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gc.html git-gc.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-files.html git-diff-files.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch.html git-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck.html git-fsck.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-index.html git-diff-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hash-object.html git-hash-object.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-grep.html git-grep.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gc.html git-gc.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck.html git-fsck.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gui.html git-gui.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hook.html git-hook.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hash-object.html git-hash-object.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-tree.html git-diff-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-import.html git-fast-import.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-help.html git-help.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-format-patch.html git-format-patch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-imap-send.html git-imap-send.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-grep.html git-grep.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-tree.html git-diff-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff.html git-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-format-patch.html git-format-patch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hook.html git-hook.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-imap-send.html git-imap-send.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-push.html git-http-push.txt
@@ -5099,16 +5129,22 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-index-pack.html git-index-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-help.html git-help.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init-db.html git-init-db.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-instaweb.html git-instaweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-remote.html git-ls-remote.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init.html git-init.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init.html git-init.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-tree.html git-ls-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.txt
@@ -5117,46 +5153,46 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailinfo.html git-mailinfo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-tree.html git-ls-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-index.html git-merge-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-one-file.html git-merge-one-file.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-interpret-trailers.html git-interpret-trailers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-remote.html git-ls-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-file.html git-merge-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-interpret-trailers.html git-interpret-trailers.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-base.html git-merge-base.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-one-file.html git-merge-one-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-index.html git-merge-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool--lib.html git-mergetool--lib.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool--lib.html git-mergetool--lib.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-tree.html git-merge-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktree.html git-mktree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-multi-pack-index.html git-multi-pack-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktag.html git-mktag.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mv.html git-mv.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mv.html git-mv.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktree.html git-mktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-multi-pack-index.html git-multi-pack-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktag.html git-mktag.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-name-rev.html git-name-rev.txt
@@ -5165,7 +5201,10 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool.html git-mergetool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-notes.html git-notes.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-redundant.html git-pack-redundant.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge.html git-merge.txt
@@ -5174,25 +5213,19 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-prune-packed.html git-prune-packed.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-notes.html git-notes.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-redundant.html git-pack-redundant.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-prune.html git-prune.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-quiltimport.html git-quiltimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-p4.html git-p4.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-refs.html git-refs.txt
@@ -5201,130 +5234,136 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-range-diff.html git-range-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reflog.html git-reflog.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-read-tree.html git-read-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-receive-pack.html git-receive-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-p4.html git-p4.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-read-tree.html git-read-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote-fd.html git-remote-fd.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote-ext.html git-remote-ext.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pull.html git-pull.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reflog.html git-reflog.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-receive-pack.html git-receive-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-push.html git-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote-fd.html git-remote-fd.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replace.html git-replace.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-repack.html git-repack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-request-pull.html git-request-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote.html git-remote.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-restore.html git-restore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-repack.html git-repack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rerere.html git-rerere.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replace.html git-replace.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote.html git-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rebase.html git-rebase.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-log.html git-log.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-restore.html git-restore.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reset.html git-reset.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rerere.html git-rerere.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pull.html git-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-log.html git-log.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reset.html git-reset.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-pack.html git-send-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n.html git-sh-i18n.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rm.html git-rm.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-parse.html git-rev-parse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-email.html git-send-email.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rm.html git-rm.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-revert.html git-revert.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-config.html git-config.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shell.html git-shell.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-pack.html git-send-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replay.html git-replay.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-setup.html git-sh-setup.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-index.html git-show-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-email.html git-send-email.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-branch.html git-show-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replay.html git-replay.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rebase.html git-rebase.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-config.html git-config.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-parse.html git-rev-parse.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-ref.html git-show-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sparse-checkout.html git-sparse-checkout.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-index.html git-show-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stage.html git-stage.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-ref.html git-show-ref.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sparse-checkout.html git-sparse-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-status.html git-status.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stash.html git-stash.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-switch.html git-switch.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-file.html git-unpack-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-symbolic-ref.html git-symbolic-ref.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-submodule.html git-submodule.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-status.html git-status.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-switch.html git-switch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-symbolic-ref.html git-symbolic-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-file.html git-unpack-file.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-objects.html git-unpack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-submodule.html git-submodule.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-archive.html git-upload-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-objects.html git-unpack-objects.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-server-info.html git-update-server-info.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-tag.html git-tag.txt
@@ -5333,13 +5372,10 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-ref.html git-update-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-server-info.html git-update-server-info.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-archive.html git-upload-archive.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-version.html git-version.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-var.html git-var.txt
@@ -5348,94 +5384,94 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-tag.html git-verify-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-index.html git-update-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-svn.html git-svn.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-commit.html git-verify-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-pack.html git-verify-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-version.html git-version.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-web--browse.html git-web--browse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show.html git-show.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-whatchanged.html git-whatchanged.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-svn.html git-svn.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-index.html git-update-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-whatchanged.html git-whatchanged.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-write-tree.html git-write-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-web--browse.html git-web--browse.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-write-tree.html git-write-tree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-commit-graph.html gitformat-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-worktree.html git-worktree.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitattributes.html gitattributes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitk.html gitk.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o scalar.html scalar.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitk.html gitk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show.html git-show.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-commit-graph.html gitformat-commit-graph.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-worktree.html git-worktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.html gitweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitattributes.html gitattributes.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o githooks.html githooks.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitignore.html gitignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmodules.html gitmodules.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o githooks.html githooks.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmodules.html gitmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git.html git.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcli.html gitcli.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcvs-migration.html gitcvs-migration.txt
@@ -5444,68 +5480,73 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcli.html gitcli.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git.html git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o giteveryday.html giteveryday.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitpacking.html gitpacking.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitnamespaces.html gitnamespaces.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o giteveryday.html giteveryday.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitfaq.html gitfaq.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 git-tools.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitnamespaces.html gitnamespaces.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 howto-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 git-tools.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
 sed -e '1,/^$/d' howto/new-command.txt | \
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial.html gittutorial.txt
+\
+sed -e '1,/^$/d' howto/revert-branch-rebase.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-branch-rebase.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitglossary.html gitglossary.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial.html gittutorial.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
-sed -e '1,/^$/d' howto/revert-branch-rebase.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-branch-rebase.html
+sed -e '1,/^$/d' howto/using-signed-tag-in-pull-request.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/using-signed-tag-in-pull-request.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
@@ -5524,23 +5565,18 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
-sed -e '1,/^$/d' howto/using-signed-tag-in-pull-request.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/using-signed-tag-in-pull-request.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-\
 sed -e '1,/^$/d' howto/separating-topic-branches.txt | \
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/separating-topic-branches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
-sed -e '1,/^$/d' howto/rebuild-from-update-hook.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebuild-from-update-hook.html
+sed -e '1,/^$/d' howto/setup-git-server-over-http.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/setup-git-server-over-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
-sed -e '1,/^$/d' howto/setup-git-server-over-http.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/setup-git-server-over-http.html
+sed -e '1,/^$/d' howto/recover-corrupted-object-harder.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
@@ -5548,20 +5584,19 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 git-bisect-lk2009.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
-sed -e '1,/^$/d' howto/recover-corrupted-blob-object.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-blob-object.html
+sed -e '1,/^$/d' howto/rebuild-from-update-hook.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
-sed -e '1,/^$/d' howto/recover-corrupted-object-harder.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-object-harder.html
+sed -e '1,/^$/d' howto/coordinate-embargoed-releases.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/coordinate-embargoed-releases.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-error-handling.txt
+\
+sed -e '1,/^$/d' howto/rebase-from-internal-branch.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
@@ -5569,97 +5604,95 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-\
-sed -e '1,/^$/d' howto/coordinate-embargoed-releases.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/coordinate-embargoed-releases.html
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 \
-sed -e '1,/^$/d' howto/rebase-from-internal-branch.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebase-from-internal-branch.html
+sed -e '1,/^$/d' howto/recover-corrupted-blob-object.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-blob-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-merge.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 git-bisect-lk2009.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-\
-sed -e '1,/^$/d' howto/maintain-git.txt | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/maintain-git.html
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-error-handling.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 ReviewingGuidelines.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-simple-ipc.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-simple-ipc.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 DecisionMaking.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-parse-options.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 ReviewingGuidelines.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 DecisionMaking.txt
+\
+sed -e '1,/^$/d' howto/maintain-git.txt | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 ToolsForGit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-parse-options.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/long-running-process-protocol.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bitmap-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-trace2.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/multi-pack-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 MyFirstObjectWalk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/build-systems.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bundle-uri.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/multi-pack-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/build-systems.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 SubmittingPatches.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/pack-heuristics.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bundle-uri.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-trace2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/partial-clone.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/pack-heuristics.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/hash-function-transition.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/parallel-checkout.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/platform-support.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/send-pack-pipeline.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/platform-support.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/scalar.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/racy-git.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 MyFirstContribution.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/scalar.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/parallel-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/trivial-merge.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/racy-git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 MyFirstContribution.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/partial-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/shallow.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-index.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/trivial-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -o everyday.html everyday.txto
@@ -5668,75 +5701,78 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b xhtml11 -o git-remote-helpers.html git-remote-helpers.txto
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/reftable.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/unit-tests.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/unit-tests.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d book -o user-manual.xml user-manual.txt
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/reftable.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-archimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-apply.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archive.xml
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -f asciidoc.conf -b docbook -d book -o user-manual.xml user-manual.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-apply.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-bugreport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-archive.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-bisect.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-blame.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bundle.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-cherry.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-cat-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-mailmap.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ignore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-attr.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-check-mailmap.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
@@ -5746,19 +5782,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-column.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-count-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clone.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-count-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache--daemon.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -5770,28 +5806,25 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-daemon.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diagnose.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diagnose.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-describe.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-cvsserver.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -5800,79 +5833,79 @@
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-diff-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fmt-merge-msg.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-filter-branch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-filter-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-repo.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-get-tar-commit-id.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-config.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-format-patch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-gc.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-fsck.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-fetch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hash-object.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-index-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-http-fetch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -5881,7 +5914,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-init-db.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-index-pack.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -5890,67 +5926,67 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-instaweb.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-interpret-trailers.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-interpret-trailers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-merge-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-log.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-one-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool--lib.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-mergetool--lib.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-mergetool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-mv.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-log.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-multi-pack-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-merge.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-mktree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -5959,34 +5995,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-p4.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune-packed.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-pack-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-prune-packed.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pull.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-range-diff.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -6001,28 +6031,37 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-receive-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-reflog.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-pull.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-ext.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rebase.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replay.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-request-pull.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-restore.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -6034,40 +6073,37 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-revert.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-restore.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-parse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-parse.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-list.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-sh-setup.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-show-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-sh-i18n--envsubst.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-email.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-branch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -6076,16 +6112,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-shortlog.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-stage.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stage.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -6094,10 +6127,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-submodule.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -6106,16 +6139,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-unpack-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-symbolic-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-tag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-svn.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-tag.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -6127,7 +6160,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-update-server-info.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-upload-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -6136,6 +6169,9 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-var.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
@@ -6148,13 +6184,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-web--browse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-whatchanged.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-worktree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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
@@ -6163,10 +6199,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 scalar.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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-bundle.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-bundle.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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
@@ -6175,28 +6211,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 gitformat-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 git.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmailmap.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-capabilities.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitmodules.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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
@@ -6205,43 +6241,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 gitprotocol-common.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-capabilities.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man githooks.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitprotocol-v2.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcvs-migration.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitcvs-migration.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitdiffcore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.conf.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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
@@ -6250,28 +6283,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 gitglossary.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xsltproc --xinclude --stringparam html.stylesheet docbook-xsl.css --param generate.consistent.ids 1 -o user-manual.html docbook.xsl user-manual.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcore-tutorial.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+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.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xsltproc --xinclude --stringparam html.stylesheet docbook-xsl.css --param generate.consistent.ids 1 -o user-manual.html docbook.xsl user-manual.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitworkflows.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gittutorial.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[1]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 # git-mediawiki
@@ -6296,6 +6332,10 @@
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+./generate-script.sh "git-filter-branch.sh" "git-filter-branch+" ./GIT-BUILD-OPTIONS && \
+mv git-filter-branch+ git-filter-branch
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-merge-octopus.sh" "git-merge-octopus+" ./GIT-BUILD-OPTIONS && \
 mv git-merge-octopus+ git-merge-octopus
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -6304,20 +6344,16 @@
 mv git-merge-one-file+ git-merge-one-file
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-filter-branch.sh" "git-filter-branch+" ./GIT-BUILD-OPTIONS && \
-mv git-filter-branch+ git-filter-branch
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-quiltimport.sh" "git-quiltimport+" ./GIT-BUILD-OPTIONS && \
-mv git-quiltimport+ git-quiltimport
+./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
+mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
 mv git-mergetool+ git-mergetool
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
-mv git-merge-resolve+ git-merge-resolve
+./generate-script.sh "git-quiltimport.sh" "git-quiltimport+" ./GIT-BUILD-OPTIONS && \
+mv git-quiltimport+ git-quiltimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-request-pull.sh" "git-request-pull+" ./GIT-BUILD-OPTIONS && \
@@ -6332,18 +6368,22 @@
 mv git-web--browse+ git-web--browse
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsexportcommit.perl" "git-cvsexportcommit+" && \
-mv git-cvsexportcommit+ git-cvsexportcommit
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
 mv git-archimport+ git-archimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsexportcommit.perl" "git-cvsexportcommit+" && \
+mv git-cvsexportcommit+ git-cvsexportcommit
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsimport.perl" "git-cvsimport+" && \
 mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
+mv git-cvsserver+ git-cvsserver
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
 mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -6352,15 +6392,11 @@
 mv git-svn+ git-svn
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
-mv git-cvsserver+ git-cvsserver
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-setup+ git-sh-setup
+/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
+mv git-mergetool--lib+ git-mergetool--lib
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
@@ -6368,13 +6404,13 @@
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool--lib+ git-mergetool--lib
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
 mv git-sh-i18n+ git-sh-i18n
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
+mv git-sh-setup+ git-sh-setup
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /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'
@@ -6385,10 +6421,10 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git.pm" "perl/build/lib/Git.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/IndexInfo.pm" "perl/build/lib/Git/IndexInfo.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/I18N.pm" "perl/build/lib/Git/I18N.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/I18N.pm" "perl/build/lib/Git/I18N.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/IndexInfo.pm" "perl/build/lib/Git/IndexInfo.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN.pm" "perl/build/lib/Git/LoadCPAN.pm"
@@ -6403,6 +6439,9 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Error.pm" "perl/build/lib/Git/LoadCPAN/Error.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Editor.pm" "perl/build/lib/Git/SVN/Editor.pm"
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Fetcher.pm" "perl/build/lib/Git/SVN/Fetcher.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -6415,9 +6454,6 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Migration.pm" "perl/build/lib/Git/SVN/Migration.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Editor.pm" "perl/build/lib/Git/SVN/Editor.pm"
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Prompt.pm" "perl/build/lib/Git/SVN/Prompt.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -6900,41 +6936,9 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink04-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-expecting success of 0007.3 'requested identities are strict': 
-	(
-		sane_unset GIT_COMMITTER_NAME &&
-		sane_unset GIT_COMMITTER_EMAIL &&
-		test_must_fail git var GIT_COMMITTER_IDENT
-	)
-
-Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink04-arm64.debian.net>) not allowed
-ok 3 - requested identities are strict
+second user <pbuilder2@codethink03-arm64.debian.net> 1112912053 -0700
+prerequisite AUTOIDENT ok
+ok 3 # skip requested identities are strict (missing !AUTOIDENT of !FAIL_PREREQS,!AUTOIDENT)
 
 expecting success of 0007.4 'get GIT_DEFAULT_BRANCH without configuration': 
 	(
@@ -8023,6 +8027,112 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0010-racy-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0026-eol-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0026-eol-config/.git/
 expecting success of 0026.1 'setup': 
@@ -9373,6 +9483,7 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at f2c783e second
+M	three
 Previous HEAD position was f2c783e second
 Switched to branch 'main'
 ok 28 - checkout when deleting .gitattributes
@@ -9383,7 +9494,6 @@
 	git diff
 
 
-+crlf is not a valid attribute name: .gitattributes:1
 ok 29 - invalid .gitattributes (must not crash)
 
 expecting success of 0020.30 'setting up for new autocrlf tests': 
@@ -10278,110 +10388,130 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0010-racy-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t0035-safe-bare-repository.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/.git/
+expecting success of 0035.1 'setup an embedded bare repo, secondary worktree and submodule': 
+	git init outer-repo &&
+	git init --bare --initial-branch=main outer-repo/bare-repo &&
+	git -C outer-repo worktree add ../outer-secondary &&
+	test_path_is_dir outer-secondary &&
+	(
+		cd outer-repo &&
+		test_commit A &&
+		git push bare-repo +HEAD:refs/heads/main &&
+		git -c protocol.file.allow=always \
+			submodule add --name subn -- ./bare-repo subd
+	) &&
+	test_path_is_dir outer-repo/.git/worktrees/outer-secondary &&
+	test_path_is_dir outer-repo/.git/modules/subn
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 1 - Racy git trial #0 part A
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo/
+No possible source branch, inferring '--orphan'
+Preparing worktree (new branch 'outer-secondary')
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+To bare-repo
+ * [new branch]      HEAD -> main
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/subd'...
+done.
+ok 1 - setup an embedded bare repo, secondary worktree and submodule
 
-expecting success of 0010.2 'Racy git trial #0 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0035.2 'safe.bareRepository unset': 
+	test_unconfig --global safe.bareRepository &&
+	expect_accepted_implicit -C outer-repo/bare-repo
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 2 - Racy git trial #0 part B
+.
+13:26:03.668565 setup.c:1548                 | d0 | main                     | data         |     |  0.000682 |  0.000682 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+ok 2 - safe.bareRepository unset
 
-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 &&
+expecting success of 0035.3 'safe.bareRepository=all': 
+	test_config_global safe.bareRepository all &&
+	expect_accepted_implicit -C outer-repo/bare-repo
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 3 - Racy git trial #1 part A
+.
+13:26:03.752513 setup.c:1548                 | d0 | main                     | data         |     |  0.000641 |  0.000641 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+ok 3 - safe.bareRepository=all
 
-expecting success of 0010.4 'Racy git trial #1 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0035.4 'safe.bareRepository=explicit': 
+	test_config_global safe.bareRepository explicit &&
+	expect_rejected -C outer-repo/bare-repo
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 4 - Racy git trial #1 part B
+fatal: cannot use bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
+13:26:03.880519 setup.c:1548                 | d0 | main                     | data         |     |  0.000639 |  0.000639 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+ok 4 - safe.bareRepository=explicit
 
-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 &&
+expecting success of 0035.5 'safe.bareRepository in the repository': 
+	# safe.bareRepository must not be "explicit", otherwise
+	# git config fails with "fatal: not in a git directory" (like
+	# safe.directory)
+	test_config -C outer-repo/bare-repo safe.bareRepository all &&
+	test_config_global safe.bareRepository explicit &&
+	expect_rejected -C outer-repo/bare-repo
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 5 - Racy git trial #2 part A
+fatal: cannot use bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
+13:26:04.044757 setup.c:1548                 | d0 | main                     | data         |     |  0.000669 |  0.000669 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+ok 5 - safe.bareRepository in the repository
 
-expecting success of 0010.6 'Racy git trial #2 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0035.6 'safe.bareRepository on the command line': 
+	test_config_global safe.bareRepository explicit &&
+	expect_accepted_implicit -C outer-repo/bare-repo \
+		-c safe.bareRepository=all
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 6 - Racy git trial #2 part B
+.
+13:26:04.200587 setup.c:1548                 | d0 | main                     | data         |     |  0.000639 |  0.000639 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+ok 6 - safe.bareRepository on the command line
 
-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 &&
+expecting success of 0035.7 'safe.bareRepository in included file': 
+	cat >gitconfig-include <<-\EOF &&
+	[safe]
+		bareRepository = explicit
+	EOF
+	git config --global --add include.path "$(pwd)/gitconfig-include" &&
+	expect_rejected -C outer-repo/bare-repo
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 7 - Racy git trial #3 part A
+fatal: cannot use bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
+13:26:04.336990 setup.c:1548                 | d0 | main                     | data         |     |  0.000636 |  0.000636 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+ok 7 - safe.bareRepository in included file
 
-expecting success of 0010.8 'Racy git trial #3 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0035.8 'no trace when GIT_DIR is explicitly provided': 
+	expect_accepted_explicit "$pwd/outer-repo/bare-repo"
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 8 - Racy git trial #3 part B
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+ok 8 - no trace when GIT_DIR is explicitly provided
 
-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 &&
+expecting success of 0035.9 'no trace when "bare repository" is .git': 
+	expect_accepted_implicit -C outer-repo/.git
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 9 - Racy git trial #4 part A
+.
+13:26:04.476609 setup.c:1548                 | d0 | main                     | data         |     |  0.000620 |  0.000620 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+ok 9 - no trace when "bare repository" is .git
 
-expecting success of 0010.10 'Racy git trial #4 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0035.10 'no trace when "bare repository" is a subdir of .git': 
+	expect_accepted_implicit -C outer-repo/.git/objects
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 10 - Racy git trial #4 part B
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+13:26:04.549632 setup.c:1548                 | d0 | main                     | data         |     |  0.000679 |  0.000679 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+ok 10 - no trace when "bare repository" is a subdir of .git
 
-# passed all 10 test(s)
-1..10
+expecting success of 0035.11 'no trace in $GIT_DIR of secondary worktree': 
+	expect_accepted_implicit -C outer-repo/.git/worktrees/outer-secondary
+
+.
+13:26:04.616363 setup.c:1548                 | d0 | main                     | data         |     |  0.000629 |  0.000629 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+
+.
+13:26:04.696310 setup.c:1548                 | d0 | main                     | data         |     |  0.000641 |  0.000641 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0001-init.sh ***
@@ -11550,6 +11680,571 @@
 1..93
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0033-safe-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/source/.git'
+ok 15 - local clone of unowned repo refused in unsafe directory
+
+expecting success of 0033.16 'local clone of unowned repo accepted in safe directory': 
+	test_when_finished "rm -rf source" &&
+	git init source &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit -C source initial
+	) &&
+	test_must_fail git clone --local source target &&
+	git config --global --add safe.directory "$(pwd)/source/.git" &&
+	git clone --local source target &&
+	test_path_is_dir target
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/source/.git'
+Cloning into 'target'...
+done.
+ok 16 - local clone of unowned repo accepted in safe directory
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0033.17 'checked paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	git init repository &&
+	ln -s repository repo &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repository"
+	) &&
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repo for-each-ref &&
+	git -C repo/ for-each-ref &&
+	test_must_fail git -C repository/.git for-each-ref &&
+	test_must_fail git -C repository/.git/ for-each-ref &&
+	test_must_fail git -C repo/.git for-each-ref &&
+	test_must_fail git -C repo/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0028-working-tree-encoding.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0028-working-tree-encoding/.git/
 expecting success of 0028.1 'setup test files': 
@@ -11767,6 +12462,22 @@
 | 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
 | 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -11783,6 +12494,22 @@
 | 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
 | 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -11799,6 +12526,22 @@
 | 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
 | 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -11855,6 +12598,22 @@
 hint: The file 'bebom.utf16le' contains a byte order mark (BOM). Please use UTF-16 as working-tree-encoding.
 fatal: BOM is prohibited in 'lebom.utf16le' if encoded as utf-16LE
 hint: The file 'lebom.utf16le' contains a byte order mark (BOM). Please use UTF-16 as working-tree-encoding.
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -11871,6 +12630,22 @@
 | 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
 | 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -11909,6 +12684,22 @@
 hint: The file 'nobom.utf16' is missing a byte order mark (BOM). Please use UTF-16BE or UTF-16LE (depending on the byte order) as working-tree-encoding.
 fatal: BOM is required in 'nobom.utf16' if encoded as utf-16
 hint: The file 'nobom.utf16' is missing a byte order mark (BOM). Please use UTF-16BE or UTF-16LE (depending on the byte order) as working-tree-encoding.
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -11925,6 +12716,22 @@
 | 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
 | 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -12000,7 +12807,7 @@
 | 16:  a  
 
 warning: in the working copy of 'eol.utf16', CRLF will be replaced by LF the next time Git touches it
-source (test.utf16lebom, considered UTF-16LE-BOM):
+source (test.utf16, considered utf-16):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
 | 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
@@ -12010,24 +12817,12 @@
 | 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
 | 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
 
-destination (test.utf16lebom, considered UTF-8):
+destination (test.utf16, considered UTF-8):
 |  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
 |  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
 | 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
 | 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
-source (eol.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 6f o |  3:  0   |  4: 6e n |  5:  0   |  6: 65 e |  7:  0  
-|  8:  d   |  9:  0   | 10:  a   | 11:  0   | 12: 74 t | 13:  0   | 14: 77 w | 15:  0  
-| 16: 6f o | 17:  0   | 18:  d   | 19:  0   | 20:  a   | 21:  0   | 22: 74 t | 23:  0  
-| 24: 68 h | 25:  0   | 26: 72 r | 27:  0   | 28: 65 e | 29:  0   | 30: 65 e | 31:  0  
-| 32:  d   | 33:  0   | 34:  a   | 35:  0  
-
-destination (eol.utf16, considered UTF-8):
-|  0: 6f o |  1: 6e n |  2: 65 e |  3:  d   |  4:  a   |  5: 74 t |  6: 77 w |  7: 6f o
-|  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
-| 16:  a  
-
 source (test.utf16lebom, considered UTF-16LE-BOM):
 |  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
 |  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
@@ -12049,71 +12844,7 @@
  1 file changed, 3 insertions(+)
  create mode 100644 eol.utf16
 Updated 1 path from the index
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 Updated 1 path from the index
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 HEAD is now at dfb2bb8 initial
 ok 8 - eol conversion for UTF-16 encoded files on checkout
 
@@ -12154,38 +12885,6 @@
 hint: The file 'bebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
 fatal: BOM is prohibited in 'lebom.utf32le' if encoded as utf-32LE
 hint: The file 'lebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 HEAD is now at dfb2bb8 initial
 ok 9 - check prohibited UTF-32 BOM
 
@@ -12208,38 +12907,6 @@
 hint: The file 'nobom.utf32' is missing a byte order mark (BOM). Please use UTF-32BE or UTF-32LE (depending on the byte order) as working-tree-encoding.
 fatal: BOM is required in 'nobom.utf32' if encoded as utf-32
 hint: The file 'nobom.utf32' is missing a byte order mark (BOM). Please use UTF-32BE or UTF-32LE (depending on the byte order) as working-tree-encoding.
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 HEAD is now at dfb2bb8 initial
 ok 10 - check required UTF-32 BOM
 
@@ -12303,124 +12970,12 @@
 | 16:  a  
 
 warning: in the working copy of 'eol.utf32', CRLF will be replaced by LF the next time Git touches it
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (eol.utf32, considered utf-32):
-|  0: ff   |  1: fe   |  2:  0   |  3:  0   |  4: 6f o |  5:  0   |  6:  0   |  7:  0  
-|  8: 6e n |  9:  0   | 10:  0   | 11:  0   | 12: 65 e | 13:  0   | 14:  0   | 15:  0  
-| 16:  d   | 17:  0   | 18:  0   | 19:  0   | 20:  a   | 21:  0   | 22:  0   | 23:  0  
-| 24: 74 t | 25:  0   | 26:  0   | 27:  0   | 28: 77 w | 29:  0   | 30:  0   | 31:  0  
-| 32: 6f o | 33:  0   | 34:  0   | 35:  0   | 36:  d   | 37:  0   | 38:  0   | 39:  0  
-| 40:  a   | 41:  0   | 42:  0   | 43:  0   | 44: 74 t | 45:  0   | 46:  0   | 47:  0  
-| 48: 68 h | 49:  0   | 50:  0   | 51:  0   | 52: 72 r | 53:  0   | 54:  0   | 55:  0  
-| 56: 65 e | 57:  0   | 58:  0   | 59:  0   | 60: 65 e | 61:  0   | 62:  0   | 63:  0  
-| 64:  d   | 65:  0   | 66:  0   | 67:  0   | 68:  a   | 69:  0   | 70:  0   | 71:  0  
-
-destination (eol.utf32, considered UTF-8):
-|  0: 6f o |  1: 6e n |  2: 65 e |  3:  d   |  4:  a   |  5: 74 t |  6: 77 w |  7: 6f o
-|  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
-| 16:  a  
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 [main 674dc3f] eol
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 eol.utf32
 Updated 1 path from the index
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 Updated 1 path from the index
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 HEAD is now at dfb2bb8 initial
 ok 11 - eol conversion for UTF-32 encoded files on checkout
 
@@ -12487,72 +13042,8 @@
 	git diff 2>err.out &&
 	test_grep "error: BOM is required" err.out
 
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 error: BOM is required in 'nonsense.utf16' if encoded as utf-16
 error: BOM is required in 'nonsense.utf16' if encoded as utf-16
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 HEAD is now at dfb2bb8 initial
 ok 14 - error if encoding garbage is already in Git
 
@@ -12604,130 +13095,18 @@
 	git reset
 
 Checking roundtrip encoding for SHIFT-JIS...
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 Unstaged changes after reset:
 M	.gitattributes
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 Unstaged changes after reset:
 M	.gitattributes
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 Unstaged changes after reset:
 M	.gitattributes
 Checking roundtrip encoding for utf-16...
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 Unstaged changes after reset:
 M	.gitattributes
 Checking roundtrip encoding for utf-16...
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 Unstaged changes after reset:
 M	.gitattributes
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 HEAD is now at dfb2bb8 initial
 ok 15 - check roundtrip encoding
 
@@ -13061,716 +13440,20 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0035-safe-bare-repository.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/.git/
-expecting success of 0035.1 'setup an embedded bare repo, secondary worktree and submodule': 
-	git init outer-repo &&
-	git init --bare --initial-branch=main outer-repo/bare-repo &&
-	git -C outer-repo worktree add ../outer-secondary &&
-	test_path_is_dir outer-secondary &&
-	(
-		cd outer-repo &&
-		test_commit A &&
-		git push bare-repo +HEAD:refs/heads/main &&
-		git -c protocol.file.allow=always \
-			submodule add --name subn -- ./bare-repo subd
-	) &&
-	test_path_is_dir outer-repo/.git/worktrees/outer-secondary &&
-	test_path_is_dir outer-repo/.git/modules/subn
+*** t0030-stripspace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo/
-No possible source branch, inferring '--orphan'
-Preparing worktree (new branch 'outer-secondary')
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-To bare-repo
- * [new branch]      HEAD -> main
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/subd'...
-done.
-ok 1 - setup an embedded bare repo, secondary worktree and submodule
+	echo "$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0035.2 'safe.bareRepository unset': 
-	test_unconfig --global safe.bareRepository &&
-	expect_accepted_implicit -C outer-repo/bare-repo
-
-.
-06:53:17.981166 setup.c:1548                 | d0 | main                     | data         |     |  0.000762 |  0.000762 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
-ok 2 - safe.bareRepository unset
-
-expecting success of 0035.3 'safe.bareRepository=all': 
-	test_config_global safe.bareRepository all &&
-	expect_accepted_implicit -C outer-repo/bare-repo
-
-.
-06:53:18.045370 setup.c:1548                 | d0 | main                     | data         |     |  0.000686 |  0.000686 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
-ok 3 - safe.bareRepository=all
-
-expecting success of 0035.4 'safe.bareRepository=explicit': 
-	test_config_global safe.bareRepository explicit &&
-	expect_rejected -C outer-repo/bare-repo
-
-fatal: cannot use bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-06:53:18.144687 setup.c:1548                 | d0 | main                     | data         |     |  0.000656 |  0.000656 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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': 
-	# safe.bareRepository must not be "explicit", otherwise
-	# git config fails with "fatal: not in a git directory" (like
-	# safe.directory)
-	test_config -C outer-repo/bare-repo safe.bareRepository all &&
-	test_config_global safe.bareRepository explicit &&
-	expect_rejected -C outer-repo/bare-repo
-
-fatal: cannot use bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-06:53:18.273775 setup.c:1548                 | d0 | main                     | data         |     |  0.000713 |  0.000713 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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': 
-	test_config_global safe.bareRepository explicit &&
-	expect_accepted_implicit -C outer-repo/bare-repo \
-		-c safe.bareRepository=all
-
-.
-06:53:18.380221 setup.c:1548                 | d0 | main                     | data         |     |  0.000670 |  0.000670 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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': 
-	cat >gitconfig-include <<-\EOF &&
-	[safe]
-		bareRepository = explicit
-	EOF
-	git config --global --add include.path "$(pwd)/gitconfig-include" &&
-	expect_rejected -C outer-repo/bare-repo
-
-fatal: cannot use bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-06:53:18.488092 setup.c:1548                 | d0 | main                     | data         |     |  0.000718 |  0.000718 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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': 
-	expect_accepted_explicit "$pwd/outer-repo/bare-repo"
-
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
-ok 8 - no trace when GIT_DIR is explicitly provided
-
-expecting success of 0035.9 'no trace when "bare repository" is .git': 
-	expect_accepted_implicit -C outer-repo/.git
-
-.
-06:53:18.588058 setup.c:1548                 | d0 | main                     | data         |     |  0.000655 |  0.000655 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
-06:53:18.595297 setup.c:1548                 | d0 | main                     | data         |     |  0.001644 |  0.001644 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-
-.
-06:53:18.632082 setup.c:1548                 | d0 | main                     | data         |     |  0.000692 |  0.000692 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-
-.
-06:53:18.666679 setup.c:1548                 | d0 | main                     | data         |     |  0.000736 |  0.000736 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0033-safe-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/source/.git'
-ok 15 - local clone of unowned repo refused in unsafe directory
-
-expecting success of 0033.16 'local clone of unowned repo accepted in safe directory': 
-	test_when_finished "rm -rf source" &&
-	git init source &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit -C source initial
-	) &&
-	test_must_fail git clone --local source target &&
-	git config --global --add safe.directory "$(pwd)/source/.git" &&
-	git clone --local source target &&
-	test_path_is_dir target
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/source/.git'
-Cloning into 'target'...
-done.
-ok 16 - local clone of unowned repo accepted in safe directory
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 0033.17 'checked paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	git init repository &&
-	ln -s repository repo &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
-
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repository"
-	) &&
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repo for-each-ref &&
-	git -C repo/ for-each-ref &&
-	test_must_fail git -C repository/.git for-each-ref &&
-	test_must_fail git -C repository/.git/ for-each-ref &&
-	test_must_fail git -C repo/.git for-each-ref &&
-	test_must_fail git -C repo/.git/ for-each-ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0033-safe-directory/repository'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0051-windows-named-pipe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0051-windows-named-pipe/.git/
-1..0 # SKIP skipping Windows-specific tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0030-stripspace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
-
-	echo "$ttt$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
-
-	echo "$ttt$ttt$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
+	echo "$ttt$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
 	echo "$ttt$ttt$ttt$ttt" >expect &&
 	git stripspace <expect >actual &&
@@ -14241,6 +13924,61 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0051-windows-named-pipe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0051-windows-named-pipe/.git/
+1..0 # SKIP skipping Windows-specific tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0055-beyond-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0055-beyond-symlinks/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0055.1 'setup': 
+	>a &&
+	mkdir b &&
+	ln -s b c &&
+	>c/d &&
+	git update-index --add a b/d
+
+ok 1 - setup
+
+expecting success of 0055.2 'update-index --add beyond symlinks': 
+	test_must_fail git update-index --add c/d &&
+	cat >expect <<-\EOF &&
+	a
+	b/d
+	EOF
+	git ls-files >actual &&
+	test_cmp expect actual
+
+error: 'c/d' is beyond a symbolic link
+fatal: Unable to process path c/d
+ok 2 - update-index --add beyond symlinks
+
+expecting success of 0055.3 'add beyond symlinks': 
+	test_must_fail git add c/d &&
+	cat >expect <<-\EOF &&
+	a
+	b/d
+	EOF
+	git ls-files >actual &&
+	test_cmp expect actual
+
+fatal: pathspec 'c/d' is beyond a symbolic link
+ok 3 - add beyond symlinks
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0050-filesystem.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0050-filesystem/.git/
 checking prerequisite: CASE_INSENSITIVE_FS
@@ -14400,54 +14138,954 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0055-beyond-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0055-beyond-symlinks/.git/
-checking prerequisite: SYMLINKS
+*** t0056-git-C.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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>
 
-)
-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
+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 1 - setup
+ok 2 - "git -C <path>" with an empty <path> is a no-op
 
-expecting success of 0055.2 'update-index --add beyond symlinks': 
-	test_must_fail git update-index --add c/d &&
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0040-parse-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
-	a
-	b/d
+	error: switch `s' requires a value
 	EOF
-	git ls-files >actual &&
+	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
 
-error: 'c/d' is beyond a symbolic link
-fatal: Unable to process path c/d
-ok 2 - update-index --add beyond symlinks
+ok 23 - missing required value
 
-expecting success of 0055.3 'add beyond symlinks': 
-	test_must_fail git add c/d &&
+expecting success of 0040.24 'superfluous value provided: boolean': 
 	cat >expect <<-\EOF &&
-	a
-	b/d
+	error: option `yes' takes no value
 	EOF
-	git ls-files >actual &&
+	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
 
-fatal: pathspec 'c/d' is beyond a symbolic link
-ok 3 - add beyond symlinks
+ok 24 - superfluous value provided: boolean
 
-# passed all 3 test(s)
-1..3
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0062-revision-walking.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0012-help.sh ***
@@ -19036,956 +19674,6 @@
 1..174
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0062-revision-walking.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0056-git-C.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0040-parse-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0063-string-list.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0063-string-list/.git/
 expecting success of 0063.1 'split foo:bar:baz at :, max -1': 
@@ -20108,6 +19796,121 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0067-parse_pathspec_file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0067-parse_pathspec_file/.git/
+expecting success of 0067.1 'one item from stdin': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 1 - one item from stdin
+
+expecting success of 0067.2 'one item from file': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t >list &&
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+
+ok 2 - one item from file
+
+expecting success of 0067.3 'NUL delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" |
+	test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+
+ok 3 - NUL delimiters
+
+expecting success of 0067.4 'LF delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 4 - LF delimiters
+
+expecting success of 0067.5 'no trailing delimiter': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 5 - no trailing delimiter
+
+expecting success of 0067.6 'CRLF delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\r\nfileB.t\r\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+
+ok 6 - CRLF delimiters
+
+expecting success of 0067.7 'quotes': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+
+ok 7 - quotes
+
+expecting success of 0067.8 '--pathspec-file-nul takes quotes literally': 
+	# Note: there is an extra newline because --pathspec-file-nul takes
+	# input \n literally, too
+	cat >expect <<-\EOF &&
+	"file\101.t"
+
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+
+ok 8 - --pathspec-file-nul takes quotes literally
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0066-dir-iterator.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0066-dir-iterator/.git/
 expecting success of 0066.1 'setup': 
@@ -20289,119 +20092,287 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0067-parse_pathspec_file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0067-parse_pathspec_file/.git/
-expecting success of 0067.1 'one item from stdin': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	EOF
+*** t0068-for-each-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	echo fileA.t |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0068-for-each-repo/one/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0068-for-each-repo/two/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0068-for-each-repo/three/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	test_cmp expect actual
+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 1 - one item from stdin
+ok 2 - do nothing on empty config
 
-expecting success of 0067.2 'one item from file': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	EOF
+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"
 
-	echo fileA.t >list &&
-	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+error: key does not contain a section: a
+fatal: got bad config --config=a
 
-	test_cmp expect actual
+usage: git for-each-repo --config=<config> [--] <arguments>
 
-ok 2 - one item from file
+    --[no-]config <config>
+                          config key storing a list of repository paths
+    --[no-]keep-going     keep going even if command fails in a repository
 
-expecting success of 0067.3 'NUL delimiters': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	fileB.t
-	EOF
+error: key does not contain variable name: a.b.
+fatal: got bad config --config=a.b.
 
-	printf "fileA.t\0fileB.t\0" |
-	test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
+usage: git for-each-repo --config=<config> [--] <arguments>
 
-	test_cmp expect actual
+    --[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 - NUL delimiters
+error: invalid key: '.b
+fatal: got bad config --config='.b
 
-expecting success of 0067.4 'LF delimiters': 
+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 &&
-	fileA.t
-	fileB.t
+	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
 
-	printf "fileA.t\nfileB.t\n" |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+ok 4 - error on NULL value for config keys
 
-	test_cmp expect actual
+expecting success of 0068.5 '--keep-going': 
+	git config keep.going non-existing &&
+	git config --add keep.going . &&
 
-ok 4 - LF delimiters
+	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 &&
 
-expecting success of 0067.5 'no trailing delimiter': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	fileB.t
-	EOF
+	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
 
-	printf "fileA.t\nfileB.t" |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+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
 
-	test_cmp expect actual
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0070-fundamental.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 5 - no trailing delimiter
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0070-fundamental/doesnotexist/test7Z1ySM': No such file or directory
+ok 1 - mktemp to nonexistent directory prints filename
 
-expecting success of 0067.6 'CRLF delimiters': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	fileB.t
-	EOF
+checking prerequisite: SANITY
 
-	printf "fileA.t\r\nfileB.t\r\n" |
-	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-	test_cmp expect actual
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
 
-ok 6 - CRLF delimiters
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 0067.7 'quotes': 
-	cat >expect <<-\EOF &&
-	fileA.t
-	EOF
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 0070.2 'mktemp to unwritable directory prints filename': 
+	mkdir cannotwrite &&
+	test_when_finished "chmod +w cannotwrite" &&
+	chmod -w cannotwrite &&
+	test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
+	grep "cannotwrite/test" err
 
-	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0070-fundamental/cannotwrite/testhEdsI3': Permission denied
+ok 2 - mktemp to unwritable directory prints filename
 
-	test_cmp expect actual
+expecting success of 0070.3 'git_mkstemps_mode does not fail if fd 0 is not open': 
+	git commit --allow-empty -m message <&-
 
-ok 7 - quotes
+[master (root-commit) b293b08] message
+ Author: A U Thor <author@example.com>
+ok 3 - git_mkstemps_mode does not fail if fd 0 is not open
 
-expecting success of 0067.8 '--pathspec-file-nul takes quotes literally': 
-	# Note: there is an extra newline because --pathspec-file-nul takes
-	# input \n literally, too
-	cat >expect <<-\EOF &&
-	"file\101.t"
+expecting success of 0070.4 'check for a bug in the regex routines': 
+	# if this test fails, re-build git with NO_REGEX=1
+	test-tool regex --bug
+
+ok 4 - check for a bug in the regex routines
+
+expecting success of 0070.5 'incomplete sideband messages are reassembled': 
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line receive-sideband <split-sideband 2>err &&
+	grep "Hello, world" err
+
+primary: regular output
+remote: Hello, world!        
+ok 5 - incomplete sideband messages are reassembled
+
+expecting success of 0070.6 'eof on sideband message is reported': 
+	printf 1234 >input &&
+	test-tool pkt-line receive-sideband <input 2>err &&
+	test_grep "unexpected disconnect" err
+
+sideband: unexpected disconnect while reading sideband packet
+ok 6 - eof on sideband message is reported
+
+expecting success of 0070.7 'missing sideband designator is reported': 
+	printf 0004 >input &&
+	test-tool pkt-line receive-sideband <input 2>err &&
+	test_grep "missing sideband" err
+
+sideband: protocol error: missing sideband designator
+ok 7 - missing sideband designator is reported
 
+expecting success of 0070.8 'unpack-sideband: --no-chomp-newline': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--no-chomp-newline <split-sideband >out 2>err &&
+	cat >expect-out <<-EOF &&
+		primary: regular output
+	EOF
+	cat >expect-err <<-EOF &&
+		Foo.
+		Bar.
+		Hello, world!
 	EOF
+	test_cmp expect-out out &&
+	test_cmp expect-err err
 
-	cat >list <<-\EOF &&
-	"file\101.t"
+ok 8 - unpack-sideband: --no-chomp-newline
+
+expecting success of 0070.9 'unpack-sideband: --chomp-newline (default)': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--chomp-newline <split-sideband >out 2>err &&
+	printf "primary: regular output" >expect-out &&
+	printf "Foo.Bar.Hello, world!" >expect-err &&
+	test_cmp expect-out out &&
+	test_cmp expect-err err
+
+ok 9 - unpack-sideband: --chomp-newline (default)
+
+expecting success of 0070.10 'unpack-sideband: packet_reader_read() consumes sideband, no chomp payload': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--reader-use-sideband \
+		--no-chomp-newline <split-sideband >out 2>err &&
+	cat >expect-out <<-EOF &&
+		primary: regular output
 	EOF
+	printf "remote: Foo.        \n"           >expect-err &&
+	printf "remote: Bar.        \n"          >>expect-err &&
+	printf "remote: Hello, world!        \n" >>expect-err &&
+	test_cmp expect-out out &&
+	test_cmp expect-err err
 
-	test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual &&
+ok 10 - unpack-sideband: packet_reader_read() consumes sideband, no chomp payload
 
-	test_cmp expect actual
+expecting success of 0070.11 'unpack-sideband: packet_reader_read() consumes sideband, chomp payload': 
+	test_when_finished "rm -f expect-out expect-err" &&
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line unpack-sideband \
+		--reader-use-sideband \
+		--chomp-newline <split-sideband >out 2>err &&
+	printf "primary: regular output" >expect-out &&
+	printf "remote: Foo.        \n"           >expect-err &&
+	printf "remote: Bar.        \n"          >>expect-err &&
+	printf "remote: Hello, world!        \n" >>expect-err &&
+	test_cmp expect-out out &&
+	test_cmp expect-err err
 
-ok 8 - --pathspec-file-nul takes quotes literally
+ok 11 - unpack-sideband: packet_reader_read() consumes sideband, chomp payload
 
-# passed all 8 test(s)
-1..8
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0061-run-command.sh ***
@@ -20655,140 +20626,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0068-for-each-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0068-for-each-repo/one/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0068-for-each-repo/two/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0068-for-each-repo/three/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0080-unit-test-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0080-unit-test-output/.git/
 expecting success of 0080.1 'TAP output from unit tests': 
@@ -22573,155 +22410,6 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0070-fundamental.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0070-fundamental/doesnotexist/testc91cf2': No such file or directory
-ok 1 - mktemp to nonexistent directory prints filename
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 0070.2 'mktemp to unwritable directory prints filename': 
-	mkdir cannotwrite &&
-	test_when_finished "chmod +w cannotwrite" &&
-	chmod -w cannotwrite &&
-	test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
-	grep "cannotwrite/test" err
-
-fatal: Unable to create temporary file '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0070-fundamental/cannotwrite/testzdkTvM': Permission denied
-ok 2 - mktemp to unwritable directory prints filename
-
-expecting success of 0070.3 'git_mkstemps_mode does not fail if fd 0 is not open': 
-	git commit --allow-empty -m message <&-
-
-[master (root-commit) b293b08] message
- Author: A U Thor <author@example.com>
-ok 3 - git_mkstemps_mode does not fail if fd 0 is not open
-
-expecting success of 0070.4 'check for a bug in the regex routines': 
-	# if this test fails, re-build git with NO_REGEX=1
-	test-tool regex --bug
-
-ok 4 - check for a bug in the regex routines
-
-expecting success of 0070.5 'incomplete sideband messages are reassembled': 
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line receive-sideband <split-sideband 2>err &&
-	grep "Hello, world" err
-
-primary: regular output
-remote: Hello, world!        
-ok 5 - incomplete sideband messages are reassembled
-
-expecting success of 0070.6 'eof on sideband message is reported': 
-	printf 1234 >input &&
-	test-tool pkt-line receive-sideband <input 2>err &&
-	test_grep "unexpected disconnect" err
-
-sideband: unexpected disconnect while reading sideband packet
-ok 6 - eof on sideband message is reported
-
-expecting success of 0070.7 'missing sideband designator is reported': 
-	printf 0004 >input &&
-	test-tool pkt-line receive-sideband <input 2>err &&
-	test_grep "missing sideband" err
-
-sideband: protocol error: missing sideband designator
-ok 7 - missing sideband designator is reported
-
-expecting success of 0070.8 'unpack-sideband: --no-chomp-newline': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--no-chomp-newline <split-sideband >out 2>err &&
-	cat >expect-out <<-EOF &&
-		primary: regular output
-	EOF
-	cat >expect-err <<-EOF &&
-		Foo.
-		Bar.
-		Hello, world!
-	EOF
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 8 - unpack-sideband: --no-chomp-newline
-
-expecting success of 0070.9 'unpack-sideband: --chomp-newline (default)': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--chomp-newline <split-sideband >out 2>err &&
-	printf "primary: regular output" >expect-out &&
-	printf "Foo.Bar.Hello, world!" >expect-err &&
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 9 - unpack-sideband: --chomp-newline (default)
-
-expecting success of 0070.10 'unpack-sideband: packet_reader_read() consumes sideband, no chomp payload': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--reader-use-sideband \
-		--no-chomp-newline <split-sideband >out 2>err &&
-	cat >expect-out <<-EOF &&
-		primary: regular output
-	EOF
-	printf "remote: Foo.        \n"           >expect-err &&
-	printf "remote: Bar.        \n"          >>expect-err &&
-	printf "remote: Hello, world!        \n" >>expect-err &&
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 10 - unpack-sideband: packet_reader_read() consumes sideband, no chomp payload
-
-expecting success of 0070.11 'unpack-sideband: packet_reader_read() consumes sideband, chomp payload': 
-	test_when_finished "rm -f expect-out expect-err" &&
-	test-tool pkt-line send-split-sideband >split-sideband &&
-	test-tool pkt-line unpack-sideband \
-		--reader-use-sideband \
-		--chomp-newline <split-sideband >out 2>err &&
-	printf "primary: regular output" >expect-out &&
-	printf "remote: Foo.        \n"           >expect-err &&
-	printf "remote: Bar.        \n"          >>expect-err &&
-	printf "remote: Hello, world!        \n" >>expect-err &&
-	test_cmp expect-out out &&
-	test_cmp expect-err err
-
-ok 11 - unpack-sideband: packet_reader_read() consumes sideband, chomp payload
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0081-find-pack.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0081-find-pack/.git/
 expecting success of 0081.1 'setup': 
@@ -22856,6 +22544,164 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0092-diagnose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0092-diagnose': 62.36 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-14 13:26   .git/COMMIT_EDITMSG
+      137  2026-03-14 13:26   .git/index
+       23  2026-03-14 13:26   .git/HEAD
+       92  2026-03-14 13:26   .git/config
+       73  2026-03-14 13:26   .git/description
+      478  2026-03-14 13:26   .git/hooks/applypatch-msg.sample
+      896  2026-03-14 13:26   .git/hooks/commit-msg.sample
+     4726  2026-03-14 13:26   .git/hooks/fsmonitor-watchman.sample
+      189  2026-03-14 13:26   .git/hooks/post-update.sample
+      424  2026-03-14 13:26   .git/hooks/pre-applypatch.sample
+     1649  2026-03-14 13:26   .git/hooks/pre-commit.sample
+      416  2026-03-14 13:26   .git/hooks/pre-merge-commit.sample
+     1492  2026-03-14 13:26   .git/hooks/prepare-commit-msg.sample
+     1374  2026-03-14 13:26   .git/hooks/pre-push.sample
+     4898  2026-03-14 13:26   .git/hooks/pre-rebase.sample
+      544  2026-03-14 13:26   .git/hooks/pre-receive.sample
+     2783  2026-03-14 13:26   .git/hooks/push-to-checkout.sample
+     2308  2026-03-14 13:26   .git/hooks/sendemail-validate.sample
+     3650  2026-03-14 13:26   .git/hooks/update.sample
+      240  2026-03-14 13:26   .git/info/exclude
+      154  2026-03-14 13:26   .git/logs/refs/heads/master
+      154  2026-03-14 13:26   .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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0095-bloom.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0095-bloom/.git/
 expecting success of 0095.1 'compute unseeded murmur3 hash for empty string': 
@@ -23000,164 +22846,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0092-diagnose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0092-diagnose': 83.76 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  2025-02-09 06:53   .git/COMMIT_EDITMSG
-      137  2025-02-09 06:53   .git/index
-       23  2025-02-09 06:53   .git/HEAD
-       92  2025-02-09 06:53   .git/config
-       73  2025-02-09 06:53   .git/description
-      478  2025-02-09 06:53   .git/hooks/applypatch-msg.sample
-      896  2025-02-09 06:53   .git/hooks/commit-msg.sample
-     4726  2025-02-09 06:53   .git/hooks/fsmonitor-watchman.sample
-      189  2025-02-09 06:53   .git/hooks/post-update.sample
-      424  2025-02-09 06:53   .git/hooks/pre-applypatch.sample
-     1649  2025-02-09 06:53   .git/hooks/pre-commit.sample
-      416  2025-02-09 06:53   .git/hooks/pre-merge-commit.sample
-     1492  2025-02-09 06:53   .git/hooks/prepare-commit-msg.sample
-     1374  2025-02-09 06:53   .git/hooks/pre-push.sample
-     4898  2025-02-09 06:53   .git/hooks/pre-rebase.sample
-      544  2025-02-09 06:53   .git/hooks/pre-receive.sample
-     2783  2025-02-09 06:53   .git/hooks/push-to-checkout.sample
-     2308  2025-02-09 06:53   .git/hooks/sendemail-validate.sample
-     3650  2025-02-09 06:53   .git/hooks/update.sample
-      240  2025-02-09 06:53   .git/info/exclude
-      154  2025-02-09 06:53   .git/logs/refs/heads/master
-      154  2025-02-09 06:53   .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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0091-bugreport.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0091-bugreport/.git/
 expecting success of 0091.1 'create a report': 
@@ -23227,7 +22915,7 @@
 	git bugreport -o foo/ &&
 	test_path_is_file foo/git-bugreport-*
 
-Created new report at 'foo/git-bugreport-2025-02-09-0653.txt'.
+Created new report at 'foo/git-bugreport-2026-03-14-1326.txt'.
 ok 5 - --output-directory puts the report in the provided dir
 
 expecting success of 0091.6 'incorrect arguments abort with usage': 
@@ -23252,14 +22940,14 @@
 	test_when_finished rm non-repo/git-bugreport-* &&
 	nongit git bugreport
 
-Created new report at 'git-bugreport-2025-02-09-0653.txt'.
+Created new report at 'git-bugreport-2026-03-14-1326.txt'.
 ok 8 - runs outside of a git dir
 
 expecting success of 0091.9 'can create leading directories outside of a git dir': 
 	test_when_finished rm -fr foo/bar/baz &&
 	nongit git bugreport -o foo/bar/baz
 
-Created new report at 'foo/bar/baz/git-bugreport-2025-02-09-0653.txt'.
+Created new report at 'foo/bar/baz/git-bugreport-2026-03-14-1326.txt'.
 ok 9 - can create leading directories outside of a git dir
 
 expecting success of 0091.10 'indicates populated hooks': 
@@ -23350,7 +23038,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.48.0~rc1+next.20250101/t/trash directory.t0091-bugreport': 83.76 GiB (mount flags 0x1000)
+Available space on '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0091-bugreport': 62.36 GiB (mount flags 0x1000)
 Contents of .git/objects:
 Total: 0 loose objects
 ok 11 - --diagnose creates diagnostics zip archive
@@ -23390,24 +23078,24 @@
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
 Created new report at 'report/git-bugreport-test.txt'.
-       23  2025-02-09 06:53   .git/HEAD
-       92  2025-02-09 06:53   .git/config
-       73  2025-02-09 06:53   .git/description
-      478  2025-02-09 06:53   .git/hooks/applypatch-msg.sample
-      896  2025-02-09 06:53   .git/hooks/commit-msg.sample
-     4726  2025-02-09 06:53   .git/hooks/fsmonitor-watchman.sample
-      189  2025-02-09 06:53   .git/hooks/post-update.sample
-      424  2025-02-09 06:53   .git/hooks/pre-applypatch.sample
-     1649  2025-02-09 06:53   .git/hooks/pre-commit.sample
-      416  2025-02-09 06:53   .git/hooks/pre-merge-commit.sample
-     1492  2025-02-09 06:53   .git/hooks/prepare-commit-msg.sample
-     1374  2025-02-09 06:53   .git/hooks/pre-push.sample
-     4898  2025-02-09 06:53   .git/hooks/pre-rebase.sample
-      544  2025-02-09 06:53   .git/hooks/pre-receive.sample
-     2783  2025-02-09 06:53   .git/hooks/push-to-checkout.sample
-     2308  2025-02-09 06:53   .git/hooks/sendemail-validate.sample
-     3650  2025-02-09 06:53   .git/hooks/update.sample
-      240  2025-02-09 06:53   .git/info/exclude
+       23  2026-03-14 13:26   .git/HEAD
+       92  2026-03-14 13:26   .git/config
+       73  2026-03-14 13:26   .git/description
+      478  2026-03-14 13:26   .git/hooks/applypatch-msg.sample
+      896  2026-03-14 13:26   .git/hooks/commit-msg.sample
+     4726  2026-03-14 13:26   .git/hooks/fsmonitor-watchman.sample
+      189  2026-03-14 13:26   .git/hooks/post-update.sample
+      424  2026-03-14 13:26   .git/hooks/pre-applypatch.sample
+     1649  2026-03-14 13:26   .git/hooks/pre-commit.sample
+      416  2026-03-14 13:26   .git/hooks/pre-merge-commit.sample
+     1492  2026-03-14 13:26   .git/hooks/prepare-commit-msg.sample
+     1374  2026-03-14 13:26   .git/hooks/pre-push.sample
+     4898  2026-03-14 13:26   .git/hooks/pre-rebase.sample
+      544  2026-03-14 13:26   .git/hooks/pre-receive.sample
+     2783  2026-03-14 13:26   .git/hooks/push-to-checkout.sample
+     2308  2026-03-14 13:26   .git/hooks/sendemail-validate.sample
+     3650  2026-03-14 13:26   .git/hooks/update.sample
+      240  2026-03-14 13:26   .git/info/exclude
 ok 13 - --diagnose=all includes .git dir contents
 
 # passed all 13 test(s)
@@ -23622,6 +23310,76 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0201-gettext-fallbacks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0200-gettext-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0200-gettext-basic/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23744,76 +23502,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0201-gettext-fallbacks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0202-gettext-perl.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0202-gettext-perl/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23836,9 +23524,9 @@
 ok 2 - Git::I18N is located at /build/reproducible-path/git-2.48.0~rc1+next.20250101/perl/build/lib/Git/I18N.pm
 ok 3 - sanity: Git::I18N has 3 export(s)
 ok 4 - sanity: Git::I18N exports everything by default
-ok 5 - sanity: __n has a $$$ prototype
-ok 6 - sanity: __ has a $ prototype
-ok 7 - sanity: N__ has a $ prototype
+ok 5 - sanity: N__ has a $ prototype
+ok 6 - sanity: __n has a $$$ prototype
+ok 7 - sanity: __ has a $ prototype
 ok 8 - Passing a string through __() in the C locale works
 ok 9 - Get singular string through __n() in C locale
 ok 10 - Get plural string through __n() in C locale
@@ -23851,52 +23539,6 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0204-gettext-reencode-sanity.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0204-gettext-reencode-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 0204.1 'gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic': 
-    printf "TILRAUN: Halló Heimur!" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: Hello World!" >actual &&
-    test_cmp expect actual
-
-ok 1 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic
-
-expecting success of 0204.2 'gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes': 
-    printf "%s" "$RUNES" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "$MSGKEY" >actual &&
-    test_cmp expect actual
-
-ok 2 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes
-
-ok 3 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_ISO_LOCALE)
-
-ok 4 # skip gettext: impossible ISO-8859-1 output (missing GETTEXT_ISO_LOCALE)
-
-expecting success of 0204.5 'gettext: Fetching a UTF-8 msgid -> UTF-8': 
-    printf "TILRAUN: ‚einfaldar‘ og „tvöfaldar“ gæsalappir" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: ‘single’ and “double� quotes" >actual &&
-    test_cmp expect actual
-
-ok 5 - gettext: Fetching a UTF-8 msgid -> UTF-8
-
-ok 6 # skip gettext: Fetching a UTF-8 msgid -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
-
-expecting success of 0204.7 'gettext.c: git init UTF-8 -> UTF-8': 
-    printf "Bjó til tóma Git lind" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" git init repo >actual &&
-    test_when_finished "rm -rf repo" &&
-    grep "^$(cat expect) " actual
-
-Bjó til tóma Git lind í /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0204-gettext-reencode-sanity/repo/.git/
-ok 7 - gettext.c: git init UTF-8 -> UTF-8
-
-ok 8 # skip gettext.c: git init UTF-8 -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0203-gettext-setlocale-sanity.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0203-gettext-setlocale-sanity/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23937,264 +23579,50 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0210-trace2-normal.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0210-trace2-normal/.git/
-expecting success of 0210.1 'normal stream, return code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 1 - normal stream, return code 0
-
-expecting success of 0210.2 'normal stream, return code 1': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 1
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:1
-		atexit elapsed:_TIME_ code:1
-	EOF
-	test_cmp expect actual
-
-ok 2 - normal stream, return code 1
-
-expecting success of 0210.3 'automatic filename': 
-	test_when_finished "rm -r traces actual expect" &&
-	mkdir traces &&
-	GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 3 - automatic filename
-
-expecting success of 0210.4 'normal stream, exit code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 002exit 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 4 - normal stream, exit code 0
-
-expecting success of 0210.5 'normal stream, exit code 1': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 002exit 1
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:1
-		atexit elapsed:_TIME_ code:1
-	EOF
-	test_cmp expect actual
-
-ok 5 - normal stream, exit code 1
-
-expecting success of 0210.6 'normal stream, error event': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 003error 'hello world' 'this is a test'
-		cmd_name trace2 (trace2)
-		error hello world
-		error this is a test
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-error: hello world
-error: this is a test
-ok 6 - normal stream, error event
-
-expecting success of 0210.7 'BUG messages are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 007bug
-		cmd_name trace2 (trace2)
-		error the bug message
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-BUG: t/helper/test-trace2.c:213: the bug message
-ok 7 - BUG messages are written to trace2
-
-expecting success of 0210.8 'bug messages with BUG_if_bug() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 008bug 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	another bug message
-	an explicit BUG_if_bug() following bug() call(s) is nice, but not required
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 008bug
-		cmd_name trace2 (trace2)
-		error a bug message
-		error another bug message
-		error an explicit BUG_if_bug() following bug() call(s) is nice, but not required
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 8 - bug messages with BUG_if_bug() are written to trace2
-
-expecting success of 0210.9 'bug messages without explicit BUG_if_bug() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 009bug_BUG 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	another bug message
-	had bug() call(s) in this process without explicit BUG_if_bug()
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 009bug_BUG
-		cmd_name trace2 (trace2)
-		error a bug message
-		error another bug message
-		error on exit(): had bug() call(s) in this process without explicit BUG_if_bug()
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 9 - bug messages without explicit BUG_if_bug() are written to trace2
-
-expecting success of 0210.10 'bug messages followed by BUG() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 010bug_BUG 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	a BUG message
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
+*** t0204-gettext-reencode-sanity.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0204-gettext-reencode-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 0204.1 'gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic': 
+    printf "TILRAUN: Halló Heimur!" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: Hello World!" >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 1 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic
 
-ok 10 - bug messages followed by BUG() are written to trace2
+expecting success of 0204.2 'gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes': 
+    printf "%s" "$RUNES" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "$MSGKEY" >actual &&
+    test_cmp expect actual
 
-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 2 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes
 
-ok 11 - using global config, normal stream, return code 0
+ok 3 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_ISO_LOCALE)
 
-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 4 # skip gettext: impossible ISO-8859-1 output (missing GETTEXT_ISO_LOCALE)
 
-ok 12 - using global config with include
+expecting success of 0204.5 'gettext: Fetching a UTF-8 msgid -> UTF-8': 
+    printf "TILRAUN: ‚einfaldar‘ og „tvöfaldar“ gæsalappir" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: ‘single’ and “double� quotes" >actual &&
+    test_cmp expect actual
 
-expecting success of 0210.13 'unsafe URLs are redacted by default': 
-	test_when_finished \
-		"rm -r trace.normal unredacted.normal clone clone2" &&
+ok 5 - gettext: Fetching a UTF-8 msgid -> UTF-8
 
-	test_config_global \
-		"url.$(pwd).insteadOf" https://user:pwd@example.com/ &&
-	test_config_global trace2.configParams "core.*,remote.*.url" &&
+ok 6 # skip gettext: Fetching a UTF-8 msgid -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
 
-	GIT_TRACE2="$(pwd)/trace.normal" \
-		git clone https://user:pwd@example.com/ clone &&
-	! grep user:pwd trace.normal &&
+expecting success of 0204.7 'gettext.c: git init UTF-8 -> UTF-8': 
+    printf "Bjó til tóma Git lind" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" git init repo >actual &&
+    test_when_finished "rm -rf repo" &&
+    grep "^$(cat expect) " actual
 
-	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
+Bjó til tóma Git lind í /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0204-gettext-reencode-sanity/repo/.git/
+ok 7 - gettext.c: git init UTF-8 -> UTF-8
 
-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.
-06:53:22.370353 common-main.c:58                  start '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' clone https://user:pwd@example.com/ clone2
-06:53:22.371650 config.c:3098                     def_param scope:unknown remote.origin.url=https://user:pwd@example.com/
-ok 13 - unsafe URLs are redacted by default
+ok 8 # skip gettext.c: git init UTF-8 -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
 
-# passed all 13 test(s)
-1..13
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0021-conversion.sh ***
@@ -24985,8 +24413,8 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0021-conversion/repo/.git/
 fatal: smudge write error
 error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
---- smudge-write-fail.o	2025-02-09 06:53:19.933432728 +0000
-+++ smudge-write-fail.r	2025-02-09 06:53:20.077433645 +0000
+--- smudge-write-fail.o	2026-03-14 13:26:08.742677808 +0000
++++ smudge-write-fail.r	2026-03-14 13:26:09.086677808 +0000
 @@ -1 +1 @@
 -this is going to fail
 +guvf vf tbvat gb snvy
@@ -25708,8 +25136,8 @@
 	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":"20250209T065322.452375Z-Hcf858c9d-P00166455","thread":"main","time":"2025-02-09T06:53:22.452465Z","file":"common-main.c","line":57,"evt":"4","exe":"2.48.0.rc1.219.gb6b6757d772"}
-{"event":"too_many_files","sid":"20250209T065322.452375Z-Hcf858c9d-P00166455","thread":"main","time":"2025-02-09T06:53:22.452476Z","file":"common-main.c","line":57}
+{"event":"version","sid":"20260314T132617.577269Z-H5c947e1c-P003dc481","thread":"main","time":"2026-03-14T13:26:17.577367Z","file":"common-main.c","line":57,"evt":"4","exe":"2.48.0.rc1.219.gb6b6757d772"}
+{"event":"too_many_files","sid":"20260314T132617.577269Z-H5c947e1c-P003dc481","thread":"main","time":"2026-03-14T13:26:17.577381Z","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': 
@@ -25756,23 +25184,884 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0060-path-utils.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0060-path-utils/.git/
-expecting success of 0060.1 'basename': test-tool path-utils basename
-ok 1 - basename
-
-expecting success of 0060.2 'dirname': test-tool path-utils dirname
-ok 2 - dirname
-
-expecting success of 0060.3 'normalize path:  => ': 
-		echo '' >expect &&
-		test-tool path-utils normalize_path_copy '' >actual &&
-		test_cmp expect actual
-	
-ok 3 - normalize path:  => 
-
-expecting success of 0060.4 'normalize path: . => ': 
-		echo '' >expect &&
+*** t0210-trace2-normal.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0210-trace2-normal/.git/
+expecting success of 0210.1 'normal stream, return code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 1 - normal stream, return code 0
+
+expecting success of 0210.2 'normal stream, return code 1': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 1
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:1
+		atexit elapsed:_TIME_ code:1
+	EOF
+	test_cmp expect actual
+
+ok 2 - normal stream, return code 1
+
+expecting success of 0210.3 'automatic filename': 
+	test_when_finished "rm -r traces actual expect" &&
+	mkdir traces &&
+	GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 3 - automatic filename
+
+expecting success of 0210.4 'normal stream, exit code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 002exit 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 4 - normal stream, exit code 0
+
+expecting success of 0210.5 'normal stream, exit code 1': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 002exit 1
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:1
+		atexit elapsed:_TIME_ code:1
+	EOF
+	test_cmp expect actual
+
+ok 5 - normal stream, exit code 1
+
+expecting success of 0210.6 'normal stream, error event': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 003error 'hello world' 'this is a test'
+		cmd_name trace2 (trace2)
+		error hello world
+		error this is a test
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+error: hello world
+error: this is a test
+ok 6 - normal stream, error event
+
+expecting success of 0210.7 'BUG messages are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 007bug
+		cmd_name trace2 (trace2)
+		error the bug message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+BUG: t/helper/test-trace2.c:213: the bug message
+ok 7 - BUG messages are written to trace2
+
+expecting success of 0210.8 'bug messages with BUG_if_bug() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 008bug 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 008bug
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+ok 8 - bug messages with BUG_if_bug() are written to trace2
+
+expecting success of 0210.9 'bug messages without explicit BUG_if_bug() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 009bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	had bug() call(s) in this process without explicit BUG_if_bug()
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 009bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error on exit(): had bug() call(s) in this process without explicit BUG_if_bug()
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+ok 9 - bug messages without explicit BUG_if_bug() are written to trace2
+
+expecting success of 0210.10 'bug messages followed by BUG() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 010bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	a BUG message
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 010bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error a BUG message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+ok 10 - bug messages followed by BUG() are written to trace2
+
+expecting success of 0210.11 '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.
+13:26:17.964284 common-main.c:58                  start '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' clone https://user:pwd@example.com/ clone2
+13:26:17.969999 config.c:3098                     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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0090-cache-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0090-cache-tree/.git/
+expecting success of 0090.1 'initial commit has cache-tree': 
+	test_commit foo &&
+	test_cache_tree
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - initial commit has cache-tree
+
+expecting success of 0090.2 'read-tree HEAD establishes cache-tree': 
+	git read-tree HEAD &&
+	test_cache_tree
+
+ok 2 - read-tree HEAD establishes cache-tree
+
+expecting success of 0090.3 'git-add invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	echo "I changed this file" >foo &&
+	git add foo &&
+	test_invalid_cache_tree
+
+HEAD is now at ddd63c9 foo
+ok 3 - git-add invalidates cache-tree
+
+expecting success of 0090.4 'git-add in subdir invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	mkdir dirx &&
+	echo "I changed this file" >dirx/foo &&
+	git add dirx/foo &&
+	test_invalid_cache_tree
+
+error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
+HEAD is now at ddd63c9 foo
+ok 4 - git-add in subdir invalidates cache-tree
+
+expecting success of 0090.5 'git-add in subdir does not invalidate sibling cache-tree': 
+	git tag no-children &&
+	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
+	mkdir dir1 dir2 &&
+	test_commit dir1/a &&
+	test_commit dir2/b &&
+	echo "I changed this file" >dir1/a &&
+	test_when_finished "rm before" &&
+	cat >before <<-\EOF &&
+	SHA  (3 entries, 2 subtrees)
+	SHA dir1/ (1 entries, 0 subtrees)
+	SHA dir2/ (1 entries, 0 subtrees)
+	EOF
+	cmp_cache_tree before &&
+	echo "I changed this file" >dir1/a &&
+	git add dir1/a &&
+	cat >expect <<-\EOF &&
+	invalid                                   (2 subtrees)
+	invalid                                  dir1/ (0 subtrees)
+	SHA dir2/ (1 entries, 0 subtrees)
+	EOF
+	cmp_cache_tree expect
+
+[master 365c8fc] dir1/a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir1/a.t
+[master 8be4607] dir2/b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir2/b.t
+error: invalid object 040000 3b5b859722b671676295bf3795f34b8c6f2393f5 for 'dir1'
+HEAD is now at ddd63c9 foo
+ok 5 - git-add in subdir does not invalidate sibling cache-tree
+
+expecting success of 0090.6 'update-index invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	echo "I changed this file" >foo &&
+	git update-index --add foo &&
+	test_invalid_cache_tree
+
+HEAD is now at ddd63c9 foo
+ok 6 - update-index invalidates cache-tree
+
+expecting success of 0090.7 'write-tree establishes cache-tree': 
+	test-tool scrap-cache-tree &&
+	git write-tree &&
+	test_cache_tree
+
+64fd3796c57084e7b8cbae358ce37970b8e954f6
+ok 7 - write-tree establishes cache-tree
+
+expecting success of 0090.8 'test-tool scrap-cache-tree works': 
+	git read-tree HEAD &&
+	test-tool scrap-cache-tree &&
+	test_no_cache_tree
+
+ok 8 - test-tool scrap-cache-tree works
+
+expecting success of 0090.9 'second commit has cache-tree': 
+	test_commit bar &&
+	test_cache_tree
+
+[master eeeeed8] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 9 - second commit has cache-tree
+
+expecting success of 0090.10 'commit --interactive gives cache-tree on partial commit': 
+	test_when_finished "git reset --hard" &&
+	cat <<-\EOT >foo.c &&
+	int foo()
+	{
+		return 42;
+	}
+	int bar()
+	{
+		return 42;
+	}
+	EOT
+	git add foo.c &&
+	test_invalid_cache_tree &&
+	git commit -m "add a file" &&
+	test_cache_tree &&
+	cat <<-\EOT >foo.c &&
+	int foo()
+	{
+		return 43;
+	}
+	int bar()
+	{
+		return 44;
+	}
+	EOT
+	test_write_lines p 1 "" s n y q |
+	git commit --interactive -m foo &&
+	cat <<-\EOF >expected.status &&
+	 M foo.c
+	EOF
+	test_cache_tree expected.status
+
+[master d1075a6] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 foo.c
+           staged     unstaged path
+  1:    unchanged        +2/-2 foo.c
+
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:    unchanged        +2/-2 [f]oo.c
+Patch update>>            staged     unstaged path
+* 1:    unchanged        +2/-2 [f]oo.c
+Patch update>> diff --git a/foo.c b/foo.c
+index 75522e2..3f7f049 100644
+--- a/foo.c
++++ b/foo.c
+@@ -1,8 +1,8 @@
+ int foo()
+ {
+-return 42;
++return 43;
+ }
+ int bar()
+ {
+-return 42;
++return 44;
+ }
+(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
+@@ -1,6 +1,6 @@
+ int foo()
+ {
+-return 42;
++return 43;
+ }
+ int bar()
+ {
+(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -4,5 +4,5 @@
+ }
+ int bar()
+ {
+-return 42;
++return 44;
+ }
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> Bye.
+[master 65d7dde] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 65d7dde foo
+ok 10 - commit --interactive gives cache-tree on partial commit
+
+expecting success of 0090.11 'commit -p with shrinking cache-tree': 
+	mkdir -p deep/very-long-subdir &&
+	echo content >deep/very-long-subdir/file &&
+	git add deep &&
+	git commit -m add &&
+	git rm -r deep &&
+
+	before=$(wc -c <.git/index) &&
+	git commit -m delete -p &&
+	after=$(wc -c <.git/index) &&
+
+	# double check that the index shrank
+	test $before -gt $after &&
+
+	# and that our index was not corrupted
+	git fsck
+
+[master 10c383a] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deep/very-long-subdir/file
+rm 'deep/very-long-subdir/file'
+No changes.
+[master 73c66c3] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 deep/very-long-subdir/file
+dangling blob d238b40d1657b1cc3ebd9a3c55ef04f303c694ae
+ok 11 - commit -p with shrinking cache-tree
+
+expecting success of 0090.12 'commit in child dir has cache-tree': 
+	mkdir dir &&
+	>dir/child.t &&
+	git add dir/child.t &&
+	git commit -m dir/child.t &&
+	test_cache_tree
+
+[master d3413ee] dir/child.t
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir/child.t
+ok 12 - commit in child dir has cache-tree
+
+expecting success of 0090.13 'reset --hard gives cache-tree': 
+	test-tool scrap-cache-tree &&
+	git reset --hard &&
+	test_cache_tree
+
+HEAD is now at d3413ee dir/child.t
+ok 13 - reset --hard gives cache-tree
+
+expecting success of 0090.14 'reset --hard without index gives cache-tree': 
+	rm -f .git/index &&
+	git clean -fd &&
+	git reset --hard &&
+	test_cache_tree
+
+Removing bar.t
+Removing dir/
+Removing expected.status
+Removing foo.c
+Removing foo.t
+Removing status
+HEAD is now at d3413ee dir/child.t
+ok 14 - reset --hard without index gives cache-tree
+
+expecting success of 0090.15 'checkout gives cache-tree': 
+	git tag current &&
+	git checkout HEAD^ &&
+	test_cache_tree
+
+Note: switching to 'HEAD^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 73c66c3 delete
+ok 15 - checkout gives cache-tree
+
+expecting success of 0090.16 'checkout -b gives cache-tree': 
+	git checkout current &&
+	git checkout -b prev HEAD^ &&
+	test_cache_tree
+
+Previous HEAD position was 73c66c3 delete
+HEAD is now at d3413ee dir/child.t
+Previous HEAD position was d3413ee dir/child.t
+Switched to a new branch 'prev'
+ok 16 - checkout -b gives cache-tree
+
+expecting success of 0090.17 'checkout -B gives cache-tree': 
+	git checkout current &&
+	git checkout -B prev HEAD^ &&
+	test_cache_tree
+
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+Previous HEAD position was d3413ee dir/child.t
+Switched to and reset branch 'prev'
+ok 17 - checkout -B gives cache-tree
+
+expecting success of 0090.18 'merge --ff-only maintains cache-tree': 
+	git checkout current &&
+	git checkout -b changes &&
+	test_commit llamas &&
+	test_commit pachyderm &&
+	test_cache_tree &&
+	git checkout current &&
+	test_cache_tree &&
+	git merge --ff-only changes &&
+	test_cache_tree
+
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+Switched to a new branch 'changes'
+[changes 229c856] llamas
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 llamas.t
+[changes f10d9f3] pachyderm
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pachyderm.t
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+Updating d3413ee..f10d9f3
+Fast-forward
+ llamas.t    | 1 +
+ pachyderm.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 llamas.t
+ create mode 100644 pachyderm.t
+ok 18 - merge --ff-only maintains cache-tree
+
+expecting success of 0090.19 'merge maintains cache-tree': 
+	git checkout current &&
+	git checkout -b changes2 &&
+	test_commit alpacas &&
+	test_cache_tree &&
+	git checkout current &&
+	test_commit struthio &&
+	test_cache_tree &&
+	git merge changes2 &&
+	test_cache_tree
+
+Previous HEAD position was f10d9f3 pachyderm
+HEAD is now at d3413ee dir/child.t
+Switched to a new branch 'changes2'
+[changes2 4b1575a] alpacas
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpacas.t
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+[detached HEAD 5a63c6d] struthio
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 struthio.t
+Merge made by the 'ort' strategy.
+ alpacas.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpacas.t
+ok 19 - merge maintains cache-tree
+
+expecting success of 0090.20 'partial commit gives cache-tree': 
+	git checkout -b partial no-children &&
+	test_commit one &&
+	test_commit two &&
+	echo "some change" >one.t &&
+	git add one.t &&
+	echo "some other change" >two.t &&
+	git commit two.t -m partial &&
+	cat <<-\EOF >expected.status &&
+	M  one.t
+	EOF
+	test_cache_tree expected.status
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e104fa1 Merge branch 'changes2' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> e104fa1
+
+Switched to a new branch 'partial'
+[partial 6771940] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[partial cd7fad9] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[partial f24c7c2] partial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 20 - partial commit gives cache-tree
+
+expecting success of 0090.21 'no phantom error when switching trees': 
+	mkdir newdir &&
+	>newdir/one &&
+	git add newdir/one &&
+	git checkout 2>errors &&
+	test_must_be_empty errors
+
+A	newdir/one
+M	one.t
+ok 21 - no phantom error when switching trees
+
+expecting success of 0090.22 'switching trees does not invalidate shared index': 
+	(
+		sane_unset GIT_TEST_SPLIT_INDEX &&
+		git update-index --split-index &&
+		>split &&
+		git add split &&
+		test-tool dump-split-index .git/index | grep -v ^own >before &&
+		git commit -m "as-is" &&
+		test-tool dump-split-index .git/index | grep -v ^own >after &&
+		test_cmp before after
+	)
+
+[partial dc7a831] as-is
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 newdir/one
+ create mode 100644 split
+ok 22 - switching trees does not invalidate shared index
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0052-simple-ipc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0060-path-utils.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0060-path-utils/.git/
+expecting success of 0060.1 'basename': test-tool path-utils basename
+ok 1 - basename
+
+expecting success of 0060.2 'dirname': test-tool path-utils dirname
+ok 2 - dirname
+
+expecting success of 0060.3 'normalize path:  => ': 
+		echo '' >expect &&
+		test-tool path-utils normalize_path_copy '' >actual &&
+		test_cmp expect actual
+	
+ok 3 - normalize path:  => 
+
+expecting success of 0060.4 'normalize path: . => ': 
+		echo '' >expect &&
 		test-tool path-utils normalize_path_copy '.' >actual &&
 		test_cmp expect actual
 	
@@ -27497,513 +27786,6 @@
 1..218
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0090-cache-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0090-cache-tree/.git/
-expecting success of 0090.1 'initial commit has cache-tree': 
-	test_commit foo &&
-	test_cache_tree
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - initial commit has cache-tree
-
-expecting success of 0090.2 'read-tree HEAD establishes cache-tree': 
-	git read-tree HEAD &&
-	test_cache_tree
-
-ok 2 - read-tree HEAD establishes cache-tree
-
-expecting success of 0090.3 'git-add invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	echo "I changed this file" >foo &&
-	git add foo &&
-	test_invalid_cache_tree
-
-HEAD is now at ddd63c9 foo
-ok 3 - git-add invalidates cache-tree
-
-expecting success of 0090.4 'git-add in subdir invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	mkdir dirx &&
-	echo "I changed this file" >dirx/foo &&
-	git add dirx/foo &&
-	test_invalid_cache_tree
-
-error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
-HEAD is now at ddd63c9 foo
-ok 4 - git-add in subdir invalidates cache-tree
-
-expecting success of 0090.5 'git-add in subdir does not invalidate sibling cache-tree': 
-	git tag no-children &&
-	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
-	mkdir dir1 dir2 &&
-	test_commit dir1/a &&
-	test_commit dir2/b &&
-	echo "I changed this file" >dir1/a &&
-	test_when_finished "rm before" &&
-	cat >before <<-\EOF &&
-	SHA  (3 entries, 2 subtrees)
-	SHA dir1/ (1 entries, 0 subtrees)
-	SHA dir2/ (1 entries, 0 subtrees)
-	EOF
-	cmp_cache_tree before &&
-	echo "I changed this file" >dir1/a &&
-	git add dir1/a &&
-	cat >expect <<-\EOF &&
-	invalid                                   (2 subtrees)
-	invalid                                  dir1/ (0 subtrees)
-	SHA dir2/ (1 entries, 0 subtrees)
-	EOF
-	cmp_cache_tree expect
-
-[master 365c8fc] dir1/a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir1/a.t
-[master 8be4607] dir2/b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir2/b.t
-error: invalid object 040000 3b5b859722b671676295bf3795f34b8c6f2393f5 for 'dir1'
-HEAD is now at ddd63c9 foo
-ok 5 - git-add in subdir does not invalidate sibling cache-tree
-
-expecting success of 0090.6 'update-index invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	echo "I changed this file" >foo &&
-	git update-index --add foo &&
-	test_invalid_cache_tree
-
-HEAD is now at ddd63c9 foo
-ok 6 - update-index invalidates cache-tree
-
-expecting success of 0090.7 'write-tree establishes cache-tree': 
-	test-tool scrap-cache-tree &&
-	git write-tree &&
-	test_cache_tree
-
-64fd3796c57084e7b8cbae358ce37970b8e954f6
-ok 7 - write-tree establishes cache-tree
-
-expecting success of 0090.8 'test-tool scrap-cache-tree works': 
-	git read-tree HEAD &&
-	test-tool scrap-cache-tree &&
-	test_no_cache_tree
-
-ok 8 - test-tool scrap-cache-tree works
-
-expecting success of 0090.9 'second commit has cache-tree': 
-	test_commit bar &&
-	test_cache_tree
-
-[master eeeeed8] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 9 - second commit has cache-tree
-
-expecting success of 0090.10 'commit --interactive gives cache-tree on partial commit': 
-	test_when_finished "git reset --hard" &&
-	cat <<-\EOT >foo.c &&
-	int foo()
-	{
-		return 42;
-	}
-	int bar()
-	{
-		return 42;
-	}
-	EOT
-	git add foo.c &&
-	test_invalid_cache_tree &&
-	git commit -m "add a file" &&
-	test_cache_tree &&
-	cat <<-\EOT >foo.c &&
-	int foo()
-	{
-		return 43;
-	}
-	int bar()
-	{
-		return 44;
-	}
-	EOT
-	test_write_lines p 1 "" s n y q |
-	git commit --interactive -m foo &&
-	cat <<-\EOF >expected.status &&
-	 M foo.c
-	EOF
-	test_cache_tree expected.status
-
-[master d1075a6] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 foo.c
-           staged     unstaged path
-  1:    unchanged        +2/-2 foo.c
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:    unchanged        +2/-2 [f]oo.c
-Patch update>>            staged     unstaged path
-* 1:    unchanged        +2/-2 [f]oo.c
-Patch update>> diff --git a/foo.c b/foo.c
-index 75522e2..3f7f049 100644
---- a/foo.c
-+++ b/foo.c
-@@ -1,8 +1,8 @@
- int foo()
- {
--return 42;
-+return 43;
- }
- int bar()
- {
--return 42;
-+return 44;
- }
-(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
-@@ -1,6 +1,6 @@
- int foo()
- {
--return 42;
-+return 43;
- }
- int bar()
- {
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -4,5 +4,5 @@
- }
- int bar()
- {
--return 42;
-+return 44;
- }
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> Bye.
-[master 65d7dde] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 65d7dde foo
-ok 10 - commit --interactive gives cache-tree on partial commit
-
-expecting success of 0090.11 'commit -p with shrinking cache-tree': 
-	mkdir -p deep/very-long-subdir &&
-	echo content >deep/very-long-subdir/file &&
-	git add deep &&
-	git commit -m add &&
-	git rm -r deep &&
-
-	before=$(wc -c <.git/index) &&
-	git commit -m delete -p &&
-	after=$(wc -c <.git/index) &&
-
-	# double check that the index shrank
-	test $before -gt $after &&
-
-	# and that our index was not corrupted
-	git fsck
-
-[master 10c383a] add
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deep/very-long-subdir/file
-rm 'deep/very-long-subdir/file'
-No changes.
-[master 73c66c3] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 deep/very-long-subdir/file
-dangling blob d238b40d1657b1cc3ebd9a3c55ef04f303c694ae
-ok 11 - commit -p with shrinking cache-tree
-
-expecting success of 0090.12 'commit in child dir has cache-tree': 
-	mkdir dir &&
-	>dir/child.t &&
-	git add dir/child.t &&
-	git commit -m dir/child.t &&
-	test_cache_tree
-
-[master d3413ee] dir/child.t
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/child.t
-ok 12 - commit in child dir has cache-tree
-
-expecting success of 0090.13 'reset --hard gives cache-tree': 
-	test-tool scrap-cache-tree &&
-	git reset --hard &&
-	test_cache_tree
-
-HEAD is now at d3413ee dir/child.t
-ok 13 - reset --hard gives cache-tree
-
-expecting success of 0090.14 'reset --hard without index gives cache-tree': 
-	rm -f .git/index &&
-	git clean -fd &&
-	git reset --hard &&
-	test_cache_tree
-
-Removing bar.t
-Removing dir/
-Removing expected.status
-Removing foo.c
-Removing foo.t
-Removing status
-HEAD is now at d3413ee dir/child.t
-ok 14 - reset --hard without index gives cache-tree
-
-expecting success of 0090.15 'checkout gives cache-tree': 
-	git tag current &&
-	git checkout HEAD^ &&
-	test_cache_tree
-
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 73c66c3 delete
-ok 15 - checkout gives cache-tree
-
-expecting success of 0090.16 'checkout -b gives cache-tree': 
-	git checkout current &&
-	git checkout -b prev HEAD^ &&
-	test_cache_tree
-
-Previous HEAD position was 73c66c3 delete
-HEAD is now at d3413ee dir/child.t
-Previous HEAD position was d3413ee dir/child.t
-Switched to a new branch 'prev'
-ok 16 - checkout -b gives cache-tree
-
-expecting success of 0090.17 'checkout -B gives cache-tree': 
-	git checkout current &&
-	git checkout -B prev HEAD^ &&
-	test_cache_tree
-
-Note: switching to 'current'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d3413ee dir/child.t
-Previous HEAD position was d3413ee dir/child.t
-Switched to and reset branch 'prev'
-ok 17 - checkout -B gives cache-tree
-
-expecting success of 0090.18 'merge --ff-only maintains cache-tree': 
-	git checkout current &&
-	git checkout -b changes &&
-	test_commit llamas &&
-	test_commit pachyderm &&
-	test_cache_tree &&
-	git checkout current &&
-	test_cache_tree &&
-	git merge --ff-only changes &&
-	test_cache_tree
-
-Note: switching to 'current'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d3413ee dir/child.t
-Switched to a new branch 'changes'
-[changes 229c856] llamas
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 llamas.t
-[changes f10d9f3] pachyderm
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pachyderm.t
-Note: switching to 'current'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d3413ee dir/child.t
-Updating d3413ee..f10d9f3
-Fast-forward
- llamas.t    | 1 +
- pachyderm.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 llamas.t
- create mode 100644 pachyderm.t
-ok 18 - merge --ff-only maintains cache-tree
-
-expecting success of 0090.19 'merge maintains cache-tree': 
-	git checkout current &&
-	git checkout -b changes2 &&
-	test_commit alpacas &&
-	test_cache_tree &&
-	git checkout current &&
-	test_commit struthio &&
-	test_cache_tree &&
-	git merge changes2 &&
-	test_cache_tree
-
-Previous HEAD position was f10d9f3 pachyderm
-HEAD is now at d3413ee dir/child.t
-Switched to a new branch 'changes2'
-[changes2 4b1575a] alpacas
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpacas.t
-Note: switching to 'current'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d3413ee dir/child.t
-[detached HEAD 5a63c6d] struthio
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 struthio.t
-Merge made by the 'ort' strategy.
- alpacas.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 alpacas.t
-ok 19 - merge maintains cache-tree
-
-expecting success of 0090.20 'partial commit gives cache-tree': 
-	git checkout -b partial no-children &&
-	test_commit one &&
-	test_commit two &&
-	echo "some change" >one.t &&
-	git add one.t &&
-	echo "some other change" >two.t &&
-	git commit two.t -m partial &&
-	cat <<-\EOF >expected.status &&
-	M  one.t
-	EOF
-	test_cache_tree expected.status
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  e104fa1 Merge branch 'changes2' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> e104fa1
-
-Switched to a new branch 'partial'
-[partial 6771940] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[partial cd7fad9] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[partial f24c7c2] partial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 20 - partial commit gives cache-tree
-
-expecting success of 0090.21 'no phantom error when switching trees': 
-	mkdir newdir &&
-	>newdir/one &&
-	git add newdir/one &&
-	git checkout 2>errors &&
-	test_must_be_empty errors
-
-A	newdir/one
-M	one.t
-ok 21 - no phantom error when switching trees
-
-expecting success of 0090.22 'switching trees does not invalidate shared index': 
-	(
-		sane_unset GIT_TEST_SPLIT_INDEX &&
-		git update-index --split-index &&
-		>split &&
-		git add split &&
-		test-tool dump-split-index .git/index | grep -v ^own >before &&
-		git commit -m "as-is" &&
-		test-tool dump-split-index .git/index | grep -v ^own >after &&
-		test_cmp before after
-	)
-
-[partial dc7a831] as-is
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 newdir/one
- create mode 100644 split
-ok 22 - switching trees does not invalidate shared index
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0211-trace2-perf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0211-trace2-perf/.git/
 expecting success of 0211.1 'perf stream, return code 0': 
@@ -28203,26 +27985,26 @@
 Cloning into 'clone2'...
 warning: You appear to have cloned an empty repository.
 done.
-06:53:22.399799 common-main.c:58|d0|main|start||_T_REL_|||'/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' clone https://user:pwd@example.com/ clone2
-06:53:22.401146 config.c:3098|d0|main|def_param||||scope:unknow|remote.origin.url:https://user:pwd@example.com/
+13:26:17.816471 common-main.c:58|d0|main|start||_T_REL_|||'/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' clone https://user:pwd@example.com/ clone2
+13:26:17.822110 config.c:3098|d0|main|def_param||||scope:unknow|remote.origin.url:https://user:pwd@example.com/
 ok 10 - unsafe URLs are redacted by default
 
 expecting success of 0211.11 'expect def_params for normal builtin command': 
 	try_simple "git version" "version"
 
 git version 2.48.0.rc1.219.gb6b6757d772
-06:53:22.442505 git.c:477|d0|main|cmd_name|||||version (version)
-06:53:22.442606 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.442622 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:18.072500 git.c:477|d0|main|cmd_name|||||version (version)
+13:26:18.072591 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:18.072608 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 11 - expect def_params for normal builtin command
 
 expecting success of 0211.12 'expect def_params for query command': 
 	try_simple "git --man-path" "_query_"
 
 /usr/share/man
-06:53:22.480088 git.c:187|d0|main|cmd_name|||||_query_ (_query_)
-06:53:22.480171 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.480187 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:18.384433 git.c:187|d0|main|cmd_name|||||_query_ (_query_)
+13:26:18.384519 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:18.384535 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 12 - expect def_params for query command
 
 expecting success of 0211.13 'expect def_params for remote-curl and _run_dashed_': 
@@ -28250,12 +28032,12 @@
 
 warning: url has no scheme: y/
 fatal: credential url cannot be parsed: y/
-06:53:22.528214 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-06:53:22.528270 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.528287 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-06:53:22.544872 remote-curl.c:1573|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
-06:53:22.544897 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.544916 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:18.676939 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:26:18.676991 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:18.677007 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:18.719880 remote-curl.c:1573|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
+13:26:18.719903 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:18.719921 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 13 - expect def_params for remote-curl and _run_dashed_
 
 expecting success of 0211.14 'expect def_params for http-fetch and _run_dashed_': 
@@ -28282,12 +28064,12 @@
 	grep "d1|main|def_param|.*|cfg.prop.foo:red" actual &&
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
-06:53:22.595647 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-06:53:22.595703 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.595718 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-06:53:22.606907 http-fetch.c:151|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
-06:53:22.606932 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.606955 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:19.068543 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:26:19.068593 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:19.068608 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:19.096038 http-fetch.c:151|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
+13:26:19.096060 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:19.096081 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 14 - expect def_params for http-fetch and _run_dashed_
 
 expecting success of 0211.15 'expect def_params during git alias expansion': 
@@ -28325,13 +28107,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.48.0.rc1.219.gb6b6757d772
-06:53:22.653199 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-06:53:22.653382 git.c:819|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
-06:53:22.653251 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.653267 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-06:53:22.655121 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
-06:53:22.655209 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.655228 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:19.458120 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:26:19.458306 git.c:819|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
+13:26:19.458173 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:19.458189 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:19.482557 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
+13:26:19.482650 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:19.482667 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 15 - expect def_params during git alias expansion
 
 expecting success of 0211.16 'expect def_params during shell alias expansion': 
@@ -28372,13 +28154,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.48.0.rc1.219.gb6b6757d772
-06:53:22.709915 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-06:53:22.710612 git.c:394|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
-06:53:22.709974 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.710400 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-06:53:22.715226 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
-06:53:22.715321 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.715339 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:19.891113 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:26:19.891346 git.c:394|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
+13:26:19.891165 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:19.891180 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:19.911107 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
+13:26:19.911198 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:19.911216 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 16 - expect def_params during shell alias expansion
 
 expecting success of 0211.17 'expect def_params during nested git alias expansion': 
@@ -28429,17 +28211,17 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.48.0.rc1.219.gb6b6757d772
-06:53:22.774248 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-06:53:22.774327 run-command.c:734|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
-06:53:22.774416 git.c:424|d0|main|alias|||||alias:xxx argv:[yyy]
-06:53:22.774473 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
-06:53:22.774477 run-command.c:734|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
-06:53:22.774553 git.c:424|d0|main|alias|||||alias:yyy argv:[version]
-06:53:22.774560 git.c:819|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
-06:53:22.774316 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-06:53:22.776733 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
-06:53:22.776828 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-06:53:22.776845 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:20.298969 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:26:20.299047 run-command.c:734|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
+13:26:20.299137 git.c:424|d0|main|alias|||||alias:xxx argv:[yyy]
+13:26:20.299198 git.c:763|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
+13:26:20.299202 run-command.c:734|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
+13:26:20.299274 git.c:424|d0|main|alias|||||alias:yyy argv:[version]
+13:26:20.299281 git.c:819|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
+13:26:20.299036 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:26:20.311735 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
+13:26:20.311824 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:26:20.311840 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 17 - expect def_params during nested git alias expansion
 
 # passed all 17 test(s)
@@ -28863,10 +28645,10 @@
 	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
 	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
 
-{"event":"region_enter","sid":"20250209T065323.034772Z-Hcf858c9d-P00167333","thread":"main","time":"2025-02-09T06:53:23.035171Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20250209T065323.034772Z-Hcf858c9d-P00167333","thread":"main","time":"2025-02-09T06:53:23.035211Z","file":"progress.c","line":351,"repo":0,"t_rel":0.000041,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"data","sid":"20250209T065323.034772Z-Hcf858c9d-P00167333","thread":"main","time":"2025-02-09T06:53:23.035199Z","file":"progress.c","line":344,"repo":0,"t_abs":0.000612,"t_rel":0.000029,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
-{"event":"data","sid":"20250209T065323.034772Z-Hcf858c9d-P00167333","thread":"main","time":"2025-02-09T06:53:23.035205Z","file":"progress.c","line":348,"repo":0,"t_abs":0.000619,"t_rel":0.000036,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
+{"event":"region_enter","sid":"20260314T132622.172630Z-H5c947e1c-P003dd539","thread":"main","time":"2026-03-14T13:26:22.173007Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20260314T132622.172630Z-H5c947e1c-P003dd539","thread":"main","time":"2026-03-14T13:26:22.173047Z","file":"progress.c","line":351,"repo":0,"t_rel":0.000040,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"data","sid":"20260314T132622.172630Z-H5c947e1c-P003dd539","thread":"main","time":"2026-03-14T13:26:22.173035Z","file":"progress.c","line":344,"repo":0,"t_abs":0.000602,"t_rel":0.000029,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
+{"event":"data","sid":"20260314T132622.172630Z-H5c947e1c-P003dd539","thread":"main","time":"2026-03-14T13:26:22.173042Z","file":"progress.c","line":348,"repo":0,"t_abs":0.000609,"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': 
@@ -28879,8 +28661,8 @@
 		<in 2>stderr &&
 	test_region progress "Working hard" trace-startstop.event
 
-{"event":"region_enter","sid":"20250209T065323.051519Z-Hcf858c9d-P001673ab","thread":"main","time":"2025-02-09T06:53:23.051914Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20250209T065323.051519Z-Hcf858c9d-P001673ab","thread":"main","time":"2025-02-09T06:53:23.051927Z","file":"progress.c","line":351,"repo":0,"t_rel":0.000014,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_enter","sid":"20260314T132622.273839Z-H5c947e1c-P003dd59c","thread":"main","time":"2026-03-14T13:26:22.274211Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20260314T132622.273839Z-H5c947e1c-P003dd59c","thread":"main","time":"2026-03-14T13:26:22.274226Z","file":"progress.c","line":351,"repo":0,"t_rel":0.000015,"nesting":1,"category":"progress","label":"Working hard"}
 ok 13 - progress generates traces: stop / start
 
 expecting success of 0500.14 'progress generates traces: start without stop': 
@@ -28895,7 +28677,7 @@
 	grep region_enter.*progress trace-start.event &&
 	! grep region_leave.*progress trace-start.event
 
-{"event":"region_enter","sid":"20250209T065323.066657Z-Hcf858c9d-P0016740e","thread":"main","time":"2025-02-09T06:53:23.067051Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_enter","sid":"20260314T132622.352171Z-H5c947e1c-P003dd5e8","thread":"main","time":"2026-03-14T13:26:22.352527Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
 ok 14 - progress generates traces: start without stop
 
 expecting success of 0500.15 'progress generates traces: stop without start': 
@@ -28924,14 +28706,500 @@
 	grep region_enter.*progress.*Two trace-2start.event &&
 	! grep region_leave trace-2start.event
 
-{"event":"region_enter","sid":"20250209T065323.089241Z-Hcf858c9d-P001674a3","thread":"main","time":"2025-02-09T06:53:23.089627Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"One"}
-{"event":"region_enter","sid":"20250209T065323.089241Z-Hcf858c9d-P001674a3","thread":"main","time":"2025-02-09T06:53:23.089632Z","file":"progress.c","line":273,"repo":0,"nesting":2,"category":"progress","label":"Two"}
+{"event":"region_enter","sid":"20260314T132622.463219Z-H5c947e1c-P003dd675","thread":"main","time":"2026-03-14T13:26:22.463580Z","file":"progress.c","line":273,"repo":0,"nesting":1,"category":"progress","label":"One"}
+{"event":"region_enter","sid":"20260314T132622.463219Z-H5c947e1c-P003dd675","thread":"main","time":"2026-03-14T13:26:22.463585Z","file":"progress.c","line":273,"repo":0,"nesting":2,"category":"progress","label":"Two"}
 ok 16 - progress generates traces: start with active progress bar (no stops)
 
 # passed all 16 test(s)
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0303-credential-external.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0303-credential-external/.git/
+expecting success of 0303.1 'helper (store) has no existing data': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 1 - helper (store) has no existing data
+
+expecting success of 0303.2 'helper (store) stores password': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		EOF
+	
+ok 2 - helper (store) stores password
+
+expecting success of 0303.3 'helper (store) can retrieve password': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		--
+		EOF
+	
+ok 3 - helper (store) can retrieve password
+
+expecting success of 0303.4 'helper (store) requires matching protocol': 
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=example.com
+		--
+		protocol=http
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://example.com':
+		askpass: Password for 'http://askpass-username@example.com':
+		EOF
+	
+ok 4 - helper (store) requires matching protocol
+
+expecting success of 0303.5 'helper (store) requires matching host': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=other.tld
+		--
+		protocol=https
+		host=other.tld
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://other.tld':
+		askpass: Password for 'https://askpass-username@other.tld':
+		EOF
+	
+ok 5 - helper (store) requires matching host
+
+expecting success of 0303.6 'helper (store) requires matching username': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=other
+		--
+		protocol=https
+		host=example.com
+		username=other
+		password=askpass-password
+		--
+		askpass: Password for 'https://other@example.com':
+		EOF
+	
+ok 6 - helper (store) requires matching username
+
+expecting success of 0303.7 'helper (store) requires matching path': 
+		test_config credential.usehttppath true &&
+		check approve $HELPER <<-\EOF &&
+		protocol=http
+		host=path.tld
+		path=foo.git
+		username=user
+		password=pass
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=path.tld
+		path=bar.git
+		--
+		protocol=http
+		host=path.tld
+		path=bar.git
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://path.tld/bar.git':
+		askpass: Password for 'http://askpass-username@path.tld/bar.git':
+		EOF
+	
+ok 7 - helper (store) requires matching path
+
+expecting success of 0303.8 'helper (store) overwrites on store': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=askpass-password
+		--
+		askpass: Password for 'https://user-overwrite@example.com':
+		EOF
+	
+ok 8 - helper (store) overwrites on store
+
+expecting success of 0303.9 'helper (store) can forget host': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 9 - helper (store) can forget host
+
+expecting success of 0303.10 'helper (store) can store multiple users': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 10 - helper (store) can store multiple users
+
+expecting success of 0303.11 'helper (store) does not erase a password distinct from input': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		--
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+	
+ok 11 - helper (store) does not erase a password distinct from input
+
+expecting success of 0303.12 'helper (store) can forget user': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=askpass-password
+		--
+		askpass: Password for 'https://user1@example.com':
+		EOF
+	
+ok 12 - helper (store) can forget user
+
+expecting success of 0303.13 'helper (store) remembers other user': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 13 - helper (store) remembers other user
+
+expecting success of 0303.14 'helper (store) can store empty username': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=sso.tld
+		--
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+	
+ok 14 - helper (store) can store empty username
+
+expecting success of 0303.15 'helper (store) erases all matching credentials': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase2
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 15 - helper (store) erases all matching credentials
+
+expecting success of 0303.16 'helper (store) not confused by long header': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=victim.example.com
+		username=user
+		password=to-be-stolen
+		EOF
+
+		check fill $HELPER <<-EOF
+		protocol=https
+		host=badguy.example.com
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		protocol=https
+		host=badguy.example.com
+		username=askpass-username
+		password=askpass-password
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		askpass: Username for 'https://badguy.example.com':
+		askpass: Password for 'https://askpass-username@badguy.example.com':
+		EOF
+	
+ok 16 - helper (store) not confused by long header
+
+expecting success of 0303.17 'helper (store) stores password_expiry_utc': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry
+		password=pass
+		password_expiry_utc=9999999999
+		EOF
+	
+ok 17 - helper (store) stores password_expiry_utc
+
+expecting success of 0303.18 'helper (store) gets password_expiry_utc': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry
+		password=pass
+		password_expiry_utc=9999999999
+		--
+		EOF
+	
+ok 18 - helper (store) gets password_expiry_utc
+
+expecting success of 0303.19 'helper (store) overwrites when password_expiry_utc changes': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass1
+		password_expiry_utc=9999999998
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		password_expiry_utc=9999999999
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		password_expiry_utc=9999999999
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=askpass-password
+		--
+		askpass: Password for 'https://user-expiry-overwrite@example.com':
+		EOF
+	
+ok 19 - helper (store) overwrites when password_expiry_utc changes
+
+expecting success of 0303.20 'helper (store) stores oauth_refresh_token': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user4
+		password=pass
+		oauth_refresh_token=xyzzy
+		EOF
+	
+ok 20 - helper (store) stores oauth_refresh_token
+
+expecting success of 0303.21 'helper (store) gets oauth_refresh_token': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user4
+		--
+		protocol=https
+		host=example.com
+		username=user4
+		password=pass
+		oauth_refresh_token=xyzzy
+		--
+		EOF
+	
+ok 21 - helper (store) gets oauth_refresh_token
+
+expecting success of 0303.22 'helper (store) times out': 
+		check approve "$HELPER" <<-\EOF &&
+		protocol=https
+		host=timeout.tld
+		username=user
+		password=pass
+		EOF
+		sleep 2 &&
+		check fill "$HELPER" <<-\EOF
+		protocol=https
+		host=timeout.tld
+		--
+		protocol=https
+		host=timeout.tld
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://timeout.tld':
+		askpass: Password for 'https://askpass-username@timeout.tld':
+		EOF
+	
+ok 22 - helper (store) times out
+
+expecting success of 0303.23 'test cleanup removes everything': 
+		test_must_be_empty "$HOME/.git-credentials"
+	
+ok 23 - test cleanup removes everything
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0300-credentials.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0300-credentials/.git/
 expecting success of 0300.1 'setup helper scripts': 
@@ -29970,6 +30238,1700 @@
 1..53
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0611-reftable-httpd.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0611-reftable-httpd/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0612-reftable-jgit-compatibility.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0612-reftable-jgit-compatibility/.git/
+checking prerequisite: JGIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
+	jgit --version
+
+)
+./test-lib.sh: line 1020: 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0301-credential-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0600-reffiles-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t0600-reffiles-backend/subdir/
+--- subdir.dir	2026-03-14 13:26:28.186677808 +0000
++++ our.dir	2026-03-14 13:26:28.194677808 +0000
+@@ -1 +1 @@
+-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0600-reffiles-backend/subdir
++/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0008-ignores.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0008-ignores/.git/
 expecting success of 0008.1 'setup': 
@@ -34677,377 +36639,1005 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0611-reftable-httpd.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0611-reftable-httpd/.git/
-checking prerequisite: NOT_ROOT
+*** t0601-reffiles-pack-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0601-reffiles-pack-refs/.git/
+expecting success of 0601.1 'enable reflogs': 
+	git config core.logallrefupdates true
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+ok 1 - enable reflogs
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0612-reftable-jgit-compatibility.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0612-reftable-jgit-compatibility/.git/
-checking prerequisite: JGIT
+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)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
-	jgit --version
+[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
 
-)
-t0612-reftable-jgit-compatibility.sh: 7: eval: jgit: not found
-prerequisite JGIT not satisfied
-1..0 # SKIP skipping reftable JGit tests; JGit is not present in PATH
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0602-reffiles-fsck.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/.git/
-expecting success of 0602.1 'ref name should be checked': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	branch_dir_prefix=.git/refs/heads &&
-	tag_dir_prefix=.git/refs/tags &&
-	cd repo &&
+expecting success of 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 commit --allow-empty -m initial &&
-	git checkout -b default-branch &&
-	git tag default-tag &&
-	git tag multi_hierarchy/default-tag &&
+	git pack-refs --prune --all &&
+	test_path_is_file .git/packed-refs &&
+	N=$(find .git/refs -type f) &&
+	test -z "$N"
 
-	cp $branch_dir_prefix/default-branch $branch_dir_prefix/@ &&
-	git refs verify 2>err &&
-	test_must_be_empty err &&
-	rm $branch_dir_prefix/@ &&
+ok 3 - pack-refs --prune --all
 
-	cp $tag_dir_prefix/default-tag $tag_dir_prefix/tag-1.lock &&
-	git refs verify 2>err &&
-	rm $tag_dir_prefix/tag-1.lock &&
-	test_must_be_empty err &&
+expecting success of 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
 
-	cp $tag_dir_prefix/default-tag $tag_dir_prefix/.lock &&
-	test_must_fail git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	error: refs/tags/.lock: badRefName: invalid refname format
-	EOF
-	rm $tag_dir_prefix/.lock &&
-	test_cmp expect err &&
+ok 4 - see if git show-ref works as expected
 
-	for refname in ".refname-starts-with-dot" "~refname-has-stride"
-	do
-		cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname" &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/heads/$refname: badRefName: invalid refname format
-		EOF
-		rm "$branch_dir_prefix/$refname" &&
-		test_cmp expect err || return 1
-	done &&
+expecting success of 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
 
-	for refname in ".refname-starts-with-dot" "~refname-has-stride"
-	do
-		cp $tag_dir_prefix/default-tag "$tag_dir_prefix/$refname" &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/tags/$refname: badRefName: invalid refname format
-		EOF
-		rm "$tag_dir_prefix/$refname" &&
-		test_cmp expect err || return 1
-	done &&
+ok 5 - see if a branch still exists when packed
 
-	for refname in ".refname-starts-with-dot" "~refname-has-stride"
-	do
-		cp $tag_dir_prefix/multi_hierarchy/default-tag "$tag_dir_prefix/multi_hierarchy/$refname" &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/tags/multi_hierarchy/$refname: badRefName: invalid refname format
-		EOF
-		rm "$tag_dir_prefix/multi_hierarchy/$refname" &&
-		test_cmp expect err || return 1
-	done &&
+expecting success of 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
 
-	for refname in ".refname-starts-with-dot" "~refname-has-stride"
-	do
-		mkdir "$branch_dir_prefix/$refname" &&
-		cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname/default-branch" &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/heads/$refname/default-branch: badRefName: invalid refname format
-		EOF
-		rm -r "$branch_dir_prefix/$refname" &&
-		test_cmp expect err || return 1
-	done
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/.git/
-[main (root-commit) 8b2b4f6] initial
- Author: A U Thor <author@example.com>
-Switched to a new branch 'default-branch'
-ok 1 - ref name should be checked
+expecting success of 0601.7 'see if a branch still exists after git pack-refs --prune': 
+	git branch e &&
+	git pack-refs --all --prune &&
+	echo "$SHA1 refs/heads/e" >expect &&
+	git show-ref e >result &&
+	test_cmp expect result
 
-expecting success of 0602.2 'ref name check should be adapted into fsck messages': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	branch_dir_prefix=.git/refs/heads &&
-	cd repo &&
-	git commit --allow-empty -m initial &&
-	git checkout -b branch-1 &&
+ok 7 - see if a branch still exists after git pack-refs --prune
 
-	cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
-	git -c fsck.badRefName=warn refs verify 2>err &&
-	cat >expect <<-EOF &&
-	warning: refs/heads/.branch-1: badRefName: invalid refname format
-	EOF
-	rm $branch_dir_prefix/.branch-1 &&
-	test_cmp expect err &&
+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
 
-	cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
-	git -c fsck.badRefName=ignore refs verify 2>err &&
-	test_must_be_empty err
+ok 8 - see if git pack-refs --prune remove ref files
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/.git/
-[main (root-commit) 8b2b4f6] initial
- Author: A U Thor <author@example.com>
-Switched to a new branch 'branch-1'
-ok 2 - ref name check should be adapted into fsck messages
+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
 
-expecting success of 0602.3 'ref name check should work for multiple worktrees': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+ok 9 - see if git pack-refs --prune removes empty dirs
 
-	cd repo &&
-	test_commit initial &&
-	git checkout -b branch-1 &&
-	test_commit second &&
-	git checkout -b branch-2 &&
-	test_commit third &&
-	git checkout -b branch-3 &&
-	git worktree add ./worktree-1 branch-1 &&
-	git worktree add ./worktree-2 branch-2 &&
-	worktree1_refdir_prefix=.git/worktrees/worktree-1/refs/worktree &&
-	worktree2_refdir_prefix=.git/worktrees/worktree-2/refs/worktree &&
+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
 
-	(
-		cd worktree-1 &&
-		git update-ref refs/worktree/branch-4 refs/heads/branch-3
-	) &&
-	(
-		cd worktree-2 &&
-		git update-ref refs/worktree/branch-4 refs/heads/branch-3
-	) &&
+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
 
-	cp $worktree1_refdir_prefix/branch-4 $worktree1_refdir_prefix/' branch-5' &&
-	cp $worktree2_refdir_prefix/branch-4 $worktree2_refdir_prefix/'~branch-6' &&
+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
 
-	test_must_fail git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	error: worktrees/worktree-1/refs/worktree/ branch-5: badRefName: invalid refname format
-	error: worktrees/worktree-2/refs/worktree/~branch-6: badRefName: invalid refname format
-	EOF
-	sort err >sorted_err &&
-	test_cmp expect sorted_err &&
+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
 
-	for worktree in "worktree-1" "worktree-2"
-	do
-		(
-			cd $worktree &&
-			test_must_fail git refs verify 2>err &&
-			cat >expect <<-EOF &&
-			error: worktrees/worktree-1/refs/worktree/ branch-5: badRefName: invalid refname format
-			error: worktrees/worktree-2/refs/worktree/~branch-6: badRefName: invalid refname format
-			EOF
-			sort err >sorted_err &&
-			test_cmp expect sorted_err || return 1
-		)
-	done
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/repo/.git/
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'branch-1'
-[branch-1 d0dd942] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-Switched to a new branch 'branch-2'
-[branch-2 3371f0b] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-Switched to a new branch 'branch-3'
-Preparing worktree (checking out 'branch-1')
-HEAD is now at d0dd942 second
-Preparing worktree (checking out 'branch-2')
-HEAD is now at 3371f0b third
-ok 3 - ref name check should work for multiple worktrees
+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 0602.4 'regular ref content should be checked (individual)': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	branch_dir_prefix=.git/refs/heads &&
-	cd repo &&
-	test_commit default &&
-	mkdir -p "$branch_dir_prefix/a/b" &&
+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
 
-	git refs verify 2>err &&
-	test_must_be_empty err &&
+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
 
-	for bad_content in "$(git rev-parse main)x" "xfsazqfxcadas" "Xfsazqfxcadas"
-	do
-		printf "%s" $bad_content >$branch_dir_prefix/branch-bad &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/heads/branch-bad: badRefContent: $bad_content
-		EOF
-		rm $branch_dir_prefix/branch-bad &&
-		test_cmp expect err || return 1
-	done &&
+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
 
-	for bad_content in "$(git rev-parse main)x" "xfsazqfxcadas" "Xfsazqfxcadas"
-	do
-		printf "%s" $bad_content >$branch_dir_prefix/a/b/branch-bad &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/heads/a/b/branch-bad: badRefContent: $bad_content
-		EOF
-		rm $branch_dir_prefix/a/b/branch-bad &&
-		test_cmp expect err || return 1
-	done &&
+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
 
-	printf "%s" "$(git rev-parse main)" >$branch_dir_prefix/branch-no-newline &&
-	git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	warning: refs/heads/branch-no-newline: refMissingNewline: misses LF at the end
-	EOF
-	rm $branch_dir_prefix/branch-no-newline &&
-	test_cmp expect err &&
+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
 
-	for trailing_content in " garbage" "    more garbage"
-	do
-		printf "%s" "$(git rev-parse main)$trailing_content" >$branch_dir_prefix/branch-garbage &&
-		git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		warning: refs/heads/branch-garbage: trailingRefContent: has trailing garbage: '$trailing_content'
-		EOF
-		rm $branch_dir_prefix/branch-garbage &&
-		test_cmp expect err || return 1
-	done &&
+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
 
-	printf "%s\n\n\n" "$(git rev-parse main)" >$branch_dir_prefix/branch-garbage-special &&
-	git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	warning: refs/heads/branch-garbage-special: trailingRefContent: has trailing garbage: '
+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
 
-	'
-	EOF
-	rm $branch_dir_prefix/branch-garbage-special &&
-	test_cmp expect err &&
+ok 19 - see if up-to-date packed refs are preserved
 
-	printf "%s\n\n\n  garbage" "$(git rev-parse main)" >$branch_dir_prefix/branch-garbage-special &&
-	git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	warning: refs/heads/branch-garbage-special: trailingRefContent: has trailing garbage: '
+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
 
-	  garbage'
-	EOF
-	rm $branch_dir_prefix/branch-garbage-special &&
-	test_cmp expect err
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/repo/repo/.git/
-[main (root-commit) c5ea02d] default
+[main 6d2fc87] soon to be garbage-collected
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default.t
-ok 4 - regular ref content should be checked (individual)
+HEAD is now at 2daebe9 Initial commit.
+ok 21 - explicit pack-refs with dangling packed reference
 
-expecting success of 0602.5 'regular ref content should be checked (aggregate)': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	branch_dir_prefix=.git/refs/heads &&
-	tag_dir_prefix=.git/refs/tags &&
-	cd repo &&
-	test_commit default &&
-	mkdir -p "$branch_dir_prefix/a/b" &&
+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
 
-	bad_content_1=$(git rev-parse main)x &&
-	bad_content_2=xfsazqfxcadas &&
-	bad_content_3=Xfsazqfxcadas &&
-	printf "%s" $bad_content_1 >$tag_dir_prefix/tag-bad-1 &&
-	printf "%s" $bad_content_2 >$tag_dir_prefix/tag-bad-2 &&
-	printf "%s" $bad_content_3 >$branch_dir_prefix/a/b/branch-bad &&
-	printf "%s" "$(git rev-parse main)" >$branch_dir_prefix/branch-no-newline &&
-	printf "%s garbage" "$(git rev-parse main)" >$branch_dir_prefix/branch-garbage &&
+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
 
-	test_must_fail git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	error: refs/heads/a/b/branch-bad: badRefContent: $bad_content_3
-	error: refs/tags/tag-bad-1: badRefContent: $bad_content_1
-	error: refs/tags/tag-bad-2: badRefContent: $bad_content_2
-	warning: refs/heads/branch-garbage: trailingRefContent: has trailing garbage: ' garbage'
-	warning: refs/heads/branch-no-newline: refMissingNewline: misses LF at the end
-	EOF
-	sort err >sorted_err &&
-	test_cmp expect sorted_err
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/repo/repo/repo/.git/
-[main (root-commit) d808a9b] default
+[main ce057e0] future garbage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default.t
-ok 5 - regular ref content should be checked (aggregate)
+HEAD is now at 2daebe9 Initial commit.
+Deleted branch lamb (was 2daebe9).
+ok 23 - delete ref while another dangling packed ref
 
-expecting success of 0602.6 'textual symref content should be checked (individual)': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	branch_dir_prefix=.git/refs/heads &&
-	cd repo &&
-	test_commit default &&
-	mkdir -p "$branch_dir_prefix/a/b" &&
+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
 
-	for good_referent in "refs/heads/branch" "HEAD"
-	do
-		printf "ref: %s\n" $good_referent >$branch_dir_prefix/branch-good &&
-		git refs verify 2>err &&
-		rm $branch_dir_prefix/branch-good &&
-		test_must_be_empty err || return 1
-	done &&
+2daebe96d7fd03d28875d852f87c06a18f4a6639 refs/top
+ok 24 - pack ref directly below refs/
 
-	for bad_referent in "refs/heads/.branch" "refs/heads/~branch" "refs/heads/?branch"
-	do
-		printf "ref: %s\n" $bad_referent >$branch_dir_prefix/branch-bad &&
-		test_must_fail git refs verify 2>err &&
-		cat >expect <<-EOF &&
-		error: refs/heads/branch-bad: badReferentName: points to invalid refname '$bad_referent'
-		EOF
-		rm $branch_dir_prefix/branch-bad &&
-		test_cmp expect err || return 1
-	done &&
+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
 
-	printf "ref: refs/heads/branch" >$branch_dir_prefix/branch-no-newline &&
-	git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	warning: refs/heads/branch-no-newline: refMissingNewline: misses LF at the end
-	EOF
-	rm $branch_dir_prefix/branch-no-newline &&
-	test_cmp expect err &&
+ok 25 - do not pack ref in refs/bisect
 
-	printf "ref: refs/heads/branch     " >$branch_dir_prefix/a/b/branch-trailing-1 &&
-	git refs verify 2>err &&
-	cat >expect <<-EOF &&
-	warning: refs/heads/a/b/branch-trailing-1: refMissingNewline: misses LF at the end
-	warning: refs/heads/a/b/branch-trailing-1: trailingRefContent: has trailing whitespaces or newlines
-	EOF
-	rm $branch_dir_prefix/a/b/branch-trailing-1 &&
-	test_cmp expect err &&
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0602-reffiles-fsck.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/.git/
+expecting success of 0602.1 'ref name should be checked': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	branch_dir_prefix=.git/refs/heads &&
+	tag_dir_prefix=.git/refs/tags &&
+	cd repo &&
+
+	git commit --allow-empty -m initial &&
+	git checkout -b default-branch &&
+	git tag default-tag &&
+	git tag multi_hierarchy/default-tag &&
+
+	cp $branch_dir_prefix/default-branch $branch_dir_prefix/@ &&
+	git refs verify 2>err &&
+	test_must_be_empty err &&
+	rm $branch_dir_prefix/@ &&
+
+	cp $tag_dir_prefix/default-tag $tag_dir_prefix/tag-1.lock &&
+	git refs verify 2>err &&
+	rm $tag_dir_prefix/tag-1.lock &&
+	test_must_be_empty err &&
+
+	cp $tag_dir_prefix/default-tag $tag_dir_prefix/.lock &&
+	test_must_fail git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	error: refs/tags/.lock: badRefName: invalid refname format
+	EOF
+	rm $tag_dir_prefix/.lock &&
+	test_cmp expect err &&
+
+	for refname in ".refname-starts-with-dot" "~refname-has-stride"
+	do
+		cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname" &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/heads/$refname: badRefName: invalid refname format
+		EOF
+		rm "$branch_dir_prefix/$refname" &&
+		test_cmp expect err || return 1
+	done &&
+
+	for refname in ".refname-starts-with-dot" "~refname-has-stride"
+	do
+		cp $tag_dir_prefix/default-tag "$tag_dir_prefix/$refname" &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/tags/$refname: badRefName: invalid refname format
+		EOF
+		rm "$tag_dir_prefix/$refname" &&
+		test_cmp expect err || return 1
+	done &&
+
+	for refname in ".refname-starts-with-dot" "~refname-has-stride"
+	do
+		cp $tag_dir_prefix/multi_hierarchy/default-tag "$tag_dir_prefix/multi_hierarchy/$refname" &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/tags/multi_hierarchy/$refname: badRefName: invalid refname format
+		EOF
+		rm "$tag_dir_prefix/multi_hierarchy/$refname" &&
+		test_cmp expect err || return 1
+	done &&
+
+	for refname in ".refname-starts-with-dot" "~refname-has-stride"
+	do
+		mkdir "$branch_dir_prefix/$refname" &&
+		cp $branch_dir_prefix/default-branch "$branch_dir_prefix/$refname/default-branch" &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/heads/$refname/default-branch: badRefName: invalid refname format
+		EOF
+		rm -r "$branch_dir_prefix/$refname" &&
+		test_cmp expect err || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/.git/
+[main (root-commit) 8b2b4f6] initial
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'default-branch'
+ok 1 - ref name should be checked
+
+expecting success of 0602.2 'ref name check should be adapted into fsck messages': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	branch_dir_prefix=.git/refs/heads &&
+	cd repo &&
+	git commit --allow-empty -m initial &&
+	git checkout -b branch-1 &&
+
+	cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
+	git -c fsck.badRefName=warn refs verify 2>err &&
+	cat >expect <<-EOF &&
+	warning: refs/heads/.branch-1: badRefName: invalid refname format
+	EOF
+	rm $branch_dir_prefix/.branch-1 &&
+	test_cmp expect err &&
+
+	cp $branch_dir_prefix/branch-1 $branch_dir_prefix/.branch-1 &&
+	git -c fsck.badRefName=ignore refs verify 2>err &&
+	test_must_be_empty err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/.git/
+[main (root-commit) 8b2b4f6] initial
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'branch-1'
+ok 2 - ref name check should be adapted into fsck messages
+
+expecting success of 0602.3 'ref name check should work for multiple worktrees': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+
+	cd repo &&
+	test_commit initial &&
+	git checkout -b branch-1 &&
+	test_commit second &&
+	git checkout -b branch-2 &&
+	test_commit third &&
+	git checkout -b branch-3 &&
+	git worktree add ./worktree-1 branch-1 &&
+	git worktree add ./worktree-2 branch-2 &&
+	worktree1_refdir_prefix=.git/worktrees/worktree-1/refs/worktree &&
+	worktree2_refdir_prefix=.git/worktrees/worktree-2/refs/worktree &&
+
+	(
+		cd worktree-1 &&
+		git update-ref refs/worktree/branch-4 refs/heads/branch-3
+	) &&
+	(
+		cd worktree-2 &&
+		git update-ref refs/worktree/branch-4 refs/heads/branch-3
+	) &&
+
+	cp $worktree1_refdir_prefix/branch-4 $worktree1_refdir_prefix/' branch-5' &&
+	cp $worktree2_refdir_prefix/branch-4 $worktree2_refdir_prefix/'~branch-6' &&
+
+	test_must_fail git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	error: worktrees/worktree-1/refs/worktree/ branch-5: badRefName: invalid refname format
+	error: worktrees/worktree-2/refs/worktree/~branch-6: badRefName: invalid refname format
+	EOF
+	sort err >sorted_err &&
+	test_cmp expect sorted_err &&
+
+	for worktree in "worktree-1" "worktree-2"
+	do
+		(
+			cd $worktree &&
+			test_must_fail git refs verify 2>err &&
+			cat >expect <<-EOF &&
+			error: worktrees/worktree-1/refs/worktree/ branch-5: badRefName: invalid refname format
+			error: worktrees/worktree-2/refs/worktree/~branch-6: badRefName: invalid refname format
+			EOF
+			sort err >sorted_err &&
+			test_cmp expect sorted_err || return 1
+		)
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/repo/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'branch-1'
+[branch-1 d0dd942] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+Switched to a new branch 'branch-2'
+[branch-2 3371f0b] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+Switched to a new branch 'branch-3'
+Preparing worktree (checking out 'branch-1')
+HEAD is now at d0dd942 second
+Preparing worktree (checking out 'branch-2')
+HEAD is now at 3371f0b third
+ok 3 - ref name check should work for multiple worktrees
+
+expecting success of 0602.4 'regular ref content should be checked (individual)': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	branch_dir_prefix=.git/refs/heads &&
+	cd repo &&
+	test_commit default &&
+	mkdir -p "$branch_dir_prefix/a/b" &&
+
+	git refs verify 2>err &&
+	test_must_be_empty err &&
+
+	for bad_content in "$(git rev-parse main)x" "xfsazqfxcadas" "Xfsazqfxcadas"
+	do
+		printf "%s" $bad_content >$branch_dir_prefix/branch-bad &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/heads/branch-bad: badRefContent: $bad_content
+		EOF
+		rm $branch_dir_prefix/branch-bad &&
+		test_cmp expect err || return 1
+	done &&
+
+	for bad_content in "$(git rev-parse main)x" "xfsazqfxcadas" "Xfsazqfxcadas"
+	do
+		printf "%s" $bad_content >$branch_dir_prefix/a/b/branch-bad &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/heads/a/b/branch-bad: badRefContent: $bad_content
+		EOF
+		rm $branch_dir_prefix/a/b/branch-bad &&
+		test_cmp expect err || return 1
+	done &&
+
+	printf "%s" "$(git rev-parse main)" >$branch_dir_prefix/branch-no-newline &&
+	git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	warning: refs/heads/branch-no-newline: refMissingNewline: misses LF at the end
+	EOF
+	rm $branch_dir_prefix/branch-no-newline &&
+	test_cmp expect err &&
+
+	for trailing_content in " garbage" "    more garbage"
+	do
+		printf "%s" "$(git rev-parse main)$trailing_content" >$branch_dir_prefix/branch-garbage &&
+		git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		warning: refs/heads/branch-garbage: trailingRefContent: has trailing garbage: '$trailing_content'
+		EOF
+		rm $branch_dir_prefix/branch-garbage &&
+		test_cmp expect err || return 1
+	done &&
+
+	printf "%s\n\n\n" "$(git rev-parse main)" >$branch_dir_prefix/branch-garbage-special &&
+	git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	warning: refs/heads/branch-garbage-special: trailingRefContent: has trailing garbage: '
+
+
+	'
+	EOF
+	rm $branch_dir_prefix/branch-garbage-special &&
+	test_cmp expect err &&
+
+	printf "%s\n\n\n  garbage" "$(git rev-parse main)" >$branch_dir_prefix/branch-garbage-special &&
+	git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	warning: refs/heads/branch-garbage-special: trailingRefContent: has trailing garbage: '
+
+
+	  garbage'
+	EOF
+	rm $branch_dir_prefix/branch-garbage-special &&
+	test_cmp expect err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/repo/repo/.git/
+[main (root-commit) c5ea02d] default
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default.t
+ok 4 - regular ref content should be checked (individual)
+
+expecting success of 0602.5 'regular ref content should be checked (aggregate)': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	branch_dir_prefix=.git/refs/heads &&
+	tag_dir_prefix=.git/refs/tags &&
+	cd repo &&
+	test_commit default &&
+	mkdir -p "$branch_dir_prefix/a/b" &&
+
+	bad_content_1=$(git rev-parse main)x &&
+	bad_content_2=xfsazqfxcadas &&
+	bad_content_3=Xfsazqfxcadas &&
+	printf "%s" $bad_content_1 >$tag_dir_prefix/tag-bad-1 &&
+	printf "%s" $bad_content_2 >$tag_dir_prefix/tag-bad-2 &&
+	printf "%s" $bad_content_3 >$branch_dir_prefix/a/b/branch-bad &&
+	printf "%s" "$(git rev-parse main)" >$branch_dir_prefix/branch-no-newline &&
+	printf "%s garbage" "$(git rev-parse main)" >$branch_dir_prefix/branch-garbage &&
+
+	test_must_fail git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	error: refs/heads/a/b/branch-bad: badRefContent: $bad_content_3
+	error: refs/tags/tag-bad-1: badRefContent: $bad_content_1
+	error: refs/tags/tag-bad-2: badRefContent: $bad_content_2
+	warning: refs/heads/branch-garbage: trailingRefContent: has trailing garbage: ' garbage'
+	warning: refs/heads/branch-no-newline: refMissingNewline: misses LF at the end
+	EOF
+	sort err >sorted_err &&
+	test_cmp expect sorted_err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0602-reffiles-fsck/repo/repo/repo/repo/repo/.git/
+[main (root-commit) d808a9b] default
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default.t
+ok 5 - regular ref content should be checked (aggregate)
+
+expecting success of 0602.6 'textual symref content should be checked (individual)': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	branch_dir_prefix=.git/refs/heads &&
+	cd repo &&
+	test_commit default &&
+	mkdir -p "$branch_dir_prefix/a/b" &&
+
+	for good_referent in "refs/heads/branch" "HEAD"
+	do
+		printf "ref: %s\n" $good_referent >$branch_dir_prefix/branch-good &&
+		git refs verify 2>err &&
+		rm $branch_dir_prefix/branch-good &&
+		test_must_be_empty err || return 1
+	done &&
+
+	for bad_referent in "refs/heads/.branch" "refs/heads/~branch" "refs/heads/?branch"
+	do
+		printf "ref: %s\n" $bad_referent >$branch_dir_prefix/branch-bad &&
+		test_must_fail git refs verify 2>err &&
+		cat >expect <<-EOF &&
+		error: refs/heads/branch-bad: badReferentName: points to invalid refname '$bad_referent'
+		EOF
+		rm $branch_dir_prefix/branch-bad &&
+		test_cmp expect err || return 1
+	done &&
+
+	printf "ref: refs/heads/branch" >$branch_dir_prefix/branch-no-newline &&
+	git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	warning: refs/heads/branch-no-newline: refMissingNewline: misses LF at the end
+	EOF
+	rm $branch_dir_prefix/branch-no-newline &&
+	test_cmp expect err &&
+
+	printf "ref: refs/heads/branch     " >$branch_dir_prefix/a/b/branch-trailing-1 &&
+	git refs verify 2>err &&
+	cat >expect <<-EOF &&
+	warning: refs/heads/a/b/branch-trailing-1: refMissingNewline: misses LF at the end
+	warning: refs/heads/a/b/branch-trailing-1: trailingRefContent: has trailing whitespaces or newlines
+	EOF
+	rm $branch_dir_prefix/a/b/branch-trailing-1 &&
+	test_cmp expect err &&
 
 	printf "ref: refs/heads/branch\n\n" >$branch_dir_prefix/a/b/branch-trailing-2 &&
 	git refs verify 2>err &&
@@ -35397,6 +37987,44 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1003-read-tree-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t0613-reftable-write-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0613-reftable-write-options/.git/
 expecting success of 0613.1 'default write options': 
@@ -35742,1823 +38370,1891 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0303-credential-external.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0303-credential-external/.git/
-expecting success of 0303.1 'helper (store) has no existing data': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
-	
-ok 1 - helper (store) has no existing data
+*** t1005-read-tree-reset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1005-read-tree-reset/.git/
+expecting success of 1005.1 'setup': 
+	git init &&
+	mkdir df &&
+	echo content >df/file &&
+	git add df/file &&
+	git commit -m one &&
+	git ls-files >expect &&
+	rm -rf df &&
+	echo content >df &&
+	git add df &&
+	echo content >new &&
+	git add new &&
+	git commit -m two
 
-expecting success of 0303.2 'helper (store) stores password': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		EOF
-	
-ok 2 - helper (store) stores password
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1005-read-tree-reset/.git/
+[master (root-commit) 92e0c46] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 df/file
+[master 12f5e11] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename df/file => df (100%)
+ create mode 100644 new
+ok 1 - setup
 
-expecting success of 0303.3 'helper (store) can retrieve password': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		--
-		EOF
-	
-ok 3 - helper (store) can retrieve password
+expecting success of 1005.2 'reset should work': 
+	read_tree_u_must_succeed -u --reset HEAD^ &&
+	git ls-files >actual &&
+	test_cmp expect actual
 
-expecting success of 0303.4 'helper (store) requires matching protocol': 
-		check fill $HELPER <<-\EOF
-		protocol=http
-		host=example.com
-		--
-		protocol=http
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'http://example.com':
-		askpass: Password for 'http://askpass-username@example.com':
-		EOF
-	
-ok 4 - helper (store) requires matching protocol
+ok 2 - reset should work
 
-expecting success of 0303.5 'helper (store) requires matching host': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=other.tld
-		--
-		protocol=https
-		host=other.tld
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://other.tld':
-		askpass: Password for 'https://askpass-username@other.tld':
-		EOF
-	
-ok 5 - helper (store) requires matching host
+expecting success of 1005.3 'reset should remove remnants from a failed merge': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
 
-expecting success of 0303.6 'helper (store) requires matching username': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=other
-		--
-		protocol=https
-		host=example.com
-		username=other
-		password=askpass-password
-		--
-		askpass: Password for 'https://other@example.com':
-		EOF
-	
-ok 6 - helper (store) requires matching username
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 3 - reset should remove remnants from a failed merge
 
-expecting success of 0303.7 'helper (store) requires matching path': 
-		test_config credential.usehttppath true &&
-		check approve $HELPER <<-\EOF &&
-		protocol=http
-		host=path.tld
-		path=foo.git
-		username=user
-		password=pass
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=http
-		host=path.tld
-		path=bar.git
-		--
-		protocol=http
-		host=path.tld
-		path=bar.git
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'http://path.tld/bar.git':
-		askpass: Password for 'http://askpass-username@path.tld/bar.git':
-		EOF
-	
-ok 7 - helper (store) requires matching path
+expecting success of 1005.4 'two-way reset should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	read_tree_u_must_succeed --reset -u HEAD HEAD &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
 
-expecting success of 0303.8 'helper (store) overwrites on store': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=askpass-password
-		--
-		askpass: Password for 'https://user-overwrite@example.com':
-		EOF
-	
-ok 8 - helper (store) overwrites on store
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 4 - two-way reset should remove remnants too
 
-expecting success of 0303.9 'helper (store) can forget host': 
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
+expecting success of 1005.5 'Porcelain reset should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git reset --hard &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+HEAD is now at 12f5e11 two
+ok 5 - Porcelain reset should remove remnants too
+
+expecting success of 1005.6 'Porcelain checkout -f should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git checkout -f &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 6 - Porcelain checkout -f should remove remnants too
+
+expecting success of 1005.7 'Porcelain checkout -f HEAD should remove remnants too': 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git checkout -f HEAD &&
+	git ls-files -s >actual &&
+	! test -f old &&
+	test_cmp expect actual
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 7 - Porcelain checkout -f HEAD should remove remnants too
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1007-hash-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1007-hash-object/.git/
+expecting success of 1007.1 'setup': 
+	setup_repo &&
+	test_oid_cache <<-EOF
+	hello sha1:5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	hello sha256:1e3b6c04d2eeb2b3e45c8a330445404c0b7cc7b257e2b097167d26f5230090c4
+
+	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
+	EOF
+
+ok 1 - setup
+
+expecting success of 1007.2 'multiple '--stdin's are rejected': 
+	echo example | test_must_fail git hash-object --stdin --stdin
+
+error: Multiple --stdin arguments are not supported
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+ok 2 - multiple '--stdin's are rejected
+
+expecting success of 1007.3 'Can't use --stdin and --stdin-paths together': 
+	echo example | test_must_fail git hash-object --stdin --stdin-paths &&
+	echo example | test_must_fail git hash-object --stdin-paths --stdin
+
+error: Can't use --stdin-paths with --stdin
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+error: Can't use --stdin-paths with --stdin
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+ok 3 - Can't use --stdin and --stdin-paths together
+
+expecting success of 1007.4 'Can't pass filenames as arguments with --stdin-paths': 
+	echo example | test_must_fail git hash-object --stdin-paths hello
+
+error: Can't specify files with --stdin-paths
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+ok 4 - Can't pass filenames as arguments with --stdin-paths
+
+expecting success of 1007.5 'Can't use --path with --stdin-paths': 
+	echo example | test_must_fail git hash-object --stdin-paths --path=foo
+
+error: Can't use --stdin-paths with --path
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+ok 5 - Can't use --path with --stdin-paths
+
+expecting success of 1007.6 'Can't use --path with --no-filters': 
+	test_must_fail git hash-object --no-filters --path=foo
+
+error: Can't use --path with --no-filters
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+ok 6 - Can't use --path with --no-filters
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.7 'hash a file': 
+	test "$(test_oid hello)" = $(git hash-object hello)
+
+ok 7 - hash a file
+
+expecting success of 1007.8 'blob does not exist in database': 
+		test_must_fail git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
 	
-ok 9 - helper (store) can forget host
+fatal: git cat-file 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689: bad file
+ok 8 - blob does not exist in database
 
-expecting success of 0303.10 'helper (store) can store multiple users': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		--
-		protocol=https
-		host=example.com
-		username=user1
-		password=pass1
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user2
-		--
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
+expecting success of 1007.9 'hash from stdin': 
+	test "$(test_oid example)" = $(git hash-object --stdin < example)
+
+ok 9 - hash from stdin
+
+expecting success of 1007.10 'blob does not exist in database': 
+		test_must_fail git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 10 - helper (store) can store multiple users
+fatal: git cat-file ddd3f836d3e3fbb7ae289aa9ae83536f76956399: bad file
+ok 10 - blob does not exist in database
 
-expecting success of 0303.11 'helper (store) does not erase a password distinct from input': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass1
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		--
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass1
-		EOF
+expecting success of 1007.11 'hash a file and write to database': 
+	test "$(test_oid hello)" = $(git hash-object -w hello)
+
+ok 11 - hash a file and write to database
+
+expecting success of 1007.12 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
 	
-ok 11 - helper (store) does not erase a password distinct from input
+Hello Worldok 12 - blob exists in database
 
-expecting success of 0303.12 'helper (store) can forget user': 
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user1
-		--
-		protocol=https
-		host=example.com
-		username=user1
-		password=askpass-password
-		--
-		askpass: Password for 'https://user1@example.com':
-		EOF
+expecting success of 1007.13 'git hash-object --stdin file1 <file0 first operates on file0, then file1': 
+	echo foo > file1 &&
+	obname0=$(echo bar | git hash-object --stdin) &&
+	obname1=$(git hash-object file1) &&
+	obname0new=$(echo bar | git hash-object --stdin file1 | sed -n -e 1p) &&
+	obname1new=$(echo bar | git hash-object --stdin file1 | sed -n -e 2p) &&
+	test "$obname0" = "$obname0new" &&
+	test "$obname1" = "$obname1new"
+
+ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
+
+expecting success of 1007.14 'set up crlf tests': 
+	echo fooQ | tr Q "\\015" >file0 &&
+	cp file0 file1 &&
+	echo "file0 -crlf" >.gitattributes &&
+	echo "file1 crlf" >>.gitattributes &&
+	git config core.autocrlf true &&
+	file0_sha=$(git hash-object file0) &&
+	file1_sha=$(git hash-object file1) &&
+	test "$file0_sha" != "$file1_sha"
+
+ok 14 - set up crlf tests
+
+expecting success of 1007.15 'check that appropriate filter is invoke when --path is used': 
+	path1_sha=$(git hash-object --path=file1 file0) &&
+	path0_sha=$(git hash-object --path=file0 file1) &&
+	test "$file0_sha" = "$path0_sha" &&
+	test "$file1_sha" = "$path1_sha" &&
+	path1_sha=$(git hash-object --path=file1 --stdin <file0) &&
+	path0_sha=$(git hash-object --path=file0 --stdin <file1) &&
+	test "$file0_sha" = "$path0_sha" &&
+	test "$file1_sha" = "$path1_sha"
+
+ok 15 - check that appropriate filter is invoke when --path is used
+
+expecting success of 1007.16 'gitattributes also work in a subdirectory': 
+	mkdir subdir &&
+	(
+		cd subdir &&
+		subdir_sha0=$(git hash-object ../file0) &&
+		subdir_sha1=$(git hash-object ../file1) &&
+		test "$file0_sha" = "$subdir_sha0" &&
+		test "$file1_sha" = "$subdir_sha1"
+	)
+
+ok 16 - gitattributes also work in a subdirectory
+
+expecting success of 1007.17 '--path works in a subdirectory': 
+	(
+		cd subdir &&
+		path1_sha=$(git hash-object --path=../file1 ../file0) &&
+		path0_sha=$(git hash-object --path=../file0 ../file1) &&
+		test "$file0_sha" = "$path0_sha" &&
+		test "$file1_sha" = "$path1_sha"
+	)
+
+ok 17 - --path works in a subdirectory
+
+expecting success of 1007.18 'check that --no-filters option works': 
+	nofilters_file1=$(git hash-object --no-filters file1) &&
+	test "$file0_sha" = "$nofilters_file1" &&
+	nofilters_file1=$(git hash-object --stdin <file1) &&
+	test "$file0_sha" = "$nofilters_file1"
+
+ok 18 - check that --no-filters option works
+
+expecting success of 1007.19 'check that --no-filters option works with --stdin-paths': 
+	nofilters_file1=$(echo "file1" | git hash-object --stdin-paths --no-filters) &&
+	test "$file0_sha" = "$nofilters_file1"
+
+ok 19 - check that --no-filters option works with --stdin-paths
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 12 - helper (store) can forget user
+ok 20 - hash from stdin and write to database (-w --stdin)
 
-expecting success of 0303.13 'helper (store) remembers other user': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user2
-		--
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
+expecting success of 1007.21 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 13 - helper (store) remembers other user
+This is an exampleok 21 - blob exists in database
 
-expecting success of 0303.14 'helper (store) can store empty username': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=sso.tld
-		username=
-		password=
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=sso.tld
-		--
-		protocol=https
-		host=sso.tld
-		username=
-		password=
-		EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 14 - helper (store) can store empty username
+ok 22 - hash from stdin and write to database (--stdin -w)
 
-expecting success of 0303.15 'helper (store) erases all matching credentials': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-erase1
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-erase2
-		password=pass1
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
+expecting success of 1007.23 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 15 - helper (store) erases all matching credentials
+This is an exampleok 23 - blob exists in database
 
-expecting success of 0303.16 'helper (store) not confused by long header': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=victim.example.com
-		username=user
-		password=to-be-stolen
-		EOF
+expecting success of 1007.24 'hash two files with names on stdin': 
+	test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
 
-		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
+ok 24 - hash two files with names on stdin
 
-expecting success of 0303.17 'helper (store) stores password_expiry_utc': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-expiry
-		password=pass
-		password_expiry_utc=9999999999
-		EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 17 - helper (store) stores password_expiry_utc
+ok 25 - hash two files with names on stdin and write to database (-w --stdin-paths)
 
-expecting success of 0303.18 'helper (store) gets password_expiry_utc': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-expiry
-		--
-		protocol=https
-		host=example.com
-		username=user-expiry
-		password=pass
-		password_expiry_utc=9999999999
-		--
-		EOF
+expecting success of 1007.26 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
 	
-ok 18 - helper (store) gets password_expiry_utc
+Hello Worldok 26 - blob exists in database
 
-expecting success of 0303.19 'helper (store) overwrites when password_expiry_utc changes': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass1
-		password_expiry_utc=9999999998
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass2
-		password_expiry_utc=9999999999
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass2
-		password_expiry_utc=9999999999
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=askpass-password
-		--
-		askpass: Password for 'https://user-expiry-overwrite@example.com':
-		EOF
+expecting success of 1007.27 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 19 - helper (store) overwrites when password_expiry_utc changes
+This is an exampleok 27 - blob exists in database
 
-expecting success of 0303.20 'helper (store) stores oauth_refresh_token': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user4
-		password=pass
-		oauth_refresh_token=xyzzy
-		EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 20 - helper (store) stores oauth_refresh_token
+ok 28 - hash two files with names on stdin and write to database (--stdin-paths -w)
 
-expecting success of 0303.21 'helper (store) gets oauth_refresh_token': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user4
-		--
-		protocol=https
-		host=example.com
-		username=user4
-		password=pass
-		oauth_refresh_token=xyzzy
-		--
-		EOF
+expecting success of 1007.29 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
 	
-ok 21 - helper (store) gets oauth_refresh_token
+Hello Worldok 29 - blob exists in database
 
-expecting success of 0303.22 'helper (store) times out': 
-		check approve "$HELPER" <<-\EOF &&
-		protocol=https
-		host=timeout.tld
-		username=user
-		password=pass
-		EOF
-		sleep 2 &&
-		check fill "$HELPER" <<-\EOF
-		protocol=https
-		host=timeout.tld
-		--
-		protocol=https
-		host=timeout.tld
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://timeout.tld':
-		askpass: Password for 'https://askpass-username@timeout.tld':
-		EOF
+expecting success of 1007.30 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 22 - helper (store) times out
+This is an exampleok 30 - blob exists in database
 
-expecting success of 0303.23 'test cleanup removes everything': 
-		test_must_be_empty "$HOME/.git-credentials"
-	
-ok 23 - test cleanup removes everything
+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
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0000-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0000-basic/.git/
-expecting success of 0000.1 'verify that the running shell supports "local"': 
-	x="notlocal" &&
-	y="alsonotlocal" &&
-	echo "local alsolocal" >expected1 &&
-	try_local_xy >actual1 &&
-	test_cmp expected1 actual1 &&
-	echo "notlocal alsonotlocal" >expected2 &&
-	echo "$x $y" >actual2 &&
-	test_cmp expected2 actual2
+error: too-short tree object
+ok 31 - too-short tree
 
-ok 1 - verify that the running shell supports "local"
+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
 
-expecting success of 0000.2 '.git/objects should be empty after git init in an empty repo': 
-	find .git/objects -type f -print >should-be-empty &&
-	test_line_count = 0 should-be-empty
+error: malformed mode in tree entry
+ok 32 - malformed mode in tree
 
-ok 2 - .git/objects should be empty after git init in an empty repo
+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
 
-expecting success of 0000.3 '.git/objects should have 3 subdirectories': 
-	find .git/objects -type d -print >full-of-directories &&
-	test_line_count = 3 full-of-directories
+error: empty filename in tree entry
+ok 33 - empty filename in tree
 
-ok 3 - .git/objects should have 3 subdirectories
+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 0000.4 'success is reported like this': 
-	:
+error: object fails fsck: duplicateEntries: contains duplicate file entries
+ok 34 - duplicate filename in tree
 
-ok 4 - success is reported like this
+expecting success of 1007.35 'corrupt commit': 
+	test_must_fail git hash-object -t commit --stdin </dev/null
 
-expecting success of 0000.5 'subtest: 3 passing tests': 
-	write_and_run_sub_test_lib_test full-pass <<-\EOF &&
-	for i in 1 2 3
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test full-pass <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 - passing test #3
-	> # passed all 3 test(s)
-	> 1..3
-	EOF
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 35 - corrupt commit
 
-ok 5 - subtest: 3 passing tests
+expecting success of 1007.36 'corrupt tag': 
+	test_must_fail git hash-object -t tag --stdin </dev/null
 
-expecting success of 0000.6 'subtest: 2/3 tests passing': 
-	write_and_run_sub_test_lib_test_err partial-pass <<-\EOF &&
-	test_expect_success "passing test #1" "true"
-	test_expect_success "failing test #2" "false"
-	test_expect_success "passing test #3" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test partial-pass <<-\EOF
-	> ok 1 - passing test #1
-	> not ok 2 - failing test #2
-	#	false
-	> ok 3 - passing test #3
-	> # failed 1 among 3 test(s)
-	> 1..3
-	EOF
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 36 - corrupt tag
 
-ok 6 - subtest: 2/3 tests passing
+expecting success of 1007.37 'hash-object complains about bogus type name': 
+	test_must_fail git hash-object -t bogus --stdin </dev/null
 
-expecting success of 0000.7 'subtest: --immediate': 
-	run_sub_test_lib_test_err partial-pass \
-		--immediate &&
-	check_sub_test_lib_test_err partial-pass \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	> ok 1 - passing test #1
-	> not ok 2 - failing test #2
-	> #	false
-	> 1..2
-	EOF_OUT
-	EOF_ERR
+fatal: invalid object type "bogus"
+ok 37 - hash-object complains about bogus type name
 
-ok 7 - subtest: --immediate
+expecting success of 1007.38 'hash-object complains about truncated type name': 
+	test_must_fail git hash-object -t bl --stdin </dev/null
 
-expecting success of 0000.8 'subtest: a failing TODO test': 
-	write_and_run_sub_test_lib_test failing-todo <<-\EOF &&
-	test_expect_success "passing test" "true"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_done
-	EOF
-	check_sub_test_lib_test failing-todo <<-\EOF
-	> ok 1 - passing test
-	> not ok 2 - pretend we have a known breakage # TODO known breakage
-	> # still have 1 known breakage(s)
-	> # passed all remaining 1 test(s)
-	> 1..2
-	EOF
+fatal: invalid object type "bl"
+ok 38 - hash-object complains about truncated type name
 
-ok 8 - subtest: a failing TODO test
+expecting success of 1007.39 '--literally': 
+	t=1234567890 &&
+	echo example | git hash-object -t $t --literally --stdin
 
-expecting success of 0000.9 'subtest: a passing TODO test': 
-	write_and_run_sub_test_lib_test passing-todo <<-\EOF &&
-	test_expect_failure "pretend we have fixed a known breakage" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test passing-todo <<-\EOF
-	> ok 1 - pretend we have fixed a known breakage # TODO known breakage vanished
-	> # 1 known breakage(s) vanished; please update test(s)
-	> 1..1
-	EOF
+f78b23c3f872d473c764d5fcf4fb39af8bbf2123
+ok 39 - --literally
 
-ok 9 - subtest: a passing TODO test
+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 0000.10 'subtest: 2 TODO tests, one passin': 
-	write_and_run_sub_test_lib_test partially-passing-todos <<-\EOF &&
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_expect_success "pretend we have a passing test" "true"
-	test_expect_failure "pretend we have fixed another known breakage" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test partially-passing-todos <<-\EOF
-	> not ok 1 - pretend we have a known breakage # TODO known breakage
-	> ok 2 - pretend we have a passing test
-	> ok 3 - pretend we have fixed another known breakage # TODO known breakage vanished
-	> # 1 known breakage(s) vanished; please update test(s)
-	> # still have 1 known breakage(s)
-	> # passed all remaining 1 test(s)
-	> 1..3
-	EOF
+2a881776ee43e849175ee7158075560ca0ae7692
+ok 40 - --literally with extra-long type
 
-ok 10 - subtest: 2 TODO tests, one passin
+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
 
-expecting success of 0000.11 'subtest: mixed results: pass, failure and a TODO test': 
-	write_and_run_sub_test_lib_test_err mixed-results1 <<-\EOF &&
-	test_expect_success "passing test" "true"
-	test_expect_success "failing test" "false"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_done
-	EOF
-	check_sub_test_lib_test mixed-results1 <<-\EOF
-	> ok 1 - passing test
-	> not ok 2 - failing test
-	> #	false
-	> not ok 3 - pretend we have a known breakage # TODO known breakage
-	> # still have 1 known breakage(s)
-	> # failed 1 among remaining 2 test(s)
-	> 1..3
-	EOF
+ok 41 - --stdin outside of repository (uses SHA-1)
 
-ok 11 - subtest: mixed results: pass, failure and a TODO test
+# passed all 41 test(s)
+1..41
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1004-read-tree-m-u-wf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1004-read-tree-m-u-wf/.git/
+expecting success of 1004.1 'two-way setup': 
 
-expecting success of 0000.12 'subtest: mixed results: a mixture of all possible results': 
-	write_and_run_sub_test_lib_test_err mixed-results2 <<-\EOF &&
-	test_expect_success "passing test" "true"
-	test_expect_success "passing test" "true"
-	test_expect_success "passing test" "true"
-	test_expect_success "passing test" "true"
-	test_expect_success "failing test" "false"
-	test_expect_success "failing test" "false"
-	test_expect_success "failing test" "false"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_expect_failure "pretend we have a known breakage" "false"
-	test_expect_failure "pretend we have fixed a known breakage" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test mixed-results2 <<-\EOF
-	> ok 1 - passing test
-	> ok 2 - passing test
-	> ok 3 - passing test
-	> ok 4 - passing test
-	> not ok 5 - failing test
-	> #	false
-	> not ok 6 - failing test
-	> #	false
-	> not ok 7 - failing test
-	> #	false
-	> not ok 8 - pretend we have a known breakage # TODO known breakage
-	> not ok 9 - pretend we have a known breakage # TODO known breakage
-	> ok 10 - pretend we have fixed a known breakage # TODO known breakage vanished
-	> # 1 known breakage(s) vanished; please update test(s)
-	> # still have 2 known breakage(s)
-	> # failed 3 among remaining 7 test(s)
-	> 1..10
-	EOF
+	mkdir subdir &&
+	echo >file1 file one &&
+	echo >file2 file two &&
+	echo >subdir/file1 file one in subdirectory &&
+	echo >subdir/file2 file two in subdirectory &&
+	git update-index --add file1 file2 subdir/file1 subdir/file2 &&
+	git commit -m initial &&
 
-ok 12 - subtest: mixed results: a mixture of all possible results
+	git branch side &&
+	git tag -f branch-point &&
 
-expecting success of 0000.13 'subtest: --verbose option': 
-	write_and_run_sub_test_lib_test_err t1234-verbose --verbose <<-\EOF &&
-	test_expect_success "passing test" true
-	test_expect_success "test with output" "echo foo"
-	test_expect_success "failing test" false
-	test_done
-	EOF
-	mv t1234-verbose/out t1234-verbose/out+ &&
-	grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out &&
-	check_sub_test_lib_test t1234-verbose <<-\EOF
-	> expecting success of 1234.1 'passing test': true
-	> ok 1 - passing test
-	> Z
-	> expecting success of 1234.2 'test with output': echo foo
-	> foo
-	> ok 2 - test with output
-	> Z
-	> expecting success of 1234.3 'failing test': false
-	> not ok 3 - failing test
-	> #	false
-	> Z
-	> # failed 1 among 3 test(s)
-	> 1..3
-	EOF
+	echo file2 is not tracked on the main branch anymore &&
+	rm -f file2 subdir/file2 &&
+	git update-index --remove file2 subdir/file2 &&
+	git commit -a -m "main removes file2 and subdir/file2"
 
-ok 13 - subtest: --verbose option
+[main (root-commit) eb5336a] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ create mode 100644 subdir/file1
+ create mode 100644 subdir/file2
+file2 is not tracked on the main branch anymore
+[main dbb6421] main removes file2 and subdir/file2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 file2
+ delete mode 100644 subdir/file2
+ok 1 - two-way setup
 
-expecting success of 0000.14 'subtest: --verbose-only option': 
-	run_sub_test_lib_test_err \
-		t1234-verbose \
-		--verbose-only=2 &&
-	check_sub_test_lib_test t1234-verbose <<-\EOF
-	> ok 1 - passing test
-	> Z
-	> expecting success of 1234.2 'test with output': echo foo
-	> foo
-	> ok 2 - test with output
-	> Z
-	> not ok 3 - failing test
-	> #	false
-	> # failed 1 among 3 test(s)
-	> 1..3
-	EOF
+expecting success of 1004.2 'two-way not clobbering': 
 
-ok 14 - subtest: --verbose-only option
+	echo >file2 main creates untracked file2 &&
+	echo >subdir/file2 main creates untracked subdir/file2 &&
+	if err=$(read_tree_u_must_succeed -m -u main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
 
-expecting success of 0000.15 'subtest: skip one with GIT_SKIP_TESTS': 
-	(
-		run_sub_test_lib_test full-pass \
-			--skip="full.2" &&
-		check_sub_test_lib_test full-pass <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
-		> ok 3 - passing test #3
-		> # passed all 3 test(s)
-		> 1..3
-		EOF
-	)
+happy to see error: Untracked working tree file 'file2' would be overwritten by merge.
+ok 2 - two-way not clobbering
 
-ok 15 - subtest: skip one with GIT_SKIP_TESTS
+expecting success of 1004.3 'two-way with incorrect --exclude-per-directory (1)': 
 
-expecting success of 0000.16 'subtest: skip several with GIT_SKIP_TESTS': 
-	(
-		write_and_run_sub_test_lib_test git-skip-tests-several \
-			--skip="git.2 git.5" <<-\EOF &&
-		for i in 1 2 3 4 5 6
-		do
-			test_expect_success "passing test #$i" "true"
-		done
-		test_done
-		EOF
-		check_sub_test_lib_test git-skip-tests-several <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
-		> ok 3 - passing test #3
-		> ok 4 - passing test #4
-		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
-		> ok 6 - passing test #6
-		> # passed all 6 test(s)
-		> 1..6
-		EOF
-	)
+	if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
 
-ok 16 - subtest: skip several with GIT_SKIP_TESTS
+happy to see fatal: --exclude-per-directory is meaningless unless -u
+ok 3 - two-way with incorrect --exclude-per-directory (1)
 
-expecting success of 0000.17 'subtest: sh pattern skipping with GIT_SKIP_TESTS': 
-	(
-		run_sub_test_lib_test git-skip-tests-several \
-			--skip="git.[2-5]" &&
-		check_sub_test_lib_test git-skip-tests-several <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
-		> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
-		> ok 4 # skip passing test #4 (GIT_SKIP_TESTS)
-		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
-		> ok 6 - passing test #6
-		> # passed all 6 test(s)
-		> 1..6
-		EOF
-	)
+expecting success of 1004.4 'two-way with incorrect --exclude-per-directory (2)': 
 
-ok 17 - subtest: sh pattern skipping with GIT_SKIP_TESTS
+	if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
 
-expecting success of 0000.18 'subtest: skip entire test suite with GIT_SKIP_TESTS': 
-	(
-		GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test git-skip-tests-several \
-			--skip="git" &&
-		check_sub_test_lib_test git-skip-tests-several <<-\EOF
-		> 1..0 # SKIP skip all tests in git
-		EOF
-	)
+happy to see fatal: --exclude-per-directory argument must be .gitignore
+ok 4 - two-way with incorrect --exclude-per-directory (2)
 
-ok 18 - subtest: skip entire test suite with GIT_SKIP_TESTS
+expecting success of 1004.5 'two-way clobbering a ignored file': 
 
-expecting success of 0000.19 'subtest: GIT_SKIP_TESTS does not skip unmatched suite': 
-	(
-		GIT_SKIP_TESTS="notgit" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test full-pass \
-			--skip="notfull" &&
-		check_sub_test_lib_test full-pass <<-\EOF
-		> ok 1 - passing test #1
-		> ok 2 - passing test #2
-		> ok 3 - passing test #3
-		> # passed all 3 test(s)
-		> 1..3
-		EOF
-	)
+	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore main side
 
-ok 19 - subtest: GIT_SKIP_TESTS does not skip unmatched suite
+ok 5 - two-way clobbering a ignored file
 
-expecting success of 0000.20 'subtest: --run basic': 
-	run_sub_test_lib_test git-skip-tests-several --run="1,3,5" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+expecting success of 1004.6 'three-way not complaining on an untracked path in both': 
 
-ok 20 - subtest: --run basic
+	rm -f file2 subdir/file2 &&
+	git checkout side &&
+	echo >file3 file three &&
+	echo >subdir/file3 file three &&
+	git update-index --add file3 subdir/file3 &&
+	git commit -a -m "side adds file3 and removes file2" &&
 
-expecting success of 0000.21 'subtest: --run with a range': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1-3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 # skip passing test #5 (--run)
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+	git checkout main &&
+	echo >file2 file two is untracked on the main side &&
+	echo >subdir/file2 file two is untracked on the main side &&
 
-ok 21 - subtest: --run with a range
+	read_tree_u_must_succeed -m -u branch-point main side
 
-expecting success of 0000.22 'subtest: --run with two ranges': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1-2,5-6" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+Switched to branch 'side'
+D	file2
+D	subdir/file2
+[side 4be225f] side adds file3 and removes file2
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+ delete mode 100644 file2
+ create mode 100644 file3
+ delete mode 100644 subdir/file2
+ create mode 100644 subdir/file3
+Switched to branch 'main'
+ok 6 - three-way not complaining on an untracked path in both
 
-ok 22 - subtest: --run with two ranges
+expecting success of 1004.7 'three-way not clobbering a working tree file': 
 
-expecting success of 0000.23 'subtest: --run with a left open range': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="-3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 # skip passing test #5 (--run)
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+	git reset --hard &&
+	rm -f file2 subdir/file2 file3 subdir/file3 &&
+	git checkout main &&
+	echo >file3 file three created in main, untracked &&
+	echo >subdir/file3 file three created in main, untracked &&
+	if err=$(read_tree_u_must_succeed -m -u branch-point main side 2>&1)
+	then
+		echo should have complained
+		false
+	else
+		echo "happy to see $err"
+	fi
 
-ok 23 - subtest: --run with a left open range
+HEAD is now at dbb6421 main removes file2 and subdir/file2
+Already on 'main'
+happy to see error: Untracked working tree file 'file3' would be overwritten by merge.
+ok 7 - three-way not clobbering a working tree file
 
-expecting success of 0000.24 'subtest: --run with a right open range': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="4-" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+expecting success of 1004.8 'three-way not complaining on an untracked file': 
 
-ok 24 - subtest: --run with a right open range
+	git reset --hard &&
+	rm -f file2 subdir/file2 file3 subdir/file3 &&
+	git checkout main &&
+	echo >file3 file three created in main, untracked &&
+	echo >subdir/file3 file three created in main, untracked &&
 
-expecting success of 0000.25 'subtest: --run with basic negation': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point main side
 
-ok 25 - subtest: --run with basic negation
+HEAD is now at dbb6421 main removes file2 and subdir/file2
+Already on 'main'
+ok 8 - three-way not complaining on an untracked file
 
-expecting success of 0000.26 'subtest: --run with two negations': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!3,!6" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+expecting success of 1004.9 '3-way not overwriting local changes (setup)': 
 
-ok 26 - subtest: --run with two negations
+	git reset --hard &&
+	git checkout -b side-a branch-point &&
+	echo >>file1 "new line to be kept in the merge result" &&
+	git commit -a -m "side-a changes file1" &&
+	git checkout -b side-b branch-point &&
+	echo >>file2 "new line to be kept in the merge result" &&
+	git commit -a -m "side-b changes file2" &&
+	git checkout side-a
 
-expecting success of 0000.27 'subtest: --run a range and negation': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="-4,!2" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 - passing test #3
-	> ok 4 - passing test #4
-	> ok 5 # skip passing test #5 (--run)
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
 
-ok 27 - subtest: --run a range and negation
+HEAD is now at dbb6421 main removes file2 and subdir/file2
+Switched to a new branch 'side-a'
+[side-a 67c0594] side-a changes file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'side-b'
+[side-b 3ad988a] side-b changes file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'side-a'
+ok 9 - 3-way not overwriting local changes (setup)
 
-expecting success of 0000.28 'subtest: --run range negation': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!1-3" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 - passing test #6
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+expecting success of 1004.10 '3-way not overwriting local changes (our side)': 
 
-ok 28 - subtest: --run range negation
+	# At this point, file1 from side-a should be kept as side-b
+	# did not touch it.
 
-expecting success of 0000.29 'subtest: --run include, exclude and include': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1-5,!1-3,2" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+	git reset --hard &&
 
-ok 29 - subtest: --run include, exclude and include
+	echo >>file1 "local changes" &&
+	read_tree_u_must_succeed -m -u branch-point side-a side-b &&
+	grep "new line to be kept" file1 &&
+	grep "local changes" file1
 
-expecting success of 0000.30 'subtest: --run include, exclude and include, comma separated': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run=1-5,!1-3,2 &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 # skip passing test #1 (--run)
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 - passing test #4
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
 
-ok 30 - subtest: --run include, exclude and include, comma separated
+HEAD is now at 67c0594 side-a changes file1
+new line to be kept in the merge result
+local changes
+ok 10 - 3-way not overwriting local changes (our side)
 
-expecting success of 0000.31 'subtest: --run exclude and include': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="!3-,5" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 - passing test #2
-	> ok 3 # skip passing test #3 (--run)
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+expecting success of 1004.11 '3-way not overwriting local changes (their side)': 
 
-ok 31 - subtest: --run exclude and include
+	# At this point, file2 from side-b should be taken as side-a
+	# did not touch it.
 
-expecting success of 0000.32 'subtest: --run empty selectors': 
-	run_sub_test_lib_test git-skip-tests-several \
-		--run="1,,3,,,5" &&
-	check_sub_test_lib_test git-skip-tests-several <<-\EOF
-	> ok 1 - passing test #1
-	> ok 2 # skip passing test #2 (--run)
-	> ok 3 - passing test #3
-	> ok 4 # skip passing test #4 (--run)
-	> ok 5 - passing test #5
-	> ok 6 # skip passing test #6 (--run)
-	> # passed all 6 test(s)
-	> 1..6
-	EOF
+	git reset --hard &&
 
-ok 32 - subtest: --run empty selectors
+	echo >>file2 "local changes" &&
+	read_tree_u_must_fail -m -u branch-point side-a side-b &&
+	! grep "new line to be kept" file2 &&
+	grep "local changes" file2
 
-expecting success of 0000.33 'subtest: --run substring selector': 
-	write_and_run_sub_test_lib_test run-substring-selector \
-		--run="relevant" <<-\EOF &&
-	test_expect_success "relevant test" "true"
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "other test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-substring-selector <<-\EOF
-	> ok 1 - relevant test
-	> ok 2 # skip other test #1 (--run)
-	> ok 3 # skip other test #2 (--run)
-	> ok 4 # skip other test #3 (--run)
-	> ok 5 # skip other test #4 (--run)
-	> ok 6 # skip other test #5 (--run)
-	> ok 7 # skip other test #6 (--run)
-	> # passed all 7 test(s)
-	> 1..7
-	EOF
 
-ok 33 - subtest: --run substring selector
+HEAD is now at 67c0594 side-a changes file1
+error: Entry 'file2' not uptodate. Cannot merge.
+error: Entry 'file2' not uptodate. Cannot merge.
+local changes
+ok 11 - 3-way not overwriting local changes (their side)
 
-expecting success of 0000.34 'subtest: --run keyword selection': 
-	write_and_run_sub_test_lib_test_err run-inv-range-start \
-		--run="a-5" <<-\EOF &&
-	test_expect_success "passing test #1" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test_err run-inv-range-start \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	> FATAL: Unexpected exit with code 1
-	EOF_OUT
-	> error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ}
-	EOF_ERR
+expecting success of 1004.12 'funny symlink in work tree': 
 
-ok 34 - subtest: --run keyword selection
+	git reset --hard &&
+	git checkout -b sym-b side-b &&
+	mkdir -p a &&
+	>a/b &&
+	git add a/b &&
+	git commit -m "side adds a/b" &&
 
-expecting success of 0000.35 'subtest: --run invalid range end': 
-	run_sub_test_lib_test_err run-inv-range-start \
-		--run="1-z" &&
-	check_sub_test_lib_test_err run-inv-range-start \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	> FATAL: Unexpected exit with code 1
-	EOF_OUT
-	> error: --run: invalid non-numeric in range end: ${SQ}1-z${SQ}
-	EOF_ERR
+	rm -fr a &&
+	git checkout -b sym-a side-a &&
+	mkdir -p a &&
+	test_ln_s_add ../b a/b &&
+	git commit -m "we add a/b" &&
 
-ok 35 - subtest: --run invalid range end
+	read_tree_u_must_succeed -m -u sym-a sym-a sym-b
 
-expecting success of 0000.36 'subtest: --invert-exit-code without --immediate': 
-	run_sub_test_lib_test_err full-pass \
-		--invert-exit-code &&
-	check_sub_test_lib_test_err full-pass \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	ok 1 - passing test #1
-	ok 2 - passing test #2
-	ok 3 - passing test #3
-	# passed all 3 test(s)
-	1..3
-	# faking up non-zero exit with --invert-exit-code
-	EOF_OUT
-	EOF_ERR
 
-ok 36 - subtest: --invert-exit-code without --immediate
+HEAD is now at 67c0594 side-a changes file1
+Switched to a new branch 'sym-b'
+[sym-b b05f19b] side adds a/b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b
+Switched to a new branch 'sym-a'
+checking prerequisite: SYMLINKS
 
-expecting success of 0000.37 'subtest: --invert-exit-code with --immediate: all passed': 
-	run_sub_test_lib_test_err full-pass \
-		--invert-exit-code --immediate &&
-	check_sub_test_lib_test_err full-pass \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	ok 1 - passing test #1
-	ok 2 - passing test #2
-	ok 3 - passing test #3
-	# passed all 3 test(s)
-	1..3
-	# faking up non-zero exit with --invert-exit-code
-	EOF_OUT
-	EOF_ERR
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-ok 37 - subtest: --invert-exit-code with --immediate: all passed
+)
+prerequisite SYMLINKS ok
+[sym-a c4bc40b] we add a/b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 a/b
+ok 12 - funny symlink in work tree
 
-expecting success of 0000.38 'subtest: --invert-exit-code without --immediate: partial pass': 
-	run_sub_test_lib_test partial-pass \
-		--invert-exit-code &&
-	check_sub_test_lib_test partial-pass <<-\EOF
-	ok 1 - passing test #1
-	not ok 2 - # TODO induced breakage (--invert-exit-code): failing test #2
-	#	false
-	ok 3 - passing test #3
-	# failed 1 among 3 test(s)
-	1..3
-	# faked up failures as TODO & now exiting with 0 due to --invert-exit-code
-	EOF
+checking prerequisite: SANITY
 
-ok 38 - subtest: --invert-exit-code without --immediate: partial pass
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 0000.39 'subtest: --invert-exit-code with --immediate: partial pass': 
-	run_sub_test_lib_test partial-pass \
-		--invert-exit-code --immediate &&
-	check_sub_test_lib_test partial-pass \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	ok 1 - passing test #1
-	not ok 2 - # TODO induced breakage (--invert-exit-code): failing test #2
-	#	false
-	1..2
-	# faked up failures as TODO & now exiting with 0 due to --invert-exit-code
-	EOF_OUT
-	EOF_ERR
+	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 39 - subtest: --invert-exit-code with --immediate: partial pass
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 0000.40 'subtest: --invert-exit-code --immediate: got a failure': 
-	run_sub_test_lib_test partial-pass \
-		--invert-exit-code --immediate &&
-	check_sub_test_lib_test_err partial-pass \
-		<<-\EOF_OUT 3<<-EOF_ERR
-	ok 1 - passing test #1
-	not ok 2 - # TODO induced breakage (--invert-exit-code): failing test #2
-	#	false
-	1..2
-	# faked up failures as TODO & now exiting with 0 due to --invert-exit-code
-	EOF_OUT
-	EOF_ERR
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-ok 40 - subtest: --invert-exit-code --immediate: got a failure
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 1004.13 'funny symlink in work tree, un-unlink-able': 
 
-expecting success of 0000.41 'subtest: tests respect prerequisites': 
-	write_and_run_sub_test_lib_test prereqs <<-\EOF &&
+	test_when_finished "chmod u+w a 2>/dev/null; rm -fr a b" &&
 
-	test_set_prereq HAVEIT
-	test_expect_success HAVEIT "prereq is satisfied" "true"
-	test_expect_success "have_prereq works" "
-		test_have_prereq HAVEIT
-	"
-	test_expect_success DONTHAVEIT "prereq not satisfied" "false"
+	rm -fr a b &&
+	git reset --hard &&
 
-	test_set_prereq HAVETHIS
-	test_expect_success HAVETHIS,HAVEIT "multiple prereqs" "true"
-	test_expect_success HAVEIT,DONTHAVEIT "mixed prereqs (yes,no)" "false"
-	test_expect_success DONTHAVEIT,HAVEIT "mixed prereqs (no,yes)" "false"
+	git checkout sym-a &&
+	chmod a-w a &&
+	test_must_fail git read-tree -m -u sym-a sym-a sym-b
 
-	test_done
-	EOF
 
-	check_sub_test_lib_test prereqs <<-\EOF
-	ok 1 - prereq is satisfied
-	ok 2 - have_prereq works
-	ok 3 # skip prereq not satisfied (missing DONTHAVEIT)
-	ok 4 - multiple prereqs
-	ok 5 # skip mixed prereqs (yes,no) (missing DONTHAVEIT of HAVEIT,DONTHAVEIT)
-	ok 6 # skip mixed prereqs (no,yes) (missing DONTHAVEIT of DONTHAVEIT,HAVEIT)
-	# passed all 6 test(s)
-	1..6
-	EOF
+HEAD is now at c4bc40b we add a/b
+Already on 'sym-a'
+error: unable to unlink old 'a/b': Permission denied
+ok 13 - funny symlink in work tree, un-unlink-able
 
-ok 41 - subtest: tests respect prerequisites
+expecting success of 1004.14 'D/F setup': 
 
-expecting success of 0000.42 'subtest: tests respect lazy prerequisites': 
-	write_and_run_sub_test_lib_test lazy-prereqs <<-\EOF &&
+	git reset --hard &&
 
-	test_lazy_prereq LAZY_TRUE true
-	test_expect_success LAZY_TRUE "lazy prereq is satisfied" "true"
-	test_expect_success !LAZY_TRUE "negative lazy prereq" "false"
+	git checkout side-a &&
+	rm -f subdir/file2 &&
+	mkdir subdir/file2 &&
+	echo qfwfq >subdir/file2/another &&
+	git add subdir/file2/another &&
+	test_tick &&
+	git commit -m "side-a changes file2 to directory"
 
-	test_lazy_prereq LAZY_FALSE false
-	test_expect_success LAZY_FALSE "lazy prereq not satisfied" "false"
-	test_expect_success !LAZY_FALSE "negative false prereq" "true"
 
-	test_done
-	EOF
+HEAD is now at c4bc40b we add a/b
+Switched to branch 'side-a'
+[side-a d094fd2] side-a changes file2 to directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 subdir/file2
+ create mode 100644 subdir/file2/another
+ok 14 - D/F setup
 
-	check_sub_test_lib_test lazy-prereqs <<-\EOF
-	ok 1 - lazy prereq is satisfied
-	ok 2 # skip negative lazy prereq (missing !LAZY_TRUE)
-	ok 3 # skip lazy prereq not satisfied (missing LAZY_FALSE)
-	ok 4 - negative false prereq
-	# passed all 4 test(s)
-	1..4
-	EOF
+expecting success of 1004.15 'D/F': 
 
-ok 42 - subtest: tests respect lazy prerequisites
+	git checkout side-b &&
+	read_tree_u_must_succeed -m -u branch-point side-b side-a &&
+	git ls-files -u >actual &&
+	(
+		a=$(git rev-parse branch-point:subdir/file2) &&
+		b=$(git rev-parse side-a:subdir/file2/another) &&
+		echo "100644 $a 1	subdir/file2" &&
+		echo "100644 $a 2	subdir/file2" &&
+		echo "100644 $b 3	subdir/file2/another"
+	) >expect &&
+	test_cmp expect actual
 
-expecting success of 0000.43 'subtest: nested lazy prerequisites': 
-	write_and_run_sub_test_lib_test nested-lazy <<-\EOF &&
 
-	test_lazy_prereq NESTED_INNER "
-		>inner &&
-		rm -f outer
-	"
-	test_lazy_prereq NESTED_PREREQ "
-		>outer &&
-		test_have_prereq NESTED_INNER &&
-		echo can create new file in cwd >file &&
-		test_path_is_file outer &&
-		test_path_is_missing inner
-	"
-	test_expect_success NESTED_PREREQ "evaluate nested prereq" "true"
+Switched to branch 'side-b'
+ok 15 - D/F
 
-	test_done
-	EOF
+expecting success of 1004.16 'D/F resolve': 
 
-	check_sub_test_lib_test nested-lazy <<-\EOF
-	ok 1 - evaluate nested prereq
-	# passed all 1 test(s)
-	1..1
-	EOF
+	git reset --hard &&
+	git checkout side-b &&
+	git merge-resolve branch-point -- side-b side-a
 
-ok 43 - subtest: nested lazy prerequisites
 
-expecting success of 0000.44 'subtest: lazy prereqs do not turn off tracing': 
-	write_and_run_sub_test_lib_test lazy-prereq-and-tracing \
-		-v -x <<-\EOF &&
-	test_lazy_prereq LAZY true
+HEAD is now at 3ad988a side-b changes file2
+Already on 'side-b'
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Adding subdir/file2/another
+ok 16 - D/F resolve
 
-	test_expect_success lazy "test_have_prereq LAZY && echo trace"
+expecting success of 1004.17 'D/F recursive': 
 
-	test_done
-	EOF
+	git reset --hard &&
+	git checkout side-b &&
+	git merge-recursive branch-point -- side-b side-a
 
-	grep "echo trace" lazy-prereq-and-tracing/err
 
-+ echo trace
-ok 44 - subtest: lazy prereqs do not turn off tracing
+HEAD is now at 3ad988a side-b changes file2
+Already on 'side-b'
+Merging side-b with side-a
+Merging:
+3ad988a side-b changes file2
+d094fd2 side-a changes file2 to directory
+found 1 common ancestor:
+eb5336a initial
+Adding subdir/file2/another
+Removing subdir/file2 to make room for subdirectory
 
-expecting success of 0000.45 'subtest: tests clean up after themselves': 
-	write_and_run_sub_test_lib_test cleanup <<-\EOF &&
-	clean=no
-	test_expect_success "do cleanup" "
-		test_when_finished clean=yes
-	"
-	test_expect_success "cleanup happened" "
-		test $clean = yes
-	"
-	test_done
-	EOF
+Removing subdir/file2
+ok 17 - D/F recursive
 
-	check_sub_test_lib_test cleanup <<-\EOF
-	ok 1 - do cleanup
-	ok 2 - cleanup happened
-	# passed all 2 test(s)
-	1..2
-	EOF
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1008-read-tree-overlay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 45 - subtest: tests clean up after themselves
+[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 0000.46 'subtest: tests clean up even on failures': 
-	write_and_run_sub_test_lib_test_err \
-		failing-cleanup <<-\EOF &&
-	test_expect_success "tests clean up even after a failure" "
-		touch clean-after-failure &&
-		test_when_finished rm clean-after-failure &&
-		(exit 1)
-	"
-	test_expect_success "failure to clean up causes the test to fail" "
-		test_when_finished \"(exit 2)\"
-	"
-	test_done
-	EOF
-	check_sub_test_lib_test failing-cleanup <<-\EOF
-	> not ok 1 - tests clean up even after a failure
-	> #	Z
-	> #	touch clean-after-failure &&
-	> #	test_when_finished rm clean-after-failure &&
-	> #	(exit 1)
-	> #	Z
-	> not ok 2 - failure to clean up causes the test to fail
-	> #	Z
-	> #	test_when_finished "(exit 2)"
-	> #	Z
-	> # failed 2 among 2 test(s)
-	> 1..2
-	EOF
+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 46 - subtest: tests clean up even on failures
+ok 2 - multi-read
 
-expecting success of 0000.47 'subtest: test_atexit is run': 
-	write_and_run_sub_test_lib_test_err \
-		atexit-cleanup -i <<-\EOF &&
-	test_expect_success "tests clean up even after a failure" "
-		> ../../clean-atexit &&
-		test_atexit rm ../../clean-atexit &&
-		> ../../also-clean-atexit &&
-		test_atexit rm ../../also-clean-atexit &&
-		> ../../dont-clean-atexit &&
-		(exit 1)
-	"
-	test_done
-	EOF
-	test_path_is_file dont-clean-atexit &&
-	test_path_is_missing clean-atexit &&
-	test_path_is_missing also-clean-atexit
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1001-read-tree-m-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-ok 47 - subtest: test_atexit is run
+	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
 
-expecting success of 0000.48 'test_oid provides sane info by default': 
-	test_oid zero >actual &&
-	grep "^00*\$" actual &&
-	rawsz="$(test_oid rawsz)" &&
-	hexsz="$(test_oid hexsz)" &&
-	# +1 accounts for the trailing newline
-	test $(( $hexsz + 1)) -eq $(wc -c <actual) &&
-	test $(( $rawsz * 2)) -eq "$hexsz"
+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
 
-0000000000000000000000000000000000000000
-ok 48 - test_oid provides sane info by default
+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 0000.49 'test_oid can look up data for SHA-1': 
-	test_when_finished "test_detect_hash" &&
-	test_set_hash sha1 &&
-	test_oid zero >actual &&
-	grep "^00*\$" actual &&
-	rawsz="$(test_oid rawsz)" &&
-	hexsz="$(test_oid hexsz)" &&
-	test $(wc -c <actual) -eq 41 &&
-	test "$rawsz" -eq 20 &&
-	test "$hexsz" -eq 40
+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
 
-0000000000000000000000000000000000000000
-ok 49 - test_oid can look up data for SHA-1
+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
 
-expecting success of 0000.50 'test_oid can look up data for SHA-256': 
-	test_when_finished "test_detect_hash" &&
-	test_set_hash sha256 &&
-	test_oid zero >actual &&
-	grep "^00*\$" actual &&
-	rawsz="$(test_oid rawsz)" &&
-	hexsz="$(test_oid hexsz)" &&
-	test $(wc -c <actual) -eq 65 &&
-	test "$rawsz" -eq 32 &&
-	test "$hexsz" -eq 64
+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.
 
-0000000000000000000000000000000000000000000000000000000000000000
-ok 50 - test_oid can look up data for SHA-256
+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 0000.51 'test_oid can look up data for a specified algorithm': 
-	rawsz="$(test_oid --hash=sha1 rawsz)" &&
-	hexsz="$(test_oid --hash=sha1 hexsz)" &&
-	test "$rawsz" -eq 20 &&
-	test "$hexsz" -eq 40 &&
-	rawsz="$(test_oid --hash=sha256 rawsz)" &&
-	hexsz="$(test_oid --hash=sha256 hexsz)" &&
-	test "$rawsz" -eq 32 &&
-	test "$hexsz" -eq 64
+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 51 - test_oid can look up data for a specified algorithm
+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 0000.52 'test_bool_env': 
-	(
-		sane_unset envvar &&
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: clean
+ok 5 - 6 - local addition already has the same.
 
-		test_bool_env envvar true &&
-		! test_bool_env envvar false &&
+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
 
-		envvar= &&
-		export envvar &&
-		! test_bool_env envvar true &&
-		! test_bool_env envvar false &&
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: dirty
+ok 6 - 7 - local addition already has the same.
 
-		envvar=true &&
-		test_bool_env envvar true &&
-		test_bool_env envvar false &&
+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
 
-		envvar=false &&
-		! test_bool_env envvar true &&
-		! test_bool_env envvar false &&
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 7 - 8 - conflicting addition.
 
-		envvar=invalid &&
-		# When encountering an invalid bool value, test_bool_env
-		# prints its error message to the original stderr of the
-		# test script, hence the redirection of fd 7, and aborts
-		# with "exit 1", hence the subshell.
-		! ( test_bool_env envvar true ) 7>err &&
-		grep "error: test_bool_env requires bool values" err &&
+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
 
-		envvar=true &&
-		! ( test_bool_env envvar invalid ) 7>err &&
-		grep "error: test_bool_env requires bool values" err
-	)
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 8 - 9 - conflicting addition.
 
-fatal: bad boolean environment value 'invalid' for 'envvar'
-error: test_bool_env requires bool values both for $envvar and for the default fallback
-error: option `--default' expects a boolean value with `--type=bool`, not `invalid`
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+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
 
-    --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
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+ok 9 - 10 - path removed.
 
-error: test_bool_env requires bool values both for $envvar and for the default fallback
-ok 52 - test_bool_env
+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 0000.53 'git update-index without --add should fail adding': 
-	test_must_fail git update-index should-be-empty
+error: Entry 'rezrov' not uptodate. Cannot merge.
+ok 10 - 11 - dirty path removed.
 
-error: should-be-empty: cannot add to the index - missing --add option?
-fatal: Unable to process path should-be-empty
-ok 53 - git update-index without --add should fail adding
+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 0000.54 'git update-index with --add should succeed': 
-	git update-index --add should-be-empty
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 11 - 12 - unmatching local changes being removed.
 
-ok 54 - git update-index with --add should succeed
+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 0000.55 'writing tree out with git write-tree': 
-	tree=$(git write-tree)
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 12 - 13 - unmatching local changes being removed.
 
-ok 55 - writing tree out with git write-tree
+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 0000.56 'validate object ID of a known tree': 
-	test "$tree" = "$(test_oid simpletree)"
-    
-ok 56 - validate object ID of a known tree
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
+nitfol: clean
+ok 13 - 14 - unchanged in two heads.
 
-expecting success of 0000.57 'git update-index without --remove should fail removing': 
-	rm -f should-be-empty full-of-directories &&
-	test_must_fail git update-index should-be-empty
+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
 
-error: should-be-empty: does not exist and --remove not passed
-fatal: Unable to process path should-be-empty
-ok 57 - git update-index without --remove should fail removing
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
+nitfol: dirty
+ok 14 - 15 - unchanged in two heads.
 
-expecting success of 0000.58 'git update-index with --remove should be able to remove': 
-	git update-index --remove should-be-empty
+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 58 - git update-index with --remove should be able to remove
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 15 - 16 - conflicting local change.
 
-expecting success of 0000.59 'git write-tree should be able to write an empty tree': 
-	tree=$(git write-tree)
+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
 
-ok 59 - git write-tree should be able to write an empty tree
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 16 - 17 - conflicting local change.
 
-expecting success of 0000.60 'validate object ID of a known tree': 
-	test "$tree" = $EMPTY_TREE
+expecting success of 1001.17 '18 - local change already having a good result.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	cat bozbar-new >bozbar &&
+	git update-index --add bozbar &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >18.out &&
+	test_cmp M.out 18.out &&
+	check_cache_at bozbar clean
 
-ok 60 - validate object ID of a known tree
+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 0000.61 'adding various types of objects with git update-index --add': 
-	mkdir path2 path3 path3/subp3 &&
-	paths="path0 path2/file2 path3/file3 path3/subp3/file3" &&
-	(
-		for p in $paths
-		do
-			echo "hello $p" >$p || exit 1
-			test_ln_s_add "hello $p" ${p}sym || exit 1
-		done
-	) &&
-	find path* ! -type d -print | xargs git update-index --add
+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
 
-checking prerequisite: SYMLINKS
+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.
 
-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 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
 
-)
-prerequisite SYMLINKS ok
-ok 61 - adding various types of objects with git update-index --add
+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 0000.62 'showing stage with git ls-files --stage': 
-	git ls-files --stage >current
+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 62 - showing stage with git ls-files --stage
+error: Entry 'bozbar' not uptodate. Cannot merge.
+ok 20 - 21 - no local change, dirty cache.
 
-expecting success of 0000.63 'validate git ls-files output for a known tree': 
-	cat >expected <<-EOF &&
-	100644 $(test_oid path0f) 0	path0
-	120000 $(test_oid path0s) 0	path0sym
-	100644 $(test_oid path2f) 0	path2/file2
-	120000 $(test_oid path2s) 0	path2/file2sym
-	100644 $(test_oid path3f) 0	path3/file3
-	120000 $(test_oid path3s) 0	path3/file3sym
-	100644 $(test_oid subp3f) 0	path3/subp3/file3
-	120000 $(test_oid subp3s) 0	path3/subp3/file3sym
-	EOF
-	test_cmp expected current
+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 63 - validate git ls-files output for a known tree
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 21 - 22 - local change cache updated.
 
-expecting success of 0000.64 'writing tree out with git write-tree': 
-	tree=$(git write-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 &&
 
-ok 64 - writing tree out with git write-tree
+	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 0000.65 'validate object ID for a known tree': 
-	test "$tree" = "$(test_oid root)"
+treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
+100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
+treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
+040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
+ok 22 - DF vs DF/DF case setup.
 
-ok 65 - validate object ID for a known tree
+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 0000.66 'showing tree with git ls-tree': 
-	git ls-tree $tree >current
+100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0	DF/DF
+DF/DF: dirty
+ok 23 - DF vs DF/DF case test.
 
-ok 66 - showing tree with git ls-tree
+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 &&
 
-expecting success of 0000.67 'git ls-tree output for a known tree': 
-	cat >expected <<-EOF &&
-	100644 blob $(test_oid path0f)	path0
-	120000 blob $(test_oid path0s)	path0sym
-	040000 tree $(test_oid path2d)	path2
-	040000 tree $(test_oid path3d)	path3
-	EOF
-	test_cmp expected current
+	rm -f a &&
+	git update-index --remove a &&
+	mkdir a &&
+	: >a/b &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH
 
-ok 67 - git ls-tree output for a known tree
+treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
+100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
+treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 24 - a/b (untracked) vs a case setup.
 
-expecting success of 0000.68 'showing tree with git ls-tree -r': 
-	git ls-tree -r $tree >current
+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
 
-ok 68 - showing tree with git ls-tree -r
+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 0000.69 'git ls-tree -r output for a known tree': 
-	cat >expected <<-EOF &&
-	100644 blob $(test_oid path0f)	path0
-	120000 blob $(test_oid path0s)	path0sym
-	100644 blob $(test_oid path2f)	path2/file2
-	120000 blob $(test_oid path2s)	path2/file2sym
-	100644 blob $(test_oid path3f)	path3/file3
-	120000 blob $(test_oid path3s)	path3/file3sym
-	100644 blob $(test_oid subp3f)	path3/subp3/file3
-	120000 blob $(test_oid subp3s)	path3/subp3/file3sym
+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_cmp expected current
+	test_must_fail git read-tree --super-prefix fictional/ -u -m "$treeH" "$treeM" 2>actual &&
+	test_cmp expect actual
 
-ok 69 - git ls-tree -r output for a known tree
+ok 26 - read-tree supports the super-prefix
 
-expecting success of 0000.70 'showing tree with git ls-tree -r -t': 
-	git ls-tree -r -t $tree >current
+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 &&
 
-ok 70 - showing tree with git ls-tree -r -t
+	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 0000.71 'git ls-tree -r output for a known tree': 
-	cat >expected <<-EOF &&
-	100644 blob $(test_oid path0f)	path0
-	120000 blob $(test_oid path0s)	path0sym
-	040000 tree $(test_oid path2d)	path2
-	100644 blob $(test_oid path2f)	path2/file2
-	120000 blob $(test_oid path2s)	path2/file2sym
-	040000 tree $(test_oid path3d)	path3
-	100644 blob $(test_oid path3f)	path3/file3
-	120000 blob $(test_oid path3s)	path3/file3sym
-	040000 tree $(test_oid subp3d)	path3/subp3
-	100644 blob $(test_oid subp3f)	path3/subp3/file3
-	120000 blob $(test_oid subp3s)	path3/subp3/file3sym
-	EOF
-	test_cmp expected current
+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.
 
-ok 71 - git ls-tree -r output for a known tree
+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 0000.72 'writing partial tree out with git write-tree --prefix': 
-	ptree=$(git write-tree --prefix=path3)
+ok 28 - a/b vs a, plus c/d case test.
 
-ok 72 - writing partial tree out with git write-tree --prefix
+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
 
-expecting success of 0000.73 'validate object ID for a known tree': 
-	test "$ptree" = $(test_oid path3d)
+[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 73 - validate object ID for a known tree
+# passed all 29 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1009-read-tree-new-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1009-read-tree-new-index/.git/
+expecting success of 1009.1 'setup': 
+	echo one >a &&
+	git add a &&
+	git commit -m initial
 
-expecting success of 0000.74 'writing partial tree out with git write-tree --prefix': 
-	ptree=$(git write-tree --prefix=path3/subp3)
+[main (root-commit) 4d54ff5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
 
-ok 74 - writing partial tree out with git write-tree --prefix
+expecting success of 1009.2 'non-existent index file': 
+	rm -f new-index &&
+	GIT_INDEX_FILE=new-index git read-tree main
 
-expecting success of 0000.75 'validate object ID for a known tree': 
-	test "$ptree" = $(test_oid subp3d)
+ok 2 - non-existent index file
 
-ok 75 - validate object ID for a known tree
+expecting success of 1009.3 'empty index file': 
+	rm -f new-index &&
+	> new-index &&
+	GIT_INDEX_FILE=new-index git read-tree main
 
-expecting success of 0000.76 'put invalid objects into the index': 
-	rm -f .git/index &&
-	suffix=$(echo $ZERO_OID | sed -e "s/^.//") &&
-	cat >badobjects <<-EOF &&
-	100644 blob $(test_oid 001)	dir/file1
-	100644 blob $(test_oid 002)	dir/file2
-	100644 blob $(test_oid 003)	dir/file3
-	100644 blob $(test_oid 004)	dir/file4
-	100644 blob $(test_oid 005)	dir/file5
-	EOF
-	git update-index --index-info <badobjects
+ok 3 - empty index file
 
-ok 76 - put invalid objects into the index
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1002-read-tree-m-u-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1002-read-tree-m-u-2way/.git/
+expecting success of 1002.1 'setup': 
+	echo frotz >frotz &&
+	echo nitfol >nitfol &&
+	echo bozbar >bozbar &&
+	echo rezrov >rezrov &&
+	git update-index --add nitfol bozbar rezrov &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH &&
 
-expecting success of 0000.77 'writing this tree without --missing-ok': 
-	test_must_fail git write-tree
+	echo gnusto >bozbar &&
+	git update-index --add frotz bozbar --force-remove rezrov &&
+	git ls-files --stage >M.out &&
+	treeM=$(git write-tree) &&
+	echo treeM $treeM &&
+	git ls-tree $treeM &&
+	cp bozbar bozbar.M &&
+	cp frotz frotz.M &&
+	cp nitfol nitfol.M &&
+	git diff-tree $treeH $treeM
 
-error: invalid object 100644 0000000000000000000000000000000000000001 for 'dir/file1'
-fatal: git-write-tree: error building trees
-ok 77 - writing this tree without --missing-ok
+treeH 661afa9096b7e2d4b9a28a6e43736cd0b06d1308
+100644 blob 78d812a2124ff980a1a70f8cca493698d643d242	bozbar
+100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
+100644 blob 766498d93a4b06057a8e49d23f4068f1170ff38f	rezrov
+treeM 05bf9652e9b06473d6ca2f32ff60e2401e59bfa6
+100644 blob bb3b2cd2e136e1e4e7ecdf10068e246196dd8294	bozbar
+100644 blob 8e4020bb5a8d8c873b25de15933e75cc0fc275df	frotz
+100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
+:100644 100644 78d812a2124ff980a1a70f8cca493698d643d242 bb3b2cd2e136e1e4e7ecdf10068e246196dd8294 M	bozbar
+:000000 100644 0000000000000000000000000000000000000000 8e4020bb5a8d8c873b25de15933e75cc0fc275df A	frotz
+:100644 000000 766498d93a4b06057a8e49d23f4068f1170ff38f 0000000000000000000000000000000000000000 D	rezrov
+ok 1 - setup
 
-expecting success of 0000.78 'writing this tree with --missing-ok': 
-	git write-tree --missing-ok
+expecting success of 1002.2 '1, 2, 3 - no carry forward': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >1-3.out &&
+	cmp M.out 1-3.out &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	check_cache_at bozbar clean &&
+	check_cache_at frotz clean &&
+	check_cache_at nitfol clean
 
-6718b1dd2231ec9ad958238ceeaa06fbfbefda94
-ok 78 - writing this tree with --missing-ok
+bozbar: clean
+frotz: clean
+nitfol: clean
+ok 2 - 1, 2, 3 - no carry forward
 
-expecting success of 0000.79 'git read-tree followed by write-tree should be idempotent': 
-	rm -f .git/index &&
-	git read-tree $tree &&
-	test_path_is_file .git/index &&
-	newtree=$(git write-tree) &&
-	test "$newtree" = "$tree"
+expecting success of 1002.3 '4 - carry forward local addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo "+100644 X 0	yomin" >expected &&
+	echo yomin >yomin &&
+	git update-index --add yomin &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >4.out &&
+	test_might_fail git diff -U0 --no-index M.out 4.out >4diff.out &&
+	compare_change 4diff.out expected &&
+	check_cache_at yomin clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo yomin >yomin1 &&
+	diff yomin yomin1 &&
+	rm -f yomin1
 
-ok 79 - git read-tree followed by write-tree should be idempotent
+yomin: clean
+ok 3 - 4 - carry forward local addition.
 
-expecting success of 0000.80 'validate git diff-files output for a know cache/work tree state': 
-	cat >expected <<EOF &&
-:100644 100644 $(test_oid path0f) $ZERO_OID M	path0
-:120000 120000 $(test_oid path0s) $ZERO_OID M	path0sym
-:100644 100644 $(test_oid path2f) $ZERO_OID M	path2/file2
-:120000 120000 $(test_oid path2s) $ZERO_OID M	path2/file2sym
-:100644 100644 $(test_oid path3f) $ZERO_OID M	path3/file3
-:120000 120000 $(test_oid path3s) $ZERO_OID M	path3/file3sym
-:100644 100644 $(test_oid subp3f) $ZERO_OID M	path3/subp3/file3
-:120000 120000 $(test_oid subp3s) $ZERO_OID M	path3/subp3/file3sym
-EOF
-	git diff-files >current &&
-	test_cmp expected current
+expecting success of 1002.4 '5 - carry forward local addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	read_tree_u_must_succeed -m -u $treeH &&
+	echo yomin >yomin &&
+	git update-index --add yomin &&
+	echo yomin yomin >yomin &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >5.out &&
+	test_might_fail git diff -U0 --no-index M.out 5.out >5diff.out &&
+	compare_change 5diff.out expected &&
+	check_cache_at yomin dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	: dirty index should have prevented -u from checking it out. &&
+	echo yomin yomin >yomin1 &&
+	diff yomin yomin1 &&
+	rm -f yomin1
 
-ok 80 - validate git diff-files output for a know cache/work tree state
+yomin: dirty
+ok 4 - 5 - carry forward local addition.
 
-expecting success of 0000.81 'git update-index --refresh should succeed': 
-	git update-index --refresh
+expecting success of 1002.5 '6 - local addition already has the same.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo frotz >frotz &&
+	git update-index --add frotz &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >6.out &&
+	test_cmp M.out 6.out &&
+	check_cache_at frotz clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo frotz >frotz1 &&
+	diff frotz frotz1 &&
+	rm -f frotz1
 
-ok 81 - git update-index --refresh should succeed
+frotz: clean
+ok 5 - 6 - local addition already has the same.
 
-expecting success of 0000.82 'no diff after checkout and git update-index --refresh': 
-	git diff-files >current &&
-	cmp -s current /dev/null
+expecting success of 1002.6 '7 - local addition already has the same.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo frotz >frotz &&
+	git update-index --add frotz &&
+	echo frotz frotz >frotz &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >7.out &&
+	test_cmp M.out 7.out &&
+	check_cache_at frotz dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp nitfol.M nitfol &&
+	: dirty index should have prevented -u from checking it out. &&
+	echo frotz frotz >frotz1 &&
+	diff frotz frotz1 &&
+	rm -f frotz1
 
-ok 82 - no diff after checkout and git update-index --refresh
+frotz: dirty
+ok 6 - 7 - local addition already has the same.
 
-expecting success of 0000.83 'git commit-tree records the correct tree in a commit': 
-	commit0=$(echo NO | git commit-tree $P) &&
-	git show --pretty=raw $commit0 >out &&
-	tree=$(sed -n -e "s/^tree //p" -e "/^author /q" out) &&
-	test "z$tree" = "z$P"
+expecting success of 1002.7 '8 - conflicting addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
-ok 83 - git commit-tree records the correct tree in a commit
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 7 - 8 - conflicting addition.
 
-expecting success of 0000.84 'git commit-tree records the correct parent in a commit': 
-	commit1=$(echo NO | git commit-tree $P -p $commit0) &&
-	git show --pretty=raw $commit1 >out &&
-	parent=$(sed -n -e "s/^parent //p" -e "/^author /q" out) &&
-	test "z$commit0" = "z$parent"
+expecting success of 1002.8 '9 - conflicting addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	echo frotz >frotz &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
-ok 84 - git commit-tree records the correct parent in a commit
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 8 - 9 - conflicting addition.
 
-expecting success of 0000.85 'git commit-tree omits duplicated parent in a commit': 
-	commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
-	git show --pretty=raw $commit2 >out &&
-	cat >match.sed <<-\EOF &&
-	s/^parent //p
-	/^author /q
-	EOF
-	parent=$(sed -n -f match.sed out | sort -u) &&
-	test "z$commit0" = "z$parent" &&
-	git show --pretty=raw $commit2 >out &&
-	test_stdout_line_count = 1 sed -n -f match.sed out
+expecting success of 1002.9 '10 - path removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo rezrov >rezrov &&
+	git update-index --add rezrov &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >10.out &&
+	cmp M.out 10.out &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-error: duplicate parent d664f4b2f72710b8e019acf96c4773c8ac3993b8 ignored
-ok 85 - git commit-tree omits duplicated parent in a commit
+ok 9 - 10 - path removed.
 
-expecting success of 0000.86 'update-index D/F conflict': 
-	mv path0 tmp &&
-	mv path2 path0 &&
-	mv tmp path2 &&
-	git update-index --add --replace path2 path0/file2 &&
-	git ls-files path0 >tmp &&
-	numpath0=$(wc -l <tmp) &&
-	test $numpath0 = 1
+expecting success of 1002.10 '11 - dirty path removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo rezrov >rezrov &&
+	git update-index --add rezrov &&
+	echo rezrov rezrov >rezrov &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
-ok 86 - update-index D/F conflict
+error: Entry 'rezrov' not uptodate. Cannot merge.
+ok 10 - 11 - dirty path removed.
 
-expecting success of 0000.87 'very long name in the index handled sanely': 
+expecting success of 1002.11 '12 - unmatching local changes being removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo rezrov rezrov >rezrov &&
+	git update-index --add rezrov &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
-	a=a && # 1
-	a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 16
-	a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 256
-	a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 4096
-	a=${a}q &&
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 11 - 12 - unmatching local changes being removed.
 
-	>path4 &&
-	git update-index --add path4 &&
-	git ls-files -s path4 >tmp &&
-	(
-		sed -e "s/	.*/	/" tmp |
-		tr -d "\012" &&
-		echo "$a"
-	) | git update-index --index-info &&
-	git ls-files "a*" >tmp &&
-	len=$(wc -c <tmp) &&
-	test $len = 4098
+expecting success of 1002.12 '13 - unmatching local changes being removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo rezrov rezrov >rezrov &&
+	git update-index --add rezrov &&
+	echo rezrov >rezrov &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
-ok 87 - very long name in the index handled sanely
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 12 - 13 - unmatching local changes being removed.
 
-expecting success of 0000.88 'more update-index D/F conflicts': 
-	# empty the index to make sure our entry is last
-	git read-tree --empty &&
-	cacheinfo=100644,$(test_oid empty_blob) &&
-	git update-index --add --cacheinfo $cacheinfo,path5/a &&
+expecting success of 1002.13 '14 - unchanged in two heads.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo nitfol nitfol >nitfol &&
+	git update-index --add nitfol &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >14.out &&
+	test_must_fail git diff -U0 --no-index M.out 14.out >14diff.out &&
+	compare_change 14diff.out expected &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	check_cache_at nitfol clean &&
+	echo nitfol nitfol >nitfol1 &&
+	diff nitfol nitfol1 &&
+	rm -f nitfol1
 
-	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/file &&
-	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/file &&
-	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/c/file &&
+nitfol: clean
+ok 13 - 14 - unchanged in two heads.
 
-	# "a-" sorts between "a" and "a/"
-	git update-index --add --cacheinfo $cacheinfo,path5/a- &&
+expecting success of 1002.14 '15 - unchanged in two heads.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo nitfol nitfol >nitfol &&
+	git update-index --add nitfol &&
+	echo nitfol nitfol nitfol >nitfol &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >15.out &&
+	test_must_fail git diff -U0 --no-index M.out 15.out >15diff.out &&
+	compare_change 15diff.out expected &&
+	check_cache_at nitfol dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	echo nitfol nitfol nitfol >nitfol1 &&
+	diff nitfol nitfol1 &&
+	rm -f nitfol1
 
-	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/file &&
-	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/file &&
-	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/c/file &&
+nitfol: dirty
+ok 14 - 15 - unchanged in two heads.
 
-	cat >expected <<-\EOF &&
-	path5/a
-	path5/a-
-	EOF
-	git ls-files >actual &&
-	test_cmp expected actual
+expecting success of 1002.15 '16 - conflicting local change.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar bozbar >bozbar &&
+	git update-index --add bozbar &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
-error: 'path5/a/file' appears as both a file and as a directory
-error: path5/a/file: cannot add to the index - missing --add option?
-fatal: git update-index: --cacheinfo cannot add path5/a/file
-error: 'path5/a/b/file' appears as both a file and as a directory
-error: path5/a/b/file: cannot add to the index - missing --add option?
-fatal: git update-index: --cacheinfo cannot add path5/a/b/file
-error: 'path5/a/b/c/file' appears as both a file and as a directory
-error: path5/a/b/c/file: cannot add to the index - missing --add option?
-fatal: git update-index: --cacheinfo cannot add path5/a/b/c/file
-error: 'path5/a/file' appears as both a file and as a directory
-error: path5/a/file: cannot add to the index - missing --add option?
-fatal: git update-index: --cacheinfo cannot add path5/a/file
-error: 'path5/a/b/file' appears as both a file and as a directory
-error: path5/a/b/file: cannot add to the index - missing --add option?
-fatal: git update-index: --cacheinfo cannot add path5/a/b/file
-error: 'path5/a/b/c/file' appears as both a file and as a directory
-error: path5/a/b/c/file: cannot add to the index - missing --add option?
-fatal: git update-index: --cacheinfo cannot add path5/a/b/c/file
-ok 88 - more update-index D/F conflicts
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 15 - 16 - conflicting local change.
 
-expecting success of 0000.89 'test_must_fail on a failing git command': 
-	test_must_fail git notacommand
+expecting success of 1002.16 '17 - conflicting local change.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar bozbar >bozbar &&
+	git update-index --add bozbar &&
+	echo bozbar bozbar bozbar >bozbar &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
-git: 'notacommand' is not a git command. See 'git --help'.
-ok 89 - test_must_fail on a failing git command
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 16 - 17 - conflicting local change.
 
-expecting success of 0000.90 'test_must_fail on a failing git command with env': 
-	test_must_fail env var1=a var2=b git notacommand
+expecting success of 1002.17 '18 - local change already having a good result.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo gnusto >bozbar &&
+	git update-index --add bozbar &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >18.out &&
+	test_cmp M.out 18.out &&
+	check_cache_at bozbar clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-git: 'notacommand' is not a git command. See 'git --help'.
-ok 90 - test_must_fail on a failing git command with env
+bozbar: clean
+ok 17 - 18 - local change already having a good result.
 
-expecting success of 0000.91 'test_must_fail rejects a non-git command': 
-	! test_must_fail grep ^$ notafile 2>err &&
-	grep -F "test_must_fail: only 'git' is allowed" err
+expecting success of 1002.18 '19 - local change already having a good result, further modified.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo gnusto >bozbar &&
+	git update-index --add bozbar &&
+	echo gnusto gnusto >bozbar &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >19.out &&
+	test_cmp M.out 19.out &&
+	check_cache_at bozbar dirty &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo gnusto gnusto >bozbar1 &&
+	diff bozbar bozbar1 &&
+	rm -f bozbar1
 
-test_must_fail: only 'git' is allowed: grep ^$ notafile
-ok 91 - test_must_fail rejects a non-git command
+bozbar: dirty
+ok 18 - 19 - local change already having a good result, further modified.
 
-expecting success of 0000.92 'test_must_fail rejects a non-git command with env': 
-	! test_must_fail env var1=a var2=b grep ^$ notafile 2>err &&
-	grep -F "test_must_fail: only 'git' is allowed" err
+expecting success of 1002.19 '20 - no local change, use new tree.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar >bozbar &&
+	git update-index --add bozbar &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
+	git ls-files --stage >20.out &&
+	test_cmp M.out 20.out &&
+	check_cache_at bozbar clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-test_must_fail: only 'git' is allowed: env var1=a var2=b grep ^$ notafile
-ok 92 - test_must_fail rejects a non-git command with env
+bozbar: clean
+ok 19 - 20 - no local change, use new tree.
 
-# passed all 92 test(s)
-1..92
+expecting success of 1002.20 '21 - no local change, dirty cache.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar >bozbar &&
+	git update-index --add bozbar &&
+	echo gnusto gnusto >bozbar &&
+	! read_tree_u_must_succeed -m -u $treeH $treeM
+
+error: Entry 'bozbar' not uptodate. Cannot merge.
+ok 20 - 21 - no local change, dirty cache.
+
+expecting success of 1002.21 'DF vs DF/DF case setup.': 
+	rm -f .git/index &&
+	echo DF >DF &&
+	git update-index --add DF &&
+	treeDF=$(git write-tree) &&
+	echo treeDF $treeDF &&
+	git ls-tree $treeDF &&
+
+	rm -f DF &&
+	mkdir DF &&
+	echo DF/DF >DF/DF &&
+	git update-index --add --remove DF DF/DF &&
+	treeDFDF=$(git write-tree) &&
+	echo treeDFDF $treeDFDF &&
+	git ls-tree $treeDFDF &&
+	git ls-files --stage >DFDF.out
+
+treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
+100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
+treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
+040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
+ok 21 - DF vs DF/DF case setup.
+
+expecting success of 1002.22 'DF vs DF/DF case test.': 
+	rm -f .git/index &&
+	rm -fr DF &&
+	echo DF >DF &&
+	git update-index --add DF &&
+	read_tree_u_must_succeed -m -u $treeDF $treeDFDF &&
+	git ls-files --stage >DFDFcheck.out &&
+	test_cmp DFDF.out DFDFcheck.out &&
+	check_cache_at DF/DF clean
+
+DF/DF: clean
+ok 22 - DF vs DF/DF case test.
+
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1003-read-tree-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t1010-mktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-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
+expecting success of 1010.2 'ls-tree piped to mktree (1)': 
+	git mktree <top >actual &&
+	test_cmp tree actual
 
-ok 2 - read-tree --prefix
+ok 2 - ls-tree piped to mktree (1)
 
-expecting success of 1003.3 'read-tree --prefix with leading slash exits with error': 
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/two/ $tree &&
-	git read-tree --prefix=two/ $tree &&
+expecting success of 1010.3 'ls-tree piped to mktree (2)': 
+	git mktree <top.withsub >actual &&
+	test_cmp tree.withsub actual
 
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/ $tree &&
-	git read-tree --prefix= $tree
+ok 3 - ls-tree piped to mktree (2)
 
-rm 'one'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-ok 3 - read-tree --prefix with leading slash exits with error
+expecting success of 1010.4 'ls-tree output in wrong order given to mktree (1)': 
+	perl -e "print reverse <>" <top |
+	git mktree >actual &&
+	test_cmp tree actual
 
-# passed all 3 test(s)
-1..3
+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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1000-read-tree-m-3way.sh ***
@@ -38203,1611 +40899,76 @@
 1..83
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1001-read-tree-m-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t0410-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/.git/
+expecting success of 0410.1 'extensions.partialclone without filter': 
+	test_create_repo server &&
+	git clone --filter="blob:none" "file://$(pwd)/server" client &&
+	git -C client config --unset remote.origin.partialclonefilter &&
+	git -C client fetch origin
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/server/.git/
+Cloning into 'client'...
+warning: You appear to have cloned an empty repository.
+ok 1 - extensions.partialclone without filter
 
-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 0410.2 'convert shallow clone to partial clone': 
+	rm -fr server client &&
+	test_create_repo server &&
+	test_commit -C server my_commit 1 &&
+	test_commit -C server my_commit2 1 &&
+	git clone --depth=1 "file://$(pwd)/server" client &&
+	git -C client fetch --unshallow --filter="blob:none" &&
+	test_cmp_config -C client true remote.origin.promisor &&
+	test_cmp_config -C client blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C client 1 core.repositoryformatversion
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/server/.git/
+[master (root-commit) 282d88a] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+[master b56a127] my_commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'client'...
+warning: filtering not recognized by server, ignoring
+warning: filtering not recognized by server, ignoring
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/server
+ * [new tag]         my_commit  -> my_commit
+ok 2 - convert shallow clone to partial clone
 
-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
+checking prerequisite: DEFAULT_REPO_FORMAT
 
-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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+	test_have_prereq SHA1,REFFILES
 
-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.
+)
+checking prerequisite: SHA1
 
-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
+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
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
-yomin: dirty
-ok 4 - 5 - carry forward local addition.
-
-expecting success of 1001.5 '6 - local addition already has the same.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	git update-index --add frotz &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >6.out &&
-	test_cmp M.out 6.out &&
-	check_cache_at frotz clean
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-frotz: clean
-ok 5 - 6 - local addition already has the same.
-
-expecting success of 1001.6 '7 - local addition already has the same.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo frotz >frotz &&
-	git update-index --add frotz &&
-	echo frotz frotz >frotz &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >7.out &&
-	test_cmp M.out 7.out &&
-	check_cache_at frotz dirty
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-frotz: dirty
-ok 6 - 7 - local addition already has the same.
-
-expecting success of 1001.7 '8 - conflicting addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo frotz frotz >frotz &&
-	git update-index --add frotz &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 7 - 8 - conflicting addition.
-
-expecting success of 1001.8 '9 - conflicting addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo frotz frotz >frotz &&
-	git update-index --add frotz &&
-	echo frotz >frotz &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 8 - 9 - conflicting addition.
-
-expecting success of 1001.9 '10 - path removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo rezrov >rezrov &&
-	git update-index --add rezrov &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >10.out &&
-	test_cmp M.out 10.out
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-ok 9 - 10 - path removed.
-
-expecting success of 1001.10 '11 - dirty path removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo rezrov >rezrov &&
-	git update-index --add rezrov &&
-	echo rezrov rezrov >rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'rezrov' not uptodate. Cannot merge.
-ok 10 - 11 - dirty path removed.
-
-expecting success of 1001.11 '12 - unmatching local changes being removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo rezrov rezrov >rezrov &&
-	git update-index --add rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 11 - 12 - unmatching local changes being removed.
-
-expecting success of 1001.12 '13 - unmatching local changes being removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo rezrov rezrov >rezrov &&
-	git update-index --add rezrov &&
-	echo rezrov >rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 12 - 13 - unmatching local changes being removed.
-
-expecting success of 1001.13 '14 - unchanged in two heads.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo nitfol nitfol >nitfol &&
-	git update-index --add nitfol &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >14.out &&
-	test_must_fail git diff --no-index M.out 14.out >14diff.out &&
-	compare_change 14diff.out expected &&
-	check_cache_at nitfol clean
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: clean
-ok 13 - 14 - unchanged in two heads.
-
-expecting success of 1001.14 '15 - unchanged in two heads.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo nitfol nitfol >nitfol &&
-	git update-index --add nitfol &&
-	echo nitfol nitfol nitfol >nitfol &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >15.out &&
-	test_must_fail git diff --no-index M.out 15.out >15diff.out &&
-	compare_change 15diff.out expected &&
-	check_cache_at nitfol dirty
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: dirty
-ok 14 - 15 - unchanged in two heads.
-
-expecting success of 1001.15 '16 - conflicting local change.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo bozbar bozbar >bozbar &&
-	git update-index --add bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 15 - 16 - conflicting local change.
-
-expecting success of 1001.16 '17 - conflicting local change.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo bozbar bozbar >bozbar &&
-	git update-index --add bozbar &&
-	echo bozbar bozbar bozbar >bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 16 - 17 - conflicting local change.
-
-expecting success of 1001.17 '18 - local change already having a good result.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-new >bozbar &&
-	git update-index --add bozbar &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >18.out &&
-	test_cmp M.out 18.out &&
-	check_cache_at bozbar clean
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: clean
-ok 17 - 18 - local change already having a good result.
-
-expecting success of 1001.18 '19 - local change already having a good result, further modified.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-new >bozbar &&
-	git update-index --add bozbar &&
-	echo gnusto gnusto >bozbar &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >19.out &&
-	test_cmp M.out 19.out &&
-	check_cache_at bozbar dirty
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
-ok 18 - 19 - local change already having a good result, further modified.
-
-expecting success of 1001.19 '20 - no local change, use new tree.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-old >bozbar &&
-	git update-index --add bozbar &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >20.out &&
-	test_cmp M.out 20.out &&
-	check_cache_at bozbar dirty
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
-ok 19 - 20 - no local change, use new tree.
-
-expecting success of 1001.20 '21 - no local change, dirty cache.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-old >bozbar &&
-	git update-index --add bozbar &&
-	echo gnusto gnusto >bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'bozbar' not uptodate. Cannot merge.
-ok 20 - 21 - no local change, dirty cache.
-
-expecting success of 1001.21 '22 - local change cache updated.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
-	git update-index --add bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 21 - 22 - local change cache updated.
-
-expecting success of 1001.22 'DF vs DF/DF case setup.': 
-	rm -f .git/index &&
-	echo DF >DF &&
-	git update-index --add DF &&
-	treeDF=$(git write-tree) &&
-	echo treeDF $treeDF &&
-	git ls-tree $treeDF &&
-
-	rm -f DF &&
-	mkdir DF &&
-	echo DF/DF >DF/DF &&
-	git update-index --add --remove DF DF/DF &&
-	treeDFDF=$(git write-tree) &&
-	echo treeDFDF $treeDFDF &&
-	git ls-tree $treeDFDF &&
-	git ls-files --stage >DFDF.out
-
-treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
-100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
-treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
-040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 22 - DF vs DF/DF case setup.
-
-expecting success of 1001.23 'DF vs DF/DF case test.': 
-	rm -f .git/index &&
-	rm -fr DF &&
-	echo DF >DF &&
-	git update-index --add DF &&
-	read_tree_twoway $treeDF $treeDFDF &&
-	git ls-files --stage >DFDFcheck.out &&
-	test_cmp DFDF.out DFDFcheck.out &&
-	check_cache_at DF/DF dirty &&
-	:
-
-100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0	DF/DF
-DF/DF: dirty
-ok 23 - DF vs DF/DF case test.
-
-expecting success of 1001.24 'a/b (untracked) vs a case setup.': 
-	rm -f .git/index &&
-	: >a &&
-	git update-index --add a &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	git ls-files --stage >treeM.out &&
-
-	rm -f a &&
-	git update-index --remove a &&
-	mkdir a &&
-	: >a/b &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH
-
-treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
-treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 24 - a/b (untracked) vs a case setup.
-
-expecting success of 1001.25 'a/b (untracked) vs a, plus c/d case test.': 
-	read_tree_u_must_fail -u -m "$treeH" "$treeM" &&
-	git ls-files --stage &&
-	test -f a/b
-
-error: Updating 'a' would lose untracked files in it
-error: Updating 'a' would lose untracked files in it
-ok 25 - a/b (untracked) vs a, plus c/d case test.
-
-expecting success of 1001.26 'read-tree supports the super-prefix': 
-	cat <<-EOF >expect &&
-		error: Updating 'fictional/a' would lose untracked files in it
-	EOF
-	test_must_fail git read-tree --super-prefix fictional/ -u -m "$treeH" "$treeM" 2>actual &&
-	test_cmp expect actual
-
-ok 26 - read-tree supports the super-prefix
-
-expecting success of 1001.27 'a/b vs a, plus c/d case setup.': 
-	rm -f .git/index &&
-	rm -fr a &&
-	: >a &&
-	mkdir c &&
-	: >c/d &&
-	git update-index --add a c/d &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	git ls-files --stage >treeM.out &&
-
-	rm -f a &&
-	mkdir a &&
-	: >a/b &&
-	git update-index --add --remove a a/b &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH
-
-treeM 3e82e8b9894d6c7982dcd25a6dad66400d52735f
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
-040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee	c
-treeH 02c6f058fb950781e5b773c21e4c237db1ff4d5a
-040000 tree 4277b6e69d25e5efa77c455340557b384a4c018a	a
-040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee	c
-ok 27 - a/b vs a, plus c/d case setup.
-
-expecting success of 1001.28 'a/b vs a, plus c/d case test.': 
-	read_tree_u_must_succeed -u -m "$treeH" "$treeM" &&
-	git ls-files --stage >treeMcheck.out &&
-	test_cmp treeM.out treeMcheck.out
-
-ok 28 - a/b vs a, plus c/d case test.
-
-expecting success of 1001.29 '-m references the correct modified tree': 
-	echo >file-a &&
-	echo >file-b &&
-	git add file-a file-b &&
-	git commit -a -m "test for correct modified tree" &&
-	git branch initial-mod &&
-	echo b >file-b &&
-	git commit -a -m "B" &&
-	echo a >file-a &&
-	git add file-a &&
-	git ls-tree $(git write-tree) file-a >expect &&
-	read_tree_must_succeed -m HEAD initial-mod &&
-	git ls-tree $(git write-tree) file-a >actual &&
-	test_cmp expect actual
-
-[master (root-commit) 0d16b8a] test for correct modified tree
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 c/d
- create mode 100644 file-a
- create mode 100644 file-b
-[master 9f64e7b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 29 - -m references the correct modified tree
-
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0301-credential-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0410-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/.git/
-expecting success of 0410.1 'extensions.partialclone without filter': 
-	test_create_repo server &&
-	git clone --filter="blob:none" "file://$(pwd)/server" client &&
-	git -C client config --unset remote.origin.partialclonefilter &&
-	git -C client fetch origin
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/server/.git/
-Cloning into 'client'...
-warning: You appear to have cloned an empty repository.
-ok 1 - extensions.partialclone without filter
-
-expecting success of 0410.2 'convert shallow clone to partial clone': 
-	rm -fr server client &&
-	test_create_repo server &&
-	test_commit -C server my_commit 1 &&
-	test_commit -C server my_commit2 1 &&
-	git clone --depth=1 "file://$(pwd)/server" client &&
-	git -C client fetch --unshallow --filter="blob:none" &&
-	test_cmp_config -C client true remote.origin.promisor &&
-	test_cmp_config -C client blob:none remote.origin.partialclonefilter &&
-	test_cmp_config -C client 1 core.repositoryformatversion
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/server/.git/
-[master (root-commit) 282d88a] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-[master b56a127] my_commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'client'...
-warning: filtering not recognized by server, ignoring
-warning: filtering not recognized by server, ignoring
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/server
- * [new tag]         my_commit  -> my_commit
-ok 2 - convert shallow clone to partial clone
-
-checking prerequisite: DEFAULT_REPO_FORMAT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-	test_have_prereq SHA1,REFFILES
-
-)
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-	case "$GIT_DEFAULT_HASH" in
-	sha1) true ;;
-	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
-	*) false ;;
-	esac
-
-)
-prerequisite SHA1 ok
-prerequisite DEFAULT_REPO_FORMAT ok
-expecting success of 0410.3 'convert to partial clone with noop extension': 
-	rm -fr server client &&
-	test_create_repo server &&
-	test_commit -C server my_commit 1 &&
-	test_commit -C server my_commit2 1 &&
-	git clone --depth=1 "file://$(pwd)/server" client &&
-	test_cmp_config -C client 0 core.repositoryformatversion &&
-	git -C client config extensions.noop true &&
-	git -C client fetch --unshallow --filter="blob:none"
+)
+prerequisite SHA1 ok
+prerequisite DEFAULT_REPO_FORMAT ok
+expecting success of 0410.3 'convert to partial clone with noop extension': 
+	rm -fr server client &&
+	test_create_repo server &&
+	test_commit -C server my_commit 1 &&
+	test_commit -C server my_commit2 1 &&
+	git clone --depth=1 "file://$(pwd)/server" client &&
+	test_cmp_config -C client 0 core.repositoryformatversion &&
+	git -C client config extensions.noop true &&
+	git -C client fetch --unshallow --filter="blob:none"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0410-partial-clone/server/.git/
 [master (root-commit) 593c6ee] my_commit
@@ -40981,4281 +42142,1607 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0600-reffiles-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+*** t1015-read-index-unmerged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1015-read-index-unmerged/.git/
+expecting success of 1015.1 'setup modify/delete + directory/file conflict': 
+	test_create_repo df_plus_modify_delete &&
+	(
+		cd df_plus_modify_delete &&
 
-[main (root-commit) d31adcd] Initial
+		test_write_lines a b c d e f g h >letters &&
+		git add letters &&
+		git commit -m initial &&
+
+		git checkout -b modify &&
+		# Throw in letters.txt for sorting order fun
+		# ("letters.txt" sorts between "letters" and "letters/file")
+		echo i >>letters &&
+		echo "version 2" >letters.txt &&
+		git add letters letters.txt &&
+		git commit -m modified &&
+
+		git checkout -b delete HEAD^ &&
+		git rm letters &&
+		mkdir letters &&
+		>letters/file &&
+		echo "version 1" >letters.txt &&
+		git add letters letters.txt &&
+		git commit -m deleted
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1015-read-index-unmerged/df_plus_modify_delete/.git/
+[master (root-commit) 461649b] initial
  Author: A U Thor <author@example.com>
-[main e6940ad] Second
+ 1 file changed, 8 insertions(+)
+ create mode 100644 letters
+Switched to a new branch 'modify'
+[modify 4e26d91] modified
  Author: A U Thor <author@example.com>
-[main c2327cb] Third
+ 2 files changed, 2 insertions(+)
+ create mode 100644 letters.txt
+Switched to a new branch 'delete'
+rm 'letters'
+[delete 380ce95] deleted
  Author: A U Thor <author@example.com>
-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
+ 3 files changed, 1 insertion(+), 8 deletions(-)
+ delete mode 100644 letters
+ create mode 100644 letters.txt
+ create mode 100644 letters/file
+ok 1 - setup modify/delete + directory/file conflict
 
-expecting success of 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 1015.2 'read-tree --reset cleans unmerged entries': 
+	test_when_finished "git -C df_plus_modify_delete clean -f" &&
+	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
+	(
+		cd df_plus_modify_delete &&
 
-ok 3 - empty directory should not fool for-each-ref
+		git checkout delete^0 &&
+		test_must_fail git merge modify &&
 
-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
+		git read-tree --reset HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-ok 4 - empty directory should not fool create
+Note: switching to 'delete^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 5 - empty directory should not fool verify
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-ok 6 - empty directory should not fool 1-arg update
+Or undo this operation with:
 
-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
+  git switch -
 
-ok 7 - empty directory should not fool 2-arg update
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 380ce95 deleted
+Auto-merging letters.txt
+CONFLICT (add/add): Merge conflict in letters.txt
+CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
+CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 380ce95 deleted
+Removing conflicts
+Removing letters~modify
+ok 2 - read-tree --reset cleans unmerged entries
 
-ok 8 - empty directory should not fool 0-arg delete
+expecting success of 1015.3 'One reset --hard cleans unmerged entries': 
+	test_when_finished "git -C df_plus_modify_delete clean -f" &&
+	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
+	(
+		cd df_plus_modify_delete &&
 
-expecting success of 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
+		git checkout delete^0 &&
+		test_must_fail git merge modify &&
 
-ok 9 - empty directory should not fool 1-arg delete
+		git reset --hard &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-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
+HEAD is now at 380ce95 deleted
+Auto-merging letters.txt
+CONFLICT (add/add): Merge conflict in letters.txt
+CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
+CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 380ce95 deleted
+HEAD is now at 380ce95 deleted
+Removing conflicts
+ok 3 - One reset --hard cleans unmerged entries
 
-ok 10 - non-empty directory blocks create
+expecting success of 1015.4 'setup directory/file conflict + simple edit/edit': 
+	test_create_repo df_plus_edit_edit &&
+	(
+		cd df_plus_edit_edit &&
 
-expecting success of 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
+		test_seq 1 10 >numbers &&
+		git add numbers &&
+		git commit -m initial &&
 
-ok 11 - broken reference blocks create
+		git checkout -b d-edit &&
+		mkdir foo &&
+		echo content >foo/bar &&
+		git add foo &&
+		echo 11 >>numbers &&
+		git add numbers &&
+		git commit -m "directory and edit" &&
 
-expecting success of 0600.12 'non-empty directory blocks indirect create': 
-	prefix=refs/ne-indirect-create &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	mkdir -p .git/$prefix/foo/bar &&
-	: >.git/$prefix/foo/bar/baz.lock &&
-	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/symref': there is a non-empty directory '.git/$prefix/foo' blocking reference '$prefix/foo'
-	EOF
-	printf "%s\n" "update $prefix/symref $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo'
-	EOF
-	printf "%s\n" "update $prefix/symref $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+		git checkout -b f-edit d-edit^1 &&
+		echo content >foo &&
+		git add foo &&
+		echo eleven >>numbers &&
+		git add numbers &&
+		git commit -m "file and edit"
+	)
 
-ok 12 - non-empty directory blocks indirect create
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1015-read-index-unmerged/df_plus_edit_edit/.git/
+[master (root-commit) e5e228a] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 numbers
+Switched to a new branch 'd-edit'
+[d-edit 1997ecb] directory and edit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo/bar
+Switched to a new branch 'f-edit'
+[f-edit ea28ef2] file and edit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo
+ok 4 - setup directory/file conflict + simple edit/edit
 
-expecting success of 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 1015.5 'git merge --abort succeeds despite D/F conflict': 
+	test_when_finished "git -C df_plus_edit_edit clean -f" &&
+	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
+	(
+		cd df_plus_edit_edit &&
 
-ok 13 - broken reference blocks indirect create
+		git checkout f-edit^0 &&
+		test_must_fail git merge d-edit^0 &&
 
-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
+		git merge --abort &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-ok 14 - no bogus intermediate values during delete
+Note: switching to 'f-edit^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-error: Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0600-reffiles-backend/.git/packed-refs.lock': File exists.
-ok 15 - delete fails cleanly if packed-refs file is locked
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-error: unable to create file /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0600-reffiles-backend/.git/packed-refs.new: File exists
-ok 16 - delete fails cleanly if packed-refs.new write fails
+Or undo this operation with:
 
-expecting success of 0600.17 'setup worktree': 
-	test_commit first &&
-	git worktree add -b wt-main wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
+  git switch -
 
-[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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 &&
+HEAD is now at ea28ef2 file and edit
+CONFLICT (file/directory): directory in the way of foo from HEAD; moving it to foo~HEAD instead.
+Auto-merging numbers
+CONFLICT (content): Merge conflict in numbers
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at ea28ef2 file and edit
+Removing conflicts
+ok 5 - git merge --abort succeeds despite D/F conflict
 
-	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 &&
+expecting success of 1015.6 'git am --skip succeeds despite D/F conflict': 
+	test_when_finished "git -C df_plus_edit_edit clean -f" &&
+	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
+	(
+		cd df_plus_edit_edit &&
 
-	$RWT for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	PSEUDO_WT_HEAD
-	refs/bisect/wt-random
-	refs/heads/main
-	refs/heads/wt-main
-	EOF
-	test_cmp expected actual &&
+		git checkout f-edit^0 &&
+		git format-patch -1 d-edit &&
+		test_must_fail git am -3 0001*.patch &&
 
-	$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
+		git am --skip &&
+		test_path_is_missing .git/rebase-apply &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-ok 18 - for_each_reflog()
+HEAD is now at ea28ef2 file and edit
+0001-directory-and-edit.patch
+Applying: directory and edit
+Using index info to reconstruct a base tree...
+M	numbers
+Falling back to patching base and 3-way merge...
+Merging:
+ea28ef2 file and edit
+virtual directory and edit
+found 1 common ancestor:
+virtual 75a3e2be4ba4a7062d21fba0206758f5518d6ead
+Auto-merging numbers
+CONFLICT (content): Merge conflict in numbers
+Adding foo/bar
+Removing foo to make room for subdirectory
 
-checking prerequisite: SHA1
+CONFLICT (file/directory): There is a directory with name foo in directory and edit. Adding foo as foo~HEAD
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 directory and edit
+HEAD is now at ea28ef2 file and edit
+Removing 0001-directory-and-edit.patch
+Removing conflicts
+Removing foo~HEAD
+ok 6 - git am --skip succeeds despite D/F conflict
 
-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
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1014-read-tree-confusing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1014-read-tree-confusing/.git/
+expecting success of 1014.1 'create base tree': 
+	echo content >file &&
+	git add file &&
+	git commit -m base &&
+	blob=$(git rev-parse HEAD:file) &&
+	tree=$(git rev-parse HEAD^{tree})
 
-)
-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
+[master (root-commit) 5d770fe] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - create base tree
 
-Switched to a new branch 'reflogskip'
-ok 19 - parsing reverse reflogs at BUFSIZ boundaries
+expecting success of 1014.2 'enable core.protectHFS for rejection tests': 
+	git config core.protectHFS true
 
-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 2 - enable core.protectHFS for rejection tests
 
-ok 20 - reflog expire operates on symref not referrent
+expecting success of 1014.3 'enable core.protectNTFS for rejection tests': 
+	git config core.protectNTFS true
 
-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
+ok 3 - enable core.protectNTFS for rejection tests
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1014.4 'reject . at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.'
+ok 4 - reject . at end of path
 
-checking prerequisite: SYMLINKS
+expecting success of 1014.5 'reject . as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path './file'
+ok 5 - reject . as subtree
 
-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 1014.6 'reject .. at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '..'
+ok 6 - reject .. at end of path
 
-)
-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 1014.7 'reject .. as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '../file'
+ok 7 - reject .. as subtree
 
-fatal: Needed a single revision
-ok 22 - ref resolution not confused by broken symlinks
+expecting success of 1014.8 'reject .git at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git'
+ok 8 - reject .git at end of path
 
-expecting success of 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 1014.9 'reject .git as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git/file'
+ok 9 - reject .git as subtree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1014.10 'reject .GIT at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GIT'
+ok 10 - reject .GIT at end of path
 
-expecting success of 0600.24 'log diagnoses bogus HEAD symref': 
-	git init empty &&
-	test-tool -C empty ref-store main create-symref HEAD refs/heads/invalid.lock &&
-	test_must_fail git -C empty log 2>stderr &&
-	test_grep broken stderr &&
-	test_must_fail git -C empty log --default totally-bogus 2>stderr &&
-	test_grep broken stderr
+expecting success of 1014.11 'reject .GIT as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GIT/file'
+ok 11 - reject .GIT as subtree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1014.12 'reject {u200c}.Git at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '‌.Git'
+ok 12 - reject {u200c}.Git at end of path
 
-expecting success of 0600.25 'empty directory removal': 
-	git branch d1/d2/r1 HEAD &&
-	git branch d1/r2 HEAD &&
-	test_path_is_file .git/refs/heads/d1/d2/r1 &&
-	test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
-	git branch -d d1/d2/r1 &&
-	test_must_fail git show-ref --verify -q refs/heads/d1/d2 &&
-	test_must_fail git show-ref --verify -q logs/refs/heads/d1/d2 &&
-	test_path_is_file .git/refs/heads/d1/r2 &&
-	test_path_is_file .git/logs/refs/heads/d1/r2
+expecting success of 1014.13 'reject {u200c}.Git as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '‌.Git/file'
+ok 13 - reject {u200c}.Git as subtree
 
-Deleted branch d1/d2/r1 (was 89a3a1d).
-ok 25 - empty directory removal
+expecting success of 1014.14 'reject .gI{u200c}T at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.gI‌T'
+ok 14 - reject .gI{u200c}T at end of path
 
-expecting success of 0600.26 'symref empty directory removal': 
-	git branch e1/e2/r1 HEAD &&
-	git branch e1/r2 HEAD &&
-	git checkout e1/e2/r1 &&
-	test_when_finished "git checkout main" &&
-	test_path_is_file .git/refs/heads/e1/e2/r1 &&
-	test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
-	git update-ref -d HEAD &&
-	test_must_fail git show-ref --verify -q refs/heads/e1/e2 &&
-	test_must_fail git show-ref --verify -q logs/refs/heads/e1/e2 &&
-	test_path_is_file .git/refs/heads/e1/r2 &&
-	test_path_is_file .git/logs/refs/heads/e1/r2 &&
-	test_path_is_file .git/logs/HEAD
+expecting success of 1014.15 'reject .gI{u200c}T as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.gI‌T/file'
+ok 15 - reject .gI{u200c}T as subtree
 
-Switched to branch 'e1/e2/r1'
-Switched to branch 'main'
-ok 26 - symref empty directory removal
+expecting success of 1014.16 'reject .GiT{u200c} at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GiT‌'
+ok 16 - reject .GiT{u200c} at end of path
 
-expecting success of 0600.27 'directory not created deleting packed ref': 
-	git branch d1/d2/r1 HEAD &&
-	git pack-refs --all &&
-	test_path_is_missing .git/refs/heads/d1/d2 &&
-	git update-ref -d refs/heads/d1/d2/r1 &&
-	test_path_is_missing .git/refs/heads/d1/d2 &&
-	test_path_is_missing .git/refs/heads/d1
+expecting success of 1014.17 'reject .GiT{u200c} as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GiT‌/file'
+ok 17 - reject .GiT{u200c} as subtree
 
-ok 27 - directory not created deleting packed ref
+expecting success of 1014.18 'reject git~1 at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path 'git~1'
+ok 18 - reject git~1 at end of path
 
-expecting success of 0600.28 'git branch -m u v should fail when the reflog for u is a symlink': 
-	git branch --create-reflog u &&
-	mv .git/logs/refs/heads/u real-u &&
-	ln -s real-u .git/logs/refs/heads/u &&
-	test_must_fail git branch -m u v
+expecting success of 1014.19 'reject git~1 as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path 'git~1/file'
+ok 19 - reject git~1 as subtree
 
-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 1014.20 'reject .git.{space} at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git. '
+ok 20 - reject .git.{space} at end of path
 
-expecting success of 0600.29 'git branch -m with symlinked .git/refs': 
-	test_when_finished "rm -rf subdir" &&
-	git init --bare subdir &&
+expecting success of 1014.21 'reject .git.{space} as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git. /file'
+ok 21 - reject .git.{space} as subtree
 
-	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 1014.22 'reject backslashes at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.\.GIT\foobar'
+ok 22 - reject backslashes at end of path
 
-	git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
-	git rev-parse --absolute-git-dir >our.dir &&
-	! test_cmp subdir.dir our.dir &&
+expecting success of 1014.23 'reject backslashes as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.\.GIT\foobar/file'
+ok 23 - reject backslashes as subtree
 
-	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 1014.24 'reject backslashes2 at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git\foobar'
+ok 24 - reject backslashes2 at end of path
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0600-reffiles-backend/subdir/
---- subdir.dir	2025-02-09 06:53:25.485468053 +0000
-+++ our.dir	2025-02-09 06:53:25.489468079 +0000
-@@ -1 +1 @@
--/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0600-reffiles-backend/subdir
-+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0600-reffiles-backend/.git
-commit 89a3a1dedc5a76d0eefcd624dfb8d4f8004a1994
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 1014.25 'reject backslashes2 as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git\foobar/file'
+ok 25 - reject backslashes2 as subtree
 
-    first
+expecting success of 1014.26 'reject .git...:alternate-stream at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git...:alternate-stream'
+ok 26 - reject .git...:alternate-stream at end of path
 
-commit c2327cb6b086a944f739ef59ddcffd3d45998884
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+expecting success of 1014.27 'reject .git...:alternate-stream as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git...:alternate-stream/file'
+ok 27 - reject .git...:alternate-stream as subtree
 
-    Third
+expecting success of 1014.28 'utf-8 paths allowed with core.protectHFS off': 
+	test_when_finished "git read-tree HEAD" &&
+	test_config core.protectHFS false &&
+	printf "100644 blob %s\t%s" "$blob" ".gi${u200c}t" >tree &&
+	ok=$(git mktree <tree) &&
+	git read-tree $ok
 
-commit e6940ad615916edba236dd73cb432b3598c8537f
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+ok 28 - utf-8 paths allowed with core.protectHFS off
 
-    Second
+# passed all 28 test(s)
+1..28
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1012-read-tree-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-commit d31adcd248e1f85d12741183d231fa5260dcfd5e
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+	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: &&
 
-    Initial
-Deleted branch rename-dest (was 89a3a1d).
-ok 29 - git branch -m with symlinked .git/refs
+	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
+	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
+	:
 
-checking prerequisite: SYMLINKS_WINDOWS
+ok 1 - setup
 
-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
+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
 
-)
-prerequisite SYMLINKS_WINDOWS not satisfied
-ok 30 # skip rebase when .git/logs is a symlink (missing SYMLINKS_WINDOWS,MINGW of MINGW,SYMLINKS_WINDOWS)
+ok 2 - 3-way (1)
 
-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
+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 31 - git reflog expire honors core.sharedRepository
+ok 3 - 3-way (2)
 
-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
+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
-	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
+ok 4 - 3-way (3)
 
-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
+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 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
+ok 5 - 2-way (1)
 
-# passed all 33 test(s)
-1..33
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1008-read-tree-overlay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t1011-read-tree-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1011-read-tree-sparse-checkout/.git/
+expecting success of 1011.1 'setup': 
+	test_commit init &&
+	echo modified >>init.t &&
 
-[main (root-commit) 4d54ff5] initial
+	cat >expected <<-EOF &&
+	100644 $(git hash-object init.t) 0	init.t
+	100644 $EMPTY_BLOB 0	sub/added
+	100644 $EMPTY_BLOB 0	sub/addedtoo
+	100644 $EMPTY_BLOB 0	subsub/added
+	EOF
+	cat >expected.swt <<-\EOF &&
+	H init.t
+	H sub/added
+	H sub/addedtoo
+	H subsub/added
+	EOF
+
+	mkdir sub subsub &&
+	touch sub/added sub/addedtoo subsub/added &&
+	git add init.t sub/added sub/addedtoo subsub/added &&
+	git commit -m "modified and added" &&
+	git tag top &&
+	git rm sub/added &&
+	git commit -m removed &&
+	git tag removed &&
+	git checkout top &&
+	git ls-files --stage >result &&
+	test_cmp expected result
+
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-[main a9fb064] second
+ create mode 100644 init.t
+[master 9598e22] modified and added
  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
+ 4 files changed, 1 insertion(+)
+ create mode 100644 sub/added
+ create mode 100644 sub/addedtoo
+ create mode 100644 subsub/added
+rm 'sub/added'
+[master de70956] removed
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b/c
-ok 1 - setup
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 sub/added
+Note: switching to 'top'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 - multi-read
+If you want to 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1009-read-tree-new-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1009-read-tree-new-index/.git/
-expecting success of 1009.1 'setup': 
-	echo one >a &&
-	git add a &&
-	git commit -m initial
+  git switch -c <new-branch-name>
 
-[main (root-commit) 4d54ff5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 1 - setup
+Or undo this operation with:
 
-expecting success of 1009.2 'non-existent index file': 
-	rm -f new-index &&
-	GIT_INDEX_FILE=new-index git read-tree main
+  git switch -
 
-ok 2 - non-existent index file
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1009.3 'empty index file': 
-	rm -f new-index &&
-	> new-index &&
-	GIT_INDEX_FILE=new-index git read-tree main
+HEAD is now at 9598e22 modified and added
+ok 1 - setup
 
-ok 3 - empty index file
+expecting success of 1011.2 'read-tree without .git/info/sparse-checkout': 
+	read_tree_u_must_succeed -m -u HEAD &&
+	git ls-files --stage >result &&
+	test_cmp expected result &&
+	git ls-files -t >result &&
+	test_cmp expected.swt result
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1005-read-tree-reset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1005-read-tree-reset/.git/
-expecting success of 1005.1 'setup': 
-	git init &&
-	mkdir df &&
-	echo content >df/file &&
-	git add df/file &&
-	git commit -m one &&
-	git ls-files >expect &&
-	rm -rf df &&
-	echo content >df &&
-	git add df &&
-	echo content >new &&
-	git add new &&
-	git commit -m two
+ok 2 - read-tree without .git/info/sparse-checkout
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1005-read-tree-reset/.git/
-[master (root-commit) 92e0c46] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 df/file
-[master 12f5e11] two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename df/file => df (100%)
- create mode 100644 new
-ok 1 - setup
+expecting success of 1011.3 'read-tree with .git/info/sparse-checkout but disabled': 
+	mkdir .git/info &&
+	echo >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
+	git ls-files -t >result &&
+	test_cmp expected.swt result &&
+	test_path_is_file init.t &&
+	test_path_is_file sub/added
 
-expecting success of 1005.2 'reset should work': 
-	read_tree_u_must_succeed -u --reset HEAD^ &&
-	git ls-files >actual &&
-	test_cmp expect actual
+ok 3 - read-tree with .git/info/sparse-checkout but disabled
 
-ok 2 - reset should work
+expecting success of 1011.4 'read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled': 
+	git config core.sparsecheckout true &&
+	echo >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed --no-sparse-checkout -m -u HEAD &&
+	git ls-files -t >result &&
+	test_cmp expected.swt result &&
+	test_path_is_file init.t &&
+	test_path_is_file sub/added
 
-expecting success of 1005.3 'reset should remove remnants from a failed merge': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+ok 4 - read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 3 - reset should remove remnants from a failed merge
+expecting success of 1011.5 'read-tree with empty .git/info/sparse-checkout': 
+	git config core.sparsecheckout true &&
+	echo >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
+	git ls-files --stage >result &&
+	test_cmp expected result &&
+	git ls-files -t >result &&
+	cat >expected.swt <<-\EOF &&
+	S init.t
+	S sub/added
+	S sub/addedtoo
+	S subsub/added
+	EOF
+	test_cmp expected.swt result &&
+	test_path_is_missing init.t &&
+	test_path_is_missing sub/added
 
-expecting success of 1005.4 'two-way reset should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD HEAD &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+ok 5 - read-tree with empty .git/info/sparse-checkout
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 4 - two-way reset should remove remnants too
+expecting success of 1011.6 'match directories with trailing slash': 
+	cat >expected.swt-noinit <<-\EOF &&
+	S init.t
+	H sub/added
+	H sub/addedtoo
+	S subsub/added
+	EOF
 
-expecting success of 1005.5 'Porcelain reset should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git reset --hard &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+	echo sub/ > .git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
+	git ls-files -t > result &&
+	test_cmp expected.swt-noinit result &&
+	test_path_is_missing init.t &&
+	test_path_is_file sub/added
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-HEAD is now at 12f5e11 two
-ok 5 - Porcelain reset should remove remnants too
+ok 6 - match directories with trailing slash
 
-expecting success of 1005.6 'Porcelain checkout -f should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+expecting success of 1011.7 'match directories without trailing slash': 
+	echo sub >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
+	git ls-files -t >result &&
+	test_cmp expected.swt-noinit result &&
+	test_path_is_missing init.t &&
+	test_path_is_file sub/added
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 6 - Porcelain checkout -f should remove remnants too
+ok 7 - match directories without trailing slash
 
-expecting success of 1005.7 'Porcelain checkout -f HEAD should remove remnants too': 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f HEAD &&
-	git ls-files -s >actual &&
-	! test -f old &&
-	test_cmp expect actual
+expecting success of 1011.8 'match directories with negated patterns': 
+	cat >expected.swt-negation <<\EOF &&
+S init.t
+S sub/added
+H sub/addedtoo
+S subsub/added
+EOF
 
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 7 - Porcelain checkout -f HEAD should remove remnants too
+	cat >.git/info/sparse-checkout <<\EOF &&
+sub
+!sub/added
+EOF
+	git read-tree -m -u HEAD &&
+	git ls-files -t >result &&
+	test_cmp expected.swt-negation result &&
+	test_path_is_missing init.t &&
+	test_path_is_missing sub/added &&
+	test_path_is_file sub/addedtoo
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1007-hash-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ok 8 - match directories with negated patterns
 
-	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
-	EOF
+expecting success of 1011.9 'match directories with negated patterns (2)': 
+	cat >expected.swt-negation2 <<\EOF &&
+H init.t
+H sub/added
+S sub/addedtoo
+H subsub/added
+EOF
 
-ok 1 - setup
+	cat >.git/info/sparse-checkout <<\EOF &&
+/*
+!sub
+sub/added
+EOF
+	git read-tree -m -u HEAD &&
+	git ls-files -t >result &&
+	test_cmp expected.swt-negation2 result &&
+	test_path_is_file init.t &&
+	test_path_is_file sub/added &&
+	test_path_is_missing sub/addedtoo
 
-expecting success of 1007.2 'multiple '--stdin's are rejected': 
-	echo example | test_must_fail git hash-object --stdin --stdin
+ok 9 - match directories with negated patterns (2)
 
-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 1011.10 'match directory pattern': 
+	echo "s?b" >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
+	git ls-files -t >result &&
+	test_cmp expected.swt-noinit result &&
+	test_path_is_missing init.t &&
+	test_path_is_file sub/added
 
-    -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 10 - match directory pattern
 
-ok 2 - multiple '--stdin's are rejected
+expecting success of 1011.11 'checkout area changes': 
+	cat >expected.swt-nosub <<-\EOF &&
+	H init.t
+	S sub/added
+	S sub/addedtoo
+	S subsub/added
+	EOF
 
-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
+	echo init.t >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
+	git ls-files -t >result &&
+	test_cmp expected.swt-nosub result &&
+	test_path_is_file init.t &&
+	test_path_is_missing sub/added
 
-error: Can't use --stdin-paths with --stdin
-usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
-                       [--stdin [--literally]] [--] <file>...
-   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+ok 11 - checkout area changes
 
-    -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 1011.12 'read-tree updates worktree, absent case': 
+	echo sub/added >.git/info/sparse-checkout &&
+	git checkout -f top &&
+	read_tree_u_must_succeed -m -u HEAD^ &&
+	test_path_is_missing init.t
 
-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]
+HEAD is now at 9598e22 modified and added
+ok 12 - read-tree updates worktree, absent case
 
-    -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 1011.13 'read-tree will not throw away dirty changes, non-sparse': 
+	echo "/*" >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
 
-ok 3 - Can't use --stdin and --stdin-paths together
+	echo dirty >init.t &&
+	read_tree_u_must_fail -m -u HEAD^ &&
+	test_path_is_file init.t &&
+	grep -q dirty init.t
 
-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 'init.t' not uptodate. Cannot merge.
+error: Entry 'init.t' not uptodate. Cannot merge.
+ok 13 - read-tree will not throw away dirty changes, non-sparse
 
-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 1011.14 'read-tree will not throw away dirty changes, sparse': 
+	echo "/*" >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
 
-    -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
+	echo dirty >init.t &&
+	echo sub/added >.git/info/sparse-checkout &&
+	read_tree_u_must_fail -m -u HEAD^ &&
+	test_path_is_file init.t &&
+	grep -q dirty init.t
 
-ok 4 - Can't pass filenames as arguments with --stdin-paths
+error: Entry 'init.t' not uptodate. Cannot merge.
+error: Entry 'init.t' not uptodate. Cannot merge.
+ok 14 - read-tree will not throw away dirty changes, sparse
 
-expecting success of 1007.5 'Can't use --path with --stdin-paths': 
-	echo example | test_must_fail git hash-object --stdin-paths --path=foo
+expecting success of 1011.15 'read-tree updates worktree, dirty case': 
+	echo sub/added >.git/info/sparse-checkout &&
+	git checkout -f top &&
+	echo dirty >init.t &&
+	read_tree_u_must_fail -m -u HEAD^ &&
+	grep -q dirty init.t &&
+	rm init.t
 
-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]
+HEAD is now at 9598e22 modified and added
+error: Entry 'init.t' not uptodate. Cannot merge.
+error: Entry 'init.t' not uptodate. Cannot merge.
+ok 15 - read-tree updates worktree, dirty case
 
-    -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 1011.16 'read-tree removes worktree, dirty case': 
+	echo init.t >.git/info/sparse-checkout &&
+	git checkout -f top &&
+	echo dirty >added &&
+	read_tree_u_must_succeed -m -u HEAD^ &&
+	grep -q dirty added
 
-ok 5 - Can't use --path with --stdin-paths
+HEAD is now at 9598e22 modified and added
+ok 16 - read-tree removes worktree, dirty case
 
-expecting success of 1007.6 'Can't use --path with --no-filters': 
-	test_must_fail git hash-object --no-filters --path=foo
+expecting success of 1011.17 'read-tree adds to worktree, absent case': 
+	echo init.t >.git/info/sparse-checkout &&
+	git checkout -f removed &&
+	read_tree_u_must_succeed -u -m HEAD^ &&
+	test_path_is_missing sub/added
 
-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]
+Previous HEAD position was 9598e22 modified and added
+HEAD is now at de70956 removed
+ok 17 - read-tree adds to worktree, absent case
 
-    -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 1011.18 'read-tree adds to worktree, dirty case': 
+	echo init.t >.git/info/sparse-checkout &&
+	git checkout -f removed &&
+	mkdir sub &&
+	echo dirty >sub/added &&
+	read_tree_u_must_succeed -u -m HEAD^ &&
+	grep -q dirty sub/added
 
-ok 6 - Can't use --path with --no-filters
+HEAD is now at de70956 removed
+ok 18 - read-tree adds to worktree, dirty case
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1011.19 'index removal and worktree narrowing at the same time': 
+	echo init.t >.git/info/sparse-checkout &&
+	echo sub/added >>.git/info/sparse-checkout &&
+	git checkout -f top &&
+	echo init.t >.git/info/sparse-checkout &&
+	git checkout removed &&
+	git ls-files sub/added >result &&
+	test_path_is_missing sub/added &&
+	test_must_be_empty result
 
-ok 7 - hash a file
+Previous HEAD position was de70956 removed
+HEAD is now at 9598e22 modified and added
+Previous HEAD position was 9598e22 modified and added
+HEAD is now at de70956 removed
+ok 19 - index removal and worktree narrowing at the same time
 
-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 1011.20 'read-tree --reset removes outside worktree': 
+	echo init.t >.git/info/sparse-checkout &&
+	git checkout -f top &&
+	git reset --hard removed &&
+	git ls-files sub/added >result &&
+	test_must_be_empty result
 
-expecting success of 1007.9 'hash from stdin': 
-	test "$(test_oid example)" = $(git hash-object --stdin < example)
+Previous HEAD position was de70956 removed
+HEAD is now at 9598e22 modified and added
+HEAD is now at de70956 removed
+ok 20 - read-tree --reset removes outside worktree
 
-ok 9 - hash from stdin
+expecting success of 1011.21 'print warnings when some worktree updates disabled': 
+	echo sub >.git/info/sparse-checkout &&
+	git checkout -f init &&
+	mkdir sub &&
+	touch sub/added sub/addedtoo &&
+	# Use -q to suppress "Previous HEAD position" and "Head is now at" msgs
+	git checkout -q top 2>actual &&
+	cat >expected <<\EOF &&
+warning: The following paths were already present and thus not updated despite sparse patterns:
+	sub/added
+	sub/addedtoo
 
-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
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+EOF
+	test_cmp expected actual
 
-expecting success of 1007.11 'hash a file and write to database': 
-	test "$(test_oid hello)" = $(git hash-object -w hello)
+Previous HEAD position was de70956 removed
+HEAD is now at 2519212 init
+ok 21 - print warnings when some worktree updates disabled
 
-ok 11 - hash a file and write to database
+expecting success of 1011.22 'checkout without --ignore-skip-worktree-bits': 
+	echo "*" >.git/info/sparse-checkout &&
+	git checkout -f top &&
+	test_path_is_file init.t &&
+	echo sub >.git/info/sparse-checkout &&
+	git checkout &&
+	echo modified >> sub/added &&
+	git checkout . &&
+	test_path_is_missing init.t &&
+	git diff --exit-code HEAD
 
-expecting success of 1007.12 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 12 - blob exists in database
+HEAD is now at 9598e22 modified and added
+Updated 1 path from the index
+ok 22 - checkout without --ignore-skip-worktree-bits
 
-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 1011.23 'checkout with --ignore-skip-worktree-bits': 
+	echo "*" >.git/info/sparse-checkout &&
+	git checkout -f top &&
+	test_path_is_file init.t &&
+	echo sub >.git/info/sparse-checkout &&
+	git checkout &&
+	echo modified >> sub/added &&
+	git checkout --ignore-skip-worktree-bits . &&
+	test_path_is_file init.t &&
+	git diff --exit-code HEAD
 
-ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
+HEAD is now at 9598e22 modified and added
+Updated 3 paths from the index
+ok 23 - checkout with --ignore-skip-worktree-bits
 
-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"
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1020-subdirectory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1020-subdirectory/.git/
+expecting success of 1020.1 'setup': 
+	long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
+	test_write_lines $long >one &&
+	mkdir dir &&
+	test_write_lines x y z $long a b c >dir/two &&
+	cp one original.one &&
+	cp dir/two original.two
 
-ok 14 - set up crlf tests
+ok 1 - setup
 
-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 1020.2 'update-index and ls-files': 
+	git update-index --add one &&
+	case "$(git ls-files)" in
+	one) echo pass one ;;
+	*) echo bad one; return 1 ;;
+	esac &&
+	(
+		cd dir &&
+		git update-index --add two &&
+		case "$(git ls-files)" in
+		two) echo pass two ;;
+		*) echo bad two; exit 1 ;;
+		esac
+	) &&
+	case "$(git ls-files)" in
+	dir/two"$LF"one) echo pass both ;;
+	*) echo bad; return 1 ;;
+	esac
 
-ok 15 - check that appropriate filter is invoke when --path is used
+pass one
+pass two
+pass both
+ok 2 - update-index and ls-files
 
-expecting success of 1007.16 'gitattributes also work in a subdirectory': 
-	mkdir subdir &&
+expecting success of 1020.3 'cat-file': 
+	two=$(git ls-files -s dir/two) &&
+	two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
+	echo "$two" &&
+	git cat-file -p "$two" >actual &&
+	cmp dir/two actual &&
 	(
-		cd subdir &&
-		subdir_sha0=$(git hash-object ../file0) &&
-		subdir_sha1=$(git hash-object ../file1) &&
-		test "$file0_sha" = "$subdir_sha0" &&
-		test "$file1_sha" = "$subdir_sha1"
+		cd dir &&
+		git cat-file -p "$two" >actual &&
+		cmp two actual
 	)
 
-ok 16 - gitattributes also work in a subdirectory
+c1144d0671912dd26751c1fbf1eac57a907f82c7
+ok 3 - cat-file
 
-expecting success of 1007.17 '--path works in a subdirectory': 
+expecting success of 1020.4 'diff-files': 
+	echo a >>one &&
+	echo d >>dir/two &&
+	case "$(git diff-files --name-only)" in
+	dir/two"$LF"one) echo pass top ;;
+	*) echo bad top; return 1 ;;
+	esac &&
+	# diff should not omit leading paths
 	(
-		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"
+		cd dir &&
+		case "$(git diff-files --name-only)" in
+		dir/two"$LF"one) echo pass subdir ;;
+		*) echo bad subdir; exit 1 ;;
+		esac &&
+		case "$(git diff-files --name-only .)" in
+		dir/two) echo pass subdir limited ;;
+		*) echo bad subdir limited; exit 1 ;;
+		esac
 	)
 
-ok 17 - --path works in a subdirectory
-
-expecting success of 1007.18 'check that --no-filters option works': 
-	nofilters_file1=$(git hash-object --no-filters file1) &&
-	test "$file0_sha" = "$nofilters_file1" &&
-	nofilters_file1=$(git hash-object --stdin <file1) &&
-	test "$file0_sha" = "$nofilters_file1"
-
-ok 18 - check that --no-filters option works
+pass top
+pass subdir
+pass subdir limited
+ok 4 - diff-files
 
-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"
+expecting success of 1020.5 'write-tree': 
+	top=$(git write-tree) &&
+	echo $top &&
+	(
+		cd dir &&
+		sub=$(git write-tree) &&
+		echo $sub &&
+		test "z$top" = "z$sub"
+	)
 
-ok 19 - check that --no-filters option works with --stdin-paths
+cf1e35b43464cccd320d58a813e14e25fa36b1d7
+cf1e35b43464cccd320d58a813e14e25fa36b1d7
+ok 5 - write-tree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.20 'hash from stdin and write to database (-w --stdin)': 
-		test "$(test_oid example)" = $(git hash-object $args < example)
-	
-ok 20 - hash from stdin and write to database (-w --stdin)
+expecting success of 1020.6 'checkout-index': 
+	git checkout-index -f -u one &&
+	cmp one original.one &&
+	(
+		cd dir &&
+		git checkout-index -f -u two &&
+		cmp two ../original.two
+	)
 
-expecting success of 1007.21 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 21 - blob exists in database
+ok 6 - checkout-index
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1020.7 'read-tree': 
+	rm -f one dir/two &&
+	tree=$(git write-tree) &&
+	read_tree_u_must_succeed --reset -u "$tree" &&
+	cmp one original.one &&
+	cmp dir/two original.two &&
+	(
+		cd dir &&
+		rm -f two &&
+		read_tree_u_must_succeed --reset -u "$tree" &&
+		cmp two ../original.two &&
+		cmp ../one ../original.one
+	)
 
-expecting success of 1007.23 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 23 - blob exists in database
+ok 7 - read-tree
 
-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 1020.8 'alias expansion': 
+	(
+		git config alias.test-status-alias status &&
+		cd dir &&
+		git status &&
+		git test-status-alias
+	)
 
-ok 24 - hash two files with names on stdin
+On branch master
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+No commits yet
 
-expecting success of 1007.26 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 26 - blob exists in database
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+	new file:   two
+	new file:   ../one
 
-expecting success of 1007.27 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 27 - blob exists in database
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	post-dry-run
+	post-dry-run-wt
+	pre-dry-run
+	pre-dry-run-wt
+	../original.one
+	../original.two
+	../post-dry-run
+	../post-dry-run-wt
+	../pre-dry-run
+	../pre-dry-run-wt
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+On branch master
 
-expecting success of 1007.29 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 29 - blob exists in database
+No commits yet
 
-expecting success of 1007.30 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 30 - blob exists in database
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+	new file:   two
+	new file:   ../one
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	post-dry-run
+	post-dry-run-wt
+	pre-dry-run
+	pre-dry-run-wt
+	../original.one
+	../original.two
+	../post-dry-run
+	../post-dry-run-wt
+	../pre-dry-run
+	../pre-dry-run-wt
 
-error: too-short tree object
-ok 31 - too-short tree
+ok 8 - alias expansion
 
-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
+expecting success of 1020.9 '!alias expansion': 
+	pwd >expect &&
+	(
+		git config alias.test-alias-directory !pwd &&
+		cd dir &&
+		git test-alias-directory >../actual
+	) &&
+	test_cmp expect actual
 
-error: malformed mode in tree entry
-ok 32 - malformed mode in tree
+ok 9 - !alias expansion
 
-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
+expecting success of 1020.10 'GIT_PREFIX for !alias': 
+	printf "dir/" >expect &&
+	(
+		git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&
+		cd dir &&
+		git test-alias-directory >../actual
+	) &&
+	test_cmp expect actual
 
-error: empty filename in tree entry
-ok 33 - empty filename in tree
+ok 10 - GIT_PREFIX for !alias
 
-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 1020.11 'GIT_PREFIX for built-ins': 
+	# Use GIT_EXTERNAL_DIFF to test that the "diff" built-in
+	# receives the GIT_PREFIX variable.
+	echo "dir/" >expect &&
+	write_script diff <<-\EOF &&
+	printf "%s\n" "$GIT_PREFIX"
+	EOF
+	(
+		cd dir &&
+		echo "change" >two &&
+		GIT_EXTERNAL_DIFF=./diff git diff >../actual &&
+		git checkout -- two
+	) &&
+	test_cmp expect actual
 
-error: object fails fsck: duplicateEntries: contains duplicate file entries
-ok 34 - duplicate filename in tree
+ok 11 - GIT_PREFIX for built-ins
 
-expecting success of 1007.35 'corrupt commit': 
-	test_must_fail git hash-object -t commit --stdin </dev/null
+expecting success of 1020.12 'no file/rev ambiguity check inside .git': 
+	git commit -a -m 1 &&
+	(
+		cd .git &&
+		git show -s HEAD
+	)
 
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 35 - corrupt commit
+[master (root-commit) 63e2ba9] 1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 58 insertions(+)
+ create mode 100644 dir/two
+ create mode 100644 one
+commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-expecting success of 1007.36 'corrupt tag': 
-	test_must_fail git hash-object -t tag --stdin </dev/null
+    1
+ok 12 - no file/rev ambiguity check inside .git
 
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 36 - corrupt tag
+expecting success of 1020.13 'no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)': 
+	test_when_finished "rm -fr foo.git" &&
+	git clone -s --bare .git foo.git &&
+	(
+		cd foo.git &&
+		# older Git needed help by exporting GIT_DIR=.
+		# to realize that it is inside a bare repository.
+		# We keep this test around for regression testing.
+		GIT_DIR=. git show -s HEAD
+	)
 
-expecting success of 1007.37 'hash-object complains about bogus type name': 
-	test_must_fail git hash-object -t bogus --stdin </dev/null
+Cloning into bare repository 'foo.git'...
+done.
+commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-fatal: invalid object type "bogus"
-ok 37 - hash-object complains about bogus type name
+    1
+ok 13 - no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)
 
-expecting success of 1007.38 'hash-object complains about truncated type name': 
-	test_must_fail git hash-object -t bl --stdin </dev/null
+expecting success of 1020.14 'no file/rev ambiguity check inside a bare repo': 
+	test_when_finished "rm -fr foo.git" &&
+	git clone -s --bare .git foo.git &&
+	(
+		cd foo.git &&
+		git show -s HEAD
+	)
 
-fatal: invalid object type "bl"
-ok 38 - hash-object complains about truncated type name
+Cloning into bare repository 'foo.git'...
+done.
+commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-expecting success of 1007.39 '--literally': 
-	t=1234567890 &&
-	echo example | git hash-object -t $t --literally --stdin
+    1
+ok 14 - no file/rev ambiguity check inside a bare repo
 
-f78b23c3f872d473c764d5fcf4fb39af8bbf2123
-ok 39 - --literally
+checking prerequisite: SYMLINKS
 
-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
+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
 
-2a881776ee43e849175ee7158075560ca0ae7692
-ok 40 - --literally with extra-long type
+)
+prerequisite SYMLINKS ok
+expecting success of 1020.15 'detection should not be fooled by a symlink': 
+	git clone -s .git another &&
+	ln -s another yetanother &&
+	(
+		cd yetanother/.git &&
+		git show -s HEAD
+	)
 
-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
+Cloning into 'another'...
+done.
+commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-ok 41 - --stdin outside of repository (uses SHA-1)
+    1
+ok 15 - detection should not be fooled by a symlink
 
-# passed all 41 test(s)
-1..41
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1010-mktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** 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" &&
 
-ok 1 - setup
+	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}) &&
 
-expecting success of 1010.2 'ls-tree piped to mktree (1)': 
-	git mktree <top >actual &&
-	test_cmp tree actual
+	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 2 - ls-tree piped to mktree (1)
+	# "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 1010.3 'ls-tree piped to mktree (2)': 
-	git mktree <top.withsub >actual &&
-	test_cmp tree.withsub actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3 - ls-tree piped to mktree (2)
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1021-rerere-in-workdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1021-rerere-in-workdir/.git/
+checking prerequisite: SYMLINKS
 
-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
+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 4 - ls-tree output in wrong order given to mktree (1)
+)
+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 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
+	echo hello >world &&
+	test_tick &&
+	git commit -a -m hello &&
 
-ok 5 - ls-tree output in wrong order given to mktree (2)
+	git checkout -b side HEAD^ &&
+	echo goodbye >world &&
+	test_tick &&
+	git commit -a -m goodbye &&
 
-expecting success of 1010.6 'allow missing object with --missing': 
-	git mktree --missing <top.missing >actual &&
-	test_cmp tree.missing actual
+	git checkout main
 
-ok 6 - allow missing object with --missing
+[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 1010.7 'mktree refuses to read ls-tree -r output (1)': 
-	test_must_fail git mktree <all
+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
+	)
 
-fatal: path a-/one contains slash
-ok 7 - mktree refuses to read ls-tree -r output (1)
+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
 
-expecting success of 1010.8 'mktree refuses to read ls-tree -r output (2)': 
-	test_must_fail git mktree <all.withsub
+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
+	)
 
-fatal: path a-/one contains slash
-ok 8 - mktree refuses to read ls-tree -r output (2)
+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
 
-# passed all 8 test(s)
-1..8
+# still have 1 known breakage(s)
+# passed all remaining 2 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1004-read-tree-m-u-wf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1004-read-tree-m-u-wf/.git/
-expecting success of 1004.1 'two-way setup': 
-
-	mkdir subdir &&
-	echo >file1 file one &&
-	echo >file2 file two &&
-	echo >subdir/file1 file one in subdirectory &&
-	echo >subdir/file2 file two in subdirectory &&
-	git update-index --add file1 file2 subdir/file1 subdir/file2 &&
-	git commit -m initial &&
+*** t1051-large-conversion.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 branch side &&
-	git tag -f branch-point &&
+ok 1 - setup input tests
 
-	echo file2 is not tracked on the main branch anymore &&
-	rm -f file2 subdir/file2 &&
-	git update-index --remove file2 subdir/file2 &&
-	git commit -a -m "main removes file2 and subdir/file2"
+expecting success of 1051.2 'autocrlf=true converts on input': 
+	test_config core.autocrlf true &&
+	check_input
 
-[main (root-commit) eb5336a] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
- create mode 100644 subdir/file1
- create mode 100644 subdir/file2
-file2 is not tracked on the main branch anymore
-[main dbb6421] main removes file2 and subdir/file2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 file2
- delete mode 100644 subdir/file2
-ok 1 - two-way setup
+ok 2 - autocrlf=true converts on input
 
-expecting success of 1004.2 'two-way not clobbering': 
+expecting success of 1051.3 'eol=crlf converts on input': 
+	set_attr eol=crlf &&
+	check_input
 
-	echo >file2 main creates untracked file2 &&
-	echo >subdir/file2 main creates untracked subdir/file2 &&
-	if err=$(read_tree_u_must_succeed -m -u main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+ok 3 - eol=crlf converts on input
 
-happy to see error: Untracked working tree file 'file2' would be overwritten by merge.
-ok 2 - two-way not clobbering
+expecting success of 1051.4 'ident converts on input': 
+	set_attr ident &&
+	check_input
 
-expecting success of 1004.3 'two-way with incorrect --exclude-per-directory (1)': 
+ok 4 - ident converts on input
 
-	if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+expecting success of 1051.5 'user-defined filters convert on input': 
+	set_attr filter=test &&
+	check_input
 
-happy to see fatal: --exclude-per-directory is meaningless unless -u
-ok 3 - two-way with incorrect --exclude-per-directory (1)
+ok 5 - user-defined filters convert on input
 
-expecting success of 1004.4 'two-way with incorrect --exclude-per-directory (2)': 
+expecting success of 1051.6 'setup output tests': 
+	echo "\$Id\$" >small &&
+	cat small small >large &&
+	git add small large &&
+	git config core.bigfilethreshold 7 &&
+	git config filter.test.smudge "sed s/.*/SMUDGE/"
 
-	if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+ok 6 - setup output tests
 
-happy to see fatal: --exclude-per-directory argument must be .gitignore
-ok 4 - two-way with incorrect --exclude-per-directory (2)
+expecting success of 1051.7 'autocrlf=true converts on output': 
+	test_config core.autocrlf true &&
+	check_output
 
-expecting success of 1004.5 'two-way clobbering a ignored file': 
+Updated 2 paths from the index
+ok 7 - autocrlf=true converts on output
 
-	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore main side
+expecting success of 1051.8 'eol=crlf converts on output': 
+	set_attr eol=crlf &&
+	check_output
 
-ok 5 - two-way clobbering a ignored file
+Updated 2 paths from the index
+ok 8 - eol=crlf converts on output
 
-expecting success of 1004.6 'three-way not complaining on an untracked path in both': 
+expecting success of 1051.9 'user-defined filters convert on output': 
+	set_attr filter=test &&
+	check_output
 
-	rm -f file2 subdir/file2 &&
-	git checkout side &&
-	echo >file3 file three &&
-	echo >subdir/file3 file three &&
-	git update-index --add file3 subdir/file3 &&
-	git commit -a -m "side adds file3 and removes file2" &&
+Updated 2 paths from the index
+ok 9 - user-defined filters convert on output
 
-	git checkout main &&
-	echo >file2 file two is untracked on the main side &&
-	echo >subdir/file2 file two is untracked on the main side &&
+expecting success of 1051.10 'ident converts on output': 
+	set_attr ident &&
+	rm -f small large &&
+	git checkout small large &&
+	sed -n "s/Id: .*/Id: SHA/p" <small >small.clean &&
+	head -n 1 large >large.head &&
+	sed -n "s/Id: .*/Id: SHA/p" <large.head >large.clean &&
+	test_cmp small.clean large.clean
 
-	read_tree_u_must_succeed -m -u branch-point main side
+Updated 2 paths from the index
+ok 10 - ident converts on output
 
-Switched to branch 'side'
-D	file2
-D	subdir/file2
-[side 4be225f] side adds file3 and removes file2
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+), 2 deletions(-)
- delete mode 100644 file2
- create mode 100644 file3
- delete mode 100644 subdir/file2
- create mode 100644 subdir/file3
-Switched to branch 'main'
-ok 6 - three-way not complaining on an untracked path in both
+checking prerequisite: EXPENSIVE
 
-expecting success of 1004.7 'three-way not clobbering a working tree file': 
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-	git reset --hard &&
-	rm -f file2 subdir/file2 file3 subdir/file3 &&
-	git checkout main &&
-	echo >file3 file three created in main, untracked &&
-	echo >subdir/file3 file three created in main, untracked &&
-	if err=$(read_tree_u_must_succeed -m -u branch-point main side 2>&1)
-	then
-		echo should have complained
-		false
-	else
-		echo "happy to see $err"
-	fi
+)
+prerequisite EXPENSIVE not satisfied
+checking prerequisite: SIZE_T_IS_64BIT
 
-HEAD is now at dbb6421 main removes file2 and subdir/file2
-Already on 'main'
-happy to see error: Untracked working tree file 'file3' would be overwritten by merge.
-ok 7 - three-way not clobbering a working tree file
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SIZE_T_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SIZE_T_IS_64BIT" &&
+	test 8 -eq "$(build_option sizeof-size_t)"
 
-expecting success of 1004.8 'three-way not complaining on an untracked file': 
+)
+prerequisite SIZE_T_IS_64BIT ok
+checking prerequisite: LONG_IS_64BIT
 
-	git reset --hard &&
-	rm -f file2 subdir/file2 file3 subdir/file3 &&
-	git checkout main &&
-	echo >file3 file three created in main, untracked &&
-	echo >subdir/file3 file three created in main, untracked &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+	test 8 -le "$(build_option sizeof-long)"
 
-	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point main side
+)
+prerequisite LONG_IS_64BIT ok
+ok 11 # skip files over 4GB convert on output (missing !LONG_IS_64BIT,EXPENSIVE of EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT)
 
-HEAD is now at dbb6421 main removes file2 and subdir/file2
-Already on 'main'
-ok 8 - three-way not complaining on an untracked file
+ok 12 # skip files over 4GB convert on input (missing !LONG_IS_64BIT,EXPENSIVE of EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT)
 
-expecting success of 1004.9 '3-way not overwriting local changes (setup)': 
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1090-sparse-checkout-scope.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1090-sparse-checkout-scope/.git/
+expecting success of 1090.1 'setup': 
+	echo "initial" >a &&
+	echo "initial" >b &&
+	echo "initial" >c &&
+	git add a b c &&
+	git commit -m "initial commit"
 
-	git reset --hard &&
-	git checkout -b side-a branch-point &&
-	echo >>file1 "new line to be kept in the merge result" &&
-	git commit -a -m "side-a changes file1" &&
-	git checkout -b side-b branch-point &&
-	echo >>file2 "new line to be kept in the merge result" &&
-	git commit -a -m "side-b changes file2" &&
-	git checkout side-a
+[main (root-commit) 0b6cffd] initial commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ok 1 - setup
 
+expecting success of 1090.2 'create feature branch': 
+	git checkout -b feature &&
+	echo "modified" >b &&
+	echo "modified" >c &&
+	git add b c &&
+	git commit -m "modification"
 
-HEAD is now at dbb6421 main removes file2 and subdir/file2
-Switched to a new branch 'side-a'
-[side-a 67c0594] side-a changes file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'side-b'
-[side-b 3ad988a] side-b changes file2
+Switched to a new branch 'feature'
+[feature 96237bb] modification
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'side-a'
-ok 9 - 3-way not overwriting local changes (setup)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 2 - create feature branch
 
-expecting success of 1004.10 '3-way not overwriting local changes (our side)': 
+expecting success of 1090.3 'perform sparse checkout of main': 
+	git config --local --bool core.sparsecheckout true &&
+	mkdir .git/info &&
+	echo "!/*" >.git/info/sparse-checkout &&
+	echo "/a" >>.git/info/sparse-checkout &&
+	echo "/c" >>.git/info/sparse-checkout &&
+	git checkout main &&
+	test_path_is_file a &&
+	test_path_is_missing b &&
+	test_path_is_file c
 
-	# At this point, file1 from side-a should be kept as side-b
-	# did not touch it.
+Switched to branch 'main'
+ok 3 - perform sparse checkout of main
 
-	git reset --hard &&
+expecting success of 1090.4 'merge feature branch into sparse checkout of main': 
+	git merge feature &&
+	test_path_is_file a &&
+	test_path_is_missing b &&
+	test_path_is_file c &&
+	test "$(cat c)" = "modified"
 
-	echo >>file1 "local changes" &&
-	read_tree_u_must_succeed -m -u branch-point side-a side-b &&
-	grep "new line to be kept" file1 &&
-	grep "local changes" file1
+Updating 0b6cffd..96237bb
+Fast-forward
+ b | 2 +-
+ c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 4 - merge feature branch into sparse checkout of main
 
+expecting success of 1090.5 'return to full checkout of main': 
+	git checkout feature &&
+	echo "/*" >.git/info/sparse-checkout &&
+	git checkout main &&
+	test_path_is_file a &&
+	test_path_is_file b &&
+	test_path_is_file c &&
+	test "$(cat b)" = "modified"
 
-HEAD is now at 67c0594 side-a changes file1
-new line to be kept in the merge result
-local changes
-ok 10 - 3-way not overwriting local changes (our side)
+Switched to branch 'feature'
+Switched to branch 'main'
+ok 5 - return to full checkout of main
 
-expecting success of 1004.11 '3-way not overwriting local changes (their side)': 
+expecting success of 1090.6 'skip-worktree on files outside sparse patterns': 
+	git sparse-checkout disable &&
+	git sparse-checkout set --no-cone "a*" &&
+	git checkout-index --all --ignore-skip-worktree-bits &&
 
-	# At this point, file2 from side-b should be taken as side-a
-	# did not touch it.
+	git ls-files -t >output &&
+	! grep ^S output >actual &&
+	test_must_be_empty actual &&
 
-	git reset --hard &&
+	test_config sparse.expectFilesOutsideOfPatterns true &&
+	cat <<-\EOF >expect &&
+	S b
+	S c
+	EOF
+	git ls-files -t >output &&
+	grep ^S output >actual &&
+	test_cmp expect actual
 
-	echo >>file2 "local changes" &&
-	read_tree_u_must_fail -m -u branch-point side-a side-b &&
-	! grep "new line to be kept" file2 &&
-	grep "local changes" file2
+ok 6 - skip-worktree on files outside sparse patterns
 
+expecting success of 1090.7 'in partial clone, sparse checkout only fetches needed blobs': 
+	test_create_repo server &&
+	git clone --template= "file://$(pwd)/server" client &&
 
-HEAD is now at 67c0594 side-a changes file1
-error: Entry 'file2' not uptodate. Cannot merge.
-error: Entry 'file2' not uptodate. Cannot merge.
-local changes
-ok 11 - 3-way not overwriting local changes (their side)
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	echo a >server/a &&
+	echo bb >server/b &&
+	mkdir server/c &&
+	echo ccc >server/c/c &&
+	git -C server add a b c/c &&
+	git -C server commit -m message &&
 
-expecting success of 1004.12 'funny symlink in work tree': 
+	test_config -C client core.sparsecheckout 1 &&
+	mkdir client/.git/info &&
+	echo "!/*" >client/.git/info/sparse-checkout &&
+	echo "/a" >>client/.git/info/sparse-checkout &&
+	git -C client fetch --filter=blob:none origin &&
+	git -C client checkout FETCH_HEAD &&
 
-	git reset --hard &&
-	git checkout -b sym-b side-b &&
-	mkdir -p a &&
-	>a/b &&
-	git add a/b &&
-	git commit -m "side adds a/b" &&
+	git -C client rev-list HEAD \
+		--quiet --objects --missing=print >unsorted_actual &&
+	(
+		printf "?" &&
+		git hash-object server/b &&
+		printf "?" &&
+		git hash-object server/c/c
+	) >unsorted_expect &&
+	sort unsorted_actual >actual &&
+	sort unsorted_expect >expect &&
+	test_cmp expect actual
 
-	rm -fr a &&
-	git checkout -b sym-a side-a &&
-	mkdir -p a &&
-	test_ln_s_add ../b a/b &&
-	git commit -m "we add a/b" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1090-sparse-checkout-scope/server/.git/
+Cloning into 'client'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) ab14680] message
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c/c
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1090-sparse-checkout-scope/server
+ * [new branch]      main       -> origin/main
+Note: switching to 'FETCH_HEAD'.
 
-	read_tree_u_must_succeed -m -u sym-a sym-a sym-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:
 
-HEAD is now at 67c0594 side-a changes file1
-Switched to a new branch 'sym-b'
-[sym-b b05f19b] side adds a/b
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b
-Switched to a new branch 'sym-a'
-checking prerequisite: SYMLINKS
+  git switch -c <new-branch-name>
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[sym-a c4bc40b] we add a/b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 a/b
-ok 12 - funny symlink in work tree
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 1004.13 'funny symlink in work tree, un-unlink-able': 
-
-	test_when_finished "chmod u+w a 2>/dev/null; rm -fr a b" &&
-
-	rm -fr a b &&
-	git reset --hard &&
-
-	git checkout sym-a &&
-	chmod a-w a &&
-	test_must_fail git read-tree -m -u sym-a sym-a sym-b
-
-
-HEAD is now at c4bc40b we add a/b
-Already on 'sym-a'
-error: unable to unlink old 'a/b': Permission denied
-ok 13 - funny symlink in work tree, un-unlink-able
-
-expecting success of 1004.14 'D/F setup': 
-
-	git reset --hard &&
-
-	git checkout side-a &&
-	rm -f subdir/file2 &&
-	mkdir subdir/file2 &&
-	echo qfwfq >subdir/file2/another &&
-	git add subdir/file2/another &&
-	test_tick &&
-	git commit -m "side-a changes file2 to directory"
-
-
-HEAD is now at c4bc40b we add a/b
-Switched to branch 'side-a'
-[side-a d094fd2] side-a changes file2 to directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 subdir/file2
- create mode 100644 subdir/file2/another
-ok 14 - D/F setup
-
-expecting success of 1004.15 'D/F': 
-
-	git checkout side-b &&
-	read_tree_u_must_succeed -m -u branch-point side-b side-a &&
-	git ls-files -u >actual &&
-	(
-		a=$(git rev-parse branch-point:subdir/file2) &&
-		b=$(git rev-parse side-a:subdir/file2/another) &&
-		echo "100644 $a 1	subdir/file2" &&
-		echo "100644 $a 2	subdir/file2" &&
-		echo "100644 $b 3	subdir/file2/another"
-	) >expect &&
-	test_cmp expect actual
-
-
-Switched to branch 'side-b'
-ok 15 - D/F
-
-expecting success of 1004.16 'D/F resolve': 
-
-	git reset --hard &&
-	git checkout side-b &&
-	git merge-resolve branch-point -- side-b side-a
-
-
-HEAD is now at 3ad988a side-b changes file2
-Already on 'side-b'
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Adding subdir/file2/another
-ok 16 - D/F resolve
-
-expecting success of 1004.17 'D/F recursive': 
-
-	git reset --hard &&
-	git checkout side-b &&
-	git merge-recursive branch-point -- side-b side-a
-
-
-HEAD is now at 3ad988a side-b changes file2
-Already on 'side-b'
-Merging side-b with side-a
-Merging:
-3ad988a side-b changes file2
-d094fd2 side-a changes file2 to directory
-found 1 common ancestor:
-eb5336a initial
-Adding subdir/file2/another
-Removing subdir/file2 to make room for subdirectory
-
-Removing subdir/file2
-ok 17 - D/F recursive
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1002-read-tree-m-u-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1002-read-tree-m-u-2way/.git/
-expecting success of 1002.1 'setup': 
-	echo frotz >frotz &&
-	echo nitfol >nitfol &&
-	echo bozbar >bozbar &&
-	echo rezrov >rezrov &&
-	git update-index --add nitfol bozbar rezrov &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH &&
-
-	echo gnusto >bozbar &&
-	git update-index --add frotz bozbar --force-remove rezrov &&
-	git ls-files --stage >M.out &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	cp bozbar bozbar.M &&
-	cp frotz frotz.M &&
-	cp nitfol nitfol.M &&
-	git diff-tree $treeH $treeM
-
-treeH 661afa9096b7e2d4b9a28a6e43736cd0b06d1308
-100644 blob 78d812a2124ff980a1a70f8cca493698d643d242	bozbar
-100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
-100644 blob 766498d93a4b06057a8e49d23f4068f1170ff38f	rezrov
-treeM 05bf9652e9b06473d6ca2f32ff60e2401e59bfa6
-100644 blob bb3b2cd2e136e1e4e7ecdf10068e246196dd8294	bozbar
-100644 blob 8e4020bb5a8d8c873b25de15933e75cc0fc275df	frotz
-100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
-:100644 100644 78d812a2124ff980a1a70f8cca493698d643d242 bb3b2cd2e136e1e4e7ecdf10068e246196dd8294 M	bozbar
-:000000 100644 0000000000000000000000000000000000000000 8e4020bb5a8d8c873b25de15933e75cc0fc275df A	frotz
-:100644 000000 766498d93a4b06057a8e49d23f4068f1170ff38f 0000000000000000000000000000000000000000 D	rezrov
-ok 1 - setup
-
-expecting success of 1002.2 '1, 2, 3 - no carry forward': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >1-3.out &&
-	cmp M.out 1-3.out &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	check_cache_at bozbar clean &&
-	check_cache_at frotz clean &&
-	check_cache_at nitfol clean
-
-bozbar: clean
-frotz: clean
-nitfol: clean
-ok 2 - 1, 2, 3 - no carry forward
-
-expecting success of 1002.3 '4 - carry forward local addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo "+100644 X 0	yomin" >expected &&
-	echo yomin >yomin &&
-	git update-index --add yomin &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >4.out &&
-	test_might_fail git diff -U0 --no-index M.out 4.out >4diff.out &&
-	compare_change 4diff.out expected &&
-	check_cache_at yomin clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	echo yomin >yomin1 &&
-	diff yomin yomin1 &&
-	rm -f yomin1
-
-yomin: clean
-ok 3 - 4 - carry forward local addition.
-
-expecting success of 1002.4 '5 - carry forward local addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	read_tree_u_must_succeed -m -u $treeH &&
-	echo yomin >yomin &&
-	git update-index --add yomin &&
-	echo yomin yomin >yomin &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >5.out &&
-	test_might_fail git diff -U0 --no-index M.out 5.out >5diff.out &&
-	compare_change 5diff.out expected &&
-	check_cache_at yomin dirty &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	: dirty index should have prevented -u from checking it out. &&
-	echo yomin yomin >yomin1 &&
-	diff yomin yomin1 &&
-	rm -f yomin1
-
-yomin: dirty
-ok 4 - 5 - carry forward local addition.
-
-expecting success of 1002.5 '6 - local addition already has the same.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz >frotz &&
-	git update-index --add frotz &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >6.out &&
-	test_cmp M.out 6.out &&
-	check_cache_at frotz clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	echo frotz >frotz1 &&
-	diff frotz frotz1 &&
-	rm -f frotz1
-
-frotz: clean
-ok 5 - 6 - local addition already has the same.
-
-expecting success of 1002.6 '7 - local addition already has the same.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz >frotz &&
-	git update-index --add frotz &&
-	echo frotz frotz >frotz &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >7.out &&
-	test_cmp M.out 7.out &&
-	check_cache_at frotz dirty &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp nitfol.M nitfol &&
-	: dirty index should have prevented -u from checking it out. &&
-	echo frotz frotz >frotz1 &&
-	diff frotz frotz1 &&
-	rm -f frotz1
-
-frotz: dirty
-ok 6 - 7 - local addition already has the same.
-
-expecting success of 1002.7 '8 - conflicting addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz frotz >frotz &&
-	git update-index --add frotz &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 7 - 8 - conflicting addition.
-
-expecting success of 1002.8 '9 - conflicting addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz frotz >frotz &&
-	git update-index --add frotz &&
-	echo frotz >frotz &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 8 - 9 - conflicting addition.
-
-expecting success of 1002.9 '10 - path removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov >rezrov &&
-	git update-index --add rezrov &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >10.out &&
-	cmp M.out 10.out &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol
-
-ok 9 - 10 - path removed.
-
-expecting success of 1002.10 '11 - dirty path removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov >rezrov &&
-	git update-index --add rezrov &&
-	echo rezrov rezrov >rezrov &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'rezrov' not uptodate. Cannot merge.
-ok 10 - 11 - dirty path removed.
-
-expecting success of 1002.11 '12 - unmatching local changes being removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov rezrov >rezrov &&
-	git update-index --add rezrov &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 11 - 12 - unmatching local changes being removed.
-
-expecting success of 1002.12 '13 - unmatching local changes being removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov rezrov >rezrov &&
-	git update-index --add rezrov &&
-	echo rezrov >rezrov &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 12 - 13 - unmatching local changes being removed.
-
-expecting success of 1002.13 '14 - unchanged in two heads.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo nitfol nitfol >nitfol &&
-	git update-index --add nitfol &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >14.out &&
-	test_must_fail git diff -U0 --no-index M.out 14.out >14diff.out &&
-	compare_change 14diff.out expected &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	check_cache_at nitfol clean &&
-	echo nitfol nitfol >nitfol1 &&
-	diff nitfol nitfol1 &&
-	rm -f nitfol1
-
-nitfol: clean
-ok 13 - 14 - unchanged in two heads.
-
-expecting success of 1002.14 '15 - unchanged in two heads.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo nitfol nitfol >nitfol &&
-	git update-index --add nitfol &&
-	echo nitfol nitfol nitfol >nitfol &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >15.out &&
-	test_must_fail git diff -U0 --no-index M.out 15.out >15diff.out &&
-	compare_change 15diff.out expected &&
-	check_cache_at nitfol dirty &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	echo nitfol nitfol nitfol >nitfol1 &&
-	diff nitfol nitfol1 &&
-	rm -f nitfol1
-
-nitfol: dirty
-ok 14 - 15 - unchanged in two heads.
-
-expecting success of 1002.15 '16 - conflicting local change.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar bozbar >bozbar &&
-	git update-index --add bozbar &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 15 - 16 - conflicting local change.
-
-expecting success of 1002.16 '17 - conflicting local change.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar bozbar >bozbar &&
-	git update-index --add bozbar &&
-	echo bozbar bozbar bozbar >bozbar &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 16 - 17 - conflicting local change.
-
-expecting success of 1002.17 '18 - local change already having a good result.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo gnusto >bozbar &&
-	git update-index --add bozbar &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >18.out &&
-	test_cmp M.out 18.out &&
-	check_cache_at bozbar clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol
-
-bozbar: clean
-ok 17 - 18 - local change already having a good result.
-
-expecting success of 1002.18 '19 - local change already having a good result, further modified.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo gnusto >bozbar &&
-	git update-index --add bozbar &&
-	echo gnusto gnusto >bozbar &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >19.out &&
-	test_cmp M.out 19.out &&
-	check_cache_at bozbar dirty &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	echo gnusto gnusto >bozbar1 &&
-	diff bozbar bozbar1 &&
-	rm -f bozbar1
-
-bozbar: dirty
-ok 18 - 19 - local change already having a good result, further modified.
-
-expecting success of 1002.19 '20 - no local change, use new tree.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar >bozbar &&
-	git update-index --add bozbar &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >20.out &&
-	test_cmp M.out 20.out &&
-	check_cache_at bozbar clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol
-
-bozbar: clean
-ok 19 - 20 - no local change, use new tree.
-
-expecting success of 1002.20 '21 - no local change, dirty cache.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar >bozbar &&
-	git update-index --add bozbar &&
-	echo gnusto gnusto >bozbar &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'bozbar' not uptodate. Cannot merge.
-ok 20 - 21 - no local change, dirty cache.
-
-expecting success of 1002.21 'DF vs DF/DF case setup.': 
-	rm -f .git/index &&
-	echo DF >DF &&
-	git update-index --add DF &&
-	treeDF=$(git write-tree) &&
-	echo treeDF $treeDF &&
-	git ls-tree $treeDF &&
-
-	rm -f DF &&
-	mkdir DF &&
-	echo DF/DF >DF/DF &&
-	git update-index --add --remove DF DF/DF &&
-	treeDFDF=$(git write-tree) &&
-	echo treeDFDF $treeDFDF &&
-	git ls-tree $treeDFDF &&
-	git ls-files --stage >DFDF.out
-
-treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
-100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
-treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
-040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 21 - DF vs DF/DF case setup.
-
-expecting success of 1002.22 'DF vs DF/DF case test.': 
-	rm -f .git/index &&
-	rm -fr DF &&
-	echo DF >DF &&
-	git update-index --add DF &&
-	read_tree_u_must_succeed -m -u $treeDF $treeDFDF &&
-	git ls-files --stage >DFDFcheck.out &&
-	test_cmp DFDF.out DFDFcheck.out &&
-	check_cache_at DF/DF clean
-
-DF/DF: clean
-ok 22 - DF vs DF/DF case test.
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0601-reffiles-pack-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1014-read-tree-confusing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1014-read-tree-confusing/.git/
-expecting success of 1014.1 'create base tree': 
-	echo content >file &&
-	git add file &&
-	git commit -m base &&
-	blob=$(git rev-parse HEAD:file) &&
-	tree=$(git rev-parse HEAD^{tree})
-
-[master (root-commit) 5d770fe] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - create base tree
-
-expecting success of 1014.2 'enable core.protectHFS for rejection tests': 
-	git config core.protectHFS true
-
-ok 2 - enable core.protectHFS for rejection tests
-
-expecting success of 1014.3 'enable core.protectNTFS for rejection tests': 
-	git config core.protectNTFS true
-
-ok 3 - enable core.protectNTFS for rejection tests
-
-expecting success of 1014.4 'reject . at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.'
-ok 4 - reject . at end of path
-
-expecting success of 1014.5 'reject . as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path './file'
-ok 5 - reject . as subtree
-
-expecting success of 1014.6 'reject .. at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '..'
-ok 6 - reject .. at end of path
-
-expecting success of 1014.7 'reject .. as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '../file'
-ok 7 - reject .. as subtree
-
-expecting success of 1014.8 'reject .git at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git'
-ok 8 - reject .git at end of path
-
-expecting success of 1014.9 'reject .git as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git/file'
-ok 9 - reject .git as subtree
-
-expecting success of 1014.10 'reject .GIT at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GIT'
-ok 10 - reject .GIT at end of path
-
-expecting success of 1014.11 'reject .GIT as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GIT/file'
-ok 11 - reject .GIT as subtree
-
-expecting success of 1014.12 'reject {u200c}.Git at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '‌.Git'
-ok 12 - reject {u200c}.Git at end of path
-
-expecting success of 1014.13 'reject {u200c}.Git as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '‌.Git/file'
-ok 13 - reject {u200c}.Git as subtree
-
-expecting success of 1014.14 'reject .gI{u200c}T at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.gI‌T'
-ok 14 - reject .gI{u200c}T at end of path
-
-expecting success of 1014.15 'reject .gI{u200c}T as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.gI‌T/file'
-ok 15 - reject .gI{u200c}T as subtree
-
-expecting success of 1014.16 'reject .GiT{u200c} at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GiT‌'
-ok 16 - reject .GiT{u200c} at end of path
-
-expecting success of 1014.17 'reject .GiT{u200c} as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GiT‌/file'
-ok 17 - reject .GiT{u200c} as subtree
-
-expecting success of 1014.18 'reject git~1 at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path 'git~1'
-ok 18 - reject git~1 at end of path
-
-expecting success of 1014.19 'reject git~1 as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path 'git~1/file'
-ok 19 - reject git~1 as subtree
-
-expecting success of 1014.20 'reject .git.{space} at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git. '
-ok 20 - reject .git.{space} at end of path
-
-expecting success of 1014.21 'reject .git.{space} as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git. /file'
-ok 21 - reject .git.{space} as subtree
-
-expecting success of 1014.22 'reject backslashes at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.\.GIT\foobar'
-ok 22 - reject backslashes at end of path
-
-expecting success of 1014.23 'reject backslashes as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.\.GIT\foobar/file'
-ok 23 - reject backslashes as subtree
-
-expecting success of 1014.24 'reject backslashes2 at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git\foobar'
-ok 24 - reject backslashes2 at end of path
-
-expecting success of 1014.25 'reject backslashes2 as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git\foobar/file'
-ok 25 - reject backslashes2 as subtree
-
-expecting success of 1014.26 'reject .git...:alternate-stream at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git...:alternate-stream'
-ok 26 - reject .git...:alternate-stream at end of path
-
-expecting success of 1014.27 'reject .git...:alternate-stream as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git...:alternate-stream/file'
-ok 27 - reject .git...:alternate-stream as subtree
-
-expecting success of 1014.28 'utf-8 paths allowed with core.protectHFS off': 
-	test_when_finished "git read-tree HEAD" &&
-	test_config core.protectHFS false &&
-	printf "100644 blob %s\t%s" "$blob" ".gi${u200c}t" >tree &&
-	ok=$(git mktree <tree) &&
-	git read-tree $ok
-
-ok 28 - utf-8 paths allowed with core.protectHFS off
-
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1015-read-index-unmerged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1015-read-index-unmerged/.git/
-expecting success of 1015.1 'setup modify/delete + directory/file conflict': 
-	test_create_repo df_plus_modify_delete &&
-	(
-		cd df_plus_modify_delete &&
-
-		test_write_lines a b c d e f g h >letters &&
-		git add letters &&
-		git commit -m initial &&
-
-		git checkout -b modify &&
-		# Throw in letters.txt for sorting order fun
-		# ("letters.txt" sorts between "letters" and "letters/file")
-		echo i >>letters &&
-		echo "version 2" >letters.txt &&
-		git add letters letters.txt &&
-		git commit -m modified &&
-
-		git checkout -b delete HEAD^ &&
-		git rm letters &&
-		mkdir letters &&
-		>letters/file &&
-		echo "version 1" >letters.txt &&
-		git add letters letters.txt &&
-		git commit -m deleted
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1015-read-index-unmerged/df_plus_modify_delete/.git/
-[master (root-commit) 461649b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 letters
-Switched to a new branch 'modify'
-[modify 4e26d91] modified
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 letters.txt
-Switched to a new branch 'delete'
-rm 'letters'
-[delete 380ce95] deleted
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 8 deletions(-)
- delete mode 100644 letters
- create mode 100644 letters.txt
- create mode 100644 letters/file
-ok 1 - setup modify/delete + directory/file conflict
-
-expecting success of 1015.2 'read-tree --reset cleans unmerged entries': 
-	test_when_finished "git -C df_plus_modify_delete clean -f" &&
-	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
-	(
-		cd df_plus_modify_delete &&
-
-		git checkout delete^0 &&
-		test_must_fail git merge modify &&
-
-		git read-tree --reset HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
-
-Note: switching to 'delete^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 380ce95 deleted
-Auto-merging letters.txt
-CONFLICT (add/add): Merge conflict in letters.txt
-CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
-CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 380ce95 deleted
-Removing conflicts
-Removing letters~modify
-ok 2 - read-tree --reset cleans unmerged entries
-
-expecting success of 1015.3 'One reset --hard cleans unmerged entries': 
-	test_when_finished "git -C df_plus_modify_delete clean -f" &&
-	test_when_finished "git -C df_plus_modify_delete reset --hard" &&
-	(
-		cd df_plus_modify_delete &&
-
-		git checkout delete^0 &&
-		test_must_fail git merge modify &&
-
-		git reset --hard &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
-
-HEAD is now at 380ce95 deleted
-Auto-merging letters.txt
-CONFLICT (add/add): Merge conflict in letters.txt
-CONFLICT (file/directory): directory in the way of letters from modify; moving it to letters~modify instead.
-CONFLICT (modify/delete): letters~modify deleted in HEAD and modified in modify.  Version modify of letters~modify left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 380ce95 deleted
-HEAD is now at 380ce95 deleted
-Removing conflicts
-ok 3 - One reset --hard cleans unmerged entries
-
-expecting success of 1015.4 'setup directory/file conflict + simple edit/edit': 
-	test_create_repo df_plus_edit_edit &&
-	(
-		cd df_plus_edit_edit &&
-
-		test_seq 1 10 >numbers &&
-		git add numbers &&
-		git commit -m initial &&
-
-		git checkout -b d-edit &&
-		mkdir foo &&
-		echo content >foo/bar &&
-		git add foo &&
-		echo 11 >>numbers &&
-		git add numbers &&
-		git commit -m "directory and edit" &&
-
-		git checkout -b f-edit d-edit^1 &&
-		echo content >foo &&
-		git add foo &&
-		echo eleven >>numbers &&
-		git add numbers &&
-		git commit -m "file and edit"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1015-read-index-unmerged/df_plus_edit_edit/.git/
-[master (root-commit) e5e228a] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 numbers
-Switched to a new branch 'd-edit'
-[d-edit 1997ecb] directory and edit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 foo/bar
-Switched to a new branch 'f-edit'
-[f-edit ea28ef2] file and edit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 foo
-ok 4 - setup directory/file conflict + simple edit/edit
-
-expecting success of 1015.5 'git merge --abort succeeds despite D/F conflict': 
-	test_when_finished "git -C df_plus_edit_edit clean -f" &&
-	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
-	(
-		cd df_plus_edit_edit &&
-
-		git checkout f-edit^0 &&
-		test_must_fail git merge d-edit^0 &&
-
-		git merge --abort &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
-
-Note: switching to 'f-edit^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at ea28ef2 file and edit
-CONFLICT (file/directory): directory in the way of foo from HEAD; moving it to foo~HEAD instead.
-Auto-merging numbers
-CONFLICT (content): Merge conflict in numbers
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at ea28ef2 file and edit
-Removing conflicts
-ok 5 - git merge --abort succeeds despite D/F conflict
-
-expecting success of 1015.6 'git am --skip succeeds despite D/F conflict': 
-	test_when_finished "git -C df_plus_edit_edit clean -f" &&
-	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
-	(
-		cd df_plus_edit_edit &&
-
-		git checkout f-edit^0 &&
-		git format-patch -1 d-edit &&
-		test_must_fail git am -3 0001*.patch &&
-
-		git am --skip &&
-		test_path_is_missing .git/rebase-apply &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
-
-HEAD is now at ea28ef2 file and edit
-0001-directory-and-edit.patch
-Applying: directory and edit
-Using index info to reconstruct a base tree...
-M	numbers
-Falling back to patching base and 3-way merge...
-Merging:
-ea28ef2 file and edit
-virtual directory and edit
-found 1 common ancestor:
-virtual 75a3e2be4ba4a7062d21fba0206758f5518d6ead
-Auto-merging numbers
-CONFLICT (content): Merge conflict in numbers
-Adding foo/bar
-Removing foo to make room for subdirectory
-
-CONFLICT (file/directory): There is a directory with name foo in directory and edit. Adding foo as foo~HEAD
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 directory and edit
-HEAD is now at ea28ef2 file and edit
-Removing 0001-directory-and-edit.patch
-Removing conflicts
-Removing foo~HEAD
-ok 6 - git am --skip succeeds despite D/F conflict
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1012-read-tree-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1011-read-tree-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1011-read-tree-sparse-checkout/.git/
-expecting success of 1011.1 'setup': 
-	test_commit init &&
-	echo modified >>init.t &&
-
-	cat >expected <<-EOF &&
-	100644 $(git hash-object init.t) 0	init.t
-	100644 $EMPTY_BLOB 0	sub/added
-	100644 $EMPTY_BLOB 0	sub/addedtoo
-	100644 $EMPTY_BLOB 0	subsub/added
-	EOF
-	cat >expected.swt <<-\EOF &&
-	H init.t
-	H sub/added
-	H sub/addedtoo
-	H subsub/added
-	EOF
-
-	mkdir sub subsub &&
-	touch sub/added sub/addedtoo subsub/added &&
-	git add init.t sub/added sub/addedtoo subsub/added &&
-	git commit -m "modified and added" &&
-	git tag top &&
-	git rm sub/added &&
-	git commit -m removed &&
-	git tag removed &&
-	git checkout top &&
-	git ls-files --stage >result &&
-	test_cmp expected result
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 9598e22] modified and added
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- create mode 100644 sub/added
- create mode 100644 sub/addedtoo
- create mode 100644 subsub/added
-rm 'sub/added'
-[master de70956] removed
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 sub/added
-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 9598e22 modified and added
-ok 1 - setup
-
-expecting success of 1011.2 'read-tree without .git/info/sparse-checkout': 
-	read_tree_u_must_succeed -m -u HEAD &&
-	git ls-files --stage >result &&
-	test_cmp expected result &&
-	git ls-files -t >result &&
-	test_cmp expected.swt result
-
-ok 2 - read-tree without .git/info/sparse-checkout
-
-expecting success of 1011.3 'read-tree with .git/info/sparse-checkout but disabled': 
-	mkdir .git/info &&
-	echo >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-	git ls-files -t >result &&
-	test_cmp expected.swt result &&
-	test_path_is_file init.t &&
-	test_path_is_file sub/added
-
-ok 3 - read-tree with .git/info/sparse-checkout but disabled
-
-expecting success of 1011.4 'read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled': 
-	git config core.sparsecheckout true &&
-	echo >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed --no-sparse-checkout -m -u HEAD &&
-	git ls-files -t >result &&
-	test_cmp expected.swt result &&
-	test_path_is_file init.t &&
-	test_path_is_file sub/added
-
-ok 4 - read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled
-
-expecting success of 1011.5 'read-tree with empty .git/info/sparse-checkout': 
-	git config core.sparsecheckout true &&
-	echo >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-	git ls-files --stage >result &&
-	test_cmp expected result &&
-	git ls-files -t >result &&
-	cat >expected.swt <<-\EOF &&
-	S init.t
-	S sub/added
-	S sub/addedtoo
-	S subsub/added
-	EOF
-	test_cmp expected.swt result &&
-	test_path_is_missing init.t &&
-	test_path_is_missing sub/added
-
-ok 5 - read-tree with empty .git/info/sparse-checkout
-
-expecting success of 1011.6 'match directories with trailing slash': 
-	cat >expected.swt-noinit <<-\EOF &&
-	S init.t
-	H sub/added
-	H sub/addedtoo
-	S subsub/added
-	EOF
-
-	echo sub/ > .git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-	git ls-files -t > result &&
-	test_cmp expected.swt-noinit result &&
-	test_path_is_missing init.t &&
-	test_path_is_file sub/added
-
-ok 6 - match directories with trailing slash
-
-expecting success of 1011.7 'match directories without trailing slash': 
-	echo sub >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-	git ls-files -t >result &&
-	test_cmp expected.swt-noinit result &&
-	test_path_is_missing init.t &&
-	test_path_is_file sub/added
-
-ok 7 - match directories without trailing slash
-
-expecting success of 1011.8 'match directories with negated patterns': 
-	cat >expected.swt-negation <<\EOF &&
-S init.t
-S sub/added
-H sub/addedtoo
-S subsub/added
-EOF
-
-	cat >.git/info/sparse-checkout <<\EOF &&
-sub
-!sub/added
-EOF
-	git read-tree -m -u HEAD &&
-	git ls-files -t >result &&
-	test_cmp expected.swt-negation result &&
-	test_path_is_missing init.t &&
-	test_path_is_missing sub/added &&
-	test_path_is_file sub/addedtoo
-
-ok 8 - match directories with negated patterns
-
-expecting success of 1011.9 'match directories with negated patterns (2)': 
-	cat >expected.swt-negation2 <<\EOF &&
-H init.t
-H sub/added
-S sub/addedtoo
-H subsub/added
-EOF
-
-	cat >.git/info/sparse-checkout <<\EOF &&
-/*
-!sub
-sub/added
-EOF
-	git read-tree -m -u HEAD &&
-	git ls-files -t >result &&
-	test_cmp expected.swt-negation2 result &&
-	test_path_is_file init.t &&
-	test_path_is_file sub/added &&
-	test_path_is_missing sub/addedtoo
-
-ok 9 - match directories with negated patterns (2)
-
-expecting success of 1011.10 'match directory pattern': 
-	echo "s?b" >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-	git ls-files -t >result &&
-	test_cmp expected.swt-noinit result &&
-	test_path_is_missing init.t &&
-	test_path_is_file sub/added
-
-ok 10 - match directory pattern
-
-expecting success of 1011.11 'checkout area changes': 
-	cat >expected.swt-nosub <<-\EOF &&
-	H init.t
-	S sub/added
-	S sub/addedtoo
-	S subsub/added
-	EOF
-
-	echo init.t >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-	git ls-files -t >result &&
-	test_cmp expected.swt-nosub result &&
-	test_path_is_file init.t &&
-	test_path_is_missing sub/added
-
-ok 11 - checkout area changes
-
-expecting success of 1011.12 'read-tree updates worktree, absent case': 
-	echo sub/added >.git/info/sparse-checkout &&
-	git checkout -f top &&
-	read_tree_u_must_succeed -m -u HEAD^ &&
-	test_path_is_missing init.t
-
-HEAD is now at 9598e22 modified and added
-ok 12 - read-tree updates worktree, absent case
-
-expecting success of 1011.13 'read-tree will not throw away dirty changes, non-sparse': 
-	echo "/*" >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-
-	echo dirty >init.t &&
-	read_tree_u_must_fail -m -u HEAD^ &&
-	test_path_is_file init.t &&
-	grep -q dirty init.t
-
-error: Entry 'init.t' not uptodate. Cannot merge.
-error: Entry 'init.t' not uptodate. Cannot merge.
-ok 13 - read-tree will not throw away dirty changes, non-sparse
-
-expecting success of 1011.14 'read-tree will not throw away dirty changes, sparse': 
-	echo "/*" >.git/info/sparse-checkout &&
-	read_tree_u_must_succeed -m -u HEAD &&
-
-	echo dirty >init.t &&
-	echo sub/added >.git/info/sparse-checkout &&
-	read_tree_u_must_fail -m -u HEAD^ &&
-	test_path_is_file init.t &&
-	grep -q dirty init.t
-
-error: Entry 'init.t' not uptodate. Cannot merge.
-error: Entry 'init.t' not uptodate. Cannot merge.
-ok 14 - read-tree will not throw away dirty changes, sparse
-
-expecting success of 1011.15 'read-tree updates worktree, dirty case': 
-	echo sub/added >.git/info/sparse-checkout &&
-	git checkout -f top &&
-	echo dirty >init.t &&
-	read_tree_u_must_fail -m -u HEAD^ &&
-	grep -q dirty init.t &&
-	rm init.t
-
-HEAD is now at 9598e22 modified and added
-error: Entry 'init.t' not uptodate. Cannot merge.
-error: Entry 'init.t' not uptodate. Cannot merge.
-ok 15 - read-tree updates worktree, dirty case
-
-expecting success of 1011.16 'read-tree removes worktree, dirty case': 
-	echo init.t >.git/info/sparse-checkout &&
-	git checkout -f top &&
-	echo dirty >added &&
-	read_tree_u_must_succeed -m -u HEAD^ &&
-	grep -q dirty added
-
-HEAD is now at 9598e22 modified and added
-ok 16 - read-tree removes worktree, dirty case
-
-expecting success of 1011.17 'read-tree adds to worktree, absent case': 
-	echo init.t >.git/info/sparse-checkout &&
-	git checkout -f removed &&
-	read_tree_u_must_succeed -u -m HEAD^ &&
-	test_path_is_missing sub/added
-
-Previous HEAD position was 9598e22 modified and added
-HEAD is now at de70956 removed
-ok 17 - read-tree adds to worktree, absent case
-
-expecting success of 1011.18 'read-tree adds to worktree, dirty case': 
-	echo init.t >.git/info/sparse-checkout &&
-	git checkout -f removed &&
-	mkdir sub &&
-	echo dirty >sub/added &&
-	read_tree_u_must_succeed -u -m HEAD^ &&
-	grep -q dirty sub/added
-
-HEAD is now at de70956 removed
-ok 18 - read-tree adds to worktree, dirty case
-
-expecting success of 1011.19 'index removal and worktree narrowing at the same time': 
-	echo init.t >.git/info/sparse-checkout &&
-	echo sub/added >>.git/info/sparse-checkout &&
-	git checkout -f top &&
-	echo init.t >.git/info/sparse-checkout &&
-	git checkout removed &&
-	git ls-files sub/added >result &&
-	test_path_is_missing sub/added &&
-	test_must_be_empty result
-
-Previous HEAD position was de70956 removed
-HEAD is now at 9598e22 modified and added
-Previous HEAD position was 9598e22 modified and added
-HEAD is now at de70956 removed
-ok 19 - index removal and worktree narrowing at the same time
-
-expecting success of 1011.20 'read-tree --reset removes outside worktree': 
-	echo init.t >.git/info/sparse-checkout &&
-	git checkout -f top &&
-	git reset --hard removed &&
-	git ls-files sub/added >result &&
-	test_must_be_empty result
-
-Previous HEAD position was de70956 removed
-HEAD is now at 9598e22 modified and added
-HEAD is now at de70956 removed
-ok 20 - read-tree --reset removes outside worktree
-
-expecting success of 1011.21 'print warnings when some worktree updates disabled': 
-	echo sub >.git/info/sparse-checkout &&
-	git checkout -f init &&
-	mkdir sub &&
-	touch sub/added sub/addedtoo &&
-	# Use -q to suppress "Previous HEAD position" and "Head is now at" msgs
-	git checkout -q top 2>actual &&
-	cat >expected <<\EOF &&
-warning: The following paths were already present and thus not updated despite sparse patterns:
-	sub/added
-	sub/addedtoo
-
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-EOF
-	test_cmp expected actual
-
-Previous HEAD position was de70956 removed
-HEAD is now at 2519212 init
-ok 21 - print warnings when some worktree updates disabled
-
-expecting success of 1011.22 'checkout without --ignore-skip-worktree-bits': 
-	echo "*" >.git/info/sparse-checkout &&
-	git checkout -f top &&
-	test_path_is_file init.t &&
-	echo sub >.git/info/sparse-checkout &&
-	git checkout &&
-	echo modified >> sub/added &&
-	git checkout . &&
-	test_path_is_missing init.t &&
-	git diff --exit-code HEAD
-
-HEAD is now at 9598e22 modified and added
-Updated 1 path from the index
-ok 22 - checkout without --ignore-skip-worktree-bits
-
-expecting success of 1011.23 'checkout with --ignore-skip-worktree-bits': 
-	echo "*" >.git/info/sparse-checkout &&
-	git checkout -f top &&
-	test_path_is_file init.t &&
-	echo sub >.git/info/sparse-checkout &&
-	git checkout &&
-	echo modified >> sub/added &&
-	git checkout --ignore-skip-worktree-bits . &&
-	test_path_is_file init.t &&
-	git diff --exit-code HEAD
-
-HEAD is now at 9598e22 modified and added
-Updated 3 paths from the index
-ok 23 - checkout with --ignore-skip-worktree-bits
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1022-read-tree-partial-clone.sh ***
-expecting success of 1022.1 'read-tree in partial clone prefetches in one batch': 
-	test_when_finished "rm -rf server client trace" &&
-
-	git init server &&
-	echo foo >server/one &&
-	echo bar >server/two &&
-	git -C server add one two &&
-	git -C server commit -m "initial commit" &&
-	TREE=$(git -C server rev-parse HEAD^{tree}) &&
-
-	git -C server config uploadpack.allowfilter 1 &&
-	git -C server config uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:none "file://$(pwd)/server" client &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client read-tree $TREE $TREE &&
-
-	# "done" marks the end of negotiation (once per fetch). Expect that
-	# only one fetch occurs.
-	grep "fetch> done" trace >donelines &&
-	test_line_count = 1 donelines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1022-read-tree-partial-clone/server/.git/
-[master (root-commit) a6fa93e] initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 two
-Cloning into bare repository 'client'...
-ok 1 - read-tree in partial clone prefetches in one batch
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1021-rerere-in-workdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1021-rerere-in-workdir/.git/
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 1021.1 'setup': 
-	git config rerere.enabled true &&
-	>world &&
-	git add world &&
-	test_tick &&
-	git commit -m initial &&
-
-	echo hello >world &&
-	test_tick &&
-	git commit -a -m hello &&
-
-	git checkout -b side HEAD^ &&
-	echo goodbye >world &&
-	test_tick &&
-	git commit -a -m goodbye &&
-
-	git checkout main
-
-[main (root-commit) 21975ff] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 world
-[main 02943d2] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'side'
-[side 5611ff9] goodbye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 1021.2 'rerere in workdir': 
-	rm -rf .git/rr-cache &&
-	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . work &&
-	(
-		cd work &&
-		test_must_fail git merge side &&
-		git rerere status >actual &&
-		echo world >expect &&
-		test_cmp expect actual
-	)
-
-Auto-merging world
-CONFLICT (content): Merge conflict in world
-Recorded preimage for 'world'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - rerere in workdir
-
-checking known breakage of 1021.3 'rerere in workdir (relative)': 
-	rm -rf .git/rr-cache &&
-	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . krow &&
-	(
-		cd krow &&
-		rm -f .git/rr-cache &&
-		ln -s ../.git/rr-cache .git/rr-cache &&
-		test_must_fail git merge side &&
-		git rerere status >actual &&
-		echo world >expect &&
-		test_cmp expect actual
-	)
-
-Auto-merging world
-CONFLICT (content): Merge conflict in world
-fatal: could not create directory '.git/rr-cache'
-fatal: could not create directory '.git/rr-cache'
-not ok 3 - rerere in workdir (relative) # TODO known breakage
-
-# still have 1 known breakage(s)
-# passed all remaining 2 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1020-subdirectory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1020-subdirectory/.git/
-expecting success of 1020.1 'setup': 
-	long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
-	test_write_lines $long >one &&
-	mkdir dir &&
-	test_write_lines x y z $long a b c >dir/two &&
-	cp one original.one &&
-	cp dir/two original.two
-
-ok 1 - setup
-
-expecting success of 1020.2 'update-index and ls-files': 
-	git update-index --add one &&
-	case "$(git ls-files)" in
-	one) echo pass one ;;
-	*) echo bad one; return 1 ;;
-	esac &&
-	(
-		cd dir &&
-		git update-index --add two &&
-		case "$(git ls-files)" in
-		two) echo pass two ;;
-		*) echo bad two; exit 1 ;;
-		esac
-	) &&
-	case "$(git ls-files)" in
-	dir/two"$LF"one) echo pass both ;;
-	*) echo bad; return 1 ;;
-	esac
-
-pass one
-pass two
-pass both
-ok 2 - update-index and ls-files
-
-expecting success of 1020.3 'cat-file': 
-	two=$(git ls-files -s dir/two) &&
-	two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
-	echo "$two" &&
-	git cat-file -p "$two" >actual &&
-	cmp dir/two actual &&
-	(
-		cd dir &&
-		git cat-file -p "$two" >actual &&
-		cmp two actual
-	)
-
-c1144d0671912dd26751c1fbf1eac57a907f82c7
-ok 3 - cat-file
-
-expecting success of 1020.4 'diff-files': 
-	echo a >>one &&
-	echo d >>dir/two &&
-	case "$(git diff-files --name-only)" in
-	dir/two"$LF"one) echo pass top ;;
-	*) echo bad top; return 1 ;;
-	esac &&
-	# diff should not omit leading paths
-	(
-		cd dir &&
-		case "$(git diff-files --name-only)" in
-		dir/two"$LF"one) echo pass subdir ;;
-		*) echo bad subdir; exit 1 ;;
-		esac &&
-		case "$(git diff-files --name-only .)" in
-		dir/two) echo pass subdir limited ;;
-		*) echo bad subdir limited; exit 1 ;;
-		esac
-	)
-
-pass top
-pass subdir
-pass subdir limited
-ok 4 - diff-files
-
-expecting success of 1020.5 'write-tree': 
-	top=$(git write-tree) &&
-	echo $top &&
-	(
-		cd dir &&
-		sub=$(git write-tree) &&
-		echo $sub &&
-		test "z$top" = "z$sub"
-	)
-
-cf1e35b43464cccd320d58a813e14e25fa36b1d7
-cf1e35b43464cccd320d58a813e14e25fa36b1d7
-ok 5 - write-tree
-
-expecting success of 1020.6 'checkout-index': 
-	git checkout-index -f -u one &&
-	cmp one original.one &&
-	(
-		cd dir &&
-		git checkout-index -f -u two &&
-		cmp two ../original.two
-	)
-
-ok 6 - checkout-index
-
-expecting success of 1020.7 'read-tree': 
-	rm -f one dir/two &&
-	tree=$(git write-tree) &&
-	read_tree_u_must_succeed --reset -u "$tree" &&
-	cmp one original.one &&
-	cmp dir/two original.two &&
-	(
-		cd dir &&
-		rm -f two &&
-		read_tree_u_must_succeed --reset -u "$tree" &&
-		cmp two ../original.two &&
-		cmp ../one ../original.one
-	)
-
-ok 7 - read-tree
-
-expecting success of 1020.8 'alias expansion': 
-	(
-		git config alias.test-status-alias status &&
-		cd dir &&
-		git status &&
-		git test-status-alias
-	)
-
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-	new file:   two
-	new file:   ../one
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	post-dry-run
-	post-dry-run-wt
-	pre-dry-run
-	pre-dry-run-wt
-	../original.one
-	../original.two
-	../post-dry-run
-	../post-dry-run-wt
-	../pre-dry-run
-	../pre-dry-run-wt
-
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-	new file:   two
-	new file:   ../one
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	post-dry-run
-	post-dry-run-wt
-	pre-dry-run
-	pre-dry-run-wt
-	../original.one
-	../original.two
-	../post-dry-run
-	../post-dry-run-wt
-	../pre-dry-run
-	../pre-dry-run-wt
-
-ok 8 - alias expansion
-
-expecting success of 1020.9 '!alias expansion': 
-	pwd >expect &&
-	(
-		git config alias.test-alias-directory !pwd &&
-		cd dir &&
-		git test-alias-directory >../actual
-	) &&
-	test_cmp expect actual
-
-ok 9 - !alias expansion
-
-expecting success of 1020.10 'GIT_PREFIX for !alias': 
-	printf "dir/" >expect &&
-	(
-		git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&
-		cd dir &&
-		git test-alias-directory >../actual
-	) &&
-	test_cmp expect actual
-
-ok 10 - GIT_PREFIX for !alias
-
-expecting success of 1020.11 'GIT_PREFIX for built-ins': 
-	# Use GIT_EXTERNAL_DIFF to test that the "diff" built-in
-	# receives the GIT_PREFIX variable.
-	echo "dir/" >expect &&
-	write_script diff <<-\EOF &&
-	printf "%s\n" "$GIT_PREFIX"
-	EOF
-	(
-		cd dir &&
-		echo "change" >two &&
-		GIT_EXTERNAL_DIFF=./diff git diff >../actual &&
-		git checkout -- two
-	) &&
-	test_cmp expect actual
-
-ok 11 - GIT_PREFIX for built-ins
-
-expecting success of 1020.12 'no file/rev ambiguity check inside .git': 
-	git commit -a -m 1 &&
-	(
-		cd .git &&
-		git show -s HEAD
-	)
-
-[master (root-commit) 63e2ba9] 1
- Author: A U Thor <author@example.com>
- 2 files changed, 58 insertions(+)
- create mode 100644 dir/two
- create mode 100644 one
-commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-ok 12 - no file/rev ambiguity check inside .git
-
-expecting success of 1020.13 'no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)': 
-	test_when_finished "rm -fr foo.git" &&
-	git clone -s --bare .git foo.git &&
-	(
-		cd foo.git &&
-		# older Git needed help by exporting GIT_DIR=.
-		# to realize that it is inside a bare repository.
-		# We keep this test around for regression testing.
-		GIT_DIR=. git show -s HEAD
-	)
-
-Cloning into bare repository 'foo.git'...
-done.
-commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-ok 13 - no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)
-
-expecting success of 1020.14 'no file/rev ambiguity check inside a bare repo': 
-	test_when_finished "rm -fr foo.git" &&
-	git clone -s --bare .git foo.git &&
-	(
-		cd foo.git &&
-		git show -s HEAD
-	)
-
-Cloning into bare repository 'foo.git'...
-done.
-commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-ok 14 - no file/rev ambiguity check inside a bare repo
-
-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 1020.15 'detection should not be fooled by a symlink': 
-	git clone -s .git another &&
-	ln -s another yetanother &&
-	(
-		cd yetanother/.git &&
-		git show -s HEAD
-	)
-
-Cloning into 'another'...
-done.
-commit 63e2ba96e88f4f612aaba03cc52a7db80cff1e0c
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-ok 15 - detection should not be fooled by a symlink
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1051-large-conversion.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-
-expecting success of 1051.6 'setup output tests': 
-	echo "\$Id\$" >small &&
-	cat small small >large &&
-	git add small large &&
-	git config core.bigfilethreshold 7 &&
-	git config filter.test.smudge "sed s/.*/SMUDGE/"
-
-ok 6 - setup output tests
-
-expecting success of 1051.7 'autocrlf=true converts on output': 
-	test_config core.autocrlf true &&
-	check_output
-
-Updated 2 paths from the index
-ok 7 - autocrlf=true converts on output
-
-expecting success of 1051.8 'eol=crlf converts on output': 
-	set_attr eol=crlf &&
-	check_output
-
-Updated 2 paths from the index
-ok 8 - eol=crlf converts on output
-
-expecting success of 1051.9 'user-defined filters convert on output': 
-	set_attr filter=test &&
-	check_output
-
-Updated 2 paths from the index
-ok 9 - user-defined filters convert on output
-
-expecting success of 1051.10 'ident converts on output': 
-	set_attr ident &&
-	rm -f small large &&
-	git checkout small large &&
-	sed -n "s/Id: .*/Id: SHA/p" <small >small.clean &&
-	head -n 1 large >large.head &&
-	sed -n "s/Id: .*/Id: SHA/p" <large.head >large.clean &&
-	test_cmp small.clean large.clean
-
-Updated 2 paths from the index
-ok 10 - ident converts on output
-
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-checking prerequisite: SIZE_T_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SIZE_T_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SIZE_T_IS_64BIT" &&
-	test 8 -eq "$(build_option sizeof-size_t)"
-
-)
-prerequisite SIZE_T_IS_64BIT ok
-checking prerequisite: LONG_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-	test 8 -le "$(build_option sizeof-long)"
-
-)
-prerequisite LONG_IS_64BIT ok
-ok 11 # skip files over 4GB convert on output (missing !LONG_IS_64BIT,EXPENSIVE of EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT)
-
-ok 12 # skip files over 4GB convert on input (missing !LONG_IS_64BIT,EXPENSIVE of EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT)
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1090-sparse-checkout-scope.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1090-sparse-checkout-scope/.git/
-expecting success of 1090.1 'setup': 
-	echo "initial" >a &&
-	echo "initial" >b &&
-	echo "initial" >c &&
-	git add a b c &&
-	git commit -m "initial commit"
-
-[main (root-commit) 0b6cffd] initial commit
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
-ok 1 - setup
-
-expecting success of 1090.2 'create feature branch': 
-	git checkout -b feature &&
-	echo "modified" >b &&
-	echo "modified" >c &&
-	git add b c &&
-	git commit -m "modification"
-
-Switched to a new branch 'feature'
-[feature 96237bb] modification
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 2 - create feature branch
-
-expecting success of 1090.3 'perform sparse checkout of main': 
-	git config --local --bool core.sparsecheckout true &&
-	mkdir .git/info &&
-	echo "!/*" >.git/info/sparse-checkout &&
-	echo "/a" >>.git/info/sparse-checkout &&
-	echo "/c" >>.git/info/sparse-checkout &&
-	git checkout main &&
-	test_path_is_file a &&
-	test_path_is_missing b &&
-	test_path_is_file c
-
-Switched to branch 'main'
-ok 3 - perform sparse checkout of main
-
-expecting success of 1090.4 'merge feature branch into sparse checkout of main': 
-	git merge feature &&
-	test_path_is_file a &&
-	test_path_is_missing b &&
-	test_path_is_file c &&
-	test "$(cat c)" = "modified"
-
-Updating 0b6cffd..96237bb
-Fast-forward
- b | 2 +-
- c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 4 - merge feature branch into sparse checkout of main
-
-expecting success of 1090.5 'return to full checkout of main': 
-	git checkout feature &&
-	echo "/*" >.git/info/sparse-checkout &&
-	git checkout main &&
-	test_path_is_file a &&
-	test_path_is_file b &&
-	test_path_is_file c &&
-	test "$(cat b)" = "modified"
-
-Switched to branch 'feature'
-Switched to branch 'main'
-ok 5 - return to full checkout of main
-
-expecting success of 1090.6 'skip-worktree on files outside sparse patterns': 
-	git sparse-checkout disable &&
-	git sparse-checkout set --no-cone "a*" &&
-	git checkout-index --all --ignore-skip-worktree-bits &&
-
-	git ls-files -t >output &&
-	! grep ^S output >actual &&
-	test_must_be_empty actual &&
-
-	test_config sparse.expectFilesOutsideOfPatterns true &&
-	cat <<-\EOF >expect &&
-	S b
-	S c
-	EOF
-	git ls-files -t >output &&
-	grep ^S output >actual &&
-	test_cmp expect actual
-
-ok 6 - skip-worktree on files outside sparse patterns
-
-expecting success of 1090.7 'in partial clone, sparse checkout only fetches needed blobs': 
-	test_create_repo server &&
-	git clone --template= "file://$(pwd)/server" client &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	echo a >server/a &&
-	echo bb >server/b &&
-	mkdir server/c &&
-	echo ccc >server/c/c &&
-	git -C server add a b c/c &&
-	git -C server commit -m message &&
-
-	test_config -C client core.sparsecheckout 1 &&
-	mkdir client/.git/info &&
-	echo "!/*" >client/.git/info/sparse-checkout &&
-	echo "/a" >>client/.git/info/sparse-checkout &&
-	git -C client fetch --filter=blob:none origin &&
-	git -C client checkout FETCH_HEAD &&
-
-	git -C client rev-list HEAD \
-		--quiet --objects --missing=print >unsorted_actual &&
-	(
-		printf "?" &&
-		git hash-object server/b &&
-		printf "?" &&
-		git hash-object server/c/c
-	) >unsorted_expect &&
-	sort unsorted_actual >actual &&
-	sort unsorted_expect >expect &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1090-sparse-checkout-scope/server/.git/
-Cloning into 'client'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) ab14680] message
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c/c
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1090-sparse-checkout-scope/server
- * [new branch]      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:
+Or undo this operation with:
 
   git switch -
 
@@ -45293,7 +43780,7 @@
  create mode 100644 content.t
 1+0 records in
 1+0 records out
-1 byte copied, 3.452e-05 s, 29.0 kB/s
+1 byte copied, 0.00338944 s, 0.3 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1060-object-corruption/no-bit-error/.git/
 [master (root-commit) f374eba] content
  Author: A U Thor <author@example.com>
@@ -45406,8 +43893,8 @@
 
 Cloning into bare repository 'missing-transport'...
 error: git upload-pack: git-pack-objects died with error.
-remote: fatal: unable to read d95f3ad14dee633a758d2e331151e950dd13e4ed        
 fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
+remote: fatal: unable to read d95f3ad14dee633a758d2e331151e950dd13e4ed        
 remote: aborting due to possible repository corruption on the remote side.
 fatal: early EOF
 fatal: fetch-pack: invalid index-pack output
@@ -46406,670 +44893,2747 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1016-compatObjectFormat.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1016-compatObjectFormat/.git/
-expecting success of 1016.1 'setup sha1 repository': 
-		git init --object-format=$hash &&
-		git config core.repositoryformatversion 1 &&
-		git config extensions.objectformat $hash &&
-		git config extensions.compatobjectformat $(compat_hash $hash) &&
-		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
-		echo "Hello World!" >hello &&
-		eval hello_${hash}_oid=$(git hash-object hello) &&
-		git update-index --add hello &&
-		git commit -m "Initial commit" &&
-		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
-		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1016-compatObjectFormat/repo-sha1/.git/
-[master (root-commit) 0f0d9f0] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-ok 1 - setup sha1 repository
-
-expecting success of 1016.2 'create a sha1  tagged blob': 
-		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
-		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
-	
-ok 2 - create a sha1  tagged blob
+*** t0610-reftable-basics.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/.git/
+expecting success of 0610.1 'init: creates basic reftable structures': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_path_is_dir repo/.git/reftable &&
+	test_path_is_file repo/.git/reftable/tables.list &&
+	echo reftable >expect &&
+	git -C repo rev-parse --show-ref-format >actual &&
+	test_cmp expect actual
 
-expecting success of 1016.3 'create a sha1 tagged tree': 
-		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
-		eval treetag_${hash}_oid=$(git rev-parse treetag)
-	
-ok 3 - create a sha1 tagged tree
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 1 - init: creates basic reftable structures
 
-expecting success of 1016.4 'create a sha1 tagged commit': 
-		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
-		eval committag_${hash}_oid=$(git rev-parse committag)
-	
-ok 4 - create a sha1 tagged commit
+expecting success of 0610.2 'init: sha256 object format via environment variable': 
+	test_when_finished "rm -rf repo" &&
+	GIT_DEFAULT_HASH=sha256 git init repo &&
+	cat >expect <<-EOF &&
+	sha256
+	reftable
+	EOF
+	git -C repo rev-parse --show-object-format --show-ref-format >actual &&
+	test_cmp expect actual
 
-checking prerequisite: GPG2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 2 - init: sha256 object format via environment variable
 
-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
+expecting success of 0610.3 'init: sha256 object format via option': 
+	test_when_finished "rm -rf repo" &&
+	git init --object-format=sha256 repo &&
+	cat >expect <<-EOF &&
+	sha256
+	reftable
+	EOF
+	git -C repo rev-parse --show-object-format --show-ref-format >actual &&
+	test_cmp expect actual
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 3 - init: sha256 object format via option
 
-)
-prerequisite GPG2 not satisfied
-ok 5 # skip create a sha1 signed commit (missing GPG2)
+expecting success of 0610.4 'init: reinitializing reftable backend succeeds': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo A &&
 
-ok 6 # skip create a sha1 signed tag (missing GPG2)
+	git -C repo for-each-ref >expect &&
+	git init --ref-format=reftable repo &&
+	git -C repo for-each-ref >actual &&
+	test_cmp expect actual
 
-expecting success of 1016.7 'create a sha1 branch': 
-		git checkout -b branch $(commit_oid $hash) &&
-		echo "More more more give me more!" >more &&
-		eval more_${hash}_oid=$(git hash-object more) &&
-		echo "Another and another and another" >another &&
-		eval another_${hash}_oid=$(git hash-object another) &&
-		git update-index --add more another &&
-		git commit -m "Add more files!" &&
-		eval commit2_${hash}_oid=$(git rev-parse HEAD) &&
-		eval tree2_${hash}_oid=$(git rev-parse HEAD^{tree})
-	
-Switched to a new branch 'branch'
-[branch f94d4a8] Add more files!
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 another
- create mode 100644 more
-ok 7 - create a sha1 branch
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 4 - init: reinitializing reftable backend succeeds
 
-ok 8 # skip create another sha1 signed tag (missing GPG2)
+expecting success of 0610.5 'init: reinitializing files with reftable backend fails': 
+	test_when_finished "rm -rf repo" &&
+	git init --ref-format=files repo &&
+	test_commit -C repo file &&
 
-ok 9 # skip merge the sha1 branches together (missing GPG2)
+	cp repo/.git/HEAD expect &&
+	test_must_fail git init --ref-format=reftable repo &&
+	test_cmp expect repo/.git/HEAD
 
-ok 10 # skip create additional sha1 signed commits (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 8775f53] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+fatal: attempt to reinitialize repository with different reference storage format
+ok 5 - init: reinitializing files with reftable backend fails
 
-ok 11 # skip create additional sha1 signed tags (missing GPG2)
+expecting success of 0610.6 'init: reinitializing reftable with files backend fails': 
+	test_when_finished "rm -rf repo" &&
+	git init --ref-format=reftable repo &&
+	test_commit -C repo file &&
 
-expecting success of 1016.12 'setup sha256 repository': 
-		git init --object-format=$hash &&
-		git config core.repositoryformatversion 1 &&
-		git config extensions.objectformat $hash &&
-		git config extensions.compatobjectformat $(compat_hash $hash) &&
-		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
-		echo "Hello World!" >hello &&
-		eval hello_${hash}_oid=$(git hash-object hello) &&
-		git update-index --add hello &&
-		git commit -m "Initial commit" &&
-		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
-		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1016-compatObjectFormat/repo-sha256/.git/
-[master (root-commit) 8c32aa7] Initial commit
+	cp repo/.git/HEAD expect &&
+	test_must_fail git init --ref-format=files repo &&
+	test_cmp expect repo/.git/HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) d122299] file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 hello
-ok 12 - setup sha256 repository
+ create mode 100644 file.t
+fatal: attempt to reinitialize repository with different reference storage format
+ok 6 - init: reinitializing reftable with files backend fails
 
-expecting success of 1016.13 'create a sha256  tagged blob': 
-		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
-		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
+expecting success of 0610.7 'init: honors --shared=umask with umask 002': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 13 - create a sha256  tagged blob
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 7 - init: honors --shared=umask with umask 002
 
-expecting success of 1016.14 'create a sha256 tagged tree': 
-		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
-		eval treetag_${hash}_oid=$(git rev-parse treetag)
+expecting success of 0610.8 'pack-refs: honors --shared=umask with umask 002': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 14 - create a sha256 tagged tree
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 8 - pack-refs: honors --shared=umask with umask 002
 
-expecting success of 1016.15 'create a sha256 tagged commit': 
-		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
-		eval committag_${hash}_oid=$(git rev-parse committag)
+expecting success of 0610.9 'init: honors --shared=umask with umask 022': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 15 - create a sha256 tagged commit
-
-ok 16 # skip create a sha256 signed commit (missing GPG2)
-
-ok 17 # skip create a sha256 signed tag (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 9 - init: honors --shared=umask with umask 022
 
-expecting success of 1016.18 'create a sha256 branch': 
-		git checkout -b branch $(commit_oid $hash) &&
-		echo "More more more give me more!" >more &&
-		eval more_${hash}_oid=$(git hash-object more) &&
-		echo "Another and another and another" >another &&
-		eval another_${hash}_oid=$(git hash-object another) &&
-		git update-index --add more another &&
-		git commit -m "Add more files!" &&
-		eval commit2_${hash}_oid=$(git rev-parse HEAD) &&
-		eval tree2_${hash}_oid=$(git rev-parse HEAD^{tree})
+expecting success of 0610.10 'pack-refs: honors --shared=umask with umask 022': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-Switched to a new branch 'branch'
-[branch 38ddb0e] Add more files!
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 another
- create mode 100644 more
-ok 18 - create a sha256 branch
-
-ok 19 # skip create another sha256 signed tag (missing GPG2)
-
-ok 20 # skip merge the sha256 branches together (missing GPG2)
-
-ok 21 # skip create additional sha256 signed commits (missing GPG2)
-
-ok 22 # skip create additional sha256 signed tags (missing GPG2)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 10 - pack-refs: honors --shared=umask with umask 022
 
-expecting success of 1016.23 'Verify blob hello's sha1 oid': 
-		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
-		test_cmp ${name}_sha1 ${name}_sha1_expected
+expecting success of 0610.11 'init: honors --shared=umask with umask 027': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 23 - Verify blob hello's sha1 oid
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 11 - init: honors --shared=umask with umask 027
 
-expecting success of 1016.24 'Verify blob hello's sha256 oid': 
-		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
-		test_cmp ${name}_sha256 ${name}_sha256_expected
+expecting success of 0610.12 'pack-refs: honors --shared=umask with umask 027': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 24 - Verify blob hello's sha256 oid
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 12 - pack-refs: honors --shared=umask with umask 027
 
-expecting success of 1016.25 'Verify hello's sha1 type': 
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type_expected
+expecting success of 0610.13 'init: honors --shared=group with umask 002': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 25 - Verify hello's sha1 type
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 13 - init: honors --shared=group with umask 002
 
-expecting success of 1016.26 'Verify hello's sha256 type': 
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type_expected
+expecting success of 0610.14 'pack-refs: honors --shared=group with umask 002': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 26 - Verify hello's sha256 type
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 14 - pack-refs: honors --shared=group with umask 002
 
-expecting success of 1016.27 'Verify hello's sha1 size': 
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
-		test_cmp ${name}_size1 ${name}_size2
+expecting success of 0610.15 'init: honors --shared=group with umask 022': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 27 - Verify hello's sha1 size
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 15 - init: honors --shared=group with umask 022
 
-expecting success of 1016.28 'Verify hello's sha256 size': 
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
-		test_cmp ${name}_size3 ${name}_size4
+expecting success of 0610.16 'pack-refs: honors --shared=group with umask 022': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 28 - Verify hello's sha256 size
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 16 - pack-refs: honors --shared=group with umask 022
 
-expecting success of 1016.29 'Verify hello's sha1 pretty content': 
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
-		test_cmp ${name}_content1 ${name}_content2
+expecting success of 0610.17 'init: honors --shared=group with umask 027': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 29 - Verify hello's sha1 pretty content
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 17 - init: honors --shared=group with umask 027
 
-expecting success of 1016.30 'Verify hello's sha256 pretty content': 
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
-		test_cmp ${name}_content3 ${name}_content4
+expecting success of 0610.18 'pack-refs: honors --shared=group with umask 027': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 30 - Verify hello's sha256 pretty content
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 18 - pack-refs: honors --shared=group with umask 027
 
-expecting success of 1016.31 'Verify hello's sha1 content': 
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
-		test_cmp ${name}_content5 ${name}_content6
+expecting success of 0610.19 'init: honors --shared=world with umask 002': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 31 - Verify hello's sha1 content
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 19 - init: honors --shared=world with umask 002
 
-expecting success of 1016.32 'Verify hello's sha256 content': 
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
-		test_cmp ${name}_content7 ${name}_content8
+expecting success of 0610.20 'pack-refs: honors --shared=world with umask 002': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 32 - Verify hello's sha256 content
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 20 - pack-refs: honors --shared=world with umask 002
 
-expecting success of 1016.33 'Verify tree tree's sha1 oid': 
-		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
-		test_cmp ${name}_sha1 ${name}_sha1_expected
+expecting success of 0610.21 'init: honors --shared=world with umask 022': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 33 - Verify tree tree's sha1 oid
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 21 - init: honors --shared=world with umask 022
 
-expecting success of 1016.34 'Verify tree tree's sha256 oid': 
-		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
-		test_cmp ${name}_sha256 ${name}_sha256_expected
+expecting success of 0610.22 'pack-refs: honors --shared=world with umask 022': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 34 - Verify tree tree's sha256 oid
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 22 - pack-refs: honors --shared=world with umask 022
 
-expecting success of 1016.35 'Verify tree's sha1 type': 
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type_expected
+expecting success of 0610.23 'init: honors --shared=world with umask 027': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 35 - Verify tree's sha1 type
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 23 - init: honors --shared=world with umask 027
 
-expecting success of 1016.36 'Verify tree's sha256 type': 
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type_expected
+expecting success of 0610.24 'pack-refs: honors --shared=world with umask 027': 
+		test_when_finished "rm -rf repo" &&
+		(
+			umask $umask &&
+			git init --shared=$shared repo &&
+			test_commit -C repo A &&
+			test_line_count = 2 repo/.git/reftable/tables.list &&
+			git -C repo pack-refs
+		) &&
+		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
+		for table in repo/.git/reftable/*.ref
+		do
+			test_expect_perms "$expect" "$table" ||
+			return 1
+		done
 	
-ok 36 - Verify tree's sha256 type
+Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 24 - pack-refs: honors --shared=world with umask 027
 
-expecting success of 1016.37 'Verify tree's sha1 size': 
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
-		test_cmp ${name}_size1 ${name}_size2
-	
-ok 37 - Verify tree's sha1 size
+expecting success of 0610.25 'clone: can clone reftable repository': 
+	test_when_finished "rm -rf repo clone" &&
+	git init repo &&
+	test_commit -C repo message1 file1 &&
 
-expecting success of 1016.38 'Verify tree's sha256 size': 
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
-		test_cmp ${name}_size3 ${name}_size4
-	
-ok 38 - Verify tree's sha256 size
+	git clone repo cloned &&
+	echo reftable >expect &&
+	git -C cloned rev-parse --show-ref-format >actual &&
+	test_cmp expect actual &&
+	test_path_is_file cloned/file1
 
-expecting success of 1016.39 'Verify tree's sha1 pretty content': 
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
-		test_cmp ${name}_content1 ${name}_content2
-	
-ok 39 - Verify tree's sha1 pretty content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 3d039ac] message1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Cloning into 'cloned'...
+done.
+ok 25 - clone: can clone reftable repository
 
-expecting success of 1016.40 'Verify tree's sha256 pretty content': 
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
-		test_cmp ${name}_content3 ${name}_content4
-	
-ok 40 - Verify tree's sha256 pretty content
+expecting success of 0610.26 'clone: can clone reffiles into reftable repository': 
+	test_when_finished "rm -rf reffiles reftable" &&
+	git init --ref-format=files reffiles &&
+	test_commit -C reffiles A &&
+	git clone --ref-format=reftable ./reffiles reftable &&
 
-expecting success of 1016.41 'Verify tree's sha1 content': 
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
-		test_cmp ${name}_content5 ${name}_content6
-	
-ok 41 - Verify tree's sha1 content
+	git -C reffiles rev-parse HEAD >expect &&
+	git -C reftable rev-parse HEAD >actual &&
+	test_cmp expect actual &&
 
-expecting success of 1016.42 'Verify tree's sha256 content': 
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
-		test_cmp ${name}_content7 ${name}_content8
-	
-ok 42 - Verify tree's sha256 content
+	git -C reftable rev-parse --show-ref-format >actual &&
+	echo reftable >expect &&
+	test_cmp expect actual &&
 
-expecting success of 1016.43 'Verify commit commit's sha1 oid': 
-		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
-		test_cmp ${name}_sha1 ${name}_sha1_expected
-	
-ok 43 - Verify commit commit's sha1 oid
+	git -C reffiles rev-parse --show-ref-format >actual &&
+	echo files >expect &&
+	test_cmp expect actual
 
-expecting success of 1016.44 'Verify commit commit's sha256 oid': 
-		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
-		test_cmp ${name}_sha256 ${name}_sha256_expected
-	
-ok 44 - Verify commit commit's sha256 oid
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/reffiles/.git/
+[main (root-commit) c8e0c53] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Cloning into 'reftable'...
+done.
+ok 26 - clone: can clone reffiles into reftable repository
 
-expecting success of 1016.45 'Verify commit's sha1 type': 
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type_expected
-	
-ok 45 - Verify commit's sha1 type
+expecting success of 0610.27 'clone: can clone reftable into reffiles repository': 
+	test_when_finished "rm -rf reffiles reftable" &&
+	git init --ref-format=reftable reftable &&
+	test_commit -C reftable A &&
+	git clone --ref-format=files ./reftable reffiles &&
 
-expecting success of 1016.46 'Verify commit's sha256 type': 
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type_expected
-	
-ok 46 - Verify commit's sha256 type
+	git -C reftable rev-parse HEAD >expect &&
+	git -C reffiles rev-parse HEAD >actual &&
+	test_cmp expect actual &&
 
-expecting success of 1016.47 'Verify commit's sha1 size': 
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
-		test_cmp ${name}_size1 ${name}_size2
-	
-ok 47 - Verify commit's sha1 size
+	git -C reftable rev-parse --show-ref-format >actual &&
+	echo reftable >expect &&
+	test_cmp expect actual &&
 
-expecting success of 1016.48 'Verify commit's sha256 size': 
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
-		test_cmp ${name}_size3 ${name}_size4
-	
-ok 48 - Verify commit's sha256 size
+	git -C reffiles rev-parse --show-ref-format >actual &&
+	echo files >expect &&
+	test_cmp expect actual
 
-expecting success of 1016.49 'Verify commit's sha1 pretty content': 
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
-		test_cmp ${name}_content1 ${name}_content2
-	
-ok 49 - Verify commit's sha1 pretty content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/reftable/.git/
+[main (root-commit) 063dab5] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Cloning into 'reffiles'...
+done.
+ok 27 - clone: can clone reftable into reffiles repository
 
-expecting success of 1016.50 'Verify commit's sha256 pretty content': 
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
-		test_cmp ${name}_content3 ${name}_content4
-	
-ok 50 - Verify commit's sha256 pretty content
+expecting success of 0610.28 'ref transaction: corrupted tables cause failure': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit file1 &&
+		for f in .git/reftable/*.ref
+		do
+			: >"$f" || return 1
+		done &&
+		test_must_fail git update-ref refs/heads/main HEAD
+	)
 
-expecting success of 1016.51 'Verify commit's sha1 content': 
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
-		test_cmp ${name}_content5 ${name}_content6
-	
-ok 51 - Verify commit's sha1 content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) d612ae7] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+fatal: HEAD: not a valid SHA1
+ok 28 - ref transaction: corrupted tables cause failure
 
-expecting success of 1016.52 'Verify commit's sha256 content': 
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
-		test_cmp ${name}_content7 ${name}_content8
-	
-ok 52 - Verify commit's sha256 content
+expecting success of 0610.29 'ref transaction: corrupted tables.list cause failure': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit file1 &&
+		echo garbage >.git/reftable/tables.list &&
+		test_must_fail git update-ref refs/heads/main HEAD
+	)
 
-ok 53 # skip Verify commit signedcommit's sha1 oid (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) d612ae7] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+fatal: HEAD: not a valid SHA1
+ok 29 - ref transaction: corrupted tables.list cause failure
 
-ok 54 # skip Verify commit signedcommit's sha256 oid (missing GPG2)
+expecting success of 0610.30 'ref transaction: refuses to write ref causing F/D conflict': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo file &&
+	test_must_fail git -C repo update-ref refs/heads/main/forbidden
 
-ok 55 # skip Verify signedcommit's sha1 type (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 1c78b0a] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+usage: git update-ref [<options>] -d <refname> [<old-oid>]
+   or: git update-ref [<options>]    <refname> <new-oid> [<old-oid>]
+   or: git update-ref [<options>] --stdin [-z]
 
-ok 56 # skip Verify signedcommit's sha256 type (missing GPG2)
+    -m <reason>           reason of the update
+    -d                    delete the reference
+    --no-deref            update <refname> not the one it points to
+    --deref               opposite of --no-deref
+    -z                    stdin has NUL-terminated arguments
+    --[no-]stdin          read updates from stdin
+    --[no-]create-reflog  create a reflog
 
-ok 57 # skip Verify signedcommit's sha1 size (missing GPG2)
+ok 30 - ref transaction: refuses to write ref causing F/D conflict
 
-ok 58 # skip Verify signedcommit's sha256 size (missing GPG2)
+expecting success of 0610.31 'ref transaction: deleting ref with invalid name fails': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo file &&
+	test_must_fail git -C repo update-ref -d ../../my-private-file
 
-ok 59 # skip Verify signedcommit's sha1 pretty content (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) a9763e5] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+error: refusing to update ref with bad name '../../my-private-file'
+ok 31 - ref transaction: deleting ref with invalid name fails
 
-ok 60 # skip Verify signedcommit's sha256 pretty content (missing GPG2)
+expecting success of 0610.32 'ref transaction: can skip object ID verification': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail test-tool -C repo ref-store main update-ref msg refs/heads/branch $INVALID_OID $ZERO_OID 0 &&
+	test-tool -C repo ref-store main update-ref msg refs/heads/branch $INVALID_OID $ZERO_OID REF_SKIP_OID_VERIFICATION
 
-ok 61 # skip Verify signedcommit's sha1 content (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+fatal: update_ref failed for ref 'refs/heads/branch': trying to write ref 'refs/heads/branch' with nonexistent object 0000000000000000000000000000000000000001
+ok 32 - ref transaction: can skip object ID verification
 
-ok 62 # skip Verify signedcommit's sha256 content (missing GPG2)
+expecting success of 0610.33 'ref transaction: updating same ref multiple times fails': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo A &&
+	cat >updates <<-EOF &&
+	update refs/heads/main $A
+	update refs/heads/main $A
+	EOF
+	cat >expect <<-EOF &&
+	fatal: multiple updates for ref ${SQ}refs/heads/main${SQ} not allowed
+	EOF
+	test_must_fail git -C repo update-ref --stdin <updates 2>err &&
+	test_cmp expect err
 
-expecting success of 1016.63 'Verify tag hellotag's sha1 oid': 
-		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
-		test_cmp ${name}_sha1 ${name}_sha1_expected
-	
-ok 63 - Verify tag hellotag's sha1 oid
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) d1cc01b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 33 - ref transaction: updating same ref multiple times fails
 
-expecting success of 1016.64 'Verify tag hellotag's sha256 oid': 
-		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
-		test_cmp ${name}_sha256 ${name}_sha256_expected
-	
-ok 64 - Verify tag hellotag's sha256 oid
+expecting success of 0610.34 'ref transaction: can delete symbolic self-reference with git-symbolic-ref(1)': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	git -C repo symbolic-ref refs/heads/self refs/heads/self &&
+	git -C repo symbolic-ref -d refs/heads/self
 
-expecting success of 1016.65 'Verify hellotag's sha1 type': 
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type_expected
-	
-ok 65 - Verify hellotag's sha1 type
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 34 - ref transaction: can delete symbolic self-reference with git-symbolic-ref(1)
 
-expecting success of 1016.66 'Verify hellotag's sha256 type': 
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type_expected
-	
-ok 66 - Verify hellotag's sha256 type
+expecting success of 0610.35 'ref transaction: deleting symbolic self-reference without --no-deref fails': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	git -C repo symbolic-ref refs/heads/self refs/heads/self &&
+	cat >expect <<-EOF &&
+	error: multiple updates for ${SQ}refs/heads/self${SQ} (including one via symref ${SQ}refs/heads/self${SQ}) are not allowed
+	EOF
+	test_must_fail git -C repo update-ref -d refs/heads/self 2>err &&
+	test_cmp expect err
 
-expecting success of 1016.67 'Verify hellotag's sha1 size': 
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
-		test_cmp ${name}_size1 ${name}_size2
-	
-ok 67 - Verify hellotag's sha1 size
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 35 - ref transaction: deleting symbolic self-reference without --no-deref fails
 
-expecting success of 1016.68 'Verify hellotag's sha256 size': 
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
-		test_cmp ${name}_size3 ${name}_size4
-	
-ok 68 - Verify hellotag's sha256 size
+expecting success of 0610.36 'ref transaction: deleting symbolic self-reference with --no-deref succeeds': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	git -C repo symbolic-ref refs/heads/self refs/heads/self &&
+	git -C repo update-ref -d --no-deref refs/heads/self
 
-expecting success of 1016.69 'Verify hellotag's sha1 pretty content': 
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
-		test_cmp ${name}_content1 ${name}_content2
-	
-ok 69 - Verify hellotag's sha1 pretty content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 36 - ref transaction: deleting symbolic self-reference with --no-deref succeeds
 
-expecting success of 1016.70 'Verify hellotag's sha256 pretty content': 
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
-		test_cmp ${name}_content3 ${name}_content4
-	
-ok 70 - Verify hellotag's sha256 pretty content
+expecting success of 0610.37 'ref transaction: creating symbolic ref fails with F/D conflict': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo A &&
+	cat >expect <<-EOF &&
+	error: ${SQ}refs/heads/main${SQ} exists; cannot create ${SQ}refs/heads${SQ}
+	EOF
+	test_must_fail git -C repo symbolic-ref refs/heads refs/heads/foo 2>err &&
+	test_cmp expect err
 
-expecting success of 1016.71 'Verify hellotag's sha1 content': 
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
-		test_cmp ${name}_content5 ${name}_content6
-	
-ok 71 - Verify hellotag's sha1 content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 6d715cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 37 - ref transaction: creating symbolic ref fails with F/D conflict
 
-expecting success of 1016.72 'Verify hellotag's sha256 content': 
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
-		test_cmp ${name}_content7 ${name}_content8
-	
-ok 72 - Verify hellotag's sha256 content
+expecting success of 0610.38 'ref transaction: ref deletion': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit file &&
+		HEAD_OID=$(git show-ref -s --verify HEAD) &&
+		cat >expect <<-EOF &&
+		$HEAD_OID refs/heads/main
+		$HEAD_OID refs/tags/file
+		EOF
+		git show-ref >actual &&
+		test_cmp expect actual &&
 
-expecting success of 1016.73 'Verify tag treetag's sha1 oid': 
-		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
-		test_cmp ${name}_sha1 ${name}_sha1_expected
-	
-ok 73 - Verify tag treetag's sha1 oid
+		test_must_fail git update-ref -d refs/tags/file $INVALID_OID &&
+		git show-ref >actual &&
+		test_cmp expect actual &&
 
-expecting success of 1016.74 'Verify tag treetag's sha256 oid': 
-		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
-		test_cmp ${name}_sha256 ${name}_sha256_expected
-	
-ok 74 - Verify tag treetag's sha256 oid
+		git update-ref -d refs/tags/file $HEAD_OID &&
+		echo "$HEAD_OID refs/heads/main" >expect &&
+		git show-ref >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 1016.75 'Verify treetag's sha1 type': 
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type_expected
-	
-ok 75 - Verify treetag's sha1 type
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) ebdce24] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+error: cannot lock ref 'refs/tags/file': is at ebdce24106c291a92bd800eef0ef9f363ac0c1dc but expected 0000000000000000000000000000000000000001
+ok 38 - ref transaction: ref deletion
 
-expecting success of 1016.76 'Verify treetag's sha256 type': 
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type_expected
-	
-ok 76 - Verify treetag's sha256 type
+expecting success of 0610.39 'ref transaction: writes cause auto-compaction': 
+	test_when_finished "rm -rf repo" &&
 
-expecting success of 1016.77 'Verify treetag's sha1 size': 
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
-		test_cmp ${name}_size1 ${name}_size2
-	
-ok 77 - Verify treetag's sha1 size
+	git init repo &&
+	test_line_count = 1 repo/.git/reftable/tables.list &&
 
-expecting success of 1016.78 'Verify treetag's sha256 size': 
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
-		test_cmp ${name}_size3 ${name}_size4
-	
-ok 78 - Verify treetag's sha256 size
+	test_commit -C repo --no-tag A &&
+	test_line_count = 1 repo/.git/reftable/tables.list &&
 
-expecting success of 1016.79 'Verify treetag's sha1 pretty content': 
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
-		test_cmp ${name}_content1 ${name}_content2
-	
-ok 79 - Verify treetag's sha1 pretty content
+	test_commit -C repo --no-tag B &&
+	test_line_count = 1 repo/.git/reftable/tables.list
 
-expecting success of 1016.80 'Verify treetag's sha256 pretty content': 
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
-		test_cmp ${name}_content3 ${name}_content4
-	
-ok 80 - Verify treetag's sha256 pretty content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) d4404d5] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main c79f296] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 39 - ref transaction: writes cause auto-compaction
 
-expecting success of 1016.81 'Verify treetag's sha1 content': 
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
-		test_cmp ${name}_content5 ${name}_content6
-	
-ok 81 - Verify treetag's sha1 content
+expecting success of 0610.40 'ref transaction: env var disables compaction': 
+	test_when_finished "rm -rf repo" &&
 
-expecting success of 1016.82 'Verify treetag's sha256 content': 
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
-		test_cmp ${name}_content7 ${name}_content8
-	
-ok 82 - Verify treetag's sha256 content
+	git init repo &&
+	test_commit -C repo A &&
 
-expecting success of 1016.83 'Verify tag committag's sha1 oid': 
-		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
-		test_cmp ${name}_sha1 ${name}_sha1_expected
-	
-ok 83 - Verify tag committag's sha1 oid
+	start=$(wc -l <repo/.git/reftable/tables.list) &&
+	iterations=5 &&
+	expected=$((start + iterations)) &&
 
-expecting success of 1016.84 'Verify tag committag's sha256 oid': 
-		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
-		test_cmp ${name}_sha256 ${name}_sha256_expected
-	
-ok 84 - Verify tag committag's sha256 oid
+	for i in $(test_seq $iterations)
+	do
+		GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+		git -C repo update-ref branch-$i HEAD || return 1
+	done &&
+	test_line_count = $expected repo/.git/reftable/tables.list &&
 
-expecting success of 1016.85 'Verify committag's sha1 type': 
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type_expected
-	
-ok 85 - Verify committag's sha1 type
+	git -C repo update-ref foo HEAD &&
+	test_line_count -lt $expected repo/.git/reftable/tables.list
 
-expecting success of 1016.86 'Verify committag's sha256 type': 
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type_expected
-	
-ok 86 - Verify committag's sha256 type
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 3c1b37b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 40 - ref transaction: env var disables compaction
 
-expecting success of 1016.87 'Verify committag's sha1 size': 
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
-		test_cmp ${name}_size1 ${name}_size2
-	
-ok 87 - Verify committag's sha1 size
+expecting success of 0610.41 'ref transaction: alternating table sizes are compacted': 
+	test_when_finished "rm -rf repo" &&
 
-expecting success of 1016.88 'Verify committag's sha256 size': 
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
-		test_cmp ${name}_size3 ${name}_size4
-	
-ok 88 - Verify committag's sha256 size
+	git init repo &&
+	test_commit -C repo A &&
+	for i in $(test_seq 5)
+	do
+		git -C repo branch -f foo &&
+		git -C repo branch -d foo || return 1
+	done &&
+	test_line_count = 2 repo/.git/reftable/tables.list
 
-expecting success of 1016.89 'Verify committag's sha1 pretty content': 
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
-		test_cmp ${name}_content1 ${name}_content2
-	
-ok 89 - Verify committag's sha1 pretty content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 617a709] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Deleted branch foo (was 617a709).
+Deleted branch foo (was 617a709).
+Deleted branch foo (was 617a709).
+Deleted branch foo (was 617a709).
+Deleted branch foo (was 617a709).
+ok 41 - ref transaction: alternating table sizes are compacted
 
-expecting success of 1016.90 'Verify committag's sha256 pretty content': 
-		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
-		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
-		test_cmp ${name}_content3 ${name}_content4
-	
-ok 90 - Verify committag's sha256 pretty content
+expecting success of 0610.42 'ref transaction: writes are synced': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo initial &&
 
-expecting success of 1016.91 'Verify committag's sha1 content': 
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
-		test_cmp ${name}_content5 ${name}_content6
-	
-ok 91 - Verify committag's sha1 content
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+	GIT_TEST_FSYNC=true \
+		git -C repo -c core.fsync=reference \
+		-c core.fsyncMethod=fsync update-ref refs/heads/branch HEAD &&
+	check_fsync_events trace2.txt <<-EOF
+	"name":"hardware-flush","count":4
+	EOF
 
-expecting success of 1016.92 'Verify committag's sha256 content': 
-		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
-		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
-		test_cmp ${name}_content7 ${name}_content8
-	
-ok 92 - Verify committag's sha256 content
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 1aef781] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 42 - ref transaction: writes are synced
 
-ok 93 # skip Verify tag signedtag's sha1 oid (missing GPG2)
+expecting success of 0610.43 'ref transaction: empty transaction in empty repo': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo --no-tag A &&
+	git -C repo update-ref -d refs/heads/main &&
+	test-tool -C repo ref-store main delete-refs REF_NO_DEREF msg HEAD &&
+	git -C repo update-ref --stdin <<-EOF
+	prepare
+	commit
+	EOF
 
-ok 94 # skip Verify tag signedtag's sha256 oid (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) c0b5012] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+prepare: ok
+commit: ok
+ok 43 - ref transaction: empty transaction in empty repo
 
-ok 95 # skip Verify signedtag's sha1 type (missing GPG2)
+expecting success of 0610.44 'ref transaction: fails gracefully when auto compaction fails': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
 
-ok 96 # skip Verify signedtag's sha256 type (missing GPG2)
+		test_commit A &&
+		for i in $(test_seq 10)
+		do
+			git branch branch-$i &&
+			for table in .git/reftable/*.ref
+			do
+				touch "$table.lock" || exit 1
+			done ||
+			exit 1
+		done &&
+		test_line_count = 10 .git/reftable/tables.list
+	)
 
-ok 97 # skip Verify signedtag's sha1 size (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) bd580e6] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 44 - ref transaction: fails gracefully when auto compaction fails
 
-ok 98 # skip Verify signedtag's sha256 size (missing GPG2)
+expecting success of 0610.45 'ref transaction: timeout acquiring tables.list lock': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		>.git/reftable/tables.list.lock &&
+		test_must_fail git update-ref refs/heads/branch HEAD 2>err &&
+		test_grep "cannot lock references" err
+	)
 
-ok 99 # skip Verify signedtag's sha1 pretty content (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 68d032e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+fatal: update_ref failed for ref 'refs/heads/branch': cannot lock references
+ok 45 - ref transaction: timeout acquiring tables.list lock
 
-ok 100 # skip Verify signedtag's sha256 pretty content (missing GPG2)
+expecting success of 0610.46 'ref transaction: retry acquiring tables.list lock': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		LOCK=.git/reftable/tables.list.lock &&
+		>$LOCK &&
+		{
+			( sleep 1 && rm -f $LOCK ) &
+		} &&
+		git -c reftable.lockTimeout=5000 update-ref refs/heads/branch HEAD
+	)
 
-ok 101 # skip Verify signedtag's sha1 content (missing GPG2)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 68d032e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 46 - ref transaction: retry acquiring tables.list lock
 
-ok 102 # skip Verify signedtag's sha256 content (missing GPG2)
+expecting success of 0610.47 'ref transaction: many concurrent writers': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		# Set a high timeout. While a couple of seconds should be
+		# plenty, using the address sanitizer will significantly slow
+		# us down here. So we are aiming way higher than you would ever
+		# think is necessary just to keep us from flaking. We could
+		# also lock indefinitely by passing -1, but that could
+		# potentially block CI jobs indefinitely if there was a bug
+		# here.
+		git config set reftable.lockTimeout 300000 &&
+		test_commit --no-tag initial &&
 
-expecting success of 1016.103 'Verify blob more's sha1 oid': 
-		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
-		test_cmp ${name}_sha1 ${name}_sha1_expected
-	
-ok 103 - Verify blob more's sha1 oid
+		head=$(git rev-parse HEAD) &&
+		for i in $(test_seq 100)
+		do
+			printf "%s commit\trefs/heads/branch-%s\n" "$head" "$i" ||
+			return 1
+		done >expect &&
+		printf "%s commit\trefs/heads/main\n" "$head" >>expect &&
 
-expecting success of 1016.104 'Verify blob more's sha256 oid': 
-		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
-		test_cmp ${name}_sha256 ${name}_sha256_expected
-	
-ok 104 - Verify blob more's sha256 oid
+		for i in $(test_seq 100)
+		do
+			{ git update-ref refs/heads/branch-$i HEAD& } ||
+			return 1
+		done &&
 
-expecting success of 1016.105 'Verify more's sha1 type': 
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type2 &&
-		test_cmp ${name}_type1 ${name}_type_expected
-	
-ok 105 - Verify more's sha1 type
+		wait &&
+		git for-each-ref --sort=v:refname >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 1016.106 'Verify more's sha256 type': 
-		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
-		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type4 &&
-		test_cmp ${name}_type3 ${name}_type_expected
-	
-ok 106 - Verify more's sha256 type
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 68d032e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 47 - ref transaction: many concurrent writers
 
-expecting success of 1016.107 'Verify more's sha1 size': 
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
-		test_cmp ${name}_size1 ${name}_size2
-	
-ok 107 - Verify more's sha1 size
+expecting success of 0610.48 'pack-refs: compacts tables': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
 
-expecting success of 1016.108 'Verify more's sha256 size': 
-		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
-		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
+	test_commit -C repo A &&
+	ls -1 repo/.git/reftable >table-files &&
+	test_line_count = 3 table-files &&
+	test_line_count = 2 repo/.git/reftable/tables.list &&
+
+	git -C repo pack-refs &&
+	ls -1 repo/.git/reftable >table-files &&
+	test_line_count = 2 table-files &&
+	test_line_count = 1 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) bd580e6] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 48 - pack-refs: compacts tables
+
+expecting success of 0610.49 'pack-refs: compaction raises locking errors': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo A &&
+	touch repo/.git/reftable/tables.list.lock &&
+	cat >expect <<-EOF &&
+	error: unable to compact stack: data is locked
+	EOF
+	test_must_fail git -C repo pack-refs 2>err &&
+	test_cmp expect err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) e75b87b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 49 - pack-refs: compaction raises locking errors
+
+expecting success of 0610.50 'pack-refs: auto compaction': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit A &&
+
+		# We need a bit of setup to ensure that git-gc(1) actually
+		# triggers, and that it does not write anything to the refdb.
+		git config gc.auto 1 &&
+		git config gc.autoDetach 0 &&
+		git config gc.reflogExpire never &&
+		git config gc.reflogExpireUnreachable never &&
+		test_oid blob17_1 | git hash-object -w --stdin &&
+
+		# The tables should have been auto-compacted, and thus auto
+		# compaction should not have to do anything.
+		ls -1 .git/reftable >tables-expect &&
+		test_line_count = 3 tables-expect &&
+		git $command --auto &&
+		ls -1 .git/reftable >tables-actual &&
+		test_cmp tables-expect tables-actual &&
+
+		test_oid blob17_2 | git hash-object -w --stdin &&
+
+		# Lock all tables, write some refs. Auto-compaction will be
+		# unable to compact tables and thus fails gracefully,
+		# compacting only those tables which are not locked.
+		ls .git/reftable/*.ref | sort |
+		while read table
+		do
+			touch "$table.lock" &&
+			basename "$table" >>tables.expect || exit 1
+		done &&
+		test_line_count = 2 .git/reftable/tables.list &&
+		git branch B &&
+		git branch C &&
+
+		# The new tables are auto-compacted, but the locked tables are
+		# left intact.
+		test_line_count = 3 .git/reftable/tables.list &&
+		head -n 2 .git/reftable/tables.list >tables.head &&
+		test_cmp tables.expect tables.head &&
+
+		rm .git/reftable/*.lock &&
+		git $command --auto &&
+		test_line_count = 1 .git/reftable/tables.list
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 062915c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+175b6c5dfd7f9bf6e2b2c4e2dcf3e2341298575d
+17e344e7c08441fa81d5b56c21008dc0feeeaa20
+ok 50 - pack-refs: auto compaction
+
+expecting success of 0610.51 'gc: auto compaction': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit A &&
+
+		# We need a bit of setup to ensure that git-gc(1) actually
+		# triggers, and that it does not write anything to the refdb.
+		git config gc.auto 1 &&
+		git config gc.autoDetach 0 &&
+		git config gc.reflogExpire never &&
+		git config gc.reflogExpireUnreachable never &&
+		test_oid blob17_1 | git hash-object -w --stdin &&
+
+		# The tables should have been auto-compacted, and thus auto
+		# compaction should not have to do anything.
+		ls -1 .git/reftable >tables-expect &&
+		test_line_count = 3 tables-expect &&
+		git $command --auto &&
+		ls -1 .git/reftable >tables-actual &&
+		test_cmp tables-expect tables-actual &&
+
+		test_oid blob17_2 | git hash-object -w --stdin &&
+
+		# Lock all tables, write some refs. Auto-compaction will be
+		# unable to compact tables and thus fails gracefully,
+		# compacting only those tables which are not locked.
+		ls .git/reftable/*.ref | sort |
+		while read table
+		do
+			touch "$table.lock" &&
+			basename "$table" >>tables.expect || exit 1
+		done &&
+		test_line_count = 2 .git/reftable/tables.list &&
+		git branch B &&
+		git branch C &&
+
+		# The new tables are auto-compacted, but the locked tables are
+		# left intact.
+		test_line_count = 3 .git/reftable/tables.list &&
+		head -n 2 .git/reftable/tables.list >tables.head &&
+		test_cmp tables.expect tables.head &&
+
+		rm .git/reftable/*.lock &&
+		git $command --auto &&
+		test_line_count = 1 .git/reftable/tables.list
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 062915c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+175b6c5dfd7f9bf6e2b2c4e2dcf3e2341298575d
+17e344e7c08441fa81d5b56c21008dc0feeeaa20
+Auto packing the repository for optimum performance.
+See "git help gc" for manual housekeeping.
+warning: There are too many unreachable loose objects; run 'git prune' to remove them.
+ok 51 - gc: auto compaction
+
+expecting success of 0610.52 'maintenance run --task=pack-refs: auto compaction': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit A &&
+
+		# We need a bit of setup to ensure that git-gc(1) actually
+		# triggers, and that it does not write anything to the refdb.
+		git config gc.auto 1 &&
+		git config gc.autoDetach 0 &&
+		git config gc.reflogExpire never &&
+		git config gc.reflogExpireUnreachable never &&
+		test_oid blob17_1 | git hash-object -w --stdin &&
+
+		# The tables should have been auto-compacted, and thus auto
+		# compaction should not have to do anything.
+		ls -1 .git/reftable >tables-expect &&
+		test_line_count = 3 tables-expect &&
+		git $command --auto &&
+		ls -1 .git/reftable >tables-actual &&
+		test_cmp tables-expect tables-actual &&
+
+		test_oid blob17_2 | git hash-object -w --stdin &&
+
+		# Lock all tables, write some refs. Auto-compaction will be
+		# unable to compact tables and thus fails gracefully,
+		# compacting only those tables which are not locked.
+		ls .git/reftable/*.ref | sort |
+		while read table
+		do
+			touch "$table.lock" &&
+			basename "$table" >>tables.expect || exit 1
+		done &&
+		test_line_count = 2 .git/reftable/tables.list &&
+		git branch B &&
+		git branch C &&
+
+		# The new tables are auto-compacted, but the locked tables are
+		# left intact.
+		test_line_count = 3 .git/reftable/tables.list &&
+		head -n 2 .git/reftable/tables.list >tables.head &&
+		test_cmp tables.expect tables.head &&
+
+		rm .git/reftable/*.lock &&
+		git $command --auto &&
+		test_line_count = 1 .git/reftable/tables.list
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 062915c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+175b6c5dfd7f9bf6e2b2c4e2dcf3e2341298575d
+17e344e7c08441fa81d5b56c21008dc0feeeaa20
+ok 52 - maintenance run --task=pack-refs: auto compaction
+
+expecting success of 0610.53 'pack-refs: prunes stale tables': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	touch repo/.git/reftable/stale-table.ref &&
+	git -C repo pack-refs &&
+	test_path_is_missing repo/.git/reftable/stable-ref.ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 53 - pack-refs: prunes stale tables
+
+expecting success of 0610.54 'pack-refs: does not prune non-table files': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	touch repo/.git/reftable/garbage &&
+	git -C repo pack-refs &&
+	test_path_is_file repo/.git/reftable/garbage
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 54 - pack-refs: does not prune non-table files
+
+expecting success of 0610.55 'packed-refs: writes are synced': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo initial &&
+	test_line_count = 2 table-files &&
+
+	: >trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+	GIT_TEST_FSYNC=true \
+		git -C repo -c core.fsync=reference \
+		-c core.fsyncMethod=fsync pack-refs &&
+	check_fsync_events trace2.txt <<-EOF
+	"name":"hardware-flush","count":2
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) d8072fd] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 55 - packed-refs: writes are synced
+
+expecting success of 0610.56 'ref iterator: bogus names are flagged': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit --no-tag file &&
+		test-tool ref-store main update-ref msg "refs/heads/bogus..name" $(git rev-parse HEAD) $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+
+		cat >expect <<-EOF &&
+		$ZERO_OID refs/heads/bogus..name 0xc
+		$(git rev-parse HEAD) refs/heads/main 0x0
+		EOF
+		test-tool ref-store main for-each-ref "" >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) ba04411] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 56 - ref iterator: bogus names are flagged
+
+expecting success of 0610.57 'ref iterator: missing object IDs are not flagged': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test-tool ref-store main update-ref msg "refs/heads/broken-hash" $INVALID_OID $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+
+		cat >expect <<-EOF &&
+		$INVALID_OID refs/heads/broken-hash 0x0
+		EOF
+		test-tool ref-store main for-each-ref "" >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 57 - ref iterator: missing object IDs are not flagged
+
+expecting success of 0610.58 'basic: commit and list refs': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo file &&
+	test_write_lines refs/heads/main refs/tags/file >expect &&
+	git -C repo for-each-ref --format="%(refname)" >actual &&
+	test_cmp actual expect
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) ba04411] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 58 - basic: commit and list refs
+
+expecting success of 0610.59 'basic: can write large commit message': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	perl -e "
+		print \"this is a long commit message\" x 50000
+	" >commit-msg &&
+	git -C repo commit --allow-empty --file=../commit-msg
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 355c8bc] 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 59 - basic: can write large commit message
+
+expecting success of 0610.60 'basic: show-ref fails with empty repository': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail git -C repo show-ref >actual &&
+	test_must_be_empty actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 60 - basic: show-ref fails with empty repository
+
+expecting success of 0610.61 'basic: can check out unborn branch': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	git -C repo checkout -b main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+Switched to a new branch 'main'
+ok 61 - basic: can check out unborn branch
+
+expecting success of 0610.62 'basic: peeled tags are stored': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo file &&
+	git -C repo tag -m "annotated tag" test_tag HEAD &&
+	for ref in refs/heads/main refs/tags/file refs/tags/test_tag refs/tags/test_tag^{}
+	do
+		echo "$(git -C repo rev-parse "$ref") $ref" || return 1
+	done >expect &&
+	git -C repo show-ref -d >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) a7bae40] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 62 - basic: peeled tags are stored
+
+expecting success of 0610.63 'basic: for-each-ref can print symrefs': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit file &&
+		git branch &&
+		git symbolic-ref refs/heads/sym refs/heads/main &&
+		cat >expected <<-EOF &&
+		refs/heads/main
+		EOF
+		git for-each-ref --format="%(symref)" refs/heads/sym >actual &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 00d7e56] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+* main
+ok 63 - basic: for-each-ref can print symrefs
+
+expecting success of 0610.64 'basic: notes': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		write_script fake_editor <<-\EOF &&
+		echo "$MSG" >"$1"
+		echo "$MSG" >&2
+		EOF
+
+		test_commit 1st &&
+		test_commit 2nd &&
+		GIT_EDITOR=./fake_editor MSG=b4 git notes add &&
+		GIT_EDITOR=./fake_editor MSG=b3 git notes edit &&
+		echo b4 >expect &&
+		git notes --ref commits@{1} show >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 3aa380d] 1st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+[main 322f39a] 2nd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2nd.t
+b4
+b3
+ok 64 - basic: notes
+
+expecting success of 0610.65 'basic: stash': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit file &&
+		git stash list >expect &&
+		test_line_count = 0 expect &&
+
+		echo hoi >>file.t &&
+		git stash push -m stashed &&
+		git stash list >expect &&
+		test_line_count = 1 expect &&
+
+		git stash clear &&
+		git stash list >expect &&
+		test_line_count = 0 expect
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 00d7e56] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+Saved working directory and index state On main: stashed
+ok 65 - basic: stash
+
+expecting success of 0610.66 'basic: cherry-pick': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit message1 file1 &&
+		test_commit message2 file2 &&
+		git branch source &&
+		git checkout HEAD^ &&
+		test_commit message3 file3 &&
+		git cherry-pick source &&
+		test_path_is_file file2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) adc3c6f] message1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[main 606b3a5] message2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+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 adc3c6f message1
+[detached HEAD 54033ed] message3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[detached HEAD 7bb1ef8] message2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:35:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 66 - basic: cherry-pick
+
+expecting success of 0610.67 'basic: rebase': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit message1 file1 &&
+		test_commit message2 file2 &&
+		git branch source &&
+		git checkout HEAD^ &&
+		test_commit message3 file3 &&
+		git rebase source &&
+		test_path_is_file file2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) adc3c6f] message1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[main 606b3a5] message2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+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 adc3c6f message1
+[detached HEAD 54033ed] message3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 67 - basic: rebase
+
+expecting success of 0610.68 'reflog: can delete separate reflog entries': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit file &&
+		test_commit file2 &&
+		test_commit file3 &&
+		test_commit file4 &&
+		git reflog >actual &&
+		grep file3 actual &&
+
+		git reflog delete HEAD@{1} &&
+		git reflog >actual &&
+		! grep file3 actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 00d7e56] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+[main e047176] file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.t
+[main 9ff9783] file3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3.t
+[main ff4d285] file4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4.t
+9ff9783 HEAD@{1}: commit: file3
+ok 68 - reflog: can delete separate reflog entries
+
+expecting success of 0610.69 'reflog: can switch to previous branch': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit file1 &&
+		git checkout -b branch1 &&
+		test_commit file2 &&
+		git checkout -b branch2 &&
+		git switch - &&
+		git rev-parse --symbolic-full-name HEAD >actual &&
+		echo refs/heads/branch1 >expect &&
+		test_cmp actual expect
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 88ef297] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+Switched to a new branch 'branch1'
+[branch1 14114a6] file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.t
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+ok 69 - reflog: can switch to previous branch
+
+expecting success of 0610.70 'reflog: copying branch writes reflog entry': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit file1 &&
+		test_commit file2 &&
+		oid=$(git rev-parse --short HEAD) &&
+		git branch src &&
+		cat >expect <<-EOF &&
+		${oid} dst@{0}: Branch: copied refs/heads/src to refs/heads/dst
+		${oid} dst@{1}: branch: Created from main
+		EOF
+		git branch -c src dst &&
+		git reflog dst >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 88ef297] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+[main 14114a6] file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.t
+ok 70 - reflog: copying branch writes reflog entry
+
+expecting success of 0610.71 'reflog: renaming branch writes reflog entry': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		git symbolic-ref HEAD refs/heads/before &&
+		test_commit file &&
+		git show-ref >expected.refs &&
+		sed s/before/after/g <expected.refs >expected &&
+		git branch -M after &&
+		git show-ref >actual &&
+		test_cmp expected actual &&
+		echo refs/heads/after >expected &&
+		git symbolic-ref HEAD >actual &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[before (root-commit) 00d7e56] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 71 - reflog: renaming branch writes reflog entry
+
+expecting success of 0610.72 'reflog: can store empty logs': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_must_fail test-tool ref-store main reflog-exists refs/heads/branch &&
+		test-tool ref-store main create-reflog refs/heads/branch &&
+		test-tool ref-store main reflog-exists refs/heads/branch &&
+		test-tool ref-store main for-each-reflog-ent-reverse refs/heads/branch >actual &&
+		test_must_be_empty actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+ok 72 - reflog: can store empty logs
+
+expecting success of 0610.73 'reflog: expiry empties reflog': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit initial &&
+		git checkout -b branch &&
+		test_commit fileA &&
+		test_commit fileB &&
+
+		cat >expect <<-EOF &&
+		commit: fileB
+		commit: fileA
+		branch: Created from HEAD
+		EOF
+		git reflog show --format="%gs" refs/heads/branch >actual &&
+		test_cmp expect actual &&
+
+		git reflog expire branch --expire=all &&
+		git reflog show --format="%gs" refs/heads/branch >actual &&
+		test_must_be_empty actual &&
+		test-tool ref-store main reflog-exists refs/heads/branch
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 96ce1d0] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'branch'
+[branch a5a0c4a] fileA
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA.t
+[branch f95cb17] fileB
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileB.t
+ok 73 - reflog: expiry empties reflog
+
+expecting success of 0610.74 'reflog: can be deleted': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		test-tool ref-store main reflog-exists refs/heads/main &&
+		test-tool ref-store main delete-reflog refs/heads/main &&
+		test_must_fail test-tool ref-store main reflog-exists refs/heads/main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 96ce1d0] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 74 - reflog: can be deleted
+
+expecting success of 0610.75 'reflog: garbage collection deletes reflog entries': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		for count in $(test_seq 1 10)
+		do
+			test_commit "number $count" file.t $count number-$count ||
+			return 1
+		done &&
+		git reflog refs/heads/main >actual &&
+		test_line_count = 10 actual &&
+		grep "commit (initial): number 1" actual &&
+		grep "commit: number 10" actual &&
+
+		git gc &&
+		git reflog refs/heads/main >actual &&
+		test_line_count = 0 actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) e67d185] number 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+[main f156d57] number 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9077452] number 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 02eb257] number 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 831ad6a] number 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e99bc3d] number 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 747cd61] number 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 5cd813b] number 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 1744c73] number 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2a06617] number 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+e67d185 refs/heads/main@{9}: commit (initial): number 1
+2a06617 refs/heads/main@{0}: commit: number 10
+ok 75 - reflog: garbage collection deletes reflog entries
+
+expecting success of 0610.76 'reflog: updates via HEAD update HEAD reflog': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit main-one &&
+		git checkout -b new-branch &&
+		test_commit new-one &&
+		test_commit new-two &&
+
+		echo new-one >expect &&
+		git log -1 --format=%s HEAD@{1} >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 54e8446] main-one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-one.t
+Switched to a new branch 'new-branch'
+[new-branch f5aadd6] new-one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-one.t
+[new-branch a6436fc] new-two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-two.t
+ok 76 - reflog: updates via HEAD update HEAD reflog
+
+expecting success of 0610.77 'branch: copying branch with D/F conflict': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		git branch branch &&
+		cat >expect <<-EOF &&
+		error: ${SQ}refs/heads/branch${SQ} exists; cannot create ${SQ}refs/heads/branch/moved${SQ}
+		fatal: branch copy failed
+		EOF
+		test_must_fail git branch -c branch branch/moved 2>err &&
+		test_cmp expect err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) f5f692f] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 77 - branch: copying branch with D/F conflict
+
+expecting success of 0610.78 'branch: moving branch with D/F conflict': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		git branch branch &&
+		git branch conflict &&
+		cat >expect <<-EOF &&
+		error: ${SQ}refs/heads/conflict${SQ} exists; cannot create ${SQ}refs/heads/conflict/moved${SQ}
+		fatal: branch rename failed
+		EOF
+		test_must_fail git branch -m branch conflict/moved 2>err &&
+		test_cmp expect err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) f5f692f] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 78 - branch: moving branch with D/F conflict
+
+expecting success of 0610.79 'worktree: adding worktree creates separate stack': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	git -C repo worktree add ../worktree &&
+	test_path_is_file repo/.git/worktrees/worktree/refs/heads &&
+	echo "ref: refs/heads/.invalid" >expect &&
+	test_cmp expect repo/.git/worktrees/worktree/HEAD &&
+	test_path_is_dir repo/.git/worktrees/worktree/reftable &&
+	test_path_is_file repo/.git/worktrees/worktree/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) f5f692f] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at f5f692f A
+ok 79 - worktree: adding worktree creates separate stack
+
+expecting success of 0610.80 'worktree: pack-refs in main repo packs main refs': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+	git -C repo worktree add ../worktree &&
+	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+	git -C worktree update-ref refs/worktree/per-worktree HEAD &&
+
+	test_line_count = 4 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 3 repo/.git/reftable/tables.list &&
+	git -C repo pack-refs &&
+	test_line_count = 4 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) f3cb7ed] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at f3cb7ed A
+ok 80 - worktree: pack-refs in main repo packs main refs
+
+expecting success of 0610.81 'worktree: pack-refs in worktree packs worktree refs': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+	git -C repo worktree add ../worktree &&
+	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+	git -C worktree update-ref refs/worktree/per-worktree HEAD &&
+
+	test_line_count = 4 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 3 repo/.git/reftable/tables.list &&
+	git -C worktree pack-refs &&
+	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 3 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) cf83a65] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at cf83a65 A
+ok 81 - worktree: pack-refs in worktree packs worktree refs
+
+expecting success of 0610.82 'worktree: creating shared ref updates main stack': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	git -C repo worktree add ../worktree &&
+	git -C repo pack-refs &&
+	git -C worktree pack-refs &&
+	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list &&
+
+	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
+	git -C worktree update-ref refs/heads/shared HEAD &&
+	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 2 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 844bede] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at 844bede A
+ok 82 - worktree: creating shared ref updates main stack
+
+expecting success of 0610.83 'worktree: creating per-worktree ref updates worktree stack': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	git -C repo worktree add ../worktree &&
+	git -C repo pack-refs &&
+	git -C worktree pack-refs &&
+	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list &&
+
+	git -C worktree update-ref refs/bisect/per-worktree HEAD &&
+	test_line_count = 2 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 4b15ad9] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at 4b15ad9 A
+ok 83 - worktree: creating per-worktree ref updates worktree stack
+
+expecting success of 0610.84 'worktree: creating per-worktree ref from main repo': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	git -C repo worktree add ../worktree &&
+	git -C repo pack-refs &&
+	git -C worktree pack-refs &&
+	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list &&
+
+	git -C repo update-ref worktrees/worktree/refs/bisect/per-worktree HEAD &&
+	test_line_count = 2 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) bee2885] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at bee2885 A
+ok 84 - worktree: creating per-worktree ref from main repo
+
+expecting success of 0610.85 'worktree: creating per-worktree ref from second worktree': 
+	test_when_finished "rm -rf repo wt1 wt2" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	git -C repo worktree add ../wt1 &&
+	git -C repo worktree add ../wt2 &&
+	git -C repo pack-refs &&
+	git -C wt1 pack-refs &&
+	git -C wt2 pack-refs &&
+	test_line_count = 1 repo/.git/worktrees/wt1/reftable/tables.list &&
+	test_line_count = 1 repo/.git/worktrees/wt2/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list &&
+
+	git -C wt1 update-ref worktrees/wt2/refs/bisect/per-worktree HEAD &&
+	test_line_count = 1 repo/.git/worktrees/wt1/reftable/tables.list &&
+	test_line_count = 2 repo/.git/worktrees/wt2/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) c7da95b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'wt1')
+HEAD is now at c7da95b A
+Preparing worktree (new branch 'wt2')
+HEAD is now at c7da95b A
+ok 85 - worktree: creating per-worktree ref from second worktree
+
+expecting success of 0610.86 'worktree: can create shared and per-worktree ref in one transaction': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo A &&
+
+	git -C repo worktree add ../worktree &&
+	git -C repo pack-refs &&
+	git -C worktree pack-refs &&
+	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 1 repo/.git/reftable/tables.list &&
+
+	cat >stdin <<-EOF &&
+	create worktrees/worktree/refs/bisect/per-worktree HEAD
+	create refs/branches/shared HEAD
+	EOF
+	git -C repo update-ref --stdin <stdin &&
+	test_line_count = 2 repo/.git/worktrees/worktree/reftable/tables.list &&
+	test_line_count = 2 repo/.git/reftable/tables.list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) b29bec6] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at b29bec6 A
+ok 86 - worktree: can create shared and per-worktree ref in one transaction
+
+expecting success of 0610.87 'worktree: can access common refs': 
+	test_when_finished "rm -rf repo worktree" &&
+	git init repo &&
+	test_commit -C repo file1 &&
+	git -C repo branch branch1 &&
+	git -C repo worktree add ../worktree &&
+
+	echo refs/heads/worktree >expect &&
+	git -C worktree symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	git -C worktree checkout branch1
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 42d7a58] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+Preparing worktree (new branch 'worktree')
+HEAD is now at 42d7a58 file1
+Switched to branch 'branch1'
+ok 87 - worktree: can access common refs
+
+expecting success of 0610.88 'worktree: adds worktree with detached HEAD': 
+	test_when_finished "rm -rf repo worktree" &&
+
+	git init repo &&
+	test_commit -C repo A &&
+	git -C repo rev-parse main >expect &&
+
+	git -C repo worktree add --detach ../worktree main &&
+	git -C worktree rev-parse HEAD >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) 10f6cc5] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (detached HEAD 10f6cc5)
+HEAD is now at 10f6cc5 A
+ok 88 - worktree: adds worktree with detached HEAD
+
+expecting success of 0610.89 'fetch: accessing FETCH_HEAD special ref works': 
+	test_when_finished "rm -rf repo sub" &&
+
+	git init sub &&
+	test_commit -C sub two &&
+	git -C sub rev-parse HEAD >expect &&
+
+	git init repo &&
+	test_commit -C repo one &&
+	git -C repo fetch ../sub &&
+	git -C repo rev-parse FETCH_HEAD >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/sub/.git/
+[main (root-commit) c1d57c8] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
+[main (root-commit) ef23b68] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+From ../sub
+ * branch            HEAD       -> FETCH_HEAD
+ok 89 - fetch: accessing FETCH_HEAD special ref works
+
+# passed all 89 test(s)
+1..89
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1016-compatObjectFormat.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1016-compatObjectFormat/.git/
+expecting success of 1016.1 'setup sha1 repository': 
+		git init --object-format=$hash &&
+		git config core.repositoryformatversion 1 &&
+		git config extensions.objectformat $hash &&
+		git config extensions.compatobjectformat $(compat_hash $hash) &&
+		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
+		echo "Hello World!" >hello &&
+		eval hello_${hash}_oid=$(git hash-object hello) &&
+		git update-index --add hello &&
+		git commit -m "Initial commit" &&
+		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
+		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1016-compatObjectFormat/repo-sha1/.git/
+[master (root-commit) 0f0d9f0] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+ok 1 - setup sha1 repository
+
+expecting success of 1016.2 'create a sha1  tagged blob': 
+		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
+		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
+	
+ok 2 - create a sha1  tagged blob
+
+expecting success of 1016.3 'create a sha1 tagged tree': 
+		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
+		eval treetag_${hash}_oid=$(git rev-parse treetag)
+	
+ok 3 - create a sha1 tagged tree
+
+expecting success of 1016.4 'create a sha1 tagged commit': 
+		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
+		eval committag_${hash}_oid=$(git rev-parse committag)
+	
+ok 4 - create a sha1 tagged commit
+
+checking prerequisite: GPG2
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	case "$gpg_version" in
+	"gpg (GnuPG) "[01].*)
+		say "This test requires a GPG version >= v2.0.0"
+		exit 1
+		;;
+	*)
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG2 not satisfied
+ok 5 # skip create a sha1 signed commit (missing GPG2)
+
+ok 6 # skip create a sha1 signed tag (missing GPG2)
+
+expecting success of 1016.7 'create a sha1 branch': 
+		git checkout -b branch $(commit_oid $hash) &&
+		echo "More more more give me more!" >more &&
+		eval more_${hash}_oid=$(git hash-object more) &&
+		echo "Another and another and another" >another &&
+		eval another_${hash}_oid=$(git hash-object another) &&
+		git update-index --add more another &&
+		git commit -m "Add more files!" &&
+		eval commit2_${hash}_oid=$(git rev-parse HEAD) &&
+		eval tree2_${hash}_oid=$(git rev-parse HEAD^{tree})
+	
+Switched to a new branch 'branch'
+[branch f94d4a8] Add more files!
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 another
+ create mode 100644 more
+ok 7 - create a sha1 branch
+
+ok 8 # skip create another sha1 signed tag (missing GPG2)
+
+ok 9 # skip merge the sha1 branches together (missing GPG2)
+
+ok 10 # skip create additional sha1 signed commits (missing GPG2)
+
+ok 11 # skip create additional sha1 signed tags (missing GPG2)
+
+expecting success of 1016.12 'setup sha256 repository': 
+		git init --object-format=$hash &&
+		git config core.repositoryformatversion 1 &&
+		git config extensions.objectformat $hash &&
+		git config extensions.compatobjectformat $(compat_hash $hash) &&
+		test_config gpg.program $TEST_DIRECTORY/t1016/gpg &&
+		echo "Hello World!" >hello &&
+		eval hello_${hash}_oid=$(git hash-object hello) &&
+		git update-index --add hello &&
+		git commit -m "Initial commit" &&
+		eval commit_${hash}_oid=$(git rev-parse HEAD) &&
+		eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1016-compatObjectFormat/repo-sha256/.git/
+[master (root-commit) 8c32aa7] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+ok 12 - setup sha256 repository
+
+expecting success of 1016.13 'create a sha256  tagged blob': 
+		git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
+		eval hellotag_${hash}_oid=$(git rev-parse hellotag)
+	
+ok 13 - create a sha256  tagged blob
+
+expecting success of 1016.14 'create a sha256 tagged tree': 
+		git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
+		eval treetag_${hash}_oid=$(git rev-parse treetag)
+	
+ok 14 - create a sha256 tagged tree
+
+expecting success of 1016.15 'create a sha256 tagged commit': 
+		git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
+		eval committag_${hash}_oid=$(git rev-parse committag)
+	
+ok 15 - create a sha256 tagged commit
+
+ok 16 # skip create a sha256 signed commit (missing GPG2)
+
+ok 17 # skip create a sha256 signed tag (missing GPG2)
+
+expecting success of 1016.18 'create a sha256 branch': 
+		git checkout -b branch $(commit_oid $hash) &&
+		echo "More more more give me more!" >more &&
+		eval more_${hash}_oid=$(git hash-object more) &&
+		echo "Another and another and another" >another &&
+		eval another_${hash}_oid=$(git hash-object another) &&
+		git update-index --add more another &&
+		git commit -m "Add more files!" &&
+		eval commit2_${hash}_oid=$(git rev-parse HEAD) &&
+		eval tree2_${hash}_oid=$(git rev-parse HEAD^{tree})
+	
+Switched to a new branch 'branch'
+[branch 38ddb0e] Add more files!
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 another
+ create mode 100644 more
+ok 18 - create a sha256 branch
+
+ok 19 # skip create another sha256 signed tag (missing GPG2)
+
+ok 20 # skip merge the sha256 branches together (missing GPG2)
+
+ok 21 # skip create additional sha256 signed commits (missing GPG2)
+
+ok 22 # skip create additional sha256 signed tags (missing GPG2)
+
+expecting success of 1016.23 'Verify blob hello's sha1 oid': 
+		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
+		test_cmp ${name}_sha1 ${name}_sha1_expected
+	
+ok 23 - Verify blob hello's sha1 oid
+
+expecting success of 1016.24 'Verify blob hello's sha256 oid': 
+		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
+		test_cmp ${name}_sha256 ${name}_sha256_expected
+	
+ok 24 - Verify blob hello's sha256 oid
+
+expecting success of 1016.25 'Verify hello's sha1 type': 
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type_expected
+	
+ok 25 - Verify hello's sha1 type
+
+expecting success of 1016.26 'Verify hello's sha256 type': 
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type_expected
+	
+ok 26 - Verify hello's sha256 type
+
+expecting success of 1016.27 'Verify hello's sha1 size': 
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
+		test_cmp ${name}_size1 ${name}_size2
+	
+ok 27 - Verify hello's sha1 size
+
+expecting success of 1016.28 'Verify hello's sha256 size': 
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
+		test_cmp ${name}_size3 ${name}_size4
+	
+ok 28 - Verify hello's sha256 size
+
+expecting success of 1016.29 'Verify hello's sha1 pretty content': 
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
+		test_cmp ${name}_content1 ${name}_content2
+	
+ok 29 - Verify hello's sha1 pretty content
+
+expecting success of 1016.30 'Verify hello's sha256 pretty content': 
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
+		test_cmp ${name}_content3 ${name}_content4
+	
+ok 30 - Verify hello's sha256 pretty content
+
+expecting success of 1016.31 'Verify hello's sha1 content': 
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
+		test_cmp ${name}_content5 ${name}_content6
+	
+ok 31 - Verify hello's sha1 content
+
+expecting success of 1016.32 'Verify hello's sha256 content': 
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
+		test_cmp ${name}_content7 ${name}_content8
+	
+ok 32 - Verify hello's sha256 content
+
+expecting success of 1016.33 'Verify tree tree's sha1 oid': 
+		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
+		test_cmp ${name}_sha1 ${name}_sha1_expected
+	
+ok 33 - Verify tree tree's sha1 oid
+
+expecting success of 1016.34 'Verify tree tree's sha256 oid': 
+		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
+		test_cmp ${name}_sha256 ${name}_sha256_expected
+	
+ok 34 - Verify tree tree's sha256 oid
+
+expecting success of 1016.35 'Verify tree's sha1 type': 
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type_expected
+	
+ok 35 - Verify tree's sha1 type
+
+expecting success of 1016.36 'Verify tree's sha256 type': 
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type_expected
+	
+ok 36 - Verify tree's sha256 type
+
+expecting success of 1016.37 'Verify tree's sha1 size': 
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
+		test_cmp ${name}_size1 ${name}_size2
+	
+ok 37 - Verify tree's sha1 size
+
+expecting success of 1016.38 'Verify tree's sha256 size': 
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
+		test_cmp ${name}_size3 ${name}_size4
+	
+ok 38 - Verify tree's sha256 size
+
+expecting success of 1016.39 'Verify tree's sha1 pretty content': 
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
+		test_cmp ${name}_content1 ${name}_content2
+	
+ok 39 - Verify tree's sha1 pretty content
+
+expecting success of 1016.40 'Verify tree's sha256 pretty content': 
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
+		test_cmp ${name}_content3 ${name}_content4
+	
+ok 40 - Verify tree's sha256 pretty content
+
+expecting success of 1016.41 'Verify tree's sha1 content': 
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
+		test_cmp ${name}_content5 ${name}_content6
+	
+ok 41 - Verify tree's sha1 content
+
+expecting success of 1016.42 'Verify tree's sha256 content': 
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
+		test_cmp ${name}_content7 ${name}_content8
+	
+ok 42 - Verify tree's sha256 content
+
+expecting success of 1016.43 'Verify commit commit's sha1 oid': 
+		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
+		test_cmp ${name}_sha1 ${name}_sha1_expected
+	
+ok 43 - Verify commit commit's sha1 oid
+
+expecting success of 1016.44 'Verify commit commit's sha256 oid': 
+		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
+		test_cmp ${name}_sha256 ${name}_sha256_expected
+	
+ok 44 - Verify commit commit's sha256 oid
+
+expecting success of 1016.45 'Verify commit's sha1 type': 
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type_expected
+	
+ok 45 - Verify commit's sha1 type
+
+expecting success of 1016.46 'Verify commit's sha256 type': 
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type_expected
+	
+ok 46 - Verify commit's sha256 type
+
+expecting success of 1016.47 'Verify commit's sha1 size': 
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
+		test_cmp ${name}_size1 ${name}_size2
+	
+ok 47 - Verify commit's sha1 size
+
+expecting success of 1016.48 'Verify commit's sha256 size': 
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
+		test_cmp ${name}_size3 ${name}_size4
+	
+ok 48 - Verify commit's sha256 size
+
+expecting success of 1016.49 'Verify commit's sha1 pretty content': 
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
+		test_cmp ${name}_content1 ${name}_content2
+	
+ok 49 - Verify commit's sha1 pretty content
+
+expecting success of 1016.50 'Verify commit's sha256 pretty content': 
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
+		test_cmp ${name}_content3 ${name}_content4
+	
+ok 50 - Verify commit's sha256 pretty content
+
+expecting success of 1016.51 'Verify commit's sha1 content': 
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
+		test_cmp ${name}_content5 ${name}_content6
+	
+ok 51 - Verify commit's sha1 content
+
+expecting success of 1016.52 'Verify commit's sha256 content': 
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
+		test_cmp ${name}_content7 ${name}_content8
+	
+ok 52 - Verify commit's sha256 content
+
+ok 53 # skip Verify commit signedcommit's sha1 oid (missing GPG2)
+
+ok 54 # skip Verify commit signedcommit's sha256 oid (missing GPG2)
+
+ok 55 # skip Verify signedcommit's sha1 type (missing GPG2)
+
+ok 56 # skip Verify signedcommit's sha256 type (missing GPG2)
+
+ok 57 # skip Verify signedcommit's sha1 size (missing GPG2)
+
+ok 58 # skip Verify signedcommit's sha256 size (missing GPG2)
+
+ok 59 # skip Verify signedcommit's sha1 pretty content (missing GPG2)
+
+ok 60 # skip Verify signedcommit's sha256 pretty content (missing GPG2)
+
+ok 61 # skip Verify signedcommit's sha1 content (missing GPG2)
+
+ok 62 # skip Verify signedcommit's sha256 content (missing GPG2)
+
+expecting success of 1016.63 'Verify tag hellotag's sha1 oid': 
+		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
+		test_cmp ${name}_sha1 ${name}_sha1_expected
+	
+ok 63 - Verify tag hellotag's sha1 oid
+
+expecting success of 1016.64 'Verify tag hellotag's sha256 oid': 
+		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
+		test_cmp ${name}_sha256 ${name}_sha256_expected
+	
+ok 64 - Verify tag hellotag's sha256 oid
+
+expecting success of 1016.65 'Verify hellotag's sha1 type': 
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type_expected
+	
+ok 65 - Verify hellotag's sha1 type
+
+expecting success of 1016.66 'Verify hellotag's sha256 type': 
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type_expected
+	
+ok 66 - Verify hellotag's sha256 type
+
+expecting success of 1016.67 'Verify hellotag's sha1 size': 
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
+		test_cmp ${name}_size1 ${name}_size2
+	
+ok 67 - Verify hellotag's sha1 size
+
+expecting success of 1016.68 'Verify hellotag's sha256 size': 
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
+		test_cmp ${name}_size3 ${name}_size4
+	
+ok 68 - Verify hellotag's sha256 size
+
+expecting success of 1016.69 'Verify hellotag's sha1 pretty content': 
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
+		test_cmp ${name}_content1 ${name}_content2
+	
+ok 69 - Verify hellotag's sha1 pretty content
+
+expecting success of 1016.70 'Verify hellotag's sha256 pretty content': 
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
+		test_cmp ${name}_content3 ${name}_content4
+	
+ok 70 - Verify hellotag's sha256 pretty content
+
+expecting success of 1016.71 'Verify hellotag's sha1 content': 
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
+		test_cmp ${name}_content5 ${name}_content6
+	
+ok 71 - Verify hellotag's sha1 content
+
+expecting success of 1016.72 'Verify hellotag's sha256 content': 
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
+		test_cmp ${name}_content7 ${name}_content8
+	
+ok 72 - Verify hellotag's sha256 content
+
+expecting success of 1016.73 'Verify tag treetag's sha1 oid': 
+		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
+		test_cmp ${name}_sha1 ${name}_sha1_expected
+	
+ok 73 - Verify tag treetag's sha1 oid
+
+expecting success of 1016.74 'Verify tag treetag's sha256 oid': 
+		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
+		test_cmp ${name}_sha256 ${name}_sha256_expected
+	
+ok 74 - Verify tag treetag's sha256 oid
+
+expecting success of 1016.75 'Verify treetag's sha1 type': 
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type_expected
+	
+ok 75 - Verify treetag's sha1 type
+
+expecting success of 1016.76 'Verify treetag's sha256 type': 
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type_expected
+	
+ok 76 - Verify treetag's sha256 type
+
+expecting success of 1016.77 'Verify treetag's sha1 size': 
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
+		test_cmp ${name}_size1 ${name}_size2
+	
+ok 77 - Verify treetag's sha1 size
+
+expecting success of 1016.78 'Verify treetag's sha256 size': 
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
+		test_cmp ${name}_size3 ${name}_size4
+	
+ok 78 - Verify treetag's sha256 size
+
+expecting success of 1016.79 'Verify treetag's sha1 pretty content': 
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
+		test_cmp ${name}_content1 ${name}_content2
+	
+ok 79 - Verify treetag's sha1 pretty content
+
+expecting success of 1016.80 'Verify treetag's sha256 pretty content': 
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
+		test_cmp ${name}_content3 ${name}_content4
+	
+ok 80 - Verify treetag's sha256 pretty content
+
+expecting success of 1016.81 'Verify treetag's sha1 content': 
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
+		test_cmp ${name}_content5 ${name}_content6
+	
+ok 81 - Verify treetag's sha1 content
+
+expecting success of 1016.82 'Verify treetag's sha256 content': 
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
+		test_cmp ${name}_content7 ${name}_content8
+	
+ok 82 - Verify treetag's sha256 content
+
+expecting success of 1016.83 'Verify tag committag's sha1 oid': 
+		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
+		test_cmp ${name}_sha1 ${name}_sha1_expected
+	
+ok 83 - Verify tag committag's sha1 oid
+
+expecting success of 1016.84 'Verify tag committag's sha256 oid': 
+		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
+		test_cmp ${name}_sha256 ${name}_sha256_expected
+	
+ok 84 - Verify tag committag's sha256 oid
+
+expecting success of 1016.85 'Verify committag's sha1 type': 
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type_expected
+	
+ok 85 - Verify committag's sha1 type
+
+expecting success of 1016.86 'Verify committag's sha256 type': 
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type_expected
+	
+ok 86 - Verify committag's sha256 type
+
+expecting success of 1016.87 'Verify committag's sha1 size': 
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
+		test_cmp ${name}_size1 ${name}_size2
+	
+ok 87 - Verify committag's sha1 size
+
+expecting success of 1016.88 'Verify committag's sha256 size': 
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
+		test_cmp ${name}_size3 ${name}_size4
+	
+ok 88 - Verify committag's sha256 size
+
+expecting success of 1016.89 'Verify committag's sha1 pretty content': 
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} >${name}_content1 &&
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} >${name}_content2 &&
+		test_cmp ${name}_content1 ${name}_content2
+	
+ok 89 - Verify committag's sha1 pretty content
+
+expecting success of 1016.90 'Verify committag's sha256 pretty content': 
+		git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} >${name}_content3 &&
+		git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} >${name}_content4 &&
+		test_cmp ${name}_content3 ${name}_content4
+	
+ok 90 - Verify committag's sha256 pretty content
+
+expecting success of 1016.91 'Verify committag's sha1 content': 
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} >${name}_content5 &&
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} >${name}_content6 &&
+		test_cmp ${name}_content5 ${name}_content6
+	
+ok 91 - Verify committag's sha1 content
+
+expecting success of 1016.92 'Verify committag's sha256 content': 
+		git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} >${name}_content7 &&
+		git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} >${name}_content8 &&
+		test_cmp ${name}_content7 ${name}_content8
+	
+ok 92 - Verify committag's sha256 content
+
+ok 93 # skip Verify tag signedtag's sha1 oid (missing GPG2)
+
+ok 94 # skip Verify tag signedtag's sha256 oid (missing GPG2)
+
+ok 95 # skip Verify signedtag's sha1 type (missing GPG2)
+
+ok 96 # skip Verify signedtag's sha256 type (missing GPG2)
+
+ok 97 # skip Verify signedtag's sha1 size (missing GPG2)
+
+ok 98 # skip Verify signedtag's sha256 size (missing GPG2)
+
+ok 99 # skip Verify signedtag's sha1 pretty content (missing GPG2)
+
+ok 100 # skip Verify signedtag's sha256 pretty content (missing GPG2)
+
+ok 101 # skip Verify signedtag's sha1 content (missing GPG2)
+
+ok 102 # skip Verify signedtag's sha256 content (missing GPG2)
+
+expecting success of 1016.103 'Verify blob more's sha1 oid': 
+		git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} >${name}_sha1 &&
+		test_cmp ${name}_sha1 ${name}_sha1_expected
+	
+ok 103 - Verify blob more's sha1 oid
+
+expecting success of 1016.104 'Verify blob more's sha256 oid': 
+		git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} >${name}_sha256 &&
+		test_cmp ${name}_sha256 ${name}_sha256_expected
+	
+ok 104 - Verify blob more's sha256 oid
+
+expecting success of 1016.105 'Verify more's sha1 type': 
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} >${name}_type1 &&
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} >${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type2 &&
+		test_cmp ${name}_type1 ${name}_type_expected
+	
+ok 105 - Verify more's sha1 type
+
+expecting success of 1016.106 'Verify more's sha256 type': 
+		git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} >${name}_type3 &&
+		git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} >${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type4 &&
+		test_cmp ${name}_type3 ${name}_type_expected
+	
+ok 106 - Verify more's sha256 type
+
+expecting success of 1016.107 'Verify more's sha1 size': 
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} >${name}_size1 &&
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} >${name}_size2 &&
+		test_cmp ${name}_size1 ${name}_size2
+	
+ok 107 - Verify more's sha1 size
+
+expecting success of 1016.108 'Verify more's sha256 size': 
+		git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} >${name}_size3 &&
+		git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} >${name}_size4 &&
 		test_cmp ${name}_size3 ${name}_size4
 	
 ok 108 - Verify more's sha256 size
@@ -47436,30 +48000,6 @@
 1..202
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1304-default-acl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-
-t1304-default-acl.sh: 4: eval: setfacl: 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1303-wacky-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1303-wacky-config/.git/
 expecting success of 1303.1 'modify same key': 
@@ -47560,98 +48100,28 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0052-simple-ipc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t1304-default-acl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-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
+./test-lib.sh: line 1017: setfacl: command not found
+ok 1 - checking for a working acl setup
 
-client (good 91) (join 0), (errors 0)
-ok 8 - stress test threads
+ok 2 # skip Setup test repo (missing SETFACL)
 
-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
+ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
 
-error: no server listening at 'ipc-test'
-error: no server listening at 'ipc-test'
-ok 9 - stop-daemon works
+ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
 
-error: no server listening at 'ipc-test'
-# passed all 9 test(s)
-1..9
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1307-config-blob.sh ***
@@ -47980,268 +48450,978 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1305-config-include.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t0000-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0000-basic/.git/
+expecting success of 0000.1 'verify that the running shell supports "local"': 
+	x="notlocal" &&
+	y="alsonotlocal" &&
+	echo "local alsolocal" >expected1 &&
+	try_local_xy >actual1 &&
+	test_cmp expected1 actual1 &&
+	echo "notlocal alsonotlocal" >expected2 &&
+	echo "$x $y" >actual2 &&
+	test_cmp expected2 actual2
 
-ok 2 - include file by relative path
+ok 1 - verify that the running shell supports "local"
 
-expecting success of 1305.3 'chained relative paths': 
-	mkdir subdir &&
-	echo "[test]three = 3" >subdir/three &&
-	echo "[include]path = three" >subdir/two &&
-	echo "[include]path = subdir/two" >.gitconfig &&
-	echo 3 >expect &&
-	git config test.three >actual &&
-	test_cmp expect actual
+expecting success of 0000.2 '.git/objects should be empty after git init in an empty repo': 
+	find .git/objects -type f -print >should-be-empty &&
+	test_line_count = 0 should-be-empty
 
-ok 3 - chained relative paths
+ok 2 - .git/objects should be empty after git init in an empty repo
 
-expecting success of 1305.4 'include paths get tilde-expansion': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = ~/one" >.gitconfig &&
-	echo 1 >expect &&
-	git config test.one >actual &&
-	test_cmp expect actual
+expecting success of 0000.3 '.git/objects should have 3 subdirectories': 
+	find .git/objects -type d -print >full-of-directories &&
+	test_line_count = 3 full-of-directories
 
-ok 4 - include paths get tilde-expansion
+ok 3 - .git/objects should have 3 subdirectories
 
-expecting success of 1305.5 'include options can still be examined': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo one >expect &&
-	git config include.path >actual &&
-	test_cmp expect actual
+expecting success of 0000.4 'success is reported like this': 
+	:
 
-ok 5 - include options can still be examined
+ok 4 - success is reported like this
 
-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
+expecting success of 0000.5 'subtest: 3 passing tests': 
+	write_and_run_sub_test_lib_test full-pass <<-\EOF &&
+	for i in 1 2 3
+	do
+		test_expect_success "passing test #$i" "true"
+	done
+	test_done
+	EOF
+	check_sub_test_lib_test full-pass <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 - passing test #3
+	> # passed all 3 test(s)
+	> 1..3
 	EOF
-	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
+ok 5 - subtest: 3 passing tests
 
-expecting success of 1305.8 'single file list does not expand includes by default': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo "include.path=one" >expect &&
-	git config -f .gitconfig --list >actual &&
-	test_cmp expect actual
+expecting success of 0000.6 'subtest: 2/3 tests passing': 
+	write_and_run_sub_test_lib_test_err partial-pass <<-\EOF &&
+	test_expect_success "passing test #1" "true"
+	test_expect_success "failing test #2" "false"
+	test_expect_success "passing test #3" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test partial-pass <<-\EOF
+	> ok 1 - passing test #1
+	> not ok 2 - failing test #2
+	#	false
+	> ok 3 - passing test #3
+	> # failed 1 among 3 test(s)
+	> 1..3
+	EOF
 
-ok 8 - single file list does not expand includes by default
+ok 6 - subtest: 2/3 tests passing
 
-expecting success of 1305.9 'writing config file does not expand includes': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	git config test.two 2 &&
-	echo 2 >expect &&
-	git config --no-includes test.two >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config --no-includes test.one
+expecting success of 0000.7 'subtest: --immediate': 
+	run_sub_test_lib_test_err partial-pass \
+		--immediate &&
+	check_sub_test_lib_test_err partial-pass \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	> ok 1 - passing test #1
+	> not ok 2 - failing test #2
+	> #	false
+	> 1..2
+	EOF_OUT
+	EOF_ERR
 
-ok 9 - writing config file does not expand includes
+ok 7 - subtest: --immediate
 
-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
+expecting success of 0000.8 'subtest: a failing TODO test': 
+	write_and_run_sub_test_lib_test failing-todo <<-\EOF &&
+	test_expect_success "passing test" "true"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_done
 	EOF
-	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
+	check_sub_test_lib_test failing-todo <<-\EOF
+	> ok 1 - passing test
+	> not ok 2 - pretend we have a known breakage # TODO known breakage
+	> # still have 1 known breakage(s)
+	> # passed all remaining 1 test(s)
+	> 1..2
 	EOF
-	echo yes >expect &&
-	git config test.value >actual &&
-	test_cmp expect actual
 
-ok 11 - missing include files are ignored
+ok 8 - subtest: a failing TODO test
 
-expecting success of 1305.12 'absolute includes from command line work': 
-	echo "[test]one = 1" >one &&
-	echo 1 >expect &&
-	git -c include.path="$(pwd)/one" config test.one >actual &&
-	test_cmp expect actual
+expecting success of 0000.9 'subtest: a passing TODO test': 
+	write_and_run_sub_test_lib_test passing-todo <<-\EOF &&
+	test_expect_failure "pretend we have fixed a known breakage" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test passing-todo <<-\EOF
+	> ok 1 - pretend we have fixed a known breakage # TODO known breakage vanished
+	> # 1 known breakage(s) vanished; please update test(s)
+	> 1..1
+	EOF
 
-ok 12 - absolute includes from command line work
+ok 9 - subtest: a passing TODO test
 
-expecting success of 1305.13 'relative includes from command line fail': 
-	echo "[test]one = 1" >one &&
-	test_must_fail git -c include.path=one config test.one
+expecting success of 0000.10 'subtest: 2 TODO tests, one passin': 
+	write_and_run_sub_test_lib_test partially-passing-todos <<-\EOF &&
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_success "pretend we have a passing test" "true"
+	test_expect_failure "pretend we have fixed another known breakage" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test partially-passing-todos <<-\EOF
+	> not ok 1 - pretend we have a known breakage # TODO known breakage
+	> ok 2 - pretend we have a passing test
+	> ok 3 - pretend we have fixed another known breakage # TODO known breakage vanished
+	> # 1 known breakage(s) vanished; please update test(s)
+	> # still have 1 known breakage(s)
+	> # passed all remaining 1 test(s)
+	> 1..3
+	EOF
 
-error: relative config includes must come from files
-fatal: unable to parse command-line config
-ok 13 - relative includes from command line fail
+ok 10 - subtest: 2 TODO tests, one passin
 
-expecting success of 1305.14 'absolute includes from blobs work': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=$(pwd)/one" >blob &&
-	blob=$(git hash-object -w blob) &&
-	echo 1 >expect &&
-	git config --blob=$blob test.one >actual &&
-	test_cmp expect actual
+expecting success of 0000.11 'subtest: mixed results: pass, failure and a TODO test': 
+	write_and_run_sub_test_lib_test_err mixed-results1 <<-\EOF &&
+	test_expect_success "passing test" "true"
+	test_expect_success "failing test" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_done
+	EOF
+	check_sub_test_lib_test mixed-results1 <<-\EOF
+	> ok 1 - passing test
+	> not ok 2 - failing test
+	> #	false
+	> not ok 3 - pretend we have a known breakage # TODO known breakage
+	> # still have 1 known breakage(s)
+	> # failed 1 among remaining 2 test(s)
+	> 1..3
+	EOF
 
-ok 14 - absolute includes from blobs work
+ok 11 - subtest: mixed results: pass, failure and a TODO test
 
-expecting success of 1305.15 'relative includes from blobs fail': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=one" >blob &&
-	blob=$(git hash-object -w blob) &&
-	test_must_fail git config --blob=$blob test.one
+expecting success of 0000.12 'subtest: mixed results: a mixture of all possible results': 
+	write_and_run_sub_test_lib_test_err mixed-results2 <<-\EOF &&
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "failing test" "false"
+	test_expect_success "failing test" "false"
+	test_expect_success "failing test" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_failure "pretend we have fixed a known breakage" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test mixed-results2 <<-\EOF
+	> ok 1 - passing test
+	> ok 2 - passing test
+	> ok 3 - passing test
+	> ok 4 - passing test
+	> not ok 5 - failing test
+	> #	false
+	> not ok 6 - failing test
+	> #	false
+	> not ok 7 - failing test
+	> #	false
+	> not ok 8 - pretend we have a known breakage # TODO known breakage
+	> not ok 9 - pretend we have a known breakage # TODO known breakage
+	> ok 10 - pretend we have fixed a known breakage # TODO known breakage vanished
+	> # 1 known breakage(s) vanished; please update test(s)
+	> # still have 2 known breakage(s)
+	> # failed 3 among remaining 7 test(s)
+	> 1..10
+	EOF
 
-error: relative config includes must come from files
-error: bad config line 1 in blob d085876092eb24c144128bcd5db5d26e665f4f8a
-ok 15 - relative includes from blobs fail
+ok 12 - subtest: mixed results: a mixture of all possible results
 
-expecting success of 1305.16 'absolute includes from stdin work': 
-	echo "[test]one = 1" >one &&
-	echo 1 >expect &&
-	echo "[include]path=\"$(pwd)/one\"" |
-	git config --file - test.one >actual &&
-	test_cmp expect actual
+expecting success of 0000.13 'subtest: --verbose option': 
+	write_and_run_sub_test_lib_test_err t1234-verbose --verbose <<-\EOF &&
+	test_expect_success "passing test" true
+	test_expect_success "test with output" "echo foo"
+	test_expect_success "failing test" false
+	test_done
+	EOF
+	mv t1234-verbose/out t1234-verbose/out+ &&
+	grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out &&
+	check_sub_test_lib_test t1234-verbose <<-\EOF
+	> expecting success of 1234.1 'passing test': true
+	> ok 1 - passing test
+	> Z
+	> expecting success of 1234.2 'test with output': echo foo
+	> foo
+	> ok 2 - test with output
+	> Z
+	> expecting success of 1234.3 'failing test': false
+	> not ok 3 - failing test
+	> #	false
+	> Z
+	> # failed 1 among 3 test(s)
+	> 1..3
+	EOF
 
-ok 16 - absolute includes from stdin work
+ok 13 - subtest: --verbose option
 
-expecting success of 1305.17 'relative includes from stdin line fail': 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=one" |
-	test_must_fail git config --file - test.one
+expecting success of 0000.14 'subtest: --verbose-only option': 
+	run_sub_test_lib_test_err \
+		t1234-verbose \
+		--verbose-only=2 &&
+	check_sub_test_lib_test t1234-verbose <<-\EOF
+	> ok 1 - passing test
+	> Z
+	> expecting success of 1234.2 'test with output': echo foo
+	> foo
+	> ok 2 - test with output
+	> Z
+	> not ok 3 - failing test
+	> #	false
+	> # failed 1 among 3 test(s)
+	> 1..3
+	EOF
 
-error: relative config includes must come from files
-fatal: bad config line 1 in standard input
-ok 17 - relative includes from stdin line fail
+ok 14 - subtest: --verbose-only option
 
-expecting success of 1305.18 'conditional include, both unanchored': 
-	git init foo &&
+expecting success of 0000.15 'subtest: skip one with GIT_SKIP_TESTS': 
 	(
-		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
+		run_sub_test_lib_test full-pass \
+			--skip="full.2" &&
+		check_sub_test_lib_test full-pass <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
+		> ok 3 - passing test #3
+		> # passed all 3 test(s)
+		> 1..3
+		EOF
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/foo/.git/
-ok 18 - conditional include, both unanchored
+ok 15 - subtest: skip one with GIT_SKIP_TESTS
 
-expecting success of 1305.19 'conditional include, $HOME expansion': 
+expecting success of 0000.16 'subtest: skip several with GIT_SKIP_TESTS': 
 	(
-		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
+		write_and_run_sub_test_lib_test git-skip-tests-several \
+			--skip="git.2 git.5" <<-\EOF &&
+		for i in 1 2 3 4 5 6
+		do
+			test_expect_success "passing test #$i" "true"
+		done
+		test_done
+		EOF
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
+		> ok 3 - passing test #3
+		> ok 4 - passing test #4
+		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
+		> ok 6 - passing test #6
+		> # passed all 6 test(s)
+		> 1..6
+		EOF
 	)
 
-ok 19 - conditional include, $HOME expansion
+ok 16 - subtest: skip several with GIT_SKIP_TESTS
 
-expecting success of 1305.20 'conditional include, full pattern': 
+expecting success of 0000.17 'subtest: sh pattern skipping with GIT_SKIP_TESTS': 
 	(
-		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
+		run_sub_test_lib_test git-skip-tests-several \
+			--skip="git.[2-5]" &&
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
+		> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
+		> ok 4 # skip passing test #4 (GIT_SKIP_TESTS)
+		> ok 5 # skip passing test #5 (GIT_SKIP_TESTS)
+		> ok 6 - passing test #6
+		> # passed all 6 test(s)
+		> 1..6
+		EOF
 	)
 
-ok 20 - conditional include, full pattern
+ok 17 - subtest: sh pattern skipping with GIT_SKIP_TESTS
 
-expecting success of 1305.21 'conditional include, relative path': 
-	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >>.gitconfig &&
-	echo "[test]four=4" >bar4 &&
+expecting success of 0000.18 'subtest: skip entire test suite with GIT_SKIP_TESTS': 
 	(
-		cd foo &&
-		echo 4 >expect &&
-		git config test.four >actual &&
-		test_cmp expect actual
+		GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
+		run_sub_test_lib_test git-skip-tests-several \
+			--skip="git" &&
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
+		> 1..0 # SKIP skip all tests in git
+		EOF
 	)
 
-ok 21 - conditional include, relative path
+ok 18 - subtest: skip entire test suite with GIT_SKIP_TESTS
 
-expecting success of 1305.22 'conditional include, both unanchored, icase': 
+expecting success of 0000.19 'subtest: GIT_SKIP_TESTS does not skip unmatched suite': 
 	(
-		cd foo &&
-		echo "[includeIf \"gitdir/i:FOO/\"]path=bar5" >>.git/config &&
-		echo "[test]five=5" >.git/bar5 &&
-		echo 5 >expect &&
-		git config test.five >actual &&
-		test_cmp expect actual
+		GIT_SKIP_TESTS="notgit" && export GIT_SKIP_TESTS &&
+		run_sub_test_lib_test full-pass \
+			--skip="notfull" &&
+		check_sub_test_lib_test full-pass <<-\EOF
+		> ok 1 - passing test #1
+		> ok 2 - passing test #2
+		> ok 3 - passing test #3
+		> # passed all 3 test(s)
+		> 1..3
+		EOF
 	)
 
-ok 22 - conditional include, both unanchored, icase
+ok 19 - subtest: GIT_SKIP_TESTS does not skip unmatched suite
 
-expecting success of 1305.23 'conditional include, early config reading': 
+expecting success of 0000.20 'subtest: --run basic': 
+	run_sub_test_lib_test git-skip-tests-several --run="1,3,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 20 - subtest: --run basic
+
+expecting success of 0000.21 'subtest: --run with a range': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 # skip passing test #5 (--run)
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 21 - subtest: --run with a range
+
+expecting success of 0000.22 'subtest: --run with two ranges': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-2,5-6" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 22 - subtest: --run with two ranges
+
+expecting success of 0000.23 'subtest: --run with a left open range': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 # skip passing test #5 (--run)
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 23 - subtest: --run with a left open range
+
+expecting success of 0000.24 'subtest: --run with a right open range': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="4-" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 24 - subtest: --run with a right open range
+
+expecting success of 0000.25 'subtest: --run with basic negation': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 25 - subtest: --run with basic negation
+
+expecting success of 0000.26 'subtest: --run with two negations': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3,!6" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 26 - subtest: --run with two negations
+
+expecting success of 0000.27 'subtest: --run a range and negation': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="-4,!2" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 - passing test #3
+	> ok 4 - passing test #4
+	> ok 5 # skip passing test #5 (--run)
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 27 - subtest: --run a range and negation
+
+expecting success of 0000.28 'subtest: --run range negation': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!1-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 - passing test #6
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 28 - subtest: --run range negation
+
+expecting success of 0000.29 'subtest: --run include, exclude and include': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-5,!1-3,2" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 29 - subtest: --run include, exclude and include
+
+expecting success of 0000.30 'subtest: --run include, exclude and include, comma separated': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run=1-5,!1-3,2 &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 # skip passing test #1 (--run)
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 - passing test #4
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 30 - subtest: --run include, exclude and include, comma separated
+
+expecting success of 0000.31 'subtest: --run exclude and include': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3-,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 - passing test #2
+	> ok 3 # skip passing test #3 (--run)
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 31 - subtest: --run exclude and include
+
+expecting success of 0000.32 'subtest: --run empty selectors': 
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1,,3,,,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
+	> ok 1 - passing test #1
+	> ok 2 # skip passing test #2 (--run)
+	> ok 3 - passing test #3
+	> ok 4 # skip passing test #4 (--run)
+	> ok 5 - passing test #5
+	> ok 6 # skip passing test #6 (--run)
+	> # passed all 6 test(s)
+	> 1..6
+	EOF
+
+ok 32 - subtest: --run empty selectors
+
+expecting success of 0000.33 'subtest: --run substring selector': 
+	write_and_run_sub_test_lib_test run-substring-selector \
+		--run="relevant" <<-\EOF &&
+	test_expect_success "relevant test" "true"
+	for i in 1 2 3 4 5 6
+	do
+		test_expect_success "other test #$i" "true"
+	done
+	test_done
+	EOF
+	check_sub_test_lib_test run-substring-selector <<-\EOF
+	> ok 1 - relevant test
+	> ok 2 # skip other test #1 (--run)
+	> ok 3 # skip other test #2 (--run)
+	> ok 4 # skip other test #3 (--run)
+	> ok 5 # skip other test #4 (--run)
+	> ok 6 # skip other test #5 (--run)
+	> ok 7 # skip other test #6 (--run)
+	> # passed all 7 test(s)
+	> 1..7
+	EOF
+
+ok 33 - subtest: --run substring selector
+
+expecting success of 0000.34 'subtest: --run keyword selection': 
+	write_and_run_sub_test_lib_test_err run-inv-range-start \
+		--run="a-5" <<-\EOF &&
+	test_expect_success "passing test #1" "true"
+	test_done
+	EOF
+	check_sub_test_lib_test_err run-inv-range-start \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	> FATAL: Unexpected exit with code 1
+	EOF_OUT
+	> error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ}
+	EOF_ERR
+
+ok 34 - subtest: --run keyword selection
+
+expecting success of 0000.35 'subtest: --run invalid range end': 
+	run_sub_test_lib_test_err run-inv-range-start \
+		--run="1-z" &&
+	check_sub_test_lib_test_err run-inv-range-start \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	> FATAL: Unexpected exit with code 1
+	EOF_OUT
+	> error: --run: invalid non-numeric in range end: ${SQ}1-z${SQ}
+	EOF_ERR
+
+ok 35 - subtest: --run invalid range end
+
+expecting success of 0000.36 'subtest: --invert-exit-code without --immediate': 
+	run_sub_test_lib_test_err full-pass \
+		--invert-exit-code &&
+	check_sub_test_lib_test_err full-pass \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	ok 1 - passing test #1
+	ok 2 - passing test #2
+	ok 3 - passing test #3
+	# passed all 3 test(s)
+	1..3
+	# faking up non-zero exit with --invert-exit-code
+	EOF_OUT
+	EOF_ERR
+
+ok 36 - subtest: --invert-exit-code without --immediate
+
+expecting success of 0000.37 'subtest: --invert-exit-code with --immediate: all passed': 
+	run_sub_test_lib_test_err full-pass \
+		--invert-exit-code --immediate &&
+	check_sub_test_lib_test_err full-pass \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	ok 1 - passing test #1
+	ok 2 - passing test #2
+	ok 3 - passing test #3
+	# passed all 3 test(s)
+	1..3
+	# faking up non-zero exit with --invert-exit-code
+	EOF_OUT
+	EOF_ERR
+
+ok 37 - subtest: --invert-exit-code with --immediate: all passed
+
+expecting success of 0000.38 'subtest: --invert-exit-code without --immediate: partial pass': 
+	run_sub_test_lib_test partial-pass \
+		--invert-exit-code &&
+	check_sub_test_lib_test partial-pass <<-\EOF
+	ok 1 - passing test #1
+	not ok 2 - # TODO induced breakage (--invert-exit-code): failing test #2
+	#	false
+	ok 3 - passing test #3
+	# failed 1 among 3 test(s)
+	1..3
+	# faked up failures as TODO & now exiting with 0 due to --invert-exit-code
+	EOF
+
+ok 38 - subtest: --invert-exit-code without --immediate: partial pass
+
+expecting success of 0000.39 'subtest: --invert-exit-code with --immediate: partial pass': 
+	run_sub_test_lib_test partial-pass \
+		--invert-exit-code --immediate &&
+	check_sub_test_lib_test partial-pass \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	ok 1 - passing test #1
+	not ok 2 - # TODO induced breakage (--invert-exit-code): failing test #2
+	#	false
+	1..2
+	# faked up failures as TODO & now exiting with 0 due to --invert-exit-code
+	EOF_OUT
+	EOF_ERR
+
+ok 39 - subtest: --invert-exit-code with --immediate: partial pass
+
+expecting success of 0000.40 'subtest: --invert-exit-code --immediate: got a failure': 
+	run_sub_test_lib_test partial-pass \
+		--invert-exit-code --immediate &&
+	check_sub_test_lib_test_err partial-pass \
+		<<-\EOF_OUT 3<<-EOF_ERR
+	ok 1 - passing test #1
+	not ok 2 - # TODO induced breakage (--invert-exit-code): failing test #2
+	#	false
+	1..2
+	# faked up failures as TODO & now exiting with 0 due to --invert-exit-code
+	EOF_OUT
+	EOF_ERR
+
+ok 40 - subtest: --invert-exit-code --immediate: got a failure
+
+expecting success of 0000.41 'subtest: tests respect prerequisites': 
+	write_and_run_sub_test_lib_test prereqs <<-\EOF &&
+
+	test_set_prereq HAVEIT
+	test_expect_success HAVEIT "prereq is satisfied" "true"
+	test_expect_success "have_prereq works" "
+		test_have_prereq HAVEIT
+	"
+	test_expect_success DONTHAVEIT "prereq not satisfied" "false"
+
+	test_set_prereq HAVETHIS
+	test_expect_success HAVETHIS,HAVEIT "multiple prereqs" "true"
+	test_expect_success HAVEIT,DONTHAVEIT "mixed prereqs (yes,no)" "false"
+	test_expect_success DONTHAVEIT,HAVEIT "mixed prereqs (no,yes)" "false"
+
+	test_done
+	EOF
+
+	check_sub_test_lib_test prereqs <<-\EOF
+	ok 1 - prereq is satisfied
+	ok 2 - have_prereq works
+	ok 3 # skip prereq not satisfied (missing DONTHAVEIT)
+	ok 4 - multiple prereqs
+	ok 5 # skip mixed prereqs (yes,no) (missing DONTHAVEIT of HAVEIT,DONTHAVEIT)
+	ok 6 # skip mixed prereqs (no,yes) (missing DONTHAVEIT of DONTHAVEIT,HAVEIT)
+	# passed all 6 test(s)
+	1..6
+	EOF
+
+ok 41 - subtest: tests respect prerequisites
+
+expecting success of 0000.42 'subtest: tests respect lazy prerequisites': 
+	write_and_run_sub_test_lib_test lazy-prereqs <<-\EOF &&
+
+	test_lazy_prereq LAZY_TRUE true
+	test_expect_success LAZY_TRUE "lazy prereq is satisfied" "true"
+	test_expect_success !LAZY_TRUE "negative lazy prereq" "false"
+
+	test_lazy_prereq LAZY_FALSE false
+	test_expect_success LAZY_FALSE "lazy prereq not satisfied" "false"
+	test_expect_success !LAZY_FALSE "negative false prereq" "true"
+
+	test_done
+	EOF
+
+	check_sub_test_lib_test lazy-prereqs <<-\EOF
+	ok 1 - lazy prereq is satisfied
+	ok 2 # skip negative lazy prereq (missing !LAZY_TRUE)
+	ok 3 # skip lazy prereq not satisfied (missing LAZY_FALSE)
+	ok 4 - negative false prereq
+	# passed all 4 test(s)
+	1..4
+	EOF
+
+ok 42 - subtest: tests respect lazy prerequisites
+
+expecting success of 0000.43 'subtest: nested lazy prerequisites': 
+	write_and_run_sub_test_lib_test nested-lazy <<-\EOF &&
+
+	test_lazy_prereq NESTED_INNER "
+		>inner &&
+		rm -f outer
+	"
+	test_lazy_prereq NESTED_PREREQ "
+		>outer &&
+		test_have_prereq NESTED_INNER &&
+		echo can create new file in cwd >file &&
+		test_path_is_file outer &&
+		test_path_is_missing inner
+	"
+	test_expect_success NESTED_PREREQ "evaluate nested prereq" "true"
+
+	test_done
+	EOF
+
+	check_sub_test_lib_test nested-lazy <<-\EOF
+	ok 1 - evaluate nested prereq
+	# passed all 1 test(s)
+	1..1
+	EOF
+
+ok 43 - subtest: nested lazy prerequisites
+
+expecting success of 0000.44 'subtest: lazy prereqs do not turn off tracing': 
+	write_and_run_sub_test_lib_test lazy-prereq-and-tracing \
+		-v -x <<-\EOF &&
+	test_lazy_prereq LAZY true
+
+	test_expect_success lazy "test_have_prereq LAZY && echo trace"
+
+	test_done
+	EOF
+
+	grep "echo trace" lazy-prereq-and-tracing/err
+
+++ echo trace
+ok 44 - subtest: lazy prereqs do not turn off tracing
+
+expecting success of 0000.45 'subtest: tests clean up after themselves': 
+	write_and_run_sub_test_lib_test cleanup <<-\EOF &&
+	clean=no
+	test_expect_success "do cleanup" "
+		test_when_finished clean=yes
+	"
+	test_expect_success "cleanup happened" "
+		test $clean = yes
+	"
+	test_done
+	EOF
+
+	check_sub_test_lib_test cleanup <<-\EOF
+	ok 1 - do cleanup
+	ok 2 - cleanup happened
+	# passed all 2 test(s)
+	1..2
+	EOF
+
+ok 45 - subtest: tests clean up after themselves
+
+expecting success of 0000.46 'subtest: tests clean up even on failures': 
+	write_and_run_sub_test_lib_test_err \
+		failing-cleanup <<-\EOF &&
+	test_expect_success "tests clean up even after a failure" "
+		touch clean-after-failure &&
+		test_when_finished rm clean-after-failure &&
+		(exit 1)
+	"
+	test_expect_success "failure to clean up causes the test to fail" "
+		test_when_finished \"(exit 2)\"
+	"
+	test_done
+	EOF
+	check_sub_test_lib_test failing-cleanup <<-\EOF
+	> not ok 1 - tests clean up even after a failure
+	> #	Z
+	> #	touch clean-after-failure &&
+	> #	test_when_finished rm clean-after-failure &&
+	> #	(exit 1)
+	> #	Z
+	> not ok 2 - failure to clean up causes the test to fail
+	> #	Z
+	> #	test_when_finished "(exit 2)"
+	> #	Z
+	> # failed 2 among 2 test(s)
+	> 1..2
+	EOF
+
+ok 46 - subtest: tests clean up even on failures
+
+expecting success of 0000.47 'subtest: test_atexit is run': 
+	write_and_run_sub_test_lib_test_err \
+		atexit-cleanup -i <<-\EOF &&
+	test_expect_success "tests clean up even after a failure" "
+		> ../../clean-atexit &&
+		test_atexit rm ../../clean-atexit &&
+		> ../../also-clean-atexit &&
+		test_atexit rm ../../also-clean-atexit &&
+		> ../../dont-clean-atexit &&
+		(exit 1)
+	"
+	test_done
+	EOF
+	test_path_is_file dont-clean-atexit &&
+	test_path_is_missing clean-atexit &&
+	test_path_is_missing also-clean-atexit
+
+ok 47 - subtest: test_atexit is run
+
+expecting success of 0000.48 'test_oid provides sane info by default': 
+	test_oid zero >actual &&
+	grep "^00*\$" actual &&
+	rawsz="$(test_oid rawsz)" &&
+	hexsz="$(test_oid hexsz)" &&
+	# +1 accounts for the trailing newline
+	test $(( $hexsz + 1)) -eq $(wc -c <actual) &&
+	test $(( $rawsz * 2)) -eq "$hexsz"
+
+0000000000000000000000000000000000000000
+ok 48 - test_oid provides sane info by default
+
+expecting success of 0000.49 'test_oid can look up data for SHA-1': 
+	test_when_finished "test_detect_hash" &&
+	test_set_hash sha1 &&
+	test_oid zero >actual &&
+	grep "^00*\$" actual &&
+	rawsz="$(test_oid rawsz)" &&
+	hexsz="$(test_oid hexsz)" &&
+	test $(wc -c <actual) -eq 41 &&
+	test "$rawsz" -eq 20 &&
+	test "$hexsz" -eq 40
+
+0000000000000000000000000000000000000000
+ok 49 - test_oid can look up data for SHA-1
+
+expecting success of 0000.50 'test_oid can look up data for SHA-256': 
+	test_when_finished "test_detect_hash" &&
+	test_set_hash sha256 &&
+	test_oid zero >actual &&
+	grep "^00*\$" actual &&
+	rawsz="$(test_oid rawsz)" &&
+	hexsz="$(test_oid hexsz)" &&
+	test $(wc -c <actual) -eq 65 &&
+	test "$rawsz" -eq 32 &&
+	test "$hexsz" -eq 64
+
+0000000000000000000000000000000000000000000000000000000000000000
+ok 50 - test_oid can look up data for SHA-256
+
+expecting success of 0000.51 'test_oid can look up data for a specified algorithm': 
+	rawsz="$(test_oid --hash=sha1 rawsz)" &&
+	hexsz="$(test_oid --hash=sha1 hexsz)" &&
+	test "$rawsz" -eq 20 &&
+	test "$hexsz" -eq 40 &&
+	rawsz="$(test_oid --hash=sha256 rawsz)" &&
+	hexsz="$(test_oid --hash=sha256 hexsz)" &&
+	test "$rawsz" -eq 32 &&
+	test "$hexsz" -eq 64
+
+ok 51 - test_oid can look up data for a specified algorithm
+
+expecting success of 0000.52 'test_bool_env': 
 	(
-		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
+		sane_unset envvar &&
+
+		test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar= &&
+		export envvar &&
+		! test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar=true &&
+		test_bool_env envvar true &&
+		test_bool_env envvar false &&
+
+		envvar=false &&
+		! test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar=invalid &&
+		# When encountering an invalid bool value, test_bool_env
+		# prints its error message to the original stderr of the
+		# test script, hence the redirection of fd 7, and aborts
+		# with "exit 1", hence the subshell.
+		! ( test_bool_env envvar true ) 7>err &&
+		grep "error: test_bool_env requires bool values" err &&
+
+		envvar=true &&
+		! ( test_bool_env envvar invalid ) 7>err &&
+		grep "error: test_bool_env requires bool values" err
 	)
 
-ok 23 - conditional include, early config reading
+fatal: bad boolean environment value 'invalid' for 'envvar'
+error: test_bool_env requires bool values both for $envvar and for the default fallback
+error: option `--default' expects a boolean value with `--type=bool`, not `invalid`
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
 
-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
+    --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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/foo/bar/repo/.git/
-ok 24 - conditional include with /**/
+error: test_bool_env requires bool values both for $envvar and for the default fallback
+ok 52 - test_bool_env
+
+expecting success of 0000.53 'git update-index without --add should fail adding': 
+	test_must_fail git update-index should-be-empty
+
+error: should-be-empty: cannot add to the index - missing --add option?
+fatal: Unable to process path should-be-empty
+ok 53 - git update-index without --add should fail adding
+
+expecting success of 0000.54 'git update-index with --add should succeed': 
+	git update-index --add should-be-empty
+
+ok 54 - git update-index with --add should succeed
+
+expecting success of 0000.55 'writing tree out with git write-tree': 
+	tree=$(git write-tree)
+
+ok 55 - writing tree out with git write-tree
+
+expecting success of 0000.56 'validate object ID of a known tree': 
+	test "$tree" = "$(test_oid simpletree)"
+    
+ok 56 - validate object ID of a known tree
+
+expecting success of 0000.57 'git update-index without --remove should fail removing': 
+	rm -f should-be-empty full-of-directories &&
+	test_must_fail git update-index should-be-empty
+
+error: should-be-empty: does not exist and --remove not passed
+fatal: Unable to process path should-be-empty
+ok 57 - git update-index without --remove should fail removing
+
+expecting success of 0000.58 'git update-index with --remove should be able to remove': 
+	git update-index --remove should-be-empty
+
+ok 58 - git update-index with --remove should be able to remove
+
+expecting success of 0000.59 'git write-tree should be able to write an empty tree': 
+	tree=$(git write-tree)
+
+ok 59 - git write-tree should be able to write an empty tree
+
+expecting success of 0000.60 'validate object ID of a known tree': 
+	test "$tree" = $EMPTY_TREE
+
+ok 60 - validate object ID of a known tree
+
+expecting success of 0000.61 'adding various types of objects with git update-index --add': 
+	mkdir path2 path3 path3/subp3 &&
+	paths="path0 path2/file2 path3/file3 path3/subp3/file3" &&
+	(
+		for p in $paths
+		do
+			echo "hello $p" >$p || exit 1
+			test_ln_s_add "hello $p" ${p}sym || exit 1
+		done
+	) &&
+	find path* ! -type d -print | xargs git update-index --add
 
 checking prerequisite: SYMLINKS
 
@@ -48253,237 +49433,316 @@
 
 )
 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" &&
+ok 61 - adding various types of objects with git update-index --add
 
-		git init foo &&
-		cd foo &&
-		mkdir sub
-	)
+expecting success of 0000.62 'showing stage with git ls-files --stage': 
+	git ls-files --stage >current
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/real-home/foo/.git/
-ok 25 - conditional include, set up symlinked $HOME
+ok 62 - showing stage with git ls-files --stage
 
-expecting success of 1305.26 'conditional include, $HOME expansion with symlinks': 
-	(
-		HOME="$TRASH_DIRECTORY/home" &&
-		export HOME &&
-		cd "$HOME"/foo &&
+expecting success of 0000.63 'validate git ls-files output for a known tree': 
+	cat >expected <<-EOF &&
+	100644 $(test_oid path0f) 0	path0
+	120000 $(test_oid path0s) 0	path0sym
+	100644 $(test_oid path2f) 0	path2/file2
+	120000 $(test_oid path2s) 0	path2/file2sym
+	100644 $(test_oid path3f) 0	path3/file3
+	120000 $(test_oid path3s) 0	path3/file3sym
+	100644 $(test_oid subp3f) 0	path3/subp3/file3
+	120000 $(test_oid subp3s) 0	path3/subp3/file3sym
+	EOF
+	test_cmp expected current
 
-		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 63 - validate git ls-files output for a known tree
 
-ok 26 - conditional include, $HOME expansion with symlinks
+expecting success of 0000.64 'writing tree out with git write-tree': 
+	tree=$(git write-tree)
 
-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 &&
+ok 64 - writing tree out with git write-tree
 
-		echo 4 >expect &&
-		force_setup_explicit_git_dir &&
-		git -C sub config test.four >actual &&
-		test_cmp expect actual
-	)
+expecting success of 0000.65 'validate object ID for a known tree': 
+	test "$tree" = "$(test_oid root)"
 
-ok 27 - conditional include, relative path with symlinks
+ok 65 - validate object ID for a known tree
 
-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 0000.66 'showing tree with git ls-tree': 
+	git ls-tree $tree >current
 
-ok 28 - conditional include, gitdir matching symlink
+ok 66 - showing tree with git ls-tree
 
-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
-	)
+expecting success of 0000.67 'git ls-tree output for a known tree': 
+	cat >expected <<-EOF &&
+	100644 blob $(test_oid path0f)	path0
+	120000 blob $(test_oid path0s)	path0sym
+	040000 tree $(test_oid path2d)	path2
+	040000 tree $(test_oid path3d)	path3
+	EOF
+	test_cmp expected current
 
-ok 29 - conditional include, gitdir matching symlink, icase
+ok 67 - git ls-tree output for a known tree
 
-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
+expecting success of 0000.68 'showing tree with git ls-tree -r': 
+	git ls-tree -r $tree >current
 
-Switched to a new branch 'main'
-Switched to a new branch 'foo-branch'
-ok 30 - conditional include, onbranch
+ok 68 - showing tree with git ls-tree -r
 
-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 &&
+expecting success of 0000.69 'git ls-tree -r output for a known tree': 
+	cat >expected <<-EOF &&
+	100644 blob $(test_oid path0f)	path0
+	120000 blob $(test_oid path0s)	path0sym
+	100644 blob $(test_oid path2f)	path2/file2
+	120000 blob $(test_oid path2s)	path2/file2sym
+	100644 blob $(test_oid path3f)	path3/file3
+	120000 blob $(test_oid path3s)	path3/file3sym
+	100644 blob $(test_oid subp3f)	path3/subp3/file3
+	120000 blob $(test_oid subp3s)	path3/subp3/file3sym
+	EOF
+	test_cmp expected current
 
-	echo 10 >expect &&
-	git checkout -b foo-branch/a/b/c &&
-	git config test.ten >actual &&
-	test_cmp expect actual &&
+ok 69 - git ls-tree -r output for a known tree
 
-	git checkout -b moo-bar/a &&
-	git config test.ten >actual &&
-	test_cmp expect actual
+expecting success of 0000.70 'showing tree with git ls-tree -r -t': 
+	git ls-tree -r -t $tree >current
 
-Switched to a new branch 'not-foo-branch/a'
-Switched to a new branch 'foo-branch/a/b/c'
-Switched to a new branch 'moo-bar/a'
-ok 31 - conditional include, onbranch, wildcard
+ok 70 - showing tree with git ls-tree -r -t
 
-expecting success of 1305.32 'conditional include, onbranch, implicit /** for /': 
-	echo "[includeIf \"onbranch:foo-dir/\"]path=bar11" >>.git/config &&
-	echo "[test]eleven=11" >.git/bar11 &&
-	git checkout -b not-foo-dir/a &&
-	test_must_fail git config test.eleven &&
+expecting success of 0000.71 'git ls-tree -r output for a known tree': 
+	cat >expected <<-EOF &&
+	100644 blob $(test_oid path0f)	path0
+	120000 blob $(test_oid path0s)	path0sym
+	040000 tree $(test_oid path2d)	path2
+	100644 blob $(test_oid path2f)	path2/file2
+	120000 blob $(test_oid path2s)	path2/file2sym
+	040000 tree $(test_oid path3d)	path3
+	100644 blob $(test_oid path3f)	path3/file3
+	120000 blob $(test_oid path3s)	path3/file3sym
+	040000 tree $(test_oid subp3d)	path3/subp3
+	100644 blob $(test_oid subp3f)	path3/subp3/file3
+	120000 blob $(test_oid subp3s)	path3/subp3/file3sym
+	EOF
+	test_cmp expected current
 
-	echo 11 >expect &&
-	git checkout -b foo-dir/a/b/c &&
-	git config test.eleven >actual &&
-	test_cmp expect actual
+ok 71 - git ls-tree -r output for a known tree
 
-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 0000.72 'writing partial tree out with git write-tree --prefix': 
+	ptree=$(git write-tree --prefix=path3)
 
-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 72 - writing partial tree out with git write-tree --prefix
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/cycle/
-fatal: exceeded maximum include depth (10) while including
-ok 33 - include cycles are detected
+expecting success of 0000.73 'validate object ID for a known tree': 
+	test "$ptree" = $(test_oid path3d)
 
-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
-	)
+ok 73 - validate object ID for a known tree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/repo/.git/
-baz
-ok 34 - onbranch with unborn branch
+expecting success of 0000.74 'writing partial tree out with git write-tree --prefix': 
+	ptree=$(git write-tree --prefix=path3/subp3)
 
-expecting success of 1305.35 'onbranch with detached HEAD': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+ok 74 - writing partial tree out with git write-tree --prefix
+
+expecting success of 0000.75 'validate object ID for a known tree': 
+	test "$ptree" = $(test_oid subp3d)
+
+ok 75 - validate object ID for a known tree
+
+expecting success of 0000.76 'put invalid objects into the index': 
+	rm -f .git/index &&
+	suffix=$(echo $ZERO_OID | sed -e "s/^.//") &&
+	cat >badobjects <<-EOF &&
+	100644 blob $(test_oid 001)	dir/file1
+	100644 blob $(test_oid 002)	dir/file2
+	100644 blob $(test_oid 003)	dir/file3
+	100644 blob $(test_oid 004)	dir/file4
+	100644 blob $(test_oid 005)	dir/file5
+	EOF
+	git update-index --index-info <badobjects
+
+ok 76 - put invalid objects into the index
+
+expecting success of 0000.77 'writing this tree without --missing-ok': 
+	test_must_fail git write-tree
+
+error: invalid object 100644 0000000000000000000000000000000000000001 for 'dir/file1'
+fatal: git-write-tree: error building trees
+ok 77 - writing this tree without --missing-ok
+
+expecting success of 0000.78 'writing this tree with --missing-ok': 
+	git write-tree --missing-ok
+
+6718b1dd2231ec9ad958238ceeaa06fbfbefda94
+ok 78 - writing this tree with --missing-ok
+
+expecting success of 0000.79 'git read-tree followed by write-tree should be idempotent': 
+	rm -f .git/index &&
+	git read-tree $tree &&
+	test_path_is_file .git/index &&
+	newtree=$(git write-tree) &&
+	test "$newtree" = "$tree"
+
+ok 79 - git read-tree followed by write-tree should be idempotent
+
+expecting success of 0000.80 'validate git diff-files output for a know cache/work tree state': 
+	cat >expected <<EOF &&
+:100644 100644 $(test_oid path0f) $ZERO_OID M	path0
+:120000 120000 $(test_oid path0s) $ZERO_OID M	path0sym
+:100644 100644 $(test_oid path2f) $ZERO_OID M	path2/file2
+:120000 120000 $(test_oid path2s) $ZERO_OID M	path2/file2sym
+:100644 100644 $(test_oid path3f) $ZERO_OID M	path3/file3
+:120000 120000 $(test_oid path3s) $ZERO_OID M	path3/file3sym
+:100644 100644 $(test_oid subp3f) $ZERO_OID M	path3/subp3/file3
+:120000 120000 $(test_oid subp3s) $ZERO_OID M	path3/subp3/file3sym
+EOF
+	git diff-files >current &&
+	test_cmp expected current
+
+ok 80 - validate git diff-files output for a know cache/work tree state
+
+expecting success of 0000.81 'git update-index --refresh should succeed': 
+	git update-index --refresh
+
+ok 81 - git update-index --refresh should succeed
+
+expecting success of 0000.82 'no diff after checkout and git update-index --refresh': 
+	git diff-files >current &&
+	cmp -s current /dev/null
+
+ok 82 - no diff after checkout and git update-index --refresh
+
+expecting success of 0000.83 'git commit-tree records the correct tree in a commit': 
+	commit0=$(echo NO | git commit-tree $P) &&
+	git show --pretty=raw $commit0 >out &&
+	tree=$(sed -n -e "s/^tree //p" -e "/^author /q" out) &&
+	test "z$tree" = "z$P"
+
+ok 83 - git commit-tree records the correct tree in a commit
+
+expecting success of 0000.84 'git commit-tree records the correct parent in a commit': 
+	commit1=$(echo NO | git commit-tree $P -p $commit0) &&
+	git show --pretty=raw $commit1 >out &&
+	parent=$(sed -n -e "s/^parent //p" -e "/^author /q" out) &&
+	test "z$commit0" = "z$parent"
+
+ok 84 - git commit-tree records the correct parent in a commit
+
+expecting success of 0000.85 'git commit-tree omits duplicated parent in a commit': 
+	commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
+	git show --pretty=raw $commit2 >out &&
+	cat >match.sed <<-\EOF &&
+	s/^parent //p
+	/^author /q
+	EOF
+	parent=$(sed -n -f match.sed out | sort -u) &&
+	test "z$commit0" = "z$parent" &&
+	git show --pretty=raw $commit2 >out &&
+	test_stdout_line_count = 1 sed -n -f match.sed out
+
+error: duplicate parent d664f4b2f72710b8e019acf96c4773c8ac3993b8 ignored
+ok 85 - git commit-tree omits duplicated parent in a commit
+
+expecting success of 0000.86 'update-index D/F conflict': 
+	mv path0 tmp &&
+	mv path2 path0 &&
+	mv tmp path2 &&
+	git update-index --add --replace path2 path0/file2 &&
+	git ls-files path0 >tmp &&
+	numpath0=$(wc -l <tmp) &&
+	test $numpath0 = 1
+
+ok 86 - update-index D/F conflict
+
+expecting success of 0000.87 'very long name in the index handled sanely': 
+
+	a=a && # 1
+	a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 16
+	a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 256
+	a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 4096
+	a=${a}q &&
+
+	>path4 &&
+	git update-index --add path4 &&
+	git ls-files -s path4 >tmp &&
 	(
-		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
-	)
+		sed -e "s/	.*/	/" tmp |
+		tr -d "\012" &&
+		echo "$a"
+	) | git update-index --index-info &&
+	git ls-files "a*" >tmp &&
+	len=$(wc -c <tmp) &&
+	test $len = 4098
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ok 87 - very long name in the index handled sanely
 
-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
+expecting success of 0000.88 'more update-index D/F conflicts': 
+	# empty the index to make sure our entry is last
+	git read-tree --empty &&
+	cacheinfo=100644,$(test_oid empty_blob) &&
+	git update-index --add --cacheinfo $cacheinfo,path5/a &&
 
-baz
-ok 36 - onbranch without repository
+	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/file &&
+	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/file &&
+	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/c/file &&
 
-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
+	# "a-" sorts between "a" and "a/"
+	git update-index --add --cacheinfo $cacheinfo,path5/a- &&
 
-baz
-ok 37 - onbranch without repository but explicit nonexistent Git directory
+	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/file &&
+	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/file &&
+	test_must_fail git update-index --add --cacheinfo $cacheinfo,path5/a/b/c/file &&
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1310-config-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	cat >expected <<-\EOF &&
+	path5/a
+	path5/a-
+	EOF
+	git ls-files >actual &&
+	test_cmp expected actual
 
-ok 1 - uses --default when entry missing
+error: 'path5/a/file' appears as both a file and as a directory
+error: path5/a/file: cannot add to the index - missing --add option?
+fatal: git update-index: --cacheinfo cannot add path5/a/file
+error: 'path5/a/b/file' appears as both a file and as a directory
+error: path5/a/b/file: cannot add to the index - missing --add option?
+fatal: git update-index: --cacheinfo cannot add path5/a/b/file
+error: 'path5/a/b/c/file' appears as both a file and as a directory
+error: path5/a/b/c/file: cannot add to the index - missing --add option?
+fatal: git update-index: --cacheinfo cannot add path5/a/b/c/file
+error: 'path5/a/file' appears as both a file and as a directory
+error: path5/a/file: cannot add to the index - missing --add option?
+fatal: git update-index: --cacheinfo cannot add path5/a/file
+error: 'path5/a/b/file' appears as both a file and as a directory
+error: path5/a/b/file: cannot add to the index - missing --add option?
+fatal: git update-index: --cacheinfo cannot add path5/a/b/file
+error: 'path5/a/b/c/file' appears as both a file and as a directory
+error: path5/a/b/c/file: cannot add to the index - missing --add option?
+fatal: git update-index: --cacheinfo cannot add path5/a/b/c/file
+ok 88 - more update-index D/F conflicts
 
-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
+expecting success of 0000.89 'test_must_fail on a failing git command': 
+	test_must_fail git notacommand
 
-ok 2 - does not use --default when entry present
+git: 'notacommand' is not a git command. See 'git --help'.
+ok 89 - test_must_fail on a failing git command
 
-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 0000.90 'test_must_fail on a failing git command with env': 
+	test_must_fail env var1=a var2=b git notacommand
 
-ok 3 - canonicalizes --default with appropriate type
+git: 'notacommand' is not a git command. See 'git --help'.
+ok 90 - test_must_fail on a failing git command with env
 
-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 0000.91 'test_must_fail rejects a non-git command': 
+	! test_must_fail grep ^$ notafile 2>err &&
+	grep -F "test_must_fail: only 'git' is allowed" err
 
-fatal: failed to format default config value: x
-ok 4 - dies when --default cannot be parsed
+test_must_fail: only 'git' is allowed: grep ^$ notafile
+ok 91 - test_must_fail rejects a non-git command
 
-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 0000.92 'test_must_fail rejects a non-git command with env': 
+	! test_must_fail env var1=a var2=b grep ^$ notafile 2>err &&
+	grep -F "test_must_fail: only 'git' is allowed" err
 
-error: --default is only applicable to --get
-ok 5 - does not allow --default without --get
+test_must_fail: only 'git' is allowed: env var1=a var2=b grep ^$ notafile
+ok 92 - test_must_fail rejects a non-git command with env
 
-# passed all 5 test(s)
-1..5
+# passed all 92 test(s)
+1..92
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1091-sparse-checkout-builtin.sh ***
@@ -49274,6 +50533,7 @@
 	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': 
@@ -49699,2081 +50959,510 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0610-reftable-basics.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/.git/
-expecting success of 0610.1 'init: creates basic reftable structures': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_path_is_dir repo/.git/reftable &&
-	test_path_is_file repo/.git/reftable/tables.list &&
-	echo reftable >expect &&
-	git -C repo rev-parse --show-ref-format >actual &&
+*** t1310-config-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 1 - init: creates basic reftable structures
+ok 1 - uses --default when entry missing
 
-expecting success of 0610.2 'init: sha256 object format via environment variable': 
-	test_when_finished "rm -rf repo" &&
-	GIT_DEFAULT_HASH=sha256 git init repo &&
-	cat >expect <<-EOF &&
-	sha256
-	reftable
-	EOF
-	git -C repo rev-parse --show-object-format --show-ref-format >actual &&
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 2 - init: sha256 object format via environment variable
+ok 2 - does not use --default when entry present
 
-expecting success of 0610.3 'init: sha256 object format via option': 
-	test_when_finished "rm -rf repo" &&
-	git init --object-format=sha256 repo &&
-	cat >expect <<-EOF &&
-	sha256
-	reftable
-	EOF
-	git -C repo rev-parse --show-object-format --show-ref-format >actual &&
+expecting success of 1310.3 'canonicalizes --default with appropriate type': 
+	echo true >expect &&
+	git config -f config --default=yes --bool core.foo >actual &&
 	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 3 - init: sha256 object format via option
-
-expecting success of 0610.4 'init: reinitializing reftable backend succeeds': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo A &&
+ok 3 - canonicalizes --default with appropriate type
 
-	git -C repo for-each-ref >expect &&
-	git init --ref-format=reftable repo &&
-	git -C repo for-each-ref >actual &&
-	test_cmp expect actual
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 4 - init: reinitializing reftable backend succeeds
+fatal: failed to format default config value: x
+ok 4 - dies when --default cannot be parsed
 
-expecting success of 0610.5 'init: reinitializing files with reftable backend fails': 
-	test_when_finished "rm -rf repo" &&
-	git init --ref-format=files repo &&
-	test_commit -C repo file &&
+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
 
-	cp repo/.git/HEAD expect &&
-	test_must_fail git init --ref-format=reftable repo &&
-	test_cmp expect repo/.git/HEAD
+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.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 8775f53] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-fatal: attempt to reinitialize repository with different reference storage format
-ok 5 - init: reinitializing files with reftable backend fails
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1305-config-include.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 0610.6 'init: reinitializing reftable with files backend fails': 
-	test_when_finished "rm -rf repo" &&
-	git init --ref-format=reftable repo &&
-	test_commit -C repo file &&
+ok 1 - include file by absolute path
 
-	cp repo/.git/HEAD expect &&
-	test_must_fail git init --ref-format=files repo &&
-	test_cmp expect repo/.git/HEAD
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) d122299] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-fatal: attempt to reinitialize repository with different reference storage format
-ok 6 - init: reinitializing reftable with files backend fails
+ok 2 - include file by relative path
 
-expecting success of 0610.7 'init: honors --shared=umask with umask 002': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 7 - init: honors --shared=umask with umask 002
+expecting success of 1305.3 'chained relative paths': 
+	mkdir subdir &&
+	echo "[test]three = 3" >subdir/three &&
+	echo "[include]path = three" >subdir/two &&
+	echo "[include]path = subdir/two" >.gitconfig &&
+	echo 3 >expect &&
+	git config test.three >actual &&
+	test_cmp expect actual
 
-expecting success of 0610.8 'pack-refs: honors --shared=umask with umask 002': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 8 - pack-refs: honors --shared=umask with umask 002
+ok 3 - chained relative paths
 
-expecting success of 0610.9 'init: honors --shared=umask with umask 022': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 9 - init: honors --shared=umask with umask 022
+expecting success of 1305.4 'include paths get tilde-expansion': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = ~/one" >.gitconfig &&
+	echo 1 >expect &&
+	git config test.one >actual &&
+	test_cmp expect actual
 
-expecting success of 0610.10 'pack-refs: honors --shared=umask with umask 022': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 10 - pack-refs: honors --shared=umask with umask 022
+ok 4 - include paths get tilde-expansion
 
-expecting success of 0610.11 'init: honors --shared=umask with umask 027': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 11 - init: honors --shared=umask with umask 027
+expecting success of 1305.5 'include options can still be examined': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo one >expect &&
+	git config include.path >actual &&
+	test_cmp expect actual
 
-expecting success of 0610.12 'pack-refs: honors --shared=umask with umask 027': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 12 - pack-refs: honors --shared=umask with umask 027
+ok 5 - include options can still be examined
 
-expecting success of 0610.13 'init: honors --shared=group with umask 002': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 13 - init: honors --shared=group with umask 002
+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
 
-expecting success of 0610.14 'pack-refs: honors --shared=group with umask 002': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 14 - pack-refs: honors --shared=group with umask 002
+ok 6 - listing includes option and expansion
 
-expecting success of 0610.15 'init: honors --shared=group with umask 022': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 15 - init: honors --shared=group with umask 022
+expecting success of 1305.7 'single file lookup does not expand includes by default': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	test_must_fail git config -f .gitconfig test.one &&
+	test_must_fail git config --global test.one &&
+	echo 1 >expect &&
+	git config --includes -f .gitconfig test.one >actual &&
+	test_cmp expect actual
 
-expecting success of 0610.16 'pack-refs: honors --shared=group with umask 022': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 16 - pack-refs: honors --shared=group with umask 022
+ok 7 - single file lookup does not expand includes by default
 
-expecting success of 0610.17 'init: honors --shared=group with umask 027': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 17 - init: honors --shared=group with umask 027
+expecting success of 1305.8 'single file list does not expand includes by default': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo "include.path=one" >expect &&
+	git config -f .gitconfig --list >actual &&
+	test_cmp expect actual
 
-expecting success of 0610.18 'pack-refs: honors --shared=group with umask 027': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 18 - pack-refs: honors --shared=group with umask 027
+ok 8 - single file list does not expand includes by default
 
-expecting success of 0610.19 'init: honors --shared=world with umask 002': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 19 - init: honors --shared=world with umask 002
+expecting success of 1305.9 'writing config file does not expand includes': 
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	git config test.two 2 &&
+	echo 2 >expect &&
+	git config --no-includes test.two >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config --no-includes test.one
 
-expecting success of 0610.20 'pack-refs: honors --shared=world with umask 002': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 20 - pack-refs: honors --shared=world with umask 002
+ok 9 - writing config file does not expand includes
 
-expecting success of 0610.21 'init: honors --shared=world with umask 022': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 21 - init: honors --shared=world with umask 022
+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
 
-expecting success of 0610.22 'pack-refs: honors --shared=world with umask 022': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 22 - pack-refs: honors --shared=world with umask 022
+ok 10 - config modification does not affect includes
 
-expecting success of 0610.23 'init: honors --shared=world with umask 027': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 23 - init: honors --shared=world with umask 027
+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
 
-expecting success of 0610.24 'pack-refs: honors --shared=world with umask 027': 
-		test_when_finished "rm -rf repo" &&
-		(
-			umask $umask &&
-			git init --shared=$shared repo &&
-			test_commit -C repo A &&
-			test_line_count = 2 repo/.git/reftable/tables.list &&
-			git -C repo pack-refs
-		) &&
-		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
-		for table in repo/.git/reftable/*.ref
-		do
-			test_expect_perms "$expect" "$table" ||
-			return 1
-		done
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 24 - pack-refs: honors --shared=world with umask 027
+ok 11 - missing include files are ignored
 
-expecting success of 0610.25 'clone: can clone reftable repository': 
-	test_when_finished "rm -rf repo clone" &&
-	git init repo &&
-	test_commit -C repo message1 file1 &&
+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
 
-	git clone repo cloned &&
-	echo reftable >expect &&
-	git -C cloned rev-parse --show-ref-format >actual &&
-	test_cmp expect actual &&
-	test_path_is_file cloned/file1
+ok 12 - absolute includes from command line work
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 3d039ac] message1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Cloning into 'cloned'...
-done.
-ok 25 - clone: can clone reftable repository
+expecting success of 1305.13 'relative includes from command line fail': 
+	echo "[test]one = 1" >one &&
+	test_must_fail git -c include.path=one config test.one
 
-expecting success of 0610.26 'clone: can clone reffiles into reftable repository': 
-	test_when_finished "rm -rf reffiles reftable" &&
-	git init --ref-format=files reffiles &&
-	test_commit -C reffiles A &&
-	git clone --ref-format=reftable ./reffiles reftable &&
+error: relative config includes must come from files
+fatal: unable to parse command-line config
+ok 13 - relative includes from command line fail
 
-	git -C reffiles rev-parse HEAD >expect &&
-	git -C reftable rev-parse HEAD >actual &&
-	test_cmp expect 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
 
-	git -C reftable rev-parse --show-ref-format >actual &&
-	echo reftable >expect &&
-	test_cmp expect actual &&
+ok 14 - absolute includes from blobs work
 
-	git -C reffiles rev-parse --show-ref-format >actual &&
-	echo files >expect &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/reffiles/.git/
-[main (root-commit) c8e0c53] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Cloning into 'reftable'...
-done.
-ok 26 - clone: can clone reffiles into reftable repository
-
-expecting success of 0610.27 'clone: can clone reftable into reffiles repository': 
-	test_when_finished "rm -rf reffiles reftable" &&
-	git init --ref-format=reftable reftable &&
-	test_commit -C reftable A &&
-	git clone --ref-format=files ./reftable reffiles &&
-
-	git -C reftable rev-parse HEAD >expect &&
-	git -C reffiles rev-parse HEAD >actual &&
-	test_cmp expect 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
 
-	git -C reftable rev-parse --show-ref-format >actual &&
-	echo reftable >expect &&
-	test_cmp expect actual &&
+error: relative config includes must come from files
+error: bad config line 1 in blob d085876092eb24c144128bcd5db5d26e665f4f8a
+ok 15 - relative includes from blobs fail
 
-	git -C reffiles rev-parse --show-ref-format >actual &&
-	echo files >expect &&
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/reftable/.git/
-[main (root-commit) 063dab5] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Cloning into 'reffiles'...
-done.
-ok 27 - clone: can clone reftable into reffiles repository
+ok 16 - absolute includes from stdin work
 
-expecting success of 0610.28 'ref transaction: corrupted tables cause failure': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit file1 &&
-		for f in .git/reftable/*.ref
-		do
-			: >"$f" || return 1
-		done &&
-		test_must_fail git update-ref refs/heads/main HEAD
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) d612ae7] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-fatal: HEAD: not a valid SHA1
-ok 28 - ref transaction: corrupted tables cause failure
+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 0610.29 'ref transaction: corrupted tables.list cause failure': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.18 'conditional include, both unanchored': 
+	git init foo &&
 	(
-		cd repo &&
-		test_commit file1 &&
-		echo garbage >.git/reftable/tables.list &&
-		test_must_fail git update-ref refs/heads/main HEAD
+		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.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) d612ae7] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-fatal: HEAD: not a valid SHA1
-ok 29 - ref transaction: corrupted tables.list cause failure
-
-expecting success of 0610.30 'ref transaction: refuses to write ref causing F/D conflict': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo file &&
-	test_must_fail git -C repo update-ref refs/heads/main/forbidden
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 1c78b0a] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-usage: git update-ref [<options>] -d <refname> [<old-oid>]
-   or: git update-ref [<options>]    <refname> <new-oid> [<old-oid>]
-   or: git update-ref [<options>] --stdin [-z]
-
-    -m <reason>           reason of the update
-    -d                    delete the reference
-    --no-deref            update <refname> not the one it points to
-    --deref               opposite of --no-deref
-    -z                    stdin has NUL-terminated arguments
-    --[no-]stdin          read updates from stdin
-    --[no-]create-reflog  create a reflog
-
-ok 30 - ref transaction: refuses to write ref causing F/D conflict
-
-expecting success of 0610.31 'ref transaction: deleting ref with invalid name fails': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo file &&
-	test_must_fail git -C repo update-ref -d ../../my-private-file
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) a9763e5] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-error: refusing to update ref with bad name '../../my-private-file'
-ok 31 - ref transaction: deleting ref with invalid name fails
-
-expecting success of 0610.32 'ref transaction: can skip object ID verification': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail test-tool -C repo ref-store main update-ref msg refs/heads/branch $INVALID_OID $ZERO_OID 0 &&
-	test-tool -C repo ref-store main update-ref msg refs/heads/branch $INVALID_OID $ZERO_OID REF_SKIP_OID_VERIFICATION
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-fatal: update_ref failed for ref 'refs/heads/branch': trying to write ref 'refs/heads/branch' with nonexistent object 0000000000000000000000000000000000000001
-ok 32 - ref transaction: can skip object ID verification
-
-expecting success of 0610.33 'ref transaction: updating same ref multiple times fails': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo A &&
-	cat >updates <<-EOF &&
-	update refs/heads/main $A
-	update refs/heads/main $A
-	EOF
-	cat >expect <<-EOF &&
-	fatal: multiple updates for ref ${SQ}refs/heads/main${SQ} not allowed
-	EOF
-	test_must_fail git -C repo update-ref --stdin <updates 2>err &&
-	test_cmp expect err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) d1cc01b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 33 - ref transaction: updating same ref multiple times fails
-
-expecting success of 0610.34 'ref transaction: can delete symbolic self-reference with git-symbolic-ref(1)': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	git -C repo symbolic-ref refs/heads/self refs/heads/self &&
-	git -C repo symbolic-ref -d refs/heads/self
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 34 - ref transaction: can delete symbolic self-reference with git-symbolic-ref(1)
-
-expecting success of 0610.35 'ref transaction: deleting symbolic self-reference without --no-deref fails': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	git -C repo symbolic-ref refs/heads/self refs/heads/self &&
-	cat >expect <<-EOF &&
-	error: multiple updates for ${SQ}refs/heads/self${SQ} (including one via symref ${SQ}refs/heads/self${SQ}) are not allowed
-	EOF
-	test_must_fail git -C repo update-ref -d refs/heads/self 2>err &&
-	test_cmp expect err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 35 - ref transaction: deleting symbolic self-reference without --no-deref fails
-
-expecting success of 0610.36 'ref transaction: deleting symbolic self-reference with --no-deref succeeds': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	git -C repo symbolic-ref refs/heads/self refs/heads/self &&
-	git -C repo update-ref -d --no-deref refs/heads/self
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 36 - ref transaction: deleting symbolic self-reference with --no-deref succeeds
-
-expecting success of 0610.37 'ref transaction: creating symbolic ref fails with F/D conflict': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo A &&
-	cat >expect <<-EOF &&
-	error: ${SQ}refs/heads/main${SQ} exists; cannot create ${SQ}refs/heads${SQ}
-	EOF
-	test_must_fail git -C repo symbolic-ref refs/heads refs/heads/foo 2>err &&
-	test_cmp expect err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 6d715cf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 37 - ref transaction: creating symbolic ref fails with F/D conflict
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/foo/.git/
+ok 18 - conditional include, both unanchored
 
-expecting success of 0610.38 'ref transaction: ref deletion': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.19 'conditional include, $HOME expansion': 
 	(
-		cd repo &&
-		test_commit file &&
-		HEAD_OID=$(git show-ref -s --verify HEAD) &&
-		cat >expect <<-EOF &&
-		$HEAD_OID refs/heads/main
-		$HEAD_OID refs/tags/file
-		EOF
-		git show-ref >actual &&
-		test_cmp expect actual &&
-
-		test_must_fail git update-ref -d refs/tags/file $INVALID_OID &&
-		git show-ref >actual &&
-		test_cmp expect actual &&
-
-		git update-ref -d refs/tags/file $HEAD_OID &&
-		echo "$HEAD_OID refs/heads/main" >expect &&
-		git show-ref >actual &&
+		cd foo &&
+		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
+		echo "[test]two=2" >.git/bar2 &&
+		echo 2 >expect &&
+		git config test.two >actual &&
 		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) ebdce24] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-error: cannot lock ref 'refs/tags/file': is at ebdce24106c291a92bd800eef0ef9f363ac0c1dc but expected 0000000000000000000000000000000000000001
-ok 38 - ref transaction: ref deletion
-
-expecting success of 0610.39 'ref transaction: writes cause auto-compaction': 
-	test_when_finished "rm -rf repo" &&
-
-	git init repo &&
-	test_line_count = 1 repo/.git/reftable/tables.list &&
-
-	test_commit -C repo --no-tag A &&
-	test_line_count = 1 repo/.git/reftable/tables.list &&
-
-	test_commit -C repo --no-tag B &&
-	test_line_count = 1 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) d4404d5] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main c79f296] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 39 - ref transaction: writes cause auto-compaction
-
-expecting success of 0610.40 'ref transaction: env var disables compaction': 
-	test_when_finished "rm -rf repo" &&
-
-	git init repo &&
-	test_commit -C repo A &&
-
-	start=$(wc -l <repo/.git/reftable/tables.list) &&
-	iterations=5 &&
-	expected=$((start + iterations)) &&
-
-	for i in $(test_seq $iterations)
-	do
-		GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
-		git -C repo update-ref branch-$i HEAD || return 1
-	done &&
-	test_line_count = $expected repo/.git/reftable/tables.list &&
-
-	git -C repo update-ref foo HEAD &&
-	test_line_count -lt $expected repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 3c1b37b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 40 - ref transaction: env var disables compaction
-
-expecting success of 0610.41 'ref transaction: alternating table sizes are compacted': 
-	test_when_finished "rm -rf repo" &&
-
-	git init repo &&
-	test_commit -C repo A &&
-	for i in $(test_seq 5)
-	do
-		git -C repo branch -f foo &&
-		git -C repo branch -d foo || return 1
-	done &&
-	test_line_count = 2 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 617a709] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Deleted branch foo (was 617a709).
-Deleted branch foo (was 617a709).
-Deleted branch foo (was 617a709).
-Deleted branch foo (was 617a709).
-Deleted branch foo (was 617a709).
-ok 41 - ref transaction: alternating table sizes are compacted
-
-expecting success of 0610.42 'ref transaction: writes are synced': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo initial &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	GIT_TEST_FSYNC=true \
-		git -C repo -c core.fsync=reference \
-		-c core.fsyncMethod=fsync update-ref refs/heads/branch HEAD &&
-	check_fsync_events trace2.txt <<-EOF
-	"name":"hardware-flush","count":4
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 1aef781] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 42 - ref transaction: writes are synced
-
-expecting success of 0610.43 'ref transaction: empty transaction in empty repo': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo --no-tag A &&
-	git -C repo update-ref -d refs/heads/main &&
-	test-tool -C repo ref-store main delete-refs REF_NO_DEREF msg HEAD &&
-	git -C repo update-ref --stdin <<-EOF
-	prepare
-	commit
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) c0b5012] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-prepare: ok
-commit: ok
-ok 43 - ref transaction: empty transaction in empty repo
+ok 19 - conditional include, $HOME expansion
 
-expecting success of 0610.44 'ref transaction: fails gracefully when auto compaction fails': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.20 'conditional include, full pattern': 
 	(
-		cd repo &&
-
-		test_commit A &&
-		for i in $(test_seq 10)
-		do
-			git branch branch-$i &&
-			for table in .git/reftable/*.ref
-			do
-				touch "$table.lock" || exit 1
-			done ||
-			exit 1
-		done &&
-		test_line_count = 10 .git/reftable/tables.list
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) bd580e6] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 44 - ref transaction: fails gracefully when auto compaction fails
+ok 20 - conditional include, full pattern
 
-expecting success of 0610.45 'ref transaction: timeout acquiring tables.list lock': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.21 'conditional include, relative path': 
+	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >>.gitconfig &&
+	echo "[test]four=4" >bar4 &&
 	(
-		cd repo &&
-		test_commit initial &&
-		>.git/reftable/tables.list.lock &&
-		test_must_fail git update-ref refs/heads/branch HEAD 2>err &&
-		test_grep "cannot lock references" err
+		cd foo &&
+		echo 4 >expect &&
+		git config test.four >actual &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 68d032e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-fatal: update_ref failed for ref 'refs/heads/branch': cannot lock references
-ok 45 - ref transaction: timeout acquiring tables.list lock
+ok 21 - conditional include, relative path
 
-expecting success of 0610.46 'ref transaction: retry acquiring tables.list lock': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.22 'conditional include, both unanchored, icase': 
 	(
-		cd repo &&
-		test_commit initial &&
-		LOCK=.git/reftable/tables.list.lock &&
-		>$LOCK &&
-		{
-			( sleep 1 && rm -f $LOCK ) &
-		} &&
-		git -c reftable.lockTimeout=5000 update-ref refs/heads/branch HEAD
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 68d032e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 46 - ref transaction: retry acquiring tables.list lock
+ok 22 - conditional include, both unanchored, icase
 
-expecting success of 0610.47 'ref transaction: many concurrent writers': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.23 'conditional include, early config reading': 
 	(
-		cd repo &&
-		# Set a high timeout. While a couple of seconds should be
-		# plenty, using the address sanitizer will significantly slow
-		# us down here. So we are aiming way higher than you would ever
-		# think is necessary just to keep us from flaking. We could
-		# also lock indefinitely by passing -1, but that could
-		# potentially block CI jobs indefinitely if there was a bug
-		# here.
-		git config set reftable.lockTimeout 300000 &&
-		test_commit --no-tag initial &&
-
-		head=$(git rev-parse HEAD) &&
-		for i in $(test_seq 100)
-		do
-			printf "%s commit\trefs/heads/branch-%s\n" "$head" "$i" ||
-			return 1
-		done >expect &&
-		printf "%s commit\trefs/heads/main\n" "$head" >>expect &&
-
-		for i in $(test_seq 100)
-		do
-			{ git update-ref refs/heads/branch-$i HEAD& } ||
-			return 1
-		done &&
-
-		wait &&
-		git for-each-ref --sort=v:refname >actual &&
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 68d032e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 47 - ref transaction: many concurrent writers
-
-expecting success of 0610.48 'pack-refs: compacts tables': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-
-	test_commit -C repo A &&
-	ls -1 repo/.git/reftable >table-files &&
-	test_line_count = 3 table-files &&
-	test_line_count = 2 repo/.git/reftable/tables.list &&
-
-	git -C repo pack-refs &&
-	ls -1 repo/.git/reftable >table-files &&
-	test_line_count = 2 table-files &&
-	test_line_count = 1 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) bd580e6] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 48 - pack-refs: compacts tables
+ok 23 - conditional include, early config reading
 
-expecting success of 0610.49 'pack-refs: compaction raises locking errors': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo A &&
-	touch repo/.git/reftable/tables.list.lock &&
-	cat >expect <<-EOF &&
-	error: unable to compact stack: data is locked
+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
-	test_must_fail git -C repo pack-refs 2>err &&
-	test_cmp expect err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) e75b87b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 49 - pack-refs: compaction raises locking errors
-
-expecting success of 0610.50 'pack-refs: auto compaction': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit A &&
-
-		# We need a bit of setup to ensure that git-gc(1) actually
-		# triggers, and that it does not write anything to the refdb.
-		git config gc.auto 1 &&
-		git config gc.autoDetach 0 &&
-		git config gc.reflogExpire never &&
-		git config gc.reflogExpireUnreachable never &&
-		test_oid blob17_1 | git hash-object -w --stdin &&
-
-		# The tables should have been auto-compacted, and thus auto
-		# compaction should not have to do anything.
-		ls -1 .git/reftable >tables-expect &&
-		test_line_count = 3 tables-expect &&
-		git $command --auto &&
-		ls -1 .git/reftable >tables-actual &&
-		test_cmp tables-expect tables-actual &&
-
-		test_oid blob17_2 | git hash-object -w --stdin &&
-
-		# Lock all tables, write some refs. Auto-compaction will be
-		# unable to compact tables and thus fails gracefully,
-		# compacting only those tables which are not locked.
-		ls .git/reftable/*.ref | sort |
-		while read table
-		do
-			touch "$table.lock" &&
-			basename "$table" >>tables.expect || exit 1
-		done &&
-		test_line_count = 2 .git/reftable/tables.list &&
-		git branch B &&
-		git branch C &&
-
-		# The new tables are auto-compacted, but the locked tables are
-		# left intact.
-		test_line_count = 3 .git/reftable/tables.list &&
-		head -n 2 .git/reftable/tables.list >tables.head &&
-		test_cmp tables.expect tables.head &&
-
-		rm .git/reftable/*.lock &&
-		git $command --auto &&
-		test_line_count = 1 .git/reftable/tables.list
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 062915c] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-175b6c5dfd7f9bf6e2b2c4e2dcf3e2341298575d
-17e344e7c08441fa81d5b56c21008dc0feeeaa20
-ok 50 - pack-refs: auto compaction
-
-expecting success of 0610.51 'gc: auto compaction': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit A &&
-
-		# We need a bit of setup to ensure that git-gc(1) actually
-		# triggers, and that it does not write anything to the refdb.
-		git config gc.auto 1 &&
-		git config gc.autoDetach 0 &&
-		git config gc.reflogExpire never &&
-		git config gc.reflogExpireUnreachable never &&
-		test_oid blob17_1 | git hash-object -w --stdin &&
-
-		# The tables should have been auto-compacted, and thus auto
-		# compaction should not have to do anything.
-		ls -1 .git/reftable >tables-expect &&
-		test_line_count = 3 tables-expect &&
-		git $command --auto &&
-		ls -1 .git/reftable >tables-actual &&
-		test_cmp tables-expect tables-actual &&
-
-		test_oid blob17_2 | git hash-object -w --stdin &&
-
-		# Lock all tables, write some refs. Auto-compaction will be
-		# unable to compact tables and thus fails gracefully,
-		# compacting only those tables which are not locked.
-		ls .git/reftable/*.ref | sort |
-		while read table
-		do
-			touch "$table.lock" &&
-			basename "$table" >>tables.expect || exit 1
-		done &&
-		test_line_count = 2 .git/reftable/tables.list &&
-		git branch B &&
-		git branch C &&
+	echo "[test]seven=7" >$REPO/.git/bar7 &&
+	echo 7 >expect &&
+	git -C $REPO config test.seven >actual &&
+	test_cmp expect actual
 
-		# The new tables are auto-compacted, but the locked tables are
-		# left intact.
-		test_line_count = 3 .git/reftable/tables.list &&
-		head -n 2 .git/reftable/tables.list >tables.head &&
-		test_cmp tables.expect tables.head &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/foo/bar/repo/.git/
+ok 24 - conditional include with /**/
 
-		rm .git/reftable/*.lock &&
-		git $command --auto &&
-		test_line_count = 1 .git/reftable/tables.list
-	)
+checking prerequisite: SYMLINKS
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 062915c] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-175b6c5dfd7f9bf6e2b2c4e2dcf3e2341298575d
-17e344e7c08441fa81d5b56c21008dc0feeeaa20
-Auto packing the repository for optimum performance.
-See "git help gc" for manual housekeeping.
-warning: There are too many unreachable loose objects; run 'git prune' to remove them.
-ok 51 - gc: auto compaction
+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 0610.52 'maintenance run --task=pack-refs: auto compaction': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+)
+prerequisite SYMLINKS ok
+expecting success of 1305.25 'conditional include, set up symlinked $HOME': 
+	mkdir real-home &&
+	ln -s real-home home &&
 	(
-		cd repo &&
-
-		test_commit A &&
-
-		# We need a bit of setup to ensure that git-gc(1) actually
-		# triggers, and that it does not write anything to the refdb.
-		git config gc.auto 1 &&
-		git config gc.autoDetach 0 &&
-		git config gc.reflogExpire never &&
-		git config gc.reflogExpireUnreachable never &&
-		test_oid blob17_1 | git hash-object -w --stdin &&
-
-		# The tables should have been auto-compacted, and thus auto
-		# compaction should not have to do anything.
-		ls -1 .git/reftable >tables-expect &&
-		test_line_count = 3 tables-expect &&
-		git $command --auto &&
-		ls -1 .git/reftable >tables-actual &&
-		test_cmp tables-expect tables-actual &&
-
-		test_oid blob17_2 | git hash-object -w --stdin &&
-
-		# Lock all tables, write some refs. Auto-compaction will be
-		# unable to compact tables and thus fails gracefully,
-		# compacting only those tables which are not locked.
-		ls .git/reftable/*.ref | sort |
-		while read table
-		do
-			touch "$table.lock" &&
-			basename "$table" >>tables.expect || exit 1
-		done &&
-		test_line_count = 2 .git/reftable/tables.list &&
-		git branch B &&
-		git branch C &&
-
-		# The new tables are auto-compacted, but the locked tables are
-		# left intact.
-		test_line_count = 3 .git/reftable/tables.list &&
-		head -n 2 .git/reftable/tables.list >tables.head &&
-		test_cmp tables.expect tables.head &&
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME" &&
 
-		rm .git/reftable/*.lock &&
-		git $command --auto &&
-		test_line_count = 1 .git/reftable/tables.list
+		git init foo &&
+		cd foo &&
+		mkdir sub
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 062915c] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-175b6c5dfd7f9bf6e2b2c4e2dcf3e2341298575d
-17e344e7c08441fa81d5b56c21008dc0feeeaa20
-ok 52 - maintenance run --task=pack-refs: auto compaction
-
-expecting success of 0610.53 'pack-refs: prunes stale tables': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	touch repo/.git/reftable/stale-table.ref &&
-	git -C repo pack-refs &&
-	test_path_is_missing repo/.git/reftable/stable-ref.ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 53 - pack-refs: prunes stale tables
-
-expecting success of 0610.54 'pack-refs: does not prune non-table files': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	touch repo/.git/reftable/garbage &&
-	git -C repo pack-refs &&
-	test_path_is_file repo/.git/reftable/garbage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 54 - pack-refs: does not prune non-table files
-
-expecting success of 0610.55 'packed-refs: writes are synced': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo initial &&
-	test_line_count = 2 table-files &&
-
-	: >trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	GIT_TEST_FSYNC=true \
-		git -C repo -c core.fsync=reference \
-		-c core.fsyncMethod=fsync pack-refs &&
-	check_fsync_events trace2.txt <<-EOF
-	"name":"hardware-flush","count":2
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) d8072fd] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 55 - packed-refs: writes are synced
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/real-home/foo/.git/
+ok 25 - conditional include, set up symlinked $HOME
 
-expecting success of 0610.56 'ref iterator: bogus names are flagged': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.26 'conditional include, $HOME expansion with symlinks': 
 	(
-		cd repo &&
-		test_commit --no-tag file &&
-		test-tool ref-store main update-ref msg "refs/heads/bogus..name" $(git rev-parse HEAD) $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME"/foo &&
 
-		cat >expect <<-EOF &&
-		$ZERO_OID refs/heads/bogus..name 0xc
-		$(git rev-parse HEAD) refs/heads/main 0x0
-		EOF
-		test-tool ref-store main for-each-ref "" >actual &&
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) ba04411] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 56 - ref iterator: bogus names are flagged
+ok 26 - conditional include, $HOME expansion with symlinks
 
-expecting success of 0610.57 'ref iterator: missing object IDs are not flagged': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+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 &&
 	(
-		cd repo &&
-		test-tool ref-store main update-ref msg "refs/heads/broken-hash" $INVALID_OID $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME"/foo &&
 
-		cat >expect <<-EOF &&
-		$INVALID_OID refs/heads/broken-hash 0x0
-		EOF
-		test-tool ref-store main for-each-ref "" >actual &&
+		echo 4 >expect &&
+		force_setup_explicit_git_dir &&
+		git -C sub config test.four >actual &&
 		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 57 - ref iterator: missing object IDs are not flagged
-
-expecting success of 0610.58 'basic: commit and list refs': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo file &&
-	test_write_lines refs/heads/main refs/tags/file >expect &&
-	git -C repo for-each-ref --format="%(refname)" >actual &&
-	test_cmp actual expect
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) ba04411] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 58 - basic: commit and list refs
-
-expecting success of 0610.59 'basic: can write large commit message': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	perl -e "
-		print \"this is a long commit message\" x 50000
-	" >commit-msg &&
-	git -C repo commit --allow-empty --file=../commit-msg
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 355c8bc] 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 59 - basic: can write large commit message
-
-expecting success of 0610.60 'basic: show-ref fails with empty repository': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail git -C repo show-ref >actual &&
-	test_must_be_empty actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 60 - basic: show-ref fails with empty repository
-
-expecting success of 0610.61 'basic: can check out unborn branch': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	git -C repo checkout -b main
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-Switched to a new branch 'main'
-ok 61 - basic: can check out unborn branch
-
-expecting success of 0610.62 'basic: peeled tags are stored': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo file &&
-	git -C repo tag -m "annotated tag" test_tag HEAD &&
-	for ref in refs/heads/main refs/tags/file refs/tags/test_tag refs/tags/test_tag^{}
-	do
-		echo "$(git -C repo rev-parse "$ref") $ref" || return 1
-	done >expect &&
-	git -C repo show-ref -d >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) a7bae40] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 62 - basic: peeled tags are stored
-
-expecting success of 0610.63 'basic: for-each-ref can print symrefs': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit file &&
-		git branch &&
-		git symbolic-ref refs/heads/sym refs/heads/main &&
-		cat >expected <<-EOF &&
-		refs/heads/main
-		EOF
-		git for-each-ref --format="%(symref)" refs/heads/sym >actual &&
-		test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 00d7e56] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-* main
-ok 63 - basic: for-each-ref can print symrefs
+ok 27 - conditional include, relative path with symlinks
 
-expecting success of 0610.64 'basic: notes': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.28 'conditional include, gitdir matching symlink': 
+	ln -s foo bar &&
 	(
-		write_script fake_editor <<-\EOF &&
-		echo "$MSG" >"$1"
-		echo "$MSG" >&2
-		EOF
-
-		test_commit 1st &&
-		test_commit 2nd &&
-		GIT_EDITOR=./fake_editor MSG=b4 git notes add &&
-		GIT_EDITOR=./fake_editor MSG=b3 git notes edit &&
-		echo b4 >expect &&
-		git notes --ref commits@{1} show >actual &&
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 3aa380d] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-[main 322f39a] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2nd.t
-b4
-b3
-ok 64 - basic: notes
-
-expecting success of 0610.65 'basic: stash': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit file &&
-		git stash list >expect &&
-		test_line_count = 0 expect &&
-
-		echo hoi >>file.t &&
-		git stash push -m stashed &&
-		git stash list >expect &&
-		test_line_count = 1 expect &&
-
-		git stash clear &&
-		git stash list >expect &&
-		test_line_count = 0 expect
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 00d7e56] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-Saved working directory and index state On main: stashed
-ok 65 - basic: stash
-
-expecting success of 0610.66 'basic: cherry-pick': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit message1 file1 &&
-		test_commit message2 file2 &&
-		git branch source &&
-		git checkout HEAD^ &&
-		test_commit message3 file3 &&
-		git cherry-pick source &&
-		test_path_is_file file2
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) adc3c6f] message1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[main 606b3a5] message2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-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 adc3c6f message1
-[detached HEAD 54033ed] message3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[detached HEAD 7bb1ef8] message2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:35:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 66 - basic: cherry-pick
+ok 28 - conditional include, gitdir matching symlink
 
-expecting success of 0610.67 'basic: rebase': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 1305.29 'conditional include, gitdir matching symlink, icase': 
 	(
-		cd repo &&
-		test_commit message1 file1 &&
-		test_commit message2 file2 &&
-		git branch source &&
-		git checkout HEAD^ &&
-		test_commit message3 file3 &&
-		git rebase source &&
-		test_path_is_file file2
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) adc3c6f] message1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[main 606b3a5] message2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-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 adc3c6f message1
-[detached HEAD 54033ed] message3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 67 - basic: rebase
-
-expecting success of 0610.68 'reflog: can delete separate reflog entries': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit file &&
-		test_commit file2 &&
-		test_commit file3 &&
-		test_commit file4 &&
-		git reflog >actual &&
-		grep file3 actual &&
+ok 29 - conditional include, gitdir matching symlink, icase
 
-		git reflog delete HEAD@{1} &&
-		git reflog >actual &&
-		! grep file3 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 00d7e56] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-[main e047176] file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2.t
-[main 9ff9783] file3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3.t
-[main ff4d285] file4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4.t
-9ff9783 HEAD@{1}: commit: file3
-ok 68 - reflog: can delete separate reflog entries
+Switched to a new branch 'main'
+Switched to a new branch 'foo-branch'
+ok 30 - conditional include, onbranch
 
-expecting success of 0610.69 'reflog: can switch to previous branch': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit file1 &&
-		git checkout -b branch1 &&
-		test_commit file2 &&
-		git checkout -b branch2 &&
-		git switch - &&
-		git rev-parse --symbolic-full-name HEAD >actual &&
-		echo refs/heads/branch1 >expect &&
-		test_cmp actual expect
-	)
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 88ef297] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-Switched to a new branch 'branch1'
-[branch1 14114a6] file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2.t
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-ok 69 - reflog: can switch to previous branch
+	echo 10 >expect &&
+	git checkout -b foo-branch/a/b/c &&
+	git config test.ten >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0610.70 'reflog: copying branch writes reflog entry': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit file1 &&
-		test_commit file2 &&
-		oid=$(git rev-parse --short HEAD) &&
-		git branch src &&
-		cat >expect <<-EOF &&
-		${oid} dst@{0}: Branch: copied refs/heads/src to refs/heads/dst
-		${oid} dst@{1}: branch: Created from main
-		EOF
-		git branch -c src dst &&
-		git reflog dst >actual &&
-		test_cmp expect actual
-	)
+	git checkout -b moo-bar/a &&
+	git config test.ten >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 88ef297] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-[main 14114a6] file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2.t
-ok 70 - reflog: copying branch writes reflog entry
+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 0610.71 'reflog: renaming branch writes reflog entry': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		git symbolic-ref HEAD refs/heads/before &&
-		test_commit file &&
-		git show-ref >expected.refs &&
-		sed s/before/after/g <expected.refs >expected &&
-		git branch -M after &&
-		git show-ref >actual &&
-		test_cmp expected actual &&
-		echo refs/heads/after >expected &&
-		git symbolic-ref HEAD >actual &&
-		test_cmp expected 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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[before (root-commit) 00d7e56] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 71 - reflog: renaming branch writes reflog entry
+	echo 11 >expect &&
+	git checkout -b foo-dir/a/b/c &&
+	git config test.eleven >actual &&
+	test_cmp expect actual
 
-expecting success of 0610.72 'reflog: can store empty logs': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
+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 /
 
-		test_must_fail test-tool ref-store main reflog-exists refs/heads/branch &&
-		test-tool ref-store main create-reflog refs/heads/branch &&
-		test-tool ref-store main reflog-exists refs/heads/branch &&
-		test-tool ref-store main for-each-reflog-ent-reverse refs/heads/branch >actual &&
-		test_must_be_empty 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-ok 72 - reflog: can store empty logs
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/cycle/
+fatal: exceeded maximum include depth (10) while including
+ok 33 - include cycles are detected
 
-expecting success of 0610.73 'reflog: expiry empties reflog': 
+expecting success of 1305.34 'onbranch with unborn branch': 
 	test_when_finished "rm -rf repo" &&
 	git init repo &&
 	(
 		cd repo &&
-
-		test_commit initial &&
-		git checkout -b branch &&
-		test_commit fileA &&
-		test_commit fileB &&
-
-		cat >expect <<-EOF &&
-		commit: fileB
-		commit: fileA
-		branch: Created from HEAD
-		EOF
-		git reflog show --format="%gs" refs/heads/branch >actual &&
-		test_cmp expect actual &&
-
-		git reflog expire branch --expire=all &&
-		git reflog show --format="%gs" refs/heads/branch >actual &&
-		test_must_be_empty actual &&
-		test-tool ref-store main reflog-exists refs/heads/branch
+		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.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 96ce1d0] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'branch'
-[branch a5a0c4a] fileA
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA.t
-[branch f95cb17] fileB
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileB.t
-ok 73 - reflog: expiry empties reflog
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1305-config-include/repo/.git/
+baz
+ok 34 - onbranch with unborn branch
 
-expecting success of 0610.74 'reflog: can be deleted': 
+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 &&
-		test-tool ref-store main reflog-exists refs/heads/main &&
-		test-tool ref-store main delete-reflog refs/heads/main &&
-		test_must_fail test-tool ref-store main reflog-exists refs/heads/main
+		git switch --detach HEAD &&
+		test_must_fail git config get foo.bar
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 96ce1d0] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-ok 74 - reflog: can be deleted
-
-expecting success of 0610.75 'reflog: garbage collection deletes reflog entries': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		for count in $(test_seq 1 10)
-		do
-			test_commit "number $count" file.t $count number-$count ||
-			return 1
-		done &&
-		git reflog refs/heads/main >actual &&
-		test_line_count = 10 actual &&
-		grep "commit (initial): number 1" actual &&
-		grep "commit: number 10" actual &&
-
-		git gc &&
-		git reflog refs/heads/main >actual &&
-		test_line_count = 0 actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) e67d185] number 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-[main f156d57] number 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9077452] number 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 02eb257] number 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 831ad6a] number 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e99bc3d] number 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 747cd61] number 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 5cd813b] number 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 1744c73] number 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2a06617] number 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-e67d185 refs/heads/main@{9}: commit (initial): number 1
-2a06617 refs/heads/main@{0}: commit: number 10
-ok 75 - reflog: garbage collection deletes reflog entries
-
-expecting success of 0610.76 'reflog: updates via HEAD update HEAD reflog': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit main-one &&
-		git checkout -b new-branch &&
-		test_commit new-one &&
-		test_commit new-two &&
-
-		echo new-one >expect &&
-		git log -1 --format=%s HEAD@{1} >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 54e8446] main-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main-one.t
-Switched to a new branch 'new-branch'
-[new-branch f5aadd6] new-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-one.t
-[new-branch a6436fc] new-two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-two.t
-ok 76 - reflog: updates via HEAD update HEAD reflog
-
-expecting success of 0610.77 'branch: copying branch with D/F conflict': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		git branch branch &&
-		cat >expect <<-EOF &&
-		error: ${SQ}refs/heads/branch${SQ} exists; cannot create ${SQ}refs/heads/branch/moved${SQ}
-		fatal: branch copy failed
-		EOF
-		test_must_fail git branch -c branch branch/moved 2>err &&
-		test_cmp expect err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) f5f692f] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 77 - branch: copying branch with D/F conflict
-
-expecting success of 0610.78 'branch: moving branch with D/F conflict': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		git branch branch &&
-		git branch conflict &&
-		cat >expect <<-EOF &&
-		error: ${SQ}refs/heads/conflict${SQ} exists; cannot create ${SQ}refs/heads/conflict/moved${SQ}
-		fatal: branch rename failed
-		EOF
-		test_must_fail git branch -m branch conflict/moved 2>err &&
-		test_cmp expect err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) f5f692f] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 78 - branch: moving branch with D/F conflict
-
-expecting success of 0610.79 'worktree: adding worktree creates separate stack': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	git -C repo worktree add ../worktree &&
-	test_path_is_file repo/.git/worktrees/worktree/refs/heads &&
-	echo "ref: refs/heads/.invalid" >expect &&
-	test_cmp expect repo/.git/worktrees/worktree/HEAD &&
-	test_path_is_dir repo/.git/worktrees/worktree/reftable &&
-	test_path_is_file repo/.git/worktrees/worktree/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) f5f692f] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at f5f692f A
-ok 79 - worktree: adding worktree creates separate stack
-
-expecting success of 0610.80 'worktree: pack-refs in main repo packs main refs': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
-	git -C repo worktree add ../worktree &&
-	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
-	git -C worktree update-ref refs/worktree/per-worktree HEAD &&
-
-	test_line_count = 4 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 3 repo/.git/reftable/tables.list &&
-	git -C repo pack-refs &&
-	test_line_count = 4 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) f3cb7ed] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at f3cb7ed A
-ok 80 - worktree: pack-refs in main repo packs main refs
-
-expecting success of 0610.81 'worktree: pack-refs in worktree packs worktree refs': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
-	git -C repo worktree add ../worktree &&
-	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
-	git -C worktree update-ref refs/worktree/per-worktree HEAD &&
-
-	test_line_count = 4 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 3 repo/.git/reftable/tables.list &&
-	git -C worktree pack-refs &&
-	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 3 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) cf83a65] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at cf83a65 A
-ok 81 - worktree: pack-refs in worktree packs worktree refs
-
-expecting success of 0610.82 'worktree: creating shared ref updates main stack': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	git -C repo worktree add ../worktree &&
-	git -C repo pack-refs &&
-	git -C worktree pack-refs &&
-	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list &&
-
-	GIT_TEST_REFTABLE_AUTOCOMPACTION=false \
-	git -C worktree update-ref refs/heads/shared HEAD &&
-	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 2 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 844bede] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at 844bede A
-ok 82 - worktree: creating shared ref updates main stack
-
-expecting success of 0610.83 'worktree: creating per-worktree ref updates worktree stack': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	git -C repo worktree add ../worktree &&
-	git -C repo pack-refs &&
-	git -C worktree pack-refs &&
-	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list &&
-
-	git -C worktree update-ref refs/bisect/per-worktree HEAD &&
-	test_line_count = 2 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 4b15ad9] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at 4b15ad9 A
-ok 83 - worktree: creating per-worktree ref updates worktree stack
-
-expecting success of 0610.84 'worktree: creating per-worktree ref from main repo': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	git -C repo worktree add ../worktree &&
-	git -C repo pack-refs &&
-	git -C worktree pack-refs &&
-	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list &&
-
-	git -C repo update-ref worktrees/worktree/refs/bisect/per-worktree HEAD &&
-	test_line_count = 2 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) bee2885] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at bee2885 A
-ok 84 - worktree: creating per-worktree ref from main repo
-
-expecting success of 0610.85 'worktree: creating per-worktree ref from second worktree': 
-	test_when_finished "rm -rf repo wt1 wt2" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	git -C repo worktree add ../wt1 &&
-	git -C repo worktree add ../wt2 &&
-	git -C repo pack-refs &&
-	git -C wt1 pack-refs &&
-	git -C wt2 pack-refs &&
-	test_line_count = 1 repo/.git/worktrees/wt1/reftable/tables.list &&
-	test_line_count = 1 repo/.git/worktrees/wt2/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list &&
-
-	git -C wt1 update-ref worktrees/wt2/refs/bisect/per-worktree HEAD &&
-	test_line_count = 1 repo/.git/worktrees/wt1/reftable/tables.list &&
-	test_line_count = 2 repo/.git/worktrees/wt2/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) c7da95b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'wt1')
-HEAD is now at c7da95b A
-Preparing worktree (new branch 'wt2')
-HEAD is now at c7da95b A
-ok 85 - worktree: creating per-worktree ref from second worktree
-
-expecting success of 0610.86 'worktree: can create shared and per-worktree ref in one transaction': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo A &&
-
-	git -C repo worktree add ../worktree &&
-	git -C repo pack-refs &&
-	git -C worktree pack-refs &&
-	test_line_count = 1 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 1 repo/.git/reftable/tables.list &&
-
-	cat >stdin <<-EOF &&
-	create worktrees/worktree/refs/bisect/per-worktree HEAD
-	create refs/branches/shared HEAD
-	EOF
-	git -C repo update-ref --stdin <stdin &&
-	test_line_count = 2 repo/.git/worktrees/worktree/reftable/tables.list &&
-	test_line_count = 2 repo/.git/reftable/tables.list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) b29bec6] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at b29bec6 A
-ok 86 - worktree: can create shared and per-worktree ref in one transaction
-
-expecting success of 0610.87 'worktree: can access common refs': 
-	test_when_finished "rm -rf repo worktree" &&
-	git init repo &&
-	test_commit -C repo file1 &&
-	git -C repo branch branch1 &&
-	git -C repo worktree add ../worktree &&
-
-	echo refs/heads/worktree >expect &&
-	git -C worktree symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	git -C worktree checkout branch1
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 42d7a58] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-Preparing worktree (new branch 'worktree')
-HEAD is now at 42d7a58 file1
-Switched to branch 'branch1'
-ok 87 - worktree: can access common refs
-
-expecting success of 0610.88 'worktree: adds worktree with detached HEAD': 
-	test_when_finished "rm -rf repo worktree" &&
-
-	git init repo &&
-	test_commit -C repo A &&
-	git -C repo rev-parse main >expect &&
-
-	git -C repo worktree add --detach ../worktree main &&
-	git -C worktree rev-parse HEAD >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) 10f6cc5] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (detached HEAD 10f6cc5)
-HEAD is now at 10f6cc5 A
-ok 88 - worktree: adds worktree with detached HEAD
+HEAD is now at 24b24cf initial
+ok 35 - onbranch with detached HEAD
 
-expecting success of 0610.89 'fetch: accessing FETCH_HEAD special ref works': 
-	test_when_finished "rm -rf repo sub" &&
+expecting success of 1305.36 'onbranch without repository': 
+	test_when_finished "rm -f .gitconfig config.inc" &&
+	git config set -f .gitconfig "includeIf.onbranch:**.path" config.inc &&
+	git config set -f config.inc foo.bar baz &&
+	git config get foo.bar &&
+	test_must_fail nongit git config get foo.bar
 
-	git init sub &&
-	test_commit -C sub two &&
-	git -C sub rev-parse HEAD >expect &&
+baz
+ok 36 - onbranch without repository
 
-	git init repo &&
-	test_commit -C repo one &&
-	git -C repo fetch ../sub &&
-	git -C repo rev-parse FETCH_HEAD >actual &&
-	test_cmp expect actual
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/sub/.git/
-[main (root-commit) c1d57c8] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0610-reftable-basics/repo/.git/
-[main (root-commit) ef23b68] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-From ../sub
- * branch            HEAD       -> FETCH_HEAD
-ok 89 - fetch: accessing FETCH_HEAD special ref works
+baz
+ok 37 - onbranch without repository but explicit nonexistent Git directory
 
-# passed all 89 test(s)
-1..89
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1309-early-config.sh ***
@@ -51929,82 +51618,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1350-config-hooks-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1006-cat-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1006-cat-file/.git/
 expecting success of 1006.1 'usage: cmdmode -e -p': 
@@ -58293,6 +57906,82 @@
 1..369
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1350-config-hooks-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1308-config-set.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1308-config-set/.git/
 expecting success of 1308.1 'setup default config': 
@@ -58850,6 +58539,295 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1406-submodule-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1406-submodule-ref-store/.git/
+expecting success of 1406.1 'setup': 
+	git init sub &&
+	(
+		cd sub &&
+		test_commit first &&
+		git checkout -b new-main &&
+		git tag -a -m new-tag new-tag HEAD
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1406-submodule-ref-store/sub/.git/
+[main (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Switched to a new branch 'new-main'
+ok 1 - setup
+
+expecting success of 1406.2 'pack_refs() not allowed': 
+	test_must_fail $RUN pack-refs 3
+
+fatal: unknown function pack-refs
+ok 2 - pack_refs() not allowed
+
+expecting success of 1406.3 'create_symref() not allowed': 
+	test_must_fail $RUN create-symref FOO refs/heads/main nothing
+
+BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
+ok 3 - create_symref() not allowed
+
+expecting success of 1406.4 'delete_refs() not allowed': 
+	test_must_fail $RUN delete-refs 0 nothing FOO refs/tags/new-tag
+
+BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
+ok 4 - delete_refs() not allowed
+
+expecting success of 1406.5 'rename_refs() not allowed': 
+	test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
+
+BUG: refs/files-backend.c:159: operation rename_ref requires abilities 0x2, but only have 0x5
+ok 5 - rename_refs() not allowed
+
+expecting success of 1406.6 'for_each_ref(refs/heads/)': 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	cat >expected <<-\EOF &&
+	main 0x0
+	new-main 0x0
+	EOF
+	test_cmp expected actual
+
+ok 6 - for_each_ref(refs/heads/)
+
+expecting success of 1406.7 'for_each_ref() is sorted': 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	sort actual > expected &&
+	test_cmp expected actual
+
+ok 7 - for_each_ref() is sorted
+
+expecting success of 1406.8 'resolve_ref(main)': 
+	SHA1=`git -C sub rev-parse main` &&
+	echo "$SHA1 refs/heads/main 0x0" >expected &&
+	$RUN resolve-ref refs/heads/main 0 >actual &&
+	test_cmp expected actual
+
+ok 8 - resolve_ref(main)
+
+expecting success of 1406.9 'verify_ref(new-main)': 
+	$RUN verify-ref refs/heads/new-main
+
+ok 9 - verify_ref(new-main)
+
+expecting success of 1406.10 'for_each_reflog()': 
+	$RUN for-each-reflog >actual &&
+	cat >expected <<-\EOF &&
+	HEAD
+	refs/heads/main
+	refs/heads/new-main
+	EOF
+	test_cmp expected actual
+
+ok 10 - for_each_reflog()
+
+expecting success of 1406.11 'for_each_reflog_ent()': 
+	$RUN for-each-reflog-ent HEAD >actual &&
+	head -n1 actual | grep first &&
+	tail -n1 actual | grep main.to.new
+
+0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
+50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
+ok 11 - for_each_reflog_ent()
+
+expecting success of 1406.12 'for_each_reflog_ent_reverse()': 
+	$RUN for-each-reflog-ent-reverse HEAD >actual &&
+	head -n1 actual | grep main.to.new &&
+	tail -n1 actual | grep first
+
+50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
+0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
+ok 12 - for_each_reflog_ent_reverse()
+
+expecting success of 1406.13 'reflog_exists(HEAD)': 
+	$RUN reflog-exists HEAD
+
+ok 13 - reflog_exists(HEAD)
+
+expecting success of 1406.14 'delete_reflog() not allowed': 
+	test_must_fail $RUN delete-reflog HEAD
+
+BUG: refs/files-backend.c:159: operation delete_reflog requires abilities 0x2, but only have 0x5
+ok 14 - delete_reflog() not allowed
+
+expecting success of 1406.15 'create-reflog() not allowed': 
+	test_must_fail $RUN create-reflog HEAD
+
+BUG: refs/files-backend.c:159: operation create_reflog requires abilities 0x2, but only have 0x5
+ok 15 - create-reflog() not allowed
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1405-main-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1401-symbolic-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1401-symbolic-ref/.git/
 expecting success of 1401.1 'setup': 
@@ -59473,293 +59451,116 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1406-submodule-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1406-submodule-ref-store/.git/
-expecting success of 1406.1 'setup': 
-	git init sub &&
+*** t1407-worktree-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 sub &&
-		test_commit first &&
-		git checkout -b new-main &&
-		git tag -a -m new-tag new-tag HEAD
+		cd wt &&
+		test_commit second
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1406-submodule-ref-store/sub/.git/
 [main (root-commit) 50e526b] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 first.t
-Switched to a new branch 'new-main'
-ok 1 - setup
-
-expecting success of 1406.2 'pack_refs() not allowed': 
-	test_must_fail $RUN pack-refs 3
-
-fatal: unknown function pack-refs
-ok 2 - pack_refs() not allowed
-
-expecting success of 1406.3 'create_symref() not allowed': 
-	test_must_fail $RUN create-symref FOO refs/heads/main nothing
-
-BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
-ok 3 - create_symref() not allowed
-
-expecting success of 1406.4 'delete_refs() not allowed': 
-	test_must_fail $RUN delete-refs 0 nothing FOO refs/tags/new-tag
-
-BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
-ok 4 - delete_refs() not allowed
-
-expecting success of 1406.5 'rename_refs() not allowed': 
-	test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
-
-BUG: refs/files-backend.c:159: operation rename_ref requires abilities 0x2, but only have 0x5
-ok 5 - rename_refs() not allowed
-
-expecting success of 1406.6 'for_each_ref(refs/heads/)': 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	cat >expected <<-\EOF &&
-	main 0x0
-	new-main 0x0
-	EOF
-	test_cmp expected actual
-
-ok 6 - for_each_ref(refs/heads/)
-
-expecting success of 1406.7 'for_each_ref() is sorted': 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	sort actual > expected &&
-	test_cmp expected actual
-
-ok 7 - for_each_ref() is sorted
-
-expecting success of 1406.8 'resolve_ref(main)': 
-	SHA1=`git -C sub rev-parse main` &&
-	echo "$SHA1 refs/heads/main 0x0" >expected &&
-	$RUN resolve-ref refs/heads/main 0 >actual &&
-	test_cmp expected actual
-
-ok 8 - resolve_ref(main)
-
-expecting success of 1406.9 'verify_ref(new-main)': 
-	$RUN verify-ref refs/heads/new-main
-
-ok 9 - verify_ref(new-main)
-
-expecting success of 1406.10 'for_each_reflog()': 
-	$RUN for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	refs/heads/main
-	refs/heads/new-main
-	EOF
-	test_cmp expected actual
-
-ok 10 - for_each_reflog()
-
-expecting success of 1406.11 'for_each_reflog_ent()': 
-	$RUN for-each-reflog-ent HEAD >actual &&
-	head -n1 actual | grep first &&
-	tail -n1 actual | grep main.to.new
-
-0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
-50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
-ok 11 - for_each_reflog_ent()
-
-expecting success of 1406.12 'for_each_reflog_ent_reverse()': 
-	$RUN for-each-reflog-ent-reverse HEAD >actual &&
-	head -n1 actual | grep main.to.new &&
-	tail -n1 actual | grep first
-
-50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
-0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
-ok 12 - for_each_reflog_ent_reverse()
-
-expecting success of 1406.13 'reflog_exists(HEAD)': 
-	$RUN reflog-exists HEAD
-
-ok 13 - reflog_exists(HEAD)
-
-expecting success of 1406.14 'delete_reflog() not allowed': 
-	test_must_fail $RUN delete-reflog HEAD
-
-BUG: refs/files-backend.c:159: operation delete_reflog requires abilities 0x2, but only have 0x5
-ok 14 - delete_reflog() not allowed
-
-expecting success of 1406.15 'create-reflog() not allowed': 
-	test_must_fail $RUN create-reflog HEAD
-
-BUG: refs/files-backend.c:159: operation create_reflog requires abilities 0x2, but only have 0x5
-ok 15 - create-reflog() not allowed
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1405-main-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1405-main-ref-store/.git/
-expecting success of 1405.1 'setup': 
-	test_commit one
-
-[main (root-commit) d79ce16] one
+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 one.t
+ create mode 100644 second.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 &&
+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 &&
-	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
+	$RMAIN resolve-ref refs/heads/main 0 >actual &&
 	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 2 - resolve_ref(<shared-ref>)
 
-ok 6 - for_each_ref() is sorted
+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 &&
 
-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 &&
+	SHA1=`git rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/main 0x1" >expected &&
+	$RMAIN resolve-ref HEAD 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 3 - resolve_ref(<per-worktree-ref>)
 
-ok 8 - verify_ref(new-main)
+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 &&
 
-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
+	$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 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)
+ok 4 - create_symref(FOO, refs/heads/main)
 
-expecting success of 1405.13 'delete_reflog(HEAD)': 
-	$RUN delete-reflog HEAD &&
-	test_must_fail git reflog exists HEAD
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1408-packed-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1408-packed-refs/.git/
+expecting success of 1408.1 'setup': 
+	test_tick &&
+	git commit --allow-empty -m one &&
+	one=$(git rev-parse HEAD) &&
+	git for-each-ref >actual &&
+	echo "$one commit	refs/heads/main" >expect &&
+	test_cmp expect actual &&
 
-ok 13 - delete_reflog(HEAD)
+	git pack-refs --all &&
+	git for-each-ref >actual &&
+	echo "$one commit	refs/heads/main" >expect &&
+	test_cmp expect actual &&
 
-expecting success of 1405.14 'create-reflog(HEAD)': 
-	$RUN create-reflog HEAD &&
-	git reflog exists HEAD
+	git checkout --orphan another &&
+	test_tick &&
+	git commit --allow-empty -m two &&
+	two=$(git rev-parse HEAD) &&
+	git checkout -B main &&
+	git branch -D another &&
 
-ok 14 - create-reflog(HEAD)
+	git for-each-ref >actual &&
+	echo "$two commit	refs/heads/main" >expect &&
+	test_cmp expect actual &&
 
-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
+	git reflog expire --expire=now --all &&
+	git prune &&
+	git tag -m v1.0 v1.0 main
 
-Switched to a new branch 'foo'
-HEAD is now at ff283f4 recreate-main
-[detached HEAD 12c332b] bar-commit
+[main (root-commit) 76a57ce] one
  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)
+Switched to a new branch 'another'
+[another (root-commit) 169e1dc] two
+ Author: A U Thor <author@example.com>
+Switched to and reset branch 'main'
+Deleted branch another (was 169e1dc).
+ok 1 - setup
 
-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 --
+expecting success of 1408.2 'no error from stale entry in packed-refs': 
+	git describe main >actual 2>&1 &&
+	echo "v1.0" >expect &&
+	test_cmp expect actual
 
-HEAD is now at 12c332b bar-commit
-fatal: bad revision 'refs/heads/foo'
-ok 16 - delete_ref(refs/heads/foo)
+ok 2 - no error from stale entry in packed-refs
 
-# passed all 16 test(s)
-1..16
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1402-check-ref-format.sh ***
@@ -60344,164 +60145,6 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1407-worktree-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1408-packed-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1408-packed-refs/.git/
-expecting success of 1408.1 'setup': 
-	test_tick &&
-	git commit --allow-empty -m one &&
-	one=$(git rev-parse HEAD) &&
-	git for-each-ref >actual &&
-	echo "$one commit	refs/heads/main" >expect &&
-	test_cmp expect actual &&
-
-	git pack-refs --all &&
-	git for-each-ref >actual &&
-	echo "$one commit	refs/heads/main" >expect &&
-	test_cmp expect actual &&
-
-	git checkout --orphan another &&
-	test_tick &&
-	git commit --allow-empty -m two &&
-	two=$(git rev-parse HEAD) &&
-	git checkout -B main &&
-	git branch -D another &&
-
-	git for-each-ref >actual &&
-	echo "$two commit	refs/heads/main" >expect &&
-	test_cmp expect actual &&
-
-	git reflog expire --expire=now --all &&
-	git prune &&
-	git tag -m v1.0 v1.0 main
-
-[main (root-commit) 76a57ce] one
- Author: A U Thor <author@example.com>
-Switched to a new branch 'another'
-[another (root-commit) 169e1dc] two
- Author: A U Thor <author@example.com>
-Switched to and reset branch 'main'
-Deleted branch another (was 169e1dc).
-ok 1 - setup
-
-expecting success of 1408.2 'no error from stale entry in packed-refs': 
-	git describe main >actual 2>&1 &&
-	echo "v1.0" >expect &&
-	test_cmp expect actual
-
-ok 2 - no error from stale entry in packed-refs
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1412-reflog-loop.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1412-reflog-loop/.git/
-expecting success of 1412.1 'setup commits': 
-	test_commit one file content &&
-	test_commit --append two file content
-
-[master (root-commit) e46513e] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 98995b2] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup commits
-
-expecting success of 1412.2 'setup reflog with alternating commits': 
-	git checkout -b topic &&
-	git reset one &&
-	git reset two &&
-	git reset one &&
-	git reset two
-
-Switched to a new branch 'topic'
-Unstaged changes after reset:
-M	file
-Unstaged changes after reset:
-M	file
-ok 2 - setup reflog with alternating commits
-
-expecting success of 1412.3 'reflog shows all entries': 
-	cat >expect <<-\EOF &&
-		topic@{0} reset: moving to two
-		topic@{1} reset: moving to one
-		topic@{2} reset: moving to two
-		topic@{3} reset: moving to one
-		topic@{4} branch: Created from HEAD
-	EOF
-	git log -g --format="%gd %gs" topic >actual &&
-	test_cmp expect actual
-
-ok 3 - reflog shows all entries
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1404-update-ref-errors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1404-update-ref-errors/.git/
 expecting success of 1404.1 'setup': 
@@ -60981,6 +60624,52 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1412-reflog-loop.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1412-reflog-loop/.git/
+expecting success of 1412.1 'setup commits': 
+	test_commit one file content &&
+	test_commit --append two file content
+
+[master (root-commit) e46513e] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 98995b2] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup commits
+
+expecting success of 1412.2 'setup reflog with alternating commits': 
+	git checkout -b topic &&
+	git reset one &&
+	git reset two &&
+	git reset one &&
+	git reset two
+
+Switched to a new branch 'topic'
+Unstaged changes after reset:
+M	file
+Unstaged changes after reset:
+M	file
+ok 2 - setup reflog with alternating commits
+
+expecting success of 1412.3 'reflog shows all entries': 
+	cat >expect <<-\EOF &&
+		topic@{0} reset: moving to two
+		topic@{1} reset: moving to one
+		topic@{2} reset: moving to two
+		topic@{3} reset: moving to one
+		topic@{4} branch: Created from HEAD
+	EOF
+	git log -g --format="%gd %gs" topic >actual &&
+	test_cmp expect actual
+
+ok 3 - reflog shows all entries
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1413-reflog-detach.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1413-reflog-detach/.git/
 expecting success of 1413.1 'setup': 
@@ -61533,16465 +61222,11646 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0450-txt-doc-vs-help.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0450-txt-doc-vs-help/.git/
-expecting success of 0450.1 'setup: list of builtins': 
-	git --list-cmds=builtins >builtins
+*** t1415-worktree-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1415-worktree-refs/.git/
+expecting success of 1415.1 'setup': 
+	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
 
-ok 1 - setup: list of builtins
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[master 42fba42] wt1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wt1.t
+[master 83df652] wt2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wt2.t
+Preparing worktree (detached HEAD 42fba42)
+HEAD is now at 42fba42 wt1
+Preparing worktree (detached HEAD 83df652)
+HEAD is now at 83df652 wt2
+Note: switching to 'initial'.
 
-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
-		BUG "please keep the list of txt and help mismatches sorted"
-	fi
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 2 - list of txt and help mismatches is sorted
+If you want to 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 0450.3 'add -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 3 - add -h output has no \t
+  git switch -c <new-branch-name>
 
-expecting success of 0450.4 'add -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 4 - add -h output has dashed labels
+Or undo this operation with:
 
-expecting success of 0450.5 'add -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 5 - add -h output has consistent spacing
+  git switch -
 
-expecting success of 0450.6 'add *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 6 - add *.txt SYNOPSIS has dashed labels
+Turn off this advice by setting config variable advice.detachedHead to false
 
-checking known breakage of 0450.7 'add -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+HEAD is now at 24b24cf initial
+ok 1 - setup
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:22.833451180 +0000
-+++ help	2025-02-09 06:53:22.837451205 +0000
-@@ -1,5 +1 @@
--git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
--        [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]
--        [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
--        [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
--        [--] [<pathspec>...]
-+git add [<options>] [--] <pathspec>...
-not ok 7 - add -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1415.2 'refs/worktree are per-worktree': 
+	test_cmp_rev worktree/foo initial &&
+	( cd wt1 && test_cmp_rev worktree/foo wt1 ) &&
+	( cd wt2 && test_cmp_rev worktree/foo wt2 )
 
-expecting success of 0450.8 'am -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 8 - am -h output has no \t
+ok 2 - refs/worktree are per-worktree
 
-expecting success of 0450.9 'am -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 9 - am -h output has dashed labels
+expecting success of 1415.3 'resolve main-worktree/HEAD': 
+	test_cmp_rev main-worktree/HEAD initial &&
+	( cd wt1 && test_cmp_rev main-worktree/HEAD initial ) &&
+	( cd wt2 && test_cmp_rev main-worktree/HEAD initial )
 
-expecting success of 0450.10 'am -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 10 - am -h output has consistent spacing
+ok 3 - resolve main-worktree/HEAD
 
-expecting success of 0450.11 'am *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 11 - am *.txt SYNOPSIS has dashed labels
+expecting success of 1415.4 'ambiguous main-worktree/HEAD': 
+	test_when_finished git update-ref -d refs/heads/main-worktree/HEAD &&
+	git update-ref refs/heads/main-worktree/HEAD $(git rev-parse HEAD) &&
+	git rev-parse main-worktree/HEAD 2>warn &&
+	grep "main-worktree/HEAD.*ambiguous" warn
 
-checking known breakage of 0450.12 'am -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+warning: refname 'main-worktree/HEAD' is ambiguous.
+ok 4 - ambiguous main-worktree/HEAD
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:22.881451485 +0000
-+++ help	2025-02-09 06:53:22.889451536 +0000
-@@ -1,10 +1,2 @@
--git am [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
--       [--[no-]3way] [--interactive] [--committer-date-is-author-date]
--       [--ignore-date] [--ignore-space-change | --ignore-whitespace]
--       [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
--       [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
--       [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
--       [--quoted-cr=<action>]
--       [--empty=(stop|drop|keep)]
--       [(<mbox> | <Maildir>)...]
--git am (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)
-+git am [<options>] [(<mbox> | <Maildir>)...]
-+git am [<options>] (--continue | --skip | --abort)
-not ok 12 - am -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1415.5 'resolve worktrees/xx/HEAD': 
+	test_cmp_rev worktrees/wt1/HEAD wt1 &&
+	( cd wt1 && test_cmp_rev worktrees/wt1/HEAD wt1 ) &&
+	( cd wt2 && test_cmp_rev worktrees/wt1/HEAD wt1 )
 
-expecting success of 0450.13 'annotate -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 13 - annotate -h output has no \t
+ok 5 - resolve worktrees/xx/HEAD
 
-expecting success of 0450.14 'annotate -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 14 - annotate -h output has dashed labels
+expecting success of 1415.6 'ambiguous worktrees/xx/HEAD': 
+	git update-ref refs/heads/worktrees/wt1/HEAD $(git rev-parse HEAD) &&
+	test_when_finished git update-ref -d refs/heads/worktrees/wt1/HEAD &&
+	git rev-parse worktrees/wt1/HEAD 2>warn &&
+	grep "worktrees/wt1/HEAD.*ambiguous" warn
 
-expecting success of 0450.15 'annotate -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 15 - annotate -h output has consistent spacing
+42fba42569eaa325aaade18832dfa5432d54ffd1
+warning: refname 'worktrees/wt1/HEAD' is ambiguous.
+ok 6 - ambiguous worktrees/xx/HEAD
 
-expecting success of 0450.16 'annotate *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 16 - annotate *.txt SYNOPSIS has dashed labels
+expecting success of 1415.7 'reflog of main-worktree/HEAD': 
+	git reflog HEAD | sed "s/HEAD/main-worktree\/HEAD/" >expected &&
+	git reflog main-worktree/HEAD >actual &&
+	test_cmp expected actual &&
+	git -C wt1 reflog main-worktree/HEAD >actual.wt1 &&
+	test_cmp expected actual.wt1
 
-expecting success of 0450.17 'annotate -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 7 - reflog of main-worktree/HEAD
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 17 - annotate -h output and SYNOPSIS agree
+expecting success of 1415.8 'reflog of worktrees/xx/HEAD': 
+	git -C wt2 reflog HEAD | sed "s/HEAD/worktrees\/wt2\/HEAD/" >expected &&
+	git reflog worktrees/wt2/HEAD >actual &&
+	test_cmp expected actual &&
+	git -C wt1 reflog worktrees/wt2/HEAD >actual.wt1 &&
+	test_cmp expected actual.wt1 &&
+	git -C wt2 reflog worktrees/wt2/HEAD >actual.wt2 &&
+	test_cmp expected actual.wt2
 
-expecting success of 0450.18 'apply -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 18 - apply -h output has no \t
+ok 8 - reflog of worktrees/xx/HEAD
 
-expecting success of 0450.19 'apply -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 19 - apply -h output has dashed labels
+expecting success of 1415.9 'for-each-ref from main worktree': 
+	mkdir fer1 &&
+	git -C fer1 init repo &&
+	test_commit -C fer1/repo initial &&
+	git -C fer1/repo worktree add ../second &&
+	git -C fer1/repo update-ref refs/bisect/first HEAD &&
+	git -C fer1/repo update-ref refs/rewritten/first HEAD &&
+	git -C fer1/repo update-ref refs/worktree/first HEAD &&
+	git -C fer1/repo for-each-ref --format="%(refname)" | grep first >actual &&
+	cat >expected <<-\EOF &&
+	refs/bisect/first
+	refs/rewritten/first
+	refs/worktree/first
+	EOF
+	test_cmp expected actual
 
-expecting success of 0450.20 'apply -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 20 - apply -h output has consistent spacing
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1415-worktree-refs/fer1/repo/.git/
+[master (root-commit) 1935181] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Preparing worktree (new branch 'second')
+HEAD is now at 1935181 initial
+ok 9 - for-each-ref from main worktree
 
-expecting success of 0450.21 'apply *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 21 - apply *.txt SYNOPSIS has dashed labels
+expecting success of 1415.10 'for-each-ref from linked worktree': 
+	mkdir fer2 &&
+	git -C fer2 init repo &&
+	test_commit -C fer2/repo initial &&
+	git -C fer2/repo worktree add ../second &&
+	git -C fer2/second update-ref refs/bisect/second HEAD &&
+	git -C fer2/second update-ref refs/rewritten/second HEAD &&
+	git -C fer2/second update-ref refs/worktree/second HEAD &&
+	git -C fer2/second for-each-ref --format="%(refname)" | grep second >actual &&
+	cat >expected <<-\EOF &&
+	refs/bisect/second
+	refs/heads/second
+	refs/rewritten/second
+	refs/worktree/second
+	EOF
+	test_cmp expected actual
 
-checking known breakage of 0450.22 'apply -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1415-worktree-refs/fer2/repo/.git/
+[master (root-commit) 23fa7ba] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Preparing worktree (new branch 'second')
+HEAD is now at 23fa7ba initial
+ok 10 - for-each-ref from linked worktree
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:22.969452045 +0000
-+++ help	2025-02-09 06:53:22.973452070 +0000
-@@ -1,9 +1 @@
--git apply [--stat] [--numstat] [--summary] [--check]
--          [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
--          [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
--          [--allow-binary-replacement | --binary] [--reject] [-z]
--          [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
--          [--ignore-space-change | --ignore-whitespace]
--          [--whitespace=(nowarn|warn|fix|error|error-all)]
--          [--exclude=<path>] [--include=<path>] [--directory=<root>]
--          [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
-+git apply [<options>] [<patch>...]
-not ok 22 - apply -h output and SYNOPSIS agree # TODO known breakage
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1416-ref-transaction-hooks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1416-ref-transaction-hooks/.git/
+expecting success of 1416.1 'setup': 
+	test_commit PRE &&
+	PRE_OID=$(git rev-parse PRE) &&
+	test_commit POST &&
+	POST_OID=$(git rev-parse POST)
 
-expecting success of 0450.23 'archive -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 23 - archive -h output has no \t
+[main (root-commit) 63ac8e7] PRE
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 PRE.t
+[main 99d5316] POST
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 POST.t
+ok 1 - setup
 
-expecting success of 0450.24 'archive -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 24 - archive -h output has dashed labels
+expecting success of 1416.2 'hook allows updating ref if successful': 
+	git reset --hard PRE &&
+	test_hook reference-transaction <<-\EOF &&
+		echo "$*" >>actual
+	EOF
+	cat >expect <<-EOF &&
+		prepared
+		committed
+	EOF
+	git update-ref HEAD POST &&
+	test_cmp expect actual
 
-expecting success of 0450.25 'archive -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
+HEAD is now at 63ac8e7 PRE
+ok 2 - hook allows updating ref if successful
+
+expecting success of 1416.3 'hook aborts updating ref in prepared state': 
+	git reset --hard PRE &&
+	test_hook reference-transaction <<-\EOF &&
+		if test "$1" = prepared
 		then
-			test_line_count = 1 help.ws
+			exit 1
 		fi
-	
-ok 25 - archive -h output has consistent spacing
+	EOF
+	test_must_fail git update-ref HEAD POST 2>err &&
+	test_grep "ref updates aborted by hook" err
 
-expecting success of 0450.26 'archive *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 26 - archive *.txt SYNOPSIS has dashed labels
+HEAD is now at 63ac8e7 PRE
+fatal: ref updates aborted by hook
+ok 3 - hook aborts updating ref in prepared state
 
-checking known breakage of 0450.27 'archive -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
+expecting success of 1416.4 'hook gets all queued updates in prepared state': 
+	test_when_finished "rm actual" &&
+	git reset --hard PRE &&
+	test_hook reference-transaction <<-\EOF &&
+		if test "$1" = prepared
 		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			while read -r line
+			do
+				printf "%s\n" "$line"
+			done >actual
+		fi
+	EOF
+	cat >expect <<-EOF &&
+		$ZERO_OID $POST_OID refs/heads/main
+	EOF
+	git update-ref HEAD POST <<-EOF &&
+		update HEAD $ZERO_OID $POST_OID
+		update refs/heads/main $ZERO_OID $POST_OID
+	EOF
+	test_cmp expect actual
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.009452299 +0000
-+++ help	2025-02-09 06:53:23.013452325 +0000
-@@ -1,4 +1,4 @@
--git archive [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
--            [-o <file> | --output=<file>] [--worktree-attributes]
--            [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
--            [<path>...]
-+git archive [<options>] <tree-ish> [<path>...]
-+git archive --list
-+git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]
-+git archive --remote <repo> [--exec <cmd>] --list
-not ok 27 - archive -h output and SYNOPSIS agree # TODO known breakage
+HEAD is now at 63ac8e7 PRE
+ok 4 - hook gets all queued updates in prepared state
 
-expecting success of 0450.28 'bisect -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 28 - bisect -h output has no \t
+expecting success of 1416.5 'hook gets all queued updates in committed state': 
+	test_when_finished "rm actual" &&
+	git reset --hard PRE &&
+	test_hook reference-transaction <<-\EOF &&
+		if test "$1" = committed
+		then
+			while read -r line
+			do
+				printf "%s\n" "$line"
+			done >actual
+		fi
+	EOF
+	cat >expect <<-EOF &&
+		$ZERO_OID $POST_OID refs/heads/main
+	EOF
+	git update-ref HEAD POST &&
+	test_cmp expect actual
 
-expecting success of 0450.29 'bisect -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 29 - bisect -h output has dashed labels
+HEAD is now at 63ac8e7 PRE
+ok 5 - hook gets all queued updates in committed state
 
-expecting success of 0450.30 'bisect -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
+expecting success of 1416.6 'hook gets all queued updates in aborted state': 
+	test_when_finished "rm actual" &&
+	git reset --hard PRE &&
+	test_hook reference-transaction <<-\EOF &&
+		if test "$1" = aborted
 		then
-			test_line_count = 1 help.ws
+			while read -r line
+			do
+				printf "%s\n" "$line"
+			done >actual
 		fi
-	
-ok 30 - bisect -h output has consistent spacing
+	EOF
+	cat >expect <<-EOF &&
+		$ZERO_OID $POST_OID HEAD
+		$ZERO_OID $POST_OID refs/heads/main
+	EOF
+	git update-ref --stdin <<-EOF &&
+		start
+		update HEAD POST $ZERO_OID
+		update refs/heads/main POST $ZERO_OID
+		abort
+	EOF
+	test_cmp expect actual
 
-expecting success of 0450.31 'bisect *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 31 - bisect *.txt SYNOPSIS has dashed labels
+HEAD is now at 63ac8e7 PRE
+start: ok
+abort: ok
+ok 6 - hook gets all queued updates in aborted state
 
-checking known breakage of 0450.32 'bisect -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1416.7 'interleaving hook calls succeed': 
+	test_when_finished "rm -r target-repo.git" &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.061452630 +0000
-+++ help	2025-02-09 06:53:23.065452656 +0000
-@@ -1 +1,10 @@
--git bisect <subcommand> <options>
-+git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-+git bisect (good|bad) [<rev>...]
-+git bisect terms [--term-good | --term-bad]
-+git bisect skip [(<rev>|<range>)...]
-+git bisect next
-+git bisect reset [<commit>]
-+git bisect visualize
-+git bisect replay <logfile>
-+git bisect log
-+git bisect run <cmd> [<arg>...]
-not ok 32 - bisect -h output and SYNOPSIS agree # TODO known breakage
+	git init --bare target-repo.git &&
 
-expecting success of 0450.33 'blame -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 33 - blame -h output has no \t
+	test_hook -C target-repo.git reference-transaction <<-\EOF &&
+		echo $0 "$@" >>actual
+	EOF
 
-expecting success of 0450.34 'blame -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 34 - blame -h output has dashed labels
+	test_hook -C target-repo.git update <<-\EOF &&
+		echo $0 "$@" >>actual
+	EOF
 
-expecting success of 0450.35 'blame -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 35 - blame -h output has consistent spacing
+	cat >expect <<-EOF &&
+		hooks/update refs/tags/PRE $ZERO_OID $PRE_OID
+		hooks/reference-transaction prepared
+		hooks/reference-transaction committed
+		hooks/update refs/tags/POST $ZERO_OID $POST_OID
+		hooks/reference-transaction prepared
+		hooks/reference-transaction committed
+	EOF
 
-expecting success of 0450.36 'blame *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 36 - blame *.txt SYNOPSIS has dashed labels
+	git push ./target-repo.git PRE POST &&
+	test_cmp expect target-repo.git/actual
 
-checking known breakage of 0450.37 'blame -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1416-ref-transaction-hooks/target-repo.git/
+To ./target-repo.git
+ * [new tag]         PRE -> PRE
+ * [new tag]         POST -> POST
+ok 7 - interleaving hook calls succeed
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.101452885 +0000
-+++ help	2025-02-09 06:53:23.105452910 +0000
-@@ -1,5 +1 @@
--git blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
--          [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
--          [--ignore-rev <rev>] [--ignore-revs-file <file>]
--          [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
--          [ --contents <file> ] [<rev> | --reverse <rev>..<rev>] [--] <file>
-+git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-not ok 37 - blame -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1416.8 'hook captures git-symbolic-ref updates': 
+	test_when_finished "rm actual" &&
 
-expecting success of 0450.38 'branch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 38 - branch -h output has no \t
+	test_hook reference-transaction <<-\EOF &&
+		echo "$*" >>actual
+		while read -r line
+		do
+			printf "%s\n" "$line"
+		done >>actual
+	EOF
 
-expecting success of 0450.39 'branch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 39 - branch -h output has dashed labels
+	git symbolic-ref refs/heads/symref refs/heads/main &&
 
-expecting success of 0450.40 'branch -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 40 - branch -h output has consistent spacing
+	cat >expect <<-EOF &&
+	prepared
+	$ZERO_OID ref:refs/heads/main refs/heads/symref
+	committed
+	$ZERO_OID ref:refs/heads/main refs/heads/symref
+	EOF
 
-expecting success of 0450.41 'branch *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 41 - branch *.txt SYNOPSIS has dashed labels
+	test_cmp expect actual
 
-checking known breakage of 0450.42 'branch -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 8 - hook captures git-symbolic-ref updates
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.141453139 +0000
-+++ help	2025-02-09 06:53:23.149453190 +0000
-@@ -1,16 +1,8 @@
--git branch [--color[=<when>] | --no-color] [--show-current]
--           [-v [--abbrev=<n> | --no-abbrev]]
--           [--column[=<options>] | --no-column] [--sort=<key>]
--           [--merged [<commit>]] [--no-merged [<commit>]]
--           [--contains [<commit>]] [--no-contains [<commit>]]
--           [--points-at <object>] [--format=<format>]
--           [(-r | --remotes) | (-a | --all)]
--           [--list] [<pattern>...]
--git branch [--track[=(direct|inherit)] | --no-track] [-f]
--           [--recurse-submodules] <branchname> [<start-point>]
--git branch (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
--git branch --unset-upstream [<branchname>]
--git branch (-m | -M) [<oldbranch>] <newbranch>
--git branch (-c | -C) [<oldbranch>] <newbranch>
--git branch (-d | -D) [-r] <branchname>...
--git branch --edit-description [<branchname>]
-+git branch [<options>] [-r | -a] [--merged] [--no-merged]
-+git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-+git branch [<options>] [-l] [<pattern>...]
-+git branch [<options>] [-r] (-d | -D) <branch-name>...
-+git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-+git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-+git branch [<options>] [-r | -a] [--points-at]
-+git branch [<options>] [-r | -a] [--format]
-not ok 42 - branch -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1416.9 'hook gets all queued symref updates': 
+	test_when_finished "rm actual" &&
 
-expecting success of 0450.43 'bugreport -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 43 - bugreport -h output has no \t
+	git update-ref refs/heads/branch $POST_OID &&
+	git symbolic-ref refs/heads/symref refs/heads/main &&
+	git symbolic-ref refs/heads/symrefd refs/heads/main &&
+	git symbolic-ref refs/heads/symrefu refs/heads/main &&
 
-expecting success of 0450.44 'bugreport -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 44 - bugreport -h output has dashed labels
+	test_hook reference-transaction <<-\EOF &&
+	echo "$*" >>actual
+	while read -r line
+	do
+		printf "%s\n" "$line"
+	done >>actual
+	EOF
 
-expecting success of 0450.45 'bugreport -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 45 - bugreport -h output has consistent spacing
+	# In the files backend, "delete" also triggers an additional transaction
+	# update on the packed-refs backend, which constitutes additional reflog
+	# entries.
+	if test_have_prereq REFFILES
+	then
+		cat >expect <<-EOF
+		aborted
+		$ZERO_OID $ZERO_OID refs/heads/symrefd
+		EOF
+	else
+		>expect
+	fi &&
 
-expecting success of 0450.46 'bugreport *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 46 - bugreport *.txt SYNOPSIS has dashed labels
+	cat >>expect <<-EOF &&
+	prepared
+	ref:refs/heads/main $ZERO_OID refs/heads/symref
+	ref:refs/heads/main $ZERO_OID refs/heads/symrefd
+	$ZERO_OID ref:refs/heads/main refs/heads/symrefc
+	ref:refs/heads/main ref:refs/heads/branch refs/heads/symrefu
+	committed
+	ref:refs/heads/main $ZERO_OID refs/heads/symref
+	ref:refs/heads/main $ZERO_OID refs/heads/symrefd
+	$ZERO_OID ref:refs/heads/main refs/heads/symrefc
+	ref:refs/heads/main ref:refs/heads/branch refs/heads/symrefu
+	EOF
 
-expecting success of 0450.47 'bugreport -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	git update-ref --no-deref --stdin <<-EOF &&
+	start
+	symref-verify refs/heads/symref refs/heads/main
+	symref-delete refs/heads/symrefd refs/heads/main
+	symref-create refs/heads/symrefc refs/heads/main
+	symref-update refs/heads/symrefu refs/heads/branch ref refs/heads/main
+	prepare
+	commit
+	EOF
+	test_cmp expect actual
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 47 - bugreport -h output and SYNOPSIS agree
+start: ok
+prepare: ok
+commit: ok
+ok 9 - hook gets all queued symref updates
 
-expecting success of 0450.48 'bundle -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 48 - bundle -h output has no \t
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1420-lost-found.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 0450.49 'bundle -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 49 - bundle -h output has dashed labels
+[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 0450.50 'bundle -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 50 - bundle -h output has consistent spacing
+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)
 
-expecting success of 0450.51 'bundle *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 51 - bundle *.txt SYNOPSIS has dashed labels
+HEAD is now at 9bb1ae9 initial
+dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
+dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
+ok 2 - lost and found something
 
-expecting success of 0450.52 'bundle -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1419-exclude-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1419-exclude-refs/.git/
+expecting success of 1419.1 'setup': 
+	test_commit --no-tag base &&
+	base="$(git rev-parse HEAD)" &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 52 - bundle -h output and SYNOPSIS agree
+	for name in foo bar baz quux
+	do
+		for i in 1 2 3
+		do
+			echo "create refs/heads/$name/$i $base" || return 1
+		done || return 1
+	done >in &&
+	echo "delete refs/heads/main" >>in &&
 
-expecting success of 0450.53 'cat-file -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 53 - cat-file -h output has no \t
+	git update-ref --stdin <in &&
+	git pack-refs --all
 
-expecting success of 0450.54 'cat-file -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 54 - cat-file -h output has dashed labels
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 1 - setup
 
-expecting success of 0450.55 'cat-file -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 55 - cat-file -h output has consistent spacing
+expecting success of 1419.2 'excluded region in middle': 
+	for_each_ref__exclude refs/heads refs/heads/foo >actual 2>perf &&
+	for_each_ref refs/heads/bar refs/heads/baz refs/heads/quux >expect &&
 
-expecting success of 0450.56 'cat-file *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 56 - cat-file *.txt SYNOPSIS has dashed labels
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-expecting success of 0450.57 'cat-file -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 2 - excluded region in middle
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 57 - cat-file -h output and SYNOPSIS agree
+expecting success of 1419.3 'excluded region at beginning': 
+	for_each_ref__exclude refs/heads refs/heads/bar >actual 2>perf &&
+	for_each_ref refs/heads/baz refs/heads/foo refs/heads/quux >expect &&
 
-expecting success of 0450.58 'check-attr -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 58 - check-attr -h output has no \t
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-expecting success of 0450.59 'check-attr -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 59 - check-attr -h output has dashed labels
+ok 3 - excluded region at beginning
 
-expecting success of 0450.60 'check-attr -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 60 - check-attr -h output has consistent spacing
+expecting success of 1419.4 'excluded region at end': 
+	for_each_ref__exclude refs/heads refs/heads/quux >actual 2>perf &&
+	for_each_ref refs/heads/foo refs/heads/bar refs/heads/baz >expect &&
 
-expecting success of 0450.61 'check-attr *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 61 - check-attr *.txt SYNOPSIS has dashed labels
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-expecting success of 0450.62 'check-attr -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 4 - excluded region at end
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 62 - check-attr -h output and SYNOPSIS agree
+expecting success of 1419.5 'disjoint excluded regions': 
+	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/quux >actual 2>perf &&
+	for_each_ref refs/heads/baz refs/heads/foo >expect &&
 
-expecting success of 0450.63 'check-ignore -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 63 - check-ignore -h output has no \t
+	test_cmp expect actual &&
+	assert_jumps 2 perf
 
-expecting success of 0450.64 'check-ignore -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 64 - check-ignore -h output has dashed labels
+ok 5 - disjoint excluded regions
 
-expecting success of 0450.65 'check-ignore -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 65 - check-ignore -h output has consistent spacing
+expecting success of 1419.6 'adjacent, non-overlapping excluded regions': 
+	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/baz >actual 2>perf &&
+	for_each_ref refs/heads/foo refs/heads/quux >expect &&
 
-expecting success of 0450.66 'check-ignore *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 66 - check-ignore *.txt SYNOPSIS has dashed labels
+	test_cmp expect actual &&
+	case "$GIT_DEFAULT_REF_FORMAT" in
+	files)
+		assert_jumps 1 perf;;
+	reftable)
+		assert_jumps 2 perf;;
+	*)
+		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
+	esac
 
-expecting success of 0450.67 'check-ignore -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 6 - adjacent, non-overlapping excluded regions
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 67 - check-ignore -h output and SYNOPSIS agree
+expecting success of 1419.7 'overlapping excluded regions': 
+	for_each_ref__exclude refs/heads refs/heads/ba refs/heads/baz >actual 2>perf &&
+	for_each_ref refs/heads/foo refs/heads/quux >expect &&
 
-expecting success of 0450.68 'check-mailmap -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 68 - check-mailmap -h output has no \t
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-expecting success of 0450.69 'check-mailmap -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 69 - check-mailmap -h output has dashed labels
+ok 7 - overlapping excluded regions
 
-expecting success of 0450.70 'check-mailmap -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 70 - check-mailmap -h output has consistent spacing
+expecting success of 1419.8 'several overlapping excluded regions': 
+	for_each_ref__exclude refs/heads \
+		refs/heads/bar refs/heads/baz refs/heads/foo >actual 2>perf &&
+	for_each_ref refs/heads/quux >expect &&
 
-expecting success of 0450.71 'check-mailmap *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 71 - check-mailmap *.txt SYNOPSIS has dashed labels
+	test_cmp expect actual &&
+	case "$GIT_DEFAULT_REF_FORMAT" in
+	files)
+		assert_jumps 1 perf;;
+	reftable)
+		assert_jumps 3 perf;;
+	*)
+		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
+	esac
 
-expecting success of 0450.72 'check-mailmap -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 8 - several overlapping excluded regions
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 72 - check-mailmap -h output and SYNOPSIS agree
+expecting success of 1419.9 'unordered excludes': 
+	for_each_ref__exclude refs/heads \
+		refs/heads/foo refs/heads/baz >actual 2>perf &&
+	for_each_ref refs/heads/bar refs/heads/quux >expect &&
 
-expecting success of 0450.73 'check-ref-format -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 73 - check-ref-format -h output has no \t
+	test_cmp expect actual &&
+	case "$GIT_DEFAULT_REF_FORMAT" in
+	files)
+		assert_jumps 1 perf;;
+	reftable)
+		assert_jumps 2 perf;;
+	*)
+		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
+	esac
 
-expecting success of 0450.74 'check-ref-format -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 74 - check-ref-format -h output has dashed labels
+ok 9 - unordered excludes
 
-expecting success of 0450.75 'check-ref-format -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 75 - check-ref-format -h output has consistent spacing
+expecting success of 1419.10 'non-matching excluded section': 
+	for_each_ref__exclude refs/heads refs/heads/does/not/exist >actual 2>perf &&
+	for_each_ref >expect &&
 
-expecting success of 0450.76 'check-ref-format *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 76 - check-ref-format *.txt SYNOPSIS has dashed labels
+	test_cmp expect actual &&
+	assert_no_jumps perf
 
-checking known breakage of 0450.77 'check-ref-format -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 10 - non-matching excluded section
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.425454946 +0000
-+++ help	2025-02-09 06:53:23.429454972 +0000
-@@ -1,4 +1,2 @@
--git check-ref-format [--normalize]
--                     [--[no-]allow-onelevel] [--refspec-pattern]
--                     <refname>
-+git check-ref-format [--normalize] [<options>] <refname>
- git check-ref-format --branch <branchname-shorthand>
-not ok 77 - check-ref-format -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1419.11 'meta-characters are discarded': 
+	for_each_ref__exclude refs/heads "refs/heads/ba*" >actual 2>perf &&
+	for_each_ref >expect &&
 
-expecting success of 0450.78 'checkout -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 78 - checkout -h output has no \t
+	test_cmp expect actual &&
+	assert_no_jumps perf
 
-expecting success of 0450.79 'checkout -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 79 - checkout -h output has dashed labels
+ok 11 - meta-characters are discarded
 
-expecting success of 0450.80 'checkout -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 80 - checkout -h output has consistent spacing
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1417-reflog-updateref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1417-reflog-updateref/.git/
+expecting success of 1417.1 'setup': 
+	git init -b main repo &&
+	(
+		cd repo &&
 
-expecting success of 0450.81 'checkout *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 81 - checkout *.txt SYNOPSIS has dashed labels
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
 
-checking known breakage of 0450.82 'checkout -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+		git reflog HEAD >expect &&
+		git reset --hard HEAD~ &&
+		# Make sure that the reflog does not point to the same commit
+		# as HEAD.
+		git reflog delete HEAD@{0} &&
+		git reflog HEAD >actual &&
+		test_cmp expect actual
+	)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.461455175 +0000
-+++ help	2025-02-09 06:53:23.465455201 +0000
-@@ -1,9 +1,2 @@
--git checkout [-q] [-f] [-m] [<branch>]
--git checkout [-q] [-f] [-m] --detach [<branch>]
--git checkout [-q] [-f] [-m] [--detach] <commit>
--git checkout [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
--git checkout [-f] <tree-ish> [--] <pathspec>...
--git checkout [-f] <tree-ish> --pathspec-from-file=<file> [--pathspec-file-nul]
--git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [--] <pathspec>...
--git checkout [-f|--ours|--theirs|-m|--conflict=<style>] --pathspec-from-file=<file> [--pathspec-file-nul]
--git checkout (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
-+git checkout [<options>] <branch>
-+git checkout [<options>] [<branch>] -- <file>...
-not ok 82 - checkout -h output and SYNOPSIS agree # TODO known breakage
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1417-reflog-updateref/repo/.git/
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+HEAD is now at d9df450 B
+ok 1 - setup
 
-expecting success of 0450.83 'checkout--worker -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 83 - checkout--worker -h output has no \t
+expecting success of 1417.2 'get 'B' with 'git reflog delete --updateref HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.84 'checkout--worker -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 84 - checkout--worker -h output has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.85 'checkout--worker -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
 	
-ok 85 - checkout--worker -h output has consistent spacing
+ok 2 - get 'B' with 'git reflog delete --updateref HEAD@{0}'
 
-ok 86 # skip checkout--worker *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_CHECKOUT__WORKER)
+expecting success of 1417.3 'get 'B' with 'git reflog delete --updateref HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-ok 87 # skip checkout--worker -h output and SYNOPSIS agree (missing BUILTIN_TXT_CHECKOUT__WORKER)
+		(
+			cd copy &&
 
-expecting success of 0450.88 'checkout-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 88 - checkout-index -h output has no \t
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.89 'checkout-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 89 - checkout-index -h output has dashed labels
+ok 3 - get 'B' with 'git reflog delete --updateref HEAD@{1}'
 
-expecting success of 0450.90 'checkout-index -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 90 - checkout-index -h output has consistent spacing
+expecting success of 1417.4 'get 'C' with 'git reflog delete --updateref main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.91 'checkout-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 91 - checkout-index *.txt SYNOPSIS has dashed labels
+		(
+			cd copy &&
 
-checking known breakage of 0450.92 'checkout-index -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+			test_cmp expect actual
+		)
 	
---- txt	2025-02-09 06:53:23.521455557 +0000
-+++ help	2025-02-09 06:53:23.525455583 +0000
-@@ -1,6 +1 @@
--git checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
--                   [--stage=<number>|all]
--                   [--temp]
--                   [--ignore-skip-worktree-bits]
--                   [-z] [--stdin]
--                   [--] [<file>...]
-+git checkout-index [<options>] [--] [<file>...]
-not ok 92 - checkout-index -h output and SYNOPSIS agree # TODO known breakage
+ok 4 - get 'C' with 'git reflog delete --updateref main@{0}'
 
-expecting success of 0450.93 'cherry -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 93 - cherry -h output has no \t
+expecting success of 1417.5 'get 'B' with 'git reflog delete --updateref main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.94 'cherry -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 94 - cherry -h output has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.95 'cherry -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 95 - cherry -h output has consistent spacing
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.96 'cherry *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 96 - cherry *.txt SYNOPSIS has dashed labels
+ok 5 - get 'B' with 'git reflog delete --updateref main@{1}'
 
-expecting success of 0450.97 'cherry -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1417.6 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 97 - cherry -h output and SYNOPSIS agree
+		(
+			cd copy &&
 
-expecting success of 0450.98 'cherry-pick -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 98 - cherry-pick -h output has no \t
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.99 'cherry-pick -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 99 - cherry-pick -h output has dashed labels
+ok 6 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'
 
-expecting success of 0450.100 'cherry-pick -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 100 - cherry-pick -h output has consistent spacing
+expecting success of 1417.7 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.101 'cherry-pick *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 101 - cherry-pick *.txt SYNOPSIS has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.102 'cherry-pick -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+			test_cmp expect actual
+		)
 	
-ok 102 - cherry-pick -h output and SYNOPSIS agree
+ok 7 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'
 
-expecting success of 0450.103 'clean -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 103 - clean -h output has no \t
+expecting success of 1417.8 'get 'C' with 'git reflog delete --updateref --rewrite main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.104 'clean -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 104 - clean -h output has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.105 'clean -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 105 - clean -h output has consistent spacing
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.106 'clean *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 106 - clean *.txt SYNOPSIS has dashed labels
+ok 8 - get 'C' with 'git reflog delete --updateref --rewrite main@{0}'
 
-expecting success of 0450.107 'clean -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1417.9 'get 'B' with 'git reflog delete --updateref --rewrite main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 107 - clean -h output and SYNOPSIS agree
+		(
+			cd copy &&
 
-expecting success of 0450.108 'clone -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 108 - clone -h output has no \t
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.109 'clone -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 109 - clone -h output has dashed labels
+ok 9 - get 'B' with 'git reflog delete --updateref --rewrite main@{1}'
 
-expecting success of 0450.110 'clone -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 110 - clone -h output has consistent spacing
+expecting success of 1417.10 'get 'B' with 'test_must_fail git reflog expire HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.111 'clone *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 111 - clone *.txt SYNOPSIS has dashed labels
+		(
+			cd copy &&
 
-checking known breakage of 0450.112 'clone -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+			test_cmp expect actual
+		)
 	
---- txt	2025-02-09 06:53:23.661456448 +0000
-+++ help	2025-02-09 06:53:23.665456473 +0000
-@@ -1,9 +1 @@
--git clone [--template=<template-directory>]
--          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
--          [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
--          [--dissociate] [--separate-git-dir <git-dir>]
--          [--depth <depth>] [--[no-]single-branch] [--no-tags]
--          [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
--          [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
--          [--filter=<filter-spec>] [--also-filter-submodules]] [--] <repository>
--          [<directory>]
-+git clone [<options>] [--] <repo> [<dir>]
-not ok 112 - clone -h output and SYNOPSIS agree # TODO known breakage
+error: HEAD@{0} points nowhere!
+ok 10 - get 'B' with 'test_must_fail git reflog expire HEAD@{0}'
 
-expecting success of 0450.113 'column -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 113 - column -h output has no \t
+expecting success of 1417.11 'get 'B' with 'test_must_fail git reflog expire HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.114 'column -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 114 - column -h output has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.115 'column -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 115 - column -h output has consistent spacing
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.116 'column *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 116 - column *.txt SYNOPSIS has dashed labels
+error: HEAD@{1} points nowhere!
+ok 11 - get 'B' with 'test_must_fail git reflog expire HEAD@{1}'
 
-checking known breakage of 0450.117 'column -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1417.12 'get 'B' with 'test_must_fail git reflog expire main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.697456677 +0000
-+++ help	2025-02-09 06:53:23.701456702 +0000
-@@ -1,2 +1 @@
--git column [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
--           [--indent=<string>] [--nl=<string>] [--padding=<n>]
-+git column [<options>]
-not ok 117 - column -h output and SYNOPSIS agree # TODO known breakage
+		(
+			cd copy &&
 
-expecting success of 0450.118 'commit -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 118 - commit -h output has no \t
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.119 'commit -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 119 - commit -h output has dashed labels
+error: main@{0} points nowhere!
+ok 12 - get 'B' with 'test_must_fail git reflog expire main@{0}'
 
-expecting success of 0450.120 'commit -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 120 - commit -h output has consistent spacing
+expecting success of 1417.13 'get 'B' with 'test_must_fail git reflog expire main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.121 'commit *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 121 - commit *.txt SYNOPSIS has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.122 'commit -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+			test_cmp expect actual
+		)
 	
-ok 122 - commit -h output and SYNOPSIS agree
+error: main@{1} points nowhere!
+ok 13 - get 'B' with 'test_must_fail git reflog expire main@{1}'
 
-expecting success of 0450.123 'commit-graph -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 123 - commit-graph -h output has no \t
+expecting success of 1417.14 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.124 'commit-graph -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 124 - commit-graph -h output has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.125 'commit-graph -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 125 - commit-graph -h output has consistent spacing
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.126 'commit-graph *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 126 - commit-graph *.txt SYNOPSIS has dashed labels
+error: HEAD@{0} points nowhere!
+ok 14 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'
 
-expecting success of 0450.127 'commit-graph -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1417.15 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 127 - commit-graph -h output and SYNOPSIS agree
+		(
+			cd copy &&
 
-expecting success of 0450.128 'commit-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 128 - commit-tree -h output has no \t
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.129 'commit-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 129 - commit-tree -h output has dashed labels
+error: HEAD@{1} points nowhere!
+ok 15 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'
 
-expecting success of 0450.130 'commit-tree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 130 - commit-tree -h output has consistent spacing
+expecting success of 1417.16 'get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.131 'commit-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 131 - commit-tree *.txt SYNOPSIS has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.132 'commit-tree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+			test_cmp expect actual
+		)
 	
-ok 132 - commit-tree -h output and SYNOPSIS agree
+error: main@{0} points nowhere!
+ok 16 - get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'
 
-expecting success of 0450.133 'config -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 133 - config -h output has no \t
+expecting success of 1417.17 'get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.134 'config -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 134 - config -h output has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.135 'config -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 135 - config -h output has consistent spacing
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.136 'config *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 136 - config *.txt SYNOPSIS has dashed labels
+error: main@{1} points nowhere!
+ok 17 - get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'
 
-expecting success of 0450.137 'config -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1417.18 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 137 - config -h output and SYNOPSIS agree
+		(
+			cd copy &&
 
-expecting success of 0450.138 'count-objects -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 138 - count-objects -h output has no \t
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.139 'count-objects -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 139 - count-objects -h output has dashed labels
+error: HEAD@{0} points nowhere!
+ok 18 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'
 
-expecting success of 0450.140 'count-objects -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 140 - count-objects -h output has consistent spacing
+expecting success of 1417.19 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.141 'count-objects *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 141 - count-objects *.txt SYNOPSIS has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.142 'count-objects -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+			test_cmp expect actual
+		)
 	
-ok 142 - count-objects -h output and SYNOPSIS agree
+error: HEAD@{1} points nowhere!
+ok 19 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'
 
-expecting success of 0450.143 'credential -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 143 - credential -h output has no \t
+expecting success of 1417.20 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 0450.144 'credential -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 144 - credential -h output has dashed labels
+		(
+			cd copy &&
 
-expecting success of 0450.145 'credential -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 145 - credential -h output has consistent spacing
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.146 'credential *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 146 - credential *.txt SYNOPSIS has dashed labels
+error: main@{0} points nowhere!
+ok 20 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'
 
-checking known breakage of 0450.147 'credential -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1417.21 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.913458051 +0000
-+++ help	2025-02-09 06:53:23.921458102 +0000
-@@ -0,0 +1 @@
-+git credential (fill|approve|reject)
-not ok 147 - credential -h output and SYNOPSIS agree # TODO known breakage
+		(
+			cd copy &&
 
-expecting success of 0450.148 'credential-cache -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 148 - credential-cache -h output has no \t
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0450.149 'credential-cache -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+			test_cmp expect actual
+		)
 	
-ok 149 - credential-cache -h output has dashed labels
+error: main@{1} points nowhere!
+ok 21 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'
 
-expecting success of 0450.150 'credential-cache -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 150 - credential-cache -h output has consistent spacing
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1410-reflog.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/.git/
+expecting success of 1410.1 'setup': 
+	mkdir -p A/B &&
+	echo rat >C &&
+	echo ox >A/D &&
+	echo tiger >A/B/E &&
+	git add . &&
 
-expecting success of 0450.151 'credential-cache *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 151 - credential-cache *.txt SYNOPSIS has dashed labels
+	test_tick && git commit -m rabbit &&
+	H=$(git rev-parse --verify HEAD) &&
+	A=$(git rev-parse --verify HEAD:A) &&
+	B=$(git rev-parse --verify HEAD:A/B) &&
+	C=$(git rev-parse --verify HEAD:C) &&
+	D=$(git rev-parse --verify HEAD:A/D) &&
+	E=$(git rev-parse --verify HEAD:A/B/E) &&
+	check_fsck &&
 
-checking known breakage of 0450.152 'credential-cache -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	test_chmod +x C &&
+	git add C &&
+	test_tick && git commit -m dragon &&
+	L=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:23.945458255 +0000
-+++ help	2025-02-09 06:53:23.953458306 +0000
-@@ -0,0 +1 @@
-+git credential-cache [<options>] <action>
-not ok 152 - credential-cache -h output and SYNOPSIS agree # TODO known breakage
+	rm -f C A/B/E &&
+	echo snake >F &&
+	echo horse >A/G &&
+	git add F A/G &&
+	test_tick && git commit -a -m sheep &&
+	F=$(git rev-parse --verify HEAD:F) &&
+	G=$(git rev-parse --verify HEAD:A/G) &&
+	I=$(git rev-parse --verify HEAD:A) &&
+	J=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
 
-expecting success of 0450.153 'credential-cache--daemon -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 153 - credential-cache--daemon -h output has no \t
+	rm -f A/G &&
+	test_tick && git commit -a -m monkey &&
+	K=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
 
-expecting success of 0450.154 'credential-cache--daemon -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 154 - credential-cache--daemon -h output has dashed labels
+	check_have A B C D E F G H I J K L &&
 
-expecting success of 0450.155 'credential-cache--daemon -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 155 - credential-cache--daemon -h output has consistent spacing
+	git prune &&
 
-expecting success of 0450.156 'credential-cache--daemon *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 156 - credential-cache--daemon *.txt SYNOPSIS has dashed labels
+	check_have A B C D E F G H I J K L &&
 
-expecting success of 0450.157 'credential-cache--daemon -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	check_fsck &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 157 - credential-cache--daemon -h output and SYNOPSIS agree
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-expecting success of 0450.158 'credential-store -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 158 - credential-store -h output has no \t
+[main (root-commit) 07fcc4f] rabbit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 A/B/E
+ create mode 100644 A/D
+ create mode 100644 C
+[main 7d1a0b8] dragon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 C
+[main 15ab5f0] sheep
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+ delete mode 100644 A/B/E
+ create mode 100644 A/G
+ delete mode 100755 C
+ create mode 100644 F
+[main 3ac530f] monkey
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A/G
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+ok 1 - setup
 
-expecting success of 0450.159 'credential-store -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 159 - credential-store -h output has dashed labels
+expecting success of 1410.2 'correct usage on sub-command -h': 
+	test_expect_code 129 git reflog expire -h >err &&
+	grep "git reflog expire" err
 
-expecting success of 0450.160 'credential-store -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 160 - credential-store -h output has consistent spacing
+usage: git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
+ok 2 - correct usage on sub-command -h
 
-expecting success of 0450.161 'credential-store *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 161 - credential-store *.txt SYNOPSIS has dashed labels
+expecting success of 1410.3 'correct usage on "git reflog show -h"': 
+	test_expect_code 129 git reflog show -h >err &&
+	grep -F "git reflog [show]" err
 
-checking known breakage of 0450.162 'credential-store -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+usage: git reflog [show] [<log-options>] [<ref>]
+ok 3 - correct usage on "git reflog show -h"
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.013458687 +0000
-+++ help	2025-02-09 06:53:24.021458738 +0000
-@@ -0,0 +1 @@
-+git credential-store [<options>] <action>
-not ok 162 - credential-store -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1410.4 'pass through -- to sub-command': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo message --a-file contents dash-tag &&
 
-expecting success of 0450.163 'describe -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 163 - describe -h output has no \t
+	git -C repo reflog show -- --does-not-exist >out &&
+	test_must_be_empty out &&
+	git -C repo reflog show >expect &&
+	git -C repo reflog show -- --a-file >actual &&
+	test_cmp expect actual
 
-expecting success of 0450.164 'describe -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 164 - describe -h output has dashed labels
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) 85b7e86] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 --a-file
+ok 4 - pass through -- to sub-command
 
-expecting success of 0450.165 'describe -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 165 - describe -h output has consistent spacing
+expecting success of 1410.5 'rewind': 
+	test_tick && git reset --hard HEAD~2 &&
+	test -f C &&
+	test -f A/B/E &&
+	! test -f F &&
+	! test -f A/G &&
 
-expecting success of 0450.166 'describe *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 166 - describe *.txt SYNOPSIS has dashed labels
+	check_have A B C D E F G H I J K L &&
 
-expecting success of 0450.167 'describe -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	git prune &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 167 - describe -h output and SYNOPSIS agree
+	check_have A B C D E F G H I J K L &&
 
-expecting success of 0450.168 'diagnose -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 168 - diagnose -h output has no \t
+	git reflog refs/heads/main >output &&
+	test_line_count = 5 output
 
-expecting success of 0450.169 'diagnose -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 169 - diagnose -h output has dashed labels
+HEAD is now at 7d1a0b8 dragon
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+tree
+tree
+blob
+blob
+blob
+blob
+blob
+commit
+tree
+commit
+commit
+commit
+ok 5 - rewind
 
-expecting success of 0450.170 'diagnose -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 170 - diagnose -h output has consistent spacing
+expecting success of 1410.6 'reflog expire should not barf on an annotated tag': 
+	test_when_finished "git tag -d v0.tag || :" &&
+	git -c core.logAllRefUpdates=always \
+		tag -a -m "tag name" v0.tag main &&
+	git reflog expire --dry-run refs/tags/v0.tag 2>err &&
+	test_grep ! "error: [Oo]bject .* not a commit" err
 
-expecting success of 0450.171 'diagnose *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 171 - diagnose *.txt SYNOPSIS has dashed labels
+Deleted tag 'v0.tag' (was dec1896)
+ok 6 - reflog expire should not barf on an annotated tag
 
-expecting success of 0450.172 'diagnose -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1410.7 'corrupt and check': 
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 172 - diagnose -h output and SYNOPSIS agree
+	corrupt $F &&
+	check_fsck "missing blob $F"
 
-expecting success of 0450.173 'diff -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 173 - diff -h output has no \t
 
-expecting success of 0450.174 'diff -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 174 - diff -h output has dashed labels
+missing blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 7 - corrupt and check
 
-expecting success of 0450.175 'diff -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 175 - diff -h output has consistent spacing
+expecting success of 1410.8 'reflog expire --dry-run should not touch reflog': 
 
-expecting success of 0450.176 'diff *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 176 - diff *.txt SYNOPSIS has dashed labels
+	git reflog expire --dry-run \
+		--expire=$(($test_tick - 10000)) \
+		--expire-unreachable=$(($test_tick - 10000)) \
+		--stale-fix \
+		--all &&
 
-expecting success of 0450.177 'diff -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 5 output &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 177 - diff -h output and SYNOPSIS agree
+	check_fsck "missing blob $F"
 
-expecting success of 0450.178 'diff-files -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 178 - diff-files -h output has no \t
+missing blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 8 - reflog expire --dry-run should not touch reflog
 
-expecting success of 0450.179 'diff-files -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 179 - diff-files -h output has dashed labels
+expecting success of 1410.9 'reflog expire': 
 
-expecting success of 0450.180 'diff-files -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 180 - diff-files -h output has consistent spacing
+	git reflog expire --verbose \
+		--expire=$(($test_tick - 10000)) \
+		--expire-unreachable=$(($test_tick - 10000)) \
+		--stale-fix \
+		--all &&
 
-expecting success of 0450.181 'diff-files *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 181 - diff-files *.txt SYNOPSIS has dashed labels
+	git reflog refs/heads/main >output &&
+	test_line_count = 2 output &&
 
-expecting success of 0450.182 'diff-files -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	check_fsck "dangling commit $K"
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 182 - diff-files -h output and SYNOPSIS agree
+Marking reachable objects...
+keep commit (initial): rabbit
+keep commit: dragon
+prune commit: sheep
+prune commit: monkey
+prune reset: moving to HEAD~2
+keep commit (initial): rabbit
+keep commit: dragon
+prune commit: sheep
+prune commit: monkey
+prune reset: moving to HEAD~2
+dangling commit 3ac530f2f6c3a45206a6b2d455baf89d1c8f672d
+ok 9 - reflog expire
 
-expecting success of 0450.183 'diff-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 183 - diff-index -h output has no \t
+expecting success of 1410.10 '--stale-fix handles missing objects generously': 
+	git -c core.logAllRefUpdates=false fast-import --date-format=now <<-EOS &&
+	commit refs/heads/stale-fix
+	mark :1
+	committer Author <a@uth.or> now
+	data <<EOF
+	start stale fix
+	EOF
+	M 100644 inline file
+	data <<EOF
+	contents
+	EOF
+	commit refs/heads/stale-fix
+	committer Author <a@uth.or> now
+	data <<EOF
+	stale fix branch tip
+	EOF
+	from :1
+	EOS
 
-expecting success of 0450.184 'diff-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 184 - diff-index -h output has dashed labels
+	parent_oid=$(git rev-parse stale-fix^) &&
+	test_when_finished "recover $parent_oid" &&
+	corrupt $parent_oid &&
+	git reflog expire --stale-fix
 
-expecting success of 0450.185 'diff-index -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 185 - diff-index -h output has consistent spacing
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            4 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         1 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-expecting success of 0450.186 'diff-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 186 - diff-index *.txt SYNOPSIS has dashed labels
+ok 10 - --stale-fix handles missing objects generously
 
-expecting success of 0450.187 'diff-index -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1410.11 'prune and fsck': 
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 187 - diff-index -h output and SYNOPSIS agree
+	git prune &&
+	check_fsck &&
 
-expecting success of 0450.188 'diff-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 188 - diff-tree -h output has no \t
+	check_have A B C D E H L &&
+	check_dont_have F G I J K
 
-expecting success of 0450.189 'diff-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 189 - diff-tree -h output has dashed labels
 
-expecting success of 0450.190 'diff-tree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 190 - diff-tree -h output has consistent spacing
+tree
+tree
+blob
+blob
+blob
+commit
+commit
+fatal: git cat-file: could not get object info
+fatal: git cat-file: could not get object info
+fatal: git cat-file: could not get object info
+fatal: git cat-file: could not get object info
+fatal: git cat-file: could not get object info
+ok 11 - prune and fsck
 
-expecting success of 0450.191 'diff-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 191 - diff-tree *.txt SYNOPSIS has dashed labels
+expecting success of 1410.12 'recover and check': 
 
-expecting success of 0450.192 'diff-tree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	recover $F &&
+	check_fsck "dangling blob $F"
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 192 - diff-tree -h output and SYNOPSIS agree
 
-expecting success of 0450.193 'difftool -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 193 - difftool -h output has no \t
+dangling blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 12 - recover and check
 
-expecting success of 0450.194 'difftool -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 194 - difftool -h output has dashed labels
+expecting success of 1410.13 'delete': 
+	echo 1 > C &&
+	test_tick &&
+	git commit -m rat C &&
 
-expecting success of 0450.195 'difftool -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 195 - difftool -h output has consistent spacing
+	echo 2 > C &&
+	test_tick &&
+	git commit -m ox C &&
 
-expecting success of 0450.196 'difftool *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 196 - difftool *.txt SYNOPSIS has dashed labels
+	echo 3 > C &&
+	test_tick &&
+	git commit -m tiger C &&
 
-expecting success of 0450.197 'difftool -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	HEAD_entry_count=$(git reflog | wc -l) &&
+	main_entry_count=$(git reflog show main | wc -l) &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 197 - difftool -h output and SYNOPSIS agree
+	test $HEAD_entry_count = 5 &&
+	test $main_entry_count = 5 &&
 
-expecting success of 0450.198 'fast-export -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 198 - fast-export -h output has no \t
 
-expecting success of 0450.199 'fast-export -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 199 - fast-export -h output has dashed labels
+	git reflog delete main@{1} &&
+	git reflog show main > output &&
+	test_line_count = $(($main_entry_count - 1)) output &&
+	test $HEAD_entry_count = $(git reflog | wc -l) &&
+	! grep ox < output &&
 
-expecting success of 0450.200 'fast-export -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 200 - fast-export -h output has consistent spacing
+	main_entry_count=$(wc -l < output) &&
 
-expecting success of 0450.201 'fast-export *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 201 - fast-export *.txt SYNOPSIS has dashed labels
+	git reflog delete HEAD@{1} &&
+	test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
+	test $main_entry_count = $(git reflog show main | wc -l) &&
 
-checking known breakage of 0450.202 'fast-export -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	HEAD_entry_count=$(git reflog | wc -l) &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.321460647 +0000
-+++ help	2025-02-09 06:53:24.325460673 +0000
-@@ -1 +1 @@
--git fast-export [<options>] | git fast-import
-+git fast-export [<rev-list-opts>]
-not ok 202 - fast-export -h output and SYNOPSIS agree # TODO known breakage
+	git reflog delete main@{07.04.2005.15:15:00.-0700} &&
+	git reflog show main > output &&
+	test_line_count = $(($main_entry_count - 1)) output &&
+	! grep dragon < output
 
-expecting success of 0450.203 'fast-import -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 203 - fast-import -h output has no \t
 
-expecting success of 0450.204 'fast-import -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 204 - fast-import -h output has dashed labels
+[main f392752] rat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 7e525ff] ox
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3740c00] tiger
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - delete
 
-expecting success of 0450.205 'fast-import -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 205 - fast-import -h output has consistent spacing
+expecting success of 1410.14 'rewind2': 
 
-expecting success of 0450.206 'fast-import *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 206 - fast-import *.txt SYNOPSIS has dashed labels
+	test_tick && git reset --hard HEAD~2 &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-checking known breakage of 0450.207 'fast-import -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+HEAD is now at f392752 rat
+ok 14 - rewind2
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.357460876 +0000
-+++ help	2025-02-09 06:53:24.365460927 +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>]
-not ok 207 - fast-import -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1410.15 '--expire=never': 
 
-expecting success of 0450.208 'fetch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 208 - fetch -h output has no \t
+	git reflog expire --verbose \
+		--expire=never \
+		--expire-unreachable=never \
+		--all &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-expecting success of 0450.209 'fetch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 209 - fetch -h output has dashed labels
+keep commit (initial): rabbit
+keep commit: dragon
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+keep commit (initial): rabbit
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+ok 15 - --expire=never
 
-expecting success of 0450.210 'fetch -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 210 - fetch -h output has consistent spacing
+expecting success of 1410.16 'gc.reflogexpire=never': 
+	test_config gc.reflogexpire never &&
+	test_config gc.reflogexpireunreachable never &&
 
-expecting success of 0450.211 'fetch *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 211 - fetch *.txt SYNOPSIS has dashed labels
+	git reflog expire --verbose --all >output &&
+	test_line_count = 9 output &&
 
-expecting success of 0450.212 'fetch -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 212 - fetch -h output and SYNOPSIS agree
+ok 16 - gc.reflogexpire=never
 
-expecting success of 0450.213 'fetch-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 213 - fetch-pack -h output has no \t
+expecting success of 1410.17 'gc.reflogexpire=false': 
+	test_config gc.reflogexpire false &&
+	test_config gc.reflogexpireunreachable false &&
 
-expecting success of 0450.214 'fetch-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 214 - fetch-pack -h output has dashed labels
+	git reflog expire --verbose --all &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-expecting success of 0450.215 'fetch-pack -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 215 - fetch-pack -h output has consistent spacing
 
-expecting success of 0450.216 'fetch-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 216 - fetch-pack *.txt SYNOPSIS has dashed labels
+keep commit (initial): rabbit
+keep commit: dragon
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+keep commit (initial): rabbit
+keep commit: rat
+keep commit: tiger
+keep reset: moving to HEAD~2
+ok 17 - gc.reflogexpire=false
 
-checking known breakage of 0450.217 'fetch-pack -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1410.18 'git reflog expire unknown reference': 
+	test_config gc.reflogexpire never &&
+	test_config gc.reflogexpireunreachable never &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.437461385 +0000
-+++ help	2025-02-09 06:53:24.441461411 +0000
-@@ -1,4 +1 @@
--git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
--               [--upload-pack=<git-upload-pack>]
--               [--depth=<n>] [--no-progress]
--               [-v] <repository> [<refs>...]
-+git fetch-pack [--all] [--stdin] [--quiet | -q] [--keep | -k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [--diag-url] [-v] [<host>:]<directory> [<refs>...]
-not ok 217 - fetch-pack -h output and SYNOPSIS agree # TODO known breakage
+	test_must_fail git reflog expire main@{123} 2>stderr &&
+	test_grep "points nowhere" stderr &&
+	test_must_fail git reflog expire does-not-exist 2>stderr &&
+	test_grep "points nowhere" stderr
 
-expecting success of 0450.218 'fmt-merge-msg -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 218 - fmt-merge-msg -h output has no \t
+error: main@{123} points nowhere!
+error: does-not-exist points nowhere!
+ok 18 - git reflog expire unknown reference
 
-expecting success of 0450.219 'fmt-merge-msg -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 219 - fmt-merge-msg -h output has dashed labels
+expecting success of 1410.19 'checkout should not delete log for packed ref': 
+	test $(git reflog main | wc -l) = 4 &&
+	git branch foo &&
+	git pack-refs --all &&
+	git checkout foo &&
+	test $(git reflog main | wc -l) = 4
 
-expecting success of 0450.220 'fmt-merge-msg -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 220 - fmt-merge-msg -h output has consistent spacing
+Switched to branch 'foo'
+ok 19 - checkout should not delete log for packed ref
 
-expecting success of 0450.221 'fmt-merge-msg *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 221 - fmt-merge-msg *.txt SYNOPSIS has dashed labels
+expecting success of 1410.20 'stale dirs do not cause d/f conflicts (reflogs on)': 
+	test_when_finished "git branch -d one || git branch -d one/two" &&
 
-checking known breakage of 0450.222 'fmt-merge-msg -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	git branch one/two main &&
+	echo "one/two@{0} branch: Created from main" >expect &&
+	git log -g --format="%gd %gs" one/two >actual &&
+	test_cmp expect actual &&
+	git branch -d one/two &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.469461589 +0000
-+++ help	2025-02-09 06:53:24.473461614 +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>
-+git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]
-not ok 222 - fmt-merge-msg -h output and SYNOPSIS agree # TODO known breakage
+	# now logs/refs/heads/one is a stale directory, but
+	# we should move it out of the way to create "one" reflog
+	git branch one main &&
+	echo "one@{0} branch: Created from main" >expect &&
+	git log -g --format="%gd %gs" one >actual &&
+	test_cmp expect actual
 
-expecting success of 0450.223 'for-each-ref -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 223 - for-each-ref -h output has no \t
+Deleted branch one/two (was f392752).
+Deleted branch one (was f392752).
+ok 20 - stale dirs do not cause d/f conflicts (reflogs on)
 
-expecting success of 0450.224 'for-each-ref -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 224 - for-each-ref -h output has dashed labels
+expecting success of 1410.21 'stale dirs do not cause d/f conflicts (reflogs off)': 
+	test_when_finished "git branch -d one || git branch -d one/two" &&
 
-expecting success of 0450.225 'for-each-ref -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 225 - for-each-ref -h output has consistent spacing
+	git branch one/two main &&
+	echo "one/two@{0} branch: Created from main" >expect &&
+	git log -g --format="%gd %gs" one/two >actual &&
+	test_cmp expect actual &&
+	git branch -d one/two &&
 
-expecting success of 0450.226 'for-each-ref *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 226 - for-each-ref *.txt SYNOPSIS has dashed labels
+	# same as before, but we only create a reflog for "one" if
+	# it already exists, which it does not
+	git -c core.logallrefupdates=false branch one main &&
+	git log -g --format="%gd %gs" one >actual &&
+	test_must_be_empty actual
 
-checking known breakage of 0450.227 'for-each-ref -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+Deleted branch one/two (was f392752).
+Deleted branch one (was f392752).
+ok 21 - stale dirs do not cause d/f conflicts (reflogs off)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.505461818 +0000
-+++ help	2025-02-09 06:53:24.509461843 +0000
-@@ -1,7 +1,4 @@
--git for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl]
--                 [(--sort=<key>)...] [--format=<format>]
--                 [--include-root-refs] [ --stdin | <pattern>... ]
--                 [--points-at=<object>]
--                 [--merged[=<object>]] [--no-merged[=<object>]]
--                 [--contains[=<object>]] [--no-contains[=<object>]]
--                 [--exclude=<pattern> ...]
-+git for-each-ref [<options>] [<pattern>]
-+git for-each-ref [--points-at <object>]
-+git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]
-+git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]
-not ok 227 - for-each-ref -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1410.22 'no segfaults for reflog containing non-commit sha1s': 
+	git update-ref --create-reflog -m "Creating ref" \
+		refs/tests/tree-in-reflog HEAD &&
+	git update-ref -m "Forcing tree" refs/tests/tree-in-reflog HEAD^{tree} &&
+	git update-ref -m "Restoring to commit" refs/tests/tree-in-reflog HEAD &&
+	git reflog refs/tests/tree-in-reflog
 
-expecting success of 0450.228 'for-each-repo -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 228 - for-each-repo -h output has no \t
+f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
+f392752 refs/tests/tree-in-reflog@{2}: Creating ref
+ok 22 - no segfaults for reflog containing non-commit sha1s
 
-expecting success of 0450.229 'for-each-repo -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 229 - for-each-repo -h output has dashed labels
+checking known breakage of 1410.23 'reflog with non-commit entries displays all entries': 
+	git reflog refs/tests/tree-in-reflog >actual &&
+	test_line_count = 3 actual
 
-expecting success of 0450.230 'for-each-repo -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 230 - for-each-repo -h output has consistent spacing
+test_line_count: line count for actual != 3
+f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
+f392752 refs/tests/tree-in-reflog@{2}: Creating ref
+not ok 23 - reflog with non-commit entries displays all entries # TODO known breakage
 
-expecting success of 0450.231 'for-each-repo *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 231 - for-each-repo *.txt SYNOPSIS has dashed labels
+expecting success of 1410.24 'continue walking past root commits': 
+	git init orphanage &&
+	(
+		cd orphanage &&
+		cat >expect <<-\EOF &&
+		HEAD@{0} commit (initial): orphan2-1
+		HEAD@{1} commit: orphan1-2
+		HEAD@{2} commit (initial): orphan1-1
+		HEAD@{3} commit (initial): initial
+		EOF
+		test_commit initial &&
+		git checkout --orphan orphan1 &&
+		test_commit orphan1-1 &&
+		test_commit orphan1-2 &&
+		git checkout --orphan orphan2 &&
+		test_commit orphan2-1 &&
+		git log -g --format="%gd %gs" >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 0450.232 'for-each-repo -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/orphanage/.git/
+[main (root-commit) 3805046] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'orphan1'
+[orphan1 (root-commit) 5906753] orphan1-1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 initial.t
+ create mode 100644 orphan1-1.t
+[orphan1 4e641d7] orphan1-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 orphan1-2.t
+Switched to a new branch 'orphan2'
+[orphan2 (root-commit) 593a89b] orphan2-1
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 initial.t
+ create mode 100644 orphan1-1.t
+ create mode 100644 orphan1-2.t
+ create mode 100644 orphan2-1.t
+ok 24 - continue walking past root commits
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 232 - for-each-repo -h output and SYNOPSIS agree
+expecting success of 1410.25 'expire with multiple worktrees': 
+	git init main-wt &&
+	(
+		cd main-wt &&
+		test_tick &&
+		test_commit foo &&
+		git  worktree add link-wt &&
+		test_tick &&
+		test_commit -C link-wt foobar &&
+		test_tick &&
+		git reflog expire --verbose --all --expire=$test_tick &&
+		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
+		test_must_be_empty actual
+	)
 
-expecting success of 0450.233 'format-patch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 233 - format-patch -h output has no \t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/main-wt/.git/
+[main (root-commit) 7745948] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Preparing worktree (new branch 'link-wt')
+HEAD is now at 7745948 foo
+[link-wt 25ae450] foobar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foobar.t
+prune commit (initial): foo
+prune branch: Created from HEAD
+prune commit: foobar
+prune commit (initial): foo
+prune 
+prune reset: moving to HEAD
+prune commit: foobar
+ok 25 - expire with multiple worktrees
 
-expecting success of 0450.234 'format-patch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 234 - format-patch -h output has dashed labels
+expecting success of 1410.26 'expire one of multiple worktrees': 
+	git init main-wt2 &&
+	(
+		cd main-wt2 &&
+		test_tick &&
+		test_commit foo &&
+		git worktree add link-wt &&
+		test_tick &&
+		test_commit -C link-wt foobar &&
+		test_tick &&
+		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
+			>expect-link-wt &&
+		git reflog expire --verbose --all --expire=$test_tick \
+			--single-worktree &&
+		test-tool ref-store worktree:main for-each-reflog-ent HEAD \
+			>actual-main &&
+		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
+			>actual-link-wt &&
+		test_must_be_empty actual-main &&
+		test_cmp expect-link-wt actual-link-wt
+	)
 
-expecting success of 0450.235 'format-patch -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 235 - format-patch -h output has consistent spacing
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/main-wt2/.git/
+[main (root-commit) 7745948] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Preparing worktree (new branch 'link-wt')
+HEAD is now at 7745948 foo
+[link-wt 25ae450] foobar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foobar.t
+prune commit (initial): foo
+prune branch: Created from HEAD
+prune commit: foobar
+prune commit (initial): foo
+ok 26 - expire one of multiple worktrees
 
-expecting success of 0450.236 'format-patch *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 236 - format-patch *.txt SYNOPSIS has dashed labels
+expecting success of 1410.27 'empty reflog': 
+	test_when_finished "rm -rf empty" &&
+	git init empty &&
+	test_commit -C empty A &&
+	test-tool ref-store main create-reflog refs/heads/foo &&
+	git -C empty reflog expire --all 2>err &&
+	test_must_be_empty err
 
-checking known breakage of 0450.237 'format-patch -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/empty/.git/
+[main (root-commit) d4404d5] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 27 - empty reflog
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.569462225 +0000
-+++ help	2025-02-09 06:53:24.573462250 +0000
-@@ -1,23 +1 @@
--git format-patch [-k] [(-o|--output-directory) <dir> | --stdout]
--                 [--no-thread | --thread[=<style>]]
--                 [(--attach|--inline)[=<boundary>] | --no-attach]
--                 [-s | --signoff]
--                 [--signature=<signature> | --no-signature]
--                 [--signature-file=<file>]
--                 [-n | --numbered | -N | --no-numbered]
--                 [--start-number <n>] [--numbered-files]
--                 [--in-reply-to=<message-id>] [--suffix=.<sfx>]
--                 [--ignore-if-in-upstream] [--always]
--                 [--cover-from-description=<mode>]
--                 [--rfc[=<rfc>]] [--subject-prefix=<subject-prefix>]
--                 [(--reroll-count|-v) <n>]
--                 [--to=<email>] [--cc=<email>]
--                 [--[no-]cover-letter] [--quiet]
--                 [--[no-]encode-email-headers]
--                 [--no-notes | --notes[=<ref>]]
--                 [--interdiff=<previous>]
--                 [--range-diff=<previous> [--creation-factor=<percent>]]
--                 [--filename-max-length=<n>]
--                 [--progress]
--                 [<common-diff-options>]
--                 [ <since> | <revision-range> ]
-+git format-patch [<options>] [<since> | <revision-range>]
-not ok 237 - format-patch -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1410.28 'list reflogs': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		git reflog list >actual &&
+		test_must_be_empty actual &&
 
-expecting success of 0450.238 'fsck -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 238 - fsck -h output has no \t
+		test_commit A &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual &&
 
-expecting success of 0450.239 'fsck -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 239 - fsck -h output has dashed labels
+		git branch b &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/b
+		refs/heads/main
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 0450.240 'fsck -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 240 - fsck -h output has consistent spacing
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 28 - list reflogs
 
-expecting success of 0450.241 'fsck *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 241 - fsck *.txt SYNOPSIS has dashed labels
+expecting success of 1410.29 'list reflogs with worktree': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
 
-expecting success of 0450.242 'fsck -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+		test_commit A &&
+		git worktree add wt &&
+		git -c core.logAllRefUpdates=always \
+			update-ref refs/worktree/main HEAD &&
+		git -c core.logAllRefUpdates=always \
+			update-ref refs/worktree/per-worktree HEAD &&
+		git -c core.logAllRefUpdates=always -C wt \
+			update-ref refs/worktree/per-worktree HEAD &&
+		git -c core.logAllRefUpdates=always -C wt \
+			update-ref refs/worktree/worktree HEAD &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 242 - fsck -h output and SYNOPSIS agree
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		refs/heads/wt
+		refs/worktree/main
+		refs/worktree/per-worktree
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual &&
 
-expecting success of 0450.243 'fsck-objects -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 243 - fsck-objects -h output has no \t
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		refs/heads/wt
+		refs/worktree/per-worktree
+		refs/worktree/worktree
+		EOF
+		git -C wt reflog list >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 0450.244 'fsck-objects -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 244 - fsck-objects -h output has dashed labels
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Preparing worktree (new branch 'wt')
+HEAD is now at fa70208 A
+ok 29 - list reflogs with worktree
 
-expecting success of 0450.245 'fsck-objects -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 245 - fsck-objects -h output has consistent spacing
+expecting success of 1410.30 'reflog list returns error with additional args': 
+	cat >expect <<-EOF &&
+	error: list does not accept arguments: ${SQ}bogus${SQ}
+	EOF
+	test_must_fail git reflog list bogus 2>err &&
+	test_cmp expect err
 
-expecting success of 0450.246 'fsck-objects *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 246 - fsck-objects *.txt SYNOPSIS has dashed labels
+ok 30 - reflog list returns error with additional args
 
-checking known breakage of 0450.247 'fsck-objects -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1410.31 'reflog for symref with unborn target can be listed': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		git symbolic-ref HEAD refs/heads/unborn &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual
+	)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.645462709 +0000
-+++ help	2025-02-09 06:53:24.649462734 +0000
-@@ -1 +1,4 @@
--git fsck-objects ...
-+git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
-+                 [--[no-]full] [--strict] [--verbose] [--lost-found]
-+                 [--[no-]dangling] [--[no-]progress] [--connectivity-only]
-+                 [--[no-]name-objects] [<object>...]
-not ok 247 - fsck-objects -h output and SYNOPSIS agree # TODO known breakage
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 31 - reflog for symref with unborn target can be listed
 
-expecting success of 0450.248 'fsmonitor--daemon -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 248 - fsmonitor--daemon -h output has no \t
+expecting success of 1410.32 'reflog with invalid object ID can be listed': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A &&
+		test-tool ref-store main update-ref msg refs/heads/missing \
+			$(test_oid deadbeef) "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
+		refs/heads/missing
+		EOF
+		git reflog list >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 0450.249 'fsmonitor--daemon -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 249 - fsmonitor--daemon -h output has dashed labels
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
+[main (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 32 - reflog with invalid object ID can be listed
 
-expecting success of 0450.250 'fsmonitor--daemon -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 250 - fsmonitor--daemon -h output has consistent spacing
+# still have 1 known breakage(s)
+# passed all remaining 31 test(s)
+1..32
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1430-bad-ref-name.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/.git/
+expecting success of 1430.1 'setup': 
+	test_commit one &&
+	test_commit two &&
+	main_sha1=$(git rev-parse refs/heads/main)
 
-expecting success of 0450.251 'fsmonitor--daemon *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 251 - fsmonitor--daemon *.txt SYNOPSIS has dashed labels
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - setup
 
-checking known breakage of 0450.252 'fsmonitor--daemon -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1430.2 'fast-import: fail on invalid branch name ".badbranchname"': 
+	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
+	cat >input <<-INPUT_END &&
+		commit .badbranchname
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		corrupt
+		COMMIT
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.681462938 +0000
-+++ help	2025-02-09 06:53:24.685462963 +0000
-@@ -1,4 +1,4 @@
--git fsmonitor--daemon start
--git fsmonitor--daemon run
-+git fsmonitor--daemon start [<options>]
-+git fsmonitor--daemon run [<options>]
- git fsmonitor--daemon stop
- git fsmonitor--daemon status
-not ok 252 - fsmonitor--daemon -h output and SYNOPSIS agree # TODO known breakage
+		from refs/heads/main
 
-expecting success of 0450.253 'gc -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 253 - gc -h output has no \t
+	INPUT_END
+	test_must_fail git fast-import <input
 
-expecting success of 0450.254 'gc -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 254 - gc -h output has dashed labels
+fatal: Branch name doesn't conform to GIT standards: .badbranchname
+fast-import: dumping crash report to .git/fast_import_crash_4092952
+ok 2 - fast-import: fail on invalid branch name ".badbranchname"
 
-expecting success of 0450.255 'gc -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 255 - gc -h output has consistent spacing
+expecting success of 1430.3 'fast-import: fail on invalid branch name "bad[branch]name"': 
+	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
+	cat >input <<-INPUT_END &&
+		commit bad[branch]name
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		corrupt
+		COMMIT
 
-expecting success of 0450.256 'gc *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 256 - gc *.txt SYNOPSIS has dashed labels
+		from refs/heads/main
 
-checking known breakage of 0450.257 'gc -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	INPUT_END
+	test_must_fail git fast-import <input
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.713463141 +0000
-+++ help	2025-02-09 06:53:24.717463167 +0000
-@@ -1 +1 @@
--git gc [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]
-+git gc [<options>]
-not ok 257 - gc -h output and SYNOPSIS agree # TODO known breakage
+fatal: Branch name doesn't conform to GIT standards: bad[branch]name
+fast-import: dumping crash report to .git/fast_import_crash_4093045
+ok 3 - fast-import: fail on invalid branch name "bad[branch]name"
 
-expecting success of 0450.258 'get-tar-commit-id -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 258 - get-tar-commit-id -h output has no \t
+expecting success of 1430.4 'git branch shows badly named ref as warning': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch >output 2>error &&
+	test_grep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-expecting success of 0450.259 'get-tar-commit-id -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 259 - get-tar-commit-id -h output has dashed labels
+warning: ignoring ref with broken name refs/heads/broken...ref
+ok 4 - git branch shows badly named ref as warning
 
-expecting success of 0450.260 'get-tar-commit-id -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 260 - get-tar-commit-id -h output has consistent spacing
+expecting success of 1430.5 'branch -d can delete badly named ref': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -d broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-expecting success of 0450.261 'get-tar-commit-id *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 261 - get-tar-commit-id *.txt SYNOPSIS has dashed labels
+Deleted branch broken...ref (was broken).
+ok 5 - branch -d can delete badly named ref
 
-expecting success of 0450.262 'get-tar-commit-id -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1430.6 'branch -D can delete badly named ref': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -D broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 262 - get-tar-commit-id -h output and SYNOPSIS agree
+Deleted branch broken...ref (was broken).
+ok 6 - branch -D can delete badly named ref
 
-expecting success of 0450.263 'grep -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 263 - grep -h output has no \t
+expecting success of 1430.7 'branch -D cannot delete non-ref in .git dir': 
+	echo precious >.git/my-private-file &&
+	echo precious >expect &&
+	test_must_fail git branch -D ../../my-private-file &&
+	test_cmp expect .git/my-private-file
 
-expecting success of 0450.264 'grep -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 264 - grep -h output has dashed labels
+error: branch '../../my-private-file' not found
+ok 7 - branch -D cannot delete non-ref in .git dir
 
-expecting success of 0450.265 'grep -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 265 - grep -h output has consistent spacing
+expecting success of 1430.8 'branch -D cannot delete ref in .git dir': 
+	git rev-parse HEAD >.git/my-private-file &&
+	git rev-parse HEAD >expect &&
+	git branch foo/legit &&
+	test_must_fail git branch -D foo////./././../../../my-private-file &&
+	test_cmp expect .git/my-private-file
 
-expecting success of 0450.266 'grep *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 266 - grep *.txt SYNOPSIS has dashed labels
+error: branch 'foo////./././../../../my-private-file' not found
+ok 8 - branch -D cannot delete ref in .git dir
 
-checking known breakage of 0450.267 'grep -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1430.9 'branch -D cannot delete absolute path': 
+	git branch -f extra &&
+	test_must_fail git branch -D "$(pwd)/.git/refs/heads/extra" &&
+	test_cmp_rev HEAD extra
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.781463574 +0000
-+++ help	2025-02-09 06:53:24.781463574 +0000
-@@ -1,21 +1 @@
--git grep [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]
--         [-v | --invert-match] [-h|-H] [--full-name]
--         [-E | --extended-regexp] [-G | --basic-regexp]
--         [-P | --perl-regexp]
--         [-F | --fixed-strings] [-n | --line-number] [--column]
--         [-l | --files-with-matches] [-L | --files-without-match]
--         [(-O | --open-files-in-pager) [<pager>]]
--         [-z | --null]
--         [ -o | --only-matching ] [-c | --count] [--all-match] [-q | --quiet]
--         [--max-depth <depth>] [--[no-]recursive]
--         [--color[=<when>] | --no-color]
--         [--break] [--heading] [-p | --show-function]
--         [-A <post-context>] [-B <pre-context>] [-C <context>]
--         [-W | --function-context]
--         [(-m | --max-count) <num>]
--         [--threads <num>]
--         [-f <file>] [-e] <pattern>
--         [--and|--or|--not|(|)|-e <pattern>...]
--         [--recurse-submodules] [--parent-basename <basename>]
--         [ [--[no-]exclude-standard] [--cached | --untracked | --no-index] | <tree>...]
--         [--] [<pathspec>...]
-+git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]
-not ok 267 - grep -h output and SYNOPSIS agree # TODO known breakage
+error: branch '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra' not found
+ok 9 - branch -D cannot delete absolute path
 
-expecting success of 0450.268 'hash-object -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 268 - hash-object -h output has no \t
+expecting success of 1430.10 'git branch cannot create a badly named ref': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test_must_fail git branch broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-expecting success of 0450.269 'hash-object -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 269 - hash-object -h output has dashed labels
+fatal: 'broken...ref' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 10 - git branch cannot create a badly named ref
 
-expecting success of 0450.270 'hash-object -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 270 - hash-object -h output has consistent spacing
+expecting success of 1430.11 'branch -m cannot rename to a bad ref name': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test_might_fail git branch -D goodref &&
+	git branch goodref &&
+	test_must_fail git branch -m goodref broken...ref &&
+	test_cmp_rev main goodref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-expecting success of 0450.271 'hash-object *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 271 - hash-object *.txt SYNOPSIS has dashed labels
+error: branch 'goodref' not found
+fatal: 'broken...ref' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 11 - branch -m cannot rename to a bad ref name
 
-expecting success of 0450.272 'hash-object -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+checking known breakage of 1430.12 'branch -m can rename from a bad ref name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 272 - hash-object -h output and SYNOPSIS agree
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -m broken...ref renamed &&
+	test_cmp_rev main renamed &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-expecting success of 0450.273 'help -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 273 - help -h output has no \t
+fatal: invalid branch name: 'broken...ref'
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+not ok 12 - branch -m can rename from a bad ref name # TODO known breakage
 
-expecting success of 0450.274 'help -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 274 - help -h output has dashed labels
+expecting success of 1430.13 'push cannot create a badly named ref': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-expecting success of 0450.275 'help -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 275 - help -h output has consistent spacing
+fatal: invalid refspec 'HEAD:refs/heads/broken...ref'
+ok 13 - push cannot create a badly named ref
 
-expecting success of 0450.276 'help *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 276 - help *.txt SYNOPSIS has dashed labels
+checking known breakage of 1430.14 'push --mirror can delete badly named ref': 
+	top=$(pwd) &&
+	git init src &&
+	git init dest &&
 
-expecting success of 0450.277 'help -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	(
+		cd src &&
+		test_commit one
+	) &&
+	(
+		cd dest &&
+		test_commit two &&
+		git checkout --detach &&
+		test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION
+	) &&
+	git -C src push --mirror "file://$top/dest" &&
+	git -C dest branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 277 - help -h output and SYNOPSIS agree
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/dest/.git/
+[main (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main (root-commit) 9db02ea] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+HEAD is now at 9db02ea two
+fatal: update_ref failed for ref 'refs/heads/broken...ref': cannot update ref 'refs/heads/broken...ref': trying to write ref 'refs/heads/broken...ref' with nonexistent object 139b20d8e6c5b496de61f033f642d0e3dbff528d
+not ok 14 - push --mirror can delete badly named ref # TODO known breakage
 
-expecting success of 0450.278 'hook -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 278 - hook -h output has no \t
+expecting success of 1430.15 'rev-parse skips symref pointing to broken name': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch shadow one &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
+	git rev-parse --verify one >expect &&
+	git rev-parse --verify shadow >actual 2>err &&
+	test_cmp expect actual &&
+	test_grep "ignoring dangling symref refs/tags/shadow" err
 
-expecting success of 0450.279 'hook -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 279 - hook -h output has dashed labels
+warning: ignoring dangling symref refs/tags/shadow
+ok 15 - rev-parse skips symref pointing to broken name
 
-expecting success of 0450.280 'hook -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 280 - hook -h output has consistent spacing
+expecting success of 1430.16 'for-each-ref emits warnings for broken names': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	git for-each-ref >output 2>error &&
+	! grep -e "broken\.\.\.ref" output &&
+	! grep -e "badname" output &&
+	! grep -e "broken\.\.\.symref" output &&
+	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+	test_grep ! "ignoring broken ref refs/heads/badname" error &&
+	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
 
-expecting success of 0450.281 'hook *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 281 - hook *.txt SYNOPSIS has dashed labels
+warning: ignoring ref with broken name refs/heads/broken...ref
+warning: ignoring ref with broken name refs/heads/broken...symref
+ok 16 - for-each-ref emits warnings for broken names
 
-expecting success of 0450.282 'hook -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1430.17 'update-ref -d can delete broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git update-ref -d refs/heads/broken...ref >output 2>error &&
+	test_must_be_empty output &&
+	test_must_be_empty error &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 282 - hook -h output and SYNOPSIS agree
+ok 17 - update-ref -d can delete broken name
 
-expecting success of 0450.283 'index-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 283 - index-pack -h output has no \t
+expecting success of 1430.18 'branch -d can delete broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	git branch -d broken...ref >output 2>error &&
+	test_grep "Deleted branch broken...ref (was broken)" output &&
+	test_must_be_empty error &&
+	git branch >output 2>error &&
+	! grep -e "broken\.\.\.ref" error &&
+	! grep -e "broken\.\.\.ref" output
 
-expecting success of 0450.284 'index-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 284 - index-pack -h output has dashed labels
+Deleted branch broken...ref (was broken).
+ok 18 - branch -d can delete broken name
 
-expecting success of 0450.285 'index-pack -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 285 - index-pack -h output has consistent spacing
+expecting success of 1430.19 'update-ref --no-deref -d can delete symref to broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
 
-expecting success of 0450.286 'index-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 286 - index-pack *.txt SYNOPSIS has dashed labels
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_must_be_empty output &&
+	test_must_be_empty error
 
-checking known breakage of 0450.287 'index-pack -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: reference does not exist
+ok 19 - update-ref --no-deref -d can delete symref to broken name
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.917464439 +0000
-+++ help	2025-02-09 06:53:24.921464465 +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>]
--               [--[no-]rev-index] [<pack-file>]
-+git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-id>=<severity>...]] [--fsck-objects[=<msg-id>=<severity>...]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])
-not ok 287 - index-pack -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1430.20 'branch -d can delete symref to broken name': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git branch -d badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+	test_must_be_empty error
 
-expecting success of 0450.288 'init -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 288 - init -h output has no \t
+error: reference does not exist
+Deleted branch badname (was refs/heads/broken...ref).
+ok 20 - branch -d can delete symref to broken name
 
-expecting success of 0450.289 'init -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 289 - init -h output has dashed labels
+expecting success of 1430.21 'update-ref --no-deref -d can delete dangling symref to broken name': 
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_must_be_empty output &&
+	test_must_be_empty error
 
-expecting success of 0450.290 'init -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 290 - init -h output has consistent spacing
+error: reference does not exist
+ok 21 - update-ref --no-deref -d can delete dangling symref to broken name
 
-expecting success of 0450.291 'init *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 291 - init *.txt SYNOPSIS has dashed labels
+expecting success of 1430.22 'branch -d can delete dangling symref to broken name': 
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/badname &&
+	git branch -d badname >output 2>error &&
+	test_ref_missing refs/heads/badname &&
+	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+	test_must_be_empty error
 
-expecting success of 0450.292 'init -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: reference does not exist
+Deleted branch badname (was refs/heads/broken...ref).
+ok 22 - branch -d can delete dangling symref to broken name
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 292 - init -h output and SYNOPSIS agree
+expecting success of 1430.23 'update-ref -d can delete broken name through symref': 
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
+	test_ref_exists refs/heads/broken...ref &&
+	git update-ref -d refs/heads/badname >output 2>error &&
+	test_ref_missing refs/heads/broken...ref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
 
-expecting success of 0450.293 'init-db -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 293 - init-db -h output has no \t
+error: reference does not exist
+ok 23 - update-ref -d can delete broken name through symref
 
-expecting success of 0450.294 'init-db -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 294 - init-db -h output has dashed labels
+expecting success of 1430.24 'update-ref --no-deref -d can delete symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
 
-expecting success of 0450.295 'init-db -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 295 - init-db -h output has consistent spacing
+error: reference does not exist
+ok 24 - update-ref --no-deref -d can delete symref with broken name
 
-expecting success of 0450.296 'init-db *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 296 - init-db *.txt SYNOPSIS has dashed labels
+expecting success of 1430.25 'branch -d can delete symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git branch -d broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_grep "Deleted branch broken...symref (was refs/heads/main)" output &&
+	test_must_be_empty error
 
-checking known breakage of 0450.297 'init-db -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: reference does not exist
+Deleted branch broken...symref (was refs/heads/main).
+ok 25 - branch -d can delete symref with broken name
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:24.985464872 +0000
-+++ help	2025-02-09 06:53:24.993464923 +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>]
-+            [--separate-git-dir <git-dir>] [--object-format=<format>]
-+            [--ref-format=<format>]
-+            [-b <branch-name> | --initial-branch=<branch-name>]
-+            [--shared[=<permissions>]] [<directory>]
-not ok 297 - init-db -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1430.26 'update-ref --no-deref -d can delete dangling symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_must_be_empty output &&
+	test_must_be_empty error
 
-expecting success of 0450.298 'interpret-trailers -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 298 - interpret-trailers -h output has no \t
+error: reference does not exist
+ok 26 - update-ref --no-deref -d can delete dangling symref with broken name
 
-expecting success of 0450.299 'interpret-trailers -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 299 - interpret-trailers -h output has dashed labels
+expecting success of 1430.27 'branch -d can delete dangling symref with broken name': 
+	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
+	test_ref_exists refs/heads/broken...symref &&
+	git branch -d broken...symref >output 2>error &&
+	test_ref_missing refs/heads/broken...symref &&
+	test_grep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
+	test_must_be_empty error
 
-expecting success of 0450.300 'interpret-trailers -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 300 - interpret-trailers -h output has consistent spacing
+error: reference does not exist
+Deleted branch broken...symref (was refs/heads/idonotexist).
+ok 27 - branch -d can delete dangling symref with broken name
 
-expecting success of 0450.301 'interpret-trailers *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 301 - interpret-trailers *.txt SYNOPSIS has dashed labels
+expecting success of 1430.28 'update-ref -d cannot delete non-ref in .git dir': 
+	echo precious >.git/my-private-file &&
+	echo precious >expect &&
+	test_must_fail git update-ref -d my-private-file >output 2>error &&
+	test_must_be_empty output &&
+	test_grep -e "refusing to update ref with bad name" error &&
+	test_cmp expect .git/my-private-file
 
-expecting success of 0450.302 'interpret-trailers -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: refusing to update ref with bad name 'my-private-file'
+ok 28 - update-ref -d cannot delete non-ref in .git dir
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 302 - interpret-trailers -h output and SYNOPSIS agree
+expecting success of 1430.29 'update-ref -d cannot delete absolute path': 
+	git branch -f extra &&
+	test_must_fail git update-ref -d "$(pwd)/.git/refs/heads/extra" &&
+	test_cmp_rev HEAD extra
 
-expecting success of 0450.303 'log -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 303 - log -h output has no \t
+error: refusing to update ref with bad name '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra'
+ok 29 - update-ref -d cannot delete absolute path
 
-expecting success of 0450.304 'log -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 304 - log -h output has dashed labels
+expecting success of 1430.30 'update-ref --stdin fails create with bad ref name': 
+	echo "create ~a refs/heads/main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
 
-expecting success of 0450.305 'log -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 305 - log -h output has consistent spacing
+fatal: invalid ref format: ~a
+ok 30 - update-ref --stdin fails create with bad ref name
 
-expecting success of 0450.306 'log *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 306 - log *.txt SYNOPSIS has dashed labels
+expecting success of 1430.31 'update-ref --stdin fails update with bad ref name': 
+	echo "update ~a refs/heads/main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
 
-checking known breakage of 0450.307 'log -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+fatal: invalid ref format: ~a
+ok 31 - update-ref --stdin fails update with bad ref name
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:25.061465355 +0000
-+++ help	2025-02-09 06:53:25.077465457 +0000
-@@ -1 +1,2 @@
- git log [<options>] [<revision-range>] [[--] <path>...]
-+git show [<options>] <object>...
-not ok 307 - log -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1430.32 'update-ref --stdin fails delete with bad ref name': 
+	echo "delete ~a refs/heads/main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
 
-expecting success of 0450.308 'ls-files -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 308 - ls-files -h output has no \t
+fatal: invalid ref format: ~a
+ok 32 - update-ref --stdin fails delete with bad ref name
 
-expecting success of 0450.309 'ls-files -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 309 - ls-files -h output has dashed labels
+expecting success of 1430.33 'update-ref --stdin -z fails create with bad ref name': 
+	printf "%s\0" "create ~a " refs/heads/main >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a " err
 
-expecting success of 0450.310 'ls-files -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 310 - ls-files -h output has consistent spacing
+fatal: invalid ref format: ~a 
+ok 33 - update-ref --stdin -z fails create with bad ref name
 
-expecting success of 0450.311 'ls-files *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 311 - ls-files *.txt SYNOPSIS has dashed labels
+expecting success of 1430.34 'update-ref --stdin -z fails update with bad ref name': 
+	printf "%s\0" "update ~a" refs/heads/main "" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
 
-checking known breakage of 0450.312 'ls-files -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+fatal: invalid ref format: ~a
+ok 34 - update-ref --stdin -z fails update with bad ref name
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:25.109465661 +0000
-+++ help	2025-02-09 06:53:25.113465686 +0000
-@@ -1,13 +1 @@
--git ls-files [-z] [-t] [-v] [-f]
--             [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
--             [-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
--             [--resolve-undo]
--             [--directory [--no-empty-directory]] [--eol]
--             [--deduplicate]
--             [-x <pattern>|--exclude=<pattern>]
--             [-X <file>|--exclude-from=<file>]
--             [--exclude-per-directory=<file>]
--             [--exclude-standard]
--             [--error-unmatch] [--with-tree=<tree-ish>]
--             [--full-name] [--recurse-submodules]
--             [--abbrev[=<n>]] [--format=<format>] [--] [<file>...]
-+git ls-files [<options>] [<file>...]
-not ok 312 - ls-files -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1430.35 'update-ref --stdin -z fails delete with bad ref name': 
+	printf "%s\0" "delete ~a" refs/heads/main >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: invalid ref format: ~a" err
 
-expecting success of 0450.313 'ls-remote -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 313 - ls-remote -h output has no \t
+fatal: invalid ref format: ~a
+ok 35 - update-ref --stdin -z fails delete with bad ref name
 
-expecting success of 0450.314 'ls-remote -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 314 - ls-remote -h output has dashed labels
+expecting success of 1430.36 'branch rejects HEAD as a branch name': 
+	test_must_fail git branch HEAD HEAD^ &&
+	test_must_fail git show-ref refs/heads/HEAD
 
-expecting success of 0450.315 'ls-remote -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 315 - ls-remote -h output has consistent spacing
+fatal: 'HEAD' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 36 - branch rejects HEAD as a branch name
 
-expecting success of 0450.316 'ls-remote *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 316 - ls-remote *.txt SYNOPSIS has dashed labels
+expecting success of 1430.37 'checkout -b rejects HEAD as a branch name': 
+	test_must_fail git checkout -B HEAD HEAD^ &&
+	test_must_fail git show-ref refs/heads/HEAD
 
-expecting success of 0450.317 'ls-remote -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+fatal: 'HEAD' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 37 - checkout -b rejects HEAD as a branch name
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 317 - ls-remote -h output and SYNOPSIS agree
+expecting success of 1430.38 'update-ref can operate on refs/heads/HEAD': 
+	git update-ref refs/heads/HEAD HEAD^ &&
+	git show-ref refs/heads/HEAD &&
+	git update-ref -d refs/heads/HEAD &&
+	test_must_fail git show-ref refs/heads/HEAD
 
-expecting success of 0450.318 'ls-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 318 - ls-tree -h output has no \t
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/HEAD
+ok 38 - update-ref can operate on refs/heads/HEAD
 
-expecting success of 0450.319 'ls-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 319 - ls-tree -h output has dashed labels
+expecting success of 1430.39 'branch -d can remove refs/heads/HEAD': 
+	git update-ref refs/heads/HEAD HEAD^ &&
+	git branch -d HEAD &&
+	test_must_fail git show-ref refs/heads/HEAD
 
-expecting success of 0450.320 'ls-tree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 320 - ls-tree -h output has consistent spacing
+Deleted branch HEAD (was d79ce16).
+ok 39 - branch -d can remove refs/heads/HEAD
 
-expecting success of 0450.321 'ls-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 321 - ls-tree *.txt SYNOPSIS has dashed labels
+expecting success of 1430.40 'branch -m can rename refs/heads/HEAD': 
+	git update-ref refs/heads/HEAD HEAD^ &&
+	git branch -m HEAD tail &&
+	test_must_fail git show-ref refs/heads/HEAD &&
+	git show-ref refs/heads/tail
 
-checking known breakage of 0450.322 'ls-tree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+warning: renamed a misnamed branch 'HEAD' away
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/tail
+ok 40 - branch -m can rename refs/heads/HEAD
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:25.181466119 +0000
-+++ help	2025-02-09 06:53:25.185466144 +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>]
--            <tree-ish> [<path>...]
-+git ls-tree [<options>] <tree-ish> [<path>...]
-not ok 322 - ls-tree -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1430.41 'branch -d can remove refs/heads/-dash': 
+	git update-ref refs/heads/-dash HEAD^ &&
+	git branch -d -- -dash &&
+	test_must_fail git show-ref refs/heads/-dash
 
-expecting success of 0450.323 'mailinfo -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 323 - mailinfo -h output has no \t
+Deleted branch -dash (was d79ce16).
+ok 41 - branch -d can remove refs/heads/-dash
 
-expecting success of 0450.324 'mailinfo -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 324 - mailinfo -h output has dashed labels
+expecting success of 1430.42 'branch -m can rename refs/heads/-dash': 
+	git update-ref refs/heads/-dash HEAD^ &&
+	git branch -m -- -dash dash &&
+	test_must_fail git show-ref refs/heads/-dash &&
+	git show-ref refs/heads/dash
 
-expecting success of 0450.325 'mailinfo -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 325 - mailinfo -h output has consistent spacing
+warning: renamed a misnamed branch '-dash' away
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/dash
+ok 42 - branch -m can rename refs/heads/-dash
 
-expecting success of 0450.326 'mailinfo *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 326 - mailinfo *.txt SYNOPSIS has dashed labels
+# still have 2 known breakage(s)
+# passed all remaining 40 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1451-fsck-buffer.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1451-fsck-buffer/.git/
+expecting success of 1451.1 'create valid objects': 
+	git commit --allow-empty -m foo &&
+	commit=$(git rev-parse --verify HEAD) &&
+	tree=$(git rev-parse --verify HEAD^{tree})
 
-checking known breakage of 0450.327 'mailinfo -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+[master (root-commit) 2093db0] foo
+ Author: A U Thor <author@example.com>
+ok 1 - create valid objects
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.2 'reset input to empty': 
+		>base
 	
---- txt	2025-02-09 06:53:25.213466322 +0000
-+++ help	2025-02-09 06:53:25.217466348 +0000
-@@ -1,3 +1 @@
--git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n]
--             [--[no-]scissors] [--quoted-cr=<action>]
--             <msg> <patch>
-+git mailinfo [<options>] <msg> <patch> < mail >info
-not ok 327 - mailinfo -h output and SYNOPSIS agree # TODO known breakage
+ok 2 - reset input to empty
 
-expecting success of 0450.328 'mailsplit -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.3 'truncated commit (missingTree, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 328 - mailsplit -h output has no \t
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 3 - truncated commit (missingTree, "")
 
-expecting success of 0450.329 'mailsplit -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.4 'truncated commit (missingTree, "tr")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 329 - mailsplit -h output has dashed labels
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 4 - truncated commit (missingTree, "tr")
 
-expecting success of 0450.330 'mailsplit -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.5 'truncated commit (missingTree, "tree")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 330 - mailsplit -h output has consistent spacing
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 5 - truncated commit (missingTree, "tree")
 
-expecting success of 0450.331 'mailsplit *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.6 'truncated commit (badTreeSha1, "tree ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 331 - mailsplit *.txt SYNOPSIS has dashed labels
-
-checking known breakage of 0450.332 'mailsplit -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
+ok 6 - truncated commit (badTreeSha1, "tree ")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.7 'truncated commit (badTreeSha1, "tree 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
---- txt	2025-02-09 06:53:25.245466526 +0000
-+++ help	2025-02-09 06:53:25.249466552 +0000
-@@ -1,2 +1 @@
--git mailsplit [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]
--              -o<directory> [--] [(<mbox>|<Maildir>)...]
-+git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]
-not ok 332 - mailsplit -h output and SYNOPSIS agree # TODO known breakage
+error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
+ok 7 - truncated commit (badTreeSha1, "tree 1234")
 
-expecting success of 0450.333 'maintenance -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.8 'add tree line': 
+		echo "$content" >>base
 	
-ok 333 - maintenance -h output has no \t
+ok 8 - add tree line
 
-expecting success of 0450.334 'maintenance -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.9 'truncated commit (missingAuthor, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 334 - maintenance -h output has dashed labels
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 9 - truncated commit (missingAuthor, "")
 
-expecting success of 0450.335 'maintenance -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.10 'truncated commit (missingAuthor, "par")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 335 - maintenance -h output has consistent spacing
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 10 - truncated commit (missingAuthor, "par")
 
-expecting success of 0450.336 'maintenance *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.11 'truncated commit (missingAuthor, "parent")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 336 - maintenance *.txt SYNOPSIS has dashed labels
-
-checking known breakage of 0450.337 'maintenance -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 11 - truncated commit (missingAuthor, "parent")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.12 'truncated commit (badParentSha1, "parent ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
---- txt	2025-02-09 06:53:25.273466704 +0000
-+++ help	2025-02-09 06:53:25.277466730 +0000
-@@ -1,3 +1 @@
--git maintenance run [<options>]
--git maintenance start [--scheduler=<scheduler>]
--git maintenance (stop|register|unregister) [<options>]
-+git maintenance <subcommand> [<options>]
-not ok 337 - maintenance -h output and SYNOPSIS agree # TODO known breakage
+error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
+ok 12 - truncated commit (badParentSha1, "parent ")
 
-expecting success of 0450.338 'merge -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.13 'truncated commit (badParentSha1, "parent 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 338 - merge -h output has no \t
+error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
+ok 13 - truncated commit (badParentSha1, "parent 1234")
 
-expecting success of 0450.339 'merge -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.14 'add parent line': 
+		echo "$content" >>base
 	
-ok 339 - merge -h output has dashed labels
+ok 14 - add parent line
 
-expecting success of 0450.340 'merge -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.15 'truncated commit (missingAuthor, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 340 - merge -h output has consistent spacing
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 15 - truncated commit (missingAuthor, "")
 
-expecting success of 0450.341 'merge *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.16 'truncated commit (missingAuthor, "au")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 341 - merge *.txt SYNOPSIS has dashed labels
-
-checking known breakage of 0450.342 'merge -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 16 - truncated commit (missingAuthor, "au")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.17 'truncated commit (missingAuthor, "author")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
---- txt	2025-02-09 06:53:25.309466933 +0000
-+++ help	2025-02-09 06:53:25.317466984 +0000
-@@ -1,6 +1,3 @@
--git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
--          [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
--          [--[no-]allow-unrelated-histories]
--          [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]
--          [--into-name <branch>] [<commit>...]
--git merge (--continue | --abort | --quit)
-+git merge [<options>] [<commit>...]
-+git merge --abort
-+git merge --continue
-not ok 342 - merge -h output and SYNOPSIS agree # TODO known breakage
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 17 - truncated commit (missingAuthor, "author")
 
-expecting success of 0450.343 'merge-base -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.18 'truncated commit (missingEmail, "author ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 343 - merge-base -h output has no \t
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 18 - truncated commit (missingEmail, "author ")
 
-expecting success of 0450.344 'merge-base -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.19 'truncated commit (missingEmail, "author name")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 344 - merge-base -h output has dashed labels
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 19 - truncated commit (missingEmail, "author name")
 
-expecting success of 0450.345 'merge-base -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.20 'truncated commit (badEmail, "author name <")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 345 - merge-base -h output has consistent spacing
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 20 - truncated commit (badEmail, "author name <")
 
-expecting success of 0450.346 'merge-base *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.21 'truncated commit (badEmail, "author name <email")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 346 - merge-base *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.347 'merge-base -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 21 - truncated commit (badEmail, "author name <email")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.22 'truncated commit (missingSpaceBeforeDate, "author name <email>")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 347 - merge-base -h output and SYNOPSIS agree
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 22 - truncated commit (missingSpaceBeforeDate, "author name <email>")
 
-expecting success of 0450.348 'merge-file -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.23 'truncated commit (badDate, "author name <email> ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 348 - merge-file -h output has no \t
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 23 - truncated commit (badDate, "author name <email> ")
 
-expecting success of 0450.349 'merge-file -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.24 'truncated commit (badDate, "author name <email> 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 349 - merge-file -h output has dashed labels
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 24 - truncated commit (badDate, "author name <email> 1234")
 
-expecting success of 0450.350 'merge-file -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.25 'truncated commit (badTimezone, "author name <email> 1234 ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 350 - merge-file -h output has consistent spacing
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 25 - truncated commit (badTimezone, "author name <email> 1234 ")
 
-expecting success of 0450.351 'merge-file *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.26 'truncated commit (badTimezone, "author name <email> 1234 +")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 351 - merge-file *.txt SYNOPSIS has dashed labels
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 26 - truncated commit (badTimezone, "author name <email> 1234 +")
 
-checking known breakage of 0450.352 'merge-file -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1451.27 'add author line': 
+		echo "$content" >>base
+	
+ok 27 - add author line
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.28 'truncated commit (missingCommitter, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
---- txt	2025-02-09 06:53:25.389467442 +0000
-+++ help	2025-02-09 06:53:25.393467468 +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>]
--               [--[no-]diff3] [--object-id] <current> <base> <other>
-+git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>
-not ok 352 - merge-file -h output and SYNOPSIS agree # TODO known breakage
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 28 - truncated commit (missingCommitter, "")
 
-expecting success of 0450.353 'merge-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.29 'truncated commit (missingCommitter, "co")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 353 - merge-index -h output has no \t
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 29 - truncated commit (missingCommitter, "co")
 
-expecting success of 0450.354 'merge-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.30 'truncated commit (missingCommitter, "committer")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 354 - merge-index -h output has dashed labels
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 30 - truncated commit (missingCommitter, "committer")
 
-expecting success of 0450.355 'merge-index -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 355 - merge-index -h output has consistent spacing
-
-expecting success of 0450.356 'merge-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.31 'truncated commit (missingEmail, "committer ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 356 - merge-index *.txt SYNOPSIS has dashed labels
-
-checking known breakage of 0450.357 'merge-index -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 31 - truncated commit (missingEmail, "committer ")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.32 'truncated commit (missingEmail, "committer name")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
---- txt	2025-02-09 06:53:25.425467671 +0000
-+++ help	2025-02-09 06:53:25.429467697 +0000
-@@ -1 +1 @@
--git merge-index [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
-+git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])
-not ok 357 - merge-index -h output and SYNOPSIS agree # TODO known breakage
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 32 - truncated commit (missingEmail, "committer name")
 
-expecting success of 0450.358 'merge-ours -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.33 'truncated commit (badEmail, "committer name <")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 358 - merge-ours -h output has no \t
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 33 - truncated commit (badEmail, "committer name <")
 
-expecting success of 0450.359 'merge-ours -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.34 'truncated commit (badEmail, "committer name <email")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 359 - merge-ours -h output has dashed labels
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 34 - truncated commit (badEmail, "committer name <email")
 
-expecting success of 0450.360 'merge-ours -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.35 'truncated commit (missingSpaceBeforeDate, "committer name <email>")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 360 - merge-ours -h output has consistent spacing
-
-ok 361 # skip merge-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_OURS)
-
-ok 362 # skip merge-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_OURS)
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 35 - truncated commit (missingSpaceBeforeDate, "committer name <email>")
 
-expecting success of 0450.363 'merge-recursive -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.36 'truncated commit (badDate, "committer name <email> ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 363 - merge-recursive -h output has no \t
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 36 - truncated commit (badDate, "committer name <email> ")
 
-expecting success of 0450.364 'merge-recursive -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.37 'truncated commit (badDate, "committer name <email> 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 364 - merge-recursive -h output has dashed labels
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 37 - truncated commit (badDate, "committer name <email> 1234")
 
-expecting success of 0450.365 'merge-recursive -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.38 'truncated commit (badTimezone, "committer name <email> 1234 ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 365 - merge-recursive -h output has consistent spacing
-
-ok 366 # skip merge-recursive *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE)
-
-ok 367 # skip merge-recursive -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE)
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 38 - truncated commit (badTimezone, "committer name <email> 1234 ")
 
-expecting success of 0450.368 'merge-recursive-ours -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.39 'truncated commit (badTimezone, "committer name <email> 1234 +")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 368 - merge-recursive-ours -h output has no \t
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 39 - truncated commit (badTimezone, "committer name <email> 1234 +")
 
-expecting success of 0450.369 'merge-recursive-ours -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.40 'add committer line': 
+		echo "$content" >>base
 	
-ok 369 - merge-recursive-ours -h output has dashed labels
+ok 40 - add committer line
 
-expecting success of 0450.370 'merge-recursive-ours -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.41 'reset input to empty': 
+		>base
 	
-ok 370 - merge-recursive-ours -h output has consistent spacing
-
-ok 371 # skip merge-recursive-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
-
-ok 372 # skip merge-recursive-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
+ok 41 - reset input to empty
 
-expecting success of 0450.373 'merge-recursive-theirs -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.42 'truncated tag (missingObject, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 373 - merge-recursive-theirs -h output has no \t
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 42 - truncated tag (missingObject, "")
 
-expecting success of 0450.374 'merge-recursive-theirs -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.43 'truncated tag (missingObject, "obj")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 374 - merge-recursive-theirs -h output has dashed labels
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 43 - truncated tag (missingObject, "obj")
 
-expecting success of 0450.375 'merge-recursive-theirs -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.44 'truncated tag (missingObject, "object")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 375 - merge-recursive-theirs -h output has consistent spacing
-
-ok 376 # skip merge-recursive-theirs *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
-
-ok 377 # skip merge-recursive-theirs -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 44 - truncated tag (missingObject, "object")
 
-expecting success of 0450.378 'merge-subtree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.45 'truncated tag (badObjectSha1, "object ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 378 - merge-subtree -h output has no \t
+error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
+ok 45 - truncated tag (badObjectSha1, "object ")
 
-expecting success of 0450.379 'merge-subtree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.46 'truncated tag (badObjectSha1, "object 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 379 - merge-subtree -h output has dashed labels
+error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
+ok 46 - truncated tag (badObjectSha1, "object 1234")
 
-expecting success of 0450.380 'merge-subtree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.47 'add object line': 
+		echo "$content" >>base
 	
-ok 380 - merge-subtree -h output has consistent spacing
-
-ok 381 # skip merge-subtree *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_SUBTREE)
-
-ok 382 # skip merge-subtree -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_SUBTREE)
+ok 47 - add object line
 
-expecting success of 0450.383 'merge-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.48 'truncated tag (missingType, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 383 - merge-tree -h output has no \t
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 48 - truncated tag (missingType, "")
 
-expecting success of 0450.384 'merge-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.49 'truncated tag (missingType, "ty")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 384 - merge-tree -h output has dashed labels
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 49 - truncated tag (missingType, "ty")
 
-expecting success of 0450.385 'merge-tree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.50 'truncated tag (missingType, "type")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 385 - merge-tree -h output has consistent spacing
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 50 - truncated tag (missingType, "type")
 
-expecting success of 0450.386 'merge-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.51 'truncated tag (badType, "type ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 386 - merge-tree *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.387 'merge-tree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: badType: invalid 'type' value
+ok 51 - truncated tag (badType, "type ")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.52 'truncated tag (badType, "type com")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 387 - merge-tree -h output and SYNOPSIS agree
+error: object fails fsck: badType: invalid 'type' value
+ok 52 - truncated tag (badType, "type com")
 
-expecting success of 0450.388 'mktag -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.53 'add type line': 
+		echo "$content" >>base
 	
-ok 388 - mktag -h output has no \t
+ok 53 - add type line
 
-expecting success of 0450.389 'mktag -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.54 'truncated tag (missingTagEntry, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 389 - mktag -h output has dashed labels
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 54 - truncated tag (missingTagEntry, "")
 
-expecting success of 0450.390 'mktag -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.55 'truncated tag (missingTagEntry, "ta")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 390 - mktag -h output has consistent spacing
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 55 - truncated tag (missingTagEntry, "ta")
 
-expecting success of 0450.391 'mktag *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.56 'truncated tag (missingTagEntry, "tag")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 391 - mktag *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.392 'mktag -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 56 - truncated tag (missingTagEntry, "tag")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.57 'truncated tag (badTagName, "tag ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 392 - mktag -h output and SYNOPSIS agree
+error: object fails fsck: badTagName: invalid 'tag' name: 
+ok 57 - truncated tag (badTagName, "tag ")
 
-expecting success of 0450.393 'mktree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.58 'add tag line': 
+		echo "$content" >>base
 	
-ok 393 - mktree -h output has no \t
+ok 58 - add tag line
 
-expecting success of 0450.394 'mktree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.59 'truncated tag (missingTagger, "")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 394 - mktree -h output has dashed labels
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 59 - truncated tag (missingTagger, "")
 
-expecting success of 0450.395 'mktree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.60 'truncated tag (missingTagger, "ta")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 395 - mktree -h output has consistent spacing
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 60 - truncated tag (missingTagger, "ta")
 
-expecting success of 0450.396 'mktree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.61 'truncated tag (missingTagger, "tagger")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 396 - mktree *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.397 'mktree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 61 - truncated tag (missingTagger, "tagger")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.62 'truncated tag (missingEmail, "tagger ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 397 - mktree -h output and SYNOPSIS agree
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 62 - truncated tag (missingEmail, "tagger ")
 
-expecting success of 0450.398 'multi-pack-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.63 'truncated tag (missingEmail, "tagger name")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 398 - multi-pack-index -h output has no \t
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 63 - truncated tag (missingEmail, "tagger name")
 
-expecting success of 0450.399 'multi-pack-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.64 'truncated tag (badEmail, "tagger name <")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 399 - multi-pack-index -h output has dashed labels
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 64 - truncated tag (badEmail, "tagger name <")
 
-expecting success of 0450.400 'multi-pack-index -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.65 'truncated tag (badEmail, "tagger name <email")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 400 - multi-pack-index -h output has consistent spacing
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 65 - truncated tag (badEmail, "tagger name <email")
 
-expecting success of 0450.401 'multi-pack-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1451.66 'truncated tag (missingSpaceBeforeDate, "tagger name <email>")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 401 - multi-pack-index *.txt SYNOPSIS has dashed labels
-
-checking known breakage of 0450.402 'multi-pack-index -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 66 - truncated tag (missingSpaceBeforeDate, "tagger name <email>")
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1451.67 'truncated tag (badDate, "tagger name <email> ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
---- txt	2025-02-09 06:53:25.701469427 +0000
-+++ help	2025-02-09 06:53:25.701469427 +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>]
-+git multi-pack-index [<options>] verify
-+git multi-pack-index [<options>] expire
-+git multi-pack-index [<options>] repack [--batch-size=<size>]
-not ok 402 - multi-pack-index -h output and SYNOPSIS agree # TODO known breakage
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 67 - truncated tag (badDate, "tagger name <email> ")
 
-expecting success of 0450.403 'mv -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1451.68 'truncated tag (badDate, "tagger name <email> 1234")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 403 - mv -h output has no \t
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 68 - truncated tag (badDate, "tagger name <email> 1234")
 
-expecting success of 0450.404 'mv -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1451.69 'truncated tag (badTimezone, "tagger name <email> 1234 ")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 404 - mv -h output has dashed labels
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 69 - truncated tag (badTimezone, "tagger name <email> 1234 ")
 
-expecting success of 0450.405 'mv -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1451.70 'truncated tag (badTimezone, "tagger name <email> 1234 +")': 
+		# do not pipe into hash-object here; we want to increase
+		# the chance that it uses a fixed-size buffer or mmap,
+		# and a pipe would be read into a strbuf.
+		{
+			cat base &&
+			echo "$content"
+		} >input &&
+		test_must_fail git hash-object -t "$type" input 2>err &&
+		grep "$fsck" err
 	
-ok 405 - mv -h output has consistent spacing
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 70 - truncated tag (badTimezone, "tagger name <email> 1234 +")
 
-expecting success of 0450.406 'mv *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 406 - mv *.txt SYNOPSIS has dashed labels
+expecting success of 1451.71 'truncated tree (short hash)': 
+	printf "100644 foo\0\1\1\1\1" >input &&
+	test_must_fail git hash-object -t tree input 2>err &&
+	grep badTree err
 
-expecting success of 0450.407 'mv -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+error: object fails fsck: badTree: cannot be parsed as a tree
+ok 71 - truncated tree (short hash)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 407 - mv -h output and SYNOPSIS agree
+expecting success of 1451.72 'truncated tree (missing nul)': 
+	# these two things are indistinguishable to the parser. The important
+	# thing about this is example is that there are enough bytes to
+	# make up a hash, and that there is no NUL (and we confirm that the
+	# parser does not walk past the end of the buffer).
+	printf "100644 a long filename, or a hash with missing nul?" >input &&
+	test_must_fail git hash-object -t tree input 2>err &&
+	grep badTree err
 
-expecting success of 0450.408 'name-rev -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 408 - name-rev -h output has no \t
+error: object fails fsck: badTree: cannot be parsed as a tree
+ok 72 - truncated tree (missing nul)
 
-expecting success of 0450.409 'name-rev -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 409 - name-rev -h output has dashed labels
+# passed all 72 test(s)
+1..72
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1502-rev-parse-parseopt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1502-rev-parse-parseopt/.git/
+expecting success of 1502.1 'setup optionspec': 
+	sed -e "s/^|//" >optionspec <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+|h,help!   show the help
+|
+|foo       some nifty option --foo
+|bar=      some cool option --bar with an argument
+|b,baz     a short and long option
+|
+| An option group Header
+|C?        option C with an optional argument
+|d,data?   short and long option with an optional argument
+|
+| Argument hints
+|B=arg     short option required argument
+|bar2=arg  long option required argument
+|e,fuz=with-space  short and long option required argument
+|s?some    short option optional argument
+|long?data long option optional argument
+|g,fluf?path     short and long option optional argument
+|longest=very-long-argument-hint  a very long argument hint
+|pair=key=value  with an equals sign in the hint
+|aswitch help te=t contains? fl*g characters!`
+|bswitch=hint	 hint has trailing tab character
+|cswitch	 switch has trailing tab character
+|short-hint=a    with a one symbol hint
+|
+|Extras
+|extra1    line above used to cause a segfault but no longer does
+EOF
 
-expecting success of 0450.410 'name-rev -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 410 - name-rev -h output has consistent spacing
+ok 1 - setup optionspec
 
-expecting success of 0450.411 'name-rev *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 411 - name-rev *.txt SYNOPSIS has dashed labels
+expecting success of 1502.2 'setup optionspec-no-switches': 
+	sed -e "s/^|//" >optionspec_no_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+EOF
 
-checking known breakage of 0450.412 'name-rev -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 2 - setup optionspec-no-switches
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:25.769469860 +0000
-+++ help	2025-02-09 06:53:25.773469885 +0000
-@@ -1,2 +1,3 @@
--git name-rev [--tags] [--refs=<pattern>]
--             ( --all | --annotate-stdin | <commit-ish>... )
-+git name-rev [<options>] <commit>...
-+git name-rev [<options>] --all
-+git name-rev [<options>] --annotate-stdin
-not ok 412 - name-rev -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1502.3 'setup optionspec-only-hidden-switches': 
+	sed -e "s/^|//" >optionspec_only_hidden_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+|hidden1* A hidden switch
+EOF
 
-expecting success of 0450.413 'notes -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 413 - notes -h output has no \t
+ok 3 - setup optionspec-only-hidden-switches
 
-expecting success of 0450.414 'notes -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 414 - notes -h output has dashed labels
+expecting success of 1502.4 'test --parseopt help output': 
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
+	test_cmp "$TEST_DIRECTORY/t1502/optionspec.help" output
 
-expecting success of 0450.415 'notes -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 415 - notes -h output has consistent spacing
+ok 4 - test --parseopt help output
 
-expecting success of 0450.416 'notes *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 416 - notes *.txt SYNOPSIS has dashed labels
+expecting success of 1502.5 'test --parseopt help output no switches': 
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
+	test_cmp expect output
 
-checking known breakage of 0450.417 'notes -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 5 - test --parseopt help output no switches
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:25.821470191 +0000
-+++ help	2025-02-09 06:53:25.825470216 +0000
-@@ -1,12 +1,12 @@
--git notes [list [<object>]]
--git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
--git notes copy [-f] ( --stdin | <from-object> [<to-object>] )
--git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
--git notes edit [--allow-empty] [<object>] [--[no-]stripspace]
--git notes show [<object>]
--git notes merge [-v | -q] [-s <strategy> ] <notes-ref>
-+git notes [--ref <notes-ref>] [list [<object>]]
-+git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>] [-e]
-+git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>
-+git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>] [-e]
-+git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]
-+git notes [--ref <notes-ref>] show [<object>]
-+git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>
- git notes merge --commit [-v | -q]
- git notes merge --abort [-v | -q]
--git notes remove [--ignore-missing] [--stdin] [<object>...]
--git notes prune [-n] [-v]
--git notes get-ref
-+git notes [--ref <notes-ref>] remove [<object>...]
-+git notes [--ref <notes-ref>] prune [-n] [-v]
-+git notes [--ref <notes-ref>] get-ref
-not ok 417 - notes -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1502.6 'test --parseopt help output hidden switches': 
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
+	test_cmp expect output
 
-expecting success of 0450.418 'pack-objects -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 418 - pack-objects -h output has no \t
+ok 6 - test --parseopt help output hidden switches
 
-expecting success of 0450.419 'pack-objects -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 419 - pack-objects -h output has dashed labels
+expecting success of 1502.7 'test --parseopt help-all output hidden switches': 
+	sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+|    some-command does foo and bar!
+|
+|    --[no-]hidden1        A hidden switch
+|
+|EOF
+END_EXPECT
+	test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
+	test_cmp expect output
 
-expecting success of 0450.420 'pack-objects -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 420 - pack-objects -h output has consistent spacing
+ok 7 - test --parseopt help-all output hidden switches
 
-expecting success of 0450.421 'pack-objects *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 421 - pack-objects *.txt SYNOPSIS has dashed labels
+expecting success of 1502.8 'test --parseopt invalid switch help output': 
+	{
+		cat <<-\EOF &&
+		error: unknown option `does-not-exist'
+		EOF
+		sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/optionspec.help"
+	} >expect &&
+	test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
+	test_cmp expect output
 
-checking known breakage of 0450.422 'pack-objects -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 8 - test --parseopt invalid switch help output
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:25.877470547 +0000
-+++ help	2025-02-09 06:53:25.885470598 +0000
-@@ -1,7 +1,2 @@
--git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]
--                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]
--                 [--local] [--incremental] [--window=<n>] [--depth=<n>]
--                 [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
--                 [--cruft] [--cruft-expiration=<time>]
--                 [--stdout [--filter=<filter-spec>] | <base-name>]
--                 [--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>
-+git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]
-+git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]
-not ok 422 - pack-objects -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1502.9 'setup expect.1': 
+	cat > expect <<EOF
+set -- --foo --bar 'ham' -b --aswitch -- 'arg'
+EOF
 
-expecting success of 0450.423 'pack-redundant -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 423 - pack-redundant -h output has no \t
+ok 9 - setup expect.1
 
-expecting success of 0450.424 'pack-redundant -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 424 - pack-redundant -h output has dashed labels
+expecting success of 1502.10 'test --parseopt': 
+	git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
+	test_cmp expect output
 
-expecting success of 0450.425 'pack-redundant -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 425 - pack-redundant -h output has consistent spacing
+ok 10 - test --parseopt
 
-expecting success of 0450.426 'pack-redundant *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 426 - pack-redundant *.txt SYNOPSIS has dashed labels
+expecting success of 1502.11 'test --parseopt with mixed options and arguments': 
+	git rev-parse --parseopt -- --foo arg --bar=ham --baz --aswitch < optionspec > output &&
+	test_cmp expect output
 
-expecting success of 0450.427 'pack-redundant -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 11 - test --parseopt with mixed options and arguments
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 427 - pack-redundant -h output and SYNOPSIS agree
+expecting success of 1502.12 'setup expect.2': 
+	cat > expect <<EOF
+set -- --foo -- 'arg' '--bar=ham'
+EOF
 
-expecting success of 0450.428 'pack-refs -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 428 - pack-refs -h output has no \t
+ok 12 - setup expect.2
 
-expecting success of 0450.429 'pack-refs -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 429 - pack-refs -h output has dashed labels
+expecting success of 1502.13 'test --parseopt with --': 
+	git rev-parse --parseopt -- --foo -- arg --bar=ham < optionspec > output &&
+	test_cmp expect output
 
-expecting success of 0450.430 'pack-refs -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 430 - pack-refs -h output has consistent spacing
+ok 13 - test --parseopt with --
 
-expecting success of 0450.431 'pack-refs *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 431 - pack-refs *.txt SYNOPSIS has dashed labels
+expecting success of 1502.14 'test --parseopt --stop-at-non-option': 
+	git rev-parse --parseopt --stop-at-non-option -- --foo arg --bar=ham < optionspec > output &&
+	test_cmp expect output
 
-expecting success of 0450.432 'pack-refs -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 14 - test --parseopt --stop-at-non-option
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 432 - pack-refs -h output and SYNOPSIS agree
+expecting success of 1502.15 'setup expect.3': 
+	cat > expect <<EOF
+set -- --foo -- '--' 'arg' '--bar=ham'
+EOF
 
-expecting success of 0450.433 'patch-id -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 433 - patch-id -h output has no \t
+ok 15 - setup expect.3
 
-expecting success of 0450.434 'patch-id -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 434 - patch-id -h output has dashed labels
+expecting success of 1502.16 'test --parseopt --keep-dashdash': 
+	git rev-parse --parseopt --keep-dashdash -- --foo -- arg --bar=ham < optionspec > output &&
+	test_cmp expect output
 
-expecting success of 0450.435 'patch-id -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 435 - patch-id -h output has consistent spacing
+ok 16 - test --parseopt --keep-dashdash
 
-expecting success of 0450.436 'patch-id *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 436 - patch-id *.txt SYNOPSIS has dashed labels
+expecting success of 1502.17 'setup expect.4': 
+	cat >expect <<EOF
+set -- --foo -- '--' 'arg' '--spam=ham'
+EOF
 
-expecting success of 0450.437 'patch-id -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 17 - setup expect.4
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 437 - patch-id -h output and SYNOPSIS agree
+expecting success of 1502.18 'test --parseopt --keep-dashdash --stop-at-non-option with --': 
+	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo -- arg --spam=ham <optionspec >output &&
+	test_cmp expect output
 
-expecting success of 0450.438 'pickaxe -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 438 - pickaxe -h output has no \t
+ok 18 - test --parseopt --keep-dashdash --stop-at-non-option with --
 
-expecting success of 0450.439 'pickaxe -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 439 - pickaxe -h output has dashed labels
+expecting success of 1502.19 'setup expect.5': 
+	cat > expect <<EOF
+set -- --foo -- 'arg' '--spam=ham'
+EOF
 
-expecting success of 0450.440 'pickaxe -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 440 - pickaxe -h output has consistent spacing
+ok 19 - setup expect.5
 
-ok 441 # skip pickaxe *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_PICKAXE)
+expecting success of 1502.20 'test --parseopt --keep-dashdash --stop-at-non-option without --': 
+	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo arg --spam=ham <optionspec >output &&
+	test_cmp expect output
 
-ok 442 # skip pickaxe -h output and SYNOPSIS agree (missing BUILTIN_TXT_PICKAXE)
+ok 20 - test --parseopt --keep-dashdash --stop-at-non-option without --
 
-expecting success of 0450.443 'prune -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 443 - prune -h output has no \t
+expecting success of 1502.21 'setup expect.6': 
+	cat > expect <<EOF
+set -- --foo --bar='z' --baz -C'Z' --data='A' -- 'arg'
+EOF
 
-expecting success of 0450.444 'prune -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 444 - prune -h output has dashed labels
+ok 21 - setup expect.6
 
-expecting success of 0450.445 'prune -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 445 - prune -h output has consistent spacing
+expecting success of 1502.22 'test --parseopt --stuck-long': 
+	git rev-parse --parseopt --stuck-long -- --foo --bar=z -b arg -CZ -dA <optionspec >output &&
+	test_cmp expect output
 
-expecting success of 0450.446 'prune *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 446 - prune *.txt SYNOPSIS has dashed labels
+ok 22 - test --parseopt --stuck-long
 
-expecting success of 0450.447 'prune -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1502.23 'setup expect.7': 
+	cat > expect <<EOF
+set -- --data='' -C --baz -- 'arg'
+EOF
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 447 - prune -h output and SYNOPSIS agree
+ok 23 - setup expect.7
 
-expecting success of 0450.448 'prune-packed -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 448 - prune-packed -h output has no \t
+expecting success of 1502.24 'test --parseopt --stuck-long and empty optional argument': 
+	git rev-parse --parseopt --stuck-long -- --data= arg -C -b <optionspec >output &&
+	test_cmp expect output
 
-expecting success of 0450.449 'prune-packed -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 449 - prune-packed -h output has dashed labels
+ok 24 - test --parseopt --stuck-long and empty optional argument
 
-expecting success of 0450.450 'prune-packed -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 450 - prune-packed -h output has consistent spacing
+expecting success of 1502.25 'setup expect.8': 
+	cat > expect <<EOF
+set -- --data --baz -- 'arg'
+EOF
 
-expecting success of 0450.451 'prune-packed *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 451 - prune-packed *.txt SYNOPSIS has dashed labels
+ok 25 - setup expect.8
 
-expecting success of 0450.452 'prune-packed -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1502.26 'test --parseopt --stuck-long and long option with unset optional argument': 
+	git rev-parse --parseopt --stuck-long -- --data arg -b <optionspec >output &&
+	test_cmp expect output
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 452 - prune-packed -h output and SYNOPSIS agree
+ok 26 - test --parseopt --stuck-long and long option with unset optional argument
 
-expecting success of 0450.453 'pull -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 453 - pull -h output has no \t
+expecting success of 1502.27 'test --parseopt --stuck-long and short option with unset optional argument': 
+	git rev-parse --parseopt --stuck-long -- -d arg -b <optionspec >output &&
+	test_cmp expect output
 
-expecting success of 0450.454 'pull -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 454 - pull -h output has dashed labels
+ok 27 - test --parseopt --stuck-long and short option with unset optional argument
 
-expecting success of 0450.455 'pull -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 455 - pull -h output has consistent spacing
+expecting success of 1502.28 'test --parseopt help output: "wrapped" options normal "or:" lines': 
+	sed -e "s/^|//" >spec <<-\EOF &&
+	|cmd [--some-option]
+	|    [--another-option]
+	|cmd [--yet-another-option]
+	|--
+	|h,help!   show the help
+	EOF
 
-expecting success of 0450.456 'pull *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 456 - pull *.txt SYNOPSIS has dashed labels
+	sed -e "s/^|//" >expect <<-\END_EXPECT &&
+	|cat <<\EOF
+	|usage: cmd [--some-option]
+	|   or:     [--another-option]
+	|   or: cmd [--yet-another-option]
+	|
+	|    -h, --help            show the help
+	|
+	|EOF
+	END_EXPECT
 
-expecting success of 0450.457 'pull -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
+	test_cmp expect actual
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 457 - pull -h output and SYNOPSIS agree
+ok 28 - test --parseopt help output: "wrapped" options normal "or:" lines
 
-expecting success of 0450.458 'push -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 458 - push -h output has no \t
+expecting success of 1502.29 'test --parseopt invalid opt-spec': 
+	test_write_lines x -- "=, x" >spec &&
+	echo "fatal: missing opt-spec before option flags" >expect &&
+	test_must_fail git rev-parse --parseopt -- <spec 2>err &&
+	test_cmp expect err
 
-expecting success of 0450.459 'push -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 459 - push -h output has dashed labels
+ok 29 - test --parseopt invalid opt-spec
 
-expecting success of 0450.460 'push -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 460 - push -h output has consistent spacing
+expecting success of 1502.30 'test --parseopt help output: multi-line blurb after empty line': 
+	sed -e "s/^|//" >spec <<-\EOF &&
+	|cmd [--some-option]
+	|    [--another-option]
+	|
+	|multi
+	|line
+	|blurb
+	|--
+	|h,help!   show the help
+	EOF
 
-expecting success of 0450.461 'push *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 461 - push *.txt SYNOPSIS has dashed labels
+	sed -e "s/^|//" >expect <<-\END_EXPECT &&
+	|cat <<\EOF
+	|usage: cmd [--some-option]
+	|   or:     [--another-option]
+	|
+	|    multi
+	|    line
+	|    blurb
+	|
+	|    -h, --help            show the help
+	|
+	|EOF
+	END_EXPECT
 
-checking known breakage of 0450.462 'push -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
+	test_cmp expect actual
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:26.501474517 +0000
-+++ help	2025-02-09 06:53:26.517474619 +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]
--         [-u | --set-upstream] [-o <string> | --push-option=<string>]
--         [--[no-]signed|--signed=(true|false|if-asked)]
--         [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
--         [--no-verify] [<repository> [<refspec>...]]
-+git push [<options>] [<repository> [<refspec>...]]
-not ok 462 - push -h output and SYNOPSIS agree # TODO known breakage
+ok 30 - test --parseopt help output: multi-line blurb after empty line
 
-expecting success of 0450.463 'range-diff -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 463 - range-diff -h output has no \t
+expecting success of 1502.31 'test --parseopt help output for optionspec-neg': 
+	test_expect_code 129 git rev-parse --parseopt -- \
+		-h >output <"$TEST_DIRECTORY/t1502/optionspec-neg" &&
+	test_cmp "$TEST_DIRECTORY/t1502/optionspec-neg.help" output
 
-expecting success of 0450.464 'range-diff -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 464 - range-diff -h output has dashed labels
+ok 31 - test --parseopt help output for optionspec-neg
 
-expecting success of 0450.465 'range-diff -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 465 - range-diff -h output has consistent spacing
+expecting success of 1502.32 'test --parseopt valid options for optionspec-neg': 
+	cat >expect <<-\EOF &&
+	set -- --foo --no-foo --no-bar --positive-only --no-negative --
+	EOF
+	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
+	       --foo --no-foo --no-bar --positive-only --no-negative &&
+	test_cmp expect output
 
-expecting success of 0450.466 'range-diff *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 466 - range-diff *.txt SYNOPSIS has dashed labels
+ok 32 - test --parseopt valid options for optionspec-neg
 
-checking known breakage of 0450.467 'range-diff -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1502.33 'test --parseopt positivated option for optionspec-neg': 
+	cat >expect <<-\EOF &&
+	set -- --no-no-bar --no-no-bar --
+	EOF
+	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
+	       --no-no-bar --bar &&
+	test_cmp expect output
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:26.605475179 +0000
-+++ help	2025-02-09 06:53:26.609475205 +0000
-@@ -1,6 +1,3 @@
--git range-diff [--color=[<when>]] [--no-color] [<diff-options>]
--               [--no-dual-color] [--creation-factor=<factor>]
--               [--left-only | --right-only] [--diff-merges=<format>]
--               [--remerge-diff]
--               ( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )
--               [[--] <path>...]
-+git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>
-+git range-diff [<options>] <old-tip>...<new-tip>
-+git range-diff [<options>] <base> <old-tip> <new-tip>
-not ok 467 - range-diff -h output and SYNOPSIS agree # TODO known breakage
+ok 33 - test --parseopt positivated option for optionspec-neg
 
-expecting success of 0450.468 'read-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1502.34 'test --parseopt invalid switch --no-positive-only help output for optionspec-neg': 
+		{
+			cat <<-\EOF &&
+			error: unknown option `no-positive-only'
+			EOF
+			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
+		} >expect &&
+		test_expect_code 129 git rev-parse --parseopt -- $opt \
+			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
+		test_cmp expect output
 	
-ok 468 - read-tree -h output has no \t
+ok 34 - test --parseopt invalid switch --no-positive-only help output for optionspec-neg
 
-expecting success of 0450.469 'read-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1502.35 'test --parseopt invalid switch --negative help output for optionspec-neg': 
+		{
+			cat <<-\EOF &&
+			error: unknown option `negative'
+			EOF
+			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
+		} >expect &&
+		test_expect_code 129 git rev-parse --parseopt -- $opt \
+			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
+		test_cmp expect output
 	
-ok 469 - read-tree -h output has dashed labels
+ok 35 - test --parseopt invalid switch --negative help output for optionspec-neg
 
-expecting success of 0450.470 'read-tree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1502.36 'test --parseopt invalid switch --no-no-negative help output for optionspec-neg': 
+		{
+			cat <<-\EOF &&
+			error: unknown option `no-no-negative'
+			EOF
+			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
+		} >expect &&
+		test_expect_code 129 git rev-parse --parseopt -- $opt \
+			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
+		test_cmp expect output
 	
-ok 470 - read-tree -h output has consistent spacing
+ok 36 - test --parseopt invalid switch --no-no-negative help output for optionspec-neg
 
-expecting success of 0450.471 'read-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 471 - read-tree *.txt SYNOPSIS has dashed labels
+expecting success of 1502.37 'ambiguous: --no matches both --noble and --no-noble': 
+	cat >spec <<-\EOF &&
+	some-command [options]
+	--
+	noble The feudal switch.
+	EOF
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	git rev-parse --parseopt -- <spec 2>err --no &&
+	grep "error: ambiguous option: no (could be --noble or --no-noble)" err
 
-expecting success of 0450.472 'read-tree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+cat <<\EOF
+usage: some-command [options]
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 472 - read-tree -h output and SYNOPSIS agree
+    --[no-]noble          The feudal switch.
 
-expecting success of 0450.473 'rebase -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 473 - rebase -h output has no \t
+EOF
+error: ambiguous option: no (could be --noble or --no-noble)
+ok 37 - ambiguous: --no matches both --noble and --no-noble
 
-expecting success of 0450.474 'rebase -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 474 - rebase -h output has dashed labels
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1503-rev-parse-verify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
 
-expecting success of 0450.475 'rebase -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 475 - rebase -h output has consistent spacing
+ok 1 - set up basic repo with 1 file (hello) and 4 commits
 
-expecting success of 0450.476 'rebase *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 476 - rebase *.txt SYNOPSIS has dashed labels
+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"
 
-checking known breakage of 0450.477 'rebase -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 2 - works with one good rev
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:26.769476223 +0000
-+++ help	2025-02-09 06:53:26.777476273 +0000
-@@ -1,5 +1,3 @@
--git rebase [-i | --interactive] [<options>] [--exec <cmd>]
--           [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
--git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
--           --root [<branch>]
--git rebase (--continue|--skip|--abort|--quit|--edit-todo|--show-current-patch)
-+git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-+git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-+git rebase --continue | --abort | --skip | --edit-todo
-not ok 477 - rebase -h output and SYNOPSIS agree # TODO known breakage
+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
 
-expecting success of 0450.478 'receive-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 478 - receive-pack -h output has no \t
+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 0450.479 'receive-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 479 - receive-pack -h output has dashed labels
+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
 
-expecting success of 0450.480 'receive-pack -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 480 - receive-pack -h output has consistent spacing
+ok 4 - fails silently when using -q
 
-expecting success of 0450.481 'receive-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 481 - receive-pack *.txt SYNOPSIS has dashed labels
+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
 
-expecting success of 0450.482 'receive-pack -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 5 - fails silently when using -q with deleted reflogs
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 482 - receive-pack -h output and SYNOPSIS agree
+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
 
-expecting success of 0450.483 'reflog -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 483 - reflog -h output has no \t
+ok 6 - fails silently when using -q with not enough reflogs
 
-expecting success of 0450.484 'reflog -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 484 - reflog -h output has dashed labels
+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
 
-expecting success of 0450.485 'reflog -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 485 - reflog -h output has consistent spacing
+ok 7 - succeeds silently with -q and reflogs that do not go far back enough in time
 
-expecting success of 0450.486 'reflog *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 486 - reflog *.txt SYNOPSIS has dashed labels
+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 0450.487 'reflog -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+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
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 487 - reflog -h output and SYNOPSIS agree
+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 0450.488 'refs -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 488 - refs -h output has no \t
+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 0450.489 'refs -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 489 - refs -h output has dashed labels
+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 0450.490 'refs -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 490 - refs -h output has consistent spacing
+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 0450.491 'refs *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 491 - refs *.txt SYNOPSIS has dashed labels
+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 0450.492 'refs -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 11 - options can appear after --verify
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 492 - refs -h output and SYNOPSIS agree
+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
 
-expecting success of 0450.493 'remote -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 493 - remote -h output has no \t
+ok 12 - verify respects --end-of-options
 
-expecting success of 0450.494 'remote -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 494 - remote -h output has dashed labels
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1501-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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/") &&
 
-expecting success of 0450.495 'remote -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 495 - remote -h output has consistent spacing
+	mkdir -p work/sub/dir &&
+	mkdir -p work2 &&
+	mv .git repo.git
 
-expecting success of 0450.496 'remote *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 496 - remote *.txt SYNOPSIS has dashed labels
+ok 1 - setup
 
-checking known breakage of 0450.497 'remote -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
+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
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
+			echo $4 >expected.prefix
 		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
-
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:27.081478208 +0000
-+++ help	2025-02-09 06:53:27.093478284 +0000
-@@ -1,13 +1,13 @@
- git remote [-v | --verbose]
--git remote add [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
-+git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>
- git remote rename [--[no-]progress] <old> <new>
- git remote remove <name>
- git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
-+git remote [-v | --verbose] show [-n] <name>
-+git remote prune [-n | --dry-run] <name>
-+git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]
- git remote set-branches [--add] <name> <branch>...
- git remote get-url [--push] [--all] <name>
- git remote set-url [--push] <name> <newurl> [<oldurl>]
--git remote set-url --add [--push] <name> <newurl>
--git remote set-url --delete [--push] <name> <URL>
--git remote [-v | --verbose] 'show' [-n] <name>...
--git remote prune [-n | --dry-run] <name>...
--git remote [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
-+git remote set-url --add <name> <newurl>
-+git remote set-url --delete <name> <url>
-not ok 497 - remote -h output and SYNOPSIS agree # TODO known breakage
-
-expecting success of 0450.498 'remote-ext -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 498 - remote-ext -h output has no \t
 
-expecting success of 0450.499 'remote-ext -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 499 - remote-ext -h output has dashed labels
+		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 &&
 
-expecting success of 0450.500 'remote-ext -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
+		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
-			test_line_count = 1 help.ws
+			# 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 500 - remote-ext -h output has consistent spacing
+	}
 
-expecting success of 0450.501 'remote-ext *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 501 - remote-ext *.txt SYNOPSIS has dashed labels
+ok 2 - setup: helper for testing rev-parse
 
-checking known breakage of 0450.502 'remote-ext -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 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
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:27.289479531 +0000
-+++ help	2025-02-09 06:53:27.341479862 +0000
-@@ -1 +1 @@
--git remote add <nick> "ext::<command>[ <arguments>...]"
-+git remote-ext <remote> <url>
-not ok 502 - remote-ext -h output and SYNOPSIS agree # TODO known breakage
+ok 3 - setup: core.worktree = relative path
 
-expecting success of 0450.503 'remote-fd -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 503 - remote-fd -h output has no \t
+expecting success of 1501.4 'outside': 
+	test_rev_parse false false false
 
-expecting success of 0450.504 'remote-fd -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 504 - remote-fd -h output has dashed labels
+ok 4 - outside
 
-expecting success of 0450.505 'remote-fd -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 505 - remote-fd -h output has consistent spacing
+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 0450.506 'remote-fd *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 506 - remote-fd *.txt SYNOPSIS has dashed labels
+'actual.prefix' is not empty, it contains:
 
-checking known breakage of 0450.507 'remote-fd -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 5 - inside work tree
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:27.553481211 +0000
-+++ help	2025-02-09 06:53:27.597481491 +0000
-@@ -0,0 +1 @@
-+git remote-fd <remote> <url>
-not ok 507 - remote-fd -h output and SYNOPSIS agree # TODO known breakage
+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
 
-expecting success of 0450.508 'repack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 508 - repack -h output has no \t
+ok 6 - empty prefix is actually written out
 
-expecting success of 0450.509 'repack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 509 - repack -h output has dashed labels
+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/
+	)
 
-expecting success of 0450.510 'repack -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 510 - repack -h output has consistent spacing
+ok 7 - subdir of work tree
 
-expecting success of 0450.511 'repack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 511 - repack *.txt SYNOPSIS has dashed labels
+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"
 
-checking known breakage of 0450.512 'repack -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 8 - setup: core.worktree = absolute path
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:28.025484214 +0000
-+++ help	2025-02-09 06:53:28.061484443 +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>]
-not ok 512 - repack -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1501.9 'outside': 
+	test_rev_parse false false false &&
+	(
+		cd work2 &&
+		test_rev_parse false false false
+	)
 
-expecting success of 0450.513 'replace -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 513 - replace -h output has no \t
+ok 9 - outside
 
-expecting success of 0450.514 'replace -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 514 - replace -h output has dashed labels
+expecting success of 1501.10 'inside work tree': 
+	(
+		cd work &&
+		test_rev_parse false false true ""
+	)
 
-expecting success of 0450.515 'replace -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 515 - replace -h output has consistent spacing
+'actual.prefix' is not empty, it contains:
 
-expecting success of 0450.516 'replace *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 516 - replace *.txt SYNOPSIS has dashed labels
+ok 10 - inside work tree
 
-expecting success of 0450.517 'replace -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1501.11 'subdir of work tree': 
+	(
+		cd work/sub/dir &&
+		test_rev_parse false false true sub/dir/
+	)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 517 - replace -h output and SYNOPSIS agree
+ok 11 - subdir of work tree
 
-expecting success of 0450.518 'replay -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 518 - replay -h output has no \t
+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
 
-expecting success of 0450.519 'replay -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 519 - replay -h output has dashed labels
+ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree)
 
-expecting success of 0450.520 'replay -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 520 - replay -h output has consistent spacing
+expecting success of 1501.13 'outside': 
+	test_rev_parse false false false &&
+	(
+		cd work2 &&
+		test_rev_parse false false false
+	)
 
-expecting success of 0450.521 'replay *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 521 - replay *.txt SYNOPSIS has dashed labels
+ok 13 - outside
 
-expecting success of 0450.522 'replay -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1501.14 'inside work tree': 
+	(
+		cd work &&
+		GIT_WORK_TREE=. &&
+		test_rev_parse false false true ""
+	)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 522 - replay -h output and SYNOPSIS agree
+'actual.prefix' is not empty, it contains:
 
-expecting success of 0450.523 'rerere -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 523 - rerere -h output has no \t
+ok 14 - inside work tree
 
-expecting success of 0450.524 'rerere -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 524 - rerere -h output has dashed labels
+expecting success of 1501.15 'subdir of work tree': 
+	(
+		cd work/sub/dir &&
+		GIT_WORK_TREE=../.. &&
+		test_rev_parse false false true sub/dir/
+	)
 
-expecting success of 0450.525 'rerere -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 525 - rerere -h output has consistent spacing
+ok 15 - subdir of work tree
 
-expecting success of 0450.526 'rerere *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 526 - rerere *.txt SYNOPSIS has dashed labels
+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
 
-expecting success of 0450.527 'rerere -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 16 - setup: GIT_WORK_TREE=absolute, below git dir
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 527 - rerere -h output and SYNOPSIS agree
+expecting success of 1501.17 'outside': 
+	echo outside &&
+	test_rev_parse false false false
 
-expecting success of 0450.528 'reset -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 528 - reset -h output has no \t
+outside
+ok 17 - outside
 
-expecting success of 0450.529 'reset -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 529 - reset -h output has dashed labels
+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
+	)
 
-expecting success of 0450.530 'reset -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 530 - reset -h output has consistent spacing
+ok 18 - in repo.git
 
-expecting success of 0450.531 'reset *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 531 - reset *.txt SYNOPSIS has dashed labels
+expecting success of 1501.19 'inside work tree': 
+	(
+		cd repo.git/work &&
+		test_rev_parse false true true ""
+	)
 
-checking known breakage of 0450.532 'reset -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+'actual.prefix' is not empty, it contains:
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:29.165491467 +0000
-+++ help	2025-02-09 06:53:29.213491773 +0000
-@@ -1,4 +1,4 @@
-+git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
- git reset [-q] [<tree-ish>] [--] <pathspec>...
--git reset [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]
--git reset (--patch | -p) [<tree-ish>] [--] [<pathspec>...]
--git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]
-+git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-+git reset --patch [<tree-ish>] [--] [<pathspec>...]
-not ok 532 - reset -h output and SYNOPSIS agree # TODO known breakage
+ok 19 - inside work tree
 
-expecting success of 0450.533 'restore -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 533 - restore -h output has no \t
+expecting success of 1501.20 'subdir of work tree': 
+	(
+		cd repo.git/work/sub/dir &&
+		test_rev_parse false true true sub/dir/
+	)
 
-expecting success of 0450.534 'restore -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 534 - restore -h output has dashed labels
+ok 20 - subdir of work tree
 
-expecting success of 0450.535 'restore -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 535 - restore -h output has consistent spacing
+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
 
-expecting success of 0450.536 'restore *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 536 - restore *.txt SYNOPSIS has dashed labels
+ok 21 - find work tree from repo
 
-checking known breakage of 0450.537 'restore -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 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
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:29.409493020 +0000
-+++ help	2025-02-09 06:53:29.429493147 +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]
--git restore (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]
-+git restore [<options>] [--source=<branch>] <file>...
-not ok 537 - restore -h output and SYNOPSIS agree # TODO known breakage
+ok 22 - find work tree from work tree
 
-expecting success of 0450.538 'rev-list -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 538 - rev-list -h output has no \t
+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 &&
 
-expecting success of 0450.539 'rev-list -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 539 - rev-list -h output has dashed labels
+		git diff --exit-code tracked &&
+		echo changed >tracked &&
+		test_must_fail git diff --exit-code tracked
+	)
 
-expecting success of 0450.540 'rev-list -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 540 - rev-list -h output has consistent spacing
+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 0450.541 'rev-list *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 541 - rev-list *.txt SYNOPSIS has dashed labels
+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
 
-expecting success of 0450.542 'rev-list -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	(
+		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
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 542 - rev-list -h output and SYNOPSIS agree
+ok 24 - diff-index respects work tree under .git dir
 
-expecting success of 0450.543 'rev-parse -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 543 - rev-parse -h output has no \t
+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
 
-expecting success of 0450.544 'rev-parse -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 544 - rev-parse -h output has dashed labels
+	(
+		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
 
-expecting success of 0450.545 'rev-parse -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 545 - rev-parse -h output has consistent spacing
+ok 25 - diff-files respects work tree under .git dir
 
-expecting success of 0450.546 'rev-parse *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 546 - rev-parse *.txt SYNOPSIS has dashed labels
+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
 
-checking known breakage of 0450.547 'rev-parse -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+	(
+		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
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:29.589494165 +0000
-+++ help	2025-02-09 06:53:29.593494190 +0000
-@@ -1 +1,3 @@
--git rev-parse [<options>] <arg>...
-+git rev-parse --parseopt [<options>] -- [<args>...]
-+git rev-parse --sq-quote [<arg>...]
-+git rev-parse [<options>] [<arg>...]
-not ok 547 - rev-parse -h output and SYNOPSIS agree # TODO known breakage
+ok 26 - git diff respects work tree under .git dir
 
-expecting success of 0450.548 'revert -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 548 - revert -h output has no \t
+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
 
-expecting success of 0450.549 'revert -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 549 - revert -h output has dashed labels
+ok 27 - git grep
 
-expecting success of 0450.550 'revert -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 550 - revert -h output has consistent spacing
+expecting success of 1501.28 'git commit': 
+	(
+		cd repo.git &&
+		GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done
+	)
 
-expecting success of 0450.551 'revert *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 551 - revert *.txt SYNOPSIS has dashed labels
+[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 0450.552 'revert -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 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
+	)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 552 - revert -h output and SYNOPSIS agree
+fatal: /home: '/home' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1501-work-tree/repo.git/work'
+ok 29 - absolute pathspec should fail gracefully
 
-expecting success of 0450.553 'rm -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 553 - rm -h output has no \t
+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 0450.554 'rm -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 554 - rm -h output has dashed labels
+git --git-dir=/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1501-work-tree//repo.git --work-tree=/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1501-work-tree add dummy_file
+ok 30 - make_relative_path handles double slashes in GIT_DIR
 
-expecting success of 0450.555 'rm -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 555 - rm -h output has consistent spacing
+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 0450.556 'rm *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 556 - rm *.txt SYNOPSIS has dashed labels
+ok 31 - relative $GIT_WORK_TREE and git subprocesses
 
-expecting success of 0450.557 'rm -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 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
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 557 - rm -h output and SYNOPSIS agree
+cp: cannot stat 'repo.git/sharedindex.*': No such file or directory
+ok 32 - Multi-worktree setup
 
-expecting success of 0450.558 'send-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 558 - send-pack -h output has no \t
+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 0450.559 'send-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 559 - send-pack -h output has dashed labels
+ok 33 - GIT_DIR set (1)
 
-expecting success of 0450.560 'send-pack -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 560 - send-pack -h output has consistent spacing
+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 0450.561 'send-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 561 - send-pack *.txt SYNOPSIS has dashed labels
+ok 34 - GIT_DIR set (2)
 
-expecting success of 0450.562 'send-pack -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 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
+	)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 562 - send-pack -h output and SYNOPSIS agree
+ok 35 - Auto discovery
 
-expecting success of 0450.563 'shortlog -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 563 - shortlog -h output has no \t
+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 0450.564 'shortlog -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 564 - shortlog -h output has dashed labels
+ok 36 - $GIT_DIR/common overrides core.worktree
 
-expecting success of 0450.565 'shortlog -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 565 - shortlog -h output has consistent spacing
+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 0450.566 'shortlog *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 566 - shortlog *.txt SYNOPSIS has dashed labels
+ok 37 - $GIT_WORK_TREE overrides $GIT_DIR/common
 
-expecting success of 0450.567 'shortlog -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 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
+	)
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 567 - shortlog -h output and SYNOPSIS agree
+fatal: Invalid path '/.invalid': No such file or directory
+ok 38 - error out gracefully on invalid $GIT_WORK_TREE
 
-expecting success of 0450.568 'show -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 568 - show -h output has no \t
+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 0450.569 'show -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 569 - show -h output has dashed labels
+	GIT_DIR=relative/.git GIT_WORK_TREE=relative git reset HEAD^ &&
 
-expecting success of 0450.570 'show -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 570 - show -h output has consistent spacing
+	git -C relative log -1 --format=%s >actual &&
+	echo one >expect &&
+	test_cmp expect actual
 
-expecting success of 0450.571 'show *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 571 - show *.txt SYNOPSIS has dashed labels
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-checking known breakage of 0450.572 'show -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+# passed all 39 test(s)
+1..39
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1505-rev-parse-last.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1505-rev-parse-last/.git/
+expecting success of 1505.1 'setup': 
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:29.917496252 +0000
-+++ help	2025-02-09 06:53:29.925496303 +0000
-@@ -1 +1,2 @@
--git show [<options>] [<object>...]
-+git log [<options>] [<revision-range>] [[--] <path>...]
-+git show [<options>] <object>...
-not ok 572 - show -h output and SYNOPSIS agree # TODO known breakage
+	make_commit 1 &&
+	git branch side &&
+	make_commit 2 &&
+	make_commit 3 &&
+	git checkout side &&
+	make_commit 4 &&
+	git merge main &&
+	git checkout main
 
-expecting success of 0450.573 'show-branch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 573 - show-branch -h output has no \t
 
-expecting success of 0450.574 'show-branch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 574 - show-branch -h output has dashed labels
+[main (root-commit) c11cd10] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+[main ba98451] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2
+[main aefd701] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3
+Switched to branch 'side'
+[side 1d4df77] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4
+Merge made by the 'ort' strategy.
+ 2 | 1 +
+ 3 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 2
+ create mode 100644 3
+Switched to branch 'main'
+ok 1 - setup
 
-expecting success of 0450.575 'show-branch -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 575 - show-branch -h output has consistent spacing
+expecting success of 1505.2 '@{-1} works': 
+	test_cmp_rev side @{-1}
 
-expecting success of 0450.576 'show-branch *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 576 - show-branch *.txt SYNOPSIS has dashed labels
+ok 2 - @{-1} works
 
-expecting success of 0450.577 'show-branch -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1505.3 '@{-1}~2 works': 
+	test_cmp_rev side~2 @{-1}~2
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 577 - show-branch -h output and SYNOPSIS agree
+ok 3 - @{-1}~2 works
 
-expecting success of 0450.578 'show-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 578 - show-index -h output has no \t
+expecting success of 1505.4 '@{-1}^2 works': 
+	test_cmp_rev side^2 @{-1}^2
 
-expecting success of 0450.579 'show-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 579 - show-index -h output has dashed labels
+ok 4 - @{-1}^2 works
 
-expecting success of 0450.580 'show-index -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 580 - show-index -h output has consistent spacing
+expecting success of 1505.5 '@{-1}@{1} works': 
+	test_cmp_rev side@{1} @{-1}@{1}
 
-expecting success of 0450.581 'show-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 581 - show-index *.txt SYNOPSIS has dashed labels
+ok 5 - @{-1}@{1} works
 
-expecting success of 0450.582 'show-index -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1505.6 '@{-2} works': 
+	test_cmp_rev main @{-2}
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 582 - show-index -h output and SYNOPSIS agree
+ok 6 - @{-2} works
 
-expecting success of 0450.583 'show-ref -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 583 - show-ref -h output has no \t
+expecting success of 1505.7 '@{-3} fails': 
+	test_must_fail git rev-parse @{-3}
 
-expecting success of 0450.584 'show-ref -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 584 - show-ref -h output has dashed labels
+fatal: ambiguous argument '@{-3}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+@{-3}
+ok 7 - @{-3} fails
 
-expecting success of 0450.585 'show-ref -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1504-ceiling-dirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1504-ceiling-dirs/.git/
+expecting success of 1504.1 'no_ceil: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 585 - show-ref -h output has consistent spacing
+ok 1 - no_ceil: git rev-parse --show-prefix is ''
 
-expecting success of 0450.586 'show-ref *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.2 'ceil_empty: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 586 - show-ref *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.587 'show-ref -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 2 - ceil_empty: git rev-parse --show-prefix is ''
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.3 'ceil_at_parent: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 587 - show-ref -h output and SYNOPSIS agree
+ok 3 - ceil_at_parent: git rev-parse --show-prefix is ''
 
-expecting success of 0450.588 'sparse-checkout -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.4 'ceil_at_parent_slash: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 588 - sparse-checkout -h output has no \t
+ok 4 - ceil_at_parent_slash: git rev-parse --show-prefix is ''
 
-expecting success of 0450.589 'sparse-checkout -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.5 'ceil_at_trash: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 589 - sparse-checkout -h output has dashed labels
+ok 5 - ceil_at_trash: git rev-parse --show-prefix is ''
 
-expecting success of 0450.590 'sparse-checkout -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.6 'ceil_at_trash_slash: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 590 - sparse-checkout -h output has consistent spacing
+ok 6 - ceil_at_trash_slash: git rev-parse --show-prefix is ''
 
-expecting success of 0450.591 'sparse-checkout *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.7 'ceil_at_sub: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 591 - sparse-checkout *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.592 'sparse-checkout -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 7 - ceil_at_sub: git rev-parse --show-prefix is ''
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.8 'ceil_at_sub_slash: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 592 - sparse-checkout -h output and SYNOPSIS agree
+ok 8 - ceil_at_sub_slash: git rev-parse --show-prefix is ''
 
-expecting success of 0450.593 'stage -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 593 - stage -h output has no \t
+checking prerequisite: SYMLINKS
 
-expecting success of 0450.594 'stage -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 594 - stage -h output has dashed labels
+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 0450.595 'stage -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+)
+prerequisite SYMLINKS ok
+expecting success of 1504.9 'subdir_no_ceil: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 595 - stage -h output has consistent spacing
+ok 9 - subdir_no_ceil: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.596 'stage *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.10 'subdir_ceil_empty: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 596 - stage *.txt SYNOPSIS has dashed labels
-
-checking known breakage of 0450.597 'stage -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 10 - subdir_ceil_empty: git rev-parse --show-prefix is 'sub/dir/'
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.11 'subdir_ceil_at_trash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
---- txt	2025-02-09 06:53:31.289504981 +0000
-+++ help	2025-02-09 06:53:31.313505134 +0000
-@@ -1 +1 @@
--git stage <arg>...
-+git add [<options>] [--] <pathspec>...
-not ok 597 - stage -h output and SYNOPSIS agree # TODO known breakage
+fatal: not a git repository (or any of the parent directories): .git
+ok 11 - subdir_ceil_at_trash: prefix
 
-expecting success of 0450.598 'stash -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.12 'subdir_ceil_at_trash_slash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 598 - stash -h output has no \t
+fatal: not a git repository (or any of the parent directories): .git
+ok 12 - subdir_ceil_at_trash_slash: prefix
 
-expecting success of 0450.599 'stash -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.13 'subdir_ceil_at_sub: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 599 - stash -h output has dashed labels
+fatal: not a git repository (or any of the parent directories): .git
+ok 13 - subdir_ceil_at_sub: prefix
 
-expecting success of 0450.600 'stash -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.14 'subdir_ceil_at_sub_slash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 600 - stash -h output has consistent spacing
+fatal: not a git repository (or any of the parent directories): .git
+ok 14 - subdir_ceil_at_sub_slash: prefix
 
-expecting success of 0450.601 'stash *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.15 'subdir_ceil_at_top: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 601 - stash *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.602 'stash -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+fatal: not a git repository (or any of the parent directories): .git
+ok 15 - subdir_ceil_at_top: prefix
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.16 'subdir_ceil_at_top_slash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 602 - stash -h output and SYNOPSIS agree
+fatal: not a git repository (or any of the parent directories): .git
+ok 16 - subdir_ceil_at_top_slash: prefix
 
-expecting success of 0450.603 'status -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.17 'subdir_ceil_at_top_no_resolve: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 603 - status -h output has no \t
+ok 17 - subdir_ceil_at_top_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.604 'status -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.18 'subdir_ceil_at_top_slash_no_resolve: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 604 - status -h output has dashed labels
+ok 18 - subdir_ceil_at_top_slash_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.605 'status -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.19 'subdir_ceil_at_subdir: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 605 - status -h output has consistent spacing
+ok 19 - subdir_ceil_at_subdir: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.606 'status *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.20 'subdir_ceil_at_subdir_slash: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 606 - status *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.607 'status -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 20 - subdir_ceil_at_subdir_slash: git rev-parse --show-prefix is 'sub/dir/'
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.21 'subdir_ceil_at_su: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 607 - status -h output and SYNOPSIS agree
+ok 21 - subdir_ceil_at_su: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.608 'stripspace -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.22 'subdir_ceil_at_su_slash: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 608 - stripspace -h output has no \t
+ok 22 - subdir_ceil_at_su_slash: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.609 'stripspace -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.23 'subdir_ceil_at_sub_di: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 609 - stripspace -h output has dashed labels
+ok 23 - subdir_ceil_at_sub_di: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.610 'stripspace -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.24 'subdir_ceil_at_sub_di_slash: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 610 - stripspace -h output has consistent spacing
+ok 24 - subdir_ceil_at_sub_di_slash: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.611 'stripspace *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.25 'subdir_ceil_at_subdi: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 611 - stripspace *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.612 'stripspace -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+ok 25 - subdir_ceil_at_subdi: git rev-parse --show-prefix is 'sub/dir/'
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.26 'subdir_ceil_at_subdi_slash: git rev-parse --show-prefix is 'sub/dir/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 612 - stripspace -h output and SYNOPSIS agree
+ok 26 - subdir_ceil_at_subdi_slash: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0450.613 'submodule--helper -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.27 'second_of_two: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 613 - submodule--helper -h output has no \t
+fatal: not a git repository (or any of the parent directories): .git
+ok 27 - second_of_two: prefix
 
-expecting success of 0450.614 'submodule--helper -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.28 'first_of_two: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 614 - submodule--helper -h output has dashed labels
+fatal: not a git repository (or any of the parent directories): .git
+ok 28 - first_of_two: prefix
 
-expecting success of 0450.615 'submodule--helper -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.29 'second_of_three: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 615 - submodule--helper -h output has consistent spacing
-
-ok 616 # skip submodule--helper *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_SUBMODULE__HELPER)
-
-ok 617 # skip submodule--helper -h output and SYNOPSIS agree (missing BUILTIN_TXT_SUBMODULE__HELPER)
+fatal: not a git repository (or any of the parent directories): .git
+ok 29 - second_of_three: prefix
 
-expecting success of 0450.618 'switch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.30 'git_dir_specified: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 618 - switch -h output has no \t
+ok 30 - git_dir_specified: git rev-parse --show-prefix is ''
 
-expecting success of 0450.619 'switch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.31 'sd_no_ceil: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 619 - switch -h output has dashed labels
+ok 31 - sd_no_ceil: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.620 'switch -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.32 'sd_ceil_empty: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 620 - switch -h output has consistent spacing
+ok 32 - sd_ceil_empty: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.621 'switch *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.33 'sd_ceil_at_trash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 621 - switch *.txt SYNOPSIS has dashed labels
-
-checking known breakage of 0450.622 'switch -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+fatal: not a git repository (or any of the parent directories): .git
+ok 33 - sd_ceil_at_trash: prefix
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.34 'sd_ceil_at_trash_slash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
---- txt	2025-02-09 06:53:32.641513583 +0000
-+++ help	2025-02-09 06:53:32.681513838 +0000
-@@ -1,4 +1 @@
--git switch [<options>] [--no-guess] <branch>
--git switch [<options>] --detach [<start-point>]
--git switch [<options>] (-c|-C) <new-branch> [<start-point>]
--git switch [<options>] --orphan <new-branch>
-+git switch [<options>] [<branch>]
-not ok 622 - switch -h output and SYNOPSIS agree # TODO known breakage
+fatal: not a git repository (or any of the parent directories): .git
+ok 34 - sd_ceil_at_trash_slash: prefix
 
-expecting success of 0450.623 'symbolic-ref -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.35 'sd_ceil_at_s: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 623 - symbolic-ref -h output has no \t
+fatal: not a git repository (or any of the parent directories): .git
+ok 35 - sd_ceil_at_s: prefix
 
-expecting success of 0450.624 'symbolic-ref -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.36 'sd_ceil_at_s_slash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 624 - symbolic-ref -h output has dashed labels
+fatal: not a git repository (or any of the parent directories): .git
+ok 36 - sd_ceil_at_s_slash: prefix
 
-expecting success of 0450.625 'symbolic-ref -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.37 'sd_ceil_at_sd: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 625 - symbolic-ref -h output has consistent spacing
+ok 37 - sd_ceil_at_sd: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.626 'symbolic-ref *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.38 'sd_ceil_at_sd_slash: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 626 - symbolic-ref *.txt SYNOPSIS has dashed labels
+ok 38 - sd_ceil_at_sd_slash: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.627 'symbolic-ref -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+expecting success of 1504.39 'sd_ceil_at_su: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
+	
+ok 39 - sd_ceil_at_su: git rev-parse --show-prefix is 's/d/'
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+expecting success of 1504.40 'sd_ceil_at_su_slash: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 627 - symbolic-ref -h output and SYNOPSIS agree
+ok 40 - sd_ceil_at_su_slash: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.628 'tag -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1504.41 'sd_ceil_at_s_di: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 628 - tag -h output has no \t
+ok 41 - sd_ceil_at_s_di: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.629 'tag -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1504.42 'sd_ceil_at_s_di_slash: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 629 - tag -h output has dashed labels
+ok 42 - sd_ceil_at_s_di_slash: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.630 'tag -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
+expecting success of 1504.43 'sd_ceil_at_sdi: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 630 - tag -h output has consistent spacing
+ok 43 - sd_ceil_at_sdi: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.631 'tag *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1504.44 'sd_ceil_at_sdi_slash: git rev-parse --show-prefix is 's/d/'': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 631 - tag *.txt SYNOPSIS has dashed labels
+ok 44 - sd_ceil_at_sdi_slash: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0450.632 'tag -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1500-rev-parse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/.git/
+expecting success of 1500.1 'setup': 
+	mkdir -p sub/dir work &&
+	cp -R .git repo.git &&
+	git checkout -B main &&
+	test_commit abc &&
+	git checkout -b side &&
+	test_commit def &&
+	git checkout main &&
+	git worktree add worktree side
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 632 - tag -h output and SYNOPSIS agree
+Switched to a new branch 'main'
+[main (root-commit) 4decab4] abc
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abc.t
+Switched to a new branch 'side'
+[side 0620bdf] def
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 def.t
+Switched to branch 'main'
+Preparing worktree (checking out 'side')
+HEAD is now at 0620bdf def
+ok 1 - setup
 
-expecting success of 0450.633 'unpack-file -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 633 - unpack-file -h output has no \t
+expecting success of 1500.2 'toplevel: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.634 'unpack-file -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 634 - unpack-file -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.635 'unpack-file -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 635 - unpack-file -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 2 - toplevel: --is-bare-repository
 
-expecting success of 0450.636 'unpack-file *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 636 - unpack-file *.txt SYNOPSIS has dashed labels
+expecting success of 1500.3 'toplevel: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.637 'unpack-file -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 637 - unpack-file -h output and SYNOPSIS agree
-
-expecting success of 0450.638 'unpack-objects -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 638 - unpack-objects -h output has no \t
-
-expecting success of 0450.639 'unpack-objects -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 639 - unpack-objects -h output has dashed labels
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 3 - toplevel: --is-inside-git-dir
 
-expecting success of 0450.640 'unpack-objects -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 640 - unpack-objects -h output has consistent spacing
+expecting success of 1500.4 'toplevel: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.641 'unpack-objects *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 641 - unpack-objects *.txt SYNOPSIS has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.642 'unpack-objects -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 4 - toplevel: --is-inside-work-tree
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 642 - unpack-objects -h output and SYNOPSIS agree
+expecting success of 1500.5 'toplevel: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.643 'update-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 643 - update-index -h output has no \t
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.644 'update-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 644 - update-index -h output has dashed labels
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 5 - toplevel: --show-prefix
 
-expecting success of 0450.645 'update-index -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 645 - update-index -h output has consistent spacing
+expecting success of 1500.6 'toplevel: --git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.646 'update-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 646 - update-index *.txt SYNOPSIS has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-checking known breakage of 0450.647 'update-index -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 6 - toplevel: --git-dir
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:34.097522847 +0000
-+++ help	2025-02-09 06:53:34.129523051 +0000
-@@ -1,19 +1 @@
--git update-index
--                 [--add] [--remove | --force-remove] [--replace]
--                 [--refresh] [-q] [--unmerged] [--ignore-missing]
--                 [(--cacheinfo <mode>,<object>,<file>)...]
--                 [--chmod=(+|-)x]
--                 [--[no-]assume-unchanged]
--                 [--[no-]skip-worktree]
--                 [--[no-]ignore-skip-worktree-entries]
--                 [--[no-]fsmonitor-valid]
--                 [--ignore-submodules]
--                 [--[no-]split-index]
--                 [--[no-|test-|force-]untracked-cache]
--                 [--[no-]fsmonitor]
--                 [--really-refresh] [--unresolve] [--again | -g]
--                 [--info-only] [--index-info]
--                 [-z] [--stdin] [--index-version <n>]
--                 [--show-index-version]
--                 [--verbose]
--                 [--] [<file>...]
-+git update-index [<options>] [--] [<file>...]
-not ok 647 - update-index -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1500.7 'toplevel: --absolute-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.648 'update-ref -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 648 - update-ref -h output has no \t
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.649 'update-ref -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 649 - update-ref -h output has dashed labels
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 7 - toplevel: --absolute-git-dir
 
-expecting success of 0450.650 'update-ref -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 650 - update-ref -h output has consistent spacing
+expecting success of 1500.8 '.git/: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.651 'update-ref *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 651 - update-ref *.txt SYNOPSIS has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-checking known breakage of 0450.652 'update-ref -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 8 - .git/: --is-bare-repository
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:34.421524909 +0000
-+++ help	2025-02-09 06:53:34.461525163 +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>]
-+git update-ref [<options>]    <refname> <new-oid> [<old-oid>]
-+git update-ref [<options>] --stdin [-z]
-not ok 652 - update-ref -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1500.9 '.git/: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.653 'update-server-info -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 653 - update-server-info -h output has no \t
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.654 'update-server-info -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 654 - update-server-info -h output has dashed labels
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 9 - .git/: --is-inside-git-dir
 
-expecting success of 0450.655 'update-server-info -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 655 - update-server-info -h output has consistent spacing
+expecting success of 1500.10 '.git/: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.656 'update-server-info *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 656 - update-server-info *.txt SYNOPSIS has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.657 'update-server-info -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 10 - .git/: --is-inside-work-tree
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 657 - update-server-info -h output and SYNOPSIS agree
+expecting success of 1500.11 '.git/: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.658 'upload-archive -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 658 - upload-archive -h output has no \t
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.659 'upload-archive -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 659 - upload-archive -h output has dashed labels
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 11 - .git/: --show-prefix
 
-expecting success of 0450.660 'upload-archive -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 660 - upload-archive -h output has consistent spacing
+expecting success of 1500.12 '.git/: --git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.661 'upload-archive *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 661 - upload-archive *.txt SYNOPSIS has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.662 'upload-archive -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 12 - .git/: --git-dir
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 662 - upload-archive -h output and SYNOPSIS agree
+expecting success of 1500.13 '.git/: --absolute-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.663 'upload-archive--writer -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 663 - upload-archive--writer -h output has no \t
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.664 'upload-archive--writer -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 664 - upload-archive--writer -h output has dashed labels
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 13 - .git/: --absolute-git-dir
 
-expecting success of 0450.665 'upload-archive--writer -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 665 - upload-archive--writer -h output has consistent spacing
+expecting success of 1500.14 '.git/objects/: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-ok 666 # skip upload-archive--writer *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-ok 667 # skip upload-archive--writer -h output and SYNOPSIS agree (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 14 - .git/objects/: --is-bare-repository
 
-expecting success of 0450.668 'upload-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 668 - upload-pack -h output has no \t
+expecting success of 1500.15 '.git/objects/: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.669 'upload-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 669 - upload-pack -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.670 'upload-pack -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 670 - upload-pack -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 15 - .git/objects/: --is-inside-git-dir
 
-expecting success of 0450.671 'upload-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 671 - upload-pack *.txt SYNOPSIS has dashed labels
+expecting success of 1500.16 '.git/objects/: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.672 'upload-pack -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 672 - upload-pack -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 16 - .git/objects/: --is-inside-work-tree
 
-expecting success of 0450.673 'var -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 673 - var -h output has no \t
+expecting success of 1500.17 '.git/objects/: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.674 'var -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 674 - var -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.675 'var -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 675 - var -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 17 - .git/objects/: --show-prefix
 
-expecting success of 0450.676 'var *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 676 - var *.txt SYNOPSIS has dashed labels
+expecting success of 1500.18 '.git/objects/: --git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.677 'var -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 677 - var -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 18 - .git/objects/: --git-dir
 
-expecting success of 0450.678 'verify-commit -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 678 - verify-commit -h output has no \t
+expecting success of 1500.19 '.git/objects/: --absolute-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.679 'verify-commit -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 679 - verify-commit -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.680 'verify-commit -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 680 - verify-commit -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 19 - .git/objects/: --absolute-git-dir
 
-expecting success of 0450.681 'verify-commit *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 681 - verify-commit *.txt SYNOPSIS has dashed labels
+expecting success of 1500.20 'subdirectory: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.682 'verify-commit -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 682 - verify-commit -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 20 - subdirectory: --is-bare-repository
 
-expecting success of 0450.683 'verify-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 683 - verify-pack -h output has no \t
+expecting success of 1500.21 'subdirectory: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.684 'verify-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 684 - verify-pack -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.685 'verify-pack -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 685 - verify-pack -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 21 - subdirectory: --is-inside-git-dir
 
-expecting success of 0450.686 'verify-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 686 - verify-pack *.txt SYNOPSIS has dashed labels
+expecting success of 1500.22 'subdirectory: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.687 'verify-pack -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 687 - verify-pack -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 22 - subdirectory: --is-inside-work-tree
 
-expecting success of 0450.688 'verify-tag -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 688 - verify-tag -h output has no \t
+expecting success of 1500.23 'subdirectory: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.689 'verify-tag -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 689 - verify-tag -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.690 'verify-tag -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 690 - verify-tag -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 23 - subdirectory: --show-prefix
 
-expecting success of 0450.691 'verify-tag *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 691 - verify-tag *.txt SYNOPSIS has dashed labels
+expecting success of 1500.24 'subdirectory: --git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.692 'verify-tag -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 692 - verify-tag -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 24 - subdirectory: --git-dir
 
-expecting success of 0450.693 'version -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 693 - version -h output has no \t
+expecting success of 1500.25 'subdirectory: --absolute-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.694 'version -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 694 - version -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.695 'version -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 695 - version -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 25 - subdirectory: --absolute-git-dir
 
-expecting success of 0450.696 'version *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 696 - version *.txt SYNOPSIS has dashed labels
+expecting success of 1500.26 'core.bare = true: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.697 'version -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 697 - version -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 26 - core.bare = true: --is-bare-repository
 
-expecting success of 0450.698 'whatchanged -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 698 - whatchanged -h output has no \t
+expecting success of 1500.27 'core.bare = true: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.699 'whatchanged -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 699 - whatchanged -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.700 'whatchanged -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 700 - whatchanged -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 27 - core.bare = true: --is-inside-git-dir
 
-expecting success of 0450.701 'whatchanged *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 701 - whatchanged *.txt SYNOPSIS has dashed labels
+expecting success of 1500.28 'core.bare = true: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-checking known breakage of 0450.702 'whatchanged -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
---- txt	2025-02-09 06:53:36.141535852 +0000
-+++ help	2025-02-09 06:53:36.149535903 +0000
-@@ -1 +1,2 @@
--git whatchanged <option>...
-+git log [<options>] [<revision-range>] [[--] <path>...]
-+git show [<options>] <object>...
-not ok 702 - whatchanged -h output and SYNOPSIS agree # TODO known breakage
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 28 - core.bare = true: --is-inside-work-tree
 
-expecting success of 0450.703 'worktree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 703 - worktree -h output has no \t
+expecting success of 1500.29 'core.bare undefined: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.704 'worktree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 704 - worktree -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.705 'worktree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 705 - worktree -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 29 - core.bare undefined: --is-bare-repository
 
-expecting success of 0450.706 'worktree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 706 - worktree *.txt SYNOPSIS has dashed labels
+expecting success of 1500.30 'core.bare undefined: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.707 'worktree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 707 - worktree -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 30 - core.bare undefined: --is-inside-git-dir
 
-expecting success of 0450.708 'write-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 708 - write-tree -h output has no \t
+expecting success of 1500.31 'core.bare undefined: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.709 'write-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 709 - write-tree -h output has dashed labels
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 0450.710 'write-tree -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 710 - write-tree -h output has consistent spacing
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 31 - core.bare undefined: --is-inside-work-tree
 
-expecting success of 0450.711 'write-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 711 - write-tree *.txt SYNOPSIS has dashed labels
+expecting success of 1500.32 'GIT_DIR=../.git, core.bare = false: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 0450.712 'write-tree -h output and SYNOPSIS agree': 
-		t2s="$(txt_to_synopsis "$builtin")" &&
-		if test "$builtin" = "merge-tree"
-		then
-			test_when_finished "rm -f t2s.new" &&
-			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
-			t2s=t2s.new
-		fi &&
-		h2s="$(help_to_synopsis "$builtin")" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
-	
-ok 712 - write-tree -h output and SYNOPSIS agree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 32 - GIT_DIR=../.git, core.bare = false: --is-bare-repository
 
-# still have 56 known breakage(s)
-# passed all remaining 656 test(s)
-1..712
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1420-lost-found.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 1500.33 'GIT_DIR=../.git, core.bare = false: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-[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
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-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)
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 33 - GIT_DIR=../.git, core.bare = false: --is-inside-git-dir
 
-HEAD is now at 9bb1ae9 initial
-dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
-dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
-ok 2 - lost and found something
+expecting success of 1500.34 'GIT_DIR=../.git, core.bare = false: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1415-worktree-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1415-worktree-refs/.git/
-expecting success of 1415.1 'setup': 
-	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
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master 42fba42] wt1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wt1.t
-[master 83df652] wt2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wt2.t
-Preparing worktree (detached HEAD 42fba42)
-HEAD is now at 42fba42 wt1
-Preparing worktree (detached HEAD 83df652)
-HEAD is now at 83df652 wt2
-Note: switching to 'initial'.
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 34 - GIT_DIR=../.git, core.bare = false: --is-inside-work-tree
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 1500.35 'GIT_DIR=../.git, core.bare = false: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-  git switch -c <new-branch-name>
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 35 - GIT_DIR=../.git, core.bare = false: --show-prefix
 
-Or undo this operation with:
+expecting success of 1500.36 'GIT_DIR=../.git, core.bare = false: --git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-  git switch -
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 36 - GIT_DIR=../.git, core.bare = false: --git-dir
 
-HEAD is now at 24b24cf initial
-ok 1 - setup
+expecting success of 1500.37 'GIT_DIR=../.git, core.bare = false: --absolute-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1415.2 'refs/worktree are per-worktree': 
-	test_cmp_rev worktree/foo initial &&
-	( cd wt1 && test_cmp_rev worktree/foo wt1 ) &&
-	( cd wt2 && test_cmp_rev worktree/foo wt2 )
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-ok 2 - refs/worktree are per-worktree
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 37 - GIT_DIR=../.git, core.bare = false: --absolute-git-dir
 
-expecting success of 1415.3 'resolve main-worktree/HEAD': 
-	test_cmp_rev main-worktree/HEAD initial &&
-	( cd wt1 && test_cmp_rev main-worktree/HEAD initial ) &&
-	( cd wt2 && test_cmp_rev main-worktree/HEAD initial )
+expecting success of 1500.38 'GIT_DIR=../.git, core.bare = true: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-ok 3 - resolve main-worktree/HEAD
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 1415.4 'ambiguous main-worktree/HEAD': 
-	test_when_finished git update-ref -d refs/heads/main-worktree/HEAD &&
-	git update-ref refs/heads/main-worktree/HEAD $(git rev-parse HEAD) &&
-	git rev-parse main-worktree/HEAD 2>warn &&
-	grep "main-worktree/HEAD.*ambiguous" warn
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 38 - GIT_DIR=../.git, core.bare = true: --is-bare-repository
 
-24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-warning: refname 'main-worktree/HEAD' is ambiguous.
-ok 4 - ambiguous main-worktree/HEAD
+expecting success of 1500.39 'GIT_DIR=../.git, core.bare = true: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1415.5 'resolve worktrees/xx/HEAD': 
-	test_cmp_rev worktrees/wt1/HEAD wt1 &&
-	( cd wt1 && test_cmp_rev worktrees/wt1/HEAD wt1 ) &&
-	( cd wt2 && test_cmp_rev worktrees/wt1/HEAD wt1 )
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-ok 5 - resolve worktrees/xx/HEAD
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 39 - GIT_DIR=../.git, core.bare = true: --is-inside-git-dir
 
-expecting success of 1415.6 'ambiguous worktrees/xx/HEAD': 
-	git update-ref refs/heads/worktrees/wt1/HEAD $(git rev-parse HEAD) &&
-	test_when_finished git update-ref -d refs/heads/worktrees/wt1/HEAD &&
-	git rev-parse worktrees/wt1/HEAD 2>warn &&
-	grep "worktrees/wt1/HEAD.*ambiguous" warn
+expecting success of 1500.40 'GIT_DIR=../.git, core.bare = true: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-42fba42569eaa325aaade18832dfa5432d54ffd1
-warning: refname 'worktrees/wt1/HEAD' is ambiguous.
-ok 6 - ambiguous worktrees/xx/HEAD
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 1415.7 'reflog of main-worktree/HEAD': 
-	git reflog HEAD | sed "s/HEAD/main-worktree\/HEAD/" >expected &&
-	git reflog main-worktree/HEAD >actual &&
-	test_cmp expected actual &&
-	git -C wt1 reflog main-worktree/HEAD >actual.wt1 &&
-	test_cmp expected actual.wt1
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 40 - GIT_DIR=../.git, core.bare = true: --is-inside-work-tree
 
-ok 7 - reflog of main-worktree/HEAD
+expecting success of 1500.41 'GIT_DIR=../.git, core.bare = true: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1415.8 'reflog of worktrees/xx/HEAD': 
-	git -C wt2 reflog HEAD | sed "s/HEAD/worktrees\/wt2\/HEAD/" >expected &&
-	git reflog worktrees/wt2/HEAD >actual &&
-	test_cmp expected actual &&
-	git -C wt1 reflog worktrees/wt2/HEAD >actual.wt1 &&
-	test_cmp expected actual.wt1 &&
-	git -C wt2 reflog worktrees/wt2/HEAD >actual.wt2 &&
-	test_cmp expected actual.wt2
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-ok 8 - reflog of worktrees/xx/HEAD
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 41 - GIT_DIR=../.git, core.bare = true: --show-prefix
 
-expecting success of 1415.9 'for-each-ref from main worktree': 
-	mkdir fer1 &&
-	git -C fer1 init repo &&
-	test_commit -C fer1/repo initial &&
-	git -C fer1/repo worktree add ../second &&
-	git -C fer1/repo update-ref refs/bisect/first HEAD &&
-	git -C fer1/repo update-ref refs/rewritten/first HEAD &&
-	git -C fer1/repo update-ref refs/worktree/first HEAD &&
-	git -C fer1/repo for-each-ref --format="%(refname)" | grep first >actual &&
-	cat >expected <<-\EOF &&
-	refs/bisect/first
-	refs/rewritten/first
-	refs/worktree/first
-	EOF
-	test_cmp expected actual
+expecting success of 1500.42 'GIT_DIR=../.git, core.bare undefined: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1415-worktree-refs/fer1/repo/.git/
-[master (root-commit) 1935181] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Preparing worktree (new branch 'second')
-HEAD is now at 1935181 initial
-ok 9 - for-each-ref from main worktree
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 1415.10 'for-each-ref from linked worktree': 
-	mkdir fer2 &&
-	git -C fer2 init repo &&
-	test_commit -C fer2/repo initial &&
-	git -C fer2/repo worktree add ../second &&
-	git -C fer2/second update-ref refs/bisect/second HEAD &&
-	git -C fer2/second update-ref refs/rewritten/second HEAD &&
-	git -C fer2/second update-ref refs/worktree/second HEAD &&
-	git -C fer2/second for-each-ref --format="%(refname)" | grep second >actual &&
-	cat >expected <<-\EOF &&
-	refs/bisect/second
-	refs/heads/second
-	refs/rewritten/second
-	refs/worktree/second
-	EOF
-	test_cmp expected actual
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 42 - GIT_DIR=../.git, core.bare undefined: --is-bare-repository
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1415-worktree-refs/fer2/repo/.git/
-[master (root-commit) 23fa7ba] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Preparing worktree (new branch 'second')
-HEAD is now at 23fa7ba initial
-ok 10 - for-each-ref from linked worktree
+expecting success of 1500.43 'GIT_DIR=../.git, core.bare undefined: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1416-ref-transaction-hooks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1416-ref-transaction-hooks/.git/
-expecting success of 1416.1 'setup': 
-	test_commit PRE &&
-	PRE_OID=$(git rev-parse PRE) &&
-	test_commit POST &&
-	POST_OID=$(git rev-parse POST)
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-[main (root-commit) 63ac8e7] PRE
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 PRE.t
-[main 99d5316] POST
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 POST.t
-ok 1 - setup
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 43 - GIT_DIR=../.git, core.bare undefined: --is-inside-git-dir
 
-expecting success of 1416.2 'hook allows updating ref if successful': 
-	git reset --hard PRE &&
-	test_hook reference-transaction <<-\EOF &&
-		echo "$*" >>actual
-	EOF
-	cat >expect <<-EOF &&
-		prepared
-		committed
-	EOF
-	git update-ref HEAD POST &&
-	test_cmp expect actual
+expecting success of 1500.44 'GIT_DIR=../.git, core.bare undefined: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-HEAD is now at 63ac8e7 PRE
-ok 2 - hook allows updating ref if successful
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 1416.3 'hook aborts updating ref in prepared state': 
-	git reset --hard PRE &&
-	test_hook reference-transaction <<-\EOF &&
-		if test "$1" = prepared
-		then
-			exit 1
-		fi
-	EOF
-	test_must_fail git update-ref HEAD POST 2>err &&
-	test_grep "ref updates aborted by hook" err
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 44 - GIT_DIR=../.git, core.bare undefined: --is-inside-work-tree
 
-HEAD is now at 63ac8e7 PRE
-fatal: ref updates aborted by hook
-ok 3 - hook aborts updating ref in prepared state
+expecting success of 1500.45 'GIT_DIR=../.git, core.bare undefined: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1416.4 'hook gets all queued updates in prepared state': 
-	test_when_finished "rm actual" &&
-	git reset --hard PRE &&
-	test_hook reference-transaction <<-\EOF &&
-		if test "$1" = prepared
-		then
-			while read -r line
-			do
-				printf "%s\n" "$line"
-			done >actual
-		fi
-	EOF
-	cat >expect <<-EOF &&
-		$ZERO_OID $POST_OID refs/heads/main
-	EOF
-	git update-ref HEAD POST <<-EOF &&
-		update HEAD $ZERO_OID $POST_OID
-		update refs/heads/main $ZERO_OID $POST_OID
-	EOF
-	test_cmp expect actual
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-HEAD is now at 63ac8e7 PRE
-ok 4 - hook gets all queued updates in prepared state
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 45 - GIT_DIR=../.git, core.bare undefined: --show-prefix
 
-expecting success of 1416.5 'hook gets all queued updates in committed state': 
-	test_when_finished "rm actual" &&
-	git reset --hard PRE &&
-	test_hook reference-transaction <<-\EOF &&
-		if test "$1" = committed
-		then
-			while read -r line
-			do
-				printf "%s\n" "$line"
-			done >actual
-		fi
-	EOF
-	cat >expect <<-EOF &&
-		$ZERO_OID $POST_OID refs/heads/main
-	EOF
-	git update-ref HEAD POST &&
-	test_cmp expect actual
+expecting success of 1500.46 'GIT_DIR=../repo.git, core.bare = false: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-HEAD is now at 63ac8e7 PRE
-ok 5 - hook gets all queued updates in committed state
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 1416.6 'hook gets all queued updates in aborted state': 
-	test_when_finished "rm actual" &&
-	git reset --hard PRE &&
-	test_hook reference-transaction <<-\EOF &&
-		if test "$1" = aborted
-		then
-			while read -r line
-			do
-				printf "%s\n" "$line"
-			done >actual
-		fi
-	EOF
-	cat >expect <<-EOF &&
-		$ZERO_OID $POST_OID HEAD
-		$ZERO_OID $POST_OID refs/heads/main
-	EOF
-	git update-ref --stdin <<-EOF &&
-		start
-		update HEAD POST $ZERO_OID
-		update refs/heads/main POST $ZERO_OID
-		abort
-	EOF
-	test_cmp expect actual
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 46 - GIT_DIR=../repo.git, core.bare = false: --is-bare-repository
 
-HEAD is now at 63ac8e7 PRE
-start: ok
-abort: ok
-ok 6 - hook gets all queued updates in aborted state
+expecting success of 1500.47 'GIT_DIR=../repo.git, core.bare = false: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1416.7 'interleaving hook calls succeed': 
-	test_when_finished "rm -r target-repo.git" &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	git init --bare target-repo.git &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 47 - GIT_DIR=../repo.git, core.bare = false: --is-inside-git-dir
 
-	test_hook -C target-repo.git reference-transaction <<-\EOF &&
-		echo $0 "$@" >>actual
-	EOF
+expecting success of 1500.48 'GIT_DIR=../repo.git, core.bare = false: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-	test_hook -C target-repo.git update <<-\EOF &&
-		echo $0 "$@" >>actual
-	EOF
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	cat >expect <<-EOF &&
-		hooks/update refs/tags/PRE $ZERO_OID $PRE_OID
-		hooks/reference-transaction prepared
-		hooks/reference-transaction committed
-		hooks/update refs/tags/POST $ZERO_OID $POST_OID
-		hooks/reference-transaction prepared
-		hooks/reference-transaction committed
-	EOF
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 48 - GIT_DIR=../repo.git, core.bare = false: --is-inside-work-tree
 
-	git push ./target-repo.git PRE POST &&
-	test_cmp expect target-repo.git/actual
+expecting success of 1500.49 'GIT_DIR=../repo.git, core.bare = false: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1416-ref-transaction-hooks/target-repo.git/
-To ./target-repo.git
- * [new tag]         PRE -> PRE
- * [new tag]         POST -> POST
-ok 7 - interleaving hook calls succeed
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 1416.8 'hook captures git-symbolic-ref updates': 
-	test_when_finished "rm actual" &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 49 - GIT_DIR=../repo.git, core.bare = false: --show-prefix
 
-	test_hook reference-transaction <<-\EOF &&
-		echo "$*" >>actual
-		while read -r line
-		do
-			printf "%s\n" "$line"
-		done >>actual
-	EOF
+expecting success of 1500.50 'GIT_DIR=../repo.git, core.bare = false: --git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-	git symbolic-ref refs/heads/symref refs/heads/main &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	cat >expect <<-EOF &&
-	prepared
-	$ZERO_OID ref:refs/heads/main refs/heads/symref
-	committed
-	$ZERO_OID ref:refs/heads/main refs/heads/symref
-	EOF
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 50 - GIT_DIR=../repo.git, core.bare = false: --git-dir
 
-	test_cmp expect actual
+expecting success of 1500.51 'GIT_DIR=../repo.git, core.bare = false: --absolute-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-ok 8 - hook captures git-symbolic-ref updates
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-expecting success of 1416.9 'hook gets all queued symref updates': 
-	test_when_finished "rm actual" &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 51 - GIT_DIR=../repo.git, core.bare = false: --absolute-git-dir
 
-	git update-ref refs/heads/branch $POST_OID &&
-	git symbolic-ref refs/heads/symref refs/heads/main &&
-	git symbolic-ref refs/heads/symrefd refs/heads/main &&
-	git symbolic-ref refs/heads/symrefu refs/heads/main &&
+expecting success of 1500.52 'GIT_DIR=../repo.git, core.bare = true: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-	test_hook reference-transaction <<-\EOF &&
-	echo "$*" >>actual
-	while read -r line
-	do
-		printf "%s\n" "$line"
-	done >>actual
-	EOF
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	# In the files backend, "delete" also triggers an additional transaction
-	# update on the packed-refs backend, which constitutes additional reflog
-	# entries.
-	if test_have_prereq REFFILES
-	then
-		cat >expect <<-EOF
-		aborted
-		$ZERO_OID $ZERO_OID refs/heads/symrefd
-		EOF
-	else
-		>expect
-	fi &&
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 52 - GIT_DIR=../repo.git, core.bare = true: --is-bare-repository
 
-	cat >>expect <<-EOF &&
-	prepared
-	ref:refs/heads/main $ZERO_OID refs/heads/symref
-	ref:refs/heads/main $ZERO_OID refs/heads/symrefd
-	$ZERO_OID ref:refs/heads/main refs/heads/symrefc
-	ref:refs/heads/main ref:refs/heads/branch refs/heads/symrefu
-	committed
-	ref:refs/heads/main $ZERO_OID refs/heads/symref
-	ref:refs/heads/main $ZERO_OID refs/heads/symrefd
-	$ZERO_OID ref:refs/heads/main refs/heads/symrefc
-	ref:refs/heads/main ref:refs/heads/branch refs/heads/symrefu
-	EOF
+expecting success of 1500.53 'GIT_DIR=../repo.git, core.bare = true: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-	git update-ref --no-deref --stdin <<-EOF &&
-	start
-	symref-verify refs/heads/symref refs/heads/main
-	symref-delete refs/heads/symrefd refs/heads/main
-	symref-create refs/heads/symrefc refs/heads/main
-	symref-update refs/heads/symrefu refs/heads/branch ref refs/heads/main
-	prepare
-	commit
-	EOF
-	test_cmp expect actual
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-start: ok
-prepare: ok
-commit: ok
-ok 9 - hook gets all queued symref updates
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 53 - GIT_DIR=../repo.git, core.bare = true: --is-inside-git-dir
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1419-exclude-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1419-exclude-refs/.git/
-expecting success of 1419.1 'setup': 
-	test_commit --no-tag base &&
-	base="$(git rev-parse HEAD)" &&
+expecting success of 1500.54 'GIT_DIR=../repo.git, core.bare = true: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-	for name in foo bar baz quux
-	do
-		for i in 1 2 3
-		do
-			echo "create refs/heads/$name/$i $base" || return 1
-		done || return 1
-	done >in &&
-	echo "delete refs/heads/main" >>in &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	git update-ref --stdin <in &&
-	git pack-refs --all
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 54 - GIT_DIR=../repo.git, core.bare = true: --is-inside-work-tree
 
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 1 - setup
+expecting success of 1500.55 'GIT_DIR=../repo.git, core.bare = true: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1419.2 'excluded region in middle': 
-	for_each_ref__exclude refs/heads refs/heads/foo >actual 2>perf &&
-	for_each_ref refs/heads/bar refs/heads/baz refs/heads/quux >expect &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 55 - GIT_DIR=../repo.git, core.bare = true: --show-prefix
 
-ok 2 - excluded region in middle
+expecting success of 1500.56 'GIT_DIR=../repo.git, core.bare undefined: --is-bare-repository': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1419.3 'excluded region at beginning': 
-	for_each_ref__exclude refs/heads refs/heads/bar >actual 2>perf &&
-	for_each_ref refs/heads/baz refs/heads/foo refs/heads/quux >expect &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 56 - GIT_DIR=../repo.git, core.bare undefined: --is-bare-repository
 
-ok 3 - excluded region at beginning
+expecting success of 1500.57 'GIT_DIR=../repo.git, core.bare undefined: --is-inside-git-dir': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1419.4 'excluded region at end': 
-	for_each_ref__exclude refs/heads refs/heads/quux >actual 2>perf &&
-	for_each_ref refs/heads/foo refs/heads/bar refs/heads/baz >expect &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 57 - GIT_DIR=../repo.git, core.bare undefined: --is-inside-git-dir
 
-ok 4 - excluded region at end
+expecting success of 1500.58 'GIT_DIR=../repo.git, core.bare undefined: --is-inside-work-tree': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1419.5 'disjoint excluded regions': 
-	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/quux >actual 2>perf &&
-	for_each_ref refs/heads/baz refs/heads/foo >expect &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	test_cmp expect actual &&
-	assert_jumps 2 perf
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 58 - GIT_DIR=../repo.git, core.bare undefined: --is-inside-work-tree
 
-ok 5 - disjoint excluded regions
+expecting success of 1500.59 'GIT_DIR=../repo.git, core.bare undefined: --show-prefix': 
+			if test -n "$gitdir"
+			then
+				test_when_finished "unset GIT_DIR" &&
+				GIT_DIR="$gitdir" &&
+				export GIT_DIR
+			fi &&
 
-expecting success of 1419.6 'adjacent, non-overlapping excluded regions': 
-	for_each_ref__exclude refs/heads refs/heads/bar refs/heads/baz >actual 2>perf &&
-	for_each_ref refs/heads/foo refs/heads/quux >expect &&
+			case "$bare" in
+			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
+			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
+			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
+			esac &&
 
-	test_cmp expect actual &&
-	case "$GIT_DEFAULT_REF_FORMAT" in
-	files)
-		assert_jumps 1 perf;;
-	reftable)
-		assert_jumps 2 perf;;
-	*)
-		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
-	esac
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 59 - GIT_DIR=../repo.git, core.bare undefined: --show-prefix
 
-ok 6 - adjacent, non-overlapping excluded regions
+expecting success of 1500.60 'rev-parse --path-format=absolute': 
+	test_one "." "$ROOT/.git" --path-format=absolute --git-dir &&
+	test_one "." "$ROOT/.git" --path-format=absolute --git-common-dir &&
+	test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-dir &&
+	test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-common-dir &&
+	test_one "worktree" "$ROOT/.git/worktrees/worktree" --path-format=absolute --git-dir &&
+	test_one "worktree" "$ROOT/.git" --path-format=absolute --git-common-dir &&
+	test_one "." "$ROOT" --path-format=absolute --show-toplevel &&
+	test_one "." "$ROOT/.git/objects" --path-format=absolute --git-path objects &&
+	test_one "." "$ROOT/.git/objects/foo/bar/baz" --path-format=absolute --git-path objects/foo/bar/baz
 
-expecting success of 1419.7 'overlapping excluded regions': 
-	for_each_ref__exclude refs/heads refs/heads/ba refs/heads/baz >actual 2>perf &&
-	for_each_ref refs/heads/foo refs/heads/quux >expect &&
+ok 60 - rev-parse --path-format=absolute
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+expecting success of 1500.61 'rev-parse --path-format=relative': 
+	test_one "." ".git" --path-format=relative --git-dir &&
+	test_one "." ".git" --path-format=relative --git-common-dir &&
+	test_one "sub/dir" "../../.git" --path-format=relative --git-dir &&
+	test_one "sub/dir" "../../.git" --path-format=relative --git-common-dir &&
+	test_one "worktree" "../.git/worktrees/worktree" --path-format=relative --git-dir &&
+	test_one "worktree" "../.git" --path-format=relative --git-common-dir &&
+	test_one "." "./" --path-format=relative --show-toplevel &&
+	test_one "." ".git/objects" --path-format=relative --git-path objects &&
+	test_one "." ".git/objects/foo/bar/baz" --path-format=relative --git-path objects/foo/bar/baz
 
-ok 7 - overlapping excluded regions
+ok 61 - rev-parse --path-format=relative
 
-expecting success of 1419.8 'several overlapping excluded regions': 
-	for_each_ref__exclude refs/heads \
-		refs/heads/bar refs/heads/baz refs/heads/foo >actual 2>perf &&
-	for_each_ref refs/heads/quux >expect &&
+expecting success of 1500.62 '--path-format=relative does not affect --absolute-git-dir': 
+	git rev-parse --path-format=relative --absolute-git-dir >actual &&
+	echo "$ROOT/.git" >expect &&
+	test_cmp expect actual
 
-	test_cmp expect actual &&
-	case "$GIT_DEFAULT_REF_FORMAT" in
-	files)
-		assert_jumps 1 perf;;
-	reftable)
-		assert_jumps 3 perf;;
-	*)
-		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
-	esac
+ok 62 - --path-format=relative does not affect --absolute-git-dir
 
-ok 8 - several overlapping excluded regions
+expecting success of 1500.63 '--path-format can change in the middle of the command line': 
+	git rev-parse --path-format=absolute --git-dir --path-format=relative --git-path objects/foo/bar >actual &&
+	cat >expect <<-EOF &&
+	$ROOT/.git
+	.git/objects/foo/bar
+	EOF
+	test_cmp expect actual
 
-expecting success of 1419.9 'unordered excludes': 
-	for_each_ref__exclude refs/heads \
-		refs/heads/foo refs/heads/baz >actual 2>perf &&
-	for_each_ref refs/heads/bar refs/heads/quux >expect &&
+ok 63 - --path-format can change in the middle of the command line
 
-	test_cmp expect actual &&
-	case "$GIT_DEFAULT_REF_FORMAT" in
-	files)
-		assert_jumps 1 perf;;
-	reftable)
-		assert_jumps 2 perf;;
-	*)
-		BUG "unhandled ref format $GIT_DEFAULT_REF_FORMAT";;
-	esac
+expecting success of 1500.64 '--path-format does not segfault without an argument': 
+	test_must_fail git rev-parse --path-format
 
-ok 9 - unordered excludes
+fatal: --path-format requires an argument
+ok 64 - --path-format does not segfault without an argument
 
-expecting success of 1419.10 'non-matching excluded section': 
-	for_each_ref__exclude refs/heads refs/heads/does/not/exist >actual 2>perf &&
-	for_each_ref >expect &&
+expecting success of 1500.65 'git-common-dir from worktree root': 
+	echo .git >expect &&
+	git rev-parse --git-common-dir >actual &&
+	test_cmp expect actual
 
-	test_cmp expect actual &&
-	assert_no_jumps perf
+ok 65 - git-common-dir from worktree root
 
-ok 10 - non-matching excluded section
+expecting success of 1500.66 'git-common-dir inside sub-dir': 
+	mkdir -p path/to/child &&
+	test_when_finished "rm -rf path" &&
+	echo "$(git -C path/to/child rev-parse --show-cdup).git" >expect &&
+	git -C path/to/child rev-parse --git-common-dir >actual &&
+	test_cmp expect actual
 
-expecting success of 1419.11 'meta-characters are discarded': 
-	for_each_ref__exclude refs/heads "refs/heads/ba*" >actual 2>perf &&
-	for_each_ref >expect &&
+ok 66 - git-common-dir inside sub-dir
 
-	test_cmp expect actual &&
-	assert_no_jumps perf
+expecting success of 1500.67 'git-path from worktree root': 
+	echo .git/objects >expect &&
+	git rev-parse --git-path objects >actual &&
+	test_cmp expect actual
 
-ok 11 - meta-characters are discarded
+ok 67 - git-path from worktree root
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1417-reflog-updateref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1417-reflog-updateref/.git/
-expecting success of 1417.1 'setup': 
-	git init -b main repo &&
-	(
-		cd repo &&
+expecting success of 1500.68 'git-path inside sub-dir': 
+	mkdir -p path/to/child &&
+	test_when_finished "rm -rf path" &&
+	echo "$(git -C path/to/child rev-parse --show-cdup).git/objects" >expect &&
+	git -C path/to/child rev-parse --git-path objects >actual &&
+	test_cmp expect actual
 
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
+ok 68 - git-path inside sub-dir
 
-		git reflog HEAD >expect &&
-		git reset --hard HEAD~ &&
-		# Make sure that the reflog does not point to the same commit
-		# as HEAD.
-		git reflog delete HEAD@{0} &&
-		git reflog HEAD >actual &&
-		test_cmp expect actual
-	)
+expecting success of 1500.69 'rev-parse --is-shallow-repository in shallow repo': 
+	test_commit test_commit &&
+	echo true >expect &&
+	git clone --depth 1 --no-local . shallow &&
+	test_when_finished "rm -rf shallow" &&
+	git -C shallow rev-parse --is-shallow-repository >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1417-reflog-updateref/repo/.git/
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
+[main b250333] test_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-HEAD is now at d9df450 B
-ok 1 - setup
-
-expecting success of 1417.2 'get 'B' with 'git reflog delete --updateref HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
-
-		(
-			cd copy &&
-
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
-
-			test_cmp expect actual
-		)
-	
-ok 2 - get 'B' with 'git reflog delete --updateref HEAD@{0}'
-
-expecting success of 1417.3 'get 'B' with 'git reflog delete --updateref HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+ create mode 100644 test_commit.t
+Cloning into 'shallow'...
+ok 69 - rev-parse --is-shallow-repository in shallow repo
 
-		(
-			cd copy &&
+expecting success of 1500.70 'rev-parse --is-shallow-repository in non-shallow repo': 
+	echo false >expect &&
+	git rev-parse --is-shallow-repository >actual &&
+	test_cmp expect actual
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+ok 70 - rev-parse --is-shallow-repository in non-shallow repo
 
-			test_cmp expect actual
-		)
-	
-ok 3 - get 'B' with 'git reflog delete --updateref HEAD@{1}'
+expecting success of 1500.71 'rev-parse --show-object-format in repo': 
+	test_oid algo >expect &&
+	git rev-parse --show-object-format >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=storage >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=input >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=output >actual &&
+	test_cmp expect actual &&
+	test_must_fail git rev-parse --show-object-format=squeamish-ossifrage 2>err &&
+	grep "unknown mode for --show-object-format: squeamish-ossifrage" err
 
-expecting success of 1417.4 'get 'C' with 'git reflog delete --updateref main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+fatal: unknown mode for --show-object-format: squeamish-ossifrage
+ok 71 - rev-parse --show-object-format in repo
 
-		(
-			cd copy &&
+expecting success of 1500.72 'rev-parse --show-ref-format': 
+	test_detect_ref_format >expect &&
+	git rev-parse --show-ref-format >actual &&
+	test_cmp expect actual
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+ok 72 - rev-parse --show-ref-format
 
-			test_cmp expect actual
-		)
-	
-ok 4 - get 'C' with 'git reflog delete --updateref main@{0}'
+expecting success of 1500.73 'rev-parse --show-ref-format with invalid storage': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		git config extensions.refstorage broken &&
+		test_must_fail git rev-parse --show-ref-format 2>err &&
+		grep "error: invalid value for ${SQ}extensions.refstorage${SQ}: ${SQ}broken${SQ}" err
+	)
 
-expecting success of 1417.5 'get 'B' with 'git reflog delete --updateref main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/repo/.git/
+error: invalid value for 'extensions.refstorage': 'broken'
+ok 73 - rev-parse --show-ref-format with invalid storage
 
-		(
-			cd copy &&
+expecting success of 1500.74 '--show-toplevel from subdir of working tree': 
+	pwd >expect &&
+	git -C sub/dir rev-parse --show-toplevel >actual &&
+	test_cmp expect actual
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+ok 74 - --show-toplevel from subdir of working tree
 
-			test_cmp expect actual
-		)
-	
-ok 5 - get 'B' with 'git reflog delete --updateref main@{1}'
+expecting success of 1500.75 '--show-toplevel from inside .git': 
+	test_must_fail git -C .git rev-parse --show-toplevel
 
-expecting success of 1417.6 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+fatal: this operation must be run in a work tree
+ok 75 - --show-toplevel from inside .git
 
-		(
-			cd copy &&
+expecting success of 1500.76 'showing the superproject correctly': 
+	git rev-parse --show-superproject-working-tree >out &&
+	test_must_be_empty out &&
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+	test_create_repo super &&
+	test_commit -C super test_commit &&
+	test_create_repo sub &&
+	test_commit -C sub test_commit &&
+	git -c protocol.file.allow=always \
+		-C super submodule add ../sub dir/sub &&
+	echo $(pwd)/super >expect  &&
+	git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
+	test_cmp expect out &&
 
-			test_cmp expect actual
-		)
-	
-ok 6 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'
+	test_commit -C super submodule_add &&
+	git -C super checkout -b branch1 &&
+	git -C super/dir/sub checkout -b branch1 &&
+	test_commit -C super/dir/sub branch1_commit &&
+	git -C super add dir/sub &&
+	test_commit -C super branch1_commit &&
+	git -C super checkout -b branch2 main &&
+	git -C super/dir/sub checkout -b branch2 main &&
+	test_commit -C super/dir/sub branch2_commit &&
+	git -C super add dir/sub &&
+	test_commit -C super branch2_commit &&
+	test_must_fail git -C super merge branch1 &&
 
-expecting success of 1417.7 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+	git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
+	test_cmp expect out
 
-		(
-			cd copy &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/super/.git/
+[main (root-commit) 6703cdc] test_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test_commit.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/sub/.git/
+[main (root-commit) 5c184ab] test_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test_commit.t
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/super/dir/sub'...
+done.
+[main b28d39e] submodule_add
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 dir/sub
+ create mode 100644 submodule_add.t
+Switched to a new branch 'branch1'
+Switched to a new branch 'branch1'
+[branch1 7018b5f] branch1_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch1_commit.t
+[branch1 e08f379] branch1_commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 branch1_commit.t
+Switched to a new branch 'branch2'
+M	dir/sub
+Switched to a new branch 'branch2'
+[branch2 6aad707] branch2_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch2_commit.t
+[branch2 32c6339] branch2_commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 branch2_commit.t
+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 (dir/sub), and either merge commit 7018b5f
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add dir/sub
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule dir/sub
+CONFLICT (submodule): Merge conflict in dir/sub
+Automatic merge failed; fix conflicts and then commit the result.
+ok 76 - showing the superproject correctly
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 1500.77 'rev-parse --since= unsqueezed ordering': 
+	x1=--since=1970-01-01T00:00:01Z &&
+	x2=--since=1970-01-01T00:00:02Z &&
+	x3=--since=1970-01-01T00:00:03Z &&
+	git rev-parse $x1 $x1 $x3 $x2 >actual &&
+	cat >expect <<-EOF &&
+	--max-age=1
+	--max-age=1
+	--max-age=3
+	--max-age=2
+	EOF
+	test_cmp expect actual
 
-			test_cmp expect actual
-		)
-	
-ok 7 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'
+ok 77 - rev-parse --since= unsqueezed ordering
 
-expecting success of 1417.8 'get 'C' with 'git reflog delete --updateref --rewrite main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1500.78 'rev-parse --bisect includes bad, excludes good': 
+	test_commit_bulk 6 &&
 
-		(
-			cd copy &&
+	git update-ref refs/bisect/bad-1 HEAD~1 &&
+	git update-ref refs/bisect/b HEAD~2 &&
+	git update-ref refs/bisect/bad-3 HEAD~3 &&
+	git update-ref refs/bisect/good-3 HEAD~3 &&
+	git update-ref refs/bisect/bad-4 HEAD~4 &&
+	git update-ref refs/bisect/go HEAD~4 &&
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+	# Note: refs/bisect/b and refs/bisect/go should be ignored because they
+	# do not match the refs/bisect/bad or refs/bisect/good prefixes.
+	cat >expect <<-EOF &&
+	refs/bisect/bad-1
+	refs/bisect/bad-3
+	refs/bisect/bad-4
+	^refs/bisect/good-3
+	EOF
 
-			test_cmp expect actual
-		)
-	
-ok 8 - get 'C' with 'git reflog delete --updateref --rewrite main@{0}'
+	git rev-parse --symbolic-full-name --bisect >actual &&
+	test_cmp expect actual
 
-expecting success of 1417.9 'get 'B' with 'git reflog delete --updateref --rewrite main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+b2503331aaf518185a33f93c7d7df3f7b1f05f21
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           18 (         0 duplicates                  )
+      blobs  :            6 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            6 (         0 duplicates          5 deltas of          5 attempts)
+      commits:            6 (         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:              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            =          7
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       1420 /       1420
+---------------------------------------------------------------------
 
-		(
-			cd copy &&
+ok 78 - rev-parse --bisect includes bad, excludes good
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 1500.79 '--short= truncates to the actual hash length': 
+	git rev-parse HEAD >expect &&
+	git rev-parse --short=100 HEAD >actual &&
+	test_cmp expect actual
 
-			test_cmp expect actual
-		)
-	
-ok 9 - get 'B' with 'git reflog delete --updateref --rewrite main@{1}'
+ok 79 - --short= truncates to the actual hash length
 
-expecting success of 1417.10 'get 'B' with 'test_must_fail git reflog expire HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1500.80 ':/ and HEAD^{/} favor more recent matching commits': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit common-old &&
+		test_commit --no-tag common-new &&
+		git rev-parse HEAD >expect &&
+		git rev-parse :/common >actual &&
+		test_cmp expect actual &&
+		git rev-parse HEAD^{/common} >actual &&
+		test_cmp expect actual
+	)
 
-		(
-			cd copy &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/repo/.git/
+[main (root-commit) 276aa89] common-old
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 common-old.t
+[main 96cff80] common-new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 common-new.t
+ok 80 - :/ and HEAD^{/} favor more recent matching commits
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+# passed all 80 test(s)
+1..80
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1460-refs-migrate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/.git/
+expecting success of 1460.1 'setup': 
+	rm -rf .git
 
-			test_cmp expect actual
-		)
-	
-error: HEAD@{0} points nowhere!
-ok 10 - get 'B' with 'test_must_fail git reflog expire HEAD@{0}'
+ok 1 - setup
 
-expecting success of 1417.11 'get 'B' with 'test_must_fail git reflog expire HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1460.2 'superfluous arguments': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail git -C repo refs migrate foo 2>err &&
+	cat >expect <<-EOF &&
+	usage: too many arguments
+	EOF
+	test_cmp expect err
 
-		(
-			cd copy &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 2 - superfluous arguments
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 1460.3 'missing ref storage format': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail git -C repo refs migrate 2>err &&
+	cat >expect <<-EOF &&
+	usage: missing --ref-format=<format>
+	EOF
+	test_cmp expect err
 
-			test_cmp expect actual
-		)
-	
-error: HEAD@{1} points nowhere!
-ok 11 - get 'B' with 'test_must_fail git reflog expire HEAD@{1}'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 3 - missing ref storage format
 
-expecting success of 1417.12 'get 'B' with 'test_must_fail git reflog expire main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1460.4 'unknown ref storage format': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail git -C repo refs migrate \
+		--ref-format=unknown 2>err &&
+	cat >expect <<-EOF &&
+	error: unknown ref storage format ${SQ}unknown${SQ}
+	EOF
+	test_cmp expect err
 
-		(
-			cd copy &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 4 - unknown ref storage format
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 1460.5 'files: migration to same format fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$from_format 2>err &&
+			cat >expect <<-EOF &&
+			error: repository already uses ${SQ}$from_format${SQ} format
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 5 - files: migration to same format fails
 
-			test_cmp expect actual
-		)
-	
-error: main@{0} points nowhere!
-ok 12 - get 'B' with 'test_must_fail git reflog expire main@{0}'
+expecting success of 1460.6 'files -> reftable: migration with worktree fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			git -C repo worktree add wt &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$to_format 2>err &&
+			cat >expect <<-EOF &&
+			error: migrating repositories with worktrees is not supported yet
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+No possible source branch, inferring '--orphan'
+Preparing worktree (new branch 'wt')
+ok 6 - files -> reftable: migration with worktree fails
 
-expecting success of 1417.13 'get 'B' with 'test_must_fail git reflog expire main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1460.7 'files -> reftable: unborn HEAD': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 7 - files -> reftable: unborn HEAD
 
-		(
-			cd copy &&
+expecting success of 1460.8 'files -> reftable: single ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 8 - files -> reftable: single ref
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 1460.9 'files -> reftable: bare repository': 
+			test_when_finished "rm -rf repo repo.git" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git clone --ref-format=$from_format --mirror repo repo.git &&
+			test_migration repo.git "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 5e30013] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into bare repository 'repo.git'...
+done.
+ok 9 - files -> reftable: bare repository
 
+expecting success of 1460.10 'files -> reftable: dangling symref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
+			test_migration repo "$to_format" &&
+			echo refs/heads/nonexistent >expect &&
+			git -C repo symbolic-ref BROKEN_HEAD >actual &&
 			test_cmp expect actual
-		)
-	
-error: main@{1} points nowhere!
-ok 13 - get 'B' with 'test_must_fail git reflog expire main@{1}'
-
-expecting success of 1417.14 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
-
-		(
-			cd copy &&
-
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) d39e3de] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 10 - files -> reftable: dangling symref
 
+expecting success of 1460.11 'files -> reftable: broken ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
+				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
+			test_migration repo "$to_format" true &&
+			test_oid 001 >expect &&
+			git -C repo rev-parse refs/heads/broken >actual &&
 			test_cmp expect actual
-		)
-	
-error: HEAD@{0} points nowhere!
-ok 14 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'
-
-expecting success of 1417.15 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
-
-		(
-			cd copy &&
-
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 1935181] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 11 - files -> reftable: broken ref
 
-			test_cmp expect actual
-		)
-	
-error: HEAD@{1} points nowhere!
-ok 15 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'
+expecting success of 1460.12 'files -> reftable: pseudo-refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo update-ref FOO_HEAD HEAD &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 23fa7ba] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 12 - files -> reftable: pseudo-refs
 
-expecting success of 1417.16 'get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1460.13 'files -> reftable: special refs are left alone': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
+			git -C repo rev-parse MERGE_HEAD &&
+			test_migration repo "$to_format" &&
+			test_path_is_file repo/.git/MERGE_HEAD
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+31243c69d8d79236a6f50781bf4138e2507bab91
+ok 13 - files -> reftable: special refs are left alone
 
-		(
-			cd copy &&
+expecting success of 1460.14 'files -> reftable: a bunch of refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+			test_commit -C repo initial &&
+			cat >input <<-EOF &&
+			create FOO_HEAD HEAD
+			create refs/heads/branch-1 HEAD
+			create refs/heads/branch-2 HEAD
+			create refs/heads/branch-3 HEAD
+			create refs/heads/branch-4 HEAD
+			create refs/tags/tag-1 HEAD
+			create refs/tags/tag-2 HEAD
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 167ffd6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 14 - files -> reftable: a bunch of refs
 
+expecting success of 1460.15 'files -> reftable: dry-run migration does not modify repository': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo refs migrate --dry-run \
+				--ref-format=$to_format >output &&
+			grep "Finished dry-run migration of refs" output &&
+			test_path_is_dir repo/.git/ref_migration.* &&
+			echo $from_format >expect &&
+			git -C repo rev-parse --show-ref-format >actual &&
 			test_cmp expect actual
-		)
-	
-error: main@{0} points nowhere!
-ok 16 - get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) f844f1e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Finished dry-run migration of refs, the result can be found at '.git/ref_migration.O5DN3r'
+ok 15 - files -> reftable: dry-run migration does not modify repository
 
-expecting success of 1417.17 'get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1460.16 'files -> reftable: reflogs of symrefs with target deleted': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo branch branch-1 HEAD &&
+			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
+			cat >input <<-EOF &&
+			delete refs/heads/branch-1
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) b13909b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 16 - files -> reftable: reflogs of symrefs with target deleted
 
-		(
-			cd copy &&
+expecting success of 1460.17 'files -> reftable: reflogs order is retained': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
+			test_commit --date "100003000 +0700" --no-tag -C repo second &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) b2ea3e6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main a1e4c45] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 17 - files -> reftable: reflogs order is retained
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 1460.18 'reftable: migration to same format fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$from_format 2>err &&
+			cat >expect <<-EOF &&
+			error: repository already uses ${SQ}$from_format${SQ} format
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 18 - reftable: migration to same format fails
 
-			test_cmp expect actual
-		)
-	
-error: main@{1} points nowhere!
-ok 17 - get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'
+expecting success of 1460.19 'reftable -> files: migration with worktree fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			git -C repo worktree add wt &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$to_format 2>err &&
+			cat >expect <<-EOF &&
+			error: migrating repositories with worktrees is not supported yet
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+No possible source branch, inferring '--orphan'
+Preparing worktree (new branch 'wt')
+ok 19 - reftable -> files: migration with worktree fails
 
-expecting success of 1417.18 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1460.20 'reftable -> files: unborn HEAD': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 20 - reftable -> files: unborn HEAD
 
-		(
-			cd copy &&
+expecting success of 1460.21 'reftable -> files: single ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 2aabd22] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 21 - reftable -> files: single ref
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 1460.22 'reftable -> files: bare repository': 
+			test_when_finished "rm -rf repo repo.git" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git clone --ref-format=$from_format --mirror repo repo.git &&
+			test_migration repo.git "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 3805046] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into bare repository 'repo.git'...
+done.
+ok 22 - reftable -> files: bare repository
 
+expecting success of 1460.23 'reftable -> files: dangling symref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
+			test_migration repo "$to_format" &&
+			echo refs/heads/nonexistent >expect &&
+			git -C repo symbolic-ref BROKEN_HEAD >actual &&
 			test_cmp expect actual
-		)
-	
-error: HEAD@{0} points nowhere!
-ok 18 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'
-
-expecting success of 1417.19 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
-
-		(
-			cd copy &&
-
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 971e222] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 23 - reftable -> files: dangling symref
 
+expecting success of 1460.24 'reftable -> files: broken ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
+				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
+			test_migration repo "$to_format" true &&
+			test_oid 001 >expect &&
+			git -C repo rev-parse refs/heads/broken >actual &&
 			test_cmp expect actual
-		)
-	
-error: HEAD@{1} points nowhere!
-ok 19 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'
-
-expecting success of 1417.20 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
-
-		(
-			cd copy &&
-
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) cf21f93] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 24 - reftable -> files: broken ref
 
-			test_cmp expect actual
-		)
-	
-error: main@{0} points nowhere!
-ok 20 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'
+expecting success of 1460.25 'reftable -> files: pseudo-refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo update-ref FOO_HEAD HEAD &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) f175d86] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 25 - reftable -> files: pseudo-refs
 
-expecting success of 1417.21 'get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 1460.26 'reftable -> files: special refs are left alone': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
+			git -C repo rev-parse MERGE_HEAD &&
+			test_migration repo "$to_format" &&
+			test_path_is_file repo/.git/MERGE_HEAD
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 1aef781] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+1aef78129fc22a570756b7eeccd0be80318e18c3
+ok 26 - reftable -> files: special refs are left alone
 
-		(
-			cd copy &&
+expecting success of 1460.27 'reftable -> files: a bunch of refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+			test_commit -C repo initial &&
+			cat >input <<-EOF &&
+			create FOO_HEAD HEAD
+			create refs/heads/branch-1 HEAD
+			create refs/heads/branch-2 HEAD
+			create refs/heads/branch-3 HEAD
+			create refs/heads/branch-4 HEAD
+			create refs/tags/tag-1 HEAD
+			create refs/tags/tag-2 HEAD
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 8858db3] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 27 - reftable -> files: a bunch of refs
 
+expecting success of 1460.28 'reftable -> files: dry-run migration does not modify repository': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo refs migrate --dry-run \
+				--ref-format=$to_format >output &&
+			grep "Finished dry-run migration of refs" output &&
+			test_path_is_dir repo/.git/ref_migration.* &&
+			echo $from_format >expect &&
+			git -C repo rev-parse --show-ref-format >actual &&
 			test_cmp expect actual
-		)
-	
-error: main@{1} points nowhere!
-ok 21 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1410-reflog.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/.git/
-expecting success of 1410.1 'setup': 
-	mkdir -p A/B &&
-	echo rat >C &&
-	echo ox >A/D &&
-	echo tiger >A/B/E &&
-	git add . &&
-
-	test_tick && git commit -m rabbit &&
-	H=$(git rev-parse --verify HEAD) &&
-	A=$(git rev-parse --verify HEAD:A) &&
-	B=$(git rev-parse --verify HEAD:A/B) &&
-	C=$(git rev-parse --verify HEAD:C) &&
-	D=$(git rev-parse --verify HEAD:A/D) &&
-	E=$(git rev-parse --verify HEAD:A/B/E) &&
-	check_fsck &&
-
-	test_chmod +x C &&
-	git add C &&
-	test_tick && git commit -m dragon &&
-	L=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
-
-	rm -f C A/B/E &&
-	echo snake >F &&
-	echo horse >A/G &&
-	git add F A/G &&
-	test_tick && git commit -a -m sheep &&
-	F=$(git rev-parse --verify HEAD:F) &&
-	G=$(git rev-parse --verify HEAD:A/G) &&
-	I=$(git rev-parse --verify HEAD:A) &&
-	J=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
-
-	rm -f A/G &&
-	test_tick && git commit -a -m monkey &&
-	K=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
-
-	check_have A B C D E F G H I J K L &&
-
-	git prune &&
-
-	check_have A B C D E F G H I J K L &&
-
-	check_fsck &&
-
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
-
-[main (root-commit) 07fcc4f] rabbit
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 68d032e] initial
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 A/B/E
- create mode 100644 A/D
- create mode 100644 C
-[main 7d1a0b8] dragon
+ 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.nEXIih'
+ok 28 - reftable -> files: dry-run migration does not modify repository
+
+expecting success of 1460.29 'reftable -> files: reflogs of symrefs with target deleted': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo branch branch-1 HEAD &&
+			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
+			cat >input <<-EOF &&
+			delete refs/heads/branch-1
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 8cd44c7] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 C
-[main 15ab5f0] sheep
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 29 - reftable -> files: reflogs of symrefs with target deleted
+
+expecting success of 1460.30 'reftable -> files: reflogs order is retained': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
+			test_commit --date "100003000 +0700" --no-tag -C repo second &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) b2ea3e6] initial
  Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+), 2 deletions(-)
- delete mode 100644 A/B/E
- create mode 100644 A/G
- delete mode 100755 C
- create mode 100644 F
-[main 3ac530f] monkey
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main a1e4c45] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A/G
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-ok 1 - setup
-
-expecting success of 1410.2 'correct usage on sub-command -h': 
-	test_expect_code 129 git reflog expire -h >err &&
-	grep "git reflog expire" err
-
-usage: git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
-ok 2 - correct usage on sub-command -h
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 30 - reftable -> files: reflogs order is retained
 
-expecting success of 1410.3 'correct usage on "git reflog show -h"': 
-	test_expect_code 129 git reflog show -h >err &&
-	grep -F "git reflog [show]" err
+expecting success of 1460.31 'migrating from files format deletes backend files': 
+	test_when_finished "rm -rf repo" &&
+	git init --ref-format=files repo &&
+	test_commit -C repo first &&
+	git -C repo pack-refs --all &&
+	test_commit -C repo second &&
+	git -C repo update-ref ORIG_HEAD HEAD &&
+	git -C repo rev-parse HEAD >repo/.git/FETCH_HEAD &&
 
-usage: git reflog [show] [<log-options>] [<ref>]
-ok 3 - correct usage on "git reflog show -h"
+	test_path_is_file repo/.git/HEAD &&
+	test_path_is_file repo/.git/ORIG_HEAD &&
+	test_path_is_file repo/.git/refs/heads/main &&
+	test_path_is_file repo/.git/packed-refs &&
 
-expecting success of 1410.4 'pass through -- to sub-command': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo message --a-file contents dash-tag &&
+	test_migration repo reftable &&
 
-	git -C repo reflog show -- --does-not-exist >out &&
-	test_must_be_empty out &&
-	git -C repo reflog show >expect &&
-	git -C repo reflog show -- --a-file >actual &&
-	test_cmp expect actual
+	echo "ref: refs/heads/.invalid" >expect &&
+	test_cmp expect repo/.git/HEAD &&
+	echo "this repository uses the reftable format" >expect &&
+	test_cmp expect repo/.git/refs/heads &&
+	test_path_is_file repo/.git/FETCH_HEAD &&
+	test_path_is_missing repo/.git/ORIG_HEAD &&
+	test_path_is_missing repo/.git/refs/heads/main &&
+	test_path_is_missing repo/.git/logs &&
+	test_path_is_missing repo/.git/packed-refs
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) 85b7e86] message
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 9897709] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 --a-file
-ok 4 - pass through -- to sub-command
-
-expecting success of 1410.5 'rewind': 
-	test_tick && git reset --hard HEAD~2 &&
-	test -f C &&
-	test -f A/B/E &&
-	! test -f F &&
-	! test -f A/G &&
-
-	check_have A B C D E F G H I J K L &&
-
-	git prune &&
-
-	check_have A B C D E F G H I J K L &&
-
-	git reflog refs/heads/main >output &&
-	test_line_count = 5 output
-
-HEAD is now at 7d1a0b8 dragon
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-ok 5 - rewind
+ create mode 100644 first.t
+[main 2c28476] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 31 - migrating from files format deletes backend files
 
-expecting success of 1410.6 'reflog expire should not barf on an annotated tag': 
-	test_when_finished "git tag -d v0.tag || :" &&
-	git -c core.logAllRefUpdates=always \
-		tag -a -m "tag name" v0.tag main &&
-	git reflog expire --dry-run refs/tags/v0.tag 2>err &&
-	test_grep ! "error: [Oo]bject .* not a commit" err
+expecting success of 1460.32 'migrating from reftable format deletes backend files': 
+	test_when_finished "rm -rf repo" &&
+	git init --ref-format=reftable repo &&
+	test_commit -C repo first &&
 
-Deleted tag 'v0.tag' (was dec1896)
-ok 6 - reflog expire should not barf on an annotated tag
+	test_path_is_dir repo/.git/reftable &&
+	test_migration repo files &&
 
-expecting success of 1410.7 'corrupt and check': 
+	test_path_is_missing repo/.git/reftable &&
+	echo "ref: refs/heads/main" >expect &&
+	test_cmp expect repo/.git/HEAD &&
+	test_path_is_file repo/.git/packed-refs
 
-	corrupt $F &&
-	check_fsck "missing blob $F"
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) fdc6a6a] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+ok 32 - migrating from reftable format deletes backend files
 
+# passed all 32 test(s)
+1..32
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1509-root-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1506-rev-parse-diagnosis.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1506-rev-parse-diagnosis/.git/
+expecting success of 1506.1 'set up basic repo': 
+	echo one > file.txt &&
+	mkdir subdir &&
+	echo two > subdir/file.txt &&
+	echo three > subdir/file2.txt &&
+	git add . &&
+	git commit -m init &&
+	echo four > index-only.txt &&
+	git add index-only.txt &&
+	echo five > disk-only.txt
 
-missing blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 7 - corrupt and check
+[main (root-commit) 724c7fc] init
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 file.txt
+ create mode 100644 subdir/file.txt
+ create mode 100644 subdir/file2.txt
+ok 1 - set up basic repo
 
-expecting success of 1410.8 'reflog expire --dry-run should not touch reflog': 
+expecting success of 1506.2 'correct file objects': 
+	HASH_file=$(git rev-parse HEAD:file.txt) &&
+	git rev-parse HEAD:subdir/file.txt &&
+	git rev-parse :index-only.txt &&
+	(cd subdir &&
+	 git rev-parse HEAD:subdir/file2.txt &&
+	 test $HASH_file = $(git rev-parse HEAD:file.txt) &&
+	 test $HASH_file = $(git rev-parse :file.txt) &&
+	 test $HASH_file = $(git rev-parse :0:file.txt) )
 
-	git reflog expire --dry-run \
-		--expire=$(($test_tick - 10000)) \
-		--expire-unreachable=$(($test_tick - 10000)) \
-		--stale-fix \
-		--all &&
+f719efd430d52bcfc8566a43b2eb655688d38871
+8510665149157c2bc901848c3e0b746954e9cbd9
+2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
+ok 2 - correct file objects
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 5 output &&
+expecting success of 1506.3 'correct relative file objects (0)': 
+	git rev-parse :file.txt >expected &&
+	git rev-parse :./file.txt >result &&
+	test_cmp expected result &&
+	git rev-parse :0:./file.txt >result &&
+	test_cmp expected result
 
-	check_fsck "missing blob $F"
+ok 3 - correct relative file objects (0)
 
-missing blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 8 - reflog expire --dry-run should not touch reflog
+expecting success of 1506.4 'correct relative file objects (1)': 
+	git rev-parse HEAD:file.txt >expected &&
+	git rev-parse HEAD:./file.txt >result &&
+	test_cmp expected result
 
-expecting success of 1410.9 'reflog expire': 
+ok 4 - correct relative file objects (1)
 
-	git reflog expire --verbose \
-		--expire=$(($test_tick - 10000)) \
-		--expire-unreachable=$(($test_tick - 10000)) \
-		--stale-fix \
-		--all &&
+expecting success of 1506.5 'correct relative file objects (2)': 
+	(
+		cd subdir &&
+		git rev-parse HEAD:../file.txt >result &&
+		test_cmp ../expected result
+	)
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 2 output &&
+ok 5 - correct relative file objects (2)
 
-	check_fsck "dangling commit $K"
+expecting success of 1506.6 'correct relative file objects (3)': 
+	(
+		cd subdir &&
+		git rev-parse HEAD:../subdir/../file.txt >result &&
+		test_cmp ../expected result
+	)
 
-Marking reachable objects...
-keep commit (initial): rabbit
-keep commit: dragon
-prune commit: sheep
-prune commit: monkey
-prune reset: moving to HEAD~2
-keep commit (initial): rabbit
-keep commit: dragon
-prune commit: sheep
-prune commit: monkey
-prune reset: moving to HEAD~2
-dangling commit 3ac530f2f6c3a45206a6b2d455baf89d1c8f672d
-ok 9 - reflog expire
+ok 6 - correct relative file objects (3)
 
-expecting success of 1410.10 '--stale-fix handles missing objects generously': 
-	git -c core.logAllRefUpdates=false fast-import --date-format=now <<-EOS &&
-	commit refs/heads/stale-fix
-	mark :1
-	committer Author <a@uth.or> now
-	data <<EOF
-	start stale fix
-	EOF
-	M 100644 inline file
-	data <<EOF
-	contents
-	EOF
-	commit refs/heads/stale-fix
-	committer Author <a@uth.or> now
-	data <<EOF
-	stale fix branch tip
-	EOF
-	from :1
-	EOS
+expecting success of 1506.7 'correct relative file objects (4)': 
+	git rev-parse HEAD:subdir/file.txt >expected &&
+	(
+		cd subdir &&
+		git rev-parse HEAD:./file.txt >result &&
+		test_cmp ../expected result
+	)
 
-	parent_oid=$(git rev-parse stale-fix^) &&
-	test_when_finished "recover $parent_oid" &&
-	corrupt $parent_oid &&
-	git reflog expire --stale-fix
+ok 7 - correct relative file objects (4)
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            4 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         1 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
+expecting success of 1506.8 'correct relative file objects (5)': 
+	git rev-parse :subdir/file.txt >expected &&
+	(
+		cd subdir &&
+		git rev-parse :./file.txt >result &&
+		test_cmp ../expected result &&
+		git rev-parse :0:./file.txt >result &&
+		test_cmp ../expected result
+	)
 
-ok 10 - --stale-fix handles missing objects generously
+ok 8 - correct relative file objects (5)
 
-expecting success of 1410.11 'prune and fsck': 
+expecting success of 1506.9 'correct relative file objects (6)': 
+	git rev-parse :file.txt >expected &&
+	(
+		cd subdir &&
+		git rev-parse :../file.txt >result &&
+		test_cmp ../expected result &&
+		git rev-parse :0:../file.txt >result &&
+		test_cmp ../expected result
+	)
 
-	git prune &&
-	check_fsck &&
+ok 9 - correct relative file objects (6)
 
-	check_have A B C D E H L &&
-	check_dont_have F G I J K
+expecting success of 1506.10 'incorrect revision id': 
+	test_must_fail git rev-parse foobar:file.txt 2>error &&
+	test_grep "invalid object name .foobar." error &&
+	test_must_fail git rev-parse foobar 2>error &&
+	test_grep "unknown revision or path not in the working tree." error
 
+foobar:file.txt
+fatal: invalid object name 'foobar'.
+foobar
+fatal: ambiguous argument 'foobar': unknown revision or path not in the working tree.
+ok 10 - incorrect revision id
 
-tree
-tree
-blob
-blob
-blob
-commit
-commit
-fatal: git cat-file: could not get object info
-fatal: git cat-file: could not get object info
-fatal: git cat-file: could not get object info
-fatal: git cat-file: could not get object info
-fatal: git cat-file: could not get object info
-ok 11 - prune and fsck
+expecting success of 1506.11 'incorrect file in sha1:path': 
+	test_must_fail git rev-parse HEAD:nothing.txt 2>error &&
+	test_grep "path .nothing.txt. does not exist in .HEAD." error &&
+	test_must_fail git rev-parse HEAD:index-only.txt 2>error &&
+	test_grep "path .index-only.txt. exists on disk, but not in .HEAD." error &&
+	(cd subdir &&
+	 test_must_fail git rev-parse HEAD:file2.txt 2>error &&
+	 test_did_you_mean HEAD subdir/ file2.txt exists )
 
-expecting success of 1410.12 'recover and check': 
+HEAD:nothing.txt
+fatal: path 'nothing.txt' does not exist in 'HEAD'
+HEAD:index-only.txt
+fatal: path 'index-only.txt' exists on disk, but not in 'HEAD'
+HEAD:file2.txt
+ok 11 - incorrect file in sha1:path
 
-	recover $F &&
-	check_fsck "dangling blob $F"
+expecting success of 1506.12 'incorrect file in :path and :N:path': 
+	test_must_fail git rev-parse :nothing.txt 2>error &&
+	test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+	test_must_fail git rev-parse :1:nothing.txt 2>error &&
+	test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+	test_must_fail git rev-parse :1:file.txt 2>error &&
+	test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
+	(cd subdir &&
+	 test_must_fail git rev-parse :1:file.txt 2>error &&
+	 test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
+	 test_must_fail git rev-parse :file2.txt 2>error &&
+	 test_did_you_mean ":0" subdir/ file2.txt "is in the index" &&
+	 test_must_fail git rev-parse :2:file2.txt 2>error &&
+	 test_did_you_mean :0 subdir/ file2.txt "is in the index") &&
+	test_must_fail git rev-parse :disk-only.txt 2>error &&
+	test_grep "path .disk-only.txt. exists on disk, but not in the index" error
 
+:nothing.txt
+fatal: path 'nothing.txt' does not exist (neither on disk nor in the index)
+:1:nothing.txt
+fatal: path 'nothing.txt' does not exist (neither on disk nor in the index)
+:1:file.txt
+:1:file.txt
+:file2.txt
+:2:file2.txt
+:disk-only.txt
+fatal: path 'disk-only.txt' exists on disk, but not in the index
+ok 12 - incorrect file in :path and :N:path
 
-dangling blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 12 - recover and check
+expecting success of 1506.13 'invalid @{n} reference': 
+	test_must_fail git rev-parse main@{99999} >output 2>error &&
+	test_must_be_empty output &&
+	test_grep "log for [^ ]* only has [0-9][0-9]* entries" error  &&
+	test_must_fail git rev-parse --verify main@{99999} >output 2>error &&
+	test_must_be_empty output &&
+	test_grep "log for [^ ]* only has [0-9][0-9]* entries" error
 
-expecting success of 1410.13 'delete': 
-	echo 1 > C &&
-	test_tick &&
-	git commit -m rat C &&
+fatal: log for 'main' only has 1 entries
+fatal: log for 'main' only has 1 entries
+ok 13 - invalid @{n} reference
 
-	echo 2 > C &&
-	test_tick &&
-	git commit -m ox C &&
+expecting success of 1506.14 'relative path not found': 
+	(
+		cd subdir &&
+		test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
+		test_grep subdir/nonexistent.txt error
+	)
 
-	echo 3 > C &&
-	test_tick &&
-	git commit -m tiger C &&
+HEAD:./nonexistent.txt
+fatal: path 'subdir/nonexistent.txt' does not exist in 'HEAD'
+ok 14 - relative path not found
 
-	HEAD_entry_count=$(git reflog | wc -l) &&
-	main_entry_count=$(git reflog show main | wc -l) &&
+expecting success of 1506.15 'relative path outside worktree': 
+	test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
+	test_must_be_empty output &&
+	test_grep "outside repository" error
 
-	test $HEAD_entry_count = 5 &&
-	test $main_entry_count = 5 &&
+fatal: '../file.txt' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1506-rev-parse-diagnosis'
+ok 15 - relative path outside worktree
 
+expecting success of 1506.16 'relative path when cwd is outside worktree': 
+	test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
+	test_must_be_empty output &&
+	test_grep "relative path syntax can.t be used outside working tree" error
 
-	git reflog delete main@{1} &&
-	git reflog show main > output &&
-	test_line_count = $(($main_entry_count - 1)) output &&
-	test $HEAD_entry_count = $(git reflog | wc -l) &&
-	! grep ox < output &&
+fatal: relative path syntax can't be used outside working tree
+ok 16 - relative path when cwd is outside worktree
 
-	main_entry_count=$(wc -l < output) &&
+expecting success of 1506.17 '<commit>:file correctly diagnosed after a pathname': 
+	test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error &&
+	test_grep ! "exists on disk" error &&
+	test_grep "no such path in the working tree" error &&
+	cat >expect <<-\EOF &&
+	file.txt
+	HEAD:file.txt
+	EOF
+	test_cmp expect actual
 
-	git reflog delete HEAD@{1} &&
-	test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
-	test $main_entry_count = $(git reflog show main | wc -l) &&
+fatal: HEAD:file.txt: no such path in the working tree.
+ok 17 - <commit>:file correctly diagnosed after a pathname
 
-	HEAD_entry_count=$(git reflog | wc -l) &&
+expecting success of 1506.18 'dotdot is not an empty set': 
+	( H=$(git rev-parse HEAD) && echo $H && echo ^$H ) >expect &&
 
-	git reflog delete main@{07.04.2005.15:15:00.-0700} &&
-	git reflog show main > output &&
-	test_line_count = $(($main_entry_count - 1)) output &&
-	! grep dragon < output
+	git rev-parse HEAD.. >actual &&
+	test_cmp expect actual &&
 
+	git rev-parse ..HEAD >actual &&
+	test_cmp expect actual &&
 
-[main f392752] rat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 7e525ff] ox
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3740c00] tiger
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - delete
+	echo .. >expect &&
+	git rev-parse .. >actual &&
+	test_cmp expect actual
 
-expecting success of 1410.14 'rewind2': 
+ok 18 - dotdot is not an empty set
 
-	test_tick && git reset --hard HEAD~2 &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+expecting success of 1506.19 'dotdot does not peel endpoints': 
+	git tag -a -m "annotate" annotated HEAD &&
+	A=$(git rev-parse annotated) &&
+	H=$(git rev-parse annotated^0) &&
+	{
+		echo $A && echo ^$A
+	} >expect-with-two-dots &&
+	{
+		echo $A && echo $A && echo ^$H
+	} >expect-with-merge-base &&
 
-HEAD is now at f392752 rat
-ok 14 - rewind2
+	git rev-parse annotated..annotated >actual-with-two-dots &&
+	test_cmp expect-with-two-dots actual-with-two-dots &&
 
-expecting success of 1410.15 '--expire=never': 
+	git rev-parse annotated...annotated >actual-with-merge-base &&
+	test_cmp expect-with-merge-base actual-with-merge-base
 
-	git reflog expire --verbose \
-		--expire=never \
-		--expire-unreachable=never \
-		--all &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+ok 19 - dotdot does not peel endpoints
 
-keep commit (initial): rabbit
-keep commit: dragon
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-keep commit (initial): rabbit
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-ok 15 - --expire=never
+expecting success of 1506.20 'arg before dashdash must be a revision (missing)': 
+	test_must_fail git rev-parse foobar -- 2>stderr &&
+	test_grep "bad revision" stderr
 
-expecting success of 1410.16 'gc.reflogexpire=never': 
-	test_config gc.reflogexpire never &&
-	test_config gc.reflogexpireunreachable never &&
+fatal: bad revision 'foobar'
+ok 20 - arg before dashdash must be a revision (missing)
 
-	git reflog expire --verbose --all >output &&
-	test_line_count = 9 output &&
+expecting success of 1506.21 'arg before dashdash must be a revision (file)': 
+	>foobar &&
+	test_must_fail git rev-parse foobar -- 2>stderr &&
+	test_grep "bad revision" stderr
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+fatal: bad revision 'foobar'
+ok 21 - arg before dashdash must be a revision (file)
 
-ok 16 - gc.reflogexpire=never
+expecting success of 1506.22 'arg before dashdash must be a revision (ambiguous)': 
+	>foobar &&
+	git update-ref refs/heads/foobar HEAD &&
+	{
+		# we do not want to use rev-parse here, because
+		# we are testing it
+		git show-ref -s refs/heads/foobar &&
+		printf "%s\n" --
+	} >expect &&
+	git rev-parse foobar -- >actual &&
+	test_cmp expect actual
 
-expecting success of 1410.17 'gc.reflogexpire=false': 
-	test_config gc.reflogexpire false &&
-	test_config gc.reflogexpireunreachable false &&
+ok 22 - arg before dashdash must be a revision (ambiguous)
 
-	git reflog expire --verbose --all &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+expecting success of 1506.23 'reject Nth parent if N is too high': 
+	test_must_fail git rev-parse HEAD^100000000000000000000000000000000
 
+fatal: ambiguous argument 'HEAD^100000000000000000000000000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+HEAD^100000000000000000000000000000000
+ok 23 - reject Nth parent if N is too high
 
-keep commit (initial): rabbit
-keep commit: dragon
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-keep commit (initial): rabbit
-keep commit: rat
-keep commit: tiger
-keep reset: moving to HEAD~2
-ok 17 - gc.reflogexpire=false
+expecting success of 1506.24 'reject Nth ancestor if N is too high': 
+	test_must_fail git rev-parse HEAD~100000000000000000000000000000000
 
-expecting success of 1410.18 'git reflog expire unknown reference': 
-	test_config gc.reflogexpire never &&
-	test_config gc.reflogexpireunreachable never &&
+fatal: ambiguous argument 'HEAD~100000000000000000000000000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+HEAD~100000000000000000000000000000000
+ok 24 - reject Nth ancestor if N is too high
 
-	test_must_fail git reflog expire main@{123} 2>stderr &&
-	test_grep "points nowhere" stderr &&
-	test_must_fail git reflog expire does-not-exist 2>stderr &&
-	test_grep "points nowhere" stderr
+expecting success of 1506.25 'pathspecs with wildcards are not ambiguous': 
+	echo "*.c" >expect &&
+	git rev-parse "*.c" >actual &&
+	test_cmp expect actual
 
-error: main@{123} points nowhere!
-error: does-not-exist points nowhere!
-ok 18 - git reflog expire unknown reference
+ok 25 - pathspecs with wildcards are not ambiguous
 
-expecting success of 1410.19 'checkout should not delete log for packed ref': 
-	test $(git reflog main | wc -l) = 4 &&
-	git branch foo &&
-	git pack-refs --all &&
-	git checkout foo &&
-	test $(git reflog main | wc -l) = 4
+expecting success of 1506.26 'backslash does not trigger wildcard rule': 
+	test_must_fail git rev-parse "foo\\bar"
 
-Switched to branch 'foo'
-ok 19 - checkout should not delete log for packed ref
+fatal: ambiguous argument 'foo\bar': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+foo\bar
+ok 26 - backslash does not trigger wildcard rule
 
-expecting success of 1410.20 'stale dirs do not cause d/f conflicts (reflogs on)': 
-	test_when_finished "git branch -d one || git branch -d one/two" &&
+expecting success of 1506.27 'escaped char does not trigger wildcard rule': 
+	test_must_fail git rev-parse "foo\\*bar"
 
-	git branch one/two main &&
-	echo "one/two@{0} branch: Created from main" >expect &&
-	git log -g --format="%gd %gs" one/two >actual &&
-	test_cmp expect actual &&
-	git branch -d one/two &&
+fatal: ambiguous argument 'foo\*bar': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+foo\*bar
+ok 27 - escaped char does not trigger wildcard rule
 
-	# now logs/refs/heads/one is a stale directory, but
-	# we should move it out of the way to create "one" reflog
-	git branch one main &&
-	echo "one@{0} branch: Created from main" >expect &&
-	git log -g --format="%gd %gs" one >actual &&
+expecting success of 1506.28 'arg after dashdash not interpreted as option': 
+	cat >expect <<-\EOF &&
+	--
+	--local-env-vars
+	EOF
+	git rev-parse -- --local-env-vars >actual &&
 	test_cmp expect actual
 
-Deleted branch one/two (was f392752).
-Deleted branch one (was f392752).
-ok 20 - stale dirs do not cause d/f conflicts (reflogs on)
-
-expecting success of 1410.21 'stale dirs do not cause d/f conflicts (reflogs off)': 
-	test_when_finished "git branch -d one || git branch -d one/two" &&
-
-	git branch one/two main &&
-	echo "one/two@{0} branch: Created from main" >expect &&
-	git log -g --format="%gd %gs" one/two >actual &&
-	test_cmp expect actual &&
-	git branch -d one/two &&
-
-	# same as before, but we only create a reflog for "one" if
-	# it already exists, which it does not
-	git -c core.logallrefupdates=false branch one main &&
-	git log -g --format="%gd %gs" one >actual &&
-	test_must_be_empty actual
-
-Deleted branch one/two (was f392752).
-Deleted branch one (was f392752).
-ok 21 - stale dirs do not cause d/f conflicts (reflogs off)
+ok 28 - arg after dashdash not interpreted as option
 
-expecting success of 1410.22 'no segfaults for reflog containing non-commit sha1s': 
-	git update-ref --create-reflog -m "Creating ref" \
-		refs/tests/tree-in-reflog HEAD &&
-	git update-ref -m "Forcing tree" refs/tests/tree-in-reflog HEAD^{tree} &&
-	git update-ref -m "Restoring to commit" refs/tests/tree-in-reflog HEAD &&
-	git reflog refs/tests/tree-in-reflog
+expecting success of 1506.29 'arg after end-of-options not interpreted as option': 
+	test_must_fail git rev-parse --end-of-options --not-real -- 2>err &&
+	test_grep bad.revision.*--not-real err
 
-f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
-f392752 refs/tests/tree-in-reflog@{2}: Creating ref
-ok 22 - no segfaults for reflog containing non-commit sha1s
+--end-of-options
+fatal: bad revision '--not-real'
+ok 29 - arg after end-of-options not interpreted as option
 
-checking known breakage of 1410.23 'reflog with non-commit entries displays all entries': 
-	git reflog refs/tests/tree-in-reflog >actual &&
-	test_line_count = 3 actual
+expecting success of 1506.30 'end-of-options still allows --': 
+	cat >expect <<-EOF &&
+	--end-of-options
+	$(git rev-parse --verify HEAD)
+	--
+	path
+	EOF
+	git rev-parse --end-of-options HEAD -- path >actual &&
+	test_cmp expect actual
 
-test_line_count: line count for actual != 3
-f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
-f392752 refs/tests/tree-in-reflog@{2}: Creating ref
-not ok 23 - reflog with non-commit entries displays all entries # TODO known breakage
+ok 30 - end-of-options still allows --
 
-expecting success of 1410.24 'continue walking past root commits': 
-	git init orphanage &&
-	(
-		cd orphanage &&
-		cat >expect <<-\EOF &&
-		HEAD@{0} commit (initial): orphan2-1
-		HEAD@{1} commit: orphan1-2
-		HEAD@{2} commit (initial): orphan1-1
-		HEAD@{3} commit (initial): initial
-		EOF
-		test_commit initial &&
-		git checkout --orphan orphan1 &&
-		test_commit orphan1-1 &&
-		test_commit orphan1-2 &&
-		git checkout --orphan orphan2 &&
-		test_commit orphan2-1 &&
-		git log -g --format="%gd %gs" >actual &&
-		test_cmp expect actual
-	)
+# passed all 30 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1508-at-combinations.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1508-at-combinations/.git/
+expecting success of 1508.1 'setup': 
+	test_commit main-one &&
+	test_commit main-two &&
+	git checkout -b upstream-branch &&
+	test_commit upstream-one &&
+	test_commit upstream-two &&
+	if test_have_prereq !MINGW
+	then
+		git checkout -b @/at-test
+	fi &&
+	git checkout -b @@/at-test &&
+	git checkout -b @at-test &&
+	git checkout -b old-branch &&
+	test_commit old-one &&
+	test_commit old-two &&
+	git checkout -b new-branch &&
+	test_commit new-one &&
+	test_commit new-two &&
+	git branch -u main old-branch &&
+	git branch -u upstream-branch new-branch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/orphanage/.git/
-[main (root-commit) 3805046] initial
+[main (root-commit) 1b49f74] main-one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'orphan1'
-[orphan1 (root-commit) 5906753] orphan1-1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 initial.t
- create mode 100644 orphan1-1.t
-[orphan1 4e641d7] orphan1-2
+ create mode 100644 main-one.t
+[main 6d5691d] main-two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 orphan1-2.t
-Switched to a new branch 'orphan2'
-[orphan2 (root-commit) 593a89b] orphan2-1
+ create mode 100644 main-two.t
+Switched to a new branch 'upstream-branch'
+[upstream-branch 6d93ee3] upstream-one
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 initial.t
- create mode 100644 orphan1-1.t
- create mode 100644 orphan1-2.t
- create mode 100644 orphan2-1.t
-ok 24 - continue walking past root commits
-
-expecting success of 1410.25 'expire with multiple worktrees': 
-	git init main-wt &&
-	(
-		cd main-wt &&
-		test_tick &&
-		test_commit foo &&
-		git  worktree add link-wt &&
-		test_tick &&
-		test_commit -C link-wt foobar &&
-		test_tick &&
-		git reflog expire --verbose --all --expire=$test_tick &&
-		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
-		test_must_be_empty actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/main-wt/.git/
-[main (root-commit) 7745948] foo
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream-one.t
+[upstream-branch 2bb3c5b] upstream-two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Preparing worktree (new branch 'link-wt')
-HEAD is now at 7745948 foo
-[link-wt 25ae450] foobar
+ create mode 100644 upstream-two.t
+Switched to a new branch '@/at-test'
+Switched to a new branch '@@/at-test'
+Switched to a new branch '@at-test'
+Switched to a new branch 'old-branch'
+[old-branch a935743] old-one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foobar.t
-prune commit (initial): foo
-prune branch: Created from HEAD
-prune commit: foobar
-prune commit (initial): foo
-prune 
-prune reset: moving to HEAD
-prune commit: foobar
-ok 25 - expire with multiple worktrees
-
-expecting success of 1410.26 'expire one of multiple worktrees': 
-	git init main-wt2 &&
-	(
-		cd main-wt2 &&
-		test_tick &&
-		test_commit foo &&
-		git worktree add link-wt &&
-		test_tick &&
-		test_commit -C link-wt foobar &&
-		test_tick &&
-		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
-			>expect-link-wt &&
-		git reflog expire --verbose --all --expire=$test_tick \
-			--single-worktree &&
-		test-tool ref-store worktree:main for-each-reflog-ent HEAD \
-			>actual-main &&
-		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD \
-			>actual-link-wt &&
-		test_must_be_empty actual-main &&
-		test_cmp expect-link-wt actual-link-wt
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/main-wt2/.git/
-[main (root-commit) 7745948] foo
+ create mode 100644 old-one.t
+[old-branch 2c577ae] old-two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Preparing worktree (new branch 'link-wt')
-HEAD is now at 7745948 foo
-[link-wt 25ae450] foobar
+ create mode 100644 old-two.t
+Switched to a new branch 'new-branch'
+[new-branch d3599bb] new-one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foobar.t
-prune commit (initial): foo
-prune branch: Created from HEAD
-prune commit: foobar
-prune commit (initial): foo
-ok 26 - expire one of multiple worktrees
-
-expecting success of 1410.27 'empty reflog': 
-	test_when_finished "rm -rf empty" &&
-	git init empty &&
-	test_commit -C empty A &&
-	test-tool ref-store main create-reflog refs/heads/foo &&
-	git -C empty reflog expire --all 2>err &&
-	test_must_be_empty err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/empty/.git/
-[main (root-commit) d4404d5] A
+ create mode 100644 new-one.t
+[new-branch 8a88a27] new-two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 27 - empty reflog
-
-expecting success of 1410.28 'list reflogs': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		git reflog list >actual &&
-		test_must_be_empty actual &&
+ create mode 100644 new-two.t
+branch 'old-branch' set up to track 'main'.
+branch 'new-branch' set up to track 'upstream-branch'.
+ok 1 - setup
 
-		test_commit A &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual &&
-
-		git branch b &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/b
-		refs/heads/main
-		EOF
-		git reflog list >actual &&
+expecting success of 1508.2 'HEAD = refs/heads/new-branch': 
+		echo 'refs/heads/new-branch' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s 'HEAD' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name 'HEAD' >actual
+		else
+			git cat-file -p 'HEAD' >actual
+		fi &&
 		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 28 - list reflogs
-
-expecting success of 1410.29 'list reflogs with worktree': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit A &&
-		git worktree add wt &&
-		git -c core.logAllRefUpdates=always \
-			update-ref refs/worktree/main HEAD &&
-		git -c core.logAllRefUpdates=always \
-			update-ref refs/worktree/per-worktree HEAD &&
-		git -c core.logAllRefUpdates=always -C wt \
-			update-ref refs/worktree/per-worktree HEAD &&
-		git -c core.logAllRefUpdates=always -C wt \
-			update-ref refs/worktree/worktree HEAD &&
-
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		refs/heads/wt
-		refs/worktree/main
-		refs/worktree/per-worktree
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual &&
+	
+ok 2 - HEAD = refs/heads/new-branch
 
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		refs/heads/wt
-		refs/worktree/per-worktree
-		refs/worktree/worktree
-		EOF
-		git -C wt reflog list >actual &&
+expecting success of 1508.3 '@{1} = new-one': 
+		echo 'new-one' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@{1}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{1}' >actual
+		else
+			git cat-file -p '@{1}' >actual
+		fi &&
 		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Preparing worktree (new branch 'wt')
-HEAD is now at fa70208 A
-ok 29 - list reflogs with worktree
-
-expecting success of 1410.30 'reflog list returns error with additional args': 
-	cat >expect <<-EOF &&
-	error: list does not accept arguments: ${SQ}bogus${SQ}
-	EOF
-	test_must_fail git reflog list bogus 2>err &&
-	test_cmp expect err
-
-ok 30 - reflog list returns error with additional args
+	
+ok 3 - @{1} = new-one
 
-expecting success of 1410.31 'reflog for symref with unborn target can be listed': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		git symbolic-ref HEAD refs/heads/unborn &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		EOF
-		git reflog list >actual &&
+expecting success of 1508.4 'HEAD@{1} = new-one': 
+		echo 'new-one' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s 'HEAD@{1}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name 'HEAD@{1}' >actual
+		else
+			git cat-file -p 'HEAD@{1}' >actual
+		fi &&
 		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 31 - reflog for symref with unborn target can be listed
+	
+ok 4 - HEAD@{1} = new-one
 
-expecting success of 1410.32 'reflog with invalid object ID can be listed': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test-tool ref-store main update-ref msg refs/heads/missing \
-			$(test_oid deadbeef) "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		refs/heads/missing
-		EOF
-		git reflog list >actual &&
+expecting success of 1508.5 '@{now} = new-two': 
+		echo 'new-two' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@{now}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{now}' >actual
+		else
+			git cat-file -p '@{now}' >actual
+		fi &&
 		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1410-reflog/repo/.git/
-[main (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 32 - reflog with invalid object ID can be listed
-
-# still have 1 known breakage(s)
-# passed all remaining 31 test(s)
-1..32
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1451-fsck-buffer.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1451-fsck-buffer/.git/
-expecting success of 1451.1 'create valid objects': 
-	git commit --allow-empty -m foo &&
-	commit=$(git rev-parse --verify HEAD) &&
-	tree=$(git rev-parse --verify HEAD^{tree})
-
-[master (root-commit) 2093db0] foo
- Author: A U Thor <author@example.com>
-ok 1 - create valid objects
-
-expecting success of 1451.2 'reset input to empty': 
-		>base
 	
-ok 2 - reset input to empty
+ok 5 - @{now} = new-two
 
-expecting success of 1451.3 'truncated commit (missingTree, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.6 'HEAD@{now} = new-two': 
+		echo 'new-two' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s 'HEAD@{now}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name 'HEAD@{now}' >actual
+		else
+			git cat-file -p 'HEAD@{now}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 3 - truncated commit (missingTree, "")
+ok 6 - HEAD@{now} = new-two
 
-expecting success of 1451.4 'truncated commit (missingTree, "tr")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.7 '@{-1} = refs/heads/old-branch': 
+		echo 'refs/heads/old-branch' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s '@{-1}' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{-1}' >actual
+		else
+			git cat-file -p '@{-1}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 4 - truncated commit (missingTree, "tr")
+ok 7 - @{-1} = refs/heads/old-branch
 
-expecting success of 1451.5 'truncated commit (missingTree, "tree")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.8 '@{-1}@{0} = old-two': 
+		echo 'old-two' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@{-1}@{0}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{-1}@{0}' >actual
+		else
+			git cat-file -p '@{-1}@{0}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 5 - truncated commit (missingTree, "tree")
+ok 8 - @{-1}@{0} = old-two
 
-expecting success of 1451.6 'truncated commit (badTreeSha1, "tree ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.9 '@{-1}@{1} = old-one': 
+		echo 'old-one' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@{-1}@{1}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{-1}@{1}' >actual
+		else
+			git cat-file -p '@{-1}@{1}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
-ok 6 - truncated commit (badTreeSha1, "tree ")
+ok 9 - @{-1}@{1} = old-one
 
-expecting success of 1451.7 'truncated commit (badTreeSha1, "tree 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.10 '@{u} = refs/heads/upstream-branch': 
+		echo 'refs/heads/upstream-branch' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s '@{u}' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{u}' >actual
+		else
+			git cat-file -p '@{u}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
-ok 7 - truncated commit (badTreeSha1, "tree 1234")
+ok 10 - @{u} = refs/heads/upstream-branch
 
-expecting success of 1451.8 'add tree line': 
-		echo "$content" >>base
+expecting success of 1508.11 'HEAD@{u} = refs/heads/upstream-branch': 
+		echo 'refs/heads/upstream-branch' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s 'HEAD@{u}' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name 'HEAD@{u}' >actual
+		else
+			git cat-file -p 'HEAD@{u}' >actual
+		fi &&
+		test_cmp expect actual
 	
-ok 8 - add tree line
+ok 11 - HEAD@{u} = refs/heads/upstream-branch
 
-expecting success of 1451.9 'truncated commit (missingAuthor, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.12 '@{u}@{1} = upstream-one': 
+		echo 'upstream-one' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@{u}@{1}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{u}@{1}' >actual
+		else
+			git cat-file -p '@{u}@{1}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 9 - truncated commit (missingAuthor, "")
+ok 12 - @{u}@{1} = upstream-one
 
-expecting success of 1451.10 'truncated commit (missingAuthor, "par")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.13 '@{-1}@{u} = refs/heads/main': 
+		echo 'refs/heads/main' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s '@{-1}@{u}' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{-1}@{u}' >actual
+		else
+			git cat-file -p '@{-1}@{u}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 10 - truncated commit (missingAuthor, "par")
+ok 13 - @{-1}@{u} = refs/heads/main
 
-expecting success of 1451.11 'truncated commit (missingAuthor, "parent")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.14 '@{-1}@{u}@{1} = main-one': 
+		echo 'main-one' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@{-1}@{u}@{1}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{-1}@{u}@{1}' >actual
+		else
+			git cat-file -p '@{-1}@{u}@{1}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 11 - truncated commit (missingAuthor, "parent")
+ok 14 - @{-1}@{u}@{1} = main-one
 
-expecting success of 1451.12 'truncated commit (badParentSha1, "parent ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.15 '@ = new-two': 
+		echo 'new-two' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@' >actual
+		else
+			git cat-file -p '@' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
-ok 12 - truncated commit (badParentSha1, "parent ")
+ok 15 - @ = new-two
 
-expecting success of 1451.13 'truncated commit (badParentSha1, "parent 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.16 '@@{u} = refs/heads/upstream-branch': 
+		echo 'refs/heads/upstream-branch' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s '@@{u}' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@@{u}' >actual
+		else
+			git cat-file -p '@@{u}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
-ok 13 - truncated commit (badParentSha1, "parent 1234")
+ok 16 - @@{u} = refs/heads/upstream-branch
 
-expecting success of 1451.14 'add parent line': 
-		echo "$content" >>base
+expecting success of 1508.17 '@@/at-test = refs/heads/@@/at-test': 
+		echo 'refs/heads/@@/at-test' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s '@@/at-test' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@@/at-test' >actual
+		else
+			git cat-file -p '@@/at-test' >actual
+		fi &&
+		test_cmp expect actual
 	
-ok 14 - add parent line
+ok 17 - @@/at-test = refs/heads/@@/at-test
 
-expecting success of 1451.15 'truncated commit (missingAuthor, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.18 '@/at-test = refs/heads/@/at-test': 
+		echo 'refs/heads/@/at-test' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s '@/at-test' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@/at-test' >actual
+		else
+			git cat-file -p '@/at-test' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 15 - truncated commit (missingAuthor, "")
+ok 18 - @/at-test = refs/heads/@/at-test
 
-expecting success of 1451.16 'truncated commit (missingAuthor, "au")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.19 '@at-test = refs/heads/@at-test': 
+		echo 'refs/heads/@at-test' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s '@at-test' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@at-test' >actual
+		else
+			git cat-file -p '@at-test' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 16 - truncated commit (missingAuthor, "au")
+ok 19 - @at-test = refs/heads/@at-test
 
-expecting success of 1451.17 'truncated commit (missingAuthor, "author")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.20 '@{u}@{-1} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{u}@{-1}'
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 17 - truncated commit (missingAuthor, "author")
+fatal: Needed a single revision
+ok 20 - @{u}@{-1} is nonsensical
 
-expecting success of 1451.18 'truncated commit (missingEmail, "author ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.21 '@{0}@{0} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{0}@{0}'
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 18 - truncated commit (missingEmail, "author ")
+fatal: Needed a single revision
+ok 21 - @{0}@{0} is nonsensical
 
-expecting success of 1451.19 'truncated commit (missingEmail, "author name")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.22 '@{1}@{u} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{1}@{u}'
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 19 - truncated commit (missingEmail, "author name")
+fatal: no such branch: '@{1}'
+ok 22 - @{1}@{u} is nonsensical
 
-expecting success of 1451.20 'truncated commit (badEmail, "author name <")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.23 'HEAD@{-1} is nonsensical': 
+		test_must_fail git rev-parse --verify 'HEAD@{-1}'
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 20 - truncated commit (badEmail, "author name <")
+fatal: Needed a single revision
+ok 23 - HEAD@{-1} is nonsensical
 
-expecting success of 1451.21 'truncated commit (badEmail, "author name <email")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.24 '@{-1}@{-1} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{-1}@{-1}'
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 21 - truncated commit (badEmail, "author name <email")
+fatal: Needed a single revision
+ok 24 - @{-1}@{-1} is nonsensical
 
-expecting success of 1451.22 'truncated commit (missingSpaceBeforeDate, "author name <email>")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.25 'HEAD@{3} = old-two': 
+		echo 'old-two' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s 'HEAD@{3}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name 'HEAD@{3}' >actual
+		else
+			git cat-file -p 'HEAD@{3}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 22 - truncated commit (missingSpaceBeforeDate, "author name <email>")
+ok 25 - HEAD@{3} = old-two
 
-expecting success of 1451.23 'truncated commit (badDate, "author name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.26 '@{3} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{3}'
 	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 23 - truncated commit (badDate, "author name <email> ")
+fatal: log for 'new-branch' only has 3 entries
+ok 26 - @{3} is nonsensical
 
-expecting success of 1451.24 'truncated commit (badDate, "author name <email> 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 24 - truncated commit (badDate, "author name <email> 1234")
+expecting success of 1508.27 'switch to old-branch': 
+	git checkout old-branch
 
-expecting success of 1451.25 'truncated commit (badTimezone, "author name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 25 - truncated commit (badTimezone, "author name <email> 1234 ")
+Switched to branch 'old-branch'
+Your branch is ahead of 'main' by 4 commits.
+  (use "git push" to publish your local commits)
+ok 27 - switch to old-branch
 
-expecting success of 1451.26 'truncated commit (badTimezone, "author name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.28 'HEAD = refs/heads/old-branch': 
+		echo 'refs/heads/old-branch' >expect &&
+		if test 'ref' = 'commit'
+		then
+			git log -1 --format=%s 'HEAD' >actual
+		elif test 'ref' = 'ref'
+		then
+			git rev-parse --symbolic-full-name 'HEAD' >actual
+		else
+			git cat-file -p 'HEAD' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 26 - truncated commit (badTimezone, "author name <email> 1234 +")
+ok 28 - HEAD = refs/heads/old-branch
 
-expecting success of 1451.27 'add author line': 
-		echo "$content" >>base
+expecting success of 1508.29 'HEAD@{1} = new-two': 
+		echo 'new-two' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s 'HEAD@{1}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name 'HEAD@{1}' >actual
+		else
+			git cat-file -p 'HEAD@{1}' >actual
+		fi &&
+		test_cmp expect actual
 	
-ok 27 - add author line
+ok 29 - HEAD@{1} = new-two
 
-expecting success of 1451.28 'truncated commit (missingCommitter, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.30 '@{1} = old-one': 
+		echo 'old-one' >expect &&
+		if test 'commit' = 'commit'
+		then
+			git log -1 --format=%s '@{1}' >actual
+		elif test 'commit' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@{1}' >actual
+		else
+			git cat-file -p '@{1}' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 28 - truncated commit (missingCommitter, "")
+ok 30 - @{1} = old-one
 
-expecting success of 1451.29 'truncated commit (missingCommitter, "co")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 29 - truncated commit (missingCommitter, "co")
+expecting success of 1508.31 'create path with @': 
+	echo content >normal &&
+	echo content >fun@ny &&
+	git add normal fun@ny &&
+	git commit -m "funny path"
 
-expecting success of 1451.30 'truncated commit (missingCommitter, "committer")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 30 - truncated commit (missingCommitter, "committer")
+[old-branch 7240585] funny path
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fun@ny
+ create mode 100644 normal
+ok 31 - create path with @
 
-expecting success of 1451.31 'truncated commit (missingEmail, "committer ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.32 '@:normal = content': 
+		echo 'content' >expect &&
+		if test 'blob' = 'commit'
+		then
+			git log -1 --format=%s '@:normal' >actual
+		elif test 'blob' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@:normal' >actual
+		else
+			git cat-file -p '@:normal' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 31 - truncated commit (missingEmail, "committer ")
+ok 32 - @:normal = content
 
-expecting success of 1451.32 'truncated commit (missingEmail, "committer name")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 1508.33 '@:fun@ny = content': 
+		echo 'content' >expect &&
+		if test 'blob' = 'commit'
+		then
+			git log -1 --format=%s '@:fun@ny' >actual
+		elif test 'blob' = 'ref'
+		then
+			git rev-parse --symbolic-full-name '@:fun@ny' >actual
+		else
+			git cat-file -p '@:fun@ny' >actual
+		fi &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 32 - truncated commit (missingEmail, "committer name")
+ok 33 - @:fun@ny = content
 
-expecting success of 1451.33 'truncated commit (badEmail, "committer name <")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 33 - truncated commit (badEmail, "committer name <")
+expecting success of 1508.34 '@{1} works with only one reflog entry': 
+	git checkout -B newbranch main &&
+	git reflog expire --expire=now refs/heads/newbranch &&
+	git commit --allow-empty -m "first after expiration" &&
+	test_cmp_rev newbranch~ newbranch@{1}
 
-expecting success of 1451.34 'truncated commit (badEmail, "committer name <email")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 34 - truncated commit (badEmail, "committer name <email")
+Switched to a new branch 'newbranch'
+[newbranch b4bdce6] first after expiration
+ Author: A U Thor <author@example.com>
+ok 34 - @{1} works with only one reflog entry
 
-expecting success of 1451.35 'truncated commit (missingSpaceBeforeDate, "committer name <email>")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 35 - truncated commit (missingSpaceBeforeDate, "committer name <email>")
+expecting success of 1508.35 '@{0} works with empty reflog': 
+	git checkout -B newbranch main &&
+	git reflog expire --expire=now refs/heads/newbranch &&
+	test_cmp_rev newbranch newbranch@{0}
 
-expecting success of 1451.36 'truncated commit (badDate, "committer name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 36 - truncated commit (badDate, "committer name <email> ")
+Reset branch 'newbranch'
+ok 35 - @{0} works with empty reflog
 
-expecting success of 1451.37 'truncated commit (badDate, "committer name <email> 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 37 - truncated commit (badDate, "committer name <email> 1234")
+# passed all 35 test(s)
+1..35
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1507-rev-parse-upstream.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1507-rev-parse-upstream/.git/
+expecting success of 1507.1 'setup': 
 
-expecting success of 1451.38 'truncated commit (badTimezone, "committer name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 38 - truncated commit (badTimezone, "committer name <email> 1234 ")
+	test_commit 1 &&
+	git checkout -b side &&
+	test_commit 2 &&
+	git checkout main &&
+	git clone . clone &&
+	test_commit 3 &&
+	(cd clone &&
+	 test_commit 4 &&
+	 git branch --track my-side origin/side &&
+	 git branch --track local-main main &&
+	 git branch --track fun@ny origin/side &&
+	 git branch --track @funny origin/side &&
+	 git branch --track funny@ origin/side &&
+	 git remote add -t main main-only .. &&
+	 git fetch main-only &&
+	 git branch bad-upstream &&
+	 git config branch.bad-upstream.remote main-only &&
+	 git config branch.bad-upstream.merge refs/heads/side
+	)
 
-expecting success of 1451.39 'truncated commit (badTimezone, "committer name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 39 - truncated commit (badTimezone, "committer name <email> 1234 +")
+[main (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Switched to a new branch 'side'
+[side 82335b2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Switched to branch 'main'
+Cloning into 'clone'...
+done.
+[main 8f489d0] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[main 6efda21] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+branch 'my-side' set up to track 'origin/side'.
+branch 'local-main' set up to track 'main'.
+branch 'fun@ny' set up to track 'origin/side'.
+branch '@funny' set up to track 'origin/side'.
+branch 'funny@' set up to track 'origin/side'.
+From ..
+ * [new branch]      main       -> main-only/main
+ * [new tag]         3          -> 3
+ok 1 - setup
 
-expecting success of 1451.40 'add committer line': 
-		echo "$content" >>base
-	
-ok 40 - add committer line
+expecting success of 1507.2 '@{upstream} resolves to correct full name': 
+	echo refs/remotes/origin/main >expect &&
+	git -C clone rev-parse --symbolic-full-name @{upstream} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{UPSTREAM} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{UpSTReam} >actual &&
+	test_cmp expect actual
 
-expecting success of 1451.41 'reset input to empty': 
-		>base
-	
-ok 41 - reset input to empty
+ok 2 - @{upstream} resolves to correct full name
 
-expecting success of 1451.42 'truncated tag (missingObject, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 42 - truncated tag (missingObject, "")
+expecting success of 1507.3 '@{u} resolves to correct full name': 
+	echo refs/remotes/origin/main >expect &&
+	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{U} >actual &&
+	test_cmp expect actual
 
-expecting success of 1451.43 'truncated tag (missingObject, "obj")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 43 - truncated tag (missingObject, "obj")
+ok 3 - @{u} resolves to correct full name
 
-expecting success of 1451.44 'truncated tag (missingObject, "object")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 44 - truncated tag (missingObject, "object")
+expecting success of 1507.4 'my-side@{upstream} resolves to correct full name': 
+	echo refs/remotes/origin/side >expect &&
+	git -C clone rev-parse --symbolic-full-name my-side@{u} >actual &&
+	test_cmp expect actual
 
-expecting success of 1451.45 'truncated tag (badObjectSha1, "object ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
-ok 45 - truncated tag (badObjectSha1, "object ")
+ok 4 - my-side@{upstream} resolves to correct full name
 
-expecting success of 1451.46 'truncated tag (badObjectSha1, "object 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
-ok 46 - truncated tag (badObjectSha1, "object 1234")
+expecting success of 1507.5 'upstream of branch with @ in middle': 
+	git -C clone rev-parse --symbolic-full-name fun@ny@{u} >actual &&
+	echo refs/remotes/origin/side >expect &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name fun@ny@{U} >actual &&
+	test_cmp expect actual
 
-expecting success of 1451.47 'add object line': 
-		echo "$content" >>base
-	
-ok 47 - add object line
+ok 5 - upstream of branch with @ in middle
 
-expecting success of 1451.48 'truncated tag (missingType, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
-ok 48 - truncated tag (missingType, "")
+expecting success of 1507.6 'upstream of branch with @ at start': 
+	git -C clone rev-parse --symbolic-full-name @funny@{u} >actual &&
+	echo refs/remotes/origin/side >expect &&
+	test_cmp expect actual
 
-expecting success of 1451.49 'truncated tag (missingType, "ty")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
-ok 49 - truncated tag (missingType, "ty")
+ok 6 - upstream of branch with @ at start
 
-expecting success of 1451.50 'truncated tag (missingType, "type")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
-ok 50 - truncated tag (missingType, "type")
+expecting success of 1507.7 'upstream of branch with @ at end': 
+	git -C clone rev-parse --symbolic-full-name funny@@{u} >actual &&
+	echo refs/remotes/origin/side >expect &&
+	test_cmp expect actual
 
-expecting success of 1451.51 'truncated tag (badType, "type ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badType: invalid 'type' value
-ok 51 - truncated tag (badType, "type ")
+ok 7 - upstream of branch with @ at end
 
-expecting success of 1451.52 'truncated tag (badType, "type com")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badType: invalid 'type' value
-ok 52 - truncated tag (badType, "type com")
+expecting success of 1507.8 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}': 
+	test_must_fail git -C clone rev-parse --symbolic-full-name refs/heads/my-side@{upstream}
 
-expecting success of 1451.53 'add type line': 
-		echo "$content" >>base
-	
-ok 53 - add type line
+fatal: no such branch: 'refs/heads/my-side'
+ok 8 - refs/heads/my-side@{upstream} does not resolve to my-side{upstream}
 
-expecting success of 1451.54 'truncated tag (missingTagEntry, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 54 - truncated tag (missingTagEntry, "")
+expecting success of 1507.9 'my-side@{u} resolves to correct commit': 
+	git checkout side &&
+	test_commit 5 &&
+	(cd clone && git fetch) &&
+	echo 2 >expect &&
+	commit_subject my-side >actual &&
+	test_cmp expect actual &&
+	echo 5 >expect &&
+	commit_subject my-side@{u} >actual &&
+	test_cmp expect actual
 
-expecting success of 1451.55 'truncated tag (missingTagEntry, "ta")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 55 - truncated tag (missingTagEntry, "ta")
+Switched to branch 'side'
+[side e3f9627] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1507-rev-parse-upstream/.
+   d0dcf97..8f489d0  main       -> origin/main
+   82335b2..e3f9627  side       -> origin/side
+ * [new tag]         5          -> 5
+ok 9 - my-side@{u} resolves to correct commit
 
-expecting success of 1451.56 'truncated tag (missingTagEntry, "tag")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 56 - truncated tag (missingTagEntry, "tag")
+expecting success of 1507.10 'not-tracking@{u} fails': 
+	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} &&
+	(cd clone && git checkout --no-track -b non-tracking) &&
+	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u}
 
-expecting success of 1451.57 'truncated tag (badTagName, "tag ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTagName: invalid 'tag' name: 
-ok 57 - truncated tag (badTagName, "tag ")
+fatal: no such branch: 'non-tracking'
+Switched to a new branch 'non-tracking'
+fatal: no upstream configured for branch 'non-tracking'
+ok 10 - not-tracking@{u} fails
 
-expecting success of 1451.58 'add tag line': 
-		echo "$content" >>base
-	
-ok 58 - add tag line
+expecting success of 1507.11 '<branch>@{u}@{1} resolves correctly': 
+	test_commit 6 &&
+	(cd clone && git fetch) &&
+	echo 5 >expect &&
+	commit_subject my-side@{u}@{1} >actual &&
+	test_cmp expect actual &&
+	commit_subject my-side@{U}@{1} >actual &&
+	test_cmp expect actual
 
-expecting success of 1451.59 'truncated tag (missingTagger, "")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 59 - truncated tag (missingTagger, "")
+[side 8bf5882] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1507-rev-parse-upstream/.
+   e3f9627..8bf5882  side       -> origin/side
+ * [new tag]         6          -> 6
+ok 11 - <branch>@{u}@{1} resolves correctly
 
-expecting success of 1451.60 'truncated tag (missingTagger, "ta")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 60 - truncated tag (missingTagger, "ta")
+expecting success of 1507.12 '@{u} without specifying branch fails on a detached HEAD': 
+	git checkout HEAD^0 &&
+	test_must_fail git rev-parse @{u} &&
+	test_must_fail git rev-parse @{U}
 
-expecting success of 1451.61 'truncated tag (missingTagger, "tagger")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 61 - truncated tag (missingTagger, "tagger")
+Note: switching to 'HEAD^0'.
 
-expecting success of 1451.62 'truncated tag (missingEmail, "tagger ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 62 - truncated tag (missingEmail, "tagger ")
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 1451.63 'truncated tag (missingEmail, "tagger name")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 63 - truncated tag (missingEmail, "tagger name")
+If you want to 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 1451.64 'truncated tag (badEmail, "tagger name <")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 64 - truncated tag (badEmail, "tagger name <")
+  git switch -c <new-branch-name>
 
-expecting success of 1451.65 'truncated tag (badEmail, "tagger name <email")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 65 - truncated tag (badEmail, "tagger name <email")
+Or undo this operation with:
 
-expecting success of 1451.66 'truncated tag (missingSpaceBeforeDate, "tagger name <email>")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 66 - truncated tag (missingSpaceBeforeDate, "tagger name <email>")
+  git switch -
 
-expecting success of 1451.67 'truncated tag (badDate, "tagger name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 67 - truncated tag (badDate, "tagger name <email> ")
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1451.68 'truncated tag (badDate, "tagger name <email> 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 68 - truncated tag (badDate, "tagger name <email> 1234")
+HEAD is now at 8bf5882 6
+fatal: HEAD does not point to a branch
+fatal: HEAD does not point to a branch
+ok 12 - @{u} without specifying branch fails on a detached HEAD
 
-expecting success of 1451.69 'truncated tag (badTimezone, "tagger name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 69 - truncated tag (badTimezone, "tagger name <email> 1234 ")
+expecting success of 1507.13 'checkout -b new my-side@{u} forks from the same': 
+(
+	cd clone &&
+	git checkout -b new my-side@{u} &&
+	git rev-parse --symbolic-full-name my-side@{u} >expect &&
+	git rev-parse --symbolic-full-name new@{u} >actual &&
+	test_cmp expect actual
+)
 
-expecting success of 1451.70 'truncated tag (badTimezone, "tagger name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 70 - truncated tag (badTimezone, "tagger name <email> 1234 +")
+Switched to a new branch 'new'
+branch 'new' set up to track 'origin/side'.
+ok 13 - checkout -b new my-side@{u} forks from the same
 
-expecting success of 1451.71 'truncated tree (short hash)': 
-	printf "100644 foo\0\1\1\1\1" >input &&
-	test_must_fail git hash-object -t tree input 2>err &&
-	grep badTree err
+expecting success of 1507.14 'merge my-side@{u} records the correct name': 
+(
+	cd clone &&
+	git checkout main &&
+	test_might_fail git branch -D new &&
+	git branch -t new my-side@{u} &&
+	git merge -s ours new@{u} &&
+	git show -s --pretty=tformat:%s >actual &&
+	echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
+	test_cmp expect actual
+)
 
-error: object fails fsck: badTree: cannot be parsed as a tree
-ok 71 - truncated tree (short hash)
+Switched to branch 'main'
+Your branch and 'origin/main' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+Deleted branch new (was 8bf5882).
+branch 'new' set up to track 'origin/side'.
+Merge made by the 'ours' strategy.
+ok 14 - merge my-side@{u} records the correct name
 
-expecting success of 1451.72 'truncated tree (missing nul)': 
-	# these two things are indistinguishable to the parser. The important
-	# thing about this is example is that there are enough bytes to
-	# make up a hash, and that there is no NUL (and we confirm that the
-	# parser does not walk past the end of the buffer).
-	printf "100644 a long filename, or a hash with missing nul?" >input &&
-	test_must_fail git hash-object -t tree input 2>err &&
-	grep badTree err
+expecting success of 1507.15 'branch -d other@{u}': 
+	git checkout -t -b other main &&
+	git branch -d @{u} &&
+	git for-each-ref refs/heads/main >actual &&
+	test_must_be_empty actual
 
-error: object fails fsck: badTree: cannot be parsed as a tree
-ok 72 - truncated tree (missing nul)
+Previous HEAD position was 8bf5882 6
+Switched to a new branch 'other'
+branch 'other' set up to track 'main'.
+Deleted branch main (was 8f489d0).
+ok 15 - branch -d other@{u}
 
-# passed all 72 test(s)
-1..72
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1430-bad-ref-name.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/.git/
-expecting success of 1430.1 'setup': 
-	test_commit one &&
-	test_commit two &&
-	main_sha1=$(git rev-parse refs/heads/main)
+expecting success of 1507.16 'checkout other@{u}': 
+	git branch -f main HEAD &&
+	git checkout -t -b another main &&
+	git checkout @{u} &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/main >expect &&
+	test_cmp expect actual
 
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - setup
+Switched to a new branch 'another'
+branch 'another' set up to track 'main'.
+Switched to branch 'main'
+ok 16 - checkout other@{u}
 
-expecting success of 1430.2 'fast-import: fail on invalid branch name ".badbranchname"': 
-	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
-	cat >input <<-INPUT_END &&
-		commit .badbranchname
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		corrupt
-		COMMIT
+expecting success of 1507.17 'branch@{u} works when tracking a local branch': 
+	echo refs/heads/main >expect &&
+	git -C clone rev-parse --symbolic-full-name local-main@{u} >actual &&
+	test_cmp expect actual
 
-		from refs/heads/main
+ok 17 - branch@{u} works when tracking a local branch
 
-	INPUT_END
-	test_must_fail git fast-import <input
+expecting success of 1507.18 'branch@{u} error message when no upstream': 
+	cat >expect <<-EOF &&
+	fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
+	EOF
+	error_message non-tracking@{u} &&
+	test_cmp expect error
 
-fatal: Branch name doesn't conform to GIT standards: .badbranchname
-fast-import: dumping crash report to .git/fast_import_crash_1510351
-ok 2 - fast-import: fail on invalid branch name ".badbranchname"
+ok 18 - branch@{u} error message when no upstream
 
-expecting success of 1430.3 'fast-import: fail on invalid branch name "bad[branch]name"': 
-	test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
-	cat >input <<-INPUT_END &&
-		commit bad[branch]name
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		corrupt
-		COMMIT
+expecting success of 1507.19 '@{u} error message when no upstream': 
+	cat >expect <<-EOF &&
+	fatal: no upstream configured for branch ${SQ}main${SQ}
+	EOF
+	test_must_fail git rev-parse --verify @{u} 2>actual &&
+	test_cmp expect actual
 
-		from refs/heads/main
+ok 19 - @{u} error message when no upstream
 
-	INPUT_END
-	test_must_fail git fast-import <input
+expecting success of 1507.20 '@{u} silent error when no upstream': 
+	test_must_fail git rev-parse --verify --quiet @{u} 2>actual &&
+	test_must_be_empty actual
 
-fatal: Branch name doesn't conform to GIT standards: bad[branch]name
-fast-import: dumping crash report to .git/fast_import_crash_1510420
-ok 3 - fast-import: fail on invalid branch name "bad[branch]name"
+ok 20 - @{u} silent error when no upstream
 
-expecting success of 1430.4 'git branch shows badly named ref as warning': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch >output 2>error &&
-	test_grep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+expecting success of 1507.21 'branch@{u} error message with misspelt branch': 
+	cat >expect <<-EOF &&
+	fatal: no such branch: ${SQ}no-such-branch${SQ}
+	EOF
+	error_message no-such-branch@{u} &&
+	test_cmp expect error
 
-warning: ignoring ref with broken name refs/heads/broken...ref
-ok 4 - git branch shows badly named ref as warning
+ok 21 - branch@{u} error message with misspelt branch
 
-expecting success of 1430.5 'branch -d can delete badly named ref': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -d broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+expecting success of 1507.22 '@{u} error message when not on a branch': 
+	cat >expect <<-EOF &&
+	fatal: HEAD does not point to a branch
+	EOF
+	git checkout HEAD^0 &&
+	test_must_fail git rev-parse --verify @{u} 2>actual &&
+	test_cmp expect actual
 
-Deleted branch broken...ref (was broken).
-ok 5 - branch -d can delete badly named ref
+Note: switching to 'HEAD^0'.
 
-expecting success of 1430.6 'branch -D can delete badly named ref': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -D broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Deleted branch broken...ref (was broken).
-ok 6 - branch -D can delete badly named 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 1430.7 'branch -D cannot delete non-ref in .git dir': 
-	echo precious >.git/my-private-file &&
-	echo precious >expect &&
-	test_must_fail git branch -D ../../my-private-file &&
-	test_cmp expect .git/my-private-file
+  git switch -c <new-branch-name>
 
-error: branch '../../my-private-file' not found
-ok 7 - branch -D cannot delete non-ref in .git dir
+Or undo this operation with:
 
-expecting success of 1430.8 'branch -D cannot delete ref in .git dir': 
-	git rev-parse HEAD >.git/my-private-file &&
-	git rev-parse HEAD >expect &&
-	git branch foo/legit &&
-	test_must_fail git branch -D foo////./././../../../my-private-file &&
-	test_cmp expect .git/my-private-file
+  git switch -
 
-error: branch 'foo////./././../../../my-private-file' not found
-ok 8 - branch -D cannot delete ref in .git dir
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1430.9 'branch -D cannot delete absolute path': 
-	git branch -f extra &&
-	test_must_fail git branch -D "$(pwd)/.git/refs/heads/extra" &&
-	test_cmp_rev HEAD extra
+HEAD is now at 8f489d0 3
+ok 22 - @{u} error message when not on a branch
 
-error: branch '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra' not found
-ok 9 - branch -D cannot delete absolute path
+expecting success of 1507.23 'branch@{u} error message if upstream branch not fetched': 
+	cat >expect <<-EOF &&
+	fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
+	EOF
+	error_message bad-upstream@{u} &&
+	test_cmp expect error
 
-expecting success of 1430.10 'git branch cannot create a badly named ref': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test_must_fail git branch broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+ok 23 - branch@{u} error message if upstream branch not fetched
 
-fatal: 'broken...ref' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 10 - git branch cannot create a badly named ref
+expecting success of 1507.24 'pull works when tracking a local branch': 
+(
+	cd clone &&
+	git checkout local-main &&
+	git pull
+)
 
-expecting success of 1430.11 'branch -m cannot rename to a bad ref name': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test_might_fail git branch -D goodref &&
-	git branch goodref &&
-	test_must_fail git branch -m goodref broken...ref &&
-	test_cmp_rev main goodref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+Switched to branch 'local-main'
+Your branch is behind 'main' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+From .
+ * branch            main       -> FETCH_HEAD
+Updating 6efda21..ac35135
+Fast-forward
+ok 24 - pull works when tracking a local branch
 
-error: branch 'goodref' not found
-fatal: 'broken...ref' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 11 - branch -m cannot rename to a bad ref name
+expecting success of 1507.25 '@{u} works when tracking a local branch': 
+	echo refs/heads/main >expect &&
+	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
+	test_cmp expect actual
 
-checking known breakage of 1430.12 'branch -m can rename from a bad ref name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+ok 25 - @{u} works when tracking a local branch
 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -m broken...ref renamed &&
-	test_cmp_rev main renamed &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+expecting success of 1507.26 'log -g other@{u}': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	commit $commit
+	Reflog: main@{0} (C O Mitter <committer@example.com>)
+	Reflog message: branch: Created from HEAD
+	Author: A U Thor <author@example.com>
+	Date:   Thu Apr 7 15:15:13 2005 -0700
 
-fatal: invalid branch name: 'broken...ref'
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-not ok 12 - branch -m can rename from a bad ref name # TODO known breakage
+	    3
+	EOF
+	git log -1 -g other@{u} >actual &&
+	test_cmp expect actual
 
-expecting success of 1430.13 'push cannot create a badly named ref': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+ok 26 - log -g other@{u}
 
-fatal: invalid refspec 'HEAD:refs/heads/broken...ref'
-ok 13 - push cannot create a badly named ref
+expecting success of 1507.27 'log -g other@{u}@{now}': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	commit $commit
+	Reflog: main@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
+	Reflog message: branch: Created from HEAD
+	Author: A U Thor <author@example.com>
+	Date:   Thu Apr 7 15:15:13 2005 -0700
 
-checking known breakage of 1430.14 'push --mirror can delete badly named ref': 
-	top=$(pwd) &&
-	git init src &&
-	git init dest &&
+	    3
+	EOF
+	git log -1 -g other@{u}@{now} >actual &&
+	test_cmp expect actual
 
-	(
-		cd src &&
-		test_commit one
-	) &&
-	(
-		cd dest &&
-		test_commit two &&
-		git checkout --detach &&
-		test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION
-	) &&
-	git -C src push --mirror "file://$top/dest" &&
-	git -C dest branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+ok 27 - log -g other@{u}@{now}
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/dest/.git/
-[main (root-commit) 4331c28] one
+expecting success of 1507.28 '@{reflog}-parsing does not look beyond colon': 
+	echo content >@{yesterday} &&
+	git add @{yesterday} &&
+	git commit -m "funny reflog file" &&
+	git hash-object @{yesterday} >expect &&
+	git rev-parse HEAD:@{yesterday} >actual &&
+	test_cmp expect actual
+
+[detached HEAD eae0df2] funny reflog file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main (root-commit) 9db02ea] two
+ create mode 100644 @{yesterday}
+ok 28 - @{reflog}-parsing does not look beyond colon
+
+expecting success of 1507.29 '@{upstream}-parsing does not look beyond colon': 
+	echo content >@{upstream} &&
+	git add @{upstream} &&
+	git commit -m "funny upstream file" &&
+	git hash-object @{upstream} >expect &&
+	git rev-parse HEAD:@{upstream} >actual &&
+	test_cmp expect actual
+
+[detached HEAD c358789] funny upstream file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-HEAD is now at 9db02ea two
-fatal: update_ref failed for ref 'refs/heads/broken...ref': cannot update ref 'refs/heads/broken...ref': trying to write ref 'refs/heads/broken...ref' with nonexistent object 139b20d8e6c5b496de61f033f642d0e3dbff528d
-not ok 14 - push --mirror can delete badly named ref # TODO known breakage
+ create mode 100644 @{upstream}
+ok 29 - @{upstream}-parsing does not look beyond colon
 
-expecting success of 1430.15 'rev-parse skips symref pointing to broken name': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch shadow one &&
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
-	git rev-parse --verify one >expect &&
-	git rev-parse --verify shadow >actual 2>err &&
-	test_cmp expect actual &&
-	test_grep "ignoring dangling symref refs/tags/shadow" err
+# passed all 29 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1511-rev-parse-caret.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1511-rev-parse-caret/.git/
+expecting success of 1511.1 'setup': 
+	echo blob >a-blob &&
+	git tag -a -m blob blob-tag $(git hash-object -w a-blob) &&
+	mkdir a-tree &&
+	echo moreblobs >a-tree/another-blob &&
+	git add . &&
+	TREE_SHA1=$(git write-tree) &&
+	git tag -a -m tree tree-tag "$TREE_SHA1" &&
+	git commit -m Initial &&
+	git tag -a -m commit commit-tag &&
+	git branch ref &&
+	git checkout main &&
+	echo modified >>a-blob &&
+	git add -u &&
+	git commit -m Modified &&
+	git branch modref &&
+	echo changed! >>a-blob &&
+	git add -u &&
+	git commit -m !Exp &&
+	git branch expref &&
+	echo changed >>a-blob &&
+	git add -u &&
+	git commit -m Changed &&
+	echo changed-again >>a-blob &&
+	git add -u &&
+	git commit -m Changed-again
 
-warning: ignoring dangling symref refs/tags/shadow
-ok 15 - rev-parse skips symref pointing to broken name
+[main (root-commit) 543146a] Initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a-blob
+ create mode 100644 a-tree/another-blob
+Already on 'main'
+[main 921b76a] Modified
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main e6ae3e8] !Exp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main ee9e0b8] Changed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 8f5adaa] Changed-again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-expecting success of 1430.16 'for-each-ref emits warnings for broken names': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	git for-each-ref >output 2>error &&
-	! grep -e "broken\.\.\.ref" output &&
-	! grep -e "badname" output &&
-	! grep -e "broken\.\.\.symref" output &&
-	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
-	test_grep ! "ignoring broken ref refs/heads/badname" error &&
-	test_grep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
+expecting success of 1511.2 'ref^{non-existent}': 
+	test_must_fail git rev-parse ref^{non-existent}
 
-warning: ignoring ref with broken name refs/heads/broken...ref
-warning: ignoring ref with broken name refs/heads/broken...symref
-ok 16 - for-each-ref emits warnings for broken names
+fatal: ambiguous argument 'ref^{non-existent}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ref^{non-existent}
+ok 2 - ref^{non-existent}
 
-expecting success of 1430.17 'update-ref -d can delete broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git update-ref -d refs/heads/broken...ref >output 2>error &&
-	test_must_be_empty output &&
-	test_must_be_empty error &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+expecting success of 1511.3 'ref^{}': 
+	git rev-parse ref >expected &&
+	git rev-parse ref^{} >actual &&
+	test_cmp expected actual &&
+	git rev-parse commit-tag^{} >actual &&
+	test_cmp expected actual
 
-ok 17 - update-ref -d can delete broken name
+ok 3 - ref^{}
 
-expecting success of 1430.18 'branch -d can delete broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	git branch -d broken...ref >output 2>error &&
-	test_grep "Deleted branch broken...ref (was broken)" output &&
-	test_must_be_empty error &&
-	git branch >output 2>error &&
-	! grep -e "broken\.\.\.ref" error &&
-	! grep -e "broken\.\.\.ref" output
+expecting success of 1511.4 'ref^{commit}': 
+	git rev-parse ref >expected &&
+	git rev-parse ref^{commit} >actual &&
+	test_cmp expected actual &&
+	git rev-parse commit-tag^{commit} >actual &&
+	test_cmp expected actual &&
+	test_must_fail git rev-parse tree-tag^{commit} &&
+	test_must_fail git rev-parse blob-tag^{commit}
 
-Deleted branch broken...ref (was broken).
-ok 18 - branch -d can delete broken name
+error: tree-tag^{commit}: expected commit type, but the object dereferences to tree type
+error: tree-tag^{commit}: expected commit type, but the object dereferences to tree type
+fatal: ambiguous argument 'tree-tag^{commit}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+tree-tag^{commit}
+error: blob-tag^{commit}: expected commit type, but the object dereferences to blob type
+error: blob-tag^{commit}: expected commit type, but the object dereferences to blob type
+fatal: ambiguous argument 'blob-tag^{commit}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+blob-tag^{commit}
+ok 4 - ref^{commit}
 
-expecting success of 1430.19 'update-ref --no-deref -d can delete symref to broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+expecting success of 1511.5 'ref^{tree}': 
+	echo $TREE_SHA1 >expected &&
+	git rev-parse ref^{tree} >actual &&
+	test_cmp expected actual &&
+	git rev-parse commit-tag^{tree} >actual &&
+	test_cmp expected actual &&
+	git rev-parse tree-tag^{tree} >actual &&
+	test_cmp expected actual &&
+	test_must_fail git rev-parse blob-tag^{tree}
 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_must_be_empty output &&
-	test_must_be_empty error
+error: blob-tag^{tree}: expected tree type, but the object dereferences to blob type
+error: blob-tag^{tree}: expected tree type, but the object dereferences to blob type
+fatal: ambiguous argument 'blob-tag^{tree}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+blob-tag^{tree}
+ok 5 - ref^{tree}
 
-error: reference does not exist
-ok 19 - update-ref --no-deref -d can delete symref to broken name
+expecting success of 1511.6 'ref^{tag}': 
+	test_must_fail git rev-parse HEAD^{tag} &&
+	git rev-parse commit-tag >expected &&
+	git rev-parse commit-tag^{tag} >actual &&
+	test_cmp expected actual
 
-expecting success of 1430.20 'branch -d can delete symref to broken name': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git branch -d badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
-	test_must_be_empty error
+error: HEAD^{tag}: expected tag type, but the object dereferences to tree type
+error: HEAD^{tag}: expected tag type, but the object dereferences to tree type
+fatal: ambiguous argument 'HEAD^{tag}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+HEAD^{tag}
+ok 6 - ref^{tag}
 
-error: reference does not exist
-Deleted branch badname (was refs/heads/broken...ref).
-ok 20 - branch -d can delete symref to broken name
+expecting success of 1511.7 'ref^{/.}': 
+	git rev-parse main >expected &&
+	git rev-parse main^{/.} >actual &&
+	test_cmp expected actual
 
-expecting success of 1430.21 'update-ref --no-deref -d can delete dangling symref to broken name': 
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_must_be_empty output &&
-	test_must_be_empty error
+ok 7 - ref^{/.}
 
-error: reference does not exist
-ok 21 - update-ref --no-deref -d can delete dangling symref to broken name
+expecting success of 1511.8 'ref^{/non-existent}': 
+	test_must_fail git rev-parse main^{/non-existent}
 
-expecting success of 1430.22 'branch -d can delete dangling symref to broken name': 
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/badname &&
-	git branch -d badname >output 2>error &&
-	test_ref_missing refs/heads/badname &&
-	test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
-	test_must_be_empty error
+fatal: ambiguous argument 'main^{/non-existent}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+main^{/non-existent}
+ok 8 - ref^{/non-existent}
 
-error: reference does not exist
-Deleted branch badname (was refs/heads/broken...ref).
-ok 22 - branch -d can delete dangling symref to broken name
+expecting success of 1511.9 'ref^{/Initial}': 
+	git rev-parse ref >expected &&
+	git rev-parse main^{/Initial} >actual &&
+	test_cmp expected actual
 
-expecting success of 1430.23 'update-ref -d can delete broken name through symref': 
-	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
-	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
-	test_ref_exists refs/heads/broken...ref &&
-	git update-ref -d refs/heads/badname >output 2>error &&
-	test_ref_missing refs/heads/broken...ref &&
-	test_must_be_empty output &&
-	test_must_be_empty error
+ok 9 - ref^{/Initial}
 
-error: reference does not exist
-ok 23 - update-ref -d can delete broken name through symref
+expecting success of 1511.10 'ref^{/!Exp}': 
+	test_must_fail git rev-parse main^{/!Exp}
 
-expecting success of 1430.24 'update-ref --no-deref -d can delete symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_must_be_empty output &&
-	test_must_be_empty error
+fatal: ambiguous argument 'main^{/!Exp}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+main^{/!Exp}
+ok 10 - ref^{/!Exp}
 
-error: reference does not exist
-ok 24 - update-ref --no-deref -d can delete symref with broken name
+expecting success of 1511.11 'ref^{/!}': 
+	test_must_fail git rev-parse main^{/!}
 
-expecting success of 1430.25 'branch -d can delete symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/main &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git branch -d broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_grep "Deleted branch broken...symref (was refs/heads/main)" output &&
-	test_must_be_empty error
+fatal: ambiguous argument 'main^{/!}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+main^{/!}
+ok 11 - ref^{/!}
 
-error: reference does not exist
-Deleted branch broken...symref (was refs/heads/main).
-ok 25 - branch -d can delete symref with broken name
+expecting success of 1511.12 'ref^{/!!Exp}': 
+	git rev-parse expref >expected &&
+	git rev-parse main^{/!!Exp} >actual &&
+	test_cmp expected actual
 
-expecting success of 1430.26 'update-ref --no-deref -d can delete dangling symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_must_be_empty output &&
-	test_must_be_empty error
+ok 12 - ref^{/!!Exp}
 
-error: reference does not exist
-ok 26 - update-ref --no-deref -d can delete dangling symref with broken name
+expecting success of 1511.13 'ref^{/!-}': 
+	test_must_fail git rev-parse main^{/!-}
 
-expecting success of 1430.27 'branch -d can delete dangling symref with broken name': 
-	test-tool ref-store main create-symref refs/heads/broken...symref refs/heads/idonotexist &&
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
-	test_ref_exists refs/heads/broken...symref &&
-	git branch -d broken...symref >output 2>error &&
-	test_ref_missing refs/heads/broken...symref &&
-	test_grep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
-	test_must_be_empty error
+fatal: ambiguous argument 'main^{/!-}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+main^{/!-}
+ok 13 - ref^{/!-}
 
-error: reference does not exist
-Deleted branch broken...symref (was refs/heads/idonotexist).
-ok 27 - branch -d can delete dangling symref with broken name
+expecting success of 1511.14 'ref^{/!-.}': 
+	test_must_fail git rev-parse main^{/!-.}
 
-expecting success of 1430.28 'update-ref -d cannot delete non-ref in .git dir': 
-	echo precious >.git/my-private-file &&
-	echo precious >expect &&
-	test_must_fail git update-ref -d my-private-file >output 2>error &&
-	test_must_be_empty output &&
-	test_grep -e "refusing to update ref with bad name" error &&
-	test_cmp expect .git/my-private-file
+fatal: ambiguous argument 'main^{/!-.}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+main^{/!-.}
+ok 14 - ref^{/!-.}
 
-error: refusing to update ref with bad name 'my-private-file'
-ok 28 - update-ref -d cannot delete non-ref in .git dir
+expecting success of 1511.15 'ref^{/!-non-existent}': 
+	git rev-parse main >expected &&
+	git rev-parse main^{/!-non-existent} >actual &&
+	test_cmp expected actual
 
-expecting success of 1430.29 'update-ref -d cannot delete absolute path': 
-	git branch -f extra &&
-	test_must_fail git update-ref -d "$(pwd)/.git/refs/heads/extra" &&
-	test_cmp_rev HEAD extra
+ok 15 - ref^{/!-non-existent}
 
-error: refusing to update ref with bad name '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra'
-ok 29 - update-ref -d cannot delete absolute path
+expecting success of 1511.16 'ref^{/!-Changed}': 
+	git rev-parse expref >expected &&
+	git rev-parse main^{/!-Changed} >actual &&
+	test_cmp expected actual
 
-expecting success of 1430.30 'update-ref --stdin fails create with bad ref name': 
-	echo "create ~a refs/heads/main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
+ok 16 - ref^{/!-Changed}
 
-fatal: invalid ref format: ~a
-ok 30 - update-ref --stdin fails create with bad ref name
+expecting success of 1511.17 'ref^{/!-!Exp}': 
+	git rev-parse modref >expected &&
+	git rev-parse expref^{/!-!Exp} >actual &&
+	test_cmp expected actual
 
-expecting success of 1430.31 'update-ref --stdin fails update with bad ref name': 
-	echo "update ~a refs/heads/main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
+ok 17 - ref^{/!-!Exp}
 
-fatal: invalid ref format: ~a
-ok 31 - update-ref --stdin fails update with bad ref name
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1515-rev-parse-outside-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1515-rev-parse-outside-repo/.git/
+expecting success of 1515.1 'set up non-repo directory': 
+	GIT_CEILING_DIRECTORIES=$(pwd) &&
+	export GIT_CEILING_DIRECTORIES &&
+	mkdir non-repo &&
+	cd non-repo &&
+	# confirm that git does not find a repo
+	test_must_fail git rev-parse --git-dir
 
-expecting success of 1430.32 'update-ref --stdin fails delete with bad ref name': 
-	echo "delete ~a refs/heads/main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
+fatal: not a git repository (or any of the parent directories): .git
+ok 1 - set up non-repo directory
 
-fatal: invalid ref format: ~a
-ok 32 - update-ref --stdin fails delete with bad ref name
+expecting success of 1515.2 'rev-parse --sq-quote': 
+	dump_args "$tricky" easy >expect &&
+	eval "dump_args $(git rev-parse --sq-quote "$tricky" easy)" >actual &&
+	test_cmp expect actual
 
-expecting success of 1430.33 'update-ref --stdin -z fails create with bad ref name': 
-	printf "%s\0" "create ~a " refs/heads/main >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a " err
+ok 2 - rev-parse --sq-quote
 
-fatal: invalid ref format: ~a 
-ok 33 - update-ref --stdin -z fails create with bad ref name
+expecting success of 1515.3 'rev-parse --local-env-vars': 
+	git rev-parse --local-env-vars >actual &&
+	# we do not want to depend on the complete list here,
+	# so just look for something plausible
+	grep ^GIT_DIR actual
 
-expecting success of 1430.34 'update-ref --stdin -z fails update with bad ref name': 
-	printf "%s\0" "update ~a" refs/heads/main "" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
+GIT_DIR
+ok 3 - rev-parse --local-env-vars
 
-fatal: invalid ref format: ~a
-ok 34 - update-ref --stdin -z fails update with bad ref name
+expecting success of 1515.4 'rev-parse --resolve-git-dir': 
+	git init --separate-git-dir repo dir &&
+	test_must_fail git rev-parse --resolve-git-dir . &&
+	echo "$(pwd)/repo" >expect &&
+	git rev-parse --resolve-git-dir dir/.git >actual &&
+	test_cmp expect actual
 
-expecting success of 1430.35 'update-ref --stdin -z fails delete with bad ref name': 
-	printf "%s\0" "delete ~a" refs/heads/main >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: invalid ref format: ~a" err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1515-rev-parse-outside-repo/non-repo/repo/
+fatal: not a gitdir '.'
+ok 4 - rev-parse --resolve-git-dir
 
-fatal: invalid ref format: ~a
-ok 35 - update-ref --stdin -z fails delete with bad ref name
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1513-rev-parse-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1513-rev-parse-prefix/.git/
+expecting success of 1513.1 'setup': 
+	mkdir -p sub1/sub2 &&
+	echo top >top &&
+	echo file1 >sub1/file1 &&
+	echo file2 >sub1/sub2/file2 &&
+	git add top sub1/file1 sub1/sub2/file2 &&
+	git commit -m commit
 
-expecting success of 1430.36 'branch rejects HEAD as a branch name': 
-	test_must_fail git branch HEAD HEAD^ &&
-	test_must_fail git show-ref refs/heads/HEAD
+[main (root-commit) 2a70803] commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/sub2/file2
+ create mode 100644 top
+ok 1 - setup
 
-fatal: 'HEAD' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 36 - branch rejects HEAD as a branch name
+expecting success of 1513.2 'empty prefix -- file': 
+	git rev-parse --prefix "" -- top sub1/file1 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	top
+	sub1/file1
+	EOF
+	test_cmp expected actual
 
-expecting success of 1430.37 'checkout -b rejects HEAD as a branch name': 
-	test_must_fail git checkout -B HEAD HEAD^ &&
-	test_must_fail git show-ref refs/heads/HEAD
+ok 2 - empty prefix -- file
 
-fatal: 'HEAD' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 37 - checkout -b rejects HEAD as a branch name
+expecting success of 1513.3 'valid prefix -- file': 
+	git rev-parse --prefix sub1/ -- file1 sub2/file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/file1
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
 
-expecting success of 1430.38 'update-ref can operate on refs/heads/HEAD': 
-	git update-ref refs/heads/HEAD HEAD^ &&
-	git show-ref refs/heads/HEAD &&
-	git update-ref -d refs/heads/HEAD &&
-	test_must_fail git show-ref refs/heads/HEAD
+ok 3 - valid prefix -- file
 
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/HEAD
-ok 38 - update-ref can operate on refs/heads/HEAD
+expecting success of 1513.4 'valid prefix -- ../file': 
+	git rev-parse --prefix sub1/ -- ../top sub2/file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/../top
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
 
-expecting success of 1430.39 'branch -d can remove refs/heads/HEAD': 
-	git update-ref refs/heads/HEAD HEAD^ &&
-	git branch -d HEAD &&
-	test_must_fail git show-ref refs/heads/HEAD
+ok 4 - valid prefix -- ../file
 
-Deleted branch HEAD (was d79ce16).
-ok 39 - branch -d can remove refs/heads/HEAD
+expecting success of 1513.5 'empty prefix HEAD:./path': 
+	git rev-parse --prefix "" HEAD:./top >actual &&
+	git rev-parse HEAD:top >expected &&
+	test_cmp expected actual
 
-expecting success of 1430.40 'branch -m can rename refs/heads/HEAD': 
-	git update-ref refs/heads/HEAD HEAD^ &&
-	git branch -m HEAD tail &&
-	test_must_fail git show-ref refs/heads/HEAD &&
-	git show-ref refs/heads/tail
+ok 5 - empty prefix HEAD:./path
 
-warning: renamed a misnamed branch 'HEAD' away
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/tail
-ok 40 - branch -m can rename refs/heads/HEAD
+expecting success of 1513.6 'valid prefix HEAD:./path': 
+	git rev-parse --prefix sub1/ HEAD:./file1 >actual &&
+	git rev-parse HEAD:sub1/file1 >expected &&
+	test_cmp expected actual
 
-expecting success of 1430.41 'branch -d can remove refs/heads/-dash': 
-	git update-ref refs/heads/-dash HEAD^ &&
-	git branch -d -- -dash &&
-	test_must_fail git show-ref refs/heads/-dash
+ok 6 - valid prefix HEAD:./path
 
-Deleted branch -dash (was d79ce16).
-ok 41 - branch -d can remove refs/heads/-dash
+expecting success of 1513.7 'valid prefix HEAD:../path': 
+	git rev-parse --prefix sub1/ HEAD:../top >actual &&
+	git rev-parse HEAD:top >expected &&
+	test_cmp expected actual
 
-expecting success of 1430.42 'branch -m can rename refs/heads/-dash': 
-	git update-ref refs/heads/-dash HEAD^ &&
-	git branch -m -- -dash dash &&
-	test_must_fail git show-ref refs/heads/-dash &&
-	git show-ref refs/heads/dash
+ok 7 - valid prefix HEAD:../path
 
-warning: renamed a misnamed branch '-dash' away
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/dash
-ok 42 - branch -m can rename refs/heads/-dash
+expecting success of 1513.8 'prefix ignored with HEAD:top': 
+	git rev-parse --prefix sub1/ HEAD:top >actual &&
+	git rev-parse HEAD:top >expected &&
+	test_cmp expected actual
 
-# still have 2 known breakage(s)
-# passed all remaining 40 test(s)
-1..42
+ok 8 - prefix ignored with HEAD:top
+
+expecting success of 1513.9 'disambiguate path with valid prefix': 
+	git rev-parse --prefix sub1/ file1 >actual &&
+	cat <<-\EOF >expected &&
+	sub1/file1
+	EOF
+	test_cmp expected actual
+
+ok 9 - disambiguate path with valid prefix
+
+expecting success of 1513.10 'file and refs with prefix': 
+	git rev-parse --prefix sub1/ main file1 >actual &&
+	cat <<-EOF >expected &&
+	$(git rev-parse main)
+	sub1/file1
+	EOF
+	test_cmp expected actual
+
+ok 10 - file and refs with prefix
+
+expecting success of 1513.11 'two-levels deep': 
+	git rev-parse --prefix sub1/sub2/ -- file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
+
+ok 11 - two-levels deep
+
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1502-rev-parse-parseopt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1502-rev-parse-parseopt/.git/
-expecting success of 1502.1 'setup optionspec': 
-	sed -e "s/^|//" >optionspec <<\EOF
-|some-command [options] <args>...
-|
-|some-command does foo and bar!
-|--
-|h,help!   show the help
-|
-|foo       some nifty option --foo
-|bar=      some cool option --bar with an argument
-|b,baz     a short and long option
-|
-| An option group Header
-|C?        option C with an optional argument
-|d,data?   short and long option with an optional argument
-|
-| Argument hints
-|B=arg     short option required argument
-|bar2=arg  long option required argument
-|e,fuz=with-space  short and long option required argument
-|s?some    short option optional argument
-|long?data long option optional argument
-|g,fluf?path     short and long option optional argument
-|longest=very-long-argument-hint  a very long argument hint
-|pair=key=value  with an equals sign in the hint
-|aswitch help te=t contains? fl*g characters!`
-|bswitch=hint	 hint has trailing tab character
-|cswitch	 switch has trailing tab character
-|short-hint=a    with a one symbol hint
-|
-|Extras
-|extra1    line above used to cause a segfault but no longer does
-EOF
+*** t1400-update-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref/.git/
+expecting success of 1400.1 'setup': 
+	git checkout --orphan main &&
+	create_test_commits "" &&
+	mkdir $bare &&
+	cd $bare &&
+	git init --bare -b main &&
+	create_test_commits "bare" &&
+	cd -
 
-ok 1 - setup optionspec
+Switched to a new branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref/bare-repo/
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref
+ok 1 - setup
 
-expecting success of 1502.2 'setup optionspec-no-switches': 
-	sed -e "s/^|//" >optionspec_no_switches <<\EOF
-|some-command [options] <args>...
-|
-|some-command does foo and bar!
-|--
-EOF
+expecting success of 1400.2 'create refs/heads/main': 
+	git update-ref $m $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-ok 2 - setup optionspec-no-switches
+ok 2 - create refs/heads/main
 
-expecting success of 1502.3 'setup optionspec-only-hidden-switches': 
-	sed -e "s/^|//" >optionspec_only_hidden_switches <<\EOF
-|some-command [options] <args>...
-|
-|some-command does foo and bar!
-|--
-|hidden1* A hidden switch
-EOF
+expecting success of 1400.3 'create refs/heads/main with oldvalue verification': 
+	git update-ref $m $B $A &&
+	test $B = $(git show-ref -s --verify $m)
 
-ok 3 - setup optionspec-only-hidden-switches
+ok 3 - create refs/heads/main with oldvalue verification
 
-expecting success of 1502.4 'test --parseopt help output': 
-	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
-	test_cmp "$TEST_DIRECTORY/t1502/optionspec.help" output
+expecting success of 1400.4 'fail to delete refs/heads/main with stale ref': 
+	test_must_fail git update-ref -d $m $A &&
+	test $B = "$(git show-ref -s --verify $m)"
 
-ok 4 - test --parseopt help output
+error: cannot lock ref 'refs/heads/main': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 4 - fail to delete refs/heads/main with stale ref
 
-expecting success of 1502.5 'test --parseopt help output no switches': 
-	sed -e "s/^|//" >expect <<\END_EXPECT &&
-|cat <<\EOF
-|usage: some-command [options] <args>...
-|
-|    some-command does foo and bar!
-|
-|EOF
-END_EXPECT
-	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
-	test_cmp expect output
+expecting success of 1400.5 'delete refs/heads/main': 
+	test_when_finished "git update-ref -d $m" &&
+	git update-ref -d $m $B &&
+	test_must_fail git show-ref --verify -q $m
 
-ok 5 - test --parseopt help output no switches
+ok 5 - delete refs/heads/main
 
-expecting success of 1502.6 'test --parseopt help output hidden switches': 
-	sed -e "s/^|//" >expect <<\END_EXPECT &&
-|cat <<\EOF
-|usage: some-command [options] <args>...
-|
-|    some-command does foo and bar!
-|
-|EOF
-END_EXPECT
-	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
-	test_cmp expect output
+expecting success of 1400.6 'delete refs/heads/main without oldvalue verification': 
+	test_when_finished "git update-ref -d $m" &&
+	git update-ref $m $A &&
+	test $A = $(git show-ref -s --verify $m) &&
+	git update-ref -d $m &&
+	test_must_fail git show-ref --verify -q $m
 
-ok 6 - test --parseopt help output hidden switches
+ok 6 - delete refs/heads/main without oldvalue verification
 
-expecting success of 1502.7 'test --parseopt help-all output hidden switches': 
-	sed -e "s/^|//" >expect <<\END_EXPECT &&
-|cat <<\EOF
-|usage: some-command [options] <args>...
-|
-|    some-command does foo and bar!
-|
-|    --[no-]hidden1        A hidden switch
-|
-|EOF
-END_EXPECT
-	test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
-	test_cmp expect output
+expecting success of 1400.7 'fail to create  due to file/directory conflict': 
+	test_when_finished "git update-ref -d refs/heads/gu" &&
+	git update-ref refs/heads/gu $A &&
+	test_must_fail git update-ref refs/heads/gu/fixes $A
 
-ok 7 - test --parseopt help-all output hidden switches
+fatal: update_ref failed for ref 'refs/heads/gu/fixes': cannot lock ref 'refs/heads/gu/fixes': 'refs/heads/gu' exists; cannot create 'refs/heads/gu/fixes'
+ok 7 - fail to create  due to file/directory conflict
 
-expecting success of 1502.8 'test --parseopt invalid switch help output': 
-	{
-		cat <<-\EOF &&
-		error: unknown option `does-not-exist'
-		EOF
-		sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/optionspec.help"
-	} >expect &&
-	test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
-	test_cmp expect output
+expecting success of 1400.8 'create refs/heads/main (by HEAD)': 
+	git update-ref HEAD $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-ok 8 - test --parseopt invalid switch help output
+ok 8 - create refs/heads/main (by HEAD)
 
-expecting success of 1502.9 'setup expect.1': 
-	cat > expect <<EOF
-set -- --foo --bar 'ham' -b --aswitch -- 'arg'
-EOF
+expecting success of 1400.9 'create refs/heads/main (by HEAD) with oldvalue verification': 
+	git update-ref HEAD $B $A &&
+	test $B = $(git show-ref -s --verify $m)
 
-ok 9 - setup expect.1
+ok 9 - create refs/heads/main (by HEAD) with oldvalue verification
 
-expecting success of 1502.10 'test --parseopt': 
-	git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
-	test_cmp expect output
+expecting success of 1400.10 'fail to delete refs/heads/main (by HEAD) with stale ref': 
+	test_must_fail git update-ref -d HEAD $A &&
+	test $B = $(git show-ref -s --verify $m)
 
-ok 10 - test --parseopt
+error: cannot lock ref 'HEAD': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 10 - fail to delete refs/heads/main (by HEAD) with stale ref
 
-expecting success of 1502.11 'test --parseopt with mixed options and arguments': 
-	git rev-parse --parseopt -- --foo arg --bar=ham --baz --aswitch < optionspec > output &&
-	test_cmp expect output
+expecting success of 1400.11 'delete refs/heads/main (by HEAD)': 
+	test_when_finished "git update-ref -d $m" &&
+	git update-ref -d HEAD $B &&
+	test_must_fail git show-ref --verify -q $m
 
-ok 11 - test --parseopt with mixed options and arguments
+ok 11 - delete refs/heads/main (by HEAD)
 
-expecting success of 1502.12 'setup expect.2': 
-	cat > expect <<EOF
-set -- --foo -- 'arg' '--bar=ham'
-EOF
+expecting success of 1400.12 'deleting current branch adds message to HEAD's log': 
+	test_when_finished "git update-ref -d $m" &&
+	git update-ref $m $A &&
+	git symbolic-ref HEAD $m &&
+	git update-ref -m delete-$m -d $m &&
+	test_must_fail git show-ref --verify -q $m &&
+	test-tool ref-store main for-each-reflog-ent HEAD >actual &&
+	grep "delete-$m$" actual
 
-ok 12 - setup expect.2
+0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1112912653 -0700	delete-refs/heads/main
+ok 12 - deleting current branch adds message to HEAD's log
 
-expecting success of 1502.13 'test --parseopt with --': 
-	git rev-parse --parseopt -- --foo -- arg --bar=ham < optionspec > output &&
-	test_cmp expect output
+expecting success of 1400.13 'deleting by HEAD adds message to HEAD's log': 
+	test_when_finished "git update-ref -d $m" &&
+	git update-ref $m $A &&
+	git symbolic-ref HEAD $m &&
+	git update-ref -m delete-by-head -d HEAD &&
+	test_must_fail git show-ref --verify -q $m &&
+	test-tool ref-store main for-each-reflog-ent HEAD >actual &&
+	grep "delete-by-head$" actual
 
-ok 13 - test --parseopt with --
+102939797ab91a4f201d131418d2c9d919dcdd2c 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1112912653 -0700	delete-by-head
+ok 13 - deleting by HEAD adds message to HEAD's log
 
-expecting success of 1502.14 'test --parseopt --stop-at-non-option': 
-	git rev-parse --parseopt --stop-at-non-option -- --foo arg --bar=ham < optionspec > output &&
-	test_cmp expect output
+expecting success of 1400.14 'update-ref does not create reflogs by default': 
+	test_when_finished "git update-ref -d $outside" &&
+	git update-ref $outside $A &&
+	git rev-parse $A >expect &&
+	git rev-parse $outside >actual &&
+	test_cmp expect actual &&
+	test_must_fail git reflog exists $outside
 
-ok 14 - test --parseopt --stop-at-non-option
+ok 14 - update-ref does not create reflogs by default
 
-expecting success of 1502.15 'setup expect.3': 
-	cat > expect <<EOF
-set -- --foo -- '--' 'arg' '--bar=ham'
-EOF
+expecting success of 1400.15 'update-ref creates reflogs with --create-reflog': 
+	test_when_finished "git update-ref -d $outside" &&
+	git update-ref --create-reflog $outside $A &&
+	git rev-parse $A >expect &&
+	git rev-parse $outside >actual &&
+	test_cmp expect actual &&
+	git reflog exists $outside
 
-ok 15 - setup expect.3
+ok 15 - update-ref creates reflogs with --create-reflog
 
-expecting success of 1502.16 'test --parseopt --keep-dashdash': 
-	git rev-parse --parseopt --keep-dashdash -- --foo -- arg --bar=ham < optionspec > output &&
-	test_cmp expect output
+expecting success of 1400.16 'creates no reflog in bare repository': 
+	git -C $bare update-ref $m $bareA &&
+	git -C $bare rev-parse $bareA >expect &&
+	git -C $bare rev-parse $m >actual &&
+	test_cmp expect actual &&
+	test_must_fail git -C $bare reflog exists $m
 
-ok 16 - test --parseopt --keep-dashdash
+ok 16 - creates no reflog in bare repository
 
-expecting success of 1502.17 'setup expect.4': 
-	cat >expect <<EOF
-set -- --foo -- '--' 'arg' '--spam=ham'
-EOF
+expecting success of 1400.17 'core.logAllRefUpdates=true creates reflog in bare repository': 
+	test_when_finished "git -C $bare config --unset core.logAllRefUpdates && \
+		test-tool ref-store main delete-reflog $m" &&
+	git -C $bare config core.logAllRefUpdates true &&
+	git -C $bare update-ref $m $bareB &&
+	git -C $bare rev-parse $bareB >expect &&
+	git -C $bare rev-parse $m >actual &&
+	test_cmp expect actual &&
+	git -C $bare reflog exists $m
 
-ok 17 - setup expect.4
+ok 17 - core.logAllRefUpdates=true creates reflog in bare repository
 
-expecting success of 1502.18 'test --parseopt --keep-dashdash --stop-at-non-option with --': 
-	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo -- arg --spam=ham <optionspec >output &&
-	test_cmp expect output
+expecting success of 1400.18 'core.logAllRefUpdates=true does not create reflog by default': 
+	test_config core.logAllRefUpdates true &&
+	test_when_finished "git update-ref -d $outside" &&
+	git update-ref $outside $A &&
+	git rev-parse $A >expect &&
+	git rev-parse $outside >actual &&
+	test_cmp expect actual &&
+	test_must_fail git reflog exists $outside
 
-ok 18 - test --parseopt --keep-dashdash --stop-at-non-option with --
+ok 18 - core.logAllRefUpdates=true does not create reflog by default
 
-expecting success of 1502.19 'setup expect.5': 
-	cat > expect <<EOF
-set -- --foo -- 'arg' '--spam=ham'
-EOF
+expecting success of 1400.19 'core.logAllRefUpdates=always creates reflog by default': 
+	test_config core.logAllRefUpdates always &&
+	test_when_finished "git update-ref -d $outside" &&
+	git update-ref $outside $A &&
+	git rev-parse $A >expect &&
+	git rev-parse $outside >actual &&
+	test_cmp expect actual &&
+	git reflog exists $outside
 
-ok 19 - setup expect.5
+ok 19 - core.logAllRefUpdates=always creates reflog by default
 
-expecting success of 1502.20 'test --parseopt --keep-dashdash --stop-at-non-option without --': 
-	git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo arg --spam=ham <optionspec >output &&
-	test_cmp expect output
+expecting success of 1400.20 'core.logAllRefUpdates=always creates reflog for ORIG_HEAD': 
+	test_config core.logAllRefUpdates always &&
+	git update-ref ORIG_HEAD $A &&
+	git reflog exists ORIG_HEAD
 
-ok 20 - test --parseopt --keep-dashdash --stop-at-non-option without --
+ok 20 - core.logAllRefUpdates=always creates reflog for ORIG_HEAD
 
-expecting success of 1502.21 'setup expect.6': 
-	cat > expect <<EOF
-set -- --foo --bar='z' --baz -C'Z' --data='A' -- 'arg'
-EOF
+expecting success of 1400.21 '--no-create-reflog overrides core.logAllRefUpdates=always': 
+	test_config core.logAllRefUpdates true &&
+	test_when_finished "git update-ref -d $outside" &&
+	git update-ref --no-create-reflog $outside $A &&
+	git rev-parse $A >expect &&
+	git rev-parse $outside >actual &&
+	test_cmp expect actual &&
+	test_must_fail git reflog exists $outside
 
-ok 21 - setup expect.6
+ok 21 - --no-create-reflog overrides core.logAllRefUpdates=always
 
-expecting success of 1502.22 'test --parseopt --stuck-long': 
-	git rev-parse --parseopt --stuck-long -- --foo --bar=z -b arg -CZ -dA <optionspec >output &&
-	test_cmp expect output
+expecting success of 1400.22 'create refs/heads/main (by HEAD)': 
+	git update-ref HEAD $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-ok 22 - test --parseopt --stuck-long
+ok 22 - create refs/heads/main (by HEAD)
 
-expecting success of 1502.23 'setup expect.7': 
-	cat > expect <<EOF
-set -- --data='' -C --baz -- 'arg'
-EOF
+expecting success of 1400.23 'pack refs': 
+	git pack-refs --all
 
-ok 23 - setup expect.7
+ok 23 - pack refs
 
-expecting success of 1502.24 'test --parseopt --stuck-long and empty optional argument': 
-	git rev-parse --parseopt --stuck-long -- --data= arg -C -b <optionspec >output &&
-	test_cmp expect output
+expecting success of 1400.24 'move refs/heads/main (by HEAD)': 
+	git update-ref HEAD $B $A &&
+	test $B = $(git show-ref -s --verify $m)
 
-ok 24 - test --parseopt --stuck-long and empty optional argument
+ok 24 - move refs/heads/main (by HEAD)
 
-expecting success of 1502.25 'setup expect.8': 
-	cat > expect <<EOF
-set -- --data --baz -- 'arg'
-EOF
+expecting success of 1400.25 'delete refs/heads/main (by HEAD) should remove both packed and loose refs/heads/main': 
+	test_when_finished "git update-ref -d $m" &&
+	git update-ref -d HEAD $B &&
+	! grep "$m" .git/packed-refs &&
+	test_must_fail git show-ref --verify -q $m
 
-ok 25 - setup expect.8
+ok 25 - delete refs/heads/main (by HEAD) should remove both packed and loose refs/heads/main
 
-expecting success of 1502.26 'test --parseopt --stuck-long and long option with unset optional argument': 
-	git rev-parse --parseopt --stuck-long -- --data arg -b <optionspec >output &&
-	test_cmp expect output
+expecting success of 1400.26 'delete symref without dereference': 
+	test_when_finished "git update-ref -d $m" &&
+	echo foo >foo.c &&
+	git add foo.c &&
+	git commit -m foo &&
+	git symbolic-ref SYMREF $m &&
+	git update-ref --no-deref -d SYMREF &&
+	git show-ref --verify -q $m &&
+	test_must_fail git show-ref --verify -q SYMREF &&
+	test_must_fail git symbolic-ref SYMREF
 
-ok 26 - test --parseopt --stuck-long and long option with unset optional argument
+[main (root-commit) fc83d41] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.c
+fatal: ref SYMREF is not a symbolic ref
+ok 26 - delete symref without dereference
 
-expecting success of 1502.27 'test --parseopt --stuck-long and short option with unset optional argument': 
-	git rev-parse --parseopt --stuck-long -- -d arg -b <optionspec >output &&
-	test_cmp expect output
+expecting success of 1400.27 'delete symref without dereference when the referred ref is packed': 
+	test_when_finished "git update-ref -d $m" &&
+	echo foo >foo.c &&
+	git add foo.c &&
+	git commit -m foo &&
+	git symbolic-ref SYMREF $m &&
+	git pack-refs --all &&
+	git update-ref --no-deref -d SYMREF &&
+	git show-ref --verify -q $m &&
+	test_must_fail git show-ref --verify -q SYMREF &&
+	test_must_fail git symbolic-ref SYMREF
 
-ok 27 - test --parseopt --stuck-long and short option with unset optional argument
+[main (root-commit) fc83d41] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.c
+fatal: ref SYMREF is not a symbolic ref
+ok 27 - delete symref without dereference when the referred ref is packed
 
-expecting success of 1502.28 'test --parseopt help output: "wrapped" options normal "or:" lines': 
-	sed -e "s/^|//" >spec <<-\EOF &&
-	|cmd [--some-option]
-	|    [--another-option]
-	|cmd [--yet-another-option]
-	|--
-	|h,help!   show the help
-	EOF
+expecting success of 1400.28 'update-ref -d is not confused by self-reference': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF refs/heads/self" &&
+	git symbolic-ref refs/heads/self refs/heads/self &&
+	git symbolic-ref --no-recurse refs/heads/self &&
+	test_must_fail git update-ref -d refs/heads/self &&
+	git symbolic-ref --no-recurse refs/heads/self
 
-	sed -e "s/^|//" >expect <<-\END_EXPECT &&
-	|cat <<\EOF
-	|usage: cmd [--some-option]
-	|   or:     [--another-option]
-	|   or: cmd [--yet-another-option]
-	|
-	|    -h, --help            show the help
-	|
-	|EOF
-	END_EXPECT
+refs/heads/self
+error: multiple updates for 'refs/heads/self' (including one via symref 'refs/heads/self') are not allowed
+refs/heads/self
+ok 28 - update-ref -d is not confused by self-reference
 
-	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
-	test_cmp expect actual
+expecting success of 1400.29 'update-ref --no-deref -d can delete self-reference': 
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF refs/heads/self" &&
+	git symbolic-ref refs/heads/self refs/heads/self &&
+	git symbolic-ref --no-recurse refs/heads/self &&
+	git update-ref --no-deref -d refs/heads/self &&
+	test_must_fail git show-ref --verify -q refs/heads/self
 
-ok 28 - test --parseopt help output: "wrapped" options normal "or:" lines
+refs/heads/self
+ok 29 - update-ref --no-deref -d can delete self-reference
 
-expecting success of 1502.29 'test --parseopt invalid opt-spec': 
-	test_write_lines x -- "=, x" >spec &&
-	echo "fatal: missing opt-spec before option flags" >expect &&
-	test_must_fail git rev-parse --parseopt -- <spec 2>err &&
-	test_cmp expect err
+expecting success of 1400.30 'update-ref --no-deref -d can delete reference to bad ref': 
+	>.git/refs/heads/bad &&
+	test_when_finished "rm -f .git/refs/heads/bad" &&
+	git symbolic-ref refs/heads/ref-to-bad refs/heads/bad &&
+	test_when_finished "git update-ref -d refs/heads/ref-to-bad" &&
+	git symbolic-ref --no-recurse refs/heads/ref-to-bad &&
+	git update-ref --no-deref -d refs/heads/ref-to-bad &&
+	test_must_fail git show-ref --verify -q refs/heads/ref-to-bad
 
-ok 29 - test --parseopt invalid opt-spec
+refs/heads/bad
+ok 30 - update-ref --no-deref -d can delete reference to bad ref
 
-expecting success of 1502.30 'test --parseopt help output: multi-line blurb after empty line': 
-	sed -e "s/^|//" >spec <<-\EOF &&
-	|cmd [--some-option]
-	|    [--another-option]
-	|
-	|multi
-	|line
-	|blurb
-	|--
-	|h,help!   show the help
-	EOF
+expecting success of 1400.31 '(not) create HEAD with old sha1': 
+	test_must_fail git update-ref HEAD $A $B
 
-	sed -e "s/^|//" >expect <<-\END_EXPECT &&
-	|cat <<\EOF
-	|usage: cmd [--some-option]
-	|   or:     [--another-option]
-	|
-	|    multi
-	|    line
-	|    blurb
-	|
-	|    -h, --help            show the help
-	|
-	|EOF
-	END_EXPECT
+fatal: update_ref failed for ref 'HEAD': cannot lock ref 'HEAD': unable to resolve reference 'refs/heads/main'
+ok 31 - (not) create HEAD with old sha1
 
-	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
-	test_cmp expect actual
+expecting success of 1400.32 '(not) prior created .git/refs/heads/main': 
+	test_when_finished "git update-ref -d $m" &&
+	test_must_fail git show-ref --verify -q $m
 
-ok 30 - test --parseopt help output: multi-line blurb after empty line
+ok 32 - (not) prior created .git/refs/heads/main
 
-expecting success of 1502.31 'test --parseopt help output for optionspec-neg': 
-	test_expect_code 129 git rev-parse --parseopt -- \
-		-h >output <"$TEST_DIRECTORY/t1502/optionspec-neg" &&
-	test_cmp "$TEST_DIRECTORY/t1502/optionspec-neg.help" output
+expecting success of 1400.33 'create HEAD': 
+	git update-ref HEAD $A
 
-ok 31 - test --parseopt help output for optionspec-neg
+ok 33 - create HEAD
 
-expecting success of 1502.32 'test --parseopt valid options for optionspec-neg': 
-	cat >expect <<-\EOF &&
-	set -- --foo --no-foo --no-bar --positive-only --no-negative --
-	EOF
-	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
-	       --foo --no-foo --no-bar --positive-only --no-negative &&
-	test_cmp expect output
+expecting success of 1400.34 '(not) change HEAD with wrong SHA1': 
+	test_must_fail git update-ref HEAD $B $Z
 
-ok 32 - test --parseopt valid options for optionspec-neg
+fatal: update_ref failed for ref 'HEAD': cannot lock ref 'HEAD': reference already exists
+ok 34 - (not) change HEAD with wrong SHA1
 
-expecting success of 1502.33 'test --parseopt positivated option for optionspec-neg': 
-	cat >expect <<-\EOF &&
-	set -- --no-no-bar --no-no-bar --
-	EOF
-	git rev-parse --parseopt -- <"$TEST_DIRECTORY/t1502/optionspec-neg" >output \
-	       --no-no-bar --bar &&
-	test_cmp expect output
+expecting success of 1400.35 '(not) changed .git/refs/heads/main': 
+	test_when_finished "git update-ref -d $m" &&
+	! test $B = $(git show-ref -s --verify $m)
 
-ok 33 - test --parseopt positivated option for optionspec-neg
+ok 35 - (not) changed .git/refs/heads/main
 
-expecting success of 1502.34 'test --parseopt invalid switch --no-positive-only help output for optionspec-neg': 
-		{
-			cat <<-\EOF &&
-			error: unknown option `no-positive-only'
-			EOF
-			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
-		} >expect &&
-		test_expect_code 129 git rev-parse --parseopt -- $opt \
-			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
-		test_cmp expect output
-	
-ok 34 - test --parseopt invalid switch --no-positive-only help output for optionspec-neg
+expecting success of 1400.36 'clean up reflog': 
+	test-tool ref-store main delete-reflog $m
 
-expecting success of 1502.35 'test --parseopt invalid switch --negative help output for optionspec-neg': 
-		{
-			cat <<-\EOF &&
-			error: unknown option `negative'
-			EOF
-			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
-		} >expect &&
-		test_expect_code 129 git rev-parse --parseopt -- $opt \
-			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
-		test_cmp expect output
-	
-ok 35 - test --parseopt invalid switch --negative help output for optionspec-neg
+ok 36 - clean up reflog
 
-expecting success of 1502.36 'test --parseopt invalid switch --no-no-negative help output for optionspec-neg': 
-		{
-			cat <<-\EOF &&
-			error: unknown option `no-no-negative'
-			EOF
-			sed -e 1d -e \$d <"$TEST_DIRECTORY/t1502/$spec.help"
-		} >expect &&
-		test_expect_code 129 git rev-parse --parseopt -- $opt \
-			2>output <"$TEST_DIRECTORY/t1502/$spec" &&
-		test_cmp expect output
-	
-ok 36 - test --parseopt invalid switch --no-no-negative help output for optionspec-neg
+expecting success of 1400.37 'create refs/heads/main (logged by touch)': 
+	test_config core.logAllRefUpdates false &&
+	GIT_COMMITTER_DATE="2005-05-26 23:30" \
+	git update-ref --create-reflog HEAD $A -m "Initial Creation" &&
+	test $A = $(git show-ref -s --verify $m)
 
-expecting success of 1502.37 'ambiguous: --no matches both --noble and --no-noble': 
-	cat >spec <<-\EOF &&
-	some-command [options]
-	--
-	noble The feudal switch.
-	EOF
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	git rev-parse --parseopt -- <spec 2>err --no &&
-	grep "error: ambiguous option: no (could be --noble or --no-noble)" err
+ok 37 - create refs/heads/main (logged by touch)
 
-cat <<\EOF
-usage: some-command [options]
+expecting success of 1400.38 'update refs/heads/main (logged by touch)': 
+	test_config core.logAllRefUpdates false &&
+	GIT_COMMITTER_DATE="2005-05-26 23:31" \
+	git update-ref HEAD $B $A -m "Switch" &&
+	test $B = $(git show-ref -s --verify $m)
 
-    --[no-]noble          The feudal switch.
+ok 38 - update refs/heads/main (logged by touch)
 
-EOF
-error: ambiguous option: no (could be --noble or --no-noble)
-ok 37 - ambiguous: --no matches both --noble and --no-noble
+expecting success of 1400.39 'set refs/heads/main (logged by touch)': 
+	test_config core.logAllRefUpdates false &&
+	GIT_COMMITTER_DATE="2005-05-26 23:41" \
+	git update-ref HEAD $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1501-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 39 - set refs/heads/main (logged by touch)
 
-	mkdir -p work/sub/dir &&
-	mkdir -p work2 &&
-	mv .git repo.git
+expecting success of 1400.40 'verifying refs/heads/main's log (logged by touch)': 
+	test_when_finished "git update-ref -d $m && git reflog expire --expire=all --all && rm -rf actual expect" &&
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp actual expect
 
-ok 1 - setup
+ok 40 - verifying refs/heads/main's log (logged by touch)
 
-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 1400.41 'create refs/heads/main (logged by config)': 
+	test_config core.logAllRefUpdates true &&
+	GIT_COMMITTER_DATE="2005-05-26 23:32" \
+	git update-ref HEAD $A -m "Initial Creation" &&
+	test $A = $(git show-ref -s --verify $m)
 
-		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 &&
+ok 41 - create refs/heads/main (logged by config)
 
-		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 1400.42 'update refs/heads/main (logged by config)': 
+	test_config core.logAllRefUpdates true &&
+	GIT_COMMITTER_DATE="2005-05-26 23:33" \
+	git update-ref HEAD $B $A -m "Switch" &&
+	test $B = $(git show-ref -s --verify $m)
 
-ok 2 - setup: helper for testing rev-parse
+ok 42 - update refs/heads/main (logged by config)
 
-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 1400.43 'set refs/heads/main (logged by config)': 
+	test_config core.logAllRefUpdates true &&
+	GIT_COMMITTER_DATE="2005-05-26 23:43" \
+	git update-ref HEAD $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-ok 3 - setup: core.worktree = relative path
+ok 43 - set refs/heads/main (logged by config)
 
-expecting success of 1501.4 'outside': 
-	test_rev_parse false false false
+expecting success of 1400.44 'verifying refs/heads/main's log (logged by config)': 
+	test_when_finished "git update-ref -d $m && git reflog expire --expire=all --all && rm -rf actual expect" &&
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp actual expect
 
-ok 4 - outside
+ok 44 - verifying refs/heads/main's log (logged by config)
 
-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 1400.45 'set up for querying the reflog': 
+	git update-ref -d $m &&
+	test-tool ref-store main delete-reflog $m &&
 
-'actual.prefix' is not empty, it contains:
+	GIT_COMMITTER_DATE="1117150320 -0500" git update-ref $m $C &&
+	GIT_COMMITTER_DATE="1117150350 -0500" git update-ref $m $A &&
+	GIT_COMMITTER_DATE="1117150380 -0500" git update-ref $m $B &&
+	GIT_COMMITTER_DATE="1117150680 -0500" git update-ref $m $F &&
+	GIT_COMMITTER_DATE="1117150980 -0500" git update-ref $m $E &&
+	git update-ref $m $D &&
+	# Delete the last reflog entry so that the tip of m and the reflog for
+	# it disagree.
+	git reflog delete $m@{0} &&
 
-ok 5 - inside work tree
+	cat >expect <<-EOF &&
+	$Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
+	$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500
+	$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
+	$B $F $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500
+	$F $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500
+	EOF
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp expect actual
 
-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 45 - set up for querying the reflog
 
-ok 6 - empty prefix is actually written out
+expecting success of 1400.46 'Query "main@{May 25 2005}" (before history)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{May 25 2005}" >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for 'main' only goes back to $ed" >expect &&
+	test_cmp expect e
 
-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 46 - Query "main@{May 25 2005}" (before history)
 
-ok 7 - subdir of work tree
+expecting success of 1400.47 'Query main@{2005-05-25} (before history)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify main@{2005-05-25} >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for 'main' only goes back to $ed" >expect &&
+	test_cmp expect e
 
-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 47 - Query main@{2005-05-25} (before history)
 
-ok 8 - setup: core.worktree = absolute path
+expecting success of 1400.48 'Query "main@{May 26 2005 23:31:59}" (1 second before history)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{May 26 2005 23:31:59}" >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for 'main' only goes back to $ed" >expect &&
+	test_cmp expect e
 
-expecting success of 1501.9 'outside': 
-	test_rev_parse false false false &&
-	(
-		cd work2 &&
-		test_rev_parse false false false
-	)
+ok 48 - Query "main@{May 26 2005 23:31:59}" (1 second before history)
 
-ok 9 - outside
+expecting success of 1400.49 'Query "main@{May 26 2005 23:32:00}" (exactly history start)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{May 26 2005 23:32:00}" >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 
-expecting success of 1501.10 'inside work tree': 
-	(
-		cd work &&
-		test_rev_parse false false true ""
-	)
+ok 49 - Query "main@{May 26 2005 23:32:00}" (exactly history start)
 
-'actual.prefix' is not empty, it contains:
+expecting success of 1400.50 'Query "main@{May 26 2005 23:32:30}" (first non-creation change)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{May 26 2005 23:32:30}" >o 2>e &&
+	echo "$A" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 
-ok 10 - inside work tree
+ok 50 - Query "main@{May 26 2005 23:32:30}" (first non-creation change)
 
-expecting success of 1501.11 'subdir of work tree': 
-	(
-		cd work/sub/dir &&
-		test_rev_parse false false true sub/dir/
-	)
+expecting success of 1400.51 'Query "main@{2005-05-26 23:33:01}" (middle of history with gap)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{2005-05-26 23:33:01}" >o 2>e &&
+	echo "$B" >expect &&
+	test_cmp expect o
 
-ok 11 - subdir of work tree
+ok 51 - Query "main@{2005-05-26 23:33:01}" (middle of history with gap)
 
-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
+expecting success of 1400.52 'Query "main@{2005-05-26 23:38:00}" (middle of history)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{2005-05-26 23:38:00}" >o 2>e &&
+	echo "$F" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 
-ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree)
+ok 52 - Query "main@{2005-05-26 23:38:00}" (middle of history)
 
-expecting success of 1501.13 'outside': 
-	test_rev_parse false false false &&
-	(
-		cd work2 &&
-		test_rev_parse false false false
-	)
+expecting success of 1400.53 'Query "main@{2005-05-26 23:43:00}" (exact end of history)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{2005-05-26 23:43:00}" >o 2>e &&
+	echo "$E" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 
-ok 13 - outside
+ok 53 - Query "main@{2005-05-26 23:43:00}" (exact end of history)
 
-expecting success of 1501.14 'inside work tree': 
-	(
-		cd work &&
-		GIT_WORK_TREE=. &&
-		test_rev_parse false false true ""
-	)
+expecting success of 1400.54 'Query "main@{2005-05-28}" (past end of history)': 
+	test_when_finished "rm -f o e" &&
+	git rev-parse --verify "main@{2005-05-28}" >o 2>e &&
+	echo "$D" >expect &&
+	test_cmp expect o &&
+	test_grep -F "warning: log for ref $m unexpectedly ended on $ld" e
 
-'actual.prefix' is not empty, it contains:
+warning: log for ref refs/heads/main unexpectedly ended on Thu, 26 May 2005 18:43:00 -0500
+ok 54 - Query "main@{2005-05-28}" (past end of history)
 
-ok 14 - inside work tree
+expecting success of 1400.55 'query reflog with gap': 
+	test_when_finished "git update-ref -d $m" &&
 
-expecting success of 1501.15 'subdir of work tree': 
-	(
-		cd work/sub/dir &&
-		GIT_WORK_TREE=../.. &&
-		test_rev_parse false false true sub/dir/
-	)
+	GIT_COMMITTER_DATE="1117150320 -0500" git update-ref $m $A &&
+	GIT_COMMITTER_DATE="1117150380 -0500" git update-ref $m $B &&
+	GIT_COMMITTER_DATE="1117150480 -0500" git update-ref $m $C &&
+	GIT_COMMITTER_DATE="1117150580 -0500" git update-ref $m $D &&
+	GIT_COMMITTER_DATE="1117150680 -0500" git update-ref $m $F &&
+	git reflog delete $m@{2} &&
 
-ok 15 - subdir of work tree
+	git rev-parse --verify "main@{2005-05-26 23:33:01}" >actual 2>stderr &&
+	echo "$B" >expect &&
+	test_cmp expect actual &&
+	test_grep -F "warning: log for ref $m has gap after $gd" stderr
 
-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
+warning: log for ref refs/heads/main has gap after Thu, 26 May 2005 18:33:00 -0500
+ok 55 - query reflog with gap
 
-ok 16 - setup: GIT_WORK_TREE=absolute, below git dir
+expecting success of 1400.56 'creating initial files': 
+	test_when_finished rm -f M &&
+	echo TEST >F &&
+	git add F &&
+	GIT_AUTHOR_DATE="2005-05-26 23:30" \
+	GIT_COMMITTER_DATE="2005-05-26 23:30" git commit -m add -a &&
+	h_TEST=$(git rev-parse --verify HEAD) &&
+	echo The other day this did not work. >M &&
+	echo And then Bob told me how to fix it. >>M &&
+	echo OTHER >F &&
+	GIT_AUTHOR_DATE="2005-05-26 23:41" \
+	GIT_COMMITTER_DATE="2005-05-26 23:41" git commit -F M -a &&
+	h_OTHER=$(git rev-parse --verify HEAD) &&
+	GIT_AUTHOR_DATE="2005-05-26 23:44" \
+	GIT_COMMITTER_DATE="2005-05-26 23:44" git commit --amend &&
+	h_FIXED=$(git rev-parse --verify HEAD) &&
+	echo Merged initial commit and a later commit. >M &&
+	echo $h_TEST >.git/MERGE_HEAD &&
+	GIT_AUTHOR_DATE="2005-05-26 23:45" \
+	GIT_COMMITTER_DATE="2005-05-26 23:45" git commit -F M &&
+	h_MERGED=$(git rev-parse --verify HEAD)
 
-expecting success of 1501.17 'outside': 
-	echo outside &&
-	test_rev_parse false false false
+[main (root-commit) 0c23f5f] add
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 F
+ create mode 100644 foo.c
+[main d3968db] The other day this did not work. And then Bob told me how to fix it.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e66de33] The other day this did not work. And then Bob told me how to fix it.
+ Author: A U Thor <author@example.com>
+ Date: Thu May 26 23:41:00 2005 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 29d1ccd] Merged initial commit and a later commit.
+ Author: A U Thor <author@example.com>
+ok 56 - creating initial files
 
-outside
-ok 17 - outside
+expecting success of 1400.57 'git commit logged updates': 
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp expect actual
 
-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 57 - git commit logged updates
 
-ok 18 - in repo.git
+expecting success of 1400.58 'git cat-file blob main:F (expect OTHER)': 
+	test OTHER = $(git cat-file blob main:F)
 
-expecting success of 1501.19 'inside work tree': 
-	(
-		cd repo.git/work &&
-		test_rev_parse false true true ""
-	)
+ok 58 - git cat-file blob main:F (expect OTHER)
 
-'actual.prefix' is not empty, it contains:
+expecting success of 1400.59 'git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)': 
+	test TEST = $(git cat-file blob "main@{2005-05-26 23:30}:F")
 
-ok 19 - inside work tree
+ok 59 - git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)
 
-expecting success of 1501.20 'subdir of work tree': 
-	(
-		cd repo.git/work/sub/dir &&
-		test_rev_parse false true true sub/dir/
-	)
+expecting success of 1400.60 'git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)': 
+	test OTHER = $(git cat-file blob "main@{2005-05-26 23:42}:F")
 
-ok 20 - subdir of work tree
+ok 60 - git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)
 
-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
+expecting success of 1400.61 'given old value for missing pseudoref, do not create': 
+	test_must_fail git update-ref PSEUDOREF $A $B 2>err &&
+	test_must_fail git rev-parse PSEUDOREF &&
+	test_grep "unable to resolve reference" err
 
-ok 21 - find work tree from repo
+fatal: ambiguous argument 'PSEUDOREF': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+PSEUDOREF
+fatal: update_ref failed for ref 'PSEUDOREF': cannot lock ref 'PSEUDOREF': unable to resolve reference 'PSEUDOREF'
+ok 61 - given old value for missing pseudoref, do not create
 
-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
+expecting success of 1400.62 'create pseudoref': 
+	git update-ref PSEUDOREF $A &&
+	test $A = $(git show-ref -s --verify PSEUDOREF)
 
-ok 22 - find work tree from work tree
+ok 62 - create pseudoref
 
-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 &&
+expecting success of 1400.63 'overwrite pseudoref with no old value given': 
+	git update-ref PSEUDOREF $B &&
+	test $B = $(git show-ref -s --verify PSEUDOREF)
 
-		git diff --exit-code tracked &&
-		echo changed >tracked &&
-		test_must_fail git diff --exit-code tracked
-	)
+ok 63 - overwrite pseudoref with no old value given
 
-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 1400.64 'overwrite pseudoref with correct old value': 
+	git update-ref PSEUDOREF $C $B &&
+	test $C = $(git show-ref -s --verify PSEUDOREF)
 
-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
+ok 64 - overwrite pseudoref with correct old value
 
-	(
-		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
+expecting success of 1400.65 'do not overwrite pseudoref with wrong old value': 
+	test_must_fail git update-ref PSEUDOREF $D $E 2>err &&
+	test $C = $(git show-ref -s --verify PSEUDOREF) &&
+	test_grep "cannot lock ref.*expected" err
 
-ok 24 - diff-index respects work tree under .git dir
+fatal: update_ref failed for ref 'PSEUDOREF': cannot lock ref 'PSEUDOREF': is at 3cceb89b690679aecbe1db39079f99221f1aaaa6 but expected a6166d2809963b1da1148e6922729c21214390c8
+ok 65 - do not overwrite pseudoref with wrong old value
 
-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
+expecting success of 1400.66 'delete pseudoref': 
+	git update-ref -d PSEUDOREF &&
+	test_must_fail git show-ref -s --verify PSEUDOREF
 
-	(
-		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
+fatal: 'PSEUDOREF' - not a valid ref
+ok 66 - delete pseudoref
 
-ok 25 - diff-files respects work tree under .git dir
+expecting success of 1400.67 'do not delete pseudoref with wrong old value': 
+	git update-ref PSEUDOREF $A &&
+	test_must_fail git update-ref -d PSEUDOREF $B 2>err &&
+	test $A = $(git show-ref -s --verify PSEUDOREF) &&
+	test_grep "cannot lock ref.*expected" err
 
-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
+error: cannot lock ref 'PSEUDOREF': is at 102939797ab91a4f201d131418d2c9d919dcdd2c but expected 56d5c1374e8028a1e122ab046ab7b98165342dc4
+ok 67 - do not delete pseudoref with wrong old value
 
-	(
-		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
+expecting success of 1400.68 'delete pseudoref with correct old value': 
+	git update-ref -d PSEUDOREF $A &&
+	test_must_fail git show-ref -s --verify PSEUDOREF
 
-ok 26 - git diff respects work tree under .git dir
+fatal: 'PSEUDOREF' - not a valid ref
+ok 68 - delete pseudoref with correct old value
 
-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
+expecting success of 1400.69 'create pseudoref with old OID zero': 
+	git update-ref PSEUDOREF $A $Z &&
+	test $A = $(git show-ref -s --verify PSEUDOREF)
 
-ok 27 - git grep
+ok 69 - create pseudoref with old OID zero
 
-expecting success of 1501.28 'git commit': 
-	(
-		cd repo.git &&
-		GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done
-	)
+expecting success of 1400.70 'do not overwrite pseudoref with old OID zero': 
+	test_when_finished git update-ref -d PSEUDOREF &&
+	test_must_fail git update-ref PSEUDOREF $B $Z 2>err &&
+	test $A = $(git show-ref -s --verify PSEUDOREF) &&
+	test_grep "already exists" err
 
-[master (root-commit) 271ed29] done
+fatal: update_ref failed for ref 'PSEUDOREF': cannot lock ref 'PSEUDOREF': reference already exists
+ok 70 - do not overwrite pseudoref with old OID zero
+
+expecting success of 1400.71 'stdin test setup': 
+	echo "$pws" >"$pws" &&
+	git add -- "$pws" &&
+	git commit -m "$pws"
+
+[main 536da9b] path with space
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 sub/dir/tracked
-ok 28 - git commit
+ create mode 100644 path with space
+ok 71 - stdin test setup
 
-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
-	)
+expecting success of 1400.72 '-z fails without --stdin': 
+	test_must_fail git update-ref -z $m $m $m 2>err &&
+	test_grep "usage: git update-ref" err
 
-fatal: /home: '/home' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1501-work-tree/repo.git/work'
-ok 29 - absolute pathspec should fail gracefully
+usage: git update-ref [<options>] -d <refname> [<old-oid>]
+ok 72 - -z fails without --stdin
 
-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 1400.73 'stdin works with no input': 
+	>stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse --verify -q $m
 
-git --git-dir=/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1501-work-tree//repo.git --work-tree=/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1501-work-tree add dummy_file
-ok 30 - make_relative_path handles double slashes in GIT_DIR
+536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
+ok 73 - stdin works with no input
 
-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 1400.74 'stdin fails on empty line': 
+	echo "" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: empty command in input" err
 
-ok 31 - relative $GIT_WORK_TREE and git subprocesses
+fatal: empty command in input
+ok 74 - stdin fails on empty line
 
-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 1400.75 'stdin fails on only whitespace': 
+	echo " " >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: whitespace before command:  " err
 
-cp: cannot stat 'repo.git/sharedindex.*': No such file or directory
-ok 32 - Multi-worktree setup
+fatal: whitespace before command:  
+ok 75 - stdin fails on only whitespace
 
-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 1400.76 'stdin fails on leading whitespace': 
+	echo " create $a $m" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: whitespace before command:  create $a $m" err
 
-ok 33 - GIT_DIR set (1)
+fatal: whitespace before command:  create refs/heads/a refs/heads/main
+ok 76 - stdin fails on leading whitespace
 
-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 1400.77 'stdin fails on unknown command': 
+	echo "unknown $a" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: unknown command: unknown $a" err
 
-ok 34 - GIT_DIR set (2)
+fatal: unknown command: unknown refs/heads/a
+ok 77 - stdin fails on unknown command
 
-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 1400.78 'stdin fails on unbalanced quotes': 
+	echo "create $a \"main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: badly quoted argument: \\\"main" err
 
-ok 35 - Auto discovery
+fatal: badly quoted argument: "main
+ok 78 - stdin fails on unbalanced quotes
 
-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 1400.79 'stdin fails on invalid escape': 
+	echo "create $a \"ma\zn\"" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err
 
-ok 36 - $GIT_DIR/common overrides core.worktree
+fatal: badly quoted argument: "ma\zn"
+ok 79 - stdin fails on invalid escape
 
-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 1400.80 'stdin fails on junk after quoted argument': 
+	echo "create \"$a\"main" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: unexpected character after quoted argument: \\\"$a\\\"main" err
 
-ok 37 - $GIT_WORK_TREE overrides $GIT_DIR/common
+fatal: unexpected character after quoted argument: "refs/heads/a"main
+ok 80 - stdin fails on junk after quoted argument
 
-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 1400.81 'stdin fails create with no ref': 
+	echo "create " >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: create: missing <ref>" err
 
-fatal: Invalid path '/.invalid': No such file or directory
-ok 38 - error out gracefully on invalid $GIT_WORK_TREE
+fatal: create: missing <ref>
+ok 81 - stdin fails create with no ref
 
-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 1400.82 'stdin fails create with no new value': 
+	echo "create $a" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: create $a: missing <new-oid>" err
 
-	GIT_DIR=relative/.git GIT_WORK_TREE=relative git reset HEAD^ &&
+fatal: create refs/heads/a: missing <new-oid>
+ok 82 - stdin fails create with no new value
 
-	git -C relative log -1 --format=%s >actual &&
-	echo one >expect &&
-	test_cmp expect actual
+expecting success of 1400.83 'stdin fails create with too many arguments': 
+	echo "create $a $m $m" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: create $a: extra input:  $m" err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+fatal: create refs/heads/a: extra input:  refs/heads/main
+ok 83 - stdin fails create with too many arguments
 
-# passed all 39 test(s)
-1..39
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1503-rev-parse-verify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+expecting success of 1400.84 'stdin fails update with no ref': 
+	echo "update " >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: update: missing <ref>" err
 
-ok 1 - set up basic repo with 1 file (hello) and 4 commits
+fatal: update: missing <ref>
+ok 84 - stdin fails update with no ref
 
-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"
+expecting success of 1400.85 'stdin fails update with no new value': 
+	echo "update $a" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: update $a: missing <new-oid>" err
 
-ok 2 - works with one good rev
+fatal: update refs/heads/a: missing <new-oid>
+ok 85 - stdin fails update with no new value
 
-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
+expecting success of 1400.86 'stdin fails update with too many arguments': 
+	echo "update $a $m $m $m" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: update $a: extra input:  $m" err
 
-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
+fatal: update refs/heads/a: extra input:  refs/heads/main
+ok 86 - stdin fails update with too many arguments
 
-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
+expecting success of 1400.87 'stdin fails delete with no ref': 
+	echo "delete " >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: delete: missing <ref>" err
 
-ok 4 - fails silently when using -q
+fatal: delete: missing <ref>
+ok 87 - stdin fails delete with no ref
 
-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
+expecting success of 1400.88 'stdin fails delete with too many arguments': 
+	echo "delete $a $m $m" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: delete $a: extra input:  $m" err
 
-ok 5 - fails silently when using -q with deleted reflogs
+fatal: delete refs/heads/a: extra input:  refs/heads/main
+ok 88 - stdin fails delete with too many arguments
 
-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
+expecting success of 1400.89 'stdin fails verify with too many arguments': 
+	echo "verify $a $m $m" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: verify $a: extra input:  $m" err
 
-ok 6 - fails silently when using -q with not enough reflogs
+fatal: verify refs/heads/a: extra input:  refs/heads/main
+ok 89 - stdin fails verify with too many arguments
 
-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
+expecting success of 1400.90 'stdin fails option with unknown name': 
+	echo "option unknown" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: option unknown: unknown" err
 
-ok 7 - succeeds silently with -q and reflogs that do not go far back enough in time
+fatal: option unknown: unknown
+ok 90 - stdin fails option with unknown name
 
-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 1400.91 'stdin fails with duplicate refs': 
+	cat >stdin <<-EOF &&
+	create $a $m
+	create $b $m
+	create $a $m
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	test_grep "fatal: multiple updates for ref '$a' not allowed" err
 
-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
+fatal: multiple updates for ref 'refs/heads/a' not allowed
+ok 91 - stdin fails with duplicate refs
 
-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 1400.92 'stdin create ref works': 
+	echo "create $a $m" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-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 92 - stdin create ref works
 
-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 1400.93 'stdin does not create reflogs by default': 
+	test_when_finished "git update-ref -d $outside" &&
+	echo "create $outside $m" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $outside >actual &&
+	test_cmp expect actual &&
+	test_must_fail git reflog exists $outside
 
-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 93 - stdin does not create reflogs by default
 
-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 1400.94 'stdin creates reflogs with --create-reflog': 
+	test_when_finished "git update-ref -d $outside" &&
+	echo "create $outside $m" >stdin &&
+	git update-ref --create-reflog --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $outside >actual &&
+	test_cmp expect actual &&
+	git reflog exists $outside
 
-ok 11 - options can appear after --verify
+ok 94 - stdin creates reflogs with --create-reflog
 
-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 1400.95 'stdin succeeds with quoted argument': 
+	git update-ref -d $a &&
+	echo "create $a \"$m\"" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
 	test_cmp expect actual
 
-ok 12 - verify respects --end-of-options
+ok 95 - stdin succeeds with quoted argument
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1504-ceiling-dirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1504-ceiling-dirs/.git/
-expecting success of 1504.1 'no_ceil: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 1 - no_ceil: git rev-parse --show-prefix is ''
+expecting success of 1400.96 'stdin succeeds with escaped character': 
+	git update-ref -d $a &&
+	echo "create $a \"ma\\151n\"" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.2 'ceil_empty: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 2 - ceil_empty: git rev-parse --show-prefix is ''
+ok 96 - stdin succeeds with escaped character
 
-expecting success of 1504.3 'ceil_at_parent: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 3 - ceil_at_parent: git rev-parse --show-prefix is ''
+expecting success of 1400.97 'stdin update ref creates with zero old value': 
+	echo "update $b $m $Z" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	git update-ref -d $b
 
-expecting success of 1504.4 'ceil_at_parent_slash: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 4 - ceil_at_parent_slash: git rev-parse --show-prefix is ''
+ok 97 - stdin update ref creates with zero old value
 
-expecting success of 1504.5 'ceil_at_trash: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 5 - ceil_at_trash: git rev-parse --show-prefix is ''
+expecting success of 1400.98 'stdin update ref creates with empty old value': 
+	echo "update $b $m $E" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.6 'ceil_at_trash_slash: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 6 - ceil_at_trash_slash: git rev-parse --show-prefix is ''
+ok 98 - stdin update ref creates with empty old value
 
-expecting success of 1504.7 'ceil_at_sub: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 7 - ceil_at_sub: git rev-parse --show-prefix is ''
+expecting success of 1400.99 'stdin create ref works with path with space to blob': 
+	echo "create refs/blobs/pws \"$m:$pws\"" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse "$m:$pws" >expect &&
+	git rev-parse refs/blobs/pws >actual &&
+	test_cmp expect actual &&
+	git update-ref -d refs/blobs/pws
 
-expecting success of 1504.8 'ceil_at_sub_slash: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 8 - ceil_at_sub_slash: git rev-parse --show-prefix is ''
+ok 99 - stdin create ref works with path with space to blob
 
-checking prerequisite: SYMLINKS
+expecting success of 1400.100 'stdin update ref fails with wrong old value': 
+	echo "update $c $m $m~1" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: cannot lock ref '$c'" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-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
+fatal: cannot lock ref 'refs/heads/c': unable to resolve reference 'refs/heads/c'
+ok 100 - stdin update ref fails with wrong old value
 
-)
-prerequisite SYMLINKS ok
-expecting success of 1504.9 'subdir_no_ceil: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 9 - subdir_no_ceil: git rev-parse --show-prefix is 'sub/dir/'
+expecting success of 1400.101 'stdin update ref fails with bad old value': 
+	echo "update $c $m does-not-exist" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: update $c: invalid <old-oid>: does-not-exist" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-expecting success of 1504.10 'subdir_ceil_empty: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 10 - subdir_ceil_empty: git rev-parse --show-prefix is 'sub/dir/'
+fatal: update refs/heads/c: invalid <old-oid>: does-not-exist
+ok 101 - stdin update ref fails with bad old value
 
-expecting success of 1504.11 'subdir_ceil_at_trash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 11 - subdir_ceil_at_trash: prefix
+expecting success of 1400.102 'stdin create ref fails with bad new value': 
+	echo "create $c does-not-exist" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: create $c: invalid <new-oid>: does-not-exist" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-expecting success of 1504.12 'subdir_ceil_at_trash_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 12 - subdir_ceil_at_trash_slash: prefix
+fatal: create refs/heads/c: invalid <new-oid>: does-not-exist
+ok 102 - stdin create ref fails with bad new value
 
-expecting success of 1504.13 'subdir_ceil_at_sub: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 13 - subdir_ceil_at_sub: prefix
+expecting success of 1400.103 'stdin create ref fails with zero new value': 
+	echo "create $c " >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: create $c: zero <new-oid>" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-expecting success of 1504.14 'subdir_ceil_at_sub_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 14 - subdir_ceil_at_sub_slash: prefix
+fatal: create refs/heads/c: zero <new-oid>
+ok 103 - stdin create ref fails with zero new value
 
-expecting success of 1504.15 'subdir_ceil_at_top: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 15 - subdir_ceil_at_top: prefix
+expecting success of 1400.104 'stdin update ref works with right old value': 
+	echo "update $b $m~1 $m" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.16 'subdir_ceil_at_top_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 16 - subdir_ceil_at_top_slash: prefix
+ok 104 - stdin update ref works with right old value
 
-expecting success of 1504.17 'subdir_ceil_at_top_no_resolve: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 17 - subdir_ceil_at_top_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
+expecting success of 1400.105 'stdin delete ref fails with wrong old value': 
+	echo "delete $a $m~1" >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: cannot lock ref '$a'" err &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.18 'subdir_ceil_at_top_slash_no_resolve: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 18 - subdir_ceil_at_top_slash_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
+fatal: cannot lock ref 'refs/heads/a': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
+ok 105 - stdin delete ref fails with wrong old value
 
-expecting success of 1504.19 'subdir_ceil_at_subdir: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 19 - subdir_ceil_at_subdir: git rev-parse --show-prefix is 'sub/dir/'
+expecting success of 1400.106 'stdin delete ref fails with zero old value': 
+	echo "delete $a " >stdin &&
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: delete $a: zero <old-oid>" err &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.20 'subdir_ceil_at_subdir_slash: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 20 - subdir_ceil_at_subdir_slash: git rev-parse --show-prefix is 'sub/dir/'
+fatal: delete refs/heads/a: zero <old-oid>
+ok 106 - stdin delete ref fails with zero old value
 
-expecting success of 1504.21 'subdir_ceil_at_su: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 21 - subdir_ceil_at_su: git rev-parse --show-prefix is 'sub/dir/'
+expecting success of 1400.107 'stdin update symref works option no-deref': 
+	git symbolic-ref TESTSYMREF $b &&
+	cat >stdin <<-EOF &&
+	option no-deref
+	update TESTSYMREF $a $b
+	EOF
+	git update-ref --stdin <stdin &&
+	git rev-parse TESTSYMREF >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.22 'subdir_ceil_at_su_slash: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 22 - subdir_ceil_at_su_slash: git rev-parse --show-prefix is 'sub/dir/'
+ok 107 - stdin update symref works option no-deref
 
-expecting success of 1504.23 'subdir_ceil_at_sub_di: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 23 - subdir_ceil_at_sub_di: git rev-parse --show-prefix is 'sub/dir/'
+expecting success of 1400.108 'stdin delete symref works option no-deref': 
+	git symbolic-ref TESTSYMREF $b &&
+	cat >stdin <<-EOF &&
+	option no-deref
+	delete TESTSYMREF $b
+	EOF
+	git update-ref --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q TESTSYMREF &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.24 'subdir_ceil_at_sub_di_slash: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 24 - subdir_ceil_at_sub_di_slash: git rev-parse --show-prefix is 'sub/dir/'
+ok 108 - stdin delete symref works option no-deref
 
-expecting success of 1504.25 'subdir_ceil_at_subdi: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 25 - subdir_ceil_at_subdi: git rev-parse --show-prefix is 'sub/dir/'
+expecting success of 1400.109 'stdin update symref works flag --no-deref': 
+	git symbolic-ref TESTSYMREFONE $b &&
+	git symbolic-ref TESTSYMREFTWO $b &&
+	cat >stdin <<-EOF &&
+	update TESTSYMREFONE $a $b
+	update TESTSYMREFTWO $a $b
+	EOF
+	git update-ref --no-deref --stdin <stdin &&
+	git rev-parse TESTSYMREFONE TESTSYMREFTWO >expect &&
+	git rev-parse $a $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.26 'subdir_ceil_at_subdi_slash: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 26 - subdir_ceil_at_subdi_slash: git rev-parse --show-prefix is 'sub/dir/'
+ok 109 - stdin update symref works flag --no-deref
 
-expecting success of 1504.27 'second_of_two: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 27 - second_of_two: prefix
+expecting success of 1400.110 'stdin delete symref works flag --no-deref': 
+	git symbolic-ref TESTSYMREFONE $b &&
+	git symbolic-ref TESTSYMREFTWO $b &&
+	cat >stdin <<-EOF &&
+	delete TESTSYMREFONE $b
+	delete TESTSYMREFTWO $b
+	EOF
+	git update-ref --no-deref --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q TESTSYMREFONE &&
+	test_must_fail git rev-parse --verify -q TESTSYMREFTWO &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.28 'first_of_two: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 28 - first_of_two: prefix
+ok 110 - stdin delete symref works flag --no-deref
 
-expecting success of 1504.29 'second_of_three: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 29 - second_of_three: prefix
+expecting success of 1400.111 'stdin delete ref works with right old value': 
+	echo "delete $b $m~1" >stdin &&
+	git update-ref --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q $b
 
-expecting success of 1504.30 'git_dir_specified: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 30 - git_dir_specified: git rev-parse --show-prefix is ''
+ok 111 - stdin delete ref works with right old value
 
-expecting success of 1504.31 'sd_no_ceil: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 31 - sd_no_ceil: git rev-parse --show-prefix is 's/d/'
+expecting success of 1400.112 'stdin update/create/verify combination works': 
+	cat >stdin <<-EOF &&
+	update $a $m
+	create $b $m
+	verify $c
+	EOF
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	test_must_fail git rev-parse --verify -q $c
 
-expecting success of 1504.32 'sd_ceil_empty: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 32 - sd_ceil_empty: git rev-parse --show-prefix is 's/d/'
+ok 112 - stdin update/create/verify combination works
 
-expecting success of 1504.33 'sd_ceil_at_trash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 33 - sd_ceil_at_trash: prefix
+expecting success of 1400.113 'stdin verify succeeds for correct value': 
+	test-tool ref-store main for-each-reflog-ent $m >before &&
+	git rev-parse $m >expect &&
+	echo "verify $m $m" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual &&
+	test-tool ref-store main for-each-reflog-ent $m >after &&
+	test_cmp before after
 
-expecting success of 1504.34 'sd_ceil_at_trash_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 34 - sd_ceil_at_trash_slash: prefix
+ok 113 - stdin verify succeeds for correct value
 
-expecting success of 1504.35 'sd_ceil_at_s: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 35 - sd_ceil_at_s: prefix
+expecting success of 1400.114 'stdin verify succeeds for missing reference': 
+	test-tool ref-store main for-each-reflog-ent $m >before &&
+	echo "verify refs/heads/missing $Z" >stdin &&
+	git update-ref --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q refs/heads/missing &&
+	test-tool ref-store main for-each-reflog-ent $m >after &&
+	test_cmp before after
 
-expecting success of 1504.36 'sd_ceil_at_s_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
-	
-fatal: not a git repository (or any of the parent directories): .git
-ok 36 - sd_ceil_at_s_slash: prefix
+ok 114 - stdin verify succeeds for missing reference
 
-expecting success of 1504.37 'sd_ceil_at_sd: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 37 - sd_ceil_at_sd: git rev-parse --show-prefix is 's/d/'
+expecting success of 1400.115 'stdin verify treats no value as missing': 
+	echo "verify refs/heads/missing" >stdin &&
+	git update-ref --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q refs/heads/missing
 
-expecting success of 1504.38 'sd_ceil_at_sd_slash: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 38 - sd_ceil_at_sd_slash: git rev-parse --show-prefix is 's/d/'
+ok 115 - stdin verify treats no value as missing
 
-expecting success of 1504.39 'sd_ceil_at_su: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 39 - sd_ceil_at_su: git rev-parse --show-prefix is 's/d/'
+expecting success of 1400.116 'stdin verify fails for wrong value': 
+	git rev-parse $m >expect &&
+	echo "verify $m $m~1" >stdin &&
+	test_must_fail git update-ref --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.40 'sd_ceil_at_su_slash: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 40 - sd_ceil_at_su_slash: git rev-parse --show-prefix is 's/d/'
+fatal: cannot lock ref 'refs/heads/main': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
+ok 116 - stdin verify fails for wrong value
 
-expecting success of 1504.41 'sd_ceil_at_s_di: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 41 - sd_ceil_at_s_di: git rev-parse --show-prefix is 's/d/'
+expecting success of 1400.117 'stdin verify fails for mistaken null value': 
+	git rev-parse $m >expect &&
+	echo "verify $m $Z" >stdin &&
+	test_must_fail git update-ref --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.42 'sd_ceil_at_s_di_slash: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 42 - sd_ceil_at_s_di_slash: git rev-parse --show-prefix is 's/d/'
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 117 - stdin verify fails for mistaken null value
 
-expecting success of 1504.43 'sd_ceil_at_sdi: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 43 - sd_ceil_at_sdi: git rev-parse --show-prefix is 's/d/'
+expecting success of 1400.118 'stdin verify fails for mistaken empty value': 
+	M=$(git rev-parse $m) &&
+	test_when_finished "git update-ref $m $M" &&
+	git rev-parse $m >expect &&
+	echo "verify $m" >stdin &&
+	test_must_fail git update-ref --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-expecting success of 1504.44 'sd_ceil_at_sdi_slash: git rev-parse --show-prefix is 's/d/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
-		test_cmp expect actual
-	
-ok 44 - sd_ceil_at_sdi_slash: git rev-parse --show-prefix is 's/d/'
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 118 - stdin verify fails for mistaken empty value
 
-# passed all 44 test(s)
-1..44
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1505-rev-parse-last.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1505-rev-parse-last/.git/
-expecting success of 1505.1 'setup': 
+expecting success of 1400.119 'stdin update refs works with identity updates': 
+	cat >stdin <<-EOF &&
+	update $a $m $m
+	update $b $m $m
+	update $c $Z $E
+	EOF
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	test_must_fail git rev-parse --verify -q $c
 
-	make_commit 1 &&
-	git branch side &&
-	make_commit 2 &&
-	make_commit 3 &&
-	git checkout side &&
-	make_commit 4 &&
-	git merge main &&
-	git checkout main
+ok 119 - stdin update refs works with identity updates
 
+expecting success of 1400.120 'stdin update refs fails with wrong old value': 
+	git update-ref $c $m &&
+	cat >stdin <<-EOF &&
+	update $a $m $m
+	update $b $m $m
+	update $c  
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	grep "fatal: cannot lock ref '$c'" err &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	git rev-parse $c >actual &&
+	test_cmp expect actual
 
-[main (root-commit) c11cd10] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-[main ba98451] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2
-[main aefd701] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3
-Switched to branch 'side'
-[side 1d4df77] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4
-Merge made by the 'ort' strategy.
- 2 | 1 +
- 3 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 2
- create mode 100644 3
-Switched to branch 'main'
-ok 1 - setup
+fatal: cannot lock ref 'refs/heads/c': reference already exists
+ok 120 - stdin update refs fails with wrong old value
 
-expecting success of 1505.2 '@{-1} works': 
-	test_cmp_rev side @{-1}
+expecting success of 1400.121 'stdin delete refs works with packed and loose refs': 
+	git pack-refs --all &&
+	git update-ref $c $m~1 &&
+	cat >stdin <<-EOF &&
+	delete $a $m
+	update $b $Z $m
+	update $c $E $m~1
+	EOF
+	git update-ref --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q $a &&
+	test_must_fail git rev-parse --verify -q $b &&
+	test_must_fail git rev-parse --verify -q $c
 
-ok 2 - @{-1} works
+ok 121 - stdin delete refs works with packed and loose refs
 
-expecting success of 1505.3 '@{-1}~2 works': 
-	test_cmp_rev side~2 @{-1}~2
+expecting success of 1400.122 'stdin -z works on empty input': 
+	>stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse --verify -q $m
 
-ok 3 - @{-1}~2 works
+536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
+ok 122 - stdin -z works on empty input
 
-expecting success of 1505.4 '@{-1}^2 works': 
-	test_cmp_rev side^2 @{-1}^2
+expecting success of 1400.123 'stdin -z fails on empty line': 
+	echo "" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: whitespace before command: " err
 
-ok 4 - @{-1}^2 works
+fatal: whitespace before command: 
+ok 123 - stdin -z fails on empty line
 
-expecting success of 1505.5 '@{-1}@{1} works': 
-	test_cmp_rev side@{1} @{-1}@{1}
+expecting success of 1400.124 'stdin -z fails on empty command': 
+	printf $F "" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: empty command in input" err
 
-ok 5 - @{-1}@{1} works
+fatal: empty command in input
+ok 124 - stdin -z fails on empty command
 
-expecting success of 1505.6 '@{-2} works': 
-	test_cmp_rev main @{-2}
+expecting success of 1400.125 'stdin -z fails on only whitespace': 
+	printf $F " " >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: whitespace before command:  " err
 
-ok 6 - @{-2} works
+fatal: whitespace before command:  
+ok 125 - stdin -z fails on only whitespace
 
-expecting success of 1505.7 '@{-3} fails': 
-	test_must_fail git rev-parse @{-3}
+expecting success of 1400.126 'stdin -z fails on leading whitespace': 
+	printf $F " create $a" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: whitespace before command:  create $a" err
 
-fatal: ambiguous argument '@{-3}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-@{-3}
-ok 7 - @{-3} fails
+fatal: whitespace before command:  create refs/heads/a
+ok 126 - stdin -z fails on leading whitespace
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1509-root-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1500-rev-parse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/.git/
-expecting success of 1500.1 'setup': 
-	mkdir -p sub/dir work &&
-	cp -R .git repo.git &&
-	git checkout -B main &&
-	test_commit abc &&
-	git checkout -b side &&
-	test_commit def &&
-	git checkout main &&
-	git worktree add worktree side
+expecting success of 1400.127 'stdin -z fails on unknown command': 
+	printf $F "unknown $a" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: unknown command: unknown $a" err
 
-Switched to a new branch 'main'
-[main (root-commit) 4decab4] abc
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abc.t
-Switched to a new branch 'side'
-[side 0620bdf] def
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 def.t
-Switched to branch 'main'
-Preparing worktree (checking out 'side')
-HEAD is now at 0620bdf def
-ok 1 - setup
+fatal: unknown command: unknown refs/heads/a
+ok 127 - stdin -z fails on unknown command
 
-expecting success of 1500.2 'toplevel: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.128 'stdin -z fails create with no ref': 
+	printf $F "create " >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: create: missing <ref>" err
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: create: missing <ref>
+ok 128 - stdin -z fails create with no ref
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 2 - toplevel: --is-bare-repository
+expecting success of 1400.129 'stdin -z fails create with no new value': 
+	printf $F "create $a" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: create $a: unexpected end of input when reading <new-oid>" err
 
-expecting success of 1500.3 'toplevel: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: create refs/heads/a: unexpected end of input when reading <new-oid>
+ok 129 - stdin -z fails create with no new value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.130 'stdin -z fails create with too many arguments': 
+	printf $F "create $a" "$m" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: unknown command: $m" err
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 3 - toplevel: --is-inside-git-dir
+fatal: unknown command: refs/heads/main
+ok 130 - stdin -z fails create with too many arguments
 
-expecting success of 1500.4 'toplevel: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.131 'stdin -z fails update with no ref': 
+	printf $F "update " >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: update: missing <ref>" err
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: update: missing <ref>
+ok 131 - stdin -z fails update with no ref
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 4 - toplevel: --is-inside-work-tree
+expecting success of 1400.132 'stdin -z fails update with too few args': 
+	printf $F "update $a" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: update $a: unexpected end of input when reading <old-oid>" err
 
-expecting success of 1500.5 'toplevel: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: update refs/heads/a: unexpected end of input when reading <old-oid>
+ok 132 - stdin -z fails update with too few args
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.133 'stdin -z emits warning with empty new value': 
+	git update-ref $a $m &&
+	printf $F "update $a" "" "" >stdin &&
+	git update-ref -z --stdin <stdin 2>err &&
+	grep "warning: update $a: missing <new-oid>, treating as zero" err &&
+	test_must_fail git rev-parse --verify -q $a
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 5 - toplevel: --show-prefix
+warning: update refs/heads/a: missing <new-oid>, treating as zero
+ok 133 - stdin -z emits warning with empty new value
 
-expecting success of 1500.6 'toplevel: --git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.134 'stdin -z fails update with no new value': 
+	printf $F "update $a" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: update $a: unexpected end of input when reading <new-oid>" err
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: update refs/heads/a: unexpected end of input when reading <new-oid>
+ok 134 - stdin -z fails update with no new value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 6 - toplevel: --git-dir
+expecting success of 1400.135 'stdin -z fails update with no old value': 
+	printf $F "update $a" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: update $a: unexpected end of input when reading <old-oid>" err
 
-expecting success of 1500.7 'toplevel: --absolute-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: update refs/heads/a: unexpected end of input when reading <old-oid>
+ok 135 - stdin -z fails update with no old value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.136 'stdin -z fails update with too many arguments': 
+	printf $F "update $a" "$m" "$m" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: unknown command: $m" err
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 7 - toplevel: --absolute-git-dir
+fatal: unknown command: refs/heads/main
+ok 136 - stdin -z fails update with too many arguments
 
-expecting success of 1500.8 '.git/: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.137 'stdin -z fails delete with no ref': 
+	printf $F "delete " >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: delete: missing <ref>" err
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: delete: missing <ref>
+ok 137 - stdin -z fails delete with no ref
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 8 - .git/: --is-bare-repository
+expecting success of 1400.138 'stdin -z fails delete with no old value': 
+	printf $F "delete $a" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: delete $a: unexpected end of input when reading <old-oid>" err
 
-expecting success of 1500.9 '.git/: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: delete refs/heads/a: unexpected end of input when reading <old-oid>
+ok 138 - stdin -z fails delete with no old value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.139 'stdin -z fails delete with too many arguments': 
+	printf $F "delete $a" "$m" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: unknown command: $m" err
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 9 - .git/: --is-inside-git-dir
+fatal: unknown command: refs/heads/main
+ok 139 - stdin -z fails delete with too many arguments
 
-expecting success of 1500.10 '.git/: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.140 'stdin -z fails verify with too many arguments': 
+	printf $F "verify $a" "$m" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: unknown command: $m" err
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: unknown command: refs/heads/main
+ok 140 - stdin -z fails verify with too many arguments
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 10 - .git/: --is-inside-work-tree
+expecting success of 1400.141 'stdin -z fails verify with no old value': 
+	printf $F "verify $a" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: verify $a: unexpected end of input when reading <old-oid>" err
 
-expecting success of 1500.11 '.git/: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: verify refs/heads/a: unexpected end of input when reading <old-oid>
+ok 141 - stdin -z fails verify with no old value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.142 'stdin -z fails option with unknown name': 
+	printf $F "option unknown" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: option unknown: unknown" err
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 11 - .git/: --show-prefix
+fatal: option unknown: unknown
+ok 142 - stdin -z fails option with unknown name
 
-expecting success of 1500.12 '.git/: --git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.143 'stdin -z fails with duplicate refs': 
+	printf $F "create $a" "$m" "create $b" "$m" "create $a" "$m" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	test_grep "fatal: multiple updates for ref '$a' not allowed" err
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: multiple updates for ref 'refs/heads/a' not allowed
+ok 143 - stdin -z fails with duplicate refs
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 12 - .git/: --git-dir
+expecting success of 1400.144 'stdin -z create ref works': 
+	printf $F "create $a" "$m" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-expecting success of 1500.13 '.git/: --absolute-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 144 - stdin -z create ref works
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.145 'stdin -z update ref creates with zero old value': 
+	printf $F "update $b" "$m" "$Z" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	git update-ref -d $b
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 13 - .git/: --absolute-git-dir
+ok 145 - stdin -z update ref creates with zero old value
 
-expecting success of 1500.14 '.git/objects/: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.146 'stdin -z update ref creates with empty old value': 
+	printf $F "update $b" "$m" "" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+ok 146 - stdin -z update ref creates with empty old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 14 - .git/objects/: --is-bare-repository
+expecting success of 1400.147 'stdin -z create ref works with path with space to blob': 
+	printf $F "create refs/blobs/pws" "$m:$pws" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse "$m:$pws" >expect &&
+	git rev-parse refs/blobs/pws >actual &&
+	test_cmp expect actual &&
+	git update-ref -d refs/blobs/pws
 
-expecting success of 1500.15 '.git/objects/: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 147 - stdin -z create ref works with path with space to blob
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.148 'stdin -z update ref fails with wrong old value': 
+	printf $F "update $c" "$m" "$m~1" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: cannot lock ref '$c'" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 15 - .git/objects/: --is-inside-git-dir
+fatal: cannot lock ref 'refs/heads/c': unable to resolve reference 'refs/heads/c'
+ok 148 - stdin -z update ref fails with wrong old value
 
-expecting success of 1500.16 '.git/objects/: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.149 'stdin -z update ref fails with bad old value': 
+	printf $F "update $c" "$m" "does-not-exist" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: update $c: invalid <old-oid>: does-not-exist" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: update refs/heads/c: invalid <old-oid>: does-not-exist
+ok 149 - stdin -z update ref fails with bad old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 16 - .git/objects/: --is-inside-work-tree
+expecting success of 1400.150 'stdin -z create ref fails when ref exists': 
+	git update-ref $c $m &&
+	git rev-parse "$c" >expect &&
+	printf $F "create $c" "$m~1" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: cannot lock ref '$c'" err &&
+	git rev-parse "$c" >actual &&
+	test_cmp expect actual
 
-expecting success of 1500.17 '.git/objects/: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: cannot lock ref 'refs/heads/c': reference already exists
+ok 150 - stdin -z create ref fails when ref exists
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.151 'stdin -z create ref fails with bad new value': 
+	git update-ref -d "$c" &&
+	printf $F "create $c" "does-not-exist" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: create $c: invalid <new-oid>: does-not-exist" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 17 - .git/objects/: --show-prefix
+fatal: create refs/heads/c: invalid <new-oid>: does-not-exist
+ok 151 - stdin -z create ref fails with bad new value
 
-expecting success of 1500.18 '.git/objects/: --git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.152 'stdin -z create ref fails with empty new value': 
+	printf $F "create $c" "" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: create $c: missing <new-oid>" err &&
+	test_must_fail git rev-parse --verify -q $c
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: create refs/heads/c: missing <new-oid>
+ok 152 - stdin -z create ref fails with empty new value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 18 - .git/objects/: --git-dir
+expecting success of 1400.153 'stdin -z update ref works with right old value': 
+	printf $F "update $b" "$m~1" "$m" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1500.19 '.git/objects/: --absolute-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 153 - stdin -z update ref works with right old value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.154 'stdin -z delete ref fails with wrong old value': 
+	printf $F "delete $a" "$m~1" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: cannot lock ref '$a'" err &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 19 - .git/objects/: --absolute-git-dir
+fatal: cannot lock ref 'refs/heads/a': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
+ok 154 - stdin -z delete ref fails with wrong old value
 
-expecting success of 1500.20 'subdirectory: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.155 'stdin -z delete ref fails with zero old value': 
+	printf $F "delete $a" "$Z" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: delete $a: zero <old-oid>" err &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: delete refs/heads/a: zero <old-oid>
+ok 155 - stdin -z delete ref fails with zero old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 20 - subdirectory: --is-bare-repository
+expecting success of 1400.156 'stdin -z update symref works option no-deref': 
+	git symbolic-ref TESTSYMREF $b &&
+	printf $F "option no-deref" "update TESTSYMREF" "$a" "$b" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse TESTSYMREF >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-expecting success of 1500.21 'subdirectory: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 156 - stdin -z update symref works option no-deref
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.157 'stdin -z delete symref works option no-deref': 
+	git symbolic-ref TESTSYMREF $b &&
+	printf $F "option no-deref" "delete TESTSYMREF" "$b" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q TESTSYMREF &&
+	git rev-parse $m~1 >expect &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 21 - subdirectory: --is-inside-git-dir
+ok 157 - stdin -z delete symref works option no-deref
 
-expecting success of 1500.22 'subdirectory: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.158 'stdin -z delete ref works with right old value': 
+	printf $F "delete $b" "$m~1" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q $b
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+ok 158 - stdin -z delete ref works with right old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 22 - subdirectory: --is-inside-work-tree
+expecting success of 1400.159 'stdin -z update/create/verify combination works': 
+	printf $F "update $a" "$m" "" "create $b" "$m" "verify $c" "" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	test_must_fail git rev-parse --verify -q $c
 
-expecting success of 1500.23 'subdirectory: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 159 - stdin -z update/create/verify combination works
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.160 'stdin -z verify succeeds for correct value': 
+	git rev-parse $m >expect &&
+	printf $F "verify $m" "$m" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 23 - subdirectory: --show-prefix
+ok 160 - stdin -z verify succeeds for correct value
 
-expecting success of 1500.24 'subdirectory: --git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.161 'stdin -z verify succeeds for missing reference': 
+	printf $F "verify refs/heads/missing" "$Z" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q refs/heads/missing
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+ok 161 - stdin -z verify succeeds for missing reference
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 24 - subdirectory: --git-dir
+expecting success of 1400.162 'stdin -z verify treats no value as missing': 
+	printf $F "verify refs/heads/missing" "" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q refs/heads/missing
 
-expecting success of 1500.25 'subdirectory: --absolute-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 162 - stdin -z verify treats no value as missing
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.163 'stdin -z verify fails for wrong value': 
+	git rev-parse $m >expect &&
+	printf $F "verify $m" "$m~1" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 25 - subdirectory: --absolute-git-dir
+fatal: cannot lock ref 'refs/heads/main': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
+ok 163 - stdin -z verify fails for wrong value
 
-expecting success of 1500.26 'core.bare = true: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.164 'stdin -z verify fails for mistaken null value': 
+	git rev-parse $m >expect &&
+	printf $F "verify $m" "$Z" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 164 - stdin -z verify fails for mistaken null value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 26 - core.bare = true: --is-bare-repository
+expecting success of 1400.165 'stdin -z verify fails for mistaken empty value': 
+	M=$(git rev-parse $m) &&
+	test_when_finished "git update-ref $m $M" &&
+	git rev-parse $m >expect &&
+	printf $F "verify $m" "" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-expecting success of 1500.27 'core.bare = true: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 165 - stdin -z verify fails for mistaken empty value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.166 'stdin -z update refs works with identity updates': 
+	printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$Z" "" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	test_must_fail git rev-parse --verify -q $c
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 27 - core.bare = true: --is-inside-git-dir
+ok 166 - stdin -z update refs works with identity updates
 
-expecting success of 1500.28 'core.bare = true: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.167 'stdin -z update refs fails with wrong old value': 
+	git update-ref $c $m &&
+	printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$m" "$Z" >stdin &&
+	test_must_fail git update-ref -z --stdin <stdin 2>err &&
+	grep "fatal: cannot lock ref '$c'" err &&
+	git rev-parse $m >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual &&
+	git rev-parse $b >actual &&
+	test_cmp expect actual &&
+	git rev-parse $c >actual &&
+	test_cmp expect actual
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: cannot lock ref 'refs/heads/c': reference already exists
+ok 167 - stdin -z update refs fails with wrong old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 28 - core.bare = true: --is-inside-work-tree
+expecting success of 1400.168 'stdin -z delete refs works with packed and loose refs': 
+	git pack-refs --all &&
+	git update-ref $c $m~1 &&
+	printf $F "delete $a" "$m" "update $b" "$Z" "$m" "update $c" "" "$m~1" >stdin &&
+	git update-ref -z --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q $a &&
+	test_must_fail git rev-parse --verify -q $b &&
+	test_must_fail git rev-parse --verify -q $c
 
-expecting success of 1500.29 'core.bare undefined: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+warning: update refs/heads/c: missing <new-oid>, treating as zero
+ok 168 - stdin -z delete refs works with packed and loose refs
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.169 'fails with duplicate HEAD update': 
+	git branch target1 $A &&
+	git checkout target1 &&
+	cat >stdin <<-EOF &&
+	update refs/heads/target1 $C
+	option no-deref
+	update HEAD $B
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	test_grep "fatal: multiple updates for 'HEAD' (including one via its referent .refs/heads/target1.) are not allowed" err &&
+	echo "refs/heads/target1" >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/target1 >actual &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 29 - core.bare undefined: --is-bare-repository
+Switched to branch 'target1'
+fatal: multiple updates for 'HEAD' (including one via its referent 'refs/heads/target1') are not allowed
+ok 169 - fails with duplicate HEAD update
 
-expecting success of 1500.30 'core.bare undefined: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.170 'fails with duplicate ref update via symref': 
+	test_when_finished "git symbolic-ref -d refs/heads/symref2" &&
+	git branch target2 $A &&
+	git symbolic-ref refs/heads/symref2 refs/heads/target2 &&
+	cat >stdin <<-EOF &&
+	update refs/heads/target2 $C
+	update refs/heads/symref2 $B
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	test_grep "fatal: multiple updates for 'refs/heads/target2' (including one via symref .refs/heads/symref2.) are not allowed" err &&
+	echo "refs/heads/target2" >expect &&
+	git symbolic-ref refs/heads/symref2 >actual &&
+	test_cmp expect actual &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/target2 >actual &&
+	test_cmp expect actual
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: multiple updates for 'refs/heads/target2' (including one via symref 'refs/heads/symref2') are not allowed
+ok 170 - fails with duplicate ref update via symref
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 30 - core.bare undefined: --is-inside-git-dir
+checking prerequisite: ULIMIT_FILE_DESCRIPTORS
 
-expecting success of 1500.31 'core.bare undefined: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_FILE_DESCRIPTORS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_FILE_DESCRIPTORS" &&
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_open_files true
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+)
+prerequisite ULIMIT_FILE_DESCRIPTORS ok
+expecting success of 1400.171 'large transaction creating branches does not burst open file limit': 
+(
+	for i in $(test_seq 33)
+	do
+		echo "create refs/heads/$i HEAD" || exit 1
+	done >large_input &&
+	run_with_limited_open_files git update-ref --stdin <large_input &&
+	git rev-parse --verify -q refs/heads/33
+)
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 31 - core.bare undefined: --is-inside-work-tree
+102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 171 - large transaction creating branches does not burst open file limit
 
-expecting success of 1500.32 'GIT_DIR=../.git, core.bare = false: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.172 'large transaction deleting branches does not burst open file limit': 
+(
+	for i in $(test_seq 33)
+	do
+		echo "delete refs/heads/$i HEAD" || exit 1
+	done >large_input &&
+	run_with_limited_open_files git update-ref --stdin <large_input &&
+	test_must_fail git rev-parse --verify -q refs/heads/33
+)
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+ok 172 - large transaction deleting branches does not burst open file limit
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 32 - GIT_DIR=../.git, core.bare = false: --is-bare-repository
+expecting success of 1400.173 'handle per-worktree refs in refs/bisect': 
+	git commit --allow-empty -m "initial commit" &&
+	git worktree add -b branch worktree &&
+	(
+		cd worktree &&
+		git commit --allow-empty -m "test commit"  &&
+		git for-each-ref >for-each-ref.out &&
+		! grep refs/bisect for-each-ref.out &&
+		git update-ref refs/bisect/something HEAD &&
+		git rev-parse refs/bisect/something >../worktree-head &&
+		git for-each-ref | grep refs/bisect/something
+	) &&
+	git show-ref >actual &&
+	! grep refs/bisect actual &&
+	test_must_fail git rev-parse refs/bisect/something &&
+	git update-ref refs/bisect/something HEAD &&
+	git rev-parse refs/bisect/something >main-head &&
+	! test_cmp main-head worktree-head
 
-expecting success of 1500.33 'GIT_DIR=../.git, core.bare = false: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+[target1 58a0522] initial commit
+ Author: A U Thor <author@example.com>
+Preparing worktree (new branch 'branch')
+HEAD is now at 58a0522 initial commit
+[branch b62e0cb] test commit
+ Author: A U Thor <author@example.com>
+b62e0cb4990da3244885da90fe7d493334cca9f5 commit	refs/bisect/something
+fatal: ambiguous argument 'refs/bisect/something': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/bisect/something
+--- main-head	2026-03-14 13:27:13.366677808 +0000
++++ worktree-head	2026-03-14 13:27:13.246677808 +0000
+@@ -1 +1 @@
+-58a052250c09f010b95ad9bfe32f35d704eda1a0
++b62e0cb4990da3244885da90fe7d493334cca9f5
+ok 173 - handle per-worktree refs in refs/bisect
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.174 'transaction handles empty commit': 
+	cat >stdin <<-EOF &&
+	start
+	prepare
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start prepare commit >expect &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 33 - GIT_DIR=../.git, core.bare = false: --is-inside-git-dir
+ok 174 - transaction handles empty commit
 
-expecting success of 1500.34 'GIT_DIR=../.git, core.bare = false: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.175 'transaction handles empty commit with missing prepare': 
+	cat >stdin <<-EOF &&
+	start
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit >expect &&
+	test_cmp expect actual
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+ok 175 - transaction handles empty commit with missing prepare
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 34 - GIT_DIR=../.git, core.bare = false: --is-inside-work-tree
+expecting success of 1400.176 'transaction handles sole commit': 
+	cat >stdin <<-EOF &&
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" commit >expect &&
+	test_cmp expect actual
 
-expecting success of 1500.35 'GIT_DIR=../.git, core.bare = false: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 176 - transaction handles sole commit
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.177 'transaction handles empty abort': 
+	cat >stdin <<-EOF &&
+	start
+	prepare
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start prepare abort >expect &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 35 - GIT_DIR=../.git, core.bare = false: --show-prefix
+ok 177 - transaction handles empty abort
 
-expecting success of 1500.36 'GIT_DIR=../.git, core.bare = false: --git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.178 'transaction exits on multiple aborts': 
+	cat >stdin <<-EOF &&
+	abort
+	abort
+	EOF
+	test_must_fail git update-ref --stdin <stdin >actual 2>err &&
+	printf "%s: ok\n" abort >expect &&
+	test_cmp expect actual &&
+	grep "fatal: transaction is closed" err
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: transaction is closed
+ok 178 - transaction exits on multiple aborts
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 36 - GIT_DIR=../.git, core.bare = false: --git-dir
+expecting success of 1400.179 'transaction exits on start after prepare': 
+	cat >stdin <<-EOF &&
+	prepare
+	start
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err >actual &&
+	printf "%s: ok\n" prepare >expect &&
+	test_cmp expect actual &&
+	grep "fatal: prepared transactions can only be closed" err
 
-expecting success of 1500.37 'GIT_DIR=../.git, core.bare = false: --absolute-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: prepared transactions can only be closed
+ok 179 - transaction exits on start after prepare
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.180 'transaction handles empty abort with missing prepare': 
+	cat >stdin <<-EOF &&
+	start
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start abort >expect &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 37 - GIT_DIR=../.git, core.bare = false: --absolute-git-dir
+ok 180 - transaction handles empty abort with missing prepare
 
-expecting success of 1500.38 'GIT_DIR=../.git, core.bare = true: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.181 'transaction handles sole abort': 
+	cat >stdin <<-EOF &&
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" abort >expect &&
+	test_cmp expect actual
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+ok 181 - transaction handles sole abort
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 38 - GIT_DIR=../.git, core.bare = true: --is-bare-repository
+expecting success of 1400.182 'transaction can handle commit': 
+	cat >stdin <<-EOF &&
+	start
+	create $a HEAD
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit >expect &&
+	test_cmp expect actual &&
+	git rev-parse HEAD >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
 
-expecting success of 1500.39 'GIT_DIR=../.git, core.bare = true: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 182 - transaction can handle commit
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.183 'transaction can handle abort': 
+	cat >stdin <<-EOF &&
+	start
+	create $b HEAD
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start abort >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify -q $b
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 39 - GIT_DIR=../.git, core.bare = true: --is-inside-git-dir
+ok 183 - transaction can handle abort
 
-expecting success of 1500.40 'GIT_DIR=../.git, core.bare = true: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.184 'transaction aborts by default': 
+	cat >stdin <<-EOF &&
+	start
+	create $b HEAD
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify -q $b
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+ok 184 - transaction aborts by default
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 40 - GIT_DIR=../.git, core.bare = true: --is-inside-work-tree
+expecting success of 1400.185 'transaction with prepare aborts by default': 
+	cat >stdin <<-EOF &&
+	start
+	create $b HEAD
+	prepare
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start prepare >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify -q $b
 
-expecting success of 1500.41 'GIT_DIR=../.git, core.bare = true: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 185 - transaction with prepare aborts by default
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.186 'transaction can commit multiple times': 
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/branch-1 $A
+	commit
+	start
+	create refs/heads/branch-2 $B
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit start commit >expect &&
+	test_cmp expect actual &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/branch-1 >actual &&
+	test_cmp expect actual &&
+	echo "$B" >expect &&
+	git rev-parse refs/heads/branch-2 >actual &&
+	test_cmp expect actual
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 41 - GIT_DIR=../.git, core.bare = true: --show-prefix
+ok 186 - transaction can commit multiple times
 
-expecting success of 1500.42 'GIT_DIR=../.git, core.bare undefined: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.187 'transaction can create and delete': 
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/create-and-delete $A
+	commit
+	start
+	delete refs/heads/create-and-delete $A
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit start commit >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify refs/heads/create-and-delete
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+fatal: 'refs/heads/create-and-delete' - not a valid ref
+ok 187 - transaction can create and delete
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 42 - GIT_DIR=../.git, core.bare undefined: --is-bare-repository
+expecting success of 1400.188 'transaction can commit after abort': 
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/abort $A
+	abort
+	start
+	create refs/heads/abort $A
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start abort start commit >expect &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/abort >actual &&
+	test_cmp expect actual
 
-expecting success of 1500.43 'GIT_DIR=../.git, core.bare undefined: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+ok 188 - transaction can commit after abort
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.189 'transaction cannot restart ongoing transaction': 
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/restart $A
+	start
+	commit
+	EOF
+	test_must_fail git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify refs/heads/restart
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 43 - GIT_DIR=../.git, core.bare undefined: --is-inside-git-dir
+fatal: cannot restart ongoing transaction
+fatal: 'refs/heads/restart' - not a valid ref
+ok 189 - transaction cannot restart ongoing transaction
 
-expecting success of 1500.44 'GIT_DIR=../.git, core.bare undefined: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+checking prerequisite: PIPE
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 44 - GIT_DIR=../.git, core.bare undefined: --is-inside-work-tree
+)
+prerequisite PIPE ok
+expecting success of 1400.190 'transaction flushes status updates': 
+	mkfifo in out &&
+	(git update-ref --stdin <in >out &) &&
 
-expecting success of 1500.45 'GIT_DIR=../.git, core.bare undefined: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+	exec 9>in &&
+	exec 8<out &&
+	test_when_finished "exec 9>&-" &&
+	test_when_finished "exec 8<&-" &&
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+	echo "start" >&9 &&
+	echo "start: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual &&
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 45 - GIT_DIR=../.git, core.bare undefined: --show-prefix
+	echo "create refs/heads/flush $A" >&9 &&
 
-expecting success of 1500.46 'GIT_DIR=../repo.git, core.bare = false: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+	echo prepare >&9 &&
+	echo "prepare: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual &&
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+	# This must now fail given that we have locked the ref.
+	test_must_fail git update-ref refs/heads/flush $B 2>stderr &&
+	grep "fatal: update_ref failed for ref ${SQ}refs/heads/flush${SQ}: cannot lock ref" stderr &&
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 46 - GIT_DIR=../repo.git, core.bare = false: --is-bare-repository
+	echo commit >&9 &&
+	echo "commit: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual
 
-expecting success of 1500.47 'GIT_DIR=../repo.git, core.bare = false: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+fatal: update_ref failed for ref 'refs/heads/flush': cannot lock ref 'refs/heads/flush': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref/.git/refs/heads/flush.lock': File exists.
+ok 190 - transaction flushes status updates
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.191 'stdin  symref-verify fails without --no-deref': 
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: symref-verify: cannot operate with deref mode" err
+	
+fatal: symref-verify: cannot operate with deref mode
+ok 191 - stdin  symref-verify fails without --no-deref
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 47 - GIT_DIR=../repo.git, core.bare = false: --is-inside-git-dir
+expecting success of 1400.192 'stdin  symref-verify fails with too many arguments': 
+		format_command $type "symref-verify refs/heads/symref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err  &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-verify refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: symref-verify refs/heads/symref: extra input:  refs/heads/a
+ok 192 - stdin  symref-verify fails with too many arguments
 
-expecting success of 1500.48 'GIT_DIR=../repo.git, core.bare = false: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.193 'stdin  symref-verify succeeds for correct value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
+		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
+		test_cmp before after
+	
+ok 193 - stdin  symref-verify succeeds for correct value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.194 'stdin  symref-verify fails with no value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		format_command $type "symref-verify refs/heads/symref" "" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin
+	
+fatal: cannot lock ref 'refs/heads/symref': reference already exists
+ok 194 - stdin  symref-verify fails with no value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 48 - GIT_DIR=../repo.git, core.bare = false: --is-inside-work-tree
+expecting success of 1400.195 'stdin  symref-verify succeeds for dangling reference': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref2" &&
+		test_must_fail git symbolic-ref refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
+		format_command $type "symref-verify refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin
+	
+fatal: ref refs/heads/nonexistent is not a symbolic ref
+ok 195 - stdin  symref-verify succeeds for dangling reference
 
-expecting success of 1500.49 'GIT_DIR=../repo.git, core.bare = false: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.196 'stdin  symref-verify fails for missing reference': 
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
+		format_command $type "symref-verify refs/heads/missing" "refs/heads/unknown" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/missing${SQ}: unable to resolve reference ${SQ}refs/heads/missing${SQ}" err &&
+		test_must_fail git rev-parse --verify -q refs/heads/missing &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
+		test_cmp before after
+	
+fatal: cannot lock ref 'refs/heads/missing': unable to resolve reference 'refs/heads/missing'
+ok 196 - stdin  symref-verify fails for missing reference
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.197 'stdin  symref-verify fails for wrong value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		format_command $type "symref-verify refs/heads/symref" "$b" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
+ok 197 - stdin  symref-verify fails for wrong value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 49 - GIT_DIR=../repo.git, core.bare = false: --show-prefix
+expecting success of 1400.198 'stdin  symref-verify fails for mistaken null value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		format_command $type "symref-verify refs/heads/symref" "$Z" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected 0000000000000000000000000000000000000000
+ok 198 - stdin  symref-verify fails for mistaken null value
 
-expecting success of 1500.50 'GIT_DIR=../repo.git, core.bare = false: --git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.199 'stdin  symref-delete fails without --no-deref': 
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: symref-delete: cannot operate with deref mode" err
+	
+fatal: symref-delete: cannot operate with deref mode
+ok 199 - stdin  symref-delete fails without --no-deref
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.200 'stdin  symref-delete fails with no ref': 
+		format_command $type "symref-delete " >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: symref-delete: missing <ref>" err
+	
+fatal: symref-delete: missing <ref>
+ok 200 - stdin  symref-delete fails with no ref
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 50 - GIT_DIR=../repo.git, core.bare = false: --git-dir
+expecting success of 1400.201 'stdin  symref-delete fails deleting regular ref': 
+		test_when_finished "git update-ref -d refs/heads/regularref" &&
+		git update-ref refs/heads/regularref $a &&
+		format_command $type "symref-delete refs/heads/regularref" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: expected symref with target ${SQ}$a${SQ}: but is a regular ref" err
+	
+fatal: cannot lock ref 'refs/heads/regularref': expected symref with target 'refs/heads/a': but is a regular ref
+ok 201 - stdin  symref-delete fails deleting regular ref
 
-expecting success of 1500.51 'GIT_DIR=../repo.git, core.bare = false: --absolute-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.202 'stdin  symref-delete fails with too many arguments': 
+		format_command $type "symref-delete refs/heads/symref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-delete refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: symref-delete refs/heads/symref: extra input:  refs/heads/a
+ok 202 - stdin  symref-delete fails with too many arguments
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.203 'stdin  symref-delete fails with wrong old value': 
+		format_command $type "symref-delete refs/heads/symref" "$m" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected refs/heads/main" err &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/main
+ok 203 - stdin  symref-delete fails with wrong old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 51 - GIT_DIR=../repo.git, core.bare = false: --absolute-git-dir
+expecting success of 1400.204 'stdin  symref-delete works with right old value': 
+		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		test_must_fail git rev-parse --verify -q refs/heads/symref
+	
+ok 204 - stdin  symref-delete works with right old value
 
-expecting success of 1500.52 'GIT_DIR=../repo.git, core.bare = true: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.205 'stdin  symref-delete works with empty old value': 
+		git symbolic-ref refs/heads/symref $a >stdin &&
+		format_command $type "symref-delete refs/heads/symref" "" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		test_must_fail git rev-parse --verify -q $b
+	
+ok 205 - stdin  symref-delete works with empty old value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.206 'stdin  symref-delete succeeds for dangling reference': 
+		test_must_fail git symbolic-ref refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
+		format_command $type "symref-delete refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		test_must_fail git symbolic-ref -d refs/heads/symref2
+	
+fatal: ref refs/heads/nonexistent is not a symbolic ref
+fatal: Cannot delete refs/heads/symref2, not a symbolic ref
+ok 206 - stdin  symref-delete succeeds for dangling reference
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 52 - GIT_DIR=../repo.git, core.bare = true: --is-bare-repository
+expecting success of 1400.207 'stdin  symref-delete deletes regular ref without target': 
+		git update-ref refs/heads/regularref $a &&
+		format_command $type "symref-delete refs/heads/regularref" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin
+	
+ok 207 - stdin  symref-delete deletes regular ref without target
 
-expecting success of 1500.53 'GIT_DIR=../repo.git, core.bare = true: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.208 'stdin  symref-create fails with too many arguments': 
+		format_command $type "symref-create refs/heads/symref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-create refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: symref-create refs/heads/symref: extra input:  refs/heads/a
+ok 208 - stdin  symref-create fails with too many arguments
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.209 'stdin  symref-create fails with no target': 
+		format_command $type "symref-create refs/heads/symref" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin
+	
+fatal: symref-create refs/heads/symref: missing <new-target>
+ok 209 - stdin  symref-create fails with no target
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 53 - GIT_DIR=../repo.git, core.bare = true: --is-inside-git-dir
+expecting success of 1400.210 'stdin  symref-create fails with empty target': 
+		format_command $type "symref-create refs/heads/symref" "" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin
+	
+fatal: symref-create refs/heads/symref: missing <new-target>
+ok 210 - stdin  symref-create fails with empty target
 
-expecting success of 1500.54 'GIT_DIR=../repo.git, core.bare = true: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.211 'stdin  symref-create works': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual
+	
+ok 211 - stdin  symref-create works
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.212 'stdin  symref-create works with --no-deref': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "$a" &&
+		git update-ref --stdin $type <stdin 2>err
+	
+symref-create refs/heads/symref refs/heads/a
+ok 212 - stdin  symref-create works with --no-deref
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 54 - GIT_DIR=../repo.git, core.bare = true: --is-inside-work-tree
+expecting success of 1400.213 'stdin  create dangling symref ref works': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "refs/heads/unknown" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo refs/heads/unknown >actual &&
+		test_cmp expect actual
+	
+ok 213 - stdin  create dangling symref ref works
 
-expecting success of 1500.55 'GIT_DIR=../repo.git, core.bare = true: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.214 'stdin  symref-create does not create reflogs by default': 
+		test_when_finished "git symbolic-ref -d refs/symref" &&
+		format_command $type "symref-create refs/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual &&
+		test_must_fail git reflog exists refs/symref
+	
+ok 214 - stdin  symref-create does not create reflogs by default
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.215 'stdin  symref-create reflogs with --create-reflog': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
+		git update-ref --create-reflog --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual &&
+		git reflog exists refs/heads/symref
+	
+ok 215 - stdin  symref-create reflogs with --create-reflog
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 55 - GIT_DIR=../repo.git, core.bare = true: --show-prefix
+expecting success of 1400.216 'stdin  symref-update fails with too many arguments': 
+		format_command $type "symref-update refs/heads/symref" "$a" "ref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-update refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: symref-update refs/heads/symref: extra input:  refs/heads/a
+ok 216 - stdin  symref-update fails with too many arguments
 
-expecting success of 1500.56 'GIT_DIR=../repo.git, core.bare undefined: --is-bare-repository': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.217 'stdin  symref-update fails with wrong old value argument': 
+		format_command $type "symref-update refs/heads/symref" "$a" "foo" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: symref-update refs/heads/symref: invalid arg ${SQ}foo${SQ} for old value" err
+	
+fatal: symref-update refs/heads/symref: invalid arg 'foo' for old value
+ok 217 - stdin  symref-update fails with wrong old value argument
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.218 'stdin  symref-update creates with zero old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 218 - stdin  symref-update creates with zero old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 56 - GIT_DIR=../repo.git, core.bare undefined: --is-bare-repository
+expecting success of 1400.219 'stdin  symref-update creates with no old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 219 - stdin  symref-update creates with no old value
 
-expecting success of 1500.57 'GIT_DIR=../repo.git, core.bare undefined: --is-inside-git-dir': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.220 'stdin  symref-update creates dangling': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo refs/heads/nonexistent >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+ok 220 - stdin  symref-update creates dangling
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.221 'stdin  symref-update fails with wrong old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$b" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected $b" err &&
+		test_must_fail git rev-parse --verify -q $c
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
+ok 221 - stdin  symref-update fails with wrong old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 57 - GIT_DIR=../repo.git, core.bare undefined: --is-inside-git-dir
+expecting success of 1400.222 'stdin  symref-update updates dangling ref': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+ok 222 - stdin  symref-update updates dangling ref
 
-expecting success of 1500.58 'GIT_DIR=../repo.git, core.bare undefined: --is-inside-work-tree': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.223 'stdin  symref-update updates dangling ref with old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+ok 223 - stdin  symref-update updates dangling ref with old value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.224 'stdin  symref-update fails update dangling ref with wrong old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/wrongref" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		echo refs/heads/nonexistent >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/nonexistent but expected refs/heads/wrongref
+ok 224 - stdin  symref-update fails update dangling ref with wrong old value
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 58 - GIT_DIR=../repo.git, core.bare undefined: --is-inside-work-tree
+expecting success of 1400.225 'stdin  symref-update works with right old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $m >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 225 - stdin  symref-update works with right old value
 
-expecting success of 1500.59 'GIT_DIR=../repo.git, core.bare undefined: --show-prefix': 
-			if test -n "$gitdir"
-			then
-				test_when_finished "unset GIT_DIR" &&
-				GIT_DIR="$gitdir" &&
-				export GIT_DIR
-			fi &&
+expecting success of 1400.226 'stdin  symref-update works with no old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $m >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 226 - stdin  symref-update works with no old value
 
-			case "$bare" in
-			t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
-			f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
-			u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
-			esac &&
+expecting success of 1400.227 'stdin  symref-update fails with empty old ref-target': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" "ref" "" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: symref-update refs/heads/symref: expected old value
+ok 227 - stdin  symref-update fails with empty old ref-target
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 59 - GIT_DIR=../repo.git, core.bare undefined: --show-prefix
+expecting success of 1400.228 'stdin  symref-update creates (with deref)': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/symref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
+		grep "$Z $(git rev-parse $a)" actual
+	
+0000000000000000000000000000000000000000 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 228 - stdin  symref-update creates (with deref)
 
-expecting success of 1500.60 'rev-parse --path-format=absolute': 
-	test_one "." "$ROOT/.git" --path-format=absolute --git-dir &&
-	test_one "." "$ROOT/.git" --path-format=absolute --git-common-dir &&
-	test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-dir &&
-	test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-common-dir &&
-	test_one "worktree" "$ROOT/.git/worktrees/worktree" --path-format=absolute --git-dir &&
-	test_one "worktree" "$ROOT/.git" --path-format=absolute --git-common-dir &&
-	test_one "." "$ROOT" --path-format=absolute --show-toplevel &&
-	test_one "." "$ROOT/.git/objects" --path-format=absolute --git-path objects &&
-	test_one "." "$ROOT/.git/objects/foo/bar/baz" --path-format=absolute --git-path objects/foo/bar/baz
+expecting success of 1400.229 'stdin  symref-update regular ref to symref with correct old-oid': 
+		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse $a)" >stdin &&
+		git update-ref --stdin $type <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
+		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
+	
+58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 229 - stdin  symref-update regular ref to symref with correct old-oid
 
-ok 60 - rev-parse --path-format=absolute
+expecting success of 1400.230 'stdin  symref-update regular ref to symref fails with wrong old-oid': 
+		test_when_finished "git update-ref -d refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse refs/heads/target2)" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: is at $(git rev-parse $a) but expected $(git rev-parse refs/heads/target2)" err &&
+		echo $(git rev-parse $a) >expect &&
+		git rev-parse refs/heads/regularref >actual &&
+		test_cmp expect actual
+	
+fatal: cannot lock ref 'refs/heads/regularref': is at 58a052250c09f010b95ad9bfe32f35d704eda1a0 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 230 - stdin  symref-update regular ref to symref fails with wrong old-oid
 
-expecting success of 1500.61 'rev-parse --path-format=relative': 
-	test_one "." ".git" --path-format=relative --git-dir &&
-	test_one "." ".git" --path-format=relative --git-common-dir &&
-	test_one "sub/dir" "../../.git" --path-format=relative --git-dir &&
-	test_one "sub/dir" "../../.git" --path-format=relative --git-common-dir &&
-	test_one "worktree" "../.git/worktrees/worktree" --path-format=relative --git-dir &&
-	test_one "worktree" "../.git" --path-format=relative --git-common-dir &&
-	test_one "." "./" --path-format=relative --show-toplevel &&
-	test_one "." ".git/objects" --path-format=relative --git-path objects &&
-	test_one "." ".git/objects/foo/bar/baz" --path-format=relative --git-path objects/foo/bar/baz
+expecting success of 1400.231 'stdin  symref-update regular ref to symref fails with invalid old-oid': 
+		test_when_finished "git update-ref -d refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "not-a-ref-oid" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid" err &&
+		echo $(git rev-parse $a) >expect &&
+		git rev-parse refs/heads/regularref >actual &&
+		test_cmp expect actual
+	
+fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid
+ok 231 - stdin  symref-update regular ref to symref fails with invalid old-oid
 
-ok 61 - rev-parse --path-format=relative
+expecting success of 1400.232 'stdin  symref-update existing symref with zero old-oid': 
+		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref refs/heads/target2 &&
+		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/symref${SQ}: reference already exists" err &&
+		echo refs/heads/target2 >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: cannot lock ref 'refs/heads/symref': reference already exists
+ok 232 - stdin  symref-update existing symref with zero old-oid
 
-expecting success of 1500.62 '--path-format=relative does not affect --absolute-git-dir': 
-	git rev-parse --path-format=relative --absolute-git-dir >actual &&
-	echo "$ROOT/.git" >expect &&
-	test_cmp expect actual
+expecting success of 1400.233 'stdin  symref-update regular ref to symref (with deref)': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_when_finished "git update-ref -d --no-deref refs/heads/symref2" &&
+		git update-ref refs/heads/symref2 $a &&
+		git symbolic-ref --no-recurse refs/heads/symref refs/heads/symref2 &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref $type --stdin <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/symref2 >actual &&
+		test_cmp expect actual &&
+		echo refs/heads/symref2 >expect &&
+		git symbolic-ref --no-recurse refs/heads/symref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
+		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
+	
+58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 233 - stdin  symref-update regular ref to symref (with deref)
 
-ok 62 - --path-format=relative does not affect --absolute-git-dir
+expecting success of 1400.234 'stdin  symref-update regular ref to symref': 
+		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" >stdin &&
+		git update-ref $type --stdin <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
+		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
+	
+58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 234 - stdin  symref-update regular ref to symref
 
-expecting success of 1500.63 '--path-format can change in the middle of the command line': 
-	git rev-parse --path-format=absolute --git-dir --path-format=relative --git-path objects/foo/bar >actual &&
-	cat >expect <<-EOF &&
-	$ROOT/.git
-	.git/objects/foo/bar
-	EOF
-	test_cmp expect actual
+expecting success of 1400.235 'stdin -z symref-verify fails without --no-deref': 
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: symref-verify: cannot operate with deref mode" err
+	
+fatal: symref-verify: cannot operate with deref mode
+ok 235 - stdin -z symref-verify fails without --no-deref
 
-ok 63 - --path-format can change in the middle of the command line
+expecting success of 1400.236 'stdin -z symref-verify fails with too many arguments': 
+		format_command $type "symref-verify refs/heads/symref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err  &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-verify refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: unknown command: refs/heads/a
+ok 236 - stdin -z symref-verify fails with too many arguments
 
-expecting success of 1500.64 '--path-format does not segfault without an argument': 
-	test_must_fail git rev-parse --path-format
+expecting success of 1400.237 'stdin -z symref-verify succeeds for correct value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
+		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
+		test_cmp before after
+	
+ok 237 - stdin -z symref-verify succeeds for correct value
 
-fatal: --path-format requires an argument
-ok 64 - --path-format does not segfault without an argument
+expecting success of 1400.238 'stdin -z symref-verify fails with no value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		format_command $type "symref-verify refs/heads/symref" "" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin
+	
+fatal: cannot lock ref 'refs/heads/symref': reference already exists
+ok 238 - stdin -z symref-verify fails with no value
 
-expecting success of 1500.65 'git-common-dir from worktree root': 
-	echo .git >expect &&
-	git rev-parse --git-common-dir >actual &&
-	test_cmp expect actual
+expecting success of 1400.239 'stdin -z symref-verify succeeds for dangling reference': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref2" &&
+		test_must_fail git symbolic-ref refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
+		format_command $type "symref-verify refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin
+	
+fatal: ref refs/heads/nonexistent is not a symbolic ref
+ok 239 - stdin -z symref-verify succeeds for dangling reference
 
-ok 65 - git-common-dir from worktree root
+expecting success of 1400.240 'stdin -z symref-verify fails for missing reference': 
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
+		format_command $type "symref-verify refs/heads/missing" "refs/heads/unknown" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/missing${SQ}: unable to resolve reference ${SQ}refs/heads/missing${SQ}" err &&
+		test_must_fail git rev-parse --verify -q refs/heads/missing &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
+		test_cmp before after
+	
+fatal: cannot lock ref 'refs/heads/missing': unable to resolve reference 'refs/heads/missing'
+ok 240 - stdin -z symref-verify fails for missing reference
 
-expecting success of 1500.66 'git-common-dir inside sub-dir': 
-	mkdir -p path/to/child &&
-	test_when_finished "rm -rf path" &&
-	echo "$(git -C path/to/child rev-parse --show-cdup).git" >expect &&
-	git -C path/to/child rev-parse --git-common-dir >actual &&
-	test_cmp expect actual
+expecting success of 1400.241 'stdin -z symref-verify fails for wrong value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		format_command $type "symref-verify refs/heads/symref" "$b" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
+ok 241 - stdin -z symref-verify fails for wrong value
 
-ok 66 - git-common-dir inside sub-dir
+expecting success of 1400.242 'stdin -z symref-verify fails for mistaken null value': 
+		git symbolic-ref refs/heads/symref >expect &&
+		format_command $type "symref-verify refs/heads/symref" "$Z" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected 0000000000000000000000000000000000000000
+ok 242 - stdin -z symref-verify fails for mistaken null value
 
-expecting success of 1500.67 'git-path from worktree root': 
-	echo .git/objects >expect &&
-	git rev-parse --git-path objects >actual &&
-	test_cmp expect actual
+expecting success of 1400.243 'stdin -z symref-delete fails without --no-deref': 
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: symref-delete: cannot operate with deref mode" err
+	
+fatal: symref-delete: cannot operate with deref mode
+ok 243 - stdin -z symref-delete fails without --no-deref
 
-ok 67 - git-path from worktree root
+expecting success of 1400.244 'stdin -z symref-delete fails with no ref': 
+		format_command $type "symref-delete " >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: symref-delete: missing <ref>" err
+	
+fatal: symref-delete: missing <ref>
+ok 244 - stdin -z symref-delete fails with no ref
 
-expecting success of 1500.68 'git-path inside sub-dir': 
-	mkdir -p path/to/child &&
-	test_when_finished "rm -rf path" &&
-	echo "$(git -C path/to/child rev-parse --show-cdup).git/objects" >expect &&
-	git -C path/to/child rev-parse --git-path objects >actual &&
-	test_cmp expect actual
+expecting success of 1400.245 'stdin -z symref-delete fails deleting regular ref': 
+		test_when_finished "git update-ref -d refs/heads/regularref" &&
+		git update-ref refs/heads/regularref $a &&
+		format_command $type "symref-delete refs/heads/regularref" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: expected symref with target ${SQ}$a${SQ}: but is a regular ref" err
+	
+fatal: cannot lock ref 'refs/heads/regularref': expected symref with target 'refs/heads/a': but is a regular ref
+ok 245 - stdin -z symref-delete fails deleting regular ref
 
-ok 68 - git-path inside sub-dir
+expecting success of 1400.246 'stdin -z symref-delete fails with too many arguments': 
+		format_command $type "symref-delete refs/heads/symref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-delete refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: unknown command: refs/heads/a
+ok 246 - stdin -z symref-delete fails with too many arguments
 
-expecting success of 1500.69 'rev-parse --is-shallow-repository in shallow repo': 
-	test_commit test_commit &&
-	echo true >expect &&
-	git clone --depth 1 --no-local . shallow &&
-	test_when_finished "rm -rf shallow" &&
-	git -C shallow rev-parse --is-shallow-repository >actual &&
-	test_cmp expect actual
+expecting success of 1400.247 'stdin -z symref-delete fails with wrong old value': 
+		format_command $type "symref-delete refs/heads/symref" "$m" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected refs/heads/main" err &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/main
+ok 247 - stdin -z symref-delete fails with wrong old value
 
-[main b250333] test_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test_commit.t
-Cloning into 'shallow'...
-ok 69 - rev-parse --is-shallow-repository in shallow repo
+expecting success of 1400.248 'stdin -z symref-delete works with right old value': 
+		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		test_must_fail git rev-parse --verify -q refs/heads/symref
+	
+ok 248 - stdin -z symref-delete works with right old value
 
-expecting success of 1500.70 'rev-parse --is-shallow-repository in non-shallow repo': 
-	echo false >expect &&
-	git rev-parse --is-shallow-repository >actual &&
-	test_cmp expect actual
+expecting success of 1400.249 'stdin -z symref-delete works with empty old value': 
+		git symbolic-ref refs/heads/symref $a >stdin &&
+		format_command $type "symref-delete refs/heads/symref" "" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		test_must_fail git rev-parse --verify -q $b
+	
+ok 249 - stdin -z symref-delete works with empty old value
 
-ok 70 - rev-parse --is-shallow-repository in non-shallow repo
+expecting success of 1400.250 'stdin -z symref-delete succeeds for dangling reference': 
+		test_must_fail git symbolic-ref refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
+		format_command $type "symref-delete refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		test_must_fail git symbolic-ref -d refs/heads/symref2
+	
+fatal: ref refs/heads/nonexistent is not a symbolic ref
+fatal: Cannot delete refs/heads/symref2, not a symbolic ref
+ok 250 - stdin -z symref-delete succeeds for dangling reference
 
-expecting success of 1500.71 'rev-parse --show-object-format in repo': 
-	test_oid algo >expect &&
-	git rev-parse --show-object-format >actual &&
-	test_cmp expect actual &&
-	git rev-parse --show-object-format=storage >actual &&
-	test_cmp expect actual &&
-	git rev-parse --show-object-format=input >actual &&
-	test_cmp expect actual &&
-	git rev-parse --show-object-format=output >actual &&
-	test_cmp expect actual &&
-	test_must_fail git rev-parse --show-object-format=squeamish-ossifrage 2>err &&
-	grep "unknown mode for --show-object-format: squeamish-ossifrage" err
+expecting success of 1400.251 'stdin -z symref-delete deletes regular ref without target': 
+		git update-ref refs/heads/regularref $a &&
+		format_command $type "symref-delete refs/heads/regularref" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin
+	
+ok 251 - stdin -z symref-delete deletes regular ref without target
 
-fatal: unknown mode for --show-object-format: squeamish-ossifrage
-ok 71 - rev-parse --show-object-format in repo
+expecting success of 1400.252 'stdin -z symref-create fails with too many arguments': 
+		format_command $type "symref-create refs/heads/symref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-create refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: unknown command: refs/heads/a
+ok 252 - stdin -z symref-create fails with too many arguments
 
-expecting success of 1500.72 'rev-parse --show-ref-format': 
-	test_detect_ref_format >expect &&
-	git rev-parse --show-ref-format >actual &&
-	test_cmp expect actual
+expecting success of 1400.253 'stdin -z symref-create fails with no target': 
+		format_command $type "symref-create refs/heads/symref" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin
+	
+fatal: symref-create refs/heads/symref: missing <new-target>
+ok 253 - stdin -z symref-create fails with no target
 
-ok 72 - rev-parse --show-ref-format
+expecting success of 1400.254 'stdin -z symref-create fails with empty target': 
+		format_command $type "symref-create refs/heads/symref" "" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin
+	
+fatal: symref-create refs/heads/symref: missing <new-target>
+ok 254 - stdin -z symref-create fails with empty target
 
-expecting success of 1500.73 'rev-parse --show-ref-format with invalid storage': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		git config extensions.refstorage broken &&
-		test_must_fail git rev-parse --show-ref-format 2>err &&
-		grep "error: invalid value for ${SQ}extensions.refstorage${SQ}: ${SQ}broken${SQ}" err
-	)
+expecting success of 1400.255 'stdin -z symref-create works': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual
+	
+ok 255 - stdin -z symref-create works
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/repo/.git/
-error: invalid value for 'extensions.refstorage': 'broken'
-ok 73 - rev-parse --show-ref-format with invalid storage
+expecting success of 1400.256 'stdin -z symref-create works with --no-deref': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "$a" &&
+		git update-ref --stdin $type <stdin 2>err
+	
+symref-create refs/heads/symrefrefs/heads/aok 256 - stdin -z symref-create works with --no-deref
 
-expecting success of 1500.74 '--show-toplevel from subdir of working tree': 
-	pwd >expect &&
-	git -C sub/dir rev-parse --show-toplevel >actual &&
-	test_cmp expect actual
+expecting success of 1400.257 'stdin -z create dangling symref ref works': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "refs/heads/unknown" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo refs/heads/unknown >actual &&
+		test_cmp expect actual
+	
+ok 257 - stdin -z create dangling symref ref works
 
-ok 74 - --show-toplevel from subdir of working tree
+expecting success of 1400.258 'stdin -z symref-create does not create reflogs by default': 
+		test_when_finished "git symbolic-ref -d refs/symref" &&
+		format_command $type "symref-create refs/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual &&
+		test_must_fail git reflog exists refs/symref
+	
+ok 258 - stdin -z symref-create does not create reflogs by default
 
-expecting success of 1500.75 '--show-toplevel from inside .git': 
-	test_must_fail git -C .git rev-parse --show-toplevel
+expecting success of 1400.259 'stdin -z symref-create reflogs with --create-reflog': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
+		git update-ref --create-reflog --stdin $type --no-deref <stdin &&
+		git symbolic-ref refs/heads/symref >expect &&
+		echo $a >actual &&
+		test_cmp expect actual &&
+		git reflog exists refs/heads/symref
+	
+ok 259 - stdin -z symref-create reflogs with --create-reflog
 
-fatal: this operation must be run in a work tree
-ok 75 - --show-toplevel from inside .git
+expecting success of 1400.260 'stdin -z symref-update fails with too many arguments': 
+		format_command $type "symref-update refs/heads/symref" "$a" "ref" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		if test "$type" = "-z"
+		then
+			grep "fatal: unknown command: $a" err
+		else
+			grep "fatal: symref-update refs/heads/symref: extra input:  $a" err
+		fi
+	
+fatal: unknown command: refs/heads/a
+ok 260 - stdin -z symref-update fails with too many arguments
 
-expecting success of 1500.76 'showing the superproject correctly': 
-	git rev-parse --show-superproject-working-tree >out &&
-	test_must_be_empty out &&
+expecting success of 1400.261 'stdin -z symref-update fails with wrong old value argument': 
+		format_command $type "symref-update refs/heads/symref" "$a" "foo" "$a" "$a" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: symref-update refs/heads/symref: invalid arg ${SQ}foo${SQ} for old value" err
+	
+fatal: symref-update refs/heads/symref: invalid arg 'foo' for old value
+ok 261 - stdin -z symref-update fails with wrong old value argument
 
-	test_create_repo super &&
-	test_commit -C super test_commit &&
-	test_create_repo sub &&
-	test_commit -C sub test_commit &&
-	git -c protocol.file.allow=always \
-		-C super submodule add ../sub dir/sub &&
-	echo $(pwd)/super >expect  &&
-	git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
-	test_cmp expect out &&
+expecting success of 1400.262 'stdin -z symref-update creates with zero old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 262 - stdin -z symref-update creates with zero old value
 
-	test_commit -C super submodule_add &&
-	git -C super checkout -b branch1 &&
-	git -C super/dir/sub checkout -b branch1 &&
-	test_commit -C super/dir/sub branch1_commit &&
-	git -C super add dir/sub &&
-	test_commit -C super branch1_commit &&
-	git -C super checkout -b branch2 main &&
-	git -C super/dir/sub checkout -b branch2 main &&
-	test_commit -C super/dir/sub branch2_commit &&
-	git -C super add dir/sub &&
-	test_commit -C super branch2_commit &&
-	test_must_fail git -C super merge branch1 &&
+expecting success of 1400.263 'stdin -z symref-update creates with no old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 263 - stdin -z symref-update creates with no old value
 
-	git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
-	test_cmp expect out
+expecting success of 1400.264 'stdin -z symref-update creates dangling': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo refs/heads/nonexistent >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+ok 264 - stdin -z symref-update creates dangling
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/super/.git/
-[main (root-commit) 6703cdc] test_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test_commit.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/sub/.git/
-[main (root-commit) 5c184ab] test_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test_commit.t
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/super/dir/sub'...
-done.
-[main b28d39e] submodule_add
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 dir/sub
- create mode 100644 submodule_add.t
-Switched to a new branch 'branch1'
-Switched to a new branch 'branch1'
-[branch1 7018b5f] branch1_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch1_commit.t
-[branch1 e08f379] branch1_commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 branch1_commit.t
-Switched to a new branch 'branch2'
-M	dir/sub
-Switched to a new branch 'branch2'
-[branch2 6aad707] branch2_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch2_commit.t
-[branch2 32c6339] branch2_commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 branch2_commit.t
-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 (dir/sub), and either merge commit 7018b5f
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add dir/sub
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule dir/sub
-CONFLICT (submodule): Merge conflict in dir/sub
-Automatic merge failed; fix conflicts and then commit the result.
-ok 76 - showing the superproject correctly
+expecting success of 1400.265 'stdin -z symref-update fails with wrong old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$b" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
+		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected $b" err &&
+		test_must_fail git rev-parse --verify -q $c
+	
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
+ok 265 - stdin -z symref-update fails with wrong old value
 
-expecting success of 1500.77 'rev-parse --since= unsqueezed ordering': 
-	x1=--since=1970-01-01T00:00:01Z &&
-	x2=--since=1970-01-01T00:00:02Z &&
-	x3=--since=1970-01-01T00:00:03Z &&
-	git rev-parse $x1 $x1 $x3 $x2 >actual &&
-	cat >expect <<-EOF &&
-	--max-age=1
-	--max-age=1
-	--max-age=3
-	--max-age=2
-	EOF
-	test_cmp expect actual
+expecting success of 1400.266 'stdin -z symref-update updates dangling ref': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+ok 266 - stdin -z symref-update updates dangling ref
 
-ok 77 - rev-parse --since= unsqueezed ordering
+expecting success of 1400.267 'stdin -z symref-update updates dangling ref with old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/nonexistent" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+ok 267 - stdin -z symref-update updates dangling ref with old value
 
-expecting success of 1500.78 'rev-parse --bisect includes bad, excludes good': 
-	test_commit_bulk 6 &&
+expecting success of 1400.268 'stdin -z symref-update fails update dangling ref with wrong old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_must_fail git rev-parse refs/heads/nonexistent &&
+		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
+		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/wrongref" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		echo refs/heads/nonexistent >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/nonexistent
+fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/nonexistent but expected refs/heads/wrongref
+ok 268 - stdin -z symref-update fails update dangling ref with wrong old value
 
-	git update-ref refs/bisect/bad-1 HEAD~1 &&
-	git update-ref refs/bisect/b HEAD~2 &&
-	git update-ref refs/bisect/bad-3 HEAD~3 &&
-	git update-ref refs/bisect/good-3 HEAD~3 &&
-	git update-ref refs/bisect/bad-4 HEAD~4 &&
-	git update-ref refs/bisect/go HEAD~4 &&
+expecting success of 1400.269 'stdin -z symref-update works with right old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$a" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $m >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 269 - stdin -z symref-update works with right old value
 
-	# Note: refs/bisect/b and refs/bisect/go should be ignored because they
-	# do not match the refs/bisect/bad or refs/bisect/good prefixes.
-	cat >expect <<-EOF &&
-	refs/bisect/bad-1
-	refs/bisect/bad-3
-	refs/bisect/bad-4
-	^refs/bisect/good-3
-	EOF
+expecting success of 1400.270 'stdin -z symref-update works with no old value': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" >stdin &&
+		git update-ref --stdin $type --no-deref <stdin &&
+		echo $m >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+ok 270 - stdin -z symref-update works with no old value
 
-	git rev-parse --symbolic-full-name --bisect >actual &&
-	test_cmp expect actual
+expecting success of 1400.271 'stdin -z symref-update fails with empty old ref-target': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref $a &&
+		format_command $type "symref-update refs/heads/symref" "$m" "ref" "" >stdin &&
+		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
+		echo $a >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
+		test_cmp expect actual
+	
+fatal: symref-update refs/heads/symref: expected old value
+ok 271 - stdin -z symref-update fails with empty old ref-target
 
-b2503331aaf518185a33f93c7d7df3f7b1f05f21
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           18 (         0 duplicates                  )
-      blobs  :            6 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            6 (         0 duplicates          5 deltas of          5 attempts)
-      commits:            6 (         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:              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            =          7
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       1420 /       1420
----------------------------------------------------------------------
+expecting success of 1400.272 'stdin -z symref-update creates (with deref)': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref --stdin $type <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/symref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
+		grep "$Z $(git rev-parse $a)" actual
+	
+0000000000000000000000000000000000000000 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 272 - stdin -z symref-update creates (with deref)
 
-ok 78 - rev-parse --bisect includes bad, excludes good
+expecting success of 1400.273 'stdin -z symref-update regular ref to symref with correct old-oid': 
+		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse $a)" >stdin &&
+		git update-ref --stdin $type <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
+		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
+	
+58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 273 - stdin -z symref-update regular ref to symref with correct old-oid
 
-expecting success of 1500.79 '--short= truncates to the actual hash length': 
-	git rev-parse HEAD >expect &&
-	git rev-parse --short=100 HEAD >actual &&
-	test_cmp expect actual
+expecting success of 1400.274 'stdin -z symref-update regular ref to symref fails with wrong old-oid': 
+		test_when_finished "git update-ref -d refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse refs/heads/target2)" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: is at $(git rev-parse $a) but expected $(git rev-parse refs/heads/target2)" err &&
+		echo $(git rev-parse $a) >expect &&
+		git rev-parse refs/heads/regularref >actual &&
+		test_cmp expect actual
+	
+fatal: cannot lock ref 'refs/heads/regularref': is at 58a052250c09f010b95ad9bfe32f35d704eda1a0 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 274 - stdin -z symref-update regular ref to symref fails with wrong old-oid
 
-ok 79 - --short= truncates to the actual hash length
+expecting success of 1400.275 'stdin -z symref-update regular ref to symref fails with invalid old-oid': 
+		test_when_finished "git update-ref -d refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "not-a-ref-oid" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid" err &&
+		echo $(git rev-parse $a) >expect &&
+		git rev-parse refs/heads/regularref >actual &&
+		test_cmp expect actual
+	
+fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid
+ok 275 - stdin -z symref-update regular ref to symref fails with invalid old-oid
 
-expecting success of 1500.80 ':/ and HEAD^{/} favor more recent matching commits': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit common-old &&
-		test_commit --no-tag common-new &&
-		git rev-parse HEAD >expect &&
-		git rev-parse :/common >actual &&
-		test_cmp expect actual &&
-		git rev-parse HEAD^{/common} >actual &&
+expecting success of 1400.276 'stdin -z symref-update existing symref with zero old-oid': 
+		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/symref" &&
+		git symbolic-ref refs/heads/symref refs/heads/target2 &&
+		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
+		test_must_fail git update-ref --stdin $type <stdin 2>err &&
+		grep "fatal: cannot lock ref ${SQ}refs/heads/symref${SQ}: reference already exists" err &&
+		echo refs/heads/target2 >expect &&
+		git symbolic-ref refs/heads/symref >actual &&
 		test_cmp expect actual
-	)
+	
+fatal: cannot lock ref 'refs/heads/symref': reference already exists
+ok 276 - stdin -z symref-update existing symref with zero old-oid
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1500-rev-parse/repo/.git/
-[main (root-commit) 276aa89] common-old
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 common-old.t
-[main 96cff80] common-new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 common-new.t
-ok 80 - :/ and HEAD^{/} favor more recent matching commits
+expecting success of 1400.277 'stdin -z symref-update regular ref to symref (with deref)': 
+		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
+		test_when_finished "git update-ref -d --no-deref refs/heads/symref2" &&
+		git update-ref refs/heads/symref2 $a &&
+		git symbolic-ref --no-recurse refs/heads/symref refs/heads/symref2 &&
+		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
+		git update-ref $type --stdin <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/symref2 >actual &&
+		test_cmp expect actual &&
+		echo refs/heads/symref2 >expect &&
+		git symbolic-ref --no-recurse refs/heads/symref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
+		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
+	
+58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 277 - stdin -z symref-update regular ref to symref (with deref)
 
-# passed all 80 test(s)
-1..80
+expecting success of 1400.278 'stdin -z symref-update regular ref to symref': 
+		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
+		git update-ref --no-deref refs/heads/regularref $a &&
+		format_command $type "symref-update refs/heads/regularref" "$a" >stdin &&
+		git update-ref $type --stdin <stdin &&
+		echo $a >expect &&
+		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
+		test_cmp expect actual &&
+		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
+		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
+	
+58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
+ok 278 - stdin -z symref-update regular ref to symref
+
+# passed all 278 test(s)
+1..278
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1460-refs-migrate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/.git/
-expecting success of 1460.1 'setup': 
-	rm -rf .git
+*** t1512-rev-parse-disambiguation.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1512-rev-parse-disambiguation/.git/
+expecting success of 1512.1 'ambiguous blob output': 
+	git init --bare blob.prefix &&
+	(
+		cd blob.prefix &&
 
-ok 1 - setup
+		# 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 &&
 
-expecting success of 1460.2 'superfluous arguments': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail git -C repo refs migrate foo 2>err &&
-	cat >expect <<-EOF &&
-	usage: too many arguments
+		# 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
-	test_cmp expect err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 2 - superfluous arguments
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1460.3 'missing ref storage format': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail git -C repo refs migrate 2>err &&
-	cat >expect <<-EOF &&
-	usage: missing --ref-format=<format>
-	EOF
-	test_cmp expect err
+expecting success of 1512.2 'ambiguous loose bad object parsed as OBJ_BAD': 
+	git init --bare blob.bad &&
+	(
+		cd blob.bad &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 3 - missing ref storage format
+		# 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
+	) &&
 
-expecting success of 1460.4 'unknown ref storage format': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail git -C repo refs migrate \
-		--ref-format=unknown 2>err &&
-	cat >expect <<-EOF &&
-	error: unknown ref storage format ${SQ}unknown${SQ}
+	test_cmp_failed_rev_parse blob.bad bad0 <<-\EOF
+	error: short object ID bad0... is ambiguous
+	fatal: invalid object type
 	EOF
-	test_cmp expect err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 4 - unknown ref storage format
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1512-rev-parse-disambiguation/blob.bad/
+bad0bd4672dee1b4d3b8088534ed5a0362bc8d59
+bad0853730d9d114ac789f0ce89039d224bf66c9
+ok 2 - ambiguous loose bad object parsed as OBJ_BAD
 
-expecting success of 1460.5 'files: migration to same format fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$from_format 2>err &&
-			cat >expect <<-EOF &&
-			error: repository already uses ${SQ}$from_format${SQ} format
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 5 - files: migration to same format fails
+expecting success of 1512.3 'ambigous zlib corrupt loose blob': 
+	git init --bare blob.corrupt &&
+	(
+		cd blob.corrupt &&
 
-expecting success of 1460.6 'files -> reftable: migration with worktree fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			git -C repo worktree add wt &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$to_format 2>err &&
-			cat >expect <<-EOF &&
-			error: migrating repositories with worktrees is not supported yet
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-No possible source branch, inferring '--orphan'
-Preparing worktree (new branch 'wt')
-ok 6 - files -> reftable: migration with worktree fails
+		# Both have the prefix "cafe"
+		echo bnkxmdwz | git hash-object -w --stdin &&
+		oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
 
-expecting success of 1460.7 'files -> reftable: unborn HEAD': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 7 - files -> reftable: unborn HEAD
+		oidf=objects/$(test_oid_to_path "$oid") &&
+		chmod 755 $oidf &&
+		echo broken >$oidf
+	) &&
 
-expecting success of 1460.8 'files -> reftable: single ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 8 - files -> reftable: single ref
+	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
 
-expecting success of 1460.9 'files -> reftable: bare repository': 
-			test_when_finished "rm -rf repo repo.git" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git clone --ref-format=$from_format --mirror repo repo.git &&
-			test_migration repo.git "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into bare repository 'repo.git'...
-done.
-ok 9 - files -> reftable: bare repository
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1512-rev-parse-disambiguation/blob.corrupt/
+cafe3f2e27174acdf9aa3a394d73714cdcf533d9
+cafe
+ok 3 - ambigous zlib corrupt loose blob
 
-expecting success of 1460.10 'files -> reftable: dangling symref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
-			test_migration repo "$to_format" &&
-			echo refs/heads/nonexistent >expect &&
-			git -C repo symbolic-ref BROKEN_HEAD >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) d39e3de] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 10 - files -> reftable: dangling symref
+checking prerequisite: SHA1
 
-expecting success of 1460.11 'files -> reftable: broken ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
-				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
-			test_migration repo "$to_format" true &&
-			test_oid 001 >expect &&
-			git -C repo rev-parse refs/heads/broken >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 1935181] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 11 - files -> reftable: broken ref
+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 1460.12 'files -> reftable: pseudo-refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo update-ref FOO_HEAD HEAD &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 23fa7ba] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 12 - files -> reftable: pseudo-refs
+)
+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 &&
 
-expecting success of 1460.13 'files -> reftable: special refs are left alone': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
-			git -C repo rev-parse MERGE_HEAD &&
-			test_migration repo "$to_format" &&
-			test_path_is_file repo/.git/MERGE_HEAD
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 31243c6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-31243c69d8d79236a6f50781bf4138e2507bab91
-ok 13 - files -> reftable: special refs are left alone
+	# create one blob 0000000000b36
+	git add a0blgqsjc &&
 
-expecting success of 1460.14 'files -> reftable: a bunch of refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
+	# create one tree 0000000000cdc
+	git write-tree
 
-			test_commit -C repo initial &&
-			cat >input <<-EOF &&
-			create FOO_HEAD HEAD
-			create refs/heads/branch-1 HEAD
-			create refs/heads/branch-2 HEAD
-			create refs/heads/branch-3 HEAD
-			create refs/heads/branch-4 HEAD
-			create refs/tags/tag-1 HEAD
-			create refs/tags/tag-2 HEAD
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 167ffd6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 14 - files -> reftable: a bunch of refs
+0000000000cdcf04beb2fab69e65622616294984
+ok 4 - blob and tree
 
-expecting success of 1460.15 'files -> reftable: dry-run migration does not modify repository': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo refs migrate --dry-run \
-				--ref-format=$to_format >output &&
-			grep "Finished dry-run migration of refs" output &&
-			test_path_is_dir repo/.git/ref_migration.* &&
-			echo $from_format >expect &&
-			git -C repo rev-parse --show-ref-format >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) f844f1e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Finished dry-run migration of refs, the result can be found at '.git/ref_migration.BsYw83'
-ok 15 - files -> reftable: dry-run migration does not modify repository
+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
 
-expecting success of 1460.16 'files -> reftable: reflogs of symrefs with target deleted': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo branch branch-1 HEAD &&
-			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
-			cat >input <<-EOF &&
-			delete refs/heads/branch-1
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) b13909b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 16 - files -> reftable: reflogs of symrefs with target deleted
+error: short object ID 000000000 is ambiguous
+ok 5 - warn ambiguity when no candidate matches type hint
 
-expecting success of 1460.17 'files -> reftable: reflogs order is retained': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
-			test_commit --date "100003000 +0700" --no-tag -C repo second &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) b2ea3e6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main a1e4c45] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 17 - files -> reftable: reflogs order is retained
+expecting success of 1512.6 'disambiguate tree-ish': 
+	# feed tree-ish in an unambiguous way
+	git rev-parse --verify 0000000000cdc:a0blgqsjc &&
 
-expecting success of 1460.18 'reftable: migration to same format fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$from_format 2>err &&
-			cat >expect <<-EOF &&
-			error: repository already uses ${SQ}$from_format${SQ} format
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 18 - reftable: migration to same format fails
+	# 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
 
-expecting success of 1460.19 'reftable -> files: migration with worktree fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			git -C repo worktree add wt &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$to_format 2>err &&
-			cat >expect <<-EOF &&
-			error: migrating repositories with worktrees is not supported yet
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-No possible source branch, inferring '--orphan'
-Preparing worktree (new branch 'wt')
-ok 19 - reftable -> files: migration with worktree fails
+0000000000b36b6aa7ea4b75318ed078f55505c3
+0000000000b36b6aa7ea4b75318ed078f55505c3
+ok 6 - disambiguate tree-ish
 
-expecting success of 1460.20 'reftable -> files: unborn HEAD': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 20 - reftable -> files: unborn HEAD
+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
 
-expecting success of 1460.21 'reftable -> files: single ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 2aabd22] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 21 - reftable -> files: single ref
+ok 7 - disambiguate blob
 
-expecting success of 1460.22 'reftable -> files: bare repository': 
-			test_when_finished "rm -rf repo repo.git" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git clone --ref-format=$from_format --mirror repo repo.git &&
-			test_migration repo.git "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 3805046] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into bare repository 'repo.git'...
-done.
-ok 22 - reftable -> files: bare repository
+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)
 
-expecting success of 1460.23 'reftable -> files: dangling symref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
-			test_migration repo "$to_format" &&
-			echo refs/heads/nonexistent >expect &&
-			git -C repo symbolic-ref BROKEN_HEAD >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 971e222] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 23 - reftable -> files: dangling symref
+ok 8 - disambiguate tree
 
-expecting success of 1460.24 'reftable -> files: broken ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
-				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
-			test_migration repo "$to_format" true &&
-			test_oid 001 >expect &&
-			git -C repo rev-parse refs/heads/broken >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) cf21f93] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 24 - reftable -> files: broken ref
+expecting success of 1512.9 'first commit': 
+	# create one commit 0000000000e4f
+	git commit -m a2onsxbvj
 
-expecting success of 1460.25 'reftable -> files: pseudo-refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo update-ref FOO_HEAD HEAD &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) f175d86] initial
+[main (root-commit) 0000000000e] a2onsxbvj
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 25 - reftable -> files: pseudo-refs
+ 1 file changed, 12 insertions(+)
+ create mode 100644 a0blgqsjc
+ok 9 - first commit
 
-expecting success of 1460.26 'reftable -> files: special refs are left alone': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
-			git -C repo rev-parse MERGE_HEAD &&
-			test_migration repo "$to_format" &&
-			test_path_is_file repo/.git/MERGE_HEAD
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 1aef781] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-1aef78129fc22a570756b7eeccd0be80318e18c3
-ok 26 - reftable -> files: special refs are left alone
+expecting success of 1512.10 'disambiguate commit-ish': 
+	# feed commit-ish in an unambiguous way
+	git rev-parse --verify 0000000000e4f^{commit} &&
 
-expecting success of 1460.27 'reftable -> files: a bunch of refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
+	# 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} &&
 
-			test_commit -C repo initial &&
-			cat >input <<-EOF &&
-			create FOO_HEAD HEAD
-			create refs/heads/branch-1 HEAD
-			create refs/heads/branch-2 HEAD
-			create refs/heads/branch-3 HEAD
-			create refs/heads/branch-4 HEAD
-			create refs/tags/tag-1 HEAD
-			create refs/tags/tag-2 HEAD
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 8858db3] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 27 - reftable -> files: a bunch of refs
+	# likewise
+	git rev-parse --verify 000000000^0
 
-expecting success of 1460.28 'reftable -> files: dry-run migration does not modify repository': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo refs migrate --dry-run \
-				--ref-format=$to_format >output &&
-			grep "Finished dry-run migration of refs" output &&
-			test_path_is_dir repo/.git/ref_migration.* &&
-			echo $from_format >expect &&
-			git -C repo rev-parse --show-ref-format >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 68d032e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Finished dry-run migration of refs, the result can be found at '.git/ref_migration.DghQhG'
-ok 28 - reftable -> files: dry-run migration does not modify repository
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 10 - disambiguate commit-ish
 
-expecting success of 1460.29 'reftable -> files: reflogs of symrefs with target deleted': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo branch branch-1 HEAD &&
-			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
-			cat >input <<-EOF &&
-			delete refs/heads/branch-1
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 8cd44c7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 29 - reftable -> files: reflogs of symrefs with target deleted
+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)
 
-expecting success of 1460.30 'reftable -> files: reflogs order is retained': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
-			test_commit --date "100003000 +0700" --no-tag -C repo second &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) b2ea3e6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main a1e4c45] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 30 - reftable -> files: reflogs order is retained
+ok 11 - disambiguate commit
 
-expecting success of 1460.31 'migrating from files format deletes backend files': 
-	test_when_finished "rm -rf repo" &&
-	git init --ref-format=files repo &&
-	test_commit -C repo first &&
-	git -C repo pack-refs --all &&
-	test_commit -C repo second &&
-	git -C repo update-ref ORIG_HEAD HEAD &&
-	git -C repo rev-parse HEAD >repo/.git/FETCH_HEAD &&
+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...
 
-	test_path_is_file repo/.git/HEAD &&
-	test_path_is_file repo/.git/ORIG_HEAD &&
-	test_path_is_file repo/.git/refs/heads/main &&
-	test_path_is_file repo/.git/packed-refs &&
+ok 12 - log name1..name2 takes only commit-ishes on both ends
 
-	test_migration repo reftable &&
+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..
 
-	echo "ref: refs/heads/.invalid" >expect &&
-	test_cmp expect repo/.git/HEAD &&
-	echo "this repository uses the reftable format" >expect &&
-	test_cmp expect repo/.git/refs/heads &&
-	test_path_is_file repo/.git/FETCH_HEAD &&
-	test_path_is_missing repo/.git/ORIG_HEAD &&
-	test_path_is_missing repo/.git/refs/heads/main &&
-	test_path_is_missing repo/.git/logs &&
-	test_path_is_missing repo/.git/packed-refs
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 13 - rev-parse name1..name2 takes only commit-ishes on both ends
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 9897709] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[main 2c28476] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 31 - migrating from files format deletes backend files
+expecting success of 1512.14 'git log takes only commit-ish': 
+	# Likewise.
+	git log 000000000
 
-expecting success of 1460.32 'migrating from reftable format deletes backend files': 
-	test_when_finished "rm -rf repo" &&
-	git init --ref-format=reftable repo &&
-	test_commit -C repo first &&
+commit 0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-	test_path_is_dir repo/.git/reftable &&
-	test_migration repo files &&
+    a2onsxbvj
+ok 14 - git log takes only commit-ish
 
-	test_path_is_missing repo/.git/reftable &&
-	echo "ref: refs/heads/main" >expect &&
-	test_cmp expect repo/.git/HEAD &&
-	test_path_is_file repo/.git/packed-refs
+expecting success of 1512.15 'git reset takes only commit-ish': 
+	# Likewise.
+	git reset 000000000
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) fdc6a6a] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-ok 32 - migrating from reftable format deletes backend files
+ok 15 - git reset takes only commit-ish
 
-# passed all 32 test(s)
-1..32
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1506-rev-parse-diagnosis.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1506-rev-parse-diagnosis/.git/
-expecting success of 1506.1 'set up basic repo': 
-	echo one > file.txt &&
-	mkdir subdir &&
-	echo two > subdir/file.txt &&
-	echo three > subdir/file2.txt &&
-	git add . &&
-	git commit -m init &&
-	echo four > index-only.txt &&
-	git add index-only.txt &&
-	echo five > disk-only.txt
+expecting success of 1512.16 'first tag': 
+	# create one tag 0000000000f8f
+	git tag -a -m j7cp83um v1.0.0
 
-[main (root-commit) 724c7fc] init
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 file.txt
- create mode 100644 subdir/file.txt
- create mode 100644 subdir/file2.txt
-ok 1 - set up basic repo
+ok 16 - first tag
 
-expecting success of 1506.2 'correct file objects': 
-	HASH_file=$(git rev-parse HEAD:file.txt) &&
-	git rev-parse HEAD:subdir/file.txt &&
-	git rev-parse :index-only.txt &&
-	(cd subdir &&
-	 git rev-parse HEAD:subdir/file2.txt &&
-	 test $HASH_file = $(git rev-parse HEAD:file.txt) &&
-	 test $HASH_file = $(git rev-parse :file.txt) &&
-	 test $HASH_file = $(git rev-parse :0:file.txt) )
+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} &&
 
-f719efd430d52bcfc8566a43b2eb655688d38871
-8510665149157c2bc901848c3e0b746954e9cbd9
-2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
-ok 2 - correct file objects
+	# likewise
+	git log 0000000000..0000000000 &&
+	git log ..0000000000 &&
+	git log 0000000000.. &&
+	git log 0000000000...0000000000 &&
+	git log ...0000000000 &&
+	git log 0000000000...
 
-expecting success of 1506.3 'correct relative file objects (0)': 
-	git rev-parse :file.txt >expected &&
-	git rev-parse :./file.txt >result &&
-	test_cmp expected result &&
-	git rev-parse :0:./file.txt >result &&
-	test_cmp expected result
+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
 
-ok 3 - correct relative file objects (0)
+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}
 
-expecting success of 1506.4 'correct relative file objects (1)': 
-	git rev-parse HEAD:file.txt >expected &&
-	git rev-parse HEAD:./file.txt >result &&
-	test_cmp expected result
+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
 
-ok 4 - correct relative file objects (1)
+expecting success of 1512.19 'parse describe name': 
+	# feed an unambiguous describe name
+	git rev-parse --verify v1.0.0-0-g0000000000e4f &&
 
-expecting success of 1506.5 'correct relative file objects (2)': 
-	(
-		cd subdir &&
-		git rev-parse HEAD:../file.txt >result &&
-		test_cmp ../expected result
-	)
+	# 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
 
-ok 5 - correct relative file objects (2)
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 19 - parse describe name
 
-expecting success of 1506.6 'correct relative file objects (3)': 
-	(
-		cd subdir &&
-		git rev-parse HEAD:../subdir/../file.txt >result &&
-		test_cmp ../expected result
-	)
+expecting success of 1512.20 'more history': 
+	# commit 0000000000043
+	git mv a0blgqsjc d12cr3h8t &&
+	echo h62xsjeu >>d12cr3h8t &&
+	git add d12cr3h8t &&
 
-ok 6 - correct relative file objects (3)
+	test_tick &&
+	git commit -m czy8f73t &&
 
-expecting success of 1506.7 'correct relative file objects (4)': 
-	git rev-parse HEAD:subdir/file.txt >expected &&
-	(
-		cd subdir &&
-		git rev-parse HEAD:./file.txt >result &&
-		test_cmp ../expected result
-	)
+	# commit 00000000008ec
+	git mv d12cr3h8t j000jmpzn &&
+	echo j08bekfvt >>j000jmpzn &&
+	git add j000jmpzn &&
 
-ok 7 - correct relative file objects (4)
+	test_tick &&
+	git commit -m ioiley5o &&
 
-expecting success of 1506.8 'correct relative file objects (5)': 
-	git rev-parse :subdir/file.txt >expected &&
-	(
-		cd subdir &&
-		git rev-parse :./file.txt >result &&
-		test_cmp ../expected result &&
-		git rev-parse :0:./file.txt >result &&
-		test_cmp ../expected result
-	)
+	# commit 0000000005b0
+	git checkout v1.0.0^0 &&
+	git mv a0blgqsjc f5518nwu &&
 
-ok 8 - correct relative file objects (5)
-
-expecting success of 1506.9 'correct relative file objects (6)': 
-	git rev-parse :file.txt >expected &&
-	(
-		cd subdir &&
-		git rev-parse :../file.txt >result &&
-		test_cmp ../expected result &&
-		git rev-parse :0:../file.txt >result &&
-		test_cmp ../expected result
-	)
-
-ok 9 - correct relative file objects (6)
-
-expecting success of 1506.10 'incorrect revision id': 
-	test_must_fail git rev-parse foobar:file.txt 2>error &&
-	test_grep "invalid object name .foobar." error &&
-	test_must_fail git rev-parse foobar 2>error &&
-	test_grep "unknown revision or path not in the working tree." error
-
-foobar:file.txt
-fatal: invalid object name 'foobar'.
-foobar
-fatal: ambiguous argument 'foobar': unknown revision or path not in the working tree.
-ok 10 - incorrect revision id
-
-expecting success of 1506.11 'incorrect file in sha1:path': 
-	test_must_fail git rev-parse HEAD:nothing.txt 2>error &&
-	test_grep "path .nothing.txt. does not exist in .HEAD." error &&
-	test_must_fail git rev-parse HEAD:index-only.txt 2>error &&
-	test_grep "path .index-only.txt. exists on disk, but not in .HEAD." error &&
-	(cd subdir &&
-	 test_must_fail git rev-parse HEAD:file2.txt 2>error &&
-	 test_did_you_mean HEAD subdir/ file2.txt exists )
-
-HEAD:nothing.txt
-fatal: path 'nothing.txt' does not exist in 'HEAD'
-HEAD:index-only.txt
-fatal: path 'index-only.txt' exists on disk, but not in 'HEAD'
-HEAD:file2.txt
-ok 11 - incorrect file in sha1:path
-
-expecting success of 1506.12 'incorrect file in :path and :N:path': 
-	test_must_fail git rev-parse :nothing.txt 2>error &&
-	test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
-	test_must_fail git rev-parse :1:nothing.txt 2>error &&
-	test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
-	test_must_fail git rev-parse :1:file.txt 2>error &&
-	test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
-	(cd subdir &&
-	 test_must_fail git rev-parse :1:file.txt 2>error &&
-	 test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
-	 test_must_fail git rev-parse :file2.txt 2>error &&
-	 test_did_you_mean ":0" subdir/ file2.txt "is in the index" &&
-	 test_must_fail git rev-parse :2:file2.txt 2>error &&
-	 test_did_you_mean :0 subdir/ file2.txt "is in the index") &&
-	test_must_fail git rev-parse :disk-only.txt 2>error &&
-	test_grep "path .disk-only.txt. exists on disk, but not in the index" error
-
-:nothing.txt
-fatal: path 'nothing.txt' does not exist (neither on disk nor in the index)
-:1:nothing.txt
-fatal: path 'nothing.txt' does not exist (neither on disk nor in the index)
-:1:file.txt
-:1:file.txt
-:file2.txt
-:2:file2.txt
-:disk-only.txt
-fatal: path 'disk-only.txt' exists on disk, but not in the index
-ok 12 - incorrect file in :path and :N:path
-
-expecting success of 1506.13 'invalid @{n} reference': 
-	test_must_fail git rev-parse main@{99999} >output 2>error &&
-	test_must_be_empty output &&
-	test_grep "log for [^ ]* only has [0-9][0-9]* entries" error  &&
-	test_must_fail git rev-parse --verify main@{99999} >output 2>error &&
-	test_must_be_empty output &&
-	test_grep "log for [^ ]* only has [0-9][0-9]* entries" error
-
-fatal: log for 'main' only has 1 entries
-fatal: log for 'main' only has 1 entries
-ok 13 - invalid @{n} reference
-
-expecting success of 1506.14 'relative path not found': 
-	(
-		cd subdir &&
-		test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
-		test_grep subdir/nonexistent.txt error
-	)
-
-HEAD:./nonexistent.txt
-fatal: path 'subdir/nonexistent.txt' does not exist in 'HEAD'
-ok 14 - relative path not found
-
-expecting success of 1506.15 'relative path outside worktree': 
-	test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
-	test_must_be_empty output &&
-	test_grep "outside repository" error
-
-fatal: '../file.txt' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1506-rev-parse-diagnosis'
-ok 15 - relative path outside worktree
-
-expecting success of 1506.16 'relative path when cwd is outside worktree': 
-	test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
-	test_must_be_empty output &&
-	test_grep "relative path syntax can.t be used outside working tree" error
-
-fatal: relative path syntax can't be used outside working tree
-ok 16 - relative path when cwd is outside worktree
-
-expecting success of 1506.17 '<commit>:file correctly diagnosed after a pathname': 
-	test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error &&
-	test_grep ! "exists on disk" error &&
-	test_grep "no such path in the working tree" error &&
-	cat >expect <<-\EOF &&
-	file.txt
-	HEAD:file.txt
-	EOF
-	test_cmp expect actual
-
-fatal: HEAD:file.txt: no such path in the working tree.
-ok 17 - <commit>:file correctly diagnosed after a pathname
-
-expecting success of 1506.18 'dotdot is not an empty set': 
-	( H=$(git rev-parse HEAD) && echo $H && echo ^$H ) >expect &&
-
-	git rev-parse HEAD.. >actual &&
-	test_cmp expect actual &&
-
-	git rev-parse ..HEAD >actual &&
-	test_cmp expect actual &&
-
-	echo .. >expect &&
-	git rev-parse .. >actual &&
-	test_cmp expect actual
-
-ok 18 - dotdot is not an empty set
-
-expecting success of 1506.19 'dotdot does not peel endpoints': 
-	git tag -a -m "annotate" annotated HEAD &&
-	A=$(git rev-parse annotated) &&
-	H=$(git rev-parse annotated^0) &&
-	{
-		echo $A && echo ^$A
-	} >expect-with-two-dots &&
-	{
-		echo $A && echo $A && echo ^$H
-	} >expect-with-merge-base &&
-
-	git rev-parse annotated..annotated >actual-with-two-dots &&
-	test_cmp expect-with-two-dots actual-with-two-dots &&
-
-	git rev-parse annotated...annotated >actual-with-merge-base &&
-	test_cmp expect-with-merge-base actual-with-merge-base
-
-ok 19 - dotdot does not peel endpoints
-
-expecting success of 1506.20 'arg before dashdash must be a revision (missing)': 
-	test_must_fail git rev-parse foobar -- 2>stderr &&
-	test_grep "bad revision" stderr
-
-fatal: bad revision 'foobar'
-ok 20 - arg before dashdash must be a revision (missing)
-
-expecting success of 1506.21 'arg before dashdash must be a revision (file)': 
-	>foobar &&
-	test_must_fail git rev-parse foobar -- 2>stderr &&
-	test_grep "bad revision" stderr
-
-fatal: bad revision 'foobar'
-ok 21 - arg before dashdash must be a revision (file)
-
-expecting success of 1506.22 'arg before dashdash must be a revision (ambiguous)': 
-	>foobar &&
-	git update-ref refs/heads/foobar HEAD &&
-	{
-		# we do not want to use rev-parse here, because
-		# we are testing it
-		git show-ref -s refs/heads/foobar &&
-		printf "%s\n" --
-	} >expect &&
-	git rev-parse foobar -- >actual &&
-	test_cmp expect actual
-
-ok 22 - arg before dashdash must be a revision (ambiguous)
-
-expecting success of 1506.23 'reject Nth parent if N is too high': 
-	test_must_fail git rev-parse HEAD^100000000000000000000000000000000
-
-fatal: ambiguous argument 'HEAD^100000000000000000000000000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-HEAD^100000000000000000000000000000000
-ok 23 - reject Nth parent if N is too high
-
-expecting success of 1506.24 'reject Nth ancestor if N is too high': 
-	test_must_fail git rev-parse HEAD~100000000000000000000000000000000
-
-fatal: ambiguous argument 'HEAD~100000000000000000000000000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-HEAD~100000000000000000000000000000000
-ok 24 - reject Nth ancestor if N is too high
-
-expecting success of 1506.25 'pathspecs with wildcards are not ambiguous': 
-	echo "*.c" >expect &&
-	git rev-parse "*.c" >actual &&
-	test_cmp expect actual
-
-ok 25 - pathspecs with wildcards are not ambiguous
-
-expecting success of 1506.26 'backslash does not trigger wildcard rule': 
-	test_must_fail git rev-parse "foo\\bar"
-
-fatal: ambiguous argument 'foo\bar': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-foo\bar
-ok 26 - backslash does not trigger wildcard rule
-
-expecting success of 1506.27 'escaped char does not trigger wildcard rule': 
-	test_must_fail git rev-parse "foo\\*bar"
-
-fatal: ambiguous argument 'foo\*bar': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-foo\*bar
-ok 27 - escaped char does not trigger wildcard rule
-
-expecting success of 1506.28 'arg after dashdash not interpreted as option': 
-	cat >expect <<-\EOF &&
-	--
-	--local-env-vars
-	EOF
-	git rev-parse -- --local-env-vars >actual &&
-	test_cmp expect actual
-
-ok 28 - arg after dashdash not interpreted as option
-
-expecting success of 1506.29 'arg after end-of-options not interpreted as option': 
-	test_must_fail git rev-parse --end-of-options --not-real -- 2>err &&
-	test_grep bad.revision.*--not-real err
-
---end-of-options
-fatal: bad revision '--not-real'
-ok 29 - arg after end-of-options not interpreted as option
-
-expecting success of 1506.30 'end-of-options still allows --': 
-	cat >expect <<-EOF &&
-	--end-of-options
-	$(git rev-parse --verify HEAD)
-	--
-	path
-	EOF
-	git rev-parse --end-of-options HEAD -- path >actual &&
-	test_cmp expect actual
-
-ok 30 - end-of-options still allows --
-
-# passed all 30 test(s)
-1..30
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1508-at-combinations.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1508-at-combinations/.git/
-expecting success of 1508.1 'setup': 
-	test_commit main-one &&
-	test_commit main-two &&
-	git checkout -b upstream-branch &&
-	test_commit upstream-one &&
-	test_commit upstream-two &&
-	if test_have_prereq !MINGW
-	then
-		git checkout -b @/at-test
-	fi &&
-	git checkout -b @@/at-test &&
-	git checkout -b @at-test &&
-	git checkout -b old-branch &&
-	test_commit old-one &&
-	test_commit old-two &&
-	git checkout -b new-branch &&
-	test_commit new-one &&
-	test_commit new-two &&
-	git branch -u main old-branch &&
-	git branch -u upstream-branch new-branch
-
-[main (root-commit) 1b49f74] main-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main-one.t
-[main 6d5691d] main-two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main-two.t
-Switched to a new branch 'upstream-branch'
-[upstream-branch 6d93ee3] upstream-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream-one.t
-[upstream-branch 2bb3c5b] upstream-two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream-two.t
-Switched to a new branch '@/at-test'
-Switched to a new branch '@@/at-test'
-Switched to a new branch '@at-test'
-Switched to a new branch 'old-branch'
-[old-branch a935743] old-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 old-one.t
-[old-branch 2c577ae] old-two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 old-two.t
-Switched to a new branch 'new-branch'
-[new-branch d3599bb] new-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-one.t
-[new-branch 8a88a27] new-two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-two.t
-branch 'old-branch' set up to track 'main'.
-branch 'new-branch' set up to track 'upstream-branch'.
-ok 1 - setup
-
-expecting success of 1508.2 'HEAD = refs/heads/new-branch': 
-		echo 'refs/heads/new-branch' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s 'HEAD' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name 'HEAD' >actual
-		else
-			git cat-file -p 'HEAD' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 2 - HEAD = refs/heads/new-branch
-
-expecting success of 1508.3 '@{1} = new-one': 
-		echo 'new-one' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@{1}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{1}' >actual
-		else
-			git cat-file -p '@{1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 3 - @{1} = new-one
-
-expecting success of 1508.4 'HEAD@{1} = new-one': 
-		echo 'new-one' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s 'HEAD@{1}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name 'HEAD@{1}' >actual
-		else
-			git cat-file -p 'HEAD@{1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 4 - HEAD@{1} = new-one
-
-expecting success of 1508.5 '@{now} = new-two': 
-		echo 'new-two' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@{now}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{now}' >actual
-		else
-			git cat-file -p '@{now}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 5 - @{now} = new-two
-
-expecting success of 1508.6 'HEAD@{now} = new-two': 
-		echo 'new-two' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s 'HEAD@{now}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name 'HEAD@{now}' >actual
-		else
-			git cat-file -p 'HEAD@{now}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 6 - HEAD@{now} = new-two
-
-expecting success of 1508.7 '@{-1} = refs/heads/old-branch': 
-		echo 'refs/heads/old-branch' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s '@{-1}' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{-1}' >actual
-		else
-			git cat-file -p '@{-1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 7 - @{-1} = refs/heads/old-branch
-
-expecting success of 1508.8 '@{-1}@{0} = old-two': 
-		echo 'old-two' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@{-1}@{0}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{-1}@{0}' >actual
-		else
-			git cat-file -p '@{-1}@{0}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 8 - @{-1}@{0} = old-two
-
-expecting success of 1508.9 '@{-1}@{1} = old-one': 
-		echo 'old-one' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@{-1}@{1}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{-1}@{1}' >actual
-		else
-			git cat-file -p '@{-1}@{1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 9 - @{-1}@{1} = old-one
-
-expecting success of 1508.10 '@{u} = refs/heads/upstream-branch': 
-		echo 'refs/heads/upstream-branch' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s '@{u}' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{u}' >actual
-		else
-			git cat-file -p '@{u}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 10 - @{u} = refs/heads/upstream-branch
-
-expecting success of 1508.11 'HEAD@{u} = refs/heads/upstream-branch': 
-		echo 'refs/heads/upstream-branch' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s 'HEAD@{u}' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name 'HEAD@{u}' >actual
-		else
-			git cat-file -p 'HEAD@{u}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 11 - HEAD@{u} = refs/heads/upstream-branch
-
-expecting success of 1508.12 '@{u}@{1} = upstream-one': 
-		echo 'upstream-one' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@{u}@{1}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{u}@{1}' >actual
-		else
-			git cat-file -p '@{u}@{1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 12 - @{u}@{1} = upstream-one
-
-expecting success of 1508.13 '@{-1}@{u} = refs/heads/main': 
-		echo 'refs/heads/main' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s '@{-1}@{u}' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{-1}@{u}' >actual
-		else
-			git cat-file -p '@{-1}@{u}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 13 - @{-1}@{u} = refs/heads/main
-
-expecting success of 1508.14 '@{-1}@{u}@{1} = main-one': 
-		echo 'main-one' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@{-1}@{u}@{1}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{-1}@{u}@{1}' >actual
-		else
-			git cat-file -p '@{-1}@{u}@{1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 14 - @{-1}@{u}@{1} = main-one
-
-expecting success of 1508.15 '@ = new-two': 
-		echo 'new-two' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@' >actual
-		else
-			git cat-file -p '@' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 15 - @ = new-two
-
-expecting success of 1508.16 '@@{u} = refs/heads/upstream-branch': 
-		echo 'refs/heads/upstream-branch' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s '@@{u}' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@@{u}' >actual
-		else
-			git cat-file -p '@@{u}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 16 - @@{u} = refs/heads/upstream-branch
-
-expecting success of 1508.17 '@@/at-test = refs/heads/@@/at-test': 
-		echo 'refs/heads/@@/at-test' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s '@@/at-test' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@@/at-test' >actual
-		else
-			git cat-file -p '@@/at-test' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 17 - @@/at-test = refs/heads/@@/at-test
-
-expecting success of 1508.18 '@/at-test = refs/heads/@/at-test': 
-		echo 'refs/heads/@/at-test' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s '@/at-test' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@/at-test' >actual
-		else
-			git cat-file -p '@/at-test' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 18 - @/at-test = refs/heads/@/at-test
-
-expecting success of 1508.19 '@at-test = refs/heads/@at-test': 
-		echo 'refs/heads/@at-test' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s '@at-test' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@at-test' >actual
-		else
-			git cat-file -p '@at-test' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 19 - @at-test = refs/heads/@at-test
-
-expecting success of 1508.20 '@{u}@{-1} is nonsensical': 
-		test_must_fail git rev-parse --verify '@{u}@{-1}'
-	
-fatal: Needed a single revision
-ok 20 - @{u}@{-1} is nonsensical
-
-expecting success of 1508.21 '@{0}@{0} is nonsensical': 
-		test_must_fail git rev-parse --verify '@{0}@{0}'
-	
-fatal: Needed a single revision
-ok 21 - @{0}@{0} is nonsensical
-
-expecting success of 1508.22 '@{1}@{u} is nonsensical': 
-		test_must_fail git rev-parse --verify '@{1}@{u}'
-	
-fatal: no such branch: '@{1}'
-ok 22 - @{1}@{u} is nonsensical
-
-expecting success of 1508.23 'HEAD@{-1} is nonsensical': 
-		test_must_fail git rev-parse --verify 'HEAD@{-1}'
-	
-fatal: Needed a single revision
-ok 23 - HEAD@{-1} is nonsensical
-
-expecting success of 1508.24 '@{-1}@{-1} is nonsensical': 
-		test_must_fail git rev-parse --verify '@{-1}@{-1}'
-	
-fatal: Needed a single revision
-ok 24 - @{-1}@{-1} is nonsensical
-
-expecting success of 1508.25 'HEAD@{3} = old-two': 
-		echo 'old-two' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s 'HEAD@{3}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name 'HEAD@{3}' >actual
-		else
-			git cat-file -p 'HEAD@{3}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 25 - HEAD@{3} = old-two
-
-expecting success of 1508.26 '@{3} is nonsensical': 
-		test_must_fail git rev-parse --verify '@{3}'
-	
-fatal: log for 'new-branch' only has 3 entries
-ok 26 - @{3} is nonsensical
-
-expecting success of 1508.27 'switch to old-branch': 
-	git checkout old-branch
-
-Switched to branch 'old-branch'
-Your branch is ahead of 'main' by 4 commits.
-  (use "git push" to publish your local commits)
-ok 27 - switch to old-branch
-
-expecting success of 1508.28 'HEAD = refs/heads/old-branch': 
-		echo 'refs/heads/old-branch' >expect &&
-		if test 'ref' = 'commit'
-		then
-			git log -1 --format=%s 'HEAD' >actual
-		elif test 'ref' = 'ref'
-		then
-			git rev-parse --symbolic-full-name 'HEAD' >actual
-		else
-			git cat-file -p 'HEAD' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 28 - HEAD = refs/heads/old-branch
-
-expecting success of 1508.29 'HEAD@{1} = new-two': 
-		echo 'new-two' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s 'HEAD@{1}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name 'HEAD@{1}' >actual
-		else
-			git cat-file -p 'HEAD@{1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 29 - HEAD@{1} = new-two
-
-expecting success of 1508.30 '@{1} = old-one': 
-		echo 'old-one' >expect &&
-		if test 'commit' = 'commit'
-		then
-			git log -1 --format=%s '@{1}' >actual
-		elif test 'commit' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@{1}' >actual
-		else
-			git cat-file -p '@{1}' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 30 - @{1} = old-one
-
-expecting success of 1508.31 'create path with @': 
-	echo content >normal &&
-	echo content >fun@ny &&
-	git add normal fun@ny &&
-	git commit -m "funny path"
-
-[old-branch 7240585] funny path
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fun@ny
- create mode 100644 normal
-ok 31 - create path with @
-
-expecting success of 1508.32 '@:normal = content': 
-		echo 'content' >expect &&
-		if test 'blob' = 'commit'
-		then
-			git log -1 --format=%s '@:normal' >actual
-		elif test 'blob' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@:normal' >actual
-		else
-			git cat-file -p '@:normal' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 32 - @:normal = content
-
-expecting success of 1508.33 '@:fun@ny = content': 
-		echo 'content' >expect &&
-		if test 'blob' = 'commit'
-		then
-			git log -1 --format=%s '@:fun@ny' >actual
-		elif test 'blob' = 'ref'
-		then
-			git rev-parse --symbolic-full-name '@:fun@ny' >actual
-		else
-			git cat-file -p '@:fun@ny' >actual
-		fi &&
-		test_cmp expect actual
-	
-ok 33 - @:fun@ny = content
-
-expecting success of 1508.34 '@{1} works with only one reflog entry': 
-	git checkout -B newbranch main &&
-	git reflog expire --expire=now refs/heads/newbranch &&
-	git commit --allow-empty -m "first after expiration" &&
-	test_cmp_rev newbranch~ newbranch@{1}
-
-Switched to a new branch 'newbranch'
-[newbranch b4bdce6] first after expiration
- Author: A U Thor <author@example.com>
-ok 34 - @{1} works with only one reflog entry
-
-expecting success of 1508.35 '@{0} works with empty reflog': 
-	git checkout -B newbranch main &&
-	git reflog expire --expire=now refs/heads/newbranch &&
-	test_cmp_rev newbranch newbranch@{0}
-
-Reset branch 'newbranch'
-ok 35 - @{0} works with empty reflog
-
-# passed all 35 test(s)
-1..35
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1507-rev-parse-upstream.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1507-rev-parse-upstream/.git/
-expecting success of 1507.1 'setup': 
-
-	test_commit 1 &&
-	git checkout -b side &&
-	test_commit 2 &&
-	git checkout main &&
-	git clone . clone &&
-	test_commit 3 &&
-	(cd clone &&
-	 test_commit 4 &&
-	 git branch --track my-side origin/side &&
-	 git branch --track local-main main &&
-	 git branch --track fun@ny origin/side &&
-	 git branch --track @funny origin/side &&
-	 git branch --track funny@ origin/side &&
-	 git remote add -t main main-only .. &&
-	 git fetch main-only &&
-	 git branch bad-upstream &&
-	 git config branch.bad-upstream.remote main-only &&
-	 git config branch.bad-upstream.merge refs/heads/side
-	)
-
-[main (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to a new branch 'side'
-[side 82335b2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to branch 'main'
-Cloning into 'clone'...
-done.
-[main 8f489d0] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[main 6efda21] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-branch 'my-side' set up to track 'origin/side'.
-branch 'local-main' set up to track 'main'.
-branch 'fun@ny' set up to track 'origin/side'.
-branch '@funny' set up to track 'origin/side'.
-branch 'funny@' set up to track 'origin/side'.
-From ..
- * [new branch]      main       -> main-only/main
- * [new tag]         3          -> 3
-ok 1 - setup
-
-expecting success of 1507.2 '@{upstream} resolves to correct full name': 
-	echo refs/remotes/origin/main >expect &&
-	git -C clone rev-parse --symbolic-full-name @{upstream} >actual &&
-	test_cmp expect actual &&
-	git -C clone rev-parse --symbolic-full-name @{UPSTREAM} >actual &&
-	test_cmp expect actual &&
-	git -C clone rev-parse --symbolic-full-name @{UpSTReam} >actual &&
-	test_cmp expect actual
-
-ok 2 - @{upstream} resolves to correct full name
-
-expecting success of 1507.3 '@{u} resolves to correct full name': 
-	echo refs/remotes/origin/main >expect &&
-	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
-	test_cmp expect actual &&
-	git -C clone rev-parse --symbolic-full-name @{U} >actual &&
-	test_cmp expect actual
-
-ok 3 - @{u} resolves to correct full name
-
-expecting success of 1507.4 'my-side@{upstream} resolves to correct full name': 
-	echo refs/remotes/origin/side >expect &&
-	git -C clone rev-parse --symbolic-full-name my-side@{u} >actual &&
-	test_cmp expect actual
-
-ok 4 - my-side@{upstream} resolves to correct full name
-
-expecting success of 1507.5 'upstream of branch with @ in middle': 
-	git -C clone rev-parse --symbolic-full-name fun@ny@{u} >actual &&
-	echo refs/remotes/origin/side >expect &&
-	test_cmp expect actual &&
-	git -C clone rev-parse --symbolic-full-name fun@ny@{U} >actual &&
-	test_cmp expect actual
-
-ok 5 - upstream of branch with @ in middle
-
-expecting success of 1507.6 'upstream of branch with @ at start': 
-	git -C clone rev-parse --symbolic-full-name @funny@{u} >actual &&
-	echo refs/remotes/origin/side >expect &&
-	test_cmp expect actual
-
-ok 6 - upstream of branch with @ at start
-
-expecting success of 1507.7 'upstream of branch with @ at end': 
-	git -C clone rev-parse --symbolic-full-name funny@@{u} >actual &&
-	echo refs/remotes/origin/side >expect &&
-	test_cmp expect actual
-
-ok 7 - upstream of branch with @ at end
-
-expecting success of 1507.8 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}': 
-	test_must_fail git -C clone rev-parse --symbolic-full-name refs/heads/my-side@{upstream}
-
-fatal: no such branch: 'refs/heads/my-side'
-ok 8 - refs/heads/my-side@{upstream} does not resolve to my-side{upstream}
-
-expecting success of 1507.9 'my-side@{u} resolves to correct commit': 
-	git checkout side &&
-	test_commit 5 &&
-	(cd clone && git fetch) &&
-	echo 2 >expect &&
-	commit_subject my-side >actual &&
-	test_cmp expect actual &&
-	echo 5 >expect &&
-	commit_subject my-side@{u} >actual &&
-	test_cmp expect actual
-
-Switched to branch 'side'
-[side e3f9627] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1507-rev-parse-upstream/.
-   d0dcf97..8f489d0  main       -> origin/main
-   82335b2..e3f9627  side       -> origin/side
- * [new tag]         5          -> 5
-ok 9 - my-side@{u} resolves to correct commit
-
-expecting success of 1507.10 'not-tracking@{u} fails': 
-	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} &&
-	(cd clone && git checkout --no-track -b non-tracking) &&
-	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u}
-
-fatal: no such branch: 'non-tracking'
-Switched to a new branch 'non-tracking'
-fatal: no upstream configured for branch 'non-tracking'
-ok 10 - not-tracking@{u} fails
-
-expecting success of 1507.11 '<branch>@{u}@{1} resolves correctly': 
-	test_commit 6 &&
-	(cd clone && git fetch) &&
-	echo 5 >expect &&
-	commit_subject my-side@{u}@{1} >actual &&
-	test_cmp expect actual &&
-	commit_subject my-side@{U}@{1} >actual &&
-	test_cmp expect actual
-
-[side 8bf5882] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1507-rev-parse-upstream/.
-   e3f9627..8bf5882  side       -> origin/side
- * [new tag]         6          -> 6
-ok 11 - <branch>@{u}@{1} resolves correctly
-
-expecting success of 1507.12 '@{u} without specifying branch fails on a detached HEAD': 
-	git checkout HEAD^0 &&
-	test_must_fail git rev-parse @{u} &&
-	test_must_fail git rev-parse @{U}
-
-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 8bf5882 6
-fatal: HEAD does not point to a branch
-fatal: HEAD does not point to a branch
-ok 12 - @{u} without specifying branch fails on a detached HEAD
-
-expecting success of 1507.13 'checkout -b new my-side@{u} forks from the same': 
-(
-	cd clone &&
-	git checkout -b new my-side@{u} &&
-	git rev-parse --symbolic-full-name my-side@{u} >expect &&
-	git rev-parse --symbolic-full-name new@{u} >actual &&
-	test_cmp expect actual
-)
-
-Switched to a new branch 'new'
-branch 'new' set up to track 'origin/side'.
-ok 13 - checkout -b new my-side@{u} forks from the same
-
-expecting success of 1507.14 'merge my-side@{u} records the correct name': 
-(
-	cd clone &&
-	git checkout main &&
-	test_might_fail git branch -D new &&
-	git branch -t new my-side@{u} &&
-	git merge -s ours new@{u} &&
-	git show -s --pretty=tformat:%s >actual &&
-	echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
-	test_cmp expect actual
-)
-
-Switched to branch 'main'
-Your branch and 'origin/main' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-Deleted branch new (was 8bf5882).
-branch 'new' set up to track 'origin/side'.
-Merge made by the 'ours' strategy.
-ok 14 - merge my-side@{u} records the correct name
-
-expecting success of 1507.15 'branch -d other@{u}': 
-	git checkout -t -b other main &&
-	git branch -d @{u} &&
-	git for-each-ref refs/heads/main >actual &&
-	test_must_be_empty actual
-
-Previous HEAD position was 8bf5882 6
-Switched to a new branch 'other'
-branch 'other' set up to track 'main'.
-Deleted branch main (was 8f489d0).
-ok 15 - branch -d other@{u}
-
-expecting success of 1507.16 'checkout other@{u}': 
-	git branch -f main HEAD &&
-	git checkout -t -b another main &&
-	git checkout @{u} &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/main >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'another'
-branch 'another' set up to track 'main'.
-Switched to branch 'main'
-ok 16 - checkout other@{u}
-
-expecting success of 1507.17 'branch@{u} works when tracking a local branch': 
-	echo refs/heads/main >expect &&
-	git -C clone rev-parse --symbolic-full-name local-main@{u} >actual &&
-	test_cmp expect actual
-
-ok 17 - branch@{u} works when tracking a local branch
-
-expecting success of 1507.18 'branch@{u} error message when no upstream': 
-	cat >expect <<-EOF &&
-	fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
-	EOF
-	error_message non-tracking@{u} &&
-	test_cmp expect error
-
-ok 18 - branch@{u} error message when no upstream
-
-expecting success of 1507.19 '@{u} error message when no upstream': 
-	cat >expect <<-EOF &&
-	fatal: no upstream configured for branch ${SQ}main${SQ}
-	EOF
-	test_must_fail git rev-parse --verify @{u} 2>actual &&
-	test_cmp expect actual
-
-ok 19 - @{u} error message when no upstream
-
-expecting success of 1507.20 '@{u} silent error when no upstream': 
-	test_must_fail git rev-parse --verify --quiet @{u} 2>actual &&
-	test_must_be_empty actual
-
-ok 20 - @{u} silent error when no upstream
-
-expecting success of 1507.21 'branch@{u} error message with misspelt branch': 
-	cat >expect <<-EOF &&
-	fatal: no such branch: ${SQ}no-such-branch${SQ}
-	EOF
-	error_message no-such-branch@{u} &&
-	test_cmp expect error
-
-ok 21 - branch@{u} error message with misspelt branch
-
-expecting success of 1507.22 '@{u} error message when not on a branch': 
-	cat >expect <<-EOF &&
-	fatal: HEAD does not point to a branch
-	EOF
-	git checkout HEAD^0 &&
-	test_must_fail git rev-parse --verify @{u} 2>actual &&
-	test_cmp expect actual
-
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 8f489d0 3
-ok 22 - @{u} error message when not on a branch
-
-expecting success of 1507.23 'branch@{u} error message if upstream branch not fetched': 
-	cat >expect <<-EOF &&
-	fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
-	EOF
-	error_message bad-upstream@{u} &&
-	test_cmp expect error
-
-ok 23 - branch@{u} error message if upstream branch not fetched
-
-expecting success of 1507.24 'pull works when tracking a local branch': 
-(
-	cd clone &&
-	git checkout local-main &&
-	git pull
-)
-
-Switched to branch 'local-main'
-Your branch is behind 'main' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-From .
- * branch            main       -> FETCH_HEAD
-Updating 6efda21..ac35135
-Fast-forward
-ok 24 - pull works when tracking a local branch
-
-expecting success of 1507.25 '@{u} works when tracking a local branch': 
-	echo refs/heads/main >expect &&
-	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
-	test_cmp expect actual
-
-ok 25 - @{u} works when tracking a local branch
-
-expecting success of 1507.26 'log -g other@{u}': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-	commit $commit
-	Reflog: main@{0} (C O Mitter <committer@example.com>)
-	Reflog message: branch: Created from HEAD
-	Author: A U Thor <author@example.com>
-	Date:   Thu Apr 7 15:15:13 2005 -0700
-
-	    3
-	EOF
-	git log -1 -g other@{u} >actual &&
-	test_cmp expect actual
-
-ok 26 - log -g other@{u}
-
-expecting success of 1507.27 'log -g other@{u}@{now}': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-	commit $commit
-	Reflog: main@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
-	Reflog message: branch: Created from HEAD
-	Author: A U Thor <author@example.com>
-	Date:   Thu Apr 7 15:15:13 2005 -0700
-
-	    3
-	EOF
-	git log -1 -g other@{u}@{now} >actual &&
-	test_cmp expect actual
-
-ok 27 - log -g other@{u}@{now}
-
-expecting success of 1507.28 '@{reflog}-parsing does not look beyond colon': 
-	echo content >@{yesterday} &&
-	git add @{yesterday} &&
-	git commit -m "funny reflog file" &&
-	git hash-object @{yesterday} >expect &&
-	git rev-parse HEAD:@{yesterday} >actual &&
-	test_cmp expect actual
-
-[detached HEAD eae0df2] funny reflog file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 @{yesterday}
-ok 28 - @{reflog}-parsing does not look beyond colon
-
-expecting success of 1507.29 '@{upstream}-parsing does not look beyond colon': 
-	echo content >@{upstream} &&
-	git add @{upstream} &&
-	git commit -m "funny upstream file" &&
-	git hash-object @{upstream} >expect &&
-	git rev-parse HEAD:@{upstream} >actual &&
-	test_cmp expect actual
-
-[detached HEAD c358789] funny upstream file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 @{upstream}
-ok 29 - @{upstream}-parsing does not look beyond colon
-
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1511-rev-parse-caret.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1511-rev-parse-caret/.git/
-expecting success of 1511.1 'setup': 
-	echo blob >a-blob &&
-	git tag -a -m blob blob-tag $(git hash-object -w a-blob) &&
-	mkdir a-tree &&
-	echo moreblobs >a-tree/another-blob &&
-	git add . &&
-	TREE_SHA1=$(git write-tree) &&
-	git tag -a -m tree tree-tag "$TREE_SHA1" &&
-	git commit -m Initial &&
-	git tag -a -m commit commit-tag &&
-	git branch ref &&
-	git checkout main &&
-	echo modified >>a-blob &&
-	git add -u &&
-	git commit -m Modified &&
-	git branch modref &&
-	echo changed! >>a-blob &&
-	git add -u &&
-	git commit -m !Exp &&
-	git branch expref &&
-	echo changed >>a-blob &&
-	git add -u &&
-	git commit -m Changed &&
-	echo changed-again >>a-blob &&
-	git add -u &&
-	git commit -m Changed-again
-
-[main (root-commit) 543146a] Initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a-blob
- create mode 100644 a-tree/another-blob
-Already on 'main'
-[main 921b76a] Modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main e6ae3e8] !Exp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main ee9e0b8] Changed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 8f5adaa] Changed-again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 1511.2 'ref^{non-existent}': 
-	test_must_fail git rev-parse ref^{non-existent}
-
-fatal: ambiguous argument 'ref^{non-existent}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ref^{non-existent}
-ok 2 - ref^{non-existent}
-
-expecting success of 1511.3 'ref^{}': 
-	git rev-parse ref >expected &&
-	git rev-parse ref^{} >actual &&
-	test_cmp expected actual &&
-	git rev-parse commit-tag^{} >actual &&
-	test_cmp expected actual
-
-ok 3 - ref^{}
-
-expecting success of 1511.4 'ref^{commit}': 
-	git rev-parse ref >expected &&
-	git rev-parse ref^{commit} >actual &&
-	test_cmp expected actual &&
-	git rev-parse commit-tag^{commit} >actual &&
-	test_cmp expected actual &&
-	test_must_fail git rev-parse tree-tag^{commit} &&
-	test_must_fail git rev-parse blob-tag^{commit}
-
-error: tree-tag^{commit}: expected commit type, but the object dereferences to tree type
-error: tree-tag^{commit}: expected commit type, but the object dereferences to tree type
-fatal: ambiguous argument 'tree-tag^{commit}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-tree-tag^{commit}
-error: blob-tag^{commit}: expected commit type, but the object dereferences to blob type
-error: blob-tag^{commit}: expected commit type, but the object dereferences to blob type
-fatal: ambiguous argument 'blob-tag^{commit}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-blob-tag^{commit}
-ok 4 - ref^{commit}
-
-expecting success of 1511.5 'ref^{tree}': 
-	echo $TREE_SHA1 >expected &&
-	git rev-parse ref^{tree} >actual &&
-	test_cmp expected actual &&
-	git rev-parse commit-tag^{tree} >actual &&
-	test_cmp expected actual &&
-	git rev-parse tree-tag^{tree} >actual &&
-	test_cmp expected actual &&
-	test_must_fail git rev-parse blob-tag^{tree}
-
-error: blob-tag^{tree}: expected tree type, but the object dereferences to blob type
-error: blob-tag^{tree}: expected tree type, but the object dereferences to blob type
-fatal: ambiguous argument 'blob-tag^{tree}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-blob-tag^{tree}
-ok 5 - ref^{tree}
-
-expecting success of 1511.6 'ref^{tag}': 
-	test_must_fail git rev-parse HEAD^{tag} &&
-	git rev-parse commit-tag >expected &&
-	git rev-parse commit-tag^{tag} >actual &&
-	test_cmp expected actual
-
-error: HEAD^{tag}: expected tag type, but the object dereferences to tree type
-error: HEAD^{tag}: expected tag type, but the object dereferences to tree type
-fatal: ambiguous argument 'HEAD^{tag}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-HEAD^{tag}
-ok 6 - ref^{tag}
-
-expecting success of 1511.7 'ref^{/.}': 
-	git rev-parse main >expected &&
-	git rev-parse main^{/.} >actual &&
-	test_cmp expected actual
-
-ok 7 - ref^{/.}
-
-expecting success of 1511.8 'ref^{/non-existent}': 
-	test_must_fail git rev-parse main^{/non-existent}
-
-fatal: ambiguous argument 'main^{/non-existent}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-main^{/non-existent}
-ok 8 - ref^{/non-existent}
-
-expecting success of 1511.9 'ref^{/Initial}': 
-	git rev-parse ref >expected &&
-	git rev-parse main^{/Initial} >actual &&
-	test_cmp expected actual
-
-ok 9 - ref^{/Initial}
-
-expecting success of 1511.10 'ref^{/!Exp}': 
-	test_must_fail git rev-parse main^{/!Exp}
-
-fatal: ambiguous argument 'main^{/!Exp}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-main^{/!Exp}
-ok 10 - ref^{/!Exp}
-
-expecting success of 1511.11 'ref^{/!}': 
-	test_must_fail git rev-parse main^{/!}
-
-fatal: ambiguous argument 'main^{/!}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-main^{/!}
-ok 11 - ref^{/!}
-
-expecting success of 1511.12 'ref^{/!!Exp}': 
-	git rev-parse expref >expected &&
-	git rev-parse main^{/!!Exp} >actual &&
-	test_cmp expected actual
-
-ok 12 - ref^{/!!Exp}
-
-expecting success of 1511.13 'ref^{/!-}': 
-	test_must_fail git rev-parse main^{/!-}
-
-fatal: ambiguous argument 'main^{/!-}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-main^{/!-}
-ok 13 - ref^{/!-}
-
-expecting success of 1511.14 'ref^{/!-.}': 
-	test_must_fail git rev-parse main^{/!-.}
-
-fatal: ambiguous argument 'main^{/!-.}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-main^{/!-.}
-ok 14 - ref^{/!-.}
-
-expecting success of 1511.15 'ref^{/!-non-existent}': 
-	git rev-parse main >expected &&
-	git rev-parse main^{/!-non-existent} >actual &&
-	test_cmp expected actual
-
-ok 15 - ref^{/!-non-existent}
-
-expecting success of 1511.16 'ref^{/!-Changed}': 
-	git rev-parse expref >expected &&
-	git rev-parse main^{/!-Changed} >actual &&
-	test_cmp expected actual
-
-ok 16 - ref^{/!-Changed}
-
-expecting success of 1511.17 'ref^{/!-!Exp}': 
-	git rev-parse modref >expected &&
-	git rev-parse expref^{/!-!Exp} >actual &&
-	test_cmp expected actual
-
-ok 17 - ref^{/!-!Exp}
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1513-rev-parse-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1513-rev-parse-prefix/.git/
-expecting success of 1513.1 'setup': 
-	mkdir -p sub1/sub2 &&
-	echo top >top &&
-	echo file1 >sub1/file1 &&
-	echo file2 >sub1/sub2/file2 &&
-	git add top sub1/file1 sub1/sub2/file2 &&
-	git commit -m commit
-
-[main (root-commit) 2a70803] commit
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 sub1/file1
- create mode 100644 sub1/sub2/file2
- create mode 100644 top
-ok 1 - setup
-
-expecting success of 1513.2 'empty prefix -- file': 
-	git rev-parse --prefix "" -- top sub1/file1 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	top
-	sub1/file1
-	EOF
-	test_cmp expected actual
-
-ok 2 - empty prefix -- file
-
-expecting success of 1513.3 'valid prefix -- file': 
-	git rev-parse --prefix sub1/ -- file1 sub2/file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/file1
-	sub1/sub2/file2
-	EOF
-	test_cmp expected actual
-
-ok 3 - valid prefix -- file
-
-expecting success of 1513.4 'valid prefix -- ../file': 
-	git rev-parse --prefix sub1/ -- ../top sub2/file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/../top
-	sub1/sub2/file2
-	EOF
-	test_cmp expected actual
-
-ok 4 - valid prefix -- ../file
-
-expecting success of 1513.5 'empty prefix HEAD:./path': 
-	git rev-parse --prefix "" HEAD:./top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
-
-ok 5 - empty prefix HEAD:./path
-
-expecting success of 1513.6 'valid prefix HEAD:./path': 
-	git rev-parse --prefix sub1/ HEAD:./file1 >actual &&
-	git rev-parse HEAD:sub1/file1 >expected &&
-	test_cmp expected actual
-
-ok 6 - valid prefix HEAD:./path
-
-expecting success of 1513.7 'valid prefix HEAD:../path': 
-	git rev-parse --prefix sub1/ HEAD:../top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
-
-ok 7 - valid prefix HEAD:../path
-
-expecting success of 1513.8 'prefix ignored with HEAD:top': 
-	git rev-parse --prefix sub1/ HEAD:top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
-
-ok 8 - prefix ignored with HEAD:top
-
-expecting success of 1513.9 'disambiguate path with valid prefix': 
-	git rev-parse --prefix sub1/ file1 >actual &&
-	cat <<-\EOF >expected &&
-	sub1/file1
-	EOF
-	test_cmp expected actual
-
-ok 9 - disambiguate path with valid prefix
-
-expecting success of 1513.10 'file and refs with prefix': 
-	git rev-parse --prefix sub1/ main file1 >actual &&
-	cat <<-EOF >expected &&
-	$(git rev-parse main)
-	sub1/file1
-	EOF
-	test_cmp expected actual
-
-ok 10 - file and refs with prefix
-
-expecting success of 1513.11 'two-levels deep': 
-	git rev-parse --prefix sub1/sub2/ -- file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/sub2/file2
-	EOF
-	test_cmp expected actual
-
-ok 11 - two-levels deep
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1515-rev-parse-outside-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1515-rev-parse-outside-repo/.git/
-expecting success of 1515.1 'set up non-repo directory': 
-	GIT_CEILING_DIRECTORIES=$(pwd) &&
-	export GIT_CEILING_DIRECTORIES &&
-	mkdir non-repo &&
-	cd non-repo &&
-	# confirm that git does not find a repo
-	test_must_fail git rev-parse --git-dir
-
-fatal: not a git repository (or any of the parent directories): .git
-ok 1 - set up non-repo directory
-
-expecting success of 1515.2 'rev-parse --sq-quote': 
-	dump_args "$tricky" easy >expect &&
-	eval "dump_args $(git rev-parse --sq-quote "$tricky" easy)" >actual &&
-	test_cmp expect actual
-
-ok 2 - rev-parse --sq-quote
-
-expecting success of 1515.3 'rev-parse --local-env-vars': 
-	git rev-parse --local-env-vars >actual &&
-	# we do not want to depend on the complete list here,
-	# so just look for something plausible
-	grep ^GIT_DIR actual
-
-GIT_DIR
-ok 3 - rev-parse --local-env-vars
-
-expecting success of 1515.4 'rev-parse --resolve-git-dir': 
-	git init --separate-git-dir repo dir &&
-	test_must_fail git rev-parse --resolve-git-dir . &&
-	echo "$(pwd)/repo" >expect &&
-	git rev-parse --resolve-git-dir dir/.git >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1515-rev-parse-outside-repo/non-repo/repo/
-fatal: not a gitdir '.'
-ok 4 - rev-parse --resolve-git-dir
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1514-rev-parse-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1514-rev-parse-push/.git/
-expecting success of 1514.1 'setup': 
-	git init --bare parent.git &&
-	git init --bare other.git &&
-	git remote add origin parent.git &&
-	git remote add other other.git &&
-	test_commit base &&
-	git push origin HEAD &&
-	git branch --set-upstream-to=origin/main main &&
-	git branch --track topic origin/main &&
-	git push origin topic &&
-	git push other topic
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1514-rev-parse-push/parent.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1514-rev-parse-push/other.git/
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-To parent.git
- * [new branch]      HEAD -> main
-branch 'main' set up to track 'origin/main'.
-branch 'topic' set up to track 'origin/main'.
-To parent.git
- * [new branch]      topic -> topic
-To other.git
- * [new branch]      topic -> topic
-ok 1 - setup
-
-expecting success of 1514.2 '@{push} with default=nothing': 
-	test_config push.default nothing &&
-	test_must_fail git rev-parse main@{push} &&
-	test_must_fail git rev-parse main@{PUSH} &&
-	test_must_fail git rev-parse main@{PuSH}
-
-fatal: push has no destination (push.default is 'nothing')
-fatal: push has no destination (push.default is 'nothing')
-fatal: push has no destination (push.default is 'nothing')
-ok 2 - @{push} with default=nothing
-
-expecting success of 1514.3 '@{push} with default=simple': 
-	test_config push.default simple &&
-	resolve main@{push} refs/remotes/origin/main &&
-	resolve main@{PUSH} refs/remotes/origin/main &&
-	resolve main@{pUSh} refs/remotes/origin/main
-
-ok 3 - @{push} with default=simple
-
-expecting success of 1514.4 'triangular @{push} fails with default=simple': 
-	test_config push.default simple &&
-	test_must_fail git rev-parse topic@{push}
-
-fatal: cannot resolve 'simple' push to a single destination
-ok 4 - triangular @{push} fails with default=simple
-
-expecting success of 1514.5 '@{push} with default=current': 
-	test_config push.default current &&
-	resolve topic@{push} refs/remotes/origin/topic
-
-ok 5 - @{push} with default=current
-
-expecting success of 1514.6 '@{push} with default=matching': 
-	test_config push.default matching &&
-	resolve topic@{push} refs/remotes/origin/topic
-
-ok 6 - @{push} with default=matching
-
-expecting success of 1514.7 '@{push} with pushremote defined': 
-	test_config push.default current &&
-	test_config branch.topic.pushremote other &&
-	resolve topic@{push} refs/remotes/other/topic
-
-ok 7 - @{push} with pushremote defined
-
-expecting success of 1514.8 '@{push} with push refspecs': 
-	test_config push.default nothing &&
-	test_config remote.origin.push refs/heads/*:refs/heads/magic/* &&
-	git push &&
-	resolve topic@{push} refs/remotes/origin/magic/topic
-
-To parent.git
- * [new branch]      main -> magic/main
- * [new branch]      topic -> magic/topic
-ok 8 - @{push} with push refspecs
-
-expecting success of 1514.9 'resolving @{push} fails with a detached HEAD': 
-	git checkout HEAD^0 &&
-	test_when_finished "git checkout -" &&
-	test_must_fail git rev-parse @{push}
-
-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 d1ff1c9 base
-fatal: HEAD does not point to a branch
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-ok 9 - resolving @{push} fails with a detached HEAD
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1601-index-bogus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1601-index-bogus/.git/
-expecting success of 1601.1 'create tree with null sha1': 
-	tree=$(printf "160000 commit $ZERO_OID\\tbroken\\n" | git mktree)
-
-ok 1 - create tree with null sha1
-
-expecting success of 1601.2 'read-tree refuses to read null sha1': 
-	test_must_fail git read-tree $tree
-
-error: cache entry has null sha1: broken
-fatal: unable to write new index file
-ok 2 - read-tree refuses to read null sha1
-
-expecting success of 1601.3 'GIT_ALLOW_NULL_SHA1 overrides refusal': 
-	GIT_ALLOW_NULL_SHA1=1 git read-tree $tree
-
-warning: cache entry has null sha1: broken
-ok 3 - GIT_ALLOW_NULL_SHA1 overrides refusal
-
-expecting success of 1601.4 'git write-tree refuses to write null sha1': 
-	test_must_fail git write-tree
-
-error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
-fatal: git-write-tree: error building trees
-ok 4 - git write-tree refuses to write null sha1
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1517-outside-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1517-outside-repo/.git/
-expecting success of 1517.1 'set up a non-repo directory and test file': 
-	GIT_CEILING_DIRECTORIES=$(pwd) &&
-	export GIT_CEILING_DIRECTORIES &&
-	mkdir non-repo &&
-	(
-		cd non-repo &&
-		# confirm that git does not find a repo
-		test_must_fail git rev-parse --git-dir
-	) &&
-	test_write_lines one two three four >nums &&
-	git add nums &&
-	cp nums nums.old &&
-	test_write_lines five >>nums &&
-	git diff >sample.patch
-
-fatal: not a git repository (or any of the parent directories): .git
-ok 1 - set up a non-repo directory and test file
-
-expecting success of 1517.2 'compute a patch-id outside repository (uses SHA-1)': 
-	nongit env GIT_DEFAULT_HASH=sha1 \
-		git patch-id <sample.patch >patch-id.expect &&
-	nongit \
-		git patch-id <sample.patch >patch-id.actual &&
-	test_cmp patch-id.expect patch-id.actual
-
-ok 2 - compute a patch-id outside repository (uses SHA-1)
-
-expecting success of 1517.3 'hash-object outside repository (uses SHA-1)': 
-	nongit env GIT_DEFAULT_HASH=sha1 \
-		git hash-object --stdin <sample.patch >hash.expect &&
-	nongit \
-		git hash-object --stdin <sample.patch >hash.actual &&
-	test_cmp hash.expect hash.actual
-
-ok 3 - hash-object outside repository (uses SHA-1)
-
-expecting success of 1517.4 'apply a patch outside repository': 
-	(
-		cd non-repo &&
-		cp ../nums.old nums &&
-		git apply ../sample.patch
-	) &&
-	test_cmp nums non-repo/nums
-
-ok 4 - apply a patch outside repository
-
-expecting success of 1517.5 'grep outside repository': 
-	git grep --cached two >expect &&
-	(
-		cd non-repo &&
-		cp ../nums.old nums &&
-		git grep --no-index two >../actual
-	) &&
-	test_cmp expect actual
-
-ok 5 - grep outside repository
-
-expecting success of 1517.6 'imap-send outside repository': 
-	test_config_global imap.host imaps://localhost &&
-	test_config_global imap.folder Drafts &&
-
-	echo nothing to send >expect &&
-	test_must_fail git imap-send -v </dev/null 2>actual &&
-	test_cmp expect actual &&
-
-	(
-		cd non-repo &&
-		test_must_fail git imap-send -v </dev/null 2>../actual
-	) &&
-	test_cmp expect actual
-
-ok 6 - imap-send outside repository
-
-expecting success of 1517.7 'check-ref-format outside repository': 
-	git check-ref-format --branch refs/heads/xyzzy >expect &&
-	nongit git check-ref-format --branch refs/heads/xyzzy >actual &&
-	test_cmp expect actual
-
-ok 7 - check-ref-format outside repository
-
-expecting success of 1517.8 'diff outside repository': 
-	echo one >one &&
-	echo two >two &&
-	test_must_fail git diff --no-index one two >expect.raw &&
-	(
-		cd non-repo &&
-		cp ../one . &&
-		cp ../two . &&
-		test_must_fail git diff one two >../actual.raw
-	) &&
-	# outside repository diff falls back to SHA-1 but
-	# GIT_DEFAULT_HASH may be set to sha256 on the in-repo side.
-	sed -e "/^index /d" expect.raw >expect &&
-	sed -e "/^index /d" actual.raw >actual &&
-	test_cmp expect actual
-
-ok 8 - diff outside repository
-
-expecting success of 1517.9 'stripspace outside repository': 
-	nongit git stripspace -s </dev/null
-
-ok 9 - stripspace outside repository
-
-expecting success of 1517.10 'remote-http outside repository': 
-	test_must_fail git remote-http 2>actual &&
-	test_grep "^error: remote-curl" actual &&
-	(
-		cd non-repo &&
-		test_must_fail git remote-http 2>../actual
-	) &&
-	test_grep "^error: remote-curl" actual
-
-error: remote-curl: usage: git remote-curl <remote> [<url>]
-error: remote-curl: usage: git remote-curl <remote> [<url>]
-ok 10 - remote-http outside repository
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1512-rev-parse-disambiguation.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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_write_lines h62xsjeu j08bekfvt kg7xflhm >>f5518nwu &&
+	git add f5518nwu &&
 
 	test_tick &&
 	git commit -m b3wettvi &&
@@ -78397,6 +73267,277 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1514-rev-parse-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1514-rev-parse-push/.git/
+expecting success of 1514.1 'setup': 
+	git init --bare parent.git &&
+	git init --bare other.git &&
+	git remote add origin parent.git &&
+	git remote add other other.git &&
+	test_commit base &&
+	git push origin HEAD &&
+	git branch --set-upstream-to=origin/main main &&
+	git branch --track topic origin/main &&
+	git push origin topic &&
+	git push other topic
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1514-rev-parse-push/parent.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1514-rev-parse-push/other.git/
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+To parent.git
+ * [new branch]      HEAD -> main
+branch 'main' set up to track 'origin/main'.
+branch 'topic' set up to track 'origin/main'.
+To parent.git
+ * [new branch]      topic -> topic
+To other.git
+ * [new branch]      topic -> topic
+ok 1 - setup
+
+expecting success of 1514.2 '@{push} with default=nothing': 
+	test_config push.default nothing &&
+	test_must_fail git rev-parse main@{push} &&
+	test_must_fail git rev-parse main@{PUSH} &&
+	test_must_fail git rev-parse main@{PuSH}
+
+fatal: push has no destination (push.default is 'nothing')
+fatal: push has no destination (push.default is 'nothing')
+fatal: push has no destination (push.default is 'nothing')
+ok 2 - @{push} with default=nothing
+
+expecting success of 1514.3 '@{push} with default=simple': 
+	test_config push.default simple &&
+	resolve main@{push} refs/remotes/origin/main &&
+	resolve main@{PUSH} refs/remotes/origin/main &&
+	resolve main@{pUSh} refs/remotes/origin/main
+
+ok 3 - @{push} with default=simple
+
+expecting success of 1514.4 'triangular @{push} fails with default=simple': 
+	test_config push.default simple &&
+	test_must_fail git rev-parse topic@{push}
+
+fatal: cannot resolve 'simple' push to a single destination
+ok 4 - triangular @{push} fails with default=simple
+
+expecting success of 1514.5 '@{push} with default=current': 
+	test_config push.default current &&
+	resolve topic@{push} refs/remotes/origin/topic
+
+ok 5 - @{push} with default=current
+
+expecting success of 1514.6 '@{push} with default=matching': 
+	test_config push.default matching &&
+	resolve topic@{push} refs/remotes/origin/topic
+
+ok 6 - @{push} with default=matching
+
+expecting success of 1514.7 '@{push} with pushremote defined': 
+	test_config push.default current &&
+	test_config branch.topic.pushremote other &&
+	resolve topic@{push} refs/remotes/other/topic
+
+ok 7 - @{push} with pushremote defined
+
+expecting success of 1514.8 '@{push} with push refspecs': 
+	test_config push.default nothing &&
+	test_config remote.origin.push refs/heads/*:refs/heads/magic/* &&
+	git push &&
+	resolve topic@{push} refs/remotes/origin/magic/topic
+
+To parent.git
+ * [new branch]      main -> magic/main
+ * [new branch]      topic -> magic/topic
+ok 8 - @{push} with push refspecs
+
+expecting success of 1514.9 'resolving @{push} fails with a detached HEAD': 
+	git checkout HEAD^0 &&
+	test_when_finished "git checkout -" &&
+	test_must_fail git rev-parse @{push}
+
+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 d1ff1c9 base
+fatal: HEAD does not point to a branch
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+ok 9 - resolving @{push} fails with a detached HEAD
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1601-index-bogus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1601-index-bogus/.git/
+expecting success of 1601.1 'create tree with null sha1': 
+	tree=$(printf "160000 commit $ZERO_OID\\tbroken\\n" | git mktree)
+
+ok 1 - create tree with null sha1
+
+expecting success of 1601.2 'read-tree refuses to read null sha1': 
+	test_must_fail git read-tree $tree
+
+error: cache entry has null sha1: broken
+fatal: unable to write new index file
+ok 2 - read-tree refuses to read null sha1
+
+expecting success of 1601.3 'GIT_ALLOW_NULL_SHA1 overrides refusal': 
+	GIT_ALLOW_NULL_SHA1=1 git read-tree $tree
+
+warning: cache entry has null sha1: broken
+ok 3 - GIT_ALLOW_NULL_SHA1 overrides refusal
+
+expecting success of 1601.4 'git write-tree refuses to write null sha1': 
+	test_must_fail git write-tree
+
+error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+fatal: git-write-tree: error building trees
+ok 4 - git write-tree refuses to write null sha1
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1517-outside-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1517-outside-repo/.git/
+expecting success of 1517.1 'set up a non-repo directory and test file': 
+	GIT_CEILING_DIRECTORIES=$(pwd) &&
+	export GIT_CEILING_DIRECTORIES &&
+	mkdir non-repo &&
+	(
+		cd non-repo &&
+		# confirm that git does not find a repo
+		test_must_fail git rev-parse --git-dir
+	) &&
+	test_write_lines one two three four >nums &&
+	git add nums &&
+	cp nums nums.old &&
+	test_write_lines five >>nums &&
+	git diff >sample.patch
+
+fatal: not a git repository (or any of the parent directories): .git
+ok 1 - set up a non-repo directory and test file
+
+expecting success of 1517.2 'compute a patch-id outside repository (uses SHA-1)': 
+	nongit env GIT_DEFAULT_HASH=sha1 \
+		git patch-id <sample.patch >patch-id.expect &&
+	nongit \
+		git patch-id <sample.patch >patch-id.actual &&
+	test_cmp patch-id.expect patch-id.actual
+
+ok 2 - compute a patch-id outside repository (uses SHA-1)
+
+expecting success of 1517.3 'hash-object outside repository (uses SHA-1)': 
+	nongit env GIT_DEFAULT_HASH=sha1 \
+		git hash-object --stdin <sample.patch >hash.expect &&
+	nongit \
+		git hash-object --stdin <sample.patch >hash.actual &&
+	test_cmp hash.expect hash.actual
+
+ok 3 - hash-object outside repository (uses SHA-1)
+
+expecting success of 1517.4 'apply a patch outside repository': 
+	(
+		cd non-repo &&
+		cp ../nums.old nums &&
+		git apply ../sample.patch
+	) &&
+	test_cmp nums non-repo/nums
+
+ok 4 - apply a patch outside repository
+
+expecting success of 1517.5 'grep outside repository': 
+	git grep --cached two >expect &&
+	(
+		cd non-repo &&
+		cp ../nums.old nums &&
+		git grep --no-index two >../actual
+	) &&
+	test_cmp expect actual
+
+ok 5 - grep outside repository
+
+expecting success of 1517.6 'imap-send outside repository': 
+	test_config_global imap.host imaps://localhost &&
+	test_config_global imap.folder Drafts &&
+
+	echo nothing to send >expect &&
+	test_must_fail git imap-send -v </dev/null 2>actual &&
+	test_cmp expect actual &&
+
+	(
+		cd non-repo &&
+		test_must_fail git imap-send -v </dev/null 2>../actual
+	) &&
+	test_cmp expect actual
+
+ok 6 - imap-send outside repository
+
+expecting success of 1517.7 'check-ref-format outside repository': 
+	git check-ref-format --branch refs/heads/xyzzy >expect &&
+	nongit git check-ref-format --branch refs/heads/xyzzy >actual &&
+	test_cmp expect actual
+
+ok 7 - check-ref-format outside repository
+
+expecting success of 1517.8 'diff outside repository': 
+	echo one >one &&
+	echo two >two &&
+	test_must_fail git diff --no-index one two >expect.raw &&
+	(
+		cd non-repo &&
+		cp ../one . &&
+		cp ../two . &&
+		test_must_fail git diff one two >../actual.raw
+	) &&
+	# outside repository diff falls back to SHA-1 but
+	# GIT_DEFAULT_HASH may be set to sha256 on the in-repo side.
+	sed -e "/^index /d" expect.raw >expect &&
+	sed -e "/^index /d" actual.raw >actual &&
+	test_cmp expect actual
+
+ok 8 - diff outside repository
+
+expecting success of 1517.9 'stripspace outside repository': 
+	nongit git stripspace -s </dev/null
+
+ok 9 - stripspace outside repository
+
+expecting success of 1517.10 'remote-http outside repository': 
+	test_must_fail git remote-http 2>actual &&
+	test_grep "^error: remote-curl" actual &&
+	(
+		cd non-repo &&
+		test_must_fail git remote-http 2>../actual
+	) &&
+	test_grep "^error: remote-curl" actual
+
+error: remote-curl: usage: git remote-curl <remote> [<url>]
+error: remote-curl: usage: git remote-curl <remote> [<url>]
+ok 10 - remote-http outside repository
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1600-index.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1600-index/.git/
 expecting success of 1600.1 'setup': 
@@ -78526,4398 +73667,1004 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1400-update-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref/.git/
-expecting success of 1400.1 'setup': 
-	git checkout --orphan main &&
-	create_test_commits "" &&
-	mkdir $bare &&
-	cd $bare &&
-	git init --bare -b main &&
-	create_test_commits "bare" &&
-	cd -
+*** t2000-conflict-when-checking-files-out.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2000-conflict-when-checking-files-out/.git/
+expecting success of 2000.1 'git update-index --add various paths.': git update-index --add path0 path1/file1
+ok 1 - git update-index --add various paths.
 
-Switched to a new branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref/bare-repo/
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref
-ok 1 - setup
+expecting success of 2000.2 'git checkout-index without -f should fail on conflicting work tree.': test_must_fail git checkout-index -a
+path0 already exists, no checkout
+fatal: cannot create directory at 'path1': File exists
+ok 2 - git checkout-index without -f should fail on conflicting work tree.
 
-expecting success of 1400.2 'create refs/heads/main': 
-	git update-ref $m $A &&
-	test $A = $(git show-ref -s --verify $m)
+expecting success of 2000.3 'git checkout-index with -f should succeed.': git checkout-index -f -a
+ok 3 - git checkout-index with -f should succeed.
 
-ok 2 - create refs/heads/main
+expecting success of 2000.4 'git checkout-index conflicting paths.': test -f path0 && test -d path1 && test -f path1/file1
+ok 4 - git checkout-index conflicting paths.
 
-expecting success of 1400.3 'create refs/heads/main with oldvalue verification': 
-	git update-ref $m $B $A &&
-	test $B = $(git show-ref -s --verify $m)
+checking prerequisite: SYMLINKS
 
-ok 3 - create refs/heads/main with oldvalue verification
+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 1400.4 'fail to delete refs/heads/main with stale ref': 
-	test_must_fail git update-ref -d $m $A &&
-	test $B = "$(git show-ref -s --verify $m)"
+)
+prerequisite SYMLINKS ok
+expecting success of 2000.5 'checkout-index -f twice with --prefix': 
+	mkdir -p tar/get &&
+	ln -s tar/get there &&
+	echo first &&
+	git checkout-index -a -f --prefix=there/ &&
+	echo second &&
+	git checkout-index -a -f --prefix=there/
 
-error: cannot lock ref 'refs/heads/main': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 4 - fail to delete refs/heads/main with stale ref
+first
+second
+ok 5 - checkout-index -f twice with --prefix
 
-expecting success of 1400.5 'delete refs/heads/main': 
-	test_when_finished "git update-ref -d $m" &&
-	git update-ref -d $m $B &&
-	test_must_fail git show-ref --verify -q $m
+expecting success of 2000.6 'git update-index --add path2/file0': git update-index --add path2/file0
+ok 6 - git update-index --add path2/file0
 
-ok 5 - delete refs/heads/main
+expecting success of 2000.7 'writing tree out with git write-tree': tree1=$(git write-tree)
+ok 7 - writing tree out with git write-tree
 
-expecting success of 1400.6 'delete refs/heads/main without oldvalue verification': 
-	test_when_finished "git update-ref -d $m" &&
-	git update-ref $m $A &&
-	test $A = $(git show-ref -s --verify $m) &&
-	git update-ref -d $m &&
-	test_must_fail git show-ref --verify -q $m
+expecting success of 2000.8 'git update-index --add path3/file1': git update-index --add path3/file1
+ok 8 - git update-index --add path3/file1
 
-ok 6 - delete refs/heads/main without oldvalue verification
+expecting success of 2000.9 'writing tree out with git write-tree': tree2=$(git write-tree)
+ok 9 - writing tree out with git write-tree
 
-expecting success of 1400.7 'fail to create  due to file/directory conflict': 
-	test_when_finished "git update-ref -d refs/heads/gu" &&
-	git update-ref refs/heads/gu $A &&
-	test_must_fail git update-ref refs/heads/gu/fixes $A
+expecting success of 2000.10 'read previously written tree and checkout.': git read-tree -m $tree1 && git checkout-index -f -a
+ok 10 - read previously written tree and checkout.
 
-fatal: update_ref failed for ref 'refs/heads/gu/fixes': cannot lock ref 'refs/heads/gu/fixes': 'refs/heads/gu' exists; cannot create 'refs/heads/gu/fixes'
-ok 7 - fail to create  due to file/directory conflict
+expecting success of 2000.11 'add a symlink': test_ln_s_add path2 path3
+ok 11 - add a symlink
 
-expecting success of 1400.8 'create refs/heads/main (by HEAD)': 
-	git update-ref HEAD $A &&
-	test $A = $(git show-ref -s --verify $m)
+expecting success of 2000.12 'writing tree out with git write-tree': tree3=$(git write-tree)
+ok 12 - writing tree out with git write-tree
 
-ok 8 - create refs/heads/main (by HEAD)
+expecting success of 2000.13 'read previously written tree and checkout.': git read-tree $tree2 && git checkout-index -f -a
+ok 13 - read previously written tree and checkout.
 
-expecting success of 1400.9 'create refs/heads/main (by HEAD) with oldvalue verification': 
-	git update-ref HEAD $B $A &&
-	test $B = $(git show-ref -s --verify $m)
+expecting success of 2000.14 'checking out conflicting path with -f': test ! -h path2 && test -d path2 &&
+     test ! -h path3 && test -d path3 &&
+     test ! -h path2/file0 && test -f path2/file0 &&
+     test ! -h path3/file1 && test -f path3/file1
+ok 14 - checking out conflicting path with -f
 
-ok 9 - create refs/heads/main (by HEAD) with oldvalue verification
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2002-checkout-cache-u.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2002-checkout-cache-u/.git/
+expecting success of 2002.1 'preparation': 
+echo frotz >path0 &&
+git update-index --add path0 &&
+t=$(git write-tree)
+ok 1 - preparation
 
-expecting success of 1400.10 'fail to delete refs/heads/main (by HEAD) with stale ref': 
-	test_must_fail git update-ref -d HEAD $A &&
-	test $B = $(git show-ref -s --verify $m)
+expecting success of 2002.2 'without -u, git checkout-index smudges stat information.': 
+rm -f path0 &&
+git read-tree $t &&
+git checkout-index -f -a &&
+test_must_fail git diff-files --exit-code
+:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0000000000000000000000000000000000000000 M	path0
+ok 2 - without -u, git checkout-index smudges stat information.
 
-error: cannot lock ref 'HEAD': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 10 - fail to delete refs/heads/main (by HEAD) with stale ref
+expecting success of 2002.3 'with -u, git checkout-index picks up stat information from new files.': 
+rm -f path0 &&
+git read-tree $t &&
+git checkout-index -u -f -a &&
+git diff-files --exit-code
+ok 3 - with -u, git checkout-index picks up stat information from new files.
 
-expecting success of 1400.11 'delete refs/heads/main (by HEAD)': 
-	test_when_finished "git update-ref -d $m" &&
-	git update-ref -d HEAD $B &&
-	test_must_fail git show-ref --verify -q $m
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1300-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1300-config/.git/
+expecting success of 1300.1 'setup whitespace config': 
+	sed -e "s/^|//" \
+	    -e "s/[$]$//" \
+	    -e "s/X/	/g" >.git/config <<-\EOF
+	[section]
+	|	solid = rock
+	|	sparse = big XX blue
+	|	sparseAndTail = big XX blue $
+	|	sparseAndTailQuoted = "big XX blue "
+	|	sparseAndBiggerTail = big XX blue X X
+	|	sparseAndBiggerTailQuoted = "big XX blue X X"
+	|	sparseAndBiggerTailQuotedPlus = "big XX blue X X"X $
+	|	headAndTail = Xbig blue $
+	|	headAndTailQuoted = "Xbig blue "
+	|	headAndTailQuotedPlus = "Xbig blue " $
+	|	annotated = big blueX# to be discarded
+	|	annotatedQuoted = "big blue"X# to be discarded
+	EOF
 
-ok 11 - delete refs/heads/main (by HEAD)
+ok 1 - setup whitespace config
 
-expecting success of 1400.12 'deleting current branch adds message to HEAD's log': 
-	test_when_finished "git update-ref -d $m" &&
-	git update-ref $m $A &&
-	git symbolic-ref HEAD $m &&
-	git update-ref -m delete-$m -d $m &&
-	test_must_fail git show-ref --verify -q $m &&
-	test-tool ref-store main for-each-reflog-ent HEAD >actual &&
-	grep "delete-$m$" actual
+expecting success of 1300.2 'no internal whitespace': 
+	echo "rock" >expect &&
+	git config --get section.solid >actual &&
+	test_cmp expect actual
 
-0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1112912653 -0700	delete-refs/heads/main
-ok 12 - deleting current branch adds message to HEAD's log
+ok 2 - no internal whitespace
 
-expecting success of 1400.13 'deleting by HEAD adds message to HEAD's log': 
-	test_when_finished "git update-ref -d $m" &&
-	git update-ref $m $A &&
-	git symbolic-ref HEAD $m &&
-	git update-ref -m delete-by-head -d HEAD &&
-	test_must_fail git show-ref --verify -q $m &&
-	test-tool ref-store main for-each-reflog-ent HEAD >actual &&
-	grep "delete-by-head$" actual
+expecting success of 1300.3 'internal whitespace': 
+	echo "big QQ blue" | q_to_tab >expect &&
+	git config --get section.sparse >actual &&
+	test_cmp expect actual
 
-102939797ab91a4f201d131418d2c9d919dcdd2c 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1112912653 -0700	delete-by-head
-ok 13 - deleting by HEAD adds message to HEAD's log
+ok 3 - internal whitespace
 
-expecting success of 1400.14 'update-ref does not create reflogs by default': 
-	test_when_finished "git update-ref -d $outside" &&
-	git update-ref $outside $A &&
-	git rev-parse $A >expect &&
-	git rev-parse $outside >actual &&
-	test_cmp expect actual &&
-	test_must_fail git reflog exists $outside
+expecting success of 1300.4 'internal and trailing whitespace': 
+	echo "big QQ blue" | q_to_tab >expect &&
+	git config --get section.sparseAndTail >actual &&
+	test_cmp expect actual
 
-ok 14 - update-ref does not create reflogs by default
+ok 4 - internal and trailing whitespace
 
-expecting success of 1400.15 'update-ref creates reflogs with --create-reflog': 
-	test_when_finished "git update-ref -d $outside" &&
-	git update-ref --create-reflog $outside $A &&
-	git rev-parse $A >expect &&
-	git rev-parse $outside >actual &&
-	test_cmp expect actual &&
-	git reflog exists $outside
+expecting success of 1300.5 'internal and trailing whitespace, all quoted': 
+	echo "big QQ blue " | q_to_tab >expect &&
+	git config --get section.sparseAndTailQuoted >actual &&
+	test_cmp expect actual
 
-ok 15 - update-ref creates reflogs with --create-reflog
+ok 5 - internal and trailing whitespace, all quoted
 
-expecting success of 1400.16 'creates no reflog in bare repository': 
-	git -C $bare update-ref $m $bareA &&
-	git -C $bare rev-parse $bareA >expect &&
-	git -C $bare rev-parse $m >actual &&
-	test_cmp expect actual &&
-	test_must_fail git -C $bare reflog exists $m
+expecting success of 1300.6 'internal and more trailing whitespace': 
+	echo "big QQ blue" | q_to_tab >expect &&
+	git config --get section.sparseAndBiggerTail >actual &&
+	test_cmp expect actual
 
-ok 16 - creates no reflog in bare repository
+ok 6 - internal and more trailing whitespace
 
-expecting success of 1400.17 'core.logAllRefUpdates=true creates reflog in bare repository': 
-	test_when_finished "git -C $bare config --unset core.logAllRefUpdates && \
-		test-tool ref-store main delete-reflog $m" &&
-	git -C $bare config core.logAllRefUpdates true &&
-	git -C $bare update-ref $m $bareB &&
-	git -C $bare rev-parse $bareB >expect &&
-	git -C $bare rev-parse $m >actual &&
-	test_cmp expect actual &&
-	git -C $bare reflog exists $m
+expecting success of 1300.7 'internal and more trailing whitespace, all quoted': 
+	echo "big QQ blue Q Q" | q_to_tab >expect &&
+	git config --get section.sparseAndBiggerTailQuoted >actual &&
+	test_cmp expect actual
 
-ok 17 - core.logAllRefUpdates=true creates reflog in bare repository
+ok 7 - internal and more trailing whitespace, all quoted
 
-expecting success of 1400.18 'core.logAllRefUpdates=true does not create reflog by default': 
-	test_config core.logAllRefUpdates true &&
-	test_when_finished "git update-ref -d $outside" &&
-	git update-ref $outside $A &&
-	git rev-parse $A >expect &&
-	git rev-parse $outside >actual &&
-	test_cmp expect actual &&
-	test_must_fail git reflog exists $outside
+expecting success of 1300.8 'internal and more trailing whitespace, not all quoted': 
+	echo "big QQ blue Q Q" | q_to_tab >expect &&
+	git config --get section.sparseAndBiggerTailQuotedPlus >actual &&
+	test_cmp expect actual
 
-ok 18 - core.logAllRefUpdates=true does not create reflog by default
+ok 8 - internal and more trailing whitespace, not all quoted
 
-expecting success of 1400.19 'core.logAllRefUpdates=always creates reflog by default': 
-	test_config core.logAllRefUpdates always &&
-	test_when_finished "git update-ref -d $outside" &&
-	git update-ref $outside $A &&
-	git rev-parse $A >expect &&
-	git rev-parse $outside >actual &&
-	test_cmp expect actual &&
-	git reflog exists $outside
+expecting success of 1300.9 'leading and trailing whitespace': 
+	echo "big blue" >expect &&
+	git config --get section.headAndTail >actual &&
+	test_cmp expect actual
 
-ok 19 - core.logAllRefUpdates=always creates reflog by default
+ok 9 - leading and trailing whitespace
 
-expecting success of 1400.20 'core.logAllRefUpdates=always creates reflog for ORIG_HEAD': 
-	test_config core.logAllRefUpdates always &&
-	git update-ref ORIG_HEAD $A &&
-	git reflog exists ORIG_HEAD
+expecting success of 1300.10 'leading and trailing whitespace, all quoted': 
+	echo "Qbig blue " | q_to_tab >expect &&
+	git config --get section.headAndTailQuoted >actual &&
+	test_cmp expect actual
 
-ok 20 - core.logAllRefUpdates=always creates reflog for ORIG_HEAD
+ok 10 - leading and trailing whitespace, all quoted
 
-expecting success of 1400.21 '--no-create-reflog overrides core.logAllRefUpdates=always': 
-	test_config core.logAllRefUpdates true &&
-	test_when_finished "git update-ref -d $outside" &&
-	git update-ref --no-create-reflog $outside $A &&
-	git rev-parse $A >expect &&
-	git rev-parse $outside >actual &&
-	test_cmp expect actual &&
-	test_must_fail git reflog exists $outside
+expecting success of 1300.11 'leading and trailing whitespace, not all quoted': 
+	echo "Qbig blue " | q_to_tab >expect &&
+	git config --get section.headAndTailQuotedPlus >actual &&
+	test_cmp expect actual
 
-ok 21 - --no-create-reflog overrides core.logAllRefUpdates=always
+ok 11 - leading and trailing whitespace, not all quoted
 
-expecting success of 1400.22 'create refs/heads/main (by HEAD)': 
-	git update-ref HEAD $A &&
-	test $A = $(git show-ref -s --verify $m)
+expecting success of 1300.12 'inline comment': 
+	echo "big blue" >expect &&
+	git config --get section.annotated >actual &&
+	test_cmp expect actual
 
-ok 22 - create refs/heads/main (by HEAD)
+ok 12 - inline comment
 
-expecting success of 1400.23 'pack refs': 
-	git pack-refs --all
+expecting success of 1300.13 'inline comment, quoted': 
+	echo "big blue" >expect &&
+	git config --get section.annotatedQuoted >actual &&
+	test_cmp expect actual
 
-ok 23 - pack refs
+ok 13 - inline comment, quoted
 
-expecting success of 1400.24 'move refs/heads/main (by HEAD)': 
-	git update-ref HEAD $B $A &&
-	test $B = $(git show-ref -s --verify $m)
+expecting success of 1300.14 'clear default config': 
+	rm -f .git/config
 
-ok 24 - move refs/heads/main (by HEAD)
+ok 14 - clear default config
 
-expecting success of 1400.25 'delete refs/heads/main (by HEAD) should remove both packed and loose refs/heads/main': 
-	test_when_finished "git update-ref -d $m" &&
-	git update-ref -d HEAD $B &&
-	! grep "$m" .git/packed-refs &&
-	test_must_fail git show-ref --verify -q $m
+expecting success of 1300.15 'initial': 
+	git config ${mode_set} section.penguin "little blue" &&
+	test_cmp expect .git/config
 
-ok 25 - delete refs/heads/main (by HEAD) should remove both packed and loose refs/heads/main
+ok 15 - initial
 
-expecting success of 1400.26 'delete symref without dereference': 
-	test_when_finished "git update-ref -d $m" &&
-	echo foo >foo.c &&
-	git add foo.c &&
-	git commit -m foo &&
-	git symbolic-ref SYMREF $m &&
-	git update-ref --no-deref -d SYMREF &&
-	git show-ref --verify -q $m &&
-	test_must_fail git show-ref --verify -q SYMREF &&
-	test_must_fail git symbolic-ref SYMREF
+expecting success of 1300.16 'mixed case': 
+	git config ${mode_set} Section.Movie BadPhysics &&
+	test_cmp expect .git/config
 
-[main (root-commit) fc83d41] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.c
-fatal: ref SYMREF is not a symbolic ref
-ok 26 - delete symref without dereference
+ok 16 - mixed case
 
-expecting success of 1400.27 'delete symref without dereference when the referred ref is packed': 
-	test_when_finished "git update-ref -d $m" &&
-	echo foo >foo.c &&
-	git add foo.c &&
-	git commit -m foo &&
-	git symbolic-ref SYMREF $m &&
-	git pack-refs --all &&
-	git update-ref --no-deref -d SYMREF &&
-	git show-ref --verify -q $m &&
-	test_must_fail git show-ref --verify -q SYMREF &&
-	test_must_fail git symbolic-ref SYMREF
+expecting success of 1300.17 'similar section': 
+	git config ${mode_set} Sections.WhatEver Second &&
+	test_cmp expect .git/config
 
-[main (root-commit) fc83d41] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.c
-fatal: ref SYMREF is not a symbolic ref
-ok 27 - delete symref without dereference when the referred ref is packed
+ok 17 - similar section
 
-expecting success of 1400.28 'update-ref -d is not confused by self-reference': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF refs/heads/self" &&
-	git symbolic-ref refs/heads/self refs/heads/self &&
-	git symbolic-ref --no-recurse refs/heads/self &&
-	test_must_fail git update-ref -d refs/heads/self &&
-	git symbolic-ref --no-recurse refs/heads/self
+expecting success of 1300.18 'uppercase section': 
+	git config ${mode_set} SECTION.UPPERCASE true &&
+	test_cmp expect .git/config
 
-refs/heads/self
-error: multiple updates for 'refs/heads/self' (including one via symref 'refs/heads/self') are not allowed
-refs/heads/self
-ok 28 - update-ref -d is not confused by self-reference
+ok 18 - uppercase section
 
-expecting success of 1400.29 'update-ref --no-deref -d can delete self-reference': 
-	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF refs/heads/self" &&
-	git symbolic-ref refs/heads/self refs/heads/self &&
-	git symbolic-ref --no-recurse refs/heads/self &&
-	git update-ref --no-deref -d refs/heads/self &&
-	test_must_fail git show-ref --verify -q refs/heads/self
+expecting success of 1300.19 'replace with non-match': 
+	git config section.penguin kingpin !blue
 
-refs/heads/self
-ok 29 - update-ref --no-deref -d can delete self-reference
+ok 19 - replace with non-match
 
-expecting success of 1400.30 'update-ref --no-deref -d can delete reference to bad ref': 
-	>.git/refs/heads/bad &&
-	test_when_finished "rm -f .git/refs/heads/bad" &&
-	git symbolic-ref refs/heads/ref-to-bad refs/heads/bad &&
-	test_when_finished "git update-ref -d refs/heads/ref-to-bad" &&
-	git symbolic-ref --no-recurse refs/heads/ref-to-bad &&
-	git update-ref --no-deref -d refs/heads/ref-to-bad &&
-	test_must_fail git show-ref --verify -q refs/heads/ref-to-bad
+expecting success of 1300.20 'replace with non-match (actually matching)': 
+	git config section.penguin "very blue" !kingpin
 
-refs/heads/bad
-ok 30 - update-ref --no-deref -d can delete reference to bad ref
+ok 20 - replace with non-match (actually matching)
 
-expecting success of 1400.31 '(not) create HEAD with old sha1': 
-	test_must_fail git update-ref HEAD $A $B
+expecting success of 1300.21 'append comments': 
+	git config --replace-all --comment="Pygoscelis papua" section.penguin gentoo &&
+	git config ${mode_set} --comment="find fish" section.disposition peckish &&
+	git config ${mode_set} --comment="#abc" section.foo bar &&
 
-fatal: update_ref failed for ref 'HEAD': cannot lock ref 'HEAD': unable to resolve reference 'refs/heads/main'
-ok 31 - (not) create HEAD with old sha1
+	git config --comment="and comment" section.spsp value &&
+	git config --comment="	# and comment" section.htsp value &&
 
-expecting success of 1400.32 '(not) prior created .git/refs/heads/main': 
-	test_when_finished "git update-ref -d $m" &&
-	test_must_fail git show-ref --verify -q $m
+	test_cmp expect .git/config
 
-ok 32 - (not) prior created .git/refs/heads/main
+ok 21 - append comments
 
-expecting success of 1400.33 'create HEAD': 
-	git update-ref HEAD $A
+expecting success of 1300.22 'Prohibited LF in comment': 
+	test_must_fail git config ${mode_set} --comment="a${LF}b" section.k v
 
-ok 33 - create HEAD
+fatal: no multi-line comment allowed: 'a
+b'
+ok 22 - Prohibited LF in comment
 
-expecting success of 1400.34 '(not) change HEAD with wrong SHA1': 
-	test_must_fail git update-ref HEAD $B $Z
+expecting success of 1300.23 'non-match result': test_cmp expect .git/config
+ok 23 - non-match result
 
-fatal: update_ref failed for ref 'HEAD': cannot lock ref 'HEAD': reference already exists
-ok 34 - (not) change HEAD with wrong SHA1
+expecting success of 1300.24 'find mixed-case key by canonical name': 
+	test_cmp_config Second sections.whatever
 
-expecting success of 1400.35 '(not) changed .git/refs/heads/main': 
-	test_when_finished "git update-ref -d $m" &&
-	! test $B = $(git show-ref -s --verify $m)
+ok 24 - find mixed-case key by canonical name
 
-ok 35 - (not) changed .git/refs/heads/main
+expecting success of 1300.25 'find mixed-case key by non-canonical name': 
+	test_cmp_config Second SeCtIoNs.WhAtEvEr
 
-expecting success of 1400.36 'clean up reflog': 
-	test-tool ref-store main delete-reflog $m
+ok 25 - find mixed-case key by non-canonical name
 
-ok 36 - clean up reflog
+expecting success of 1300.26 'subsections are not canonicalized by git-config': 
+	cat >>.git/config <<-\EOF &&
+	[section.SubSection]
+	key = one
+	[section "SubSection"]
+	key = two
+	EOF
+	test_cmp_config one section.subsection.key &&
+	test_cmp_config two section.SubSection.key
 
-expecting success of 1400.37 'create refs/heads/main (logged by touch)': 
-	test_config core.logAllRefUpdates false &&
-	GIT_COMMITTER_DATE="2005-05-26 23:30" \
-	git update-ref --create-reflog HEAD $A -m "Initial Creation" &&
-	test $A = $(git show-ref -s --verify $m)
+ok 26 - subsections are not canonicalized by git-config
 
-ok 37 - create refs/heads/main (logged by touch)
+expecting success of 1300.27 'value for missing section and missing key is not printed': 
+		test_must_fail git config "$key" >out 2>err &&
+		test_must_be_empty out &&
+		test_must_be_empty err
+	
+ok 27 - value for missing section and missing key is not printed
 
-expecting success of 1400.38 'update refs/heads/main (logged by touch)': 
-	test_config core.logAllRefUpdates false &&
-	GIT_COMMITTER_DATE="2005-05-26 23:31" \
-	git update-ref HEAD $B $A -m "Switch" &&
-	test $B = $(git show-ref -s --verify $m)
+expecting success of 1300.28 'value for missing section and existing key is not printed': 
+		test_must_fail git config "$key" >out 2>err &&
+		test_must_be_empty out &&
+		test_must_be_empty err
+	
+ok 28 - value for missing section and existing key is not printed
 
-ok 38 - update refs/heads/main (logged by touch)
+expecting success of 1300.29 'value for existing section and missing key is not printed': 
+		test_must_fail git config "$key" >out 2>err &&
+		test_must_be_empty out &&
+		test_must_be_empty err
+	
+ok 29 - value for existing section and missing key is not printed
 
-expecting success of 1400.39 'set refs/heads/main (logged by touch)': 
-	test_config core.logAllRefUpdates false &&
-	GIT_COMMITTER_DATE="2005-05-26 23:41" \
-	git update-ref HEAD $A &&
-	test $A = $(git show-ref -s --verify $m)
+expecting success of 1300.30 'value for missing subsection and missing key is not printed': 
+		test_must_fail git config "$key" >out 2>err &&
+		test_must_be_empty out &&
+		test_must_be_empty err
+	
+ok 30 - value for missing subsection and missing key is not printed
 
-ok 39 - set refs/heads/main (logged by touch)
+expecting success of 1300.31 'value for existing subsection and missing key is not printed': 
+		test_must_fail git config "$key" >out 2>err &&
+		test_must_be_empty out &&
+		test_must_be_empty err
+	
+ok 31 - value for existing subsection and missing key is not printed
 
-expecting success of 1400.40 'verifying refs/heads/main's log (logged by touch)': 
-	test_when_finished "git update-ref -d $m && git reflog expire --expire=all --all && rm -rf actual expect" &&
-	test-tool ref-store main for-each-reflog-ent $m >actual &&
-	test_cmp actual expect
+expecting success of 1300.32 'value for missing subsection and existing key is not printed': 
+		test_must_fail git config "$key" >out 2>err &&
+		test_must_be_empty out &&
+		test_must_be_empty err
+	
+ok 32 - value for missing subsection and existing key is not printed
 
-ok 40 - verifying refs/heads/main's log (logged by touch)
+expecting success of 1300.33 'unset with cont. lines': 
+	git config ${mode_unset} beta.baz
 
-expecting success of 1400.41 'create refs/heads/main (logged by config)': 
-	test_config core.logAllRefUpdates true &&
-	GIT_COMMITTER_DATE="2005-05-26 23:32" \
-	git update-ref HEAD $A -m "Initial Creation" &&
-	test $A = $(git show-ref -s --verify $m)
+ok 33 - unset with cont. lines
 
-ok 41 - create refs/heads/main (logged by config)
+expecting success of 1300.34 'unset with cont. lines is correct': test_cmp expect .git/config
+ok 34 - unset with cont. lines is correct
 
-expecting success of 1400.42 'update refs/heads/main (logged by config)': 
-	test_config core.logAllRefUpdates true &&
-	GIT_COMMITTER_DATE="2005-05-26 23:33" \
-	git update-ref HEAD $B $A -m "Switch" &&
-	test $B = $(git show-ref -s --verify $m)
+expecting success of 1300.35 'multiple unset': 
+	git config ${mode_unset_all} beta.haha
 
-ok 42 - update refs/heads/main (logged by config)
+ok 35 - multiple unset
 
-expecting success of 1400.43 'set refs/heads/main (logged by config)': 
-	test_config core.logAllRefUpdates true &&
-	GIT_COMMITTER_DATE="2005-05-26 23:43" \
-	git update-ref HEAD $A &&
-	test $A = $(git show-ref -s --verify $m)
+expecting success of 1300.36 'multiple unset is correct': 
+	test_cmp expect .git/config
 
-ok 43 - set refs/heads/main (logged by config)
+ok 36 - multiple unset is correct
 
-expecting success of 1400.44 'verifying refs/heads/main's log (logged by config)': 
-	test_when_finished "git update-ref -d $m && git reflog expire --expire=all --all && rm -rf actual expect" &&
-	test-tool ref-store main for-each-reflog-ent $m >actual &&
-	test_cmp actual expect
+expecting success of 1300.37 '--replace-all missing value': 
+	test_must_fail git config ${mode_replace_all} beta.haha &&
+	test_cmp .git/config2 .git/config
 
-ok 44 - verifying refs/heads/main's log (logged by config)
+error: wrong number of arguments, should be from 2 to 3
+ok 37 - --replace-all missing value
 
-expecting success of 1400.45 'set up for querying the reflog': 
-	git update-ref -d $m &&
-	test-tool ref-store main delete-reflog $m &&
+expecting success of 1300.38 '--replace-all': 
+	git config ${mode_replace_all} beta.haha gamma
 
-	GIT_COMMITTER_DATE="1117150320 -0500" git update-ref $m $C &&
-	GIT_COMMITTER_DATE="1117150350 -0500" git update-ref $m $A &&
-	GIT_COMMITTER_DATE="1117150380 -0500" git update-ref $m $B &&
-	GIT_COMMITTER_DATE="1117150680 -0500" git update-ref $m $F &&
-	GIT_COMMITTER_DATE="1117150980 -0500" git update-ref $m $E &&
-	git update-ref $m $D &&
-	# Delete the last reflog entry so that the tip of m and the reflog for
-	# it disagree.
-	git reflog delete $m@{0} &&
+ok 38 - --replace-all
 
-	cat >expect <<-EOF &&
-	$Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
-	$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500
-	$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
-	$B $F $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500
-	$F $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500
-	EOF
-	test-tool ref-store main for-each-reflog-ent $m >actual &&
-	test_cmp expect actual
+expecting success of 1300.39 'all replaced': 
+	test_cmp expect .git/config
 
-ok 45 - set up for querying the reflog
+ok 39 - all replaced
 
-expecting success of 1400.46 'Query "main@{May 25 2005}" (before history)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{May 25 2005}" >o 2>e &&
-	echo "$C" >expect &&
-	test_cmp expect o &&
-	echo "warning: log for 'main' only goes back to $ed" >expect &&
-	test_cmp expect e
+expecting success of 1300.40 'really mean test': 
+	git config ${mode_set} beta.haha alpha &&
+	test_cmp expect .git/config
 
-ok 46 - Query "main@{May 25 2005}" (before history)
+ok 40 - really mean test
 
-expecting success of 1400.47 'Query main@{2005-05-25} (before history)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify main@{2005-05-25} >o 2>e &&
-	echo "$C" >expect &&
-	test_cmp expect o &&
-	echo "warning: log for 'main' only goes back to $ed" >expect &&
-	test_cmp expect e
+expecting success of 1300.41 'really really mean test': 
+	git config ${mode_set} nextsection.nonewline wow &&
+	test_cmp expect .git/config
 
-ok 47 - Query main@{2005-05-25} (before history)
+ok 41 - really really mean test
 
-expecting success of 1400.48 'Query "main@{May 26 2005 23:31:59}" (1 second before history)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{May 26 2005 23:31:59}" >o 2>e &&
-	echo "$C" >expect &&
-	test_cmp expect o &&
-	echo "warning: log for 'main' only goes back to $ed" >expect &&
-	test_cmp expect e
+expecting success of 1300.42 'get value': 
+	test_cmp_config alpha beta.haha
 
-ok 48 - Query "main@{May 26 2005 23:31:59}" (1 second before history)
+ok 42 - get value
 
-expecting success of 1400.49 'Query "main@{May 26 2005 23:32:00}" (exactly history start)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{May 26 2005 23:32:00}" >o 2>e &&
-	echo "$C" >expect &&
-	test_cmp expect o &&
-	test_must_be_empty e
+expecting success of 1300.43 'unset': 
+	git config ${mode_unset} beta.haha &&
+	test_cmp expect .git/config
 
-ok 49 - Query "main@{May 26 2005 23:32:00}" (exactly history start)
+ok 43 - unset
 
-expecting success of 1400.50 'Query "main@{May 26 2005 23:32:30}" (first non-creation change)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{May 26 2005 23:32:30}" >o 2>e &&
-	echo "$A" >expect &&
-	test_cmp expect o &&
-	test_must_be_empty e
+expecting success of 1300.44 'multivar': 
+	git config nextsection.NoNewLine "wow2 for me" "for me$" &&
+	test_cmp expect .git/config
 
-ok 50 - Query "main@{May 26 2005 23:32:30}" (first non-creation change)
+ok 44 - multivar
 
-expecting success of 1400.51 'Query "main@{2005-05-26 23:33:01}" (middle of history with gap)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{2005-05-26 23:33:01}" >o 2>e &&
-	echo "$B" >expect &&
-	test_cmp expect o
+expecting success of 1300.45 'non-match': 
+	git config --get nextsection.nonewline !for
 
-ok 51 - Query "main@{2005-05-26 23:33:01}" (middle of history with gap)
+wow
+ok 45 - non-match
 
-expecting success of 1400.52 'Query "main@{2005-05-26 23:38:00}" (middle of history)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{2005-05-26 23:38:00}" >o 2>e &&
-	echo "$F" >expect &&
-	test_cmp expect o &&
-	test_must_be_empty e
+expecting success of 1300.46 'non-match value': 
+	test_cmp_config wow --get nextsection.nonewline !for
 
-ok 52 - Query "main@{2005-05-26 23:38:00}" (middle of history)
+ok 46 - non-match value
 
-expecting success of 1400.53 'Query "main@{2005-05-26 23:43:00}" (exact end of history)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{2005-05-26 23:43:00}" >o 2>e &&
-	echo "$E" >expect &&
-	test_cmp expect o &&
-	test_must_be_empty e
+expecting success of 1300.47 'multi-valued get returns final one': 
+	test_cmp_config "wow2 for me" --get nextsection.nonewline
 
-ok 53 - Query "main@{2005-05-26 23:43:00}" (exact end of history)
+ok 47 - multi-valued get returns final one
 
-expecting success of 1400.54 'Query "main@{2005-05-28}" (past end of history)': 
-	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "main@{2005-05-28}" >o 2>e &&
-	echo "$D" >expect &&
-	test_cmp expect o &&
-	test_grep -F "warning: log for ref $m unexpectedly ended on $ld" e
+expecting success of 1300.48 'multi-valued get-all returns all': 
+	cat >expect <<-\EOF &&
+	wow
+	wow2 for me
+	EOF
+	git config ${mode_get_all} nextsection.nonewline >actual &&
+	test_cmp expect actual
 
-warning: log for ref refs/heads/main unexpectedly ended on Thu, 26 May 2005 18:43:00 -0500
-ok 54 - Query "main@{2005-05-28}" (past end of history)
+ok 48 - multi-valued get-all returns all
 
-expecting success of 1400.55 'query reflog with gap': 
-	test_when_finished "git update-ref -d $m" &&
+expecting success of 1300.49 'multivar replace': 
+	git config nextsection.nonewline "wow3" "wow$" &&
+	test_cmp expect .git/config
 
-	GIT_COMMITTER_DATE="1117150320 -0500" git update-ref $m $A &&
-	GIT_COMMITTER_DATE="1117150380 -0500" git update-ref $m $B &&
-	GIT_COMMITTER_DATE="1117150480 -0500" git update-ref $m $C &&
-	GIT_COMMITTER_DATE="1117150580 -0500" git update-ref $m $D &&
-	GIT_COMMITTER_DATE="1117150680 -0500" git update-ref $m $F &&
-	git reflog delete $m@{2} &&
+ok 49 - multivar replace
 
-	git rev-parse --verify "main@{2005-05-26 23:33:01}" >actual 2>stderr &&
-	echo "$B" >expect &&
-	test_cmp expect actual &&
-	test_grep -F "warning: log for ref $m has gap after $gd" stderr
+expecting success of 1300.50 'ambiguous unset': 
+	test_must_fail git config ${mode_unset} nextsection.nonewline
 
-warning: log for ref refs/heads/main has gap after Thu, 26 May 2005 18:33:00 -0500
-ok 55 - query reflog with gap
+warning: nextsection.nonewline has multiple values
+ok 50 - ambiguous unset
 
-expecting success of 1400.56 'creating initial files': 
-	test_when_finished rm -f M &&
-	echo TEST >F &&
-	git add F &&
-	GIT_AUTHOR_DATE="2005-05-26 23:30" \
-	GIT_COMMITTER_DATE="2005-05-26 23:30" git commit -m add -a &&
-	h_TEST=$(git rev-parse --verify HEAD) &&
-	echo The other day this did not work. >M &&
-	echo And then Bob told me how to fix it. >>M &&
-	echo OTHER >F &&
-	GIT_AUTHOR_DATE="2005-05-26 23:41" \
-	GIT_COMMITTER_DATE="2005-05-26 23:41" git commit -F M -a &&
-	h_OTHER=$(git rev-parse --verify HEAD) &&
-	GIT_AUTHOR_DATE="2005-05-26 23:44" \
-	GIT_COMMITTER_DATE="2005-05-26 23:44" git commit --amend &&
-	h_FIXED=$(git rev-parse --verify HEAD) &&
-	echo Merged initial commit and a later commit. >M &&
-	echo $h_TEST >.git/MERGE_HEAD &&
-	GIT_AUTHOR_DATE="2005-05-26 23:45" \
-	GIT_COMMITTER_DATE="2005-05-26 23:45" git commit -F M &&
-	h_MERGED=$(git rev-parse --verify HEAD)
+expecting success of 1300.51 'invalid unset': 
+	test_must_fail git config ${mode_unset} somesection.nonewline
 
-[main (root-commit) 0c23f5f] add
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 F
- create mode 100644 foo.c
-[main d3968db] The other day this did not work. And then Bob told me how to fix it.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e66de33] The other day this did not work. And then Bob told me how to fix it.
- Author: A U Thor <author@example.com>
- Date: Thu May 26 23:41:00 2005 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 29d1ccd] Merged initial commit and a later commit.
- Author: A U Thor <author@example.com>
-ok 56 - creating initial files
+ok 51 - invalid unset
 
-expecting success of 1400.57 'git commit logged updates': 
-	test-tool ref-store main for-each-reflog-ent $m >actual &&
-	test_cmp expect actual
+expecting success of 1300.52 'multivar unset': 
+	case "$mode" in
+	legacy)
+		git config --unset nextsection.nonewline "wow3$";;
+	subcommands)
+		git config unset --value="wow3$" nextsection.nonewline;;
+	esac &&
+	test_cmp expect .git/config
 
-ok 57 - git commit logged updates
+ok 52 - multivar unset
 
-expecting success of 1400.58 'git cat-file blob main:F (expect OTHER)': 
-	test OTHER = $(git cat-file blob main:F)
+expecting success of 1300.53 'invalid key': test_must_fail git config inval.2key blabla
+error: invalid key: inval.2key
+ok 53 - invalid key
 
-ok 58 - git cat-file blob main:F (expect OTHER)
+expecting success of 1300.54 'correct key': git config 123456.a123 987
+ok 54 - correct key
 
-expecting success of 1400.59 'git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)': 
-	test TEST = $(git cat-file blob "main@{2005-05-26 23:30}:F")
+expecting success of 1300.55 'hierarchical section': 
+	git config Version.1.2.3eX.Alpha beta
 
-ok 59 - git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)
+ok 55 - hierarchical section
 
-expecting success of 1400.60 'git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)': 
-	test OTHER = $(git cat-file blob "main@{2005-05-26 23:42}:F")
+expecting success of 1300.56 'hierarchical section value': 
+	test_cmp expect .git/config
 
-ok 60 - git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)
+ok 56 - hierarchical section value
 
-expecting success of 1400.61 'given old value for missing pseudoref, do not create': 
-	test_must_fail git update-ref PSEUDOREF $A $B 2>err &&
-	test_must_fail git rev-parse PSEUDOREF &&
-	test_grep "unable to resolve reference" err
+expecting success of 1300.57 'working --list': 
+	git config ${mode_prefix}list > output &&
+	test_cmp expect output
 
-fatal: ambiguous argument 'PSEUDOREF': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-PSEUDOREF
-fatal: update_ref failed for ref 'PSEUDOREF': cannot lock ref 'PSEUDOREF': unable to resolve reference 'PSEUDOREF'
-ok 61 - given old value for missing pseudoref, do not create
+ok 57 - working --list
 
-expecting success of 1400.62 'create pseudoref': 
-	git update-ref PSEUDOREF $A &&
-	test $A = $(git show-ref -s --verify PSEUDOREF)
+expecting success of 1300.58 '--list without repo produces empty output': 
+	git --git-dir=nonexistent config ${mode_prefix}list >output &&
+	test_must_be_empty output
 
-ok 62 - create pseudoref
+ok 58 - --list without repo produces empty output
 
-expecting success of 1400.63 'overwrite pseudoref with no old value given': 
-	git update-ref PSEUDOREF $B &&
-	test $B = $(git show-ref -s --verify PSEUDOREF)
+expecting success of 1300.59 '--name-only --list': 
+	git config ${mode_prefix}list --name-only >output &&
+	test_cmp expect output
 
-ok 63 - overwrite pseudoref with no old value given
+ok 59 - --name-only --list
 
-expecting success of 1400.64 'overwrite pseudoref with correct old value': 
-	git update-ref PSEUDOREF $C $B &&
-	test $C = $(git show-ref -s --verify PSEUDOREF)
+expecting success of 1300.60 '--get-regexp': 
+	git config ${mode_get_regexp} in >output &&
+	test_cmp expect output
 
-ok 64 - overwrite pseudoref with correct old value
+ok 60 - --get-regexp
 
-expecting success of 1400.65 'do not overwrite pseudoref with wrong old value': 
-	test_must_fail git update-ref PSEUDOREF $D $E 2>err &&
-	test $C = $(git show-ref -s --verify PSEUDOREF) &&
-	test_grep "cannot lock ref.*expected" err
+expecting success of 1300.61 '--name-only --get-regexp': 
+	git config ${mode_get_regexp} --name-only in >output &&
+	test_cmp expect output
 
-fatal: update_ref failed for ref 'PSEUDOREF': cannot lock ref 'PSEUDOREF': is at 3cceb89b690679aecbe1db39079f99221f1aaaa6 but expected a6166d2809963b1da1148e6922729c21214390c8
-ok 65 - do not overwrite pseudoref with wrong old value
+ok 61 - --name-only --get-regexp
 
-expecting success of 1400.66 'delete pseudoref': 
-	git update-ref -d PSEUDOREF &&
-	test_must_fail git show-ref -s --verify PSEUDOREF
+expecting success of 1300.62 '--add': 
+	git config --add nextsection.nonewline "wow4 for you" &&
+	git config ${mode_get_all} nextsection.nonewline > output &&
+	test_cmp expect output
 
-fatal: 'PSEUDOREF' - not a valid ref
-ok 66 - delete pseudoref
+ok 62 - --add
 
-expecting success of 1400.67 'do not delete pseudoref with wrong old value': 
-	git update-ref PSEUDOREF $A &&
-	test_must_fail git update-ref -d PSEUDOREF $B 2>err &&
-	test $A = $(git show-ref -s --verify PSEUDOREF) &&
-	test_grep "cannot lock ref.*expected" err
+expecting success of 1300.63 'get variable with no value': 
+	git config --get novalue.variable ^$
 
-error: cannot lock ref 'PSEUDOREF': is at 102939797ab91a4f201d131418d2c9d919dcdd2c but expected 56d5c1374e8028a1e122ab046ab7b98165342dc4
-ok 67 - do not delete pseudoref with wrong old value
 
-expecting success of 1400.68 'delete pseudoref with correct old value': 
-	git update-ref -d PSEUDOREF $A &&
-	test_must_fail git show-ref -s --verify PSEUDOREF
+ok 63 - get variable with no value
 
-fatal: 'PSEUDOREF' - not a valid ref
-ok 68 - delete pseudoref with correct old value
+expecting success of 1300.64 'get variable with empty value': 
+	git config --get emptyvalue.variable ^$
 
-expecting success of 1400.69 'create pseudoref with old OID zero': 
-	git update-ref PSEUDOREF $A $Z &&
-	test $A = $(git show-ref -s --verify PSEUDOREF)
 
-ok 69 - create pseudoref with old OID zero
+ok 64 - get variable with empty value
 
-expecting success of 1400.70 'do not overwrite pseudoref with old OID zero': 
-	test_when_finished git update-ref -d PSEUDOREF &&
-	test_must_fail git update-ref PSEUDOREF $B $Z 2>err &&
-	test $A = $(git show-ref -s --verify PSEUDOREF) &&
-	test_grep "already exists" err
+expecting success of 1300.65 'get-regexp variable with no value': 
+	git config ${mode_get_regexp} novalue > output &&
+	test_cmp expect output
 
-fatal: update_ref failed for ref 'PSEUDOREF': cannot lock ref 'PSEUDOREF': reference already exists
-ok 70 - do not overwrite pseudoref with old OID zero
+ok 65 - get-regexp variable with no value
 
-expecting success of 1400.71 'stdin test setup': 
-	echo "$pws" >"$pws" &&
-	git add -- "$pws" &&
-	git commit -m "$pws"
+expecting success of 1300.66 'get-regexp --bool variable with no value': 
+	git config ${mode_get_regexp} --bool novalue > output &&
+	test_cmp expect output
 
-[main 536da9b] path with space
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path with space
-ok 71 - stdin test setup
+ok 66 - get-regexp --bool variable with no value
 
-expecting success of 1400.72 '-z fails without --stdin': 
-	test_must_fail git update-ref -z $m $m $m 2>err &&
-	test_grep "usage: git update-ref" err
+expecting success of 1300.67 'get-regexp variable with empty value': 
+	git config ${mode_get_regexp} emptyvalue > output &&
+	test_cmp expect output
 
-usage: git update-ref [<options>] -d <refname> [<old-oid>]
-ok 72 - -z fails without --stdin
+ok 67 - get-regexp variable with empty value
 
-expecting success of 1400.73 'stdin works with no input': 
-	>stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse --verify -q $m
+expecting success of 1300.68 'get bool variable with no value': 
+	git config --bool novalue.variable > output &&
+	test_cmp expect output
 
-536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
-ok 73 - stdin works with no input
+ok 68 - get bool variable with no value
 
-expecting success of 1400.74 'stdin fails on empty line': 
-	echo "" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: empty command in input" err
+expecting success of 1300.69 'get bool variable with empty value': 
+	git config --bool emptyvalue.variable > output &&
+	test_cmp expect output
 
-fatal: empty command in input
-ok 74 - stdin fails on empty line
+ok 69 - get bool variable with empty value
 
-expecting success of 1400.75 'stdin fails on only whitespace': 
-	echo " " >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: whitespace before command:  " err
+expecting success of 1300.70 'no arguments, but no crash': 
+	test_must_fail git config >output 2>&1 &&
+	echo "error: no action specified" >expect &&
+	test_cmp expect output
 
-fatal: whitespace before command:  
-ok 75 - stdin fails on only whitespace
+ok 70 - no arguments, but no crash
 
-expecting success of 1400.76 'stdin fails on leading whitespace': 
-	echo " create $a $m" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: whitespace before command:  create $a $m" err
+expecting success of 1300.71 'new section is partial match of another': 
+	git config a.x y &&
+	test_cmp expect .git/config
 
-fatal: whitespace before command:  create refs/heads/a refs/heads/main
-ok 76 - stdin fails on leading whitespace
+ok 71 - new section is partial match of another
 
-expecting success of 1400.77 'stdin fails on unknown command': 
-	echo "unknown $a" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: unknown command: unknown $a" err
+expecting success of 1300.72 'new variable inserts into proper section': 
+	git config b.x y &&
+	git config a.b c &&
+	test_cmp expect .git/config
 
-fatal: unknown command: unknown refs/heads/a
-ok 77 - stdin fails on unknown command
+ok 72 - new variable inserts into proper section
 
-expecting success of 1400.78 'stdin fails on unbalanced quotes': 
-	echo "create $a \"main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: badly quoted argument: \\\"main" err
+expecting success of 1300.73 'alternative --file (non-existing file should fail)': 
+	test_must_fail git config --file non-existing-config -l &&
+	test_must_fail git config --file non-existing-config test.xyzzy
 
-fatal: badly quoted argument: "main
-ok 78 - stdin fails on unbalanced quotes
+fatal: unable to read config file 'non-existing-config': No such file or directory
+ok 73 - alternative --file (non-existing file should fail)
 
-expecting success of 1400.79 'stdin fails on invalid escape': 
-	echo "create $a \"ma\zn\"" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err
+expecting success of 1300.74 'alternative GIT_CONFIG': 
+	GIT_CONFIG=other-config git config ${mode_prefix}list >output &&
+	test_cmp expect output
 
-fatal: badly quoted argument: "ma\zn"
-ok 79 - stdin fails on invalid escape
+ok 74 - alternative GIT_CONFIG
 
-expecting success of 1400.80 'stdin fails on junk after quoted argument': 
-	echo "create \"$a\"main" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: unexpected character after quoted argument: \\\"$a\\\"main" err
+expecting success of 1300.75 'alternative GIT_CONFIG (--file)': 
+	git config ${mode_prefix}list --file other-config >output &&
+	test_cmp expect output
 
-fatal: unexpected character after quoted argument: "refs/heads/a"main
-ok 80 - stdin fails on junk after quoted argument
+ok 75 - alternative GIT_CONFIG (--file)
 
-expecting success of 1400.81 'stdin fails create with no ref': 
-	echo "create " >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: create: missing <ref>" err
+expecting success of 1300.76 'alternative GIT_CONFIG (--file=-)': 
+	git config ${mode_prefix}list --file - <other-config >output &&
+	test_cmp expect output
 
-fatal: create: missing <ref>
-ok 81 - stdin fails create with no ref
+ok 76 - alternative GIT_CONFIG (--file=-)
 
-expecting success of 1400.82 'stdin fails create with no new value': 
-	echo "create $a" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: create $a: missing <new-oid>" err
+expecting success of 1300.77 'setting a value in stdin is an error': 
+	test_must_fail git config --file - some.value foo
 
-fatal: create refs/heads/a: missing <new-oid>
-ok 82 - stdin fails create with no new value
+fatal: writing to stdin is not supported
+ok 77 - setting a value in stdin is an error
 
-expecting success of 1400.83 'stdin fails create with too many arguments': 
-	echo "create $a $m $m" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: create $a: extra input:  $m" err
+expecting success of 1300.78 'editing stdin is an error': 
+	test_must_fail git config ${mode_prefix}edit --file -
 
-fatal: create refs/heads/a: extra input:  refs/heads/main
-ok 83 - stdin fails create with too many arguments
+fatal: editing stdin is not supported
+ok 78 - editing stdin is an error
 
-expecting success of 1400.84 'stdin fails update with no ref': 
-	echo "update " >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: update: missing <ref>" err
+expecting success of 1300.79 'refer config from subdirectory': 
+	test_when_finished "rm -r x" &&
+	mkdir x &&
+	test_cmp_config -C x strasse --file=../other-config --get ein.bahn
 
-fatal: update: missing <ref>
-ok 84 - stdin fails update with no ref
+ok 79 - refer config from subdirectory
 
-expecting success of 1400.85 'stdin fails update with no new value': 
-	echo "update $a" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: update $a: missing <new-oid>" err
+expecting success of 1300.80 '--set in alternative file': 
+	git config --file=other-config anwohner.park ausweis &&
+	test_cmp expect other-config
 
-fatal: update refs/heads/a: missing <new-oid>
-ok 85 - stdin fails update with no new value
+ok 80 - --set in alternative file
 
-expecting success of 1400.86 'stdin fails update with too many arguments': 
-	echo "update $a $m $m $m" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: update $a: extra input:  $m" err
+expecting success of 1300.81 'rename section': 
+	git config ${mode_prefix}rename-section branch.eins branch.zwei
 
-fatal: update refs/heads/a: extra input:  refs/heads/main
-ok 86 - stdin fails update with too many arguments
+ok 81 - rename section
 
-expecting success of 1400.87 'stdin fails delete with no ref': 
-	echo "delete " >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: delete: missing <ref>" err
+expecting success of 1300.82 'rename succeeded': 
+	test_cmp expect .git/config
 
-fatal: delete: missing <ref>
-ok 87 - stdin fails delete with no ref
+ok 82 - rename succeeded
 
-expecting success of 1400.88 'stdin fails delete with too many arguments': 
-	echo "delete $a $m $m" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: delete $a: extra input:  $m" err
+expecting success of 1300.83 'rename non-existing section': 
+	test_must_fail git config ${mode_prefix}rename-section \
+		branch."world domination" branch.drei
 
-fatal: delete refs/heads/a: extra input:  refs/heads/main
-ok 88 - stdin fails delete with too many arguments
+fatal: no such section: branch.world domination
+ok 83 - rename non-existing section
 
-expecting success of 1400.89 'stdin fails verify with too many arguments': 
-	echo "verify $a $m $m" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: verify $a: extra input:  $m" err
+expecting success of 1300.84 'rename succeeded': 
+	test_cmp expect .git/config
 
-fatal: verify refs/heads/a: extra input:  refs/heads/main
-ok 89 - stdin fails verify with too many arguments
+ok 84 - rename succeeded
 
-expecting success of 1400.90 'stdin fails option with unknown name': 
-	echo "option unknown" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: option unknown: unknown" err
+expecting success of 1300.85 'rename another section': 
+	git config ${mode_prefix}rename-section branch."1 234 blabl/a" branch.drei
 
-fatal: option unknown: unknown
-ok 90 - stdin fails option with unknown name
+ok 85 - rename another section
 
-expecting success of 1400.91 'stdin fails with duplicate refs': 
-	cat >stdin <<-EOF &&
-	create $a $m
-	create $b $m
-	create $a $m
-	EOF
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	test_grep "fatal: multiple updates for ref '$a' not allowed" err
+expecting success of 1300.86 'rename succeeded': 
+	test_cmp expect .git/config
 
-fatal: multiple updates for ref 'refs/heads/a' not allowed
-ok 91 - stdin fails with duplicate refs
+ok 86 - rename succeeded
 
-expecting success of 1400.92 'stdin create ref works': 
-	echo "create $a $m" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
+expecting success of 1300.87 'rename a section with a var on the same line': 
+	git config ${mode_prefix}rename-section branch.vier branch.zwei
 
-ok 92 - stdin create ref works
+ok 87 - rename a section with a var on the same line
 
-expecting success of 1400.93 'stdin does not create reflogs by default': 
-	test_when_finished "git update-ref -d $outside" &&
-	echo "create $outside $m" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $outside >actual &&
-	test_cmp expect actual &&
-	test_must_fail git reflog exists $outside
+expecting success of 1300.88 'rename succeeded': 
+	test_cmp expect .git/config
 
-ok 93 - stdin does not create reflogs by default
+ok 88 - rename succeeded
 
-expecting success of 1400.94 'stdin creates reflogs with --create-reflog': 
-	test_when_finished "git update-ref -d $outside" &&
-	echo "create $outside $m" >stdin &&
-	git update-ref --create-reflog --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $outside >actual &&
-	test_cmp expect actual &&
-	git reflog exists $outside
+expecting success of 1300.89 'renaming empty section name is rejected': 
+	test_must_fail git config ${mode_prefix}rename-section branch.zwei ""
 
-ok 94 - stdin creates reflogs with --create-reflog
+error: invalid section name: 
+ok 89 - renaming empty section name is rejected
 
-expecting success of 1400.95 'stdin succeeds with quoted argument': 
-	git update-ref -d $a &&
-	echo "create $a \"$m\"" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
+expecting success of 1300.90 'renaming to bogus section is rejected': 
+	test_must_fail git config ${mode_prefix}rename-section branch.zwei "bogus name"
 
-ok 95 - stdin succeeds with quoted argument
+error: invalid section name: bogus name
+ok 90 - renaming to bogus section is rejected
 
-expecting success of 1400.96 'stdin succeeds with escaped character': 
-	git update-ref -d $a &&
-	echo "create $a \"ma\\151n\"" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
+expecting success of 1300.91 'renaming a section with a long line': 
+	{
+		printf "[b]\\n" &&
+		printf "  c = d %1024s [a] e = f\\n" " " &&
+		printf "[a] g = h\\n"
+	} >y &&
+	git config ${mode_prefix}rename-section -f y a xyz &&
+	test_must_fail git config -f y b.e
 
-ok 96 - stdin succeeds with escaped character
+ok 91 - renaming a section with a long line
 
-expecting success of 1400.97 'stdin update ref creates with zero old value': 
-	echo "update $b $m $Z" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual &&
-	git update-ref -d $b
+expecting success of 1300.92 'renaming an embedded section with a long line': 
+	{
+		printf "[b]\\n" &&
+		printf "  c = d %1024s [a] [foo] e = f\\n" " " &&
+		printf "[a] g = h\\n"
+	} >y &&
+	git config ${mode_prefix}rename-section -f y a xyz &&
+	test_must_fail git config -f y foo.e
 
-ok 97 - stdin update ref creates with zero old value
+ok 92 - renaming an embedded section with a long line
 
-expecting success of 1400.98 'stdin update ref creates with empty old value': 
-	echo "update $b $m $E" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
+expecting success of 1300.93 'renaming a section with an overly-long line': 
+	{
+		printf "[b]\\n" &&
+		printf "  c = d %525000s e" " " &&
+		printf "[a] g = h\\n"
+	} >y &&
+	test_must_fail git config ${mode_prefix}rename-section -f y a xyz 2>err &&
+	grep "refusing to work with overly long line in .y. on line 2" err
 
-ok 98 - stdin update ref creates with empty old value
+error: refusing to work with overly long line in 'y' on line 2
+ok 93 - renaming a section with an overly-long line
 
-expecting success of 1400.99 'stdin create ref works with path with space to blob': 
-	echo "create refs/blobs/pws \"$m:$pws\"" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse "$m:$pws" >expect &&
-	git rev-parse refs/blobs/pws >actual &&
-	test_cmp expect actual &&
-	git update-ref -d refs/blobs/pws
+expecting success of 1300.94 'remove section': 
+	git config ${mode_prefix}remove-section branch.zwei
 
-ok 99 - stdin create ref works with path with space to blob
+ok 94 - remove section
 
-expecting success of 1400.100 'stdin update ref fails with wrong old value': 
-	echo "update $c $m $m~1" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: cannot lock ref '$c'" err &&
-	test_must_fail git rev-parse --verify -q $c
+expecting success of 1300.95 'section was removed properly': 
+	test_cmp expect .git/config
 
-fatal: cannot lock ref 'refs/heads/c': unable to resolve reference 'refs/heads/c'
-ok 100 - stdin update ref fails with wrong old value
+ok 95 - section was removed properly
 
-expecting success of 1400.101 'stdin update ref fails with bad old value': 
-	echo "update $c $m does-not-exist" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: update $c: invalid <old-oid>: does-not-exist" err &&
-	test_must_fail git rev-parse --verify -q $c
+expecting success of 1300.96 'section ending': 
+	rm -f .git/config &&
+	git config ${mode_set} gitcvs.enabled true &&
+	git config ${mode_set} gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
+	git config ${mode_set} gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
+	test_cmp expect .git/config
 
-fatal: update refs/heads/c: invalid <old-oid>: does-not-exist
-ok 101 - stdin update ref fails with bad old value
 
-expecting success of 1400.102 'stdin create ref fails with bad new value': 
-	echo "create $c does-not-exist" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: create $c: invalid <new-oid>: does-not-exist" err &&
-	test_must_fail git rev-parse --verify -q $c
+ok 96 - section ending
 
-fatal: create refs/heads/c: invalid <new-oid>: does-not-exist
-ok 102 - stdin create ref fails with bad new value
+expecting success of 1300.97 'numbers': 
+	git config ${mode_set} kilo.gram 1k &&
+	git config ${mode_set} mega.ton 1m &&
+	echo 1024 >expect &&
+	echo 1048576 >>expect &&
+	git config --int --get kilo.gram >actual &&
+	git config --int --get mega.ton >>actual &&
+	test_cmp expect actual
 
-expecting success of 1400.103 'stdin create ref fails with zero new value': 
-	echo "create $c " >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: create $c: zero <new-oid>" err &&
-	test_must_fail git rev-parse --verify -q $c
+ok 97 - numbers
 
-fatal: create refs/heads/c: zero <new-oid>
-ok 103 - stdin create ref fails with zero new value
+expecting success of 1300.98 '--int is at least 64 bits': 
+	git config ${mode_set} giga.watts 121g &&
+	echo  >expect &&
+	test_cmp_config 129922760704 --int --get giga.watts
 
-expecting success of 1400.104 'stdin update ref works with right old value': 
-	echo "update $b $m~1 $m" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
+ok 98 - --int is at least 64 bits
 
-ok 104 - stdin update ref works with right old value
+expecting success of 1300.99 'invalid unit': 
+	git config ${mode_set} aninvalid.unit "1auto" &&
+	test_cmp_config 1auto aninvalid.unit &&
+	test_must_fail git config --int --get aninvalid.unit 2>actual &&
+	test_grep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
 
-expecting success of 1400.105 'stdin delete ref fails with wrong old value': 
-	echo "delete $a $m~1" >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: cannot lock ref '$a'" err &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
+fatal: bad numeric config value '1auto' for 'aninvalid.unit' in file .git/config: invalid unit
+ok 99 - invalid unit
 
-fatal: cannot lock ref 'refs/heads/a': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
-ok 105 - stdin delete ref fails with wrong old value
+expecting success of 1300.100 'invalid unit boolean': 
+	git config ${mode_set} commit.gpgsign "1true" &&
+	test_cmp_config 1true commit.gpgsign &&
+	test_must_fail git config --bool --get commit.gpgsign 2>actual &&
+	test_grep "bad boolean config value .1true. for .commit.gpgsign." actual
 
-expecting success of 1400.106 'stdin delete ref fails with zero old value': 
-	echo "delete $a " >stdin &&
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: delete $a: zero <old-oid>" err &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
+fatal: bad boolean config value '1true' for 'commit.gpgsign'
+ok 100 - invalid unit boolean
 
-fatal: delete refs/heads/a: zero <old-oid>
-ok 106 - stdin delete ref fails with zero old value
+expecting success of 1300.101 'line number is reported correctly': 
+	printf "[bool]\n\tvar\n" >invalid &&
+	test_must_fail git config -f invalid --path bool.var 2>actual &&
+	test_grep "line 2" actual
 
-expecting success of 1400.107 'stdin update symref works option no-deref': 
-	git symbolic-ref TESTSYMREF $b &&
-	cat >stdin <<-EOF &&
-	option no-deref
-	update TESTSYMREF $a $b
-	EOF
-	git update-ref --stdin <stdin &&
-	git rev-parse TESTSYMREF >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
+fatal: bad config line 2 in file invalid
+ok 101 - line number is reported correctly
 
-ok 107 - stdin update symref works option no-deref
+expecting success of 1300.102 'invalid stdin config': 
+	echo "[broken" | test_must_fail git config ${mode_prefix}list --file - >output 2>&1 &&
+	test_grep "bad config line 1 in standard input" output
 
-expecting success of 1400.108 'stdin delete symref works option no-deref': 
-	git symbolic-ref TESTSYMREF $b &&
-	cat >stdin <<-EOF &&
-	option no-deref
-	delete TESTSYMREF $b
-	EOF
-	git update-ref --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q TESTSYMREF &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
+fatal: bad config line 1 in standard input
+ok 102 - invalid stdin config
 
-ok 108 - stdin delete symref works option no-deref
+expecting success of 1300.103 'bool': 
 
-expecting success of 1400.109 'stdin update symref works flag --no-deref': 
-	git symbolic-ref TESTSYMREFONE $b &&
-	git symbolic-ref TESTSYMREFTWO $b &&
-	cat >stdin <<-EOF &&
-	update TESTSYMREFONE $a $b
-	update TESTSYMREFTWO $a $b
-	EOF
-	git update-ref --no-deref --stdin <stdin &&
-	git rev-parse TESTSYMREFONE TESTSYMREFTWO >expect &&
-	git rev-parse $a $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
+	git config ${mode_set} bool.true1 01 &&
+	git config ${mode_set} bool.true2 -1 &&
+	git config ${mode_set} bool.true3 YeS &&
+	git config ${mode_set} bool.true4 true &&
+	git config ${mode_set} bool.false1 000 &&
+	git config ${mode_set} bool.false2 "" &&
+	git config ${mode_set} bool.false3 nO &&
+	git config ${mode_set} bool.false4 FALSE &&
+	rm -f result &&
+	for i in 1 2 3 4
+	do
+	    git config --bool --get bool.true$i >>result &&
+	    git config --bool --get bool.false$i >>result || return 1
+	done &&
+	test_cmp expect result
+ok 103 - bool
 
-ok 109 - stdin update symref works flag --no-deref
+expecting success of 1300.104 'invalid bool (--get)': 
 
-expecting success of 1400.110 'stdin delete symref works flag --no-deref': 
-	git symbolic-ref TESTSYMREFONE $b &&
-	git symbolic-ref TESTSYMREFTWO $b &&
-	cat >stdin <<-EOF &&
-	delete TESTSYMREFONE $b
-	delete TESTSYMREFTWO $b
-	EOF
-	git update-ref --no-deref --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q TESTSYMREFONE &&
-	test_must_fail git rev-parse --verify -q TESTSYMREFTWO &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
+	git config ${mode_set} bool.nobool foobar &&
+	test_must_fail git config --bool --get bool.nobool
+fatal: bad boolean config value 'foobar' for 'bool.nobool'
+ok 104 - invalid bool (--get)
 
-ok 110 - stdin delete symref works flag --no-deref
+expecting success of 1300.105 'invalid bool (set)': 
 
-expecting success of 1400.111 'stdin delete ref works with right old value': 
-	echo "delete $b $m~1" >stdin &&
-	git update-ref --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q $b
+	test_must_fail git config --bool bool.nobool foobar
+fatal: bad boolean config value 'foobar' for 'bool.nobool'
+ok 105 - invalid bool (set)
 
-ok 111 - stdin delete ref works with right old value
+expecting success of 1300.106 'set --bool': 
 
-expecting success of 1400.112 'stdin update/create/verify combination works': 
-	cat >stdin <<-EOF &&
-	update $a $m
-	create $b $m
-	verify $c
-	EOF
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual &&
-	test_must_fail git rev-parse --verify -q $c
+	rm -f .git/config &&
+	git config --bool bool.true1 01 &&
+	git config --bool bool.true2 -1 &&
+	git config --bool bool.true3 YeS &&
+	git config --bool bool.true4 true &&
+	git config --bool bool.false1 000 &&
+	git config --bool bool.false2 "" &&
+	git config --bool bool.false3 nO &&
+	git config --bool bool.false4 FALSE &&
+	test_cmp expect .git/config
+ok 106 - set --bool
 
-ok 112 - stdin update/create/verify combination works
+expecting success of 1300.107 'set --int': 
 
-expecting success of 1400.113 'stdin verify succeeds for correct value': 
-	test-tool ref-store main for-each-reflog-ent $m >before &&
-	git rev-parse $m >expect &&
-	echo "verify $m $m" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual &&
-	test-tool ref-store main for-each-reflog-ent $m >after &&
-	test_cmp before after
+	rm -f .git/config &&
+	git config --int int.val1 01 &&
+	git config --int int.val2 -1 &&
+	git config --int int.val3 5m &&
+	test_cmp expect .git/config
 
-ok 113 - stdin verify succeeds for correct value
+ok 107 - set --int
 
-expecting success of 1400.114 'stdin verify succeeds for missing reference': 
-	test-tool ref-store main for-each-reflog-ent $m >before &&
-	echo "verify refs/heads/missing $Z" >stdin &&
-	git update-ref --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q refs/heads/missing &&
-	test-tool ref-store main for-each-reflog-ent $m >after &&
-	test_cmp before after
+expecting success of 1300.108 'get --bool-or-int': 
+	cat >.git/config <<-\EOF &&
+	[bool]
+	true1
+	true2 = true
+	false = false
+	[int]
+	int1 = 0
+	int2 = 1
+	int3 = -1
+	EOF
+	cat >expect <<-\EOF &&
+	true
+	true
+	false
+	0
+	1
+	-1
+	EOF
+	{
+		git config --bool-or-int bool.true1 &&
+		git config --bool-or-int bool.true2 &&
+		git config --bool-or-int bool.false &&
+		git config --bool-or-int int.int1 &&
+		git config --bool-or-int int.int2 &&
+		git config --bool-or-int int.int3
+	} >actual &&
+	test_cmp expect actual
 
-ok 114 - stdin verify succeeds for missing reference
+ok 108 - get --bool-or-int
 
-expecting success of 1400.115 'stdin verify treats no value as missing': 
-	echo "verify refs/heads/missing" >stdin &&
-	git update-ref --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q refs/heads/missing
+expecting success of 1300.109 'set --bool-or-int': 
+	rm -f .git/config &&
+	git config --bool-or-int bool.true1 true &&
+	git config --bool-or-int bool.false1 false &&
+	git config --bool-or-int bool.true2 yes &&
+	git config --bool-or-int bool.false2 no &&
+	git config --bool-or-int int.int1 0 &&
+	git config --bool-or-int int.int2 1 &&
+	git config --bool-or-int int.int3 -1 &&
+	test_cmp expect .git/config
 
-ok 115 - stdin verify treats no value as missing
+ok 109 - set --bool-or-int
 
-expecting success of 1400.116 'stdin verify fails for wrong value': 
-	git rev-parse $m >expect &&
-	echo "verify $m $m~1" >stdin &&
-	test_must_fail git update-ref --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual
+expecting success of 1300.110 'set --path': 
+	rm -f .git/config &&
+	git config --path path.home "~/" &&
+	git config --path path.normal "/dev/null" &&
+	git config --path path.trailingtilde "foo~" &&
+	test_cmp expect .git/config
+ok 110 - set --path
 
-fatal: cannot lock ref 'refs/heads/main': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
-ok 116 - stdin verify fails for wrong value
+expecting success of 1300.111 'get --path': 
+	git config --get --path path.home > result &&
+	git config --get --path path.normal >> result &&
+	git config --get --path path.trailingtilde >> result &&
+	test_cmp expect result
 
-expecting success of 1400.117 'stdin verify fails for mistaken null value': 
-	git rev-parse $m >expect &&
-	echo "verify $m $Z" >stdin &&
-	test_must_fail git update-ref --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual
+ok 111 - get --path
 
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 117 - stdin verify fails for mistaken null value
+expecting success of 1300.112 'get --path copes with unset $HOME': 
+	(
+		sane_unset HOME &&
+		test_must_fail git config --get --path path.home \
+			>result 2>msg &&
+		git config --get --path path.normal >>result &&
+		git config --get --path path.trailingtilde >>result
+	) &&
+	test_grep "[Ff]ailed to expand.*~/" msg &&
+	test_cmp expect result
 
-expecting success of 1400.118 'stdin verify fails for mistaken empty value': 
-	M=$(git rev-parse $m) &&
-	test_when_finished "git update-ref $m $M" &&
-	git rev-parse $m >expect &&
-	echo "verify $m" >stdin &&
-	test_must_fail git update-ref --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual
+fatal: failed to expand user dir in: '~/'
+ok 112 - get --path copes with unset $HOME
 
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 118 - stdin verify fails for mistaken empty value
+expecting success of 1300.113 'get --path barfs on boolean variable': 
+	echo "[path]bool" >.git/config &&
+	test_must_fail git config --get --path path.bool
 
-expecting success of 1400.119 'stdin update refs works with identity updates': 
-	cat >stdin <<-EOF &&
-	update $a $m $m
-	update $b $m $m
-	update $c $Z $E
+error: missing value for 'path.bool'
+fatal: bad config line 1 in file .git/config
+ok 113 - get --path barfs on boolean variable
+
+expecting success of 1300.114 'get --expiry-date': 
+	rel="3.weeks.5.days.00:00" &&
+	rel_out="$rel ->" &&
+	cat >.git/config <<-\EOF &&
+	[date]
+	valid1 = "3.weeks.5.days 00:00"
+	valid2 = "Fri Jun 4 15:46:55 2010"
+	valid3 = "2017/11/11 11:11:11PM"
+	valid4 = "2017/11/10 09:08:07 PM"
+	valid5 = "never"
+	invalid1 = "abc"
 	EOF
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $b >actual &&
+	cat >expect <<-EOF &&
+	$(test-tool date timestamp $rel)
+	1275666415
+	1510441871
+	1510348087
+	0
+	EOF
+	: "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&
+	{
+		echo "$rel_out $(git config --expiry-date date.valid1)" &&
+		git config --expiry-date date.valid2 &&
+		git config --expiry-date date.valid3 &&
+		git config --expiry-date date.valid4 &&
+		git config --expiry-date date.valid5
+	} >actual &&
 	test_cmp expect actual &&
-	test_must_fail git rev-parse --verify -q $c
+	test_must_fail git config --expiry-date date.invalid1
 
-ok 119 - stdin update refs works with identity updates
+error: 'abc' for 'date.invalid1' is not a valid timestamp
+fatal: bad config line 7 in file .git/config
+ok 114 - get --expiry-date
 
-expecting success of 1400.120 'stdin update refs fails with wrong old value': 
-	git update-ref $c $m &&
-	cat >stdin <<-EOF &&
-	update $a $m $m
-	update $b $m $m
-	update $c  
-	EOF
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: cannot lock ref '$c'" err &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual &&
-	git rev-parse $c >actual &&
+expecting success of 1300.115 'get --type=color': 
+	rm .git/config &&
+	git config ${mode_set} foo.color "red" &&
+	git config --get --type=color foo.color >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	echo "<RED>" >expect &&
 	test_cmp expect actual
 
-fatal: cannot lock ref 'refs/heads/c': reference already exists
-ok 120 - stdin update refs fails with wrong old value
+ok 115 - get --type=color
 
-expecting success of 1400.121 'stdin delete refs works with packed and loose refs': 
-	git pack-refs --all &&
-	git update-ref $c $m~1 &&
-	cat >stdin <<-EOF &&
-	delete $a $m
-	update $b $Z $m
-	update $c $E $m~1
-	EOF
-	git update-ref --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q $a &&
-	test_must_fail git rev-parse --verify -q $b &&
-	test_must_fail git rev-parse --verify -q $c
+expecting success of 1300.116 'set --type=color': 
+	rm .git/config &&
+	git config --type=color foo.color "red" &&
+	test_cmp expect .git/config
 
-ok 121 - stdin delete refs works with packed and loose refs
+ok 116 - set --type=color
 
-expecting success of 1400.122 'stdin -z works on empty input': 
-	>stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse --verify -q $m
+expecting success of 1300.117 'get --type=color barfs on non-color': 
+	echo "[foo]bar=not-a-color" >.git/config &&
+	test_must_fail git config --get --type=color foo.bar
 
-536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
-ok 122 - stdin -z works on empty input
+error: invalid color value: not-a-color
+fatal: bad config line 1 in file .git/config
+ok 117 - get --type=color barfs on non-color
 
-expecting success of 1400.123 'stdin -z fails on empty line': 
-	echo "" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: whitespace before command: " err
+expecting success of 1300.118 'set --type=color barfs on non-color': 
+	test_must_fail git config --type=color foo.color "not-a-color" 2>error &&
+	test_grep "cannot parse color" error
 
-fatal: whitespace before command: 
-ok 123 - stdin -z fails on empty line
+fatal: cannot parse color 'not-a-color'
+ok 118 - set --type=color barfs on non-color
 
-expecting success of 1400.124 'stdin -z fails on empty command': 
-	printf $F "" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: empty command in input" err
+expecting success of 1300.119 'quoting': 
+	rm -f .git/config &&
+	git config ${mode_set} quote.leading " test" &&
+	git config ${mode_set} quote.ending "test " &&
+	git config ${mode_set} quote.semicolon "test;test" &&
+	git config ${mode_set} quote.hash "test#test" &&
+	test_cmp expect .git/config
 
-fatal: empty command in input
-ok 124 - stdin -z fails on empty command
+ok 119 - quoting
 
-expecting success of 1400.125 'stdin -z fails on only whitespace': 
-	printf $F " " >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: whitespace before command:  " err
+expecting success of 1300.120 'key with newline': 
+	test_must_fail git config ${mode_get} "key.with
+newline" 123
+error: invalid key: key.with
+newline
+ok 120 - key with newline
 
-fatal: whitespace before command:  
-ok 125 - stdin -z fails on only whitespace
-
-expecting success of 1400.126 'stdin -z fails on leading whitespace': 
-	printf $F " create $a" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: whitespace before command:  create $a" err
-
-fatal: whitespace before command:  create refs/heads/a
-ok 126 - stdin -z fails on leading whitespace
-
-expecting success of 1400.127 'stdin -z fails on unknown command': 
-	printf $F "unknown $a" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: unknown command: unknown $a" err
-
-fatal: unknown command: unknown refs/heads/a
-ok 127 - stdin -z fails on unknown command
-
-expecting success of 1400.128 'stdin -z fails create with no ref': 
-	printf $F "create " >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: create: missing <ref>" err
-
-fatal: create: missing <ref>
-ok 128 - stdin -z fails create with no ref
-
-expecting success of 1400.129 'stdin -z fails create with no new value': 
-	printf $F "create $a" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: create $a: unexpected end of input when reading <new-oid>" err
-
-fatal: create refs/heads/a: unexpected end of input when reading <new-oid>
-ok 129 - stdin -z fails create with no new value
-
-expecting success of 1400.130 'stdin -z fails create with too many arguments': 
-	printf $F "create $a" "$m" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: unknown command: $m" err
-
-fatal: unknown command: refs/heads/main
-ok 130 - stdin -z fails create with too many arguments
-
-expecting success of 1400.131 'stdin -z fails update with no ref': 
-	printf $F "update " >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: update: missing <ref>" err
-
-fatal: update: missing <ref>
-ok 131 - stdin -z fails update with no ref
-
-expecting success of 1400.132 'stdin -z fails update with too few args': 
-	printf $F "update $a" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: update $a: unexpected end of input when reading <old-oid>" err
-
-fatal: update refs/heads/a: unexpected end of input when reading <old-oid>
-ok 132 - stdin -z fails update with too few args
-
-expecting success of 1400.133 'stdin -z emits warning with empty new value': 
-	git update-ref $a $m &&
-	printf $F "update $a" "" "" >stdin &&
-	git update-ref -z --stdin <stdin 2>err &&
-	grep "warning: update $a: missing <new-oid>, treating as zero" err &&
-	test_must_fail git rev-parse --verify -q $a
-
-warning: update refs/heads/a: missing <new-oid>, treating as zero
-ok 133 - stdin -z emits warning with empty new value
-
-expecting success of 1400.134 'stdin -z fails update with no new value': 
-	printf $F "update $a" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: update $a: unexpected end of input when reading <new-oid>" err
-
-fatal: update refs/heads/a: unexpected end of input when reading <new-oid>
-ok 134 - stdin -z fails update with no new value
-
-expecting success of 1400.135 'stdin -z fails update with no old value': 
-	printf $F "update $a" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: update $a: unexpected end of input when reading <old-oid>" err
-
-fatal: update refs/heads/a: unexpected end of input when reading <old-oid>
-ok 135 - stdin -z fails update with no old value
-
-expecting success of 1400.136 'stdin -z fails update with too many arguments': 
-	printf $F "update $a" "$m" "$m" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: unknown command: $m" err
-
-fatal: unknown command: refs/heads/main
-ok 136 - stdin -z fails update with too many arguments
-
-expecting success of 1400.137 'stdin -z fails delete with no ref': 
-	printf $F "delete " >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: delete: missing <ref>" err
-
-fatal: delete: missing <ref>
-ok 137 - stdin -z fails delete with no ref
-
-expecting success of 1400.138 'stdin -z fails delete with no old value': 
-	printf $F "delete $a" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: delete $a: unexpected end of input when reading <old-oid>" err
-
-fatal: delete refs/heads/a: unexpected end of input when reading <old-oid>
-ok 138 - stdin -z fails delete with no old value
-
-expecting success of 1400.139 'stdin -z fails delete with too many arguments': 
-	printf $F "delete $a" "$m" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: unknown command: $m" err
-
-fatal: unknown command: refs/heads/main
-ok 139 - stdin -z fails delete with too many arguments
-
-expecting success of 1400.140 'stdin -z fails verify with too many arguments': 
-	printf $F "verify $a" "$m" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: unknown command: $m" err
-
-fatal: unknown command: refs/heads/main
-ok 140 - stdin -z fails verify with too many arguments
-
-expecting success of 1400.141 'stdin -z fails verify with no old value': 
-	printf $F "verify $a" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: verify $a: unexpected end of input when reading <old-oid>" err
-
-fatal: verify refs/heads/a: unexpected end of input when reading <old-oid>
-ok 141 - stdin -z fails verify with no old value
-
-expecting success of 1400.142 'stdin -z fails option with unknown name': 
-	printf $F "option unknown" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: option unknown: unknown" err
-
-fatal: option unknown: unknown
-ok 142 - stdin -z fails option with unknown name
-
-expecting success of 1400.143 'stdin -z fails with duplicate refs': 
-	printf $F "create $a" "$m" "create $b" "$m" "create $a" "$m" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	test_grep "fatal: multiple updates for ref '$a' not allowed" err
-
-fatal: multiple updates for ref 'refs/heads/a' not allowed
-ok 143 - stdin -z fails with duplicate refs
-
-expecting success of 1400.144 'stdin -z create ref works': 
-	printf $F "create $a" "$m" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
-
-ok 144 - stdin -z create ref works
-
-expecting success of 1400.145 'stdin -z update ref creates with zero old value': 
-	printf $F "update $b" "$m" "$Z" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual &&
-	git update-ref -d $b
-
-ok 145 - stdin -z update ref creates with zero old value
-
-expecting success of 1400.146 'stdin -z update ref creates with empty old value': 
-	printf $F "update $b" "$m" "" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
-
-ok 146 - stdin -z update ref creates with empty old value
-
-expecting success of 1400.147 'stdin -z create ref works with path with space to blob': 
-	printf $F "create refs/blobs/pws" "$m:$pws" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse "$m:$pws" >expect &&
-	git rev-parse refs/blobs/pws >actual &&
-	test_cmp expect actual &&
-	git update-ref -d refs/blobs/pws
-
-ok 147 - stdin -z create ref works with path with space to blob
-
-expecting success of 1400.148 'stdin -z update ref fails with wrong old value': 
-	printf $F "update $c" "$m" "$m~1" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: cannot lock ref '$c'" err &&
-	test_must_fail git rev-parse --verify -q $c
-
-fatal: cannot lock ref 'refs/heads/c': unable to resolve reference 'refs/heads/c'
-ok 148 - stdin -z update ref fails with wrong old value
-
-expecting success of 1400.149 'stdin -z update ref fails with bad old value': 
-	printf $F "update $c" "$m" "does-not-exist" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: update $c: invalid <old-oid>: does-not-exist" err &&
-	test_must_fail git rev-parse --verify -q $c
-
-fatal: update refs/heads/c: invalid <old-oid>: does-not-exist
-ok 149 - stdin -z update ref fails with bad old value
-
-expecting success of 1400.150 'stdin -z create ref fails when ref exists': 
-	git update-ref $c $m &&
-	git rev-parse "$c" >expect &&
-	printf $F "create $c" "$m~1" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: cannot lock ref '$c'" err &&
-	git rev-parse "$c" >actual &&
-	test_cmp expect actual
-
-fatal: cannot lock ref 'refs/heads/c': reference already exists
-ok 150 - stdin -z create ref fails when ref exists
-
-expecting success of 1400.151 'stdin -z create ref fails with bad new value': 
-	git update-ref -d "$c" &&
-	printf $F "create $c" "does-not-exist" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: create $c: invalid <new-oid>: does-not-exist" err &&
-	test_must_fail git rev-parse --verify -q $c
-
-fatal: create refs/heads/c: invalid <new-oid>: does-not-exist
-ok 151 - stdin -z create ref fails with bad new value
-
-expecting success of 1400.152 'stdin -z create ref fails with empty new value': 
-	printf $F "create $c" "" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: create $c: missing <new-oid>" err &&
-	test_must_fail git rev-parse --verify -q $c
-
-fatal: create refs/heads/c: missing <new-oid>
-ok 152 - stdin -z create ref fails with empty new value
-
-expecting success of 1400.153 'stdin -z update ref works with right old value': 
-	printf $F "update $b" "$m~1" "$m" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
-
-ok 153 - stdin -z update ref works with right old value
-
-expecting success of 1400.154 'stdin -z delete ref fails with wrong old value': 
-	printf $F "delete $a" "$m~1" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: cannot lock ref '$a'" err &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
-
-fatal: cannot lock ref 'refs/heads/a': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
-ok 154 - stdin -z delete ref fails with wrong old value
-
-expecting success of 1400.155 'stdin -z delete ref fails with zero old value': 
-	printf $F "delete $a" "$Z" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: delete $a: zero <old-oid>" err &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
-
-fatal: delete refs/heads/a: zero <old-oid>
-ok 155 - stdin -z delete ref fails with zero old value
-
-expecting success of 1400.156 'stdin -z update symref works option no-deref': 
-	git symbolic-ref TESTSYMREF $b &&
-	printf $F "option no-deref" "update TESTSYMREF" "$a" "$b" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse TESTSYMREF >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
-
-ok 156 - stdin -z update symref works option no-deref
-
-expecting success of 1400.157 'stdin -z delete symref works option no-deref': 
-	git symbolic-ref TESTSYMREF $b &&
-	printf $F "option no-deref" "delete TESTSYMREF" "$b" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q TESTSYMREF &&
-	git rev-parse $m~1 >expect &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual
-
-ok 157 - stdin -z delete symref works option no-deref
-
-expecting success of 1400.158 'stdin -z delete ref works with right old value': 
-	printf $F "delete $b" "$m~1" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q $b
-
-ok 158 - stdin -z delete ref works with right old value
-
-expecting success of 1400.159 'stdin -z update/create/verify combination works': 
-	printf $F "update $a" "$m" "" "create $b" "$m" "verify $c" "" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual &&
-	test_must_fail git rev-parse --verify -q $c
-
-ok 159 - stdin -z update/create/verify combination works
-
-expecting success of 1400.160 'stdin -z verify succeeds for correct value': 
-	git rev-parse $m >expect &&
-	printf $F "verify $m" "$m" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual
-
-ok 160 - stdin -z verify succeeds for correct value
-
-expecting success of 1400.161 'stdin -z verify succeeds for missing reference': 
-	printf $F "verify refs/heads/missing" "$Z" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q refs/heads/missing
-
-ok 161 - stdin -z verify succeeds for missing reference
-
-expecting success of 1400.162 'stdin -z verify treats no value as missing': 
-	printf $F "verify refs/heads/missing" "" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q refs/heads/missing
-
-ok 162 - stdin -z verify treats no value as missing
-
-expecting success of 1400.163 'stdin -z verify fails for wrong value': 
-	git rev-parse $m >expect &&
-	printf $F "verify $m" "$m~1" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual
-
-fatal: cannot lock ref 'refs/heads/main': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
-ok 163 - stdin -z verify fails for wrong value
-
-expecting success of 1400.164 'stdin -z verify fails for mistaken null value': 
-	git rev-parse $m >expect &&
-	printf $F "verify $m" "$Z" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual
-
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 164 - stdin -z verify fails for mistaken null value
-
-expecting success of 1400.165 'stdin -z verify fails for mistaken empty value': 
-	M=$(git rev-parse $m) &&
-	test_when_finished "git update-ref $m $M" &&
-	git rev-parse $m >expect &&
-	printf $F "verify $m" "" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin &&
-	git rev-parse $m >actual &&
-	test_cmp expect actual
-
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 165 - stdin -z verify fails for mistaken empty value
-
-expecting success of 1400.166 'stdin -z update refs works with identity updates': 
-	printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$Z" "" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual &&
-	test_must_fail git rev-parse --verify -q $c
-
-ok 166 - stdin -z update refs works with identity updates
-
-expecting success of 1400.167 'stdin -z update refs fails with wrong old value': 
-	git update-ref $c $m &&
-	printf $F "update $a" "$m" "$m" "update $b" "$m" "$m" "update $c" "$m" "$Z" >stdin &&
-	test_must_fail git update-ref -z --stdin <stdin 2>err &&
-	grep "fatal: cannot lock ref '$c'" err &&
-	git rev-parse $m >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual &&
-	git rev-parse $b >actual &&
-	test_cmp expect actual &&
-	git rev-parse $c >actual &&
-	test_cmp expect actual
-
-fatal: cannot lock ref 'refs/heads/c': reference already exists
-ok 167 - stdin -z update refs fails with wrong old value
-
-expecting success of 1400.168 'stdin -z delete refs works with packed and loose refs': 
-	git pack-refs --all &&
-	git update-ref $c $m~1 &&
-	printf $F "delete $a" "$m" "update $b" "$Z" "$m" "update $c" "" "$m~1" >stdin &&
-	git update-ref -z --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q $a &&
-	test_must_fail git rev-parse --verify -q $b &&
-	test_must_fail git rev-parse --verify -q $c
-
-warning: update refs/heads/c: missing <new-oid>, treating as zero
-ok 168 - stdin -z delete refs works with packed and loose refs
-
-expecting success of 1400.169 'fails with duplicate HEAD update': 
-	git branch target1 $A &&
-	git checkout target1 &&
-	cat >stdin <<-EOF &&
-	update refs/heads/target1 $C
-	option no-deref
-	update HEAD $B
-	EOF
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	test_grep "fatal: multiple updates for 'HEAD' (including one via its referent .refs/heads/target1.) are not allowed" err &&
-	echo "refs/heads/target1" >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	echo "$A" >expect &&
-	git rev-parse refs/heads/target1 >actual &&
-	test_cmp expect actual
-
-Switched to branch 'target1'
-fatal: multiple updates for 'HEAD' (including one via its referent 'refs/heads/target1') are not allowed
-ok 169 - fails with duplicate HEAD update
-
-expecting success of 1400.170 'fails with duplicate ref update via symref': 
-	test_when_finished "git symbolic-ref -d refs/heads/symref2" &&
-	git branch target2 $A &&
-	git symbolic-ref refs/heads/symref2 refs/heads/target2 &&
-	cat >stdin <<-EOF &&
-	update refs/heads/target2 $C
-	update refs/heads/symref2 $B
-	EOF
-	test_must_fail git update-ref --stdin <stdin 2>err &&
-	test_grep "fatal: multiple updates for 'refs/heads/target2' (including one via symref .refs/heads/symref2.) are not allowed" err &&
-	echo "refs/heads/target2" >expect &&
-	git symbolic-ref refs/heads/symref2 >actual &&
-	test_cmp expect actual &&
-	echo "$A" >expect &&
-	git rev-parse refs/heads/target2 >actual &&
-	test_cmp expect actual
-
-fatal: multiple updates for 'refs/heads/target2' (including one via symref 'refs/heads/symref2') are not allowed
-ok 170 - fails with duplicate ref update via symref
-
-checking prerequisite: ULIMIT_FILE_DESCRIPTORS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_FILE_DESCRIPTORS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_FILE_DESCRIPTORS" &&
-	test_have_prereq !MINGW,!CYGWIN &&
-	run_with_limited_open_files true
-
-)
-prerequisite ULIMIT_FILE_DESCRIPTORS ok
-expecting success of 1400.171 'large transaction creating branches does not burst open file limit': 
-(
-	for i in $(test_seq 33)
-	do
-		echo "create refs/heads/$i HEAD" || exit 1
-	done >large_input &&
-	run_with_limited_open_files git update-ref --stdin <large_input &&
-	git rev-parse --verify -q refs/heads/33
-)
-
-102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 171 - large transaction creating branches does not burst open file limit
-
-expecting success of 1400.172 'large transaction deleting branches does not burst open file limit': 
-(
-	for i in $(test_seq 33)
-	do
-		echo "delete refs/heads/$i HEAD" || exit 1
-	done >large_input &&
-	run_with_limited_open_files git update-ref --stdin <large_input &&
-	test_must_fail git rev-parse --verify -q refs/heads/33
-)
-
-ok 172 - large transaction deleting branches does not burst open file limit
-
-expecting success of 1400.173 'handle per-worktree refs in refs/bisect': 
-	git commit --allow-empty -m "initial commit" &&
-	git worktree add -b branch worktree &&
-	(
-		cd worktree &&
-		git commit --allow-empty -m "test commit"  &&
-		git for-each-ref >for-each-ref.out &&
-		! grep refs/bisect for-each-ref.out &&
-		git update-ref refs/bisect/something HEAD &&
-		git rev-parse refs/bisect/something >../worktree-head &&
-		git for-each-ref | grep refs/bisect/something
-	) &&
-	git show-ref >actual &&
-	! grep refs/bisect actual &&
-	test_must_fail git rev-parse refs/bisect/something &&
-	git update-ref refs/bisect/something HEAD &&
-	git rev-parse refs/bisect/something >main-head &&
-	! test_cmp main-head worktree-head
-
-[target1 58a0522] initial commit
- Author: A U Thor <author@example.com>
-Preparing worktree (new branch 'branch')
-HEAD is now at 58a0522 initial commit
-[branch b62e0cb] test commit
- Author: A U Thor <author@example.com>
-b62e0cb4990da3244885da90fe7d493334cca9f5 commit	refs/bisect/something
-fatal: ambiguous argument 'refs/bisect/something': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/bisect/something
---- main-head	2025-02-09 06:53:39.265555729 +0000
-+++ worktree-head	2025-02-09 06:53:39.157555042 +0000
-@@ -1 +1 @@
--58a052250c09f010b95ad9bfe32f35d704eda1a0
-+b62e0cb4990da3244885da90fe7d493334cca9f5
-ok 173 - handle per-worktree refs in refs/bisect
-
-expecting success of 1400.174 'transaction handles empty commit': 
-	cat >stdin <<-EOF &&
-	start
-	prepare
-	commit
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start prepare commit >expect &&
-	test_cmp expect actual
-
-ok 174 - transaction handles empty commit
-
-expecting success of 1400.175 'transaction handles empty commit with missing prepare': 
-	cat >stdin <<-EOF &&
-	start
-	commit
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start commit >expect &&
-	test_cmp expect actual
-
-ok 175 - transaction handles empty commit with missing prepare
-
-expecting success of 1400.176 'transaction handles sole commit': 
-	cat >stdin <<-EOF &&
-	commit
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" commit >expect &&
-	test_cmp expect actual
-
-ok 176 - transaction handles sole commit
-
-expecting success of 1400.177 'transaction handles empty abort': 
-	cat >stdin <<-EOF &&
-	start
-	prepare
-	abort
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start prepare abort >expect &&
-	test_cmp expect actual
-
-ok 177 - transaction handles empty abort
-
-expecting success of 1400.178 'transaction exits on multiple aborts': 
-	cat >stdin <<-EOF &&
-	abort
-	abort
-	EOF
-	test_must_fail git update-ref --stdin <stdin >actual 2>err &&
-	printf "%s: ok\n" abort >expect &&
-	test_cmp expect actual &&
-	grep "fatal: transaction is closed" err
-
-fatal: transaction is closed
-ok 178 - transaction exits on multiple aborts
-
-expecting success of 1400.179 'transaction exits on start after prepare': 
-	cat >stdin <<-EOF &&
-	prepare
-	start
-	EOF
-	test_must_fail git update-ref --stdin <stdin 2>err >actual &&
-	printf "%s: ok\n" prepare >expect &&
-	test_cmp expect actual &&
-	grep "fatal: prepared transactions can only be closed" err
-
-fatal: prepared transactions can only be closed
-ok 179 - transaction exits on start after prepare
-
-expecting success of 1400.180 'transaction handles empty abort with missing prepare': 
-	cat >stdin <<-EOF &&
-	start
-	abort
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start abort >expect &&
-	test_cmp expect actual
-
-ok 180 - transaction handles empty abort with missing prepare
-
-expecting success of 1400.181 'transaction handles sole abort': 
-	cat >stdin <<-EOF &&
-	abort
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" abort >expect &&
-	test_cmp expect actual
-
-ok 181 - transaction handles sole abort
-
-expecting success of 1400.182 'transaction can handle commit': 
-	cat >stdin <<-EOF &&
-	start
-	create $a HEAD
-	commit
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start commit >expect &&
-	test_cmp expect actual &&
-	git rev-parse HEAD >expect &&
-	git rev-parse $a >actual &&
-	test_cmp expect actual
-
-ok 182 - transaction can handle commit
-
-expecting success of 1400.183 'transaction can handle abort': 
-	cat >stdin <<-EOF &&
-	start
-	create $b HEAD
-	abort
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start abort >expect &&
-	test_cmp expect actual &&
-	test_must_fail git show-ref --verify -q $b
-
-ok 183 - transaction can handle abort
-
-expecting success of 1400.184 'transaction aborts by default': 
-	cat >stdin <<-EOF &&
-	start
-	create $b HEAD
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start >expect &&
-	test_cmp expect actual &&
-	test_must_fail git show-ref --verify -q $b
-
-ok 184 - transaction aborts by default
-
-expecting success of 1400.185 'transaction with prepare aborts by default': 
-	cat >stdin <<-EOF &&
-	start
-	create $b HEAD
-	prepare
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start prepare >expect &&
-	test_cmp expect actual &&
-	test_must_fail git show-ref --verify -q $b
-
-ok 185 - transaction with prepare aborts by default
-
-expecting success of 1400.186 'transaction can commit multiple times': 
-	cat >stdin <<-EOF &&
-	start
-	create refs/heads/branch-1 $A
-	commit
-	start
-	create refs/heads/branch-2 $B
-	commit
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start commit start commit >expect &&
-	test_cmp expect actual &&
-	echo "$A" >expect &&
-	git rev-parse refs/heads/branch-1 >actual &&
-	test_cmp expect actual &&
-	echo "$B" >expect &&
-	git rev-parse refs/heads/branch-2 >actual &&
-	test_cmp expect actual
-
-ok 186 - transaction can commit multiple times
-
-expecting success of 1400.187 'transaction can create and delete': 
-	cat >stdin <<-EOF &&
-	start
-	create refs/heads/create-and-delete $A
-	commit
-	start
-	delete refs/heads/create-and-delete $A
-	commit
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start commit start commit >expect &&
-	test_cmp expect actual &&
-	test_must_fail git show-ref --verify refs/heads/create-and-delete
-
-fatal: 'refs/heads/create-and-delete' - not a valid ref
-ok 187 - transaction can create and delete
-
-expecting success of 1400.188 'transaction can commit after abort': 
-	cat >stdin <<-EOF &&
-	start
-	create refs/heads/abort $A
-	abort
-	start
-	create refs/heads/abort $A
-	commit
-	EOF
-	git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start abort start commit >expect &&
-	echo "$A" >expect &&
-	git rev-parse refs/heads/abort >actual &&
-	test_cmp expect actual
-
-ok 188 - transaction can commit after abort
-
-expecting success of 1400.189 'transaction cannot restart ongoing transaction': 
-	cat >stdin <<-EOF &&
-	start
-	create refs/heads/restart $A
-	start
-	commit
-	EOF
-	test_must_fail git update-ref --stdin <stdin >actual &&
-	printf "%s: ok\n" start >expect &&
-	test_cmp expect actual &&
-	test_must_fail git show-ref --verify refs/heads/restart
-
-fatal: cannot restart ongoing transaction
-fatal: 'refs/heads/restart' - not a valid ref
-ok 189 - transaction cannot restart ongoing transaction
-
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-expecting success of 1400.190 'transaction flushes status updates': 
-	mkfifo in out &&
-	(git update-ref --stdin <in >out &) &&
-
-	exec 9>in &&
-	exec 8<out &&
-	test_when_finished "exec 9>&-" &&
-	test_when_finished "exec 8<&-" &&
-
-	echo "start" >&9 &&
-	echo "start: ok" >expected &&
-	read line <&8 &&
-	echo "$line" >actual &&
-	test_cmp expected actual &&
-
-	echo "create refs/heads/flush $A" >&9 &&
-
-	echo prepare >&9 &&
-	echo "prepare: ok" >expected &&
-	read line <&8 &&
-	echo "$line" >actual &&
-	test_cmp expected actual &&
-
-	# This must now fail given that we have locked the ref.
-	test_must_fail git update-ref refs/heads/flush $B 2>stderr &&
-	grep "fatal: update_ref failed for ref ${SQ}refs/heads/flush${SQ}: cannot lock ref" stderr &&
-
-	echo commit >&9 &&
-	echo "commit: ok" >expected &&
-	read line <&8 &&
-	echo "$line" >actual &&
-	test_cmp expected actual
-
-fatal: update_ref failed for ref 'refs/heads/flush': cannot lock ref 'refs/heads/flush': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1400-update-ref/.git/refs/heads/flush.lock': File exists.
-ok 190 - transaction flushes status updates
-
-expecting success of 1400.191 'stdin  symref-verify fails without --no-deref': 
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: symref-verify: cannot operate with deref mode" err
-	
-fatal: symref-verify: cannot operate with deref mode
-ok 191 - stdin  symref-verify fails without --no-deref
-
-expecting success of 1400.192 'stdin  symref-verify fails with too many arguments': 
-		format_command $type "symref-verify refs/heads/symref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err  &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-verify refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: symref-verify refs/heads/symref: extra input:  refs/heads/a
-ok 192 - stdin  symref-verify fails with too many arguments
-
-expecting success of 1400.193 'stdin  symref-verify succeeds for correct value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
-		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
-		test_cmp before after
-	
-ok 193 - stdin  symref-verify succeeds for correct value
-
-expecting success of 1400.194 'stdin  symref-verify fails with no value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		format_command $type "symref-verify refs/heads/symref" "" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin
-	
-fatal: cannot lock ref 'refs/heads/symref': reference already exists
-ok 194 - stdin  symref-verify fails with no value
-
-expecting success of 1400.195 'stdin  symref-verify succeeds for dangling reference': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref2" &&
-		test_must_fail git symbolic-ref refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
-		format_command $type "symref-verify refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin
-	
-fatal: ref refs/heads/nonexistent is not a symbolic ref
-ok 195 - stdin  symref-verify succeeds for dangling reference
-
-expecting success of 1400.196 'stdin  symref-verify fails for missing reference': 
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
-		format_command $type "symref-verify refs/heads/missing" "refs/heads/unknown" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/missing${SQ}: unable to resolve reference ${SQ}refs/heads/missing${SQ}" err &&
-		test_must_fail git rev-parse --verify -q refs/heads/missing &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
-		test_cmp before after
-	
-fatal: cannot lock ref 'refs/heads/missing': unable to resolve reference 'refs/heads/missing'
-ok 196 - stdin  symref-verify fails for missing reference
-
-expecting success of 1400.197 'stdin  symref-verify fails for wrong value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		format_command $type "symref-verify refs/heads/symref" "$b" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
-ok 197 - stdin  symref-verify fails for wrong value
-
-expecting success of 1400.198 'stdin  symref-verify fails for mistaken null value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		format_command $type "symref-verify refs/heads/symref" "$Z" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected 0000000000000000000000000000000000000000
-ok 198 - stdin  symref-verify fails for mistaken null value
-
-expecting success of 1400.199 'stdin  symref-delete fails without --no-deref': 
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: symref-delete: cannot operate with deref mode" err
-	
-fatal: symref-delete: cannot operate with deref mode
-ok 199 - stdin  symref-delete fails without --no-deref
-
-expecting success of 1400.200 'stdin  symref-delete fails with no ref': 
-		format_command $type "symref-delete " >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: symref-delete: missing <ref>" err
-	
-fatal: symref-delete: missing <ref>
-ok 200 - stdin  symref-delete fails with no ref
-
-expecting success of 1400.201 'stdin  symref-delete fails deleting regular ref': 
-		test_when_finished "git update-ref -d refs/heads/regularref" &&
-		git update-ref refs/heads/regularref $a &&
-		format_command $type "symref-delete refs/heads/regularref" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: expected symref with target ${SQ}$a${SQ}: but is a regular ref" err
-	
-fatal: cannot lock ref 'refs/heads/regularref': expected symref with target 'refs/heads/a': but is a regular ref
-ok 201 - stdin  symref-delete fails deleting regular ref
-
-expecting success of 1400.202 'stdin  symref-delete fails with too many arguments': 
-		format_command $type "symref-delete refs/heads/symref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-delete refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: symref-delete refs/heads/symref: extra input:  refs/heads/a
-ok 202 - stdin  symref-delete fails with too many arguments
-
-expecting success of 1400.203 'stdin  symref-delete fails with wrong old value': 
-		format_command $type "symref-delete refs/heads/symref" "$m" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected refs/heads/main" err &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/main
-ok 203 - stdin  symref-delete fails with wrong old value
-
-expecting success of 1400.204 'stdin  symref-delete works with right old value': 
-		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		test_must_fail git rev-parse --verify -q refs/heads/symref
-	
-ok 204 - stdin  symref-delete works with right old value
-
-expecting success of 1400.205 'stdin  symref-delete works with empty old value': 
-		git symbolic-ref refs/heads/symref $a >stdin &&
-		format_command $type "symref-delete refs/heads/symref" "" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		test_must_fail git rev-parse --verify -q $b
-	
-ok 205 - stdin  symref-delete works with empty old value
-
-expecting success of 1400.206 'stdin  symref-delete succeeds for dangling reference': 
-		test_must_fail git symbolic-ref refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
-		format_command $type "symref-delete refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		test_must_fail git symbolic-ref -d refs/heads/symref2
-	
-fatal: ref refs/heads/nonexistent is not a symbolic ref
-fatal: Cannot delete refs/heads/symref2, not a symbolic ref
-ok 206 - stdin  symref-delete succeeds for dangling reference
-
-expecting success of 1400.207 'stdin  symref-delete deletes regular ref without target': 
-		git update-ref refs/heads/regularref $a &&
-		format_command $type "symref-delete refs/heads/regularref" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin
-	
-ok 207 - stdin  symref-delete deletes regular ref without target
-
-expecting success of 1400.208 'stdin  symref-create fails with too many arguments': 
-		format_command $type "symref-create refs/heads/symref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-create refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: symref-create refs/heads/symref: extra input:  refs/heads/a
-ok 208 - stdin  symref-create fails with too many arguments
-
-expecting success of 1400.209 'stdin  symref-create fails with no target': 
-		format_command $type "symref-create refs/heads/symref" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin
-	
-fatal: symref-create refs/heads/symref: missing <new-target>
-ok 209 - stdin  symref-create fails with no target
-
-expecting success of 1400.210 'stdin  symref-create fails with empty target': 
-		format_command $type "symref-create refs/heads/symref" "" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin
-	
-fatal: symref-create refs/heads/symref: missing <new-target>
-ok 210 - stdin  symref-create fails with empty target
-
-expecting success of 1400.211 'stdin  symref-create works': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual
-	
-ok 211 - stdin  symref-create works
-
-expecting success of 1400.212 'stdin  symref-create works with --no-deref': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "$a" &&
-		git update-ref --stdin $type <stdin 2>err
-	
-symref-create refs/heads/symref refs/heads/a
-ok 212 - stdin  symref-create works with --no-deref
-
-expecting success of 1400.213 'stdin  create dangling symref ref works': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "refs/heads/unknown" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo refs/heads/unknown >actual &&
-		test_cmp expect actual
-	
-ok 213 - stdin  create dangling symref ref works
-
-expecting success of 1400.214 'stdin  symref-create does not create reflogs by default': 
-		test_when_finished "git symbolic-ref -d refs/symref" &&
-		format_command $type "symref-create refs/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual &&
-		test_must_fail git reflog exists refs/symref
-	
-ok 214 - stdin  symref-create does not create reflogs by default
-
-expecting success of 1400.215 'stdin  symref-create reflogs with --create-reflog': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
-		git update-ref --create-reflog --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual &&
-		git reflog exists refs/heads/symref
-	
-ok 215 - stdin  symref-create reflogs with --create-reflog
-
-expecting success of 1400.216 'stdin  symref-update fails with too many arguments': 
-		format_command $type "symref-update refs/heads/symref" "$a" "ref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-update refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: symref-update refs/heads/symref: extra input:  refs/heads/a
-ok 216 - stdin  symref-update fails with too many arguments
-
-expecting success of 1400.217 'stdin  symref-update fails with wrong old value argument': 
-		format_command $type "symref-update refs/heads/symref" "$a" "foo" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: symref-update refs/heads/symref: invalid arg ${SQ}foo${SQ} for old value" err
-	
-fatal: symref-update refs/heads/symref: invalid arg 'foo' for old value
-ok 217 - stdin  symref-update fails with wrong old value argument
-
-expecting success of 1400.218 'stdin  symref-update creates with zero old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 218 - stdin  symref-update creates with zero old value
-
-expecting success of 1400.219 'stdin  symref-update creates with no old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 219 - stdin  symref-update creates with no old value
-
-expecting success of 1400.220 'stdin  symref-update creates dangling': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo refs/heads/nonexistent >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-ok 220 - stdin  symref-update creates dangling
-
-expecting success of 1400.221 'stdin  symref-update fails with wrong old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$b" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected $b" err &&
-		test_must_fail git rev-parse --verify -q $c
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
-ok 221 - stdin  symref-update fails with wrong old value
-
-expecting success of 1400.222 'stdin  symref-update updates dangling ref': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-ok 222 - stdin  symref-update updates dangling ref
-
-expecting success of 1400.223 'stdin  symref-update updates dangling ref with old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-ok 223 - stdin  symref-update updates dangling ref with old value
-
-expecting success of 1400.224 'stdin  symref-update fails update dangling ref with wrong old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/wrongref" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		echo refs/heads/nonexistent >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/nonexistent but expected refs/heads/wrongref
-ok 224 - stdin  symref-update fails update dangling ref with wrong old value
-
-expecting success of 1400.225 'stdin  symref-update works with right old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $m >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 225 - stdin  symref-update works with right old value
-
-expecting success of 1400.226 'stdin  symref-update works with no old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $m >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 226 - stdin  symref-update works with no old value
-
-expecting success of 1400.227 'stdin  symref-update fails with empty old ref-target': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" "ref" "" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: symref-update refs/heads/symref: expected old value
-ok 227 - stdin  symref-update fails with empty old ref-target
-
-expecting success of 1400.228 'stdin  symref-update creates (with deref)': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/symref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
-		grep "$Z $(git rev-parse $a)" actual
-	
-0000000000000000000000000000000000000000 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 228 - stdin  symref-update creates (with deref)
-
-expecting success of 1400.229 'stdin  symref-update regular ref to symref with correct old-oid': 
-		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse $a)" >stdin &&
-		git update-ref --stdin $type <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
-		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
-	
-58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 229 - stdin  symref-update regular ref to symref with correct old-oid
-
-expecting success of 1400.230 'stdin  symref-update regular ref to symref fails with wrong old-oid': 
-		test_when_finished "git update-ref -d refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse refs/heads/target2)" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: is at $(git rev-parse $a) but expected $(git rev-parse refs/heads/target2)" err &&
-		echo $(git rev-parse $a) >expect &&
-		git rev-parse refs/heads/regularref >actual &&
-		test_cmp expect actual
-	
-fatal: cannot lock ref 'refs/heads/regularref': is at 58a052250c09f010b95ad9bfe32f35d704eda1a0 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 230 - stdin  symref-update regular ref to symref fails with wrong old-oid
-
-expecting success of 1400.231 'stdin  symref-update regular ref to symref fails with invalid old-oid': 
-		test_when_finished "git update-ref -d refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "not-a-ref-oid" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid" err &&
-		echo $(git rev-parse $a) >expect &&
-		git rev-parse refs/heads/regularref >actual &&
-		test_cmp expect actual
-	
-fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid
-ok 231 - stdin  symref-update regular ref to symref fails with invalid old-oid
-
-expecting success of 1400.232 'stdin  symref-update existing symref with zero old-oid': 
-		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref refs/heads/target2 &&
-		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/symref${SQ}: reference already exists" err &&
-		echo refs/heads/target2 >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: cannot lock ref 'refs/heads/symref': reference already exists
-ok 232 - stdin  symref-update existing symref with zero old-oid
-
-expecting success of 1400.233 'stdin  symref-update regular ref to symref (with deref)': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_when_finished "git update-ref -d --no-deref refs/heads/symref2" &&
-		git update-ref refs/heads/symref2 $a &&
-		git symbolic-ref --no-recurse refs/heads/symref refs/heads/symref2 &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref $type --stdin <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/symref2 >actual &&
-		test_cmp expect actual &&
-		echo refs/heads/symref2 >expect &&
-		git symbolic-ref --no-recurse refs/heads/symref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
-		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
-	
-58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 233 - stdin  symref-update regular ref to symref (with deref)
-
-expecting success of 1400.234 'stdin  symref-update regular ref to symref': 
-		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" >stdin &&
-		git update-ref $type --stdin <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
-		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
-	
-58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 234 - stdin  symref-update regular ref to symref
-
-expecting success of 1400.235 'stdin -z symref-verify fails without --no-deref': 
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: symref-verify: cannot operate with deref mode" err
-	
-fatal: symref-verify: cannot operate with deref mode
-ok 235 - stdin -z symref-verify fails without --no-deref
-
-expecting success of 1400.236 'stdin -z symref-verify fails with too many arguments': 
-		format_command $type "symref-verify refs/heads/symref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err  &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-verify refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: unknown command: refs/heads/a
-ok 236 - stdin -z symref-verify fails with too many arguments
-
-expecting success of 1400.237 'stdin -z symref-verify succeeds for correct value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
-		format_command $type "symref-verify refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
-		test_cmp before after
-	
-ok 237 - stdin -z symref-verify succeeds for correct value
-
-expecting success of 1400.238 'stdin -z symref-verify fails with no value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		format_command $type "symref-verify refs/heads/symref" "" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin
-	
-fatal: cannot lock ref 'refs/heads/symref': reference already exists
-ok 238 - stdin -z symref-verify fails with no value
-
-expecting success of 1400.239 'stdin -z symref-verify succeeds for dangling reference': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref2" &&
-		test_must_fail git symbolic-ref refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
-		format_command $type "symref-verify refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin
-	
-fatal: ref refs/heads/nonexistent is not a symbolic ref
-ok 239 - stdin -z symref-verify succeeds for dangling reference
-
-expecting success of 1400.240 'stdin -z symref-verify fails for missing reference': 
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >before &&
-		format_command $type "symref-verify refs/heads/missing" "refs/heads/unknown" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/missing${SQ}: unable to resolve reference ${SQ}refs/heads/missing${SQ}" err &&
-		test_must_fail git rev-parse --verify -q refs/heads/missing &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >after &&
-		test_cmp before after
-	
-fatal: cannot lock ref 'refs/heads/missing': unable to resolve reference 'refs/heads/missing'
-ok 240 - stdin -z symref-verify fails for missing reference
-
-expecting success of 1400.241 'stdin -z symref-verify fails for wrong value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		format_command $type "symref-verify refs/heads/symref" "$b" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
-ok 241 - stdin -z symref-verify fails for wrong value
-
-expecting success of 1400.242 'stdin -z symref-verify fails for mistaken null value': 
-		git symbolic-ref refs/heads/symref >expect &&
-		format_command $type "symref-verify refs/heads/symref" "$Z" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected 0000000000000000000000000000000000000000
-ok 242 - stdin -z symref-verify fails for mistaken null value
-
-expecting success of 1400.243 'stdin -z symref-delete fails without --no-deref': 
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: symref-delete: cannot operate with deref mode" err
-	
-fatal: symref-delete: cannot operate with deref mode
-ok 243 - stdin -z symref-delete fails without --no-deref
-
-expecting success of 1400.244 'stdin -z symref-delete fails with no ref': 
-		format_command $type "symref-delete " >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: symref-delete: missing <ref>" err
-	
-fatal: symref-delete: missing <ref>
-ok 244 - stdin -z symref-delete fails with no ref
-
-expecting success of 1400.245 'stdin -z symref-delete fails deleting regular ref': 
-		test_when_finished "git update-ref -d refs/heads/regularref" &&
-		git update-ref refs/heads/regularref $a &&
-		format_command $type "symref-delete refs/heads/regularref" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: expected symref with target ${SQ}$a${SQ}: but is a regular ref" err
-	
-fatal: cannot lock ref 'refs/heads/regularref': expected symref with target 'refs/heads/a': but is a regular ref
-ok 245 - stdin -z symref-delete fails deleting regular ref
-
-expecting success of 1400.246 'stdin -z symref-delete fails with too many arguments': 
-		format_command $type "symref-delete refs/heads/symref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-delete refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: unknown command: refs/heads/a
-ok 246 - stdin -z symref-delete fails with too many arguments
-
-expecting success of 1400.247 'stdin -z symref-delete fails with wrong old value': 
-		format_command $type "symref-delete refs/heads/symref" "$m" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected refs/heads/main" err &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/main
-ok 247 - stdin -z symref-delete fails with wrong old value
-
-expecting success of 1400.248 'stdin -z symref-delete works with right old value': 
-		format_command $type "symref-delete refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		test_must_fail git rev-parse --verify -q refs/heads/symref
-	
-ok 248 - stdin -z symref-delete works with right old value
-
-expecting success of 1400.249 'stdin -z symref-delete works with empty old value': 
-		git symbolic-ref refs/heads/symref $a >stdin &&
-		format_command $type "symref-delete refs/heads/symref" "" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		test_must_fail git rev-parse --verify -q $b
-	
-ok 249 - stdin -z symref-delete works with empty old value
-
-expecting success of 1400.250 'stdin -z symref-delete succeeds for dangling reference': 
-		test_must_fail git symbolic-ref refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref2 refs/heads/nonexistent &&
-		format_command $type "symref-delete refs/heads/symref2" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		test_must_fail git symbolic-ref -d refs/heads/symref2
-	
-fatal: ref refs/heads/nonexistent is not a symbolic ref
-fatal: Cannot delete refs/heads/symref2, not a symbolic ref
-ok 250 - stdin -z symref-delete succeeds for dangling reference
-
-expecting success of 1400.251 'stdin -z symref-delete deletes regular ref without target': 
-		git update-ref refs/heads/regularref $a &&
-		format_command $type "symref-delete refs/heads/regularref" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin
-	
-ok 251 - stdin -z symref-delete deletes regular ref without target
-
-expecting success of 1400.252 'stdin -z symref-create fails with too many arguments': 
-		format_command $type "symref-create refs/heads/symref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-create refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: unknown command: refs/heads/a
-ok 252 - stdin -z symref-create fails with too many arguments
-
-expecting success of 1400.253 'stdin -z symref-create fails with no target': 
-		format_command $type "symref-create refs/heads/symref" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin
-	
-fatal: symref-create refs/heads/symref: missing <new-target>
-ok 253 - stdin -z symref-create fails with no target
-
-expecting success of 1400.254 'stdin -z symref-create fails with empty target': 
-		format_command $type "symref-create refs/heads/symref" "" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin
-	
-fatal: symref-create refs/heads/symref: missing <new-target>
-ok 254 - stdin -z symref-create fails with empty target
-
-expecting success of 1400.255 'stdin -z symref-create works': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual
-	
-ok 255 - stdin -z symref-create works
-
-expecting success of 1400.256 'stdin -z symref-create works with --no-deref': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "$a" &&
-		git update-ref --stdin $type <stdin 2>err
-	
-symref-create refs/heads/symrefrefs/heads/aok 256 - stdin -z symref-create works with --no-deref
-
-expecting success of 1400.257 'stdin -z create dangling symref ref works': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "refs/heads/unknown" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo refs/heads/unknown >actual &&
-		test_cmp expect actual
-	
-ok 257 - stdin -z create dangling symref ref works
-
-expecting success of 1400.258 'stdin -z symref-create does not create reflogs by default': 
-		test_when_finished "git symbolic-ref -d refs/symref" &&
-		format_command $type "symref-create refs/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual &&
-		test_must_fail git reflog exists refs/symref
-	
-ok 258 - stdin -z symref-create does not create reflogs by default
-
-expecting success of 1400.259 'stdin -z symref-create reflogs with --create-reflog': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-create refs/heads/symref" "$a" >stdin &&
-		git update-ref --create-reflog --stdin $type --no-deref <stdin &&
-		git symbolic-ref refs/heads/symref >expect &&
-		echo $a >actual &&
-		test_cmp expect actual &&
-		git reflog exists refs/heads/symref
-	
-ok 259 - stdin -z symref-create reflogs with --create-reflog
-
-expecting success of 1400.260 'stdin -z symref-update fails with too many arguments': 
-		format_command $type "symref-update refs/heads/symref" "$a" "ref" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		if test "$type" = "-z"
-		then
-			grep "fatal: unknown command: $a" err
-		else
-			grep "fatal: symref-update refs/heads/symref: extra input:  $a" err
-		fi
-	
-fatal: unknown command: refs/heads/a
-ok 260 - stdin -z symref-update fails with too many arguments
-
-expecting success of 1400.261 'stdin -z symref-update fails with wrong old value argument': 
-		format_command $type "symref-update refs/heads/symref" "$a" "foo" "$a" "$a" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: symref-update refs/heads/symref: invalid arg ${SQ}foo${SQ} for old value" err
-	
-fatal: symref-update refs/heads/symref: invalid arg 'foo' for old value
-ok 261 - stdin -z symref-update fails with wrong old value argument
-
-expecting success of 1400.262 'stdin -z symref-update creates with zero old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 262 - stdin -z symref-update creates with zero old value
-
-expecting success of 1400.263 'stdin -z symref-update creates with no old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 263 - stdin -z symref-update creates with no old value
-
-expecting success of 1400.264 'stdin -z symref-update creates dangling': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo refs/heads/nonexistent >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-ok 264 - stdin -z symref-update creates dangling
-
-expecting success of 1400.265 'stdin -z symref-update fails with wrong old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$b" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin 2>err &&
-		grep "fatal: verifying symref target: ${SQ}refs/heads/symref${SQ}: is at $a but expected $b" err &&
-		test_must_fail git rev-parse --verify -q $c
-	
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/a but expected refs/heads/b
-ok 265 - stdin -z symref-update fails with wrong old value
-
-expecting success of 1400.266 'stdin -z symref-update updates dangling ref': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-ok 266 - stdin -z symref-update updates dangling ref
-
-expecting success of 1400.267 'stdin -z symref-update updates dangling ref with old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/nonexistent" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-ok 267 - stdin -z symref-update updates dangling ref with old value
-
-expecting success of 1400.268 'stdin -z symref-update fails update dangling ref with wrong old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_must_fail git rev-parse refs/heads/nonexistent &&
-		git symbolic-ref refs/heads/symref refs/heads/nonexistent &&
-		format_command $type "symref-update refs/heads/symref" "$a" "ref" "refs/heads/wrongref" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		echo refs/heads/nonexistent >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: ambiguous argument 'refs/heads/nonexistent': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/nonexistent
-fatal: verifying symref target: 'refs/heads/symref': is at refs/heads/nonexistent but expected refs/heads/wrongref
-ok 268 - stdin -z symref-update fails update dangling ref with wrong old value
-
-expecting success of 1400.269 'stdin -z symref-update works with right old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" "ref" "$a" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $m >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 269 - stdin -z symref-update works with right old value
-
-expecting success of 1400.270 'stdin -z symref-update works with no old value': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" >stdin &&
-		git update-ref --stdin $type --no-deref <stdin &&
-		echo $m >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-ok 270 - stdin -z symref-update works with no old value
-
-expecting success of 1400.271 'stdin -z symref-update fails with empty old ref-target': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref $a &&
-		format_command $type "symref-update refs/heads/symref" "$m" "ref" "" >stdin &&
-		test_must_fail git update-ref --stdin $type --no-deref <stdin &&
-		echo $a >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: symref-update refs/heads/symref: expected old value
-ok 271 - stdin -z symref-update fails with empty old ref-target
-
-expecting success of 1400.272 'stdin -z symref-update creates (with deref)': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref --stdin $type <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/symref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
-		grep "$Z $(git rev-parse $a)" actual
-	
-0000000000000000000000000000000000000000 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 272 - stdin -z symref-update creates (with deref)
-
-expecting success of 1400.273 'stdin -z symref-update regular ref to symref with correct old-oid': 
-		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse $a)" >stdin &&
-		git update-ref --stdin $type <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
-		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
-	
-58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 273 - stdin -z symref-update regular ref to symref with correct old-oid
-
-expecting success of 1400.274 'stdin -z symref-update regular ref to symref fails with wrong old-oid': 
-		test_when_finished "git update-ref -d refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "$(git rev-parse refs/heads/target2)" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/regularref${SQ}: is at $(git rev-parse $a) but expected $(git rev-parse refs/heads/target2)" err &&
-		echo $(git rev-parse $a) >expect &&
-		git rev-parse refs/heads/regularref >actual &&
-		test_cmp expect actual
-	
-fatal: cannot lock ref 'refs/heads/regularref': is at 58a052250c09f010b95ad9bfe32f35d704eda1a0 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 274 - stdin -z symref-update regular ref to symref fails with wrong old-oid
-
-expecting success of 1400.275 'stdin -z symref-update regular ref to symref fails with invalid old-oid': 
-		test_when_finished "git update-ref -d refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" "oid" "not-a-ref-oid" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid" err &&
-		echo $(git rev-parse $a) >expect &&
-		git rev-parse refs/heads/regularref >actual &&
-		test_cmp expect actual
-	
-fatal: symref-update refs/heads/regularref: invalid oid: not-a-ref-oid
-ok 275 - stdin -z symref-update regular ref to symref fails with invalid old-oid
-
-expecting success of 1400.276 'stdin -z symref-update existing symref with zero old-oid': 
-		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/symref" &&
-		git symbolic-ref refs/heads/symref refs/heads/target2 &&
-		format_command $type "symref-update refs/heads/symref" "$a" "oid" "$Z" >stdin &&
-		test_must_fail git update-ref --stdin $type <stdin 2>err &&
-		grep "fatal: cannot lock ref ${SQ}refs/heads/symref${SQ}: reference already exists" err &&
-		echo refs/heads/target2 >expect &&
-		git symbolic-ref refs/heads/symref >actual &&
-		test_cmp expect actual
-	
-fatal: cannot lock ref 'refs/heads/symref': reference already exists
-ok 276 - stdin -z symref-update existing symref with zero old-oid
-
-expecting success of 1400.277 'stdin -z symref-update regular ref to symref (with deref)': 
-		test_when_finished "git symbolic-ref -d refs/heads/symref" &&
-		test_when_finished "git update-ref -d --no-deref refs/heads/symref2" &&
-		git update-ref refs/heads/symref2 $a &&
-		git symbolic-ref --no-recurse refs/heads/symref refs/heads/symref2 &&
-		format_command $type "symref-update refs/heads/symref" "$a" >stdin &&
-		git update-ref $type --stdin <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/symref2 >actual &&
-		test_cmp expect actual &&
-		echo refs/heads/symref2 >expect &&
-		git symbolic-ref --no-recurse refs/heads/symref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/symref >actual &&
-		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
-	
-58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 277 - stdin -z symref-update regular ref to symref (with deref)
-
-expecting success of 1400.278 'stdin -z symref-update regular ref to symref': 
-		test_when_finished "git symbolic-ref -d --no-recurse refs/heads/regularref" &&
-		git update-ref --no-deref refs/heads/regularref $a &&
-		format_command $type "symref-update refs/heads/regularref" "$a" >stdin &&
-		git update-ref $type --stdin <stdin &&
-		echo $a >expect &&
-		git symbolic-ref --no-recurse refs/heads/regularref >actual &&
-		test_cmp expect actual &&
-		test-tool ref-store main for-each-reflog-ent refs/heads/regularref >actual &&
-		grep "$(git rev-parse $a) $(git rev-parse $a)" actual
-	
-58a052250c09f010b95ad9bfe32f35d704eda1a0 58a052250c09f010b95ad9bfe32f35d704eda1a0 C O Mitter <committer@example.com> 1112912653 -0700
-ok 278 - stdin -z symref-update regular ref to symref
-
-# passed all 278 test(s)
-1..278
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2000-conflict-when-checking-files-out.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2000-conflict-when-checking-files-out/.git/
-expecting success of 2000.1 'git update-index --add various paths.': git update-index --add path0 path1/file1
-ok 1 - git update-index --add various paths.
-
-expecting success of 2000.2 'git checkout-index without -f should fail on conflicting work tree.': test_must_fail git checkout-index -a
-path0 already exists, no checkout
-fatal: cannot create directory at 'path1': File exists
-ok 2 - git checkout-index without -f should fail on conflicting work tree.
-
-expecting success of 2000.3 'git checkout-index with -f should succeed.': git checkout-index -f -a
-ok 3 - git checkout-index with -f should succeed.
-
-expecting success of 2000.4 'git checkout-index conflicting paths.': test -f path0 && test -d path1 && test -f path1/file1
-ok 4 - git checkout-index conflicting paths.
-
-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 2000.5 'checkout-index -f twice with --prefix': 
-	mkdir -p tar/get &&
-	ln -s tar/get there &&
-	echo first &&
-	git checkout-index -a -f --prefix=there/ &&
-	echo second &&
-	git checkout-index -a -f --prefix=there/
-
-first
-second
-ok 5 - checkout-index -f twice with --prefix
-
-expecting success of 2000.6 'git update-index --add path2/file0': git update-index --add path2/file0
-ok 6 - git update-index --add path2/file0
-
-expecting success of 2000.7 'writing tree out with git write-tree': tree1=$(git write-tree)
-ok 7 - writing tree out with git write-tree
-
-expecting success of 2000.8 'git update-index --add path3/file1': git update-index --add path3/file1
-ok 8 - git update-index --add path3/file1
-
-expecting success of 2000.9 'writing tree out with git write-tree': tree2=$(git write-tree)
-ok 9 - writing tree out with git write-tree
-
-expecting success of 2000.10 'read previously written tree and checkout.': git read-tree -m $tree1 && git checkout-index -f -a
-ok 10 - read previously written tree and checkout.
-
-expecting success of 2000.11 'add a symlink': test_ln_s_add path2 path3
-ok 11 - add a symlink
-
-expecting success of 2000.12 'writing tree out with git write-tree': tree3=$(git write-tree)
-ok 12 - writing tree out with git write-tree
-
-expecting success of 2000.13 'read previously written tree and checkout.': git read-tree $tree2 && git checkout-index -f -a
-ok 13 - read previously written tree and checkout.
-
-expecting success of 2000.14 'checking out conflicting path with -f': test ! -h path2 && test -d path2 &&
-     test ! -h path3 && test -d path3 &&
-     test ! -h path2/file0 && test -f path2/file0 &&
-     test ! -h path3/file1 && test -f path3/file1
-ok 14 - checking out conflicting path with -f
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2002-checkout-cache-u.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2002-checkout-cache-u/.git/
-expecting success of 2002.1 'preparation': 
-echo frotz >path0 &&
-git update-index --add path0 &&
-t=$(git write-tree)
-ok 1 - preparation
-
-expecting success of 2002.2 'without -u, git checkout-index smudges stat information.': 
-rm -f path0 &&
-git read-tree $t &&
-git checkout-index -f -a &&
-test_must_fail git diff-files --exit-code
-:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0000000000000000000000000000000000000000 M	path0
-ok 2 - without -u, git checkout-index smudges stat information.
-
-expecting success of 2002.3 'with -u, git checkout-index picks up stat information from new files.': 
-rm -f path0 &&
-git read-tree $t &&
-git checkout-index -u -f -a &&
-git diff-files --exit-code
-ok 3 - with -u, git checkout-index picks up stat information from new files.
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2005-checkout-index-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2005-checkout-index-symlinks/.git/
-expecting success of 2005.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 2005.2 'the checked-out symlink must be a file': 
-git checkout-index symlink &&
-test -f symlink
-ok 2 - the checked-out symlink must be a file
-
-expecting success of 2005.3 'the file must be the blob we added during the setup': 
-	echo "$l" >expect &&
-	git hash-object -t blob symlink >actual &&
-	test_cmp expect actual
-
-ok 3 - the file must be the blob we added during the setup
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2003-checkout-cache-mkdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1800-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1300-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1300-config/.git/
-expecting success of 1300.1 'setup whitespace config': 
-	sed -e "s/^|//" \
-	    -e "s/[$]$//" \
-	    -e "s/X/	/g" >.git/config <<-\EOF
-	[section]
-	|	solid = rock
-	|	sparse = big XX blue
-	|	sparseAndTail = big XX blue $
-	|	sparseAndTailQuoted = "big XX blue "
-	|	sparseAndBiggerTail = big XX blue X X
-	|	sparseAndBiggerTailQuoted = "big XX blue X X"
-	|	sparseAndBiggerTailQuotedPlus = "big XX blue X X"X $
-	|	headAndTail = Xbig blue $
-	|	headAndTailQuoted = "Xbig blue "
-	|	headAndTailQuotedPlus = "Xbig blue " $
-	|	annotated = big blueX# to be discarded
-	|	annotatedQuoted = "big blue"X# to be discarded
-	EOF
-
-ok 1 - setup whitespace config
-
-expecting success of 1300.2 'no internal whitespace': 
-	echo "rock" >expect &&
-	git config --get section.solid >actual &&
-	test_cmp expect actual
-
-ok 2 - no internal whitespace
-
-expecting success of 1300.3 'internal whitespace': 
-	echo "big QQ blue" | q_to_tab >expect &&
-	git config --get section.sparse >actual &&
-	test_cmp expect actual
-
-ok 3 - internal whitespace
-
-expecting success of 1300.4 'internal and trailing whitespace': 
-	echo "big QQ blue" | q_to_tab >expect &&
-	git config --get section.sparseAndTail >actual &&
-	test_cmp expect actual
-
-ok 4 - internal and trailing whitespace
-
-expecting success of 1300.5 'internal and trailing whitespace, all quoted': 
-	echo "big QQ blue " | q_to_tab >expect &&
-	git config --get section.sparseAndTailQuoted >actual &&
-	test_cmp expect actual
-
-ok 5 - internal and trailing whitespace, all quoted
-
-expecting success of 1300.6 'internal and more trailing whitespace': 
-	echo "big QQ blue" | q_to_tab >expect &&
-	git config --get section.sparseAndBiggerTail >actual &&
-	test_cmp expect actual
-
-ok 6 - internal and more trailing whitespace
-
-expecting success of 1300.7 'internal and more trailing whitespace, all quoted': 
-	echo "big QQ blue Q Q" | q_to_tab >expect &&
-	git config --get section.sparseAndBiggerTailQuoted >actual &&
-	test_cmp expect actual
-
-ok 7 - internal and more trailing whitespace, all quoted
-
-expecting success of 1300.8 'internal and more trailing whitespace, not all quoted': 
-	echo "big QQ blue Q Q" | q_to_tab >expect &&
-	git config --get section.sparseAndBiggerTailQuotedPlus >actual &&
-	test_cmp expect actual
-
-ok 8 - internal and more trailing whitespace, not all quoted
-
-expecting success of 1300.9 'leading and trailing whitespace': 
-	echo "big blue" >expect &&
-	git config --get section.headAndTail >actual &&
-	test_cmp expect actual
-
-ok 9 - leading and trailing whitespace
-
-expecting success of 1300.10 'leading and trailing whitespace, all quoted': 
-	echo "Qbig blue " | q_to_tab >expect &&
-	git config --get section.headAndTailQuoted >actual &&
-	test_cmp expect actual
-
-ok 10 - leading and trailing whitespace, all quoted
-
-expecting success of 1300.11 'leading and trailing whitespace, not all quoted': 
-	echo "Qbig blue " | q_to_tab >expect &&
-	git config --get section.headAndTailQuotedPlus >actual &&
-	test_cmp expect actual
-
-ok 11 - leading and trailing whitespace, not all quoted
-
-expecting success of 1300.12 'inline comment': 
-	echo "big blue" >expect &&
-	git config --get section.annotated >actual &&
-	test_cmp expect actual
-
-ok 12 - inline comment
-
-expecting success of 1300.13 'inline comment, quoted': 
-	echo "big blue" >expect &&
-	git config --get section.annotatedQuoted >actual &&
-	test_cmp expect actual
-
-ok 13 - inline comment, quoted
-
-expecting success of 1300.14 'clear default config': 
-	rm -f .git/config
-
-ok 14 - clear default config
-
-expecting success of 1300.15 'initial': 
-	git config ${mode_set} section.penguin "little blue" &&
-	test_cmp expect .git/config
-
-ok 15 - initial
-
-expecting success of 1300.16 'mixed case': 
-	git config ${mode_set} Section.Movie BadPhysics &&
-	test_cmp expect .git/config
-
-ok 16 - mixed case
-
-expecting success of 1300.17 'similar section': 
-	git config ${mode_set} Sections.WhatEver Second &&
-	test_cmp expect .git/config
-
-ok 17 - similar section
-
-expecting success of 1300.18 'uppercase section': 
-	git config ${mode_set} SECTION.UPPERCASE true &&
-	test_cmp expect .git/config
-
-ok 18 - uppercase section
-
-expecting success of 1300.19 'replace with non-match': 
-	git config section.penguin kingpin !blue
-
-ok 19 - replace with non-match
-
-expecting success of 1300.20 'replace with non-match (actually matching)': 
-	git config section.penguin "very blue" !kingpin
-
-ok 20 - replace with non-match (actually matching)
-
-expecting success of 1300.21 'append comments': 
-	git config --replace-all --comment="Pygoscelis papua" section.penguin gentoo &&
-	git config ${mode_set} --comment="find fish" section.disposition peckish &&
-	git config ${mode_set} --comment="#abc" section.foo bar &&
-
-	git config --comment="and comment" section.spsp value &&
-	git config --comment="	# and comment" section.htsp value &&
-
-	test_cmp expect .git/config
-
-ok 21 - append comments
-
-expecting success of 1300.22 'Prohibited LF in comment': 
-	test_must_fail git config ${mode_set} --comment="a${LF}b" section.k v
-
-fatal: no multi-line comment allowed: 'a
-b'
-ok 22 - Prohibited LF in comment
-
-expecting success of 1300.23 'non-match result': test_cmp expect .git/config
-ok 23 - non-match result
-
-expecting success of 1300.24 'find mixed-case key by canonical name': 
-	test_cmp_config Second sections.whatever
-
-ok 24 - find mixed-case key by canonical name
-
-expecting success of 1300.25 'find mixed-case key by non-canonical name': 
-	test_cmp_config Second SeCtIoNs.WhAtEvEr
-
-ok 25 - find mixed-case key by non-canonical name
-
-expecting success of 1300.26 'subsections are not canonicalized by git-config': 
-	cat >>.git/config <<-\EOF &&
-	[section.SubSection]
-	key = one
-	[section "SubSection"]
-	key = two
-	EOF
-	test_cmp_config one section.subsection.key &&
-	test_cmp_config two section.SubSection.key
-
-ok 26 - subsections are not canonicalized by git-config
-
-expecting success of 1300.27 'value for missing section and missing key is not printed': 
-		test_must_fail git config "$key" >out 2>err &&
-		test_must_be_empty out &&
-		test_must_be_empty err
-	
-ok 27 - value for missing section and missing key is not printed
-
-expecting success of 1300.28 'value for missing section and existing key is not printed': 
-		test_must_fail git config "$key" >out 2>err &&
-		test_must_be_empty out &&
-		test_must_be_empty err
-	
-ok 28 - value for missing section and existing key is not printed
-
-expecting success of 1300.29 'value for existing section and missing key is not printed': 
-		test_must_fail git config "$key" >out 2>err &&
-		test_must_be_empty out &&
-		test_must_be_empty err
-	
-ok 29 - value for existing section and missing key is not printed
-
-expecting success of 1300.30 'value for missing subsection and missing key is not printed': 
-		test_must_fail git config "$key" >out 2>err &&
-		test_must_be_empty out &&
-		test_must_be_empty err
-	
-ok 30 - value for missing subsection and missing key is not printed
-
-expecting success of 1300.31 'value for existing subsection and missing key is not printed': 
-		test_must_fail git config "$key" >out 2>err &&
-		test_must_be_empty out &&
-		test_must_be_empty err
-	
-ok 31 - value for existing subsection and missing key is not printed
-
-expecting success of 1300.32 'value for missing subsection and existing key is not printed': 
-		test_must_fail git config "$key" >out 2>err &&
-		test_must_be_empty out &&
-		test_must_be_empty err
-	
-ok 32 - value for missing subsection and existing key is not printed
-
-expecting success of 1300.33 'unset with cont. lines': 
-	git config ${mode_unset} beta.baz
-
-ok 33 - unset with cont. lines
-
-expecting success of 1300.34 'unset with cont. lines is correct': test_cmp expect .git/config
-ok 34 - unset with cont. lines is correct
-
-expecting success of 1300.35 'multiple unset': 
-	git config ${mode_unset_all} beta.haha
-
-ok 35 - multiple unset
-
-expecting success of 1300.36 'multiple unset is correct': 
-	test_cmp expect .git/config
-
-ok 36 - multiple unset is correct
-
-expecting success of 1300.37 '--replace-all missing value': 
-	test_must_fail git config ${mode_replace_all} beta.haha &&
-	test_cmp .git/config2 .git/config
-
-error: wrong number of arguments, should be from 2 to 3
-ok 37 - --replace-all missing value
-
-expecting success of 1300.38 '--replace-all': 
-	git config ${mode_replace_all} beta.haha gamma
-
-ok 38 - --replace-all
-
-expecting success of 1300.39 'all replaced': 
-	test_cmp expect .git/config
-
-ok 39 - all replaced
-
-expecting success of 1300.40 'really mean test': 
-	git config ${mode_set} beta.haha alpha &&
-	test_cmp expect .git/config
-
-ok 40 - really mean test
-
-expecting success of 1300.41 'really really mean test': 
-	git config ${mode_set} nextsection.nonewline wow &&
-	test_cmp expect .git/config
-
-ok 41 - really really mean test
-
-expecting success of 1300.42 'get value': 
-	test_cmp_config alpha beta.haha
-
-ok 42 - get value
-
-expecting success of 1300.43 'unset': 
-	git config ${mode_unset} beta.haha &&
-	test_cmp expect .git/config
-
-ok 43 - unset
-
-expecting success of 1300.44 'multivar': 
-	git config nextsection.NoNewLine "wow2 for me" "for me$" &&
-	test_cmp expect .git/config
-
-ok 44 - multivar
-
-expecting success of 1300.45 'non-match': 
-	git config --get nextsection.nonewline !for
-
-wow
-ok 45 - non-match
-
-expecting success of 1300.46 'non-match value': 
-	test_cmp_config wow --get nextsection.nonewline !for
-
-ok 46 - non-match value
-
-expecting success of 1300.47 'multi-valued get returns final one': 
-	test_cmp_config "wow2 for me" --get nextsection.nonewline
-
-ok 47 - multi-valued get returns final one
-
-expecting success of 1300.48 'multi-valued get-all returns all': 
-	cat >expect <<-\EOF &&
-	wow
-	wow2 for me
-	EOF
-	git config ${mode_get_all} nextsection.nonewline >actual &&
-	test_cmp expect actual
-
-ok 48 - multi-valued get-all returns all
-
-expecting success of 1300.49 'multivar replace': 
-	git config nextsection.nonewline "wow3" "wow$" &&
-	test_cmp expect .git/config
-
-ok 49 - multivar replace
-
-expecting success of 1300.50 'ambiguous unset': 
-	test_must_fail git config ${mode_unset} nextsection.nonewline
-
-warning: nextsection.nonewline has multiple values
-ok 50 - ambiguous unset
-
-expecting success of 1300.51 'invalid unset': 
-	test_must_fail git config ${mode_unset} somesection.nonewline
-
-ok 51 - invalid unset
-
-expecting success of 1300.52 'multivar unset': 
-	case "$mode" in
-	legacy)
-		git config --unset nextsection.nonewline "wow3$";;
-	subcommands)
-		git config unset --value="wow3$" nextsection.nonewline;;
-	esac &&
-	test_cmp expect .git/config
-
-ok 52 - multivar unset
-
-expecting success of 1300.53 'invalid key': test_must_fail git config inval.2key blabla
-error: invalid key: inval.2key
-ok 53 - invalid key
-
-expecting success of 1300.54 'correct key': git config 123456.a123 987
-ok 54 - correct key
-
-expecting success of 1300.55 'hierarchical section': 
-	git config Version.1.2.3eX.Alpha beta
-
-ok 55 - hierarchical section
-
-expecting success of 1300.56 'hierarchical section value': 
-	test_cmp expect .git/config
-
-ok 56 - hierarchical section value
-
-expecting success of 1300.57 'working --list': 
-	git config ${mode_prefix}list > output &&
-	test_cmp expect output
-
-ok 57 - working --list
-
-expecting success of 1300.58 '--list without repo produces empty output': 
-	git --git-dir=nonexistent config ${mode_prefix}list >output &&
-	test_must_be_empty output
-
-ok 58 - --list without repo produces empty output
-
-expecting success of 1300.59 '--name-only --list': 
-	git config ${mode_prefix}list --name-only >output &&
-	test_cmp expect output
-
-ok 59 - --name-only --list
-
-expecting success of 1300.60 '--get-regexp': 
-	git config ${mode_get_regexp} in >output &&
-	test_cmp expect output
-
-ok 60 - --get-regexp
-
-expecting success of 1300.61 '--name-only --get-regexp': 
-	git config ${mode_get_regexp} --name-only in >output &&
-	test_cmp expect output
-
-ok 61 - --name-only --get-regexp
-
-expecting success of 1300.62 '--add': 
-	git config --add nextsection.nonewline "wow4 for you" &&
-	git config ${mode_get_all} nextsection.nonewline > output &&
-	test_cmp expect output
-
-ok 62 - --add
-
-expecting success of 1300.63 'get variable with no value': 
-	git config --get novalue.variable ^$
-
-
-ok 63 - get variable with no value
-
-expecting success of 1300.64 'get variable with empty value': 
-	git config --get emptyvalue.variable ^$
-
-
-ok 64 - get variable with empty value
-
-expecting success of 1300.65 'get-regexp variable with no value': 
-	git config ${mode_get_regexp} novalue > output &&
-	test_cmp expect output
-
-ok 65 - get-regexp variable with no value
-
-expecting success of 1300.66 'get-regexp --bool variable with no value': 
-	git config ${mode_get_regexp} --bool novalue > output &&
-	test_cmp expect output
-
-ok 66 - get-regexp --bool variable with no value
-
-expecting success of 1300.67 'get-regexp variable with empty value': 
-	git config ${mode_get_regexp} emptyvalue > output &&
-	test_cmp expect output
-
-ok 67 - get-regexp variable with empty value
-
-expecting success of 1300.68 'get bool variable with no value': 
-	git config --bool novalue.variable > output &&
-	test_cmp expect output
-
-ok 68 - get bool variable with no value
-
-expecting success of 1300.69 'get bool variable with empty value': 
-	git config --bool emptyvalue.variable > output &&
-	test_cmp expect output
-
-ok 69 - get bool variable with empty value
-
-expecting success of 1300.70 'no arguments, but no crash': 
-	test_must_fail git config >output 2>&1 &&
-	echo "error: no action specified" >expect &&
-	test_cmp expect output
-
-ok 70 - no arguments, but no crash
-
-expecting success of 1300.71 'new section is partial match of another': 
-	git config a.x y &&
-	test_cmp expect .git/config
-
-ok 71 - new section is partial match of another
-
-expecting success of 1300.72 'new variable inserts into proper section': 
-	git config b.x y &&
-	git config a.b c &&
-	test_cmp expect .git/config
-
-ok 72 - new variable inserts into proper section
-
-expecting success of 1300.73 'alternative --file (non-existing file should fail)': 
-	test_must_fail git config --file non-existing-config -l &&
-	test_must_fail git config --file non-existing-config test.xyzzy
-
-fatal: unable to read config file 'non-existing-config': No such file or directory
-ok 73 - alternative --file (non-existing file should fail)
-
-expecting success of 1300.74 'alternative GIT_CONFIG': 
-	GIT_CONFIG=other-config git config ${mode_prefix}list >output &&
-	test_cmp expect output
-
-ok 74 - alternative GIT_CONFIG
-
-expecting success of 1300.75 'alternative GIT_CONFIG (--file)': 
-	git config ${mode_prefix}list --file other-config >output &&
-	test_cmp expect output
-
-ok 75 - alternative GIT_CONFIG (--file)
-
-expecting success of 1300.76 'alternative GIT_CONFIG (--file=-)': 
-	git config ${mode_prefix}list --file - <other-config >output &&
-	test_cmp expect output
-
-ok 76 - alternative GIT_CONFIG (--file=-)
-
-expecting success of 1300.77 'setting a value in stdin is an error': 
-	test_must_fail git config --file - some.value foo
-
-fatal: writing to stdin is not supported
-ok 77 - setting a value in stdin is an error
-
-expecting success of 1300.78 'editing stdin is an error': 
-	test_must_fail git config ${mode_prefix}edit --file -
-
-fatal: editing stdin is not supported
-ok 78 - editing stdin is an error
-
-expecting success of 1300.79 'refer config from subdirectory': 
-	test_when_finished "rm -r x" &&
-	mkdir x &&
-	test_cmp_config -C x strasse --file=../other-config --get ein.bahn
-
-ok 79 - refer config from subdirectory
-
-expecting success of 1300.80 '--set in alternative file': 
-	git config --file=other-config anwohner.park ausweis &&
-	test_cmp expect other-config
-
-ok 80 - --set in alternative file
-
-expecting success of 1300.81 'rename section': 
-	git config ${mode_prefix}rename-section branch.eins branch.zwei
-
-ok 81 - rename section
-
-expecting success of 1300.82 'rename succeeded': 
-	test_cmp expect .git/config
-
-ok 82 - rename succeeded
-
-expecting success of 1300.83 'rename non-existing section': 
-	test_must_fail git config ${mode_prefix}rename-section \
-		branch."world domination" branch.drei
-
-fatal: no such section: branch.world domination
-ok 83 - rename non-existing section
-
-expecting success of 1300.84 'rename succeeded': 
-	test_cmp expect .git/config
-
-ok 84 - rename succeeded
-
-expecting success of 1300.85 'rename another section': 
-	git config ${mode_prefix}rename-section branch."1 234 blabl/a" branch.drei
-
-ok 85 - rename another section
-
-expecting success of 1300.86 'rename succeeded': 
-	test_cmp expect .git/config
-
-ok 86 - rename succeeded
-
-expecting success of 1300.87 'rename a section with a var on the same line': 
-	git config ${mode_prefix}rename-section branch.vier branch.zwei
-
-ok 87 - rename a section with a var on the same line
-
-expecting success of 1300.88 'rename succeeded': 
-	test_cmp expect .git/config
-
-ok 88 - rename succeeded
-
-expecting success of 1300.89 'renaming empty section name is rejected': 
-	test_must_fail git config ${mode_prefix}rename-section branch.zwei ""
-
-error: invalid section name: 
-ok 89 - renaming empty section name is rejected
-
-expecting success of 1300.90 'renaming to bogus section is rejected': 
-	test_must_fail git config ${mode_prefix}rename-section branch.zwei "bogus name"
-
-error: invalid section name: bogus name
-ok 90 - renaming to bogus section is rejected
-
-expecting success of 1300.91 'renaming a section with a long line': 
-	{
-		printf "[b]\\n" &&
-		printf "  c = d %1024s [a] e = f\\n" " " &&
-		printf "[a] g = h\\n"
-	} >y &&
-	git config ${mode_prefix}rename-section -f y a xyz &&
-	test_must_fail git config -f y b.e
-
-ok 91 - renaming a section with a long line
-
-expecting success of 1300.92 'renaming an embedded section with a long line': 
-	{
-		printf "[b]\\n" &&
-		printf "  c = d %1024s [a] [foo] e = f\\n" " " &&
-		printf "[a] g = h\\n"
-	} >y &&
-	git config ${mode_prefix}rename-section -f y a xyz &&
-	test_must_fail git config -f y foo.e
-
-ok 92 - renaming an embedded section with a long line
-
-expecting success of 1300.93 'renaming a section with an overly-long line': 
-	{
-		printf "[b]\\n" &&
-		printf "  c = d %525000s e" " " &&
-		printf "[a] g = h\\n"
-	} >y &&
-	test_must_fail git config ${mode_prefix}rename-section -f y a xyz 2>err &&
-	grep "refusing to work with overly long line in .y. on line 2" err
-
-error: refusing to work with overly long line in 'y' on line 2
-ok 93 - renaming a section with an overly-long line
-
-expecting success of 1300.94 'remove section': 
-	git config ${mode_prefix}remove-section branch.zwei
-
-ok 94 - remove section
-
-expecting success of 1300.95 'section was removed properly': 
-	test_cmp expect .git/config
-
-ok 95 - section was removed properly
-
-expecting success of 1300.96 'section ending': 
-	rm -f .git/config &&
-	git config ${mode_set} gitcvs.enabled true &&
-	git config ${mode_set} gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
-	git config ${mode_set} gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
-	test_cmp expect .git/config
-
-
-ok 96 - section ending
-
-expecting success of 1300.97 'numbers': 
-	git config ${mode_set} kilo.gram 1k &&
-	git config ${mode_set} mega.ton 1m &&
-	echo 1024 >expect &&
-	echo 1048576 >>expect &&
-	git config --int --get kilo.gram >actual &&
-	git config --int --get mega.ton >>actual &&
-	test_cmp expect actual
-
-ok 97 - numbers
-
-expecting success of 1300.98 '--int is at least 64 bits': 
-	git config ${mode_set} giga.watts 121g &&
-	echo  >expect &&
-	test_cmp_config 129922760704 --int --get giga.watts
-
-ok 98 - --int is at least 64 bits
-
-expecting success of 1300.99 'invalid unit': 
-	git config ${mode_set} aninvalid.unit "1auto" &&
-	test_cmp_config 1auto aninvalid.unit &&
-	test_must_fail git config --int --get aninvalid.unit 2>actual &&
-	test_grep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
-
-fatal: bad numeric config value '1auto' for 'aninvalid.unit' in file .git/config: invalid unit
-ok 99 - invalid unit
-
-expecting success of 1300.100 'invalid unit boolean': 
-	git config ${mode_set} commit.gpgsign "1true" &&
-	test_cmp_config 1true commit.gpgsign &&
-	test_must_fail git config --bool --get commit.gpgsign 2>actual &&
-	test_grep "bad boolean config value .1true. for .commit.gpgsign." actual
-
-fatal: bad boolean config value '1true' for 'commit.gpgsign'
-ok 100 - invalid unit boolean
-
-expecting success of 1300.101 'line number is reported correctly': 
-	printf "[bool]\n\tvar\n" >invalid &&
-	test_must_fail git config -f invalid --path bool.var 2>actual &&
-	test_grep "line 2" actual
-
-fatal: bad config line 2 in file invalid
-ok 101 - line number is reported correctly
-
-expecting success of 1300.102 'invalid stdin config': 
-	echo "[broken" | test_must_fail git config ${mode_prefix}list --file - >output 2>&1 &&
-	test_grep "bad config line 1 in standard input" output
-
-fatal: bad config line 1 in standard input
-ok 102 - invalid stdin config
-
-expecting success of 1300.103 'bool': 
-
-	git config ${mode_set} bool.true1 01 &&
-	git config ${mode_set} bool.true2 -1 &&
-	git config ${mode_set} bool.true3 YeS &&
-	git config ${mode_set} bool.true4 true &&
-	git config ${mode_set} bool.false1 000 &&
-	git config ${mode_set} bool.false2 "" &&
-	git config ${mode_set} bool.false3 nO &&
-	git config ${mode_set} bool.false4 FALSE &&
-	rm -f result &&
-	for i in 1 2 3 4
-	do
-	    git config --bool --get bool.true$i >>result &&
-	    git config --bool --get bool.false$i >>result || return 1
-	done &&
-	test_cmp expect result
-ok 103 - bool
-
-expecting success of 1300.104 'invalid bool (--get)': 
-
-	git config ${mode_set} bool.nobool foobar &&
-	test_must_fail git config --bool --get bool.nobool
-fatal: bad boolean config value 'foobar' for 'bool.nobool'
-ok 104 - invalid bool (--get)
-
-expecting success of 1300.105 'invalid bool (set)': 
-
-	test_must_fail git config --bool bool.nobool foobar
-fatal: bad boolean config value 'foobar' for 'bool.nobool'
-ok 105 - invalid bool (set)
-
-expecting success of 1300.106 'set --bool': 
-
-	rm -f .git/config &&
-	git config --bool bool.true1 01 &&
-	git config --bool bool.true2 -1 &&
-	git config --bool bool.true3 YeS &&
-	git config --bool bool.true4 true &&
-	git config --bool bool.false1 000 &&
-	git config --bool bool.false2 "" &&
-	git config --bool bool.false3 nO &&
-	git config --bool bool.false4 FALSE &&
-	test_cmp expect .git/config
-ok 106 - set --bool
-
-expecting success of 1300.107 'set --int': 
-
-	rm -f .git/config &&
-	git config --int int.val1 01 &&
-	git config --int int.val2 -1 &&
-	git config --int int.val3 5m &&
-	test_cmp expect .git/config
-
-ok 107 - set --int
-
-expecting success of 1300.108 'get --bool-or-int': 
-	cat >.git/config <<-\EOF &&
-	[bool]
-	true1
-	true2 = true
-	false = false
-	[int]
-	int1 = 0
-	int2 = 1
-	int3 = -1
-	EOF
-	cat >expect <<-\EOF &&
-	true
-	true
-	false
-	0
-	1
-	-1
-	EOF
-	{
-		git config --bool-or-int bool.true1 &&
-		git config --bool-or-int bool.true2 &&
-		git config --bool-or-int bool.false &&
-		git config --bool-or-int int.int1 &&
-		git config --bool-or-int int.int2 &&
-		git config --bool-or-int int.int3
-	} >actual &&
-	test_cmp expect actual
-
-ok 108 - get --bool-or-int
-
-expecting success of 1300.109 'set --bool-or-int': 
-	rm -f .git/config &&
-	git config --bool-or-int bool.true1 true &&
-	git config --bool-or-int bool.false1 false &&
-	git config --bool-or-int bool.true2 yes &&
-	git config --bool-or-int bool.false2 no &&
-	git config --bool-or-int int.int1 0 &&
-	git config --bool-or-int int.int2 1 &&
-	git config --bool-or-int int.int3 -1 &&
-	test_cmp expect .git/config
-
-ok 109 - set --bool-or-int
-
-expecting success of 1300.110 'set --path': 
-	rm -f .git/config &&
-	git config --path path.home "~/" &&
-	git config --path path.normal "/dev/null" &&
-	git config --path path.trailingtilde "foo~" &&
-	test_cmp expect .git/config
-ok 110 - set --path
-
-expecting success of 1300.111 'get --path': 
-	git config --get --path path.home > result &&
-	git config --get --path path.normal >> result &&
-	git config --get --path path.trailingtilde >> result &&
-	test_cmp expect result
-
-ok 111 - get --path
-
-expecting success of 1300.112 'get --path copes with unset $HOME': 
-	(
-		sane_unset HOME &&
-		test_must_fail git config --get --path path.home \
-			>result 2>msg &&
-		git config --get --path path.normal >>result &&
-		git config --get --path path.trailingtilde >>result
-	) &&
-	test_grep "[Ff]ailed to expand.*~/" msg &&
-	test_cmp expect result
-
-fatal: failed to expand user dir in: '~/'
-ok 112 - get --path copes with unset $HOME
-
-expecting success of 1300.113 'get --path barfs on boolean variable': 
-	echo "[path]bool" >.git/config &&
-	test_must_fail git config --get --path path.bool
-
-error: missing value for 'path.bool'
-fatal: bad config line 1 in file .git/config
-ok 113 - get --path barfs on boolean variable
-
-expecting success of 1300.114 'get --expiry-date': 
-	rel="3.weeks.5.days.00:00" &&
-	rel_out="$rel ->" &&
-	cat >.git/config <<-\EOF &&
-	[date]
-	valid1 = "3.weeks.5.days 00:00"
-	valid2 = "Fri Jun 4 15:46:55 2010"
-	valid3 = "2017/11/11 11:11:11PM"
-	valid4 = "2017/11/10 09:08:07 PM"
-	valid5 = "never"
-	invalid1 = "abc"
-	EOF
-	cat >expect <<-EOF &&
-	$(test-tool date timestamp $rel)
-	1275666415
-	1510441871
-	1510348087
-	0
-	EOF
-	: "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&
-	{
-		echo "$rel_out $(git config --expiry-date date.valid1)" &&
-		git config --expiry-date date.valid2 &&
-		git config --expiry-date date.valid3 &&
-		git config --expiry-date date.valid4 &&
-		git config --expiry-date date.valid5
-	} >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config --expiry-date date.invalid1
-
-error: 'abc' for 'date.invalid1' is not a valid timestamp
-fatal: bad config line 7 in file .git/config
-ok 114 - get --expiry-date
-
-expecting success of 1300.115 'get --type=color': 
-	rm .git/config &&
-	git config ${mode_set} foo.color "red" &&
-	git config --get --type=color foo.color >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	echo "<RED>" >expect &&
-	test_cmp expect actual
-
-ok 115 - get --type=color
-
-expecting success of 1300.116 'set --type=color': 
-	rm .git/config &&
-	git config --type=color foo.color "red" &&
-	test_cmp expect .git/config
-
-ok 116 - set --type=color
-
-expecting success of 1300.117 'get --type=color barfs on non-color': 
-	echo "[foo]bar=not-a-color" >.git/config &&
-	test_must_fail git config --get --type=color foo.bar
-
-error: invalid color value: not-a-color
-fatal: bad config line 1 in file .git/config
-ok 117 - get --type=color barfs on non-color
-
-expecting success of 1300.118 'set --type=color barfs on non-color': 
-	test_must_fail git config --type=color foo.color "not-a-color" 2>error &&
-	test_grep "cannot parse color" error
-
-fatal: cannot parse color 'not-a-color'
-ok 118 - set --type=color barfs on non-color
-
-expecting success of 1300.119 'quoting': 
-	rm -f .git/config &&
-	git config ${mode_set} quote.leading " test" &&
-	git config ${mode_set} quote.ending "test " &&
-	git config ${mode_set} quote.semicolon "test;test" &&
-	git config ${mode_set} quote.hash "test#test" &&
-	test_cmp expect .git/config
-
-ok 119 - quoting
-
-expecting success of 1300.120 'key with newline': 
-	test_must_fail git config ${mode_get} "key.with
-newline" 123
-error: invalid key: key.with
-newline
-ok 120 - key with newline
-
-expecting success of 1300.121 'value with newline': git config ${mode_set} key.sub value.with\\\
-newline
-ok 121 - value with newline
+expecting success of 1300.121 'value with newline': git config ${mode_set} key.sub value.with\\\
+newline
+ok 121 - value with newline
 
 expecting success of 1300.122 'value continued on next line': 
 	git config ${mode_prefix}list > result &&
@@ -87713,6 +79460,435 @@
 1..480
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1800-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2003-checkout-cache-mkdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2005-checkout-index-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2005-checkout-index-symlinks/.git/
+expecting success of 2005.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 2005.2 'the checked-out symlink must be a file': 
+git checkout-index symlink &&
+test -f symlink
+ok 2 - the checked-out symlink must be a file
+
+expecting success of 2005.3 'the file must be the blob we added during the setup': 
+	echo "$l" >expect &&
+	git hash-object -t blob symlink >actual &&
+	test_cmp expect actual
+
+ok 3 - the file must be the blob we added during the setup
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t2007-checkout-symlink.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2007-checkout-symlink/.git/
 expecting success of 2007.1 'setup': 
@@ -87794,941 +79970,288 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2006-checkout-index-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2006-checkout-index-basic/.git/
-expecting success of 2006.1 'checkout-index --gobbledegook': 
-	test_expect_code 129 git checkout-index --gobbledegook 2>err &&
-	test_grep "[Uu]sage" err
-
-usage: git checkout-index [<options>] [--] [<file>...]
-ok 1 - checkout-index --gobbledegook
-
-expecting success of 2006.2 'checkout-index -h in broken repository': 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git checkout-index -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2006-checkout-index-basic/broken/.git/
-usage: git checkout-index [<options>] [--] [<file>...]
-ok 2 - checkout-index -h in broken repository
-
-expecting success of 2006.3 'checkout-index reports errors (cmdline)': 
-	test_must_fail git checkout-index -- does-not-exist 2>stderr &&
-	test_grep not.in.the.cache stderr
+*** t1700-split-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1700-split-index/.git/
+expecting success of 1700.1 'setup': 
+	test_oid_cache <<-EOF
+	own_v3 sha1:8299b0bcd1ac364e5f1d7768efb62fa2da79a339
+	own_v3 sha256:38a6d2925e3eceec33ad7b34cbff4e0086caa0daf28f31e51f5bd94b4a7af86b
 
-git checkout-index: does-not-exist is not in the cache
-ok 3 - checkout-index reports errors (cmdline)
+	base_v3 sha1:39d890139ee5356c7ef572216cebcd27aa41f9df
+	base_v3 sha256:c9baeadf905112bf6c17aefbd7d02267afd70ded613c30cafed2d40cb506e1ed
 
-expecting success of 2006.4 'checkout-index reports errors (stdin)': 
-	echo does-not-exist |
-	test_must_fail git checkout-index --stdin 2>stderr &&
-	test_grep not.in.the.cache stderr
+	own_v4 sha1:432ef4b63f32193984f339431fd50ca796493569
+	own_v4 sha256:6738ac6319c25b694afa7bcc313deb182d1a59b68bf7a47b4296de83478c0420
 
-git checkout-index: does-not-exist is not in the cache
-ok 4 - checkout-index reports errors (stdin)
+	base_v4 sha1:508851a7f0dfa8691e9f69c7f055865389012491
+	base_v4 sha256:3177d4adfdd4b6904f7e921d91d715a471c0dde7cf6a4bba574927f02b699508
+	EOF
 
-checking prerequisite: SYMLINKS
+ok 1 - setup
 
-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 1700.2 'enable split index': 
+	git config splitIndex.maxPercentChange 100 &&
+	git update-index --split-index &&
+	test-tool dump-split-index .git/index >actual &&
+	indexversion=$(git update-index --show-index-version) &&
 
-)
-prerequisite SYMLINKS ok
-checking prerequisite: CASE_INSENSITIVE_FS
+	# NEEDSWORK: Stop hard-coding checksums.
+	if test "$indexversion" = "4"
+	then
+		own=$(test_oid own_v4) &&
+		base=$(test_oid base_v4)
+	else
+		own=$(test_oid own_v3) &&
+		base=$(test_oid base_v3)
+	fi &&
 
-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
+	cat >expect <<-EOF &&
+	own $own
+	base $base
+	replacements:
+	deletions:
+	EOF
+	test_cmp expect actual
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 5 # skip checkout-index with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+ok 2 - enable split index
 
-checking prerequisite: UTF8_NFD_TO_NFC
+expecting success of 1700.3 'add one file': 
+	create_non_racy_file one &&
+	git update-index --add one &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-	# check whether FS converts nfd unicode to nfc
-	auml=$(printf "\303\244")
-	aumlcdiar=$(printf "\141\314\210")
-	>"$auml" &&
-	test -f "$aumlcdiar"
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	base $base
+	100644 $EMPTY_BLOB 0	one
+	replacements:
+	deletions:
+	EOF
+	test_cmp expect actual
 
-)
-prerequisite UTF8_NFD_TO_NFC not satisfied
-ok 6 # skip checkout-index with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
+ok 3 - add one file
 
-expecting success of 2006.7 'checkout-index --temp correctly reports error on missing blobs': 
-	test_when_finished git reset --hard &&
-	missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
-	cat >objs <<-EOF &&
-	100644 $missing_blob	file
-	120000 $missing_blob	symlink
+expecting success of 1700.4 'disable split index': 
+	git update-index --no-split-index &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
 	EOF
-	git update-index --index-info <objs &&
+	test_cmp ls-files.expect ls-files.actual &&
 
-	test_must_fail git checkout-index --temp symlink file 2>stderr &&
-	test_grep "unable to read sha1 file of file ($missing_blob)" stderr &&
-	test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr
+	BASE=$(test-tool dump-split-index .git/index | sed -n "s/^own/base/p") &&
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	not a split index
+	EOF
+	test_cmp expect actual
 
-.merge_file_jm6EoT	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
+ok 4 - disable split index
 
-expecting success of 2006.8 'checkout-index --temp correctly reports error for submodules': 
-	git init sub &&
-	test_commit -C sub file &&
-	git submodule add ./sub &&
-	git commit -m sub &&
-	test_must_fail git checkout-index --temp sub 2>stderr &&
-	test_grep "cannot create temporary submodule sub" stderr
+expecting success of 1700.5 'enable split index again, "one" now belongs to base index"': 
+	git update-index --split-index &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2006-checkout-index-basic/sub/.git/
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-Adding existing repo at 'sub' to the index
-[master (root-commit) c4df02a] sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-error: cannot create temporary submodule sub
-ok 8 - checkout-index --temp correctly reports error for submodules
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	$BASE
+	replacements:
+	deletions:
+	EOF
+	test_cmp expect actual
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2004-checkout-cache-temp.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2004-checkout-cache-temp/.git/
-expecting success of 2004.1 'setup': 
-	mkdir asubdir &&
-	echo tree1path0 >path0 &&
-	echo tree1path1 >path1 &&
-	echo tree1path3 >path3 &&
-	echo tree1path4 >path4 &&
-	echo tree1asubdir/path5 >asubdir/path5 &&
-	git update-index --add path0 path1 path3 path4 asubdir/path5 &&
-	t1=$(git write-tree) &&
-	rm -f path* .merge_* actual .git/index &&
-	echo tree2path0 >path0 &&
-	echo tree2path1 >path1 &&
-	echo tree2path2 >path2 &&
-	echo tree2path4 >path4 &&
-	git update-index --add path0 path1 path2 path4 &&
-	t2=$(git write-tree) &&
-	rm -f path* .merge_* actual .git/index &&
-	echo tree2path0 >path0 &&
-	echo tree3path1 >path1 &&
-	echo tree3path2 >path2 &&
-	echo tree3path3 >path3 &&
-	git update-index --add path0 path1 path2 path3 &&
-	t3=$(git write-tree)
+ok 5 - enable split index again, "one" now belongs to base index"
 
-ok 1 - setup
+expecting success of 1700.6 'modify original file, base index untouched': 
+	echo modified | create_non_racy_file one &&
+	file1_blob=$(git hash-object one) &&
+	git update-index one &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $file1_blob 0	one
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
 
-expecting success of 2004.2 'checkout one stage 0 to temporary file': 
-	rm -f path* .merge_* actual .git/index &&
-	git read-tree $t1 &&
-	git checkout-index --temp -- path1 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path1 &&
-	p=$(cut "-d	" -f1 actual) &&
-	test -f $p &&
-	test $(cat $p) = tree1path1
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	q_to_tab >expect <<-EOF &&
+	$BASE
+	100644 $file1_blob 0Q
+	replacements: 0
+	deletions:
+	EOF
+	test_cmp expect actual
 
-ok 2 - checkout one stage 0 to temporary file
+ok 6 - modify original file, base index untouched
 
-expecting success of 2004.3 'checkout all stage 0 to temporary files': 
-	rm -f path* .merge_* actual .git/index &&
-	git read-tree $t1 &&
-	git checkout-index -a --temp >actual &&
-	test_line_count = 5 actual &&
-	for f in path0 path1 path3 path4 asubdir/path5
-	do
-		test $(grep $f actual | cut "-d	" -f2) = $f &&
-		p=$(grep $f actual | cut "-d	" -f1) &&
-		test -f $p &&
-		test $(cat $p) = tree1$f || return 1
-	done
+expecting success of 1700.7 'add another file, which stays index': 
+	create_non_racy_file two &&
+	git update-index --add two &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $file1_blob 0	one
+	100644 $EMPTY_BLOB 0	two
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
 
-ok 3 - checkout all stage 0 to temporary files
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	q_to_tab >expect <<-EOF &&
+	$BASE
+	100644 $file1_blob 0Q
+	100644 $EMPTY_BLOB 0	two
+	replacements: 0
+	deletions:
+	EOF
+	test_cmp expect actual
 
-expecting success of 2004.4 'setup 3-way merge': 
-	rm -f path* .merge_* actual .git/index &&
-	git read-tree -m $t1 $t2 $t3
+ok 7 - add another file, which stays index
 
-ok 4 - setup 3-way merge
+expecting success of 1700.8 'remove file not in base index': 
+	git update-index --force-remove two &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $file1_blob 0	one
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
 
-expecting success of 2004.5 'checkout one stage 2 to temporary file': 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=2 --temp -- path1 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path1 &&
-	p=$(cut "-d	" -f1 actual) &&
-	test -f $p &&
-	test $(cat $p) = tree2path1
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	q_to_tab >expect <<-EOF &&
+	$BASE
+	100644 $file1_blob 0Q
+	replacements: 0
+	deletions:
+	EOF
+	test_cmp expect actual
 
-ok 5 - checkout one stage 2 to temporary file
+ok 8 - remove file not in base index
 
-expecting success of 2004.6 'checkout all stage 2 to temporary files': 
-	rm -f path* .merge_* actual &&
-	git checkout-index --all --stage=2 --temp >actual &&
-	test_line_count = 3 actual &&
-	for f in path1 path2 path4
-	do
-		test $(grep $f actual | cut "-d	" -f2) = $f &&
-		p=$(grep $f actual | cut "-d	" -f1) &&
-		test -f $p &&
-		test $(cat $p) = tree2$f || return 1
-	done
+expecting success of 1700.9 'remove file in base index': 
+	git update-index --force-remove one &&
+	git ls-files --stage >ls-files.actual &&
+	test_must_be_empty ls-files.actual &&
 
-ok 6 - checkout all stage 2 to temporary files
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	$BASE
+	replacements:
+	deletions: 0
+	EOF
+	test_cmp expect actual
 
-expecting success of 2004.7 'checkout all stages of unknown path': 
-	rm -f path* .merge_* actual &&
-	test_must_fail git checkout-index --stage=all --temp \
-		-- does-not-exist 2>stderr &&
-	test_grep not.in.the.cache stderr
+ok 9 - remove file in base index
 
-git checkout-index: does-not-exist is not in the cache
-ok 7 - checkout all stages of unknown path
+expecting success of 1700.10 'add original file back': 
+	create_non_racy_file one &&
+	git update-index --add one &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
 
-expecting success of 2004.8 'checkout all stages/one file to nothing': 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --temp -- path0 >actual 2>stderr &&
-	test_must_be_empty stderr &&
-	test_line_count = 0 actual
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	$BASE
+	100644 $EMPTY_BLOB 0	one
+	replacements:
+	deletions: 0
+	EOF
+	test_cmp expect actual
 
-ok 8 - checkout all stages/one file to nothing
+ok 10 - add original file back
 
-expecting success of 2004.9 'checkout all stages/one file to temporary files': 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --temp -- path1 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path1 &&
-	cut "-d	" -f1 actual | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s1) = tree1path1 &&
-	test $(cat $s2) = tree2path1 &&
-	test $(cat $s3) = tree3path1)
+expecting success of 1700.11 'add new file': 
+	create_non_racy_file two &&
+	git update-index --add two &&
+	git ls-files --stage >actual &&
+	cat >expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
+	100644 $EMPTY_BLOB 0	two
+	EOF
+	test_cmp expect actual
 
-ok 9 - checkout all stages/one file to temporary files
+ok 11 - add new file
 
-expecting success of 2004.10 '--stage=all implies --temp': 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all -- path1 &&
-	test_path_is_missing path1
+expecting success of 1700.12 'unify index, two files remain': 
+	git update-index --no-split-index &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
+	100644 $EMPTY_BLOB 0	two
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
 
-.merge_file_v7tr28 .merge_file_XgGsF2 .merge_file_wAk5LJ	path1
-ok 10 - --stage=all implies --temp
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	not a split index
+	EOF
+	test_cmp expect actual
 
-expecting success of 2004.11 'overriding --stage=all resets implied --temp': 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --stage=2 -- path1 &&
-	echo tree2path1 >expect &&
-	test_cmp expect path1
+ok 12 - unify index, two files remain
 
-ok 11 - overriding --stage=all resets implied --temp
+expecting success of 1700.13 'rev-parse --shared-index-path': 
+	test_create_repo split-index &&
+	(
+		cd split-index &&
+		git update-index --split-index &&
+		echo .git/sharedindex* >expect &&
+		git rev-parse --shared-index-path >actual &&
+		test_cmp expect actual &&
+		mkdir subdirectory &&
+		cd subdirectory &&
+		echo ../.git/sharedindex* >expect &&
+		git rev-parse --shared-index-path >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 2004.12 '--stage=all --no-temp is rejected': 
-	rm -f path* .merge_* actual &&
-	test_must_fail git checkout-index --stage=all --no-temp -- path1 2>err &&
-	grep -v "already exists" err &&
-	grep "options .--stage=all. and .--no-temp. cannot be used together" err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1700-split-index/split-index/.git/
+ok 13 - rev-parse --shared-index-path
 
-fatal: options '--stage=all' and '--no-temp' cannot be used together
-fatal: options '--stage=all' and '--no-temp' cannot be used together
-ok 12 - --stage=all --no-temp is rejected
+expecting success of 1700.14 'set core.splitIndex config variable to true': 
+	git config core.splitIndex true &&
+	create_non_racy_file three &&
+	git update-index --add three &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
+	100644 $EMPTY_BLOB 0	three
+	100644 $EMPTY_BLOB 0	two
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
+	BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	$BASE
+	replacements:
+	deletions:
+	EOF
+	test_cmp expect actual
 
-expecting success of 2004.13 'checkout some stages/one file to temporary files': 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --temp -- path2 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path2 &&
-	cut "-d	" -f1 actual | (read s1 s2 s3 &&
-	test $s1 = . &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s2) = tree2path2 &&
-	test $(cat $s3) = tree3path2)
+ok 14 - set core.splitIndex config variable to true
 
-ok 13 - checkout some stages/one file to temporary files
+expecting success of 1700.15 'set core.splitIndex config variable to false': 
+	git config core.splitIndex false &&
+	git update-index --force-remove three &&
+	git ls-files --stage >ls-files.actual &&
+	cat >ls-files.expect <<-EOF &&
+	100644 $EMPTY_BLOB 0	one
+	100644 $EMPTY_BLOB 0	two
+	EOF
+	test_cmp ls-files.expect ls-files.actual &&
+	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
+	cat >expect <<-EOF &&
+	not a split index
+	EOF
+	test_cmp expect actual
 
-expecting success of 2004.14 'checkout all stages/all files to temporary files': 
-	rm -f path* .merge_* actual &&
-	git checkout-index -a --stage=all --temp >actual &&
-	test_line_count = 5 actual
-
-ok 14 - checkout all stages/all files to temporary files
-
-expecting success of 2004.15 '-- path0: no entry': 
-	test x$(grep path0 actual | cut "-d	" -f2) = x
-
-ok 15 - -- path0: no entry
-
-expecting success of 2004.16 '-- path1: all 3 stages': 
-	test $(grep path1 actual | cut "-d	" -f2) = path1 &&
-	grep path1 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s1) = tree1path1 &&
-	test $(cat $s2) = tree2path1 &&
-	test $(cat $s3) = tree3path1)
-
-ok 16 - -- path1: all 3 stages
-
-expecting success of 2004.17 '-- path2: no stage 1, have stage 2 and 3': 
-	test $(grep path2 actual | cut "-d	" -f2) = path2 &&
-	grep path2 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test $s1 = . &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s2) = tree2path2 &&
-	test $(cat $s3) = tree3path2)
-
-ok 17 - -- path2: no stage 1, have stage 2 and 3
-
-expecting success of 2004.18 '-- path3: no stage 2, have stage 1 and 3': 
-	test $(grep path3 actual | cut "-d	" -f2) = path3 &&
-	grep path3 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test $s2 = . &&
-	test -f $s3 &&
-	test $(cat $s1) = tree1path3 &&
-	test $(cat $s3) = tree3path3)
-
-ok 18 - -- path3: no stage 2, have stage 1 and 3
-
-expecting success of 2004.19 '-- path4: no stage 3, have stage 1 and 3': 
-	test $(grep path4 actual | cut "-d	" -f2) = path4 &&
-	grep path4 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test -f $s2 &&
-	test $s3 = . &&
-	test $(cat $s1) = tree1path4 &&
-	test $(cat $s2) = tree2path4)
-
-ok 19 - -- path4: no stage 3, have stage 1 and 3
-
-expecting success of 2004.20 '-- asubdir/path5: no stage 2 and 3 have stage 1': 
-	test $(grep asubdir/path5 actual | cut "-d	" -f2) = asubdir/path5 &&
-	grep asubdir/path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test $s2 = . &&
-	test $s3 = . &&
-	test $(cat $s1) = tree1asubdir/path5)
-
-ok 20 - -- asubdir/path5: no stage 2 and 3 have stage 1
-
-expecting success of 2004.21 'checkout --temp within subdir': 
-	(
-		cd asubdir &&
-		git checkout-index -a --stage=all >actual &&
-		test_line_count = 1 actual &&
-		test $(grep path5 actual | cut "-d	" -f2) = path5 &&
-		grep path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-		test -f ../$s1 &&
-		test $s2 = . &&
-		test $s3 = . &&
-		test $(cat ../$s1) = tree1asubdir/path5)
-	)
-
-ok 21 - checkout --temp within subdir
-
-expecting success of 2004.22 'checkout --temp symlink': 
-	rm -f path* .merge_* actual .git/index &&
-	test_ln_s_add path7 path6 &&
-	git checkout-index --temp -a >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path6 &&
-	p=$(cut "-d	" -f1 actual) &&
-	test -f $p &&
-	test $(cat $p) = path7
-
-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 22 - checkout --temp symlink
-
-expecting success of 2004.23 'emit well-formed relative path': 
-	rm -f path* .merge_* actual .git/index &&
-	>path0123456789 &&
-	git update-index --add path0123456789 &&
-	(
-		cd asubdir &&
-		git checkout-index --temp -- ../path0123456789 >actual &&
-		test_line_count = 1 actual &&
-		test $(cut "-d	" -f2 actual) = ../path0123456789
-	)
-
-ok 23 - emit well-formed relative path
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2008-checkout-subdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir/.git/
-expecting success of 2008.1 'setup': 
-
-	echo "base" > file0 &&
-	git add file0 &&
-	mkdir dir1 &&
-	echo "hello" > dir1/file1 &&
-	git add dir1/file1 &&
-	mkdir dir2 &&
-	echo "bonjour" > dir2/file2 &&
-	git add dir2/file2 &&
-	test_tick &&
-	git commit -m "populate tree"
-
-
-[master (root-commit) 15793b3] populate tree
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 dir1/file1
- create mode 100644 dir2/file2
- create mode 100644 file0
-ok 1 - setup
-
-expecting success of 2008.2 'remove and restore with relative path': 
-
-	(
-		cd dir1 &&
-		rm ../file0 &&
-		git checkout HEAD -- ../file0 &&
-		test "base" = "$(cat ../file0)" &&
-		rm ../dir2/file2 &&
-		git checkout HEAD -- ../dir2/file2 &&
-		test "bonjour" = "$(cat ../dir2/file2)" &&
-		rm ../file0 ./file1 &&
-		git checkout HEAD -- .. &&
-		test "base" = "$(cat ../file0)" &&
-		test "hello" = "$(cat file1)"
-	)
-
-
-ok 2 - remove and restore with relative path
-
-expecting success of 2008.3 'checkout with empty prefix': 
-
-	rm file0 &&
-	git checkout HEAD -- file0 &&
-	test "base" = "$(cat file0)"
-
-
-ok 3 - checkout with empty prefix
-
-expecting success of 2008.4 'checkout with simple prefix': 
-
-	rm dir1/file1 &&
-	git checkout HEAD -- dir1 &&
-	test "hello" = "$(cat dir1/file1)" &&
-	rm dir1/file1 &&
-	git checkout HEAD -- dir1/file1 &&
-	test "hello" = "$(cat dir1/file1)"
-
-
-ok 4 - checkout with simple prefix
-
-expecting success of 2008.5 'checkout with complex relative path': 
-	(
-		cd dir1 &&
-		rm file1 &&
-		git checkout HEAD -- ../dir1/../dir1/file1 &&
-		test "hello" = "$(cat file1)"
-	)
-
-ok 5 - checkout with complex relative path
-
-expecting success of 2008.6 'relative path outside tree should fail': test_must_fail git checkout HEAD -- ../../Makefile
-fatal: ../../Makefile: '../../Makefile' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir'
-ok 6 - relative path outside tree should fail
-
-expecting success of 2008.7 'incorrect relative path to file should fail (1)': test_must_fail git checkout HEAD -- ../file0
-fatal: ../file0: '../file0' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir'
-ok 7 - incorrect relative path to file should fail (1)
-
-expecting success of 2008.8 'incorrect relative path should fail (2)': ( cd dir1 && test_must_fail git checkout HEAD -- ./file0 )
-error: pathspec './file0' did not match any file(s) known to git
-ok 8 - incorrect relative path should fail (2)
-
-expecting success of 2008.9 'incorrect relative path should fail (3)': ( cd dir1 && test_must_fail git checkout HEAD -- ../../file0 )
-fatal: ../../file0: '../../file0' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir'
-ok 9 - incorrect relative path should fail (3)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2009-checkout-statinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2009-checkout-statinfo/.git/
-expecting success of 2009.1 'setup': 
-
-	echo hello >world &&
-	git update-index --add world &&
-	git commit -m initial &&
-	git branch side &&
-	echo goodbye >world &&
-	git update-index --add world &&
-	git commit -m second
-
-
-[main (root-commit) b8cd0f7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-[main 5892dcd] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 2009.2 'branch switching': 
-
-	git reset --hard &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout side &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main &&
-	test "$(git diff-files --raw)" = ""
-
-
-HEAD is now at 5892dcd second
-Already on 'main'
-Switched to branch 'side'
-Switched to branch 'main'
-ok 2 - branch switching
-
-expecting success of 2009.3 'path checkout': 
-
-	git reset --hard &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main world &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout side world &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout main world &&
-	test "$(git diff-files --raw)" = ""
-
-
-HEAD is now at 5892dcd second
-Updated 0 paths from c356a2a
-Updated 1 path from dbd05ee
-Updated 1 path from c356a2a
-ok 3 - path checkout
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2010-checkout-ambiguous.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2010-checkout-ambiguous/.git/
-expecting success of 2010.1 'setup': 
-	echo hello >world &&
-	echo hello >all &&
-	git add all world &&
-	git commit -m initial &&
-	git branch world
-
-[main (root-commit) c5e2eee] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 all
- create mode 100644 world
-ok 1 - setup
-
-expecting success of 2010.2 'reference must be a tree': 
-	test_must_fail git checkout $(git hash-object ./all) --
-
-fatal: unable to read tree (ce013625030ba8dba906f756967f9e9ca394464a)
-ok 2 - reference must be a tree
-
-expecting success of 2010.3 'branch switching': 
-	test "refs/heads/main" = "$(git symbolic-ref HEAD)" &&
-	git checkout world -- &&
-	test "refs/heads/world" = "$(git symbolic-ref HEAD)"
-
-Switched to branch 'world'
-ok 3 - branch switching
-
-expecting success of 2010.4 'checkout world from the index': 
-	echo bye > world &&
-	git checkout -- world &&
-	git diff --exit-code --quiet
-
-ok 4 - checkout world from the index
-
-expecting success of 2010.5 'non ambiguous call': 
-	git checkout all
-
-Updated 0 paths from the index
-ok 5 - non ambiguous call
-
-expecting success of 2010.6 'allow the most common case': 
-	git checkout world &&
-	test "refs/heads/world" = "$(git symbolic-ref HEAD)"
-
-Already on 'world'
-ok 6 - allow the most common case
-
-expecting success of 2010.7 'check ambiguity': 
-	test_must_fail git checkout world all
-
-fatal: ambiguous argument 'world': both revision and filename
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 7 - check ambiguity
-
-expecting success of 2010.8 'check ambiguity in subdir': 
-	mkdir sub &&
-	# not ambiguous because sub/world does not exist
-	git -C sub checkout world ../all &&
-	echo hello >sub/world &&
-	# ambiguous because sub/world does exist
-	test_must_fail git -C sub checkout world ../all
-
-Updated 0 paths from dd4e7a7
-fatal: ambiguous argument 'world': both revision and filename
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 8 - check ambiguity in subdir
-
-expecting success of 2010.9 'disambiguate checking out from a tree-ish': 
-	echo bye > world &&
-	git checkout world -- world &&
-	git diff --exit-code --quiet
-
-ok 9 - disambiguate checking out from a tree-ish
-
-expecting success of 2010.10 'accurate error message with more than one ref': 
-	test_must_fail git checkout HEAD main -- 2>actual &&
-	test_grep 2 actual &&
-	test_grep "one reference expected, 2 given" actual
-
-fatal: only one reference expected, 2 given.
-fatal: only one reference expected, 2 given.
-ok 10 - accurate error message with more than one ref
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1700-split-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1700-split-index/.git/
-expecting success of 1700.1 'setup': 
-	test_oid_cache <<-EOF
-	own_v3 sha1:8299b0bcd1ac364e5f1d7768efb62fa2da79a339
-	own_v3 sha256:38a6d2925e3eceec33ad7b34cbff4e0086caa0daf28f31e51f5bd94b4a7af86b
-
-	base_v3 sha1:39d890139ee5356c7ef572216cebcd27aa41f9df
-	base_v3 sha256:c9baeadf905112bf6c17aefbd7d02267afd70ded613c30cafed2d40cb506e1ed
-
-	own_v4 sha1:432ef4b63f32193984f339431fd50ca796493569
-	own_v4 sha256:6738ac6319c25b694afa7bcc313deb182d1a59b68bf7a47b4296de83478c0420
-
-	base_v4 sha1:508851a7f0dfa8691e9f69c7f055865389012491
-	base_v4 sha256:3177d4adfdd4b6904f7e921d91d715a471c0dde7cf6a4bba574927f02b699508
-	EOF
-
-ok 1 - setup
-
-expecting success of 1700.2 'enable split index': 
-	git config splitIndex.maxPercentChange 100 &&
-	git update-index --split-index &&
-	test-tool dump-split-index .git/index >actual &&
-	indexversion=$(git update-index --show-index-version) &&
-
-	# NEEDSWORK: Stop hard-coding checksums.
-	if test "$indexversion" = "4"
-	then
-		own=$(test_oid own_v4) &&
-		base=$(test_oid base_v4)
-	else
-		own=$(test_oid own_v3) &&
-		base=$(test_oid base_v3)
-	fi &&
-
-	cat >expect <<-EOF &&
-	own $own
-	base $base
-	replacements:
-	deletions:
-	EOF
-	test_cmp expect actual
-
-ok 2 - enable split index
-
-expecting success of 1700.3 'add one file': 
-	create_non_racy_file one &&
-	git update-index --add one &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	base $base
-	100644 $EMPTY_BLOB 0	one
-	replacements:
-	deletions:
-	EOF
-	test_cmp expect actual
-
-ok 3 - add one file
-
-expecting success of 1700.4 'disable split index': 
-	git update-index --no-split-index &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	BASE=$(test-tool dump-split-index .git/index | sed -n "s/^own/base/p") &&
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	not a split index
-	EOF
-	test_cmp expect actual
-
-ok 4 - disable split index
-
-expecting success of 1700.5 'enable split index again, "one" now belongs to base index"': 
-	git update-index --split-index &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	$BASE
-	replacements:
-	deletions:
-	EOF
-	test_cmp expect actual
-
-ok 5 - enable split index again, "one" now belongs to base index"
-
-expecting success of 1700.6 'modify original file, base index untouched': 
-	echo modified | create_non_racy_file one &&
-	file1_blob=$(git hash-object one) &&
-	git update-index one &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $file1_blob 0	one
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	q_to_tab >expect <<-EOF &&
-	$BASE
-	100644 $file1_blob 0Q
-	replacements: 0
-	deletions:
-	EOF
-	test_cmp expect actual
-
-ok 6 - modify original file, base index untouched
-
-expecting success of 1700.7 'add another file, which stays index': 
-	create_non_racy_file two &&
-	git update-index --add two &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $file1_blob 0	one
-	100644 $EMPTY_BLOB 0	two
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	q_to_tab >expect <<-EOF &&
-	$BASE
-	100644 $file1_blob 0Q
-	100644 $EMPTY_BLOB 0	two
-	replacements: 0
-	deletions:
-	EOF
-	test_cmp expect actual
-
-ok 7 - add another file, which stays index
-
-expecting success of 1700.8 'remove file not in base index': 
-	git update-index --force-remove two &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $file1_blob 0	one
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	q_to_tab >expect <<-EOF &&
-	$BASE
-	100644 $file1_blob 0Q
-	replacements: 0
-	deletions:
-	EOF
-	test_cmp expect actual
-
-ok 8 - remove file not in base index
-
-expecting success of 1700.9 'remove file in base index': 
-	git update-index --force-remove one &&
-	git ls-files --stage >ls-files.actual &&
-	test_must_be_empty ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	$BASE
-	replacements:
-	deletions: 0
-	EOF
-	test_cmp expect actual
-
-ok 9 - remove file in base index
-
-expecting success of 1700.10 'add original file back': 
-	create_non_racy_file one &&
-	git update-index --add one &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	$BASE
-	100644 $EMPTY_BLOB 0	one
-	replacements:
-	deletions: 0
-	EOF
-	test_cmp expect actual
-
-ok 10 - add original file back
-
-expecting success of 1700.11 'add new file': 
-	create_non_racy_file two &&
-	git update-index --add two &&
-	git ls-files --stage >actual &&
-	cat >expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	100644 $EMPTY_BLOB 0	two
-	EOF
-	test_cmp expect actual
-
-ok 11 - add new file
-
-expecting success of 1700.12 'unify index, two files remain': 
-	git update-index --no-split-index &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	100644 $EMPTY_BLOB 0	two
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	not a split index
-	EOF
-	test_cmp expect actual
-
-ok 12 - unify index, two files remain
-
-expecting success of 1700.13 'rev-parse --shared-index-path': 
-	test_create_repo split-index &&
-	(
-		cd split-index &&
-		git update-index --split-index &&
-		echo .git/sharedindex* >expect &&
-		git rev-parse --shared-index-path >actual &&
-		test_cmp expect actual &&
-		mkdir subdirectory &&
-		cd subdirectory &&
-		echo ../.git/sharedindex* >expect &&
-		git rev-parse --shared-index-path >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1700-split-index/split-index/.git/
-ok 13 - rev-parse --shared-index-path
-
-expecting success of 1700.14 'set core.splitIndex config variable to true': 
-	git config core.splitIndex true &&
-	create_non_racy_file three &&
-	git update-index --add three &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	100644 $EMPTY_BLOB 0	three
-	100644 $EMPTY_BLOB 0	two
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-	BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	$BASE
-	replacements:
-	deletions:
-	EOF
-	test_cmp expect actual
-
-ok 14 - set core.splitIndex config variable to true
-
-expecting success of 1700.15 'set core.splitIndex config variable to false': 
-	git config core.splitIndex false &&
-	git update-index --force-remove three &&
-	git ls-files --stage >ls-files.actual &&
-	cat >ls-files.expect <<-EOF &&
-	100644 $EMPTY_BLOB 0	one
-	100644 $EMPTY_BLOB 0	two
-	EOF
-	test_cmp ls-files.expect ls-files.actual &&
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	not a split index
-	EOF
-	test_cmp expect actual
-
-ok 15 - set core.splitIndex config variable to false
+ok 15 - set core.splitIndex config variable to false
 
 expecting success of 1700.16 'set core.splitIndex config variable back to true': 
 	git config core.splitIndex true &&
@@ -89106,977 +80629,470 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2014-checkout-switch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2014-checkout-switch/.git/
-expecting success of 2014.1 'setup': 
-	echo Hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m V1 &&
-	echo Hello world >file &&
-	git add file &&
-	git checkout -b other
-
-[master (root-commit) 68a43dc] V1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'other'
-ok 1 - setup
-
-expecting success of 2014.2 'check all changes are staged': 
-	git diff --exit-code
-
-ok 2 - check all changes are staged
-
-expecting success of 2014.3 'second commit': 
-	git commit -m V2
-
-[other c55967b] V2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - second commit
-
-expecting success of 2014.4 'check': 
-	git diff --cached --exit-code
-
-ok 4 - check
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2011-checkout-invalid-head.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2011-checkout-invalid-head/.git/
-expecting success of 2011.1 'setup': 
-	echo hello >world &&
-	git add world &&
-	git commit -m initial
-
-[main (root-commit) b8cd0f7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-ok 1 - setup
-
-expecting success of 2011.2 'checkout should not start branch from a tree': 
-	test_must_fail git checkout -b newbranch main^{tree}
-
-fatal: Cannot switch branch to a non-commit 'main^{tree}'
-ok 2 - checkout should not start branch from a tree
-
-expecting success of 2011.3 'checkout main from invalid HEAD': 
-	echo $ZERO_OID >.git/HEAD &&
-	git checkout main --
-
-Switched to branch 'main'
-ok 3 - checkout main from invalid HEAD
-
-expecting success of 2011.4 'checkout notices failure to lock HEAD': 
-	test_when_finished "rm -f .git/HEAD.lock" &&
-	>.git/HEAD.lock &&
-	test_must_fail git checkout -b other
-
-error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2011-checkout-invalid-head/.git/HEAD.lock': File exists.
-
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-fatal: unable to update HEAD
-ok 4 - checkout notices failure to lock HEAD
-
-expecting success of 2011.5 'create ref directory/file conflict scenario': 
-	git update-ref refs/heads/outer/inner main &&
-	reset_to_df () {
-		git symbolic-ref HEAD refs/heads/outer
-	}
-
-ok 5 - create ref directory/file conflict scenario
-
-expecting success of 2011.6 'checkout away from d/f HEAD (unpacked, to branch)': 
-	reset_to_df &&
-	git checkout main
-
-Switched to branch 'main'
-ok 6 - checkout away from d/f HEAD (unpacked, to branch)
-
-expecting success of 2011.7 'checkout away from d/f HEAD (unpacked, to detached)': 
-	reset_to_df &&
-	git checkout --detach main
-
-HEAD is now at b8cd0f7 initial
-ok 7 - checkout away from d/f HEAD (unpacked, to detached)
-
-expecting success of 2011.8 'pack refs': 
-	git pack-refs --all --prune
-
-ok 8 - pack refs
-
-expecting success of 2011.9 'checkout away from d/f HEAD (packed, to branch)': 
-	reset_to_df &&
-	git checkout main
-
-Switched to branch 'main'
-ok 9 - checkout away from d/f HEAD (packed, to branch)
-
-expecting success of 2011.10 'checkout away from d/f HEAD (packed, to detached)': 
-	reset_to_df &&
-	git checkout --detach main
+*** t2008-checkout-subdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir/.git/
+expecting success of 2008.1 'setup': 
 
-HEAD is now at b8cd0f7 initial
-ok 10 - checkout away from d/f HEAD (packed, to detached)
+	echo "base" > file0 &&
+	git add file0 &&
+	mkdir dir1 &&
+	echo "hello" > dir1/file1 &&
+	git add dir1/file1 &&
+	mkdir dir2 &&
+	echo "bonjour" > dir2/file2 &&
+	git add dir2/file2 &&
+	test_tick &&
+	git commit -m "populate tree"
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2015-checkout-unborn.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2015-checkout-unborn/.git/
-expecting success of 2015.1 'setup': 
-	mkdir parent &&
-	(
-		cd parent &&
-		git init &&
-		echo content >file &&
-		git add file &&
-		git commit -m base
-	) &&
-	git fetch parent main:origin
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2015-checkout-unborn/parent/.git/
-[main (root-commit) 5d770fe] base
+[master (root-commit) 15793b3] populate tree
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-From parent
- * [new branch]      main       -> origin
+ 3 files changed, 3 insertions(+)
+ create mode 100644 dir1/file1
+ create mode 100644 dir2/file2
+ create mode 100644 file0
 ok 1 - setup
 
-expecting success of 2015.2 'checkout from unborn preserves untracked files': 
-	echo precious >expect &&
-	echo precious >file &&
-	test_must_fail git checkout -b new origin &&
-	test_cmp expect file
-
-error: The following untracked working tree files would be overwritten by checkout:
-	file
-Please move or remove them before you switch branches.
-Aborting
-ok 2 - checkout from unborn preserves untracked files
-
-expecting success of 2015.3 'checkout from unborn preserves index contents': 
-	echo precious >expect &&
-	echo precious >file &&
-	git add file &&
-	test_must_fail git checkout -b new origin &&
-	test_cmp expect file &&
-	git show :file >file &&
-	test_cmp expect file
-
-error: Your local changes to the following files would be overwritten by checkout:
-	file
-Please commit your changes or stash them before you switch branches.
-Aborting
-ok 3 - checkout from unborn preserves index contents
-
-expecting success of 2015.4 'checkout from unborn merges identical index contents': 
-	echo content >file &&
-	git add file &&
-	git checkout -b new origin
-
-Switched to a new branch 'new'
-ok 4 - checkout from unborn merges identical index contents
-
-expecting success of 2015.5 'checking out another branch from unborn state': 
-	git checkout --orphan newroot &&
-	git checkout -b anothername &&
-	test_must_fail git show-ref --verify refs/heads/newroot &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/anothername >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'newroot'
-Switched to a new branch 'anothername'
-fatal: 'refs/heads/newroot' - not a valid ref
-ok 5 - checking out another branch from unborn state
+expecting success of 2008.2 'remove and restore with relative path': 
 
-expecting success of 2015.6 'checking out in a newly created repo': 
-	test_create_repo empty &&
 	(
-		cd empty &&
-		git symbolic-ref HEAD >expect &&
-		test_must_fail git checkout &&
-		git symbolic-ref HEAD >actual &&
-		test_cmp expect actual
+		cd dir1 &&
+		rm ../file0 &&
+		git checkout HEAD -- ../file0 &&
+		test "base" = "$(cat ../file0)" &&
+		rm ../dir2/file2 &&
+		git checkout HEAD -- ../dir2/file2 &&
+		test "bonjour" = "$(cat ../dir2/file2)" &&
+		rm ../file0 ./file1 &&
+		git checkout HEAD -- .. &&
+		test "base" = "$(cat ../file0)" &&
+		test "hello" = "$(cat file1)"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2015-checkout-unborn/empty/.git/
-fatal: You are on a branch yet to be born
-ok 6 - checking out in a newly created repo
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2019-checkout-ambiguous-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ok 2 - remove and restore with relative path
 
-expecting success of 2019.3 'checkout produces ambiguity warning': 
-	grep "warning.*ambiguous" stderr
+expecting success of 2008.3 'checkout with empty prefix': 
 
-warning: refname 'ambiguity' is ambiguous.
-ok 3 - checkout produces ambiguity warning
+	rm file0 &&
+	git checkout HEAD -- file0 &&
+	test "base" = "$(cat file0)"
 
-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
+ok 3 - checkout with empty prefix
 
-expecting success of 2019.5 'checkout reports switch to branch': 
-	test_grep "Switched to branch" stderr &&
-	test_grep ! "^HEAD is now at" stderr
+expecting success of 2008.4 'checkout with simple prefix': 
 
-Switched to branch 'ambiguity'
-ok 5 - checkout reports switch to branch
+	rm dir1/file1 &&
+	git checkout HEAD -- dir1 &&
+	test "hello" = "$(cat dir1/file1)" &&
+	rm dir1/file1 &&
+	git checkout HEAD -- dir1/file1 &&
+	test "hello" = "$(cat dir1/file1)"
 
-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
+ok 4 - checkout with simple prefix
 
-expecting success of 2019.7 'checkout produces ambiguity warning': 
-	grep "warning.*ambiguous" stderr
+expecting success of 2008.5 'checkout with complex relative path': 
+	(
+		cd dir1 &&
+		rm file1 &&
+		git checkout HEAD -- ../dir1/../dir1/file1 &&
+		test "hello" = "$(cat file1)"
+	)
 
-warning: refname 'vagueness' is ambiguous.
-ok 7 - checkout produces ambiguity warning
+ok 5 - checkout with complex relative path
 
-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
+expecting success of 2008.6 'relative path outside tree should fail': test_must_fail git checkout HEAD -- ../../Makefile
+fatal: ../../Makefile: '../../Makefile' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir'
+ok 6 - relative path outside tree should fail
 
-ok 8 - checkout chooses branch over tag
+expecting success of 2008.7 'incorrect relative path to file should fail (1)': test_must_fail git checkout HEAD -- ../file0
+fatal: ../file0: '../file0' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir'
+ok 7 - incorrect relative path to file should fail (1)
 
-expecting success of 2019.9 'checkout reports switch to branch': 
-	test_grep "Switched to branch" stderr &&
-	test_grep ! "^HEAD is now at" stderr
+expecting success of 2008.8 'incorrect relative path should fail (2)': ( cd dir1 && test_must_fail git checkout HEAD -- ./file0 )
+error: pathspec './file0' did not match any file(s) known to git
+ok 8 - incorrect relative path should fail (2)
 
-Switched to branch 'vagueness'
-ok 9 - checkout reports switch to branch
+expecting success of 2008.9 'incorrect relative path should fail (3)': ( cd dir1 && test_must_fail git checkout HEAD -- ../../file0 )
+fatal: ../../file0: '../../file0' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2008-checkout-subdir'
+ok 9 - incorrect relative path should fail (3)
 
 # passed all 9 test(s)
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2017-checkout-orphan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2017-checkout-orphan/.git/
-expecting success of 2017.1 'Setup': 
-	echo "Initial" >"$TEST_FILE" &&
-	git add "$TEST_FILE" &&
-	git commit -m "First Commit" &&
-	test_tick &&
-	echo "State 1" >>"$TEST_FILE" &&
-	git add "$TEST_FILE" &&
-	test_tick &&
-	git commit -m "Second Commit"
-
-[main (root-commit) df316c6] First Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 8c3f362] Second Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - Setup
-
-expecting success of 2017.2 '--orphan creates a new orphan branch from HEAD': 
-	git checkout --orphan alpha &&
-	test_must_fail git rev-parse --verify HEAD &&
-	test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
-	test_tick &&
-	git commit -m "Third Commit" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet main alpha
-
-Switched to a new branch 'alpha'
-fatal: Needed a single revision
-[alpha (root-commit) 6f20c32] Third Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 2 - --orphan creates a new orphan branch from HEAD
-
-expecting success of 2017.3 '--orphan creates a new orphan branch from <start_point>': 
-	git checkout main &&
-	git checkout --orphan beta main^ &&
-	test_must_fail git rev-parse --verify HEAD &&
-	test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
-	test_tick &&
-	git commit -m "Fourth Commit" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet main^ beta
-
-Switched to branch 'main'
-Switched to a new branch 'beta'
-fatal: Needed a single revision
-[beta (root-commit) 530edda] Fourth Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 3 - --orphan creates a new orphan branch from <start_point>
-
-expecting success of 2017.4 '--orphan must be rejected with -b': 
-	git checkout main &&
-	test_must_fail git checkout --orphan new -b newer &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
-
-Switched to branch 'main'
-fatal: options '-b', '-B', and '--orphan' cannot be used together
-ok 4 - --orphan must be rejected with -b
+*** t2006-checkout-index-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2006-checkout-index-basic/.git/
+expecting success of 2006.1 'checkout-index --gobbledegook': 
+	test_expect_code 129 git checkout-index --gobbledegook 2>err &&
+	test_grep "[Uu]sage" err
 
-expecting success of 2017.5 '--orphan must be rejected with -t': 
-	git checkout main &&
-	test_must_fail git checkout --orphan new -t main &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
+usage: git checkout-index [<options>] [--] [<file>...]
+ok 1 - checkout-index --gobbledegook
 
-Already on 'main'
-fatal: '--orphan' cannot be used with '-t'
-ok 5 - --orphan must be rejected with -t
+expecting success of 2006.2 'checkout-index -h in broken repository': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git checkout-index -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
 
-expecting success of 2017.6 '--orphan ignores branch.autosetupmerge': 
-	git checkout main &&
-	git config branch.autosetupmerge always &&
-	git checkout --orphan gamma &&
-	test_cmp_config "" --default "" branch.gamma.merge &&
-	test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git checkout main &&
-	git config branch.autosetupmerge inherit &&
-	git checkout --orphan eta &&
-	test_cmp_config "" --default "" branch.eta.merge &&
-	test_cmp_config "" --default "" branch.eta.remote &&
-	echo refs/heads/eta >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual &&
-	test_must_fail git rev-parse --verify HEAD^
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2006-checkout-index-basic/broken/.git/
+usage: git checkout-index [<options>] [--] [<file>...]
+ok 2 - checkout-index -h in broken repository
 
-Already on 'main'
-Switched to a new branch 'gamma'
-fatal: Needed a single revision
-Switched to branch 'main'
-Switched to a new branch 'eta'
-fatal: Needed a single revision
-ok 6 - --orphan ignores branch.autosetupmerge
+expecting success of 2006.3 'checkout-index reports errors (cmdline)': 
+	test_must_fail git checkout-index -- does-not-exist 2>stderr &&
+	test_grep not.in.the.cache stderr
 
-expecting success of 2017.7 '--orphan makes reflog by default': 
-	git checkout main &&
-	git config --unset core.logAllRefUpdates &&
-	git checkout --orphan delta &&
-	test_must_fail git rev-parse --verify delta@{0} &&
-	git commit -m Delta &&
-	git rev-parse --verify delta@{0}
+git checkout-index: does-not-exist is not in the cache
+ok 3 - checkout-index reports errors (cmdline)
 
-Switched to branch 'main'
-Switched to a new branch 'delta'
-fatal: Needed a single revision
-[delta (root-commit) 9beee35] Delta
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-9beee35744aee191f8186ef0a6ab78f710cdd57c
-ok 7 - --orphan makes reflog by default
+expecting success of 2006.4 'checkout-index reports errors (stdin)': 
+	echo does-not-exist |
+	test_must_fail git checkout-index --stdin 2>stderr &&
+	test_grep not.in.the.cache stderr
 
-expecting success of 2017.8 '--orphan does not make reflog when core.logAllRefUpdates = false': 
-	git checkout main &&
-	git config core.logAllRefUpdates false &&
-	git checkout --orphan epsilon &&
-	test_must_fail git rev-parse --verify epsilon@{0} &&
-	git commit -m Epsilon &&
-	test_must_fail git rev-parse --verify epsilon@{0}
+git checkout-index: does-not-exist is not in the cache
+ok 4 - checkout-index reports errors (stdin)
 
-Switched to branch 'main'
-Switched to a new branch 'epsilon'
-fatal: Needed a single revision
-[epsilon (root-commit) c5e7701] Epsilon
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false
+checking prerequisite: SYMLINKS
 
-expecting success of 2017.9 '--orphan with -l makes reflog when core.logAllRefUpdates = false': 
-	git checkout main &&
-	git checkout -l --orphan zeta &&
-	test_must_fail git rev-parse --verify zeta@{0} &&
-	git commit -m Zeta &&
-	git rev-parse --verify zeta@{0}
+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
 
-Switched to branch 'main'
-Switched to a new branch 'zeta'
-fatal: Needed a single revision
-[zeta (root-commit) 1b23595] Zeta
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-1b235958474dccc5c8f228713c620d22e7d1825d
-ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false
+)
+prerequisite SYMLINKS ok
+checking prerequisite: CASE_INSENSITIVE_FS
 
-expecting success of 2017.10 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog': 
-	git checkout main &&
-	git checkout -l --orphan eta &&
-	test_must_fail git rev-parse --verify eta@{0} &&
-	git checkout main &&
-	test_must_fail git rev-parse --verify eta@{0}
+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
 
-Switched to branch 'main'
-Switched to a new branch 'eta'
-fatal: Needed a single revision
-Switched to branch 'main'
-fatal: Needed a single revision
-ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 5 # skip checkout-index with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
 
-expecting success of 2017.11 '--orphan is rejected with an existing name': 
-	git checkout main &&
-	test_must_fail git checkout --orphan main &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
+checking prerequisite: UTF8_NFD_TO_NFC
 
-Already on 'main'
-fatal: a branch named 'main' already exists
-ok 11 - --orphan is rejected with an existing name
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+	# check whether FS converts nfd unicode to nfc
+	auml=$(printf "\303\244")
+	aumlcdiar=$(printf "\141\314\210")
+	>"$auml" &&
+	test -f "$aumlcdiar"
 
-expecting success of 2017.12 '--orphan refuses to switch if a merge is needed': 
-	git checkout main &&
-	git reset --hard &&
-	echo local >>"$TEST_FILE" &&
-	cat "$TEST_FILE" >"$TEST_FILE.saved" &&
-	test_must_fail git checkout --orphan new main^ &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)" &&
-	test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
-	git diff-index --quiet --cached HEAD &&
-	git reset --hard
+)
+prerequisite UTF8_NFD_TO_NFC not satisfied
+ok 6 # skip checkout-index with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
 
-Already on 'main'
-HEAD is now at 8c3f362 Second Commit
-error: Your local changes to the following files would be overwritten by checkout:
-	foo
-Please commit your changes or stash them before you switch branches.
-Aborting
-HEAD is now at 8c3f362 Second Commit
-ok 12 - --orphan refuses to switch if a merge is needed
+expecting success of 2006.7 'checkout-index --temp correctly reports error on missing blobs': 
+	test_when_finished git reset --hard &&
+	missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
+	cat >objs <<-EOF &&
+	100644 $missing_blob	file
+	120000 $missing_blob	symlink
+	EOF
+	git update-index --index-info <objs &&
 
-expecting success of 2017.13 'cannot --detach on an unborn branch': 
-	git checkout main &&
-	git checkout --orphan new &&
-	test_must_fail git checkout --detach
+	test_must_fail git checkout-index --temp symlink file 2>stderr &&
+	test_grep "unable to read sha1 file of file ($missing_blob)" stderr &&
+	test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr
 
-Already on 'main'
-Switched to a new branch 'new'
-fatal: You are on a branch yet to be born
-ok 13 - cannot --detach on an unborn branch
+.merge_file_pCYBpj	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
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2012-checkout-last.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 2006.8 'checkout-index --temp correctly reports error for submodules': 
+	git init sub &&
+	test_commit -C sub file &&
+	git submodule add ./sub &&
+	git commit -m sub &&
+	test_must_fail git checkout-index --temp sub 2>stderr &&
+	test_grep "cannot create temporary submodule sub" stderr
 
-[main (root-commit) b77667e] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2006-checkout-index-basic/sub/.git/
+[master (root-commit) 4c1911f] file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 world
-[main 5146e8d] second
+ create mode 100644 file.t
+Adding existing repo at 'sub' to the index
+[master (root-commit) c4df02a] sub
  Author: A U Thor <author@example.com>
- 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>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+error: cannot create temporary submodule sub
+ok 8 - checkout-index --temp correctly reports error for submodules
 
-Or undo this operation with:
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2004-checkout-cache-temp.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2004-checkout-cache-temp/.git/
+expecting success of 2004.1 'setup': 
+	mkdir asubdir &&
+	echo tree1path0 >path0 &&
+	echo tree1path1 >path1 &&
+	echo tree1path3 >path3 &&
+	echo tree1path4 >path4 &&
+	echo tree1asubdir/path5 >asubdir/path5 &&
+	git update-index --add path0 path1 path3 path4 asubdir/path5 &&
+	t1=$(git write-tree) &&
+	rm -f path* .merge_* actual .git/index &&
+	echo tree2path0 >path0 &&
+	echo tree2path1 >path1 &&
+	echo tree2path2 >path2 &&
+	echo tree2path4 >path4 &&
+	git update-index --add path0 path1 path2 path4 &&
+	t2=$(git write-tree) &&
+	rm -f path* .merge_* actual .git/index &&
+	echo tree2path0 >path0 &&
+	echo tree3path1 >path1 &&
+	echo tree3path2 >path2 &&
+	echo tree3path3 >path3 &&
+	git update-index --add path0 path1 path2 path3 &&
+	t3=$(git write-tree)
 
-  git switch -
+ok 1 - setup
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 2004.2 'checkout one stage 0 to temporary file': 
+	rm -f path* .merge_* actual .git/index &&
+	git read-tree $t1 &&
+	git checkout-index --temp -- path1 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path1 &&
+	p=$(cut "-d	" -f1 actual) &&
+	test -f $p &&
+	test $(cat $p) = tree1path1
 
-HEAD is now at b77667e initial
-fatal: ref HEAD is not a symbolic ref
-ok 8 - "checkout -" detaches again
+ok 2 - checkout one stage 0 to temporary file
 
-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
+expecting success of 2004.3 'checkout all stage 0 to temporary files': 
+	rm -f path* .merge_* actual .git/index &&
+	git read-tree $t1 &&
+	git checkout-index -a --temp >actual &&
+	test_line_count = 5 actual &&
+	for f in path0 path1 path3 path4 asubdir/path5
 	do
-		git checkout -b branch$i || return 1
+		test $(grep $f actual | cut "-d	" -f2) = $f &&
+		p=$(grep $f actual | cut "-d	" -f1) &&
+		test -f $p &&
+		test $(cat $p) = tree1$f || 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
+ok 3 - checkout all stage 0 to temporary files
 
-Previous HEAD position was b77667e initial
-Switched to branch 'another'
-Note: switching to '...main'.
+expecting success of 2004.4 'setup 3-way merge': 
+	rm -f path* .merge_* actual .git/index &&
+	git read-tree -m $t1 $t2 $t3
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 4 - setup 3-way merge
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 2004.5 'checkout one stage 2 to temporary file': 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=2 --temp -- path1 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path1 &&
+	p=$(cut "-d	" -f1 actual) &&
+	test -f $p &&
+	test $(cat $p) = tree2path1
 
-  git switch -c <new-branch-name>
+ok 5 - checkout one stage 2 to temporary file
 
-Or undo this operation with:
+expecting success of 2004.6 'checkout all stage 2 to temporary files': 
+	rm -f path* .merge_* actual &&
+	git checkout-index --all --stage=2 --temp >actual &&
+	test_line_count = 3 actual &&
+	for f in path1 path2 path4
+	do
+		test $(grep $f actual | cut "-d	" -f2) = $f &&
+		p=$(grep $f actual | cut "-d	" -f1) &&
+		test -f $p &&
+		test $(cat $p) = tree2$f || return 1
+	done
 
-  git switch -
+ok 6 - checkout all stage 2 to temporary files
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 2004.7 'checkout all stages of unknown path': 
+	rm -f path* .merge_* actual &&
+	test_must_fail git checkout-index --stage=all --temp \
+		-- does-not-exist 2>stderr &&
+	test_grep not.in.the.cache stderr
 
-HEAD is now at b77667e initial
-ok 17 - ...main
+git checkout-index: does-not-exist is not in the cache
+ok 7 - checkout all stages of unknown path
 
-expecting success of 2012.18 'main...': 
-	git checkout another &&
-	git checkout main... &&
+expecting success of 2004.8 'checkout all stages/one file to nothing': 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all --temp -- path0 >actual 2>stderr &&
+	test_must_be_empty stderr &&
+	test_line_count = 0 actual
 
-	git rev-parse --verify main^ >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
+ok 8 - checkout all stages/one file to nothing
 
-Previous HEAD position was b77667e initial
-Switched to branch 'another'
-Note: switching to 'main...'.
+expecting success of 2004.9 'checkout all stages/one file to temporary files': 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all --temp -- path1 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path1 &&
+	cut "-d	" -f1 actual | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s1) = tree1path1 &&
+	test $(cat $s2) = tree2path1 &&
+	test $(cat $s3) = tree3path1)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 9 - checkout all stages/one file to temporary files
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 2004.10 '--stage=all implies --temp': 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all -- path1 &&
+	test_path_is_missing path1
 
-  git switch -c <new-branch-name>
+.merge_file_iUglxE .merge_file_se6VFL .merge_file_PXdcOa	path1
+ok 10 - --stage=all implies --temp
 
-Or undo this operation with:
+expecting success of 2004.11 'overriding --stage=all resets implied --temp': 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all --stage=2 -- path1 &&
+	echo tree2path1 >expect &&
+	test_cmp expect path1
 
-  git switch -
+ok 11 - overriding --stage=all resets implied --temp
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 2004.12 '--stage=all --no-temp is rejected': 
+	rm -f path* .merge_* actual &&
+	test_must_fail git checkout-index --stage=all --no-temp -- path1 2>err &&
+	grep -v "already exists" err &&
+	grep "options .--stage=all. and .--no-temp. cannot be used together" err
 
-HEAD is now at b77667e initial
-ok 18 - main...
+fatal: options '--stage=all' and '--no-temp' cannot be used together
+fatal: options '--stage=all' and '--no-temp' cannot be used together
+ok 12 - --stage=all --no-temp is rejected
 
-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
+expecting success of 2004.13 'checkout some stages/one file to temporary files': 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all --temp -- path2 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path2 &&
+	cut "-d	" -f1 actual | (read s1 s2 s3 &&
+	test $s1 = . &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s2) = tree2path2 &&
+	test $(cat $s3) = tree3path2)
 
-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
+ok 13 - checkout some stages/one file to temporary files
 
-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
+expecting success of 2004.14 'checkout all stages/all files to temporary files': 
+	rm -f path* .merge_* actual &&
+	git checkout-index -a --stage=all --temp >actual &&
+	test_line_count = 5 actual
 
-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
+ok 14 - checkout all stages/all files to temporary files
 
-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
+expecting success of 2004.15 '-- path0: no entry': 
+	test x$(grep path0 actual | cut "-d	" -f2) = x
 
-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
+ok 15 - -- path0: no entry
 
-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
+expecting success of 2004.16 '-- path1: all 3 stages': 
+	test $(grep path1 actual | cut "-d	" -f2) = path1 &&
+	grep path1 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s1) = tree1path1 &&
+	test $(cat $s2) = tree2path1 &&
+	test $(cat $s3) = tree3path1)
 
-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
+ok 16 - -- path1: all 3 stages
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2021-checkout-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2021-checkout-overwrite/.git/
-expecting success of 2021.1 'setup': 
+expecting success of 2004.17 '-- path2: no stage 1, have stage 2 and 3': 
+	test $(grep path2 actual | cut "-d	" -f2) = path2 &&
+	grep path2 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test $s1 = . &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s2) = tree2path2 &&
+	test $(cat $s3) = tree3path2)
 
-	mkdir -p a/b/c &&
-	>a/b/c/d &&
-	git add -A &&
-	git commit -m base &&
-	git tag start
+ok 17 - -- path2: no stage 1, have stage 2 and 3
 
-[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 2004.18 '-- path3: no stage 2, have stage 1 and 3': 
+	test $(grep path3 actual | cut "-d	" -f2) = path3 &&
+	grep path3 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test $s2 = . &&
+	test -f $s3 &&
+	test $(cat $s1) = tree1path3 &&
+	test $(cat $s3) = tree3path3)
 
-expecting success of 2021.2 'create a commit where dir a/b changed to file': 
+ok 18 - -- path3: no stage 2, have stage 1 and 3
 
-	git checkout -b file &&
-	rm -rf a/b &&
-	>a/b &&
-	git add -A &&
-	git commit -m "dir to file"
+expecting success of 2004.19 '-- path4: no stage 3, have stage 1 and 3': 
+	test $(grep path4 actual | cut "-d	" -f2) = path4 &&
+	grep path4 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test -f $s2 &&
+	test $s3 = . &&
+	test $(cat $s1) = tree1path4 &&
+	test $(cat $s2) = tree2path4)
 
-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
+ok 19 - -- path4: no stage 3, have stage 1 and 3
 
-expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
+expecting success of 2004.20 '-- asubdir/path5: no stage 2 and 3 have stage 1': 
+	test $(grep asubdir/path5 actual | cut "-d	" -f2) = asubdir/path5 &&
+	grep asubdir/path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test $s2 = . &&
+	test $s3 = . &&
+	test $(cat $s1) = tree1asubdir/path5)
 
-	git rm --cached a/b &&
-	git commit -m "un-track the file" &&
-	test_must_fail git checkout start &&
-	test -f a/b
+ok 20 - -- asubdir/path5: no stage 2 and 3 have stage 1
 
-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 2004.21 'checkout --temp within subdir': 
+	(
+		cd asubdir &&
+		git checkout-index -a --stage=all >actual &&
+		test_line_count = 1 actual &&
+		test $(grep path5 actual | cut "-d	" -f2) = path5 &&
+		grep path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+		test -f ../$s1 &&
+		test $s2 = . &&
+		test $s3 = . &&
+		test $(cat ../$s1) = tree1asubdir/path5)
+	)
 
-expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
+ok 21 - checkout --temp within subdir
 
-	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"
+expecting success of 2004.22 'checkout --temp symlink': 
+	rm -f path* .merge_* actual .git/index &&
+	test_ln_s_add path7 path6 &&
+	git checkout-index --temp -a >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path6 &&
+	p=$(cut "-d	" -f1 actual) &&
+	test -f $p &&
+	test $(cat $p) = path7
 
-Switched to a new branch 'symlink'
 checking prerequisite: SYMLINKS
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
@@ -90087,2018 +81103,397 @@
 
 )
 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2016-checkout-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2016-checkout-patch/.git/
-expecting success of 2016.1 'setup': 
-	mkdir dir &&
-	echo parent > dir/foo &&
-	echo dummy > bar &&
-	git add bar dir/foo &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
-
-[master (root-commit) 758b165] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 dir/foo
-[master 3319288] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 2016.2 'saying "n" does nothing': 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n n | git checkout -p &&
-	verify_saved_state bar &&
-	verify_saved_state dir/foo
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 2 - saying "n" does nothing
-
-expecting success of 2016.3 'git checkout -p': 
-	test_write_lines n y | git checkout -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 3 - git checkout -p
-
-expecting success of 2016.4 'git checkout -p with staged changes': 
-	set_state dir/foo work index &&
-	test_write_lines n y | git checkout -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 9015a7a..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--index
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 4 - git checkout -p with staged changes
-
-expecting success of 2016.5 'git checkout -p HEAD with NO staged changes: abort': 
-		set_and_save_state dir/foo work head &&
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_saved_state dir/foo &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 5 - git checkout -p HEAD with NO staged changes: abort
-
-expecting success of 2016.6 'git checkout -p HEAD with NO staged changes: apply': 
-		test_write_lines n y y | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 6 - git checkout -p HEAD with NO staged changes: apply
-
-expecting success of 2016.7 'git checkout -p HEAD with change already staged': 
-		set_state dir/foo index index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-ok 7 - git checkout -p HEAD with change already staged
-
-expecting success of 2016.8 'git checkout -p @ with NO staged changes: abort': 
-		set_and_save_state dir/foo work head &&
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_saved_state dir/foo &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 8 - git checkout -p @ with NO staged changes: abort
-
-expecting success of 2016.9 'git checkout -p @ with NO staged changes: apply': 
-		test_write_lines n y y | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 9 - git checkout -p @ with NO staged changes: apply
-
-expecting success of 2016.10 'git checkout -p @ with change already staged': 
-		set_state dir/foo index index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-ok 10 - git checkout -p @ with change already staged
-
-expecting success of 2016.11 'git checkout -p HEAD^...': 
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git checkout -p HEAD^... &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent parent
-
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-diff --git b/dir/foo a/dir/foo
-index 564b12f..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--head
-+parent
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-ok 11 - git checkout -p HEAD^...
-
-expecting success of 2016.12 'git checkout -p HEAD^': 
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git checkout -p HEAD^ &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent parent
-
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-ok 12 - git checkout -p HEAD^
-
-expecting success of 2016.13 'git checkout -p handles deletion': 
-	set_state dir/foo work index &&
-	rm dir/foo &&
-	test_write_lines n y | git checkout -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-deleted file mode 100644
-index 9015a7a..0000000
---- a/dir/foo
-+++ /dev/null
-@@ -1 +0,0 @@
--index
-(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
-ok 13 - git checkout -p handles deletion
-
-expecting success of 2016.14 'path limiting works: dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git checkout -p dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 14 - path limiting works: dir
-
-expecting success of 2016.15 'path limiting works: -- dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git checkout -p -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 15 - path limiting works: -- dir
-
-expecting success of 2016.16 'path limiting works: HEAD^ -- dir': 
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | git checkout -p HEAD^ -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent parent
-
-diff --git b/dir/foo a/dir/foo
-index 564b12f..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--head
-+parent
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-ok 16 - path limiting works: HEAD^ -- dir
-
-expecting success of 2016.17 'path limiting works: foo inside dir': 
-	set_state dir/foo work head &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | (cd dir && git checkout -p foo) &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 17 - path limiting works: foo inside dir
-
-expecting success of 2016.18 'none of this moved HEAD': 
-	verify_saved_head
-
-ok 18 - none of this moved HEAD
+ok 22 - checkout --temp symlink
 
-expecting success of 2016.19 'empty tree can be handled': 
-	test_when_finished "git reset --hard" &&
-	git checkout -p $(test_oid empty_tree) --
+expecting success of 2004.23 'emit well-formed relative path': 
+	rm -f path* .merge_* actual .git/index &&
+	>path0123456789 &&
+	git update-index --add path0123456789 &&
+	(
+		cd asubdir &&
+		git checkout-index --temp -- ../path0123456789 >actual &&
+		test_line_count = 1 actual &&
+		test $(cut "-d	" -f2 actual) = ../path0123456789
+	)
 
-diff --git b/bar a/bar
-deleted file mode 100644
-index 8c999e6..0000000
---- b/bar
-+++ /dev/null
-@@ -1 +0,0 @@
--bar_work
-(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
-diff --git b/dir/foo a/dir/foo
-deleted file mode 100644
-index 564b12f..0000000
---- b/dir/foo
-+++ /dev/null
-@@ -1 +0,0 @@
--head
-(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
-HEAD is now at 3319288 second
-ok 19 - empty tree can be handled
+ok 23 - emit well-formed relative path
 
-# passed all 19 test(s)
-1..19
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2018-checkout-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2018-checkout-branch/.git/
-expecting success of 2018.1 'setup': 
-	test_commit initial file1 &&
-	HEAD1=$(git rev-parse --verify HEAD) &&
+*** t2009-checkout-statinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2009-checkout-statinfo/.git/
+expecting success of 2009.1 'setup': 
 
-	test_commit change1 file1 &&
-	HEAD2=$(git rev-parse --verify HEAD) &&
+	echo hello >world &&
+	git update-index --add world &&
+	git commit -m initial &&
+	git branch side &&
+	echo goodbye >world &&
+	git update-index --add world &&
+	git commit -m second
 
-	git branch -m branch1
 
-[master (root-commit) ee02a18] initial
+[main (root-commit) b8cd0f7] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 5be17a9] change1
+ create mode 100644 world
+[main 5892dcd] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 2018.2 'checkout a branch without refs/heads/* prefix': 
-	git clone --no-tags . repo-odd-prefix &&
-	(
-		cd repo-odd-prefix &&
-
-		origin=$(git symbolic-ref refs/remotes/origin/HEAD) &&
-		git symbolic-ref refs/heads/a-branch "$origin" &&
-
-		git checkout -f a-branch &&
-		git checkout -f a-branch
-	)
-
-Cloning into 'repo-odd-prefix'...
-done.
-Switched to branch 'a-branch'
-Switched to branch 'a-branch'
-ok 2 - checkout a branch without refs/heads/* prefix
-
-expecting success of 2018.3 'checkout -b to a new branch, set to HEAD': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-	do_checkout branch2
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was 5be17a9).
-ok 3 - checkout -b to a new branch, set to HEAD
-
-expecting success of 2018.4 'checkout -b to a merge base': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-	git checkout -b branch2 branch1...
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was 5be17a9).
-ok 4 - checkout -b to a merge base
-
-expecting success of 2018.5 'checkout -b to a new branch, set to an explicit ref': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-	do_checkout branch2 $HEAD1
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was ee02a18).
-ok 5 - checkout -b to a new branch, set to an explicit ref
-
-expecting success of 2018.6 'checkout -b to a new branch with unmergeable changes fails': 
-	setup_dirty_unmergeable &&
-	do_checkout ! branch2 $HEAD1 &&
-	test_dirty_unmergeable
-
-error: Your local changes to the following files would be overwritten by checkout:
-	file1
-Please commit your changes or stash them before you switch branches.
-Aborting
-diff --git a/file1 b/file1
-index 5be4a41..1725fe9 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- change1
-+change2
-ok 6 - checkout -b to a new branch with unmergeable changes fails
-
-expecting success of 2018.7 'checkout -f -b to a new branch with unmergeable changes discards changes': 
-	test_when_finished "
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-
-	# still dirty and on branch1
-	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_dirty_unmergeable_discards_changes
-
-Switched to a new branch 'branch2'
-Switched to branch 'branch1'
-Deleted branch branch2 (was ee02a18).
-ok 7 - checkout -f -b to a new branch with unmergeable changes discards changes
-
-expecting success of 2018.8 'checkout -b to a new branch preserves mergeable changes': 
-	test_when_finished "
-		git reset --hard &&
-		git checkout branch1 &&
-		test_might_fail git branch -D branch2" &&
-
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 &&
-	test_dirty_mergeable
-
-Switched to a new branch 'branch2'
-A	file2
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..6c493ff
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+file2
-HEAD is now at ee02a18 initial
-Switched to branch 'branch1'
-Deleted branch branch2 (was ee02a18).
-ok 8 - checkout -b to a new branch preserves mergeable changes
-
-expecting success of 2018.9 'checkout -f -b to a new branch with mergeable changes discards changes': 
-	test_when_finished git reset --hard HEAD &&
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_dirty_mergeable_discards_changes
-
-Switched to a new branch 'branch2'
-HEAD is now at ee02a18 initial
-ok 9 - checkout -f -b to a new branch with mergeable changes discards changes
-
-expecting success of 2018.10 'checkout -b to an existing branch fails': 
-	test_when_finished git reset --hard HEAD &&
-	do_checkout ! branch2 $HEAD2
-
-fatal: a branch named 'branch2' already exists
-HEAD is now at ee02a18 initial
-ok 10 - checkout -b to an existing branch fails
-
-expecting success of 2018.11 'checkout -b to @{-1} fails with the right branch name': 
-	git checkout branch1 &&
-	git checkout branch2 &&
-	echo  >expect "fatal: a branch named 'branch1' already exists" &&
-	test_must_fail git checkout -b @{-1} 2>actual &&
-	test_cmp expect actual
-
-Switched to branch 'branch1'
-Switched to branch 'branch2'
-ok 11 - checkout -b to @{-1} fails with the right branch name
-
-expecting success of 2018.12 'checkout -B to an existing branch resets branch to HEAD': 
-	git checkout branch1 &&
-
-	do_checkout branch2 "" -B
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 12 - checkout -B to an existing branch resets branch to HEAD
-
-expecting success of 2018.13 'checkout -B to a merge base': 
-	git checkout branch1 &&
-
-	git checkout -B branch2 branch1...
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 13 - checkout -B to a merge base
-
-expecting success of 2018.14 'checkout -B to an existing branch from detached HEAD resets branch to HEAD': 
-	head=$(git rev-parse --verify HEAD) &&
-	git checkout "$head" &&
-
-	do_checkout branch2 "" -B
-
-Note: switching to '5be17a9503605cbff49376bccdc74acb1ebd9160'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 5be17a9 change1
-Switched to and reset branch 'branch2'
-ok 14 - checkout -B to an existing branch from detached HEAD resets branch to HEAD
-
-expecting success of 2018.15 'checkout -B to an existing branch with an explicit ref resets branch to that ref': 
-	git checkout branch1 &&
-
-	do_checkout branch2 $HEAD1 -B
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 15 - checkout -B to an existing branch with an explicit ref resets branch to that ref
-
-expecting success of 2018.16 'checkout -B to an existing branch with unmergeable changes fails': 
-	git checkout branch1 &&
-
-	setup_dirty_unmergeable &&
-	do_checkout ! branch2 $HEAD1 -B &&
-	test_dirty_unmergeable
-
-Switched to branch 'branch1'
-error: Your local changes to the following files would be overwritten by checkout:
-	file1
-Please commit your changes or stash them before you switch branches.
-Aborting
-diff --git a/file1 b/file1
-index 5be4a41..1725fe9 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- change1
-+change2
-ok 16 - checkout -B to an existing branch with unmergeable changes fails
-
-expecting success of 2018.17 'checkout -f -B to an existing branch with unmergeable changes discards changes': 
-	# still dirty and on branch1
-	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_dirty_unmergeable_discards_changes
-
-Switched to and reset branch 'branch2'
-ok 17 - checkout -f -B to an existing branch with unmergeable changes discards changes
-
-expecting success of 2018.18 'checkout -B to an existing branch preserves mergeable changes': 
-	test_when_finished git reset --hard &&
-	git checkout branch1 &&
-
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 -B &&
-	test_dirty_mergeable
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-A	file2
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..6c493ff
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+file2
-HEAD is now at ee02a18 initial
-ok 18 - checkout -B to an existing branch preserves mergeable changes
-
-expecting success of 2018.19 'checkout -f -B to an existing branch with mergeable changes discards changes': 
-	git checkout branch1 &&
-
-	setup_dirty_mergeable &&
-	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_dirty_mergeable_discards_changes
-
-Switched to branch 'branch1'
-Switched to and reset branch 'branch2'
-ok 19 - checkout -f -B to an existing branch with mergeable changes discards changes
-
-expecting success of 2018.20 'checkout -b <describe>': 
-	git tag -f -m "First commit" initial initial &&
-	git checkout -f change1 &&
-	name=$(git describe) &&
-	git checkout -b $name &&
-	git diff --exit-code change1 &&
-	echo "refs/heads/$name" >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-Updated tag 'initial' (was ee02a18)
-Note: switching to 'change1'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 5be17a9 change1
-Switched to a new branch 'initial-1-g5be17a9'
-ok 20 - checkout -b <describe>
-
-expecting success of 2018.21 'checkout -B to the current branch works': 
-	git checkout branch1 &&
-	git checkout -B branch1-scratch &&
-
-	setup_dirty_mergeable &&
-	git checkout -B branch1-scratch initial &&
-	test_dirty_mergeable
-
-Switched to branch 'branch1'
-Switched to a new branch 'branch1-scratch'
-Reset branch 'branch1-scratch'
-A	file2
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..6c493ff
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+file2
-ok 21 - checkout -B to the current branch works
-
-expecting success of 2018.22 'checkout -b after clone --no-checkout does a checkout of HEAD': 
-	git init src &&
-	test_commit -C src a &&
-	rev="$(git -C src rev-parse HEAD)" &&
-	git clone --no-checkout src dest &&
-	git -C dest checkout "$rev" -b branch &&
-	test_path_is_file dest/a.t
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2018-checkout-branch/src/.git/
-[master (root-commit) 7f0b538] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Cloning into 'dest'...
-done.
-Switched to a new branch 'branch'
-ok 22 - checkout -b after clone --no-checkout does a checkout of HEAD
-
-expecting success of 2018.23 'checkout -b to a new branch preserves mergeable changes despite sparse-checkout': 
-	test_when_finished "
-		git reset --hard &&
-		git checkout branch1-scratch &&
-		test_might_fail git branch -D branch3 &&
-		git config core.sparseCheckout false &&
-		rm -rf .git/info" &&
-
-	test_commit file2 &&
-
-	echo stuff >>file1 &&
-	mkdir .git/info &&
-	echo file2 >.git/info/sparse-checkout &&
-	git config core.sparseCheckout true &&
-
-	CURHEAD=$(git rev-parse HEAD) &&
-	do_checkout branch3 $CURHEAD &&
-
-	echo file1 >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual
-
-[branch1-scratch b9d73e8] file2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file2
- create mode 100644 file2.t
-warning: The following paths are not up to date and were left despite sparse patterns:
-	file1
-
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-Switched to a new branch 'branch3'
-M	file1
-HEAD is now at b9d73e8 file2
-Switched to branch 'branch1-scratch'
-Deleted branch branch3 (was b9d73e8).
-ok 23 - checkout -b to a new branch preserves mergeable changes despite sparse-checkout
-
-expecting success of 2018.24 'checkout -b rejects an invalid start point': 
-	test_must_fail git checkout -b branch4 file1 2>err &&
-	test_grep "is not a commit" err
-
-fatal: 'file1' is not a commit and a branch 'branch4' cannot be created from it
-ok 24 - checkout -b rejects an invalid start point
-
-expecting success of 2018.25 'checkout -b rejects an extra path argument': 
-	test_must_fail git checkout -b branch5 branch1 file1 2>err &&
-	test_grep "Cannot update paths and switch to branch" err
-
-fatal: Cannot update paths and switch to branch 'branch5' at the same time.
-ok 25 - checkout -b rejects an extra path argument
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2022-checkout-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 2009.2 'branch switching': 
 
-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 "$(git diff-files --raw)" = "" &&
 
-	test_cmp expect.common dir/common &&
-	test_path_is_file dir/main &&
-	git diff --exit-code main dir/main &&
+	git checkout main &&
+	test "$(git diff-files --raw)" = "" &&
 
-	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
+	git checkout side &&
+	test "$(git diff-files --raw)" = "" &&
 
-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
+	git checkout main &&
+	test "$(git diff-files --raw)" = ""
 
-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 &&
+HEAD is now at 5892dcd second
+Already on 'main'
+Switched to branch 'side'
+Switched to branch 'main'
+ok 2 - branch switching
 
-	git checkout main dir &&
+expecting success of 2009.3 'path checkout': 
 
-	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
+	git reset --hard &&
+	test "$(git diff-files --raw)" = "" &&
 
-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
+	git checkout main world &&
+	test "$(git diff-files --raw)" = "" &&
 
-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
+	git checkout side world &&
+	test "$(git diff-files --raw)" = "" &&
 
-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
+	git checkout main world &&
+	test "$(git diff-files --raw)" = ""
 
-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
+HEAD is now at 5892dcd second
+Updated 0 paths from c356a2a
+Updated 1 path from dbd05ee
+Updated 1 path from c356a2a
+ok 3 - path checkout
 
-# passed all 5 test(s)
-1..5
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2025-checkout-no-overlay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2025-checkout-no-overlay/.git/
-expecting success of 2025.1 'setup': 
-	git commit --allow-empty -m "initial"
+*** t2010-checkout-ambiguous.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2010-checkout-ambiguous/.git/
+expecting success of 2010.1 'setup': 
+	echo hello >world &&
+	echo hello >all &&
+	git add all world &&
+	git commit -m initial &&
+	git branch world
 
-[master (root-commit) 8b2b4f6] initial
+[main (root-commit) c5e2eee] initial
  Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 all
+ create mode 100644 world
 ok 1 - setup
 
-expecting success of 2025.2 'checkout --no-overlay deletes files not in <tree-ish>': 
-	>file &&
-	mkdir dir &&
-	>dir/file1 &&
-	git add file dir/file1 &&
-	git checkout --no-overlay HEAD -- file &&
-	test_path_is_missing file &&
-	test_path_is_file dir/file1
-
-ok 2 - checkout --no-overlay deletes files not in <tree-ish>
-
-expecting success of 2025.3 'checkout --no-overlay removing last file from directory': 
-	git checkout --no-overlay HEAD -- dir/file1 &&
-	test_path_is_missing dir
-
-ok 3 - checkout --no-overlay removing last file from directory
+expecting success of 2010.2 'reference must be a tree': 
+	test_must_fail git checkout $(git hash-object ./all) --
 
-expecting success of 2025.4 'checkout -p --overlay is disallowed': 
-	test_must_fail git checkout -p --overlay HEAD 2>actual &&
-	test_grep "fatal: options .-p. and .--overlay. cannot be used together" actual
+fatal: unable to read tree (ce013625030ba8dba906f756967f9e9ca394464a)
+ok 2 - reference must be a tree
 
-fatal: options '-p' and '--overlay' cannot be used together
-ok 4 - checkout -p --overlay is disallowed
+expecting success of 2010.3 'branch switching': 
+	test "refs/heads/main" = "$(git symbolic-ref HEAD)" &&
+	git checkout world -- &&
+	test "refs/heads/world" = "$(git symbolic-ref HEAD)"
 
-expecting success of 2025.5 '--no-overlay --theirs with D/F conflict deletes file': 
-	test_commit file1 file1 &&
-	test_commit file2 file2 &&
-	git rm --cached file1 &&
-	echo 1234 >file1 &&
-	F1=$(git rev-parse HEAD:file1) &&
-	F2=$(git rev-parse HEAD:file2) &&
-	{
-		echo "100644 $F1 1	file1" &&
-		echo "100644 $F2 2	file1"
-	} | git update-index --index-info &&
-	test_path_is_file file1 &&
-	git checkout --theirs --no-overlay -- file1 &&
-	test_path_is_missing file1
+Switched to branch 'world'
+ok 3 - branch switching
 
-[master a11d2b7] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 1c03fe1] file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-rm 'file1'
-ok 5 - --no-overlay --theirs with D/F conflict deletes file
+expecting success of 2010.4 'checkout world from the index': 
+	echo bye > world &&
+	git checkout -- world &&
+	git diff --exit-code --quiet
 
-expecting success of 2025.6 'wildcard pathspec matches file in subdirectory': 
-	git reset --hard &&
-	mkdir subdir &&
-	test_commit file3-1 subdir/file3 &&
-	test_commit file3-2 subdir/file3 &&
+ok 4 - checkout world from the index
 
-	git checkout --no-overlay file3-1 "*file3" &&
-	echo file3-1 >expect &&
-	test_path_is_file subdir/file3 &&
-	test_cmp expect subdir/file3
+expecting success of 2010.5 'non ambiguous call': 
+	git checkout all
 
-HEAD is now at 1c03fe1 file2
-[master 78da8bb] file3-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/file3
-[master cac8ac6] file3-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Updated 1 path from e1fb72e
-ok 6 - wildcard pathspec matches file in subdirectory
+Updated 0 paths from the index
+ok 5 - non ambiguous call
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2023-checkout-m.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2023-checkout-m/.git/
-expecting success of 2023.1 'setup': 
-	test_tick &&
-	test_commit both.txt both.txt initial &&
-	git branch topic &&
-	test_commit modified_in_main both.txt in_main &&
-	test_commit added_in_main each.txt in_main &&
-	git checkout topic &&
-	test_commit modified_in_topic both.txt in_topic &&
-	test_commit added_in_topic each.txt in_topic
+expecting success of 2010.6 'allow the most common case': 
+	git checkout world &&
+	test "refs/heads/world" = "$(git symbolic-ref HEAD)"
 
-[main (root-commit) 7a8c5bf] both.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both.txt
-[main caa44c2] modified_in_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 8422e32] added_in_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 each.txt
-Switched to branch 'topic'
-[topic 33542d7] modified_in_topic
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic d46615c] added_in_topic
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 each.txt
-ok 1 - setup
+Already on 'world'
+ok 6 - allow the most common case
 
-expecting success of 2023.2 'git merge main': 
-    test_must_fail git merge main
+expecting success of 2010.7 'check ambiguity': 
+	test_must_fail git checkout world all
 
-Auto-merging both.txt
-CONFLICT (content): Merge conflict in both.txt
-Auto-merging each.txt
-CONFLICT (add/add): Merge conflict in each.txt
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - git merge main
+fatal: ambiguous argument 'world': both revision and filename
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 7 - check ambiguity
 
-expecting success of 2023.3 '-m restores 2-way conflicted+resolved file': 
-	cp each.txt each.txt.conflicted &&
-	echo resolved >each.txt &&
-	git add each.txt &&
-	git checkout -m -- each.txt &&
-	clean_branchnames <each.txt >each.txt.cleaned &&
-	clean_branchnames <each.txt.conflicted >each.txt.conflicted.cleaned &&
-	test_cmp each.txt.conflicted.cleaned each.txt.cleaned
+expecting success of 2010.8 'check ambiguity in subdir': 
+	mkdir sub &&
+	# not ambiguous because sub/world does not exist
+	git -C sub checkout world ../all &&
+	echo hello >sub/world &&
+	# ambiguous because sub/world does exist
+	test_must_fail git -C sub checkout world ../all
 
-ok 3 - -m restores 2-way conflicted+resolved file
+Updated 0 paths from dd4e7a7
+fatal: ambiguous argument 'world': both revision and filename
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 8 - check ambiguity in subdir
 
-expecting success of 2023.4 '-m restores 3-way conflicted+resolved file': 
-	cp both.txt both.txt.conflicted &&
-	echo resolved >both.txt &&
-	git add both.txt &&
-	git checkout -m -- both.txt &&
-	clean_branchnames <both.txt >both.txt.cleaned &&
-	clean_branchnames <both.txt.conflicted >both.txt.conflicted.cleaned &&
-	test_cmp both.txt.conflicted.cleaned both.txt.cleaned
+expecting success of 2010.9 'disambiguate checking out from a tree-ish': 
+	echo bye > world &&
+	git checkout world -- world &&
+	git diff --exit-code --quiet
 
-ok 4 - -m restores 3-way conflicted+resolved file
+ok 9 - disambiguate checking out from a tree-ish
 
-expecting success of 2023.5 'force checkout a conflict file creates stage zero entry': 
-	git init co-force &&
-	(
-		cd co-force &&
-		echo a >a &&
-		git add a &&
-		git commit -ama &&
-		A_OBJ=$(git rev-parse :a) &&
-		git branch topic &&
-		echo b >a &&
-		git commit -amb &&
-		B_OBJ=$(git rev-parse :a) &&
-		git checkout topic &&
-		echo c >a &&
-		C_OBJ=$(git hash-object a) &&
-		git checkout -m main &&
-		test_cmp_rev :1:a $A_OBJ &&
-		test_cmp_rev :2:a $B_OBJ &&
-		test_cmp_rev :3:a $C_OBJ &&
-		git checkout -f topic &&
-		test_cmp_rev :0:a $A_OBJ
-	)
+expecting success of 2010.10 'accurate error message with more than one ref': 
+	test_must_fail git checkout HEAD main -- 2>actual &&
+	test_grep 2 actual &&
+	test_grep "one reference expected, 2 given" actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2023-checkout-m/co-force/.git/
-[main (root-commit) b7442a0] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[main 7529dfa] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'topic'
-Switched to branch 'main'
-M	a
-Switched to branch 'topic'
-ok 5 - force checkout a conflict file creates stage zero entry
+fatal: only one reference expected, 2 given.
+fatal: only one reference expected, 2 given.
+ok 10 - accurate error message with more than one ref
 
-# passed all 5 test(s)
-1..5
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2020-checkout-detach.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2020-checkout-detach/.git/
-expecting success of 2020.1 'setup': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three && git tag -d three &&
-	test_commit four && git tag -d four &&
-	git branch branch &&
-	git tag tag
+*** t2011-checkout-invalid-head.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2011-checkout-invalid-head/.git/
+expecting success of 2011.1 'setup': 
+	echo hello >world &&
+	git add world &&
+	git commit -m initial
 
-[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 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Deleted tag 'three' (was 7c7cd71)
-[main fd8d77e] four
+[main (root-commit) b8cd0f7] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 four.t
-Deleted tag 'four' (was fd8d77e)
+ create mode 100644 world
 ok 1 - setup
 
-expecting success of 2020.2 'checkout branch does not detach': 
-	reset &&
-	git checkout branch &&
-	check_not_detached
-
-Already on 'main'
-Switched to branch 'branch'
-ok 2 - checkout branch does not detach
-
-expecting success of 2020.3 'checkout HEAD no-op/don't detach': 
-		reset &&
-		cat .git/HEAD >expect &&
-		git checkout $opt &&
-		cat .git/HEAD >actual &&
-		check_not_detached &&
-		test_cmp expect actual
-	
-Switched to branch 'main'
-ok 3 - checkout HEAD no-op/don't detach
-
-expecting success of 2020.4 'checkout @ no-op/don't detach': 
-		reset &&
-		cat .git/HEAD >expect &&
-		git checkout $opt &&
-		cat .git/HEAD >actual &&
-		check_not_detached &&
-		test_cmp expect actual
-	
-Already on 'main'
-ok 4 - checkout @ no-op/don't detach
-
-expecting success of 2020.5 'checkout tag detaches': 
-	reset &&
-	git checkout tag &&
-	check_detached
-
-Already on 'main'
-Note: switching to 'tag'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at fd8d77e four
-ok 5 - checkout tag detaches
-
-expecting success of 2020.6 'checkout branch by full name detaches': 
-	reset &&
-	git checkout refs/heads/branch &&
-	check_detached
-
-Switched to branch 'main'
-Note: switching to 'refs/heads/branch'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at fd8d77e four
-ok 6 - checkout branch by full name detaches
-
-expecting success of 2020.7 'checkout non-ref detaches': 
-	reset &&
-	git checkout branch^ &&
-	check_detached
-
-Switched to branch 'main'
-Note: switching to 'branch^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 7c7cd71 three
-ok 7 - checkout non-ref detaches
-
-expecting success of 2020.8 'checkout ref^0 detaches': 
-	reset &&
-	git checkout branch^0 &&
-	check_detached
-
-Previous HEAD position was 7c7cd71 three
-Switched to branch 'main'
-Note: switching to 'branch^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at fd8d77e four
-ok 8 - checkout ref^0 detaches
-
-expecting success of 2020.9 'checkout --detach detaches': 
-	reset &&
-	git checkout --detach branch &&
-	check_detached
-
-Switched to branch 'main'
-HEAD is now at fd8d77e four
-ok 9 - checkout --detach detaches
-
-expecting success of 2020.10 'checkout --detach without branch name': 
-	reset &&
-	git checkout --detach &&
-	check_detached
-
-Switched to branch 'main'
-HEAD is now at fd8d77e four
-ok 10 - checkout --detach without branch name
-
-expecting success of 2020.11 'checkout --detach errors out for non-commit': 
-	reset &&
-	test_must_fail git checkout --detach one^{tree} &&
-	check_not_detached
-
-Switched to branch 'main'
-fatal: Cannot switch branch to a non-commit 'one^{tree}'
-ok 11 - checkout --detach errors out for non-commit
-
-expecting success of 2020.12 'checkout --detach errors out for extra argument': 
-	reset &&
-	git checkout main &&
-	test_must_fail git checkout --detach tag one.t &&
-	check_not_detached
-
-Already on 'main'
-Already on 'main'
-fatal: git checkout: --detach does not take a path argument 'one.t'
-ok 12 - checkout --detach errors out for extra argument
-
-expecting success of 2020.13 'checkout --detached and -b are incompatible': 
-	reset &&
-	test_must_fail git checkout --detach -b newbranch tag &&
-	check_not_detached
-
-Already on 'main'
-fatal: '--detach' cannot be used with '-b/-B/--orphan'
-ok 13 - checkout --detached and -b are incompatible
-
-expecting success of 2020.14 'checkout --detach moves HEAD': 
-	reset &&
-	git checkout one &&
-	git checkout --detach two &&
-	git diff --exit-code HEAD &&
-	git diff --exit-code two
-
-Already on 'main'
-Note: switching to 'one'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 2011.2 'checkout should not start branch from a tree': 
+	test_must_fail git checkout -b newbranch main^{tree}
 
-HEAD is now at d79ce16 one
-Previous HEAD position was d79ce16 one
-HEAD is now at 139b20d two
-ok 14 - checkout --detach moves HEAD
+fatal: Cannot switch branch to a non-commit 'main^{tree}'
+ok 2 - checkout should not start branch from a tree
 
-expecting success of 2020.15 'checkout warns on orphan commits': 
-	reset &&
-	git checkout --detach two &&
-	echo content >orphan &&
-	git add orphan &&
-	git commit -a -m orphan1 &&
-	echo new content >orphan &&
-	git commit -a -m orphan2 &&
-	orphan2=$(git rev-parse HEAD) &&
-	git checkout main 2>stderr
+expecting success of 2011.3 'checkout main from invalid HEAD': 
+	echo $ZERO_OID >.git/HEAD &&
+	git checkout main --
 
-Previous HEAD position was 139b20d two
 Switched to branch 'main'
-HEAD is now at 139b20d two
-[detached HEAD 61e8031] orphan1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 orphan
-[detached HEAD bfea71d] orphan2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - checkout warns on orphan commits
-
-expecting success of 2020.16 'checkout warns on orphan commits: output': 
-	check_orphan_warning stderr "2 commits"
-
-Warning: you are leaving 2 commits behind, not connected to
-ok 16 - checkout warns on orphan commits: output
-
-expecting success of 2020.17 'checkout warns orphaning 1 of 2 commits': 
-	git checkout "$orphan2" &&
-	git checkout HEAD^ 2>stderr
-
-Note: switching to 'bfea71df3731158d55fcf7b9d1ae214132b90e2b'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at bfea71d orphan2
-ok 17 - checkout warns orphaning 1 of 2 commits
-
-expecting success of 2020.18 'checkout warns orphaning 1 of 2 commits: output': 
-	check_orphan_warning stderr "1 commit"
+ok 3 - checkout main from invalid HEAD
 
-Warning: you are leaving 1 commit behind, not connected to
-ok 18 - checkout warns orphaning 1 of 2 commits: output
+expecting success of 2011.4 'checkout notices failure to lock HEAD': 
+	test_when_finished "rm -f .git/HEAD.lock" &&
+	>.git/HEAD.lock &&
+	test_must_fail git checkout -b other
 
-expecting success of 2020.19 'checkout does not warn leaving ref tip': 
-	reset &&
-	git checkout --detach two &&
-	git checkout main 2>stderr
+error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2011-checkout-invalid-head/.git/HEAD.lock': File exists.
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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.
+fatal: unable to update HEAD
+ok 4 - checkout notices failure to lock HEAD
 
-  61e8031 orphan1
+expecting success of 2011.5 'create ref directory/file conflict scenario': 
+	git update-ref refs/heads/outer/inner main &&
+	reset_to_df () {
+		git symbolic-ref HEAD refs/heads/outer
+	}
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+ok 5 - create ref directory/file conflict scenario
 
- git branch <new-branch-name> 61e8031
+expecting success of 2011.6 'checkout away from d/f HEAD (unpacked, to branch)': 
+	reset_to_df &&
+	git checkout main
 
 Switched to branch 'main'
-HEAD is now at 139b20d two
-ok 19 - checkout does not warn leaving ref tip
-
-expecting success of 2020.20 'checkout does not warn leaving ref tip': 
-	check_no_orphan_warning stderr
-
-Previous HEAD position was 139b20d two
-ok 20 - checkout does not warn leaving ref tip
-
-expecting success of 2020.21 'checkout does not warn leaving reachable commit': 
-	reset &&
-	git checkout --detach HEAD^ &&
-	git checkout main 2>stderr
-
-Already on 'main'
-HEAD is now at 7c7cd71 three
-ok 21 - checkout does not warn leaving reachable commit
-
-expecting success of 2020.22 'checkout does not warn leaving reachable commit': 
-	check_no_orphan_warning stderr
-
-Previous HEAD position was 7c7cd71 three
-ok 22 - checkout does not warn leaving reachable commit
-
-expecting success of 2020.23 'tracking count is accurate after orphan check': 
-	reset &&
-	git branch child main^ &&
-	git config branch.child.remote . &&
-	git config branch.child.merge refs/heads/main &&
-	git checkout child^ &&
-	git checkout child >stdout &&
-	test_cmp expect stdout &&
-
-	git checkout --detach child >stdout &&
-	test_grep ! "can be fast-forwarded\." stdout
-
-Already on 'main'
-Note: switching to 'child^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-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
-Previous HEAD position was 139b20d two
-Switched to branch 'child'
-HEAD is now at 7c7cd71 three
-ok 23 - tracking count is accurate after orphan check
-
-expecting success of 2020.24 'no advice given for explicit detached head state': 
-	# baseline
-	test_config advice.detachedHead true &&
-	git checkout child && git checkout HEAD^0 >expect.advice 2>&1 &&
-	test_config advice.detachedHead false &&
-	git checkout child && git checkout HEAD^0 >expect.no-advice 2>&1 &&
-	test_unconfig advice.detachedHead &&
-	# without configuration, the advice.* variables default to true
-	git checkout child && git checkout HEAD^0 >actual 2>&1 &&
-	test_cmp expect.advice actual &&
-
-	# with explicit --detach
-	# no configuration
-	test_unconfig advice.detachedHead &&
-	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
-	test_cmp expect.no-advice actual &&
-
-	# explicitly decline advice
-	test_config advice.detachedHead false &&
-	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
-	test_cmp expect.no-advice actual
-
-Switched to branch 'child'
-Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-ok 24 - no advice given for explicit detached head state
-
-expecting success of 2020.25 'describe_detached_head prints no SHA-1 ellipsis when not asked to': 
-
-	commit=7c7cd714e262 &&
-	commit2=139b20d8e6c5 &&
-	commit3=d79ce1670bdc &&
-
-	# The first detach operation is more chatty than the following ones.
-	cat >1st_detach <<-EOF &&
-	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 $commit three
-	EOF
-
-	# The remaining ones just show info about previous and current HEADs.
-	cat >2nd_detach <<-EOF &&
-	Previous HEAD position was $commit three
-	HEAD is now at $commit2 two
-	EOF
-
-	cat >3rd_detach <<-EOF &&
-	Previous HEAD position was $commit2 two
-	HEAD is now at $commit3 one
-	EOF
-
-	reset &&
-	check_not_detached &&
-
-	# Various ways of *not* asking for ellipses
-
-	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 1st_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS=no git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 2nd_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 3rd_detach actual &&
-
-	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
+ok 6 - checkout away from d/f HEAD (unpacked, to branch)
 
-	# We only have four commits, but we can re-use them
-	reset &&
-	check_not_detached &&
+expecting success of 2011.7 'checkout away from d/f HEAD (unpacked, to detached)': 
+	reset_to_df &&
+	git checkout --detach main
 
-	# Make no mention of the env var at all
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 1st_detach actual &&
+HEAD is now at b8cd0f7 initial
+ok 7 - checkout away from d/f HEAD (unpacked, to detached)
 
-	GIT_PRINT_SHA1_ELLIPSIS='nope' &&
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 2nd_detach actual &&
+expecting success of 2011.8 'pack refs': 
+	git pack-refs --all --prune
 
-	GIT_PRINT_SHA1_ELLIPSIS=nein &&
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 3rd_detach actual &&
+ok 8 - pack refs
 
-	true
+expecting success of 2011.9 'checkout away from d/f HEAD (packed, to branch)': 
+	reset_to_df &&
+	git checkout main
 
-Previous HEAD position was 7c7cd71 three
-Switched to branch 'main'
-Previous HEAD position was d79ce16 one
 Switched to branch 'main'
-ok 25 - describe_detached_head prints no SHA-1 ellipsis when not asked to
-
-expecting success of 2020.26 'describe_detached_head does print SHA-1 ellipsis when asked to': 
-
-	commit=7c7cd714e262 &&
-	commit2=139b20d8e6c5 &&
-	commit3=d79ce1670bdc &&
-
-	# The first detach operation is more chatty than the following ones.
-	cat >1st_detach <<-EOF &&
-	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 $commit... three
-	EOF
-
-	# The remaining ones just show info about previous and current HEADs.
-	cat >2nd_detach <<-EOF &&
-	Previous HEAD position was $commit... three
-	HEAD is now at $commit2... two
-	EOF
-
-	cat >3rd_detach <<-EOF &&
-	Previous HEAD position was $commit2... two
-	HEAD is now at $commit3... one
-	EOF
-
-	reset &&
-	check_not_detached &&
-
-	# Various ways of asking for ellipses...
-	# The user can just use any kind of quoting (including none).
-
-	GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 1st_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 2nd_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_cmp 3rd_detach actual &&
+ok 9 - checkout away from d/f HEAD (packed, to branch)
 
-	true
+expecting success of 2011.10 'checkout away from d/f HEAD (packed, to detached)': 
+	reset_to_df &&
+	git checkout --detach main
 
-Previous HEAD position was d79ce16 one
-Switched to branch 'main'
-ok 26 - describe_detached_head does print SHA-1 ellipsis when asked to
+HEAD is now at b8cd0f7 initial
+ok 10 - checkout away from d/f HEAD (packed, to detached)
 
-# passed all 26 test(s)
-1..26
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2027-checkout-track.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2027-checkout-track/.git/
-expecting success of 2027.1 'setup': 
-	test_commit one &&
-	test_commit two
+*** t2014-checkout-switch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2014-checkout-switch/.git/
+expecting success of 2014.1 'setup': 
+	echo Hello >file &&
+	git add file &&
+	test_tick &&
+	git commit -m V1 &&
+	echo Hello world >file &&
+	git add file &&
+	git checkout -b other
 
-[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
+[master (root-commit) 68a43dc] V1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
+ create mode 100644 file
+Switched to a new branch 'other'
 ok 1 - setup
 
-expecting success of 2027.2 'checkout --track -b creates a new tracking branch': 
-	git checkout --track -b branch1 main &&
-	test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
-	test $(git config --get branch.branch1.remote) = . &&
-	test $(git config --get branch.branch1.merge) = refs/heads/main
+expecting success of 2014.2 'check all changes are staged': 
+	git diff --exit-code
 
-Switched to a new branch 'branch1'
-branch 'branch1' set up to track 'main'.
-ok 2 - checkout --track -b creates a new tracking branch
+ok 2 - check all changes are staged
 
-expecting success of 2027.3 'checkout --track -b rejects an extra path argument': 
-	test_must_fail git checkout --track -b branch2 main one.t 2>err &&
-	test_grep "cannot be used with updating paths" err
+expecting success of 2014.3 'second commit': 
+	git commit -m V2
 
-fatal: '--track' cannot be used with updating paths
-ok 3 - checkout --track -b rejects an extra path argument
+[other c55967b] V2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - second commit
 
-expecting success of 2027.4 'checkout --track -b overrides autoSetupMerge=inherit': 
-	# Set up tracking config on main
-	test_config branch.main.remote origin &&
-	test_config branch.main.merge refs/heads/some-branch &&
-	test_config branch.autoSetupMerge inherit &&
-	# With --track=inherit, we copy the tracking config from main
-	git checkout --track=inherit -b b1 main &&
-	test_cmp_config origin branch.b1.remote &&
-	test_cmp_config refs/heads/some-branch branch.b1.merge &&
-	# With branch.autoSetupMerge=inherit, we do the same
-	git checkout -b b2 main &&
-	test_cmp_config origin branch.b2.remote &&
-	test_cmp_config refs/heads/some-branch branch.b2.merge &&
-	# But --track overrides this
-	git checkout --track -b b3 main &&
-	test_cmp_config . branch.b3.remote &&
-	test_cmp_config refs/heads/main branch.b3.merge &&
-	# And --track=direct does as well
-	git checkout --track=direct -b b4 main &&
-	test_cmp_config . branch.b4.remote &&
-	test_cmp_config refs/heads/main branch.b4.merge
+expecting success of 2014.4 'check': 
+	git diff --cached --exit-code
 
-Switched to a new branch 'b1'
-branch 'b1' set up to track 'origin/some-branch'.
-Switched to a new branch 'b2'
-branch 'b2' set up to track 'origin/some-branch'.
-Switched to a new branch 'b3'
-branch 'b3' set up to track 'main'.
-Switched to a new branch 'b4'
-branch 'b4' set up to track 'main'.
-ok 4 - checkout --track -b overrides autoSetupMerge=inherit
+ok 4 - check
 
 # passed all 4 test(s)
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2026-checkout-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t2015-checkout-unborn.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2015-checkout-unborn/.git/
+expecting success of 2015.1 'setup': 
+	mkdir parent &&
+	(
+		cd parent &&
+		git init &&
+		echo content >file &&
+		git add file &&
+		git commit -m base
+	) &&
+	git fetch parent main:origin
 
-[master (root-commit) ad2e047] file0
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2015-checkout-unborn/parent/.git/
+[main (root-commit) 5d770fe] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 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(-)
+ create mode 100644 file
+From parent
+ * [new branch]      main       -> origin
 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 &&
+expecting success of 2015.2 'checkout from unborn preserves untracked files': 
+	echo precious >expect &&
+	echo precious >file &&
+	test_must_fail git checkout -b new origin &&
+	test_cmp expect file
 
-	printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+error: The following untracked working tree files would be overwritten by checkout:
+	file
+Please move or remove them before you switch branches.
+Aborting
+ok 2 - checkout from unborn preserves untracked files
 
-	cat >expect <<-\EOF &&
-	M  fileB.t
-	M  fileC.t
-	EOF
-	verify_expect
+expecting success of 2015.3 'checkout from unborn preserves index contents': 
+	echo precious >expect &&
+	echo precious >file &&
+	git add file &&
+	test_must_fail git checkout -b new origin &&
+	test_cmp expect file &&
+	git show :file >file &&
+	test_cmp expect file
 
-HEAD is now at 774eb8e files 2
-Updated 2 paths from 0465292
-ok 10 - only touches what was listed
+error: Your local changes to the following files would be overwritten by checkout:
+	file
+Please commit your changes or stash them before you switch branches.
+Aborting
+ok 3 - checkout from unborn preserves index contents
 
-expecting success of 2026.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
+expecting success of 2015.4 'checkout from unborn merges identical index contents': 
+	echo content >file &&
+	git add file &&
+	git checkout -b new origin
 
-	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 &&
+Switched to a new branch 'new'
+ok 4 - checkout from unborn merges identical index contents
 
-	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 &&
+expecting success of 2015.5 'checking out another branch from unborn state': 
+	git checkout --orphan newroot &&
+	git checkout -b anothername &&
+	test_must_fail git show-ref --verify refs/heads/newroot &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/anothername >expect &&
+	test_cmp expect actual
 
-	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 &&
+Switched to a new branch 'newroot'
+Switched to a new branch 'anothername'
+fatal: 'refs/heads/newroot' - not a valid ref
+ok 5 - checking out another branch from unborn state
 
-	test_must_fail git checkout --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
+expecting success of 2015.6 'checking out in a newly created repo': 
+	test_create_repo empty &&
+	(
+		cd empty &&
+		git symbolic-ref HEAD >expect &&
+		test_must_fail git checkout &&
+		git symbolic-ref HEAD >actual &&
+		test_cmp expect actual
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2015-checkout-unborn/empty/.git/
+fatal: You are on a branch yet to be born
+ok 6 - checking out in a newly created repo
 
-# passed all 11 test(s)
-1..11
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t1450-fsck.sh ***
@@ -93714,7 +83109,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000972127 s, 1.0 kB/s
+1 byte copied, 0.00600836 s, 0.2 kB/s
 error: .git/objects/pack/pack-8be9f6a4139bcddd74c3d2ed343bb71e87863c4b.pack pack checksum mismatch
 ok 79 - fsck fails on corrupt packfile
 
@@ -93958,12446 +83353,12109 @@
 1..94
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2050-git-dir-relative.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2050-git-dir-relative/.git/
-expecting success of 2050.1 'Setting up post-commit hook': 
-mkdir -p .git/hooks &&
-echo >.git/hooks/post-commit "#!/bin/sh
-touch \"\${COMMIT_FILE}\"
-echo Post commit hook was called." &&
-chmod +x .git/hooks/post-commit
-ok 1 - Setting up post-commit hook
-
-expecting success of 2050.2 'post-commit hook used ordinarily': 
-echo initial >top &&
-git add top &&
-git commit -m initial &&
-test -r "${COMMIT_FILE}"
+*** t2017-checkout-orphan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2017-checkout-orphan/.git/
+expecting success of 2017.1 'Setup': 
+	echo "Initial" >"$TEST_FILE" &&
+	git add "$TEST_FILE" &&
+	git commit -m "First Commit" &&
+	test_tick &&
+	echo "State 1" >>"$TEST_FILE" &&
+	git add "$TEST_FILE" &&
+	test_tick &&
+	git commit -m "Second Commit"
 
-Post commit hook was called.
-[master (root-commit) 0619340] initial
+[main (root-commit) df316c6] First Commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 top
-ok 2 - post-commit hook used ordinarily
-
-expecting success of 2050.3 'post-commit-hook created and used from top dir': 
-echo changed >top &&
-git --git-dir subdir/.git add top &&
-git --git-dir subdir/.git commit -m topcommit &&
-test -r "${COMMIT_FILE}"
-
-Post commit hook was called.
-[master fc38a58] topcommit
+ create mode 100644 foo
+[main 8c3f362] Second Commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - post-commit-hook created and used from top dir
+ 1 file changed, 1 insertion(+)
+ok 1 - Setup
 
-expecting success of 2050.4 'post-commit-hook from sub dir': 
-echo changed again >top &&
-cd subdir &&
-git --git-dir .git --work-tree .. add ../top &&
-git --git-dir .git --work-tree .. commit -m subcommit &&
-test -r "${COMMIT_FILE}"
+expecting success of 2017.2 '--orphan creates a new orphan branch from HEAD': 
+	git checkout --orphan alpha &&
+	test_must_fail git rev-parse --verify HEAD &&
+	test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
+	test_tick &&
+	git commit -m "Third Commit" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git diff-tree --quiet main alpha
 
-Post commit hook was called.
-[master ca7703f] subcommit
+Switched to a new branch 'alpha'
+fatal: Needed a single revision
+[alpha (root-commit) 6f20c32] Third Commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - post-commit-hook from sub dir
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2072-restore-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2072-restore-pathspec-file/.git/
-expecting success of 2072.1 'setup': 
-	test_commit file0 &&
-
-	mkdir dir1 &&
-	echo 1 >dir1/file &&
-	echo 1 >fileA.t &&
-	echo 1 >fileB.t &&
-	echo 1 >fileC.t &&
-	echo 1 >fileD.t &&
-	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "files 1" &&
-
-	echo 2 >dir1/file &&
-	echo 2 >fileA.t &&
-	echo 2 >fileB.t &&
-	echo 2 >fileC.t &&
-	echo 2 >fileD.t &&
-	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "files 2" &&
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 2 - --orphan creates a new orphan branch from HEAD
 
-	git tag checkpoint
+expecting success of 2017.3 '--orphan creates a new orphan branch from <start_point>': 
+	git checkout main &&
+	git checkout --orphan beta main^ &&
+	test_must_fail git rev-parse --verify HEAD &&
+	test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
+	test_tick &&
+	git commit -m "Fourth Commit" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git diff-tree --quiet main^ beta
 
-[master (root-commit) ad2e047] file0
+Switched to branch 'main'
+Switched to a new branch 'beta'
+fatal: Needed a single revision
+[beta (root-commit) 530edda] Fourth Commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file0.t
-[master 17aa47d] files 1
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir1/file
- create mode 100644 fileA.t
- create mode 100644 fileB.t
- create mode 100644 fileC.t
- create mode 100644 fileD.t
-[master 4c6d82b] files 2
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+), 5 deletions(-)
-ok 1 - setup
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 3 - --orphan creates a new orphan branch from <start_point>
 
-expecting success of 2072.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
+expecting success of 2017.4 '--orphan must be rejected with -b': 
+	git checkout main &&
+	test_must_fail git checkout --orphan new -b newer &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 
-	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
+Switched to branch 'main'
+fatal: options '-b', '-B', and '--orphan' cannot be used together
+ok 4 - --orphan must be rejected with -b
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
+expecting success of 2017.5 '--orphan must be rejected with -t': 
+	git checkout main &&
+	test_must_fail git checkout --orphan new -t main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 
-HEAD is now at 4c6d82b files 2
-ok 2 - --pathspec-from-file from stdin
+Already on 'main'
+fatal: '--orphan' cannot be used with '-t'
+ok 5 - --orphan must be rejected with -t
 
-expecting success of 2072.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
+expecting success of 2017.6 '--orphan ignores branch.autosetupmerge': 
+	git checkout main &&
+	git config branch.autosetupmerge always &&
+	git checkout --orphan gamma &&
+	test_cmp_config "" --default "" branch.gamma.merge &&
+	test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git checkout main &&
+	git config branch.autosetupmerge inherit &&
+	git checkout --orphan eta &&
+	test_cmp_config "" --default "" branch.eta.merge &&
+	test_cmp_config "" --default "" branch.eta.remote &&
+	echo refs/heads/eta >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual &&
+	test_must_fail git rev-parse --verify HEAD^
 
-	echo fileA.t >list &&
-	git restore --pathspec-from-file=list --source=HEAD^1 &&
+Already on 'main'
+Switched to a new branch 'gamma'
+fatal: Needed a single revision
+Switched to branch 'main'
+Switched to a new branch 'eta'
+fatal: Needed a single revision
+ok 6 - --orphan ignores branch.autosetupmerge
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
+expecting success of 2017.7 '--orphan makes reflog by default': 
+	git checkout main &&
+	git config --unset core.logAllRefUpdates &&
+	git checkout --orphan delta &&
+	test_must_fail git rev-parse --verify delta@{0} &&
+	git commit -m Delta &&
+	git rev-parse --verify delta@{0}
 
-HEAD is now at 4c6d82b files 2
-ok 3 - --pathspec-from-file from file
+Switched to branch 'main'
+Switched to a new branch 'delta'
+fatal: Needed a single revision
+[delta (root-commit) 9beee35] Delta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+9beee35744aee191f8186ef0a6ab78f710cdd57c
+ok 7 - --orphan makes reflog by default
 
-expecting success of 2072.4 'NUL delimiters': 
-	restore_checkpoint &&
+expecting success of 2017.8 '--orphan does not make reflog when core.logAllRefUpdates = false': 
+	git checkout main &&
+	git config core.logAllRefUpdates false &&
+	git checkout --orphan epsilon &&
+	test_must_fail git rev-parse --verify epsilon@{0} &&
+	git commit -m Epsilon &&
+	test_must_fail git rev-parse --verify epsilon@{0}
 
-	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
+Switched to branch 'main'
+Switched to a new branch 'epsilon'
+fatal: Needed a single revision
+[epsilon (root-commit) c5e7701] Epsilon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
+expecting success of 2017.9 '--orphan with -l makes reflog when core.logAllRefUpdates = false': 
+	git checkout main &&
+	git checkout -l --orphan zeta &&
+	test_must_fail git rev-parse --verify zeta@{0} &&
+	git commit -m Zeta &&
+	git rev-parse --verify zeta@{0}
 
-HEAD is now at 4c6d82b files 2
-ok 4 - NUL delimiters
+Switched to branch 'main'
+Switched to a new branch 'zeta'
+fatal: Needed a single revision
+[zeta (root-commit) 1b23595] Zeta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+1b235958474dccc5c8f228713c620d22e7d1825d
+ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false
 
-expecting success of 2072.5 'LF delimiters': 
-	restore_checkpoint &&
+expecting success of 2017.10 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog': 
+	git checkout main &&
+	git checkout -l --orphan eta &&
+	test_must_fail git rev-parse --verify eta@{0} &&
+	git checkout main &&
+	test_must_fail git rev-parse --verify eta@{0}
 
-	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+Switched to branch 'main'
+Switched to a new branch 'eta'
+fatal: Needed a single revision
+Switched to branch 'main'
+fatal: Needed a single revision
+ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
+expecting success of 2017.11 '--orphan is rejected with an existing name': 
+	git checkout main &&
+	test_must_fail git checkout --orphan main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 
-HEAD is now at 4c6d82b files 2
-ok 5 - LF delimiters
+Already on 'main'
+fatal: a branch named 'main' already exists
+ok 11 - --orphan is rejected with an existing name
 
-expecting success of 2072.6 'no trailing delimiter': 
-	restore_checkpoint &&
+expecting success of 2017.12 '--orphan refuses to switch if a merge is needed': 
+	git checkout main &&
+	git reset --hard &&
+	echo local >>"$TEST_FILE" &&
+	cat "$TEST_FILE" >"$TEST_FILE.saved" &&
+	test_must_fail git checkout --orphan new main^ &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)" &&
+	test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
+	git diff-index --quiet --cached HEAD &&
+	git reset --hard
 
-	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+Already on 'main'
+HEAD is now at 8c3f362 Second Commit
+error: Your local changes to the following files would be overwritten by checkout:
+	foo
+Please commit your changes or stash them before you switch branches.
+Aborting
+HEAD is now at 8c3f362 Second Commit
+ok 12 - --orphan refuses to switch if a merge is needed
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
+expecting success of 2017.13 'cannot --detach on an unborn branch': 
+	git checkout main &&
+	git checkout --orphan new &&
+	test_must_fail git checkout --detach
 
-HEAD is now at 4c6d82b files 2
-ok 6 - no trailing delimiter
+Already on 'main'
+Switched to a new branch 'new'
+fatal: You are on a branch yet to be born
+ok 13 - cannot --detach on an unborn branch
 
-expecting success of 2072.7 'CRLF delimiters': 
-	restore_checkpoint &&
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2012-checkout-last.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
 
-	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+[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
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
+expecting success of 2012.2 '"checkout -" does not work initially': 
+	test_must_fail git checkout -
 
-HEAD is now at 4c6d82b files 2
-ok 7 - CRLF delimiters
+error: pathspec '-' did not match any file(s) known to git
+ok 2 - "checkout -" does not work initially
 
-expecting success of 2072.8 'quotes': 
-	restore_checkpoint &&
+expecting success of 2012.3 'first branch switch': 
+	git checkout other
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+Switched to branch 'other'
+ok 3 - first branch switch
 
-	git restore --pathspec-from-file=list --source=HEAD^1 &&
+expecting success of 2012.4 '"checkout -" switches back': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
+Switched to branch 'main'
+ok 4 - "checkout -" switches back
 
-HEAD is now at 4c6d82b files 2
-ok 8 - quotes
+expecting success of 2012.5 '"checkout -" switches forth': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref other
 
-expecting success of 2072.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
+Switched to branch 'other'
+ok 5 - "checkout -" switches forth
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+expecting success of 2012.6 'detach HEAD': 
+	git checkout $(git rev-parse HEAD)
 
-	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
+Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
 
-HEAD is now at 4c6d82b files 2
-error: pathspec '"file\101.t"
-' did not match any file(s) known to git
-ok 9 - quotes not compatible with --pathspec-file-nul
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 2072.10 'only touches what was listed': 
-	restore_checkpoint &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+  git switch -c <new-branch-name>
 
-	cat >expect <<-\EOF &&
-	 M fileB.t
-	 M fileC.t
-	EOF
-	verify_expect
+Or undo this operation with:
 
-HEAD is now at 4c6d82b files 2
-ok 10 - only touches what was listed
+  git switch -
 
-expecting success of 2072.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+HEAD is now at b77667e initial
+ok 6 - detach HEAD
 
-	test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+expecting success of 2012.7 '"checkout -" attaches again': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref other
 
-	test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+Switched to branch 'other'
+ok 7 - "checkout -" attaches again
 
-	test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
-	test_grep -e "you must specify path(s) to restore" err
+expecting success of 2012.8 '"checkout -" detaches again': 
+	git checkout - &&
 
-HEAD is now at 4c6d82b files 2
-fatal: options '--pathspec-from-file' and '--patch' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-fatal: you must specify path(s) to restore
-ok 11 - error conditions
+	git rev-parse other >expect &&
+	git rev-parse HEAD >actual &&
+	test_cmp expect actual &&
 
-expecting success of 2072.12 'wildcard pathspec matches file in subdirectory': 
-	restore_checkpoint &&
+	test_must_fail git symbolic-ref HEAD
 
-	echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 &&
-	cat >expect <<-\EOF &&
-	 M dir1/file
-	EOF
-	verify_expect
+Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
 
-HEAD is now at 4c6d82b files 2
-ok 12 - wildcard pathspec matches file in 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.
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2070-restore.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2070-restore/.git/
-expecting success of 2070.1 'setup': 
-	test_commit first &&
-	echo first-and-a-half >>first.t &&
-	git add first.t &&
-	test_commit second &&
-	echo one >one &&
-	echo two >two &&
-	echo untracked >untracked &&
-	echo ignored >ignored &&
-	echo /ignored >.gitignore &&
-	git add one two .gitignore &&
-	git update-ref refs/heads/one main
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[main a46c920] second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 second.t
-ok 1 - setup
+  git switch -c <new-branch-name>
 
-expecting success of 2070.2 'restore without pathspec is not ok': 
-	test_must_fail git restore &&
-	test_must_fail git restore --source=first
+Or undo this operation with:
 
-fatal: you must specify path(s) to restore
-fatal: you must specify path(s) to restore
-ok 2 - restore without pathspec is not ok
+  git switch -
 
-expecting success of 2070.3 'restore a file, ignoring branch of same name': 
-	cat one >expected &&
-	echo dirty >>one &&
-	git restore one &&
-	test_cmp expected one
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 3 - restore a file, ignoring branch of same name
+HEAD is now at b77667e initial
+fatal: ref HEAD is not a symbolic ref
+ok 8 - "checkout -" detaches again
 
-expecting success of 2070.4 'restore a file on worktree from another ref': 
-	test_when_finished git reset --hard &&
-	git cat-file blob first:./first.t >expected &&
-	git restore --source=first first.t &&
-	test_cmp expected first.t &&
-	git cat-file blob HEAD:./first.t >expected &&
-	git show :first.t >actual &&
-	test_cmp expected actual
+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
 
-HEAD is now at a46c920 second
-ok 4 - restore a file on worktree from another ref
+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 2070.5 'restore a file in the index from another ref': 
-	test_when_finished git reset --hard &&
-	git cat-file blob first:./first.t >expected &&
-	git restore --source=first --staged first.t &&
-	git show :first.t >actual &&
-	test_cmp expected actual &&
-	git cat-file blob HEAD:./first.t >expected &&
-	test_cmp expected first.t
+expecting success of 2012.10 'switch to the last': 
+	more_switches &&
+	git checkout @{-1} &&
+	test_cmp_symbolic_HEAD_ref branch2
 
-HEAD is now at a46c920 second
-ok 5 - restore a file in the index from another ref
+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 2070.6 'restore a file in both the index and worktree from another ref': 
-	test_when_finished git reset --hard &&
-	git cat-file blob first:./first.t >expected &&
-	git restore --source=first --staged --worktree first.t &&
-	git show :first.t >actual &&
-	test_cmp expected actual &&
-	test_cmp expected first.t
+expecting success of 2012.11 'switch to second from the last': 
+	more_switches &&
+	git checkout @{-2} &&
+	test_cmp_symbolic_HEAD_ref branch3
 
-HEAD is now at a46c920 second
-ok 6 - restore a file in both the index and worktree from another ref
+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 2070.7 'restore --staged uses HEAD as source': 
-	test_when_finished git reset --hard &&
-	git cat-file blob :./first.t >expected &&
-	echo index-dirty >>first.t &&
-	git add first.t &&
-	git restore --staged first.t &&
-	git cat-file blob :./first.t >actual &&
-	test_cmp expected actual
+expecting success of 2012.12 'switch to third from the last': 
+	more_switches &&
+	git checkout @{-3} &&
+	test_cmp_symbolic_HEAD_ref branch4
 
-HEAD is now at a46c920 second
-ok 7 - restore --staged uses HEAD as source
+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 2070.8 'restore --worktree --staged uses HEAD as source': 
-	test_when_finished git reset --hard &&
-	git show HEAD:./first.t >expected &&
-	echo dirty >>first.t &&
-	git add first.t &&
-	git restore --worktree --staged first.t &&
-	git show :./first.t >actual &&
-	test_cmp expected actual &&
-	test_cmp expected first.t
+expecting success of 2012.13 'switch to fourth from the last': 
+	more_switches &&
+	git checkout @{-4} &&
+	test_cmp_symbolic_HEAD_ref branch5
 
-HEAD is now at a46c920 second
-ok 8 - restore --worktree --staged uses HEAD as source
+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 2070.9 'restore --ignore-unmerged ignores unmerged entries': 
-	git init unmerged &&
-	(
-		cd unmerged &&
-		echo one >unmerged &&
-		echo one >common &&
-		git add unmerged common &&
-		git commit -m common &&
-		git switch -c first &&
-		echo first >unmerged &&
-		git commit -am first &&
-		git switch -c second main &&
-		echo second >unmerged &&
-		git commit -am second &&
-		test_must_fail git merge first &&
+expecting success of 2012.14 'switch to twelfth from the last': 
+	more_switches &&
+	git checkout @{-12} &&
+	test_cmp_symbolic_HEAD_ref branch13
 
-		echo dirty >>common &&
-		test_must_fail git restore . &&
+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
 
-		git restore --ignore-unmerged --quiet . >output 2>&1 &&
-		git diff common >diff-output &&
-		test_must_be_empty output &&
-		test_must_be_empty diff-output
-	)
+expecting success of 2012.15 'merge base test setup': 
+	git checkout -b another other &&
+	test_commit --append third world "hello again"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2070-restore/unmerged/.git/
-[main (root-commit) b83edd8] common
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 common
- create mode 100644 unmerged
-Switched to a new branch 'first'
-[first 753ae86] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'second'
-[second 06de6fa] second
+Switched to a new branch 'another'
+[another d04d7df] third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging unmerged
-CONFLICT (content): Merge conflict in unmerged
-Automatic merge failed; fix conflicts and then commit the result.
-error: path 'unmerged' is unmerged
-ok 9 - restore --ignore-unmerged ignores unmerged entries
+ 1 file changed, 1 insertion(+)
+ok 15 - merge base test setup
 
-expecting success of 2070.10 'restore --staged adds deleted intent-to-add file back to index': 
-	echo "nonempty" >nonempty &&
-	>empty &&
-	git add nonempty empty &&
-	git commit -m "create files to be deleted" &&
-	git rm --cached nonempty empty &&
-	git add -N nonempty empty &&
-	git restore --staged nonempty empty &&
-	git diff --cached --exit-code
+expecting success of 2012.16 'another...main': 
+	git checkout another &&
+	git checkout another...main &&
 
-[main 94e3084] create files to be deleted
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 empty
- create mode 100644 nonempty
-rm 'empty'
-rm 'nonempty'
-ok 10 - restore --staged adds deleted intent-to-add file back to index
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 2070.11 'restore --staged invalidates cache tree for deletions': 
-	test_when_finished git reset --hard &&
-	>new1 &&
-	>new2 &&
-	git add new1 new2 &&
+Already on 'another'
+Note: switching to 'another...main'.
 
-	# It is important to commit and then reset here, so that the index
-	# contains a valid cache-tree for the "both" tree.
-	git commit -m both &&
-	git reset --soft HEAD^ &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 restore --staged new1 &&
-	git commit -m "just new2" &&
-	git rev-parse HEAD:new2 &&
-	test_must_fail git rev-parse HEAD:new1
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[main 19f4790] both
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 new1
- create mode 100644 new2
-[main 2c4724a] just new2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 new2
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-fatal: path 'new1' exists on disk, but not in 'HEAD'
-HEAD:new1
-HEAD is now at 2c4724a just new2
-ok 11 - restore --staged invalidates cache tree for deletions
+  git switch -c <new-branch-name>
 
-expecting success of 2070.12 'restore --merge to unresolve': 
-	O=$(echo original | git hash-object -w --stdin) &&
-	A=$(echo ourside | git hash-object -w --stdin) &&
-	B=$(echo theirside | git hash-object -w --stdin) &&
-	{
-		echo "100644 $O 1	file" &&
-		echo "100644 $A 2	file" &&
-		echo "100644 $B 3	file"
-	} | git update-index --index-info &&
-	echo nothing >file &&
-	git restore --worktree --merge file &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
+Or undo this operation with:
 
-ok 12 - restore --merge to unresolve
+  git switch -
 
-expecting success of 2070.13 'restore --merge to unresolve after (mistaken) resolution': 
-	O=$(echo original | git hash-object -w --stdin) &&
-	A=$(echo ourside | git hash-object -w --stdin) &&
-	B=$(echo theirside | git hash-object -w --stdin) &&
-	{
-		echo "100644 $O 1	file" &&
-		echo "100644 $A 2	file" &&
-		echo "100644 $B 3	file"
-	} | git update-index --index-info &&
-	echo nothing >file &&
-	git add file &&
-	git restore --worktree --merge file &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 13 - restore --merge to unresolve after (mistaken) resolution
+HEAD is now at b77667e initial
+ok 16 - another...main
 
-expecting success of 2070.14 'restore --merge to unresolve after (mistaken) resolution': 
-	O=$(echo original | git hash-object -w --stdin) &&
-	A=$(echo ourside | git hash-object -w --stdin) &&
-	B=$(echo theirside | git hash-object -w --stdin) &&
-	{
-		echo "100644 $O 1	file" &&
-		echo "100644 $A 2	file" &&
-		echo "100644 $B 3	file"
-	} | git update-index --index-info &&
-	git rm -f file &&
-	git restore --worktree --merge file &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
+expecting success of 2012.17 '...main': 
+	git checkout another &&
+	git checkout ...main &&
 
-rm 'file'
-ok 14 - restore --merge to unresolve after (mistaken) resolution
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 2070.15 'restore with merge options are incompatible with certain options': 
-	for opts in \
-		"--staged --ours" \
-		"--staged --theirs" \
-		"--staged --merge" \
-		"--source=HEAD --ours" \
-		"--source=HEAD --theirs" \
-		"--source=HEAD --merge" \
-		"--staged --conflict=diff3" \
-		"--staged --worktree --ours" \
-		"--staged --worktree --theirs" \
-		"--staged --worktree --merge" \
-		"--staged --worktree --conflict=zdiff3"
-	do
-		test_must_fail git restore $opts . 2>err &&
-		grep "cannot be used" err || return
-	done
+Previous HEAD position was b77667e initial
+Switched to branch 'another'
+Note: switching to '...main'.
 
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--merge' or '--conflict' cannot be used with --staged
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-fatal: '--merge' or '--conflict' cannot be used with --staged
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--merge' or '--conflict' cannot be used with --staged
-fatal: '--merge' or '--conflict' cannot be used with --staged
-ok 15 - restore with merge options are incompatible with certain options
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2060-switch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch/.git/
-expecting success of 2060.1 'setup': 
-	test_commit first &&
-	git branch first-branch &&
-	test_commit second &&
-	test_commit third &&
-	git remote add origin nohost:/nopath &&
-	git update-ref refs/remotes/origin/foo first-branch
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[main d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[main cd7036d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-ok 1 - setup
+  git switch -c <new-branch-name>
 
-expecting success of 2060.2 'switch branch no arguments': 
-	test_must_fail git switch
+Or undo this operation with:
 
-fatal: missing branch or commit argument
-ok 2 - switch branch no arguments
+  git switch -
 
-expecting success of 2060.3 'switch branch': 
-	git switch first-branch &&
-	test_path_is_missing second.t
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Switched to branch 'first-branch'
-ok 3 - switch branch
+HEAD is now at b77667e initial
+ok 17 - ...main
 
-expecting success of 2060.4 'switch and detach': 
-	test_when_finished git switch main &&
-	test_must_fail git switch main^{commit} &&
-	git switch --detach main^{commit} &&
-	test_must_fail git symbolic-ref HEAD
+expecting success of 2012.18 'main...': 
+	git checkout another &&
+	git checkout main... &&
 
-fatal: a branch is expected, got commit 'main^{commit}'
-hint: If you want to detach HEAD at the commit, try again with the --detach option.
-HEAD is now at cd7036d third
-fatal: ref HEAD is not a symbolic ref
-Switched to branch 'main'
-ok 4 - switch and detach
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 2060.5 'suggestion to detach': 
-	test_must_fail git switch main^{commit} 2>stderr &&
-	grep "try again with the --detach option" stderr
+Previous HEAD position was b77667e initial
+Switched to branch 'another'
+Note: switching to 'main...'.
 
-hint: If you want to detach HEAD at the commit, try again with the --detach option.
-ok 5 - suggestion to detach
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 2060.6 'suggestion to detach is suppressed with advice.suggestDetachingHead=false': 
-	test_config advice.suggestDetachingHead false &&
-	test_must_fail git switch main^{commit} 2>stderr &&
-	! grep "try again with the --detach option" stderr
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 6 - suggestion to detach is suppressed with advice.suggestDetachingHead=false
+  git switch -c <new-branch-name>
 
-expecting success of 2060.7 'switch and detach current branch': 
-	test_when_finished git switch main &&
-	git switch main &&
-	git switch --detach &&
-	test_must_fail git symbolic-ref HEAD
+Or undo this operation with:
 
-Already on 'main'
-HEAD is now at cd7036d third
-fatal: ref HEAD is not a symbolic ref
-Switched to branch 'main'
-ok 7 - switch and detach current branch
+  git switch -
 
-expecting success of 2060.8 'switch and create branch': 
-	test_when_finished git switch main &&
-	git switch -c temp main^ &&
-	test_cmp_rev main^ refs/heads/temp &&
-	echo refs/heads/temp >expected-branch &&
-	git symbolic-ref HEAD >actual-branch &&
-	test_cmp expected-branch actual-branch
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Switched to a new branch 'temp'
-Switched to branch 'main'
-ok 8 - switch and create branch
+HEAD is now at b77667e initial
+ok 18 - main...
 
-expecting success of 2060.9 'force create branch from HEAD': 
-	test_when_finished git switch main &&
-	git switch --detach main &&
-	test_must_fail git switch -c temp &&
-	git switch -C temp &&
-	test_cmp_rev main refs/heads/temp &&
-	echo refs/heads/temp >expected-branch &&
-	git symbolic-ref HEAD >actual-branch &&
-	test_cmp expected-branch actual-branch
+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
 
-HEAD is now at cd7036d third
-fatal: a branch named 'temp' already exists
-Switched to and reset branch 'temp'
+Previous HEAD position was b77667e initial
 Switched to branch 'main'
-ok 9 - force create branch from HEAD
+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 2060.10 'new orphan branch from empty': 
-	test_when_finished git switch main &&
-	test_must_fail git switch --orphan new-orphan HEAD &&
-	git switch --orphan new-orphan &&
-	test_commit orphan &&
-	git cat-file commit refs/heads/new-orphan >commit &&
-	! grep ^parent commit &&
-	git ls-files >tracked-files &&
-	echo orphan.t >expected &&
-	test_cmp expected tracked-files
+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
 
-fatal: '--orphan' cannot take <start-point>
-Switched to a new branch 'new-orphan'
-[new-orphan (root-commit) 11bb70e] orphan
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 orphan.t
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/moodle.
 Switched to branch 'main'
-ok 10 - new orphan branch from empty
+ok 20 - "checkout -" works after a rebase A B
 
-expecting success of 2060.11 'orphan branch works with --discard-changes': 
-	test_when_finished git switch main &&
-	echo foo >foo.txt &&
-	git switch --discard-changes --orphan new-orphan2 &&
-	git ls-files >tracked-files &&
-	test_must_be_empty tracked-files
+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
 
-Switched to a new branch 'new-orphan2'
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/other.
 Switched to branch 'main'
-ok 11 - orphan branch works with --discard-changes
+ok 21 - "checkout -" works after a rebase -i A
 
-expecting success of 2060.12 'switching ignores file of same branch name': 
-	test_when_finished git switch main &&
-	: >first-branch &&
-	git switch first-branch &&
-	echo refs/heads/first-branch >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual
+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
 
-Switched to branch 'first-branch'
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/foodle.
 Switched to branch 'main'
-ok 12 - switching ignores file of same branch name
+ok 22 - "checkout -" works after a rebase -i A B
 
-expecting success of 2060.13 'guess and create branch': 
-	test_when_finished git switch main &&
-	test_must_fail git switch --no-guess foo &&
-	test_config checkout.guess false &&
-	test_must_fail git switch foo &&
-	test_config checkout.guess true &&
-	git switch foo &&
-	echo refs/heads/foo >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0450-txt-doc-vs-help.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t0450-txt-doc-vs-help/.git/
+expecting success of 0450.1 'setup: list of builtins': 
+	git --list-cmds=builtins >builtins
 
-fatal: invalid reference: foo
-fatal: invalid reference: foo
-Switched to a new branch 'foo'
-branch 'foo' set up to track 'origin/foo'.
-Switched to branch 'main'
-ok 13 - guess and create branch
+ok 1 - setup: list of builtins
 
-expecting success of 2060.14 'not switching when something is in progress': 
-	test_when_finished rm -f .git/MERGE_HEAD &&
-	# fake a merge-in-progress
-	cp .git/HEAD .git/MERGE_HEAD &&
-	test_must_fail git switch -d @^
+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
+		BUG "please keep the list of txt and help mismatches sorted"
+	fi
 
-fatal: cannot switch branch while merging
-Consider "git merge --quit" or "git worktree add".
-ok 14 - not switching when something is in progress
+ok 2 - list of txt and help mismatches is sorted
 
-expecting success of 2060.15 'tracking info copied with autoSetupMerge=inherit': 
-	# default config does not copy tracking info
-	git switch -c foo-no-inherit foo &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
-	# with --track=inherit, we copy tracking info from foo
-	git switch --track=inherit -c foo2 foo &&
-	test_cmp_config origin branch.foo2.remote &&
-	test_cmp_config refs/heads/foo branch.foo2.merge &&
-	# with autoSetupMerge=inherit, we do the same
-	test_config branch.autoSetupMerge inherit &&
-	git switch -c foo3 foo &&
-	test_cmp_config origin branch.foo3.remote &&
-	test_cmp_config refs/heads/foo branch.foo3.merge &&
-	# with --track, we override autoSetupMerge
-	git switch --track -c foo4 foo &&
-	test_cmp_config . branch.foo4.remote &&
-	test_cmp_config refs/heads/foo branch.foo4.merge &&
-	# and --track=direct does as well
-	git switch --track=direct -c foo5 foo &&
-	test_cmp_config . branch.foo5.remote &&
-	test_cmp_config refs/heads/foo branch.foo5.merge &&
-	# no tracking info to inherit from main
-	git switch -c main2 main &&
-	test_cmp_config "" --default "" branch.main2.remote &&
-	test_cmp_config "" --default "" branch.main2.merge
+expecting success of 0450.3 'add -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 3 - add -h output has no \t
 
-Switched to a new branch 'foo-no-inherit'
-Switched to a new branch 'foo2'
-branch 'foo2' set up to track 'origin/foo'.
-Switched to a new branch 'foo3'
-branch 'foo3' set up to track 'origin/foo'.
-Switched to a new branch 'foo4'
-branch 'foo4' set up to track 'foo'.
-Switched to a new branch 'foo5'
-branch 'foo5' set up to track 'foo'.
-warning: asked to inherit tracking from 'main', but no remote is set
-Switched to a new branch 'main2'
-ok 15 - tracking info copied with autoSetupMerge=inherit
+expecting success of 0450.4 'add -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 4 - add -h output has dashed labels
 
-expecting success of 2060.16 'switch back when temporarily detached and checked out elsewhere ': 
-	test_when_finished "
-		git worktree remove wt1 ||:
-		git worktree remove wt2 ||:
-		git checkout - ||:
-		git branch -D shared ||:
-	" &&
-	git checkout -b shared &&
-	test_commit shared-first &&
-	HASH1=$(git rev-parse --verify HEAD) &&
-	test_commit shared-second &&
-	test_commit shared-third &&
-	HASH2=$(git rev-parse --verify HEAD) &&
-	git worktree add wt1 -f shared &&
-	git -C wt1 bisect start &&
-	git -C wt1 bisect good $HASH1 &&
-	git -C wt1 bisect bad $HASH2 &&
-	git worktree add wt2 -f shared &&
-	git -C wt2 bisect start &&
-	git -C wt2 bisect good $HASH1 &&
-	git -C wt2 bisect bad $HASH2 &&
-	# we test in both worktrees to ensure that works
-	# as expected with "first" and "next" worktrees
-	test_must_fail git -C wt1 switch shared &&
-	test_must_fail git -C wt1 switch -C shared &&
-	git -C wt1 switch --ignore-other-worktrees shared &&
-	test_must_fail git -C wt2 switch shared &&
-	test_must_fail git -C wt2 switch -C shared &&
-	git -C wt2 switch --ignore-other-worktrees shared
+expecting success of 0450.5 'add -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 5 - add -h output has consistent spacing
 
-Switched to a new branch 'shared'
-[shared 814c97a] shared-first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-first.t
-[shared 7162996] shared-second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-second.t
-[shared 90dda28] shared-third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-third.t
-Preparing worktree (checking out 'shared')
-HEAD is now at 90dda28 shared-third
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[716299614285626473e2ba3b8caf8b7633592842] shared-second
-Preparing worktree (checking out 'shared')
-HEAD is now at 90dda28 shared-third
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[716299614285626473e2ba3b8caf8b7633592842] shared-second
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-Previous HEAD position was 7162996 shared-second
-Switched to branch 'shared'
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-Previous HEAD position was 7162996 shared-second
-Switched to branch 'shared'
-Switched to branch 'main2'
-Deleted branch shared (was 90dda28).
-ok 16 - switch back when temporarily detached and checked out elsewhere 
+expecting success of 0450.6 'add *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 6 - add *.txt SYNOPSIS has dashed labels
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2024-checkout-dwim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/.git/
-expecting success of 2024.1 'setup': 
-	test_commit my_main &&
-	git init repo_a &&
-	(
-		cd repo_a &&
-		test_commit a_main &&
-		git checkout -b foo &&
-		test_commit a_foo &&
-		git checkout -b bar &&
-		test_commit a_bar &&
-		git checkout -b ambiguous_branch_and_file &&
-		test_commit a_ambiguous_branch_and_file
-	) &&
-	git init repo_b &&
-	(
-		cd repo_b &&
-		test_commit b_main &&
-		git checkout -b foo &&
-		test_commit b_foo &&
-		git checkout -b baz &&
-		test_commit b_baz &&
-		git checkout -b ambiguous_branch_and_file &&
-		test_commit b_ambiguous_branch_and_file
-	) &&
-	git remote add repo_a repo_a &&
-	git remote add repo_b repo_b &&
-	git config remote.repo_b.fetch \
-		"+refs/heads/*:refs/remotes/other_b/*" &&
-	git fetch --all
+checking known breakage of 0450.7 'add -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-[master (root-commit) 476f86c] my_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_main.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_a/.git/
-[master (root-commit) d6d6851] a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_main.t
-Switched to a new branch 'foo'
-[foo e2c25ec] a_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_foo.t
-Switched to a new branch 'bar'
-[bar bfd2f16] a_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_bar.t
-Switched to a new branch 'ambiguous_branch_and_file'
-[ambiguous_branch_and_file 225901c] a_ambiguous_branch_and_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_ambiguous_branch_and_file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_b/.git/
-[master (root-commit) 272258e] b_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_main.t
-Switched to a new branch 'foo'
-[foo 7eb022a] b_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_foo.t
-Switched to a new branch 'baz'
-[baz 8ac57c7] b_baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_baz.t
-Switched to a new branch 'ambiguous_branch_and_file'
-[ambiguous_branch_and_file 1b5c299] b_ambiguous_branch_and_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_ambiguous_branch_and_file.t
-Fetching repo_a
-From repo_a
- * [new branch]      ambiguous_branch_and_file   -> repo_a/ambiguous_branch_and_file
- * [new branch]      bar                         -> repo_a/bar
- * [new branch]      foo                         -> repo_a/foo
- * [new branch]      master                      -> repo_a/master
- * [new tag]         a_ambiguous_branch_and_file -> a_ambiguous_branch_and_file
- * [new tag]         a_bar                       -> a_bar
- * [new tag]         a_foo                       -> a_foo
- * [new tag]         a_main                      -> a_main
-Fetching repo_b
-From repo_b
- * [new branch]      ambiguous_branch_and_file   -> other_b/ambiguous_branch_and_file
- * [new branch]      baz                         -> other_b/baz
- * [new branch]      foo                         -> other_b/foo
- * [new branch]      master                      -> other_b/master
- * [new tag]         b_ambiguous_branch_and_file -> b_ambiguous_branch_and_file
- * [new tag]         b_baz                       -> b_baz
- * [new tag]         b_foo                       -> b_foo
- * [new tag]         b_main                      -> b_main
-ok 1 - setup
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:21.466677808 +0000
++++ help	2026-03-14 13:26:21.518677808 +0000
+@@ -1,5 +1 @@
+-git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
+-        [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]
+-        [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
+-        [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+-        [--] [<pathspec>...]
++git add [<options>] [--] <pathspec>...
+not ok 7 - add -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2024.2 'checkout of non-existing branch fails': 
-	git checkout -B main &&
-	test_might_fail git branch -D xyzzy &&
+expecting success of 0450.8 'am -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 8 - am -h output has no \t
 
-	test_must_fail git checkout xyzzy &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/xyzzy &&
-	test_branch main
+expecting success of 0450.9 'am -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 9 - am -h output has dashed labels
 
-Switched to a new branch 'main'
-error: branch 'xyzzy' not found
-error: pathspec 'xyzzy' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 2 - checkout of non-existing branch fails
+expecting success of 0450.10 'am -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 10 - am -h output has consistent spacing
 
-expecting success of 2024.3 'checkout of branch from multiple remotes fails #1': 
-	git checkout -B main &&
-	test_might_fail git branch -D foo &&
+expecting success of 0450.11 'am *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 11 - am *.txt SYNOPSIS has dashed labels
 
-	test_must_fail git checkout foo &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/foo &&
-	test_branch main
+checking known breakage of 0450.12 'am -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Reset branch 'main'
-error: branch 'foo' not found
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:
-hint:     git checkout --track origin/<name>
-hint:
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: 'foo' matched multiple (2) remote tracking branches
-fatal: Needed a single revision
-ok 3 - checkout of branch from multiple remotes fails #1
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:21.978677808 +0000
++++ help	2026-03-14 13:26:22.034677808 +0000
+@@ -1,10 +1,2 @@
+-git am [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
+-       [--[no-]3way] [--interactive] [--committer-date-is-author-date]
+-       [--ignore-date] [--ignore-space-change | --ignore-whitespace]
+-       [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
+-       [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
+-       [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
+-       [--quoted-cr=<action>]
+-       [--empty=(stop|drop|keep)]
+-       [(<mbox> | <Maildir>)...]
+-git am (--continue | --skip | --abort | --quit | --retry | --show-current-patch[=(diff|raw)] | --allow-empty)
++git am [<options>] [(<mbox> | <Maildir>)...]
++git am [<options>] (--continue | --skip | --abort)
+not ok 12 - am -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2024.4 'when arg matches multiple remotes, do not fallback to interpreting as pathspec': 
-	# create a file with name matching remote branch name
-	git checkout -b t_ambiguous_branch_and_file &&
-	>ambiguous_branch_and_file &&
-	git add ambiguous_branch_and_file &&
-	git commit -m "ambiguous_branch_and_file" &&
+expecting success of 0450.13 'annotate -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 13 - annotate -h output has no \t
 
-	# modify file to verify that it will not be touched by checkout
-	test_when_finished "git checkout -- ambiguous_branch_and_file" &&
-	echo "file contents" >ambiguous_branch_and_file &&
-	cp ambiguous_branch_and_file expect &&
+expecting success of 0450.14 'annotate -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 14 - annotate -h output has dashed labels
 
-	test_must_fail git checkout ambiguous_branch_and_file 2>err &&
+expecting success of 0450.15 'annotate -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 15 - annotate -h output has consistent spacing
 
-	test_grep "matched multiple (2) remote tracking branches" err &&
+expecting success of 0450.16 'annotate *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 16 - annotate *.txt SYNOPSIS has dashed labels
 
-	# file must not be altered
-	test_cmp expect ambiguous_branch_and_file
+expecting success of 0450.17 'annotate -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Switched to a new branch 't_ambiguous_branch_and_file'
-[t_ambiguous_branch_and_file 8830e76] ambiguous_branch_and_file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 ambiguous_branch_and_file
-fatal: 'ambiguous_branch_and_file' matched multiple (2) remote tracking branches
-ok 4 - when arg matches multiple remotes, do not fallback to interpreting as pathspec
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 17 - annotate -h output and SYNOPSIS agree
 
-expecting success of 2024.5 'checkout of branch from multiple remotes fails with advice': 
-	git checkout -B main &&
-	test_might_fail git branch -D foo &&
-	test_must_fail git checkout foo 2>stderr &&
-	test_branch main &&
-	status_uno_is_clean &&
-	test_grep "^hint: " stderr &&
-	test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
-		checkout foo 2>stderr &&
-	test_branch main &&
-	status_uno_is_clean &&
-	test_grep ! "^hint: " stderr
+expecting success of 0450.18 'apply -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 18 - apply -h output has no \t
 
-Switched to and reset branch 'main'
-error: branch 'foo' not found
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:     git checkout --track origin/<name>
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-ok 5 - checkout of branch from multiple remotes fails with advice
+expecting success of 0450.19 'apply -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 19 - apply -h output has dashed labels
 
-expecting success of 2024.6 'checkout -p with multiple remotes does not print advice': 
-	git checkout -B main &&
-	test_might_fail git branch -D foo &&
+expecting success of 0450.20 'apply -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 20 - apply -h output has consistent spacing
 
-	git checkout -p foo 2>stderr &&
-	test_grep ! "^hint: " stderr &&
-	status_uno_is_clean
+expecting success of 0450.21 'apply *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 21 - apply *.txt SYNOPSIS has dashed labels
 
-Reset branch 'main'
-error: branch 'foo' not found
-No changes.
-ok 6 - checkout -p with multiple remotes does not print advice
+checking known breakage of 0450.22 'apply -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2024.7 'checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D foo &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:22.974677808 +0000
++++ help	2026-03-14 13:26:23.018677808 +0000
+@@ -1,9 +1 @@
+-git apply [--stat] [--numstat] [--summary] [--check]
+-          [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
+-          [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
+-          [--allow-binary-replacement | --binary] [--reject] [-z]
+-          [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
+-          [--ignore-space-change | --ignore-whitespace]
+-          [--whitespace=(nowarn|warn|fix|error|error-all)]
+-          [--exclude=<path>] [--include=<path>] [--directory=<root>]
+-          [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
++git apply [<options>] [<patch>...]
+not ok 22 - apply -h output and SYNOPSIS agree # TODO known breakage
 
-	git -c checkout.defaultRemote=repo_a checkout foo &&
-	status_uno_is_clean &&
-	test_branch foo &&
-	test_cmp_rev remotes/repo_a/foo HEAD &&
-	test_branch_upstream foo repo_a foo
+expecting success of 0450.23 'archive -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 23 - archive -h output has no \t
 
-Reset branch 'main'
-error: branch 'foo' not found
-Switched to a new branch 'foo'
-branch 'foo' set up to track 'repo_a/foo'.
-ok 7 - checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1
+expecting success of 0450.24 'archive -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 24 - archive -h output has dashed labels
 
-expecting success of 2024.8 'checkout of branch from a single remote succeeds #1': 
-	git checkout -B main &&
-	test_might_fail git branch -D bar &&
+expecting success of 0450.25 'archive -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 25 - archive -h output has consistent spacing
 
-	git checkout bar &&
-	status_uno_is_clean &&
-	test_branch bar &&
-	test_cmp_rev remotes/repo_a/bar HEAD &&
-	test_branch_upstream bar repo_a bar
+expecting success of 0450.26 'archive *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 26 - archive *.txt SYNOPSIS has dashed labels
 
-Switched to and reset branch 'main'
-error: branch 'bar' not found
-Switched to a new branch 'bar'
-branch 'bar' set up to track 'repo_a/bar'.
-ok 8 - checkout of branch from a single remote succeeds #1
+checking known breakage of 0450.27 'archive -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2024.9 'checkout of branch from a single remote succeeds #2': 
-	git checkout -B main &&
-	test_might_fail git branch -D baz &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:23.474677808 +0000
++++ help	2026-03-14 13:26:23.526677808 +0000
+@@ -1,4 +1,4 @@
+-git archive [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
+-            [-o <file> | --output=<file>] [--worktree-attributes]
+-            [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
+-            [<path>...]
++git archive [<options>] <tree-ish> [<path>...]
++git archive --list
++git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]
++git archive --remote <repo> [--exec <cmd>] --list
+not ok 27 - archive -h output and SYNOPSIS agree # TODO known breakage
 
-	git checkout baz &&
-	status_uno_is_clean &&
-	test_branch baz &&
-	test_cmp_rev remotes/other_b/baz HEAD &&
-	test_branch_upstream baz repo_b baz
+expecting success of 0450.28 'bisect -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 28 - bisect -h output has no \t
 
-Switched to and reset branch 'main'
-error: branch 'baz' not found
-Switched to a new branch 'baz'
-branch 'baz' set up to track 'repo_b/baz'.
-ok 9 - checkout of branch from a single remote succeeds #2
+expecting success of 0450.29 'bisect -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 29 - bisect -h output has dashed labels
 
-expecting success of 2024.10 '--no-guess suppresses branch auto-vivification': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
+expecting success of 0450.30 'bisect -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 30 - bisect -h output has consistent spacing
 
-	test_must_fail git checkout --no-guess bar &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch main
+expecting success of 0450.31 'bisect *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 31 - bisect *.txt SYNOPSIS has dashed labels
 
-Switched to and reset branch 'main'
-Deleted branch bar (was bfd2f16).
-error: pathspec 'bar' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 10 - --no-guess suppresses branch auto-vivification
+checking known breakage of 0450.32 'bisect -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2024.11 'checkout.guess = false suppresses branch auto-vivification': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:23.982677808 +0000
++++ help	2026-03-14 13:26:24.046677808 +0000
+@@ -1 +1,10 @@
+-git bisect <subcommand> <options>
++git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
++git bisect (good|bad) [<rev>...]
++git bisect terms [--term-good | --term-bad]
++git bisect skip [(<rev>|<range>)...]
++git bisect next
++git bisect reset [<commit>]
++git bisect visualize
++git bisect replay <logfile>
++git bisect log
++git bisect run <cmd> [<arg>...]
+not ok 32 - bisect -h output and SYNOPSIS agree # TODO known breakage
 
-	test_config checkout.guess false &&
-	test_must_fail git checkout bar &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch main
+expecting success of 0450.33 'blame -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 33 - blame -h output has no \t
 
-Reset branch 'main'
-error: branch 'bar' not found
-error: pathspec 'bar' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 11 - checkout.guess = false suppresses branch auto-vivification
+expecting success of 0450.34 'blame -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 34 - blame -h output has dashed labels
 
-expecting success of 2024.12 'setup more remotes with unconventional refspecs': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	git init repo_c &&
-	(
-		cd repo_c &&
-		test_commit c_main &&
-		git checkout -b bar &&
-		test_commit c_bar &&
-		git checkout -b spam &&
-		test_commit c_spam
-	) &&
-	git init repo_d &&
-	(
-		cd repo_d &&
-		test_commit d_main &&
-		git checkout -b baz &&
-		test_commit d_baz &&
-		git checkout -b eggs &&
-		test_commit d_eggs
-	) &&
-	git remote add repo_c repo_c &&
-	git config remote.repo_c.fetch \
-		"+refs/heads/*:refs/remotes/extra_dir/repo_c/extra_dir/*" &&
-	git remote add repo_d repo_d &&
-	git config remote.repo_d.fetch \
-		"+refs/heads/*:refs/repo_d/*" &&
-	git fetch --all
+expecting success of 0450.35 'blame -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 35 - blame -h output has consistent spacing
 
-Reset branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_c/.git/
-[master (root-commit) cdfe1c8] c_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_main.t
-Switched to a new branch 'bar'
-[bar b017b41] c_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_bar.t
-Switched to a new branch 'spam'
-[spam 449823f] c_spam
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_spam.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_d/.git/
-[master (root-commit) b0e85f1] d_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_main.t
-Switched to a new branch 'baz'
-[baz b83c7c6] d_baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_baz.t
-Switched to a new branch 'eggs'
-[eggs e1ffd37] d_eggs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_eggs.t
-Fetching repo_a
-Fetching repo_b
-Fetching repo_c
-From repo_c
- * [new branch]      bar        -> extra_dir/repo_c/extra_dir/bar
- * [new branch]      master     -> extra_dir/repo_c/extra_dir/master
- * [new branch]      spam       -> extra_dir/repo_c/extra_dir/spam
- * [new tag]         c_bar      -> c_bar
- * [new tag]         c_main     -> c_main
- * [new tag]         c_spam     -> c_spam
-Fetching repo_d
-From repo_d
- * [new branch]      baz        -> refs/repo_d/baz
- * [new branch]      eggs       -> refs/repo_d/eggs
- * [new branch]      master     -> refs/repo_d/master
- * [new tag]         d_baz      -> d_baz
- * [new tag]         d_eggs     -> d_eggs
- * [new tag]         d_main     -> d_main
-ok 12 - setup more remotes with unconventional refspecs
+expecting success of 0450.36 'blame *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 36 - blame *.txt SYNOPSIS has dashed labels
 
-expecting success of 2024.13 'checkout of branch from multiple remotes fails #2': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
+checking known breakage of 0450.37 'blame -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	test_must_fail git checkout bar &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch main
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:24.526677808 +0000
++++ help	2026-03-14 13:26:24.574677808 +0000
+@@ -1,5 +1 @@
+-git blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
+-          [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
+-          [--ignore-rev <rev>] [--ignore-revs-file <file>]
+-          [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
+-          [ --contents <file> ] [<rev> | --reverse <rev>..<rev>] [--] <file>
++git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+not ok 37 - blame -h output and SYNOPSIS agree # TODO known breakage
 
-Reset branch 'main'
-error: branch 'bar' not found
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:
-hint:     git checkout --track origin/<name>
-hint:
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: 'bar' matched multiple (2) remote tracking branches
-fatal: Needed a single revision
-ok 13 - checkout of branch from multiple remotes fails #2
+expecting success of 0450.38 'branch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 38 - branch -h output has no \t
 
-expecting success of 2024.14 'checkout of branch from multiple remotes fails #3': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D baz &&
+expecting success of 0450.39 'branch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 39 - branch -h output has dashed labels
 
-	test_must_fail git checkout baz &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/baz &&
-	test_branch main
+expecting success of 0450.40 'branch -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 40 - branch -h output has consistent spacing
 
-Reset branch 'main'
-Deleted branch baz (was 8ac57c7).
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:
-hint:     git checkout --track origin/<name>
-hint:
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: 'baz' matched multiple (2) remote tracking branches
-fatal: Needed a single revision
-ok 14 - checkout of branch from multiple remotes fails #3
+expecting success of 0450.41 'branch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 41 - branch *.txt SYNOPSIS has dashed labels
 
-expecting success of 2024.15 'checkout of branch from a single remote succeeds #3': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+checking known breakage of 0450.42 'branch -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	git checkout spam &&
-	status_uno_is_clean &&
-	test_branch spam &&
-	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
-	test_branch_upstream spam repo_c spam
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:24.986677808 +0000
++++ help	2026-03-14 13:26:25.050677808 +0000
+@@ -1,16 +1,8 @@
+-git branch [--color[=<when>] | --no-color] [--show-current]
+-           [-v [--abbrev=<n> | --no-abbrev]]
+-           [--column[=<options>] | --no-column] [--sort=<key>]
+-           [--merged [<commit>]] [--no-merged [<commit>]]
+-           [--contains [<commit>]] [--no-contains [<commit>]]
+-           [--points-at <object>] [--format=<format>]
+-           [(-r | --remotes) | (-a | --all)]
+-           [--list] [<pattern>...]
+-git branch [--track[=(direct|inherit)] | --no-track] [-f]
+-           [--recurse-submodules] <branchname> [<start-point>]
+-git branch (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
+-git branch --unset-upstream [<branchname>]
+-git branch (-m | -M) [<oldbranch>] <newbranch>
+-git branch (-c | -C) [<oldbranch>] <newbranch>
+-git branch (-d | -D) [-r] <branchname>...
+-git branch --edit-description [<branchname>]
++git branch [<options>] [-r | -a] [--merged] [--no-merged]
++git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
++git branch [<options>] [-l] [<pattern>...]
++git branch [<options>] [-r] (-d | -D) <branch-name>...
++git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
++git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
++git branch [<options>] [-r | -a] [--points-at]
++git branch [<options>] [-r | -a] [--format]
+not ok 42 - branch -h output and SYNOPSIS agree # TODO known breakage
 
-Reset branch 'main'
-error: branch 'spam' not found
-Switched to a new branch 'spam'
-branch 'spam' set up to track 'repo_c/spam'.
-ok 15 - checkout of branch from a single remote succeeds #3
+expecting success of 0450.43 'bugreport -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 43 - bugreport -h output has no \t
 
-expecting success of 2024.16 'checkout of branch from a single remote succeeds #4': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D eggs &&
+expecting success of 0450.44 'bugreport -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 44 - bugreport -h output has dashed labels
 
-	git checkout eggs &&
-	status_uno_is_clean &&
-	test_branch eggs &&
-	test_cmp_rev refs/repo_d/eggs HEAD &&
-	test_branch_upstream eggs repo_d eggs
+expecting success of 0450.45 'bugreport -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 45 - bugreport -h output has consistent spacing
 
-Switched to and reset branch 'main'
-error: branch 'eggs' not found
-Switched to a new branch 'eggs'
-branch 'eggs' set up to track 'repo_d/eggs'.
-ok 16 - checkout of branch from a single remote succeeds #4
+expecting success of 0450.46 'bugreport *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 46 - bugreport *.txt SYNOPSIS has dashed labels
 
-expecting success of 2024.17 'checkout of branch with a file having the same name fails': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+expecting success of 0450.47 'bugreport -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	>spam &&
-	test_must_fail git checkout spam &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch main
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 47 - bugreport -h output and SYNOPSIS agree
 
-Switched to and reset branch 'main'
-Deleted branch spam (was 449823f).
-fatal: 'spam' could be both a local file and a tracking branch.
-Please use -- (and optionally --no-guess) to disambiguate
-fatal: Needed a single revision
-ok 17 - checkout of branch with a file having the same name fails
+expecting success of 0450.48 'bundle -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 48 - bundle -h output has no \t
 
-expecting success of 2024.18 'checkout of branch with a file in subdir having the same name fails': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+expecting success of 0450.49 'bundle -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 49 - bundle -h output has dashed labels
 
-	>spam &&
-	mkdir sub &&
-	mv spam sub/spam &&
-	test_must_fail git -C sub checkout spam &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch main
+expecting success of 0450.50 'bundle -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 50 - bundle -h output has consistent spacing
 
-Reset branch 'main'
-error: branch 'spam' not found
-fatal: 'spam' could be both a local file and a tracking branch.
-Please use -- (and optionally --no-guess) to disambiguate
-fatal: Needed a single revision
-ok 18 - checkout of branch with a file in subdir having the same name fails
+expecting success of 0450.51 'bundle *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 51 - bundle *.txt SYNOPSIS has dashed labels
 
-expecting success of 2024.19 'checkout <branch> -- succeeds, even if a file with the same name exists': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+expecting success of 0450.52 'bundle -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	>spam &&
-	git checkout spam -- &&
-	status_uno_is_clean &&
-	test_branch spam &&
-	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
-	test_branch_upstream spam repo_c spam
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 52 - bundle -h output and SYNOPSIS agree
 
-Reset branch 'main'
-error: branch 'spam' not found
-Switched to a new branch 'spam'
-branch 'spam' set up to track 'repo_c/spam'.
-ok 19 - checkout <branch> -- succeeds, even if a file with the same name exists
+expecting success of 0450.53 'cat-file -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 53 - cat-file -h output has no \t
 
-expecting success of 2024.20 'loosely defined local base branch is reported correctly': 
+expecting success of 0450.54 'cat-file -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 54 - cat-file -h output has dashed labels
 
-	git checkout main &&
-	status_uno_is_clean &&
-	git branch strict &&
-	git branch loose &&
-	git commit --allow-empty -m "a bit more" &&
+expecting success of 0450.55 'cat-file -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 55 - cat-file -h output has consistent spacing
 
-	test_config branch.strict.remote . &&
-	test_config branch.loose.remote . &&
-	test_config branch.strict.merge refs/heads/main &&
-	test_config branch.loose.merge main &&
+expecting success of 0450.56 'cat-file *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 56 - cat-file *.txt SYNOPSIS has dashed labels
 
-	git checkout strict >expect.raw 2>&1 &&
-	sed -e "s/strict/BRANCHNAME/g" <expect.raw >expect &&
-	status_uno_is_clean &&
-	git checkout loose >actual.raw 2>&1 &&
-	sed -e "s/loose/BRANCHNAME/g" <actual.raw >actual &&
-	status_uno_is_clean &&
-	grep BRANCHNAME actual &&
+expecting success of 0450.57 'cat-file -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	test_cmp expect actual
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 57 - cat-file -h output and SYNOPSIS agree
 
-Switched to branch 'main'
-[main 0b0f2ce] a bit more
- Author: A U Thor <author@example.com>
-Switched to branch 'BRANCHNAME'
-ok 20 - loosely defined local base branch is reported correctly
+expecting success of 0450.58 'check-attr -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 58 - check-attr -h output has no \t
 
-expecting success of 2024.21 'reject when arg could be part of dwim branch': 
-	git remote add foo file://non-existent-place &&
-	git update-ref refs/remotes/foo/dwim-arg HEAD &&
-	echo foo >dwim-arg &&
-	git add dwim-arg &&
-	echo bar >dwim-arg &&
-	test_must_fail git checkout dwim-arg &&
-	test_must_fail git rev-parse refs/heads/dwim-arg -- &&
-	grep bar dwim-arg
+expecting success of 0450.59 'check-attr -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 59 - check-attr -h output has dashed labels
 
-fatal: 'dwim-arg' could be both a local file and a tracking branch.
-Please use -- (and optionally --no-guess) to disambiguate
-fatal: bad revision 'refs/heads/dwim-arg'
-bar
-ok 21 - reject when arg could be part of dwim branch
+expecting success of 0450.60 'check-attr -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 60 - check-attr -h output has consistent spacing
 
-expecting success of 2024.22 'disambiguate dwim branch and checkout path (1)': 
-	git update-ref refs/remotes/foo/dwim-arg1 HEAD &&
-	echo foo >dwim-arg1 &&
-	git add dwim-arg1 &&
-	echo bar >dwim-arg1 &&
-	git checkout -- dwim-arg1 &&
-	test_must_fail git rev-parse refs/heads/dwim-arg1 -- &&
-	grep foo dwim-arg1
+expecting success of 0450.61 'check-attr *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 61 - check-attr *.txt SYNOPSIS has dashed labels
 
-fatal: bad revision 'refs/heads/dwim-arg1'
-foo
-ok 22 - disambiguate dwim branch and checkout path (1)
+expecting success of 0450.62 'check-attr -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2024.23 'disambiguate dwim branch and checkout path (2)': 
-	git update-ref refs/remotes/foo/dwim-arg2 HEAD &&
-	echo foo >dwim-arg2 &&
-	git add dwim-arg2 &&
-	echo bar >dwim-arg2 &&
-	git checkout dwim-arg2 -- &&
-	git rev-parse refs/heads/dwim-arg2 -- &&
-	grep bar dwim-arg2
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 62 - check-attr -h output and SYNOPSIS agree
 
-Switched to a new branch 'dwim-arg2'
-A	dwim-arg
-A	dwim-arg1
-A	dwim-arg2
-branch 'dwim-arg2' set up to track 'foo/dwim-arg2'.
-e1ffd376e093970186efb2074ec16dcb57d23789
---
-bar
-ok 23 - disambiguate dwim branch and checkout path (2)
+expecting success of 0450.63 'check-ignore -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 63 - check-ignore -h output has no \t
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2071-restore-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2071-restore-patch/.git/
-expecting success of 2071.1 'setup': 
-	mkdir dir &&
-	echo parent >dir/foo &&
-	echo dummy >bar &&
-	git add bar dir/foo &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
+expecting success of 0450.64 'check-ignore -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 64 - check-ignore -h output has dashed labels
 
-[master (root-commit) 758b165] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 dir/foo
-[master 3319288] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+expecting success of 0450.65 'check-ignore -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 65 - check-ignore -h output has consistent spacing
 
-expecting success of 2071.2 'restore -p without pathspec is fine': 
-	echo q >cmd &&
-	git restore -p <cmd
+expecting success of 0450.66 'check-ignore *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 66 - check-ignore *.txt SYNOPSIS has dashed labels
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 2 - restore -p without pathspec is fine
+expecting success of 0450.67 'check-ignore -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2071.3 'saying "n" does nothing': 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n n | git restore -p &&
-	verify_saved_state bar &&
-	verify_saved_state dir/foo
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 67 - check-ignore -h output and SYNOPSIS agree
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 3 - saying "n" does nothing
+expecting success of 0450.68 'check-mailmap -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 68 - check-mailmap -h output has no \t
 
-expecting success of 2071.4 'git restore -p': 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n y | git restore -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 0450.69 'check-mailmap -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 69 - check-mailmap -h output has dashed labels
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 4 - git restore -p
+expecting success of 0450.70 'check-mailmap -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 70 - check-mailmap -h output has consistent spacing
 
-expecting success of 2071.5 'git restore -p with staged changes': 
-	set_state dir/foo work index &&
-	test_write_lines n y | git restore -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
+expecting success of 0450.71 'check-mailmap *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 71 - check-mailmap *.txt SYNOPSIS has dashed labels
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 9015a7a..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--index
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 5 - git restore -p with staged changes
+expecting success of 0450.72 'check-mailmap -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2071.6 'git restore -p --source=HEAD': 
-		set_state dir/foo work index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git restore -p --source=$opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head index &&
-		test_grep "Discard" output
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 6 - git restore -p --source=HEAD
+ok 72 - check-mailmap -h output and SYNOPSIS agree
 
-expecting success of 2071.7 'git restore -p --source=@': 
-		set_state dir/foo work index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git restore -p --source=$opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head index &&
-		test_grep "Discard" output
+expecting success of 0450.73 'check-ref-format -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 7 - git restore -p --source=@
+ok 73 - check-ref-format -h output has no \t
 
-expecting success of 2071.8 'git restore -p --source=HEAD^': 
-	set_state dir/foo work index &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git restore -p --source=HEAD^ &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent index
+expecting success of 0450.74 'check-ref-format -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 74 - check-ref-format -h output has dashed labels
 
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-diff --git b/dir/foo a/dir/foo
-index b8f99f5..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--work
-+parent
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-ok 8 - git restore -p --source=HEAD^
+expecting success of 0450.75 'check-ref-format -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 75 - check-ref-format -h output has consistent spacing
 
-expecting success of 2071.9 'git restore -p --source=HEAD^...': 
-	set_state dir/foo work index &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git restore -p --source=HEAD^... &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent index
+expecting success of 0450.76 'check-ref-format *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 76 - check-ref-format *.txt SYNOPSIS has dashed labels
 
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-diff --git b/dir/foo a/dir/foo
-index b8f99f5..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--work
-+parent
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-ok 9 - git restore -p --source=HEAD^...
+checking known breakage of 0450.77 'check-ref-format -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2071.10 'git restore -p handles deletion': 
-	set_state dir/foo work index &&
-	rm dir/foo &&
-	test_write_lines n y | git restore -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:28.890677808 +0000
++++ help	2026-03-14 13:26:28.962677808 +0000
+@@ -1,4 +1,2 @@
+-git check-ref-format [--normalize]
+-                     [--[no-]allow-onelevel] [--refspec-pattern]
+-                     <refname>
++git check-ref-format [--normalize] [<options>] <refname>
+ git check-ref-format --branch <branchname-shorthand>
+not ok 77 - check-ref-format -h output and SYNOPSIS agree # TODO known breakage
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-deleted file mode 100644
-index 9015a7a..0000000
---- a/dir/foo
-+++ /dev/null
-@@ -1 +0,0 @@
--index
-(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
-ok 10 - git restore -p handles deletion
+expecting success of 0450.78 'checkout -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 78 - checkout -h output has no \t
 
-expecting success of 2071.11 'path limiting works: dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git restore -p dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 0450.79 'checkout -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 79 - checkout -h output has dashed labels
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 11 - path limiting works: dir
+expecting success of 0450.80 'checkout -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 80 - checkout -h output has consistent spacing
 
-expecting success of 2071.12 'path limiting works: -- dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git restore -p -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 0450.81 'checkout *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 81 - checkout *.txt SYNOPSIS has dashed labels
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 12 - path limiting works: -- dir
+checking known breakage of 0450.82 'checkout -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2071.13 'path limiting works: HEAD^ -- dir': 
-	set_state dir/foo work head &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent head
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:29.414677808 +0000
++++ help	2026-03-14 13:26:29.478677808 +0000
+@@ -1,9 +1,2 @@
+-git checkout [-q] [-f] [-m] [<branch>]
+-git checkout [-q] [-f] [-m] --detach [<branch>]
+-git checkout [-q] [-f] [-m] [--detach] <commit>
+-git checkout [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
+-git checkout [-f] <tree-ish> [--] <pathspec>...
+-git checkout [-f] <tree-ish> --pathspec-from-file=<file> [--pathspec-file-nul]
+-git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [--] <pathspec>...
+-git checkout [-f|--ours|--theirs|-m|--conflict=<style>] --pathspec-from-file=<file> [--pathspec-file-nul]
+-git checkout (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
++git checkout [<options>] <branch>
++git checkout [<options>] [<branch>] -- <file>...
+not ok 82 - checkout -h output and SYNOPSIS agree # TODO known breakage
 
-diff --git b/dir/foo a/dir/foo
-index b8f99f5..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--work
-+parent
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-ok 13 - path limiting works: HEAD^ -- dir
+expecting success of 0450.83 'checkout--worker -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 83 - checkout--worker -h output has no \t
 
-expecting success of 2071.14 'path limiting works: foo inside dir': 
-	set_state dir/foo work head &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | (cd dir && git restore -p foo) &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 0450.84 'checkout--worker -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 84 - checkout--worker -h output has dashed labels
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 14 - path limiting works: foo inside dir
+expecting success of 0450.85 'checkout--worker -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 85 - checkout--worker -h output has consistent spacing
 
-expecting success of 2071.15 'none of this moved HEAD': 
-	verify_saved_head
+ok 86 # skip checkout--worker *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_CHECKOUT__WORKER)
 
-ok 15 - none of this moved HEAD
+ok 87 # skip checkout--worker -h output and SYNOPSIS agree (missing BUILTIN_TXT_CHECKOUT__WORKER)
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2081-parallel-checkout-collisions.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2081-parallel-checkout-collisions/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
+expecting success of 0450.88 'checkout-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 88 - checkout-index -h output has no \t
 
-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 0450.89 'checkout-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 89 - checkout-index -h output has dashed labels
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 1 # skip setup (missing CASE_INSENSITIVE_FS)
+expecting success of 0450.90 'checkout-index -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 90 - checkout-index -h output has consistent spacing
 
-ok 2 # skip worker detects basename collision (missing CASE_INSENSITIVE_FS)
+expecting success of 0450.91 'checkout-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 91 - checkout-index *.txt SYNOPSIS has dashed labels
 
-ok 3 # skip worker detects dirname collision (missing CASE_INSENSITIVE_FS)
+checking known breakage of 0450.92 'checkout-index -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-checking prerequisite: SYMLINKS
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:30.398677808 +0000
++++ help	2026-03-14 13:26:30.454677808 +0000
+@@ -1,6 +1 @@
+-git checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
+-                   [--stage=<number>|all]
+-                   [--temp]
+-                   [--ignore-skip-worktree-bits]
+-                   [-z] [--stdin]
+-                   [--] [<file>...]
++git checkout-index [<options>] [--] [<file>...]
+not ok 92 - checkout-index -h output and SYNOPSIS agree # TODO known breakage
 
-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 0450.93 'cherry -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 93 - cherry -h output has no \t
 
-)
-prerequisite SYMLINKS ok
-ok 4 # skip do not follow symlinks colliding with leading dir (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+expecting success of 0450.94 'cherry -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 94 - cherry -h output has dashed labels
 
-ok 5 # skip collision report on clone (w/ racy file creation) (missing CASE_INSENSITIVE_FS)
+expecting success of 0450.95 'cherry -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 95 - cherry -h output has consistent spacing
 
-ok 6 # skip collision report on clone (w/ colliding peer after the detected entry) (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,!MINGW,!CYGWIN)
+expecting success of 0450.96 'cherry *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 96 - cherry *.txt SYNOPSIS has dashed labels
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2100-update-cache-badpath.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2100-update-cache-badpath/.git/
-checking prerequisite: SYMLINKS
+expecting success of 0450.97 'cherry -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-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
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 97 - cherry -h output and SYNOPSIS agree
 
-)
-prerequisite SYMLINKS ok
-expecting success of 2100.1 'git update-index --add to add various paths.': git update-index --add -- path0 path1 path2/file2 path3/file3
-ok 1 - git update-index --add to add various paths.
+expecting success of 0450.98 'cherry-pick -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 98 - cherry-pick -h output has no \t
 
-expecting success of 2100.2 'git update-index to add conflicting path path0/file0 should fail.': test_must_fail git update-index --add -- path0/file0
-error: 'path0/file0' appears as both a file and as a directory
-error: path0/file0: cannot add to the index - missing --add option?
-fatal: Unable to process path path0/file0
-ok 2 - git update-index to add conflicting path path0/file0 should fail.
+expecting success of 0450.99 'cherry-pick -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 99 - cherry-pick -h output has dashed labels
 
-expecting success of 2100.3 'git update-index to add conflicting path path1/file1 should fail.': test_must_fail git update-index --add -- path1/file1
-error: 'path1/file1' appears as both a file and as a directory
-error: path1/file1: cannot add to the index - missing --add option?
-fatal: Unable to process path path1/file1
-ok 3 - git update-index to add conflicting path path1/file1 should fail.
+expecting success of 0450.100 'cherry-pick -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 100 - cherry-pick -h output has consistent spacing
 
-expecting success of 2100.4 'git update-index to add conflicting path path2 should fail.': test_must_fail git update-index --add -- path2
-error: 'path2' appears as both a file and as a directory
-error: path2: cannot add to the index - missing --add option?
-fatal: Unable to process path path2
-ok 4 - git update-index to add conflicting path path2 should fail.
+expecting success of 0450.101 'cherry-pick *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 101 - cherry-pick *.txt SYNOPSIS has dashed labels
 
-expecting success of 2100.5 'git update-index to add conflicting path path3 should fail.': test_must_fail git update-index --add -- path3
-error: 'path3' appears as both a file and as a directory
-error: path3: cannot add to the index - missing --add option?
-fatal: Unable to process path path3
-ok 5 - git update-index to add conflicting path path3 should fail.
+expecting success of 0450.102 'cherry-pick -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2102-update-index-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 102 - cherry-pick -h output and SYNOPSIS agree
 
-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 0450.103 'clean -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 103 - clean -h output has no \t
 
-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
+expecting success of 0450.104 'clean -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 104 - clean -h output has dashed labels
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2101-update-index-reupdate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 0450.105 'clean -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 105 - clean -h output has consistent spacing
 
-ok 1 - update-index --add
+expecting success of 0450.106 'clean *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 106 - clean *.txt SYNOPSIS has dashed labels
 
-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
+expecting success of 0450.107 'clean -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-error: file1: does not exist and --remove not passed
-fatal: Unable to process path file1
-happy - failed as expected
-ok 2 - update-index --again
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 107 - clean -h output and SYNOPSIS agree
 
-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
+expecting success of 0450.108 'clone -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 108 - clone -h output has no \t
 
-ok 3 - update-index --remove --again
+expecting success of 0450.109 'clone -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 109 - clone -h output has dashed labels
 
-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 0450.110 'clone -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 110 - clone -h output has consistent spacing
 
-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
+expecting success of 0450.111 'clone *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 111 - clone *.txt SYNOPSIS has dashed labels
 
-ok 5 - update-index again
+checking known breakage of 0450.112 'clone -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 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
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:32.706677808 +0000
++++ help	2026-03-14 13:26:32.750677808 +0000
+@@ -1,9 +1 @@
+-git clone [--template=<template-directory>]
+-          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
+-          [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
+-          [--dissociate] [--separate-git-dir <git-dir>]
+-          [--depth <depth>] [--[no-]single-branch] [--no-tags]
+-          [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
+-          [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
+-          [--filter=<filter-spec>] [--also-filter-submodules]] [--] <repository>
+-          [<directory>]
++git clone [<options>] [--] <repo> [<dir>]
+not ok 112 - clone -h output and SYNOPSIS agree # TODO known breakage
 
-ok 6 - update-index --update from subdir
+expecting success of 0450.113 'column -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 113 - column -h output has no \t
 
-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
+expecting success of 0450.114 'column -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 114 - column -h output has dashed labels
 
-ok 7 - update-index --update with pathspec
+expecting success of 0450.115 'column -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 115 - column -h output has consistent spacing
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2105-update-index-gitfile.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+expecting success of 0450.116 'column *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 116 - column *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+checking known breakage of 0450.117 'column -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2105.2 'add gitlink to absolute .git file': 
-	git update-index --add -- sub1
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:33.282677808 +0000
++++ help	2026-03-14 13:26:33.342677808 +0000
+@@ -1,2 +1 @@
+-git column [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
+-           [--indent=<string>] [--nl=<string>] [--padding=<n>]
++git column [<options>]
+not ok 117 - column -h output and SYNOPSIS agree # TODO known breakage
 
-ok 2 - add gitlink to absolute .git file
+expecting success of 0450.118 'commit -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 118 - commit -h output has no \t
 
-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)
+expecting success of 0450.119 'commit -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 119 - commit -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 0450.120 'commit -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 120 - commit -h output has consistent spacing
 
-expecting success of 2105.4 'add gitlink to relative .git file': 
-	git update-index --add -- sub2
+expecting success of 0450.121 'commit *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 121 - commit *.txt SYNOPSIS has dashed labels
 
-ok 4 - add gitlink to relative .git file
+expecting success of 0450.122 'commit -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2030-unresolve-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2030-unresolve-info/.git/
-expecting success of 2030.1 'setup': 
-	mkdir fi &&
-	printf "a\0a" >binary &&
-	git add binary &&
-	test_commit initial fi/le first &&
-	git branch side &&
-	git branch another &&
-	printf "a\0b" >binary &&
-	git add binary &&
-	test_commit second fi/le second &&
-	git checkout side &&
-	test_commit third fi/le third &&
-	git branch add-add &&
-	git checkout another &&
-	test_commit fourth fi/le fourth &&
-	git checkout add-add &&
-	test_commit fifth add-differently &&
-	git checkout main
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 122 - commit -h output and SYNOPSIS agree
 
-[main (root-commit) 7b271e3] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 binary
- create mode 100644 fi/le
-[main 9a00f99] second
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'side'
-[side b18340d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'another'
-[another cf4d985] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'add-add'
-[add-add b851e77] fifth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-differently
-Switched to branch 'main'
-ok 1 - setup
+expecting success of 0450.123 'commit-graph -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 123 - commit-graph -h output has no \t
 
-expecting success of 2030.2 'add records switch clears': 
-	prime_resolve_undo &&
-	test_tick &&
-	git commit -m merged &&
-	echo committing keeps &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-	git checkout second^0 &&
-	echo switching clears &&
-	check_resolve_undo cleared
+expecting success of 0450.124 'commit-graph -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 124 - commit-graph -h output has dashed labels
 
-HEAD is now at 9a00f99 second
-Note: switching to 'second^0'.
+expecting success of 0450.125 'commit-graph -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 125 - commit-graph -h output has consistent spacing
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 0450.126 'commit-graph *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 126 - commit-graph *.txt SYNOPSIS has dashed labels
 
-If you want to 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 0450.127 'commit-graph -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-  git switch -c <new-branch-name>
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 127 - commit-graph -h output and SYNOPSIS agree
 
-Or undo this operation with:
+expecting success of 0450.128 'commit-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 128 - commit-tree -h output has no \t
 
-  git switch -
+expecting success of 0450.129 'commit-tree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 129 - commit-tree -h output has dashed labels
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 0450.130 'commit-tree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 130 - commit-tree -h output has consistent spacing
 
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD b3a51df] merged
- Author: A U Thor <author@example.com>
-committing keeps
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 0450.131 'commit-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 131 - commit-tree *.txt SYNOPSIS has dashed labels
 
-  b3a51df merged
+expecting success of 0450.132 'commit-tree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 132 - commit-tree -h output and SYNOPSIS agree
 
- git branch <new-branch-name> b3a51df
+expecting success of 0450.133 'config -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 133 - config -h output has no \t
 
-HEAD is now at 9a00f99 second
-switching clears
-ok 2 - add records switch clears
+expecting success of 0450.134 'config -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 134 - config -h output has dashed labels
 
-expecting success of 2030.3 'rm records reset clears': 
-	prime_resolve_undo &&
-	test_tick &&
-	git commit -m merged &&
-	echo committing keeps &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+expecting success of 0450.135 'config -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 135 - config -h output has consistent spacing
 
-	echo merge clears upfront &&
-	test_must_fail git merge fourth^0 &&
-	check_resolve_undo nuked &&
+expecting success of 0450.136 'config *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 136 - config *.txt SYNOPSIS has dashed labels
 
-	git rm -f fi/le &&
-	echo resolving records &&
-	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
+expecting success of 0450.137 'config -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	git reset --hard &&
-	echo resetting discards &&
-	check_resolve_undo discarded
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 137 - config -h output and SYNOPSIS agree
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 70d285e] merged
- Author: A U Thor <author@example.com>
-committing keeps
-merge clears upfront
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'fi/le'
-resolving records
-HEAD is now at 70d285e merged
-resetting discards
-ok 3 - rm records reset clears
+expecting success of 0450.138 'count-objects -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 138 - count-objects -h output has no \t
 
-expecting success of 2030.4 'plumbing clears': 
-	prime_resolve_undo &&
-	test_tick &&
-	git commit -m merged &&
-	echo committing keeps &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+expecting success of 0450.139 'count-objects -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 139 - count-objects -h output has dashed labels
 
-	echo plumbing clear &&
-	git update-index --clear-resolve-undo &&
-	check_resolve_undo cleared
+expecting success of 0450.140 'count-objects -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 140 - count-objects -h output has consistent spacing
 
-HEAD is now at 70d285e merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 0450.141 'count-objects *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 141 - count-objects *.txt SYNOPSIS has dashed labels
 
-  70d285e merged
+expecting success of 0450.142 'count-objects -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 142 - count-objects -h output and SYNOPSIS agree
 
- git branch <new-branch-name> 70d285e
+expecting success of 0450.143 'credential -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 143 - credential -h output has no \t
 
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 894de51] merged
- Author: A U Thor <author@example.com>
-committing keeps
-plumbing clear
-ok 4 - plumbing clears
+expecting success of 0450.144 'credential -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 144 - credential -h output has dashed labels
 
-expecting success of 2030.5 'add records checkout -m undoes': 
-	prime_resolve_undo &&
-	git diff HEAD &&
-	git checkout --conflict=merge fi/le &&
-	echo checkout used the record and removed it &&
-	check_resolve_undo removed &&
-	echo the index and the work tree is unmerged again &&
-	git diff >actual &&
-	grep "^++<<<<<<<" actual
+expecting success of 0450.145 'credential -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 145 - credential -h output has consistent spacing
 
-HEAD is now at 894de51 merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 0450.146 'credential *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 146 - credential *.txt SYNOPSIS has dashed labels
 
-  894de51 merged
+checking known breakage of 0450.147 'credential -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:36.602677808 +0000
++++ help	2026-03-14 13:26:36.734677808 +0000
+@@ -0,0 +1 @@
++git credential (fill|approve|reject)
+not ok 147 - credential -h output and SYNOPSIS agree # TODO known breakage
 
- git branch <new-branch-name> 894de51
+expecting success of 0450.148 'credential-cache -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 148 - credential-cache -h output has no \t
 
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-diff --git a/fi/le b/fi/le
-index e019be0..8dca2f8 100644
---- a/fi/le
-+++ b/fi/le
-@@ -1 +1 @@
--second
-+different
-Recreated 1 merge conflict
-checkout used the record and removed it
-the index and the work tree is unmerged again
-++<<<<<<< ours
-ok 5 - add records checkout -m undoes
+expecting success of 0450.149 'credential-cache -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 149 - credential-cache -h output has dashed labels
 
-expecting success of 2030.6 'unmerge with plumbing': 
-	prime_resolve_undo &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
+expecting success of 0450.150 'credential-cache -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 150 - credential-cache -h output has consistent spacing
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - unmerge with plumbing
+expecting success of 0450.151 'credential-cache *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 151 - credential-cache *.txt SYNOPSIS has dashed labels
 
-expecting success of 2030.7 'unmerge can be done even after committing': 
-	prime_resolve_undo &&
-	git commit -m "record to nuke MERGE_HEAD" &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
+checking known breakage of 0450.152 'credential-cache -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 739b00c] record to nuke MERGE_HEAD
- Author: A U Thor <author@example.com>
-ok 7 - unmerge can be done even after committing
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:37.150677808 +0000
++++ help	2026-03-14 13:26:37.250677808 +0000
+@@ -0,0 +1 @@
++git credential-cache [<options>] <action>
+not ok 152 - credential-cache -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2030.8 'unmerge removal': 
-	prime_resolve_undo remove &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
+expecting success of 0450.153 'credential-cache--daemon -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 153 - credential-cache--daemon -h output has no \t
 
-HEAD is now at 739b00c record to nuke MERGE_HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 0450.154 'credential-cache--daemon -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 154 - credential-cache--daemon -h output has dashed labels
 
-  739b00c record to nuke MERGE_HEAD
+expecting success of 0450.155 'credential-cache--daemon -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 155 - credential-cache--daemon -h output has consistent spacing
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 0450.156 'credential-cache--daemon *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 156 - credential-cache--daemon *.txt SYNOPSIS has dashed labels
 
- git branch <new-branch-name> 739b00c
+expecting success of 0450.157 'credential-cache--daemon -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'fi/le'
-ok 8 - unmerge removal
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 157 - credential-cache--daemon -h output and SYNOPSIS agree
 
-expecting success of 2030.9 'unmerge removal after committing': 
-	prime_resolve_undo remove &&
-	git commit -m "record to nuke MERGE_HEAD" &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
+expecting success of 0450.158 'credential-store -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 158 - credential-store -h output has no \t
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'fi/le'
-[detached HEAD 76cfeff] record to nuke MERGE_HEAD
- Author: A U Thor <author@example.com>
-ok 9 - unmerge removal after committing
+expecting success of 0450.159 'credential-store -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 159 - credential-store -h output has dashed labels
 
-expecting success of 2030.10 'rerere and rerere forget': 
-	mkdir .git/rr-cache &&
-	prime_resolve_undo &&
-	echo record the resolution &&
-	git rerere &&
-	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
-	rerere_id=${rerere_id%/postimage} &&
-	test -f .git/rr-cache/$rerere_id/postimage &&
-	git checkout -m fi/le &&
-	echo resurrect the conflict &&
-	grep "^=======" fi/le &&
-	echo reresolve the conflict &&
-	git rerere &&
-	test "z$(cat fi/le)" = zdifferent &&
-	echo register the resolution again &&
-	git add fi/le &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-	test -z "$(git ls-files -u)" &&
-	git rerere forget fi/le &&
-	! test -f .git/rr-cache/$rerere_id/postimage &&
-	tr "\0" "\n" <.git/MERGE_RR >actual &&
-	echo "$rerere_id	fi/le" >expect &&
-	test_cmp expect actual
+expecting success of 0450.160 'credential-store -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 160 - credential-store -h output has consistent spacing
 
-HEAD is now at 76cfeff record to nuke MERGE_HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 0450.161 'credential-store *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 161 - credential-store *.txt SYNOPSIS has dashed labels
 
-  76cfeff record to nuke MERGE_HEAD
+checking known breakage of 0450.162 'credential-store -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:38.230677808 +0000
++++ help	2026-03-14 13:26:38.370677808 +0000
+@@ -0,0 +1 @@
++git credential-store [<options>] <action>
+not ok 162 - credential-store -h output and SYNOPSIS agree # TODO known breakage
 
- git branch <new-branch-name> 76cfeff
+expecting success of 0450.163 'describe -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 163 - describe -h output has no \t
 
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-record the resolution
-Recorded resolution for 'fi/le'.
-Recreated 1 merge conflict
-resurrect the conflict
-=======
-reresolve the conflict
-Resolved 'fi/le' using previous resolution.
-register the resolution again
-Updated preimage for 'fi/le'
-Forgot resolution for 'fi/le'
-ok 10 - rerere and rerere forget
+expecting success of 0450.164 'describe -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 164 - describe -h output has dashed labels
 
-expecting success of 2030.11 'rerere and rerere forget (subdirectory)': 
-	rm -fr .git/rr-cache &&
-	mkdir .git/rr-cache &&
-	prime_resolve_undo &&
-	echo record the resolution &&
-	(cd fi && git rerere) &&
-	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
-	rerere_id=${rerere_id%/postimage} &&
-	test -f .git/rr-cache/$rerere_id/postimage &&
-	(cd fi && git checkout -m le) &&
-	echo resurrect the conflict &&
-	grep "^=======" fi/le &&
-	echo reresolve the conflict &&
-	(cd fi && git rerere) &&
-	test "z$(cat fi/le)" = zdifferent &&
-	echo register the resolution again &&
-	(cd fi && git add le) &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-	test -z "$(git ls-files -u)" &&
-	(cd fi && git rerere forget le) &&
-	! test -f .git/rr-cache/$rerere_id/postimage &&
-	tr "\0" "\n" <.git/MERGE_RR >actual &&
-	echo "$rerere_id	fi/le" >expect &&
-	test_cmp expect actual
+expecting success of 0450.165 'describe -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 165 - describe -h output has consistent spacing
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-record the resolution
-Recorded resolution for 'fi/le'.
-Recreated 1 merge conflict
-resurrect the conflict
-=======
-reresolve the conflict
-Resolved 'fi/le' using previous resolution.
-register the resolution again
-Updated preimage for 'fi/le'
-Forgot resolution for 'fi/le'
-ok 11 - rerere and rerere forget (subdirectory)
+expecting success of 0450.166 'describe *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 166 - describe *.txt SYNOPSIS has dashed labels
 
-expecting success of 2030.12 'rerere forget (binary)': 
-	git checkout -f side &&
-	test_commit --printf binary binary "a\0c" &&
-	test_must_fail git merge second &&
-	git rerere forget binary
+expecting success of 0450.167 'describe -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Previous HEAD position was 9a00f99 second
-Switched to branch 'side'
-[side ebd12fa] binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-warning: Cannot merge binary files: binary (HEAD vs. second)
-Auto-merging binary
-CONFLICT (content): Merge conflict in binary
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-error: could not parse conflict hunks in 'binary'
-ok 12 - rerere forget (binary)
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 167 - describe -h output and SYNOPSIS agree
 
-expecting success of 2030.13 'rerere forget (add-add conflict)': 
-	git checkout -f main &&
-	echo main >add-differently &&
-	git add add-differently &&
-	git commit -m "add differently" &&
-	test_must_fail git merge fifth &&
-	git rerere forget add-differently 2>actual &&
-	test_grep "no remembered" actual
+expecting success of 0450.168 'diagnose -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 168 - diagnose -h output has no \t
 
-Switched to branch 'main'
-[main d92f3b1] add differently
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-differently
-Auto-merging add-differently
-CONFLICT (add/add): Merge conflict in add-differently
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'add-differently'
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-error: no remembered resolution for 'add-differently'
-ok 13 - rerere forget (add-add conflict)
+expecting success of 0450.169 'diagnose -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 169 - diagnose -h output has dashed labels
 
-expecting success of 2030.14 'resolve-undo keeps blobs from gc': 
-	git checkout -f main &&
+expecting success of 0450.170 'diagnose -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 170 - diagnose -h output has consistent spacing
 
-	# First make sure we do not have any cruft left in the object store
-	git repack -a -d &&
-	git prune --expire=now &&
-	git prune-packed &&
-	git gc --prune=now &&
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
+expecting success of 0450.171 'diagnose *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 171 - diagnose *.txt SYNOPSIS has dashed labels
 
-	# Now add three otherwise unreferenced blob objects to the index
-	git reset --hard &&
-	B1=$(echo "resolve undo test data 1" | git hash-object -w --stdin) &&
-	B2=$(echo "resolve undo test data 2" | git hash-object -w --stdin) &&
-	B3=$(echo "resolve undo test data 3" | git hash-object -w --stdin) &&
-	git update-index --add --index-info <<-EOF &&
-	100644 $B1 1	frotz
-	100644 $B2 2	frotz
-	100644 $B3 3	frotz
-	EOF
+expecting success of 0450.172 'diagnose -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	# These three blob objects are reachable (only) from the index
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
-	# and they should be protected from GC
-	git gc --prune=now &&
-	git cat-file -e $B1 &&
-	git cat-file -e $B2 &&
-	git cat-file -e $B3 &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 172 - diagnose -h output and SYNOPSIS agree
 
-	# Now resolve the conflicted path
-	B0=$(echo "resolve undo test data 0" | git hash-object -w --stdin) &&
-	git update-index --add --cacheinfo 100644,$B0,frotz &&
+expecting success of 0450.173 'diff -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 173 - diff -h output has no \t
 
-	# These three blob objects are now reachable only from the resolve-undo
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
+expecting success of 0450.174 'diff -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 174 - diff -h output has dashed labels
 
-	# and they should survive GC
-	git gc --prune=now &&
-	git cat-file -e $B0 &&
-	git cat-file -e $B1 &&
-	git cat-file -e $B2 &&
-	git cat-file -e $B3 &&
+expecting success of 0450.175 'diff -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 175 - diff -h output has consistent spacing
 
-	# Now we switch away, which nukes resolve-undo, and
-	# blobs B0..B3 would become dangling.  fsck should
-	# notice that they are now unreachable.
-	git checkout -f side &&
-	git fsck --unreachable >cruft &&
-	sort cruft >actual &&
-	sort <<-EOF >expect &&
-	unreachable blob $B0
-	unreachable blob $B1
-	unreachable blob $B2
-	unreachable blob $B3
-	EOF
-	test_cmp expect actual &&
+expecting success of 0450.176 'diff *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 176 - diff *.txt SYNOPSIS has dashed labels
 
-	# And they should go away when gc runs.
-	git gc --prune=now &&
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
+expecting success of 0450.177 'diff -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	test_must_fail git cat-file -e $B0 &&
-	test_must_fail git cat-file -e $B1 &&
-	test_must_fail git cat-file -e $B2 &&
-	test_must_fail git cat-file -e $B3
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 177 - diff -h output and SYNOPSIS agree
 
-Already on 'main'
-HEAD is now at d92f3b1 add differently
-Switched to branch 'side'
-ok 14 - resolve-undo keeps blobs from gc
+expecting success of 0450.178 'diff-files -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 178 - diff-files -h output has no \t
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2104-update-index-skip-worktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 0450.179 'diff-files -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 179 - diff-files -h output has dashed labels
 
-	cat >expect.skip <<-\EOF &&
-	S 1
-	H 2
-	S sub/1
-	H sub/2
-	EOF
+expecting success of 0450.180 'diff-files -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 180 - diff-files -h output has consistent spacing
 
-	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 -
+expecting success of 0450.181 'diff-files *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 181 - diff-files *.txt SYNOPSIS has dashed labels
 
-ok 1 - setup
+expecting success of 0450.182 'diff-files -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2104.2 'index is at version 2': 
-	test "$(git update-index --show-index-version)" = 2
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 182 - diff-files -h output and SYNOPSIS agree
 
-ok 2 - index is at version 2
+expecting success of 0450.183 'diff-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 183 - diff-index -h output has no \t
 
-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 -
+expecting success of 0450.184 'diff-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 184 - diff-index -h output has dashed labels
 
-ok 3 - update-index --skip-worktree
+expecting success of 0450.185 'diff-index -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 185 - diff-index -h output has consistent spacing
 
-expecting success of 2104.4 'index is at version 3 after having some skip-worktree entries': 
-	test "$(git update-index --show-index-version)" = 3
+expecting success of 0450.186 'diff-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 186 - diff-index *.txt SYNOPSIS has dashed labels
 
-ok 4 - index is at version 3 after having some skip-worktree entries
+expecting success of 0450.187 'diff-index -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2104.5 'ls-files -t': 
-	git ls-files -t | test_cmp expect.skip -
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 187 - diff-index -h output and SYNOPSIS agree
 
-ok 5 - ls-files -t
+expecting success of 0450.188 'diff-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 188 - diff-tree -h output has no \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 -
+expecting success of 0450.189 'diff-tree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 189 - diff-tree -h output has dashed labels
 
-ok 6 - update-index --no-skip-worktree
+expecting success of 0450.190 'diff-tree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 190 - diff-tree -h output has consistent spacing
 
-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
+expecting success of 0450.191 'diff-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 191 - diff-tree *.txt SYNOPSIS has dashed labels
 
-ok 7 - index version is back to 2 when there is no skip-worktree entry
+expecting success of 0450.192 'diff-tree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2103-update-index-ignore-missing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2103-update-index-ignore-missing/.git/
-expecting success of 2103.1 'basics': 
-	>one &&
-	>two &&
-	>three &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 192 - diff-tree -h output and SYNOPSIS agree
 
-	# need --add when adding
-	test_must_fail git update-index one &&
-	test -z "$(git ls-files)" &&
-	git update-index --add one &&
-	test zone = "z$(git ls-files)" &&
+expecting success of 0450.193 'difftool -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 193 - difftool -h output has no \t
 
-	# update-index is atomic
-	echo 1 >one &&
-	test_must_fail git update-index one two &&
-	echo "M	one" >expect &&
-	git diff-files --name-status >actual &&
-	test_cmp expect actual &&
+expecting success of 0450.194 'difftool -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 194 - difftool -h output has dashed labels
 
-	git update-index --add one two three &&
-	test_write_lines one three two >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual &&
+expecting success of 0450.195 'difftool -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 195 - difftool -h output has consistent spacing
 
-	test_tick &&
-	(
-		test_create_repo xyzzy &&
-		cd xyzzy &&
-		>file &&
-		git add file &&
-		git commit -m "sub initial"
-	) &&
-	git add xyzzy &&
+expecting success of 0450.196 'difftool *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 196 - difftool *.txt SYNOPSIS has dashed labels
 
-	test_tick &&
-	git commit -m initial &&
-	git tag initial
+expecting success of 0450.197 'difftool -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-error: one: cannot add to the index - missing --add option?
-fatal: Unable to process path one
-error: two: cannot add to the index - missing --add option?
-fatal: Unable to process path two
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2103-update-index-ignore-missing/xyzzy/.git/
-[master (root-commit) a40d181] sub initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-warning: adding embedded git repository: xyzzy
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> xyzzy
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached xyzzy
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) ce14d7f] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 three
- create mode 100644 two
- create mode 160000 xyzzy
-ok 1 - basics
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 197 - difftool -h output and SYNOPSIS agree
 
-expecting success of 2103.2 '--ignore-missing --refresh': 
-	git reset --hard initial &&
-	echo 2 >one &&
-	test_must_fail git update-index --refresh &&
-	echo 1 >one &&
-	git update-index --refresh &&
-	rm -f two &&
-	test_must_fail git update-index --refresh &&
-	git update-index --ignore-missing --refresh
+expecting success of 0450.198 'fast-export -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 198 - fast-export -h output has no \t
 
+expecting success of 0450.199 'fast-export -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 199 - fast-export -h output has dashed labels
 
-HEAD is now at ce14d7f initial
-one: needs update
-two: needs update
-ok 2 - --ignore-missing --refresh
+expecting success of 0450.200 'fast-export -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 200 - fast-export -h output has consistent spacing
 
-expecting success of 2103.3 '--unmerged --refresh': 
-	git reset --hard initial &&
-	info=$(git ls-files -s one | sed -e "s/ 0	/ 1	/") &&
-	git rm --cached one &&
-	echo "$info" | git update-index --index-info &&
-	test_must_fail git update-index --refresh &&
-	git update-index --unmerged --refresh &&
-	echo 2 >two &&
-	test_must_fail git update-index --unmerged --refresh >actual &&
-	grep two actual &&
-	! grep one actual &&
-	! grep three actual
+expecting success of 0450.201 'fast-export *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 201 - fast-export *.txt SYNOPSIS has dashed labels
 
-HEAD is now at ce14d7f initial
-rm 'one'
-one: needs merge
-two: needs update
-ok 3 - --unmerged --refresh
+checking known breakage of 0450.202 'fast-export -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2103.4 '--ignore-submodules --refresh (1)': 
-	git reset --hard initial &&
-	rm -f two &&
-	test_must_fail git update-index --ignore-submodules --refresh
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:42.986677808 +0000
++++ help	2026-03-14 13:26:43.042677808 +0000
+@@ -1 +1 @@
+-git fast-export [<options>] | git fast-import
++git fast-export [<rev-list-opts>]
+not ok 202 - fast-export -h output and SYNOPSIS agree # TODO known breakage
 
-HEAD is now at ce14d7f initial
-two: needs update
-ok 4 - --ignore-submodules --refresh (1)
+expecting success of 0450.203 'fast-import -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 203 - fast-import -h output has no \t
 
-expecting success of 2103.5 '--ignore-submodules --refresh (2)': 
-	git reset --hard initial &&
-	test_tick &&
-	(
-		cd xyzzy &&
-		git commit -m "sub second" --allow-empty
-	) &&
-	test_must_fail git update-index --refresh &&
-	test_must_fail git update-index --ignore-missing --refresh &&
-	git update-index --ignore-submodules --refresh
+expecting success of 0450.204 'fast-import -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 204 - fast-import -h output has dashed labels
 
-HEAD is now at ce14d7f initial
-[master 66f0d66] sub second
- Author: A U Thor <author@example.com>
-xyzzy: needs update
-xyzzy: needs update
-ok 5 - --ignore-submodules --refresh (2)
+expecting success of 0450.205 'fast-import -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 205 - fast-import -h output has consistent spacing
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2082-parallel-checkout-attributes.sh ***
-expecting success of 2082.1 'parallel-checkout with ident': 
-	set_checkout_config 2 0 &&
-	git init ident &&
-	(
-		cd ident &&
-		echo "A ident" >.gitattributes &&
-		echo "\$Id\$" >A &&
-		echo "\$Id\$" >B &&
-		git add -A &&
-		git commit -m id &&
+expecting success of 0450.206 'fast-import *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 206 - fast-import *.txt SYNOPSIS has dashed labels
 
-		rm A B &&
-		test_checkout_workers 2 git reset --hard &&
-		hexsz=$(test_oid hexsz) &&
-		grep -E "\\\$Id: [0-9a-f]{$hexsz} \\\$" A &&
-		grep "\\\$Id\\\$" B
-	)
+checking known breakage of 0450.207 'fast-import -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/ident/.git/
-[master (root-commit) f770bc4] id
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
-HEAD is now at f770bc4 id
-$Id: 055c8729cdcc372500a08db659c045e16c4409fb $
-$Id$
-ok 1 - parallel-checkout with ident
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:43.510677808 +0000
++++ help	2026-03-14 13:26:43.570677808 +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>]
+not ok 207 - fast-import -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2082.2 'parallel-checkout with re-encoding': 
-	set_checkout_config 2 0 &&
-	git init encoding &&
-	(
-		cd encoding &&
-		echo text >utf8-text &&
-		write_utf16 <utf8-text >utf16-text &&
+expecting success of 0450.208 'fetch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 208 - fetch -h output has no \t
 
-		echo "A working-tree-encoding=UTF-16" >.gitattributes &&
-		cp utf16-text A &&
-		cp utf8-text B &&
-		git add A B .gitattributes &&
-		git commit -m encoding &&
+expecting success of 0450.209 'fetch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 209 - fetch -h output has dashed labels
 
-		# Check that A is stored in UTF-8
-		git cat-file -p :A >A.internal &&
-		test_cmp_bin utf8-text A.internal &&
+expecting success of 0450.210 'fetch -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 210 - fetch -h output has consistent spacing
 
-		rm A B &&
-		test_checkout_workers 2 git checkout A B &&
+expecting success of 0450.211 'fetch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 211 - fetch *.txt SYNOPSIS has dashed labels
 
-		# Check that A (and only A) is re-encoded during checkout
-		test_cmp_bin utf16-text A &&
-		test_cmp_bin utf8-text B
-	)
+expecting success of 0450.212 'fetch -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/encoding/.git/
-checking prerequisite: NO_UTF16_BOM
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 212 - fetch -h output and SYNOPSIS agree
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
-	test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
+expecting success of 0450.213 'fetch-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 213 - fetch-pack -h output has no \t
 
-)
-prerequisite NO_UTF16_BOM not satisfied
-[master (root-commit) eb6a843] encoding
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
-Updated 2 paths from the index
-ok 2 - parallel-checkout with re-encoding
+expecting success of 0450.214 'fetch-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 214 - fetch-pack -h output has dashed labels
 
-expecting success of 2082.3 'parallel-checkout with eol conversions': 
-	set_checkout_config 2 0 &&
-	git init eol &&
-	(
-		cd eol &&
-		printf "multi\r\nline\r\ntext" >crlf-text &&
-		printf "multi\nline\ntext" >lf-text &&
+expecting success of 0450.215 'fetch-pack -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 215 - fetch-pack -h output has consistent spacing
 
-		git config core.autocrlf false &&
-		echo "A eol=crlf" >.gitattributes &&
-		cp crlf-text A &&
-		cp lf-text B &&
-		git add A B .gitattributes &&
-		git commit -m eol &&
+expecting success of 0450.216 'fetch-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 216 - fetch-pack *.txt SYNOPSIS has dashed labels
 
-		# Check that A is stored with LF format
-		git cat-file -p :A >A.internal &&
-		test_cmp_bin lf-text A.internal &&
+checking known breakage of 0450.217 'fetch-pack -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		rm A B &&
-		test_checkout_workers 2 git checkout A B &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:44.534677808 +0000
++++ help	2026-03-14 13:26:44.590677808 +0000
+@@ -1,4 +1 @@
+-git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
+-               [--upload-pack=<git-upload-pack>]
+-               [--depth=<n>] [--no-progress]
+-               [-v] <repository> [<refs>...]
++git fetch-pack [--all] [--stdin] [--quiet | -q] [--keep | -k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [--diag-url] [-v] [<host>:]<directory> [<refs>...]
+not ok 217 - fetch-pack -h output and SYNOPSIS agree # TODO known breakage
 
-		# Check that A (and only A) is converted to CRLF during checkout
-		test_cmp_bin crlf-text A &&
-		test_cmp_bin lf-text B
-	)
+expecting success of 0450.218 'fmt-merge-msg -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 218 - fmt-merge-msg -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/eol/.git/
-[master (root-commit) cd8ac0d] eol
- Author: A U Thor <author@example.com>
- 3 files changed, 7 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
-Updated 2 paths from the index
-ok 3 - parallel-checkout with eol conversions
+expecting success of 0450.219 'fmt-merge-msg -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 219 - fmt-merge-msg -h output has dashed labels
 
-expecting success of 2082.4 'parallel-checkout and external filter': 
-	set_checkout_config 2 0 &&
-	git init filter &&
-	(
-		cd filter &&
-		write_script <<-\EOF rot13.sh &&
-		tr \
-		  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-		  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
-		EOF
+expecting success of 0450.220 'fmt-merge-msg -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 220 - fmt-merge-msg -h output has consistent spacing
 
-		git config filter.rot13.clean "\"$(pwd)/rot13.sh\"" &&
-		git config filter.rot13.smudge "\"$(pwd)/rot13.sh\"" &&
-		git config filter.rot13.required true &&
+expecting success of 0450.221 'fmt-merge-msg *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 221 - fmt-merge-msg *.txt SYNOPSIS has dashed labels
 
-		echo abcd >original &&
-		echo nopq >rot13 &&
+checking known breakage of 0450.222 'fmt-merge-msg -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		echo "A filter=rot13" >.gitattributes &&
-		cp original A &&
-		cp original B &&
-		cp original C &&
-		git add A B C .gitattributes &&
-		git commit -m filter &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:45.054677808 +0000
++++ help	2026-03-14 13:26:45.122677808 +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>
++git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]
+not ok 222 - fmt-merge-msg -h output and SYNOPSIS agree # TODO known breakage
 
-		# Check that A (and only A) was cleaned
-		git cat-file -p :A >A.internal &&
-		test_cmp rot13 A.internal &&
-		git cat-file -p :B >B.internal &&
-		test_cmp original B.internal &&
-		git cat-file -p :C >C.internal &&
-		test_cmp original C.internal &&
+expecting success of 0450.223 'for-each-ref -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 223 - for-each-ref -h output has no \t
 
-		rm A B C *.internal &&
-		test_checkout_workers 2 git checkout A B C &&
+expecting success of 0450.224 'for-each-ref -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 224 - for-each-ref -h output has dashed labels
 
-		# Check that A (and only A) was smudged during checkout
-		test_cmp original A &&
-		test_cmp original B &&
-		test_cmp original C
-	)
+expecting success of 0450.225 'for-each-ref -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 225 - for-each-ref -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/filter/.git/
-[master (root-commit) 9fb524e] filter
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A
- create mode 100644 B
- create mode 100644 C
-Updated 3 paths from the index
-ok 4 - parallel-checkout and external filter
+expecting success of 0450.226 'for-each-ref *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 226 - for-each-ref *.txt SYNOPSIS has dashed labels
 
-expecting success of 2082.5 'parallel-checkout and delayed checkout': 
-	test_config_global filter.delay.process \
-		"test-tool rot13-filter --always-delay --log=\"$(pwd)/delayed.log\" clean smudge delay" &&
-	test_config_global filter.delay.required true &&
+checking known breakage of 0450.227 'for-each-ref -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	echo "abcd" >original &&
-	echo "nopq" >rot13 &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:45.586677808 +0000
++++ help	2026-03-14 13:26:45.654677808 +0000
+@@ -1,7 +1,4 @@
+-git for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl]
+-                 [(--sort=<key>)...] [--format=<format>]
+-                 [--include-root-refs] [ --stdin | <pattern>... ]
+-                 [--points-at=<object>]
+-                 [--merged[=<object>]] [--no-merged[=<object>]]
+-                 [--contains[=<object>]] [--no-contains[=<object>]]
+-                 [--exclude=<pattern> ...]
++git for-each-ref [<options>] [<pattern>]
++git for-each-ref [--points-at <object>]
++git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]
++git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]
+not ok 227 - for-each-ref -h output and SYNOPSIS agree # TODO known breakage
 
-	git init delayed &&
-	(
-		cd delayed &&
-		echo "*.d filter=delay" >.gitattributes &&
-		cp ../original W.d &&
-		cp ../original X.d &&
-		cp ../original Y &&
-		cp ../original Z &&
-		git add -A &&
-		git commit -m delayed &&
+expecting success of 0450.228 'for-each-repo -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 228 - for-each-repo -h output has no \t
 
-		# Check that *.d files were cleaned
-		git cat-file -p :W.d >W.d.internal &&
-		test_cmp W.d.internal ../rot13 &&
-		git cat-file -p :X.d >X.d.internal &&
-		test_cmp X.d.internal ../rot13 &&
-		git cat-file -p :Y >Y.internal &&
-		test_cmp Y.internal ../original &&
-		git cat-file -p :Z >Z.internal &&
-		test_cmp Z.internal ../original &&
+expecting success of 0450.229 'for-each-repo -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 229 - for-each-repo -h output has dashed labels
 
-		rm *
-	) &&
+expecting success of 0450.230 'for-each-repo -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 230 - for-each-repo -h output has consistent spacing
 
-	set_checkout_config 2 0 &&
-	test_checkout_workers 2 git -C delayed checkout -f &&
-	verify_checkout delayed &&
+expecting success of 0450.231 'for-each-repo *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 231 - for-each-repo *.txt SYNOPSIS has dashed labels
 
-	# Check that the *.d files got to the delay queue and were filtered
-	grep "smudge W.d .* \[DELAYED\]" delayed.log &&
-	grep "smudge X.d .* \[DELAYED\]" delayed.log &&
-	test_cmp delayed/W.d original &&
-	test_cmp delayed/X.d original &&
+expecting success of 0450.232 'for-each-repo -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	# Check that the parallel-eligible entries went to the right queue and
-	# were not filtered
-	! grep "smudge Y .* \[DELAYED\]" delayed.log &&
-	! grep "smudge Z .* \[DELAYED\]" delayed.log &&
-	test_cmp delayed/Y original &&
-	test_cmp delayed/Z original
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 232 - for-each-repo -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/delayed/.git/
-[master (root-commit) 73aa10e] delayed
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 W.d
- create mode 100644 X.d
- create mode 100644 Y
- create mode 100644 Z
-IN: smudge W.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
-IN: smudge X.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
-ok 5 - parallel-checkout and delayed checkout
+expecting success of 0450.233 'format-patch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 233 - format-patch -h output has no \t
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2106-update-index-assume-unchanged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2106-update-index-assume-unchanged/.git/
-expecting success of 2106.1 'setup': 
-	: >file &&
-	git add file &&
-	git commit -m initial &&
-	git branch other &&
-	echo upstream >file &&
-	git add file &&
-	git commit -m upstream
+expecting success of 0450.234 'format-patch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 234 - format-patch -h output has dashed labels
 
-[master (root-commit) 6ce5622] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master fbda113] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+expecting success of 0450.235 'format-patch -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 235 - format-patch -h output has consistent spacing
 
-expecting success of 2106.2 'do not switch branches with dirty file': 
-	git reset --hard &&
-	git checkout other &&
-	echo dirt >file &&
-	git update-index --assume-unchanged file &&
-	test_must_fail git checkout - 2>err &&
-	test_grep overwritten err
+expecting success of 0450.236 'format-patch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 236 - format-patch *.txt SYNOPSIS has dashed labels
 
-HEAD is now at fbda113 upstream
-Switched to branch 'other'
-error: Your local changes to the following files would be overwritten by checkout:
-ok 2 - do not switch branches with dirty file
+checking known breakage of 0450.237 'format-patch -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2107-update-index-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/.git/
-expecting success of 2107.1 'update-index --nonsense fails': 
-	test_must_fail git update-index --nonsense 2>msg &&
-	test -s msg
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:46.654677808 +0000
++++ help	2026-03-14 13:26:46.698677808 +0000
+@@ -1,23 +1 @@
+-git format-patch [-k] [(-o|--output-directory) <dir> | --stdout]
+-                 [--no-thread | --thread[=<style>]]
+-                 [(--attach|--inline)[=<boundary>] | --no-attach]
+-                 [-s | --signoff]
+-                 [--signature=<signature> | --no-signature]
+-                 [--signature-file=<file>]
+-                 [-n | --numbered | -N | --no-numbered]
+-                 [--start-number <n>] [--numbered-files]
+-                 [--in-reply-to=<message-id>] [--suffix=.<sfx>]
+-                 [--ignore-if-in-upstream] [--always]
+-                 [--cover-from-description=<mode>]
+-                 [--rfc[=<rfc>]] [--subject-prefix=<subject-prefix>]
+-                 [(--reroll-count|-v) <n>]
+-                 [--to=<email>] [--cc=<email>]
+-                 [--[no-]cover-letter] [--quiet]
+-                 [--[no-]encode-email-headers]
+-                 [--no-notes | --notes[=<ref>]]
+-                 [--interdiff=<previous>]
+-                 [--range-diff=<previous> [--creation-factor=<percent>]]
+-                 [--filename-max-length=<n>]
+-                 [--progress]
+-                 [<common-diff-options>]
+-                 [ <since> | <revision-range> ]
++git format-patch [<options>] [<since> | <revision-range>]
+not ok 237 - format-patch -h output and SYNOPSIS agree # TODO known breakage
 
-ok 1 - update-index --nonsense fails
+expecting success of 0450.238 'fsck -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 238 - fsck -h output has no \t
 
-expecting success of 2107.2 'update-index --nonsense dumps usage': 
-	test_expect_code 129 git update-index --nonsense 2>err &&
-	test_grep "[Uu]sage: git update-index" err
+expecting success of 0450.239 'fsck -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 239 - fsck -h output has dashed labels
 
-usage: git update-index [<options>] [--] [<file>...]
-ok 2 - update-index --nonsense dumps usage
+expecting success of 0450.240 'fsck -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 240 - fsck -h output has consistent spacing
 
-expecting success of 2107.3 'update-index -h with corrupt index': 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git update-index -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage: git update-index" broken/usage
+expecting success of 0450.241 'fsck *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 241 - fsck *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/broken/.git/
-usage: git update-index [<options>] [--] [<file>...]
-ok 3 - update-index -h with corrupt index
+expecting success of 0450.242 'fsck -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2107.4 '--cacheinfo complains of missing arguments': 
-	test_must_fail git update-index --cacheinfo
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 242 - fsck -h output and SYNOPSIS agree
 
-error: option 'cacheinfo' expects <mode>,<sha1>,<path>
-ok 4 - --cacheinfo complains of missing arguments
+expecting success of 0450.243 'fsck-objects -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 243 - fsck-objects -h output has no \t
 
-expecting success of 2107.5 '--cacheinfo does not accept blob null sha1': 
-	echo content >file &&
-	git add file &&
-	git rev-parse :file >expect &&
-	test_must_fail git update-index --verbose --cacheinfo 100644 $ZERO_OID file >out &&
-	git rev-parse :file >actual &&
-	test_cmp expect actual &&
+expecting success of 0450.244 'fsck-objects -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 244 - fsck-objects -h output has dashed labels
 
-	cat >expect <<-\EOF &&
-	add 'file'
-	EOF
-	test_cmp expect out
+expecting success of 0450.245 'fsck-objects -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 245 - fsck-objects -h output has consistent spacing
 
-error: cache entry has null sha1: file
-fatal: Unable to write new index file
-ok 5 - --cacheinfo does not accept blob null sha1
+expecting success of 0450.246 'fsck-objects *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 246 - fsck-objects *.txt SYNOPSIS has dashed labels
 
-expecting success of 2107.6 '--cacheinfo does not accept gitlink null sha1': 
-	git init submodule &&
-	(cd submodule && test_commit foo) &&
-	git add submodule &&
-	git rev-parse :submodule >expect &&
-	test_must_fail git update-index --cacheinfo 160000 $ZERO_OID submodule &&
-	git rev-parse :submodule >actual &&
-	test_cmp expect actual
+checking known breakage of 0450.247 'fsck-objects -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/submodule/.git/
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-warning: adding embedded git repository: submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submodule
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submodule
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-error: cache entry has null sha1: submodule
-fatal: Unable to write new index file
-ok 6 - --cacheinfo does not accept gitlink null sha1
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:47.814677808 +0000
++++ help	2026-03-14 13:26:47.878677808 +0000
+@@ -1 +1,4 @@
+-git fsck-objects ...
++git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
++                 [--[no-]full] [--strict] [--verbose] [--lost-found]
++                 [--[no-]dangling] [--[no-]progress] [--connectivity-only]
++                 [--[no-]name-objects] [<object>...]
+not ok 247 - fsck-objects -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2107.7 '--cacheinfo mode,sha1,path (new syntax)': 
-	echo content >file &&
-	git hash-object -w --stdin <file >expect &&
+expecting success of 0450.248 'fsmonitor--daemon -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 248 - fsmonitor--daemon -h output has no \t
 
-	git update-index --add --cacheinfo 100644 "$(cat expect)" file &&
-	git rev-parse :file >actual &&
-	test_cmp expect actual &&
+expecting success of 0450.249 'fsmonitor--daemon -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 249 - fsmonitor--daemon -h output has dashed labels
 
-	git update-index --add --verbose --cacheinfo "100644,$(cat expect),elif" >out &&
-	git rev-parse :elif >actual &&
-	test_cmp expect actual &&
+expecting success of 0450.250 'fsmonitor--daemon -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 250 - fsmonitor--daemon -h output has consistent spacing
 
-	cat >expect <<-\EOF &&
-	add 'elif'
-	EOF
-	test_cmp expect out
+expecting success of 0450.251 'fsmonitor--daemon *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 251 - fsmonitor--daemon *.txt SYNOPSIS has dashed labels
 
-ok 7 - --cacheinfo mode,sha1,path (new syntax)
+checking known breakage of 0450.252 'fsmonitor--daemon -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2107.8 '.lock files cleaned up': 
-	mkdir cleanup &&
-	(
-	cd cleanup &&
-	mkdir worktree &&
-	git init repo &&
-	cd repo &&
-	git config core.worktree ../../worktree &&
-	# --refresh triggers late setup_work_tree,
-	# the_index.cache_changed is zero, rollback_lock_file fails
-	git update-index --refresh --verbose >out &&
-	test_must_be_empty out &&
-	! test -f .git/index.lock
-	)
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:48.318677808 +0000
++++ help	2026-03-14 13:26:48.362677808 +0000
+@@ -1,4 +1,4 @@
+-git fsmonitor--daemon start
+-git fsmonitor--daemon run
++git fsmonitor--daemon start [<options>]
++git fsmonitor--daemon run [<options>]
+ git fsmonitor--daemon stop
+ git fsmonitor--daemon status
+not ok 252 - fsmonitor--daemon -h output and SYNOPSIS agree # TODO known breakage
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/cleanup/repo/.git/
-ok 8 - .lock files cleaned up
+expecting success of 0450.253 'gc -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 253 - gc -h output has no \t
 
-expecting success of 2107.9 '--chmod=+x and chmod=-x in the same argument list': 
-	>A &&
-	>B &&
-	git add A B &&
-	git update-index --verbose --chmod=+x A --chmod=-x B >out &&
-	cat >expect <<-\EOF &&
-	add 'A'
-	chmod +x 'A'
-	add 'B'
-	chmod -x 'B'
-	EOF
-	test_cmp expect out &&
+expecting success of 0450.254 'gc -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 254 - gc -h output has dashed labels
 
-	cat >expect <<-EOF &&
-	100755 $EMPTY_BLOB 0	A
-	100644 $EMPTY_BLOB 0	B
-	EOF
-	git ls-files --stage A B >actual &&
-	test_cmp expect actual
+expecting success of 0450.255 'gc -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 255 - gc -h output has consistent spacing
 
-ok 9 - --chmod=+x and chmod=-x in the same argument list
+expecting success of 0450.256 'gc *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 256 - gc *.txt SYNOPSIS has dashed labels
 
-expecting success of 2107.10 '--index-version': 
-	git commit --allow-empty -m snap &&
-	git reset --hard &&
-	git rm -f -r --cached . &&
+checking known breakage of 0450.257 'gc -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	# The default index version is 2 --- update this test
-	# when you change it in the code
-	git update-index --show-index-version >actual &&
-	echo 2 >expect &&
-	test_cmp expect actual &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:48.894677808 +0000
++++ help	2026-03-14 13:26:48.958677808 +0000
+@@ -1 +1 @@
+-git gc [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]
++git gc [<options>]
+not ok 257 - gc -h output and SYNOPSIS agree # TODO known breakage
 
-	# The next test wants us to be using version 2
-	git update-index --index-version 2 &&
+expecting success of 0450.258 'get-tar-commit-id -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 258 - get-tar-commit-id -h output has no \t
 
-	git update-index --index-version 4 --verbose >actual &&
-	echo "index-version: was 2, set to 4" >expect &&
-	test_cmp expect actual &&
+expecting success of 0450.259 'get-tar-commit-id -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 259 - get-tar-commit-id -h output has dashed labels
 
-	git update-index --index-version 4 --verbose >actual &&
-	echo "index-version: was 4, set to 4" >expect &&
-	test_cmp expect actual &&
+expecting success of 0450.260 'get-tar-commit-id -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 260 - get-tar-commit-id -h output has consistent spacing
 
-	git update-index --index-version 2 --verbose >actual &&
-	echo "index-version: was 4, set to 2" >expect &&
-	test_cmp expect actual &&
+expecting success of 0450.261 'get-tar-commit-id *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 261 - get-tar-commit-id *.txt SYNOPSIS has dashed labels
 
-	# non-verbose should be silent
-	git update-index --index-version 4 >actual &&
-	test_must_be_empty actual
+expecting success of 0450.262 'get-tar-commit-id -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-[master (root-commit) 207d473] snap
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+)
- create mode 100755 A
- create mode 100644 B
- create mode 100644 elif
- create mode 100644 file
- create mode 160000 submodule
-HEAD is now at 207d473 snap
-rm 'A'
-rm 'B'
-rm 'elif'
-rm 'file'
-rm 'submodule'
-ok 10 - --index-version
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 262 - get-tar-commit-id -h output and SYNOPSIS agree
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2202-add-addremove.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 0450.263 'grep -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 263 - grep -h output has no \t
 
-[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 0450.264 'grep -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 264 - grep -h output has dashed labels
 
-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
+expecting success of 0450.265 'grep -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 265 - grep -h output has consistent spacing
 
-ok 2 - git add --all
+expecting success of 0450.266 'grep *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 266 - grep *.txt SYNOPSIS has dashed labels
 
-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
+checking known breakage of 0450.267 'grep -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-HEAD is now at 50dd5d8 initial
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config set advice.addEmptyPathspec false"
-ok 3 - Just "git add" is a no-op
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:50.102677808 +0000
++++ help	2026-03-14 13:26:50.154677808 +0000
+@@ -1,21 +1 @@
+-git grep [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]
+-         [-v | --invert-match] [-h|-H] [--full-name]
+-         [-E | --extended-regexp] [-G | --basic-regexp]
+-         [-P | --perl-regexp]
+-         [-F | --fixed-strings] [-n | --line-number] [--column]
+-         [-l | --files-with-matches] [-L | --files-without-match]
+-         [(-O | --open-files-in-pager) [<pager>]]
+-         [-z | --null]
+-         [ -o | --only-matching ] [-c | --count] [--all-match] [-q | --quiet]
+-         [--max-depth <depth>] [--[no-]recursive]
+-         [--color[=<when>] | --no-color]
+-         [--break] [--heading] [-p | --show-function]
+-         [-A <post-context>] [-B <pre-context>] [-C <context>]
+-         [-W | --function-context]
+-         [(-m | --max-count) <num>]
+-         [--threads <num>]
+-         [-f <file>] [-e] <pattern>
+-         [--and|--or|--not|(|)|-e <pattern>...]
+-         [--recurse-submodules] [--parent-basename <basename>]
+-         [ [--[no-]exclude-standard] [--cached | --untracked | --no-index] | <tree>...]
+-         [--] [<pathspec>...]
++git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]
+not ok 267 - grep -h output and SYNOPSIS agree # TODO known breakage
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2201-add-update-typechange.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2201-add-update-typechange/.git/
-expecting success of 2201.1 'setup': 
-	>xyzzy &&
-	_empty=$(git hash-object --stdin <xyzzy) &&
-	>yomin &&
-	>caskly &&
-	if test_have_prereq SYMLINKS; then
-		ln -s frotz nitfol &&
-		T_letter=T
-	else
-		printf %s frotz > nitfol &&
-		T_letter=M
-	fi &&
-	mkdir rezrov &&
-	>rezrov/bozbar &&
-	git add caskly xyzzy yomin nitfol rezrov/bozbar &&
+expecting success of 0450.268 'hash-object -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 268 - hash-object -h output has no \t
 
-	test_tick &&
-	git commit -m initial
+expecting success of 0450.269 'hash-object -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 269 - hash-object -h output has dashed labels
 
+expecting success of 0450.270 'hash-object -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 270 - hash-object -h output has consistent spacing
 
-checking prerequisite: SYMLINKS
+expecting success of 0450.271 'hash-object *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 271 - hash-object *.txt SYNOPSIS has dashed labels
 
-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 0450.272 'hash-object -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 8dc0761] initial
- Author: A U Thor <author@example.com>
- 5 files changed, 1 insertion(+)
- create mode 100644 caskly
- create mode 120000 nitfol
- create mode 100644 rezrov/bozbar
- create mode 100644 xyzzy
- create mode 100644 yomin
-ok 1 - setup
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 272 - hash-object -h output and SYNOPSIS agree
 
-expecting success of 2201.2 'modify': 
-	rm -f xyzzy yomin nitfol caskly &&
-	# caskly disappears (not a submodule)
-	mkdir caskly &&
-	# nitfol changes from symlink to regular
-	>nitfol &&
-	# rezrov/bozbar disappears
-	rm -fr rezrov &&
-	if test_have_prereq SYMLINKS; then
-		ln -s xyzzy rezrov
-	else
-		printf %s xyzzy > rezrov
-	fi &&
-	# xyzzy disappears (not a submodule)
-	mkdir xyzzy &&
-	echo gnusto >xyzzy/bozbar &&
-	# yomin gets replaced with a submodule
-	mkdir yomin &&
-	>yomin/yomin &&
-	(
-		cd yomin &&
-		git init &&
-		git add yomin &&
-		git commit -m "sub initial"
-	) &&
-	yomin=$(GIT_DIR=yomin/.git git rev-parse HEAD) &&
-	# yonk is added and then turned into a submodule
-	# this should appear as T in diff-files and as A in diff-index
-	>yonk &&
-	git add yonk &&
-	rm -f yonk &&
-	mkdir yonk &&
-	>yonk/yonk &&
-	(
-		cd yonk &&
-		git init &&
-		git add yonk &&
-		git commit -m "sub initial"
-	) &&
-	yonk=$(GIT_DIR=yonk/.git git rev-parse HEAD) &&
-	# zifmia is added and then removed
-	# this should appear in diff-files but not in diff-index.
-	>zifmia &&
-	git add zifmia &&
-	rm -f zifmia &&
-	mkdir zifmia &&
-	{
-		git ls-tree -r HEAD |
-		sed -e "s/^/:/" -e "
-			/	caskly/{
-				s/	caskly/ $ZERO_OID D&/
-				s/blob/000000/
-			}
-			/	nitfol/{
-				s/	nitfol/ $ZERO_OID $T_letter&/
-				s/blob/100644/
-			}
-			/	rezrov.bozbar/{
-				s/	rezrov.bozbar/ $ZERO_OID D&/
-				s/blob/000000/
-			}
-			/	xyzzy/{
-				s/	xyzzy/ $ZERO_OID D&/
-				s/blob/000000/
-			}
-			/	yomin/{
-			    s/	yomin/ $ZERO_OID T&/
-				s/blob/160000/
-			}
-		"
-	} >expect &&
-	{
-		cat expect &&
-		echo ":100644 160000 $_empty $ZERO_OID T	yonk" &&
-		echo ":100644 000000 $_empty $ZERO_OID D	zifmia"
-	} >expect-files &&
-	{
-		cat expect &&
-		echo ":000000 160000 $ZERO_OID $ZERO_OID A	yonk"
-	} >expect-index &&
-	{
-		echo "100644 $_empty 0	nitfol" &&
-		echo "160000 $yomin 0	yomin" &&
-		echo "160000 $yonk 0	yonk"
-	} >expect-final
+expecting success of 0450.273 'help -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 273 - help -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2201-add-update-typechange/yomin/.git/
-[master (root-commit) 9da2848] sub initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 yomin
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2201-add-update-typechange/yonk/.git/
-[master (root-commit) 9cc3160] sub initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 yonk
-ok 2 - modify
+expecting success of 0450.274 'help -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 274 - help -h output has dashed labels
 
-expecting success of 2201.3 'diff-files': 
-	git diff-files --raw >actual &&
-	test_cmp expect-files actual
+expecting success of 0450.275 'help -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 275 - help -h output has consistent spacing
 
-ok 3 - diff-files
+expecting success of 0450.276 'help *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 276 - help *.txt SYNOPSIS has dashed labels
 
-expecting success of 2201.4 'diff-index': 
-	git diff-index --raw HEAD -- >actual &&
-	test_cmp expect-index actual
+expecting success of 0450.277 'help -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 4 - diff-index
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 277 - help -h output and SYNOPSIS agree
 
-expecting success of 2201.5 'add -u': 
-	rm -f ".git/saved-index" &&
-	cp -p ".git/index" ".git/saved-index" &&
-	git add -u &&
-	git ls-files -s >actual &&
-	test_cmp expect-final actual
+expecting success of 0450.278 'hook -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 278 - hook -h output has no \t
 
-ok 5 - add -u
+expecting success of 0450.279 'hook -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 279 - hook -h output has dashed labels
 
-expecting success of 2201.6 'commit -a': 
-	if test -f ".git/saved-index"
-	then
-		rm -f ".git/index" &&
-		mv ".git/saved-index" ".git/index"
-	fi &&
-	git commit -m "second" -a &&
-	git ls-files -s >actual &&
-	test_cmp expect-final actual &&
-	rm -f .git/index &&
-	git read-tree HEAD &&
-	git ls-files -s >actual &&
-	test_cmp expect-final actual
+expecting success of 0450.280 'hook -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 280 - hook -h output has consistent spacing
 
-[master 0f3d2ce] second
- Author: A U Thor <author@example.com>
- 6 files changed, 2 insertions(+), 1 deletion(-)
- delete mode 100644 caskly
- mode change 120000 => 100644 nitfol
- delete mode 100644 rezrov/bozbar
- delete mode 100644 xyzzy
- mode change 100644 => 160000 yomin
- create mode 160000 yonk
-ok 6 - commit -a
+expecting success of 0450.281 'hook *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 281 - hook *.txt SYNOPSIS has dashed labels
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2200-add-update.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2200-add-update/.git/
-expecting success of 2200.1 'setup': 
-	echo initial >check &&
-	echo initial >top &&
-	echo initial >foo &&
-	mkdir dir1 dir2 &&
-	echo initial >dir1/sub1 &&
-	echo initial >dir1/sub2 &&
-	echo initial >dir2/sub3 &&
-	git add check dir1 dir2 top foo &&
-	test_tick &&
-	git commit -m initial &&
+expecting success of 0450.282 'hook -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	echo changed >check &&
-	echo changed >top &&
-	echo changed >dir2/sub3 &&
-	rm -f dir1/sub1 &&
-	echo other >dir2/other
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 282 - hook -h output and SYNOPSIS agree
 
-[master (root-commit) ec46c19] initial
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 check
- create mode 100644 dir1/sub1
- create mode 100644 dir1/sub2
- create mode 100644 dir2/sub3
- create mode 100644 foo
- create mode 100644 top
-ok 1 - setup
+expecting success of 0450.283 'index-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 283 - index-pack -h output has no \t
 
-expecting success of 2200.2 'update': 
-	git add -u dir1 dir2
+expecting success of 0450.284 'index-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 284 - index-pack -h output has dashed labels
 
-ok 2 - update
+expecting success of 0450.285 'index-pack -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 285 - index-pack -h output has consistent spacing
 
-expecting success of 2200.3 'update noticed a removal': 
-	git ls-files dir1/sub1 >out &&
-	test_must_be_empty out
+expecting success of 0450.286 'index-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 286 - index-pack *.txt SYNOPSIS has dashed labels
 
-ok 3 - update noticed a removal
+checking known breakage of 0450.287 'index-pack -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2200.4 'update touched correct path': 
-	git diff-files --name-status dir2/sub3 >out &&
-	test_must_be_empty out
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:52.310677808 +0000
++++ help	2026-03-14 13:26:52.370677808 +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>]
+-               [--[no-]rev-index] [<pack-file>]
++git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict[=<msg-id>=<severity>...]] [--fsck-objects[=<msg-id>=<severity>...]] (<pack-file> | --stdin [--fix-thin] [<pack-file>])
+not ok 287 - index-pack -h output and SYNOPSIS agree # TODO known breakage
 
-ok 4 - update touched correct path
+expecting success of 0450.288 'init -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 288 - init -h output has no \t
 
-expecting success of 2200.5 'update did not touch other tracked files': 
-	echo "M	check" >expect &&
-	git diff-files --name-status check >actual &&
-	test_cmp expect actual &&
+expecting success of 0450.289 'init -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 289 - init -h output has dashed labels
 
-	echo "M	top" >expect &&
-	git diff-files --name-status top >actual &&
-	test_cmp expect actual
+expecting success of 0450.290 'init -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 290 - init -h output has consistent spacing
 
-ok 5 - update did not touch other tracked files
+expecting success of 0450.291 'init *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 291 - init *.txt SYNOPSIS has dashed labels
 
-expecting success of 2200.6 'update did not touch untracked files': 
-	git ls-files dir2/other >out &&
-	test_must_be_empty out
+expecting success of 0450.292 'init -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 6 - update did not touch untracked files
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 292 - init -h output and SYNOPSIS agree
 
-expecting success of 2200.7 'error out when passing untracked path': 
-	git reset --hard &&
-	echo content >>baz &&
-	echo content >>top &&
-	test_must_fail git add -u baz top 2>err &&
-	test_grep -e "error: pathspec .baz. did not match any file(s) known to git" err &&
-	git diff --cached --name-only >actual &&
-	test_must_be_empty actual
+expecting success of 0450.293 'init-db -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 293 - init-db -h output has no \t
 
-HEAD is now at ec46c19 initial
-error: pathspec 'baz' did not match any file(s) known to git
-ok 7 - error out when passing untracked path
+expecting success of 0450.294 'init-db -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 294 - init-db -h output has dashed labels
 
-expecting success of 2200.8 'cache tree has not been corrupted': 
+expecting success of 0450.295 'init-db -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 295 - init-db -h output has consistent spacing
 
-	git ls-files -s |
-	sed -e "s/ 0	/	/" >expect &&
-	git ls-tree -r $(git write-tree) |
-	sed -e "s/ blob / /" >current &&
-	test_cmp expect current
+expecting success of 0450.296 'init-db *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 296 - init-db *.txt SYNOPSIS has dashed labels
 
+checking known breakage of 0450.297 'init-db -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 8 - cache tree has not been corrupted
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:53.414677808 +0000
++++ help	2026-03-14 13:26:53.466677808 +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>]
++            [--separate-git-dir <git-dir>] [--object-format=<format>]
++            [--ref-format=<format>]
++            [-b <branch-name> | --initial-branch=<branch-name>]
++            [--shared[=<permissions>]] [<directory>]
+not ok 297 - init-db -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2200.9 'update from a subdirectory': 
-	(
-		cd dir1 &&
-		echo more >sub2 &&
-		git add -u sub2
-	)
+expecting success of 0450.298 'interpret-trailers -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 298 - interpret-trailers -h output has no \t
 
-ok 9 - update from a subdirectory
+expecting success of 0450.299 'interpret-trailers -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 299 - interpret-trailers -h output has dashed labels
 
-expecting success of 2200.10 'change gets noticed': 
-	git diff-files --name-status dir1 >out &&
-	test_must_be_empty out
+expecting success of 0450.300 'interpret-trailers -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 300 - interpret-trailers -h output has consistent spacing
 
-ok 10 - change gets noticed
+expecting success of 0450.301 'interpret-trailers *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 301 - interpret-trailers *.txt SYNOPSIS has dashed labels
 
-expecting success of 2200.11 'non-qualified update in subdir updates from the root': 
-	(
-		cd dir1 &&
-		echo even more >>sub2 &&
-		git --literal-pathspecs add -u &&
-		echo even more >>sub2 &&
-		git add -u
-	) &&
-	git diff-files --name-only >actual &&
-	test_must_be_empty actual
+expecting success of 0450.302 'interpret-trailers -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 11 - non-qualified update in subdir updates from the root
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 302 - interpret-trailers -h output and SYNOPSIS agree
 
-expecting success of 2200.12 'replace a file with a symlink': 
+expecting success of 0450.303 'log -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 303 - log -h output has no \t
 
-	rm foo &&
-	test_ln_s_add top foo
+expecting success of 0450.304 'log -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 304 - log -h output has dashed labels
 
+expecting success of 0450.305 'log -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 305 - log -h output has consistent spacing
 
-checking prerequisite: SYMLINKS
+expecting success of 0450.306 'log *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 306 - log *.txt SYNOPSIS has dashed labels
 
-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
+checking known breakage of 0450.307 'log -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-)
-prerequisite SYMLINKS ok
-ok 12 - replace a file with a symlink
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:54.498677808 +0000
++++ help	2026-03-14 13:26:54.542677808 +0000
+@@ -1 +1,2 @@
+ git log [<options>] [<revision-range>] [[--] <path>...]
++git show [<options>] <object>...
+not ok 307 - log -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2200.13 'add everything changed': 
+expecting success of 0450.308 'ls-files -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 308 - ls-files -h output has no \t
 
-	git add -u &&
-	git diff-files >out &&
-	test_must_be_empty out
+expecting success of 0450.309 'ls-files -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 309 - ls-files -h output has dashed labels
 
+expecting success of 0450.310 'ls-files -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 310 - ls-files -h output has consistent spacing
 
-ok 13 - add everything changed
+expecting success of 0450.311 'ls-files *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 311 - ls-files *.txt SYNOPSIS has dashed labels
 
-expecting success of 2200.14 'touch and then add -u': 
+checking known breakage of 0450.312 'ls-files -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	touch check &&
-	git add -u &&
-	git diff-files >out &&
-	test_must_be_empty out
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:55.014677808 +0000
++++ help	2026-03-14 13:26:55.074677808 +0000
+@@ -1,13 +1 @@
+-git ls-files [-z] [-t] [-v] [-f]
+-             [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
+-             [-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
+-             [--resolve-undo]
+-             [--directory [--no-empty-directory]] [--eol]
+-             [--deduplicate]
+-             [-x <pattern>|--exclude=<pattern>]
+-             [-X <file>|--exclude-from=<file>]
+-             [--exclude-per-directory=<file>]
+-             [--exclude-standard]
+-             [--error-unmatch] [--with-tree=<tree-ish>]
+-             [--full-name] [--recurse-submodules]
+-             [--abbrev[=<n>]] [--format=<format>] [--] [<file>...]
++git ls-files [<options>] [<file>...]
+not ok 312 - ls-files -h output and SYNOPSIS agree # TODO known breakage
 
+expecting success of 0450.313 'ls-remote -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 313 - ls-remote -h output has no \t
 
-ok 14 - touch and then add -u
+expecting success of 0450.314 'ls-remote -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 314 - ls-remote -h output has dashed labels
 
-expecting success of 2200.15 'touch and then add explicitly': 
+expecting success of 0450.315 'ls-remote -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 315 - ls-remote -h output has consistent spacing
 
-	touch check &&
-	git add check &&
-	git diff-files >out &&
-	test_must_be_empty out
+expecting success of 0450.316 'ls-remote *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 316 - ls-remote *.txt SYNOPSIS has dashed labels
 
+expecting success of 0450.317 'ls-remote -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 15 - touch and then add explicitly
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 317 - ls-remote -h output and SYNOPSIS agree
 
-expecting success of 2200.16 'add -n -u should not add but just report': 
+expecting success of 0450.318 'ls-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 318 - ls-tree -h output has no \t
 
-	(
-		echo "add 'check'" &&
-		echo "remove 'top'"
-	) >expect &&
-	before=$(git ls-files -s check top) &&
-	git count-objects -v >objects_before &&
-	echo changed >>check &&
-	rm -f top &&
-	git add -n -u >actual &&
-	after=$(git ls-files -s check top) &&
-	git count-objects -v >objects_after &&
+expecting success of 0450.319 'ls-tree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 319 - ls-tree -h output has dashed labels
 
-	test "$before" = "$after" &&
-	test_cmp objects_before objects_after &&
-	test_cmp expect actual
+expecting success of 0450.320 'ls-tree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 320 - ls-tree -h output has consistent spacing
 
+expecting success of 0450.321 'ls-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 321 - ls-tree *.txt SYNOPSIS has dashed labels
 
-ok 16 - add -n -u should not add but just report
+checking known breakage of 0450.322 'ls-tree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2200.17 'add -u resolves unmerged paths': 
-	git reset --hard &&
-	one=$(echo 1 | git hash-object -w --stdin) &&
-	two=$(echo 2 | git hash-object -w --stdin) &&
-	three=$(echo 3 | git hash-object -w --stdin) &&
-	{
-		for path in path1 path2
-		do
-			echo "100644 $one 1	$path" &&
-			echo "100644 $two 2	$path" &&
-			echo "100644 $three 3	$path" || return 1
-		done &&
-		echo "100644 $one 1	path3" &&
-		echo "100644 $one 1	path4" &&
-		echo "100644 $one 3	path5" &&
-		echo "100644 $one 3	path6"
-	} |
-	git update-index --index-info &&
-	echo 3 >path1 &&
-	echo 2 >path3 &&
-	echo 2 >path5 &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:56.122677808 +0000
++++ help	2026-03-14 13:26:56.182677808 +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>]
+-            <tree-ish> [<path>...]
++git ls-tree [<options>] <tree-ish> [<path>...]
+not ok 322 - ls-tree -h output and SYNOPSIS agree # TODO known breakage
 
-	# Fail to explicitly resolve removed paths with "git add"
-	test_must_fail git add --no-all path4 &&
-	test_must_fail git add --no-all path6 &&
+expecting success of 0450.323 'mailinfo -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 323 - mailinfo -h output has no \t
 
-	# "add -u" should notice removals no matter what stages
-	# the index entries are in.
-	git add -u &&
-	git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
-	{
-		echo "100644 $three 0	path1" &&
-		echo "100644 $two 0	path3" &&
-		echo "100644 $two 0	path5"
-	} >expect &&
-	test_cmp expect actual
+expecting success of 0450.324 'mailinfo -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 324 - mailinfo -h output has dashed labels
 
-HEAD is now at ec46c19 initial
-fatal: unable to stat 'path4': No such file or directory
-fatal: unable to stat 'path6': No such file or directory
-ok 17 - add -u resolves unmerged paths
+expecting success of 0450.325 'mailinfo -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 325 - mailinfo -h output has consistent spacing
 
-expecting success of 2200.18 '"add -u non-existent" should fail': 
-	test_must_fail git add -u non-existent &&
-	git ls-files >actual &&
-	! grep "non-existent" actual
+expecting success of 0450.326 'mailinfo *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 326 - mailinfo *.txt SYNOPSIS has dashed labels
 
-fatal: pathspec 'non-existent' did not match any files
-ok 18 - "add -u non-existent" should fail
+checking known breakage of 0450.327 'mailinfo -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2200.19 '"commit -a" implies "add -u" if index becomes empty': 
-	git rm -rf \* &&
-	git commit -m clean-slate &&
-	test_commit file1 &&
-	rm file1.t &&
-	test_tick &&
-	git commit -a -m remove &&
-	git ls-tree HEAD: >out &&
-	test_must_be_empty out
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:56.658677808 +0000
++++ help	2026-03-14 13:26:56.718677808 +0000
+@@ -1,3 +1 @@
+-git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n]
+-             [--[no-]scissors] [--quoted-cr=<action>]
+-             <msg> <patch>
++git mailinfo [<options>] <msg> <patch> < mail >info
+not ok 327 - mailinfo -h output and SYNOPSIS agree # TODO known breakage
 
-rm 'check'
-rm 'dir1/sub1'
-rm 'dir1/sub2'
-rm 'dir2/sub3'
-rm 'foo'
-rm 'path1'
-rm 'path3'
-rm 'path5'
-rm 'top'
-[master 592864c] clean-slate
- Author: A U Thor <author@example.com>
- 6 files changed, 6 deletions(-)
- delete mode 100644 check
- delete mode 100644 dir1/sub1
- delete mode 100644 dir1/sub2
- delete mode 100644 dir2/sub3
- delete mode 100644 foo
- delete mode 100644 top
-[master d0c715a] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-[master 4eab7cc] remove
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1.t
-ok 19 - "commit -a" implies "add -u" if index becomes empty
+expecting success of 0450.328 'mailsplit -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 328 - mailsplit -h output has no \t
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2108-update-index-refresh-racy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2108-update-index-refresh-racy/.git/
-expecting success of 2108.1 'setup': 
-	reset_files &&
-	# we are calling reset_files() a couple of times during tests;
-	# test-tool chmtime does not change the ctime; to not weaken
-	# or even break our tests, disable ctime-checks entirely
-	git config core.trustctime false &&
-	git add file other &&
-	git commit -m "initial import"
+expecting success of 0450.329 'mailsplit -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 329 - mailsplit -h output has dashed labels
 
-[master (root-commit) 4c25839] initial import
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 other
-ok 1 - setup
+expecting success of 0450.330 'mailsplit -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 330 - mailsplit -h output has consistent spacing
 
-expecting success of 2108.2 '--refresh has no racy timestamps to fix': 
-	reset_files &&
-	# set the index time far enough to the future;
-	# it must be at least 3 seconds for VFAT
-	test_set_magic_mtime .git/index +60 &&
-	git update-index --refresh &&
-	test_is_magic_mtime .git/index +60
+expecting success of 0450.331 'mailsplit *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 331 - mailsplit *.txt SYNOPSIS has dashed labels
 
-ok 2 - --refresh has no racy timestamps to fix
+checking known breakage of 0450.332 'mailsplit -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2108.3 '--refresh should fix racy timestamp': 
-	reset_files &&
-	update_assert_changed --refresh
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:57.202677808 +0000
++++ help	2026-03-14 13:26:57.274677808 +0000
+@@ -1,2 +1 @@
+-git mailsplit [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]
+-              -o<directory> [--] [(<mbox>|<Maildir>)...]
++git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]
+not ok 332 - mailsplit -h output and SYNOPSIS agree # TODO known breakage
 
---- .git/test-mtime-expect	2025-02-09 06:53:48.825616555 +0000
-+++ .git/test-mtime-actual	2025-02-09 06:53:48.829616580 +0000
-@@ -1 +1 @@
--1234567890
-+1739084028
-ok 3 - --refresh should fix racy timestamp
+expecting success of 0450.333 'maintenance -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 333 - maintenance -h output has no \t
 
-expecting success of 2108.4 '--really-refresh should fix racy timestamp': 
-	reset_files &&
-	update_assert_changed --really-refresh
+expecting success of 0450.334 'maintenance -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 334 - maintenance -h output has dashed labels
 
---- .git/test-mtime-expect	2025-02-09 06:53:48.913617115 +0000
-+++ .git/test-mtime-actual	2025-02-09 06:53:48.917617140 +0000
-@@ -1 +1 @@
--1234567890
-+1739084028
-ok 4 - --really-refresh should fix racy timestamp
+expecting success of 0450.335 'maintenance -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 335 - maintenance -h output has consistent spacing
 
-expecting success of 2108.5 '--refresh should fix racy timestamp if other file needs update': 
-	reset_files &&
-	echo content2 >other &&
-	test_set_magic_mtime other &&
-	update_assert_changed --refresh
+expecting success of 0450.336 'maintenance *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 336 - maintenance *.txt SYNOPSIS has dashed labels
 
-other: needs update
---- .git/test-mtime-expect	2025-02-09 06:53:48.989617598 +0000
-+++ .git/test-mtime-actual	2025-02-09 06:53:48.989617598 +0000
-@@ -1 +1 @@
--1234567890
-+1739084028
-ok 5 - --refresh should fix racy timestamp if other file needs update
+checking known breakage of 0450.337 'maintenance -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2108.6 '--refresh should fix racy timestamp if racy file needs update': 
-	reset_files &&
-	echo content2 >file &&
-	test_set_magic_mtime file &&
-	update_assert_changed --refresh
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:57.694677808 +0000
++++ help	2026-03-14 13:26:57.742677808 +0000
+@@ -1,3 +1 @@
+-git maintenance run [<options>]
+-git maintenance start [--scheduler=<scheduler>]
+-git maintenance (stop|register|unregister) [<options>]
++git maintenance <subcommand> [<options>]
+not ok 337 - maintenance -h output and SYNOPSIS agree # TODO known breakage
 
-file: needs update
---- .git/test-mtime-expect	2025-02-09 06:53:49.065618082 +0000
-+++ .git/test-mtime-actual	2025-02-09 06:53:49.069618107 +0000
-@@ -1 +1 @@
--1234567890
-+1739084029
-ok 6 - --refresh should fix racy timestamp if racy file needs update
+expecting success of 0450.338 'merge -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 338 - merge -h output has no \t
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2300-cd-to-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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" ]
-		)
+expecting success of 0450.339 'merge -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 1 - at physical root
+ok 339 - merge -h output has dashed labels
 
-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" ]
-		)
+expecting success of 0450.340 'merge -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 2 - at physical subdir
+ok 340 - merge -h output has consistent spacing
 
-checking prerequisite: SYMLINKS
+expecting success of 0450.341 'merge *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 341 - merge *.txt SYNOPSIS has dashed labels
 
-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
+checking known breakage of 0450.342 'merge -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-)
-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" ]
-		)
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 3 - at symbolic root
+--- txt	2026-03-14 13:26:58.202677808 +0000
++++ help	2026-03-14 13:26:58.270677808 +0000
+@@ -1,6 +1,3 @@
+-git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
+-          [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
+-          [--[no-]allow-unrelated-histories]
+-          [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]
+-          [--into-name <branch>] [<commit>...]
+-git merge (--continue | --abort | --quit)
++git merge [<options>] [<commit>...]
++git merge --abort
++git merge --continue
+not ok 342 - merge -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2300.4 'at symbolic subdir': 
-		(
-			cd 'subdir-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
+expecting success of 0450.343 'merge-base -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 4 - at symbolic subdir
+ok 343 - merge-base -h output has no \t
 
-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" ]
-		)
+expecting success of 0450.344 'merge-base -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 5 - at internal symbolic subdir
+ok 344 - merge-base -h output has dashed labels
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2205-add-worktree-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/.git/
-expecting success of 2205.1 '1a: setup--config worktree': 
-	mkdir test1 &&
-	(
-	cd test1 &&
-	test_create_repo repo &&
-	git --git-dir="repo/.git" config core.worktree "$(pwd)" &&
+expecting success of 0450.345 'merge-base -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 345 - merge-base -h output has consistent spacing
 
-	mkdir -p outside-tracked outside-untracked &&
-	mkdir -p repo/inside-tracked repo/inside-untracked &&
-	>file-tracked &&
-	>file-untracked &&
-	>outside-tracked/file &&
-	>outside-untracked/file &&
-	>repo/file-tracked &&
-	>repo/file-untracked &&
-	>repo/inside-tracked/file &&
-	>repo/inside-untracked/file &&
+expecting success of 0450.346 'merge-base *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 346 - merge-base *.txt SYNOPSIS has dashed labels
 
-	cat >expect-tracked-unsorted <<-EOF &&
-	../file-tracked
-	../outside-tracked/file
-	file-tracked
-	inside-tracked/file
-	EOF
+expecting success of 0450.347 'merge-base -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	cat >expect-untracked-unsorted <<-EOF &&
-	../file-untracked
-	../outside-untracked/file
-	file-untracked
-	inside-untracked/file
-	EOF
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 347 - merge-base -h output and SYNOPSIS agree
 
-	cat >expect-all-dir-unsorted <<-EOF &&
-	../file-untracked
-	../file-tracked
-	../outside-untracked/
-	../outside-tracked/
-	./
-	EOF
+expecting success of 0450.348 'merge-file -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 348 - merge-file -h output has no \t
 
-	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+expecting success of 0450.349 'merge-file -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 349 - merge-file -h output has dashed labels
 
-	cat >.gitignore <<-EOF
-	.gitignore
-	actual-*
-	expect-*
-	EOF
-	)
+expecting success of 0450.350 'merge-file -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 350 - merge-file -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test1/repo/.git/
-ok 1 - 1a: setup--config worktree
+expecting success of 0450.351 'merge-file *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 351 - merge-file *.txt SYNOPSIS has dashed labels
 
-expecting success of 2205.2 '1b: pre-add all': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-all-unsorted &&
-	sort actual-all-unsorted >actual-all &&
-	sort expect-all-unsorted >expect-all &&
-	test_cmp expect-all actual-all
-	)
+checking known breakage of 0450.352 'merge-file -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 2 - 1b: pre-add all
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:59.386677808 +0000
++++ help	2026-03-14 13:26:59.454677808 +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>]
+-               [--[no-]diff3] [--object-id] <current> <base> <other>
++git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>
+not ok 352 - merge-file -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2205.3 '1c: pre-add dir all': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --directory --exclude-standard "$parent_dir" >actual-all-dir-unsorted &&
-	sort actual-all-dir-unsorted >actual-all &&
-	sort expect-all-dir-unsorted >expect-all &&
-	test_cmp expect-all actual-all
-	)
+expecting success of 0450.353 'merge-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 353 - merge-index -h output has no \t
 
-ok 3 - 1c: pre-add dir all
+expecting success of 0450.354 'merge-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 354 - merge-index -h output has dashed labels
 
-expecting success of 2205.4 '1d: post-add tracked': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	(
-		cd repo &&
-		git add file-tracked &&
-		git add inside-tracked &&
-		git add ../outside-tracked &&
-		git add "$parent_dir/file-tracked" &&
-		git ls-files "$parent_dir" >../actual-tracked-unsorted
-	) &&
-	sort actual-tracked-unsorted >actual-tracked &&
-	sort expect-tracked-unsorted >expect-tracked &&
-	test_cmp expect-tracked actual-tracked
-	)
+expecting success of 0450.355 'merge-index -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 355 - merge-index -h output has consistent spacing
 
-ok 4 - 1d: post-add tracked
+expecting success of 0450.356 'merge-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 356 - merge-index *.txt SYNOPSIS has dashed labels
 
-expecting success of 2205.5 '1e: post-add untracked': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-untracked-unsorted &&
-	sort actual-untracked-unsorted >actual-untracked &&
-	sort expect-untracked-unsorted >expect-untracked &&
-	test_cmp expect-untracked actual-untracked
-	)
+checking known breakage of 0450.357 'merge-index -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-ok 5 - 1e: post-add untracked
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:26:59.902677808 +0000
++++ help	2026-03-14 13:26:59.958677808 +0000
+@@ -1 +1 @@
+-git merge-index [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
++git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])
+not ok 357 - merge-index -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2205.6 '2a: setup--set git-dir': 
-	mkdir test2 &&
-	(
-	cd test2 &&
-	test_create_repo repo &&
-	# create two foreign repositories that should remain untracked
-	test_create_repo repo-outside &&
-	test_create_repo repo/repo-inside &&
+expecting success of 0450.358 'merge-ours -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 358 - merge-ours -h output has no \t
 
-	mkdir -p repo/inside-tracked repo/inside-untracked &&
-	>repo/file-tracked &&
-	>repo/file-untracked &&
-	>repo/inside-tracked/file &&
-	>repo/inside-untracked/file &&
-	>repo-outside/file &&
-	>repo/repo-inside/file &&
+expecting success of 0450.359 'merge-ours -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 359 - merge-ours -h output has dashed labels
 
-	cat >expect-tracked-unsorted <<-EOF &&
-	repo/file-tracked
-	repo/inside-tracked/file
-	EOF
+expecting success of 0450.360 'merge-ours -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 360 - merge-ours -h output has consistent spacing
 
-	cat >expect-untracked-unsorted <<-EOF &&
-	repo/file-untracked
-	repo/inside-untracked/file
-	repo/repo-inside/
-	repo-outside/
-	EOF
+ok 361 # skip merge-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_OURS)
 
-	cat >expect-all-dir-unsorted <<-EOF &&
-	repo/
-	repo-outside/
-	EOF
+ok 362 # skip merge-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_OURS)
 
-	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+expecting success of 0450.363 'merge-recursive -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 363 - merge-recursive -h output has no \t
 
-	cat >.gitignore <<-EOF
-	.gitignore
-	actual-*
-	expect-*
-	EOF
-	)
+expecting success of 0450.364 'merge-recursive -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 364 - merge-recursive -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test2/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test2/repo-outside/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test2/repo/repo-inside/.git/
-ok 6 - 2a: setup--set git-dir
+expecting success of 0450.365 'merge-recursive -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 365 - merge-recursive -h output has consistent spacing
 
-expecting success of 2205.7 '2b: pre-add all': 
-	(
-	cd test2 &&
-	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-all-unsorted &&
-	sort actual-all-unsorted >actual-all &&
-	sort expect-all-unsorted >expect-all &&
-	test_cmp expect-all actual-all
-	)
+ok 366 # skip merge-recursive *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE)
 
-ok 7 - 2b: pre-add all
+ok 367 # skip merge-recursive -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE)
 
-expecting success of 2205.8 '2c: pre-add dir all': 
-	(
-	cd test2 &&
-	git --git-dir=repo/.git ls-files -o --directory --exclude-standard >actual-all-dir-unsorted &&
-	sort actual-all-dir-unsorted >actual-all &&
-	sort expect-all-dir-unsorted >expect-all &&
-	test_cmp expect-all actual-all
-	)
+expecting success of 0450.368 'merge-recursive-ours -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 368 - merge-recursive-ours -h output has no \t
 
-ok 8 - 2c: pre-add dir all
+expecting success of 0450.369 'merge-recursive-ours -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 369 - merge-recursive-ours -h output has dashed labels
 
-expecting success of 2205.9 '2d: post-add tracked': 
-	(
-	cd test2 &&
-	git --git-dir=repo/.git add repo/file-tracked &&
-	git --git-dir=repo/.git add repo/inside-tracked &&
-	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
-	sort actual-tracked-unsorted >actual-tracked &&
-	sort expect-tracked-unsorted >expect-tracked &&
-	test_cmp expect-tracked actual-tracked
-	)
+expecting success of 0450.370 'merge-recursive-ours -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 370 - merge-recursive-ours -h output has consistent spacing
 
-ok 9 - 2d: post-add tracked
+ok 371 # skip merge-recursive-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
 
-expecting success of 2205.10 '2e: post-add untracked': 
-	(
-	cd test2 &&
-	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-untracked-unsorted &&
-	sort actual-untracked-unsorted >actual-untracked &&
-	sort expect-untracked-unsorted >expect-untracked &&
-	test_cmp expect-untracked actual-untracked
-	)
+ok 372 # skip merge-recursive-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
 
-ok 10 - 2e: post-add untracked
+expecting success of 0450.373 'merge-recursive-theirs -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 373 - merge-recursive-theirs -h output has no \t
 
-expecting success of 2205.11 '3a: setup--add repo dir': 
-	mkdir test3 &&
-	(
-	cd test3 &&
-	test_create_repo repo &&
+expecting success of 0450.374 'merge-recursive-theirs -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 374 - merge-recursive-theirs -h output has dashed labels
 
-	mkdir -p repo/inside-tracked repo/inside-ignored &&
-	>repo/file-tracked &&
-	>repo/file-ignored &&
-	>repo/inside-tracked/file &&
-	>repo/inside-ignored/file &&
+expecting success of 0450.375 'merge-recursive-theirs -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 375 - merge-recursive-theirs -h output has consistent spacing
 
-	cat >.gitignore <<-EOF &&
-	.gitignore
-	actual-*
-	expect-*
-	*ignored
-	EOF
+ok 376 # skip merge-recursive-theirs *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
 
-	cat >expect-tracked-unsorted <<-EOF &&
-	repo/file-tracked
-	repo/inside-tracked/file
-	EOF
+ok 377 # skip merge-recursive-theirs -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
 
-	cat >expect-ignored-unsorted <<-EOF
-	repo/file-ignored
-	repo/inside-ignored/
-	.gitignore
-	actual-ignored-unsorted
-	expect-ignored-unsorted
-	expect-tracked-unsorted
-	EOF
-	)
+expecting success of 0450.378 'merge-subtree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 378 - merge-subtree -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test3/repo/.git/
-ok 11 - 3a: setup--add repo dir
+expecting success of 0450.379 'merge-subtree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 379 - merge-subtree -h output has dashed labels
 
-expecting success of 2205.12 '3b: ignored': 
-	(
-	cd test3 &&
-	git --git-dir=repo/.git ls-files -io --directory --exclude-standard >actual-ignored-unsorted &&
-	sort actual-ignored-unsorted >actual-ignored &&
-	sort expect-ignored-unsorted >expect-ignored &&
-	test_cmp expect-ignored actual-ignored
-	)
+expecting success of 0450.380 'merge-subtree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 380 - merge-subtree -h output has consistent spacing
 
-ok 12 - 3b: ignored
+ok 381 # skip merge-subtree *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_SUBTREE)
 
-expecting success of 2205.13 '3c: add repo': 
-	(
-	cd test3 &&
-	git --git-dir=repo/.git add repo &&
-	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
-	sort actual-tracked-unsorted >actual-tracked &&
-	sort expect-tracked-unsorted >expect-tracked &&
-	test_cmp expect-tracked actual-tracked
-	)
+ok 382 # skip merge-subtree -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_SUBTREE)
 
-ok 13 - 3c: add repo
+expecting success of 0450.383 'merge-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 383 - merge-tree -h output has no \t
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2204-add-ignored.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2204-add-ignored/.git/
-expecting success of 2204.1 'setup': 
-	mkdir sub dir dir/sub &&
-	echo sub >.gitignore &&
-	echo ign >>.gitignore &&
-	for p in . sub dir dir/sub
-	do
-		>"$p/ign" &&
-		>"$p/file" || exit 1
-	done
+expecting success of 0450.384 'merge-tree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 384 - merge-tree -h output has dashed labels
 
-ok 1 - setup
+expecting success of 0450.385 'merge-tree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 385 - merge-tree -h output has consistent spacing
 
-expecting success of 2204.2 'no complaints for unignored file': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
+expecting success of 0450.386 'merge-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 2 - no complaints for unignored file
+ok 386 - merge-tree *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.3 'no complaints for unignored dir/file': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
+expecting success of 0450.387 'merge-tree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 3 - no complaints for unignored dir/file
+ok 387 - merge-tree -h output and SYNOPSIS agree
 
-expecting success of 2204.4 'no complaints for unignored dir': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
+expecting success of 0450.388 'mktag -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 4 - no complaints for unignored dir
+ok 388 - mktag -h output has no \t
 
-expecting success of 2204.5 'no complaints for unignored d*': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
+expecting success of 0450.389 'mktag -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 5 - no complaints for unignored d*
+ok 389 - mktag -h output has dashed labels
 
-expecting success of 2204.6 'complaints for ignored ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.390 'mktag -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 6 - complaints for ignored ign
+ok 390 - mktag -h output has consistent spacing
 
-expecting success of 2204.7 'complaints for ignored ign output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.391 'mktag *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 7 - complaints for ignored ign output
+ok 391 - mktag *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.8 'complaints for ignored ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.392 'mktag -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 8 - complaints for ignored ign with unignored file
+ok 392 - mktag -h output and SYNOPSIS agree
 
-expecting success of 2204.9 'complaints for ignored ign with unignored file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.393 'mktree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-hint: Use -f if you really want to add them.
-ok 9 - complaints for ignored ign with unignored file output
+ok 393 - mktree -h output has no \t
 
-expecting success of 2204.10 'complaints for ignored dir/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.394 'mktree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 10 - complaints for ignored dir/ign
+ok 394 - mktree -h output has dashed labels
 
-expecting success of 2204.11 'complaints for ignored dir/ign output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.395 'mktree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-hint: Use -f if you really want to add them.
-ok 11 - complaints for ignored dir/ign output
+ok 395 - mktree -h output has consistent spacing
 
-expecting success of 2204.12 'complaints for ignored dir/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.396 'mktree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 12 - complaints for ignored dir/ign with unignored file
+ok 396 - mktree *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.13 'complaints for ignored dir/ign with unignored file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.397 'mktree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-hint: Use -f if you really want to add them.
-ok 13 - complaints for ignored dir/ign with unignored file output
+ok 397 - mktree -h output and SYNOPSIS agree
 
-expecting success of 2204.14 'complaints for ignored dir/sub': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.398 'multi-pack-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 14 - complaints for ignored dir/sub
+ok 398 - multi-pack-index -h output has no \t
 
-expecting success of 2204.15 'complaints for ignored dir/sub output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.399 'multi-pack-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 15 - complaints for ignored dir/sub output
+ok 399 - multi-pack-index -h output has dashed labels
 
-expecting success of 2204.16 'complaints for ignored dir/sub with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.400 'multi-pack-index -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 16 - complaints for ignored dir/sub with unignored file
+ok 400 - multi-pack-index -h output has consistent spacing
 
-expecting success of 2204.17 'complaints for ignored dir/sub with unignored file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.401 'multi-pack-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 17 - complaints for ignored dir/sub with unignored file output
+ok 401 - multi-pack-index *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.18 'complaints for ignored dir/sub/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+checking known breakage of 0450.402 'multi-pack-index -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 18 - complaints for ignored dir/sub/ign
+--- txt	2026-03-14 13:27:03.794677808 +0000
++++ help	2026-03-14 13:27:03.854677808 +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>]
++git multi-pack-index [<options>] verify
++git multi-pack-index [<options>] expire
++git multi-pack-index [<options>] repack [--batch-size=<size>]
+not ok 402 - multi-pack-index -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2204.19 'complaints for ignored dir/sub/ign output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.403 'mv -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-hint: Use -f if you really want to add them.
-ok 19 - complaints for ignored dir/sub/ign output
+ok 403 - mv -h output has no \t
 
-expecting success of 2204.20 'complaints for ignored dir/sub/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.404 'mv -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 20 - complaints for ignored dir/sub/ign with unignored file
+ok 404 - mv -h output has dashed labels
 
-expecting success of 2204.21 'complaints for ignored dir/sub/ign with unignored file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.405 'mv -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-hint: Use -f if you really want to add them.
-ok 21 - complaints for ignored dir/sub/ign with unignored file output
+ok 405 - mv -h output has consistent spacing
 
-expecting success of 2204.22 'complaints for ignored sub/file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.406 'mv *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 22 - complaints for ignored sub/file
+ok 406 - mv *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.23 'complaints for ignored sub/file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.407 'mv -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-hint: Use -f if you really want to add them.
-ok 23 - complaints for ignored sub/file output
+ok 407 - mv -h output and SYNOPSIS agree
 
-expecting success of 2204.24 'complaints for ignored sub/file with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.408 'name-rev -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 24 - complaints for ignored sub/file with unignored file
+ok 408 - name-rev -h output has no \t
 
-expecting success of 2204.25 'complaints for ignored sub/file with unignored file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.409 'name-rev -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 25 - complaints for ignored sub/file with unignored file output
+ok 409 - name-rev -h output has dashed labels
 
-expecting success of 2204.26 'complaints for ignored sub': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.410 'name-rev -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 26 - complaints for ignored sub
+ok 410 - name-rev -h output has consistent spacing
 
-expecting success of 2204.27 'complaints for ignored sub output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.411 'name-rev *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 27 - complaints for ignored sub output
+ok 411 - name-rev *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.28 'complaints for ignored sub with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+checking known breakage of 0450.412 'name-rev -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 28 - complaints for ignored sub with unignored file
+--- txt	2026-03-14 13:27:04.882677808 +0000
++++ help	2026-03-14 13:27:04.958677808 +0000
+@@ -1,2 +1,3 @@
+-git name-rev [--tags] [--refs=<pattern>]
+-             ( --all | --annotate-stdin | <commit-ish>... )
++git name-rev [<options>] <commit>...
++git name-rev [<options>] --all
++git name-rev [<options>] --annotate-stdin
+not ok 412 - name-rev -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2204.29 'complaints for ignored sub with unignored file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.413 'notes -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-hint: Use -f if you really want to add them.
-ok 29 - complaints for ignored sub with unignored file output
+ok 413 - notes -h output has no \t
 
-expecting success of 2204.30 'complaints for ignored sub/file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.414 'notes -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 30 - complaints for ignored sub/file
+ok 414 - notes -h output has dashed labels
 
-expecting success of 2204.31 'complaints for ignored sub/file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.415 'notes -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-hint: Use -f if you really want to add them.
-ok 31 - complaints for ignored sub/file output
+ok 415 - notes -h output has consistent spacing
 
-expecting success of 2204.32 'complaints for ignored sub/file with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.416 'notes *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 32 - complaints for ignored sub/file with unignored file
+ok 416 - notes *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.33 'complaints for ignored sub/file with unignored file output': 
-		test_grep -e "Use -f if" err
+checking known breakage of 0450.417 'notes -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-hint: Use -f if you really want to add them.
-ok 33 - complaints for ignored sub/file with unignored file output
+--- txt	2026-03-14 13:27:05.446677808 +0000
++++ help	2026-03-14 13:27:05.502677808 +0000
+@@ -1,12 +1,12 @@
+-git notes [list [<object>]]
+-git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
+-git notes copy [-f] ( --stdin | <from-object> [<to-object>] )
+-git notes append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
+-git notes edit [--allow-empty] [<object>] [--[no-]stripspace]
+-git notes show [<object>]
+-git notes merge [-v | -q] [-s <strategy> ] <notes-ref>
++git notes [--ref <notes-ref>] [list [<object>]]
++git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>] [-e]
++git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>
++git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>] [-e]
++git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]
++git notes [--ref <notes-ref>] show [<object>]
++git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>
+ git notes merge --commit [-v | -q]
+ git notes merge --abort [-v | -q]
+-git notes remove [--ignore-missing] [--stdin] [<object>...]
+-git notes prune [-n] [-v]
+-git notes get-ref
++git notes [--ref <notes-ref>] remove [<object>...]
++git notes [--ref <notes-ref>] prune [-n] [-v]
++git notes [--ref <notes-ref>] get-ref
+not ok 417 - notes -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2204.34 'complaints for ignored sub/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.418 'pack-objects -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 34 - complaints for ignored sub/ign
+ok 418 - pack-objects -h output has no \t
 
-expecting success of 2204.35 'complaints for ignored sub/ign output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.419 'pack-objects -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 35 - complaints for ignored sub/ign output
+ok 419 - pack-objects -h output has dashed labels
 
-expecting success of 2204.36 'complaints for ignored sub/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
+expecting success of 0450.420 'pack-objects -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 36 - complaints for ignored sub/ign with unignored file
+ok 420 - pack-objects -h output has consistent spacing
 
-expecting success of 2204.37 'complaints for ignored sub/ign with unignored file output': 
-		test_grep -e "Use -f if" err
+expecting success of 0450.421 'pack-objects *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 37 - complaints for ignored sub/ign with unignored file output
+ok 421 - pack-objects *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.38 'complaints for ignored sub in dir': 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
+checking known breakage of 0450.422 'pack-objects -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 38 - complaints for ignored sub in dir
+--- txt	2026-03-14 13:27:05.998677808 +0000
++++ help	2026-03-14 13:27:06.066677808 +0000
+@@ -1,7 +1,2 @@
+-git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]
+-                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]
+-                 [--local] [--incremental] [--window=<n>] [--depth=<n>]
+-                 [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
+-                 [--cruft] [--cruft-expiration=<time>]
+-                 [--stdout [--filter=<filter-spec>] | <base-name>]
+-                 [--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>
++git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]
++git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]
+not ok 422 - pack-objects -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2204.39 'complaints for ignored sub in dir output': 
-		(
-			cd dir &&
-			test_grep -e "Use -f if" err
-		)
+expecting success of 0450.423 'pack-redundant -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-hint: Use -f if you really want to add them.
-ok 39 - complaints for ignored sub in dir output
+ok 423 - pack-redundant -h output has no \t
 
-expecting success of 2204.40 'complaints for ignored sub/file in dir': 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
+expecting success of 0450.424 'pack-redundant -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 40 - complaints for ignored sub/file in dir
+ok 424 - pack-redundant -h output has dashed labels
 
-expecting success of 2204.41 'complaints for ignored sub/file in dir output': 
-		(
-			cd dir &&
-			test_grep -e "Use -f if" err
-		)
+expecting success of 0450.425 'pack-redundant -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-hint: Use -f if you really want to add them.
-ok 41 - complaints for ignored sub/file in dir output
+ok 425 - pack-redundant -h output has consistent spacing
 
-expecting success of 2204.42 'complaints for ignored sub/ign in dir': 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
+expecting success of 0450.426 'pack-redundant *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 42 - complaints for ignored sub/ign in dir
+ok 426 - pack-redundant *.txt SYNOPSIS has dashed labels
 
-expecting success of 2204.43 'complaints for ignored sub/ign in dir output': 
-		(
-			cd dir &&
-			test_grep -e "Use -f if" err
-		)
+expecting success of 0450.427 'pack-redundant -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-hint: Use -f if you really want to add them.
-ok 43 - complaints for ignored sub/ign in dir output
+ok 427 - pack-redundant -h output and SYNOPSIS agree
 
-expecting success of 2204.44 'complaints for ignored ign in sub': 
-		rm -f .git/index &&
-		(
-			cd sub &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
+expecting success of 0450.428 'pack-refs -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 44 - complaints for ignored ign in sub
+ok 428 - pack-refs -h output has no \t
 
-expecting success of 2204.45 'complaints for ignored ign in sub output': 
-		(
-			cd sub &&
-			test_grep -e "Use -f if" err
-		)
+expecting success of 0450.429 'pack-refs -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 45 - complaints for ignored ign in sub output
+ok 429 - pack-refs -h output has dashed labels
 
-expecting success of 2204.46 'complaints for ignored file in sub': 
-		rm -f .git/index &&
-		(
-			cd sub &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
+expecting success of 0450.430 'pack-refs -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 46 - complaints for ignored file in sub
+ok 430 - pack-refs -h output has consistent spacing
 
-expecting success of 2204.47 'complaints for ignored file in sub output': 
-		(
-			cd sub &&
-			test_grep -e "Use -f if" err
-		)
+expecting success of 0450.431 'pack-refs *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-hint: Use -f if you really want to add them.
-ok 47 - complaints for ignored file in sub output
+ok 431 - pack-refs *.txt SYNOPSIS has dashed labels
 
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1510-repo-setup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/.git/
-expecting success of 1510.1 '#0: nonbare repo, no explicit configuration': 
-	try_repo 0 unset unset unset "" unset \
-		.git "$here/0" "$here/0" "(null)" \
-		.git "$here/0" "$here/0" sub/ 2>message &&
-	test_must_be_empty message
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/0/.git/
-ok 1 - #0: nonbare repo, no explicit configuration
+expecting success of 0450.432 'pack-refs -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.2 '#1: GIT_WORK_TREE without explicit GIT_DIR is accepted': 
-	try_repo 1 "$here" unset unset "" unset \
-		"$here/1/.git" "$here" "$here" 1/ \
-		"$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
-	test_must_be_empty message
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 432 - pack-refs -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/1/.git/
-ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted
+expecting success of 0450.433 'patch-id -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 433 - patch-id -h output has no \t
 
-expecting success of 1510.3 '#2: worktree defaults to cwd with explicit GIT_DIR': 
-	try_repo 2 unset "$here/2/.git" unset "" unset \
-		"$here/2/.git" "$here/2" "$here/2" "(null)" \
-		"$here/2/.git" "$here/2/sub" "$here/2/sub" "(null)"
+expecting success of 0450.434 'patch-id -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 434 - patch-id -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/2/.git/
-ok 3 - #2: worktree defaults to cwd with explicit GIT_DIR
+expecting success of 0450.435 'patch-id -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 435 - patch-id -h output has consistent spacing
 
-expecting success of 1510.4 '#2b: relative GIT_DIR': 
-	try_repo 2b unset ".git" unset "" unset \
-		".git" "$here/2b" "$here/2b" "(null)" \
-		"../.git" "$here/2b/sub" "$here/2b/sub" "(null)"
+expecting success of 0450.436 'patch-id *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 436 - patch-id *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/2b/.git/
-ok 4 - #2b: relative GIT_DIR
+expecting success of 0450.437 'patch-id -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.5 '#3: setup': 
-	setup_repo 3 unset "" unset &&
-	mkdir -p 3/sub/sub 3/wt/sub
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 437 - patch-id -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/3/.git/
-ok 5 - #3: setup
+expecting success of 0450.438 'pickaxe -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 438 - pickaxe -h output has no \t
 
-expecting success of 1510.6 '#3: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.439 'pickaxe -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 439 - pickaxe -h output has dashed labels
 
-expecting success of 1510.7 '#3: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.440 'pickaxe -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 440 - pickaxe -h output has consistent spacing
 
-expecting success of 1510.8 '#3: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+ok 441 # skip pickaxe *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_PICKAXE)
+
+ok 442 # skip pickaxe -h output and SYNOPSIS agree (missing BUILTIN_TXT_PICKAXE)
+
+expecting success of 0450.443 'prune -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree
+ok 443 - prune -h output has no \t
 
-expecting success of 1510.9 '#3: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.444 'prune -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree
+ok 444 - prune -h output has dashed labels
 
-expecting success of 1510.10 '#3: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.445 'prune -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 10 - #3: chdir_to_toplevel uses worktree, not git dir
+ok 445 - prune -h output has consistent spacing
 
-expecting success of 1510.11 '#3: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.446 'prune *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 11 - #3: chdir_to_toplevel uses worktree (from subdir)
+ok 446 - prune *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.12 '#4: core.worktree without GIT_DIR set is accepted': 
-	setup_repo 4 ../sub "" unset &&
-	mkdir -p 4/sub sub &&
-	try_case 4 unset unset \
-		.git "$here/4/sub" "$here/4" "(null)" \
-		"$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
-	test_must_be_empty message
+expecting success of 0450.447 'prune -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/4/.git/
-ok 12 - #4: core.worktree without GIT_DIR set is accepted
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 447 - prune -h output and SYNOPSIS agree
 
-expecting success of 1510.13 '#5: core.worktree + GIT_WORK_TREE is accepted': 
-	# or: you cannot intimidate away the lack of GIT_DIR setting
-	try_repo 5 "$here" unset "$here/5" "" unset \
-		"$here/5/.git" "$here" "$here" 5/ \
-		"$here/5/.git" "$here" "$here" 5/sub/ 2>message &&
-	try_repo 5a .. unset "$here/5a" "" unset \
-		"$here/5a/.git" "$here" "$here" 5a/ \
-		"$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
-	test_must_be_empty message
+expecting success of 0450.448 'prune-packed -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 448 - prune-packed -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/5/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/5a/.git/
-ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted
+expecting success of 0450.449 'prune-packed -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 449 - prune-packed -h output has dashed labels
 
-expecting success of 1510.14 '#6: setting GIT_DIR brings core.worktree to life': 
-	setup_repo 6 "$here/6" "" unset &&
-	try_case 6 unset .git \
-		.git "$here/6" "$here/6" "(null)" &&
-	try_case 6 unset "$here/6/.git" \
-		"$here/6/.git" "$here/6" "$here/6" "(null)" &&
-	try_case 6/sub/sub unset ../../.git \
-		"$here/6/.git" "$here/6" "$here/6" sub/sub/ &&
-	try_case 6/sub/sub unset "$here/6/.git" \
-		"$here/6/.git" "$here/6" "$here/6" sub/sub/
+expecting success of 0450.450 'prune-packed -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 450 - prune-packed -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6/.git/
-ok 14 - #6: setting GIT_DIR brings core.worktree to life
+expecting success of 0450.451 'prune-packed *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 451 - prune-packed *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.15 '#6b: GIT_DIR set, core.worktree relative': 
-	setup_repo 6b .. "" unset &&
-	try_case 6b unset .git \
-		.git "$here/6b" "$here/6b" "(null)" &&
-	try_case 6b unset "$here/6b/.git" \
-		"$here/6b/.git" "$here/6b" "$here/6b" "(null)" &&
-	try_case 6b/sub/sub unset ../../.git \
-		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/ &&
-	try_case 6b/sub/sub unset "$here/6b/.git" \
-		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/
+expecting success of 0450.452 'prune-packed -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6b/.git/
-ok 15 - #6b: GIT_DIR set, core.worktree relative
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 452 - prune-packed -h output and SYNOPSIS agree
 
-expecting success of 1510.16 '#6c: GIT_DIR set, core.worktree=../wt (absolute)': 
-	setup_repo 6c "$here/6c/wt" "" unset &&
-	mkdir -p 6c/wt/sub &&
+expecting success of 0450.453 'pull -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 453 - pull -h output has no \t
 
-	try_case 6c unset .git \
-		.git "$here/6c/wt" "$here/6c" "(null)" &&
-	try_case 6c unset "$here/6c/.git" \
-		"$here/6c/.git" "$here/6c/wt" "$here/6c" "(null)" &&
-	try_case 6c/sub/sub unset ../../.git \
-		../../.git "$here/6c/wt" "$here/6c/sub/sub" "(null)" &&
-	try_case 6c/sub/sub unset "$here/6c/.git" \
-		"$here/6c/.git" "$here/6c/wt" "$here/6c/sub/sub" "(null)"
+expecting success of 0450.454 'pull -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 454 - pull -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6c/.git/
-ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute)
+expecting success of 0450.455 'pull -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 455 - pull -h output has consistent spacing
 
-expecting success of 1510.17 '#6d: GIT_DIR set, core.worktree=../wt (relative)': 
-	setup_repo 6d "$here/6d/wt" "" unset &&
-	mkdir -p 6d/wt/sub &&
+expecting success of 0450.456 'pull *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 456 - pull *.txt SYNOPSIS has dashed labels
 
-	try_case 6d unset .git \
-		.git "$here/6d/wt" "$here/6d" "(null)" &&
-	try_case 6d unset "$here/6d/.git" \
-		"$here/6d/.git" "$here/6d/wt" "$here/6d" "(null)" &&
-	try_case 6d/sub/sub unset ../../.git \
-		../../.git "$here/6d/wt" "$here/6d/sub/sub" "(null)" &&
-	try_case 6d/sub/sub unset "$here/6d/.git" \
-		"$here/6d/.git" "$here/6d/wt" "$here/6d/sub/sub" "(null)"
+expecting success of 0450.457 'pull -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6d/.git/
-ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative)
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 457 - pull -h output and SYNOPSIS agree
 
-expecting success of 1510.18 '#6e: GIT_DIR set, core.worktree=../.. (absolute)': 
-	setup_repo 6e "$here" "" unset &&
-	try_case 6e unset .git \
-		"$here/6e/.git" "$here" "$here" 6e/ &&
-	try_case 6e unset "$here/6e/.git" \
-		"$here/6e/.git" "$here" "$here" 6e/ &&
-	try_case 6e/sub/sub unset ../../.git \
-		"$here/6e/.git" "$here" "$here" 6e/sub/sub/ &&
-	try_case 6e/sub/sub unset "$here/6e/.git" \
-		"$here/6e/.git" "$here" "$here" 6e/sub/sub/
+expecting success of 0450.458 'push -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 458 - push -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6e/.git/
-ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute)
+expecting success of 0450.459 'push -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 459 - push -h output has dashed labels
 
-expecting success of 1510.19 '#6f: GIT_DIR set, core.worktree=../.. (relative)': 
-	setup_repo 6f ../../ "" unset &&
-	try_case 6f unset .git \
-		"$here/6f/.git" "$here" "$here" 6f/ &&
-	try_case 6f unset "$here/6f/.git" \
-		"$here/6f/.git" "$here" "$here" 6f/ &&
-	try_case 6f/sub/sub unset ../../.git \
-		"$here/6f/.git" "$here" "$here" 6f/sub/sub/ &&
-	try_case 6f/sub/sub unset "$here/6f/.git" \
-		"$here/6f/.git" "$here" "$here" 6f/sub/sub/
+expecting success of 0450.460 'push -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 460 - push -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6f/.git/
-ok 19 - #6f: GIT_DIR set, core.worktree=../.. (relative)
+expecting success of 0450.461 'push *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 461 - push *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.20 '#7: setup': 
-	setup_repo 7 non-existent "" unset &&
-	mkdir -p 7/sub/sub 7/wt/sub
+checking known breakage of 0450.462 'push -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/7/.git/
-ok 20 - #7: setup
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:10.126677808 +0000
++++ help	2026-03-14 13:27:10.178677808 +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]
+-         [-u | --set-upstream] [-o <string> | --push-option=<string>]
+-         [--[no-]signed|--signed=(true|false|if-asked)]
+-         [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
+-         [--no-verify] [<repository> [<refspec>...]]
++git push [<options>] [<repository> [<refspec>...]]
+not ok 462 - push -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1510.21 '#7: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.463 'range-diff -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 21 - #7: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 463 - range-diff -h output has no \t
 
-expecting success of 1510.22 '#7: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.464 'range-diff -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 22 - #7: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 464 - range-diff -h output has dashed labels
 
-expecting success of 1510.23 '#7: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.465 'range-diff -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 23 - #7: explicit GIT_WORK_TREE from parent of worktree
+ok 465 - range-diff -h output has consistent spacing
 
-expecting success of 1510.24 '#7: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.466 'range-diff *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 24 - #7: explicit GIT_WORK_TREE from nephew of worktree
+ok 466 - range-diff *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.25 '#7: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+checking known breakage of 0450.467 'range-diff -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 25 - #7: chdir_to_toplevel uses worktree, not git dir
+--- txt	2026-03-14 13:27:10.682677808 +0000
++++ help	2026-03-14 13:27:10.738677808 +0000
+@@ -1,6 +1,3 @@
+-git range-diff [--color=[<when>]] [--no-color] [<diff-options>]
+-               [--no-dual-color] [--creation-factor=<factor>]
+-               [--left-only | --right-only] [--diff-merges=<format>]
+-               [--remerge-diff]
+-               ( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )
+-               [[--] <path>...]
++git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>
++git range-diff [<options>] <old-tip>...<new-tip>
++git range-diff [<options>] <base> <old-tip> <new-tip>
+not ok 467 - range-diff -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1510.26 '#7: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.468 'read-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 26 - #7: chdir_to_toplevel uses worktree (from subdir)
+ok 468 - read-tree -h output has no \t
 
-expecting success of 1510.27 '#8: gitfile, easy case': 
-	try_repo 8 unset unset unset gitfile unset \
-		"$here/8.git" "$here/8" "$here/8" "(null)" \
-		"$here/8.git" "$here/8" "$here/8" sub/
+expecting success of 0450.469 'read-tree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 469 - read-tree -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/8/.git/
-ok 27 - #8: gitfile, easy case
+expecting success of 0450.470 'read-tree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 470 - read-tree -h output has consistent spacing
 
-expecting success of 1510.28 '#9: GIT_WORK_TREE accepted with gitfile': 
-	mkdir -p 9/wt &&
-	try_repo 9 wt unset unset gitfile unset \
-		"$here/9.git" "$here/9/wt" "$here/9" "(null)" \
-		"$here/9.git" "$here/9/sub/wt" "$here/9/sub" "(null)" 2>message &&
-	test_must_be_empty message
+expecting success of 0450.471 'read-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 471 - read-tree *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/9/.git/
-ok 28 - #9: GIT_WORK_TREE accepted with gitfile
+expecting success of 0450.472 'read-tree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.29 '#10: GIT_DIR can point to gitfile': 
-	try_repo 10 unset "$here/10/.git" unset gitfile unset \
-		"$here/10.git" "$here/10" "$here/10" "(null)" \
-		"$here/10.git" "$here/10/sub" "$here/10/sub" "(null)"
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 472 - read-tree -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/10/.git/
-ok 29 - #10: GIT_DIR can point to gitfile
+expecting success of 0450.473 'rebase -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 473 - rebase -h output has no \t
 
-expecting success of 1510.30 '#10b: relative GIT_DIR can point to gitfile': 
-	try_repo 10b unset .git unset gitfile unset \
-		"$here/10b.git" "$here/10b" "$here/10b" "(null)" \
-		"$here/10b.git" "$here/10b/sub" "$here/10b/sub" "(null)"
+expecting success of 0450.474 'rebase -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 474 - rebase -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/10b/.git/
-ok 30 - #10b: relative GIT_DIR can point to gitfile
+expecting success of 0450.475 'rebase -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 475 - rebase -h output has consistent spacing
 
-expecting success of 1510.31 '#11: setup': 
-	setup_repo 11 unset gitfile unset &&
-	mkdir -p 11/sub/sub 11/wt/sub
+expecting success of 0450.476 'rebase *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 476 - rebase *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/11/.git/
-ok 31 - #11: setup
+checking known breakage of 0450.477 'rebase -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.32 '#11: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 32 - #11: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+--- txt	2026-03-14 13:27:11.826677808 +0000
++++ help	2026-03-14 13:27:11.886677808 +0000
+@@ -1,5 +1,3 @@
+-git rebase [-i | --interactive] [<options>] [--exec <cmd>]
+-           [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+-git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
+-           --root [<branch>]
+-git rebase (--continue|--skip|--abort|--quit|--edit-todo|--show-current-patch)
++git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
++git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
++git rebase --continue | --abort | --skip | --edit-todo
+not ok 477 - rebase -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1510.33 '#11: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.478 'receive-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 33 - #11: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 478 - receive-pack -h output has no \t
 
-expecting success of 1510.34 '#11: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.479 'receive-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 34 - #11: explicit GIT_WORK_TREE from parent of worktree
+ok 479 - receive-pack -h output has dashed labels
 
-expecting success of 1510.35 '#11: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.480 'receive-pack -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 35 - #11: explicit GIT_WORK_TREE from nephew of worktree
+ok 480 - receive-pack -h output has consistent spacing
 
-expecting success of 1510.36 '#11: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.481 'receive-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 36 - #11: chdir_to_toplevel uses worktree, not git dir
+ok 481 - receive-pack *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.37 '#11: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 37 - #11: chdir_to_toplevel uses worktree (from subdir)
+expecting success of 0450.482 'receive-pack -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.38 '#12: core.worktree with gitfile is accepted': 
-	try_repo 12 unset unset "$here/12" gitfile unset \
-		"$here/12.git" "$here/12" "$here/12" "(null)" \
-		"$here/12.git" "$here/12" "$here/12" sub/ 2>message &&
-	test_must_be_empty message
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 482 - receive-pack -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/12/.git/
-ok 38 - #12: core.worktree with gitfile is accepted
+expecting success of 0450.483 'reflog -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 483 - reflog -h output has no \t
 
-expecting success of 1510.39 '#13: core.worktree+GIT_WORK_TREE accepted (with gitfile)': 
-	# or: you cannot intimidate away the lack of GIT_DIR setting
-	try_repo 13 non-existent-too unset non-existent gitfile unset \
-		"$here/13.git" "$here/13/non-existent-too" "$here/13" "(null)" \
-		"$here/13.git" "$here/13/sub/non-existent-too" "$here/13/sub" "(null)" 2>message &&
-	test_must_be_empty message
+expecting success of 0450.484 'reflog -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 484 - reflog -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/13/.git/
-ok 39 - #13: core.worktree+GIT_WORK_TREE accepted (with gitfile)
+expecting success of 0450.485 'reflog -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 485 - reflog -h output has consistent spacing
 
-expecting success of 1510.40 '#14: core.worktree with GIT_DIR pointing to gitfile': 
-	setup_repo 14 "$here/14" gitfile unset &&
-	try_case 14 unset .git \
-		"$here/14.git" "$here/14" "$here/14" "(null)" &&
-	try_case 14 unset "$here/14/.git" \
-		"$here/14.git" "$here/14" "$here/14" "(null)" &&
-	try_case 14/sub/sub unset ../../.git \
-		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
-	try_case 14/sub/sub unset "$here/14/.git" \
-		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
+expecting success of 0450.486 'reflog *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 486 - reflog *.txt SYNOPSIS has dashed labels
 
-	setup_repo 14c "$here/14c/wt" gitfile unset &&
-	mkdir -p 14c/wt/sub &&
+expecting success of 0450.487 'reflog -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	try_case 14c unset .git \
-		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
-	try_case 14c unset "$here/14c/.git" \
-		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
-	try_case 14c/sub/sub unset ../../.git \
-		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
-	try_case 14c/sub/sub unset "$here/14c/.git" \
-		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 487 - reflog -h output and SYNOPSIS agree
 
-	setup_repo 14d "$here/14d/wt" gitfile unset &&
-	mkdir -p 14d/wt/sub &&
+expecting success of 0450.488 'refs -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 488 - refs -h output has no \t
 
-	try_case 14d unset .git \
-		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
-	try_case 14d unset "$here/14d/.git" \
-		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
-	try_case 14d/sub/sub unset ../../.git \
-		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
-	try_case 14d/sub/sub unset "$here/14d/.git" \
-		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
+expecting success of 0450.489 'refs -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 489 - refs -h output has dashed labels
 
-	setup_repo 14e "$here" gitfile unset &&
-	try_case 14e unset .git \
-		"$here/14e.git" "$here" "$here" 14e/ &&
-	try_case 14e unset "$here/14e/.git" \
-		"$here/14e.git" "$here" "$here" 14e/ &&
-	try_case 14e/sub/sub unset ../../.git \
-		"$here/14e.git" "$here" "$here" 14e/sub/sub/ &&
-	try_case 14e/sub/sub unset "$here/14e/.git" \
-		"$here/14e.git" "$here" "$here" 14e/sub/sub/
+expecting success of 0450.490 'refs -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 490 - refs -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14c/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14d/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14e/.git/
-ok 40 - #14: core.worktree with GIT_DIR pointing to gitfile
+expecting success of 0450.491 'refs *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 491 - refs *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.41 '#14b: core.worktree is relative to actual git dir': 
-	setup_repo 14b ../14b gitfile unset &&
-	try_case 14b unset .git \
-		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
-	try_case 14b unset "$here/14b/.git" \
-		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
-	try_case 14b/sub/sub unset ../../.git \
-		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
-	try_case 14b/sub/sub unset "$here/14b/.git" \
-		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
+expecting success of 0450.492 'refs -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	setup_repo 14f ../ gitfile unset &&
-	try_case 14f unset .git \
-		"$here/14f.git" "$here" "$here" 14f/ &&
-	try_case 14f unset "$here/14f/.git" \
-		"$here/14f.git" "$here" "$here" 14f/ &&
-	try_case 14f/sub/sub unset ../../.git \
-		"$here/14f.git" "$here" "$here" 14f/sub/sub/ &&
-	try_case 14f/sub/sub unset "$here/14f/.git" \
-		"$here/14f.git" "$here" "$here" 14f/sub/sub/
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 492 - refs -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14b/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14f/.git/
-ok 41 - #14b: core.worktree is relative to actual git dir
+expecting success of 0450.493 'remote -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 493 - remote -h output has no \t
 
-expecting success of 1510.42 '#15: setup': 
-	setup_repo 15 non-existent gitfile unset &&
-	mkdir -p 15/sub/sub 15/wt/sub
+expecting success of 0450.494 'remote -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 494 - remote -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/15/.git/
-ok 42 - #15: setup
+expecting success of 0450.495 'remote -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 495 - remote -h output has consistent spacing
 
-expecting success of 1510.43 '#15: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.496 'remote *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 43 - #15: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 496 - remote *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.44 '#15: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+checking known breakage of 0450.497 'remote -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 44 - #15: explicit GIT_WORK_TREE and GIT_DIR in subdir
+--- txt	2026-03-14 13:27:13.978677808 +0000
++++ help	2026-03-14 13:27:14.046677808 +0000
+@@ -1,13 +1,13 @@
+ git remote [-v | --verbose]
+-git remote add [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
++git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>
+ git remote rename [--[no-]progress] <old> <new>
+ git remote remove <name>
+ git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
++git remote [-v | --verbose] show [-n] <name>
++git remote prune [-n | --dry-run] <name>
++git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]
+ git remote set-branches [--add] <name> <branch>...
+ git remote get-url [--push] [--all] <name>
+ git remote set-url [--push] <name> <newurl> [<oldurl>]
+-git remote set-url --add [--push] <name> <newurl>
+-git remote set-url --delete [--push] <name> <URL>
+-git remote [-v | --verbose] 'show' [-n] <name>...
+-git remote prune [-n | --dry-run] <name>...
+-git remote [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
++git remote set-url --add <name> <newurl>
++git remote set-url --delete <name> <url>
+not ok 497 - remote -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1510.45 '#15: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.498 'remote-ext -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 45 - #15: explicit GIT_WORK_TREE from parent of worktree
+ok 498 - remote-ext -h output has no \t
 
-expecting success of 1510.46 '#15: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.499 'remote-ext -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 46 - #15: explicit GIT_WORK_TREE from nephew of worktree
+ok 499 - remote-ext -h output has dashed labels
 
-expecting success of 1510.47 '#15: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.500 'remote-ext -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 47 - #15: chdir_to_toplevel uses worktree, not git dir
+ok 500 - remote-ext -h output has consistent spacing
 
-expecting success of 1510.48 '#15: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.501 'remote-ext *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 48 - #15: chdir_to_toplevel uses worktree (from subdir)
+ok 501 - remote-ext *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.49 '#16a: implicitly bare repo (cwd inside .git dir)': 
-	setup_repo 16a unset "" unset &&
-	mkdir -p 16a/.git/wt/sub &&
+checking known breakage of 0450.502 'remote-ext -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	try_case 16a/.git unset unset \
-		. "(null)" "$here/16a/.git" "(null)" &&
-	try_case 16a/.git/wt unset unset \
-		"$here/16a/.git" "(null)" "$here/16a/.git/wt" "(null)" &&
-	try_case 16a/.git/wt/sub unset unset \
-		"$here/16a/.git" "(null)" "$here/16a/.git/wt/sub" "(null)"
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:14.454677808 +0000
++++ help	2026-03-14 13:27:14.518677808 +0000
+@@ -1 +1 @@
+-git remote add <nick> "ext::<command>[ <arguments>...]"
++git remote-ext <remote> <url>
+not ok 502 - remote-ext -h output and SYNOPSIS agree # TODO known breakage
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16a/.git/
-ok 49 - #16a: implicitly bare repo (cwd inside .git dir)
+expecting success of 0450.503 'remote-fd -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 503 - remote-fd -h output has no \t
 
-expecting success of 1510.50 '#16b: bare .git (cwd inside .git dir)': 
-	setup_repo 16b unset "" true &&
-	mkdir -p 16b/.git/wt/sub &&
+expecting success of 0450.504 'remote-fd -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 504 - remote-fd -h output has dashed labels
 
-	try_case 16b/.git unset unset \
-		. "(null)" "$here/16b/.git" "(null)" &&
-	try_case 16b/.git/wt unset unset \
-		"$here/16b/.git" "(null)" "$here/16b/.git/wt" "(null)" &&
-	try_case 16b/.git/wt/sub unset unset \
-		"$here/16b/.git" "(null)" "$here/16b/.git/wt/sub" "(null)"
+expecting success of 0450.505 'remote-fd -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 505 - remote-fd -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16b/.git/
-ok 50 - #16b: bare .git (cwd inside .git dir)
+expecting success of 0450.506 'remote-fd *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 506 - remote-fd *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.51 '#16c: bare .git has no worktree': 
-	try_repo 16c unset unset unset "" true \
-		.git "(null)" "$here/16c" "(null)" \
-		"$here/16c/.git" "(null)" "$here/16c/sub" "(null)"
+checking known breakage of 0450.507 'remote-fd -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16c/.git/
-ok 51 - #16c: bare .git has no worktree
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:14.970677808 +0000
++++ help	2026-03-14 13:27:15.050677808 +0000
+@@ -0,0 +1 @@
++git remote-fd <remote> <url>
+not ok 507 - remote-fd -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1510.52 '#16d: bareness preserved across alias': 
-	setup_repo 16d unset "" unset &&
-	(
-		cd 16d/.git &&
-		test_must_fail git status &&
-		git config alias.st status &&
-		test_must_fail git st
-	)
+expecting success of 0450.508 'repack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 508 - repack -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16d/.git/
-fatal: this operation must be run in a work tree
-fatal: this operation must be run in a work tree
-ok 52 - #16d: bareness preserved across alias
+expecting success of 0450.509 'repack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 509 - repack -h output has dashed labels
 
-expecting success of 1510.53 '#16e: bareness preserved by --bare': 
-	setup_repo 16e unset "" unset &&
-	(
-		cd 16e/.git &&
-		test_must_fail git status &&
-		test_must_fail git --bare status
-	)
+expecting success of 0450.510 'repack -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 510 - repack -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16e/.git/
-fatal: this operation must be run in a work tree
-fatal: this operation must be run in a work tree
-ok 53 - #16e: bareness preserved by --bare
+expecting success of 0450.511 'repack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 511 - repack *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.54 '#17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)': 
-	# Just like #16.
-	setup_repo 17a unset "" true &&
-	setup_repo 17b unset "" true &&
-	mkdir -p 17a/.git/wt/sub &&
-	mkdir -p 17b/.git/wt/sub &&
+checking known breakage of 0450.512 'repack -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	try_case 17a/.git "$here/17a" unset \
-		"$here/17a/.git" "$here/17a" "$here/17a" .git/ \
-		2>message &&
-	try_case 17a/.git/wt "$here/17a" unset \
-		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/ &&
-	try_case 17a/.git/wt/sub "$here/17a" unset \
-		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/sub/ &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:15.506677808 +0000
++++ help	2026-03-14 13:27:15.574677808 +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>]
+not ok 512 - repack -h output and SYNOPSIS agree # TODO known breakage
 
-	try_case 17b/.git "$here/17b" unset \
-		"$here/17b/.git" "$here/17b" "$here/17b" .git/ &&
-	try_case 17b/.git/wt "$here/17b" unset \
-		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/ &&
-	try_case 17b/.git/wt/sub "$here/17b" unset \
-		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/sub/ &&
+expecting success of 0450.513 'replace -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 513 - replace -h output has no \t
 
-	try_repo 17c "$here/17c" unset unset "" true \
-		.git "$here/17c" "$here/17c" "(null)" \
-		"$here/17c/.git" "$here/17c" "$here/17c" sub/ 2>message &&
-	test_must_be_empty message
+expecting success of 0450.514 'replace -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 514 - replace -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/17a/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/17b/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/17c/.git/
-ok 54 - #17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)
+expecting success of 0450.515 'replace -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 515 - replace -h output has consistent spacing
 
-expecting success of 1510.55 '#18: bare .git named by GIT_DIR has no worktree': 
-	try_repo 18 unset .git unset "" true \
-		.git "(null)" "$here/18" "(null)" \
-		../.git "(null)" "$here/18/sub" "(null)" &&
-	try_repo 18b unset "$here/18b/.git" unset "" true \
-		"$here/18b/.git" "(null)" "$here/18b" "(null)" \
-		"$here/18b/.git" "(null)" "$here/18b/sub" "(null)"
+expecting success of 0450.516 'replace *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 516 - replace *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/18/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/18b/.git/
-ok 55 - #18: bare .git named by GIT_DIR has no worktree
+expecting success of 0450.517 'replace -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.56 '#19: setup': 
-	setup_repo 19 unset "" true &&
-	mkdir -p 19/sub/sub 19/wt/sub
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 517 - replace -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/19/.git/
-ok 56 - #19: setup
+expecting success of 0450.518 'replay -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 518 - replay -h output has no \t
 
-expecting success of 1510.57 '#19: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.519 'replay -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 57 - #19: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 519 - replay -h output has dashed labels
 
-expecting success of 1510.58 '#19: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.520 'replay -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 58 - #19: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 520 - replay -h output has consistent spacing
 
-expecting success of 1510.59 '#19: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.521 'replay *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 59 - #19: explicit GIT_WORK_TREE from parent of worktree
+ok 521 - replay *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.60 '#19: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.522 'replay -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 60 - #19: explicit GIT_WORK_TREE from nephew of worktree
+ok 522 - replay -h output and SYNOPSIS agree
 
-expecting success of 1510.61 '#19: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.523 'rerere -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 61 - #19: chdir_to_toplevel uses worktree, not git dir
+ok 523 - rerere -h output has no \t
 
-expecting success of 1510.62 '#19: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.524 'rerere -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 62 - #19: chdir_to_toplevel uses worktree (from subdir)
+ok 524 - rerere -h output has dashed labels
 
-expecting success of 1510.63 '#20a: core.worktree without GIT_DIR accepted (inside .git)': 
-	# Unlike case #16a.
-	setup_repo 20a "$here/20a" "" unset &&
-	mkdir -p 20a/.git/wt/sub &&
-	try_case 20a/.git unset unset \
-		"$here/20a/.git" "$here/20a" "$here/20a" .git/ 2>message &&
-	try_case 20a/.git/wt unset unset \
-		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/ &&
-	try_case 20a/.git/wt/sub unset unset \
-		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/sub/ &&
-	test_must_be_empty message
+expecting success of 0450.525 'rerere -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 525 - rerere -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/20a/.git/
-ok 63 - #20a: core.worktree without GIT_DIR accepted (inside .git)
+expecting success of 0450.526 'rerere *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 526 - rerere *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.64 '#20b/c: core.worktree and core.bare conflict': 
-	setup_repo 20b non-existent "" true &&
-	mkdir -p 20b/.git/wt/sub &&
-	(
-		cd 20b/.git &&
-		test_must_fail git status >/dev/null
-	) 2>message &&
-	grep "core.bare and core.worktree" message
+expecting success of 0450.527 'rerere -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/20b/.git/
-warning: core.bare and core.worktree do not make sense
-ok 64 - #20b/c: core.worktree and core.bare conflict
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 527 - rerere -h output and SYNOPSIS agree
 
-expecting success of 1510.65 '#20d: core.worktree and core.bare OK when working tree not needed': 
-	setup_repo 20d non-existent "" true &&
-	mkdir -p 20d/.git/wt/sub &&
-	(
-		cd 20d/.git &&
-		git config foo.bar value
-	)
+expecting success of 0450.528 'reset -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 528 - reset -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/20d/.git/
-warning: core.bare and core.worktree do not make sense
-ok 65 - #20d: core.worktree and core.bare OK when working tree not needed
+expecting success of 0450.529 'reset -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 529 - reset -h output has dashed labels
 
-expecting success of 1510.66 '#21: setup, core.worktree warns before overriding core.bare': 
-	setup_repo 21 non-existent "" unset &&
-	mkdir -p 21/.git/wt/sub &&
-	(
-		cd 21/.git &&
-		GIT_WORK_TREE="$here/21" &&
-		export GIT_WORK_TREE &&
-		git status >/dev/null
-	) 2>message &&
-	test_must_be_empty message
+expecting success of 0450.530 'reset -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 530 - reset -h output has consistent spacing
 
+expecting success of 0450.531 'reset *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 531 - reset *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/21/.git/
-ok 66 - #21: setup, core.worktree warns before overriding core.bare
+checking known breakage of 0450.532 'reset -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.67 '#21: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 67 - #21: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+--- txt	2026-03-14 13:27:17.530677808 +0000
++++ help	2026-03-14 13:27:17.582677808 +0000
+@@ -1,4 +1,4 @@
++git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+ git reset [-q] [<tree-ish>] [--] <pathspec>...
+-git reset [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]
+-git reset (--patch | -p) [<tree-ish>] [--] [<pathspec>...]
+-git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]
++git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
++git reset --patch [<tree-ish>] [--] [<pathspec>...]
+not ok 532 - reset -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1510.68 '#21: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.533 'restore -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 68 - #21: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 533 - restore -h output has no \t
 
-expecting success of 1510.69 '#21: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.534 'restore -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 69 - #21: explicit GIT_WORK_TREE from parent of worktree
+ok 534 - restore -h output has dashed labels
 
-expecting success of 1510.70 '#21: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.535 'restore -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 70 - #21: explicit GIT_WORK_TREE from nephew of worktree
+ok 535 - restore -h output has consistent spacing
 
-expecting success of 1510.71 '#21: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.536 'restore *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 71 - #21: chdir_to_toplevel uses worktree, not git dir
+ok 536 - restore *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.72 '#21: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 72 - #21: chdir_to_toplevel uses worktree (from subdir)
+checking known breakage of 0450.537 'restore -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.73 '#22a: core.worktree = GIT_DIR = .git dir': 
-	# like case #6.
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:17.922677808 +0000
++++ help	2026-03-14 13:27:17.974677808 +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]
+-git restore (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]
++git restore [<options>] [--source=<branch>] <file>...
+not ok 537 - restore -h output and SYNOPSIS agree # TODO known breakage
 
-	setup_repo 22a "$here/22a/.git" "" unset &&
-	setup_repo 22ab . "" unset &&
-	mkdir -p 22a/.git/sub 22a/sub &&
-	mkdir -p 22ab/.git/sub 22ab/sub &&
-	try_case 22a/.git unset . \
-		. "$here/22a/.git" "$here/22a/.git" "(null)" &&
-	try_case 22a/.git unset "$here/22a/.git" \
-		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" "(null)" &&
-	try_case 22a/.git/sub unset .. \
-		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
-	try_case 22a/.git/sub unset "$here/22a/.git" \
-		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
+expecting success of 0450.538 'rev-list -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 538 - rev-list -h output has no \t
 
-	try_case 22ab/.git unset . \
-		. "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
-	try_case 22ab/.git unset "$here/22ab/.git" \
-		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
-	try_case 22ab/.git/sub unset .. \
-		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" sub/ &&
-	try_case 22ab/.git unset "$here/22ab/.git" \
-		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)"
+expecting success of 0450.539 'rev-list -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 539 - rev-list -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22a/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22ab/.git/
-ok 73 - #22a: core.worktree = GIT_DIR = .git dir
+expecting success of 0450.540 'rev-list -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 540 - rev-list -h output has consistent spacing
 
-expecting success of 1510.74 '#22b: core.worktree child of .git, GIT_DIR=.git': 
-	setup_repo 22b "$here/22b/.git/wt" "" unset &&
-	setup_repo 22bb wt "" unset &&
-	mkdir -p 22b/.git/sub 22b/sub 22b/.git/wt/sub 22b/wt/sub &&
-	mkdir -p 22bb/.git/sub 22bb/sub 22bb/.git/wt 22bb/wt &&
+expecting success of 0450.541 'rev-list *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 541 - rev-list *.txt SYNOPSIS has dashed labels
 
-	try_case 22b/.git unset . \
-		. "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
-	try_case 22b/.git unset "$here/22b/.git" \
-		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
-	try_case 22b/.git/sub unset .. \
-		.. "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
-	try_case 22b/.git/sub unset "$here/22b/.git" \
-		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
+expecting success of 0450.542 'rev-list -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	try_case 22bb/.git unset . \
-		. "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
-	try_case 22bb/.git unset "$here/22bb/.git" \
-		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
-	try_case 22bb/.git/sub unset .. \
-		.. "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)" &&
-	try_case 22bb/.git/sub unset "$here/22bb/.git" \
-		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)"
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 542 - rev-list -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22b/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22bb/.git/
-ok 74 - #22b: core.worktree child of .git, GIT_DIR=.git
+expecting success of 0450.543 'rev-parse -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 543 - rev-parse -h output has no \t
 
-expecting success of 1510.75 '#22c: core.worktree = .git/.., GIT_DIR=.git': 
-	setup_repo 22c "$here/22c" "" unset &&
-	setup_repo 22cb .. "" unset &&
-	mkdir -p 22c/.git/sub 22c/sub &&
-	mkdir -p 22cb/.git/sub 22cb/sub &&
+expecting success of 0450.544 'rev-parse -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 544 - rev-parse -h output has dashed labels
 
-	try_case 22c/.git unset . \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
-	try_case 22c/.git unset "$here/22c/.git" \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
-	try_case 22c/.git/sub unset .. \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
-	try_case 22c/.git/sub unset "$here/22c/.git" \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
+expecting success of 0450.545 'rev-parse -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 545 - rev-parse -h output has consistent spacing
 
-	try_case 22cb/.git unset . \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
-	try_case 22cb/.git unset "$here/22cb/.git" \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
-	try_case 22cb/.git/sub unset .. \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/ &&
-	try_case 22cb/.git/sub unset "$here/22cb/.git" \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/
+expecting success of 0450.546 'rev-parse *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 546 - rev-parse *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22c/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22cb/.git/
-ok 75 - #22c: core.worktree = .git/.., GIT_DIR=.git
+checking known breakage of 0450.547 'rev-parse -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 1510.76 '#22.2: core.worktree and core.bare conflict': 
-	setup_repo 22 "$here/22" "" true &&
-	(
-		cd 22/.git &&
-		GIT_DIR=. &&
-		export GIT_DIR &&
-		test_must_fail git status 2>result
-	) &&
-	(
-		cd 22 &&
-		GIT_DIR=.git &&
-		export GIT_DIR &&
-		test_must_fail git status 2>result
-	) &&
-	grep "core.bare and core.worktree" 22/.git/result &&
-	grep "core.bare and core.worktree" 22/result
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:18.850677808 +0000
++++ help	2026-03-14 13:27:18.910677808 +0000
+@@ -1 +1,3 @@
+-git rev-parse [<options>] <arg>...
++git rev-parse --parseopt [<options>] -- [<args>...]
++git rev-parse --sq-quote [<arg>...]
++git rev-parse [<options>] [<arg>...]
+not ok 547 - rev-parse -h output and SYNOPSIS agree # TODO known breakage
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22/.git/
-warning: core.bare and core.worktree do not make sense
-warning: core.bare and core.worktree do not make sense
-ok 76 - #22.2: core.worktree and core.bare conflict
+expecting success of 0450.548 'revert -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 548 - revert -h output has no \t
 
-expecting success of 1510.77 '#23: setup': 
-	setup_repo 23 non-existent "" true &&
-	mkdir -p 23/sub/sub 23/wt/sub
+expecting success of 0450.549 'revert -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 549 - revert -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/23/.git/
-ok 77 - #23: setup
+expecting success of 0450.550 'revert -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 550 - revert -h output has consistent spacing
 
-expecting success of 1510.78 '#23: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.551 'revert *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 78 - #23: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 551 - revert *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.79 '#23: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.552 'revert -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 79 - #23: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 552 - revert -h output and SYNOPSIS agree
 
-expecting success of 1510.80 '#23: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.553 'rm -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 80 - #23: explicit GIT_WORK_TREE from parent of worktree
+ok 553 - rm -h output has no \t
 
-expecting success of 1510.81 '#23: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.554 'rm -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 81 - #23: explicit GIT_WORK_TREE from nephew of worktree
+ok 554 - rm -h output has dashed labels
 
-expecting success of 1510.82 '#23: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.555 'rm -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 82 - #23: chdir_to_toplevel uses worktree, not git dir
+ok 555 - rm -h output has consistent spacing
 
-expecting success of 1510.83 '#23: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.556 'rm *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 83 - #23: chdir_to_toplevel uses worktree (from subdir)
+ok 556 - rm *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.84 '#24: bare repo has no worktree (gitfile case)': 
-	try_repo 24 unset unset unset gitfile true \
-		"$here/24.git" "(null)" "$here/24" "(null)" \
-		"$here/24.git" "(null)" "$here/24/sub" "(null)"
+expecting success of 0450.557 'rm -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/24/.git/
-ok 84 - #24: bare repo has no worktree (gitfile case)
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 557 - rm -h output and SYNOPSIS agree
 
-expecting success of 1510.85 '#25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case)': 
-	try_repo 25 "$here/25" unset unset gitfile true \
-		"$here/25.git" "$here/25" "$here/25" "(null)"  \
-		"$here/25.git" "$here/25" "$here/25" "sub/" 2>message &&
-	test_must_be_empty message
+expecting success of 0450.558 'send-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 558 - send-pack -h output has no \t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/25/.git/
-ok 85 - #25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case)
+expecting success of 0450.559 'send-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 559 - send-pack -h output has dashed labels
 
-expecting success of 1510.86 '#26: bare repo has no worktree (GIT_DIR -> gitfile case)': 
-	try_repo 26 unset "$here/26/.git" unset gitfile true \
-		"$here/26.git" "(null)" "$here/26" "(null)" \
-		"$here/26.git" "(null)" "$here/26/sub" "(null)" &&
-	try_repo 26b unset .git unset gitfile true \
-		"$here/26b.git" "(null)" "$here/26b" "(null)" \
-		"$here/26b.git" "(null)" "$here/26b/sub" "(null)"
+expecting success of 0450.560 'send-pack -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 560 - send-pack -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/26/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/26b/.git/
-ok 86 - #26: bare repo has no worktree (GIT_DIR -> gitfile case)
+expecting success of 0450.561 'send-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 561 - send-pack *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.87 '#27: setup': 
-	setup_repo 27 unset gitfile true &&
-	mkdir -p 27/sub/sub 27/wt/sub
+expecting success of 0450.562 'send-pack -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/27/.git/
-ok 87 - #27: setup
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 562 - send-pack -h output and SYNOPSIS agree
 
-expecting success of 1510.88 '#27: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.563 'shortlog -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 88 - #27: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 563 - shortlog -h output has no \t
 
-expecting success of 1510.89 '#27: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.564 'shortlog -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 89 - #27: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 564 - shortlog -h output has dashed labels
 
-expecting success of 1510.90 '#27: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.565 'shortlog -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 90 - #27: explicit GIT_WORK_TREE from parent of worktree
+ok 565 - shortlog -h output has consistent spacing
 
-expecting success of 1510.91 '#27: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.566 'shortlog *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 91 - #27: explicit GIT_WORK_TREE from nephew of worktree
+ok 566 - shortlog *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.92 '#27: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.567 'shortlog -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 92 - #27: chdir_to_toplevel uses worktree, not git dir
+ok 567 - shortlog -h output and SYNOPSIS agree
 
-expecting success of 1510.93 '#27: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.568 'show -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 93 - #27: chdir_to_toplevel uses worktree (from subdir)
+ok 568 - show -h output has no \t
 
-expecting success of 1510.94 '#28: core.worktree and core.bare conflict (gitfile case)': 
-	setup_repo 28 "$here/28" gitfile true &&
-	(
-		cd 28 &&
-		test_must_fail git status
-	) 2>message &&
-	grep "core.bare and core.worktree" message
+expecting success of 0450.569 'show -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 569 - show -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/28/.git/
-warning: core.bare and core.worktree do not make sense
-ok 94 - #28: core.worktree and core.bare conflict (gitfile case)
+expecting success of 0450.570 'show -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 570 - show -h output has consistent spacing
 
-expecting success of 1510.95 '#29: setup': 
-	setup_repo 29 non-existent gitfile true &&
-	mkdir -p 29/sub/sub 29/wt/sub &&
-	(
-		cd 29 &&
-		GIT_WORK_TREE="$here/29" &&
-		export GIT_WORK_TREE &&
-		git status
-	) 2>message &&
-	test_must_be_empty message
+expecting success of 0450.571 'show *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 571 - show *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/29/.git/
-On branch master
+checking known breakage of 0450.572 'show -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-No commits yet
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:21.698677808 +0000
++++ help	2026-03-14 13:27:21.754677808 +0000
+@@ -1 +1,2 @@
+-git show [<options>] [<object>...]
++git log [<options>] [<revision-range>] [[--] <path>...]
++git show [<options>] <object>...
+not ok 572 - show -h output and SYNOPSIS agree # TODO known breakage
 
-nothing to commit (create/copy files and use "git add" to track)
-ok 95 - #29: setup
+expecting success of 0450.573 'show-branch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 573 - show-branch -h output has no \t
 
-expecting success of 1510.96 '#29: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.574 'show-branch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 96 - #29: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 574 - show-branch -h output has dashed labels
 
-expecting success of 1510.97 '#29: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.575 'show-branch -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 97 - #29: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 575 - show-branch -h output has consistent spacing
 
-expecting success of 1510.98 '#29: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.576 'show-branch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 98 - #29: explicit GIT_WORK_TREE from parent of worktree
+ok 576 - show-branch *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.99 '#29: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.577 'show-branch -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 99 - #29: explicit GIT_WORK_TREE from nephew of worktree
+ok 577 - show-branch -h output and SYNOPSIS agree
 
-expecting success of 1510.100 '#29: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.578 'show-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 100 - #29: chdir_to_toplevel uses worktree, not git dir
+ok 578 - show-index -h output has no \t
 
-expecting success of 1510.101 '#29: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.579 'show-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 101 - #29: chdir_to_toplevel uses worktree (from subdir)
+ok 579 - show-index -h output has dashed labels
 
-expecting success of 1510.102 '#30: core.worktree and core.bare conflict (gitfile version)': 
-	# Just like case #22.
-	setup_repo 30 "$here/30" gitfile true &&
-	(
-		cd 30 &&
-		test_must_fail env GIT_DIR=.git git status 2>result
-	) &&
-	grep "core.bare and core.worktree" 30/result
+expecting success of 0450.580 'show-index -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 580 - show-index -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/30/.git/
-warning: core.bare and core.worktree do not make sense
-ok 102 - #30: core.worktree and core.bare conflict (gitfile version)
+expecting success of 0450.581 'show-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 581 - show-index *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.103 '#31: setup': 
-	setup_repo 31 non-existent gitfile true &&
-	mkdir -p 31/sub/sub 31/wt/sub
+expecting success of 0450.582 'show-index -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/31/.git/
-ok 103 - #31: setup
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 582 - show-index -h output and SYNOPSIS agree
 
-expecting success of 1510.104 '#31: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+expecting success of 0450.583 'show-ref -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 104 - #31: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+ok 583 - show-ref -h output has no \t
 
-expecting success of 1510.105 '#31: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+expecting success of 0450.584 'show-ref -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 105 - #31: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 584 - show-ref -h output has dashed labels
 
-expecting success of 1510.106 '#31: explicit GIT_WORK_TREE from parent of worktree': 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+expecting success of 0450.585 'show-ref -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 106 - #31: explicit GIT_WORK_TREE from parent of worktree
+ok 585 - show-ref -h output has consistent spacing
 
-expecting success of 1510.107 '#31: explicit GIT_WORK_TREE from nephew of worktree': 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+expecting success of 0450.586 'show-ref *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 107 - #31: explicit GIT_WORK_TREE from nephew of worktree
+ok 586 - show-ref *.txt SYNOPSIS has dashed labels
 
-expecting success of 1510.108 '#31: chdir_to_toplevel uses worktree, not git dir': 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+expecting success of 0450.587 'show-ref -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
+
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-ok 108 - #31: chdir_to_toplevel uses worktree, not git dir
+ok 587 - show-ref -h output and SYNOPSIS agree
 
-expecting success of 1510.109 '#31: chdir_to_toplevel uses worktree (from subdir)': 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+expecting success of 0450.588 'sparse-checkout -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 109 - #31: chdir_to_toplevel uses worktree (from subdir)
+ok 588 - sparse-checkout -h output has no \t
 
-# passed all 109 test(s)
-1..109
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2203-add-intent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 0450.589 'sparse-checkout -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 589 - sparse-checkout -h output has dashed labels
 
-[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 0450.590 'sparse-checkout -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 590 - sparse-checkout -h output has consistent spacing
 
-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
+expecting success of 0450.591 'sparse-checkout *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 591 - sparse-checkout *.txt SYNOPSIS has dashed labels
 
-ok 2 - git status
+expecting success of 0450.592 'sparse-checkout -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 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
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 592 - sparse-checkout -h output and SYNOPSIS agree
 
-ok 3 - git status with porcelain v2
+expecting success of 0450.593 'stage -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 593 - stage -h output has no \t
 
-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
+expecting success of 0450.594 'stage -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 594 - stage -h output has dashed labels
 
-ok 4 - check result of "add -N"
+expecting success of 0450.595 'stage -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 595 - stage -h output has consistent spacing
 
-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
+expecting success of 0450.596 'stage *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 596 - stage *.txt SYNOPSIS has dashed labels
 
-ok 5 - intent to add is just an ordinary empty blob
+checking known breakage of 0450.597 'stage -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 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
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:24.438677808 +0000
++++ help	2026-03-14 13:27:24.494677808 +0000
+@@ -1 +1 @@
+-git stage <arg>...
++git add [<options>] [--] <pathspec>...
+not ok 597 - stage -h output and SYNOPSIS agree # TODO known breakage
 
-ok 6 - intent to add does not clobber existing paths
+expecting success of 0450.598 'stash -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 598 - stash -h output has no \t
 
-expecting success of 2203.7 'i-t-a entry is simply ignored': 
-	test_tick &&
-	git commit -a -m initial &&
-	git reset --hard &&
+expecting success of 0450.599 'stash -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 599 - stash -h output has dashed labels
 
-	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
+expecting success of 0450.600 'stash -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 600 - stash -h output has consistent spacing
 
-[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 0450.601 'stash *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 601 - stash *.txt SYNOPSIS has dashed labels
 
-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
+expecting success of 0450.602 'stash -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-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
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 602 - stash -h output and SYNOPSIS agree
 
-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
+expecting success of 0450.603 'status -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 603 - status -h output has no \t
 
-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 0450.604 'status -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 604 - status -h output has dashed labels
 
-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 &&
+expecting success of 0450.605 'status -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 605 - status -h output has consistent spacing
 
-	: >dir/bar &&
-	git add -N dir/bar &&
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual &&
+expecting success of 0450.606 'status *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 606 - status *.txt SYNOPSIS has dashed labels
 
-	git write-tree >/dev/null &&
+expecting success of 0450.607 'status -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 607 - status -h output and SYNOPSIS agree
 
-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 0450.608 'stripspace -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 608 - stripspace -h output has no \t
 
-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
-	)
+expecting success of 0450.609 'stripspace -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 609 - stripspace -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 0450.610 'stripspace -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 610 - stripspace -h output has consistent spacing
 
-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
-	)
+expecting success of 0450.611 'stripspace *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 611 - stripspace *.txt SYNOPSIS has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2203-add-intent/ita-in-dir/.git/
-ok 12 - cache-tree does skip dir that becomes empty
+expecting success of 0450.612 'stripspace -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 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
-	)
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 612 - stripspace -h output and SYNOPSIS agree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
-On branch master
+expecting success of 0450.613 'submodule--helper -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 613 - submodule--helper -h output has no \t
 
-Initial commit
+expecting success of 0450.614 'submodule--helper -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 614 - submodule--helper -h output has dashed labels
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	new file:   one
+expecting success of 0450.615 'submodule--helper -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 615 - submodule--helper -h output has consistent spacing
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 13 - commit: ita entries ignored in empty initial commit check
+ok 616 # skip submodule--helper *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_SUBMODULE__HELPER)
 
-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
-	)
+ok 617 # skip submodule--helper -h output and SYNOPSIS agree (missing BUILTIN_TXT_SUBMODULE__HELPER)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
-[master (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	new file:   two
+expecting success of 0450.618 'switch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 618 - switch -h output has no \t
 
-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 0450.619 'switch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 619 - switch -h output has dashed labels
 
-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 &&
+expecting success of 0450.620 'switch -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 620 - switch -h output has consistent spacing
 
-		git status | grep -v "^?" >actual.1 &&
-		test_grep "renamed: *first -> third" actual.1 &&
+expecting success of 0450.621 'switch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 621 - switch *.txt SYNOPSIS has dashed labels
 
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		 R first -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
+checking known breakage of 0450.622 'switch -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		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 &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:26.786677808 +0000
++++ help	2026-03-14 13:27:26.838677808 +0000
+@@ -1,4 +1 @@
+-git switch [<options>] [--no-guess] <branch>
+-git switch [<options>] --detach [<start-point>]
+-git switch [<options>] (-c|-C) <new-branch> [<start-point>]
+-git switch [<options>] --orphan <new-branch>
++git switch [<options>] [<branch>]
+not ok 622 - switch -h output and SYNOPSIS agree # TODO known breakage
 
-		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 &&
+expecting success of 0450.623 'symbolic-ref -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 623 - symbolic-ref -h output has no \t
 
-		git diff --cached --stat >actual.5 &&
-		test_must_be_empty actual.5
+expecting success of 0450.624 'symbolic-ref -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 624 - symbolic-ref -h output has dashed labels
 
-	)
+expecting success of 0450.625 'symbolic-ref -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 625 - symbolic-ref -h output has consistent spacing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 0450.626 'symbolic-ref *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 626 - symbolic-ref *.txt SYNOPSIS has dashed labels
 
-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 &&
+expecting success of 0450.627 'symbolic-ref -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-		git status | grep -v "^?" >actual.1 &&
-		test_grep "renamed: *first -> second" actual.1 &&
-		test_grep "renamed: *second -> third" actual.1 &&
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 627 - symbolic-ref -h output and SYNOPSIS agree
 
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		R  first -> second
-		 R second -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
+expecting success of 0450.628 'tag -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 628 - tag -h output has no \t
 
-		hash=$(git hash-object third) &&
-		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
-		cat >expected.3 <<-EOF &&
-		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
-		2 .R N... 100644 100644 100644 $hash $hash R100 third	second
-		EOF
-		test_cmp expected.3 actual.3
-	)
+expecting success of 0450.629 'tag -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 629 - tag -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 0450.630 'tag -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 630 - tag -h output has consistent spacing
 
-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 &&
+expecting success of 0450.631 'tag *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 631 - tag *.txt SYNOPSIS has dashed labels
 
-	hash_e=$(git hash-object empty) &&
-	hash_n=$(git hash-object not-empty) &&
+expecting success of 0450.632 'tag -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	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
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 632 - tag -h output and SYNOPSIS agree
 
-	git add -N empty not-empty &&
+expecting success of 0450.633 'unpack-file -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 633 - unpack-file -h output has no \t
 
-	git diff >actual &&
-	test_cmp expect.diff_p actual &&
+expecting success of 0450.634 'unpack-file -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 634 - unpack-file -h output has dashed labels
 
-	git diff --summary >actual &&
-	test_cmp expect.diff_s actual &&
+expecting success of 0450.635 'unpack-file -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 635 - unpack-file -h output has consistent spacing
 
-	git diff-files -p >actual &&
-	test_cmp expect.diff_p actual &&
+expecting success of 0450.636 'unpack-file *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 636 - unpack-file *.txt SYNOPSIS has dashed labels
 
-	git diff-files --abbrev >actual &&
-	test_cmp expect.diff_a actual &&
+expecting success of 0450.637 'unpack-file -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	git diff --cached >actual &&
-	test_must_be_empty actual
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 637 - unpack-file -h output and SYNOPSIS agree
 
-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 0450.638 'unpack-objects -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 638 - unpack-objects -h output has no \t
 
-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
+expecting success of 0450.639 'unpack-objects -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 639 - unpack-objects -h output has dashed labels
 
-HEAD is now at 03f6a20 foo
-ok 18 - "diff HEAD" includes ita as new files
+expecting success of 0450.640 'unpack-objects -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 640 - unpack-objects -h output has consistent spacing
 
-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 0450.641 'unpack-objects *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 641 - unpack-objects *.txt SYNOPSIS has dashed labels
 
-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 0450.642 'unpack-objects -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2401-worktree-prune.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2401-worktree-prune/.git/
-expecting success of 2401.1 'initialize': 
-	git commit --allow-empty -m init
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 642 - unpack-objects -h output and SYNOPSIS agree
 
-[main (root-commit) 50572bf] init
- Author: A U Thor <author@example.com>
-ok 1 - initialize
+expecting success of 0450.643 'update-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 643 - update-index -h output has no \t
 
-expecting success of 2401.2 'worktree prune on normal repo': 
-	git worktree prune &&
-	test_must_fail git worktree prune abc
+expecting success of 0450.644 'update-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 644 - update-index -h output has dashed labels
 
-usage: git worktree prune [-n] [-v] [--expire <expire>]
+expecting success of 0450.645 'update-index -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 645 - update-index -h output has consistent spacing
 
-    -n, --[no-]dry-run    do not remove, show only
-    -v, --[no-]verbose    report pruned working trees
-    --[no-]expire <expiry-date>
-                          expire working trees older than <time>
+expecting success of 0450.646 'update-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 646 - update-index *.txt SYNOPSIS has dashed labels
 
-ok 2 - worktree prune on normal repo
+checking known breakage of 0450.647 'update-index -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2401.3 'prune files inside $GIT_DIR/worktrees': 
-	mkdir .git/worktrees &&
-	: >.git/worktrees/abc &&
-	git worktree prune --verbose 2>actual &&
-	cat >expect <<EOF &&
-Removing worktrees/abc: not a valid directory
-EOF
-	test_cmp expect actual &&
-	! test -f .git/worktrees/abc &&
-	! test -d .git/worktrees
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:29.282677808 +0000
++++ help	2026-03-14 13:27:29.334677808 +0000
+@@ -1,19 +1 @@
+-git update-index
+-                 [--add] [--remove | --force-remove] [--replace]
+-                 [--refresh] [-q] [--unmerged] [--ignore-missing]
+-                 [(--cacheinfo <mode>,<object>,<file>)...]
+-                 [--chmod=(+|-)x]
+-                 [--[no-]assume-unchanged]
+-                 [--[no-]skip-worktree]
+-                 [--[no-]ignore-skip-worktree-entries]
+-                 [--[no-]fsmonitor-valid]
+-                 [--ignore-submodules]
+-                 [--[no-]split-index]
+-                 [--[no-|test-|force-]untracked-cache]
+-                 [--[no-]fsmonitor]
+-                 [--really-refresh] [--unresolve] [--again | -g]
+-                 [--info-only] [--index-info]
+-                 [-z] [--stdin] [--index-version <n>]
+-                 [--show-index-version]
+-                 [--verbose]
+-                 [--] [<file>...]
++git update-index [<options>] [--] [<file>...]
+not ok 647 - update-index -h output and SYNOPSIS agree # TODO known breakage
 
-ok 3 - prune files inside $GIT_DIR/worktrees
+expecting success of 0450.648 'update-ref -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 648 - update-ref -h output has no \t
 
-expecting success of 2401.4 'prune directories without gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	cat >expect <<EOF &&
-Removing worktrees/def: gitdir file does not exist
-EOF
-	git worktree prune --verbose 2>actual &&
-	test_cmp expect actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+expecting success of 0450.649 'update-ref -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 649 - update-ref -h output has dashed labels
 
-ok 4 - prune directories without gitdir
+expecting success of 0450.650 'update-ref -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 650 - update-ref -h output has consistent spacing
 
-checking prerequisite: SANITY
+expecting success of 0450.651 'update-ref *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 651 - update-ref *.txt SYNOPSIS has dashed labels
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+checking known breakage of 0450.652 'update-ref -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-	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"
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:29.810677808 +0000
++++ help	2026-03-14 13:27:29.870677808 +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>]
++git update-ref [<options>]    <refname> <new-oid> [<old-oid>]
++git update-ref [<options>] --stdin [-z]
+not ok 652 - update-ref -h output and SYNOPSIS agree # TODO known breakage
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+expecting success of 0450.653 'update-server-info -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 653 - update-server-info -h output has no \t
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+expecting success of 0450.654 'update-server-info -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 654 - update-server-info -h output has dashed labels
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 2401.5 'prune directories with unreadable gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	: >.git/worktrees/def/gitdir &&
-	chmod u-r .git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+expecting success of 0450.655 'update-server-info -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 655 - update-server-info -h output has consistent spacing
 
-Removing worktrees/def: unable to read gitdir file (Permission denied)
-ok 5 - prune directories with unreadable gitdir
+expecting success of 0450.656 'update-server-info *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 656 - update-server-info *.txt SYNOPSIS has dashed labels
 
-expecting success of 2401.6 'prune directories with invalid gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	: >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: invalid gitdir file" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+expecting success of 0450.657 'update-server-info -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Removing worktrees/def: invalid gitdir file
-ok 6 - prune directories with invalid gitdir
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 657 - update-server-info -h output and SYNOPSIS agree
 
-expecting success of 2401.7 'prune directories with gitdir pointing to nowhere': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+expecting success of 0450.658 'upload-archive -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 658 - upload-archive -h output has no \t
 
-Removing worktrees/def: gitdir file points to non-existent location
-ok 7 - prune directories with gitdir pointing to nowhere
+expecting success of 0450.659 'upload-archive -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 659 - upload-archive -h output has dashed labels
 
-expecting success of 2401.8 'not prune locked checkout': 
-	test_when_finished rm -r .git/worktrees &&
-	mkdir -p .git/worktrees/ghi &&
-	: >.git/worktrees/ghi/locked &&
-	git worktree prune &&
-	test -d .git/worktrees/ghi
+expecting success of 0450.660 'upload-archive -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 660 - upload-archive -h output has consistent spacing
 
-ok 8 - not prune locked checkout
+expecting success of 0450.661 'upload-archive *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 661 - upload-archive *.txt SYNOPSIS has dashed labels
 
-expecting success of 2401.9 'not prune recent checkouts': 
-	test_when_finished rm -r .git/worktrees &&
-	git worktree add jlm HEAD &&
-	test -d .git/worktrees/jlm &&
-	rm -rf jlm &&
-	git worktree prune --verbose --expire=2.days.ago &&
-	test -d .git/worktrees/jlm
+expecting success of 0450.662 'upload-archive -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-ok 9 - not prune recent checkouts
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 662 - upload-archive -h output and SYNOPSIS agree
 
-expecting success of 2401.10 'not prune proper checkouts': 
-	test_when_finished rm -r .git/worktrees &&
-	git worktree add --detach "$PWD/nop" main &&
-	git worktree prune &&
-	test -d .git/worktrees/nop
+expecting success of 0450.663 'upload-archive--writer -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 663 - upload-archive--writer -h output has no \t
 
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-ok 10 - not prune proper checkouts
+expecting success of 0450.664 'upload-archive--writer -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 664 - upload-archive--writer -h output has dashed labels
 
-expecting success of 2401.11 'prune duplicate (linked/linked)': 
-	test_when_finished rm -fr .git/worktrees w1 w2 &&
-	git worktree add --detach w1 &&
-	git worktree add --detach w2 &&
-	sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new &&
-	mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "duplicate entry" actual &&
-	test -d .git/worktrees/w1 &&
-	! test -d .git/worktrees/w2
+expecting success of 0450.665 'upload-archive--writer -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 665 - upload-archive--writer -h output has consistent spacing
 
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-Removing worktrees/w2: duplicate entry
-ok 11 - prune duplicate (linked/linked)
+ok 666 # skip upload-archive--writer *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
 
-expecting success of 2401.12 'prune duplicate (main/linked)': 
-	test_when_finished rm -fr repo wt &&
-	test_create_repo repo &&
-	test_commit -C repo x &&
-	git -C repo worktree add --detach ../wt &&
-	rm -fr wt &&
-	mv repo wt &&
-	git -C wt worktree prune --verbose 2>actual &&
-	test_grep "duplicate entry" actual &&
-	! test -d .git/worktrees/wt
+ok 667 # skip upload-archive--writer -h output and SYNOPSIS agree (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2401-worktree-prune/repo/.git/
-[main (root-commit) cb85766] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Preparing worktree (detached HEAD cb85766)
-HEAD is now at cb85766 x
-Removing worktrees/wt: duplicate entry
-ok 12 - prune duplicate (main/linked)
+expecting success of 0450.668 'upload-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 668 - upload-pack -h output has no \t
 
-expecting success of 2401.13 'not prune proper worktrees inside linked worktree with relative paths': 
-	test_when_finished rm -rf repo wt_ext &&
-	git init repo &&
-	(
-	    cd repo &&
-	    git config worktree.useRelativePaths true &&
-	    echo content >file &&
-	    git add file &&
-	    git commit -m msg &&
-	    git worktree add ../wt_ext &&
-	    git worktree add wt_int &&
-	    cd wt_int &&
-	    git worktree prune -v >out &&
-	    test_must_be_empty out &&
-	    cd ../../wt_ext &&
-	    git worktree prune -v >out &&
-	    test_must_be_empty out
-	)
+expecting success of 0450.669 'upload-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 669 - upload-pack -h output has dashed labels
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2401-worktree-prune/repo/.git/
-[main (root-commit) b2ccb9a] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Preparing worktree (new branch 'wt_ext')
-HEAD is now at b2ccb9a msg
-Preparing worktree (new branch 'wt_int')
-HEAD is now at b2ccb9a msg
-ok 13 - not prune proper worktrees inside linked worktree with relative paths
+expecting success of 0450.670 'upload-pack -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 670 - upload-pack -h output has consistent spacing
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2404-worktree-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2404-worktree-config/.git/
-expecting success of 2404.1 'setup': 
-	test_commit start
+expecting success of 0450.671 'upload-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 671 - upload-pack *.txt SYNOPSIS has dashed labels
 
-[master (root-commit) bb4ab09] start
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 start.t
-ok 1 - setup
+expecting success of 0450.672 'upload-pack -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2404.2 'config --worktree in single worktree': 
-	git config --worktree foo.bar true &&
-	test_cmp_config true foo.bar
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 672 - upload-pack -h output and SYNOPSIS agree
 
-ok 2 - config --worktree in single worktree
+expecting success of 0450.673 'var -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 673 - var -h output has no \t
 
-expecting success of 2404.3 'add worktrees': 
-	git worktree add wt1 &&
-	git worktree add wt2
+expecting success of 0450.674 'var -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 674 - var -h output has dashed labels
 
-Preparing worktree (new branch 'wt1')
-HEAD is now at bb4ab09 start
-Preparing worktree (new branch 'wt2')
-HEAD is now at bb4ab09 start
-ok 3 - add worktrees
+expecting success of 0450.675 'var -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 675 - var -h output has consistent spacing
 
-expecting success of 2404.4 'config --worktree without extension': 
-	test_must_fail git config --worktree foo.bar false
+expecting success of 0450.676 'var *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 676 - var *.txt SYNOPSIS has dashed labels
 
-fatal: --worktree cannot be used with multiple working trees unless the config
-extension worktreeConfig is enabled. Please read "CONFIGURATION FILE"
-section in "git help worktree" for details
-ok 4 - config --worktree without extension
+expecting success of 0450.677 'var -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2404.5 'enable worktreeConfig extension': 
-	git config core.repositoryformatversion 1 &&
-	git config extensions.worktreeConfig true &&
-	test_cmp_config true extensions.worktreeConfig &&
-	test_cmp_config 1 core.repositoryformatversion
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 677 - var -h output and SYNOPSIS agree
 
-ok 5 - enable worktreeConfig extension
+expecting success of 0450.678 'verify-commit -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 678 - verify-commit -h output has no \t
 
-expecting success of 2404.6 'config is shared as before': 
-	git config this.is shared &&
-	test_cmp_config shared this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+expecting success of 0450.679 'verify-commit -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 679 - verify-commit -h output has dashed labels
 
-ok 6 - config is shared as before
+expecting success of 0450.680 'verify-commit -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 680 - verify-commit -h output has consistent spacing
 
-expecting success of 2404.7 'config is shared (set from another worktree)': 
-	git -C wt1 config that.is also-shared &&
-	test_cmp_config also-shared that.is &&
-	test_cmp_config -C wt1 also-shared that.is &&
-	test_cmp_config -C wt2 also-shared that.is
+expecting success of 0450.681 'verify-commit *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 681 - verify-commit *.txt SYNOPSIS has dashed labels
 
-ok 7 - config is shared (set from another worktree)
+expecting success of 0450.682 'verify-commit -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2404.8 'config private to main worktree': 
-	git config --worktree this.is for-main &&
-	test_cmp_config for-main this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 682 - verify-commit -h output and SYNOPSIS agree
 
-ok 8 - config private to main worktree
+expecting success of 0450.683 'verify-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 683 - verify-pack -h output has no \t
 
-expecting success of 2404.9 'config private to linked worktree': 
-	git -C wt1 config --worktree this.is for-wt1 &&
-	test_cmp_config for-main this.is &&
-	test_cmp_config -C wt1 for-wt1 this.is &&
-	test_cmp_config -C wt2 shared this.is
+expecting success of 0450.684 'verify-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 684 - verify-pack -h output has dashed labels
 
-ok 9 - config private to linked worktree
+expecting success of 0450.685 'verify-pack -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 685 - verify-pack -h output has consistent spacing
 
-expecting success of 2404.10 'core.bare no longer for main only': 
-	test_config core.bare true &&
-	test "$(git rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt2 rev-parse --is-bare-repository)" = true
+expecting success of 0450.686 'verify-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 686 - verify-pack *.txt SYNOPSIS has dashed labels
 
-ok 10 - core.bare no longer for main only
+expecting success of 0450.687 'verify-pack -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2404.11 'per-worktree core.bare is picked up': 
-	git -C wt1 config --worktree core.bare true &&
-	test "$(git rev-parse --is-bare-repository)" = false &&
-	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt2 rev-parse --is-bare-repository)" = false
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 687 - verify-pack -h output and SYNOPSIS agree
 
-ok 11 - per-worktree core.bare is picked up
+expecting success of 0450.688 'verify-tag -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 688 - verify-tag -h output has no \t
 
-expecting success of 2404.12 'config.worktree no longer read without extension': 
-	git config --unset extensions.worktreeConfig &&
-	test_cmp_config shared this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+expecting success of 0450.689 'verify-tag -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 689 - verify-tag -h output has dashed labels
 
-ok 12 - config.worktree no longer read without extension
+expecting success of 0450.690 'verify-tag -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 690 - verify-tag -h output has consistent spacing
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2402-worktree-list.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/.git/
-expecting success of 2402.1 'setup': 
-	test_commit init
+expecting success of 0450.691 'verify-tag *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 691 - verify-tag *.txt SYNOPSIS has dashed labels
 
-[main (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
+expecting success of 0450.692 'verify-tag -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-expecting success of 2402.2 'rev-parse --git-common-dir on main worktree': 
-	git rev-parse --git-common-dir >actual &&
-	echo .git >expected &&
-	test_cmp expected actual &&
-	mkdir sub &&
-	git -C sub rev-parse --git-common-dir >actual2 &&
-	echo ../.git >expected2 &&
-	test_cmp expected2 actual2
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 692 - verify-tag -h output and SYNOPSIS agree
 
-ok 2 - rev-parse --git-common-dir on main worktree
-
-expecting success of 2402.3 'rev-parse --git-path objects linked worktree': 
-	echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
-	test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
-	git worktree add --detach linked-tree main &&
-	git -C linked-tree rev-parse --git-path objects >actual &&
-	test_cmp expect actual
+expecting success of 0450.693 'version -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 693 - version -h output has no \t
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 3 - rev-parse --git-path objects linked worktree
+expecting success of 0450.694 'version -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 694 - version -h output has dashed labels
 
-expecting success of 2402.4 '"list" all worktrees from main': 
-	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
-	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
+expecting success of 0450.695 'version -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 695 - version -h output has consistent spacing
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 4 - "list" all worktrees from main
+expecting success of 0450.696 'version *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 696 - version *.txt SYNOPSIS has dashed labels
 
-expecting success of 2402.5 '"list" all worktrees from linked': 
-	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
-	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git -C here worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
+expecting success of 0450.697 'version -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 5 - "list" all worktrees from linked
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 697 - version -h output and SYNOPSIS agree
 
-expecting success of 2402.6 '"list" all worktrees --porcelain': 
-	echo "worktree $(git rev-parse --show-toplevel)" >expect &&
-	echo "HEAD $(git rev-parse HEAD)" >>expect &&
-	echo "branch $(git symbolic-ref HEAD)" >>expect &&
-	echo >>expect &&
-	test_when_finished "rm -rf here actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
-	echo "HEAD $(git rev-parse HEAD)" >>expect &&
-	echo "detached" >>expect &&
-	echo >>expect &&
-	git worktree list --porcelain >actual &&
-	test_cmp expect actual
+expecting success of 0450.698 'whatchanged -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 698 - whatchanged -h output has no \t
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 6 - "list" all worktrees --porcelain
+expecting success of 0450.699 'whatchanged -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 699 - whatchanged -h output has dashed labels
 
-expecting success of 2402.7 '"list" all worktrees --porcelain -z': 
-	test_when_finished "rm -rf here _actual actual expect &&
-				git worktree prune" &&
-	printf "worktree %sQHEAD %sQbranch %sQQ" \
-		"$(git rev-parse --show-toplevel)" \
-		$(git rev-parse HEAD --symbolic-full-name HEAD) >expect &&
-	git worktree add --detach here main &&
-	printf "worktree %sQHEAD %sQdetachedQQ" \
-		"$(git -C here rev-parse --show-toplevel)" \
-		"$(git rev-parse HEAD)" >>expect &&
-	git worktree list --porcelain -z >_actual &&
-	nul_to_q <_actual >actual &&
-	test_cmp expect actual
+expecting success of 0450.700 'whatchanged -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 700 - whatchanged -h output has consistent spacing
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 7 - "list" all worktrees --porcelain -z
+expecting success of 0450.701 'whatchanged *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 701 - whatchanged *.txt SYNOPSIS has dashed labels
 
-expecting success of 2402.8 '"list" -z fails without --porcelain': 
-	test_must_fail git worktree list -z
+checking known breakage of 0450.702 'whatchanged -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-fatal: the option '-z' requires '--porcelain'
-ok 8 - "list" -z fails without --porcelain
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+--- txt	2026-03-14 13:27:35.090677808 +0000
++++ help	2026-03-14 13:27:35.154677808 +0000
+@@ -1 +1,2 @@
+-git whatchanged <option>...
++git log [<options>] [<revision-range>] [[--] <path>...]
++git show [<options>] <object>...
+not ok 702 - whatchanged -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 2402.9 '"list" all worktrees with locked annotation': 
-	test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
-	git worktree add --detach locked main &&
-	git worktree add --detach unlocked main &&
-	git worktree lock locked &&
-	test_when_finished "git worktree unlock locked" &&
-	git worktree list >out &&
-	grep "/locked  *[0-9a-f].* locked$" out &&
-	! grep "/unlocked  *[0-9a-f].* locked$" out
+expecting success of 0450.703 'worktree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 703 - worktree -h output has no \t
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/locked    2519212 (detached HEAD) locked
-ok 9 - "list" all worktrees with locked annotation
+expecting success of 0450.704 'worktree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 704 - worktree -h output has dashed labels
 
-expecting success of 2402.10 '"list" all worktrees --porcelain with locked': 
-	test_when_finished "rm -rf locked1 locked2 unlocked out actual expect && git worktree prune" &&
-	echo "locked" >expect &&
-	echo "locked with reason" >>expect &&
-	git worktree add --detach locked1 &&
-	git worktree add --detach locked2 &&
-	# unlocked worktree should not be annotated with "locked"
-	git worktree add --detach unlocked &&
-	git worktree lock locked1 &&
-	test_when_finished "git worktree unlock locked1" &&
-	git worktree lock locked2 --reason "with reason" &&
-	test_when_finished "git worktree unlock locked2" &&
-	git worktree list --porcelain >out &&
-	grep "^locked" out >actual &&
-	test_cmp expect actual
+expecting success of 0450.705 'worktree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 705 - worktree -h output has consistent spacing
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 10 - "list" all worktrees --porcelain with locked
+expecting success of 0450.706 'worktree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 706 - worktree *.txt SYNOPSIS has dashed labels
 
-expecting success of 2402.11 '"list" all worktrees --porcelain with locked reason newline escaped': 
-	test_when_finished "rm -rf locked_lf locked_crlf out actual expect && git worktree prune" &&
-	printf "locked \"locked\\\\r\\\\nreason\"\n" >expect &&
-	printf "locked \"locked\\\\nreason\"\n" >>expect &&
-	git worktree add --detach locked_lf &&
-	git worktree add --detach locked_crlf &&
-	git worktree lock locked_lf --reason "$(printf "locked\nreason")" &&
-	test_when_finished "git worktree unlock locked_lf" &&
-	git worktree lock locked_crlf --reason "$(printf "locked\r\nreason")" &&
-	test_when_finished "git worktree unlock locked_crlf" &&
-	git worktree list --porcelain >out &&
-	grep "^locked" out >actual &&
-	test_cmp expect actual
+expecting success of 0450.707 'worktree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 11 - "list" all worktrees --porcelain with locked reason newline escaped
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 707 - worktree -h output and SYNOPSIS agree
 
-expecting success of 2402.12 '"list" all worktrees with prunable annotation': 
-	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
-	git worktree add --detach prunable &&
-	git worktree add --detach unprunable &&
-	rm -rf prunable &&
-	git worktree list >out &&
-	grep "/prunable  *[0-9a-f].* prunable$" out &&
-	! grep "/unprunable  *[0-9a-f].* prunable$"
+expecting success of 0450.708 'write-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 708 - write-tree -h output has no \t
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
-ok 12 - "list" all worktrees with prunable annotation
+expecting success of 0450.709 'write-tree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 709 - write-tree -h output has dashed labels
 
-expecting success of 2402.13 '"list" all worktrees --porcelain with prunable': 
-	test_when_finished "rm -rf prunable out && git worktree prune" &&
-	git worktree add --detach prunable &&
-	rm -rf prunable &&
-	git worktree list --porcelain >out &&
-	sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
-	test_grep "^prunable gitdir file points to non-existent location$" only_prunable
+expecting success of 0450.710 'write-tree -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 710 - write-tree -h output has consistent spacing
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-prunable gitdir file points to non-existent location
-ok 13 - "list" all worktrees --porcelain with prunable
+expecting success of 0450.711 'write-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 711 - write-tree *.txt SYNOPSIS has dashed labels
 
-expecting success of 2402.14 '"list" all worktrees with prunable consistent with "prune"': 
-	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
-	git worktree add --detach prunable &&
-	git worktree add --detach unprunable &&
-	rm -rf prunable &&
-	git worktree list >out &&
-	grep "/prunable  *[0-9a-f].* prunable$" out &&
-	! grep "/unprunable  *[0-9a-f].* unprunable$" out &&
-	git worktree prune --verbose 2>out &&
-	test_grep "^Removing worktrees/prunable" out &&
-	test_grep ! "^Removing worktrees/unprunable" out
+expecting success of 0450.712 'write-tree -h output and SYNOPSIS agree': 
+		t2s="$(txt_to_synopsis "$builtin")" &&
+		if test "$builtin" = "merge-tree"
+		then
+			test_when_finished "rm -f t2s.new" &&
+			sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new
+			t2s=t2s.new
+		fi &&
+		h2s="$(help_to_synopsis "$builtin")" &&
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
-Removing worktrees/prunable: gitdir file points to non-existent location
-ok 14 - "list" all worktrees with prunable consistent with "prune"
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
+	
+ok 712 - write-tree -h output and SYNOPSIS agree
 
-expecting success of 2402.15 '"list" --verbose and --porcelain mutually exclusive': 
-	test_must_fail git worktree list --verbose --porcelain
+# still have 56 known breakage(s)
+# passed all remaining 656 test(s)
+1..712
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2019-checkout-ambiguous-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-fatal: options '--verbose' and '--porcelain' cannot be used together
-ok 15 - "list" --verbose and --porcelain mutually exclusive
+[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 2402.16 '"list" all worktrees --verbose with locked': 
-	test_when_finished "rm -rf locked1 locked2 out actual expect && git worktree prune" &&
-	git worktree add locked1 --detach &&
-	git worktree add locked2 --detach &&
-	git worktree lock locked1 &&
-	test_when_finished "git worktree unlock locked1" &&
-	git worktree lock locked2 --reason "with reason" &&
-	test_when_finished "git worktree unlock locked2" &&
-	echo "$(git -C locked2 rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
-	printf "\tlocked: with reason\n" >>expect &&
-	git worktree list --verbose >out &&
-	grep "/locked1  *[0-9a-f].* locked$" out &&
-	sed -n "s/  */ /g;/\/locked2  *[0-9a-f].*$/,/locked: .*$/p" <out >actual &&
-	test_cmp actual expect
+expecting success of 2019.2 'checkout ambiguous ref succeeds': 
+	git checkout ambiguity 2>stderr
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/locked1  2519212 (detached HEAD) locked
-ok 16 - "list" all worktrees --verbose with locked
+ok 2 - checkout ambiguous ref succeeds
 
-expecting success of 2402.17 '"list" all worktrees --verbose with prunable': 
-	test_when_finished "rm -rf prunable out actual expect && git worktree prune" &&
-	git worktree add prunable --detach &&
-	echo "$(git -C prunable rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
-	printf "\tprunable: gitdir file points to non-existent location\n" >>expect &&
-	rm -rf prunable &&
-	git worktree list --verbose >out &&
-	sed -n "s/  */ /g;/\/prunable  *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
-	test_cmp actual expect
+expecting success of 2019.3 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 17 - "list" all worktrees --verbose with prunable
+warning: refname 'ambiguity' is ambiguous.
+ok 3 - checkout produces ambiguity warning
 
-expecting success of 2402.18 'bare repo setup': 
-	git init --bare bare1 &&
-	echo "data" >file1 &&
-	git add file1 &&
-	git commit -m"File1: add data" &&
-	git push bare1 main &&
-	git reset --hard HEAD^
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/bare1/
-[main 7c81006] File1: add data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-To bare1
- * [new branch]      main -> main
-HEAD is now at 2519212 init
-ok 18 - bare repo setup
+ok 4 - checkout chooses branch over tag
 
-expecting success of 2402.19 '"list" all worktrees from bare main': 
-	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
-	echo "$(pwd)/bare1 (bare)" >expect &&
-	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git -C bare1 worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
+expecting success of 2019.5 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 19 - "list" all worktrees from bare main
+Switched to branch 'ambiguity'
+ok 5 - checkout reports switch to branch
 
-expecting success of 2402.20 '"list" all worktrees --porcelain from bare main': 
-	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
-	echo "worktree $(pwd)/bare1" >expect &&
-	echo "bare" >>expect &&
-	echo >>expect &&
-	echo "worktree $(git -C there rev-parse --show-toplevel)" >>expect &&
-	echo "HEAD $(git -C there rev-parse HEAD)" >>expect &&
-	echo "detached" >>expect &&
-	echo >>expect &&
-	git -C bare1 worktree list --porcelain >actual &&
-	test_cmp expect actual
+expecting success of 2019.6 'checkout vague ref succeeds': 
+	git checkout vagueness 2>stderr &&
+	test_set_prereq VAGUENESS_SUCCESS
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 20 - "list" all worktrees --porcelain from bare main
+ok 6 - checkout vague ref succeeds
 
-expecting success of 2402.21 '"list" all worktrees from linked with a bare main': 
-	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
-	echo "$(pwd)/bare1 (bare)" >expect &&
-	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git -C there worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
+expecting success of 2019.7 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 21 - "list" all worktrees from linked with a bare main
+warning: refname 'vagueness' is ambiguous.
+ok 7 - checkout produces ambiguity warning
 
-expecting success of 2402.22 'bare repo cleanup': 
-	rm -rf bare1
+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 22 - bare repo cleanup
+ok 8 - checkout chooses branch over tag
 
-expecting success of 2402.23 'broken main worktree still at the top': 
-	git init broken-main &&
-	(
-		cd broken-main &&
-		test_commit new &&
-		git worktree add linked &&
-		cat >expected <<-EOF &&
-		worktree $(pwd)
-		HEAD $ZERO_OID
+expecting success of 2019.9 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
 
-		EOF
-		cd linked &&
-		echo "worktree $(pwd)" >expected &&
-		(cd ../ && test-tool ref-store main create-symref HEAD .broken ) &&
-		git worktree list --porcelain >out &&
-		head -n 3 out >actual &&
-		test_cmp ../expected actual &&
-		git worktree list >out &&
-		head -n 1 out >actual.2 &&
-		grep -F "(error)" actual.2
-	)
+Switched to branch 'vagueness'
+ok 9 - checkout reports switch to branch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/broken-main/.git/
-[main (root-commit) 3325ee1] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Preparing worktree (new branch 'linked')
-HEAD is now at 3325ee1 new
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/broken-main         0000000 (error)
-ok 23 - broken main worktree still at the top
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2021-checkout-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2021-checkout-overwrite/.git/
+expecting success of 2021.1 'setup': 
 
-expecting success of 2402.24 'linked worktrees are sorted': 
-	test_when_finished "rm -rf sorted" &&
-	mkdir sorted &&
-	git init sorted/main &&
-	(
-		cd sorted/main &&
-		test_tick &&
-		test_commit new &&
-		git worktree add ../first &&
-		git worktree add ../second &&
-		git worktree list --porcelain >out &&
-		grep ^worktree out >actual
-	) &&
-	cat >expected <<-EOF &&
-	worktree $(pwd)/sorted/main
-	worktree $(pwd)/sorted/first
-	worktree $(pwd)/sorted/second
-	EOF
-	test_cmp expected sorted/main/actual
+	mkdir -p a/b/c &&
+	>a/b/c/d &&
+	git add -A &&
+	git commit -m base &&
+	git tag start
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/sorted/main/.git/
-[main (root-commit) d8ef111] new
+[master (root-commit) 6ef9cb1] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Preparing worktree (new branch 'first')
-HEAD is now at d8ef111 new
-Preparing worktree (new branch 'second')
-HEAD is now at d8ef111 new
-ok 24 - linked worktrees are sorted
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b/c/d
+ok 1 - setup
 
-expecting success of 2402.25 'linked worktrees with relative paths are shown with absolute paths': 
-	test_when_finished "rm -rf sorted" &&
-	mkdir sorted &&
-	git init sorted/main &&
-	(
-		cd sorted/main &&
-		test_tick &&
-		test_commit new &&
-		git worktree add --relative-paths ../first &&
-		git worktree add ../second &&
-		git worktree list --porcelain >out &&
-		grep ^worktree out >actual
-	) &&
-	cat >expected <<-EOF &&
-	worktree $(pwd)/sorted/main
-	worktree $(pwd)/sorted/first
-	worktree $(pwd)/sorted/second
-	EOF
-	test_cmp expected sorted/main/actual
+expecting success of 2021.2 'create a commit where dir a/b changed to file': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/sorted/main/.git/
-[main (root-commit) d8ef111] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Preparing worktree (new branch 'first')
-HEAD is now at d8ef111 new
-Preparing worktree (new branch 'second')
-HEAD is now at d8ef111 new
-ok 25 - linked worktrees with relative paths are shown with absolute paths
+	git checkout -b file &&
+	rm -rf a/b &&
+	>a/b &&
+	git add -A &&
+	git commit -m "dir to file"
 
-expecting success of 2402.26 'worktree path when called in .git directory': 
-	git worktree list >list1 &&
-	git -C .git worktree list >list2 &&
-	test_cmp list1 list2
+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
 
-ok 26 - worktree path when called in .git directory
+expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
 
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2403-worktree-move.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	git rm --cached a/b &&
+	git commit -m "un-track the file" &&
+	test_must_fail git checkout start &&
+	test -f a/b
 
-[master (root-commit) 2519212] init
+rm 'a/b'
+[file 1d595a3] un-track the file
  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
+ 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 2403.2 'lock main worktree': 
-	test_must_fail git worktree lock .
+expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
 
-fatal: The main working tree cannot be locked or unlocked
-ok 2 - lock main worktree
+	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"
 
-expecting success of 2403.3 'lock linked worktree': 
-	git worktree lock --reason hahaha source &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+Switched to a new branch 'symlink'
+checking prerequisite: SYMLINKS
 
-ok 3 - lock linked worktree
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success of 2403.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
+)
+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
 
-Preparing worktree (new branch 'elsewhere')
-HEAD is now at 2519212 init
-ok 4 - lock linked worktree from another worktree
+expecting success of 2021.5 'checkout commit with dir must not remove untracked a/b': 
 
-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
+	git rm --cached a/b &&
+	git commit -m "un-track the symlink" &&
+	test_must_fail git checkout start
 
-fatal: 'source' is already locked, reason: hahaha
-ok 5 - lock worktree twice
+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 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
+expecting success of 2021.6 'the symlink remained': 
 
-fatal: '.' is already locked, reason: hahaha
-ok 6 - lock worktree twice (from the locked worktree)
+	test -h a/b
 
-expecting success of 2403.7 'unlock main worktree': 
-	test_must_fail git worktree unlock .
+ok 6 - the symlink remained
 
-fatal: The main working tree cannot be locked or unlocked
-ok 7 - unlock main worktree
+expecting success of 2021.7 'cleanup after previous symlink tests': 
+	rm a/b
 
-expecting success of 2403.8 'unlock linked worktree': 
-	git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
+ok 7 - cleanup after previous symlink tests
 
-ok 8 - unlock linked worktree
+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
 
-expecting success of 2403.9 'unlock worktree twice': 
-	test_must_fail git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
+Note: switching to 'start'.
 
-fatal: 'source' is not locked
-ok 9 - unlock worktree twice
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 2403.10 'move non-worktree': 
-	mkdir abc &&
-	test_must_fail git worktree move abc def
+If you want to 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: 'abc' is not a working tree
-ok 10 - move non-worktree
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-fatal: cannot move a locked working tree;
-use 'move -f -f' to override or unlock first
-ok 11 - move locked worktree
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-worktree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/destination
-ok 12 - move worktree
+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:
 
-expecting success of 2403.13 'move main worktree': 
-	test_must_fail git worktree move . def
+  63af845 add dir/f
 
-fatal: '.' is a main working tree
-ok 13 - move main worktree
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 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
+ git branch <new-branch-name> 63af845
 
-worktree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/some-dir/destination
-ok 14 - move worktree to another dir
+HEAD is now at 6ef9cb1 base
+ok 8 - checkout -f must not follow symlinks when removing entries
 
-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
+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
 
-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)
+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'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: 'bobble' already exists
-ok 16 - refuse to move worktree atop existing path
+If you want to 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 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 switch -c <new-branch-name>
 
-	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
+Or undo this operation with:
 
-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>
+  git switch -
 
-ok 17 - move atop existing but missing worktree
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/withsub/.git/
-[master (root-commit) 5e30013] initial
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2016-checkout-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2016-checkout-patch/.git/
+expecting success of 2016.1 'setup': 
+	mkdir dir &&
+	echo parent > dir/foo &&
+	echo dummy > bar &&
+	git add bar dir/foo &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
+
+[master (root-commit) 758b165] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/withsub/sub'...
-done.
-[master 640b2c6] withsub
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 dir/foo
+[master 3319288] second
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Preparing worktree (detached HEAD 640b2c6)
-HEAD is now at 640b2c6 withsub
-ok 18 - move a repo with uninitialized submodule
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-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
-	)
+expecting success of 2016.2 'saying "n" does nothing': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n n | git checkout -p &&
+	verify_saved_state bar &&
+	verify_saved_state dir/foo
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 2 - saying "n" does nothing
 
-expecting success of 2403.20 'remove main worktree': 
-	test_must_fail git worktree remove .
+expecting success of 2016.3 'git checkout -p': 
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
 
-fatal: '.' is a main working tree
-ok 20 - remove main worktree
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 3 - git checkout -p
 
-expecting success of 2403.21 'remove locked worktree': 
-	git worktree lock destination &&
-	test_when_finished "git worktree unlock destination" &&
-	test_must_fail git worktree remove destination
+expecting success of 2016.4 'git checkout -p with staged changes': 
+	set_state dir/foo work index &&
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
 
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-ok 21 - remove locked worktree
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 9015a7a..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-index
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 4 - git checkout -p with staged changes
 
-expecting success of 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
+expecting success of 2016.5 'git checkout -p HEAD with NO staged changes: abort': 
+		set_and_save_state dir/foo work head &&
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_saved_state dir/foo &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 5 - git checkout -p HEAD with NO staged changes: abort
 
-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 2016.6 'git checkout -p HEAD with NO staged changes: apply': 
+		test_write_lines n y y | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 6 - git checkout -p HEAD with NO staged changes: apply
 
-expecting success of 2403.23 'remove worktree with untracked file': 
-	: >destination/untracked &&
-	test_must_fail git worktree remove destination
+expecting success of 2016.7 'git checkout -p HEAD with change already staged': 
+		set_state dir/foo index index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+ok 7 - git checkout -p HEAD with change already staged
 
-fatal: 'destination' contains modified or untracked files, use --force to delete it
-ok 23 - remove worktree with untracked file
+expecting success of 2016.8 'git checkout -p @ with NO staged changes: abort': 
+		set_and_save_state dir/foo work head &&
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_saved_state dir/foo &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 8 - git checkout -p @ with NO staged changes: abort
 
-expecting success of 2403.24 'force remove worktree with untracked file': 
-	git worktree remove --force destination &&
-	test_path_is_missing destination
+expecting success of 2016.9 'git checkout -p @ with NO staged changes: apply': 
+		test_write_lines n y y | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 9 - git checkout -p @ with NO staged changes: apply
 
-ok 24 - force remove worktree with untracked file
+expecting success of 2016.10 'git checkout -p @ with change already staged': 
+		set_state dir/foo index index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+ok 10 - git checkout -p @ with change already staged
 
-expecting success of 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
+expecting success of 2016.11 'git checkout -p HEAD^...': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git checkout -p HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
 
-Preparing worktree (new branch 'to-be-gone')
-HEAD is now at 2519212 init
-ok 25 - remove missing worktree
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 11 - git checkout -p HEAD^...
 
-expecting success of 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
+expecting success of 2016.12 'git checkout -p HEAD^': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git checkout -p HEAD^ &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
 
-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
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 12 - git checkout -p HEAD^
 
-expecting success of 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
+expecting success of 2016.13 'git checkout -p handles deletion': 
+	set_state dir/foo work index &&
+	rm dir/foo &&
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
 
-fatal: 'noodle' is not a working tree
-fatal: 'noodle/bork' is not a working tree
-ok 27 - proper error when worktree not found
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+deleted file mode 100644
+index 9015a7a..0000000
+--- a/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-index
+(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
+ok 13 - git checkout -p handles deletion
 
-expecting success of 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
+expecting success of 2016.14 'path limiting works: dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git checkout -p dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
 
-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)
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 14 - path limiting works: dir
 
-expecting success of 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
-	)
+expecting success of 2016.15 'path limiting works: -- dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git checkout -p -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 15 - path limiting works: -- dir
 
-expecting success of 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
-	)
+expecting success of 2016.16 'path limiting works: HEAD^ -- dir': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | git checkout -p HEAD^ -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
 
-Preparing worktree (detached HEAD 640b2c6)
-HEAD is now at 640b2c6 withsub
-ok 30 - remove a repo with uninitialized submodule
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 16 - path limiting works: HEAD^ -- dir
 
-expecting success of 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
-	)
+expecting success of 2016.17 'path limiting works: foo inside dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | (cd dir && git checkout -p foo) &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
 
-Preparing worktree (detached HEAD 640b2c6)
-HEAD is now at 640b2c6 withsub
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 17 - path limiting works: foo inside dir
 
-expecting success of 2403.32 'move worktree with absolute path to relative path': 
-	test_config worktree.useRelativePaths false &&
-	git worktree add ./absolute &&
-	git worktree move --relative-paths absolute relative &&
-	echo "gitdir: ../.git/worktrees/absolute" >expect &&
-	test_cmp expect relative/.git &&
-	echo "../../../relative/.git" >expect &&
-	test_cmp expect .git/worktrees/absolute/gitdir &&
-	test_config worktree.useRelativePaths true &&
-	git worktree move relative relative2 &&
-	echo "gitdir: ../.git/worktrees/absolute" >expect &&
-	test_cmp expect relative2/.git &&
-	echo "../../../relative2/.git" >expect &&
-	test_cmp expect .git/worktrees/absolute/gitdir
+expecting success of 2016.18 'none of this moved HEAD': 
+	verify_saved_head
 
-Preparing worktree (new branch 'absolute')
-HEAD is now at 2519212 init
-ok 32 - move worktree with absolute path to relative path
+ok 18 - none of this moved HEAD
 
-expecting success of 2403.33 'move worktree with relative path to absolute path': 
-	test_config worktree.useRelativePaths true &&
-	git worktree move --no-relative-paths relative2 absolute &&
-	echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect &&
-	test_cmp expect absolute/.git &&
-	echo "$(pwd)/absolute/.git" >expect &&
-	test_cmp expect .git/worktrees/absolute/gitdir
+expecting success of 2016.19 'empty tree can be handled': 
+	test_when_finished "git reset --hard" &&
+	git checkout -p $(test_oid empty_tree) --
 
-ok 33 - move worktree with relative path to absolute path
+diff --git b/bar a/bar
+deleted file mode 100644
+index 8c999e6..0000000
+--- b/bar
++++ /dev/null
+@@ -1 +0,0 @@
+-bar_work
+(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
+diff --git b/dir/foo a/dir/foo
+deleted file mode 100644
+index 564b12f..0000000
+--- b/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-head
+(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
+HEAD is now at 3319288 second
+ok 19 - empty tree can be handled
 
-# passed all 33 test(s)
-1..33
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2405-worktree-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
+*** t2018-checkout-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2018-checkout-branch/.git/
+expecting success of 2018.1 'setup': 
+	test_commit initial file1 &&
+	HEAD1=$(git rev-parse --verify HEAD) &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
+	test_commit change1 file1 &&
+	HEAD2=$(git rev-parse --verify HEAD) &&
+
+	git branch -m branch1
+
+[master (root-commit) ee02a18] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file1
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+[master 5be17a9] change1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup: create origin repos
+ok 1 - setup
 
-expecting success of 2405.2 'setup: clone superproject to create main worktree': 
-	git clone --recursive "$base_path/origin/main" main
+expecting success of 2018.2 'checkout a branch without refs/heads/* prefix': 
+	git clone --no-tags . repo-odd-prefix &&
+	(
+		cd repo-odd-prefix &&
 
-Cloning into 'main'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2405-worktree-submodule/main/sub'...
+		origin=$(git symbolic-ref refs/remotes/origin/HEAD) &&
+		git symbolic-ref refs/heads/a-branch "$origin" &&
+
+		git checkout -f a-branch &&
+		git checkout -f a-branch
+	)
+
+Cloning into 'repo-odd-prefix'...
 done.
-Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
-ok 2 - setup: clone superproject to create main worktree
+Switched to branch 'a-branch'
+Switched to branch 'a-branch'
+ok 2 - checkout a branch without refs/heads/* prefix
 
-expecting success of 2405.3 'add superproject worktree': 
-	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
+expecting success of 2018.3 'checkout -b to a new branch, set to HEAD': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+	do_checkout branch2
 
-Preparing worktree (detached HEAD 322c452)
-HEAD is now at 322c452 add sub
-ok 3 - add superproject worktree
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was 5be17a9).
+ok 3 - checkout -b to a new branch, set to HEAD
 
-checking known breakage of 2405.4 'submodule is checked out just after worktree add': 
-	git -C worktree diff --submodule main"^!" >out &&
-	grep "file1 updated" out
+expecting success of 2018.4 'checkout -b to a merge base': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+	git checkout -b branch2 branch1...
 
-not ok 4 - submodule is checked out just after worktree add # TODO known breakage
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was 5be17a9).
+ok 4 - checkout -b to a merge base
 
-expecting success of 2405.5 'add superproject worktree and initialize submodules': 
-	git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
-	git -C worktree-submodule-update submodule update
+expecting success of 2018.5 'checkout -b to a new branch, set to an explicit ref': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
+	do_checkout branch2 $HEAD1
 
-Preparing worktree (detached HEAD 322c452)
-HEAD is now at 322c452 add sub
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was ee02a18).
+ok 5 - checkout -b to a new branch, set to an explicit ref
 
-expecting success of 2405.6 'submodule is checked out just after submodule update in linked worktree': 
-	git -C worktree-submodule-update diff --submodule main"^!" >out &&
-	grep "file1 updated" out
+expecting success of 2018.6 'checkout -b to a new branch with unmergeable changes fails': 
+	setup_dirty_unmergeable &&
+	do_checkout ! branch2 $HEAD1 &&
+	test_dirty_unmergeable
 
-  > file1 updated
-ok 6 - submodule is checked out just after submodule update in linked worktree
+error: Your local changes to the following files would be overwritten by checkout:
+	file1
+Please commit your changes or stash them before you switch branches.
+Aborting
+diff --git a/file1 b/file1
+index 5be4a41..1725fe9 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ change1
++change2
+ok 6 - checkout -b to a new branch with unmergeable changes fails
 
-expecting success of 2405.7 'add superproject worktree and manually add submodule worktree': 
-	git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
-	git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
+expecting success of 2018.7 'checkout -f -b to a new branch with unmergeable changes discards changes': 
+	test_when_finished "
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
 
-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
+	# still dirty and on branch1
+	do_checkout branch2 $HEAD1 "-f -b" &&
+	test_dirty_unmergeable_discards_changes
 
-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
+Switched to a new branch 'branch2'
+Switched to branch 'branch1'
+Deleted branch branch2 (was ee02a18).
+ok 7 - checkout -f -b to a new branch with unmergeable changes discards changes
 
-  > file1 updated
-ok 8 - submodule is checked out after manually adding submodule worktree
+expecting success of 2018.8 'checkout -b to a new branch preserves mergeable changes': 
+	test_when_finished "
+		git reset --hard &&
+		git checkout branch1 &&
+		test_might_fail git branch -D branch2" &&
 
-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
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 &&
+	test_dirty_mergeable
 
-Preparing worktree (detached HEAD d717f19)
-HEAD is now at d717f19 sub updated
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+Switched to a new branch 'branch2'
+A	file2
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..6c493ff
+--- /dev/null
++++ b/file2
+@@ -0,0 +1 @@
++file2
+HEAD is now at ee02a18 initial
+Switched to branch 'branch1'
+Deleted branch branch2 (was ee02a18).
+ok 8 - checkout -b to a new branch preserves mergeable changes
 
-expecting success of 2405.10 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config': 
-	echo "../../../sub" >expect-main &&
-	git -C main/sub config --get core.worktree >actual-main &&
-	test_cmp expect-main actual-main &&
-	echo "../../../../../../checkout-recurse/sub" >expect-linked &&
-	git -C checkout-recurse/sub config --get core.worktree >actual-linked &&
-	test_cmp expect-linked actual-linked &&
-	git -C checkout-recurse checkout --recurse-submodules first &&
-	test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
-	test_must_be_empty linked-config &&
-	git -C main/sub config --get core.worktree >actual-main &&
-	test_cmp expect-main actual-main
+expecting success of 2018.9 'checkout -f -b to a new branch with mergeable changes discards changes': 
+	test_when_finished git reset --hard HEAD &&
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 "-f -b" &&
+	test_dirty_mergeable_discards_changes
 
-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
+Switched to a new branch 'branch2'
+HEAD is now at ee02a18 initial
+ok 9 - checkout -f -b to a new branch with mergeable changes discards changes
 
-expecting success of 2405.11 'unsetting core.worktree does not prevent running commands directly against the submodule repository': 
-	git -C main/.git/worktrees/checkout-recurse/modules/sub log
+expecting success of 2018.10 'checkout -b to an existing branch fails': 
+	test_when_finished git reset --hard HEAD &&
+	do_checkout ! branch2 $HEAD2
 
-commit 69af1687b671131ed0cfa61b7fcdc907a4c21f2c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+fatal: a branch named 'branch2' already exists
+HEAD is now at ee02a18 initial
+ok 10 - checkout -b to an existing branch fails
 
-    file1
-ok 11 - unsetting core.worktree does not prevent running commands directly against the submodule repository
+expecting success of 2018.11 'checkout -b to @{-1} fails with the right branch name': 
+	git checkout branch1 &&
+	git checkout branch2 &&
+	echo  >expect "fatal: a branch named 'branch1' already exists" &&
+	test_must_fail git checkout -b @{-1} 2>actual &&
+	test_cmp expect actual
 
-# still have 1 known breakage(s)
-# passed all remaining 10 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2406-worktree-repair.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/
-expecting success of 2406.1 'setup': 
-	test_commit init
+Switched to branch 'branch1'
+Switched to branch 'branch2'
+ok 11 - checkout -b to @{-1} fails with the right branch name
 
-[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 2018.12 'checkout -B to an existing branch resets branch to HEAD': 
+	git checkout branch1 &&
 
-expecting success of 2406.2 'skip missing worktree': 
-	test_when_finished "git worktree prune" &&
-	git worktree add --detach missing &&
-	rm -rf missing &&
-	git worktree repair >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err
+	do_checkout branch2 "" -B
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 2 - skip missing worktree
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 12 - checkout -B to an existing branch resets branch to HEAD
 
-expecting success of 2406.3 'worktree path not directory': 
-	test_when_finished "git worktree prune" &&
-	git worktree add --detach notdir &&
-	rm -rf notdir &&
-	>notdir &&
-	test_must_fail git worktree repair >out 2>err &&
-	test_must_be_empty out &&
-	test_grep "not a directory" err
+expecting success of 2018.13 'checkout -B to a merge base': 
+	git checkout branch1 &&
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-error: not a directory: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/notdir
-ok 3 - worktree path not directory
+	git checkout -B branch2 branch1...
 
-expecting success of 2406.4 'don't clobber .git repo': 
-	test_when_finished "rm -rf repo && git worktree prune" &&
-	git worktree add --detach repo &&
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_must_fail git worktree repair >out 2>err &&
-	test_must_be_empty out &&
-	test_grep ".git is not a file" err
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 13 - checkout -B to a merge base
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/repo/.git/
-error: .git is not a file: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/repo
-ok 4 - don't clobber .git repo
+expecting success of 2018.14 'checkout -B to an existing branch from detached HEAD resets branch to HEAD': 
+	head=$(git rev-parse --verify HEAD) &&
+	git checkout "$head" &&
 
-expecting success of 2406.5 'repair missing .git file': 
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
+	do_checkout branch2 "" -B
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
-ok 5 - repair missing .git file
+Note: switching to '5be17a9503605cbff49376bccdc74acb1ebd9160'.
 
-expecting success of 2406.6 'repair bogus .git file': 
-	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
-		".git file broken"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
-ok 6 - repair bogus .git file
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 2406.7 'repair incorrect .git file': 
-	test_when_finished "rm -rf other && git worktree prune" &&
-	test_create_repo other &&
-	other=$(git -C other rev-parse --absolute-git-dir) &&
-	test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \
-		".git file incorrect"
+  git switch -c <new-branch-name>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/other/.git/
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
-ok 7 - repair incorrect .git file
+Or undo this operation with:
 
-expecting success of 2406.8 'repair .git file from main/.git': 
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
+  git switch -
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
-ok 8 - repair .git file from main/.git
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 2406.9 'repair .git file from linked worktree': 
-	test_when_finished "rm -rf other && git worktree prune" &&
-	git worktree add --detach other &&
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" other
+HEAD is now at 5be17a9 change1
+Switched to and reset branch 'branch2'
+ok 14 - checkout -B to an existing branch from detached HEAD resets branch to HEAD
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
-ok 9 - repair .git file from linked worktree
+expecting success of 2018.15 'checkout -B to an existing branch with an explicit ref resets branch to that ref': 
+	git checkout branch1 &&
 
-expecting success of 2406.10 'repair .git file from bare.git': 
-	test_when_finished "rm -rf bare.git corrupt && git worktree prune" &&
-	git clone --bare . bare.git &&
-	git -C bare.git worktree add --detach ../corrupt &&
-	git -C corrupt rev-parse --absolute-git-dir >expect &&
-	rm -f corrupt/.git &&
-	git -C bare.git worktree repair &&
-	git -C corrupt rev-parse --absolute-git-dir >actual &&
-	test_cmp expect actual
+	do_checkout branch2 $HEAD1 -B
 
-Cloning into bare repository 'bare.git'...
-done.
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
-ok 10 - repair .git file from bare.git
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 15 - checkout -B to an existing branch with an explicit ref resets branch to that ref
 
-expecting success of 2406.11 'invalid worktree path': 
-	test_must_fail git worktree repair /notvalid >out 2>err &&
-	test_must_be_empty out &&
-	test_grep "not a valid path" err
+expecting success of 2018.16 'checkout -B to an existing branch with unmergeable changes fails': 
+	git checkout branch1 &&
 
-error: not a valid path: /notvalid
-ok 11 - invalid worktree path
+	setup_dirty_unmergeable &&
+	do_checkout ! branch2 $HEAD1 -B &&
+	test_dirty_unmergeable
 
-expecting success of 2406.12 'repo not found; .git not file': 
-	test_when_finished "rm -rf not-a-worktree" &&
-	test_create_repo not-a-worktree &&
-	test_must_fail git worktree repair not-a-worktree >out 2>err &&
-	test_must_be_empty out &&
-	test_grep ".git is not a file" err
+Switched to branch 'branch1'
+error: Your local changes to the following files would be overwritten by checkout:
+	file1
+Please commit your changes or stash them before you switch branches.
+Aborting
+diff --git a/file1 b/file1
+index 5be4a41..1725fe9 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ change1
++change2
+ok 16 - checkout -B to an existing branch with unmergeable changes fails
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/not-a-worktree/.git/
-error: unable to locate repository; .git is not a file: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/not-a-worktree/.git
-ok 12 - repo not found; .git not file
+expecting success of 2018.17 'checkout -f -B to an existing branch with unmergeable changes discards changes': 
+	# still dirty and on branch1
+	do_checkout branch2 $HEAD1 "-f -B" &&
+	test_dirty_unmergeable_discards_changes
 
-expecting success of 2406.13 'repo not found; .git not referencing repo': 
-	test_when_finished "rm -rf side not-a-repo && git worktree prune" &&
-	git worktree add --detach side &&
-	sed s,\.git/worktrees/side$,not-a-repo, side/.git >side/.newgit &&
-	mv side/.newgit side/.git &&
-	mkdir not-a-repo &&
-	test_must_fail git worktree repair side 2>err &&
-	test_grep ".git file does not reference a repository" err
+Switched to and reset branch 'branch2'
+ok 17 - checkout -f -B to an existing branch with unmergeable changes discards changes
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-error: unable to locate repository; .git file does not reference a repository: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/side/.git
-ok 13 - repo not found; .git not referencing repo
+expecting success of 2018.18 'checkout -B to an existing branch preserves mergeable changes': 
+	test_when_finished git reset --hard &&
+	git checkout branch1 &&
 
-expecting success of 2406.14 'repo not found; .git file broken': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	echo /invalid >orig/.git &&
-	mv orig moved &&
-	test_must_fail git worktree repair moved >out 2>err &&
-	test_must_be_empty out &&
-	test_grep ".git file broken" err
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 -B &&
+	test_dirty_mergeable
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-error: unable to locate repository; .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/moved/.git
-ok 14 - repo not found; .git file broken
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+A	file2
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..6c493ff
+--- /dev/null
++++ b/file2
+@@ -0,0 +1 @@
++file2
+HEAD is now at ee02a18 initial
+ok 18 - checkout -B to an existing branch preserves mergeable changes
 
-expecting success of 2406.15 'repair broken gitdir': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
-	rm .git/worktrees/orig/gitdir &&
-	mv orig moved &&
-	git worktree repair moved 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_grep "gitdir unreadable" err
+expecting success of 2018.19 'checkout -f -B to an existing branch with mergeable changes discards changes': 
+	git checkout branch1 &&
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir unreadable: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 15 - repair broken gitdir
+	setup_dirty_mergeable &&
+	do_checkout branch2 $HEAD1 "-f -B" &&
+	test_dirty_mergeable_discards_changes
 
-expecting success of 2406.16 'repair incorrect gitdir': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
-	mv orig moved &&
-	git worktree repair moved 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_grep "gitdir incorrect" err
+Switched to branch 'branch1'
+Switched to and reset branch 'branch2'
+ok 19 - checkout -f -B to an existing branch with mergeable changes discards changes
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 16 - repair incorrect gitdir
+expecting success of 2018.20 'checkout -b <describe>': 
+	git tag -f -m "First commit" initial initial &&
+	git checkout -f change1 &&
+	name=$(git describe) &&
+	git checkout -b $name &&
+	git diff --exit-code change1 &&
+	echo "refs/heads/$name" >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 2406.17 'repair gitdir (implicit) from linked worktree': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
-	mv orig moved &&
-	git -C moved worktree repair 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_grep "gitdir incorrect" err
+Updated tag 'initial' (was ee02a18)
+Note: switching to 'change1'.
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 17 - repair gitdir (implicit) from linked worktree
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 2406.18 'unable to repair gitdir (implicit) from main worktree': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	cat .git/worktrees/orig/gitdir >expect &&
-	mv orig moved &&
-	git worktree repair 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_must_be_empty err
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 18 - unable to repair gitdir (implicit) from main worktree
+  git switch -c <new-branch-name>
 
-expecting success of 2406.19 'repair multiple gitdir files': 
-	test_when_finished "rm -rf orig1 orig2 moved1 moved2 &&
-		git worktree prune" &&
-	git worktree add --detach orig1 &&
-	git worktree add --detach orig2 &&
-	sed s,orig1/\.git$,moved1/.git, .git/worktrees/orig1/gitdir >expect1 &&
-	sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 &&
-	mv orig1 moved1 &&
-	mv orig2 moved2 &&
-	git worktree repair moved1 moved2 2>err &&
-	test_cmp expect1 .git/worktrees/orig1/gitdir &&
-	test_cmp expect2 .git/worktrees/orig2/gitdir &&
-	test_grep "gitdir incorrect:.*orig1/gitdir$" err &&
-	test_grep "gitdir incorrect:.*orig2/gitdir$" err
+Or undo this operation with:
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
-repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig2/gitdir
-ok 19 - repair multiple gitdir files
+  git switch -
 
-expecting success of 2406.20 'repair moved main and linked worktrees': 
-	test_when_finished "rm -rf main side mainmoved sidemoved" &&
-	test_create_repo main &&
-	test_commit -C main init &&
-	git -C main worktree add --detach ../side &&
-	sed "s,side/\.git$,sidemoved/.git," \
-		main/.git/worktrees/side/gitdir >expect-gitdir &&
-	sed "s,main/.git/worktrees/side$,mainmoved/.git/worktrees/side," \
-		side/.git >expect-gitfile &&
-	mv main mainmoved &&
-	mv side sidemoved &&
-	git -C mainmoved worktree repair ../sidemoved &&
-	test_cmp expect-gitdir mainmoved/.git/worktrees/side/gitdir &&
-	test_cmp expect-gitfile sidemoved/.git
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) f54694c] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD f54694c)
-HEAD is now at f54694c init
-repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/mainmoved/.git/worktrees/side/gitdir
-ok 20 - repair moved main and linked worktrees
+HEAD is now at 5be17a9 change1
+Switched to a new branch 'initial-1-g5be17a9'
+ok 20 - checkout -b <describe>
 
-expecting success of 2406.21 'repair copied main and linked worktrees': 
-	test_when_finished "rm -rf orig dup" &&
-	mkdir -p orig &&
-	git -C orig init main &&
-	test_commit -C orig/main nothing &&
-	git -C orig/main worktree add ../linked &&
-	cp orig/main/.git/worktrees/linked/gitdir orig/main.expect &&
-	cp orig/linked/.git orig/linked.expect &&
-	cp -R orig dup &&
-	sed "s,orig/linked/\.git$,dup/linked/.git," orig/main.expect >dup/main.expect &&
-	sed "s,orig/main/\.git/worktrees/linked$,dup/main/.git/worktrees/linked," \
-		orig/linked.expect >dup/linked.expect &&
-	git -C dup/main worktree repair ../linked &&
-	test_cmp orig/main.expect orig/main/.git/worktrees/linked/gitdir &&
-	test_cmp orig/linked.expect orig/linked/.git &&
-	test_cmp dup/main.expect dup/main/.git/worktrees/linked/gitdir &&
-	test_cmp dup/linked.expect dup/linked/.git
+expecting success of 2018.21 'checkout -B to the current branch works': 
+	git checkout branch1 &&
+	git checkout -B branch1-scratch &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/orig/main/.git/
-[master (root-commit) a5c17d1] nothing
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nothing.t
-Preparing worktree (new branch 'linked')
-HEAD is now at a5c17d1 nothing
-repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/dup/main/.git/worktrees/linked/gitdir
-ok 21 - repair copied main and linked worktrees
+	setup_dirty_mergeable &&
+	git checkout -B branch1-scratch initial &&
+	test_dirty_mergeable
 
-expecting success of 2406.22 'repair worktree with relative path with missing gitfile': 
-	test_when_finished "rm -rf main wt" &&
-	test_create_repo main &&
-	git -C main config worktree.useRelativePaths true &&
-	test_commit -C main init &&
-	git -C main worktree add --detach ../wt &&
-	rm wt/.git &&
-	test_path_is_missing wt/.git &&
-	git -C main worktree repair &&
-	echo "gitdir: ../main/.git/worktrees/wt" >expect &&
-	test_cmp expect wt/.git
+Switched to branch 'branch1'
+Switched to a new branch 'branch1-scratch'
+Reset branch 'branch1-scratch'
+A	file2
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..6c493ff
+--- /dev/null
++++ b/file2
+@@ -0,0 +1 @@
++file2
+ok 21 - checkout -B to the current branch works
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) 49cd008] init
+expecting success of 2018.22 'checkout -b after clone --no-checkout does a checkout of HEAD': 
+	git init src &&
+	test_commit -C src a &&
+	rev="$(git -C src rev-parse HEAD)" &&
+	git clone --no-checkout src dest &&
+	git -C dest checkout "$rev" -b branch &&
+	test_path_is_file dest/a.t
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2018-checkout-branch/src/.git/
+[master (root-commit) 7f0b538] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD 49cd008)
-HEAD is now at 49cd008 init
-repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/wt
-ok 22 - repair worktree with relative path with missing gitfile
+ create mode 100644 a.t
+Cloning into 'dest'...
+done.
+Switched to a new branch 'branch'
+ok 22 - checkout -b after clone --no-checkout does a checkout of HEAD
 
-expecting success of 2406.23 'repair absolute worktree to use relative paths': 
-	test_when_finished "rm -rf main side sidemoved" &&
-	test_create_repo main &&
-	test_commit -C main init &&
-	git -C main worktree add --detach ../side &&
-	echo "../../../../sidemoved/.git" >expect-gitdir &&
-	echo "gitdir: ../main/.git/worktrees/side" >expect-gitfile &&
-	mv side sidemoved &&
-	git -C main worktree repair --relative-paths ../sidemoved &&
-	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
-	test_cmp expect-gitfile sidemoved/.git
+expecting success of 2018.23 'checkout -b to a new branch preserves mergeable changes despite sparse-checkout': 
+	test_when_finished "
+		git reset --hard &&
+		git checkout branch1-scratch &&
+		test_might_fail git branch -D branch3 &&
+		git config core.sparseCheckout false &&
+		rm -rf .git/info" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) 7e6fdee] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD 7e6fdee)
-HEAD is now at 7e6fdee init
-repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
-repair: .git file absolute/relative path mismatch: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/sidemoved
-ok 23 - repair absolute worktree to use relative paths
+	test_commit file2 &&
 
-expecting success of 2406.24 'repair relative worktree to use absolute paths': 
-	test_when_finished "rm -rf main side sidemoved" &&
-	test_create_repo main &&
-	test_commit -C main init &&
-	git -C main worktree add --relative-paths --detach ../side &&
-	echo "$(pwd)/sidemoved/.git" >expect-gitdir &&
-	echo "gitdir: $(pwd)/main/.git/worktrees/side" >expect-gitfile &&
-	mv side sidemoved &&
-	git -C main worktree repair ../sidemoved &&
-	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
-	test_cmp expect-gitfile sidemoved/.git
+	echo stuff >>file1 &&
+	mkdir .git/info &&
+	echo file2 >.git/info/sparse-checkout &&
+	git config core.sparseCheckout true &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) 6f4234e] init
+	CURHEAD=$(git rev-parse HEAD) &&
+	do_checkout branch3 $CURHEAD &&
+
+	echo file1 >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual
+
+[branch1-scratch b9d73e8] file2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD 6f4234e)
-HEAD is now at 6f4234e init
-repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
-ok 24 - repair relative worktree to use absolute paths
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file2
+ create mode 100644 file2.t
+warning: The following paths are not up to date and were left despite sparse patterns:
+	file1
 
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+Switched to a new branch 'branch3'
+M	file1
+HEAD is now at b9d73e8 file2
+Switched to branch 'branch1-scratch'
+Deleted branch branch3 (was b9d73e8).
+ok 23 - checkout -b to a new branch preserves mergeable changes despite sparse-checkout
 
-	git init sub &&
-	(
-		cd sub &&
-		git checkout -b B2 &&
-		echo B2 >file &&
-		git add file &&
-		git commit -m file &&
+expecting success of 2018.24 'checkout -b rejects an invalid start point': 
+	test_must_fail git checkout -b branch4 file1 2>err &&
+	test_grep "is not a commit" err
 
-		git checkout -b B1 &&
-		echo B1 >file &&
-		git add file &&
-		git commit -m file
-	) &&
+fatal: 'file1' is not a commit and a branch 'branch4' cannot be created from it
+ok 24 - checkout -b rejects an invalid start point
 
-	git init various &&
-	(
-		cd various &&
+expecting success of 2018.25 'checkout -b rejects an extra path argument': 
+	test_must_fail git checkout -b branch5 branch1 file1 2>err &&
+	test_grep "Cannot update paths and switch to branch" err
 
-		git checkout -b B1 &&
-		mkdir a c e &&
-		echo a/a >a/a &&
-		echo b >b &&
-		echo c/c >c/c &&
-		test_ln_s_add c d &&
-		echo e/e >e/e &&
-		git submodule add ../sub f &&
-		git submodule add ../sub g &&
-		test_ln_s_add c h &&
+fatal: Cannot update paths and switch to branch 'branch5' at the same time.
+ok 25 - checkout -b rejects an extra path argument
 
-		echo "B1 i" >i &&
-		test_ln_s_add c j &&
-		git submodule add -b B1 ../sub k &&
-		mkdir l &&
-		echo l/l >l/l &&
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2022-checkout-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
 
-		git add . &&
-		git commit -m B1 &&
+[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
 
-		git checkout -b B2 &&
-		git rm -rf :^.gitmodules :^k &&
-		mkdir b d f &&
-		echo a >a &&
-		echo b/b >b/b &&
-		test_ln_s_add b c &&
-		echo d/d >d/d &&
-		git submodule add ../sub e &&
-		echo f/f >f/f &&
-		test_ln_s_add b g &&
-		git submodule add ../sub h &&
+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 &&
 
-		echo "B2 i" >i &&
-		test_ln_s_add b j &&
-		git -C k checkout B2 &&
-		mkdir m &&
-		echo m/m >m/m &&
+	git checkout main dir &&
 
-		git add . &&
-		git commit -m B2 &&
+	test_cmp expect.common dir/common &&
+	test_path_is_file dir/main &&
+	git diff --exit-code main dir/main &&
 
-		git checkout --recurse-submodules B1
-	)
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub/.git/
-Switched to a new branch 'B2'
-[B2 (root-commit) 880a0eb] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'B1'
-[B1 0f06b39] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/.git/
-Switched to a new branch 'B1'
-checking prerequisite: SYMLINKS
+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
 
-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 2022.3 'do not touch unmerged entries matching $path but not in $tree': 
+	git checkout next &&
+	git reset --hard &&
 
-)
-prerequisite SYMLINKS ok
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/f'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/g'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/k'...
-done.
-[B1 (root-commit) 46a23ce] B1
- Author: A U Thor <author@example.com>
- 13 files changed, 22 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 a/a
- create mode 100644 b
- create mode 100644 c/c
- create mode 120000 d
- create mode 100644 e/e
- create mode 160000 f
- create mode 160000 g
- create mode 120000 h
- create mode 100644 i
- create mode 120000 j
- create mode 160000 k
- create mode 100644 l/l
-Switched to a new branch 'B2'
-rm 'a/a'
-rm 'b'
-rm 'c/c'
-rm 'd'
-rm 'e/e'
-rm 'f'
-rm 'g'
-rm 'h'
-rm 'i'
-rm 'j'
-rm 'l/l'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/e'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/h'...
-done.
-Switched to a new branch 'B2'
-branch 'B2' set up to track 'origin/B2'.
-[B2 176cae8] B2
- Author: A U Thor <author@example.com>
- 19 files changed, 17 insertions(+), 17 deletions(-)
- create mode 100644 a
- delete mode 100644 a/a
- delete mode 100644 b
- create mode 100644 b/b
- create mode 120000 c
- delete mode 100644 c/c
- delete mode 120000 d
- create mode 100644 d/d
- rename f => e (100%)
- delete mode 100644 e/e
- create mode 100644 f/f
- mode change 160000 => 120000 g
- mode change 120000 => 160000 h
- delete mode 100644 l/l
- create mode 100644 m/m
-Switched to branch 'B1'
-ok 1 - setup repo for checkout with various types of changes
+	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 &&
 
-expecting success of 2080.2 'sequential checkout': 
-		repo=various_$mode &&
-		cp -R -P various $repo &&
+	git checkout main dir &&
 
-		# The just copied files have more recent timestamps than their
-		# associated index entries. So refresh the cached timestamps
-		# to avoid an "entry not up-to-date" error from `git checkout`.
-		# We only have to do this for the submodules as `git checkout`
-		# will already refresh the superproject index before performing
-		# the up-to-date check.
-		#
-		git -C $repo submodule foreach "git update-index --refresh" &&
+	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
 
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git -C $repo checkout --recurse-submodules B2 &&
-		verify_checkout $repo
-	
-Entering 'f'
-Entering 'g'
-Entering 'k'
-Switched to branch 'B2'
-ok 2 - sequential checkout
+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 2080.3 'parallel checkout': 
-		repo=various_$mode &&
-		cp -R -P various $repo &&
+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
 
-		# The just copied files have more recent timestamps than their
-		# associated index entries. So refresh the cached timestamps
-		# to avoid an "entry not up-to-date" error from `git checkout`.
-		# We only have to do this for the submodules as `git checkout`
-		# will already refresh the superproject index before performing
-		# the up-to-date check.
-		#
-		git -C $repo submodule foreach "git update-index --refresh" &&
+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
 
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git -C $repo checkout --recurse-submodules B2 &&
-		verify_checkout $repo
-	
-Entering 'f'
-Entering 'g'
-Entering 'k'
-Switched to branch 'B2'
-ok 3 - parallel checkout
+expecting success of 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
 
-expecting success of 2080.4 'sequential-fallback checkout': 
-		repo=various_$mode &&
-		cp -R -P various $repo &&
+[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
 
-		# The just copied files have more recent timestamps than their
-		# associated index entries. So refresh the cached timestamps
-		# to avoid an "entry not up-to-date" error from `git checkout`.
-		# We only have to do this for the submodules as `git checkout`
-		# will already refresh the superproject index before performing
-		# the up-to-date check.
-		#
-		git -C $repo submodule foreach "git update-index --refresh" &&
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2023-checkout-m.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2023-checkout-m/.git/
+expecting success of 2023.1 'setup': 
+	test_tick &&
+	test_commit both.txt both.txt initial &&
+	git branch topic &&
+	test_commit modified_in_main both.txt in_main &&
+	test_commit added_in_main each.txt in_main &&
+	git checkout topic &&
+	test_commit modified_in_topic both.txt in_topic &&
+	test_commit added_in_topic each.txt in_topic
 
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git -C $repo checkout --recurse-submodules B2 &&
-		verify_checkout $repo
-	
-Entering 'f'
-Entering 'g'
-Entering 'k'
-Switched to branch 'B2'
-ok 4 - sequential-fallback checkout
+[main (root-commit) 7a8c5bf] both.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 both.txt
+[main caa44c2] modified_in_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 8422e32] added_in_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 each.txt
+Switched to branch 'topic'
+[topic 33542d7] modified_in_topic
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[topic d46615c] added_in_topic
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 each.txt
+ok 1 - setup
 
-expecting success of 2080.5 'parallel checkout on clone': 
-		test_config_global protocol.file.allow always &&
-		repo=various_${mode}_clone &&
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git clone --recurse-submodules --branch B2 various $repo &&
-		verify_checkout $repo
-	
-Cloning into 'various_parallel_clone'...
-done.
-Submodule 'e' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
-Submodule 'h' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
-Submodule 'k' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/e'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/h'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/k'...
-done.
-Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
-ok 5 - parallel checkout on clone
+expecting success of 2023.2 'git merge main': 
+    test_must_fail git merge main
 
-expecting success of 2080.6 'sequential-fallback checkout on clone': 
-		test_config_global protocol.file.allow always &&
-		repo=various_${mode}_clone &&
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git clone --recurse-submodules --branch B2 various $repo &&
-		verify_checkout $repo
-	
-Cloning into 'various_sequential-fallback_clone'...
-done.
-Submodule 'e' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
-Submodule 'h' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
-Submodule 'k' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/e'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/h'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/k'...
-done.
-Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
-ok 6 - sequential-fallback checkout on clone
+Auto-merging both.txt
+CONFLICT (content): Merge conflict in both.txt
+Auto-merging each.txt
+CONFLICT (add/add): Merge conflict in each.txt
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - git merge main
 
-expecting success of 2080.7 'compare the working trees': 
-	rm -rf various_*/.git &&
-	rm -rf various_*/*/.git &&
+expecting success of 2023.3 '-m restores 2-way conflicted+resolved file': 
+	cp each.txt each.txt.conflicted &&
+	echo resolved >each.txt &&
+	git add each.txt &&
+	git checkout -m -- each.txt &&
+	clean_branchnames <each.txt >each.txt.cleaned &&
+	clean_branchnames <each.txt.conflicted >each.txt.conflicted.cleaned &&
+	test_cmp each.txt.conflicted.cleaned each.txt.cleaned
 
-	# We use `git diff` instead of `diff -r` because the latter would
-	# follow symlinks, and not all `diff` implementations support the
-	# `--no-dereference` option.
-	#
-	git diff --no-index various_sequential various_parallel &&
-	git diff --no-index various_sequential various_parallel_clone &&
-	git diff --no-index various_sequential various_sequential-fallback &&
-	git diff --no-index various_sequential various_sequential-fallback_clone
+ok 3 - -m restores 2-way conflicted+resolved file
 
-ok 7 - compare the working trees
+expecting success of 2023.4 '-m restores 3-way conflicted+resolved file': 
+	cp both.txt both.txt.conflicted &&
+	echo resolved >both.txt &&
+	git add both.txt &&
+	git checkout -m -- both.txt &&
+	clean_branchnames <both.txt >both.txt.cleaned &&
+	clean_branchnames <both.txt.conflicted >both.txt.conflicted.cleaned &&
+	test_cmp both.txt.conflicted.cleaned both.txt.cleaned
 
-expecting success of 2080.8 'submodules can use parallel checkout': 
-	set_checkout_config 2 0 &&
-	git init super &&
+ok 4 - -m restores 3-way conflicted+resolved file
+
+expecting success of 2023.5 'force checkout a conflict file creates stage zero entry': 
+	git init co-force &&
 	(
-		cd super &&
-		git init sub &&
-		test_commit -C sub A &&
-		test_commit -C sub B &&
-		git submodule add ./sub &&
-		git commit -m sub &&
-		rm sub/* &&
-		test_checkout_workers 2 git checkout --recurse-submodules .
+		cd co-force &&
+		echo a >a &&
+		git add a &&
+		git commit -ama &&
+		A_OBJ=$(git rev-parse :a) &&
+		git branch topic &&
+		echo b >a &&
+		git commit -amb &&
+		B_OBJ=$(git rev-parse :a) &&
+		git checkout topic &&
+		echo c >a &&
+		C_OBJ=$(git hash-object a) &&
+		git checkout -m main &&
+		test_cmp_rev :1:a $A_OBJ &&
+		test_cmp_rev :2:a $B_OBJ &&
+		test_cmp_rev :3:a $C_OBJ &&
+		git checkout -f topic &&
+		test_cmp_rev :0:a $A_OBJ
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git/
-[master (root-commit) 0ddfaf1] A
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2023-checkout-m/co-force/.git/
+[main (root-commit) b7442a0] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
+ create mode 100644 a
+[main 7529dfa] b
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Adding existing repo at 'sub' to the index
-[master (root-commit) 00b6c10] sub
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'topic'
+Switched to branch 'main'
+M	a
+Switched to branch 'topic'
+ok 5 - force checkout a conflict file creates stage zero entry
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2025-checkout-no-overlay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2025-checkout-no-overlay/.git/
+expecting success of 2025.1 'setup': 
+	git commit --allow-empty -m "initial"
+
+[master (root-commit) 8b2b4f6] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Migrating git directory of 'sub' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/.git/modules/sub'
-Updated 0 paths from the index
-ok 8 - submodules can use parallel checkout
+ok 1 - setup
 
-expecting success of 2080.9 'parallel checkout respects --[no]-force': 
-	set_checkout_config 2 0 &&
-	git init dirty &&
-	(
-		cd dirty &&
-		mkdir D &&
-		test_commit D/F &&
-		test_commit F &&
+expecting success of 2025.2 'checkout --no-overlay deletes files not in <tree-ish>': 
+	>file &&
+	mkdir dir &&
+	>dir/file1 &&
+	git add file dir/file1 &&
+	git checkout --no-overlay HEAD -- file &&
+	test_path_is_missing file &&
+	test_path_is_file dir/file1
 
-		rm -rf D &&
-		echo changed >D &&
-		echo changed >F.t &&
+ok 2 - checkout --no-overlay deletes files not in <tree-ish>
 
-		# We expect 0 workers because there is nothing to be done
-		test_checkout_workers 0 git checkout HEAD &&
-		test_path_is_file D &&
-		grep changed D &&
-		grep changed F.t &&
+expecting success of 2025.3 'checkout --no-overlay removing last file from directory': 
+	git checkout --no-overlay HEAD -- dir/file1 &&
+	test_path_is_missing dir
 
-		test_checkout_workers 2 git checkout --force HEAD &&
-		test_path_is_dir D &&
-		grep D/F D/F.t &&
-		grep F F.t
-	)
+ok 3 - checkout --no-overlay removing last file from directory
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/dirty/.git/
-[master (root-commit) e516e44] D/F
+expecting success of 2025.4 'checkout -p --overlay is disallowed': 
+	test_must_fail git checkout -p --overlay HEAD 2>actual &&
+	test_grep "fatal: options .-p. and .--overlay. cannot be used together" actual
+
+fatal: options '-p' and '--overlay' cannot be used together
+ok 4 - checkout -p --overlay is disallowed
+
+expecting success of 2025.5 '--no-overlay --theirs with D/F conflict deletes file': 
+	test_commit file1 file1 &&
+	test_commit file2 file2 &&
+	git rm --cached file1 &&
+	echo 1234 >file1 &&
+	F1=$(git rev-parse HEAD:file1) &&
+	F2=$(git rev-parse HEAD:file2) &&
+	{
+		echo "100644 $F1 1	file1" &&
+		echo "100644 $F2 2	file1"
+	} | git update-index --index-info &&
+	test_path_is_file file1 &&
+	git checkout --theirs --no-overlay -- file1 &&
+	test_path_is_missing file1
+
+[master a11d2b7] file1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 D/F.t
-[master a9126ab] F
+ create mode 100644 file1
+[master 1c03fe1] file2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-D	D/F.t
-M	F.t
-changed
-changed
-D/F
-F
-ok 9 - parallel checkout respects --[no]-force
+ create mode 100644 file2
+rm 'file1'
+ok 5 - --no-overlay --theirs with D/F conflict deletes file
 
-checking prerequisite: SYMLINKS
+expecting success of 2025.6 'wildcard pathspec matches file in subdirectory': 
+	git reset --hard &&
+	mkdir subdir &&
+	test_commit file3-1 subdir/file3 &&
+	test_commit file3-2 subdir/file3 &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	git checkout --no-overlay file3-1 "*file3" &&
+	echo file3-1 >expect &&
+	test_path_is_file subdir/file3 &&
+	test_cmp expect subdir/file3
 
-)
-prerequisite SYMLINKS ok
-expecting success of 2080.10 'parallel checkout checks for symlinks in leading dirs': 
-	set_checkout_config 2 0 &&
-	git init symlinks &&
-	(
-		cd symlinks &&
-		mkdir D untracked &&
-		# Commit 2 files to have enough work for 2 parallel workers
-		test_commit D/A &&
-		test_commit D/B &&
-		rm -rf D &&
-		ln -s untracked D &&
+HEAD is now at 1c03fe1 file2
+[master 78da8bb] file3-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/file3
+[master cac8ac6] file3-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Updated 1 path from e1fb72e
+ok 6 - wildcard pathspec matches file in subdirectory
 
-		test_checkout_workers 2 git checkout --force HEAD &&
-		! test -h D &&
-		grep D/A D/A.t &&
-		grep D/B D/B.t
-	)
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2027-checkout-track.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2027-checkout-track/.git/
+expecting success of 2027.1 'setup': 
+	test_commit one &&
+	test_commit two
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/symlinks/.git/
-[master (root-commit) dce6a14] D/A
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 D/A.t
-[master 59586d4] D/B
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 D/B.t
-D/A
-D/B
-ok 10 - parallel checkout checks for symlinks in leading dirs
+ create mode 100644 two.t
+ok 1 - setup
 
-expecting success of 2080.11 '"git checkout ." report should not include failed entries': 
-	test_config_global filter.delay.process \
-		"test-tool rot13-filter --always-delay --log=delayed.log clean smudge delay" &&
-	test_config_global filter.delay.required true &&
-	test_config_global filter.cat.clean cat  &&
-	test_config_global filter.cat.smudge cat  &&
-	test_config_global filter.cat.required true  &&
+expecting success of 2027.2 'checkout --track -b creates a new tracking branch': 
+	git checkout --track -b branch1 main &&
+	test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
+	test $(git config --get branch.branch1.remote) = . &&
+	test $(git config --get branch.branch1.merge) = refs/heads/main
 
-	set_checkout_config 2 0 &&
-	git init failed_entries &&
-	(
-		cd failed_entries &&
-		cat >.gitattributes <<-EOF &&
-		*delay*              filter=delay
-		parallel-ineligible* filter=cat
-		EOF
-		echo a >missing-delay.a &&
-		echo a >parallel-ineligible.a &&
-		echo a >parallel-eligible.a &&
-		echo b >success-delay.b &&
-		echo b >parallel-ineligible.b &&
-		echo b >parallel-eligible.b &&
-		git add -A &&
-		git commit -m files &&
+Switched to a new branch 'branch1'
+branch 'branch1' set up to track 'main'.
+ok 2 - checkout --track -b creates a new tracking branch
 
-		a_blob="$(git rev-parse :parallel-ineligible.a)" &&
-		rm .git/objects/$(test_oid_to_path $a_blob) &&
-		rm *.a *.b &&
+expecting success of 2027.3 'checkout --track -b rejects an extra path argument': 
+	test_must_fail git checkout --track -b branch2 main one.t 2>err &&
+	test_grep "cannot be used with updating paths" err
 
-		test_checkout_workers 2 test_must_fail git checkout . 2>err &&
+fatal: '--track' cannot be used with updating paths
+ok 3 - checkout --track -b rejects an extra path argument
 
-		# All *.b entries should succeed and all *.a entries should fail:
-		#  - missing-delay.a: the delay filter will drop this path
-		#  - parallel-*.a: the blob will be missing
-		#
-		grep "Updated 3 paths from the index" err &&
-		test_stdout_line_count = 3 ls *.b &&
-		! ls *.a
-	)
+expecting success of 2027.4 'checkout --track -b overrides autoSetupMerge=inherit': 
+	# Set up tracking config on main
+	test_config branch.main.remote origin &&
+	test_config branch.main.merge refs/heads/some-branch &&
+	test_config branch.autoSetupMerge inherit &&
+	# With --track=inherit, we copy the tracking config from main
+	git checkout --track=inherit -b b1 main &&
+	test_cmp_config origin branch.b1.remote &&
+	test_cmp_config refs/heads/some-branch branch.b1.merge &&
+	# With branch.autoSetupMerge=inherit, we do the same
+	git checkout -b b2 main &&
+	test_cmp_config origin branch.b2.remote &&
+	test_cmp_config refs/heads/some-branch branch.b2.merge &&
+	# But --track overrides this
+	git checkout --track -b b3 main &&
+	test_cmp_config . branch.b3.remote &&
+	test_cmp_config refs/heads/main branch.b3.merge &&
+	# And --track=direct does as well
+	git checkout --track=direct -b b4 main &&
+	test_cmp_config . branch.b4.remote &&
+	test_cmp_config refs/heads/main branch.b4.merge
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/failed_entries/.git/
-[master (root-commit) d1e22ca] files
- Author: A U Thor <author@example.com>
- 7 files changed, 8 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 missing-delay.a
- create mode 100644 parallel-eligible.a
- create mode 100644 parallel-eligible.b
- create mode 100644 parallel-ineligible.a
- create mode 100644 parallel-ineligible.b
- create mode 100644 success-delay.b
-Updated 3 paths from the index
-ls: cannot access '*.a': No such file or directory
-ok 11 - "git checkout ." report should not include failed entries
+Switched to a new branch 'b1'
+branch 'b1' set up to track 'origin/some-branch'.
+Switched to a new branch 'b2'
+branch 'b2' set up to track 'origin/some-branch'.
+Switched to a new branch 'b3'
+branch 'b3' set up to track 'main'.
+Switched to a new branch 'b4'
+branch 'b4' set up to track 'main'.
+ok 4 - checkout --track -b overrides autoSetupMerge=inherit
 
-# passed all 11 test(s)
-1..11
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1013-read-tree-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/.git/
-expecting success of 1013.1 'git read-tree -u -m --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
+*** t2020-checkout-detach.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2020-checkout-detach/.git/
+expecting success of 2020.1 'setup': 
+	test_commit one &&
+	test_commit two &&
+	test_commit three && git tag -d three &&
+	test_commit four && git tag -d four &&
+	git branch branch &&
+	git tag tag
+
+[main (root-commit) d79ce16] one
  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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ 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 7c7cd71] three
  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 three.t
+Deleted tag 'three' (was 7c7cd71)
+[main fd8d77e] four
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 1 - git read-tree -u -m --recurse-submodules: added submodule is checked out
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+Deleted tag 'four' (was fd8d77e)
+ok 1 - setup
 
-expecting success of 1013.2 'git read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 2 - git read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir
+expecting success of 2020.2 'checkout branch does not detach': 
+	reset &&
+	git checkout branch &&
+	check_not_detached
 
-expecting success of 1013.3 'git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-ok 3 - git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
+Already on 'main'
+Switched to branch 'branch'
+ok 2 - checkout branch does not detach
 
-expecting success of 1013.4 'git read-tree -u -m --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
+expecting success of 2020.3 'checkout HEAD no-op/don't detach': 
+		reset &&
+		cat .git/HEAD >expect &&
+		git checkout $opt &&
+		cat .git/HEAD >actual &&
+		check_not_detached &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-ok 4 - git read-tree -u -m --recurse-submodules: replace directory with submodule
+Switched to branch 'main'
+ok 3 - checkout HEAD no-op/don't detach
 
-expecting success of 1013.5 'git read-tree -u -m --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
+expecting success of 2020.4 'checkout @ no-op/don't detach': 
+		reset &&
+		cat .git/HEAD >expect &&
+		git checkout $opt &&
+		cat .git/HEAD >actual &&
+		check_not_detached &&
+		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 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 5 - git read-tree -u -m --recurse-submodules: nested submodules are checked out
+Already on 'main'
+ok 4 - checkout @ no-op/don't detach
 
-expecting success of 1013.6 'git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 6 - git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree
+expecting success of 2020.5 'checkout tag detaches': 
+	reset &&
+	git checkout tag &&
+	check_detached
 
-expecting success of 1013.7 'git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 7 - git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory
+Already on 'main'
+Note: switching to 'tag'.
 
-expecting success of 1013.8 'git read-tree -u -m --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 8 - git read-tree -u -m --recurse-submodules: replace submodule with a file
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 1013.9 'git read-tree -u -m --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u -m --recurse-submodules replace_sub1_with_file
-not ok 9 - git read-tree -u -m --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+If you want to 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 1013.10 'git read-tree -u -m --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-ok 10 - git read-tree -u -m --recurse-submodules: worktrees of nested submodules are removed
+  git switch -c <new-branch-name>
 
-expecting success of 1013.11 'git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 11 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree
+Or undo this operation with:
 
-expecting success of 1013.12 'git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			test_must_fail $command invalid_sub1 2>err &&
-			test_grep sub1 err &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-ok 12 - git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails
+  git switch -
 
-expecting success of 1013.13 'git read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-fatal: ref HEAD is not a symbolic ref
-ok 13 - git read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1013.14 'git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			test_must_fail $command add_sub1 &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-ok 14 - git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name
+HEAD is now at fd8d77e four
+ok 5 - checkout tag detaches
 
-expecting success of 1013.15 'git read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file': 
-		test_when_finished "rm -rf submodule_update/.git/info" &&
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			mkdir .git/info &&
-			echo sub1 >.git/info/exclude &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 15 - git read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file
+expecting success of 2020.6 'checkout branch by full name detaches': 
+	reset &&
+	git checkout refs/heads/branch &&
+	check_detached
 
-checking known breakage of 1013.16 'git read-tree -u -m --recurse-submodules: replace submodule with a directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_submodule_content sub1 origin/replace_sub1_with_directory
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-not ok 16 - git read-tree -u -m --recurse-submodules: replace submodule with a directory # TODO known breakage
+Switched to branch 'main'
+Note: switching to 'refs/heads/branch'.
 
-checking known breakage of 1013.17 'git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-not ok 17 - git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 1013.18 'git read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
-		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			rm -rf .git/modules/sub1/info &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			mkdir .git/modules/sub1/info &&
-			echo ignored >.git/modules/sub1/info/exclude &&
-			: >sub1/ignored &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 18 - git read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+If you want to 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 1013.19 'git -c submodule.recurse=true read-tree -u -m: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			git -c submodule.recurse=true $cmd_args modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 19 - git -c submodule.recurse=true read-tree -u -m: modified submodule updates submodule work tree
+  git switch -c <new-branch-name>
 
-expecting success of 1013.20 'git read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 20 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively
+Or undo this operation with:
 
-expecting success of 1013.21 'git read-tree -u --reset --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 21 - git read-tree -u --reset --recurse-submodules: added submodule is checked out
+  git switch -
 
-expecting success of 1013.22 'git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 22 - git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1013.23 'git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-ok 23 - git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule
+HEAD is now at fd8d77e four
+ok 6 - checkout branch by full name detaches
 
-expecting success of 1013.24 'git read-tree -u --reset --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-ok 24 - git read-tree -u --reset --recurse-submodules: replace directory with submodule
+expecting success of 2020.7 'checkout non-ref detaches': 
+	reset &&
+	git checkout branch^ &&
+	check_detached
 
-expecting success of 1013.25 'git read-tree -u --reset --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 25 - git read-tree -u --reset --recurse-submodules: nested submodules are checked out
+Switched to branch 'main'
+Note: switching to 'branch^'.
 
-expecting success of 1013.26 'git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 26 - git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 1013.27 'git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 27 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
+If you want to 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 1013.28 'git read-tree -u --reset --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 28 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
+  git switch -c <new-branch-name>
 
-checking known breakage of 1013.29 'git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u --reset --recurse-submodules replace_sub1_with_file
-not ok 29 - git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+Or undo this operation with:
 
-expecting success of 1013.30 'git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-ok 30 - git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed
+  git switch -
 
-expecting success of 1013.31 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 31 - git read-tree -u --reset --recurse-submodules: modified submodule updates submodule work tree
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1013.32 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-ok 32 - git read-tree -u --reset --recurse-submodules: updating to a missing submodule commit fails
+HEAD is now at 7c7cd71 three
+ok 7 - checkout non-ref detaches
 
-expecting success of 1013.33 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-fatal: ref HEAD is not a symbolic ref
-ok 33 - git read-tree -u --reset --recurse-submodules: submodule branch is not changed, detach HEAD instead
+expecting success of 2020.8 'checkout ref^0 detaches': 
+	reset &&
+	git checkout branch^0 &&
+	check_detached
 
-expecting success of 1013.34 'git read-tree -u --reset --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'.
-ok 34 - git read-tree -u --reset --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
+Previous HEAD position was 7c7cd71 three
+Switched to branch 'main'
+Note: switching to 'branch^0'.
 
-expecting success of 1013.35 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-ok 35 - git read-tree -u --reset --recurse-submodules: replace submodule with a directory
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 1013.36 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 36 - git read-tree -u --reset --recurse-submodules: replace submodule containing a .git directory with a directory must fail
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 1013.37 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 37 - git read-tree -u --reset --recurse-submodules: replace submodule with a file ignoring ignored files
+  git switch -c <new-branch-name>
 
-expecting success of 1013.38 'git read-tree -u --reset --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'.
-ok 38 - git read-tree -u --reset --recurse-submodules: modified submodule does update submodule work tree from invalid commit
+Or undo this operation with:
 
-expecting success of 1013.39 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 39 - git read-tree -u --reset --recurse-submodules: updating submodules fixes .git links
+  git switch -
 
-expecting success of 1013.40 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 40 - git read-tree -u --reset --recurse-submodules: changed submodule worktree is reset
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
+HEAD is now at fd8d77e four
+ok 8 - checkout ref^0 detaches
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 2020.9 'checkout --detach detaches': 
+	reset &&
+	git checkout --detach branch &&
+	check_detached
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
+Switched to branch 'main'
+HEAD is now at fd8d77e four
+ok 9 - checkout --detach detaches
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-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 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-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 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 47 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
-not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u -m 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 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 51 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-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 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 1013.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.
-ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 2020.10 'checkout --detach without branch name': 
+	reset &&
+	git checkout --detach &&
+	check_detached
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 branch 'main'
+HEAD is now at fd8d77e four
+ok 10 - checkout --detach without branch name
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 2020.11 'checkout --detach errors out for non-commit': 
+	reset &&
+	test_must_fail git checkout --detach one^{tree} &&
+	check_not_detached
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
+Switched to branch 'main'
+fatal: Cannot switch branch to a non-commit 'one^{tree}'
+ok 11 - checkout --detach errors out for non-commit
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-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 2020.12 'checkout --detach errors out for extra argument': 
+	reset &&
+	git checkout main &&
+	test_must_fail git checkout --detach tag one.t &&
+	check_not_detached
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+Already on 'main'
+Already on 'main'
+fatal: git checkout: --detach does not take a path argument 'one.t'
+ok 12 - checkout --detach errors out for extra argument
 
-checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
-not ok 61 - git_test_func: replace submodule with a directory must fail # TODO known breakage
+expecting success of 2020.13 'checkout --detached and -b are incompatible': 
+	reset &&
+	test_must_fail git checkout --detach -b newbranch tag &&
+	check_not_detached
 
-checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
-not ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+Already on 'main'
+fatal: '--detach' cannot be used with '-b/-B/--orphan'
+ok 13 - checkout --detached and -b are incompatible
 
-checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
-not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
+expecting success of 2020.14 'checkout --detach moves HEAD': 
+	reset &&
+	git checkout one &&
+	git checkout --detach two &&
+	git diff --exit-code HEAD &&
+	git diff --exit-code two
 
-checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
-not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+Already on 'main'
+Note: switching to 'one'.
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 65 - git_test_func: modified submodule does not update submodule work tree
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-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
+If you want to 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 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
+  git switch -c <new-branch-name>
 
-expecting success of 1013.68 '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'.
-ok 68 - git_test_func: added submodule does remove untracked unignored file with same name when forced
+Or undo this operation with:
 
-# still have 10 known breakage(s)
-# passed all remaining 58 test(s)
-1..68
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2407-worktree-heads.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/.git/
-expecting success of 2407.1 'setup': 
-	test_commit init &&
+  git switch -
 
-	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" &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-		git checkout - &&
-		test_commit $i &&
-		git branch wt-$i &&
-		git branch fake-$i &&
-		git worktree add wt-$i wt-$i || return 1
-	done &&
+HEAD is now at d79ce16 one
+Previous HEAD position was d79ce16 one
+HEAD is now at 139b20d two
+ok 14 - checkout --detach moves HEAD
 
-	# 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
+expecting success of 2020.15 'checkout warns on orphan commits': 
+	reset &&
+	git checkout --detach two &&
+	echo content >orphan &&
+	git add orphan &&
+	git commit -a -m orphan1 &&
+	echo new content >orphan &&
+	git commit -a -m orphan2 &&
+	orphan2=$(git rev-parse HEAD) &&
+	git checkout main 2>stderr
 
-[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.48.0~rc1+next.20250101/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
+Previous HEAD position was 139b20d two
+Switched to branch 'main'
+HEAD is now at 139b20d two
+[detached HEAD 61e8031] orphan1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 f-1.t
-Switched to a new branch 'fake-2'
-[fake-2 8b85f46] f-2
+ create mode 100644 orphan
+[detached HEAD bfea71d] orphan2
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - checkout warns on orphan commits
 
-fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-1'
-error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-2'
-error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-3'
-error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-4'
-error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-4'
-ok 2 - refuse to overwrite: checked out in worktree
+expecting success of 2020.16 'checkout warns on orphan commits: output': 
+	check_orphan_warning stderr "2 commits"
 
-expecting success of 2407.3 'refuse to overwrite: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
+Warning: you are leaving 2 commits behind, not connected to
+ok 16 - checkout warns on orphan commits: output
 
-	# Set up a bisect so HEAD no longer points to wt-4.
-	git -C wt-4 bisect start &&
-	git -C wt-4 bisect bad wt-4 &&
-	git -C wt-4 bisect good wt-1 &&
+expecting success of 2020.17 'checkout warns orphaning 1 of 2 commits': 
+	git checkout "$orphan2" &&
+	git checkout HEAD^ 2>stderr
 
-	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
+Note: switching to 'bfea71df3731158d55fcf7b9d1ae214132b90e2b'.
 
-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.48.0~rc1+next.20250101/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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 2407.4 'refuse to overwrite: worktree in rebase (apply)': 
-	test_when_finished git -C wt-2 rebase --abort &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase --apply conflict-2 &&
+  git switch -c <new-branch-name>
 
-	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
+Or undo this operation with:
 
-First, rewinding head to replay your work on top of it...
-Applying: 2
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-881ff7f will conflict
-virtual 2
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in 2.t
-Auto-merging 2.t
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 2
-fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-2'
-ok 4 - refuse to overwrite: worktree in rebase (apply)
+  git switch -
 
-expecting success of 2407.5 'refuse to overwrite: worktree in rebase (merge)': 
-	test_when_finished git -C wt-2 rebase --abort &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase conflict-2 &&
+HEAD is now at bfea71d orphan2
+ok 17 - checkout warns orphaning 1 of 2 commits
 
-	test_must_fail git branch -f wt-2 HEAD 2>err &&
-	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
+expecting success of 2020.18 'checkout warns orphaning 1 of 2 commits: output': 
+	check_orphan_warning stderr "1 commit"
 
-Rebasing (1/1)
Auto-merging 2.t
-CONFLICT (add/add): Merge conflict in 2.t
-error: could not apply 8f55bc3... 2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 8f55bc3... 2
-fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-2'
-ok 5 - refuse to overwrite: worktree in rebase (merge)
+Warning: you are leaving 1 commit behind, not connected to
+ok 18 - checkout warns orphaning 1 of 2 commits: output
 
-expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
-	test_when_finished git -C wt-3 rebase --abort &&
+expecting success of 2020.19 'checkout does not warn leaving ref tip': 
+	reset &&
+	git checkout --detach two &&
+	git checkout main 2>stderr
 
-	git branch -f can-be-updated wt-3 &&
-	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	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
+  61e8031 orphan1
 
-Rebasing (1/3)
Auto-merging 3.t
-CONFLICT (add/add): Merge conflict in 3.t
-error: could not apply 4c93b0a... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 4c93b0a... 3
-fatal: cannot force update the branch 'can-be-updated' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-3'
-ok 6 - refuse to overwrite: worktree in rebase with --update-refs
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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 &&
+ git branch <new-branch-name> 61e8031
 
-	# 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
+Switched to branch 'main'
+HEAD is now at 139b20d two
+ok 19 - checkout does not warn leaving ref tip
 
-fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads'
-ok 7 - refuse to fetch over ref: checked out
+expecting success of 2020.20 'checkout does not warn leaving ref tip': 
+	check_no_orphan_warning stderr
 
-expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
+Previous HEAD position was 139b20d two
+ok 20 - checkout does not warn leaving ref tip
 
-	# Set up a bisect so HEAD no longer points to wt-4.
-	git -C wt-4 bisect start &&
-	git -C wt-4 bisect bad wt-4 &&
-	git -C wt-4 bisect good wt-1 &&
+expecting success of 2020.21 'checkout does not warn leaving reachable commit': 
+	reset &&
+	git checkout --detach HEAD^ &&
+	git checkout main 2>stderr
 
-	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
-	grep "refusing to fetch into branch" err
+Already on 'main'
+HEAD is now at 7c7cd71 three
+ok 21 - checkout does not warn leaving reachable commit
 
-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.48.0~rc1+next.20250101/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 2020.22 'checkout does not warn leaving reachable commit': 
+	check_no_orphan_warning stderr
 
-expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
-	test_when_finished git -C wt-3 rebase --abort &&
+Previous HEAD position was 7c7cd71 three
+ok 22 - checkout does not warn leaving reachable commit
 
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-3 rebase conflict-3 &&
+expecting success of 2020.23 'tracking count is accurate after orphan check': 
+	reset &&
+	git branch child main^ &&
+	git config branch.child.remote . &&
+	git config branch.child.merge refs/heads/main &&
+	git checkout child^ &&
+	git checkout child >stdout &&
+	test_cmp expect stdout &&
 
-	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
-	grep "refusing to fetch into branch" err
+	git checkout --detach child >stdout &&
+	test_grep ! "can be fast-forwarded\." stdout
 
-Rebasing (1/1)
Auto-merging 3.t
-CONFLICT (add/add): Merge conflict in 3.t
-error: could not apply 4c93b0a... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 4c93b0a... 3
-fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-3'
-ok 9 - refuse to fetch over ref: worktree in rebase
+Already on 'main'
+Note: switching to 'child^'.
 
-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_* &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	# 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 &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	# 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 &&
+  git switch -c <new-branch-name>
 
-	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
+Or undo this operation with:
 
-fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-4'
-ok 10 - refuse to overwrite when in error states
+  git switch -
 
-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
-	)
+Turn off this advice by setting config variable advice.detachedHead to false
 
-[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
+HEAD is now at 139b20d two
+Previous HEAD position was 139b20d two
+Switched to branch 'child'
+HEAD is now at 7c7cd71 three
+ok 23 - tracking count is accurate after orphan check
 
-expecting success of 2407.12 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+expecting success of 2020.24 'no advice given for explicit detached head state': 
+	# baseline
+	test_config advice.detachedHead true &&
+	git checkout child && git checkout HEAD^0 >expect.advice 2>&1 &&
+	test_config advice.detachedHead false &&
+	git checkout child && git checkout HEAD^0 >expect.no-advice 2>&1 &&
+	test_unconfig advice.detachedHead &&
+	# without configuration, the advice.* variables default to true
+	git checkout child && git checkout HEAD^0 >actual 2>&1 &&
+	test_cmp expect.advice actual &&
 
-ok 12 - $EDITOR and friends are unchanged
+	# with explicit --detach
+	# no configuration
+	test_unconfig advice.detachedHead &&
+	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
+	test_cmp expect.no-advice actual &&
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3000-ls-files-others.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/.git/
-expecting success of 3000.1 'setup ': 
-	date >path0 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s xyzzy path1
-	else
-		date >path1
-	fi &&
-	mkdir path2 path3 path4 &&
-	date >path2/file2 &&
-	date >path2-junk &&
-	date >path3/file3 &&
-	date >path3-junk &&
-	git update-index --add path3-junk path3/file3
+	# explicitly decline advice
+	test_config advice.detachedHead false &&
+	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
+	test_cmp expect.no-advice actual
 
-checking prerequisite: SYMLINKS
+Switched to branch 'child'
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+ok 24 - no advice given for explicit detached head state
 
-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 2020.25 'describe_detached_head prints no SHA-1 ellipsis when not asked to': 
 
-)
-prerequisite SYMLINKS ok
-ok 1 - setup 
+	commit=7c7cd714e262 &&
+	commit2=139b20d8e6c5 &&
+	commit3=d79ce1670bdc &&
 
-expecting success of 3000.2 'setup: expected output': 
-	cat >expected1 <<-\EOF &&
-	expected1
-	expected2
-	expected3
-	output
-	path0
-	path1
-	path2-junk
-	path2/file2
-	EOF
+	# The first detach operation is more chatty than the following ones.
+	cat >1st_detach <<-EOF &&
+	Note: switching to 'HEAD^'.
 
-	sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
-	cp expected2 expected3 &&
-	echo path4/ >>expected2
+	You are in 'detached HEAD' state. You can look around, make experimental
+	changes 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 - setup: expected output
+	If you want to 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 3000.3 'ls-files --others': 
-	git ls-files --others >output &&
-	test_cmp expected1 output
+	  git switch -c <new-branch-name>
 
-ok 3 - ls-files --others
+	Or undo this operation with:
 
-expecting success of 3000.4 'ls-files --others --directory': 
-	git ls-files --others --directory >output &&
-	test_cmp expected2 output
+	  git switch -
 
-ok 4 - ls-files --others --directory
+	Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3000.5 '--no-empty-directory hides empty directory': 
-	git ls-files --others --directory --no-empty-directory >output &&
-	test_cmp expected3 output
+	HEAD is now at $commit three
+	EOF
 
-ok 5 - --no-empty-directory hides empty directory
+	# The remaining ones just show info about previous and current HEADs.
+	cat >2nd_detach <<-EOF &&
+	Previous HEAD position was $commit three
+	HEAD is now at $commit2 two
+	EOF
 
-expecting success of 3000.6 'ls-files --others handles non-submodule .git': 
-	mkdir not-a-submodule &&
-	echo foo >not-a-submodule/.git &&
-	git ls-files -o >output &&
-	test_cmp expected1 output
+	cat >3rd_detach <<-EOF &&
+	Previous HEAD position was $commit2 two
+	HEAD is now at $commit3 one
+	EOF
 
-ok 6 - ls-files --others handles non-submodule .git
+	reset &&
+	check_not_detached &&
 
-expecting success of 3000.7 'ls-files --others with symlinked submodule': 
-	git init super &&
-	git init sub &&
-	(
-		cd sub &&
-		>a &&
-		git add a &&
-		git commit -m sub &&
-		git pack-refs --all
-	) &&
-	(
-		cd super &&
-		"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub &&
-		git ls-files --others --exclude-standard >../actual
-	) &&
-	echo sub/ >expect &&
-	test_cmp expect actual
+	# Various ways of *not* asking for ellipses
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/super/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/sub/.git/
-[master (root-commit) 8c0a349] sub
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 7 - ls-files --others with symlinked submodule
+	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 1st_detach actual &&
 
-expecting success of 3000.8 'setup nested pathspec search': 
-	test_create_repo nested &&
-	(
-		cd nested &&
+	GIT_PRINT_SHA1_ELLIPSIS=no git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 2nd_detach actual &&
 
-		mkdir -p partially_tracked/untracked_dir &&
-		> partially_tracked/content &&
-		> partially_tracked/untracked_dir/file &&
+	GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 3rd_detach actual &&
 
-		mkdir -p untracked/deep &&
-		> untracked/deep/path &&
-		> untracked/deep/foo.c &&
+	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
 
-		git add partially_tracked/content
-	)
+	# We only have four commits, but we can re-use them
+	reset &&
+	check_not_detached &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/nested/.git/
-ok 8 - setup nested pathspec search
+	# Make no mention of the env var at all
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 1st_detach actual &&
 
-expecting success of 3000.9 'ls-files -o --directory with single deep dir pathspec': 
-	(
-		cd nested &&
+	GIT_PRINT_SHA1_ELLIPSIS='nope' &&
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 2nd_detach actual &&
 
-		git ls-files -o --directory untracked/deep/ >actual &&
+	GIT_PRINT_SHA1_ELLIPSIS=nein &&
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 3rd_detach actual &&
 
-		cat <<-EOF >expect &&
-		untracked/deep/
-		EOF
+	true
 
-		test_cmp expect actual
-	)
+Previous HEAD position was 7c7cd71 three
+Switched to branch 'main'
+Previous HEAD position was d79ce16 one
+Switched to branch 'main'
+ok 25 - describe_detached_head prints no SHA-1 ellipsis when not asked to
 
-ok 9 - ls-files -o --directory with single deep dir pathspec
+expecting success of 2020.26 'describe_detached_head does print SHA-1 ellipsis when asked to': 
 
-expecting success of 3000.10 'ls-files -o --directory with multiple dir pathspecs': 
-	(
-		cd nested &&
+	commit=7c7cd714e262 &&
+	commit2=139b20d8e6c5 &&
+	commit3=d79ce1670bdc &&
 
-		git ls-files -o --directory partially_tracked/ untracked/ >actual &&
+	# The first detach operation is more chatty than the following ones.
+	cat >1st_detach <<-EOF &&
+	Note: switching to 'HEAD^'.
 
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/
-		EOF
+	You are in 'detached HEAD' state. You can look around, make experimental
+	changes and commit them, and you can discard any commits you make in this
+	state without impacting any branches by switching back to a branch.
 
-		test_cmp expect actual
-	)
+	If you want to create a new branch to retain commits you create, you may
+	do so (now or later) by using -c with the switch command. Example:
 
-ok 10 - ls-files -o --directory with multiple dir pathspecs
+	  git switch -c <new-branch-name>
 
-expecting success of 3000.11 'ls-files -o --directory with mix dir/file pathspecs': 
-	(
-		cd nested &&
+	Or undo this operation with:
 
-		git ls-files -o --directory partially_tracked/ untracked/deep/path >actual &&
+	  git switch -
 
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/deep/path
-		EOF
+	Turn off this advice by setting config variable advice.detachedHead to false
 
-		test_cmp expect actual
-	)
+	HEAD is now at $commit... three
+	EOF
 
-ok 11 - ls-files -o --directory with mix dir/file pathspecs
+	# The remaining ones just show info about previous and current HEADs.
+	cat >2nd_detach <<-EOF &&
+	Previous HEAD position was $commit... three
+	HEAD is now at $commit2... two
+	EOF
 
-expecting success of 3000.12 'ls-files -o --directory with glob filetype match': 
-	(
-		cd nested &&
+	cat >3rd_detach <<-EOF &&
+	Previous HEAD position was $commit2... two
+	HEAD is now at $commit3... one
+	EOF
 
-		# globs kinda defeat --directory, but only for that pathspec
-		git ls-files --others --directory partially_tracked "untracked/*.c" >actual &&
+	reset &&
+	check_not_detached &&
 
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/deep/foo.c
-		EOF
+	# Various ways of asking for ellipses...
+	# The user can just use any kind of quoting (including none).
 
-		test_cmp expect actual
-	)
+	GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 1st_detach actual &&
 
-ok 12 - ls-files -o --directory with glob filetype match
+	GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 2nd_detach actual &&
 
-expecting success of 3000.13 'ls-files -o --directory with mix of tracked states': 
-	(
-		cd nested &&
+	GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_cmp 3rd_detach actual &&
 
-		# globs kinda defeat --directory, but only for that pathspec
-		git ls-files --others --directory partially_tracked/ "untracked/?*" >actual &&
+	true
 
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/deep/
-		EOF
+Previous HEAD position was d79ce16 one
+Switched to branch 'main'
+ok 26 - describe_detached_head does print SHA-1 ellipsis when asked to
 
-		test_cmp expect actual
-	)
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2026-checkout-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2026-checkout-pathspec-file/.git/
+expecting success of 2026.1 'setup': 
+	test_commit file0 &&
 
-ok 13 - ls-files -o --directory with mix of tracked states
+	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" &&
 
-expecting success of 3000.14 'ls-files -o --directory with glob filetype match only': 
-	(
-		cd nested &&
+	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 ls-files --others --directory "untracked/*.c" >actual &&
+	git tag checkpoint
 
-		cat <<-EOF >expect &&
-		untracked/deep/foo.c
-		EOF
+[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
 
-		test_cmp expect actual
-	)
+expecting success of 2026.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
 
-ok 14 - ls-files -o --directory with glob filetype match only
+	echo fileA.t | git checkout --pathspec-from-file=- HEAD^1 &&
 
-expecting success of 3000.15 'ls-files -o --directory to get immediate paths under one dir only': 
-	(
-		cd nested &&
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
 
-		git ls-files --others --directory "untracked/?*" >actual &&
+HEAD is now at 774eb8e files 2
+Updated 1 path from 0465292
+ok 2 - --pathspec-from-file from stdin
 
-		cat <<-EOF >expect &&
-		untracked/deep/
-		EOF
+expecting success of 2026.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
 
-		test_cmp expect actual
-	)
+	echo fileA.t >list &&
+	git checkout --pathspec-from-file=list HEAD^1 &&
 
-ok 15 - ls-files -o --directory to get immediate paths under one dir only
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
 
-expecting success of 3000.16 'ls-files -o avoids listing untracked non-matching gitdir': 
-	test_when_finished "rm -rf nested/untracked/deep/empty" &&
-	(
-		cd nested &&
+HEAD is now at 774eb8e files 2
+Updated 1 path from 0465292
+ok 3 - --pathspec-from-file from file
 
-		git init untracked/deep/empty &&
-		git ls-files --others "untracked/*.c" >actual &&
+expecting success of 2026.4 'NUL delimiters': 
+	restore_checkpoint &&
 
-		cat <<-EOF >expect &&
-		untracked/deep/foo.c
-		EOF
+	printf "fileA.t\0fileB.t\0" | git checkout --pathspec-from-file=- --pathspec-file-nul HEAD^1 &&
 
-		test_cmp expect actual
-	)
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/nested/untracked/deep/empty/.git/
-ok 16 - ls-files -o avoids listing untracked non-matching gitdir
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 4 - NUL delimiters
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3002-ls-files-dashpath.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3002-ls-files-dashpath/.git/
-expecting success of 3002.1 'setup': 
-	echo frotz >path0 &&
-	echo frotz >./-foo &&
-	echo frotz >./--
+expecting success of 2026.5 'LF delimiters': 
+	restore_checkpoint &&
 
-ok 1 - setup
+	printf "fileA.t\nfileB.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
 
-expecting success of 3002.2 'git ls-files without path restriction.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others >output &&
 	cat >expect <<-\EOF &&
-	--
-	-foo
-	output
-	path0
+	M  fileA.t
+	M  fileB.t
 	EOF
-	test_cmp output expect
+	verify_expect
 
-ok 2 - git ls-files without path restriction.
+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 &&
 
-expecting success of 3002.3 'git ls-files with path restriction.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others path0 >output &&
 	cat >expect <<-\EOF &&
-	path0
+	M  fileA.t
+	M  fileB.t
 	EOF
-	test_cmp output expect
+	verify_expect
 
-ok 3 - git ls-files with path restriction.
+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 &&
 
-expecting success of 3002.4 'git ls-files with path restriction with --.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others -- path0 >output &&
 	cat >expect <<-\EOF &&
-	path0
+	M  fileA.t
+	M  fileB.t
 	EOF
-	test_cmp output expect
+	verify_expect
 
-ok 4 - git ls-files with path restriction with --.
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 7 - CRLF delimiters
 
-expecting success of 3002.5 'git ls-files with path restriction with -- --.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others -- -- >output &&
-	cat >expect <<-\EOF &&
-	--
+expecting success of 2026.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
 	EOF
-	test_cmp output expect
 
-ok 5 - git ls-files with path restriction with -- --.
+	git checkout --pathspec-from-file=list HEAD^1 &&
 
-expecting success of 3002.6 'git ls-files with no path restriction.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others -- >output &&
 	cat >expect <<-\EOF &&
-	--
-	-foo
-	output
-	path0
+	M  fileA.t
 	EOF
-	test_cmp output expect
-
+	verify_expect
 
-ok 6 - git ls-files with no path restriction.
+HEAD is now at 774eb8e files 2
+Updated 1 path from 0465292
+ok 8 - quotes
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3003-ls-files-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3003-ls-files-exclude/.git/
-expecting success of 3003.1 'create repo with file': 
-	echo content >file &&
-	git add file &&
-	git commit -m file &&
-	echo modification >file
+expecting success of 2026.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
 
-[master (root-commit) 39caa03] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - create repo with file
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-expecting success of 3003.2 'ls-files output contains file (cached)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --cached >output &&
-	test_cmp expect output
+	test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1
 
-ok 2 - ls-files output contains file (cached)
+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 3003.3 'ls-files output contains file (modified)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --modified >output &&
-	test_cmp expect output
+expecting success of 2026.10 'only touches what was listed': 
+	restore_checkpoint &&
 
-ok 3 - ls-files output contains file (modified)
+	printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
 
-expecting success of 3003.4 'add file to gitignore': 
-	echo file >.gitignore
+	cat >expect <<-\EOF &&
+	M  fileB.t
+	M  fileC.t
+	EOF
+	verify_expect
 
-ok 4 - add file to gitignore
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 10 - only touches what was listed
 
-expecting success of 3003.5 'ls-files output contains file (cached)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --cached >output &&
-	test_cmp expect output
+expecting success of 2026.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
 
-ok 5 - ls-files output contains file (cached)
+	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 &&
 
-expecting success of 3003.6 'ls-files output contains file (modified)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --modified >output &&
-	test_cmp expect output
+	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 &&
 
-ok 6 - ls-files output contains file (modified)
+	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 &&
 
-expecting success of 3003.7 'ls-files -i -c lists only tracked-but-ignored files': 
-	echo content >other-file &&
-	git add other-file &&
-	echo file >expect &&
-	git ls-files -i -c --exclude-standard >output &&
-	test_cmp expect output
+	test_must_fail git checkout --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
 
-ok 7 - ls-files -i -c lists only tracked-but-ignored files
+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 7 test(s)
-1..7
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3001-ls-files-others-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3001-ls-files-others-exclude/.git/
-expecting success of 3001.1 'git ls-files --others with various exclude options.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
-
-ok 1 - git ls-files --others with various exclude options.
-
-expecting success of 3001.2 'git ls-files --others with \r\n line endings.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
+*** t2050-git-dir-relative.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2050-git-dir-relative/.git/
+expecting success of 2050.1 'Setting up post-commit hook': 
+mkdir -p .git/hooks &&
+echo >.git/hooks/post-commit "#!/bin/sh
+touch \"\${COMMIT_FILE}\"
+echo Post commit hook was called." &&
+chmod +x .git/hooks/post-commit
+ok 1 - Setting up post-commit hook
 
-ok 2 - git ls-files --others with \r\n line endings.
+expecting success of 2050.2 'post-commit hook used ordinarily': 
+echo initial >top &&
+git add top &&
+git commit -m initial &&
+test -r "${COMMIT_FILE}"
 
-expecting success of 3001.3 'setup skip-worktree gitignore': 
-	git add $allignores &&
-	git update-index --skip-worktree $allignores &&
-	rm $allignores
+Post commit hook was called.
+[master (root-commit) 0619340] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 top
+ok 2 - post-commit hook used ordinarily
 
-ok 3 - setup skip-worktree gitignore
+expecting success of 2050.3 'post-commit-hook created and used from top dir': 
+echo changed >top &&
+git --git-dir subdir/.git add top &&
+git --git-dir subdir/.git commit -m topcommit &&
+test -r "${COMMIT_FILE}"
 
-expecting success of 3001.4 'git ls-files --others with various exclude options.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
+Post commit hook was called.
+[master fc38a58] topcommit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - post-commit-hook created and used from top dir
 
-ok 4 - git ls-files --others with various exclude options.
+expecting success of 2050.4 'post-commit-hook from sub dir': 
+echo changed again >top &&
+cd subdir &&
+git --git-dir .git --work-tree .. add ../top &&
+git --git-dir .git --work-tree .. commit -m subcommit &&
+test -r "${COMMIT_FILE}"
 
-expecting success of 3001.5 'restore gitignore': 
-	git checkout --ignore-skip-worktree-bits $allignores &&
-	rm .git/index
+Post commit hook was called.
+[master ca7703f] subcommit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - post-commit-hook from sub dir
 
-Updated 3 paths from the index
-ok 5 - restore gitignore
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2072-restore-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2072-restore-pathspec-file/.git/
+expecting success of 2072.1 'setup': 
+	test_commit file0 &&
 
-expecting success of 3001.6 'git status honors core.excludesfile': test_cmp expect output
-ok 6 - git status honors core.excludesfile
+	mkdir dir1 &&
+	echo 1 >dir1/file &&
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
 
-expecting success of 3001.7 'trailing slash in exclude allows directory match(1)': 
+	echo 2 >dir1/file &&
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 2" &&
 
-	git ls-files --others --exclude=one/ >output &&
-	if grep "^one/" output
-	then
-		echo Ooops
-		false
-	else
-		: happy
-	fi
+	git tag checkpoint
 
+[master (root-commit) ad2e047] file0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0.t
+[master 17aa47d] files 1
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/file
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ create mode 100644 fileD.t
+[master 4c6d82b] files 2
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+ok 1 - setup
 
-ok 7 - trailing slash in exclude allows directory match(1)
+expecting success of 2072.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
 
-expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
+	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
 
-	git ls-files --others --exclude=one/two/ >output &&
-	if grep "^one/two/" output
-	then
-		echo Ooops
-		false
-	else
-		: happy
-	fi
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
 
+HEAD is now at 4c6d82b files 2
+ok 2 - --pathspec-from-file from stdin
 
-ok 8 - trailing slash in exclude allows directory match (2)
+expecting success of 2072.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
 
-expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
+	echo fileA.t >list &&
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
 
-	>two &&
-	git ls-files --others --exclude=two/ >output &&
-	grep "^two" output
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
 
+HEAD is now at 4c6d82b files 2
+ok 3 - --pathspec-from-file from file
 
-two
-ok 9 - trailing slash in exclude forces directory match (1)
+expecting success of 2072.4 'NUL delimiters': 
+	restore_checkpoint &&
 
-expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
+	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
 
-	git ls-files --others --exclude=one/a.1/ >output &&
-	grep "^one/a.1" output
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
 
+HEAD is now at 4c6d82b files 2
+ok 4 - NUL delimiters
 
-one/a.1
-ok 10 - trailing slash in exclude forces directory match (2)
+expecting success of 2072.5 'LF delimiters': 
+	restore_checkpoint &&
 
-expecting success of 3001.11 'negated exclude matches can override previous ones': 
+	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
 
-	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
-	grep "^a.1" output
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
 
-a.1
-ok 11 - negated exclude matches can override previous ones
+HEAD is now at 4c6d82b files 2
+ok 5 - LF delimiters
 
-expecting success of 3001.12 'excluded directory overrides content patterns': 
+expecting success of 2072.6 'no trailing delimiter': 
+	restore_checkpoint &&
 
-	git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
+	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
 
-ok 12 - excluded directory overrides content patterns
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
 
-expecting success of 3001.13 'negated directory doesn't affect content patterns': 
+HEAD is now at 4c6d82b files 2
+ok 6 - no trailing delimiter
 
-	git ls-files --others --exclude="!one" --exclude="one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
+expecting success of 2072.7 'CRLF delimiters': 
+	restore_checkpoint &&
 
-ok 13 - negated directory doesn't affect content patterns
+	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
 
-expecting success of 3001.14 'subdirectory ignore (setup)': 
-	mkdir -p top/l1/l2 &&
-	(
-		cd top &&
-		git init &&
-		echo /.gitignore >.gitignore &&
-		echo l1 >>.gitignore &&
-		echo l2 >l1/.gitignore &&
-		>l1/l2/l1
-	)
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3001-ls-files-others-exclude/top/.git/
-ok 14 - subdirectory ignore (setup)
+HEAD is now at 4c6d82b files 2
+ok 7 - CRLF delimiters
 
-expecting success of 3001.15 'subdirectory ignore (toplevel)': 
-	(
-		cd top &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+expecting success of 2072.8 'quotes': 
+	restore_checkpoint &&
 
-ok 15 - subdirectory ignore (toplevel)
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-expecting success of 3001.16 'subdirectory ignore (l1/l2)': 
-	(
-		cd top/l1/l2 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
 
-ok 16 - subdirectory ignore (l1/l2)
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
 
-expecting success of 3001.17 'subdirectory ignore (l1)': 
-	(
-		cd top/l1 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+HEAD is now at 4c6d82b files 2
+ok 8 - quotes
 
-ok 17 - subdirectory ignore (l1)
+expecting success of 2072.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
 
-expecting success of 3001.18 'show/hide empty ignored directory (setup)': 
-	rm top/l1/l2/l1 &&
-	rm top/l1/.gitignore
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-ok 18 - show/hide empty ignored directory (setup)
+	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
 
-expecting success of 3001.19 'show empty ignored directory with --directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/ >expect &&
-	test_cmp expect actual
+HEAD is now at 4c6d82b files 2
+error: pathspec '"file\101.t"
+' did not match any file(s) known to git
+ok 9 - quotes not compatible with --pathspec-file-nul
 
-ok 19 - show empty ignored directory with --directory
+expecting success of 2072.10 'only touches what was listed': 
+	restore_checkpoint &&
 
-expecting success of 3001.20 'hide empty ignored directory with --no-empty-directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
+	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
 
-ok 20 - hide empty ignored directory with --no-empty-directory
+	cat >expect <<-\EOF &&
+	 M fileB.t
+	 M fileC.t
+	EOF
+	verify_expect
 
-expecting success of 3001.21 'show/hide empty ignored sub-directory (setup)': 
-	> top/l1/tracked &&
-	(
-		cd top &&
-		git add -f l1/tracked
-	)
+HEAD is now at 4c6d82b files 2
+ok 10 - only touches what was listed
 
-ok 21 - show/hide empty ignored sub-directory (setup)
+expecting success of 2072.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
 
-expecting success of 3001.22 'show empty ignored sub-directory with --directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/l2/ >expect &&
-	test_cmp expect actual
+	test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
 
-ok 22 - show empty ignored sub-directory with --directory
+	test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
-expecting success of 3001.23 'hide empty ignored sub-directory with --no-empty-directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
+	test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
-ok 23 - hide empty ignored sub-directory with --no-empty-directory
+	test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
+	test_grep -e "you must specify path(s) to restore" err
 
-expecting success of 3001.24 'pattern matches prefix completely': 
-	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
-	test_must_be_empty actual
+HEAD is now at 4c6d82b files 2
+fatal: options '--pathspec-from-file' and '--patch' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+fatal: you must specify path(s) to restore
+ok 11 - error conditions
 
-ok 24 - pattern matches prefix completely
+expecting success of 2072.12 'wildcard pathspec matches file in subdirectory': 
+	restore_checkpoint &&
 
-expecting success of 3001.25 'ls-files with "**" patterns': 
-	cat <<-\EOF >expect &&
-	a.1
-	one/a.1
-	one/two/a.1
-	three/a.1
+	echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	cat >expect <<-\EOF &&
+	 M dir1/file
 	EOF
-	git ls-files -o -i --exclude "**/a.1" >actual &&
-	test_cmp expect actual
-
-ok 25 - ls-files with "**" patterns
-
-expecting success of 3001.26 'ls-files with "**" patterns and --directory': 
-	# Expectation same as previous test
-	git ls-files --directory -o -i --exclude "**/a.1" >actual &&
-	test_cmp expect actual
-
-ok 26 - ls-files with "**" patterns and --directory
-
-expecting success of 3001.27 'ls-files with "**" patterns and no slashes': 
-	git ls-files -o -i --exclude "one**a.1" >actual &&
-	test_must_be_empty actual
+	verify_expect
 
-ok 27 - ls-files with "**" patterns and no slashes
+HEAD is now at 4c6d82b files 2
+ok 12 - wildcard pathspec matches file in subdirectory
 
-# passed all 27 test(s)
-1..27
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3006-ls-files-long.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t2060-switch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch/.git/
+expecting success of 2060.1 'setup': 
+	test_commit first &&
+	git branch first-branch &&
+	test_commit second &&
+	test_commit third &&
+	git remote add origin nohost:/nopath &&
+	git update-ref refs/remotes/origin/foo first-branch
 
-	path_a=${p}_a &&
-	path_z=${p}_z &&
+[main (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[main d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[main cd7036d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+ok 1 - setup
 
-	blob_a=$(echo frotz | git hash-object -w --stdin) &&
-	blob_z=$(echo nitfol | git hash-object -w --stdin) &&
+expecting success of 2060.2 'switch branch no arguments': 
+	test_must_fail git switch
 
-	pat="100644 %s 0\t%s\n"
+fatal: missing branch or commit argument
+ok 2 - switch branch no arguments
 
-ok 1 - setup
+expecting success of 2060.3 'switch branch': 
+	git switch first-branch &&
+	test_path_is_missing second.t
 
-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
+Switched to branch 'first-branch'
+ok 3 - switch branch
 
-ok 2 - overly-long path by itself is not a problem
+expecting success of 2060.4 'switch and detach': 
+	test_when_finished git switch main &&
+	test_must_fail git switch main^{commit} &&
+	git switch --detach main^{commit} &&
+	test_must_fail git symbolic-ref HEAD
 
-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
+fatal: a branch is expected, got commit 'main^{commit}'
+hint: If you want to detach HEAD at the commit, try again with the --detach option.
+HEAD is now at cd7036d third
+fatal: ref HEAD is not a symbolic ref
+Switched to branch 'main'
+ok 4 - switch and detach
 
-ok 3 - overly-long path does not replace another by mistake
+expecting success of 2060.5 'suggestion to detach': 
+	test_must_fail git switch main^{commit} 2>stderr &&
+	grep "try again with the --detach option" stderr
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3005-ls-files-relative.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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*
-	)
+hint: If you want to detach HEAD at the commit, try again with the --detach option.
+ok 5 - suggestion to detach
 
-ok 1 - prepare
+expecting success of 2060.6 'suggestion to detach is suppressed with advice.suggestDetachingHead=false': 
+	test_config advice.suggestDetachingHead false &&
+	test_must_fail git switch main^{commit} 2>stderr &&
+	! grep "try again with the --detach option" stderr
 
-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 6 - suggestion to detach is suppressed with advice.suggestDetachingHead=false
 
-ok 2 - ls-files with mixed levels
+expecting success of 2060.7 'switch and detach current branch': 
+	test_when_finished git switch main &&
+	git switch main &&
+	git switch --detach &&
+	test_must_fail git symbolic-ref HEAD
 
-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
-	)
+Already on 'main'
+HEAD is now at cd7036d third
+fatal: ref HEAD is not a symbolic ref
+Switched to branch 'main'
+ok 7 - switch and detach current branch
 
-ok 3 - ls-files -c
+expecting success of 2060.8 'switch and create branch': 
+	test_when_finished git switch main &&
+	git switch -c temp main^ &&
+	test_cmp_rev main^ refs/heads/temp &&
+	echo refs/heads/temp >expected-branch &&
+	git symbolic-ref HEAD >actual-branch &&
+	test_cmp expected-branch actual-branch
 
-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
-	)
+Switched to a new branch 'temp'
+Switched to branch 'main'
+ok 8 - switch and create branch
 
-ok 4 - ls-files -o
+expecting success of 2060.9 'force create branch from HEAD': 
+	test_when_finished git switch main &&
+	git switch --detach main &&
+	test_must_fail git switch -c temp &&
+	git switch -C temp &&
+	test_cmp_rev main refs/heads/temp &&
+	echo refs/heads/temp >expected-branch &&
+	git symbolic-ref HEAD >actual-branch &&
+	test_cmp expected-branch actual-branch
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3004-ls-files-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+HEAD is now at cd7036d third
+fatal: a branch named 'temp' already exists
+Switched to and reset branch 'temp'
+Switched to branch 'main'
+ok 9 - force create branch from HEAD
 
-ok 1 - ls-files in empty repository
+expecting success of 2060.10 'new orphan branch from empty': 
+	test_when_finished git switch main &&
+	test_must_fail git switch --orphan new-orphan HEAD &&
+	git switch --orphan new-orphan &&
+	test_commit orphan &&
+	git cat-file commit refs/heads/new-orphan >commit &&
+	! grep ^parent commit &&
+	git ls-files >tracked-files &&
+	echo orphan.t >expected &&
+	test_cmp expected tracked-files
 
-expecting success of 3004.2 'ls-files with nonexistent path': 
-	git ls-files doesnotexist >actual &&
-	test_must_be_empty actual
+fatal: '--orphan' cannot take <start-point>
+Switched to a new branch 'new-orphan'
+[new-orphan (root-commit) 11bb70e] orphan
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 orphan.t
+Switched to branch 'main'
+ok 10 - new orphan branch from empty
 
-ok 2 - ls-files with nonexistent path
+expecting success of 2060.11 'orphan branch works with --discard-changes': 
+	test_when_finished git switch main &&
+	echo foo >foo.txt &&
+	git switch --discard-changes --orphan new-orphan2 &&
+	git ls-files >tracked-files &&
+	test_must_be_empty tracked-files
 
-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
+Switched to a new branch 'new-orphan2'
+Switched to branch 'main'
+ok 11 - orphan branch works with --discard-changes
 
-usage: git ls-files [<options>] [<file>...]
-ok 3 - ls-files with nonsense option
+expecting success of 2060.12 'switching ignores file of same branch name': 
+	test_when_finished git switch main &&
+	: >first-branch &&
+	git switch first-branch &&
+	echo refs/heads/first-branch >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual
 
-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
+Switched to branch 'first-branch'
+Switched to branch 'main'
+ok 12 - switching ignores file of same branch name
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3004-ls-files-basic/broken/.git/
-usage: git ls-files [<options>] [<file>...]
-ok 4 - ls-files -h in corrupt repository
+expecting success of 2060.13 'guess and create branch': 
+	test_when_finished git switch main &&
+	test_must_fail git switch --no-guess foo &&
+	test_config checkout.guess false &&
+	test_must_fail git switch foo &&
+	test_config checkout.guess true &&
+	git switch foo &&
+	echo refs/heads/foo >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual
 
-checking prerequisite: SYMLINKS
+fatal: invalid reference: foo
+fatal: invalid reference: foo
+Switched to a new branch 'foo'
+branch 'foo' set up to track 'origin/foo'.
+Switched to branch 'main'
+ok 13 - guess and create branch
 
-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 2060.14 'not switching when something is in progress': 
+	test_when_finished rm -f .git/MERGE_HEAD &&
+	# fake a merge-in-progress
+	cp .git/HEAD .git/MERGE_HEAD &&
+	test_must_fail git switch -d @^
 
-)
-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 &&
+fatal: cannot switch branch while merging
+Consider "git merge --quit" or "git worktree add".
+ok 14 - not switching when something is in progress
 
-	(
-		cd subs &&
-		git ls-files -s link >../expect &&
-		git ls-files -s "$(pwd)/link" >../actual
-	) &&
-	test_cmp expect actual
+expecting success of 2060.15 'tracking info copied with autoSetupMerge=inherit': 
+	# default config does not copy tracking info
+	git switch -c foo-no-inherit foo &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+	# with --track=inherit, we copy tracking info from foo
+	git switch --track=inherit -c foo2 foo &&
+	test_cmp_config origin branch.foo2.remote &&
+	test_cmp_config refs/heads/foo branch.foo2.merge &&
+	# with autoSetupMerge=inherit, we do the same
+	test_config branch.autoSetupMerge inherit &&
+	git switch -c foo3 foo &&
+	test_cmp_config origin branch.foo3.remote &&
+	test_cmp_config refs/heads/foo branch.foo3.merge &&
+	# with --track, we override autoSetupMerge
+	git switch --track -c foo4 foo &&
+	test_cmp_config . branch.foo4.remote &&
+	test_cmp_config refs/heads/foo branch.foo4.merge &&
+	# and --track=direct does as well
+	git switch --track=direct -c foo5 foo &&
+	test_cmp_config . branch.foo5.remote &&
+	test_cmp_config refs/heads/foo branch.foo5.merge &&
+	# no tracking info to inherit from main
+	git switch -c main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
 
-ok 5 - ls-files with absolute paths to symlinks
+Switched to a new branch 'foo-no-inherit'
+Switched to a new branch 'foo2'
+branch 'foo2' set up to track 'origin/foo'.
+Switched to a new branch 'foo3'
+branch 'foo3' set up to track 'origin/foo'.
+Switched to a new branch 'foo4'
+branch 'foo4' set up to track 'foo'.
+Switched to a new branch 'foo5'
+branch 'foo5' set up to track 'foo'.
+warning: asked to inherit tracking from 'main', but no remote is set
+Switched to a new branch 'main2'
+ok 15 - tracking info copied with autoSetupMerge=inherit
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3008-ls-files-lazy-init-name-hash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 2060.16 'switch back when temporarily detached and checked out elsewhere ': 
+	test_when_finished "
+		git worktree remove wt1 ||:
+		git worktree remove wt2 ||:
+		git checkout - ||:
+		git branch -D shared ||:
+	" &&
+	git checkout -b shared &&
+	test_commit shared-first &&
+	HASH1=$(git rev-parse --verify HEAD) &&
+	test_commit shared-second &&
+	test_commit shared-third &&
+	HASH2=$(git rev-parse --verify HEAD) &&
+	git worktree add wt1 -f shared &&
+	git -C wt1 bisect start &&
+	git -C wt1 bisect good $HASH1 &&
+	git -C wt1 bisect bad $HASH2 &&
+	git worktree add wt2 -f shared &&
+	git -C wt2 bisect start &&
+	git -C wt2 bisect good $HASH1 &&
+	git -C wt2 bisect bad $HASH2 &&
+	# we test in both worktrees to ensure that works
+	# as expected with "first" and "next" worktrees
+	test_must_fail git -C wt1 switch shared &&
+	test_must_fail git -C wt1 switch -C shared &&
+	git -C wt1 switch --ignore-other-worktrees shared &&
+	test_must_fail git -C wt2 switch shared &&
+	test_must_fail git -C wt2 switch -C shared &&
+	git -C wt2 switch --ignore-other-worktrees shared
 
-0.000750 0.022847 4002 multi 2
-ok 1 - no buffer overflow in lazy_init_name_hash
+Switched to a new branch 'shared'
+[shared 814c97a] shared-first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-first.t
+[shared 7162996] shared-second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-second.t
+[shared 90dda28] shared-third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-third.t
+Preparing worktree (checking out 'shared')
+HEAD is now at 90dda28 shared-third
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[716299614285626473e2ba3b8caf8b7633592842] shared-second
+Preparing worktree (checking out 'shared')
+HEAD is now at 90dda28 shared-third
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[716299614285626473e2ba3b8caf8b7633592842] shared-second
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+Previous HEAD position was 7162996 shared-second
+Switched to branch 'shared'
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+Previous HEAD position was 7162996 shared-second
+Switched to branch 'shared'
+Switched to branch 'main2'
+Deleted branch shared (was 90dda28).
+ok 16 - switch back when temporarily detached and checked out elsewhere 
 
-# passed all 1 test(s)
-1..1
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3009-ls-files-others-nonsubmodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/.git/
-expecting success of 3009.1 'setup: directories': 
-	mkdir nonrepo-no-files/ &&
-	mkdir nonrepo-untracked-file &&
-	: >nonrepo-untracked-file/untracked &&
-	git init repo-no-commit-no-files &&
-	git init repo-no-commit-untracked-file &&
-	: >repo-no-commit-untracked-file/untracked &&
-	git init repo-with-commit-no-files &&
-	git -C repo-with-commit-no-files commit --allow-empty -mmsg &&
-	git init repo-with-commit-untracked-file &&
-	test_commit -C repo-with-commit-untracked-file msg &&
-	: >repo-with-commit-untracked-file/untracked
+*** t2070-restore.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2070-restore/.git/
+expecting success of 2070.1 'setup': 
+	test_commit first &&
+	echo first-and-a-half >>first.t &&
+	git add first.t &&
+	test_commit second &&
+	echo one >one &&
+	echo two >two &&
+	echo untracked >untracked &&
+	echo ignored >ignored &&
+	echo /ignored >.gitignore &&
+	git add one two .gitignore &&
+	git update-ref refs/heads/one main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-no-files/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-untracked-file/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-no-files/.git/
-[master (root-commit) b4b9816] msg
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-untracked-file/.git/
-[master (root-commit) c24fc06] msg
+[main (root-commit) 50e526b] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 msg.t
-ok 1 - setup: directories
-
-expecting success of 3009.2 'ls-files --others handles untracked git repositories': 
-	git ls-files -o >output &&
-	cat >expect <<-EOF &&
-	nonrepo-untracked-file/untracked
-	output
-	repo-no-commit-no-files/
-	repo-no-commit-untracked-file/
-	repo-with-commit-no-files/
-	repo-with-commit-untracked-file/
-	EOF
-	test_cmp expect output
+ create mode 100644 first.t
+[main a46c920] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 second.t
+ok 1 - setup
 
-ok 2 - ls-files --others handles untracked git repositories
+expecting success of 2070.2 'restore without pathspec is not ok': 
+	test_must_fail git restore &&
+	test_must_fail git restore --source=first
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2500-untracked-overwriting.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/.git/
-expecting success of 2500.1 'reset --hard will nuke untracked files/dirs': 
-	test_setup_reset hard &&
-	(
-		cd reset_hard &&
-		git ls-tree -r stable &&
-		git log --all --name-status --oneline &&
-		git ls-tree -r work &&
+fatal: you must specify path(s) to restore
+fatal: you must specify path(s) to restore
+ok 2 - restore without pathspec is not ok
 
-		mkdir foo.t &&
-		echo precious >foo.t/file &&
-		echo foo >expect &&
+expecting success of 2070.3 'restore a file, ignoring branch of same name': 
+	cat one >expected &&
+	echo dirty >>one &&
+	git restore one &&
+	test_cmp expected one
 
-		git reset --hard work &&
+ok 3 - restore a file, ignoring branch of same name
 
-		# check that untracked directory foo.t/ was nuked
-		test_path_is_file foo.t &&
-		test_cmp expect foo.t
-	)
+expecting success of 2070.4 'restore a file on worktree from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first first.t &&
+	test_cmp expected first.t &&
+	git cat-file blob HEAD:./first.t >expected &&
+	git show :first.t >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/reset_hard/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Switched to branch 'work'
-[work cb1b896] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Switched to branch 'stable'
-100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
-cb1b896 foo
-A	foo.t
-2519212 init
-A	init.t
-100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99	foo.t
-100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
-HEAD is now at cb1b896 foo
-ok 1 - reset --hard will nuke untracked files/dirs
+HEAD is now at a46c920 second
+ok 4 - restore a file on worktree from another ref
 
-expecting success of 2500.2 'reset --merge will preserve untracked files/dirs': 
-	test_setup_reset merge &&
-	(
-		cd reset_merge &&
+expecting success of 2070.5 'restore a file in the index from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first --staged first.t &&
+	git show :first.t >actual &&
+	test_cmp expected actual &&
+	git cat-file blob HEAD:./first.t >expected &&
+	test_cmp expected first.t
 
-		mkdir foo.t &&
-		echo precious >foo.t/file &&
-		cp foo.t/file expect &&
+HEAD is now at a46c920 second
+ok 5 - restore a file in the index from another ref
 
-		test_must_fail git reset --merge work 2>error &&
-		test_cmp expect foo.t/file &&
-		grep "Updating .foo.t. would lose untracked files" error
-	)
+expecting success of 2070.6 'restore a file in both the index and worktree from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first --staged --worktree first.t &&
+	git show :first.t >actual &&
+	test_cmp expected actual &&
+	test_cmp expected first.t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/reset_merge/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Switched to branch 'work'
-[work cb1b896] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Switched to branch 'stable'
-error: Updating 'foo.t' would lose untracked files in it
-ok 2 - reset --merge will preserve untracked files/dirs
+HEAD is now at a46c920 second
+ok 6 - restore a file in both the index and worktree from another ref
 
-expecting success of 2500.3 'reset --keep will preserve untracked files/dirs': 
-	test_setup_reset keep &&
-	(
-		cd reset_keep &&
+expecting success of 2070.7 'restore --staged uses HEAD as source': 
+	test_when_finished git reset --hard &&
+	git cat-file blob :./first.t >expected &&
+	echo index-dirty >>first.t &&
+	git add first.t &&
+	git restore --staged first.t &&
+	git cat-file blob :./first.t >actual &&
+	test_cmp expected actual
 
-		mkdir foo.t &&
-		echo precious >foo.t/file &&
-		cp foo.t/file expect &&
+HEAD is now at a46c920 second
+ok 7 - restore --staged uses HEAD as source
 
-		test_must_fail git reset --merge work 2>error &&
-		test_cmp expect foo.t/file &&
-		grep "Updating.*foo.t.*would lose untracked files" error
-	)
+expecting success of 2070.8 'restore --worktree --staged uses HEAD as source': 
+	test_when_finished git reset --hard &&
+	git show HEAD:./first.t >expected &&
+	echo dirty >>first.t &&
+	git add first.t &&
+	git restore --worktree --staged first.t &&
+	git show :./first.t >actual &&
+	test_cmp expected actual &&
+	test_cmp expected first.t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/reset_keep/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Switched to branch 'work'
-[work cb1b896] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Switched to branch 'stable'
-error: Updating 'foo.t' would lose untracked files in it
-ok 3 - reset --keep will preserve untracked files/dirs
+HEAD is now at a46c920 second
+ok 8 - restore --worktree --staged uses HEAD as source
 
-expecting success of 2500.4 'checkout -m does not nuke untracked file': 
-	test_setup_checkout_m &&
+expecting success of 2070.9 'restore --ignore-unmerged ignores unmerged entries': 
+	git init unmerged &&
 	(
-		cd checkout &&
+		cd unmerged &&
+		echo one >unmerged &&
+		echo one >common &&
+		git add unmerged common &&
+		git commit -m common &&
+		git switch -c first &&
+		echo first >unmerged &&
+		git commit -am first &&
+		git switch -c second main &&
+		echo second >unmerged &&
+		git commit -am second &&
+		test_must_fail git merge first &&
 
-		# Tweak filler
-		test_write_lines this file has some >filler &&
-		# Make an untracked file, save its contents in "expect"
-		echo precious >notes.txt &&
-		cp notes.txt expect &&
+		echo dirty >>common &&
+		test_must_fail git restore . &&
 
-		test_must_fail git checkout -m work &&
-		test_cmp expect notes.txt
+		git restore --ignore-unmerged --quiet . >output 2>&1 &&
+		git diff common >diff-output &&
+		test_must_be_empty output &&
+		test_must_be_empty diff-output
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/checkout/.git/
-[master (root-commit) 2519212] init
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2070-restore/unmerged/.git/
+[main (root-commit) b83edd8] common
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 7d7f42a] filler
+ 2 files changed, 2 insertions(+)
+ create mode 100644 common
+ create mode 100644 unmerged
+Switched to a new branch 'first'
+[first 753ae86] first
  Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 filler
-Switched to a new branch 'work'
-[work bac6a98] filler
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'second'
+[second 06de6fa] second
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 notes.txt
-Switched to branch 'stable'
-error: Untracked working tree file 'notes.txt' would be overwritten by merge.
-ok 4 - checkout -m does not nuke untracked file
-
-expecting success of 2500.5 'git rebase --abort and untracked files': 
-	test_setup_sequencing rebase_abort_and_untracked &&
-	(
-		cd sequencing_rebase_abort_and_untracked &&
-		git checkout fooey &&
-		test_must_fail git rebase simple &&
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging unmerged
+CONFLICT (content): Merge conflict in unmerged
+Automatic merge failed; fix conflicts and then commit the result.
+error: path 'unmerged' is unmerged
+ok 9 - restore --ignore-unmerged ignores unmerged entries
 
-		cat init.t &&
-		git rm init.t &&
-		echo precious >init.t &&
-		cp init.t expect &&
-		git status --porcelain &&
-		test_must_fail git rebase --abort &&
-		test_cmp expect init.t
-	)
+expecting success of 2070.10 'restore --staged adds deleted intent-to-add file back to index': 
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git restore --staged nonempty empty &&
+	git diff --cached --exit-code
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_abort_and_untracked/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
+[main 94e3084] create files to be deleted
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Switched to branch 'fooey'
-Rebasing (1/1)
Auto-merging filler
-CONFLICT (content): Merge conflict in filler
-error: could not apply d39f842... changes
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply d39f842... changes
-init
-rm 'init.t'
-UU filler
-D  foo/bar/baz.t
-D  init.t
-?? expect
-?? init.t
-error: The following untracked working tree files would be overwritten by reset:
-	init.t
-Please move or remove them before you reset.
-Aborting
-fatal: could not move back to d39f842c8a54822614a71d9e503b01b89b57e3bf
-ok 5 - git rebase --abort and untracked files
+ 2 files changed, 1 insertion(+)
+ create mode 100644 empty
+ create mode 100644 nonempty
+rm 'empty'
+rm 'nonempty'
+ok 10 - restore --staged adds deleted intent-to-add file back to index
 
-expecting success of 2500.6 'git rebase fast forwarding and untracked files': 
-	test_setup_sequencing rebase_fast_forward_and_untracked &&
-	(
-		cd sequencing_rebase_fast_forward_and_untracked &&
-		git checkout init &&
-		echo precious >filler &&
-		cp filler expect &&
-		test_must_fail git rebase init simple &&
-		test_cmp expect filler
-	)
+expecting success of 2070.11 'restore --staged invalidates cache tree for deletions': 
+	test_when_finished git reset --hard &&
+	>new1 &&
+	>new2 &&
+	git add new1 new2 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_fast_forward_and_untracked/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
+	# It is important to commit and then reset here, so that the index
+	# contains a valid cache-tree for the "both" tree.
+	git commit -m both &&
+	git reset --soft HEAD^ &&
+
+	git restore --staged new1 &&
+	git commit -m "just new2" &&
+	git rev-parse HEAD:new2 &&
+	test_must_fail git rev-parse HEAD:new1
+
+[main 19f4790] both
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 new1
+ create mode 100644 new2
+[main 2c4724a] just new2
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Note: switching to 'init'.
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 new2
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+fatal: path 'new1' exists on disk, but not in 'HEAD'
+HEAD:new1
+HEAD is now at 2c4724a just new2
+ok 11 - restore --staged invalidates cache tree for deletions
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 2070.12 'restore --merge to unresolve': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	echo nothing >file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 12 - restore --merge to unresolve
 
-  git switch -c <new-branch-name>
+expecting success of 2070.13 'restore --merge to unresolve after (mistaken) resolution': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	echo nothing >file &&
+	git add file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
 
-Or undo this operation with:
+ok 13 - restore --merge to unresolve after (mistaken) resolution
 
-  git switch -
+expecting success of 2070.14 'restore --merge to unresolve after (mistaken) resolution': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	git rm -f file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
 
-Turn off this advice by setting config variable advice.detachedHead to false
+rm 'file'
+ok 14 - restore --merge to unresolve after (mistaken) resolution
 
-HEAD is now at 2519212 init
-error: The following untracked working tree files would be overwritten by checkout:
-	filler
-Please move or remove them before you switch branches.
-Aborting
-error: could not switch to simple
-ok 6 - git rebase fast forwarding and untracked files
+expecting success of 2070.15 'restore with merge options are incompatible with certain options': 
+	for opts in \
+		"--staged --ours" \
+		"--staged --theirs" \
+		"--staged --merge" \
+		"--source=HEAD --ours" \
+		"--source=HEAD --theirs" \
+		"--source=HEAD --merge" \
+		"--staged --conflict=diff3" \
+		"--staged --worktree --ours" \
+		"--staged --worktree --theirs" \
+		"--staged --worktree --merge" \
+		"--staged --worktree --conflict=zdiff3"
+	do
+		test_must_fail git restore $opts . 2>err &&
+		grep "cannot be used" err || return
+	done
 
-checking known breakage of 2500.7 'git rebase --autostash and untracked files': 
-	test_setup_sequencing rebase_autostash_and_untracked &&
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+ok 15 - restore with merge options are incompatible with certain options
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2024-checkout-dwim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/.git/
+expecting success of 2024.1 'setup': 
+	test_commit my_main &&
+	git init repo_a &&
 	(
-		cd sequencing_rebase_autostash_and_untracked &&
-		git checkout simple &&
-		git rm filler &&
-		mkdir filler &&
-		echo precious >filler/file &&
-		cp filler/file expect &&
-		git rebase --autostash init &&
-		test_path_is_file filler/file
-	)
+		cd repo_a &&
+		test_commit a_main &&
+		git checkout -b foo &&
+		test_commit a_foo &&
+		git checkout -b bar &&
+		test_commit a_bar &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit a_ambiguous_branch_and_file
+	) &&
+	git init repo_b &&
+	(
+		cd repo_b &&
+		test_commit b_main &&
+		git checkout -b foo &&
+		test_commit b_foo &&
+		git checkout -b baz &&
+		test_commit b_baz &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit b_ambiguous_branch_and_file
+	) &&
+	git remote add repo_a repo_a &&
+	git remote add repo_b repo_b &&
+	git config remote.repo_b.fetch \
+		"+refs/heads/*:refs/remotes/other_b/*" &&
+	git fetch --all
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_autostash_and_untracked/.git/
-[master (root-commit) 2519212] init
+[master (root-commit) 476f86c] my_main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
+ create mode 100644 my_main.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_a/.git/
+[master (root-commit) d6d6851] a_main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Already on 'simple'
-rm 'filler'
-error: Updating the following directories would lose untracked files in them:
-	filler
-
-Aborting
-fatal: could not reset --hard
-Created autostash: ae7ed59
-not ok 7 - git rebase --autostash and untracked files # TODO known breakage
-
-checking known breakage of 2500.8 'git stash and untracked files': 
-	test_setup_sequencing stash_and_untracked_files &&
-	(
-		cd sequencing_stash_and_untracked_files &&
-		git checkout simple &&
-		git rm filler &&
-		mkdir filler &&
-		echo precious >filler/file &&
-		cp filler/file expect &&
-		git status --porcelain &&
-		git stash push &&
-		git status --porcelain &&
-		test_path_is_file filler/file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_stash_and_untracked_files/.git/
-[master (root-commit) 2519212] init
+ create mode 100644 a_main.t
+Switched to a new branch 'foo'
+[foo e2c25ec] a_foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
+ create mode 100644 a_foo.t
+Switched to a new branch 'bar'
+[bar bfd2f16] a_bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Already on 'simple'
-rm 'filler'
-D  filler
-?? expect
-?? filler/
-Saved working directory and index state WIP on simple: 15a37e4 another
-?? expect
-File filler/file doesn't exist
-not ok 8 - git stash and untracked files # TODO known breakage
-
-expecting success of 2500.9 'git am --abort and untracked dir vs. unmerged file': 
-	test_setup_sequencing am_abort_and_untracked &&
-	(
-		cd sequencing_am_abort_and_untracked &&
-		git format-patch -1 --stdout fooey >changes.mbox &&
-		test_must_fail git am --3way changes.mbox &&
-
-		# Delete the conflicted file; we will stage and commit it later
-		rm filler &&
-
-		# Put an unrelated untracked directory there
-		mkdir filler &&
-		echo foo >filler/file1 &&
-		echo bar >filler/file2 &&
-
-		test_must_fail git am --abort 2>errors &&
-		test_path_is_dir filler &&
-		grep "Updating .filler. would lose untracked files in it" errors
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_am_abort_and_untracked/.git/
-[master (root-commit) 2519212] init
+ create mode 100644 a_bar.t
+Switched to a new branch 'ambiguous_branch_and_file'
+[ambiguous_branch_and_file 225901c] a_ambiguous_branch_and_file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
+ create mode 100644 a_ambiguous_branch_and_file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_b/.git/
+[master (root-commit) 272258e] b_main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Applying: changes
-Using index info to reconstruct a base tree...
-M	filler
-Falling back to patching base and 3-way merge...
-Merging:
-15a37e4 another
-virtual changes
-found 1 common ancestor:
-virtual 3f7dfa0c5a54951d5d8082a6eda7692dfeb9ce47
-Removing foo/bar/baz.t
-Auto-merging filler
-CONFLICT (content): Merge conflict in filler
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 changes
-error: Updating 'filler' would lose untracked files in it
-ok 9 - git am --abort and untracked dir vs. unmerged file
-
-expecting success of 2500.10 'git am --skip and untracked dir vs deleted file': 
-	test_setup_sequencing am_skip_and_untracked &&
-	(
-		cd sequencing_am_skip_and_untracked &&
-		git checkout fooey &&
-		git format-patch -1 --stdout simple >changes.mbox &&
-		test_must_fail git am --3way changes.mbox &&
-
-		# Delete newfile
-		rm newfile &&
-
-		# Put an unrelated untracked directory there
-		mkdir newfile &&
-		echo foo >newfile/file1 &&
-		echo bar >newfile/file2 &&
-
-		# Change our mind about resolutions, just skip this patch
-		test_must_fail git am --skip 2>errors &&
-		test_path_is_dir newfile &&
-		grep "Updating .newfile. would lose untracked files in it" errors
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_am_skip_and_untracked/.git/
-[master (root-commit) 2519212] init
+ create mode 100644 b_main.t
+Switched to a new branch 'foo'
+[foo 7eb022a] b_foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 8220a2b] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-[master 4cfedf0] foo/bar/baz
+ create mode 100644 b_foo.t
+Switched to a new branch 'baz'
+[baz 8ac57c7] b_baz
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-Switched to branch 'fooey'
-rm 'foo/bar/baz.t'
-[fooey d39f842] changes
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'simple'
-[simple 15a37e4] another
+ create mode 100644 b_baz.t
+Switched to a new branch 'ambiguous_branch_and_file'
+[ambiguous_branch_and_file 1b5c299] b_ambiguous_branch_and_file
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 newfile
-Switched to branch 'fooey'
-Applying: another
-Using index info to reconstruct a base tree...
-M	filler
-Falling back to patching base and 3-way merge...
-Merging:
-d39f842 changes
-virtual another
-found 1 common ancestor:
-virtual a4566c4813b6ad70d63b32fcd2dda30547574648
-Auto-merging filler
-CONFLICT (content): Merge conflict in filler
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 another
-error: Updating 'newfile' would lose untracked files in it
-ok 10 - git am --skip and untracked dir vs deleted file
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_ambiguous_branch_and_file.t
+Fetching repo_a
+From repo_a
+ * [new branch]      ambiguous_branch_and_file   -> repo_a/ambiguous_branch_and_file
+ * [new branch]      bar                         -> repo_a/bar
+ * [new branch]      foo                         -> repo_a/foo
+ * [new branch]      master                      -> repo_a/master
+ * [new tag]         a_ambiguous_branch_and_file -> a_ambiguous_branch_and_file
+ * [new tag]         a_bar                       -> a_bar
+ * [new tag]         a_foo                       -> a_foo
+ * [new tag]         a_main                      -> a_main
+Fetching repo_b
+From repo_b
+ * [new branch]      ambiguous_branch_and_file   -> other_b/ambiguous_branch_and_file
+ * [new branch]      baz                         -> other_b/baz
+ * [new branch]      foo                         -> other_b/foo
+ * [new branch]      master                      -> other_b/master
+ * [new tag]         b_ambiguous_branch_and_file -> b_ambiguous_branch_and_file
+ * [new tag]         b_baz                       -> b_baz
+ * [new tag]         b_foo                       -> b_foo
+ * [new tag]         b_main                      -> b_main
+ok 1 - setup
 
-# still have 2 known breakage(s)
-# passed all remaining 8 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3010-ls-files-killed-modified.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3010-ls-files-killed-modified/.git/
-expecting success of 3010.1 'git update-index --add to add various paths.': 
-	date >path0 &&
-	test_ln_s_add xyzzy path1 &&
-	mkdir path2 path3 pathx &&
-	date >path2/file2 &&
-	date >path3/file3 &&
-	>pathx/ju &&
-	: >path7 &&
-	date >path8 &&
-	: >path9 &&
-	date >path10 &&
-	git update-index --add -- path0 path?/file? pathx/ju path7 path8 path9 path10 &&
-	git init submod1 &&
-	git -C submod1 commit --allow-empty -m "empty 1" &&
-	git init submod2 &&
-	git -C submod2 commit --allow-empty -m "empty 2" &&
-	git update-index --add submod[12] &&
-	(
-		cd submod1 &&
-		git commit --allow-empty -m "empty 1 (updated)"
-	) &&
-	rm -fr path?	# leave path10 alone
+expecting success of 2024.2 'checkout of non-existing branch fails': 
+	git checkout -B main &&
+	test_might_fail git branch -D xyzzy &&
 
-checking prerequisite: SYMLINKS
+	test_must_fail git checkout xyzzy &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/xyzzy &&
+	test_branch main
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+Switched to a new branch 'main'
+error: branch 'xyzzy' not found
+error: pathspec 'xyzzy' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 2 - checkout of non-existing branch fails
 
-)
-prerequisite SYMLINKS ok
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3010-ls-files-killed-modified/submod1/.git/
-[master (root-commit) 4da6488] empty 1
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3010-ls-files-killed-modified/submod2/.git/
-[master (root-commit) 2720aba] empty 2
- Author: A U Thor <author@example.com>
-[master c92551b] empty 1 (updated)
- Author: A U Thor <author@example.com>
-ok 1 - git update-index --add to add various paths.
+expecting success of 2024.3 'checkout of branch from multiple remotes fails #1': 
+	git checkout -B main &&
+	test_might_fail git branch -D foo &&
 
-expecting success of 3010.2 'git ls-files -k to show killed files.': 
-	date >path2 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s frotz path3 &&
-		ln -s nitfol path5
-	else
-		date >path3 &&
-		date >path5
-	fi &&
-	mkdir -p path0 path1 path6 pathx/ju &&
-	date >path0/file0 &&
-	date >path1/file1 &&
-	date >path6/file6 &&
-	date >path7 &&
-	: >path8 &&
-	: >path9 &&
-	touch path10 &&
-	>pathx/ju/nk &&
-	cat >.expected <<-\EOF
-	path0/file0
-	path1/file1
-	path2
-	path3
-	pathx/ju/nk
-	EOF
+	test_must_fail git checkout foo &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/foo &&
+	test_branch main
 
-ok 2 - git ls-files -k to show killed files.
+Reset branch 'main'
+error: branch 'foo' not found
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:
+hint:     git checkout --track origin/<name>
+hint:
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: 'foo' matched multiple (2) remote tracking branches
+fatal: Needed a single revision
+ok 3 - checkout of branch from multiple remotes fails #1
 
-expecting success of 3010.3 'git ls-files -k output (w/o icase)': 
-	git ls-files -k >.output &&
-	test_cmp .expected .output
+expecting success of 2024.4 'when arg matches multiple remotes, do not fallback to interpreting as pathspec': 
+	# create a file with name matching remote branch name
+	git checkout -b t_ambiguous_branch_and_file &&
+	>ambiguous_branch_and_file &&
+	git add ambiguous_branch_and_file &&
+	git commit -m "ambiguous_branch_and_file" &&
 
-ok 3 - git ls-files -k output (w/o icase)
+	# modify file to verify that it will not be touched by checkout
+	test_when_finished "git checkout -- ambiguous_branch_and_file" &&
+	echo "file contents" >ambiguous_branch_and_file &&
+	cp ambiguous_branch_and_file expect &&
 
-expecting success of 3010.4 'git ls-files -k output (w/ icase)': 
-	git -c core.ignorecase=true ls-files -k >.output &&
-	test_cmp .expected .output
+	test_must_fail git checkout ambiguous_branch_and_file 2>err &&
 
-ok 4 - git ls-files -k output (w/ icase)
+	test_grep "matched multiple (2) remote tracking branches" err &&
 
-expecting success of 3010.5 'git ls-files -m to show modified files.': 
-	git ls-files -m >.output
+	# file must not be altered
+	test_cmp expect ambiguous_branch_and_file
 
-ok 5 - git ls-files -m to show modified files.
+Switched to a new branch 't_ambiguous_branch_and_file'
+[t_ambiguous_branch_and_file 8830e76] ambiguous_branch_and_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 ambiguous_branch_and_file
+fatal: 'ambiguous_branch_and_file' matched multiple (2) remote tracking branches
+ok 4 - when arg matches multiple remotes, do not fallback to interpreting as pathspec
 
-expecting success of 3010.6 'validate git ls-files -m output.': 
-	cat >.expected <<-\EOF &&
-	path0
-	path1
-	path2/file2
-	path3/file3
-	path7
-	path8
-	pathx/ju
-	submod1
-	EOF
-	test_cmp .expected .output
+expecting success of 2024.5 'checkout of branch from multiple remotes fails with advice': 
+	git checkout -B main &&
+	test_might_fail git branch -D foo &&
+	test_must_fail git checkout foo 2>stderr &&
+	test_branch main &&
+	status_uno_is_clean &&
+	test_grep "^hint: " stderr &&
+	test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
+		checkout foo 2>stderr &&
+	test_branch main &&
+	status_uno_is_clean &&
+	test_grep ! "^hint: " stderr
 
-ok 6 - validate git ls-files -m output.
+Switched to and reset branch 'main'
+error: branch 'foo' not found
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:     git checkout --track origin/<name>
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+ok 5 - checkout of branch from multiple remotes fails with advice
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3012-ls-files-dedup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3012-ls-files-dedup/.git/
-expecting success of 3012.1 'setup': 
-	>a.txt &&
-	>b.txt &&
-	>delete.txt &&
-	git add a.txt b.txt delete.txt &&
-	git commit -m base &&
-	echo a >a.txt &&
-	echo b >b.txt &&
-	echo delete >delete.txt &&
-	git add a.txt b.txt delete.txt &&
-	git commit -m tip &&
-	git tag tip &&
-	git reset --hard HEAD^ &&
-	echo change >a.txt &&
-	git commit -a -m side &&
-	git tag side
+expecting success of 2024.6 'checkout -p with multiple remotes does not print advice': 
+	git checkout -B main &&
+	test_might_fail git branch -D foo &&
 
-[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
+	git checkout -p foo 2>stderr &&
+	test_grep ! "^hint: " stderr &&
+	status_uno_is_clean
 
-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
+Reset branch 'main'
+error: branch 'foo' not found
+No changes.
+ok 6 - checkout -p with multiple remotes does not print advice
 
-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 2024.7 'checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D foo &&
 
-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
+	git -c checkout.defaultRemote=repo_a checkout foo &&
+	status_uno_is_clean &&
+	test_branch foo &&
+	test_cmp_rev remotes/repo_a/foo HEAD &&
+	test_branch_upstream foo repo_a foo
 
-HEAD is now at 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
+Reset branch 'main'
+error: branch 'foo' not found
+Switched to a new branch 'foo'
+branch 'foo' set up to track 'repo_a/foo'.
+ok 7 - checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3011-common-prefixes-and-directory-traversal.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3011-common-prefixes-and-directory-traversal/.git/
-expecting success of 3011.1 'setup': 
-	test_commit hello &&
+expecting success of 2024.8 'checkout of branch from a single remote succeeds #1': 
+	git checkout -B main &&
+	test_might_fail git branch -D bar &&
 
-	>empty &&
-	mkdir untracked_dir &&
-	>untracked_dir/empty &&
-	git init untracked_repo &&
-	>untracked_repo/empty &&
+	git checkout bar &&
+	status_uno_is_clean &&
+	test_branch bar &&
+	test_cmp_rev remotes/repo_a/bar HEAD &&
+	test_branch_upstream bar repo_a bar
 
-	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
+Switched to and reset branch 'main'
+error: branch 'bar' not found
+Switched to a new branch 'bar'
+branch 'bar' set up to track 'repo_a/bar'.
+ok 8 - checkout of branch from a single remote succeeds #1
 
-[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.48.0~rc1+next.20250101/t/trash directory.t3011-common-prefixes-and-directory-traversal/untracked_repo/.git/
-ok 1 - setup
+expecting success of 2024.9 'checkout of branch from a single remote succeeds #2': 
+	git checkout -B main &&
+	test_might_fail git branch -D baz &&
 
-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
+	git checkout baz &&
+	status_uno_is_clean &&
+	test_branch baz &&
+	test_cmp_rev remotes/other_b/baz HEAD &&
+	test_branch_upstream baz repo_b baz
 
-ok 2 - git ls-files -o shows the right entries
+Switched to and reset branch 'main'
+error: branch 'baz' not found
+Switched to a new branch 'baz'
+branch 'baz' set up to track 'repo_b/baz'.
+ok 9 - checkout of branch from a single remote succeeds #2
 
-expecting success of 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
+expecting success of 2024.10 '--no-guess suppresses branch auto-vivification': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
 
-ok 3 - git ls-files -o --exclude-standard shows the right entries
+	test_must_fail git checkout --no-guess bar &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch main
 
-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
+Switched to and reset branch 'main'
+Deleted branch bar (was bfd2f16).
+error: pathspec 'bar' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 10 - --no-guess suppresses branch auto-vivification
 
-ok 4 - git ls-files -o untracked_dir recurses
+expecting success of 2024.11 'checkout.guess = false suppresses branch auto-vivification': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
 
-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
+	test_config checkout.guess false &&
+	test_must_fail git checkout bar &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch main
 
-ok 5 - git ls-files -o untracked_dir/ recurses
+Reset branch 'main'
+error: branch 'bar' not found
+error: pathspec 'bar' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 11 - checkout.guess = false suppresses branch auto-vivification
 
-expecting success of 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
+expecting success of 2024.12 'setup more remotes with unconventional refspecs': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	git init repo_c &&
+	(
+		cd repo_c &&
+		test_commit c_main &&
+		git checkout -b bar &&
+		test_commit c_bar &&
+		git checkout -b spam &&
+		test_commit c_spam
+	) &&
+	git init repo_d &&
+	(
+		cd repo_d &&
+		test_commit d_main &&
+		git checkout -b baz &&
+		test_commit d_baz &&
+		git checkout -b eggs &&
+		test_commit d_eggs
+	) &&
+	git remote add repo_c repo_c &&
+	git config remote.repo_c.fetch \
+		"+refs/heads/*:refs/remotes/extra_dir/repo_c/extra_dir/*" &&
+	git remote add repo_d repo_d &&
+	git config remote.repo_d.fetch \
+		"+refs/heads/*:refs/repo_d/*" &&
+	git fetch --all
 
-ok 6 - git ls-files -o --directory untracked_dir does not recurse
+Reset branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_c/.git/
+[master (root-commit) cdfe1c8] c_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c_main.t
+Switched to a new branch 'bar'
+[bar b017b41] c_bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c_bar.t
+Switched to a new branch 'spam'
+[spam 449823f] c_spam
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c_spam.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2024-checkout-dwim/repo_d/.git/
+[master (root-commit) b0e85f1] d_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_main.t
+Switched to a new branch 'baz'
+[baz b83c7c6] d_baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_baz.t
+Switched to a new branch 'eggs'
+[eggs e1ffd37] d_eggs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_eggs.t
+Fetching repo_a
+Fetching repo_b
+Fetching repo_c
+From repo_c
+ * [new branch]      bar        -> extra_dir/repo_c/extra_dir/bar
+ * [new branch]      master     -> extra_dir/repo_c/extra_dir/master
+ * [new branch]      spam       -> extra_dir/repo_c/extra_dir/spam
+ * [new tag]         c_bar      -> c_bar
+ * [new tag]         c_main     -> c_main
+ * [new tag]         c_spam     -> c_spam
+Fetching repo_d
+From repo_d
+ * [new branch]      baz        -> refs/repo_d/baz
+ * [new branch]      eggs       -> refs/repo_d/eggs
+ * [new branch]      master     -> refs/repo_d/master
+ * [new tag]         d_baz      -> d_baz
+ * [new tag]         d_eggs     -> d_eggs
+ * [new tag]         d_main     -> d_main
+ok 12 - setup more remotes with unconventional refspecs
 
-expecting success of 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
+expecting success of 2024.13 'checkout of branch from multiple remotes fails #2': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
 
-ok 7 - git ls-files -o --directory untracked_dir/ does not recurse
+	test_must_fail git checkout bar &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch main
 
-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
+Reset branch 'main'
+error: branch 'bar' not found
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:
+hint:     git checkout --track origin/<name>
+hint:
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: 'bar' matched multiple (2) remote tracking branches
+fatal: Needed a single revision
+ok 13 - checkout of branch from multiple remotes fails #2
 
-ok 8 - git ls-files -o untracked_repo does not recurse
+expecting success of 2024.14 'checkout of branch from multiple remotes fails #3': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D baz &&
 
-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
+	test_must_fail git checkout baz &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/baz &&
+	test_branch main
 
-ok 9 - git ls-files -o untracked_repo/ does not recurse
+Reset branch 'main'
+Deleted branch baz (was 8ac57c7).
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:
+hint:     git checkout --track origin/<name>
+hint:
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: 'baz' matched multiple (2) remote tracking branches
+fatal: Needed a single revision
+ok 14 - checkout of branch from multiple remotes fails #3
 
-expecting success of 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
+expecting success of 2024.15 'checkout of branch from a single remote succeeds #3': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-ok 10 - git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only
+	git checkout spam &&
+	status_uno_is_clean &&
+	test_branch spam &&
+	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
+	test_branch_upstream spam repo_c spam
 
-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
+Reset branch 'main'
+error: branch 'spam' not found
+Switched to a new branch 'spam'
+branch 'spam' set up to track 'repo_c/spam'.
+ok 15 - checkout of branch from a single remote succeeds #3
 
-ok 11 - git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only
+expecting success of 2024.16 'checkout of branch from a single remote succeeds #4': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D eggs &&
 
-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
+	git checkout eggs &&
+	status_uno_is_clean &&
+	test_branch eggs &&
+	test_cmp_rev refs/repo_d/eggs HEAD &&
+	test_branch_upstream eggs repo_d eggs
 
-ok 12 - git ls-files -o --directory untracked_dir untracked_repo does not recurse
+Switched to and reset branch 'main'
+error: branch 'eggs' not found
+Switched to a new branch 'eggs'
+branch 'eggs' set up to track 'repo_d/eggs'.
+ok 16 - checkout of branch from a single remote succeeds #4
 
-expecting success of 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
+expecting success of 2024.17 'checkout of branch with a file having the same name fails': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-ok 13 - git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse
+	>spam &&
+	test_must_fail git checkout spam &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/spam &&
+	test_branch main
 
-expecting success of 3011.14 'git ls-files -o .git shows nothing': 
-	git ls-files -o .git >actual &&
-	test_must_be_empty actual
+Switched to and reset branch 'main'
+Deleted branch spam (was 449823f).
+fatal: 'spam' could be both a local file and a tracking branch.
+Please use -- (and optionally --no-guess) to disambiguate
+fatal: Needed a single revision
+ok 17 - checkout of branch with a file having the same name fails
 
-ok 14 - git ls-files -o .git shows nothing
+expecting success of 2024.18 'checkout of branch with a file in subdir having the same name fails': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-expecting success of 3011.15 'git ls-files -o .git/ shows nothing': 
-	git ls-files -o .git/ >actual &&
-	test_must_be_empty actual
+	>spam &&
+	mkdir sub &&
+	mv spam sub/spam &&
+	test_must_fail git -C sub checkout spam &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/spam &&
+	test_branch main
 
-ok 15 - git ls-files -o .git/ shows nothing
+Reset branch 'main'
+error: branch 'spam' not found
+fatal: 'spam' could be both a local file and a tracking branch.
+Please use -- (and optionally --no-guess) to disambiguate
+fatal: Needed a single revision
+ok 18 - checkout of branch with a file in subdir having the same name fails
 
-checking prerequisite: FUNNYNAMES
+expecting success of 2024.19 'checkout <branch> -- succeeds, even if a file with the same name exists': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-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
+	>spam &&
+	git checkout spam -- &&
+	status_uno_is_clean &&
+	test_branch spam &&
+	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
+	test_branch_upstream spam repo_c spam
 
-)
-prerequisite FUNNYNAMES ok
-expecting success of 3011.16 'git ls-files -o untracked_* recurses appropriately': 
-	mkdir "untracked_*" &&
-	>"untracked_*/empty" &&
+Reset branch 'main'
+error: branch 'spam' not found
+Switched to a new branch 'spam'
+branch 'spam' set up to track 'repo_c/spam'.
+ok 19 - checkout <branch> -- succeeds, even if a file with the same name exists
 
-	cat <<-EOF >expect &&
-	untracked_*/empty
-	untracked_dir/empty
-	untracked_repo/
-	EOF
-	git ls-files -o "untracked_*" >actual &&
-	test_cmp expect actual
+expecting success of 2024.20 'loosely defined local base branch is reported correctly': 
 
-ok 16 - git ls-files -o untracked_* recurses appropriately
+	git checkout main &&
+	status_uno_is_clean &&
+	git branch strict &&
+	git branch loose &&
+	git commit --allow-empty -m "a bit more" &&
 
-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
+	test_config branch.strict.remote . &&
+	test_config branch.loose.remote . &&
+	test_config branch.strict.merge refs/heads/main &&
+	test_config branch.loose.merge main &&
 
---- expect	2025-02-09 06:53:53.425645823 +0000
-+++ actual	2025-02-09 06:53:53.429645848 +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
+	git checkout strict >expect.raw 2>&1 &&
+	sed -e "s/strict/BRANCHNAME/g" <expect.raw >expect &&
+	status_uno_is_clean &&
+	git checkout loose >actual.raw 2>&1 &&
+	sed -e "s/loose/BRANCHNAME/g" <actual.raw >actual &&
+	status_uno_is_clean &&
+	grep BRANCHNAME actual &&
 
-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
+Switched to branch 'main'
+[main 0b0f2ce] a bit more
+ Author: A U Thor <author@example.com>
+Switched to branch 'BRANCHNAME'
+ok 20 - loosely defined local base branch is reported correctly
 
-expecting success of 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
+expecting success of 2024.21 'reject when arg could be part of dwim branch': 
+	git remote add foo file://non-existent-place &&
+	git update-ref refs/remotes/foo/dwim-arg HEAD &&
+	echo foo >dwim-arg &&
+	git add dwim-arg &&
+	echo bar >dwim-arg &&
+	test_must_fail git checkout dwim-arg &&
+	test_must_fail git rev-parse refs/heads/dwim-arg -- &&
+	grep bar dwim-arg
 
-ok 19 - git ls-files -o --directory untracked_*/ does not recurse
+fatal: 'dwim-arg' could be both a local file and a tracking branch.
+Please use -- (and optionally --no-guess) to disambiguate
+fatal: bad revision 'refs/heads/dwim-arg'
+bar
+ok 21 - reject when arg could be part of dwim branch
 
-expecting success of 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
+expecting success of 2024.22 'disambiguate dwim branch and checkout path (1)': 
+	git update-ref refs/remotes/foo/dwim-arg1 HEAD &&
+	echo foo >dwim-arg1 &&
+	git add dwim-arg1 &&
+	echo bar >dwim-arg1 &&
+	git checkout -- dwim-arg1 &&
+	test_must_fail git rev-parse refs/heads/dwim-arg1 -- &&
+	grep foo dwim-arg1
 
-ok 20 - git ls-files -o consistent between one or two dirs
+fatal: bad revision 'refs/heads/dwim-arg1'
+foo
+ok 22 - disambiguate dwim branch and checkout path (1)
 
-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
+expecting success of 2024.23 'disambiguate dwim branch and checkout path (2)': 
+	git update-ref refs/remotes/foo/dwim-arg2 HEAD &&
+	echo foo >dwim-arg2 &&
+	git add dwim-arg2 &&
+	echo bar >dwim-arg2 &&
+	git checkout dwim-arg2 -- &&
+	git rev-parse refs/heads/dwim-arg2 -- &&
+	grep bar dwim-arg2
 
-ok 21 - git status --ignored shows same files under dir with or without pathspec
+Switched to a new branch 'dwim-arg2'
+A	dwim-arg
+A	dwim-arg1
+A	dwim-arg2
+branch 'dwim-arg2' set up to track 'foo/dwim-arg2'.
+e1ffd376e093970186efb2074ec16dcb57d23789
+--
+bar
+ok 23 - disambiguate dwim branch and checkout path (2)
 
-# still have 1 known breakage(s)
-# passed all remaining 20 test(s)
-1..21
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3020-ls-files-error-unmatch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3020-ls-files-error-unmatch/.git/
-expecting success of 3020.1 'setup': 
-	touch foo bar &&
-	git update-index --add foo bar &&
-	git commit -m "add foo bar"
+*** t2071-restore-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2071-restore-patch/.git/
+expecting success of 2071.1 'setup': 
+	mkdir dir &&
+	echo parent >dir/foo &&
+	echo dummy >bar &&
+	git add bar dir/foo &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
 
-[master (root-commit) 6c59e8c] add foo bar
+[master (root-commit) 758b165] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
+ 2 files changed, 2 insertions(+)
  create mode 100644 bar
- create mode 100644 foo
+ create mode 100644 dir/foo
+[master 3319288] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 3020.2 'git ls-files --error-unmatch should fail with unmatched path.': 
-	test_must_fail git ls-files --error-unmatch foo bar-does-not-match
+expecting success of 2071.2 'restore -p without pathspec is fine': 
+	echo q >cmd &&
+	git restore -p <cmd
 
-error: pathspec 'bar-does-not-match' did not match any file(s) known to git
-Did you forget to 'git add'?
-foo
-ok 2 - git ls-files --error-unmatch should fail with unmatched path.
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 2 - restore -p without pathspec is fine
 
-expecting success of 3020.3 'git ls-files --error-unmatch should succeed with matched paths.': 
-	git ls-files --error-unmatch foo bar
+expecting success of 2071.3 'saying "n" does nothing': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n n | git restore -p &&
+	verify_saved_state bar &&
+	verify_saved_state dir/foo
 
-bar
-foo
-ok 3 - git ls-files --error-unmatch should succeed with matched paths.
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 3 - saying "n" does nothing
 
-# passed all 3 test(s)
-1..3
+expecting success of 2071.4 'git restore -p': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 4 - git restore -p
+
+expecting success of 2071.5 'git restore -p with staged changes': 
+	set_state dir/foo work index &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 9015a7a..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-index
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 5 - git restore -p with staged changes
+
+expecting success of 2071.6 'git restore -p --source=HEAD': 
+		set_state dir/foo work index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git restore -p --source=$opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head index &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 6 - git restore -p --source=HEAD
+
+expecting success of 2071.7 'git restore -p --source=@': 
+		set_state dir/foo work index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git restore -p --source=$opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head index &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 7 - git restore -p --source=@
+
+expecting success of 2071.8 'git restore -p --source=HEAD^': 
+	set_state dir/foo work index &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git restore -p --source=HEAD^ &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent index
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 8 - git restore -p --source=HEAD^
+
+expecting success of 2071.9 'git restore -p --source=HEAD^...': 
+	set_state dir/foo work index &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git restore -p --source=HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent index
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 9 - git restore -p --source=HEAD^...
+
+expecting success of 2071.10 'git restore -p handles deletion': 
+	set_state dir/foo work index &&
+	rm dir/foo &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+deleted file mode 100644
+index 9015a7a..0000000
+--- a/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-index
+(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
+ok 10 - git restore -p handles deletion
+
+expecting success of 2071.11 'path limiting works: dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git restore -p dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 11 - path limiting works: dir
+
+expecting success of 2071.12 'path limiting works: -- dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git restore -p -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 12 - path limiting works: -- dir
+
+expecting success of 2071.13 'path limiting works: HEAD^ -- dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent head
+
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 13 - path limiting works: HEAD^ -- dir
+
+expecting success of 2071.14 'path limiting works: foo inside dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | (cd dir && git restore -p foo) &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 14 - path limiting works: foo inside dir
+
+expecting success of 2071.15 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 15 - none of this moved HEAD
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2501-cwd-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/
-expecting success of 2501.1 'setup': 
-	test_commit init &&
+*** t2081-parallel-checkout-collisions.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2081-parallel-checkout-collisions/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
 
-	git branch fd_conflict &&
+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
 
-	mkdir -p foo/bar &&
-	test_commit foo/bar/baz &&
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 1 # skip setup (missing CASE_INSENSITIVE_FS)
 
-	git revert HEAD &&
-	git tag reverted &&
+ok 2 # skip worker detects basename collision (missing CASE_INSENSITIVE_FS)
 
-	git checkout fd_conflict &&
-	mkdir dirORfile &&
-	test_commit dirORfile/foo &&
+ok 3 # skip worker detects dirname collision (missing CASE_INSENSITIVE_FS)
 
-	git rm -r dirORfile &&
-	echo not-a-directory >dirORfile &&
-	git add dirORfile &&
-	git commit -m dirORfile &&
+checking prerequisite: SYMLINKS
 
-	git switch -c df_conflict HEAD~1 &&
-	test_commit random_file &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-	git switch -c undo_fd_conflict fd_conflict &&
-	git revert HEAD
+)
+prerequisite SYMLINKS ok
+ok 4 # skip do not follow symlinks colliding with leading dir (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
 
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master f4c5aab] foo/bar/baz
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2030-unresolve-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2030-unresolve-info/.git/
+expecting success of 2030.1 'setup': 
+	mkdir fi &&
+	printf "a\0a" >binary &&
+	git add binary &&
+	test_commit initial fi/le first &&
+	git branch side &&
+	git branch another &&
+	printf "a\0b" >binary &&
+	git add binary &&
+	test_commit second fi/le second &&
+	git checkout side &&
+	test_commit third fi/le third &&
+	git branch add-add &&
+	git checkout another &&
+	test_commit fourth fi/le fourth &&
+	git checkout add-add &&
+	test_commit fifth add-differently &&
+	git checkout main
+
+[main (root-commit) 7b271e3] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-[master 968d1fe] Revert "foo/bar/baz"
+ 2 files changed, 1 insertion(+)
+ create mode 100644 binary
+ create mode 100644 fi/le
+[main 9a00f99] second
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'fd_conflict'
-[fd_conflict d7f9e78] dirORfile/foo
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'side'
+[side b18340d] third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dirORfile/foo.t
-rm 'dirORfile/foo.t'
-[fd_conflict 9658629] dirORfile
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'another'
+[another cf4d985] fourth
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 dirORfile
- delete mode 100644 dirORfile/foo.t
-Switched to a new branch 'df_conflict'
-[df_conflict d90d7a3] random_file
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'add-add'
+[add-add b851e77] fifth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 random_file.t
-Switched to a new branch 'undo_fd_conflict'
-[undo_fd_conflict 46c1835] Revert "dirORfile"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 dirORfile
- create mode 100644 dirORfile/foo.t
+ create mode 100644 add-differently
+Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 2501.2 'checkout does not clean cwd incidentally': 
-	test_incidental_dir_removal git checkout init
+expecting success of 2030.2 'add records switch clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	git checkout second^0 &&
+	echo switching clears &&
+	check_resolve_undo cleared
 
-Note: switching to 'foo/bar/baz^{commit}'.
+HEAD is now at 9a00f99 second
+Note: switching to 'second^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -106414,13841 +95472,14782 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at f4c5aab foo/bar/baz
-Previous HEAD position was f4c5aab foo/bar/baz
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 2519212 init
-ok 2 - checkout does not clean cwd incidentally
-
-expecting success of 2501.3 'checkout fails if cwd needs to be removed': 
-	test_required_dir_removal git checkout fd_conflict
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD b3a51df] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Previous HEAD position was 2519212 init
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 3 - checkout fails if cwd needs to be removed
+  b3a51df merged
 
-expecting success of 2501.4 'reset --hard does not clean cwd incidentally': 
-	test_incidental_dir_removal git reset --hard init
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 2519212 init
-ok 4 - reset --hard does not clean cwd incidentally
+ git branch <new-branch-name> b3a51df
 
-expecting success of 2501.5 'reset --hard fails if cwd needs to be removed': 
-	test_required_dir_removal git reset --hard fd_conflict
+HEAD is now at 9a00f99 second
+switching clears
+ok 2 - add records switch clears
 
-Previous HEAD position was 2519212 init
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove 'dirORfile' since it is the current working directory.
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 5 - reset --hard fails if cwd needs to be removed
+expecting success of 2030.3 'rm records reset clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
 
-expecting success of 2501.6 'merge does not clean cwd incidentally': 
-	test_incidental_dir_removal git merge reverted
+	echo merge clears upfront &&
+	test_must_fail git merge fourth^0 &&
+	check_resolve_undo nuked &&
 
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-Updating f4c5aab..968d1fe
-Fast-forward
- foo/bar/baz.t | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 968d1fe Revert "foo/bar/baz"
-ok 6 - merge does not clean cwd incidentally
+	git rm -f fi/le &&
+	echo resolving records &&
+	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
 
-expecting success of 2501.7 'merge fails if cwd needs to be removed; recursive friendly': 
-	git checkout foo/bar/baz &&
-	test_when_finished "git clean -fdx" &&
+	git reset --hard &&
+	echo resetting discards &&
+	check_resolve_undo discarded
 
-	mkdir dirORfile &&
-	(
-		cd dirORfile &&
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 70d285e] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+merge clears upfront
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'fi/le'
+resolving records
+HEAD is now at 70d285e merged
+resetting discards
+ok 3 - rm records reset clears
 
-		test_must_fail git merge fd_conflict 2>../error
-	) &&
+expecting success of 2030.4 'plumbing clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
 
-	test_path_is_dir dirORfile &&
-	grep "Refusing to remove the current working directory" error
+	echo plumbing clear &&
+	git update-index --clear-resolve-undo &&
+	check_resolve_undo cleared
 
-Previous HEAD position was 968d1fe Revert "foo/bar/baz"
-HEAD is now at f4c5aab foo/bar/baz
-error: Refusing to remove the current working directory:
-Removing dirORfile/
-Removing error
-ok 7 - merge fails if cwd needs to be removed; recursive friendly
+HEAD is now at 70d285e merged
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 2501.8 'merge fails if cwd needs to be removed': 
-	test_required_dir_removal git merge fd_conflict
+  70d285e merged
 
-Previous HEAD position was f4c5aab foo/bar/baz
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-ok 8 - merge fails if cwd needs to be removed
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 2501.9 'cherry-pick does not clean cwd incidentally': 
-	test_incidental_dir_removal git cherry-pick reverted
+ git branch <new-branch-name> 70d285e
 
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-[detached HEAD d0d1a1f] Revert "foo/bar/baz"
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 894de51] merged
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at d0d1a1f Revert "foo/bar/baz"
-ok 9 - cherry-pick does not clean cwd incidentally
+committing keeps
+plumbing clear
+ok 4 - plumbing clears
 
-expecting success of 2501.10 'cherry-pick fails if cwd needs to be removed': 
-	test_required_dir_removal git cherry-pick fd_conflict
+expecting success of 2030.5 'add records checkout -m undoes': 
+	prime_resolve_undo &&
+	git diff HEAD &&
+	git checkout --conflict=merge fi/le &&
+	echo checkout used the record and removed it &&
+	check_resolve_undo removed &&
+	echo the index and the work tree is unmerged again &&
+	git diff >actual &&
+	grep "^++<<<<<<<" actual
 
+HEAD is now at 894de51 merged
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  d0d1a1f Revert "foo/bar/baz"
+  894de51 merged
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> d0d1a1f
-
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 10 - cherry-pick fails if cwd needs to be removed
-
-expecting success of 2501.11 'rebase does not clean cwd incidentally': 
-	test_incidental_dir_removal git rebase reverted
+ git branch <new-branch-name> 894de51
 
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-Successfully rebased and updated detached HEAD.
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 968d1fe Revert "foo/bar/baz"
-ok 11 - rebase does not clean cwd incidentally
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+diff --git a/fi/le b/fi/le
+index e019be0..8dca2f8 100644
+--- a/fi/le
++++ b/fi/le
+@@ -1 +1 @@
+-second
++different
+Recreated 1 merge conflict
+checkout used the record and removed it
+the index and the work tree is unmerged again
+++<<<<<<< ours
+ok 5 - add records checkout -m undoes
 
-expecting success of 2501.12 'rebase fails if cwd needs to be removed': 
-	test_required_dir_removal git rebase fd_conflict
+expecting success of 2030.6 'unmerge with plumbing': 
+	prime_resolve_undo &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
 
-Previous HEAD position was 968d1fe Revert "foo/bar/baz"
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 12 - rebase fails if cwd needs to be removed
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - unmerge with plumbing
 
-expecting success of 2501.13 'revert does not clean cwd incidentally': 
-	test_incidental_dir_removal git revert HEAD
+expecting success of 2030.7 'unmerge can be done even after committing': 
+	prime_resolve_undo &&
+	git commit -m "record to nuke MERGE_HEAD" &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
 
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-[detached HEAD f0f8756] Revert "foo/bar/baz"
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 739b00c] record to nuke MERGE_HEAD
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at f0f8756 Revert "foo/bar/baz"
-ok 13 - revert does not clean cwd incidentally
+ok 7 - unmerge can be done even after committing
 
-expecting success of 2501.14 'revert fails if cwd needs to be removed': 
-	test_required_dir_removal git revert undo_fd_conflict
+expecting success of 2030.8 'unmerge removal': 
+	prime_resolve_undo remove &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
 
+HEAD is now at 739b00c record to nuke MERGE_HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  f0f8756 Revert "foo/bar/baz"
+  739b00c record to nuke MERGE_HEAD
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> f0f8756
-
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 14 - revert fails if cwd needs to be removed
+ git branch <new-branch-name> 739b00c
 
-expecting success of 2501.15 'rm does not clean cwd incidentally': 
-	test_incidental_dir_removal git rm bar/baz.t
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'fi/le'
+ok 8 - unmerge removal
 
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-rm 'foo/bar/baz.t'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
-D  foo/bar/baz.t
-HEAD is now at f4c5aab foo/bar/baz
-ok 15 - rm does not clean cwd incidentally
+expecting success of 2030.9 'unmerge removal after committing': 
+	prime_resolve_undo remove &&
+	git commit -m "record to nuke MERGE_HEAD" &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
 
-expecting success of 2501.16 'apply does not remove cwd incidentally': 
-	git diff HEAD HEAD~1 >patch &&
-	test_incidental_dir_removal git apply ../patch
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'fi/le'
+[detached HEAD 76cfeff] record to nuke MERGE_HEAD
+ Author: A U Thor <author@example.com>
+ok 9 - unmerge removal after committing
 
-HEAD is now at f4c5aab foo/bar/baz
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
- D foo/bar/baz.t
-?? patch
-HEAD is now at f4c5aab foo/bar/baz
-ok 16 - apply does not remove cwd incidentally
+expecting success of 2030.10 'rerere and rerere forget': 
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	git rerere &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	git checkout -m fi/le &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	git rerere &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	git add fi/le &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	git rerere forget fi/le &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
 
-expecting success of 2501.17 'clean does not remove cwd incidentally': 
-	test_incidental_untracked_dir_removal \
-		git -C .. clean -fd -e warnings . >warnings &&
-	grep "Refusing to remove current working directory" warnings
+HEAD is now at 76cfeff record to nuke MERGE_HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-HEAD is now at f4c5aab foo/bar/baz
-Refusing to remove current working directory
-HEAD is now at f4c5aab foo/bar/baz
-ok 17 - clean does not remove cwd incidentally
+  76cfeff record to nuke MERGE_HEAD
 
-expecting success of 2501.18 'stash does not remove cwd incidentally': 
-	test_incidental_untracked_dir_removal \
-		git stash --include-untracked
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-HEAD is now at f4c5aab foo/bar/baz
-Saved working directory and index state WIP on (no branch): f4c5aab foo/bar/baz
-Refusing to remove current working directory
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/untracked
-HEAD is now at f4c5aab foo/bar/baz
-ok 18 - stash does not remove cwd incidentally
+ git branch <new-branch-name> 76cfeff
 
-expecting success of 2501.19 '`rm -rf dir` only removes a subset of dir': 
-	test_when_finished "rm -rf a/" &&
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+record the resolution
+Recorded resolution for 'fi/le'.
+Recreated 1 merge conflict
+resurrect the conflict
+=======
+reresolve the conflict
+Resolved 'fi/le' using previous resolution.
+register the resolution again
+Updated preimage for 'fi/le'
+Forgot resolution for 'fi/le'
+ok 10 - rerere and rerere forget
 
-	mkdir -p a/b/c &&
-	>a/b/c/untracked &&
-	>a/b/c/tracked &&
-	git add a/b/c/tracked &&
+expecting success of 2030.11 'rerere and rerere forget (subdirectory)': 
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	(cd fi && git rerere) &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	(cd fi && git checkout -m le) &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	(cd fi && git rerere) &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	(cd fi && git add le) &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	(cd fi && git rerere forget le) &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
 
-	(
-		cd a/b &&
-		git rm -rf ../b
-	) &&
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+record the resolution
+Recorded resolution for 'fi/le'.
+Recreated 1 merge conflict
+resurrect the conflict
+=======
+reresolve the conflict
+Resolved 'fi/le' using previous resolution.
+register the resolution again
+Updated preimage for 'fi/le'
+Forgot resolution for 'fi/le'
+ok 11 - rerere and rerere forget (subdirectory)
 
-	test_path_is_dir a/b &&
-	test_path_is_missing a/b/c/tracked &&
-	test_path_is_file a/b/c/untracked
+expecting success of 2030.12 'rerere forget (binary)': 
+	git checkout -f side &&
+	test_commit --printf binary binary "a\0c" &&
+	test_must_fail git merge second &&
+	git rerere forget binary
 
-rm 'a/b/c/tracked'
-ok 19 - `rm -rf dir` only removes a subset of dir
+Previous HEAD position was 9a00f99 second
+Switched to branch 'side'
+[side ebd12fa] binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+warning: Cannot merge binary files: binary (HEAD vs. second)
+Auto-merging binary
+CONFLICT (content): Merge conflict in binary
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+error: could not parse conflict hunks in 'binary'
+ok 12 - rerere forget (binary)
 
-expecting success of 2501.20 '`rm -rf dir` even with only tracked files will remove something else': 
-	test_when_finished "rm -rf a/" &&
+expecting success of 2030.13 'rerere forget (add-add conflict)': 
+	git checkout -f main &&
+	echo main >add-differently &&
+	git add add-differently &&
+	git commit -m "add differently" &&
+	test_must_fail git merge fifth &&
+	git rerere forget add-differently 2>actual &&
+	test_grep "no remembered" actual
 
-	mkdir -p a/b/c &&
-	>a/b/c/tracked &&
-	git add a/b/c/tracked &&
+Switched to branch 'main'
+[main d92f3b1] add differently
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-differently
+Auto-merging add-differently
+CONFLICT (add/add): Merge conflict in add-differently
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'add-differently'
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+error: no remembered resolution for 'add-differently'
+ok 13 - rerere forget (add-add conflict)
 
-	(
-		cd a/b &&
-		git rm -rf ../b
-	) &&
+expecting success of 2030.14 'resolve-undo keeps blobs from gc': 
+	git checkout -f main &&
 
-	test_path_is_missing a/b/c/tracked &&
-	test_path_is_missing a/b/c &&
-	test_path_is_dir a/b
+	# First make sure we do not have any cruft left in the object store
+	git repack -a -d &&
+	git prune --expire=now &&
+	git prune-packed &&
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
 
-rm 'a/b/c/tracked'
-ok 20 - `rm -rf dir` even with only tracked files will remove something else
+	# Now add three otherwise unreferenced blob objects to the index
+	git reset --hard &&
+	B1=$(echo "resolve undo test data 1" | git hash-object -w --stdin) &&
+	B2=$(echo "resolve undo test data 2" | git hash-object -w --stdin) &&
+	B3=$(echo "resolve undo test data 3" | git hash-object -w --stdin) &&
+	git update-index --add --index-info <<-EOF &&
+	100644 $B1 1	frotz
+	100644 $B2 2	frotz
+	100644 $B3 3	frotz
+	EOF
 
-expecting success of 2501.21 'git version continues working from a deleted dir': 
-	mkdir tmp &&
-	(
-		cd tmp &&
-		rm -rf ../tmp &&
-		git version
-	)
+	# These three blob objects are reachable (only) from the index
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+	# and they should be protected from GC
+	git gc --prune=now &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
 
-sh: 0: getcwd() failed: No such file or directory
-git version 2.48.0.rc1.219.gb6b6757d772
-ok 21 - git version continues working from a deleted dir
+	# Now resolve the conflicted path
+	B0=$(echo "resolve undo test data 0" | git hash-object -w --stdin) &&
+	git update-index --add --cacheinfo 100644,$B0,frotz &&
 
-expecting success of 2501.22 'rm -r with -C leaves submodule if cwd inside': 
-	test_submodule_removal dir git -C .. rm -r my_submodule/
+	# These three blob objects are now reachable only from the resolve-undo
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
 
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git/
-[master (root-commit) f132c27] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Adding existing repo at 'my_submodule' to the index
-[detached HEAD 629a5d0] Add the submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my_submodule
-Migrating git directory of 'my_submodule' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-fatal: could not remove 'my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 22 - rm -r with -C leaves submodule if cwd inside
+	# and they should survive GC
+	git gc --prune=now &&
+	git cat-file -e $B0 &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
 
-expecting success of 2501.23 'rm -r leaves submodule if cwd inside': 
-	test_submodule_removal dir \
-		git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
+	# Now we switch away, which nukes resolve-undo, and
+	# blobs B0..B3 would become dangling.  fsck should
+	# notice that they are now unreachable.
+	git checkout -f side &&
+	git fsck --unreachable >cruft &&
+	sort cruft >actual &&
+	sort <<-EOF >expect &&
+	unreachable blob $B0
+	unreachable blob $B1
+	unreachable blob $B2
+	unreachable blob $B3
+	EOF
+	test_cmp expect actual &&
 
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git/
-[master (root-commit) f132c27] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Adding existing repo at 'my_submodule' to the index
-[detached HEAD 629a5d0] Add the submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my_submodule
-Migrating git directory of 'my_submodule' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-fatal: could not remove 'my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 23 - rm -r leaves submodule if cwd inside
+	# And they should go away when gc runs.
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
 
-expecting success of 2501.24 'rm -rf removes submodule even if cwd inside': 
-	test_submodule_removal missing \
-		git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
+	test_must_fail git cat-file -e $B0 &&
+	test_must_fail git cat-file -e $B1 &&
+	test_must_fail git cat-file -e $B2 &&
+	test_must_fail git cat-file -e $B3
 
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git/
-[master (root-commit) f132c27] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Adding existing repo at 'my_submodule' to the index
-[detached HEAD 629a5d0] Add the submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my_submodule
-Migrating git directory of 'my_submodule' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 24 - rm -rf removes submodule even if cwd inside
+Already on 'main'
+HEAD is now at d92f3b1 add differently
+Switched to branch 'side'
+ok 14 - resolve-undo keeps blobs from gc
 
-# passed all 24 test(s)
-1..24
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3013-ls-files-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3013-ls-files-format/.git/
-expecting success of 3013.1 'usage: --format is incompatible with -s': 
-		test_expect_code 129 git ls-files --format="%(objectname)" $flag
-	
-fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
-
-usage: git ls-files [<options>] [<file>...]
+*** t2100-update-cache-badpath.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2100-update-cache-badpath/.git/
+checking prerequisite: SYMLINKS
 
-    -z                    separate paths with the NUL character
-    -t                    identify the file status with tags
-    -v                    use lowercase letters for 'assume unchanged' files
-    -f                    use lowercase letters for 'fsmonitor clean' files
-    -c, --[no-]cached     show cached files in the output (default)
-    -d, --[no-]deleted    show deleted files in the output
-    -m, --[no-]modified   show modified files in the output
-    -o, --[no-]others     show other files in the output
-    -i, --[no-]ignored    show ignored files in the output
-    -s, --[no-]stage      show staged contents' object name in the output
-    -k, --[no-]killed     show files on the filesystem that need to be removed
-    --[no-]directory      show 'other' directories' names only
-    --[no-]eol            show line endings of files
-    --[no-]empty-directory
-                          don't show empty directories
-    -u, --[no-]unmerged   show unmerged files in the output
-    --[no-]resolve-undo   show resolve-undo information
-    -x, --exclude <pattern>
-                          skip files matching pattern
-    -X, --exclude-from <file>
-                          read exclude patterns from <file>
-    --[no-]exclude-per-directory <file>
-                          read additional per-directory exclude patterns in <file>
-    --exclude-standard    add the standard git exclusions
-    --full-name           make the output relative to the project top directory
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
-    --[no-]with-tree <tree-ish>
-                          pretend that paths removed since <tree-ish> are still present
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    --[no-]debug          show debugging data
-    --[no-]deduplicate    suppress duplicate entries
-    --[no-]sparse         show sparse directories in the presence of a sparse index
-    --format <format>     format to use for the output
+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 1 - usage: --format is incompatible with -s
+)
+prerequisite SYMLINKS ok
+expecting success of 2100.1 'git update-index --add to add various paths.': git update-index --add -- path0 path1 path2/file2 path3/file3
+ok 1 - git update-index --add to add various paths.
 
-expecting success of 3013.2 'usage: --format is incompatible with -o': 
-		test_expect_code 129 git ls-files --format="%(objectname)" $flag
-	
-fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
+expecting success of 2100.2 'git update-index to add conflicting path path0/file0 should fail.': test_must_fail git update-index --add -- path0/file0
+error: 'path0/file0' appears as both a file and as a directory
+error: path0/file0: cannot add to the index - missing --add option?
+fatal: Unable to process path path0/file0
+ok 2 - git update-index to add conflicting path path0/file0 should fail.
 
-usage: git ls-files [<options>] [<file>...]
+expecting success of 2100.3 'git update-index to add conflicting path path1/file1 should fail.': test_must_fail git update-index --add -- path1/file1
+error: 'path1/file1' appears as both a file and as a directory
+error: path1/file1: cannot add to the index - missing --add option?
+fatal: Unable to process path path1/file1
+ok 3 - git update-index to add conflicting path path1/file1 should fail.
 
-    -z                    separate paths with the NUL character
-    -t                    identify the file status with tags
-    -v                    use lowercase letters for 'assume unchanged' files
-    -f                    use lowercase letters for 'fsmonitor clean' files
-    -c, --[no-]cached     show cached files in the output (default)
-    -d, --[no-]deleted    show deleted files in the output
-    -m, --[no-]modified   show modified files in the output
-    -o, --[no-]others     show other files in the output
-    -i, --[no-]ignored    show ignored files in the output
-    -s, --[no-]stage      show staged contents' object name in the output
-    -k, --[no-]killed     show files on the filesystem that need to be removed
-    --[no-]directory      show 'other' directories' names only
-    --[no-]eol            show line endings of files
-    --[no-]empty-directory
-                          don't show empty directories
-    -u, --[no-]unmerged   show unmerged files in the output
-    --[no-]resolve-undo   show resolve-undo information
-    -x, --exclude <pattern>
-                          skip files matching pattern
-    -X, --exclude-from <file>
-                          read exclude patterns from <file>
-    --[no-]exclude-per-directory <file>
-                          read additional per-directory exclude patterns in <file>
-    --exclude-standard    add the standard git exclusions
-    --full-name           make the output relative to the project top directory
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
-    --[no-]with-tree <tree-ish>
-                          pretend that paths removed since <tree-ish> are still present
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    --[no-]debug          show debugging data
-    --[no-]deduplicate    suppress duplicate entries
-    --[no-]sparse         show sparse directories in the presence of a sparse index
-    --format <format>     format to use for the output
+expecting success of 2100.4 'git update-index to add conflicting path path2 should fail.': test_must_fail git update-index --add -- path2
+error: 'path2' appears as both a file and as a directory
+error: path2: cannot add to the index - missing --add option?
+fatal: Unable to process path path2
+ok 4 - git update-index to add conflicting path path2 should fail.
 
-ok 2 - usage: --format is incompatible with -o
+expecting success of 2100.5 'git update-index to add conflicting path path3 should fail.': test_must_fail git update-index --add -- path3
+error: 'path3' appears as both a file and as a directory
+error: path3: cannot add to the index - missing --add option?
+fatal: Unable to process path path3
+ok 5 - git update-index to add conflicting path path3 should fail.
 
-expecting success of 3013.3 'usage: --format is incompatible with -k': 
-		test_expect_code 129 git ls-files --format="%(objectname)" $flag
-	
-fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2102-update-index-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-usage: git ls-files [<options>] [<file>...]
+expecting success of 2102.2 'modify the symbolic link': 
+printf new-file > symlink &&
+git update-index symlink
+ok 2 - modify the symbolic link
 
-    -z                    separate paths with the NUL character
-    -t                    identify the file status with tags
-    -v                    use lowercase letters for 'assume unchanged' files
-    -f                    use lowercase letters for 'fsmonitor clean' files
-    -c, --[no-]cached     show cached files in the output (default)
-    -d, --[no-]deleted    show deleted files in the output
-    -m, --[no-]modified   show modified files in the output
-    -o, --[no-]others     show other files in the output
-    -i, --[no-]ignored    show ignored files in the output
-    -s, --[no-]stage      show staged contents' object name in the output
-    -k, --[no-]killed     show files on the filesystem that need to be removed
-    --[no-]directory      show 'other' directories' names only
-    --[no-]eol            show line endings of files
-    --[no-]empty-directory
-                          don't show empty directories
-    -u, --[no-]unmerged   show unmerged files in the output
-    --[no-]resolve-undo   show resolve-undo information
-    -x, --exclude <pattern>
-                          skip files matching pattern
-    -X, --exclude-from <file>
-                          read exclude patterns from <file>
-    --[no-]exclude-per-directory <file>
-                          read additional per-directory exclude patterns in <file>
-    --exclude-standard    add the standard git exclusions
-    --full-name           make the output relative to the project top directory
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
-    --[no-]with-tree <tree-ish>
-                          pretend that paths removed since <tree-ish> are still present
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    --[no-]debug          show debugging data
-    --[no-]deduplicate    suppress duplicate entries
-    --[no-]sparse         show sparse directories in the presence of a sparse index
-    --format <format>     format to use for the output
+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
 
-ok 3 - usage: --format is incompatible with -k
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1701-racy-split-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-expecting success of 3013.4 'usage: --format is incompatible with -t': 
-		test_expect_code 129 git ls-files --format="%(objectname)" $flag
-	
-fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
+	echo "cached content" >racy-file &&
+	git add racy-file &&
+	git commit -m initial &&
 
-usage: git ls-files [<options>] [<file>...]
+	echo something >other-file &&
+	# No raciness with this file.
+	test-tool chmtime =-20 other-file &&
 
-    -z                    separate paths with the NUL character
-    -t                    identify the file status with tags
-    -v                    use lowercase letters for 'assume unchanged' files
-    -f                    use lowercase letters for 'fsmonitor clean' files
-    -c, --[no-]cached     show cached files in the output (default)
-    -d, --[no-]deleted    show deleted files in the output
-    -m, --[no-]modified   show modified files in the output
-    -o, --[no-]others     show other files in the output
-    -i, --[no-]ignored    show ignored files in the output
-    -s, --[no-]stage      show staged contents' object name in the output
-    -k, --[no-]killed     show files on the filesystem that need to be removed
-    --[no-]directory      show 'other' directories' names only
-    --[no-]eol            show line endings of files
-    --[no-]empty-directory
-                          don't show empty directories
-    -u, --[no-]unmerged   show unmerged files in the output
-    --[no-]resolve-undo   show resolve-undo information
-    -x, --exclude <pattern>
-                          skip files matching pattern
-    -X, --exclude-from <file>
-                          read exclude patterns from <file>
-    --[no-]exclude-per-directory <file>
-                          read additional per-directory exclude patterns in <file>
-    --exclude-standard    add the standard git exclusions
-    --full-name           make the output relative to the project top directory
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
-    --[no-]with-tree <tree-ish>
-                          pretend that paths removed since <tree-ish> are still present
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    --[no-]debug          show debugging data
-    --[no-]deduplicate    suppress duplicate entries
-    --[no-]sparse         show sparse directories in the presence of a sparse index
-    --format <format>     format to use for the output
+	echo "+cached content" >expect
 
-ok 4 - usage: --format is incompatible with -t
+[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 3013.5 'usage: --format is incompatible with --resolve-undo': 
-		test_expect_code 129 git ls-files --format="%(objectname)" $flag
-	
-fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
+expecting success of 1701.2 'split the index while adding a racily clean file #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-usage: git ls-files [<options>] [<file>...]
+		# 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 &&
 
-    -z                    separate paths with the NUL character
-    -t                    identify the file status with tags
-    -v                    use lowercase letters for 'assume unchanged' files
-    -f                    use lowercase letters for 'fsmonitor clean' files
-    -c, --[no-]cached     show cached files in the output (default)
-    -d, --[no-]deleted    show deleted files in the output
-    -m, --[no-]modified   show modified files in the output
-    -o, --[no-]others     show other files in the output
-    -i, --[no-]ignored    show ignored files in the output
-    -s, --[no-]stage      show staged contents' object name in the output
-    -k, --[no-]killed     show files on the filesystem that need to be removed
-    --[no-]directory      show 'other' directories' names only
-    --[no-]eol            show line endings of files
-    --[no-]empty-directory
-                          don't show empty directories
-    -u, --[no-]unmerged   show unmerged files in the output
-    --[no-]resolve-undo   show resolve-undo information
-    -x, --exclude <pattern>
-                          skip files matching pattern
-    -X, --exclude-from <file>
-                          read exclude patterns from <file>
-    --[no-]exclude-per-directory <file>
-                          read additional per-directory exclude patterns in <file>
-    --exclude-standard    add the standard git exclusions
-    --full-name           make the output relative to the project top directory
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
-    --[no-]with-tree <tree-ish>
-                          pretend that paths removed since <tree-ish> are still present
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    --[no-]debug          show debugging data
-    --[no-]deduplicate    suppress duplicate entries
-    --[no-]sparse         show sparse directories in the presence of a sparse index
-    --format <format>     format to use for the output
+		# 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 &&
 
-ok 5 - usage: --format is incompatible with --resolve-undo
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3013.6 'usage: --format is incompatible with --deduplicate': 
-		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+		# 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
 	
-fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
+ok 2 - split the index while adding a racily clean file #0
 
-usage: git ls-files [<options>] [<file>...]
+expecting success of 1701.3 'split the index while adding a racily clean file #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-    -z                    separate paths with the NUL character
-    -t                    identify the file status with tags
-    -v                    use lowercase letters for 'assume unchanged' files
-    -f                    use lowercase letters for 'fsmonitor clean' files
-    -c, --[no-]cached     show cached files in the output (default)
-    -d, --[no-]deleted    show deleted files in the output
-    -m, --[no-]modified   show modified files in the output
-    -o, --[no-]others     show other files in the output
-    -i, --[no-]ignored    show ignored files in the output
-    -s, --[no-]stage      show staged contents' object name in the output
-    -k, --[no-]killed     show files on the filesystem that need to be removed
-    --[no-]directory      show 'other' directories' names only
-    --[no-]eol            show line endings of files
-    --[no-]empty-directory
-                          don't show empty directories
-    -u, --[no-]unmerged   show unmerged files in the output
-    --[no-]resolve-undo   show resolve-undo information
-    -x, --exclude <pattern>
-                          skip files matching pattern
-    -X, --exclude-from <file>
-                          read exclude patterns from <file>
-    --[no-]exclude-per-directory <file>
-                          read additional per-directory exclude patterns in <file>
-    --exclude-standard    add the standard git exclusions
-    --full-name           make the output relative to the project top directory
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
-    --[no-]with-tree <tree-ish>
-                          pretend that paths removed since <tree-ish> are still present
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    --[no-]debug          show debugging data
-    --[no-]deduplicate    suppress duplicate entries
-    --[no-]sparse         show sparse directories in the presence of a sparse index
-    --format <format>     format to use for the output
+		# 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 &&
 
-ok 6 - usage: --format is incompatible with --deduplicate
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3013.7 'usage: --format is incompatible with --eol': 
-		test_expect_code 129 git ls-files --format="%(objectname)" $flag
-	
-fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-usage: git ls-files [<options>] [<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
 
-    -z                    separate paths with the NUL character
-    -t                    identify the file status with tags
-    -v                    use lowercase letters for 'assume unchanged' files
-    -f                    use lowercase letters for 'fsmonitor clean' files
-    -c, --[no-]cached     show cached files in the output (default)
-    -d, --[no-]deleted    show deleted files in the output
-    -m, --[no-]modified   show modified files in the output
-    -o, --[no-]others     show other files in the output
-    -i, --[no-]ignored    show ignored files in the output
-    -s, --[no-]stage      show staged contents' object name in the output
-    -k, --[no-]killed     show files on the filesystem that need to be removed
-    --[no-]directory      show 'other' directories' names only
-    --[no-]eol            show line endings of files
-    --[no-]empty-directory
-                          don't show empty directories
-    -u, --[no-]unmerged   show unmerged files in the output
-    --[no-]resolve-undo   show resolve-undo information
-    -x, --exclude <pattern>
-                          skip files matching pattern
-    -X, --exclude-from <file>
-                          read exclude patterns from <file>
-    --[no-]exclude-per-directory <file>
-                          read additional per-directory exclude patterns in <file>
-    --exclude-standard    add the standard git exclusions
-    --full-name           make the output relative to the project top directory
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
-    --[no-]with-tree <tree-ish>
-                          pretend that paths removed since <tree-ish> are still present
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    --[no-]debug          show debugging data
-    --[no-]deduplicate    suppress duplicate entries
-    --[no-]sparse         show sparse directories in the presence of a sparse index
-    --format <format>     format to use for the output
+expecting success of 1701.4 'split the index while adding a racily clean file #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-ok 7 - usage: --format is incompatible with --eol
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-expecting success of 3013.8 'setup': 
-	printf "LINEONE\nLINETWO\nLINETHREE\n" >o1.txt &&
-	printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >o2.txt &&
-	printf "LINEONE\r\nLINETWO\nLINETHREE\n" >o3.txt &&
-	git add o?.txt &&
-	oid=$(git hash-object o1.txt) &&
-	git update-index --add --cacheinfo 120000 $oid o4.txt &&
-	git update-index --add --cacheinfo 160000 $oid o5.txt &&
-	git update-index --add --cacheinfo 100755 $oid o6.txt &&
-	git commit -m base
+		# 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 &&
 
-[master (root-commit) 8422806] base
- Author: A U Thor <author@example.com>
- 6 files changed, 16 insertions(+)
- create mode 100644 o1.txt
- create mode 100644 o2.txt
- create mode 100644 o3.txt
- create mode 120000 o4.txt
- create mode 160000 o5.txt
- create mode 100755 o6.txt
-ok 8 - setup
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3013.9 'git ls-files --format objectmode v.s. -s': 
-	git ls-files -s >files &&
-	cut -d" " -f1 files >expect &&
-	git ls-files --format="%(objectmode)" >actual &&
-	test_cmp expect actual
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 4 - split the index while adding a racily clean file #2
 
-ok 9 - git ls-files --format objectmode v.s. -s
+expecting success of 1701.5 'split the index while adding a racily clean file #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3013.10 'git ls-files --format objectname v.s. -s': 
-	git ls-files -s >files &&
-	cut -d" " -f2 files >expect &&
-	git ls-files --format="%(objectname)" >actual &&
-	test_cmp expect actual
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-ok 10 - git ls-files --format objectname v.s. -s
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3013.11 'git ls-files --format objecttype': 
-	git ls-files --format="%(objectname)" o1.txt o4.txt o6.txt >objectname &&
-	git cat-file --batch-check="%(objecttype)" >expect <objectname &&
-	git ls-files --format="%(objecttype)" o1.txt o4.txt o6.txt >actual &&
-	test_cmp expect actual
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-ok 11 - git ls-files --format objecttype
+		# 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 3013.12 'git ls-files --format objectsize': 
-	cat>expect <<-\EOF &&
-26
-29
-27
-26
--
-26
-	EOF
-	git ls-files --format="%(objectsize)" >actual &&
+expecting success of 1701.6 'split the index while adding a racily clean file #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-	test_cmp expect actual
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
 
-ok 12 - git ls-files --format objectsize
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3013.13 'git ls-files --format objectsize:padded': 
-	cat>expect <<-\EOF &&
-     26
-     29
-     27
-     26
-      -
-     26
-	EOF
-	git ls-files --format="%(objectsize:padded)" >actual &&
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	test_cmp expect actual
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 6 - split the index while adding a racily clean file #4
 
-ok 13 - git ls-files --format objectsize:padded
+expecting success of 1701.7 'add a racily clean file to an already split index #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3013.14 'git ls-files --format v.s. --eol': 
-	git ls-files --eol >tmp &&
-	sed -e "s/	/ /g" -e "s/  */ /g" tmp >expect 2>err &&
-	test_must_be_empty err &&
-	git ls-files --format="i/%(eolinfo:index) w/%(eolinfo:worktree) attr/%(eolattr) %(path)" >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp expect actual
+		git update-index --split-index &&
 
-ok 14 - git ls-files --format v.s. --eol
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3013.15 'git ls-files --format path v.s. -s': 
-	git ls-files -s >files &&
-	cut -f2 files >expect &&
-	git ls-files --format="%(path)" >actual &&
-	test_cmp expect actual
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-ok 15 - git ls-files --format path v.s. -s
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3013.16 'git ls-files --format with relative path': 
-	cat >expect <<-\EOF &&
-	../o1.txt
-	../o2.txt
-	../o3.txt
-	../o4.txt
-	../o5.txt
-	../o6.txt
-	EOF
-	mkdir sub &&
-	cd sub &&
-	git ls-files --format="%(path)" ":/" >../actual &&
-	cd .. &&
-	test_cmp expect actual
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 7 - add a racily clean file to an already split index #0
 
-ok 16 - git ls-files --format with relative path
+expecting success of 1701.8 'add a racily clean file to an already split index #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3013.17 'git ls-files --format with -m': 
-	echo change >o1.txt &&
-	cat >expect <<-\EOF &&
-	o1.txt
-	o4.txt
-	o5.txt
-	o6.txt
-	EOF
-	git ls-files --format="%(path)" -m >actual &&
-	test_cmp expect actual
+		git update-index --split-index &&
 
-ok 17 - git ls-files --format with -m
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3013.18 'git ls-files --format with -d': 
-	echo o7 >o7.txt &&
-	git add o7.txt &&
-	rm o7.txt &&
-	cat >expect <<-\EOF &&
-	o4.txt
-	o5.txt
-	o6.txt
-	o7.txt
-	EOF
-	git ls-files --format="%(path)" -d >actual &&
-	test_cmp expect actual
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-ok 18 - git ls-files --format with -d
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3013.19 'git ls-files --format v.s -s': 
-	git ls-files --stage >expect &&
-	git ls-files --format="%(objectmode) %(objectname) %(stage)%x09%(path)" >actual &&
-	test_cmp expect actual
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 8 - add a racily clean file to an already split index #1
 
-ok 19 - git ls-files --format v.s -s
+expecting success of 1701.9 'add a racily clean file to an already split index #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3013.20 'git ls-files --format with --debug': 
-	git ls-files --debug >expect &&
-	git ls-files --format="%(path)" --debug >actual &&
-	test_cmp expect actual
+		git update-index --split-index &&
 
-ok 20 - git ls-files --format with --debug
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3040-subprojects-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3040-subprojects-basic/.git/
-expecting success of 3040.1 'setup: create superproject': 
-	: >Makefile &&
-	git add Makefile &&
-	git commit -m "Superproject created"
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-[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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-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
+		# 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3040-subprojects-basic/sub1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 set advice.addEmbeddedRepo false"
-ok 2 - setup: create subprojects
+expecting success of 1701.10 'add a racily clean file to an already split index #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3040.3 'check if fsck ignores the subprojects': 
-	git fsck --full
+		git update-index --split-index &&
 
-ok 3 - check if fsck ignores the subprojects
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-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
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 0000000000000000000000000000000000000000 M	sub1
-ok 4 - check if commit in a subproject detected
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-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
+		# 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
 
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
-ok 5 - check if a changed subproject HEAD can be committed
+expecting success of 1701.11 'add a racily clean file to an already split index #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3040.6 'check if diff-index works for subproject elements': 
-	test_expect_code 1 git diff-index --exit-code --cached save -- sub1
+		git update-index --split-index &&
 
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
-ok 6 - check if diff-index works for subproject elements
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-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
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
-ok 7 - check if diff-tree works for subproject elements
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3040.8 'check if git diff works for subproject elements': 
-	test_expect_code 1 git diff --exit-code HEAD^ HEAD
+		# 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
 
-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 1701.12 'split the index when the index contains a racily clean cache entry #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-Cloning into 'cloned'...
-done.
-ok 9 - check if clone works
+		git update-index --add racy-file &&
 
-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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-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 set advice.addEmbeddedRepo false"
-R100	sub2	sub3
-ok 10 - removing and adding subproject
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3040.11 'checkout in superproject': 
-	git checkout save &&
-	git diff-index --exit-code --raw --cached save -- sub1
+		# 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 &&
 
-warning: unable to rmdir 'sub3': Directory not empty
-Switched to branch 'save'
-M	sub1
-ok 11 - checkout in superproject
+		# 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
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3050-subprojects-fetch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3050-subprojects-fetch/.git/
-expecting success of 3050.1 'setup': 
-	test_tick &&
-	mkdir -p sub && (
-		cd sub &&
-		git init &&
-		>subfile &&
-		git add subfile &&
-		git commit -m "subproject commit #1"
-	) &&
-	>mainfile &&
-	git add sub mainfile &&
-	test_tick &&
-	git commit -m "superproject commit #1"
+expecting success of 1701.13 'split the index when the index contains a racily clean cache entry #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3050-subprojects-fetch/sub/.git/
-[master (root-commit) 4c0c877] subproject commit #1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subfile
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) 1226c2e] superproject commit #1
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 mainfile
- create mode 160000 sub
-ok 1 - setup
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3050.2 'clone': 
-	git clone "file://$(pwd)/.git" cloned &&
-	(git rev-parse HEAD && git ls-files -s) >expected &&
-	(
-		cd cloned &&
-		(git rev-parse HEAD && git ls-files -s) >../actual
-	) &&
-	test_cmp expected actual
+		git update-index --add racy-file &&
 
-Cloning into 'cloned'...
-ok 2 - clone
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3050.3 'advance': 
-	echo more >mainfile &&
-	git update-index --force-remove sub &&
-	mv sub/.git sub/.git-disabled &&
-	git add sub/subfile mainfile &&
-	mv sub/.git-disabled sub/.git &&
-	test_tick &&
-	git commit -m "superproject commit #2"
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-[master 1548ecd] superproject commit #2
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 sub
- create mode 100644 sub/subfile
-ok 3 - advance
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-expecting success of 3050.4 'fetch': 
-	(git rev-parse HEAD && git ls-files -s) >expected &&
-	(
-		cd cloned &&
-		git pull &&
-		(git rev-parse HEAD && git ls-files -s) >../actual
-	) &&
-	test_cmp expected actual
+		# 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
 
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3050-subprojects-fetch/
-   1226c2e..1548ecd  master     -> origin/master
-Updating 1226c2e..1548ecd
-Fast-forward
- mainfile    | 1 +
- sub         | 1 -
- sub/subfile | 0
- 3 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 sub
- create mode 100644 sub/subfile
-ok 4 - fetch
+expecting success of 1701.14 'split the index when the index contains a racily clean cache entry #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3007-ls-files-recurse-submodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/.git/
-expecting success of 3007.1 'setup directory structure and submodules': 
-	echo a >a &&
-	mkdir b &&
-	echo b >b/b &&
-	git add a b &&
-	git commit -m "add a and b" &&
-	git init submodule &&
-	echo c >submodule/c &&
-	git -C submodule add c &&
-	git -C submodule commit -m "add c" &&
-	git submodule add ./submodule &&
-	git commit -m "added submodule"
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-[master (root-commit) f320cab] add a and b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b/b
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git/
-[master (root-commit) 3281629] add c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Adding existing repo at 'submodule' to the index
-[master 14616f7] added submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 1 - setup directory structure and submodules
+		git update-index --add racy-file &&
 
-expecting success of 3007.2 'ls-files correctly outputs files in submodule': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-ok 2 - ls-files correctly outputs files in submodule
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-expecting success of 3007.3 '--stage': 
-	GITMODULES_HASH=$(git rev-parse HEAD:.gitmodules) &&
-	A_HASH=$(git rev-parse HEAD:a) &&
-	B_HASH=$(git rev-parse HEAD:b/b) &&
-	C_HASH=$(git -C submodule rev-parse HEAD:c) &&
+		# 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
 
-	cat >expect <<-EOF &&
-	100644 $GITMODULES_HASH 0	.gitmodules
-	100644 $A_HASH 0	a
-	100644 $B_HASH 0	b/b
-	100644 $C_HASH 0	submodule/c
-	EOF
+expecting success of 1701.15 'split the index when the index contains a racily clean cache entry #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-	git ls-files --stage --recurse-submodules >actual &&
-	test_cmp expect actual
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-ok 3 - --stage
+		git update-index --add racy-file &&
 
-expecting success of 3007.4 'ls-files correctly outputs files in submodule with -z': 
-	lf_to_nul >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	git ls-files --recurse-submodules -z >actual &&
-	test_cmp expect actual
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-ok 4 - ls-files correctly outputs files in submodule with -z
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
 
-expecting success of 3007.5 'ls-files does not output files not added to a repo': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
+		# 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
 
-	echo a >not_added &&
-	echo b >b/not_added &&
-	echo c >submodule/not_added &&
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
+expecting success of 1701.16 'split the index when the index contains a racily clean cache entry #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-ok 5 - ls-files does not output files not added to a repo
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3007.6 'ls-files recurses more than 1 level': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/.gitmodules
-	submodule/c
-	submodule/subsub/d
-	EOF
+		git update-index --add racy-file &&
 
-	git init submodule/subsub &&
-	echo d >submodule/subsub/d &&
-	git -C submodule/subsub add d &&
-	git -C submodule/subsub commit -m "add d" &&
-	git -C submodule submodule add ./subsub &&
-	git -C submodule commit -m "added subsub" &&
-	git submodule absorbgitdirs &&
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git/
-[master (root-commit) 0cb03c9] add d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d
-Adding existing repo at 'subsub' to the index
-[master 83d4bc1] added subsub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsub
-Migrating git directory of 'submodule' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
-Migrating git directory of 'submodule/subsub' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule/modules/subsub'
-ok 6 - ls-files recurses more than 1 level
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3007.7 'ls-files works with GIT_DIR': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	c
-	subsub/d
-	EOF
+		# 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 &&
 
-	git --git-dir=submodule/.git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
+		# 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
 
-ok 7 - ls-files works with GIT_DIR
+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.* &&
 
-expecting success of 3007.8 '--recurse-submodules and pathspecs setup': 
-	echo e >submodule/subsub/e.txt &&
-	git -C submodule/subsub add e.txt &&
-	git -C submodule/subsub commit -m "adding e.txt" &&
-	echo f >submodule/f.TXT &&
-	echo g >submodule/g.txt &&
-	git -C submodule add f.TXT g.txt &&
-	git -C submodule commit -m "add f and g" &&
-	echo h >h.txt &&
-	mkdir sib &&
-	echo sib >sib/file &&
-	git add h.txt sib/file &&
-	git commit -m "add h and sib/file" &&
-	git init sub &&
-	echo sub >sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add file" &&
-	git submodule add ./sub &&
-	git commit -m "added sub" &&
+		git update-index --split-index &&
 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule/.gitmodules
-	submodule/c
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub/d
-	submodule/subsub/e.txt
-	EOF
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "*" >actual &&
-	test_cmp expect actual
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-[master 562fffb] adding e.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.txt
-[master f284b88] add f and g
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 f.TXT
- create mode 100644 g.txt
-[master ad13f14] add h and sib/file
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 h.txt
- create mode 100644 sib/file
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/sub/.git/
-[master (root-commit) e443189] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Adding existing repo at 'sub' to the index
-[master 4a68fc6] added sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub
-ok 8 - --recurse-submodules and pathspecs setup
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3007.9 'inactive submodule': 
-	test_when_finished "git config --bool submodule.submodule.active true" &&
-	test_when_finished "git -C submodule config --bool submodule.subsub.active true" &&
-	git config --bool submodule.submodule.active "false" &&
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule
-	EOF
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
+		# 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
 
-	git config --bool submodule.submodule.active "true" &&
-	git -C submodule config --bool submodule.subsub.active "false" &&
+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.* &&
 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule/.gitmodules
-	submodule/c
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub
-	EOF
+		git update-index --split-index &&
 
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-ok 9 - inactive submodule
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-expecting success of 3007.10 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/g.txt
-	submodule/subsub/e.txt
-	EOF
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	git ls-files --recurse-submodules "*.txt" >actual &&
-	test_cmp expect actual
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-ok 10 - --recurse-submodules and pathspecs
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-expecting success of 3007.11 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub/e.txt
-	EOF
+		# 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
 
-	git ls-files --recurse-submodules ":(icase)*.txt" >actual &&
-	test_cmp expect actual
+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.* &&
 
-ok 11 - --recurse-submodules and pathspecs
+		git update-index --split-index &&
 
-expecting success of 3007.12 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/f.TXT
-	submodule/g.txt
-	EOF
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	git ls-files --recurse-submodules ":(icase)*.txt" ":(exclude)submodule/subsub/*" >actual &&
-	test_cmp expect actual
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-ok 12 - --recurse-submodules and pathspecs
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3007.13 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	sub/file
-	EOF
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-	git ls-files --recurse-submodules "sub" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "sub/" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "sub/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "su*/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "su?/file" >actual &&
-	test_cmp expect actual
+		# 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 &&
 
-ok 13 - --recurse-submodules and pathspecs
+		# 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 3007.14 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	sib/file
-	sub/file
-	EOF
+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 ls-files --recurse-submodules "s??/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "s???file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "s*file" >actual &&
-	test_cmp expect actual
+		git update-index --split-index &&
 
-ok 14 - --recurse-submodules and pathspecs
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3007.15 '--recurse-submodules and relative paths': 
-	# From subdir
-	cat >expect <<-\EOF &&
-	b
-	EOF
-	git -C b ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-	# Relative path to top
-	cat >expect <<-\EOF &&
-	../.gitmodules
-	../a
-	b
-	../h.txt
-	../sib/file
-	../sub/file
-	../submodule/.gitmodules
-	../submodule/c
-	../submodule/f.TXT
-	../submodule/g.txt
-	../submodule/subsub/d
-	../submodule/subsub/e.txt
-	EOF
-	git -C b ls-files --recurse-submodules -- .. >actual &&
-	test_cmp expect actual &&
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-	# Relative path to submodule
-	cat >expect <<-\EOF &&
-	../submodule/.gitmodules
-	../submodule/c
-	../submodule/f.TXT
-	../submodule/g.txt
-	../submodule/subsub/d
-	../submodule/subsub/e.txt
-	EOF
-	git -C b ls-files --recurse-submodules -- ../submodule >actual &&
-	test_cmp expect actual
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-ok 15 - --recurse-submodules and relative paths
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
 
-expecting success of 3007.16 '--recurse-submodules does not support --error-unmatch': 
-	test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual &&
-	test_grep "does not support --error-unmatch" actual
+		# 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
 
-fatal: ls-files --recurse-submodules does not support --error-unmatch
-ok 16 - --recurse-submodules does not support --error-unmatch
+expecting success of 1701.21 'update the split index when it contains a new racily clean cache entry #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3007.17 '--recurse-submodules parses submodule repo config': 
-	test_config -C submodule index.sparse "invalid non-boolean value" &&
-	test_must_fail git ls-files --recurse-submodules 2>err &&
-	grep "bad boolean config value" err
+		git update-index --split-index &&
 
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
-ok 17 - --recurse-submodules parses submodule repo config
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3007.18 '--recurse-submodules parses submodule worktree config': 
-	test_config -C submodule extensions.worktreeConfig true &&
-	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
 
-	test_must_fail git ls-files --recurse-submodules 2>err &&
-	grep "bad boolean config value" err
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
-ok 18 - --recurse-submodules parses submodule worktree config
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3007.19 '--recurse-submodules submodules ignore super project worktreeConfig extension': 
-	# Enable worktree config in both super project & submodule, set an
-	# invalid config in the submodule worktree config
-	test_config extensions.worktreeConfig true &&
-	test_config -C submodule extensions.worktreeConfig true &&
-	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
+		# 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 &&
 
-	# Now, disable the worktree config in the submodule. Note that we need
-	# to manually re-enable extensions.worktreeConfig when the test is
-	# finished, otherwise the test_unconfig of index.sparse will not work.
-	test_unconfig -C submodule extensions.worktreeConfig &&
-	test_when_finished "git -C submodule config extensions.worktreeConfig true" &&
+		# 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
 
-	# With extensions.worktreeConfig disabled in the submodule, the invalid
-	# worktree config is not picked up.
-	git ls-files --recurse-submodules 2>err &&
-	! grep "bad boolean config value" err
+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.* &&
 
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-submodule/.gitmodules
-submodule/c
-submodule/f.TXT
-submodule/g.txt
-submodule/subsub/d
-submodule/subsub/e.txt
-ok 19 - --recurse-submodules submodules ignore super project worktreeConfig extension
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3007.20 '--recurse-submodules and --deleted are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --deleted 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 20 - --recurse-submodules and --deleted are incompatible
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3007.21 '--recurse-submodules and --modified are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --modified 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 21 - --recurse-submodules and --modified are incompatible
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3007.22 '--recurse-submodules and --others are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --others 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 22 - --recurse-submodules and --others are incompatible
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3007.23 '--recurse-submodules and --killed are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --killed 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 23 - --recurse-submodules and --killed are incompatible
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
 
-expecting success of 3007.24 '--recurse-submodules and --unmerged are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --unmerged 2>actual &&
-		test_grep 'unsupported mode' actual
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
 	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 24 - --recurse-submodules and --unmerged are incompatible
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3060-ls-files-with-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3060-ls-files-with-tree/.git/
-expecting success of 3060.1 'setup': 
-
-	# The bug we are exercising requires a fair number of entries
-	# in a sub-directory so that add_index_entry will trigger a
-	# realloc.
+ok 22 - update the split index when a racily clean cache entry is stored only in the shared index #0
 
-	echo file >expected &&
-	mkdir sub &&
-	for n in 0 1 2 3 4 5
-	do
-		for m in 0 1 2 3 4 5 6 7 8 9
-		do
-			num=00$n$m &&
-			>sub/file-$num &&
-			echo file-$num >>expected ||
-			return 1
-		done
-	done &&
-	git add . &&
-	git commit -m "add a bunch of files" &&
+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.* &&
 
-	# We remove them all so that we will have something to add
-	# back with --with-tree and so that we will definitely be
-	# under the realloc size to trigger the bug.
-	rm -rf sub &&
-	git commit -a -m "remove them all" &&
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-	# The bug also requires some entry before our directory so that
-	# prune_index will modify the_repository->index.cache
+		# 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 &&
 
-	mkdir a_directory_that_sorts_before_sub &&
-	>a_directory_that_sorts_before_sub/file &&
-	mkdir sub &&
-	>sub/file &&
-	git add .
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-[master (root-commit) 853a03d] add a bunch of files
- Author: A U Thor <author@example.com>
- 61 files changed, 61 insertions(+)
- create mode 100644 expected
- create mode 100644 sub/file-0000
- create mode 100644 sub/file-0001
- create mode 100644 sub/file-0002
- create mode 100644 sub/file-0003
- create mode 100644 sub/file-0004
- create mode 100644 sub/file-0005
- create mode 100644 sub/file-0006
- create mode 100644 sub/file-0007
- create mode 100644 sub/file-0008
- create mode 100644 sub/file-0009
- create mode 100644 sub/file-0010
- create mode 100644 sub/file-0011
- create mode 100644 sub/file-0012
- create mode 100644 sub/file-0013
- create mode 100644 sub/file-0014
- create mode 100644 sub/file-0015
- create mode 100644 sub/file-0016
- create mode 100644 sub/file-0017
- create mode 100644 sub/file-0018
- create mode 100644 sub/file-0019
- create mode 100644 sub/file-0020
- create mode 100644 sub/file-0021
- create mode 100644 sub/file-0022
- create mode 100644 sub/file-0023
- create mode 100644 sub/file-0024
- create mode 100644 sub/file-0025
- create mode 100644 sub/file-0026
- create mode 100644 sub/file-0027
- create mode 100644 sub/file-0028
- create mode 100644 sub/file-0029
- create mode 100644 sub/file-0030
- create mode 100644 sub/file-0031
- create mode 100644 sub/file-0032
- create mode 100644 sub/file-0033
- create mode 100644 sub/file-0034
- create mode 100644 sub/file-0035
- create mode 100644 sub/file-0036
- create mode 100644 sub/file-0037
- create mode 100644 sub/file-0038
- create mode 100644 sub/file-0039
- create mode 100644 sub/file-0040
- create mode 100644 sub/file-0041
- create mode 100644 sub/file-0042
- create mode 100644 sub/file-0043
- create mode 100644 sub/file-0044
- create mode 100644 sub/file-0045
- create mode 100644 sub/file-0046
- create mode 100644 sub/file-0047
- create mode 100644 sub/file-0048
- create mode 100644 sub/file-0049
- create mode 100644 sub/file-0050
- create mode 100644 sub/file-0051
- create mode 100644 sub/file-0052
- create mode 100644 sub/file-0053
- create mode 100644 sub/file-0054
- create mode 100644 sub/file-0055
- create mode 100644 sub/file-0056
- create mode 100644 sub/file-0057
- create mode 100644 sub/file-0058
- create mode 100644 sub/file-0059
-[master 80af29e] remove them all
- Author: A U Thor <author@example.com>
- 60 files changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 sub/file-0000
- delete mode 100644 sub/file-0001
- delete mode 100644 sub/file-0002
- delete mode 100644 sub/file-0003
- delete mode 100644 sub/file-0004
- delete mode 100644 sub/file-0005
- delete mode 100644 sub/file-0006
- delete mode 100644 sub/file-0007
- delete mode 100644 sub/file-0008
- delete mode 100644 sub/file-0009
- delete mode 100644 sub/file-0010
- delete mode 100644 sub/file-0011
- delete mode 100644 sub/file-0012
- delete mode 100644 sub/file-0013
- delete mode 100644 sub/file-0014
- delete mode 100644 sub/file-0015
- delete mode 100644 sub/file-0016
- delete mode 100644 sub/file-0017
- delete mode 100644 sub/file-0018
- delete mode 100644 sub/file-0019
- delete mode 100644 sub/file-0020
- delete mode 100644 sub/file-0021
- delete mode 100644 sub/file-0022
- delete mode 100644 sub/file-0023
- delete mode 100644 sub/file-0024
- delete mode 100644 sub/file-0025
- delete mode 100644 sub/file-0026
- delete mode 100644 sub/file-0027
- delete mode 100644 sub/file-0028
- delete mode 100644 sub/file-0029
- delete mode 100644 sub/file-0030
- delete mode 100644 sub/file-0031
- delete mode 100644 sub/file-0032
- delete mode 100644 sub/file-0033
- delete mode 100644 sub/file-0034
- delete mode 100644 sub/file-0035
- delete mode 100644 sub/file-0036
- delete mode 100644 sub/file-0037
- delete mode 100644 sub/file-0038
- delete mode 100644 sub/file-0039
- delete mode 100644 sub/file-0040
- delete mode 100644 sub/file-0041
- delete mode 100644 sub/file-0042
- delete mode 100644 sub/file-0043
- delete mode 100644 sub/file-0044
- delete mode 100644 sub/file-0045
- delete mode 100644 sub/file-0046
- delete mode 100644 sub/file-0047
- delete mode 100644 sub/file-0048
- delete mode 100644 sub/file-0049
- delete mode 100644 sub/file-0050
- delete mode 100644 sub/file-0051
- delete mode 100644 sub/file-0052
- delete mode 100644 sub/file-0053
- delete mode 100644 sub/file-0054
- delete mode 100644 sub/file-0055
- delete mode 100644 sub/file-0056
- delete mode 100644 sub/file-0057
- delete mode 100644 sub/file-0058
- delete mode 100644 sub/file-0059
-ok 1 - setup
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3060.2 'usage': 
-	test_expect_code 128 git ls-files --with-tree=HEAD -u &&
-	test_expect_code 128 git ls-files --with-tree=HEAD -s &&
-	test_expect_code 128 git ls-files --recurse-submodules --with-tree=HEAD
+		# 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 &&
 
-fatal: options 'ls-files --with-tree' and '-s/-u' cannot be used together
-fatal: options 'ls-files --with-tree' and '-s/-u' cannot be used together
-fatal: ls-files --recurse-submodules unsupported mode
-ok 2 - usage
+		# 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 3060.3 'git ls-files --with-tree should succeed from subdir': 
-	# We have to run from a sub-directory to trigger prune_index
-	# Then we finally get to run our --with-tree test
-	(
-		cd sub &&
-		git ls-files --with-tree=HEAD~1 >../output
-	)
+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.* &&
 
-ok 3 - git ls-files --with-tree should succeed from subdir
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3060.4 'git ls-files --with-tree should add entries from named tree.': 
-	test_cmp expected output
+		# 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 &&
 
-ok 4 - git ls-files --with-tree should add entries from named tree.
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3060.5 'no duplicates in --with-tree output': 
-	git ls-files --with-tree=HEAD >actual &&
-	sort -u actual >expected &&
-	test_cmp expected actual
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-ok 5 - no duplicates in --with-tree output
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
 
-expecting success of 3060.6 'setup: output in a conflict': 
-	test_create_repo conflict &&
-	test_commit -C conflict BASE file &&
-	test_commit -C conflict A file foo &&
-	git -C conflict reset --hard BASE &&
-	test_commit -C conflict B file bar
+		# 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3060-ls-files-with-tree/conflict/.git/
-[master (root-commit) 7955b49] BASE
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 67d38f3] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 7955b49 BASE
-[master f8636b1] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - setup: output in a conflict
+expecting success of 1701.25 'update the split index when a racily clean cache entry is stored only in the shared index #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-expecting success of 3060.7 'output in a conflict': 
-	test_must_fail git -C conflict merge A B &&
-	cat >expected <<-\EOF &&
-	file
-	file
-	file
-	file
-	EOF
-	git -C conflict ls-files --with-tree=HEAD >actual &&
-	test_cmp expected actual
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 7 - output in a conflict
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3060.8 'output with removed .git/index': 
-	cat >expected <<-\EOF &&
-	file
-	EOF
-	rm conflict/.git/index &&
-	git -C conflict ls-files --with-tree=HEAD >actual &&
-	test_cmp expected actual
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-ok 8 - output with removed .git/index
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3100-ls-tree-restrict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+		# 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 &&
 
-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
+		# 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
 
-)
-prerequisite SYMLINKS ok
-a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
-ok 1 - setup
+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.* &&
 
-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
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-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
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3100.5 'ls-tree recursive with -d': git ls-tree -r -d $tree >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-040000 tree X	path2/baz
-EOF
-     test_output
-ok 5 - ls-tree recursive with -d
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3100.6 'ls-tree filtered with path': git ls-tree $tree path >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 6 - ls-tree filtered with path
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
 
-expecting success of 3100.7 'ls-tree filtered with path1 path0': git ls-tree $tree path1 path0 >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-EOF
-     test_output
-ok 7 - ls-tree filtered with path1 path0
+		# 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 3100.8 'ls-tree filtered with path0/': git ls-tree $tree path0/ >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 8 - ls-tree filtered with path0/
+expecting success of 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.* &&
 
-expecting success of 3100.9 'ls-tree filtered with path2': git ls-tree $tree path2 >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-EOF
-     test_output
-ok 9 - ls-tree filtered with path2
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3100.10 'ls-tree filtered with path2/': git ls-tree $tree path2/ >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-120000 blob X	path2/bazbo
-100644 blob X	path2/foo
-EOF
-     test_output
-ok 10 - ls-tree filtered with path2/
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 3100.11 'ls-tree filtered with path2/baz': git ls-tree $tree path2/baz >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-EOF
-     test_output
-ok 11 - ls-tree filtered with path2/baz
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3100.12 'ls-tree filtered with path2/bak': git ls-tree $tree path2/bak >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 12 - ls-tree filtered with path2/bak
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 3100.13 'ls-tree -t filtered with path2/bak': git ls-tree -t $tree path2/bak >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-EOF
-     test_output
-ok 13 - ls-tree -t filtered with path2/bak
+		# 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 &&
 
-expecting success of 3100.14 'ls-tree with one path a prefix of the other': git ls-tree $tree path2/baz path2/bazbo >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-120000 blob X	path2/bazbo
-EOF
-     test_output
-ok 14 - ls-tree with one path a prefix of the other
+		# 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
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3102-ls-tree-wildcards.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3102-ls-tree-wildcards/.git/
-expecting success of 3102.1 'setup': 
-	mkdir a aa "a[a]" &&
-	touch a/one aa/two "a[a]/three" &&
-	git add a/one aa/two "a[a]/three" &&
-	git commit -m test
+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.* &&
 
-[master (root-commit) a832b10] test
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/one
- create mode 100644 a[a]/three
- create mode 100644 aa/two
-ok 1 - setup
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-expecting success of 3102.2 'ls-tree a[a] matches literally': 
-	cat >expect <<-EOF &&
-	100644 blob $EMPTY_BLOB	a[a]/three
-	EOF
-	git ls-tree -r HEAD "a[a]" >actual &&
-	test_cmp expect actual
+		# 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 &&
 
-ok 2 - ls-tree a[a] matches literally
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-expecting success of 3102.3 'ls-tree outside prefix': 
-	cat >expect <<-EOF &&
-	100644 blob $EMPTY_BLOB	../a[a]/three
-	EOF
-	( cd aa && git ls-tree -r HEAD "../a[a]" ) >actual &&
-	test_cmp expect actual
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-ok 3 - ls-tree outside prefix
+		# 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 &&
 
-checking known breakage of 3102.4 'ls-tree does not yet support negated pathspec': 
-	git ls-files ":(exclude)a" "a*" >expect &&
-	git ls-tree --name-only -r HEAD ":(exclude)a" "a*" >actual &&
-	test_cmp expect actual
+		# 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
 
-fatal: :(exclude)a: pathspec magic not supported by this command: 'exclude' (mnemonic: '!')
-not ok 4 - ls-tree does not yet support negated pathspec # TODO known breakage
+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.* &&
 
-# still have 1 known breakage(s)
-# passed all remaining 3 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3103-ls-tree-misc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-[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
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-error: Could not read 5fcffbd6e4c5c5b8d81f5e9314b20e338e3ffff5
-ok 2 - ls-tree fails with non-zero exit code on broken tree
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 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
+		# 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 &&
 
-expecting success of 3103.4 'usage: incompatible options: --long and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
 	
-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
+ok 29 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #2
 
-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 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.* &&
 
-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
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+		# 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 &&
 
-    -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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-ok 6 - usage: incompatible options: --name-only and --format
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-expecting success of 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
+		# 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 &&
 
-expecting success of 3103.8 'usage: incompatible options: --name-status and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
 	
-fatal: --format can't be combined with other format-altering options
-
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+ok 30 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #3
 
-    -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
+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.* &&
 
-ok 8 - usage: incompatible options: --name-status and --format
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-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
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
 
-expecting success of 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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
 
-    -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
+		# 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 &&
 
-ok 10 - usage: incompatible options: --object-only and --format
+		# 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 10 test(s)
-1..10
+# passed all 31 test(s)
+1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3101-ls-tree-dirname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3101-ls-tree-dirname/.git/
-expecting success of 3101.1 'setup': 
-	echo 111 >1.txt &&
-	echo 222 >2.txt &&
-	mkdir path0 path0/a path0/a/b path0/a/b/c &&
-	echo 111 >path0/a/b/c/1.txt &&
-	mkdir path1 path1/b path1/b/c &&
-	echo 111 >path1/b/c/1.txt &&
-	mkdir path2 &&
-	echo 111 >path2/1.txt &&
-	mkdir path3 &&
-	echo 111 >path3/1.txt &&
-	echo 222 >path3/2.txt &&
-	find *.txt path* \( -type f -o -type l \) -print |
-	xargs git update-index --add &&
-	tree=$(git write-tree) &&
-	echo $tree
-
-ef2ea4d6de8ec0863f430e4cad7468ce74f60aa7
-ok 1 - setup
-
-expecting success of 3101.2 'ls-tree plain': 
-	git ls-tree $tree >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
-
-ok 2 - ls-tree plain
-
-expecting success of 3101.3 'ls-tree recursive': 
-	git ls-tree -r $tree >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
-
-ok 3 - ls-tree recursive
-
-expecting success of 3101.4 'ls-tree filter 1.txt': 
-	git ls-tree $tree 1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-EOF
-	test_output
-
-ok 4 - ls-tree filter 1.txt
-
-expecting success of 3101.5 'ls-tree filter path1/b/c/1.txt': 
-	git ls-tree $tree path1/b/c/1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	path1/b/c/1.txt
-EOF
-	test_output
-
-ok 5 - ls-tree filter path1/b/c/1.txt
-
-expecting success of 3101.6 'ls-tree filter all 1.txt files': 
-	git ls-tree $tree 1.txt path0/a/b/c/1.txt \
-		path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-EOF
-	test_output
-
-ok 6 - ls-tree filter all 1.txt files
-
-expecting success of 3101.7 'ls-tree filter directories': 
-	git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
-	cat >expected <<\EOF &&
-040000 tree X	path0/a/b/c
-040000 tree X	path1/b/c
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
-
-ok 7 - ls-tree filter directories
-
-expecting success of 3101.8 'ls-tree filter odd names': 
-	git ls-tree $tree 1.txt ./1.txt .//1.txt \
-		path3/1.txt path3/./1.txt path3 path3// >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
-
-ok 8 - ls-tree filter odd names
-
-expecting success of 3101.9 'ls-tree filter missing files and extra slashes': 
-	git ls-tree $tree 1.txt/ abc.txt \
-		path3//23.txt path3/2.txt/// >current &&
-	>expected &&
-	test_output
-
-ok 9 - ls-tree filter missing files and extra slashes
-
-expecting success of 3101.10 'ls-tree filter is leading path match': 
-	git ls-tree $tree pa path3/a >current &&
-	>expected &&
-	test_output
+*** t2101-update-index-reupdate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 10 - ls-tree filter is leading path match
+ok 1 - update-index --add
 
-expecting success of 3101.11 'ls-tree --full-name': 
-	(
-		cd path0 &&
-		git ls-tree --full-name $tree a
-	) >current &&
-	cat >expected <<\EOF &&
-040000 tree X	path0/a
-EOF
-	test_output
+expecting success of 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
 
-ok 11 - ls-tree --full-name
+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 3101.12 'ls-tree --no-full-name': 
-	git -C path0 ls-tree --no-full-name $tree a >current &&
+expecting success of 2101.3 'update-index --remove --again': 
+	git update-index --remove --again &&
+	git ls-files -s >current &&
 	cat >expected <<-EOF &&
-	040000 tree X	a
+	100644 $(git hash-object file2) 0	file2
 	EOF
-	test_output
-
-ok 12 - ls-tree --no-full-name
-
-expecting success of 3101.13 'ls-tree --full-tree': 
-	(
-		cd path1/b/c &&
-		git ls-tree --full-tree $tree
-	) >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
-
-ok 13 - ls-tree --full-tree
+	cmp current expected
 
-expecting success of 3101.14 'ls-tree --full-tree -r': 
-	(
-		cd path3/ &&
-		git ls-tree --full-tree -r $tree
-	) >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
+ok 3 - update-index --remove --again
 
-ok 14 - ls-tree --full-tree -r
+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 3101.15 'ls-tree --abbrev=5': 
-	git ls-tree --abbrev=5 $tree >current &&
-	sed -e "s/ $_x05[0-9a-f]*	/ X	/" <current >check &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_cmp expected check
+expecting success of 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 15 - ls-tree --abbrev=5
+ok 5 - update-index again
 
-expecting success of 3101.16 'ls-tree --name-only': 
-		git ls-tree $opt $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0
-		path1
-		path2
-		path3
-		EOF
-		test_output
-	
-ok 16 - ls-tree --name-only
+expecting success of 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
 
-expecting success of 3101.17 'ls-tree --name-only -r': 
-		git ls-tree $opt -r $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0/a/b/c/1.txt
-		path1/b/c/1.txt
-		path2/1.txt
-		path3/1.txt
-		path3/2.txt
-		EOF
-		test_output
-	
-ok 17 - ls-tree --name-only -r
+ok 6 - update-index --update from subdir
 
-expecting success of 3101.18 'ls-tree --name-status': 
-		git ls-tree $opt $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0
-		path1
-		path2
-		path3
-		EOF
-		test_output
-	
-ok 18 - ls-tree --name-status
+expecting success of 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
 
-expecting success of 3101.19 'ls-tree --name-status -r': 
-		git ls-tree $opt -r $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0/a/b/c/1.txt
-		path1/b/c/1.txt
-		path2/1.txt
-		path3/1.txt
-		path3/2.txt
-		EOF
-		test_output
-	
-ok 19 - ls-tree --name-status -r
+ok 7 - update-index --update with pathspec
 
-# passed all 19 test(s)
-1..19
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3104-ls-tree-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3104-ls-tree-format/.git/
-expecting success of 3104.1 'ls-tree --format usage': 
-	test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
-	test_expect_code 129 git ls-tree --format=fmt --name-only HEAD &&
-	test_expect_code 129 git ls-tree --format=fmt --name-status HEAD
+*** t2103-update-index-ignore-missing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2103-update-index-ignore-missing/.git/
+expecting success of 2103.1 'basics': 
+	>one &&
+	>two &&
+	>three &&
 
-fatal: --format can't be combined with other format-altering options
+	# need --add when adding
+	test_must_fail git update-index one &&
+	test -z "$(git ls-files)" &&
+	git update-index --add one &&
+	test zone = "z$(git ls-files)" &&
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+	# update-index is atomic
+	echo 1 >one &&
+	test_must_fail git update-index one two &&
+	echo "M	one" >expect &&
+	git diff-files --name-status >actual &&
+	test_cmp expect actual &&
 
-    -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
+	git update-index --add one two three &&
+	test_write_lines one three two >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual &&
 
-fatal: --format can't be combined with other format-altering options
+	test_tick &&
+	(
+		test_create_repo xyzzy &&
+		cd xyzzy &&
+		>file &&
+		git add file &&
+		git commit -m "sub initial"
+	) &&
+	git add xyzzy &&
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+	test_tick &&
+	git commit -m initial &&
+	git tag initial
 
-    -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
+error: one: cannot add to the index - missing --add option?
+fatal: Unable to process path one
+error: two: cannot add to the index - missing --add option?
+fatal: Unable to process path two
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2103-update-index-ignore-missing/xyzzy/.git/
+[master (root-commit) a40d181] sub initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+warning: adding embedded git repository: xyzzy
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> xyzzy
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached xyzzy
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) ce14d7f] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 three
+ create mode 100644 two
+ create mode 160000 xyzzy
+ok 1 - basics
 
-fatal: --format can't be combined with other format-altering options
+expecting success of 2103.2 '--ignore-missing --refresh': 
+	git reset --hard initial &&
+	echo 2 >one &&
+	test_must_fail git update-index --refresh &&
+	echo 1 >one &&
+	git update-index --refresh &&
+	rm -f two &&
+	test_must_fail git update-index --refresh &&
+	git update-index --ignore-missing --refresh
 
-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
+HEAD is now at ce14d7f initial
+one: needs update
+two: needs update
+ok 2 - --ignore-missing --refresh
 
-ok 1 - ls-tree --format usage
+expecting success of 2103.3 '--unmerged --refresh': 
+	git reset --hard initial &&
+	info=$(git ls-files -s one | sed -e "s/ 0	/ 1	/") &&
+	git rm --cached one &&
+	echo "$info" | git update-index --index-info &&
+	test_must_fail git update-index --refresh &&
+	git update-index --unmerged --refresh &&
+	echo 2 >two &&
+	test_must_fail git update-index --unmerged --refresh >actual &&
+	grep two actual &&
+	! grep one actual &&
+	! grep three actual
 
-expecting success of 3104.2 'setup': 
-	setup_basic_ls_tree_data
+HEAD is now at ce14d7f initial
+rm 'one'
+one: needs merge
+two: needs update
+ok 3 - --unmerged --refresh
 
-[master (root-commit) 921915e] dir/sub-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/sub-file.t
-[master 61a63ac] top-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 top-file.t
-Cloning into 'submodule'...
-done.
-Adding existing repo at 'submodule' to the index
-[master 9ac950e] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 2 - setup
+expecting success of 2103.4 '--ignore-submodules --refresh (1)': 
+	git reset --hard initial &&
+	rm -f two &&
+	test_must_fail git update-index --ignore-submodules --refresh
 
-expecting success of 3104.3 'ls-tree --format='%(path) %(path) %(path)' HEAD top-file': 
-	git ls-tree --format="%(path) %(path) %(path)" HEAD top-file.t >actual &&
-	echo top-file.t top-file.t top-file.t >expect &&
-	test_cmp expect actual
+HEAD is now at ce14d7f initial
+two: needs update
+ok 4 - --ignore-submodules --refresh (1)
 
-ok 3 - ls-tree --format='%(path) %(path) %(path)' HEAD top-file
+expecting success of 2103.5 '--ignore-submodules --refresh (2)': 
+	git reset --hard initial &&
+	test_tick &&
+	(
+		cd xyzzy &&
+		git commit -m "sub second" --allow-empty
+	) &&
+	test_must_fail git update-index --refresh &&
+	test_must_fail git update-index --ignore-missing --refresh &&
+	git update-index --ignore-submodules --refresh
 
-expecting success of 3104.4 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options ' '': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 4 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options ' '
+HEAD is now at ce14d7f initial
+[master 66f0d66] sub second
+ Author: A U Thor <author@example.com>
+xyzzy: needs update
+xyzzy: needs update
+ok 5 - --ignore-submodules --refresh (2)
 
-expecting success of 3104.5 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 5 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2104-update-index-skip-worktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 3104.6 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' is like options '--long '': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 6 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' is like options '--long '
+	cat >expect.skip <<-\EOF &&
+	S 1
+	H 2
+	S sub/1
+	H sub/2
+	EOF
 
-expecting success of 3104.7 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 7 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' on optimized v.s. non-optimized path
+	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 -
 
-expecting success of 3104.8 'ls-tree '--format=<%(path)>' is like options '--name-only '': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 8 - ls-tree '--format=<%(path)>' is like options '--name-only '
+ok 1 - setup
 
-expecting success of 3104.9 'ls-tree '--format=<%(path)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 9 - ls-tree '--format=<%(path)>' on optimized v.s. non-optimized path
+expecting success of 2104.2 'index is at version 2': 
+	test "$(git update-index --show-index-version)" = 2
 
-expecting success of 3104.10 'ls-tree '--format=<%(objectname)>' is like options '--object-only '': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 10 - ls-tree '--format=<%(objectname)>' is like options '--object-only '
+ok 2 - index is at version 2
 
-expecting success of 3104.11 'ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 11 - ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path
+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 -
 
-expecting success of 3104.12 'ls-tree '--format=<%(objectname)>' is like options '--object-only --abbrev --abbrev'': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 12 - ls-tree '--format=<%(objectname)>' is like options '--object-only --abbrev --abbrev'
+ok 3 - update-index --skip-worktree
 
-expecting success of 3104.13 'ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 13 - ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path
+expecting success of 2104.4 'index is at version 3 after having some skip-worktree entries': 
+	test "$(git update-index --show-index-version)" = 3
 
-expecting success of 3104.14 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '-t -t'': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 14 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '-t -t'
+ok 4 - index is at version 3 after having some skip-worktree entries
 
-expecting success of 3104.15 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 15 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
+expecting success of 2104.5 'ls-files -t': 
+	git ls-files -t | test_cmp expect.skip -
 
-expecting success of 3104.16 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-name --full-name'': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 16 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-name --full-name'
+ok 5 - ls-files -t
 
-expecting success of 3104.17 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 17 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
+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 -
 
-expecting success of 3104.18 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-tree --full-tree'': 
-		git ls-tree $opts -r HEAD >expect &&
-		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
-		test_cmp expect actual
-	
-ok 18 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-tree --full-tree'
+ok 6 - update-index --no-skip-worktree
 
-expecting success of 3104.19 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
-		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
-		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
-		sed "s/^> //" >actual <actual.raw &&
-		test_cmp expect actual
-	
-ok 19 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
+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
 
-# passed all 19 test(s)
-1..19
+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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3201-branch-contains.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3201-branch-contains/.git/
-expecting success of 3201.1 'setup': 
-
-	>file &&
+*** t2106-update-index-assume-unchanged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2106-update-index-assume-unchanged/.git/
+expecting success of 2106.1 'setup': 
+	: >file &&
 	git add file &&
-	test_tick &&
 	git commit -m initial &&
-	git branch -M main &&
-	git branch side &&
-
-	echo 1 >file &&
-	test_tick &&
-	git commit -a -m "second on main" &&
-
-	git checkout side &&
-	echo 1 >file &&
-	test_tick &&
-	git commit -a -m "second on side" &&
-
-	git merge main
-
+	git branch other &&
+	echo upstream >file &&
+	git add file &&
+	git commit -m upstream
 
-[master (root-commit) 1bd44cb] initial
+[master (root-commit) 6ce5622] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
-[main f254a9d] second on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'side'
-[side 5a0fd8a] second on side
+[master fbda113] upstream
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Merge made by the 'ort' strategy.
 ok 1 - setup
 
-expecting success of 3201.2 'branch --contains=main': 
-
-	git branch --contains=main >actual &&
-	{
-		echo "  main" && echo "* side"
-	} >expect &&
-	test_cmp expect actual
+expecting success of 2106.2 'do not switch branches with dirty file': 
+	git reset --hard &&
+	git checkout other &&
+	echo dirt >file &&
+	git update-index --assume-unchanged file &&
+	test_must_fail git checkout - 2>err &&
+	test_grep overwritten err
 
+HEAD is now at fbda113 upstream
+Switched to branch 'other'
+error: Your local changes to the following files would be overwritten by checkout:
+ok 2 - do not switch branches with dirty file
 
-ok 2 - branch --contains=main
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2105-update-index-gitfile.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
 
-expecting success of 3201.3 'branch --contains main': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git branch --contains main >actual &&
-	{
-		echo "  main" && echo "* side"
-	} >expect &&
-	test_cmp expect actual
+expecting success of 2105.2 'add gitlink to absolute .git file': 
+	git update-index --add -- sub1
 
+ok 2 - add gitlink to absolute .git file
 
-ok 3 - branch --contains main
+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)
 
-expecting success of 3201.4 'branch --no-contains=main': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git branch --no-contains=main >actual &&
-	test_must_be_empty actual
+expecting success of 2105.4 'add gitlink to relative .git file': 
+	git update-index --add -- sub2
 
+ok 4 - add gitlink to relative .git file
 
-ok 4 - branch --no-contains=main
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2082-parallel-checkout-attributes.sh ***
+expecting success of 2082.1 'parallel-checkout with ident': 
+	set_checkout_config 2 0 &&
+	git init ident &&
+	(
+		cd ident &&
+		echo "A ident" >.gitattributes &&
+		echo "\$Id\$" >A &&
+		echo "\$Id\$" >B &&
+		git add -A &&
+		git commit -m id &&
 
-expecting success of 3201.5 'branch --no-contains main': 
+		rm A B &&
+		test_checkout_workers 2 git reset --hard &&
+		hexsz=$(test_oid hexsz) &&
+		grep -E "\\\$Id: [0-9a-f]{$hexsz} \\\$" A &&
+		grep "\\\$Id\\\$" B
+	)
 
-	git branch --no-contains main >actual &&
-	test_must_be_empty actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/ident/.git/
+[master (root-commit) f770bc4] id
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+HEAD is now at f770bc4 id
+$Id: 055c8729cdcc372500a08db659c045e16c4409fb $
+$Id$
+ok 1 - parallel-checkout with ident
 
+expecting success of 2082.2 'parallel-checkout with re-encoding': 
+	set_checkout_config 2 0 &&
+	git init encoding &&
+	(
+		cd encoding &&
+		echo text >utf8-text &&
+		write_utf16 <utf8-text >utf16-text &&
 
-ok 5 - branch --no-contains main
+		echo "A working-tree-encoding=UTF-16" >.gitattributes &&
+		cp utf16-text A &&
+		cp utf8-text B &&
+		git add A B .gitattributes &&
+		git commit -m encoding &&
 
-expecting success of 3201.6 'branch --contains=side': 
+		# Check that A is stored in UTF-8
+		git cat-file -p :A >A.internal &&
+		test_cmp_bin utf8-text A.internal &&
 
-	git branch --contains=side >actual &&
-	{
-		echo "* side"
-	} >expect &&
-	test_cmp expect actual
+		rm A B &&
+		test_checkout_workers 2 git checkout A B &&
 
+		# Check that A (and only A) is re-encoded during checkout
+		test_cmp_bin utf16-text A &&
+		test_cmp_bin utf8-text B
+	)
 
-ok 6 - branch --contains=side
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/encoding/.git/
+checking prerequisite: NO_UTF16_BOM
 
-expecting success of 3201.7 'branch --no-contains=side': 
-
-	git branch --no-contains=side >actual &&
-	{
-		echo "  main"
-	} >expect &&
-	test_cmp expect actual
-
-
-ok 7 - branch --no-contains=side
-
-expecting success of 3201.8 'branch --contains with pattern implies --list': 
-
-	git branch --contains=main main >actual &&
-	{
-		echo "  main"
-	} >expect &&
-	test_cmp expect actual
-
-
-ok 8 - branch --contains with pattern implies --list
-
-expecting success of 3201.9 'branch --no-contains with pattern implies --list': 
-
-	git branch --no-contains=main main >actual &&
-	test_must_be_empty actual
-
-
-ok 9 - branch --no-contains with pattern implies --list
-
-expecting success of 3201.10 'side: branch --merged': 
-
-	git branch --merged >actual &&
-	{
-		echo "  main" &&
-		echo "* side"
-	} >expect &&
-	test_cmp expect actual
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
+	test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
 
+)
+prerequisite NO_UTF16_BOM not satisfied
+[master (root-commit) eb6a843] encoding
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+Updated 2 paths from the index
+ok 2 - parallel-checkout with re-encoding
 
-ok 10 - side: branch --merged
+expecting success of 2082.3 'parallel-checkout with eol conversions': 
+	set_checkout_config 2 0 &&
+	git init eol &&
+	(
+		cd eol &&
+		printf "multi\r\nline\r\ntext" >crlf-text &&
+		printf "multi\nline\ntext" >lf-text &&
 
-expecting success of 3201.11 'branch --merged with pattern implies --list': 
+		git config core.autocrlf false &&
+		echo "A eol=crlf" >.gitattributes &&
+		cp crlf-text A &&
+		cp lf-text B &&
+		git add A B .gitattributes &&
+		git commit -m eol &&
 
-	git branch --merged=side main >actual &&
-	{
-		echo "  main"
-	} >expect &&
-	test_cmp expect actual
+		# Check that A is stored with LF format
+		git cat-file -p :A >A.internal &&
+		test_cmp_bin lf-text A.internal &&
 
+		rm A B &&
+		test_checkout_workers 2 git checkout A B &&
 
-ok 11 - branch --merged with pattern implies --list
+		# Check that A (and only A) is converted to CRLF during checkout
+		test_cmp_bin crlf-text A &&
+		test_cmp_bin lf-text B
+	)
 
-expecting success of 3201.12 'side: branch --no-merged': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/eol/.git/
+[master (root-commit) cd8ac0d] eol
+ Author: A U Thor <author@example.com>
+ 3 files changed, 7 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+Updated 2 paths from the index
+ok 3 - parallel-checkout with eol conversions
 
-	git branch --no-merged >actual &&
-	test_must_be_empty actual
+expecting success of 2082.4 'parallel-checkout and external filter': 
+	set_checkout_config 2 0 &&
+	git init filter &&
+	(
+		cd filter &&
+		write_script <<-\EOF rot13.sh &&
+		tr \
+		  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+		  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
+		EOF
 
+		git config filter.rot13.clean "\"$(pwd)/rot13.sh\"" &&
+		git config filter.rot13.smudge "\"$(pwd)/rot13.sh\"" &&
+		git config filter.rot13.required true &&
 
-ok 12 - side: branch --no-merged
+		echo abcd >original &&
+		echo nopq >rot13 &&
 
-expecting success of 3201.13 'main: branch --merged': 
+		echo "A filter=rot13" >.gitattributes &&
+		cp original A &&
+		cp original B &&
+		cp original C &&
+		git add A B C .gitattributes &&
+		git commit -m filter &&
 
-	git checkout main &&
-	git branch --merged >actual &&
-	{
-		echo "* main"
-	} >expect &&
-	test_cmp expect actual
+		# Check that A (and only A) was cleaned
+		git cat-file -p :A >A.internal &&
+		test_cmp rot13 A.internal &&
+		git cat-file -p :B >B.internal &&
+		test_cmp original B.internal &&
+		git cat-file -p :C >C.internal &&
+		test_cmp original C.internal &&
 
+		rm A B C *.internal &&
+		test_checkout_workers 2 git checkout A B C &&
 
-Switched to branch 'main'
-ok 13 - main: branch --merged
+		# Check that A (and only A) was smudged during checkout
+		test_cmp original A &&
+		test_cmp original B &&
+		test_cmp original C
+	)
 
-expecting success of 3201.14 'main: branch --no-merged': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/filter/.git/
+[master (root-commit) 9fb524e] filter
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A
+ create mode 100644 B
+ create mode 100644 C
+Updated 3 paths from the index
+ok 4 - parallel-checkout and external filter
 
-	git branch --no-merged >actual &&
-	{
-		echo "  side"
-	} >expect &&
-	test_cmp expect actual
+expecting success of 2082.5 'parallel-checkout and delayed checkout': 
+	test_config_global filter.delay.process \
+		"test-tool rot13-filter --always-delay --log=\"$(pwd)/delayed.log\" clean smudge delay" &&
+	test_config_global filter.delay.required true &&
 
+	echo "abcd" >original &&
+	echo "nopq" >rot13 &&
 
-ok 14 - main: branch --no-merged
+	git init delayed &&
+	(
+		cd delayed &&
+		echo "*.d filter=delay" >.gitattributes &&
+		cp ../original W.d &&
+		cp ../original X.d &&
+		cp ../original Y &&
+		cp ../original Z &&
+		git add -A &&
+		git commit -m delayed &&
 
-expecting success of 3201.15 'branch --no-merged with pattern implies --list': 
+		# Check that *.d files were cleaned
+		git cat-file -p :W.d >W.d.internal &&
+		test_cmp W.d.internal ../rot13 &&
+		git cat-file -p :X.d >X.d.internal &&
+		test_cmp X.d.internal ../rot13 &&
+		git cat-file -p :Y >Y.internal &&
+		test_cmp Y.internal ../original &&
+		git cat-file -p :Z >Z.internal &&
+		test_cmp Z.internal ../original &&
 
-	git branch --no-merged=main main >actual &&
-	test_must_be_empty actual
+		rm *
+	) &&
 
+	set_checkout_config 2 0 &&
+	test_checkout_workers 2 git -C delayed checkout -f &&
+	verify_checkout delayed &&
 
-ok 15 - branch --no-merged with pattern implies --list
+	# Check that the *.d files got to the delay queue and were filtered
+	grep "smudge W.d .* \[DELAYED\]" delayed.log &&
+	grep "smudge X.d .* \[DELAYED\]" delayed.log &&
+	test_cmp delayed/W.d original &&
+	test_cmp delayed/X.d original &&
 
-expecting success of 3201.16 'implicit --list conflicts with modification options': 
+	# Check that the parallel-eligible entries went to the right queue and
+	# were not filtered
+	! grep "smudge Y .* \[DELAYED\]" delayed.log &&
+	! grep "smudge Z .* \[DELAYED\]" delayed.log &&
+	test_cmp delayed/Y original &&
+	test_cmp delayed/Z original
 
-	test_must_fail git branch --contains=main -d &&
-	test_must_fail git branch --contains=main -m foo &&
-	test_must_fail git branch --no-contains=main -d &&
-	test_must_fail git branch --no-contains=main -m foo
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2082-parallel-checkout-attributes/delayed/.git/
+[master (root-commit) 73aa10e] delayed
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 W.d
+ create mode 100644 X.d
+ create mode 100644 Y
+ create mode 100644 Z
+IN: smudge W.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
+IN: smudge X.d treeish=73aa10e96740aa088d4dcea378e1df6a64c5577d blob=0c362bbfebfbae31b3762aada18b9d0119486316 5 [OK] -- [DELAYED]
+ok 5 - parallel-checkout and delayed checkout
 
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2107-update-index-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/.git/
+expecting success of 2107.1 'update-index --nonsense fails': 
+	test_must_fail git update-index --nonsense 2>msg &&
+	test -s msg
 
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-   or: git branch [<options>] [-l] [<pattern>...]
-   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
-   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-   or: git branch [<options>] [-r | -a] [--points-at]
-   or: git branch [<options>] [-r | -a] [--format]
+ok 1 - update-index --nonsense fails
 
-Generic options
-    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
-    -q, --[no-]quiet      suppress informational messages
-    -t, --[no-]track[=(direct|inherit)]
-                          set branch tracking configuration
-    -u, --[no-]set-upstream-to <upstream>
-                          change the upstream info
-    --[no-]unset-upstream unset the upstream info
-    --[no-]color[=<when>] use colored output
-    -r, --remotes         act on remote-tracking branches
-    --contains <commit>   print only branches that contain the commit
-    --no-contains <commit>
-                          print only branches that don't contain the commit
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+expecting success of 2107.2 'update-index --nonsense dumps usage': 
+	test_expect_code 129 git update-index --nonsense 2>err &&
+	test_grep "[Uu]sage: git update-index" err
 
-Specific git-branch actions:
-    -a, --all             list both remote-tracking and local branches
-    -d, --[no-]delete     delete fully merged branch
-    -D                    delete branch (even if not merged)
-    -m, --[no-]move       move/rename a branch and its reflog
-    -M                    move/rename a branch, even if target exists
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    -c, --[no-]copy       copy a branch and its reflog
-    -C                    copy a branch, even if target exists
-    -l, --[no-]list       list branch names
-    --[no-]show-current   show current branch name
-    --[no-]create-reflog  create the branch's reflog
-    --[no-]edit-description
-                          edit the description for the branch
-    -f, --[no-]force      force creation, move/rename, deletion
-    --merged <commit>     print only branches that are merged
-    --no-merged <commit>  print only branches that are not merged
-    --[no-]column[=<style>]
-                          list branches in columns
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only branches of the object
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]format <format>
-                          format to use for the output
+usage: git update-index [<options>] [--] [<file>...]
+ok 2 - update-index --nonsense dumps usage
 
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-   or: git branch [<options>] [-l] [<pattern>...]
-   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
-   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-   or: git branch [<options>] [-r | -a] [--points-at]
-   or: git branch [<options>] [-r | -a] [--format]
+expecting success of 2107.3 'update-index -h with corrupt index': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git update-index -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage: git update-index" broken/usage
 
-Generic options
-    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
-    -q, --[no-]quiet      suppress informational messages
-    -t, --[no-]track[=(direct|inherit)]
-                          set branch tracking configuration
-    -u, --[no-]set-upstream-to <upstream>
-                          change the upstream info
-    --[no-]unset-upstream unset the upstream info
-    --[no-]color[=<when>] use colored output
-    -r, --remotes         act on remote-tracking branches
-    --contains <commit>   print only branches that contain the commit
-    --no-contains <commit>
-                          print only branches that don't contain the commit
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/broken/.git/
+usage: git update-index [<options>] [--] [<file>...]
+ok 3 - update-index -h with corrupt index
 
-Specific git-branch actions:
-    -a, --all             list both remote-tracking and local branches
-    -d, --[no-]delete     delete fully merged branch
-    -D                    delete branch (even if not merged)
-    -m, --[no-]move       move/rename a branch and its reflog
-    -M                    move/rename a branch, even if target exists
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    -c, --[no-]copy       copy a branch and its reflog
-    -C                    copy a branch, even if target exists
-    -l, --[no-]list       list branch names
-    --[no-]show-current   show current branch name
-    --[no-]create-reflog  create the branch's reflog
-    --[no-]edit-description
-                          edit the description for the branch
-    -f, --[no-]force      force creation, move/rename, deletion
-    --merged <commit>     print only branches that are merged
-    --no-merged <commit>  print only branches that are not merged
-    --[no-]column[=<style>]
-                          list branches in columns
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only branches of the object
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]format <format>
-                          format to use for the output
+expecting success of 2107.4 '--cacheinfo complains of missing arguments': 
+	test_must_fail git update-index --cacheinfo
 
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-   or: git branch [<options>] [-l] [<pattern>...]
-   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
-   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-   or: git branch [<options>] [-r | -a] [--points-at]
-   or: git branch [<options>] [-r | -a] [--format]
+error: option 'cacheinfo' expects <mode>,<sha1>,<path>
+ok 4 - --cacheinfo complains of missing arguments
 
-Generic options
-    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
-    -q, --[no-]quiet      suppress informational messages
-    -t, --[no-]track[=(direct|inherit)]
-                          set branch tracking configuration
-    -u, --[no-]set-upstream-to <upstream>
-                          change the upstream info
-    --[no-]unset-upstream unset the upstream info
-    --[no-]color[=<when>] use colored output
-    -r, --remotes         act on remote-tracking branches
-    --contains <commit>   print only branches that contain the commit
-    --no-contains <commit>
-                          print only branches that don't contain the commit
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+expecting success of 2107.5 '--cacheinfo does not accept blob null sha1': 
+	echo content >file &&
+	git add file &&
+	git rev-parse :file >expect &&
+	test_must_fail git update-index --verbose --cacheinfo 100644 $ZERO_OID file >out &&
+	git rev-parse :file >actual &&
+	test_cmp expect actual &&
 
-Specific git-branch actions:
-    -a, --all             list both remote-tracking and local branches
-    -d, --[no-]delete     delete fully merged branch
-    -D                    delete branch (even if not merged)
-    -m, --[no-]move       move/rename a branch and its reflog
-    -M                    move/rename a branch, even if target exists
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    -c, --[no-]copy       copy a branch and its reflog
-    -C                    copy a branch, even if target exists
-    -l, --[no-]list       list branch names
-    --[no-]show-current   show current branch name
-    --[no-]create-reflog  create the branch's reflog
-    --[no-]edit-description
-                          edit the description for the branch
-    -f, --[no-]force      force creation, move/rename, deletion
-    --merged <commit>     print only branches that are merged
-    --no-merged <commit>  print only branches that are not merged
-    --[no-]column[=<style>]
-                          list branches in columns
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only branches of the object
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]format <format>
-                          format to use for the output
+	cat >expect <<-\EOF &&
+	add 'file'
+	EOF
+	test_cmp expect out
 
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-   or: git branch [<options>] [-l] [<pattern>...]
-   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
-   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-   or: git branch [<options>] [-r | -a] [--points-at]
-   or: git branch [<options>] [-r | -a] [--format]
+error: cache entry has null sha1: file
+fatal: Unable to write new index file
+ok 5 - --cacheinfo does not accept blob null sha1
 
-Generic options
-    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
-    -q, --[no-]quiet      suppress informational messages
-    -t, --[no-]track[=(direct|inherit)]
-                          set branch tracking configuration
-    -u, --[no-]set-upstream-to <upstream>
-                          change the upstream info
-    --[no-]unset-upstream unset the upstream info
-    --[no-]color[=<when>] use colored output
-    -r, --remotes         act on remote-tracking branches
-    --contains <commit>   print only branches that contain the commit
-    --no-contains <commit>
-                          print only branches that don't contain the commit
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+expecting success of 2107.6 '--cacheinfo does not accept gitlink null sha1': 
+	git init submodule &&
+	(cd submodule && test_commit foo) &&
+	git add submodule &&
+	git rev-parse :submodule >expect &&
+	test_must_fail git update-index --cacheinfo 160000 $ZERO_OID submodule &&
+	git rev-parse :submodule >actual &&
+	test_cmp expect actual
 
-Specific git-branch actions:
-    -a, --all             list both remote-tracking and local branches
-    -d, --[no-]delete     delete fully merged branch
-    -D                    delete branch (even if not merged)
-    -m, --[no-]move       move/rename a branch and its reflog
-    -M                    move/rename a branch, even if target exists
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    -c, --[no-]copy       copy a branch and its reflog
-    -C                    copy a branch, even if target exists
-    -l, --[no-]list       list branch names
-    --[no-]show-current   show current branch name
-    --[no-]create-reflog  create the branch's reflog
-    --[no-]edit-description
-                          edit the description for the branch
-    -f, --[no-]force      force creation, move/rename, deletion
-    --merged <commit>     print only branches that are merged
-    --no-merged <commit>  print only branches that are not merged
-    --[no-]column[=<style>]
-                          list branches in columns
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only branches of the object
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]format <format>
-                          format to use for the output
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/submodule/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+warning: adding embedded git repository: submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submodule
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submodule
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+error: cache entry has null sha1: submodule
+fatal: Unable to write new index file
+ok 6 - --cacheinfo does not accept gitlink null sha1
 
-ok 16 - implicit --list conflicts with modification options
+expecting success of 2107.7 '--cacheinfo mode,sha1,path (new syntax)': 
+	echo content >file &&
+	git hash-object -w --stdin <file >expect &&
 
-expecting success of 3201.17 'Assert that --contains only works on commits, not trees & blobs': 
-	test_must_fail git branch --contains main^{tree} &&
-	blob=$(git hash-object -w --stdin <<-\EOF
-	Some blob
-	EOF
-	) &&
-	test_must_fail git branch --contains $blob &&
-	test_must_fail git branch --no-contains $blob
+	git update-index --add --cacheinfo 100644 "$(cat expect)" file &&
+	git rev-parse :file >actual &&
+	test_cmp expect actual &&
 
-error: object f27c6ae26adb8396d3861976ba268f87ad8afa0b is a tree, not a commit
-error: no such commit main^{tree}
-error: object cfb9f2866bfe62c278d75e8c33f020ccc27b5829 is a blob, not a commit
-error: no such commit cfb9f2866bfe62c278d75e8c33f020ccc27b5829
-error: object cfb9f2866bfe62c278d75e8c33f020ccc27b5829 is a blob, not a commit
-error: no such commit cfb9f2866bfe62c278d75e8c33f020ccc27b5829
-ok 17 - Assert that --contains only works on commits, not trees & blobs
+	git update-index --add --verbose --cacheinfo "100644,$(cat expect),elif" >out &&
+	git rev-parse :elif >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3201.18 'multiple branch --contains': 
-	git checkout -b side2 main &&
-	>feature &&
-	git add feature &&
-	git commit -m "add feature" &&
-	git checkout -b next main &&
-	git merge side &&
-	git branch --contains side --contains side2 >actual &&
 	cat >expect <<-\EOF &&
-	* next
-	  side
-	  side2
+	add 'elif'
 	EOF
-	test_cmp expect actual
+	test_cmp expect out
 
-Switched to a new branch 'side2'
-[side2 08dccf0] add feature
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 feature
-Switched to a new branch 'next'
-Updating f254a9d..8b329c6
-Fast-forward
-ok 18 - multiple branch --contains
+ok 7 - --cacheinfo mode,sha1,path (new syntax)
 
-expecting success of 3201.19 'multiple branch --merged': 
-	git branch --merged next --merged main >actual &&
-	cat >expect <<-\EOF &&
-	  main
-	* next
-	  side
-	EOF
-	test_cmp expect actual
+expecting success of 2107.8 '.lock files cleaned up': 
+	mkdir cleanup &&
+	(
+	cd cleanup &&
+	mkdir worktree &&
+	git init repo &&
+	cd repo &&
+	git config core.worktree ../../worktree &&
+	# --refresh triggers late setup_work_tree,
+	# the_index.cache_changed is zero, rollback_lock_file fails
+	git update-index --refresh --verbose >out &&
+	test_must_be_empty out &&
+	! test -f .git/index.lock
+	)
 
-ok 19 - multiple branch --merged
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2107-update-index-basic/cleanup/repo/.git/
+ok 8 - .lock files cleaned up
 
-expecting success of 3201.20 'multiple branch --no-contains': 
-	git branch --no-contains side --no-contains side2 >actual &&
+expecting success of 2107.9 '--chmod=+x and chmod=-x in the same argument list': 
+	>A &&
+	>B &&
+	git add A B &&
+	git update-index --verbose --chmod=+x A --chmod=-x B >out &&
 	cat >expect <<-\EOF &&
-	  main
+	add 'A'
+	chmod +x 'A'
+	add 'B'
+	chmod -x 'B'
 	EOF
-	test_cmp expect actual
-
-ok 20 - multiple branch --no-contains
+	test_cmp expect out &&
 
-expecting success of 3201.21 'multiple branch --no-merged': 
-	git branch --no-merged next --no-merged main >actual &&
-	cat >expect <<-\EOF &&
-	  side2
+	cat >expect <<-EOF &&
+	100755 $EMPTY_BLOB 0	A
+	100644 $EMPTY_BLOB 0	B
 	EOF
+	git ls-files --stage A B >actual &&
 	test_cmp expect actual
 
-ok 21 - multiple branch --no-merged
+ok 9 - --chmod=+x and chmod=-x in the same argument list
 
-expecting success of 3201.22 'branch --contains combined with --no-contains': 
-	git checkout -b seen main &&
-	git merge side &&
-	git merge side2 &&
-	git branch --contains side --no-contains side2 >actual &&
-	cat >expect <<-\EOF &&
-	  next
-	  side
-	EOF
-	test_cmp expect actual
+expecting success of 2107.10 '--index-version': 
+	git commit --allow-empty -m snap &&
+	git reset --hard &&
+	git rm -f -r --cached . &&
 
-Switched to a new branch 'seen'
-Updating f254a9d..8b329c6
-Fast-forward
-Merge made by the 'ort' strategy.
- feature | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 feature
-ok 22 - branch --contains combined with --no-contains
+	# The default index version is 2 --- update this test
+	# when you change it in the code
+	git update-index --show-index-version >actual &&
+	echo 2 >expect &&
+	test_cmp expect actual &&
 
-expecting success of 3201.23 'branch --merged combined with --no-merged': 
-	git branch --merged seen --no-merged next >actual &&
-	cat >expect <<-\EOF &&
-	* seen
-	  side2
-	EOF
-	test_cmp expect actual
+	# The next test wants us to be using version 2
+	git update-index --index-version 2 &&
 
-ok 23 - branch --merged combined with --no-merged
+	git update-index --index-version 4 --verbose >actual &&
+	echo "index-version: was 2, set to 4" >expect &&
+	test_cmp expect actual &&
 
-expecting success of 3201.24 'branch --merged with --verbose': 
-	git branch --track topic main &&
-	git branch zzz topic &&
-	git checkout topic &&
-	test_commit foo &&
-	git branch --merged topic >actual &&
-	cat >expect <<-\EOF &&
-	  main
-	* topic
-	  zzz
-	EOF
+	git update-index --index-version 4 --verbose >actual &&
+	echo "index-version: was 4, set to 4" >expect &&
 	test_cmp expect actual &&
-	git branch --verbose --merged topic >actual &&
-	cat >expect <<-EOF &&
-	  main  $(git rev-parse --short main) second on main
-	* topic $(git rev-parse --short topic ) [ahead 1] foo
-	  zzz   $(git rev-parse --short zzz   ) second on main
-	EOF
-	test_cmp expect actual
 
-branch 'topic' set up to track 'main'.
-Switched to branch 'topic'
-Your branch is up to date with 'main'.
-[topic 67f297f] foo
+	git update-index --index-version 2 --verbose >actual &&
+	echo "index-version: was 4, set to 2" >expect &&
+	test_cmp expect actual &&
+
+	# non-verbose should be silent
+	git update-index --index-version 4 >actual &&
+	test_must_be_empty actual
+
+[master (root-commit) 207d473] snap
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 24 - branch --merged with --verbose
+ 5 files changed, 3 insertions(+)
+ create mode 100755 A
+ create mode 100644 B
+ create mode 100644 elif
+ create mode 100644 file
+ create mode 160000 submodule
+HEAD is now at 207d473 snap
+rm 'A'
+rm 'B'
+rm 'elif'
+rm 'file'
+rm 'submodule'
+ok 10 - --index-version
 
-# passed all 24 test(s)
-1..24
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3205-branch-color.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3205-branch-color/.git/
-expecting success of 3205.1 'set up some sample branches': 
-	test_commit foo &&
-	git branch -M main &&
-	git update-ref refs/remotes/origin/main HEAD &&
-	git update-ref refs/heads/other HEAD
+*** t2202-add-addremove.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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) ddd63c9] foo
+[master (root-commit) 50dd5d8] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - set up some sample branches
-
-expecting success of 3205.2 'set up some color config': 
-	git config color.branch.local blue &&
-	git config color.branch.remote yellow &&
-	git config color.branch.current cyan
-
-ok 2 - set up some color config
+ 2 files changed, 3 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 will-remove
+ok 1 - setup
 
-expecting success of 3205.3 'regular output shows colors': 
-	cat >expect <<-\EOF &&
-	* <CYAN>main<RESET>
-	  <BLUE>other<RESET>
-	  <YELLOW>remotes/origin/main<RESET>
-	EOF
-	git branch --color -a >actual.raw &&
-	test_decode_color <actual.raw >actual &&
+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 3 - regular output shows colors
+ok 2 - git add --all
 
-expecting success of 3205.4 'verbose output shows colors': 
-	oid=$(git rev-parse --short HEAD) &&
-	cat >expect <<-EOF &&
-	* <CYAN>main               <RESET> $oid foo
-	  <BLUE>other              <RESET> $oid foo
-	  <YELLOW>remotes/origin/main<RESET> $oid foo
-	EOF
-	git branch --color -v -a >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+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
 
-ok 4 - verbose output shows colors
+HEAD is now at 50dd5d8 initial
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config set advice.addEmptyPathspec false"
+ok 3 - Just "git add" is a no-op
 
-# passed all 4 test(s)
-1..4
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3105-ls-tree-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output/.git/
-expecting success of 3105.1 'ls-tree --format usage': 
-	test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
-	test_expect_code 129 git ls-tree --format=fmt --name-only HEAD &&
-	test_expect_code 129 git ls-tree --format=fmt --name-status HEAD
+*** t2201-add-update-typechange.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2201-add-update-typechange/.git/
+expecting success of 2201.1 'setup': 
+	>xyzzy &&
+	_empty=$(git hash-object --stdin <xyzzy) &&
+	>yomin &&
+	>caskly &&
+	if test_have_prereq SYMLINKS; then
+		ln -s frotz nitfol &&
+		T_letter=T
+	else
+		printf %s frotz > nitfol &&
+		T_letter=M
+	fi &&
+	mkdir rezrov &&
+	>rezrov/bozbar &&
+	git add caskly xyzzy yomin nitfol rezrov/bozbar &&
 
-fatal: --format can't be combined with other format-altering options
+	test_tick &&
+	git commit -m initial
 
-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
+checking prerequisite: SYMLINKS
 
-fatal: --format can't be combined with other format-altering options
+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
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+)
+prerequisite SYMLINKS ok
+[master (root-commit) 8dc0761] initial
+ Author: A U Thor <author@example.com>
+ 5 files changed, 1 insertion(+)
+ create mode 100644 caskly
+ create mode 120000 nitfol
+ create mode 100644 rezrov/bozbar
+ create mode 100644 xyzzy
+ create mode 100644 yomin
+ok 1 - setup
 
-    -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
+expecting success of 2201.2 'modify': 
+	rm -f xyzzy yomin nitfol caskly &&
+	# caskly disappears (not a submodule)
+	mkdir caskly &&
+	# nitfol changes from symlink to regular
+	>nitfol &&
+	# rezrov/bozbar disappears
+	rm -fr rezrov &&
+	if test_have_prereq SYMLINKS; then
+		ln -s xyzzy rezrov
+	else
+		printf %s xyzzy > rezrov
+	fi &&
+	# xyzzy disappears (not a submodule)
+	mkdir xyzzy &&
+	echo gnusto >xyzzy/bozbar &&
+	# yomin gets replaced with a submodule
+	mkdir yomin &&
+	>yomin/yomin &&
+	(
+		cd yomin &&
+		git init &&
+		git add yomin &&
+		git commit -m "sub initial"
+	) &&
+	yomin=$(GIT_DIR=yomin/.git git rev-parse HEAD) &&
+	# yonk is added and then turned into a submodule
+	# this should appear as T in diff-files and as A in diff-index
+	>yonk &&
+	git add yonk &&
+	rm -f yonk &&
+	mkdir yonk &&
+	>yonk/yonk &&
+	(
+		cd yonk &&
+		git init &&
+		git add yonk &&
+		git commit -m "sub initial"
+	) &&
+	yonk=$(GIT_DIR=yonk/.git git rev-parse HEAD) &&
+	# zifmia is added and then removed
+	# this should appear in diff-files but not in diff-index.
+	>zifmia &&
+	git add zifmia &&
+	rm -f zifmia &&
+	mkdir zifmia &&
+	{
+		git ls-tree -r HEAD |
+		sed -e "s/^/:/" -e "
+			/	caskly/{
+				s/	caskly/ $ZERO_OID D&/
+				s/blob/000000/
+			}
+			/	nitfol/{
+				s/	nitfol/ $ZERO_OID $T_letter&/
+				s/blob/100644/
+			}
+			/	rezrov.bozbar/{
+				s/	rezrov.bozbar/ $ZERO_OID D&/
+				s/blob/000000/
+			}
+			/	xyzzy/{
+				s/	xyzzy/ $ZERO_OID D&/
+				s/blob/000000/
+			}
+			/	yomin/{
+			    s/	yomin/ $ZERO_OID T&/
+				s/blob/160000/
+			}
+		"
+	} >expect &&
+	{
+		cat expect &&
+		echo ":100644 160000 $_empty $ZERO_OID T	yonk" &&
+		echo ":100644 000000 $_empty $ZERO_OID D	zifmia"
+	} >expect-files &&
+	{
+		cat expect &&
+		echo ":000000 160000 $ZERO_OID $ZERO_OID A	yonk"
+	} >expect-index &&
+	{
+		echo "100644 $_empty 0	nitfol" &&
+		echo "160000 $yomin 0	yomin" &&
+		echo "160000 $yonk 0	yonk"
+	} >expect-final
 
-fatal: --format can't be combined with other format-altering options
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2201-add-update-typechange/yomin/.git/
+[master (root-commit) 9da2848] sub initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 yomin
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2201-add-update-typechange/yonk/.git/
+[master (root-commit) 9cc3160] sub initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 yonk
+ok 2 - modify
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+expecting success of 2201.3 'diff-files': 
+	git diff-files --raw >actual &&
+	test_cmp expect-files actual
 
-    -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 3 - diff-files
 
-ok 1 - ls-tree --format usage
+expecting success of 2201.4 'diff-index': 
+	git diff-index --raw HEAD -- >actual &&
+	test_cmp expect-index actual
 
-expecting success of 3105.2 'setup': 
-	setup_basic_ls_tree_data
+ok 4 - diff-index
 
-[master (root-commit) 921915e] dir/sub-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/sub-file.t
-[master 61a63ac] top-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 top-file.t
-Cloning into 'submodule'...
-done.
-Adding existing repo at 'submodule' to the index
-[master 9ac950e] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 2 - setup
+expecting success of 2201.5 'add -u': 
+	rm -f ".git/saved-index" &&
+	cp -p ".git/index" ".git/saved-index" &&
+	git add -u &&
+	git ls-files -s >actual &&
+	test_cmp expect-final actual
 
-expecting success of 3105.3 'setup: HEAD_* variables': 
-	HEAD_gitmodules=$(git rev-parse HEAD:.gitmodules) &&
-	HEAD_dir=$(git rev-parse HEAD:dir) &&
-	HEAD_top_file=$(git rev-parse HEAD:top-file.t) &&
-	HEAD_submodule=$(git rev-parse HEAD:submodule) &&
-	HEAD_dir_sub_file=$(git rev-parse HEAD:dir/sub-file.t)
+ok 5 - add -u
 
-ok 3 - setup: HEAD_* variables
+expecting success of 2201.6 'commit -a': 
+	if test -f ".git/saved-index"
+	then
+		rm -f ".git/index" &&
+		mv ".git/saved-index" ".git/index"
+	fi &&
+	git commit -m "second" -a &&
+	git ls-files -s >actual &&
+	test_cmp expect-final actual &&
+	rm -f .git/index &&
+	git read-tree HEAD &&
+	git ls-files -s >actual &&
+	test_cmp expect-final actual
 
-expecting success of 3105.4 ''ls-tree ' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 4 - 'ls-tree ' output
+[master 0f3d2ce] second
+ Author: A U Thor <author@example.com>
+ 6 files changed, 2 insertions(+), 1 deletion(-)
+ delete mode 100644 caskly
+ mode change 120000 => 100644 nitfol
+ delete mode 100644 rezrov/bozbar
+ delete mode 100644 xyzzy
+ mode change 100644 => 160000 yomin
+ create mode 160000 yonk
+ok 6 - commit -a
 
-expecting success of 3105.5 ''ls-tree ' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 5 - 'ls-tree ' output (via subdir)
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2200-add-update.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2200-add-update/.git/
+expecting success of 2200.1 'setup': 
+	echo initial >check &&
+	echo initial >top &&
+	echo initial >foo &&
+	mkdir dir1 dir2 &&
+	echo initial >dir1/sub1 &&
+	echo initial >dir1/sub2 &&
+	echo initial >dir2/sub3 &&
+	git add check dir1 dir2 top foo &&
+	test_tick &&
+	git commit -m initial &&
 
-expecting success of 3105.6 ''ls-tree  -t' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 6 - 'ls-tree  -t' output
+	echo changed >check &&
+	echo changed >top &&
+	echo changed >dir2/sub3 &&
+	rm -f dir1/sub1 &&
+	echo other >dir2/other
 
-expecting success of 3105.7 ''ls-tree  -t' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 7 - 'ls-tree  -t' output (via subdir)
+[master (root-commit) ec46c19] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 check
+ create mode 100644 dir1/sub1
+ create mode 100644 dir1/sub2
+ create mode 100644 dir2/sub3
+ create mode 100644 foo
+ create mode 100644 top
+ok 1 - setup
 
-expecting success of 3105.8 ''ls-tree  -d' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 8 - 'ls-tree  -d' output
+expecting success of 2200.2 'update': 
+	git add -u dir1 dir2
 
-expecting success of 3105.9 ''ls-tree  -d' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 9 - 'ls-tree  -d' output (via subdir)
+ok 2 - update
 
-expecting success of 3105.10 ''ls-tree  -r' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 10 - 'ls-tree  -r' output
+expecting success of 2200.3 'update noticed a removal': 
+	git ls-files dir1/sub1 >out &&
+	test_must_be_empty out
 
-expecting success of 3105.11 ''ls-tree  -r' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 11 - 'ls-tree  -r' output (via subdir)
+ok 3 - update noticed a removal
 
-expecting success of 3105.12 ''ls-tree --long' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 12 - 'ls-tree --long' output
+expecting success of 2200.4 'update touched correct path': 
+	git diff-files --name-status dir2/sub3 >out &&
+	test_must_be_empty out
 
-expecting success of 3105.13 ''ls-tree --long' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 13 - 'ls-tree --long' output (via subdir)
+ok 4 - update touched correct path
 
-expecting success of 3105.14 ''ls-tree --long -t' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 14 - 'ls-tree --long -t' output
+expecting success of 2200.5 'update did not touch other tracked files': 
+	echo "M	check" >expect &&
+	git diff-files --name-status check >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3105.15 ''ls-tree --long -t' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 15 - 'ls-tree --long -t' output (via subdir)
+	echo "M	top" >expect &&
+	git diff-files --name-status top >actual &&
+	test_cmp expect actual
 
-expecting success of 3105.16 ''ls-tree --long -d' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 16 - 'ls-tree --long -d' output
+ok 5 - update did not touch other tracked files
 
-expecting success of 3105.17 ''ls-tree --long -d' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 17 - 'ls-tree --long -d' output (via subdir)
+expecting success of 2200.6 'update did not touch untracked files': 
+	git ls-files dir2/other >out &&
+	test_must_be_empty out
 
-expecting success of 3105.18 ''ls-tree --long -r' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 18 - 'ls-tree --long -r' output
+ok 6 - update did not touch untracked files
 
-expecting success of 3105.19 ''ls-tree --long -r' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 19 - 'ls-tree --long -r' output (via subdir)
+expecting success of 2200.7 'error out when passing untracked path': 
+	git reset --hard &&
+	echo content >>baz &&
+	echo content >>top &&
+	test_must_fail git add -u baz top 2>err &&
+	test_grep -e "error: pathspec .baz. did not match any file(s) known to git" err &&
+	git diff --cached --name-only >actual &&
+	test_must_be_empty actual
 
-expecting success of 3105.20 ''ls-tree --name-only' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 20 - 'ls-tree --name-only' output
+HEAD is now at ec46c19 initial
+error: pathspec 'baz' did not match any file(s) known to git
+ok 7 - error out when passing untracked path
 
-expecting success of 3105.21 ''ls-tree --name-only' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 21 - 'ls-tree --name-only' output (via subdir)
+expecting success of 2200.8 'cache tree has not been corrupted': 
 
-expecting success of 3105.22 ''ls-tree --name-only -t' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 22 - 'ls-tree --name-only -t' output
+	git ls-files -s |
+	sed -e "s/ 0	/	/" >expect &&
+	git ls-tree -r $(git write-tree) |
+	sed -e "s/ blob / /" >current &&
+	test_cmp expect current
 
-expecting success of 3105.23 ''ls-tree --name-only -t' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 23 - 'ls-tree --name-only -t' output (via subdir)
 
-expecting success of 3105.24 ''ls-tree --name-only -d' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 24 - 'ls-tree --name-only -d' output
+ok 8 - cache tree has not been corrupted
 
-expecting success of 3105.25 ''ls-tree --name-only -d' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 25 - 'ls-tree --name-only -d' output (via subdir)
+expecting success of 2200.9 'update from a subdirectory': 
+	(
+		cd dir1 &&
+		echo more >sub2 &&
+		git add -u sub2
+	)
 
-expecting success of 3105.26 ''ls-tree --name-only -r' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 26 - 'ls-tree --name-only -r' output
+ok 9 - update from a subdirectory
 
-expecting success of 3105.27 ''ls-tree --name-only -r' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 27 - 'ls-tree --name-only -r' output (via subdir)
+expecting success of 2200.10 'change gets noticed': 
+	git diff-files --name-status dir1 >out &&
+	test_must_be_empty out
 
-expecting success of 3105.28 ''ls-tree --object-only' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 28 - 'ls-tree --object-only' output
+ok 10 - change gets noticed
 
-expecting success of 3105.29 ''ls-tree --object-only' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 29 - 'ls-tree --object-only' output (via subdir)
+expecting success of 2200.11 'non-qualified update in subdir updates from the root': 
+	(
+		cd dir1 &&
+		echo even more >>sub2 &&
+		git --literal-pathspecs add -u &&
+		echo even more >>sub2 &&
+		git add -u
+	) &&
+	git diff-files --name-only >actual &&
+	test_must_be_empty actual
 
-expecting success of 3105.30 ''ls-tree --object-only -t' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 30 - 'ls-tree --object-only -t' output
+ok 11 - non-qualified update in subdir updates from the root
 
-expecting success of 3105.31 ''ls-tree --object-only -t' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 31 - 'ls-tree --object-only -t' output (via subdir)
+expecting success of 2200.12 'replace a file with a symlink': 
 
-expecting success of 3105.32 ''ls-tree --object-only -d' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 32 - 'ls-tree --object-only -d' output
+	rm foo &&
+	test_ln_s_add top foo
 
-expecting success of 3105.33 ''ls-tree --object-only -d' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 33 - 'ls-tree --object-only -d' output (via subdir)
 
-expecting success of 3105.34 ''ls-tree --object-only -r' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 34 - 'ls-tree --object-only -r' output
+checking prerequisite: SYMLINKS
 
-expecting success of 3105.35 ''ls-tree --object-only -r' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 35 - 'ls-tree --object-only -r' output (via subdir)
+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 3105.36 'setup: HEAD_short_* variables': 
-	HEAD_short_gitmodules=$(git rev-parse --short HEAD:.gitmodules) &&
-	HEAD_short_dir=$(git rev-parse --short HEAD:dir) &&
-	HEAD_short_top_file=$(git rev-parse --short HEAD:top-file.t) &&
-	HEAD_short_submodule=$(git rev-parse --short HEAD:submodule) &&
-	HEAD_short_dir_sub_file=$(git rev-parse --short HEAD:dir/sub-file.t)
+)
+prerequisite SYMLINKS ok
+ok 12 - replace a file with a symlink
 
-ok 36 - setup: HEAD_short_* variables
+expecting success of 2200.13 'add everything changed': 
 
-expecting success of 3105.37 ''ls-tree --object-only --abbrev' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 37 - 'ls-tree --object-only --abbrev' output
+	git add -u &&
+	git diff-files >out &&
+	test_must_be_empty out
 
-expecting success of 3105.38 ''ls-tree --object-only --abbrev' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 38 - 'ls-tree --object-only --abbrev' output (via subdir)
 
-expecting success of 3105.39 ''ls-tree --object-only --abbrev -t' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 39 - 'ls-tree --object-only --abbrev -t' output
+ok 13 - add everything changed
 
-expecting success of 3105.40 ''ls-tree --object-only --abbrev -t' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 40 - 'ls-tree --object-only --abbrev -t' output (via subdir)
+expecting success of 2200.14 'touch and then add -u': 
 
-expecting success of 3105.41 ''ls-tree --object-only --abbrev -d' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 41 - 'ls-tree --object-only --abbrev -d' output
+	touch check &&
+	git add -u &&
+	git diff-files >out &&
+	test_must_be_empty out
 
-expecting success of 3105.42 ''ls-tree --object-only --abbrev -d' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 42 - 'ls-tree --object-only --abbrev -d' output (via subdir)
 
-expecting success of 3105.43 ''ls-tree --object-only --abbrev -r' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 43 - 'ls-tree --object-only --abbrev -r' output
+ok 14 - touch and then add -u
 
-expecting success of 3105.44 ''ls-tree --object-only --abbrev -r' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 44 - 'ls-tree --object-only --abbrev -r' output (via subdir)
+expecting success of 2200.15 'touch and then add explicitly': 
 
-expecting success of 3105.45 ''ls-tree --full-name' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 45 - 'ls-tree --full-name' output
+	touch check &&
+	git add check &&
+	git diff-files >out &&
+	test_must_be_empty out
 
-expecting success of 3105.46 ''ls-tree --full-name' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 46 - 'ls-tree --full-name' output (via subdir)
 
-expecting success of 3105.47 ''ls-tree --full-name -d' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 47 - 'ls-tree --full-name -d' output
+ok 15 - touch and then add explicitly
 
-expecting success of 3105.48 ''ls-tree --full-name -d' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 48 - 'ls-tree --full-name -d' output (via subdir)
+expecting success of 2200.16 'add -n -u should not add but just report': 
 
-expecting success of 3105.49 ''ls-tree --full-name -r' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 49 - 'ls-tree --full-name -r' output
+	(
+		echo "add 'check'" &&
+		echo "remove 'top'"
+	) >expect &&
+	before=$(git ls-files -s check top) &&
+	git count-objects -v >objects_before &&
+	echo changed >>check &&
+	rm -f top &&
+	git add -n -u >actual &&
+	after=$(git ls-files -s check top) &&
+	git count-objects -v >objects_after &&
 
-expecting success of 3105.50 ''ls-tree --full-name -r' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 50 - 'ls-tree --full-name -r' output (via subdir)
+	test "$before" = "$after" &&
+	test_cmp objects_before objects_after &&
+	test_cmp expect actual
 
-expecting success of 3105.51 ''ls-tree --full-name -t' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 51 - 'ls-tree --full-name -t' output
 
-expecting success of 3105.52 ''ls-tree --full-name -t' output (via subdir)': 
-				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
-				test_cmp expect actual
-			
-ok 52 - 'ls-tree --full-name -t' output (via subdir)
+ok 16 - add -n -u should not add but just report
 
-expecting success of 3105.53 ''ls-tree --full-tree' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 53 - 'ls-tree --full-tree' output
+expecting success of 2200.17 'add -u resolves unmerged paths': 
+	git reset --hard &&
+	one=$(echo 1 | git hash-object -w --stdin) &&
+	two=$(echo 2 | git hash-object -w --stdin) &&
+	three=$(echo 3 | git hash-object -w --stdin) &&
+	{
+		for path in path1 path2
+		do
+			echo "100644 $one 1	$path" &&
+			echo "100644 $two 2	$path" &&
+			echo "100644 $three 3	$path" || return 1
+		done &&
+		echo "100644 $one 1	path3" &&
+		echo "100644 $one 1	path4" &&
+		echo "100644 $one 3	path5" &&
+		echo "100644 $one 3	path6"
+	} |
+	git update-index --index-info &&
+	echo 3 >path1 &&
+	echo 2 >path3 &&
+	echo 2 >path5 &&
 
-expecting success of 3105.54 ''ls-tree --full-tree' output (via subdir, fails)': 
-				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
-			
-fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
-ok 54 - 'ls-tree --full-tree' output (via subdir, fails)
+	# Fail to explicitly resolve removed paths with "git add"
+	test_must_fail git add --no-all path4 &&
+	test_must_fail git add --no-all path6 &&
 
-expecting success of 3105.55 ''ls-tree --full-tree -t' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 55 - 'ls-tree --full-tree -t' output
+	# "add -u" should notice removals no matter what stages
+	# the index entries are in.
+	git add -u &&
+	git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
+	{
+		echo "100644 $three 0	path1" &&
+		echo "100644 $two 0	path3" &&
+		echo "100644 $two 0	path5"
+	} >expect &&
+	test_cmp expect actual
 
-expecting success of 3105.56 ''ls-tree --full-tree -t' output (via subdir, fails)': 
-				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
-			
-fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
-ok 56 - 'ls-tree --full-tree -t' output (via subdir, fails)
+HEAD is now at ec46c19 initial
+fatal: unable to stat 'path4': No such file or directory
+fatal: unable to stat 'path6': No such file or directory
+ok 17 - add -u resolves unmerged paths
 
-expecting success of 3105.57 ''ls-tree --full-tree -d' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 57 - 'ls-tree --full-tree -d' output
+expecting success of 2200.18 '"add -u non-existent" should fail': 
+	test_must_fail git add -u non-existent &&
+	git ls-files >actual &&
+	! grep "non-existent" actual
 
-expecting success of 3105.58 ''ls-tree --full-tree -d' output (via subdir, fails)': 
-				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
-			
-fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
-ok 58 - 'ls-tree --full-tree -d' output (via subdir, fails)
+fatal: pathspec 'non-existent' did not match any files
+ok 18 - "add -u non-existent" should fail
 
-expecting success of 3105.59 ''ls-tree --full-tree -r' output': 
-			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
-			test_cmp expect actual
-		
-ok 59 - 'ls-tree --full-tree -r' output
+expecting success of 2200.19 '"commit -a" implies "add -u" if index becomes empty': 
+	git rm -rf \* &&
+	git commit -m clean-slate &&
+	test_commit file1 &&
+	rm file1.t &&
+	test_tick &&
+	git commit -a -m remove &&
+	git ls-tree HEAD: >out &&
+	test_must_be_empty out
 
-expecting success of 3105.60 ''ls-tree --full-tree -r' output (via subdir, fails)': 
-				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
-			
-fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
-ok 60 - 'ls-tree --full-tree -r' output (via subdir, fails)
+rm 'check'
+rm 'dir1/sub1'
+rm 'dir1/sub2'
+rm 'dir2/sub3'
+rm 'foo'
+rm 'path1'
+rm 'path3'
+rm 'path5'
+rm 'top'
+[master 592864c] clean-slate
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 deletions(-)
+ delete mode 100644 check
+ delete mode 100644 dir1/sub1
+ delete mode 100644 dir1/sub2
+ delete mode 100644 dir2/sub3
+ delete mode 100644 foo
+ delete mode 100644 top
+[master d0c715a] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+[master 4eab7cc] remove
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1.t
+ok 19 - "commit -a" implies "add -u" if index becomes empty
 
-# passed all 60 test(s)
-1..60
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3204-branch-name-interpretation.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3204-branch-name-interpretation/.git/
-expecting success of 3204.1 'set up repo': 
-	test_commit one &&
-	test_commit two &&
-	git remote add origin foo.git
+*** t2108-update-index-refresh-racy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2108-update-index-refresh-racy/.git/
+expecting success of 2108.1 'setup': 
+	reset_files &&
+	# we are calling reset_files() a couple of times during tests;
+	# test-tool chmtime does not change the ctime; to not weaken
+	# or even break our tests, disable ctime-checks entirely
+	git config core.trustctime false &&
+	git add file other &&
+	git commit -m "initial import"
 
-[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
+[master (root-commit) 4c25839] initial import
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - set up repo
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 other
+ok 1 - setup
 
-expecting success of 3204.2 'update branch via @{-1}': 
-	git branch previous one &&
+expecting success of 2108.2 '--refresh has no racy timestamps to fix': 
+	reset_files &&
+	# set the index time far enough to the future;
+	# it must be at least 3 seconds for VFAT
+	test_set_magic_mtime .git/index +60 &&
+	git update-index --refresh &&
+	test_is_magic_mtime .git/index +60
 
-	git checkout previous &&
-	git checkout main &&
+ok 2 - --refresh has no racy timestamps to fix
 
-	git branch -f @{-1} two &&
-	expect_branch previous two
+expecting success of 2108.3 '--refresh should fix racy timestamp': 
+	reset_files &&
+	update_assert_changed --refresh
 
-Switched to branch 'previous'
-Switched to branch 'main'
-ok 2 - update branch via @{-1}
+--- .git/test-mtime-expect	2026-03-14 13:27:51.694677808 +0000
++++ .git/test-mtime-actual	2026-03-14 13:27:51.722677808 +0000
+@@ -1 +1 @@
+-1234567890
++1773494871
+ok 3 - --refresh should fix racy timestamp
 
-expecting success of 3204.3 'update branch via local @{upstream}': 
-	git branch local one &&
-	git branch --set-upstream-to=local &&
+expecting success of 2108.4 '--really-refresh should fix racy timestamp': 
+	reset_files &&
+	update_assert_changed --really-refresh
 
-	git branch -f @{upstream} two &&
-	expect_branch local two
+--- .git/test-mtime-expect	2026-03-14 13:27:52.022677808 +0000
++++ .git/test-mtime-actual	2026-03-14 13:27:52.050677808 +0000
+@@ -1 +1 @@
+-1234567890
++1773494872
+ok 4 - --really-refresh should fix racy timestamp
 
-branch 'main' set up to track 'local'.
-ok 3 - update branch via local @{upstream}
+expecting success of 2108.5 '--refresh should fix racy timestamp if other file needs update': 
+	reset_files &&
+	echo content2 >other &&
+	test_set_magic_mtime other &&
+	update_assert_changed --refresh
 
-expecting success of 3204.4 'disallow updating branch via remote @{upstream}': 
-	git update-ref refs/remotes/origin/remote one &&
-	git branch --set-upstream-to=origin/remote &&
+other: needs update
+--- .git/test-mtime-expect	2026-03-14 13:27:52.454677808 +0000
++++ .git/test-mtime-actual	2026-03-14 13:27:52.466677808 +0000
+@@ -1 +1 @@
+-1234567890
++1773494872
+ok 5 - --refresh should fix racy timestamp if other file needs update
 
-	test_must_fail git branch -f @{upstream} two
+expecting success of 2108.6 '--refresh should fix racy timestamp if racy file needs update': 
+	reset_files &&
+	echo content2 >file &&
+	test_set_magic_mtime file &&
+	update_assert_changed --refresh
 
-branch 'main' set up to track 'origin/remote'.
-fatal: '@{upstream}' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 4 - disallow updating branch via remote @{upstream}
+file: needs update
+--- .git/test-mtime-expect	2026-03-14 13:27:52.862677808 +0000
++++ .git/test-mtime-actual	2026-03-14 13:27:52.878677808 +0000
+@@ -1 +1 @@
+-1234567890
++1773494872
+ok 6 - --refresh should fix racy timestamp if racy file needs update
 
-expecting success of 3204.5 'create branch with pseudo-qualified name': 
-	git branch refs/heads/qualified two &&
-	expect_branch refs/heads/refs/heads/qualified two
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2205-add-worktree-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/.git/
+expecting success of 2205.1 '1a: setup--config worktree': 
+	mkdir test1 &&
+	(
+	cd test1 &&
+	test_create_repo repo &&
+	git --git-dir="repo/.git" config core.worktree "$(pwd)" &&
 
-ok 5 - create branch with pseudo-qualified name
+	mkdir -p outside-tracked outside-untracked &&
+	mkdir -p repo/inside-tracked repo/inside-untracked &&
+	>file-tracked &&
+	>file-untracked &&
+	>outside-tracked/file &&
+	>outside-untracked/file &&
+	>repo/file-tracked &&
+	>repo/file-untracked &&
+	>repo/inside-tracked/file &&
+	>repo/inside-untracked/file &&
 
-expecting success of 3204.6 'force-copy a branch to itself via @{-1} is no-op': 
-	git branch -t copiable main &&
-	git checkout copiable &&
-	git checkout - &&
-	git branch -C @{-1} copiable &&
-	git config --get-all branch.copiable.merge >actual &&
-	echo refs/heads/main >expect &&
-	test_cmp expect actual
+	cat >expect-tracked-unsorted <<-EOF &&
+	../file-tracked
+	../outside-tracked/file
+	file-tracked
+	inside-tracked/file
+	EOF
 
-branch 'copiable' set up to track 'main'.
-Switched to branch 'copiable'
-Your branch is up to date with 'main'.
-Switched to branch 'main'
-Your branch is ahead of 'origin/remote' by 1 commit.
-  (use "git push" to publish your local commits)
-ok 6 - force-copy a branch to itself via @{-1} is no-op
+	cat >expect-untracked-unsorted <<-EOF &&
+	../file-untracked
+	../outside-untracked/file
+	file-untracked
+	inside-untracked/file
+	EOF
 
-expecting success of 3204.7 'delete branch via @{-1}': 
-	git branch previous-del &&
+	cat >expect-all-dir-unsorted <<-EOF &&
+	../file-untracked
+	../file-tracked
+	../outside-untracked/
+	../outside-tracked/
+	./
+	EOF
 
-	git checkout previous-del &&
-	git checkout main &&
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
 
-	git branch -D @{-1} &&
-	expect_deleted previous-del
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
 
-Switched to branch 'previous-del'
-Switched to branch 'main'
-Your branch is ahead of 'origin/remote' by 1 commit.
-  (use "git push" to publish your local commits)
-Deleted branch previous-del (was 139b20d).
-fatal: Needed a single revision
-ok 7 - delete branch via @{-1}
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test1/repo/.git/
+ok 1 - 1a: setup--config worktree
 
-expecting success of 3204.8 'delete branch via local @{upstream}': 
-	git branch local-del &&
-	git branch --set-upstream-to=local-del &&
+expecting success of 2205.2 '1b: pre-add all': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-all-unsorted &&
+	sort actual-all-unsorted >actual-all &&
+	sort expect-all-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
 
-	git branch -D @{upstream} &&
-	expect_deleted local-del
+ok 2 - 1b: pre-add all
 
-branch 'main' set up to track 'local-del'.
-Deleted branch local-del (was 139b20d).
-fatal: Needed a single revision
-ok 8 - delete branch via local @{upstream}
+expecting success of 2205.3 '1c: pre-add dir all': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --directory --exclude-standard "$parent_dir" >actual-all-dir-unsorted &&
+	sort actual-all-dir-unsorted >actual-all &&
+	sort expect-all-dir-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
 
-expecting success of 3204.9 'delete branch via remote @{upstream}': 
-	git update-ref refs/remotes/origin/remote-del two &&
-	git branch --set-upstream-to=origin/remote-del &&
+ok 3 - 1c: pre-add dir all
 
-	git branch -r -D @{upstream} &&
-	expect_deleted origin/remote-del
+expecting success of 2205.4 '1d: post-add tracked': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	(
+		cd repo &&
+		git add file-tracked &&
+		git add inside-tracked &&
+		git add ../outside-tracked &&
+		git add "$parent_dir/file-tracked" &&
+		git ls-files "$parent_dir" >../actual-tracked-unsorted
+	) &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
 
-branch 'main' set up to track 'origin/remote-del'.
-Deleted remote-tracking branch origin/remote-del (was 139b20d).
-fatal: Needed a single revision
-ok 9 - delete branch via remote @{upstream}
+ok 4 - 1d: post-add tracked
 
-expecting success of 3204.10 'delete @{upstream} expansion matches -r option': 
-	git update-ref refs/remotes/origin/remote-del two &&
-	git branch --set-upstream-to=origin/remote-del &&
-	git update-ref refs/heads/origin/remote-del two &&
-	git update-ref refs/heads/remotes/origin/remote-del two &&
+expecting success of 2205.5 '1e: post-add untracked': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-untracked-unsorted &&
+	sort actual-untracked-unsorted >actual-untracked &&
+	sort expect-untracked-unsorted >expect-untracked &&
+	test_cmp expect-untracked actual-untracked
+	)
 
-	test_must_fail git branch -D @{upstream} &&
-	expect_branch refs/heads/origin/remote-del two &&
-	expect_branch refs/heads/remotes/origin/remote-del two
+ok 5 - 1e: post-add untracked
 
-branch 'main' set up to track 'origin/remote-del'.
-error: branch '@{upstream}' not found
-ok 10 - delete @{upstream} expansion matches -r option
+expecting success of 2205.6 '2a: setup--set git-dir': 
+	mkdir test2 &&
+	(
+	cd test2 &&
+	test_create_repo repo &&
+	# create two foreign repositories that should remain untracked
+	test_create_repo repo-outside &&
+	test_create_repo repo/repo-inside &&
 
-expecting success of 3204.11 'disallow deleting remote branch via @{-1}': 
-	git update-ref refs/remotes/origin/previous one &&
+	mkdir -p repo/inside-tracked repo/inside-untracked &&
+	>repo/file-tracked &&
+	>repo/file-untracked &&
+	>repo/inside-tracked/file &&
+	>repo/inside-untracked/file &&
+	>repo-outside/file &&
+	>repo/repo-inside/file &&
 
-	git checkout -b origin/previous two &&
-	git checkout main &&
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
+	EOF
 
-	test_must_fail git branch -r -D @{-1} &&
-	expect_branch refs/remotes/origin/previous one &&
-	expect_branch refs/heads/origin/previous two
+	cat >expect-untracked-unsorted <<-EOF &&
+	repo/file-untracked
+	repo/inside-untracked/file
+	repo/repo-inside/
+	repo-outside/
+	EOF
 
-Switched to a new branch 'origin/previous'
-Switched to branch 'main'
-Your branch is up to date with 'remotes/origin/remote-del'.
-error: remote-tracking branch '@{-1}' not found
-ok 11 - disallow deleting remote branch via @{-1}
+	cat >expect-all-dir-unsorted <<-EOF &&
+	repo/
+	repo-outside/
+	EOF
 
-expecting success of 3204.12 'create branch named "@"': 
-	git branch -f @ one &&
-	expect_branch refs/heads/@ one
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
 
-ok 12 - create branch named "@"
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
 
-expecting success of 3204.13 'delete branch named "@"': 
-	git update-ref refs/heads/@ two &&
-	git branch -D @ &&
-	expect_deleted refs/heads/@
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test2/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test2/repo-outside/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test2/repo/repo-inside/.git/
+ok 6 - 2a: setup--set git-dir
 
-Deleted branch @ (was 139b20d).
-fatal: Needed a single revision
-ok 13 - delete branch named "@"
+expecting success of 2205.7 '2b: pre-add all': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-all-unsorted &&
+	sort actual-all-unsorted >actual-all &&
+	sort expect-all-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
 
-expecting success of 3204.14 'checkout does not treat remote @{upstream} as a branch': 
-	git update-ref refs/remotes/origin/checkout one &&
-	git branch --set-upstream-to=origin/checkout &&
-	git update-ref refs/heads/origin/checkout two &&
-	git update-ref refs/heads/remotes/origin/checkout two &&
+ok 7 - 2b: pre-add all
 
-	git checkout @{upstream} &&
-	expect_branch HEAD one
+expecting success of 2205.8 '2c: pre-add dir all': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --directory --exclude-standard >actual-all-dir-unsorted &&
+	sort actual-all-dir-unsorted >actual-all &&
+	sort expect-all-dir-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
 
-branch 'main' set up to track 'origin/checkout'.
-warning: refname '@{upstream}' is ambiguous.
-Note: switching to '@{upstream}'.
+ok 8 - 2c: pre-add dir all
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 2205.9 '2d: post-add tracked': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git add repo/file-tracked &&
+	git --git-dir=repo/.git add repo/inside-tracked &&
+	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 9 - 2d: post-add tracked
 
-  git switch -c <new-branch-name>
+expecting success of 2205.10 '2e: post-add untracked': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-untracked-unsorted &&
+	sort actual-untracked-unsorted >actual-untracked &&
+	sort expect-untracked-unsorted >expect-untracked &&
+	test_cmp expect-untracked actual-untracked
+	)
 
-Or undo this operation with:
+ok 10 - 2e: post-add untracked
 
-  git switch -
+expecting success of 2205.11 '3a: setup--add repo dir': 
+	mkdir test3 &&
+	(
+	cd test3 &&
+	test_create_repo repo &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	mkdir -p repo/inside-tracked repo/inside-ignored &&
+	>repo/file-tracked &&
+	>repo/file-ignored &&
+	>repo/inside-tracked/file &&
+	>repo/inside-ignored/file &&
 
-HEAD is now at d79ce16 one
-ok 14 - checkout does not treat remote @{upstream} as a branch
+	cat >.gitignore <<-EOF &&
+	.gitignore
+	actual-*
+	expect-*
+	*ignored
+	EOF
 
-expecting success of 3204.15 'edit-description via @{-1}': 
-	git checkout -b desc-branch &&
-	git checkout -b non-desc-branch &&
-	write_script editor <<-\EOF &&
-		echo "Branch description" >"$1"
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
 	EOF
-	EDITOR=./editor git branch --edit-description @{-1} &&
-	test_must_fail git config branch.non-desc-branch.description &&
-	git config branch.desc-branch.description >actual &&
-	printf "Branch description\n\n" >expect &&
-	test_cmp expect actual
 
-Switched to a new branch 'desc-branch'
-Switched to a new branch 'non-desc-branch'
-ok 15 - edit-description via @{-1}
+	cat >expect-ignored-unsorted <<-EOF
+	repo/file-ignored
+	repo/inside-ignored/
+	.gitignore
+	actual-ignored-unsorted
+	expect-ignored-unsorted
+	expect-tracked-unsorted
+	EOF
+	)
 
-expecting success of 3204.16 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"': 
-	git checkout -b upstream-branch &&
-	git checkout -b upstream-other -t upstream-branch &&
-	git branch --set-upstream-to upstream-other @{-1} &&
-	git config branch.upstream-branch.merge >actual &&
-	echo "refs/heads/upstream-other" >expect &&
-	test_cmp expect actual &&
-	git branch --unset-upstream @{-1}@{upstream} &&
-	test_must_fail git config branch.upstream-other.merge
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2205-add-worktree-config/test3/repo/.git/
+ok 11 - 3a: setup--add repo dir
 
-Switched to a new branch 'upstream-branch'
-Switched to a new branch 'upstream-other'
-branch 'upstream-other' set up to track 'upstream-branch'.
-branch 'upstream-branch' set up to track 'upstream-other'.
-ok 16 - modify branch upstream via "@{-1}" and "@{-1}@{upstream}"
+expecting success of 2205.12 '3b: ignored': 
+	(
+	cd test3 &&
+	git --git-dir=repo/.git ls-files -io --directory --exclude-standard >actual-ignored-unsorted &&
+	sort actual-ignored-unsorted >actual-ignored &&
+	sort expect-ignored-unsorted >expect-ignored &&
+	test_cmp expect-ignored actual-ignored
+	)
 
-# passed all 16 test(s)
-1..16
+ok 12 - 3b: ignored
+
+expecting success of 2205.13 '3c: add repo': 
+	(
+	cd test3 &&
+	git --git-dir=repo/.git add repo &&
+	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
+
+ok 13 - 3c: add repo
+
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3211-peel-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3211-peel-ref/.git/
-expecting success of 3211.1 'create annotated tag in refs/tags': 
-	test_commit base &&
-	git tag -m annotated foo
+*** t2204-add-ignored.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2204-add-ignored/.git/
+expecting success of 2204.1 'setup': 
+	mkdir sub dir dir/sub &&
+	echo sub >.gitignore &&
+	echo ign >>.gitignore &&
+	for p in . sub dir dir/sub
+	do
+		>"$p/ign" &&
+		>"$p/file" || exit 1
+	done
 
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 1 - create annotated tag in refs/tags
+ok 1 - setup
 
-expecting success of 3211.2 'create annotated tag outside of refs/tags': 
-	git update-ref refs/outside/foo refs/tags/foo
+expecting success of 2204.2 'no complaints for unignored file': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 2 - no complaints for unignored file
 
-ok 2 - create annotated tag outside of refs/tags
+expecting success of 2204.3 'no complaints for unignored dir/file': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 3 - no complaints for unignored dir/file
 
-expecting success of 3211.3 'set up expected show-ref output': 
-	{
-		print_ref "refs/heads/main" &&
-		print_ref "refs/outside/foo" &&
-		print_ref "refs/outside/foo^{}" &&
-		print_ref "refs/tags/base" &&
-		print_ref "refs/tags/foo" &&
-		print_ref "refs/tags/foo^{}"
-	} >expect
+expecting success of 2204.4 'no complaints for unignored dir': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 4 - no complaints for unignored dir
 
-ok 3 - set up expected show-ref output
+expecting success of 2204.5 'no complaints for unignored d*': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 5 - no complaints for unignored d*
 
-expecting success of 3211.4 'refs are peeled outside of refs/tags (loose)': 
-	git show-ref -d >actual &&
-	test_cmp expect actual
+expecting success of 2204.6 'complaints for ignored ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 6 - complaints for ignored ign
 
-ok 4 - refs are peeled outside of refs/tags (loose)
+expecting success of 2204.7 'complaints for ignored ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 7 - complaints for ignored ign output
 
-expecting success of 3211.5 'refs are peeled outside of refs/tags (packed)': 
-	git pack-refs --all &&
-	git show-ref -d >actual &&
-	test_cmp expect actual
+expecting success of 2204.8 'complaints for ignored ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 8 - complaints for ignored ign with unignored file
 
-ok 5 - refs are peeled outside of refs/tags (packed)
+expecting success of 2204.9 'complaints for ignored ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 9 - complaints for ignored ign with unignored file output
 
-expecting success of 3211.6 'create old-style pack-refs without fully-peeled': 
-	# Git no longer writes without fully-peeled, so we just write our own
-	# from scratch; we could also munge the existing file to remove the
-	# fully-peeled bits, but that seems even more prone to failure,
-	# especially if the format ever changes again. At least this way we
-	# know we are emulating exactly what an older git would have written.
-	{
-		echo "# pack-refs with: peeled " &&
-		print_ref "refs/heads/main" &&
-		print_ref "refs/outside/foo" &&
-		print_ref "refs/tags/base" &&
-		print_ref "refs/tags/foo" &&
-		echo "^$(git rev-parse "refs/tags/foo^{}")"
-	} >tmp &&
-	mv tmp .git/packed-refs
+expecting success of 2204.10 'complaints for ignored dir/ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 10 - complaints for ignored dir/ign
 
-ok 6 - create old-style pack-refs without fully-peeled
+expecting success of 2204.11 'complaints for ignored dir/ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 11 - complaints for ignored dir/ign output
 
-expecting success of 3211.7 'refs are peeled outside of refs/tags (old packed)': 
-	git show-ref -d >actual &&
-	test_cmp expect actual
+expecting success of 2204.12 'complaints for ignored dir/ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 12 - complaints for ignored dir/ign with unignored file
 
-ok 7 - refs are peeled outside of refs/tags (old packed)
+expecting success of 2204.13 'complaints for ignored dir/ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 13 - complaints for ignored dir/ign with unignored file output
 
-expecting success of 3211.8 'peeled refs survive deletion of packed ref': 
-	git pack-refs --all &&
-	cp .git/packed-refs fully-peeled &&
-	git branch yadda &&
-	git pack-refs --all &&
-	git branch -d yadda &&
-	test_cmp fully-peeled .git/packed-refs
+expecting success of 2204.14 'complaints for ignored dir/sub': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 14 - complaints for ignored dir/sub
 
-Deleted branch yadda (was d1ff1c9).
-ok 8 - peeled refs survive deletion of packed ref
+expecting success of 2204.15 'complaints for ignored dir/sub output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 15 - complaints for ignored dir/sub output
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3203-branch-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3203-branch-output/.git/
-expecting success of 3203.1 'make commits': 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	git branch -M main &&
-	echo content >>file &&
-	git commit -a -m two
+expecting success of 2204.16 'complaints for ignored dir/sub with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 16 - complaints for ignored dir/sub with unignored file
 
-[master (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(+)
-ok 1 - make commits
+expecting success of 2204.17 'complaints for ignored dir/sub with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 17 - complaints for ignored dir/sub with unignored file output
 
-expecting success of 3203.2 'make branches': 
-	git branch branch-one &&
-	git branch branch-two HEAD^
+expecting success of 2204.18 'complaints for ignored dir/sub/ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 18 - complaints for ignored dir/sub/ign
 
-ok 2 - make branches
+expecting success of 2204.19 'complaints for ignored dir/sub/ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 19 - complaints for ignored dir/sub/ign output
 
-expecting success of 3203.3 'make remote branches': 
-	git update-ref refs/remotes/origin/branch-one branch-one &&
-	git update-ref refs/remotes/origin/branch-two branch-two &&
-	git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/branch-one
+expecting success of 2204.20 'complaints for ignored dir/sub/ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 20 - complaints for ignored dir/sub/ign with unignored file
 
-ok 3 - make remote branches
+expecting success of 2204.21 'complaints for ignored dir/sub/ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 21 - complaints for ignored dir/sub/ign with unignored file output
 
-expecting success of 3203.4 'git branch shows local branches': 
-	git branch >actual &&
-	test_cmp expect actual
+expecting success of 2204.22 'complaints for ignored sub/file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 22 - complaints for ignored sub/file
 
-ok 4 - git branch shows local branches
+expecting success of 2204.23 'complaints for ignored sub/file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 23 - complaints for ignored sub/file output
 
-expecting success of 3203.5 'git branch --list shows local branches': 
-	git branch --list >actual &&
-	test_cmp expect actual
+expecting success of 2204.24 'complaints for ignored sub/file with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 24 - complaints for ignored sub/file with unignored file
 
-ok 5 - git branch --list shows local branches
+expecting success of 2204.25 'complaints for ignored sub/file with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 25 - complaints for ignored sub/file with unignored file output
 
-expecting success of 3203.6 'git branch --list pattern shows matching local branches': 
-	git branch --list branch* >actual &&
-	test_cmp expect actual
+expecting success of 2204.26 'complaints for ignored sub': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 26 - complaints for ignored sub
 
-ok 6 - git branch --list pattern shows matching local branches
+expecting success of 2204.27 'complaints for ignored sub output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 27 - complaints for ignored sub output
 
-expecting success of 3203.7 'git branch -r shows remote branches': 
-	git branch -r >actual &&
-	test_cmp expect actual &&
+expecting success of 2204.28 'complaints for ignored sub with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 28 - complaints for ignored sub with unignored file
 
-	git branch --remotes >actual &&
-	test_cmp expect actual
+expecting success of 2204.29 'complaints for ignored sub with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 29 - complaints for ignored sub with unignored file output
 
-ok 7 - git branch -r shows remote branches
+expecting success of 2204.30 'complaints for ignored sub/file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 30 - complaints for ignored sub/file
 
-expecting success of 3203.8 'git branch --no-remotes is rejected': 
-	test_must_fail git branch --no-remotes 2>err &&
-	grep "unknown option .no-remotes." err
+expecting success of 2204.31 'complaints for ignored sub/file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 31 - complaints for ignored sub/file output
 
-error: unknown option `no-remotes'
-ok 8 - git branch --no-remotes is rejected
+expecting success of 2204.32 'complaints for ignored sub/file with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 32 - complaints for ignored sub/file with unignored file
 
-expecting success of 3203.9 'git branch -a shows local and remote branches': 
-	git branch -a >actual &&
-	test_cmp expect actual &&
+expecting success of 2204.33 'complaints for ignored sub/file with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 33 - complaints for ignored sub/file with unignored file output
 
-	git branch --all >actual &&
-	test_cmp expect actual
+expecting success of 2204.34 'complaints for ignored sub/ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 34 - complaints for ignored sub/ign
 
-ok 9 - git branch -a shows local and remote branches
+expecting success of 2204.35 'complaints for ignored sub/ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 35 - complaints for ignored sub/ign output
 
-expecting success of 3203.10 'git branch --no-all is rejected': 
-	test_must_fail git branch --no-all 2>err &&
-	grep "unknown option .no-all." err
+expecting success of 2204.36 'complaints for ignored sub/ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 36 - complaints for ignored sub/ign with unignored file
 
-error: unknown option `no-all'
-ok 10 - git branch --no-all is rejected
+expecting success of 2204.37 'complaints for ignored sub/ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 37 - complaints for ignored sub/ign with unignored file output
 
-expecting success of 3203.11 'git branch -v shows branch summaries': 
-	git branch -v >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
+expecting success of 2204.38 'complaints for ignored sub in dir': 
+		rm -f .git/index &&
+		(
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 38 - complaints for ignored sub in dir
 
-ok 11 - git branch -v shows branch summaries
+expecting success of 2204.39 'complaints for ignored sub in dir output': 
+		(
+			cd dir &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 39 - complaints for ignored sub in dir output
 
-expecting success of 3203.12 'git branch --list -v pattern shows branch summaries': 
-	git branch --list -v branch* >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
+expecting success of 2204.40 'complaints for ignored sub/file in dir': 
+		rm -f .git/index &&
+		(
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 40 - complaints for ignored sub/file in dir
 
-ok 12 - git branch --list -v pattern shows branch summaries
+expecting success of 2204.41 'complaints for ignored sub/file in dir output': 
+		(
+			cd dir &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 41 - complaints for ignored sub/file in dir output
 
-expecting success of 3203.13 'git branch --ignore-case --list -v pattern shows branch summaries': 
-	git branch --list --ignore-case -v BRANCH* >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
+expecting success of 2204.42 'complaints for ignored sub/ign in dir': 
+		rm -f .git/index &&
+		(
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 42 - complaints for ignored sub/ign in dir
 
-ok 13 - git branch --ignore-case --list -v pattern shows branch summaries
+expecting success of 2204.43 'complaints for ignored sub/ign in dir output': 
+		(
+			cd dir &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 43 - complaints for ignored sub/ign in dir output
 
-expecting success of 3203.14 'git branch -v pattern does not show branch summaries': 
-	test_must_fail git branch -v branch*
+expecting success of 2204.44 'complaints for ignored ign in sub': 
+		rm -f .git/index &&
+		(
+			cd sub &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 44 - complaints for ignored ign in sub
 
-fatal: 'branch*' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 14 - git branch -v pattern does not show branch summaries
+expecting success of 2204.45 'complaints for ignored ign in sub output': 
+		(
+			cd sub &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 45 - complaints for ignored ign in sub output
 
-expecting success of 3203.15 'git branch `--show-current` shows current branch': 
-	cat >expect <<-\EOF &&
-	branch-two
-	EOF
-	git checkout branch-two &&
-	git branch --show-current >actual &&
-	test_cmp expect actual
+expecting success of 2204.46 'complaints for ignored file in sub': 
+		rm -f .git/index &&
+		(
+			cd sub &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 46 - complaints for ignored file in sub
 
-Switched to branch 'branch-two'
-ok 15 - git branch `--show-current` shows current branch
+expecting success of 2204.47 'complaints for ignored file in sub output': 
+		(
+			cd sub &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 47 - complaints for ignored file in sub output
 
-expecting success of 3203.16 'git branch `--show-current` is silent when detached HEAD': 
-	git checkout HEAD^0 &&
-	git branch --show-current >actual &&
-	test_must_be_empty actual
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2300-cd-to-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Note: switching to 'HEAD^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 prerequisite: SYMLINKS
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-  git switch -c <new-branch-name>
+)
+prerequisite SYMLINKS ok
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2203-add-intent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-HEAD is now at f39a923 one
-ok 16 - git branch `--show-current` is silent when detached HEAD
+[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 3203.17 'git branch `--show-current` works properly when tag exists': 
+expecting success of 2203.2 'git status': 
+	git status --porcelain | grep -v actual >actual &&
 	cat >expect <<-\EOF &&
-	branch-and-tag-name
+	DA 1.t
+	A  elif
+	 A file
 	EOF
-	test_when_finished "
-		git checkout branch-one
-		git branch -D branch-and-tag-name
-	" &&
-	git checkout -b branch-and-tag-name &&
-	test_when_finished "git tag -d branch-and-tag-name" &&
-	git tag branch-and-tag-name &&
-	git branch --show-current >actual &&
 	test_cmp expect actual
 
-Switched to a new branch 'branch-and-tag-name'
-Deleted tag 'branch-and-tag-name' (was f39a923)
-Switched to branch 'branch-one'
-Deleted branch branch-and-tag-name (was f39a923).
-ok 17 - git branch `--show-current` works properly when tag exists
+ok 2 - git status
 
-expecting success of 3203.18 'git branch `--show-current` works properly with worktrees': 
-	cat >expect <<-\EOF &&
-	branch-one
-	branch-two
+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
-	git checkout branch-one &&
-	test_when_finished "
-		git worktree remove worktree_dir
-	" &&
-	git worktree add worktree_dir branch-two &&
-	{
-		git branch --show-current &&
-		git -C worktree_dir branch --show-current
-	} >actual &&
-	test_cmp expect actual
-
-Already on 'branch-one'
-Preparing worktree (checking out 'branch-two')
-HEAD is now at f39a923 one
-ok 18 - git branch `--show-current` works properly with worktrees
-
-expecting success of 3203.19 'git branch shows detached HEAD properly': 
-	cat >expect <<EOF &&
-* (HEAD detached at $(git rev-parse --short HEAD^0))
-  branch-one
-  branch-two
-  main
-EOF
-	git checkout HEAD^0 &&
-	git branch >actual &&
 	test_cmp expect actual
 
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-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 19 - git branch shows detached HEAD properly
+ok 3 - git status with porcelain v2
 
-expecting success of 3203.20 'git branch shows detached HEAD properly after checkout --detach': 
-	git checkout main &&
-	cat >expect <<EOF &&
-* (HEAD detached at $(git rev-parse --short HEAD^0))
-  branch-one
-  branch-two
-  main
-EOF
-	git checkout --detach &&
-	git branch >actual &&
+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
 
-Switched to branch 'main'
-HEAD is now at 5647d5f two
-ok 20 - git branch shows detached HEAD properly after checkout --detach
+ok 4 - check result of "add -N"
 
-expecting success of 3203.21 'git branch shows detached HEAD properly after moving': 
-	cat >expect <<EOF &&
-* (HEAD detached from $(git rev-parse --short HEAD))
-  branch-one
-  branch-two
-  main
-EOF
-	git reset --hard HEAD^1 &&
-	git branch >actual &&
+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
 
-HEAD is now at f39a923 one
-ok 21 - git branch shows detached HEAD properly after moving
+ok 5 - intent to add is just an ordinary empty blob
 
-expecting success of 3203.22 'git branch shows detached HEAD properly from tag': 
-	cat >expect <<EOF &&
-* (HEAD detached at fromtag)
-  branch-one
-  branch-two
-  main
-EOF
-	git tag fromtag main &&
-	git checkout fromtag &&
-	git branch >actual &&
-	test_cmp expect actual
+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
 
-Previous HEAD position was f39a923 one
-HEAD is now at 5647d5f two
-ok 22 - git branch shows detached HEAD properly from tag
+ok 6 - intent to add does not clobber existing paths
 
-expecting success of 3203.23 'git branch shows detached HEAD properly after moving from tag': 
-	cat >expect <<EOF &&
-* (HEAD detached from fromtag)
-  branch-one
-  branch-two
-  main
-EOF
-	git reset --hard HEAD^1 &&
-	git branch >actual &&
-	test_cmp expect actual
+expecting success of 2203.7 'i-t-a entry is simply ignored': 
+	test_tick &&
+	git commit -a -m initial &&
+	git reset --hard &&
 
-HEAD is now at f39a923 one
-ok 23 - git branch shows detached HEAD properly after moving from tag
+	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
 
-expecting success of 3203.24 'git branch `--sort=[-]objectsize` option': 
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  branch-two
-	  branch-one
-	  main
-	EOF
-	git branch --sort=objectsize >actual &&
-	test_cmp expect actual &&
+[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
 
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  branch-one
-	  main
-	  branch-two
-	EOF
-	git branch --sort=-objectsize >actual &&
-	test_cmp expect actual
+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
 
-ok 24 - git branch `--sort=[-]objectsize` option
+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 3203.25 'git branch `--sort=[-]type` option': 
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  branch-one
-	  branch-two
-	  main
-	EOF
-	git branch --sort=type >actual &&
-	test_cmp expect actual &&
+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
 
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  branch-one
-	  branch-two
-	  main
-	EOF
-	git branch --sort=-type >actual &&
-	test_cmp expect actual
+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
 
-ok 25 - git branch `--sort=[-]type` option
+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 &&
 
-expecting success of 3203.26 'git branch `--sort=[-]version:refname` option': 
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  branch-one
-	  branch-two
-	  main
-	EOF
-	git branch --sort=version:refname >actual &&
+	: >dir/bar &&
+	git add -N dir/bar &&
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
 	test_cmp expect actual &&
 
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  main
-	  branch-two
-	  branch-one
-	EOF
-	git branch --sort=-version:refname >actual &&
-	test_cmp expect actual
-
-ok 26 - git branch `--sort=[-]version:refname` option
-
-expecting success of 3203.27 'git branch --points-at option': 
-	cat >expect <<-\EOF &&
-	  branch-one
-	  main
-	EOF
-	git branch --points-at=branch-one >actual &&
-	test_cmp expect actual
-
-ok 27 - git branch --points-at option
-
-expecting success of 3203.28 'ambiguous branch/tag not marked': 
-	git tag ambiguous &&
-	git branch ambiguous &&
-	echo "  ambiguous" >expect &&
-	git branch --list ambiguous >actual &&
-	test_cmp expect actual
-
-ok 28 - ambiguous branch/tag not marked
+	git write-tree >/dev/null &&
 
-expecting success of 3203.29 'local-branch symrefs shortened properly': 
-	git symbolic-ref refs/heads/ref-to-branch refs/heads/branch-one &&
-	git symbolic-ref refs/heads/ref-to-remote refs/remotes/origin/branch-one &&
-	cat >expect <<-\EOF &&
-	  ref-to-branch -> branch-one
-	  ref-to-remote -> origin/branch-one
-	EOF
-	git branch >actual.raw &&
-	grep ref-to <actual.raw >actual &&
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
 	test_cmp expect actual
 
-ok 29 - local-branch symrefs shortened properly
+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 3203.30 'sort branches, ignore case': 
+expecting success of 2203.11 'cache-tree does not ignore dir that has i-t-a entries': 
+	git init ita-in-dir &&
 	(
-		git init -b main sort-icase &&
-		cd sort-icase &&
-		test_commit initial &&
-		git branch branch-one &&
-		git branch BRANCH-two &&
-		git branch --list | awk "{print \$NF}" >actual &&
-		cat >expected <<-\EOF &&
-		BRANCH-two
-		branch-one
-		main
-		EOF
-		test_cmp expected actual &&
-		git branch --list -i | awk "{print \$NF}" >actual &&
-		cat >expected <<-\EOF &&
-		branch-one
-		BRANCH-two
-		main
-		EOF
-		test_cmp expected actual
+		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.48.0~rc1+next.20250101/t/trash directory.t3203-branch-output/sort-icase/.git/
-[main (root-commit) 24b24cf] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+[master (root-commit) 7b0eb4f] committed
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 30 - sort branches, ignore case
+ 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 3203.31 'git branch --format option': 
-	cat >expect <<-\EOF &&
-	Refname is (HEAD detached from fromtag)
-	Refname is refs/heads/ambiguous
-	Refname is refs/heads/branch-one
-	Refname is refs/heads/branch-two
-	Refname is refs/heads/main
-	Refname is refs/heads/ref-to-branch
-	Refname is refs/heads/ref-to-remote
-	EOF
-	git branch --format="Refname is %(refname)" >actual &&
-	test_cmp expect actual
+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
+	)
 
-ok 31 - git branch --format option
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+ok 12 - cache-tree does skip dir that becomes empty
 
-expecting success of 3203.32 'git branch --format with ahead-behind': 
-	cat >expect <<-\EOF &&
-	(HEAD detached from fromtag) 0 0
-	refs/heads/ambiguous 0 0
-	refs/heads/branch-one 1 0
-	refs/heads/branch-two 0 0
-	refs/heads/main 1 0
-	refs/heads/ref-to-branch 1 0
-	refs/heads/ref-to-remote 1 0
-	EOF
-	git branch --format="%(refname) %(ahead-behind:HEAD)" >actual &&
-	test_cmp expect actual
+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
+	)
 
-ok 32 - git branch --format with ahead-behind
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
+On branch master
 
-expecting success of 3203.33 'git branch with --format=%(rest) must fail': 
-	test_must_fail git branch --format="%(rest)" >actual
+Initial commit
 
-fatal: this command reject atom %(rest)
-ok 33 - git branch with --format=%(rest) must fail
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	new file:   one
 
-expecting success of 3203.34 'git branch --format --omit-empty': 
-	cat >expect <<-\EOF &&
-	Refname is (HEAD detached from fromtag)
-	Refname is refs/heads/ambiguous
-	Refname is refs/heads/branch-one
-	Refname is refs/heads/branch-two
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 13 - commit: ita entries ignored in empty initial commit check
 
-	Refname is refs/heads/ref-to-branch
-	Refname is refs/heads/ref-to-remote
-	EOF
-	git branch --format="%(if:notequals=refs/heads/main)%(refname)%(then)Refname is %(refname)%(end)" >actual &&
-	test_cmp expect actual &&
-	cat >expect <<-\EOF &&
-	Refname is (HEAD detached from fromtag)
-	Refname is refs/heads/ambiguous
-	Refname is refs/heads/branch-one
-	Refname is refs/heads/branch-two
-	Refname is refs/heads/ref-to-branch
-	Refname is refs/heads/ref-to-remote
-	EOF
-	git branch --omit-empty --format="%(if:notequals=refs/heads/main)%(refname)%(then)Refname is %(refname)%(end)" >actual &&
-	test_cmp expect actual
+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
+	)
 
-ok 34 - git branch --format --omit-empty
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
+[master (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	new file:   two
 
-expecting success of 3203.35 'worktree colors correct': 
-	cat >expect <<-EOF &&
-	* <GREEN>(HEAD detached from fromtag)<RESET>
-	  ambiguous<RESET>
-	  branch-one<RESET>
-	+ <CYAN>branch-two<RESET>
-	  main<RESET>
-	  ref-to-branch<RESET> -> branch-one
-	  ref-to-remote<RESET> -> origin/branch-one
-	EOF
-	git worktree add worktree_dir branch-two &&
-	git branch --color >actual.raw &&
-	rm -r worktree_dir &&
-	git worktree prune &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 14 - commit: ita entries ignored in empty commit check
 
-Preparing worktree (checking out 'branch-two')
-HEAD is now at f39a923 one
-ok 35 - worktree colors correct
+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 &&
 
-expecting success of 3203.36 'set up color tests': 
-	echo "<RED>main<RESET>" >expect.color &&
-	echo "main" >expect.bare &&
-	color_args="--format=%(color:red)%(refname:short) --list main"
+		git status | grep -v "^?" >actual.1 &&
+		test_grep "renamed: *first -> third" actual.1 &&
 
-ok 36 - set up color tests
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		 R first -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
 
-expecting success of 3203.37 '%(color) omitted without tty': 
-	TERM=vt100 git branch $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.bare actual
+		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 &&
 
-ok 37 - %(color) omitted without tty
+		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 &&
 
-checking prerequisite: TTY
+		git diff --cached --stat >actual.5 &&
+		test_must_be_empty actual.5
 
-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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+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 &&
 
-)
-prerequisite TTY ok
-expecting success of 3203.38 '%(color) present with tty': 
-	test_terminal git branch $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+		git status | grep -v "^?" >actual.1 &&
+		test_grep "renamed: *first -> second" actual.1 &&
+		test_grep "renamed: *second -> third" actual.1 &&
 
-ok 38 - %(color) present with tty
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		R  first -> second
+		 R second -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
 
-expecting success of 3203.39 '--color overrides auto-color': 
-	git branch --color $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+		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
+	)
 
-ok 39 - --color overrides auto-color
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3203.40 'verbose output lists worktree path': 
-	one=$(git rev-parse --short HEAD) &&
-	two=$(git rev-parse --short main) &&
-	cat >expect <<-EOF &&
-	* (HEAD detached from fromtag) $one one
-	  ambiguous                    $one one
-	  branch-one                   $two two
-	+ branch-two                   $one ($(pwd)/worktree_dir) one
-	  main                         $two two
-	  ref-to-branch                $two two
-	  ref-to-remote                $two two
-	EOF
-	git worktree add worktree_dir branch-two &&
-	git branch -vv >actual &&
-	rm -r worktree_dir &&
-	git worktree prune &&
-	test_cmp expect actual
+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 &&
 
-Preparing worktree (checking out 'branch-two')
-HEAD is now at f39a923 one
-ok 40 - verbose output lists worktree path
+	hash_e=$(git hash-object empty) &&
+	hash_n=$(git hash-object not-empty) &&
 
-# passed all 40 test(s)
-1..40
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3202-show-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3202-show-branch/.git/
-expecting success of 3202.1 'error descriptions on empty repository': 
-	current=$(git branch --show-current) &&
-	cat >expect <<-EOF &&
-	error: no commit on branch '$current' yet
+	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
-	test_must_fail git branch --edit-description 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch --edit-description $current 2>actual &&
-	test_cmp expect actual
-
-ok 1 - error descriptions on empty repository
-
-expecting success of 3202.2 'fatal descriptions on empty repository': 
-	current=$(git branch --show-current) &&
-	cat >expect <<-EOF &&
-	fatal: no commit on branch '$current' yet
+	cat >expect.diff_s <<-EOF &&
+	 create mode 100644 empty
+	 create mode 100644 not-empty
 	EOF
-	test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch -c new-branch 2>actual &&
-	test_cmp expect actual
-
-ok 2 - fatal descriptions on empty repository
-
-expecting success of 3202.3 'setup': 
-	test_commit initial &&
-	for i in $(test_seq 1 10)
-	do
-		git checkout -b branch$i initial &&
-		test_commit --no-tag branch$i || return 1
-	done &&
-	git for-each-ref \
-		--sort=version:refname \
-		--format="%(refname:strip=2)" \
-		"refs/heads/branch*" >branches.sorted &&
-	sed "s/^> //" >expect <<-\EOF
-	> ! [branch1] branch1
-	>  ! [branch2] branch2
-	>   ! [branch3] branch3
-	>    ! [branch4] branch4
-	>     ! [branch5] branch5
-	>      ! [branch6] branch6
-	>       ! [branch7] branch7
-	>        ! [branch8] branch8
-	>         ! [branch9] branch9
-	>          * [branch10] branch10
-	> ----------
-	>          * [branch10] branch10
-	>         +  [branch9] branch9
-	>        +   [branch8] branch8
-	>       +    [branch7] branch7
-	>      +     [branch6] branch6
-	>     +      [branch5] branch5
-	>    +       [branch4] branch4
-	>   +        [branch3] branch3
-	>  +         [branch2] branch2
-	> +          [branch1] branch1
-	> +++++++++* [branch10^] initial
+	cat >expect.diff_a <<-EOF &&
+	:000000 100644 0000000 0000000 A$(printf "\t")empty
+	:000000 100644 0000000 0000000 A$(printf "\t")not-empty
 	EOF
 
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'branch1'
-[branch1 39d0a3f] branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch1.t
-Switched to a new branch 'branch2'
-[branch2 bcd9857] branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch2.t
-Switched to a new branch 'branch3'
-[branch3 6401a40] branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch3.t
-Switched to a new branch 'branch4'
-[branch4 831d58d] branch4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch4.t
-Switched to a new branch 'branch5'
-[branch5 d4d852d] branch5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch5.t
-Switched to a new branch 'branch6'
-[branch6 3af5e35] branch6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch6.t
-Switched to a new branch 'branch7'
-[branch7 0cecb11] branch7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch7.t
-Switched to a new branch 'branch8'
-[branch8 48b5688] branch8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch8.t
-Switched to a new branch 'branch9'
-[branch9 b82e556] branch9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch9.t
-Switched to a new branch 'branch10'
-[branch10 3b327e0] branch10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch10.t
-ok 3 - setup
+	git add -N empty not-empty &&
 
-expecting success of 3202.4 'show-branch with more than 8 branches': 
-	git show-branch $(cat branches.sorted) >actual &&
-	test_cmp expect actual
+	git diff >actual &&
+	test_cmp expect.diff_p actual &&
 
-ok 4 - show-branch with more than 8 branches
+	git diff --summary >actual &&
+	test_cmp expect.diff_s actual &&
 
-expecting success of 3202.5 'show-branch with showbranch.default': 
-	for branch in $(cat branches.sorted)
-	do
-		test_config showbranch.default $branch --add || return 1
-	done &&
-	git show-branch >actual &&
-	test_cmp expect actual
+	git diff-files -p >actual &&
+	test_cmp expect.diff_p actual &&
 
-ok 5 - show-branch with showbranch.default
+	git diff-files --abbrev >actual &&
+	test_cmp expect.diff_a actual &&
 
-expecting success of 3202.6 'show-branch --color output': 
-	sed "s/^> //" >expect <<-\EOF &&
-	> <RED>!<RESET> [branch1] branch1
-	>  <GREEN>!<RESET> [branch2] branch2
-	>   <YELLOW>!<RESET> [branch3] branch3
-	>    <BLUE>!<RESET> [branch4] branch4
-	>     <MAGENTA>!<RESET> [branch5] branch5
-	>      <CYAN>!<RESET> [branch6] branch6
-	>       <BOLD;RED>!<RESET> [branch7] branch7
-	>        <BOLD;GREEN>!<RESET> [branch8] branch8
-	>         <BOLD;YELLOW>!<RESET> [branch9] branch9
-	>          <BOLD;BLUE>*<RESET> [branch10] branch10
-	> ----------
-	>          <BOLD;BLUE>*<RESET> [branch10] branch10
-	>         <BOLD;YELLOW>+<RESET>  [branch9] branch9
-	>        <BOLD;GREEN>+<RESET>   [branch8] branch8
-	>       <BOLD;RED>+<RESET>    [branch7] branch7
-	>      <CYAN>+<RESET>     [branch6] branch6
-	>     <MAGENTA>+<RESET>      [branch5] branch5
-	>    <BLUE>+<RESET>       [branch4] branch4
-	>   <YELLOW>+<RESET>        [branch3] branch3
-	>  <GREEN>+<RESET>         [branch2] branch2
-	> <RED>+<RESET>          [branch1] branch1
-	> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
-	EOF
-	git show-branch --color=always $(cat branches.sorted) >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+	git diff --cached >actual &&
+	test_must_be_empty actual
 
-ok 6 - show-branch --color output
+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 3202.7 'show branch --remotes': 
-	cat >expect.err <<-\EOF &&
-	No revs to be shown.
+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
-	git show-branch -r 2>actual.err >actual.out &&
-	test_cmp expect.err actual.err &&
-	test_must_be_empty actual.out
-
-ok 7 - show branch --remotes
+	test_cmp expected actual
 
-expecting success of 3202.8 'show-branch --sparse': 
-	test_when_finished "git checkout branch10 && git branch -D branchA" &&
-	git checkout -b branchA branch10 &&
-	git merge -s ours -m "merge 1 and 10 to make A" branch1 &&
-	git commit --allow-empty -m "another" &&
+HEAD is now at 03f6a20 foo
+ok 18 - "diff HEAD" includes ita as new files
 
-	git show-branch --sparse >out &&
-	grep "merge 1 and 10 to make A" out &&
+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
 
-	git show-branch >out &&
-	! grep "merge 1 and 10 to make A" out &&
+HEAD is now at 03f6a20 foo
+new file mode 100644
+HEAD is now at 03f6a20 foo
+ok 19 - apply --intent-to-add
 
-	git show-branch --no-sparse >out &&
-	! grep "merge 1 and 10 to make A" out
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2401-worktree-prune.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2401-worktree-prune/.git/
+expecting success of 2401.1 'initialize': 
+	git commit --allow-empty -m init
 
-Switched to a new branch 'branchA'
-Merge made by the 'ours' strategy.
-[branchA 711c132] another
+[main (root-commit) 50572bf] init
  Author: A U Thor <author@example.com>
-          -  [branchA^] merge 1 and 10 to make A
-Switched to branch 'branch10'
-Deleted branch branchA (was 711c132).
-ok 8 - show-branch --sparse
+ok 1 - initialize
 
-expecting success of 3202.9 'setup show branch --list': 
-	sed "s/^> //" >expect <<-\EOF
-	>   [branch1] branch1
-	>   [branch2] branch2
-	>   [branch3] branch3
-	>   [branch4] branch4
-	>   [branch5] branch5
-	>   [branch6] branch6
-	>   [branch7] branch7
-	>   [branch8] branch8
-	>   [branch9] branch9
-	> * [branch10] branch10
-	EOF
+expecting success of 2401.2 'worktree prune on normal repo': 
+	git worktree prune &&
+	test_must_fail git worktree prune abc
 
-ok 9 - setup show branch --list
+usage: git worktree prune [-n] [-v] [--expire <expire>]
 
-expecting success of 3202.10 'show branch --list': 
-	git show-branch --list $(cat branches.sorted) >actual &&
-	test_cmp expect actual
+    -n, --[no-]dry-run    do not remove, show only
+    -v, --[no-]verbose    report pruned working trees
+    --[no-]expire <expiry-date>
+                          expire working trees older than <time>
 
-ok 10 - show branch --list
+ok 2 - worktree prune on normal repo
 
-expecting success of 3202.11 'show branch --list has no --color output': 
-	git show-branch --color=always --list $(cat branches.sorted) >actual &&
-	test_cmp expect actual
+expecting success of 2401.3 'prune files inside $GIT_DIR/worktrees': 
+	mkdir .git/worktrees &&
+	: >.git/worktrees/abc &&
+	git worktree prune --verbose 2>actual &&
+	cat >expect <<EOF &&
+Removing worktrees/abc: not a valid directory
+EOF
+	test_cmp expect actual &&
+	! test -f .git/worktrees/abc &&
+	! test -d .git/worktrees
 
-ok 11 - show branch --list has no --color output
+ok 3 - prune files inside $GIT_DIR/worktrees
 
-expecting success of 3202.12 'show branch --merge-base with one argument': 
-	for branch in $(cat branches.sorted)
-	do
-		git rev-parse $branch >expect &&
-		git show-branch --merge-base $branch >actual &&
-		test_cmp expect actual || return 1
-	done
+expecting success of 2401.4 'prune directories without gitdir': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	cat >expect <<EOF &&
+Removing worktrees/def: gitdir file does not exist
+EOF
+	git worktree prune --verbose 2>actual &&
+	test_cmp expect actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-ok 12 - show branch --merge-base with one argument
+ok 4 - prune directories without gitdir
 
-expecting success of 3202.13 'show branch --merge-base with two arguments': 
-	for branch in $(cat branches.sorted)
-	do
-		git rev-parse initial >expect &&
-		git show-branch --merge-base initial $branch >actual &&
-		test_cmp expect actual || return 1
-	done
+checking prerequisite: SANITY
 
-ok 13 - show branch --merge-base with two arguments
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 3202.14 'show branch --merge-base with N arguments': 
-	git rev-parse initial >expect &&
-	git show-branch --merge-base $(cat branches.sorted) >actual &&
-	test_cmp expect actual &&
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
 
-	git merge-base $(cat branches.sorted) >actual &&
-	test_cmp expect actual
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-ok 14 - show branch --merge-base with N arguments
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 3202.15 'show-branch --all --reflog (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-fatal: options '--reflog' and '--all/--remotes/--independent/--merge-base' cannot be used together
-ok 15 - show-branch --all --reflog (should fail)
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 2401.5 'prune directories with unreadable gitdir': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	: >.git/worktrees/def/gitdir &&
+	chmod u-r .git/worktrees/def/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-expecting success of 3202.16 'show-branch --merge-base --reflog (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
-ok 16 - show-branch --merge-base --reflog (should fail)
+Removing worktrees/def: unable to read gitdir file (Permission denied)
+ok 5 - prune directories with unreadable gitdir
 
-expecting success of 3202.17 'show-branch --list --merge-base (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
-ok 17 - show-branch --list --merge-base (should fail)
+expecting success of 2401.6 'prune directories with invalid gitdir': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	: >.git/worktrees/def/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "Removing worktrees/def: invalid gitdir file" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-expecting success of 3202.18 'show-branch --reflog --current (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-fatal: options '--reflog' and '--current' cannot be used together
-ok 18 - show-branch --reflog --current (should fail)
+Removing worktrees/def: invalid gitdir file
+ok 6 - prune directories with invalid gitdir
 
-expecting success of 3202.19 'show-branch --no-topo-order (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-topo-order'
-ok 19 - show-branch --no-topo-order (should fail)
+expecting success of 2401.7 'prune directories with gitdir pointing to nowhere': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-expecting success of 3202.20 'show-branch --no-date-order (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-date-order'
-ok 20 - show-branch --no-date-order (should fail)
+Removing worktrees/def: gitdir file points to non-existent location
+ok 7 - prune directories with gitdir pointing to nowhere
 
-expecting success of 3202.21 'show-branch --no-reflog (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-reflog'
-ok 21 - show-branch --no-reflog (should fail)
+expecting success of 2401.8 'not prune locked checkout': 
+	test_when_finished rm -r .git/worktrees &&
+	mkdir -p .git/worktrees/ghi &&
+	: >.git/worktrees/ghi/locked &&
+	git worktree prune &&
+	test -d .git/worktrees/ghi
 
-expecting success of 3202.22 'error descriptions on non-existent branch': 
-	cat >expect <<-EOF &&
-	error: no branch named 'non-existent'
-	EOF
-	test_must_fail git branch --edit-description non-existent 2>actual &&
-	test_cmp expect actual
+ok 8 - not prune locked checkout
 
-ok 22 - error descriptions on non-existent branch
+expecting success of 2401.9 'not prune recent checkouts': 
+	test_when_finished rm -r .git/worktrees &&
+	git worktree add jlm HEAD &&
+	test -d .git/worktrees/jlm &&
+	rm -rf jlm &&
+	git worktree prune --verbose --expire=2.days.ago &&
+	test -d .git/worktrees/jlm
 
-expecting success of 3202.23 'fatal descriptions on non-existent branch': 
-	cat >expect <<-EOF &&
-	fatal: branch 'non-existent' does not exist
-	EOF
-	test_must_fail git branch --set-upstream-to=non-existent non-existent 2>actual &&
-	test_cmp expect actual &&
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+ok 9 - not prune recent checkouts
 
-	cat >expect <<-EOF &&
-	fatal: no branch named 'non-existent'
-	EOF
-	test_must_fail git branch -c non-existent new-branch 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch -m non-existent new-branch 2>actual &&
-	test_cmp expect actual
+expecting success of 2401.10 'not prune proper checkouts': 
+	test_when_finished rm -r .git/worktrees &&
+	git worktree add --detach "$PWD/nop" main &&
+	git worktree prune &&
+	test -d .git/worktrees/nop
 
-ok 23 - fatal descriptions on non-existent branch
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+ok 10 - not prune proper checkouts
 
-expecting success of 3202.24 'error descriptions on orphan branch': 
-	test_when_finished git worktree remove -f wt &&
-	git worktree add wt --detach &&
-	git -C wt checkout --orphan orphan-branch &&
-	test_branch_op_in_wt() {
-		test_orphan_error() {
-			test_must_fail git $* 2>actual &&
-			test_grep "no commit on branch .orphan-branch. yet$" actual
-		} &&
-		test_orphan_error -C wt branch $1 $2 &&                # implicit branch
-		test_orphan_error -C wt branch $1 orphan-branch $2 &&  # explicit branch
-		test_orphan_error branch $1 orphan-branch $2           # different worktree
-	} &&
-	test_branch_op_in_wt --edit-description &&
-	test_branch_op_in_wt --set-upstream-to=ne &&
-	test_branch_op_in_wt -c new-branch
+expecting success of 2401.11 'prune duplicate (linked/linked)': 
+	test_when_finished rm -fr .git/worktrees w1 w2 &&
+	git worktree add --detach w1 &&
+	git worktree add --detach w2 &&
+	sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new &&
+	mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "duplicate entry" actual &&
+	test -d .git/worktrees/w1 &&
+	! test -d .git/worktrees/w2
 
-Preparing worktree (detached HEAD 3b327e0)
-HEAD is now at 3b327e0 branch10
-Switched to a new branch 'orphan-branch'
-error: no commit on branch 'orphan-branch' yet
-error: no commit on branch 'orphan-branch' yet
-error: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-ok 24 - error descriptions on orphan branch
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+Removing worktrees/w2: duplicate entry
+ok 11 - prune duplicate (linked/linked)
 
-expecting success of 3202.25 'setup reflogs': 
-	test_commit base &&
-	git checkout -b branch &&
-	test_commit one &&
-	git reset --hard HEAD^ &&
-	test_commit two &&
-	test_commit three
+expecting success of 2401.12 'prune duplicate (main/linked)': 
+	test_when_finished rm -fr repo wt &&
+	test_create_repo repo &&
+	test_commit -C repo x &&
+	git -C repo worktree add --detach ../wt &&
+	rm -fr wt &&
+	mv repo wt &&
+	git -C wt worktree prune --verbose 2>actual &&
+	test_grep "duplicate entry" actual &&
+	! test -d .git/worktrees/wt
 
-[branch10 4c99dd1] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'branch'
-[branch 6203781] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-HEAD is now at 4c99dd1 base
-[branch 9c7919e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[branch 0d1aba5] three
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2401-worktree-prune/repo/.git/
+[main (root-commit) cb85766] x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 25 - setup reflogs
-
-expecting success of 3202.26 '--reflog shows reflog entries': 
-	cat >expect <<-\EOF &&
-	! [branch@{0}] (0 seconds ago) commit: three
-	 ! [branch@{1}] (60 seconds ago) commit: two
-	  ! [branch@{2}] (2 minutes ago) reset: moving to HEAD^
-	   ! [branch@{3}] (2 minutes ago) commit: one
-	----
-	+    [branch@{0}] three
-	++   [branch@{1}] two
-	   + [branch@{3}] one
-	++++ [branch@{2}] base
-	EOF
-	# the output always contains relative timestamps; use
-	# a known time to get deterministic results
-	GIT_TEST_DATE_NOW=$test_tick \
-	git show-branch --reflog branch >actual &&
-	test_cmp expect actual
-
-ok 26 - --reflog shows reflog entries
+ create mode 100644 x.t
+Preparing worktree (detached HEAD cb85766)
+HEAD is now at cb85766 x
+Removing worktrees/wt: duplicate entry
+ok 12 - prune duplicate (main/linked)
 
-expecting success of 3202.27 '--reflog handles missing reflog': 
-	git reflog expire --expire=now branch &&
-	git show-branch --reflog branch >actual &&
-	test_must_be_empty actual
+expecting success of 2401.13 'not prune proper worktrees inside linked worktree with relative paths': 
+	test_when_finished rm -rf repo wt_ext &&
+	git init repo &&
+	(
+	    cd repo &&
+	    git config worktree.useRelativePaths true &&
+	    echo content >file &&
+	    git add file &&
+	    git commit -m msg &&
+	    git worktree add ../wt_ext &&
+	    git worktree add wt_int &&
+	    cd wt_int &&
+	    git worktree prune -v >out &&
+	    test_must_be_empty out &&
+	    cd ../../wt_ext &&
+	    git worktree prune -v >out &&
+	    test_must_be_empty out
+	)
 
-No revs to be shown.
-ok 27 - --reflog handles missing reflog
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2401-worktree-prune/repo/.git/
+[main (root-commit) b2ccb9a] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Preparing worktree (new branch 'wt_ext')
+HEAD is now at b2ccb9a msg
+Preparing worktree (new branch 'wt_int')
+HEAD is now at b2ccb9a msg
+ok 13 - not prune proper worktrees inside linked worktree with relative paths
 
-# passed all 27 test(s)
-1..27
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3300-funny-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3300-funny-names/.git/
-expecting success of 3300.1 'setup': 
-	cat >"$p0" <<-\EOF &&
-	1. A quick brown fox jumps over the lazy cat, oops dog.
-	2. A quick brown fox jumps over the lazy cat, oops dog.
-	3. A quick brown fox jumps over the lazy cat, oops dog.
-	EOF
-
-	{ cat "$p0" >"$p1" || :; } &&
-	{ echo "Foo Bar Baz" >"$p2" || :; }
+*** t2404-worktree-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2404-worktree-config/.git/
+expecting success of 2404.1 'setup': 
+	test_commit start
 
+[master (root-commit) bb4ab09] start
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 start.t
 ok 1 - setup
 
-expecting success of 3300.2 'setup: populate index and tree': 
-	git update-index --add "$p0" "$p2" &&
-	t0=$(git write-tree)
-
-ok 2 - setup: populate index and tree
-
-expecting success of 3300.3 'ls-files prints space in filename verbatim': 
-	printf "%s\n" "just space" no-funny >expected &&
-	git ls-files >current &&
-	test_cmp expected current
-
-ok 3 - ls-files prints space in filename verbatim
-
-expecting success of 3300.4 'setup: add funny filename': 
-	git update-index --add "$p1" &&
-	t1=$(git write-tree)
-
-ok 4 - setup: add funny filename
-
-expecting success of 3300.5 'ls-files quotes funny filename': 
-	cat >expected <<-\EOF &&
-	just space
-	no-funny
-	"tabs\t,\" (dq) and spaces"
-	EOF
-	git ls-files >current &&
-	test_cmp expected current
-
-ok 5 - ls-files quotes funny filename
-
-expecting success of 3300.6 'ls-files -z does not quote funny filename': 
-	cat >expected <<-\EOF &&
-	just space
-	no-funny
-	tabs	," (dq) and spaces
-	EOF
-	git ls-files -z >ls-files.z &&
-	perl -pe "y/\000/\012/" <ls-files.z >current &&
-	test_cmp expected current
-
-ok 6 - ls-files -z does not quote funny filename
-
-expecting success of 3300.7 'ls-tree quotes funny filename': 
-	cat >expected <<-\EOF &&
-	just space
-	no-funny
-	"tabs\t,\" (dq) and spaces"
-	EOF
-	git ls-tree -r $t1 >ls-tree &&
-	sed -e "s/^[^	]*	//" <ls-tree >current &&
-	test_cmp expected current
-
-ok 7 - ls-tree quotes funny filename
-
-expecting success of 3300.8 'diff-index --name-status quotes funny filename': 
-	cat >expected <<-\EOF &&
-	A	"tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-index --name-status $t0 >current &&
-	test_cmp expected current
-
-ok 8 - diff-index --name-status quotes funny filename
-
-expecting success of 3300.9 'diff-tree --name-status quotes funny filename': 
-	cat >expected <<-\EOF &&
-	A	"tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-tree --name-status $t0 $t1 >current &&
-	test_cmp expected current
-
-ok 9 - diff-tree --name-status quotes funny filename
-
-expecting success of 3300.10 'diff-index -z does not quote funny filename': 
-	cat >expected <<-\EOF &&
-	A
-	tabs	," (dq) and spaces
-	EOF
-	git diff-index -z --name-status $t0 >diff-index.z &&
-	perl -pe "y/\000/\012/" <diff-index.z >current &&
-	test_cmp expected current
-
-ok 10 - diff-index -z does not quote funny filename
-
-expecting success of 3300.11 'diff-tree -z does not quote funny filename': 
-	cat >expected <<-\EOF &&
-	A
-	tabs	," (dq) and spaces
-	EOF
-	git diff-tree -z --name-status $t0 $t1 >diff-tree.z &&
-	perl -pe y/\\000/\\012/ <diff-tree.z >current &&
-	test_cmp expected current
+expecting success of 2404.2 'config --worktree in single worktree': 
+	git config --worktree foo.bar true &&
+	test_cmp_config true foo.bar
 
-ok 11 - diff-tree -z does not quote funny filename
+ok 2 - config --worktree in single worktree
 
-expecting success of 3300.12 'diff-tree --find-copies-harder quotes funny filename': 
-	cat >expected <<-\EOF &&
-	CNUM	no-funny	"tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-tree -C --find-copies-harder --name-status $t0 $t1 >out &&
-	sed -e "s/^C[0-9]*/CNUM/" <out >current &&
-	test_cmp expected current
+expecting success of 2404.3 'add worktrees': 
+	git worktree add wt1 &&
+	git worktree add wt2
 
-ok 12 - diff-tree --find-copies-harder quotes funny filename
+Preparing worktree (new branch 'wt1')
+HEAD is now at bb4ab09 start
+Preparing worktree (new branch 'wt2')
+HEAD is now at bb4ab09 start
+ok 3 - add worktrees
 
-expecting success of 3300.13 'setup: remove unfunny index entry': 
-	git update-index --force-remove "$p0"
+expecting success of 2404.4 'config --worktree without extension': 
+	test_must_fail git config --worktree foo.bar false
 
-ok 13 - setup: remove unfunny index entry
+fatal: --worktree cannot be used with multiple working trees unless the config
+extension worktreeConfig is enabled. Please read "CONFIGURATION FILE"
+section in "git help worktree" for details
+ok 4 - config --worktree without extension
 
-expecting success of 3300.14 'diff-tree -M quotes funny filename': 
-	cat >expected <<-\EOF &&
-	RNUM	no-funny	"tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-index -M --name-status $t0 >out &&
-	sed -e "s/^R[0-9]*/RNUM/" <out >current &&
-	test_cmp expected current
+expecting success of 2404.5 'enable worktreeConfig extension': 
+	git config core.repositoryformatversion 1 &&
+	git config extensions.worktreeConfig true &&
+	test_cmp_config true extensions.worktreeConfig &&
+	test_cmp_config 1 core.repositoryformatversion
 
-ok 14 - diff-tree -M quotes funny filename
+ok 5 - enable worktreeConfig extension
 
-expecting success of 3300.15 'diff-index -M -p quotes funny filename': 
-	cat >expected <<-\EOF &&
-	diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
-	similarity index NUM%
-	rename from no-funny
-	rename to "tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-index -M -p $t0 >diff &&
-	sed -e "s/index [0-9]*%/index NUM%/" <diff >current &&
-	test_cmp expected current
+expecting success of 2404.6 'config is shared as before': 
+	git config this.is shared &&
+	test_cmp_config shared this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-ok 15 - diff-index -M -p quotes funny filename
+ok 6 - config is shared as before
 
-expecting success of 3300.16 'setup: mode change': 
-	chmod +x "$p1"
+expecting success of 2404.7 'config is shared (set from another worktree)': 
+	git -C wt1 config that.is also-shared &&
+	test_cmp_config also-shared that.is &&
+	test_cmp_config -C wt1 also-shared that.is &&
+	test_cmp_config -C wt2 also-shared that.is
 
-ok 16 - setup: mode change
+ok 7 - config is shared (set from another worktree)
 
-expecting success of 3300.17 'diff-index -M -p with mode change quotes funny filename': 
-	cat >expected <<-\EOF &&
-	diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
-	old mode 100644
-	new mode 100755
-	similarity index NUM%
-	rename from no-funny
-	rename to "tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-index -M -p $t0 >diff &&
-	sed -e "s/index [0-9]*%/index NUM%/" <diff >current &&
-	test_cmp expected current
+expecting success of 2404.8 'config private to main worktree': 
+	git config --worktree this.is for-main &&
+	test_cmp_config for-main this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-ok 17 - diff-index -M -p with mode change quotes funny filename
+ok 8 - config private to main worktree
 
-expecting success of 3300.18 'diffstat for rename quotes funny filename': 
-	cat >expected <<-\EOF &&
-	 "tabs\t,\" (dq) and spaces"
-	 1 file changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git diff-index -M -p $t0 >diff &&
-	git apply --stat <diff >diffstat &&
-	sed -e "s/|.*//" -e "s/ *\$//" <diffstat >current &&
-	test_cmp expected current
+expecting success of 2404.9 'config private to linked worktree': 
+	git -C wt1 config --worktree this.is for-wt1 &&
+	test_cmp_config for-main this.is &&
+	test_cmp_config -C wt1 for-wt1 this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-ok 18 - diffstat for rename quotes funny filename
+ok 9 - config private to linked worktree
 
-expecting success of 3300.19 'numstat for rename quotes funny filename': 
-	cat >expected <<-\EOF &&
-	0	0	"tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-index -M -p $t0 >diff &&
-	git apply --numstat <diff >current &&
-	test_cmp expected current
+expecting success of 2404.10 'core.bare no longer for main only': 
+	test_config core.bare true &&
+	test "$(git rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt2 rev-parse --is-bare-repository)" = true
 
-ok 19 - numstat for rename quotes funny filename
+ok 10 - core.bare no longer for main only
 
-expecting success of 3300.20 'numstat without -M quotes funny filename': 
-	cat >expected <<-\EOF &&
-	0	3	no-funny
-	3	0	"tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-index -p $t0 >diff &&
-	git apply --numstat <diff >current &&
-	test_cmp expected current
+expecting success of 2404.11 'per-worktree core.bare is picked up': 
+	git -C wt1 config --worktree core.bare true &&
+	test "$(git rev-parse --is-bare-repository)" = false &&
+	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt2 rev-parse --is-bare-repository)" = false
 
-ok 20 - numstat without -M quotes funny filename
+ok 11 - per-worktree core.bare is picked up
 
-expecting success of 3300.21 'numstat for non-git rename diff quotes funny filename': 
-	cat >expected <<-\EOF &&
-	0	3	no-funny
-	3	0	"tabs\t,\" (dq) and spaces"
-	EOF
-	git diff-index -p $t0 >git-diff &&
-	sed -ne "/^[-+@]/p" <git-diff >diff &&
-	git apply --numstat <diff >current &&
-	test_cmp expected current
+expecting success of 2404.12 'config.worktree no longer read without extension': 
+	git config --unset extensions.worktreeConfig &&
+	test_cmp_config shared this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-ok 21 - numstat for non-git rename diff quotes funny filename
+ok 12 - config.worktree no longer read without extension
 
-# passed all 21 test(s)
-1..21
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3302-notes-index-expensive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3302-notes-index-expensive/.git/
-expecting success of 3302.1 'setup 10': 
-		mkdir "$count" &&
-		(
-			cd "$count" &&
-			create_repo "$count"
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3302-notes-index-expensive/10/.git/
-ok 1 - setup 10
-
-expecting success of 3302.2 'notes work': 
+*** t1013-read-tree-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/.git/
+expecting success of 1013.1 'git read-tree -u -m --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
 		(
-			cd "$count" &&
-			test_notes "$count"
+			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
 		)
 	
-ok 2 - notes work
-
-checking prerequisite: USR_BIN_TIME
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
-	test -x /usr/bin/time
-
-)
-prerequisite USR_BIN_TIME not satisfied
-ok 3 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME)
-
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-ok 4 # skip setup 100 (missing EXPENSIVE)
-
-ok 5 # skip notes work (missing EXPENSIVE)
-
-ok 6 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
-
-ok 7 # skip setup 1000 (missing EXPENSIVE)
-
-ok 8 # skip notes work (missing EXPENSIVE)
-
-ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
-
-ok 10 # skip setup 10000 (missing EXPENSIVE)
-
-ok 11 # skip notes work (missing EXPENSIVE)
-
-ok 12 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3304-notes-mixed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3304-notes-mixed/.git/
-expecting success of 3304.1 'setup: create a couple of commits': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 1 - git read-tree -u -m --recurse-submodules: added submodule is checked out
 
-	test_tick &&
-	cat <<INPUT_END >input &&
-commit refs/heads/main
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-commit #1
-COMMIT
+expecting success of 1013.2 'git read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 2 - git read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir
 
-M 644 inline file
-data <<EOF
-file in commit #1
-EOF
+expecting success of 1013.3 'git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+ok 3 - git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
 
-INPUT_END
+expecting success of 1013.4 'git read-tree -u -m --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+ok 4 - git read-tree -u -m --recurse-submodules: replace directory with submodule
 
-	test_tick &&
-	cat <<INPUT_END >>input &&
-commit refs/heads/main
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-commit #2
-COMMIT
+expecting success of 1013.5 'git read-tree -u -m --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 5 - git read-tree -u -m --recurse-submodules: nested submodules are checked out
 
-M 644 inline file
-data <<EOF
-file in commit #2
-EOF
+expecting success of 1013.6 'git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+ok 6 - git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree
 
-INPUT_END
-	git fast-import --quiet <input
+expecting success of 1013.7 'git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 7 - git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory
 
-ok 1 - setup: create a couple of commits
+expecting success of 1013.8 'git read-tree -u -m --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 8 - git read-tree -u -m --recurse-submodules: replace submodule with a file
 
-expecting success of 3304.2 'create a notes tree with both notes and non-notes': 
+checking known breakage of 1013.9 'git read-tree -u -m --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m --recurse-submodules replace_sub1_with_file
+not ok 9 - git read-tree -u -m --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
 
-	commit1=$(git rev-parse refs/heads/main^) &&
-	commit2=$(git rev-parse refs/heads/main) &&
-	test_tick &&
-	cat <<INPUT_END >input &&
-commit refs/notes/commits
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-notes commit #1
-COMMIT
+expecting success of 1013.10 'git read-tree -u -m --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 10 - git read-tree -u -m --recurse-submodules: worktrees of nested submodules are removed
 
-N inline $commit1
-data <<EOF
-note for commit #1
-EOF
+expecting success of 1013.11 'git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 11 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree
 
-N inline $commit2
-data <<EOF
-note for commit #2
-EOF
+expecting success of 1013.12 'git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			test_must_fail $command invalid_sub1 2>err &&
+			test_grep sub1 err &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+ok 12 - git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails
 
-INPUT_END
-	test_tick &&
-	cat <<INPUT_END >>input &&
-commit refs/notes/commits
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-notes commit #2
-COMMIT
+expecting success of 1013.13 'git read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+fatal: ref HEAD is not a symbolic ref
+ok 13 - git read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead
 
-M 644 inline foobar/non-note.txt
-data <<EOF
-A non-note in a notes tree
-EOF
+expecting success of 1013.14 'git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			test_must_fail $command add_sub1 &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+ok 14 - git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name
 
-N inline $commit2
-data <<EOF
-edited note for commit #2
-EOF
+expecting success of 1013.15 'git read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file': 
+		test_when_finished "rm -rf submodule_update/.git/info" &&
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			mkdir .git/info &&
+			echo sub1 >.git/info/exclude &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 15 - git read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file
 
-INPUT_END
-	test_tick &&
-	cat <<INPUT_END >>input &&
-commit refs/notes/commits
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-notes commit #3
-COMMIT
+checking known breakage of 1013.16 'git read-tree -u -m --recurse-submodules: replace submodule with a directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_submodule_content sub1 origin/replace_sub1_with_directory
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+not ok 16 - git read-tree -u -m --recurse-submodules: replace submodule with a directory # TODO known breakage
 
-N inline $commit1
-data <<EOF
-edited note for commit #1
-EOF
+checking known breakage of 1013.17 'git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+not ok 17 - git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
 
-M 644 inline deadbeef
-data <<EOF
-non-note with SHA1-like name
-EOF
+expecting success of 1013.18 'git read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
+		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			rm -rf .git/modules/sub1/info &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			mkdir .git/modules/sub1/info &&
+			echo ignored >.git/modules/sub1/info/exclude &&
+			: >sub1/ignored &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 18 - git read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
 
-M 644 inline de/adbeef
-data <<EOF
-another non-note with SHA1-like name
-EOF
+expecting success of 1013.19 'git -c submodule.recurse=true read-tree -u -m: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			git -c submodule.recurse=true $cmd_args modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 19 - git -c submodule.recurse=true read-tree -u -m: modified submodule updates submodule work tree
 
-M 644 inline de/adbeefdeadbeefdeadbeefdeadbeefdeadbeef
-data <<EOF
-This is actually a valid note, albeit to a non-existing object.
-It is needed in order to trigger the "mishandling" of the dead/beef non-note.
-EOF
+expecting success of 1013.20 'git read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 20 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively
 
-M 644 inline dead/beef
-data <<EOF
-yet another non-note with SHA1-like name
-EOF
+expecting success of 1013.21 'git read-tree -u --reset --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 21 - git read-tree -u --reset --recurse-submodules: added submodule is checked out
 
-INPUT_END
-	git fast-import --quiet <input &&
-	git config core.notesRef refs/notes/commits
+expecting success of 1013.22 'git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 22 - git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir
 
-ok 2 - create a notes tree with both notes and non-notes
+expecting success of 1013.23 'git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+ok 23 - git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule
 
-expecting success of 3304.3 'verify contents of notes': 
+expecting success of 1013.24 'git read-tree -u --reset --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+ok 24 - git read-tree -u --reset --recurse-submodules: replace directory with submodule
 
-	git log | grep "^    " > actual &&
-	test_cmp expect actual
+expecting success of 1013.25 'git read-tree -u --reset --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 25 - git read-tree -u --reset --recurse-submodules: nested submodules are checked out
 
-ok 3 - verify contents of notes
+expecting success of 1013.26 'git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+ok 26 - git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree
 
-expecting success of 3304.4 'verify contents of non-notes': 
+expecting success of 1013.27 'git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 27 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
 
-	git cat-file -p refs/notes/commits:foobar/non-note.txt > actual_nn1 &&
-	test_cmp expect_nn1 actual_nn1 &&
-	git cat-file -p refs/notes/commits:deadbeef > actual_nn2 &&
-	test_cmp expect_nn2 actual_nn2 &&
-	git cat-file -p refs/notes/commits:de/adbeef > actual_nn3 &&
-	test_cmp expect_nn3 actual_nn3 &&
-	git cat-file -p refs/notes/commits:dead/beef > actual_nn4 &&
-	test_cmp expect_nn4 actual_nn4
+expecting success of 1013.28 'git read-tree -u --reset --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 28 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
 
-ok 4 - verify contents of non-notes
+checking known breakage of 1013.29 'git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u --reset --recurse-submodules replace_sub1_with_file
+not ok 29 - git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
 
-expecting success of 3304.5 'git-notes preserves non-notes': 
+expecting success of 1013.30 'git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 30 - git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed
 
-	test_tick &&
-	git notes add -f -m "foo bar"
+expecting success of 1013.31 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 31 - git read-tree -u --reset --recurse-submodules: modified submodule updates submodule work tree
 
-Overwriting existing notes for object 5f8b8322f6a2c6d36eb6d42312d2393900ab7b81
-ok 5 - git-notes preserves non-notes
+expecting success of 1013.32 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+ok 32 - git read-tree -u --reset --recurse-submodules: updating to a missing submodule commit fails
 
-expecting success of 3304.6 'verify contents of non-notes after git-notes': 
+expecting success of 1013.33 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+fatal: ref HEAD is not a symbolic ref
+ok 33 - git read-tree -u --reset --recurse-submodules: submodule branch is not changed, detach HEAD instead
 
-	git cat-file -p refs/notes/commits:foobar/non-note.txt > actual_nn1 &&
-	test_cmp expect_nn1 actual_nn1 &&
-	git cat-file -p refs/notes/commits:deadbeef > actual_nn2 &&
-	test_cmp expect_nn2 actual_nn2 &&
-	git cat-file -p refs/notes/commits:de/adbeef > actual_nn3 &&
-	test_cmp expect_nn3 actual_nn3 &&
-	git cat-file -p refs/notes/commits:dead/beef > actual_nn4 &&
-	test_cmp expect_nn4 actual_nn4
+expecting success of 1013.34 'git read-tree -u --reset --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'.
+ok 34 - git read-tree -u --reset --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
 
-ok 6 - verify contents of non-notes after git-notes
+expecting success of 1013.35 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+ok 35 - git read-tree -u --reset --recurse-submodules: replace submodule with a directory
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3206-range-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3206-range-diff/.git/
-expecting success of 3206.1 'setup': 
-	git fast-import <"$TEST_DIRECTORY"/t3206/history.export &&
-	test_oid_cache <<-\EOF
-	# topic
-	t1 sha1:4de457d
-	t2 sha1:fccce22
-	t3 sha1:147e64e
-	t4 sha1:a63e992
-	t1 sha256:b89f8b9
-	t2 sha256:5f12aad
-	t3 sha256:ea8b273
-	t4 sha256:14b7336
+expecting success of 1013.36 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 36 - git read-tree -u --reset --recurse-submodules: replace submodule containing a .git directory with a directory must fail
 
-	# unmodified
-	u1 sha1:35b9b25
-	u2 sha1:de345ab
-	u3 sha1:9af6654
-	u4 sha1:2901f77
-	u1 sha256:e3731be
-	u2 sha256:14fadf8
-	u3 sha256:736c4bc
-	u4 sha256:673e77d
+expecting success of 1013.37 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 37 - git read-tree -u --reset --recurse-submodules: replace submodule with a file ignoring ignored files
 
-	# topic (abbrev=10)
-	t1_abbrev sha1:4de457d2c0
-	t2_abbrev sha1:fccce22f8c
-	t3_abbrev sha1:147e64ef53
-	t4_abbrev sha1:a63e992599
-	t1_abbrev sha256:b89f8b9092
-	t2_abbrev sha256:5f12aadf34
-	t3_abbrev sha256:ea8b273a6c
-	t4_abbrev sha256:14b73361fc
+expecting success of 1013.38 'git read-tree -u --reset --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'.
+ok 38 - git read-tree -u --reset --recurse-submodules: modified submodule does update submodule work tree from invalid commit
 
-	# unmodified (abbrev=10)
-	u1_abbrev sha1:35b9b25f76
-	u2_abbrev sha1:de345ab3de
-	u3_abbrev sha1:9af6654000
-	u4_abbrev sha1:2901f773f3
-	u1_abbrev sha256:e3731be242
-	u2_abbrev sha256:14fadf8cee
-	u3_abbrev sha256:736c4bcb44
-	u4_abbrev sha256:673e77d589
+expecting success of 1013.39 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 39 - git read-tree -u --reset --recurse-submodules: updating submodules fixes .git links
 
-	# reordered
-	r1 sha1:aca177a
-	r2 sha1:14ad629
-	r3 sha1:ee58208
-	r4 sha1:307b27a
-	r1 sha256:f59d3aa
-	r2 sha256:fb261a8
-	r3 sha256:cb2649b
-	r4 sha256:958577e
+expecting success of 1013.40 'git read-tree -u --reset --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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 40 - git read-tree -u --reset --recurse-submodules: changed submodule worktree is reset
 
-	# removed (deleted)
-	d1 sha1:7657159
-	d2 sha1:43d84d3
-	d3 sha1:a740396
-	d1 sha256:e312513
-	d2 sha256:eb19258
-	d3 sha256:1ccb3c1
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
 
-	# added
-	a1 sha1:2716022
-	a2 sha1:b62accd
-	a3 sha1:df46cfa
-	a4 sha1:3e64548
-	a5 sha1:12b4063
-	a1 sha256:d724f4d
-	a2 sha256:1de7762
-	a3 sha256:e159431
-	a4 sha256:b3e483c
-	a5 sha256:90866a7
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
 
-	# rebased
-	b1 sha1:cc9c443
-	b2 sha1:c5d9641
-	b3 sha1:28cc2b6
-	b4 sha1:5628ab7
-	b5 sha1:a31b12e
-	b1 sha256:a1a8717
-	b2 sha256:20a5862
-	b3 sha256:587172a
-	b4 sha256:2721c5d
-	b5 sha256:7b57864
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
 
-	# changed
-	c1 sha1:a4b3333
-	c2 sha1:f51d370
-	c3 sha1:0559556
-	c4 sha1:d966c5c
-	c1 sha256:f8c2b9d
-	c2 sha256:3fb6318
-	c3 sha256:168ab68
-	c4 sha256:3526539
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
 
-	# changed-message
-	m1 sha1:f686024
-	m2 sha1:4ab067d
-	m3 sha1:b9cb956
-	m4 sha1:8add5f1
-	m1 sha256:31e6281
-	m2 sha256:a06bf1b
-	m3 sha256:82dc654
-	m4 sha256:48470c5
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 45 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-	# renamed
-	n1 sha1:f258d75
-	n2 sha1:017b62d
-	n3 sha1:3ce7af6
-	n4 sha1:1e6226b
-	n1 sha256:ad52114
-	n2 sha256:3b54c8f
-	n3 sha256:3b0a644
-	n4 sha256:e461653
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 46 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-	# mode change
-	o1 sha1:4d39cb3
-	o2 sha1:26c107f
-	o3 sha1:4c1e0f5
-	o1 sha256:d0dd598
-	o2 sha256:c4a279e
-	o3 sha256:78459d7
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 47 - git_test_func: replace submodule with a directory must fail
 
-	# added and removed
-	s1 sha1:096b1ba
-	s2 sha1:d92e698
-	s3 sha1:9a1db4d
-	s4 sha1:fea3b5c
-	s1 sha256:a7f9134
-	s2 sha256:b4c2580
-	s3 sha256:1d62aa2
-	s4 sha256:48160e8
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
 
-	# Empty delimiter (included so lines match neatly)
-	__ sha1:-------
-	__ sha256:-------
-	EOF
+checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           83 (        21 duplicates                  )
-      blobs  :           14 (         0 duplicates          0 deltas of         11 attempts)
-      trees  :           24 (        21 duplicates          1 deltas of         23 attempts)
-      commits:           45 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:          12 (        14 loads     )
-      marks:           1024 (        59 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            =         23
-pack_report: pack_mmap_calls          =         13
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       8521
----------------------------------------------------------------------
+checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 50 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-ok 1 - setup
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 51 - git_test_func: modified submodule does not update submodule work tree
 
-expecting success of 3206.2 'simple A..B A..C (unmodified)': 
-	git range-diff --no-color main..topic main..unmodified \
-		>actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
-	EOF
-	test_cmp expect actual
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+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
 
-ok 2 - simple A..B A..C (unmodified)
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 3206.3 'simple B...C (unmodified)': 
-	git range-diff --no-color topic...unmodified >actual &&
-	# same "expect" as above
-	test_cmp expect actual
+expecting success of 1013.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.
+ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
 
-ok 3 - simple B...C (unmodified)
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 3206.4 'simple A B C (unmodified)': 
-	git range-diff --no-color main topic unmodified >actual &&
-	# same "expect" as above
-	test_cmp expect actual
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
 
-ok 4 - simple A B C (unmodified)
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 3206.5 'simple A..B A..C (unmodified) with --abbrev': 
-	git range-diff --no-color --abbrev=10 main..topic main..unmodified \
-		>actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1_abbrev) = 1:  $(test_oid u1_abbrev) s/5/A/
-	2:  $(test_oid t2_abbrev) = 2:  $(test_oid u2_abbrev) s/4/A/
-	3:  $(test_oid t3_abbrev) = 3:  $(test_oid u3_abbrev) s/11/B/
-	4:  $(test_oid t4_abbrev) = 4:  $(test_oid u4_abbrev) s/12/B/
-	EOF
-	test_cmp expect actual
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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
 
-ok 5 - simple A..B A..C (unmodified) with --abbrev
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+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 3206.6 'A^! and A^-<n> (unmodified)': 
-	git range-diff --no-color topic^! unmodified^-1 >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t4) = 1:  $(test_oid u4) s/12/B/
-	EOF
-	test_cmp expect actual
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-ok 6 - A^! and A^-<n> (unmodified)
+checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
+not ok 61 - git_test_func: replace submodule with a directory must fail # TODO known breakage
 
-expecting success of 3206.7 'A^{/..} is not mistaken for a range': 
-	test_must_fail git range-diff topic^.. topic^{/..} -- 2>error &&
-	test_grep "not a commit range" error
+checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
+not ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
 
-fatal: not a commit range: 'topic^{/..}'
-ok 7 - A^{/..} is not mistaken for a range
+checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
+not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-expecting success of 3206.8 'trivial reordering': 
-	git range-diff --no-color main topic reordered >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid r1) s/5/A/
-	3:  $(test_oid t3) = 2:  $(test_oid r2) s/11/B/
-	4:  $(test_oid t4) = 3:  $(test_oid r3) s/12/B/
-	2:  $(test_oid t2) = 4:  $(test_oid r4) s/4/A/
-	EOF
-	test_cmp expect actual
+checking known breakage of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
+not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-ok 8 - trivial reordering
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 65 - git_test_func: modified submodule does not update submodule work tree
 
-expecting success of 3206.9 'removed a commit': 
-	git range-diff --no-color main topic removed >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid d1) s/5/A/
-	2:  $(test_oid t2) < -:  $(test_oid __) s/4/A/
-	3:  $(test_oid t3) = 2:  $(test_oid d2) s/11/B/
-	4:  $(test_oid t4) = 3:  $(test_oid d3) s/12/B/
-	EOF
-	test_cmp expect actual
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 66 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-ok 9 - removed a commit
+expecting success of 1013.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.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1013-read-tree-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 3206.10 'added a commit': 
-	git range-diff --no-color main topic added >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid a1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid a2) s/4/A/
-	-:  $(test_oid __) > 3:  $(test_oid a3) s/6/A/
-	3:  $(test_oid t3) = 4:  $(test_oid a4) s/11/B/
-	4:  $(test_oid t4) = 5:  $(test_oid a5) s/12/B/
-	EOF
-	test_cmp expect actual
+expecting success of 1013.68 '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'.
+ok 68 - git_test_func: added submodule does remove untracked unignored file with same name when forced
 
-ok 10 - added a commit
+# still have 10 known breakage(s)
+# passed all remaining 58 test(s)
+1..68
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2405-worktree-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2405-worktree-submodule/.git/
+expecting success of 2405.1 'setup: create origin repos': 
+	git config --global protocol.file.allow always &&
+	git init origin/sub &&
+	test_commit -C origin/sub file1 &&
+	git init origin/main &&
+	test_commit -C origin/main first &&
+	git -C origin/main submodule add ../sub &&
+	git -C origin/main commit -m "add sub" &&
+	test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
+	git -C origin/main/sub pull &&
+	git -C origin/main add sub &&
+	git -C origin/main commit -m "sub updated"
 
-expecting success of 3206.11 'new base, A B C': 
-	git range-diff --no-color main topic rebased >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid b1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid b2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid b3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid b4) s/12/B/
-	EOF
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
 
-ok 11 - new base, A B C
+expecting success of 2405.2 'setup: clone superproject to create main worktree': 
+	git clone --recursive "$base_path/origin/main" main
 
-expecting success of 3206.12 'new base, B...C': 
-	# this syntax includes the commits from main!
-	git range-diff --no-color topic...rebased >actual &&
-	cat >expect <<-EOF &&
-	-:  $(test_oid __) > 1:  $(test_oid b5) unrelated
-	1:  $(test_oid t1) = 2:  $(test_oid b1) s/5/A/
-	2:  $(test_oid t2) = 3:  $(test_oid b2) s/4/A/
-	3:  $(test_oid t3) = 4:  $(test_oid b3) s/11/B/
-	4:  $(test_oid t4) = 5:  $(test_oid b4) s/12/B/
-	EOF
-	test_cmp expect actual
+Cloning into 'main'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2405-worktree-submodule/main/sub'...
+done.
+Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
+ok 2 - setup: clone superproject to create main worktree
 
-ok 12 - new base, B...C
+expecting success of 2405.3 'add superproject worktree': 
+	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
 
-expecting success of 3206.13 'changed commit': 
-	git range-diff --no-color topic...changed >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
-	    @@ file: A
-	      9
-	      10
-	     -11
-	    -+B
-	    ++BB
-	      12
-	      13
-	      14
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
-	    @@ file
-	     @@ file: A
-	      9
-	      10
-	    - B
-	    + BB
-	     -12
-	     +B
-	      13
-	EOF
-	test_cmp expect actual
+Preparing worktree (detached HEAD 322c452)
+HEAD is now at 322c452 add sub
+ok 3 - add superproject worktree
 
-ok 13 - changed commit
+checking known breakage of 2405.4 'submodule is checked out just after worktree add': 
+	git -C worktree diff --submodule main"^!" >out &&
+	grep "file1 updated" out
 
-expecting success of 3206.14 'changed commit with --no-patch diff option': 
-	git range-diff --no-color --no-patch topic...changed >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
-	EOF
-	test_cmp expect actual
+not ok 4 - submodule is checked out just after worktree add # TODO known breakage
 
-ok 14 - changed commit with --no-patch diff option
+expecting success of 2405.5 'add superproject worktree and initialize submodules': 
+	git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
+	git -C worktree-submodule-update submodule update
 
-expecting success of 3206.15 'changed commit with --stat diff option': 
-	git range-diff --no-color --stat topic...changed >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
-	     a => b | 2 +-
-	     1 file changed, 1 insertion(+), 1 deletion(-)
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
-	     a => b | 2 +-
-	     1 file changed, 1 insertion(+), 1 deletion(-)
-	EOF
-	test_cmp expect actual
+Preparing worktree (detached HEAD 322c452)
+HEAD is now at 322c452 add sub
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 15 - changed commit with --stat diff option
+expecting success of 2405.6 'submodule is checked out just after submodule update in linked worktree': 
+	git -C worktree-submodule-update diff --submodule main"^!" >out &&
+	grep "file1 updated" out
 
-expecting success of 3206.16 'changed commit with sm config': 
-	git range-diff --no-color --submodule=log topic...changed >actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
-	    @@ file: A
-	      9
-	      10
-	     -11
-	    -+B
-	    ++BB
-	      12
-	      13
-	      14
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
-	    @@ file
-	     @@ file: A
-	      9
-	      10
-	    - B
-	    + BB
-	     -12
-	     +B
-	      13
-	EOF
-	test_cmp expect actual
+  > file1 updated
+ok 6 - submodule is checked out just after submodule update in linked worktree
 
-ok 16 - changed commit with sm config
+expecting success of 2405.7 'add superproject worktree and manually add submodule worktree': 
+	git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
+	git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
 
-expecting success of 3206.17 'renamed file': 
-	git range-diff --no-color --submodule=log topic...renamed-file >actual &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid n1) s/5/A/
-	2:  $(test_oid t2) ! 2:  $(test_oid n2) s/4/A/
-	    @@ Metadata
-	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
-	    Z
-	    Z ## Commit message ##
-	    -    s/4/A/
-	    +    s/4/A/ + rename file
-	    Z
-	    - ## file ##
-	    + ## file => renamed-file ##
-	    Z@@
-	    Z 1
-	    Z 2
-	3:  $(test_oid t3) ! 3:  $(test_oid n3) s/11/B/
-	    @@ Metadata
-	    Z ## Commit message ##
-	    Z    s/11/B/
-	    Z
-	    - ## file ##
-	    -@@ file: A
-	    + ## renamed-file ##
-	    +@@ renamed-file: A
-	    Z 8
-	    Z 9
-	    Z 10
-	4:  $(test_oid t4) ! 4:  $(test_oid n4) s/12/B/
-	    @@ Metadata
-	    Z ## Commit message ##
-	    Z    s/12/B/
-	    Z
-	    - ## file ##
-	    -@@ file: A
-	    + ## renamed-file ##
-	    +@@ renamed-file: A
-	    Z 9
-	    Z 10
-	    Z B
-	EOF
-	test_cmp expect actual
+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
 
-ok 17 - renamed file
+expecting success of 2405.8 'submodule is checked out after manually adding submodule worktree': 
+	git -C linked_submodule diff --submodule main"^!" >out &&
+	grep "file1 updated" out
 
-expecting success of 3206.18 'file with mode only change': 
-	git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t2) ! 1:  $(test_oid o1) s/4/A/
-	    @@ Metadata
-	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
-	    Z
-	    Z ## Commit message ##
-	    -    s/4/A/
-	    +    s/4/A/ + add other-file
-	    Z
-	    Z ## file ##
-	    Z@@
-	    @@ file
-	    Z A
-	    Z 6
-	    Z 7
-	    +
-	    + ## other-file (new) ##
-	2:  $(test_oid t3) ! 2:  $(test_oid o2) s/11/B/
-	    @@ Metadata
-	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
-	    Z
-	    Z ## Commit message ##
-	    -    s/11/B/
-	    +    s/11/B/ + mode change other-file
-	    Z
-	    Z ## file ##
-	    Z@@ file: A
-	    @@ file: A
-	    Z 12
-	    Z 13
-	    Z 14
-	    +
-	    + ## other-file (mode change 100644 => 100755) ##
-	3:  $(test_oid t4) = 3:  $(test_oid o3) s/12/B/
-	EOF
-	test_cmp expect actual
+  > file1 updated
+ok 8 - submodule is checked out after manually adding submodule worktree
 
-ok 18 - file with mode only change
+expecting success of 2405.9 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree': 
+	git -C main worktree add "$base_path/checkout-recurse" --detach  &&
+	git -C checkout-recurse submodule update --init &&
+	echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	test_cmp expect-gitfile actual-gitfile &&
+	git -C main/sub rev-parse HEAD >expect-head-main &&
+	git -C checkout-recurse checkout --recurse-submodules HEAD~1 &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	git -C main/sub rev-parse HEAD >actual-head-main &&
+	test_cmp expect-gitfile actual-gitfile &&
+	test_cmp expect-head-main actual-head-main
 
-expecting success of 3206.19 'file added and later removed': 
-	git range-diff --no-color --submodule=log topic...added-removed >actual &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid s1) s/5/A/
-	2:  $(test_oid t2) ! 2:  $(test_oid s2) s/4/A/
-	    @@ Metadata
-	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
-	    Z
-	    Z ## Commit message ##
-	    -    s/4/A/
-	    +    s/4/A/ + new-file
-	    Z
-	    Z ## file ##
-	    Z@@
-	    @@ file
-	    Z A
-	    Z 6
-	    Z 7
-	    +
-	    + ## new-file (new) ##
-	3:  $(test_oid t3) ! 3:  $(test_oid s3) s/11/B/
-	    @@ Metadata
-	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
-	    Z
-	    Z ## Commit message ##
-	    -    s/11/B/
-	    +    s/11/B/ + remove file
-	    Z
-	    Z ## file ##
-	    Z@@ file: A
-	    @@ file: A
-	    Z 12
-	    Z 13
-	    Z 14
-	    +
-	    + ## new-file (deleted) ##
-	4:  $(test_oid t4) = 4:  $(test_oid s4) s/12/B/
-	EOF
-	test_cmp expect actual
+Preparing worktree (detached HEAD d717f19)
+HEAD is now at d717f19 sub updated
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2405-worktree-submodule/checkout-recurse/sub'...
+done.
+Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
+Previous HEAD position was d717f19 sub updated
+HEAD is now at 322c452 add sub
+ok 9 - checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree
 
-ok 19 - file added and later removed
+expecting success of 2405.10 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config': 
+	echo "../../../sub" >expect-main &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main &&
+	echo "../../../../../../checkout-recurse/sub" >expect-linked &&
+	git -C checkout-recurse/sub config --get core.worktree >actual-linked &&
+	test_cmp expect-linked actual-linked &&
+	git -C checkout-recurse checkout --recurse-submodules first &&
+	test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
+	test_must_be_empty linked-config &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main
 
-expecting success of 3206.20 'no commits on one side': 
-	git commit --amend -m "new message" &&
-	git range-diff main HEAD@{1} HEAD
+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
 
-[main b4b08e4] new message
- Author: Thomas Rast <trast@inf.ethz.ch>
- Date: Mon Jul 22 11:25:27 2013 +0200
- 1 file changed, 20 deletions(-)
- delete mode 100644 file
-1:  a31b12e < -:  ------- unrelated
-ok 20 - no commits on one side
+expecting success of 2405.11 'unsetting core.worktree does not prevent running commands directly against the submodule repository': 
+	git -C main/.git/worktrees/checkout-recurse/modules/sub log
 
-expecting success of 3206.21 'changed message': 
-	git range-diff --no-color topic...changed-message >actual &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid m1) s/5/A/
-	2:  $(test_oid t2) ! 2:  $(test_oid m2) s/4/A/
-	    @@ Metadata
-	    Z ## Commit message ##
-	    Z    s/4/A/
-	    Z
-	    +    Also a silly comment here!
-	    +
-	    Z ## file ##
-	    Z@@
-	    Z 1
-	3:  $(test_oid t3) = 3:  $(test_oid m3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid m4) s/12/B/
-	EOF
-	test_cmp expect actual
+commit 69af1687b671131ed0cfa61b7fcdc907a4c21f2c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-ok 21 - changed message
+    file1
+ok 11 - unsetting core.worktree does not prevent running commands directly against the submodule repository
 
-expecting success of 3206.22 'dual-coloring': 
-	sed -e "s|^:||" >expect <<-EOF &&
-	:<YELLOW>1:  $(test_oid c1) = 1:  $(test_oid m1) s/5/A/<RESET>
-	:<RED>2:  $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2:  $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
-	:    <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
-	:      ## Commit message ##<RESET>
-	:         s/4/A/<RESET>
-	:     <RESET>
-	:    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
-	:    <REVERSE><GREEN>+<RESET>
-	:      ## file ##<RESET>
-	:    <CYAN> @@<RESET>
-	:      1<RESET>
-	:<RED>3:  $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3:  $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
-	:    <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
-	:      9<RESET>
-	:      10<RESET>
-	:    <RED> -11<RESET>
-	:    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
-	:    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
-	:      12<RESET>
-	:      13<RESET>
-	:      14<RESET>
-	:<RED>4:  $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4:  $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
-	:    <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
-	:    <CYAN> @@ file: A<RESET>
-	:      9<RESET>
-	:      10<RESET>
-	:    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
-	:    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
-	:    <RED> -12<RESET>
-	:    <GREEN> +B<RESET>
-	:      13<RESET>
+# still have 1 known breakage(s)
+# passed all remaining 10 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2403-worktree-move.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-	git range-diff changed...changed-message --color --dual-color >actual.raw &&
-	test_decode_color >actual <actual.raw &&
-	test_cmp expect actual
-
-ok 22 - dual-coloring
-
-expecting success of 3206.23 'format-patch --range-diff=topic': 
-		test_when_finished "rm -f 000?-*" &&
-		git format-patch --cover-letter --range-diff=$prev \
-			main..unmodified >actual &&
-		test_line_count = 5 actual &&
-		test_grep "^Range-diff:$" 0000-* &&
-		grep "= 1: .* s/5/A" 0000-* &&
-		grep "= 2: .* s/4/A" 0000-* &&
-		grep "= 3: .* s/11/B" 0000-* &&
-		grep "= 4: .* s/12/B" 0000-*
-	
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-ok 23 - format-patch --range-diff=topic
-
-expecting success of 3206.24 'format-patch --range-diff=main..topic': 
-		test_when_finished "rm -f 000?-*" &&
-		git format-patch --cover-letter --range-diff=$prev \
-			main..unmodified >actual &&
-		test_line_count = 5 actual &&
-		test_grep "^Range-diff:$" 0000-* &&
-		grep "= 1: .* s/5/A" 0000-* &&
-		grep "= 2: .* s/4/A" 0000-* &&
-		grep "= 3: .* s/11/B" 0000-* &&
-		grep "= 4: .* s/12/B" 0000-*
-	
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-ok 24 - format-patch --range-diff=main..topic
-
-expecting success of 3206.25 '--range-diff implies --cover-letter for multi-patch series': 
-	test_when_finished "rm -f v2-000?-*" &&
-	git format-patch -v2 --range-diff=topic main..unmodified &&
-	test_grep "^Range-diff against v1:$" v2-0000-cover-letter.patch
-
-v2-0000-cover-letter.patch
-v2-0001-s-5-A.patch
-v2-0002-s-4-A.patch
-v2-0003-s-11-B.patch
-v2-0004-s-12-B.patch
-Range-diff against v1:
-ok 25 - --range-diff implies --cover-letter for multi-patch series
-
-expecting success of 3206.26 'explicit --no-cover-letter defeats implied --cover-letter': 
-	test_when_finished "rm -f v2-000?-*" &&
-	test_must_fail git format-patch --no-cover-letter \
-		-v2 --range-diff=topic main..unmodified &&
-	test_must_fail git -c format.coverLetter=no format-patch \
-		-v2 --range-diff=topic main..unmodified
-
-fatal: --range-diff requires --cover-letter or single patch
-fatal: --range-diff requires --cover-letter or single patch
-ok 26 - explicit --no-cover-letter defeats implied --cover-letter
-
-expecting success of 3206.27 'format-patch --range-diff as commentary': 
-	test_when_finished "rm -f 0001-*" &&
-	git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
-	test_line_count = 1 actual &&
-	test_grep "^Range-diff:$" 0001-* &&
-	grep "> 1: .* new message" 0001-*
-
-Range-diff:
--:  ------- > 1:  b4b08e4 new message
-ok 27 - format-patch --range-diff as commentary
-
-expecting success of 3206.28 'format-patch --range-diff reroll-count with a non-integer': 
-	test_when_finished "rm -f v2.9-0001-*" &&
-	git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual &&
-	test_line_count = 1 actual &&
-	test_grep "^Range-diff:$" v2.9-0001-* &&
-	grep "> 1: .* new message" v2.9-0001-*
-
-Range-diff:
--:  ------- > 1:  b4b08e4 new message
-ok 28 - format-patch --range-diff reroll-count with a non-integer
-
-expecting success of 3206.29 'format-patch --range-diff reroll-count with a integer': 
-	test_when_finished "rm -f v2-0001-*" &&
-	git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual &&
-	test_line_count = 1 actual &&
-	test_grep "^Range-diff ..* v1:$" v2-0001-* &&
-	grep "> 1: .* new message" v2-0001-*
-
-Range-diff against v1:
--:  ------- > 1:  b4b08e4 new message
-ok 29 - format-patch --range-diff reroll-count with a integer
-
-expecting success of 3206.30 'format-patch --range-diff with v0': 
-	test_when_finished "rm -f v0-0001-*" &&
-	git format-patch --range-diff=HEAD~1 -v0 HEAD~1 >actual &&
-	test_line_count = 1 actual &&
-	test_grep "^Range-diff:$" v0-0001-* &&
-	grep "> 1: .* new message" v0-0001-*
-
-Range-diff:
--:  ------- > 1:  b4b08e4 new message
-ok 30 - format-patch --range-diff with v0
-
-expecting success of 3206.31 'range-diff overrides diff.noprefix internally': 
-	git -c diff.noprefix=true range-diff HEAD^...
-
--:  ------- > 1:  b4b08e4 new message
-ok 31 - range-diff overrides diff.noprefix internally
-
-expecting success of 3206.32 'basic with modified format.pretty with suffix': 
-	git -c format.pretty="format:commit %H%d%n" range-diff \
-		main..topic main..unmodified
+	test_cmp expected actual
 
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-ok 32 - basic with modified format.pretty with suffix
+[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 3206.33 'basic with modified format.pretty without "commit "': 
-	git -c format.pretty="format:%H%n" range-diff \
-		main..topic main..unmodified
+expecting success of 2403.2 'lock main worktree': 
+	test_must_fail git worktree lock .
 
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-ok 33 - basic with modified format.pretty without "commit "
+fatal: The main working tree cannot be locked or unlocked
+ok 2 - lock main worktree
 
-expecting success of 3206.34 'range-diff compares notes by default': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	git range-diff --no-color main..topic main..unmodified \
-		>actual &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
-	    @@ Commit message
-	    Z
-	    Z
-	    Z ## Notes ##
-	    -    topic note
-	    +    unmodified note
-	    Z
-	    Z ## file ##
-	    Z@@ file: A
-	EOF
-	test_cmp expect actual
+expecting success of 2403.3 'lock linked worktree': 
+	git worktree lock --reason hahaha source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-Removing note for object topic
-Removing note for object unmodified
-ok 34 - range-diff compares notes by default
+ok 3 - lock linked worktree
 
-expecting success of 3206.35 'range-diff with --no-notes': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	git range-diff --no-color --no-notes main..topic main..unmodified \
-		>actual &&
-	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
-	EOF
-	test_cmp expect actual
+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
 
-Removing note for object topic
-Removing note for object unmodified
-ok 35 - range-diff with --no-notes
+Preparing worktree (new branch 'elsewhere')
+HEAD is now at 2519212 init
+ok 4 - lock linked worktree from another worktree
 
-expecting success of 3206.36 'range-diff with multiple --notes': 
-	test_when_finished "git notes --ref=note1 remove topic unmodified || :" &&
-	git notes --ref=note1 add -m "topic note1" topic &&
-	git notes --ref=note1 add -m "unmodified note1" unmodified &&
-	test_when_finished "git notes --ref=note2 remove topic unmodified || :" &&
-	git notes --ref=note2 add -m "topic note2" topic &&
-	git notes --ref=note2 add -m "unmodified note2" unmodified &&
-	git range-diff --no-color --notes=note1 --notes=note2 main..topic main..unmodified \
-		>actual &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
-	    @@ Commit message
-	    Z
-	    Z
-	    Z ## Notes (note1) ##
-	    -    topic note1
-	    +    unmodified note1
-	    Z
-	    Z
-	    Z ## Notes (note2) ##
-	    -    topic note2
-	    +    unmodified note2
-	    Z
-	    Z ## file ##
-	    Z@@ file: A
-	EOF
-	test_cmp expect actual
+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
 
-Removing note for object topic
-Removing note for object unmodified
-Removing note for object topic
-Removing note for object unmodified
-ok 36 - range-diff with multiple --notes
+fatal: 'source' is already locked, reason: hahaha
+ok 5 - lock worktree twice
 
-expecting success of 3206.37 'range-diff with --notes=custom does not show default notes': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	test_when_finished "git notes --ref=custom remove topic unmodified || :" &&
-	git notes --ref=custom add -m "topic note" topic &&
-	git notes --ref=custom add -m "unmodified note" unmodified &&
-	git range-diff --notes=custom main..topic main..unmodified \
-		>actual &&
-	! grep "## Notes ##" actual &&
-	grep "## Notes (custom) ##" actual
+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
 
-      ## Notes (custom) ##
-Removing note for object topic
-Removing note for object unmodified
-Removing note for object topic
-Removing note for object unmodified
-ok 37 - range-diff with --notes=custom does not show default notes
+fatal: '.' is already locked, reason: hahaha
+ok 6 - lock worktree twice (from the locked worktree)
 
-expecting success of 3206.38 'format-patch --range-diff does not compare notes by default': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	test_when_finished "rm -f 000?-*" &&
-	git format-patch --cover-letter --range-diff=$prev \
-		main..unmodified >actual &&
-	test_line_count = 5 actual &&
-	test_grep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "= 4: .* s/12/B" 0000-* &&
-	! grep "Notes" 0000-* &&
-	! grep "note" 0000-*
+expecting success of 2403.7 'unlock main worktree': 
+	test_must_fail git worktree unlock .
 
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-Removing note for object topic
-Removing note for object unmodified
-ok 38 - format-patch --range-diff does not compare notes by default
+fatal: The main working tree cannot be locked or unlocked
+ok 7 - unlock main worktree
 
-expecting success of 3206.39 'format-patch --notes=custom --range-diff only compares custom notes': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	test_when_finished "git notes --ref=custom remove topic unmodified || :" &&
-	git notes --ref=custom add -m "topic note (custom)" topic &&
-	git notes --ref=custom add -m "unmodified note (custom)" unmodified &&
-	test_when_finished "rm -f 000?-*" &&
-	git format-patch --notes=custom --cover-letter --range-diff=$prev \
-		main..unmodified >actual &&
-	grep "## Notes (custom) ##" 0000-* &&
-	! grep "## Notes ##" 0000-*
+expecting success of 2403.8 'unlock linked worktree': 
+	git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
 
-      ## Notes (custom) ##
-Removing note for object topic
-Removing note for object unmodified
-Removing note for object topic
-Removing note for object unmodified
-ok 39 - format-patch --notes=custom --range-diff only compares custom notes
+ok 8 - unlock linked worktree
 
-expecting success of 3206.40 'format-patch --range-diff with --no-notes': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	test_when_finished "rm -f 000?-*" &&
-	git format-patch --no-notes --cover-letter --range-diff=$prev \
-		main..unmodified >actual &&
-	test_line_count = 5 actual &&
-	test_grep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "= 4: .* s/12/B" 0000-* &&
-	! grep "Notes" 0000-* &&
-	! grep "note" 0000-*
+expecting success of 2403.9 'unlock worktree twice': 
+	test_must_fail git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
 
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-Removing note for object topic
-Removing note for object unmodified
-ok 40 - format-patch --range-diff with --no-notes
+fatal: 'source' is not locked
+ok 9 - unlock worktree twice
 
-expecting success of 3206.41 'format-patch --range-diff with --notes': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	test_when_finished "rm -f 000?-*" &&
-	git format-patch --notes --cover-letter --range-diff=$prev \
-		main..unmodified >actual &&
-	test_line_count = 5 actual &&
-	test_grep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "! 4: .* s/12/B" 0000-* &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	    @@ Commit message
-	    Z
-	    Z
-	    Z ## Notes ##
-	    -    topic note
-	    +    unmodified note
-	    Z
-	    Z ## file ##
-	    Z@@ file: A
-	EOF
-	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
-	test_cmp expect actual
+expecting success of 2403.10 'move non-worktree': 
+	mkdir abc &&
+	test_must_fail git worktree move abc def
 
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 ! 4:  2901f77 s/12/B/
-Removing note for object topic
-Removing note for object unmodified
-ok 41 - format-patch --range-diff with --notes
+fatal: 'abc' is not a working tree
+ok 10 - move non-worktree
 
-expecting success of 3206.42 'format-patch --range-diff with format.notes config': 
-	test_when_finished "git notes remove topic unmodified || :" &&
-	git notes add -m "topic note" topic &&
-	git notes add -m "unmodified note" unmodified &&
-	test_config format.notes true &&
-	test_when_finished "rm -f 000?-*" &&
-	git format-patch --cover-letter --range-diff=$prev \
-		main..unmodified >actual &&
-	test_line_count = 5 actual &&
-	test_grep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "! 4: .* s/12/B" 0000-* &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	    @@ Commit message
-	    Z
-	    Z
-	    Z ## Notes ##
-	    -    topic note
-	    +    unmodified note
-	    Z
-	    Z ## file ##
-	    Z@@ file: A
-	EOF
-	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
-	test_cmp expect actual
+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
 
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 ! 4:  2901f77 s/12/B/
-Removing note for object topic
-Removing note for object unmodified
-ok 42 - format-patch --range-diff with format.notes config
+fatal: cannot move a locked working tree;
+use 'move -f -f' to override or unlock first
+ok 11 - move locked worktree
 
-expecting success of 3206.43 'format-patch --range-diff with multiple notes': 
-	test_when_finished "git notes --ref=note1 remove topic unmodified || :" &&
-	git notes --ref=note1 add -m "topic note1" topic &&
-	git notes --ref=note1 add -m "unmodified note1" unmodified &&
-	test_when_finished "git notes --ref=note2 remove topic unmodified || :" &&
-	git notes --ref=note2 add -m "topic note2" topic &&
-	git notes --ref=note2 add -m "unmodified note2" unmodified &&
-	test_when_finished "rm -f 000?-*" &&
-	git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \
-		main..unmodified >actual &&
-	test_line_count = 5 actual &&
-	test_grep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "! 4: .* s/12/B" 0000-* &&
-	sed s/Z/\ /g >expect <<-EOF &&
-	    @@ Commit message
-	    Z
-	    Z
-	    Z ## Notes (note1) ##
-	    -    topic note1
-	    +    unmodified note1
-	    Z
-	    Z
-	    Z ## Notes (note2) ##
-	    -    topic note2
-	    +    unmodified note2
-	    Z
-	    Z ## file ##
-	    Z@@ file: A
-	EOF
-	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
-	test_cmp expect actual
+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
 
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 ! 4:  2901f77 s/12/B/
-Removing note for object topic
-Removing note for object unmodified
-Removing note for object topic
-Removing note for object unmodified
-ok 43 - format-patch --range-diff with multiple notes
+worktree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/destination
+ok 12 - move worktree
 
-expecting success of 3206.44 '--left-only/--right-only': 
-	git switch --orphan left-right &&
-	test_commit first &&
-	test_commit unmatched &&
-	test_commit common &&
-	git switch -C left-right first &&
-	git cherry-pick common &&
+expecting success of 2403.13 'move main worktree': 
+	test_must_fail git worktree move . def
 
-	git range-diff -s --left-only ...common >actual &&
-	head_oid=$(git rev-parse --short HEAD) &&
-	common_oid=$(git rev-parse --short common) &&
-	echo "1:  $head_oid = 2:  $common_oid common" >expect &&
-	test_cmp expect actual
+fatal: '.' is a main working tree
+ok 13 - move main worktree
 
-Switched to a new branch 'left-right'
-[left-right (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[left-right 8b3efcc] unmatched
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unmatched.t
-[left-right 66efeb1] common
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 common.t
-Reset branch 'left-right'
-[left-right a6d113e] common
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 common.t
-ok 44 - --left-only/--right-only
+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
 
-expecting success of 3206.45 'ranges with pathspecs': 
-	git range-diff topic...mode-only-change -- other-file >actual &&
-	test_line_count = 2 actual &&
-	topic_oid=$(git rev-parse --short topic) &&
-	mode_change_oid=$(git rev-parse --short mode-only-change^) &&
-	file_change_oid=$(git rev-parse --short mode-only-change) &&
-	grep "$mode_change_oid" actual &&
-	! grep "$file_change_oid" actual &&
-	! grep "$topic_oid" actual
+worktree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/some-dir/destination
+ok 14 - move worktree to another dir
 
--:  ------- > 2:  26c107f s/11/B/ + mode change other-file
-ok 45 - ranges with pathspecs
+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
 
-expecting success of 3206.46 'submodule changes are shown irrespective of diff.submodule': 
-	git init sub-repo &&
-	test_commit -C sub-repo sub-first &&
-	sub_oid1=$(git -C sub-repo rev-parse HEAD) &&
-	test_commit -C sub-repo sub-second &&
-	sub_oid2=$(git -C sub-repo rev-parse HEAD) &&
-	test_commit -C sub-repo sub-third &&
-	sub_oid3=$(git -C sub-repo rev-parse HEAD) &&
+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)
 
-	git checkout -b main-sub topic &&
-	git -c protocol.file.allow=always submodule add ./sub-repo sub &&
-	git -C sub checkout --detach sub-first &&
-	git commit -m "add sub" sub &&
-	sup_oid1=$(git rev-parse --short HEAD) &&
-	git checkout -b topic-sub &&
-	git -C sub checkout sub-second &&
-	git commit -m "change sub" sub &&
-	sup_oid2=$(git rev-parse --short HEAD) &&
-	git checkout -b modified-sub main-sub &&
-	git -C sub checkout sub-third &&
-	git commit -m "change sub" sub &&
-	sup_oid3=$(git rev-parse --short HEAD) &&
-	sup_oid0=$(test_oid __) &&
+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
 
-	test_config diff.submodule log &&
-	git range-diff topic topic-sub modified-sub >actual &&
-	cat >expect <<-EOF &&
-	1:  $sup_oid1 = 1:  $sup_oid1 add sub
-	2:  $sup_oid2 < -:  $sup_oid0 change sub
-	-:  $sup_oid0 > 2:  $sup_oid3 change sub
-	EOF
-	test_cmp expect actual &&
-	test_config diff.submodule diff &&
-	git range-diff topic topic-sub modified-sub >actual &&
-	git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
-	cat >expect <<-EOF &&
-	1:  $sup_oid1 = 1:  $sup_oid1 add sub
-	2:  $sup_oid2 ! 2:  $sup_oid3 change sub
-	    @@ Commit message
-	      ## sub ##
-	     @@
-	     -Subproject commit $sub_oid1
-	    -+Subproject commit $sub_oid2
-	    ++Subproject commit $sub_oid3
-	EOF
-	test_cmp expect actual &&
-	test_config diff.submodule diff &&
-	git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
-	test_cmp expect actual
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: 'bobble' already exists
+ok 16 - refuse to move worktree atop existing path
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3206-range-diff/sub-repo/.git/
-[main (root-commit) 0dd48dc] sub-first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub-first.t
-[main 5aa4e7e] sub-second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub-second.t
-[main 57c2aa9] sub-third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub-third.t
-Switched to a new branch 'main-sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3206-range-diff/sub'...
-done.
-HEAD is now at 0dd48dc sub-first
-[main-sub 3424d3a] add sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Switched to a new branch 'topic-sub'
-Previous HEAD position was 0dd48dc sub-first
-HEAD is now at 5aa4e7e sub-second
-[topic-sub f8a571b] change sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'modified-sub'
-A	.gitmodules
-M	sub
-Previous HEAD position was 5aa4e7e sub-second
-HEAD is now at 57c2aa9 sub-third
-[modified-sub 3bd1f61] change sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 46 - submodule changes are shown irrespective of diff.submodule
+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 &&
 
-expecting success of 3206.47 '--diff-merges': 
-	renamed_oid=$(git rev-parse --short renamed-file) &&
-	tree=$(git merge-tree unmodified renamed-file) &&
-	clean=$(git commit-tree -m merge -p unmodified -p renamed-file $tree) &&
-	clean_oid=$(git rev-parse --short $clean) &&
-	conflict=$(git commit-tree -m merge -p unmodified -p renamed-file^ $tree) &&
-	conflict_oid=$(git rev-parse --short $conflict) &&
+	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
 
-	git range-diff --diff-merges=1 $clean...$conflict >actual &&
-	cat >expect <<-EOF &&
-	1:  $renamed_oid < -:  ------- s/12/B/
-	2:  $clean_oid = 1:  $conflict_oid merge
-	EOF
-	test_cmp expect actual
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+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 47 - --diff-merges
+ok 17 - move atop existing but missing worktree
 
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3207-branch-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/.git/
-expecting success of 3207.1 'setup superproject and submodule': 
-	git config --global protocol.file.allow always &&
-	mkdir test_dirs &&
+expecting success of 2403.18 'move a repo with uninitialized submodule': 
+	git init withsub &&
 	(
-		cd test_dirs &&
-		git init super &&
-		test_commit -C super foo &&
-		git init sub-sub-upstream &&
-		test_commit -C sub-sub-upstream foo &&
-		git init sub-upstream &&
-		# Submodule in a submodule
-		git -C sub-upstream submodule add "${pwd}/test_dirs/sub-sub-upstream" sub-sub &&
-		git -C sub-upstream commit -m "add submodule" &&
-		# Regular submodule
-		git -C super submodule add "${pwd}/test_dirs/sub-upstream" sub &&
-		# Submodule in a subdirectory
-		git -C super submodule add "${pwd}/test_dirs/sub-sub-upstream" second/sub &&
-		git -C super commit -m "add submodule" &&
-		git -C super config submodule.propagateBranches true &&
-		git -C super/sub submodule update --init
-	) &&
-	reset_test
+		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.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/.git/
-[main (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream/.git/
-[main (root-commit) 946e985] foo
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream/sub-sub'...
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/withsub/sub'...
 done.
-[main (root-commit) fabad35] add submodule
+[master 640b2c6] withsub
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub-sub
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/sub'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/second/sub'...
-done.
-[main a659cca] add submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 second/sub
  create mode 160000 sub
-Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub-sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/sub/sub-sub'...
-done.
-Submodule path 'sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
-ok 1 - setup superproject and submodule
+Preparing worktree (detached HEAD 640b2c6)
+HEAD is now at 640b2c6 withsub
+ok 18 - move a repo with uninitialized submodule
 
-expecting success of 3207.2 '--recurse-submodules should create branches': 
-	test_when_finished "reset_test" &&
+expecting success of 2403.19 'not move a repo with initialized submodule': 
 	(
-		cd super &&
-		git branch --recurse-submodules branch-a &&
-		git rev-parse branch-a &&
-		git -C sub rev-parse branch-a &&
-		git -C sub/sub-sub rev-parse branch-a &&
-		git -C second/sub rev-parse branch-a
+		cd withsub &&
+		git -c protocol.file.allow=always -C third submodule update &&
+		test_must_fail git worktree move third forth
 	)
 
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-a659cca0b1b849507a0373483187f0dfd198299a
-fabad3591d45028390e48528499f1c234468d2f9
-946e985ab20de757ca5b872b16d64e92ff3803a9
-946e985ab20de757ca5b872b16d64e92ff3803a9
-ok 2 - --recurse-submodules should create branches
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3207.3 '--recurse-submodules should die if submodule.propagateBranches is false': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		echo "fatal: branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled" >expected &&
-		test_must_fail git -c submodule.propagateBranches=false branch --recurse-submodules branch-a 2>actual &&
-		test_cmp expected actual
-	)
+expecting success of 2403.20 'remove main worktree': 
+	test_must_fail git worktree remove .
 
-ok 3 - --recurse-submodules should die if submodule.propagateBranches is false
+fatal: '.' is a main working tree
+ok 20 - remove main worktree
 
-expecting success of 3207.4 '--recurse-submodules should fail when not creating branches': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		git branch --recurse-submodules branch-a &&
-		echo "fatal: --recurse-submodules can only be used to create branches" >expected &&
-		test_must_fail git branch --recurse-submodules -D branch-a 2>actual &&
-		test_cmp expected actual &&
-		# Assert that the branches were not deleted
-		git rev-parse branch-a &&
-		git -C sub rev-parse branch-a
-	)
+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
 
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-a659cca0b1b849507a0373483187f0dfd198299a
-fabad3591d45028390e48528499f1c234468d2f9
-ok 4 - --recurse-submodules should fail when not creating branches
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+ok 21 - remove locked worktree
 
-expecting success of 3207.5 'should respect submodule.recurse when creating branches': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		git -c submodule.recurse=true branch branch-a &&
-		git rev-parse branch-a &&
-		git -C sub rev-parse branch-a
-	)
+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
 
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-a659cca0b1b849507a0373483187f0dfd198299a
-fabad3591d45028390e48528499f1c234468d2f9
-ok 5 - should respect submodule.recurse when creating branches
+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 3207.6 'should ignore submodule.recurse when not creating branches': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		git branch --recurse-submodules branch-a &&
-		git -c submodule.recurse=true branch -D branch-a &&
-		test_no_branch . branch-a &&
-		git -C sub rev-parse branch-a
-	)
+expecting success of 2403.23 'remove worktree with untracked file': 
+	: >destination/untracked &&
+	test_must_fail git worktree remove destination
 
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-Deleted branch branch-a (was a659cca).
-branch-a
-fatal: ambiguous argument 'branch-a': unknown revision or path not in the working tree.
-fabad3591d45028390e48528499f1c234468d2f9
-ok 6 - should ignore submodule.recurse when not creating branches
+fatal: 'destination' contains modified or untracked files, use --force to delete it
+ok 23 - remove worktree with untracked file
 
-expecting success of 3207.7 'should create branches based off commit id in superproject': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		git branch --recurse-submodules branch-a &&
-		git checkout --recurse-submodules branch-a &&
-		git -C sub rev-parse HEAD >expected &&
-		# Move the tip of sub:branch-a so that it no longer matches the commit in super:branch-a
-		git -C sub checkout branch-a &&
-		test_commit -C sub bar &&
-		# Create a new branch-b branch with start-point=branch-a
-		git branch --recurse-submodules branch-b branch-a &&
-		git rev-parse branch-b &&
-		git -C sub rev-parse branch-b >actual &&
-		# Assert that the commit id of sub:second-branch matches super:branch-a and not sub:branch-a
-		test_cmp expected actual
-	)
+expecting success of 2403.24 'force remove worktree with untracked file': 
+	git worktree remove --force destination &&
+	test_path_is_missing destination
 
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-Switched to branch 'branch-a'
-Switched to branch 'branch-a'
-[branch-a 55e03b0] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-submodule 'second/sub': creating branch 'branch-b'
-submodule 'sub': creating branch 'branch-b'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-b'
-a659cca0b1b849507a0373483187f0dfd198299a
-ok 7 - should create branches based off commit id in superproject
+ok 24 - force remove worktree with untracked file
 
-expecting success of 3207.8 'should not create any branches if branch is not valid for all repos': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		git -C sub branch branch-a &&
-		test_must_fail git branch --recurse-submodules branch-a 2>actual &&
-		test_no_branch . branch-a &&
-		grep "submodule .sub.: fatal: a branch named .branch-a. already exists" actual
-	)
+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
 
-branch-a
-fatal: ambiguous argument 'branch-a': unknown revision or path not in the working tree.
-submodule 'sub': fatal: a branch named 'branch-a' already exists
-ok 8 - should not create any branches if branch is not valid for all repos
+Preparing worktree (new branch 'to-be-gone')
+HEAD is now at 2519212 init
+ok 25 - remove missing worktree
 
-expecting success of 3207.9 'should create branches if branch exists and --force is given': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		git -C sub rev-parse HEAD >expected &&
-		test_commit -C sub baz &&
-		# branch-a in sub now points to a newer commit.
-		git -C sub branch branch-a HEAD &&
-		git -C sub rev-parse branch-a >actual-old-branch-a &&
-		git branch --recurse-submodules --force branch-a &&
-		git rev-parse branch-a &&
-		git -C sub rev-parse branch-a >actual-new-branch-a &&
-		test_cmp expected actual-new-branch-a &&
-		# assert that branch --force actually moved the sub
-		# branch
-		! test_cmp expected actual-old-branch-a
-	)
+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
 
-[main 5f30a46] baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 baz.t
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-a659cca0b1b849507a0373483187f0dfd198299a
---- expected	2025-02-09 06:53:58.129675752 +0000
-+++ actual-old-branch-a	2025-02-09 06:53:58.173676032 +0000
-@@ -1 +1 @@
--fabad3591d45028390e48528499f1c234468d2f9
-+5f30a46d99c99a2d6f32daf26fe6bfe59b279761
-ok 9 - should create branches if branch exists and --force is given
+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 3207.10 'should create branch when submodule is not in HEAD:.gitmodules': 
-	test_when_finished "reset_test" &&
-	(
-		cd super &&
-		git branch branch-a &&
-		git checkout -b branch-b &&
-		git submodule add ../sub-upstream sub2 &&
-		git -C sub2 submodule update --init &&
-		# branch-b now has a committed submodule not in branch-a
-		git commit -m "add second submodule" &&
-		git checkout branch-a &&
-		git branch --recurse-submodules branch-c branch-b &&
-		git checkout --recurse-submodules branch-c &&
-		git -C sub2 rev-parse branch-c &&
-		git -C sub2/sub-sub rev-parse branch-c
-	)
+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
 
-Switched to a new branch 'branch-b'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super/sub2'...
-done.
-Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub-sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super/sub2/sub-sub'...
-done.
-Submodule path 'sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
-[branch-b 75b433c] add second submodule
- 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 'branch-a'
-submodule 'second/sub': creating branch 'branch-c'
-submodule 'sub': creating branch 'branch-c'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-c'
-submodule 'sub2': creating branch 'branch-c'
-submodule 'sub2': submodule 'sub-sub': creating branch 'branch-c'
-Switched to branch 'branch-c'
-fabad3591d45028390e48528499f1c234468d2f9
-946e985ab20de757ca5b872b16d64e92ff3803a9
-ok 10 - should create branch when submodule is not in HEAD:.gitmodules
+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 3207.11 'should not create branches in inactive submodules': 
-	test_when_finished "reset_test" &&
-	test_config -C super submodule.sub.active false &&
-	(
-		cd super &&
-		git branch --recurse-submodules branch-a &&
-		git rev-parse branch-a &&
-		test_no_branch sub branch-a
-	)
+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
 
-submodule 'second/sub': creating branch 'branch-a'
-a659cca0b1b849507a0373483187f0dfd198299a
-branch-a
-fatal: ambiguous argument 'branch-a': unknown revision or path not in the working tree.
-ok 11 - should not create branches in inactive submodules
+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 3207.12 'should set up tracking of local branches with track=always': 
-	test_when_finished "reset_test" &&
+expecting success of 2403.29 'remove cleans up .git/worktrees when empty': 
+	git init moog &&
 	(
-		cd super &&
-		git -c branch.autoSetupMerge=always branch --recurse-submodules branch-a main &&
-		git -C sub rev-parse main &&
-		test_cmp_config -C sub . branch.branch-a.remote &&
-		test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+		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
 	)
 
-branch 'branch-a' set up to track 'main'.
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'second/sub': branch 'branch-a' set up to track 'main'.
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': branch 'branch-a' set up to track 'main'.
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'main'.
-fabad3591d45028390e48528499f1c234468d2f9
-ok 12 - should set up tracking of local branches with track=always
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3207.13 'should set up tracking of local branches with explicit track': 
-	test_when_finished "reset_test" &&
+expecting success of 2403.30 'remove a repo with uninitialized submodule': 
+	test_config_global protocol.file.allow always &&
 	(
-		cd super &&
-		git branch --track --recurse-submodules branch-a main &&
-		git -C sub rev-parse main &&
-		test_cmp_config -C sub . branch.branch-a.remote &&
-		test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+		cd withsub &&
+		git worktree add to-remove HEAD &&
+		git worktree remove to-remove
 	)
 
-branch 'branch-a' set up to track 'main'.
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'second/sub': branch 'branch-a' set up to track 'main'.
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': branch 'branch-a' set up to track 'main'.
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'main'.
-fabad3591d45028390e48528499f1c234468d2f9
-ok 13 - should set up tracking of local branches with explicit track
+Preparing worktree (detached HEAD 640b2c6)
+HEAD is now at 640b2c6 withsub
+ok 30 - remove a repo with uninitialized submodule
 
-expecting success of 3207.14 'should not set up unnecessary tracking of local branches': 
-	test_when_finished "reset_test" &&
+expecting success of 2403.31 'not remove a repo with initialized submodule': 
+	test_config_global protocol.file.allow always &&
 	(
-		cd super &&
-		git branch --recurse-submodules branch-a main &&
-		git -C sub rev-parse main &&
-		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
-		test_cmp_config -C sub "" --default "" branch.branch-a.merge
+		cd withsub &&
+		git worktree add to-remove HEAD &&
+		git -C to-remove submodule update &&
+		test_must_fail git worktree remove to-remove
 	)
 
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-fabad3591d45028390e48528499f1c234468d2f9
-ok 14 - should not set up unnecessary tracking of local branches
-
-expecting success of 3207.15 'setup tests with remotes': 
-	(
-		cd test_dirs &&
-		(
-			cd super &&
-			git branch branch-a &&
-			git checkout -b branch-b &&
-			git submodule add ../sub-upstream sub2 &&
-			# branch-b now has a committed submodule not in branch-a
-			git commit -m "add second submodule"
-		) &&
-		git clone --branch main --recurse-submodules super super-clone &&
-		git -C super-clone config submodule.propagateBranches true
-	) &&
-	reset_remote_test
-
-Switched to a new branch 'branch-b'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/sub2'...
-done.
-[branch-b 75b433c] add second submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub2
-Cloning into 'super-clone'...
-done.
-Submodule 'second/sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'second/sub'
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super-clone/second/sub'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super-clone/sub'...
-done.
-Submodule path 'second/sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
-Submodule path 'sub': checked out 'fabad3591d45028390e48528499f1c234468d2f9'
-Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub/sub-sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super-clone/sub/sub-sub'...
+Preparing worktree (detached HEAD 640b2c6)
+HEAD is now at 640b2c6 withsub
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2403-worktree-move/withsub/to-remove/sub'...
 done.
-Submodule path 'sub/sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
-ok 15 - setup tests with remotes
+Submodule path 'sub': checked out '5e3001300c8a533bee3e24efd70fbfae3dfa27e3'
+fatal: working trees containing submodules cannot be moved or removed
+ok 31 - not remove a repo with initialized submodule
 
-expecting success of 3207.16 'should get fatal error upon branch creation when submodule is not in .git/modules': 
-	test_when_finished "reset_remote_test" &&
-	(
-		cd super-clone &&
-		# This should succeed because super-clone has sub in .git/modules
-		git branch --recurse-submodules branch-a origin/branch-a &&
-		# This should fail because super-clone does not have sub2 .git/modules
-		test_must_fail git branch --recurse-submodules branch-b origin/branch-b 2>actual &&
-		grep "fatal: submodule .sub2.: unable to find submodule" actual &&
-		test_no_branch . branch-b &&
-		test_no_branch sub branch-b &&
-		# User can fix themselves by initializing the submodule
-		git checkout origin/branch-b &&
-		git submodule update --init --recursive &&
-		git branch --recurse-submodules branch-b origin/branch-b
-	)
+expecting success of 2403.32 'move worktree with absolute path to relative path': 
+	test_config worktree.useRelativePaths false &&
+	git worktree add ./absolute &&
+	git worktree move --relative-paths absolute relative &&
+	echo "gitdir: ../.git/worktrees/absolute" >expect &&
+	test_cmp expect relative/.git &&
+	echo "../../../relative/.git" >expect &&
+	test_cmp expect .git/worktrees/absolute/gitdir &&
+	test_config worktree.useRelativePaths true &&
+	git worktree move relative relative2 &&
+	echo "gitdir: ../.git/worktrees/absolute" >expect &&
+	test_cmp expect relative2/.git &&
+	echo "../../../relative2/.git" >expect &&
+	test_cmp expect .git/worktrees/absolute/gitdir
 
-branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'second/sub': branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'origin/branch-a'.
-fatal: submodule 'sub2': unable to find submodule
-branch-b
-fatal: ambiguous argument 'branch-b': unknown revision or path not in the working tree.
-branch-b
-fatal: ambiguous argument 'branch-b': unknown revision or path not in the working tree.
-Note: switching to 'origin/branch-b'.
+Preparing worktree (new branch 'absolute')
+HEAD is now at 2519212 init
+ok 32 - move worktree with absolute path to relative path
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 2403.33 'move worktree with relative path to absolute path': 
+	test_config worktree.useRelativePaths true &&
+	git worktree move --no-relative-paths relative2 absolute &&
+	echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect &&
+	test_cmp expect absolute/.git &&
+	echo "$(pwd)/absolute/.git" >expect &&
+	test_cmp expect .git/worktrees/absolute/gitdir
 
-If you want to 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 33 - move worktree with relative path to absolute path
 
-  git switch -c <new-branch-name>
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2406-worktree-repair.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/
+expecting success of 2406.1 'setup': 
+	test_commit init
 
-Or undo this operation with:
+[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
 
-  git switch -
+expecting success of 2406.2 'skip missing worktree': 
+	test_when_finished "git worktree prune" &&
+	git worktree add --detach missing &&
+	rm -rf missing &&
+	git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 2 - skip missing worktree
 
-HEAD is now at 75b433c add second submodule
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream) registered for path 'sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super-clone/sub2'...
-done.
-Submodule path 'sub2': checked out 'fabad3591d45028390e48528499f1c234468d2f9'
-Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub2/sub-sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super-clone/sub2/sub-sub'...
-done.
-Submodule path 'sub2/sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
-branch 'branch-b' set up to track 'origin/branch-b'.
-submodule 'second/sub': creating branch 'branch-b'
-submodule 'second/sub': branch 'branch-b' set up to track 'origin/branch-b'.
-submodule 'sub': creating branch 'branch-b'
-submodule 'sub': branch 'branch-b' set up to track 'origin/branch-b'.
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-b'
-submodule 'sub': submodule 'sub-sub': branch 'branch-b' set up to track 'origin/branch-b'.
-submodule 'sub2': creating branch 'branch-b'
-submodule 'sub2': branch 'branch-b' set up to track 'origin/branch-b'.
-submodule 'sub2': submodule 'sub-sub': creating branch 'branch-b'
-submodule 'sub2': submodule 'sub-sub': branch 'branch-b' set up to track 'origin/branch-b'.
-ok 16 - should get fatal error upon branch creation when submodule is not in .git/modules
+expecting success of 2406.3 'worktree path not directory': 
+	test_when_finished "git worktree prune" &&
+	git worktree add --detach notdir &&
+	rm -rf notdir &&
+	>notdir &&
+	test_must_fail git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_grep "not a directory" err
 
-expecting success of 3207.17 'should set up tracking of remote-tracking branches by default': 
-	test_when_finished "reset_remote_test" &&
-	(
-		cd super-clone &&
-		git branch --recurse-submodules branch-a origin/branch-a &&
-		test_cmp_config origin branch.branch-a.remote &&
-		test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
-		# "origin/branch-a" does not exist for "sub", but it matches the refspec
-		# so tracking should be set up
-		test_cmp_config -C sub origin branch.branch-a.remote &&
-		test_cmp_config -C sub refs/heads/branch-a branch.branch-a.merge &&
-		test_cmp_config -C sub/sub-sub origin branch.branch-a.remote &&
-		test_cmp_config -C sub/sub-sub refs/heads/branch-a branch.branch-a.merge
-	)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: not a directory: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/notdir
+ok 3 - worktree path not directory
 
-branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'second/sub': branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'origin/branch-a'.
-ok 17 - should set up tracking of remote-tracking branches by default
+expecting success of 2406.4 'don't clobber .git repo': 
+	test_when_finished "rm -rf repo && git worktree prune" &&
+	git worktree add --detach repo &&
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_must_fail git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_grep ".git is not a file" err
 
-expecting success of 3207.18 'should not fail when unable to set up tracking in submodule': 
-	test_when_finished "reset_remote_test" &&
-	(
-		cd super-clone &&
-		git remote rename origin ex-origin &&
-		git branch --recurse-submodules branch-a ex-origin/branch-a &&
-		test_cmp_config ex-origin branch.branch-a.remote &&
-		test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
-		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
-		test_cmp_config -C sub "" --default "" branch.branch-a.merge
-	)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/repo/.git/
+error: .git is not a file: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/repo
+ok 4 - don't clobber .git repo
 
-branch 'branch-a' set up to track 'ex-origin/branch-a'.
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-ok 18 - should not fail when unable to set up tracking in submodule
+expecting success of 2406.5 'repair missing .git file': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
 
-expecting success of 3207.19 '--track=inherit should set up tracking correctly': 
-	test_when_finished "reset_remote_test" &&
-	(
-		cd super-clone &&
-		git branch --recurse-submodules branch-a origin/branch-a &&
-		# Set this manually instead of using branch --set-upstream-to
-		# to circumvent the "nonexistent upstream" check.
-		git -C sub config branch.branch-a.remote origin &&
-		git -C sub config branch.branch-a.merge refs/heads/sub-branch-a &&
-		git -C sub/sub-sub config branch.branch-a.remote other &&
-		git -C sub/sub-sub config branch.branch-a.merge refs/heads/sub-sub-branch-a &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
+ok 5 - repair missing .git file
 
-		git branch --recurse-submodules --track=inherit branch-b branch-a &&
-		test_cmp_config origin branch.branch-b.remote &&
-		test_cmp_config refs/heads/branch-a branch.branch-b.merge &&
-		test_cmp_config -C sub origin branch.branch-b.remote &&
-		test_cmp_config -C sub refs/heads/sub-branch-a branch.branch-b.merge &&
-		test_cmp_config -C sub/sub-sub other branch.branch-b.remote &&
-		test_cmp_config -C sub/sub-sub refs/heads/sub-sub-branch-a branch.branch-b.merge
-	)
+expecting success of 2406.6 'repair bogus .git file': 
+	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
+		".git file broken"
 
-branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'second/sub': branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': branch 'branch-a' set up to track 'origin/branch-a'.
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'origin/branch-a'.
-branch 'branch-b' set up to track 'origin/branch-a'.
-submodule 'second/sub': creating branch 'branch-b'
-submodule 'second/sub': branch 'branch-b' set up to track 'origin/branch-a'.
-submodule 'sub': creating branch 'branch-b'
-submodule 'sub': branch 'branch-b' set up to track 'origin/sub-branch-a'.
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-b'
-submodule 'sub': submodule 'sub-sub': branch 'branch-b' set up to track 'other/sub-sub-branch-a'.
-ok 19 - --track=inherit should set up tracking correctly
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
+ok 6 - repair bogus .git file
 
-expecting success of 3207.20 '--no-track should not set up tracking': 
-	test_when_finished "reset_remote_test" &&
-	(
-		cd super-clone &&
-		git branch --recurse-submodules --no-track branch-a origin/branch-a &&
-		test_cmp_config "" --default "" branch.branch-a.remote &&
-		test_cmp_config "" --default "" branch.branch-a.merge &&
-		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
-		test_cmp_config -C sub "" --default "" branch.branch-a.merge &&
-		test_cmp_config -C sub/sub-sub "" --default "" branch.branch-a.remote &&
-		test_cmp_config -C sub/sub-sub "" --default "" branch.branch-a.merge
-	)
+expecting success of 2406.7 'repair incorrect .git file': 
+	test_when_finished "rm -rf other && git worktree prune" &&
+	test_create_repo other &&
+	other=$(git -C other rev-parse --absolute-git-dir) &&
+	test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \
+		".git file incorrect"
 
-submodule 'second/sub': creating branch 'branch-a'
-submodule 'sub': creating branch 'branch-a'
-submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
-ok 20 - --no-track should not set up tracking
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/other/.git/
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
+ok 7 - repair incorrect .git file
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3306-notes-prune.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3306-notes-prune/.git/
-expecting success of 3306.1 'setup: create a few commits with notes': 
+expecting success of 2406.8 'repair .git file from main/.git': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
 
-	: > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m 1st &&
-	git notes add -m "Note #1" &&
-	first=$(git rev-parse HEAD) &&
-	: > file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m 2nd &&
-	git notes add -m "Note #2" &&
-	second=$(git rev-parse HEAD) &&
-	: > file3 &&
-	git add file3 &&
-	test_tick &&
-	git commit -m 3rd &&
-	third=$(git rev-parse HEAD) &&
-	COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") &&
-	test -f $COMMIT_FILE &&
-	test-tool chmtime =+0 $COMMIT_FILE &&
-	git notes add -m "Note #3"
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
+ok 8 - repair .git file from main/.git
 
-[master (root-commit) ab5f302] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-[master 08341ad] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-[master 5ee1c35] 3rd
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file3
-ok 1 - setup: create a few commits with notes
+expecting success of 2406.9 'repair .git file from linked worktree': 
+	test_when_finished "rm -rf other && git worktree prune" &&
+	git worktree add --detach other &&
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" other
 
-expecting success of 3306.2 'verify commits and notes': 
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
+ok 9 - repair .git file from linked worktree
 
-	git log > actual &&
+expecting success of 2406.10 'repair .git file from bare.git': 
+	test_when_finished "rm -rf bare.git corrupt && git worktree prune" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add --detach ../corrupt &&
+	git -C corrupt rev-parse --absolute-git-dir >expect &&
+	rm -f corrupt/.git &&
+	git -C bare.git worktree repair &&
+	git -C corrupt rev-parse --absolute-git-dir >actual &&
 	test_cmp expect actual
 
-ok 2 - verify commits and notes
+Cloning into bare repository 'bare.git'...
+done.
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/corrupt
+ok 10 - repair .git file from bare.git
 
-expecting success of 3306.3 'remove some commits': 
+expecting success of 2406.11 'invalid worktree path': 
+	test_must_fail git worktree repair /notvalid >out 2>err &&
+	test_must_be_empty out &&
+	test_grep "not a valid path" err
 
-	git reset --hard HEAD~1 &&
-	git reflog expire --expire=now HEAD &&
-	git gc --prune=now
+error: not a valid path: /notvalid
+ok 11 - invalid worktree path
 
-HEAD is now at 08341ad 2nd
-ok 3 - remove some commits
+expecting success of 2406.12 'repo not found; .git not file': 
+	test_when_finished "rm -rf not-a-worktree" &&
+	test_create_repo not-a-worktree &&
+	test_must_fail git worktree repair not-a-worktree >out 2>err &&
+	test_must_be_empty out &&
+	test_grep ".git is not a file" err
 
-expecting success of 3306.4 'verify that commits are gone': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/not-a-worktree/.git/
+error: unable to locate repository; .git is not a file: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/not-a-worktree/.git
+ok 12 - repo not found; .git not file
 
-	test_must_fail git cat-file -p $third &&
-	git cat-file -p $second &&
-	git cat-file -p $first
+expecting success of 2406.13 'repo not found; .git not referencing repo': 
+	test_when_finished "rm -rf side not-a-repo && git worktree prune" &&
+	git worktree add --detach side &&
+	sed s,\.git/worktrees/side$,not-a-repo, side/.git >side/.newgit &&
+	mv side/.newgit side/.git &&
+	mkdir not-a-repo &&
+	test_must_fail git worktree repair side 2>err &&
+	test_grep ".git file does not reference a repository" err
 
-fatal: Not a valid object name 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
-tree aefde3a01f6e10d72fd4899ce14c8b2654d3eb45
-parent ab5f302035f2e7aaf04265f08b42034c23256e1f
-author A U Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: unable to locate repository; .git file does not reference a repository: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/side/.git
+ok 13 - repo not found; .git not referencing repo
 
-2nd
-tree ad24149d789e59d4b5f9ce41cda90110ca0f98b7
-author A U Thor <author@example.com> 1112911993 -0700
-committer C O Mitter <committer@example.com> 1112911993 -0700
+expecting success of 2406.14 'repo not found; .git file broken': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	echo /invalid >orig/.git &&
+	mv orig moved &&
+	test_must_fail git worktree repair moved >out 2>err &&
+	test_must_be_empty out &&
+	test_grep ".git file broken" err
 
-1st
-ok 4 - verify that commits are gone
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: unable to locate repository; .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/moved/.git
+ok 14 - repo not found; .git file broken
 
-expecting success of 3306.5 'verify that notes are still present': 
+expecting success of 2406.15 'repair broken gitdir': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
+	rm .git/worktrees/orig/gitdir &&
+	mv orig moved &&
+	git worktree repair moved 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_grep "gitdir unreadable" err
 
-	git notes show $third &&
-	git notes show $second &&
-	git notes show $first
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir unreadable: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 15 - repair broken gitdir
 
-Note #3
-Note #2
-Note #1
-ok 5 - verify that notes are still present
+expecting success of 2406.16 'repair incorrect gitdir': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
+	mv orig moved &&
+	git worktree repair moved 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_grep "gitdir incorrect" err
 
-expecting success of 3306.6 'prune -n does not remove notes': 
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 16 - repair incorrect gitdir
 
-	git notes list > expect &&
-	git notes prune -n &&
-	git notes list > actual &&
-	test_cmp expect actual
+expecting success of 2406.17 'repair gitdir (implicit) from linked worktree': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
+	mv orig moved &&
+	git -C moved worktree repair 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_grep "gitdir incorrect" err
 
-5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
-ok 6 - prune -n does not remove notes
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 17 - repair gitdir (implicit) from linked worktree
 
-expecting success of 3306.7 'prune -n lists prunable notes': 
+expecting success of 2406.18 'unable to repair gitdir (implicit) from main worktree': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	cat .git/worktrees/orig/gitdir >expect &&
+	mv orig moved &&
+	git worktree repair 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_must_be_empty err
 
-	echo $third >expect &&
-	git notes prune -n > actual &&
-	test_cmp expect actual
-
-ok 7 - prune -n lists prunable notes
-
-expecting success of 3306.8 'prune notes': 
-
-	git notes prune
-
-ok 8 - prune notes
-
-expecting success of 3306.9 'verify that notes are gone': 
-
-	test_must_fail git notes show $third &&
-	git notes show $second &&
-	git notes show $first
-
-error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
-Note #2
-Note #1
-ok 9 - verify that notes are gone
-
-expecting success of 3306.10 'remove some commits': 
-
-	git reset --hard HEAD~1 &&
-	git reflog expire --expire=now HEAD &&
-	git gc --prune=now
-
-HEAD is now at ab5f302 1st
-ok 10 - remove some commits
-
-expecting success of 3306.11 'prune -v notes': 
-
-	echo $second >expect &&
-	git notes prune -v > actual &&
-	test_cmp expect actual
-
-ok 11 - prune -v notes
-
-expecting success of 3306.12 'verify that notes are gone': 
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 18 - unable to repair gitdir (implicit) from main worktree
 
-	test_must_fail git notes show $third &&
-	test_must_fail git notes show $second &&
-	git notes show $first
+expecting success of 2406.19 'repair multiple gitdir files': 
+	test_when_finished "rm -rf orig1 orig2 moved1 moved2 &&
+		git worktree prune" &&
+	git worktree add --detach orig1 &&
+	git worktree add --detach orig2 &&
+	sed s,orig1/\.git$,moved1/.git, .git/worktrees/orig1/gitdir >expect1 &&
+	sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 &&
+	mv orig1 moved1 &&
+	mv orig2 moved2 &&
+	git worktree repair moved1 moved2 2>err &&
+	test_cmp expect1 .git/worktrees/orig1/gitdir &&
+	test_cmp expect2 .git/worktrees/orig2/gitdir &&
+	test_grep "gitdir incorrect:.*orig1/gitdir$" err &&
+	test_grep "gitdir incorrect:.*orig2/gitdir$" err
 
-error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
-error: no note found for object 08341ad9e94faa089d60fd3f523affb25c6da189.
-Note #1
-ok 12 - verify that notes are gone
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
+repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/.git/worktrees/orig2/gitdir
+ok 19 - repair multiple gitdir files
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3307-notes-man.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3307-notes-man/.git/
-expecting success of 3307.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C
+expecting success of 2406.20 'repair moved main and linked worktrees': 
+	test_when_finished "rm -rf main side mainmoved sidemoved" &&
+	test_create_repo main &&
+	test_commit -C main init &&
+	git -C main worktree add --detach ../side &&
+	sed "s,side/\.git$,sidemoved/.git," \
+		main/.git/worktrees/side/gitdir >expect-gitdir &&
+	sed "s,main/.git/worktrees/side$,mainmoved/.git/worktrees/side," \
+		side/.git >expect-gitfile &&
+	mv main mainmoved &&
+	mv side sidemoved &&
+	git -C mainmoved worktree repair ../sidemoved &&
+	test_cmp expect-gitdir mainmoved/.git/worktrees/side/gitdir &&
+	test_cmp expect-gitfile sidemoved/.git
 
-[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
-[master 35a8500] C
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) f54694c] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
-
-expecting success of 3307.2 'example 1: notes to add an Acked-by line': 
-	cat <<-\EOF >expect &&
-	    B
-
-	Notes:
-	    Acked-by: A C Ker <acker@example.com>
-	EOF
-	git notes add -m "Acked-by: A C Ker <acker@example.com>" B &&
-	git show -s B^{commit} >log &&
-	tail -n 4 log >actual &&
-	test_cmp expect actual
-
-ok 2 - example 1: notes to add an Acked-by line
-
-expecting success of 3307.3 'example 2: binary notes': 
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
-	git checkout B &&
-	blob=$(git hash-object -w test-binary-1.png) &&
-	git notes --ref=logo add -C "$blob" &&
-	git notes --ref=logo copy B C &&
-	git notes --ref=logo show C >actual &&
-	test_cmp test-binary-1.png actual
+ create mode 100644 init.t
+Preparing worktree (detached HEAD f54694c)
+HEAD is now at f54694c init
+repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/mainmoved/.git/worktrees/side/gitdir
+ok 20 - repair moved main and linked worktrees
 
-Note: switching to 'B'.
+expecting success of 2406.21 'repair copied main and linked worktrees': 
+	test_when_finished "rm -rf orig dup" &&
+	mkdir -p orig &&
+	git -C orig init main &&
+	test_commit -C orig/main nothing &&
+	git -C orig/main worktree add ../linked &&
+	cp orig/main/.git/worktrees/linked/gitdir orig/main.expect &&
+	cp orig/linked/.git orig/linked.expect &&
+	cp -R orig dup &&
+	sed "s,orig/linked/\.git$,dup/linked/.git," orig/main.expect >dup/main.expect &&
+	sed "s,orig/main/\.git/worktrees/linked$,dup/main/.git/worktrees/linked," \
+		orig/linked.expect >dup/linked.expect &&
+	git -C dup/main worktree repair ../linked &&
+	test_cmp orig/main.expect orig/main/.git/worktrees/linked/gitdir &&
+	test_cmp orig/linked.expect orig/linked/.git &&
+	test_cmp dup/main.expect dup/main/.git/worktrees/linked/gitdir &&
+	test_cmp dup/linked.expect dup/linked/.git
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/orig/main/.git/
+[master (root-commit) a5c17d1] nothing
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nothing.t
+Preparing worktree (new branch 'linked')
+HEAD is now at a5c17d1 nothing
+repair: gitdir incorrect: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/dup/main/.git/worktrees/linked/gitdir
+ok 21 - repair copied main and linked worktrees
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 2406.22 'repair worktree with relative path with missing gitfile': 
+	test_when_finished "rm -rf main wt" &&
+	test_create_repo main &&
+	git -C main config worktree.useRelativePaths true &&
+	test_commit -C main init &&
+	git -C main worktree add --detach ../wt &&
+	rm wt/.git &&
+	test_path_is_missing wt/.git &&
+	git -C main worktree repair &&
+	echo "gitdir: ../main/.git/worktrees/wt" >expect &&
+	test_cmp expect wt/.git
 
-  git switch -c <new-branch-name>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) 49cd008] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (detached HEAD 49cd008)
+HEAD is now at 49cd008 init
+repair: .git file broken: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/wt
+ok 22 - repair worktree with relative path with missing gitfile
 
-Or undo this operation with:
+expecting success of 2406.23 'repair absolute worktree to use relative paths': 
+	test_when_finished "rm -rf main side sidemoved" &&
+	test_create_repo main &&
+	test_commit -C main init &&
+	git -C main worktree add --detach ../side &&
+	echo "../../../../sidemoved/.git" >expect-gitdir &&
+	echo "gitdir: ../main/.git/worktrees/side" >expect-gitfile &&
+	mv side sidemoved &&
+	git -C main worktree repair --relative-paths ../sidemoved &&
+	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
+	test_cmp expect-gitfile sidemoved/.git
 
-  git switch -
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) 7e6fdee] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (detached HEAD 7e6fdee)
+HEAD is now at 7e6fdee init
+repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
+repair: .git file absolute/relative path mismatch: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/sidemoved
+ok 23 - repair absolute worktree to use relative paths
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 2406.24 'repair relative worktree to use absolute paths': 
+	test_when_finished "rm -rf main side sidemoved" &&
+	test_create_repo main &&
+	test_commit -C main init &&
+	git -C main worktree add --relative-paths --detach ../side &&
+	echo "$(pwd)/sidemoved/.git" >expect-gitdir &&
+	echo "gitdir: $(pwd)/main/.git/worktrees/side" >expect-gitfile &&
+	mv side sidemoved &&
+	git -C main worktree repair ../sidemoved &&
+	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
+	test_cmp expect-gitfile sidemoved/.git
 
-HEAD is now at d9df450 B
-ok 3 - example 2: binary notes
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) 6f4234e] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (detached HEAD 6f4234e)
+HEAD is now at 6f4234e init
+repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
+ok 24 - repair relative worktree to use absolute paths
 
-# passed all 3 test(s)
-1..3
+# passed all 24 test(s)
+1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3308-notes-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3308-notes-merge/.git/
-expecting success of 3308.1 'setup': 
-	test_commit 1st &&
-	test_commit 2nd &&
-	test_commit 3rd &&
-	test_commit 4th &&
-	test_commit 5th &&
-	# Create notes on 4 first commits
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "Notes on 1st commit" 1st &&
-	git notes add -m "Notes on 2nd commit" 2nd &&
-	git notes add -m "Notes on 3rd commit" 3rd &&
-	git notes add -m "Notes on 4th commit" 4th &&
-	# Copy notes to remote-notes
-	git fetch . refs/notes/*:refs/remote-notes/origin/* &&
-
-	test_oid_cache <<-EOF
-	hash4a sha1:5e93d24084d32e1cb61f7070505b9d2530cca987
-	hash3a sha1:8366731eeee53787d2bdf8fc1eff7d94757e8da0
-	hash2a sha1:eede89064cd42441590d6afec6c37b321ada3389
-	hash1a sha1:daa55ffad6cb99bf64226532147ffcaf5ce8bdd1
-	hash5b sha1:0f2efbd00262f2fd41dfae33df8765618eeacd99
-	hash4b sha1:dec2502dac3ea161543f71930044deff93fa945c
-	hash3b sha1:4069cdb399fd45463ec6eef8e051a16a03592d91
-	hash2c sha1:d000d30e6ddcfce3a8122c403226a2ce2fd04d9d
-	hash1c sha1:43add6bd0c8c0bc871ac7991e0f5573cfba27804
-	hash4d sha1:1f257a3a90328557c452f0817d6cc50c89d315d4
-	hash3d sha1:05a4927951bcef347f51486575b878b2b60137f2
-
-	hash4a sha256:eef876be1d32ac2e2e42240e0429325cec116e55e88cb2969899fac695aa762f
-	hash3a sha256:cf7cd1bc091d7ba4166a86df864110e42087cd893a5ae96bc50d637e0290939d
-	hash2a sha256:21ddde7ebce2c285213898cb04deca0fd3209610cf7aaf8222e4e2f45262fae2
-	hash1a sha256:f9fe0eda16c6027732ed9d4295689a03abd16f893be69b3dcbf4037ddb191921
-	hash5b sha256:20046f2244577797a9e3d3f790ea9eca4d8a6bafb2a5570bcb0e03aa02ce100b
-	hash4b sha256:f90563d134c61a95bb88afbd45d48ccc9e919c62aa6fbfcd483302b3e4d8dbcb
-	hash3b sha256:988f2aca9f2d87e93e6a73197c2bb99560cc44a2f92d18653968f956f01221e0
-	hash2c sha256:84153b777b4d42827a756c6578dcdb59d8ae5d1360b874fb37c430150c825c26
-	hash1c sha256:9beb2bc4eef72e4c4087be168a20573e34d993d9ab1883055f23e322afa06567
-	hash4d sha256:32de39dc06e679a7abb2d4a55ede7709b3124340a4a90aa305971b1c72ac319d
-	hash3d sha256:fa73b20e41cbb7541c4c81d1535016131dbfbeb05bf6a71f6115e9cad31c7af5
-	EOF
+*** t2402-worktree-list.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/.git/
+expecting success of 2402.1 'setup': 
+	test_commit init
 
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-[master 7a4ca6e] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2nd.t
-[master d07d62e] 3rd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3rd.t
-[master 0f7aa3e] 4th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4th.t
-[master 7f9ad88] 5th
+[main (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 5th.t
-From .
- * [new ref]         refs/notes/x -> refs/remote-notes/origin/x
+ create mode 100644 init.t
 ok 1 - setup
 
-expecting success of 3308.2 'verify initial notes (x)': 
-	verify_notes x
-
-ok 2 - verify initial notes (x)
-
-expecting success of 3308.3 'fail to merge empty notes ref into empty notes ref (z => y)': 
-	test_must_fail git -c "core.notesRef=refs/notes/y" notes merge z
-
-fatal: Cannot merge empty notes ref (refs/notes/z) into empty notes ref (refs/notes/y)
-ok 3 - fail to merge empty notes ref into empty notes ref (z => y)
-
-expecting success of 3308.4 'fail to merge into various non-notes refs': 
-	test_must_fail git -c "core.notesRef=refs/notes" notes merge x &&
-	test_must_fail git -c "core.notesRef=refs/notes/" notes merge x &&
-	git update-ref refs/notes/dir/foo HEAD &&
-	test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
-	test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
-	test_must_fail git -c "core.notesRef=refs/heads/main" notes merge x &&
-	test_must_fail git -c "core.notesRef=refs/notes/y:" notes merge x &&
-	test_must_fail git -c "core.notesRef=refs/notes/y:foo" notes merge x &&
-	test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
+expecting success of 2402.2 'rev-parse --git-common-dir on main worktree': 
+	git rev-parse --git-common-dir >actual &&
+	echo .git >expected &&
+	test_cmp expected actual &&
+	mkdir sub &&
+	git -C sub rev-parse --git-common-dir >actual2 &&
+	echo ../.git >expected2 &&
+	test_cmp expected2 actual2
 
-fatal: refusing to merge notes in refs/notes (outside of refs/notes/)
-fatal: Failed to resolve local notes ref 'refs/notes/'
-fatal: update_ref failed for ref 'refs/notes/dir': cannot lock ref 'refs/notes/dir': 'refs/notes/dir/foo' exists; cannot create 'refs/notes/dir'
-fatal: Failed to resolve local notes ref 'refs/notes/dir/'
-fatal: refusing to merge notes in refs/heads/main (outside of refs/notes/)
-fatal: Failed to resolve local notes ref 'refs/notes/y:'
-fatal: Failed to resolve local notes ref 'refs/notes/y:foo'
-fatal: Failed to resolve local notes ref 'refs/notes/foo^{bar'
-ok 4 - fail to merge into various non-notes refs
+ok 2 - rev-parse --git-common-dir on main worktree
 
-expecting success of 3308.5 'merge non-notes ref into empty notes ref (remote-notes/origin/x => v)': 
-	git config core.notesRef refs/notes/v &&
-	git notes merge refs/remote-notes/origin/x &&
-	verify_notes v &&
-	# refs/remote-notes/origin/x and v should point to the same notes commit
-	test "$(git rev-parse refs/remote-notes/origin/x)" = "$(git rev-parse refs/notes/v)"
+expecting success of 2402.3 'rev-parse --git-path objects linked worktree': 
+	echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
+	test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
+	git worktree add --detach linked-tree main &&
+	git -C linked-tree rev-parse --git-path objects >actual &&
+	test_cmp expect actual
 
-ok 5 - merge non-notes ref into empty notes ref (remote-notes/origin/x => v)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 3 - rev-parse --git-path objects linked worktree
 
-expecting success of 3308.6 'merge notes into empty notes ref (x => y)': 
-	git config core.notesRef refs/notes/y &&
-	git notes merge x &&
-	verify_notes y &&
-	# x and y should point to the same notes commit
-	test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
+expecting success of 2402.4 '"list" all worktrees from main': 
+	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
+	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
 
-ok 6 - merge notes into empty notes ref (x => y)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 4 - "list" all worktrees from main
 
-expecting success of 3308.7 'merge empty notes ref (z => y)': 
-	git notes merge z &&
-	# y should not change (still == x)
-	test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
+expecting success of 2402.5 '"list" all worktrees from linked': 
+	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
+	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C here worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
 
-ok 7 - merge empty notes ref (z => y)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 5 - "list" all worktrees from linked
 
-expecting success of 3308.8 'change notes on other notes ref (y)': 
-	# Not touching notes to 1st commit
-	git notes remove 2nd &&
-	git notes append -m "More notes on 3rd commit" 3rd &&
-	git notes add -f -m "New notes on 4th commit" 4th &&
-	git notes add -m "Notes on 5th commit" 5th
+expecting success of 2402.6 '"list" all worktrees --porcelain': 
+	echo "worktree $(git rev-parse --show-toplevel)" >expect &&
+	echo "HEAD $(git rev-parse HEAD)" >>expect &&
+	echo "branch $(git symbolic-ref HEAD)" >>expect &&
+	echo >>expect &&
+	test_when_finished "rm -rf here actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
+	echo "HEAD $(git rev-parse HEAD)" >>expect &&
+	echo "detached" >>expect &&
+	echo >>expect &&
+	git worktree list --porcelain >actual &&
+	test_cmp expect actual
 
-Removing note for object 2nd
-Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
-ok 8 - change notes on other notes ref (y)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 6 - "list" all worktrees --porcelain
 
-expecting success of 3308.9 'merge previous notes commit (y^ => y) => No-op': 
-	pre_state="$(git rev-parse refs/notes/y)" &&
-	git notes merge y^ &&
-	# y should not move
-	test "$pre_state" = "$(git rev-parse refs/notes/y)"
+expecting success of 2402.7 '"list" all worktrees --porcelain -z': 
+	test_when_finished "rm -rf here _actual actual expect &&
+				git worktree prune" &&
+	printf "worktree %sQHEAD %sQbranch %sQQ" \
+		"$(git rev-parse --show-toplevel)" \
+		$(git rev-parse HEAD --symbolic-full-name HEAD) >expect &&
+	git worktree add --detach here main &&
+	printf "worktree %sQHEAD %sQdetachedQQ" \
+		"$(git -C here rev-parse --show-toplevel)" \
+		"$(git rev-parse HEAD)" >>expect &&
+	git worktree list --porcelain -z >_actual &&
+	nul_to_q <_actual >actual &&
+	test_cmp expect actual
 
-Already up to date.
-ok 9 - merge previous notes commit (y^ => y) => No-op
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 7 - "list" all worktrees --porcelain -z
 
-expecting success of 3308.10 'verify changed notes on other notes ref (y)': 
-	verify_notes y
+expecting success of 2402.8 '"list" -z fails without --porcelain': 
+	test_must_fail git worktree list -z
 
-ok 10 - verify changed notes on other notes ref (y)
+fatal: the option '-z' requires '--porcelain'
+ok 8 - "list" -z fails without --porcelain
 
-expecting success of 3308.11 'verify unchanged notes on original notes ref (x)': 
-	verify_notes x
+expecting success of 2402.9 '"list" all worktrees with locked annotation': 
+	test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
+	git worktree add --detach locked main &&
+	git worktree add --detach unlocked main &&
+	git worktree lock locked &&
+	test_when_finished "git worktree unlock locked" &&
+	git worktree list >out &&
+	grep "/locked  *[0-9a-f].* locked$" out &&
+	! grep "/unlocked  *[0-9a-f].* locked$" out
 
-ok 11 - verify unchanged notes on original notes ref (x)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/locked    2519212 (detached HEAD) locked
+ok 9 - "list" all worktrees with locked annotation
 
-expecting success of 3308.12 'merge original notes (x) into changed notes (y) => No-op': 
-	git notes merge -vvv x &&
-	verify_notes y &&
-	verify_notes x
+expecting success of 2402.10 '"list" all worktrees --porcelain with locked': 
+	test_when_finished "rm -rf locked1 locked2 unlocked out actual expect && git worktree prune" &&
+	echo "locked" >expect &&
+	echo "locked with reason" >>expect &&
+	git worktree add --detach locked1 &&
+	git worktree add --detach locked2 &&
+	# unlocked worktree should not be annotated with "locked"
+	git worktree add --detach unlocked &&
+	git worktree lock locked1 &&
+	test_when_finished "git worktree unlock locked1" &&
+	git worktree lock locked2 --reason "with reason" &&
+	test_when_finished "git worktree unlock locked2" &&
+	git worktree list --porcelain >out &&
+	grep "^locked" out >actual &&
+	test_cmp expect actual
 
-One merge base found (bf2877f)
-Merging remote commit bf2877f into local commit 21b8c5e with merge-base bf2877f
-Already up to date.
-ok 12 - merge original notes (x) into changed notes (y) => No-op
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 10 - "list" all worktrees --porcelain with locked
 
-expecting success of 3308.13 'merge changed (y) into original (x) => Fast-forward': 
-	git config core.notesRef refs/notes/x &&
-	git notes merge y &&
-	verify_notes x &&
-	verify_notes y &&
-	# x and y should point to same the notes commit
-	test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
+expecting success of 2402.11 '"list" all worktrees --porcelain with locked reason newline escaped': 
+	test_when_finished "rm -rf locked_lf locked_crlf out actual expect && git worktree prune" &&
+	printf "locked \"locked\\\\r\\\\nreason\"\n" >expect &&
+	printf "locked \"locked\\\\nreason\"\n" >>expect &&
+	git worktree add --detach locked_lf &&
+	git worktree add --detach locked_crlf &&
+	git worktree lock locked_lf --reason "$(printf "locked\nreason")" &&
+	test_when_finished "git worktree unlock locked_lf" &&
+	git worktree lock locked_crlf --reason "$(printf "locked\r\nreason")" &&
+	test_when_finished "git worktree unlock locked_crlf" &&
+	git worktree list --porcelain >out &&
+	grep "^locked" out >actual &&
+	test_cmp expect actual
 
-Fast-forward
-ok 13 - merge changed (y) into original (x) => Fast-forward
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 11 - "list" all worktrees --porcelain with locked reason newline escaped
 
-expecting success of 3308.14 'merge empty notes ref (z => y)': 
-	# Prepare empty (but valid) notes ref (z)
-	git config core.notesRef refs/notes/z &&
-	git notes add -m "foo" &&
-	git notes remove &&
-	git notes >output_notes_z &&
-	test_must_be_empty output_notes_z &&
-	# Do the merge (z => y)
-	git config core.notesRef refs/notes/y &&
-	git notes merge z &&
-	verify_notes y &&
-	# y should no longer point to the same notes commit as x
-	test "$(git rev-parse refs/notes/x)" != "$(git rev-parse refs/notes/y)"
+expecting success of 2402.12 '"list" all worktrees with prunable annotation': 
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* prunable$"
 
-Removing note for object HEAD
-ok 14 - merge empty notes ref (z => y)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
+ok 12 - "list" all worktrees with prunable annotation
 
-expecting success of 3308.15 'change notes on other notes ref (y)': 
-	# Append to 1st commit notes
-	git notes append -m "More notes on 1st commit" 1st &&
-	# Add new notes to 2nd commit
-	git notes add -m "New notes on 2nd commit" 2nd &&
-	verify_notes y
+expecting success of 2402.13 '"list" all worktrees --porcelain with prunable': 
+	test_when_finished "rm -rf prunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	rm -rf prunable &&
+	git worktree list --porcelain >out &&
+	sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
+	test_grep "^prunable gitdir file points to non-existent location$" only_prunable
 
-ok 15 - change notes on other notes ref (y)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+prunable gitdir file points to non-existent location
+ok 13 - "list" all worktrees --porcelain with prunable
 
-expecting success of 3308.16 'change notes on notes ref (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes remove 3rd &&
-	git notes append -m "More notes on 4th commit" 4th &&
-	verify_notes x
+expecting success of 2402.14 '"list" all worktrees with prunable consistent with "prune"': 
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* unprunable$" out &&
+	git worktree prune --verbose 2>out &&
+	test_grep "^Removing worktrees/prunable" out &&
+	test_grep ! "^Removing worktrees/unprunable" out
 
-Removing note for object 3rd
-ok 16 - change notes on notes ref (x)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
+Removing worktrees/prunable: gitdir file points to non-existent location
+ok 14 - "list" all worktrees with prunable consistent with "prune"
 
-expecting success of 3308.17 'merge y into x => Non-conflicting 3-way merge': 
-	git notes merge y &&
-	verify_notes x &&
-	verify_notes y
+expecting success of 2402.15 '"list" --verbose and --porcelain mutually exclusive': 
+	test_must_fail git worktree list --verbose --porcelain
 
-ok 17 - merge y into x => Non-conflicting 3-way merge
+fatal: options '--verbose' and '--porcelain' cannot be used together
+ok 15 - "list" --verbose and --porcelain mutually exclusive
 
-expecting success of 3308.18 'create notes on new, separate notes ref (w)': 
-	git config core.notesRef refs/notes/w &&
-	# Add same note as refs/notes/y on 2nd commit
-	git notes add -m "New notes on 2nd commit" 2nd &&
-	# Add new note on 3rd commit (non-conflicting)
-	git notes add -m "New notes on 3rd commit" 3rd &&
-	# Verify state of notes on new, separate notes ref (w)
-	verify_notes w
+expecting success of 2402.16 '"list" all worktrees --verbose with locked': 
+	test_when_finished "rm -rf locked1 locked2 out actual expect && git worktree prune" &&
+	git worktree add locked1 --detach &&
+	git worktree add locked2 --detach &&
+	git worktree lock locked1 &&
+	test_when_finished "git worktree unlock locked1" &&
+	git worktree lock locked2 --reason "with reason" &&
+	test_when_finished "git worktree unlock locked2" &&
+	echo "$(git -C locked2 rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tlocked: with reason\n" >>expect &&
+	git worktree list --verbose >out &&
+	grep "/locked1  *[0-9a-f].* locked$" out &&
+	sed -n "s/  */ /g;/\/locked2  *[0-9a-f].*$/,/locked: .*$/p" <out >actual &&
+	test_cmp actual expect
 
-ok 18 - create notes on new, separate notes ref (w)
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/locked1  2519212 (detached HEAD) locked
+ok 16 - "list" all worktrees --verbose with locked
 
-expecting success of 3308.19 'merge w into x => Non-conflicting history-less merge': 
-	git config core.notesRef refs/notes/x &&
-	git notes merge w &&
-	# Verify new state of notes on other notes ref (x)
-	verify_notes x &&
-	# Also verify that nothing changed on other notes refs (y and w)
-	verify_notes y &&
-	verify_notes w
+expecting success of 2402.17 '"list" all worktrees --verbose with prunable': 
+	test_when_finished "rm -rf prunable out actual expect && git worktree prune" &&
+	git worktree add prunable --detach &&
+	echo "$(git -C prunable rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tprunable: gitdir file points to non-existent location\n" >>expect &&
+	rm -rf prunable &&
+	git worktree list --verbose >out &&
+	sed -n "s/  */ /g;/\/prunable  *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
+	test_cmp actual expect
 
-ok 19 - merge w into x => Non-conflicting history-less merge
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 17 - "list" all worktrees --verbose with prunable
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3200-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/.git/
-expecting success of 3200.1 'prepare a trivial repository': 
-	echo Hello >A &&
-	git update-index --add A &&
-	git commit -m "Initial commit." &&
-	git branch -M main &&
-	echo World >>A &&
-	git update-index --add A &&
-	git commit -m "Second commit." &&
-	HEAD=$(git rev-parse --verify HEAD)
+expecting success of 2402.18 'bare repo setup': 
+	git init --bare bare1 &&
+	echo "data" >file1 &&
+	git add file1 &&
+	git commit -m"File1: add data" &&
+	git push bare1 main &&
+	git reset --hard HEAD^
 
-[main (root-commit) 2daebe9] Initial commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[main da664a6] Second commit.
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/bare1/
+[main 7c81006] File1: add data
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - prepare a trivial repository
-
-expecting success of 3200.2 'git branch --help should not have created a bogus branch': 
-	test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&
-	test_ref_missing refs/heads/--help
-
-error: reference does not exist
-ok 2 - git branch --help should not have created a bogus branch
-
-expecting success of 3200.3 'branch -h in broken repository': 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init -b main &&
-		>.git/refs/heads/main &&
-		test_expect_code 129 git branch -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/broken/.git/
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-ok 3 - branch -h in broken repository
-
-expecting success of 3200.4 'git branch abc should create a branch': 
-	git branch abc &&
-	test_ref_exists refs/heads/abc
-
-ok 4 - git branch abc should create a branch
+ create mode 100644 file1
+To bare1
+ * [new branch]      main -> main
+HEAD is now at 2519212 init
+ok 18 - bare repo setup
 
-expecting success of 3200.5 'git branch abc should fail when abc exists': 
-	test_must_fail git branch abc
+expecting success of 2402.19 '"list" all worktrees from bare main': 
+	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "$(pwd)/bare1 (bare)" >expect &&
+	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C bare1 worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
 
-fatal: a branch named 'abc' already exists
-ok 5 - git branch abc should fail when abc exists
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 19 - "list" all worktrees from bare main
 
-expecting success of 3200.6 'git branch --force abc should fail when abc is checked out': 
-	test_when_finished git switch main &&
-	git switch abc &&
-	test_must_fail git branch --force abc HEAD~1
+expecting success of 2402.20 '"list" all worktrees --porcelain from bare main': 
+	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "worktree $(pwd)/bare1" >expect &&
+	echo "bare" >>expect &&
+	echo >>expect &&
+	echo "worktree $(git -C there rev-parse --show-toplevel)" >>expect &&
+	echo "HEAD $(git -C there rev-parse HEAD)" >>expect &&
+	echo "detached" >>expect &&
+	echo >>expect &&
+	git -C bare1 worktree list --porcelain >actual &&
+	test_cmp expect actual
 
-Switched to branch 'abc'
-fatal: cannot force update the branch 'abc' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch'
-Switched to branch 'main'
-ok 6 - git branch --force abc should fail when abc is checked out
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 20 - "list" all worktrees --porcelain from bare main
 
-expecting success of 3200.7 'git branch --force abc should succeed when abc exists': 
-	git rev-parse HEAD~1 >expect &&
-	git branch --force abc HEAD~1 &&
-	git rev-parse abc >actual &&
+expecting success of 2402.21 '"list" all worktrees from linked with a bare main': 
+	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "$(pwd)/bare1 (bare)" >expect &&
+	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C there worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
 	test_cmp expect actual
 
-ok 7 - git branch --force abc should succeed when abc exists
-
-expecting success of 3200.8 'git branch a/b/c should create a branch': 
-	git branch a/b/c &&
-	test_ref_exists refs/heads/a/b/c
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 21 - "list" all worktrees from linked with a bare main
 
-ok 8 - git branch a/b/c should create a branch
+expecting success of 2402.22 'bare repo cleanup': 
+	rm -rf bare1
 
-expecting success of 3200.9 'git branch mb main... should create a branch': 
-	git branch mb main... &&
-	test_ref_exists refs/heads/mb
+ok 22 - bare repo cleanup
 
-ok 9 - git branch mb main... should create a branch
+expecting success of 2402.23 'broken main worktree still at the top': 
+	git init broken-main &&
+	(
+		cd broken-main &&
+		test_commit new &&
+		git worktree add linked &&
+		cat >expected <<-EOF &&
+		worktree $(pwd)
+		HEAD $ZERO_OID
 
-expecting success of 3200.10 'git branch HEAD should fail': 
-	test_must_fail git branch HEAD
+		EOF
+		cd linked &&
+		echo "worktree $(pwd)" >expected &&
+		(cd ../ && test-tool ref-store main create-symref HEAD .broken ) &&
+		git worktree list --porcelain >out &&
+		head -n 3 out >actual &&
+		test_cmp ../expected actual &&
+		git worktree list >out &&
+		head -n 1 out >actual.2 &&
+		grep -F "(error)" actual.2
+	)
 
-fatal: 'HEAD' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 10 - git branch HEAD should fail
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/broken-main/.git/
+[main (root-commit) 3325ee1] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Preparing worktree (new branch 'linked')
+HEAD is now at 3325ee1 new
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/broken-main         0000000 (error)
+ok 23 - broken main worktree still at the top
 
-expecting success of 3200.11 'git branch --create-reflog d/e/f should create a branch and a log': 
-	GIT_COMMITTER_DATE="2005-05-26 23:30" \
-	git -c core.logallrefupdates=false branch --create-reflog d/e/f &&
-	test_ref_exists refs/heads/d/e/f &&
-	cat >expect <<-EOF &&
-	$HEAD refs/heads/d/e/f@{0}: branch: Created from main
+expecting success of 2402.24 'linked worktrees are sorted': 
+	test_when_finished "rm -rf sorted" &&
+	mkdir sorted &&
+	git init sorted/main &&
+	(
+		cd sorted/main &&
+		test_tick &&
+		test_commit new &&
+		git worktree add ../first &&
+		git worktree add ../second &&
+		git worktree list --porcelain >out &&
+		grep ^worktree out >actual
+	) &&
+	cat >expected <<-EOF &&
+	worktree $(pwd)/sorted/main
+	worktree $(pwd)/sorted/first
+	worktree $(pwd)/sorted/second
 	EOF
-	git reflog show --no-abbrev-commit refs/heads/d/e/f >actual &&
-	test_cmp expect actual
-
-ok 11 - git branch --create-reflog d/e/f should create a branch and a log
-
-expecting success of 3200.12 'git branch -d d/e/f should delete a branch and a log': 
-	git branch -d d/e/f &&
-	test_ref_missing refs/heads/d/e/f &&
-	test_must_fail git reflog exists refs/heads/d/e/f
+	test_cmp expected sorted/main/actual
 
-Deleted branch d/e/f (was da664a6).
-error: reference does not exist
-ok 12 - git branch -d d/e/f should delete a branch and a log
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/sorted/main/.git/
+[main (root-commit) d8ef111] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Preparing worktree (new branch 'first')
+HEAD is now at d8ef111 new
+Preparing worktree (new branch 'second')
+HEAD is now at d8ef111 new
+ok 24 - linked worktrees are sorted
 
-expecting success of 3200.13 'git branch j/k should work after branch j has been deleted': 
-	git branch j &&
-	git branch -d j &&
-	git branch j/k
+expecting success of 2402.25 'linked worktrees with relative paths are shown with absolute paths': 
+	test_when_finished "rm -rf sorted" &&
+	mkdir sorted &&
+	git init sorted/main &&
+	(
+		cd sorted/main &&
+		test_tick &&
+		test_commit new &&
+		git worktree add --relative-paths ../first &&
+		git worktree add ../second &&
+		git worktree list --porcelain >out &&
+		grep ^worktree out >actual
+	) &&
+	cat >expected <<-EOF &&
+	worktree $(pwd)/sorted/main
+	worktree $(pwd)/sorted/first
+	worktree $(pwd)/sorted/second
+	EOF
+	test_cmp expected sorted/main/actual
 
-Deleted branch j (was da664a6).
-ok 13 - git branch j/k should work after branch j has been deleted
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2402-worktree-list/sorted/main/.git/
+[main (root-commit) d8ef111] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Preparing worktree (new branch 'first')
+HEAD is now at d8ef111 new
+Preparing worktree (new branch 'second')
+HEAD is now at d8ef111 new
+ok 25 - linked worktrees with relative paths are shown with absolute paths
 
-expecting success of 3200.14 'git branch l should work after branch l/m has been deleted': 
-	git branch l/m &&
-	git branch -d l/m &&
-	git branch l
+expecting success of 2402.26 'worktree path when called in .git directory': 
+	git worktree list >list1 &&
+	git -C .git worktree list >list2 &&
+	test_cmp list1 list2
 
-Deleted branch l/m (was da664a6).
-ok 14 - git branch l should work after branch l/m has been deleted
+ok 26 - worktree path when called in .git directory
 
-expecting success of 3200.15 'git branch -m dumps usage': 
-	test_expect_code 128 git branch -m 2>err &&
-	test_grep "branch name required" err
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2407-worktree-heads.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/.git/
+expecting success of 2407.1 'setup': 
+	test_commit init &&
 
-fatal: branch name required
-ok 15 - git branch -m dumps usage
+	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" &&
 
-expecting success of 3200.16 'git branch -m m broken_symref should work': 
-	test_when_finished "git branch -D broken_symref" &&
-	git branch --create-reflog m &&
-	git symbolic-ref refs/heads/broken_symref refs/heads/i_am_broken &&
-	git branch -m m broken_symref &&
-	git reflog exists refs/heads/broken_symref &&
-	test_must_fail git reflog exists refs/heads/i_am_broken
+		git checkout - &&
+		test_commit $i &&
+		git branch wt-$i &&
+		git branch fake-$i &&
+		git worktree add wt-$i wt-$i || return 1
+	done &&
 
-Deleted branch broken_symref (was da664a6).
-ok 16 - git branch -m m broken_symref should work
+	# 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
 
-expecting success of 3200.17 'git branch -m m m/m should work': 
-	git branch --create-reflog m &&
-	git branch -m m m/m &&
-	git reflog exists refs/heads/m/m
+[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.48.0~rc1+next.20250101/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
 
-ok 17 - git branch -m m m/m should work
+expecting success of 2407.2 'refuse to overwrite: checked out in worktree': 
+	for i in 1 2 3 4
+	do
+		test_must_fail git branch -f wt-$i HEAD 2>err &&
+		grep "cannot force update the branch" err &&
 
-expecting success of 3200.18 'git branch -m n/n n should work': 
-	git branch --create-reflog n/n &&
-	git branch -m n/n n &&
-	git reflog exists refs/heads/n
+		test_must_fail git branch -D wt-$i 2>err &&
+		grep "cannot delete branch" err || return 1
+	done
 
-ok 18 - git branch -m n/n n should work
+fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-1'
+error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-2'
+error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-3'
+error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-4'
+error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-4'
+ok 2 - refuse to overwrite: checked out in worktree
 
-expecting success of 3200.19 'git branch -m bbb should rename checked out branch': 
-	test_when_finished git branch -D bbb &&
-	test_when_finished git checkout main &&
-	git checkout -b aaa &&
-	git commit --allow-empty -m "a new commit" &&
-	git rev-parse aaa@{0} >expect &&
-	git branch -m bbb &&
-	git rev-parse bbb@{1} >actual &&
-	test_cmp expect actual &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/bbb >expect &&
-	test_cmp expect actual
+expecting success of 2407.3 'refuse to overwrite: worktree in bisect': 
+	test_when_finished git -C wt-4 bisect reset &&
 
-Switched to a new branch 'aaa'
-[aaa a533b01] a new commit
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
-Deleted branch bbb (was a533b01).
-ok 19 - git branch -m bbb should rename checked out branch
+	# Set up a bisect so HEAD no longer points to wt-4.
+	git -C wt-4 bisect start &&
+	git -C wt-4 bisect bad wt-4 &&
+	git -C wt-4 bisect good wt-1 &&
 
-expecting success of 3200.20 'renaming checked out branch works with d/f conflict': 
-	test_when_finished "git branch -D foo/bar || git branch -D foo" &&
-	test_when_finished git checkout main &&
-	git checkout -b foo &&
-	git branch -m foo/bar &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/foo/bar >expect &&
-	test_cmp expect actual
+	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
 
-Switched to a new branch 'foo'
-Switched to branch 'main'
-Deleted branch foo/bar (was da664a6).
-ok 20 - renaming checked out branch works with d/f conflict
+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.48.0~rc1+next.20250101/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 3200.21 'git branch -m o/o o should fail when o/p exists': 
-	git branch o/o &&
-	git branch o/p &&
-	test_must_fail git branch -m o/o o
+expecting success of 2407.4 'refuse to overwrite: worktree in rebase (apply)': 
+	test_when_finished git -C wt-2 rebase --abort &&
 
-error: 'refs/heads/o/p' exists; cannot create 'refs/heads/o'
-fatal: branch rename failed
-ok 21 - git branch -m o/o o should fail when o/p exists
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-2 rebase --apply conflict-2 &&
 
-expecting success of 3200.22 'git branch -m o/q o/p should fail when o/p exists': 
-	git branch o/q &&
-	test_must_fail git branch -m o/q o/p
+	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
 
-fatal: a branch named 'o/p' already exists
-ok 22 - git branch -m o/q o/p should fail when o/p exists
+First, rewinding head to replay your work on top of it...
+Applying: 2
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+881ff7f will conflict
+virtual 2
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in 2.t
+Auto-merging 2.t
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 2
+fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-2'
+ok 4 - refuse to overwrite: worktree in rebase (apply)
 
-expecting success of 3200.23 'git branch -M o/q o/p should work when o/p exists': 
-	git branch -M o/q o/p
+expecting success of 2407.5 'refuse to overwrite: worktree in rebase (merge)': 
+	test_when_finished git -C wt-2 rebase --abort &&
 
-ok 23 - git branch -M o/q o/p should work when o/p exists
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-2 rebase conflict-2 &&
 
-expecting success of 3200.24 'git branch -m -f o/q o/p should work when o/p exists': 
-	git branch o/q &&
-	git branch -m -f o/q o/p
+	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
 
-ok 24 - git branch -m -f o/q o/p should work when o/p exists
+Rebasing (1/1)
Auto-merging 2.t
+CONFLICT (add/add): Merge conflict in 2.t
+error: could not apply 8f55bc3... 2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 8f55bc3... 2
+fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-2'
+ok 5 - refuse to overwrite: worktree in rebase (merge)
 
-expecting success of 3200.25 'git branch -m q r/q should fail when r exists': 
-	git branch q &&
-	git branch r &&
-	test_must_fail git branch -m q r/q
+expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
+	test_when_finished git -C wt-3 rebase --abort &&
 
-error: 'refs/heads/r' exists; cannot create 'refs/heads/r/q'
-fatal: branch rename failed
-ok 25 - git branch -m q r/q should fail when r exists
+	git branch -f can-be-updated wt-3 &&
+	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
 
-expecting success of 3200.26 'git branch -M foo bar should fail when bar is checked out': 
-	git branch bar &&
-	git checkout -b foo &&
-	test_must_fail git branch -M bar foo
+	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
 
-Switched to a new branch 'foo'
-fatal: cannot force update the branch 'foo' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch'
-ok 26 - git branch -M foo bar should fail when bar is checked out
+Rebasing (1/3)
Auto-merging 3.t
+CONFLICT (add/add): Merge conflict in 3.t
+error: could not apply 4c93b0a... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 4c93b0a... 3
+fatal: cannot force update the branch 'can-be-updated' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-3'
+ok 6 - refuse to overwrite: worktree in rebase with --update-refs
 
-expecting success of 3200.27 'git branch -M foo bar should fail when bar is checked out in worktree': 
-	git branch -f bar &&
-	test_when_finished "git worktree remove wt && git branch -D wt" &&
-	git worktree add wt &&
-	test_must_fail git branch -M bar wt
+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 &&
 
-Preparing worktree (new branch 'wt')
-HEAD is now at da664a6 Second commit.
-fatal: cannot force update the branch 'wt' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/wt'
-Deleted branch wt (was da664a6).
-ok 27 - git branch -M foo bar should fail when bar is checked out in worktree
+	# General fetch into refs/heads/ will fail on first ref,
+	# so use a generic error message check.
+	test_must_fail git fetch server +refs/heads/*:refs/heads/* 2>err &&
+	grep "refusing to fetch into branch" err
 
-expecting success of 3200.28 'git branch -M baz bam should succeed when baz is checked out': 
-	git checkout -b baz &&
-	git branch bam &&
-	git branch -M baz bam &&
-	test $(git rev-parse --abbrev-ref HEAD) = bam
+fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads'
+ok 7 - refuse to fetch over ref: checked out
 
-Switched to a new branch 'baz'
-ok 28 - git branch -M baz bam should succeed when baz is checked out
+expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
+	test_when_finished git -C wt-4 bisect reset &&
 
-expecting success of 3200.29 'git branch -M baz bam should add entries to HEAD reflog': 
-	git reflog show HEAD >actual &&
-	grep "HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam" actual
+	# 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 &&
 
-da664a6 HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam
-ok 29 - git branch -M baz bam should add entries to HEAD reflog
+	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
+	grep "refusing to fetch into branch" err
 
-expecting success of 3200.30 'git branch -M should leave orphaned HEAD alone': 
-	git init -b main orphan &&
-	(
-		cd orphan &&
-		test_commit initial &&
-		git checkout --orphan lonely &&
-		git symbolic-ref HEAD >expect &&
-		echo refs/heads/lonely >actual &&
-		test_cmp expect actual &&
-		test_ref_missing refs/head/lonely &&
-		git branch -M main mistress &&
-		git symbolic-ref HEAD >expect &&
-		test_cmp expect actual
-	)
+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.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/orphan/.git/
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'lonely'
-error: reference does not exist
-ok 30 - git branch -M should leave orphaned HEAD alone
+expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
+	test_when_finished git -C wt-3 rebase --abort &&
 
-expecting success of 3200.31 'resulting reflog can be shown by log -g': 
-	oid=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-	HEAD@{0} $oid Branch: renamed refs/heads/baz to refs/heads/bam
-	HEAD@{2} $oid checkout: moving from foo to baz
-	EOF
-	git log -g --format="%gd %H %gs" -2 HEAD >actual &&
-	test_cmp expect actual
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-3 rebase conflict-3 &&
 
-ok 31 - resulting reflog can be shown by log -g
+	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
+	grep "refusing to fetch into branch" err
 
-expecting success of 3200.32 'git branch -M baz bam should succeed when baz is checked out as linked working tree': 
-	git checkout main &&
-	git worktree add -b baz bazdir &&
-	git worktree add -f bazdir2 baz &&
-	git branch -M baz bam &&
-	test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
-	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
-	rm -r bazdir bazdir2 &&
-	git worktree prune
+Rebasing (1/1)
Auto-merging 3.t
+CONFLICT (add/add): Merge conflict in 3.t
+error: could not apply 4c93b0a... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 4c93b0a... 3
+fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-3'
+ok 9 - refuse to fetch over ref: worktree in rebase
 
-Switched to branch 'main'
-Preparing worktree (new branch 'baz')
-HEAD is now at da664a6 Second commit.
-Preparing worktree (checking out 'baz')
-HEAD is now at da664a6 Second commit.
-ok 32 - git branch -M baz bam should succeed when baz is checked out as linked working tree
+expecting success of 2407.10 'refuse to overwrite when in error states': 
+	test_when_finished rm -rf .git/worktrees/wt-*/rebase-merge &&
+	test_when_finished rm -rf .git/worktrees/wt-*/BISECT_* &&
 
-expecting success of 3200.33 'git branch -M fails if updating any linked working tree fails': 
-	git worktree add -b baz bazdir1 &&
-	git worktree add -f bazdir2 baz &&
-	touch .git/worktrees/bazdir1/HEAD.lock &&
-	test_must_fail git branch -M baz bam &&
-	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
-	git branch -M bam baz &&
-	rm .git/worktrees/bazdir1/HEAD.lock &&
-	touch .git/worktrees/bazdir2/HEAD.lock &&
-	test_must_fail git branch -M baz bam &&
-	test $(git -C bazdir1 rev-parse --abbrev-ref HEAD) = bam &&
-	rm -rf bazdir1 bazdir2 &&
-	git worktree prune
+	# Both branches are currently under rebase.
+	mkdir -p .git/worktrees/wt-3/rebase-merge &&
+	touch .git/worktrees/wt-3/rebase-merge/interactive &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-3/rebase-merge/head-name &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-3/rebase-merge/onto &&
+	mkdir -p .git/worktrees/wt-4/rebase-merge &&
+	touch .git/worktrees/wt-4/rebase-merge/interactive &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-4/rebase-merge/head-name &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-4/rebase-merge/onto &&
 
-Preparing worktree (new branch 'baz')
-HEAD is now at da664a6 Second commit.
-Preparing worktree (checking out 'baz')
-HEAD is now at da664a6 Second commit.
-error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/.git/worktrees/bazdir1/HEAD.lock': File exists.
+	# 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 &&
 
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-error: HEAD of working tree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/bazdir1 is not updated
-fatal: branch renamed to bam, but HEAD is not updated
-error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/.git/worktrees/bazdir2/HEAD.lock': File exists.
+	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
 
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-error: HEAD of working tree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/bazdir2 is not updated
-fatal: branch renamed to bam, but HEAD is not updated
-ok 33 - git branch -M fails if updating any linked working tree fails
+fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t2407-worktree-heads/wt-4'
+ok 10 - refuse to overwrite when in error states
 
-expecting success of 3200.34 'git branch -M baz bam should succeed within a worktree in which baz is checked out': 
-	git checkout -b baz &&
-	git worktree add -f bazdir baz &&
+expecting success of 2407.11 'refuse to overwrite during rebase with --update-refs': 
+	git commit --fixup HEAD~2 --allow-empty &&
 	(
-		cd bazdir &&
-		git branch -M baz bam &&
-		echo bam >expect &&
-		git rev-parse --abbrev-ref HEAD >actual &&
-		test_cmp expect actual
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
+		! grep "update-refs" todo
 	) &&
-	echo bam >expect &&
-	git rev-parse --abbrev-ref HEAD >actual &&
-	test_cmp expect actual &&
-	rm -r bazdir &&
-	git worktree prune
-
-Switched to a new branch 'baz'
-Preparing worktree (checking out 'baz')
-HEAD is now at da664a6 Second commit.
-ok 34 - git branch -M baz bam should succeed within a worktree in which baz is checked out
-
-expecting success of 3200.35 'git branch -M main should work when main is checked out': 
-	git checkout main &&
-	git branch -M main
-
-Switched to branch 'main'
-ok 35 - git branch -M main should work when main is checked out
-
-expecting success of 3200.36 'git branch -M main main should work when main is checked out': 
-	git checkout main &&
-	git branch -M main main
-
-Already on 'main'
-ok 36 - git branch -M main main should work when main is checked out
+	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
+	)
 
-expecting success of 3200.37 'git branch -M topic topic should work when main is checked out': 
-	git checkout main &&
-	git branch topic &&
-	git branch -M topic topic
+[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
 
-Already on 'main'
-ok 37 - git branch -M topic topic should work when main is checked out
+expecting success of 2407.12 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
 
-expecting success of 3200.38 'git branch -M and -C fail on detached HEAD': 
-	git checkout HEAD^{} &&
-	test_when_finished git checkout - &&
-	echo "fatal: cannot rename the current branch while not on any" >expect &&
-	test_must_fail git branch -M must-fail 2>err &&
-	test_cmp expect err &&
-	echo "fatal: cannot copy the current branch while not on any" >expect &&
-	test_must_fail git branch -C must-fail 2>err &&
-	test_cmp expect err
+ok 12 - $EDITOR and friends are unchanged
 
-Note: switching to 'HEAD^{}'.
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3002-ls-files-dashpath.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3002-ls-files-dashpath/.git/
+expecting success of 3002.1 'setup': 
+	echo frotz >path0 &&
+	echo frotz >./-foo &&
+	echo 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.
+ok 1 - setup
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3002.2 'git ls-files without path restriction.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others >output &&
+	cat >expect <<-\EOF &&
+	--
+	-foo
+	output
+	path0
+	EOF
+	test_cmp output expect
 
-  git switch -c <new-branch-name>
+ok 2 - git ls-files without path restriction.
 
-Or undo this operation with:
+expecting success of 3002.3 'git ls-files with path restriction.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others path0 >output &&
+	cat >expect <<-\EOF &&
+	path0
+	EOF
+	test_cmp output expect
 
-  git switch -
+ok 3 - git ls-files with path restriction.
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3002.4 'git ls-files with path restriction with --.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- path0 >output &&
+	cat >expect <<-\EOF &&
+	path0
+	EOF
+	test_cmp output expect
 
-HEAD is now at da664a6 Second commit.
-Switched to branch 'main'
-ok 38 - git branch -M and -C fail on detached HEAD
+ok 4 - git ls-files with path restriction with --.
 
-expecting success of 3200.39 'git branch -m should work with orphan branches': 
-	test_when_finished git checkout - &&
-	test_when_finished git worktree remove -f wt &&
-	git worktree add wt --detach &&
-	# rename orphan in another worktreee
-	git -C wt checkout --orphan orphan-foo-wt &&
-	git branch -m orphan-foo-wt orphan-bar-wt &&
-	test orphan-bar-wt=$(git -C orphan-worktree branch --show-current) &&
-	# rename orphan in the current worktree
-	git checkout --orphan orphan-foo &&
-	git branch -m orphan-foo orphan-bar &&
-	test orphan-bar=$(git branch --show-current)
+expecting success of 3002.5 'git ls-files with path restriction with -- --.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- -- >output &&
+	cat >expect <<-\EOF &&
+	--
+	EOF
+	test_cmp output expect
 
-Preparing worktree (detached HEAD da664a6)
-HEAD is now at da664a6 Second commit.
-Switched to a new branch 'orphan-foo-wt'
-fatal: cannot change to 'orphan-worktree': No such file or directory
-Switched to a new branch 'orphan-foo'
-Note: switching to 'da664a6b0bffeb0904609e9e14e1beeecfe55c4a'.
+ok 5 - git ls-files with path restriction with -- --.
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 3002.6 'git ls-files with no path restriction.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- >output &&
+	cat >expect <<-\EOF &&
+	--
+	-foo
+	output
+	path0
+	EOF
+	test_cmp output expect
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
 
-  git switch -c <new-branch-name>
+ok 6 - git ls-files with no path restriction.
 
-Or undo this operation with:
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2080-parallel-checkout-basics.sh ***
+expecting success of 2080.1 'setup repo for checkout with various types of changes': 
+	test_config_global protocol.file.allow always &&
 
-  git switch -
+	git init sub &&
+	(
+		cd sub &&
+		git checkout -b B2 &&
+		echo B2 >file &&
+		git add file &&
+		git commit -m file &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		git checkout -b B1 &&
+		echo B1 >file &&
+		git add file &&
+		git commit -m file
+	) &&
 
-HEAD is now at da664a6 Second commit.
-ok 39 - git branch -m should work with orphan branches
+	git init various &&
+	(
+		cd various &&
 
-expecting success of 3200.40 'git branch -d on orphan HEAD (merged)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	test_when_finished "rm -rf .git/objects/commit-graph*" &&
-	git commit-graph write --reachable &&
-	git branch --track to-delete main &&
-	git branch -d to-delete
+		git checkout -b B1 &&
+		mkdir a c e &&
+		echo a/a >a/a &&
+		echo b >b &&
+		echo c/c >c/c &&
+		test_ln_s_add c d &&
+		echo e/e >e/e &&
+		git submodule add ../sub f &&
+		git submodule add ../sub g &&
+		test_ln_s_add c h &&
 
-Switched to a new branch 'orphan'
-branch 'to-delete' set up to track 'main'.
-warning: deleting branch 'to-delete' that has been merged to
-         'refs/heads/main', but not yet merged to HEAD
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 40 - git branch -d on orphan HEAD (merged)
+		echo "B1 i" >i &&
+		test_ln_s_add c j &&
+		git submodule add -b B1 ../sub k &&
+		mkdir l &&
+		echo l/l >l/l &&
 
-expecting success of 3200.41 'git branch -d on orphan HEAD (merged, graph)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	git branch --track to-delete main &&
-	git branch -d to-delete
+		git add . &&
+		git commit -m B1 &&
 
-Switched to a new branch 'orphan'
-branch 'to-delete' set up to track 'main'.
-warning: deleting branch 'to-delete' that has been merged to
-         'refs/heads/main', but not yet merged to HEAD
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 41 - git branch -d on orphan HEAD (merged, graph)
+		git checkout -b B2 &&
+		git rm -rf :^.gitmodules :^k &&
+		mkdir b d f &&
+		echo a >a &&
+		echo b/b >b/b &&
+		test_ln_s_add b c &&
+		echo d/d >d/d &&
+		git submodule add ../sub e &&
+		echo f/f >f/f &&
+		test_ln_s_add b g &&
+		git submodule add ../sub h &&
 
-expecting success of 3200.42 'git branch -d on orphan HEAD (unmerged)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	test_when_finished "git branch -D to-delete" &&
-	git branch to-delete main &&
-	test_must_fail git branch -d to-delete 2>err &&
-	grep "not fully merged" err
+		echo "B2 i" >i &&
+		test_ln_s_add b j &&
+		git -C k checkout B2 &&
+		mkdir m &&
+		echo m/m >m/m &&
 
-Switched to a new branch 'orphan'
-error: the branch 'to-delete' is not fully merged
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 42 - git branch -d on orphan HEAD (unmerged)
+		git add . &&
+		git commit -m B2 &&
 
-expecting success of 3200.43 'git branch -d on orphan HEAD (unmerged, graph)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	test_when_finished "git branch -D to-delete" &&
-	git branch to-delete main &&
-	test_when_finished "rm -rf .git/objects/commit-graph*" &&
-	git commit-graph write --reachable &&
-	test_must_fail git branch -d to-delete 2>err &&
-	grep "not fully merged" err
+		git checkout --recurse-submodules B1
+	)
 
-Switched to a new branch 'orphan'
-error: the branch 'to-delete' is not fully merged
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 43 - git branch -d on orphan HEAD (unmerged, graph)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub/.git/
+Switched to a new branch 'B2'
+[B2 (root-commit) 880a0eb] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'B1'
+[B1 0f06b39] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/.git/
+Switched to a new branch 'B1'
+checking prerequisite: SYMLINKS
 
-expecting success of 3200.44 'git branch -v -d t should work': 
-	git branch t &&
-	git rev-parse --verify refs/heads/t &&
-	git branch -v -d t &&
-	test_must_fail git rev-parse --verify refs/heads/t
+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
 
-da664a6b0bffeb0904609e9e14e1beeecfe55c4a
-Deleted branch t (was da664a6).
-fatal: Needed a single revision
-ok 44 - git branch -v -d t should work
+)
+prerequisite SYMLINKS ok
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/f'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/g'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/k'...
+done.
+[B1 (root-commit) 46a23ce] B1
+ Author: A U Thor <author@example.com>
+ 13 files changed, 22 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 a/a
+ create mode 100644 b
+ create mode 100644 c/c
+ create mode 120000 d
+ create mode 100644 e/e
+ create mode 160000 f
+ create mode 160000 g
+ create mode 120000 h
+ create mode 100644 i
+ create mode 120000 j
+ create mode 160000 k
+ create mode 100644 l/l
+Switched to a new branch 'B2'
+rm 'a/a'
+rm 'b'
+rm 'c/c'
+rm 'd'
+rm 'e/e'
+rm 'f'
+rm 'g'
+rm 'h'
+rm 'i'
+rm 'j'
+rm 'l/l'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/e'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various/h'...
+done.
+Switched to a new branch 'B2'
+branch 'B2' set up to track 'origin/B2'.
+[B2 176cae8] B2
+ Author: A U Thor <author@example.com>
+ 19 files changed, 17 insertions(+), 17 deletions(-)
+ create mode 100644 a
+ delete mode 100644 a/a
+ delete mode 100644 b
+ create mode 100644 b/b
+ create mode 120000 c
+ delete mode 100644 c/c
+ delete mode 120000 d
+ create mode 100644 d/d
+ rename f => e (100%)
+ delete mode 100644 e/e
+ create mode 100644 f/f
+ mode change 160000 => 120000 g
+ mode change 120000 => 160000 h
+ delete mode 100644 l/l
+ create mode 100644 m/m
+Switched to branch 'B1'
+ok 1 - setup repo for checkout with various types of changes
 
-expecting success of 3200.45 'git branch -v -m t s should work': 
-	git branch t &&
-	git rev-parse --verify refs/heads/t &&
-	git branch -v -m t s &&
-	test_must_fail git rev-parse --verify refs/heads/t &&
-	git rev-parse --verify refs/heads/s &&
-	git branch -d s
+expecting success of 2080.2 'sequential checkout': 
+		repo=various_$mode &&
+		cp -R -P various $repo &&
 
-da664a6b0bffeb0904609e9e14e1beeecfe55c4a
-fatal: Needed a single revision
-da664a6b0bffeb0904609e9e14e1beeecfe55c4a
-Deleted branch s (was da664a6).
-ok 45 - git branch -v -m t s should work
+		# The just copied files have more recent timestamps than their
+		# associated index entries. So refresh the cached timestamps
+		# to avoid an "entry not up-to-date" error from `git checkout`.
+		# We only have to do this for the submodules as `git checkout`
+		# will already refresh the superproject index before performing
+		# the up-to-date check.
+		#
+		git -C $repo submodule foreach "git update-index --refresh" &&
 
-expecting success of 3200.46 'git branch -m -d t s should fail': 
-	git branch t &&
-	git rev-parse refs/heads/t &&
-	test_must_fail git branch -m -d t s &&
-	git branch -d t &&
-	test_must_fail git rev-parse refs/heads/t
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git -C $repo checkout --recurse-submodules B2 &&
+		verify_checkout $repo
+	
+Entering 'f'
+Entering 'g'
+Entering 'k'
+Switched to branch 'B2'
+ok 2 - sequential checkout
 
-da664a6b0bffeb0904609e9e14e1beeecfe55c4a
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-   or: git branch [<options>] [-l] [<pattern>...]
-   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
-   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-   or: git branch [<options>] [-r | -a] [--points-at]
-   or: git branch [<options>] [-r | -a] [--format]
+expecting success of 2080.3 'parallel checkout': 
+		repo=various_$mode &&
+		cp -R -P various $repo &&
 
-Generic options
-    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
-    -q, --[no-]quiet      suppress informational messages
-    -t, --[no-]track[=(direct|inherit)]
-                          set branch tracking configuration
-    -u, --[no-]set-upstream-to <upstream>
-                          change the upstream info
-    --[no-]unset-upstream unset the upstream info
-    --[no-]color[=<when>] use colored output
-    -r, --remotes         act on remote-tracking branches
-    --contains <commit>   print only branches that contain the commit
-    --no-contains <commit>
-                          print only branches that don't contain the commit
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+		# The just copied files have more recent timestamps than their
+		# associated index entries. So refresh the cached timestamps
+		# to avoid an "entry not up-to-date" error from `git checkout`.
+		# We only have to do this for the submodules as `git checkout`
+		# will already refresh the superproject index before performing
+		# the up-to-date check.
+		#
+		git -C $repo submodule foreach "git update-index --refresh" &&
 
-Specific git-branch actions:
-    -a, --all             list both remote-tracking and local branches
-    -d, --[no-]delete     delete fully merged branch
-    -D                    delete branch (even if not merged)
-    -m, --[no-]move       move/rename a branch and its reflog
-    -M                    move/rename a branch, even if target exists
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    -c, --[no-]copy       copy a branch and its reflog
-    -C                    copy a branch, even if target exists
-    -l, --[no-]list       list branch names
-    --[no-]show-current   show current branch name
-    --[no-]create-reflog  create the branch's reflog
-    --[no-]edit-description
-                          edit the description for the branch
-    -f, --[no-]force      force creation, move/rename, deletion
-    --merged <commit>     print only branches that are merged
-    --no-merged <commit>  print only branches that are not merged
-    --[no-]column[=<style>]
-                          list branches in columns
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only branches of the object
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]format <format>
-                          format to use for the output
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git -C $repo checkout --recurse-submodules B2 &&
+		verify_checkout $repo
+	
+Entering 'f'
+Entering 'g'
+Entering 'k'
+Switched to branch 'B2'
+ok 3 - parallel checkout
 
-Deleted branch t (was da664a6).
-fatal: ambiguous argument 'refs/heads/t': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/t
-ok 46 - git branch -m -d t s should fail
+expecting success of 2080.4 'sequential-fallback checkout': 
+		repo=various_$mode &&
+		cp -R -P various $repo &&
 
-expecting success of 3200.47 'git branch --list -d t should fail': 
-	git branch t &&
-	git rev-parse refs/heads/t &&
-	test_must_fail git branch --list -d t &&
-	git branch -d t &&
-	test_must_fail git rev-parse refs/heads/t
+		# The just copied files have more recent timestamps than their
+		# associated index entries. So refresh the cached timestamps
+		# to avoid an "entry not up-to-date" error from `git checkout`.
+		# We only have to do this for the submodules as `git checkout`
+		# will already refresh the superproject index before performing
+		# the up-to-date check.
+		#
+		git -C $repo submodule foreach "git update-index --refresh" &&
 
-da664a6b0bffeb0904609e9e14e1beeecfe55c4a
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
-   or: git branch [<options>] [-l] [<pattern>...]
-   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
-   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
-   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
-   or: git branch [<options>] [-r | -a] [--points-at]
-   or: git branch [<options>] [-r | -a] [--format]
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git -C $repo checkout --recurse-submodules B2 &&
+		verify_checkout $repo
+	
+Entering 'f'
+Entering 'g'
+Entering 'k'
+Switched to branch 'B2'
+ok 4 - sequential-fallback checkout
 
-Generic options
-    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
-    -q, --[no-]quiet      suppress informational messages
-    -t, --[no-]track[=(direct|inherit)]
-                          set branch tracking configuration
-    -u, --[no-]set-upstream-to <upstream>
-                          change the upstream info
-    --[no-]unset-upstream unset the upstream info
-    --[no-]color[=<when>] use colored output
-    -r, --remotes         act on remote-tracking branches
-    --contains <commit>   print only branches that contain the commit
-    --no-contains <commit>
-                          print only branches that don't contain the commit
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+expecting success of 2080.5 'parallel checkout on clone': 
+		test_config_global protocol.file.allow always &&
+		repo=various_${mode}_clone &&
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git clone --recurse-submodules --branch B2 various $repo &&
+		verify_checkout $repo
+	
+Cloning into 'various_parallel_clone'...
+done.
+Submodule 'e' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
+Submodule 'h' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
+Submodule 'k' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/e'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/h'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/k'...
+done.
+Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
+ok 5 - parallel checkout on clone
 
-Specific git-branch actions:
-    -a, --all             list both remote-tracking and local branches
-    -d, --[no-]delete     delete fully merged branch
-    -D                    delete branch (even if not merged)
-    -m, --[no-]move       move/rename a branch and its reflog
-    -M                    move/rename a branch, even if target exists
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    -c, --[no-]copy       copy a branch and its reflog
-    -C                    copy a branch, even if target exists
-    -l, --[no-]list       list branch names
-    --[no-]show-current   show current branch name
-    --[no-]create-reflog  create the branch's reflog
-    --[no-]edit-description
-                          edit the description for the branch
-    -f, --[no-]force      force creation, move/rename, deletion
-    --merged <commit>     print only branches that are merged
-    --no-merged <commit>  print only branches that are not merged
-    --[no-]column[=<style>]
-                          list branches in columns
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only branches of the object
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
-    --[no-]recurse-submodules
-                          recurse through submodules
-    --[no-]format <format>
-                          format to use for the output
+expecting success of 2080.6 'sequential-fallback checkout on clone': 
+		test_config_global protocol.file.allow always &&
+		repo=various_${mode}_clone &&
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git clone --recurse-submodules --branch B2 various $repo &&
+		verify_checkout $repo
+	
+Cloning into 'various_sequential-fallback_clone'...
+done.
+Submodule 'e' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
+Submodule 'h' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
+Submodule 'k' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/e'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/h'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/k'...
+done.
+Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
+ok 6 - sequential-fallback checkout on clone
 
-Deleted branch t (was da664a6).
-fatal: ambiguous argument 'refs/heads/t': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/t
-ok 47 - git branch --list -d t should fail
+expecting success of 2080.7 'compare the working trees': 
+	rm -rf various_*/.git &&
+	rm -rf various_*/*/.git &&
 
-expecting success of 3200.48 'deleting checked-out branch from repo that is a submodule': 
-	test_when_finished "rm -rf repo1 repo2" &&
+	# We use `git diff` instead of `diff -r` because the latter would
+	# follow symlinks, and not all `diff` implementations support the
+	# `--no-dereference` option.
+	#
+	git diff --no-index various_sequential various_parallel &&
+	git diff --no-index various_sequential various_parallel_clone &&
+	git diff --no-index various_sequential various_sequential-fallback &&
+	git diff --no-index various_sequential various_sequential-fallback_clone
 
-	git init repo1 &&
-	git init repo1/sub &&
-	test_commit -C repo1/sub x &&
-	test_config_global protocol.file.allow always &&
-	git -C repo1 submodule add ./sub &&
-	git -C repo1 commit -m "adding sub" &&
+ok 7 - compare the working trees
 
-	git clone --recurse-submodules repo1 repo2 &&
-	git -C repo2/sub checkout -b work &&
-	test_must_fail git -C repo2/sub branch -D work
+expecting success of 2080.8 'submodules can use parallel checkout': 
+	set_checkout_config 2 0 &&
+	git init super &&
+	(
+		cd super &&
+		git init sub &&
+		test_commit -C sub A &&
+		test_commit -C sub B &&
+		git submodule add ./sub &&
+		git commit -m sub &&
+		rm sub/* &&
+		test_checkout_workers 2 git checkout --recurse-submodules .
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo1/sub/.git/
-[main (root-commit) cb85766] x
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git/
+[master (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 x.t
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
 Adding existing repo at 'sub' to the index
-[main (root-commit) 0e407d8] adding sub
+[master (root-commit) 00b6c10] sub
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 sub
-Cloning into 'repo2'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo1/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo2/sub'...
-done.
-Submodule path 'sub': checked out 'cb85766717df318a47d35b1ec7b43b1040fdc133'
-Switched to a new branch 'work'
-error: cannot delete branch 'work' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo2/.git/modules/sub'
-ok 48 - deleting checked-out branch from repo that is a submodule
+Migrating git directory of 'sub' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/super/.git/modules/sub'
+Updated 0 paths from the index
+ok 8 - submodules can use parallel checkout
 
-expecting success of 3200.49 'bare main worktree has HEAD at branch deleted by secondary worktree': 
-	test_when_finished "rm -rf nonbare base secondary" &&
+expecting success of 2080.9 'parallel checkout respects --[no]-force': 
+	set_checkout_config 2 0 &&
+	git init dirty &&
+	(
+		cd dirty &&
+		mkdir D &&
+		test_commit D/F &&
+		test_commit F &&
 
-	git init -b main nonbare &&
-	test_commit -C nonbare x &&
-	git clone --bare nonbare bare &&
-	git -C bare worktree add --detach ../secondary main &&
-	git -C secondary branch -D main
+		rm -rf D &&
+		echo changed >D &&
+		echo changed >F.t &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/nonbare/.git/
-[main (root-commit) 6f481db] x
+		# We expect 0 workers because there is nothing to be done
+		test_checkout_workers 0 git checkout HEAD &&
+		test_path_is_file D &&
+		grep changed D &&
+		grep changed F.t &&
+
+		test_checkout_workers 2 git checkout --force HEAD &&
+		test_path_is_dir D &&
+		grep D/F D/F.t &&
+		grep F F.t
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/dirty/.git/
+[master (root-commit) e516e44] D/F
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Cloning into bare repository 'bare'...
-done.
-Preparing worktree (detached HEAD 6f481db)
-HEAD is now at 6f481db x
-Deleted branch main (was 6f481db).
-ok 49 - bare main worktree has HEAD at branch deleted by secondary worktree
-
-expecting success of 3200.50 'git branch --list -v with --abbrev': 
-	test_when_finished "git branch -D t" &&
-	git branch t &&
-	git branch -v --list t >actual.default &&
-	git branch -v --list --abbrev t >actual.abbrev &&
-	test_cmp actual.default actual.abbrev &&
+ create mode 100644 D/F.t
+[master a9126ab] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+D	D/F.t
+M	F.t
+changed
+changed
+D/F
+F
+ok 9 - parallel checkout respects --[no]-force
 
-	git branch -v --list --no-abbrev t >actual.noabbrev &&
-	git branch -v --list --abbrev=0 t >actual.0abbrev &&
-	git -c core.abbrev=no branch -v --list t >actual.noabbrev-conf &&
-	test_cmp actual.noabbrev actual.0abbrev &&
-	test_cmp actual.noabbrev actual.noabbrev-conf &&
+checking prerequisite: SYMLINKS
 
-	git branch -v --list --abbrev=36 t >actual.36abbrev &&
-	# how many hexdigits are used?
-	read name objdefault rest <actual.abbrev &&
-	read name obj36 rest <actual.36abbrev &&
-	objfull=$(git rev-parse --verify 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
 
-	# are we really getting abbreviations?
-	test "$obj36" != "$objdefault" &&
-	expr "$obj36" : "$objdefault" >/dev/null &&
-	test "$objfull" != "$obj36" &&
-	expr "$objfull" : "$obj36" >/dev/null
+)
+prerequisite SYMLINKS ok
+expecting success of 2080.10 'parallel checkout checks for symlinks in leading dirs': 
+	set_checkout_config 2 0 &&
+	git init symlinks &&
+	(
+		cd symlinks &&
+		mkdir D untracked &&
+		# Commit 2 files to have enough work for 2 parallel workers
+		test_commit D/A &&
+		test_commit D/B &&
+		rm -rf D &&
+		ln -s untracked D &&
 
+		test_checkout_workers 2 git checkout --force HEAD &&
+		! test -h D &&
+		grep D/A D/A.t &&
+		grep D/B D/B.t
+	)
 
-Deleted branch t (was da664a6).
-ok 50 - git branch --list -v with --abbrev
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/symlinks/.git/
+[master (root-commit) dce6a14] D/A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D/A.t
+[master 59586d4] D/B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D/B.t
+D/A
+D/B
+ok 10 - parallel checkout checks for symlinks in leading dirs
 
-expecting success of 3200.51 'git branch --column': 
-	COLUMNS=81 git branch --column=column >actual &&
-	cat >expect <<-\EOF &&
-	  a/b/c   bam     foo     l     * main    n       o/p     r
-	  abc     bar     j/k     m/m     mb      o/o     q       topic
-	EOF
-	test_cmp expect actual
+expecting success of 2080.11 '"git checkout ." report should not include failed entries': 
+	test_config_global filter.delay.process \
+		"test-tool rot13-filter --always-delay --log=delayed.log clean smudge delay" &&
+	test_config_global filter.delay.required true &&
+	test_config_global filter.cat.clean cat  &&
+	test_config_global filter.cat.smudge cat  &&
+	test_config_global filter.cat.required true  &&
 
-ok 51 - git branch --column
+	set_checkout_config 2 0 &&
+	git init failed_entries &&
+	(
+		cd failed_entries &&
+		cat >.gitattributes <<-EOF &&
+		*delay*              filter=delay
+		parallel-ineligible* filter=cat
+		EOF
+		echo a >missing-delay.a &&
+		echo a >parallel-ineligible.a &&
+		echo a >parallel-eligible.a &&
+		echo b >success-delay.b &&
+		echo b >parallel-ineligible.b &&
+		echo b >parallel-eligible.b &&
+		git add -A &&
+		git commit -m files &&
 
-expecting success of 3200.52 'git branch --column with an extremely long branch name': 
-	long=this/is/a/part/of/long/branch/name &&
-	long=z$long/$long/$long/$long &&
-	test_when_finished "git branch -d $long" &&
-	git branch $long &&
-	COLUMNS=80 git branch --column=column >actual &&
-	cat >expect <<-EOF &&
-	  a/b/c
-	  abc
-	  bam
-	  bar
-	  foo
-	  j/k
-	  l
-	  m/m
-	* main
-	  mb
-	  n
-	  o/o
-	  o/p
-	  q
-	  r
-	  topic
-	  $long
-	EOF
-	test_cmp expect actual
+		a_blob="$(git rev-parse :parallel-ineligible.a)" &&
+		rm .git/objects/$(test_oid_to_path $a_blob) &&
+		rm *.a *.b &&
 
-Deleted branch zthis/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name (was da664a6).
-ok 52 - git branch --column with an extremely long branch name
+		test_checkout_workers 2 test_must_fail git checkout . 2>err &&
 
-expecting success of 3200.53 'git branch with column.*': 
-	git config column.ui column &&
-	git config column.branch "dense" &&
-	COLUMNS=80 git branch >actual &&
-	git config --unset column.branch &&
-	git config --unset column.ui &&
-	cat >expect <<-\EOF &&
-	  a/b/c   bam   foo   l   * main   n     o/p   r
-	  abc     bar   j/k   m/m   mb     o/o   q     topic
-	EOF
-	test_cmp expect actual
+		# All *.b entries should succeed and all *.a entries should fail:
+		#  - missing-delay.a: the delay filter will drop this path
+		#  - parallel-*.a: the blob will be missing
+		#
+		grep "Updated 3 paths from the index" err &&
+		test_stdout_line_count = 3 ls *.b &&
+		! ls *.a
+	)
 
-ok 53 - git branch with column.*
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2080-parallel-checkout-basics/failed_entries/.git/
+[master (root-commit) d1e22ca] files
+ Author: A U Thor <author@example.com>
+ 7 files changed, 8 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 missing-delay.a
+ create mode 100644 parallel-eligible.a
+ create mode 100644 parallel-eligible.b
+ create mode 100644 parallel-ineligible.a
+ create mode 100644 parallel-ineligible.b
+ create mode 100644 success-delay.b
+Updated 3 paths from the index
+ls: cannot access '*.a': No such file or directory
+ok 11 - "git checkout ." report should not include failed entries
 
-expecting success of 3200.54 'git branch --column -v should fail': 
-	test_must_fail git branch --column -v
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1510-repo-setup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/.git/
+expecting success of 1510.1 '#0: nonbare repo, no explicit configuration': 
+	try_repo 0 unset unset unset "" unset \
+		.git "$here/0" "$here/0" "(null)" \
+		.git "$here/0" "$here/0" sub/ 2>message &&
+	test_must_be_empty message
 
-fatal: options '--column' and '--verbose' cannot be used together
-ok 54 - git branch --column -v should fail
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/0/.git/
+ok 1 - #0: nonbare repo, no explicit configuration
 
-expecting success of 3200.55 'git branch -v with column.ui ignored': 
-	git config column.ui column &&
-	COLUMNS=80 git branch -v | cut -c -8 | sed "s/ *$//" >actual &&
-	git config --unset column.ui &&
-	cat >expect <<-\EOF &&
-	  a/b/c
-	  abc
-	  bam
-	  bar
-	  foo
-	  j/k
-	  l
-	  m/m
-	* main
-	  mb
-	  n
-	  o/o
-	  o/p
-	  q
-	  r
-	  topic
-	EOF
-	test_cmp expect actual
+expecting success of 1510.2 '#1: GIT_WORK_TREE without explicit GIT_DIR is accepted': 
+	try_repo 1 "$here" unset unset "" unset \
+		"$here/1/.git" "$here" "$here" 1/ \
+		"$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
+	test_must_be_empty message
 
-ok 55 - git branch -v with column.ui ignored
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/1/.git/
+ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted
 
-checking prerequisite: DEFAULT_REPO_FORMAT
+expecting success of 1510.3 '#2: worktree defaults to cwd with explicit GIT_DIR': 
+	try_repo 2 unset "$here/2/.git" unset "" unset \
+		"$here/2/.git" "$here/2" "$here/2" "(null)" \
+		"$here/2/.git" "$here/2/sub" "$here/2/sub" "(null)"
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-	test_have_prereq SHA1,REFFILES
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/2/.git/
+ok 3 - #2: worktree defaults to cwd with explicit GIT_DIR
 
-)
-checking prerequisite: SHA1
+expecting success of 1510.4 '#2b: relative GIT_DIR': 
+	try_repo 2b unset ".git" unset "" unset \
+		".git" "$here/2b" "$here/2b" "(null)" \
+		"../.git" "$here/2b/sub" "$here/2b/sub" "(null)"
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/2b/.git/
+ok 4 - #2b: relative GIT_DIR
 
-)
-prerequisite SHA1 ok
-prerequisite DEFAULT_REPO_FORMAT ok
-expecting success of 3200.56 'git branch -m q q2 without config should succeed': 
-	test_when_finished mv .git/config-saved .git/config &&
-	mv .git/config .git/config-saved &&
-	git branch -m q q2 &&
-	git branch -m q2 q
+expecting success of 1510.5 '#3: setup': 
+	setup_repo 3 unset "" unset &&
+	mkdir -p 3/sub/sub 3/wt/sub
 
-ok 56 - git branch -m q q2 without config should succeed
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/3/.git/
+ok 5 - #3: setup
 
-expecting success of 3200.57 'git branch -m s/s s should work when s/t is deleted': 
-	git config branch.s/s.dummy Hello &&
-	git branch --create-reflog s/s &&
-	git reflog exists refs/heads/s/s &&
-	git branch --create-reflog s/t &&
-	git reflog exists refs/heads/s/t &&
-	git branch -d s/t &&
-	git branch -m s/s s &&
-	git reflog exists refs/heads/s
+expecting success of 1510.6 '#3: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-Deleted branch s/t (was da664a6).
-ok 57 - git branch -m s/s s should work when s/t is deleted
+expecting success of 1510.7 '#3: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-expecting success of 3200.58 'config information was renamed, too': 
-	test $(git config branch.s.dummy) = Hello &&
-	test_must_fail git config branch.s/s.dummy
+expecting success of 1510.8 '#3: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree
 
-ok 58 - config information was renamed, too
+expecting success of 1510.9 '#3: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree
 
-expecting success of 3200.59 'git branch -m correctly renames multiple config sections': 
-	test_when_finished "git checkout main" &&
-	git checkout -b source main &&
+expecting success of 1510.10 '#3: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 10 - #3: chdir_to_toplevel uses worktree, not git dir
 
-	# Assert that a config file with multiple config sections has
-	# those sections preserved...
-	cat >expect <<-\EOF &&
-	branch.dest.key1=value1
-	some.gar.b=age
-	branch.dest.key2=value2
-	EOF
-	cat >config.branch <<\EOF &&
-;; Note the lack of -\EOF above & mixed indenting here. This is
-;; intentional, we are also testing that the formatting of copied
-;; sections is preserved.
+expecting success of 1510.11 '#3: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 11 - #3: chdir_to_toplevel uses worktree (from subdir)
 
-;; Comment for source. Tabs
-[branch "source"]
-	;; Comment for the source value
-	key1 = value1
-;; Comment for some.gar. Spaces
-[some "gar"]
-    ;; Comment for the some.gar value
-    b = age
-;; Comment for source, again. Mixed tabs/spaces.
-[branch "source"]
-    ;; Comment for the source value, again
-	key2 = value2
-EOF
-	cat config.branch >>.git/config &&
-	git branch -m source dest &&
-	git config -f .git/config -l | grep -F -e source -e dest -e some.gar >actual &&
-	test_cmp expect actual &&
+expecting success of 1510.12 '#4: core.worktree without GIT_DIR set is accepted': 
+	setup_repo 4 ../sub "" unset &&
+	mkdir -p 4/sub sub &&
+	try_case 4 unset unset \
+		.git "$here/4/sub" "$here/4" "(null)" \
+		"$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
+	test_must_be_empty message
 
-	# ...and that the comments for those sections are also
-	# preserved.
-	sed "s/\"source\"/\"dest\"/" config.branch >expect &&
-	sed -n -e "/Note the lack/,\$p" .git/config >actual &&
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/4/.git/
+ok 12 - #4: core.worktree without GIT_DIR set is accepted
 
-Switched to a new branch 'source'
-Switched to branch 'main'
-ok 59 - git branch -m correctly renames multiple config sections
+expecting success of 1510.13 '#5: core.worktree + GIT_WORK_TREE is accepted': 
+	# or: you cannot intimidate away the lack of GIT_DIR setting
+	try_repo 5 "$here" unset "$here/5" "" unset \
+		"$here/5/.git" "$here" "$here" 5/ \
+		"$here/5/.git" "$here" "$here" 5/sub/ 2>message &&
+	try_repo 5a .. unset "$here/5a" "" unset \
+		"$here/5a/.git" "$here" "$here" 5a/ \
+		"$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
+	test_must_be_empty message
 
-expecting success of 3200.60 'git branch -c dumps usage': 
-	test_expect_code 128 git branch -c 2>err &&
-	test_grep "branch name required" err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/5/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/5a/.git/
+ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted
 
-fatal: branch name required
-ok 60 - git branch -c dumps usage
+expecting success of 1510.14 '#6: setting GIT_DIR brings core.worktree to life': 
+	setup_repo 6 "$here/6" "" unset &&
+	try_case 6 unset .git \
+		.git "$here/6" "$here/6" "(null)" &&
+	try_case 6 unset "$here/6/.git" \
+		"$here/6/.git" "$here/6" "$here/6" "(null)" &&
+	try_case 6/sub/sub unset ../../.git \
+		"$here/6/.git" "$here/6" "$here/6" sub/sub/ &&
+	try_case 6/sub/sub unset "$here/6/.git" \
+		"$here/6/.git" "$here/6" "$here/6" sub/sub/
 
-expecting success of 3200.61 'git branch --copy dumps usage': 
-	test_expect_code 128 git branch --copy 2>err &&
-	test_grep "branch name required" err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6/.git/
+ok 14 - #6: setting GIT_DIR brings core.worktree to life
 
-fatal: branch name required
-ok 61 - git branch --copy dumps usage
+expecting success of 1510.15 '#6b: GIT_DIR set, core.worktree relative': 
+	setup_repo 6b .. "" unset &&
+	try_case 6b unset .git \
+		.git "$here/6b" "$here/6b" "(null)" &&
+	try_case 6b unset "$here/6b/.git" \
+		"$here/6b/.git" "$here/6b" "$here/6b" "(null)" &&
+	try_case 6b/sub/sub unset ../../.git \
+		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/ &&
+	try_case 6b/sub/sub unset "$here/6b/.git" \
+		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/
 
-expecting success of 3200.62 'git branch -c d e should work': 
-	git branch --create-reflog d &&
-	git reflog exists refs/heads/d &&
-	git config branch.d.dummy Hello &&
-	git branch -c d e &&
-	git reflog exists refs/heads/d &&
-	git reflog exists refs/heads/e &&
-	echo Hello >expect &&
-	git config branch.e.dummy >actual &&
-	test_cmp expect actual &&
-	echo Hello >expect &&
-	git config branch.d.dummy >actual &&
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6b/.git/
+ok 15 - #6b: GIT_DIR set, core.worktree relative
 
-ok 62 - git branch -c d e should work
+expecting success of 1510.16 '#6c: GIT_DIR set, core.worktree=../wt (absolute)': 
+	setup_repo 6c "$here/6c/wt" "" unset &&
+	mkdir -p 6c/wt/sub &&
 
-expecting success of 3200.63 'git branch --copy is a synonym for -c': 
-	git branch --create-reflog copy &&
-	git reflog exists refs/heads/copy &&
-	git config branch.copy.dummy Hello &&
-	git branch --copy copy copy-to &&
-	git reflog exists refs/heads/copy &&
-	git reflog exists refs/heads/copy-to &&
-	echo Hello >expect &&
-	git config branch.copy.dummy >actual &&
-	test_cmp expect actual &&
-	echo Hello >expect &&
-	git config branch.copy-to.dummy >actual &&
-	test_cmp expect actual
+	try_case 6c unset .git \
+		.git "$here/6c/wt" "$here/6c" "(null)" &&
+	try_case 6c unset "$here/6c/.git" \
+		"$here/6c/.git" "$here/6c/wt" "$here/6c" "(null)" &&
+	try_case 6c/sub/sub unset ../../.git \
+		../../.git "$here/6c/wt" "$here/6c/sub/sub" "(null)" &&
+	try_case 6c/sub/sub unset "$here/6c/.git" \
+		"$here/6c/.git" "$here/6c/wt" "$here/6c/sub/sub" "(null)"
 
-ok 63 - git branch --copy is a synonym for -c
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6c/.git/
+ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute)
 
-expecting success of 3200.64 'git branch -c ee ef should copy ee to create branch ef': 
-	git checkout -b ee &&
-	git reflog exists refs/heads/ee &&
-	git config branch.ee.dummy Hello &&
-	git branch -c ee ef &&
-	git reflog exists refs/heads/ee &&
-	git reflog exists refs/heads/ef &&
-	test $(git config branch.ee.dummy) = Hello &&
-	test $(git config branch.ef.dummy) = Hello &&
-	test $(git rev-parse --abbrev-ref HEAD) = ee
+expecting success of 1510.17 '#6d: GIT_DIR set, core.worktree=../wt (relative)': 
+	setup_repo 6d "$here/6d/wt" "" unset &&
+	mkdir -p 6d/wt/sub &&
 
-Switched to a new branch 'ee'
-ok 64 - git branch -c ee ef should copy ee to create branch ef
+	try_case 6d unset .git \
+		.git "$here/6d/wt" "$here/6d" "(null)" &&
+	try_case 6d unset "$here/6d/.git" \
+		"$here/6d/.git" "$here/6d/wt" "$here/6d" "(null)" &&
+	try_case 6d/sub/sub unset ../../.git \
+		../../.git "$here/6d/wt" "$here/6d/sub/sub" "(null)" &&
+	try_case 6d/sub/sub unset "$here/6d/.git" \
+		"$here/6d/.git" "$here/6d/wt" "$here/6d/sub/sub" "(null)"
 
-expecting success of 3200.65 'git branch -c f/f g/g should work': 
-	git branch --create-reflog f/f &&
-	git reflog exists refs/heads/f/f &&
-	git config branch.f/f.dummy Hello &&
-	git branch -c f/f g/g &&
-	git reflog exists refs/heads/f/f &&
-	git reflog exists refs/heads/g/g &&
-	test $(git config branch.f/f.dummy) = Hello &&
-	test $(git config branch.g/g.dummy) = Hello
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6d/.git/
+ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative)
 
-ok 65 - git branch -c f/f g/g should work
+expecting success of 1510.18 '#6e: GIT_DIR set, core.worktree=../.. (absolute)': 
+	setup_repo 6e "$here" "" unset &&
+	try_case 6e unset .git \
+		"$here/6e/.git" "$here" "$here" 6e/ &&
+	try_case 6e unset "$here/6e/.git" \
+		"$here/6e/.git" "$here" "$here" 6e/ &&
+	try_case 6e/sub/sub unset ../../.git \
+		"$here/6e/.git" "$here" "$here" 6e/sub/sub/ &&
+	try_case 6e/sub/sub unset "$here/6e/.git" \
+		"$here/6e/.git" "$here" "$here" 6e/sub/sub/
 
-expecting success of 3200.66 'git branch -c m2 m2 should work': 
-	git branch --create-reflog m2 &&
-	git reflog exists refs/heads/m2 &&
-	git config branch.m2.dummy Hello &&
-	git branch -c m2 m2 &&
-	git reflog exists refs/heads/m2 &&
-	test $(git config branch.m2.dummy) = Hello
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6e/.git/
+ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute)
 
-ok 66 - git branch -c m2 m2 should work
+expecting success of 1510.19 '#6f: GIT_DIR set, core.worktree=../.. (relative)': 
+	setup_repo 6f ../../ "" unset &&
+	try_case 6f unset .git \
+		"$here/6f/.git" "$here" "$here" 6f/ &&
+	try_case 6f unset "$here/6f/.git" \
+		"$here/6f/.git" "$here" "$here" 6f/ &&
+	try_case 6f/sub/sub unset ../../.git \
+		"$here/6f/.git" "$here" "$here" 6f/sub/sub/ &&
+	try_case 6f/sub/sub unset "$here/6f/.git" \
+		"$here/6f/.git" "$here" "$here" 6f/sub/sub/
 
-expecting success of 3200.67 'git branch -c zz zz/zz should fail': 
-	git branch --create-reflog zz &&
-	git reflog exists refs/heads/zz &&
-	test_must_fail git branch -c zz zz/zz
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/6f/.git/
+ok 19 - #6f: GIT_DIR set, core.worktree=../.. (relative)
 
-error: directory not empty: .git/logs/refs/heads/zz/zz
-fatal: branch copy failed
-ok 67 - git branch -c zz zz/zz should fail
+expecting success of 1510.20 '#7: setup': 
+	setup_repo 7 non-existent "" unset &&
+	mkdir -p 7/sub/sub 7/wt/sub
 
-expecting success of 3200.68 'git branch -c b/b b should fail': 
-	git branch --create-reflog b/b &&
-	test_must_fail git branch -c b/b b
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/7/.git/
+ok 20 - #7: setup
 
-error: directory not empty: .git/logs/refs/heads/b
-fatal: branch copy failed
-ok 68 - git branch -c b/b b should fail
+expecting success of 1510.21 '#7: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 21 - #7: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-expecting success of 3200.69 'git branch -C o/q o/p should work when o/p exists': 
-	git branch --create-reflog o/q &&
-	git reflog exists refs/heads/o/q &&
-	git reflog exists refs/heads/o/p &&
-	git branch -C o/q o/p
+expecting success of 1510.22 '#7: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 22 - #7: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-ok 69 - git branch -C o/q o/p should work when o/p exists
+expecting success of 1510.23 '#7: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 23 - #7: explicit GIT_WORK_TREE from parent of worktree
 
-expecting success of 3200.70 'git branch -c -f o/q o/p should work when o/p exists': 
-	git reflog exists refs/heads/o/q &&
-	git reflog exists refs/heads/o/p &&
-	git branch -c -f o/q o/p
+expecting success of 1510.24 '#7: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 24 - #7: explicit GIT_WORK_TREE from nephew of worktree
 
-ok 70 - git branch -c -f o/q o/p should work when o/p exists
+expecting success of 1510.25 '#7: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 25 - #7: chdir_to_toplevel uses worktree, not git dir
 
-expecting success of 3200.71 'git branch -c qq rr/qq should fail when rr exists': 
-	git branch qq &&
-	git branch rr &&
-	test_must_fail git branch -c qq rr/qq
+expecting success of 1510.26 '#7: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 26 - #7: chdir_to_toplevel uses worktree (from subdir)
 
-error: 'refs/heads/rr' exists; cannot create 'refs/heads/rr/qq'
-fatal: branch copy failed
-ok 71 - git branch -c qq rr/qq should fail when rr exists
+expecting success of 1510.27 '#8: gitfile, easy case': 
+	try_repo 8 unset unset unset gitfile unset \
+		"$here/8.git" "$here/8" "$here/8" "(null)" \
+		"$here/8.git" "$here/8" "$here/8" sub/
 
-expecting success of 3200.72 'git branch -C b1 b2 should fail when b2 is checked out': 
-	git branch b1 &&
-	git checkout -b b2 &&
-	test_must_fail git branch -C b1 b2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/8/.git/
+ok 27 - #8: gitfile, easy case
 
-Switched to a new branch 'b2'
-fatal: cannot force update the branch 'b2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch'
-ok 72 - git branch -C b1 b2 should fail when b2 is checked out
+expecting success of 1510.28 '#9: GIT_WORK_TREE accepted with gitfile': 
+	mkdir -p 9/wt &&
+	try_repo 9 wt unset unset gitfile unset \
+		"$here/9.git" "$here/9/wt" "$here/9" "(null)" \
+		"$here/9.git" "$here/9/sub/wt" "$here/9/sub" "(null)" 2>message &&
+	test_must_be_empty message
 
-expecting success of 3200.73 'git branch -C c1 c2 should succeed when c1 is checked out': 
-	git checkout -b c1 &&
-	git branch c2 &&
-	git branch -C c1 c2 &&
-	test $(git rev-parse --abbrev-ref HEAD) = c1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/9/.git/
+ok 28 - #9: GIT_WORK_TREE accepted with gitfile
 
-Switched to a new branch 'c1'
-ok 73 - git branch -C c1 c2 should succeed when c1 is checked out
+expecting success of 1510.29 '#10: GIT_DIR can point to gitfile': 
+	try_repo 10 unset "$here/10/.git" unset gitfile unset \
+		"$here/10.git" "$here/10" "$here/10" "(null)" \
+		"$here/10.git" "$here/10/sub" "$here/10/sub" "(null)"
 
-expecting success of 3200.74 'git branch -C c1 c2 should never touch HEAD': 
-	msg="Branch: copied refs/heads/c1 to refs/heads/c2" &&
-	git reflog HEAD >actual &&
-	! grep "$msg$" actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/10/.git/
+ok 29 - #10: GIT_DIR can point to gitfile
 
-ok 74 - git branch -C c1 c2 should never touch HEAD
+expecting success of 1510.30 '#10b: relative GIT_DIR can point to gitfile': 
+	try_repo 10b unset .git unset gitfile unset \
+		"$here/10b.git" "$here/10b" "$here/10b" "(null)" \
+		"$here/10b.git" "$here/10b/sub" "$here/10b/sub" "(null)"
 
-expecting success of 3200.75 'git branch -C main should work when main is checked out': 
-	git checkout main &&
-	git branch -C main
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/10b/.git/
+ok 30 - #10b: relative GIT_DIR can point to gitfile
 
-Switched to branch 'main'
-ok 75 - git branch -C main should work when main is checked out
+expecting success of 1510.31 '#11: setup': 
+	setup_repo 11 unset gitfile unset &&
+	mkdir -p 11/sub/sub 11/wt/sub
 
-expecting success of 3200.76 'git branch -C main main should work when main is checked out': 
-	git checkout main &&
-	git branch -C main main
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/11/.git/
+ok 31 - #11: setup
 
-Already on 'main'
-ok 76 - git branch -C main main should work when main is checked out
+expecting success of 1510.32 '#11: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 32 - #11: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-expecting success of 3200.77 'git branch -C main5 main5 should work when main is checked out': 
-	git checkout main &&
-	git branch main5 &&
-	git branch -C main5 main5
+expecting success of 1510.33 '#11: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 33 - #11: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-Already on 'main'
-ok 77 - git branch -C main5 main5 should work when main is checked out
+expecting success of 1510.34 '#11: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 34 - #11: explicit GIT_WORK_TREE from parent of worktree
 
-expecting success of 3200.78 'git branch -C ab cd should overwrite existing config for cd': 
-	git branch --create-reflog cd &&
-	git reflog exists refs/heads/cd &&
-	git config branch.cd.dummy CD &&
-	git branch --create-reflog ab &&
-	git reflog exists refs/heads/ab &&
-	git config branch.ab.dummy AB &&
-	git branch -C ab cd &&
-	git reflog exists refs/heads/ab &&
-	git reflog exists refs/heads/cd &&
-	test $(git config branch.ab.dummy) = AB &&
-	test $(git config branch.cd.dummy) = AB
+expecting success of 1510.35 '#11: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 35 - #11: explicit GIT_WORK_TREE from nephew of worktree
 
-ok 78 - git branch -C ab cd should overwrite existing config for cd
+expecting success of 1510.36 '#11: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 36 - #11: chdir_to_toplevel uses worktree, not git dir
 
-expecting success of 3200.79 'git branch -c correctly copies multiple config sections': 
-	FOO=1 &&
-	export FOO &&
-	test_when_finished "git checkout main" &&
-	git checkout -b source2 main &&
+expecting success of 1510.37 '#11: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 37 - #11: chdir_to_toplevel uses worktree (from subdir)
 
-	# Assert that a config file with multiple config sections has
-	# those sections preserved...
-	cat >expect <<-\EOF &&
-	branch.source2.key1=value1
-	branch.dest2.key1=value1
-	more.gar.b=age
-	branch.source2.key2=value2
-	branch.dest2.key2=value2
-	EOF
-	cat >config.branch <<\EOF &&
-;; Note the lack of -\EOF above & mixed indenting here. This is
-;; intentional, we are also testing that the formatting of copied
-;; sections is preserved.
+expecting success of 1510.38 '#12: core.worktree with gitfile is accepted': 
+	try_repo 12 unset unset "$here/12" gitfile unset \
+		"$here/12.git" "$here/12" "$here/12" "(null)" \
+		"$here/12.git" "$here/12" "$here/12" sub/ 2>message &&
+	test_must_be_empty message
 
-;; Comment for source2. Tabs
-[branch "source2"]
-	;; Comment for the source2 value
-	key1 = value1
-;; Comment for more.gar. Spaces
-[more "gar"]
-    ;; Comment for the more.gar value
-    b = age
-;; Comment for source2, again. Mixed tabs/spaces.
-[branch "source2"]
-    ;; Comment for the source2 value, again
-	key2 = value2
-EOF
-	cat config.branch >>.git/config &&
-	git branch -c source2 dest2 &&
-	git config -f .git/config -l | grep -F -e source2 -e dest2 -e more.gar >actual &&
-	test_cmp expect actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/12/.git/
+ok 38 - #12: core.worktree with gitfile is accepted
 
-	# ...and that the comments and formatting for those sections
-	# is also preserved.
-	cat >expect <<\EOF &&
-;; Comment for source2. Tabs
-[branch "source2"]
-	;; Comment for the source2 value
-	key1 = value1
-;; Comment for more.gar. Spaces
-[branch "dest2"]
-	;; Comment for the source2 value
-	key1 = value1
-;; Comment for more.gar. Spaces
-[more "gar"]
-    ;; Comment for the more.gar value
-    b = age
-;; Comment for source2, again. Mixed tabs/spaces.
-[branch "source2"]
-    ;; Comment for the source2 value, again
-	key2 = value2
-[branch "dest2"]
-    ;; Comment for the source2 value, again
-	key2 = value2
-EOF
-	sed -n -e "/Comment for source2/,\$p" .git/config >actual &&
-	test_cmp expect actual
+expecting success of 1510.39 '#13: core.worktree+GIT_WORK_TREE accepted (with gitfile)': 
+	# or: you cannot intimidate away the lack of GIT_DIR setting
+	try_repo 13 non-existent-too unset non-existent gitfile unset \
+		"$here/13.git" "$here/13/non-existent-too" "$here/13" "(null)" \
+		"$here/13.git" "$here/13/sub/non-existent-too" "$here/13/sub" "(null)" 2>message &&
+	test_must_be_empty message
 
-Switched to a new branch 'source2'
-Switched to branch 'main'
-ok 79 - git branch -c correctly copies multiple config sections
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/13/.git/
+ok 39 - #13: core.worktree+GIT_WORK_TREE accepted (with gitfile)
 
-expecting success of 3200.80 'deleting a symref': 
-	git branch target &&
-	git symbolic-ref refs/heads/symref refs/heads/target &&
-	echo "Deleted branch symref (was refs/heads/target)." >expect &&
-	git branch -d symref >actual &&
-	test_ref_exists refs/heads/target &&
-	test_ref_missing refs/heads/symref &&
-	test_cmp expect actual
+expecting success of 1510.40 '#14: core.worktree with GIT_DIR pointing to gitfile': 
+	setup_repo 14 "$here/14" gitfile unset &&
+	try_case 14 unset .git \
+		"$here/14.git" "$here/14" "$here/14" "(null)" &&
+	try_case 14 unset "$here/14/.git" \
+		"$here/14.git" "$here/14" "$here/14" "(null)" &&
+	try_case 14/sub/sub unset ../../.git \
+		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
+	try_case 14/sub/sub unset "$here/14/.git" \
+		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
 
-error: reference does not exist
-ok 80 - deleting a symref
+	setup_repo 14c "$here/14c/wt" gitfile unset &&
+	mkdir -p 14c/wt/sub &&
 
-expecting success of 3200.81 'deleting a dangling symref': 
-	git symbolic-ref refs/heads/dangling-symref nowhere &&
-	git symbolic-ref --no-recurse refs/heads/dangling-symref &&
-	echo "Deleted branch dangling-symref (was nowhere)." >expect &&
-	git branch -d dangling-symref >actual &&
-	test_ref_missing refs/heads/dangling-symref &&
-	test_cmp expect actual
+	try_case 14c unset .git \
+		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
+	try_case 14c unset "$here/14c/.git" \
+		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
+	try_case 14c/sub/sub unset ../../.git \
+		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
+	try_case 14c/sub/sub unset "$here/14c/.git" \
+		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
 
-nowhere
-error: reference does not exist
-ok 81 - deleting a dangling symref
+	setup_repo 14d "$here/14d/wt" gitfile unset &&
+	mkdir -p 14d/wt/sub &&
 
-expecting success of 3200.82 'deleting a self-referential symref': 
-	git symbolic-ref refs/heads/self-reference refs/heads/self-reference &&
-	test_ref_exists refs/heads/self-reference &&
-	echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect &&
-	git branch -d self-reference >actual &&
-	test_ref_missing refs/heads/self-reference &&
-	test_cmp expect actual
+	try_case 14d unset .git \
+		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
+	try_case 14d unset "$here/14d/.git" \
+		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
+	try_case 14d/sub/sub unset ../../.git \
+		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
+	try_case 14d/sub/sub unset "$here/14d/.git" \
+		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
 
-error: reference does not exist
-ok 82 - deleting a self-referential symref
+	setup_repo 14e "$here" gitfile unset &&
+	try_case 14e unset .git \
+		"$here/14e.git" "$here" "$here" 14e/ &&
+	try_case 14e unset "$here/14e/.git" \
+		"$here/14e.git" "$here" "$here" 14e/ &&
+	try_case 14e/sub/sub unset ../../.git \
+		"$here/14e.git" "$here" "$here" 14e/sub/sub/ &&
+	try_case 14e/sub/sub unset "$here/14e/.git" \
+		"$here/14e.git" "$here" "$here" 14e/sub/sub/
 
-expecting success of 3200.83 'renaming a symref is not allowed': 
-	git symbolic-ref refs/heads/topic refs/heads/main &&
-	test_must_fail git branch -m topic new-topic &&
-	git symbolic-ref refs/heads/topic &&
-	test_ref_exists refs/heads/main &&
-	test_ref_missing refs/heads/new-topic
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14c/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14d/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14e/.git/
+ok 40 - #14: core.worktree with GIT_DIR pointing to gitfile
 
-error: refname refs/heads/topic is a symbolic ref, renaming it is not supported
-fatal: branch rename failed
-refs/heads/main
-error: reference does not exist
-ok 83 - renaming a symref is not allowed
+expecting success of 1510.41 '#14b: core.worktree is relative to actual git dir': 
+	setup_repo 14b ../14b gitfile unset &&
+	try_case 14b unset .git \
+		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
+	try_case 14b unset "$here/14b/.git" \
+		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
+	try_case 14b/sub/sub unset ../../.git \
+		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
+	try_case 14b/sub/sub unset "$here/14b/.git" \
+		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
 
-expecting success of 3200.84 'test tracking setup via --track': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --track my1 local/main &&
-	test $(git config branch.my1.remote) = local &&
-	test $(git config branch.my1.merge) = refs/heads/main
+	setup_repo 14f ../ gitfile unset &&
+	try_case 14f unset .git \
+		"$here/14f.git" "$here" "$here" 14f/ &&
+	try_case 14f unset "$here/14f/.git" \
+		"$here/14f.git" "$here" "$here" 14f/ &&
+	try_case 14f/sub/sub unset ../../.git \
+		"$here/14f.git" "$here" "$here" 14f/sub/sub/ &&
+	try_case 14f/sub/sub unset "$here/14f/.git" \
+		"$here/14f.git" "$here" "$here" 14f/sub/sub/
 
-From .
- * [new branch]      a/b/c      -> local/a/b/c
- * [new branch]      ab         -> local/ab
- * [new branch]      abc        -> local/abc
- * [new branch]      b/b        -> local/b/b
- * [new branch]      b1         -> local/b1
- * [new branch]      b2         -> local/b2
- * [new branch]      bam        -> local/bam
- * [new branch]      bar        -> local/bar
- * [new branch]      c1         -> local/c1
- * [new branch]      c2         -> local/c2
- * [new branch]      cd         -> local/cd
- * [new branch]      copy       -> local/copy
- * [new branch]      copy-to    -> local/copy-to
- * [new branch]      d          -> local/d
- * [new branch]      dest       -> local/dest
- * [new branch]      dest2      -> local/dest2
- * [new branch]      e          -> local/e
- * [new branch]      ee         -> local/ee
- * [new branch]      ef         -> local/ef
- * [new branch]      f/f        -> local/f/f
- * [new branch]      foo        -> local/foo
- * [new branch]      g/g        -> local/g/g
- * [new branch]      j/k        -> local/j/k
- * [new branch]      l          -> local/l
- * [new branch]      m/m        -> local/m/m
- * [new branch]      m2         -> local/m2
- * [new branch]      main       -> local/main
- * [new branch]      main5      -> local/main5
- * [new branch]      mb         -> local/mb
- * [new branch]      n          -> local/n
- * [new branch]      o/o        -> local/o/o
- * [new branch]      o/p        -> local/o/p
- * [new branch]      o/q        -> local/o/q
- * [new branch]      q          -> local/q
- * [new branch]      qq         -> local/qq
- * [new branch]      r          -> local/r
- * [new branch]      rr         -> local/rr
- * [new branch]      s          -> local/s
- * [new branch]      source2    -> local/source2
- * [new branch]      target     -> local/target
- * [new branch]      topic      -> local/topic
- * [new branch]      zz         -> local/zz
-branch 'my1' set up to track 'local/main'.
-ok 84 - test tracking setup via --track
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14b/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/14f/.git/
+ok 41 - #14b: core.worktree is relative to actual git dir
 
-expecting success of 3200.85 'test tracking setup (non-wildcard, matching)': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/main:refs/remotes/local/main &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --track my4 local/main &&
-	test $(git config branch.my4.remote) = local &&
-	test $(git config branch.my4.merge) = refs/heads/main
+expecting success of 1510.42 '#15: setup': 
+	setup_repo 15 non-existent gitfile unset &&
+	mkdir -p 15/sub/sub 15/wt/sub
 
-branch 'my4' set up to track 'local/main'.
-ok 85 - test tracking setup (non-wildcard, matching)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/15/.git/
+ok 42 - #15: setup
 
-expecting success of 3200.86 'tracking setup fails on non-matching refspec': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
-	test_must_fail git branch --track my5 local/main &&
-	test_must_fail git config branch.my5.remote &&
-	test_must_fail git config branch.my5.merge
+expecting success of 1510.43 '#15: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 43 - #15: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-fatal: cannot set up tracking information; starting point 'local/main' is not a branch
-ok 86 - tracking setup fails on non-matching refspec
+expecting success of 1510.44 '#15: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 44 - #15: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-expecting success of 3200.87 'test tracking setup via config': 
-	git config branch.autosetupmerge true &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch my3 local/main &&
-	test $(git config branch.my3.remote) = local &&
-	test $(git config branch.my3.merge) = refs/heads/main
+expecting success of 1510.45 '#15: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 45 - #15: explicit GIT_WORK_TREE from parent of worktree
 
-branch 'my3' set up to track 'local/main'.
-ok 87 - test tracking setup via config
+expecting success of 1510.46 '#15: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 46 - #15: explicit GIT_WORK_TREE from nephew of worktree
 
-expecting success of 3200.88 'test overriding tracking setup via --no-track': 
-	git config branch.autosetupmerge true &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track my2 local/main &&
-	git config branch.autosetupmerge false &&
-	! test "$(git config branch.my2.remote)" = local &&
-	! test "$(git config branch.my2.merge)" = refs/heads/main
+expecting success of 1510.47 '#15: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 47 - #15: chdir_to_toplevel uses worktree, not git dir
 
-ok 88 - test overriding tracking setup via --no-track
+expecting success of 1510.48 '#15: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 48 - #15: chdir_to_toplevel uses worktree (from subdir)
 
-expecting success of 3200.89 'no tracking without .fetch entries': 
-	git config branch.autosetupmerge true &&
-	git branch my6 s &&
-	git config branch.autosetupmerge false &&
-	test -z "$(git config branch.my6.remote)" &&
-	test -z "$(git config branch.my6.merge)"
+expecting success of 1510.49 '#16a: implicitly bare repo (cwd inside .git dir)': 
+	setup_repo 16a unset "" unset &&
+	mkdir -p 16a/.git/wt/sub &&
 
-ok 89 - no tracking without .fetch entries
+	try_case 16a/.git unset unset \
+		. "(null)" "$here/16a/.git" "(null)" &&
+	try_case 16a/.git/wt unset unset \
+		"$here/16a/.git" "(null)" "$here/16a/.git/wt" "(null)" &&
+	try_case 16a/.git/wt/sub unset unset \
+		"$here/16a/.git" "(null)" "$here/16a/.git/wt/sub" "(null)"
 
-expecting success of 3200.90 'test tracking setup via --track but deeper': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/o/o || git fetch local) &&
-	git branch --track my7 local/o/o &&
-	test "$(git config branch.my7.remote)" = local &&
-	test "$(git config branch.my7.merge)" = refs/heads/o/o
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16a/.git/
+ok 49 - #16a: implicitly bare repo (cwd inside .git dir)
 
-branch 'my7' set up to track 'local/o/o'.
-ok 90 - test tracking setup via --track but deeper
+expecting success of 1510.50 '#16b: bare .git (cwd inside .git dir)': 
+	setup_repo 16b unset "" true &&
+	mkdir -p 16b/.git/wt/sub &&
 
-expecting success of 3200.91 'test deleting branch deletes branch config': 
-	git branch -d my7 &&
-	test -z "$(git config branch.my7.remote)" &&
-	test -z "$(git config branch.my7.merge)"
+	try_case 16b/.git unset unset \
+		. "(null)" "$here/16b/.git" "(null)" &&
+	try_case 16b/.git/wt unset unset \
+		"$here/16b/.git" "(null)" "$here/16b/.git/wt" "(null)" &&
+	try_case 16b/.git/wt/sub unset unset \
+		"$here/16b/.git" "(null)" "$here/16b/.git/wt/sub" "(null)"
 
-Deleted branch my7 (was da664a6).
-ok 91 - test deleting branch deletes branch config
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16b/.git/
+ok 50 - #16b: bare .git (cwd inside .git dir)
 
-expecting success of 3200.92 'test deleting branch without config': 
-	git branch my7 s &&
-	sha1=$(git rev-parse my7 | cut -c 1-7) &&
-	echo "Deleted branch my7 (was $sha1)." >expect &&
-	git branch -d my7 >actual 2>&1 &&
-	test_cmp expect actual
+expecting success of 1510.51 '#16c: bare .git has no worktree': 
+	try_repo 16c unset unset unset "" true \
+		.git "(null)" "$here/16c" "(null)" \
+		"$here/16c/.git" "(null)" "$here/16c/sub" "(null)"
 
-ok 92 - test deleting branch without config
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16c/.git/
+ok 51 - #16c: bare .git has no worktree
 
-expecting success of 3200.93 'deleting currently checked out branch fails': 
-	git worktree add -b my7 my7 &&
-	test_must_fail git -C my7 branch -d my7 &&
-	test_must_fail git branch -d my7 2>actual &&
-	grep "^error: cannot delete branch .my7. used by worktree at " actual &&
-	rm -r my7 &&
-	git worktree prune
+expecting success of 1510.52 '#16d: bareness preserved across alias': 
+	setup_repo 16d unset "" unset &&
+	(
+		cd 16d/.git &&
+		test_must_fail git status &&
+		git config alias.st status &&
+		test_must_fail git st
+	)
 
-Preparing worktree (new branch 'my7')
-HEAD is now at da664a6 Second commit.
-error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
-error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
-ok 93 - deleting currently checked out branch fails
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16d/.git/
+fatal: this operation must be run in a work tree
+fatal: this operation must be run in a work tree
+ok 52 - #16d: bareness preserved across alias
 
-expecting success of 3200.94 'deleting in-use branch fails': 
-	git worktree add my7 &&
-	test_commit -C my7 bt7 &&
-	git -C my7 bisect start HEAD HEAD~2 &&
-	test_must_fail git -C my7 branch -d my7 &&
-	test_must_fail git branch -d my7 2>actual &&
-	grep "^error: cannot delete branch .my7. used by worktree at " actual &&
-	rm -r my7 &&
-	git worktree prune
+expecting success of 1510.53 '#16e: bareness preserved by --bare': 
+	setup_repo 16e unset "" unset &&
+	(
+		cd 16e/.git &&
+		test_must_fail git status &&
+		test_must_fail git --bare status
+	)
 
-Preparing worktree (checking out 'my7')
-HEAD is now at da664a6 Second commit.
-[my7 d256542] bt7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bt7.t
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[da664a6b0bffeb0904609e9e14e1beeecfe55c4a] Second commit.
-error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
-error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
-ok 94 - deleting in-use branch fails
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/16e/.git/
+fatal: this operation must be run in a work tree
+fatal: this operation must be run in a work tree
+ok 53 - #16e: bareness preserved by --bare
 
-expecting success of 3200.95 'test --track without .fetch entries': 
-	git branch --track my8 &&
-	test "$(git config branch.my8.remote)" &&
-	test "$(git config branch.my8.merge)"
+expecting success of 1510.54 '#17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)': 
+	# Just like #16.
+	setup_repo 17a unset "" true &&
+	setup_repo 17b unset "" true &&
+	mkdir -p 17a/.git/wt/sub &&
+	mkdir -p 17b/.git/wt/sub &&
 
-branch 'my8' set up to track 'main'.
-ok 95 - test --track without .fetch entries
+	try_case 17a/.git "$here/17a" unset \
+		"$here/17a/.git" "$here/17a" "$here/17a" .git/ \
+		2>message &&
+	try_case 17a/.git/wt "$here/17a" unset \
+		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/ &&
+	try_case 17a/.git/wt/sub "$here/17a" unset \
+		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/sub/ &&
 
-expecting success of 3200.96 'branch from non-branch HEAD w/autosetupmerge=always': 
-	git config branch.autosetupmerge always &&
-	git branch my9 HEAD^ &&
-	git config branch.autosetupmerge false
+	try_case 17b/.git "$here/17b" unset \
+		"$here/17b/.git" "$here/17b" "$here/17b" .git/ &&
+	try_case 17b/.git/wt "$here/17b" unset \
+		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/ &&
+	try_case 17b/.git/wt/sub "$here/17b" unset \
+		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/sub/ &&
 
-ok 96 - branch from non-branch HEAD w/autosetupmerge=always
+	try_repo 17c "$here/17c" unset unset "" true \
+		.git "$here/17c" "$here/17c" "(null)" \
+		"$here/17c/.git" "$here/17c" "$here/17c" sub/ 2>message &&
+	test_must_be_empty message
 
-expecting success of 3200.97 'branch from non-branch HEAD w/--track causes failure': 
-	test_must_fail git branch --track my10 HEAD^
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/17a/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/17b/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/17c/.git/
+ok 54 - #17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)
 
-fatal: cannot set up tracking information; starting point 'HEAD^' is not a branch
-ok 97 - branch from non-branch HEAD w/--track causes failure
+expecting success of 1510.55 '#18: bare .git named by GIT_DIR has no worktree': 
+	try_repo 18 unset .git unset "" true \
+		.git "(null)" "$here/18" "(null)" \
+		../.git "(null)" "$here/18/sub" "(null)" &&
+	try_repo 18b unset "$here/18b/.git" unset "" true \
+		"$here/18b/.git" "(null)" "$here/18b" "(null)" \
+		"$here/18b/.git" "(null)" "$here/18b/sub" "(null)"
 
-expecting success of 3200.98 'branch from tag w/--track causes failure': 
-	git tag foobar &&
-	test_must_fail git branch --track my11 foobar
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/18/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/18b/.git/
+ok 55 - #18: bare .git named by GIT_DIR has no worktree
 
-fatal: cannot set up tracking information; starting point 'foobar' is not a branch
-ok 98 - branch from tag w/--track causes failure
+expecting success of 1510.56 '#19: setup': 
+	setup_repo 19 unset "" true &&
+	mkdir -p 19/sub/sub 19/wt/sub
 
-expecting success of 3200.99 'simple tracking works when remote branch name matches': 
-	test_when_finished "rm -rf otherserver" &&
-	git init otherserver &&
-	test_commit -C otherserver my_commit 1 &&
-	git -C otherserver branch feature &&
-	test_config branch.autosetupmerge simple &&
-	test_config remote.otherserver.url otherserver &&
-	test_config remote.otherserver.fetch refs/heads/*:refs/remotes/otherserver/* &&
-	git fetch otherserver &&
-	git branch feature otherserver/feature &&
-	test_cmp_config otherserver branch.feature.remote &&
-	test_cmp_config refs/heads/feature branch.feature.merge
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/19/.git/
+ok 56 - #19: setup
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/otherserver/.git/
-[main (root-commit) a1f3a4a] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-From otherserver
- * [new branch]      feature    -> otherserver/feature
- * [new branch]      main       -> otherserver/main
- * [new tag]         my_commit  -> my_commit
-branch 'feature' set up to track 'otherserver/feature'.
-ok 99 - simple tracking works when remote branch name matches
+expecting success of 1510.57 '#19: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 57 - #19: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-expecting success of 3200.100 'simple tracking skips when remote branch name does not match': 
-	test_config branch.autosetupmerge simple &&
-	test_config remote.local.url . &&
-	test_config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git fetch local &&
-	git branch my-other local/main &&
-	test_cmp_config "" --default "" branch.my-other.remote &&
-	test_cmp_config "" --default "" branch.my-other.merge
+expecting success of 1510.58 '#19: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 58 - #19: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-From .
- * [new branch]      feature    -> local/feature
- * [new branch]      my1        -> local/my1
- * [new branch]      my2        -> local/my2
- * [new branch]      my3        -> local/my3
- * [new branch]      my4        -> local/my4
- * [new branch]      my6        -> local/my6
- * [new branch]      my7        -> local/my7
- * [new branch]      my8        -> local/my8
- * [new branch]      my9        -> local/my9
-ok 100 - simple tracking skips when remote branch name does not match
+expecting success of 1510.59 '#19: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 59 - #19: explicit GIT_WORK_TREE from parent of worktree
 
-expecting success of 3200.101 'simple tracking skips when remote ref is not a branch': 
-	test_config branch.autosetupmerge simple &&
-	test_config remote.localtags.url . &&
-	test_config remote.localtags.fetch refs/tags/*:refs/remotes/localtags/* &&
-	git tag mytag12 main &&
-	git fetch localtags &&
-	git branch mytag12 localtags/mytag12 &&
-	test_cmp_config "" --default "" branch.mytag12.remote &&
-	test_cmp_config "" --default "" branch.mytag12.merge
+expecting success of 1510.60 '#19: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 60 - #19: explicit GIT_WORK_TREE from nephew of worktree
 
-From .
- * [new tag]         bt7        -> localtags/bt7
- * [new tag]         foobar     -> localtags/foobar
- * [new tag]         my_commit  -> localtags/my_commit
- * [new tag]         mytag12    -> localtags/mytag12
-ok 101 - simple tracking skips when remote ref is not a branch
+expecting success of 1510.61 '#19: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 61 - #19: chdir_to_toplevel uses worktree, not git dir
 
-expecting success of 3200.102 '--set-upstream-to fails on multiple branches': 
-	echo "fatal: too many arguments to set new upstream" >expect &&
-	test_must_fail git branch --set-upstream-to main a b c 2>err &&
-	test_cmp expect err
+expecting success of 1510.62 '#19: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 62 - #19: chdir_to_toplevel uses worktree (from subdir)
 
-ok 102 - --set-upstream-to fails on multiple branches
+expecting success of 1510.63 '#20a: core.worktree without GIT_DIR accepted (inside .git)': 
+	# Unlike case #16a.
+	setup_repo 20a "$here/20a" "" unset &&
+	mkdir -p 20a/.git/wt/sub &&
+	try_case 20a/.git unset unset \
+		"$here/20a/.git" "$here/20a" "$here/20a" .git/ 2>message &&
+	try_case 20a/.git/wt unset unset \
+		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/ &&
+	try_case 20a/.git/wt/sub unset unset \
+		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/sub/ &&
+	test_must_be_empty message
 
-expecting success of 3200.103 '--set-upstream-to fails on detached HEAD': 
-	git checkout HEAD^{} &&
-	test_when_finished git checkout - &&
-	echo "fatal: could not set upstream of HEAD to main when it does not point to any branch" >expect &&
-	test_must_fail git branch --set-upstream-to main 2>err &&
-	test_cmp expect err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/20a/.git/
+ok 63 - #20a: core.worktree without GIT_DIR accepted (inside .git)
 
-Note: switching to 'HEAD^{}'.
+expecting success of 1510.64 '#20b/c: core.worktree and core.bare conflict': 
+	setup_repo 20b non-existent "" true &&
+	mkdir -p 20b/.git/wt/sub &&
+	(
+		cd 20b/.git &&
+		test_must_fail git status >/dev/null
+	) 2>message &&
+	grep "core.bare and core.worktree" message
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/20b/.git/
+warning: core.bare and core.worktree do not make sense
+ok 64 - #20b/c: core.worktree and core.bare conflict
 
-If you want to 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 1510.65 '#20d: core.worktree and core.bare OK when working tree not needed': 
+	setup_repo 20d non-existent "" true &&
+	mkdir -p 20d/.git/wt/sub &&
+	(
+		cd 20d/.git &&
+		git config foo.bar value
+	)
 
-  git switch -c <new-branch-name>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/20d/.git/
+warning: core.bare and core.worktree do not make sense
+ok 65 - #20d: core.worktree and core.bare OK when working tree not needed
 
-Or undo this operation with:
+expecting success of 1510.66 '#21: setup, core.worktree warns before overriding core.bare': 
+	setup_repo 21 non-existent "" unset &&
+	mkdir -p 21/.git/wt/sub &&
+	(
+		cd 21/.git &&
+		GIT_WORK_TREE="$here/21" &&
+		export GIT_WORK_TREE &&
+		git status >/dev/null
+	) 2>message &&
+	test_must_be_empty message
 
-  git switch -
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/21/.git/
+ok 66 - #21: setup, core.worktree warns before overriding core.bare
 
-HEAD is now at da664a6 Second commit.
-Switched to branch 'main'
-ok 103 - --set-upstream-to fails on detached HEAD
+expecting success of 1510.67 '#21: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 67 - #21: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-expecting success of 3200.104 '--set-upstream-to fails on a missing dst branch': 
-	echo "fatal: branch 'does-not-exist' does not exist" >expect &&
-	test_must_fail git branch --set-upstream-to main does-not-exist 2>err &&
-	test_cmp expect err
+expecting success of 1510.68 '#21: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 68 - #21: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-ok 104 - --set-upstream-to fails on a missing dst branch
+expecting success of 1510.69 '#21: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 69 - #21: explicit GIT_WORK_TREE from parent of worktree
 
-expecting success of 3200.105 '--set-upstream-to fails on a missing src branch': 
-	test_must_fail git branch --set-upstream-to does-not-exist main 2>err &&
-	test_grep "the requested upstream branch 'does-not-exist' does not exist" err
+expecting success of 1510.70 '#21: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 70 - #21: explicit GIT_WORK_TREE from nephew of worktree
 
-fatal: the requested upstream branch 'does-not-exist' does not exist
-ok 105 - --set-upstream-to fails on a missing src branch
+expecting success of 1510.71 '#21: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 71 - #21: chdir_to_toplevel uses worktree, not git dir
 
-expecting success of 3200.106 '--set-upstream-to fails on a non-ref': 
-	echo "fatal: cannot set up tracking information; starting point 'HEAD^{}' is not a branch" >expect &&
-	test_must_fail git branch --set-upstream-to HEAD^{} 2>err &&
-	test_cmp expect err
+expecting success of 1510.72 '#21: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 72 - #21: chdir_to_toplevel uses worktree (from subdir)
 
-ok 106 - --set-upstream-to fails on a non-ref
+expecting success of 1510.73 '#22a: core.worktree = GIT_DIR = .git dir': 
+	# like case #6.
 
-expecting success of 3200.107 '--set-upstream-to fails on locked config': 
-	test_when_finished "rm -f .git/config.lock" &&
-	>.git/config.lock &&
-	git branch locked &&
-	test_must_fail git branch --set-upstream-to locked 2>err &&
-	test_grep "could not lock config file .git/config" err
+	setup_repo 22a "$here/22a/.git" "" unset &&
+	setup_repo 22ab . "" unset &&
+	mkdir -p 22a/.git/sub 22a/sub &&
+	mkdir -p 22ab/.git/sub 22ab/sub &&
+	try_case 22a/.git unset . \
+		. "$here/22a/.git" "$here/22a/.git" "(null)" &&
+	try_case 22a/.git unset "$here/22a/.git" \
+		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" "(null)" &&
+	try_case 22a/.git/sub unset .. \
+		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
+	try_case 22a/.git/sub unset "$here/22a/.git" \
+		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
 
-error: could not lock config file .git/config: File exists
-ok 107 - --set-upstream-to fails on locked config
+	try_case 22ab/.git unset . \
+		. "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
+	try_case 22ab/.git unset "$here/22ab/.git" \
+		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
+	try_case 22ab/.git/sub unset .. \
+		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" sub/ &&
+	try_case 22ab/.git unset "$here/22ab/.git" \
+		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)"
 
-expecting success of 3200.108 'use --set-upstream-to modify HEAD': 
-	test_config branch.main.remote foo &&
-	test_config branch.main.merge foo &&
-	git branch my12 &&
-	git branch --set-upstream-to my12 &&
-	test "$(git config branch.main.remote)" = "." &&
-	test "$(git config branch.main.merge)" = "refs/heads/my12"
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22a/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22ab/.git/
+ok 73 - #22a: core.worktree = GIT_DIR = .git dir
 
-branch 'main' set up to track 'my12'.
-ok 108 - use --set-upstream-to modify HEAD
+expecting success of 1510.74 '#22b: core.worktree child of .git, GIT_DIR=.git': 
+	setup_repo 22b "$here/22b/.git/wt" "" unset &&
+	setup_repo 22bb wt "" unset &&
+	mkdir -p 22b/.git/sub 22b/sub 22b/.git/wt/sub 22b/wt/sub &&
+	mkdir -p 22bb/.git/sub 22bb/sub 22bb/.git/wt 22bb/wt &&
 
-expecting success of 3200.109 'use --set-upstream-to modify a particular branch': 
-	git branch my13 &&
-	git branch --set-upstream-to main my13 &&
-	test_when_finished "git branch --unset-upstream my13" &&
-	test "$(git config branch.my13.remote)" = "." &&
-	test "$(git config branch.my13.merge)" = "refs/heads/main"
+	try_case 22b/.git unset . \
+		. "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
+	try_case 22b/.git unset "$here/22b/.git" \
+		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
+	try_case 22b/.git/sub unset .. \
+		.. "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
+	try_case 22b/.git/sub unset "$here/22b/.git" \
+		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
 
-branch 'my13' set up to track 'main'.
-ok 109 - use --set-upstream-to modify a particular branch
+	try_case 22bb/.git unset . \
+		. "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
+	try_case 22bb/.git unset "$here/22bb/.git" \
+		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
+	try_case 22bb/.git/sub unset .. \
+		.. "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)" &&
+	try_case 22bb/.git/sub unset "$here/22bb/.git" \
+		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)"
 
-expecting success of 3200.110 '--unset-upstream should fail if given a non-existent branch': 
-	echo "fatal: branch 'i-dont-exist' has no upstream information" >expect &&
-	test_must_fail git branch --unset-upstream i-dont-exist 2>err &&
-	test_cmp expect err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22b/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22bb/.git/
+ok 74 - #22b: core.worktree child of .git, GIT_DIR=.git
 
-ok 110 - --unset-upstream should fail if given a non-existent branch
+expecting success of 1510.75 '#22c: core.worktree = .git/.., GIT_DIR=.git': 
+	setup_repo 22c "$here/22c" "" unset &&
+	setup_repo 22cb .. "" unset &&
+	mkdir -p 22c/.git/sub 22c/sub &&
+	mkdir -p 22cb/.git/sub 22cb/sub &&
 
-expecting success of 3200.111 '--unset-upstream should fail if config is locked': 
-	test_when_finished "rm -f .git/config.lock" &&
-	git branch --set-upstream-to locked &&
-	>.git/config.lock &&
-	test_must_fail git branch --unset-upstream 2>err &&
-	test_grep "could not lock config file .git/config" err
+	try_case 22c/.git unset . \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
+	try_case 22c/.git unset "$here/22c/.git" \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
+	try_case 22c/.git/sub unset .. \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
+	try_case 22c/.git/sub unset "$here/22c/.git" \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
 
-branch 'main' set up to track 'locked'.
-error: could not lock config file .git/config: File exists
-ok 111 - --unset-upstream should fail if config is locked
+	try_case 22cb/.git unset . \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
+	try_case 22cb/.git unset "$here/22cb/.git" \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
+	try_case 22cb/.git/sub unset .. \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/ &&
+	try_case 22cb/.git/sub unset "$here/22cb/.git" \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/
 
-expecting success of 3200.112 'test --unset-upstream on HEAD': 
-	git branch my14 &&
-	test_config branch.main.remote foo &&
-	test_config branch.main.merge foo &&
-	git branch --set-upstream-to my14 &&
-	git branch --unset-upstream &&
-	test_must_fail git config branch.main.remote &&
-	test_must_fail git config branch.main.merge &&
-	# fail for a branch without upstream set
-	echo "fatal: branch 'main' has no upstream information" >expect &&
-	test_must_fail git branch --unset-upstream 2>err &&
-	test_cmp expect err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22c/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22cb/.git/
+ok 75 - #22c: core.worktree = .git/.., GIT_DIR=.git
 
-branch 'main' set up to track 'my14'.
-ok 112 - test --unset-upstream on HEAD
+expecting success of 1510.76 '#22.2: core.worktree and core.bare conflict': 
+	setup_repo 22 "$here/22" "" true &&
+	(
+		cd 22/.git &&
+		GIT_DIR=. &&
+		export GIT_DIR &&
+		test_must_fail git status 2>result
+	) &&
+	(
+		cd 22 &&
+		GIT_DIR=.git &&
+		export GIT_DIR &&
+		test_must_fail git status 2>result
+	) &&
+	grep "core.bare and core.worktree" 22/.git/result &&
+	grep "core.bare and core.worktree" 22/result
 
-expecting success of 3200.113 '--unset-upstream should fail on multiple branches': 
-	echo "fatal: too many arguments to unset upstream" >expect &&
-	test_must_fail git branch --unset-upstream a b c 2>err &&
-	test_cmp expect err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/22/.git/
+warning: core.bare and core.worktree do not make sense
+warning: core.bare and core.worktree do not make sense
+ok 76 - #22.2: core.worktree and core.bare conflict
 
-ok 113 - --unset-upstream should fail on multiple branches
+expecting success of 1510.77 '#23: setup': 
+	setup_repo 23 non-existent "" true &&
+	mkdir -p 23/sub/sub 23/wt/sub
 
-expecting success of 3200.114 '--unset-upstream should fail on detached HEAD': 
-	git checkout HEAD^{} &&
-	test_when_finished git checkout - &&
-	echo "fatal: could not unset upstream of HEAD when it does not point to any branch" >expect &&
-	test_must_fail git branch --unset-upstream 2>err &&
-	test_cmp expect err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/23/.git/
+ok 77 - #23: setup
 
-Note: switching to 'HEAD^{}'.
+expecting success of 1510.78 '#23: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 78 - #23: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 1510.79 '#23: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 79 - #23: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-If you want to 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 1510.80 '#23: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 80 - #23: explicit GIT_WORK_TREE from parent of worktree
 
-  git switch -c <new-branch-name>
+expecting success of 1510.81 '#23: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 81 - #23: explicit GIT_WORK_TREE from nephew of worktree
 
-Or undo this operation with:
+expecting success of 1510.82 '#23: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 82 - #23: chdir_to_toplevel uses worktree, not git dir
 
-  git switch -
+expecting success of 1510.83 '#23: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 83 - #23: chdir_to_toplevel uses worktree (from subdir)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 1510.84 '#24: bare repo has no worktree (gitfile case)': 
+	try_repo 24 unset unset unset gitfile true \
+		"$here/24.git" "(null)" "$here/24" "(null)" \
+		"$here/24.git" "(null)" "$here/24/sub" "(null)"
 
-HEAD is now at da664a6 Second commit.
-Switched to branch 'main'
-ok 114 - --unset-upstream should fail on detached HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/24/.git/
+ok 84 - #24: bare repo has no worktree (gitfile case)
 
-expecting success of 3200.115 'test --unset-upstream on a particular branch': 
-	git branch my15 &&
-	git branch --set-upstream-to main my14 &&
-	git branch --unset-upstream my14 &&
-	test_must_fail git config branch.my14.remote &&
-	test_must_fail git config branch.my14.merge
+expecting success of 1510.85 '#25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case)': 
+	try_repo 25 "$here/25" unset unset gitfile true \
+		"$here/25.git" "$here/25" "$here/25" "(null)"  \
+		"$here/25.git" "$here/25" "$here/25" "sub/" 2>message &&
+	test_must_be_empty message
 
-branch 'my14' set up to track 'main'.
-ok 115 - test --unset-upstream on a particular branch
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/25/.git/
+ok 85 - #25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case)
 
-expecting success of 3200.116 'disabled option --set-upstream fails': 
-	test_must_fail git branch --set-upstream origin/main
+expecting success of 1510.86 '#26: bare repo has no worktree (GIT_DIR -> gitfile case)': 
+	try_repo 26 unset "$here/26/.git" unset gitfile true \
+		"$here/26.git" "(null)" "$here/26" "(null)" \
+		"$here/26.git" "(null)" "$here/26/sub" "(null)" &&
+	try_repo 26b unset .git unset gitfile true \
+		"$here/26b.git" "(null)" "$here/26b" "(null)" \
+		"$here/26b.git" "(null)" "$here/26b/sub" "(null)"
 
-fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead
-ok 116 - disabled option --set-upstream fails
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/26/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/26b/.git/
+ok 86 - #26: bare repo has no worktree (GIT_DIR -> gitfile case)
 
-expecting success of 3200.117 '--set-upstream-to notices an error to set branch as own upstream': 
-	git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
-	cat >expect <<-\EOF &&
-	warning: not setting branch 'my13' as its own upstream
-	EOF
-	test_expect_code 1 git config branch.my13.remote &&
-	test_expect_code 1 git config branch.my13.merge &&
-	test_cmp expect actual
+expecting success of 1510.87 '#27: setup': 
+	setup_repo 27 unset gitfile true &&
+	mkdir -p 27/sub/sub 27/wt/sub
 
-ok 117 - --set-upstream-to notices an error to set branch as own upstream
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/27/.git/
+ok 87 - #27: setup
 
-expecting success of 3200.118 'git checkout -b g/h/i -l should create a branch and a log': 
-	test_when_finished git checkout main &&
-	GIT_COMMITTER_DATE="2005-05-26 23:30" \
-	git checkout -b g/h/i -l main &&
-	test_ref_exists refs/heads/g/h/i &&
-	cat >expect <<-EOF &&
-	$HEAD refs/heads/g/h/i@{0}: branch: Created from main
-	EOF
-	git reflog show --no-abbrev-commit refs/heads/g/h/i >actual &&
-	test_cmp expect actual
+expecting success of 1510.88 '#27: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 88 - #27: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-Switched to a new branch 'g/h/i'
-Switched to branch 'main'
-ok 118 - git checkout -b g/h/i -l should create a branch and a log
+expecting success of 1510.89 '#27: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 89 - #27: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-expecting success of 3200.119 'checkout -b makes reflog by default': 
-	git checkout main &&
-	git config --unset core.logAllRefUpdates &&
-	git checkout -b alpha &&
-	git rev-parse --verify alpha@{0}
+expecting success of 1510.90 '#27: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 90 - #27: explicit GIT_WORK_TREE from parent of worktree
 
-Already on 'main'
-Switched to a new branch 'alpha'
-da664a6b0bffeb0904609e9e14e1beeecfe55c4a
-ok 119 - checkout -b makes reflog by default
+expecting success of 1510.91 '#27: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 91 - #27: explicit GIT_WORK_TREE from nephew of worktree
 
-expecting success of 3200.120 'checkout -b does not make reflog when core.logAllRefUpdates = false': 
-	git checkout main &&
-	git config core.logAllRefUpdates false &&
-	git checkout -b beta &&
-	test_must_fail git rev-parse --verify beta@{0}
+expecting success of 1510.92 '#27: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 92 - #27: chdir_to_toplevel uses worktree, not git dir
 
-Switched to branch 'main'
-Switched to a new branch 'beta'
-fatal: Needed a single revision
-ok 120 - checkout -b does not make reflog when core.logAllRefUpdates = false
+expecting success of 1510.93 '#27: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 93 - #27: chdir_to_toplevel uses worktree (from subdir)
 
-expecting success of 3200.121 'checkout -b with -l makes reflog when core.logAllRefUpdates = false': 
-	git checkout main &&
-	git checkout -lb gamma &&
-	git config --unset core.logAllRefUpdates &&
-	git rev-parse --verify gamma@{0}
+expecting success of 1510.94 '#28: core.worktree and core.bare conflict (gitfile case)': 
+	setup_repo 28 "$here/28" gitfile true &&
+	(
+		cd 28 &&
+		test_must_fail git status
+	) 2>message &&
+	grep "core.bare and core.worktree" message
 
-Switched to branch 'main'
-Switched to a new branch 'gamma'
-da664a6b0bffeb0904609e9e14e1beeecfe55c4a
-ok 121 - checkout -b with -l makes reflog when core.logAllRefUpdates = false
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/28/.git/
+warning: core.bare and core.worktree do not make sense
+ok 94 - #28: core.worktree and core.bare conflict (gitfile case)
 
-expecting success of 3200.122 'avoid ambiguous track and advise': 
-	git config branch.autosetupmerge true &&
-	git config remote.ambi1.url lalala &&
-	git config remote.ambi1.fetch refs/heads/lalala:refs/heads/main &&
-	git config remote.ambi2.url lilili &&
-	git config remote.ambi2.fetch refs/heads/lilili:refs/heads/main &&
-	cat <<-EOF >expected &&
-	fatal: not tracking: ambiguous information for ref 'refs/heads/main'
-	hint: There are multiple remotes whose fetch refspecs map to the remote
-	hint: tracking ref 'refs/heads/main':
-	hint:   ambi1
-	hint:   ambi2
-	hint:
-	hint: This is typically a configuration error.
-	hint:
-	hint: To support setting up tracking branches, ensure that
-	hint: different remotes' fetch refspecs map into different
-	hint: tracking namespaces.
-	EOF
-	test_must_fail git branch all1 main 2>actual &&
-	test_cmp expected actual &&
-	test -z "$(git config branch.all1.merge)"
-
-ok 122 - avoid ambiguous track and advise
+expecting success of 1510.95 '#29: setup': 
+	setup_repo 29 non-existent gitfile true &&
+	mkdir -p 29/sub/sub 29/wt/sub &&
+	(
+		cd 29 &&
+		GIT_WORK_TREE="$here/29" &&
+		export GIT_WORK_TREE &&
+		git status
+	) 2>message &&
+	test_must_be_empty message
 
-expecting success of 3200.123 'autosetuprebase local on a tracked local branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase local &&
-	(git show-ref -q refs/remotes/local/o || git fetch local) &&
-	git branch mybase &&
-	git branch --track myr1 mybase &&
-	test "$(git config branch.myr1.remote)" = . &&
-	test "$(git config branch.myr1.merge)" = refs/heads/mybase &&
-	test "$(git config branch.myr1.rebase)" = true
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/29/.git/
+On branch master
 
-From .
- * [new branch]      all1       -> local/all1
- * [new branch]      alpha      -> local/alpha
- * [new branch]      beta       -> local/beta
- * [new branch]      g/h/i      -> local/g/h/i
- * [new branch]      gamma      -> local/gamma
- * [new branch]      locked     -> local/locked
- * [new branch]      my-other   -> local/my-other
- * [new branch]      my12       -> local/my12
- * [new branch]      my13       -> local/my13
- * [new branch]      my14       -> local/my14
- * [new branch]      my15       -> local/my15
- * [new branch]      mytag12    -> local/mytag12
-branch 'myr1' set up to track 'mybase' by rebasing.
-ok 123 - autosetuprebase local on a tracked local branch
+No commits yet
 
-expecting success of 3200.124 'autosetuprebase always on a tracked local branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase always &&
-	(git show-ref -q refs/remotes/local/o || git fetch local) &&
-	git branch mybase2 &&
-	git branch --track myr2 mybase &&
-	test "$(git config branch.myr2.remote)" = . &&
-	test "$(git config branch.myr2.merge)" = refs/heads/mybase &&
-	test "$(git config branch.myr2.rebase)" = true
+nothing to commit (create/copy files and use "git add" to track)
+ok 95 - #29: setup
 
-From .
- * [new branch]      mybase     -> local/mybase
- * [new branch]      myr1       -> local/myr1
-branch 'myr2' set up to track 'mybase' by rebasing.
-ok 124 - autosetuprebase always on a tracked local branch
+expecting success of 1510.96 '#29: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 96 - #29: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-expecting success of 3200.125 'autosetuprebase remote on a tracked local branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase remote &&
-	(git show-ref -q refs/remotes/local/o || git fetch local) &&
-	git branch mybase3 &&
-	git branch --track myr3 mybase2 &&
-	test "$(git config branch.myr3.remote)" = . &&
-	test "$(git config branch.myr3.merge)" = refs/heads/mybase2 &&
-	! test "$(git config branch.myr3.rebase)" = true
+expecting success of 1510.97 '#29: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 97 - #29: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-From .
- * [new branch]      mybase2    -> local/mybase2
- * [new branch]      myr2       -> local/myr2
-branch 'myr3' set up to track 'mybase2'.
-ok 125 - autosetuprebase remote on a tracked local branch
+expecting success of 1510.98 '#29: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 98 - #29: explicit GIT_WORK_TREE from parent of worktree
 
-expecting success of 3200.126 'autosetuprebase never on a tracked local branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase never &&
-	(git show-ref -q refs/remotes/local/o || git fetch local) &&
-	git branch mybase4 &&
-	git branch --track myr4 mybase2 &&
-	test "$(git config branch.myr4.remote)" = . &&
-	test "$(git config branch.myr4.merge)" = refs/heads/mybase2 &&
-	! test "$(git config branch.myr4.rebase)" = true
+expecting success of 1510.99 '#29: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 99 - #29: explicit GIT_WORK_TREE from nephew of worktree
 
-From .
- * [new branch]      mybase3    -> local/mybase3
- * [new branch]      myr3       -> local/myr3
-branch 'myr4' set up to track 'mybase2'.
-ok 126 - autosetuprebase never on a tracked local branch
+expecting success of 1510.100 '#29: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 100 - #29: chdir_to_toplevel uses worktree, not git dir
 
-expecting success of 3200.127 'autosetuprebase local on a tracked remote branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase local &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --track myr5 local/main &&
-	test "$(git config branch.myr5.remote)" = local &&
-	test "$(git config branch.myr5.merge)" = refs/heads/main &&
-	! test "$(git config branch.myr5.rebase)" = true
+expecting success of 1510.101 '#29: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 101 - #29: chdir_to_toplevel uses worktree (from subdir)
 
-branch 'myr5' set up to track 'local/main'.
-ok 127 - autosetuprebase local on a tracked remote branch
+expecting success of 1510.102 '#30: core.worktree and core.bare conflict (gitfile version)': 
+	# Just like case #22.
+	setup_repo 30 "$here/30" gitfile true &&
+	(
+		cd 30 &&
+		test_must_fail env GIT_DIR=.git git status 2>result
+	) &&
+	grep "core.bare and core.worktree" 30/result
 
-expecting success of 3200.128 'autosetuprebase never on a tracked remote branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase never &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --track myr6 local/main &&
-	test "$(git config branch.myr6.remote)" = local &&
-	test "$(git config branch.myr6.merge)" = refs/heads/main &&
-	! test "$(git config branch.myr6.rebase)" = true
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/30/.git/
+warning: core.bare and core.worktree do not make sense
+ok 102 - #30: core.worktree and core.bare conflict (gitfile version)
 
-branch 'myr6' set up to track 'local/main'.
-ok 128 - autosetuprebase never on a tracked remote branch
+expecting success of 1510.103 '#31: setup': 
+	setup_repo 31 non-existent gitfile true &&
+	mkdir -p 31/sub/sub 31/wt/sub
 
-expecting success of 3200.129 'autosetuprebase remote on a tracked remote branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase remote &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --track myr7 local/main &&
-	test "$(git config branch.myr7.remote)" = local &&
-	test "$(git config branch.myr7.merge)" = refs/heads/main &&
-	test "$(git config branch.myr7.rebase)" = true
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1510-repo-setup/31/.git/
+ok 103 - #31: setup
 
-branch 'myr7' set up to track 'local/main' by rebasing.
-ok 129 - autosetuprebase remote on a tracked remote branch
+expecting success of 1510.104 '#31: explicit GIT_WORK_TREE and GIT_DIR at toplevel': 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 104 - #31: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-expecting success of 3200.130 'autosetuprebase always on a tracked remote branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	git config branch.autosetuprebase remote &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --track myr8 local/main &&
-	test "$(git config branch.myr8.remote)" = local &&
-	test "$(git config branch.myr8.merge)" = refs/heads/main &&
-	test "$(git config branch.myr8.rebase)" = true
+expecting success of 1510.105 '#31: explicit GIT_WORK_TREE and GIT_DIR in subdir': 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 105 - #31: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-branch 'myr8' set up to track 'local/main' by rebasing.
-ok 130 - autosetuprebase always on a tracked remote branch
+expecting success of 1510.106 '#31: explicit GIT_WORK_TREE from parent of worktree': 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 106 - #31: explicit GIT_WORK_TREE from parent of worktree
 
-expecting success of 3200.131 'autosetuprebase unconfigured on a tracked remote branch': 
-	git config --unset branch.autosetuprebase &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --track myr9 local/main &&
-	test "$(git config branch.myr9.remote)" = local &&
-	test "$(git config branch.myr9.merge)" = refs/heads/main &&
-	test "z$(git config branch.myr9.rebase)" = z
+expecting success of 1510.107 '#31: explicit GIT_WORK_TREE from nephew of worktree': 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 107 - #31: explicit GIT_WORK_TREE from nephew of worktree
 
-branch 'myr9' set up to track 'local/main'.
-ok 131 - autosetuprebase unconfigured on a tracked remote branch
+expecting success of 1510.108 '#31: chdir_to_toplevel uses worktree, not git dir': 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 108 - #31: chdir_to_toplevel uses worktree, not git dir
 
-expecting success of 3200.132 'autosetuprebase unconfigured on a tracked local branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/o || git fetch local) &&
-	git branch mybase10 &&
-	git branch --track myr10 mybase2 &&
-	test "$(git config branch.myr10.remote)" = . &&
-	test "$(git config branch.myr10.merge)" = refs/heads/mybase2 &&
-	test "z$(git config branch.myr10.rebase)" = z
+expecting success of 1510.109 '#31: chdir_to_toplevel uses worktree (from subdir)': 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 109 - #31: chdir_to_toplevel uses worktree (from subdir)
 
-From .
- * [new branch]      mybase4    -> local/mybase4
- * [new branch]      myr4       -> local/myr4
- * [new branch]      myr5       -> local/myr5
- * [new branch]      myr6       -> local/myr6
- * [new branch]      myr7       -> local/myr7
- * [new branch]      myr8       -> local/myr8
- * [new branch]      myr9       -> local/myr9
-branch 'myr10' set up to track 'mybase2'.
-ok 132 - autosetuprebase unconfigured on a tracked local branch
+# passed all 109 test(s)
+1..109
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3000-ls-files-others.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/.git/
+expecting success of 3000.1 'setup ': 
+	date >path0 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s xyzzy path1
+	else
+		date >path1
+	fi &&
+	mkdir path2 path3 path4 &&
+	date >path2/file2 &&
+	date >path2-junk &&
+	date >path3/file3 &&
+	date >path3-junk &&
+	git update-index --add path3-junk path3/file3
 
-expecting success of 3200.133 'autosetuprebase unconfigured on untracked local branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr11 mybase2 &&
-	test "z$(git config branch.myr11.remote)" = z &&
-	test "z$(git config branch.myr11.merge)" = z &&
-	test "z$(git config branch.myr11.rebase)" = z
+checking prerequisite: SYMLINKS
 
-ok 133 - autosetuprebase unconfigured on untracked local branch
+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 3200.134 'autosetuprebase unconfigured on untracked remote branch': 
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr12 local/main &&
-	test "z$(git config branch.myr12.remote)" = z &&
-	test "z$(git config branch.myr12.merge)" = z &&
-	test "z$(git config branch.myr12.rebase)" = z
+)
+prerequisite SYMLINKS ok
+ok 1 - setup 
 
-ok 134 - autosetuprebase unconfigured on untracked remote branch
+expecting success of 3000.2 'setup: expected output': 
+	cat >expected1 <<-\EOF &&
+	expected1
+	expected2
+	expected3
+	output
+	path0
+	path1
+	path2-junk
+	path2/file2
+	EOF
 
-expecting success of 3200.135 'autosetuprebase never on an untracked local branch': 
-	git config branch.autosetuprebase never &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr13 mybase2 &&
-	test "z$(git config branch.myr13.remote)" = z &&
-	test "z$(git config branch.myr13.merge)" = z &&
-	test "z$(git config branch.myr13.rebase)" = z
+	sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
+	cp expected2 expected3 &&
+	echo path4/ >>expected2
 
-ok 135 - autosetuprebase never on an untracked local branch
+ok 2 - setup: expected output
 
-expecting success of 3200.136 'autosetuprebase local on an untracked local branch': 
-	git config branch.autosetuprebase local &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr14 mybase2 &&
-	test "z$(git config branch.myr14.remote)" = z &&
-	test "z$(git config branch.myr14.merge)" = z &&
-	test "z$(git config branch.myr14.rebase)" = z
+expecting success of 3000.3 'ls-files --others': 
+	git ls-files --others >output &&
+	test_cmp expected1 output
 
-ok 136 - autosetuprebase local on an untracked local branch
+ok 3 - ls-files --others
 
-expecting success of 3200.137 'autosetuprebase remote on an untracked local branch': 
-	git config branch.autosetuprebase remote &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr15 mybase2 &&
-	test "z$(git config branch.myr15.remote)" = z &&
-	test "z$(git config branch.myr15.merge)" = z &&
-	test "z$(git config branch.myr15.rebase)" = z
+expecting success of 3000.4 'ls-files --others --directory': 
+	git ls-files --others --directory >output &&
+	test_cmp expected2 output
 
-ok 137 - autosetuprebase remote on an untracked local branch
+ok 4 - ls-files --others --directory
 
-expecting success of 3200.138 'autosetuprebase always on an untracked local branch': 
-	git config branch.autosetuprebase always &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr16 mybase2 &&
-	test "z$(git config branch.myr16.remote)" = z &&
-	test "z$(git config branch.myr16.merge)" = z &&
-	test "z$(git config branch.myr16.rebase)" = z
+expecting success of 3000.5 '--no-empty-directory hides empty directory': 
+	git ls-files --others --directory --no-empty-directory >output &&
+	test_cmp expected3 output
 
-ok 138 - autosetuprebase always on an untracked local branch
+ok 5 - --no-empty-directory hides empty directory
 
-expecting success of 3200.139 'autosetuprebase never on an untracked remote branch': 
-	git config branch.autosetuprebase never &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr17 local/main &&
-	test "z$(git config branch.myr17.remote)" = z &&
-	test "z$(git config branch.myr17.merge)" = z &&
-	test "z$(git config branch.myr17.rebase)" = z
+expecting success of 3000.6 'ls-files --others handles non-submodule .git': 
+	mkdir not-a-submodule &&
+	echo foo >not-a-submodule/.git &&
+	git ls-files -o >output &&
+	test_cmp expected1 output
 
-ok 139 - autosetuprebase never on an untracked remote branch
+ok 6 - ls-files --others handles non-submodule .git
 
-expecting success of 3200.140 'autosetuprebase local on an untracked remote branch': 
-	git config branch.autosetuprebase local &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr18 local/main &&
-	test "z$(git config branch.myr18.remote)" = z &&
-	test "z$(git config branch.myr18.merge)" = z &&
-	test "z$(git config branch.myr18.rebase)" = z
+expecting success of 3000.7 'ls-files --others with symlinked submodule': 
+	git init super &&
+	git init sub &&
+	(
+		cd sub &&
+		>a &&
+		git add a &&
+		git commit -m sub &&
+		git pack-refs --all
+	) &&
+	(
+		cd super &&
+		"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub &&
+		git ls-files --others --exclude-standard >../actual
+	) &&
+	echo sub/ >expect &&
+	test_cmp expect actual
 
-ok 140 - autosetuprebase local on an untracked remote branch
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/super/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/sub/.git/
+[master (root-commit) 8c0a349] sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 7 - ls-files --others with symlinked submodule
 
-expecting success of 3200.141 'autosetuprebase remote on an untracked remote branch': 
-	git config branch.autosetuprebase remote &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr19 local/main &&
-	test "z$(git config branch.myr19.remote)" = z &&
-	test "z$(git config branch.myr19.merge)" = z &&
-	test "z$(git config branch.myr19.rebase)" = z
+expecting success of 3000.8 'setup nested pathspec search': 
+	test_create_repo nested &&
+	(
+		cd nested &&
 
-ok 141 - autosetuprebase remote on an untracked remote branch
+		mkdir -p partially_tracked/untracked_dir &&
+		> partially_tracked/content &&
+		> partially_tracked/untracked_dir/file &&
 
-expecting success of 3200.142 'autosetuprebase always on an untracked remote branch': 
-	git config branch.autosetuprebase always &&
-	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/main || git fetch local) &&
-	git branch --no-track myr20 local/main &&
-	test "z$(git config branch.myr20.remote)" = z &&
-	test "z$(git config branch.myr20.merge)" = z &&
-	test "z$(git config branch.myr20.rebase)" = z
+		mkdir -p untracked/deep &&
+		> untracked/deep/path &&
+		> untracked/deep/foo.c &&
 
-ok 142 - autosetuprebase always on an untracked remote branch
+		git add partially_tracked/content
+	)
 
-expecting success of 3200.143 'autosetuprebase always on detached HEAD': 
-	git config branch.autosetupmerge always &&
-	test_when_finished git checkout main &&
-	git checkout HEAD^0 &&
-	git branch my11 &&
-	test -z "$(git config branch.my11.remote)" &&
-	test -z "$(git config branch.my11.merge)"
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/nested/.git/
+ok 8 - setup nested pathspec search
 
-Note: switching to 'HEAD^0'.
+expecting success of 3000.9 'ls-files -o --directory with single deep dir pathspec': 
+	(
+		cd nested &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+		git ls-files -o --directory untracked/deep/ >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:
+		cat <<-EOF >expect &&
+		untracked/deep/
+		EOF
 
-  git switch -c <new-branch-name>
+		test_cmp expect actual
+	)
 
-Or undo this operation with:
+ok 9 - ls-files -o --directory with single deep dir pathspec
 
-  git switch -
+expecting success of 3000.10 'ls-files -o --directory with multiple dir pathspecs': 
+	(
+		cd nested &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		git ls-files -o --directory partially_tracked/ untracked/ >actual &&
 
-HEAD is now at da664a6 Second commit.
-Switched to branch 'main'
-ok 143 - autosetuprebase always on detached HEAD
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/
+		EOF
 
-expecting success of 3200.144 'detect misconfigured autosetuprebase (bad value)': 
-	git config branch.autosetuprebase garbage &&
-	test_must_fail git branch
+		test_cmp expect actual
+	)
 
-error: malformed value for branch.autosetuprebase
-fatal: bad config variable 'branch.autosetuprebase' in file '.git/config' at line 87
-ok 144 - detect misconfigured autosetuprebase (bad value)
+ok 10 - ls-files -o --directory with multiple dir pathspecs
 
-expecting success of 3200.145 'detect misconfigured autosetuprebase (no value)': 
-	git config --unset branch.autosetuprebase &&
-	echo "[branch] autosetuprebase" >>.git/config &&
-	test_must_fail git branch &&
-	git config --unset branch.autosetuprebase
+expecting success of 3000.11 'ls-files -o --directory with mix dir/file pathspecs': 
+	(
+		cd nested &&
 
-error: missing value for 'branch.autosetuprebase'
-fatal: bad config variable 'branch.autosetuprebase' in file '.git/config' at line 130
-ok 145 - detect misconfigured autosetuprebase (no value)
+		git ls-files -o --directory partially_tracked/ untracked/deep/path >actual &&
 
-expecting success of 3200.146 'attempt to delete a branch without base and unmerged to HEAD': 
-	git checkout my9 &&
-	git config --unset branch.my8.merge &&
-	test_must_fail git branch -d my8
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/path
+		EOF
 
-Switched to branch 'my9'
-error: the branch 'my8' is not fully merged
-hint: If you are sure you want to delete it, run 'git branch -D my8'
-hint: Disable this message with "git config set advice.forceDeleteBranch false"
-ok 146 - attempt to delete a branch without base and unmerged to HEAD
+		test_cmp expect actual
+	)
 
-expecting success of 3200.147 'attempt to delete a branch merged to its base': 
-	# we are on my9 which is the initial commit; traditionally
-	# we would not have allowed deleting my8 that is not merged
-	# to my9, but it is set to track main that already has my8
-	git config branch.my8.merge refs/heads/main &&
-	git branch -d my8
+ok 11 - ls-files -o --directory with mix dir/file pathspecs
 
-warning: deleting branch 'my8' that has been merged to
-         'refs/heads/main', but not yet merged to HEAD
-Deleted branch my8 (was da664a6).
-ok 147 - attempt to delete a branch merged to its base
+expecting success of 3000.12 'ls-files -o --directory with glob filetype match': 
+	(
+		cd nested &&
 
-expecting success of 3200.148 'attempt to delete a branch merged to its base': 
-	git checkout main &&
-	echo Third >>A &&
-	git commit -m "Third commit" A &&
-	git branch -t my10 my9 &&
-	git branch -f my10 HEAD^ &&
-	# we are on main which is at the third commit, and my10
-	# is behind us, so traditionally we would have allowed deleting
-	# it; but my10 is set to track my9 that is further behind.
-	test_must_fail git branch -d my10
+		# globs kinda defeat --directory, but only for that pathspec
+		git ls-files --others --directory partially_tracked "untracked/*.c" >actual &&
 
-Switched to branch 'main'
-[main c783cab] Third commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-branch 'my10' set up to track 'my9'.
-warning: not deleting branch 'my10' that is not yet merged to
-         'refs/heads/my9', even though it is merged to HEAD
-error: the branch 'my10' is not fully merged
-hint: If you are sure you want to delete it, run 'git branch -D my10'
-hint: Disable this message with "git config set advice.forceDeleteBranch false"
-ok 148 - attempt to delete a branch merged to its base
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/foo.c
+		EOF
 
-expecting success of 3200.149 'branch --delete --force removes dangling branch': 
-	git checkout main &&
-	test_commit unstable &&
-	hash=$(git rev-parse HEAD) &&
-	objpath=$(echo $hash | sed -e "s|^..|.git/objects/&/|") &&
-	git branch --no-track dangling &&
-	mv $objpath $objpath.x &&
-	test_when_finished "mv $objpath.x $objpath" &&
-	git branch --delete --force dangling &&
-	git for-each-ref refs/heads/dangling >actual &&
-	test_must_be_empty actual
+		test_cmp expect actual
+	)
 
-Already on 'main'
-[main e9e975e] unstable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unstable.t
-Deleted branch dangling (was e9e975e).
-ok 149 - branch --delete --force removes dangling branch
+ok 12 - ls-files -o --directory with glob filetype match
 
-expecting success of 3200.150 'use --edit-description': 
-	EDITOR=: git branch --edit-description &&
-	test_expect_code 1 git config branch.main.description &&
+expecting success of 3000.13 'ls-files -o --directory with mix of tracked states': 
+	(
+		cd nested &&
 
-	write_script editor <<-\EOF &&
-		echo "New contents" >"$1"
-	EOF
-	EDITOR=./editor git branch --edit-description &&
-		write_script editor <<-\EOF &&
-		git stripspace -s <"$1" >"EDITOR_OUTPUT"
-	EOF
-	EDITOR=./editor git branch --edit-description &&
-	echo "New contents" >expect &&
-	test_cmp expect EDITOR_OUTPUT
+		# globs kinda defeat --directory, but only for that pathspec
+		git ls-files --others --directory partially_tracked/ "untracked/?*" >actual &&
 
-ok 150 - use --edit-description
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/
+		EOF
 
-expecting success of 3200.151 'detect typo in branch name when using --edit-description': 
-	write_script editor <<-\EOF &&
-		echo "New contents" >"$1"
-	EOF
-	test_must_fail env EDITOR=./editor git branch --edit-description no-such-branch
+		test_cmp expect actual
+	)
 
-error: no branch named 'no-such-branch'
-ok 151 - detect typo in branch name when using --edit-description
+ok 13 - ls-files -o --directory with mix of tracked states
 
-expecting success of 3200.152 'refuse --edit-description on unborn branch for now': 
-	test_when_finished "git checkout main" &&
-	write_script editor <<-\EOF &&
-		echo "New contents" >"$1"
-	EOF
-	git checkout --orphan unborn &&
-	test_must_fail env EDITOR=./editor git branch --edit-description
+expecting success of 3000.14 'ls-files -o --directory with glob filetype match only': 
+	(
+		cd nested &&
 
-Switched to a new branch 'unborn'
-error: no commit on branch 'unborn' yet
-Switched to branch 'main'
-ok 152 - refuse --edit-description on unborn branch for now
+		git ls-files --others --directory "untracked/*.c" >actual &&
 
-expecting success of 3200.153 '--merged catches invalid object names': 
-	test_must_fail git branch --merged 0000000000000000000000000000000000000000
+		cat <<-EOF >expect &&
+		untracked/deep/foo.c
+		EOF
 
-error: option `merged' must point to a commit
-ok 153 - --merged catches invalid object names
+		test_cmp expect actual
+	)
 
-expecting success of 3200.154 '--list during rebase': 
-	test_when_finished "reset_rebase" &&
-	git checkout main &&
-	FAKE_LINES="1 edit 2" &&
-	export FAKE_LINES &&
-	set_fake_editor &&
-	git rebase -i HEAD~2 &&
-	git branch --list >actual &&
-	test_grep "rebasing main" actual
+ok 14 - ls-files -o --directory with glob filetype match only
 
-Already on 'main'
-rebase -i script before editing:
-pick c783cab Third commit
-pick e9e975e unstable
+expecting success of 3000.15 'ls-files -o --directory to get immediate paths under one dir only': 
+	(
+		cd nested &&
 
-rebase -i script after editing:
-pick c783cab Third commit
-edit e9e975e unstable
-Rebasing (2/2)
Stopped at e9e975e...  unstable
-You can amend the commit now, with
+		git ls-files --others --directory "untracked/?*" >actual &&
 
-  git commit --amend 
+		cat <<-EOF >expect &&
+		untracked/deep/
+		EOF
 
-Once you are satisfied with your changes, run
+		test_cmp expect actual
+	)
 
-  git rebase --continue
-* (no branch, rebasing main)
-HEAD is now at e9e975e unstable
-Removing .gitconfig
-Removing EDITOR_OUTPUT
-Removing actual
-Removing actual.0abbrev
-Removing actual.36abbrev
-Removing actual.abbrev
-Removing actual.config
-Removing actual.default
-Removing actual.noabbrev
-Removing actual.noabbrev-conf
-Removing config.branch
-Removing editor
-Removing err
-Removing expect
-Removing expect.config
-Removing expected
-Removing fake-editor.sh
-ok 154 - --list during rebase
+ok 15 - ls-files -o --directory to get immediate paths under one dir only
 
-expecting success of 3200.155 '--list during rebase from detached HEAD': 
-	test_when_finished "reset_rebase && git checkout main" &&
-	git checkout main^0 &&
-	oid=$(git rev-parse --short HEAD) &&
-	FAKE_LINES="1 edit 2" &&
-	export FAKE_LINES &&
-	set_fake_editor &&
-	git rebase -i HEAD~2 &&
-	git branch --list >actual &&
-	test_grep "rebasing detached HEAD $oid" actual
+expecting success of 3000.16 'ls-files -o avoids listing untracked non-matching gitdir': 
+	test_when_finished "rm -rf nested/untracked/deep/empty" &&
+	(
+		cd nested &&
 
-Note: switching to 'main^0'.
+		git init untracked/deep/empty &&
+		git ls-files --others "untracked/*.c" >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.
+		cat <<-EOF >expect &&
+		untracked/deep/foo.c
+		EOF
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		test_cmp expect actual
+	)
 
-  git switch -c <new-branch-name>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3000-ls-files-others/nested/untracked/deep/empty/.git/
+ok 16 - ls-files -o avoids listing untracked non-matching gitdir
 
-Or undo this operation with:
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3001-ls-files-others-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3001-ls-files-others-exclude/.git/
+expecting success of 3001.1 'git ls-files --others with various exclude options.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
 
-  git switch -
+ok 1 - git ls-files --others with various exclude options.
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3001.2 'git ls-files --others with \r\n line endings.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
 
-HEAD is now at e9e975e unstable
-rebase -i script before editing:
-pick c783cab Third commit
-pick e9e975e unstable
+ok 2 - git ls-files --others with \r\n line endings.
 
-rebase -i script after editing:
-pick c783cab Third commit
-edit e9e975e unstable
-Rebasing (2/2)
Stopped at e9e975e...  unstable
-You can amend the commit now, with
+expecting success of 3001.3 'setup skip-worktree gitignore': 
+	git add $allignores &&
+	git update-index --skip-worktree $allignores &&
+	rm $allignores
 
-  git commit --amend 
+ok 3 - setup skip-worktree gitignore
 
-Once you are satisfied with your changes, run
+expecting success of 3001.4 'git ls-files --others with various exclude options.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
 
-  git rebase --continue
-* (no branch, rebasing detached HEAD e9e975e)
-HEAD is now at e9e975e unstable
-Removing actual
-Removing fake-editor.sh
-Switched to branch 'main'
-ok 155 - --list during rebase from detached HEAD
+ok 4 - git ls-files --others with various exclude options.
 
-expecting success of 3200.156 'tracking with unexpected .fetch refspec': 
-	rm -rf a b c d &&
-	git init -b main a &&
-	(
-		cd a &&
-		test_commit a
-	) &&
-	git init -b main b &&
-	(
-		cd b &&
-		test_commit b
-	) &&
-	git init -b main c &&
-	(
-		cd c &&
-		test_commit c &&
-		git remote add a ../a &&
-		git remote add b ../b &&
-		git fetch --all
-	) &&
-	git init -b main d &&
-	(
-		cd d &&
-		git remote add c ../c &&
-		git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" &&
-		git fetch c &&
-		git branch --track local/a/main remotes/a/main &&
-		test "$(git config branch.local/a/main.remote)" = "c" &&
-		test "$(git config branch.local/a/main.merge)" = "refs/remotes/a/main" &&
-		git rev-parse --verify a >expect &&
-		git rev-parse --verify local/a/main >actual &&
-		test_cmp expect actual
-	)
+expecting success of 3001.5 'restore gitignore': 
+	git checkout --ignore-skip-worktree-bits $allignores &&
+	rm .git/index
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/a/.git/
-[main (root-commit) f7cd21e] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/b/.git/
-[main (root-commit) 0546d35] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/c/.git/
-[main (root-commit) 38c490a] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Fetching a
-From ../a
- * [new branch]      main       -> a/main
- * [new tag]         a          -> a
-Fetching b
-From ../b
- * [new branch]      main       -> b/main
- * [new tag]         b          -> b
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/d/.git/
-From ../c
- * [new ref]         a/HEAD     -> a/HEAD
- * [new ref]         a/main     -> a/main
- * [new ref]         b/HEAD     -> b/HEAD
- * [new ref]         b/main     -> b/main
- * [new tag]         a          -> a
- * [new tag]         b          -> b
-branch 'local/a/main' set up to track 'c/refs/remotes/a/main'.
-warning: refname 'a' is ambiguous.
-ok 156 - tracking with unexpected .fetch refspec
+Updated 3 paths from the index
+ok 5 - restore gitignore
 
-expecting success of 3200.157 'configured committerdate sort': 
-	git init -b main sort &&
-	test_config -C sort branch.sort "committerdate" &&
+expecting success of 3001.6 'git status honors core.excludesfile': test_cmp expect output
+ok 6 - git status honors core.excludesfile
 
-	(
-		cd sort &&
-		test_commit initial &&
-		git checkout -b a &&
-		test_commit a &&
-		git checkout -b c &&
-		test_commit c &&
-		git checkout -b b &&
-		test_commit b &&
-		git branch >actual &&
-		cat >expect <<-\EOF &&
-		  main
-		  a
-		  c
-		* b
-		EOF
-		test_cmp expect actual
-	)
+expecting success of 3001.7 'trailing slash in exclude allows directory match(1)': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/sort/.git/
-[main (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 'a'
-[a 3f62c16] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Switched to a new branch 'c'
-[c 8d91554] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Switched to a new branch 'b'
-[b 80279b4] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-ok 157 - configured committerdate sort
+	git ls-files --others --exclude=one/ >output &&
+	if grep "^one/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
 
-expecting success of 3200.158 'option override configured sort': 
-	test_config -C sort branch.sort "committerdate" &&
 
-	(
-		cd sort &&
-		git branch --sort=refname >actual &&
-		cat >expect <<-\EOF &&
-		  a
-		* b
-		  c
-		  main
-		EOF
-		test_cmp expect actual
-	)
+ok 7 - trailing slash in exclude allows directory match(1)
 
-ok 158 - option override configured sort
+expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
 
-expecting success of 3200.159 '--no-sort cancels config sort keys': 
-	test_config -C sort branch.sort "-refname" &&
+	git ls-files --others --exclude=one/two/ >output &&
+	if grep "^one/two/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
 
-	(
-		cd sort &&
 
-		# objecttype is identical for all of them, so sort falls back on
-		# default (ascending refname)
-		git branch \
-			--no-sort \
-			--sort="objecttype" >actual &&
-		cat >expect <<-\EOF &&
-		  a
-		* b
-		  c
-		  main
-		EOF
-		test_cmp expect actual
-	)
+ok 8 - trailing slash in exclude allows directory match (2)
 
+expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
 
-ok 159 - --no-sort cancels config sort keys
+	>two &&
+	git ls-files --others --exclude=two/ >output &&
+	grep "^two" output
 
-expecting success of 3200.160 '--no-sort cancels command line sort keys': 
-	(
-		cd sort &&
 
-		# objecttype is identical for all of them, so sort falls back on
-		# default (ascending refname)
-		git branch \
-			--sort="-refname" \
-			--no-sort \
-			--sort="objecttype" >actual &&
-		cat >expect <<-\EOF &&
-		  a
-		* b
-		  c
-		  main
-		EOF
-		test_cmp expect actual
-	)
+two
+ok 9 - trailing slash in exclude forces directory match (1)
 
-ok 160 - --no-sort cancels command line sort keys
+expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
 
-expecting success of 3200.161 '--no-sort without subsequent --sort prints expected branches': 
-	(
-		cd sort &&
+	git ls-files --others --exclude=one/a.1/ >output &&
+	grep "^one/a.1" output
 
-		# Sort the results with `sort` for a consistent comparison
-		# against expected
-		git branch --no-sort | sort >actual &&
-		cat >expect <<-\EOF &&
-		  a
-		  c
-		  main
-		* b
-		EOF
-		test_cmp expect actual
-	)
 
-ok 161 - --no-sort without subsequent --sort prints expected branches
+one/a.1
+ok 10 - trailing slash in exclude forces directory match (2)
 
-expecting success of 3200.162 'invalid sort parameter in configuration': 
-	test_config -C sort branch.sort "v:notvalid" &&
+expecting success of 3001.11 'negated exclude matches can override previous ones': 
 
-	(
-		cd sort &&
+	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
+	grep "^a.1" output
 
-		# this works in the "listing" mode, so bad sort key
-		# is a dying offence.
-		test_must_fail git branch &&
+a.1
+ok 11 - negated exclude matches can override previous ones
 
-		# these do not need to use sorting, and should all
-		# succeed
-		git branch newone main &&
-		git branch -c newone newerone &&
-		git branch -m newone newestone &&
-		git branch -d newerone newestone
-	)
+expecting success of 3001.12 'excluded directory overrides content patterns': 
 
-fatal: unknown field name: notvalid
-Deleted branch newerone (was 31243c6).
-Deleted branch newestone (was 31243c6).
-ok 162 - invalid sort parameter in configuration
+	git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
+	if grep "^one/a.1" output
+	then
+		false
+	fi
 
-expecting success of 3200.163 'tracking info copied with --track=inherit': 
-	git branch --track=inherit foo2 my1 &&
-	test_cmp_config local branch.foo2.remote &&
-	test_cmp_config refs/heads/main branch.foo2.merge
+ok 12 - excluded directory overrides content patterns
 
-branch 'foo2' set up to track 'local/main'.
-ok 163 - tracking info copied with --track=inherit
+expecting success of 3001.13 'negated directory doesn't affect content patterns': 
 
-expecting success of 3200.164 'tracking info copied with autoSetupMerge=inherit': 
-	test_unconfig branch.autoSetupMerge &&
-	# default config does not copy tracking info
-	git branch foo-no-inherit my1 &&
-	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 my1
-	test_config branch.autoSetupMerge inherit &&
-	git branch foo3 my1 &&
-	test_cmp_config local branch.foo3.remote &&
-	test_cmp_config refs/heads/main branch.foo3.merge &&
-	# no tracking info to inherit from main
-	git branch main2 main &&
-	test_cmp_config "" --default "" branch.main2.remote &&
-	test_cmp_config "" --default "" branch.main2.merge
+	git ls-files --others --exclude="!one" --exclude="one/a.1" >output &&
+	if grep "^one/a.1" output
+	then
+		false
+	fi
 
-branch 'foo3' set up to track 'local/main'.
-warning: asked to inherit tracking from 'main', but no remote is set
-ok 164 - tracking info copied with autoSetupMerge=inherit
+ok 13 - negated directory doesn't affect content patterns
 
-expecting success of 3200.165 '--track overrides branch.autoSetupMerge': 
-	test_config branch.autoSetupMerge inherit &&
-	git branch --track=direct foo4 my1 &&
-	test_cmp_config . branch.foo4.remote &&
-	test_cmp_config refs/heads/my1 branch.foo4.merge &&
-	git branch --no-track foo5 my1 &&
-	test_cmp_config "" --default "" branch.foo5.remote &&
-	test_cmp_config "" --default "" branch.foo5.merge
+expecting success of 3001.14 'subdirectory ignore (setup)': 
+	mkdir -p top/l1/l2 &&
+	(
+		cd top &&
+		git init &&
+		echo /.gitignore >.gitignore &&
+		echo l1 >>.gitignore &&
+		echo l2 >l1/.gitignore &&
+		>l1/l2/l1
+	)
 
-branch 'foo4' set up to track 'my1'.
-ok 165 - --track overrides branch.autoSetupMerge
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3001-ls-files-others-exclude/top/.git/
+ok 14 - subdirectory ignore (setup)
 
-expecting success of 3200.166 'errors if given a bad branch name': 
-	cat <<-\EOF >expect &&
-	fatal: 'foo..bar' is not a valid branch name
-	hint: See `man git check-ref-format`
-	hint: Disable this message with "git config set advice.refSyntax false"
-	EOF
-	test_must_fail git branch foo..bar >actual 2>&1 &&
-	test_cmp expect actual
+expecting success of 3001.15 'subdirectory ignore (toplevel)': 
+	(
+		cd top &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
 
-ok 166 - errors if given a bad branch name
+ok 15 - subdirectory ignore (toplevel)
 
-# passed all 166 test(s)
-1..166
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3301-notes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3301-notes/.git/
-expecting success of 3301.1 'cannot annotate non-existing HEAD': 
-	test_must_fail env MSG=3 git notes add
+expecting success of 3001.16 'subdirectory ignore (l1/l2)': 
+	(
+		cd top/l1/l2 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
 
-fatal: failed to resolve 'HEAD' as a valid ref.
-ok 1 - cannot annotate non-existing HEAD
+ok 16 - subdirectory ignore (l1/l2)
 
-expecting success of 3301.2 'setup': 
-	test_commit 1st &&
-	test_commit 2nd
+expecting success of 3001.17 'subdirectory ignore (l1)': 
+	(
+		cd top/l1 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
 
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-[master 7a4ca6e] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2nd.t
-ok 2 - setup
+ok 17 - subdirectory ignore (l1)
 
-expecting success of 3301.3 'need valid notes ref': 
-	test_must_fail env MSG=1 GIT_NOTES_REF=/ git notes show &&
-	test_must_fail env MSG=2 GIT_NOTES_REF=/ git notes show
+expecting success of 3001.18 'show/hide empty ignored directory (setup)': 
+	rm top/l1/l2/l1 &&
+	rm top/l1/.gitignore
 
-fatal: refusing to show notes in / (outside of refs/notes/)
-fatal: refusing to show notes in / (outside of refs/notes/)
-ok 3 - need valid notes ref
+ok 18 - show/hide empty ignored directory (setup)
 
-expecting success of 3301.4 'refusing to add notes in refs/heads/': 
-	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes add
+expecting success of 3001.19 'show empty ignored directory with --directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory
+	) >actual &&
+	echo l1/ >expect &&
+	test_cmp expect actual
 
-fatal: refusing to add notes in refs/heads/bogus (outside of refs/notes/)
-ok 4 - refusing to add notes in refs/heads/
+ok 19 - show empty ignored directory with --directory
 
-expecting success of 3301.5 'refusing to edit notes in refs/remotes/': 
-	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes edit
+expecting success of 3001.20 'hide empty ignored directory with --no-empty-directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory --no-empty-directory
+	) >actual &&
+	test_must_be_empty actual
 
-fatal: refusing to edit notes in refs/heads/bogus (outside of refs/notes/)
-ok 5 - refusing to edit notes in refs/remotes/
+ok 20 - hide empty ignored directory with --no-empty-directory
 
-expecting success of 3301.6 'handle empty notes gracefully': 
-	test_expect_code 1 git notes show
+expecting success of 3001.21 'show/hide empty ignored sub-directory (setup)': 
+	> top/l1/tracked &&
+	(
+		cd top &&
+		git add -f l1/tracked
+	)
 
-error: no note found for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691.
-ok 6 - handle empty notes gracefully
+ok 21 - show/hide empty ignored sub-directory (setup)
 
-expecting success of 3301.7 'show non-existent notes entry with %N': 
-	test_write_lines A B >expect &&
-	git show -s --format="A%n%NB" >actual &&
+expecting success of 3001.22 'show empty ignored sub-directory with --directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory
+	) >actual &&
+	echo l1/l2/ >expect &&
 	test_cmp expect actual
 
-ok 7 - show non-existent notes entry with %N
+ok 22 - show empty ignored sub-directory with --directory
 
-expecting success of 3301.8 'create notes': 
-	MSG=b4 git notes add &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b4 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+expecting success of 3001.23 'hide empty ignored sub-directory with --no-empty-directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory --no-empty-directory
+	) >actual &&
+	test_must_be_empty actual
 
-b4
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 23 - hide empty ignored sub-directory with --no-empty-directory
 
-    1st
+expecting success of 3001.24 'pattern matches prefix completely': 
+	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
+	test_must_be_empty actual
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 8 - create notes
+ok 24 - pattern matches prefix completely
 
-expecting success of 3301.9 'show notes entry with %N': 
-	test_write_lines A b4 B >expect &&
-	git show -s --format="A%n%NB" >actual &&
+expecting success of 3001.25 'ls-files with "**" patterns': 
+	cat <<-\EOF >expect &&
+	a.1
+	one/a.1
+	one/two/a.1
+	three/a.1
+	EOF
+	git ls-files -o -i --exclude "**/a.1" >actual &&
 	test_cmp expect actual
 
-ok 9 - show notes entry with %N
+ok 25 - ls-files with "**" patterns
 
-expecting success of 3301.10 'create reflog entry': 
-	ref=$(git rev-parse --short refs/notes/commits) &&
-	cat <<-EOF >expect &&
-		$ref refs/notes/commits@{0}: notes: Notes added by 'git notes add'
-	EOF
-	git reflog show refs/notes/commits >actual &&
+expecting success of 3001.26 'ls-files with "**" patterns and --directory': 
+	# Expectation same as previous test
+	git ls-files --directory -o -i --exclude "**/a.1" >actual &&
 	test_cmp expect actual
 
-ok 10 - create reflog entry
-
-expecting success of 3301.11 'edit existing notes': 
-	MSG=b3 git notes edit &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b3 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+ok 26 - ls-files with "**" patterns and --directory
 
-b3
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 3001.27 'ls-files with "**" patterns and no slashes': 
+	git ls-files -o -i --exclude "one**a.1" >actual &&
+	test_must_be_empty actual
 
-    1st
+ok 27 - ls-files with "**" patterns and no slashes
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 11 - edit existing notes
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3003-ls-files-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3003-ls-files-exclude/.git/
+expecting success of 3003.1 'create repo with file': 
+	echo content >file &&
+	git add file &&
+	git commit -m file &&
+	echo modification >file
 
-expecting success of 3301.12 'show notes from treeish': 
-	echo b3 >expect &&
-	git notes --ref commits^{tree} show >actual &&
-	test_cmp expect actual &&
+[master (root-commit) 39caa03] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - create repo with file
 
-	echo b4 >expect &&
-	git notes --ref commits@{1} show >actual &&
-	test_cmp expect actual
+expecting success of 3003.2 'ls-files output contains file (cached)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --cached >output &&
+	test_cmp expect output
 
-ok 12 - show notes from treeish
+ok 2 - ls-files output contains file (cached)
 
-expecting success of 3301.13 'cannot edit notes from non-ref': 
-	test_must_fail git notes --ref commits^{tree} edit &&
-	test_must_fail git notes --ref commits@{1} edit
+expecting success of 3003.3 'ls-files output contains file (modified)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --modified >output &&
+	test_cmp expect output
 
-fatal: Cannot use notes ref refs/notes/commits^{tree}
-fatal: Cannot use notes ref refs/notes/commits@{1}
-ok 13 - cannot edit notes from non-ref
+ok 3 - ls-files output contains file (modified)
 
-expecting success of 3301.14 'cannot "git notes add -m" where notes already exists': 
-	test_must_fail git notes add -m "b2" &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b3 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+expecting success of 3003.4 'add file to gitignore': 
+	echo file >.gitignore
 
-error: Cannot add notes. Found existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691. Use '-f' to overwrite existing notes
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 4 - add file to gitignore
 
-    1st
+expecting success of 3003.5 'ls-files output contains file (cached)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --cached >output &&
+	test_cmp expect output
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 14 - cannot "git notes add -m" where notes already exists
+ok 5 - ls-files output contains file (cached)
 
-expecting success of 3301.15 'can overwrite existing note with "git notes add -f -m"': 
-	git notes add -f -m "b1" &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b1 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+expecting success of 3003.6 'ls-files output contains file (modified)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --modified >output &&
+	test_cmp expect output
 
-Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 6 - ls-files output contains file (modified)
 
-    1st
+expecting success of 3003.7 'ls-files -i -c lists only tracked-but-ignored files': 
+	echo content >other-file &&
+	git add other-file &&
+	echo file >expect &&
+	git ls-files -i -c --exclude-standard >output &&
+	test_cmp expect output
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 15 - can overwrite existing note with "git notes add -f -m"
+ok 7 - ls-files -i -c lists only tracked-but-ignored files
 
-expecting success of 3301.16 'add w/no options on existing note morphs into edit': 
-	MSG=b2 git notes add &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b2 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2500-untracked-overwriting.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/.git/
+expecting success of 2500.1 'reset --hard will nuke untracked files/dirs': 
+	test_setup_reset hard &&
+	(
+		cd reset_hard &&
+		git ls-tree -r stable &&
+		git log --all --name-status --oneline &&
+		git ls-tree -r work &&
 
-b2
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		echo foo >expect &&
 
-    1st
+		git reset --hard work &&
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 16 - add w/no options on existing note morphs into edit
+		# check that untracked directory foo.t/ was nuked
+		test_path_is_file foo.t &&
+		test_cmp expect foo.t
+	)
 
-expecting success of 3301.17 'can overwrite existing note with "git notes add -f"': 
-	MSG=b1 git notes add -f &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b1 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/reset_hard/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Switched to branch 'work'
+[work cb1b896] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Switched to branch 'stable'
+100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
+cb1b896 foo
+A	foo.t
+2519212 init
+A	init.t
+100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99	foo.t
+100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
+HEAD is now at cb1b896 foo
+ok 1 - reset --hard will nuke untracked files/dirs
 
-Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-b1
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 2500.2 'reset --merge will preserve untracked files/dirs': 
+	test_setup_reset merge &&
+	(
+		cd reset_merge &&
 
-    1st
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		cp foo.t/file expect &&
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 17 - can overwrite existing note with "git notes add -f"
+		test_must_fail git reset --merge work 2>error &&
+		test_cmp expect foo.t/file &&
+		grep "Updating .foo.t. would lose untracked files" error
+	)
 
-expecting success of 3301.18 'show notes': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:14:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/reset_merge/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Switched to branch 'work'
+[work cb1b896] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Switched to branch 'stable'
+error: Updating 'foo.t' would lose untracked files in it
+ok 2 - reset --merge will preserve untracked files/dirs
 
-		${indent}2nd
+expecting success of 2500.3 'reset --keep will preserve untracked files/dirs': 
+	test_setup_reset keep &&
+	(
+		cd reset_keep &&
 
-		Notes:
-		${indent}b1
-	EOF
-	git cat-file commit HEAD >commits &&
-	! grep b1 commits &&
-	git log -1 >actual &&
-	test_cmp expect actual
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		cp foo.t/file expect &&
 
-ok 18 - show notes
+		test_must_fail git reset --merge work 2>error &&
+		test_cmp expect foo.t/file &&
+		grep "Updating.*foo.t.*would lose untracked files" error
+	)
 
-expecting success of 3301.19 'show multi-line notes': 
-	test_commit 3rd &&
-	MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-multiline <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:15:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/reset_keep/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Switched to branch 'work'
+[work cb1b896] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Switched to branch 'stable'
+error: Updating 'foo.t' would lose untracked files in it
+ok 3 - reset --keep will preserve untracked files/dirs
 
-		${indent}3rd
+expecting success of 2500.4 'checkout -m does not nuke untracked file': 
+	test_setup_checkout_m &&
+	(
+		cd checkout &&
 
-		Notes:
-		${indent}b3
-		${indent}c3c3c3c3
-		${indent}d3d3d3
+		# Tweak filler
+		test_write_lines this file has some >filler &&
+		# Make an untracked file, save its contents in "expect"
+		echo precious >notes.txt &&
+		cp notes.txt expect &&
 
-	EOF
-	cat expect >>expect-multiline &&
-	git log -2 >actual &&
-	test_cmp expect-multiline actual
+		test_must_fail git checkout -m work &&
+		test_cmp expect notes.txt
+	)
 
-[master d07d62e] 3rd
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/checkout/.git/
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 3rd.t
-b3
-c3c3c3c3
-d3d3d3
-ok 19 - show multi-line notes
+ create mode 100644 init.t
+[master 7d7f42a] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 filler
+Switched to a new branch 'work'
+[work bac6a98] filler
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 notes.txt
+Switched to branch 'stable'
+error: Untracked working tree file 'notes.txt' would be overwritten by merge.
+ok 4 - checkout -m does not nuke untracked file
 
-expecting success of 3301.20 'show -F notes': 
-	test_commit 4th &&
-	echo "xyzzy" >note5 &&
-	git notes add -F note5 &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-F <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:16:13 2005 -0700
+expecting success of 2500.5 'git rebase --abort and untracked files': 
+	test_setup_sequencing rebase_abort_and_untracked &&
+	(
+		cd sequencing_rebase_abort_and_untracked &&
+		git checkout fooey &&
+		test_must_fail git rebase simple &&
 
-		${indent}4th
+		cat init.t &&
+		git rm init.t &&
+		echo precious >init.t &&
+		cp init.t expect &&
+		git status --porcelain &&
+		test_must_fail git rebase --abort &&
+		test_cmp expect init.t
+	)
 
-		Notes:
-		${indent}xyzzy
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_abort_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Switched to branch 'fooey'
+Rebasing (1/1)
Auto-merging filler
+CONFLICT (content): Merge conflict in filler
+error: could not apply d39f842... changes
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply d39f842... changes
+init
+rm 'init.t'
+UU filler
+D  foo/bar/baz.t
+D  init.t
+?? expect
+?? init.t
+error: The following untracked working tree files would be overwritten by reset:
+	init.t
+Please move or remove them before you reset.
+Aborting
+fatal: could not move back to d39f842c8a54822614a71d9e503b01b89b57e3bf
+ok 5 - git rebase --abort and untracked files
 
-	EOF
-	cat expect-multiline >>expect-F &&
-	git log -3 >actual &&
-	test_cmp expect-F actual
+expecting success of 2500.6 'git rebase fast forwarding and untracked files': 
+	test_setup_sequencing rebase_fast_forward_and_untracked &&
+	(
+		cd sequencing_rebase_fast_forward_and_untracked &&
+		git checkout init &&
+		echo precious >filler &&
+		cp filler expect &&
+		test_must_fail git rebase init simple &&
+		test_cmp expect filler
+	)
 
-[master 0f7aa3e] 4th
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_fast_forward_and_untracked/.git/
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 4th.t
-ok 20 - show -F notes
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Note: switching to 'init'.
 
-expecting success of 3301.21 'Re-adding -F notes without -f fails': 
-	echo "zyxxy" >note5 &&
-	test_must_fail git notes add -F note5 &&
-	git log -3 >actual &&
-	test_cmp expect-F actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-error: Cannot add notes. Found existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11. Use '-f' to overwrite existing notes
-ok 21 - Re-adding -F notes without -f 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:
 
-expecting success of 3301.22 'git log --pretty=raw does not show notes': 
-	commit=$(git rev-parse HEAD) &&
-	tree=$(git rev-parse HEAD^{tree}) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		tree $tree
-		parent $parent
-		author A U Thor <author@example.com> 1112912173 -0700
-		committer C O Mitter <committer@example.com> 1112912173 -0700
+  git switch -c <new-branch-name>
 
-		${indent}4th
-	EOF
-	git log -1 --pretty=raw >actual &&
-	test_cmp expect actual
+Or undo this operation with:
 
-ok 22 - git log --pretty=raw does not show notes
+  git switch -
 
-expecting success of 3301.23 'git log --show-notes': 
-	cat >>expect <<-EOF &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	Notes:
-	${indent}xyzzy
-	EOF
-	git log -1 --pretty=raw --show-notes >actual &&
-	test_cmp expect actual
+HEAD is now at 2519212 init
+error: The following untracked working tree files would be overwritten by checkout:
+	filler
+Please move or remove them before you switch branches.
+Aborting
+error: could not switch to simple
+ok 6 - git rebase fast forwarding and untracked files
 
-ok 23 - git log --show-notes
+checking known breakage of 2500.7 'git rebase --autostash and untracked files': 
+	test_setup_sequencing rebase_autostash_and_untracked &&
+	(
+		cd sequencing_rebase_autostash_and_untracked &&
+		git checkout simple &&
+		git rm filler &&
+		mkdir filler &&
+		echo precious >filler/file &&
+		cp filler/file expect &&
+		git rebase --autostash init &&
+		test_path_is_file filler/file
+	)
 
-expecting success of 3301.24 'git log --no-notes': 
-	git log -1 --no-notes >actual &&
-	! grep xyzzy actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_rebase_autostash_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Already on 'simple'
+rm 'filler'
+error: Updating the following directories would lose untracked files in them:
+	filler
 
-ok 24 - git log --no-notes
+Aborting
+fatal: could not reset --hard
+Created autostash: ae7ed59
+not ok 7 - git rebase --autostash and untracked files # TODO known breakage
 
-expecting success of 3301.25 'git format-patch does not show notes': 
-	git format-patch -1 --stdout >actual &&
-	! grep xyzzy actual
+checking known breakage of 2500.8 'git stash and untracked files': 
+	test_setup_sequencing stash_and_untracked_files &&
+	(
+		cd sequencing_stash_and_untracked_files &&
+		git checkout simple &&
+		git rm filler &&
+		mkdir filler &&
+		echo precious >filler/file &&
+		cp filler/file expect &&
+		git status --porcelain &&
+		git stash push &&
+		git status --porcelain &&
+		test_path_is_file filler/file
+	)
 
-ok 25 - git format-patch does not show notes
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_stash_and_untracked_files/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Already on 'simple'
+rm 'filler'
+D  filler
+?? expect
+?? filler/
+Saved working directory and index state WIP on simple: 15a37e4 another
+?? expect
+File filler/file doesn't exist
+not ok 8 - git stash and untracked files # TODO known breakage
 
-expecting success of 3301.26 'git format-patch --show-notes does show notes': 
-	git format-patch --show-notes -1 --stdout >actual &&
-	grep xyzzy actual
+expecting success of 2500.9 'git am --abort and untracked dir vs. unmerged file': 
+	test_setup_sequencing am_abort_and_untracked &&
+	(
+		cd sequencing_am_abort_and_untracked &&
+		git format-patch -1 --stdout fooey >changes.mbox &&
+		test_must_fail git am --3way changes.mbox &&
 
-    xyzzy
-ok 26 - git format-patch --show-notes does show notes
+		# Delete the conflicted file; we will stage and commit it later
+		rm filler &&
 
-expecting success of 3301.27 'git show  does show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-    xyzzy
-ok 27 - git show  does show notes
+		# Put an unrelated untracked directory there
+		mkdir filler &&
+		echo foo >filler/file1 &&
+		echo bar >filler/file2 &&
 
-expecting success of 3301.28 'git show --pretty does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 28 - git show --pretty does not show notes
+		test_must_fail git am --abort 2>errors &&
+		test_path_is_dir filler &&
+		grep "Updating .filler. would lose untracked files in it" errors
+	)
 
-expecting success of 3301.29 'git show --pretty=raw does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 29 - git show --pretty=raw does not show notes
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_am_abort_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Applying: changes
+Using index info to reconstruct a base tree...
+M	filler
+Falling back to patching base and 3-way merge...
+Merging:
+15a37e4 another
+virtual changes
+found 1 common ancestor:
+virtual 3f7dfa0c5a54951d5d8082a6eda7692dfeb9ce47
+Removing foo/bar/baz.t
+Auto-merging filler
+CONFLICT (content): Merge conflict in filler
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 changes
+error: Updating 'filler' would lose untracked files in it
+ok 9 - git am --abort and untracked dir vs. unmerged file
 
-expecting success of 3301.30 'git show --pretty=short does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 30 - git show --pretty=short does not show notes
+expecting success of 2500.10 'git am --skip and untracked dir vs deleted file': 
+	test_setup_sequencing am_skip_and_untracked &&
+	(
+		cd sequencing_am_skip_and_untracked &&
+		git checkout fooey &&
+		git format-patch -1 --stdout simple >changes.mbox &&
+		test_must_fail git am --3way changes.mbox &&
 
-expecting success of 3301.31 'git show --pretty=medium does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 31 - git show --pretty=medium does not show notes
+		# Delete newfile
+		rm newfile &&
 
-expecting success of 3301.32 'git show --pretty=full does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 32 - git show --pretty=full does not show notes
+		# Put an unrelated untracked directory there
+		mkdir newfile &&
+		echo foo >newfile/file1 &&
+		echo bar >newfile/file2 &&
 
-expecting success of 3301.33 'git show --pretty=fuller does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 33 - git show --pretty=fuller does not show notes
+		# Change our mind about resolutions, just skip this patch
+		test_must_fail git am --skip 2>errors &&
+		test_path_is_dir newfile &&
+		grep "Updating .newfile. would lose untracked files in it" errors
+	)
 
-expecting success of 3301.34 'git show --pretty=format:%s does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 34 - git show --pretty=format:%s does not show notes
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2500-untracked-overwriting/sequencing_am_skip_and_untracked/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 8220a2b] filler
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+[master 4cfedf0] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+Switched to branch 'fooey'
+rm 'foo/bar/baz.t'
+[fooey d39f842] changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'simple'
+[simple 15a37e4] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 newfile
+Switched to branch 'fooey'
+Applying: another
+Using index info to reconstruct a base tree...
+M	filler
+Falling back to patching base and 3-way merge...
+Merging:
+d39f842 changes
+virtual another
+found 1 common ancestor:
+virtual a4566c4813b6ad70d63b32fcd2dda30547574648
+Auto-merging filler
+CONFLICT (content): Merge conflict in filler
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 another
+error: Updating 'newfile' would lose untracked files in it
+ok 10 - git am --skip and untracked dir vs deleted file
 
-expecting success of 3301.35 'git show --oneline does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 35 - git show --oneline does not show notes
+# still have 2 known breakage(s)
+# passed all remaining 8 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3006-ls-files-long.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3006-ls-files-long/.git/
+expecting success of 3006.1 'setup': 
+	p=filefilefilefilefilefilefilefile &&
+	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
+	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
 
-expecting success of 3301.36 'setup alternate notes ref': 
-	git notes --ref=alternate add -m alternate
+	path_a=${p}_a &&
+	path_z=${p}_z &&
 
-ok 36 - setup alternate notes ref
+	blob_a=$(echo frotz | git hash-object -w --stdin) &&
+	blob_z=$(echo nitfol | git hash-object -w --stdin) &&
 
-expecting success of 3301.37 'git log --notes shows default notes': 
-	git log -1 --notes >actual &&
-	grep xyzzy actual &&
-	! grep alternate actual
+	pat="100644 %s 0\t%s\n"
 
-    xyzzy
-ok 37 - git log --notes shows default notes
+ok 1 - setup
 
-expecting success of 3301.38 'git log --notes=X shows only X': 
-	git log -1 --notes=alternate >actual &&
-	! grep xyzzy actual &&
-	grep alternate actual
+expecting success of 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
 
-Notes (alternate):
-    alternate
-ok 38 - git log --notes=X shows only X
+ok 2 - overly-long path by itself is not a problem
 
-expecting success of 3301.39 'git log --notes --notes=X shows both': 
-	git log -1 --notes --notes=alternate >actual &&
-	grep xyzzy actual &&
-	grep alternate actual
+expecting success of 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
 
-    xyzzy
-Notes (alternate):
-    alternate
-ok 39 - git log --notes --notes=X shows both
+ok 3 - overly-long path does not replace another by mistake
 
-expecting success of 3301.40 'git log --no-notes resets default state': 
-	git log -1 --notes --notes=alternate \
-		--no-notes --notes=alternate \
-		>actual &&
-	! grep xyzzy actual &&
-	grep alternate actual
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3005-ls-files-relative.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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*
+	)
 
-Notes (alternate):
-    alternate
-ok 40 - git log --no-notes resets default state
+ok 1 - prepare
 
-expecting success of 3301.41 'git log --no-notes resets ref list': 
-	git log -1 --notes --notes=alternate \
-		--no-notes --notes \
-		>actual &&
-	grep xyzzy actual &&
-	! grep alternate actual
+expecting success of 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
+	)
 
-    xyzzy
-ok 41 - git log --no-notes resets ref list
+ok 2 - ls-files with mixed levels
 
-expecting success of 3301.42 'show -m notes': 
-	test_commit 5th &&
-	git notes add -m spam -m "foo${LF}bar${LF}baz" &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-m <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+expecting success of 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
+	)
 
-		${indent}5th
+ok 3 - ls-files -c
 
-		Notes:
-		${indent}spam
-		${indent}
-		${indent}foo
-		${indent}bar
-		${indent}baz
+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
+	)
 
-	EOF
-	cat expect-F >>expect-m &&
-	git log -4 >actual &&
-	test_cmp expect-m actual
+ok 4 - ls-files -o
 
-[master 7f9ad88] 5th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5th.t
-ok 42 - show -m notes
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3004-ls-files-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 3301.43 'remove note with add -f -F /dev/null': 
-	git notes add -f -F /dev/null &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-rm-F <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+ok 1 - ls-files in empty repository
 
-		${indent}5th
+expecting success of 3004.2 'ls-files with nonexistent path': 
+	git ls-files doesnotexist >actual &&
+	test_must_be_empty actual
 
-	EOF
-	cat expect-F >>expect-rm-F &&
-	git log -4 >actual &&
-	test_cmp expect-rm-F actual &&
-	test_must_fail git notes show
+ok 2 - ls-files with nonexistent path
 
-Overwriting existing notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 43 - remove note with add -f -F /dev/null
+expecting success of 3004.3 'ls-files with nonsense option': 
+	test_expect_code 129 git ls-files --nonsense 2>actual &&
+	test_grep "[Uu]sage: git ls-files" actual
 
-expecting success of 3301.44 'do not create empty note with -m ""': 
-	git notes add -m "" &&
-	git log -4 >actual &&
-	test_cmp expect-rm-F actual &&
-	test_must_fail git notes show
+usage: git ls-files [<options>] [<file>...]
+ok 3 - ls-files with nonsense option
 
-Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 44 - do not create empty note with -m ""
+expecting success of 3004.4 'ls-files -h in corrupt repository': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git ls-files -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage: git ls-files " broken/usage
 
-expecting success of 3301.45 'create note with combination of -m and -F': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect-combine_m_and_F <<-EOF &&
-		foo
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3004-ls-files-basic/broken/.git/
+usage: git ls-files [<options>] [<file>...]
+ok 4 - ls-files -h in corrupt repository
 
-		xyzzy
+checking prerequisite: SYMLINKS
 
-		bar
+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
 
-		zyxxy
+)
+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 &&
 
-		baz
-	EOF
-	echo "xyzzy" >note_a &&
-	echo "zyxxy" >note_b &&
-	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
+	(
+		cd subs &&
+		git ls-files -s link >../expect &&
+		git ls-files -s "$(pwd)/link" >../actual
+	) &&
+	test_cmp expect actual
 
-Removing note for object HEAD
-ok 45 - create note with combination of -m and -F
+ok 5 - ls-files with absolute paths to symlinks
 
-expecting success of 3301.46 'create note with combination of -m and -F and --separator': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect-combine_m_and_F <<-\EOF &&
-	foo
-	-------
-	xyzzy
-	-------
-	bar
-	-------
-	zyxxy
-	-------
-	baz
-	EOF
-	echo "xyzzy" >note_a &&
-	echo "zyxxy" >note_b &&
-	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --separator="-------" &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3008-ls-files-lazy-init-name-hash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Removing note for object HEAD
-ok 46 - create note with combination of -m and -F and --separator
+0.000814 0.036472 4002 multi 2
+ok 1 - no buffer overflow in lazy_init_name_hash
 
-expecting success of 3301.47 'create note with combination of -m and -F and --no-separator': 
-	cat >expect-combine_m_and_F <<-\EOF &&
-	foo
-	xyzzy
-	bar
-	zyxxy
-	baz
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3009-ls-files-others-nonsubmodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/.git/
+expecting success of 3009.1 'setup: directories': 
+	mkdir nonrepo-no-files/ &&
+	mkdir nonrepo-untracked-file &&
+	: >nonrepo-untracked-file/untracked &&
+	git init repo-no-commit-no-files &&
+	git init repo-no-commit-untracked-file &&
+	: >repo-no-commit-untracked-file/untracked &&
+	git init repo-with-commit-no-files &&
+	git -C repo-with-commit-no-files commit --allow-empty -mmsg &&
+	git init repo-with-commit-untracked-file &&
+	test_commit -C repo-with-commit-untracked-file msg &&
+	: >repo-with-commit-untracked-file/untracked
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-no-files/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-no-commit-untracked-file/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-no-files/.git/
+[master (root-commit) b4b9816] msg
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3009-ls-files-others-nonsubmodule/repo-with-commit-untracked-file/.git/
+[master (root-commit) c24fc06] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 msg.t
+ok 1 - setup: directories
+
+expecting success of 3009.2 'ls-files --others handles untracked git repositories': 
+	git ls-files -o >output &&
+	cat >expect <<-EOF &&
+	nonrepo-untracked-file/untracked
+	output
+	repo-no-commit-no-files/
+	repo-no-commit-untracked-file/
+	repo-with-commit-no-files/
+	repo-with-commit-untracked-file/
 	EOF
-	echo "xyzzy" >note_a &&
-	echo "zyxxy" >note_b &&
-	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --no-separator &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
+	test_cmp expect output
 
-ok 47 - create note with combination of -m and -F and --no-separator
+ok 2 - ls-files --others handles untracked git repositories
 
-expecting success of 3301.48 'remove note with "git notes remove"': 
-	git notes remove HEAD^ &&
-	git notes remove &&
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect-rm-remove <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3010-ls-files-killed-modified.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3010-ls-files-killed-modified/.git/
+expecting success of 3010.1 'git update-index --add to add various paths.': 
+	date >path0 &&
+	test_ln_s_add xyzzy path1 &&
+	mkdir path2 path3 pathx &&
+	date >path2/file2 &&
+	date >path3/file3 &&
+	>pathx/ju &&
+	: >path7 &&
+	date >path8 &&
+	: >path9 &&
+	date >path10 &&
+	git update-index --add -- path0 path?/file? pathx/ju path7 path8 path9 path10 &&
+	git init submod1 &&
+	git -C submod1 commit --allow-empty -m "empty 1" &&
+	git init submod2 &&
+	git -C submod2 commit --allow-empty -m "empty 2" &&
+	git update-index --add submod[12] &&
+	(
+		cd submod1 &&
+		git commit --allow-empty -m "empty 1 (updated)"
+	) &&
+	rm -fr path?	# leave path10 alone
 
-		${indent}5th
+checking prerequisite: SYMLINKS
 
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:16:13 2005 -0700
+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
 
-		${indent}4th
+)
+prerequisite SYMLINKS ok
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3010-ls-files-killed-modified/submod1/.git/
+[master (root-commit) 4da6488] empty 1
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3010-ls-files-killed-modified/submod2/.git/
+[master (root-commit) 2720aba] empty 2
+ Author: A U Thor <author@example.com>
+[master c92551b] empty 1 (updated)
+ Author: A U Thor <author@example.com>
+ok 1 - git update-index --add to add various paths.
 
+expecting success of 3010.2 'git ls-files -k to show killed files.': 
+	date >path2 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s frotz path3 &&
+		ln -s nitfol path5
+	else
+		date >path3 &&
+		date >path5
+	fi &&
+	mkdir -p path0 path1 path6 pathx/ju &&
+	date >path0/file0 &&
+	date >path1/file1 &&
+	date >path6/file6 &&
+	date >path7 &&
+	: >path8 &&
+	: >path9 &&
+	touch path10 &&
+	>pathx/ju/nk &&
+	cat >.expected <<-\EOF
+	path0/file0
+	path1/file1
+	path2
+	path3
+	pathx/ju/nk
 	EOF
-	cat expect-multiline >>expect-rm-remove &&
-	git log -4 >actual &&
-	test_cmp expect-rm-remove actual &&
-	test_must_fail git notes show HEAD^
 
-Removing note for object HEAD^
-Removing note for object HEAD
-error: no note found for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11.
-ok 48 - remove note with "git notes remove"
+ok 2 - git ls-files -k to show killed files.
 
-expecting success of 3301.49 'removing non-existing note should not create new commit': 
-	git rev-parse --verify refs/notes/commits >before_commit &&
-	test_must_fail git notes remove HEAD^ &&
-	git rev-parse --verify refs/notes/commits >after_commit &&
-	test_cmp before_commit after_commit
+expecting success of 3010.3 'git ls-files -k output (w/o icase)': 
+	git ls-files -k >.output &&
+	test_cmp .expected .output
 
-Object HEAD^ has no note
-ok 49 - removing non-existing note should not create new commit
+ok 3 - git ls-files -k output (w/o icase)
 
-expecting success of 3301.50 'removing more than one': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+expecting success of 3010.4 'git ls-files -k output (w/ icase)': 
+	git -c core.ignorecase=true ls-files -k >.output &&
+	test_cmp .expected .output
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git notes remove HEAD^^ HEAD^^^ &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+ok 4 - git ls-files -k output (w/ icase)
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-ok 50 - removing more than one
+expecting success of 3010.5 'git ls-files -m to show modified files.': 
+	git ls-files -m >.output
 
-expecting success of 3301.51 'removing is atomic': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
-	test_must_fail git notes remove HEAD^^ HEAD^^^ HEAD^ &&
-	after=$(git rev-parse --verify refs/notes/commits) &&
-	test "$before" = "$after"
+ok 5 - git ls-files -m to show modified files.
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-Object HEAD^ has no note
-ok 51 - removing is atomic
+expecting success of 3010.6 'validate git ls-files -m output.': 
+	cat >.expected <<-\EOF &&
+	path0
+	path1
+	path2/file2
+	path3/file3
+	path7
+	path8
+	pathx/ju
+	submod1
+	EOF
+	test_cmp .expected .output
 
-expecting success of 3301.52 'removing with --ignore-missing': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+ok 6 - validate git ls-files -m output.
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git notes remove --ignore-missing HEAD^^ HEAD^^^ HEAD^ &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3020-ls-files-error-unmatch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3020-ls-files-error-unmatch/.git/
+expecting success of 3020.1 'setup': 
+	touch foo bar &&
+	git update-index --add foo bar &&
+	git commit -m "add foo bar"
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-Object HEAD^ has no note
-ok 52 - removing with --ignore-missing
+[master (root-commit) 6c59e8c] add foo bar
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - setup
 
-expecting success of 3301.53 'removing with --ignore-missing but bogus ref': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
-	test_must_fail git notes remove --ignore-missing HEAD^^ HEAD^^^ NO-SUCH-COMMIT &&
-	after=$(git rev-parse --verify refs/notes/commits) &&
-	test "$before" = "$after"
+expecting success of 3020.2 'git ls-files --error-unmatch should fail with unmatched path.': 
+	test_must_fail git ls-files --error-unmatch foo bar-does-not-match
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-error: Failed to resolve 'NO-SUCH-COMMIT' as a valid ref.
-ok 53 - removing with --ignore-missing but bogus ref
+error: pathspec 'bar-does-not-match' did not match any file(s) known to git
+Did you forget to 'git add'?
+foo
+ok 2 - git ls-files --error-unmatch should fail with unmatched path.
 
-expecting success of 3301.54 'remove reads from --stdin': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+expecting success of 3020.3 'git ls-files --error-unmatch should succeed with matched paths.': 
+	git ls-files --error-unmatch foo bar
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git rev-parse HEAD^^ HEAD^^^ >input &&
-	git notes remove --stdin <input &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+bar
+foo
+ok 3 - git ls-files --error-unmatch should succeed with matched paths.
 
-Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-ok 54 - remove reads from --stdin
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3012-ls-files-dedup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3012-ls-files-dedup/.git/
+expecting success of 3012.1 'setup': 
+	>a.txt &&
+	>b.txt &&
+	>delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m base &&
+	echo a >a.txt &&
+	echo b >b.txt &&
+	echo delete >delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m tip &&
+	git tag tip &&
+	git reset --hard HEAD^ &&
+	echo change >a.txt &&
+	git commit -a -m side &&
+	git tag side
 
-expecting success of 3301.55 'remove --stdin is also atomic': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
-	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
-	test_must_fail git notes remove --stdin <input &&
-	after=$(git rev-parse --verify refs/notes/commits) &&
-	test "$before" = "$after"
+[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
 
-Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
-ok 55 - remove --stdin is also atomic
+expecting success of 3012.2 'git ls-files --deduplicate to show unique unmerged path': 
+	test_must_fail git merge tip &&
+	git ls-files --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	b.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git merge --abort
 
-expecting success of 3301.56 'removing with --stdin --ignore-missing': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+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
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
-	git notes remove --ignore-missing --stdin <input &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+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
 
-Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
-ok 56 - removing with --stdin --ignore-missing
+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
 
-expecting success of 3301.57 'list notes with "git notes list"': 
-	commit_2=$(git rev-parse 2nd) &&
-	commit_3=$(git rev-parse 3rd) &&
-	note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
-	note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
-	sort -t" " -k2 >expect <<-EOF &&
-		$note_2 $commit_2
-		$note_3 $commit_3
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3011-common-prefixes-and-directory-traversal.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-	git notes list >actual &&
-	test_cmp expect actual
+	mkdir an_ignored_dir &&
+	mkdir an_untracked_dir &&
+	>an_ignored_dir/ignored &&
+	>an_ignored_dir/untracked &&
+	>an_untracked_dir/ignored &&
+	>an_untracked_dir/untracked
 
-ok 57 - list notes with "git notes list"
+[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.48.0~rc1+next.20250101/t/trash directory.t3011-common-prefixes-and-directory-traversal/untracked_repo/.git/
+ok 1 - setup
 
-expecting success of 3301.58 'list notes with "git notes"': 
-	git notes >actual &&
+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 58 - list notes with "git notes"
+ok 2 - git ls-files -o shows the right entries
 
-expecting success of 3301.59 '"git notes" without subcommand does not take arguments': 
-	test_expect_code 129 git notes HEAD^^ 2>err &&
-	grep "^error: unknown subcommand" err
+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
 
-error: unknown subcommand: `HEAD^^'
-ok 59 - "git notes" without subcommand does not take arguments
+ok 3 - git ls-files -o --exclude-standard shows the right entries
 
-expecting success of 3301.60 'list specific note with "git notes list <object>"': 
-	git rev-parse refs/notes/commits:$commit_3 >expect &&
-	git notes list HEAD^^ >actual &&
+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 60 - list specific note with "git notes list <object>"
+ok 4 - git ls-files -o untracked_dir recurses
 
-expecting success of 3301.61 'listing non-existing notes fails': 
-	test_must_fail git notes list HEAD >actual &&
-	test_must_be_empty actual
+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
 
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 61 - listing non-existing notes fails
+ok 5 - git ls-files -o untracked_dir/ recurses
 
-expecting success of 3301.62 'append: specify a separator with an empty arg': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
+expecting success of 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
 
-	notes-2
-	EOF
+ok 6 - git ls-files -o --directory untracked_dir does not recurse
 
-	git notes add -m "notes-1" &&
-	git notes append --separator="" -m "notes-2" &&
-	git notes show >actual &&
+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
 
-Removing note for object HEAD
-ok 62 - append: specify a separator with an empty arg
+ok 7 - git ls-files -o --directory untracked_dir/ does not recurse
 
-expecting success of 3301.63 'append: specify a separator without arg': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
+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
 
-	notes-2
-	EOF
+ok 8 - git ls-files -o untracked_repo does not recurse
 
-	git notes add -m "notes-1" &&
-	git notes append --separator -m "notes-2" &&
-	git notes show >actual &&
+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
 
-Removing note for object HEAD
-ok 63 - append: specify a separator without arg
+ok 9 - git ls-files -o untracked_repo/ does not recurse
 
-expecting success of 3301.64 'append: specify as --no-separator': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	notes-2
+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 notes add -m "notes-1" &&
-	git notes append --no-separator -m "notes-2" &&
-	git notes show >actual &&
+	git ls-files -o untracked_dir untracked_repo >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 64 - append: specify as --no-separator
+ok 10 - git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only
 
-expecting success of 3301.65 'append: specify separator with line break': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	-------
-	notes-2
+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 notes add -m "notes-1" &&
-	git notes append --separator="-------$LF" -m "notes-2" &&
-	git notes show >actual &&
+	git ls-files -o untracked_dir/ untracked_repo/ >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 65 - append: specify separator with line break
+ok 11 - git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only
 
-expecting success of 3301.66 'append: specify separator without line break': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	-------
-	notes-2
+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 notes add -m "notes-1" &&
-	git notes append --separator="-------" -m "notes-2" &&
-	git notes show >actual &&
+	git ls-files -o --directory untracked_dir untracked_repo >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 66 - append: specify separator without line break
+ok 12 - git ls-files -o --directory untracked_dir untracked_repo does not recurse
 
-expecting success of 3301.67 'append: specify separator with multiple messages': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	-------
-	notes-2
-	-------
-	notes-3
+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 notes add -m "notes-1" &&
-	git notes append --separator="-------" -m "notes-2" -m "notes-3" &&
-	git notes show >actual &&
+	git ls-files -o --directory untracked_dir/ untracked_repo/ >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 67 - append: specify separator with multiple messages
+ok 13 - git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse
 
-expecting success of 3301.68 'append note with combination of -m and -F and --separator': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect-combine_m_and_F <<-\EOF &&
-	m-notes-1
-	-------
-	f-notes-1
-	-------
-	m-notes-2
-	-------
-	f-notes-2
-	-------
-	m-notes-3
-	EOF
+expecting success of 3011.14 'git ls-files -o .git shows nothing': 
+	git ls-files -o .git >actual &&
+	test_must_be_empty actual
 
-	echo "f-notes-1" >note_a &&
-	echo "f-notes-2" >note_b &&
-	git notes append -m "m-notes-1" -F note_a -m "m-notes-2" -F note_b -m "m-notes-3" --separator="-------" &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
+ok 14 - git ls-files -o .git shows nothing
 
-Removing note for object HEAD
-ok 68 - append note with combination of -m and -F and --separator
+expecting success of 3011.15 'git ls-files -o .git/ shows nothing': 
+	git ls-files -o .git/ >actual &&
+	test_must_be_empty actual
 
-expecting success of 3301.69 'append to existing note with "git notes append"': 
-	cat >expect <<-EOF &&
-		Initial set of notes
+ok 15 - git ls-files -o .git/ shows nothing
 
-		More notes appended with git notes append
-	EOF
-	git notes add -m "Initial set of notes" &&
-	git notes append -m "More notes appended with git notes append" &&
-	git notes show >actual &&
-	test_cmp expect actual
+checking prerequisite: FUNNYNAMES
 
-ok 69 - append to existing note with "git notes append"
+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 3301.70 '"git notes list" does not expand to "git notes list HEAD"': 
-	commit_5=$(git rev-parse 5th) &&
-	note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
-	sort -t" " -k2 >expect_list <<-EOF &&
-		$note_2 $commit_2
-		$note_3 $commit_3
-		$note_5 $commit_5
+)
+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 notes list >actual &&
-	test_cmp expect_list actual
+	git ls-files -o "untracked_*" >actual &&
+	test_cmp expect actual
 
-ok 70 - "git notes list" does not expand to "git notes list HEAD"
+ok 16 - git ls-files -o untracked_* recurses appropriately
 
-expecting success of 3301.71 'appending empty string does not change existing note': 
-	git notes append -m "" &&
-	git notes show >actual &&
+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
 
-ok 71 - appending empty string does not change existing note
+--- expect	2026-03-14 13:28:09.954677808 +0000
++++ actual	2026-03-14 13:28:09.974677808 +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 3301.72 'git notes append == add when there is no existing note': 
-	git notes remove HEAD &&
-	test_must_fail git notes list HEAD &&
-	git notes append -m "Initial set of notes${LF}${LF}More notes appended with git notes append" &&
-	git notes show >actual &&
+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
 
-Removing note for object HEAD
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 72 - git notes append == add when there is no existing note
+ok 18 - git ls-files -o --directory untracked_* does not recurse
 
-expecting success of 3301.73 'appending empty string to non-existing note does not create note': 
-	git notes remove HEAD &&
-	test_must_fail git notes list HEAD &&
-	git notes append -m "" &&
-	test_must_fail git notes list HEAD
+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
 
-Removing note for object HEAD
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 73 - appending empty string to non-existing note does not create note
+ok 19 - git ls-files -o --directory untracked_*/ does not recurse
 
-expecting success of 3301.74 'create other note on a different notes ref (setup)': 
-	test_commit 6th &&
-	GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-not-other <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
+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
 
-		${indent}6th
-	EOF
-	cp expect-not-other expect-other &&
-	cat >>expect-other <<-EOF
+ok 20 - git ls-files -o consistent between one or two dirs
 
-		Notes (other):
-		${indent}other note
+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
 
-[master 2c12533] 6th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6th.t
-ok 74 - create other note on a different notes ref (setup)
-
-expecting success of 3301.75 'Do not show note on other ref by default': 
-	git log -1 >actual &&
-	test_cmp expect-not-other actual
-
-ok 75 - Do not show note on other ref by default
+ok 21 - git status --ignored shows same files under dir with or without pathspec
 
-expecting success of 3301.76 'Do show note when ref is given in GIT_NOTES_REF': 
-	GIT_NOTES_REF="refs/notes/other" git log -1 >actual &&
-	test_cmp expect-other actual
+# still have 1 known breakage(s)
+# passed all remaining 20 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3013-ls-files-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3013-ls-files-format/.git/
+expecting success of 3013.1 'usage: --format is incompatible with -s': 
+		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+	
+fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
 
-ok 76 - Do show note when ref is given in GIT_NOTES_REF
+usage: git ls-files [<options>] [<file>...]
 
-expecting success of 3301.77 'Do show note when ref is given in core.notesRef config': 
-	test_config core.notesRef "refs/notes/other" &&
-	git log -1 >actual &&
-	test_cmp expect-other actual
+    -z                    separate paths with the NUL character
+    -t                    identify the file status with tags
+    -v                    use lowercase letters for 'assume unchanged' files
+    -f                    use lowercase letters for 'fsmonitor clean' files
+    -c, --[no-]cached     show cached files in the output (default)
+    -d, --[no-]deleted    show deleted files in the output
+    -m, --[no-]modified   show modified files in the output
+    -o, --[no-]others     show other files in the output
+    -i, --[no-]ignored    show ignored files in the output
+    -s, --[no-]stage      show staged contents' object name in the output
+    -k, --[no-]killed     show files on the filesystem that need to be removed
+    --[no-]directory      show 'other' directories' names only
+    --[no-]eol            show line endings of files
+    --[no-]empty-directory
+                          don't show empty directories
+    -u, --[no-]unmerged   show unmerged files in the output
+    --[no-]resolve-undo   show resolve-undo information
+    -x, --exclude <pattern>
+                          skip files matching pattern
+    -X, --exclude-from <file>
+                          read exclude patterns from <file>
+    --[no-]exclude-per-directory <file>
+                          read additional per-directory exclude patterns in <file>
+    --exclude-standard    add the standard git exclusions
+    --full-name           make the output relative to the project top directory
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
+    --[no-]with-tree <tree-ish>
+                          pretend that paths removed since <tree-ish> are still present
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    --[no-]debug          show debugging data
+    --[no-]deduplicate    suppress duplicate entries
+    --[no-]sparse         show sparse directories in the presence of a sparse index
+    --format <format>     format to use for the output
 
-ok 77 - Do show note when ref is given in core.notesRef config
+ok 1 - usage: --format is incompatible with -s
 
-expecting success of 3301.78 'Do not show note when core.notesRef is overridden': 
-	test_config core.notesRef "refs/notes/other" &&
-	GIT_NOTES_REF="refs/notes/wrong" git log -1 >actual &&
-	test_cmp expect-not-other actual
+expecting success of 3013.2 'usage: --format is incompatible with -o': 
+		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+	
+fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
 
-ok 78 - Do not show note when core.notesRef is overridden
+usage: git ls-files [<options>] [<file>...]
 
-expecting success of 3301.79 'Show all notes when notes.displayRef=refs/notes/*': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect-both <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
+    -z                    separate paths with the NUL character
+    -t                    identify the file status with tags
+    -v                    use lowercase letters for 'assume unchanged' files
+    -f                    use lowercase letters for 'fsmonitor clean' files
+    -c, --[no-]cached     show cached files in the output (default)
+    -d, --[no-]deleted    show deleted files in the output
+    -m, --[no-]modified   show modified files in the output
+    -o, --[no-]others     show other files in the output
+    -i, --[no-]ignored    show ignored files in the output
+    -s, --[no-]stage      show staged contents' object name in the output
+    -k, --[no-]killed     show files on the filesystem that need to be removed
+    --[no-]directory      show 'other' directories' names only
+    --[no-]eol            show line endings of files
+    --[no-]empty-directory
+                          don't show empty directories
+    -u, --[no-]unmerged   show unmerged files in the output
+    --[no-]resolve-undo   show resolve-undo information
+    -x, --exclude <pattern>
+                          skip files matching pattern
+    -X, --exclude-from <file>
+                          read exclude patterns from <file>
+    --[no-]exclude-per-directory <file>
+                          read additional per-directory exclude patterns in <file>
+    --exclude-standard    add the standard git exclusions
+    --full-name           make the output relative to the project top directory
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
+    --[no-]with-tree <tree-ish>
+                          pretend that paths removed since <tree-ish> are still present
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    --[no-]debug          show debugging data
+    --[no-]deduplicate    suppress duplicate entries
+    --[no-]sparse         show sparse directories in the presence of a sparse index
+    --format <format>     format to use for the output
 
-		${indent}6th
+ok 2 - usage: --format is incompatible with -o
 
-		Notes:
-		${indent}order test
+expecting success of 3013.3 'usage: --format is incompatible with -k': 
+		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+	
+fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
 
-		Notes (other):
-		${indent}other note
+usage: git ls-files [<options>] [<file>...]
 
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+    -z                    separate paths with the NUL character
+    -t                    identify the file status with tags
+    -v                    use lowercase letters for 'assume unchanged' files
+    -f                    use lowercase letters for 'fsmonitor clean' files
+    -c, --[no-]cached     show cached files in the output (default)
+    -d, --[no-]deleted    show deleted files in the output
+    -m, --[no-]modified   show modified files in the output
+    -o, --[no-]others     show other files in the output
+    -i, --[no-]ignored    show ignored files in the output
+    -s, --[no-]stage      show staged contents' object name in the output
+    -k, --[no-]killed     show files on the filesystem that need to be removed
+    --[no-]directory      show 'other' directories' names only
+    --[no-]eol            show line endings of files
+    --[no-]empty-directory
+                          don't show empty directories
+    -u, --[no-]unmerged   show unmerged files in the output
+    --[no-]resolve-undo   show resolve-undo information
+    -x, --exclude <pattern>
+                          skip files matching pattern
+    -X, --exclude-from <file>
+                          read exclude patterns from <file>
+    --[no-]exclude-per-directory <file>
+                          read additional per-directory exclude patterns in <file>
+    --exclude-standard    add the standard git exclusions
+    --full-name           make the output relative to the project top directory
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
+    --[no-]with-tree <tree-ish>
+                          pretend that paths removed since <tree-ish> are still present
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    --[no-]debug          show debugging data
+    --[no-]deduplicate    suppress duplicate entries
+    --[no-]sparse         show sparse directories in the presence of a sparse index
+    --format <format>     format to use for the output
 
-		${indent}5th
+ok 3 - usage: --format is incompatible with -k
 
-		Notes:
-		${indent}replacement for deleted note
-	EOF
-	GIT_NOTES_REF=refs/notes/commits git notes add \
-		-m"replacement for deleted note" HEAD^ &&
-	GIT_NOTES_REF=refs/notes/commits git notes add -m"order test" &&
-	test_unconfig core.notesRef &&
-	test_config notes.displayRef "refs/notes/*" &&
-	git log -2 >actual &&
-	test_cmp expect-both actual
+expecting success of 3013.4 'usage: --format is incompatible with -t': 
+		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+	
+fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
 
-ok 79 - Show all notes when notes.displayRef=refs/notes/*
+usage: git ls-files [<options>] [<file>...]
 
-expecting success of 3301.80 'core.notesRef is implicitly in notes.displayRef': 
-	test_config core.notesRef refs/notes/commits &&
-	test_config notes.displayRef refs/notes/other &&
-	git log -2 >actual &&
-	test_cmp expect-both actual
+    -z                    separate paths with the NUL character
+    -t                    identify the file status with tags
+    -v                    use lowercase letters for 'assume unchanged' files
+    -f                    use lowercase letters for 'fsmonitor clean' files
+    -c, --[no-]cached     show cached files in the output (default)
+    -d, --[no-]deleted    show deleted files in the output
+    -m, --[no-]modified   show modified files in the output
+    -o, --[no-]others     show other files in the output
+    -i, --[no-]ignored    show ignored files in the output
+    -s, --[no-]stage      show staged contents' object name in the output
+    -k, --[no-]killed     show files on the filesystem that need to be removed
+    --[no-]directory      show 'other' directories' names only
+    --[no-]eol            show line endings of files
+    --[no-]empty-directory
+                          don't show empty directories
+    -u, --[no-]unmerged   show unmerged files in the output
+    --[no-]resolve-undo   show resolve-undo information
+    -x, --exclude <pattern>
+                          skip files matching pattern
+    -X, --exclude-from <file>
+                          read exclude patterns from <file>
+    --[no-]exclude-per-directory <file>
+                          read additional per-directory exclude patterns in <file>
+    --exclude-standard    add the standard git exclusions
+    --full-name           make the output relative to the project top directory
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
+    --[no-]with-tree <tree-ish>
+                          pretend that paths removed since <tree-ish> are still present
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    --[no-]debug          show debugging data
+    --[no-]deduplicate    suppress duplicate entries
+    --[no-]sparse         show sparse directories in the presence of a sparse index
+    --format <format>     format to use for the output
 
-ok 80 - core.notesRef is implicitly in notes.displayRef
+ok 4 - usage: --format is incompatible with -t
 
-expecting success of 3301.81 'notes.displayRef can be given more than once': 
-	test_unconfig core.notesRef &&
-	test_config notes.displayRef refs/notes/commits &&
-	git config --add notes.displayRef refs/notes/other &&
-	git log -2 >actual &&
-	test_cmp expect-both actual
+expecting success of 3013.5 'usage: --format is incompatible with --resolve-undo': 
+		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+	
+fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
 
-ok 81 - notes.displayRef can be given more than once
+usage: git ls-files [<options>] [<file>...]
 
-expecting success of 3301.82 'notes.displayRef respects order': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-both-reversed <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
+    -z                    separate paths with the NUL character
+    -t                    identify the file status with tags
+    -v                    use lowercase letters for 'assume unchanged' files
+    -f                    use lowercase letters for 'fsmonitor clean' files
+    -c, --[no-]cached     show cached files in the output (default)
+    -d, --[no-]deleted    show deleted files in the output
+    -m, --[no-]modified   show modified files in the output
+    -o, --[no-]others     show other files in the output
+    -i, --[no-]ignored    show ignored files in the output
+    -s, --[no-]stage      show staged contents' object name in the output
+    -k, --[no-]killed     show files on the filesystem that need to be removed
+    --[no-]directory      show 'other' directories' names only
+    --[no-]eol            show line endings of files
+    --[no-]empty-directory
+                          don't show empty directories
+    -u, --[no-]unmerged   show unmerged files in the output
+    --[no-]resolve-undo   show resolve-undo information
+    -x, --exclude <pattern>
+                          skip files matching pattern
+    -X, --exclude-from <file>
+                          read exclude patterns from <file>
+    --[no-]exclude-per-directory <file>
+                          read additional per-directory exclude patterns in <file>
+    --exclude-standard    add the standard git exclusions
+    --full-name           make the output relative to the project top directory
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
+    --[no-]with-tree <tree-ish>
+                          pretend that paths removed since <tree-ish> are still present
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    --[no-]debug          show debugging data
+    --[no-]deduplicate    suppress duplicate entries
+    --[no-]sparse         show sparse directories in the presence of a sparse index
+    --format <format>     format to use for the output
 
-		${indent}6th
+ok 5 - usage: --format is incompatible with --resolve-undo
 
-		Notes (other):
-		${indent}other note
+expecting success of 3013.6 'usage: --format is incompatible with --deduplicate': 
+		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+	
+fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
 
-		Notes:
-		${indent}order test
-	EOF
-	test_config core.notesRef refs/notes/other &&
-	test_config notes.displayRef refs/notes/commits &&
-	git log -1 >actual &&
-	test_cmp expect-both-reversed actual
+usage: git ls-files [<options>] [<file>...]
 
-ok 82 - notes.displayRef respects order
+    -z                    separate paths with the NUL character
+    -t                    identify the file status with tags
+    -v                    use lowercase letters for 'assume unchanged' files
+    -f                    use lowercase letters for 'fsmonitor clean' files
+    -c, --[no-]cached     show cached files in the output (default)
+    -d, --[no-]deleted    show deleted files in the output
+    -m, --[no-]modified   show modified files in the output
+    -o, --[no-]others     show other files in the output
+    -i, --[no-]ignored    show ignored files in the output
+    -s, --[no-]stage      show staged contents' object name in the output
+    -k, --[no-]killed     show files on the filesystem that need to be removed
+    --[no-]directory      show 'other' directories' names only
+    --[no-]eol            show line endings of files
+    --[no-]empty-directory
+                          don't show empty directories
+    -u, --[no-]unmerged   show unmerged files in the output
+    --[no-]resolve-undo   show resolve-undo information
+    -x, --exclude <pattern>
+                          skip files matching pattern
+    -X, --exclude-from <file>
+                          read exclude patterns from <file>
+    --[no-]exclude-per-directory <file>
+                          read additional per-directory exclude patterns in <file>
+    --exclude-standard    add the standard git exclusions
+    --full-name           make the output relative to the project top directory
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
+    --[no-]with-tree <tree-ish>
+                          pretend that paths removed since <tree-ish> are still present
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    --[no-]debug          show debugging data
+    --[no-]deduplicate    suppress duplicate entries
+    --[no-]sparse         show sparse directories in the presence of a sparse index
+    --format <format>     format to use for the output
 
-expecting success of 3301.83 'notes.displayRef with no value handled gracefully': 
-	test_must_fail git -c notes.displayRef log -0 --notes &&
-	test_must_fail git -c notes.displayRef diff-tree --notes HEAD
+ok 6 - usage: --format is incompatible with --deduplicate
 
-error: missing value for 'notes.displayref'
-fatal: unable to parse 'notes.displayref' from command-line config
-error: missing value for 'notes.displayref'
-fatal: unable to parse 'notes.displayref' from command-line config
-ok 83 - notes.displayRef with no value handled gracefully
+expecting success of 3013.7 'usage: --format is incompatible with --eol': 
+		test_expect_code 129 git ls-files --format="%(objectname)" $flag
+	
+fatal: --format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, --eol
 
-expecting success of 3301.84 'GIT_NOTES_DISPLAY_REF works': 
-	GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
-		git log -2 >actual &&
-	test_cmp expect-both actual
+usage: git ls-files [<options>] [<file>...]
 
-ok 84 - GIT_NOTES_DISPLAY_REF works
+    -z                    separate paths with the NUL character
+    -t                    identify the file status with tags
+    -v                    use lowercase letters for 'assume unchanged' files
+    -f                    use lowercase letters for 'fsmonitor clean' files
+    -c, --[no-]cached     show cached files in the output (default)
+    -d, --[no-]deleted    show deleted files in the output
+    -m, --[no-]modified   show modified files in the output
+    -o, --[no-]others     show other files in the output
+    -i, --[no-]ignored    show ignored files in the output
+    -s, --[no-]stage      show staged contents' object name in the output
+    -k, --[no-]killed     show files on the filesystem that need to be removed
+    --[no-]directory      show 'other' directories' names only
+    --[no-]eol            show line endings of files
+    --[no-]empty-directory
+                          don't show empty directories
+    -u, --[no-]unmerged   show unmerged files in the output
+    --[no-]resolve-undo   show resolve-undo information
+    -x, --exclude <pattern>
+                          skip files matching pattern
+    -X, --exclude-from <file>
+                          read exclude patterns from <file>
+    --[no-]exclude-per-directory <file>
+                          read additional per-directory exclude patterns in <file>
+    --exclude-standard    add the standard git exclusions
+    --full-name           make the output relative to the project top directory
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]error-unmatch  if any <file> is not in the index, treat this as an error
+    --[no-]with-tree <tree-ish>
+                          pretend that paths removed since <tree-ish> are still present
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    --[no-]debug          show debugging data
+    --[no-]deduplicate    suppress duplicate entries
+    --[no-]sparse         show sparse directories in the presence of a sparse index
+    --format <format>     format to use for the output
 
-expecting success of 3301.85 'GIT_NOTES_DISPLAY_REF overrides config': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect-none <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
+ok 7 - usage: --format is incompatible with --eol
 
-		${indent}6th
+expecting success of 3013.8 'setup': 
+	printf "LINEONE\nLINETWO\nLINETHREE\n" >o1.txt &&
+	printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >o2.txt &&
+	printf "LINEONE\r\nLINETWO\nLINETHREE\n" >o3.txt &&
+	git add o?.txt &&
+	oid=$(git hash-object o1.txt) &&
+	git update-index --add --cacheinfo 120000 $oid o4.txt &&
+	git update-index --add --cacheinfo 160000 $oid o5.txt &&
+	git update-index --add --cacheinfo 100755 $oid o6.txt &&
+	git commit -m base
 
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+[master (root-commit) 8422806] base
+ Author: A U Thor <author@example.com>
+ 6 files changed, 16 insertions(+)
+ create mode 100644 o1.txt
+ create mode 100644 o2.txt
+ create mode 100644 o3.txt
+ create mode 120000 o4.txt
+ create mode 160000 o5.txt
+ create mode 100755 o6.txt
+ok 8 - setup
 
-		${indent}5th
-	EOF
-	test_config notes.displayRef "refs/notes/*" &&
-	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log -2 >actual &&
-	test_cmp expect-none actual
+expecting success of 3013.9 'git ls-files --format objectmode v.s. -s': 
+	git ls-files -s >files &&
+	cut -d" " -f1 files >expect &&
+	git ls-files --format="%(objectmode)" >actual &&
+	test_cmp expect actual
 
-ok 85 - GIT_NOTES_DISPLAY_REF overrides config
+ok 9 - git ls-files --format objectmode v.s. -s
 
-expecting success of 3301.86 '--show-notes=* adds to GIT_NOTES_DISPLAY_REF': 
-	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log --show-notes=* -2 >actual &&
-	test_cmp expect-both actual
+expecting success of 3013.10 'git ls-files --format objectname v.s. -s': 
+	git ls-files -s >files &&
+	cut -d" " -f2 files >expect &&
+	git ls-files --format="%(objectname)" >actual &&
+	test_cmp expect actual
 
-ok 86 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF
+ok 10 - git ls-files --format objectname v.s. -s
 
-expecting success of 3301.87 '--no-standard-notes': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-commits <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
+expecting success of 3013.11 'git ls-files --format objecttype': 
+	git ls-files --format="%(objectname)" o1.txt o4.txt o6.txt >objectname &&
+	git cat-file --batch-check="%(objecttype)" >expect <objectname &&
+	git ls-files --format="%(objecttype)" o1.txt o4.txt o6.txt >actual &&
+	test_cmp expect actual
 
-		${indent}6th
+ok 11 - git ls-files --format objecttype
 
-		Notes:
-		${indent}order test
+expecting success of 3013.12 'git ls-files --format objectsize': 
+	cat>expect <<-\EOF &&
+26
+29
+27
+26
+-
+26
 	EOF
-	git log --no-standard-notes --show-notes=commits -1 >actual &&
-	test_cmp expect-commits actual
+	git ls-files --format="%(objectsize)" >actual &&
 
-ok 87 - --no-standard-notes
+	test_cmp expect actual
 
-expecting success of 3301.88 '--standard-notes': 
-	test_config notes.displayRef "refs/notes/*" &&
-	git log --no-standard-notes --show-notes=commits \
-		--standard-notes -2 >actual &&
-	test_cmp expect-both actual
+ok 12 - git ls-files --format objectsize
 
-ok 88 - --standard-notes
+expecting success of 3013.13 'git ls-files --format objectsize:padded': 
+	cat>expect <<-\EOF &&
+     26
+     29
+     27
+     26
+      -
+     26
+	EOF
+	git ls-files --format="%(objectsize:padded)" >actual &&
 
-expecting success of 3301.89 '--show-notes=ref accumulates': 
-	git log --show-notes=other --show-notes=commits \
-		 --no-standard-notes -1 >actual &&
-	test_cmp expect-both-reversed actual
+	test_cmp expect actual
 
-ok 89 - --show-notes=ref accumulates
+ok 13 - git ls-files --format objectsize:padded
 
-expecting success of 3301.90 'Allow notes on non-commits (trees, blobs, tags)': 
-	test_config core.notesRef refs/notes/other &&
-	echo "Note on a tree" >expect &&
-	git notes add -m "Note on a tree" HEAD: &&
-	git notes show HEAD: >actual &&
-	test_cmp expect actual &&
-	echo "Note on a blob" >expect &&
-	git ls-tree --name-only HEAD >files &&
-	filename=$(head -n1 files) &&
-	git notes add -m "Note on a blob" HEAD:$filename &&
-	git notes show HEAD:$filename >actual &&
-	test_cmp expect actual &&
-	echo "Note on a tag" >expect &&
-	git tag -a -m "This is an annotated tag" foobar HEAD^ &&
-	git notes add -m "Note on a tag" foobar &&
-	git notes show foobar >actual &&
+expecting success of 3013.14 'git ls-files --format v.s. --eol': 
+	git ls-files --eol >tmp &&
+	sed -e "s/	/ /g" -e "s/  */ /g" tmp >expect 2>err &&
+	test_must_be_empty err &&
+	git ls-files --format="i/%(eolinfo:index) w/%(eolinfo:worktree) attr/%(eolattr) %(path)" >actual 2>err &&
+	test_must_be_empty err &&
 	test_cmp expect actual
 
-ok 90 - Allow notes on non-commits (trees, blobs, tags)
+ok 14 - git ls-files --format v.s. --eol
 
-expecting success of 3301.91 'create note from other note with "git notes add -C"': 
-	test_commit 7th &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:19:13 2005 -0700
+expecting success of 3013.15 'git ls-files --format path v.s. -s': 
+	git ls-files -s >files &&
+	cut -f2 files >expect &&
+	git ls-files --format="%(path)" >actual &&
+	test_cmp expect actual
 
-		${indent}7th
+ok 15 - git ls-files --format path v.s. -s
 
-		Notes:
-		${indent}order test
+expecting success of 3013.16 'git ls-files --format with relative path': 
+	cat >expect <<-\EOF &&
+	../o1.txt
+	../o2.txt
+	../o3.txt
+	../o4.txt
+	../o5.txt
+	../o6.txt
 	EOF
-	note=$(git notes list HEAD^) &&
-	git notes add -C $note &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD^ >expect &&
-	git notes list HEAD >actual &&
+	mkdir sub &&
+	cd sub &&
+	git ls-files --format="%(path)" ":/" >../actual &&
+	cd .. &&
 	test_cmp expect actual
 
-[master fb01e0c] 7th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7th.t
-ok 91 - create note from other note with "git notes add -C"
+ok 16 - git ls-files --format with relative path
 
-expecting success of 3301.92 'create note from non-existing note with "git notes add -C" fails': 
-	test_commit 8th &&
-	test_must_fail git notes add -C deadbeef &&
-	test_must_fail git notes list HEAD
+expecting success of 3013.17 'git ls-files --format with -m': 
+	echo change >o1.txt &&
+	cat >expect <<-\EOF &&
+	o1.txt
+	o4.txt
+	o5.txt
+	o6.txt
+	EOF
+	git ls-files --format="%(path)" -m >actual &&
+	test_cmp expect actual
 
-[master 9a4c31c] 8th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8th.t
-fatal: failed to resolve 'deadbeef' as a valid ref.
-error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
-ok 92 - create note from non-existing note with "git notes add -C" fails
+ok 17 - git ls-files --format with -m
 
-expecting success of 3301.93 'create note from non-blob with "git notes add -C" fails': 
-	commit=$(git rev-parse --verify HEAD) &&
-	tree=$(git rev-parse --verify HEAD:) &&
-	test_must_fail git notes add -C $commit &&
-	test_must_fail git notes add -C $tree &&
-	test_must_fail git notes list HEAD
+expecting success of 3013.18 'git ls-files --format with -d': 
+	echo o7 >o7.txt &&
+	git add o7.txt &&
+	rm o7.txt &&
+	cat >expect <<-\EOF &&
+	o4.txt
+	o5.txt
+	o6.txt
+	o7.txt
+	EOF
+	git ls-files --format="%(path)" -d >actual &&
+	test_cmp expect actual
 
-fatal: cannot read note data from non-blob object '9a4c31c7f722b5d517e92c64e932dd751e1413bf'.
-fatal: cannot read note data from non-blob object '37f6454412e4ed89ae47782f956ed0fb573892f6'.
-error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
-ok 93 - create note from non-blob with "git notes add -C" fails
+ok 18 - git ls-files --format with -d
 
-expecting success of 3301.94 'create note from blob with "git notes add -C" reuses blob id': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:20:13 2005 -0700
+expecting success of 3013.19 'git ls-files --format v.s -s': 
+	git ls-files --stage >expect &&
+	git ls-files --format="%(objectmode) %(objectname) %(stage)%x09%(path)" >actual &&
+	test_cmp expect actual
 
-		${indent}8th
+ok 19 - git ls-files --format v.s -s
 
-		Notes:
-		${indent}This is a blob object
-	EOF
-	echo "This is a blob object" | git hash-object -w --stdin >blob &&
-	git notes add -C $(cat blob) &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD >actual &&
-	test_cmp blob actual
+expecting success of 3013.20 'git ls-files --format with --debug': 
+	git ls-files --debug >expect &&
+	git ls-files --format="%(path)" --debug >actual &&
+	test_cmp expect actual
 
-ok 94 - create note from blob with "git notes add -C" reuses blob id
+ok 20 - git ls-files --format with --debug
 
-expecting success of 3301.95 'create note from blob with "-C", also specify "-m", "-F" and "--separator"': 
-	# 8th will be reuseed in following tests, so rollback when the test is done
-	test_when_finished "git notes remove && git notes add -C $(cat blob)" &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:20:13 2005 -0700
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3040-subprojects-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3040-subprojects-basic/.git/
+expecting success of 3040.1 'setup: create superproject': 
+	: >Makefile &&
+	git add Makefile &&
+	git commit -m "Superproject created"
 
-		${indent}8th
+[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
 
-		Notes:
-		${indent}This is a blob object
-		${indent}-------
-		${indent}This is created by -m
-		${indent}-------
-		${indent}This is created by -F
+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
 
-	git notes remove &&
-	echo "This is a blob object" | git hash-object -w --stdin >blob &&
-	echo "This is created by -F" >note_a &&
-	git notes add -C $(cat blob) -m "This is created by -m" -F note_a --separator="-------" &&
-	git log -1 >actual &&
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3040-subprojects-basic/sub1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 set advice.addEmbeddedRepo false"
+ok 2 - setup: create subprojects
 
-Removing note for object HEAD
-Removing note for object HEAD
-ok 95 - create note from blob with "-C", also specify "-m", "-F" and "--separator"
+expecting success of 3040.3 'check if fsck ignores the subprojects': 
+	git fsck --full
 
-expecting success of 3301.96 'create note from other note with "git notes add -c"': 
-	test_commit 9th &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:21:13 2005 -0700
+ok 3 - check if fsck ignores the subprojects
 
-		${indent}9th
+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
 
-		Notes:
-		${indent}yet another note
-	EOF
-	note=$(git notes list HEAD^^) &&
-	MSG="yet another note" git notes add -c $note &&
-	git log -1 >actual &&
-	test_cmp expect actual
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 0000000000000000000000000000000000000000 M	sub1
+ok 4 - check if commit in a subproject detected
 
-[master 2e0db4b] 9th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9th.t
-yet another note
-ok 96 - create note from other note with "git notes add -c"
+expecting success of 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
 
-expecting success of 3301.97 'create note from non-existing note with "git notes add -c" fails': 
-	test_commit 10th &&
-	test_must_fail env MSG="yet another note" git notes add -c deadbeef &&
-	test_must_fail git notes list HEAD
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
+ok 5 - check if a changed subproject HEAD can be committed
 
-[master 7c3b87a] 10th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10th.t
-fatal: failed to resolve 'deadbeef' as a valid ref.
-error: no note found for object 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406.
-ok 97 - create note from non-existing note with "git notes add -c" fails
+expecting success of 3040.6 'check if diff-index works for subproject elements': 
+	test_expect_code 1 git diff-index --exit-code --cached save -- sub1
 
-expecting success of 3301.98 'append to note from other note with "git notes append -C"': 
-	commit=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:21:13 2005 -0700
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
+ok 6 - check if diff-index works for subproject elements
 
-		${indent}9th
+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
 
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
-	EOF
-	note=$(git notes list HEAD^) &&
-	git notes append -C $note HEAD^ &&
-	git log -1 HEAD^ >actual &&
-	test_cmp expect actual
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
+ok 7 - check if diff-tree works for subproject elements
 
-ok 98 - append to note from other note with "git notes append -C"
+expecting success of 3040.8 'check if git diff works for subproject elements': 
+	test_expect_code 1 git diff --exit-code HEAD^ HEAD
 
-expecting success of 3301.99 'create note from other note with "git notes append -c"': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:22:13 2005 -0700
+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
 
-		${indent}10th
+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
 
-		Notes:
-		${indent}other note
-	EOF
-	note=$(git notes list HEAD^) &&
-	MSG="other note" git notes append -c $note &&
-	git log -1 >actual &&
-	test_cmp expect actual
+Cloning into 'cloned'...
+done.
+ok 9 - check if clone works
 
-other note
-ok 99 - create note from other note with "git notes append -c"
+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
 
-expecting success of 3301.100 'append to note from other note with "git notes append -c"': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:22:13 2005 -0700
+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 set advice.addEmbeddedRepo false"
+R100	sub2	sub3
+ok 10 - removing and adding subproject
 
-		${indent}10th
+expecting success of 3040.11 'checkout in superproject': 
+	git checkout save &&
+	git diff-index --exit-code --raw --cached save -- sub1
 
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	note=$(git notes list HEAD) &&
-	MSG="yet another note" git notes append -c $note &&
-	git log -1 >actual &&
-	test_cmp expect actual
+warning: unable to rmdir 'sub3': Directory not empty
+Switched to branch 'save'
+M	sub1
+ok 11 - checkout in superproject
 
-yet another note
-ok 100 - append to note from other note with "git notes append -c"
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2501-cwd-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/
+expecting success of 2501.1 'setup': 
+	test_commit init &&
 
-expecting success of 3301.101 'copy note with "git notes copy"': 
-	commit=$(git rev-parse 4th) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:16:13 2005 -0700
+	git branch fd_conflict &&
 
-		${indent}4th
+	mkdir -p foo/bar &&
+	test_commit foo/bar/baz &&
 
-		Notes:
-		${indent}This is a blob object
-	EOF
-	git notes copy 8th 4th &&
-	git log 3rd..4th >actual &&
-	test_cmp expect actual &&
-	git notes list 4th >expect &&
-	git notes list 8th >actual &&
-	test_cmp expect actual
+	git revert HEAD &&
+	git tag reverted &&
 
-ok 101 - copy note with "git notes copy"
+	git checkout fd_conflict &&
+	mkdir dirORfile &&
+	test_commit dirORfile/foo &&
 
-expecting success of 3301.102 'copy note with "git notes copy" with default': 
-	test_commit 11th &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
+	git rm -r dirORfile &&
+	echo not-a-directory >dirORfile &&
+	git add dirORfile &&
+	git commit -m dirORfile &&
 
-		${indent}11th
+	git switch -c df_conflict HEAD~1 &&
+	test_commit random_file &&
 
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	git notes copy HEAD^ &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD^ >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
+	git switch -c undo_fd_conflict fd_conflict &&
+	git revert HEAD
 
-[master a446fff] 11th
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 11th.t
-ok 102 - copy note with "git notes copy" with default
-
-expecting success of 3301.103 'prevent overwrite with "git notes copy"': 
-	test_must_fail git notes copy HEAD~2 HEAD &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
+ create mode 100644 init.t
+[master f4c5aab] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+[master 968d1fe] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'fd_conflict'
+[fd_conflict d7f9e78] dirORfile/foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dirORfile/foo.t
+rm 'dirORfile/foo.t'
+[fd_conflict 9658629] dirORfile
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 dirORfile
+ delete mode 100644 dirORfile/foo.t
+Switched to a new branch 'df_conflict'
+[df_conflict d90d7a3] random_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 random_file.t
+Switched to a new branch 'undo_fd_conflict'
+[undo_fd_conflict 46c1835] Revert "dirORfile"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 dirORfile
+ create mode 100644 dirORfile/foo.t
+ok 1 - setup
 
-		${indent}11th
+expecting success of 2501.2 'checkout does not clean cwd incidentally': 
+	test_incidental_dir_removal git checkout init
 
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD^ >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
+Note: switching to 'foo/bar/baz^{commit}'.
 
-error: Cannot copy notes. Found existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5. Use '-f' to overwrite existing notes
-ok 103 - prevent overwrite with "git notes copy"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 3301.104 'allow overwrite with "git notes copy -f"': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		${indent}11th
+  git switch -c <new-branch-name>
 
-		Notes:
-		${indent}This is a blob object
-	EOF
-	git notes copy -f HEAD~3 HEAD &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~3 >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
+Or undo this operation with:
 
-Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
-ok 104 - allow overwrite with "git notes copy -f"
+  git switch -
 
-expecting success of 3301.105 'allow overwrite with "git notes copy -f" with default': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
+Turn off this advice by setting config variable advice.detachedHead to false
 
-		${indent}11th
+HEAD is now at f4c5aab foo/bar/baz
+Previous HEAD position was f4c5aab foo/bar/baz
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 2519212 init
+ok 2 - checkout does not clean cwd incidentally
 
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
-	EOF
-	git notes copy -f HEAD~2 &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~2 >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
+expecting success of 2501.3 'checkout fails if cwd needs to be removed': 
+	test_required_dir_removal git checkout fd_conflict
 
-Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
-ok 105 - allow overwrite with "git notes copy -f" with default
+Previous HEAD position was 2519212 init
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 3 - checkout fails if cwd needs to be removed
 
-expecting success of 3301.106 'cannot copy note from object without notes': 
-	test_commit 12th &&
-	test_commit 13th &&
-	test_must_fail git notes copy HEAD^ HEAD
+expecting success of 2501.4 'reset --hard does not clean cwd incidentally': 
+	test_incidental_dir_removal git reset --hard init
 
-[master 65e263d] 12th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12th.t
-[master e871aa6] 13th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13th.t
-error: missing notes on source object 65e263ded02ae4e8839bc151095113737579dc12. Cannot copy.
-ok 106 - cannot copy note from object without notes
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 2519212 init
+ok 4 - reset --hard does not clean cwd incidentally
 
-expecting success of 3301.107 'git notes copy --stdin': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:25:13 2005 -0700
+expecting success of 2501.5 'reset --hard fails if cwd needs to be removed': 
+	test_required_dir_removal git reset --hard fd_conflict
 
-		${indent}13th
+Previous HEAD position was 2519212 init
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove 'dirORfile' since it is the current working directory.
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 5 - reset --hard fails if cwd needs to be removed
 
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
+expecting success of 2501.6 'merge does not clean cwd incidentally': 
+	test_incidental_dir_removal git merge reverted
 
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:24:13 2005 -0700
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+Updating f4c5aab..968d1fe
+Fast-forward
+ foo/bar/baz.t | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 968d1fe Revert "foo/bar/baz"
+ok 6 - merge does not clean cwd incidentally
 
-		${indent}12th
+expecting success of 2501.7 'merge fails if cwd needs to be removed; recursive friendly': 
+	git checkout foo/bar/baz &&
+	test_when_finished "git clean -fdx" &&
 
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD^) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD~2) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --stdin <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~2 >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~3 >expect &&
-	git notes list HEAD^ >actual &&
-	test_cmp expect actual
+	mkdir dirORfile &&
+	(
+		cd dirORfile &&
 
-ok 107 - git notes copy --stdin
+		test_must_fail git merge fd_conflict 2>../error
+	) &&
 
-expecting success of 3301.108 'git notes copy --for-rewrite (unconfigured)': 
-	test_commit 14th &&
-	test_commit 15th &&
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
+	test_path_is_dir dirORfile &&
+	grep "Refusing to remove the current working directory" error
 
-		${indent}15th
+Previous HEAD position was 968d1fe Revert "foo/bar/baz"
+HEAD is now at f4c5aab foo/bar/baz
+error: Refusing to remove the current working directory:
+Removing dirORfile/
+Removing error
+ok 7 - merge fails if cwd needs to be removed; recursive friendly
 
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:26:13 2005 -0700
+expecting success of 2501.8 'merge fails if cwd needs to be removed': 
+	test_required_dir_removal git merge fd_conflict
 
-		${indent}14th
-	EOF
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD^) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD~2) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual
+Previous HEAD position was f4c5aab foo/bar/baz
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+ok 8 - merge fails if cwd needs to be removed
 
-[master 07c85d7] 14th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14th.t
-[master 4acf42e] 15th
+expecting success of 2501.9 'cherry-pick does not clean cwd incidentally': 
+	test_incidental_dir_removal git cherry-pick reverted
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+[detached HEAD d0d1a1f] Revert "foo/bar/baz"
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15th.t
-ok 108 - git notes copy --for-rewrite (unconfigured)
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at d0d1a1f Revert "foo/bar/baz"
+ok 9 - cherry-pick does not clean cwd incidentally
 
-expecting success of 3301.109 'git notes copy --for-rewrite (enabled)': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
+expecting success of 2501.10 'cherry-pick fails if cwd needs to be removed': 
+	test_required_dir_removal git cherry-pick fd_conflict
 
-		${indent}15th
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
+  d0d1a1f Revert "foo/bar/baz"
 
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:26:13 2005 -0700
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-		${indent}14th
+ git branch <new-branch-name> d0d1a1f
 
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	test_config notes.rewriteMode overwrite &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD^) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD~2) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 10 - cherry-pick fails if cwd needs to be removed
 
-ok 109 - git notes copy --for-rewrite (enabled)
+expecting success of 2501.11 'rebase does not clean cwd incidentally': 
+	test_incidental_dir_removal git rebase reverted
 
-expecting success of 3301.110 'git notes copy --for-rewrite (disabled)': 
-	test_config notes.rewrite.bar false &&
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=bar <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+Successfully rebased and updated detached HEAD.
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 968d1fe Revert "foo/bar/baz"
+ok 11 - rebase does not clean cwd incidentally
 
-ok 110 - git notes copy --for-rewrite (disabled)
+expecting success of 2501.12 'rebase fails if cwd needs to be removed': 
+	test_required_dir_removal git rebase fd_conflict
 
-expecting success of 3301.111 'git notes copy --for-rewrite (overwrite)': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
+Previous HEAD position was 968d1fe Revert "foo/bar/baz"
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 12 - rebase fails if cwd needs to be removed
 
-		${indent}15th
+expecting success of 2501.13 'revert does not clean cwd incidentally': 
+	test_incidental_dir_removal git revert HEAD
 
-		Notes:
-		${indent}a fresh note
-	EOF
-	git notes add -f -m"a fresh note" HEAD^ &&
-	test_config notes.rewriteMode overwrite &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+[detached HEAD f0f8756] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at f0f8756 Revert "foo/bar/baz"
+ok 13 - revert does not clean cwd incidentally
 
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-ok 111 - git notes copy --for-rewrite (overwrite)
+expecting success of 2501.14 'revert fails if cwd needs to be removed': 
+	test_required_dir_removal git revert undo_fd_conflict
 
-expecting success of 3301.112 'git notes copy --for-rewrite (ignore)': 
-	test_config notes.rewriteMode ignore &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-ok 112 - git notes copy --for-rewrite (ignore)
+  f0f8756 Revert "foo/bar/baz"
 
-expecting success of 3301.113 'git notes copy --for-rewrite (append)': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-		${indent}15th
+ git branch <new-branch-name> f0f8756
 
-		Notes:
-		${indent}a fresh note
-		${indent}
-		${indent}another fresh note
-	EOF
-	git notes add -f -m"another fresh note" HEAD^ &&
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 14 - revert fails if cwd needs to be removed
 
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-ok 113 - git notes copy --for-rewrite (append)
+expecting success of 2501.15 'rm does not clean cwd incidentally': 
+	test_incidental_dir_removal git rm bar/baz.t
 
-expecting success of 3301.114 'git notes copy --for-rewrite (append two to one)': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+rm 'foo/bar/baz.t'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+D  foo/bar/baz.t
+HEAD is now at f4c5aab foo/bar/baz
+ok 15 - rm does not clean cwd incidentally
 
-		${indent}15th
+expecting success of 2501.16 'apply does not remove cwd incidentally': 
+	git diff HEAD HEAD~1 >patch &&
+	test_incidental_dir_removal git apply ../patch
 
-		Notes:
-		${indent}a fresh note
-		${indent}
-		${indent}another fresh note
-		${indent}
-		${indent}append 1
-		${indent}
-		${indent}append 2
-	EOF
-	git notes add -f -m"append 1" HEAD^ &&
-	git notes add -f -m"append 2" HEAD^^ &&
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD^^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
+HEAD is now at f4c5aab foo/bar/baz
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/foo
+ D foo/bar/baz.t
+?? patch
+HEAD is now at f4c5aab foo/bar/baz
+ok 16 - apply does not remove cwd incidentally
 
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
-ok 114 - git notes copy --for-rewrite (append two to one)
+expecting success of 2501.17 'clean does not remove cwd incidentally': 
+	test_incidental_untracked_dir_removal \
+		git -C .. clean -fd -e warnings . >warnings &&
+	grep "Refusing to remove current working directory" warnings
 
-expecting success of 3301.115 'git notes copy --for-rewrite (append empty)': 
-	git notes remove HEAD^ &&
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
+HEAD is now at f4c5aab foo/bar/baz
+Refusing to remove current working directory
+HEAD is now at f4c5aab foo/bar/baz
+ok 17 - clean does not remove cwd incidentally
 
-Removing note for object HEAD^
-ok 115 - git notes copy --for-rewrite (append empty)
+expecting success of 2501.18 'stash does not remove cwd incidentally': 
+	test_incidental_untracked_dir_removal \
+		git stash --include-untracked
 
-expecting success of 3301.116 'GIT_NOTES_REWRITE_MODE works': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
+HEAD is now at f4c5aab foo/bar/baz
+Saved working directory and index state WIP on (no branch): f4c5aab foo/bar/baz
+Refusing to remove current working directory
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/untracked
+HEAD is now at f4c5aab foo/bar/baz
+ok 18 - stash does not remove cwd incidentally
 
-		${indent}15th
+expecting success of 2501.19 '`rm -rf dir` only removes a subset of dir': 
+	test_when_finished "rm -rf a/" &&
 
-		Notes:
-		${indent}replacement note 1
-	EOF
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	git notes add -f -m"replacement note 1" HEAD^ &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
+	mkdir -p a/b/c &&
+	>a/b/c/untracked &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
 
-ok 116 - GIT_NOTES_REWRITE_MODE works
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
 
-expecting success of 3301.117 'GIT_NOTES_REWRITE_REF works': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
+	test_path_is_dir a/b &&
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_file a/b/c/untracked
 
-		${indent}15th
+rm 'a/b/c/tracked'
+ok 19 - `rm -rf dir` only removes a subset of dir
 
-		Notes:
-		${indent}replacement note 2
-	EOF
-	git notes add -f -m"replacement note 2" HEAD^ &&
-	test_config notes.rewriteMode overwrite &&
-	test_unconfig notes.rewriteRef &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
-		git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
+expecting success of 2501.20 '`rm -rf dir` even with only tracked files will remove something else': 
+	test_when_finished "rm -rf a/" &&
 
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-ok 117 - GIT_NOTES_REWRITE_REF works
+	mkdir -p a/b/c &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
 
-expecting success of 3301.118 'GIT_NOTES_REWRITE_REF overrides config': 
-	git notes add -f -m"replacement note 3" HEAD^ &&
-	test_config notes.rewriteMode overwrite &&
-	test_config notes.rewriteRef refs/notes/other &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	GIT_NOTES_REWRITE_REF=refs/notes/commits \
-		git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	grep "replacement note 3" actual
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
 
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-    replacement note 3
-ok 118 - GIT_NOTES_REWRITE_REF overrides config
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_missing a/b/c &&
+	test_path_is_dir a/b
 
-expecting success of 3301.119 'git notes copy diagnoses too many or too few arguments': 
-	test_must_fail git notes copy 2>error &&
-	test_grep "too few arguments" error &&
-	test_must_fail git notes copy one two three 2>error &&
-	test_grep "too many arguments" error
+rm 'a/b/c/tracked'
+ok 20 - `rm -rf dir` even with only tracked files will remove something else
 
-error: too few arguments
-error: too many arguments
-ok 119 - git notes copy diagnoses too many or too few arguments
+expecting success of 2501.21 'git version continues working from a deleted dir': 
+	mkdir tmp &&
+	(
+		cd tmp &&
+		rm -rf ../tmp &&
+		git version
+	)
 
-expecting success of 3301.120 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main': 
-	test_unconfig core.notesRef &&
-	sane_unset GIT_NOTES_REF &&
-	echo refs/notes/refs/heads/main >expect &&
-	git notes --ref=refs/heads/main get-ref >actual &&
-	test_cmp expect actual
+shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory
+git version 2.48.0.rc1.219.gb6b6757d772
+ok 21 - git version continues working from a deleted dir
 
-ok 120 - git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main
+expecting success of 2501.22 'rm -r with -C leaves submodule if cwd inside': 
+	test_submodule_removal dir git -C .. rm -r my_submodule/
 
-expecting success of 3301.121 'git notes get-ref (no overrides)': 
-	test_unconfig core.notesRef &&
-	sane_unset GIT_NOTES_REF &&
-	echo refs/notes/commits >expect &&
-	git notes get-ref >actual &&
-	test_cmp expect actual
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git/
+[master (root-commit) f132c27] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Adding existing repo at 'my_submodule' to the index
+[detached HEAD 629a5d0] Add the submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my_submodule
+Migrating git directory of 'my_submodule' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+fatal: could not remove 'my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 22 - rm -r with -C leaves submodule if cwd inside
 
-ok 121 - git notes get-ref (no overrides)
+expecting success of 2501.23 'rm -r leaves submodule if cwd inside': 
+	test_submodule_removal dir \
+		git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
 
-expecting success of 3301.122 'git notes get-ref (core.notesRef)': 
-	test_config core.notesRef refs/notes/foo &&
-	echo refs/notes/foo >expect &&
-	git notes get-ref >actual &&
-	test_cmp expect actual
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git/
+[master (root-commit) f132c27] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Adding existing repo at 'my_submodule' to the index
+[detached HEAD 629a5d0] Add the submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my_submodule
+Migrating git directory of 'my_submodule' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+fatal: could not remove 'my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 23 - rm -r leaves submodule if cwd inside
 
-ok 122 - git notes get-ref (core.notesRef)
+expecting success of 2501.24 'rm -rf removes submodule even if cwd inside': 
+	test_submodule_removal missing \
+		git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
 
-expecting success of 3301.123 'git notes get-ref (GIT_NOTES_REF)': 
-	echo refs/notes/bar >expect &&
-	GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
-	test_cmp expect actual
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git/
+[master (root-commit) f132c27] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Adding existing repo at 'my_submodule' to the index
+[detached HEAD 629a5d0] Add the submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my_submodule
+Migrating git directory of 'my_submodule' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 24 - rm -rf removes submodule even if cwd inside
 
-ok 123 - git notes get-ref (GIT_NOTES_REF)
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3050-subprojects-fetch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3050-subprojects-fetch/.git/
+expecting success of 3050.1 'setup': 
+	test_tick &&
+	mkdir -p sub && (
+		cd sub &&
+		git init &&
+		>subfile &&
+		git add subfile &&
+		git commit -m "subproject commit #1"
+	) &&
+	>mainfile &&
+	git add sub mainfile &&
+	test_tick &&
+	git commit -m "superproject commit #1"
 
-expecting success of 3301.124 'git notes get-ref (--ref)': 
-	echo refs/notes/baz >expect &&
-	GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3050-subprojects-fetch/sub/.git/
+[master (root-commit) 4c0c877] subproject commit #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 subfile
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) 1226c2e] superproject commit #1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 mainfile
+ create mode 160000 sub
+ok 1 - setup
 
-ok 124 - git notes get-ref (--ref)
+expecting success of 3050.2 'clone': 
+	git clone "file://$(pwd)/.git" cloned &&
+	(git rev-parse HEAD && git ls-files -s) >expected &&
+	(
+		cd cloned &&
+		(git rev-parse HEAD && git ls-files -s) >../actual
+	) &&
+	test_cmp expected actual
 
-expecting success of 3301.125 'setup testing of empty notes': 
-	test_unconfig core.notesRef &&
-	test_commit 16th &&
-	empty_blob=$(git hash-object -w /dev/null) &&
-	echo "$empty_blob" >expect_empty
+Cloning into 'cloned'...
+ok 2 - clone
 
-[master 21d0abc] 16th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 16th.t
-ok 125 - setup testing of empty notes
+expecting success of 3050.3 'advance': 
+	echo more >mainfile &&
+	git update-index --force-remove sub &&
+	mv sub/.git sub/.git-disabled &&
+	git add sub/subfile mainfile &&
+	mv sub/.git-disabled sub/.git &&
+	test_tick &&
+	git commit -m "superproject commit #2"
 
-expecting success of 3301.126 ''git notes add' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add &&
-		test_must_fail git notes list HEAD
-	
-Object HEAD has no note
+[master 1548ecd] superproject commit #2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 sub
+ create mode 100644 sub/subfile
+ok 3 - advance
 
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 126 - 'git notes add' removes empty note
+expecting success of 3050.4 'fetch': 
+	(git rev-parse HEAD && git ls-files -s) >expected &&
+	(
+		cd cloned &&
+		git pull &&
+		(git rev-parse HEAD && git ls-files -s) >../actual
+	) &&
+	test_cmp expected actual
 
-expecting success of 3301.127 ''git notes add --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3050-subprojects-fetch/
+   1226c2e..1548ecd  master     -> origin/master
+Updating 1226c2e..1548ecd
+Fast-forward
+ mainfile    | 1 +
+ sub         | 1 -
+ sub/subfile | 0
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 sub
+ create mode 100644 sub/subfile
+ok 4 - fetch
 
-ok 127 - 'git notes add --allow-empty' stores empty note
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3060-ls-files-with-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3060-ls-files-with-tree/.git/
+expecting success of 3060.1 'setup': 
 
-expecting success of 3301.128 ''git notes add -F /dev/null' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -F /dev/null &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 128 - 'git notes add -F /dev/null' removes empty note
+	# The bug we are exercising requires a fair number of entries
+	# in a sub-directory so that add_index_entry will trigger a
+	# realloc.
 
-expecting success of 3301.129 ''git notes add -F /dev/null --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -F /dev/null --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 129 - 'git notes add -F /dev/null --allow-empty' stores empty note
+	echo file >expected &&
+	mkdir sub &&
+	for n in 0 1 2 3 4 5
+	do
+		for m in 0 1 2 3 4 5 6 7 8 9
+		do
+			num=00$n$m &&
+			>sub/file-$num &&
+			echo file-$num >>expected ||
+			return 1
+		done
+	done &&
+	git add . &&
+	git commit -m "add a bunch of files" &&
 
-expecting success of 3301.130 ''git notes add -m ""' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -m "" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 130 - 'git notes add -m ""' removes empty note
+	# We remove them all so that we will have something to add
+	# back with --with-tree and so that we will definitely be
+	# under the realloc size to trigger the bug.
+	rm -rf sub &&
+	git commit -a -m "remove them all" &&
 
-expecting success of 3301.131 ''git notes add -m "" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -m "" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 131 - 'git notes add -m "" --allow-empty' stores empty note
+	# The bug also requires some entry before our directory so that
+	# prune_index will modify the_repository->index.cache
 
-expecting success of 3301.132 ''git notes add -c "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -c "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
+	mkdir a_directory_that_sorts_before_sub &&
+	>a_directory_that_sorts_before_sub/file &&
+	mkdir sub &&
+	>sub/file &&
+	git add .
 
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 132 - 'git notes add -c "$empty_blob"' removes empty note
+[master (root-commit) 853a03d] add a bunch of files
+ Author: A U Thor <author@example.com>
+ 61 files changed, 61 insertions(+)
+ create mode 100644 expected
+ create mode 100644 sub/file-0000
+ create mode 100644 sub/file-0001
+ create mode 100644 sub/file-0002
+ create mode 100644 sub/file-0003
+ create mode 100644 sub/file-0004
+ create mode 100644 sub/file-0005
+ create mode 100644 sub/file-0006
+ create mode 100644 sub/file-0007
+ create mode 100644 sub/file-0008
+ create mode 100644 sub/file-0009
+ create mode 100644 sub/file-0010
+ create mode 100644 sub/file-0011
+ create mode 100644 sub/file-0012
+ create mode 100644 sub/file-0013
+ create mode 100644 sub/file-0014
+ create mode 100644 sub/file-0015
+ create mode 100644 sub/file-0016
+ create mode 100644 sub/file-0017
+ create mode 100644 sub/file-0018
+ create mode 100644 sub/file-0019
+ create mode 100644 sub/file-0020
+ create mode 100644 sub/file-0021
+ create mode 100644 sub/file-0022
+ create mode 100644 sub/file-0023
+ create mode 100644 sub/file-0024
+ create mode 100644 sub/file-0025
+ create mode 100644 sub/file-0026
+ create mode 100644 sub/file-0027
+ create mode 100644 sub/file-0028
+ create mode 100644 sub/file-0029
+ create mode 100644 sub/file-0030
+ create mode 100644 sub/file-0031
+ create mode 100644 sub/file-0032
+ create mode 100644 sub/file-0033
+ create mode 100644 sub/file-0034
+ create mode 100644 sub/file-0035
+ create mode 100644 sub/file-0036
+ create mode 100644 sub/file-0037
+ create mode 100644 sub/file-0038
+ create mode 100644 sub/file-0039
+ create mode 100644 sub/file-0040
+ create mode 100644 sub/file-0041
+ create mode 100644 sub/file-0042
+ create mode 100644 sub/file-0043
+ create mode 100644 sub/file-0044
+ create mode 100644 sub/file-0045
+ create mode 100644 sub/file-0046
+ create mode 100644 sub/file-0047
+ create mode 100644 sub/file-0048
+ create mode 100644 sub/file-0049
+ create mode 100644 sub/file-0050
+ create mode 100644 sub/file-0051
+ create mode 100644 sub/file-0052
+ create mode 100644 sub/file-0053
+ create mode 100644 sub/file-0054
+ create mode 100644 sub/file-0055
+ create mode 100644 sub/file-0056
+ create mode 100644 sub/file-0057
+ create mode 100644 sub/file-0058
+ create mode 100644 sub/file-0059
+[master 80af29e] remove them all
+ Author: A U Thor <author@example.com>
+ 60 files changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 sub/file-0000
+ delete mode 100644 sub/file-0001
+ delete mode 100644 sub/file-0002
+ delete mode 100644 sub/file-0003
+ delete mode 100644 sub/file-0004
+ delete mode 100644 sub/file-0005
+ delete mode 100644 sub/file-0006
+ delete mode 100644 sub/file-0007
+ delete mode 100644 sub/file-0008
+ delete mode 100644 sub/file-0009
+ delete mode 100644 sub/file-0010
+ delete mode 100644 sub/file-0011
+ delete mode 100644 sub/file-0012
+ delete mode 100644 sub/file-0013
+ delete mode 100644 sub/file-0014
+ delete mode 100644 sub/file-0015
+ delete mode 100644 sub/file-0016
+ delete mode 100644 sub/file-0017
+ delete mode 100644 sub/file-0018
+ delete mode 100644 sub/file-0019
+ delete mode 100644 sub/file-0020
+ delete mode 100644 sub/file-0021
+ delete mode 100644 sub/file-0022
+ delete mode 100644 sub/file-0023
+ delete mode 100644 sub/file-0024
+ delete mode 100644 sub/file-0025
+ delete mode 100644 sub/file-0026
+ delete mode 100644 sub/file-0027
+ delete mode 100644 sub/file-0028
+ delete mode 100644 sub/file-0029
+ delete mode 100644 sub/file-0030
+ delete mode 100644 sub/file-0031
+ delete mode 100644 sub/file-0032
+ delete mode 100644 sub/file-0033
+ delete mode 100644 sub/file-0034
+ delete mode 100644 sub/file-0035
+ delete mode 100644 sub/file-0036
+ delete mode 100644 sub/file-0037
+ delete mode 100644 sub/file-0038
+ delete mode 100644 sub/file-0039
+ delete mode 100644 sub/file-0040
+ delete mode 100644 sub/file-0041
+ delete mode 100644 sub/file-0042
+ delete mode 100644 sub/file-0043
+ delete mode 100644 sub/file-0044
+ delete mode 100644 sub/file-0045
+ delete mode 100644 sub/file-0046
+ delete mode 100644 sub/file-0047
+ delete mode 100644 sub/file-0048
+ delete mode 100644 sub/file-0049
+ delete mode 100644 sub/file-0050
+ delete mode 100644 sub/file-0051
+ delete mode 100644 sub/file-0052
+ delete mode 100644 sub/file-0053
+ delete mode 100644 sub/file-0054
+ delete mode 100644 sub/file-0055
+ delete mode 100644 sub/file-0056
+ delete mode 100644 sub/file-0057
+ delete mode 100644 sub/file-0058
+ delete mode 100644 sub/file-0059
+ok 1 - setup
 
-expecting success of 3301.133 ''git notes add -c "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -c "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
+expecting success of 3060.2 'usage': 
+	test_expect_code 128 git ls-files --with-tree=HEAD -u &&
+	test_expect_code 128 git ls-files --with-tree=HEAD -s &&
+	test_expect_code 128 git ls-files --recurse-submodules --with-tree=HEAD
 
-ok 133 - 'git notes add -c "$empty_blob" --allow-empty' stores empty note
+fatal: options 'ls-files --with-tree' and '-s/-u' cannot be used together
+fatal: options 'ls-files --with-tree' and '-s/-u' cannot be used together
+fatal: ls-files --recurse-submodules unsupported mode
+ok 2 - usage
 
-expecting success of 3301.134 ''git notes add -C "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -C "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 134 - 'git notes add -C "$empty_blob"' removes empty note
+expecting success of 3060.3 'git ls-files --with-tree should succeed from subdir': 
+	# We have to run from a sub-directory to trigger prune_index
+	# Then we finally get to run our --with-tree test
+	(
+		cd sub &&
+		git ls-files --with-tree=HEAD~1 >../output
+	)
 
-expecting success of 3301.135 ''git notes add -C "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -C "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 135 - 'git notes add -C "$empty_blob" --allow-empty' stores empty note
+ok 3 - git ls-files --with-tree should succeed from subdir
 
-expecting success of 3301.136 ''git notes append' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
+expecting success of 3060.4 'git ls-files --with-tree should add entries from named tree.': 
+	test_cmp expected output
 
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 136 - 'git notes append' removes empty note
+ok 4 - git ls-files --with-tree should add entries from named tree.
 
-expecting success of 3301.137 ''git notes append --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
+expecting success of 3060.5 'no duplicates in --with-tree output': 
+	git ls-files --with-tree=HEAD >actual &&
+	sort -u actual >expected &&
+	test_cmp expected actual
 
-ok 137 - 'git notes append --allow-empty' stores empty note
+ok 5 - no duplicates in --with-tree output
 
-expecting success of 3301.138 ''git notes append -F /dev/null' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -F /dev/null &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 138 - 'git notes append -F /dev/null' removes empty note
+expecting success of 3060.6 'setup: output in a conflict': 
+	test_create_repo conflict &&
+	test_commit -C conflict BASE file &&
+	test_commit -C conflict A file foo &&
+	git -C conflict reset --hard BASE &&
+	test_commit -C conflict B file bar
 
-expecting success of 3301.139 ''git notes append -F /dev/null --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -F /dev/null --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 139 - 'git notes append -F /dev/null --allow-empty' stores empty note
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3060-ls-files-with-tree/conflict/.git/
+[master (root-commit) 7955b49] BASE
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 67d38f3] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 7955b49 BASE
+[master f8636b1] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - setup: output in a conflict
 
-expecting success of 3301.140 ''git notes append -m ""' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -m "" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 140 - 'git notes append -m ""' removes empty note
+expecting success of 3060.7 'output in a conflict': 
+	test_must_fail git -C conflict merge A B &&
+	cat >expected <<-\EOF &&
+	file
+	file
+	file
+	file
+	EOF
+	git -C conflict ls-files --with-tree=HEAD >actual &&
+	test_cmp expected actual
 
-expecting success of 3301.141 ''git notes append -m "" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -m "" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 141 - 'git notes append -m "" --allow-empty' stores empty note
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 7 - output in a conflict
 
-expecting success of 3301.142 ''git notes append -c "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -c "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
+expecting success of 3060.8 'output with removed .git/index': 
+	cat >expected <<-\EOF &&
+	file
+	EOF
+	rm conflict/.git/index &&
+	git -C conflict ls-files --with-tree=HEAD >actual &&
+	test_cmp expected actual
 
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 142 - 'git notes append -c "$empty_blob"' removes empty note
+ok 8 - output with removed .git/index
 
-expecting success of 3301.143 ''git notes append -c "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -c "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3007-ls-files-recurse-submodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/.git/
+expecting success of 3007.1 'setup directory structure and submodules': 
+	echo a >a &&
+	mkdir b &&
+	echo b >b/b &&
+	git add a b &&
+	git commit -m "add a and b" &&
+	git init submodule &&
+	echo c >submodule/c &&
+	git -C submodule add c &&
+	git -C submodule commit -m "add c" &&
+	git submodule add ./submodule &&
+	git commit -m "added submodule"
 
-ok 143 - 'git notes append -c "$empty_blob" --allow-empty' stores empty note
+[master (root-commit) f320cab] add a and b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b/b
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git/
+[master (root-commit) 3281629] add c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Adding existing repo at 'submodule' to the index
+[master 14616f7] added submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 1 - setup directory structure and submodules
 
-expecting success of 3301.144 ''git notes append -C "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -C "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 144 - 'git notes append -C "$empty_blob"' removes empty note
+expecting success of 3007.2 'ls-files correctly outputs files in submodule': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
+	EOF
 
-expecting success of 3301.145 ''git notes append -C "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -C "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 145 - 'git notes append -C "$empty_blob" --allow-empty' stores empty note
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
 
-expecting success of 3301.146 ''git notes edit' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes edit &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
+ok 2 - ls-files correctly outputs files in submodule
 
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 146 - 'git notes edit' removes empty note
+expecting success of 3007.3 '--stage': 
+	GITMODULES_HASH=$(git rev-parse HEAD:.gitmodules) &&
+	A_HASH=$(git rev-parse HEAD:a) &&
+	B_HASH=$(git rev-parse HEAD:b/b) &&
+	C_HASH=$(git -C submodule rev-parse HEAD:c) &&
 
-expecting success of 3301.147 ''git notes edit --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes edit --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
+	cat >expect <<-EOF &&
+	100644 $GITMODULES_HASH 0	.gitmodules
+	100644 $A_HASH 0	a
+	100644 $B_HASH 0	b/b
+	100644 $C_HASH 0	submodule/c
+	EOF
 
-ok 147 - 'git notes edit --allow-empty' stores empty note
+	git ls-files --stage --recurse-submodules >actual &&
+	test_cmp expect actual
 
-expecting success of 3301.148 'empty notes are displayed by git log': 
-	test_commit 17th &&
-	git log -1 >expect &&
-	cat >>expect <<-EOF &&
+ok 3 - --stage
 
-		Notes:
+expecting success of 3007.4 'ls-files correctly outputs files in submodule with -z': 
+	lf_to_nul >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
 	EOF
-	git notes add -C "$empty_blob" --allow-empty &&
-	git log -1 >actual &&
+
+	git ls-files --recurse-submodules -z >actual &&
 	test_cmp expect actual
 
-[master 27a79f3] 17th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 17th.t
-ok 148 - empty notes are displayed by git log
+ok 4 - ls-files correctly outputs files in submodule with -z
 
-expecting success of 3301.149 'empty notes do not invoke the editor': 
-	test_commit 18th &&
-	GIT_EDITOR="false" git notes add -C "$empty_blob" --allow-empty &&
-	git notes remove HEAD &&
-	GIT_EDITOR="false" git notes add -m "" --allow-empty &&
-	git notes remove HEAD &&
-	GIT_EDITOR="false" git notes add -F /dev/null --allow-empty &&
-	git notes remove HEAD
+expecting success of 3007.5 'ls-files does not output files not added to a repo': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
+	EOF
 
-[master 86b01a9] 18th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 18th.t
-Removing note for object HEAD
-Removing note for object HEAD
-Removing note for object HEAD
-ok 149 - empty notes do not invoke the editor
+	echo a >not_added &&
+	echo b >b/not_added &&
+	echo c >submodule/not_added &&
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
 
-expecting success of 3301.150 'git notes add with -m/-F invokes editor with -e': 
-	test_commit 19th &&
-	echo "edited" >expect &&
-	MSG="$(cat expect)" git notes add -m "initial" -e &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove HEAD &&
+ok 5 - ls-files does not output files not added to a repo
 
-	# Add a note using -F and edit it
-	echo "initial" >note_file &&
-	MSG="$(cat expect)" git notes add -F note_file -e &&
-	git notes show >actual &&
+expecting success of 3007.6 'ls-files recurses more than 1 level': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/.gitmodules
+	submodule/c
+	submodule/subsub/d
+	EOF
+
+	git init submodule/subsub &&
+	echo d >submodule/subsub/d &&
+	git -C submodule/subsub add d &&
+	git -C submodule/subsub commit -m "add d" &&
+	git -C submodule submodule add ./subsub &&
+	git -C submodule commit -m "added subsub" &&
+	git submodule absorbgitdirs &&
+	git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual
 
-[master d853ef2] 19th
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git/
+[master (root-commit) 0cb03c9] add d
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 19th.t
-edited
-Removing note for object HEAD
-edited
-ok 150 - git notes add with -m/-F invokes editor with -e
-
-expecting success of 3301.151 'git notes append with -m/-F invokes the editor with -e': 
-	test_commit 20th &&
-	cat >expect <<-EOF &&
-		initial
+ create mode 100644 d
+Adding existing repo at 'subsub' to the index
+[master 83d4bc1] added subsub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsub
+Migrating git directory of 'submodule' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
+Migrating git directory of 'submodule/subsub' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule/modules/subsub'
+ok 6 - ls-files recurses more than 1 level
 
-		edited
+expecting success of 3007.7 'ls-files works with GIT_DIR': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	c
+	subsub/d
 	EOF
-	git notes add -m "initial" &&
-	MSG="edited" git notes append -m "appended" -e &&
 
-	# Verify the note content was appended and edited
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove HEAD &&
-
-	# Append a note using -F and edit it
-	echo "note from file" >note_file &&
-	git notes add -m "initial" &&
-	MSG="edited" git notes append -F note_file -e &&
-
-	# Verify notes from file has been edited in editor and appended
-	git notes show >actual &&
+	git --git-dir=submodule/.git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual
 
-[master 347e627] 20th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 20th.t
-edited
-Removing note for object HEAD
-edited
-ok 151 - git notes append with -m/-F invokes the editor with -e
+ok 7 - ls-files works with GIT_DIR
 
-expecting success of 3301.152 'git notes with a combination of -m, -F and -e invokes editor': 
-	test_commit 21st &&
-	echo "foo-file-1" >note_1 &&
-	echo "foo-file-2" >note_2 &&
-	echo "edited" >expect &&
+expecting success of 3007.8 '--recurse-submodules and pathspecs setup': 
+	echo e >submodule/subsub/e.txt &&
+	git -C submodule/subsub add e.txt &&
+	git -C submodule/subsub commit -m "adding e.txt" &&
+	echo f >submodule/f.TXT &&
+	echo g >submodule/g.txt &&
+	git -C submodule add f.TXT g.txt &&
+	git -C submodule commit -m "add f and g" &&
+	echo h >h.txt &&
+	mkdir sib &&
+	echo sib >sib/file &&
+	git add h.txt sib/file &&
+	git commit -m "add h and sib/file" &&
+	git init sub &&
+	echo sub >sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add file" &&
+	git submodule add ./sub &&
+	git commit -m "added sub" &&
 
-	MSG=$(cat expect) git notes append -F note_1 -m "message-1" -F note_2 -e &&
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule/.gitmodules
+	submodule/c
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub/d
+	submodule/subsub/e.txt
+	EOF
 
-	# Verify that combined messages from file and -m have been edited
-	git notes show >actual &&
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "*" >actual &&
 	test_cmp expect actual
 
-[master 7917321] 21st
+[master 562fffb] adding e.txt
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 21st.t
-edited
-ok 152 - git notes with a combination of -m, -F and -e invokes editor
-
-expecting success of 3301.153 'git notes append aborts when editor fails with -e': 
-	test_commit 22nd &&
-	echo "foo-file-1" >note_1 &&
-
-	# Try to append a note with -F and -e, but make the editor fail
-	test_env GIT_EDITOR="false" test_must_fail git notes append -F note_1 -e &&
-
-	# Verify that no note was added due to editor failure
-	test_must_fail git notes show
-
-[master 34adeb3] 22nd
+ create mode 100644 e.txt
+[master f284b88] add f and g
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 f.TXT
+ create mode 100644 g.txt
+[master ad13f14] add h and sib/file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 h.txt
+ create mode 100644 sib/file
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3007-ls-files-recurse-submodules/sub/.git/
+[master (root-commit) e443189] add file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 22nd.t
-error: there was a problem with the editor 'false'
-fatal: please supply the note contents using either -m or -F option
-error: no note found for object 34adeb3f542c4316ca46ba3bfb3855cdbb83cb64.
-ok 153 - git notes append aborts when editor fails with -e
-
-# passed all 153 test(s)
-1..153
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1701-racy-split-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+ create mode 100644 file
+Adding existing repo at 'sub' to the index
+[master 4a68fc6] added sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub
+ok 8 - --recurse-submodules and pathspecs setup
 
-	echo "+cached content" >expect
+expecting success of 3007.9 'inactive submodule': 
+	test_when_finished "git config --bool submodule.submodule.active true" &&
+	test_when_finished "git -C submodule config --bool submodule.subsub.active true" &&
+	git config --bool submodule.submodule.active "false" &&
 
-[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
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule
+	EOF
 
-expecting success of 1701.2 'split the index while adding a racily clean file #0': 
-		rm -f .git/index .git/sharedindex.* &&
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual &&
 
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
+	git config --bool submodule.submodule.active "true" &&
+	git -C submodule config --bool submodule.subsub.active "false" &&
 
-		# 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 &&
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule/.gitmodules
+	submodule/c
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub
+	EOF
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
 
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 2 - split the index while adding a racily clean file #0
+ok 9 - inactive submodule
 
-expecting success of 1701.3 'split the index while adding a racily clean file #1': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3007.10 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/g.txt
+	submodule/subsub/e.txt
+	EOF
 
-		# 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 &&
+	git ls-files --recurse-submodules "*.txt" >actual &&
+	test_cmp expect actual
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+ok 10 - --recurse-submodules and pathspecs
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3007.11 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub/e.txt
+	EOF
 
-		# 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
+	git ls-files --recurse-submodules ":(icase)*.txt" >actual &&
+	test_cmp expect actual
 
-expecting success of 1701.4 'split the index while adding a racily clean file #2': 
-		rm -f .git/index .git/sharedindex.* &&
+ok 11 - --recurse-submodules and pathspecs
 
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
+expecting success of 3007.12 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/f.TXT
+	submodule/g.txt
+	EOF
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+	git ls-files --recurse-submodules ":(icase)*.txt" ":(exclude)submodule/subsub/*" >actual &&
+	test_cmp expect actual
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+ok 12 - --recurse-submodules and pathspecs
 
-		# 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 3007.13 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	sub/file
+	EOF
 
-expecting success of 1701.5 'split the index while adding a racily clean file #3': 
-		rm -f .git/index .git/sharedindex.* &&
+	git ls-files --recurse-submodules "sub" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "sub/" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "sub/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "su*/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "su?/file" >actual &&
+	test_cmp expect actual
 
-		# 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 &&
+ok 13 - --recurse-submodules and pathspecs
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+expecting success of 3007.14 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	sib/file
+	sub/file
+	EOF
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+	git ls-files --recurse-submodules "s??/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "s???file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "s*file" >actual &&
+	test_cmp expect actual
 
-		# 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
+ok 14 - --recurse-submodules and pathspecs
 
-expecting success of 1701.6 'split the index while adding a racily clean file #4': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3007.15 '--recurse-submodules and relative paths': 
+	# From subdir
+	cat >expect <<-\EOF &&
+	b
+	EOF
+	git -C b ls-files --recurse-submodules >actual &&
+	test_cmp expect actual &&
 
-		# 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 &&
+	# Relative path to top
+	cat >expect <<-\EOF &&
+	../.gitmodules
+	../a
+	b
+	../h.txt
+	../sib/file
+	../sub/file
+	../submodule/.gitmodules
+	../submodule/c
+	../submodule/f.TXT
+	../submodule/g.txt
+	../submodule/subsub/d
+	../submodule/subsub/e.txt
+	EOF
+	git -C b ls-files --recurse-submodules -- .. >actual &&
+	test_cmp expect actual &&
 
-		# 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 &&
+	# Relative path to submodule
+	cat >expect <<-\EOF &&
+	../submodule/.gitmodules
+	../submodule/c
+	../submodule/f.TXT
+	../submodule/g.txt
+	../submodule/subsub/d
+	../submodule/subsub/e.txt
+	EOF
+	git -C b ls-files --recurse-submodules -- ../submodule >actual &&
+	test_cmp expect actual
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+ok 15 - --recurse-submodules and relative paths
 
-		# 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 3007.16 '--recurse-submodules does not support --error-unmatch': 
+	test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual &&
+	test_grep "does not support --error-unmatch" actual
 
-expecting success of 1701.7 'add a racily clean file to an already split index #0': 
-		rm -f .git/index .git/sharedindex.* &&
+fatal: ls-files --recurse-submodules does not support --error-unmatch
+ok 16 - --recurse-submodules does not support --error-unmatch
 
-		git update-index --split-index &&
+expecting success of 3007.17 '--recurse-submodules parses submodule repo config': 
+	test_config -C submodule index.sparse "invalid non-boolean value" &&
+	test_must_fail git ls-files --recurse-submodules 2>err &&
+	grep "bad boolean config value" err
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
+ok 17 - --recurse-submodules parses submodule repo config
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+expecting success of 3007.18 '--recurse-submodules parses submodule worktree config': 
+	test_config -C submodule extensions.worktreeConfig true &&
+	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+	test_must_fail git ls-files --recurse-submodules 2>err &&
+	grep "bad boolean config value" err
 
-		# 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
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
+ok 18 - --recurse-submodules parses submodule worktree config
 
-expecting success of 1701.8 'add a racily clean file to an already split index #1': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3007.19 '--recurse-submodules submodules ignore super project worktreeConfig extension': 
+	# Enable worktree config in both super project & submodule, set an
+	# invalid config in the submodule worktree config
+	test_config extensions.worktreeConfig true &&
+	test_config -C submodule extensions.worktreeConfig true &&
+	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
 
-		git update-index --split-index &&
+	# Now, disable the worktree config in the submodule. Note that we need
+	# to manually re-enable extensions.worktreeConfig when the test is
+	# finished, otherwise the test_unconfig of index.sparse will not work.
+	test_unconfig -C submodule extensions.worktreeConfig &&
+	test_when_finished "git -C submodule config extensions.worktreeConfig true" &&
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+	# With extensions.worktreeConfig disabled in the submodule, the invalid
+	# worktree config is not picked up.
+	git ls-files --recurse-submodules 2>err &&
+	! grep "bad boolean config value" err
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+submodule/.gitmodules
+submodule/c
+submodule/f.TXT
+submodule/g.txt
+submodule/subsub/d
+submodule/subsub/e.txt
+ok 19 - --recurse-submodules submodules ignore super project worktreeConfig extension
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3007.20 '--recurse-submodules and --deleted are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --deleted 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 20 - --recurse-submodules and --deleted are incompatible
 
-		# 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
+expecting success of 3007.21 '--recurse-submodules and --modified are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --modified 2>actual &&
+		test_grep 'unsupported mode' actual
 	
-ok 8 - add a racily clean file to an already split index #1
+fatal: ls-files --recurse-submodules unsupported mode
+ok 21 - --recurse-submodules and --modified are incompatible
 
-expecting success of 1701.9 'add a racily clean file to an already split index #2': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3007.22 '--recurse-submodules and --others are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --others 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 22 - --recurse-submodules and --others are incompatible
 
-		git update-index --split-index &&
+expecting success of 3007.23 '--recurse-submodules and --killed are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --killed 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 23 - --recurse-submodules and --killed are incompatible
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3007.24 '--recurse-submodules and --unmerged are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --unmerged 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 24 - --recurse-submodules and --unmerged are incompatible
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3102-ls-tree-wildcards.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3102-ls-tree-wildcards/.git/
+expecting success of 3102.1 'setup': 
+	mkdir a aa "a[a]" &&
+	touch a/one aa/two "a[a]/three" &&
+	git add a/one aa/two "a[a]/three" &&
+	git commit -m test
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+[master (root-commit) a832b10] test
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/one
+ create mode 100644 a[a]/three
+ create mode 100644 aa/two
+ok 1 - setup
 
-		# 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 3102.2 'ls-tree a[a] matches literally': 
+	cat >expect <<-EOF &&
+	100644 blob $EMPTY_BLOB	a[a]/three
+	EOF
+	git ls-tree -r HEAD "a[a]" >actual &&
+	test_cmp expect actual
 
-expecting success of 1701.10 'add a racily clean file to an already split index #3': 
-		rm -f .git/index .git/sharedindex.* &&
+ok 2 - ls-tree a[a] matches literally
 
-		git update-index --split-index &&
+expecting success of 3102.3 'ls-tree outside prefix': 
+	cat >expect <<-EOF &&
+	100644 blob $EMPTY_BLOB	../a[a]/three
+	EOF
+	( cd aa && git ls-tree -r HEAD "../a[a]" ) >actual &&
+	test_cmp expect actual
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+ok 3 - ls-tree outside prefix
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+checking known breakage of 3102.4 'ls-tree does not yet support negated pathspec': 
+	git ls-files ":(exclude)a" "a*" >expect &&
+	git ls-tree --name-only -r HEAD ":(exclude)a" "a*" >actual &&
+	test_cmp expect actual
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+fatal: :(exclude)a: pathspec magic not supported by this command: 'exclude' (mnemonic: '!')
+not ok 4 - ls-tree does not yet support negated pathspec # TODO known breakage
 
-		# 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
+# still have 1 known breakage(s)
+# passed all remaining 3 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3100-ls-tree-restrict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1701.11 'add a racily clean file to an already split index #4': 
-		rm -f .git/index .git/sharedindex.* &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-		git update-index --split-index &&
+)
+prerequisite SYMLINKS ok
+a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
+ok 1 - setup
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+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
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+expecting success of 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
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+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
 
-		# 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 3100.5 'ls-tree recursive with -d': git ls-tree -r -d $tree >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+040000 tree X	path2/baz
+EOF
+     test_output
+ok 5 - ls-tree recursive with -d
 
-expecting success of 1701.12 'split the index when the index contains a racily clean cache entry #0': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3100.6 'ls-tree filtered with path': git ls-tree $tree path >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 6 - ls-tree filtered with path
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3100.7 'ls-tree filtered with path1 path0': git ls-tree $tree path1 path0 >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+EOF
+     test_output
+ok 7 - ls-tree filtered with path1 path0
 
-		git update-index --add racy-file &&
+expecting success of 3100.8 'ls-tree filtered with path0/': git ls-tree $tree path0/ >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 8 - ls-tree filtered with path0/
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3100.9 'ls-tree filtered with path2': git ls-tree $tree path2 >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+EOF
+     test_output
+ok 9 - ls-tree filtered with path2
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+expecting success of 3100.10 'ls-tree filtered with path2/': git ls-tree $tree path2/ >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+120000 blob X	path2/bazbo
+100644 blob X	path2/foo
+EOF
+     test_output
+ok 10 - ls-tree filtered with path2/
 
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
+expecting success of 3100.11 'ls-tree filtered with path2/baz': git ls-tree $tree path2/baz >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+EOF
+     test_output
+ok 11 - ls-tree filtered with path2/baz
 
-		# 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 3100.12 'ls-tree filtered with path2/bak': git ls-tree $tree path2/bak >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 12 - ls-tree filtered with path2/bak
 
-expecting success of 1701.13 'split the index when the index contains a racily clean cache entry #1': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3100.13 'ls-tree -t filtered with path2/bak': git ls-tree -t $tree path2/bak >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+EOF
+     test_output
+ok 13 - ls-tree -t filtered with path2/bak
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3100.14 'ls-tree with one path a prefix of the other': git ls-tree $tree path2/baz path2/bazbo >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+120000 blob X	path2/bazbo
+EOF
+     test_output
+ok 14 - ls-tree with one path a prefix of the other
 
-		git update-index --add racy-file &&
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3103-ls-tree-misc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+[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
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+expecting success of 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
 
-		# 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 &&
+error: Could not read 5fcffbd6e4c5c5b8d81f5e9314b20e338e3ffff5
+ok 2 - ls-tree fails with non-zero exit code on broken tree
 
-		# 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
+expecting success of 3103.3 'usage: incompatible options: --long --name-only': 
+		test_expect_code 129 git ls-tree $opts $tree
 	
-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 &&
+error: options '--name-only' and '--long' cannot be used together
+ok 3 - usage: incompatible options: --long --name-only
 
-		git update-index --add racy-file &&
+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
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+    -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
 
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
+ok 4 - usage: incompatible options: --long and --format
 
-		# 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
+expecting success of 3103.5 'usage: incompatible options: --name-only --name-status': 
+		test_expect_code 129 git ls-tree $opts $tree
 	
-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 &&
+error: options '--name-status' and '--name-only' cannot be used together
+ok 5 - usage: incompatible options: --name-only --name-status
 
-		git update-index --add racy-file &&
+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
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+    -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
 
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
+ok 6 - usage: incompatible options: --name-only and --format
 
-		# 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
+expecting success of 3103.7 'usage: incompatible options: --name-status --object-only': 
+		test_expect_code 129 git ls-tree $opts $tree
 	
-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 &&
+error: options '--object-only' and '--name-status' cannot be used together
+ok 7 - usage: incompatible options: --name-status --object-only
 
-		git update-index --add racy-file &&
+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
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+    -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
 
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
+ok 8 - usage: incompatible options: --name-status and --format
 
-		# 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
+expecting success of 3103.9 'usage: incompatible options: --object-only --long': 
+		test_expect_code 129 git ls-tree $opts $tree
 	
-ok 16 - split the index when the index contains a racily clean cache entry #4
+error: options '--long' and '--object-only' cannot be used together
+ok 9 - usage: incompatible options: --object-only --long
 
-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.* &&
+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
 
-		git update-index --split-index &&
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+    -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
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+ok 10 - usage: incompatible options: --object-only and --format
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3101-ls-tree-dirname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3101-ls-tree-dirname/.git/
+expecting success of 3101.1 'setup': 
+	echo 111 >1.txt &&
+	echo 222 >2.txt &&
+	mkdir path0 path0/a path0/a/b path0/a/b/c &&
+	echo 111 >path0/a/b/c/1.txt &&
+	mkdir path1 path1/b path1/b/c &&
+	echo 111 >path1/b/c/1.txt &&
+	mkdir path2 &&
+	echo 111 >path2/1.txt &&
+	mkdir path3 &&
+	echo 111 >path3/1.txt &&
+	echo 222 >path3/2.txt &&
+	find *.txt path* \( -type f -o -type l \) -print |
+	xargs git update-index --add &&
+	tree=$(git write-tree) &&
+	echo $tree
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+ef2ea4d6de8ec0863f430e4cad7468ce74f60aa7
+ok 1 - setup
 
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
+expecting success of 3101.2 'ls-tree plain': 
+	git ls-tree $tree >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
 
-		# 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
+ok 2 - ls-tree plain
 
-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.* &&
+expecting success of 3101.3 'ls-tree recursive': 
+	git ls-tree -r $tree >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
 
-		git update-index --split-index &&
+ok 3 - ls-tree recursive
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3101.4 'ls-tree filter 1.txt': 
+	git ls-tree $tree 1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+EOF
+	test_output
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+ok 4 - ls-tree filter 1.txt
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3101.5 'ls-tree filter path1/b/c/1.txt': 
+	git ls-tree $tree path1/b/c/1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	path1/b/c/1.txt
+EOF
+	test_output
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+ok 5 - ls-tree filter path1/b/c/1.txt
 
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
+expecting success of 3101.6 'ls-tree filter all 1.txt files': 
+	git ls-tree $tree 1.txt path0/a/b/c/1.txt \
+		path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+EOF
+	test_output
 
-		# 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
+ok 6 - ls-tree filter all 1.txt files
 
-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.* &&
+expecting success of 3101.7 'ls-tree filter directories': 
+	git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
+	cat >expected <<\EOF &&
+040000 tree X	path0/a/b/c
+040000 tree X	path1/b/c
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
 
-		git update-index --split-index &&
+ok 7 - ls-tree filter directories
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3101.8 'ls-tree filter odd names': 
+	git ls-tree $tree 1.txt ./1.txt .//1.txt \
+		path3/1.txt path3/./1.txt path3 path3// >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+ok 8 - ls-tree filter odd names
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3101.9 'ls-tree filter missing files and extra slashes': 
+	git ls-tree $tree 1.txt/ abc.txt \
+		path3//23.txt path3/2.txt/// >current &&
+	>expected &&
+	test_output
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+ok 9 - ls-tree filter missing files and extra slashes
 
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
+expecting success of 3101.10 'ls-tree filter is leading path match': 
+	git ls-tree $tree pa path3/a >current &&
+	>expected &&
+	test_output
 
-		# 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
+ok 10 - ls-tree filter is leading path match
 
-expecting success of 1701.20 'update the split index when it contains a new racily clean cache entry #3': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3101.11 'ls-tree --full-name': 
+	(
+		cd path0 &&
+		git ls-tree --full-name $tree a
+	) >current &&
+	cat >expected <<\EOF &&
+040000 tree X	path0/a
+EOF
+	test_output
 
-		git update-index --split-index &&
+ok 11 - ls-tree --full-name
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3101.12 'ls-tree --no-full-name': 
+	git -C path0 ls-tree --no-full-name $tree a >current &&
+	cat >expected <<-EOF &&
+	040000 tree X	a
+	EOF
+	test_output
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+ok 12 - ls-tree --no-full-name
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3101.13 'ls-tree --full-tree': 
+	(
+		cd path1/b/c &&
+		git ls-tree --full-tree $tree
+	) >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+ok 13 - ls-tree --full-tree
 
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
+expecting success of 3101.14 'ls-tree --full-tree -r': 
+	(
+		cd path3/ &&
+		git ls-tree --full-tree -r $tree
+	) >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
 
-		# 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
+ok 14 - ls-tree --full-tree -r
 
-expecting success of 1701.21 'update the split index when it contains a new racily clean cache entry #4': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3101.15 'ls-tree --abbrev=5': 
+	git ls-tree --abbrev=5 $tree >current &&
+	sed -e "s/ $_x05[0-9a-f]*	/ X	/" <current >check &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_cmp expected check
 
-		git update-index --split-index &&
+ok 15 - ls-tree --abbrev=5
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3101.16 'ls-tree --name-only': 
+		git ls-tree $opt $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0
+		path1
+		path2
+		path3
+		EOF
+		test_output
+	
+ok 16 - ls-tree --name-only
 
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
+expecting success of 3101.17 'ls-tree --name-only -r': 
+		git ls-tree $opt -r $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0/a/b/c/1.txt
+		path1/b/c/1.txt
+		path2/1.txt
+		path3/1.txt
+		path3/2.txt
+		EOF
+		test_output
+	
+ok 17 - ls-tree --name-only -r
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3101.18 'ls-tree --name-status': 
+		git ls-tree $opt $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0
+		path1
+		path2
+		path3
+		EOF
+		test_output
+	
+ok 18 - ls-tree --name-status
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+expecting success of 3101.19 'ls-tree --name-status -r': 
+		git ls-tree $opt -r $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0/a/b/c/1.txt
+		path1/b/c/1.txt
+		path2/1.txt
+		path3/1.txt
+		path3/2.txt
+		EOF
+		test_output
+	
+ok 19 - ls-tree --name-status -r
 
-		# 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 &&
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3104-ls-tree-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3104-ls-tree-format/.git/
+expecting success of 3104.1 'ls-tree --format usage': 
+	test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
+	test_expect_code 129 git ls-tree --format=fmt --name-only HEAD &&
+	test_expect_code 129 git ls-tree --format=fmt --name-status HEAD
 
-		# 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
+fatal: --format can't be combined with other format-altering options
 
-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.* &&
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+    -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
 
-		# 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 &&
+fatal: --format can't be combined with other format-altering options
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+    -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
 
-		# 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 &&
+fatal: --format can't be combined with other format-altering options
 
-		# 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
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-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.* &&
+    -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
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+ok 1 - ls-tree --format usage
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+expecting success of 3104.2 'setup': 
+	setup_basic_ls_tree_data
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+[master (root-commit) 921915e] dir/sub-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/sub-file.t
+[master 61a63ac] top-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 top-file.t
+Cloning into 'submodule'...
+done.
+Adding existing repo at 'submodule' to the index
+[master 9ac950e] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 2 - setup
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+expecting success of 3104.3 'ls-tree --format='%(path) %(path) %(path)' HEAD top-file': 
+	git ls-tree --format="%(path) %(path) %(path)" HEAD top-file.t >actual &&
+	echo top-file.t top-file.t top-file.t >expect &&
+	test_cmp expect actual
 
-		# 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 &&
+ok 3 - ls-tree --format='%(path) %(path) %(path)' HEAD top-file
 
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
+expecting success of 3104.4 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options ' '': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
 	
-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.* &&
+ok 4 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options ' '
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3104.5 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
+	
+ok 5 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+expecting success of 3104.6 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' is like options '--long '': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
+	
+ok 6 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' is like options '--long '
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3104.7 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
+	
+ok 7 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)>' on optimized v.s. non-optimized path
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+expecting success of 3104.8 'ls-tree '--format=<%(path)>' is like options '--name-only '': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
+	
+ok 8 - ls-tree '--format=<%(path)>' is like options '--name-only '
 
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
+expecting success of 3104.9 'ls-tree '--format=<%(path)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
+	
+ok 9 - ls-tree '--format=<%(path)>' on optimized v.s. non-optimized path
 
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
+expecting success of 3104.10 'ls-tree '--format=<%(objectname)>' is like options '--object-only '': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
 	
-ok 24 - update the split index when a racily clean cache entry is stored only in the shared index #2
+ok 10 - ls-tree '--format=<%(objectname)>' is like options '--object-only '
 
-expecting success of 1701.25 'update the split index when a racily clean cache entry is stored only in the shared index #3': 
-		rm -f .git/index .git/sharedindex.* &&
+expecting success of 3104.11 'ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
+	
+ok 11 - ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3104.12 'ls-tree '--format=<%(objectname)>' is like options '--object-only --abbrev --abbrev'': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
+	
+ok 12 - ls-tree '--format=<%(objectname)>' is like options '--object-only --abbrev --abbrev'
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+expecting success of 3104.13 'ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
+	
+ok 13 - ls-tree '--format=<%(objectname)>' on optimized v.s. non-optimized path
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3104.14 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '-t -t'': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
+	
+ok 14 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '-t -t'
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+expecting success of 3104.15 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
+	
+ok 15 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
 
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
+expecting success of 3104.16 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-name --full-name'': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
+	
+ok 16 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-name --full-name'
 
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
+expecting success of 3104.17 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
 	
-ok 25 - update the split index when a racily clean cache entry is stored only in the shared index #3
+ok 17 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
 
-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.* &&
+expecting success of 3104.18 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-tree --full-tree'': 
+		git ls-tree $opts -r HEAD >expect &&
+		git ls-tree --format="$format" -r $fmtopts HEAD >actual &&
+		test_cmp expect actual
+	
+ok 18 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' is like options '--full-tree --full-tree'
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3104.19 'ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path': 
+		git ls-tree --format="$format" -r $fmtopts HEAD >expect &&
+		git ls-tree --format="> $format" -r $fmtopts HEAD >actual.raw &&
+		sed "s/^> //" >actual <actual.raw &&
+		test_cmp expect actual
+	
+ok 19 - ls-tree '--format=<%(objectmode) %(objecttype) %(objectname)%x09%(path)>' on optimized v.s. non-optimized path
 
-		# 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 &&
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3201-branch-contains.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3201-branch-contains/.git/
+expecting success of 3201.1 'setup': 
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+	>file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git branch -M main &&
+	git branch side &&
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+	echo 1 >file &&
+	test_tick &&
+	git commit -a -m "second on main" &&
 
-		# 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 &&
+	git checkout side &&
+	echo 1 >file &&
+	test_tick &&
+	git commit -a -m "second on side" &&
 
-		# 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
+	git merge main
 
-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 &&
+[master (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main f254a9d] second on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'side'
+[side 5a0fd8a] second on side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Merge made by the 'ort' strategy.
+ok 1 - setup
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+expecting success of 3201.2 'branch --contains=main': 
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+	git branch --contains=main >actual &&
+	{
+		echo "  main" && echo "* side"
+	} >expect &&
+	test_cmp expect actual
 
-		# 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 &&
+ok 2 - branch --contains=main
 
-		# 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 3201.3 'branch --contains main': 
 
-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.* &&
+	git branch --contains main >actual &&
+	{
+		echo "  main" && echo "* side"
+	} >expect &&
+	test_cmp expect actual
 
-		# 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 &&
+ok 3 - branch --contains main
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 3201.4 'branch --no-contains=main': 
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+	git branch --no-contains=main >actual &&
+	test_must_be_empty actual
 
-		# 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
+ok 4 - branch --no-contains=main
 
-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.* &&
+expecting success of 3201.5 'branch --no-contains main': 
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+	git branch --no-contains main >actual &&
+	test_must_be_empty actual
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+ok 5 - branch --no-contains main
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+expecting success of 3201.6 'branch --contains=side': 
 
-		# 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 &&
+	git branch --contains=side >actual &&
+	{
+		echo "* side"
+	} >expect &&
+	test_cmp expect actual
 
-		# 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.* &&
+ok 6 - branch --contains=side
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+expecting success of 3201.7 'branch --no-contains=side': 
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+	git branch --no-contains=side >actual &&
+	{
+		echo "  main"
+	} >expect &&
+	test_cmp expect actual
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+ok 7 - branch --no-contains=side
 
-		# 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 &&
+expecting success of 3201.8 'branch --contains with pattern implies --list': 
 
-		# 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
+	git branch --contains=main main >actual &&
+	{
+		echo "  main"
+	} >expect &&
+	test_cmp expect actual
 
-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 &&
+ok 8 - branch --contains with pattern implies --list
 
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
+expecting success of 3201.9 'branch --no-contains with pattern implies --list': 
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+	git branch --no-contains=main main >actual &&
+	test_must_be_empty actual
 
-		# 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 &&
+ok 9 - branch --no-contains with pattern implies --list
 
-		# 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
+expecting success of 3201.10 'side: branch --merged': 
 
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3320-notes-merge-worktrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3320-notes-merge-worktrees/.git/
-expecting success of 3320.1 'setup commit': 
-	test_commit tantrum
+	git branch --merged >actual &&
+	{
+		echo "  main" &&
+		echo "* side"
+	} >expect &&
+	test_cmp expect actual
 
-[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 10 - side: branch --merged
 
-ok 2 - setup notes ref (x)
+expecting success of 3201.11 'branch --merged with pattern implies --list': 
 
-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
+	git branch --merged=side main >actual &&
+	{
+		echo "  main"
+	} >expect &&
+	test_cmp expect actual
 
-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
+ok 11 - branch --merged with pattern implies --list
 
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 4 - setup remote branch (z)
+expecting success of 3201.12 'side: branch --no-merged': 
 
-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
+	git branch --no-merged >actual &&
+	test_must_be_empty actual
 
-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
+ok 12 - side: branch --no-merged
 
-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 3201.13 'main: branch --merged': 
 
-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 &&
+	git checkout main &&
+	git branch --merged >actual &&
+	{
+		echo "* main"
+	} >expect &&
 	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
+Switched to branch 'main'
+ok 13 - main: branch --merged
 
-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.48.0~rc1+next.20250101/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 3201.14 'main: branch --no-merged': 
 
-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 &&
+	git branch --no-merged >actual &&
+	{
+		echo "  side"
+	} >expect &&
 	test_cmp expect actual
 
-Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3309-notes-merge-auto-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3309-notes-merge-auto-resolve/.git/
-expecting success of 3309.1 'setup commits': 
-	test_commit 1st &&
-	test_commit 2nd &&
-	test_commit 3rd &&
-	test_commit 4th &&
-	test_commit 5th &&
-	test_commit 6th &&
-	test_commit 7th &&
-	test_commit 8th &&
-	test_commit 9th &&
-	test_commit 10th &&
-	test_commit 11th &&
-	test_commit 12th &&
-	test_commit 13th &&
-	test_commit 14th &&
-	test_commit 15th &&
 
-	test_oid_cache <<-EOF
-	hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023
-	hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c
-	hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315
-	hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36
-	hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545
-	hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be
-	hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910
-	hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6
-	hash07a sha1:897003322b53bc6ca098e9324ee508362347e734
-	hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082
-	hash15b sha1:68b8630d25516028bed862719855b3d6768d7833
-	hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df
-	hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc
-	hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62
-	hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b
-	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
-	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
-	hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765
-	hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d
-	hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a
-	hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23
-	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
-	hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54
-	hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47
-	hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1
-	hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b
-	hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee
-	hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e
+ok 14 - main: branch --no-merged
 
-	hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a
-	hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092
-	hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052
-	hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e
-	hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98
-	hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb
-	hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028
-	hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067
-	hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db
-	hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf
-	hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96
-	hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1
-	hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b
-	hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840
-	hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f
-	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
-	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
-	hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166
-	hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa
-	hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798
-	hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58
-	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
-	hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88
-	hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa
-	hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a
-	hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607
-	hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec
-	hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b
-	EOF
+expecting success of 3201.15 'branch --no-merged with pattern implies --list': 
 
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-[master 7a4ca6e] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2nd.t
-[master d07d62e] 3rd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3rd.t
-[master 0f7aa3e] 4th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4th.t
-[master 7f9ad88] 5th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5th.t
-[master 2c12533] 6th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6th.t
-[master fb01e0c] 7th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7th.t
-[master 9a4c31c] 8th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8th.t
-[master 2e0db4b] 9th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9th.t
-[master 7c3b87a] 10th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10th.t
-[master a446fff] 11th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11th.t
-[master 65e263d] 12th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12th.t
-[master e871aa6] 13th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13th.t
-[master 07c85d7] 14th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14th.t
-[master 4acf42e] 15th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15th.t
-ok 1 - setup commits
+	git branch --no-merged=main main >actual &&
+	test_must_be_empty actual
 
-expecting success of 3309.2 'setup merge base (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on 6th commit" 6th &&
-	git notes add -m "x notes on 7th commit" 7th &&
-	git notes add -m "x notes on 8th commit" 8th &&
-	git notes add -m "x notes on 9th commit" 9th &&
-	git notes add -m "x notes on 10th commit" 10th &&
-	git notes add -m "x notes on 11th commit" 11th &&
-	git notes add -m "x notes on 12th commit" 12th &&
-	git notes add -m "x notes on 13th commit" 13th &&
-	git notes add -m "x notes on 14th commit" 14th &&
-	git notes add -m "x notes on 15th commit" 15th
 
-ok 2 - setup merge base (x)
+ok 15 - branch --no-merged with pattern implies --list
 
-expecting success of 3309.3 'verify state of merge base (x)': verify_notes x x
-ok 3 - verify state of merge base (x)
+expecting success of 3201.16 'implicit --list conflicts with modification options': 
 
-expecting success of 3309.4 'setup local branch (y)': 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	git notes add -f -m "y notes on 3rd commit" 3rd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	git notes add -f -m "y notes on 5th commit" 5th &&
-	git notes remove 6th &&
-	git notes remove 7th &&
-	git notes remove 8th &&
-	git notes add -f -m "y notes on 12th commit" 12th &&
-	git notes add -f -m "y notes on 13th commit" 13th &&
-	git notes add -f -m "y notes on 14th commit" 14th &&
-	git notes add -f -m "y notes on 15th commit" 15th
+	test_must_fail git branch --contains=main -d &&
+	test_must_fail git branch --contains=main -m foo &&
+	test_must_fail git branch --no-contains=main -d &&
+	test_must_fail git branch --no-contains=main -m foo
 
-Removing note for object 6th
-Removing note for object 7th
-Removing note for object 8th
-Overwriting existing notes for object 65e263ded02ae4e8839bc151095113737579dc12
-Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-ok 4 - setup local branch (y)
 
-expecting success of 3309.5 'verify state of local branch (y)': verify_notes y y
-ok 5 - verify state of local branch (y)
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
+   or: git branch [<options>] [-l] [<pattern>...]
+   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
+   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
+   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
+   or: git branch [<options>] [-r | -a] [--points-at]
+   or: git branch [<options>] [-r | -a] [--format]
 
-expecting success of 3309.6 'setup remote branch (z)': 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "z notes on 2nd commit" 2nd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	git notes add -f -m "z notes on 5th commit" 5th &&
-	git notes remove 6th &&
-	git notes add -f -m "z notes on 8th commit" 8th &&
-	git notes remove 9th &&
-	git notes add -f -m "z notes on 11th commit" 11th &&
-	git notes remove 12th &&
-	git notes add -f -m "y notes on 14th commit" 14th &&
-	git notes add -f -m "z notes on 15th commit" 15th
+Generic options
+    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
+    -q, --[no-]quiet      suppress informational messages
+    -t, --[no-]track[=(direct|inherit)]
+                          set branch tracking configuration
+    -u, --[no-]set-upstream-to <upstream>
+                          change the upstream info
+    --[no-]unset-upstream unset the upstream info
+    --[no-]color[=<when>] use colored output
+    -r, --remotes         act on remote-tracking branches
+    --contains <commit>   print only branches that contain the commit
+    --no-contains <commit>
+                          print only branches that don't contain the commit
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
 
-Removing note for object 6th
-Overwriting existing notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-Removing note for object 9th
-Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
-Removing note for object 12th
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-ok 6 - setup remote branch (z)
+Specific git-branch actions:
+    -a, --all             list both remote-tracking and local branches
+    -d, --[no-]delete     delete fully merged branch
+    -D                    delete branch (even if not merged)
+    -m, --[no-]move       move/rename a branch and its reflog
+    -M                    move/rename a branch, even if target exists
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    -c, --[no-]copy       copy a branch and its reflog
+    -C                    copy a branch, even if target exists
+    -l, --[no-]list       list branch names
+    --[no-]show-current   show current branch name
+    --[no-]create-reflog  create the branch's reflog
+    --[no-]edit-description
+                          edit the description for the branch
+    -f, --[no-]force      force creation, move/rename, deletion
+    --merged <commit>     print only branches that are merged
+    --no-merged <commit>  print only branches that are not merged
+    --[no-]column[=<style>]
+                          list branches in columns
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only branches of the object
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]format <format>
+                          format to use for the output
 
-expecting success of 3309.7 'verify state of remote branch (z)': verify_notes z z
-ok 7 - verify state of remote branch (z)
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
+   or: git branch [<options>] [-l] [<pattern>...]
+   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
+   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
+   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
+   or: git branch [<options>] [-r | -a] [--points-at]
+   or: git branch [<options>] [-r | -a] [--format]
 
-expecting success of 3309.8 'merge z into y with invalid strategy => Fail/No changes': 
-	git config core.notesRef refs/notes/y &&
-	test_must_fail git notes merge --strategy=foo z &&
-	# Verify no changes (y)
-	verify_notes y y
+Generic options
+    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
+    -q, --[no-]quiet      suppress informational messages
+    -t, --[no-]track[=(direct|inherit)]
+                          set branch tracking configuration
+    -u, --[no-]set-upstream-to <upstream>
+                          change the upstream info
+    --[no-]unset-upstream unset the upstream info
+    --[no-]color[=<when>] use colored output
+    -r, --remotes         act on remote-tracking branches
+    --contains <commit>   print only branches that contain the commit
+    --no-contains <commit>
+                          print only branches that don't contain the commit
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
 
-error: unknown -s/--strategy: foo
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
+Specific git-branch actions:
+    -a, --all             list both remote-tracking and local branches
+    -d, --[no-]delete     delete fully merged branch
+    -D                    delete branch (even if not merged)
+    -m, --[no-]move       move/rename a branch and its reflog
+    -M                    move/rename a branch, even if target exists
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    -c, --[no-]copy       copy a branch and its reflog
+    -C                    copy a branch, even if target exists
+    -l, --[no-]list       list branch names
+    --[no-]show-current   show current branch name
+    --[no-]create-reflog  create the branch's reflog
+    --[no-]edit-description
+                          edit the description for the branch
+    -f, --[no-]force      force creation, move/rename, deletion
+    --merged <commit>     print only branches that are merged
+    --no-merged <commit>  print only branches that are not merged
+    --[no-]column[=<style>]
+                          list branches in columns
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only branches of the object
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]format <format>
+                          format to use for the output
 
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
+   or: git branch [<options>] [-l] [<pattern>...]
+   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
+   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
+   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
+   or: git branch [<options>] [-r | -a] [--points-at]
+   or: git branch [<options>] [-r | -a] [--format]
 
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+Generic options
+    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
+    -q, --[no-]quiet      suppress informational messages
+    -t, --[no-]track[=(direct|inherit)]
+                          set branch tracking configuration
+    -u, --[no-]set-upstream-to <upstream>
+                          change the upstream info
+    --[no-]unset-upstream unset the upstream info
+    --[no-]color[=<when>] use colored output
+    -r, --remotes         act on remote-tracking branches
+    --contains <commit>   print only branches that contain the commit
+    --no-contains <commit>
+                          print only branches that don't contain the commit
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
 
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
+Specific git-branch actions:
+    -a, --all             list both remote-tracking and local branches
+    -d, --[no-]delete     delete fully merged branch
+    -D                    delete branch (even if not merged)
+    -m, --[no-]move       move/rename a branch and its reflog
+    -M                    move/rename a branch, even if target exists
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    -c, --[no-]copy       copy a branch and its reflog
+    -C                    copy a branch, even if target exists
+    -l, --[no-]list       list branch names
+    --[no-]show-current   show current branch name
+    --[no-]create-reflog  create the branch's reflog
+    --[no-]edit-description
+                          edit the description for the branch
+    -f, --[no-]force      force creation, move/rename, deletion
+    --merged <commit>     print only branches that are merged
+    --no-merged <commit>  print only branches that are not merged
+    --[no-]column[=<style>]
+                          list branches in columns
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only branches of the object
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]format <format>
+                          format to use for the output
 
-Aborting notes merge resolution
-    --abort               abort notes merge
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
+   or: git branch [<options>] [-l] [<pattern>...]
+   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
+   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
+   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
+   or: git branch [<options>] [-r | -a] [--points-at]
+   or: git branch [<options>] [-r | -a] [--format]
 
-ok 8 - merge z into y with invalid strategy => Fail/No changes
+Generic options
+    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
+    -q, --[no-]quiet      suppress informational messages
+    -t, --[no-]track[=(direct|inherit)]
+                          set branch tracking configuration
+    -u, --[no-]set-upstream-to <upstream>
+                          change the upstream info
+    --[no-]unset-upstream unset the upstream info
+    --[no-]color[=<when>] use colored output
+    -r, --remotes         act on remote-tracking branches
+    --contains <commit>   print only branches that contain the commit
+    --no-contains <commit>
+                          print only branches that don't contain the commit
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
 
-expecting success of 3309.9 'merge z into y with invalid configuration option => Fail/No changes': 
-	git config core.notesRef refs/notes/y &&
-	cat >expect <<-\EOF &&
-	error: unknown notes merge strategy foo
-	fatal: unable to parse 'notes.mergeStrategy' from command-line config
-	EOF
-	test_must_fail git -c notes.mergeStrategy="foo" notes merge z 2>actual &&
-	test_cmp expect actual &&
-	# Verify no changes (y)
-	verify_notes y y
+Specific git-branch actions:
+    -a, --all             list both remote-tracking and local branches
+    -d, --[no-]delete     delete fully merged branch
+    -D                    delete branch (even if not merged)
+    -m, --[no-]move       move/rename a branch and its reflog
+    -M                    move/rename a branch, even if target exists
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    -c, --[no-]copy       copy a branch and its reflog
+    -C                    copy a branch, even if target exists
+    -l, --[no-]list       list branch names
+    --[no-]show-current   show current branch name
+    --[no-]create-reflog  create the branch's reflog
+    --[no-]edit-description
+                          edit the description for the branch
+    -f, --[no-]force      force creation, move/rename, deletion
+    --merged <commit>     print only branches that are merged
+    --no-merged <commit>  print only branches that are not merged
+    --[no-]column[=<style>]
+                          list branches in columns
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only branches of the object
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]format <format>
+                          format to use for the output
 
-ok 9 - merge z into y with invalid configuration option => Fail/No changes
+ok 16 - implicit --list conflicts with modification options
 
-expecting success of 3309.10 'merge z into y with "ours" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=ours z &&
-	verify_notes y ours
+expecting success of 3201.17 'Assert that --contains only works on commits, not trees & blobs': 
+	test_must_fail git branch --contains main^{tree} &&
+	blob=$(git hash-object -w --stdin <<-\EOF
+	Some blob
+	EOF
+	) &&
+	test_must_fail git branch --contains $blob &&
+	test_must_fail git branch --no-contains $blob
 
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 10 - merge z into y with "ours" strategy => Non-conflicting 3-way merge
+error: object f27c6ae26adb8396d3861976ba268f87ad8afa0b is a tree, not a commit
+error: no such commit main^{tree}
+error: object cfb9f2866bfe62c278d75e8c33f020ccc27b5829 is a blob, not a commit
+error: no such commit cfb9f2866bfe62c278d75e8c33f020ccc27b5829
+error: object cfb9f2866bfe62c278d75e8c33f020ccc27b5829 is a blob, not a commit
+error: no such commit cfb9f2866bfe62c278d75e8c33f020ccc27b5829
+ok 17 - Assert that --contains only works on commits, not trees & blobs
 
-expecting success of 3309.11 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+expecting success of 3201.18 'multiple branch --contains': 
+	git checkout -b side2 main &&
+	>feature &&
+	git add feature &&
+	git commit -m "add feature" &&
+	git checkout -b next main &&
+	git merge side &&
+	git branch --contains side --contains side2 >actual &&
+	cat >expect <<-\EOF &&
+	* next
+	  side
+	  side2
+	EOF
+	test_cmp expect actual
 
-ok 11 - reset to pre-merge state (y)
+Switched to a new branch 'side2'
+[side2 08dccf0] add feature
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 feature
+Switched to a new branch 'next'
+Updating f254a9d..8b329c6
+Fast-forward
+ok 18 - multiple branch --contains
 
-expecting success of 3309.12 'merge z into y with "ours" configuration option => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="ours" notes merge z &&
-	verify_notes y ours
+expecting success of 3201.19 'multiple branch --merged': 
+	git branch --merged next --merged main >actual &&
+	cat >expect <<-\EOF &&
+	  main
+	* next
+	  side
+	EOF
+	test_cmp expect actual
 
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 12 - merge z into y with "ours" configuration option => Non-conflicting 3-way merge
+ok 19 - multiple branch --merged
 
-expecting success of 3309.13 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+expecting success of 3201.20 'multiple branch --no-contains': 
+	git branch --no-contains side --no-contains side2 >actual &&
+	cat >expect <<-\EOF &&
+	  main
+	EOF
+	test_cmp expect actual
 
-ok 13 - reset to pre-merge state (y)
+ok 20 - multiple branch --no-contains
 
-expecting success of 3309.14 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="ours" notes merge z &&
-	verify_notes y ours
+expecting success of 3201.21 'multiple branch --no-merged': 
+	git branch --no-merged next --no-merged main >actual &&
+	cat >expect <<-\EOF &&
+	  side2
+	EOF
+	test_cmp expect actual
 
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 14 - merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge
+ok 21 - multiple branch --no-merged
 
-expecting success of 3309.15 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+expecting success of 3201.22 'branch --contains combined with --no-contains': 
+	git checkout -b seen main &&
+	git merge side &&
+	git merge side2 &&
+	git branch --contains side --no-contains side2 >actual &&
+	cat >expect <<-\EOF &&
+	  next
+	  side
+	EOF
+	test_cmp expect actual
 
-ok 15 - reset to pre-merge state (y)
+Switched to a new branch 'seen'
+Updating f254a9d..8b329c6
+Fast-forward
+Merge made by the 'ort' strategy.
+ feature | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 feature
+ok 22 - branch --contains combined with --no-contains
 
-expecting success of 3309.16 'merge z into y with "theirs" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=theirs z &&
-	verify_notes y theirs
+expecting success of 3201.23 'branch --merged combined with --no-merged': 
+	git branch --merged seen --no-merged next >actual &&
+	cat >expect <<-\EOF &&
+	* seen
+	  side2
+	EOF
+	test_cmp expect actual
 
-Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 16 - merge z into y with "theirs" strategy => Non-conflicting 3-way merge
+ok 23 - branch --merged combined with --no-merged
 
-expecting success of 3309.17 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+expecting success of 3201.24 'branch --merged with --verbose': 
+	git branch --track topic main &&
+	git branch zzz topic &&
+	git checkout topic &&
+	test_commit foo &&
+	git branch --merged topic >actual &&
+	cat >expect <<-\EOF &&
+	  main
+	* topic
+	  zzz
+	EOF
+	test_cmp expect actual &&
+	git branch --verbose --merged topic >actual &&
+	cat >expect <<-EOF &&
+	  main  $(git rev-parse --short main) second on main
+	* topic $(git rev-parse --short topic ) [ahead 1] foo
+	  zzz   $(git rev-parse --short zzz   ) second on main
+	EOF
+	test_cmp expect actual
 
-ok 17 - reset to pre-merge state (y)
+branch 'topic' set up to track 'main'.
+Switched to branch 'topic'
+Your branch is up to date with 'main'.
+[topic 67f297f] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 24 - branch --merged with --verbose
 
-expecting success of 3309.18 'merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="ours" notes merge --strategy=theirs z &&
-	verify_notes y theirs
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3204-branch-name-interpretation.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3204-branch-name-interpretation/.git/
+expecting success of 3204.1 'set up repo': 
+	test_commit one &&
+	test_commit two &&
+	git remote add origin foo.git
 
-Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 18 - merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - set up repo
 
-expecting success of 3309.19 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+expecting success of 3204.2 'update branch via @{-1}': 
+	git branch previous one &&
 
-ok 19 - reset to pre-merge state (y)
+	git checkout previous &&
+	git checkout main &&
 
-expecting success of 3309.20 'merge z into y with "union" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=union z &&
-	verify_notes y union
+	git branch -f @{-1} two &&
+	expect_branch previous two
 
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 20 - merge z into y with "union" strategy => Non-conflicting 3-way merge
+Switched to branch 'previous'
+Switched to branch 'main'
+ok 2 - update branch via @{-1}
 
-expecting success of 3309.21 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+expecting success of 3204.3 'update branch via local @{upstream}': 
+	git branch local one &&
+	git branch --set-upstream-to=local &&
 
-ok 21 - reset to pre-merge state (y)
+	git branch -f @{upstream} two &&
+	expect_branch local two
 
-expecting success of 3309.22 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="theirs" notes merge --strategy=union z &&
-	verify_notes y union
+branch 'main' set up to track 'local'.
+ok 3 - update branch via local @{upstream}
 
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 22 - merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge
+expecting success of 3204.4 'disallow updating branch via remote @{upstream}': 
+	git update-ref refs/remotes/origin/remote one &&
+	git branch --set-upstream-to=origin/remote &&
 
-expecting success of 3309.23 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+	test_must_fail git branch -f @{upstream} two
 
-ok 23 - reset to pre-merge state (y)
+branch 'main' set up to track 'origin/remote'.
+fatal: '@{upstream}' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 4 - disallow updating branch via remote @{upstream}
 
-expecting success of 3309.24 'merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="union" -c notes.mergeStrategy="theirs" notes merge z &&
-	verify_notes y union
+expecting success of 3204.5 'create branch with pseudo-qualified name': 
+	git branch refs/heads/qualified two &&
+	expect_branch refs/heads/refs/heads/qualified two
 
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 24 - merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge
+ok 5 - create branch with pseudo-qualified name
 
-expecting success of 3309.25 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
+expecting success of 3204.6 'force-copy a branch to itself via @{-1} is no-op': 
+	git branch -t copiable main &&
+	git checkout copiable &&
+	git checkout - &&
+	git branch -C @{-1} copiable &&
+	git config --get-all branch.copiable.merge >actual &&
+	echo refs/heads/main >expect &&
+	test_cmp expect actual
 
-ok 25 - reset to pre-merge state (y)
+branch 'copiable' set up to track 'main'.
+Switched to branch 'copiable'
+Your branch is up to date with 'main'.
+Switched to branch 'main'
+Your branch is ahead of 'origin/remote' by 1 commit.
+  (use "git push" to publish your local commits)
+ok 6 - force-copy a branch to itself via @{-1} is no-op
 
-expecting success of 3309.26 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge': 
-	test_must_fail git -c notes.z.mergeStrategy="union" notes merge z &&
-	git notes merge --abort &&
-	verify_notes y y
+expecting success of 3204.7 'delete branch via @{-1}': 
+	git branch previous-del &&
 
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-CONFLICT (content): Merge conflict in notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Auto-merging notes for 65e263ded02ae4e8839bc151095113737579dc12
-CONFLICT (delete/modify): Notes for object 65e263ded02ae4e8839bc151095113737579dc12 deleted in refs/notes/z and modified in refs/notes/y. Version from refs/notes/y left in tree.
-Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Auto-merging notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-CONFLICT (delete/modify): Notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-ok 26 - merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge
+	git checkout previous-del &&
+	git checkout main &&
 
-expecting success of 3309.27 'merge y into z with "union" strategy => Non-conflicting 3-way merge': 
-	git config core.notesRef refs/notes/z &&
-	git notes merge --strategy=union y &&
-	verify_notes z union2
+	git branch -D @{-1} &&
+	expect_deleted previous-del
 
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 27 - merge y into z with "union" strategy => Non-conflicting 3-way merge
+Switched to branch 'previous-del'
+Switched to branch 'main'
+Your branch is ahead of 'origin/remote' by 1 commit.
+  (use "git push" to publish your local commits)
+Deleted branch previous-del (was 139b20d).
+fatal: Needed a single revision
+ok 7 - delete branch via @{-1}
 
-expecting success of 3309.28 'reset to pre-merge state (z)': 
-	git update-ref refs/notes/z refs/notes/z^1 &&
-	# Verify pre-merge state
-	verify_notes z z
+expecting success of 3204.8 'delete branch via local @{upstream}': 
+	git branch local-del &&
+	git branch --set-upstream-to=local-del &&
 
-ok 28 - reset to pre-merge state (z)
+	git branch -D @{upstream} &&
+	expect_deleted local-del
 
-expecting success of 3309.29 'merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=cat_sort_uniq y &&
-	verify_notes z cat_sort_uniq
+branch 'main' set up to track 'local-del'.
+Deleted branch local-del (was 139b20d).
+fatal: Needed a single revision
+ok 8 - delete branch via local @{upstream}
 
-Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 29 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge
+expecting success of 3204.9 'delete branch via remote @{upstream}': 
+	git update-ref refs/remotes/origin/remote-del two &&
+	git branch --set-upstream-to=origin/remote-del &&
 
-expecting success of 3309.30 'reset to pre-merge state (z)': 
-	git update-ref refs/notes/z refs/notes/z^1 &&
-	# Verify pre-merge state
-	verify_notes z z
+	git branch -r -D @{upstream} &&
+	expect_deleted origin/remote-del
 
-ok 30 - reset to pre-merge state (z)
+branch 'main' set up to track 'origin/remote-del'.
+Deleted remote-tracking branch origin/remote-del (was 139b20d).
+fatal: Needed a single revision
+ok 9 - delete branch via remote @{upstream}
 
-expecting success of 3309.31 'merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="cat_sort_uniq" notes merge y &&
-	verify_notes z cat_sort_uniq
+expecting success of 3204.10 'delete @{upstream} expansion matches -r option': 
+	git update-ref refs/remotes/origin/remote-del two &&
+	git branch --set-upstream-to=origin/remote-del &&
+	git update-ref refs/heads/origin/remote-del two &&
+	git update-ref refs/heads/remotes/origin/remote-del two &&
 
-Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 31 - merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge
+	test_must_fail git branch -D @{upstream} &&
+	expect_branch refs/heads/origin/remote-del two &&
+	expect_branch refs/heads/remotes/origin/remote-del two
 
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3401-rebase-and-am-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3401-rebase-and-am-rename/.git/
-expecting success of 3401.1 'setup testcase where directory rename should be detected': 
-	test_create_repo dir-rename &&
-	(
-		cd dir-rename &&
+branch 'main' set up to track 'origin/remote-del'.
+error: branch '@{upstream}' not found
+ok 10 - delete @{upstream} expansion matches -r option
 
-		mkdir x &&
-		test_seq  1 10 >x/a &&
-		test_seq 11 20 >x/b &&
-		test_seq 21 30 >x/c &&
-		test_write_lines a b c d e f g h i >l &&
-		git add x l &&
-		git commit -m "Initial" &&
+expecting success of 3204.11 'disallow deleting remote branch via @{-1}': 
+	git update-ref refs/remotes/origin/previous one &&
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+	git checkout -b origin/previous two &&
+	git checkout main &&
 
-		git checkout A &&
-		git mv x y &&
-		git mv l letters &&
-		git commit -m "Rename x to y, l to letters" &&
+	test_must_fail git branch -r -D @{-1} &&
+	expect_branch refs/remotes/origin/previous one &&
+	expect_branch refs/heads/origin/previous two
 
-		git checkout B &&
-		echo j >>l &&
-		test_seq 31 40 >x/d &&
-		git add l x/d &&
-		git commit -m "Modify l, add x/d"
-	)
+Switched to a new branch 'origin/previous'
+Switched to branch 'main'
+Your branch is up to date with 'remotes/origin/remote-del'.
+error: remote-tracking branch '@{-1}' not found
+ok 11 - disallow deleting remote branch via @{-1}
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3401-rebase-and-am-rename/dir-rename/.git/
-[master (root-commit) 79c153a] Initial
- Author: A U Thor <author@example.com>
- 4 files changed, 39 insertions(+)
- create mode 100644 l
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 x/c
-Switched to branch 'A'
-[A cc01e42] Rename x to y, l to letters
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename l => letters (100%)
- rename {x => y}/a (100%)
- rename {x => y}/b (100%)
- rename {x => y}/c (100%)
-Switched to branch 'B'
-[B 6c5e67f] Modify l, add x/d
- Author: A U Thor <author@example.com>
- 2 files changed, 11 insertions(+)
- create mode 100644 x/d
-ok 1 - setup testcase where directory rename should be detected
+expecting success of 3204.12 'create branch named "@"': 
+	git branch -f @ one &&
+	expect_branch refs/heads/@ one
 
-expecting success of 3401.2 'rebase --interactive: directory rename detected': 
-	(
-		cd dir-rename &&
+ok 12 - create branch named "@"
 
-		git checkout B^0 &&
+expecting success of 3204.13 'delete branch named "@"': 
+	git update-ref refs/heads/@ two &&
+	git branch -D @ &&
+	expect_deleted refs/heads/@
 
-		set_fake_editor &&
-		FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
+Deleted branch @ (was 139b20d).
+fatal: Needed a single revision
+ok 13 - delete branch named "@"
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+expecting success of 3204.14 'checkout does not treat remote @{upstream} as a branch': 
+	git update-ref refs/remotes/origin/checkout one &&
+	git branch --set-upstream-to=origin/checkout &&
+	git update-ref refs/heads/origin/checkout two &&
+	git update-ref refs/heads/remotes/origin/checkout two &&
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+	git checkout @{upstream} &&
+	expect_branch HEAD one
 
-Note: switching to 'B^0'.
+branch 'main' set up to track 'origin/checkout'.
+warning: refname '@{upstream}' is ambiguous.
+Note: switching to '@{upstream}'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -120265,2626 +110264,2246 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 6c5e67f Modify l, add x/d
-rebase -i script before editing:
-pick 6c5e67f Modify l, add x/d
+HEAD is now at d79ce16 one
+ok 14 - checkout does not treat remote @{upstream} as a branch
 
-rebase -i script after editing:
-pick 6c5e67f Modify l, add x/d
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 2 - rebase --interactive: directory rename detected
-
-checking known breakage of 3401.3 'rebase --apply: directory rename detected': 
-	(
-		cd dir-rename &&
+expecting success of 3204.15 'edit-description via @{-1}': 
+	git checkout -b desc-branch &&
+	git checkout -b non-desc-branch &&
+	write_script editor <<-\EOF &&
+		echo "Branch description" >"$1"
+	EOF
+	EDITOR=./editor git branch --edit-description @{-1} &&
+	test_must_fail git config branch.non-desc-branch.description &&
+	git config branch.desc-branch.description >actual &&
+	printf "Branch description\n\n" >expect &&
+	test_cmp expect actual
 
-		git checkout B^0 &&
+Switched to a new branch 'desc-branch'
+Switched to a new branch 'non-desc-branch'
+ok 15 - edit-description via @{-1}
 
-		git -c merge.directoryRenames=true rebase --apply A &&
+expecting success of 3204.16 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"': 
+	git checkout -b upstream-branch &&
+	git checkout -b upstream-other -t upstream-branch &&
+	git branch --set-upstream-to upstream-other @{-1} &&
+	git config branch.upstream-branch.merge >actual &&
+	echo "refs/heads/upstream-other" >expect &&
+	test_cmp expect actual &&
+	git branch --unset-upstream @{-1}@{upstream} &&
+	test_must_fail git config branch.upstream-other.merge
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+Switched to a new branch 'upstream-branch'
+Switched to a new branch 'upstream-other'
+branch 'upstream-other' set up to track 'upstream-branch'.
+branch 'upstream-branch' set up to track 'upstream-other'.
+ok 16 - modify branch upstream via "@{-1}" and "@{-1}@{upstream}"
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3205-branch-color.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3205-branch-color/.git/
+expecting success of 3205.1 'set up some sample branches': 
+	test_commit foo &&
+	git branch -M main &&
+	git update-ref refs/remotes/origin/main HEAD &&
+	git update-ref refs/heads/other HEAD
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - set up some sample branches
 
-  2e986bc Modify l, add x/d
+expecting success of 3205.2 'set up some color config': 
+	git config color.branch.local blue &&
+	git config color.branch.remote yellow &&
+	git config color.branch.current cyan
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+ok 2 - set up some color config
 
- git branch <new-branch-name> 2e986bc
+expecting success of 3205.3 'regular output shows colors': 
+	cat >expect <<-\EOF &&
+	* <CYAN>main<RESET>
+	  <BLUE>other<RESET>
+	  <YELLOW>remotes/origin/main<RESET>
+	EOF
+	git branch --color -a >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
 
-HEAD is now at 6c5e67f Modify l, add x/d
-First, rewinding head to replay your work on top of it...
-Applying: Modify l, add x/d
-Using index info to reconstruct a base tree...
-A	l
-Falling back to patching base and 3-way merge...
-Merging:
-cc01e42 Rename x to y, l to letters
-virtual Modify l, add x/d
-found 1 common ancestor:
-virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
-File y/d doesn't exist
-not ok 3 - rebase --apply: directory rename detected # TODO known breakage
+ok 3 - regular output shows colors
 
-expecting success of 3401.4 'rebase --merge: directory rename detected': 
-	(
-		cd dir-rename &&
+expecting success of 3205.4 'verbose output shows colors': 
+	oid=$(git rev-parse --short HEAD) &&
+	cat >expect <<-EOF &&
+	* <CYAN>main               <RESET> $oid foo
+	  <BLUE>other              <RESET> $oid foo
+	  <YELLOW>remotes/origin/main<RESET> $oid foo
+	EOF
+	git branch --color -v -a >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
 
-		git checkout B^0 &&
+ok 4 - verbose output shows colors
 
-		git -c merge.directoryRenames=true rebase --merge A &&
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3105-ls-tree-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output/.git/
+expecting success of 3105.1 'ls-tree --format usage': 
+	test_expect_code 129 git ls-tree --format=fmt -l HEAD &&
+	test_expect_code 129 git ls-tree --format=fmt --name-only HEAD &&
+	test_expect_code 129 git ls-tree --format=fmt --name-status HEAD
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+fatal: --format can't be combined with other format-altering options
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+    -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
 
-  7f699cd Modify l, add x/d
+fatal: --format can't be combined with other format-altering options
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
- git branch <new-branch-name> 7f699cd
+    -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
 
-HEAD is now at 6c5e67f Modify l, add x/d
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 4 - rebase --merge: directory rename detected
+fatal: --format can't be combined with other format-altering options
 
-checking known breakage of 3401.5 'am: directory rename detected': 
-	(
-		cd dir-rename &&
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
 
-		git checkout A^0 &&
+    -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
 
-		git format-patch -1 B &&
+ok 1 - ls-tree --format usage
 
-		git -c merge.directoryRenames=true am --3way 0001*.patch &&
+expecting success of 3105.2 'setup': 
+	setup_basic_ls_tree_data
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+[master (root-commit) 921915e] dir/sub-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/sub-file.t
+[master 61a63ac] top-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 top-file.t
+Cloning into 'submodule'...
+done.
+Adding existing repo at 'submodule' to the index
+[master 9ac950e] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 2 - setup
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+expecting success of 3105.3 'setup: HEAD_* variables': 
+	HEAD_gitmodules=$(git rev-parse HEAD:.gitmodules) &&
+	HEAD_dir=$(git rev-parse HEAD:dir) &&
+	HEAD_top_file=$(git rev-parse HEAD:top-file.t) &&
+	HEAD_submodule=$(git rev-parse HEAD:submodule) &&
+	HEAD_dir_sub_file=$(git rev-parse HEAD:dir/sub-file.t)
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+ok 3 - setup: HEAD_* variables
 
-  2e986bc Modify l, add x/d
+expecting success of 3105.4 ''ls-tree ' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 4 - 'ls-tree ' output
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 3105.5 ''ls-tree ' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 5 - 'ls-tree ' output (via subdir)
 
- git branch <new-branch-name> 2e986bc
+expecting success of 3105.6 ''ls-tree  -t' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 6 - 'ls-tree  -t' output
 
-HEAD is now at cc01e42 Rename x to y, l to letters
-0001-Modify-l-add-x-d.patch
-Applying: Modify l, add x/d
-Using index info to reconstruct a base tree...
-A	l
-Falling back to patching base and 3-way merge...
-Merging:
-cc01e42 Rename x to y, l to letters
-virtual Modify l, add x/d
-found 1 common ancestor:
-virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
-File y/d doesn't exist
-not ok 5 - am: directory rename detected # TODO known breakage
+expecting success of 3105.7 ''ls-tree  -t' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 7 - 'ls-tree  -t' output (via subdir)
 
-expecting success of 3401.6 'setup testcase where directory rename should NOT be detected': 
-	test_create_repo no-dir-rename &&
-	(
-		cd no-dir-rename &&
+expecting success of 3105.8 ''ls-tree  -d' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 8 - 'ls-tree  -d' output
 
-		mkdir x &&
-		test_seq  1 10 >x/a &&
-		test_seq 11 20 >x/b &&
-		test_seq 21 30 >x/c &&
-		echo original >project_info &&
-		git add x project_info &&
-		git commit -m "Initial" &&
+expecting success of 3105.9 ''ls-tree  -d' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 9 - 'ls-tree  -d' output (via subdir)
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success of 3105.10 ''ls-tree  -r' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 10 - 'ls-tree  -r' output
 
-		git checkout A &&
-		echo v2 >project_info &&
-		git add project_info &&
-		git commit -m "Modify project_info" &&
+expecting success of 3105.11 ''ls-tree  -r' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 11 - 'ls-tree  -r' output (via subdir)
 
-		git checkout B &&
-		mkdir y &&
-		git mv x/c y/c &&
-		echo v1 >project_info &&
-		git add project_info &&
-		git commit -m "Rename x/c to y/c, modify project_info"
-	)
+expecting success of 3105.12 ''ls-tree --long' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 12 - 'ls-tree --long' output
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3401-rebase-and-am-rename/no-dir-rename/.git/
-[master (root-commit) 229b7b2] Initial
- Author: A U Thor <author@example.com>
- 4 files changed, 31 insertions(+)
- create mode 100644 project_info
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 x/c
-Switched to branch 'A'
-[A 5e95ce3] Modify project_info
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'B'
-[B 1f2a3f5] Rename x/c to y/c, modify project_info
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename {x => y}/c (100%)
-ok 6 - setup testcase where directory rename should NOT be detected
+expecting success of 3105.13 ''ls-tree --long' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 13 - 'ls-tree --long' output (via subdir)
 
-expecting success of 3401.7 'rebase --interactive: NO directory rename': 
-	test_when_finished "git -C no-dir-rename rebase --abort" &&
-	(
-		cd no-dir-rename &&
+expecting success of 3105.14 ''ls-tree --long -t' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 14 - 'ls-tree --long -t' output
 
-		git checkout B^0 &&
+expecting success of 3105.15 ''ls-tree --long -t' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 15 - 'ls-tree --long -t' output (via subdir)
 
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
+expecting success of 3105.16 ''ls-tree --long -d' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 16 - 'ls-tree --long -d' output
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+expecting success of 3105.17 ''ls-tree --long -d' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 17 - 'ls-tree --long -d' output (via subdir)
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+expecting success of 3105.18 ''ls-tree --long -r' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 18 - 'ls-tree --long -r' output
 
-Note: switching to 'B^0'.
+expecting success of 3105.19 ''ls-tree --long -r' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 19 - 'ls-tree --long -r' output (via subdir)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 3105.20 ''ls-tree --name-only' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 20 - 'ls-tree --name-only' output
 
-If you want to 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 3105.21 ''ls-tree --name-only' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 21 - 'ls-tree --name-only' output (via subdir)
 
-  git switch -c <new-branch-name>
+expecting success of 3105.22 ''ls-tree --name-only -t' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 22 - 'ls-tree --name-only -t' output
 
-Or undo this operation with:
+expecting success of 3105.23 ''ls-tree --name-only -t' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 23 - 'ls-tree --name-only -t' output (via subdir)
 
-  git switch -
+expecting success of 3105.24 ''ls-tree --name-only -d' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 24 - 'ls-tree --name-only -d' output
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3105.25 ''ls-tree --name-only -d' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 25 - 'ls-tree --name-only -d' output (via subdir)
 
-HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
-rebase -i script before editing:
-pick 1f2a3f5 Rename x/c to y/c, modify project_info
+expecting success of 3105.26 ''ls-tree --name-only -r' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 26 - 'ls-tree --name-only -r' output
 
-rebase -i script after editing:
-pick 1f2a3f5 Rename x/c to y/c, modify project_info
-Rebasing (1/1)
Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-ok 7 - rebase --interactive: NO directory rename
+expecting success of 3105.27 ''ls-tree --name-only -r' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 27 - 'ls-tree --name-only -r' output (via subdir)
 
-expecting success of 3401.8 'rebase (am): NO directory rename': 
-	test_when_finished "git -C no-dir-rename rebase --abort" &&
-	(
-		cd no-dir-rename &&
+expecting success of 3105.28 ''ls-tree --object-only' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 28 - 'ls-tree --object-only' output
 
-		git checkout B^0 &&
+expecting success of 3105.29 ''ls-tree --object-only' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 29 - 'ls-tree --object-only' output (via subdir)
 
-		set_fake_editor &&
-		test_must_fail git rebase A &&
+expecting success of 3105.30 ''ls-tree --object-only -t' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 30 - 'ls-tree --object-only -t' output
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+expecting success of 3105.31 ''ls-tree --object-only -t' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 31 - 'ls-tree --object-only -t' output (via subdir)
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+expecting success of 3105.32 ''ls-tree --object-only -d' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 32 - 'ls-tree --object-only -d' output
 
-HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
-Rebasing (1/1)
Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-ok 8 - rebase (am): NO directory rename
+expecting success of 3105.33 ''ls-tree --object-only -d' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 33 - 'ls-tree --object-only -d' output (via subdir)
 
-expecting success of 3401.9 'rebase --merge: NO directory rename': 
-	test_when_finished "git -C no-dir-rename rebase --abort" &&
-	(
-		cd no-dir-rename &&
+expecting success of 3105.34 ''ls-tree --object-only -r' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 34 - 'ls-tree --object-only -r' output
 
-		git checkout B^0 &&
+expecting success of 3105.35 ''ls-tree --object-only -r' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 35 - 'ls-tree --object-only -r' output (via subdir)
 
-		set_fake_editor &&
-		test_must_fail git rebase --merge A &&
+expecting success of 3105.36 'setup: HEAD_short_* variables': 
+	HEAD_short_gitmodules=$(git rev-parse --short HEAD:.gitmodules) &&
+	HEAD_short_dir=$(git rev-parse --short HEAD:dir) &&
+	HEAD_short_top_file=$(git rev-parse --short HEAD:top-file.t) &&
+	HEAD_short_submodule=$(git rev-parse --short HEAD:submodule) &&
+	HEAD_short_dir_sub_file=$(git rev-parse --short HEAD:dir/sub-file.t)
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+ok 36 - setup: HEAD_short_* variables
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+expecting success of 3105.37 ''ls-tree --object-only --abbrev' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 37 - 'ls-tree --object-only --abbrev' output
 
-HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
-Rebasing (1/1)
Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-ok 9 - rebase --merge: NO directory rename
+expecting success of 3105.38 ''ls-tree --object-only --abbrev' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 38 - 'ls-tree --object-only --abbrev' output (via subdir)
 
-expecting success of 3401.10 'am: NO directory rename': 
-	test_when_finished "git -C no-dir-rename am --abort" &&
-	(
-		cd no-dir-rename &&
+expecting success of 3105.39 ''ls-tree --object-only --abbrev -t' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 39 - 'ls-tree --object-only --abbrev -t' output
 
-		git checkout A^0 &&
+expecting success of 3105.40 ''ls-tree --object-only --abbrev -t' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 40 - 'ls-tree --object-only --abbrev -t' output (via subdir)
 
-		git format-patch -1 B &&
+expecting success of 3105.41 ''ls-tree --object-only --abbrev -d' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 41 - 'ls-tree --object-only --abbrev -d' output
 
-		test_must_fail git am --3way 0001*.patch &&
+expecting success of 3105.42 ''ls-tree --object-only --abbrev -d' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 42 - 'ls-tree --object-only --abbrev -d' output (via subdir)
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+expecting success of 3105.43 ''ls-tree --object-only --abbrev -r' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 43 - 'ls-tree --object-only --abbrev -r' output
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+expecting success of 3105.44 ''ls-tree --object-only --abbrev -r' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 44 - 'ls-tree --object-only --abbrev -r' output (via subdir)
 
-Previous HEAD position was 1f2a3f5 Rename x/c to y/c, modify project_info
-HEAD is now at 5e95ce3 Modify project_info
-0001-Rename-x-c-to-y-c-modify-project_info.patch
-Applying: Rename x/c to y/c, modify project_info
-Using index info to reconstruct a base tree...
-M	project_info
-Falling back to patching base and 3-way merge...
-Merging:
-5e95ce3 Modify project_info
-virtual Rename x/c to y/c, modify project_info
-found 1 common ancestor:
-virtual 70041a03917eeabc905137ab5853aed716a92bc6
-Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 Rename x/c to y/c, modify project_info
-ok 10 - am: NO directory rename
+expecting success of 3105.45 ''ls-tree --full-name' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 45 - 'ls-tree --full-name' output
 
-# still have 2 known breakage(s)
-# passed all remaining 8 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3310-notes-merge-manual-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3310-notes-merge-manual-resolve/.git/
-expecting success of 3310.1 'setup commits': 
-	test_commit 1st &&
-	test_commit 2nd &&
-	test_commit 3rd &&
-	test_commit 4th &&
-	test_commit 5th &&
+expecting success of 3105.46 ''ls-tree --full-name' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 46 - 'ls-tree --full-name' output (via subdir)
 
-	test_oid_cache <<-EOF
-	hash04a sha1:6e8e3febca3c2bb896704335cc4d0c34cb2f8715
-	hash03a sha1:e5388c10860456ee60673025345fe2e153eb8cf8
-	hash02a sha1:ceefa674873670e7ecd131814d909723cce2b669
-	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
-	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
-	hash01b sha1:b0a6021ec006d07e80e9b20ec9b444cbd9d560d3
-	hash04c sha1:cff59c793c20bb49a4e01bc06fb06bad642e0d54
-	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
-	hash01c sha1:0a81da8956346e19bcb27a906f04af327e03e31b
-	hash04d sha1:00494adecf2d9635a02fa431308d67993f853968
-	hash01e sha1:f75d1df88cbfe4258d49852f26cfc83f2ad4494b
-	hash04f sha1:021faa20e931fb48986ffc6282b4bb05553ac946
-	hash01f sha1:0a59e787e6d688aa6309e56e8c1b89431a0fc1c1
-	hash05g sha1:304dfb4325cf243025b9957486eb605a9b51c199
+expecting success of 3105.47 ''ls-tree --full-name -d' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 47 - 'ls-tree --full-name -d' output
 
-	hash04a	sha256:f18a935e65866345098b3b754071dbf9f3aa3520eb27a7b036b278c5e2f1ed7e
-	hash03a	sha256:713035dc94067a64e5fa6e4e1821b7c3bde49a77c7cb3f80eaadefa1ca41b3d2
-	hash02a	sha256:f160a67e048b6fa75bec3952184154045076692cf5dccd3da21e3fd34b7a3f0f
-	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
-	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
-	hash01b sha256:da96cf778c15d0a2bb76f98b2a62f6c9c01730fa7030e8f08ef0191048e7d620
-	hash04c sha256:cb615d2def4b834d5f55b2351df97dc92bee4f5009d285201427f349081c8aca
-	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
-	hash01c sha256:5b87237ac1fbae0246256fed9f9a1f077c4140fb7e6444925f8dbfa5ae406cd8
-	hash04d sha256:eeddc9f9f6cb3d6b39b861659853f10891dc373e0b6eecb09e03e39b6ce64714
-	hash01e sha256:108f521b1a74c2e6d0b52a4eda87e09162bf847f7d190cfce496ee1af0b29a5a
-	hash04f sha256:901acda0454502b3bbd281f130c419e6c8de78afcf72a8def8d45ad31462bce4
-	hash01f sha256:a2d99d1b8bf23c8af7d9d91368454adc110dfd5cc068a4cebb486ee8f5a1e16c
-	hash05g sha256:4fef015b01da8efe929a68e3bb9b8fbad81f53995f097befe8ebc93f12ab98ec
-	EOF
+expecting success of 3105.48 ''ls-tree --full-name -d' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 48 - 'ls-tree --full-name -d' output (via subdir)
 
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-[master 7a4ca6e] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2nd.t
-[master d07d62e] 3rd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3rd.t
-[master 0f7aa3e] 4th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4th.t
-[master 7f9ad88] 5th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5th.t
-ok 1 - setup commits
+expecting success of 3105.49 ''ls-tree --full-name -r' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 49 - 'ls-tree --full-name -r' output
 
-expecting success of 3310.2 'setup merge base (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on 2nd commit" 2nd &&
-	git notes add -m "x notes on 3rd commit" 3rd &&
-	git notes add -m "x notes on 4th commit" 4th &&
-	verify_notes x
+expecting success of 3105.50 ''ls-tree --full-name -r' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 50 - 'ls-tree --full-name -r' output (via subdir)
 
-ok 2 - setup merge base (x)
+expecting success of 3105.51 ''ls-tree --full-name -t' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 51 - 'ls-tree --full-name -t' output
 
-expecting success of 3310.3 'setup local branch (y)': 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	git notes add -f -m "y notes on 1st commit" 1st &&
-	git notes remove 2nd &&
-	git notes add -f -m "y notes on 3rd commit" 3rd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	verify_notes y
+expecting success of 3105.52 ''ls-tree --full-name -t' output (via subdir)': 
+				git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../ >actual &&
+				test_cmp expect actual
+			
+ok 52 - 'ls-tree --full-name -t' output (via subdir)
 
-Removing note for object 2nd
-Overwriting existing notes for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
-ok 3 - setup local branch (y)
+expecting success of 3105.53 ''ls-tree --full-tree' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 53 - 'ls-tree --full-tree' output
 
-expecting success of 3310.4 'setup remote branch (z)': 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "z notes on 1st commit" 1st &&
-	git notes add -f -m "z notes on 2nd commit" 2nd &&
-	git notes remove 3rd &&
-	git notes add -f -m "z notes on 4th commit" 4th &&
-	verify_notes z
+expecting success of 3105.54 ''ls-tree --full-tree' output (via subdir, fails)': 
+				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
+			
+fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
+ok 54 - 'ls-tree --full-tree' output (via subdir, fails)
 
-Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-Removing note for object 3rd
-Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
-ok 4 - setup remote branch (z)
+expecting success of 3105.55 ''ls-tree --full-tree -t' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 55 - 'ls-tree --full-tree -t' output
 
-expecting success of 3310.5 'merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	git update-ref refs/notes/m refs/notes/y &&
-	git config core.notesRef refs/notes/m &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+expecting success of 3105.56 ''ls-tree --full-tree -t' output (via subdir, fails)': 
+				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
+			
+fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
+ok 56 - 'ls-tree --full-tree -t' output (via subdir, fails)
 
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-ok 5 - merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+expecting success of 3105.57 ''ls-tree --full-tree -d' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 57 - 'ls-tree --full-tree -d' output
 
-expecting success of 3310.6 'change notes in z': 
-	git notes --ref z append -m "More z notes on 4th commit" 4th &&
-	verify_notes z
+expecting success of 3105.58 ''ls-tree --full-tree -d' output (via subdir, fails)': 
+				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
+			
+fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
+ok 58 - 'ls-tree --full-tree -d' output (via subdir, fails)
 
-ok 6 - change notes in z
+expecting success of 3105.59 ''ls-tree --full-tree -r' output': 
+			git ls-tree ${mode:+$mode }$opts HEAD >actual &&
+			test_cmp expect actual
+		
+ok 59 - 'ls-tree --full-tree -r' output
 
-expecting success of 3310.7 'cannot do merge w/conflicts when previous merge is unfinished': 
-	test -d .git/NOTES_MERGE_WORKTREE &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should indicate what is wrong
-	test_grep -q "\\.git/NOTES_MERGE_\\* exists" output
+expecting success of 3105.60 ''ls-tree --full-tree -r' output (via subdir, fails)': 
+				test_must_fail git -C dir ls-tree --full-name ${mode:+$mode }$opts HEAD -- ../
+			
+fatal: ../: '../' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3105-ls-tree-output'
+ok 60 - 'ls-tree --full-tree -r' output (via subdir, fails)
 
-ok 7 - cannot do merge w/conflicts when previous merge is unfinished
+# passed all 60 test(s)
+1..60
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3203-branch-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3203-branch-output/.git/
+expecting success of 3203.1 'make commits': 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+	git branch -M main &&
+	echo content >>file &&
+	git commit -a -m two
 
-expecting success of 3310.8 'setup unrelated notes ref (w)': 
-	git config core.notesRef refs/notes/w &&
-	git notes add -m "w notes on 1st commit" 1st &&
-	git notes add -m "x notes on 2nd commit" 2nd &&
-	verify_notes w
+[master (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(+)
+ok 1 - make commits
 
-ok 8 - setup unrelated notes ref (w)
+expecting success of 3203.2 'make branches': 
+	git branch branch-one &&
+	git branch branch-two HEAD^
 
-expecting success of 3310.9 'can do merge without conflicts even if previous merge is unfinished (x => w)': 
-	test -d .git/NOTES_MERGE_WORKTREE &&
-	git notes merge x &&
-	verify_notes w &&
-	# Verify that other notes refs has not changed (x and y)
-	verify_notes x &&
-	verify_notes y
+ok 2 - make branches
 
-ok 9 - can do merge without conflicts even if previous merge is unfinished (x => w)
+expecting success of 3203.3 'make remote branches': 
+	git update-ref refs/remotes/origin/branch-one branch-one &&
+	git update-ref refs/remotes/origin/branch-two branch-two &&
+	git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/branch-one
 
-expecting success of 3310.10 'do not allow mixing --commit and --abort': 
-	test_must_fail git notes merge --commit --abort
+ok 3 - make remote branches
 
-error: cannot mix --commit, --abort or -s/--strategy
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
+expecting success of 3203.4 'git branch shows local branches': 
+	git branch >actual &&
+	test_cmp expect actual
 
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
+ok 4 - git branch shows local branches
 
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+expecting success of 3203.5 'git branch --list shows local branches': 
+	git branch --list >actual &&
+	test_cmp expect actual
 
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
+ok 5 - git branch --list shows local branches
 
-Aborting notes merge resolution
-    --abort               abort notes merge
+expecting success of 3203.6 'git branch --list pattern shows matching local branches': 
+	git branch --list branch* >actual &&
+	test_cmp expect actual
 
-ok 10 - do not allow mixing --commit and --abort
+ok 6 - git branch --list pattern shows matching local branches
 
-expecting success of 3310.11 'do not allow mixing --commit and --strategy': 
-	test_must_fail git notes merge --commit --strategy theirs
+expecting success of 3203.7 'git branch -r shows remote branches': 
+	git branch -r >actual &&
+	test_cmp expect actual &&
 
-error: cannot mix --commit, --abort or -s/--strategy
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
+	git branch --remotes >actual &&
+	test_cmp expect actual
 
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
+ok 7 - git branch -r shows remote branches
 
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+expecting success of 3203.8 'git branch --no-remotes is rejected': 
+	test_must_fail git branch --no-remotes 2>err &&
+	grep "unknown option .no-remotes." err
 
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
+error: unknown option `no-remotes'
+ok 8 - git branch --no-remotes is rejected
 
-Aborting notes merge resolution
-    --abort               abort notes merge
+expecting success of 3203.9 'git branch -a shows local and remote branches': 
+	git branch -a >actual &&
+	test_cmp expect actual &&
 
-ok 11 - do not allow mixing --commit and --strategy
+	git branch --all >actual &&
+	test_cmp expect actual
 
-expecting success of 3310.12 'do not allow mixing --abort and --strategy': 
-	test_must_fail git notes merge --abort --strategy theirs
+ok 9 - git branch -a shows local and remote branches
 
-error: cannot mix --commit, --abort or -s/--strategy
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
+expecting success of 3203.10 'git branch --no-all is rejected': 
+	test_must_fail git branch --no-all 2>err &&
+	grep "unknown option .no-all." err
 
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
+error: unknown option `no-all'
+ok 10 - git branch --no-all is rejected
 
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+expecting success of 3203.11 'git branch -v shows branch summaries': 
+	git branch -v >tmp &&
+	awk "{print \$NF}" <tmp >actual &&
+	test_cmp expect actual
 
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
+ok 11 - git branch -v shows branch summaries
 
-Aborting notes merge resolution
-    --abort               abort notes merge
+expecting success of 3203.12 'git branch --list -v pattern shows branch summaries': 
+	git branch --list -v branch* >tmp &&
+	awk "{print \$NF}" <tmp >actual &&
+	test_cmp expect actual
 
-ok 12 - do not allow mixing --abort and --strategy
+ok 12 - git branch --list -v pattern shows branch summaries
 
-expecting success of 3310.13 'finalize conflicting merge (z => m)': 
-	# Resolve conflicts and finalize merge
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
-y and z notes on 1st commit
-EOF
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
-y and z notes on 4th commit
-EOF
-	git notes merge --commit &&
-	notes_merge_files_gone &&
-	# Merge commit has pre-merge y and pre-merge z as parents
-	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
-	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
-	# Merge commit mentions the notes refs merged
-	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
-	grep -q refs/notes/m merge_commit_msg &&
-	grep -q refs/notes/z merge_commit_msg &&
-	# Merge commit mentions conflicting notes
-	grep -q "Conflicts" merge_commit_msg &&
-	( for sha1 in $(cat expect_conflicts); do
-		grep -q "$sha1" merge_commit_msg ||
-		exit 1
-	done ) &&
-	# Verify contents of merge result
-	verify_notes m &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
+expecting success of 3203.13 'git branch --ignore-case --list -v pattern shows branch summaries': 
+	git branch --list --ignore-case -v BRANCH* >tmp &&
+	awk "{print \$NF}" <tmp >actual &&
+	test_cmp expect actual
 
-ok 13 - finalize conflicting merge (z => m)
+ok 13 - git branch --ignore-case --list -v pattern shows branch summaries
 
-expecting success of 3310.14 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	git update-ref refs/notes/m refs/notes/y &&
-	git config core.notesRef refs/notes/m &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+expecting success of 3203.14 'git branch -v pattern does not show branch summaries': 
+	test_must_fail git branch -v branch*
 
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-ok 14 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+fatal: 'branch*' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 14 - git branch -v pattern does not show branch summaries
 
-expecting success of 3310.15 'abort notes merge': 
-	git notes merge --abort &&
-	notes_merge_files_gone &&
-	# m has not moved (still == y)
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
+expecting success of 3203.15 'git branch `--show-current` shows current branch': 
+	cat >expect <<-\EOF &&
+	branch-two
+	EOF
+	git checkout branch-two &&
+	git branch --show-current >actual &&
+	test_cmp expect actual
 
-ok 15 - abort notes merge
+Switched to branch 'branch-two'
+ok 15 - git branch `--show-current` shows current branch
 
-expecting success of 3310.16 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+expecting success of 3203.16 'git branch `--show-current` is silent when detached HEAD': 
+	git checkout HEAD^0 &&
+	git branch --show-current >actual &&
+	test_must_be_empty 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'.
-ok 16 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+Note: switching to 'HEAD^0'.
 
-expecting success of 3310.17 'add + remove notes in finalized merge (z => m)': 
-	# Resolve one conflict
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
-y and z notes on 1st commit
-EOF
-	# Remove another conflict
-	rm .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
-	# Remove a D/F conflict
-	rm .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
-	# Add a new note
-	echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 &&
-	# Finalize merge
-	git notes merge --commit &&
-	notes_merge_files_gone &&
-	# Merge commit has pre-merge y and pre-merge z as parents
-	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
-	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
-	# Merge commit mentions the notes refs merged
-	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
-	grep -q refs/notes/m merge_commit_msg &&
-	grep -q refs/notes/z merge_commit_msg &&
-	# Merge commit mentions conflicting notes
-	grep -q "Conflicts" merge_commit_msg &&
-	( for sha1 in $(cat expect_conflicts); do
-		grep -q "$sha1" merge_commit_msg ||
-		exit 1
-	done ) &&
-	# Verify contents of merge result
-	verify_notes m &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 17 - add + remove notes in finalized merge (z => m)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 3310.18 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	git update-ref refs/notes/m refs/notes/y &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+  git switch -c <new-branch-name>
 
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-ok 18 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+Or undo this operation with:
 
-expecting success of 3310.19 'reset notes ref m to somewhere else (w)': 
-	git update-ref refs/notes/m refs/notes/w &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
+  git switch -
 
-ok 19 - reset notes ref m to somewhere else (w)
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3310.20 'fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)': 
-	# Resolve conflicts
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
-y and z notes on 1st commit
-EOF
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
-y and z notes on 4th commit
-EOF
-	# Fail to finalize merge
-	test_must_fail git notes merge --commit >output 2>&1 &&
-	# NOTES_MERGE_* refs and .git/NOTES_MERGE_* state files must remain
-	git rev-parse --verify NOTES_MERGE_PARTIAL &&
-	git rev-parse --verify NOTES_MERGE_REF &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha1 &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha2 &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
-	# Refs are unchanged
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
-	test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
-	test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
-	# Mention refs/notes/m, and its current and expected value in output
-	test_grep -q "refs/notes/m" output &&
-	test_grep -q "$(git rev-parse refs/notes/m)" output &&
-	test_grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
+HEAD is now at f39a923 one
+ok 16 - git branch `--show-current` is silent when detached HEAD
 
-26a551f04a7c1221699c120a3d0130f81d636003
-3147754abc2b58919a2c41c371fc0af47d45e199
-ok 20 - fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)
+expecting success of 3203.17 'git branch `--show-current` works properly when tag exists': 
+	cat >expect <<-\EOF &&
+	branch-and-tag-name
+	EOF
+	test_when_finished "
+		git checkout branch-one
+		git branch -D branch-and-tag-name
+	" &&
+	git checkout -b branch-and-tag-name &&
+	test_when_finished "git tag -d branch-and-tag-name" &&
+	git tag branch-and-tag-name &&
+	git branch --show-current >actual &&
+	test_cmp expect actual
 
-expecting success of 3310.21 'resolve situation by aborting the notes merge': 
-	git notes merge --abort &&
-	notes_merge_files_gone &&
-	# m has not moved (still == w)
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
+Switched to a new branch 'branch-and-tag-name'
+Deleted tag 'branch-and-tag-name' (was f39a923)
+Switched to branch 'branch-one'
+Deleted branch branch-and-tag-name (was f39a923).
+ok 17 - git branch `--show-current` works properly when tag exists
 
-ok 21 - resolve situation by aborting the notes merge
+expecting success of 3203.18 'git branch `--show-current` works properly with worktrees': 
+	cat >expect <<-\EOF &&
+	branch-one
+	branch-two
+	EOF
+	git checkout branch-one &&
+	test_when_finished "
+		git worktree remove worktree_dir
+	" &&
+	git worktree add worktree_dir branch-two &&
+	{
+		git branch --show-current &&
+		git -C worktree_dir branch --show-current
+	} >actual &&
+	test_cmp expect actual
 
-expecting success of 3310.22 'switch cwd before committing notes merge': 
-	git notes add -m foo HEAD &&
-	git notes --ref=other add -m bar HEAD &&
-	test_must_fail git notes merge refs/notes/other &&
-	(
-		cd .git/NOTES_MERGE_WORKTREE &&
-		echo "foo" > $(git rev-parse HEAD) &&
-		echo "bar" >> $(git rev-parse HEAD) &&
-		git notes merge --commit
-	) &&
-	git notes show HEAD > actual_notes &&
-	test_cmp expect_notes actual_notes
+Already on 'branch-one'
+Preparing worktree (checking out 'branch-two')
+HEAD is now at f39a923 one
+ok 18 - git branch `--show-current` works properly with worktrees
 
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-ok 22 - switch cwd before committing notes merge
+expecting success of 3203.19 'git branch shows detached HEAD properly': 
+	cat >expect <<EOF &&
+* (HEAD detached at $(git rev-parse --short HEAD^0))
+  branch-one
+  branch-two
+  main
+EOF
+	git checkout HEAD^0 &&
+	git branch >actual &&
+	test_cmp expect actual
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3321-notes-stripspace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3321-notes-stripspace/.git/
-expecting success of 3321.1 'setup the commit': 
-	test_commit 1st
+Note: switching to 'HEAD^0'.
 
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-ok 1 - setup the commit
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3321.2 'add note by editor': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	second-line
-	EOF
+  git switch -c <new-branch-name>
 
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add  &&
-	git notes show >actual &&
-	test_cmp expect actual
+Or undo this operation with:
 
+  git switch -
 
-first-line
+Turn off this advice by setting config variable advice.detachedHead to false
 
+HEAD is now at 5647d5f two
+ok 19 - git branch shows detached HEAD properly
 
-second-line
+expecting success of 3203.20 'git branch shows detached HEAD properly after checkout --detach': 
+	git checkout main &&
+	cat >expect <<EOF &&
+* (HEAD detached at $(git rev-parse --short HEAD^0))
+  branch-one
+  branch-two
+  main
+EOF
+	git checkout --detach &&
+	git branch >actual &&
+	test_cmp expect actual
 
-Removing note for object HEAD
-ok 2 - add note by editor
+Switched to branch 'main'
+HEAD is now at 5647d5f two
+ok 20 - git branch shows detached HEAD properly after checkout --detach
 
-expecting success of 3321.3 'add note by specifying single "-m", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+expecting success of 3203.21 'git branch shows detached HEAD properly after moving': 
+	cat >expect <<EOF &&
+* (HEAD detached from $(git rev-parse --short HEAD))
+  branch-one
+  branch-two
+  main
+EOF
+	git reset --hard HEAD^1 &&
+	git branch >actual &&
+	test_cmp expect actual
 
-	second-line
-	EOF
+HEAD is now at f39a923 one
+ok 21 - git branch shows detached HEAD properly after moving
 
-	git notes add -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
-	git notes show >actual &&
+expecting success of 3203.22 'git branch shows detached HEAD properly from tag': 
+	cat >expect <<EOF &&
+* (HEAD detached at fromtag)
+  branch-one
+  branch-two
+  main
+EOF
+	git tag fromtag main &&
+	git checkout fromtag &&
+	git branch >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-Removing note for object HEAD
-ok 3 - add note by specifying single "-m", "--stripspace" is the default behavior
-
-expecting success of 3321.4 'add note by specifying single "-m" and "--no-stripspace" ': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}first-line${MULTI_LF}second-line
-	EOF
+Previous HEAD position was f39a923 one
+HEAD is now at 5647d5f two
+ok 22 - git branch shows detached HEAD properly from tag
 
-	git notes add --no-stripspace \
-		      -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
-	git notes show >actual &&
+expecting success of 3203.23 'git branch shows detached HEAD properly after moving from tag': 
+	cat >expect <<EOF &&
+* (HEAD detached from fromtag)
+  branch-one
+  branch-two
+  main
+EOF
+	git reset --hard HEAD^1 &&
+	git branch >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 4 - add note by specifying single "-m" and "--no-stripspace" 
-
-expecting success of 3321.5 'add note by specifying multiple "-m", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+HEAD is now at f39a923 one
+ok 23 - git branch shows detached HEAD properly after moving from tag
 
-	second-line
+expecting success of 3203.24 'git branch `--sort=[-]objectsize` option': 
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-two
+	  branch-one
+	  main
 	EOF
-
-	git notes add -m "${LF}" \
-		      -m "first-line" \
-		      -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
-	git notes show >actual &&
+	git branch --sort=objectsize >actual &&
 	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -m "${LF}" \
-		      -m "first-line" \
-		      -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
-	git notes show >actual &&
-	test_cmp expect actual
-
-Removing note for object HEAD
-Removing note for object HEAD
-ok 5 - add note by specifying multiple "-m", "--stripspace" is the default behavior
 
-expecting success of 3321.6 'add notes by specifying multiple "-m" and "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line${LF}
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  main
+	  branch-two
 	EOF
-
-	git notes add --no-stripspace \
-		      -m "${LF}" \
-		      -m "first-line" \
-		      -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
-	git notes show >actual &&
+	git branch --sort=-objectsize >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 6 - add notes by specifying multiple "-m" and "--no-stripspace"
-
-expecting success of 3321.7 'add note by specifying single "-F", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+ok 24 - git branch `--sort=[-]objectsize` option
 
-	second-line
+expecting success of 3203.25 'git branch `--sort=[-]type` option': 
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  branch-two
+	  main
 	EOF
+	git branch --sort=type >actual &&
+	test_cmp expect actual &&
 
-	cat >note-file <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  branch-two
+	  main
 	EOF
+	git branch --sort=-type >actual &&
+	test_cmp expect actual
 
-	git notes add -F note-file &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -F note-file &&
-	git notes show >actual
-
-Removing note for object HEAD
-Removing note for object HEAD
-ok 7 - add note by specifying single "-F", "--stripspace" is the default behavior
+ok 25 - git branch `--sort=[-]type` option
 
-expecting success of 3321.8 'add note by specifying single "-F" and "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
+expecting success of 3203.26 'git branch `--sort=[-]version:refname` option': 
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  branch-two
+	  main
 	EOF
+	git branch --sort=version:refname >actual &&
+	test_cmp expect actual &&
 
-	cat >note-file <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  main
+	  branch-two
+	  branch-one
 	EOF
-
-	git notes add --no-stripspace -F note-file &&
-	git notes show >actual &&
+	git branch --sort=-version:refname >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 8 - add note by specifying single "-F" and "--no-stripspace"
-
-expecting success of 3321.9 'add note by specifying multiple "-F", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	file-1-first-line
+ok 26 - git branch `--sort=[-]version:refname` option
 
-	file-1-second-line
+expecting success of 3203.27 'git branch --points-at option': 
+	cat >expect <<-\EOF &&
+	  branch-one
+	  main
+	EOF
+	git branch --points-at=branch-one >actual &&
+	test_cmp expect actual
 
-	file-2-first-line
+ok 27 - git branch --points-at option
 
-	file-2-second-line
-	EOF
+expecting success of 3203.28 'ambiguous branch/tag not marked': 
+	git tag ambiguous &&
+	git branch ambiguous &&
+	echo "  ambiguous" >expect &&
+	git branch --list ambiguous >actual &&
+	test_cmp expect actual
 
-	cat >note-file-1 <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
-	EOF
+ok 28 - ambiguous branch/tag not marked
 
-	cat >note-file-2 <<-EOF &&
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
+expecting success of 3203.29 'local-branch symrefs shortened properly': 
+	git symbolic-ref refs/heads/ref-to-branch refs/heads/branch-one &&
+	git symbolic-ref refs/heads/ref-to-remote refs/remotes/origin/branch-one &&
+	cat >expect <<-\EOF &&
+	  ref-to-branch -> branch-one
+	  ref-to-remote -> origin/branch-one
 	EOF
-
-	git notes add -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
+	git branch >actual.raw &&
+	grep ref-to <actual.raw >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-Removing note for object HEAD
-ok 9 - add note by specifying multiple "-F", "--stripspace" is the default behavior
-
-expecting success of 3321.10 'add note by specifying multiple "-F" with "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
+ok 29 - local-branch symrefs shortened properly
 
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
-	EOF
+expecting success of 3203.30 'sort branches, ignore case': 
+	(
+		git init -b main sort-icase &&
+		cd sort-icase &&
+		test_commit initial &&
+		git branch branch-one &&
+		git branch BRANCH-two &&
+		git branch --list | awk "{print \$NF}" >actual &&
+		cat >expected <<-\EOF &&
+		BRANCH-two
+		branch-one
+		main
+		EOF
+		test_cmp expected actual &&
+		git branch --list -i | awk "{print \$NF}" >actual &&
+		cat >expected <<-\EOF &&
+		branch-one
+		BRANCH-two
+		main
+		EOF
+		test_cmp expected actual
+	)
 
-	cat >note-file-1 <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3203-branch-output/sort-icase/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 30 - sort branches, ignore case
 
-	cat >note-file-2 <<-EOF &&
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
+expecting success of 3203.31 'git branch --format option': 
+	cat >expect <<-\EOF &&
+	Refname is (HEAD detached from fromtag)
+	Refname is refs/heads/ambiguous
+	Refname is refs/heads/branch-one
+	Refname is refs/heads/branch-two
+	Refname is refs/heads/main
+	Refname is refs/heads/ref-to-branch
+	Refname is refs/heads/ref-to-remote
 	EOF
-
-	git notes add --no-stripspace -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
+	git branch --format="Refname is %(refname)" >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 10 - add note by specifying multiple "-F" with "--no-stripspace"
-
-expecting success of 3321.11 'append note by editor': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+ok 31 - git branch --format option
 
-	second-line
+expecting success of 3203.32 'git branch --format with ahead-behind': 
+	cat >expect <<-\EOF &&
+	(HEAD detached from fromtag) 0 0
+	refs/heads/ambiguous 0 0
+	refs/heads/branch-one 1 0
+	refs/heads/branch-two 0 0
+	refs/heads/main 1 0
+	refs/heads/ref-to-branch 1 0
+	refs/heads/ref-to-remote 1 0
 	EOF
-
-	git notes add -m "first-line" &&
-	MSG="${MULTI_LF}second-line${LF}" git notes append  &&
-	git notes show >actual &&
+	git branch --format="%(refname) %(ahead-behind:HEAD)" >actual &&
 	test_cmp expect actual
 
+ok 32 - git branch --format with ahead-behind
 
+expecting success of 3203.33 'git branch with --format=%(rest) must fail': 
+	test_must_fail git branch --format="%(rest)" >actual
 
+fatal: this command reject atom %(rest)
+ok 33 - git branch with --format=%(rest) must fail
 
-second-line
-
-Removing note for object HEAD
-ok 11 - append note by editor
-
-expecting success of 3321.12 'append note by specifying single "-m"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+expecting success of 3203.34 'git branch --format --omit-empty': 
+	cat >expect <<-\EOF &&
+	Refname is (HEAD detached from fromtag)
+	Refname is refs/heads/ambiguous
+	Refname is refs/heads/branch-one
+	Refname is refs/heads/branch-two
 
-	second-line
+	Refname is refs/heads/ref-to-branch
+	Refname is refs/heads/ref-to-remote
 	EOF
-
-	git notes add -m "${LF}first-line" &&
-	git notes append -m "${MULTI_LF}second-line${LF}" &&
-	git notes show >actual &&
+	git branch --format="%(if:notequals=refs/heads/main)%(refname)%(then)Refname is %(refname)%(end)" >actual &&
+	test_cmp expect actual &&
+	cat >expect <<-\EOF &&
+	Refname is (HEAD detached from fromtag)
+	Refname is refs/heads/ambiguous
+	Refname is refs/heads/branch-one
+	Refname is refs/heads/branch-two
+	Refname is refs/heads/ref-to-branch
+	Refname is refs/heads/ref-to-remote
+	EOF
+	git branch --omit-empty --format="%(if:notequals=refs/heads/main)%(refname)%(then)Refname is %(refname)%(end)" >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 12 - append note by specifying single "-m"
+ok 34 - git branch --format --omit-empty
 
-expecting success of 3321.13 'append note by specifying multiple "-m"': 
-	test_when_finished "git notes remove" &&
+expecting success of 3203.35 'worktree colors correct': 
 	cat >expect <<-EOF &&
-	first-line
-
-	second-line
+	* <GREEN>(HEAD detached from fromtag)<RESET>
+	  ambiguous<RESET>
+	  branch-one<RESET>
+	+ <CYAN>branch-two<RESET>
+	  main<RESET>
+	  ref-to-branch<RESET> -> branch-one
+	  ref-to-remote<RESET> -> origin/branch-one
 	EOF
-
-	git notes add -m "${LF}first-line" &&
-	git notes append -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
-	git notes show >actual &&
+	git worktree add worktree_dir branch-two &&
+	git branch --color >actual.raw &&
+	rm -r worktree_dir &&
+	git worktree prune &&
+	test_decode_color <actual.raw >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 13 - append note by specifying multiple "-m"
-
-expecting success of 3321.14 'add note by specifying single "-F"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+Preparing worktree (checking out 'branch-two')
+HEAD is now at f39a923 one
+ok 35 - worktree colors correct
 
-	second-line
-	EOF
+expecting success of 3203.36 'set up color tests': 
+	echo "<RED>main<RESET>" >expect.color &&
+	echo "main" >expect.bare &&
+	color_args="--format=%(color:red)%(refname:short) --list main"
 
-	cat >note-file <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
-	EOF
+ok 36 - set up color tests
 
-	git notes add -F note-file &&
-	git notes show >actual &&
-	test_cmp expect actual
+expecting success of 3203.37 '%(color) omitted without tty': 
+	TERM=vt100 git branch $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.bare actual
 
-Removing note for object HEAD
-ok 14 - add note by specifying single "-F"
+ok 37 - %(color) omitted without tty
 
-expecting success of 3321.15 'add notes by specifying multiple "-F"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	file-1-first-line
+checking prerequisite: TTY
 
-	file-1-second-line
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-	file-2-first-line
+	# 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 &&
 
-	file-2-second-line
-	EOF
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-	cat >note-file-1 <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
-	EOF
+)
+prerequisite TTY ok
+expecting success of 3203.38 '%(color) present with tty': 
+	test_terminal git branch $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
 
-	cat >note-file-2 <<-EOF &&
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
-	EOF
+ok 38 - %(color) present with tty
 
-	git notes add -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
-	test_cmp expect actual
+expecting success of 3203.39 '--color overrides auto-color': 
+	git branch --color $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
 
-Removing note for object HEAD
-ok 15 - add notes by specifying multiple "-F"
+ok 39 - --color overrides auto-color
 
-expecting success of 3321.16 'append note by specifying single "-F"': 
-	test_when_finished "git notes remove" &&
+expecting success of 3203.40 'verbose output lists worktree path': 
+	one=$(git rev-parse --short HEAD) &&
+	two=$(git rev-parse --short main) &&
 	cat >expect <<-EOF &&
-	initial-line
-
-	first-line
-
-	second-line
-	EOF
-
-	cat >note-file <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
+	* (HEAD detached from fromtag) $one one
+	  ambiguous                    $one one
+	  branch-one                   $two two
+	+ branch-two                   $one ($(pwd)/worktree_dir) one
+	  main                         $two two
+	  ref-to-branch                $two two
+	  ref-to-remote                $two two
 	EOF
-
-	git notes add -m "initial-line" &&
-	git notes append -F note-file &&
-	git notes show >actual &&
+	git worktree add worktree_dir branch-two &&
+	git branch -vv >actual &&
+	rm -r worktree_dir &&
+	git worktree prune &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 16 - append note by specifying single "-F"
-
-expecting success of 3321.17 'append notes by specifying multiple "-F"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	initial-line
+Preparing worktree (checking out 'branch-two')
+HEAD is now at f39a923 one
+ok 40 - verbose output lists worktree path
 
-	file-1-first-line
+# passed all 40 test(s)
+1..40
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3211-peel-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3211-peel-ref/.git/
+expecting success of 3211.1 'create annotated tag in refs/tags': 
+	test_commit base &&
+	git tag -m annotated foo
 
-	file-1-second-line
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 1 - create annotated tag in refs/tags
 
-	file-2-first-line
+expecting success of 3211.2 'create annotated tag outside of refs/tags': 
+	git update-ref refs/outside/foo refs/tags/foo
 
-	file-2-second-line
-	EOF
+ok 2 - create annotated tag outside of refs/tags
 
-	cat >note-file-1 <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
-	EOF
+expecting success of 3211.3 'set up expected show-ref output': 
+	{
+		print_ref "refs/heads/main" &&
+		print_ref "refs/outside/foo" &&
+		print_ref "refs/outside/foo^{}" &&
+		print_ref "refs/tags/base" &&
+		print_ref "refs/tags/foo" &&
+		print_ref "refs/tags/foo^{}"
+	} >expect
 
-	cat >note-file-2 <<-EOF &&
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
-	EOF
+ok 3 - set up expected show-ref output
 
-	git notes add -m "initial-line" &&
-	git notes append -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
+expecting success of 3211.4 'refs are peeled outside of refs/tags (loose)': 
+	git show-ref -d >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 17 - append notes by specifying multiple "-F"
+ok 4 - refs are peeled outside of refs/tags (loose)
 
-expecting success of 3321.18 'append note by specifying multiple "-F" with "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	initial-line
-	${LF}${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
+expecting success of 3211.5 'refs are peeled outside of refs/tags (packed)': 
+	git pack-refs --all &&
+	git show-ref -d >actual &&
+	test_cmp expect actual
 
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
-	EOF
+ok 5 - refs are peeled outside of refs/tags (packed)
 
-	cat >note-file-1 <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
-	EOF
+expecting success of 3211.6 'create old-style pack-refs without fully-peeled': 
+	# Git no longer writes without fully-peeled, so we just write our own
+	# from scratch; we could also munge the existing file to remove the
+	# fully-peeled bits, but that seems even more prone to failure,
+	# especially if the format ever changes again. At least this way we
+	# know we are emulating exactly what an older git would have written.
+	{
+		echo "# pack-refs with: peeled " &&
+		print_ref "refs/heads/main" &&
+		print_ref "refs/outside/foo" &&
+		print_ref "refs/tags/base" &&
+		print_ref "refs/tags/foo" &&
+		echo "^$(git rev-parse "refs/tags/foo^{}")"
+	} >tmp &&
+	mv tmp .git/packed-refs
 
-	cat >note-file-2 <<-EOF &&
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
-	EOF
+ok 6 - create old-style pack-refs without fully-peeled
 
-	git notes add -m "initial-line" &&
-	git notes append --no-stripspace -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
+expecting success of 3211.7 'refs are peeled outside of refs/tags (old packed)': 
+	git show-ref -d >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 18 - append note by specifying multiple "-F" with "--no-stripspace"
+ok 7 - refs are peeled outside of refs/tags (old packed)
 
-expecting success of 3321.19 'add notes with empty messages': 
-	rev=$(git rev-parse HEAD) &&
-	git notes add -m "${LF}" \
-		      -m "${MULTI_LF}" \
-		      -m "${LF}" >actual 2>&1 &&
-	test_grep "Removing note for object" actual
+expecting success of 3211.8 'peeled refs survive deletion of packed ref': 
+	git pack-refs --all &&
+	cp .git/packed-refs fully-peeled &&
+	git branch yadda &&
+	git pack-refs --all &&
+	git branch -d yadda &&
+	test_cmp fully-peeled .git/packed-refs
 
-Removing note for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-ok 19 - add notes with empty messages
+Deleted branch yadda (was d1ff1c9).
+ok 8 - peeled refs survive deletion of packed ref
 
-expecting success of 3321.20 'add note by specifying "-C", "--no-stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3202-show-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3202-show-branch/.git/
+expecting success of 3202.1 'error descriptions on empty repository': 
+	current=$(git branch --show-current) &&
 	cat >expect <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
+	error: no commit on branch '$current' yet
 	EOF
-
-	git hash-object -w --stdin <expect >blob &&
-	git notes add -C $(cat blob) &&
-	git notes show >actual &&
+	test_must_fail git branch --edit-description 2>actual &&
 	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --no-stripspace -C $(cat blob) &&
-	git notes show >actual &&
+	test_must_fail git branch --edit-description $current 2>actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-Removing note for object HEAD
-ok 20 - add note by specifying "-C", "--no-stripspace" is the default behavior
-
-expecting success of 3321.21 'reuse note by specifying "-C" and "--stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >data <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
-	EOF
+ok 1 - error descriptions on empty repository
 
+expecting success of 3202.2 'fatal descriptions on empty repository': 
+	current=$(git branch --show-current) &&
 	cat >expect <<-EOF &&
-	first-line
-
-	second-line
+	fatal: no commit on branch '$current' yet
 	EOF
-
-	git hash-object -w --stdin <data >blob &&
-	git notes add --stripspace -C $(cat blob) &&
-	git notes show >actual &&
+	test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch -c new-branch 2>actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 21 - reuse note by specifying "-C" and "--stripspace"
+ok 2 - fatal descriptions on empty repository
 
-expecting success of 3321.22 'reuse with "-C" and add note with "-m", "-m" will stripspace all together': 
-	test_when_finished "git notes remove" &&
-	cat >data <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
+expecting success of 3202.3 'setup': 
+	test_commit initial &&
+	for i in $(test_seq 1 10)
+	do
+		git checkout -b branch$i initial &&
+		test_commit --no-tag branch$i || return 1
+	done &&
+	git for-each-ref \
+		--sort=version:refname \
+		--format="%(refname:strip=2)" \
+		"refs/heads/branch*" >branches.sorted &&
+	sed "s/^> //" >expect <<-\EOF
+	> ! [branch1] branch1
+	>  ! [branch2] branch2
+	>   ! [branch3] branch3
+	>    ! [branch4] branch4
+	>     ! [branch5] branch5
+	>      ! [branch6] branch6
+	>       ! [branch7] branch7
+	>        ! [branch8] branch8
+	>         ! [branch9] branch9
+	>          * [branch10] branch10
+	> ----------
+	>          * [branch10] branch10
+	>         +  [branch9] branch9
+	>        +   [branch8] branch8
+	>       +    [branch7] branch7
+	>      +     [branch6] branch6
+	>     +      [branch5] branch5
+	>    +       [branch4] branch4
+	>   +        [branch3] branch3
+	>  +         [branch2] branch2
+	> +          [branch1] branch1
+	> +++++++++* [branch10^] initial
 	EOF
 
-	cat >expect <<-EOF &&
-	first-line
-
-	second-line
-
-	third-line
-	EOF
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'branch1'
+[branch1 39d0a3f] branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch1.t
+Switched to a new branch 'branch2'
+[branch2 bcd9857] branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch2.t
+Switched to a new branch 'branch3'
+[branch3 6401a40] branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch3.t
+Switched to a new branch 'branch4'
+[branch4 831d58d] branch4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch4.t
+Switched to a new branch 'branch5'
+[branch5 d4d852d] branch5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch5.t
+Switched to a new branch 'branch6'
+[branch6 3af5e35] branch6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch6.t
+Switched to a new branch 'branch7'
+[branch7 0cecb11] branch7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch7.t
+Switched to a new branch 'branch8'
+[branch8 48b5688] branch8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch8.t
+Switched to a new branch 'branch9'
+[branch9 b82e556] branch9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch9.t
+Switched to a new branch 'branch10'
+[branch10 3b327e0] branch10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch10.t
+ok 3 - setup
 
-	git hash-object -w --stdin <data >blob &&
-	git notes add -C $(cat blob) -m "third-line" &&
-	git notes show >actual &&
+expecting success of 3202.4 'show-branch with more than 8 branches': 
+	git show-branch $(cat branches.sorted) >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 22 - reuse with "-C" and add note with "-m", "-m" will stripspace all together
-
-expecting success of 3321.23 'add note with "-m" and reuse note with "-C", "-C" will not stripspace all together': 
-	test_when_finished "git notes remove" &&
-	cat >data <<-EOF &&
-
-	second-line
-	EOF
-
-	cat >expect <<-EOF &&
-	first-line
-	${LF}
-	second-line
-	EOF
+ok 4 - show-branch with more than 8 branches
 
-	git hash-object -w --stdin <data >blob &&
-	git notes add -m "first-line" -C $(cat blob)  &&
-	git notes show >actual &&
+expecting success of 3202.5 'show-branch with showbranch.default': 
+	for branch in $(cat branches.sorted)
+	do
+		test_config showbranch.default $branch --add || return 1
+	done &&
+	git show-branch >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 23 - add note with "-m" and reuse note with "-C", "-C" will not stripspace all together
-
-expecting success of 3321.24 'add note by specifying "-c", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+ok 5 - show-branch with showbranch.default
 
-	second-line
+expecting success of 3202.6 'show-branch --color output': 
+	sed "s/^> //" >expect <<-\EOF &&
+	> <RED>!<RESET> [branch1] branch1
+	>  <GREEN>!<RESET> [branch2] branch2
+	>   <YELLOW>!<RESET> [branch3] branch3
+	>    <BLUE>!<RESET> [branch4] branch4
+	>     <MAGENTA>!<RESET> [branch5] branch5
+	>      <CYAN>!<RESET> [branch6] branch6
+	>       <BOLD;RED>!<RESET> [branch7] branch7
+	>        <BOLD;GREEN>!<RESET> [branch8] branch8
+	>         <BOLD;YELLOW>!<RESET> [branch9] branch9
+	>          <BOLD;BLUE>*<RESET> [branch10] branch10
+	> ----------
+	>          <BOLD;BLUE>*<RESET> [branch10] branch10
+	>         <BOLD;YELLOW>+<RESET>  [branch9] branch9
+	>        <BOLD;GREEN>+<RESET>   [branch8] branch8
+	>       <BOLD;RED>+<RESET>    [branch7] branch7
+	>      <CYAN>+<RESET>     [branch6] branch6
+	>     <MAGENTA>+<RESET>      [branch5] branch5
+	>    <BLUE>+<RESET>       [branch4] branch4
+	>   <YELLOW>+<RESET>        [branch3] branch3
+	>  <GREEN>+<RESET>         [branch2] branch2
+	> <RED>+<RESET>          [branch1] branch1
+	> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
 	EOF
-
-	echo "initial-line" | git hash-object -w --stdin >blob &&
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add -c $(cat blob) &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add --stripspace -c $(cat blob) &&
-	git notes show >actual &&
+	git show-branch --color=always $(cat branches.sorted) >actual.raw &&
+	test_decode_color <actual.raw >actual &&
 	test_cmp expect actual
 
+ok 6 - show-branch --color output
 
-first-line
-
+expecting success of 3202.7 'show branch --remotes': 
+	cat >expect.err <<-\EOF &&
+	No revs to be shown.
+	EOF
+	git show-branch -r 2>actual.err >actual.out &&
+	test_cmp expect.err actual.err &&
+	test_must_be_empty actual.out
 
-second-line
+ok 7 - show branch --remotes
 
-Removing note for object HEAD
+expecting success of 3202.8 'show-branch --sparse': 
+	test_when_finished "git checkout branch10 && git branch -D branchA" &&
+	git checkout -b branchA branch10 &&
+	git merge -s ours -m "merge 1 and 10 to make A" branch1 &&
+	git commit --allow-empty -m "another" &&
 
-first-line
+	git show-branch --sparse >out &&
+	grep "merge 1 and 10 to make A" out &&
 
+	git show-branch >out &&
+	! grep "merge 1 and 10 to make A" out &&
 
-second-line
+	git show-branch --no-sparse >out &&
+	! grep "merge 1 and 10 to make A" out
 
-Removing note for object HEAD
-ok 24 - add note by specifying "-c", "--stripspace" is the default behavior
+Switched to a new branch 'branchA'
+Merge made by the 'ours' strategy.
+[branchA 711c132] another
+ Author: A U Thor <author@example.com>
+          -  [branchA^] merge 1 and 10 to make A
+Switched to branch 'branch10'
+Deleted branch branchA (was 711c132).
+ok 8 - show-branch --sparse
 
-expecting success of 3321.25 'add note by specifying "-c" with "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}first-line${MULTI_LF}second-line${LF}
+expecting success of 3202.9 'setup show branch --list': 
+	sed "s/^> //" >expect <<-\EOF
+	>   [branch1] branch1
+	>   [branch2] branch2
+	>   [branch3] branch3
+	>   [branch4] branch4
+	>   [branch5] branch5
+	>   [branch6] branch6
+	>   [branch7] branch7
+	>   [branch8] branch8
+	>   [branch9] branch9
+	> * [branch10] branch10
 	EOF
 
-	echo "initial-line" | git hash-object -w --stdin >blob &&
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add --no-stripspace -c $(cat blob) &&
-	git notes show >actual &&
+ok 9 - setup show branch --list
+
+expecting success of 3202.10 'show branch --list': 
+	git show-branch --list $(cat branches.sorted) >actual &&
 	test_cmp expect actual
 
+ok 10 - show branch --list
 
-first-line
+expecting success of 3202.11 'show branch --list has no --color output': 
+	git show-branch --color=always --list $(cat branches.sorted) >actual &&
+	test_cmp expect actual
 
+ok 11 - show branch --list has no --color output
 
-second-line
+expecting success of 3202.12 'show branch --merge-base with one argument': 
+	for branch in $(cat branches.sorted)
+	do
+		git rev-parse $branch >expect &&
+		git show-branch --merge-base $branch >actual &&
+		test_cmp expect actual || return 1
+	done
 
-Removing note for object HEAD
-ok 25 - add note by specifying "-c" with "--no-stripspace"
+ok 12 - show branch --merge-base with one argument
 
-expecting success of 3321.26 'edit note by specifying "-c", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+expecting success of 3202.13 'show branch --merge-base with two arguments': 
+	for branch in $(cat branches.sorted)
+	do
+		git rev-parse initial >expect &&
+		git show-branch --merge-base initial $branch >actual &&
+		test_cmp expect actual || return 1
+	done
 
-	second-line
-	EOF
+ok 13 - show branch --merge-base with two arguments
 
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes edit &&
-	git notes show >actual &&
+expecting success of 3202.14 'show branch --merge-base with N arguments': 
+	git rev-parse initial >expect &&
+	git show-branch --merge-base $(cat branches.sorted) >actual &&
 	test_cmp expect actual &&
-	git notes remove &&
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes edit --stripspace &&
-	git notes show >actual &&
-	test_cmp expect actual
 
+	git merge-base $(cat branches.sorted) >actual &&
+	test_cmp expect actual
 
-first-line
+ok 14 - show branch --merge-base with N arguments
 
+expecting success of 3202.15 'show-branch --all --reflog (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+fatal: options '--reflog' and '--all/--remotes/--independent/--merge-base' cannot be used together
+ok 15 - show-branch --all --reflog (should fail)
 
-second-line
+expecting success of 3202.16 'show-branch --merge-base --reflog (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
+ok 16 - show-branch --merge-base --reflog (should fail)
 
-Removing note for object HEAD
+expecting success of 3202.17 'show-branch --list --merge-base (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
+ok 17 - show-branch --list --merge-base (should fail)
 
-first-line
+expecting success of 3202.18 'show-branch --reflog --current (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+fatal: options '--reflog' and '--current' cannot be used together
+ok 18 - show-branch --reflog --current (should fail)
 
+expecting success of 3202.19 'show-branch --no-topo-order (should fail)': 
+		test_must_fail git show-branch --no-$opt 2>err &&
+		grep "unknown option .no-$opt." err
+	
+error: unknown option `no-topo-order'
+ok 19 - show-branch --no-topo-order (should fail)
 
-second-line
+expecting success of 3202.20 'show-branch --no-date-order (should fail)': 
+		test_must_fail git show-branch --no-$opt 2>err &&
+		grep "unknown option .no-$opt." err
+	
+error: unknown option `no-date-order'
+ok 20 - show-branch --no-date-order (should fail)
 
-Removing note for object HEAD
-ok 26 - edit note by specifying "-c", "--stripspace" is the default behavior
+expecting success of 3202.21 'show-branch --no-reflog (should fail)': 
+		test_must_fail git show-branch --no-$opt 2>err &&
+		grep "unknown option .no-$opt." err
+	
+error: unknown option `no-reflog'
+ok 21 - show-branch --no-reflog (should fail)
 
-expecting success of 3321.27 'edit note by specifying "-c" with "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
+expecting success of 3202.22 'error descriptions on non-existent branch': 
 	cat >expect <<-EOF &&
-	${LF}first-line${MULTI_LF}second-line${LF}
+	error: no branch named 'non-existent'
 	EOF
-
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add --no-stripspace &&
-	git notes show >actual &&
+	test_must_fail git branch --edit-description non-existent 2>actual &&
 	test_cmp expect actual
 
+ok 22 - error descriptions on non-existent branch
 
-first-line
-
-
-second-line
-
-Removing note for object HEAD
-ok 27 - edit note by specifying "-c" with "--no-stripspace"
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3402-rebase-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3402-rebase-merge/.git/
-expecting success of 3402.1 'setup': 
-	git add original &&
-	git commit -m"initial" &&
-	git branch side &&
-	echo "11 $T" >>original &&
-	git commit -a -m"main updates a bit." &&
+expecting success of 3202.23 'fatal descriptions on non-existent branch': 
+	cat >expect <<-EOF &&
+	fatal: branch 'non-existent' does not exist
+	EOF
+	test_must_fail git branch --set-upstream-to=non-existent non-existent 2>actual &&
+	test_cmp expect actual &&
 
-	echo "12 $T" >>original &&
-	git commit -a -m"main updates a bit more." &&
+	cat >expect <<-EOF &&
+	fatal: no branch named 'non-existent'
+	EOF
+	test_must_fail git branch -c non-existent new-branch 2>actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch -m non-existent new-branch 2>actual &&
+	test_cmp expect actual
 
-	git checkout side &&
-	(echo "0 $T" && cat original) >renamed &&
-	git add renamed &&
-	git update-index --force-remove original &&
-	git commit -a -m"side renames and edits." &&
+ok 23 - fatal descriptions on non-existent branch
 
-	tr "[a-z]" "[A-Z]" <original >newfile &&
-	git add newfile &&
-	git commit -a -m"side edits further." &&
-	git branch second-side &&
+expecting success of 3202.24 'error descriptions on orphan branch': 
+	test_when_finished git worktree remove -f wt &&
+	git worktree add wt --detach &&
+	git -C wt checkout --orphan orphan-branch &&
+	test_branch_op_in_wt() {
+		test_orphan_error() {
+			test_must_fail git $* 2>actual &&
+			test_grep "no commit on branch .orphan-branch. yet$" actual
+		} &&
+		test_orphan_error -C wt branch $1 $2 &&                # implicit branch
+		test_orphan_error -C wt branch $1 orphan-branch $2 &&  # explicit branch
+		test_orphan_error branch $1 orphan-branch $2           # different worktree
+	} &&
+	test_branch_op_in_wt --edit-description &&
+	test_branch_op_in_wt --set-upstream-to=ne &&
+	test_branch_op_in_wt -c new-branch
 
-	tr "[a-m]" "[A-M]" <original >newfile &&
-	rm -f original &&
-	git commit -a -m"side edits once again." &&
+Preparing worktree (detached HEAD 3b327e0)
+HEAD is now at 3b327e0 branch10
+Switched to a new branch 'orphan-branch'
+error: no commit on branch 'orphan-branch' yet
+error: no commit on branch 'orphan-branch' yet
+error: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+ok 24 - error descriptions on orphan branch
 
-	git branch test-rebase side &&
-	git branch test-rebase-pick side &&
-	git branch test-reference-pick side &&
-	git branch test-conflicts side &&
-	git checkout -b test-merge side
+expecting success of 3202.25 'setup reflogs': 
+	test_commit base &&
+	git checkout -b branch &&
+	test_commit one &&
+	git reset --hard HEAD^ &&
+	test_commit two &&
+	test_commit three
 
-[main (root-commit) ea140ad] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+)
- create mode 100644 original
-[main 3fbedc5] main updates a bit.
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[main 9d5d029] main updates a bit more.
+[branch10 4c99dd1] base
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'side'
-[side 2f3019a] side renames and edits.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'branch'
+[branch 6203781] one
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename original => renamed (90%)
-[side e99fe16] side edits further.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+HEAD is now at 4c99dd1 base
+[branch 9c7919e] two
  Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+)
- create mode 100644 newfile
-[side 5203c39] side edits once again.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[branch 0d1aba5] three
  Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+), 20 deletions(-)
-Switched to a new branch 'test-merge'
-ok 1 - setup
-
-expecting success of 3402.2 'reference merge': 
-	git merge -s recursive -m "reference merge" main
-
-Auto-merging renamed
-Merge made by the 'ort' strategy.
- renamed | 4 ++++
- 1 file changed, 4 insertions(+)
-ok 2 - reference merge
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 25 - setup reflogs
 
-expecting success of 3402.3 'rebase': 
-	git checkout test-rebase &&
-	GIT_TRACE=1 git rebase --merge main
+expecting success of 3202.26 '--reflog shows reflog entries': 
+	cat >expect <<-\EOF &&
+	! [branch@{0}] (0 seconds ago) commit: three
+	 ! [branch@{1}] (60 seconds ago) commit: two
+	  ! [branch@{2}] (2 minutes ago) reset: moving to HEAD^
+	   ! [branch@{3}] (2 minutes ago) commit: one
+	----
+	+    [branch@{0}] three
+	++   [branch@{1}] two
+	   + [branch@{3}] one
+	++++ [branch@{2}] base
+	EOF
+	# the output always contains relative timestamps; use
+	# a known time to get deterministic results
+	GIT_TEST_DATE_NOW=$test_tick \
+	git show-branch --reflog branch >actual &&
+	test_cmp expect actual
 
-Switched to branch 'test-rebase'
-trace: built-in: git rebase --merge main
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
trace: run_command: git notes copy --for-rewrite=rebase
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' notes copy --for-rewrite=rebase
-trace: built-in: git notes copy --for-rewrite=rebase
-Successfully rebased and updated refs/heads/test-rebase.
-ok 3 - rebase
+ok 26 - --reflog shows reflog entries
 
-expecting success of 3402.4 'test-rebase@{1} is pre rebase': 
-	test $PRE_REBASE = $(git rev-parse test-rebase@{1})
+expecting success of 3202.27 '--reflog handles missing reflog': 
+	git reflog expire --expire=now branch &&
+	git show-branch --reflog branch >actual &&
+	test_must_be_empty actual
 
-ok 4 - test-rebase@{1} is pre rebase
+No revs to be shown.
+ok 27 - --reflog handles missing reflog
 
-expecting success of 3402.5 'merge and rebase should match': 
-	git diff-tree -r test-rebase test-merge >difference &&
-	if test -s difference
-	then
-		cat difference
-		false
-	else
-		echo happy
-	fi
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3300-funny-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3300-funny-names/.git/
+expecting success of 3300.1 'setup': 
+	cat >"$p0" <<-\EOF &&
+	1. A quick brown fox jumps over the lazy cat, oops dog.
+	2. A quick brown fox jumps over the lazy cat, oops dog.
+	3. A quick brown fox jumps over the lazy cat, oops dog.
+	EOF
 
-happy
-ok 5 - merge and rebase should match
+	{ cat "$p0" >"$p1" || :; } &&
+	{ echo "Foo Bar Baz" >"$p2" || :; }
 
-expecting success of 3402.6 'rebase the other way': 
-	git reset --hard main &&
-	git rebase --merge side
+ok 1 - setup
 
-HEAD is now at 9d5d029 main updates a bit more.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test-rebase.
-ok 6 - rebase the other way
+expecting success of 3300.2 'setup: populate index and tree': 
+	git update-index --add "$p0" "$p2" &&
+	t0=$(git write-tree)
 
-expecting success of 3402.7 'rebase -Xtheirs': 
-	git checkout -b conflicting main~2 &&
-	echo "AB $T" >> original &&
-	git commit -mconflicting original &&
-	git rebase -Xtheirs main &&
-	grep AB original &&
-	! grep 11 original
+ok 2 - setup: populate index and tree
 
-Switched to a new branch 'conflicting'
-[conflicting 0a8644e] conflicting
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Rebasing (1/1)
Successfully rebased and updated refs/heads/conflicting.
-AB A quick brown fox
-ok 7 - rebase -Xtheirs
+expecting success of 3300.3 'ls-files prints space in filename verbatim': 
+	printf "%s\n" "just space" no-funny >expected &&
+	git ls-files >current &&
+	test_cmp expected current
 
-expecting success of 3402.8 'rebase -Xtheirs from orphan': 
-	git checkout --orphan orphan-conflicting main~2 &&
-	echo "AB $T" >> original &&
-	git commit -morphan-conflicting original &&
-	git rebase -Xtheirs main &&
-	grep AB original &&
-	! grep 11 original
+ok 3 - ls-files prints space in filename verbatim
 
-Switched to a new branch 'orphan-conflicting'
-[orphan-conflicting (root-commit) 9b6ca42] orphan-conflicting
- Author: A U Thor <author@example.com>
- 1 file changed, 22 insertions(+)
- create mode 100644 original
-Rebasing (1/1)
Successfully rebased and updated refs/heads/orphan-conflicting.
-AB A quick brown fox
-ok 8 - rebase -Xtheirs from orphan
+expecting success of 3300.4 'setup: add funny filename': 
+	git update-index --add "$p1" &&
+	t1=$(git write-tree)
 
-expecting success of 3402.9 'merge and rebase should match': 
-	git diff-tree -r test-rebase test-merge >difference &&
-	if test -s difference
-	then
-		cat difference
-		false
-	else
-		echo happy
-	fi
+ok 4 - setup: add funny filename
 
-happy
-ok 9 - merge and rebase should match
+expecting success of 3300.5 'ls-files quotes funny filename': 
+	cat >expected <<-\EOF &&
+	just space
+	no-funny
+	"tabs\t,\" (dq) and spaces"
+	EOF
+	git ls-files >current &&
+	test_cmp expected current
 
-expecting success of 3402.10 'picking rebase': 
-	git reset --hard side &&
-	git rebase --merge --onto main side^^ &&
-	mb=$(git merge-base main HEAD) &&
-	if test "$mb" = "$(git rev-parse main)"
-	then
-		echo happy
-	else
-		git show-branch
-		false
-	fi &&
-	f=$(git diff-tree --name-only HEAD^ HEAD) &&
-	g=$(git diff-tree --name-only HEAD^^ HEAD^) &&
-	case "$f,$g" in
-	newfile,newfile)
-		echo happy ;;
-	*)
-		echo "$f"
-		echo "$g"
-		false
-	esac
+ok 5 - ls-files quotes funny filename
 
-HEAD is now at 5203c39 side edits once again.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/orphan-conflicting.
-happy
-happy
-ok 10 - picking rebase
+expecting success of 3300.6 'ls-files -z does not quote funny filename': 
+	cat >expected <<-\EOF &&
+	just space
+	no-funny
+	tabs	," (dq) and spaces
+	EOF
+	git ls-files -z >ls-files.z &&
+	perl -pe "y/\000/\012/" <ls-files.z >current &&
+	test_cmp expected current
 
-expecting success of 3402.11 'rebase --skip works with two conflicts in a row': 
-	git checkout second-side  &&
-	tr "[A-Z]" "[a-z]" <newfile >tmp &&
-	mv tmp newfile &&
-	git commit -a -m"edit conflicting with side" &&
-	tr "[d-f]" "[D-F]" <newfile >tmp &&
-	mv tmp newfile &&
-	git commit -a -m"another edit conflicting with side" &&
-	test_must_fail git rebase --merge test-conflicts &&
-	test_must_fail git rebase --skip &&
-	git rebase --skip
+ok 6 - ls-files -z does not quote funny filename
 
-Switched to branch 'second-side'
-[second-side 546296f] edit conflicting with side
- Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+), 20 deletions(-)
-[second-side 896ca60] another edit conflicting with side
- Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+), 20 deletions(-)
-Rebasing (1/2)
Auto-merging newfile
-CONFLICT (content): Merge conflict in newfile
-error: could not apply 546296f... edit conflicting with side
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 546296f... edit conflicting with side
-Rebasing (2/2)
Auto-merging newfile
-CONFLICT (content): Merge conflict in newfile
-error: could not apply 896ca60... another edit conflicting with side
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 896ca60... another edit conflicting with side
-Successfully rebased and updated refs/heads/second-side.
-ok 11 - rebase --skip works with two conflicts in a row
+expecting success of 3300.7 'ls-tree quotes funny filename': 
+	cat >expected <<-\EOF &&
+	just space
+	no-funny
+	"tabs\t,\" (dq) and spaces"
+	EOF
+	git ls-tree -r $t1 >ls-tree &&
+	sed -e "s/^[^	]*	//" <ls-tree >current &&
+	test_cmp expected current
 
-expecting success of 3402.12 '--reapply-cherry-picks': 
-	git init repo &&
+ok 7 - ls-tree quotes funny filename
 
-	# O(1-10) -- O(1-11) -- O(0-10) main
-	#        \
-	#         -- O(1-11) -- O(1-12) otherbranch
+expecting success of 3300.8 'diff-index --name-status quotes funny filename': 
+	cat >expected <<-\EOF &&
+	A	"tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-index --name-status $t0 >current &&
+	test_cmp expected current
 
-	printf "Line %d\n" $(test_seq 1 10) >repo/file.txt &&
-	git -C repo add file.txt &&
-	git -C repo commit -m "base commit" &&
+ok 8 - diff-index --name-status quotes funny filename
 
-	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
-	git -C repo commit -a -m "add 11" &&
+expecting success of 3300.9 'diff-tree --name-status quotes funny filename': 
+	cat >expected <<-\EOF &&
+	A	"tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-tree --name-status $t0 $t1 >current &&
+	test_cmp expected current
 
-	printf "Line %d\n" $(test_seq 0 10) >repo/file.txt &&
-	git -C repo commit -a -m "add 0 delete 11" &&
+ok 9 - diff-tree --name-status quotes funny filename
 
-	git -C repo checkout -b otherbranch HEAD^^ &&
-	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
-	git -C repo commit -a -m "add 11 in another branch" &&
+expecting success of 3300.10 'diff-index -z does not quote funny filename': 
+	cat >expected <<-\EOF &&
+	A
+	tabs	," (dq) and spaces
+	EOF
+	git diff-index -z --name-status $t0 >diff-index.z &&
+	perl -pe "y/\000/\012/" <diff-index.z >current &&
+	test_cmp expected current
 
-	printf "Line %d\n" $(test_seq 1 12) >repo/file.txt &&
-	git -C repo commit -a -m "add 12 in another branch" &&
+ok 10 - diff-index -z does not quote funny filename
 
-	# Regular rebase fails, because the 1-11 commit is deduplicated
-	test_must_fail git -C repo rebase --merge main 2> err &&
-	test_grep "error: could not apply.*add 12 in another branch" err &&
-	git -C repo rebase --abort &&
+expecting success of 3300.11 'diff-tree -z does not quote funny filename': 
+	cat >expected <<-\EOF &&
+	A
+	tabs	," (dq) and spaces
+	EOF
+	git diff-tree -z --name-status $t0 $t1 >diff-tree.z &&
+	perl -pe y/\\000/\\012/ <diff-tree.z >current &&
+	test_cmp expected current
 
-	# With --reapply-cherry-picks, it works
-	git -C repo rebase --merge --reapply-cherry-picks main
+ok 11 - diff-tree -z does not quote funny filename
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3402-rebase-merge/repo/.git/
-[main (root-commit) 501a156] base commit
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 file.txt
-[main c19c7b3] add 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 841ae2b] add 0 delete 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'otherbranch'
-[otherbranch a7517c6] add 11 in another branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[otherbranch e4b3c77] add 12 in another branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging file.txt
-CONFLICT (content): Merge conflict in file.txt
-Rebasing (1/1)
error: could not apply e4b3c77... add 12 in another branch
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/otherbranch.
-ok 12 - --reapply-cherry-picks
+expecting success of 3300.12 'diff-tree --find-copies-harder quotes funny filename': 
+	cat >expected <<-\EOF &&
+	CNUM	no-funny	"tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-tree -C --find-copies-harder --name-status $t0 $t1 >out &&
+	sed -e "s/^C[0-9]*/CNUM/" <out >current &&
+	test_cmp expected current
 
-expecting success of 3402.13 '--reapply-cherry-picks refrains from reading unneeded blobs': 
-	git init server &&
+ok 12 - diff-tree --find-copies-harder quotes funny filename
 
-	# O(1-10) -- O(1-11) -- O(1-12) main
-	#        \
-	#         -- O(0-10) otherbranch
+expecting success of 3300.13 'setup: remove unfunny index entry': 
+	git update-index --force-remove "$p0"
 
-	printf "Line %d\n" $(test_seq 1 10) >server/file.txt &&
-	git -C server add file.txt &&
-	git -C server commit -m "merge base" &&
+ok 13 - setup: remove unfunny index entry
 
-	printf "Line %d\n" $(test_seq 1 11) >server/file.txt &&
-	git -C server commit -a -m "add 11" &&
+expecting success of 3300.14 'diff-tree -M quotes funny filename': 
+	cat >expected <<-\EOF &&
+	RNUM	no-funny	"tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-index -M --name-status $t0 >out &&
+	sed -e "s/^R[0-9]*/RNUM/" <out >current &&
+	test_cmp expected current
 
-	printf "Line %d\n" $(test_seq 1 12) >server/file.txt &&
-	git -C server commit -a -m "add 12" &&
+ok 14 - diff-tree -M quotes funny filename
 
-	git -C server checkout -b otherbranch HEAD^^ &&
-	printf "Line %d\n" $(test_seq 0 10) >server/file.txt &&
-	git -C server commit -a -m "add 0" &&
+expecting success of 3300.15 'diff-index -M -p quotes funny filename': 
+	cat >expected <<-\EOF &&
+	diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
+	similarity index NUM%
+	rename from no-funny
+	rename to "tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-index -M -p $t0 >diff &&
+	sed -e "s/index [0-9]*%/index NUM%/" <diff >current &&
+	test_cmp expected current
 
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
+ok 15 - diff-index -M -p quotes funny filename
 
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	git -C client checkout origin/main &&
-	git -C client checkout origin/otherbranch &&
+expecting success of 3300.16 'setup: mode change': 
+	chmod +x "$p1"
 
-	# Sanity check to ensure that the blobs from the merge base and "add
-	# 11" are missing
-	git -C client rev-list --objects --all --missing=print >missing_list &&
-	MERGE_BASE_BLOB=$(git -C server rev-parse main^^:file.txt) &&
-	ADD_11_BLOB=$(git -C server rev-parse main^:file.txt) &&
-	grep "[?]$MERGE_BASE_BLOB" missing_list &&
-	grep "[?]$ADD_11_BLOB" missing_list &&
+ok 16 - setup: mode change
 
-	git -C client rebase --merge --reapply-cherry-picks origin/main &&
+expecting success of 3300.17 'diff-index -M -p with mode change quotes funny filename': 
+	cat >expected <<-\EOF &&
+	diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
+	old mode 100644
+	new mode 100755
+	similarity index NUM%
+	rename from no-funny
+	rename to "tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-index -M -p $t0 >diff &&
+	sed -e "s/index [0-9]*%/index NUM%/" <diff >current &&
+	test_cmp expected current
 
-	# The blob from the merge base had to be fetched, but not "add 11"
-	git -C client rev-list --objects --all --missing=print >missing_list &&
-	! grep "[?]$MERGE_BASE_BLOB" missing_list &&
-	grep "[?]$ADD_11_BLOB" missing_list
+ok 17 - diff-index -M -p with mode change quotes funny filename
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3402-rebase-merge/server/.git/
-[main (root-commit) ded066b] merge base
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 file.txt
-[main c684029] add 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 161081c] add 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'otherbranch'
-[otherbranch ffb36e9] add 0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Cloning into 'client'...
-Note: switching to 'origin/main'.
+expecting success of 3300.18 'diffstat for rename quotes funny filename': 
+	cat >expected <<-\EOF &&
+	 "tabs\t,\" (dq) and spaces"
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git diff-index -M -p $t0 >diff &&
+	git apply --stat <diff >diffstat &&
+	sed -e "s/|.*//" -e "s/ *\$//" <diffstat >current &&
+	test_cmp expected current
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 18 - diffstat for rename quotes funny filename
 
-If you want to 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 3300.19 'numstat for rename quotes funny filename': 
+	cat >expected <<-\EOF &&
+	0	0	"tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-index -M -p $t0 >diff &&
+	git apply --numstat <diff >current &&
+	test_cmp expected current
 
-  git switch -c <new-branch-name>
+ok 19 - numstat for rename quotes funny filename
 
-Or undo this operation with:
+expecting success of 3300.20 'numstat without -M quotes funny filename': 
+	cat >expected <<-\EOF &&
+	0	3	no-funny
+	3	0	"tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-index -p $t0 >diff &&
+	git apply --numstat <diff >current &&
+	test_cmp expected current
 
-  git switch -
+ok 20 - numstat without -M quotes funny filename
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3300.21 'numstat for non-git rename diff quotes funny filename': 
+	cat >expected <<-\EOF &&
+	0	3	no-funny
+	3	0	"tabs\t,\" (dq) and spaces"
+	EOF
+	git diff-index -p $t0 >git-diff &&
+	sed -ne "/^[-+@]/p" <git-diff >diff &&
+	git apply --numstat <diff >current &&
+	test_cmp expected current
 
-HEAD is now at 161081c add 12
-Previous HEAD position was 161081c add 12
-HEAD is now at ffb36e9 add 0
-?00935f183cbd9243998bd3f84ac67e18eff726a4
-?8bf8891e216480d36945027a1d30bdbba5c96d90
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-?8bf8891e216480d36945027a1d30bdbba5c96d90
-ok 13 - --reapply-cherry-picks refrains from reading unneeded blobs
+ok 21 - numstat for non-git rename diff quotes funny filename
 
-# passed all 13 test(s)
-1..13
+# passed all 21 test(s)
+1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3403-rebase-skip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3403-rebase-skip/.git/
-expecting success of 3403.1 'setup': 
-	echo hello > hello &&
-	git add hello &&
-	git commit -m "hello" &&
-	git branch skip-reference &&
-	git tag hello &&
-
-	echo world >> hello &&
-	git commit -a -m "hello world" &&
-	echo goodbye >> hello &&
-	git commit -a -m "goodbye" &&
-	git tag goodbye &&
-
-	git checkout --detach &&
-	git checkout HEAD^ . &&
-	test_tick &&
-	git commit -m reverted-goodbye &&
-	git tag reverted-goodbye &&
-	git checkout goodbye &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Another Author" \
-		GIT_AUTHOR_EMAIL="another.author@example.com" \
-		git commit --amend --no-edit -m amended-goodbye \
-			--reset-author &&
-	test_tick &&
-	git tag amended-goodbye &&
-
-	git checkout -f skip-reference &&
-	echo moo > hello &&
-	git commit -a -m "we should skip this" &&
-	echo moo > cow &&
-	git add cow &&
-	git commit -m "this should not be skipped" &&
-	git branch pre-rebase skip-reference &&
-	git branch skip-merge skip-reference
+*** t3302-notes-index-expensive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3302-notes-index-expensive/.git/
+expecting success of 3302.1 'setup 10': 
+		mkdir "$count" &&
+		(
+			cd "$count" &&
+			create_repo "$count"
+		)
 	
-[main (root-commit) 7b3be24] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-[main 5a0b053] hello world
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 64bec18] goodbye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at 64bec18 goodbye
-Updated 1 path from f7e12fd
-[detached HEAD 1f15beb] reverted-goodbye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-Previous HEAD position was 1f15beb reverted-goodbye
-HEAD is now at 64bec18 goodbye
-[detached HEAD d66ccab] amended-goodbye
- Author: Another Author <another.author@example.com>
- 1 file changed, 1 insertion(+)
-Previous HEAD position was d66ccab amended-goodbye
-Switched to branch 'skip-reference'
-[skip-reference 847c4cd] we should skip this
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[skip-reference c443746] this should not be skipped
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cow
-ok 1 - setup
-
-expecting success of 3403.2 'rebase with git am -3 (default)': 
-	test_must_fail git rebase --apply main
-
-First, rewinding head to replay your work on top of it...
-Applying: we should skip this
-Using index info to reconstruct a base tree...
-M	hello
-Falling back to patching base and 3-way merge...
-Merging:
-64bec18 goodbye
-virtual we should skip this
-found 1 common ancestor:
-virtual b4d01e9b0c4a9356736dfddf8830ba9a54f5271c
-Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 we should skip this
-ok 2 - rebase with git am -3 (default)
-
-expecting success of 3403.3 'rebase --skip can not be used with other options': 
-	test_must_fail git rebase -v --skip &&
-	test_must_fail git rebase --skip -v
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3302-notes-index-expensive/10/.git/
+ok 1 - setup 10
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+expecting success of 3302.2 'notes work': 
+		(
+			cd "$count" &&
+			test_notes "$count"
+		)
+	
+ok 2 - notes work
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+checking prerequisite: USR_BIN_TIME
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
+	test -x /usr/bin/time
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+)
+prerequisite USR_BIN_TIME not satisfied
+ok 3 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME)
 
-ok 3 - rebase --skip can not be used with other options
+checking prerequisite: EXPENSIVE
 
-expecting success of 3403.4 'rebase --skip with am -3': 
-	git rebase --skip
-	
-Applying: this should not be skipped
-ok 4 - rebase --skip with am -3
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-expecting success of 3403.5 'rebase moves back to skip-reference': 
-	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
-	git branch post-rebase &&
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase main &&
-	echo "hello" > hello &&
-	git add hello &&
-	git rebase --continue &&
-	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
-	git reset --hard post-rebase
+)
+prerequisite EXPENSIVE not satisfied
+ok 4 # skip setup 100 (missing EXPENSIVE)
 
-HEAD is now at c443746 this should not be skipped
-Rebasing (1/2)
Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-error: could not apply 847c4cd... we should skip this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 847c4cd... we should skip this
-[detached HEAD 0283955] we should skip this
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
-Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-reference.
-HEAD is now at 86a691d this should not be skipped
-ok 5 - rebase moves back to skip-reference
+ok 5 # skip notes work (missing EXPENSIVE)
 
-expecting success of 3403.6 'checkout skip-merge': git checkout -f skip-merge
-Switched to branch 'skip-merge'
-ok 6 - checkout skip-merge
+ok 6 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
 
-expecting success of 3403.7 'rebase with --merge': 
-	test_must_fail git rebase --merge main
+ok 7 # skip setup 1000 (missing EXPENSIVE)
 
-Rebasing (1/2)
Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-error: could not apply 847c4cd... we should skip this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 847c4cd... we should skip this
-ok 7 - rebase with --merge
+ok 8 # skip notes work (missing EXPENSIVE)
 
-expecting success of 3403.8 'rebase --skip with --merge': 
-	git rebase --skip
+ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
 
-Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-merge.
-ok 8 - rebase --skip with --merge
+ok 10 # skip setup 10000 (missing EXPENSIVE)
 
-expecting success of 3403.9 'merge and reference trees equal': 
-	test -z "$(git diff-tree skip-merge skip-reference)"
+ok 11 # skip notes work (missing EXPENSIVE)
 
-ok 9 - merge and reference trees equal
+ok 12 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
 
-expecting success of 3403.10 'moved back to branch correctly': 
-	test refs/heads/skip-merge = $(git symbolic-ref HEAD)
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3304-notes-mixed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3304-notes-mixed/.git/
+expecting success of 3304.1 'setup: create a couple of commits': 
 
-ok 10 - moved back to branch correctly
+	test_tick &&
+	cat <<INPUT_END >input &&
+commit refs/heads/main
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+commit #1
+COMMIT
 
-expecting success of 3403.11 'skipping final pick removes .git/MERGE_MSG': 
-	test_must_fail git rebase --onto hello reverted-goodbye^ \
-		reverted-goodbye &&
-	git rebase --skip &&
-	test_path_is_missing .git/MERGE_MSG
+M 644 inline file
+data <<EOF
+file in commit #1
+EOF
 
-Rebasing (1/1)
Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-error: could not apply 1f15beb... reverted-goodbye
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1f15beb... reverted-goodbye
-Successfully rebased and updated detached HEAD.
-ok 11 - skipping final pick removes .git/MERGE_MSG
+INPUT_END
 
-expecting success of 3403.12 'correct advice upon picking empty commit': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -i --onto goodbye \
-		amended-goodbye^ amended-goodbye 2>err &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git rebase --skip" err &&
-	test_must_fail git commit &&
-	test_grep "git rebase --skip" err
+	test_tick &&
+	cat <<INPUT_END >>input &&
+commit refs/heads/main
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+commit #2
+COMMIT
 
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git rebase --skip'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+M 644 inline file
+data <<EOF
+file in commit #2
+EOF
 
-    git commit --allow-empty
+INPUT_END
+	git fast-import --quiet <input
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   pick d66ccab amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+ok 1 - setup: create a couple of commits
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
+expecting success of 3304.2 'create a notes tree with both notes and non-notes': 
 
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git rebase --skip'
-ok 12 - correct advice upon picking empty commit
+	commit1=$(git rev-parse refs/heads/main^) &&
+	commit2=$(git rev-parse refs/heads/main) &&
+	test_tick &&
+	cat <<INPUT_END >input &&
+commit refs/notes/commits
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+notes commit #1
+COMMIT
 
-expecting success of 3403.13 'correct authorship when committing empty pick': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -i --onto goodbye \
-		amended-goodbye^ amended-goodbye &&
-	git commit --allow-empty &&
-	git log --pretty=format:"%an <%ae>%n%ad%B" -1 amended-goodbye >expect &&
-	git log --pretty=format:"%an <%ae>%n%ad%B" -1 HEAD >actual &&
-	test_cmp expect actual
+N inline $commit1
+data <<EOF
+note for commit #1
+EOF
 
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+N inline $commit2
+data <<EOF
+note for commit #2
+EOF
 
-    git commit --allow-empty
+INPUT_END
+	test_tick &&
+	cat <<INPUT_END >>input &&
+commit refs/notes/commits
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+notes commit #2
+COMMIT
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   pick d66ccab amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+M 644 inline foobar/non-note.txt
+data <<EOF
+A non-note in a notes tree
+EOF
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
+N inline $commit2
+data <<EOF
+edited note for commit #2
+EOF
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply d66ccab... amended-goodbye
-[detached HEAD 046fc51] amended-goodbye
- Author: Another Author <another.author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
-ok 13 - correct authorship when committing empty pick
+INPUT_END
+	test_tick &&
+	cat <<INPUT_END >>input &&
+commit refs/notes/commits
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+notes commit #3
+COMMIT
 
-expecting success of 3403.14 'correct advice upon rewording empty commit': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="reword 1" git rebase -i \
-			--onto goodbye amended-goodbye^ amended-goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git rebase --skip" err &&
-	test_must_fail git commit &&
-	test_grep "git rebase --skip" err
+N inline $commit1
+data <<EOF
+edited note for commit #1
+EOF
 
-rebase -i script before editing:
-pick d66ccab amended-goodbye
+M 644 inline deadbeef
+data <<EOF
+non-note with SHA1-like name
+EOF
 
-rebase -i script after editing:
-reword d66ccab amended-goodbye
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git rebase --skip'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+M 644 inline de/adbeef
+data <<EOF
+another non-note with SHA1-like name
+EOF
 
-    git commit --allow-empty
+M 644 inline de/adbeefdeadbeefdeadbeefdeadbeefdeadbeef
+data <<EOF
+This is actually a valid note, albeit to a non-existing object.
+It is needed in order to trigger the "mishandling" of the dead/beef non-note.
+EOF
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   reword d66ccab amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+M 644 inline dead/beef
+data <<EOF
+yet another non-note with SHA1-like name
+EOF
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+INPUT_END
+	git fast-import --quiet <input &&
+	git config core.notesRef refs/notes/commits
 
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git rebase --skip'
-ok 14 - correct advice upon rewording empty commit
+ok 2 - create a notes tree with both notes and non-notes
 
-expecting success of 3403.15 'correct advice upon editing empty commit': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="edit 1" git rebase -i \
-			--onto goodbye amended-goodbye^ amended-goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git rebase --skip" err &&
-	test_must_fail git commit &&
-	test_grep "git rebase --skip" err
+expecting success of 3304.3 'verify contents of notes': 
 
-rebase -i script before editing:
-pick d66ccab amended-goodbye
+	git log | grep "^    " > actual &&
+	test_cmp expect actual
 
-rebase -i script after editing:
-edit d66ccab amended-goodbye
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git rebase --skip'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+ok 3 - verify contents of notes
 
-    git commit --allow-empty
+expecting success of 3304.4 'verify contents of non-notes': 
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 64bec18
-Last command done (1 command done):
-   edit d66ccab amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+	git cat-file -p refs/notes/commits:foobar/non-note.txt > actual_nn1 &&
+	test_cmp expect_nn1 actual_nn1 &&
+	git cat-file -p refs/notes/commits:deadbeef > actual_nn2 &&
+	test_cmp expect_nn2 actual_nn2 &&
+	git cat-file -p refs/notes/commits:de/adbeef > actual_nn3 &&
+	test_cmp expect_nn3 actual_nn3 &&
+	git cat-file -p refs/notes/commits:dead/beef > actual_nn4 &&
+	test_cmp expect_nn4 actual_nn4
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+ok 4 - verify contents of non-notes
 
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git rebase --skip'
-ok 15 - correct advice upon editing empty commit
+expecting success of 3304.5 'git-notes preserves non-notes': 
 
-expecting success of 3403.16 'correct advice upon cherry-picking an empty commit during a rebase': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \
-			git rebase -i goodbye^ goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git cherry-pick --skip" err &&
-	test_must_fail git commit 2>err &&
-	test_grep "git cherry-pick --skip" err
+	test_tick &&
+	git notes add -f -m "foo bar"
 
-rebase -i script before editing:
-pick 64bec18 goodbye
+Overwriting existing notes for object 5f8b8322f6a2c6d36eb6d42312d2393900ab7b81
+ok 5 - git-notes preserves non-notes
 
-rebase -i script after editing:
-pick 64bec18 goodbye
-exec git cherry-pick amended-goodbye
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 goodbye
-   exec git cherry-pick amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 3304.6 'verify contents of non-notes after git-notes': 
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+	git cat-file -p refs/notes/commits:foobar/non-note.txt > actual_nn1 &&
+	test_cmp expect_nn1 actual_nn1 &&
+	git cat-file -p refs/notes/commits:deadbeef > actual_nn2 &&
+	test_cmp expect_nn2 actual_nn2 &&
+	git cat-file -p refs/notes/commits:de/adbeef > actual_nn3 &&
+	test_cmp expect_nn3 actual_nn3 &&
+	git cat-file -p refs/notes/commits:dead/beef > actual_nn4 &&
+	test_cmp expect_nn4 actual_nn4
 
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git cherry-pick --skip'
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 goodbye
-   exec git cherry-pick amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+ok 6 - verify contents of non-notes after git-notes
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3306-notes-prune.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3306-notes-prune/.git/
+expecting success of 3306.1 'setup: create a few commits with notes': 
 
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git cherry-pick --skip'
-ok 16 - correct advice upon cherry-picking an empty commit during a rebase
+	: > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m 1st &&
+	git notes add -m "Note #1" &&
+	first=$(git rev-parse HEAD) &&
+	: > file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m 2nd &&
+	git notes add -m "Note #2" &&
+	second=$(git rev-parse HEAD) &&
+	: > file3 &&
+	git add file3 &&
+	test_tick &&
+	git commit -m 3rd &&
+	third=$(git rev-parse HEAD) &&
+	COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") &&
+	test -f $COMMIT_FILE &&
+	test-tool chmtime =+0 $COMMIT_FILE &&
+	git notes add -m "Note #3"
 
-expecting success of 3403.17 'correct advice upon multi cherry-pick picking an empty commit during a rebase': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \
-			git rebase -i goodbye^^ goodbye 2>err
-	) &&
-	test_grep "previous cherry-pick is now empty" err &&
-	test_grep "git cherry-pick --skip" err &&
-	test_must_fail git commit 2>err &&
-	test_grep "git cherry-pick --skip" err
+[master (root-commit) ab5f302] 1st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+[master 08341ad] 2nd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+[master 5ee1c35] 3rd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file3
+ok 1 - setup: create a few commits with notes
 
-rebase -i script before editing:
-pick 5a0b053 hello world
-pick 64bec18 goodbye
+expecting success of 3306.2 'verify commits and notes': 
 
-rebase -i script after editing:
-pick 5a0b053 hello world
-exec git cherry-pick goodbye amended-goodbye
-[detached HEAD 67e8618] goodbye
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-interactive rebase in progress; onto 7b3be24
-Last commands done (2 commands done):
-   pick 5a0b053 hello world
-   exec git cherry-pick goodbye amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+	git log > actual &&
+	test_cmp expect actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+ok 2 - verify commits and notes
 
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-Otherwise, please use 'git cherry-pick --skip'
-interactive rebase in progress; onto 7b3be24
-Last commands done (2 commands done):
-   pick 5a0b053 hello world
-   exec git cherry-pick goodbye amended-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 3306.3 'remove some commits': 
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+	git reset --hard HEAD~1 &&
+	git reflog expire --expire=now HEAD &&
+	git gc --prune=now
 
-nothing added to commit but untracked files present (use "git add" to track)
-Otherwise, please use 'git cherry-pick --skip'
-ok 17 - correct advice upon multi cherry-pick picking an empty commit during a rebase
+HEAD is now at 08341ad 2nd
+ok 3 - remove some commits
 
-expecting success of 3403.18 'fixup that empties commit fails': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \
-			goodbye^ reverted-goodbye
-	)
+expecting success of 3306.4 'verify that commits are gone': 
 
-rebase -i script before editing:
-pick 64bec18 goodbye
-pick 1f15beb reverted-goodbye
+	test_must_fail git cat-file -p $third &&
+	git cat-file -p $second &&
+	git cat-file -p $first
 
-rebase -i script after editing:
-pick 64bec18 goodbye
-fixup 1f15beb reverted-goodbye
-Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
-it empty. You can repeat your command with --allow-empty, or you can
-remove the commit entirely with "git reset HEAD^".
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 goodbye
-   fixup 1f15beb reverted-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+fatal: Not a valid object name 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
+tree aefde3a01f6e10d72fd4899ce14c8b2654d3eb45
+parent ab5f302035f2e7aaf04265f08b42034c23256e1f
+author A U Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+2nd
+tree ad24149d789e59d4b5f9ce41cda90110ca0f98b7
+author A U Thor <author@example.com> 1112911993 -0700
+committer C O Mitter <committer@example.com> 1112911993 -0700
 
-No changes
-Could not apply 1f15beb... reverted-goodbye
-ok 18 - fixup that empties commit fails
+1st
+ok 4 - verify that commits are gone
 
-expecting success of 3403.19 'squash that empties commit fails': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \
-			goodbye^ reverted-goodbye
-	)
+expecting success of 3306.5 'verify that notes are still present': 
 
-rebase -i script before editing:
-pick 64bec18 goodbye
-pick 1f15beb reverted-goodbye
+	git notes show $third &&
+	git notes show $second &&
+	git notes show $first
 
-rebase -i script after editing:
-pick 64bec18 goodbye
-squash 1f15beb reverted-goodbye
-Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
-it empty. You can repeat your command with --allow-empty, or you can
-remove the commit entirely with "git reset HEAD^".
-interactive rebase in progress; onto 5a0b053
-Last commands done (2 commands done):
-   pick 64bec18 goodbye
-   squash 1f15beb reverted-goodbye
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+Note #3
+Note #2
+Note #1
+ok 5 - verify that notes are still present
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	fake-editor.sh
+expecting success of 3306.6 'prune -n does not remove notes': 
 
-No changes
-Could not apply 1f15beb... reverted-goodbye
-ok 19 - squash that empties commit fails
+	git notes list > expect &&
+	git notes prune -n &&
+	git notes list > actual &&
+	test_cmp expect actual
 
-expecting success of 3403.20 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
+ok 6 - prune -n does not remove notes
 
-ok 20 - $EDITOR and friends are unchanged
+expecting success of 3306.7 'prune -n lists prunable notes': 
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3400-rebase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/.git/
-expecting success of 3400.1 'prepare repository with topic branches': 
-	test_commit "Add A." A First First &&
-	git checkout -b force-3way &&
-	echo Dummy >Y &&
-	git update-index --add Y &&
-	git commit -m "Add Y." &&
-	git checkout -b filemove &&
-	git reset --soft main &&
-	mkdir D &&
-	git mv A D/A &&
-	git commit -m "Move A." &&
-	git checkout -b my-topic-branch main &&
-	test_commit "Add B." B Second Second &&
-	git checkout -f main &&
-	echo Third >>A &&
-	git update-index A &&
-	git commit -m "Modify A." &&
-	git checkout -b side my-topic-branch &&
-	echo Side >>C &&
-	git add C &&
-	git commit -m "Add C" &&
-	git checkout -f my-topic-branch &&
-	git tag topic
+	echo $third >expect &&
+	git notes prune -n > actual &&
+	test_cmp expect actual
 
-[main (root-commit) fefbb15] Add A.
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Switched to a new branch 'force-3way'
-[force-3way 779feee] Add Y.
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 Y
-Switched to a new branch 'filemove'
-[filemove 4b62ea1] Move A.
- Author: author@name <bogus@email@address>
- 2 files changed, 1 insertion(+)
- rename A => D/A (100%)
- create mode 100644 Y
-Switched to a new branch 'my-topic-branch'
-[my-topic-branch 5d79b4b] Add B.
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to branch 'main'
-[main 79095e6] Modify A.
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'side'
-[side af81839] Add C
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-Switched to branch 'my-topic-branch'
-ok 1 - prepare repository with topic branches
+ok 7 - prune -n lists prunable notes
 
-expecting success of 3400.2 'rebase on dirty worktree': 
-	echo dirty >>A &&
-	test_must_fail git rebase main
+expecting success of 3306.8 'prune notes': 
 
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-ok 2 - rebase on dirty worktree
+	git notes prune
 
-expecting success of 3400.3 'rebase on dirty cache': 
-	git add A &&
-	test_must_fail git rebase main
+ok 8 - prune notes
 
-error: cannot rebase: Your index contains uncommitted changes.
-error: Please commit or stash them.
-ok 3 - rebase on dirty cache
+expecting success of 3306.9 'verify that notes are gone': 
 
-expecting success of 3400.4 'rebase against main': 
-	git reset --hard HEAD &&
-	git rebase main
+	test_must_fail git notes show $third &&
+	git notes show $second &&
+	git notes show $first
 
-HEAD is now at 5d79b4b Add B.
-Rebasing (1/1)
Successfully rebased and updated refs/heads/my-topic-branch.
-ok 4 - rebase against main
+error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
+Note #2
+Note #1
+ok 9 - verify that notes are gone
 
-expecting success of 3400.5 'rebase sets ORIG_HEAD to pre-rebase state': 
-	git checkout -b orig-head topic &&
-	pre="$(git rev-parse --verify HEAD)" &&
-	git rebase main &&
-	test_cmp_rev "$pre" ORIG_HEAD &&
-	test_cmp_rev ! "$pre" HEAD
+expecting success of 3306.10 'remove some commits': 
 
-Switched to a new branch 'orig-head'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/orig-head.
-ok 5 - rebase sets ORIG_HEAD to pre-rebase state
+	git reset --hard HEAD~1 &&
+	git reflog expire --expire=now HEAD &&
+	git gc --prune=now
 
-expecting success of 3400.6 'rebase, with <onto> and <upstream> specified as :/quuxery': 
-	test_when_finished "git branch -D torebase" &&
-	git checkout -b torebase my-topic-branch^ &&
-	upstream=$(git rev-parse ":/Add B") &&
-	onto=$(git rev-parse ":/Add A") &&
-	git rebase --onto $onto $upstream &&
-	git reset --hard my-topic-branch^ &&
-	git rebase --onto ":/Add A" ":/Add B" &&
-	git checkout my-topic-branch
+HEAD is now at ab5f302 1st
+ok 10 - remove some commits
 
-Switched to a new branch 'torebase'
-Current branch torebase is up to date.
-HEAD is now at 79095e6 Modify A.
-Current branch torebase is up to date.
-Switched to branch 'my-topic-branch'
-Deleted branch torebase (was 79095e6).
-ok 6 - rebase, with <onto> and <upstream> specified as :/quuxery
+expecting success of 3306.11 'prune -v notes': 
 
-expecting success of 3400.7 'the rebase operation should not have destroyed author information': 
-	! (git log | grep "Author:" | grep "<>")
+	echo $second >expect &&
+	git notes prune -v > actual &&
+	test_cmp expect actual
 
-ok 7 - the rebase operation should not have destroyed author information
+ok 11 - prune -v notes
 
-expecting success of 3400.8 'the rebase operation should not have destroyed author information (2)': 
-	git log -1 |
-	grep 'Author: author@name <bogus@email@address>'
+expecting success of 3306.12 'verify that notes are gone': 
 
-Author: author@name <bogus@email@address>
-ok 8 - the rebase operation should not have destroyed author information (2)
+	test_must_fail git notes show $third &&
+	test_must_fail git notes show $second &&
+	git notes show $first
 
-expecting success of 3400.9 'HEAD was detached during rebase': 
-	test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
+error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
+error: no note found for object 08341ad9e94faa089d60fd3f523affb25c6da189.
+Note #1
+ok 12 - verify that notes are gone
 
-ok 9 - HEAD was detached during rebase
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3307-notes-man.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3307-notes-man/.git/
+expecting success of 3307.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	test_commit C
 
-expecting success of 3400.10 'rebase from ambiguous branch name': 
-	git checkout -b topic side &&
-	git rebase main
+[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
+[master 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
 
-Switched to a new branch 'topic'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/topic.
-ok 10 - rebase from ambiguous branch name
+expecting success of 3307.2 'example 1: notes to add an Acked-by line': 
+	cat <<-\EOF >expect &&
+	    B
 
-expecting success of 3400.11 'rebase off of the previous branch using "-"': 
-	git checkout main &&
-	git checkout HEAD^ &&
-	git rebase @{-1} >expect.messages &&
-	git merge-base main HEAD >expect.forkpoint &&
+	Notes:
+	    Acked-by: A C Ker <acker@example.com>
+	EOF
+	git notes add -m "Acked-by: A C Ker <acker@example.com>" B &&
+	git show -s B^{commit} >log &&
+	tail -n 4 log >actual &&
+	test_cmp expect actual
 
-	git checkout main &&
-	git checkout HEAD^ &&
-	git rebase - >actual.messages &&
-	git merge-base main HEAD >actual.forkpoint &&
+ok 2 - example 1: notes to add an Acked-by line
 
-	test_cmp expect.forkpoint actual.forkpoint &&
-	# the next one is dubious---we may want to say "-",
-	# instead of @{-1}, in the message
-	test_cmp expect.messages actual.messages
+expecting success of 3307.3 'example 2: binary notes': 
+	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	git checkout B &&
+	blob=$(git hash-object -w test-binary-1.png) &&
+	git notes --ref=logo add -C "$blob" &&
+	git notes --ref=logo copy B C &&
+	git notes --ref=logo show C >actual &&
+	test_cmp test-binary-1.png actual
 
-Switched to branch 'main'
-Note: switching to 'HEAD^'.
+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
@@ -122901,9140 +112520,22984 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at fefbb15 Add A.
-Successfully rebased and updated detached HEAD.
-Switched to branch 'main'
-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.
+HEAD is now at d9df450 B
+ok 3 - example 2: binary notes
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3206-range-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3206-range-diff/.git/
+expecting success of 3206.1 'setup': 
+	git fast-import <"$TEST_DIRECTORY"/t3206/history.export &&
+	test_oid_cache <<-\EOF
+	# topic
+	t1 sha1:4de457d
+	t2 sha1:fccce22
+	t3 sha1:147e64e
+	t4 sha1:a63e992
+	t1 sha256:b89f8b9
+	t2 sha256:5f12aad
+	t3 sha256:ea8b273
+	t4 sha256:14b7336
 
-  git switch -c <new-branch-name>
+	# unmodified
+	u1 sha1:35b9b25
+	u2 sha1:de345ab
+	u3 sha1:9af6654
+	u4 sha1:2901f77
+	u1 sha256:e3731be
+	u2 sha256:14fadf8
+	u3 sha256:736c4bc
+	u4 sha256:673e77d
 
-Or undo this operation with:
+	# topic (abbrev=10)
+	t1_abbrev sha1:4de457d2c0
+	t2_abbrev sha1:fccce22f8c
+	t3_abbrev sha1:147e64ef53
+	t4_abbrev sha1:a63e992599
+	t1_abbrev sha256:b89f8b9092
+	t2_abbrev sha256:5f12aadf34
+	t3_abbrev sha256:ea8b273a6c
+	t4_abbrev sha256:14b73361fc
 
-  git switch -
+	# unmodified (abbrev=10)
+	u1_abbrev sha1:35b9b25f76
+	u2_abbrev sha1:de345ab3de
+	u3_abbrev sha1:9af6654000
+	u4_abbrev sha1:2901f773f3
+	u1_abbrev sha256:e3731be242
+	u2_abbrev sha256:14fadf8cee
+	u3_abbrev sha256:736c4bcb44
+	u4_abbrev sha256:673e77d589
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	# reordered
+	r1 sha1:aca177a
+	r2 sha1:14ad629
+	r3 sha1:ee58208
+	r4 sha1:307b27a
+	r1 sha256:f59d3aa
+	r2 sha256:fb261a8
+	r3 sha256:cb2649b
+	r4 sha256:958577e
 
-HEAD is now at fefbb15 Add A.
-Successfully rebased and updated detached HEAD.
-ok 11 - rebase off of the previous branch using "-"
+	# removed (deleted)
+	d1 sha1:7657159
+	d2 sha1:43d84d3
+	d3 sha1:a740396
+	d1 sha256:e312513
+	d2 sha256:eb19258
+	d3 sha256:1ccb3c1
 
-expecting success of 3400.12 'rebase a single mode change': 
-	git checkout main &&
-	git branch -D topic &&
-	echo 1 >X &&
-	git add X &&
-	test_tick &&
-	git commit -m prepare &&
-	git checkout -b modechange HEAD^ &&
-	echo 1 >X &&
-	git add X &&
-	test_chmod +x A &&
-	test_tick &&
-	git commit -m modechange &&
-	GIT_TRACE=1 git rebase main
+	# added
+	a1 sha1:2716022
+	a2 sha1:b62accd
+	a3 sha1:df46cfa
+	a4 sha1:3e64548
+	a5 sha1:12b4063
+	a1 sha256:d724f4d
+	a2 sha256:1de7762
+	a3 sha256:e159431
+	a4 sha256:b3e483c
+	a5 sha256:90866a7
 
-Switched to branch 'main'
-Deleted branch topic (was 93c5c54).
-[main 1fb901f] prepare
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 X
-Switched to a new branch 'modechange'
-[modechange 0e9b7fa] modechange
- Author: author@name <bogus@email@address>
- 2 files changed, 1 insertion(+)
- mode change 100644 => 100755 A
- create mode 100644 X
-trace: built-in: git rebase main
-Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' notes copy --for-rewrite=rebase
-trace: built-in: git notes copy --for-rewrite=rebase
-Successfully rebased and updated refs/heads/modechange.
-ok 12 - rebase a single mode change
+	# rebased
+	b1 sha1:cc9c443
+	b2 sha1:c5d9641
+	b3 sha1:28cc2b6
+	b4 sha1:5628ab7
+	b5 sha1:a31b12e
+	b1 sha256:a1a8717
+	b2 sha256:20a5862
+	b3 sha256:587172a
+	b4 sha256:2721c5d
+	b5 sha256:7b57864
 
-expecting success of 3400.13 'rebase is not broken by diff.renames': 
-	test_config diff.renames copies &&
-	git checkout filemove &&
-	GIT_TRACE=1 git rebase force-3way
+	# changed
+	c1 sha1:a4b3333
+	c2 sha1:f51d370
+	c3 sha1:0559556
+	c4 sha1:d966c5c
+	c1 sha256:f8c2b9d
+	c2 sha256:3fb6318
+	c3 sha256:168ab68
+	c4 sha256:3526539
 
-Switched to branch 'filemove'
-trace: built-in: git rebase force-3way
-Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' notes copy --for-rewrite=rebase
-trace: built-in: git notes copy --for-rewrite=rebase
-Successfully rebased and updated refs/heads/filemove.
-ok 13 - rebase is not broken by diff.renames
+	# changed-message
+	m1 sha1:f686024
+	m2 sha1:4ab067d
+	m3 sha1:b9cb956
+	m4 sha1:8add5f1
+	m1 sha256:31e6281
+	m2 sha256:a06bf1b
+	m3 sha256:82dc654
+	m4 sha256:48470c5
 
-expecting success of 3400.14 'setup: recover': 
-	test_might_fail git rebase --abort &&
-	git reset --hard &&
-	git checkout modechange
+	# renamed
+	n1 sha1:f258d75
+	n2 sha1:017b62d
+	n3 sha1:3ce7af6
+	n4 sha1:1e6226b
+	n1 sha256:ad52114
+	n2 sha256:3b54c8f
+	n3 sha256:3b0a644
+	n4 sha256:e461653
 
-fatal: no rebase in progress
-HEAD is now at 6359119 Move A.
-Switched to branch 'modechange'
-ok 14 - setup: recover
+	# mode change
+	o1 sha1:4d39cb3
+	o2 sha1:26c107f
+	o3 sha1:4c1e0f5
+	o1 sha256:d0dd598
+	o2 sha256:c4a279e
+	o3 sha256:78459d7
 
-expecting success of 3400.15 'Show verbose error when HEAD could not be detached': 
-	>B &&
-	test_when_finished "rm -f B" &&
-	test_must_fail git rebase topic 2>output.err >output.out &&
-	test_grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
-	test_grep B output.err &&
-	test_must_fail git rebase --quit 2>err &&
-	test_grep "no rebase in progress" err
+	# added and removed
+	s1 sha1:096b1ba
+	s2 sha1:d92e698
+	s3 sha1:9a1db4d
+	s4 sha1:fea3b5c
+	s1 sha256:a7f9134
+	s2 sha256:b4c2580
+	s3 sha256:1d62aa2
+	s4 sha256:48160e8
 
-error: The following untracked working tree files would be overwritten by checkout:
-	B
-fatal: no rebase in progress
-ok 15 - Show verbose error when HEAD could not be detached
+	# Empty delimiter (included so lines match neatly)
+	__ sha1:-------
+	__ sha256:-------
+	EOF
 
-expecting success of 3400.16 'fail when upstream arg is missing and not on branch': 
-	git checkout topic &&
-	test_must_fail git rebase
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           83 (        21 duplicates                  )
+      blobs  :           14 (         0 duplicates          0 deltas of         11 attempts)
+      trees  :           24 (        21 duplicates          1 deltas of         23 attempts)
+      commits:           45 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:          12 (        14 loads     )
+      marks:           1024 (        59 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            =         23
+pack_report: pack_mmap_calls          =         13
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       8521
+---------------------------------------------------------------------
 
-Note: switching to 'topic'.
+ok 1 - setup
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3206.2 'simple A..B A..C (unmodified)': 
+	git range-diff --no-color main..topic main..unmodified \
+		>actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
+	EOF
+	test_cmp expect actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 2 - simple A..B A..C (unmodified)
 
-  git switch -c <new-branch-name>
+expecting success of 3206.3 'simple B...C (unmodified)': 
+	git range-diff --no-color topic...unmodified >actual &&
+	# same "expect" as above
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 3 - simple B...C (unmodified)
 
-  git switch -
+expecting success of 3206.4 'simple A B C (unmodified)': 
+	git range-diff --no-color main topic unmodified >actual &&
+	# same "expect" as above
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 4 - simple A B C (unmodified)
 
-HEAD is now at 5d79b4b Add B.
-You are not currently on a branch.
-Please specify which branch you want to rebase against.
-See git-rebase(1) for details.
+expecting success of 3206.5 'simple A..B A..C (unmodified) with --abbrev': 
+	git range-diff --no-color --abbrev=10 main..topic main..unmodified \
+		>actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1_abbrev) = 1:  $(test_oid u1_abbrev) s/5/A/
+	2:  $(test_oid t2_abbrev) = 2:  $(test_oid u2_abbrev) s/4/A/
+	3:  $(test_oid t3_abbrev) = 3:  $(test_oid u3_abbrev) s/11/B/
+	4:  $(test_oid t4_abbrev) = 4:  $(test_oid u4_abbrev) s/12/B/
+	EOF
+	test_cmp expect actual
 
-    git rebase '<branch>'
+ok 5 - simple A..B A..C (unmodified) with --abbrev
 
-ok 16 - fail when upstream arg is missing and not on branch
+expecting success of 3206.6 'A^! and A^-<n> (unmodified)': 
+	git range-diff --no-color topic^! unmodified^-1 >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t4) = 1:  $(test_oid u4) s/12/B/
+	EOF
+	test_cmp expect actual
 
-expecting success of 3400.17 'fail when upstream arg is missing and not configured': 
-	git checkout -b no-config topic &&
-	test_must_fail git rebase
+ok 6 - A^! and A^-<n> (unmodified)
 
-Switched to a new branch 'no-config'
-There is no tracking information for the current branch.
-Please specify which branch you want to rebase against.
-See git-rebase(1) for details.
+expecting success of 3206.7 'A^{/..} is not mistaken for a range': 
+	test_must_fail git range-diff topic^.. topic^{/..} -- 2>error &&
+	test_grep "not a commit range" error
 
-    git rebase '<branch>'
+fatal: not a commit range: 'topic^{/..}'
+ok 7 - A^{/..} is not mistaken for a range
 
-If you wish to set tracking information for this branch you can do so with:
+expecting success of 3206.8 'trivial reordering': 
+	git range-diff --no-color main topic reordered >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid r1) s/5/A/
+	3:  $(test_oid t3) = 2:  $(test_oid r2) s/11/B/
+	4:  $(test_oid t4) = 3:  $(test_oid r3) s/12/B/
+	2:  $(test_oid t2) = 4:  $(test_oid r4) s/4/A/
+	EOF
+	test_cmp expect actual
 
-    git branch --set-upstream-to=<remote>/<branch> no-config
+ok 8 - trivial reordering
 
-ok 17 - fail when upstream arg is missing and not configured
+expecting success of 3206.9 'removed a commit': 
+	git range-diff --no-color main topic removed >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid d1) s/5/A/
+	2:  $(test_oid t2) < -:  $(test_oid __) s/4/A/
+	3:  $(test_oid t3) = 2:  $(test_oid d2) s/11/B/
+	4:  $(test_oid t4) = 3:  $(test_oid d3) s/12/B/
+	EOF
+	test_cmp expect actual
 
-expecting success of 3400.18 'rebase works with format.useAutoBase': 
-	test_config format.useAutoBase true &&
-	git checkout topic &&
-	git rebase main
+ok 9 - removed a commit
 
-Note: switching to 'topic'.
+expecting success of 3206.10 'added a commit': 
+	git range-diff --no-color main topic added >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid a1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid a2) s/4/A/
+	-:  $(test_oid __) > 3:  $(test_oid a3) s/6/A/
+	3:  $(test_oid t3) = 4:  $(test_oid a4) s/11/B/
+	4:  $(test_oid t4) = 5:  $(test_oid a5) s/12/B/
+	EOF
+	test_cmp expect actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 10 - added a commit
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3206.11 'new base, A B C': 
+	git range-diff --no-color main topic rebased >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid b1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid b2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid b3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid b4) s/12/B/
+	EOF
+	test_cmp expect actual
 
-  git switch -c <new-branch-name>
+ok 11 - new base, A B C
 
-Or undo this operation with:
+expecting success of 3206.12 'new base, B...C': 
+	# this syntax includes the commits from main!
+	git range-diff --no-color topic...rebased >actual &&
+	cat >expect <<-EOF &&
+	-:  $(test_oid __) > 1:  $(test_oid b5) unrelated
+	1:  $(test_oid t1) = 2:  $(test_oid b1) s/5/A/
+	2:  $(test_oid t2) = 3:  $(test_oid b2) s/4/A/
+	3:  $(test_oid t3) = 4:  $(test_oid b3) s/11/B/
+	4:  $(test_oid t4) = 5:  $(test_oid b4) s/12/B/
+	EOF
+	test_cmp expect actual
 
-  git switch -
+ok 12 - new base, B...C
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3206.13 'changed commit': 
+	git range-diff --no-color topic...changed >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	    @@ file: A
+	      9
+	      10
+	     -11
+	    -+B
+	    ++BB
+	      12
+	      13
+	      14
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	    @@ file
+	     @@ file: A
+	      9
+	      10
+	    - B
+	    + BB
+	     -12
+	     +B
+	      13
+	EOF
+	test_cmp expect actual
 
-HEAD is now at 5d79b4b Add B.
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 18 - rebase works with format.useAutoBase
+ok 13 - changed commit
 
-expecting success of 3400.19 'default to common base in @{upstream}s reflog if no upstream arg (--merge)': 
-	git checkout -b default-base main &&
-	git checkout -b default topic &&
-	git config branch.default.remote . &&
-	git config branch.default.merge refs/heads/default-base &&
-	git rebase --merge &&
-	git rev-parse --verify default-base >expect &&
-	git rev-parse default~1 >actual &&
-	test_cmp expect actual &&
-	git checkout default-base &&
-	git reset --hard HEAD^ &&
-	git checkout default &&
-	git rebase --merge &&
-	git rev-parse --verify default-base >expect &&
-	git rev-parse default~1 >actual &&
+expecting success of 3206.14 'changed commit with --no-patch diff option': 
+	git range-diff --no-color --no-patch topic...changed >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	EOF
 	test_cmp expect actual
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+ok 14 - changed commit with --no-patch diff option
 
-  b86b84f Add B.
+expecting success of 3206.15 'changed commit with --stat diff option': 
+	git range-diff --no-color --stat topic...changed >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	     a => b | 2 +-
+	     1 file changed, 1 insertion(+), 1 deletion(-)
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	     a => b | 2 +-
+	     1 file changed, 1 insertion(+), 1 deletion(-)
+	EOF
+	test_cmp expect actual
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+ok 15 - changed commit with --stat diff option
 
- git branch <new-branch-name> b86b84f
+expecting success of 3206.16 'changed commit with sm config': 
+	git range-diff --no-color --submodule=log topic...changed >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
+	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	    @@ file: A
+	      9
+	      10
+	     -11
+	    -+B
+	    ++BB
+	      12
+	      13
+	      14
+	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	    @@ file
+	     @@ file: A
+	      9
+	      10
+	    - B
+	    + BB
+	     -12
+	     +B
+	      13
+	EOF
+	test_cmp expect actual
 
-Switched to a new branch 'default-base'
-Switched to a new branch 'default'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/default.
-Switched to branch 'default-base'
-HEAD is now at 79095e6 Modify A.
-Switched to branch 'default'
-Your branch is ahead of 'default-base' by 2 commits.
-  (use "git push" to publish your local commits)
-Rebasing (1/1)
Successfully rebased and updated refs/heads/default.
-ok 19 - default to common base in @{upstream}s reflog if no upstream arg (--merge)
+ok 16 - changed commit with sm config
 
-expecting success of 3400.20 'default to common base in @{upstream}s reflog if no upstream arg (--apply)': 
-	git checkout -B default-base main &&
-	git checkout -B default topic &&
-	git config branch.default.remote . &&
-	git config branch.default.merge refs/heads/default-base &&
-	git rebase --apply &&
-	git rev-parse --verify default-base >expect &&
-	git rev-parse default~1 >actual &&
-	test_cmp expect actual &&
-	git checkout default-base &&
-	git reset --hard HEAD^ &&
-	git checkout default &&
-	git rebase --apply &&
-	git rev-parse --verify default-base >expect &&
-	git rev-parse default~1 >actual &&
+expecting success of 3206.17 'renamed file': 
+	git range-diff --no-color --submodule=log topic...renamed-file >actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid n1) s/5/A/
+	2:  $(test_oid t2) ! 2:  $(test_oid n2) s/4/A/
+	    @@ Metadata
+	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+	    Z
+	    Z ## Commit message ##
+	    -    s/4/A/
+	    +    s/4/A/ + rename file
+	    Z
+	    - ## file ##
+	    + ## file => renamed-file ##
+	    Z@@
+	    Z 1
+	    Z 2
+	3:  $(test_oid t3) ! 3:  $(test_oid n3) s/11/B/
+	    @@ Metadata
+	    Z ## Commit message ##
+	    Z    s/11/B/
+	    Z
+	    - ## file ##
+	    -@@ file: A
+	    + ## renamed-file ##
+	    +@@ renamed-file: A
+	    Z 8
+	    Z 9
+	    Z 10
+	4:  $(test_oid t4) ! 4:  $(test_oid n4) s/12/B/
+	    @@ Metadata
+	    Z ## Commit message ##
+	    Z    s/12/B/
+	    Z
+	    - ## file ##
+	    -@@ file: A
+	    + ## renamed-file ##
+	    +@@ renamed-file: A
+	    Z 9
+	    Z 10
+	    Z B
+	EOF
 	test_cmp expect actual
 
-Switched to and reset branch 'default-base'
-Switched to and reset branch 'default'
-Your branch and 'default-base' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-First, rewinding head to replay your work on top of it...
-Applying: Add B.
-Switched to branch 'default-base'
-HEAD is now at 79095e6 Modify A.
-Switched to branch 'default'
-Your branch is ahead of 'default-base' by 2 commits.
-  (use "git push" to publish your local commits)
-First, rewinding head to replay your work on top of it...
-Applying: Add B.
-ok 20 - default to common base in @{upstream}s reflog if no upstream arg (--apply)
+ok 17 - renamed file
 
-expecting success of 3400.21 'cherry-picked commits and fork-point work together': 
-	git checkout default-base &&
-	echo Amended >A &&
-	git commit -a --no-edit --amend &&
-	test_commit B B &&
-	test_commit new_B B "New B" &&
-	test_commit C C &&
-	git checkout default &&
-	git reset --hard default-base@{4} &&
-	test_commit D D &&
-	git cherry-pick -2 default-base^ &&
-	test_commit final_B B "Final B" &&
-	git rebase &&
-	echo Amended >expect &&
-	test_cmp expect A &&
-	echo "Final B" >expect &&
-	test_cmp expect B &&
-	echo C >expect &&
-	test_cmp expect C &&
-	echo D >expect &&
-	test_cmp expect D
+expecting success of 3206.18 'file with mode only change': 
+	git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t2) ! 1:  $(test_oid o1) s/4/A/
+	    @@ Metadata
+	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+	    Z
+	    Z ## Commit message ##
+	    -    s/4/A/
+	    +    s/4/A/ + add other-file
+	    Z
+	    Z ## file ##
+	    Z@@
+	    @@ file
+	    Z A
+	    Z 6
+	    Z 7
+	    +
+	    + ## other-file (new) ##
+	2:  $(test_oid t3) ! 2:  $(test_oid o2) s/11/B/
+	    @@ Metadata
+	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+	    Z
+	    Z ## Commit message ##
+	    -    s/11/B/
+	    +    s/11/B/ + mode change other-file
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	    @@ file: A
+	    Z 12
+	    Z 13
+	    Z 14
+	    +
+	    + ## other-file (mode change 100644 => 100755) ##
+	3:  $(test_oid t4) = 3:  $(test_oid o3) s/12/B/
+	EOF
+	test_cmp expect actual
 
-Switched to branch 'default-base'
-[default-base 10c1269] Modify A.
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[default-base 33daa44] B
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[default-base bb1e483] new_B
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[default-base 6fcaab7] C
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-Switched to branch 'default'
-Your branch and 'default-base' have diverged,
-and have 2 and 4 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at 79095e6 Modify A.
-[default 25c877f] D
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 D
-[default c1600f1] B
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[default a9d4b07] new_B
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[default 26a2977] final_B
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-warning: skipped previously applied commit c1600f1
-warning: skipped previously applied commit a9d4b07
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/default.
-ok 21 - cherry-picked commits and fork-point work together
+ok 18 - file with mode only change
 
-expecting success of 3400.22 'rebase --apply -q is quiet': 
-	git checkout -b quiet topic &&
-	git rebase --apply -q main >output.out 2>&1 &&
-	test_must_be_empty output.out
+expecting success of 3206.19 'file added and later removed': 
+	git range-diff --no-color --submodule=log topic...added-removed >actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid s1) s/5/A/
+	2:  $(test_oid t2) ! 2:  $(test_oid s2) s/4/A/
+	    @@ Metadata
+	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+	    Z
+	    Z ## Commit message ##
+	    -    s/4/A/
+	    +    s/4/A/ + new-file
+	    Z
+	    Z ## file ##
+	    Z@@
+	    @@ file
+	    Z A
+	    Z 6
+	    Z 7
+	    +
+	    + ## new-file (new) ##
+	3:  $(test_oid t3) ! 3:  $(test_oid s3) s/11/B/
+	    @@ Metadata
+	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
+	    Z
+	    Z ## Commit message ##
+	    -    s/11/B/
+	    +    s/11/B/ + remove file
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	    @@ file: A
+	    Z 12
+	    Z 13
+	    Z 14
+	    +
+	    + ## new-file (deleted) ##
+	4:  $(test_oid t4) = 4:  $(test_oid s4) s/12/B/
+	EOF
+	test_cmp expect actual
 
-Switched to a new branch 'quiet'
-ok 22 - rebase --apply -q is quiet
+ok 19 - file added and later removed
 
-expecting success of 3400.23 'rebase --merge -q is quiet': 
-	git checkout -B quiet topic &&
-	git rebase --merge -q main >output.out 2>&1 &&
-	test_must_be_empty output.out
+expecting success of 3206.20 'no commits on one side': 
+	git commit --amend -m "new message" &&
+	git range-diff main HEAD@{1} HEAD
 
-Reset branch 'quiet'
-ok 23 - rebase --merge -q is quiet
+[main b4b08e4] new message
+ Author: Thomas Rast <trast@inf.ethz.ch>
+ Date: Mon Jul 22 11:25:27 2013 +0200
+ 1 file changed, 20 deletions(-)
+ delete mode 100644 file
+1:  a31b12e < -:  ------- unrelated
+ok 20 - no commits on one side
 
-expecting success of 3400.24 'rebase --exec -q is quiet': 
-	git checkout -B quiet topic &&
-	git rebase --exec true -q main >output.out 2>&1 &&
-	test_must_be_empty output.out
+expecting success of 3206.21 'changed message': 
+	git range-diff --no-color topic...changed-message >actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid m1) s/5/A/
+	2:  $(test_oid t2) ! 2:  $(test_oid m2) s/4/A/
+	    @@ Metadata
+	    Z ## Commit message ##
+	    Z    s/4/A/
+	    Z
+	    +    Also a silly comment here!
+	    +
+	    Z ## file ##
+	    Z@@
+	    Z 1
+	3:  $(test_oid t3) = 3:  $(test_oid m3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid m4) s/12/B/
+	EOF
+	test_cmp expect actual
 
-Reset branch 'quiet'
-ok 24 - rebase --exec -q is quiet
+ok 21 - changed message
 
-expecting success of 3400.25 'Rebase a commit that sprinkles CRs in': 
-	(
-		echo "One" &&
-		echo "TwoQ" &&
-		echo "Three" &&
-		echo "FQur" &&
-		echo "Five"
-	) | q_to_cr >CR &&
-	git add CR &&
-	test_tick &&
-	git commit -a -m "A file with a line with CR" &&
-	git tag file-with-cr &&
-	git checkout HEAD^0 &&
-	git rebase --onto HEAD^^ HEAD^ &&
-	git diff --exit-code file-with-cr:CR HEAD:CR
+expecting success of 3206.22 'dual-coloring': 
+	sed -e "s|^:||" >expect <<-EOF &&
+	:<YELLOW>1:  $(test_oid c1) = 1:  $(test_oid m1) s/5/A/<RESET>
+	:<RED>2:  $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2:  $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
+	:    <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
+	:      ## Commit message ##<RESET>
+	:         s/4/A/<RESET>
+	:     <RESET>
+	:    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
+	:    <REVERSE><GREEN>+<RESET>
+	:      ## file ##<RESET>
+	:    <CYAN> @@<RESET>
+	:      1<RESET>
+	:<RED>3:  $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3:  $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
+	:    <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
+	:      9<RESET>
+	:      10<RESET>
+	:    <RED> -11<RESET>
+	:    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
+	:    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
+	:      12<RESET>
+	:      13<RESET>
+	:      14<RESET>
+	:<RED>4:  $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4:  $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
+	:    <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
+	:    <CYAN> @@ file: A<RESET>
+	:      9<RESET>
+	:      10<RESET>
+	:    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
+	:    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
+	:    <RED> -12<RESET>
+	:    <GREEN> +B<RESET>
+	:      13<RESET>
+	EOF
+	git range-diff changed...changed-message --color --dual-color >actual.raw &&
+	test_decode_color >actual <actual.raw &&
+	test_cmp expect actual
 
-[quiet bdc63e2] A file with a line with CR
- Author: author@name <bogus@email@address>
- 1 file changed, 5 insertions(+)
- create mode 100644 CR
-Note: switching to 'HEAD^0'.
+ok 22 - dual-coloring
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 3206.23 'format-patch --range-diff=topic': 
+		test_when_finished "rm -f 000?-*" &&
+		git format-patch --cover-letter --range-diff=$prev \
+			main..unmodified >actual &&
+		test_line_count = 5 actual &&
+		test_grep "^Range-diff:$" 0000-* &&
+		grep "= 1: .* s/5/A" 0000-* &&
+		grep "= 2: .* s/4/A" 0000-* &&
+		grep "= 3: .* s/11/B" 0000-* &&
+		grep "= 4: .* s/12/B" 0000-*
+	
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+ok 23 - format-patch --range-diff=topic
 
-If you want to 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 3206.24 'format-patch --range-diff=main..topic': 
+		test_when_finished "rm -f 000?-*" &&
+		git format-patch --cover-letter --range-diff=$prev \
+			main..unmodified >actual &&
+		test_line_count = 5 actual &&
+		test_grep "^Range-diff:$" 0000-* &&
+		grep "= 1: .* s/5/A" 0000-* &&
+		grep "= 2: .* s/4/A" 0000-* &&
+		grep "= 3: .* s/11/B" 0000-* &&
+		grep "= 4: .* s/12/B" 0000-*
+	
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+ok 24 - format-patch --range-diff=main..topic
 
-  git switch -c <new-branch-name>
+expecting success of 3206.25 '--range-diff implies --cover-letter for multi-patch series': 
+	test_when_finished "rm -f v2-000?-*" &&
+	git format-patch -v2 --range-diff=topic main..unmodified &&
+	test_grep "^Range-diff against v1:$" v2-0000-cover-letter.patch
 
-Or undo this operation with:
+v2-0000-cover-letter.patch
+v2-0001-s-5-A.patch
+v2-0002-s-4-A.patch
+v2-0003-s-11-B.patch
+v2-0004-s-12-B.patch
+Range-diff against v1:
+ok 25 - --range-diff implies --cover-letter for multi-patch series
 
-  git switch -
+expecting success of 3206.26 'explicit --no-cover-letter defeats implied --cover-letter': 
+	test_when_finished "rm -f v2-000?-*" &&
+	test_must_fail git format-patch --no-cover-letter \
+		-v2 --range-diff=topic main..unmodified &&
+	test_must_fail git -c format.coverLetter=no format-patch \
+		-v2 --range-diff=topic main..unmodified
 
-Turn off this advice by setting config variable advice.detachedHead to false
+fatal: --range-diff requires --cover-letter or single patch
+fatal: --range-diff requires --cover-letter or single patch
+ok 26 - explicit --no-cover-letter defeats implied --cover-letter
 
-HEAD is now at bdc63e2 A file with a line with CR
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 25 - Rebase a commit that sprinkles CRs in
+expecting success of 3206.27 'format-patch --range-diff as commentary': 
+	test_when_finished "rm -f 0001-*" &&
+	git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
+	test_line_count = 1 actual &&
+	test_grep "^Range-diff:$" 0001-* &&
+	grep "> 1: .* new message" 0001-*
 
-expecting success of 3400.26 'rebase can copy notes': 
-	git config notes.rewrite.rebase true &&
-	git config notes.rewriteRef "refs/notes/*" &&
-	test_commit n1 &&
-	test_commit n2 &&
-	test_commit n3 &&
-	git notes add -m"a note" n3 &&
-	git rebase --onto n1 n2 &&
-	test "a note" = "$(git notes show HEAD)"
+Range-diff:
+-:  ------- > 1:  b4b08e4 new message
+ok 27 - format-patch --range-diff as commentary
 
-[detached HEAD 6c4c424] n1
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 n1.t
-[detached HEAD 2a7c249] n2
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 n2.t
-[detached HEAD a23b9cc] n3
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 n3.t
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 26 - rebase can copy notes
+expecting success of 3206.28 'format-patch --range-diff reroll-count with a non-integer': 
+	test_when_finished "rm -f v2.9-0001-*" &&
+	git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual &&
+	test_line_count = 1 actual &&
+	test_grep "^Range-diff:$" v2.9-0001-* &&
+	grep "> 1: .* new message" v2.9-0001-*
 
-expecting success of 3400.27 'rebase -m can copy notes': 
-	git reset --hard n3 &&
-	git rebase -m --onto n1 n2 &&
-	test "a note" = "$(git notes show HEAD)"
+Range-diff:
+-:  ------- > 1:  b4b08e4 new message
+ok 28 - format-patch --range-diff reroll-count with a non-integer
 
-HEAD is now at a23b9cc n3
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 27 - rebase -m can copy notes
+expecting success of 3206.29 'format-patch --range-diff reroll-count with a integer': 
+	test_when_finished "rm -f v2-0001-*" &&
+	git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual &&
+	test_line_count = 1 actual &&
+	test_grep "^Range-diff ..* v1:$" v2-0001-* &&
+	grep "> 1: .* new message" v2-0001-*
 
-expecting success of 3400.28 'rebase commit with an ancient timestamp': 
-	git reset --hard &&
+Range-diff against v1:
+-:  ------- > 1:  b4b08e4 new message
+ok 29 - format-patch --range-diff reroll-count with a integer
 
-	>old.one && git add old.one && test_tick &&
-	git commit --date="@12345 +0400" -m "Old one" &&
-	>old.two && git add old.two && test_tick &&
-	git commit --date="@23456 +0500" -m "Old two" &&
-	>old.three && git add old.three && test_tick &&
-	git commit --date="@34567 +0600" -m "Old three" &&
+expecting success of 3206.30 'format-patch --range-diff with v0': 
+	test_when_finished "rm -f v0-0001-*" &&
+	git format-patch --range-diff=HEAD~1 -v0 HEAD~1 >actual &&
+	test_line_count = 1 actual &&
+	test_grep "^Range-diff:$" v0-0001-* &&
+	grep "> 1: .* new message" v0-0001-*
 
-	git cat-file commit HEAD^^ >actual &&
-	grep "author .* 12345 +0400$" actual &&
-	git cat-file commit HEAD^ >actual &&
-	grep "author .* 23456 +0500$" actual &&
-	git cat-file commit HEAD >actual &&
-	grep "author .* 34567 +0600$" actual &&
+Range-diff:
+-:  ------- > 1:  b4b08e4 new message
+ok 30 - format-patch --range-diff with v0
 
-	git rebase --onto HEAD^^ HEAD^ &&
+expecting success of 3206.31 'range-diff overrides diff.noprefix internally': 
+	git -c diff.noprefix=true range-diff HEAD^...
 
-	git cat-file commit HEAD >actual &&
-	grep "author .* 34567 +0600$" actual
+-:  ------- > 1:  b4b08e4 new message
+ok 31 - range-diff overrides diff.noprefix internally
 
-HEAD is now at 8512196 n3
-[detached HEAD 672de63] Old one
- Author: author@name <bogus@email@address>
- Date: Thu Jan 1 07:25:45 1970 +0400
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 old.one
-[detached HEAD bcd1a5d] Old two
- Author: author@name <bogus@email@address>
- Date: Thu Jan 1 11:30:56 1970 +0500
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 old.two
-[detached HEAD e1aec6b] Old three
- Author: author@name <bogus@email@address>
- Date: Thu Jan 1 15:36:07 1970 +0600
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 old.three
-author author@name <bogus@email@address> 12345 +0400
-author author@name <bogus@email@address> 23456 +0500
-author author@name <bogus@email@address> 34567 +0600
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-author author@name <bogus@email@address> 34567 +0600
-ok 28 - rebase commit with an ancient timestamp
+expecting success of 3206.32 'basic with modified format.pretty with suffix': 
+	git -c format.pretty="format:commit %H%d%n" range-diff \
+		main..topic main..unmodified
 
-expecting success of 3400.29 'rebase with "From " line in commit message': 
-	git checkout -b preserve-from main~1 &&
-	cat >From_.msg <<EOF &&
-Somebody embedded an mbox in a commit message
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+ok 32 - basic with modified format.pretty with suffix
 
-This is from so-and-so:
+expecting success of 3206.33 'basic with modified format.pretty without "commit "': 
+	git -c format.pretty="format:%H%n" range-diff \
+		main..topic main..unmodified
 
-From a@b Mon Sep 17 00:00:00 2001
-From: John Doe <nobody@example.com>
-Date: Sat, 11 Nov 2017 00:00:00 +0000
-Subject: not this message
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+ok 33 - basic with modified format.pretty without "commit "
 
-something
-EOF
-	>From_ &&
-	git add From_ &&
-	git commit -F From_.msg &&
-	git rebase main &&
-	git log -1 --pretty=format:%B >out &&
-	test_cmp From_.msg out
+expecting success of 3206.34 'range-diff compares notes by default': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	git range-diff --no-color main..topic main..unmodified \
+		>actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	test_cmp expect actual
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+Removing note for object topic
+Removing note for object unmodified
+ok 34 - range-diff compares notes by default
 
-  2aa280f Old three
-  672de63 Old one
-  8512196 n3
+expecting success of 3206.35 'range-diff with --no-notes': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	git range-diff --no-color --no-notes main..topic main..unmodified \
+		>actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
+	EOF
+	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:
+Removing note for object topic
+Removing note for object unmodified
+ok 35 - range-diff with --no-notes
 
- git branch <new-branch-name> 2aa280f
+expecting success of 3206.36 'range-diff with multiple --notes': 
+	test_when_finished "git notes --ref=note1 remove topic unmodified || :" &&
+	git notes --ref=note1 add -m "topic note1" topic &&
+	git notes --ref=note1 add -m "unmodified note1" unmodified &&
+	test_when_finished "git notes --ref=note2 remove topic unmodified || :" &&
+	git notes --ref=note2 add -m "topic note2" topic &&
+	git notes --ref=note2 add -m "unmodified note2" unmodified &&
+	git range-diff --no-color --notes=note1 --notes=note2 main..topic main..unmodified \
+		>actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes (note1) ##
+	    -    topic note1
+	    +    unmodified note1
+	    Z
+	    Z
+	    Z ## Notes (note2) ##
+	    -    topic note2
+	    +    unmodified note2
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	test_cmp expect actual
 
-Switched to a new branch 'preserve-from'
-[preserve-from 6a4c2b7] Somebody embedded an mbox in a commit message
- Author: author@name <bogus@email@address>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 From_
-Rebasing (1/1)
Successfully rebased and updated refs/heads/preserve-from.
-ok 29 - rebase with "From " line in commit message
+Removing note for object topic
+Removing note for object unmodified
+Removing note for object topic
+Removing note for object unmodified
+ok 36 - range-diff with multiple --notes
 
-expecting success of 3400.30 'rebase --apply and --show-current-patch': 
-	test_create_repo conflict-apply &&
-	(
-		cd conflict-apply &&
-		test_commit init &&
-		echo one >>init.t &&
-		git commit -a -m one &&
-		echo two >>init.t &&
-		git commit -a -m two &&
-		git tag two &&
-		test_must_fail git rebase --apply -f --onto init HEAD^ &&
-		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-		grep "show.*$(git rev-parse two)" stderr
-	)
+expecting success of 3206.37 'range-diff with --notes=custom does not show default notes': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished "git notes --ref=custom remove topic unmodified || :" &&
+	git notes --ref=custom add -m "topic note" topic &&
+	git notes --ref=custom add -m "unmodified note" unmodified &&
+	git range-diff --notes=custom main..topic main..unmodified \
+		>actual &&
+	! grep "## Notes ##" actual &&
+	grep "## Notes (custom) ##" actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/conflict-apply/.git/
-[main (root-commit) 4ee1594] init
- Author: author@name <bogus@email@address>
+      ## Notes (custom) ##
+Removing note for object topic
+Removing note for object unmodified
+Removing note for object topic
+Removing note for object unmodified
+ok 37 - range-diff with --notes=custom does not show default notes
+
+expecting success of 3206.38 'format-patch --range-diff does not compare notes by default': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished "rm -f 000?-*" &&
+	git format-patch --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_line_count = 5 actual &&
+	test_grep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "= 4: .* s/12/B" 0000-* &&
+	! grep "Notes" 0000-* &&
+	! grep "note" 0000-*
+
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+Removing note for object topic
+Removing note for object unmodified
+ok 38 - format-patch --range-diff does not compare notes by default
+
+expecting success of 3206.39 'format-patch --notes=custom --range-diff only compares custom notes': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished "git notes --ref=custom remove topic unmodified || :" &&
+	git notes --ref=custom add -m "topic note (custom)" topic &&
+	git notes --ref=custom add -m "unmodified note (custom)" unmodified &&
+	test_when_finished "rm -f 000?-*" &&
+	git format-patch --notes=custom --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	grep "## Notes (custom) ##" 0000-* &&
+	! grep "## Notes ##" 0000-*
+
+      ## Notes (custom) ##
+Removing note for object topic
+Removing note for object unmodified
+Removing note for object topic
+Removing note for object unmodified
+ok 39 - format-patch --notes=custom --range-diff only compares custom notes
+
+expecting success of 3206.40 'format-patch --range-diff with --no-notes': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished "rm -f 000?-*" &&
+	git format-patch --no-notes --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_line_count = 5 actual &&
+	test_grep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "= 4: .* s/12/B" 0000-* &&
+	! grep "Notes" 0000-* &&
+	! grep "note" 0000-*
+
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+Removing note for object topic
+Removing note for object unmodified
+ok 40 - format-patch --range-diff with --no-notes
+
+expecting success of 3206.41 'format-patch --range-diff with --notes': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished "rm -f 000?-*" &&
+	git format-patch --notes --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_line_count = 5 actual &&
+	test_grep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 ! 4:  2901f77 s/12/B/
+Removing note for object topic
+Removing note for object unmodified
+ok 41 - format-patch --range-diff with --notes
+
+expecting success of 3206.42 'format-patch --range-diff with format.notes config': 
+	test_when_finished "git notes remove topic unmodified || :" &&
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_config format.notes true &&
+	test_when_finished "rm -f 000?-*" &&
+	git format-patch --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_line_count = 5 actual &&
+	test_grep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 ! 4:  2901f77 s/12/B/
+Removing note for object topic
+Removing note for object unmodified
+ok 42 - format-patch --range-diff with format.notes config
+
+expecting success of 3206.43 'format-patch --range-diff with multiple notes': 
+	test_when_finished "git notes --ref=note1 remove topic unmodified || :" &&
+	git notes --ref=note1 add -m "topic note1" topic &&
+	git notes --ref=note1 add -m "unmodified note1" unmodified &&
+	test_when_finished "git notes --ref=note2 remove topic unmodified || :" &&
+	git notes --ref=note2 add -m "topic note2" topic &&
+	git notes --ref=note2 add -m "unmodified note2" unmodified &&
+	test_when_finished "rm -f 000?-*" &&
+	git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_line_count = 5 actual &&
+	test_grep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes (note1) ##
+	    -    topic note1
+	    +    unmodified note1
+	    Z
+	    Z
+	    Z ## Notes (note2) ##
+	    -    topic note2
+	    +    unmodified note2
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 ! 4:  2901f77 s/12/B/
+Removing note for object topic
+Removing note for object unmodified
+Removing note for object topic
+Removing note for object unmodified
+ok 43 - format-patch --range-diff with multiple notes
+
+expecting success of 3206.44 '--left-only/--right-only': 
+	git switch --orphan left-right &&
+	test_commit first &&
+	test_commit unmatched &&
+	test_commit common &&
+	git switch -C left-right first &&
+	git cherry-pick common &&
+
+	git range-diff -s --left-only ...common >actual &&
+	head_oid=$(git rev-parse --short HEAD) &&
+	common_oid=$(git rev-parse --short common) &&
+	echo "1:  $head_oid = 2:  $common_oid common" >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'left-right'
+[left-right (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[main 7f4d086] one
- Author: author@name <bogus@email@address>
+ create mode 100644 first.t
+[left-right 8b3efcc] unmatched
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 4a30746] two
- Author: author@name <bogus@email@address>
+ create mode 100644 unmatched.t
+[left-right 66efeb1] common
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-First, rewinding head to replay your work on top of it...
-Applying: two
-Using index info to reconstruct a base tree...
-M	init.t
-Falling back to patching base and 3-way merge...
-Merging:
-4ee1594 init
-virtual two
-found 1 common ancestor:
-virtual 24619c19508a6b9b476e2c46f4889f730a371ef0
-Auto-merging init.t
-CONFLICT (content): Merge conflict in init.t
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 two
-trace: run_command: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' show 4a30746df05d63c1ff544efc981f6dc849632f55 --
-trace: built-in: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
-ok 30 - rebase --apply and --show-current-patch
-
-expecting success of 3400.31 'rebase --apply and .gitattributes': 
-	test_create_repo attributes &&
-	(
-		cd attributes &&
-		test_commit init &&
-		git config filter.test.clean "sed -e 's/smudged/clean/g'" &&
-		git config filter.test.smudge "sed -e 's/clean/smudged/g'" &&
-
-		test_commit second &&
-		git checkout -b test HEAD^ &&
+ create mode 100644 common.t
+Reset branch 'left-right'
+[left-right a6d113e] common
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 common.t
+ok 44 - --left-only/--right-only
 
-		echo "*.txt filter=test" >.gitattributes &&
-		git add .gitattributes &&
-		test_commit third &&
+expecting success of 3206.45 'ranges with pathspecs': 
+	git range-diff topic...mode-only-change -- other-file >actual &&
+	test_line_count = 2 actual &&
+	topic_oid=$(git rev-parse --short topic) &&
+	mode_change_oid=$(git rev-parse --short mode-only-change^) &&
+	file_change_oid=$(git rev-parse --short mode-only-change) &&
+	grep "$mode_change_oid" actual &&
+	! grep "$file_change_oid" actual &&
+	! grep "$topic_oid" actual
 
-		echo "This text is smudged." >a.txt &&
-		git add a.txt &&
-		test_commit fourth &&
+-:  ------- > 2:  26c107f s/11/B/ + mode change other-file
+ok 45 - ranges with pathspecs
 
-		git checkout -b removal HEAD^ &&
-		git rm .gitattributes &&
-		git add -u &&
-		test_commit fifth &&
-		git cherry-pick test &&
+expecting success of 3206.46 'submodule changes are shown irrespective of diff.submodule': 
+	git init sub-repo &&
+	test_commit -C sub-repo sub-first &&
+	sub_oid1=$(git -C sub-repo rev-parse HEAD) &&
+	test_commit -C sub-repo sub-second &&
+	sub_oid2=$(git -C sub-repo rev-parse HEAD) &&
+	test_commit -C sub-repo sub-third &&
+	sub_oid3=$(git -C sub-repo rev-parse HEAD) &&
 
-		git checkout test &&
-		git rebase main &&
-		grep "smudged" a.txt &&
+	git checkout -b main-sub topic &&
+	git -c protocol.file.allow=always submodule add ./sub-repo sub &&
+	git -C sub checkout --detach sub-first &&
+	git commit -m "add sub" sub &&
+	sup_oid1=$(git rev-parse --short HEAD) &&
+	git checkout -b topic-sub &&
+	git -C sub checkout sub-second &&
+	git commit -m "change sub" sub &&
+	sup_oid2=$(git rev-parse --short HEAD) &&
+	git checkout -b modified-sub main-sub &&
+	git -C sub checkout sub-third &&
+	git commit -m "change sub" sub &&
+	sup_oid3=$(git rev-parse --short HEAD) &&
+	sup_oid0=$(test_oid __) &&
 
-		git checkout removal &&
-		git reset --hard &&
-		git rebase main &&
-		grep "clean" a.txt
-	)
+	test_config diff.submodule log &&
+	git range-diff topic topic-sub modified-sub >actual &&
+	cat >expect <<-EOF &&
+	1:  $sup_oid1 = 1:  $sup_oid1 add sub
+	2:  $sup_oid2 < -:  $sup_oid0 change sub
+	-:  $sup_oid0 > 2:  $sup_oid3 change sub
+	EOF
+	test_cmp expect actual &&
+	test_config diff.submodule diff &&
+	git range-diff topic topic-sub modified-sub >actual &&
+	git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
+	cat >expect <<-EOF &&
+	1:  $sup_oid1 = 1:  $sup_oid1 add sub
+	2:  $sup_oid2 ! 2:  $sup_oid3 change sub
+	    @@ Commit message
+	      ## sub ##
+	     @@
+	     -Subproject commit $sub_oid1
+	    -+Subproject commit $sub_oid2
+	    ++Subproject commit $sub_oid3
+	EOF
+	test_cmp expect actual &&
+	test_config diff.submodule diff &&
+	git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/attributes/.git/
-[main (root-commit) 4ee1594] init
- Author: author@name <bogus@email@address>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3206-range-diff/sub-repo/.git/
+[main (root-commit) 0dd48dc] sub-first
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[main 68fd476] second
- Author: author@name <bogus@email@address>
+ create mode 100644 sub-first.t
+[main 5aa4e7e] sub-second
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 second.t
-Switched to a new branch 'test'
-[test 3071d72] third
- Author: author@name <bogus@email@address>
- 2 files changed, 2 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 third.t
-[test 5339e6c] fourth
- Author: author@name <bogus@email@address>
- 2 files changed, 2 insertions(+)
- create mode 100644 a.txt
- create mode 100644 fourth.t
-Switched to a new branch 'removal'
-rm '.gitattributes'
-[removal f95b76e] fifth
- Author: author@name <bogus@email@address>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 .gitattributes
- create mode 100644 fifth.t
-[removal 5932438] fourth
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:32:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 a.txt
- create mode 100644 fourth.t
-Switched to branch 'test'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
-This text is smudged.
-Switched to branch 'removal'
-HEAD is now at 5932438 fourth
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/removal.
-This text is clean.
-ok 31 - rebase --apply and .gitattributes
+ create mode 100644 sub-second.t
+[main 57c2aa9] sub-third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub-third.t
+Switched to a new branch 'main-sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3206-range-diff/sub'...
+done.
+HEAD is now at 0dd48dc sub-first
+[main-sub 3424d3a] add sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Switched to a new branch 'topic-sub'
+Previous HEAD position was 0dd48dc sub-first
+HEAD is now at 5aa4e7e sub-second
+[topic-sub f8a571b] change sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'modified-sub'
+A	.gitmodules
+M	sub
+Previous HEAD position was 5aa4e7e sub-second
+HEAD is now at 57c2aa9 sub-third
+[modified-sub 3bd1f61] change sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 46 - submodule changes are shown irrespective of diff.submodule
 
-expecting success of 3400.32 'rebase--merge.sh and --show-current-patch': 
-	test_create_repo conflict-merge &&
+expecting success of 3206.47 '--diff-merges': 
+	renamed_oid=$(git rev-parse --short renamed-file) &&
+	tree=$(git merge-tree unmodified renamed-file) &&
+	clean=$(git commit-tree -m merge -p unmodified -p renamed-file $tree) &&
+	clean_oid=$(git rev-parse --short $clean) &&
+	conflict=$(git commit-tree -m merge -p unmodified -p renamed-file^ $tree) &&
+	conflict_oid=$(git rev-parse --short $conflict) &&
+
+	git range-diff --diff-merges=1 $clean...$conflict >actual &&
+	cat >expect <<-EOF &&
+	1:  $renamed_oid < -:  ------- s/12/B/
+	2:  $clean_oid = 1:  $conflict_oid merge
+	EOF
+	test_cmp expect actual
+
+ok 47 - --diff-merges
+
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3207-branch-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/.git/
+expecting success of 3207.1 'setup superproject and submodule': 
+	git config --global protocol.file.allow always &&
+	mkdir test_dirs &&
 	(
-		cd conflict-merge &&
-		test_commit init &&
-		echo one >>init.t &&
-		git commit -a -m one &&
-		echo two >>init.t &&
-		git commit -a -m two &&
-		git tag two &&
-		test_must_fail git rebase --merge --onto init HEAD^ &&
-		git rebase --show-current-patch >actual.patch &&
-		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-		grep "show.*REBASE_HEAD" stderr &&
-		test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
-	)
+		cd test_dirs &&
+		git init super &&
+		test_commit -C super foo &&
+		git init sub-sub-upstream &&
+		test_commit -C sub-sub-upstream foo &&
+		git init sub-upstream &&
+		# Submodule in a submodule
+		git -C sub-upstream submodule add "${pwd}/test_dirs/sub-sub-upstream" sub-sub &&
+		git -C sub-upstream commit -m "add submodule" &&
+		# Regular submodule
+		git -C super submodule add "${pwd}/test_dirs/sub-upstream" sub &&
+		# Submodule in a subdirectory
+		git -C super submodule add "${pwd}/test_dirs/sub-sub-upstream" second/sub &&
+		git -C super commit -m "add submodule" &&
+		git -C super config submodule.propagateBranches true &&
+		git -C super/sub submodule update --init
+	) &&
+	reset_test
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/conflict-merge/.git/
-[main (root-commit) 4ee1594] init
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[main 7f4d086] one
- Author: author@name <bogus@email@address>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/.git/
+[main (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 4a30746] two
- Author: author@name <bogus@email@address>
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream/.git/
+[main (root-commit) 946e985] foo
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Rebasing (1/1)
Auto-merging init.t
-CONFLICT (content): Merge conflict in init.t
-error: could not apply 4a30746... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 4a30746... two
-trace: run_command: git show REBASE_HEAD --
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' show REBASE_HEAD --
-trace: built-in: git show REBASE_HEAD --
-ok 32 - rebase--merge.sh and --show-current-patch
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream/sub-sub'...
+done.
+[main (root-commit) fabad35] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub-sub
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/sub'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/second/sub'...
+done.
+[main a659cca] add submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 second/sub
+ create mode 160000 sub
+Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub-sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/sub/sub-sub'...
+done.
+Submodule path 'sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
+ok 1 - setup superproject and submodule
 
-expecting success of 3400.33 'switch to branch checked out here': 
-	git checkout main &&
-	git rebase main main
+expecting success of 3207.2 '--recurse-submodules should create branches': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a &&
+		git -C sub/sub-sub rev-parse branch-a &&
+		git -C second/sub rev-parse branch-a
+	)
 
-Switched to branch 'main'
-Current branch main is up to date.
-ok 33 - switch to branch checked out here
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+a659cca0b1b849507a0373483187f0dfd198299a
+fabad3591d45028390e48528499f1c234468d2f9
+946e985ab20de757ca5b872b16d64e92ff3803a9
+946e985ab20de757ca5b872b16d64e92ff3803a9
+ok 2 - --recurse-submodules should create branches
 
-expecting success of 3400.34 'switch to branch checked out elsewhere fails': 
-	test_when_finished "
-		git worktree remove wt1 &&
-		git worktree remove wt2 &&
-		git branch -d shared
-	" &&
-	git worktree add wt1 -b shared &&
-	git worktree add wt2 -f shared &&
-	# we test in both worktrees to ensure that works
-	# as expected with "first" and "next" worktrees
-	test_must_fail git -C wt1 rebase shared shared &&
-	test_must_fail git -C wt2 rebase shared shared
+expecting success of 3207.3 '--recurse-submodules should die if submodule.propagateBranches is false': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		echo "fatal: branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled" >expected &&
+		test_must_fail git -c submodule.propagateBranches=false branch --recurse-submodules branch-a 2>actual &&
+		test_cmp expected actual
+	)
 
-Preparing worktree (new branch 'shared')
-HEAD is now at 1fb901f prepare
-Preparing worktree (checking out 'shared')
-HEAD is now at 1fb901f prepare
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/wt2'
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/wt1'
-Deleted branch shared (was 1fb901f).
-ok 34 - switch to branch checked out elsewhere fails
+ok 3 - --recurse-submodules should die if submodule.propagateBranches is false
 
-expecting success of 3400.35 'switch to branch not checked out': 
-	git checkout main &&
-	git branch other &&
-	git rebase main other
+expecting success of 3207.4 '--recurse-submodules should fail when not creating branches': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		echo "fatal: --recurse-submodules can only be used to create branches" >expected &&
+		test_must_fail git branch --recurse-submodules -D branch-a 2>actual &&
+		test_cmp expected actual &&
+		# Assert that the branches were not deleted
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a
+	)
 
-Already on 'main'
-Current branch other is up to date.
-ok 35 - switch to branch not checked out
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+a659cca0b1b849507a0373483187f0dfd198299a
+fabad3591d45028390e48528499f1c234468d2f9
+ok 4 - --recurse-submodules should fail when not creating branches
 
-expecting success of 3400.36 'switch to non-branch detaches HEAD': 
-	git checkout main &&
-	old_main=$(git rev-parse HEAD) &&
-	git rebase First Second^0 &&
-	test_cmp_rev HEAD Second &&
-	test_cmp_rev main $old_main &&
-	test_must_fail git symbolic-ref HEAD
+expecting success of 3207.5 'should respect submodule.recurse when creating branches': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -c submodule.recurse=true branch branch-a &&
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a
+	)
 
-Switched to branch 'main'
-Current branch Second^0 is up to date.
-fatal: ref HEAD is not a symbolic ref
-ok 36 - switch to non-branch detaches HEAD
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+a659cca0b1b849507a0373483187f0dfd198299a
+fabad3591d45028390e48528499f1c234468d2f9
+ok 5 - should respect submodule.recurse when creating branches
 
-expecting success of 3400.37 'refuse to switch to branch checked out elsewhere': 
-	git checkout main &&
-	git worktree add wt &&
-	test_must_fail git -C wt rebase main main 2>err &&
-	test_grep "already used by worktree at" err &&
-	test_must_fail git -C wt rebase --quit 2>err &&
-	test_grep "no rebase in progress" err
+expecting success of 3207.6 'should ignore submodule.recurse when not creating branches': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git -c submodule.recurse=true branch -D branch-a &&
+		test_no_branch . branch-a &&
+		git -C sub rev-parse branch-a
+	)
 
-Previous HEAD position was 5d79b4b Add B.
-Switched to branch 'main'
-Preparing worktree (new branch 'wt')
-HEAD is now at 1fb901f prepare
-fatal: 'main' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase'
-fatal: no rebase in progress
-ok 37 - refuse to switch to branch checked out elsewhere
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+Deleted branch branch-a (was a659cca).
+branch-a
+fatal: ambiguous argument 'branch-a': unknown revision or path not in the working tree.
+fabad3591d45028390e48528499f1c234468d2f9
+ok 6 - should ignore submodule.recurse when not creating branches
 
-expecting success of 3400.38 'rebase when inside worktree subdirectory': 
-	git init main-wt &&
+expecting success of 3207.7 'should create branches based off commit id in superproject': 
+	test_when_finished "reset_test" &&
 	(
-		cd main-wt &&
-		git commit --allow-empty -m "initial" &&
-		mkdir -p foo/bar &&
-		test_commit foo/bar/baz &&
-		mkdir -p a/b &&
-		test_commit a/b/c &&
-		# create another branch for our other worktree
-		git branch other &&
-		git worktree add ../other-wt other &&
-		cd ../other-wt &&
-		# create and cd into a subdirectory
-		mkdir -p random/dir &&
-		cd random/dir &&
-		# now do the rebase
-		git rebase --onto HEAD^^ HEAD^  # drops the HEAD^ commit
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git checkout --recurse-submodules branch-a &&
+		git -C sub rev-parse HEAD >expected &&
+		# Move the tip of sub:branch-a so that it no longer matches the commit in super:branch-a
+		git -C sub checkout branch-a &&
+		test_commit -C sub bar &&
+		# Create a new branch-b branch with start-point=branch-a
+		git branch --recurse-submodules branch-b branch-a &&
+		git rev-parse branch-b &&
+		git -C sub rev-parse branch-b >actual &&
+		# Assert that the commit id of sub:second-branch matches super:branch-a and not sub:branch-a
+		test_cmp expected actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/main-wt/.git/
-[main (root-commit) 18c3868] initial
- Author: author@name <bogus@email@address>
-[main ab220b2] foo/bar/baz
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-[main c2b5a42] a/b/c
- Author: author@name <bogus@email@address>
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+Switched to branch 'branch-a'
+Switched to branch 'branch-a'
+[branch-a 55e03b0] bar
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a/b/c.t
-Preparing worktree (checking out 'other')
-HEAD is now at c2b5a42 a/b/c
-Rebasing (1/1)
Successfully rebased and updated refs/heads/other.
-ok 38 - rebase when inside worktree subdirectory
+ create mode 100644 bar.t
+submodule 'second/sub': creating branch 'branch-b'
+submodule 'sub': creating branch 'branch-b'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-b'
+a659cca0b1b849507a0373483187f0dfd198299a
+ok 7 - should create branches based off commit id in superproject
 
-expecting success of 3400.39 'git rebase --update-ref with core.commentChar and branch on worktree': 
-	test_when_finished git branch -D base topic2 &&
-	test_when_finished git checkout main &&
-	test_when_finished git branch -D wt-topic &&
-	test_when_finished git worktree remove wt-topic &&
-	git checkout main &&
-	git checkout -b base &&
-	git checkout -b topic2 &&
-	test_commit msg2 &&
-	git worktree add wt-topic &&
-	git checkout base &&
-	test_commit msg3 &&
-	git checkout topic2 &&
-	GIT_SEQUENCE_EDITOR="cat >actual" git -c core.commentChar=% \
-		 rebase -i --update-refs base &&
-	test_grep "% Ref refs/heads/wt-topic checked out at" actual &&
-	test_grep "% Ref refs/heads/topic2 checked out at" actual
+expecting success of 3207.8 'should not create any branches if branch is not valid for all repos': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -C sub branch branch-a &&
+		test_must_fail git branch --recurse-submodules branch-a 2>actual &&
+		test_no_branch . branch-a &&
+		grep "submodule .sub.: fatal: a branch named .branch-a. already exists" actual
+	)
 
-Already on 'main'
-Switched to a new branch 'base'
-Switched to a new branch 'topic2'
-[topic2 db88505] msg2
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 msg2.t
-Preparing worktree (new branch 'wt-topic')
-HEAD is now at db88505 msg2
-Switched to branch 'base'
-[base 7803bc8] msg3
- Author: author@name <bogus@email@address>
+branch-a
+fatal: ambiguous argument 'branch-a': unknown revision or path not in the working tree.
+submodule 'sub': fatal: a branch named 'branch-a' already exists
+ok 8 - should not create any branches if branch is not valid for all repos
+
+expecting success of 3207.9 'should create branches if branch exists and --force is given': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -C sub rev-parse HEAD >expected &&
+		test_commit -C sub baz &&
+		# branch-a in sub now points to a newer commit.
+		git -C sub branch branch-a HEAD &&
+		git -C sub rev-parse branch-a >actual-old-branch-a &&
+		git branch --recurse-submodules --force branch-a &&
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a >actual-new-branch-a &&
+		test_cmp expected actual-new-branch-a &&
+		# assert that branch --force actually moved the sub
+		# branch
+		! test_cmp expected actual-old-branch-a
+	)
+
+[main 5f30a46] baz
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 msg3.t
-Switched to branch 'topic2'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic2.
-% Ref refs/heads/wt-topic checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/wt-topic'
-% Ref refs/heads/topic2 checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase'
-Deleted branch wt-topic (was db88505).
-Switched to branch 'main'
-Deleted branch base (was 7803bc8).
-Deleted branch topic2 (was 784ba1d).
-ok 39 - git rebase --update-ref with core.commentChar and branch on worktree
+ create mode 100644 baz.t
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+a659cca0b1b849507a0373483187f0dfd198299a
+--- expected	2026-03-14 13:28:23.934677808 +0000
++++ actual-old-branch-a	2026-03-14 13:28:24.086677808 +0000
+@@ -1 +1 @@
+-fabad3591d45028390e48528499f1c234468d2f9
++5f30a46d99c99a2d6f32daf26fe6bfe59b279761
+ok 9 - should create branches if branch exists and --force is given
 
-# passed all 39 test(s)
-1..39
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3405-rebase-malformed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3405-rebase-malformed/.git/
-expecting success of 3405.1 'setup': 
+expecting success of 3207.10 'should create branch when submodule is not in HEAD:.gitmodules': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch branch-a &&
+		git checkout -b branch-b &&
+		git submodule add ../sub-upstream sub2 &&
+		git -C sub2 submodule update --init &&
+		# branch-b now has a committed submodule not in branch-a
+		git commit -m "add second submodule" &&
+		git checkout branch-a &&
+		git branch --recurse-submodules branch-c branch-b &&
+		git checkout --recurse-submodules branch-c &&
+		git -C sub2 rev-parse branch-c &&
+		git -C sub2/sub-sub rev-parse branch-c
+	)
 
-	>file1 &&
-	>file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m "Initial commit" &&
-	git branch diff-in-message &&
-	git branch empty-message-merge &&
+Switched to a new branch 'branch-b'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super/sub2'...
+done.
+Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub-sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super/sub2/sub-sub'...
+done.
+Submodule path 'sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
+[branch-b 75b433c] add second submodule
+ 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 'branch-a'
+submodule 'second/sub': creating branch 'branch-c'
+submodule 'sub': creating branch 'branch-c'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-c'
+submodule 'sub2': creating branch 'branch-c'
+submodule 'sub2': submodule 'sub-sub': creating branch 'branch-c'
+Switched to branch 'branch-c'
+fabad3591d45028390e48528499f1c234468d2f9
+946e985ab20de757ca5b872b16d64e92ff3803a9
+ok 10 - should create branch when submodule is not in HEAD:.gitmodules
 
-	git checkout -b multi-line-subject &&
-	cat F >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -F F &&
+expecting success of 3207.11 'should not create branches in inactive submodules': 
+	test_when_finished "reset_test" &&
+	test_config -C super submodule.sub.active false &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git rev-parse branch-a &&
+		test_no_branch sub branch-a
+	)
 
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
+submodule 'second/sub': creating branch 'branch-a'
+a659cca0b1b849507a0373483187f0dfd198299a
+branch-a
+fatal: ambiguous argument 'branch-a': unknown revision or path not in the working tree.
+ok 11 - should not create branches in inactive submodules
 
-	git checkout diff-in-message &&
-	echo "commit log message containing a diff" >G &&
-	echo "" >>G &&
-	cat G >file2 &&
-	git add file2 &&
-	git diff --cached >>G &&
-	test_tick &&
-	git commit -F G &&
+expecting success of 3207.12 'should set up tracking of local branches with track=always': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -c branch.autoSetupMerge=always branch --recurse-submodules branch-a main &&
+		git -C sub rev-parse main &&
+		test_cmp_config -C sub . branch.branch-a.remote &&
+		test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+	)
 
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 &&
+branch 'branch-a' set up to track 'main'.
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'second/sub': branch 'branch-a' set up to track 'main'.
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': branch 'branch-a' set up to track 'main'.
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'main'.
+fabad3591d45028390e48528499f1c234468d2f9
+ok 12 - should set up tracking of local branches with track=always
 
-	git checkout empty-message-merge &&
-	echo file3 >file3 &&
-	git add file3 &&
-	git commit --allow-empty-message -m "" &&
+expecting success of 3207.13 'should set up tracking of local branches with explicit track': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --track --recurse-submodules branch-a main &&
+		git -C sub rev-parse main &&
+		test_cmp_config -C sub . branch.branch-a.remote &&
+		test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+	)
 
-	git checkout main &&
+branch 'branch-a' set up to track 'main'.
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'second/sub': branch 'branch-a' set up to track 'main'.
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': branch 'branch-a' set up to track 'main'.
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'main'.
+fabad3591d45028390e48528499f1c234468d2f9
+ok 13 - should set up tracking of local branches with explicit track
 
-	echo One >file1 &&
-	test_tick &&
-	git add file1 &&
-	git commit -m "Second commit"
+expecting success of 3207.14 'should not set up unnecessary tracking of local branches': 
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a main &&
+		git -C sub rev-parse main &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.merge
+	)
 
-[main (root-commit) a8d727e] Initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'multi-line-subject'
-[multi-line-subject 5037af6] This is an example of a commit log message that does not  conform to git commit convention.
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Switched to branch 'diff-in-message'
-[diff-in-message 132c17c] commit log message containing a diff
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'empty-message-merge'
-[empty-message-merge 942c0ff] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to branch 'main'
-[main d5181bc] Second commit
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+fabad3591d45028390e48528499f1c234468d2f9
+ok 14 - should not set up unnecessary tracking of local branches
+
+expecting success of 3207.15 'setup tests with remotes': 
+	(
+		cd test_dirs &&
+		(
+			cd super &&
+			git branch branch-a &&
+			git checkout -b branch-b &&
+			git submodule add ../sub-upstream sub2 &&
+			# branch-b now has a committed submodule not in branch-a
+			git commit -m "add second submodule"
+		) &&
+		git clone --branch main --recurse-submodules super super-clone &&
+		git -C super-clone config submodule.propagateBranches true
+	) &&
+	reset_remote_test
+
+Switched to a new branch 'branch-b'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super/sub2'...
+done.
+[branch-b 75b433c] add second submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub2
+Cloning into 'super-clone'...
+done.
+Submodule 'second/sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'second/sub'
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super-clone/second/sub'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super-clone/sub'...
+done.
+Submodule path 'second/sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
+Submodule path 'sub': checked out 'fabad3591d45028390e48528499f1c234468d2f9'
+Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub/sub-sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/super-clone/sub/sub-sub'...
+done.
+Submodule path 'sub/sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
+ok 15 - setup tests with remotes
 
-expecting success of 3405.2 'rebase commit with multi-line subject': 
+expecting success of 3207.16 'should get fatal error upon branch creation when submodule is not in .git/modules': 
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		# This should succeed because super-clone has sub in .git/modules
+		git branch --recurse-submodules branch-a origin/branch-a &&
+		# This should fail because super-clone does not have sub2 .git/modules
+		test_must_fail git branch --recurse-submodules branch-b origin/branch-b 2>actual &&
+		grep "fatal: submodule .sub2.: unable to find submodule" actual &&
+		test_no_branch . branch-b &&
+		test_no_branch sub branch-b &&
+		# User can fix themselves by initializing the submodule
+		git checkout origin/branch-b &&
+		git submodule update --init --recursive &&
+		git branch --recurse-submodules branch-b origin/branch-b
+	)
 
-	git rebase main multi-line-subject &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
+branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'second/sub': branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'origin/branch-a'.
+fatal: submodule 'sub2': unable to find submodule
+branch-b
+fatal: ambiguous argument 'branch-b': unknown revision or path not in the working tree.
+branch-b
+fatal: ambiguous argument 'branch-b': unknown revision or path not in the working tree.
+Note: switching to 'origin/branch-b'.
 
-	test_cmp F0 F1 &&
-	test_cmp F F0
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Rebasing (1/1)
Successfully rebased and updated refs/heads/multi-line-subject.
-ok 2 - rebase commit with multi-line subject
+If you want to 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 3405.3 'rebase commit with diff in message': 
-	git rebase main diff-in-message &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >G1 &&
-	test_cmp G0 G1 &&
-	test_cmp G G0
+  git switch -c <new-branch-name>
 
-Rebasing (1/1)
Successfully rebased and updated refs/heads/diff-in-message.
-ok 3 - rebase commit with diff in message
+Or undo this operation with:
 
-expecting success of 3405.4 'rebase -m commit with empty message': 
-	git rebase -m main empty-message-merge
+  git switch -
 
-Rebasing (1/1)
Successfully rebased and updated refs/heads/empty-message-merge.
-ok 4 - rebase -m commit with empty message
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3405.5 'rebase -i commit with empty message': 
-	git checkout diff-in-message &&
-	set_fake_editor &&
-	test_must_fail env FAKE_COMMIT_MESSAGE=" " FAKE_LINES="reword 1" \
-		git rebase -i HEAD^
+HEAD is now at 75b433c add second submodule
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-upstream) registered for path 'sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super-clone/sub2'...
+done.
+Submodule path 'sub2': checked out 'fabad3591d45028390e48528499f1c234468d2f9'
+Submodule 'sub-sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/test_dirs/sub-sub-upstream) registered for path 'sub2/sub-sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3207-branch-submodule/super-clone/sub2/sub-sub'...
+done.
+Submodule path 'sub2/sub-sub': checked out '946e985ab20de757ca5b872b16d64e92ff3803a9'
+branch 'branch-b' set up to track 'origin/branch-b'.
+submodule 'second/sub': creating branch 'branch-b'
+submodule 'second/sub': branch 'branch-b' set up to track 'origin/branch-b'.
+submodule 'sub': creating branch 'branch-b'
+submodule 'sub': branch 'branch-b' set up to track 'origin/branch-b'.
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-b'
+submodule 'sub': submodule 'sub-sub': branch 'branch-b' set up to track 'origin/branch-b'.
+submodule 'sub2': creating branch 'branch-b'
+submodule 'sub2': branch 'branch-b' set up to track 'origin/branch-b'.
+submodule 'sub2': submodule 'sub-sub': creating branch 'branch-b'
+submodule 'sub2': submodule 'sub-sub': branch 'branch-b' set up to track 'origin/branch-b'.
+ok 16 - should get fatal error upon branch creation when submodule is not in .git/modules
 
-Switched to branch 'diff-in-message'
-rebase -i script before editing:
-pick 87b000b commit log message containing a diff
+expecting success of 3207.17 'should set up tracking of remote-tracking branches by default': 
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		git branch --recurse-submodules branch-a origin/branch-a &&
+		test_cmp_config origin branch.branch-a.remote &&
+		test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
+		# "origin/branch-a" does not exist for "sub", but it matches the refspec
+		# so tracking should be set up
+		test_cmp_config -C sub origin branch.branch-a.remote &&
+		test_cmp_config -C sub refs/heads/branch-a branch.branch-a.merge &&
+		test_cmp_config -C sub/sub-sub origin branch.branch-a.remote &&
+		test_cmp_config -C sub/sub-sub refs/heads/branch-a branch.branch-a.merge
+	)
 
-rebase -i script after editing:
-reword 87b000b commit log message containing a diff
-Rebasing (1/1)
Aborting commit due to empty commit message.
-You can amend the commit now, with
+branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'second/sub': branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'origin/branch-a'.
+ok 17 - should set up tracking of remote-tracking branches by default
 
-  git commit --amend 
+expecting success of 3207.18 'should not fail when unable to set up tracking in submodule': 
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		git remote rename origin ex-origin &&
+		git branch --recurse-submodules branch-a ex-origin/branch-a &&
+		test_cmp_config ex-origin branch.branch-a.remote &&
+		test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.merge
+	)
 
-Once you are satisfied with your changes, run
+branch 'branch-a' set up to track 'ex-origin/branch-a'.
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+ok 18 - should not fail when unable to set up tracking in submodule
 
-  git rebase --continue
-ok 5 - rebase -i commit with empty message
+expecting success of 3207.19 '--track=inherit should set up tracking correctly': 
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		git branch --recurse-submodules branch-a origin/branch-a &&
+		# Set this manually instead of using branch --set-upstream-to
+		# to circumvent the "nonexistent upstream" check.
+		git -C sub config branch.branch-a.remote origin &&
+		git -C sub config branch.branch-a.merge refs/heads/sub-branch-a &&
+		git -C sub/sub-sub config branch.branch-a.remote other &&
+		git -C sub/sub-sub config branch.branch-a.merge refs/heads/sub-sub-branch-a &&
 
-# passed all 5 test(s)
-1..5
+		git branch --recurse-submodules --track=inherit branch-b branch-a &&
+		test_cmp_config origin branch.branch-b.remote &&
+		test_cmp_config refs/heads/branch-a branch.branch-b.merge &&
+		test_cmp_config -C sub origin branch.branch-b.remote &&
+		test_cmp_config -C sub refs/heads/sub-branch-a branch.branch-b.merge &&
+		test_cmp_config -C sub/sub-sub other branch.branch-b.remote &&
+		test_cmp_config -C sub/sub-sub refs/heads/sub-sub-branch-a branch.branch-b.merge
+	)
+
+branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'second/sub': branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': branch 'branch-a' set up to track 'origin/branch-a'.
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': branch 'branch-a' set up to track 'origin/branch-a'.
+branch 'branch-b' set up to track 'origin/branch-a'.
+submodule 'second/sub': creating branch 'branch-b'
+submodule 'second/sub': branch 'branch-b' set up to track 'origin/branch-a'.
+submodule 'sub': creating branch 'branch-b'
+submodule 'sub': branch 'branch-b' set up to track 'origin/sub-branch-a'.
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-b'
+submodule 'sub': submodule 'sub-sub': branch 'branch-b' set up to track 'other/sub-sub-branch-a'.
+ok 19 - --track=inherit should set up tracking correctly
+
+expecting success of 3207.20 '--no-track should not set up tracking': 
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		git branch --recurse-submodules --no-track branch-a origin/branch-a &&
+		test_cmp_config "" --default "" branch.branch-a.remote &&
+		test_cmp_config "" --default "" branch.branch-a.merge &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.merge &&
+		test_cmp_config -C sub/sub-sub "" --default "" branch.branch-a.remote &&
+		test_cmp_config -C sub/sub-sub "" --default "" branch.branch-a.merge
+	)
+
+submodule 'second/sub': creating branch 'branch-a'
+submodule 'sub': creating branch 'branch-a'
+submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
+ok 20 - --no-track should not set up tracking
+
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2013-checkout-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/.git/
-expecting success of 2013.1 'setup': 
-	mkdir submodule &&
-	(cd submodule &&
-	 git init &&
-	 test_commit first) &&
-	git add submodule &&
-	test_tick &&
-	git commit -m superproject &&
-	(cd submodule &&
-	 test_commit second) &&
-	git add submodule &&
-	test_tick &&
-	git commit -m updated.superproject
+*** t3308-notes-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3308-notes-merge/.git/
+expecting success of 3308.1 'setup': 
+	test_commit 1st &&
+	test_commit 2nd &&
+	test_commit 3rd &&
+	test_commit 4th &&
+	test_commit 5th &&
+	# Create notes on 4 first commits
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "Notes on 1st commit" 1st &&
+	git notes add -m "Notes on 2nd commit" 2nd &&
+	git notes add -m "Notes on 3rd commit" 3rd &&
+	git notes add -m "Notes on 4th commit" 4th &&
+	# Copy notes to remote-notes
+	git fetch . refs/notes/*:refs/remote-notes/origin/* &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule/.git/
-[master (root-commit) 50e526b] first
+	test_oid_cache <<-EOF
+	hash4a sha1:5e93d24084d32e1cb61f7070505b9d2530cca987
+	hash3a sha1:8366731eeee53787d2bdf8fc1eff7d94757e8da0
+	hash2a sha1:eede89064cd42441590d6afec6c37b321ada3389
+	hash1a sha1:daa55ffad6cb99bf64226532147ffcaf5ce8bdd1
+	hash5b sha1:0f2efbd00262f2fd41dfae33df8765618eeacd99
+	hash4b sha1:dec2502dac3ea161543f71930044deff93fa945c
+	hash3b sha1:4069cdb399fd45463ec6eef8e051a16a03592d91
+	hash2c sha1:d000d30e6ddcfce3a8122c403226a2ce2fd04d9d
+	hash1c sha1:43add6bd0c8c0bc871ac7991e0f5573cfba27804
+	hash4d sha1:1f257a3a90328557c452f0817d6cc50c89d315d4
+	hash3d sha1:05a4927951bcef347f51486575b878b2b60137f2
+
+	hash4a sha256:eef876be1d32ac2e2e42240e0429325cec116e55e88cb2969899fac695aa762f
+	hash3a sha256:cf7cd1bc091d7ba4166a86df864110e42087cd893a5ae96bc50d637e0290939d
+	hash2a sha256:21ddde7ebce2c285213898cb04deca0fd3209610cf7aaf8222e4e2f45262fae2
+	hash1a sha256:f9fe0eda16c6027732ed9d4295689a03abd16f893be69b3dcbf4037ddb191921
+	hash5b sha256:20046f2244577797a9e3d3f790ea9eca4d8a6bafb2a5570bcb0e03aa02ce100b
+	hash4b sha256:f90563d134c61a95bb88afbd45d48ccc9e919c62aa6fbfcd483302b3e4d8dbcb
+	hash3b sha256:988f2aca9f2d87e93e6a73197c2bb99560cc44a2f92d18653968f956f01221e0
+	hash2c sha256:84153b777b4d42827a756c6578dcdb59d8ae5d1360b874fb37c430150c825c26
+	hash1c sha256:9beb2bc4eef72e4c4087be168a20573e34d993d9ab1883055f23e322afa06567
+	hash4d sha256:32de39dc06e679a7abb2d4a55ede7709b3124340a4a90aa305971b1c72ac319d
+	hash3d sha256:fa73b20e41cbb7541c4c81d1535016131dbfbeb05bf6a71f6115e9cad31c7af5
+	EOF
+
+[master (root-commit) 04ed9a0] 1st
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 first.t
-warning: adding embedded git repository: submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submodule
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submodule
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) 1844aa5] superproject
+ create mode 100644 1st.t
+[master 7a4ca6e] 2nd
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 160000 submodule
-[master d662100] second
+ create mode 100644 2nd.t
+[master d07d62e] 3rd
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master 14e674f] updated.superproject
+ create mode 100644 3rd.t
+[master 0f7aa3e] 4th
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4th.t
+[master 7f9ad88] 5th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5th.t
+From .
+ * [new ref]         refs/notes/x -> refs/remote-notes/origin/x
 ok 1 - setup
 
-expecting success of 2013.2 '"reset <submodule>" updates the index': 
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD &&
-	git reset HEAD^ submodule &&
-	test_must_fail git diff-files --quiet &&
-	git reset submodule &&
-	git diff-files --quiet
+expecting success of 3308.2 'verify initial notes (x)': 
+	verify_notes x
 
-Unstaged changes after reset:
-M	submodule
-ok 2 - "reset <submodule>" updates the index
+ok 2 - verify initial notes (x)
 
-expecting success of 2013.3 '"checkout <submodule>" updates the index only': 
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD &&
-	git checkout HEAD^ submodule &&
-	test_must_fail git diff-files --quiet &&
-	git checkout HEAD submodule &&
-	git diff-files --quiet
+expecting success of 3308.3 'fail to merge empty notes ref into empty notes ref (z => y)': 
+	test_must_fail git -c "core.notesRef=refs/notes/y" notes merge z
 
-Updated 0 paths from f0404a9
-Updated 0 paths from 29aef3d
-ok 3 - "checkout <submodule>" updates the index only
+fatal: Cannot merge empty notes ref (refs/notes/z) into empty notes ref (refs/notes/y)
+ok 3 - fail to merge empty notes ref into empty notes ref (z => y)
 
-expecting success of 2013.4 '"checkout <submodule>" honors diff.ignoreSubmodules': 
-	git config diff.ignoreSubmodules dirty &&
-	echo x> submodule/untracked &&
-	git checkout HEAD >actual 2>&1 &&
-	test_must_be_empty actual
+expecting success of 3308.4 'fail to merge into various non-notes refs': 
+	test_must_fail git -c "core.notesRef=refs/notes" notes merge x &&
+	test_must_fail git -c "core.notesRef=refs/notes/" notes merge x &&
+	git update-ref refs/notes/dir/foo HEAD &&
+	test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
+	test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
+	test_must_fail git -c "core.notesRef=refs/heads/main" notes merge x &&
+	test_must_fail git -c "core.notesRef=refs/notes/y:" notes merge x &&
+	test_must_fail git -c "core.notesRef=refs/notes/y:foo" notes merge x &&
+	test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
 
-ok 4 - "checkout <submodule>" honors diff.ignoreSubmodules
+fatal: refusing to merge notes in refs/notes (outside of refs/notes/)
+fatal: Failed to resolve local notes ref 'refs/notes/'
+fatal: update_ref failed for ref 'refs/notes/dir': cannot lock ref 'refs/notes/dir': 'refs/notes/dir/foo' exists; cannot create 'refs/notes/dir'
+fatal: Failed to resolve local notes ref 'refs/notes/dir/'
+fatal: refusing to merge notes in refs/heads/main (outside of refs/notes/)
+fatal: Failed to resolve local notes ref 'refs/notes/y:'
+fatal: Failed to resolve local notes ref 'refs/notes/y:foo'
+fatal: Failed to resolve local notes ref 'refs/notes/foo^{bar'
+ok 4 - fail to merge into various non-notes refs
 
-expecting success of 2013.5 '"checkout <submodule>" honors submodule.*.ignore from .gitmodules': 
-	git config diff.ignoreSubmodules none &&
-	git config -f .gitmodules submodule.submodule.path submodule &&
-	git config -f .gitmodules submodule.submodule.ignore untracked &&
-	git checkout HEAD >actual 2>&1 &&
-	test_must_be_empty actual
+expecting success of 3308.5 'merge non-notes ref into empty notes ref (remote-notes/origin/x => v)': 
+	git config core.notesRef refs/notes/v &&
+	git notes merge refs/remote-notes/origin/x &&
+	verify_notes v &&
+	# refs/remote-notes/origin/x and v should point to the same notes commit
+	test "$(git rev-parse refs/remote-notes/origin/x)" = "$(git rev-parse refs/notes/v)"
 
-ok 5 - "checkout <submodule>" honors submodule.*.ignore from .gitmodules
+ok 5 - merge non-notes ref into empty notes ref (remote-notes/origin/x => v)
 
-expecting success of 2013.6 '"checkout <submodule>" honors submodule.*.ignore from .git/config': 
-	git config -f .gitmodules submodule.submodule.ignore none &&
-	git config submodule.submodule.path submodule &&
-	git config submodule.submodule.ignore all &&
-	git checkout HEAD >actual 2>&1 &&
-	test_must_be_empty actual
+expecting success of 3308.6 'merge notes into empty notes ref (x => y)': 
+	git config core.notesRef refs/notes/y &&
+	git notes merge x &&
+	verify_notes y &&
+	# x and y should point to the same notes commit
+	test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
 
-ok 6 - "checkout <submodule>" honors submodule.*.ignore from .git/config
+ok 6 - merge notes into empty notes ref (x => y)
 
-expecting success of 2013.7 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1/.git/
-[master (root-commit) f401f36] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2/.git/
-[master (root-commit) f2c1bb9] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/.git/
-[master (root-commit) 3950f7e] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 30024d7] Add sub1
+expecting success of 3308.7 'merge empty notes ref (z => y)': 
+	git notes merge z &&
+	# y should not change (still == x)
+	test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
+
+ok 7 - merge empty notes ref (z => y)
+
+expecting success of 3308.8 'change notes on other notes ref (y)': 
+	# Not touching notes to 1st commit
+	git notes remove 2nd &&
+	git notes append -m "More notes on 3rd commit" 3rd &&
+	git notes add -f -m "New notes on 4th commit" 4th &&
+	git notes add -m "Notes on 5th commit" 5th
+
+Removing note for object 2nd
+Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ok 8 - change notes on other notes ref (y)
+
+expecting success of 3308.9 'merge previous notes commit (y^ => y) => No-op': 
+	pre_state="$(git rev-parse refs/notes/y)" &&
+	git notes merge y^ &&
+	# y should not move
+	test "$pre_state" = "$(git rev-parse refs/notes/y)"
+
+Already up to date.
+ok 9 - merge previous notes commit (y^ => y) => No-op
+
+expecting success of 3308.10 'verify changed notes on other notes ref (y)': 
+	verify_notes y
+
+ok 10 - verify changed notes on other notes ref (y)
+
+expecting success of 3308.11 'verify unchanged notes on original notes ref (x)': 
+	verify_notes x
+
+ok 11 - verify unchanged notes on original notes ref (x)
+
+expecting success of 3308.12 'merge original notes (x) into changed notes (y) => No-op': 
+	git notes merge -vvv x &&
+	verify_notes y &&
+	verify_notes x
+
+One merge base found (bf2877f)
+Merging remote commit bf2877f into local commit 21b8c5e with merge-base bf2877f
+Already up to date.
+ok 12 - merge original notes (x) into changed notes (y) => No-op
+
+expecting success of 3308.13 'merge changed (y) into original (x) => Fast-forward': 
+	git config core.notesRef refs/notes/x &&
+	git notes merge y &&
+	verify_notes x &&
+	verify_notes y &&
+	# x and y should point to same the notes commit
+	test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
+
+Fast-forward
+ok 13 - merge changed (y) into original (x) => Fast-forward
+
+expecting success of 3308.14 'merge empty notes ref (z => y)': 
+	# Prepare empty (but valid) notes ref (z)
+	git config core.notesRef refs/notes/z &&
+	git notes add -m "foo" &&
+	git notes remove &&
+	git notes >output_notes_z &&
+	test_must_be_empty output_notes_z &&
+	# Do the merge (z => y)
+	git config core.notesRef refs/notes/y &&
+	git notes merge z &&
+	verify_notes y &&
+	# y should no longer point to the same notes commit as x
+	test "$(git rev-parse refs/notes/x)" != "$(git rev-parse refs/notes/y)"
+
+Removing note for object HEAD
+ok 14 - merge empty notes ref (z => y)
+
+expecting success of 3308.15 'change notes on other notes ref (y)': 
+	# Append to 1st commit notes
+	git notes append -m "More notes on 1st commit" 1st &&
+	# Add new notes to 2nd commit
+	git notes add -m "New notes on 2nd commit" 2nd &&
+	verify_notes y
+
+ok 15 - change notes on other notes ref (y)
+
+expecting success of 3308.16 'change notes on notes ref (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes remove 3rd &&
+	git notes append -m "More notes on 4th commit" 4th &&
+	verify_notes x
+
+Removing note for object 3rd
+ok 16 - change notes on notes ref (x)
+
+expecting success of 3308.17 'merge y into x => Non-conflicting 3-way merge': 
+	git notes merge y &&
+	verify_notes x &&
+	verify_notes y
+
+ok 17 - merge y into x => Non-conflicting 3-way merge
+
+expecting success of 3308.18 'create notes on new, separate notes ref (w)': 
+	git config core.notesRef refs/notes/w &&
+	# Add same note as refs/notes/y on 2nd commit
+	git notes add -m "New notes on 2nd commit" 2nd &&
+	# Add new note on 3rd commit (non-conflicting)
+	git notes add -m "New notes on 3rd commit" 3rd &&
+	# Verify state of notes on new, separate notes ref (w)
+	verify_notes w
+
+ok 18 - create notes on new, separate notes ref (w)
+
+expecting success of 3308.19 'merge w into x => Non-conflicting history-less merge': 
+	git config core.notesRef refs/notes/x &&
+	git notes merge w &&
+	# Verify new state of notes on other notes ref (x)
+	verify_notes x &&
+	# Also verify that nothing changed on other notes refs (y and w)
+	verify_notes y &&
+	verify_notes w
+
+ok 19 - merge w into x => Non-conflicting history-less merge
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3309-notes-merge-auto-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3309-notes-merge-auto-resolve/.git/
+expecting success of 3309.1 'setup commits': 
+	test_commit 1st &&
+	test_commit 2nd &&
+	test_commit 3rd &&
+	test_commit 4th &&
+	test_commit 5th &&
+	test_commit 6th &&
+	test_commit 7th &&
+	test_commit 8th &&
+	test_commit 9th &&
+	test_commit 10th &&
+	test_commit 11th &&
+	test_commit 12th &&
+	test_commit 13th &&
+	test_commit 14th &&
+	test_commit 15th &&
+
+	test_oid_cache <<-EOF
+	hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023
+	hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c
+	hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315
+	hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36
+	hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545
+	hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be
+	hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910
+	hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6
+	hash07a sha1:897003322b53bc6ca098e9324ee508362347e734
+	hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082
+	hash15b sha1:68b8630d25516028bed862719855b3d6768d7833
+	hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df
+	hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc
+	hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62
+	hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765
+	hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d
+	hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a
+	hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54
+	hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47
+	hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1
+	hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b
+	hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee
+	hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e
+
+	hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a
+	hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092
+	hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052
+	hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e
+	hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98
+	hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb
+	hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028
+	hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067
+	hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db
+	hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf
+	hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96
+	hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1
+	hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b
+	hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840
+	hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166
+	hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa
+	hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798
+	hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88
+	hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa
+	hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a
+	hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607
+	hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec
+	hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b
+	EOF
+
+[master (root-commit) 04ed9a0] 1st
  Author: A U Thor <author@example.com>
- 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 d6f9aa6] Revert "Add sub1"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+[master 7a4ca6e] 2nd
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 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 e6d8148] modified file2 and added file3
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2nd.t
+[master d07d62e] 3rd
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 1f84fbc] Modify sub1
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3rd.t
+[master 0f7aa3e] 4th
  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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 50491a1] add a nested submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4th.t
+[master 7f9ad88] 5th
  Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 6797720] update submodule, that updates a nested submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5th.t
+[master 2c12533] 6th
  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 6788ca3] make a change in nested sub
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6th.t
+[master fb01e0c] 7th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 6cc4170] update nested sub
+ create mode 100644 7th.t
+[master 9a4c31c] 8th
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 934e1af] update sub1, that updates nested sub
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8th.t
+[master 2e0db4b] 9th
  Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-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 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Previous HEAD position was f401f36 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory 43c94e1] Replace sub1 with directory
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9th.t
+[master 7c3b87a] 10th
  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 2061bb3] Revert "Replace sub1 with directory"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10th.t
+[master a446fff] 11th
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 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 d4861a4] Replace sub1 with file
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11th.t
+[master 65e263d] 12th
  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 cf98843] Revert "Replace sub1 with file"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12th.t
+[master e871aa6] 13th
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 cea73c0] Invalid sub1 commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13th.t
+[master 07c85d7] 14th
  Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 f248045] Revert "Invalid sub1 commit"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14th.t
+[master 4acf42e] 15th
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
-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'.
-ok 7 - git checkout --recurse-submodules: added submodule is checked out
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15th.t
+ok 1 - setup commits
 
-expecting success of 2013.8 'git checkout --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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-ok 8 - git checkout --recurse-submodules: added submodule is checked out in empty dir
+expecting success of 3309.2 'setup merge base (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "x notes on 6th commit" 6th &&
+	git notes add -m "x notes on 7th commit" 7th &&
+	git notes add -m "x notes on 8th commit" 8th &&
+	git notes add -m "x notes on 9th commit" 9th &&
+	git notes add -m "x notes on 10th commit" 10th &&
+	git notes add -m "x notes on 11th commit" 11th &&
+	git notes add -m "x notes on 12th commit" 12th &&
+	git notes add -m "x notes on 13th commit" 13th &&
+	git notes add -m "x notes on 14th commit" 14th &&
+	git notes add -m "x notes on 15th commit" 15th
 
-expecting success of 2013.9 'git checkout --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'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-ok 9 - git checkout --recurse-submodules: replace tracked file with submodule checks out submodule
+ok 2 - setup merge base (x)
 
-expecting success of 2013.10 'git checkout --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'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-ok 10 - git checkout --recurse-submodules: replace directory with submodule
+expecting success of 3309.3 'verify state of merge base (x)': verify_notes x x
+ok 3 - verify state of merge base (x)
 
-expecting success of 2013.11 'git checkout --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'.
-Switched to branch 'modify_sub1_recursively'
-Your branch is up to date with 'origin/modify_sub1_recursively'.
-ok 11 - git checkout --recurse-submodules: nested submodules are checked out
+expecting success of 3309.4 'setup local branch (y)': 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	git notes add -f -m "y notes on 3rd commit" 3rd &&
+	git notes add -f -m "y notes on 4th commit" 4th &&
+	git notes add -f -m "y notes on 5th commit" 5th &&
+	git notes remove 6th &&
+	git notes remove 7th &&
+	git notes remove 8th &&
+	git notes add -f -m "y notes on 12th commit" 12th &&
+	git notes add -f -m "y notes on 13th commit" 13th &&
+	git notes add -f -m "y notes on 14th commit" 14th &&
+	git notes add -f -m "y notes on 15th commit" 15th
 
-expecting success of 2013.12 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-ok 12 - git checkout --recurse-submodules: removed submodule removes submodules working tree
+Removing note for object 6th
+Removing note for object 7th
+Removing note for object 8th
+Overwriting existing notes for object 65e263ded02ae4e8839bc151095113737579dc12
+Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ok 4 - setup local branch (y)
 
-expecting success of 2013.13 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/.git/modules/sub1'
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-ok 13 - git checkout --recurse-submodules: removed submodule absorbs submodules .git directory
+expecting success of 3309.5 'verify state of local branch (y)': verify_notes y y
+ok 5 - verify state of local branch (y)
 
-expecting success of 2013.14 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 14 - git checkout --recurse-submodules: replace submodule with a file
+expecting success of 3309.6 'setup remote branch (z)': 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "z notes on 2nd commit" 2nd &&
+	git notes add -f -m "y notes on 4th commit" 4th &&
+	git notes add -f -m "z notes on 5th commit" 5th &&
+	git notes remove 6th &&
+	git notes add -f -m "z notes on 8th commit" 8th &&
+	git notes remove 9th &&
+	git notes add -f -m "z notes on 11th commit" 11th &&
+	git notes remove 12th &&
+	git notes add -f -m "y notes on 14th commit" 14th &&
+	git notes add -f -m "z notes on 15th commit" 15th
 
-checking known breakage of 2013.15 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 --recurse-submodules replace_sub1_with_file
-not ok 15 - git checkout --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+Removing note for object 6th
+Overwriting existing notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+Removing note for object 9th
+Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+Removing note for object 12th
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ok 6 - setup remote branch (z)
 
-expecting success of 2013.16 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out 'f2c1bb97d8342b3950c464bac1b708b05cb363c0'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-Switched to branch 'no_submodule'
-Your branch is up to date with 'origin/no_submodule'.
-ok 16 - git checkout --recurse-submodules: worktrees of nested submodules are removed
+expecting success of 3309.7 'verify state of remote branch (z)': verify_notes z z
+ok 7 - verify state of remote branch (z)
 
-expecting success of 2013.17 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 17 - git checkout --recurse-submodules: modified submodule updates submodule work tree
+expecting success of 3309.8 'merge z into y with invalid strategy => Fail/No changes': 
+	git config core.notesRef refs/notes/y &&
+	test_must_fail git notes merge --strategy=foo z &&
+	# Verify no changes (y)
+	verify_notes y y
 
-expecting success of 2013.18 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-	sub1
-ok 18 - git checkout --recurse-submodules: updating to a missing submodule commit fails
+error: unknown -s/--strategy: foo
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
 
-expecting success of 2013.19 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Switched to a new branch 'keep_branch'
-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'.
-fatal: ref HEAD is not a symbolic ref
-ok 19 - git checkout --recurse-submodules: submodule branch is not changed, detach HEAD instead
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
 
-expecting success of 2013.20 'git checkout --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: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-ok 20 - git checkout --recurse-submodules: added submodule doesn't remove untracked file with same name
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
 
-expecting success of 2013.21 'git checkout --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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-ok 21 - git checkout --recurse-submodules: added submodule removes an untracked ignored file
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
 
-checking known breakage of 2013.22 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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
-not ok 22 - git checkout --recurse-submodules: replace submodule with a directory # TODO known breakage
+Aborting notes merge resolution
+    --abort               abort notes merge
 
-checking known breakage of 2013.23 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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
-not ok 23 - git checkout --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
+ok 8 - merge z into y with invalid strategy => Fail/No changes
 
-expecting success of 2013.24 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 24 - git checkout --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+expecting success of 3309.9 'merge z into y with invalid configuration option => Fail/No changes': 
+	git config core.notesRef refs/notes/y &&
+	cat >expect <<-\EOF &&
+	error: unknown notes merge strategy foo
+	fatal: unable to parse 'notes.mergeStrategy' from command-line config
+	EOF
+	test_must_fail git -c notes.mergeStrategy="foo" notes merge z 2>actual &&
+	test_cmp expect actual &&
+	# Verify no changes (y)
+	verify_notes y y
 
-expecting success of 2013.25 'git -c submodule.recurse=true checkout: 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 25 - git -c submodule.recurse=true checkout: modified submodule updates submodule work tree
+ok 9 - merge z into y with invalid configuration option => Fail/No changes
 
-expecting success of 2013.26 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out 'f2c1bb97d8342b3950c464bac1b708b05cb363c0'
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-Switched to branch 'modify_sub1_recursively'
-Your branch is up to date with 'origin/modify_sub1_recursively'.
-ok 26 - git checkout --recurse-submodules: modified submodule updates submodule recursively
+expecting success of 3309.10 'merge z into y with "ours" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=ours z &&
+	verify_notes y ours
 
-expecting success of 2013.27 'git checkout -f --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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-ok 27 - git checkout -f --recurse-submodules: added submodule is checked out
+Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 10 - merge z into y with "ours" strategy => Non-conflicting 3-way merge
 
-expecting success of 2013.28 'git checkout -f --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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-ok 28 - git checkout -f --recurse-submodules: added submodule is checked out in empty dir
+expecting success of 3309.11 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.29 'git checkout -f --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'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-ok 29 - git checkout -f --recurse-submodules: replace tracked file with submodule checks out submodule
+ok 11 - reset to pre-merge state (y)
 
-expecting success of 2013.30 'git checkout -f --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'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-ok 30 - git checkout -f --recurse-submodules: replace directory with submodule
+expecting success of 3309.12 'merge z into y with "ours" configuration option => Non-conflicting 3-way merge': 
+	git -c notes.mergeStrategy="ours" notes merge z &&
+	verify_notes y ours
 
-expecting success of 2013.31 'git checkout -f --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'.
-Switched to branch 'modify_sub1_recursively'
-Your branch is up to date with 'origin/modify_sub1_recursively'.
-ok 31 - git checkout -f --recurse-submodules: nested submodules are checked out
+Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 12 - merge z into y with "ours" configuration option => Non-conflicting 3-way merge
 
-expecting success of 2013.32 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-ok 32 - git checkout -f --recurse-submodules: removed submodule removes submodules working tree
+expecting success of 3309.13 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.33 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/.git/modules/sub1'
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-ok 33 - git checkout -f --recurse-submodules: removed submodule absorbs submodules .git directory
+ok 13 - reset to pre-merge state (y)
 
-expecting success of 2013.34 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 34 - git checkout -f --recurse-submodules: replace submodule with a file
+expecting success of 3309.14 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="ours" notes merge z &&
+	verify_notes y ours
 
-checking known breakage of 2013.35 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 -f --recurse-submodules replace_sub1_with_file
-not ok 35 - git checkout -f --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 14 - merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge
 
-expecting success of 2013.36 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out 'f2c1bb97d8342b3950c464bac1b708b05cb363c0'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-Switched to branch 'no_submodule'
-Your branch is up to date with 'origin/no_submodule'.
-ok 36 - git checkout -f --recurse-submodules: worktrees of nested submodules are removed
+expecting success of 3309.15 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.37 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 37 - git checkout -f --recurse-submodules: modified submodule updates submodule work tree
+ok 15 - reset to pre-merge state (y)
 
-expecting success of 2013.38 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-ok 38 - git checkout -f --recurse-submodules: updating to a missing submodule commit fails
+expecting success of 3309.16 'merge z into y with "theirs" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=theirs z &&
+	verify_notes y theirs
 
-expecting success of 2013.39 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Switched to a new branch 'keep_branch'
-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'.
-fatal: ref HEAD is not a symbolic ref
-ok 39 - git checkout -f --recurse-submodules: submodule branch is not changed, detach HEAD instead
+Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 16 - merge z into y with "theirs" strategy => Non-conflicting 3-way merge
 
-expecting success of 2013.40 'git checkout -f --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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-ok 40 - git checkout -f --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
+expecting success of 3309.17 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.41 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Switched to branch 'replace_sub1_with_directory'
-Your branch is up to date with 'origin/replace_sub1_with_directory'.
-ok 41 - git checkout -f --recurse-submodules: replace submodule with a directory
+ok 17 - reset to pre-merge state (y)
 
-expecting success of 2013.42 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/.git/modules/sub1'
-Switched to branch 'replace_sub1_with_directory'
-Your branch is up to date with 'origin/replace_sub1_with_directory'.
-ok 42 - git checkout -f --recurse-submodules: replace submodule containing a .git directory with a directory must fail
+expecting success of 3309.18 'merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge': 
+	git -c notes.mergeStrategy="ours" notes merge --strategy=theirs z &&
+	verify_notes y theirs
 
-expecting success of 2013.43 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 43 - git checkout -f --recurse-submodules: replace submodule with a file ignoring ignored files
+Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 18 - merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge
 
-expecting success of 2013.44 'git checkout -f --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'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-ok 44 - git checkout -f --recurse-submodules: modified submodule does update submodule work tree from invalid commit
+expecting success of 3309.19 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.45 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 45 - git checkout -f --recurse-submodules: updating submodules fixes .git links
+ok 19 - reset to pre-merge state (y)
 
-expecting success of 2013.46 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Your branch is up to date with 'origin/add_sub1'.
-ok 46 - git checkout -f --recurse-submodules: changed submodule worktree is reset
+expecting success of 3309.20 'merge z into y with "union" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=union z &&
+	verify_notes y union
 
-expecting success of 2013.47 '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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 47 - git_test_func: added submodule creates empty directory
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 20 - merge z into y with "union" strategy => Non-conflicting 3-way merge
 
-expecting success of 2013.48 '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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 48 - git_test_func: added submodule leaves existing empty directory alone
+expecting success of 3309.21 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.49 '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'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 49 - git_test_func: replace tracked file with submodule creates empty directory
+ok 21 - reset to pre-merge state (y)
 
-expecting success of 2013.50 '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'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 50 - git_test_func: replace directory with submodule
+expecting success of 3309.22 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="theirs" notes merge --strategy=union z &&
+	verify_notes y union
 
-expecting success of 2013.51 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 51 - git_test_func: removed submodule leaves submodule directory and its contents in place
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 22 - merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge
 
-expecting success of 2013.52 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 52 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+expecting success of 3309.23 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.53 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 53 - git_test_func: replace submodule with a directory must fail
+ok 23 - reset to pre-merge state (y)
 
-expecting success of 2013.54 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 54 - git_test_func: replace submodule containing a .git directory with a directory must fail
+expecting success of 3309.24 'merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="union" -c notes.mergeStrategy="theirs" notes merge z &&
+	verify_notes y union
 
-checking known breakage of 2013.55 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 55 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 2013.56 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 56 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 2013.57 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-Submodule path 'sub1': checked out 'e6d8148a306c904a34344fac267f4613e698d228'
-ok 57 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 2013.58 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-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 58 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 2013.59 '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'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 59 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 2013.60 '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 checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-ok 60 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 24 - merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge
 
-expecting success of 2013.61 '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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 61 - git_test_func: added submodule creates empty directory
+expecting success of 3309.25 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 2013.62 '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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 62 - git_test_func: added submodule leaves existing empty directory alone
+ok 25 - reset to pre-merge state (y)
 
-expecting success of 2013.63 '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'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 63 - git_test_func: replace tracked file with submodule creates empty directory
+expecting success of 3309.26 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge': 
+	test_must_fail git -c notes.z.mergeStrategy="union" notes merge z &&
+	git notes merge --abort &&
+	verify_notes y y
 
-expecting success of 2013.64 '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'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 64 - git_test_func: replace directory with submodule
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+CONFLICT (content): Merge conflict in notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Auto-merging notes for 65e263ded02ae4e8839bc151095113737579dc12
+CONFLICT (delete/modify): Notes for object 65e263ded02ae4e8839bc151095113737579dc12 deleted in refs/notes/z and modified in refs/notes/y. Version from refs/notes/y left in tree.
+Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Auto-merging notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+CONFLICT (delete/modify): Notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+ok 26 - merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge
 
-expecting success of 2013.65 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 65 - git_test_func: removed submodule leaves submodule directory and its contents in place
+expecting success of 3309.27 'merge y into z with "union" strategy => Non-conflicting 3-way merge': 
+	git config core.notesRef refs/notes/z &&
+	git notes merge --strategy=union y &&
+	verify_notes z union2
 
-expecting success of 2013.66 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-ok 66 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 27 - merge y into z with "union" strategy => Non-conflicting 3-way merge
 
-checking known breakage of 2013.67 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'replace_sub1_with_directory'
-Your branch is up to date with 'origin/replace_sub1_with_directory'.
-test_must_fail: command succeeded: git checkout -f replace_sub1_with_directory
-not ok 67 - git_test_func: replace submodule with a directory must fail # TODO known breakage
+expecting success of 3309.28 'reset to pre-merge state (z)': 
+	git update-ref refs/notes/z refs/notes/z^1 &&
+	# Verify pre-merge state
+	verify_notes z z
 
-checking known breakage of 2013.68 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'replace_sub1_with_directory'
-Your branch is up to date with 'origin/replace_sub1_with_directory'.
-test_must_fail: command succeeded: git checkout -f replace_sub1_with_directory
-not ok 68 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+ok 28 - reset to pre-merge state (z)
 
-checking known breakage of 2013.69 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 -f replace_sub1_with_file
-not ok 69 - git_test_func: replace submodule with a file must fail # TODO known breakage
+expecting success of 3309.29 'merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=cat_sort_uniq y &&
+	verify_notes z cat_sort_uniq
 
-checking known breakage of 2013.70 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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 -f replace_sub1_with_file
-not ok 70 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 29 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge
 
-expecting success of 2013.71 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-Submodule path 'sub1': checked out 'e6d8148a306c904a34344fac267f4613e698d228'
-ok 71 - git_test_func: modified submodule does not update submodule work tree
+expecting success of 3309.30 'reset to pre-merge state (z)': 
+	git update-ref refs/notes/z refs/notes/z^1 &&
+	# Verify pre-merge state
+	verify_notes z z
 
-expecting success of 2013.72 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-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'.
-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 72 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+ok 30 - reset to pre-merge state (z)
 
-expecting success of 2013.73 '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'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
-ok 73 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+expecting success of 3309.31 'merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge': 
+	git -c notes.mergeStrategy="cat_sort_uniq" notes merge y &&
+	verify_notes z cat_sort_uniq
 
-expecting success of 2013.74 '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'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-ok 74 - git_test_func: added submodule does remove untracked unignored file with same name when forced
+Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 31 - merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge
 
-# still have 10 known breakage(s)
-# passed all remaining 64 test(s)
-1..74
+# passed all 31 test(s)
+1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3409-rebase-environ.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3409-rebase-environ/.git/
-expecting success of 3409.1 'setup': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three
+*** t3301-notes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3301-notes/.git/
+expecting success of 3301.1 'cannot annotate non-existing HEAD': 
+	test_must_fail env MSG=3 git notes add
 
-[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
+fatal: failed to resolve 'HEAD' as a valid ref.
+ok 1 - cannot annotate non-existing HEAD
+
+expecting success of 3301.2 'setup': 
+	test_commit 1st &&
+	test_commit 2nd
+
+[master (root-commit) 04ed9a0] 1st
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 7c7cd71] three
+ create mode 100644 1st.t
+[master 7a4ca6e] 2nd
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 1 - setup
+ create mode 100644 2nd.t
+ok 2 - setup
 
-expecting success of 3409.2 'rebase --exec does not muck with GIT_DIR': 
-	git rebase --exec "printf %s \$GIT_DIR >environ" HEAD~1 &&
-	test_must_be_empty environ
+expecting success of 3301.3 'need valid notes ref': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=/ git notes show &&
+	test_must_fail env MSG=2 GIT_NOTES_REF=/ git notes show
 
-Rebasing (2/2)
Executing: printf %s $GIT_DIR >environ
-Successfully rebased and updated refs/heads/master.
-ok 2 - rebase --exec does not muck with GIT_DIR
+fatal: refusing to show notes in / (outside of refs/notes/)
+fatal: refusing to show notes in / (outside of refs/notes/)
+ok 3 - need valid notes ref
 
-expecting success of 3409.3 'rebase --exec does not muck with GIT_WORK_TREE': 
-	git rebase --exec "printf %s \$GIT_WORK_TREE >environ" HEAD~1 &&
-	test_must_be_empty environ
+expecting success of 3301.4 'refusing to add notes in refs/heads/': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes add
 
-Rebasing (2/2)
Executing: printf %s $GIT_WORK_TREE >environ
-Successfully rebased and updated refs/heads/master.
-ok 3 - rebase --exec does not muck with GIT_WORK_TREE
+fatal: refusing to add notes in refs/heads/bogus (outside of refs/notes/)
+ok 4 - refusing to add notes in refs/heads/
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3408-rebase-multi-line.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3408-rebase-multi-line/.git/
-expecting success of 3408.1 'setup': 
+expecting success of 3301.5 'refusing to edit notes in refs/remotes/': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes edit
 
-	>file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
+fatal: refusing to edit notes in refs/heads/bogus (outside of refs/notes/)
+ok 5 - refusing to edit notes in refs/remotes/
 
-	echo hello >file &&
-	test_tick &&
-	git commit -a -m "A sample commit log message that has a long
-summary that spills over multiple lines.
+expecting success of 3301.6 'handle empty notes gracefully': 
+	test_expect_code 1 git notes show
 
-But otherwise with a sane description." &&
+error: no note found for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691.
+ok 6 - handle empty notes gracefully
 
-	git branch side &&
+expecting success of 3301.7 'show non-existent notes entry with %N': 
+	test_write_lines A B >expect &&
+	git show -s --format="A%n%NB" >actual &&
+	test_cmp expect actual
 
-	git reset --hard HEAD^ &&
-	>elif &&
-	git add elif &&
-	test_tick &&
-	git commit -m second &&
+ok 7 - show non-existent notes entry with %N
 
-	git checkout -b side2 &&
-	>afile &&
-	git add afile &&
-	test_tick &&
-	git commit -m third &&
-	echo hello >afile &&
-	test_tick &&
-	git commit -a -m fourth &&
-	git checkout -b side-merge &&
-	git reset --hard HEAD^^ &&
-	git merge --no-ff -m "A merge commit log message that has a long
-summary that spills over multiple lines.
+expecting success of 3301.8 'create notes': 
+	MSG=b4 git notes add &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b4 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-But otherwise with a sane description." side2 &&
-	git branch side-merge-original
+b4
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-[main (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[main 1708bf0] A sample commit log message that has a long summary that spills over multiple lines.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at 1bd44cb initial
-[main e79e348] second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 elif
-Switched to a new branch 'side2'
-[side2 0c9638e] third
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 afile
-[side2 5efd714] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'side-merge'
-HEAD is now at e79e348 second
-Merge made by the 'ort' strategy.
- afile | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 afile
-ok 1 - setup
+    1st
 
-expecting success of 3408.2 'rebase': 
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 8 - create notes
 
-	git checkout side &&
-	git rebase main &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
+expecting success of 3301.9 'show notes entry with %N': 
+	test_write_lines A b4 B >expect &&
+	git show -s --format="A%n%NB" >actual &&
 	test_cmp expect actual
 
+ok 9 - show notes entry with %N
 
-Switched to branch 'side'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/side.
-ok 2 - rebase
+expecting success of 3301.10 'create reflog entry': 
+	ref=$(git rev-parse --short refs/notes/commits) &&
+	cat <<-EOF >expect &&
+		$ref refs/notes/commits@{0}: notes: Notes added by 'git notes add'
+	EOF
+	git reflog show refs/notes/commits >actual &&
+	test_cmp expect actual
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3412-rebase-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3412-rebase-root/.git/
-expecting success of 3412.1 'prepare repository': 
-	test_commit 1 A &&
-	test_commit 2 A &&
-	git symbolic-ref HEAD refs/heads/other &&
-	rm .git/index &&
-	test_commit 3 B &&
-	test_commit 1b A 1 &&
-	test_commit 4 B
+ok 10 - create reflog entry
 
-[main (root-commit) c746ea0] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[main 46611ad] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other (root-commit) 2c64091] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[other 1c4476a] 1b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[other 41e7797] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - prepare repository
+expecting success of 3301.11 'edit existing notes': 
+	MSG=b3 git notes edit &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-expecting success of 3412.2 'rebase --root fails with too many args': 
-	git checkout -B fail other &&
-	test_must_fail git rebase --onto main --root fail fail
+b3
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-Switched to a new branch 'fail'
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+    1st
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 11 - edit existing notes
 
-ok 2 - rebase --root fails with too many args
+expecting success of 3301.12 'show notes from treeish': 
+	echo b3 >expect &&
+	git notes --ref commits^{tree} show >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3412.3 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
+	echo b4 >expect &&
+	git notes --ref commits@{1} show >actual &&
+	test_cmp expect actual
 
-ok 3 - setup pre-rebase hook
+ok 12 - show notes from treeish
 
-expecting success of 3412.4 'rebase --root --onto <newbase>': 
-	git checkout -b work other &&
-	git rebase --root --onto main &&
-	git log --pretty=tformat:"%s" > rebased &&
-	test_cmp expect rebased
+expecting success of 3301.13 'cannot edit notes from non-ref': 
+	test_must_fail git notes --ref commits^{tree} edit &&
+	test_must_fail git notes --ref commits@{1} edit
 
-Switched to a new branch 'work'
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work.
-ok 4 - rebase --root --onto <newbase>
+fatal: Cannot use notes ref refs/notes/commits^{tree}
+fatal: Cannot use notes ref refs/notes/commits@{1}
+ok 13 - cannot edit notes from non-ref
 
-expecting success of 3412.5 'pre-rebase got correct input (1)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+expecting success of 3301.14 'cannot "git notes add -m" where notes already exists': 
+	test_must_fail git notes add -m "b2" &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-ok 5 - pre-rebase got correct input (1)
+error: Cannot add notes. Found existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691. Use '-f' to overwrite existing notes
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 3412.6 'rebase --root --onto <newbase> <branch>': 
-	git branch work2 other &&
-	git rebase --root --onto main work2 &&
-	git log --pretty=tformat:"%s" > rebased2 &&
-	test_cmp expect rebased2
+    1st
 
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work2.
-ok 6 - rebase --root --onto <newbase> <branch>
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 14 - cannot "git notes add -m" where notes already exists
 
-expecting success of 3412.7 'pre-rebase got correct input (2)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
+expecting success of 3301.15 'can overwrite existing note with "git notes add -f -m"': 
+	git notes add -f -m "b1" &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-ok 7 - pre-rebase got correct input (2)
+Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 3412.8 'rebase -i --root --onto <newbase>': 
-	git checkout -b work3 other &&
-	git rebase -i --root --onto main &&
-	git log --pretty=tformat:"%s" > rebased3 &&
-	test_cmp expect rebased3
+    1st
 
-Switched to a new branch 'work3'
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work3.
-ok 8 - rebase -i --root --onto <newbase>
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 15 - can overwrite existing note with "git notes add -f -m"
 
-expecting success of 3412.9 'pre-rebase got correct input (3)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+expecting success of 3301.16 'add w/no options on existing note morphs into edit': 
+	MSG=b2 git notes add &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b2 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-ok 9 - pre-rebase got correct input (3)
+b2
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 3412.10 'rebase -i --root --onto <newbase> <branch>': 
-	git branch work4 other &&
-	git rebase -i --root --onto main work4 &&
-	git log --pretty=tformat:"%s" > rebased4 &&
-	test_cmp expect rebased4
+    1st
 
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work4.
-ok 10 - rebase -i --root --onto <newbase> <branch>
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 16 - add w/no options on existing note morphs into edit
 
-expecting success of 3412.11 'pre-rebase got correct input (4)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
+expecting success of 3301.17 'can overwrite existing note with "git notes add -f"': 
+	MSG=b1 git notes add -f &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-ok 11 - pre-rebase got correct input (4)
+Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+b1
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 3412.12 'set up merge history': 
-	git checkout other^ &&
-	git checkout -b side &&
-	test_commit 5 C &&
-	git checkout other &&
-	git merge side
+    1st
 
-Note: switching to 'other^'.
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 17 - can overwrite existing note with "git notes add -f"
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3301.18 'show notes': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:14:13 2005 -0700
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		${indent}2nd
 
-  git switch -c <new-branch-name>
+		Notes:
+		${indent}b1
+	EOF
+	git cat-file commit HEAD >commits &&
+	! grep b1 commits &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 18 - show notes
 
-  git switch -
+expecting success of 3301.19 'show multi-line notes': 
+	test_commit 3rd &&
+	MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-multiline <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:15:13 2005 -0700
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		${indent}3rd
 
-HEAD is now at 1c4476a 1b
-Switched to a new branch 'side'
-[side 0c9a4e9] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-Switched to branch 'other'
-Merge made by the 'ort' strategy.
- C | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-ok 12 - set up merge history
+		Notes:
+		${indent}b3
+		${indent}c3c3c3c3
+		${indent}d3d3d3
 
-expecting success of 3412.13 'set up second root and merge': 
-	git symbolic-ref HEAD refs/heads/third &&
-	rm .git/index &&
-	rm A B C &&
-	test_commit 6 D &&
-	git checkout other &&
-	git merge --allow-unrelated-histories third
+	EOF
+	cat expect >>expect-multiline &&
+	git log -2 >actual &&
+	test_cmp expect-multiline actual
 
-[third (root-commit) 00ac2af] 6
+[master d07d62e] 3rd
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 D
-Switched to branch 'other'
-Merge made by the 'ort' strategy.
- D | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 D
-ok 13 - set up second root and merge
+ create mode 100644 3rd.t
+b3
+c3c3c3c3
+d3d3d3
+ok 19 - show multi-line notes
 
-expecting success of 3412.14 'setup pre-rebase hook that fails': 
-	test_hook --setup --clobber pre-rebase <<-\EOF
-	false
-	EOF
+expecting success of 3301.20 'show -F notes': 
+	test_commit 4th &&
+	echo "xyzzy" >note5 &&
+	git notes add -F note5 &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-F <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
 
-ok 14 - setup pre-rebase hook that fails
+		${indent}4th
 
-expecting success of 3412.15 'pre-rebase hook stops rebase': 
-	git checkout -b stops1 other &&
-	test_must_fail git rebase --root --onto main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
-	test 0 = $(git rev-list other...stops1 | wc -l)
+		Notes:
+		${indent}xyzzy
 
-Switched to a new branch 'stops1'
-error: The pre-rebase hook refused to rebase.
-ok 15 - pre-rebase hook stops rebase
+	EOF
+	cat expect-multiline >>expect-F &&
+	git log -3 >actual &&
+	test_cmp expect-F actual
 
-expecting success of 3412.16 'pre-rebase hook stops rebase -i': 
-	git checkout -b stops2 other &&
-	test_must_fail git rebase --root --onto main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
-	test 0 = $(git rev-list other...stops2 | wc -l)
+[master 0f7aa3e] 4th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4th.t
+ok 20 - show -F notes
 
-Switched to a new branch 'stops2'
-error: The pre-rebase hook refused to rebase.
-ok 16 - pre-rebase hook stops rebase -i
+expecting success of 3301.21 'Re-adding -F notes without -f fails': 
+	echo "zyxxy" >note5 &&
+	test_must_fail git notes add -F note5 &&
+	git log -3 >actual &&
+	test_cmp expect-F actual
 
-expecting success of 3412.17 'remove pre-rebase hook': 
-	rm -f .git/hooks/pre-rebase
+error: Cannot add notes. Found existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11. Use '-f' to overwrite existing notes
+ok 21 - Re-adding -F notes without -f fails
 
-ok 17 - remove pre-rebase hook
+expecting success of 3301.22 'git log --pretty=raw does not show notes': 
+	commit=$(git rev-parse HEAD) &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		tree $tree
+		parent $parent
+		author A U Thor <author@example.com> 1112912173 -0700
+		committer C O Mitter <committer@example.com> 1112912173 -0700
 
-expecting success of 3412.18 'set up a conflict': 
-	git checkout main &&
-	echo conflict > B &&
-	git add B &&
-	git commit -m conflict
+		${indent}4th
+	EOF
+	git log -1 --pretty=raw >actual &&
+	test_cmp expect actual
 
-Switched to branch 'main'
-[main f80eebe] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-ok 18 - set up a conflict
+ok 22 - git log --pretty=raw does not show notes
 
-expecting success of 3412.19 'rebase --root with conflict (first part)': 
-	git checkout -b conflict1 other &&
-	test_must_fail git rebase --root --onto main &&
-	git ls-files -u | grep "B$"
+expecting success of 3301.23 'git log --show-notes': 
+	cat >>expect <<-EOF &&
 
-Switched to a new branch 'conflict1'
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-error: could not apply 2c64091... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 2c64091... 3
-100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
-100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
-ok 19 - rebase --root with conflict (first part)
+	Notes:
+	${indent}xyzzy
+	EOF
+	git log -1 --pretty=raw --show-notes >actual &&
+	test_cmp expect actual
 
-expecting success of 3412.20 'fix the conflict': 
-	echo 3 > B &&
-	git add B
+ok 23 - git log --show-notes
 
-ok 20 - fix the conflict
+expecting success of 3301.24 'git log --no-notes': 
+	git log -1 --no-notes >actual &&
+	! grep xyzzy actual
 
-expecting success of 3412.21 'rebase --root with conflict (second part)': 
-	git rebase --continue &&
-	git log --pretty=tformat:"%s" > conflict1 &&
-	test_cmp expect-conflict conflict1
+ok 24 - git log --no-notes
 
-[detached HEAD 308ae33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict1.
-ok 21 - rebase --root with conflict (second part)
+expecting success of 3301.25 'git format-patch does not show notes': 
+	git format-patch -1 --stdout >actual &&
+	! grep xyzzy actual
 
-expecting success of 3412.22 'rebase -i --root with conflict (first part)': 
-	git checkout -b conflict2 other &&
-	test_must_fail git rebase -i --root --onto main &&
-	git ls-files -u | grep "B$"
+ok 25 - git format-patch does not show notes
 
-Switched to a new branch 'conflict2'
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-error: could not apply 2c64091... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 2c64091... 3
-100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
-100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
-ok 22 - rebase -i --root with conflict (first part)
+expecting success of 3301.26 'git format-patch --show-notes does show notes': 
+	git format-patch --show-notes -1 --stdout >actual &&
+	grep xyzzy actual
 
-expecting success of 3412.23 'fix the conflict': 
-	echo 3 > B &&
-	git add B
+    xyzzy
+ok 26 - git format-patch --show-notes does show notes
 
-ok 23 - fix the conflict
+expecting success of 3301.27 'git show  does show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+    xyzzy
+ok 27 - git show  does show notes
 
-expecting success of 3412.24 'rebase -i --root with conflict (second part)': 
-	git rebase --continue &&
-	git log --pretty=tformat:"%s" > conflict2 &&
-	test_cmp expect-conflict conflict2
+expecting success of 3301.28 'git show --pretty does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 28 - git show --pretty does not show notes
 
-[detached HEAD 308ae33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict2.
-ok 24 - rebase -i --root with conflict (second part)
+expecting success of 3301.29 'git show --pretty=raw does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 29 - git show --pretty=raw does not show notes
 
-expecting success of 3412.25 'fix the conflict': 
-	echo 3 > B &&
-	git add B
+expecting success of 3301.30 'git show --pretty=short does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 30 - git show --pretty=short does not show notes
 
-ok 25 - fix the conflict
+expecting success of 3301.31 'git show --pretty=medium does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 31 - git show --pretty=medium does not show notes
 
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3413-rebase-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 3301.32 'git show --pretty=full does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 32 - git show --pretty=full does not show notes
 
-[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 3301.33 'git show --pretty=fuller does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 33 - git show --pretty=fuller does not show notes
 
-expecting success of 3413.2 'rebase': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main &&
-	test "z$(cat git)" = zworld
+expecting success of 3301.34 'git show --pretty=format:%s does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 34 - git show --pretty=format:%s does not show notes
 
-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 3301.35 'git show --oneline does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 35 - git show --oneline does not show notes
 
-expecting success of 3413.3 'rebase -i': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i main &&
-	test "z$(cat git)" = zworld
+expecting success of 3301.36 'setup alternate notes ref': 
+	git notes --ref=alternate add -m alternate
 
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 3 - rebase -i
+ok 36 - setup alternate notes ref
 
-expecting success of 3413.4 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
+expecting success of 3301.37 'git log --notes shows default notes': 
+	git log -1 --notes >actual &&
+	grep xyzzy actual &&
+	! grep alternate actual
 
-ok 4 - setup pre-rebase hook
+    xyzzy
+ok 37 - git log --notes shows default notes
 
-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,
+expecting success of 3301.38 'git log --notes=X shows only X': 
+	git log -1 --notes=alternate >actual &&
+	! grep xyzzy actual &&
+	grep alternate actual
 
+Notes (alternate):
+    alternate
+ok 38 - git log --notes=X shows only X
 
-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 3301.39 'git log --notes --notes=X shows both': 
+	git log -1 --notes --notes=alternate >actual &&
+	grep xyzzy actual &&
+	grep alternate actual
 
-expecting success of 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
+    xyzzy
+Notes (alternate):
+    alternate
+ok 39 - git log --notes --notes=X shows both
 
-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 3301.40 'git log --no-notes resets default state': 
+	git log -1 --notes --notes=alternate \
+		--no-notes --notes=alternate \
+		>actual &&
+	! grep xyzzy actual &&
+	grep alternate actual
 
-expecting success of 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
+Notes (alternate):
+    alternate
+ok 40 - git log --no-notes resets default state
 
-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 3301.41 'git log --no-notes resets ref list': 
+	git log -1 --notes --notes=alternate \
+		--no-notes --notes \
+		>actual &&
+	grep xyzzy actual &&
+	! grep alternate actual
 
-expecting success of 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,
+    xyzzy
+ok 41 - git log --no-notes resets ref list
 
+expecting success of 3301.42 'show -m notes': 
+	test_commit 5th &&
+	git notes add -m spam -m "foo${LF}bar${LF}baz" &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-m <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
 
-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)
+		${indent}5th
 
-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
+		Notes:
+		${indent}spam
+		${indent}
+		${indent}foo
+		${indent}bar
+		${indent}baz
 
-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)
+	EOF
+	cat expect-F >>expect-m &&
+	git log -4 >actual &&
+	test_cmp expect-m actual
 
-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
+[master 7f9ad88] 5th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5th.t
+ok 42 - show -m notes
 
-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 3301.43 'remove note with add -f -F /dev/null': 
+	git notes add -f -F /dev/null &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-rm-F <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
+
+		${indent}5th
 
-expecting success of 3413.11 'setup pre-rebase hook that fails': 
-	test_hook --setup --clobber pre-rebase <<-\EOF
-	false
 	EOF
+	cat expect-F >>expect-rm-F &&
+	git log -4 >actual &&
+	test_cmp expect-rm-F actual &&
+	test_must_fail git notes show
 
-ok 11 - setup pre-rebase hook that fails
+Overwriting existing notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 43 - remove note with add -f -F /dev/null
 
-expecting success of 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
+expecting success of 3301.44 'do not create empty note with -m ""': 
+	git notes add -m "" &&
+	git log -4 >actual &&
+	test_cmp expect-rm-F actual &&
+	test_must_fail git notes show
 
-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)
+Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 44 - do not create empty note with -m ""
 
-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)
+expecting success of 3301.45 'create note with combination of -m and -F': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect-combine_m_and_F <<-EOF &&
+		foo
 
-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)
+		xyzzy
 
-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
+		bar
 
-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)
+		zyxxy
 
-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
+		baz
+	EOF
+	echo "xyzzy" >note_a &&
+	echo "zyxxy" >note_b &&
+	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" &&
+	git notes show >actual &&
+	test_cmp expect-combine_m_and_F actual
 
-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)
+Removing note for object HEAD
+ok 45 - create note with combination of -m and -F
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3407-rebase-abort.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3407-rebase-abort/.git/
-expecting success of 3407.1 'setup': 
-	test_commit a a a &&
-	git branch to-rebase &&
+expecting success of 3301.46 'create note with combination of -m and -F and --separator': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect-combine_m_and_F <<-\EOF &&
+	foo
+	-------
+	xyzzy
+	-------
+	bar
+	-------
+	zyxxy
+	-------
+	baz
+	EOF
+	echo "xyzzy" >note_a &&
+	echo "zyxxy" >note_b &&
+	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --separator="-------" &&
+	git notes show >actual &&
+	test_cmp expect-combine_m_and_F actual
 
-	test_commit --annotate b a b &&
-	test_commit --annotate c a c &&
+Removing note for object HEAD
+ok 46 - create note with combination of -m and -F and --separator
 
-	git checkout to-rebase &&
-	test_commit "merge should fail on this" a d d &&
-	test_commit --annotate "merge should fail on this, too" a e pre-rebase
+expecting success of 3301.47 'create note with combination of -m and -F and --no-separator': 
+	cat >expect-combine_m_and_F <<-\EOF &&
+	foo
+	xyzzy
+	bar
+	zyxxy
+	baz
+	EOF
+	echo "xyzzy" >note_a &&
+	echo "zyxxy" >note_b &&
+	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --no-separator &&
+	git notes show >actual &&
+	test_cmp expect-combine_m_and_F actual
 
-[main (root-commit) cc33353] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[main 9c12280] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main deaaf55] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'to-rebase'
-[to-rebase 3e1f4f7] merge should fail on this
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[to-rebase 1c3a3e2] merge should fail on this, too
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+ok 47 - create note with combination of -m and -F and --no-separator
 
-expecting success of 3407.2 'rebase --apply --abort': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir "$state_dir" &&
-		git rebase --abort &&
-		check_head &&
-		test_path_is_missing "$state_dir"
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 2 - rebase --apply --abort
+expecting success of 3301.48 'remove note with "git notes remove"': 
+	git notes remove HEAD^ &&
+	git notes remove &&
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect-rm-remove <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
 
-expecting success of 3407.3 'pre rebase --apply head is marked as reachable': 
-		# Clean up the state from the previous one
-		git checkout -f --detach pre-rebase &&
-		test_tick &&
-		git commit --amend --only -m "reworded" &&
-		orig_head=$(git rev-parse HEAD) &&
-		test_must_fail git rebase$type main &&
-		# Stop ORIG_HEAD marking $state_dir/orig-head as reachable
-		git update-ref -d ORIG_HEAD &&
-		git reflog expire --expire="$GIT_COMMITTER_DATE" --all &&
-		git prune --expire=now &&
-		git rebase --abort &&
-		test_cmp_rev $orig_head HEAD
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-[detached HEAD 656dfef] reworded
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 3 - pre rebase --apply head is marked as reachable
+		${indent}5th
 
-expecting success of 3407.4 'rebase --apply --abort after --skip': 
-		# Clean up the state from the previous one
-		git checkout -B to-rebase pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir "$state_dir" &&
-		test_must_fail git rebase --skip &&
-		test_cmp_rev HEAD main &&
-		git rebase --abort &&
-		check_head &&
-		test_path_is_missing "$state_dir"
-	
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
 
-  656dfef reworded
+		${indent}4th
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+	EOF
+	cat expect-multiline >>expect-rm-remove &&
+	git log -4 >actual &&
+	test_cmp expect-rm-remove actual &&
+	test_must_fail git notes show HEAD^
 
- git branch <new-branch-name> 656dfef
+Removing note for object HEAD^
+Removing note for object HEAD
+error: no note found for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11.
+ok 48 - remove note with "git notes remove"
 
-Switched to and reset branch 'to-rebase'
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-Applying: merge should fail on this, too
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this, too
-found 1 common ancestor:
-virtual f788de73cfc81f8d734fa7efc658cc63ca083f50
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 merge should fail on this, too
-ok 4 - rebase --apply --abort after --skip
+expecting success of 3301.49 'removing non-existing note should not create new commit': 
+	git rev-parse --verify refs/notes/commits >before_commit &&
+	test_must_fail git notes remove HEAD^ &&
+	git rev-parse --verify refs/notes/commits >after_commit &&
+	test_cmp before_commit after_commit
 
-expecting success of 3407.5 'rebase --apply --abort after --continue': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir "$state_dir" &&
-		echo c > a &&
-		echo d >> a &&
-		git add a &&
-		test_must_fail git rebase --continue &&
-		test_cmp_rev ! HEAD main &&
-		git rebase --abort &&
-		check_head &&
-		test_path_is_missing "$state_dir"
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-Applying: merge should fail on this
-Applying: merge should fail on this, too
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-cffbac4 merge should fail on this
-virtual merge should fail on this, too
-found 1 common ancestor:
-virtual f788de73cfc81f8d734fa7efc658cc63ca083f50
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 merge should fail on this, too
-ok 5 - rebase --apply --abort after --continue
+Object HEAD^ has no note
+ok 49 - removing non-existing note should not create new commit
 
-expecting success of 3407.6 'rebase --apply --abort when checking out a tag': 
-		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
-		git reset --hard a -- &&
-		test_must_fail git rebase$type --onto b c pre-rebase &&
-		test_cmp_rev HEAD b^{commit} &&
-		git rebase --abort &&
-		test_cmp_rev HEAD pre-rebase^{commit} &&
-		! git symbolic-ref HEAD
-	
-HEAD is now at cc33353 a
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-9c12280 b
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-fatal: ref HEAD is not a symbolic ref
-ok 6 - rebase --apply --abort when checking out a tag
+expecting success of 3301.50 'removing more than one': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-expecting success of 3407.7 'rebase --apply --abort does not update reflog': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		git reflog show to-rebase > reflog_before &&
-		test_must_fail git rebase$type main &&
-		git rebase --abort &&
-		git reflog show to-rebase > reflog_after &&
-		test_cmp reflog_before reflog_after &&
-		rm reflog_before reflog_after
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 7 - rebase --apply --abort does not update reflog
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git notes remove HEAD^^ HEAD^^^ &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-expecting success of 3407.8 'rebase --abort can not be used with other options': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_must_fail git rebase -v --abort &&
-		test_must_fail git rebase --abort -v &&
-		git rebase --abort
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+ok 50 - removing more than one
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+expecting success of 3301.51 'removing is atomic': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
+	test_must_fail git notes remove HEAD^^ HEAD^^^ HEAD^ &&
+	after=$(git rev-parse --verify refs/notes/commits) &&
+	test "$before" = "$after"
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+Object HEAD^ has no note
+ok 51 - removing is atomic
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+expecting success of 3301.52 'removing with --ignore-missing': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-ok 8 - rebase --abort can not be used with other options
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git notes remove --ignore-missing HEAD^^ HEAD^^^ HEAD^ &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-expecting success of 3407.9 'rebase --apply --quit': 
-		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir $state_dir &&
-		head_before=$(git rev-parse HEAD) &&
-		git rebase --quit &&
-		test_cmp_rev HEAD $head_before &&
-		test_path_is_missing .git/rebase-apply
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Applying: merge should fail on this
-Using index info to reconstruct a base tree...
-M	a
-Falling back to patching base and 3-way merge...
-Merging:
-deaaf55 c
-virtual merge should fail on this
-found 1 common ancestor:
-virtual aaff74984cccd156a469afa7d9ab10e4777beb24
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 9 - rebase --apply --quit
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+Object HEAD^ has no note
+ok 52 - removing with --ignore-missing
 
-expecting success of 3407.10 'rebase --merge --abort': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir "$state_dir" &&
-		git rebase --abort &&
-		check_head &&
-		test_path_is_missing "$state_dir"
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 10 - rebase --merge --abort
+expecting success of 3301.53 'removing with --ignore-missing but bogus ref': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
+	test_must_fail git notes remove --ignore-missing HEAD^^ HEAD^^^ NO-SUCH-COMMIT &&
+	after=$(git rev-parse --verify refs/notes/commits) &&
+	test "$before" = "$after"
 
-expecting success of 3407.11 'pre rebase --merge head is marked as reachable': 
-		# Clean up the state from the previous one
-		git checkout -f --detach pre-rebase &&
-		test_tick &&
-		git commit --amend --only -m "reworded" &&
-		orig_head=$(git rev-parse HEAD) &&
-		test_must_fail git rebase$type main &&
-		# Stop ORIG_HEAD marking $state_dir/orig-head as reachable
-		git update-ref -d ORIG_HEAD &&
-		git reflog expire --expire="$GIT_COMMITTER_DATE" --all &&
-		git prune --expire=now &&
-		git rebase --abort &&
-		test_cmp_rev $orig_head HEAD
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-[detached HEAD 93ea589] reworded
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 11 - pre rebase --merge head is marked as reachable
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+error: Failed to resolve 'NO-SUCH-COMMIT' as a valid ref.
+ok 53 - removing with --ignore-missing but bogus ref
 
-expecting success of 3407.12 'rebase --merge --abort after --skip': 
-		# Clean up the state from the previous one
-		git checkout -B to-rebase pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir "$state_dir" &&
-		test_must_fail git rebase --skip &&
-		test_cmp_rev HEAD main &&
-		git rebase --abort &&
-		check_head &&
-		test_path_is_missing "$state_dir"
-	
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3301.54 'remove reads from --stdin': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-  93ea589 reworded
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git rev-parse HEAD^^ HEAD^^^ >input &&
+	git notes remove --stdin <input &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+ok 54 - remove reads from --stdin
 
- git branch <new-branch-name> 93ea589
+expecting success of 3301.55 'remove --stdin is also atomic': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
+	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
+	test_must_fail git notes remove --stdin <input &&
+	after=$(git rev-parse --verify refs/notes/commits) &&
+	test "$before" = "$after"
 
-Switched to and reset branch 'to-rebase'
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-Rebasing (2/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 1c3a3e2... merge should fail on this, too
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1c3a3e2... merge should fail on this, too
-ok 12 - rebase --merge --abort after --skip
+Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
+ok 55 - remove --stdin is also atomic
 
-expecting success of 3407.13 'rebase --merge --abort after --continue': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir "$state_dir" &&
-		echo c > a &&
-		echo d >> a &&
-		git add a &&
-		test_must_fail git rebase --continue &&
-		test_cmp_rev ! HEAD main &&
-		git rebase --abort &&
-		check_head &&
-		test_path_is_missing "$state_dir"
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-[detached HEAD 49b73bc] merge should fail on this
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 1c3a3e2... merge should fail on this, too
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1c3a3e2... merge should fail on this, too
-ok 13 - rebase --merge --abort after --continue
+expecting success of 3301.56 'removing with --stdin --ignore-missing': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-expecting success of 3407.14 'rebase --merge --abort when checking out a tag': 
-		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
-		git reset --hard a -- &&
-		test_must_fail git rebase$type --onto b c pre-rebase &&
-		test_cmp_rev HEAD b^{commit} &&
-		git rebase --abort &&
-		test_cmp_rev HEAD pre-rebase^{commit} &&
-		! git symbolic-ref HEAD
-	
-HEAD is now at cc33353 a
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-fatal: ref HEAD is not a symbolic ref
-ok 14 - rebase --merge --abort when checking out a tag
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
+	git notes remove --ignore-missing --stdin <input &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-expecting success of 3407.15 'rebase --merge --abort does not update reflog': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		git reflog show to-rebase > reflog_before &&
-		test_must_fail git rebase$type main &&
-		git rebase --abort &&
-		git reflog show to-rebase > reflog_after &&
-		test_cmp reflog_before reflog_after &&
-		rm reflog_before reflog_after
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 15 - rebase --merge --abort does not update reflog
+Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
+ok 56 - removing with --stdin --ignore-missing
 
-expecting success of 3407.16 'rebase --abort can not be used with other options': 
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_must_fail git rebase -v --abort &&
-		test_must_fail git rebase --abort -v &&
-		git rebase --abort
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+expecting success of 3301.57 'list notes with "git notes list"': 
+	commit_2=$(git rev-parse 2nd) &&
+	commit_3=$(git rev-parse 3rd) &&
+	note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
+	note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
+	sort -t" " -k2 >expect <<-EOF &&
+		$note_2 $commit_2
+		$note_3 $commit_3
+	EOF
+	git notes list >actual &&
+	test_cmp expect actual
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+ok 57 - list notes with "git notes list"
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+expecting success of 3301.58 'list notes with "git notes"': 
+	git notes >actual &&
+	test_cmp expect actual
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+ok 58 - list notes with "git notes"
 
-ok 16 - rebase --abort can not be used with other options
+expecting success of 3301.59 '"git notes" without subcommand does not take arguments': 
+	test_expect_code 129 git notes HEAD^^ 2>err &&
+	grep "^error: unknown subcommand" err
 
-expecting success of 3407.17 'rebase --merge --quit': 
-		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type main &&
-		test_path_is_dir $state_dir &&
-		head_before=$(git rev-parse HEAD) &&
-		git rebase --quit &&
-		test_cmp_rev HEAD $head_before &&
-		test_path_is_missing .git/rebase-apply
-	
-HEAD is now at 1c3a3e2 merge should fail on this, too
-Rebasing (1/2)
Auto-merging a
-CONFLICT (content): Merge conflict in a
-error: could not apply 3e1f4f7... merge should fail on this
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 17 - rebase --merge --quit
+error: unknown subcommand: `HEAD^^'
+ok 59 - "git notes" without subcommand does not take arguments
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t2400-worktree-add.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/.git/
-expecting success of 2400.1 'setup': 
-	test_commit init
+expecting success of 3301.60 'list specific note with "git notes list <object>"': 
+	git rev-parse refs/notes/commits:$commit_3 >expect &&
+	git notes list HEAD^^ >actual &&
+	test_cmp expect actual
 
-[main (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
+ok 60 - list specific note with "git notes list <object>"
 
-expecting success of 2400.2 '"add" an existing worktree': 
-	mkdir -p existing/subtree &&
-	test_must_fail git worktree add --detach existing main
+expecting success of 3301.61 'listing non-existing notes fails': 
+	test_must_fail git notes list HEAD >actual &&
+	test_must_be_empty actual
 
-Preparing worktree (detached HEAD 2519212)
-fatal: 'existing' already exists
-ok 2 - "add" an existing worktree
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 61 - listing non-existing notes fails
 
-expecting success of 2400.3 '"add" an existing empty worktree': 
-	mkdir existing_empty &&
-	git worktree add --detach existing_empty main
+expecting success of 3301.62 'append: specify a separator with an empty arg': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 3 - "add" an existing empty worktree
+	notes-2
+	EOF
 
-expecting success of 2400.4 '"add" using shorthand - fails when no previous branch': 
-	test_must_fail git worktree add existing_short -
+	git notes add -m "notes-1" &&
+	git notes append --separator="" -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-fatal: invalid reference: @{-1}
-ok 4 - "add" using shorthand - fails when no previous branch
+Removing note for object HEAD
+ok 62 - append: specify a separator with an empty arg
 
-expecting success of 2400.5 '"add" using - shorthand': 
-	git checkout -b newbranch &&
-	echo hello >myworld &&
-	git add myworld &&
-	git commit -m myworld &&
-	git checkout main &&
-	git worktree add short-hand - &&
-	echo refs/heads/newbranch >expect &&
-	git -C short-hand rev-parse --symbolic-full-name HEAD >actual &&
-	test_cmp expect actual
+expecting success of 3301.63 'append: specify a separator without arg': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
 
-Switched to a new branch 'newbranch'
-[newbranch 5ae2ce4] myworld
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 myworld
-Switched to branch 'main'
-Preparing worktree (checking out '@{-1}')
-HEAD is now at 5ae2ce4 myworld
-ok 5 - "add" using - shorthand
+	notes-2
+	EOF
 
-expecting success of 2400.6 '"add" refuses to checkout locked branch': 
-	test_must_fail git worktree add zere main &&
-	! test -d zere &&
-	! test -d .git/worktrees/zere
+	git notes add -m "notes-1" &&
+	git notes append --separator -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-Preparing worktree (checking out 'main')
-fatal: 'main' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add'
-ok 6 - "add" refuses to checkout locked branch
+Removing note for object HEAD
+ok 63 - append: specify a separator without arg
 
-expecting success of 2400.7 'checking out paths not complaining about linked checkouts': 
-	(
-	cd existing_empty &&
-	echo dirty >>init.t &&
-	git checkout main -- init.t
-	)
+expecting success of 3301.64 'append: specify as --no-separator': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	notes-2
+	EOF
 
-ok 7 - checking out paths not complaining about linked checkouts
+	git notes add -m "notes-1" &&
+	git notes append --no-separator -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.8 '"add" worktree': 
-	git rev-parse HEAD >expect &&
-	git worktree add --detach here main &&
-	(
-		cd here &&
-		test_cmp ../init.t init.t &&
-		test_must_fail git symbolic-ref HEAD &&
-		git rev-parse HEAD >actual &&
-		test_cmp ../expect actual &&
-		git fsck
-	)
+Removing note for object HEAD
+ok 64 - append: specify as --no-separator
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: ref HEAD is not a symbolic ref
-ok 8 - "add" worktree
+expecting success of 3301.65 'append: specify separator with line break': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	-------
+	notes-2
+	EOF
 
-expecting success of 2400.9 '"add" worktree with lock': 
-	git worktree add --detach --lock here-with-lock main &&
-	test_when_finished "git worktree unlock here-with-lock || :" &&
-	test -f .git/worktrees/here-with-lock/locked
+	git notes add -m "notes-1" &&
+	git notes append --separator="-------$LF" -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 9 - "add" worktree with lock
+Removing note for object HEAD
+ok 65 - append: specify separator with line break
 
-expecting success of 2400.10 '"add" worktree with lock and reason': 
-	lock_reason="why not" &&
-	git worktree add --detach --lock --reason "$lock_reason" here-with-lock-reason main &&
-	test_when_finished "git worktree unlock here-with-lock-reason || :" &&
-	test -f .git/worktrees/here-with-lock-reason/locked &&
-	echo "$lock_reason" >expect &&
-	test_cmp expect .git/worktrees/here-with-lock-reason/locked
+expecting success of 3301.66 'append: specify separator without line break': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	-------
+	notes-2
+	EOF
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 10 - "add" worktree with lock and reason
+	git notes add -m "notes-1" &&
+	git notes append --separator="-------" -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.11 '"add" worktree with reason but no lock': 
-	test_must_fail git worktree add --detach --reason "why not" here-with-reason-only main &&
-	test_path_is_missing .git/worktrees/here-with-reason-only/locked
+Removing note for object HEAD
+ok 66 - append: specify separator without line break
 
-fatal: the option '--reason' requires '--lock'
-ok 11 - "add" worktree with reason but no lock
+expecting success of 3301.67 'append: specify separator with multiple messages': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	-------
+	notes-2
+	-------
+	notes-3
+	EOF
 
-expecting success of 2400.12 '"add" worktree from a subdir': 
-	(
-		mkdir sub &&
-		cd sub &&
-		git worktree add --detach here main &&
-		cd here &&
-		test_cmp ../../init.t init.t
-	)
+	git notes add -m "notes-1" &&
+	git notes append --separator="-------" -m "notes-2" -m "notes-3" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 12 - "add" worktree from a subdir
+Removing note for object HEAD
+ok 67 - append: specify separator with multiple messages
 
-expecting success of 2400.13 '"add" from a linked checkout': 
-	(
-		cd here &&
-		git worktree add --detach nested-here main &&
-		cd nested-here &&
-		git fsck
-	)
+expecting success of 3301.68 'append note with combination of -m and -F and --separator': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect-combine_m_and_F <<-\EOF &&
+	m-notes-1
+	-------
+	f-notes-1
+	-------
+	m-notes-2
+	-------
+	f-notes-2
+	-------
+	m-notes-3
+	EOF
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 13 - "add" from a linked checkout
+	echo "f-notes-1" >note_a &&
+	echo "f-notes-2" >note_b &&
+	git notes append -m "m-notes-1" -F note_a -m "m-notes-2" -F note_b -m "m-notes-3" --separator="-------" &&
+	git notes show >actual &&
+	test_cmp expect-combine_m_and_F actual
 
-expecting success of 2400.14 '"add" worktree creating new branch': 
-	git worktree add -b newmain there main &&
-	(
-		cd there &&
-		test_cmp ../init.t init.t &&
-		git symbolic-ref HEAD >actual &&
-		echo refs/heads/newmain >expect &&
-		test_cmp expect actual &&
-		git fsck
-	)
+Removing note for object HEAD
+ok 68 - append note with combination of -m and -F and --separator
 
-Preparing worktree (new branch 'newmain')
-HEAD is now at 2519212 init
-ok 14 - "add" worktree creating new branch
+expecting success of 3301.69 'append to existing note with "git notes append"': 
+	cat >expect <<-EOF &&
+		Initial set of notes
 
-expecting success of 2400.15 'die the same branch is already checked out': 
-	(
-		cd here &&
-		test_must_fail git checkout newmain 2>actual &&
-		grep "already used by worktree at" actual
-	)
+		More notes appended with git notes append
+	EOF
+	git notes add -m "Initial set of notes" &&
+	git notes append -m "More notes appended with git notes append" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/there'
-ok 15 - die the same branch is already checked out
+ok 69 - append to existing note with "git notes append"
 
-expecting success of 2400.16 'refuse to reset a branch in use elsewhere': 
-	(
-		cd here &&
+expecting success of 3301.70 '"git notes list" does not expand to "git notes list HEAD"': 
+	commit_5=$(git rev-parse 5th) &&
+	note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
+	sort -t" " -k2 >expect_list <<-EOF &&
+		$note_2 $commit_2
+		$note_3 $commit_3
+		$note_5 $commit_5
+	EOF
+	git notes list >actual &&
+	test_cmp expect_list actual
 
-		# we know we are on detached HEAD but just in case ...
-		git checkout --detach HEAD &&
-		git rev-parse --verify HEAD >old.head &&
+ok 70 - "git notes list" does not expand to "git notes list HEAD"
 
-		git rev-parse --verify refs/heads/newmain >old.branch &&
-		test_must_fail git checkout -B newmain 2>error &&
-		git rev-parse --verify refs/heads/newmain >new.branch &&
-		git rev-parse --verify HEAD >new.head &&
+expecting success of 3301.71 'appending empty string does not change existing note': 
+	git notes append -m "" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-		grep "already used by worktree at" error &&
-		test_cmp old.branch new.branch &&
-		test_cmp old.head new.head &&
+ok 71 - appending empty string does not change existing note
 
-		# and we must be still on the same detached HEAD state
-		test_must_fail git symbolic-ref HEAD
-	)
+expecting success of 3301.72 'git notes append == add when there is no existing note': 
+	git notes remove HEAD &&
+	test_must_fail git notes list HEAD &&
+	git notes append -m "Initial set of notes${LF}${LF}More notes appended with git notes append" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2519212 init
-fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/there'
-fatal: ref HEAD is not a symbolic ref
-ok 16 - refuse to reset a branch in use elsewhere
+Removing note for object HEAD
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 72 - git notes append == add when there is no existing note
 
-checking prerequisite: SYMLINKS
+expecting success of 3301.73 'appending empty string to non-existing note does not create note': 
+	git notes remove HEAD &&
+	test_must_fail git notes list HEAD &&
+	git notes append -m "" &&
+	test_must_fail git notes list HEAD
 
-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
+Removing note for object HEAD
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 73 - appending empty string to non-existing note does not create note
 
-)
-prerequisite SYMLINKS ok
-expecting success of 2400.17 'die the same branch is already checked out (symlink)': 
-	head=$(git -C there rev-parse --git-path HEAD) &&
-	ref=$(git -C there symbolic-ref HEAD) &&
-	rm "$head" &&
-	ln -s "$ref" "$head" &&
-	test_must_fail git -C here checkout newmain
+expecting success of 3301.74 'create other note on a different notes ref (setup)': 
+	test_commit 6th &&
+	GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-not-other <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
 
-fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/there'
-ok 17 - die the same branch is already checked out (symlink)
+		${indent}6th
+	EOF
+	cp expect-not-other expect-other &&
+	cat >>expect-other <<-EOF
 
-expecting success of 2400.18 'not die the same branch is already checked out': 
-	(
-		cd here &&
-		git worktree add --force anothernewmain newmain
-	)
+		Notes (other):
+		${indent}other note
+	EOF
 
-Preparing worktree (checking out 'newmain')
-HEAD is now at 2519212 init
-ok 18 - not die the same branch is already checked out
+[master 2c12533] 6th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6th.t
+ok 74 - create other note on a different notes ref (setup)
 
-expecting success of 2400.19 'not die on re-checking out current branch': 
-	(
-		cd there &&
-		git checkout newmain
-	)
+expecting success of 3301.75 'Do not show note on other ref by default': 
+	git log -1 >actual &&
+	test_cmp expect-not-other actual
 
-Already on 'newmain'
-ok 19 - not die on re-checking out current branch
+ok 75 - Do not show note on other ref by default
 
-expecting success of 2400.20 '"add" from a bare repo': 
-	(
-		git clone --bare . bare &&
-		cd bare &&
-		git worktree add -b bare-main ../there2 main
-	)
+expecting success of 3301.76 'Do show note when ref is given in GIT_NOTES_REF': 
+	GIT_NOTES_REF="refs/notes/other" git log -1 >actual &&
+	test_cmp expect-other actual
 
-Cloning into bare repository 'bare'...
-done.
-Preparing worktree (new branch 'bare-main')
-HEAD is now at 2519212 init
-ok 20 - "add" from a bare repo
+ok 76 - Do show note when ref is given in GIT_NOTES_REF
 
-expecting success of 2400.21 'checkout from a bare repo without "add"': 
-	(
-		cd bare &&
-		test_must_fail git checkout main
-	)
+expecting success of 3301.77 'Do show note when ref is given in core.notesRef config': 
+	test_config core.notesRef "refs/notes/other" &&
+	git log -1 >actual &&
+	test_cmp expect-other actual
 
-fatal: this operation must be run in a work tree
-ok 21 - checkout from a bare repo without "add"
+ok 77 - Do show note when ref is given in core.notesRef config
 
-expecting success of 2400.22 '"add" default branch of a bare repo': 
-	(
-		git clone --bare . bare2 &&
-		cd bare2 &&
-		git worktree add ../there3 main &&
-		cd ../there3 &&
-		# Simple check that a Git command does not
-		# immediately fail with the current setup
-		git status
-	) &&
-	cat >expect <<-EOF &&
-	init.t
-	EOF
-	ls there3 >actual &&
-	test_cmp expect actual
+expecting success of 3301.78 'Do not show note when core.notesRef is overridden': 
+	test_config core.notesRef "refs/notes/other" &&
+	GIT_NOTES_REF="refs/notes/wrong" git log -1 >actual &&
+	test_cmp expect-not-other actual
 
-Cloning into bare repository 'bare2'...
-done.
-Preparing worktree (checking out 'main')
-HEAD is now at 2519212 init
-On branch main
-nothing to commit, working tree clean
-ok 22 - "add" default branch of a bare repo
+ok 78 - Do not show note when core.notesRef is overridden
 
-expecting success of 2400.23 '"add" to bare repo with worktree config': 
-	(
-		git clone --bare . bare3 &&
-		cd bare3 &&
-		git config extensions.worktreeconfig true &&
+expecting success of 3301.79 'Show all notes when notes.displayRef=refs/notes/*': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect-both <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
 
-		# Add config values that are erroneous to have in
-		# a config.worktree file outside of the main
-		# working tree, to check that Git filters them out
-		# when copying config during "git worktree add".
-		git config --worktree core.bare true &&
-		git config --worktree core.worktree "$(pwd)" &&
+		${indent}6th
 
-		# We want to check that bogus.key is copied
-		git config --worktree bogus.key value &&
-		git config --unset core.bare &&
-		git worktree add ../there4 main &&
-		cd ../there4 &&
+		Notes:
+		${indent}order test
 
-		# Simple check that a Git command does not
-		# immediately fail with the current setup
-		git status &&
-		git worktree add --detach ../there5 &&
-		cd ../there5 &&
-		git status
-	) &&
+		Notes (other):
+		${indent}other note
 
-	# the worktree has the arbitrary value copied.
-	test_cmp_config -C there4 value bogus.key &&
-	test_cmp_config -C there5 value bogus.key &&
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
 
-	# however, core.bare and core.worktree were removed.
-	test_must_fail git -C there4 config core.bare &&
-	test_must_fail git -C there4 config core.worktree &&
+		${indent}5th
 
-	cat >expect <<-EOF &&
-	init.t
+		Notes:
+		${indent}replacement for deleted note
 	EOF
+	GIT_NOTES_REF=refs/notes/commits git notes add \
+		-m"replacement for deleted note" HEAD^ &&
+	GIT_NOTES_REF=refs/notes/commits git notes add -m"order test" &&
+	test_unconfig core.notesRef &&
+	test_config notes.displayRef "refs/notes/*" &&
+	git log -2 >actual &&
+	test_cmp expect-both actual
 
-	ls there4 >actual &&
-	test_cmp expect actual &&
-	ls there5 >actual &&
-	test_cmp expect actual
+ok 79 - Show all notes when notes.displayRef=refs/notes/*
 
-Cloning into bare repository 'bare3'...
-done.
-warning: core.bare and core.worktree do not make sense
-warning: core.bare and core.worktree do not make sense
-warning: core.bare and core.worktree do not make sense
-Preparing worktree (checking out 'main')
-HEAD is now at 2519212 init
-On branch main
-nothing to commit, working tree clean
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Not currently on any branch.
-nothing to commit, working tree clean
-ok 23 - "add" to bare repo with worktree config
+expecting success of 3301.80 'core.notesRef is implicitly in notes.displayRef': 
+	test_config core.notesRef refs/notes/commits &&
+	test_config notes.displayRef refs/notes/other &&
+	git log -2 >actual &&
+	test_cmp expect-both actual
 
-expecting success of 2400.24 'checkout with grafts': 
-	test_when_finished rm .git/info/grafts &&
-	test_commit abc &&
-	SHA1=$(git rev-parse HEAD) &&
-	test_commit def &&
-	test_commit xyz &&
-	mkdir .git/info &&
-	echo "$(git rev-parse HEAD) $SHA1" >.git/info/grafts &&
-	cat >expected <<-\EOF &&
-	xyz
-	abc
-	EOF
-	git log --format=%s -2 >actual &&
-	test_cmp expected actual &&
-	git worktree add --detach grafted main &&
-	git --git-dir=grafted/.git log --format=%s -2 >actual &&
-	test_cmp expected actual
+ok 80 - core.notesRef is implicitly in notes.displayRef
 
-[main 6d278e0] abc
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abc.t
-[main 3c13a14] def
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 def.t
-[main a51b5be] xyz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 xyz.t
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-Preparing worktree (detached HEAD a51b5be)
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-HEAD is now at a51b5be xyz
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 24 - checkout with grafts
+expecting success of 3301.81 'notes.displayRef can be given more than once': 
+	test_unconfig core.notesRef &&
+	test_config notes.displayRef refs/notes/commits &&
+	git config --add notes.displayRef refs/notes/other &&
+	git log -2 >actual &&
+	test_cmp expect-both actual
 
-expecting success of 2400.25 '"add" from relative HEAD': 
-	test_commit a &&
-	test_commit b &&
-	test_commit c &&
-	git rev-parse HEAD~1 >expected &&
-	git worktree add relhead HEAD~1 &&
-	git -C relhead rev-parse HEAD >actual &&
-	test_cmp expected actual
+ok 81 - notes.displayRef can be given more than once
 
-[main e9a6308] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[main 15d3bfc] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[main 179a9e0] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Preparing worktree (detached HEAD 15d3bfc)
-HEAD is now at 15d3bfc b
-ok 25 - "add" from relative HEAD
+expecting success of 3301.82 'notes.displayRef respects order': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-both-reversed <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
 
-expecting success of 2400.26 '"add -b" with <branch> omitted': 
-	git worktree add -b burble flornk &&
-	test_cmp_rev HEAD burble
+		${indent}6th
 
-Preparing worktree (new branch 'burble')
-HEAD is now at 179a9e0 c
-ok 26 - "add -b" with <branch> omitted
+		Notes (other):
+		${indent}other note
 
-expecting success of 2400.27 '"add --detach" with <branch> omitted': 
-	git worktree add --detach fishhook &&
-	git rev-parse HEAD >expected &&
-	git -C fishhook rev-parse HEAD >actual &&
-	test_cmp expected actual &&
-	test_must_fail git -C fishhook symbolic-ref HEAD
+		Notes:
+		${indent}order test
+	EOF
+	test_config core.notesRef refs/notes/other &&
+	test_config notes.displayRef refs/notes/commits &&
+	git log -1 >actual &&
+	test_cmp expect-both-reversed actual
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-fatal: ref HEAD is not a symbolic ref
-ok 27 - "add --detach" with <branch> omitted
+ok 82 - notes.displayRef respects order
 
-expecting success of 2400.28 '"add" with <branch> omitted': 
-	git worktree add wiffle/bat &&
-	test_cmp_rev HEAD bat
+expecting success of 3301.83 'notes.displayRef with no value handled gracefully': 
+	test_must_fail git -c notes.displayRef log -0 --notes &&
+	test_must_fail git -c notes.displayRef diff-tree --notes HEAD
 
-Preparing worktree (new branch 'bat')
-HEAD is now at 179a9e0 c
-ok 28 - "add" with <branch> omitted
+error: missing value for 'notes.displayref'
+fatal: unable to parse 'notes.displayref' from command-line config
+error: missing value for 'notes.displayref'
+fatal: unable to parse 'notes.displayref' from command-line config
+ok 83 - notes.displayRef with no value handled gracefully
 
-expecting success of 2400.29 '"add" checks out existing branch of dwimd name': 
-	git branch dwim HEAD~1 &&
-	git worktree add dwim &&
-	test_cmp_rev HEAD~1 dwim &&
-	(
-		cd dwim &&
-		test_cmp_rev HEAD dwim
-	)
+expecting success of 3301.84 'GIT_NOTES_DISPLAY_REF works': 
+	GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
+		git log -2 >actual &&
+	test_cmp expect-both actual
 
-Preparing worktree (checking out 'dwim')
-HEAD is now at 15d3bfc b
-ok 29 - "add" checks out existing branch of dwimd name
+ok 84 - GIT_NOTES_DISPLAY_REF works
 
-expecting success of 2400.30 '"add <path>" dwim fails with checked out branch': 
-	git checkout -b test-branch &&
-	test_must_fail git worktree add test-branch &&
-	test_path_is_missing test-branch
+expecting success of 3301.85 'GIT_NOTES_DISPLAY_REF overrides config': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect-none <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
 
-Switched to a new branch 'test-branch'
-Preparing worktree (checking out 'test-branch')
-fatal: 'test-branch' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add'
-ok 30 - "add <path>" dwim fails with checked out branch
+		${indent}6th
 
-expecting success of 2400.31 '"add --force" with existing dwimd name doesnt die': 
-	git checkout test-branch &&
-	git worktree add --force test-branch
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
 
-Already on 'test-branch'
-Preparing worktree (checking out 'test-branch')
-HEAD is now at 179a9e0 c
-ok 31 - "add --force" with existing dwimd name doesnt die
+		${indent}5th
+	EOF
+	test_config notes.displayRef "refs/notes/*" &&
+	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log -2 >actual &&
+	test_cmp expect-none actual
 
-expecting success of 2400.32 '"add" no auto-vivify with --detach and <branch> omitted': 
-	git worktree add --detach mish/mash &&
-	test_must_fail git rev-parse mash -- &&
-	test_must_fail git -C mish/mash symbolic-ref HEAD
+ok 85 - GIT_NOTES_DISPLAY_REF overrides config
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-fatal: bad revision 'mash'
-fatal: ref HEAD is not a symbolic ref
-ok 32 - "add" no auto-vivify with --detach and <branch> omitted
+expecting success of 3301.86 '--show-notes=* adds to GIT_NOTES_DISPLAY_REF': 
+	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log --show-notes=* -2 >actual &&
+	test_cmp expect-both actual
 
-expecting success of 2400.33 ''worktree add' with '-b poodle -B poodle bamboo main' has mutually exclusive options': 
-		test_must_fail git worktree add $opts 2>actual &&
-		grep -E "fatal:( options)? .* cannot be used together" actual
-	
-fatal: options '-b', '-B', and '--detach' cannot be used together
-ok 33 - 'worktree add' with '-b poodle -B poodle bamboo main' has mutually exclusive options
+ok 86 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF
 
-expecting success of 2400.34 ''worktree add' with '-b poodle --detach bamboo main' has mutually exclusive options': 
-		test_must_fail git worktree add $opts 2>actual &&
-		grep -E "fatal:( options)? .* cannot be used together" actual
-	
-fatal: options '-b', '-B', and '--detach' cannot be used together
-ok 34 - 'worktree add' with '-b poodle --detach bamboo main' has mutually exclusive options
+expecting success of 3301.87 '--no-standard-notes': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-commits <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
 
-expecting success of 2400.35 ''worktree add' with '-B poodle --detach bamboo main' has mutually exclusive options': 
-		test_must_fail git worktree add $opts 2>actual &&
-		grep -E "fatal:( options)? .* cannot be used together" actual
-	
-fatal: options '-b', '-B', and '--detach' cannot be used together
-ok 35 - 'worktree add' with '-B poodle --detach bamboo main' has mutually exclusive options
+		${indent}6th
 
-expecting success of 2400.36 ''worktree add' with '--orphan --detach bamboo' has mutually exclusive options': 
-		test_must_fail git worktree add $opts 2>actual &&
-		grep -E "fatal:( options)? .* cannot be used together" actual
-	
-fatal: options '--orphan' and '--detach' cannot be used together
-ok 36 - 'worktree add' with '--orphan --detach bamboo' has mutually exclusive options
+		Notes:
+		${indent}order test
+	EOF
+	git log --no-standard-notes --show-notes=commits -1 >actual &&
+	test_cmp expect-commits actual
 
-expecting success of 2400.37 ''worktree add' with '--orphan --no-checkout bamboo' has mutually exclusive options': 
-		test_must_fail git worktree add $opts 2>actual &&
-		grep -E "fatal:( options)? .* cannot be used together" actual
-	
-fatal: options '--orphan' and '--no-checkout' cannot be used together
-ok 37 - 'worktree add' with '--orphan --no-checkout bamboo' has mutually exclusive options
+ok 87 - --no-standard-notes
 
-expecting success of 2400.38 ''worktree add' with '--orphan bamboo main' has mutually exclusive options': 
-		test_must_fail git worktree add $opts 2>actual &&
-		grep -E "fatal:( options)? .* cannot be used together" actual
-	
-fatal: option '--orphan' and commit-ish cannot be used together
-ok 38 - 'worktree add' with '--orphan bamboo main' has mutually exclusive options
+expecting success of 3301.88 '--standard-notes': 
+	test_config notes.displayRef "refs/notes/*" &&
+	git log --no-standard-notes --show-notes=commits \
+		--standard-notes -2 >actual &&
+	test_cmp expect-both actual
 
-expecting success of 2400.39 ''worktree add' with '--orphan -b bamboo wtdir/ main' has mutually exclusive options': 
-		test_must_fail git worktree add $opts 2>actual &&
-		grep -E "fatal:( options)? .* cannot be used together" actual
-	
-fatal: option '--orphan' and commit-ish cannot be used together
-ok 39 - 'worktree add' with '--orphan -b bamboo wtdir/ main' has mutually exclusive options
+ok 88 - --standard-notes
 
-expecting success of 2400.40 '"add -B" fails if the branch is checked out': 
-	git rev-parse newmain >before &&
-	test_must_fail git worktree add -B newmain bamboo main &&
-	git rev-parse newmain >after &&
-	test_cmp before after
+expecting success of 3301.89 '--show-notes=ref accumulates': 
+	git log --show-notes=other --show-notes=commits \
+		 --no-standard-notes -1 >actual &&
+	test_cmp expect-both-reversed actual
 
-fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/here/anothernewmain'
-ok 40 - "add -B" fails if the branch is checked out
+ok 89 - --show-notes=ref accumulates
 
-expecting success of 2400.41 'add -B': 
-	git worktree add -B poodle bamboo2 main^ &&
-	git -C bamboo2 symbolic-ref HEAD >actual &&
-	echo refs/heads/poodle >expected &&
-	test_cmp expected actual &&
-	test_cmp_rev main^ poodle
+expecting success of 3301.90 'Allow notes on non-commits (trees, blobs, tags)': 
+	test_config core.notesRef refs/notes/other &&
+	echo "Note on a tree" >expect &&
+	git notes add -m "Note on a tree" HEAD: &&
+	git notes show HEAD: >actual &&
+	test_cmp expect actual &&
+	echo "Note on a blob" >expect &&
+	git ls-tree --name-only HEAD >files &&
+	filename=$(head -n1 files) &&
+	git notes add -m "Note on a blob" HEAD:$filename &&
+	git notes show HEAD:$filename >actual &&
+	test_cmp expect actual &&
+	echo "Note on a tag" >expect &&
+	git tag -a -m "This is an annotated tag" foobar HEAD^ &&
+	git notes add -m "Note on a tag" foobar &&
+	git notes show foobar >actual &&
+	test_cmp expect actual
 
-Preparing worktree (new branch 'poodle')
-HEAD is now at 15d3bfc b
-ok 41 - add -B
+ok 90 - Allow notes on non-commits (trees, blobs, tags)
 
-expecting success of 2400.42 'add --quiet': 
-	test_when_finished "git worktree remove -f -f another-worktree" &&
-	git worktree add --quiet another-worktree main 2>actual &&
-	test_must_be_empty actual
+expecting success of 3301.91 'create note from other note with "git notes add -C"': 
+	test_commit 7th &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:19:13 2005 -0700
 
-ok 42 - add --quiet
+		${indent}7th
 
-expecting success of 2400.43 'add --quiet -b': 
-	test_when_finished "git branch -D quietnewbranch" &&
-	test_when_finished "git worktree remove -f -f another-worktree" &&
-	git worktree add --quiet -b quietnewbranch another-worktree 2>actual &&
-	test_must_be_empty actual
+		Notes:
+		${indent}order test
+	EOF
+	note=$(git notes list HEAD^) &&
+	git notes add -C $note &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 
-Deleted branch quietnewbranch (was 179a9e0).
-ok 43 - add --quiet -b
+[master fb01e0c] 7th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7th.t
+ok 91 - create note from other note with "git notes add -C"
 
-expecting success of 2400.44 '"add --orphan"': 
-	test_when_finished "git worktree remove -f -f orphandir" &&
-	git worktree add --orphan -b neworphan orphandir &&
-	echo refs/heads/neworphan >expected &&
-	git -C orphandir symbolic-ref HEAD >actual &&
-	test_cmp expected actual
+expecting success of 3301.92 'create note from non-existing note with "git notes add -C" fails': 
+	test_commit 8th &&
+	test_must_fail git notes add -C deadbeef &&
+	test_must_fail git notes list HEAD
 
-Preparing worktree (new branch 'neworphan')
-ok 44 - "add --orphan"
+[master 9a4c31c] 8th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8th.t
+fatal: failed to resolve 'deadbeef' as a valid ref.
+error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
+ok 92 - create note from non-existing note with "git notes add -C" fails
 
-expecting success of 2400.45 '"add --orphan (no -b)"': 
-	test_when_finished "git worktree remove -f -f neworphan" &&
-	git worktree add --orphan neworphan &&
-	echo refs/heads/neworphan >expected &&
-	git -C neworphan symbolic-ref HEAD >actual &&
-	test_cmp expected actual
+expecting success of 3301.93 'create note from non-blob with "git notes add -C" fails': 
+	commit=$(git rev-parse --verify HEAD) &&
+	tree=$(git rev-parse --verify HEAD:) &&
+	test_must_fail git notes add -C $commit &&
+	test_must_fail git notes add -C $tree &&
+	test_must_fail git notes list HEAD
 
-Preparing worktree (new branch 'neworphan')
-ok 45 - "add --orphan (no -b)"
+fatal: cannot read note data from non-blob object '9a4c31c7f722b5d517e92c64e932dd751e1413bf'.
+fatal: cannot read note data from non-blob object '37f6454412e4ed89ae47782f956ed0fb573892f6'.
+error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
+ok 93 - create note from non-blob with "git notes add -C" fails
 
-expecting success of 2400.46 '"add --orphan --quiet"': 
-	test_when_finished "git worktree remove -f -f orphandir" &&
-	git worktree add --quiet --orphan -b neworphan orphandir 2>log.actual &&
-	test_must_be_empty log.actual &&
-	echo refs/heads/neworphan >expected &&
-	git -C orphandir symbolic-ref HEAD >actual &&
-	test_cmp expected actual
+expecting success of 3301.94 'create note from blob with "git notes add -C" reuses blob id': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:20:13 2005 -0700
 
-ok 46 - "add --orphan --quiet"
+		${indent}8th
 
-expecting success of 2400.47 '"add --orphan" fails if the branch already exists': 
-	test_when_finished "git branch -D existingbranch" &&
-	git worktree add -b existingbranch orphandir main &&
-	git worktree remove orphandir &&
-	test_must_fail git worktree add --orphan -b existingbranch orphandir
+		Notes:
+		${indent}This is a blob object
+	EOF
+	echo "This is a blob object" | git hash-object -w --stdin >blob &&
+	git notes add -C $(cat blob) &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD >actual &&
+	test_cmp blob actual
 
-Preparing worktree (new branch 'existingbranch')
-HEAD is now at 179a9e0 c
-Preparing worktree (new branch 'existingbranch')
-fatal: a branch named 'existingbranch' already exists
-Deleted branch existingbranch (was 179a9e0).
-ok 47 - "add --orphan" fails if the branch already exists
+ok 94 - create note from blob with "git notes add -C" reuses blob id
 
-expecting success of 2400.48 '"add --orphan" with empty repository': 
-	test_when_finished "rm -rf empty_repo" &&
-	echo refs/heads/newbranch >expected &&
-	GIT_DIR="empty_repo" git init --bare &&
-	git -C empty_repo worktree add --orphan -b newbranch worktreedir &&
-	git -C empty_repo/worktreedir symbolic-ref HEAD >actual &&
-	test_cmp expected actual
+expecting success of 3301.95 'create note from blob with "-C", also specify "-m", "-F" and "--separator"': 
+	# 8th will be reuseed in following tests, so rollback when the test is done
+	test_when_finished "git notes remove && git notes add -C $(cat blob)" &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:20:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/empty_repo/
-Preparing worktree (new branch 'newbranch')
-ok 48 - "add --orphan" with empty repository
+		${indent}8th
 
-expecting success of 2400.49 '"add" worktree with orphan branch and lock': 
-	git worktree add --lock --orphan -b orphanbr orphan-with-lock &&
-	test_when_finished "git worktree unlock orphan-with-lock || :" &&
-	test -f .git/worktrees/orphan-with-lock/locked
+		Notes:
+		${indent}This is a blob object
+		${indent}-------
+		${indent}This is created by -m
+		${indent}-------
+		${indent}This is created by -F
+	EOF
 
-Preparing worktree (new branch 'orphanbr')
-ok 49 - "add" worktree with orphan branch and lock
+	git notes remove &&
+	echo "This is a blob object" | git hash-object -w --stdin >blob &&
+	echo "This is created by -F" >note_a &&
+	git notes add -C $(cat blob) -m "This is created by -m" -F note_a --separator="-------" &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.50 '"add" worktree with orphan branch, lock, and reason': 
-	lock_reason="why not" &&
-	git worktree add --detach --lock --reason "$lock_reason" orphan-with-lock-reason main &&
-	test_when_finished "git worktree unlock orphan-with-lock-reason || :" &&
-	test -f .git/worktrees/orphan-with-lock-reason/locked &&
-	echo "$lock_reason" >expect &&
-	test_cmp expect .git/worktrees/orphan-with-lock-reason/locked
+Removing note for object HEAD
+Removing note for object HEAD
+ok 95 - create note from blob with "-C", also specify "-m", "-F" and "--separator"
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-ok 50 - "add" worktree with orphan branch, lock, and reason
+expecting success of 3301.96 'create note from other note with "git notes add -c"': 
+	test_commit 9th &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:21:13 2005 -0700
 
-expecting success of 2400.51 ''worktree add' show orphan hint in bad/orphan HEAD w/ no opts': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(cd repo && test_commit commit) &&
-		git -C repo switch --orphan noref &&
-		test_must_fail git -C repo worktree add $opts foobar/ 2>actual &&
-		! grep "error: unknown switch" actual &&
-		grep "hint: If you meant to create a worktree containing a new unborn branch" actual &&
-		if [ $use_branch -eq 1 ]
-		then
-			grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual
-		else
-			grep -E "^hint: +git worktree add --orphan [^ ]+$" actual
-		fi
+		${indent}9th
 
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
+		Notes:
+		${indent}yet another note
+	EOF
+	note=$(git notes list HEAD^^) &&
+	MSG="yet another note" git notes add -c $note &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+[master 2e0db4b] 9th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'noref'
-hint: If you meant to create a worktree containing a new unborn branch
-hint:     git worktree add --orphan foobar/
-ok 51 - 'worktree add' show orphan hint in bad/orphan HEAD w/ no opts
+ create mode 100644 9th.t
+yet another note
+ok 96 - create note from other note with "git notes add -c"
 
-expecting success of 2400.52 ''worktree add' show orphan hint in bad/orphan HEAD w/ -b': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(cd repo && test_commit commit) &&
-		git -C repo switch --orphan noref &&
-		test_must_fail git -C repo worktree add $opts foobar/ 2>actual &&
-		! grep "error: unknown switch" actual &&
-		grep "hint: If you meant to create a worktree containing a new unborn branch" actual &&
-		if [ $use_branch -eq 1 ]
-		then
-			grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual
-		else
-			grep -E "^hint: +git worktree add --orphan [^ ]+$" actual
-		fi
+expecting success of 3301.97 'create note from non-existing note with "git notes add -c" fails': 
+	test_commit 10th &&
+	test_must_fail env MSG="yet another note" git notes add -c deadbeef &&
+	test_must_fail git notes list HEAD
 
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
+[master 7c3b87a] 10th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'noref'
-hint: If you meant to create a worktree containing a new unborn branch
-hint:     git worktree add --orphan -b foobar_branch foobar/
-ok 52 - 'worktree add' show orphan hint in bad/orphan HEAD w/ -b
+ create mode 100644 10th.t
+fatal: failed to resolve 'deadbeef' as a valid ref.
+error: no note found for object 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406.
+ok 97 - create note from non-existing note with "git notes add -c" fails
 
-expecting success of 2400.53 ''worktree add' show orphan hint in bad/orphan HEAD w/ -B': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(cd repo && test_commit commit) &&
-		git -C repo switch --orphan noref &&
-		test_must_fail git -C repo worktree add $opts foobar/ 2>actual &&
-		! grep "error: unknown switch" actual &&
-		grep "hint: If you meant to create a worktree containing a new unborn branch" actual &&
-		if [ $use_branch -eq 1 ]
-		then
-			grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual
-		else
-			grep -E "^hint: +git worktree add --orphan [^ ]+$" actual
-		fi
+expecting success of 3301.98 'append to note from other note with "git notes append -C"': 
+	commit=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:21:13 2005 -0700
 
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'noref'
-hint: If you meant to create a worktree containing a new unborn branch
-hint:     git worktree add --orphan -b foobar_branch foobar/
-ok 53 - 'worktree add' show orphan hint in bad/orphan HEAD w/ -B
+		${indent}9th
 
-expecting success of 2400.54 ''worktree add' doesn't show orphan hint in bad/orphan HEAD w/ --quiet': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(cd repo && test_commit commit) &&
-	test_must_fail git -C repo worktree add --quiet foobar_branch foobar/ 2>actual &&
-	! grep "error: unknown switch" actual &&
-	! grep "hint: If you meant to create a worktree containing a new unborn branch" actual
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
+	EOF
+	note=$(git notes list HEAD^) &&
+	git notes append -C $note HEAD^ &&
+	git log -1 HEAD^ >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-ok 54 - 'worktree add' doesn't show orphan hint in bad/orphan HEAD w/ --quiet
+ok 98 - append to note from other note with "git notes append -C"
 
-expecting success of 2400.55 'local clone from linked checkout': 
-	git clone --local here here-clone &&
-	( cd here-clone && git fsck )
+expecting success of 3301.99 'create note from other note with "git notes append -c"': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:22:13 2005 -0700
 
-Cloning into 'here-clone'...
-done.
-ok 55 - local clone from linked checkout
+		${indent}10th
 
-expecting success of 2400.56 'local clone --shared from linked checkout': 
-	git -C bare worktree add --detach ../baretree &&
-	git clone --local --shared baretree bare-clone &&
-	grep /bare/ bare-clone/.git/objects/info/alternates
+		Notes:
+		${indent}other note
+	EOF
+	note=$(git notes list HEAD^) &&
+	MSG="other note" git notes append -c $note &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Cloning into 'bare-clone'...
-done.
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/bare/objects
-ok 56 - local clone --shared from linked checkout
+other note
+ok 99 - create note from other note with "git notes append -c"
 
-expecting success of 2400.57 '"add" worktree with --no-checkout': 
-	git worktree add --no-checkout -b swamp swamp &&
-	! test -e swamp/init.t &&
-	git -C swamp reset --hard &&
-	test_cmp init.t swamp/init.t
+expecting success of 3301.100 'append to note from other note with "git notes append -c"': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:22:13 2005 -0700
 
-Preparing worktree (new branch 'swamp')
-HEAD is now at 179a9e0 c
-ok 57 - "add" worktree with --no-checkout
+		${indent}10th
 
-expecting success of 2400.58 '"add" worktree with --checkout': 
-	git worktree add --checkout -b swmap2 swamp2 &&
-	test_cmp init.t swamp2/init.t
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	note=$(git notes list HEAD) &&
+	MSG="yet another note" git notes append -c $note &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-Preparing worktree (new branch 'swmap2')
-HEAD is now at 179a9e0 c
-ok 58 - "add" worktree with --checkout
+yet another note
+ok 100 - append to note from other note with "git notes append -c"
 
-expecting success of 2400.59 'put a worktree under rebase': 
-	git worktree add under-rebase &&
-	(
-		cd under-rebase &&
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-		git worktree list >actual &&
-		grep "under-rebase.*detached HEAD" actual
-	)
+expecting success of 3301.101 'copy note with "git notes copy"': 
+	commit=$(git rev-parse 4th) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
 
-Preparing worktree (new branch 'under-rebase')
-HEAD is now at 179a9e0 c
-rebase -i script before editing:
-pick 179a9e0 c
+		${indent}4th
 
-rebase -i script after editing:
-edit 179a9e0 c
-Rebasing (1/1)
Stopped at 179a9e0...  c
-You can amend the commit now, with
+		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy 8th 4th &&
+	git log 3rd..4th >actual &&
+	test_cmp expect actual &&
+	git notes list 4th >expect &&
+	git notes list 8th >actual &&
+	test_cmp expect actual
 
-  git commit --amend 
+ok 101 - copy note with "git notes copy"
 
-Once you are satisfied with your changes, run
+expecting success of 3301.102 'copy note with "git notes copy" with default': 
+	test_commit 11th &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
 
-  git rebase --continue
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase             179a9e0 (detached HEAD)
-ok 59 - put a worktree under rebase
+		${indent}11th
 
-expecting success of 2400.60 'add a worktree, checking out a rebased branch': 
-	test_must_fail git worktree add new-rebase under-rebase &&
-	! test -d new-rebase
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	git notes copy HEAD^ &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 
-Preparing worktree (checking out 'under-rebase')
-fatal: 'under-rebase' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase'
-ok 60 - add a worktree, checking out a rebased branch
+[master a446fff] 11th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11th.t
+ok 102 - copy note with "git notes copy" with default
 
-expecting success of 2400.61 'checking out a rebased branch from another worktree': 
-	git worktree add new-place &&
-	test_must_fail git -C new-place checkout under-rebase
+expecting success of 3301.103 'prevent overwrite with "git notes copy"': 
+	test_must_fail git notes copy HEAD~2 HEAD &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
 
-Preparing worktree (new branch 'new-place')
-HEAD is now at 179a9e0 c
-fatal: 'under-rebase' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase'
-ok 61 - checking out a rebased branch from another worktree
+		${indent}11th
 
-expecting success of 2400.62 'not allow to delete a branch under rebase': 
-	(
-		cd under-rebase &&
-		test_must_fail git branch -D under-rebase
-	)
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 
-error: cannot delete branch 'under-rebase' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase'
-ok 62 - not allow to delete a branch under rebase
+error: Cannot copy notes. Found existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5. Use '-f' to overwrite existing notes
+ok 103 - prevent overwrite with "git notes copy"
 
-expecting success of 2400.63 'rename a branch under rebase not allowed': 
-	test_must_fail git branch -M under-rebase rebase-with-new-name
+expecting success of 3301.104 'allow overwrite with "git notes copy -f"': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
 
-fatal: branch refs/heads/under-rebase is being rebased at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase
-ok 63 - rename a branch under rebase not allowed
+		${indent}11th
 
-expecting success of 2400.64 'check out from current worktree branch ok': 
-	(
-		cd under-rebase &&
-		git checkout under-rebase &&
-		git checkout - &&
-		git rebase --abort
-	)
+		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy -f HEAD~3 HEAD &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 
-Switched to branch 'under-rebase'
-Note: switching to '179a9e09a27c48c73ff2a192ec62ebcd60fedd6a'.
+Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ok 104 - allow overwrite with "git notes copy -f"
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3301.105 'allow overwrite with "git notes copy -f" with default': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		${indent}11th
 
-  git switch -c <new-branch-name>
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
+	EOF
+	git notes copy -f HEAD~2 &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 
-Or undo this operation with:
+Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ok 105 - allow overwrite with "git notes copy -f" with default
 
-  git switch -
+expecting success of 3301.106 'cannot copy note from object without notes': 
+	test_commit 12th &&
+	test_commit 13th &&
+	test_must_fail git notes copy HEAD^ HEAD
 
-Turn off this advice by setting config variable advice.detachedHead to false
+[master 65e263d] 12th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12th.t
+[master e871aa6] 13th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13th.t
+error: missing notes on source object 65e263ded02ae4e8839bc151095113737579dc12. Cannot copy.
+ok 106 - cannot copy note from object without notes
 
-HEAD is now at 179a9e0 c
-ok 64 - check out from current worktree branch ok
+expecting success of 3301.107 'git notes copy --stdin': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:25:13 2005 -0700
 
-expecting success of 2400.65 'checkout a branch under bisect': 
-	git worktree add under-bisect &&
-	(
-		cd under-bisect &&
-		git bisect start &&
-		git bisect bad &&
-		git bisect good HEAD~2 &&
-		git worktree list >actual &&
-		grep "under-bisect.*detached HEAD" actual &&
-		test_must_fail git worktree add new-bisect under-bisect &&
-		! test -d new-bisect
-	)
+		${indent}13th
 
-Preparing worktree (new branch 'under-bisect')
-HEAD is now at 179a9e0 c
-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 0 steps)
-[15d3bfcc767862b6abd36db671feb8356eb7d7d7] b
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-bisect             15d3bfc (detached HEAD)
-Preparing worktree (checking out 'under-bisect')
-fatal: 'under-bisect' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-bisect'
-ok 65 - checkout a branch under bisect
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
 
-expecting success of 2400.66 'rename a branch under bisect not allowed': 
-	test_must_fail git branch -M under-bisect bisect-with-new-name
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:24:13 2005 -0700
 
-fatal: branch refs/heads/under-bisect is being bisected at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-bisect
-ok 66 - rename a branch under bisect not allowed
+		${indent}12th
 
-expecting success of 2400.67 '--track sets up tracking': 
-	test_when_finished rm -rf track &&
-	git worktree add --track -b track track main &&
-	test_branch_upstream track . main
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --stdin <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD^ >actual &&
+	test_cmp expect actual
 
-Preparing worktree (new branch 'track')
-branch 'track' set up to track 'main'.
-HEAD is now at 179a9e0 c
-ok 67 - --track sets up tracking
+ok 107 - git notes copy --stdin
 
-expecting success of 2400.68 '"add" <path> <remote/branch> w/ no HEAD': 
-	test_when_finished rm -rf repo_upstream repo_local foo &&
-	setup_remote_repo repo_upstream repo_local &&
-	git -C repo_local config --bool core.bare true &&
-	git -C repo_local branch -D main &&
-	git -C repo_local worktree add ./foo repo_upstream/foo
+expecting success of 3301.108 'git notes copy --for-rewrite (unconfigured)': 
+	test_commit 14th &&
+	test_commit 15th &&
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
-[main (root-commit) 135732a] repo_upstream_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_upstream_main.t
-Switched to a new branch 'foo'
-[foo 7502c9e] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_local/.git/
-[main (root-commit) d4b0dca] repo_local_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_local_main.t
-From ../repo_upstream
- * [new branch]      foo                -> repo_upstream/foo
- * [new branch]      main               -> repo_upstream/main
- * [new tag]         repo_upstream_main -> repo_upstream_main
- * [new tag]         upstream_foo       -> upstream_foo
-Deleted branch main (was d4b0dca).
-Preparing worktree (detached HEAD 7502c9e)
-HEAD is now at 7502c9e upstream_foo
-ok 68 - "add" <path> <remote/branch> w/ no HEAD
+		${indent}15th
 
-expecting success of 2400.69 '--no-track avoids setting up tracking': 
-	test_when_finished rm -rf repo_upstream repo_local foo &&
-	setup_remote_repo repo_upstream repo_local &&
-	(
-		cd repo_local &&
-		git worktree add --no-track -b foo ../foo repo_upstream/foo
-	) &&
-	(
-		cd foo &&
-		test_must_fail git config "branch.foo.remote" &&
-		test_must_fail git config "branch.foo.merge" &&
-		test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
-	)
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:26:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
-[main (root-commit) 135732a] repo_upstream_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_upstream_main.t
-Switched to a new branch 'foo'
-[foo 7502c9e] upstream_foo
+		${indent}14th
+	EOF
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual
+
+[master 07c85d7] 14th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_local/.git/
-[main (root-commit) d4b0dca] repo_local_main
+ create mode 100644 14th.t
+[master 4acf42e] 15th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 repo_local_main.t
-From ../repo_upstream
- * [new branch]      foo                -> repo_upstream/foo
- * [new branch]      main               -> repo_upstream/main
- * [new tag]         repo_upstream_main -> repo_upstream_main
- * [new tag]         upstream_foo       -> upstream_foo
-Preparing worktree (new branch 'foo')
-HEAD is now at 7502c9e upstream_foo
-ok 69 - --no-track avoids setting up tracking
+ create mode 100644 15th.t
+ok 108 - git notes copy --for-rewrite (unconfigured)
 
-expecting success of 2400.70 '"add" <path> <non-existent-branch> fails': 
-	test_must_fail git worktree add foo non-existent
+expecting success of 3301.109 'git notes copy --for-rewrite (enabled)': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
 
-fatal: invalid reference: non-existent
-ok 70 - "add" <path> <non-existent-branch> fails
+		${indent}15th
 
-expecting success of 2400.71 '"add" <path> <branch> dwims': 
-	test_when_finished rm -rf repo_upstream repo_dwim foo &&
-	setup_remote_repo repo_upstream repo_dwim &&
-	git init repo_dwim &&
-	(
-		cd repo_dwim &&
-		git worktree add ../foo foo
-	) &&
-	(
-		cd foo &&
-		test_branch_upstream foo repo_upstream foo &&
-		test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
-	)
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
-[main (root-commit) 135732a] repo_upstream_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_upstream_main.t
-Switched to a new branch 'foo'
-[foo 7502c9e] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
-[main (root-commit) 9838263] repo_dwim_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_dwim_main.t
-From ../repo_upstream
- * [new branch]      foo                -> repo_upstream/foo
- * [new branch]      main               -> repo_upstream/main
- * [new tag]         repo_upstream_main -> repo_upstream_main
- * [new tag]         upstream_foo       -> upstream_foo
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
-Preparing worktree (new branch 'foo')
-branch 'foo' set up to track 'repo_upstream/foo'.
-HEAD is now at 7502c9e upstream_foo
-ok 71 - "add" <path> <branch> dwims
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:26:13 2005 -0700
 
-expecting success of 2400.72 '"add" <path> <branch> dwims with checkout.defaultRemote': 
-	test_when_finished rm -rf repo_upstream repo_dwim foo &&
-	setup_remote_repo repo_upstream repo_dwim &&
-	git init repo_dwim &&
-	(
-		cd repo_dwim &&
-		git remote add repo_upstream2 ../repo_upstream &&
-		git fetch repo_upstream2 &&
-		test_must_fail git worktree add ../foo foo &&
-		git -c checkout.defaultRemote=repo_upstream worktree add ../foo foo &&
-		git status -uno --porcelain >status.actual &&
-		test_must_be_empty status.actual
-	) &&
-	(
-		cd foo &&
-		test_branch_upstream foo repo_upstream foo &&
-		test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
-	)
+		${indent}14th
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
-[main (root-commit) 135732a] repo_upstream_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_upstream_main.t
-Switched to a new branch 'foo'
-[foo 7502c9e] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
-[main (root-commit) 9838263] repo_dwim_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_dwim_main.t
-From ../repo_upstream
- * [new branch]      foo                -> repo_upstream/foo
- * [new branch]      main               -> repo_upstream/main
- * [new tag]         repo_upstream_main -> repo_upstream_main
- * [new tag]         upstream_foo       -> upstream_foo
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
-From ../repo_upstream
- * [new branch]      foo        -> repo_upstream2/foo
- * [new branch]      main       -> repo_upstream2/main
-fatal: invalid reference: foo
-Preparing worktree (new branch 'foo')
-branch 'foo' set up to track 'repo_upstream/foo'.
-HEAD is now at 7502c9e upstream_foo
-ok 72 - "add" <path> <branch> dwims with checkout.defaultRemote
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	test_config notes.rewriteMode overwrite &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.73 'git worktree add does not match remote': 
-	test_when_finished rm -rf repo_a repo_b foo &&
-	setup_remote_repo repo_a repo_b &&
-	(
-		cd repo_b &&
-		git worktree add ../foo
-	) &&
-	(
-		cd foo &&
-		test_must_fail git config "branch.foo.remote" &&
-		test_must_fail git config "branch.foo.merge" &&
-		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
-	)
+ok 109 - git notes copy --for-rewrite (enabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
-[main (root-commit) dcba593] repo_a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_a_main.t
-Switched to a new branch 'foo'
-[foo 9855f4b] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
-[main (root-commit) 49eaa9c] repo_b_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_b_main.t
-From ../repo_a
- * [new branch]      foo          -> repo_a/foo
- * [new branch]      main         -> repo_a/main
- * [new tag]         repo_a_main  -> repo_a_main
- * [new tag]         upstream_foo -> upstream_foo
-Preparing worktree (new branch 'foo')
-HEAD is now at 49eaa9c repo_b_main
-ok 73 - git worktree add does not match remote
+expecting success of 3301.110 'git notes copy --for-rewrite (disabled)': 
+	test_config notes.rewrite.bar false &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=bar <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.74 'git worktree add --guess-remote sets up tracking': 
-	test_when_finished rm -rf repo_a repo_b foo &&
-	setup_remote_repo repo_a repo_b &&
-	(
-		cd repo_b &&
-		git worktree add --guess-remote ../foo
-	) &&
-	(
-		cd foo &&
-		test_branch_upstream foo repo_a foo &&
-		test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
-	)
+ok 110 - git notes copy --for-rewrite (disabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
-[main (root-commit) dcba593] repo_a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_a_main.t
-Switched to a new branch 'foo'
-[foo 9855f4b] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
-[main (root-commit) 49eaa9c] repo_b_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_b_main.t
-From ../repo_a
- * [new branch]      foo          -> repo_a/foo
- * [new branch]      main         -> repo_a/main
- * [new tag]         repo_a_main  -> repo_a_main
- * [new tag]         upstream_foo -> upstream_foo
-Preparing worktree (new branch 'foo')
-branch 'foo' set up to track 'repo_a/foo'.
-HEAD is now at 9855f4b upstream_foo
-ok 74 - git worktree add --guess-remote sets up tracking
+expecting success of 3301.111 'git notes copy --for-rewrite (overwrite)': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
 
-expecting success of 2400.75 'git worktree add --guess-remote sets up tracking (quiet)': 
-	test_when_finished rm -rf repo_a repo_b foo &&
-	setup_remote_repo repo_a repo_b &&
-	(
-		cd repo_b &&
-		git worktree add --quiet --guess-remote ../foo 2>actual &&
-		test_must_be_empty actual
-	) &&
-	(
-		cd foo &&
-		test_branch_upstream foo repo_a foo &&
-		test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
-	)
+		${indent}15th
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
-[main (root-commit) dcba593] repo_a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_a_main.t
-Switched to a new branch 'foo'
-[foo 9855f4b] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
-[main (root-commit) 49eaa9c] repo_b_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_b_main.t
-From ../repo_a
- * [new branch]      foo          -> repo_a/foo
- * [new branch]      main         -> repo_a/main
- * [new tag]         repo_a_main  -> repo_a_main
- * [new tag]         upstream_foo -> upstream_foo
-ok 75 - git worktree add --guess-remote sets up tracking (quiet)
+		Notes:
+		${indent}a fresh note
+	EOF
+	git notes add -f -m"a fresh note" HEAD^ &&
+	test_config notes.rewriteMode overwrite &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.76 'git worktree --no-guess-remote (quiet)': 
-	test_when_finished rm -rf repo_a repo_b foo &&
-	setup_remote_repo repo_a repo_b &&
-	(
-		cd repo_b &&
-		git worktree add --quiet --no-guess-remote ../foo
-	) &&
-	(
-		cd foo &&
-		test_must_fail git config "branch.foo.remote" &&
-		test_must_fail git config "branch.foo.merge" &&
-		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
-	)
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+ok 111 - git notes copy --for-rewrite (overwrite)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
-[main (root-commit) dcba593] repo_a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_a_main.t
-Switched to a new branch 'foo'
-[foo 9855f4b] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
-[main (root-commit) 49eaa9c] repo_b_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_b_main.t
-From ../repo_a
- * [new branch]      foo          -> repo_a/foo
- * [new branch]      main         -> repo_a/main
- * [new tag]         repo_a_main  -> repo_a_main
- * [new tag]         upstream_foo -> upstream_foo
-ok 76 - git worktree --no-guess-remote (quiet)
+expecting success of 3301.112 'git notes copy --for-rewrite (ignore)': 
+	test_config notes.rewriteMode ignore &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.77 'git worktree add with worktree.guessRemote sets up tracking': 
-	test_when_finished rm -rf repo_a repo_b foo &&
-	setup_remote_repo repo_a repo_b &&
-	(
-		cd repo_b &&
-		git config worktree.guessRemote true &&
-		git worktree add ../foo
-	) &&
-	(
-		cd foo &&
-		test_branch_upstream foo repo_a foo &&
-		test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
-	)
+ok 112 - git notes copy --for-rewrite (ignore)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
-[main (root-commit) dcba593] repo_a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_a_main.t
-Switched to a new branch 'foo'
-[foo 9855f4b] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
-[main (root-commit) 49eaa9c] repo_b_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_b_main.t
-From ../repo_a
- * [new branch]      foo          -> repo_a/foo
- * [new branch]      main         -> repo_a/main
- * [new tag]         repo_a_main  -> repo_a_main
- * [new tag]         upstream_foo -> upstream_foo
-Preparing worktree (new branch 'foo')
-branch 'foo' set up to track 'repo_a/foo'.
-HEAD is now at 9855f4b upstream_foo
-ok 77 - git worktree add with worktree.guessRemote sets up tracking
+expecting success of 3301.113 'git notes copy --for-rewrite (append)': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
 
-expecting success of 2400.78 'git worktree --no-guess-remote option overrides config': 
-	test_when_finished rm -rf repo_a repo_b foo &&
-	setup_remote_repo repo_a repo_b &&
-	(
-		cd repo_b &&
-		git config worktree.guessRemote true &&
-		git worktree add --no-guess-remote ../foo
-	) &&
-	(
-		cd foo &&
-		test_must_fail git config "branch.foo.remote" &&
-		test_must_fail git config "branch.foo.merge" &&
-		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
-	)
+		${indent}15th
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
-[main (root-commit) dcba593] repo_a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_a_main.t
-Switched to a new branch 'foo'
-[foo 9855f4b] upstream_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
-[main (root-commit) 49eaa9c] repo_b_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repo_b_main.t
-From ../repo_a
- * [new branch]      foo          -> repo_a/foo
- * [new branch]      main         -> repo_a/main
- * [new tag]         repo_a_main  -> repo_a_main
- * [new tag]         upstream_foo -> upstream_foo
-Preparing worktree (new branch 'foo')
-HEAD is now at 49eaa9c repo_b_main
-ok 78 - git worktree --no-guess-remote option overrides config
+		Notes:
+		${indent}a fresh note
+		${indent}
+		${indent}another fresh note
+	EOF
+	git notes add -f -m"another fresh note" HEAD^ &&
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.79 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+ok 113 - git notes copy --for-rewrite (append)
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.114 'git notes copy --for-rewrite (append two to one)': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-ok 79 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch
+		${indent}15th
 
-expecting success of 2400.80 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, valid HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+		Notes:
+		${indent}a fresh note
+		${indent}
+		${indent}another fresh note
+		${indent}
+		${indent}append 1
+		${indent}
+		${indent}append 2
+	EOF
+	git notes add -f -m"append 1" HEAD^ &&
+	git notes add -f -m"append 2" HEAD^^ &&
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD^^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
+ok 114 - git notes copy --for-rewrite (append two to one)
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-HEAD is now at 6d95aef commit
-ok 80 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, valid HEAD
+expecting success of 3301.115 'git notes copy --for-rewrite (append empty)': 
+	git notes remove HEAD^ &&
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.81 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+Removing note for object HEAD^
+ok 115 - git notes copy --for-rewrite (append empty)
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.116 'GIT_NOTES_REWRITE_MODE works': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-ok 81 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+		${indent}15th
 
-expecting success of 2400.82 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+		Notes:
+		${indent}replacement note 1
+	EOF
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	git notes add -f -m"replacement note 1" HEAD^ &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+ok 116 - GIT_NOTES_REWRITE_MODE works
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 82 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+expecting success of 3301.117 'GIT_NOTES_REWRITE_REF works': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
 
-expecting success of 2400.83 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+		${indent}15th
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+		Notes:
+		${indent}replacement note 2
+	EOF
+	git notes add -f -m"replacement note 2" HEAD^ &&
+	test_config notes.rewriteMode overwrite &&
+	test_unconfig notes.rewriteRef &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
+		git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-fatal: No local or remote refs exist despite at least one remote
-ok 83 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+ok 117 - GIT_NOTES_REWRITE_REF works
 
-expecting success of 2400.84 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.118 'GIT_NOTES_REWRITE_REF overrides config': 
+	git notes add -f -m"replacement note 3" HEAD^ &&
+	test_config notes.rewriteMode overwrite &&
+	test_config notes.rewriteRef refs/notes/other &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_REF=refs/notes/commits \
+		git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	grep "replacement note 3" actual
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+    replacement note 3
+ok 118 - GIT_NOTES_REWRITE_REF overrides config
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 84 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+expecting success of 3301.119 'git notes copy diagnoses too many or too few arguments': 
+	test_must_fail git notes copy 2>error &&
+	test_grep "too few arguments" error &&
+	test_must_fail git notes copy one two three 2>error &&
+	test_grep "too many arguments" error
 
-expecting success of 2400.85 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+error: too few arguments
+error: too many arguments
+ok 119 - git notes copy diagnoses too many or too few arguments
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.120 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main': 
+	test_unconfig core.notesRef &&
+	sane_unset GIT_NOTES_REF &&
+	echo refs/notes/refs/heads/main >expect &&
+	git notes --ref=refs/heads/main get-ref >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-branch 'foo' set up to track 'upstream/foo'.
-HEAD is now at 6d95aef commit
-ok 85 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 120 - git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main
 
-expecting success of 2400.86 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd repo && git', --branch': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.121 'git notes get-ref (no overrides)': 
+	test_unconfig core.notesRef &&
+	sane_unset GIT_NOTES_REF &&
+	echo refs/notes/commits >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+ok 121 - git notes get-ref (no overrides)
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-ok 86 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd repo && git', --branch
+expecting success of 3301.122 'git notes get-ref (core.notesRef)': 
+	test_config core.notesRef refs/notes/foo &&
+	echo refs/notes/foo >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.87 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, valid HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+ok 122 - git notes get-ref (core.notesRef)
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.123 'git notes get-ref (GIT_NOTES_REF)': 
+	echo refs/notes/bar >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
+ok 123 - git notes get-ref (GIT_NOTES_REF)
+
+expecting success of 3301.124 'git notes get-ref (--ref)': 
+	echo refs/notes/baz >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
+	test_cmp expect actual
+
+ok 124 - git notes get-ref (--ref)
+
+expecting success of 3301.125 'setup testing of empty notes': 
+	test_unconfig core.notesRef &&
+	test_commit 16th &&
+	empty_blob=$(git hash-object -w /dev/null) &&
+	echo "$empty_blob" >expect_empty
+
+[master 21d0abc] 16th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-HEAD is now at 6d95aef commit
-ok 87 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, valid HEAD
+ create mode 100644 16th.t
+ok 125 - setup testing of empty notes
 
-expecting success of 2400.88 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.126 ''git notes add' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add &&
+		test_must_fail git notes list HEAD
+	
+Object HEAD has no note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 126 - 'git notes add' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.127 ''git notes add --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-ok 88 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
-
-expecting success of 2400.89 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+Object HEAD has no note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+ok 127 - 'git notes add --allow-empty' stores empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.128 ''git notes add -F /dev/null' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -F /dev/null &&
+		test_must_fail git notes list HEAD
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 89 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 128 - 'git notes add -F /dev/null' removes empty note
 
-expecting success of 2400.90 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.129 ''git notes add -F /dev/null --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -F /dev/null --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 129 - 'git notes add -F /dev/null --allow-empty' stores empty note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.130 ''git notes add -m ""' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -m "" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 130 - 'git notes add -m ""' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.131 ''git notes add -m "" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -m "" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 90 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+Object HEAD has no note
+ok 131 - 'git notes add -m "" --allow-empty' stores empty note
 
-expecting success of 2400.91 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.132 ''git notes add -c "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -c "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 132 - 'git notes add -c "$empty_blob"' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.133 ''git notes add -c "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -c "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-No possible source branch, inferring '--orphan'
-ok 91 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+Object HEAD has no note
 
-expecting success of 2400.92 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+ok 133 - 'git notes add -c "$empty_blob" --allow-empty' stores empty note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.134 ''git notes add -C "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -C "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 134 - 'git notes add -C "$empty_blob"' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.135 ''git notes add -C "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -C "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
-HEAD contents: 'ref: refs/heads/badbranch'
-hint: If you meant to create a worktree containing a new unborn branch
-fatal: invalid reference: HEAD
-ok 92 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
+Object HEAD has no note
+ok 135 - 'git notes add -C "$empty_blob" --allow-empty' stores empty note
 
-expecting success of 2400.93 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.136 ''git notes append' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 136 - 'git notes append' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.137 ''git notes append --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
-HEAD contents: 'ref: refs/heads/badbranch'
-hint: If you meant to create a worktree containing a new unborn branch
-fatal: invalid reference: HEAD
-ok 93 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD
-
-expecting success of 2400.94 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+Object HEAD has no note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+ok 137 - 'git notes append --allow-empty' stores empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.138 ''git notes append -F /dev/null' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -F /dev/null &&
+		test_must_fail git notes list HEAD
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
-HEAD contents: 'ref: refs/heads/badbranch'
-hint: If you meant to create a worktree containing a new unborn branch
-fatal: invalid reference: HEAD
-ok 94 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 138 - 'git notes append -F /dev/null' removes empty note
 
-expecting success of 2400.95 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.139 ''git notes append -F /dev/null --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -F /dev/null --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 139 - 'git notes append -F /dev/null --allow-empty' stores empty note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.140 ''git notes append -m ""' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -m "" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 140 - 'git notes append -m ""' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.141 ''git notes append -m "" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -m "" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-No possible source branch, inferring '--orphan'
-ok 95 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch
+Object HEAD has no note
+ok 141 - 'git notes append -m "" --allow-empty' stores empty note
 
-expecting success of 2400.96 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, valid HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.142 ''git notes append -c "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -c "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 142 - 'git notes append -c "$empty_blob"' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.143 ''git notes append -c "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -c "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-HEAD is now at 6d95aef commit
-ok 96 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, valid HEAD
+Object HEAD has no note
 
-expecting success of 2400.97 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+ok 143 - 'git notes append -c "$empty_blob" --allow-empty' stores empty note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.144 ''git notes append -C "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -C "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 144 - 'git notes append -C "$empty_blob"' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.145 ''git notes append -C "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -C "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-No possible source branch, inferring '--orphan'
-ok 97 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+Object HEAD has no note
+ok 145 - 'git notes append -C "$empty_blob" --allow-empty' stores empty note
 
-expecting success of 2400.98 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.146 ''git notes edit' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes edit &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 146 - 'git notes edit' removes empty note
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
+expecting success of 3301.147 ''git notes edit --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes edit --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 98 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+Object HEAD has no note
 
-expecting success of 2400.99 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+ok 147 - 'git notes edit --allow-empty' stores empty note
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.148 'empty notes are displayed by git log': 
+	test_commit 17th &&
+	git log -1 >expect &&
+	cat >>expect <<-EOF &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+		Notes:
+	EOF
+	git notes add -C "$empty_blob" --allow-empty &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+[master 27a79f3] 17th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-fatal: No local or remote refs exist despite at least one remote
-ok 99 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
-
-expecting success of 2400.100 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+ create mode 100644 17th.t
+ok 148 - empty notes are displayed by git log
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3301.149 'empty notes do not invoke the editor': 
+	test_commit 18th &&
+	GIT_EDITOR="false" git notes add -C "$empty_blob" --allow-empty &&
+	git notes remove HEAD &&
+	GIT_EDITOR="false" git notes add -m "" --allow-empty &&
+	git notes remove HEAD &&
+	GIT_EDITOR="false" git notes add -F /dev/null --allow-empty &&
+	git notes remove HEAD
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+[master 86b01a9] 18th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 100 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+ create mode 100644 18th.t
+Removing note for object HEAD
+Removing note for object HEAD
+Removing note for object HEAD
+ok 149 - empty notes do not invoke the editor
 
-expecting success of 2400.101 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.150 'git notes add with -m/-F invokes editor with -e': 
+	test_commit 19th &&
+	echo "edited" >expect &&
+	MSG="$(cat expect)" git notes add -m "initial" -e &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove HEAD &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	# Add a note using -F and edit it
+	echo "initial" >note_file &&
+	MSG="$(cat expect)" git notes add -F note_file -e &&
+	git notes show >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+[master d853ef2] 19th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-branch 'foo' set up to track 'upstream/foo'.
-HEAD is now at 6d95aef commit
-ok 101 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ create mode 100644 19th.t
+edited
+Removing note for object HEAD
+edited
+ok 150 - git notes add with -m/-F invokes editor with -e
 
-expecting success of 2400.102 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd wt && git', --branch': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.151 'git notes append with -m/-F invokes the editor with -e': 
+	test_commit 20th &&
+	cat >expect <<-EOF &&
+		initial
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+		edited
+	EOF
+	git notes add -m "initial" &&
+	MSG="edited" git notes append -m "appended" -e &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-No possible source branch, inferring '--orphan'
-ok 102 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd wt && git', --branch
+	# Verify the note content was appended and edited
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove HEAD &&
 
-expecting success of 2400.103 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, valid HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+	# Append a note using -F and edit it
+	echo "note from file" >note_file &&
+	git notes add -m "initial" &&
+	MSG="edited" git notes append -F note_file -e &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	# Verify notes from file has been edited in editor and appended
+	git notes show >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
+[master 347e627] 20th
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-HEAD is now at 6d95aef commit
-ok 103 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, valid HEAD
-
-expecting success of 2400.104 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
-
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+ create mode 100644 20th.t
+edited
+Removing note for object HEAD
+edited
+ok 151 - git notes append with -m/-F invokes the editor with -e
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-No possible source branch, inferring '--orphan'
-ok 104 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+expecting success of 3301.152 'git notes with a combination of -m, -F and -e invokes editor': 
+	test_commit 21st &&
+	echo "foo-file-1" >note_1 &&
+	echo "foo-file-2" >note_2 &&
+	echo "edited" >expect &&
 
-expecting success of 2400.105 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+	MSG=$(cat expect) git notes append -F note_1 -m "message-1" -F note_2 -e &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	# Verify that combined messages from file and -m have been edited
+	git notes show >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+[master 7917321] 21st
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 105 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ create mode 100644 21st.t
+edited
+ok 152 - git notes with a combination of -m, -F and -e invokes editor
 
-expecting success of 2400.106 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3301.153 'git notes append aborts when editor fails with -e': 
+	test_commit 22nd &&
+	echo "foo-file-1" >note_1 &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	# Try to append a note with -F and -e, but make the editor fail
+	test_env GIT_EDITOR="false" test_must_fail git notes append -F note_1 -e &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+	# Verify that no note was added due to editor failure
+	test_must_fail git notes show
+
+[master 34adeb3] 22nd
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 106 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
-
-expecting success of 2400.107 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+ create mode 100644 22nd.t
+error: there was a problem with the editor 'false'
+fatal: please supply the note contents using either -m or -F option
+error: no note found for object 34adeb3f542c4316ca46ba3bfb3855cdbb83cb64.
+ok 153 - git notes append aborts when editor fails with -e
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+# passed all 153 test(s)
+1..153
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3200-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/.git/
+expecting success of 3200.1 'prepare a trivial repository': 
+	echo Hello >A &&
+	git update-index --add A &&
+	git commit -m "Initial commit." &&
+	git branch -M main &&
+	echo World >>A &&
+	git update-index --add A &&
+	git commit -m "Second commit." &&
+	HEAD=$(git rev-parse --verify HEAD)
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+[main (root-commit) 2daebe9] Initial commit.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-No possible source branch, inferring '--orphan'
-ok 107 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ create mode 100644 A
+[main da664a6] Second commit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - prepare a trivial repository
 
-expecting success of 2400.108 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3200.2 'git branch --help should not have created a bogus branch': 
+	test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&
+	test_ref_missing refs/heads/--help
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+error: reference does not exist
+ok 2 - git branch --help should not have created a bogus branch
+
+expecting success of 3200.3 'branch -h in broken repository': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init -b main &&
+		>.git/refs/heads/main &&
+		test_expect_code 129 git branch -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/broken/.git/
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+ok 3 - branch -h in broken repository
+
+expecting success of 3200.4 'git branch abc should create a branch': 
+	git branch abc &&
+	test_ref_exists refs/heads/abc
+
+ok 4 - git branch abc should create a branch
+
+expecting success of 3200.5 'git branch abc should fail when abc exists': 
+	test_must_fail git branch abc
+
+fatal: a branch named 'abc' already exists
+ok 5 - git branch abc should fail when abc exists
+
+expecting success of 3200.6 'git branch --force abc should fail when abc is checked out': 
+	test_when_finished git switch main &&
+	git switch abc &&
+	test_must_fail git branch --force abc HEAD~1
+
+Switched to branch 'abc'
+fatal: cannot force update the branch 'abc' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch'
+Switched to branch 'main'
+ok 6 - git branch --force abc should fail when abc is checked out
+
+expecting success of 3200.7 'git branch --force abc should succeed when abc exists': 
+	git rev-parse HEAD~1 >expect &&
+	git branch --force abc HEAD~1 &&
+	git rev-parse abc >actual &&
+	test_cmp expect actual
+
+ok 7 - git branch --force abc should succeed when abc exists
+
+expecting success of 3200.8 'git branch a/b/c should create a branch': 
+	git branch a/b/c &&
+	test_ref_exists refs/heads/a/b/c
+
+ok 8 - git branch a/b/c should create a branch
+
+expecting success of 3200.9 'git branch mb main... should create a branch': 
+	git branch mb main... &&
+	test_ref_exists refs/heads/mb
+
+ok 9 - git branch mb main... should create a branch
+
+expecting success of 3200.10 'git branch HEAD should fail': 
+	test_must_fail git branch HEAD
+
+fatal: 'HEAD' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 10 - git branch HEAD should fail
+
+expecting success of 3200.11 'git branch --create-reflog d/e/f should create a branch and a log': 
+	GIT_COMMITTER_DATE="2005-05-26 23:30" \
+	git -c core.logallrefupdates=false branch --create-reflog d/e/f &&
+	test_ref_exists refs/heads/d/e/f &&
+	cat >expect <<-EOF &&
+	$HEAD refs/heads/d/e/f@{0}: branch: Created from main
+	EOF
+	git reflog show --no-abbrev-commit refs/heads/d/e/f >actual &&
+	test_cmp expect actual
+
+ok 11 - git branch --create-reflog d/e/f should create a branch and a log
+
+expecting success of 3200.12 'git branch -d d/e/f should delete a branch and a log': 
+	git branch -d d/e/f &&
+	test_ref_missing refs/heads/d/e/f &&
+	test_must_fail git reflog exists refs/heads/d/e/f
+
+Deleted branch d/e/f (was da664a6).
+error: reference does not exist
+ok 12 - git branch -d d/e/f should delete a branch and a log
+
+expecting success of 3200.13 'git branch j/k should work after branch j has been deleted': 
+	git branch j &&
+	git branch -d j &&
+	git branch j/k
+
+Deleted branch j (was da664a6).
+ok 13 - git branch j/k should work after branch j has been deleted
+
+expecting success of 3200.14 'git branch l should work after branch l/m has been deleted': 
+	git branch l/m &&
+	git branch -d l/m &&
+	git branch l
+
+Deleted branch l/m (was da664a6).
+ok 14 - git branch l should work after branch l/m has been deleted
+
+expecting success of 3200.15 'git branch -m dumps usage': 
+	test_expect_code 128 git branch -m 2>err &&
+	test_grep "branch name required" err
+
+fatal: branch name required
+ok 15 - git branch -m dumps usage
+
+expecting success of 3200.16 'git branch -m m broken_symref should work': 
+	test_when_finished "git branch -D broken_symref" &&
+	git branch --create-reflog m &&
+	git symbolic-ref refs/heads/broken_symref refs/heads/i_am_broken &&
+	git branch -m m broken_symref &&
+	git reflog exists refs/heads/broken_symref &&
+	test_must_fail git reflog exists refs/heads/i_am_broken
+
+Deleted branch broken_symref (was da664a6).
+ok 16 - git branch -m m broken_symref should work
+
+expecting success of 3200.17 'git branch -m m m/m should work': 
+	git branch --create-reflog m &&
+	git branch -m m m/m &&
+	git reflog exists refs/heads/m/m
+
+ok 17 - git branch -m m m/m should work
+
+expecting success of 3200.18 'git branch -m n/n n should work': 
+	git branch --create-reflog n/n &&
+	git branch -m n/n n &&
+	git reflog exists refs/heads/n
+
+ok 18 - git branch -m n/n n should work
+
+expecting success of 3200.19 'git branch -m bbb should rename checked out branch': 
+	test_when_finished git branch -D bbb &&
+	test_when_finished git checkout main &&
+	git checkout -b aaa &&
+	git commit --allow-empty -m "a new commit" &&
+	git rev-parse aaa@{0} >expect &&
+	git branch -m bbb &&
+	git rev-parse bbb@{1} >actual &&
+	test_cmp expect actual &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/bbb >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'aaa'
+[aaa a533b01] a new commit
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+Deleted branch bbb (was a533b01).
+ok 19 - git branch -m bbb should rename checked out branch
+
+expecting success of 3200.20 'renaming checked out branch works with d/f conflict': 
+	test_when_finished "git branch -D foo/bar || git branch -D foo" &&
+	test_when_finished git checkout main &&
+	git checkout -b foo &&
+	git branch -m foo/bar &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/foo/bar >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'foo'
+Switched to branch 'main'
+Deleted branch foo/bar (was da664a6).
+ok 20 - renaming checked out branch works with d/f conflict
+
+expecting success of 3200.21 'git branch -m o/o o should fail when o/p exists': 
+	git branch o/o &&
+	git branch o/p &&
+	test_must_fail git branch -m o/o o
+
+error: 'refs/heads/o/p' exists; cannot create 'refs/heads/o'
+fatal: branch rename failed
+ok 21 - git branch -m o/o o should fail when o/p exists
+
+expecting success of 3200.22 'git branch -m o/q o/p should fail when o/p exists': 
+	git branch o/q &&
+	test_must_fail git branch -m o/q o/p
+
+fatal: a branch named 'o/p' already exists
+ok 22 - git branch -m o/q o/p should fail when o/p exists
+
+expecting success of 3200.23 'git branch -M o/q o/p should work when o/p exists': 
+	git branch -M o/q o/p
+
+ok 23 - git branch -M o/q o/p should work when o/p exists
+
+expecting success of 3200.24 'git branch -m -f o/q o/p should work when o/p exists': 
+	git branch o/q &&
+	git branch -m -f o/q o/p
+
+ok 24 - git branch -m -f o/q o/p should work when o/p exists
+
+expecting success of 3200.25 'git branch -m q r/q should fail when r exists': 
+	git branch q &&
+	git branch r &&
+	test_must_fail git branch -m q r/q
+
+error: 'refs/heads/r' exists; cannot create 'refs/heads/r/q'
+fatal: branch rename failed
+ok 25 - git branch -m q r/q should fail when r exists
+
+expecting success of 3200.26 'git branch -M foo bar should fail when bar is checked out': 
+	git branch bar &&
+	git checkout -b foo &&
+	test_must_fail git branch -M bar foo
+
+Switched to a new branch 'foo'
+fatal: cannot force update the branch 'foo' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch'
+ok 26 - git branch -M foo bar should fail when bar is checked out
+
+expecting success of 3200.27 'git branch -M foo bar should fail when bar is checked out in worktree': 
+	git branch -f bar &&
+	test_when_finished "git worktree remove wt && git branch -D wt" &&
+	git worktree add wt &&
+	test_must_fail git branch -M bar wt
+
+Preparing worktree (new branch 'wt')
+HEAD is now at da664a6 Second commit.
+fatal: cannot force update the branch 'wt' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/wt'
+Deleted branch wt (was da664a6).
+ok 27 - git branch -M foo bar should fail when bar is checked out in worktree
+
+expecting success of 3200.28 'git branch -M baz bam should succeed when baz is checked out': 
+	git checkout -b baz &&
+	git branch bam &&
+	git branch -M baz bam &&
+	test $(git rev-parse --abbrev-ref HEAD) = bam
+
+Switched to a new branch 'baz'
+ok 28 - git branch -M baz bam should succeed when baz is checked out
+
+expecting success of 3200.29 'git branch -M baz bam should add entries to HEAD reflog': 
+	git reflog show HEAD >actual &&
+	grep "HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam" actual
+
+da664a6 HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam
+ok 29 - git branch -M baz bam should add entries to HEAD reflog
+
+expecting success of 3200.30 'git branch -M should leave orphaned HEAD alone': 
+	git init -b main orphan &&
+	(
+		cd orphan &&
+		test_commit initial &&
+		git checkout --orphan lonely &&
+		git symbolic-ref HEAD >expect &&
+		echo refs/heads/lonely >actual &&
+		test_cmp expect actual &&
+		test_ref_missing refs/head/lonely &&
+		git branch -M main mistress &&
+		git symbolic-ref HEAD >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/orphan/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'lonely'
+error: reference does not exist
+ok 30 - git branch -M should leave orphaned HEAD alone
+
+expecting success of 3200.31 'resulting reflog can be shown by log -g': 
+	oid=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	HEAD@{0} $oid Branch: renamed refs/heads/baz to refs/heads/bam
+	HEAD@{2} $oid checkout: moving from foo to baz
+	EOF
+	git log -g --format="%gd %H %gs" -2 HEAD >actual &&
+	test_cmp expect actual
+
+ok 31 - resulting reflog can be shown by log -g
+
+expecting success of 3200.32 'git branch -M baz bam should succeed when baz is checked out as linked working tree': 
+	git checkout main &&
+	git worktree add -b baz bazdir &&
+	git worktree add -f bazdir2 baz &&
+	git branch -M baz bam &&
+	test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
+	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
+	rm -r bazdir bazdir2 &&
+	git worktree prune
+
+Switched to branch 'main'
+Preparing worktree (new branch 'baz')
+HEAD is now at da664a6 Second commit.
+Preparing worktree (checking out 'baz')
+HEAD is now at da664a6 Second commit.
+ok 32 - git branch -M baz bam should succeed when baz is checked out as linked working tree
+
+expecting success of 3200.33 'git branch -M fails if updating any linked working tree fails': 
+	git worktree add -b baz bazdir1 &&
+	git worktree add -f bazdir2 baz &&
+	touch .git/worktrees/bazdir1/HEAD.lock &&
+	test_must_fail git branch -M baz bam &&
+	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
+	git branch -M bam baz &&
+	rm .git/worktrees/bazdir1/HEAD.lock &&
+	touch .git/worktrees/bazdir2/HEAD.lock &&
+	test_must_fail git branch -M baz bam &&
+	test $(git -C bazdir1 rev-parse --abbrev-ref HEAD) = bam &&
+	rm -rf bazdir1 bazdir2 &&
+	git worktree prune
+
+Preparing worktree (new branch 'baz')
+HEAD is now at da664a6 Second commit.
+Preparing worktree (checking out 'baz')
+HEAD is now at da664a6 Second commit.
+error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/.git/worktrees/bazdir1/HEAD.lock': File exists.
+
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+error: HEAD of working tree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/bazdir1 is not updated
+fatal: branch renamed to bam, but HEAD is not updated
+error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/.git/worktrees/bazdir2/HEAD.lock': File exists.
+
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+error: HEAD of working tree /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/bazdir2 is not updated
+fatal: branch renamed to bam, but HEAD is not updated
+ok 33 - git branch -M fails if updating any linked working tree fails
+
+expecting success of 3200.34 'git branch -M baz bam should succeed within a worktree in which baz is checked out': 
+	git checkout -b baz &&
+	git worktree add -f bazdir baz &&
+	(
+		cd bazdir &&
+		git branch -M baz bam &&
+		echo bam >expect &&
+		git rev-parse --abbrev-ref HEAD >actual &&
+		test_cmp expect actual
+	) &&
+	echo bam >expect &&
+	git rev-parse --abbrev-ref HEAD >actual &&
+	test_cmp expect actual &&
+	rm -r bazdir &&
+	git worktree prune
+
+Switched to a new branch 'baz'
+Preparing worktree (checking out 'baz')
+HEAD is now at da664a6 Second commit.
+ok 34 - git branch -M baz bam should succeed within a worktree in which baz is checked out
+
+expecting success of 3200.35 'git branch -M main should work when main is checked out': 
+	git checkout main &&
+	git branch -M main
+
+Switched to branch 'main'
+ok 35 - git branch -M main should work when main is checked out
+
+expecting success of 3200.36 'git branch -M main main should work when main is checked out': 
+	git checkout main &&
+	git branch -M main main
+
+Already on 'main'
+ok 36 - git branch -M main main should work when main is checked out
+
+expecting success of 3200.37 'git branch -M topic topic should work when main is checked out': 
+	git checkout main &&
+	git branch topic &&
+	git branch -M topic topic
+
+Already on 'main'
+ok 37 - git branch -M topic topic should work when main is checked out
+
+expecting success of 3200.38 'git branch -M and -C fail on detached HEAD': 
+	git checkout HEAD^{} &&
+	test_when_finished git checkout - &&
+	echo "fatal: cannot rename the current branch while not on any" >expect &&
+	test_must_fail git branch -M must-fail 2>err &&
+	test_cmp expect err &&
+	echo "fatal: cannot copy the current branch while not on any" >expect &&
+	test_must_fail git branch -C must-fail 2>err &&
+	test_cmp expect err
+
+Note: switching to 'HEAD^{}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at da664a6 Second commit.
+Switched to branch 'main'
+ok 38 - git branch -M and -C fail on detached HEAD
+
+expecting success of 3200.39 'git branch -m should work with orphan branches': 
+	test_when_finished git checkout - &&
+	test_when_finished git worktree remove -f wt &&
+	git worktree add wt --detach &&
+	# rename orphan in another worktreee
+	git -C wt checkout --orphan orphan-foo-wt &&
+	git branch -m orphan-foo-wt orphan-bar-wt &&
+	test orphan-bar-wt=$(git -C orphan-worktree branch --show-current) &&
+	# rename orphan in the current worktree
+	git checkout --orphan orphan-foo &&
+	git branch -m orphan-foo orphan-bar &&
+	test orphan-bar=$(git branch --show-current)
+
+Preparing worktree (detached HEAD da664a6)
+HEAD is now at da664a6 Second commit.
+Switched to a new branch 'orphan-foo-wt'
+fatal: cannot change to 'orphan-worktree': No such file or directory
+Switched to a new branch 'orphan-foo'
+Note: switching to 'da664a6b0bffeb0904609e9e14e1beeecfe55c4a'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at da664a6 Second commit.
+ok 39 - git branch -m should work with orphan branches
+
+expecting success of 3200.40 'git branch -d on orphan HEAD (merged)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	test_when_finished "rm -rf .git/objects/commit-graph*" &&
+	git commit-graph write --reachable &&
+	git branch --track to-delete main &&
+	git branch -d to-delete
+
+Switched to a new branch 'orphan'
+branch 'to-delete' set up to track 'main'.
+warning: deleting branch 'to-delete' that has been merged to
+         'refs/heads/main', but not yet merged to HEAD
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 40 - git branch -d on orphan HEAD (merged)
+
+expecting success of 3200.41 'git branch -d on orphan HEAD (merged, graph)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	git branch --track to-delete main &&
+	git branch -d to-delete
+
+Switched to a new branch 'orphan'
+branch 'to-delete' set up to track 'main'.
+warning: deleting branch 'to-delete' that has been merged to
+         'refs/heads/main', but not yet merged to HEAD
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 41 - git branch -d on orphan HEAD (merged, graph)
+
+expecting success of 3200.42 'git branch -d on orphan HEAD (unmerged)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	test_when_finished "git branch -D to-delete" &&
+	git branch to-delete main &&
+	test_must_fail git branch -d to-delete 2>err &&
+	grep "not fully merged" err
+
+Switched to a new branch 'orphan'
+error: the branch 'to-delete' is not fully merged
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 42 - git branch -d on orphan HEAD (unmerged)
+
+expecting success of 3200.43 'git branch -d on orphan HEAD (unmerged, graph)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	test_when_finished "git branch -D to-delete" &&
+	git branch to-delete main &&
+	test_when_finished "rm -rf .git/objects/commit-graph*" &&
+	git commit-graph write --reachable &&
+	test_must_fail git branch -d to-delete 2>err &&
+	grep "not fully merged" err
+
+Switched to a new branch 'orphan'
+error: the branch 'to-delete' is not fully merged
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 43 - git branch -d on orphan HEAD (unmerged, graph)
+
+expecting success of 3200.44 'git branch -v -d t should work': 
+	git branch t &&
+	git rev-parse --verify refs/heads/t &&
+	git branch -v -d t &&
+	test_must_fail git rev-parse --verify refs/heads/t
+
+da664a6b0bffeb0904609e9e14e1beeecfe55c4a
+Deleted branch t (was da664a6).
+fatal: Needed a single revision
+ok 44 - git branch -v -d t should work
+
+expecting success of 3200.45 'git branch -v -m t s should work': 
+	git branch t &&
+	git rev-parse --verify refs/heads/t &&
+	git branch -v -m t s &&
+	test_must_fail git rev-parse --verify refs/heads/t &&
+	git rev-parse --verify refs/heads/s &&
+	git branch -d s
+
+da664a6b0bffeb0904609e9e14e1beeecfe55c4a
+fatal: Needed a single revision
+da664a6b0bffeb0904609e9e14e1beeecfe55c4a
+Deleted branch s (was da664a6).
+ok 45 - git branch -v -m t s should work
+
+expecting success of 3200.46 'git branch -m -d t s should fail': 
+	git branch t &&
+	git rev-parse refs/heads/t &&
+	test_must_fail git branch -m -d t s &&
+	git branch -d t &&
+	test_must_fail git rev-parse refs/heads/t
+
+da664a6b0bffeb0904609e9e14e1beeecfe55c4a
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
+   or: git branch [<options>] [-l] [<pattern>...]
+   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
+   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
+   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
+   or: git branch [<options>] [-r | -a] [--points-at]
+   or: git branch [<options>] [-r | -a] [--format]
+
+Generic options
+    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
+    -q, --[no-]quiet      suppress informational messages
+    -t, --[no-]track[=(direct|inherit)]
+                          set branch tracking configuration
+    -u, --[no-]set-upstream-to <upstream>
+                          change the upstream info
+    --[no-]unset-upstream unset the upstream info
+    --[no-]color[=<when>] use colored output
+    -r, --remotes         act on remote-tracking branches
+    --contains <commit>   print only branches that contain the commit
+    --no-contains <commit>
+                          print only branches that don't contain the commit
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+Specific git-branch actions:
+    -a, --all             list both remote-tracking and local branches
+    -d, --[no-]delete     delete fully merged branch
+    -D                    delete branch (even if not merged)
+    -m, --[no-]move       move/rename a branch and its reflog
+    -M                    move/rename a branch, even if target exists
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    -c, --[no-]copy       copy a branch and its reflog
+    -C                    copy a branch, even if target exists
+    -l, --[no-]list       list branch names
+    --[no-]show-current   show current branch name
+    --[no-]create-reflog  create the branch's reflog
+    --[no-]edit-description
+                          edit the description for the branch
+    -f, --[no-]force      force creation, move/rename, deletion
+    --merged <commit>     print only branches that are merged
+    --no-merged <commit>  print only branches that are not merged
+    --[no-]column[=<style>]
+                          list branches in columns
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only branches of the object
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]format <format>
+                          format to use for the output
+
+Deleted branch t (was da664a6).
+fatal: ambiguous argument 'refs/heads/t': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/t
+ok 46 - git branch -m -d t s should fail
+
+expecting success of 3200.47 'git branch --list -d t should fail': 
+	git branch t &&
+	git rev-parse refs/heads/t &&
+	test_must_fail git branch --list -d t &&
+	git branch -d t &&
+	test_must_fail git rev-parse refs/heads/t
+
+da664a6b0bffeb0904609e9e14e1beeecfe55c4a
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+   or: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
+   or: git branch [<options>] [-l] [<pattern>...]
+   or: git branch [<options>] [-r] (-d | -D) <branch-name>...
+   or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
+   or: git branch [<options>] (-c | -C) [<old-branch>] <new-branch>
+   or: git branch [<options>] [-r | -a] [--points-at]
+   or: git branch [<options>] [-r | -a] [--format]
+
+Generic options
+    -v, --[no-]verbose    show hash and subject, give twice for upstream branch
+    -q, --[no-]quiet      suppress informational messages
+    -t, --[no-]track[=(direct|inherit)]
+                          set branch tracking configuration
+    -u, --[no-]set-upstream-to <upstream>
+                          change the upstream info
+    --[no-]unset-upstream unset the upstream info
+    --[no-]color[=<when>] use colored output
+    -r, --remotes         act on remote-tracking branches
+    --contains <commit>   print only branches that contain the commit
+    --no-contains <commit>
+                          print only branches that don't contain the commit
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+Specific git-branch actions:
+    -a, --all             list both remote-tracking and local branches
+    -d, --[no-]delete     delete fully merged branch
+    -D                    delete branch (even if not merged)
+    -m, --[no-]move       move/rename a branch and its reflog
+    -M                    move/rename a branch, even if target exists
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    -c, --[no-]copy       copy a branch and its reflog
+    -C                    copy a branch, even if target exists
+    -l, --[no-]list       list branch names
+    --[no-]show-current   show current branch name
+    --[no-]create-reflog  create the branch's reflog
+    --[no-]edit-description
+                          edit the description for the branch
+    -f, --[no-]force      force creation, move/rename, deletion
+    --merged <commit>     print only branches that are merged
+    --no-merged <commit>  print only branches that are not merged
+    --[no-]column[=<style>]
+                          list branches in columns
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only branches of the object
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+    --[no-]recurse-submodules
+                          recurse through submodules
+    --[no-]format <format>
+                          format to use for the output
+
+Deleted branch t (was da664a6).
+fatal: ambiguous argument 'refs/heads/t': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/t
+ok 47 - git branch --list -d t should fail
+
+expecting success of 3200.48 'deleting checked-out branch from repo that is a submodule': 
+	test_when_finished "rm -rf repo1 repo2" &&
+
+	git init repo1 &&
+	git init repo1/sub &&
+	test_commit -C repo1/sub x &&
+	test_config_global protocol.file.allow always &&
+	git -C repo1 submodule add ./sub &&
+	git -C repo1 commit -m "adding sub" &&
+
+	git clone --recurse-submodules repo1 repo2 &&
+	git -C repo2/sub checkout -b work &&
+	test_must_fail git -C repo2/sub branch -D work
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo1/sub/.git/
+[main (root-commit) cb85766] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Adding existing repo at 'sub' to the index
+[main (root-commit) 0e407d8] adding sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cloning into 'repo2'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo1/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo2/sub'...
+done.
+Submodule path 'sub': checked out 'cb85766717df318a47d35b1ec7b43b1040fdc133'
+Switched to a new branch 'work'
+error: cannot delete branch 'work' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/repo2/.git/modules/sub'
+ok 48 - deleting checked-out branch from repo that is a submodule
+
+expecting success of 3200.49 'bare main worktree has HEAD at branch deleted by secondary worktree': 
+	test_when_finished "rm -rf nonbare base secondary" &&
+
+	git init -b main nonbare &&
+	test_commit -C nonbare x &&
+	git clone --bare nonbare bare &&
+	git -C bare worktree add --detach ../secondary main &&
+	git -C secondary branch -D main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/nonbare/.git/
+[main (root-commit) 6f481db] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Cloning into bare repository 'bare'...
+done.
+Preparing worktree (detached HEAD 6f481db)
+HEAD is now at 6f481db x
+Deleted branch main (was 6f481db).
+ok 49 - bare main worktree has HEAD at branch deleted by secondary worktree
+
+expecting success of 3200.50 'git branch --list -v with --abbrev': 
+	test_when_finished "git branch -D t" &&
+	git branch t &&
+	git branch -v --list t >actual.default &&
+	git branch -v --list --abbrev t >actual.abbrev &&
+	test_cmp actual.default actual.abbrev &&
+
+	git branch -v --list --no-abbrev t >actual.noabbrev &&
+	git branch -v --list --abbrev=0 t >actual.0abbrev &&
+	git -c core.abbrev=no branch -v --list t >actual.noabbrev-conf &&
+	test_cmp actual.noabbrev actual.0abbrev &&
+	test_cmp actual.noabbrev actual.noabbrev-conf &&
+
+	git branch -v --list --abbrev=36 t >actual.36abbrev &&
+	# how many hexdigits are used?
+	read name objdefault rest <actual.abbrev &&
+	read name obj36 rest <actual.36abbrev &&
+	objfull=$(git rev-parse --verify t) &&
+
+	# are we really getting abbreviations?
+	test "$obj36" != "$objdefault" &&
+	expr "$obj36" : "$objdefault" >/dev/null &&
+	test "$objfull" != "$obj36" &&
+	expr "$objfull" : "$obj36" >/dev/null
+
+
+Deleted branch t (was da664a6).
+ok 50 - git branch --list -v with --abbrev
+
+expecting success of 3200.51 'git branch --column': 
+	COLUMNS=81 git branch --column=column >actual &&
+	cat >expect <<-\EOF &&
+	  a/b/c   bam     foo     l     * main    n       o/p     r
+	  abc     bar     j/k     m/m     mb      o/o     q       topic
+	EOF
+	test_cmp expect actual
+
+ok 51 - git branch --column
+
+expecting success of 3200.52 'git branch --column with an extremely long branch name': 
+	long=this/is/a/part/of/long/branch/name &&
+	long=z$long/$long/$long/$long &&
+	test_when_finished "git branch -d $long" &&
+	git branch $long &&
+	COLUMNS=80 git branch --column=column >actual &&
+	cat >expect <<-EOF &&
+	  a/b/c
+	  abc
+	  bam
+	  bar
+	  foo
+	  j/k
+	  l
+	  m/m
+	* main
+	  mb
+	  n
+	  o/o
+	  o/p
+	  q
+	  r
+	  topic
+	  $long
+	EOF
+	test_cmp expect actual
+
+Deleted branch zthis/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name (was da664a6).
+ok 52 - git branch --column with an extremely long branch name
+
+expecting success of 3200.53 'git branch with column.*': 
+	git config column.ui column &&
+	git config column.branch "dense" &&
+	COLUMNS=80 git branch >actual &&
+	git config --unset column.branch &&
+	git config --unset column.ui &&
+	cat >expect <<-\EOF &&
+	  a/b/c   bam   foo   l   * main   n     o/p   r
+	  abc     bar   j/k   m/m   mb     o/o   q     topic
+	EOF
+	test_cmp expect actual
+
+ok 53 - git branch with column.*
+
+expecting success of 3200.54 'git branch --column -v should fail': 
+	test_must_fail git branch --column -v
+
+fatal: options '--column' and '--verbose' cannot be used together
+ok 54 - git branch --column -v should fail
+
+expecting success of 3200.55 'git branch -v with column.ui ignored': 
+	git config column.ui column &&
+	COLUMNS=80 git branch -v | cut -c -8 | sed "s/ *$//" >actual &&
+	git config --unset column.ui &&
+	cat >expect <<-\EOF &&
+	  a/b/c
+	  abc
+	  bam
+	  bar
+	  foo
+	  j/k
+	  l
+	  m/m
+	* main
+	  mb
+	  n
+	  o/o
+	  o/p
+	  q
+	  r
+	  topic
+	EOF
+	test_cmp expect actual
+
+ok 55 - git branch -v with column.ui ignored
+
+checking prerequisite: DEFAULT_REPO_FORMAT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+	test_have_prereq SHA1,REFFILES
+
+)
+checking prerequisite: SHA1
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+	case "$GIT_DEFAULT_HASH" in
+	sha1) true ;;
+	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
+	*) false ;;
+	esac
+
+)
+prerequisite SHA1 ok
+prerequisite DEFAULT_REPO_FORMAT ok
+expecting success of 3200.56 'git branch -m q q2 without config should succeed': 
+	test_when_finished mv .git/config-saved .git/config &&
+	mv .git/config .git/config-saved &&
+	git branch -m q q2 &&
+	git branch -m q2 q
+
+ok 56 - git branch -m q q2 without config should succeed
+
+expecting success of 3200.57 'git branch -m s/s s should work when s/t is deleted': 
+	git config branch.s/s.dummy Hello &&
+	git branch --create-reflog s/s &&
+	git reflog exists refs/heads/s/s &&
+	git branch --create-reflog s/t &&
+	git reflog exists refs/heads/s/t &&
+	git branch -d s/t &&
+	git branch -m s/s s &&
+	git reflog exists refs/heads/s
+
+Deleted branch s/t (was da664a6).
+ok 57 - git branch -m s/s s should work when s/t is deleted
+
+expecting success of 3200.58 'config information was renamed, too': 
+	test $(git config branch.s.dummy) = Hello &&
+	test_must_fail git config branch.s/s.dummy
+
+ok 58 - config information was renamed, too
+
+expecting success of 3200.59 'git branch -m correctly renames multiple config sections': 
+	test_when_finished "git checkout main" &&
+	git checkout -b source main &&
+
+	# Assert that a config file with multiple config sections has
+	# those sections preserved...
+	cat >expect <<-\EOF &&
+	branch.dest.key1=value1
+	some.gar.b=age
+	branch.dest.key2=value2
+	EOF
+	cat >config.branch <<\EOF &&
+;; Note the lack of -\EOF above & mixed indenting here. This is
+;; intentional, we are also testing that the formatting of copied
+;; sections is preserved.
+
+;; Comment for source. Tabs
+[branch "source"]
+	;; Comment for the source value
+	key1 = value1
+;; Comment for some.gar. Spaces
+[some "gar"]
+    ;; Comment for the some.gar value
+    b = age
+;; Comment for source, again. Mixed tabs/spaces.
+[branch "source"]
+    ;; Comment for the source value, again
+	key2 = value2
+EOF
+	cat config.branch >>.git/config &&
+	git branch -m source dest &&
+	git config -f .git/config -l | grep -F -e source -e dest -e some.gar >actual &&
+	test_cmp expect actual &&
+
+	# ...and that the comments for those sections are also
+	# preserved.
+	sed "s/\"source\"/\"dest\"/" config.branch >expect &&
+	sed -n -e "/Note the lack/,\$p" .git/config >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'source'
+Switched to branch 'main'
+ok 59 - git branch -m correctly renames multiple config sections
+
+expecting success of 3200.60 'git branch -c dumps usage': 
+	test_expect_code 128 git branch -c 2>err &&
+	test_grep "branch name required" err
+
+fatal: branch name required
+ok 60 - git branch -c dumps usage
+
+expecting success of 3200.61 'git branch --copy dumps usage': 
+	test_expect_code 128 git branch --copy 2>err &&
+	test_grep "branch name required" err
+
+fatal: branch name required
+ok 61 - git branch --copy dumps usage
+
+expecting success of 3200.62 'git branch -c d e should work': 
+	git branch --create-reflog d &&
+	git reflog exists refs/heads/d &&
+	git config branch.d.dummy Hello &&
+	git branch -c d e &&
+	git reflog exists refs/heads/d &&
+	git reflog exists refs/heads/e &&
+	echo Hello >expect &&
+	git config branch.e.dummy >actual &&
+	test_cmp expect actual &&
+	echo Hello >expect &&
+	git config branch.d.dummy >actual &&
+	test_cmp expect actual
+
+ok 62 - git branch -c d e should work
+
+expecting success of 3200.63 'git branch --copy is a synonym for -c': 
+	git branch --create-reflog copy &&
+	git reflog exists refs/heads/copy &&
+	git config branch.copy.dummy Hello &&
+	git branch --copy copy copy-to &&
+	git reflog exists refs/heads/copy &&
+	git reflog exists refs/heads/copy-to &&
+	echo Hello >expect &&
+	git config branch.copy.dummy >actual &&
+	test_cmp expect actual &&
+	echo Hello >expect &&
+	git config branch.copy-to.dummy >actual &&
+	test_cmp expect actual
+
+ok 63 - git branch --copy is a synonym for -c
+
+expecting success of 3200.64 'git branch -c ee ef should copy ee to create branch ef': 
+	git checkout -b ee &&
+	git reflog exists refs/heads/ee &&
+	git config branch.ee.dummy Hello &&
+	git branch -c ee ef &&
+	git reflog exists refs/heads/ee &&
+	git reflog exists refs/heads/ef &&
+	test $(git config branch.ee.dummy) = Hello &&
+	test $(git config branch.ef.dummy) = Hello &&
+	test $(git rev-parse --abbrev-ref HEAD) = ee
+
+Switched to a new branch 'ee'
+ok 64 - git branch -c ee ef should copy ee to create branch ef
+
+expecting success of 3200.65 'git branch -c f/f g/g should work': 
+	git branch --create-reflog f/f &&
+	git reflog exists refs/heads/f/f &&
+	git config branch.f/f.dummy Hello &&
+	git branch -c f/f g/g &&
+	git reflog exists refs/heads/f/f &&
+	git reflog exists refs/heads/g/g &&
+	test $(git config branch.f/f.dummy) = Hello &&
+	test $(git config branch.g/g.dummy) = Hello
+
+ok 65 - git branch -c f/f g/g should work
+
+expecting success of 3200.66 'git branch -c m2 m2 should work': 
+	git branch --create-reflog m2 &&
+	git reflog exists refs/heads/m2 &&
+	git config branch.m2.dummy Hello &&
+	git branch -c m2 m2 &&
+	git reflog exists refs/heads/m2 &&
+	test $(git config branch.m2.dummy) = Hello
+
+ok 66 - git branch -c m2 m2 should work
+
+expecting success of 3200.67 'git branch -c zz zz/zz should fail': 
+	git branch --create-reflog zz &&
+	git reflog exists refs/heads/zz &&
+	test_must_fail git branch -c zz zz/zz
+
+error: directory not empty: .git/logs/refs/heads/zz/zz
+fatal: branch copy failed
+ok 67 - git branch -c zz zz/zz should fail
+
+expecting success of 3200.68 'git branch -c b/b b should fail': 
+	git branch --create-reflog b/b &&
+	test_must_fail git branch -c b/b b
+
+error: directory not empty: .git/logs/refs/heads/b
+fatal: branch copy failed
+ok 68 - git branch -c b/b b should fail
+
+expecting success of 3200.69 'git branch -C o/q o/p should work when o/p exists': 
+	git branch --create-reflog o/q &&
+	git reflog exists refs/heads/o/q &&
+	git reflog exists refs/heads/o/p &&
+	git branch -C o/q o/p
+
+ok 69 - git branch -C o/q o/p should work when o/p exists
+
+expecting success of 3200.70 'git branch -c -f o/q o/p should work when o/p exists': 
+	git reflog exists refs/heads/o/q &&
+	git reflog exists refs/heads/o/p &&
+	git branch -c -f o/q o/p
+
+ok 70 - git branch -c -f o/q o/p should work when o/p exists
+
+expecting success of 3200.71 'git branch -c qq rr/qq should fail when rr exists': 
+	git branch qq &&
+	git branch rr &&
+	test_must_fail git branch -c qq rr/qq
+
+error: 'refs/heads/rr' exists; cannot create 'refs/heads/rr/qq'
+fatal: branch copy failed
+ok 71 - git branch -c qq rr/qq should fail when rr exists
+
+expecting success of 3200.72 'git branch -C b1 b2 should fail when b2 is checked out': 
+	git branch b1 &&
+	git checkout -b b2 &&
+	test_must_fail git branch -C b1 b2
+
+Switched to a new branch 'b2'
+fatal: cannot force update the branch 'b2' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch'
+ok 72 - git branch -C b1 b2 should fail when b2 is checked out
+
+expecting success of 3200.73 'git branch -C c1 c2 should succeed when c1 is checked out': 
+	git checkout -b c1 &&
+	git branch c2 &&
+	git branch -C c1 c2 &&
+	test $(git rev-parse --abbrev-ref HEAD) = c1
+
+Switched to a new branch 'c1'
+ok 73 - git branch -C c1 c2 should succeed when c1 is checked out
+
+expecting success of 3200.74 'git branch -C c1 c2 should never touch HEAD': 
+	msg="Branch: copied refs/heads/c1 to refs/heads/c2" &&
+	git reflog HEAD >actual &&
+	! grep "$msg$" actual
+
+ok 74 - git branch -C c1 c2 should never touch HEAD
+
+expecting success of 3200.75 'git branch -C main should work when main is checked out': 
+	git checkout main &&
+	git branch -C main
+
+Switched to branch 'main'
+ok 75 - git branch -C main should work when main is checked out
+
+expecting success of 3200.76 'git branch -C main main should work when main is checked out': 
+	git checkout main &&
+	git branch -C main main
+
+Already on 'main'
+ok 76 - git branch -C main main should work when main is checked out
+
+expecting success of 3200.77 'git branch -C main5 main5 should work when main is checked out': 
+	git checkout main &&
+	git branch main5 &&
+	git branch -C main5 main5
+
+Already on 'main'
+ok 77 - git branch -C main5 main5 should work when main is checked out
+
+expecting success of 3200.78 'git branch -C ab cd should overwrite existing config for cd': 
+	git branch --create-reflog cd &&
+	git reflog exists refs/heads/cd &&
+	git config branch.cd.dummy CD &&
+	git branch --create-reflog ab &&
+	git reflog exists refs/heads/ab &&
+	git config branch.ab.dummy AB &&
+	git branch -C ab cd &&
+	git reflog exists refs/heads/ab &&
+	git reflog exists refs/heads/cd &&
+	test $(git config branch.ab.dummy) = AB &&
+	test $(git config branch.cd.dummy) = AB
+
+ok 78 - git branch -C ab cd should overwrite existing config for cd
+
+expecting success of 3200.79 'git branch -c correctly copies multiple config sections': 
+	FOO=1 &&
+	export FOO &&
+	test_when_finished "git checkout main" &&
+	git checkout -b source2 main &&
+
+	# Assert that a config file with multiple config sections has
+	# those sections preserved...
+	cat >expect <<-\EOF &&
+	branch.source2.key1=value1
+	branch.dest2.key1=value1
+	more.gar.b=age
+	branch.source2.key2=value2
+	branch.dest2.key2=value2
+	EOF
+	cat >config.branch <<\EOF &&
+;; Note the lack of -\EOF above & mixed indenting here. This is
+;; intentional, we are also testing that the formatting of copied
+;; sections is preserved.
+
+;; Comment for source2. Tabs
+[branch "source2"]
+	;; Comment for the source2 value
+	key1 = value1
+;; Comment for more.gar. Spaces
+[more "gar"]
+    ;; Comment for the more.gar value
+    b = age
+;; Comment for source2, again. Mixed tabs/spaces.
+[branch "source2"]
+    ;; Comment for the source2 value, again
+	key2 = value2
+EOF
+	cat config.branch >>.git/config &&
+	git branch -c source2 dest2 &&
+	git config -f .git/config -l | grep -F -e source2 -e dest2 -e more.gar >actual &&
+	test_cmp expect actual &&
+
+	# ...and that the comments and formatting for those sections
+	# is also preserved.
+	cat >expect <<\EOF &&
+;; Comment for source2. Tabs
+[branch "source2"]
+	;; Comment for the source2 value
+	key1 = value1
+;; Comment for more.gar. Spaces
+[branch "dest2"]
+	;; Comment for the source2 value
+	key1 = value1
+;; Comment for more.gar. Spaces
+[more "gar"]
+    ;; Comment for the more.gar value
+    b = age
+;; Comment for source2, again. Mixed tabs/spaces.
+[branch "source2"]
+    ;; Comment for the source2 value, again
+	key2 = value2
+[branch "dest2"]
+    ;; Comment for the source2 value, again
+	key2 = value2
+EOF
+	sed -n -e "/Comment for source2/,\$p" .git/config >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'source2'
+Switched to branch 'main'
+ok 79 - git branch -c correctly copies multiple config sections
+
+expecting success of 3200.80 'deleting a symref': 
+	git branch target &&
+	git symbolic-ref refs/heads/symref refs/heads/target &&
+	echo "Deleted branch symref (was refs/heads/target)." >expect &&
+	git branch -d symref >actual &&
+	test_ref_exists refs/heads/target &&
+	test_ref_missing refs/heads/symref &&
+	test_cmp expect actual
+
+error: reference does not exist
+ok 80 - deleting a symref
+
+expecting success of 3200.81 'deleting a dangling symref': 
+	git symbolic-ref refs/heads/dangling-symref nowhere &&
+	git symbolic-ref --no-recurse refs/heads/dangling-symref &&
+	echo "Deleted branch dangling-symref (was nowhere)." >expect &&
+	git branch -d dangling-symref >actual &&
+	test_ref_missing refs/heads/dangling-symref &&
+	test_cmp expect actual
+
+nowhere
+error: reference does not exist
+ok 81 - deleting a dangling symref
+
+expecting success of 3200.82 'deleting a self-referential symref': 
+	git symbolic-ref refs/heads/self-reference refs/heads/self-reference &&
+	test_ref_exists refs/heads/self-reference &&
+	echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect &&
+	git branch -d self-reference >actual &&
+	test_ref_missing refs/heads/self-reference &&
+	test_cmp expect actual
+
+error: reference does not exist
+ok 82 - deleting a self-referential symref
+
+expecting success of 3200.83 'renaming a symref is not allowed': 
+	git symbolic-ref refs/heads/topic refs/heads/main &&
+	test_must_fail git branch -m topic new-topic &&
+	git symbolic-ref refs/heads/topic &&
+	test_ref_exists refs/heads/main &&
+	test_ref_missing refs/heads/new-topic
+
+error: refname refs/heads/topic is a symbolic ref, renaming it is not supported
+fatal: branch rename failed
+refs/heads/main
+error: reference does not exist
+ok 83 - renaming a symref is not allowed
+
+expecting success of 3200.84 'test tracking setup via --track': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track my1 local/main &&
+	test $(git config branch.my1.remote) = local &&
+	test $(git config branch.my1.merge) = refs/heads/main
+
+From .
+ * [new branch]      a/b/c      -> local/a/b/c
+ * [new branch]      ab         -> local/ab
+ * [new branch]      abc        -> local/abc
+ * [new branch]      b/b        -> local/b/b
+ * [new branch]      b1         -> local/b1
+ * [new branch]      b2         -> local/b2
+ * [new branch]      bam        -> local/bam
+ * [new branch]      bar        -> local/bar
+ * [new branch]      c1         -> local/c1
+ * [new branch]      c2         -> local/c2
+ * [new branch]      cd         -> local/cd
+ * [new branch]      copy       -> local/copy
+ * [new branch]      copy-to    -> local/copy-to
+ * [new branch]      d          -> local/d
+ * [new branch]      dest       -> local/dest
+ * [new branch]      dest2      -> local/dest2
+ * [new branch]      e          -> local/e
+ * [new branch]      ee         -> local/ee
+ * [new branch]      ef         -> local/ef
+ * [new branch]      f/f        -> local/f/f
+ * [new branch]      foo        -> local/foo
+ * [new branch]      g/g        -> local/g/g
+ * [new branch]      j/k        -> local/j/k
+ * [new branch]      l          -> local/l
+ * [new branch]      m/m        -> local/m/m
+ * [new branch]      m2         -> local/m2
+ * [new branch]      main       -> local/main
+ * [new branch]      main5      -> local/main5
+ * [new branch]      mb         -> local/mb
+ * [new branch]      n          -> local/n
+ * [new branch]      o/o        -> local/o/o
+ * [new branch]      o/p        -> local/o/p
+ * [new branch]      o/q        -> local/o/q
+ * [new branch]      q          -> local/q
+ * [new branch]      qq         -> local/qq
+ * [new branch]      r          -> local/r
+ * [new branch]      rr         -> local/rr
+ * [new branch]      s          -> local/s
+ * [new branch]      source2    -> local/source2
+ * [new branch]      target     -> local/target
+ * [new branch]      topic      -> local/topic
+ * [new branch]      zz         -> local/zz
+branch 'my1' set up to track 'local/main'.
+ok 84 - test tracking setup via --track
+
+expecting success of 3200.85 'test tracking setup (non-wildcard, matching)': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/main:refs/remotes/local/main &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track my4 local/main &&
+	test $(git config branch.my4.remote) = local &&
+	test $(git config branch.my4.merge) = refs/heads/main
+
+branch 'my4' set up to track 'local/main'.
+ok 85 - test tracking setup (non-wildcard, matching)
+
+expecting success of 3200.86 'tracking setup fails on non-matching refspec': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
+	test_must_fail git branch --track my5 local/main &&
+	test_must_fail git config branch.my5.remote &&
+	test_must_fail git config branch.my5.merge
+
+fatal: cannot set up tracking information; starting point 'local/main' is not a branch
+ok 86 - tracking setup fails on non-matching refspec
+
+expecting success of 3200.87 'test tracking setup via config': 
+	git config branch.autosetupmerge true &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch my3 local/main &&
+	test $(git config branch.my3.remote) = local &&
+	test $(git config branch.my3.merge) = refs/heads/main
+
+branch 'my3' set up to track 'local/main'.
+ok 87 - test tracking setup via config
+
+expecting success of 3200.88 'test overriding tracking setup via --no-track': 
+	git config branch.autosetupmerge true &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track my2 local/main &&
+	git config branch.autosetupmerge false &&
+	! test "$(git config branch.my2.remote)" = local &&
+	! test "$(git config branch.my2.merge)" = refs/heads/main
+
+ok 88 - test overriding tracking setup via --no-track
+
+expecting success of 3200.89 'no tracking without .fetch entries': 
+	git config branch.autosetupmerge true &&
+	git branch my6 s &&
+	git config branch.autosetupmerge false &&
+	test -z "$(git config branch.my6.remote)" &&
+	test -z "$(git config branch.my6.merge)"
+
+ok 89 - no tracking without .fetch entries
+
+expecting success of 3200.90 'test tracking setup via --track but deeper': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/o/o || git fetch local) &&
+	git branch --track my7 local/o/o &&
+	test "$(git config branch.my7.remote)" = local &&
+	test "$(git config branch.my7.merge)" = refs/heads/o/o
+
+branch 'my7' set up to track 'local/o/o'.
+ok 90 - test tracking setup via --track but deeper
+
+expecting success of 3200.91 'test deleting branch deletes branch config': 
+	git branch -d my7 &&
+	test -z "$(git config branch.my7.remote)" &&
+	test -z "$(git config branch.my7.merge)"
+
+Deleted branch my7 (was da664a6).
+ok 91 - test deleting branch deletes branch config
+
+expecting success of 3200.92 'test deleting branch without config': 
+	git branch my7 s &&
+	sha1=$(git rev-parse my7 | cut -c 1-7) &&
+	echo "Deleted branch my7 (was $sha1)." >expect &&
+	git branch -d my7 >actual 2>&1 &&
+	test_cmp expect actual
+
+ok 92 - test deleting branch without config
+
+expecting success of 3200.93 'deleting currently checked out branch fails': 
+	git worktree add -b my7 my7 &&
+	test_must_fail git -C my7 branch -d my7 &&
+	test_must_fail git branch -d my7 2>actual &&
+	grep "^error: cannot delete branch .my7. used by worktree at " actual &&
+	rm -r my7 &&
+	git worktree prune
+
+Preparing worktree (new branch 'my7')
+HEAD is now at da664a6 Second commit.
+error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
+error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
+ok 93 - deleting currently checked out branch fails
+
+expecting success of 3200.94 'deleting in-use branch fails': 
+	git worktree add my7 &&
+	test_commit -C my7 bt7 &&
+	git -C my7 bisect start HEAD HEAD~2 &&
+	test_must_fail git -C my7 branch -d my7 &&
+	test_must_fail git branch -d my7 2>actual &&
+	grep "^error: cannot delete branch .my7. used by worktree at " actual &&
+	rm -r my7 &&
+	git worktree prune
+
+Preparing worktree (checking out 'my7')
+HEAD is now at da664a6 Second commit.
+[my7 d256542] bt7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bt7.t
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[da664a6b0bffeb0904609e9e14e1beeecfe55c4a] Second commit.
+error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
+error: cannot delete branch 'my7' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/my7'
+ok 94 - deleting in-use branch fails
+
+expecting success of 3200.95 'test --track without .fetch entries': 
+	git branch --track my8 &&
+	test "$(git config branch.my8.remote)" &&
+	test "$(git config branch.my8.merge)"
+
+branch 'my8' set up to track 'main'.
+ok 95 - test --track without .fetch entries
+
+expecting success of 3200.96 'branch from non-branch HEAD w/autosetupmerge=always': 
+	git config branch.autosetupmerge always &&
+	git branch my9 HEAD^ &&
+	git config branch.autosetupmerge false
+
+ok 96 - branch from non-branch HEAD w/autosetupmerge=always
+
+expecting success of 3200.97 'branch from non-branch HEAD w/--track causes failure': 
+	test_must_fail git branch --track my10 HEAD^
+
+fatal: cannot set up tracking information; starting point 'HEAD^' is not a branch
+ok 97 - branch from non-branch HEAD w/--track causes failure
+
+expecting success of 3200.98 'branch from tag w/--track causes failure': 
+	git tag foobar &&
+	test_must_fail git branch --track my11 foobar
+
+fatal: cannot set up tracking information; starting point 'foobar' is not a branch
+ok 98 - branch from tag w/--track causes failure
+
+expecting success of 3200.99 'simple tracking works when remote branch name matches': 
+	test_when_finished "rm -rf otherserver" &&
+	git init otherserver &&
+	test_commit -C otherserver my_commit 1 &&
+	git -C otherserver branch feature &&
+	test_config branch.autosetupmerge simple &&
+	test_config remote.otherserver.url otherserver &&
+	test_config remote.otherserver.fetch refs/heads/*:refs/remotes/otherserver/* &&
+	git fetch otherserver &&
+	git branch feature otherserver/feature &&
+	test_cmp_config otherserver branch.feature.remote &&
+	test_cmp_config refs/heads/feature branch.feature.merge
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/otherserver/.git/
+[main (root-commit) a1f3a4a] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+From otherserver
+ * [new branch]      feature    -> otherserver/feature
+ * [new branch]      main       -> otherserver/main
+ * [new tag]         my_commit  -> my_commit
+branch 'feature' set up to track 'otherserver/feature'.
+ok 99 - simple tracking works when remote branch name matches
+
+expecting success of 3200.100 'simple tracking skips when remote branch name does not match': 
+	test_config branch.autosetupmerge simple &&
+	test_config remote.local.url . &&
+	test_config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git fetch local &&
+	git branch my-other local/main &&
+	test_cmp_config "" --default "" branch.my-other.remote &&
+	test_cmp_config "" --default "" branch.my-other.merge
+
+From .
+ * [new branch]      feature    -> local/feature
+ * [new branch]      my1        -> local/my1
+ * [new branch]      my2        -> local/my2
+ * [new branch]      my3        -> local/my3
+ * [new branch]      my4        -> local/my4
+ * [new branch]      my6        -> local/my6
+ * [new branch]      my7        -> local/my7
+ * [new branch]      my8        -> local/my8
+ * [new branch]      my9        -> local/my9
+ok 100 - simple tracking skips when remote branch name does not match
+
+expecting success of 3200.101 'simple tracking skips when remote ref is not a branch': 
+	test_config branch.autosetupmerge simple &&
+	test_config remote.localtags.url . &&
+	test_config remote.localtags.fetch refs/tags/*:refs/remotes/localtags/* &&
+	git tag mytag12 main &&
+	git fetch localtags &&
+	git branch mytag12 localtags/mytag12 &&
+	test_cmp_config "" --default "" branch.mytag12.remote &&
+	test_cmp_config "" --default "" branch.mytag12.merge
+
+From .
+ * [new tag]         bt7        -> localtags/bt7
+ * [new tag]         foobar     -> localtags/foobar
+ * [new tag]         my_commit  -> localtags/my_commit
+ * [new tag]         mytag12    -> localtags/mytag12
+ok 101 - simple tracking skips when remote ref is not a branch
+
+expecting success of 3200.102 '--set-upstream-to fails on multiple branches': 
+	echo "fatal: too many arguments to set new upstream" >expect &&
+	test_must_fail git branch --set-upstream-to main a b c 2>err &&
+	test_cmp expect err
+
+ok 102 - --set-upstream-to fails on multiple branches
+
+expecting success of 3200.103 '--set-upstream-to fails on detached HEAD': 
+	git checkout HEAD^{} &&
+	test_when_finished git checkout - &&
+	echo "fatal: could not set upstream of HEAD to main when it does not point to any branch" >expect &&
+	test_must_fail git branch --set-upstream-to main 2>err &&
+	test_cmp expect err
+
+Note: switching to 'HEAD^{}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at da664a6 Second commit.
+Switched to branch 'main'
+ok 103 - --set-upstream-to fails on detached HEAD
+
+expecting success of 3200.104 '--set-upstream-to fails on a missing dst branch': 
+	echo "fatal: branch 'does-not-exist' does not exist" >expect &&
+	test_must_fail git branch --set-upstream-to main does-not-exist 2>err &&
+	test_cmp expect err
+
+ok 104 - --set-upstream-to fails on a missing dst branch
+
+expecting success of 3200.105 '--set-upstream-to fails on a missing src branch': 
+	test_must_fail git branch --set-upstream-to does-not-exist main 2>err &&
+	test_grep "the requested upstream branch 'does-not-exist' does not exist" err
+
+fatal: the requested upstream branch 'does-not-exist' does not exist
+ok 105 - --set-upstream-to fails on a missing src branch
+
+expecting success of 3200.106 '--set-upstream-to fails on a non-ref': 
+	echo "fatal: cannot set up tracking information; starting point 'HEAD^{}' is not a branch" >expect &&
+	test_must_fail git branch --set-upstream-to HEAD^{} 2>err &&
+	test_cmp expect err
+
+ok 106 - --set-upstream-to fails on a non-ref
+
+expecting success of 3200.107 '--set-upstream-to fails on locked config': 
+	test_when_finished "rm -f .git/config.lock" &&
+	>.git/config.lock &&
+	git branch locked &&
+	test_must_fail git branch --set-upstream-to locked 2>err &&
+	test_grep "could not lock config file .git/config" err
+
+error: could not lock config file .git/config: File exists
+ok 107 - --set-upstream-to fails on locked config
+
+expecting success of 3200.108 'use --set-upstream-to modify HEAD': 
+	test_config branch.main.remote foo &&
+	test_config branch.main.merge foo &&
+	git branch my12 &&
+	git branch --set-upstream-to my12 &&
+	test "$(git config branch.main.remote)" = "." &&
+	test "$(git config branch.main.merge)" = "refs/heads/my12"
+
+branch 'main' set up to track 'my12'.
+ok 108 - use --set-upstream-to modify HEAD
+
+expecting success of 3200.109 'use --set-upstream-to modify a particular branch': 
+	git branch my13 &&
+	git branch --set-upstream-to main my13 &&
+	test_when_finished "git branch --unset-upstream my13" &&
+	test "$(git config branch.my13.remote)" = "." &&
+	test "$(git config branch.my13.merge)" = "refs/heads/main"
+
+branch 'my13' set up to track 'main'.
+ok 109 - use --set-upstream-to modify a particular branch
+
+expecting success of 3200.110 '--unset-upstream should fail if given a non-existent branch': 
+	echo "fatal: branch 'i-dont-exist' has no upstream information" >expect &&
+	test_must_fail git branch --unset-upstream i-dont-exist 2>err &&
+	test_cmp expect err
+
+ok 110 - --unset-upstream should fail if given a non-existent branch
+
+expecting success of 3200.111 '--unset-upstream should fail if config is locked': 
+	test_when_finished "rm -f .git/config.lock" &&
+	git branch --set-upstream-to locked &&
+	>.git/config.lock &&
+	test_must_fail git branch --unset-upstream 2>err &&
+	test_grep "could not lock config file .git/config" err
+
+branch 'main' set up to track 'locked'.
+error: could not lock config file .git/config: File exists
+ok 111 - --unset-upstream should fail if config is locked
+
+expecting success of 3200.112 'test --unset-upstream on HEAD': 
+	git branch my14 &&
+	test_config branch.main.remote foo &&
+	test_config branch.main.merge foo &&
+	git branch --set-upstream-to my14 &&
+	git branch --unset-upstream &&
+	test_must_fail git config branch.main.remote &&
+	test_must_fail git config branch.main.merge &&
+	# fail for a branch without upstream set
+	echo "fatal: branch 'main' has no upstream information" >expect &&
+	test_must_fail git branch --unset-upstream 2>err &&
+	test_cmp expect err
+
+branch 'main' set up to track 'my14'.
+ok 112 - test --unset-upstream on HEAD
+
+expecting success of 3200.113 '--unset-upstream should fail on multiple branches': 
+	echo "fatal: too many arguments to unset upstream" >expect &&
+	test_must_fail git branch --unset-upstream a b c 2>err &&
+	test_cmp expect err
+
+ok 113 - --unset-upstream should fail on multiple branches
+
+expecting success of 3200.114 '--unset-upstream should fail on detached HEAD': 
+	git checkout HEAD^{} &&
+	test_when_finished git checkout - &&
+	echo "fatal: could not unset upstream of HEAD when it does not point to any branch" >expect &&
+	test_must_fail git branch --unset-upstream 2>err &&
+	test_cmp expect err
+
+Note: switching to 'HEAD^{}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at da664a6 Second commit.
+Switched to branch 'main'
+ok 114 - --unset-upstream should fail on detached HEAD
+
+expecting success of 3200.115 'test --unset-upstream on a particular branch': 
+	git branch my15 &&
+	git branch --set-upstream-to main my14 &&
+	git branch --unset-upstream my14 &&
+	test_must_fail git config branch.my14.remote &&
+	test_must_fail git config branch.my14.merge
+
+branch 'my14' set up to track 'main'.
+ok 115 - test --unset-upstream on a particular branch
+
+expecting success of 3200.116 'disabled option --set-upstream fails': 
+	test_must_fail git branch --set-upstream origin/main
+
+fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead
+ok 116 - disabled option --set-upstream fails
+
+expecting success of 3200.117 '--set-upstream-to notices an error to set branch as own upstream': 
+	git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
+	cat >expect <<-\EOF &&
+	warning: not setting branch 'my13' as its own upstream
+	EOF
+	test_expect_code 1 git config branch.my13.remote &&
+	test_expect_code 1 git config branch.my13.merge &&
+	test_cmp expect actual
+
+ok 117 - --set-upstream-to notices an error to set branch as own upstream
+
+expecting success of 3200.118 'git checkout -b g/h/i -l should create a branch and a log': 
+	test_when_finished git checkout main &&
+	GIT_COMMITTER_DATE="2005-05-26 23:30" \
+	git checkout -b g/h/i -l main &&
+	test_ref_exists refs/heads/g/h/i &&
+	cat >expect <<-EOF &&
+	$HEAD refs/heads/g/h/i@{0}: branch: Created from main
+	EOF
+	git reflog show --no-abbrev-commit refs/heads/g/h/i >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'g/h/i'
+Switched to branch 'main'
+ok 118 - git checkout -b g/h/i -l should create a branch and a log
+
+expecting success of 3200.119 'checkout -b makes reflog by default': 
+	git checkout main &&
+	git config --unset core.logAllRefUpdates &&
+	git checkout -b alpha &&
+	git rev-parse --verify alpha@{0}
+
+Already on 'main'
+Switched to a new branch 'alpha'
+da664a6b0bffeb0904609e9e14e1beeecfe55c4a
+ok 119 - checkout -b makes reflog by default
+
+expecting success of 3200.120 'checkout -b does not make reflog when core.logAllRefUpdates = false': 
+	git checkout main &&
+	git config core.logAllRefUpdates false &&
+	git checkout -b beta &&
+	test_must_fail git rev-parse --verify beta@{0}
+
+Switched to branch 'main'
+Switched to a new branch 'beta'
+fatal: Needed a single revision
+ok 120 - checkout -b does not make reflog when core.logAllRefUpdates = false
+
+expecting success of 3200.121 'checkout -b with -l makes reflog when core.logAllRefUpdates = false': 
+	git checkout main &&
+	git checkout -lb gamma &&
+	git config --unset core.logAllRefUpdates &&
+	git rev-parse --verify gamma@{0}
+
+Switched to branch 'main'
+Switched to a new branch 'gamma'
+da664a6b0bffeb0904609e9e14e1beeecfe55c4a
+ok 121 - checkout -b with -l makes reflog when core.logAllRefUpdates = false
+
+expecting success of 3200.122 'avoid ambiguous track and advise': 
+	git config branch.autosetupmerge true &&
+	git config remote.ambi1.url lalala &&
+	git config remote.ambi1.fetch refs/heads/lalala:refs/heads/main &&
+	git config remote.ambi2.url lilili &&
+	git config remote.ambi2.fetch refs/heads/lilili:refs/heads/main &&
+	cat <<-EOF >expected &&
+	fatal: not tracking: ambiguous information for ref 'refs/heads/main'
+	hint: There are multiple remotes whose fetch refspecs map to the remote
+	hint: tracking ref 'refs/heads/main':
+	hint:   ambi1
+	hint:   ambi2
+	hint:
+	hint: This is typically a configuration error.
+	hint:
+	hint: To support setting up tracking branches, ensure that
+	hint: different remotes' fetch refspecs map into different
+	hint: tracking namespaces.
+	EOF
+	test_must_fail git branch all1 main 2>actual &&
+	test_cmp expected actual &&
+	test -z "$(git config branch.all1.merge)"
+
+ok 122 - avoid ambiguous track and advise
+
+expecting success of 3200.123 'autosetuprebase local on a tracked local branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase local &&
+	(git show-ref -q refs/remotes/local/o || git fetch local) &&
+	git branch mybase &&
+	git branch --track myr1 mybase &&
+	test "$(git config branch.myr1.remote)" = . &&
+	test "$(git config branch.myr1.merge)" = refs/heads/mybase &&
+	test "$(git config branch.myr1.rebase)" = true
+
+From .
+ * [new branch]      all1       -> local/all1
+ * [new branch]      alpha      -> local/alpha
+ * [new branch]      beta       -> local/beta
+ * [new branch]      g/h/i      -> local/g/h/i
+ * [new branch]      gamma      -> local/gamma
+ * [new branch]      locked     -> local/locked
+ * [new branch]      my-other   -> local/my-other
+ * [new branch]      my12       -> local/my12
+ * [new branch]      my13       -> local/my13
+ * [new branch]      my14       -> local/my14
+ * [new branch]      my15       -> local/my15
+ * [new branch]      mytag12    -> local/mytag12
+branch 'myr1' set up to track 'mybase' by rebasing.
+ok 123 - autosetuprebase local on a tracked local branch
+
+expecting success of 3200.124 'autosetuprebase always on a tracked local branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase always &&
+	(git show-ref -q refs/remotes/local/o || git fetch local) &&
+	git branch mybase2 &&
+	git branch --track myr2 mybase &&
+	test "$(git config branch.myr2.remote)" = . &&
+	test "$(git config branch.myr2.merge)" = refs/heads/mybase &&
+	test "$(git config branch.myr2.rebase)" = true
+
+From .
+ * [new branch]      mybase     -> local/mybase
+ * [new branch]      myr1       -> local/myr1
+branch 'myr2' set up to track 'mybase' by rebasing.
+ok 124 - autosetuprebase always on a tracked local branch
+
+expecting success of 3200.125 'autosetuprebase remote on a tracked local branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase remote &&
+	(git show-ref -q refs/remotes/local/o || git fetch local) &&
+	git branch mybase3 &&
+	git branch --track myr3 mybase2 &&
+	test "$(git config branch.myr3.remote)" = . &&
+	test "$(git config branch.myr3.merge)" = refs/heads/mybase2 &&
+	! test "$(git config branch.myr3.rebase)" = true
+
+From .
+ * [new branch]      mybase2    -> local/mybase2
+ * [new branch]      myr2       -> local/myr2
+branch 'myr3' set up to track 'mybase2'.
+ok 125 - autosetuprebase remote on a tracked local branch
+
+expecting success of 3200.126 'autosetuprebase never on a tracked local branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase never &&
+	(git show-ref -q refs/remotes/local/o || git fetch local) &&
+	git branch mybase4 &&
+	git branch --track myr4 mybase2 &&
+	test "$(git config branch.myr4.remote)" = . &&
+	test "$(git config branch.myr4.merge)" = refs/heads/mybase2 &&
+	! test "$(git config branch.myr4.rebase)" = true
+
+From .
+ * [new branch]      mybase3    -> local/mybase3
+ * [new branch]      myr3       -> local/myr3
+branch 'myr4' set up to track 'mybase2'.
+ok 126 - autosetuprebase never on a tracked local branch
+
+expecting success of 3200.127 'autosetuprebase local on a tracked remote branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase local &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr5 local/main &&
+	test "$(git config branch.myr5.remote)" = local &&
+	test "$(git config branch.myr5.merge)" = refs/heads/main &&
+	! test "$(git config branch.myr5.rebase)" = true
+
+branch 'myr5' set up to track 'local/main'.
+ok 127 - autosetuprebase local on a tracked remote branch
+
+expecting success of 3200.128 'autosetuprebase never on a tracked remote branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase never &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr6 local/main &&
+	test "$(git config branch.myr6.remote)" = local &&
+	test "$(git config branch.myr6.merge)" = refs/heads/main &&
+	! test "$(git config branch.myr6.rebase)" = true
+
+branch 'myr6' set up to track 'local/main'.
+ok 128 - autosetuprebase never on a tracked remote branch
+
+expecting success of 3200.129 'autosetuprebase remote on a tracked remote branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase remote &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr7 local/main &&
+	test "$(git config branch.myr7.remote)" = local &&
+	test "$(git config branch.myr7.merge)" = refs/heads/main &&
+	test "$(git config branch.myr7.rebase)" = true
+
+branch 'myr7' set up to track 'local/main' by rebasing.
+ok 129 - autosetuprebase remote on a tracked remote branch
+
+expecting success of 3200.130 'autosetuprebase always on a tracked remote branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	git config branch.autosetuprebase remote &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr8 local/main &&
+	test "$(git config branch.myr8.remote)" = local &&
+	test "$(git config branch.myr8.merge)" = refs/heads/main &&
+	test "$(git config branch.myr8.rebase)" = true
+
+branch 'myr8' set up to track 'local/main' by rebasing.
+ok 130 - autosetuprebase always on a tracked remote branch
+
+expecting success of 3200.131 'autosetuprebase unconfigured on a tracked remote branch': 
+	git config --unset branch.autosetuprebase &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr9 local/main &&
+	test "$(git config branch.myr9.remote)" = local &&
+	test "$(git config branch.myr9.merge)" = refs/heads/main &&
+	test "z$(git config branch.myr9.rebase)" = z
+
+branch 'myr9' set up to track 'local/main'.
+ok 131 - autosetuprebase unconfigured on a tracked remote branch
+
+expecting success of 3200.132 'autosetuprebase unconfigured on a tracked local branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/o || git fetch local) &&
+	git branch mybase10 &&
+	git branch --track myr10 mybase2 &&
+	test "$(git config branch.myr10.remote)" = . &&
+	test "$(git config branch.myr10.merge)" = refs/heads/mybase2 &&
+	test "z$(git config branch.myr10.rebase)" = z
+
+From .
+ * [new branch]      mybase4    -> local/mybase4
+ * [new branch]      myr4       -> local/myr4
+ * [new branch]      myr5       -> local/myr5
+ * [new branch]      myr6       -> local/myr6
+ * [new branch]      myr7       -> local/myr7
+ * [new branch]      myr8       -> local/myr8
+ * [new branch]      myr9       -> local/myr9
+branch 'myr10' set up to track 'mybase2'.
+ok 132 - autosetuprebase unconfigured on a tracked local branch
+
+expecting success of 3200.133 'autosetuprebase unconfigured on untracked local branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr11 mybase2 &&
+	test "z$(git config branch.myr11.remote)" = z &&
+	test "z$(git config branch.myr11.merge)" = z &&
+	test "z$(git config branch.myr11.rebase)" = z
+
+ok 133 - autosetuprebase unconfigured on untracked local branch
+
+expecting success of 3200.134 'autosetuprebase unconfigured on untracked remote branch': 
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr12 local/main &&
+	test "z$(git config branch.myr12.remote)" = z &&
+	test "z$(git config branch.myr12.merge)" = z &&
+	test "z$(git config branch.myr12.rebase)" = z
+
+ok 134 - autosetuprebase unconfigured on untracked remote branch
+
+expecting success of 3200.135 'autosetuprebase never on an untracked local branch': 
+	git config branch.autosetuprebase never &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr13 mybase2 &&
+	test "z$(git config branch.myr13.remote)" = z &&
+	test "z$(git config branch.myr13.merge)" = z &&
+	test "z$(git config branch.myr13.rebase)" = z
+
+ok 135 - autosetuprebase never on an untracked local branch
+
+expecting success of 3200.136 'autosetuprebase local on an untracked local branch': 
+	git config branch.autosetuprebase local &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr14 mybase2 &&
+	test "z$(git config branch.myr14.remote)" = z &&
+	test "z$(git config branch.myr14.merge)" = z &&
+	test "z$(git config branch.myr14.rebase)" = z
+
+ok 136 - autosetuprebase local on an untracked local branch
+
+expecting success of 3200.137 'autosetuprebase remote on an untracked local branch': 
+	git config branch.autosetuprebase remote &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr15 mybase2 &&
+	test "z$(git config branch.myr15.remote)" = z &&
+	test "z$(git config branch.myr15.merge)" = z &&
+	test "z$(git config branch.myr15.rebase)" = z
+
+ok 137 - autosetuprebase remote on an untracked local branch
+
+expecting success of 3200.138 'autosetuprebase always on an untracked local branch': 
+	git config branch.autosetuprebase always &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr16 mybase2 &&
+	test "z$(git config branch.myr16.remote)" = z &&
+	test "z$(git config branch.myr16.merge)" = z &&
+	test "z$(git config branch.myr16.rebase)" = z
+
+ok 138 - autosetuprebase always on an untracked local branch
+
+expecting success of 3200.139 'autosetuprebase never on an untracked remote branch': 
+	git config branch.autosetuprebase never &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr17 local/main &&
+	test "z$(git config branch.myr17.remote)" = z &&
+	test "z$(git config branch.myr17.merge)" = z &&
+	test "z$(git config branch.myr17.rebase)" = z
+
+ok 139 - autosetuprebase never on an untracked remote branch
+
+expecting success of 3200.140 'autosetuprebase local on an untracked remote branch': 
+	git config branch.autosetuprebase local &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr18 local/main &&
+	test "z$(git config branch.myr18.remote)" = z &&
+	test "z$(git config branch.myr18.merge)" = z &&
+	test "z$(git config branch.myr18.rebase)" = z
+
+ok 140 - autosetuprebase local on an untracked remote branch
+
+expecting success of 3200.141 'autosetuprebase remote on an untracked remote branch': 
+	git config branch.autosetuprebase remote &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr19 local/main &&
+	test "z$(git config branch.myr19.remote)" = z &&
+	test "z$(git config branch.myr19.merge)" = z &&
+	test "z$(git config branch.myr19.rebase)" = z
+
+ok 141 - autosetuprebase remote on an untracked remote branch
+
+expecting success of 3200.142 'autosetuprebase always on an untracked remote branch': 
+	git config branch.autosetuprebase always &&
+	git config remote.local.url . &&
+	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr20 local/main &&
+	test "z$(git config branch.myr20.remote)" = z &&
+	test "z$(git config branch.myr20.merge)" = z &&
+	test "z$(git config branch.myr20.rebase)" = z
+
+ok 142 - autosetuprebase always on an untracked remote branch
+
+expecting success of 3200.143 'autosetuprebase always on detached HEAD': 
+	git config branch.autosetupmerge always &&
+	test_when_finished git checkout main &&
+	git checkout HEAD^0 &&
+	git branch my11 &&
+	test -z "$(git config branch.my11.remote)" &&
+	test -z "$(git config branch.my11.merge)"
+
+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 da664a6 Second commit.
+Switched to branch 'main'
+ok 143 - autosetuprebase always on detached HEAD
+
+expecting success of 3200.144 'detect misconfigured autosetuprebase (bad value)': 
+	git config branch.autosetuprebase garbage &&
+	test_must_fail git branch
+
+error: malformed value for branch.autosetuprebase
+fatal: bad config variable 'branch.autosetuprebase' in file '.git/config' at line 87
+ok 144 - detect misconfigured autosetuprebase (bad value)
+
+expecting success of 3200.145 'detect misconfigured autosetuprebase (no value)': 
+	git config --unset branch.autosetuprebase &&
+	echo "[branch] autosetuprebase" >>.git/config &&
+	test_must_fail git branch &&
+	git config --unset branch.autosetuprebase
+
+error: missing value for 'branch.autosetuprebase'
+fatal: bad config variable 'branch.autosetuprebase' in file '.git/config' at line 130
+ok 145 - detect misconfigured autosetuprebase (no value)
+
+expecting success of 3200.146 'attempt to delete a branch without base and unmerged to HEAD': 
+	git checkout my9 &&
+	git config --unset branch.my8.merge &&
+	test_must_fail git branch -d my8
+
+Switched to branch 'my9'
+error: the branch 'my8' is not fully merged
+hint: If you are sure you want to delete it, run 'git branch -D my8'
+hint: Disable this message with "git config set advice.forceDeleteBranch false"
+ok 146 - attempt to delete a branch without base and unmerged to HEAD
+
+expecting success of 3200.147 'attempt to delete a branch merged to its base': 
+	# we are on my9 which is the initial commit; traditionally
+	# we would not have allowed deleting my8 that is not merged
+	# to my9, but it is set to track main that already has my8
+	git config branch.my8.merge refs/heads/main &&
+	git branch -d my8
+
+warning: deleting branch 'my8' that has been merged to
+         'refs/heads/main', but not yet merged to HEAD
+Deleted branch my8 (was da664a6).
+ok 147 - attempt to delete a branch merged to its base
+
+expecting success of 3200.148 'attempt to delete a branch merged to its base': 
+	git checkout main &&
+	echo Third >>A &&
+	git commit -m "Third commit" A &&
+	git branch -t my10 my9 &&
+	git branch -f my10 HEAD^ &&
+	# we are on main which is at the third commit, and my10
+	# is behind us, so traditionally we would have allowed deleting
+	# it; but my10 is set to track my9 that is further behind.
+	test_must_fail git branch -d my10
+
+Switched to branch 'main'
+[main c783cab] Third commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+branch 'my10' set up to track 'my9'.
+warning: not deleting branch 'my10' that is not yet merged to
+         'refs/heads/my9', even though it is merged to HEAD
+error: the branch 'my10' is not fully merged
+hint: If you are sure you want to delete it, run 'git branch -D my10'
+hint: Disable this message with "git config set advice.forceDeleteBranch false"
+ok 148 - attempt to delete a branch merged to its base
+
+expecting success of 3200.149 'branch --delete --force removes dangling branch': 
+	git checkout main &&
+	test_commit unstable &&
+	hash=$(git rev-parse HEAD) &&
+	objpath=$(echo $hash | sed -e "s|^..|.git/objects/&/|") &&
+	git branch --no-track dangling &&
+	mv $objpath $objpath.x &&
+	test_when_finished "mv $objpath.x $objpath" &&
+	git branch --delete --force dangling &&
+	git for-each-ref refs/heads/dangling >actual &&
+	test_must_be_empty actual
+
+Already on 'main'
+[main e9e975e] unstable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unstable.t
+Deleted branch dangling (was e9e975e).
+ok 149 - branch --delete --force removes dangling branch
+
+expecting success of 3200.150 'use --edit-description': 
+	EDITOR=: git branch --edit-description &&
+	test_expect_code 1 git config branch.main.description &&
+
+	write_script editor <<-\EOF &&
+		echo "New contents" >"$1"
+	EOF
+	EDITOR=./editor git branch --edit-description &&
+		write_script editor <<-\EOF &&
+		git stripspace -s <"$1" >"EDITOR_OUTPUT"
+	EOF
+	EDITOR=./editor git branch --edit-description &&
+	echo "New contents" >expect &&
+	test_cmp expect EDITOR_OUTPUT
+
+ok 150 - use --edit-description
+
+expecting success of 3200.151 'detect typo in branch name when using --edit-description': 
+	write_script editor <<-\EOF &&
+		echo "New contents" >"$1"
+	EOF
+	test_must_fail env EDITOR=./editor git branch --edit-description no-such-branch
+
+error: no branch named 'no-such-branch'
+ok 151 - detect typo in branch name when using --edit-description
+
+expecting success of 3200.152 'refuse --edit-description on unborn branch for now': 
+	test_when_finished "git checkout main" &&
+	write_script editor <<-\EOF &&
+		echo "New contents" >"$1"
+	EOF
+	git checkout --orphan unborn &&
+	test_must_fail env EDITOR=./editor git branch --edit-description
+
+Switched to a new branch 'unborn'
+error: no commit on branch 'unborn' yet
+Switched to branch 'main'
+ok 152 - refuse --edit-description on unborn branch for now
+
+expecting success of 3200.153 '--merged catches invalid object names': 
+	test_must_fail git branch --merged 0000000000000000000000000000000000000000
+
+error: option `merged' must point to a commit
+ok 153 - --merged catches invalid object names
+
+expecting success of 3200.154 '--list during rebase': 
+	test_when_finished "reset_rebase" &&
+	git checkout main &&
+	FAKE_LINES="1 edit 2" &&
+	export FAKE_LINES &&
+	set_fake_editor &&
+	git rebase -i HEAD~2 &&
+	git branch --list >actual &&
+	test_grep "rebasing main" actual
+
+Already on 'main'
+rebase -i script before editing:
+pick c783cab Third commit
+pick e9e975e unstable
+
+rebase -i script after editing:
+pick c783cab Third commit
+edit e9e975e unstable
+Rebasing (2/2)
Stopped at e9e975e...  unstable
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+* (no branch, rebasing main)
+HEAD is now at e9e975e unstable
+Removing .gitconfig
+Removing EDITOR_OUTPUT
+Removing actual
+Removing actual.0abbrev
+Removing actual.36abbrev
+Removing actual.abbrev
+Removing actual.config
+Removing actual.default
+Removing actual.noabbrev
+Removing actual.noabbrev-conf
+Removing config.branch
+Removing editor
+Removing err
+Removing expect
+Removing expect.config
+Removing expected
+Removing fake-editor.sh
+ok 154 - --list during rebase
+
+expecting success of 3200.155 '--list during rebase from detached HEAD': 
+	test_when_finished "reset_rebase && git checkout main" &&
+	git checkout main^0 &&
+	oid=$(git rev-parse --short HEAD) &&
+	FAKE_LINES="1 edit 2" &&
+	export FAKE_LINES &&
+	set_fake_editor &&
+	git rebase -i HEAD~2 &&
+	git branch --list >actual &&
+	test_grep "rebasing detached HEAD $oid" actual
+
+Note: switching to 'main^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at e9e975e unstable
+rebase -i script before editing:
+pick c783cab Third commit
+pick e9e975e unstable
+
+rebase -i script after editing:
+pick c783cab Third commit
+edit e9e975e unstable
+Rebasing (2/2)
Stopped at e9e975e...  unstable
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+* (no branch, rebasing detached HEAD e9e975e)
+HEAD is now at e9e975e unstable
+Removing actual
+Removing fake-editor.sh
+Switched to branch 'main'
+ok 155 - --list during rebase from detached HEAD
+
+expecting success of 3200.156 'tracking with unexpected .fetch refspec': 
+	rm -rf a b c d &&
+	git init -b main a &&
+	(
+		cd a &&
+		test_commit a
+	) &&
+	git init -b main b &&
+	(
+		cd b &&
+		test_commit b
+	) &&
+	git init -b main c &&
+	(
+		cd c &&
+		test_commit c &&
+		git remote add a ../a &&
+		git remote add b ../b &&
+		git fetch --all
+	) &&
+	git init -b main d &&
+	(
+		cd d &&
+		git remote add c ../c &&
+		git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" &&
+		git fetch c &&
+		git branch --track local/a/main remotes/a/main &&
+		test "$(git config branch.local/a/main.remote)" = "c" &&
+		test "$(git config branch.local/a/main.merge)" = "refs/remotes/a/main" &&
+		git rev-parse --verify a >expect &&
+		git rev-parse --verify local/a/main >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/a/.git/
+[main (root-commit) f7cd21e] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/b/.git/
+[main (root-commit) 0546d35] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/c/.git/
+[main (root-commit) 38c490a] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Fetching a
+From ../a
+ * [new branch]      main       -> a/main
+ * [new tag]         a          -> a
+Fetching b
+From ../b
+ * [new branch]      main       -> b/main
+ * [new tag]         b          -> b
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/d/.git/
+From ../c
+ * [new ref]         a/HEAD     -> a/HEAD
+ * [new ref]         a/main     -> a/main
+ * [new ref]         b/HEAD     -> b/HEAD
+ * [new ref]         b/main     -> b/main
+ * [new tag]         a          -> a
+ * [new tag]         b          -> b
+branch 'local/a/main' set up to track 'c/refs/remotes/a/main'.
+warning: refname 'a' is ambiguous.
+ok 156 - tracking with unexpected .fetch refspec
+
+expecting success of 3200.157 'configured committerdate sort': 
+	git init -b main sort &&
+	test_config -C sort branch.sort "committerdate" &&
+
+	(
+		cd sort &&
+		test_commit initial &&
+		git checkout -b a &&
+		test_commit a &&
+		git checkout -b c &&
+		test_commit c &&
+		git checkout -b b &&
+		test_commit b &&
+		git branch >actual &&
+		cat >expect <<-\EOF &&
+		  main
+		  a
+		  c
+		* b
+		EOF
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3200-branch/sort/.git/
+[main (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 'a'
+[a 3f62c16] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Switched to a new branch 'c'
+[c 8d91554] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Switched to a new branch 'b'
+[b 80279b4] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+ok 157 - configured committerdate sort
+
+expecting success of 3200.158 'option override configured sort': 
+	test_config -C sort branch.sort "committerdate" &&
+
+	(
+		cd sort &&
+		git branch --sort=refname >actual &&
+		cat >expect <<-\EOF &&
+		  a
+		* b
+		  c
+		  main
+		EOF
+		test_cmp expect actual
+	)
+
+ok 158 - option override configured sort
+
+expecting success of 3200.159 '--no-sort cancels config sort keys': 
+	test_config -C sort branch.sort "-refname" &&
+
+	(
+		cd sort &&
+
+		# objecttype is identical for all of them, so sort falls back on
+		# default (ascending refname)
+		git branch \
+			--no-sort \
+			--sort="objecttype" >actual &&
+		cat >expect <<-\EOF &&
+		  a
+		* b
+		  c
+		  main
+		EOF
+		test_cmp expect actual
+	)
+
+
+ok 159 - --no-sort cancels config sort keys
+
+expecting success of 3200.160 '--no-sort cancels command line sort keys': 
+	(
+		cd sort &&
+
+		# objecttype is identical for all of them, so sort falls back on
+		# default (ascending refname)
+		git branch \
+			--sort="-refname" \
+			--no-sort \
+			--sort="objecttype" >actual &&
+		cat >expect <<-\EOF &&
+		  a
+		* b
+		  c
+		  main
+		EOF
+		test_cmp expect actual
+	)
+
+ok 160 - --no-sort cancels command line sort keys
+
+expecting success of 3200.161 '--no-sort without subsequent --sort prints expected branches': 
+	(
+		cd sort &&
+
+		# Sort the results with `sort` for a consistent comparison
+		# against expected
+		git branch --no-sort | sort >actual &&
+		cat >expect <<-\EOF &&
+		  a
+		  c
+		  main
+		* b
+		EOF
+		test_cmp expect actual
+	)
+
+ok 161 - --no-sort without subsequent --sort prints expected branches
+
+expecting success of 3200.162 'invalid sort parameter in configuration': 
+	test_config -C sort branch.sort "v:notvalid" &&
+
+	(
+		cd sort &&
+
+		# this works in the "listing" mode, so bad sort key
+		# is a dying offence.
+		test_must_fail git branch &&
+
+		# these do not need to use sorting, and should all
+		# succeed
+		git branch newone main &&
+		git branch -c newone newerone &&
+		git branch -m newone newestone &&
+		git branch -d newerone newestone
+	)
+
+fatal: unknown field name: notvalid
+Deleted branch newerone (was 31243c6).
+Deleted branch newestone (was 31243c6).
+ok 162 - invalid sort parameter in configuration
+
+expecting success of 3200.163 'tracking info copied with --track=inherit': 
+	git branch --track=inherit foo2 my1 &&
+	test_cmp_config local branch.foo2.remote &&
+	test_cmp_config refs/heads/main branch.foo2.merge
+
+branch 'foo2' set up to track 'local/main'.
+ok 163 - tracking info copied with --track=inherit
+
+expecting success of 3200.164 'tracking info copied with autoSetupMerge=inherit': 
+	test_unconfig branch.autoSetupMerge &&
+	# default config does not copy tracking info
+	git branch foo-no-inherit my1 &&
+	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 my1
+	test_config branch.autoSetupMerge inherit &&
+	git branch foo3 my1 &&
+	test_cmp_config local branch.foo3.remote &&
+	test_cmp_config refs/heads/main branch.foo3.merge &&
+	# no tracking info to inherit from main
+	git branch main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
+
+branch 'foo3' set up to track 'local/main'.
+warning: asked to inherit tracking from 'main', but no remote is set
+ok 164 - tracking info copied with autoSetupMerge=inherit
+
+expecting success of 3200.165 '--track overrides branch.autoSetupMerge': 
+	test_config branch.autoSetupMerge inherit &&
+	git branch --track=direct foo4 my1 &&
+	test_cmp_config . branch.foo4.remote &&
+	test_cmp_config refs/heads/my1 branch.foo4.merge &&
+	git branch --no-track foo5 my1 &&
+	test_cmp_config "" --default "" branch.foo5.remote &&
+	test_cmp_config "" --default "" branch.foo5.merge
+
+branch 'foo4' set up to track 'my1'.
+ok 165 - --track overrides branch.autoSetupMerge
+
+expecting success of 3200.166 'errors if given a bad branch name': 
+	cat <<-\EOF >expect &&
+	fatal: 'foo..bar' is not a valid branch name
+	hint: See `man git check-ref-format`
+	hint: Disable this message with "git config set advice.refSyntax false"
+	EOF
+	test_must_fail git branch foo..bar >actual 2>&1 &&
+	test_cmp expect actual
+
+ok 166 - errors if given a bad branch name
+
+# passed all 166 test(s)
+1..166
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3310-notes-merge-manual-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3310-notes-merge-manual-resolve/.git/
+expecting success of 3310.1 'setup commits': 
+	test_commit 1st &&
+	test_commit 2nd &&
+	test_commit 3rd &&
+	test_commit 4th &&
+	test_commit 5th &&
+
+	test_oid_cache <<-EOF
+	hash04a sha1:6e8e3febca3c2bb896704335cc4d0c34cb2f8715
+	hash03a sha1:e5388c10860456ee60673025345fe2e153eb8cf8
+	hash02a sha1:ceefa674873670e7ecd131814d909723cce2b669
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash01b sha1:b0a6021ec006d07e80e9b20ec9b444cbd9d560d3
+	hash04c sha1:cff59c793c20bb49a4e01bc06fb06bad642e0d54
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash01c sha1:0a81da8956346e19bcb27a906f04af327e03e31b
+	hash04d sha1:00494adecf2d9635a02fa431308d67993f853968
+	hash01e sha1:f75d1df88cbfe4258d49852f26cfc83f2ad4494b
+	hash04f sha1:021faa20e931fb48986ffc6282b4bb05553ac946
+	hash01f sha1:0a59e787e6d688aa6309e56e8c1b89431a0fc1c1
+	hash05g sha1:304dfb4325cf243025b9957486eb605a9b51c199
+
+	hash04a	sha256:f18a935e65866345098b3b754071dbf9f3aa3520eb27a7b036b278c5e2f1ed7e
+	hash03a	sha256:713035dc94067a64e5fa6e4e1821b7c3bde49a77c7cb3f80eaadefa1ca41b3d2
+	hash02a	sha256:f160a67e048b6fa75bec3952184154045076692cf5dccd3da21e3fd34b7a3f0f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash01b sha256:da96cf778c15d0a2bb76f98b2a62f6c9c01730fa7030e8f08ef0191048e7d620
+	hash04c sha256:cb615d2def4b834d5f55b2351df97dc92bee4f5009d285201427f349081c8aca
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash01c sha256:5b87237ac1fbae0246256fed9f9a1f077c4140fb7e6444925f8dbfa5ae406cd8
+	hash04d sha256:eeddc9f9f6cb3d6b39b861659853f10891dc373e0b6eecb09e03e39b6ce64714
+	hash01e sha256:108f521b1a74c2e6d0b52a4eda87e09162bf847f7d190cfce496ee1af0b29a5a
+	hash04f sha256:901acda0454502b3bbd281f130c419e6c8de78afcf72a8def8d45ad31462bce4
+	hash01f sha256:a2d99d1b8bf23c8af7d9d91368454adc110dfd5cc068a4cebb486ee8f5a1e16c
+	hash05g sha256:4fef015b01da8efe929a68e3bb9b8fbad81f53995f097befe8ebc93f12ab98ec
+	EOF
+
+[master (root-commit) 04ed9a0] 1st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+[master 7a4ca6e] 2nd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2nd.t
+[master d07d62e] 3rd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3rd.t
+[master 0f7aa3e] 4th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4th.t
+[master 7f9ad88] 5th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5th.t
+ok 1 - setup commits
+
+expecting success of 3310.2 'setup merge base (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "x notes on 2nd commit" 2nd &&
+	git notes add -m "x notes on 3rd commit" 3rd &&
+	git notes add -m "x notes on 4th commit" 4th &&
+	verify_notes x
+
+ok 2 - setup merge base (x)
+
+expecting success of 3310.3 'setup local branch (y)': 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	git notes add -f -m "y notes on 1st commit" 1st &&
+	git notes remove 2nd &&
+	git notes add -f -m "y notes on 3rd commit" 3rd &&
+	git notes add -f -m "y notes on 4th commit" 4th &&
+	verify_notes y
+
+Removing note for object 2nd
+Overwriting existing notes for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ok 3 - setup local branch (y)
+
+expecting success of 3310.4 'setup remote branch (z)': 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "z notes on 1st commit" 1st &&
+	git notes add -f -m "z notes on 2nd commit" 2nd &&
+	git notes remove 3rd &&
+	git notes add -f -m "z notes on 4th commit" 4th &&
+	verify_notes z
+
+Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+Removing note for object 3rd
+Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ok 4 - setup remote branch (z)
+
+expecting success of 3310.5 'merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	git update-ref refs/notes/m refs/notes/y &&
+	git config core.notesRef refs/notes/m &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 5 - merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.6 'change notes in z': 
+	git notes --ref z append -m "More z notes on 4th commit" 4th &&
+	verify_notes z
+
+ok 6 - change notes in z
+
+expecting success of 3310.7 'cannot do merge w/conflicts when previous merge is unfinished': 
+	test -d .git/NOTES_MERGE_WORKTREE &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should indicate what is wrong
+	test_grep -q "\\.git/NOTES_MERGE_\\* exists" output
+
+ok 7 - cannot do merge w/conflicts when previous merge is unfinished
+
+expecting success of 3310.8 'setup unrelated notes ref (w)': 
+	git config core.notesRef refs/notes/w &&
+	git notes add -m "w notes on 1st commit" 1st &&
+	git notes add -m "x notes on 2nd commit" 2nd &&
+	verify_notes w
+
+ok 8 - setup unrelated notes ref (w)
+
+expecting success of 3310.9 'can do merge without conflicts even if previous merge is unfinished (x => w)': 
+	test -d .git/NOTES_MERGE_WORKTREE &&
+	git notes merge x &&
+	verify_notes w &&
+	# Verify that other notes refs has not changed (x and y)
+	verify_notes x &&
+	verify_notes y
+
+ok 9 - can do merge without conflicts even if previous merge is unfinished (x => w)
+
+expecting success of 3310.10 'do not allow mixing --commit and --abort': 
+	test_must_fail git notes merge --commit --abort
+
+error: cannot mix --commit, --abort or -s/--strategy
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
+
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
+
+Aborting notes merge resolution
+    --abort               abort notes merge
+
+ok 10 - do not allow mixing --commit and --abort
+
+expecting success of 3310.11 'do not allow mixing --commit and --strategy': 
+	test_must_fail git notes merge --commit --strategy theirs
+
+error: cannot mix --commit, --abort or -s/--strategy
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
+
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
+
+Aborting notes merge resolution
+    --abort               abort notes merge
+
+ok 11 - do not allow mixing --commit and --strategy
+
+expecting success of 3310.12 'do not allow mixing --abort and --strategy': 
+	test_must_fail git notes merge --abort --strategy theirs
+
+error: cannot mix --commit, --abort or -s/--strategy
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
+
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
+
+Aborting notes merge resolution
+    --abort               abort notes merge
+
+ok 12 - do not allow mixing --abort and --strategy
+
+expecting success of 3310.13 'finalize conflicting merge (z => m)': 
+	# Resolve conflicts and finalize merge
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
+y and z notes on 1st commit
+EOF
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
+y and z notes on 4th commit
+EOF
+	git notes merge --commit &&
+	notes_merge_files_gone &&
+	# Merge commit has pre-merge y and pre-merge z as parents
+	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
+	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
+	# Merge commit mentions the notes refs merged
+	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
+	grep -q refs/notes/m merge_commit_msg &&
+	grep -q refs/notes/z merge_commit_msg &&
+	# Merge commit mentions conflicting notes
+	grep -q "Conflicts" merge_commit_msg &&
+	( for sha1 in $(cat expect_conflicts); do
+		grep -q "$sha1" merge_commit_msg ||
+		exit 1
+	done ) &&
+	# Verify contents of merge result
+	verify_notes m &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 13 - finalize conflicting merge (z => m)
+
+expecting success of 3310.14 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	git update-ref refs/notes/m refs/notes/y &&
+	git config core.notesRef refs/notes/m &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 14 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.15 'abort notes merge': 
+	git notes merge --abort &&
+	notes_merge_files_gone &&
+	# m has not moved (still == y)
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 15 - abort notes merge
+
+expecting success of 3310.16 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 16 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.17 'add + remove notes in finalized merge (z => m)': 
+	# Resolve one conflict
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
+y and z notes on 1st commit
+EOF
+	# Remove another conflict
+	rm .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
+	# Remove a D/F conflict
+	rm .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
+	# Add a new note
+	echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 &&
+	# Finalize merge
+	git notes merge --commit &&
+	notes_merge_files_gone &&
+	# Merge commit has pre-merge y and pre-merge z as parents
+	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
+	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
+	# Merge commit mentions the notes refs merged
+	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
+	grep -q refs/notes/m merge_commit_msg &&
+	grep -q refs/notes/z merge_commit_msg &&
+	# Merge commit mentions conflicting notes
+	grep -q "Conflicts" merge_commit_msg &&
+	( for sha1 in $(cat expect_conflicts); do
+		grep -q "$sha1" merge_commit_msg ||
+		exit 1
+	done ) &&
+	# Verify contents of merge result
+	verify_notes m &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 17 - add + remove notes in finalized merge (z => m)
+
+expecting success of 3310.18 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	git update-ref refs/notes/m refs/notes/y &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 18 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.19 'reset notes ref m to somewhere else (w)': 
+	git update-ref refs/notes/m refs/notes/w &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
+
+ok 19 - reset notes ref m to somewhere else (w)
+
+expecting success of 3310.20 'fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)': 
+	# Resolve conflicts
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
+y and z notes on 1st commit
+EOF
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
+y and z notes on 4th commit
+EOF
+	# Fail to finalize merge
+	test_must_fail git notes merge --commit >output 2>&1 &&
+	# NOTES_MERGE_* refs and .git/NOTES_MERGE_* state files must remain
+	git rev-parse --verify NOTES_MERGE_PARTIAL &&
+	git rev-parse --verify NOTES_MERGE_REF &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha1 &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha2 &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
+	# Refs are unchanged
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
+	test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
+	test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
+	# Mention refs/notes/m, and its current and expected value in output
+	test_grep -q "refs/notes/m" output &&
+	test_grep -q "$(git rev-parse refs/notes/m)" output &&
+	test_grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+26a551f04a7c1221699c120a3d0130f81d636003
+3147754abc2b58919a2c41c371fc0af47d45e199
+ok 20 - fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)
+
+expecting success of 3310.21 'resolve situation by aborting the notes merge': 
+	git notes merge --abort &&
+	notes_merge_files_gone &&
+	# m has not moved (still == w)
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 21 - resolve situation by aborting the notes merge
+
+expecting success of 3310.22 'switch cwd before committing notes merge': 
+	git notes add -m foo HEAD &&
+	git notes --ref=other add -m bar HEAD &&
+	test_must_fail git notes merge refs/notes/other &&
+	(
+		cd .git/NOTES_MERGE_WORKTREE &&
+		echo "foo" > $(git rev-parse HEAD) &&
+		echo "bar" >> $(git rev-parse HEAD) &&
+		git notes merge --commit
+	) &&
+	git notes show HEAD > actual_notes &&
+	test_cmp expect_notes actual_notes
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ok 22 - switch cwd before committing notes merge
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3320-notes-merge-worktrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3401-rebase-and-am-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3401-rebase-and-am-rename/.git/
+expecting success of 3401.1 'setup testcase where directory rename should be detected': 
+	test_create_repo dir-rename &&
+	(
+		cd dir-rename &&
+
+		mkdir x &&
+		test_seq  1 10 >x/a &&
+		test_seq 11 20 >x/b &&
+		test_seq 21 30 >x/c &&
+		test_write_lines a b c d e f g h i >l &&
+		git add x l &&
+		git commit -m "Initial" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv x y &&
+		git mv l letters &&
+		git commit -m "Rename x to y, l to letters" &&
+
+		git checkout B &&
+		echo j >>l &&
+		test_seq 31 40 >x/d &&
+		git add l x/d &&
+		git commit -m "Modify l, add x/d"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3401-rebase-and-am-rename/dir-rename/.git/
+[master (root-commit) 79c153a] Initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 39 insertions(+)
+ create mode 100644 l
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 x/c
+Switched to branch 'A'
+[A cc01e42] Rename x to y, l to letters
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename l => letters (100%)
+ rename {x => y}/a (100%)
+ rename {x => y}/b (100%)
+ rename {x => y}/c (100%)
+Switched to branch 'B'
+[B 6c5e67f] Modify l, add x/d
+ Author: A U Thor <author@example.com>
+ 2 files changed, 11 insertions(+)
+ create mode 100644 x/d
+ok 1 - setup testcase where directory rename should be detected
+
+expecting success of 3401.2 'rebase --interactive: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6c5e67f Modify l, add x/d
+rebase -i script before editing:
+pick 6c5e67f Modify l, add x/d
+
+rebase -i script after editing:
+pick 6c5e67f Modify l, add x/d
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 2 - rebase --interactive: directory rename detected
+
+checking known breakage of 3401.3 'rebase --apply: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout B^0 &&
+
+		git -c merge.directoryRenames=true rebase --apply A &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2e986bc Modify l, add x/d
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 2e986bc
+
+HEAD is now at 6c5e67f Modify l, add x/d
+First, rewinding head to replay your work on top of it...
+Applying: Modify l, add x/d
+Using index info to reconstruct a base tree...
+A	l
+Falling back to patching base and 3-way merge...
+Merging:
+cc01e42 Rename x to y, l to letters
+virtual Modify l, add x/d
+found 1 common ancestor:
+virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
+File y/d doesn't exist
+not ok 3 - rebase --apply: directory rename detected # TODO known breakage
+
+expecting success of 3401.4 'rebase --merge: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout B^0 &&
+
+		git -c merge.directoryRenames=true rebase --merge A &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7f699cd Modify l, add x/d
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 7f699cd
+
+HEAD is now at 6c5e67f Modify l, add x/d
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 4 - rebase --merge: directory rename detected
+
+checking known breakage of 3401.5 'am: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout A^0 &&
+
+		git format-patch -1 B &&
+
+		git -c merge.directoryRenames=true am --3way 0001*.patch &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2e986bc Modify l, add x/d
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 2e986bc
+
+HEAD is now at cc01e42 Rename x to y, l to letters
+0001-Modify-l-add-x-d.patch
+Applying: Modify l, add x/d
+Using index info to reconstruct a base tree...
+A	l
+Falling back to patching base and 3-way merge...
+Merging:
+cc01e42 Rename x to y, l to letters
+virtual Modify l, add x/d
+found 1 common ancestor:
+virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
+File y/d doesn't exist
+not ok 5 - am: directory rename detected # TODO known breakage
+
+expecting success of 3401.6 'setup testcase where directory rename should NOT be detected': 
+	test_create_repo no-dir-rename &&
+	(
+		cd no-dir-rename &&
+
+		mkdir x &&
+		test_seq  1 10 >x/a &&
+		test_seq 11 20 >x/b &&
+		test_seq 21 30 >x/c &&
+		echo original >project_info &&
+		git add x project_info &&
+		git commit -m "Initial" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo v2 >project_info &&
+		git add project_info &&
+		git commit -m "Modify project_info" &&
+
+		git checkout B &&
+		mkdir y &&
+		git mv x/c y/c &&
+		echo v1 >project_info &&
+		git add project_info &&
+		git commit -m "Rename x/c to y/c, modify project_info"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3401-rebase-and-am-rename/no-dir-rename/.git/
+[master (root-commit) 229b7b2] Initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 31 insertions(+)
+ create mode 100644 project_info
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 x/c
+Switched to branch 'A'
+[A 5e95ce3] Modify project_info
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'B'
+[B 1f2a3f5] Rename x/c to y/c, modify project_info
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename {x => y}/c (100%)
+ok 6 - setup testcase where directory rename should NOT be detected
+
+expecting success of 3401.7 'rebase --interactive: NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
+rebase -i script before editing:
+pick 1f2a3f5 Rename x/c to y/c, modify project_info
+
+rebase -i script after editing:
+pick 1f2a3f5 Rename x/c to y/c, modify project_info
+Rebasing (1/1)
Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+ok 7 - rebase --interactive: NO directory rename
+
+expecting success of 3401.8 'rebase (am): NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		test_must_fail git rebase A &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
+Rebasing (1/1)
Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+ok 8 - rebase (am): NO directory rename
+
+expecting success of 3401.9 'rebase --merge: NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		test_must_fail git rebase --merge A &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
+Rebasing (1/1)
Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+ok 9 - rebase --merge: NO directory rename
+
+expecting success of 3401.10 'am: NO directory rename': 
+	test_when_finished "git -C no-dir-rename am --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout A^0 &&
+
+		git format-patch -1 B &&
+
+		test_must_fail git am --3way 0001*.patch &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+Previous HEAD position was 1f2a3f5 Rename x/c to y/c, modify project_info
+HEAD is now at 5e95ce3 Modify project_info
+0001-Rename-x-c-to-y-c-modify-project_info.patch
+Applying: Rename x/c to y/c, modify project_info
+Using index info to reconstruct a base tree...
+M	project_info
+Falling back to patching base and 3-way merge...
+Merging:
+5e95ce3 Modify project_info
+virtual Rename x/c to y/c, modify project_info
+found 1 common ancestor:
+virtual 70041a03917eeabc905137ab5853aed716a92bc6
+Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 Rename x/c to y/c, modify project_info
+ok 10 - am: NO directory rename
+
+# still have 2 known breakage(s)
+# passed all remaining 8 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3321-notes-stripspace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3321-notes-stripspace/.git/
+expecting success of 3321.1 'setup the commit': 
+	test_commit 1st
+
+[master (root-commit) 04ed9a0] 1st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+ok 1 - setup the commit
+
+expecting success of 3321.2 'add note by editor': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add  &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+ok 2 - add note by editor
+
+expecting success of 3321.3 'add note by specifying single "-m", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 3 - add note by specifying single "-m", "--stripspace" is the default behavior
+
+expecting success of 3321.4 'add note by specifying single "-m" and "--no-stripspace" ': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}first-line${MULTI_LF}second-line
+	EOF
+
+	git notes add --no-stripspace \
+		      -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 4 - add note by specifying single "-m" and "--no-stripspace" 
+
+expecting success of 3321.5 'add note by specifying multiple "-m", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}" \
+		      -m "first-line" \
+		      -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -m "${LF}" \
+		      -m "first-line" \
+		      -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 5 - add note by specifying multiple "-m", "--stripspace" is the default behavior
+
+expecting success of 3321.6 'add notes by specifying multiple "-m" and "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line${LF}
+	EOF
+
+	git notes add --no-stripspace \
+		      -m "${LF}" \
+		      -m "first-line" \
+		      -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 6 - add notes by specifying multiple "-m" and "--no-stripspace"
+
+expecting success of 3321.7 'add note by specifying single "-F", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	cat >note-file <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	git notes add -F note-file &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -F note-file &&
+	git notes show >actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 7 - add note by specifying single "-F", "--stripspace" is the default behavior
+
+expecting success of 3321.8 'add note by specifying single "-F" and "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	cat >note-file <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	git notes add --no-stripspace -F note-file &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 8 - add note by specifying single "-F" and "--no-stripspace"
+
+expecting success of 3321.9 'add note by specifying multiple "-F", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	file-1-first-line
+
+	file-1-second-line
+
+	file-2-first-line
+
+	file-2-second-line
+	EOF
+
+	cat >note-file-1 <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+	EOF
+
+	cat >note-file-2 <<-EOF &&
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	git notes add -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 9 - add note by specifying multiple "-F", "--stripspace" is the default behavior
+
+expecting success of 3321.10 'add note by specifying multiple "-F" with "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	cat >note-file-1 <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+	EOF
+
+	cat >note-file-2 <<-EOF &&
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	git notes add --no-stripspace -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 10 - add note by specifying multiple "-F" with "--no-stripspace"
+
+expecting success of 3321.11 'append note by editor': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "first-line" &&
+	MSG="${MULTI_LF}second-line${LF}" git notes append  &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+
+
+second-line
+
+Removing note for object HEAD
+ok 11 - append note by editor
+
+expecting success of 3321.12 'append note by specifying single "-m"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}first-line" &&
+	git notes append -m "${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 12 - append note by specifying single "-m"
+
+expecting success of 3321.13 'append note by specifying multiple "-m"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}first-line" &&
+	git notes append -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 13 - append note by specifying multiple "-m"
+
+expecting success of 3321.14 'add note by specifying single "-F"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	cat >note-file <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	git notes add -F note-file &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 14 - add note by specifying single "-F"
+
+expecting success of 3321.15 'add notes by specifying multiple "-F"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	file-1-first-line
+
+	file-1-second-line
+
+	file-2-first-line
+
+	file-2-second-line
+	EOF
+
+	cat >note-file-1 <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+	EOF
+
+	cat >note-file-2 <<-EOF &&
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	git notes add -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 15 - add notes by specifying multiple "-F"
+
+expecting success of 3321.16 'append note by specifying single "-F"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	initial-line
+
+	first-line
+
+	second-line
+	EOF
+
+	cat >note-file <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	git notes add -m "initial-line" &&
+	git notes append -F note-file &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 16 - append note by specifying single "-F"
+
+expecting success of 3321.17 'append notes by specifying multiple "-F"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	initial-line
+
+	file-1-first-line
+
+	file-1-second-line
+
+	file-2-first-line
+
+	file-2-second-line
+	EOF
+
+	cat >note-file-1 <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+	EOF
+
+	cat >note-file-2 <<-EOF &&
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	git notes add -m "initial-line" &&
+	git notes append -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 17 - append notes by specifying multiple "-F"
+
+expecting success of 3321.18 'append note by specifying multiple "-F" with "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	initial-line
+	${LF}${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	cat >note-file-1 <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+	EOF
+
+	cat >note-file-2 <<-EOF &&
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	git notes add -m "initial-line" &&
+	git notes append --no-stripspace -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 18 - append note by specifying multiple "-F" with "--no-stripspace"
+
+expecting success of 3321.19 'add notes with empty messages': 
+	rev=$(git rev-parse HEAD) &&
+	git notes add -m "${LF}" \
+		      -m "${MULTI_LF}" \
+		      -m "${LF}" >actual 2>&1 &&
+	test_grep "Removing note for object" actual
+
+Removing note for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+ok 19 - add notes with empty messages
+
+expecting success of 3321.20 'add note by specifying "-C", "--no-stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	git hash-object -w --stdin <expect >blob &&
+	git notes add -C $(cat blob) &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --no-stripspace -C $(cat blob) &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 20 - add note by specifying "-C", "--no-stripspace" is the default behavior
+
+expecting success of 3321.21 'reuse note by specifying "-C" and "--stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >data <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git hash-object -w --stdin <data >blob &&
+	git notes add --stripspace -C $(cat blob) &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 21 - reuse note by specifying "-C" and "--stripspace"
+
+expecting success of 3321.22 'reuse with "-C" and add note with "-m", "-m" will stripspace all together': 
+	test_when_finished "git notes remove" &&
+	cat >data <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+
+	third-line
+	EOF
+
+	git hash-object -w --stdin <data >blob &&
+	git notes add -C $(cat blob) -m "third-line" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 22 - reuse with "-C" and add note with "-m", "-m" will stripspace all together
+
+expecting success of 3321.23 'add note with "-m" and reuse note with "-C", "-C" will not stripspace all together': 
+	test_when_finished "git notes remove" &&
+	cat >data <<-EOF &&
+
+	second-line
+	EOF
+
+	cat >expect <<-EOF &&
+	first-line
+	${LF}
+	second-line
+	EOF
+
+	git hash-object -w --stdin <data >blob &&
+	git notes add -m "first-line" -C $(cat blob)  &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 23 - add note with "-m" and reuse note with "-C", "-C" will not stripspace all together
+
+expecting success of 3321.24 'add note by specifying "-c", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	echo "initial-line" | git hash-object -w --stdin >blob &&
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add -c $(cat blob) &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add --stripspace -c $(cat blob) &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+ok 24 - add note by specifying "-c", "--stripspace" is the default behavior
+
+expecting success of 3321.25 'add note by specifying "-c" with "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}first-line${MULTI_LF}second-line${LF}
+	EOF
+
+	echo "initial-line" | git hash-object -w --stdin >blob &&
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add --no-stripspace -c $(cat blob) &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+ok 25 - add note by specifying "-c" with "--no-stripspace"
+
+expecting success of 3321.26 'edit note by specifying "-c", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes edit &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes edit --stripspace &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+ok 26 - edit note by specifying "-c", "--stripspace" is the default behavior
+
+expecting success of 3321.27 'edit note by specifying "-c" with "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}first-line${MULTI_LF}second-line${LF}
+	EOF
+
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add --no-stripspace &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+ok 27 - edit note by specifying "-c" with "--no-stripspace"
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3402-rebase-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3402-rebase-merge/.git/
+expecting success of 3402.1 'setup': 
+	git add original &&
+	git commit -m"initial" &&
+	git branch side &&
+	echo "11 $T" >>original &&
+	git commit -a -m"main updates a bit." &&
+
+	echo "12 $T" >>original &&
+	git commit -a -m"main updates a bit more." &&
+
+	git checkout side &&
+	(echo "0 $T" && cat original) >renamed &&
+	git add renamed &&
+	git update-index --force-remove original &&
+	git commit -a -m"side renames and edits." &&
+
+	tr "[a-z]" "[A-Z]" <original >newfile &&
+	git add newfile &&
+	git commit -a -m"side edits further." &&
+	git branch second-side &&
+
+	tr "[a-m]" "[A-M]" <original >newfile &&
+	rm -f original &&
+	git commit -a -m"side edits once again." &&
+
+	git branch test-rebase side &&
+	git branch test-rebase-pick side &&
+	git branch test-reference-pick side &&
+	git branch test-conflicts side &&
+	git checkout -b test-merge side
+
+[main (root-commit) ea140ad] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+)
+ create mode 100644 original
+[main 3fbedc5] main updates a bit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[main 9d5d029] main updates a bit more.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'side'
+[side 2f3019a] side renames and edits.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename original => renamed (90%)
+[side e99fe16] side edits further.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+)
+ create mode 100644 newfile
+[side 5203c39] side edits once again.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+Switched to a new branch 'test-merge'
+ok 1 - setup
+
+expecting success of 3402.2 'reference merge': 
+	git merge -s recursive -m "reference merge" main
+
+Auto-merging renamed
+Merge made by the 'ort' strategy.
+ renamed | 4 ++++
+ 1 file changed, 4 insertions(+)
+ok 2 - reference merge
+
+expecting success of 3402.3 'rebase': 
+	git checkout test-rebase &&
+	GIT_TRACE=1 git rebase --merge main
+
+Switched to branch 'test-rebase'
+trace: built-in: git rebase --merge main
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
trace: run_command: git notes copy --for-rewrite=rebase
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' notes copy --for-rewrite=rebase
+trace: built-in: git notes copy --for-rewrite=rebase
+Successfully rebased and updated refs/heads/test-rebase.
+ok 3 - rebase
+
+expecting success of 3402.4 'test-rebase@{1} is pre rebase': 
+	test $PRE_REBASE = $(git rev-parse test-rebase@{1})
+
+ok 4 - test-rebase@{1} is pre rebase
+
+expecting success of 3402.5 'merge and rebase should match': 
+	git diff-tree -r test-rebase test-merge >difference &&
+	if test -s difference
+	then
+		cat difference
+		false
+	else
+		echo happy
+	fi
+
+happy
+ok 5 - merge and rebase should match
+
+expecting success of 3402.6 'rebase the other way': 
+	git reset --hard main &&
+	git rebase --merge side
+
+HEAD is now at 9d5d029 main updates a bit more.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test-rebase.
+ok 6 - rebase the other way
+
+expecting success of 3402.7 'rebase -Xtheirs': 
+	git checkout -b conflicting main~2 &&
+	echo "AB $T" >> original &&
+	git commit -mconflicting original &&
+	git rebase -Xtheirs main &&
+	grep AB original &&
+	! grep 11 original
+
+Switched to a new branch 'conflicting'
+[conflicting 0a8644e] conflicting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Rebasing (1/1)
Successfully rebased and updated refs/heads/conflicting.
+AB A quick brown fox
+ok 7 - rebase -Xtheirs
+
+expecting success of 3402.8 'rebase -Xtheirs from orphan': 
+	git checkout --orphan orphan-conflicting main~2 &&
+	echo "AB $T" >> original &&
+	git commit -morphan-conflicting original &&
+	git rebase -Xtheirs main &&
+	grep AB original &&
+	! grep 11 original
+
+Switched to a new branch 'orphan-conflicting'
+[orphan-conflicting (root-commit) 9b6ca42] orphan-conflicting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 22 insertions(+)
+ create mode 100644 original
+Rebasing (1/1)
Successfully rebased and updated refs/heads/orphan-conflicting.
+AB A quick brown fox
+ok 8 - rebase -Xtheirs from orphan
+
+expecting success of 3402.9 'merge and rebase should match': 
+	git diff-tree -r test-rebase test-merge >difference &&
+	if test -s difference
+	then
+		cat difference
+		false
+	else
+		echo happy
+	fi
+
+happy
+ok 9 - merge and rebase should match
+
+expecting success of 3402.10 'picking rebase': 
+	git reset --hard side &&
+	git rebase --merge --onto main side^^ &&
+	mb=$(git merge-base main HEAD) &&
+	if test "$mb" = "$(git rev-parse main)"
+	then
+		echo happy
+	else
+		git show-branch
+		false
+	fi &&
+	f=$(git diff-tree --name-only HEAD^ HEAD) &&
+	g=$(git diff-tree --name-only HEAD^^ HEAD^) &&
+	case "$f,$g" in
+	newfile,newfile)
+		echo happy ;;
+	*)
+		echo "$f"
+		echo "$g"
+		false
+	esac
+
+HEAD is now at 5203c39 side edits once again.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/orphan-conflicting.
+happy
+happy
+ok 10 - picking rebase
+
+expecting success of 3402.11 'rebase --skip works with two conflicts in a row': 
+	git checkout second-side  &&
+	tr "[A-Z]" "[a-z]" <newfile >tmp &&
+	mv tmp newfile &&
+	git commit -a -m"edit conflicting with side" &&
+	tr "[d-f]" "[D-F]" <newfile >tmp &&
+	mv tmp newfile &&
+	git commit -a -m"another edit conflicting with side" &&
+	test_must_fail git rebase --merge test-conflicts &&
+	test_must_fail git rebase --skip &&
+	git rebase --skip
+
+Switched to branch 'second-side'
+[second-side 546296f] edit conflicting with side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+[second-side 896ca60] another edit conflicting with side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+Rebasing (1/2)
Auto-merging newfile
+CONFLICT (content): Merge conflict in newfile
+error: could not apply 546296f... edit conflicting with side
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 546296f... edit conflicting with side
+Rebasing (2/2)
Auto-merging newfile
+CONFLICT (content): Merge conflict in newfile
+error: could not apply 896ca60... another edit conflicting with side
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 896ca60... another edit conflicting with side
+Successfully rebased and updated refs/heads/second-side.
+ok 11 - rebase --skip works with two conflicts in a row
+
+expecting success of 3402.12 '--reapply-cherry-picks': 
+	git init repo &&
+
+	# O(1-10) -- O(1-11) -- O(0-10) main
+	#        \
+	#         -- O(1-11) -- O(1-12) otherbranch
+
+	printf "Line %d\n" $(test_seq 1 10) >repo/file.txt &&
+	git -C repo add file.txt &&
+	git -C repo commit -m "base commit" &&
+
+	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+	git -C repo commit -a -m "add 11" &&
+
+	printf "Line %d\n" $(test_seq 0 10) >repo/file.txt &&
+	git -C repo commit -a -m "add 0 delete 11" &&
+
+	git -C repo checkout -b otherbranch HEAD^^ &&
+	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+	git -C repo commit -a -m "add 11 in another branch" &&
+
+	printf "Line %d\n" $(test_seq 1 12) >repo/file.txt &&
+	git -C repo commit -a -m "add 12 in another branch" &&
+
+	# Regular rebase fails, because the 1-11 commit is deduplicated
+	test_must_fail git -C repo rebase --merge main 2> err &&
+	test_grep "error: could not apply.*add 12 in another branch" err &&
+	git -C repo rebase --abort &&
+
+	# With --reapply-cherry-picks, it works
+	git -C repo rebase --merge --reapply-cherry-picks main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3402-rebase-merge/repo/.git/
+[main (root-commit) 501a156] base commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 file.txt
+[main c19c7b3] add 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 841ae2b] add 0 delete 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'otherbranch'
+[otherbranch a7517c6] add 11 in another branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[otherbranch e4b3c77] add 12 in another branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Auto-merging file.txt
+CONFLICT (content): Merge conflict in file.txt
+Rebasing (1/1)
error: could not apply e4b3c77... add 12 in another branch
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/otherbranch.
+ok 12 - --reapply-cherry-picks
+
+expecting success of 3402.13 '--reapply-cherry-picks refrains from reading unneeded blobs': 
+	git init server &&
+
+	# O(1-10) -- O(1-11) -- O(1-12) main
+	#        \
+	#         -- O(0-10) otherbranch
+
+	printf "Line %d\n" $(test_seq 1 10) >server/file.txt &&
+	git -C server add file.txt &&
+	git -C server commit -m "merge base" &&
+
+	printf "Line %d\n" $(test_seq 1 11) >server/file.txt &&
+	git -C server commit -a -m "add 11" &&
+
+	printf "Line %d\n" $(test_seq 1 12) >server/file.txt &&
+	git -C server commit -a -m "add 12" &&
+
+	git -C server checkout -b otherbranch HEAD^^ &&
+	printf "Line %d\n" $(test_seq 0 10) >server/file.txt &&
+	git -C server commit -a -m "add 0" &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	git -C client checkout origin/main &&
+	git -C client checkout origin/otherbranch &&
+
+	# Sanity check to ensure that the blobs from the merge base and "add
+	# 11" are missing
+	git -C client rev-list --objects --all --missing=print >missing_list &&
+	MERGE_BASE_BLOB=$(git -C server rev-parse main^^:file.txt) &&
+	ADD_11_BLOB=$(git -C server rev-parse main^:file.txt) &&
+	grep "[?]$MERGE_BASE_BLOB" missing_list &&
+	grep "[?]$ADD_11_BLOB" missing_list &&
+
+	git -C client rebase --merge --reapply-cherry-picks origin/main &&
+
+	# The blob from the merge base had to be fetched, but not "add 11"
+	git -C client rev-list --objects --all --missing=print >missing_list &&
+	! grep "[?]$MERGE_BASE_BLOB" missing_list &&
+	grep "[?]$ADD_11_BLOB" missing_list
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3402-rebase-merge/server/.git/
+[main (root-commit) ded066b] merge base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 file.txt
+[main c684029] add 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 161081c] add 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'otherbranch'
+[otherbranch ffb36e9] add 0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Cloning into 'client'...
+Note: switching to 'origin/main'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 161081c add 12
+Previous HEAD position was 161081c add 12
+HEAD is now at ffb36e9 add 0
+?00935f183cbd9243998bd3f84ac67e18eff726a4
+?8bf8891e216480d36945027a1d30bdbba5c96d90
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+?8bf8891e216480d36945027a1d30bdbba5c96d90
+ok 13 - --reapply-cherry-picks refrains from reading unneeded blobs
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3405-rebase-malformed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3405-rebase-malformed/.git/
+expecting success of 3405.1 'setup': 
+
+	>file1 &&
+	>file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m "Initial commit" &&
+	git branch diff-in-message &&
+	git branch empty-message-merge &&
+
+	git checkout -b multi-line-subject &&
+	cat F >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -F F &&
+
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
+
+	git checkout diff-in-message &&
+	echo "commit log message containing a diff" >G &&
+	echo "" >>G &&
+	cat G >file2 &&
+	git add file2 &&
+	git diff --cached >>G &&
+	test_tick &&
+	git commit -F G &&
+
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 &&
+
+	git checkout empty-message-merge &&
+	echo file3 >file3 &&
+	git add file3 &&
+	git commit --allow-empty-message -m "" &&
+
+	git checkout main &&
+
+	echo One >file1 &&
+	test_tick &&
+	git add file1 &&
+	git commit -m "Second commit"
+
+[main (root-commit) a8d727e] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'multi-line-subject'
+[multi-line-subject 5037af6] This is an example of a commit log message that does not  conform to git commit convention.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Switched to branch 'diff-in-message'
+[diff-in-message 132c17c] commit log message containing a diff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'empty-message-merge'
+[empty-message-merge 942c0ff] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to branch 'main'
+[main d5181bc] Second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3405.2 'rebase commit with multi-line subject': 
+
+	git rebase main multi-line-subject &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
+
+	test_cmp F0 F1 &&
+	test_cmp F F0
+
+Rebasing (1/1)
Successfully rebased and updated refs/heads/multi-line-subject.
+ok 2 - rebase commit with multi-line subject
+
+expecting success of 3405.3 'rebase commit with diff in message': 
+	git rebase main diff-in-message &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >G1 &&
+	test_cmp G0 G1 &&
+	test_cmp G G0
+
+Rebasing (1/1)
Successfully rebased and updated refs/heads/diff-in-message.
+ok 3 - rebase commit with diff in message
+
+expecting success of 3405.4 'rebase -m commit with empty message': 
+	git rebase -m main empty-message-merge
+
+Rebasing (1/1)
Successfully rebased and updated refs/heads/empty-message-merge.
+ok 4 - rebase -m commit with empty message
+
+expecting success of 3405.5 'rebase -i commit with empty message': 
+	git checkout diff-in-message &&
+	set_fake_editor &&
+	test_must_fail env FAKE_COMMIT_MESSAGE=" " FAKE_LINES="reword 1" \
+		git rebase -i HEAD^
+
+Switched to branch 'diff-in-message'
+rebase -i script before editing:
+pick 87b000b commit log message containing a diff
+
+rebase -i script after editing:
+reword 87b000b commit log message containing a diff
+Rebasing (1/1)
Aborting commit due to empty commit message.
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+ok 5 - rebase -i commit with empty message
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3403-rebase-skip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3403-rebase-skip/.git/
+expecting success of 3403.1 'setup': 
+	echo hello > hello &&
+	git add hello &&
+	git commit -m "hello" &&
+	git branch skip-reference &&
+	git tag hello &&
+
+	echo world >> hello &&
+	git commit -a -m "hello world" &&
+	echo goodbye >> hello &&
+	git commit -a -m "goodbye" &&
+	git tag goodbye &&
+
+	git checkout --detach &&
+	git checkout HEAD^ . &&
+	test_tick &&
+	git commit -m reverted-goodbye &&
+	git tag reverted-goodbye &&
+	git checkout goodbye &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Another Author" \
+		GIT_AUTHOR_EMAIL="another.author@example.com" \
+		git commit --amend --no-edit -m amended-goodbye \
+			--reset-author &&
+	test_tick &&
+	git tag amended-goodbye &&
+
+	git checkout -f skip-reference &&
+	echo moo > hello &&
+	git commit -a -m "we should skip this" &&
+	echo moo > cow &&
+	git add cow &&
+	git commit -m "this should not be skipped" &&
+	git branch pre-rebase skip-reference &&
+	git branch skip-merge skip-reference
+	
+[main (root-commit) 7b3be24] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+[main 5a0b053] hello world
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 64bec18] goodbye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+HEAD is now at 64bec18 goodbye
+Updated 1 path from f7e12fd
+[detached HEAD 1f15beb] reverted-goodbye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Previous HEAD position was 1f15beb reverted-goodbye
+HEAD is now at 64bec18 goodbye
+[detached HEAD d66ccab] amended-goodbye
+ Author: Another Author <another.author@example.com>
+ 1 file changed, 1 insertion(+)
+Previous HEAD position was d66ccab amended-goodbye
+Switched to branch 'skip-reference'
+[skip-reference 847c4cd] we should skip this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[skip-reference c443746] this should not be skipped
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cow
+ok 1 - setup
+
+expecting success of 3403.2 'rebase with git am -3 (default)': 
+	test_must_fail git rebase --apply main
+
+First, rewinding head to replay your work on top of it...
+Applying: we should skip this
+Using index info to reconstruct a base tree...
+M	hello
+Falling back to patching base and 3-way merge...
+Merging:
+64bec18 goodbye
+virtual we should skip this
+found 1 common ancestor:
+virtual b4d01e9b0c4a9356736dfddf8830ba9a54f5271c
+Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 we should skip this
+ok 2 - rebase with git am -3 (default)
+
+expecting success of 3403.3 'rebase --skip can not be used with other options': 
+	test_must_fail git rebase -v --skip &&
+	test_must_fail git rebase --skip -v
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 3 - rebase --skip can not be used with other options
+
+expecting success of 3403.4 'rebase --skip with am -3': 
+	git rebase --skip
+	
+Applying: this should not be skipped
+ok 4 - rebase --skip with am -3
+
+expecting success of 3403.5 'rebase moves back to skip-reference': 
+	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
+	git branch post-rebase &&
+	git reset --hard pre-rebase &&
+	test_must_fail git rebase main &&
+	echo "hello" > hello &&
+	git add hello &&
+	git rebase --continue &&
+	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
+	git reset --hard post-rebase
+
+HEAD is now at c443746 this should not be skipped
+Rebasing (1/2)
Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+error: could not apply 847c4cd... we should skip this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 847c4cd... we should skip this
+[detached HEAD 0283955] we should skip this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-reference.
+HEAD is now at 86a691d this should not be skipped
+ok 5 - rebase moves back to skip-reference
+
+expecting success of 3403.6 'checkout skip-merge': git checkout -f skip-merge
+Switched to branch 'skip-merge'
+ok 6 - checkout skip-merge
+
+expecting success of 3403.7 'rebase with --merge': 
+	test_must_fail git rebase --merge main
+
+Rebasing (1/2)
Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+error: could not apply 847c4cd... we should skip this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 847c4cd... we should skip this
+ok 7 - rebase with --merge
+
+expecting success of 3403.8 'rebase --skip with --merge': 
+	git rebase --skip
+
+Rebasing (2/2)
Successfully rebased and updated refs/heads/skip-merge.
+ok 8 - rebase --skip with --merge
+
+expecting success of 3403.9 'merge and reference trees equal': 
+	test -z "$(git diff-tree skip-merge skip-reference)"
+
+ok 9 - merge and reference trees equal
+
+expecting success of 3403.10 'moved back to branch correctly': 
+	test refs/heads/skip-merge = $(git symbolic-ref HEAD)
+
+ok 10 - moved back to branch correctly
+
+expecting success of 3403.11 'skipping final pick removes .git/MERGE_MSG': 
+	test_must_fail git rebase --onto hello reverted-goodbye^ \
+		reverted-goodbye &&
+	git rebase --skip &&
+	test_path_is_missing .git/MERGE_MSG
+
+Rebasing (1/1)
Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+error: could not apply 1f15beb... reverted-goodbye
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1f15beb... reverted-goodbye
+Successfully rebased and updated detached HEAD.
+ok 11 - skipping final pick removes .git/MERGE_MSG
+
+expecting success of 3403.12 'correct advice upon picking empty commit': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -i --onto goodbye \
+		amended-goodbye^ amended-goodbye 2>err &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_grep "git rebase --skip" err
+
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git rebase --skip'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   pick d66ccab amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git rebase --skip'
+ok 12 - correct advice upon picking empty commit
+
+expecting success of 3403.13 'correct authorship when committing empty pick': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -i --onto goodbye \
+		amended-goodbye^ amended-goodbye &&
+	git commit --allow-empty &&
+	git log --pretty=format:"%an <%ae>%n%ad%B" -1 amended-goodbye >expect &&
+	git log --pretty=format:"%an <%ae>%n%ad%B" -1 HEAD >actual &&
+	test_cmp expect actual
+
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   pick d66ccab amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply d66ccab... amended-goodbye
+[detached HEAD 046fc51] amended-goodbye
+ Author: Another Author <another.author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ok 13 - correct authorship when committing empty pick
+
+expecting success of 3403.14 'correct advice upon rewording empty commit': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="reword 1" git rebase -i \
+			--onto goodbye amended-goodbye^ amended-goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_grep "git rebase --skip" err
+
+rebase -i script before editing:
+pick d66ccab amended-goodbye
+
+rebase -i script after editing:
+reword d66ccab amended-goodbye
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git rebase --skip'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   reword d66ccab amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git rebase --skip'
+ok 14 - correct advice upon rewording empty commit
+
+expecting success of 3403.15 'correct advice upon editing empty commit': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="edit 1" git rebase -i \
+			--onto goodbye amended-goodbye^ amended-goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_grep "git rebase --skip" err
+
+rebase -i script before editing:
+pick d66ccab amended-goodbye
+
+rebase -i script after editing:
+edit d66ccab amended-goodbye
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git rebase --skip'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 64bec18
+Last command done (1 command done):
+   edit d66ccab amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git rebase --skip'
+ok 15 - correct advice upon editing empty commit
+
+expecting success of 3403.16 'correct advice upon cherry-picking an empty commit during a rebase': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \
+			git rebase -i goodbye^ goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git cherry-pick --skip" err &&
+	test_must_fail git commit 2>err &&
+	test_grep "git cherry-pick --skip" err
+
+rebase -i script before editing:
+pick 64bec18 goodbye
+
+rebase -i script after editing:
+pick 64bec18 goodbye
+exec git cherry-pick amended-goodbye
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 goodbye
+   exec git cherry-pick amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git cherry-pick --skip'
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 goodbye
+   exec git cherry-pick amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git cherry-pick --skip'
+ok 16 - correct advice upon cherry-picking an empty commit during a rebase
+
+expecting success of 3403.17 'correct advice upon multi cherry-pick picking an empty commit during a rebase': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \
+			git rebase -i goodbye^^ goodbye 2>err
+	) &&
+	test_grep "previous cherry-pick is now empty" err &&
+	test_grep "git cherry-pick --skip" err &&
+	test_must_fail git commit 2>err &&
+	test_grep "git cherry-pick --skip" err
+
+rebase -i script before editing:
+pick 5a0b053 hello world
+pick 64bec18 goodbye
+
+rebase -i script after editing:
+pick 5a0b053 hello world
+exec git cherry-pick goodbye amended-goodbye
+[detached HEAD 67e8618] goodbye
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+interactive rebase in progress; onto 7b3be24
+Last commands done (2 commands done):
+   pick 5a0b053 hello world
+   exec git cherry-pick goodbye amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+Otherwise, please use 'git cherry-pick --skip'
+interactive rebase in progress; onto 7b3be24
+Last commands done (2 commands done):
+   pick 5a0b053 hello world
+   exec git cherry-pick goodbye amended-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+nothing added to commit but untracked files present (use "git add" to track)
+Otherwise, please use 'git cherry-pick --skip'
+ok 17 - correct advice upon multi cherry-pick picking an empty commit during a rebase
+
+expecting success of 3403.18 'fixup that empties commit fails': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+
+rebase -i script before editing:
+pick 64bec18 goodbye
+pick 1f15beb reverted-goodbye
+
+rebase -i script after editing:
+pick 64bec18 goodbye
+fixup 1f15beb reverted-goodbye
+Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
+it empty. You can repeat your command with --allow-empty, or you can
+remove the commit entirely with "git reset HEAD^".
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 goodbye
+   fixup 1f15beb reverted-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+No changes
+Could not apply 1f15beb... reverted-goodbye
+ok 18 - fixup that empties commit fails
+
+expecting success of 3403.19 'squash that empties commit fails': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+
+rebase -i script before editing:
+pick 64bec18 goodbye
+pick 1f15beb reverted-goodbye
+
+rebase -i script after editing:
+pick 64bec18 goodbye
+squash 1f15beb reverted-goodbye
+Rebasing (2/2)
You asked to amend the most recent commit, but doing so would make
+it empty. You can repeat your command with --allow-empty, or you can
+remove the commit entirely with "git reset HEAD^".
+interactive rebase in progress; onto 5a0b053
+Last commands done (2 commands done):
+   pick 64bec18 goodbye
+   squash 1f15beb reverted-goodbye
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
+
+No changes
+Could not apply 1f15beb... reverted-goodbye
+ok 19 - squash that empties commit fails
+
+expecting success of 3403.20 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 20 - $EDITOR and friends are unchanged
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3400-rebase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/.git/
+expecting success of 3400.1 'prepare repository with topic branches': 
+	test_commit "Add A." A First First &&
+	git checkout -b force-3way &&
+	echo Dummy >Y &&
+	git update-index --add Y &&
+	git commit -m "Add Y." &&
+	git checkout -b filemove &&
+	git reset --soft main &&
+	mkdir D &&
+	git mv A D/A &&
+	git commit -m "Move A." &&
+	git checkout -b my-topic-branch main &&
+	test_commit "Add B." B Second Second &&
+	git checkout -f main &&
+	echo Third >>A &&
+	git update-index A &&
+	git commit -m "Modify A." &&
+	git checkout -b side my-topic-branch &&
+	echo Side >>C &&
+	git add C &&
+	git commit -m "Add C" &&
+	git checkout -f my-topic-branch &&
+	git tag topic
+
+[main (root-commit) fefbb15] Add A.
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'force-3way'
+[force-3way 779feee] Add Y.
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Y
+Switched to a new branch 'filemove'
+[filemove 4b62ea1] Move A.
+ Author: author@name <bogus@email@address>
+ 2 files changed, 1 insertion(+)
+ rename A => D/A (100%)
+ create mode 100644 Y
+Switched to a new branch 'my-topic-branch'
+[my-topic-branch 5d79b4b] Add B.
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to branch 'main'
+[main 79095e6] Modify A.
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'side'
+[side af81839] Add C
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+Switched to branch 'my-topic-branch'
+ok 1 - prepare repository with topic branches
+
+expecting success of 3400.2 'rebase on dirty worktree': 
+	echo dirty >>A &&
+	test_must_fail git rebase main
+
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+ok 2 - rebase on dirty worktree
+
+expecting success of 3400.3 'rebase on dirty cache': 
+	git add A &&
+	test_must_fail git rebase main
+
+error: cannot rebase: Your index contains uncommitted changes.
+error: Please commit or stash them.
+ok 3 - rebase on dirty cache
+
+expecting success of 3400.4 'rebase against main': 
+	git reset --hard HEAD &&
+	git rebase main
+
+HEAD is now at 5d79b4b Add B.
+Rebasing (1/1)
Successfully rebased and updated refs/heads/my-topic-branch.
+ok 4 - rebase against main
+
+expecting success of 3400.5 'rebase sets ORIG_HEAD to pre-rebase state': 
+	git checkout -b orig-head topic &&
+	pre="$(git rev-parse --verify HEAD)" &&
+	git rebase main &&
+	test_cmp_rev "$pre" ORIG_HEAD &&
+	test_cmp_rev ! "$pre" HEAD
+
+Switched to a new branch 'orig-head'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/orig-head.
+ok 5 - rebase sets ORIG_HEAD to pre-rebase state
+
+expecting success of 3400.6 'rebase, with <onto> and <upstream> specified as :/quuxery': 
+	test_when_finished "git branch -D torebase" &&
+	git checkout -b torebase my-topic-branch^ &&
+	upstream=$(git rev-parse ":/Add B") &&
+	onto=$(git rev-parse ":/Add A") &&
+	git rebase --onto $onto $upstream &&
+	git reset --hard my-topic-branch^ &&
+	git rebase --onto ":/Add A" ":/Add B" &&
+	git checkout my-topic-branch
+
+Switched to a new branch 'torebase'
+Current branch torebase is up to date.
+HEAD is now at 79095e6 Modify A.
+Current branch torebase is up to date.
+Switched to branch 'my-topic-branch'
+Deleted branch torebase (was 79095e6).
+ok 6 - rebase, with <onto> and <upstream> specified as :/quuxery
+
+expecting success of 3400.7 'the rebase operation should not have destroyed author information': 
+	! (git log | grep "Author:" | grep "<>")
+
+ok 7 - the rebase operation should not have destroyed author information
+
+expecting success of 3400.8 'the rebase operation should not have destroyed author information (2)': 
+	git log -1 |
+	grep 'Author: author@name <bogus@email@address>'
+
+Author: author@name <bogus@email@address>
+ok 8 - the rebase operation should not have destroyed author information (2)
+
+expecting success of 3400.9 'HEAD was detached during rebase': 
+	test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
+
+ok 9 - HEAD was detached during rebase
+
+expecting success of 3400.10 'rebase from ambiguous branch name': 
+	git checkout -b topic side &&
+	git rebase main
+
+Switched to a new branch 'topic'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/topic.
+ok 10 - rebase from ambiguous branch name
+
+expecting success of 3400.11 'rebase off of the previous branch using "-"': 
+	git checkout main &&
+	git checkout HEAD^ &&
+	git rebase @{-1} >expect.messages &&
+	git merge-base main HEAD >expect.forkpoint &&
+
+	git checkout main &&
+	git checkout HEAD^ &&
+	git rebase - >actual.messages &&
+	git merge-base main HEAD >actual.forkpoint &&
+
+	test_cmp expect.forkpoint actual.forkpoint &&
+	# the next one is dubious---we may want to say "-",
+	# instead of @{-1}, in the message
+	test_cmp expect.messages actual.messages
+
+Switched to branch 'main'
+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 fefbb15 Add A.
+Successfully rebased and updated detached HEAD.
+Switched to branch 'main'
+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 fefbb15 Add A.
+Successfully rebased and updated detached HEAD.
+ok 11 - rebase off of the previous branch using "-"
+
+expecting success of 3400.12 'rebase a single mode change': 
+	git checkout main &&
+	git branch -D topic &&
+	echo 1 >X &&
+	git add X &&
+	test_tick &&
+	git commit -m prepare &&
+	git checkout -b modechange HEAD^ &&
+	echo 1 >X &&
+	git add X &&
+	test_chmod +x A &&
+	test_tick &&
+	git commit -m modechange &&
+	GIT_TRACE=1 git rebase main
+
+Switched to branch 'main'
+Deleted branch topic (was 93c5c54).
+[main 1fb901f] prepare
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 X
+Switched to a new branch 'modechange'
+[modechange 0e9b7fa] modechange
+ Author: author@name <bogus@email@address>
+ 2 files changed, 1 insertion(+)
+ mode change 100644 => 100755 A
+ create mode 100644 X
+trace: built-in: git rebase main
+Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' notes copy --for-rewrite=rebase
+trace: built-in: git notes copy --for-rewrite=rebase
+Successfully rebased and updated refs/heads/modechange.
+ok 12 - rebase a single mode change
+
+expecting success of 3400.13 'rebase is not broken by diff.renames': 
+	test_config diff.renames copies &&
+	git checkout filemove &&
+	GIT_TRACE=1 git rebase force-3way
+
+Switched to branch 'filemove'
+trace: built-in: git rebase force-3way
+Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' notes copy --for-rewrite=rebase
+trace: built-in: git notes copy --for-rewrite=rebase
+Successfully rebased and updated refs/heads/filemove.
+ok 13 - rebase is not broken by diff.renames
+
+expecting success of 3400.14 'setup: recover': 
+	test_might_fail git rebase --abort &&
+	git reset --hard &&
+	git checkout modechange
+
+fatal: no rebase in progress
+HEAD is now at 6359119 Move A.
+Switched to branch 'modechange'
+ok 14 - setup: recover
+
+expecting success of 3400.15 'Show verbose error when HEAD could not be detached': 
+	>B &&
+	test_when_finished "rm -f B" &&
+	test_must_fail git rebase topic 2>output.err >output.out &&
+	test_grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
+	test_grep B output.err &&
+	test_must_fail git rebase --quit 2>err &&
+	test_grep "no rebase in progress" err
+
+error: The following untracked working tree files would be overwritten by checkout:
+	B
+fatal: no rebase in progress
+ok 15 - Show verbose error when HEAD could not be detached
+
+expecting success of 3400.16 'fail when upstream arg is missing and not on branch': 
+	git checkout topic &&
+	test_must_fail git rebase
+
+Note: switching to 'topic'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 5d79b4b Add B.
+You are not currently on a branch.
+Please specify which branch you want to rebase against.
+See git-rebase(1) for details.
+
+    git rebase '<branch>'
+
+ok 16 - fail when upstream arg is missing and not on branch
+
+expecting success of 3400.17 'fail when upstream arg is missing and not configured': 
+	git checkout -b no-config topic &&
+	test_must_fail git rebase
+
+Switched to a new branch 'no-config'
+There is no tracking information for the current branch.
+Please specify which branch you want to rebase against.
+See git-rebase(1) for details.
+
+    git rebase '<branch>'
+
+If you wish to set tracking information for this branch you can do so with:
+
+    git branch --set-upstream-to=<remote>/<branch> no-config
+
+ok 17 - fail when upstream arg is missing and not configured
+
+expecting success of 3400.18 'rebase works with format.useAutoBase': 
+	test_config format.useAutoBase true &&
+	git checkout topic &&
+	git rebase main
+
+Note: switching to 'topic'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 5d79b4b Add B.
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 18 - rebase works with format.useAutoBase
+
+expecting success of 3400.19 'default to common base in @{upstream}s reflog if no upstream arg (--merge)': 
+	git checkout -b default-base main &&
+	git checkout -b default topic &&
+	git config branch.default.remote . &&
+	git config branch.default.merge refs/heads/default-base &&
+	git rebase --merge &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual &&
+	git checkout default-base &&
+	git reset --hard HEAD^ &&
+	git checkout default &&
+	git rebase --merge &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b86b84f Add 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> b86b84f
+
+Switched to a new branch 'default-base'
+Switched to a new branch 'default'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/default.
+Switched to branch 'default-base'
+HEAD is now at 79095e6 Modify A.
+Switched to branch 'default'
+Your branch is ahead of 'default-base' by 2 commits.
+  (use "git push" to publish your local commits)
+Rebasing (1/1)
Successfully rebased and updated refs/heads/default.
+ok 19 - default to common base in @{upstream}s reflog if no upstream arg (--merge)
+
+expecting success of 3400.20 'default to common base in @{upstream}s reflog if no upstream arg (--apply)': 
+	git checkout -B default-base main &&
+	git checkout -B default topic &&
+	git config branch.default.remote . &&
+	git config branch.default.merge refs/heads/default-base &&
+	git rebase --apply &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual &&
+	git checkout default-base &&
+	git reset --hard HEAD^ &&
+	git checkout default &&
+	git rebase --apply &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual
+
+Switched to and reset branch 'default-base'
+Switched to and reset branch 'default'
+Your branch and 'default-base' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+First, rewinding head to replay your work on top of it...
+Applying: Add B.
+Switched to branch 'default-base'
+HEAD is now at 79095e6 Modify A.
+Switched to branch 'default'
+Your branch is ahead of 'default-base' by 2 commits.
+  (use "git push" to publish your local commits)
+First, rewinding head to replay your work on top of it...
+Applying: Add B.
+ok 20 - default to common base in @{upstream}s reflog if no upstream arg (--apply)
+
+expecting success of 3400.21 'cherry-picked commits and fork-point work together': 
+	git checkout default-base &&
+	echo Amended >A &&
+	git commit -a --no-edit --amend &&
+	test_commit B B &&
+	test_commit new_B B "New B" &&
+	test_commit C C &&
+	git checkout default &&
+	git reset --hard default-base@{4} &&
+	test_commit D D &&
+	git cherry-pick -2 default-base^ &&
+	test_commit final_B B "Final B" &&
+	git rebase &&
+	echo Amended >expect &&
+	test_cmp expect A &&
+	echo "Final B" >expect &&
+	test_cmp expect B &&
+	echo C >expect &&
+	test_cmp expect C &&
+	echo D >expect &&
+	test_cmp expect D
+
+Switched to branch 'default-base'
+[default-base 10c1269] Modify A.
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[default-base 33daa44] B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[default-base bb1e483] new_B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[default-base 6fcaab7] C
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+Switched to branch 'default'
+Your branch and 'default-base' have diverged,
+and have 2 and 4 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at 79095e6 Modify A.
+[default 25c877f] D
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+[default c1600f1] B
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[default a9d4b07] new_B
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[default 26a2977] final_B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: skipped previously applied commit c1600f1
+warning: skipped previously applied commit a9d4b07
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/default.
+ok 21 - cherry-picked commits and fork-point work together
+
+expecting success of 3400.22 'rebase --apply -q is quiet': 
+	git checkout -b quiet topic &&
+	git rebase --apply -q main >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+Switched to a new branch 'quiet'
+ok 22 - rebase --apply -q is quiet
+
+expecting success of 3400.23 'rebase --merge -q is quiet': 
+	git checkout -B quiet topic &&
+	git rebase --merge -q main >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+Reset branch 'quiet'
+ok 23 - rebase --merge -q is quiet
+
+expecting success of 3400.24 'rebase --exec -q is quiet': 
+	git checkout -B quiet topic &&
+	git rebase --exec true -q main >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+Reset branch 'quiet'
+ok 24 - rebase --exec -q is quiet
+
+expecting success of 3400.25 'Rebase a commit that sprinkles CRs in': 
+	(
+		echo "One" &&
+		echo "TwoQ" &&
+		echo "Three" &&
+		echo "FQur" &&
+		echo "Five"
+	) | q_to_cr >CR &&
+	git add CR &&
+	test_tick &&
+	git commit -a -m "A file with a line with CR" &&
+	git tag file-with-cr &&
+	git checkout HEAD^0 &&
+	git rebase --onto HEAD^^ HEAD^ &&
+	git diff --exit-code file-with-cr:CR HEAD:CR
+
+[quiet bdc63e2] A file with a line with CR
+ Author: author@name <bogus@email@address>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 CR
+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 bdc63e2 A file with a line with CR
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 25 - Rebase a commit that sprinkles CRs in
+
+expecting success of 3400.26 'rebase can copy notes': 
+	git config notes.rewrite.rebase true &&
+	git config notes.rewriteRef "refs/notes/*" &&
+	test_commit n1 &&
+	test_commit n2 &&
+	test_commit n3 &&
+	git notes add -m"a note" n3 &&
+	git rebase --onto n1 n2 &&
+	test "a note" = "$(git notes show HEAD)"
+
+[detached HEAD 6c4c424] n1
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n1.t
+[detached HEAD 2a7c249] n2
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n2.t
+[detached HEAD a23b9cc] n3
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n3.t
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 26 - rebase can copy notes
+
+expecting success of 3400.27 'rebase -m can copy notes': 
+	git reset --hard n3 &&
+	git rebase -m --onto n1 n2 &&
+	test "a note" = "$(git notes show HEAD)"
+
+HEAD is now at a23b9cc n3
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 27 - rebase -m can copy notes
+
+expecting success of 3400.28 'rebase commit with an ancient timestamp': 
+	git reset --hard &&
+
+	>old.one && git add old.one && test_tick &&
+	git commit --date="@12345 +0400" -m "Old one" &&
+	>old.two && git add old.two && test_tick &&
+	git commit --date="@23456 +0500" -m "Old two" &&
+	>old.three && git add old.three && test_tick &&
+	git commit --date="@34567 +0600" -m "Old three" &&
+
+	git cat-file commit HEAD^^ >actual &&
+	grep "author .* 12345 +0400$" actual &&
+	git cat-file commit HEAD^ >actual &&
+	grep "author .* 23456 +0500$" actual &&
+	git cat-file commit HEAD >actual &&
+	grep "author .* 34567 +0600$" actual &&
+
+	git rebase --onto HEAD^^ HEAD^ &&
+
+	git cat-file commit HEAD >actual &&
+	grep "author .* 34567 +0600$" actual
+
+HEAD is now at 8512196 n3
+[detached HEAD 672de63] Old one
+ Author: author@name <bogus@email@address>
+ Date: Thu Jan 1 07:25:45 1970 +0400
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 old.one
+[detached HEAD bcd1a5d] Old two
+ Author: author@name <bogus@email@address>
+ Date: Thu Jan 1 11:30:56 1970 +0500
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 old.two
+[detached HEAD e1aec6b] Old three
+ Author: author@name <bogus@email@address>
+ Date: Thu Jan 1 15:36:07 1970 +0600
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 old.three
+author author@name <bogus@email@address> 12345 +0400
+author author@name <bogus@email@address> 23456 +0500
+author author@name <bogus@email@address> 34567 +0600
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+author author@name <bogus@email@address> 34567 +0600
+ok 28 - rebase commit with an ancient timestamp
+
+expecting success of 3400.29 'rebase with "From " line in commit message': 
+	git checkout -b preserve-from main~1 &&
+	cat >From_.msg <<EOF &&
+Somebody embedded an mbox in a commit message
+
+This is from so-and-so:
+
+From a@b Mon Sep 17 00:00:00 2001
+From: John Doe <nobody@example.com>
+Date: Sat, 11 Nov 2017 00:00:00 +0000
+Subject: not this message
+
+something
+EOF
+	>From_ &&
+	git add From_ &&
+	git commit -F From_.msg &&
+	git rebase main &&
+	git log -1 --pretty=format:%B >out &&
+	test_cmp From_.msg out
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  2aa280f Old three
+  672de63 Old one
+  8512196 n3
+
+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> 2aa280f
+
+Switched to a new branch 'preserve-from'
+[preserve-from 6a4c2b7] Somebody embedded an mbox in a commit message
+ Author: author@name <bogus@email@address>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 From_
+Rebasing (1/1)
Successfully rebased and updated refs/heads/preserve-from.
+ok 29 - rebase with "From " line in commit message
+
+expecting success of 3400.30 'rebase --apply and --show-current-patch': 
+	test_create_repo conflict-apply &&
+	(
+		cd conflict-apply &&
+		test_commit init &&
+		echo one >>init.t &&
+		git commit -a -m one &&
+		echo two >>init.t &&
+		git commit -a -m two &&
+		git tag two &&
+		test_must_fail git rebase --apply -f --onto init HEAD^ &&
+		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+		grep "show.*$(git rev-parse two)" stderr
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/conflict-apply/.git/
+[main (root-commit) 4ee1594] init
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[main 7f4d086] one
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+[main 4a30746] two
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+First, rewinding head to replay your work on top of it...
+Applying: two
+Using index info to reconstruct a base tree...
+M	init.t
+Falling back to patching base and 3-way merge...
+Merging:
+4ee1594 init
+virtual two
+found 1 common ancestor:
+virtual 24619c19508a6b9b476e2c46f4889f730a371ef0
+Auto-merging init.t
+CONFLICT (content): Merge conflict in init.t
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 two
+trace: run_command: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' show 4a30746df05d63c1ff544efc981f6dc849632f55 --
+trace: built-in: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
+ok 30 - rebase --apply and --show-current-patch
+
+expecting success of 3400.31 'rebase --apply and .gitattributes': 
+	test_create_repo attributes &&
+	(
+		cd attributes &&
+		test_commit init &&
+		git config filter.test.clean "sed -e 's/smudged/clean/g'" &&
+		git config filter.test.smudge "sed -e 's/clean/smudged/g'" &&
+
+		test_commit second &&
+		git checkout -b test HEAD^ &&
+
+		echo "*.txt filter=test" >.gitattributes &&
+		git add .gitattributes &&
+		test_commit third &&
+
+		echo "This text is smudged." >a.txt &&
+		git add a.txt &&
+		test_commit fourth &&
+
+		git checkout -b removal HEAD^ &&
+		git rm .gitattributes &&
+		git add -u &&
+		test_commit fifth &&
+		git cherry-pick test &&
+
+		git checkout test &&
+		git rebase main &&
+		grep "smudged" a.txt &&
+
+		git checkout removal &&
+		git reset --hard &&
+		git rebase main &&
+		grep "clean" a.txt
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/attributes/.git/
+[main (root-commit) 4ee1594] init
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[main 68fd476] second
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+Switched to a new branch 'test'
+[test 3071d72] third
+ Author: author@name <bogus@email@address>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 third.t
+[test 5339e6c] fourth
+ Author: author@name <bogus@email@address>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a.txt
+ create mode 100644 fourth.t
+Switched to a new branch 'removal'
+rm '.gitattributes'
+[removal f95b76e] fifth
+ Author: author@name <bogus@email@address>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 .gitattributes
+ create mode 100644 fifth.t
+[removal 5932438] fourth
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:32:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a.txt
+ create mode 100644 fourth.t
+Switched to branch 'test'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/test.
+This text is smudged.
+Switched to branch 'removal'
+HEAD is now at 5932438 fourth
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/removal.
+This text is clean.
+ok 31 - rebase --apply and .gitattributes
+
+expecting success of 3400.32 'rebase--merge.sh and --show-current-patch': 
+	test_create_repo conflict-merge &&
+	(
+		cd conflict-merge &&
+		test_commit init &&
+		echo one >>init.t &&
+		git commit -a -m one &&
+		echo two >>init.t &&
+		git commit -a -m two &&
+		git tag two &&
+		test_must_fail git rebase --merge --onto init HEAD^ &&
+		git rebase --show-current-patch >actual.patch &&
+		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+		grep "show.*REBASE_HEAD" stderr &&
+		test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/conflict-merge/.git/
+[main (root-commit) 4ee1594] init
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[main 7f4d086] one
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+[main 4a30746] two
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+Rebasing (1/1)
Auto-merging init.t
+CONFLICT (content): Merge conflict in init.t
+error: could not apply 4a30746... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 4a30746... two
+trace: run_command: git show REBASE_HEAD --
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' show REBASE_HEAD --
+trace: built-in: git show REBASE_HEAD --
+ok 32 - rebase--merge.sh and --show-current-patch
+
+expecting success of 3400.33 'switch to branch checked out here': 
+	git checkout main &&
+	git rebase main main
+
+Switched to branch 'main'
+Current branch main is up to date.
+ok 33 - switch to branch checked out here
+
+expecting success of 3400.34 'switch to branch checked out elsewhere fails': 
+	test_when_finished "
+		git worktree remove wt1 &&
+		git worktree remove wt2 &&
+		git branch -d shared
+	" &&
+	git worktree add wt1 -b shared &&
+	git worktree add wt2 -f shared &&
+	# we test in both worktrees to ensure that works
+	# as expected with "first" and "next" worktrees
+	test_must_fail git -C wt1 rebase shared shared &&
+	test_must_fail git -C wt2 rebase shared shared
+
+Preparing worktree (new branch 'shared')
+HEAD is now at 1fb901f prepare
+Preparing worktree (checking out 'shared')
+HEAD is now at 1fb901f prepare
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/wt2'
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/wt1'
+Deleted branch shared (was 1fb901f).
+ok 34 - switch to branch checked out elsewhere fails
+
+expecting success of 3400.35 'switch to branch not checked out': 
+	git checkout main &&
+	git branch other &&
+	git rebase main other
+
+Already on 'main'
+Current branch other is up to date.
+ok 35 - switch to branch not checked out
+
+expecting success of 3400.36 'switch to non-branch detaches HEAD': 
+	git checkout main &&
+	old_main=$(git rev-parse HEAD) &&
+	git rebase First Second^0 &&
+	test_cmp_rev HEAD Second &&
+	test_cmp_rev main $old_main &&
+	test_must_fail git symbolic-ref HEAD
+
+Switched to branch 'main'
+Current branch Second^0 is up to date.
+fatal: ref HEAD is not a symbolic ref
+ok 36 - switch to non-branch detaches HEAD
+
+expecting success of 3400.37 'refuse to switch to branch checked out elsewhere': 
+	git checkout main &&
+	git worktree add wt &&
+	test_must_fail git -C wt rebase main main 2>err &&
+	test_grep "already used by worktree at" err &&
+	test_must_fail git -C wt rebase --quit 2>err &&
+	test_grep "no rebase in progress" err
+
+Previous HEAD position was 5d79b4b Add B.
+Switched to branch 'main'
+Preparing worktree (new branch 'wt')
+HEAD is now at 1fb901f prepare
+fatal: 'main' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase'
+fatal: no rebase in progress
+ok 37 - refuse to switch to branch checked out elsewhere
+
+expecting success of 3400.38 'rebase when inside worktree subdirectory': 
+	git init main-wt &&
+	(
+		cd main-wt &&
+		git commit --allow-empty -m "initial" &&
+		mkdir -p foo/bar &&
+		test_commit foo/bar/baz &&
+		mkdir -p a/b &&
+		test_commit a/b/c &&
+		# create another branch for our other worktree
+		git branch other &&
+		git worktree add ../other-wt other &&
+		cd ../other-wt &&
+		# create and cd into a subdirectory
+		mkdir -p random/dir &&
+		cd random/dir &&
+		# now do the rebase
+		git rebase --onto HEAD^^ HEAD^  # drops the HEAD^ commit
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/main-wt/.git/
+[main (root-commit) 18c3868] initial
+ Author: author@name <bogus@email@address>
+[main ab220b2] foo/bar/baz
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+[main c2b5a42] a/b/c
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/b/c.t
+Preparing worktree (checking out 'other')
+HEAD is now at c2b5a42 a/b/c
+Rebasing (1/1)
Successfully rebased and updated refs/heads/other.
+ok 38 - rebase when inside worktree subdirectory
+
+expecting success of 3400.39 'git rebase --update-ref with core.commentChar and branch on worktree': 
+	test_when_finished git branch -D base topic2 &&
+	test_when_finished git checkout main &&
+	test_when_finished git branch -D wt-topic &&
+	test_when_finished git worktree remove wt-topic &&
+	git checkout main &&
+	git checkout -b base &&
+	git checkout -b topic2 &&
+	test_commit msg2 &&
+	git worktree add wt-topic &&
+	git checkout base &&
+	test_commit msg3 &&
+	git checkout topic2 &&
+	GIT_SEQUENCE_EDITOR="cat >actual" git -c core.commentChar=% \
+		 rebase -i --update-refs base &&
+	test_grep "% Ref refs/heads/wt-topic checked out at" actual &&
+	test_grep "% Ref refs/heads/topic2 checked out at" actual
+
+Already on 'main'
+Switched to a new branch 'base'
+Switched to a new branch 'topic2'
+[topic2 db88505] msg2
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 msg2.t
+Preparing worktree (new branch 'wt-topic')
+HEAD is now at db88505 msg2
+Switched to branch 'base'
+[base 7803bc8] msg3
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 msg3.t
+Switched to branch 'topic2'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic2.
+% Ref refs/heads/wt-topic checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase/wt-topic'
+% Ref refs/heads/topic2 checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3400-rebase'
+Deleted branch wt-topic (was db88505).
+Switched to branch 'main'
+Deleted branch base (was 7803bc8).
+Deleted branch topic2 (was 784ba1d).
+ok 39 - git rebase --update-ref with core.commentChar and branch on worktree
+
+# passed all 39 test(s)
+1..39
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3408-rebase-multi-line.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3408-rebase-multi-line/.git/
+expecting success of 3408.1 'setup': 
+
+	>file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+
+	echo hello >file &&
+	test_tick &&
+	git commit -a -m "A sample commit log message that has a long
+summary that spills over multiple lines.
+
+But otherwise with a sane description." &&
+
+	git branch side &&
+
+	git reset --hard HEAD^ &&
+	>elif &&
+	git add elif &&
+	test_tick &&
+	git commit -m second &&
+
+	git checkout -b side2 &&
+	>afile &&
+	git add afile &&
+	test_tick &&
+	git commit -m third &&
+	echo hello >afile &&
+	test_tick &&
+	git commit -a -m fourth &&
+	git checkout -b side-merge &&
+	git reset --hard HEAD^^ &&
+	git merge --no-ff -m "A merge commit log message that has a long
+summary that spills over multiple lines.
+
+But otherwise with a sane description." side2 &&
+	git branch side-merge-original
+
+[main (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main 1708bf0] A sample commit log message that has a long summary that spills over multiple lines.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+HEAD is now at 1bd44cb initial
+[main e79e348] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 elif
+Switched to a new branch 'side2'
+[side2 0c9638e] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 afile
+[side2 5efd714] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'side-merge'
+HEAD is now at e79e348 second
+Merge made by the 'ort' strategy.
+ afile | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 afile
+ok 1 - setup
+
+expecting success of 3408.2 'rebase': 
+
+	git checkout side &&
+	git rebase main &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
+	test_cmp expect actual
+
+
+Switched to branch 'side'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/side.
+ok 2 - rebase
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3409-rebase-environ.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3409-rebase-environ/.git/
+expecting success of 3409.1 'setup': 
+	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
+
+expecting success of 3409.2 'rebase --exec does not muck with GIT_DIR': 
+	git rebase --exec "printf %s \$GIT_DIR >environ" HEAD~1 &&
+	test_must_be_empty environ
+
+Rebasing (2/2)
Executing: printf %s $GIT_DIR >environ
+Successfully rebased and updated refs/heads/master.
+ok 2 - rebase --exec does not muck with GIT_DIR
+
+expecting success of 3409.3 'rebase --exec does not muck with GIT_WORK_TREE': 
+	git rebase --exec "printf %s \$GIT_WORK_TREE >environ" HEAD~1 &&
+	test_must_be_empty environ
+
+Rebasing (2/2)
Executing: printf %s $GIT_WORK_TREE >environ
+Successfully rebased and updated refs/heads/master.
+ok 3 - rebase --exec does not muck with GIT_WORK_TREE
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3407-rebase-abort.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3407-rebase-abort/.git/
+expecting success of 3407.1 'setup': 
+	test_commit a a a &&
+	git branch to-rebase &&
+
+	test_commit --annotate b a b &&
+	test_commit --annotate c a c &&
+
+	git checkout to-rebase &&
+	test_commit "merge should fail on this" a d d &&
+	test_commit --annotate "merge should fail on this, too" a e pre-rebase
+
+[main (root-commit) cc33353] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[main 9c12280] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main deaaf55] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'to-rebase'
+[to-rebase 3e1f4f7] merge should fail on this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[to-rebase 1c3a3e2] merge should fail on this, too
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3407.2 'rebase --apply --abort': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir "$state_dir" &&
+		git rebase --abort &&
+		check_head &&
+		test_path_is_missing "$state_dir"
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+ok 2 - rebase --apply --abort
+
+expecting success of 3407.3 'pre rebase --apply head is marked as reachable': 
+		# Clean up the state from the previous one
+		git checkout -f --detach pre-rebase &&
+		test_tick &&
+		git commit --amend --only -m "reworded" &&
+		orig_head=$(git rev-parse HEAD) &&
+		test_must_fail git rebase$type main &&
+		# Stop ORIG_HEAD marking $state_dir/orig-head as reachable
+		git update-ref -d ORIG_HEAD &&
+		git reflog expire --expire="$GIT_COMMITTER_DATE" --all &&
+		git prune --expire=now &&
+		git rebase --abort &&
+		test_cmp_rev $orig_head HEAD
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+[detached HEAD 656dfef] reworded
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+ok 3 - pre rebase --apply head is marked as reachable
+
+expecting success of 3407.4 'rebase --apply --abort after --skip': 
+		# Clean up the state from the previous one
+		git checkout -B to-rebase pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir "$state_dir" &&
+		test_must_fail git rebase --skip &&
+		test_cmp_rev HEAD main &&
+		git rebase --abort &&
+		check_head &&
+		test_path_is_missing "$state_dir"
+	
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  656dfef 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> 656dfef
+
+Switched to and reset branch 'to-rebase'
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+Applying: merge should fail on this, too
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this, too
+found 1 common ancestor:
+virtual f788de73cfc81f8d734fa7efc658cc63ca083f50
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 merge should fail on this, too
+ok 4 - rebase --apply --abort after --skip
+
+expecting success of 3407.5 'rebase --apply --abort after --continue': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir "$state_dir" &&
+		echo c > a &&
+		echo d >> a &&
+		git add a &&
+		test_must_fail git rebase --continue &&
+		test_cmp_rev ! HEAD main &&
+		git rebase --abort &&
+		check_head &&
+		test_path_is_missing "$state_dir"
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+Applying: merge should fail on this
+Applying: merge should fail on this, too
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+cffbac4 merge should fail on this
+virtual merge should fail on this, too
+found 1 common ancestor:
+virtual f788de73cfc81f8d734fa7efc658cc63ca083f50
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 merge should fail on this, too
+ok 5 - rebase --apply --abort after --continue
+
+expecting success of 3407.6 'rebase --apply --abort when checking out a tag': 
+		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+		git reset --hard a -- &&
+		test_must_fail git rebase$type --onto b c pre-rebase &&
+		test_cmp_rev HEAD b^{commit} &&
+		git rebase --abort &&
+		test_cmp_rev HEAD pre-rebase^{commit} &&
+		! git symbolic-ref HEAD
+	
+HEAD is now at cc33353 a
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+9c12280 b
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+fatal: ref HEAD is not a symbolic ref
+ok 6 - rebase --apply --abort when checking out a tag
+
+expecting success of 3407.7 'rebase --apply --abort does not update reflog': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		git reflog show to-rebase > reflog_before &&
+		test_must_fail git rebase$type main &&
+		git rebase --abort &&
+		git reflog show to-rebase > reflog_after &&
+		test_cmp reflog_before reflog_after &&
+		rm reflog_before reflog_after
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+ok 7 - rebase --apply --abort does not update reflog
+
+expecting success of 3407.8 'rebase --abort can not be used with other options': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_must_fail git rebase -v --abort &&
+		test_must_fail git rebase --abort -v &&
+		git rebase --abort
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 8 - rebase --abort can not be used with other options
+
+expecting success of 3407.9 'rebase --apply --quit': 
+		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir $state_dir &&
+		head_before=$(git rev-parse HEAD) &&
+		git rebase --quit &&
+		test_cmp_rev HEAD $head_before &&
+		test_path_is_missing .git/rebase-apply
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Applying: merge should fail on this
+Using index info to reconstruct a base tree...
+M	a
+Falling back to patching base and 3-way merge...
+Merging:
+deaaf55 c
+virtual merge should fail on this
+found 1 common ancestor:
+virtual aaff74984cccd156a469afa7d9ab10e4777beb24
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 merge should fail on this
+ok 9 - rebase --apply --quit
+
+expecting success of 3407.10 'rebase --merge --abort': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir "$state_dir" &&
+		git rebase --abort &&
+		check_head &&
+		test_path_is_missing "$state_dir"
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+ok 10 - rebase --merge --abort
+
+expecting success of 3407.11 'pre rebase --merge head is marked as reachable': 
+		# Clean up the state from the previous one
+		git checkout -f --detach pre-rebase &&
+		test_tick &&
+		git commit --amend --only -m "reworded" &&
+		orig_head=$(git rev-parse HEAD) &&
+		test_must_fail git rebase$type main &&
+		# Stop ORIG_HEAD marking $state_dir/orig-head as reachable
+		git update-ref -d ORIG_HEAD &&
+		git reflog expire --expire="$GIT_COMMITTER_DATE" --all &&
+		git prune --expire=now &&
+		git rebase --abort &&
+		test_cmp_rev $orig_head HEAD
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+[detached HEAD 93ea589] reworded
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+ok 11 - pre rebase --merge head is marked as reachable
+
+expecting success of 3407.12 'rebase --merge --abort after --skip': 
+		# Clean up the state from the previous one
+		git checkout -B to-rebase pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir "$state_dir" &&
+		test_must_fail git rebase --skip &&
+		test_cmp_rev HEAD main &&
+		git rebase --abort &&
+		check_head &&
+		test_path_is_missing "$state_dir"
+	
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  93ea589 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> 93ea589
+
+Switched to and reset branch 'to-rebase'
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+Rebasing (2/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 1c3a3e2... merge should fail on this, too
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1c3a3e2... merge should fail on this, too
+ok 12 - rebase --merge --abort after --skip
+
+expecting success of 3407.13 'rebase --merge --abort after --continue': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir "$state_dir" &&
+		echo c > a &&
+		echo d >> a &&
+		git add a &&
+		test_must_fail git rebase --continue &&
+		test_cmp_rev ! HEAD main &&
+		git rebase --abort &&
+		check_head &&
+		test_path_is_missing "$state_dir"
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+[detached HEAD 49b73bc] merge should fail on this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 1c3a3e2... merge should fail on this, too
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1c3a3e2... merge should fail on this, too
+ok 13 - rebase --merge --abort after --continue
+
+expecting success of 3407.14 'rebase --merge --abort when checking out a tag': 
+		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+		git reset --hard a -- &&
+		test_must_fail git rebase$type --onto b c pre-rebase &&
+		test_cmp_rev HEAD b^{commit} &&
+		git rebase --abort &&
+		test_cmp_rev HEAD pre-rebase^{commit} &&
+		! git symbolic-ref HEAD
+	
+HEAD is now at cc33353 a
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+fatal: ref HEAD is not a symbolic ref
+ok 14 - rebase --merge --abort when checking out a tag
+
+expecting success of 3407.15 'rebase --merge --abort does not update reflog': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		git reflog show to-rebase > reflog_before &&
+		test_must_fail git rebase$type main &&
+		git rebase --abort &&
+		git reflog show to-rebase > reflog_after &&
+		test_cmp reflog_before reflog_after &&
+		rm reflog_before reflog_after
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+ok 15 - rebase --merge --abort does not update reflog
+
+expecting success of 3407.16 'rebase --abort can not be used with other options': 
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_must_fail git rebase -v --abort &&
+		test_must_fail git rebase --abort -v &&
+		git rebase --abort
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 16 - rebase --abort can not be used with other options
+
+expecting success of 3407.17 'rebase --merge --quit': 
+		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir $state_dir &&
+		head_before=$(git rev-parse HEAD) &&
+		git rebase --quit &&
+		test_cmp_rev HEAD $head_before &&
+		test_path_is_missing .git/rebase-apply
+	
+HEAD is now at 1c3a3e2 merge should fail on this, too
+Rebasing (1/2)
Auto-merging a
+CONFLICT (content): Merge conflict in a
+error: could not apply 3e1f4f7... merge should fail on this
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3e1f4f7... merge should fail on this
+ok 17 - rebase --merge --quit
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2013-checkout-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/.git/
+expecting success of 2013.1 'setup': 
+	mkdir submodule &&
+	(cd submodule &&
+	 git init &&
+	 test_commit first) &&
+	git add submodule &&
+	test_tick &&
+	git commit -m superproject &&
+	(cd submodule &&
+	 test_commit second) &&
+	git add submodule &&
+	test_tick &&
+	git commit -m updated.superproject
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+warning: adding embedded git repository: submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submodule
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submodule
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) 1844aa5] superproject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submodule
+[master d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master 14e674f] updated.superproject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 2013.2 '"reset <submodule>" updates the index': 
+	git update-index --refresh &&
+	git diff-files --quiet &&
+	git diff-index --quiet --cached HEAD &&
+	git reset HEAD^ submodule &&
+	test_must_fail git diff-files --quiet &&
+	git reset submodule &&
+	git diff-files --quiet
+
+Unstaged changes after reset:
+M	submodule
+ok 2 - "reset <submodule>" updates the index
+
+expecting success of 2013.3 '"checkout <submodule>" updates the index only': 
+	git update-index --refresh &&
+	git diff-files --quiet &&
+	git diff-index --quiet --cached HEAD &&
+	git checkout HEAD^ submodule &&
+	test_must_fail git diff-files --quiet &&
+	git checkout HEAD submodule &&
+	git diff-files --quiet
+
+Updated 0 paths from f0404a9
+Updated 0 paths from 29aef3d
+ok 3 - "checkout <submodule>" updates the index only
+
+expecting success of 2013.4 '"checkout <submodule>" honors diff.ignoreSubmodules': 
+	git config diff.ignoreSubmodules dirty &&
+	echo x> submodule/untracked &&
+	git checkout HEAD >actual 2>&1 &&
+	test_must_be_empty actual
+
+ok 4 - "checkout <submodule>" honors diff.ignoreSubmodules
+
+expecting success of 2013.5 '"checkout <submodule>" honors submodule.*.ignore from .gitmodules': 
+	git config diff.ignoreSubmodules none &&
+	git config -f .gitmodules submodule.submodule.path submodule &&
+	git config -f .gitmodules submodule.submodule.ignore untracked &&
+	git checkout HEAD >actual 2>&1 &&
+	test_must_be_empty actual
+
+ok 5 - "checkout <submodule>" honors submodule.*.ignore from .gitmodules
+
+expecting success of 2013.6 '"checkout <submodule>" honors submodule.*.ignore from .git/config': 
+	git config -f .gitmodules submodule.submodule.ignore none &&
+	git config submodule.submodule.path submodule &&
+	git config submodule.submodule.ignore all &&
+	git checkout HEAD >actual 2>&1 &&
+	test_must_be_empty actual
+
+ok 6 - "checkout <submodule>" honors submodule.*.ignore from .git/config
+
+expecting success of 2013.7 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1/.git/
+[master (root-commit) f401f36] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2/.git/
+[master (root-commit) f2c1bb9] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/.git/
+[master (root-commit) 3950f7e] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 30024d7] 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 d6f9aa6] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 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 e6d8148] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 1f84fbc] 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 50491a1] 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 6797720] 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 6788ca3] 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 6cc4170] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 934e1af] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-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 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Previous HEAD position was f401f36 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory 43c94e1] 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 2061bb3] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 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 d4861a4] 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 cf98843] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 cea73c0] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 f248045] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+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'.
+ok 7 - git checkout --recurse-submodules: added submodule is checked out
+
+expecting success of 2013.8 'git checkout --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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+ok 8 - git checkout --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 2013.9 'git checkout --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'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+ok 9 - git checkout --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success of 2013.10 'git checkout --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'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+ok 10 - git checkout --recurse-submodules: replace directory with submodule
+
+expecting success of 2013.11 'git checkout --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'.
+Switched to branch 'modify_sub1_recursively'
+Your branch is up to date with 'origin/modify_sub1_recursively'.
+ok 11 - git checkout --recurse-submodules: nested submodules are checked out
+
+expecting success of 2013.12 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+ok 12 - git checkout --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success of 2013.13 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/.git/modules/sub1'
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+ok 13 - git checkout --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success of 2013.14 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 14 - git checkout --recurse-submodules: replace submodule with a file
+
+checking known breakage of 2013.15 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 --recurse-submodules replace_sub1_with_file
+not ok 15 - git checkout --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success of 2013.16 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out 'f2c1bb97d8342b3950c464bac1b708b05cb363c0'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+Switched to branch 'no_submodule'
+Your branch is up to date with 'origin/no_submodule'.
+ok 16 - git checkout --recurse-submodules: worktrees of nested submodules are removed
+
+expecting success of 2013.17 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 17 - git checkout --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success of 2013.18 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+	sub1
+ok 18 - git checkout --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success of 2013.19 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Switched to a new branch 'keep_branch'
+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'.
+fatal: ref HEAD is not a symbolic ref
+ok 19 - git checkout --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success of 2013.20 'git checkout --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: The following untracked working tree files would be overwritten by checkout:
+	sub1
+Please move or remove them before you switch branches.
+Aborting
+ok 20 - git checkout --recurse-submodules: added submodule doesn't remove untracked file with same name
+
+expecting success of 2013.21 'git checkout --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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+ok 21 - git checkout --recurse-submodules: added submodule removes an untracked ignored file
+
+checking known breakage of 2013.22 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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
+not ok 22 - git checkout --recurse-submodules: replace submodule with a directory # TODO known breakage
+
+checking known breakage of 2013.23 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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
+not ok 23 - git checkout --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
+
+expecting success of 2013.24 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 24 - git checkout --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+
+expecting success of 2013.25 'git -c submodule.recurse=true checkout: 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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 25 - git -c submodule.recurse=true checkout: modified submodule updates submodule work tree
+
+expecting success of 2013.26 'git checkout --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out 'f2c1bb97d8342b3950c464bac1b708b05cb363c0'
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+Switched to branch 'modify_sub1_recursively'
+Your branch is up to date with 'origin/modify_sub1_recursively'.
+ok 26 - git checkout --recurse-submodules: modified submodule updates submodule recursively
+
+expecting success of 2013.27 'git checkout -f --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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+ok 27 - git checkout -f --recurse-submodules: added submodule is checked out
+
+expecting success of 2013.28 'git checkout -f --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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+ok 28 - git checkout -f --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 2013.29 'git checkout -f --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'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+ok 29 - git checkout -f --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success of 2013.30 'git checkout -f --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'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+ok 30 - git checkout -f --recurse-submodules: replace directory with submodule
+
+expecting success of 2013.31 'git checkout -f --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'.
+Switched to branch 'modify_sub1_recursively'
+Your branch is up to date with 'origin/modify_sub1_recursively'.
+ok 31 - git checkout -f --recurse-submodules: nested submodules are checked out
+
+expecting success of 2013.32 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+ok 32 - git checkout -f --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success of 2013.33 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/.git/modules/sub1'
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+ok 33 - git checkout -f --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success of 2013.34 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 34 - git checkout -f --recurse-submodules: replace submodule with a file
+
+checking known breakage of 2013.35 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 -f --recurse-submodules replace_sub1_with_file
+not ok 35 - git checkout -f --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success of 2013.36 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out 'f2c1bb97d8342b3950c464bac1b708b05cb363c0'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+Switched to branch 'no_submodule'
+Your branch is up to date with 'origin/no_submodule'.
+ok 36 - git checkout -f --recurse-submodules: worktrees of nested submodules are removed
+
+expecting success of 2013.37 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 37 - git checkout -f --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success of 2013.38 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+ok 38 - git checkout -f --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success of 2013.39 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Switched to a new branch 'keep_branch'
+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'.
+fatal: ref HEAD is not a symbolic ref
+ok 39 - git checkout -f --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success of 2013.40 'git checkout -f --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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+ok 40 - git checkout -f --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
+
+expecting success of 2013.41 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Switched to branch 'replace_sub1_with_directory'
+Your branch is up to date with 'origin/replace_sub1_with_directory'.
+ok 41 - git checkout -f --recurse-submodules: replace submodule with a directory
+
+expecting success of 2013.42 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/.git/modules/sub1'
+Switched to branch 'replace_sub1_with_directory'
+Your branch is up to date with 'origin/replace_sub1_with_directory'.
+ok 42 - git checkout -f --recurse-submodules: replace submodule containing a .git directory with a directory must fail
+
+expecting success of 2013.43 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 43 - git checkout -f --recurse-submodules: replace submodule with a file ignoring ignored files
+
+expecting success of 2013.44 'git checkout -f --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'.
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+ok 44 - git checkout -f --recurse-submodules: modified submodule does update submodule work tree from invalid commit
+
+expecting success of 2013.45 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 45 - git checkout -f --recurse-submodules: updating submodules fixes .git links
+
+expecting success of 2013.46 'git checkout -f --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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Your branch is up to date with 'origin/add_sub1'.
+ok 46 - git checkout -f --recurse-submodules: changed submodule worktree is reset
+
+expecting success of 2013.47 '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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 47 - git_test_func: added submodule creates empty directory
+
+expecting success of 2013.48 '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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 48 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 2013.49 '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'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 49 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 2013.50 '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'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 50 - git_test_func: replace directory with submodule
+
+expecting success of 2013.51 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 51 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 2013.52 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 52 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 2013.53 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 53 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 2013.54 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 54 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 2013.55 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 55 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 2013.56 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 56 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 2013.57 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+Submodule path 'sub1': checked out 'e6d8148a306c904a34344fac267f4613e698d228'
+ok 57 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 2013.58 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+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 58 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 2013.59 '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'.
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 59 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 2013.60 '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 checkout:
+	sub1
+Please move or remove them before you switch branches.
+Aborting
+ok 60 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 2013.61 '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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 61 - git_test_func: added submodule creates empty directory
+
+expecting success of 2013.62 '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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 62 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 2013.63 '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'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 63 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 2013.64 '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'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 64 - git_test_func: replace directory with submodule
+
+expecting success of 2013.65 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 65 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 2013.66 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+ok 66 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+checking known breakage of 2013.67 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'replace_sub1_with_directory'
+Your branch is up to date with 'origin/replace_sub1_with_directory'.
+test_must_fail: command succeeded: git checkout -f replace_sub1_with_directory
+not ok 67 - git_test_func: replace submodule with a directory must fail # TODO known breakage
+
+checking known breakage of 2013.68 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'replace_sub1_with_directory'
+Your branch is up to date with 'origin/replace_sub1_with_directory'.
+test_must_fail: command succeeded: git checkout -f replace_sub1_with_directory
+not ok 68 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+
+checking known breakage of 2013.69 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 -f replace_sub1_with_file
+not ok 69 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 2013.70 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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 -f replace_sub1_with_file
+not ok 70 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 2013.71 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+Submodule path 'sub1': checked out 'e6d8148a306c904a34344fac267f4613e698d228'
+ok 71 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 2013.72 '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.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+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'.
+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 72 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 2013.73 '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'.
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2013-checkout-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+Submodule path 'uninitialized_sub': checked out 'f401f36f47a708c55a44c7f28d8948e9f8abac9f'
+ok 73 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 2013.74 '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'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+ok 74 - git_test_func: added submodule does remove untracked unignored file with same name when forced
+
+# still have 10 known breakage(s)
+# passed all remaining 64 test(s)
+1..74
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3406-rebase-message.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3406-rebase-message/.git/
+expecting success of 3406.1 'setup': 
+	test_commit O fileO &&
+	test_commit X fileX &&
+	git branch fast-forward &&
+	test_commit A fileA &&
+	test_commit B fileB &&
+	test_commit Y fileY &&
+
+	git checkout -b conflicts O &&
+	test_commit P &&
+	test_commit conflict-X fileX &&
+	test_commit Q &&
+
+	git checkout -b topic O &&
+	git cherry-pick A B &&
+	test_commit Z fileZ &&
+	git tag start
+
+[main (root-commit) 3749684] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileO
+[main a2df67f] X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+[main 9491ce3] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA
+[main 83a6553] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileB
+[main 545b0d0] Y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileY
+Switched to a new branch 'conflicts'
+[conflicts bd906e8] P
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 P.t
+[conflicts f31fbd6] conflict-X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+[conflicts f39a215] Q
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Q.t
+Switched to a new branch 'topic'
+[topic 731bf4a] A
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA
+[topic bd8c9c9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileB
+[topic dd54835] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileZ
+ok 1 - setup
+
+expecting success of 3406.2 'rebase -m': 
+	git rebase -m main >actual &&
+	test_must_be_empty actual
+
+warning: skipped previously applied commit 731bf4a
+warning: skipped previously applied commit bd8c9c9
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 2 - rebase -m
+
+expecting success of 3406.3 'rebase against main twice': 
+	git rebase --apply main >out &&
+	test_grep "Current branch topic is up to date" out
+
+Current branch topic is up to date.
+ok 3 - rebase against main twice
+
+expecting success of 3406.4 'rebase against main twice with --force': 
+	git rebase --force-rebase --apply main >out &&
+	test_grep "Current branch topic is up to date, rebase forced" out
+
+Current branch topic is up to date, rebase forced.
+ok 4 - rebase against main twice with --force
+
+expecting success of 3406.5 'rebase against main twice from another branch': 
+	git checkout topic^ &&
+	git rebase --apply main topic >out &&
+	test_grep "Current branch topic is up to date" out
+
+Note: switching to 'topic^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 545b0d0 Y
+Current branch topic is up to date.
+ok 5 - rebase against main twice from another branch
+
+expecting success of 3406.6 'rebase fast-forward to main': 
+	git checkout topic^ &&
+	git rebase --apply topic >out &&
+	test_grep "Fast-forwarded HEAD to topic" out
+
+Note: switching to 'topic^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 545b0d0 Y
+Fast-forwarded HEAD to topic.
+ok 6 - rebase fast-forward to main
+
+expecting success of 3406.7 'rebase --stat': 
+	git reset --hard start &&
+	git rebase --stat main >diffstat.txt &&
+	grep "^ fileX |  *1 +$" diffstat.txt
+
+HEAD is now at dd54835 Z
+warning: skipped previously applied commit 731bf4a
+warning: skipped previously applied commit bd8c9c9
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ fileX | 1 +
+ok 7 - rebase --stat
+
+expecting success of 3406.8 'rebase w/config rebase.stat': 
+	git reset --hard start &&
+	git config rebase.stat true &&
+	git rebase main >diffstat.txt &&
+	grep "^ fileX |  *1 +$" diffstat.txt
+
+HEAD is now at dd54835 Z
+warning: skipped previously applied commit 731bf4a
+warning: skipped previously applied commit bd8c9c9
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ fileX | 1 +
+ok 8 - rebase w/config rebase.stat
+
+expecting success of 3406.9 'rebase -n overrides config rebase.stat config': 
+	git reset --hard start &&
+	git config rebase.stat true &&
+	git rebase -n main >diffstat.txt &&
+	! grep "^ fileX |  *1 +$" diffstat.txt
+
+HEAD is now at dd54835 Z
+warning: skipped previously applied commit 731bf4a
+warning: skipped previously applied commit bd8c9c9
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 9 - rebase -n overrides config rebase.stat config
+
+expecting success of 3406.10 'rebase --onto outputs the invalid ref': 
+	test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
+	test_grep "invalid-ref" err
+
+fatal: Does not point to a valid commit 'invalid-ref'
+ok 10 - rebase --onto outputs the invalid ref
+
+expecting success of 3406.11 'error out early upon -C<n> or --whitespace=<bad>': 
+	test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
+	test_grep "numerical value" err &&
+	test_must_fail git rebase --whitespace=bad HEAD 2>err &&
+	test_grep "Invalid whitespace option" err
+
+fatal: switch `C' expects a numerical value
+fatal: Invalid whitespace option: 'bad'
+ok 11 - error out early upon -C<n> or --whitespace=<bad>
+
+expecting success of 3406.12 'rebase --merge reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		echo resolved >fileX &&
+		git add fileX &&
+		git rebase --continue
+	) &&
+
+	git log -g --format=%gs -5 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (continue): conflict-X
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 conflicts >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev conflicts@{1} Q
+	
+Previous HEAD position was c4441bc Z
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+[detached HEAD 57e508d] conflict-X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
+HEAD is now at f39a215 Q
+ok 12 - rebase --merge reflog
+
+expecting success of 3406.13 'rebase --merge fast-forward reflog': 
+	git checkout fast-forward &&
+	test_when_finished "git reset --hard X" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		git rebase $mode main
+	) &&
+
+	git log -g --format=%gs -2 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 fast-forward >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev fast-forward@{1} X
+	
+Switched to branch 'fast-forward'
+ fileA | 1 +
+ fileB | 1 +
+ fileY | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileY
+Successfully rebased and updated refs/heads/fast-forward.
+HEAD is now at a2df67f X
+ok 13 - rebase --merge fast-forward reflog
+
+expecting success of 3406.14 'rebase --merge --skip reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --skip
+	) &&
+
+	git log -g --format=%gs -4 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
+HEAD is now at f39a215 Q
+ok 14 - rebase --merge --skip reflog
+
+expecting success of 3406.15 'rebase --merge --abort reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	git log -g -1 conflicts >branch-expect &&
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	# check branch reflog is unchanged
+	git log -g -1 conflicts >branch-actual &&
+	test_cmp branch-expect branch-actual
+	
+Already on 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+HEAD is now at f39a215 Q
+ok 15 - rebase --merge --abort reflog
+
+expecting success of 3406.16 'rebase --merge --abort detached HEAD reflog': 
+	git checkout Q &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Note: switching to 'Q'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f39a215 Q
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+HEAD is now at f39a215 Q
+ok 16 - rebase --merge --abort detached HEAD reflog
+
+expecting success of 3406.17 'rebase --merge reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		echo resolved >fileX &&
+		git add fileX &&
+		git rebase --continue
+	) &&
+
+	git log -g --format=%gs -5 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (continue): conflict-X
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 conflicts >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev conflicts@{1} Q
+	
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+[detached HEAD 57e508d] conflict-X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
+HEAD is now at f39a215 Q
+ok 17 - rebase --merge reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.18 'rebase --merge fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout fast-forward &&
+	test_when_finished "git reset --hard X" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		git rebase $mode main
+	) &&
+
+	git log -g --format=%gs -2 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 fast-forward >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev fast-forward@{1} X
+	
+Switched to branch 'fast-forward'
+ fileA | 1 +
+ fileB | 1 +
+ fileY | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileY
+Successfully rebased and updated refs/heads/fast-forward.
+HEAD is now at a2df67f X
+ok 18 - rebase --merge fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.19 'rebase --merge --skip reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --skip
+	) &&
+
+	git log -g --format=%gs -4 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
+HEAD is now at f39a215 Q
+ok 19 - rebase --merge --skip reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.20 'rebase --merge --abort reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	git log -g -1 conflicts >branch-expect &&
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	# check branch reflog is unchanged
+	git log -g -1 conflicts >branch-actual &&
+	test_cmp branch-expect branch-actual
+	
+Already on 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+HEAD is now at f39a215 Q
+ok 20 - rebase --merge --abort reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.21 'rebase --merge --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout Q &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Note: switching to 'Q'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f39a215 Q
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
+CONFLICT (add/add): Merge conflict in fileX
+error: could not apply f31fbd6... conflict-X
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+HEAD is now at f39a215 Q
+ok 21 - rebase --merge --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.22 'rebase --apply reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		echo resolved >fileX &&
+		git add fileX &&
+		git rebase --continue
+	) &&
+
+	git log -g --format=%gs -5 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (continue): conflict-X
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 conflicts >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev conflicts@{1} Q
+	
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+Applying: conflict-X
+Applying: Q
+HEAD is now at f39a215 Q
+ok 22 - rebase --apply reflog
+
+expecting success of 3406.23 'rebase --apply fast-forward reflog': 
+	git checkout fast-forward &&
+	test_when_finished "git reset --hard X" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		git rebase $mode main
+	) &&
+
+	git log -g --format=%gs -2 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 fast-forward >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev fast-forward@{1} X
+	
+Switched to branch 'fast-forward'
+ fileA | 1 +
+ fileB | 1 +
+ fileY | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Fast-forwarded fast-forward to main.
+HEAD is now at a2df67f X
+ok 23 - rebase --apply fast-forward reflog
+
+expecting success of 3406.24 'rebase --apply --skip reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --skip
+	) &&
+
+	git log -g --format=%gs -4 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+Applying: Q
+HEAD is now at f39a215 Q
+ok 24 - rebase --apply --skip reflog
+
+expecting success of 3406.25 'rebase --apply --abort reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	git log -g -1 conflicts >branch-expect &&
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	# check branch reflog is unchanged
+	git log -g -1 conflicts >branch-actual &&
+	test_cmp branch-expect branch-actual
+	
+Already on 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+HEAD is now at f39a215 Q
+ok 25 - rebase --apply --abort reflog
+
+expecting success of 3406.26 'rebase --apply --abort detached HEAD reflog': 
+	git checkout Q &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Note: switching to 'Q'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f39a215 Q
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+HEAD is now at f39a215 Q
+ok 26 - rebase --apply --abort detached HEAD reflog
+
+expecting success of 3406.27 'rebase --apply reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		echo resolved >fileX &&
+		git add fileX &&
+		git rebase --continue
+	) &&
+
+	git log -g --format=%gs -5 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (continue): conflict-X
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 conflicts >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev conflicts@{1} Q
+	
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+Applying: conflict-X
+Applying: Q
+HEAD is now at f39a215 Q
+ok 27 - rebase --apply reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.28 'rebase --apply fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout fast-forward &&
+	test_when_finished "git reset --hard X" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		git rebase $mode main
+	) &&
+
+	git log -g --format=%gs -2 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -1 fast-forward >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
+	EOF
+	test_cmp expect actual &&
+
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev fast-forward@{1} X
+	
+Switched to branch 'fast-forward'
+ fileA | 1 +
+ fileB | 1 +
+ fileY | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Fast-forwarded fast-forward to main.
+HEAD is now at a2df67f X
+ok 28 - rebase --apply fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.29 'rebase --apply --skip reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --skip
+	) &&
+
+	git log -g --format=%gs -4 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): Q
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Switched to branch 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+Applying: Q
+HEAD is now at f39a215 Q
+ok 29 - rebase --apply --skip reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.30 'rebase --apply --abort reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
+
+	git log -g -1 conflicts >branch-expect &&
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual &&
+
+	# check branch reflog is unchanged
+	git log -g -1 conflicts >branch-actual &&
+	test_cmp branch-expect branch-actual
+	
+Already on 'conflicts'
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+HEAD is now at f39a215 Q
+ok 30 - rebase --apply --abort reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.31 'rebase --apply --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout Q &&
+	test_when_finished "git reset --hard Q" &&
+
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
+
+	git log -g --format=%gs -3 >actual &&
+	write_reflog_expect <<-EOF &&
+	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
+	${reflog_action:-rebase} (pick): P
+	${reflog_action:-rebase} (start): checkout main
+	EOF
+	test_cmp expect actual
+	
+Note: switching to 'Q'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f39a215 Q
+ fileA | 1 +
+ fileB | 1 +
+ fileX | 1 +
+ fileY | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 fileB
+ create mode 100644 fileX
+ create mode 100644 fileY
+First, rewinding head to replay your work on top of it...
+Applying: P
+Applying: conflict-X
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+866f7e4 P
+virtual conflict-X
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in fileX
+Auto-merging fileX
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict-X
+HEAD is now at f39a215 Q
+ok 31 - rebase --apply --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action
+
+expecting success of 3406.32 'rebase -i onto unrelated history': 
+	git init unrelated &&
+	test_commit -C unrelated 1 &&
+	git -C unrelated remote add -f origin "$PWD" &&
+	git -C unrelated branch --set-upstream-to=origin/main &&
+	git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
+	test_grep "Changes to " actual &&
+	test_grep "5 files changed" actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3406-rebase-message/unrelated/.git/
+[main (root-commit) 925a26a] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Updating origin
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3406-rebase-message
+ * [new branch]      conflicts    -> origin/conflicts
+ * [new branch]      fast-forward -> origin/fast-forward
+ * [new branch]      main         -> origin/main
+ * [new branch]      topic        -> origin/topic
+ * [new tag]         Q            -> Q
+ * [new tag]         X            -> X
+ * [new tag]         Y            -> Y
+ * [new tag]         A            -> A
+ * [new tag]         B            -> B
+ * [new tag]         O            -> O
+ * [new tag]         P            -> P
+ * [new tag]         conflict-X   -> conflict-X
+branch 'main' set up to track 'origin/main'.
+Rebasing (1/1)
+Successfully rebased and updated refs/heads/main.
+Changes to 545b0d0a5d2af9b721d265dc5293dbb3418ab768:
+ 5 files changed, 5 insertions(+)
+ 5 files changed, 5 insertions(+)
+ok 32 - rebase -i onto unrelated history
+
+# passed all 32 test(s)
+1..32
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3412-rebase-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3412-rebase-root/.git/
+expecting success of 3412.1 'prepare repository': 
+	test_commit 1 A &&
+	test_commit 2 A &&
+	git symbolic-ref HEAD refs/heads/other &&
+	rm .git/index &&
+	test_commit 3 B &&
+	test_commit 1b A 1 &&
+	test_commit 4 B
+
+[main (root-commit) c746ea0] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+[main 46611ad] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other (root-commit) 2c64091] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[other 1c4476a] 1b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+[other 41e7797] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - prepare repository
+
+expecting success of 3412.2 'rebase --root fails with too many args': 
+	git checkout -B fail other &&
+	test_must_fail git rebase --onto main --root fail fail
+
+Switched to a new branch 'fail'
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 2 - rebase --root fails with too many args
+
+expecting success of 3412.3 'setup pre-rebase hook': 
+	test_hook --setup pre-rebase <<-\EOF
+	echo "$1,$2" >.git/PRE-REBASE-INPUT
+	EOF
+
+ok 3 - setup pre-rebase hook
+
+expecting success of 3412.4 'rebase --root --onto <newbase>': 
+	git checkout -b work other &&
+	git rebase --root --onto main &&
+	git log --pretty=tformat:"%s" > rebased &&
+	test_cmp expect rebased
+
+Switched to a new branch 'work'
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work.
+ok 4 - rebase --root --onto <newbase>
+
+expecting success of 3412.5 'pre-rebase got correct input (1)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+
+ok 5 - pre-rebase got correct input (1)
+
+expecting success of 3412.6 'rebase --root --onto <newbase> <branch>': 
+	git branch work2 other &&
+	git rebase --root --onto main work2 &&
+	git log --pretty=tformat:"%s" > rebased2 &&
+	test_cmp expect rebased2
+
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work2.
+ok 6 - rebase --root --onto <newbase> <branch>
+
+expecting success of 3412.7 'pre-rebase got correct input (2)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
+
+ok 7 - pre-rebase got correct input (2)
+
+expecting success of 3412.8 'rebase -i --root --onto <newbase>': 
+	git checkout -b work3 other &&
+	git rebase -i --root --onto main &&
+	git log --pretty=tformat:"%s" > rebased3 &&
+	test_cmp expect rebased3
+
+Switched to a new branch 'work3'
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work3.
+ok 8 - rebase -i --root --onto <newbase>
+
+expecting success of 3412.9 'pre-rebase got correct input (3)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+
+ok 9 - pre-rebase got correct input (3)
+
+expecting success of 3412.10 'rebase -i --root --onto <newbase> <branch>': 
+	git branch work4 other &&
+	git rebase -i --root --onto main work4 &&
+	git log --pretty=tformat:"%s" > rebased4 &&
+	test_cmp expect rebased4
+
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work4.
+ok 10 - rebase -i --root --onto <newbase> <branch>
+
+expecting success of 3412.11 'pre-rebase got correct input (4)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
+
+ok 11 - pre-rebase got correct input (4)
+
+expecting success of 3412.12 'set up merge history': 
+	git checkout other^ &&
+	git checkout -b side &&
+	test_commit 5 C &&
+	git checkout other &&
+	git merge side
+
+Note: switching to 'other^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 1c4476a 1b
+Switched to a new branch 'side'
+[side 0c9a4e9] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+Switched to branch 'other'
+Merge made by the 'ort' strategy.
+ C | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+ok 12 - set up merge history
+
+expecting success of 3412.13 'set up second root and merge': 
+	git symbolic-ref HEAD refs/heads/third &&
+	rm .git/index &&
+	rm A B C &&
+	test_commit 6 D &&
+	git checkout other &&
+	git merge --allow-unrelated-histories third
+
+[third (root-commit) 00ac2af] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+Switched to branch 'other'
+Merge made by the 'ort' strategy.
+ D | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+ok 13 - set up second root and merge
+
+expecting success of 3412.14 'setup pre-rebase hook that fails': 
+	test_hook --setup --clobber pre-rebase <<-\EOF
+	false
+	EOF
+
+ok 14 - setup pre-rebase hook that fails
+
+expecting success of 3412.15 'pre-rebase hook stops rebase': 
+	git checkout -b stops1 other &&
+	test_must_fail git rebase --root --onto main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
+	test 0 = $(git rev-list other...stops1 | wc -l)
+
+Switched to a new branch 'stops1'
+error: The pre-rebase hook refused to rebase.
+ok 15 - pre-rebase hook stops rebase
+
+expecting success of 3412.16 'pre-rebase hook stops rebase -i': 
+	git checkout -b stops2 other &&
+	test_must_fail git rebase --root --onto main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
+	test 0 = $(git rev-list other...stops2 | wc -l)
+
+Switched to a new branch 'stops2'
+error: The pre-rebase hook refused to rebase.
+ok 16 - pre-rebase hook stops rebase -i
+
+expecting success of 3412.17 'remove pre-rebase hook': 
+	rm -f .git/hooks/pre-rebase
+
+ok 17 - remove pre-rebase hook
+
+expecting success of 3412.18 'set up a conflict': 
+	git checkout main &&
+	echo conflict > B &&
+	git add B &&
+	git commit -m conflict
+
+Switched to branch 'main'
+[main f80eebe] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+ok 18 - set up a conflict
+
+expecting success of 3412.19 'rebase --root with conflict (first part)': 
+	git checkout -b conflict1 other &&
+	test_must_fail git rebase --root --onto main &&
+	git ls-files -u | grep "B$"
+
+Switched to a new branch 'conflict1'
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/4)
Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+error: could not apply 2c64091... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 2c64091... 3
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 19 - rebase --root with conflict (first part)
+
+expecting success of 3412.20 'fix the conflict': 
+	echo 3 > B &&
+	git add B
+
+ok 20 - fix the conflict
+
+expecting success of 3412.21 'rebase --root with conflict (second part)': 
+	git rebase --continue &&
+	git log --pretty=tformat:"%s" > conflict1 &&
+	test_cmp expect-conflict conflict1
+
+[detached HEAD 308ae33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict1.
+ok 21 - rebase --root with conflict (second part)
+
+expecting success of 3412.22 'rebase -i --root with conflict (first part)': 
+	git checkout -b conflict2 other &&
+	test_must_fail git rebase -i --root --onto main &&
+	git ls-files -u | grep "B$"
+
+Switched to a new branch 'conflict2'
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/4)
Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+error: could not apply 2c64091... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 2c64091... 3
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 22 - rebase -i --root with conflict (first part)
+
+expecting success of 3412.23 'fix the conflict': 
+	echo 3 > B &&
+	git add B
+
+ok 23 - fix the conflict
+
+expecting success of 3412.24 'rebase -i --root with conflict (second part)': 
+	git rebase --continue &&
+	git log --pretty=tformat:"%s" > conflict2 &&
+	test_cmp expect-conflict conflict2
+
+[detached HEAD 308ae33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/conflict2.
+ok 24 - rebase -i --root with conflict (second part)
+
+expecting success of 3412.25 'fix the conflict': 
+	echo 3 > B &&
+	git add B
+
+ok 25 - fix the conflict
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3413-rebase-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3417-rebase-whitespace-fix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3417-rebase-whitespace-fix/.git/
+expecting success of 3417.1 'blank line at end of file; extend at end of file': 
+	git commit --allow-empty -m "Initial empty commit" &&
+	git add file && git commit -m first &&
+	mv second file &&
+	git add file && git commit -m second &&
+	git rebase --whitespace=fix HEAD^^ &&
+	git diff --exit-code HEAD^:file expect-first &&
+	test_cmp expect-second file
+
+[master (root-commit) 6c54391] Initial empty commit
+ Author: A U Thor <author@example.com>
+[master e2d0a8f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 file
+[master 14cb724] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: first
+Applying: second
+ok 1 - blank line at end of file; extend at end of file
+
+expecting success of 3417.2 'two blanks line at end of file; extend at end of file': 
+	cp third file && git add file && git commit -m third &&
+	git rebase --whitespace=fix HEAD^^ &&
+	git diff --exit-code HEAD^:file expect-second &&
+	test_cmp expect-third file
+
+[master c2f1416] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: second
+Applying: third
+ok 2 - two blanks line at end of file; extend at end of file
+
+expecting success of 3417.3 'same, but do not remove trailing spaces': 
+	git config core.whitespace "-blank-at-eol" &&
+	git reset --hard HEAD^ &&
+	cp third file && git add file && git commit -m third &&
+	git rebase --whitespace=fix HEAD^^ &&
+	git diff --exit-code HEAD^:file expect-second &&
+	test_cmp file third
+
+HEAD is now at 0c4819a second
+[master c2f1416] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: second
+Applying: third
+ok 3 - same, but do not remove trailing spaces
+
+expecting success of 3417.4 'at beginning of file': 
+	git config core.whitespace "blank-at-eol" &&
+	cp beginning file &&
+	git commit -m beginning file &&
+	test_write_lines 1 2 3 4 5 >>file &&
+	git commit -m more file &&
+	git rebase --whitespace=fix HEAD^^ &&
+	test_cmp expect-beginning file
+
+[master 5eeec3e] beginning
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+[master b2ce110] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+First, rewinding head to replay your work on top of it...
+Applying: beginning
+Applying: more
+ok 4 - at beginning of file
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3419-rebase-patch-id.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3419-rebase-patch-id/.git/
+expecting success of 3419.1 'setup': 
+	git commit --allow-empty -m initial &&
+	git tag root
+
+[main (root-commit) 8b2b4f6] initial
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 3419.2 'setup: 500 lines': 
+	rm -f .gitattributes &&
+	git checkout -q -f main &&
+	git reset --hard root &&
+	test_seq 500 >file &&
+	git add file &&
+	git commit -q -m initial &&
+	git branch -f other &&
+
+	scramble file &&
+	git add file &&
+	git commit -q -m "change big file" &&
+
+	git checkout -q other &&
+	: >newfile &&
+	git add newfile &&
+	git commit -q -m "add small file" &&
+
+	git cherry-pick main >/dev/null 2>&1 &&
+
+	git branch -f squashed main &&
+	git checkout -q -f squashed &&
+	git reset -q --soft HEAD~2 &&
+	git commit -q -m squashed &&
+
+	git branch -f mode main &&
+	git checkout -q -f mode &&
+	test_chmod +x file &&
+	git commit -q -a --amend &&
+
+	git branch -f modeother other &&
+	git checkout -q -f modeother &&
+	test_chmod +x file &&
+	git commit -q -a --amend
+
+HEAD is now at 8b2b4f6 initial
+ok 2 - setup: 500 lines
+
+expecting success of 3419.3 'detect upstream patch': 
+	git checkout -q main^{} &&
+	scramble file &&
+	git add file &&
+	git commit -q -m "change big file again" &&
+	git checkout -q other^{} &&
+	git rebase main &&
+	git rev-list main...HEAD~ >revs &&
+	test_must_be_empty revs
+
+warning: skipped previously applied commit 463cec6
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 3 - detect upstream patch
+
+expecting success of 3419.4 'detect upstream patch binary': 
+	echo "file binary" >.gitattributes &&
+	git checkout -q other^{} &&
+	git rebase main &&
+	git rev-list main...HEAD~ >revs &&
+	test_must_be_empty revs &&
+	test_when_finished "rm .gitattributes"
+
+warning: skipped previously applied commit 463cec6
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 4 - detect upstream patch binary
+
+expecting success of 3419.5 'detect upstream patch modechange': 
+	git checkout -q modeother^{} &&
+	git rebase mode &&
+	git rev-list mode...HEAD~ >revs &&
+	test_must_be_empty revs
+
+warning: skipped previously applied commit 471e427
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 5 - detect upstream patch modechange
+
+expecting success of 3419.6 'do not drop patch': 
+	git checkout -q other^{} &&
+	test_must_fail git rebase squashed &&
+	test_when_finished "git rebase --abort"
+
+Rebasing (1/3)
Auto-merging file
+CONFLICT (add/add): Merge conflict in file
+error: could not apply bb8cb29... initial
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bb8cb29... initial
+ok 6 - do not drop patch
+
+expecting success of 3419.7 'do not drop patch binary': 
+	echo "file binary" >.gitattributes &&
+	git checkout -q other^{} &&
+	test_must_fail git rebase squashed &&
+	test_when_finished "git rebase --abort" &&
+	test_when_finished "rm .gitattributes"
+
+Rebasing (1/3)
warning: Cannot merge binary files: file (HEAD vs. bb8cb29 (initial))
+Auto-merging file
+CONFLICT (add/add): Merge conflict in file
+error: could not apply bb8cb29... initial
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bb8cb29... initial
+ok 7 - do not drop patch binary
+
+expecting success of 3419.8 'do not drop patch modechange': 
+	git checkout -q modeother^{} &&
+	git rebase other &&
+	cat >expected <<-\EOF &&
+	diff --git a/file b/file
+	old mode 100644
+	new mode 100755
+	EOF
+	git diff HEAD~ >modediff &&
+	test_cmp expected modediff
+
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 8 - do not drop patch modechange
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3416-rebase-onto-threedots.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3416-rebase-onto-threedots/.git/
+expecting success of 3416.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	git branch side &&
+	test_commit C &&
+	git branch topic &&
+	git checkout side &&
+	test_commit H &&
+	git checkout main &&
+	test_tick &&
+	git merge H &&
+	git tag D &&
+	test_commit E &&
+	git checkout topic &&
+	test_commit F &&
+	test_commit G &&
+	git checkout side &&
+	test_tick &&
+	git merge C &&
+	git tag I &&
+	test_commit J &&
+	test_commit K
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'side'
+[side e9f30f6] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ H.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+[main 0cd72fb] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'topic'
+[topic 0fb828b] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[topic a08c965] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[side 9eed7bf] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+[side 4d3c411] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+ok 1 - setup
+
+expecting success of 3416.2 'rebase --onto main...topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	git rebase --onto main...topic F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 2 - rebase --onto main...topic
+
+expecting success of 3416.3 'rebase --onto main...': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	git rebase --onto main... F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at f576ef2 G
+Already on 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 3 - rebase --onto main...
+
+expecting success of 3416.4 'rebase --onto main...side': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase --onto main...side J
+
+HEAD is now at f576ef2 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main...side': need exactly one merge base
+ok 4 - rebase --onto main...side
+
+expecting success of 3416.5 'rebase -i --onto main...topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=1 git rebase -i --onto main...topic F
+	) &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 5 - rebase -i --onto main...topic
+
+expecting success of 3416.6 'rebase -i --onto main...': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=1 git rebase -i --onto main... F
+	) &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at f576ef2 G
+Already on 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 6 - rebase -i --onto main...
+
+expecting success of 3416.7 'rebase --onto main...side requires a single merge-base': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase -i --onto main...side J 2>err &&
+	grep "need exactly one merge base" err
+
+HEAD is now at f576ef2 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main...side': need exactly one merge base
+ok 7 - rebase --onto main...side requires a single merge-base
+
+expecting success of 3416.8 'rebase --keep-base --onto incompatible': 
+	test_must_fail git rebase --keep-base --onto main...
+
+fatal: options '--keep-base' and '--onto' cannot be used together
+ok 8 - rebase --keep-base --onto incompatible
+
+expecting success of 3416.9 'rebase --keep-base --root incompatible': 
+	test_must_fail git rebase --keep-base --root
+
+fatal: options '--keep-base' and '--root' cannot be used together
+ok 9 - rebase --keep-base --root incompatible
+
+expecting success of 3416.10 'rebase --keep-base main from topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	git rebase --keep-base main &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Current branch topic is up to date.
+ok 10 - rebase --keep-base main from topic
+
+expecting success of 3416.11 'rebase --keep-base main topic from main': 
+	git checkout main &&
+	git branch -f topic G &&
+
+	git rebase --keep-base main topic &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+Switched to branch 'main'
+Current branch topic is up to date.
+ok 11 - rebase --keep-base main topic from main
+
+expecting success of 3416.12 'rebase --keep-base main from side': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase --keep-base main
+
+HEAD is now at a08c965 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main': need exactly one merge base with branch
+ok 12 - rebase --keep-base main from side
+
+expecting success of 3416.13 'rebase -i --keep-base main from topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=2 git rebase -i --keep-base main
+	) &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Successfully rebased and updated refs/heads/topic.
+ok 13 - rebase -i --keep-base main from topic
+
+expecting success of 3416.14 'rebase -i --keep-base main topic from main': 
+	git checkout main &&
+	git branch -f topic G &&
+
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=2 git rebase -i --keep-base main topic
+	) &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+Switched to branch 'main'
+Successfully rebased and updated refs/heads/topic.
+ok 14 - rebase -i --keep-base main topic from main
+
+expecting success of 3416.15 'rebase --keep-base requires a single merge base': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase -i --keep-base main 2>err &&
+	grep "need exactly one merge base with branch" err
+
+HEAD is now at a08c965 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main': need exactly one merge base with branch
+ok 15 - rebase --keep-base requires a single merge base
+
+expecting success of 3416.16 'rebase --keep-base keeps cherry picks': 
+	git checkout -f -B main E &&
+	git cherry-pick F &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=2 git rebase -i --keep-base HEAD G
+	) &&
+	test_cmp_rev HEAD G
+
+Switched to and reset branch 'main'
+[main 3dacdd2] F
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+Successfully rebased and updated detached HEAD.
+ok 16 - rebase --keep-base keeps cherry picks
+
+expecting success of 3416.17 'rebase --keep-base --no-reapply-cherry-picks': 
+	git checkout -f -B main E &&
+	git cherry-pick F &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=1 git rebase -i --keep-base \
+					--no-reapply-cherry-picks HEAD G
+	) &&
+	test_cmp_rev HEAD^ C
+
+Previous HEAD position was a08c965 G
+Switched to and reset branch 'main'
+[main 3dacdd2] F
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+warning: skipped previously applied commit 0fb828b
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 17 - rebase --keep-base --no-reapply-cherry-picks
+
+expecting success of 3416.18 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 18 - $EDITOR and friends are unchanged
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t2400-worktree-add.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/.git/
+expecting success of 2400.1 'setup': 
+	test_commit init
+
+[main (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+ok 1 - setup
+
+expecting success of 2400.2 '"add" an existing worktree': 
+	mkdir -p existing/subtree &&
+	test_must_fail git worktree add --detach existing main
+
+Preparing worktree (detached HEAD 2519212)
+fatal: 'existing' already exists
+ok 2 - "add" an existing worktree
+
+expecting success of 2400.3 '"add" an existing empty worktree': 
+	mkdir existing_empty &&
+	git worktree add --detach existing_empty main
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 3 - "add" an existing empty worktree
+
+expecting success of 2400.4 '"add" using shorthand - fails when no previous branch': 
+	test_must_fail git worktree add existing_short -
+
+fatal: invalid reference: @{-1}
+ok 4 - "add" using shorthand - fails when no previous branch
+
+expecting success of 2400.5 '"add" using - shorthand': 
+	git checkout -b newbranch &&
+	echo hello >myworld &&
+	git add myworld &&
+	git commit -m myworld &&
+	git checkout main &&
+	git worktree add short-hand - &&
+	echo refs/heads/newbranch >expect &&
+	git -C short-hand rev-parse --symbolic-full-name HEAD >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'newbranch'
+[newbranch 5ae2ce4] myworld
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 myworld
+Switched to branch 'main'
+Preparing worktree (checking out '@{-1}')
+HEAD is now at 5ae2ce4 myworld
+ok 5 - "add" using - shorthand
+
+expecting success of 2400.6 '"add" refuses to checkout locked branch': 
+	test_must_fail git worktree add zere main &&
+	! test -d zere &&
+	! test -d .git/worktrees/zere
+
+Preparing worktree (checking out 'main')
+fatal: 'main' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add'
+ok 6 - "add" refuses to checkout locked branch
+
+expecting success of 2400.7 'checking out paths not complaining about linked checkouts': 
+	(
+	cd existing_empty &&
+	echo dirty >>init.t &&
+	git checkout main -- init.t
+	)
+
+ok 7 - checking out paths not complaining about linked checkouts
+
+expecting success of 2400.8 '"add" worktree': 
+	git rev-parse HEAD >expect &&
+	git worktree add --detach here main &&
+	(
+		cd here &&
+		test_cmp ../init.t init.t &&
+		test_must_fail git symbolic-ref HEAD &&
+		git rev-parse HEAD >actual &&
+		test_cmp ../expect actual &&
+		git fsck
+	)
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: ref HEAD is not a symbolic ref
+ok 8 - "add" worktree
+
+expecting success of 2400.9 '"add" worktree with lock': 
+	git worktree add --detach --lock here-with-lock main &&
+	test_when_finished "git worktree unlock here-with-lock || :" &&
+	test -f .git/worktrees/here-with-lock/locked
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 9 - "add" worktree with lock
+
+expecting success of 2400.10 '"add" worktree with lock and reason': 
+	lock_reason="why not" &&
+	git worktree add --detach --lock --reason "$lock_reason" here-with-lock-reason main &&
+	test_when_finished "git worktree unlock here-with-lock-reason || :" &&
+	test -f .git/worktrees/here-with-lock-reason/locked &&
+	echo "$lock_reason" >expect &&
+	test_cmp expect .git/worktrees/here-with-lock-reason/locked
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 10 - "add" worktree with lock and reason
+
+expecting success of 2400.11 '"add" worktree with reason but no lock': 
+	test_must_fail git worktree add --detach --reason "why not" here-with-reason-only main &&
+	test_path_is_missing .git/worktrees/here-with-reason-only/locked
+
+fatal: the option '--reason' requires '--lock'
+ok 11 - "add" worktree with reason but no lock
+
+expecting success of 2400.12 '"add" worktree from a subdir': 
+	(
+		mkdir sub &&
+		cd sub &&
+		git worktree add --detach here main &&
+		cd here &&
+		test_cmp ../../init.t init.t
+	)
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 12 - "add" worktree from a subdir
+
+expecting success of 2400.13 '"add" from a linked checkout': 
+	(
+		cd here &&
+		git worktree add --detach nested-here main &&
+		cd nested-here &&
+		git fsck
+	)
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 13 - "add" from a linked checkout
+
+expecting success of 2400.14 '"add" worktree creating new branch': 
+	git worktree add -b newmain there main &&
+	(
+		cd there &&
+		test_cmp ../init.t init.t &&
+		git symbolic-ref HEAD >actual &&
+		echo refs/heads/newmain >expect &&
+		test_cmp expect actual &&
+		git fsck
+	)
+
+Preparing worktree (new branch 'newmain')
+HEAD is now at 2519212 init
+ok 14 - "add" worktree creating new branch
+
+expecting success of 2400.15 'die the same branch is already checked out': 
+	(
+		cd here &&
+		test_must_fail git checkout newmain 2>actual &&
+		grep "already used by worktree at" actual
+	)
+
+fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/there'
+ok 15 - die the same branch is already checked out
+
+expecting success of 2400.16 'refuse to reset a branch in use elsewhere': 
+	(
+		cd here &&
+
+		# we know we are on detached HEAD but just in case ...
+		git checkout --detach HEAD &&
+		git rev-parse --verify HEAD >old.head &&
+
+		git rev-parse --verify refs/heads/newmain >old.branch &&
+		test_must_fail git checkout -B newmain 2>error &&
+		git rev-parse --verify refs/heads/newmain >new.branch &&
+		git rev-parse --verify HEAD >new.head &&
+
+		grep "already used by worktree at" error &&
+		test_cmp old.branch new.branch &&
+		test_cmp old.head new.head &&
+
+		# and we must be still on the same detached HEAD state
+		test_must_fail git symbolic-ref HEAD
+	)
+
+HEAD is now at 2519212 init
+fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/there'
+fatal: ref HEAD is not a symbolic ref
+ok 16 - refuse to reset a branch in use elsewhere
+
+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 2400.17 'die the same branch is already checked out (symlink)': 
+	head=$(git -C there rev-parse --git-path HEAD) &&
+	ref=$(git -C there symbolic-ref HEAD) &&
+	rm "$head" &&
+	ln -s "$ref" "$head" &&
+	test_must_fail git -C here checkout newmain
+
+fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/there'
+ok 17 - die the same branch is already checked out (symlink)
+
+expecting success of 2400.18 'not die the same branch is already checked out': 
+	(
+		cd here &&
+		git worktree add --force anothernewmain newmain
+	)
+
+Preparing worktree (checking out 'newmain')
+HEAD is now at 2519212 init
+ok 18 - not die the same branch is already checked out
+
+expecting success of 2400.19 'not die on re-checking out current branch': 
+	(
+		cd there &&
+		git checkout newmain
+	)
+
+Already on 'newmain'
+ok 19 - not die on re-checking out current branch
+
+expecting success of 2400.20 '"add" from a bare repo': 
+	(
+		git clone --bare . bare &&
+		cd bare &&
+		git worktree add -b bare-main ../there2 main
+	)
+
+Cloning into bare repository 'bare'...
+done.
+Preparing worktree (new branch 'bare-main')
+HEAD is now at 2519212 init
+ok 20 - "add" from a bare repo
+
+expecting success of 2400.21 'checkout from a bare repo without "add"': 
+	(
+		cd bare &&
+		test_must_fail git checkout main
+	)
+
+fatal: this operation must be run in a work tree
+ok 21 - checkout from a bare repo without "add"
+
+expecting success of 2400.22 '"add" default branch of a bare repo': 
+	(
+		git clone --bare . bare2 &&
+		cd bare2 &&
+		git worktree add ../there3 main &&
+		cd ../there3 &&
+		# Simple check that a Git command does not
+		# immediately fail with the current setup
+		git status
+	) &&
+	cat >expect <<-EOF &&
+	init.t
+	EOF
+	ls there3 >actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'bare2'...
+done.
+Preparing worktree (checking out 'main')
+HEAD is now at 2519212 init
+On branch main
+nothing to commit, working tree clean
+ok 22 - "add" default branch of a bare repo
+
+expecting success of 2400.23 '"add" to bare repo with worktree config': 
+	(
+		git clone --bare . bare3 &&
+		cd bare3 &&
+		git config extensions.worktreeconfig true &&
+
+		# Add config values that are erroneous to have in
+		# a config.worktree file outside of the main
+		# working tree, to check that Git filters them out
+		# when copying config during "git worktree add".
+		git config --worktree core.bare true &&
+		git config --worktree core.worktree "$(pwd)" &&
+
+		# We want to check that bogus.key is copied
+		git config --worktree bogus.key value &&
+		git config --unset core.bare &&
+		git worktree add ../there4 main &&
+		cd ../there4 &&
+
+		# Simple check that a Git command does not
+		# immediately fail with the current setup
+		git status &&
+		git worktree add --detach ../there5 &&
+		cd ../there5 &&
+		git status
+	) &&
+
+	# the worktree has the arbitrary value copied.
+	test_cmp_config -C there4 value bogus.key &&
+	test_cmp_config -C there5 value bogus.key &&
+
+	# however, core.bare and core.worktree were removed.
+	test_must_fail git -C there4 config core.bare &&
+	test_must_fail git -C there4 config core.worktree &&
+
+	cat >expect <<-EOF &&
+	init.t
+	EOF
+
+	ls there4 >actual &&
+	test_cmp expect actual &&
+	ls there5 >actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'bare3'...
+done.
+warning: core.bare and core.worktree do not make sense
+warning: core.bare and core.worktree do not make sense
+warning: core.bare and core.worktree do not make sense
+Preparing worktree (checking out 'main')
+HEAD is now at 2519212 init
+On branch main
+nothing to commit, working tree clean
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Not currently on any branch.
+nothing to commit, working tree clean
+ok 23 - "add" to bare repo with worktree config
+
+expecting success of 2400.24 'checkout with grafts': 
+	test_when_finished rm .git/info/grafts &&
+	test_commit abc &&
+	SHA1=$(git rev-parse HEAD) &&
+	test_commit def &&
+	test_commit xyz &&
+	mkdir .git/info &&
+	echo "$(git rev-parse HEAD) $SHA1" >.git/info/grafts &&
+	cat >expected <<-\EOF &&
+	xyz
+	abc
+	EOF
+	git log --format=%s -2 >actual &&
+	test_cmp expected actual &&
+	git worktree add --detach grafted main &&
+	git --git-dir=grafted/.git log --format=%s -2 >actual &&
+	test_cmp expected actual
+
+[main 6d278e0] abc
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abc.t
+[main 3c13a14] def
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 def.t
+[main a51b5be] xyz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 xyz.t
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+Preparing worktree (detached HEAD a51b5be)
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+HEAD is now at a51b5be xyz
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 24 - checkout with grafts
+
+expecting success of 2400.25 '"add" from relative HEAD': 
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git rev-parse HEAD~1 >expected &&
+	git worktree add relhead HEAD~1 &&
+	git -C relhead rev-parse HEAD >actual &&
+	test_cmp expected actual
+
+[main e9a6308] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[main 15d3bfc] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[main 179a9e0] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Preparing worktree (detached HEAD 15d3bfc)
+HEAD is now at 15d3bfc b
+ok 25 - "add" from relative HEAD
+
+expecting success of 2400.26 '"add -b" with <branch> omitted': 
+	git worktree add -b burble flornk &&
+	test_cmp_rev HEAD burble
+
+Preparing worktree (new branch 'burble')
+HEAD is now at 179a9e0 c
+ok 26 - "add -b" with <branch> omitted
+
+expecting success of 2400.27 '"add --detach" with <branch> omitted': 
+	git worktree add --detach fishhook &&
+	git rev-parse HEAD >expected &&
+	git -C fishhook rev-parse HEAD >actual &&
+	test_cmp expected actual &&
+	test_must_fail git -C fishhook symbolic-ref HEAD
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+fatal: ref HEAD is not a symbolic ref
+ok 27 - "add --detach" with <branch> omitted
+
+expecting success of 2400.28 '"add" with <branch> omitted': 
+	git worktree add wiffle/bat &&
+	test_cmp_rev HEAD bat
+
+Preparing worktree (new branch 'bat')
+HEAD is now at 179a9e0 c
+ok 28 - "add" with <branch> omitted
+
+expecting success of 2400.29 '"add" checks out existing branch of dwimd name': 
+	git branch dwim HEAD~1 &&
+	git worktree add dwim &&
+	test_cmp_rev HEAD~1 dwim &&
+	(
+		cd dwim &&
+		test_cmp_rev HEAD dwim
+	)
+
+Preparing worktree (checking out 'dwim')
+HEAD is now at 15d3bfc b
+ok 29 - "add" checks out existing branch of dwimd name
+
+expecting success of 2400.30 '"add <path>" dwim fails with checked out branch': 
+	git checkout -b test-branch &&
+	test_must_fail git worktree add test-branch &&
+	test_path_is_missing test-branch
+
+Switched to a new branch 'test-branch'
+Preparing worktree (checking out 'test-branch')
+fatal: 'test-branch' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add'
+ok 30 - "add <path>" dwim fails with checked out branch
+
+expecting success of 2400.31 '"add --force" with existing dwimd name doesnt die': 
+	git checkout test-branch &&
+	git worktree add --force test-branch
+
+Already on 'test-branch'
+Preparing worktree (checking out 'test-branch')
+HEAD is now at 179a9e0 c
+ok 31 - "add --force" with existing dwimd name doesnt die
+
+expecting success of 2400.32 '"add" no auto-vivify with --detach and <branch> omitted': 
+	git worktree add --detach mish/mash &&
+	test_must_fail git rev-parse mash -- &&
+	test_must_fail git -C mish/mash symbolic-ref HEAD
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+fatal: bad revision 'mash'
+fatal: ref HEAD is not a symbolic ref
+ok 32 - "add" no auto-vivify with --detach and <branch> omitted
+
+expecting success of 2400.33 ''worktree add' with '-b poodle -B poodle bamboo main' has mutually exclusive options': 
+		test_must_fail git worktree add $opts 2>actual &&
+		grep -E "fatal:( options)? .* cannot be used together" actual
+	
+fatal: options '-b', '-B', and '--detach' cannot be used together
+ok 33 - 'worktree add' with '-b poodle -B poodle bamboo main' has mutually exclusive options
+
+expecting success of 2400.34 ''worktree add' with '-b poodle --detach bamboo main' has mutually exclusive options': 
+		test_must_fail git worktree add $opts 2>actual &&
+		grep -E "fatal:( options)? .* cannot be used together" actual
+	
+fatal: options '-b', '-B', and '--detach' cannot be used together
+ok 34 - 'worktree add' with '-b poodle --detach bamboo main' has mutually exclusive options
+
+expecting success of 2400.35 ''worktree add' with '-B poodle --detach bamboo main' has mutually exclusive options': 
+		test_must_fail git worktree add $opts 2>actual &&
+		grep -E "fatal:( options)? .* cannot be used together" actual
+	
+fatal: options '-b', '-B', and '--detach' cannot be used together
+ok 35 - 'worktree add' with '-B poodle --detach bamboo main' has mutually exclusive options
+
+expecting success of 2400.36 ''worktree add' with '--orphan --detach bamboo' has mutually exclusive options': 
+		test_must_fail git worktree add $opts 2>actual &&
+		grep -E "fatal:( options)? .* cannot be used together" actual
+	
+fatal: options '--orphan' and '--detach' cannot be used together
+ok 36 - 'worktree add' with '--orphan --detach bamboo' has mutually exclusive options
+
+expecting success of 2400.37 ''worktree add' with '--orphan --no-checkout bamboo' has mutually exclusive options': 
+		test_must_fail git worktree add $opts 2>actual &&
+		grep -E "fatal:( options)? .* cannot be used together" actual
+	
+fatal: options '--orphan' and '--no-checkout' cannot be used together
+ok 37 - 'worktree add' with '--orphan --no-checkout bamboo' has mutually exclusive options
+
+expecting success of 2400.38 ''worktree add' with '--orphan bamboo main' has mutually exclusive options': 
+		test_must_fail git worktree add $opts 2>actual &&
+		grep -E "fatal:( options)? .* cannot be used together" actual
+	
+fatal: option '--orphan' and commit-ish cannot be used together
+ok 38 - 'worktree add' with '--orphan bamboo main' has mutually exclusive options
+
+expecting success of 2400.39 ''worktree add' with '--orphan -b bamboo wtdir/ main' has mutually exclusive options': 
+		test_must_fail git worktree add $opts 2>actual &&
+		grep -E "fatal:( options)? .* cannot be used together" actual
+	
+fatal: option '--orphan' and commit-ish cannot be used together
+ok 39 - 'worktree add' with '--orphan -b bamboo wtdir/ main' has mutually exclusive options
+
+expecting success of 2400.40 '"add -B" fails if the branch is checked out': 
+	git rev-parse newmain >before &&
+	test_must_fail git worktree add -B newmain bamboo main &&
+	git rev-parse newmain >after &&
+	test_cmp before after
+
+fatal: 'newmain' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/here/anothernewmain'
+ok 40 - "add -B" fails if the branch is checked out
+
+expecting success of 2400.41 'add -B': 
+	git worktree add -B poodle bamboo2 main^ &&
+	git -C bamboo2 symbolic-ref HEAD >actual &&
+	echo refs/heads/poodle >expected &&
+	test_cmp expected actual &&
+	test_cmp_rev main^ poodle
+
+Preparing worktree (new branch 'poodle')
+HEAD is now at 15d3bfc b
+ok 41 - add -B
+
+expecting success of 2400.42 'add --quiet': 
+	test_when_finished "git worktree remove -f -f another-worktree" &&
+	git worktree add --quiet another-worktree main 2>actual &&
+	test_must_be_empty actual
+
+ok 42 - add --quiet
+
+expecting success of 2400.43 'add --quiet -b': 
+	test_when_finished "git branch -D quietnewbranch" &&
+	test_when_finished "git worktree remove -f -f another-worktree" &&
+	git worktree add --quiet -b quietnewbranch another-worktree 2>actual &&
+	test_must_be_empty actual
+
+Deleted branch quietnewbranch (was 179a9e0).
+ok 43 - add --quiet -b
+
+expecting success of 2400.44 '"add --orphan"': 
+	test_when_finished "git worktree remove -f -f orphandir" &&
+	git worktree add --orphan -b neworphan orphandir &&
+	echo refs/heads/neworphan >expected &&
+	git -C orphandir symbolic-ref HEAD >actual &&
+	test_cmp expected actual
+
+Preparing worktree (new branch 'neworphan')
+ok 44 - "add --orphan"
+
+expecting success of 2400.45 '"add --orphan (no -b)"': 
+	test_when_finished "git worktree remove -f -f neworphan" &&
+	git worktree add --orphan neworphan &&
+	echo refs/heads/neworphan >expected &&
+	git -C neworphan symbolic-ref HEAD >actual &&
+	test_cmp expected actual
+
+Preparing worktree (new branch 'neworphan')
+ok 45 - "add --orphan (no -b)"
+
+expecting success of 2400.46 '"add --orphan --quiet"': 
+	test_when_finished "git worktree remove -f -f orphandir" &&
+	git worktree add --quiet --orphan -b neworphan orphandir 2>log.actual &&
+	test_must_be_empty log.actual &&
+	echo refs/heads/neworphan >expected &&
+	git -C orphandir symbolic-ref HEAD >actual &&
+	test_cmp expected actual
+
+ok 46 - "add --orphan --quiet"
+
+expecting success of 2400.47 '"add --orphan" fails if the branch already exists': 
+	test_when_finished "git branch -D existingbranch" &&
+	git worktree add -b existingbranch orphandir main &&
+	git worktree remove orphandir &&
+	test_must_fail git worktree add --orphan -b existingbranch orphandir
+
+Preparing worktree (new branch 'existingbranch')
+HEAD is now at 179a9e0 c
+Preparing worktree (new branch 'existingbranch')
+fatal: a branch named 'existingbranch' already exists
+Deleted branch existingbranch (was 179a9e0).
+ok 47 - "add --orphan" fails if the branch already exists
+
+expecting success of 2400.48 '"add --orphan" with empty repository': 
+	test_when_finished "rm -rf empty_repo" &&
+	echo refs/heads/newbranch >expected &&
+	GIT_DIR="empty_repo" git init --bare &&
+	git -C empty_repo worktree add --orphan -b newbranch worktreedir &&
+	git -C empty_repo/worktreedir symbolic-ref HEAD >actual &&
+	test_cmp expected actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/empty_repo/
+Preparing worktree (new branch 'newbranch')
+ok 48 - "add --orphan" with empty repository
+
+expecting success of 2400.49 '"add" worktree with orphan branch and lock': 
+	git worktree add --lock --orphan -b orphanbr orphan-with-lock &&
+	test_when_finished "git worktree unlock orphan-with-lock || :" &&
+	test -f .git/worktrees/orphan-with-lock/locked
+
+Preparing worktree (new branch 'orphanbr')
+ok 49 - "add" worktree with orphan branch and lock
+
+expecting success of 2400.50 '"add" worktree with orphan branch, lock, and reason': 
+	lock_reason="why not" &&
+	git worktree add --detach --lock --reason "$lock_reason" orphan-with-lock-reason main &&
+	test_when_finished "git worktree unlock orphan-with-lock-reason || :" &&
+	test -f .git/worktrees/orphan-with-lock-reason/locked &&
+	echo "$lock_reason" >expect &&
+	test_cmp expect .git/worktrees/orphan-with-lock-reason/locked
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+ok 50 - "add" worktree with orphan branch, lock, and reason
+
+expecting success of 2400.51 ''worktree add' show orphan hint in bad/orphan HEAD w/ no opts': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(cd repo && test_commit commit) &&
+		git -C repo switch --orphan noref &&
+		test_must_fail git -C repo worktree add $opts foobar/ 2>actual &&
+		! grep "error: unknown switch" actual &&
+		grep "hint: If you meant to create a worktree containing a new unborn branch" actual &&
+		if [ $use_branch -eq 1 ]
+		then
+			grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual
+		else
+			grep -E "^hint: +git worktree add --orphan [^ ]+$" actual
+		fi
+
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'noref'
+hint: If you meant to create a worktree containing a new unborn branch
+hint:     git worktree add --orphan foobar/
+ok 51 - 'worktree add' show orphan hint in bad/orphan HEAD w/ no opts
+
+expecting success of 2400.52 ''worktree add' show orphan hint in bad/orphan HEAD w/ -b': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(cd repo && test_commit commit) &&
+		git -C repo switch --orphan noref &&
+		test_must_fail git -C repo worktree add $opts foobar/ 2>actual &&
+		! grep "error: unknown switch" actual &&
+		grep "hint: If you meant to create a worktree containing a new unborn branch" actual &&
+		if [ $use_branch -eq 1 ]
+		then
+			grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual
+		else
+			grep -E "^hint: +git worktree add --orphan [^ ]+$" actual
+		fi
+
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'noref'
+hint: If you meant to create a worktree containing a new unborn branch
+hint:     git worktree add --orphan -b foobar_branch foobar/
+ok 52 - 'worktree add' show orphan hint in bad/orphan HEAD w/ -b
+
+expecting success of 2400.53 ''worktree add' show orphan hint in bad/orphan HEAD w/ -B': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(cd repo && test_commit commit) &&
+		git -C repo switch --orphan noref &&
+		test_must_fail git -C repo worktree add $opts foobar/ 2>actual &&
+		! grep "error: unknown switch" actual &&
+		grep "hint: If you meant to create a worktree containing a new unborn branch" actual &&
+		if [ $use_branch -eq 1 ]
+		then
+			grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual
+		else
+			grep -E "^hint: +git worktree add --orphan [^ ]+$" actual
+		fi
+
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'noref'
+hint: If you meant to create a worktree containing a new unborn branch
+hint:     git worktree add --orphan -b foobar_branch foobar/
+ok 53 - 'worktree add' show orphan hint in bad/orphan HEAD w/ -B
+
+expecting success of 2400.54 ''worktree add' doesn't show orphan hint in bad/orphan HEAD w/ --quiet': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(cd repo && test_commit commit) &&
+	test_must_fail git -C repo worktree add --quiet foobar_branch foobar/ 2>actual &&
+	! grep "error: unknown switch" actual &&
+	! grep "hint: If you meant to create a worktree containing a new unborn branch" actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+ok 54 - 'worktree add' doesn't show orphan hint in bad/orphan HEAD w/ --quiet
+
+expecting success of 2400.55 'local clone from linked checkout': 
+	git clone --local here here-clone &&
+	( cd here-clone && git fsck )
+
+Cloning into 'here-clone'...
+done.
+ok 55 - local clone from linked checkout
+
+expecting success of 2400.56 'local clone --shared from linked checkout': 
+	git -C bare worktree add --detach ../baretree &&
+	git clone --local --shared baretree bare-clone &&
+	grep /bare/ bare-clone/.git/objects/info/alternates
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Cloning into 'bare-clone'...
+done.
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/bare/objects
+ok 56 - local clone --shared from linked checkout
+
+expecting success of 2400.57 '"add" worktree with --no-checkout': 
+	git worktree add --no-checkout -b swamp swamp &&
+	! test -e swamp/init.t &&
+	git -C swamp reset --hard &&
+	test_cmp init.t swamp/init.t
+
+Preparing worktree (new branch 'swamp')
+HEAD is now at 179a9e0 c
+ok 57 - "add" worktree with --no-checkout
+
+expecting success of 2400.58 '"add" worktree with --checkout': 
+	git worktree add --checkout -b swmap2 swamp2 &&
+	test_cmp init.t swamp2/init.t
+
+Preparing worktree (new branch 'swmap2')
+HEAD is now at 179a9e0 c
+ok 58 - "add" worktree with --checkout
+
+expecting success of 2400.59 'put a worktree under rebase': 
+	git worktree add under-rebase &&
+	(
+		cd under-rebase &&
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		git worktree list >actual &&
+		grep "under-rebase.*detached HEAD" actual
+	)
+
+Preparing worktree (new branch 'under-rebase')
+HEAD is now at 179a9e0 c
+rebase -i script before editing:
+pick 179a9e0 c
+
+rebase -i script after editing:
+edit 179a9e0 c
+Rebasing (1/1)
Stopped at 179a9e0...  c
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase             179a9e0 (detached HEAD)
+ok 59 - put a worktree under rebase
+
+expecting success of 2400.60 'add a worktree, checking out a rebased branch': 
+	test_must_fail git worktree add new-rebase under-rebase &&
+	! test -d new-rebase
+
+Preparing worktree (checking out 'under-rebase')
+fatal: 'under-rebase' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase'
+ok 60 - add a worktree, checking out a rebased branch
+
+expecting success of 2400.61 'checking out a rebased branch from another worktree': 
+	git worktree add new-place &&
+	test_must_fail git -C new-place checkout under-rebase
+
+Preparing worktree (new branch 'new-place')
+HEAD is now at 179a9e0 c
+fatal: 'under-rebase' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase'
+ok 61 - checking out a rebased branch from another worktree
+
+expecting success of 2400.62 'not allow to delete a branch under rebase': 
+	(
+		cd under-rebase &&
+		test_must_fail git branch -D under-rebase
+	)
+
+error: cannot delete branch 'under-rebase' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase'
+ok 62 - not allow to delete a branch under rebase
+
+expecting success of 2400.63 'rename a branch under rebase not allowed': 
+	test_must_fail git branch -M under-rebase rebase-with-new-name
+
+fatal: branch refs/heads/under-rebase is being rebased at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-rebase
+ok 63 - rename a branch under rebase not allowed
+
+expecting success of 2400.64 'check out from current worktree branch ok': 
+	(
+		cd under-rebase &&
+		git checkout under-rebase &&
+		git checkout - &&
+		git rebase --abort
+	)
+
+Switched to branch 'under-rebase'
+Note: switching to '179a9e09a27c48c73ff2a192ec62ebcd60fedd6a'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 179a9e0 c
+ok 64 - check out from current worktree branch ok
+
+expecting success of 2400.65 'checkout a branch under bisect': 
+	git worktree add under-bisect &&
+	(
+		cd under-bisect &&
+		git bisect start &&
+		git bisect bad &&
+		git bisect good HEAD~2 &&
+		git worktree list >actual &&
+		grep "under-bisect.*detached HEAD" actual &&
+		test_must_fail git worktree add new-bisect under-bisect &&
+		! test -d new-bisect
+	)
+
+Preparing worktree (new branch 'under-bisect')
+HEAD is now at 179a9e0 c
+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 0 steps)
+[15d3bfcc767862b6abd36db671feb8356eb7d7d7] b
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-bisect             15d3bfc (detached HEAD)
+Preparing worktree (checking out 'under-bisect')
+fatal: 'under-bisect' is already used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-bisect'
+ok 65 - checkout a branch under bisect
+
+expecting success of 2400.66 'rename a branch under bisect not allowed': 
+	test_must_fail git branch -M under-bisect bisect-with-new-name
+
+fatal: branch refs/heads/under-bisect is being bisected at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/under-bisect
+ok 66 - rename a branch under bisect not allowed
+
+expecting success of 2400.67 '--track sets up tracking': 
+	test_when_finished rm -rf track &&
+	git worktree add --track -b track track main &&
+	test_branch_upstream track . main
+
+Preparing worktree (new branch 'track')
+branch 'track' set up to track 'main'.
+HEAD is now at 179a9e0 c
+ok 67 - --track sets up tracking
+
+expecting success of 2400.68 '"add" <path> <remote/branch> w/ no HEAD': 
+	test_when_finished rm -rf repo_upstream repo_local foo &&
+	setup_remote_repo repo_upstream repo_local &&
+	git -C repo_local config --bool core.bare true &&
+	git -C repo_local branch -D main &&
+	git -C repo_local worktree add ./foo repo_upstream/foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
+[main (root-commit) 135732a] repo_upstream_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_upstream_main.t
+Switched to a new branch 'foo'
+[foo 7502c9e] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_local/.git/
+[main (root-commit) d4b0dca] repo_local_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_local_main.t
+From ../repo_upstream
+ * [new branch]      foo                -> repo_upstream/foo
+ * [new branch]      main               -> repo_upstream/main
+ * [new tag]         repo_upstream_main -> repo_upstream_main
+ * [new tag]         upstream_foo       -> upstream_foo
+Deleted branch main (was d4b0dca).
+Preparing worktree (detached HEAD 7502c9e)
+HEAD is now at 7502c9e upstream_foo
+ok 68 - "add" <path> <remote/branch> w/ no HEAD
+
+expecting success of 2400.69 '--no-track avoids setting up tracking': 
+	test_when_finished rm -rf repo_upstream repo_local foo &&
+	setup_remote_repo repo_upstream repo_local &&
+	(
+		cd repo_local &&
+		git worktree add --no-track -b foo ../foo repo_upstream/foo
+	) &&
+	(
+		cd foo &&
+		test_must_fail git config "branch.foo.remote" &&
+		test_must_fail git config "branch.foo.merge" &&
+		test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
+[main (root-commit) 135732a] repo_upstream_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_upstream_main.t
+Switched to a new branch 'foo'
+[foo 7502c9e] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_local/.git/
+[main (root-commit) d4b0dca] repo_local_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_local_main.t
+From ../repo_upstream
+ * [new branch]      foo                -> repo_upstream/foo
+ * [new branch]      main               -> repo_upstream/main
+ * [new tag]         repo_upstream_main -> repo_upstream_main
+ * [new tag]         upstream_foo       -> upstream_foo
+Preparing worktree (new branch 'foo')
+HEAD is now at 7502c9e upstream_foo
+ok 69 - --no-track avoids setting up tracking
+
+expecting success of 2400.70 '"add" <path> <non-existent-branch> fails': 
+	test_must_fail git worktree add foo non-existent
+
+fatal: invalid reference: non-existent
+ok 70 - "add" <path> <non-existent-branch> fails
+
+expecting success of 2400.71 '"add" <path> <branch> dwims': 
+	test_when_finished rm -rf repo_upstream repo_dwim foo &&
+	setup_remote_repo repo_upstream repo_dwim &&
+	git init repo_dwim &&
+	(
+		cd repo_dwim &&
+		git worktree add ../foo foo
+	) &&
+	(
+		cd foo &&
+		test_branch_upstream foo repo_upstream foo &&
+		test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
+[main (root-commit) 135732a] repo_upstream_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_upstream_main.t
+Switched to a new branch 'foo'
+[foo 7502c9e] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
+[main (root-commit) 9838263] repo_dwim_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_dwim_main.t
+From ../repo_upstream
+ * [new branch]      foo                -> repo_upstream/foo
+ * [new branch]      main               -> repo_upstream/main
+ * [new tag]         repo_upstream_main -> repo_upstream_main
+ * [new tag]         upstream_foo       -> upstream_foo
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
+Preparing worktree (new branch 'foo')
+branch 'foo' set up to track 'repo_upstream/foo'.
+HEAD is now at 7502c9e upstream_foo
+ok 71 - "add" <path> <branch> dwims
+
+expecting success of 2400.72 '"add" <path> <branch> dwims with checkout.defaultRemote': 
+	test_when_finished rm -rf repo_upstream repo_dwim foo &&
+	setup_remote_repo repo_upstream repo_dwim &&
+	git init repo_dwim &&
+	(
+		cd repo_dwim &&
+		git remote add repo_upstream2 ../repo_upstream &&
+		git fetch repo_upstream2 &&
+		test_must_fail git worktree add ../foo foo &&
+		git -c checkout.defaultRemote=repo_upstream worktree add ../foo foo &&
+		git status -uno --porcelain >status.actual &&
+		test_must_be_empty status.actual
+	) &&
+	(
+		cd foo &&
+		test_branch_upstream foo repo_upstream foo &&
+		test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_upstream/.git/
+[main (root-commit) 135732a] repo_upstream_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_upstream_main.t
+Switched to a new branch 'foo'
+[foo 7502c9e] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
+[main (root-commit) 9838263] repo_dwim_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_dwim_main.t
+From ../repo_upstream
+ * [new branch]      foo                -> repo_upstream/foo
+ * [new branch]      main               -> repo_upstream/main
+ * [new tag]         repo_upstream_main -> repo_upstream_main
+ * [new tag]         upstream_foo       -> upstream_foo
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_dwim/.git/
+From ../repo_upstream
+ * [new branch]      foo        -> repo_upstream2/foo
+ * [new branch]      main       -> repo_upstream2/main
+fatal: invalid reference: foo
+Preparing worktree (new branch 'foo')
+branch 'foo' set up to track 'repo_upstream/foo'.
+HEAD is now at 7502c9e upstream_foo
+ok 72 - "add" <path> <branch> dwims with checkout.defaultRemote
+
+expecting success of 2400.73 'git worktree add does not match remote': 
+	test_when_finished rm -rf repo_a repo_b foo &&
+	setup_remote_repo repo_a repo_b &&
+	(
+		cd repo_b &&
+		git worktree add ../foo
+	) &&
+	(
+		cd foo &&
+		test_must_fail git config "branch.foo.remote" &&
+		test_must_fail git config "branch.foo.merge" &&
+		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
+[main (root-commit) dcba593] repo_a_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_a_main.t
+Switched to a new branch 'foo'
+[foo 9855f4b] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
+[main (root-commit) 49eaa9c] repo_b_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_b_main.t
+From ../repo_a
+ * [new branch]      foo          -> repo_a/foo
+ * [new branch]      main         -> repo_a/main
+ * [new tag]         repo_a_main  -> repo_a_main
+ * [new tag]         upstream_foo -> upstream_foo
+Preparing worktree (new branch 'foo')
+HEAD is now at 49eaa9c repo_b_main
+ok 73 - git worktree add does not match remote
+
+expecting success of 2400.74 'git worktree add --guess-remote sets up tracking': 
+	test_when_finished rm -rf repo_a repo_b foo &&
+	setup_remote_repo repo_a repo_b &&
+	(
+		cd repo_b &&
+		git worktree add --guess-remote ../foo
+	) &&
+	(
+		cd foo &&
+		test_branch_upstream foo repo_a foo &&
+		test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
+[main (root-commit) dcba593] repo_a_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_a_main.t
+Switched to a new branch 'foo'
+[foo 9855f4b] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
+[main (root-commit) 49eaa9c] repo_b_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_b_main.t
+From ../repo_a
+ * [new branch]      foo          -> repo_a/foo
+ * [new branch]      main         -> repo_a/main
+ * [new tag]         repo_a_main  -> repo_a_main
+ * [new tag]         upstream_foo -> upstream_foo
+Preparing worktree (new branch 'foo')
+branch 'foo' set up to track 'repo_a/foo'.
+HEAD is now at 9855f4b upstream_foo
+ok 74 - git worktree add --guess-remote sets up tracking
+
+expecting success of 2400.75 'git worktree add --guess-remote sets up tracking (quiet)': 
+	test_when_finished rm -rf repo_a repo_b foo &&
+	setup_remote_repo repo_a repo_b &&
+	(
+		cd repo_b &&
+		git worktree add --quiet --guess-remote ../foo 2>actual &&
+		test_must_be_empty actual
+	) &&
+	(
+		cd foo &&
+		test_branch_upstream foo repo_a foo &&
+		test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
+[main (root-commit) dcba593] repo_a_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_a_main.t
+Switched to a new branch 'foo'
+[foo 9855f4b] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
+[main (root-commit) 49eaa9c] repo_b_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_b_main.t
+From ../repo_a
+ * [new branch]      foo          -> repo_a/foo
+ * [new branch]      main         -> repo_a/main
+ * [new tag]         repo_a_main  -> repo_a_main
+ * [new tag]         upstream_foo -> upstream_foo
+ok 75 - git worktree add --guess-remote sets up tracking (quiet)
+
+expecting success of 2400.76 'git worktree --no-guess-remote (quiet)': 
+	test_when_finished rm -rf repo_a repo_b foo &&
+	setup_remote_repo repo_a repo_b &&
+	(
+		cd repo_b &&
+		git worktree add --quiet --no-guess-remote ../foo
+	) &&
+	(
+		cd foo &&
+		test_must_fail git config "branch.foo.remote" &&
+		test_must_fail git config "branch.foo.merge" &&
+		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
+[main (root-commit) dcba593] repo_a_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_a_main.t
+Switched to a new branch 'foo'
+[foo 9855f4b] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
+[main (root-commit) 49eaa9c] repo_b_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_b_main.t
+From ../repo_a
+ * [new branch]      foo          -> repo_a/foo
+ * [new branch]      main         -> repo_a/main
+ * [new tag]         repo_a_main  -> repo_a_main
+ * [new tag]         upstream_foo -> upstream_foo
+ok 76 - git worktree --no-guess-remote (quiet)
+
+expecting success of 2400.77 'git worktree add with worktree.guessRemote sets up tracking': 
+	test_when_finished rm -rf repo_a repo_b foo &&
+	setup_remote_repo repo_a repo_b &&
+	(
+		cd repo_b &&
+		git config worktree.guessRemote true &&
+		git worktree add ../foo
+	) &&
+	(
+		cd foo &&
+		test_branch_upstream foo repo_a foo &&
+		test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
+[main (root-commit) dcba593] repo_a_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_a_main.t
+Switched to a new branch 'foo'
+[foo 9855f4b] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
+[main (root-commit) 49eaa9c] repo_b_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_b_main.t
+From ../repo_a
+ * [new branch]      foo          -> repo_a/foo
+ * [new branch]      main         -> repo_a/main
+ * [new tag]         repo_a_main  -> repo_a_main
+ * [new tag]         upstream_foo -> upstream_foo
+Preparing worktree (new branch 'foo')
+branch 'foo' set up to track 'repo_a/foo'.
+HEAD is now at 9855f4b upstream_foo
+ok 77 - git worktree add with worktree.guessRemote sets up tracking
+
+expecting success of 2400.78 'git worktree --no-guess-remote option overrides config': 
+	test_when_finished rm -rf repo_a repo_b foo &&
+	setup_remote_repo repo_a repo_b &&
+	(
+		cd repo_b &&
+		git config worktree.guessRemote true &&
+		git worktree add --no-guess-remote ../foo
+	) &&
+	(
+		cd foo &&
+		test_must_fail git config "branch.foo.remote" &&
+		test_must_fail git config "branch.foo.merge" &&
+		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_a/.git/
+[main (root-commit) dcba593] repo_a_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_a_main.t
+Switched to a new branch 'foo'
+[foo 9855f4b] upstream_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo_b/.git/
+[main (root-commit) 49eaa9c] repo_b_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repo_b_main.t
+From ../repo_a
+ * [new branch]      foo          -> repo_a/foo
+ * [new branch]      main         -> repo_a/main
+ * [new tag]         repo_a_main  -> repo_a_main
+ * [new tag]         upstream_foo -> upstream_foo
+Preparing worktree (new branch 'foo')
+HEAD is now at 49eaa9c repo_b_main
+ok 78 - git worktree --no-guess-remote option overrides config
+
+expecting success of 2400.79 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 79 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch
+
+expecting success of 2400.80 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, valid HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+HEAD is now at 6d95aef commit
+ok 80 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, valid HEAD
+
+expecting success of 2400.81 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 81 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.82 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 82 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.83 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+fatal: No local or remote refs exist despite at least one remote
+ok 83 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+
+expecting success of 2400.84 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 84 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+
+expecting success of 2400.85 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+branch 'foo' set up to track 'upstream/foo'.
+HEAD is now at 6d95aef commit
+ok 85 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+
+expecting success of 2400.86 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd repo && git', --branch': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 86 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd repo && git', --branch
+
+expecting success of 2400.87 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, valid HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+HEAD is now at 6d95aef commit
+ok 87 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, valid HEAD
+
+expecting success of 2400.88 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 88 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.89 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 89 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.90 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 90 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+
+expecting success of 2400.91 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+No possible source branch, inferring '--orphan'
+ok 91 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+
+expecting success of 2400.92 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+warning: HEAD points to an invalid (or orphaned) reference.
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
+HEAD contents: 'ref: refs/heads/badbranch'
+hint: If you meant to create a worktree containing a new unborn branch
+fatal: invalid reference: HEAD
+ok 92 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
+
+expecting success of 2400.93 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+warning: HEAD points to an invalid (or orphaned) reference.
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
+HEAD contents: 'ref: refs/heads/badbranch'
+hint: If you meant to create a worktree containing a new unborn branch
+fatal: invalid reference: HEAD
+ok 93 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD
+
+expecting success of 2400.94 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+warning: HEAD points to an invalid (or orphaned) reference.
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
+HEAD contents: 'ref: refs/heads/badbranch'
+hint: If you meant to create a worktree containing a new unborn branch
+fatal: invalid reference: HEAD
+ok 94 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD
+
+expecting success of 2400.95 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+No possible source branch, inferring '--orphan'
+ok 95 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch
+
+expecting success of 2400.96 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, valid HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+HEAD is now at 6d95aef commit
+ok 96 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, valid HEAD
+
+expecting success of 2400.97 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+No possible source branch, inferring '--orphan'
+ok 97 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.98 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 98 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.99 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+fatal: No local or remote refs exist despite at least one remote
+ok 99 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+
+expecting success of 2400.100 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 100 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+
+expecting success of 2400.101 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+branch 'foo' set up to track 'upstream/foo'.
+HEAD is now at 6d95aef commit
+ok 101 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+
+expecting success of 2400.102 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd wt && git', --branch': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+No possible source branch, inferring '--orphan'
+ok 102 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'cd wt && git', --branch
+
+expecting success of 2400.103 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, valid HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+HEAD is now at 6d95aef commit
+ok 103 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, valid HEAD
+
+expecting success of 2400.104 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+No possible source branch, inferring '--orphan'
+ok 104 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.105 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 105 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.106 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 106 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+
+expecting success of 2400.107 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+No possible source branch, inferring '--orphan'
+ok 107 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+
+expecting success of 2400.108 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+warning: HEAD points to an invalid (or orphaned) reference.
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
+HEAD contents: 'ref: refs/heads/badbranch'
+hint: If you meant to create a worktree containing a new unborn branch
+fatal: invalid reference: HEAD
+ok 108 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
+
+expecting success of 2400.109 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+warning: HEAD points to an invalid (or orphaned) reference.
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
+HEAD contents: 'ref: refs/heads/badbranch'
+hint: If you meant to create a worktree containing a new unborn branch
+fatal: invalid reference: HEAD
+ok 109 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD
+
+expecting success of 2400.110 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+warning: HEAD points to an invalid (or orphaned) reference.
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
+HEAD contents: 'ref: refs/heads/badbranch'
+hint: If you meant to create a worktree containing a new unborn branch
+fatal: invalid reference: HEAD
+ok 110 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD
+
+expecting success of 2400.111 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 111 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch
+
+expecting success of 2400.112 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, valid HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+HEAD is now at 6d95aef commit
+ok 112 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, valid HEAD
+
+expecting success of 2400.113 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 113 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.114 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 114 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.115 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+fatal: No local or remote refs exist despite at least one remote
+ok 115 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+
+expecting success of 2400.116 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 116 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+
+expecting success of 2400.117 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+branch 'foo' set up to track 'upstream/foo'.
+HEAD is now at 6d95aef commit
+ok 117 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+
+expecting success of 2400.118 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C repo', --branch': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 118 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C repo', --branch
+
+expecting success of 2400.119 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, valid HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+HEAD is now at 6d95aef commit
+ok 119 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, valid HEAD
+
+expecting success of 2400.120 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+No possible source branch, inferring '--orphan'
+ok 120 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.121 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 121 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+
+expecting success of 2400.122 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+No possible source branch, inferring '--orphan'
+ok 122 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+
+expecting success of 2400.123 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+No possible source branch, inferring '--orphan'
+ok 123 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+
+expecting success of 2400.124 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
 
 		if [ $remote_ref -eq 1 ]
 		then
@@ -132109,19 +135572,18 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
 HEAD contents: 'ref: refs/heads/badbranch'
 hint: If you meant to create a worktree containing a new unborn branch
 fatal: invalid reference: HEAD
-ok 108 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 124 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.109 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.125 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -132228,19 +135690,18 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
 HEAD contents: 'ref: refs/heads/badbranch'
 hint: If you meant to create a worktree containing a new unborn branch
 fatal: invalid reference: HEAD
-ok 109 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 125 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.110 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.126 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -132347,19 +135808,18 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
 HEAD contents: 'ref: refs/heads/badbranch'
 hint: If you meant to create a worktree containing a new unborn branch
 fatal: invalid reference: HEAD
-ok 110 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD
+ok 126 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.111 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch': 
+expecting success of 2400.127 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -132466,10 +135926,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 No possible source branch, inferring '--orphan'
-ok 111 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch
+ok 127 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch
 
-expecting success of 2400.112 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.128 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -132576,14 +136037,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 HEAD is now at 6d95aef commit
-ok 112 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, valid HEAD
+ok 128 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.113 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.129 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -132690,10 +136152,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 No possible source branch, inferring '--orphan'
-ok 113 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+ok 129 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.114 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.130 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -132800,6 +136263,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -132807,9 +136271,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 No possible source branch, inferring '--orphan'
-ok 114 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 130 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.115 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.131 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -132916,6 +136380,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -132923,9 +136388,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 fatal: No local or remote refs exist despite at least one remote
-ok 115 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 131 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.116 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+expecting success of 2400.132 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133032,6 +136497,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -133039,9 +136505,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 No possible source branch, inferring '--orphan'
-ok 116 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+ok 132 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
 
-expecting success of 2400.117 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.133 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133148,6 +136614,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -133160,9 +136627,9 @@
  * [new tag]         commit     -> commit
 branch 'foo' set up to track 'upstream/foo'.
 HEAD is now at 6d95aef commit
-ok 117 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 133 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.118 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C repo', --branch': 
+expecting success of 2400.134 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C wt', --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133269,10 +136736,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 No possible source branch, inferring '--orphan'
-ok 118 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C repo', --branch
+ok 134 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C wt', --branch
 
-expecting success of 2400.119 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.135 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133379,14 +136847,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 HEAD is now at 6d95aef commit
-ok 119 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, valid HEAD
+ok 135 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.120 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.136 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133493,10 +136962,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 No possible source branch, inferring '--orphan'
-ok 120 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+ok 136 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.121 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.137 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133603,6 +137073,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -133610,9 +137081,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 No possible source branch, inferring '--orphan'
-ok 121 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 137 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.122 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.138 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133719,6 +137190,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -133726,9 +137198,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 No possible source branch, inferring '--orphan'
-ok 122 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 138 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.123 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.139 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133835,6 +137307,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -133846,9 +137319,9 @@
  * [new branch]      main       -> upstream/main
  * [new tag]         commit     -> commit
 No possible source branch, inferring '--orphan'
-ok 123 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 139 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.124 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.140 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -133955,18 +137428,19 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
 HEAD contents: 'ref: refs/heads/badbranch'
 hint: If you meant to create a worktree containing a new unborn branch
 fatal: invalid reference: HEAD
-ok 124 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 140 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.125 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.141 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134073,18 +137547,19 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
 HEAD contents: 'ref: refs/heads/badbranch'
 hint: If you meant to create a worktree containing a new unborn branch
 fatal: invalid reference: HEAD
-ok 125 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 141 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.126 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.142 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134191,18 +137666,19 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/HEAD'
+HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
 HEAD contents: 'ref: refs/heads/badbranch'
 hint: If you meant to create a worktree containing a new unborn branch
 fatal: invalid reference: HEAD
-ok 126 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD
+ok 142 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.127 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch': 
+expecting success of 2400.143 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --no-checkout': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134309,11 +137785,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 No possible source branch, inferring '--orphan'
-ok 127 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch
+fatal: options '--orphan' and '--no-checkout' cannot be used together
+ok 143 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --no-checkout
 
-expecting success of 2400.128 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.144 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --track': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134420,15 +137896,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-HEAD is now at 6d95aef commit
-ok 128 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, valid HEAD
+No possible source branch, inferring '--orphan'
+fatal: options '--orphan' and '--track' cannot be used together
+ok 144 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --track
 
-expecting success of 2400.129 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.145 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --no-checkout': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134535,11 +138007,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 No possible source branch, inferring '--orphan'
-ok 129 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+fatal: options '--orphan' and '--no-checkout' cannot be used together
+ok 145 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --no-checkout
 
-expecting success of 2400.130 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.146 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --track': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134646,17 +138118,11 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
 No possible source branch, inferring '--orphan'
-ok 130 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+fatal: options '--orphan' and '--track' cannot be used together
+ok 146 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --track
 
-expecting success of 2400.131 '"add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.147 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd repo && git', no --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134763,17 +138229,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-fatal: No local or remote refs exist despite at least one remote
-ok 131 - "add" error need fetch w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 147 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd repo && git', no --branch
 
-expecting success of 2400.132 '"add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+expecting success of 2400.148 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134880,17 +138338,13 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 132 - "add" DWIM infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+ok 148 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.133 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.149 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -134997,22 +138451,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-branch 'foo' set up to track 'upstream/foo'.
-HEAD is now at 6d95aef commit
-ok 133 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 149 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.134 '"add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C wt', --branch': 
+expecting success of 2400.150 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135119,11 +138560,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-No possible source branch, inferring '--orphan'
-ok 134 - "add" DWIM infer --orphan w/ empty repo, no --quiet (expect output), 'git -C wt', --branch
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+ok 150 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.135 '"add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.151 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135230,15 +138675,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-HEAD is now at 6d95aef commit
-ok 135 - "add" DWIM doesnt infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, valid HEAD
+Switched to a new branch 'foo'
+fatal: No local or remote refs exist despite at least one remote
+ok 151 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.136 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.152 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135345,11 +138791,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-No possible source branch, inferring '--orphan'
-ok 136 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+ok 152 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
 
-expecting success of 2400.137 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.153 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135456,17 +138906,19 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 137 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+ok 153 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.138 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.154 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'cd repo && git', --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135573,17 +139025,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-No possible source branch, inferring '--orphan'
-ok 138 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 154 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'cd repo && git', --branch
 
-expecting success of 2400.139 '"add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.155 '"add" DWIM doesnt infer --orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135690,21 +139134,13 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-No possible source branch, inferring '--orphan'
-ok 139 - "add" DWIM infer --orphan w/ no --quiet (expect output), 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 155 - "add" DWIM doesnt infer --orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.140 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.156 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135811,19 +139247,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
-HEAD contents: 'ref: refs/heads/badbranch'
-hint: If you meant to create a worktree containing a new unborn branch
-fatal: invalid reference: HEAD
-ok 140 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), no --quiet (expect output), 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 156 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.141 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.157 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -135930,19 +139356,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
-HEAD contents: 'ref: refs/heads/badbranch'
-hint: If you meant to create a worktree containing a new unborn branch
-fatal: invalid reference: HEAD
-ok 141 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD
+Switched to a new branch 'foo'
+ok 157 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.142 '"add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.158 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136049,19 +139471,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-warning: HEAD points to an invalid (or orphaned) reference.
-HEAD path: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/worktrees/wt/HEAD'
-HEAD contents: 'ref: refs/heads/badbranch'
-hint: If you meant to create a worktree containing a new unborn branch
-fatal: invalid reference: HEAD
-ok 142 - "add" error, warn on bad HEAD, hint use orphan w/ no --quiet (expect output), 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD
+Switched to a new branch 'foo'
+ok 158 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.143 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --no-checkout': 
+expecting success of 2400.159 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136168,11 +139586,19 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-fatal: options '--orphan' and '--no-checkout' cannot be used together
-ok 143 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --no-checkout
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+Switched to a new branch 'foo'
+From ../upstream
+ * [new branch]      foo        -> upstream/foo
+ * [new branch]      main       -> upstream/main
+ * [new tag]         commit     -> commit
+ok 159 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.144 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --track': 
+expecting success of 2400.160 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136279,11 +139705,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-fatal: options '--orphan' and '--track' cannot be used together
-ok 144 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), no --quiet (expect output), no --branch, --track
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+fatal: invalid reference: HEAD
+fatal: invalid reference: HEAD
+ok 160 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.145 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --no-checkout': 
+expecting success of 2400.161 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136390,11 +139820,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-fatal: options '--orphan' and '--no-checkout' cannot be used together
-ok 145 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --no-checkout
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+fatal: invalid reference: HEAD
+fatal: invalid reference: HEAD
+ok 161 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.146 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --track': 
+expecting success of 2400.162 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136501,11 +139935,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-No possible source branch, inferring '--orphan'
-fatal: options '--orphan' and '--track' cannot be used together
-ok 146 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, no --quiet (expect output), --branch, --track
+[main (root-commit) 6d95aef] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+fatal: invalid reference: HEAD
+fatal: invalid reference: HEAD
+ok 162 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.147 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd repo && git', no --branch': 
+expecting success of 2400.163 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd wt && git', no --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136612,9 +140050,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 147 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd repo && git', no --branch
+Preparing worktree (new branch 'orphanbranch')
+ok 163 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd wt && git', no --branch
 
-expecting success of 2400.148 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.164 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136721,13 +140160,14 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-ok 148 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, valid HEAD
+ok 164 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.149 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.165 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136834,9 +140274,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 149 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+Preparing worktree (new branch 'orphanbranch')
+ok 165 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.150 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.166 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -136943,15 +140384,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 150 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 166 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.151 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.167 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137058,6 +140500,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -137065,9 +140508,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 fatal: No local or remote refs exist despite at least one remote
-ok 151 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 167 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.152 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+expecting success of 2400.168 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137174,15 +140617,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 152 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+ok 168 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
 
-expecting success of 2400.153 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.169 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137289,6 +140733,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -137299,9 +140744,9 @@
  * [new branch]      foo        -> upstream/foo
  * [new branch]      main       -> upstream/main
  * [new tag]         commit     -> commit
-ok 153 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 169 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.154 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'cd repo && git', --branch': 
+expecting success of 2400.170 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'cd wt && git', --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137408,9 +140853,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 154 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'cd repo && git', --branch
+Preparing worktree (new branch 'orphanbranch')
+ok 170 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'cd wt && git', --branch
 
-expecting success of 2400.155 '"add" DWIM doesnt infer --orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.171 '"add" DWIM doesnt infer --orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137517,13 +140963,14 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-ok 155 - "add" DWIM doesnt infer --orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, valid HEAD
+ok 171 - "add" DWIM doesnt infer --orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.156 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.172 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137630,9 +141077,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 156 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+Preparing worktree (new branch 'orphanbranch')
+ok 172 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.157 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.173 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137739,15 +141187,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 157 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 173 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.158 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.174 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137854,15 +141303,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 158 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 174 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.159 '"add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.175 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -137969,6 +141419,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -137979,9 +141430,9 @@
  * [new branch]      foo        -> upstream/foo
  * [new branch]      main       -> upstream/main
  * [new tag]         commit     -> commit
-ok 159 - "add" DWIM infer --orphan w/ --quiet, 'cd repo && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 175 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.160 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.176 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138088,15 +141539,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 160 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd repo && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 176 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.161 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.177 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138203,15 +141655,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 161 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 177 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.162 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.178 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138318,15 +141771,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 162 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd repo && git', --detach, >=1 local branches, invalid (or orphan) HEAD
+ok 178 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.163 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd wt && git', no --branch': 
+expecting success of 2400.179 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C repo', no --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138433,10 +141887,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 163 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'cd wt && git', no --branch
+ok 179 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C repo', no --branch
 
-expecting success of 2400.164 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.180 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138543,14 +141996,13 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-ok 164 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, valid HEAD
+ok 180 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.165 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.181 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138657,10 +142109,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 165 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+ok 181 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.166 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.182 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138767,16 +142218,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 166 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 182 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.167 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.183 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -138883,7 +142333,6 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -138891,9 +142340,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 fatal: No local or remote refs exist despite at least one remote
-ok 167 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 183 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.168 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+expecting success of 2400.184 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139000,16 +142449,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 168 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+ok 184 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
 
-expecting success of 2400.169 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.185 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139116,7 +142564,6 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -139127,9 +142574,9 @@
  * [new branch]      foo        -> upstream/foo
  * [new branch]      main       -> upstream/main
  * [new tag]         commit     -> commit
-ok 169 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 185 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.170 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'cd wt && git', --branch': 
+expecting success of 2400.186 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C repo', --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139236,10 +142683,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 170 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'cd wt && git', --branch
+ok 186 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C repo', --branch
 
-expecting success of 2400.171 '"add" DWIM doesnt infer --orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.187 '"add" DWIM doesnt infer --orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139346,14 +142792,13 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-ok 171 - "add" DWIM doesnt infer --orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, valid HEAD
+ok 187 - "add" DWIM doesnt infer --orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.172 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.188 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139460,10 +142905,9 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 172 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+ok 188 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.173 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.189 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139570,16 +143014,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 173 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 189 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.174 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.190 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139686,16 +143129,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 174 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 190 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.175 '"add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.191 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139802,7 +143244,6 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -139813,9 +143254,9 @@
  * [new branch]      foo        -> upstream/foo
  * [new branch]      main       -> upstream/main
  * [new tag]         commit     -> commit
-ok 175 - "add" DWIM infer --orphan w/ --quiet, 'cd wt && git', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 191 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.176 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.192 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -139922,16 +143363,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 176 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'cd wt && git', no --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 192 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.177 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.193 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140038,16 +143478,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 177 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 193 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.178 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.194 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140154,16 +143593,15 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 178 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'cd wt && git', --detach, >=1 local branches, invalid (or orphan) HEAD
+ok 194 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.179 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C repo', no --branch': 
+expecting success of 2400.195 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C wt', no --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140270,9 +143708,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 179 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C repo', no --branch
+Preparing worktree (new branch 'orphanbranch')
+ok 195 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C wt', no --branch
 
-expecting success of 2400.180 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.196 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140379,13 +143818,14 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-ok 180 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, valid HEAD
+ok 196 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.181 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.197 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140492,9 +143932,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 181 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+Preparing worktree (new branch 'orphanbranch')
+ok 197 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.182 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.198 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140601,15 +144042,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 182 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 198 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.183 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.199 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140716,6 +144158,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -140723,9 +144166,9 @@
  create mode 100644 commit.t
 Switched to a new branch 'foo'
 fatal: No local or remote refs exist despite at least one remote
-ok 183 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 199 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.184 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
+expecting success of 2400.200 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140832,15 +144275,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 184 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+ok 200 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
 
-expecting success of 2400.185 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.201 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -140947,6 +144391,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -140957,9 +144402,9 @@
  * [new branch]      foo        -> upstream/foo
  * [new branch]      main       -> upstream/main
  * [new tag]         commit     -> commit
-ok 185 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 201 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.186 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C repo', --branch': 
+expecting success of 2400.202 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C wt', --branch': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141066,9 +144511,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 186 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C repo', --branch
+Preparing worktree (new branch 'orphanbranch')
+ok 202 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C wt', --branch
 
-expecting success of 2400.187 '"add" DWIM doesnt infer --orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, valid HEAD': 
+expecting success of 2400.203 '"add" DWIM doesnt infer --orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, valid HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141175,13 +144621,14 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
-ok 187 - "add" DWIM doesnt infer --orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, valid HEAD
+ok 203 - "add" DWIM doesnt infer --orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, valid HEAD
 
-expecting success of 2400.188 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.204 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141288,9 +144735,10 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-ok 188 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+Preparing worktree (new branch 'orphanbranch')
+ok 204 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.189 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
+expecting success of 2400.205 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141397,15 +144845,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 189 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+ok 205 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
 
-expecting success of 2400.190 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
+expecting success of 2400.206 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141512,15 +144961,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 Switched to a new branch 'foo'
-ok 190 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ok 206 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
 
-expecting success of 2400.191 '"add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
+expecting success of 2400.207 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141627,6 +145077,7 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'orphanbranch')
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
@@ -141637,9 +145088,9 @@
  * [new branch]      foo        -> upstream/foo
  * [new branch]      main       -> upstream/main
  * [new tag]         commit     -> commit
-ok 191 - "add" DWIM infer --orphan w/ --quiet, 'git -C repo', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+ok 207 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
 
-expecting success of 2400.192 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.208 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141746,15 +145197,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 192 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C repo', no --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 208 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.193 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.209 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141861,15 +145313,16 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit.t
 fatal: invalid reference: HEAD
 fatal: invalid reference: HEAD
-ok 193 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --branch, >=1 local branches, invalid (or orphan) HEAD
+ok 209 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD
 
-expecting success of 2400.194 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD': 
+expecting success of 2400.210 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD': 
 		test_when_finished "rm -rf repo" &&
 		git init repo &&
 		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
@@ -141976,3374 +145429,5822 @@
 		fi
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+Preparing worktree (new branch 'main')
 [main (root-commit) 6d95aef] commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-fatal: invalid reference: HEAD
-fatal: invalid reference: HEAD
-ok 194 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C repo', --detach, >=1 local branches, invalid (or orphan) HEAD
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+fatal: invalid reference: HEAD
+fatal: invalid reference: HEAD
+ok 210 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD
+
+expecting success of 2400.211 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --no-checkout': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+fatal: options '--orphan' and '--no-checkout' cannot be used together
+ok 211 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --no-checkout
+
+expecting success of 2400.212 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --track': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+fatal: options '--orphan' and '--track' cannot be used together
+ok 212 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --track
+
+expecting success of 2400.213 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --no-checkout': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+fatal: options '--orphan' and '--no-checkout' cannot be used together
+ok 213 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --no-checkout
+
+expecting success of 2400.214 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --track': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
+		then
+			(cd repo && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C repo symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b main ../wt &&
+			(cd wt && test_commit commit) &&
+			if [ $bad_head -eq 1 ]
+			then
+				git -C wt symbolic-ref HEAD refs/heads/badbranch
+			fi
+		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
+		then
+			test_when_finished "git -C repo worktree remove -f ../wt" &&
+			git -C repo worktree add --orphan -b orphanbranch ../wt
+		fi &&
+
+		if [ $remote -eq 1 ]
+		then
+			test_when_finished "rm -rf upstream" &&
+			git init upstream &&
+			(cd upstream && test_commit commit) &&
+			git -C upstream switch -c foo &&
+			git -C repo remote add upstream ../upstream
+		fi &&
+
+		if [ $remote_ref -eq 1 ]
+		then
+			git -C repo fetch
+		fi &&
+		if [ $success -eq 1 ]
+		then
+			test_when_finished git -C repo worktree remove ../foo
+		fi &&
+		(
+			if [ $use_cd -eq 1 ]
+			then
+				cd $git_ns
+			fi &&
+			if [ "$outcome" = "infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "no_infer" ]
+			then
+				git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					test_must_be_empty actual
+				else
+					! grep "$info_text" actual
+				fi
+			elif [ "$outcome" = "fetch_error" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				grep "$fetch_error_text" actual
+			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					! grep "$info_text" actual
+				else
+					grep "$info_text" actual
+				fi &&
+				grep "$bad_combo_regex" actual
+			elif [ "$outcome" = "warn_bad_head" ]
+			then
+				test_must_fail git $dashc_args worktree add $args 2>actual &&
+				if [ $use_quiet -eq 1 ]
+				then
+					grep "$invalid_ref_regex" actual &&
+					! grep "$orphan_hint" actual
+				else
+					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
+					headcontents=$(cat "$headpath") &&
+					grep "HEAD points to an invalid (or orphaned) reference" actual &&
+					grep "HEAD path: .$headpath." actual &&
+					grep "HEAD contents: .$headcontents." actual &&
+					grep "$orphan_hint" actual &&
+					! grep "$info_text" actual
+				fi &&
+				grep "$invalid_ref_regex" actual
+			else
+				# Unreachable
+				false
+			fi
+		) &&
+		if [ $success -ne 1 ]
+		then
+			test_path_is_missing foo
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+fatal: options '--orphan' and '--track' cannot be used together
+ok 214 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --track
+
+expecting success of 2400.215 '"add" invokes post-checkout hook (branch)': 
+	post_checkout_hook &&
+	{
+		echo $ZERO_OID $(git rev-parse HEAD) 1 &&
+		echo $(pwd)/.git/worktrees/gumby &&
+		echo $(pwd)/gumby
+	} >hook.expect &&
+	git worktree add gumby &&
+	test_cmp hook.expect gumby/hook.actual
+
+Preparing worktree (new branch 'gumby')
+HEAD is now at 179a9e0 c
+ok 215 - "add" invokes post-checkout hook (branch)
+
+expecting success of 2400.216 '"add" invokes post-checkout hook (detached)': 
+	post_checkout_hook &&
+	{
+		echo $ZERO_OID $(git rev-parse HEAD) 1 &&
+		echo $(pwd)/.git/worktrees/grumpy &&
+		echo $(pwd)/grumpy
+	} >hook.expect &&
+	git worktree add --detach grumpy &&
+	test_cmp hook.expect grumpy/hook.actual
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+ok 216 - "add" invokes post-checkout hook (detached)
+
+expecting success of 2400.217 '"add --no-checkout" suppresses post-checkout hook': 
+	post_checkout_hook &&
+	rm -f hook.actual &&
+	git worktree add --no-checkout gloopy &&
+	test_path_is_missing gloopy/hook.actual
+
+Preparing worktree (new branch 'gloopy')
+ok 217 - "add --no-checkout" suppresses post-checkout hook
+
+expecting success of 2400.218 '"add" in other worktree invokes post-checkout hook': 
+	post_checkout_hook &&
+	{
+		echo $ZERO_OID $(git rev-parse HEAD) 1 &&
+		echo $(pwd)/.git/worktrees/guppy &&
+		echo $(pwd)/guppy
+	} >hook.expect &&
+	git -C gloopy worktree add --detach ../guppy &&
+	test_cmp hook.expect guppy/hook.actual
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+ok 218 - "add" in other worktree invokes post-checkout hook
+
+expecting success of 2400.219 '"add" in bare repo invokes post-checkout hook': 
+	rm -rf bare &&
+	git clone --bare . bare &&
+	{
+		echo $ZERO_OID $(git --git-dir=bare rev-parse HEAD) 1 &&
+		echo $(pwd)/bare/worktrees/goozy &&
+		echo $(pwd)/goozy
+	} >hook.expect &&
+	post_checkout_hook bare &&
+	git -C bare worktree add --detach ../goozy &&
+	test_cmp hook.expect goozy/hook.actual
+
+Cloning into bare repository 'bare'...
+done.
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+ok 219 - "add" in bare repo invokes post-checkout hook
+
+expecting success of 2400.220 '"add" an existing but missing worktree': 
+	git worktree add --detach pneu &&
+	test_must_fail git worktree add --detach pneu &&
+	rm -fr pneu &&
+	test_must_fail git worktree add --detach pneu &&
+	git worktree add --force --detach pneu
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+Preparing worktree (detached HEAD 179a9e0)
+fatal: 'pneu' already exists
+Preparing worktree (detached HEAD 179a9e0)
+fatal: 'pneu' is a missing but already registered worktree;
+use 'add -f' to override, or 'prune' or 'remove' to clear
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+ok 220 - "add" an existing but missing worktree
+
+expecting success of 2400.221 '"add" an existing locked but missing worktree': 
+	git worktree add --detach gnoo &&
+	git worktree lock gnoo &&
+	test_when_finished "git worktree unlock gnoo || :" &&
+	rm -fr gnoo &&
+	test_must_fail git worktree add --detach gnoo &&
+	test_must_fail git worktree add --force --detach gnoo &&
+	git worktree add --force --force --detach gnoo
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+Preparing worktree (detached HEAD 179a9e0)
+fatal: 'gnoo' is a missing but locked worktree;
+use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear
+Preparing worktree (detached HEAD 179a9e0)
+fatal: 'gnoo' is a missing but locked worktree;
+use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+fatal: 'gnoo' is not locked
+ok 221 - "add" an existing locked but missing worktree
+
+expecting success of 2400.222 '"add" not tripped up by magic worktree matching"': 
+	# if worktree "sub1/bar" exists, "git worktree add bar" in distinct
+	# directory `sub2` should not mistakenly complain that `bar` is an
+	# already-registered worktree
+	mkdir sub1 sub2 &&
+	git -C sub1 --git-dir=../.git worktree add --detach bozo &&
+	git -C sub2 --git-dir=../.git worktree add --detach bozo
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+ok 222 - "add" not tripped up by magic worktree matching"
+
+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 2400.223 'sanitize generated worktree name': 
+	git worktree add --detach ".  weird*..?.lock.lock" &&
+	test -d .git/worktrees/---weird-.-
+
+Preparing worktree (detached HEAD 179a9e0)
+HEAD is now at 179a9e0 c
+ok 223 - sanitize generated worktree name
+
+expecting success of 2400.224 '"add" should not fail because of another bad worktree': 
+	git init add-fail &&
+	(
+		cd add-fail &&
+		test_commit first &&
+		mkdir sub &&
+		git worktree add sub/to-be-deleted &&
+		rm -rf sub &&
+		git worktree add second
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/add-fail/.git/
+[main (root-commit) 264aca7] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Preparing worktree (new branch 'to-be-deleted')
+HEAD is now at 264aca7 first
+Preparing worktree (new branch 'second')
+HEAD is now at 264aca7 first
+ok 224 - "add" should not fail because of another bad worktree
+
+expecting success of 2400.225 '"add" with uninitialized submodule, with submodule.recurse unset': 
+	test_config_global protocol.file.allow always &&
+	test_create_repo submodule &&
+	test_commit -C submodule first &&
+	test_create_repo project &&
+	git -C project submodule add ../submodule &&
+	git -C project add submodule &&
+	test_tick &&
+	git -C project commit -m add_sub &&
+	git clone project project-clone &&
+	git -C project-clone worktree add ../project-2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/submodule/.git/
+[main (root-commit) 264aca7] 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.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/project/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/project/submodule'...
+done.
+[main (root-commit) 57eb801] add_sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into 'project-clone'...
+done.
+Preparing worktree (new branch 'project-2')
+HEAD is now at 57eb801 add_sub
+ok 225 - "add" with uninitialized submodule, with submodule.recurse unset
+
+expecting success of 2400.226 '"add" with uninitialized submodule, with submodule.recurse set': 
+	git -C project-clone -c submodule.recurse worktree add ../project-3
+
+Preparing worktree (new branch 'project-3')
+HEAD is now at 57eb801 add_sub
+ok 226 - "add" with uninitialized submodule, with submodule.recurse set
+
+expecting success of 2400.227 '"add" with initialized submodule, with submodule.recurse unset': 
+	test_config_global protocol.file.allow always &&
+	git -C project-clone submodule update --init &&
+	git -C project-clone worktree add ../project-4
+
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/project-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '264aca7c7b40ec0269cc15ea29c2bdbebfea2e3a'
+Preparing worktree (new branch 'project-4')
+HEAD is now at 57eb801 add_sub
+ok 227 - "add" with initialized submodule, with submodule.recurse unset
+
+expecting success of 2400.228 '"add" with initialized submodule, with submodule.recurse set': 
+	git -C project-clone -c submodule.recurse worktree add ../project-5
+
+Preparing worktree (new branch 'project-5')
+HEAD is now at 57eb801 add_sub
+ok 228 - "add" with initialized submodule, with submodule.recurse set
+
+expecting success of 2400.229 'can create worktrees with relative paths': 
+	test_when_finished "git worktree remove relative" &&
+	test_config worktree.useRelativePaths false &&
+	git worktree add --relative-paths ./relative &&
+	echo "gitdir: ../.git/worktrees/relative" >expect &&
+	test_cmp expect relative/.git &&
+	echo "../../../relative/.git" >expect &&
+	test_cmp expect .git/worktrees/relative/gitdir
+
+Preparing worktree (new branch 'relative')
+HEAD is now at 179a9e0 c
+ok 229 - can create worktrees with relative paths
+
+expecting success of 2400.230 'can create worktrees with absolute paths': 
+	test_config worktree.useRelativePaths true &&
+	git worktree add ./relative &&
+	echo "gitdir: ../.git/worktrees/relative" >expect &&
+	test_cmp expect relative/.git &&
+	git worktree add --no-relative-paths ./absolute &&
+	echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect &&
+	test_cmp expect absolute/.git &&
+	echo "$(pwd)/absolute/.git" >expect &&
+	test_cmp expect .git/worktrees/absolute/gitdir
+
+Preparing worktree (checking out 'relative')
+HEAD is now at 179a9e0 c
+Preparing worktree (new branch 'absolute')
+HEAD is now at 179a9e0 c
+ok 230 - can create worktrees with absolute paths
+
+expecting success of 2400.231 'move repo without breaking relative internal links': 
+	test_when_finished rm -rf repo moved &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit initial &&
+		git worktree add --relative-paths wt1 &&
+		cd .. &&
+		mv repo moved &&
+		cd moved/wt1 &&
+		git worktree list >out 2>err &&
+		test_must_be_empty err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 2aabd22] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Preparing worktree (new branch 'wt1')
+HEAD is now at 2aabd22 initial
+ok 231 - move repo without breaking relative internal links
+
+expecting success of 2400.232 'relative worktree sets extension config': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	git -C repo commit --allow-empty -m base &&
+	git -C repo worktree add --relative-paths ./foo &&
+	test_cmp_config -C repo 1 core.repositoryformatversion &&
+	test_cmp_config -C repo true extensions.relativeworktrees
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
+[main (root-commit) 22f6d84] base
+ Author: A U Thor <author@example.com>
+Preparing worktree (new branch 'foo')
+HEAD is now at 22f6d84 base
+ok 232 - relative worktree sets extension config
+
+# passed all 232 test(s)
+1..232
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3422-rebase-incompatible-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3422-rebase-incompatible-options/.git/
+expecting success of 3422.1 'setup': 
+	test_seq 2 9 >foo &&
+	git add foo &&
+	git commit -m orig &&
+
+	git branch A &&
+	git branch B &&
+
+	git checkout A &&
+	test_seq 1 9 >foo &&
+	git add foo &&
+	git commit -m A &&
+
+	git checkout B &&
+	echo "q qfoo();" | q_to_tab >>foo &&
+	git add foo &&
+	git commit -m B
+
+[master (root-commit) 3639f03] orig
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 foo
+Switched to branch 'A'
+[A ef5b704] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 079b709] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3422.2 '--whitespace=fix incompatible with --merge': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --merge A
+	
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 2 - --whitespace=fix incompatible with --merge
+
+expecting success of 3422.3 '--whitespace=fix incompatible with --strategy=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --strategy=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 3 - --whitespace=fix incompatible with --strategy=ours
+
+expecting success of 3422.4 '--whitespace=fix incompatible with --strategy-option=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --strategy-option=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 4 - --whitespace=fix incompatible with --strategy-option=ours
+
+expecting success of 3422.5 '--whitespace=fix incompatible with --autosquash': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --autosquash A
+	
+HEAD is now at 079b709 B
+fatal: --autosquash requires the merge backend
+ok 5 - --whitespace=fix incompatible with --autosquash
+
+expecting success of 3422.6 '--whitespace=fix incompatible with --interactive': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --interactive A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 6 - --whitespace=fix incompatible with --interactive
+
+expecting success of 3422.7 '--whitespace=fix incompatible with --exec': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --exec 'true' A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 7 - --whitespace=fix incompatible with --exec
+
+expecting success of 3422.8 '--whitespace=fix incompatible with --keep-empty': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --keep-empty A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 8 - --whitespace=fix incompatible with --keep-empty
+
+expecting success of 3422.9 '--whitespace=fix incompatible with --empty=...': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --empty=ask A
+	
+HEAD is now at 079b709 B
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+fatal: apply options and merge options cannot be used together
+ok 9 - --whitespace=fix incompatible with --empty=...
+
+expecting success of 3422.10 '--whitespace=fix incompatible with --no-reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --no-reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 10 - --whitespace=fix incompatible with --no-reapply-cherry-picks
+
+expecting success of 3422.11 '--whitespace=fix incompatible with --reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 11 - --whitespace=fix incompatible with --reapply-cherry-picks
+
+expecting success of 3422.12 '--whitespace=fix incompatible with --rebase-merges': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --rebase-merges A
+	
+HEAD is now at 079b709 B
+fatal: --rebase-merges requires the merge backend
+ok 12 - --whitespace=fix incompatible with --rebase-merges
+
+expecting success of 3422.13 '--whitespace=fix incompatible with --update-refs': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --update-refs A
+	
+HEAD is now at 079b709 B
+fatal: --update-refs requires the merge backend
+ok 13 - --whitespace=fix incompatible with --update-refs
+
+expecting success of 3422.14 '--whitespace=fix incompatible with --root without --onto': 
+		git checkout B^0 &&
+		test_must_fail git rebase --whitespace=fix --root A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 14 - --whitespace=fix incompatible with --root without --onto
+
+expecting success of 3422.15 '--whitespace=fix incompatible with rebase.rebaseMerges': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.rebaseMerges=true rebase --whitespace=fix A 2>err &&
+		grep -e --no-rebase-merges err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
+ok 15 - --whitespace=fix incompatible with rebase.rebaseMerges
+
+expecting success of 3422.16 '--whitespace=fix incompatible with rebase.updateRefs': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.updateRefs=true rebase --whitespace=fix A 2>err &&
+		grep -e --no-update-refs err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
+ok 16 - --whitespace=fix incompatible with rebase.updateRefs
+
+expecting success of 3422.17 '--whitespace=fix okay with overridden rebase.rebaseMerges': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --whitespace=fix A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 17 - --whitespace=fix okay with overridden rebase.rebaseMerges
+
+expecting success of 3422.18 '--whitespace=fix okay with overridden rebase.updateRefs': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.updateRefs=true rebase --no-update-refs --whitespace=fix A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 18 - --whitespace=fix okay with overridden rebase.updateRefs
+
+expecting success of 3422.19 '-C4 incompatible with --merge': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --merge A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 19 - -C4 incompatible with --merge
+
+expecting success of 3422.20 '-C4 incompatible with --strategy=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --strategy=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 20 - -C4 incompatible with --strategy=ours
+
+expecting success of 3422.21 '-C4 incompatible with --strategy-option=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --strategy-option=ours A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 21 - -C4 incompatible with --strategy-option=ours
+
+expecting success of 3422.22 '-C4 incompatible with --autosquash': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --autosquash A
+	
+HEAD is now at 079b709 B
+fatal: --autosquash requires the merge backend
+ok 22 - -C4 incompatible with --autosquash
+
+expecting success of 3422.23 '-C4 incompatible with --interactive': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --interactive A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 23 - -C4 incompatible with --interactive
+
+expecting success of 3422.24 '-C4 incompatible with --exec': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --exec 'true' A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 24 - -C4 incompatible with --exec
+
+expecting success of 3422.25 '-C4 incompatible with --keep-empty': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --keep-empty A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 25 - -C4 incompatible with --keep-empty
+
+expecting success of 3422.26 '-C4 incompatible with --empty=...': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --empty=ask A
+	
+HEAD is now at 079b709 B
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+fatal: apply options and merge options cannot be used together
+ok 26 - -C4 incompatible with --empty=...
+
+expecting success of 3422.27 '-C4 incompatible with --no-reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --no-reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 27 - -C4 incompatible with --no-reapply-cherry-picks
+
+expecting success of 3422.28 '-C4 incompatible with --reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 28 - -C4 incompatible with --reapply-cherry-picks
+
+expecting success of 3422.29 '-C4 incompatible with --rebase-merges': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --rebase-merges A
+	
+HEAD is now at 079b709 B
+fatal: --rebase-merges requires the merge backend
+ok 29 - -C4 incompatible with --rebase-merges
+
+expecting success of 3422.30 '-C4 incompatible with --update-refs': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --update-refs A
+	
+HEAD is now at 079b709 B
+fatal: --update-refs requires the merge backend
+ok 30 - -C4 incompatible with --update-refs
+
+expecting success of 3422.31 '-C4 incompatible with --root without --onto': 
+		git checkout B^0 &&
+		test_must_fail git rebase -C4 --root A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 31 - -C4 incompatible with --root without --onto
+
+expecting success of 3422.32 '-C4 incompatible with rebase.rebaseMerges': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.rebaseMerges=true rebase -C4 A 2>err &&
+		grep -e --no-rebase-merges err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
+ok 32 - -C4 incompatible with rebase.rebaseMerges
+
+expecting success of 3422.33 '-C4 incompatible with rebase.updateRefs': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.updateRefs=true rebase -C4 A 2>err &&
+		grep -e --no-update-refs err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
+ok 33 - -C4 incompatible with rebase.updateRefs
+
+expecting success of 3422.34 '-C4 okay with overridden rebase.rebaseMerges': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.rebaseMerges=true rebase --no-rebase-merges -C4 A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 34 - -C4 okay with overridden rebase.rebaseMerges
+
+expecting success of 3422.35 '-C4 okay with overridden rebase.updateRefs': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.updateRefs=true rebase --no-update-refs -C4 A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 35 - -C4 okay with overridden rebase.updateRefs
+
+expecting success of 3422.36 '--apply incompatible with --merge': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --merge A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 36 - --apply incompatible with --merge
+
+expecting success of 3422.37 '--apply incompatible with --strategy=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --strategy=ours A
+	
+HEAD is now at 079b709 B
+fatal: --strategy requires the merge backend
+ok 37 - --apply incompatible with --strategy=ours
+
+expecting success of 3422.38 '--apply incompatible with --strategy-option=ours': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --strategy-option=ours A
+	
+HEAD is now at 079b709 B
+fatal: --strategy requires the merge backend
+ok 38 - --apply incompatible with --strategy-option=ours
+
+expecting success of 3422.39 '--apply incompatible with --autosquash': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --autosquash A
+	
+HEAD is now at 079b709 B
+fatal: --autosquash requires the merge backend
+ok 39 - --apply incompatible with --autosquash
+
+expecting success of 3422.40 '--apply incompatible with --interactive': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --interactive A
+	
+HEAD is now at 079b709 B
+fatal: apply options and merge options cannot be used together
+ok 40 - --apply incompatible with --interactive
+
+expecting success of 3422.41 '--apply incompatible with --exec': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --exec 'true' A
+	
+HEAD is now at 079b709 B
+fatal: --exec requires the merge backend
+ok 41 - --apply incompatible with --exec
+
+expecting success of 3422.42 '--apply incompatible with --keep-empty': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --keep-empty A
+	
+HEAD is now at 079b709 B
+fatal: --keep-empty requires the merge backend
+ok 42 - --apply incompatible with --keep-empty
+
+expecting success of 3422.43 '--apply incompatible with --empty=...': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --empty=ask A
+	
+HEAD is now at 079b709 B
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+fatal: --empty requires the merge backend
+ok 43 - --apply incompatible with --empty=...
+
+expecting success of 3422.44 '--apply incompatible with --no-reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --no-reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: --no-reapply-cherry-picks requires the merge backend
+ok 44 - --apply incompatible with --no-reapply-cherry-picks
+
+expecting success of 3422.45 '--apply incompatible with --reapply-cherry-picks': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --reapply-cherry-picks A
+	
+HEAD is now at 079b709 B
+fatal: --reapply-cherry-picks requires the merge backend
+ok 45 - --apply incompatible with --reapply-cherry-picks
+
+expecting success of 3422.46 '--apply incompatible with --rebase-merges': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --rebase-merges A
+	
+HEAD is now at 079b709 B
+fatal: --rebase-merges requires the merge backend
+ok 46 - --apply incompatible with --rebase-merges
+
+expecting success of 3422.47 '--apply incompatible with --update-refs': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --update-refs A
+	
+HEAD is now at 079b709 B
+fatal: --update-refs requires the merge backend
+ok 47 - --apply incompatible with --update-refs
+
+expecting success of 3422.48 '--apply incompatible with --root without --onto': 
+		git checkout B^0 &&
+		test_must_fail git rebase --apply --root A
+	
+HEAD is now at 079b709 B
+fatal: --root without --onto requires the merge backend
+ok 48 - --apply incompatible with --root without --onto
+
+expecting success of 3422.49 '--apply incompatible with rebase.rebaseMerges': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.rebaseMerges=true rebase --apply A 2>err &&
+		grep -e --no-rebase-merges err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
+ok 49 - --apply incompatible with rebase.rebaseMerges
+
+expecting success of 3422.50 '--apply incompatible with rebase.updateRefs': 
+		git checkout B^0 &&
+		test_must_fail git -c rebase.updateRefs=true rebase --apply A 2>err &&
+		grep -e --no-update-refs err
+	
+HEAD is now at 079b709 B
+fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
+ok 50 - --apply incompatible with rebase.updateRefs
+
+expecting success of 3422.51 '--apply okay with overridden rebase.rebaseMerges': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --apply A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 51 - --apply okay with overridden rebase.rebaseMerges
+
+expecting success of 3422.52 '--apply okay with overridden rebase.updateRefs': 
+		test_when_finished "git reset --hard B^0" &&
+		git checkout B^0 &&
+		git -c rebase.updateRefs=true rebase --no-update-refs --apply A
+	
+HEAD is now at 079b709 B
+First, rewinding head to replay your work on top of it...
+Applying: B
+HEAD is now at 079b709 B
+ok 52 - --apply okay with overridden rebase.updateRefs
+
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3418-rebase-continue.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3418-rebase-continue/.git/
+expecting success of 3418.1 'setup': 
+	test_commit "commit-new-file-F1" F1 1 &&
+	test_commit "commit-new-file-F2" F2 2 &&
+
+	git checkout -b topic HEAD^ &&
+	test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
+
+	git checkout main
+
+[main (root-commit) dac1376] commit-new-file-F1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F1
+[main 953b3db] commit-new-file-F2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F2
+Switched to a new branch 'topic'
+[topic 24c5d85] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F2
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 3418.2 'merge based rebase --continue with works with touched file': 
+	rm -fr .git/rebase-* &&
+	git reset --hard &&
+	git checkout main &&
+
+	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+	test-tool chmtime =-60 F1 &&
+	git rebase --continue
+
+HEAD is now at 953b3db commit-new-file-F2
+Already on 'main'
+rebase -i script before editing:
+pick 953b3db commit-new-file-F2
+
+rebase -i script after editing:
+edit 953b3db commit-new-file-F2
+Rebasing (1/1)
Stopped at 953b3db...  commit-new-file-F2
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+Successfully rebased and updated refs/heads/main.
+ok 2 - merge based rebase --continue with works with touched file
+
+expecting success of 3418.3 'merge based rebase --continue removes .git/MERGE_MSG': 
+	git checkout -f --detach topic &&
+
+	test_must_fail git rebase --onto main HEAD^ &&
+	git read-tree --reset -u HEAD &&
+	test_path_is_file .git/MERGE_MSG &&
+	git rebase --continue &&
+	test_path_is_missing .git/MERGE_MSG
+
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+Rebasing (1/1)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+Successfully rebased and updated detached HEAD.
+ok 3 - merge based rebase --continue removes .git/MERGE_MSG
+
+expecting success of 3418.4 'apply based rebase --continue works with touched file': 
+	rm -fr .git/rebase-* &&
+	git reset --hard &&
+	git checkout main &&
+
+	test_must_fail git rebase --apply --onto main main topic &&
+	echo "Resolved" >F2 &&
+	git add F2 &&
+	test-tool chmtime =-60 F1 &&
+	git rebase --continue
+
+HEAD is now at 953b3db commit-new-file-F2
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+953b3db commit-new-file-F2
+virtual commit-new-file-F2-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F2
+Auto-merging F2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+ok 4 - apply based rebase --continue works with touched file
+
+expecting success of 3418.5 'rebase --continue can not be used with other options': 
+	test_must_fail git rebase -v --continue &&
+	test_must_fail git rebase --continue -v
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 5 - rebase --continue can not be used with other options
+
+expecting success of 3418.6 'rebase --continue remembers merge strategy and options': 
+	rm -fr .git/rebase-* &&
+	git reset --hard commit-new-file-F2-on-topic-branch &&
+	test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
+	test_when_finished "rm -fr test-bin" &&
+	mkdir test-bin &&
+
+	write_script test-bin/git-merge-funny <<-\EOF &&
+	printf "[%s]\n" $# "$1" "$2" "$3" "$5" >actual
+	shift 3 &&
+	exec git merge-recursive "$@"
+	EOF
+
+	cat >expect <<-\EOF &&
+	[7]
+	[--option=arg with space]
+	[--op"tion\]
+	[--new
+	line ]
+	[--]
+	EOF
+
+	rm -f actual &&
+	(
+		PATH=./test-bin:$PATH &&
+		test_must_fail git rebase -s funny -X"option=arg with space" \
+				-Xop\"tion\\ -X"new${LF}line " main topic
+	) &&
+	test_cmp expect actual &&
+	rm actual &&
+	echo "Resolved" >F2 &&
+	git add F2 &&
+	(
+		PATH=./test-bin:$PATH &&
+		git rebase --continue
+	) &&
+	test_cmp expect actual
+
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+[topic 39de9a1] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F3
+Rebasing (1/2)
Merging 953b3db31f61f8fc41bbcb85a1c76eadc748cf75 with 24c5d85f362d6c25d316c040586afc3e0548165a
+Merging:
+953b3db commit-new-file-F2
+24c5d85 commit-new-file-F2-on-topic-branch
+found 1 common ancestor:
+dac1376 commit-new-file-F1
+CONFLICT (add/add): Merge conflict in F2
+Auto-merging F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+[detached HEAD 6396a51] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Merging 6396a513d945e21e13de4128c5f8af13443529d5 with 39de9a17650c52c96f2d6848fba0d846df88a78f
+Merging:
+6396a51 commit-new-file-F2-on-topic-branch
+39de9a1 commit-new-file-F3-on-topic-branch
+found 1 common ancestor:
+24c5d85 commit-new-file-F2-on-topic-branch
+Successfully rebased and updated refs/heads/topic.
+ok 6 - rebase --continue remembers merge strategy and options
+
+expecting success of 3418.7 'rebase -r passes merge strategy options correctly': 
+	rm -fr .git/rebase-* &&
+	git reset --hard commit-new-file-F3-on-topic-branch &&
+	test_commit merge-theirs &&
+	git reset --hard HEAD^ &&
+	test_commit some-other-commit &&
+	test_tick &&
+	git merge --no-ff merge-theirs &&
+	FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
+		-s recursive --strategy-option=theirs HEAD~2 &&
+	test_commit force-change-ours &&
+	git rebase --continue
+
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+[topic b1d70bd] merge-theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge-theirs.t
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+[topic ffb1279] some-other-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 some-other-commit.t
+Merge made by the 'ort' strategy.
+ merge-theirs.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge-theirs.t
+rebase -i script before editing:
+label onto
+
+reset onto
+pick b1d70bd merge-theirs
+label merge-theirs
+
+reset onto
+pick ffb1279 some-other-commit
+merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
+
+rebase -i script after editing:
+label onto
+reset onto
+edit b1d70bd merge-theirs
+label merge-theirs
+reset onto
+pick ffb1279 some-other-commit
+merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Stopped at b1d70bd...  merge-theirs
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD 6393337] force-change-ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 force-change-ours.t
+Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Merge made by the 'ort' strategy.
+Successfully rebased and updated refs/heads/topic.
+ok 7 - rebase -r passes merge strategy options correctly
+
+expecting success of 3418.8 '--skip after failed fixup cleans commit message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b with-conflicting-fixup &&
+	test_commit wants-fixup &&
+	test_commit "fixup 1" wants-fixup.t 1 wants-fixup-1 &&
+	test_commit "fixup 2" wants-fixup.t 2 wants-fixup-2 &&
+	test_commit "fixup 3" wants-fixup.t 3 wants-fixup-3 &&
+	test_must_fail env FAKE_LINES="1 fixup 2 squash 4" \
+		git rebase -i HEAD~4 &&
+
+	: now there is a conflict, and comments in the commit message &&
+	test_commit_message HEAD <<-\EOF &&
+	# This is a combination of 2 commits.
+	# This is the 1st commit message:
+
+	wants-fixup
+
+	# The commit message #2 will be skipped:
+
+	# fixup 1
+	EOF
+
+	: skip and continue &&
+	echo "cp \"\$1\" .git/copy.txt" | write_script copy-editor.sh &&
+	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
+
+	: the user should not have had to edit the commit message &&
+	test_path_is_missing .git/copy.txt &&
+
+	: now the comments in the commit message should have been cleaned up &&
+	test_commit_message HEAD -m wants-fixup &&
+
+	: now, let us ensure that "squash" is handled correctly &&
+	git reset --hard wants-fixup-3 &&
+	test_must_fail env FAKE_LINES="1 squash 2 squash 1 squash 3 squash 1" \
+		git rebase -i HEAD~4 &&
+
+	: the second squash failed, but there are two more in the chain &&
+	(test_set_editor "$PWD/copy-editor.sh" &&
+	 test_must_fail git rebase --skip) &&
+
+	: not the final squash, no need to edit the commit message &&
+	test_path_is_missing .git/copy.txt &&
+
+	: The first and third squashes succeeded, therefore: &&
+	test_commit_message HEAD <<-\EOF &&
+	# This is a combination of 3 commits.
+	# This is the 1st commit message:
+
+	wants-fixup
+
+	# This is the commit message #2:
+
+	fixup 1
+
+	# This is the commit message #3:
+
+	fixup 2
+	EOF
+
+	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
+	test_commit_message HEAD <<-\EOF &&
+	wants-fixup
+
+	fixup 1
+
+	fixup 2
+	EOF
+
+	: Final squash failed, but there was still a squash &&
+	head -n1 .git/copy.txt >first-line &&
+	test_grep "# This is a combination of 3 commits" first-line &&
+	test_grep "# This is the commit message #3:" .git/copy.txt
+
+Switched to a new branch 'with-conflicting-fixup'
+[with-conflicting-fixup c5541cc] wants-fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wants-fixup.t
+[with-conflicting-fixup 1453cf1] fixup 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[with-conflicting-fixup f2bd94a] fixup 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[with-conflicting-fixup 265fcdc] fixup 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick c5541cc wants-fixup
+pick 1453cf1 fixup 1
+pick f2bd94a fixup 2
+pick 265fcdc fixup 3
+
+rebase -i script after editing:
+pick c5541cc wants-fixup
+fixup 1453cf1 fixup 1
+squash 265fcdc fixup 3
+Rebasing (2/3)
Rebasing (3/3)
Auto-merging wants-fixup.t
+CONFLICT (content): Merge conflict in wants-fixup.t
+error: could not apply 265fcdc... fixup 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 265fcdc... fixup 3
+Successfully rebased and updated refs/heads/with-conflicting-fixup.
+HEAD is now at 265fcdc fixup 3
+rebase -i script before editing:
+pick c5541cc wants-fixup
+pick 1453cf1 fixup 1
+pick f2bd94a fixup 2
+pick 265fcdc fixup 3
+
+rebase -i script after editing:
+pick c5541cc wants-fixup
+squash 1453cf1 fixup 1
+squash c5541cc wants-fixup
+squash f2bd94a fixup 2
+squash c5541cc wants-fixup
+Rebasing (2/5)
Rebasing (3/5)
Auto-merging wants-fixup.t
+CONFLICT (add/add): Merge conflict in wants-fixup.t
+error: could not apply c5541cc... wants-fixup
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply c5541cc... wants-fixup
+Rebasing (4/5)
Rebasing (5/5)
Auto-merging wants-fixup.t
+CONFLICT (add/add): Merge conflict in wants-fixup.t
+error: could not apply c5541cc... wants-fixup
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply c5541cc... wants-fixup
+[detached HEAD c5ae848] wants-fixup
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wants-fixup.t
+Successfully rebased and updated refs/heads/with-conflicting-fixup.
+# This is a combination of 3 commits.
+# This is the commit message #3:
+fatal: no rebase in progress
+ok 8 - --skip after failed fixup cleans commit message
+
+expecting success of 3418.9 'setup rerere database': 
+	rm -fr .git/rebase-* &&
+	git reset --hard commit-new-file-F3-on-topic-branch &&
+	git checkout main &&
+	test_commit "commit-new-file-F3" F3 3 &&
+	test_config rerere.enabled true &&
+	git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
+	test_must_fail git rebase -m main topic &&
+	echo "Resolved" >F2 &&
+	cp F2 expected-F2 &&
+	git add F2 &&
+	test_must_fail git rebase --continue &&
+	echo "Resolved" >F3 &&
+	cp F3 expected-F3 &&
+	git add F3 &&
+	git rebase --continue &&
+	git reset --hard topic@{1}
+
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+[main 544942a] commit-new-file-F3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F3
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Recorded preimage for 'F2'
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+Recorded resolution for 'F2'.
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Recorded preimage for 'F3'
+Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+Recorded resolution for 'F3'.
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+ok 9 - setup rerere database
+
+expecting success of 3418.10 'rebase --apply --continue remembers --rerere-autoupdate': 
+		prepare &&
+		test_must_fail git rebase $action --rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+544942a commit-new-file-F3
+virtual commit-new-file-F2-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F2
+Auto-merging F2
+Staged 'F2' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+eea28ba commit-new-file-F2-on-topic-branch
+virtual commit-new-file-F3-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F3
+Auto-merging F3
+Staged 'F3' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 commit-new-file-F3-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+ok 10 - rebase --apply --continue remembers --rerere-autoupdate
+
+expecting success of 3418.11 'rebase --apply --continue honors rerere.autoUpdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+544942a commit-new-file-F3
+virtual commit-new-file-F2-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F2
+Auto-merging F2
+Staged 'F2' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+eea28ba commit-new-file-F2-on-topic-branch
+virtual commit-new-file-F3-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F3
+Auto-merging F3
+Staged 'F3' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 commit-new-file-F3-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+ok 11 - rebase --apply --continue honors rerere.autoUpdate
+
+expecting success of 3418.12 'rebase --apply --continue remembers --no-rerere-autoupdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		test_must_fail git diff-files --quiet &&
+		git add F2 &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		test_must_fail git diff-files --quiet &&
+		git add F3 &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+544942a commit-new-file-F3
+virtual commit-new-file-F2-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F2
+Auto-merging F2
+Resolved 'F2' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F2-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+eea28ba commit-new-file-F2-on-topic-branch
+virtual commit-new-file-F3-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F3
+Auto-merging F3
+Resolved 'F3' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 commit-new-file-F3-on-topic-branch
+Applying: commit-new-file-F3-on-topic-branch
+ok 12 - rebase --apply --continue remembers --no-rerere-autoupdate
+
+expecting success of 3418.13 'rebase -m --continue remembers --rerere-autoupdate': 
+		prepare &&
+		test_must_fail git rebase $action --rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 13 - rebase -m --continue remembers --rerere-autoupdate
+
+expecting success of 3418.14 'rebase -m --continue honors rerere.autoUpdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 14 - rebase -m --continue honors rerere.autoUpdate
+
+expecting success of 3418.15 'rebase -m --continue remembers --no-rerere-autoupdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		test_must_fail git diff-files --quiet &&
+		git add F2 &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		test_must_fail git diff-files --quiet &&
+		git add F3 &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'F3' using previous resolution.
+Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 15 - rebase -m --continue remembers --no-rerere-autoupdate
+
+expecting success of 3418.16 'rebase -i --continue remembers --rerere-autoupdate': 
+		prepare &&
+		test_must_fail git rebase $action --rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 16 - rebase -i --continue remembers --rerere-autoupdate
+
+expecting success of 3418.17 'rebase -i --continue honors rerere.autoUpdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action main topic &&
+		test_cmp expected-F2 F2 &&
+		git diff-files --quiet &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		git diff-files --quiet &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'F3' using previous resolution.
+Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 17 - rebase -i --continue honors rerere.autoUpdate
+
+expecting success of 3418.18 'rebase -i --continue remembers --no-rerere-autoupdate': 
+		prepare &&
+		test_config rerere.autoupdate true &&
+		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
+		test_cmp expected-F2 F2 &&
+		test_must_fail git diff-files --quiet &&
+		git add F2 &&
+		test_must_fail git rebase --continue &&
+		test_cmp expected-F3 F3 &&
+		test_must_fail git diff-files --quiet &&
+		git add F3 &&
+		git rebase --continue
+	
+HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
+Switched to branch 'main'
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
Auto-merging F3
+CONFLICT (add/add): Merge conflict in F3
+error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'F3' using previous resolution.
+Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
+[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/topic.
+ok 18 - rebase -i --continue remembers --no-rerere-autoupdate
+
+expecting success of 3418.19 'the todo command "break" works': 
+	rm -f execed &&
+	FAKE_LINES="break b exec_>execed" git rebase -i HEAD &&
+	test_path_is_missing execed &&
+	git rebase --continue &&
+	test_path_is_missing execed &&
+	git rebase --continue &&
+	test_path_is_file execed
+
+rebase -i script before editing:
+noop
+
+rebase -i script after editing:
+break
+b
+exec >execed
+Rebasing (1/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
+Rebasing (2/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
+Rebasing (3/3)
Executing: >execed
+Successfully rebased and updated refs/heads/topic.
+ok 19 - the todo command "break" works
+
+expecting success of 3418.20 'patch file is removed before break command': 
+	test_when_finished "git rebase --abort" &&
+	cat >todo <<-\EOF &&
+	pick commit-new-file-F2-on-topic-branch
+	break
+	EOF
+
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i --onto commit-new-file-F2 HEAD
+	) &&
+	test_path_is_file .git/rebase-merge/patch &&
+	echo 22>F2 &&
+	git add F2 &&
+	git rebase --continue &&
+	test_path_is_missing .git/rebase-merge/patch
+
+rebase -i script after editing:
+pick commit-new-file-F2-on-topic-branch
+break
+Rebasing (1/2)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... 
+
+[detached HEAD da61d7a] commit-new-file-F2-on-topic-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Rebasing (2/2)
Stopped at da61d7a (commit-new-file-F2-on-topic-branch)
+ok 20 - patch file is removed before break command
+
+expecting success of 3418.21 '--reschedule-failed-exec': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
+	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+	git rebase --abort &&
+	test_must_fail git -c rebase.rescheduleFailedExec=true \
+		rebase -x false HEAD^ 2>err &&
+	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+	test_grep "has been rescheduled" err
+
+Rebasing (2/2)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+hint: Could not execute the todo command
+hint:
+hint:     exec false
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+exec false
+exec false
+hint: It has been rescheduled; To edit the command before continuing, please
+ok 21 - --reschedule-failed-exec
+
+expecting success of 3418.22 'rebase.rescheduleFailedExec only affects `rebase -i`': 
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase -x false HEAD^ &&
+	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+	git rebase --abort &&
+	git rebase HEAD^
+
+Rebasing (2/2)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+hint: Could not execute the todo command
+hint:
+hint:     exec false
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+exec false
+Current branch topic is up to date.
+ok 22 - rebase.rescheduleFailedExec only affects `rebase -i`
+
+expecting success of 3418.23 'rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec': 
+	test_when_finished "git rebase --abort" &&
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase -x false --no-reschedule-failed-exec HEAD~2 &&
+	test_must_fail git rebase --continue 2>err &&
+	! grep "has been rescheduled" err
+
+Rebasing (2/4)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+ok 23 - rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec
+
+expecting success of 3418.24 'new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false HEAD~2 &&
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase --continue 2>err &&
+	! grep "has been rescheduled" err
+
+Rebasing (2/4)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+ok 24 - new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored
+
+expecting success of 3418.25 'there is no --no-reschedule-failed-exec in an ongoing rebase': 
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false HEAD~2 &&
+	test_expect_code 129 git rebase --continue --no-reschedule-failed-exec &&
+	test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec
+
+Rebasing (2/4)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --[no-]onto <revision>
+                          rebase onto given branch instead of upstream
+    --[no-]keep-base      use the merge-base of upstream and branch as the current base
+    --no-verify           allow pre-rebase hook to run
+    --verify              opposite of --no-verify
+    -q, --[no-]quiet      be quiet. implies --no-stat
+    -v, --[no-]verbose    display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --stat                opposite of --no-stat
+    --[no-]signoff        add a Signed-off-by trailer to each commit
+    --[no-]committer-date-is-author-date
+                          make committer date match author date
+    --[no-]reset-author-date
+                          ignore author date and use current date
+    -C <n>                passed to 'git apply'
+    --[no-]ignore-whitespace
+                          ignore changes in whitespace
+    --[no-]whitespace <action>
+                          passed to 'git apply'
+    -f, --[no-]force-rebase
+                          cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --ff                  opposite of --no-ff
+    --continue            continue
+    --skip                skip current patch and continue
+    --abort               abort and check out the original branch
+    --quit                abort but keep HEAD where it is
+    --edit-todo           edit the todo list during an interactive rebase
+    --show-current-patch  show the patch file being applied or merged
+    --apply               use apply strategies to rebase
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --empty (drop|keep|stop)
+                          how to handle commits that become empty
+    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
+    --[no-]update-refs    update branches that point to commits that are being rebased
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --[no-]autostash      automatically stash/stash pop before and after
+    -x, --[no-]exec <exec>
+                          add exec lines after each commit of the editable list
+    -r, --[no-]rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
+    -s, --[no-]strategy <strategy>
+                          use the given merge strategy
+    -X, --[no-]strategy-option <option>
+                          pass the argument through to the merge strategy
+    --[no-]root           rebase all reachable commits up to the root(s)
+    --[no-]reschedule-failed-exec
+                          automatically re-schedule any `exec` that fails
+    --[no-]reapply-cherry-picks
+                          apply all changes, even those already present upstream
+
+ok 25 - there is no --no-reschedule-failed-exec in an ongoing rebase
+
+expecting success of 3418.26 'rebase --apply sets ORIG_HEAD correctly': 
+		git checkout topic &&
+		git reset --hard commit-new-file-F2-on-topic-branch &&
+		test_orig_head_helper $type main
+	
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+544942a commit-new-file-F3
+virtual commit-new-file-F2-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F2
+Auto-merging F2
+Resolved 'F2' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 26 - rebase --apply sets ORIG_HEAD correctly
+
+expecting success of 3418.27 'rebase --apply <upstream> <branch> sets ORIG_HEAD correctly': 
+		git checkout main &&
+		test_orig_head_helper $type main topic
+	
+Switched to branch 'main'
+First, rewinding head to replay your work on top of it...
+Applying: commit-new-file-F2-on-topic-branch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+544942a commit-new-file-F3
+virtual commit-new-file-F2-on-topic-branch
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in F2
+Auto-merging F2
+Resolved 'F2' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 27 - rebase --apply <upstream> <branch> sets ORIG_HEAD correctly
+
+expecting success of 3418.28 'rebase --merge sets ORIG_HEAD correctly': 
+		git checkout topic &&
+		git reset --hard commit-new-file-F2-on-topic-branch &&
+		test_orig_head_helper $type main
+	
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+Rebasing (1/1)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 28 - rebase --merge sets ORIG_HEAD correctly
+
+expecting success of 3418.29 'rebase --merge <upstream> <branch> sets ORIG_HEAD correctly': 
+		git checkout main &&
+		test_orig_head_helper $type main topic
+	
+Switched to branch 'main'
+Rebasing (1/1)
Auto-merging F2
+CONFLICT (add/add): Merge conflict in F2
+error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'F2' using previous resolution.
+Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+Already on 'topic'
+HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
+ok 29 - rebase --merge <upstream> <branch> sets ORIG_HEAD correctly
+
+# passed all 29 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3423-rebase-reword.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3423-rebase-reword/.git/
+expecting success of 3423.1 'setup': 
+	test_commit main file-1 test &&
+
+	git checkout -b stuff &&
+
+	test_commit feature_a file-2 aaa &&
+	test_commit feature_b file-2 ddd
+
+[master (root-commit) 2fc88f2] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-1
+Switched to a new branch 'stuff'
+[stuff bfc518c] feature_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-2
+[stuff 6975fa1] feature_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3423.2 'reword without issues functions as intended': 
+	test_when_finished "reset_rebase" &&
+
+	git checkout stuff^0 &&
+
+	set_fake_editor &&
+	FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
+		git rebase -i -v main &&
+
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 3
+
+Note: switching to 'stuff^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6975fa1 feature_b
+Changes from 2fc88f2741a214c6daa29c1ac97d0376c9cd858d to 2fc88f2741a214c6daa29c1ac97d0376c9cd858d:
+rebase -i script before editing:
+pick bfc518c feature_a
+pick 6975fa1 feature_b
+
+rebase -i script after editing:
+pick bfc518c feature_a
+reword 6975fa1 feature_b
+Rebasing (2/2)
+[detached HEAD 7179cda] feature_b_reworded
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+HEAD is now at 7179cda feature_b_reworded
+Removing fake-editor.sh
+ok 2 - reword without issues functions as intended
+
+expecting success of 3423.3 'reword after a conflict preserves commit': 
+	test_when_finished "reset_rebase" &&
+
+	git checkout stuff^0 &&
+
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="reword 2" \
+		git rebase -i -v main &&
+
+	git checkout --theirs file-2 &&
+	git add file-2 &&
+	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
+
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 2
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7179cda feature_b_reworded
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 7179cda
+
+HEAD is now at 6975fa1 feature_b
+Changes from 2fc88f2741a214c6daa29c1ac97d0376c9cd858d to 2fc88f2741a214c6daa29c1ac97d0376c9cd858d:
+rebase -i script before editing:
+pick bfc518c feature_a
+pick 6975fa1 feature_b
+
+rebase -i script after editing:
+reword 6975fa1 feature_b
+Rebasing (1/1)
+CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 6975fa1 (feature_b).  Version 6975fa1 (feature_b) of file-2 left in tree.
+error: could not apply 6975fa1... feature_b
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 6975fa1... feature_b
+Updated 1 path from the index
+[detached HEAD 2e9e381] feature_b_reworded
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-2
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+HEAD is now at 2e9e381 feature_b_reworded
+Removing fake-editor.sh
+ok 3 - reword after a conflict preserves commit
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3415-rebase-autosquash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 2400.195 '"add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C wt', no --branch': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3415.18 'squash! squash!': 
+	test_auto_fixup_fixup squash squash
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+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!
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 195 - "add" DWIM infer --orphan w/ empty repo, DWIM (no --branch), --quiet, 'git -C wt', no --branch
+expecting success of 3415.19 'squash! fixup!': 
+	test_auto_fixup_fixup squash fixup
 
-expecting success of 2400.196 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, valid HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+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!
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+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
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
+HEAD is now at f0c2a7e second commit
+[main dda10d1] squash! 244a0fe
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-ok 196 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, valid HEAD
+ 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 2400.197 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+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
+	)
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+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
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 197 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+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
+	)
 
-expecting success of 2400.198 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+[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
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+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
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+[main cf5183f] to-fixup
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-ok 198 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
-
-expecting success of 2400.199 '"add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+ 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!
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+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
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+[main f9ef1ba] To fixup
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-fatal: No local or remote refs exist despite at least one remote
-ok 199 - "add" error need fetch w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+ 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 2400.200 '"add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3415.25 'abort last squash': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_when_finished "git checkout main" &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	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 &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+	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>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-ok 200 - "add" DWIM infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote, --force
+[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 2400.201 '"add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+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)
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+[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
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-ok 201 - "add" DWIM doesnt infer --orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+[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
 
-expecting success of 2400.202 '"add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C wt', --branch': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3424-rebase-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3424-rebase-empty/.git/
+expecting success of 3424.1 'setup test repository': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+	test_write_lines A B C D E F G H I J >letters &&
+	git add numbers letters &&
+	git commit -m A &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	git branch upstream &&
+	git branch localmods &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 202 - "add" DWIM infer --orphan w/ empty repo, --quiet, 'git -C wt', --branch
+	git checkout upstream &&
+	test_write_lines A B C D E >letters &&
+	git add letters &&
+	git commit -m B &&
 
-expecting success of 2400.203 '"add" DWIM doesnt infer --orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, valid HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+	test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers &&
+	git add numbers &&
+	git commit -m C &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	git checkout localmods &&
+	test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers &&
+	git add numbers &&
+	git commit -m C2 &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
+	git commit --allow-empty -m D &&
+
+	test_write_lines A B C D E >letters &&
+	git add letters &&
+	git commit -m "Five letters ought to be enough for anybody"
+
+[master (root-commit) 5bccb87] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-ok 203 - "add" DWIM doesnt infer --orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, valid HEAD
+ 2 files changed, 20 insertions(+)
+ create mode 100644 letters
+ create mode 100644 numbers
+Switched to branch 'upstream'
+[upstream 830e295] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 deletions(-)
+[upstream 028eb0a] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Switched to branch 'localmods'
+[localmods 48a48e4] C2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[localmods 7a36fb1] D
+ Author: A U Thor <author@example.com>
+[localmods 4a67a39] Five letters ought to be enough for anybody
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 deletions(-)
+ok 1 - setup test repository
 
-expecting success of 2400.204 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+checking known breakage of 3424.2 'rebase (apply-backend)': 
+	test_when_finished "git rebase --abort" &&
+	git checkout -B testing localmods &&
+	# rebase (--apply) should not drop commits that start empty
+	git rebase --apply upstream &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-ok 204 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, 0 remotes, 0 fetched remote branches, --no-guess-remote
+Switched to a new branch 'testing'
+First, rewinding head to replay your work on top of it...
+Applying: C2
+Using index info to reconstruct a base tree...
+M	numbers
+Falling back to patching base and 3-way merge...
+Merging:
+028eb0a C
+virtual C2
+found 1 common ancestor:
+virtual 75a3e2be4ba4a7062d21fba0206758f5518d6ead
+Auto-merging numbers
+Skipped numbers (merged same as existing)
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+No changes -- Patch already applied.
+Patch is empty.
+not ok 2 - rebase (apply-backend) # TODO known breakage
 
-expecting success of 2400.205 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3424.3 'rebase --merge --empty=drop': 
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=drop upstream &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-ok 205 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --no-guess-remote
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 3 - rebase --merge --empty=drop
 
-expecting success of 2400.206 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3424.4 'rebase --merge uses default of --empty=drop': 
+	git checkout -B testing localmods &&
+	git rebase --merge upstream &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-ok 206 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, 0 fetched remote branches, --guess-remote
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 4 - rebase --merge uses default of --empty=drop
 
-expecting success of 2400.207 '"add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3424.5 'rebase --merge --empty=keep': 
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=keep upstream &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'orphanbranch')
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/upstream/.git/
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-Switched to a new branch 'foo'
-From ../upstream
- * [new branch]      foo        -> upstream/foo
- * [new branch]      main       -> upstream/main
- * [new tag]         commit     -> commit
-ok 207 - "add" DWIM infer --orphan w/ --quiet, 'git -C wt', --branch, 0 local branches, >=1 remotes, >=1 fetched remote branches, --guess-remote
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 5 - rebase --merge --empty=keep
 
-expecting success of 2400.208 '"add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+expecting success of 3424.6 'rebase --merge --empty=stop': 
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --merge --empty=stop upstream &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	git rebase --skip &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-fatal: invalid reference: HEAD
-fatal: invalid reference: HEAD
-ok 208 - "add" error, warn on bad HEAD, hint use orphan w/ DWIM (no --branch), --quiet, 'git -C wt', no --branch, >=1 local branches, invalid (or orphan) HEAD
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.209 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+    git commit --allow-empty
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-fatal: invalid reference: HEAD
-fatal: invalid reference: HEAD
-ok 209 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --branch, >=1 local branches, invalid (or orphan) HEAD
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 028eb0a
+Last command done (1 command done):
+   pick 48a48e4 C2
+Next command to do (1 remaining command):
+   pick 7a36fb1 D # empty
+  (use "git rebase --edit-todo" to view and edit)
+You are currently rebasing branch 'testing' on '028eb0a'.
+  (all conflicts fixed: run "git rebase --continue")
 
-expecting success of 2400.210 '"add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 48a48e4... C2
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 6 - rebase --merge --empty=stop
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-Preparing worktree (new branch 'main')
-[main (root-commit) 6d95aef] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-fatal: invalid reference: HEAD
-fatal: invalid reference: HEAD
-ok 210 - "add" error, warn on bad HEAD, hint use orphan w/ --quiet, 'git -C wt', --detach, >=1 local branches, invalid (or orphan) HEAD
+expecting success of 3424.7 'rebase --merge --empty=ask': 
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --merge --empty=ask upstream &&
 
-expecting success of 2400.211 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --no-checkout': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+	git rebase --skip &&
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-fatal: options '--orphan' and '--no-checkout' cannot be used together
-ok 211 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --no-checkout
+Reset branch 'testing'
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 2400.212 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --track': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+    git commit --allow-empty
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 028eb0a
+Last command done (1 command done):
+   pick 48a48e4 C2
+Next command to do (1 remaining command):
+   pick 7a36fb1 D # empty
+  (use "git rebase --edit-todo" to view and edit)
+You are currently rebasing branch 'testing' on '028eb0a'.
+  (all conflicts fixed: run "git rebase --continue")
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-fatal: options '--orphan' and '--track' cannot be used together
-ok 212 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, DWIM (no --branch), --quiet, no --branch, --track
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
 
-expecting success of 2400.213 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --no-checkout': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 48a48e4... C2
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 7 - rebase --merge --empty=ask
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3424.8 'rebase --interactive --empty=drop': 
+	git checkout -B testing localmods &&
+	git rebase --interactive --empty=drop upstream &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-fatal: options '--orphan' and '--no-checkout' cannot be used together
-ok 213 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --no-checkout
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.214 '"add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --track': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ]
-		then
-			(cd repo && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C repo symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b main ../wt &&
-			(cd wt && test_commit commit) &&
-			if [ $bad_head -eq 1 ]
-			then
-				git -C wt symbolic-ref HEAD refs/heads/badbranch
-			fi
-		elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ]
-		then
-			test_when_finished "git -C repo worktree remove -f ../wt" &&
-			git -C repo worktree add --orphan -b orphanbranch ../wt
-		fi &&
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 8 - rebase --interactive --empty=drop
 
-		if [ $remote -eq 1 ]
-		then
-			test_when_finished "rm -rf upstream" &&
-			git init upstream &&
-			(cd upstream && test_commit commit) &&
-			git -C upstream switch -c foo &&
-			git -C repo remote add upstream ../upstream
-		fi &&
+expecting success of 3424.9 'rebase --interactive --empty=keep': 
+	git checkout -B testing localmods &&
+	git rebase --interactive --empty=keep upstream &&
 
-		if [ $remote_ref -eq 1 ]
-		then
-			git -C repo fetch
-		fi &&
-		if [ $success -eq 1 ]
-		then
-			test_when_finished git -C repo worktree remove ../foo
-		fi &&
-		(
-			if [ $use_cd -eq 1 ]
-			then
-				cd $git_ns
-			fi &&
-			if [ "$outcome" = "infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "no_infer" ]
-			then
-				git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					test_must_be_empty actual
-				else
-					! grep "$info_text" actual
-				fi
-			elif [ "$outcome" = "fetch_error" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				grep "$fetch_error_text" actual
-			elif [ "$outcome" = "fatal_orphan_bad_combo" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					! grep "$info_text" actual
-				else
-					grep "$info_text" actual
-				fi &&
-				grep "$bad_combo_regex" actual
-			elif [ "$outcome" = "warn_bad_head" ]
-			then
-				test_must_fail git $dashc_args worktree add $args 2>actual &&
-				if [ $use_quiet -eq 1 ]
-				then
-					grep "$invalid_ref_regex" actual &&
-					! grep "$orphan_hint" actual
-				else
-					headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
-					headcontents=$(cat "$headpath") &&
-					grep "HEAD points to an invalid (or orphaned) reference" actual &&
-					grep "HEAD path: .$headpath." actual &&
-					grep "HEAD contents: .$headcontents." actual &&
-					grep "$orphan_hint" actual &&
-					! grep "$info_text" actual
-				fi &&
-				grep "$invalid_ref_regex" actual
-			else
-				# Unreachable
-				false
-			fi
-		) &&
-		if [ $success -ne 1 ]
-		then
-			test_path_is_missing foo
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-fatal: options '--orphan' and '--track' cannot be used together
-ok 214 - "add" error inferred "--orphan" gives illegal opts combo w/ empty repo, --quiet, --branch, --track
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.215 '"add" invokes post-checkout hook (branch)': 
-	post_checkout_hook &&
-	{
-		echo $ZERO_OID $(git rev-parse HEAD) 1 &&
-		echo $(pwd)/.git/worktrees/gumby &&
-		echo $(pwd)/gumby
-	} >hook.expect &&
-	git worktree add gumby &&
-	test_cmp hook.expect gumby/hook.actual
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 9 - rebase --interactive --empty=keep
 
-Preparing worktree (new branch 'gumby')
-HEAD is now at 179a9e0 c
-ok 215 - "add" invokes post-checkout hook (branch)
+expecting success of 3424.10 'rebase --interactive --empty=stop': 
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --interactive --empty=stop upstream &&
 
-expecting success of 2400.216 '"add" invokes post-checkout hook (detached)': 
-	post_checkout_hook &&
-	{
-		echo $ZERO_OID $(git rev-parse HEAD) 1 &&
-		echo $(pwd)/.git/worktrees/grumpy &&
-		echo $(pwd)/grumpy
-	} >hook.expect &&
-	git worktree add --detach grumpy &&
-	test_cmp hook.expect grumpy/hook.actual
+	git rebase --skip &&
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-ok 216 - "add" invokes post-checkout hook (detached)
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.217 '"add --no-checkout" suppresses post-checkout hook': 
-	post_checkout_hook &&
-	rm -f hook.actual &&
-	git worktree add --no-checkout gloopy &&
-	test_path_is_missing gloopy/hook.actual
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-Preparing worktree (new branch 'gloopy')
-ok 217 - "add --no-checkout" suppresses post-checkout hook
+    git commit --allow-empty
 
-expecting success of 2400.218 '"add" in other worktree invokes post-checkout hook': 
-	post_checkout_hook &&
-	{
-		echo $ZERO_OID $(git rev-parse HEAD) 1 &&
-		echo $(pwd)/.git/worktrees/guppy &&
-		echo $(pwd)/guppy
-	} >hook.expect &&
-	git -C gloopy worktree add --detach ../guppy &&
-	test_cmp hook.expect guppy/hook.actual
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 028eb0a
+Last command done (1 command done):
+   pick 48a48e4 C2
+Next command to do (1 remaining command):
+   pick 7a36fb1 D # empty
+  (use "git rebase --edit-todo" to view and edit)
+You are currently rebasing branch 'testing' on '028eb0a'.
+  (all conflicts fixed: run "git rebase --continue")
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-ok 218 - "add" in other worktree invokes post-checkout hook
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
 
-expecting success of 2400.219 '"add" in bare repo invokes post-checkout hook': 
-	rm -rf bare &&
-	git clone --bare . bare &&
-	{
-		echo $ZERO_OID $(git --git-dir=bare rev-parse HEAD) 1 &&
-		echo $(pwd)/bare/worktrees/goozy &&
-		echo $(pwd)/goozy
-	} >hook.expect &&
-	post_checkout_hook bare &&
-	git -C bare worktree add --detach ../goozy &&
-	test_cmp hook.expect goozy/hook.actual
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 48a48e4... C2
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 10 - rebase --interactive --empty=stop
 
-Cloning into bare repository 'bare'...
-done.
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-ok 219 - "add" in bare repo invokes post-checkout hook
+expecting success of 3424.11 'rebase --interactive uses default of --empty=stop': 
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --interactive upstream &&
 
-expecting success of 2400.220 '"add" an existing but missing worktree': 
-	git worktree add --detach pneu &&
-	test_must_fail git worktree add --detach pneu &&
-	rm -fr pneu &&
-	test_must_fail git worktree add --detach pneu &&
-	git worktree add --force --detach pneu
+	git rebase --skip &&
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-Preparing worktree (detached HEAD 179a9e0)
-fatal: 'pneu' already exists
-Preparing worktree (detached HEAD 179a9e0)
-fatal: 'pneu' is a missing but already registered worktree;
-use 'add -f' to override, or 'prune' or 'remove' to clear
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-ok 220 - "add" an existing but missing worktree
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.221 '"add" an existing locked but missing worktree': 
-	git worktree add --detach gnoo &&
-	git worktree lock gnoo &&
-	test_when_finished "git worktree unlock gnoo || :" &&
-	rm -fr gnoo &&
-	test_must_fail git worktree add --detach gnoo &&
-	test_must_fail git worktree add --force --detach gnoo &&
-	git worktree add --force --force --detach gnoo
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-Preparing worktree (detached HEAD 179a9e0)
-fatal: 'gnoo' is a missing but locked worktree;
-use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear
-Preparing worktree (detached HEAD 179a9e0)
-fatal: 'gnoo' is a missing but locked worktree;
-use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-fatal: 'gnoo' is not locked
-ok 221 - "add" an existing locked but missing worktree
+    git commit --allow-empty
 
-expecting success of 2400.222 '"add" not tripped up by magic worktree matching"': 
-	# if worktree "sub1/bar" exists, "git worktree add bar" in distinct
-	# directory `sub2` should not mistakenly complain that `bar` is an
-	# already-registered worktree
-	mkdir sub1 sub2 &&
-	git -C sub1 --git-dir=../.git worktree add --detach bozo &&
-	git -C sub2 --git-dir=../.git worktree add --detach bozo
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 028eb0a
+Last command done (1 command done):
+   pick 48a48e4 C2
+Next command to do (1 remaining command):
+   pick 7a36fb1 D # empty
+  (use "git rebase --edit-todo" to view and edit)
+You are currently rebasing branch 'testing' on '028eb0a'.
+  (all conflicts fixed: run "git rebase --continue")
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-ok 222 - "add" not tripped up by magic worktree matching"
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
 
-checking prerequisite: FUNNYNAMES
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 48a48e4... C2
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 11 - rebase --interactive uses default of --empty=stop
 
-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 3424.12 'rebase --merge --empty=drop --keep-empty': 
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=drop --keep-empty upstream &&
 
-)
-prerequisite FUNNYNAMES ok
-expecting success of 2400.223 'sanitize generated worktree name': 
-	git worktree add --detach ".  weird*..?.lock.lock" &&
-	test -d .git/worktrees/---weird-.-
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-Preparing worktree (detached HEAD 179a9e0)
-HEAD is now at 179a9e0 c
-ok 223 - sanitize generated worktree name
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
+Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 12 - rebase --merge --empty=drop --keep-empty
 
-expecting success of 2400.224 '"add" should not fail because of another bad worktree': 
-	git init add-fail &&
-	(
-		cd add-fail &&
-		test_commit first &&
-		mkdir sub &&
-		git worktree add sub/to-be-deleted &&
-		rm -rf sub &&
-		git worktree add second
-	)
+expecting success of 3424.13 'rebase --merge --empty=drop --no-keep-empty': 
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=drop --no-keep-empty upstream &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/add-fail/.git/
-[main (root-commit) 264aca7] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Preparing worktree (new branch 'to-be-deleted')
-HEAD is now at 264aca7 first
-Preparing worktree (new branch 'second')
-HEAD is now at 264aca7 first
-ok 224 - "add" should not fail because of another bad worktree
+	test_write_lines C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.225 '"add" with uninitialized submodule, with submodule.recurse unset': 
-	test_config_global protocol.file.allow always &&
-	test_create_repo submodule &&
-	test_commit -C submodule first &&
-	test_create_repo project &&
-	git -C project submodule add ../submodule &&
-	git -C project add submodule &&
-	test_tick &&
-	git -C project commit -m add_sub &&
-	git clone project project-clone &&
-	git -C project-clone worktree add ../project-2
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
+Successfully rebased and updated refs/heads/testing.
+ok 13 - rebase --merge --empty=drop --no-keep-empty
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/submodule/.git/
-[main (root-commit) 264aca7] 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.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/project/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/project/submodule'...
-done.
-[main (root-commit) 57eb801] add_sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-Cloning into 'project-clone'...
-done.
-Preparing worktree (new branch 'project-2')
-HEAD is now at 57eb801 add_sub
-ok 225 - "add" with uninitialized submodule, with submodule.recurse unset
+expecting success of 3424.14 'rebase --merge --empty=keep --keep-empty': 
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=keep --keep-empty upstream &&
 
-expecting success of 2400.226 '"add" with uninitialized submodule, with submodule.recurse set': 
-	git -C project-clone -c submodule.recurse worktree add ../project-3
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-Preparing worktree (new branch 'project-3')
-HEAD is now at 57eb801 add_sub
-ok 226 - "add" with uninitialized submodule, with submodule.recurse set
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
+ok 14 - rebase --merge --empty=keep --keep-empty
 
-expecting success of 2400.227 '"add" with initialized submodule, with submodule.recurse unset': 
-	test_config_global protocol.file.allow always &&
-	git -C project-clone submodule update --init &&
-	git -C project-clone worktree add ../project-4
+expecting success of 3424.15 'rebase --merge --empty=keep --no-keep-empty': 
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=keep --no-keep-empty upstream &&
 
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/project-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '264aca7c7b40ec0269cc15ea29c2bdbebfea2e3a'
-Preparing worktree (new branch 'project-4')
-HEAD is now at 57eb801 add_sub
-ok 227 - "add" with initialized submodule, with submodule.recurse unset
+	test_write_lines C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.228 '"add" with initialized submodule, with submodule.recurse set': 
-	git -C project-clone -c submodule.recurse worktree add ../project-5
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated refs/heads/testing.
+ok 15 - rebase --merge --empty=keep --no-keep-empty
 
-Preparing worktree (new branch 'project-5')
-HEAD is now at 57eb801 add_sub
-ok 228 - "add" with initialized submodule, with submodule.recurse set
+expecting success of 3424.16 'rebase --merge does not leave state laying around': 
+	git checkout -B testing localmods~2 &&
+	git rebase --merge upstream &&
 
-expecting success of 2400.229 'can create worktrees with relative paths': 
-	test_when_finished "git worktree remove relative" &&
-	test_config worktree.useRelativePaths false &&
-	git worktree add --relative-paths ./relative &&
-	echo "gitdir: ../.git/worktrees/relative" >expect &&
-	test_cmp expect relative/.git &&
-	echo "../../../relative/.git" >expect &&
-	test_cmp expect .git/worktrees/relative/gitdir
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_path_is_missing .git/MERGE_MSG
 
-Preparing worktree (new branch 'relative')
-HEAD is now at 179a9e0 c
-ok 229 - can create worktrees with relative paths
+Reset branch 'testing'
+Rebasing (1/1)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
+Successfully rebased and updated refs/heads/testing.
+ok 16 - rebase --merge does not leave state laying around
 
-expecting success of 2400.230 'can create worktrees with absolute paths': 
-	test_config worktree.useRelativePaths true &&
-	git worktree add ./relative &&
-	echo "gitdir: ../.git/worktrees/relative" >expect &&
-	test_cmp expect relative/.git &&
-	git worktree add --no-relative-paths ./absolute &&
-	echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect &&
-	test_cmp expect absolute/.git &&
-	echo "$(pwd)/absolute/.git" >expect &&
-	test_cmp expect .git/worktrees/absolute/gitdir
+expecting success of 3424.17 'rebase --exec --empty=drop': 
+	git checkout -B testing localmods &&
+	git rebase --exec "true" --empty=drop upstream &&
 
-Preparing worktree (checking out 'relative')
-HEAD is now at 179a9e0 c
-Preparing worktree (new branch 'absolute')
-HEAD is now at 179a9e0 c
-ok 230 - can create worktrees with absolute paths
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 2400.231 'move repo without breaking relative internal links': 
-	test_when_finished rm -rf repo moved &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit initial &&
-		git worktree add --relative-paths wt1 &&
-		cd .. &&
-		mv repo moved &&
-		cd moved/wt1 &&
-		git worktree list >out 2>err &&
-		test_must_be_empty err
-	)
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/4)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
+Rebasing (2/4)
Executing: true
+Rebasing (3/4)
Rebasing (4/4)
Executing: true
+Successfully rebased and updated refs/heads/testing.
+ok 17 - rebase --exec --empty=drop
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 2aabd22] initial
+expecting success of 3424.18 'rebase --exec --empty=keep': 
+	git checkout -B testing localmods &&
+	git rebase --exec "true" --empty=keep upstream &&
+
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/4)
Rebasing (2/4)
Executing: true
+Rebasing (3/4)
Rebasing (4/4)
Executing: true
+Successfully rebased and updated refs/heads/testing.
+ok 18 - rebase --exec --empty=keep
+
+expecting success of 3424.19 'rebase --exec uses default of --empty=keep': 
+	git checkout -B testing localmods &&
+	git rebase --exec "true" upstream &&
+
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/4)
Rebasing (2/4)
Executing: true
+Rebasing (3/4)
Rebasing (4/4)
Executing: true
+Successfully rebased and updated refs/heads/testing.
+ok 19 - rebase --exec uses default of --empty=keep
+
+expecting success of 3424.20 'rebase --exec --empty=stop': 
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --exec "true" --empty=stop upstream &&
+
+	git rebase --skip &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+
+Reset branch 'testing'
+warning: skipped previously applied commit 4a67a39
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+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 028eb0a
+Last command done (1 command done):
+   pick 48a48e4 C2
+Next commands to do (3 remaining commands):
+   exec true
+   pick 7a36fb1 D # empty
+  (use "git rebase --edit-todo" to view and edit)
+You are currently rebasing branch 'testing' on '028eb0a'.
+  (all conflicts fixed: run "git rebase --continue")
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 48a48e4... C2
+Rebasing (2/4)
Executing: true
+Rebasing (3/4)
Rebasing (4/4)
Executing: true
+Successfully rebased and updated refs/heads/testing.
+ok 20 - rebase --exec --empty=stop
+
+# still have 1 known breakage(s)
+# passed all remaining 19 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3425-rebase-topology-merges.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3425-rebase-topology-merges/.git/
+expecting success of 3425.1 'setup of non-linear-history': 
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git checkout b &&
+	test_commit d &&
+	test_commit e &&
+
+	git checkout c &&
+	test_commit g &&
+	revert h g &&
+	git checkout d &&
+	cherry_pick gp g &&
+	test_commit i &&
+	git checkout b &&
+	test_commit f &&
+
+	git checkout d &&
+	test_commit n &&
+	test_commit o &&
+	test_merge w e &&
+	test_merge v c &&
+	git checkout o &&
+	test_commit z
+
+[master (root-commit) ce450c7] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Preparing worktree (new branch 'wt1')
-HEAD is now at 2aabd22 initial
-ok 231 - move repo without breaking relative internal links
+ create mode 100644 a.t
+[master 020ea9b] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[master d9ea348] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Note: switching to 'b'.
 
-expecting success of 2400.232 'relative worktree sets extension config': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	git -C repo commit --allow-empty -m base &&
-	git -C repo worktree add --relative-paths ./foo &&
-	test_cmp_config -C repo 1 core.repositoryformatversion &&
-	test_cmp_config -C repo true extensions.relativeworktrees
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.48.0~rc1+next.20250101/t/trash directory.t2400-worktree-add/repo/.git/
-[main (root-commit) 22f6d84] base
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 020ea9b b
+[detached HEAD 1bd0260] d
  Author: A U Thor <author@example.com>
-Preparing worktree (new branch 'foo')
-HEAD is now at 22f6d84 base
-ok 232 - relative worktree sets extension config
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+[detached HEAD 67a7211] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Previous HEAD position was 67a7211 e
+HEAD is now at d9ea348 c
+[detached HEAD 5573dba] g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 09e6546] h
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 g.t
+Previous HEAD position was 09e6546 h
+HEAD is now at 1bd0260 d
+[detached HEAD 00eccdb] gp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 3317c29] i
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i.t
+Previous HEAD position was 3317c29 i
+HEAD is now at 020ea9b b
+[detached HEAD 09e072f] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f.t
+Previous HEAD position was 09e072f f
+HEAD is now at 1bd0260 d
+[detached HEAD 35a5a4f] n
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n.t
+[detached HEAD a60ff6b] o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 o.t
+Merge made by the 'ort' strategy.
+ e.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Merge made by the 'ort' strategy.
+ c.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Previous HEAD position was 253142b v
+HEAD is now at a60ff6b o
+[detached HEAD 6fadda8] z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z.t
+ok 1 - setup of non-linear-history
 
-# passed all 232 test(s)
-1..232
+expecting success of 3425.2 'rebase --apply after merge from upstream': 
+		reset_rebase &&
+		git rebase --apply e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 6fadda8 z
+First, rewinding head to replay your work on top of it...
+Applying: n
+Applying: o
+ok 2 - rebase --apply after merge from upstream
+
+expecting success of 3425.3 'rebase -m after merge from upstream': 
+		reset_rebase &&
+		git rebase -m e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 3 - rebase -m after merge from upstream
+
+expecting success of 3425.4 'rebase -i after merge from upstream': 
+		reset_rebase &&
+		git rebase -i e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 4 - rebase -i after merge from upstream
+
+expecting success of 3425.5 'rebase --apply of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase --apply d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+First, rewinding head to replay your work on top of it...
+Applying: n
+Applying: o
+Applying: e
+ok 5 - rebase --apply of non-linear history is linearized in place
+
+expecting success of 3425.6 'rebase -m of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase -m d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at 9e9424c e
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 6 - rebase -m of non-linear history is linearized in place
+
+expecting success of 3425.7 'rebase -i of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase -i d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at ef67882 e
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 7 - rebase -i of non-linear history is linearized in place
+
+expecting success of 3425.8 'rebase --apply of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase --apply c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at ef67882 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: n
+Applying: o
+Applying: e
+ok 8 - rebase --apply of non-linear history is linearized upstream
+
+expecting success of 3425.9 'rebase -m of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase -m c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 9 - rebase -m of non-linear history is linearized upstream
+
+expecting success of 3425.10 'rebase -i of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase -i c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 10 - rebase -i of non-linear history is linearized upstream
+
+expecting success of 3425.11 'rebase --apply of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase --apply c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: n
+Applying: o
+Applying: e
+ok 11 - rebase --apply of non-linear history with merges after upstream merge is linearized
+
+expecting success of 3425.12 'rebase -m of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase -m c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 12 - rebase -m of non-linear history with merges after upstream merge is linearized
+
+expecting success of 3425.13 'rebase -i of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase -i c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 13 - rebase -i of non-linear history with merges after upstream merge is linearized
+
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3406-rebase-message.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3406-rebase-message/.git/
-expecting success of 3406.1 'setup': 
-	test_commit O fileO &&
-	test_commit X fileX &&
-	git branch fast-forward &&
-	test_commit A fileA &&
-	test_commit B fileB &&
-	test_commit Y fileY &&
+*** t3427-rebase-subtree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3427-rebase-subtree/.git/
+expecting success of 3427.1 'setup': 
+	test_commit README &&
 
-	git checkout -b conflicts O &&
-	test_commit P &&
-	test_commit conflict-X fileX &&
-	test_commit Q &&
+	git init files &&
+	test_commit -C files topic_1 &&
+	test_commit -C files topic_2 &&
+	test_commit -C files topic_3 &&
 
-	git checkout -b topic O &&
-	git cherry-pick A B &&
-	test_commit Z fileZ &&
-	git tag start
+	: 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" &&
 
-[main (root-commit) 3749684] O
+	: add two extra commits to rebase &&
+	test_commit -C files_subtree topic_4 &&
+	test_commit files_subtree/topic_5 &&
+
+	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
+
+[main (root-commit) 9b47b78] README
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 fileO
-[main a2df67f] X
+ create mode 100644 README.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 fileX
-[main 9491ce3] A
+ 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 fileA
-[main 83a6553] B
+ 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 fileB
-[main 545b0d0] Y
+ 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 fileY
-Switched to a new branch 'conflicts'
-[conflicts bd906e8] P
+ 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 P.t
-[conflicts f31fbd6] conflict-X
+ 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>
+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
+
+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"
+
+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:
+
+    git commit --allow-empty
+
+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")
+
+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 (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
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3421-rebase-topology-linear.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3421-rebase-topology-linear/.git/
+expecting success of 3421.1 'setup': 
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git checkout b &&
+	test_commit d &&
+	test_commit e
+
+[master (root-commit) ce450c7] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 fileX
-[conflicts f39a215] Q
+ create mode 100644 a.t
+[master 020ea9b] b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 Q.t
-Switched to a new branch 'topic'
-[topic 731bf4a] A
+ create mode 100644 b.t
+[master d9ea348] c
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 fileA
-[topic bd8c9c9] B
+ create mode 100644 c.t
+Note: switching to 'b'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 020ea9b b
+[detached HEAD 1bd0260] d
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 fileB
-[topic dd54835] Z
+ create mode 100644 d.t
+[detached HEAD 67a7211] e
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 fileZ
+ create mode 100644 e.t
 ok 1 - setup
 
-expecting success of 3406.2 'rebase -m': 
-	git rebase -m main >actual &&
-	test_must_be_empty actual
+expecting success of 3421.2 'simple rebase --apply': 
+		reset_rebase &&
+		git rebase --apply c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: e
+ok 2 - simple rebase --apply
+
+expecting success of 3421.3 'simple rebase -m': 
+		reset_rebase &&
+		git rebase -m c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 3 - simple rebase -m
+
+expecting success of 3421.4 'simple rebase -i': 
+		reset_rebase &&
+		git rebase -i c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 4 - simple rebase -i
+
+expecting success of 3421.5 'setup branches and remote tracking': 
+	git tag -l >tags &&
+	for tag in $(cat tags)
+	do
+		git branch branch-$tag $tag || return 1
+	done &&
+	git remote add origin "file://$PWD" &&
+	git fetch origin
+
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3421-rebase-topology-linear
+ * [new branch]      branch-a   -> origin/branch-a
+ * [new branch]      branch-b   -> origin/branch-b
+ * [new branch]      branch-c   -> origin/branch-c
+ * [new branch]      branch-d   -> origin/branch-d
+ * [new branch]      branch-e   -> origin/branch-e
+ * [new branch]      master     -> origin/master
+ok 5 - setup branches and remote tracking
+
+expecting success of 3421.6 'rebase --apply is no-op if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --apply b e &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Removing tags
+Current branch e is up to date.
+ok 6 - rebase --apply is no-op if upstream is an ancestor
+
+expecting success of 3421.7 'rebase -m is no-op if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -m b e &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Current branch e is up to date.
+ok 7 - rebase -m is no-op if upstream is an ancestor
+
+expecting success of 3421.8 'rebase -i is no-op if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -i b e &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 8 - rebase -i is no-op if upstream is an ancestor
+
+expecting success of 3421.9 'rebase --apply -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --apply -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Current branch e is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: e
+ok 9 - rebase --apply -f rewrites even if upstream is an ancestor
+
+expecting success of 3421.10 'rebase --fork-point -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --fork-point -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 10 - rebase --fork-point -f rewrites even if upstream is an ancestor
+
+expecting success of 3421.11 'rebase -m -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -m -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 11 - rebase -m -f rewrites even if upstream is an ancestor
+
+expecting success of 3421.12 'rebase -i -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -i -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 12 - rebase -i -f rewrites even if upstream is an ancestor
+
+expecting success of 3421.13 'rebase --apply -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --apply -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch branch-e is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: e
+ok 13 - rebase --apply -f rewrites even if remote upstream is an ancestor
+
+expecting success of 3421.14 'rebase --fork-point -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --fork-point -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch branch-e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
+ok 14 - rebase --fork-point -f rewrites even if remote upstream is an ancestor
+
+expecting success of 3421.15 'rebase -m -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -m -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch branch-e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
+ok 15 - rebase -m -f rewrites even if remote upstream is an ancestor
+
+expecting success of 3421.16 'rebase -i -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -i -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
+ok 16 - rebase -i -f rewrites even if remote upstream is an ancestor
+
+expecting success of 3421.17 'rebase --apply fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase --apply e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+First, rewinding head to replay your work on top of it...
+Fast-forwarded b to e.
+ok 17 - rebase --apply fast-forwards from ancestor of upstream
+
+expecting success of 3421.18 'rebase --fork-point fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase --fork-point e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 18 - rebase --fork-point fast-forwards from ancestor of upstream
+
+expecting success of 3421.19 'rebase -m fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase -m e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 19 - rebase -m fast-forwards from ancestor of upstream
+
+expecting success of 3421.20 'rebase -i fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase -i e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 20 - rebase -i fast-forwards from ancestor of upstream
+
+expecting success of 3421.21 'setup of linear history for range selection tests': 
+	git checkout c &&
+	test_commit g &&
+	revert h g &&
+	git checkout d &&
+	cherry_pick gp g &&
+	test_commit i &&
+	git checkout b &&
+	test_commit f
+
+Previous HEAD position was 67a7211 e
+HEAD is now at d9ea348 c
+[detached HEAD 5573dba] g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 09e6546] h
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 g.t
+Previous HEAD position was 09e6546 h
+HEAD is now at 1bd0260 d
+[detached HEAD 00eccdb] gp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 3317c29] i
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i.t
+Previous HEAD position was 3317c29 i
+HEAD is now at 020ea9b b
+[detached HEAD 09e072f] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f.t
+ok 21 - setup of linear history for range selection tests
+
+expecting success of 3421.22 'rebase --apply drops patches in upstream': 
+		reset_rebase &&
+		git rebase --apply h i &&
+		test_cmp_rev h HEAD~2 &&
+		test_linear_range 'd i' h..
+	
+fatal: no rebase in progress
+HEAD is now at 09e072f f
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: i
+ok 22 - rebase --apply drops patches in upstream
+
+expecting success of 3421.23 'rebase -m drops patches in upstream': 
+		reset_rebase &&
+		git rebase -m h i &&
+		test_cmp_rev h HEAD~2 &&
+		test_linear_range 'd i' h..
+	
+fatal: no rebase in progress
+HEAD is now at 5c158e9 i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 23 - rebase -m drops patches in upstream
+
+expecting success of 3421.24 'rebase -i drops patches in upstream': 
+		reset_rebase &&
+		git rebase -i h i &&
+		test_cmp_rev h HEAD~2 &&
+		test_linear_range 'd i' h..
+	
+fatal: no rebase in progress
+HEAD is now at 5c158e9 i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 24 - rebase -i drops patches in upstream
+
+expecting success of 3421.25 'rebase --apply can drop last patch if in upstream': 
+		reset_rebase &&
+		git rebase --apply h gp &&
+		test_cmp_rev h HEAD^ &&
+		test_linear_range 'd' h..
+	
+fatal: no rebase in progress
+HEAD is now at 5c158e9 i
+First, rewinding head to replay your work on top of it...
+Applying: d
+ok 25 - rebase --apply can drop last patch if in upstream
+
+expecting success of 3421.26 'rebase -m can drop last patch if in upstream': 
+		reset_rebase &&
+		git rebase -m h gp &&
+		test_cmp_rev h HEAD^ &&
+		test_linear_range 'd' h..
+	
+fatal: no rebase in progress
+HEAD is now at e937a8e d
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 26 - rebase -m can drop last patch if in upstream
+
+expecting success of 3421.27 'rebase -i can drop last patch if in upstream': 
+		reset_rebase &&
+		git rebase -i h gp &&
+		test_cmp_rev h HEAD^ &&
+		test_linear_range 'd' h..
+	
+fatal: no rebase in progress
+HEAD is now at e937a8e d
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 27 - rebase -i can drop last patch if in upstream
+
+expecting success of 3421.28 'rebase --apply --onto drops patches in upstream': 
+		reset_rebase &&
+		git rebase --apply --onto f h i &&
+		test_cmp_rev f HEAD~2 &&
+		test_linear_range 'd i' f..
+	
+fatal: no rebase in progress
+HEAD is now at e937a8e d
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: i
+ok 28 - rebase --apply --onto drops patches in upstream
+
+expecting success of 3421.29 'rebase -m --onto drops patches in upstream': 
+		reset_rebase &&
+		git rebase -m --onto f h i &&
+		test_cmp_rev f HEAD~2 &&
+		test_linear_range 'd i' f..
+	
+fatal: no rebase in progress
+HEAD is now at bcc98eb i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 29 - rebase -m --onto drops patches in upstream
+
+expecting success of 3421.30 'rebase -i --onto drops patches in upstream': 
+		reset_rebase &&
+		git rebase -i --onto f h i &&
+		test_cmp_rev f HEAD~2 &&
+		test_linear_range 'd i' f..
+	
+fatal: no rebase in progress
+HEAD is now at bcc98eb i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 30 - rebase -i --onto drops patches in upstream
+
+expecting success of 3421.31 'rebase --apply --onto does not drop patches in onto': 
+		reset_rebase &&
+		git rebase --apply --onto h f i &&
+		test_cmp_rev h HEAD~3 &&
+		test_linear_range 'd gp i' h..
+	
+fatal: no rebase in progress
+HEAD is now at bcc98eb i
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: gp
+Applying: i
+ok 31 - rebase --apply --onto does not drop patches in onto
+
+expecting success of 3421.32 'rebase -m --onto does not drop patches in onto': 
+		reset_rebase &&
+		git rebase -m --onto h f i &&
+		test_cmp_rev h HEAD~3 &&
+		test_linear_range 'd gp i' h..
+	
+fatal: no rebase in progress
+HEAD is now at bbe8f41 i
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 32 - rebase -m --onto does not drop patches in onto
+
+expecting success of 3421.33 'rebase -i --onto does not drop patches in onto': 
+		reset_rebase &&
+		git rebase -i --onto h f i &&
+		test_cmp_rev h HEAD~3 &&
+		test_linear_range 'd gp i' h..
+	
+fatal: no rebase in progress
+HEAD is now at bbe8f41 i
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 33 - rebase -i --onto does not drop patches in onto
+
+expecting success of 3421.34 'setup of linear history for empty commit tests': 
+	git checkout c &&
+	make_empty j &&
+	git checkout d &&
+	make_empty k &&
+	test_commit l
+
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  bbe8f41 i
+  4a12efe gp
+  e937a8e d
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> bbe8f41
+
+HEAD is now at d9ea348 c
+[detached HEAD 5b67321] j
+ Author: A U Thor <author@example.com>
+Previous HEAD position was 5b67321 j
+HEAD is now at 1bd0260 d
+[detached HEAD 753370d] k
+ Author: A U Thor <author@example.com>
+[detached HEAD 49cf309] l
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 l.t
+ok 34 - setup of linear history for empty commit tests
+
+checking known breakage of 3421.35 'rebase --apply keeps begin-empty commits': 
+		reset_rebase &&
+		git rebase --apply j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 49cf309 l
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: l
+error: two revisions point to different objects:
+  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
+  'HEAD~4': 020ea9b5b2051d958f4737afacdc8821a33ac9a9
+not ok 35 - rebase --apply keeps begin-empty commits # TODO known breakage
+
+expecting success of 3421.36 'rebase -m keeps begin-empty commits': 
+		reset_rebase &&
+		git rebase -m j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 1612308 l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 36 - rebase -m keeps begin-empty commits
+
+expecting success of 3421.37 'rebase -i keeps begin-empty commits': 
+		reset_rebase &&
+		git rebase -i j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 37 - rebase -i keeps begin-empty commits
 
-warning: skipped previously applied commit 731bf4a
-warning: skipped previously applied commit bd8c9c9
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 2 - rebase -m
+expecting success of 3421.38 'rebase -m --no-keep-empty drops begin-empty commits': 
+		reset_rebase &&
+		git rebase -m --no-keep-empty c l &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 38 - rebase -m --no-keep-empty drops begin-empty commits
 
-expecting success of 3406.3 'rebase against main twice': 
-	git rebase --apply main >out &&
-	test_grep "Current branch topic is up to date" out
+expecting success of 3421.39 'rebase -i --no-keep-empty drops begin-empty commits': 
+		reset_rebase &&
+		git rebase -i --no-keep-empty c l &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd l' c..
+	
+fatal: no rebase in progress
+HEAD is now at ef60b8d l
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 39 - rebase -i --no-keep-empty drops begin-empty commits
 
-Current branch topic is up to date.
-ok 3 - rebase against main twice
+expecting success of 3421.40 'rebase -m --keep-empty keeps empty even if already in upstream': 
+		reset_rebase &&
+		git rebase -m --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
+	
+fatal: no rebase in progress
+HEAD is now at ef60b8d l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 40 - rebase -m --keep-empty keeps empty even if already in upstream
 
-expecting success of 3406.4 'rebase against main twice with --force': 
-	git rebase --force-rebase --apply main >out &&
-	test_grep "Current branch topic is up to date, rebase forced" out
+expecting success of 3421.41 'rebase -i --keep-empty keeps empty even if already in upstream': 
+		reset_rebase &&
+		git rebase -i --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 41 - rebase -i --keep-empty keeps empty even if already in upstream
 
-Current branch topic is up to date, rebase forced.
-ok 4 - rebase against main twice with --force
+expecting success of 3421.42 'rebase --rebase-merges --keep-empty keeps empty even if already in upstream': 
+		reset_rebase &&
+		git rebase --rebase-merges --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
+ok 42 - rebase --rebase-merges --keep-empty keeps empty even if already in upstream
 
-expecting success of 3406.5 'rebase against main twice from another branch': 
-	git checkout topic^ &&
-	git rebase --apply main topic >out &&
-	test_grep "Current branch topic is up to date" out
+expecting success of 3421.43 'setup of linear history for test involving root': 
+	git checkout b &&
+	revert m b &&
+	git checkout --orphan disjoint &&
+	git rm -rf . &&
+	test_commit x &&
+	test_commit y &&
+	cherry_pick bp b
 
-Note: switching to 'topic^'.
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+  5395ede l
+  9a731c2 k
+  60768b3 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:
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-  git switch -c <new-branch-name>
+ git branch <new-branch-name> 5395ede
 
-Or undo this operation with:
+HEAD is now at 020ea9b b
+[detached HEAD 6db5543] m
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b.t
+Switched to a new branch 'disjoint'
+rm 'a.t'
+[disjoint (root-commit) 059091f] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+[disjoint be1e399] y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y.t
+[disjoint b7cb922] bp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+ok 43 - setup of linear history for test involving root
 
-  git switch -
+expecting success of 3421.44 'rebase --apply --onto --root': 
+		reset_rebase &&
+		git rebase --apply --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at b7cb922 bp
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 44 - rebase --apply --onto --root
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3421.45 'rebase -m --onto --root': 
+		reset_rebase &&
+		git rebase -m --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 45 - rebase -m --onto --root
 
-HEAD is now at 545b0d0 Y
-Current branch topic is up to date.
-ok 5 - rebase against main twice from another branch
+expecting success of 3421.46 'rebase -i --onto --root': 
+		reset_rebase &&
+		git rebase -i --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 46 - rebase -i --onto --root
 
-expecting success of 3406.6 'rebase fast-forward to main': 
-	git checkout topic^ &&
-	git rebase --apply topic >out &&
-	test_grep "Fast-forwarded HEAD to topic" out
+expecting success of 3421.47 'rebase --apply without --onto --root with disjoint history': 
+		reset_rebase &&
+		git rebase --apply c y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 47 - rebase --apply without --onto --root with disjoint history
 
-Note: switching to 'topic^'.
+expecting success of 3421.48 'rebase -m without --onto --root with disjoint history': 
+		reset_rebase &&
+		git rebase -m c y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 48 - rebase -m without --onto --root with disjoint history
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 3421.49 'rebase -i without --onto --root with disjoint history': 
+		reset_rebase &&
+		git rebase -i c y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 49 - rebase -i without --onto --root with disjoint history
 
-If you want to 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 3421.50 'rebase --apply --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase --apply --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 50 - rebase --apply --onto --root drops patch in onto
 
-  git switch -c <new-branch-name>
+expecting success of 3421.51 'rebase -m --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase -m --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 51 - rebase -m --onto --root drops patch in onto
 
-Or undo this operation with:
+expecting success of 3421.52 'rebase -i --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase -i --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 52 - rebase -i --onto --root drops patch in onto
 
-  git switch -
+expecting success of 3421.53 'rebase --apply --onto --root with merge-base does not go to root': 
+		reset_rebase &&
+		git rebase --apply --onto m --root g &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'c g' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+First, rewinding head to replay your work on top of it...
+Applying: c
+Applying: g
+ok 53 - rebase --apply --onto --root with merge-base does not go to root
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3421.54 'rebase -m --onto --root with merge-base does not go to root': 
+		reset_rebase &&
+		git rebase -m --onto m --root g &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'c g' m..
+	
+fatal: no rebase in progress
+HEAD is now at 9921398 g
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 54 - rebase -m --onto --root with merge-base does not go to root
 
-HEAD is now at 545b0d0 Y
-Fast-forwarded HEAD to topic.
-ok 6 - rebase fast-forward to main
+expecting success of 3421.55 'rebase -i --onto --root with merge-base does not go to root': 
+		reset_rebase &&
+		git rebase -i --onto m --root g &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'c g' m..
+	
+fatal: no rebase in progress
+HEAD is now at 9921398 g
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 55 - rebase -i --onto --root with merge-base does not go to root
 
-expecting success of 3406.7 'rebase --stat': 
-	git reset --hard start &&
-	git rebase --stat main >diffstat.txt &&
-	grep "^ fileX |  *1 +$" diffstat.txt
+expecting success of 3421.56 'rebase --apply without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase --apply m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 9921398 g
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 56 - rebase --apply without --onto --root with disjoint history drops patch in onto
 
-HEAD is now at dd54835 Z
-warning: skipped previously applied commit 731bf4a
-warning: skipped previously applied commit bd8c9c9
+expecting success of 3421.57 'rebase -m without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase -m m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
- fileX | 1 +
-ok 7 - rebase --stat
-
-expecting success of 3406.8 'rebase w/config rebase.stat': 
-	git reset --hard start &&
-	git config rebase.stat true &&
-	git rebase main >diffstat.txt &&
-	grep "^ fileX |  *1 +$" diffstat.txt
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 57 - rebase -m without --onto --root with disjoint history drops patch in onto
 
-HEAD is now at dd54835 Z
-warning: skipped previously applied commit 731bf4a
-warning: skipped previously applied commit bd8c9c9
+expecting success of 3421.58 'rebase -i without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase -i m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
- fileX | 1 +
-ok 8 - rebase w/config rebase.stat
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 58 - rebase -i without --onto --root with disjoint history drops patch in onto
 
-expecting success of 3406.9 'rebase -n overrides config rebase.stat config': 
-	git reset --hard start &&
-	git config rebase.stat true &&
-	git rebase -n main >diffstat.txt &&
-	! grep "^ fileX |  *1 +$" diffstat.txt
+expecting success of 3421.59 'rebase  --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase  --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 59 - rebase  --root on linear history is a no-op
 
-HEAD is now at dd54835 Z
-warning: skipped previously applied commit 731bf4a
-warning: skipped previously applied commit bd8c9c9
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 9 - rebase -n overrides config rebase.stat config
+expecting success of 3421.60 'rebase -m --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase -m --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 60 - rebase -m --root on linear history is a no-op
 
-expecting success of 3406.10 'rebase --onto outputs the invalid ref': 
-	test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
-	test_grep "invalid-ref" err
+expecting success of 3421.61 'rebase -i --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase -i --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 61 - rebase -i --root on linear history is a no-op
 
-fatal: Does not point to a valid commit 'invalid-ref'
-ok 10 - rebase --onto outputs the invalid ref
+expecting success of 3421.62 'rebase  -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase  -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 62 - rebase  -f --root on linear history causes re-write
 
-expecting success of 3406.11 'error out early upon -C<n> or --whitespace=<bad>': 
-	test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
-	test_grep "numerical value" err &&
-	test_must_fail git rebase --whitespace=bad HEAD 2>err &&
-	test_grep "Invalid whitespace option" err
+expecting success of 3421.63 'rebase -m -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase -m -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 8b0b08f c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 63 - rebase -m -f --root on linear history causes re-write
 
-fatal: switch `C' expects a numerical value
-fatal: Invalid whitespace option: 'bad'
-ok 11 - error out early upon -C<n> or --whitespace=<bad>
+expecting success of 3421.64 'rebase -i -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase -i -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 8b0b08f c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 64 - rebase -i -f --root on linear history causes re-write
 
-expecting success of 3406.12 'rebase --merge reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+# still have 1 known breakage(s)
+# passed all remaining 63 test(s)
+1..64
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3428-rebase-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3428-rebase-signoff/.git/
+expecting success of 3428.1 'setup': 
+	git commit --allow-empty -m "Initial empty commit" &&
+	test_commit first file a &&
+	test_commit second file &&
+	git checkout -b conflict-branch first &&
+	test_commit file-2 file-2 &&
+	test_commit conflict file &&
+	test_commit third file &&
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		echo resolved >fileX &&
-		git add fileX &&
-		git rebase --continue
-	) &&
+	ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
 
-	git log -g --format=%gs -5 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (continue): conflict-X
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+	# Expected commit message for initial commit after rebase --signoff
+	cat >expected-initial-signed <<-EOF &&
+	Initial empty commit
 
-	git log -g --format=%gs -1 conflicts >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
+	Signed-off-by: $ident
 	EOF
-	test_cmp expect actual &&
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev conflicts@{1} Q
-	
-Previous HEAD position was c4441bc Z
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-[detached HEAD 57e508d] conflict-X
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
-HEAD is now at f39a215 Q
-ok 12 - rebase --merge reflog
+	# Expected commit message after rebase --signoff
+	cat >expected-signed <<-EOF &&
+	first
 
-expecting success of 3406.13 'rebase --merge fast-forward reflog': 
-	git checkout fast-forward &&
-	test_when_finished "git reset --hard X" &&
+	Signed-off-by: $ident
+	EOF
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		git rebase $mode main
-	) &&
+	# Expected commit message after conflict resolution for rebase --signoff
+	cat >expected-signed-conflict <<-EOF &&
+	third
 
-	git log -g --format=%gs -2 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+	Signed-off-by: $ident
 
-	git log -g --format=%gs -1 fast-forward >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
-	EOF
-	test_cmp expect actual &&
+	conflict
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev fast-forward@{1} X
-	
-Switched to branch 'fast-forward'
- fileA | 1 +
- fileB | 1 +
- fileY | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileY
-Successfully rebased and updated refs/heads/fast-forward.
-HEAD is now at a2df67f X
-ok 13 - rebase --merge fast-forward reflog
+	Signed-off-by: $ident
 
-expecting success of 3406.14 'rebase --merge --skip reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+	file-2
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --skip
-	) &&
+	Signed-off-by: $ident
 
-	git log -g --format=%gs -4 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
 	EOF
-	test_cmp expect actual
-	
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
-HEAD is now at f39a215 Q
-ok 14 - rebase --merge --skip reflog
 
-expecting success of 3406.15 'rebase --merge --abort reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+	# Expected commit message after rebase without --signoff (or with --no-signoff)
+	cat >expected-unsigned <<-EOF &&
+	first
+	EOF
 
-	git log -g -1 conflicts >branch-expect &&
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+	git config alias.rbs "rebase --signoff"
 
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+[master (root-commit) 6c54391] Initial empty commit
+ Author: A U Thor <author@example.com>
+[master 626aa63] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master cee64ce] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'conflict-branch'
+[conflict-branch 3c3ba6d] file-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-2
+[conflict-branch b53cad1] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch c062584] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-	# check branch reflog is unchanged
-	git log -g -1 conflicts >branch-actual &&
-	test_cmp branch-expect branch-actual
-	
-Already on 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
+expecting success of 3428.2 'rebase --apply --signoff adds a sign-off line': 
+	test_must_fail git rbs --apply second third &&
+	git checkout --theirs file &&
+	git add file &&
+	git rebase --continue &&
+	git log --format=%B -n3 >actual &&
+	test_cmp expected-signed-conflict actual
+
+First, rewinding head to replay your work on top of it...
+Applying: file-2
+Applying: conflict
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+84c676d file-2
+virtual conflict
+found 1 common ancestor:
+virtual 848740929e99bda0e1a9783e7daa314c5a9732d5
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-HEAD is now at f39a215 Q
-ok 15 - rebase --merge --abort reflog
-
-expecting success of 3406.16 'rebase --merge --abort detached HEAD reflog': 
-	git checkout Q &&
-	test_when_finished "git reset --hard Q" &&
-
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+Patch failed at 0002 conflict
+Updated 1 path from the index
+Applying: conflict
+Applying: third
+ok 2 - rebase --apply --signoff adds a sign-off line
 
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual
-	
-Note: switching to 'Q'.
+expecting success of 3428.3 'rebase --no-signoff does not add a sign-off line': 
+	git commit --amend -m "first" &&
+	git rbs --no-signoff HEAD^ &&
+	test_commit_message HEAD expected-unsigned
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+[detached HEAD 56522f9] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is up to date.
+ok 3 - rebase --no-signoff does not add a sign-off line
 
-If you want to 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 3428.4 'rebase --exec --signoff adds a sign-off line': 
+	test_when_finished "rm exec" &&
+	git rebase --exec "touch exec" --signoff first^ first &&
+	test_path_is_file exec &&
+	test_commit_message HEAD expected-signed
 
-  git switch -c <new-branch-name>
+Rebasing (1/2)
Rebasing (2/2)
Executing: touch exec
+Successfully rebased and updated detached HEAD.
+ok 4 - rebase --exec --signoff adds a sign-off line
 
-Or undo this operation with:
+expecting success of 3428.5 'rebase --root --signoff adds a sign-off line': 
+	git checkout first &&
+	git rebase --root --keep-empty --signoff &&
+	test_commit_message HEAD^ expected-initial-signed &&
+	test_commit_message HEAD expected-signed
 
-  git switch -
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Turn off this advice by setting config variable advice.detachedHead to false
+  d43d5c6 first
 
-HEAD is now at f39a215 Q
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-HEAD is now at f39a215 Q
-ok 16 - rebase --merge --abort detached HEAD reflog
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3406.17 'rebase --merge reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+ git branch <new-branch-name> d43d5c6
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		echo resolved >fileX &&
-		git add fileX &&
-		git rebase --continue
-	) &&
+HEAD is now at 626aa63 first
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 5 - rebase --root --signoff adds a sign-off line
 
-	git log -g --format=%gs -5 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (continue): conflict-X
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+expecting success of 3428.6 'rebase -m --signoff adds a sign-off line': 
+	test_must_fail git rebase -m --signoff second third &&
+	git checkout --theirs file &&
+	git add file &&
+	GIT_EDITOR="sed -n /Conflicts:/,/^\\\$/p >actual" \
+		git rebase --continue &&
+	cat >expect <<-\EOF &&
+	# Conflicts:
+	#	file
 
-	git log -g --format=%gs -1 conflicts >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
 	EOF
 	test_cmp expect actual &&
+	git log --format=%B -n3 >actual &&
+	test_cmp expected-signed-conflict actual
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev conflicts@{1} Q
-	
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply b53cad1... conflict
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-[detached HEAD 57e508d] conflict-X
+Could not apply b53cad1... conflict
+Updated 1 path from the index
+[detached HEAD 613a669] conflict
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
-HEAD is now at f39a215 Q
-ok 17 - rebase --merge reflog GIT_REFLOG_ACTION=my-reflog-action
-
-expecting success of 3406.18 'rebase --merge fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout fast-forward &&
-	test_when_finished "git reset --hard X" &&
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 6 - rebase -m --signoff adds a sign-off line
 
+expecting success of 3428.7 'rebase -i --signoff adds a sign-off line when editing commit': 
 	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		git rebase $mode main
+		set_fake_editor &&
+		FAKE_LINES="edit 1 edit 3 edit 2" \
+			git rebase -i --signoff first third
 	) &&
+	echo a >a &&
+	git add a &&
+	test_must_fail git rebase --continue &&
+	git checkout --ours file &&
+	echo b >a &&
+	git add a file &&
+	git rebase --continue &&
+	echo c >a &&
+	git add a &&
+	git log --format=%B -n3 >actual &&
+	cat >expect <<-EOF &&
+	conflict
 
-	git log -g --format=%gs -2 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+	Signed-off-by: $ident
 
-	git log -g --format=%gs -1 fast-forward >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
-	EOF
-	test_cmp expect actual &&
+	third
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev fast-forward@{1} X
-	
-Switched to branch 'fast-forward'
- fileA | 1 +
- fileB | 1 +
- fileY | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileY
-Successfully rebased and updated refs/heads/fast-forward.
-HEAD is now at a2df67f X
-ok 18 - rebase --merge fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action
+	Signed-off-by: $ident
 
-expecting success of 3406.19 'rebase --merge --skip reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+	file-2
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --skip
-	) &&
+	Signed-off-by: $ident
 
-	git log -g --format=%gs -4 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
 	EOF
 	test_cmp expect actual
-	
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-Rebasing (3/3)
Successfully rebased and updated refs/heads/conflicts.
-HEAD is now at f39a215 Q
-ok 19 - rebase --merge --skip reflog GIT_REFLOG_ACTION=my-reflog-action
 
-expecting success of 3406.20 'rebase --merge --abort reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+rebase -i script before editing:
+pick 3c3ba6d file-2
+pick b53cad1 conflict
+pick c062584 third
 
-	git log -g -1 conflicts >branch-expect &&
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+rebase -i script after editing:
+edit 3c3ba6d file-2
+edit c062584 third
+edit b53cad1 conflict
+Rebasing (1/3)
Stopped at 3c3ba6d...  file-2
+You can amend the commit now, with
 
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+  git commit --amend 
 
-	# check branch reflog is unchanged
-	git log -g -1 conflicts >branch-actual &&
-	test_cmp branch-expect branch-actual
-	
-Already on 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD 22331a7] file-2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 file-2
+Rebasing (2/3)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply c062584... third
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-HEAD is now at f39a215 Q
-ok 20 - rebase --merge --abort reflog GIT_REFLOG_ACTION=my-reflog-action
+Could not apply c062584... third
+Updated 1 path from the index
+[detached HEAD 8033101] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (3/3)
Stopped at b53cad1...  conflict
+You can amend the commit now, with
 
-expecting success of 3406.21 'rebase --merge --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout Q &&
-	test_when_finished "git reset --hard Q" &&
+  git commit --amend 
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+Once you are satisfied with your changes, run
 
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual
-	
-Note: switching to 'Q'.
+  git rebase --continue
+ok 7 - rebase -i --signoff adds a sign-off line when editing commit
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3420-rebase-autostash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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//")"
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+[main (root-commit) 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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 switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 f39a215 Q
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging fileX
-CONFLICT (add/add): Merge conflict in fileX
-error: could not apply f31fbd6... conflict-X
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-HEAD is now at f39a215 Q
-ok 21 - rebase --merge --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action
+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 3406.22 'rebase --apply reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+		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
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		echo resolved >fileX &&
-		git add fileX &&
-		git rebase --continue
-	) &&
+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
 
-	git log -g --format=%gs -5 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (continue): conflict-X
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+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
 
-	git log -g --format=%gs -1 conflicts >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
-	EOF
-	test_cmp expect actual &&
+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
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev conflicts@{1} Q
+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
 	
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
+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
+
+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 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: P
-Applying: conflict-X
+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 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:
-866f7e4 P
-virtual conflict-X
+c57d250 related commit
+virtual second commit
 found 1 common ancestor:
 virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
+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
@@ -145351,99 +151252,43 @@
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-Applying: conflict-X
-Applying: Q
-HEAD is now at f39a215 Q
-ok 22 - rebase --apply reflog
-
-expecting success of 3406.23 'rebase --apply fast-forward reflog': 
-	git checkout fast-forward &&
-	test_when_finished "git reset --hard X" &&
-
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		git rebase $mode main
-	) &&
-
-	git log -g --format=%gs -2 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
-
-	git log -g --format=%gs -1 fast-forward >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
-	EOF
-	test_cmp expect actual &&
-
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev fast-forward@{1} X
-	
-Switched to branch 'fast-forward'
- fileA | 1 +
- fileB | 1 +
- fileY | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileY
-First, rewinding head to replay your work on top of it...
-Fast-forwarded fast-forward to main.
-HEAD is now at a2df67f X
-ok 23 - rebase --apply fast-forward reflog
-
-expecting success of 3406.24 'rebase --apply --skip reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
-
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --skip
-	) &&
+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
 
-	git log -g --format=%gs -4 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual
+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
 	
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
+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: P
-Applying: conflict-X
+Applying: second commit
 Using index info to reconstruct a base tree...
 Falling back to patching base and 3-way merge...
 Merging:
-866f7e4 P
-virtual conflict-X
+c57d250 related commit
+virtual second commit
 found 1 common ancestor:
 virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
+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
@@ -145451,60 +151296,44 @@
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-Applying: Q
-HEAD is now at f39a215 Q
-ok 24 - rebase --apply --skip reflog
-
-expecting success of 3406.25 'rebase --apply --abort reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
-
-	git log -g -1 conflicts >branch-expect &&
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
-
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+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
 
-	# check branch reflog is unchanged
-	git log -g -1 conflicts >branch-actual &&
-	test_cmp branch-expect branch-actual
+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
 	
-Already on 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
+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: P
-Applying: conflict-X
+Applying: second commit
 Using index info to reconstruct a base tree...
 Falling back to patching base and 3-way merge...
 Merging:
-866f7e4 P
-virtual conflict-X
+c57d250 related commit
+virtual second commit
 found 1 common ancestor:
 virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
+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
@@ -145512,71 +151341,43 @@
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-HEAD is now at f39a215 Q
-ok 25 - rebase --apply --abort reflog
-
-expecting success of 3406.26 'rebase --apply --abort detached HEAD reflog': 
-	git checkout Q &&
-	test_when_finished "git reset --hard Q" &&
-
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+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
 
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual
+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
 	
-Note: switching to 'Q'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at f39a215 Q
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
+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: P
-Applying: conflict-X
+Applying: second commit
 Using index info to reconstruct a base tree...
 Falling back to patching base and 3-way merge...
 Merging:
-866f7e4 P
-virtual conflict-X
+c57d250 related commit
+virtual second commit
 found 1 common ancestor:
 virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
+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
@@ -145584,67 +151385,47 @@
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-HEAD is now at f39a215 Q
-ok 26 - rebase --apply --abort detached HEAD reflog
-
-expecting success of 3406.27 'rebase --apply reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
-
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		echo resolved >fileX &&
-		git add fileX &&
-		git rebase --continue
-	) &&
-
-	git log -g --format=%gs -5 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (continue): conflict-X
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
-
-	git log -g --format=%gs -1 conflicts >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
-	EOF
-	test_cmp expect actual &&
+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
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev conflicts@{1} Q
+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
 	
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
+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: P
-Applying: conflict-X
+Applying: second commit
 Using index info to reconstruct a base tree...
 Falling back to patching base and 3-way merge...
 Merging:
-866f7e4 P
-virtual conflict-X
+c57d250 related commit
+virtual second commit
 found 1 common ancestor:
 virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
+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
@@ -145652,4103 +151433,6287 @@
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-Applying: conflict-X
-Applying: Q
-HEAD is now at f39a215 Q
-ok 27 - rebase --apply reflog GIT_REFLOG_ACTION=my-reflog-action
+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 3406.28 'rebase --apply fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout fast-forward &&
-	test_when_finished "git reset --hard X" &&
+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
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
+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 &&
-		git rebase $mode main
-	) &&
+		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
 
-	git log -g --format=%gs -2 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/fast-forward
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+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
 
-	git log -g --format=%gs -1 fast-forward >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/fast-forward onto $(git rev-parse main)
-	EOF
-	test_cmp expect actual &&
+		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
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev fast-forward@{1} X
+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
 	
-Switched to branch 'fast-forward'
- fileA | 1 +
- fileB | 1 +
- fileY | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileY
-First, rewinding head to replay your work on top of it...
-Fast-forwarded fast-forward to main.
-HEAD is now at a2df67f X
-ok 28 - rebase --apply fast-forward reflog GIT_REFLOG_ACTION=my-reflog-action
+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 3406.29 'rebase --apply --skip reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+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
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
+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 &&
-		test_must_fail git rebase $mode main &&
-		git rebase --skip
-	) &&
+		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
 
-	git log -g --format=%gs -4 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): Q
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual
+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
 	
-Switched to branch 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-First, rewinding head to replay your work on top of it...
-Applying: P
-Applying: conflict-X
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-866f7e4 P
-virtual conflict-X
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+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 set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-Applying: Q
-HEAD is now at f39a215 Q
-ok 29 - rebase --apply --skip reflog GIT_REFLOG_ACTION=my-reflog-action
-
-expecting success of 3406.30 'rebase --apply --abort reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
-
-	git log -g -1 conflicts >branch-expect &&
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
-
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to refs/heads/conflicts
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual &&
+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
 
-	# check branch reflog is unchanged
-	git log -g -1 conflicts >branch-actual &&
-	test_cmp branch-expect branch-actual
+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
 	
-Already on 'conflicts'
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-First, rewinding head to replay your work on top of it...
-Applying: P
-Applying: conflict-X
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-866f7e4 P
-virtual conflict-X
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+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 set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-HEAD is now at f39a215 Q
-ok 30 - rebase --apply --abort reflog GIT_REFLOG_ACTION=my-reflog-action
-
-expecting success of 3406.31 'rebase --apply --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout Q &&
-	test_when_finished "git reset --hard Q" &&
-
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+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
 
-	git log -g --format=%gs -3 >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (abort): returning to $(git rev-parse Q)
-	${reflog_action:-rebase} (pick): P
-	${reflog_action:-rebase} (start): checkout main
-	EOF
-	test_cmp expect actual
+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
 	
-Note: switching to 'Q'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
+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 set 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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 set 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
 
-HEAD is now at f39a215 Q
- fileA | 1 +
- fileB | 1 +
- fileX | 1 +
- fileY | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA
- create mode 100644 fileB
- create mode 100644 fileX
- create mode 100644 fileY
-First, rewinding head to replay your work on top of it...
-Applying: P
-Applying: conflict-X
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-866f7e4 P
-virtual conflict-X
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in fileX
-Auto-merging fileX
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+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 set advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-HEAD is now at f39a215 Q
-ok 31 - rebase --apply --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action
+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 3406.32 'rebase -i onto unrelated history': 
-	git init unrelated &&
-	test_commit -C unrelated 1 &&
-	git -C unrelated remote add -f origin "$PWD" &&
-	git -C unrelated branch --set-upstream-to=origin/main &&
-	git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
-	test_grep "Changes to " actual &&
-	test_grep "5 files changed" actual
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3406-rebase-message/unrelated/.git/
-[main (root-commit) 925a26a] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Updating origin
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3406-rebase-message
- * [new branch]      conflicts    -> origin/conflicts
- * [new branch]      fast-forward -> origin/fast-forward
- * [new branch]      main         -> origin/main
- * [new branch]      topic        -> origin/topic
- * [new tag]         Q            -> Q
- * [new tag]         X            -> X
- * [new tag]         Y            -> Y
- * [new tag]         A            -> A
- * [new tag]         B            -> B
- * [new tag]         O            -> O
- * [new tag]         P            -> P
- * [new tag]         conflict-X   -> conflict-X
-branch 'main' set up to track 'origin/main'.
-Rebasing (1/1)
-Successfully rebased and updated refs/heads/main.
-Changes to 545b0d0a5d2af9b721d265dc5293dbb3418ab768:
- 5 files changed, 5 insertions(+)
- 5 files changed, 5 insertions(+)
-ok 32 - rebase -i onto unrelated history
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	err
+	expect
+	expected
 
-# passed all 32 test(s)
-1..32
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3417-rebase-whitespace-fix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3417-rebase-whitespace-fix/.git/
-expecting success of 3417.1 'blank line at end of file; extend at end of file': 
-	git commit --allow-empty -m "Initial empty commit" &&
-	git add file && git commit -m first &&
-	mv second file &&
-	git add file && git commit -m second &&
-	git rebase --whitespace=fix HEAD^^ &&
-	git diff --exit-code HEAD^:file expect-first &&
-	test_cmp expect-second file
+Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
+dirty
+ok 30 - rebase --merge: non-conflicting rebase, conflicting stash
 
-[master (root-commit) 6c54391] Initial empty commit
- Author: A U Thor <author@example.com>
-[master e2d0a8f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 file
-[master 14cb724] second
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: first
-Applying: second
-ok 1 - blank line at end of file; extend at end of file
+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 3417.2 'two blanks line at end of file; extend at end of file': 
-	cp third file && git add file && git commit -m third &&
-	git rebase --whitespace=fix HEAD^^ &&
-	git diff --exit-code HEAD^:file expect-second &&
-	test_cmp expect-third file
+expecting success of 3420.32 'rebase --interactive: restore autostash when pre-rebase hook fails': 
+		git checkout -f feature-branch &&
+		test_hook pre-rebase <<-\EOF &&
+		exit 1
+		EOF
 
-[master c2f1416] third
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: second
-Applying: third
-ok 2 - two blanks line at end of file; extend at end of file
+		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 3417.3 'same, but do not remove trailing spaces': 
-	git config core.whitespace "-blank-at-eol" &&
-	git reset --hard HEAD^ &&
-	cp third file && git add file && git commit -m third &&
-	git rebase --whitespace=fix HEAD^^ &&
-	git diff --exit-code HEAD^:file expect-second &&
-	test_cmp file third
+expecting success of 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
 
-HEAD is now at 0c4819a second
-[master c2f1416] third
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: second
-Applying: third
-ok 3 - same, but do not remove trailing spaces
+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 3417.4 'at beginning of file': 
-	git config core.whitespace "blank-at-eol" &&
-	cp beginning file &&
-	git commit -m beginning file &&
-	test_write_lines 1 2 3 4 5 >>file &&
-	git commit -m more file &&
-	git rebase --whitespace=fix HEAD^^ &&
-	test_cmp expect-beginning file
+expecting success of 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
 
-[master 5eeec3e] beginning
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 13 deletions(-)
-[master b2ce110] more
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-First, rewinding head to replay your work on top of it...
-Applying: beginning
-Applying: more
-ok 4 - at beginning of file
+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
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3416-rebase-onto-threedots.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3416-rebase-onto-threedots/.git/
-expecting success of 3416.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	git branch side &&
-	test_commit C &&
-	git branch topic &&
-	git checkout side &&
-	test_commit H &&
-	git checkout main &&
-	test_tick &&
-	git merge H &&
-	git tag D &&
-	test_commit E &&
-	git checkout topic &&
-	test_commit F &&
-	test_commit G &&
-	git checkout side &&
-	test_tick &&
-	git merge C &&
-	git tag I &&
-	test_commit J &&
-	test_commit K
+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
 
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'side'
-[side e9f30f6] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- H.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-[main 0cd72fb] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'topic'
-[topic 0fb828b] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[topic a08c965] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[side 9eed7bf] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-[side 4d3c411] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 K.t
-ok 1 - setup
+expecting success of 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 3416.2 'rebase --onto main...topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
+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 set 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
 
-	git rebase --onto main...topic F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
+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 set 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
 
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 2 - rebase --onto main...topic
+expecting success of 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 set 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 3416.3 'rebase --onto main...': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
+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 set 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
 
-	git rebase --onto main... F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
+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 set 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
 
-HEAD is now at f576ef2 G
-Already on 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 3 - rebase --onto main...
+expecting success of 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
 
-expecting success of 3416.4 'rebase --onto main...side': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	err
+	expect
+	expected
 
-	test_must_fail git rebase --onto main...side J
+Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
+dirty
+ok 44 - rebase --interactive: non-conflicting rebase, conflicting stash
 
-HEAD is now at f576ef2 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main...side': need exactly one merge base
-ok 4 - rebase --onto main...side
+expecting success of 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 3416.5 'rebase -i --onto main...topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
+expecting success of 3420.46 'abort rebase -i with --autostash': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
 	(
-		set_fake_editor &&
-		EXPECT_COUNT=1 git rebase -i --onto main...topic F
+		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
 	) &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
 
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 5 - rebase -i --onto main...topic
+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 3416.6 'rebase -i --onto main...': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
+expecting success of 3420.47 'restore autostash on editor failure': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
 	(
-		set_fake_editor &&
-		EXPECT_COUNT=1 git rebase -i --onto main... F
+		test_set_editor "false" &&
+		test_must_fail git rebase -i --autostash HEAD^
 	) &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at f576ef2 G
-Already on 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 6 - rebase -i --onto main...
-
-expecting success of 3416.7 'rebase --onto main...side requires a single merge-base': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase -i --onto main...side J 2>err &&
-	grep "need exactly one merge base" err
-
-HEAD is now at f576ef2 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main...side': need exactly one merge base
-ok 7 - rebase --onto main...side requires a single merge-base
-
-expecting success of 3416.8 'rebase --keep-base --onto incompatible': 
-	test_must_fail git rebase --keep-base --onto main...
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
 
-fatal: options '--keep-base' and '--onto' cannot be used together
-ok 8 - rebase --keep-base --onto incompatible
+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 3416.9 'rebase --keep-base --root incompatible': 
-	test_must_fail git rebase --keep-base --root
+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
 
-fatal: options '--keep-base' and '--root' cannot be used together
-ok 9 - rebase --keep-base --root incompatible
+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
 
-expecting success of 3416.10 'rebase --keep-base main from topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	err
+	expect
+	expected
 
-	git rebase --keep-base main &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
+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 rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
+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
 
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Current branch topic is up to date.
-ok 10 - rebase --keep-base main from topic
+Switched to a new branch 'with-submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3416.11 'rebase --keep-base main topic from main': 
-	git checkout main &&
-	git branch -f topic G &&
+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)"
 
-	git rebase --keep-base main topic &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
+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 rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
+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'
-Current branch topic is up to date.
-ok 11 - rebase --keep-base main topic from main
+ok 51 - never change active branch
 
-expecting success of 3416.12 'rebase --keep-base main from side': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
+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
 
-	test_must_fail git rebase --keep-base main
+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
 
-HEAD is now at a08c965 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main': need exactly one merge base with branch
-ok 12 - rebase --keep-base main from side
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3429-rebase-edit-todo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 3416.13 'rebase -i --keep-base main from topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
+[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
 
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=2 git rebase -i --keep-base main
-	) &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
+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
 
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
+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
 
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Successfully rebased and updated refs/heads/topic.
-ok 13 - rebase -i --keep-base main from topic
+expecting success of 3429.3 'rebase exec with an empty list does not exec anything': 
+	git rebase HEAD -x "true" 2>output &&
+	! grep "Executing: true" output
 
-expecting success of 3416.14 'rebase -i --keep-base main topic from main': 
-	git checkout main &&
-	git branch -f topic G &&
+ok 3 - rebase exec with an empty list does not exec anything
 
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=2 git rebase -i --keep-base main topic
-	) &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
+expecting success of 3429.4 'loose object cache vs re-reading todo list': 
+	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
+	export GIT_REBASE_TODO &&
+	write_script append-todo.sh <<-\EOS &&
+	# For values 5 and 6, this yields SHA-1s with the same first two digits
+	echo "pick $(git rev-parse --short \
+		$(printf "%s\\n" \
+			"tree $EMPTY_TREE" \
+			"author A U Thor <author@example.org> $1 +0000" \
+			"committer A U Thor <author@example.org> $1 +0000" \
+			"" \
+			"$1" |
+		  git hash-object -t commit -w --stdin))" >>$GIT_REBASE_TODO
 
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
+	shift
+	test -z "$*" ||
+	echo "exec $0 $*" >>$GIT_REBASE_TODO
+	EOS
 
-Switched to branch 'main'
-Successfully rebased and updated refs/heads/topic.
-ok 14 - rebase -i --keep-base main topic from main
+	git rebase HEAD -x "./append-todo.sh 5 6"
 
-expecting success of 3416.15 'rebase --keep-base requires a single merge base': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
+Successfully rebased and updated refs/heads/master.
+ok 4 - loose object cache vs re-reading todo list
 
-	test_must_fail git rebase -i --keep-base main 2>err &&
-	grep "need exactly one merge base with branch" err
+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
 
-HEAD is now at a08c965 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main': need exactly one merge base with branch
-ok 15 - rebase --keep-base requires a single merge base
+	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
 
-expecting success of 3416.16 'rebase --keep-base keeps cherry picks': 
-	git checkout -f -B main E &&
-	git cherry-pick F &&
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=2 git rebase -i --keep-base HEAD G
-	) &&
-	test_cmp_rev HEAD G
+rebase -i script before editing:
+pick 07e65e0 first
+pick fa10d42 second
+pick ba0a06e third
 
-Switched to and reset branch 'main'
-[main 3dacdd2] F
+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:19:13 2005 -0700
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-Successfully rebased and updated detached HEAD.
-ok 16 - rebase --keep-base keeps cherry picks
-
-expecting success of 3416.17 'rebase --keep-base --no-reapply-cherry-picks': 
-	git checkout -f -B main E &&
-	git cherry-pick F &&
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=1 git rebase -i --keep-base \
-					--no-reapply-cherry-picks HEAD G
-	) &&
-	test_cmp_rev HEAD^ C
-
-Previous HEAD position was a08c965 G
-Switched to and reset branch 'main'
-[main 3dacdd2] F
+ 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:19:13 2005 -0700
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-warning: skipped previously applied commit 0fb828b
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 17 - rebase --keep-base --no-reapply-cherry-picks
+ 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 3416.18 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+expecting success of 3429.6 're-reading todo doesnt interfere with revert --edit': 
+	git reset --hard third &&
 
-ok 18 - $EDITOR and friends are unchanged
+	git revert --edit third second &&
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3419-rebase-patch-id.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3419-rebase-patch-id/.git/
-expecting success of 3419.1 'setup': 
-	git commit --allow-empty -m initial &&
-	git tag root
+	cat >expect <<-\EOF &&
+	Revert "second"
+	Revert "third"
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
 
-[main (root-commit) 8b2b4f6] initial
+HEAD is now at ba0a06e third
+[detached HEAD 2d8e437] Revert "third"
  Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 3419.2 'setup: 500 lines': 
-	rm -f .gitattributes &&
-	git checkout -q -f main &&
-	git reset --hard root &&
-	test_seq 500 >file &&
-	git add file &&
-	git commit -q -m initial &&
-	git branch -f other &&
-
-	scramble file &&
-	git add file &&
-	git commit -q -m "change big file" &&
+ 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
 
-	git checkout -q other &&
-	: >newfile &&
-	git add newfile &&
-	git commit -q -m "add small file" &&
+expecting success of 3429.7 're-reading todo doesnt interfere with cherry-pick --edit': 
+	git reset --hard first &&
 
-	git cherry-pick main >/dev/null 2>&1 &&
+	git cherry-pick --edit second third &&
 
-	git branch -f squashed main &&
-	git checkout -q -f squashed &&
-	git reset -q --soft HEAD~2 &&
-	git commit -q -m squashed &&
+	cat >expect <<-\EOF &&
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
 
-	git branch -f mode main &&
-	git checkout -q -f mode &&
-	test_chmod +x file &&
-	git commit -q -a --amend &&
+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
 
-	git branch -f modeother other &&
-	git checkout -q -f modeother &&
-	test_chmod +x file &&
-	git commit -q -a --amend
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3433-rebase-across-mode-change.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-HEAD is now at 8b2b4f6 initial
-ok 2 - setup: 500 lines
+	git branch side1 &&
+	git branch side2 &&
 
-expecting success of 3419.3 'detect upstream patch': 
-	git checkout -q main^{} &&
-	scramble file &&
-	git add file &&
-	git commit -q -m "change big file again" &&
-	git checkout -q other^{} &&
-	git rebase main &&
-	git rev-list main...HEAD~ >revs &&
-	test_must_be_empty revs
+	git checkout side1 &&
+	git rm -rf DS &&
+	test_ln_s_add unrelated DS &&
+	git commit -m side1 &&
 
-warning: skipped previously applied commit 463cec6
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 3 - detect upstream patch
+	git checkout side2 &&
+	>unrelated &&
+	git add unrelated &&
+	git commit -m commit1 &&
 
-expecting success of 3419.4 'detect upstream patch binary': 
-	echo "file binary" >.gitattributes &&
-	git checkout -q other^{} &&
-	git rebase main &&
-	git rev-list main...HEAD~ >revs &&
-	test_must_be_empty revs &&
-	test_when_finished "rm .gitattributes"
+	echo >>unrelated &&
+	git commit -am commit2
 
-warning: skipped previously applied commit 463cec6
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 4 - detect upstream patch binary
+[master (root-commit) ba9279b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 DS/whatever
+Switched to branch 'side1'
+rm 'DS/whatever'
+checking prerequisite: SYMLINKS
 
-expecting success of 3419.5 'detect upstream patch modechange': 
-	git checkout -q modeother^{} &&
-	git rebase mode &&
-	git rev-list mode...HEAD~ >revs &&
-	test_must_be_empty revs
+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
 
-warning: skipped previously applied commit 471e427
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 5 - detect upstream patch modechange
+)
+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 3419.6 'do not drop patch': 
-	git checkout -q other^{} &&
-	test_must_fail git rebase squashed &&
-	test_when_finished "git rebase --abort"
+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
 
-Rebasing (1/3)
Auto-merging file
-CONFLICT (add/add): Merge conflict in file
-error: could not apply bb8cb29... initial
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bb8cb29... initial
-ok 6 - do not drop patch
+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 3419.7 'do not drop patch binary': 
-	echo "file binary" >.gitattributes &&
-	git checkout -q other^{} &&
-	test_must_fail git rebase squashed &&
-	test_when_finished "git rebase --abort" &&
-	test_when_finished "rm .gitattributes"
+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
 
-Rebasing (1/3)
warning: Cannot merge binary files: file (HEAD vs. bb8cb29 (initial))
-Auto-merging file
-CONFLICT (add/add): Merge conflict in file
-error: could not apply bb8cb29... initial
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bb8cb29... initial
-ok 7 - do not drop patch binary
+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 3419.8 'do not drop patch modechange': 
-	git checkout -q modeother^{} &&
-	git rebase other &&
-	cat >expected <<-\EOF &&
-	diff --git a/file b/file
-	old mode 100644
-	new mode 100755
-	EOF
-	git diff HEAD~ >modediff &&
-	test_cmp expected modediff
+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
 
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 8 - do not drop patch modechange
+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 8 test(s)
-1..8
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3422-rebase-incompatible-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3422-rebase-incompatible-options/.git/
-expecting success of 3422.1 'setup': 
-	test_seq 2 9 >foo &&
-	git add foo &&
-	git commit -m orig &&
-
-	git branch A &&
-	git branch B &&
-
-	git checkout A &&
-	test_seq 1 9 >foo &&
-	git add foo &&
-	git commit -m A &&
-
-	git checkout B &&
-	echo "q qfoo();" | q_to_tab >>foo &&
-	git add foo &&
-	git commit -m B
+*** t3431-rebase-fork-point.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-[master (root-commit) 3639f03] orig
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 foo
-Switched to branch 'A'
-[A ef5b704] A
+ 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(+)
-Switched to branch 'B'
-[B 079b709] B
+ 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 3422.2 '--whitespace=fix incompatible with --merge': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --merge A
-	
-Note: switching to 'B^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 2 - --whitespace=fix incompatible with --merge
-
-expecting success of 3422.3 '--whitespace=fix incompatible with --strategy=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --strategy=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 3 - --whitespace=fix incompatible with --strategy=ours
-
-expecting success of 3422.4 '--whitespace=fix incompatible with --strategy-option=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --strategy-option=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 4 - --whitespace=fix incompatible with --strategy-option=ours
-
-expecting success of 3422.5 '--whitespace=fix incompatible with --autosquash': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --autosquash A
-	
-HEAD is now at 079b709 B
-fatal: --autosquash requires the merge backend
-ok 5 - --whitespace=fix incompatible with --autosquash
-
-expecting success of 3422.6 '--whitespace=fix incompatible with --interactive': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --interactive A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 6 - --whitespace=fix incompatible with --interactive
-
-expecting success of 3422.7 '--whitespace=fix incompatible with --exec': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --exec 'true' A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 7 - --whitespace=fix incompatible with --exec
-
-expecting success of 3422.8 '--whitespace=fix incompatible with --keep-empty': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --keep-empty A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 8 - --whitespace=fix incompatible with --keep-empty
-
-expecting success of 3422.9 '--whitespace=fix incompatible with --empty=...': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --empty=ask A
-	
-HEAD is now at 079b709 B
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-fatal: apply options and merge options cannot be used together
-ok 9 - --whitespace=fix incompatible with --empty=...
-
-expecting success of 3422.10 '--whitespace=fix incompatible with --no-reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --no-reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 10 - --whitespace=fix incompatible with --no-reapply-cherry-picks
-
-expecting success of 3422.11 '--whitespace=fix incompatible with --reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 11 - --whitespace=fix incompatible with --reapply-cherry-picks
-
-expecting success of 3422.12 '--whitespace=fix incompatible with --rebase-merges': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --rebase-merges A
-	
-HEAD is now at 079b709 B
-fatal: --rebase-merges requires the merge backend
-ok 12 - --whitespace=fix incompatible with --rebase-merges
-
-expecting success of 3422.13 '--whitespace=fix incompatible with --update-refs': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --update-refs A
-	
-HEAD is now at 079b709 B
-fatal: --update-refs requires the merge backend
-ok 13 - --whitespace=fix incompatible with --update-refs
-
-expecting success of 3422.14 '--whitespace=fix incompatible with --root without --onto': 
-		git checkout B^0 &&
-		test_must_fail git rebase --whitespace=fix --root A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 14 - --whitespace=fix incompatible with --root without --onto
-
-expecting success of 3422.15 '--whitespace=fix incompatible with rebase.rebaseMerges': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.rebaseMerges=true rebase --whitespace=fix A 2>err &&
-		grep -e --no-rebase-merges err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
-ok 15 - --whitespace=fix incompatible with rebase.rebaseMerges
-
-expecting success of 3422.16 '--whitespace=fix incompatible with rebase.updateRefs': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.updateRefs=true rebase --whitespace=fix A 2>err &&
-		grep -e --no-update-refs err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
-ok 16 - --whitespace=fix incompatible with rebase.updateRefs
-
-expecting success of 3422.17 '--whitespace=fix okay with overridden rebase.rebaseMerges': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --whitespace=fix A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 17 - --whitespace=fix okay with overridden rebase.rebaseMerges
-
-expecting success of 3422.18 '--whitespace=fix okay with overridden rebase.updateRefs': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.updateRefs=true rebase --no-update-refs --whitespace=fix A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 18 - --whitespace=fix okay with overridden rebase.updateRefs
-
-expecting success of 3422.19 '-C4 incompatible with --merge': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --merge A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 19 - -C4 incompatible with --merge
-
-expecting success of 3422.20 '-C4 incompatible with --strategy=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --strategy=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 20 - -C4 incompatible with --strategy=ours
-
-expecting success of 3422.21 '-C4 incompatible with --strategy-option=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --strategy-option=ours A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 21 - -C4 incompatible with --strategy-option=ours
-
-expecting success of 3422.22 '-C4 incompatible with --autosquash': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --autosquash A
-	
-HEAD is now at 079b709 B
-fatal: --autosquash requires the merge backend
-ok 22 - -C4 incompatible with --autosquash
-
-expecting success of 3422.23 '-C4 incompatible with --interactive': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --interactive A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 23 - -C4 incompatible with --interactive
-
-expecting success of 3422.24 '-C4 incompatible with --exec': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --exec 'true' A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 24 - -C4 incompatible with --exec
-
-expecting success of 3422.25 '-C4 incompatible with --keep-empty': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --keep-empty A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 25 - -C4 incompatible with --keep-empty
-
-expecting success of 3422.26 '-C4 incompatible with --empty=...': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --empty=ask A
-	
-HEAD is now at 079b709 B
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-fatal: apply options and merge options cannot be used together
-ok 26 - -C4 incompatible with --empty=...
-
-expecting success of 3422.27 '-C4 incompatible with --no-reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --no-reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 27 - -C4 incompatible with --no-reapply-cherry-picks
-
-expecting success of 3422.28 '-C4 incompatible with --reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 28 - -C4 incompatible with --reapply-cherry-picks
-
-expecting success of 3422.29 '-C4 incompatible with --rebase-merges': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --rebase-merges A
-	
-HEAD is now at 079b709 B
-fatal: --rebase-merges requires the merge backend
-ok 29 - -C4 incompatible with --rebase-merges
-
-expecting success of 3422.30 '-C4 incompatible with --update-refs': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --update-refs A
-	
-HEAD is now at 079b709 B
-fatal: --update-refs requires the merge backend
-ok 30 - -C4 incompatible with --update-refs
-
-expecting success of 3422.31 '-C4 incompatible with --root without --onto': 
-		git checkout B^0 &&
-		test_must_fail git rebase -C4 --root A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 31 - -C4 incompatible with --root without --onto
-
-expecting success of 3422.32 '-C4 incompatible with rebase.rebaseMerges': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.rebaseMerges=true rebase -C4 A 2>err &&
-		grep -e --no-rebase-merges err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
-ok 32 - -C4 incompatible with rebase.rebaseMerges
-
-expecting success of 3422.33 '-C4 incompatible with rebase.updateRefs': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.updateRefs=true rebase -C4 A 2>err &&
-		grep -e --no-update-refs err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
-ok 33 - -C4 incompatible with rebase.updateRefs
-
-expecting success of 3422.34 '-C4 okay with overridden rebase.rebaseMerges': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.rebaseMerges=true rebase --no-rebase-merges -C4 A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 34 - -C4 okay with overridden rebase.rebaseMerges
-
-expecting success of 3422.35 '-C4 okay with overridden rebase.updateRefs': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.updateRefs=true rebase --no-update-refs -C4 A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 35 - -C4 okay with overridden rebase.updateRefs
-
-expecting success of 3422.36 '--apply incompatible with --merge': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --merge A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 36 - --apply incompatible with --merge
-
-expecting success of 3422.37 '--apply incompatible with --strategy=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --strategy=ours A
-	
-HEAD is now at 079b709 B
-fatal: --strategy requires the merge backend
-ok 37 - --apply incompatible with --strategy=ours
-
-expecting success of 3422.38 '--apply incompatible with --strategy-option=ours': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --strategy-option=ours A
-	
-HEAD is now at 079b709 B
-fatal: --strategy requires the merge backend
-ok 38 - --apply incompatible with --strategy-option=ours
-
-expecting success of 3422.39 '--apply incompatible with --autosquash': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --autosquash A
-	
-HEAD is now at 079b709 B
-fatal: --autosquash requires the merge backend
-ok 39 - --apply incompatible with --autosquash
-
-expecting success of 3422.40 '--apply incompatible with --interactive': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --interactive A
-	
-HEAD is now at 079b709 B
-fatal: apply options and merge options cannot be used together
-ok 40 - --apply incompatible with --interactive
-
-expecting success of 3422.41 '--apply incompatible with --exec': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --exec 'true' A
-	
-HEAD is now at 079b709 B
-fatal: --exec requires the merge backend
-ok 41 - --apply incompatible with --exec
-
-expecting success of 3422.42 '--apply incompatible with --keep-empty': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --keep-empty A
-	
-HEAD is now at 079b709 B
-fatal: --keep-empty requires the merge backend
-ok 42 - --apply incompatible with --keep-empty
-
-expecting success of 3422.43 '--apply incompatible with --empty=...': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --empty=ask A
-	
-HEAD is now at 079b709 B
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-fatal: --empty requires the merge backend
-ok 43 - --apply incompatible with --empty=...
-
-expecting success of 3422.44 '--apply incompatible with --no-reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --no-reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: --no-reapply-cherry-picks requires the merge backend
-ok 44 - --apply incompatible with --no-reapply-cherry-picks
-
-expecting success of 3422.45 '--apply incompatible with --reapply-cherry-picks': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --reapply-cherry-picks A
-	
-HEAD is now at 079b709 B
-fatal: --reapply-cherry-picks requires the merge backend
-ok 45 - --apply incompatible with --reapply-cherry-picks
-
-expecting success of 3422.46 '--apply incompatible with --rebase-merges': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --rebase-merges A
-	
-HEAD is now at 079b709 B
-fatal: --rebase-merges requires the merge backend
-ok 46 - --apply incompatible with --rebase-merges
-
-expecting success of 3422.47 '--apply incompatible with --update-refs': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --update-refs A
-	
-HEAD is now at 079b709 B
-fatal: --update-refs requires the merge backend
-ok 47 - --apply incompatible with --update-refs
-
-expecting success of 3422.48 '--apply incompatible with --root without --onto': 
-		git checkout B^0 &&
-		test_must_fail git rebase --apply --root A
-	
-HEAD is now at 079b709 B
-fatal: --root without --onto requires the merge backend
-ok 48 - --apply incompatible with --root without --onto
-
-expecting success of 3422.49 '--apply incompatible with rebase.rebaseMerges': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.rebaseMerges=true rebase --apply A 2>err &&
-		grep -e --no-rebase-merges err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.rebaseMerges.  Consider adding --no-rebase-merges
-ok 49 - --apply incompatible with rebase.rebaseMerges
+expecting success of 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 3422.50 '--apply incompatible with rebase.updateRefs': 
-		git checkout B^0 &&
-		test_must_fail git -c rebase.updateRefs=true rebase --apply A 2>err &&
-		grep -e --no-update-refs err
-	
-HEAD is now at 079b709 B
-fatal: apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs
-ok 50 - --apply incompatible with rebase.updateRefs
+expecting success of 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 3422.51 '--apply okay with overridden rebase.rebaseMerges': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.rebaseMerges=true rebase --no-rebase-merges --apply A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 51 - --apply okay with overridden rebase.rebaseMerges
+expecting success of 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 3422.52 '--apply okay with overridden rebase.updateRefs': 
-		test_when_finished "git reset --hard B^0" &&
-		git checkout B^0 &&
-		git -c rebase.updateRefs=true rebase --no-update-refs --apply A
-	
-HEAD is now at 079b709 B
-First, rewinding head to replay your work on top of it...
-Applying: B
-HEAD is now at 079b709 B
-ok 52 - --apply okay with overridden rebase.updateRefs
+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
 
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3423-rebase-reword.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3423-rebase-reword/.git/
-expecting success of 3423.1 'setup': 
-	test_commit main file-1 test &&
+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
 
-	git checkout -b stuff &&
+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
 
-	test_commit feature_a file-2 aaa &&
-	test_commit feature_b file-2 ddd
+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
 
-[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 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 3423.2 'reword without issues functions as intended': 
-	test_when_finished "reset_rebase" &&
+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
 
-	git checkout stuff^0 &&
+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
 
-	set_fake_editor &&
-	FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
-		git rebase -i -v 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
 
-	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
-	test $(git rev-list --count HEAD) = 3
+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
 
-Note: switching to 'stuff^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3431.20 'git rebase --fork-point with ambiguous refname': 
+	git checkout main &&
+	git checkout -b one &&
+	git checkout side &&
+	git tag one &&
+	test_must_fail git rebase --fork-point --onto D one
 
-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
+Switched to branch 'main'
+Switched to a new branch 'one'
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+warning: refname 'one' is ambiguous.
+fatal: Ambiguous refname: 'one'
+ok 20 - git rebase --fork-point with ambiguous refname
 
-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 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
 
-expecting success of 3423.3 'reword after a conflict preserves commit': 
-	test_when_finished "reset_rebase" &&
+fatal: options '--root' and '--fork-point' cannot be used together
+ok 21 - --fork-point and --root both given
 
-	git checkout stuff^0 &&
+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"
 
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="reword 2" \
-		git rebase -i -v 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/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 22 - rebase.forkPoint set to false
 
-	git checkout --theirs file-2 &&
-	git add file-2 &&
-	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
+expecting success of 3431.23 'rebase.forkPoint set to false and then to true': 
+	test_config_global rebase.forkPoint false &&
+	test_config rebase.forkPoint true &&
+	do_test_rebase "G F E D B A"
 
-	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
-	test $(git rev-list --count HEAD) = 2
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  7179cda feature_b_reworded
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 7179cda
+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
 
-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
+expecting success of 3431.26 'rebase.forkPoint set to true and --root given': 
+	test_config rebase.forkPoint true &&
+	git rebase --root
 
-rebase -i script after editing:
-reword 6975fa1 feature_b
-Rebasing (1/1)
-CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 6975fa1 (feature_b).  Version 6975fa1 (feature_b) of file-2 left in tree.
-error: could not apply 6975fa1... feature_b
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 6975fa1... feature_b
-Updated 1 path from the index
-[detached HEAD 2e9e381] feature_b_reworded
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-2
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-HEAD is now at 2e9e381 feature_b_reworded
-Removing fake-editor.sh
-ok 3 - reword after a conflict preserves commit
+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 3 test(s)
-1..3
+# passed all 26 test(s)
+1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3418-rebase-continue.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3418-rebase-continue/.git/
-expecting success of 3418.1 'setup': 
-	test_commit "commit-new-file-F1" F1 1 &&
-	test_commit "commit-new-file-F2" F2 2 &&
-
-	git checkout -b topic HEAD^ &&
-	test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
-
-	git checkout main
+*** t3434-rebase-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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) dac1376] commit-new-file-F1
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 F1
-[main 953b3db] commit-new-file-F2
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 F2
-Switched to a new branch 'topic'
-[topic 24c5d85] commit-new-file-F2-on-topic-branch
+ 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 F2
-Switched to branch 'main'
+ 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 3418.2 'merge based rebase --continue with works with touched file': 
-	rm -fr .git/rebase-* &&
-	git reset --hard &&
-	git checkout main &&
-
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	test-tool chmtime =-60 F1 &&
-	git rebase --continue
-
-HEAD is now at 953b3db commit-new-file-F2
-Already on 'main'
-rebase -i script before editing:
-pick 953b3db commit-new-file-F2
-
-rebase -i script after editing:
-edit 953b3db commit-new-file-F2
-Rebasing (1/1)
Stopped at 953b3db...  commit-new-file-F2
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-Successfully rebased and updated refs/heads/main.
-ok 2 - merge based rebase --continue with works with touched file
+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 3418.3 'merge based rebase --continue removes .git/MERGE_MSG': 
-	git checkout -f --detach topic &&
+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
 
-	test_must_fail git rebase --onto main HEAD^ &&
-	git read-tree --reset -u HEAD &&
-	test_path_is_file .git/MERGE_MSG &&
-	git rebase --continue &&
-	test_path_is_missing .git/MERGE_MSG
+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
 
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-Rebasing (1/1)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+expecting success of 3434.4 'rebase --continue update from ISO-8859-1 to UTF-8': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace -s <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-ISO-8859-1-UTF-8'
+[conflict-ISO-8859-1-UTF-8 7f6df7e] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 7f6df7e... ÄËÑ�Ö
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-Successfully rebased and updated detached HEAD.
-ok 3 - merge based rebase --continue removes .git/MERGE_MSG
-
-expecting success of 3418.4 'apply based rebase --continue works with touched file': 
-	rm -fr .git/rebase-* &&
-	git reset --hard &&
-	git checkout main &&
-
-	test_must_fail git rebase --apply --onto main main topic &&
-	echo "Resolved" >F2 &&
-	git add F2 &&
-	test-tool chmtime =-60 F1 &&
-	git rebase --continue
+Could not apply 7f6df7e... ÄËÑ�Ö
+[detached HEAD 2d1ef83] ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/conflict-ISO-8859-1-UTF-8.
+ok 4 - rebase --continue update from ISO-8859-1 to UTF-8
 
-HEAD is now at 953b3db commit-new-file-F2
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-953b3db commit-new-file-F2
-virtual commit-new-file-F2-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F2
-Auto-merging F2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+expecting success of 3434.5 'rebase --continue update from eucJP to UTF-8': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace -s <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-eucJP-UTF-8'
+[conflict-eucJP-UTF-8 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 4850d3a... �れ���
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-ok 4 - apply based rebase --continue works with touched file
-
-expecting success of 3418.5 'rebase --continue can not be used with other options': 
-	test_must_fail git rebase -v --continue &&
-	test_must_fail git rebase --continue -v
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
-
-ok 5 - rebase --continue can not be used with other options
-
-expecting success of 3418.6 'rebase --continue remembers merge strategy and options': 
-	rm -fr .git/rebase-* &&
-	git reset --hard commit-new-file-F2-on-topic-branch &&
-	test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
-	test_when_finished "rm -fr test-bin" &&
-	mkdir test-bin &&
-
-	write_script test-bin/git-merge-funny <<-\EOF &&
-	printf "[%s]\n" $# "$1" "$2" "$3" "$5" >actual
-	shift 3 &&
-	exec git merge-recursive "$@"
-	EOF
-
-	cat >expect <<-\EOF &&
-	[7]
-	[--option=arg with space]
-	[--op"tion\]
-	[--new
-	line ]
-	[--]
-	EOF
-
-	rm -f actual &&
-	(
-		PATH=./test-bin:$PATH &&
-		test_must_fail git rebase -s funny -X"option=arg with space" \
-				-Xop\"tion\\ -X"new${LF}line " main topic
-	) &&
-	test_cmp expect actual &&
-	rm actual &&
-	echo "Resolved" >F2 &&
-	git add F2 &&
-	(
-		PATH=./test-bin:$PATH &&
-		git rebase --continue
-	) &&
-	test_cmp expect actual
+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
 
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-[topic 39de9a1] commit-new-file-F3-on-topic-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
+	
+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 F3
-Rebasing (1/2)
Merging 953b3db31f61f8fc41bbcb85a1c76eadc748cf75 with 24c5d85f362d6c25d316c040586afc3e0548165a
-Merging:
-953b3db commit-new-file-F2
-24c5d85 commit-new-file-F2-on-topic-branch
-found 1 common ancestor:
-dac1376 commit-new-file-F1
-CONFLICT (add/add): Merge conflict in F2
-Auto-merging F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 4850d3a... ?$B$O$l$R$[$U?(B
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-[detached HEAD 6396a51] commit-new-file-F2-on-topic-branch
+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, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Merging 6396a513d945e21e13de4128c5f8af13443529d5 with 39de9a17650c52c96f2d6848fba0d846df88a78f
-Merging:
-6396a51 commit-new-file-F2-on-topic-branch
-39de9a1 commit-new-file-F3-on-topic-branch
-found 1 common ancestor:
-24c5d85 commit-new-file-F2-on-topic-branch
-Successfully rebased and updated refs/heads/topic.
-ok 6 - rebase --continue remembers merge strategy and options
+ 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
 
-expecting success of 3418.7 'rebase -r passes merge strategy options correctly': 
-	rm -fr .git/rebase-* &&
-	git reset --hard commit-new-file-F3-on-topic-branch &&
-	test_commit merge-theirs &&
-	git reset --hard HEAD^ &&
-	test_commit some-other-commit &&
-	test_tick &&
-	git merge --no-ff merge-theirs &&
-	FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
-		-s recursive --strategy-option=theirs HEAD~2 &&
-	test_commit force-change-ours &&
-	git rebase --continue
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3435-rebase-gpg-sign.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3435-rebase-gpg-sign/.git/
+checking prerequisite: GPG
 
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-[topic b1d70bd] merge-theirs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge-theirs.t
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-[topic ffb1279] some-other-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 some-other-commit.t
-Merge made by the 'ort' strategy.
- merge-theirs.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 merge-theirs.t
-rebase -i script before editing:
-label onto
+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
 
-reset onto
-pick b1d70bd merge-theirs
-label merge-theirs
+	# 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
 
-reset onto
-pick ffb1279 some-other-commit
-merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
+)
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3311-notes-merge-fanout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3311-notes-merge-fanout/.git/
+expecting success of 3311.1 'setup a few initial commits with notes (notes ref: x)': 
+	git config core.notesRef refs/notes/x &&
+	for i in 1 2 3 4 5
+	do
+		test_commit "commit$i" >/dev/null &&
+		git notes add -m "notes for commit$i" || return 1
+	done &&
 
-rebase -i script after editing:
-label onto
-reset onto
-edit b1d70bd merge-theirs
-label merge-theirs
-reset onto
-pick ffb1279 some-other-commit
-merge -C bb27065 merge-theirs # Merge tag 'merge-theirs' into topic
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Stopped at b1d70bd...  merge-theirs
-You can amend the commit now, with
+	git log --format=oneline &&
 
-  git commit --amend 
+	test_oid_cache <<-EOF
+	hash05a sha1:aed91155c7a72c2188e781fdf40e0f3761b299db
+	hash04a sha1:99fab268f9d7ee7b011e091a436c78def8eeee69
+	hash03a sha1:953c20ae26c7aa0b428c20693fe38bc687f9d1a9
+	hash02a sha1:6358796131b8916eaa2dde6902642942a1cb37e1
+	hash01a sha1:b02d459c32f0e68f2fe0981033bb34f38776ba47
+	hash03b sha1:9f506ee70e20379d7f78204c77b334f43d77410d
+	hash02b sha1:23a47d6ea7d589895faf800752054818e1e7627b
 
-Once you are satisfied with your changes, run
+	hash05a sha256:3aae5d26619d96dba93795f66325716e4cbc486884f95a6adee8fb0615a76d12
+	hash04a sha256:07e43dd3d89fe634d3252e253b426aacc7285a995dcdbcf94ac284060a1122cf
+	hash03a sha256:26fb52eaa7f4866bf735254587be7b31209ec10e525912ffd8e8ba549ba892ff
+	hash02a sha256:b57ebdf23634e750dcbc4b9a37991d70f90830d568a0e4529ce9de0a3f8d605c
+	hash01a sha256:377903b1572bd5117087a5518fcb1011b5053cccbc59e3c7c823a8615204173b
+	hash03b sha256:04e7b392fda7c185bfa17c9179b56db732edc2dc2b3bf887308dcaabb717270d
+	hash02b sha256:66099aaaec49a485ed990acadd9a9b81232ea592079964113d8f581ff69ef50b
+	EOF
 
-  git rebase --continue
-[detached HEAD 6393337] force-change-ours
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 force-change-ours.t
-Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Merge made by the 'ort' strategy.
-Successfully rebased and updated refs/heads/topic.
-ok 7 - rebase -r passes merge strategy options correctly
+f6db73397fcc379ea00d1fc17a35abb42027a69a commit5
+157e8cc0aeac5befb302d276f2e706112bf6e413 commit4
+e0851358fb6b4703f23d74ef964bc4491bec7ab9 commit3
+94955c5cd7e5662c6ab40c323ecdfac458c47435 commit2
+ef004cfa88883bb87e030b6196934dd90e3548d2 commit1
+ok 1 - setup a few initial commits with notes (notes ref: x)
 
-expecting success of 3418.8 '--skip after failed fixup cleans commit message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b with-conflicting-fixup &&
-	test_commit wants-fixup &&
-	test_commit "fixup 1" wants-fixup.t 1 wants-fixup-1 &&
-	test_commit "fixup 2" wants-fixup.t 2 wants-fixup-2 &&
-	test_commit "fixup 3" wants-fixup.t 3 wants-fixup-3 &&
-	test_must_fail env FAKE_LINES="1 fixup 2 squash 4" \
-		git rebase -i HEAD~4 &&
+expecting success of 3311.2 'sanity check (x)': 
+	verify_notes x commit5 &&
+	verify_no_fanout x
 
-	: now there is a conflict, and comments in the commit message &&
-	test_commit_message HEAD <<-\EOF &&
-	# This is a combination of 2 commits.
-	# This is the 1st commit message:
+157e8cc0aeac5befb302d276f2e706112bf6e413
+94955c5cd7e5662c6ab40c323ecdfac458c47435
+e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ef004cfa88883bb87e030b6196934dd90e3548d2
+f6db73397fcc379ea00d1fc17a35abb42027a69a
+ok 2 - sanity check (x)
 
-	wants-fixup
+expecting success of 3311.3 'Add a few hundred commits w/notes to trigger fanout (x -> y)': 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	test_commit_bulk --start=6 --id=commit $((num - 5)) &&
+	i=0 &&
+	while test $i -lt $((num - 5))
+	do
+		git notes add -m "notes for commit$i" HEAD~$i || return 1
+		i=$((i + 1))
+	done &&
+	test "$(git rev-parse refs/notes/y)" != "$(git rev-parse refs/notes/x)" &&
+	# Expected number of commits and notes
+	test $(git rev-list HEAD | wc -l) = $num &&
+	test $(git notes list | wc -l) = $num &&
+	# 5 first notes unchanged
+	verify_notes y commit5
 
-	# The commit message #2 will be skipped:
+f6db73397fcc379ea00d1fc17a35abb42027a69a
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          885 (         0 duplicates                  )
+      blobs  :          295 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          295 (         0 duplicates        289 deltas of        289 attempts)
+      commits:          295 (         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:            300
+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            =        296
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      86456 /      86456
+---------------------------------------------------------------------
 
-	# fixup 1
-	EOF
+ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y)
 
-	: skip and continue &&
-	echo "cp \"\$1\" .git/copy.txt" | write_script copy-editor.sh &&
-	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
+expecting success of 3311.4 'notes tree has fanout (y)': verify_fanout y
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/7e8cc0aeac5befb302d276f2e706112bf6e413
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f6/db73397fcc379ea00d1fc17a35abb42027a69a
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 4 - notes tree has fanout (y)
 
-	: the user should not have had to edit the commit message &&
-	test_path_is_missing .git/copy.txt &&
+expecting success of 3311.5 'No-op merge (already included) (x => y)': 
+	git update-ref refs/notes/m refs/notes/y &&
+	git config core.notesRef refs/notes/m &&
+	git notes merge x &&
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/y)"
 
-	: now the comments in the commit message should have been cleaned up &&
-	test_commit_message HEAD -m wants-fixup &&
+Already up to date.
+ok 5 - No-op merge (already included) (x => y)
 
-	: now, let us ensure that "squash" is handled correctly &&
-	git reset --hard wants-fixup-3 &&
-	test_must_fail env FAKE_LINES="1 squash 2 squash 1 squash 3 squash 1" \
-		git rebase -i HEAD~4 &&
+expecting success of 3311.6 'Fast-forward merge (y => x)': 
+	git update-ref refs/notes/m refs/notes/x &&
+	git notes merge y &&
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/y)"
 
-	: the second squash failed, but there are two more in the chain &&
-	(test_set_editor "$PWD/copy-editor.sh" &&
-	 test_must_fail git rebase --skip) &&
+Fast-forward
+ok 6 - Fast-forward merge (y => x)
 
-	: not the final squash, no need to edit the commit message &&
-	test_path_is_missing .git/copy.txt &&
+expecting success of 3311.7 'change some of the initial 5 notes (x -> z)': 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "new notes for commit2" commit2 &&
+	git notes append -m "appended notes for commit3" commit3 &&
+	git notes remove commit4 &&
+	git notes remove commit5 &&
+	verify_notes z commit5
 
-	: The first and third squashes succeeded, therefore: &&
-	test_commit_message HEAD <<-\EOF &&
-	# This is a combination of 3 commits.
-	# This is the 1st commit message:
+Overwriting existing notes for object 94955c5cd7e5662c6ab40c323ecdfac458c47435
+Removing note for object commit4
+Removing note for object commit5
+ok 7 - change some of the initial 5 notes (x -> z)
 
-	wants-fixup
+expecting success of 3311.8 'notes tree has no fanout (z)': verify_no_fanout z
+94955c5cd7e5662c6ab40c323ecdfac458c47435
+e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ef004cfa88883bb87e030b6196934dd90e3548d2
+ok 8 - notes tree has no fanout (z)
 
-	# This is the commit message #2:
+expecting success of 3311.9 'successful merge without conflicts (y => z)': 
+	git update-ref refs/notes/m refs/notes/z &&
+	git config core.notesRef refs/notes/m &&
+	git notes merge y &&
+	verify_notes m commit5 &&
+	# x/y/z unchanged
+	verify_notes x commit5 &&
+	verify_notes y commit5 &&
+	verify_notes z commit5
 
-	fixup 1
+ok 9 - successful merge without conflicts (y => z)
 
-	# This is the commit message #3:
+expecting success of 3311.10 'notes tree still has fanout after merge (m)': verify_fanout m
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 10 - notes tree still has fanout after merge (m)
 
-	fixup 2
-	EOF
+expecting success of 3311.11 'introduce conflicting changes (y -> w)': 
+	git update-ref refs/notes/w refs/notes/y &&
+	git config core.notesRef refs/notes/w &&
+	git notes add -f -m "other notes for commit1" commit1 &&
+	git notes add -f -m "other notes for commit3" commit3 &&
+	git notes add -f -m "other notes for commit4" commit4 &&
+	git notes remove commit5 &&
+	verify_notes w commit5
 
-	(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
-	test_commit_message HEAD <<-\EOF &&
-	wants-fixup
+Overwriting existing notes for object ef004cfa88883bb87e030b6196934dd90e3548d2
+Overwriting existing notes for object e0851358fb6b4703f23d74ef964bc4491bec7ab9
+Overwriting existing notes for object 157e8cc0aeac5befb302d276f2e706112bf6e413
+Removing note for object commit5
+ok 11 - introduce conflicting changes (y -> w)
 
-	fixup 1
+expecting success of 3311.12 'successful merge using "ours" strategy (z => w)': 
+	git update-ref refs/notes/m refs/notes/w &&
+	git config core.notesRef refs/notes/m &&
+	git notes merge -s ours z &&
+	verify_notes m commit5 &&
+	# w/x/y/z unchanged
+	verify_notes w commit5 &&
+	verify_notes x commit5 &&
+	verify_notes y commit5 &&
+	verify_notes z commit5
 
-	fixup 2
-	EOF
+Using local notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Using local notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 12 - successful merge using "ours" strategy (z => w)
 
-	: Final squash failed, but there was still a squash &&
-	head -n1 .git/copy.txt >first-line &&
-	test_grep "# This is a combination of 3 commits" first-line &&
-	test_grep "# This is the commit message #3:" .git/copy.txt
+expecting success of 3311.13 'notes tree still has fanout after merge (m)': verify_fanout m
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/7e8cc0aeac5befb302d276f2e706112bf6e413
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 13 - notes tree still has fanout after merge (m)
 
-Switched to a new branch 'with-conflicting-fixup'
-[with-conflicting-fixup c5541cc] wants-fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wants-fixup.t
-[with-conflicting-fixup 1453cf1] fixup 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[with-conflicting-fixup f2bd94a] fixup 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[with-conflicting-fixup 265fcdc] fixup 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick c5541cc wants-fixup
-pick 1453cf1 fixup 1
-pick f2bd94a fixup 2
-pick 265fcdc fixup 3
+expecting success of 3311.14 'successful merge using "theirs" strategy (z => w)': 
+	git update-ref refs/notes/m refs/notes/w &&
+	git notes merge -s theirs z &&
+	verify_notes m commit5 &&
+	# w/x/y/z unchanged
+	verify_notes w commit5 &&
+	verify_notes x commit5 &&
+	verify_notes y commit5 &&
+	verify_notes z commit5
 
-rebase -i script after editing:
-pick c5541cc wants-fixup
-fixup 1453cf1 fixup 1
-squash 265fcdc fixup 3
-Rebasing (2/3)
Rebasing (3/3)
Auto-merging wants-fixup.t
-CONFLICT (content): Merge conflict in wants-fixup.t
-error: could not apply 265fcdc... fixup 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 265fcdc... fixup 3
-Successfully rebased and updated refs/heads/with-conflicting-fixup.
-HEAD is now at 265fcdc fixup 3
-rebase -i script before editing:
-pick c5541cc wants-fixup
-pick 1453cf1 fixup 1
-pick f2bd94a fixup 2
-pick 265fcdc fixup 3
+Using remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Using remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 14 - successful merge using "theirs" strategy (z => w)
 
-rebase -i script after editing:
-pick c5541cc wants-fixup
-squash 1453cf1 fixup 1
-squash c5541cc wants-fixup
-squash f2bd94a fixup 2
-squash c5541cc wants-fixup
-Rebasing (2/5)
Rebasing (3/5)
Auto-merging wants-fixup.t
-CONFLICT (add/add): Merge conflict in wants-fixup.t
-error: could not apply c5541cc... wants-fixup
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply c5541cc... wants-fixup
-Rebasing (4/5)
Rebasing (5/5)
Auto-merging wants-fixup.t
-CONFLICT (add/add): Merge conflict in wants-fixup.t
-error: could not apply c5541cc... wants-fixup
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply c5541cc... wants-fixup
-[detached HEAD c5ae848] wants-fixup
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 wants-fixup.t
-Successfully rebased and updated refs/heads/with-conflicting-fixup.
-# This is a combination of 3 commits.
-# This is the commit message #3:
-fatal: no rebase in progress
-ok 8 - --skip after failed fixup cleans commit message
+expecting success of 3311.15 'notes tree still has fanout after merge (m)': verify_fanout m
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 15 - notes tree still has fanout after merge (m)
 
-expecting success of 3418.9 'setup rerere database': 
-	rm -fr .git/rebase-* &&
-	git reset --hard commit-new-file-F3-on-topic-branch &&
-	git checkout main &&
-	test_commit "commit-new-file-F3" F3 3 &&
-	test_config rerere.enabled true &&
-	git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
-	test_must_fail git rebase -m main topic &&
-	echo "Resolved" >F2 &&
-	cp F2 expected-F2 &&
-	git add F2 &&
-	test_must_fail git rebase --continue &&
-	echo "Resolved" >F3 &&
-	cp F3 expected-F3 &&
-	git add F3 &&
-	git rebase --continue &&
-	git reset --hard topic@{1}
+expecting success of 3311.16 'successful merge using "union" strategy (z => w)': 
+	git update-ref refs/notes/m refs/notes/w &&
+	git notes merge -s union z &&
+	verify_notes m commit5 &&
+	# w/x/y/z unchanged
+	verify_notes w commit5 &&
+	verify_notes x commit5 &&
+	verify_notes y commit5 &&
+	verify_notes z commit5
 
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-[main 544942a] commit-new-file-F3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F3
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Recorded preimage for 'F2'
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-Recorded resolution for 'F2'.
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Recorded preimage for 'F3'
-Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-Recorded resolution for 'F3'.
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-ok 9 - setup rerere database
+Concatenating local and remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Concatenating local and remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 16 - successful merge using "union" strategy (z => w)
 
-expecting success of 3418.10 'rebase --apply --continue remembers --rerere-autoupdate': 
-		prepare &&
-		test_must_fail git rebase $action --rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-544942a commit-new-file-F3
-virtual commit-new-file-F2-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F2
-Auto-merging F2
-Staged 'F2' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-eea28ba commit-new-file-F2-on-topic-branch
-virtual commit-new-file-F3-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F3
-Auto-merging F3
-Staged 'F3' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 commit-new-file-F3-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-ok 10 - rebase --apply --continue remembers --rerere-autoupdate
+expecting success of 3311.17 'notes tree still has fanout after merge (m)': verify_fanout m
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/7e8cc0aeac5befb302d276f2e706112bf6e413
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 17 - notes tree still has fanout after merge (m)
 
-expecting success of 3418.11 'rebase --apply --continue honors rerere.autoUpdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-544942a commit-new-file-F3
-virtual commit-new-file-F2-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F2
-Auto-merging F2
-Staged 'F2' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-eea28ba commit-new-file-F2-on-topic-branch
-virtual commit-new-file-F3-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F3
-Auto-merging F3
-Staged 'F3' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 commit-new-file-F3-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-ok 11 - rebase --apply --continue honors rerere.autoUpdate
+expecting success of 3311.18 'successful merge using "cat_sort_uniq" strategy (z => w)': 
+	git update-ref refs/notes/m refs/notes/w &&
+	git notes merge -s cat_sort_uniq z &&
+	verify_notes m commit5 &&
+	# w/x/y/z unchanged
+	verify_notes w commit5 &&
+	verify_notes x commit5 &&
+	verify_notes y commit5 &&
+	verify_notes z commit5
 
-expecting success of 3418.12 'rebase --apply --continue remembers --no-rerere-autoupdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		test_must_fail git diff-files --quiet &&
-		git add F2 &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		test_must_fail git diff-files --quiet &&
-		git add F3 &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-544942a commit-new-file-F3
-virtual commit-new-file-F2-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F2
-Auto-merging F2
-Resolved 'F2' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F2-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-eea28ba commit-new-file-F2-on-topic-branch
-virtual commit-new-file-F3-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F3
-Auto-merging F3
-Resolved 'F3' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 commit-new-file-F3-on-topic-branch
-Applying: commit-new-file-F3-on-topic-branch
-ok 12 - rebase --apply --continue remembers --no-rerere-autoupdate
+Concatenating unique lines in local and remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Concatenating unique lines in local and remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 18 - successful merge using "cat_sort_uniq" strategy (z => w)
 
-expecting success of 3418.13 'rebase -m --continue remembers --rerere-autoupdate': 
-		prepare &&
-		test_must_fail git rebase $action --rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 13 - rebase -m --continue remembers --rerere-autoupdate
+expecting success of 3311.19 'notes tree still has fanout after merge (m)': verify_fanout m
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/7e8cc0aeac5befb302d276f2e706112bf6e413
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 19 - notes tree still has fanout after merge (m)
 
-expecting success of 3418.14 'rebase -m --continue honors rerere.autoUpdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 14 - rebase -m --continue honors rerere.autoUpdate
+expecting success of 3311.20 'fails to merge using "manual" strategy (z => w)': 
+	git update-ref refs/notes/m refs/notes/w &&
+	test_must_fail git notes merge z
 
-expecting success of 3418.15 'rebase -m --continue remembers --no-rerere-autoupdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		test_must_fail git diff-files --quiet &&
-		git add F2 &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		test_must_fail git diff-files --quiet &&
-		git add F3 &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'F3' using previous resolution.
-Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 15 - rebase -m --continue remembers --no-rerere-autoupdate
+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 157e8cc0aeac5befb302d276f2e706112bf6e413
+CONFLICT (delete/modify): Notes for object 157e8cc0aeac5befb302d276f2e706112bf6e413 deleted in refs/notes/z and modified in refs/notes/m. Version from refs/notes/m left in tree.
+Auto-merging notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+CONFLICT (content): Merge conflict in notes for object e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 20 - fails to merge using "manual" strategy (z => w)
 
-expecting success of 3418.16 'rebase -i --continue remembers --rerere-autoupdate': 
-		prepare &&
-		test_must_fail git rebase $action --rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 16 - rebase -i --continue remembers --rerere-autoupdate
+expecting success of 3311.21 'notes tree still has fanout after merge (m)': verify_fanout m
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/7e8cc0aeac5befb302d276f2e706112bf6e413
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 21 - notes tree still has fanout after merge (m)
 
-expecting success of 3418.17 'rebase -i --continue honors rerere.autoUpdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action main topic &&
-		test_cmp expected-F2 F2 &&
-		git diff-files --quiet &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		git diff-files --quiet &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'F3' using previous resolution.
-Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 17 - rebase -i --continue honors rerere.autoUpdate
+expecting success of 3311.22 'verify conflict entries (with no fanout)': 
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == w)
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
 
-expecting success of 3418.18 'rebase -i --continue remembers --no-rerere-autoupdate': 
-		prepare &&
-		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
-		test_cmp expected-F2 F2 &&
-		test_must_fail git diff-files --quiet &&
-		git add F2 &&
-		test_must_fail git rebase --continue &&
-		test_cmp expected-F3 F3 &&
-		test_must_fail git diff-files --quiet &&
-		git add F3 &&
-		git rebase --continue
-	
-HEAD is now at 39de9a1 commit-new-file-F3-on-topic-branch
-Switched to branch 'main'
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-[detached HEAD eea28ba] commit-new-file-F2-on-topic-branch
+ok 22 - verify conflict entries (with no fanout)
+
+expecting success of 3311.23 'resolve and finalize merge (z => w)': 
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha3 <<EOF &&
+other notes for commit3
+
+appended notes for commit3
+EOF
+	git notes merge --commit &&
+	verify_notes m commit5 &&
+	# w/x/y/z unchanged
+	verify_notes w commit5 &&
+	verify_notes x commit5 &&
+	verify_notes y commit5 &&
+	verify_notes z commit5
+
+ok 23 - resolve and finalize merge (z => w)
+
+expecting success of 3311.24 'notes tree still has fanout after merge (m)': verify_fanout m
+00/59a2ff8988844dd700659efccfd6743632f608
+00/f8b74df8cda7203edb38223fe6e88ccf9e4867
+02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
+02/e82a8dbc4055adb9de6a9659582c396e5a405c
+03/0053ed24c57da4943b57df551d320cda39d301
+04/fa40d6837978ceac40e98a0477254b79ff6109
+05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
+06/a01ff41646bc048a05917f15e10fee340f767c
+06/c14dad0e5fd835685f33ad970d094a43e1cedc
+06/e1bb3951a38f7376405b778091cd7eadec203c
+09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
+0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
+0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
+0e/77e9a284277632ab6590d1f9b0f86d399c461e
+0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
+0f/63b6e81d3b18fb134161f627844e9e5a2d942a
+0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
+0f/dfaad743779a13fea86b5092855460a1d063fe
+11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
+11/768aa383e7caa89f5a859593052eda5782f73c
+11/906a39ecfe8796cae0e0853f06c2c335868843
+12/5a36192dc2255282d7d1800dec2a340d236a9b
+12/907a70732802196c1a0ca807a108eaa29adec5
+13/42db3bf0da6aed591bc732c1746073ff06b0f3
+15/7e8cc0aeac5befb302d276f2e706112bf6e413
+15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
+17/7c1b213fa7ebafc44c50a935e6c176b79360df
+18/9334c4b88d99963170854583fc084397152338
+19/8490da44fc075db7c29686ed3d75f9eced094a
+19/eab2791c316642c620b2494c2dce003beee3d4
+1a/50d1559b52e47799dce956a3ef59427b529e48
+1a/98e69358bfe77335598c444880178786f250f3
+1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
+1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
+1c/ec8d2b2103afe07295972d513c3f4abc898607
+1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
+1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
+1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
+1f/7c2e169ef55c9e168464bfe083076dbfb6690f
+1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
+21/eb95433c63f657f4feb61b78b91ed2fe53574c
+22/66ca4aaa709bb00bf269087d8e13a54042a93d
+22/a8913746147a11a5828aa70482fa6fc1fff2a1
+23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
+23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
+23/e92f35ff959ee71439822b19c93027ce677bc8
+24/f5d4d513327acad4f00462fe39bc96ed9aec9f
+28/fca858f4bdf40159e4fa5a63846b0aceb7431a
+29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
+2b/a7acefc08f3462eb12453a8bb5521544905334
+2c/75f53ac534a324324b1ff15cefcd70e7afa646
+2d/65622d1ffee087504b1cf59a6d6bdbb9552760
+2d/9e37898a0e742a0163855935118ab9af5951a8
+2d/c1daa14d2d350677e34ef5fe76509f6e55063d
+2d/d18e98a3cc782944a568636289c160d81fd5a1
+30/45340fd90419dd2f5690d1c4d8633c70248bd9
+32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
+32/39026a8940b414239faf0d77e274112d68d96d
+32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
+32/67715033f21dbf69f361ad1f2373e78065949d
+34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
+35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
+35/e40ca1583f193dfb98af23e284a80de6fb7484
+36/63d047011bfa8f85a3503c9f54deb1a09d5adf
+37/e9a73943fb52b3af6afd3eaa0901992a63cfff
+38/07896e9e661a2e84151e396d31fd34796d1f6f
+39/65ddde0fd33b440db683e8802fe0ebcb64094c
+39/916af9733548bdbf3c7899a97969fdc1ef2e99
+39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
+39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
+3b/64761fbc713b657deb969b9855343c0d7eaa2f
+3c/066e203e841ea3c7efc4be6d87b5f719704acb
+3c/e86c1beb71106283a293ac353ce61ab3096736
+3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
+3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
+40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
+41/a3870799c63de3688b300bdbaaaa6355ff24fb
+42/a4892a296f36eadfceb9d264f6e600703bf688
+43/15150561c443e54ab895a121e3c59ee39ff170
+43/da7a31eba4b4d3108e782c779cdf94b6bec116
+44/e3b4af0aa9e1af2f6db328754f45ac7726948c
+46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
+46/59a8862a02c5227f122d894c2a001eca0d84f9
+47/dd87a8e555bd925c86bc96989593e08968b7b1
+48/14470a784d66e0318a74ab08ea7202fc3fd4cc
+4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
+4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
+4b/87d5e91601208385a412a90deedaf14279452f
+4b/ba369e6095f2c452c4d09f1358acdeaafeae76
+4c/236aea851217323502e86ecc922143018837b0
+4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
+4d/f5539d13cfe269d6558fbe78b1329b361b9590
+4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
+51/7516b737a8c858f54b5ce20ccdf922a9376cfa
+51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
+52/0400c47b7fe950cac0119f3e0f39f77ea91f48
+52/24d3a5dee327bf2df46d0439e377af58e4e4b7
+54/6ad61cfdb3824e53156bc95274f47c52009d87
+54/95af5c04ccbe4967c06508a4a30fe6944c3178
+57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
+58/61ff7dcb74969510aa40908555fdfd43e9a607
+59/6cfc19975cea95d3f9af95d3ec3822394d17c3
+5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
+5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
+60/1e442f4370db50da9a9266fb36f1df1855da4b
+60/e04cb7f2669b592f1197d087b348f6eca6ff2a
+62/151fb4b555eb4c92c1942da6b0717af8ba787a
+64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
+65/86726dc4df291efa46b1e2587f52c80a3ddbf6
+66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
+66/babe5b113fb7a4290b198c980240154b392203
+67/f28897fa34cf457d8e880b8a60a19bdc771239
+67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
+68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
+68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
+68/fc05bece2383b55c77ece5900b5f4e4c40ba62
+69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
+6b/d2133f11f05075526130cb2a97c810b11bcb5e
+6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
+6c/131adc529e2d3a59b7034ced7f99f169598411
+6c/616feca94f10bf561251a17c16b7db4b1dbdde
+6c/7461a7db47fab144addf95b814379832f4230c
+6d/6c8808dfa5be2487402591dded1ad67d908a85
+70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
+70/e91c0fd3c8a7c524c051b8e8531c8286523915
+72/80e9c59bbfcf7288d0df9636df54527880ee79
+73/939a765953cbb48cb8cb1df6ccd062919eded1
+74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
+74/deae17ac1eecf64f405e05e8e14e0dd6b30543
+75/331eaadf68c823f6bc36873b625be470fdb9da
+75/337f6597d6a984ce72b370db7ac08b11115954
+76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
+79/64a617c4a2d1bb45850b48f774fc57b28fea5b
+7a/0703d54958925e09013e04bd35cd19a078a90b
+7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
+7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
+7d/815ea015cd551ab5de80879760defb47acea6c
+7e/41915dad67d1585d33b56abf2c129432fcf426
+7f/78a61938b36a24fd4431a12b22e3dd26702757
+81/1322f632d38d635a20a148bb4c5f98b8c31d8c
+81/83a1e8450e209464100603f2a9a0b8e574ca43
+82/6d4be181ec8e60d819f4ff350dee4e501a4efa
+82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
+84/94e16f2929306d0a205b4a9cf34789ec5b52fe
+85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
+86/700c1d3f3a0a31f2f954bb4188d398af2181db
+86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
+88/7ac411f4b1bcc710eb561c61d18e3960e817cf
+8a/015ae1ae0dac611406357e7e2b7d3b29b51447
+8a/2d13657445f6056804c992cd8b46d1f2d9e08e
+8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
+8a/a7d423d5a3e120d4d8c80980791ec2f209f131
+8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
+8c/e581e0bef54e004db3bc40b2f1079d24efdb96
+8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
+8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
+8e/50afaa02fd9bd744f061730cb8eedef4997d5d
+8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
+8f/ef91e52599676addb79aba4224c2c0eb8601a3
+8f/f04a0672b445210fcb364650d74111c2fd82f5
+8f/f5663227734a920cf085f0e0b76d5db14172f4
+90/a84eeab5e3ce60421da43a623db6540b688a62
+93/28a88723298c70ca14eaaa241613c9574e8b44
+93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
+94/1e1bccbf627604ca6af86ad3541dee480aab0e
+94/2d87c0b27dd02c55b0112dab49b9be254473d2
+94/955c5cd7e5662c6ab40c323ecdfac458c47435
+96/3df12cc741f3004f8870a52fc5877bf9ca6013
+96/7dd7f09c2f55dfb393c021ab6000a283cf068e
+96/939443f19f5d8926e78e906c965b418d4c46d5
+96/d5867ce179d5146ed9163e8eba2acabab83122
+97/4217f2644a6e6fe401523c4f459f7c3689f9dd
+99/decb49e0f56074881831727b906117a326be85
+99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
+9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
+9b/f30d1676260b8fc8bf519a4af4bc628402e95a
+9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
+9e/aacc50711e24a8d7fb5734444338752cc979a5
+9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
+9e/f8c372f29f8131739dc8eeab08f4323c54c47a
+a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
+a2/16dcf6b46f5260b6cfff5721847e010c681e40
+a3/60d5a1639d70627543138385781dbee95812c8
+a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
+a6/f7090037e529277612903dde135889721b8d24
+a7/01072f88f0fec15902916cbce38f3549cac0e6
+a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
+a7/b062b1589ea7e3385124521c2d4751b44b0a4b
+a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
+ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
+ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
+ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
+ad/b50ff206b638bb35775e4d8134314a4b669ee0
+ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
+af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
+b3/5c8895207c15e1d8d64ade08db059efd46d634
+b3/a6e1262d902a183b6810d77969091aeaa8605c
+b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
+b4/a7e9c293e3b1160418b9c2652bdcd028e75742
+b8/03a8226968f1f155ebabff1429026ba58ecf94
+ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
+ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
+ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
+bb/78195e8b2beb0c006980fb5c6e7e2641524167
+bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
+bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
+c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
+c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
+c1/c44c75783ebaad6ce903072e5b14af8f444bd8
+c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
+c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
+c2/9802df7ad706dff5dc666219b1b15e53db20fb
+c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
+c3/bce4b541feff853989c57fd2dc42c9f99e5f21
+c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
+c6/1ad84c67d08df0fd04c00b62de24091c9b7383
+c7/2685d485e402e73f8cd1cae86797c8eecc8d20
+c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
+c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
+ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
+cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
+ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
+cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
+cf/b2d40d0416c7b0b60db8199e1b79f640093f72
+cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
+d0/a377c848e3a37146acd4a8a9b891a5152a9d48
+d1/4356539993fb4c70ff4f4deb91eb9097740832
+d1/46fd69423d2f3b505d145e67afe5aca02dfe09
+d1/7af66ed98bd2bd2e18daa94c6689773993770c
+d1/9a07455999d2ab16493ec101e0dbc825206007
+d1/b856326cd5454fac386a758ed8c8918f66ba26
+d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
+d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
+d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
+d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
+d4/a19a929357505d72d64fc595a543b2215c39d4
+d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
+d6/1ac6b65471750febac7d69bca2475ad7f39617
+d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
+d6/88dc5b7b307160fe01c92bc80fd608bafa923f
+d6/e2c3490a50f68c0599b1bfad824631648bfe57
+d7/3e59672de81d623318c96702bafe79ca3b01b9
+d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
+d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
+d8/425743f77600e4165b653f22ae6fd38027d2b4
+d8/5974bb6248f39e51abd6d00737edd6256ee103
+da/865c12818c8ef15fc031f832d4399997476a64
+db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
+dd/336f1f082af04276827925fc2ad27560e584f4
+dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
+dd/f7332ecf611c9ea9b21b96c61b9508c8630258
+e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
+e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
+e0/851358fb6b4703f23d74ef964bc4491bec7ab9
+e0/9816883b166284284a2848821c7787a74b8170
+e2/09a0d469e26a06ce87bb3bbc3429a911e94879
+e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
+e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
+e5/4161d6eb21566f231627f845a14c312482ed8a
+e5/ce71a5e89216984d0334e19f0b86ee734b2419
+e6/405b88cddb9dfa524a7372b58e615bf4cdc730
+e6/83dd479d771604c993c307404be2aa9ac45b7d
+e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
+e9/4fa527e4420309ff4e420897749f95cb552444
+e9/cc8b7606e0f912773c1c6aa425319858643ae1
+ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
+eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
+eb/91b96510d8485576da96507503e779dece1777
+eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
+eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
+ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
+ec/55ada1019c2cd250bec8af82e999356d32c713
+ee/79ede3b931d2796f1d48176d4859b4dde8add5
+ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
+ef/004cfa88883bb87e030b6196934dd90e3548d2
+ef/3d66358c62d9f97f72b96ea6b9848414fa8101
+ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
+ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
+ef/f8361a8dab5eb9b5532706575896f3953c3da8
+f0/ad20627099424af1d5c762cc2e6975fedc4325
+f1/d588e48db9e3d4239673d5030b47b08f849eea
+f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
+f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
+f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
+f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
+f4/f9a1dc653674c0f7c877dda961925b1515e053
+f5/4ef3b60b96982e057642bfcff04ed29caf1207
+f5/bf3719d5450931e3979d1b9b140618fe042e22
+f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
+f8/18a85408d9343660a7403290cd483de65f28fe
+f8/469687aceb346b06adb42f065dfd586013636d
+f8/b4f860379fcc1e6256494d4931ff46ea5852de
+f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
+fa/37685cddf33cbf37404cb5314ea362557da4c5
+fa/e1e08aeadada773d1eb10851e985c808cdf655
+fb/209c09b61273835f23b39ce0d07171ab872311
+fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
+fe/4314bf42a6930ab23ad01b86ba887257ccb576
+fe/9977c6f7294face7e7987f2c53bd016d035089
+ok 24 - notes tree still has fanout after merge (m)
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3438-rebase-broken-files.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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(-)
-Rebasing (2/2)
Auto-merging F3
-CONFLICT (add/add): Merge conflict in F3
-error: could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'F3' using previous resolution.
-Could not apply 39de9a1... commit-new-file-F3-on-topic-branch
-[detached HEAD 6cb54c7] commit-new-file-F3-on-topic-branch
+Switched to a new branch 'branch2'
+[branch2 638f6ad] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/topic.
-ok 18 - rebase -i --continue remembers --no-rerere-autoupdate
-
-expecting success of 3418.19 'the todo command "break" works': 
-	rm -f execed &&
-	FAKE_LINES="break b exec_>execed" git rebase -i HEAD &&
-	test_path_is_missing execed &&
-	git rebase --continue &&
-	test_path_is_missing execed &&
-	git rebase --continue &&
-	test_path_is_file execed
-
-rebase -i script before editing:
-noop
-
-rebase -i script after editing:
-break
-b
-exec >execed
-Rebasing (1/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
-Rebasing (2/3)
Stopped at 6cb54c7 (commit-new-file-F3-on-topic-branch)
-Rebasing (3/3)
Executing: >execed
-Successfully rebased and updated refs/heads/topic.
-ok 19 - the todo command "break" works
+ok 1 - set up conflicting branches
 
-expecting success of 3418.20 'patch file is removed before break command': 
-	test_when_finished "git rebase --abort" &&
-	cat >todo <<-\EOF &&
-	pick commit-new-file-F2-on-topic-branch
-	break
-	EOF
+expecting success of 3438.2 'detect missing GIT_AUTHOR_NAME': 
+		create_conflict &&
 
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i --onto commit-new-file-F2 HEAD
-	) &&
-	test_path_is_file .git/rebase-merge/patch &&
-	echo 22>F2 &&
-	git add F2 &&
-	git rebase --continue &&
-	test_path_is_missing .git/rebase-merge/patch
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
 
-rebase -i script after editing:
-pick commit-new-file-F2-on-topic-branch
-break
-Rebasing (1/2)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+		check_resolve_fails
+	
+Switched to a new branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... 
-[detached HEAD cf7125b] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Stopped at cf7125b (commit-new-file-F2-on-topic-branch)
-ok 20 - patch file is removed before break command
-
-expecting success of 3418.21 '--reschedule-failed-exec': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
-	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
-	git rebase --abort &&
-	test_must_fail git -c rebase.rescheduleFailedExec=true \
-		rebase -x false HEAD^ 2>err &&
-	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
-	test_grep "has been rescheduled" err
-
-Rebasing (2/2)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
-
-  git rebase --continue
+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 
 
-hint: Could not execute the todo command
-hint:
-hint:     exec false
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-exec false
-exec false
-hint: It has been rescheduled; To edit the command before continuing, please
-ok 21 - --reschedule-failed-exec
+If they are meant to go into a new commit, run:
 
-expecting success of 3418.22 'rebase.rescheduleFailedExec only affects `rebase -i`': 
-	test_config rebase.rescheduleFailedExec true &&
-	test_must_fail git rebase -x false HEAD^ &&
-	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
-	git rebase --abort &&
-	git rebase HEAD^
+  git commit 
 
-Rebasing (2/2)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+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
 
-hint: Could not execute the todo command
-hint:
-hint:     exec false
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-exec false
-Current branch topic is up to date.
-ok 22 - rebase.rescheduleFailedExec only affects `rebase -i`
-
-expecting success of 3418.23 'rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec': 
-	test_when_finished "git rebase --abort" &&
-	test_config rebase.rescheduleFailedExec true &&
-	test_must_fail git rebase -x false --no-reschedule-failed-exec HEAD~2 &&
-	test_must_fail git rebase --continue 2>err &&
-	! grep "has been rescheduled" err
+expecting success of 3438.3 'detect missing GIT_AUTHOR_EMAIL': 
+		create_conflict &&
 
-Rebasing (2/4)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
 
-  git rebase --continue
+		check_resolve_fails
+	
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: missing 'GIT_AUTHOR_EMAIL'
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
 
+  git commit --amend 
 
-ok 23 - rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec
+If they are meant to go into a new commit, run:
 
-expecting success of 3418.24 'new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -x false HEAD~2 &&
-	test_config rebase.rescheduleFailedExec true &&
-	test_must_fail git rebase --continue 2>err &&
-	! grep "has been rescheduled" err
+  git commit 
 
-Rebasing (2/4)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+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
 
-ok 24 - new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored
+expecting success of 3438.4 'detect missing GIT_AUTHOR_DATE': 
+		create_conflict &&
 
-expecting success of 3418.25 'there is no --no-reschedule-failed-exec in an ongoing rebase': 
-	test_when_finished "git rebase --abort" &&
-	test_must_fail git rebase -x false HEAD~2 &&
-	test_expect_code 129 git rebase --continue --no-reschedule-failed-exec &&
-	test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
 
-Rebasing (2/4)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+		check_resolve_fails
+	
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: missing 'GIT_AUTHOR_DATE'
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
 
-  git rebase --continue
+  git commit --amend 
 
+If they are meant to go into a new commit, run:
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+  git commit 
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+In both cases, once you're done, continue with:
 
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
+  git rebase --continue
 
-    --[no-]onto <revision>
-                          rebase onto given branch instead of upstream
-    --[no-]keep-base      use the merge-base of upstream and branch as the current base
-    --no-verify           allow pre-rebase hook to run
-    --verify              opposite of --no-verify
-    -q, --[no-]quiet      be quiet. implies --no-stat
-    -v, --[no-]verbose    display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --stat                opposite of --no-stat
-    --[no-]signoff        add a Signed-off-by trailer to each commit
-    --[no-]committer-date-is-author-date
-                          make committer date match author date
-    --[no-]reset-author-date
-                          ignore author date and use current date
-    -C <n>                passed to 'git apply'
-    --[no-]ignore-whitespace
-                          ignore changes in whitespace
-    --[no-]whitespace <action>
-                          passed to 'git apply'
-    -f, --[no-]force-rebase
-                          cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --ff                  opposite of --no-ff
-    --continue            continue
-    --skip                skip current patch and continue
-    --abort               abort and check out the original branch
-    --quit                abort but keep HEAD where it is
-    --edit-todo           edit the todo list during an interactive rebase
-    --show-current-patch  show the patch file being applied or merged
-    --apply               use apply strategies to rebase
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --empty (drop|keep|stop)
-                          how to handle commits that become empty
-    --[no-]autosquash     move commits that begin with squash!/fixup! under -i
-    --[no-]update-refs    update branches that point to commits that are being rebased
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --[no-]autostash      automatically stash/stash pop before and after
-    -x, --[no-]exec <exec>
-                          add exec lines after each commit of the editable list
-    -r, --[no-]rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --[no-]fork-point     use 'merge-base --fork-point' to refine upstream
-    -s, --[no-]strategy <strategy>
-                          use the given merge strategy
-    -X, --[no-]strategy-option <option>
-                          pass the argument through to the merge strategy
-    --[no-]root           rebase all reachable commits up to the root(s)
-    --[no-]reschedule-failed-exec
-                          automatically re-schedule any `exec` that fails
-    --[no-]reapply-cherry-picks
-                          apply all changes, even those already present upstream
+error: could not commit staged changes.
+ok 4 - detect missing GIT_AUTHOR_DATE
 
-ok 25 - there is no --no-reschedule-failed-exec in an ongoing rebase
+expecting success of 3438.5 'detect duplicate GIT_AUTHOR_NAME': 
+		create_conflict &&
 
-expecting success of 3418.26 'rebase --apply sets ORIG_HEAD correctly': 
-		git checkout topic &&
-		git reset --hard commit-new-file-F2-on-topic-branch &&
-		test_orig_head_helper $type main
+		grep -i $item .git/rebase-merge/author-script >tmp &&
+		cat tmp >>.git/rebase-merge/author-script &&
+
+		check_resolve_fails
 	
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-544942a commit-new-file-F3
-virtual commit-new-file-F2-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F2
-Auto-merging F2
-Resolved 'F2' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 commit-new-file-F2-on-topic-branch
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-ok 26 - rebase --apply sets ORIG_HEAD correctly
+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:
 
-expecting success of 3418.27 'rebase --apply <upstream> <branch> sets ORIG_HEAD correctly': 
-		git checkout main &&
-		test_orig_head_helper $type main topic
+  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
 	
-Switched to branch 'main'
-First, rewinding head to replay your work on top of it...
-Applying: commit-new-file-F2-on-topic-branch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-544942a commit-new-file-F3
-virtual commit-new-file-F2-on-topic-branch
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in F2
-Auto-merging F2
-Resolved 'F2' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 commit-new-file-F2-on-topic-branch
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-ok 27 - rebase --apply <upstream> <branch> sets ORIG_HEAD correctly
+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:
 
-expecting success of 3418.28 'rebase --merge sets ORIG_HEAD correctly': 
-		git checkout topic &&
-		git reset --hard commit-new-file-F2-on-topic-branch &&
-		test_orig_head_helper $type main
+  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
 	
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-Rebasing (1/1)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-ok 28 - rebase --merge sets ORIG_HEAD correctly
+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:
 
-expecting success of 3418.29 'rebase --merge <upstream> <branch> sets ORIG_HEAD correctly': 
-		git checkout main &&
-		test_orig_head_helper $type main topic
-	
-Switched to branch 'main'
-Rebasing (1/1)
Auto-merging F2
-CONFLICT (add/add): Merge conflict in F2
-error: could not apply 24c5d85... commit-new-file-F2-on-topic-branch
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 7 - detect duplicate GIT_AUTHOR_DATE
+
+expecting success of 3438.8 'unknown key in author-script': 
+	create_conflict &&
+
+	echo "GIT_AUTHOR_BOGUS=${SQ}whatever${SQ}" \
+		>>.git/rebase-merge/author-script &&
+
+	check_resolve_fails
+
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'F2' using previous resolution.
-Could not apply 24c5d85... commit-new-file-F2-on-topic-branch
-Already on 'topic'
-HEAD is now at 24c5d85 commit-new-file-F2-on-topic-branch
-ok 29 - rebase --merge <upstream> <branch> sets ORIG_HEAD correctly
+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:
 
-# passed all 29 test(s)
-1..29
+  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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3415-rebase-autosquash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3415-rebase-autosquash/.git/
-expecting success of 3415.1 'setup': 
-	echo 0 >file0 &&
-	git add . &&
+*** t3500-cherry.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 "initial commit" &&
-	echo 0 >file1 &&
-	echo 2 >file2 &&
-	git add . &&
+	git commit -m "Add A." &&
+
+	git checkout -b my-topic-branch &&
+
+	echo Second > B &&
+	git update-index --add B &&
 	test_tick &&
-	git commit -m "first commit" &&
-	git tag first-commit &&
-	echo 3 >file3 &&
-	git add . &&
+	git commit -m "Add B." &&
+
+	echo AnotherSecond > C &&
+	git update-index --add C &&
 	test_tick &&
-	git commit -m "second commit" &&
-	git tag base
+	git commit -m "Add C." &&
 
-[main (root-commit) d78c915] initial commit
- Author: A U Thor <author@example.com>
+	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 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>
+ 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 file3
-ok 1 - setup
+ 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 3415.2 'auto fixup (option)': 
-	test_auto_fixup fixup-option --autosquash &&
-	test_auto_fixup fixup-option-i "--autosquash -i"
+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) )" : "+ [^ ]*"
 
-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)
+42
+ok 2 - check that cherry with limit returns only the top patch
 
-expecting success of 3415.3 'auto fixup (config true)': 
-	git config rebase.autosquash true &&
-	test_auto_fixup ! fixup-config-true &&
-	test_auto_fixup fixup-config-true-i -i &&
-	test_auto_fixup ! fixup-config-true-no --no-autosquash &&
-	test_auto_fixup ! fixup-config-true-i-no "-i --no-autosquash"
+expecting success of 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) )" : "+ [^ ]* - .*"
 
-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)
+[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 3415.4 'auto fixup (config false)': 
-	git config rebase.autosquash false &&
-	test_auto_fixup ! fixup-config-false &&
-	test_auto_fixup ! fixup-config-false-i -i &&
-	test_auto_fixup fixup-config-false-yes --autosquash &&
-	test_auto_fixup fixup-config-false-i-yes "-i --autosquash"
+expecting success of 3500.4 'cherry ignores whitespace': 
+	git switch --orphan=upstream-with-space &&
+	test_commit initial file &&
+	>expect &&
+	git switch --create=feature-without-space &&
 
-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>
+	# 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(-)
-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>
+[feature-without-space efc65e3] change
+ Author: A U Thor <bogus_email_address>
  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>
+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(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/main.
-ok 4 - auto fixup (config false)
+ok 4 - cherry ignores whitespace
 
-expecting success of 3415.5 'auto squash (option)': 
-	test_auto_squash squash-option --autosquash &&
-	test_auto_squash squash-option-i "--autosquash -i"
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3436-rebase-more-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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" &&
 
-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)
+	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 &&
 
-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"
+	git checkout --orphan main &&
+	rm foo &&
+	test_write_lines "line 1" "        line 2" "line 3" >file &&
+	git commit -am "add file" &&
+	git tag main &&
 
-HEAD is now at f0c2a7e second commit
-[main aa2cfac] squash! first
+	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(+), 1 deletion(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main a1a4b3d] squash! first
+ 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(-)
-Rebasing (2/3)
[detached HEAD 0b600c3] first commit
+[topic 7c57c40] commit1
  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
+ 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(-)
-Current branch main is up to date.
-HEAD is now at f0c2a7e second commit
-[main 8980136] squash! first
+[topic eda6f49] commit3
  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)
+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 3415.7 'auto squash (config false)': 
-	git config rebase.autosquash false &&
-	test_auto_squash ! squash-config-false &&
-	test_auto_squash ! squash-config-false-i -i &&
-	test_auto_squash squash-config-false-yes --autosquash &&
-	test_auto_squash squash-config-false-i-yes "-i --autosquash"
+expecting success of 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
 
-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)
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+3ada4af add file
+virtual update file
+found 1 common ancestor:
+virtual cea075e2ce716201e60e4bbadc9a40706c56c362
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+ok 2 - --ignore-whitespace works with apply backend
 
-expecting success of 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
+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
 
-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
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 139b464... update file
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 139b464... update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 3 - --ignore-whitespace works with merge backend
 
-expecting success of 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
+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
 
-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
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+rebase -i script before editing:
+pick 139b464 update file
 
-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
+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
 
-HEAD is now at f0c2a7e second commit
-[main 9714540] squash! third
+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(-)
-[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
+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 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
+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
 
-HEAD is now at f0c2a7e second commit
-[main 3b312a0] squash! 244a0fe
+[detached HEAD 6184e8b] update file
  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
+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 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 &&
+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 &&
-	git cat-file commit HEAD^ >commit &&
-	! grep "squash" commit &&
-	grep "^extra para" commit >actual &&
-	test_line_count = 1 actual
+	test_ctime_is_atime -1
 
-HEAD is now at f0c2a7e second commit
-[main 56b8696] squash! 244a0fe611d
+[detached HEAD 6184e8b] update file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 31cb7fc] first commit
+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 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
+ 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 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
+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
 
-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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3415.14 'use commit --fixup': 
-	test_auto_commit_flags fixup 1
+  5c38296 edited
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3415.15 'use commit --squash': 
-	test_auto_commit_flags squash 2
+ git branch <new-branch-name> 5c38296
 
-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
+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 3415.16 'fixup! fixup!': 
-	test_auto_fixup_fixup fixup fixup
+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
 
-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!
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
 
-expecting success of 3415.17 'fixup! squash!': 
-	test_auto_fixup_fixup fixup squash
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
 
-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!
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3415.18 'squash! squash!': 
-	test_auto_fixup_fixup squash squash
+ git branch <new-branch-name> aa07736
 
-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!
+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 3415.19 'squash! fixup!': 
-	test_auto_fixup_fixup squash fixup
+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
 
-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!
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
 
-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
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
 
-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
+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 (2/4)
Rebasing (3/4)
[detached HEAD 5f906d9] first commit
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
+error: could not apply 832d950... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 832d950... commit2
+[detached HEAD 3bf7cf9] commit2
  Author: A U Thor <author@example.com>
- 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
+ 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 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
-	)
+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
 
-HEAD is now at f0c2a7e second commit
-[main bd7d73b] empty-instructionFormat-test
+[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 empty-instructionFormat-test.t
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-ok 21 - autosquash with empty custom instructionFormat
+ 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 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
-	)
+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
 
-[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
+[detached HEAD 70e7180] commit2
  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
+ 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 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
+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
 
-[main cf5183f] to-fixup
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+[detached HEAD 826be88] commit2
  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!
+ create mode 100644 foo
+Successfully rebased and updated detached HEAD.
+ok 13 - --reset-author-date works after conflict resolution
 
-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
+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
 
-[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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3415.25 'abort last squash': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_when_finished "git checkout main" &&
+  826be88 commit2
 
-	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 &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	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
+ git branch <new-branch-name> 826be88
 
-Switched to a new branch 'some-squashes'
-[some-squashes bd9420f] first
- Author: A U Thor <author@example.com>
-[some-squashes 6d29458] squash! first
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
+ok 14 - --reset-author-date works with rebase -r
+
+expecting success of 3436.15 '--reset-author-date with --committer-date-is-author-date works': 
+	test_must_fail git rebase -m --committer-date-is-author-date \
+		--reset-author-date --onto commit2^^ commit2^ commit3 &&
+	git checkout --theirs foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_ctime_is_atime -2 &&
+	test_atime_is_ignored -2
+
+Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+Updated 1 path from the index
+[detached HEAD 601f5a0] commit2
  Author: A U Thor <author@example.com>
-[some-squashes 85370c6] second
+ 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 80a4b48] commit3
  Author: A U Thor <author@example.com>
-[some-squashes c93cccf] squash! second
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick 80a4b48 commit3
+
+rebase -i script after editing:
+reword 80a4b48 commit3
+Rebasing (1/1)
[detached HEAD 93b5c21] edited
  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
+ Date: Sat Mar 14 13:29:44 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 16:33:13 2005 -0700
-Rebasing (3/4)
Rebasing (4/4)
[detached HEAD c28af0d] second
+ 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 5eab6d0] empty
  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
+ 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 3415.26 'fixup a fixup': 
-	echo 0to-fixup >file0 &&
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3437-rebase-fixup-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 -m "to-fixup" file0 &&
+	git commit --fixup=HEAD -a &&
+	git tag B1 &&
 	test_tick &&
-	git commit --squash HEAD -m X --allow-empty &&
+	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
 	test_tick &&
-	git commit --squash HEAD^ -m Y --allow-empty &&
+	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
+	echo B2 >B &&
 	test_tick &&
-	git commit -m "squash! $(git rev-parse HEAD^)" -m Z --allow-empty &&
+	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
+	git tag B2 &&
+	echo B3 >B &&
 	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)
+	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
+	git tag B3 &&
 
-[main 6a9033f] to-fixup
+	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(-)
-[main 63f0af4] squash! to-fixup
+[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>
-[main c9ec1dd] squash! to-fixup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch'
+[branch 5ea5a69] fixup! B
  Author: A U Thor <author@example.com>
-[main 0d1074f] squash! 63f0af4ca8c3d16bdada48a5a263684c0037ec5d
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch 9954cb8] amend! B
  Author: A U Thor <author@example.com>
-[main b6ab4f6] squash! 63f0af4ca8c3d16bdada48a5a263684c0037ec5d
+[branch ddcbd4a] amend! amend! B
  Author: A U Thor <author@example.com>
-Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD e9faffd] to-fixup
+[branch 4d0230e] squash! amend! amend! B
  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
+[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 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)"
+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"
 
-[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
+HEAD is now at 34b9ec4 A2
+rebase -i script before editing:
+pick 24547d2 amend! B
+pick 34b9ec4 A2
 
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3424-rebase-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3424-rebase-empty/.git/
-expecting success of 3424.1 'setup test repository': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
-	test_write_lines A B C D E F G H I J >letters &&
-	git add numbers letters &&
-	git commit -m A &&
+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
 
-	git branch upstream &&
-	git branch localmods &&
+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
 
-	git checkout upstream &&
-	test_write_lines A B C D E >letters &&
-	git add letters &&
-	git commit -m B &&
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers &&
-	git add numbers &&
-	git commit -m C &&
+  9e14115 A2
 
-	git checkout localmods &&
-	test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers &&
-	git add numbers &&
-	git commit -m C2 &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	git commit --allow-empty -m D &&
+ git branch <new-branch-name> 9e14115
 
-	test_write_lines A B C D E >letters &&
-	git add letters &&
-	git commit -m "Five letters ought to be enough for anybody"
+HEAD is now at 34b9ec4 A2
+rebase -i script before editing:
+pick 24547d2 amend! B
+pick 34b9ec4 A2
 
-[master (root-commit) 5bccb87] A
- Author: A U Thor <author@example.com>
- 2 files changed, 20 insertions(+)
- create mode 100644 letters
- create mode 100644 numbers
-Switched to branch 'upstream'
-[upstream 830e295] B
- Author: A U Thor <author@example.com>
- 1 file changed, 5 deletions(-)
-[upstream 028eb0a] C
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to branch 'localmods'
-[localmods 48a48e4] C2
- Author: A U Thor <author@example.com>
+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(-)
-[localmods 7a36fb1] D
- Author: A U Thor <author@example.com>
-[localmods 4a67a39] Five letters ought to be enough for anybody
+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 set advice.mergeConflict false"
+Could not apply 24547d2... amend! B
+[detached HEAD df4c993] new subject
  Author: A U Thor <author@example.com>
- 1 file changed, 5 deletions(-)
-ok 1 - setup test repository
+ 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
 
-checking known breakage of 3424.2 'rebase (apply-backend)': 
-	test_when_finished "git rebase --abort" &&
-	git checkout -B testing localmods &&
-	# rebase (--apply) should not drop commits that start empty
-	git rebase --apply upstream &&
+expecting success of 3437.6 'conflicting fixup -C after fixup with custom comment string': 
+	test_config core.commentString COMMENT &&
+	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 &&
+	echo resolved >A &&
+	git add A &&
+	FAKE_COMMIT_AMEND=edited git rebase --continue &&
+	test_commit_message HEAD <<-\EOF
+	A3
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+	edited
+	EOF
 
-Switched to a new branch 'testing'
-First, rewinding head to replay your work on top of it...
-Applying: C2
-Using index info to reconstruct a base tree...
-M	numbers
-Falling back to patching base and 3-way merge...
-Merging:
-028eb0a C
-virtual C2
-found 1 common ancestor:
-virtual 75a3e2be4ba4a7062d21fba0206758f5518d6ead
-Auto-merging numbers
-Skipped numbers (merged same as existing)
+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
+
+COMMENT Rebase e45ed32..fc6fe24 onto e45ed32 (4 commands)
+COMMENT
+COMMENT Commands:
+COMMENT p, pick <commit> = use commit
+COMMENT r, reword <commit> = use commit, but edit the commit message
+COMMENT e, edit <commit> = use commit, but stop for amending
+COMMENT s, squash <commit> = use commit, but meld into previous commit
+COMMENT f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
+COMMENT                    commit's log message, unless -C is used, in which case
+COMMENT                    keep only this commit's message; -c is same as -C but
+COMMENT                    opens the editor
+COMMENT x, exec <command> = run command (the rest of the line) using shell
+COMMENT b, break = stop here (continue rebase later with 'git rebase --continue')
+COMMENT d, drop <commit> = remove commit
+COMMENT l, label <label> = label current HEAD with a name
+COMMENT t, reset <label> = reset HEAD to a label
+COMMENT m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
+COMMENT         create a merge commit using the original merge commit's
+COMMENT         message (or the oneline, if no original merge commit was
+COMMENT         specified); use -c <commit> to reword the commit message
+COMMENT u, update-ref <ref> = track a placeholder for the <ref> to be updated
+COMMENT                       to this position in the new commits. The <ref> is
+COMMENT                       updated at the end of the rebase
+COMMENT
+COMMENT These lines can be re-ordered; they are executed from top to bottom.
+COMMENT
+COMMENT If you remove a line here THAT COMMIT WILL BE LOST.
+COMMENT
+COMMENT However, if you remove everything, the rebase will be aborted.
+COMMENT
+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 set advice.mergeConflict false"
-No changes -- Patch already applied.
-Patch is empty.
-not ok 2 - rebase (apply-backend) # TODO known breakage
+Could not apply fc6fe24... A3
+[detached HEAD ebea504] 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 6 - conflicting fixup -C after fixup with custom comment string
 
-expecting success of 3424.3 'rebase --merge --empty=drop': 
-	git checkout -B testing localmods &&
-	git rebase --merge --empty=drop upstream &&
+expecting success of 3437.7 '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"
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 3 - rebase --merge --empty=drop
+  ebea504 A3
 
-expecting success of 3424.4 'rebase --merge uses default of --empty=drop': 
-	git checkout -B testing localmods &&
-	git rebase --merge upstream &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+ git branch <new-branch-name> ebea504
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 4 - rebase --merge uses default of --empty=drop
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
 
-expecting success of 3424.5 'rebase --merge --empty=keep': 
-	git checkout -B testing localmods &&
-	git rebase --merge --empty=keep upstream &&
+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 set 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 7 - skipping fixup -C after fixup gives correct message
 
-	test_write_lines D C2 C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+expecting success of 3437.8 '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
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 5 - rebase --merge --empty=keep
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3424.6 'rebase --merge --empty=stop': 
-	git checkout -B testing localmods &&
-	test_must_fail git rebase --merge --empty=stop upstream &&
+  e650b85 B
 
-	git rebase --skip &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+ git branch <new-branch-name> e650b85
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+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
 
-    git commit --allow-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
+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 8 - sequence of fixup, fixup -C & squash --signoff works
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 028eb0a
-Last command done (1 command done):
-   pick 48a48e4 C2
-Next command to do (1 remaining command):
-   pick 7a36fb1 D # empty
-  (use "git rebase --edit-todo" to view and edit)
-You are currently rebasing branch 'testing' on '028eb0a'.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 3437.9 '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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 48a48e4... C2
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 6 - rebase --merge --empty=stop
+  93e1c61 B
 
-expecting success of 3424.7 'rebase --merge --empty=ask': 
-	git checkout -B testing localmods &&
-	test_must_fail git rebase --merge --empty=ask upstream &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	git rebase --skip &&
+ git branch <new-branch-name> 93e1c61
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+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
 
-Reset branch 'testing'
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+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 9 - first fixup -C commented out in sequence fixup fixup -C fixup -C
 
-    git commit --allow-empty
+expecting success of 3437.10 '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
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 028eb0a
-Last command done (1 command done):
-   pick 48a48e4 C2
-Next command to do (1 remaining command):
-   pick 7a36fb1 D # empty
-  (use "git rebase --edit-todo" to view and edit)
-You are currently rebasing branch 'testing' on '028eb0a'.
-  (all conflicts fixed: run "git rebase --continue")
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
+  8566dee B
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 48a48e4... C2
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 7 - rebase --merge --empty=ask
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3424.8 'rebase --interactive --empty=drop': 
-	git checkout -B testing localmods &&
-	git rebase --interactive --empty=drop upstream &&
+ git branch <new-branch-name> 8566dee
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 8 - rebase --interactive --empty=drop
+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 10 - multiple fixup -c opens editor once
 
-expecting success of 3424.9 'rebase --interactive --empty=keep': 
-	git checkout -B testing localmods &&
-	git rebase --interactive --empty=keep upstream &&
+expecting success of 3437.11 '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
 
-	test_write_lines D C2 C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 9 - rebase --interactive --empty=keep
+  68e48e4 A3
 
-expecting success of 3424.10 'rebase --interactive --empty=stop': 
-	git checkout -B testing localmods &&
-	test_must_fail git rebase --interactive --empty=stop upstream &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	git rebase --skip &&
+ git branch <new-branch-name> 68e48e4
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+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 11 - sequence squash, fixup & fixup -c gives combined message
 
-    git commit --allow-empty
+expecting success of 3437.12 '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
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 028eb0a
-Last command done (1 command done):
-   pick 48a48e4 C2
-Next command to do (1 remaining command):
-   pick 7a36fb1 D # empty
-  (use "git rebase --edit-todo" to view and edit)
-You are currently rebasing branch 'testing' on '028eb0a'.
-  (all conflicts fixed: run "git rebase --continue")
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
+  0a304e5 B
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 48a48e4... C2
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 10 - rebase --interactive --empty=stop
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3424.11 'rebase --interactive uses default of --empty=stop': 
-	git checkout -B testing localmods &&
-	test_must_fail git rebase --interactive upstream &&
+ git branch <new-branch-name> 0a304e5
 
-	git rebase --skip &&
+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 12 - fixup -C works upon --autosquash with amend!
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
+expecting success of 3437.13 '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
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+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 13 - fixup -[Cc]<commit> works
 
-    git commit --allow-empty
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3430-rebase-merges.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 028eb0a
-Last command done (1 command done):
-   pick 48a48e4 C2
-Next command to do (1 remaining command):
-   pick 7a36fb1 D # empty
-  (use "git rebase --edit-todo" to view and edit)
-You are currently rebasing branch 'testing' on '028eb0a'.
-  (all conflicts fixed: run "git rebase --continue")
+	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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
+[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'.
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 48a48e4... C2
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 11 - rebase --interactive uses default of --empty=stop
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3424.12 'rebase --merge --empty=drop --keep-empty': 
-	git checkout -B testing localmods &&
-	git rebase --merge --empty=drop --keep-empty upstream &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+  git switch -c <new-branch-name>
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
-Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 12 - rebase --merge --empty=drop --keep-empty
+Or undo this operation with:
 
-expecting success of 3424.13 'rebase --merge --empty=drop --no-keep-empty': 
-	git checkout -B testing localmods &&
-	git rebase --merge --empty=drop --no-keep-empty upstream &&
+  git switch -
 
-	test_write_lines C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
-Successfully rebased and updated refs/heads/testing.
-ok 13 - rebase --merge --empty=drop --no-keep-empty
+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 3424.14 'rebase --merge --empty=keep --keep-empty': 
-	git checkout -B testing localmods &&
-	git rebase --merge --empty=keep --keep-empty upstream &&
+expecting success of 3430.2 'create completely different structure': 
+	cat >script-from-scratch <<-\EOF &&
+	label onto
 
-	test_write_lines D C2 C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+	# onebranch
+	pick G
+	pick D
+	label onebranch
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/testing.
-ok 14 - rebase --merge --empty=keep --keep-empty
+	# second
+	reset onto
+	pick B
+	label second
 
-expecting success of 3424.15 'rebase --merge --empty=keep --no-keep-empty': 
-	git checkout -B testing localmods &&
-	git rebase --merge --empty=keep --no-keep-empty upstream &&
+	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
 
-	test_write_lines C2 C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+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
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated refs/heads/testing.
-ok 15 - rebase --merge --empty=keep --no-keep-empty
+expecting success of 3430.3 'generate correct todo list': 
+	cat >expect <<-EOF &&
+	label onto
 
-expecting success of 3424.16 'rebase --merge does not leave state laying around': 
-	git checkout -B testing localmods~2 &&
-	git rebase --merge upstream &&
+	reset onto
+	pick $b B
+	label first
 
-	test_path_is_missing .git/CHERRY_PICK_HEAD &&
-	test_path_is_missing .git/MERGE_MSG
+	reset onto
+	pick $c C
+	label branch-point
+	pick $f F
+	pick $g G
+	label second
 
-Reset branch 'testing'
-Rebasing (1/1)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
-Successfully rebased and updated refs/heads/testing.
-ok 16 - rebase --merge does not leave state laying around
+	reset branch-point # C
+	pick $d D
+	merge -C $e first # E
+	merge -C $h second # H
 
-expecting success of 3424.17 'rebase --exec --empty=drop': 
-	git checkout -B testing localmods &&
-	git rebase --exec "true" --empty=drop upstream &&
+	EOF
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
+	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
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
dropping 48a48e47ff77cc6b4e5b3599268e1a217b1955dc C2 -- patch contents already upstream
-Rebasing (2/4)
Executing: true
-Rebasing (3/4)
Rebasing (4/4)
Executing: true
-Successfully rebased and updated refs/heads/testing.
-ok 17 - rebase --exec --empty=drop
+Note: switching to 'B'.
 
-expecting success of 3424.18 'rebase --exec --empty=keep': 
-	git checkout -B testing localmods &&
-	git rebase --exec "true" --empty=keep upstream &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	test_write_lines D C2 C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
Rebasing (2/4)
Executing: true
-Rebasing (3/4)
Rebasing (4/4)
Executing: true
-Successfully rebased and updated refs/heads/testing.
-ok 18 - rebase --exec --empty=keep
+  git switch -c <new-branch-name>
 
-expecting success of 3424.19 'rebase --exec uses default of --empty=keep': 
-	git checkout -B testing localmods &&
-	git rebase --exec "true" upstream &&
+Or undo this operation with:
 
-	test_write_lines D C2 C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+  git switch -
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
Rebasing (2/4)
Executing: true
-Rebasing (3/4)
Rebasing (4/4)
Executing: true
-Successfully rebased and updated refs/heads/testing.
-ok 19 - rebase --exec uses default of --empty=keep
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3424.20 'rebase --exec --empty=stop': 
-	git checkout -B testing localmods &&
-	test_must_fail git rebase --exec "true" --empty=stop upstream &&
+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
 
-	git rebase --skip &&
+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
 
-	test_write_lines D C B A >expect &&
-	git log --format=%s >actual &&
-	test_cmp expect actual
+Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
+ok 5 - `reset` rejects trees
 
-Reset branch 'testing'
-warning: skipped previously applied commit 4a67a39
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/4)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+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
 
-    git commit --allow-empty
+Rebasing (1/1)
error: could not resolve 'my-label'
+ok 6 - `reset` only looks for labels under refs/rewritten/
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 028eb0a
-Last command done (1 command done):
-   pick 48a48e4 C2
-Next commands to do (3 remaining commands):
-   exec true
-   pick 7a36fb1 D # empty
-  (use "git rebase --edit-todo" to view and edit)
-You are currently rebasing branch 'testing' on '028eb0a'.
-  (all conflicts fixed: run "git rebase --continue")
+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 &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
+	: fail because of conflicting untracked file &&
+	>G.t &&
+	echo "merge -C H G" >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	test_must_fail git rebase -ir HEAD &&
+	test_cmp_rev REBASE_HEAD H^0 &&
+	grep "^merge -C .* G$" .git/rebase-merge/done &&
+	grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
+	test_path_is_missing .git/rebase-merge/patch &&
+	echo changed >file1 &&
+	git add file1 &&
+	test_must_fail git rebase --continue 2>err &&
+	grep "error: you have staged changes in your working tree" err &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 48a48e4... C2
-Rebasing (2/4)
Executing: true
-Rebasing (3/4)
Rebasing (4/4)
Executing: true
-Successfully rebased and updated refs/heads/testing.
-ok 20 - rebase --exec --empty=stop
+	: fail because of merge conflict &&
+	git reset --hard conflicting-G &&
+	test_must_fail git rebase --continue &&
+	! grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
+	test_path_is_file .git/rebase-merge/patch
 
-# still have 1 known breakage(s)
-# passed all remaining 19 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3425-rebase-topology-merges.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3425-rebase-topology-merges/.git/
-expecting success of 3425.1 'setup of non-linear-history': 
-	test_commit a &&
-	test_commit b &&
-	test_commit c &&
-	git checkout b &&
-	test_commit d &&
-	test_commit e &&
+Previous HEAD position was 5dee784 C
+Switched to a new branch 'conflicting-merge'
+Rebasing (1/1)
error: The following untracked working tree files would be overwritten by merge:
+	G.t
+Please move or remove them before you merge.
+Aborting
+error: could not even attempt to merge 'G'
+hint: Could not execute the todo command
+hint:
+hint:     merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
+merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
+error: you have staged changes in your working tree
+HEAD is now at 82776a5 conflicting-G
+Rebasing (2/2)
Auto-merging G.t
+CONFLICT (add/add): Merge conflict in G.t
+Could not apply 233d48a... G
+ok 7 - failed `merge -C` writes patch (may be rescheduled, too)
 
-	git checkout c &&
-	test_commit g &&
-	revert h g &&
-	git checkout d &&
-	cherry_pick gp g &&
-	test_commit i &&
-	git checkout b &&
-	test_commit f &&
+expecting success of 3430.8 'failed `merge <branch>` does not crash': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout conflicting-G &&
 
-	git checkout d &&
-	test_commit n &&
-	test_commit o &&
-	test_merge w e &&
-	test_merge v c &&
-	git checkout o &&
-	test_commit z
+	echo "merge G" >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	test_must_fail git rebase -ir HEAD &&
+	! grep "^merge G$" .git/rebase-merge/git-rebase-todo &&
+	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
 
-[master (root-commit) ce450c7] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[master 020ea9b] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[master d9ea348] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Note: switching to 'b'.
+Note: switching to 'conflicting-G'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -149765,17180 +157730,16310 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 020ea9b b
-[detached HEAD 1bd0260] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-[detached HEAD 67a7211] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-Previous HEAD position was 67a7211 e
-HEAD is now at d9ea348 c
-[detached HEAD 5573dba] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-[detached HEAD 09e6546] h
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 g.t
-Previous HEAD position was 09e6546 h
-HEAD is now at 1bd0260 d
-[detached HEAD 00eccdb] gp
+HEAD is now at 82776a5 conflicting-G
+Rebasing (1/1)
Auto-merging G.t
+CONFLICT (add/add): Merge conflict in G.t
+Could not merge G
+Merge branch 'G'
+ok 8 - failed `merge <branch>` does not crash
+
+expecting success of 3430.9 'merge -c commits before rewording and reloads todo-list': 
+	cat >script-from-scratch <<-\EOF &&
+	merge -c E B
+	merge -c H G
+	EOF
+
+	git checkout -b merge-c H &&
+	(
+		set_reword_editor &&
+		GIT_SEQUENCE_EDITOR="\"$PWD/replace-editor.sh\"" \
+			git rebase -i -r D
+	) &&
+	check_reworded_commits E H
+
+Previous HEAD position was 82776a5 conflicting-G
+Switched to a new branch 'merge-c'
+Rebasing (1/2)
[detached HEAD 3d66115] E
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-[detached HEAD 3317c29] i
+ Date: Thu Apr 7 15:17:13 2005 -0700
+Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Rebasing (3/3)
[detached HEAD 790085d] H
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 i.t
-Previous HEAD position was 3317c29 i
-HEAD is now at 020ea9b b
-[detached HEAD 09e072f] f
+ Date: Thu Apr 7 15:20:13 2005 -0700
+Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Successfully rebased and updated refs/heads/merge-c.
+ok 9 - merge -c commits before rewording and reloads todo-list
+
+expecting success of 3430.10 'merge -c rewords when a strategy is given': 
+	git checkout -b merge-c-with-strategy H &&
+	write_script git-merge-override <<-\EOF &&
+	echo overridden$1 >G.t
+	git add G.t
+	EOF
+
+	PATH="$PWD:$PATH" \
+	GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
+	GIT_EDITOR="echo edited >>" \
+		git rebase --no-ff -ir -s override -Xxopt E &&
+	test_write_lines overridden--xopt >expect &&
+	test_cmp expect G.t &&
+	test_write_lines H "" edited "" >expect &&
+	git log --format=%B -1 >actual &&
+	test_cmp expect actual
+
+
+Switched to a new branch 'merge-c-with-strategy'
+Rebasing (1/1)
Merge made by the 'override' strategy.
+Successfully rebased and updated refs/heads/merge-c-with-strategy.
+ok 10 - merge -c rewords when a strategy is given
+
+expecting success of 3430.11 'with a branch tip that was cherry-picked already': 
+	git checkout -b already-upstream main &&
+	base="$(git rev-parse --verify HEAD)" &&
+
+	test_commit A1 &&
+	test_commit A2 &&
+	git reset --hard $base &&
+	test_commit B1 &&
+	test_tick &&
+	git merge -m "Merge branch A" A2 &&
+
+	git checkout -b upstream-with-a2 $base &&
+	test_tick &&
+	git cherry-pick A2 &&
+
+	git checkout already-upstream &&
+	test_tick &&
+	git rebase -i -r upstream-with-a2 &&
+	test_cmp_graph upstream-with-a2.. <<-\EOF
+	*   Merge branch A
+	|\
+	| * A1
+	* | B1
+	|/
+	o A2
+	EOF
+
+Switched to a new branch 'already-upstream'
+[already-upstream cac3b13] A1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 f.t
-Previous HEAD position was 09e072f f
-HEAD is now at 1bd0260 d
-[detached HEAD 35a5a4f] n
+ create mode 100644 A1.t
+[already-upstream 0466126] A2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 n.t
-[detached HEAD a60ff6b] o
+ create mode 100644 A2.t
+HEAD is now at c2c3fe3 Merge the topic branch 'onebranch'
+[already-upstream fa07690] B1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 o.t
-Merge made by the 'ort' strategy.
- e.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
+ create mode 100644 B1.t
 Merge made by the 'ort' strategy.
- c.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Previous HEAD position was 253142b v
-HEAD is now at a60ff6b o
-[detached HEAD 6fadda8] z
+ A1.t | 1 +
+ A2.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 A1.t
+ create mode 100644 A2.t
+Switched to a new branch 'upstream-with-a2'
+[upstream-with-a2 071ab27] A2
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 z.t
-ok 1 - setup of non-linear-history
+ create mode 100644 A2.t
+Switched to branch 'already-upstream'
+warning: skipped previously applied commit 0466126
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/already-upstream.
+ok 11 - with a branch tip that was cherry-picked already
 
-expecting success of 3425.2 'rebase --apply after merge from upstream': 
-		reset_rebase &&
-		git rebase --apply e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 6fadda8 z
-First, rewinding head to replay your work on top of it...
-Applying: n
-Applying: o
-ok 2 - rebase --apply after merge from upstream
+expecting success of 3430.12 '--no-rebase-merges countermands --rebase-merges': 
+	git checkout -b no-rebase-merges E &&
+	git rebase --rebase-merges --no-rebase-merges C &&
+	test_cmp_graph C.. <<-\EOF
+	* B
+	* D
+	o C
+	EOF
 
-expecting success of 3425.3 'rebase -m after merge from upstream': 
-		reset_rebase &&
-		git rebase -m e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 3 - rebase -m after merge from upstream
+Switched to a new branch 'no-rebase-merges'
+Rebasing (2/2)
Successfully rebased and updated refs/heads/no-rebase-merges.
+ok 12 - --no-rebase-merges countermands --rebase-merges
 
-expecting success of 3425.4 'rebase -i after merge from upstream': 
-		reset_rebase &&
-		git rebase -i e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 4 - rebase -i after merge from upstream
+expecting success of 3430.13 'do not rebase cousins unless asked for': 
+	git checkout -b cousins main &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase -r HEAD^ &&
+	test_cmp_rev HEAD $before &&
+	test_tick &&
+	git rebase --rebase-merges=rebase-cousins HEAD^ &&
+	test_cmp_graph HEAD^.. <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	|/
+	o H
+	EOF
 
-expecting success of 3425.5 'rebase --apply of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase --apply d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-First, rewinding head to replay your work on top of it...
-Applying: n
-Applying: o
-Applying: e
-ok 5 - rebase --apply of non-linear history is linearized in place
+Switched to a new branch 'cousins'
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
+ok 13 - do not rebase cousins unless asked for
 
-expecting success of 3425.6 'rebase -m of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase -m d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at 9e9424c e
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 6 - rebase -m of non-linear history is linearized in place
+expecting success of 3430.14 'rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins': 
+	test_config rebase.rebaseMerges rebase-cousins &&
+	git checkout -b config-rebase-cousins main &&
+	git rebase HEAD^ &&
+	test_cmp_graph HEAD^.. <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	|/
+	o H
+	EOF
 
-expecting success of 3425.7 'rebase -i of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase -i d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at ef67882 e
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 7 - rebase -i of non-linear history is linearized in place
+Switched to a new branch 'config-rebase-cousins'
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/config-rebase-cousins.
+ok 14 - rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins
 
-expecting success of 3425.8 'rebase --apply of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase --apply c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at ef67882 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: n
-Applying: o
-Applying: e
-ok 8 - rebase --apply of non-linear history is linearized upstream
+expecting success of 3430.15 '--no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins': 
+	test_config rebase.rebaseMerges no-rebase-cousins &&
+	git checkout -b override-config-no-rebase-cousins E &&
+	git rebase --no-rebase-merges C &&
+	test_cmp_graph C.. <<-\EOF
+	* B
+	* D
+	o C
+	EOF
 
-expecting success of 3425.9 'rebase -m of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase -m c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 9 - rebase -m of non-linear history is linearized upstream
+Switched to a new branch 'override-config-no-rebase-cousins'
+Rebasing (2/2)
Successfully rebased and updated refs/heads/override-config-no-rebase-cousins.
+ok 15 - --no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins
 
-expecting success of 3425.10 'rebase -i of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase -i c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 10 - rebase -i of non-linear history is linearized upstream
+expecting success of 3430.16 '--rebase-merges overrides rebase.rebaseMerges=rebase-cousins': 
+	test_config rebase.rebaseMerges rebase-cousins &&
+	git checkout -b override-config-rebase-cousins E &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase --rebase-merges C &&
+	test_cmp_rev HEAD $before
 
-expecting success of 3425.11 'rebase --apply of non-linear history with merges after upstream merge is linearized': 
-		reset_rebase &&
-		git rebase --apply c v &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: n
-Applying: o
-Applying: e
-ok 11 - rebase --apply of non-linear history with merges after upstream merge is linearized
+Switched to a new branch 'override-config-rebase-cousins'
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/override-config-rebase-cousins.
+ok 16 - --rebase-merges overrides rebase.rebaseMerges=rebase-cousins
 
-expecting success of 3425.12 'rebase -m of non-linear history with merges after upstream merge is linearized': 
-		reset_rebase &&
-		git rebase -m c v &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 12 - rebase -m of non-linear history with merges after upstream merge is linearized
+expecting success of 3430.17 'refs/rewritten/* is worktree-local': 
+	git worktree add wt &&
+	cat >wt/script-from-scratch <<-\EOF &&
+	label xyz
+	exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
+	exec git rev-parse --verify refs/rewritten/xyz >b
+	EOF
 
-expecting success of 3425.13 'rebase -i of non-linear history with merges after upstream merge is linearized': 
-		reset_rebase &&
-		git rebase -i c v &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 13 - rebase -i of non-linear history with merges after upstream merge is linearized
+	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
+	git -C wt rebase -i HEAD &&
+	test_must_be_empty wt/a &&
+	test_cmp_rev HEAD "$(cat wt/b)"
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3427-rebase-subtree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3427-rebase-subtree/.git/
-expecting success of 3427.1 'setup': 
-	test_commit README &&
+Preparing worktree (new branch 'wt')
+HEAD is now at 2051b56 E
+Rebasing (1/3)
Rebasing (2/3)
Executing: GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
+fatal: Needed a single revision
+Rebasing (3/3)
Executing: git rev-parse --verify refs/rewritten/xyz >b
+Successfully rebased and updated refs/heads/wt.
+ok 17 - refs/rewritten/* is worktree-local
 
-	git init files &&
-	test_commit -C files topic_1 &&
-	test_commit -C files topic_2 &&
-	test_commit -C files topic_3 &&
+expecting success of 3430.18 '--abort cleans up refs/rewritten': 
+	git checkout -b abort-cleans-refs-rewritten H &&
+	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
+	git rev-parse --verify refs/rewritten/onto &&
+	git rebase --abort &&
+	test_must_fail git rev-parse --verify refs/rewritten/onto
 
-	: 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" &&
+Switched to a new branch 'abort-cleans-refs-rewritten'
+Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
+2051b561a3f30f5455d33a5269d3851790a86f42
+fatal: Needed a single revision
+ok 18 - --abort cleans up refs/rewritten
 
-	: add two extra commits to rebase &&
-	test_commit -C files_subtree topic_4 &&
-	test_commit files_subtree/topic_5 &&
+expecting success of 3430.19 '--quit cleans up refs/rewritten': 
+	git checkout -b quit-cleans-refs-rewritten H &&
+	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
+	git rev-parse --verify refs/rewritten/onto &&
+	git rebase --quit &&
+	test_must_fail git rev-parse --verify refs/rewritten/onto
 
-	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
+Switched to a new branch 'quit-cleans-refs-rewritten'
+Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
+2051b561a3f30f5455d33a5269d3851790a86f42
+fatal: Needed a single revision
+ok 19 - --quit cleans up refs/rewritten
 
-[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.48.0~rc1+next.20250101/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
+expecting success of 3430.20 'post-rewrite hook and fixups work for merges': 
+	git checkout -b post-rewrite H &&
+	test_commit same1 &&
+	git reset --hard HEAD^ &&
+	test_commit same2 &&
+	git merge -m "to fix up" same1 &&
+	echo same old same old >same2.t &&
+	test_tick &&
+	git commit --fixup HEAD same2.t &&
+	fixup="$(git rev-parse HEAD)" &&
+
+	test_hook post-rewrite <<-\EOF &&
+	cat >actual
+	EOF
+
+	test_tick &&
+	git rebase -i --autosquash -r HEAD^^^ &&
+	printf "%s %s\n%s %s\n%s %s\n%s %s\n" >expect $(git rev-parse \
+		$fixup^^2 HEAD^2 \
+		$fixup^^ HEAD^ \
+		$fixup^ HEAD \
+		$fixup HEAD) &&
+	test_cmp expect actual
+
+Switched to a new branch 'post-rewrite'
+[post-rewrite 7b22597] same1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 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
+ create mode 100644 same1.t
+HEAD is now at 233d48a H
+[post-rewrite 60bad05] same2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 files_subtree/topic_4.t
-[main 76d9147] files_subtree/topic_5
- Author: A U Thor <author@example.com>
+ create mode 100644 same2.t
+Merge made by the 'ort' strategy.
+ same1.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 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
+ create mode 100644 same1.t
+[post-rewrite 621ea5d] fixup! to fix up
  Author: A U Thor <author@example.com>
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Successfully rebased and updated refs/heads/post-rewrite.
+ok 20 - post-rewrite hook and fixups work for merges
 
-expecting success of 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"
+expecting success of 3430.21 'refuse to merge ancestors of HEAD': 
+	echo "merge HEAD^" >script-from-scratch &&
+	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
+	before="$(git rev-parse HEAD)" &&
+	git rebase -i HEAD &&
+	test_cmp_rev HEAD $before
 
-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:
+Rebasing (1/1)
Successfully rebased and updated refs/heads/post-rewrite.
+ok 21 - refuse to merge ancestors of HEAD
 
-    git commit --allow-empty
+expecting success of 3430.22 'root commits': 
+	git checkout --orphan unrelated &&
+	test_commit --author "Parsnip <root@example.com>" second-root &&
+	test_commit third-root &&
+	cat >script-from-scratch <<-\EOF &&
+	pick third-root
+	label first-branch
+	reset [new root]
+	pick second-root
+	merge first-branch # Merge the 3rd root
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i --force-rebase --root -r &&
+	test "Parsnip" = "$(git show -s --format=%an HEAD^)" &&
+	test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) &&
+	test $(git rev-parse second-root:second-root.t) = \
+		$(git rev-parse HEAD^:second-root.t) &&
+	test_cmp_graph HEAD <<-\EOF &&
+	*   Merge the 3rd root
+	|\
+	| * third-root
+	* second-root
+	EOF
 
-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")
+	: fast forward if possible &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_might_fail git config --unset sequence.editor &&
+	test_tick &&
+	git rebase -i --root -r &&
+	test_cmp_rev HEAD $before
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	files/
+Switched to a new branch 'unrelated'
+[unrelated (root-commit) b54e30e] second-root
+ Author: Parsnip <root@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 A.t
+ create mode 100644 B.t
+ create mode 100644 C.t
+ create mode 100644 D.t
+ create mode 100644 F.t
+ create mode 100644 G.t
+ create mode 100644 same1.t
+ create mode 100644 same2.t
+ create mode 100644 second-root.t
+[unrelated d18eb0b] third-root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third-root.t
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD 94a1433] Merge the 3rd root
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:41:13 2005 -0700
+Successfully rebased and updated refs/heads/unrelated.
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/unrelated.
+ok 22 - root commits
 
-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
+expecting success of 3430.23 'a "merge" into a root commit is a fast-forward': 
+	head=$(git rev-parse HEAD) &&
+	cat >script-from-scratch <<-EOF &&
+	reset [new root]
+	merge $head
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r HEAD^ &&
+	test_cmp_rev HEAD $head
 
-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"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/unrelated.
+ok 23 - a "merge" into a root commit is a fast-forward
 
-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:
+expecting success of 3430.24 'A root commit can be a cousin, treat it that way': 
+	git checkout --orphan khnum &&
+	test_commit yama &&
+	git checkout -b asherah main &&
+	test_commit shamkat &&
+	git merge --allow-unrelated-histories khnum &&
+	test_tick &&
+	git rebase -f -r HEAD^ &&
+	test_cmp_rev ! HEAD^2 khnum &&
+	test_cmp_graph HEAD^.. <<-\EOF &&
+	*   Merge branch 'khnum' into asherah
+	|\
+	| * yama
+	o shamkat
+	EOF
+	test_tick &&
+	git rebase --rebase-merges=rebase-cousins HEAD^ &&
+	test_cmp_graph HEAD^.. <<-\EOF
+	*   Merge branch 'khnum' into asherah
+	|\
+	| * yama
+	|/
+	o shamkat
+	EOF
 
-    git commit --allow-empty
+Switched to a new branch 'khnum'
+[khnum (root-commit) 467d393] yama
+ Author: A U Thor <author@example.com>
+ 11 files changed, 11 insertions(+)
+ create mode 100644 A.t
+ create mode 100644 B.t
+ create mode 100644 C.t
+ create mode 100644 D.t
+ create mode 100644 F.t
+ create mode 100644 G.t
+ create mode 100644 same1.t
+ create mode 100644 same2.t
+ create mode 100644 second-root.t
+ create mode 100644 third-root.t
+ create mode 100644 yama.t
+Switched to a new branch 'asherah'
+[asherah 1bf96fb] shamkat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shamkat.t
+Merge made by the 'ort' strategy.
+ C.t           | 1 +
+ F.t           | 1 +
+ same1.t       | 1 +
+ same2.t       | 1 +
+ second-root.t | 1 +
+ third-root.t  | 1 +
+ yama.t        | 1 +
+ 7 files changed, 7 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 F.t
+ create mode 100644 same1.t
+ create mode 100644 same2.t
+ create mode 100644 second-root.t
+ create mode 100644 third-root.t
+ create mode 100644 yama.t
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
+ok 24 - A root commit can be a cousin, treat it that way
 
-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")
+expecting success of 3430.25 'labels that are object IDs are rewritten': 
+	git checkout --detach B &&
+	test_commit I &&
+	third=$(git rev-parse HEAD) &&
+	git checkout -b labels main &&
+	git merge --no-commit $third &&
+	test_tick &&
+	git commit -m "Merge commit '$third' into labels" &&
+	echo noop >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r A &&
+	grep "^label $third-" .git/ORIGINAL-TODO &&
+	! grep "^label $third$" .git/ORIGINAL-TODO
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	files/
+HEAD is now at d9df450 B
+[detached HEAD fe616a2] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Previous HEAD position was fe616a2 I
+Switched to a new branch 'labels'
+Automatic merge went well; stopped before committing as requested
+[labels c2d3038] Merge commit 'fe616a237dd65b590ca6e0198de60da220f3d650' into labels
+ Author: A U Thor <author@example.com>
+Successfully rebased and updated refs/heads/labels.
+label fe616a237dd65b590ca6e0198de60da220f3d650-2
+ok 25 - labels that are object IDs are rewritten
 
-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
+expecting success of 3430.26 'octopus merges': 
+	git checkout -b three &&
+	test_commit before-octopus &&
+	test_commit three &&
+	git checkout -b two HEAD^ &&
+	test_commit two &&
+	git checkout -b one HEAD^ &&
+	test_commit one &&
+	test_tick &&
+	(GIT_AUTHOR_NAME="Hank" GIT_AUTHOR_EMAIL="hank@sea.world" \
+	 git merge -m "Tüntenfüsch" two three) &&
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3421-rebase-topology-linear.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3421-rebase-topology-linear/.git/
-expecting success of 3421.1 'setup': 
-	test_commit a &&
-	test_commit b &&
-	test_commit c &&
-	git checkout b &&
-	test_commit d &&
-	test_commit e
+	: fast forward if possible &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase -i -r HEAD^^ &&
+	test_cmp_rev HEAD $before &&
 
-[master (root-commit) ce450c7] a
+	test_tick &&
+	git rebase -i --force-rebase -r HEAD^^ &&
+	test "Hank" = "$(git show -s --format=%an HEAD)" &&
+	test "$before" != $(git rev-parse HEAD) &&
+	test_cmp_graph HEAD^^.. <<-\EOF
+	*-.   Tüntenfüsch
+	|\ \
+	| | * three
+	| * | two
+	| |/
+	* / one
+	|/
+	o before-octopus
+	EOF
+
+Switched to a new branch 'three'
+[three 470fcca] before-octopus
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[master 020ea9b] b
+ create mode 100644 before-octopus.t
+[three e66d291] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[master d9ea348] c
+ create mode 100644 three.t
+Switched to a new branch 'two'
+[two a4936a4] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Note: switching to 'b'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ create mode 100644 two.t
+Switched to a new branch 'one'
+[one 05ee3b8] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+warning: refname 'two' is ambiguous.
+warning: refname 'three' is ambiguous.
+Trying simple merge with two
+Trying simple merge with three
+Merge made by the 'octopus' strategy.
+ three.t | 1 +
+ two.t   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 three.t
+ create mode 100644 two.t
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Successfully rebased and updated refs/heads/one.
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Trying simple merge with 0f6eed9023c4e296d1c0ee55e03ff8df76f0000a
+Trying simple merge with 890212b565584e3c1fab7e2e887b673178afac2b
+Merge made by the 'octopus' strategy.
+Successfully rebased and updated refs/heads/one.
+ok 26 - octopus merges
 
-  git switch -c <new-branch-name>
+expecting success of 3430.27 'with --autosquash and --exec': 
+	git checkout -b with-exec H &&
+	echo Booh >B.t &&
+	test_tick &&
+	git commit --fixup B B.t &&
+	write_script show.sh <<-\EOF &&
+	subject="$(git show -s --format=%s HEAD)"
+	content="$(git diff HEAD^ HEAD | tail -n 1)"
+	echo "$subject: $content"
+	EOF
+	test_tick &&
+	git rebase -ir --autosquash --exec ./show.sh A >actual &&
+	grep "B: +Booh" actual &&
+	grep "E: +Booh" actual &&
+	grep "G: +G" actual
 
-Or undo this operation with:
+Switched to a new branch 'with-exec'
+[with-exec 63df3da] fixup! B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/22)
Rebasing (2/22)
Rebasing (3/22)
Rebasing (4/22)
Rebasing (5/22)
Executing: ./show.sh
+Rebasing (6/22)
Rebasing (7/22)
Rebasing (8/22)
Rebasing (9/22)
Executing: ./show.sh
+Rebasing (10/22)
Rebasing (11/22)
Rebasing (12/22)
Executing: ./show.sh
+Rebasing (13/22)
Rebasing (14/22)
Executing: ./show.sh
+Rebasing (15/22)
Rebasing (16/22)
Rebasing (17/22)
Rebasing (18/22)
Executing: ./show.sh
+Rebasing (19/22)
Rebasing (20/22)
Executing: ./show.sh
+Rebasing (21/22)
Rebasing (22/22)
Executing: ./show.sh
+Successfully rebased and updated refs/heads/with-exec.
+B: +Booh
+E: +Booh
+G: +G
+ok 27 - with --autosquash and --exec
 
-  git switch -
+expecting success of 3430.28 '--continue after resolving conflicts after a merge': 
+	git checkout -b already-has-g E &&
+	git cherry-pick E..G &&
+	test_commit H2 &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	git checkout -b conflicts-in-merge H &&
+	test_commit H2 H2.t conflicts H2-conflict &&
+	test_must_fail git rebase -r already-has-g &&
+	grep conflicts H2.t &&
+	echo resolved >H2.t &&
+	git add -u &&
+	git rebase --continue &&
+	test_must_fail git rev-parse --verify HEAD^2 &&
+	test_path_is_missing .git/MERGE_HEAD
 
-HEAD is now at 020ea9b b
-[detached HEAD 1bd0260] d
+Switched to a new branch 'already-has-g'
+[already-has-g b1594c7] F
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 d.t
-[detached HEAD 67a7211] e
+ create mode 100644 F.t
+[already-has-g 0944233] G
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 e.t
-ok 1 - setup
-
-expecting success of 3421.2 'simple rebase --apply': 
-		reset_rebase &&
-		git rebase --apply c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: e
-ok 2 - simple rebase --apply
-
-expecting success of 3421.3 'simple rebase -m': 
-		reset_rebase &&
-		git rebase -m c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 3 - simple rebase -m
-
-expecting success of 3421.4 'simple rebase -i': 
-		reset_rebase &&
-		git rebase -i c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 4 - simple rebase -i
-
-expecting success of 3421.5 'setup branches and remote tracking': 
-	git tag -l >tags &&
-	for tag in $(cat tags)
-	do
-		git branch branch-$tag $tag || return 1
-	done &&
-	git remote add origin "file://$PWD" &&
-	git fetch origin
-
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3421-rebase-topology-linear
- * [new branch]      branch-a   -> origin/branch-a
- * [new branch]      branch-b   -> origin/branch-b
- * [new branch]      branch-c   -> origin/branch-c
- * [new branch]      branch-d   -> origin/branch-d
- * [new branch]      branch-e   -> origin/branch-e
- * [new branch]      master     -> origin/master
-ok 5 - setup branches and remote tracking
-
-expecting success of 3421.6 'rebase --apply is no-op if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --apply b e &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Removing tags
-Current branch e is up to date.
-ok 6 - rebase --apply is no-op if upstream is an ancestor
+ create mode 100644 G.t
+[already-has-g 7148914] H2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H2.t
+Switched to a new branch 'conflicts-in-merge'
+[conflicts-in-merge 43d4486] H2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H2.t
+warning: skipped previously applied commit ca2c861
+warning: skipped previously applied commit 088b00a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging H2.t
+CONFLICT (add/add): Merge conflict in H2.t
+error: could not apply 43d4486... H2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 43d4486... H2
+conflicts
+[detached HEAD a4aa1f0] H2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/conflicts-in-merge.
+fatal: Needed a single revision
+ok 28 - --continue after resolving conflicts after a merge
 
-expecting success of 3421.7 'rebase -m is no-op if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -m b e &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Current branch e is up to date.
-ok 7 - rebase -m is no-op if upstream is an ancestor
+expecting success of 3430.29 '--rebase-merges with strategies': 
+	git checkout -b with-a-strategy F &&
+	test_tick &&
+	git merge -m "Merge conflicting-G" conflicting-G &&
 
-expecting success of 3421.8 'rebase -i is no-op if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -i b e &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 8 - rebase -i is no-op if upstream is an ancestor
+	: first, test with a merge strategy option &&
+	git rebase -ir -Xtheirs G &&
+	echo conflicting-G >expect &&
+	test_cmp expect G.t &&
 
-expecting success of 3421.9 'rebase --apply -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --apply -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Current branch e is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: e
-ok 9 - rebase --apply -f rewrites even if upstream is an ancestor
+	: now, try with a merge strategy other than recursive &&
+	git reset --hard @{1} &&
+	write_script git-merge-override <<-\EOF &&
+	echo overridden$1 >>G.t
+	git add G.t
+	EOF
+	PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
+	test_write_lines G overridden--xopt >expect &&
+	test_cmp expect G.t
 
-expecting success of 3421.10 'rebase --fork-point -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --fork-point -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 10 - rebase --fork-point -f rewrites even if upstream is an ancestor
+Switched to a new branch 'with-a-strategy'
+Merge made by the 'ort' strategy.
+ G.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging G.t
+Merge made by the 'ort' strategy.
+Successfully rebased and updated refs/heads/with-a-strategy.
+HEAD is now at 00d6684 Merge conflicting-G
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Merge made by the 'override' strategy.
+Successfully rebased and updated refs/heads/with-a-strategy.
+ok 29 - --rebase-merges with strategies
 
-expecting success of 3421.11 'rebase -m -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -m -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 11 - rebase -m -f rewrites even if upstream is an ancestor
+expecting success of 3430.30 '--rebase-merges with commit that can generate bad characters for filename': 
+	git checkout -b colon-in-label E &&
+	git merge -m "colon: this should work" G &&
+	git rebase --rebase-merges --force-rebase E
 
-expecting success of 3421.12 'rebase -i -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -i -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 12 - rebase -i -f rewrites even if upstream is an ancestor
+Switched to a new branch 'colon-in-label'
+Merge made by the 'ort' strategy.
+ F.t | 1 +
+ G.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 F.t
+ create mode 100644 G.t
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/colon-in-label.
+ok 30 - --rebase-merges with commit that can generate bad characters for filename
 
-expecting success of 3421.13 'rebase --apply -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --apply -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch branch-e is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: e
-ok 13 - rebase --apply -f rewrites even if remote upstream is an ancestor
+expecting success of 3430.31 '--rebase-merges with message matched with onto label': 
+	git checkout -b onto-label E &&
+	git merge -m onto G &&
+	git rebase --rebase-merges --force-rebase E &&
+	test_cmp_graph <<-\EOF
+	*   onto
+	|\
+	| * G
+	| * F
+	* |   E
+	|\ \
+	| * | B
+	* | | D
+	| |/
+	|/|
+	* | C
+	|/
+	* A
+	EOF
 
-expecting success of 3421.14 'rebase --fork-point -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --fork-point -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch branch-e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
-ok 14 - rebase --fork-point -f rewrites even if remote upstream is an ancestor
+Switched to a new branch 'onto-label'
+Merge made by the 'ort' strategy.
+ F.t | 1 +
+ G.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 F.t
+ create mode 100644 G.t
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/onto-label.
+ok 31 - --rebase-merges with message matched with onto label
 
-expecting success of 3421.15 'rebase -m -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -m -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch branch-e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
-ok 15 - rebase -m -f rewrites even if remote upstream is an ancestor
+expecting success of 3430.32 'progress shows the correct total': 
+	git checkout -b progress H &&
+	git rebase --rebase-merges --force-rebase --verbose A 2> err &&
+	# Expecting "Rebasing (N/14)" here, no bogus total number
+	grep "^Rebasing.*/14.$" err >progress &&
+	test_line_count = 14 progress
 
-expecting success of 3421.16 'rebase -i -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -i -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
-ok 16 - rebase -i -f rewrites even if remote upstream is an ancestor
+Switched to a new branch 'progress'
+Changes from 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 to 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050:
+ok 32 - progress shows the correct total
 
-expecting success of 3421.17 'rebase --apply fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase --apply e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-First, rewinding head to replay your work on top of it...
-Fast-forwarded b to e.
-ok 17 - rebase --apply fast-forwards from ancestor of upstream
+expecting success of 3430.33 'truncate label names': 
+	commit=$(git commit-tree -p HEAD^ -p HEAD -m "0123456789 我 123" HEAD^{tree}) &&
+	git merge --ff-only $commit &&
 
-expecting success of 3421.18 'rebase --fork-point fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase --fork-point e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 18 - rebase --fork-point fast-forwards from ancestor of upstream
+	done="$(git rev-parse --git-path rebase-merge/done)" &&
+	git -c rebase.maxLabelLength=14 rebase --rebase-merges -x "cp \"$done\" out" --root &&
+	grep "label 0123456789-我$" out &&
+	git -c rebase.maxLabelLength=13 rebase --rebase-merges -x "cp \"$done\" out" --root &&
+	grep "label 0123456789-$" out
 
-expecting success of 3421.19 'rebase -m fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase -m e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 19 - rebase -m fast-forwards from ancestor of upstream
+Updating f13795a..96fcf0c
+Fast-forward
+Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
+Successfully rebased and updated refs/heads/progress.
+label 0123456789-我
+Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
+Successfully rebased and updated refs/heads/progress.
+label 0123456789-
+ok 33 - truncate label names
 
-expecting success of 3421.20 'rebase -i fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase -i e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 20 - rebase -i fast-forwards from ancestor of upstream
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3502-cherry-pick-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3502-cherry-pick-merge/.git/
+expecting success of 3502.1 'setup': 
 
-expecting success of 3421.21 'setup of linear history for range selection tests': 
-	git checkout c &&
-	test_commit g &&
-	revert h g &&
-	git checkout d &&
-	cherry_pick gp g &&
-	test_commit i &&
-	git checkout b &&
-	test_commit f
+	>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
 
-Previous HEAD position was 67a7211 e
-HEAD is now at d9ea348 c
-[detached HEAD 5573dba] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-[detached HEAD 09e6546] h
+
+[main (root-commit) 5c8827d] Initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 g.t
-Previous HEAD position was 09e6546 h
-HEAD is now at 1bd0260 d
-[detached HEAD 00eccdb] gp
+ 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(+)
- create mode 100644 g.t
-[detached HEAD 3317c29] i
+Switched to branch 'side'
+[side 4fb21f2] add line to B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 i.t
-Previous HEAD position was 3317c29 i
-HEAD is now at 020ea9b b
-[detached HEAD 09e072f] f
- Author: A U Thor <author@example.com>
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 f.t
-ok 21 - setup of linear history for range selection tests
+ok 1 - setup
 
-expecting success of 3421.22 'rebase --apply drops patches in upstream': 
-		reset_rebase &&
-		git rebase --apply h i &&
-		test_cmp_rev h HEAD~2 &&
-		test_linear_range 'd i' h..
-	
-fatal: no rebase in progress
-HEAD is now at 09e072f f
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: i
-ok 22 - rebase --apply drops patches in upstream
+expecting success of 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
 
-expecting success of 3421.23 'rebase -m drops patches in upstream': 
-		reset_rebase &&
-		git rebase -m h i &&
-		test_cmp_rev h HEAD~2 &&
-		test_linear_range 'd i' h..
-	
-fatal: no rebase in progress
-HEAD is now at 5c158e9 i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 23 - rebase -m drops patches in upstream
+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 3421.24 'rebase -i drops patches in upstream': 
-		reset_rebase &&
-		git rebase -i h i &&
-		test_cmp_rev h HEAD~2 &&
-		test_linear_range 'd i' h..
-	
-fatal: no rebase in progress
-HEAD is now at 5c158e9 i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 24 - rebase -i drops patches in upstream
+expecting success of 3502.3 'cherry-pick explicit first parent of a non-merge': 
 
-expecting success of 3421.25 'rebase --apply can drop last patch if in upstream': 
-		reset_rebase &&
-		git rebase --apply h gp &&
-		test_cmp_rev h HEAD^ &&
-		test_linear_range 'd' h..
-	
-fatal: no rebase in progress
-HEAD is now at 5c158e9 i
-First, rewinding head to replay your work on top of it...
-Applying: d
-ok 25 - rebase --apply can drop last patch if in upstream
+	git reset --hard &&
+	git checkout a^0 &&
+	git cherry-pick -m 1 b &&
+	git diff --exit-code c --
 
-expecting success of 3421.26 'rebase -m can drop last patch if in upstream': 
-		reset_rebase &&
-		git rebase -m h gp &&
-		test_cmp_rev h HEAD^ &&
-		test_linear_range 'd' h..
-	
-fatal: no rebase in progress
-HEAD is now at e937a8e d
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 26 - rebase -m can drop last patch if in upstream
 
-expecting success of 3421.27 'rebase -i can drop last patch if in upstream': 
-		reset_rebase &&
-		git rebase -i h gp &&
-		test_cmp_rev h HEAD^ &&
-		test_linear_range 'd' h..
-	
-fatal: no rebase in progress
-HEAD is now at e937a8e d
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 27 - rebase -i can drop last patch if in upstream
+HEAD is now at c81ef52 Merge branch 'side'
+Note: switching to 'a^0'.
 
-expecting success of 3421.28 'rebase --apply --onto drops patches in upstream': 
-		reset_rebase &&
-		git rebase --apply --onto f h i &&
-		test_cmp_rev f HEAD~2 &&
-		test_linear_range 'd i' f..
-	
-fatal: no rebase in progress
-HEAD is now at e937a8e d
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: i
-ok 28 - rebase --apply --onto drops patches in upstream
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 3421.29 'rebase -m --onto drops patches in upstream': 
-		reset_rebase &&
-		git rebase -m --onto f h i &&
-		test_cmp_rev f HEAD~2 &&
-		test_linear_range 'd i' f..
-	
-fatal: no rebase in progress
-HEAD is now at bcc98eb i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 29 - rebase -m --onto drops patches in upstream
+If you want to 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 3421.30 'rebase -i --onto drops patches in upstream': 
-		reset_rebase &&
-		git rebase -i --onto f h i &&
-		test_cmp_rev f HEAD~2 &&
-		test_linear_range 'd i' f..
-	
-fatal: no rebase in progress
-HEAD is now at bcc98eb i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 30 - rebase -i --onto drops patches in upstream
+  git switch -c <new-branch-name>
 
-expecting success of 3421.31 'rebase --apply --onto does not drop patches in onto': 
-		reset_rebase &&
-		git rebase --apply --onto h f i &&
-		test_cmp_rev h HEAD~3 &&
-		test_linear_range 'd gp i' h..
-	
-fatal: no rebase in progress
-HEAD is now at bcc98eb i
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: gp
-Applying: i
-ok 31 - rebase --apply --onto does not drop patches in onto
+Or undo this operation with:
 
-expecting success of 3421.32 'rebase -m --onto does not drop patches in onto': 
-		reset_rebase &&
-		git rebase -m --onto h f i &&
-		test_cmp_rev h HEAD~3 &&
-		test_linear_range 'd gp i' h..
-	
-fatal: no rebase in progress
-HEAD is now at bbe8f41 i
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 32 - rebase -m --onto does not drop patches in onto
+  git switch -
 
-expecting success of 3421.33 'rebase -i --onto does not drop patches in onto': 
-		reset_rebase &&
-		git rebase -i --onto h f i &&
-		test_cmp_rev h HEAD~3 &&
-		test_linear_range 'd gp i' h..
-	
-fatal: no rebase in progress
-HEAD is now at bbe8f41 i
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 33 - rebase -i --onto does not drop patches in onto
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3421.34 'setup of linear history for empty commit tests': 
-	git checkout c &&
-	make_empty j &&
-	git checkout d &&
-	make_empty k &&
-	test_commit l
+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
 
-Warning: you are leaving 3 commits behind, not connected to
+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:
 
-  bbe8f41 i
-  4a12efe gp
-  e937a8e d
+  99ce4f9 add line to B
 
-If you want to keep them by creating a new branch, this may be a good time
+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> bbe8f41
+ git branch <new-branch-name> 99ce4f9
 
-HEAD is now at d9ea348 c
-[detached HEAD 5b67321] j
- Author: A U Thor <author@example.com>
-Previous HEAD position was 5b67321 j
-HEAD is now at 1bd0260 d
-[detached HEAD 753370d] k
- Author: A U Thor <author@example.com>
-[detached HEAD 49cf309] l
+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(+)
- create mode 100644 l.t
-ok 34 - setup of linear history for empty commit tests
+ok 5 - cherry pick a merge (1)
 
-checking known breakage of 3421.35 'rebase --apply keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase --apply j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 49cf309 l
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: l
-error: two revisions point to different objects:
-  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
-  'HEAD~4': 020ea9b5b2051d958f4737afacdc8821a33ac9a9
-not ok 35 - rebase --apply keeps begin-empty commits # TODO known breakage
+expecting success of 3502.6 'cherry pick a merge (2)': 
 
-expecting success of 3421.36 'rebase -m keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase -m j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 1612308 l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 36 - rebase -m keeps begin-empty commits
+	git reset --hard &&
+	git checkout b^0 &&
+	git cherry-pick -m 2 c &&
+	git diff --exit-code c
 
-expecting success of 3421.37 'rebase -i keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase -i j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 37 - rebase -i keeps begin-empty commits
 
-expecting success of 3421.38 'rebase -m --no-keep-empty drops begin-empty commits': 
-		reset_rebase &&
-		git rebase -m --no-keep-empty c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 38 - rebase -m --no-keep-empty drops begin-empty commits
+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 3421.39 'rebase -i --no-keep-empty drops begin-empty commits': 
-		reset_rebase &&
-		git rebase -i --no-keep-empty c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
-	
-fatal: no rebase in progress
-HEAD is now at ef60b8d l
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 39 - rebase -i --no-keep-empty drops begin-empty commits
+  9d31cba Merge branch 'side'
 
-expecting success of 3421.40 'rebase -m --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase -m --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at ef60b8d l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 40 - rebase -m --keep-empty keeps empty even if already in upstream
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3421.41 'rebase -i --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase -i --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 41 - rebase -i --keep-empty keeps empty even if already in upstream
+ git branch <new-branch-name> 9d31cba
 
-expecting success of 3421.42 'rebase --rebase-merges --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase --rebase-merges --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
-ok 42 - rebase --rebase-merges --keep-empty keeps empty even if already in upstream
+HEAD is now at 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 3421.43 'setup of linear history for test involving root': 
-	git checkout b &&
-	revert m b &&
-	git checkout --orphan disjoint &&
-	git rm -rf . &&
-	test_commit x &&
-	test_commit y &&
-	cherry_pick bp b
+expecting success of 3502.7 'cherry pick a merge relative to nonexistent parent should fail': 
 
-Warning: you are leaving 3 commits behind, not connected to
+	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:
 
-  5395ede l
-  9a731c2 k
-  60768b3 d
+  9554515 Merge branch 'side'
 
-If you want to keep them by creating a new branch, this may be a good time
+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> 5395ede
+ git branch <new-branch-name> 9554515
 
-HEAD is now at 020ea9b b
-[detached HEAD 6db5543] m
+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(-)
- delete mode 100644 b.t
-Switched to a new branch 'disjoint'
-rm 'a.t'
-[disjoint (root-commit) 059091f] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-[disjoint be1e399] y
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 y.t
-[disjoint b7cb922] bp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-ok 43 - setup of linear history for test involving root
+ok 8 - revert explicit first parent of a non-merge
 
-expecting success of 3421.44 'rebase --apply --onto --root': 
-		reset_rebase &&
-		git rebase --apply --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at b7cb922 bp
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 44 - rebase --apply --onto --root
+expecting success of 3502.9 'revert a merge without -m should fail': 
 
-expecting success of 3421.45 'rebase -m --onto --root': 
-		reset_rebase &&
-		git rebase -m --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 45 - rebase -m --onto --root
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert c &&
+	git diff --exit-code c
 
-expecting success of 3421.46 'rebase -i --onto --root': 
-		reset_rebase &&
-		git rebase -i --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 46 - rebase -i --onto --root
 
-expecting success of 3421.47 'rebase --apply without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase --apply c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 47 - rebase --apply without --onto --root with disjoint history
+HEAD is now at 1b3e5cc Revert "add line to B"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3421.48 'rebase -m without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase -m c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 48 - rebase -m without --onto --root with disjoint history
+  1b3e5cc Revert "add line to B"
 
-expecting success of 3421.49 'rebase -i without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase -i c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 49 - rebase -i without --onto --root with disjoint history
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3421.50 'rebase --apply --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase --apply --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 50 - rebase --apply --onto --root drops patch in onto
+ git branch <new-branch-name> 1b3e5cc
 
-expecting success of 3421.51 'rebase -m --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase -m --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 51 - rebase -m --onto --root drops patch in onto
+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 3421.52 'rebase -i --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase -i --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 52 - rebase -i --onto --root drops patch in onto
+expecting success of 3502.10 'revert a merge (1)': 
 
-expecting success of 3421.53 'rebase --apply --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase --apply --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-First, rewinding head to replay your work on top of it...
-Applying: c
-Applying: g
-ok 53 - rebase --apply --onto --root with merge-base does not go to root
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 1 c &&
+	git diff --exit-code a --
 
-expecting success of 3421.54 'rebase -m --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase -m --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 54 - rebase -m --onto --root with merge-base does not go to root
 
-expecting success of 3421.55 'rebase -i --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase -i --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 55 - rebase -i --onto --root with merge-base does not go to root
+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 3421.56 'rebase --apply without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase --apply m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 56 - rebase --apply without --onto --root with disjoint history drops patch in onto
+expecting success of 3502.11 'revert a merge (2)': 
 
-expecting success of 3421.57 'rebase -m without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase -m m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 57 - rebase -m without --onto --root with disjoint history drops patch in onto
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 2 c &&
+	git diff --exit-code b --
 
-expecting success of 3421.58 'rebase -i without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase -i m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 58 - rebase -i without --onto --root with disjoint history drops patch in onto
 
-expecting success of 3421.59 'rebase  --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase  --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 59 - rebase  --root on linear history is a no-op
+HEAD is now at ab594ec Revert "Merge branch 'side'"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3421.60 'rebase -m --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase -m --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 60 - rebase -m --root on linear history is a no-op
+  ab594ec Revert "Merge branch 'side'"
 
-expecting success of 3421.61 'rebase -i --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase -i --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 61 - rebase -i --root on linear history is a no-op
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3421.62 'rebase  -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase  -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 62 - rebase  -f --root on linear history causes re-write
+ git branch <new-branch-name> ab594ec
 
-expecting success of 3421.63 'rebase -m -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase -m -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 8b0b08f c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 63 - rebase -m -f --root on linear history causes re-write
+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 3421.64 'rebase -i -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase -i -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 8b0b08f c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 64 - rebase -i -f --root on linear history causes re-write
+expecting success of 3502.12 'revert a merge relative to nonexistent parent should fail': 
 
-# still have 1 known breakage(s)
-# passed all remaining 63 test(s)
-1..64
+	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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3420-rebase-autostash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 . &&
+*** t3503-cherry-pick-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3503-cherry-pick-root/.git/
+expecting success of 3503.1 'setup': 
+
+	echo first > file1 &&
+	git add file1 &&
 	test_tick &&
-	git commit -m "third commit" &&
-	git checkout -b unrelated-onto-branch main &&
-	echo unrelated >file4 &&
-	git add . &&
+	git commit -m "first" &&
+
+	git symbolic-ref HEAD refs/heads/second &&
+	rm .git/index file1 &&
+	echo second > file2 &&
+	git add file2 &&
 	test_tick &&
-	git commit -m "unrelated commit" &&
-	git checkout -b related-onto-branch main &&
-	echo conflicting-change >file2 &&
-	git add . &&
+	git commit -m "second" &&
+
+	git symbolic-ref HEAD refs/heads/third &&
+	rm .git/index file2 &&
+	echo third > file3 &&
+	git add file3 &&
 	test_tick &&
-	git commit -m "related commit" &&
-	remove_progress_re="$(printf "s/.*\\r//")"
+	git commit -m "third"
 
-[main (root-commit) bfa4f02] initial commit
+
+[main (root-commit) 0c72e4f] 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
- 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
+[second (root-commit) bbcd39a] second
  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
+ create mode 100644 file2
+[third (root-commit) 4911fa6] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file2
+ create mode 100644 file3
 ok 1 - setup
 
-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 3503.2 'cherry-pick a root commit': 
 
-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 checkout second^0 &&
+	git cherry-pick main &&
+	echo first >expect &&
+	test_cmp expect file1
 
-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
 
-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
+Note: switching to 'second^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		echo 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
+If you want to 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 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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at bbcd39a second
+[detached HEAD 3e6f574] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 2 - cherry-pick a root commit
 
-expecting success of 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 3503.3 'revert a root commit': 
 
-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 set 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
+	git revert main &&
+	test_path_is_missing file1
 
-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 set 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 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 set 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
+[detached HEAD 3eb7e0d] Revert "first"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+ok 3 - revert a root commit
 
-expecting success of 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 set 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 3503.4 'cherry-pick a root commit with an external strategy': 
 
-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 set 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
+	git cherry-pick --strategy=resolve main &&
+	echo first >expect &&
+	test_cmp expect file1
 
-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
+Trying simple merge.
+[detached HEAD 54587e2] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 4 - cherry-pick a root commit with an external strategy
 
-Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
-dirty
-ok 16 - rebase --apply: non-conflicting rebase, conflicting stash
+expecting success of 3503.5 'revert a root commit with an external strategy': 
 
-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
+	git revert --strategy=resolve main &&
+	test_path_is_missing file1
 
-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
+Removing file1
+[detached HEAD a457399] Revert "first"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+ok 5 - revert a root commit with an external strategy
 
-expecting success of 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 3503.6 'cherry-pick two root commits': 
 
-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
+	echo first >expect.file1 &&
+	echo second >expect.file2 &&
+	echo third >expect.file3 &&
 
-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
+	git checkout second^0 &&
+	git cherry-pick main third &&
 
-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
+	test_cmp expect.file1 file1 &&
+	test_cmp expect.file2 file2 &&
+	test_cmp expect.file3 file3 &&
+	git rev-parse --verify HEAD^^ &&
+	test_must_fail git rev-parse --verify HEAD^^^
 
-expecting success of 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
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
 
-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 set 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
+  a457399 Revert "first"
+  54587e2 first
+  3eb7e0d Revert "first"
+  3e6f574 first
 
-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 set advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-[detached HEAD 62edf38] second commit
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> a457399
+
+HEAD is now at bbcd39a second
+[detached HEAD 3e6f574] first
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
  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
+[detached HEAD 2069bd1] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+bbcd39af5b7918b8e79c884f958eeddbace1fd46
+fatal: Needed a single revision
+ok 6 - cherry-pick two root commits
 
-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 set 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
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3501-revert-cherry-pick.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3501-revert-cherry-pick/.git/
+expecting success of 3501.1 'setup': 
 
-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 set 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
+	for l in a b c d e f g h i j k l m n o
+	do
+		echo $l$l$l$l$l$l$l$l$l || return 1
+	done >oops &&
 
-expecting success of 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 set 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
+	test_tick &&
+	git add oops &&
+	git commit -m initial &&
+	git tag initial &&
 
-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
+	test_tick &&
+	echo "Add extra line at the end" >>oops &&
+	git commit -a -m added &&
+	git tag added &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	err
-	expect
-	expected
+	test_tick &&
+	git mv oops spoo &&
+	git commit -m rename1 &&
+	git tag rename1 &&
 
-Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
-dirty
-ok 30 - rebase --merge: non-conflicting rebase, conflicting stash
+	test_tick &&
+	git checkout -b side initial &&
+	git mv oops opos &&
+	git commit -m rename2 &&
+	git tag rename2
 
-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
+[main (root-commit) a242c62] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+)
+ create mode 100644 oops
+[main 4399171] added
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 31df260] rename1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename oops => spoo (100%)
+Switched to a new branch 'side'
+[side f6d0551] rename2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename oops => opos (100%)
+ok 1 - setup
 
-expecting success of 3420.32 'rebase --interactive: restore autostash when pre-rebase hook fails': 
-		git checkout -f feature-branch &&
-		test_hook pre-rebase <<-\EOF &&
-		exit 1
-		EOF
+expecting success of 3501.2 'cherry-pick --nonsense': 
 
-		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
+	pos=$(git rev-parse HEAD) &&
+	git diff --exit-code HEAD &&
+	test_must_fail git cherry-pick --nonsense 2>msg &&
+	git diff --exit-code HEAD "$pos" &&
+	test_grep "[Uu]sage:" msg
 
-expecting success of 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
+usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
+ok 2 - cherry-pick --nonsense
 
-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 3501.3 'revert --nonsense': 
 
-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
+	pos=$(git rev-parse HEAD) &&
+	git diff --exit-code HEAD &&
+	test_must_fail git revert --nonsense 2>msg &&
+	git diff --exit-code HEAD "$pos" &&
+	test_grep "[Uu]sage:" msg
 
-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
+usage: git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...
+ok 3 - revert --nonsense
 
-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 3501.4 'cherry-pick after renaming branch': 
 
-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
+	git checkout rename2 &&
+	git cherry-pick added &&
+	test_cmp_rev rename2 HEAD^ &&
+	grep "Add extra line at the end" opos &&
+	git reflog -1 | grep cherry-pick
 
-expecting success of 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 set 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 set advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-[detached HEAD 62edf38] second commit
+Note: switching to 'rename2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f6d0551 rename2
+[detached HEAD 2da2754] added
  Author: A U Thor <author@example.com>
- 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
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+Add extra line at the end
+2da2754 HEAD@{0}: cherry-pick: added
+ok 4 - cherry-pick after renaming branch
 
-expecting success of 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 set 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 3501.5 'revert after renaming branch': 
 
-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 set 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
+	git checkout rename1 &&
+	git revert added &&
+	test_cmp_rev rename1 HEAD^ &&
+	test_path_is_file spoo &&
+	test_cmp_rev initial:oops HEAD:spoo &&
+	git reflog -1 | grep revert
 
-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 set 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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	err
-	expect
-	expected
+  2da2754 added
 
-Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
-dirty
-ok 44 - rebase --interactive: non-conflicting rebase, conflicting stash
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 2da2754
 
-expecting success of 3420.46 'abort rebase -i with --autostash': 
-	test_when_finished "git reset --hard" &&
-	echo uncommitted-content >file0 &&
+HEAD is now at 31df260 rename1
+[detached HEAD 9990ddc] Revert "added"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+9990ddc HEAD@{0}: revert: Revert "added"
+ok 5 - revert after renaming branch
+
+expecting success of 3501.6 'cherry-pick on stat-dirty working tree': 
+	git clone . copy &&
 	(
-		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
+		cd copy &&
+		git checkout initial &&
+		test-tool chmtime +40 oops &&
+		git cherry-pick added
+	)
 
-Created autostash: d9b9f3e
-Applied autostash.
-error: nothing to do
-HEAD is now at 0c4d2f1 third commit
-ok 46 - abort rebase -i with --autostash
+Cloning into 'copy'...
+done.
+Note: switching to '9990ddca844ef3875d864da986dfd141d1a88865'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-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
+If you want to 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 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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	err
-	expect
-	expected
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Switched to a new branch 'with-submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+  9990ddc Revert "added"
 
-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)"
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-Switched to a new branch 'unchanged-branch'
-Created autostash: 84b1204
-Current branch unchanged-branch is up to date.
-Applied autostash.
-ok 50 - branch is left alone when possible
+ git branch <new-branch-name> 9990ddc
 
-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
+HEAD is now at a242c62 initial
+[detached HEAD 096ed54] added
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 6 - cherry-pick on stat-dirty working tree
 
-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 3501.7 'revert forbidden on dirty working tree': 
 
-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
+	echo content >extra_file &&
+	git add extra_file &&
+	test_must_fail git revert HEAD 2>errors &&
+	test_grep "your local changes would be overwritten by " errors
 
-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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3428-rebase-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3428-rebase-signoff/.git/
-expecting success of 3428.1 'setup': 
-	git commit --allow-empty -m "Initial empty commit" &&
-	test_commit first file a &&
-	test_commit second file &&
-	git checkout -b conflict-branch first &&
-	test_commit file-2 file-2 &&
-	test_commit conflict file &&
-	test_commit third file &&
+error: your local changes would be overwritten by revert.
+ok 7 - revert forbidden on dirty working tree
 
-	ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
+expecting success of 3501.8 'cherry-pick on unborn branch': 
+	git switch --orphan unborn &&
+	git rm --cached -r . &&
+	git cherry-pick initial &&
+	git diff --exit-code initial &&
+	test_cmp_rev ! initial HEAD
 
-	# Expected commit message for initial commit after rebase --signoff
-	cat >expected-initial-signed <<-EOF &&
-	Initial empty commit
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	Signed-off-by: $ident
-	EOF
+  9990ddc Revert "added"
 
-	# Expected commit message after rebase --signoff
-	cat >expected-signed <<-EOF &&
-	first
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	Signed-off-by: $ident
-	EOF
+ git branch <new-branch-name> 9990ddc
 
-	# Expected commit message after conflict resolution for rebase --signoff
-	cat >expected-signed-conflict <<-EOF &&
-	third
+Switched to a new branch 'unborn'
+rm 'extra_file'
+[unborn 38e6d75] initial
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 15 insertions(+)
+ create mode 100644 oops
+ok 8 - cherry-pick on unborn branch
 
-	Signed-off-by: $ident
+expecting success of 3501.9 'cherry-pick on unborn branch with --allow-empty': 
+	git checkout --detach &&
+	git branch -D unborn &&
+	git switch --orphan unborn &&
+	git cherry-pick initial --allow-empty &&
+	git diff --exit-code initial &&
+	test_cmp_rev ! initial HEAD
 
-	conflict
+HEAD is now at 38e6d75 initial
+Deleted branch unborn (was 38e6d75).
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	Signed-off-by: $ident
+  38e6d75 initial
 
-	file-2
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	Signed-off-by: $ident
+ git branch <new-branch-name> 38e6d75
 
-	EOF
+Switched to a new branch 'unborn'
+[unborn 38e6d75] initial
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 15 insertions(+)
+ create mode 100644 oops
+ok 9 - cherry-pick on unborn branch with --allow-empty
 
-	# Expected commit message after rebase without --signoff (or with --no-signoff)
-	cat >expected-unsigned <<-EOF &&
-	first
-	EOF
+expecting success of 3501.10 'cherry-pick "-" to pick from previous branch': 
+	git checkout unborn &&
+	test_commit to-pick actual content &&
+	git checkout main &&
+	git cherry-pick - &&
+	echo content >expect &&
+	test_cmp expect actual
 
-	git config alias.rbs "rebase --signoff"
+Already on 'unborn'
+[unborn d9ba711] to-pick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 actual
+Switched to branch 'main'
+[main 7c68b81] to-pick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 actual
+ok 10 - cherry-pick "-" to pick from previous branch
 
-[master (root-commit) 6c54391] Initial empty commit
+expecting success of 3501.11 'cherry-pick "-" is meaningless without checkout': 
+	test_create_repo afresh &&
+	(
+		cd afresh &&
+		test_commit one &&
+		test_commit two &&
+		test_commit three &&
+		test_must_fail git cherry-pick -
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3501-revert-cherry-pick/afresh/.git/
+[main (root-commit) 26cc6ba] one
  Author: A U Thor <author@example.com>
-[master 626aa63] first
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 776892e] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-[master cee64ce] second
+ create mode 100644 two.t
+[main 6c11eb3] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+fatal: bad revision '@{-1}'
+ok 11 - cherry-pick "-" is meaningless without checkout
+
+expecting success of 3501.12 'cherry-pick "-" works with arguments': 
+	git checkout -b side-branch &&
+	test_commit change actual change &&
+	git checkout main &&
+	git cherry-pick -s - &&
+	echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
+	git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
+	test_cmp expect signoff &&
+	echo change >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'side-branch'
+[side-branch 94f7852] change
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflict-branch'
-[conflict-branch 3c3ba6d] file-2
+Switched to branch 'main'
+[main a524e05] change
+ 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 "-" works with arguments
+
+expecting success of 3501.13 'cherry-pick works with dirty renamed file': 
+	test_commit to-rename &&
+	git checkout -b unrelated &&
+	test_commit unrelated &&
+	git checkout @{-1} &&
+	git mv to-rename.t renamed &&
+	test_tick &&
+	git commit -m renamed &&
+	echo modified >renamed &&
+	git cherry-pick refs/heads/unrelated &&
+	test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
+	grep -q "^modified$" renamed
+
+[main 035700e] to-rename
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file-2
-[conflict-branch b53cad1] conflict
+ create mode 100644 to-rename.t
+Switched to a new branch 'unrelated'
+[unrelated ef4075f] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated.t
+Switched to branch 'main'
+[main 356b685] renamed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename to-rename.t => renamed (100%)
+[main d1730b0] unrelated
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated.t
+ok 13 - cherry-pick works with dirty renamed file
+
+expecting success of 3501.14 'advice from failed revert': 
+	test_when_finished "git reset --hard" &&
+	test_commit --no-tag "add dream" dream dream &&
+	dream_oid=$(git rev-parse --short HEAD) &&
+	cat <<-EOF >expected &&
+	error: could not revert $dream_oid... add dream
+	hint: After resolving the conflicts, mark them with
+	hint: "git add/rm <pathspec>", then run
+	hint: "git revert --continue".
+	hint: You can instead skip this commit with "git revert --skip".
+	hint: To abort and get back to the state before "git revert",
+	hint: run "git revert --abort".
+	hint: Disable this message with "git config set advice.mergeConflict false"
+	EOF
+	test_commit --append --no-tag "double-add dream" dream dream &&
+	test_must_fail git revert HEAD^ 2>actual &&
+	test_cmp expected actual
+
+[main 10ebfde] add dream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dream
+[main 9bf0a53] double-add dream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+CONFLICT (modify/delete): dream deleted in parent of 10ebfde (add dream) and modified in HEAD.  Version HEAD of dream left in tree.
+HEAD is now at 9bf0a53 double-add dream
+ok 14 - advice from failed revert
+
+expecting success of 3501.15 'titles of fresh reverts': 
+	test_commit --no-tag A file1 &&
+	test_commit --no-tag B file1 &&
+	git revert --no-edit HEAD &&
+	test_expect_subject "Revert \"B\"" &&
+	git revert --no-edit HEAD &&
+	test_expect_subject "Reapply \"B\"" &&
+	git revert --no-edit HEAD &&
+	test_expect_subject "Revert \"Reapply \"B\"\""
+
+[main ea33305] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[main c1d3d95] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch c062584] third
+[main eef6aab] Revert "B"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:25:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main c405e54] Reapply "B"
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:25:13 2005 -0700
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+[main 39eb61b] Revert "Reapply "B""
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:25:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - titles of fresh reverts
 
-expecting success of 3428.2 'rebase --apply --signoff adds a sign-off line': 
-	test_must_fail git rbs --apply second third &&
-	git checkout --theirs file &&
-	git add file &&
-	git rebase --continue &&
-	git log --format=%B -n3 >actual &&
-	test_cmp expected-signed-conflict actual
+expecting success of 3501.16 'title of legacy double revert': 
+	test_commit --no-tag "Revert \"Revert \"B\"\"" file1 &&
+	git revert --no-edit HEAD &&
+	test_expect_subject "Revert \"Revert \"Revert \"B\"\"\""
 
-First, rewinding head to replay your work on top of it...
-Applying: file-2
-Applying: conflict
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-84c676d file-2
-virtual conflict
-found 1 common ancestor:
-virtual 848740929e99bda0e1a9783e7daa314c5a9732d5
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 conflict
-Updated 1 path from the index
-Applying: conflict
-Applying: third
-ok 2 - rebase --apply --signoff adds a sign-off line
+[main 8f4de03] Revert "Revert "B""
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9de2bd4] Revert "Revert "Revert "B"""
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:26:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - title of legacy double revert
 
-expecting success of 3428.3 'rebase --no-signoff does not add a sign-off line': 
-	git commit --amend -m "first" &&
-	git rbs --no-signoff HEAD^ &&
-	test_commit_message HEAD expected-unsigned
+expecting success of 3501.17 'identification of reverted commit (default)': 
+	test_commit to-ident &&
+	test_when_finished "git reset --hard to-ident" &&
+	git checkout --detach to-ident &&
+	git revert --no-edit HEAD &&
+	git cat-file commit HEAD >actual.raw &&
+	grep "^This reverts " actual.raw >actual &&
+	echo "This reverts commit $(git rev-parse HEAD^)." >expect &&
+	test_cmp expect actual
 
-[detached HEAD 56522f9] first
+[main bd8dd47] to-ident
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date.
-ok 3 - rebase --no-signoff does not add a sign-off line
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-ident.t
+HEAD is now at bd8dd47 to-ident
+M	actual
+[detached HEAD b5f3ac5] Revert "to-ident"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 to-ident.t
+HEAD is now at bd8dd47 to-ident
+ok 17 - identification of reverted commit (default)
 
-expecting success of 3428.4 'rebase --exec --signoff adds a sign-off line': 
-	test_when_finished "rm exec" &&
-	git rebase --exec "touch exec" --signoff first^ first &&
-	test_path_is_file exec &&
-	test_commit_message HEAD expected-signed
+expecting success of 3501.18 'identification of reverted commit (--reference)': 
+	git checkout --detach to-ident &&
+	git revert --reference --no-edit HEAD &&
+	git cat-file commit HEAD >actual.raw &&
+	grep "^This reverts " actual.raw >actual &&
+	echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
+	test_cmp expect actual
 
-Rebasing (1/2)
Rebasing (2/2)
Executing: touch exec
-Successfully rebased and updated detached HEAD.
-ok 4 - rebase --exec --signoff adds a sign-off line
+HEAD is now at bd8dd47 to-ident
+[detached HEAD 74d9825] # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 to-ident.t
+ok 18 - identification of reverted commit (--reference)
 
-expecting success of 3428.5 'rebase --root --signoff adds a sign-off line': 
-	git checkout first &&
-	git rebase --root --keep-empty --signoff &&
-	test_commit_message HEAD^ expected-initial-signed &&
-	test_commit_message HEAD expected-signed
+expecting success of 3501.19 'git revert --reference with core.commentChar': 
+	test_when_finished "git reset --hard to-ident" &&
+	git checkout --detach to-ident &&
+	GIT_EDITOR="head -n4 >actual" git -c core.commentChar=% revert \
+		--edit --reference HEAD &&
+	cat <<-EOF >expect &&
+	% *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
+
+	This reverts commit $(git show -s --pretty=reference HEAD^).
+
+	EOF
+	test_cmp expect actual
 
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  d43d5c6 first
+  74d9825 # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> d43d5c6
-
-HEAD is now at 626aa63 first
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 5 - rebase --root --signoff adds a sign-off line
+ git branch <new-branch-name> 74d9825
 
-expecting success of 3428.6 'rebase -m --signoff adds a sign-off line': 
-	test_must_fail git rebase -m --signoff second third &&
-	git checkout --theirs file &&
-	git add file &&
-	GIT_EDITOR="sed -n /Conflicts:/,/^\\\$/p >actual" \
-		git rebase --continue &&
-	cat >expect <<-\EOF &&
-	# Conflicts:
-	#	file
+HEAD is now at bd8dd47 to-ident
+M	actual
+[detached HEAD 79853a5] This reverts commit bd8dd47 (to-ident, 2005-04-07).
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 to-ident.t
+HEAD is now at bd8dd47 to-ident
+ok 19 - git revert --reference with core.commentChar
 
-	EOF
-	test_cmp expect actual &&
-	git log --format=%B -n3 >actual &&
-	test_cmp expected-signed-conflict actual
+expecting success of 3501.20 'identification of reverted commit (revert.reference)': 
+	git checkout --detach to-ident &&
+	git -c revert.reference=true revert --no-edit HEAD &&
+	git cat-file commit HEAD >actual.raw &&
+	grep "^This reverts " actual.raw >actual &&
+	echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
+	test_cmp expect actual
 
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply b53cad1... conflict
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply b53cad1... conflict
-Updated 1 path from the index
-[detached HEAD 613a669] conflict
+HEAD is now at bd8dd47 to-ident
+[detached HEAD 74d9825] # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 6 - rebase -m --signoff adds a sign-off line
-
-expecting success of 3428.7 'rebase -i --signoff adds a sign-off line when editing commit': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 edit 3 edit 2" \
-			git rebase -i --signoff first third
-	) &&
-	echo a >a &&
-	git add a &&
-	test_must_fail git rebase --continue &&
-	git checkout --ours file &&
-	echo b >a &&
-	git add a file &&
-	git rebase --continue &&
-	echo c >a &&
-	git add a &&
-	git log --format=%B -n3 >actual &&
-	cat >expect <<-EOF &&
-	conflict
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 to-ident.t
+ok 20 - identification of reverted commit (revert.reference)
 
-	Signed-off-by: $ident
+expecting success of 3501.21 'cherry-pick is unaware of --reference (for now)': 
+	test_when_finished "git reset --hard" &&
+	test_must_fail git cherry-pick --reference HEAD 2>actual &&
+	grep "^usage: git cherry-pick" actual
 
-	third
+usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
+HEAD is now at 74d9825 # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
+ok 21 - cherry-pick is unaware of --reference (for now)
 
-	Signed-off-by: $ident
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3504-cherry-pick-rerere.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3504-cherry-pick-rerere/.git/
+expecting success of 3504.1 'setup': 
+	test_commit foo &&
+	test_commit foo-main foo &&
+	test_commit bar-main bar &&
 
-	file-2
+	git checkout -b dev foo &&
+	test_commit foo-dev foo &&
+	test_commit bar-dev bar &&
+	git config rerere.enabled true
 
-	Signed-off-by: $ident
+[main (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[main b0605b8] foo-main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main f55d303] bar-main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'dev'
+[dev 1d8ba7e] foo-dev
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[dev 5392a79] bar-dev
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+ok 1 - setup
 
-	EOF
-	test_cmp expect actual
+expecting success of 3504.2 'conflicting merge': 
+	test_must_fail git merge main
 
-rebase -i script before editing:
-pick 3c3ba6d file-2
-pick b53cad1 conflict
-pick c062584 third
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+Recorded preimage for 'bar'
+Recorded preimage for 'foo'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - conflicting merge
 
-rebase -i script after editing:
-edit 3c3ba6d file-2
-edit c062584 third
-edit b53cad1 conflict
-Rebasing (1/3)
Stopped at 3c3ba6d...  file-2
-You can amend the commit now, with
+expecting success of 3504.3 'fixup': 
+	echo foo-resolved >foo &&
+	echo bar-resolved >bar &&
+	git commit -am resolved &&
+	cp foo foo-expect &&
+	cp bar bar-expect &&
+	git reset --hard HEAD^
 
-  git commit --amend 
+Recorded resolution for 'bar'.
+Recorded resolution for 'foo'.
+[dev 85492e3] resolved
+ Author: A U Thor <author@example.com>
+HEAD is now at 5392a79 bar-dev
+ok 3 - fixup
 
-Once you are satisfied with your changes, run
+expecting success of 3504.4 'cherry-pick conflict with --rerere-autoupdate': 
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	git diff-files --quiet &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
 
-  git rebase --continue
-[detached HEAD 22331a7] file-2
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+[dev 41ff336] foo-main
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 file-2
-Rebasing (2/3)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply c062584... third
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply f55d303... bar-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply c062584... third
-Updated 1 path from the index
-[detached HEAD 8033101] third
+Staged 'bar' using previous resolution.
+[dev c0de054] bar-main
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/3)
Stopped at b53cad1...  conflict
-You can amend the commit now, with
-
-  git commit --amend 
+HEAD is now at 5392a79 bar-dev
+ok 4 - cherry-pick conflict with --rerere-autoupdate
 
-Once you are satisfied with your changes, run
+expecting success of 3504.5 'cherry-pick conflict respects rerere.autoUpdate': 
+	test_config rerere.autoUpdate true &&
+	test_must_fail git cherry-pick foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	git diff-files --quiet &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
 
-  git rebase --continue
-ok 7 - rebase -i --signoff adds a sign-off line when editing commit
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+[dev 41ff336] foo-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply f55d303... bar-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'bar' using previous resolution.
+[dev c0de054] bar-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392a79 bar-dev
+ok 5 - cherry-pick conflict respects rerere.autoUpdate
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3429-rebase-edit-todo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 3504.6 'cherry-pick conflict with --no-rerere-autoupdate': 
+	test_config rerere.autoUpdate true &&
+	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	test_must_fail git diff-files --quiet &&
+	git add foo &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	test_must_fail git diff-files --quiet &&
+	git add bar &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
 
-[master (root-commit) 07e65e0] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master fa10d42] second
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'foo' using previous resolution.
+[dev 41ff336] foo-main
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ba0a06e] third
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply f55d303... bar-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'bar' using previous resolution.
+[dev c0de054] bar-main
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+HEAD is now at 5392a79 bar-dev
+ok 6 - cherry-pick conflict with --no-rerere-autoupdate
 
-expecting success of 3429.2 'rebase exec modifies rebase-todo': 
-	todo=.git/rebase-merge/git-rebase-todo &&
-	git rebase HEAD~1 -x "echo exec touch F >>$todo" &&
-	test -e F
+expecting success of 3504.7 'cherry-pick --continue rejects --rerere-autoupdate': 
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
+	echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
+	test_cmp expect actual &&
+	test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
+	echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
+	test_cmp expect actual &&
+	git cherry-pick --abort
 
-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
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+ok 7 - cherry-pick --continue rejects --rerere-autoupdate
 
-expecting success of 3429.3 'rebase exec with an empty list does not exec anything': 
-	git rebase HEAD -x "true" 2>output &&
-	! grep "Executing: true" output
+expecting success of 3504.8 'cherry-pick --rerere-autoupdate more than once': 
+	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	git cherry-pick --abort &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	git cherry-pick --abort &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-main &&
+	test_must_fail git diff-files --quiet &&
+	git cherry-pick --abort
 
-ok 3 - rebase exec with an empty list does not exec anything
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'foo' using previous resolution.
+ok 8 - cherry-pick --rerere-autoupdate more than once
 
-expecting success of 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
+expecting success of 3504.9 'cherry-pick conflict without rerere': 
+	test_config rerere.enabled false &&
+	test_must_fail git cherry-pick foo-main &&
+	grep ===== foo &&
+	grep foo-dev foo &&
+	grep foo-main foo
 
-	shift
-	test -z "$*" ||
-	echo "exec $0 $*" >>$GIT_REBASE_TODO
-	EOS
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+=======
+foo-dev
+foo-main
+>>>>>>> b0605b8 (foo-main)
+ok 9 - cherry-pick conflict without rerere
 
-	git rebase HEAD -x "./append-todo.sh 5 6"
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3505-cherry-pick-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3505-cherry-pick-empty/.git/
+expecting success of 3505.1 'setup': 
 
-Successfully rebased and updated refs/heads/master.
-ok 4 - loose object cache vs re-reading todo list
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
 
-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
+	git checkout -b empty-message-branch &&
+	echo third >> file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit --allow-empty-message -m "" &&
 
-	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
+	git checkout main &&
+	git checkout -b empty-change-branch &&
+	test_tick &&
+	git commit --allow-empty -m "empty"
 
-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
+[main (root-commit) 0c72e4f] 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
+ create mode 100644 file1
+Switched to a new branch 'empty-message-branch'
+[empty-message-branch d6aa1e8] 
  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
+Switched to branch 'main'
+Switched to a new branch 'empty-change-branch'
+[empty-change-branch 0f51a27] empty
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
-expecting success of 3429.6 're-reading todo doesnt interfere with revert --edit': 
-	git reset --hard third &&
+expecting success of 3505.2 'cherry-pick an empty commit': 
+	git checkout main &&
+	test_expect_code 1 git cherry-pick empty-change-branch
 
-	git revert --edit third second &&
+Switched to branch 'main'
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-	cat >expect <<-\EOF &&
-	Revert "second"
-	Revert "third"
-	third
-	second
-	first
-	EOF
-	git log --format="%s" >actual &&
-	test_cmp expect actual
+    git commit --allow-empty
 
-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
+Otherwise, please use 'git cherry-pick --skip'
+On branch main
+You are currently cherry-picking commit 0f51a27.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
-expecting success of 3429.7 're-reading todo doesnt interfere with cherry-pick --edit': 
-	git reset --hard first &&
+nothing to commit, working tree clean
+ok 2 - cherry-pick an empty commit
 
-	git cherry-pick --edit second third &&
+expecting success of 3505.3 'index lockfile was removed': 
+	test ! -f .git/index.lock
 
-	cat >expect <<-\EOF &&
-	third
-	second
-	first
-	EOF
-	git log --format="%s" >actual &&
-	test_cmp expect actual
+ok 3 - index lockfile was removed
 
-HEAD is now at 07e65e0 first
-[detached HEAD e619899] second
+expecting success of 3505.4 'cherry-pick a commit with an empty message': 
+	test_when_finished "git reset --hard empty-message-branch~1" &&
+	git checkout main &&
+	git cherry-pick empty-message-branch
+
+Already on 'main'
+warning: cancelling a cherry picking in progress
+[main d800ed2] 
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 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
+ 1 file changed, 1 insertion(+)
+HEAD is now at 0c72e4f first
+ok 4 - cherry-pick a commit with an empty message
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t0027-auto-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3505.5 'index lockfile was removed': 
+	test ! -f .git/index.lock
 
-ok 1 - ls-files --eol -o Text/Binary
+ok 5 - index lockfile was removed
 
-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 3505.6 'cherry-pick a commit with an empty message with --allow-empty-message': 
+	git checkout -f main &&
+	git cherry-pick --allow-empty-message empty-message-branch
 
-Switched to a new branch 'main'
-[main (root-commit) 92d411f] add .gitattributes
+Already on 'main'
+[main d800ed2] 
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
  1 file changed, 1 insertion(+)
- 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
+ok 6 - cherry-pick a commit with an empty message with --allow-empty-message
 
-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 3505.7 'cherry pick an empty non-ff commit without --allow-empty': 
+	git checkout main &&
+	echo fourth >>file2 &&
+	git add file2 &&
+	git commit -m "fourth" &&
+	test_must_fail git cherry-pick empty-change-branch
 
-[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
+Already on 'main'
+[main 36c19c0] fourth
  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.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" ""        ""
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-[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
+    git commit --allow-empty
 
-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"
+Otherwise, please use 'git cherry-pick --skip'
+On branch main
+You are currently cherry-picking commit 0f51a27.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
-[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
+nothing to commit, working tree clean
+ok 7 - cherry pick an empty non-ff commit without --allow-empty
 
-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 3505.8 'cherry pick an empty non-ff commit with --allow-empty': 
+	git checkout main &&
+	git cherry-pick --allow-empty empty-change-branch
 
-[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
+Already on 'main'
+warning: cancelling a cherry picking in progress
+[main 72a973f] empty
  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
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ok 8 - cherry pick an empty non-ff commit with --allow-empty
 
-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 3505.9 'cherry pick with --keep-redundant-commits': 
+	git checkout main &&
+	git cherry-pick --keep-redundant-commits HEAD^
 
-[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
+Already on 'main'
+[main 938d13f] fourth
  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
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ok 9 - cherry pick with --keep-redundant-commits
 
-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 3505.10 'cherry-pick a commit that becomes no-op (prep)': 
+	git checkout main &&
+	git branch fork &&
+	echo foo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m "add file2 on main" &&
 
-[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
+	git checkout fork &&
+	echo foo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m "add file2 on the side"
+
+Already on 'main'
+[main aa68455] add file2 on main
  Author: A U Thor <author@example.com>
- 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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'fork'
+[fork 521fc70] add file2 on the side
  Author: A U Thor <author@example.com>
- 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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - cherry-pick a commit that becomes no-op (prep)
 
-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
+expecting success of 3505.11 'cherry-pick a no-op with neither --keep-redundant nor --empty': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	test_must_fail git cherry-pick main
 
-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=
+HEAD is now at 521fc70 add file2 on the side
+Note: switching to 'fork^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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 
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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=
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 521fc70 add file2 on the side
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-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
+    git commit --allow-empty
 
-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 
+Otherwise, please use 'git cherry-pick --skip'
+HEAD detached at 521fc70
+You are currently cherry-picking commit aa68455.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
-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
+nothing to commit, working tree clean
+ok 11 - cherry-pick a no-op with neither --keep-redundant nor --empty
 
-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
+expecting success of 3505.12 'cherry-pick a no-op with --keep-redundant': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	git cherry-pick --keep-redundant-commits main &&
+	git show -s --format=%s >actual &&
+	echo "add file2 on main" >expect &&
+	test_cmp expect actual
 
-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=
+HEAD is now at 521fc70 add file2 on the side
+HEAD is now at 521fc70 add file2 on the side
+[detached HEAD ffffb2b] add file2 on main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ok 12 - cherry-pick a no-op with --keep-redundant
 
-expecting success of 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
+expecting success of 3505.13 '--keep-redundant-commits is incompatible with operations': 
+	test_must_fail git cherry-pick HEAD 2>output &&
+	test_grep "The previous cherry-pick is now empty" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --continue 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --skip 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --abort 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort" output &&
+	test_must_fail git cherry-pick --keep-redundant-commits --quit 2>output &&
+	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit" output &&
+	git cherry-pick --abort
 
-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
+HEAD detached from 521fc70
+You are currently cherry-picking commit ffffb2b.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
-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 
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	output
 
-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
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort
+fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit
+ok 13 - --keep-redundant-commits is incompatible with operations
 
-expecting success of 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 3505.14 '--empty is incompatible with operations': 
+	test_must_fail git cherry-pick HEAD 2>output &&
+	test_grep "The previous cherry-pick is now empty" output &&
+	test_must_fail git cherry-pick --empty=stop --continue 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --continue" output &&
+	test_must_fail git cherry-pick --empty=stop --skip 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --skip" output &&
+	test_must_fail git cherry-pick --empty=stop --abort 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --abort" output &&
+	test_must_fail git cherry-pick --empty=stop --quit 2>output &&
+	test_grep "fatal: cherry-pick: --empty cannot be used with --quit" output &&
+	git cherry-pick --abort
 
-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 detached from 521fc70
+You are currently cherry-picking commit ffffb2b.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	output
 
-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
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+fatal: cherry-pick: --empty cannot be used with --continue
+fatal: cherry-pick: --empty cannot be used with --skip
+fatal: cherry-pick: --empty cannot be used with --abort
+fatal: cherry-pick: --empty cannot be used with --quit
+ok 14 - --empty is incompatible with operations
 
-expecting success of 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 
+expecting success of 3505.15 'cherry-pick a no-op with --empty=stop': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	test_must_fail git cherry-pick --empty=stop main 2>output &&
+	test_grep "The previous cherry-pick is now empty" output
 
-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
+HEAD is now at ffffb2b add file2 on main
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
+  ffffb2b add file2 on main
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> ffffb2b
 
-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 521fc70 add file2 on the side
+HEAD detached at 521fc70
+You are currently cherry-picking commit aa68455.
+  (all conflicts fixed: run "git cherry-pick --continue")
+  (use "git cherry-pick --skip" to skip this patch)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
-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 
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	output
 
-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
+nothing added to commit but untracked files present (use "git add" to track)
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+ok 15 - cherry-pick a no-op with --empty=stop
 
-expecting success of 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 3505.16 'cherry-pick a no-op with --empty=drop': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	git cherry-pick --empty=drop main &&
+	test_commit_message HEAD -m "add file2 on the side"
 
-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
+HEAD is now at 521fc70 add file2 on the side
+HEAD is now at 521fc70 add file2 on the side
+dropping aa68455a495805013ddc30249c4c19aa0866fc23 add file2 on main -- patch contents already upstream
+ok 16 - cherry-pick a no-op with --empty=drop
 
-expecting success of 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 3505.17 'cherry-pick a no-op with --empty=keep': 
+	git reset --hard &&
+	git checkout fork^0 &&
+	git cherry-pick --empty=keep main &&
+	test_commit_message HEAD -m "add file2 on main"
 
-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
+HEAD is now at 521fc70 add file2 on the side
+HEAD is now at 521fc70 add file2 on the side
+[detached HEAD ffffb2b] add file2 on main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ok 17 - cherry-pick a no-op with --empty=keep
 
-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 
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3506-cherry-pick-ff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3506-cherry-pick-ff/.git/
+expecting success of 3506.1 'setup': 
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
+	git tag first &&
 
-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
+	git checkout -b other &&
+	echo second >> file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "second" &&
+	git tag second &&
+	test_oid_cache <<-EOF
+	cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1
+	cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d
+	EOF
 
-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
+[main (root-commit) 0c72e4f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'other'
+[other 453a047] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-expecting success of 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 3506.2 'cherry-pick using --ff fast forwards': 
+	git checkout main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick --ff second &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify second)"
 
-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
+Switched to branch 'main'
+HEAD is now at 0c72e4f first
+ok 2 - cherry-pick using --ff fast forwards
 
-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 3506.3 'cherry-pick not using --ff does not fast forwards': 
+	git checkout main &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick second &&
+	test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)"
 
-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
+Already on 'main'
+HEAD is now at 0c72e4f first
+[main 43e4ff7] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 3 - cherry-pick not using --ff does not fast forwards
 
-expecting success of 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 3506.4 'merge setup': 
+	git checkout main &&
+	git reset --hard first &&
+	echo new line >A &&
+	git add A &&
+	test_tick &&
+	git commit -m "add line to A" A &&
+	git tag A &&
+	git checkout -b side first &&
+	echo new line >B &&
+	git add B &&
+	test_tick &&
+	git commit -m "add line to B" B &&
+	git tag B &&
+	git checkout main &&
+	git merge side &&
+	git tag C &&
+	git checkout -b new A
 
-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
+Already on 'main'
+HEAD is now at 0c72e4f first
+[main e3ca70e] add line to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'side'
+[side 5faaf2e] add line to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to a new branch 'new'
+ok 4 - merge setup
 
-expecting success of 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 3506.5 'cherry-pick explicit first parent of a non-merge with --ff': 
+	git reset --hard A -- &&
+	git cherry-pick --ff -m 1 B &&
+	git diff --exit-code C --
 
-expecting success of 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
+HEAD is now at e3ca70e add line to A
+[new d859d20] add line to B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+ok 5 - cherry-pick explicit first parent of a non-merge with --ff
 
-expecting success of 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 3506.6 'cherry pick a merge with --ff but without -m should fail': 
+	git reset --hard A -- &&
+	test_must_fail git cherry-pick --ff C &&
+	git diff --exit-code A --
 
-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
+HEAD is now at e3ca70e add line to A
+error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a is a merge but no -m option was given.
+fatal: cherry-pick failed
+ok 6 - cherry pick a merge with --ff but without -m should fail
 
-expecting success of 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 3506.7 'cherry pick with --ff a merge (1)': 
+	git reset --hard A -- &&
+	git cherry-pick --ff -m 1 C &&
+	git diff --exit-code C &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
 
-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
+HEAD is now at e3ca70e add line to A
+ok 7 - cherry pick with --ff a merge (1)
 
-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 3506.8 'cherry pick with --ff a merge (2)': 
+	git reset --hard B -- &&
+	git cherry-pick --ff -m 2 C &&
+	git diff --exit-code C &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
 
-expecting success of 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
+HEAD is now at 5faaf2e add line to B
+ok 8 - cherry pick with --ff a merge (2)
 
-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 3506.9 'cherry pick a merge relative to nonexistent parent with --ff should fail': 
+	git reset --hard B -- &&
+	test_must_fail git cherry-pick --ff -m 3 C
 
-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
+HEAD is now at 5faaf2e add line to B
+error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a does not have parent 3
+fatal: cherry-pick failed
+ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail
 
-expecting success of 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 3506.10 'cherry pick a root commit with --ff': 
+	git reset --hard first -- &&
+	git rm file1 &&
+	echo first >file2 &&
+	git add file2 &&
+	git commit --amend -m "file2" &&
+	git cherry-pick --ff first &&
+	test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)"
 
-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 0c72e4f first
+rm 'file1'
+[new 1654ff9] file2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[new 1df192c] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 10 - cherry pick a root commit with --ff
 
-expecting success of 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 3506.11 'cherry-pick --ff on unborn branch': 
+	git checkout --orphan unborn &&
+	git rm --cached -r . &&
+	rm -rf * &&
+	git cherry-pick --ff first &&
+	test_cmp_rev first HEAD
 
-expecting success of 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
+Switched to a new branch 'unborn'
+rm 'file1'
+rm 'file2'
+ok 11 - cherry-pick --ff on unborn branch
 
-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
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3303-notes-subtrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3303-notes-subtrees/.git/
+expecting success of 3303.1 'setup: create 100 commits': 
 
-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
+	(
+		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.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
+M 644 inline file
+data <<EOF
+file in commit #$nr
+EOF
 
-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
+INPUT_END
 
-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
+		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.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
+deleteall
 
-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
+INPUT_END
 
-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
+	) |
+	git fast-import --quiet &&
+	git config core.notesRef refs/notes/commits
 
-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
+ok 1 - setup: create 100 commits
 
-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 3303.2 'test notes in 2/38-fanout': test_sha1_based "s|^..|&/|"
+ok 2 - test notes in 2/38-fanout
 
-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 3303.3 'verify notes in 2/38-fanout': verify_notes
+ok 3 - verify notes in 2/38-fanout
 
-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 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.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 3303.5 'verify notes in 2/2/36-fanout': verify_notes
+ok 5 - verify notes in 2/2/36-fanout
 
-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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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 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.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
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t1092-sparse-checkout-compatibility.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1092-sparse-checkout-compatibility/.git/
+expecting success of 1092.1 'setup': 
+	git init initial-repo &&
+	(
+		GIT_TEST_SPARSE_INDEX=0 &&
+		cd initial-repo &&
+		echo a >a &&
+		echo "after deep" >e &&
+		echo "after folder1" >g &&
+		echo "after x" >z &&
+		mkdir folder1 folder2 deep before x &&
+		echo "before deep" >before/a &&
+		echo "before deep again" >before/b &&
+		mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
+		mkdir deep/deeper1/deepest &&
+		mkdir deep/deeper1/deepest2 &&
+		mkdir deep/deeper1/deepest3 &&
+		echo "after deeper1" >deep/e &&
+		echo "after deepest" >deep/deeper1/e &&
+		cp a folder1 &&
+		cp a folder2 &&
+		cp a x &&
+		cp a deep &&
+		cp a deep/before &&
+		cp a deep/deeper1 &&
+		cp a deep/deeper2 &&
+		cp a deep/later &&
+		cp a deep/deeper1/deepest &&
+		cp a deep/deeper1/deepest2 &&
+		cp a deep/deeper1/deepest3 &&
+		cp -r deep/deeper1/ deep/deeper2 &&
+		mkdir deep/deeper1/0 &&
+		mkdir deep/deeper1/0/0 &&
+		touch deep/deeper1/0/1 &&
+		touch deep/deeper1/0/0/0 &&
+		>folder1- &&
+		>folder1.x &&
+		>folder10 &&
+		cp -r deep/deeper1/0 folder1 &&
+		cp -r deep/deeper1/0 folder2 &&
+		echo >>folder1/0/0/0 &&
+		echo >>folder2/0/1 &&
+		git add . &&
+		git commit -m "initial commit" &&
+		git checkout -b base &&
+		for dir in folder1 folder2 deep
+		do
+			git checkout -b update-$dir base &&
+			echo "updated $dir" >$dir/a &&
+			git commit -a -m "update $dir" || return 1
+		done &&
 
-expecting success of 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
+		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 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
+		git checkout -b rename-out-to-out rename-base &&
+		mv folder1/a folder2/b &&
+		mv folder1/larger-content folder2/edited-content &&
+		echo >>folder2/edited-content &&
+		echo >>folder2/0/1 &&
+		echo stuff >>deep/deeper1/a &&
+		git add . &&
+		git commit -m "rename folder1/... to folder2/..." &&
 
-expecting success of 0027.100 'commit NNO files crlf=true attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 100 - commit NNO files crlf=true attr= LF
+		git checkout -b rename-out-to-in rename-base &&
+		mv folder1/a deep/deeper1/b &&
+		echo more stuff >>deep/deeper1/a &&
+		rm folder2/0/1 &&
+		mkdir folder2/0/1 &&
+		echo >>folder2/0/1/1 &&
+		mv folder1/larger-content deep/deeper1/edited-content &&
+		echo >>deep/deeper1/edited-content &&
+		git add . &&
+		git commit -m "rename folder1/... to deep/deeper1/..." &&
 
-expecting success of 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
+		git checkout -b rename-in-to-out rename-base &&
+		mv deep/deeper1/a folder1/b &&
+		echo >>folder2/0/1 &&
+		rm -rf folder1/0/0 &&
+		echo >>folder1/0/0 &&
+		mv deep/deeper1/larger-content folder1/edited-content &&
+		echo >>folder1/edited-content &&
+		git add . &&
+		git commit -m "rename deep/deeper1/... to folder1/..." &&
 
-expecting success of 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
+		git checkout -b df-conflict-1 base &&
+		rm -rf folder1 &&
+		echo content >folder1 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-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
+		git checkout -b df-conflict-2 base &&
+		rm -rf folder2 &&
+		echo content >folder2 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-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
+		git checkout -b fd-conflict base &&
+		rm a &&
+		mkdir a &&
+		echo content >a/a &&
+		git add . &&
+		git commit -m "file to dir" &&
 
-expecting success of 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
+		for side in left right
 		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
+			git checkout -b merge-$side base &&
+			echo $side >>deep/deeper2/a &&
+			echo $side >>folder1/a &&
+			echo $side >>folder2/a &&
+			git add . &&
+			git commit -m "$side" || return 1
+		done &&
 
-expecting success of 0027.106 'commit NNO files crlf=true attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 106 - commit NNO files crlf=true attr= LF
+		git checkout -b deepest base &&
+		echo "updated deepest" >deep/deeper1/deepest/a &&
+		echo "updated deepest2" >deep/deeper1/deepest2/a &&
+		echo "updated deepest3" >deep/deeper1/deepest3/a &&
+		git commit -a -m "update deepest" &&
 
-expecting success of 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
+		git checkout -f base &&
+		git reset --hard
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1092-sparse-checkout-compatibility/initial-repo/.git/
+[master (root-commit) 703fd3e] initial commit
+ Author: A U Thor <author@example.com>
+ 33 files changed, 26 insertions(+)
+ create mode 100644 a
+ create mode 100644 before/a
+ create mode 100644 before/b
+ create mode 100644 deep/a
+ create mode 100644 deep/before/a
+ create mode 100644 deep/deeper1/0/0/0
+ create mode 100644 deep/deeper1/0/1
+ create mode 100644 deep/deeper1/a
+ create mode 100644 deep/deeper1/deepest/a
+ create mode 100644 deep/deeper1/deepest2/a
+ create mode 100644 deep/deeper1/deepest3/a
+ create mode 100644 deep/deeper1/e
+ create mode 100644 deep/deeper2/a
+ create mode 100644 deep/deeper2/deeper1/a
+ create mode 100644 deep/deeper2/deeper1/deepest/a
+ create mode 100644 deep/deeper2/deeper1/deepest2/a
+ create mode 100644 deep/deeper2/deeper1/deepest3/a
+ create mode 100644 deep/deeper2/deeper1/e
+ create mode 100644 deep/e
+ create mode 100644 deep/later/a
+ create mode 100644 e
+ create mode 100644 folder1-
+ create mode 100644 folder1.x
+ create mode 100644 folder1/0/0/0
+ create mode 100644 folder1/0/1
+ create mode 100644 folder1/a
+ create mode 100644 folder10
+ create mode 100644 folder2/0/0/0
+ create mode 100644 folder2/0/1
+ create mode 100644 folder2/a
+ create mode 100644 g
+ create mode 100644 x/a
+ create mode 100644 z
+Switched to a new branch 'base'
+Switched to a new branch 'update-folder1'
+[update-folder1 fa14324] update folder1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'update-folder2'
+[update-folder2 2805da4] update folder2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'update-deep'
+[update-deep ac61adf] update deep
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'rename-base'
+[rename-base 5914bd8] add interesting rename content
+ Author: A U Thor <author@example.com>
+ 3 files changed, 15 insertions(+)
+ create mode 100644 deep/deeper1/larger-content
+ create mode 100644 folder1/larger-content
+ create mode 100644 folder2/larger-content
+Switched to a new branch 'rename-out-to-out'
+[rename-out-to-out 4a04e79] rename folder1/... to folder2/...
+ Author: A U Thor <author@example.com>
+ 4 files changed, 3 insertions(+)
+ rename folder1/a => folder2/b (100%)
+ rename folder1/larger-content => folder2/edited-content (97%)
+Switched to a new branch 'rename-out-to-in'
+[rename-out-to-in d11c5fe] rename folder1/... to deep/deeper1/...
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename folder1/a => deep/deeper1/b (100%)
+ rename folder1/larger-content => deep/deeper1/edited-content (97%)
+ rename folder2/0/{ => 1}/1 (100%)
+Switched to a new branch 'rename-in-to-out'
+[rename-in-to-out e5d0f8e] rename deep/deeper1/... to folder1/...
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename folder1/0/{0 => }/0 (100%)
+ rename deep/deeper1/a => folder1/b (100%)
+ rename deep/deeper1/larger-content => folder1/edited-content (97%)
+Switched to a new branch 'df-conflict-1'
+[df-conflict-1 974b58d] dir to file
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 folder1
+ delete mode 100644 folder1/0/0/0
+ delete mode 100644 folder1/0/1
+ delete mode 100644 folder1/a
+Switched to a new branch 'df-conflict-2'
+[df-conflict-2 bef3412] dir to file
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 folder2
+ delete mode 100644 folder2/0/0/0
+ delete mode 100644 folder2/0/1
+ delete mode 100644 folder2/a
+Switched to a new branch 'fd-conflict'
+[fd-conflict 40c717f] file to dir
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 a
+ create mode 100644 a/a
+Switched to a new branch 'merge-left'
+[merge-left 9721a77] left
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+Switched to a new branch 'merge-right'
+[merge-right 4f73b62] right
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+Switched to a new branch 'deepest'
+[deepest cb037bf] update deepest
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+Switched to branch 'base'
+HEAD is now at 703fd3e initial commit
+ok 1 - setup
 
-expecting success of 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 1092.2 'sparse-index contents': 
+	init_repos &&
 
-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
+	# Remove deep, add three other directories.
+	test_sparse_checkout_set \
+		"folder1 folder2 x" \
+		"before deep" &&
 
-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
+	# Remove folder1, add deep
+	test_sparse_checkout_set \
+		"deep folder2 x" \
+		"before folder1" &&
 
-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
+	# 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 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
+	# 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 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
+	# Drop down to only files at root
+	test_sparse_checkout_set \
+		"" \
+		"before deep folder1 folder2 x" &&
 
-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
+	# 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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 10c8564bace86d48e22963bebe92e40ba8cfd937 0	deep/deeper1/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ca1fa788550e1b7b99256573687bd1dd7994e072 0	deep/deeper2/
+040000 cb4007891397aa2a451037d1c69e57f0cf498c24 0	folder2/0/
+fatal: path 'bogus' does not exist in 'HEAD'
+fatal: path 'folder2/2/3' does not exist in 'HEAD'
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
+040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
+040000 123706f6fc38949628eaf0483edbf97ba21123ae 0	folder2/
+040000 aaff74984cccd156a469afa7d9ab10e4777beb24 0	x/
+ok 2 - sparse-index contents
 
-expecting success of 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 1092.3 'expanded in-memory index matches full index': 
+	init_repos &&
+	test_sparse_match git ls-files --stage
 
-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
+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 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 1092.4 'root directory cannot be sparse': 
+	init_repos &&
 
-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
+	# Remove all in-cone files and directories from the index, collapse index
+	# with `git sparse-checkout reapply`
+	git -C sparse-index rm -r . &&
+	git -C sparse-index sparse-checkout reapply &&
 
-expecting success of 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
+	# 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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+rm 'a'
+rm 'deep/a'
+rm 'deep/before/a'
+rm 'deep/deeper1/0/0/0'
+rm 'deep/deeper1/0/1'
+rm 'deep/deeper1/a'
+rm 'deep/deeper1/deepest/a'
+rm 'deep/deeper1/deepest2/a'
+rm 'deep/deeper1/deepest3/a'
+rm 'deep/deeper1/e'
+rm 'deep/deeper2/a'
+rm 'deep/deeper2/deeper1/a'
+rm 'deep/deeper2/deeper1/deepest/a'
+rm 'deep/deeper2/deeper1/deepest2/a'
+rm 'deep/deeper2/deeper1/deepest3/a'
+rm 'deep/deeper2/deeper1/e'
+rm 'deep/e'
+rm 'deep/later/a'
+rm 'e'
+rm 'folder1-'
+rm 'folder1.x'
+rm 'folder10'
+rm 'g'
+rm 'z'
+ok 4 - root directory cannot be sparse
 
-expecting success of 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 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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 5 - status with options
 
-expecting success of 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 1092.6 'status with diff in unexpanded sparse directory': 
+	init_repos &&
+	test_all_match git checkout rename-base &&
+	test_all_match git reset --soft rename-out-to-out &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 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 6 - status with diff in unexpanded sparse directory
 
-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 1092.7 'status reports sparse-checkout': 
+	init_repos &&
+	git -C sparse-checkout status >full &&
+	git -C sparse-index status >sparse &&
+	test_grep "You are in a sparse checkout with " full &&
+	test_grep "You are in a sparse checkout." sparse
 
-expecting success of 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
+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 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 1092.8 'add, commit, checkout': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_all ../edit-contents README.md &&
 
-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
+	test_all_match git add README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Add README.md" &&
 
-expecting success of 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
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-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
+	run_on_all ../edit-contents README.md &&
 
-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 add -A &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Extend README.md" &&
 
-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
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-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
+	run_on_all ../edit-contents deep/newfile &&
 
-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
+	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 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
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout -
 
-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 8 - add, commit, checkout
 
-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.9 'deep changes during checkout': 
+	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
+	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 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
+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 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 1092.10 'checkout with modified sparse directory': 
+	init_repos &&
 
-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
+	test_all_match git checkout rename-in-to-out -- . &&
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git checkout base
 
-expecting success of 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
+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 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 1092.11 'checkout orphan then non-orphan': 
+	init_repos &&
 
-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 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 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
+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
 
-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 1092.12 'add outside sparse cone': 
+	init_repos &&
 
-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
+	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 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
+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 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 1092.13 'commit including unstaged changes': 
+	init_repos &&
 
-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-file <<-\EOF &&
+	echo $1 >$2
+	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
+	run_on_all ../edit-file 1 a &&
+	run_on_all ../edit-file 1 deep/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
+	test_all_match git commit -m "-a" -a &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	run_on_all ../edit-file 2 a &&
+	run_on_all ../edit-file 2 deep/a &&
 
-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
+	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 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
+	run_on_all ../edit-file 3 a &&
+	run_on_all ../edit-file 3 deep/a &&
 
-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
+	test_all_match git commit -m "--amend" -a --amend &&
+	test_all_match git status --porcelain=v2
 
-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
+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 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 1092.14 'status/add: outside sparse cone': 
+	init_repos &&
 
-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
+	# folder1 is at HEAD, but outside the sparse cone
+	run_on_sparse mkdir folder1 &&
+	cp initial-repo/folder1/a sparse-checkout/folder1/a &&
+	cp initial-repo/folder1/a sparse-index/folder1/a &&
 
-expecting success of 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_sparse_match git status &&
 
-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
+	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 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
+	test_sparse_match git status --porcelain=v2 &&
 
-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
+	# Adding the path outside of the sparse-checkout cone should fail.
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_all_match git add --refresh folder1/a &&
+	test_must_be_empty sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_sparse_match test_must_fail git add folder1/new &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/new &&
+	test_sparse_match git add --sparse folder1/a &&
+	test_sparse_match git add --sparse folder1/new &&
 
-expecting success of 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
+	test_all_match git add --sparse . &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m folder1/new &&
+	test_all_match git rev-parse HEAD^{tree} &&
 
-expecting success of 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
+	run_on_all ../edit-contents folder1/newer &&
+	test_all_match git add --sparse folder1/ &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m folder1/newer &&
+	test_all_match git rev-parse HEAD^{tree}
 
-expecting success of 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
+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 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 1092.15 'checkout and reset --hard': 
+	init_repos &&
 
-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
+	test_all_match git checkout update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git checkout update-deep &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	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 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
+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 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 1092.16 'diff --cached': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>README.md
+	EOF
+	run_on_all ../edit-contents &&
 
-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 diff &&
+	test_all_match git diff --cached &&
+	test_all_match git add README.md &&
+	test_all_match git diff &&
+	test_all_match git diff --cached
 
-expecting success of 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
+ok 16 - diff --cached
 
-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.17 'diff with renames and conflicts': 
+	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
+	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 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 17 - diff with renames and conflicts
 
-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.18 'diff with directory/file conflicts': 
+	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
+	for branch in rename-out-to-out \
+		      rename-out-to-in \
+		      rename-in-to-out \
+		      df-conflict-1 \
+		      df-conflict-2 \
+		      fd-conflict
+	do
+		git -C full-checkout reset --hard &&
+		test_sparse_match git reset --hard &&
+		test_all_match git checkout $branch &&
+		test_all_match git checkout rename-base -- . &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git diff --cached --no-renames &&
+		test_all_match git diff --cached --find-renames || return 1
+	done
 
-expecting success of 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
+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 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 1092.19 'log with pathspec outside sparse definition': 
+	init_repos &&
 
-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
+	test_all_match git log -- a &&
+	test_all_match git log -- folder1/a &&
+	test_all_match git log -- folder2/a &&
+	test_all_match git log -- deep/a &&
+	test_all_match git log -- deep/deeper1/a &&
+	test_all_match git log -- deep/deeper1/deepest/a &&
 
-expecting success of 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
+	test_all_match git checkout update-folder1 &&
+	test_all_match git log -- folder1/a
 
-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
+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 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 1092.20 'blame with pathspec inside sparse definition': 
+	init_repos &&
 
-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
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_all_match git blame $file || return 1
+	done
 
-expecting success of 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 20 - blame with pathspec inside 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
+expecting success of 1092.21 'blame with pathspec outside sparse definition': 
+	init_repos &&
+	test_sparse_match git sparse-checkout set &&
 
-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
+	for file in \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_sparse_match test_must_fail git blame $file &&
+		cat >expect <<-EOF &&
+		fatal: Cannot lstat '$file': No such file or directory
+		EOF
+		# We compare sparse-checkout-err and sparse-index-err in
+		# `test_sparse_match`. Given we know they are the same, we
+		# only check the content of sparse-index-err here.
+		test_cmp expect sparse-index-err || return 1
+	done
 
-expecting success of 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
+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 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 1092.22 'checkout and reset (mixed)': 
+	init_repos &&
 
-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_all_match git checkout -b reset-test update-deep &&
+	test_all_match git reset deepest &&
 
-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
+	# Because skip-worktree is preserved, resetting to update-folder1
+	# will show worktree changes for folder1/a in full-checkout, but not
+	# in sparse-checkout or sparse-index.
+	git -C full-checkout reset update-folder1 >full-checkout-out &&
+	test_sparse_match git reset update-folder1 &&
+	grep "M	folder1/a" full-checkout-out &&
+	! grep "M	folder1/a" sparse-checkout-out &&
+	run_on_sparse test_path_is_missing folder1
 
-expecting success of 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
+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 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 1092.23 'checkout and reset (merge)': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	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 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
+	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 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
+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 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 1092.24 'checkout and reset (keep)': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	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 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
+	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 0027.208 'commit NNO files crlf=input attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 208 - 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 24 - checkout and reset (keep)
 
-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 1092.25 'reset with pathspecs inside sparse definition': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents 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
+	test_all_match git reset base -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git reset base -- nonexistent-file &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git reset deepest -- deep &&
+	test_all_match git status --porcelain=v2
 
-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
+ok 25 - reset with pathspecs inside sparse definition
 
-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 1092.26 'reset with pathspecs outside sparse definition': 
+	init_repos &&
+	test_all_match git checkout -b reset-test base &&
 
-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
+	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 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
+	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 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
+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 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 1092.27 'reset with wildcard pathspec': 
+	init_repos &&
 
-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
+	test_all_match git reset update-deep -- deep\* &&
+	test_all_match git ls-files -s -- deep &&
 
-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
+	test_all_match git reset deepest -- deep\*\*\* &&
+	test_all_match git ls-files -s -- deep &&
 
-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
+	# The following `git reset`s result in updating the index on files with
+	# `skip-worktree` enabled. To avoid failing due to discrepancies in reported
+	# "modified" files, `test_sparse_match` reset is performed separately from
+	# "full-checkout" reset, then the index contents of all repos are verified.
 
-expecting success of 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
+	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 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
+	test_sparse_match git reset update-folder2 -- folder\* &&
+	git -C full-checkout reset update-folder2 -- folder\* &&
+	test_all_match git ls-files -s -- folder10 folder1 folder2 &&
 
-expecting success of 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
+	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 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
+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 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 1092.28 'reset hard with removed sparse dir': 
+	init_repos &&
 
-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
+	run_on_all git rm -r --sparse folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git reset --hard &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	cat >expect <<-\EOF &&
+	folder1/
+	EOF
 
-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
+	git -C sparse-index ls-files --sparse folder1 >out &&
+	test_cmp expect out
 
-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
+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 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 1092.29 'update-index modify outside sparse definition': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	# 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 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
+	# If file has skip-worktree enabled, but the file is present, it is
+	# treated the same as if skip-worktree is disabled
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git update-index folder1/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	# 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 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
+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 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 1092.30 'update-index --add outside sparse definition': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	# Create folder1, add new file
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/b &&
 
-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
+	# The *untracked* out-of-cone file is added to the index because it does
+	# not have a `skip-worktree` bit to signal that it should be ignored
+	# (unlike in `git add`, which will fail due to the file being outside
+	# the sparse checkout definition).
+	test_all_match git update-index --add folder1/b &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 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
+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 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 1092.31 'update-index --remove outside sparse definition': 
+	init_repos &&
 
-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
+	# 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 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
+	test_sparse_match git diff-index --cached HEAD &&
 
-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
+	# Reset the state
+	test_all_match git reset --hard &&
 
-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
+	# When --ignore-skip-worktree-entries is specified, out-of-cone
+	# (skip-worktree) files are ignored
+	test_sparse_match git update-index --remove --ignore-skip-worktree-entries folder1/a &&
+	test_sparse_match git diff --cached --name-status &&
+	test_must_be_empty sparse-checkout-out &&
 
-expecting success of 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
+	test_sparse_match git diff-index --cached HEAD &&
 
-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
+	# Reset the state
+	test_all_match git reset --hard &&
 
-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
+	# --force-remove supersedes --ignore-skip-worktree-entries, removing
+	# a skip-worktree file from the index (and disk) when both are specified
+	# with --remove
+	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --cached --name-status &&
+	test_cmp expect sparse-checkout-out &&
 
-expecting success of 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
+	test_sparse_match git diff-index --cached HEAD
 
-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
+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 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 1092.32 'update-index with directories': 
+	init_repos &&
 
-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
+	# 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 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
+	# When update-index is given a directory name WITHOUT a trailing slash, it will
+	# behave in different ways depending on the status of the directory on disk:
+	# * if it exists, the command exits with an error ("add individual files instead")
+	# * if it does NOT exist (e.g., in a sparse-checkout), it is assumed to be a
+	#   file and either triggers an error ("does not exist  and --remove not passed")
+	#   or is ignored completely (when using --remove)
+	test_all_match test_must_fail git update-index deep &&
+	run_on_all test_must_fail git update-index folder1 &&
+	test_must_fail git -C full-checkout update-index --remove folder1 &&
+	test_sparse_match git update-index --remove folder1 &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 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
+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 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 1092.33 'update-index --again file outside sparse definition': 
+	init_repos &&
 
-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
+	test_all_match git checkout -b test-reupdate &&
 
-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
+	# Update HEAD without modifying the index to introduce a difference in
+	# folder1/a
+	test_sparse_match git reset --soft update-folder1 &&
 
-[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
+	# 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 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
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --name-status &&
+	test_cmp expect sparse-checkout-out
 
-ok 262 - commit empty gitattribues
+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 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
+expecting success of 1092.34 'update-index --cacheinfo': 
+	init_repos &&
 
-ok 263 - commit text=auto
+	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 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
+	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-ok 264 - commit text
+	# Cannot add sparse directory, even in sparse index case
+	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
 
-expecting success of 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
+	# 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 &&
 
-ok 265 - commit -text
+	# To return folder1/a to "normal" for a sparse checkout (ignored &
+	# outside-of-cone), add the skip-worktree flag.
+	test_sparse_match git update-index --skip-worktree folder1/a &&
+	cat >expect <<-EOF &&
+	S folder1/a
+	EOF
+	test_sparse_match git ls-files -t -- folder1/a &&
+	test_cmp expect sparse-checkout-out
 
-expecting success of 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 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 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 1092.35 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-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
+		# 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 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
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-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
+		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 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 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 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 1092.36 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-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
+		# 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 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
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-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
+		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 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
+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 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 1092.37 ''read-tree -mu update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-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
+		# 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 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
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-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
+		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 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
+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 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 1092.38 'read-tree --merge with edit/edit conflicts in sparse directories': 
+	init_repos &&
 
-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
+	# Merge of multiple changes to same directory (but not same files) should
+	# succeed
+	test_all_match git read-tree -mu base rename-base update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	test_all_match git reset --hard &&
 
-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
+	test_all_match git read-tree -mu rename-base update-folder2 &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git reset --hard &&
 
-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
+	test_all_match test_must_fail git read-tree -mu base update-folder1 rename-out-to-in &&
+	test_all_match test_must_fail git read-tree -mu rename-out-to-in update-folder1
 
-expecting success of 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
+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 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 1092.39 'read-tree --prefix': 
+	init_repos &&
 
-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
+	# 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 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
+	# If no differing index entries exist matching the prefix,
+	# `read-tree --prefix` updates the index successfully
+	test_all_match git rm -rf deep/deeper1/deepest/ &&
+	test_all_match git read-tree --prefix=deep/deeper1/deepest -u deepest &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	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 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
+	test_all_match git rm -rf --sparse folder2/0 &&
+	test_all_match git read-tree --prefix=folder2/0/ -u rename-out-to-out &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 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
+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 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 1092.40 'read-tree --merge with directory-file conflicts': 
+	init_repos &&
 
-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
+	test_all_match git checkout -b test-branch rename-base &&
 
-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
+	# Although the index matches, without --no-sparse-checkout, outside-of-
+	# definition files will not exist on disk for sparse checkouts
+	test_sparse_match git read-tree -mu rename-out-to-out &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_path_is_missing sparse-checkout/folder2 &&
+	test_path_is_missing sparse-index/folder2 &&
 
-expecting success of 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
+	test_sparse_match git read-tree --reset -u HEAD &&
+	test_sparse_match git status --porcelain=v2 &&
 
-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
+	test_sparse_match git read-tree -mu --no-sparse-checkout rename-out-to-out &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_cmp sparse-checkout/folder2/0/1 sparse-index/folder2/0/1
 
-expecting success of 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
+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 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 1092.41 'merge, cherry-pick, and rebase': 
+	init_repos &&
 
-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
+	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
+	do
+		test_all_match git checkout -B temp update-deep &&
+		test_all_match git $OPERATION update-folder1 &&
+		test_all_match git rev-parse HEAD^{tree} &&
+		test_all_match git $OPERATION update-folder2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
 
-expecting success of 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
+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 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 1092.42 'merge with conflict outside cone': 
+	init_repos &&
 
-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
+	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 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
+	# Resolve the conflict in different ways:
+	# 1. Revert to the base
+	test_all_match git checkout base -- deep/deeper2/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	# 2. Add the file with conflict markers
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_all_match git add --sparse folder1/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	# 3. Rename the file to another sparse filename and
+	#    accept conflict markers as resolved content.
+	run_on_all mv folder2/a folder2/z &&
+	test_sparse_match test_must_fail git add folder2 &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder2/z &&
+	test_all_match git add --sparse folder2 &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	test_all_match git merge --continue &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git rev-parse HEAD^{tree}
 
-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
+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 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 1092.43 'cherry-pick/rebase with conflict outside cone': 
+	init_repos &&
 
-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
+	for OPERATION in cherry-pick rebase
+	do
+		test_all_match git checkout -B tip &&
+		test_all_match git reset --hard merge-left &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match test_must_fail git $OPERATION merge-right &&
+		test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+		# Resolve the conflict in different ways:
+		# 1. Revert to the base
+		test_all_match git checkout base -- deep/deeper2/a &&
+		test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+		# 2. Add the file with conflict markers
+		# NEEDSWORK: Even though the merge conflict removed the
+		# SKIP_WORKTREE bit from the index entry for folder1/a, we should
+		# warn that this is a problematic add.
+		test_sparse_match test_must_fail git add folder1/a &&
+		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+		test_sparse_unstaged folder1/a &&
+		test_all_match git add --sparse folder1/a &&
+		test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+		# 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 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
+		test_all_match git $OPERATION --continue &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
 
-expecting success of 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
+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 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 1092.44 'merge with outside renames': 
+	init_repos &&
 
-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
+	for type in out-to-out out-to-in in-to-out
+	do
+		test_all_match git reset --hard &&
+		test_all_match git checkout -f -b merge-$type update-deep &&
+		test_all_match git merge -m "$type" rename-$type &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
 
-expecting success of 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
+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 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 1092.45 'cherry-pick with conflicts': 
+	init_repos &&
 
-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
+	write_script edit-conflict <<-\EOF &&
+	echo $1 >conflict
+	EOF
 
-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
+	test_all_match git checkout -b to-cherry-pick &&
+	run_on_all ../edit-conflict ABC &&
+	test_all_match git add conflict &&
+	test_all_match git commit -m "conflict to pick" &&
 
-expecting success of 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
+	test_all_match git checkout -B base HEAD~1 &&
+	run_on_all ../edit-conflict DEF &&
+	test_all_match git add conflict &&
+	test_all_match git commit -m "conflict in base" &&
 
-expecting success of 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
+	test_all_match test_must_fail git cherry-pick to-cherry-pick
 
-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
+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 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 1092.46 'stash': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	# Stash a sparse directory (folder1)
+	test_all_match git checkout -b test-branch rename-base &&
+	test_all_match git reset --soft rename-out-to-out &&
+	test_all_match git stash &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	# Apply the sparse directory stash without reinstating the index
+	test_all_match git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	# 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 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
+	# Apply the sparse directory stash *with* reinstating the index
+	test_all_match git stash apply --index -q &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	# Reset to state where we will get a conflict applying the stash
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard update-folder1 &&
 
-expecting success of 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
+	# Apply the sparse directory stash with conflicts
+	test_all_match test_must_fail git stash apply --index -q &&
+	test_all_match test_must_fail git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	# Reset to base branch
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard base &&
 
-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
+	# Stash & unstash an untracked file outside of the sparse checkout
+	# definition.
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/new &&
+	test_all_match git stash -u &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	test_all_match git stash pop -q &&
+	test_all_match git status --porcelain=v2
 
-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
+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 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 1092.47 'checkout-index inside sparse definition': 
+	init_repos &&
 
-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
+	run_on_all rm -f deep/a &&
+	test_all_match git checkout-index -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 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
+	echo test >>new-a &&
+	run_on_all cp ../new-a a &&
+	test_all_match test_must_fail git checkout-index -- a &&
+	test_all_match git checkout-index -f -- a &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 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
+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 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 1092.48 'checkout-index outside sparse definition': 
+	init_repos &&
 
-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
+	# Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
+	# an error
+	test_sparse_match test_must_fail git checkout-index -- folder1/a &&
+	test_grep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
+	test_path_is_missing folder1/a &&
 
-expecting success of 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
+	# With --ignore-skip-worktree-bits, outside-of-cone files are checked out
+	test_sparse_match git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a &&
 
-expecting success of 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
+	run_on_sparse rm -rf folder1 &&
+	echo test >new-a &&
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all cp ../new-a folder1/a &&
 
-expecting success of 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
+	test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+	test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
+	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
 
-expecting success of 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
+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 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 1092.49 'checkout-index with folders': 
+	init_repos &&
 
-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
+	# Inside checkout definition
+	test_all_match test_must_fail git checkout-index -f -- deep/ &&
 
-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
+	# 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 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
+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-14 13:28:34.186677808 +0000
++++ sparse-index-err	2026-03-14 13:28:34.274677808 +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 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 1092.50 'checkout-index --all': 
+	init_repos &&
 
-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
+	test_all_match git checkout-index --all &&
+	test_sparse_match test_path_is_missing folder1 &&
 
-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
+	# --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 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
+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 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 1092.51 'clean': 
+	init_repos &&
 
-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
+	echo bogus >>.gitignore &&
+	run_on_all cp ../.gitignore . &&
+	test_all_match git add .gitignore &&
+	test_all_match git commit -m "ignore bogus files" &&
 
-expecting success of 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
+	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 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
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git clean -f &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_exists folder1/bogus &&
+	run_on_all test_path_is_missing folder1/untracked &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/untracked &&
 
-expecting success of 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
+	test_all_match git clean -fd &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_exists folder1/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
+	run_on_all test_path_is_missing deep/untracked-deep/untracked &&
 
-expecting success of 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
+	test_all_match git clean -xf &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_is_missing folder1/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
 
-expecting success of 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
+	test_all_match git clean -xdf &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_is_missing deep/untracked-deep/bogus &&
 
-expecting success of 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
+	test_sparse_match test_path_is_dir folder1
 
-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 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 51 - clean
 
-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 1092.52 'show (cached blobs/trees)': 
+		init_repos &&
 
-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
+		test_all_match git show :a &&
+		test_all_match git show :deep/a &&
+		test_sparse_match git show :folder1/a &&
 
-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
+		# The error message differs depending on whether
+		# the directory exists in the worktree.
+		test_all_match test_must_fail git show :deep/ &&
+		test_must_fail git -C full-checkout show :folder1/ &&
+		test_sparse_match test_must_fail git show :folder1/ &&
 
-expecting success of 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
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
 
-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
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git show :deep/deeper2/ &&
 
-expecting success of 0027.371 'compare_files LF NNO_attr_-text_aeol__input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
+		# 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/
 	
-ok 371 - compare_files LF NNO_attr_-text_aeol__input_LF.txt
+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 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 1092.53 'rev-parse (cached blobs/trees)': 
+		init_repos &&
 
-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
+		test_all_match git rev-parse :a &&
+		test_all_match git rev-parse :deep/a &&
+		test_sparse_match git rev-parse :folder1/a &&
 
-expecting success of 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
+		# The error message differs depending on whether
+		# the directory exists in the worktree.
+		test_all_match test_must_fail git rev-parse :deep/ &&
+		test_must_fail git -C full-checkout rev-parse :folder1/ &&
+		test_sparse_match test_must_fail git rev-parse :folder1/ &&
 
-expecting success of 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
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
 
-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
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
 
-expecting success of 0027.377 'compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		# 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/
 	
-ok 377 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
+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 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 1092.54 'submodule handling': 
+	init_repos &&
 
-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
+	test_sparse_match git sparse-checkout add modules &&
+	test_all_match mkdir modules &&
+	test_all_match touch modules/a &&
+	test_all_match git add modules &&
+	test_all_match git commit -m "add modules directory" &&
 
-expecting success of 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
+	test_config_global protocol.file.allow always &&
 
-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
+	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
+	test_all_match git commit -m "add submodule" &&
 
-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
+	# having a submodule prevents "modules" from collapse
+	test_sparse_match git sparse-checkout set deep/deeper1 &&
+	git -C sparse-index ls-files --sparse --stage >cache &&
+	grep "100644 .*	modules/a" cache &&
+	grep "160000 $(git -C initial-repo rev-parse HEAD) 0	modules/sub" cache
 
-expecting success of 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
+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 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 1092.55 'sparse-index is expanded and converted back': 
+	init_repos &&
 
-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
+	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 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
+	# ls-files expands on read, but does not write.
+	rm trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index ls-files &&
+	test_region index ensure_full_index trace2.txt
 
-expecting success of 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
+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":"20260314T132848.991126Z-H5c947e1c-P003fc974","thread":"main","time":"2026-03-14T13:28:49.006946Z","file":"sparse-index.c","line":237,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20260314T132848.991126Z-H5c947e1c-P003fc974","thread":"main","time":"2026-03-14T13:28:49.007099Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000153,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_enter","sid":"20260314T132848.991126Z-H5c947e1c-P003fc974","thread":"main","time":"2026-03-14T13:28:48.992626Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T132848.991126Z-H5c947e1c-P003fc974","thread":"main","time":"2026-03-14T13:28:49.007441Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T132848.991126Z-H5c947e1c-P003fc974","thread":"main","time":"2026-03-14T13:28:49.006448Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.013822,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T132848.991126Z-H5c947e1c-P003fc974","thread":"main","time":"2026-03-14T13:28:49.007634Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000193,"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":"20260314T132849.046856Z-H5c947e1c-P003fc9b9","thread":"main","time":"2026-03-14T13:28:49.047726Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T132849.046856Z-H5c947e1c-P003fc9b9","thread":"main","time":"2026-03-14T13:28:49.048518Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000792,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 55 - sparse-index is expanded and converted back
 
-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 1092.56 'index.sparse disabled inline uses full index': 
+	init_repos &&
 
-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
+	# 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 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
+	# Since index.sparse is set to true at a repo level, the index
+	# is converted from full to sparse when read, then never expanded
+	# over the course of `git status`. It is written to disk as a sparse
+	# index.
+	rm -f trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index status &&
+	test_region index convert_to_sparse trace2.txt &&
+	! test_region index ensure_full_index trace2.txt &&
 
-expecting success of 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
+	# 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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+On branch base
+You are in a sparse checkout with 73% of tracked files present.
 
-expecting success of 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
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20260314T132849.500081Z-H5c947e1c-P003fcb59","thread":"main","time":"2026-03-14T13:28:49.501020Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T132849.500081Z-H5c947e1c-P003fcb59","thread":"main","time":"2026-03-14T13:28:49.511396Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.010375,"nesting":2,"category":"index","label":"ensure_full_index"}
+On branch base
+You are in a sparse checkout.
 
-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
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20260314T132849.608335Z-H5c947e1c-P003fcbba","thread":"main","time":"2026-03-14T13:28:49.609127Z","file":"sparse-index.c","line":237,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20260314T132849.608335Z-H5c947e1c-P003fcbba","thread":"main","time":"2026-03-14T13:28:49.609287Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000160,"nesting":2,"category":"index","label":"convert_to_sparse"}
+On branch base
+You are in a sparse checkout.
 
-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
+nothing to commit, working tree clean
+ok 56 - index.sparse disabled inline uses full index
 
-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 1092.57 'sparse-index is not expanded': 
+	init_repos &&
 
-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
+	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 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
+	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 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
+	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 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
+	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 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
+	ensure_not_expanded reset base -- deep/a &&
+	ensure_not_expanded reset base -- nonexistent-file &&
+	ensure_not_expanded reset deepest -- deep &&
 
-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
+	# 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 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
+	# Wildcard identifies only in-cone files, no index expansion
+	ensure_not_expanded reset deepest -- deep/\* &&
 
-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
+	# Wildcard identifies only full sparse directories, no index expansion
+	ensure_not_expanded reset deepest -- folder\* &&
 
-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
+	ensure_not_expanded clean -fd &&
 
-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
+	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
+	)
 
-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
+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 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 1092.58 'sparse-index is not expanded: merge conflict in cone': 
+	init_repos &&
 
-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
+	for side in right left
+	do
+		git -C sparse-index checkout -b expand-$side base &&
+		echo $side >sparse-index/deep/a &&
+		git -C sparse-index commit -a -m "$side" || return 1
+	done &&
 
-expecting success of 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
+	(
+		sane_unset GIT_TEST_MERGE_ALGORITHM &&
+		git -C sparse-index config pull.twohead ort &&
+		ensure_not_expanded ! merge -m merged expand-right
+	)
 
-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
+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 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 1092.59 'sparse-index is not expanded: stash': 
+	init_repos &&
 
-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
+	echo >>sparse-index/a &&
+	ensure_not_expanded stash &&
+	ensure_not_expanded stash list &&
+	ensure_not_expanded stash show stash@{0} &&
+	ensure_not_expanded stash apply stash@{0} &&
+	ensure_not_expanded stash drop stash@{0} &&
 
-expecting success of 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
+	echo >>sparse-index/deep/new &&
+	ensure_not_expanded stash -u &&
+	(
+		WITHOUT_UNTRACKED_TXT=1 &&
+		ensure_not_expanded stash pop
+	) &&
 
-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
+	ensure_not_expanded stash create &&
+	oid=$(git -C sparse-index stash create) &&
+	ensure_not_expanded stash store -m "test" $oid &&
+	ensure_not_expanded reset --hard &&
+	ensure_not_expanded stash pop
 
-expecting success of 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
+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.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
+expecting success of 1092.60 'describe tested on all': 
+	init_repos &&
 
-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
+	# Add tag to be read by describe
 
-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
+	run_on_all git tag -a v1.0 -m "Version 1" &&
+	test_all_match git describe --dirty &&
+	run_on_all rm g &&
+	test_all_match git describe --dirty
 
-expecting success of 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
+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.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
+expecting success of 1092.61 'sparse-index is not expanded: describe': 
+	init_repos &&
 
-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
+	# Add tag to be read by describe
 
-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
+	git -C sparse-index tag -a v1.0 -m "Version 1" &&
 
-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
+	ensure_not_expanded describe --dirty &&
+	echo "test" >>sparse-index/g &&
+	ensure_not_expanded describe --dirty &&
+	ensure_not_expanded describe
 
-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
+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 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
+expecting success of 1092.62 'sparse index is not expanded: diff and diff-index': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	# 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.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
+	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.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
+	# 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.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
+	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.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
+	# 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.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
+	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.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
+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.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 1092.63 'sparse index is not expanded: show and rev-parse': 
+	init_repos &&
 
-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
+	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.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
+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.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
+expecting success of 1092.64 'sparse index is not expanded: update-index': 
+	init_repos &&
 
-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
+	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.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
+	echo "test" >sparse-index/README.md &&
+	echo "test2" >sparse-index/a &&
+	rm -f sparse-index/deep/a &&
 
-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
+	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.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
+	ensure_not_expanded reset --soft update-deep &&
+	ensure_not_expanded update-index --add --remove --again
 
-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
+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.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
+expecting success of 1092.65 'sparse index is not expanded: blame': 
+	init_repos &&
 
-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
+	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.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 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.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 1092.66 'sparse index is not expanded: fetch/pull': 
+	init_repos &&
 
-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
+	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.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
+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.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
+expecting success of 1092.67 'sparse index is not expanded: read-tree': 
+	init_repos &&
 
-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
+	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.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
+	rm -rf sparse-index/deep/deeper2 &&
+	ensure_not_expanded add . &&
+	ensure_not_expanded commit -m "test" &&
 
-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
+	ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
 
-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 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.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 1092.68 'ls-files': 
+	init_repos &&
 
-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
+	# Use a smaller sparse-checkout for reduced output
+	test_sparse_match git sparse-checkout set &&
 
-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
+	# Behavior agrees by default. Sparse index is expanded.
+	test_all_match git ls-files &&
 
-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
+	# With --sparse, the sparse index data changes behavior.
+	git -C sparse-index ls-files --sparse >actual &&
 
-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
+	cat >expect <<-\EOF &&
+	a
+	before/
+	deep/
+	e
+	folder1-
+	folder1.x
+	folder1/
+	folder10
+	folder2/
+	g
+	x/
+	z
+	EOF
 
-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
+	test_cmp expect actual &&
 
-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
+	# 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.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
+	# 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.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_all_match git ls-files --modified &&
 
-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
+	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.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
+	# 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.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_all_match git ls-files &&
+	git -C sparse-index ls-files --sparse >actual &&
 
-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
+	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.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
+	test_cmp expect actual &&
 
-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
+	# Double-check index expansion is avoided
+	ensure_not_expanded ls-files --sparse
 
-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
+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.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
+expecting success of 1092.69 'sparse index is not expanded: sparse-checkout': 
+	init_repos &&
 
-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
+	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.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
+	# 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.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
+	ensure_not_expanded sparse-checkout add folder1 &&
 
-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
+	# 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.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 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.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 1092.70 'reset mixed and checkout orphan': 
+	init_repos &&
 
-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_all_match git checkout rename-out-to-in &&
 
-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
+	# 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.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
+	# 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.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
+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.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
+expecting success of 1092.71 'add everything with deep new file': 
+	init_repos &&
 
-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
+	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
 
-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
+	run_on_all touch deep/deeper1/x &&
+	test_all_match git add . &&
+	test_all_match git status --porcelain=v2
 
-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
+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.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
+expecting success of 1092.72 'checkout behaves oddly with df-conflict-1': 
+	init_repos &&
 
-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
+	test_sparse_match git sparse-checkout disable &&
 
-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
+	write_script edit-content <<-\EOF &&
+	echo content >>folder1/larger-content
+	git add folder1
+	EOF
 
-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
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
 
-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_all_match git status --porcelain=v2 &&
 
-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
+	# 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.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
+	# 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.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
+	# The sparse-index reports no output
+	test_must_be_empty sparse-index-out &&
 
-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
+	# 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.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
+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.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
+expecting success of 1092.73 'checkout behaves oddly with df-conflict-2': 
+	init_repos &&
 
-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
+	test_sparse_match git sparse-checkout disable &&
 
-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
+	write_script edit-content <<-\EOF &&
+	echo content >>folder2/larger-content
+	git add folder2
+	EOF
 
-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
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
 
-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_all_match git status --porcelain=v2 &&
 
-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
+	# 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.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
+	# 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.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
+	# 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.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
-		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
+	# 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.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
+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.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 1092.74 'mv directory from out-of-cone to in-cone': 
+	init_repos &&
 
-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
+	# <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.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
+	test_all_match git reset --hard &&
 
-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
+	# <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.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
+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.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 1092.75 'rm pathspec inside sparse definition': 
+	init_repos &&
 
-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_all_match git rm deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-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 wildcard
+	run_on_all git reset --hard &&
+	test_all_match git rm deep/* &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	# 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.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
+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.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
-		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 1092.76 'rm pathspec outside sparse definition': 
+	init_repos &&
 
-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
+	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.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
+	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.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
+	cat >folder1-sparse <<-EOF &&
+	rm ${SQ}folder1/${SQ}
+	EOF
 
-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
+	# 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.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 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.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
+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.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
+expecting success of 1092.77 'rm pathspec expands index when necessary': 
+	init_repos &&
 
-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
+	# in-cone pathspec (do not expand)
+	ensure_not_expanded rm "deep/deep*" &&
+	test_must_be_empty sparse-index-err &&
 
-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
+	# out-of-cone pathspec (expand)
+	! ensure_not_expanded rm --sparse "folder1/a*" &&
+	test_must_be_empty sparse-index-err &&
 
-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
+	# pathspec that should expand index
+	! ensure_not_expanded rm "*/a" &&
+	test_must_be_empty sparse-index-err &&
 
-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
+	! ensure_not_expanded rm "**a" &&
+	test_must_be_empty sparse-index-err
 
-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
+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":"20260314T132923.960916Z-H5c947e1c-P0000506d","thread":"main","time":"2026-03-14T13:29:23.977099Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T132923.960916Z-H5c947e1c-P0000506d","thread":"main","time":"2026-03-14T13:29:23.978582Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T132924.080264Z-H5c947e1c-P000050bf","thread":"main","time":"2026-03-14T13:29:24.081245Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T132924.080264Z-H5c947e1c-P000050bf","thread":"main","time":"2026-03-14T13:29:24.083045Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T132924.198632Z-H5c947e1c-P000050fc","thread":"main","time":"2026-03-14T13:29:24.199481Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T132924.198632Z-H5c947e1c-P000050fc","thread":"main","time":"2026-03-14T13:29:24.200849Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 77 - rm pathspec expands index when necessary
 
-expecting success of 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
+expecting success of 1092.78 'sparse index is not expanded: rm': 
+	init_repos &&
 
-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
+	ensure_not_expanded rm deep/a &&
 
-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
+	# test in-cone wildcard
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm deep/* &&
 
-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
+	# test recursive rm
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm -r deep
 
-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 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.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 1092.79 'grep with and --cached': 
+	init_repos &&
 
-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
+	test_all_match git grep --cached a &&
+	test_all_match git grep --cached a -- "folder1/*"
 
-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
+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.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
+expecting success of 1092.80 'grep is not expanded': 
+	init_repos &&
 
-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
+	ensure_not_expanded grep a &&
+	ensure_not_expanded grep a -- deep/* &&
 
-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
+	# 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.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
+	# 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.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
+	# 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.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
+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.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
+checking known breakage of 1092.81 'grep within submodules is not expanded': 
+	init_repos_as_submodules &&
 
-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
+	# do not use ensure_not_expanded() here, because `grep` should be
+	# run in the superproject, not in "./sparse-index"
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+	git grep --cached --recurse-submodules a -- "*/folder1/*" &&
+	test_region ! index ensure_full_index trace2.txt
 
-expecting success of 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 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Adding existing repo at 'full-checkout' to the index
+Adding existing repo at 'sparse-checkout' to the index
+Adding existing repo at 'sparse-index' to the index
+ 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
+hint: The sparse index is expanding to a full index, a slow operation.
+hint: Your working directory likely has contents that are outside of
+hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
+hint: see your sparse-checkout definition and compare it to your working
+hint: directory contents. Running 'git clean' may assist in this cleanup.
+hint: Disable this message with "git config set advice.sparseIndexExpanded false"
+full-checkout/folder1/a:a
+sparse-checkout/folder1/a:a
+sparse-index/folder1/a:a
+{"event":"region_enter","sid":"20260314T132930.335994Z-H5c947e1c-P00006662","thread":"main","time":"2026-03-14T13:29:30.350807Z","file":"sparse-index.c","line":372,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
+not ok 81 - grep within submodules is not expanded # TODO known breakage
 
-expecting success of 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 1092.82 'grep sparse directory within submodules': 
+	init_repos_as_submodules &&
 
-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
+	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.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
+warning: unable to rmdir 'full-checkout': Directory not empty
+warning: unable to rmdir 'sparse-checkout': Directory not empty
+warning: unable to rmdir 'sparse-index': Directory not empty
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Adding existing repo at 'full-checkout' to the index
+Adding existing repo at 'sparse-checkout' to the index
+Adding existing repo at 'sparse-index' to the index
+ 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
+hint: The sparse index is expanding to a full index, a slow operation.
+hint: Your working directory likely has contents that are outside of
+hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
+hint: see your sparse-checkout definition and compare it to your working
+hint: directory contents. Running 'git clean' may assist in this cleanup.
+hint: Disable this message with "git config set advice.sparseIndexExpanded false"
+ok 82 - grep sparse directory within submodules
 
-expecting success of 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
+expecting success of 1092.83 'write-tree': 
+	init_repos &&
 
-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
+	test_all_match git write-tree &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-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
+	# 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.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
+	# 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.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
+	# 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.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 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.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 1092.84 'sparse-index is not expanded: write-tree': 
+	init_repos &&
 
-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
+	ensure_not_expanded write-tree &&
 
-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
+	echo "test1" >>sparse-index/a &&
+	git -C sparse-index update-index a &&
+	ensure_not_expanded write-tree
 
-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
+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.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
+expecting success of 1092.85 'diff-files with pathspec inside sparse definition': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-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
+	run_on_all ../edit-contents deep/a &&
 
-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
+	test_all_match git diff-files &&
 
-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
-		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
+	test_all_match git diff-files -- deep/a &&
 
-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
+	# test wildcard
+	test_all_match git diff-files -- "deep/*"
 
-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
+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.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
+expecting success of 1092.86 'diff-files with pathspec outside sparse definition': 
+	init_repos &&
 
-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
+	test_sparse_match git diff-files -- folder2/a &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-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
+	# 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.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
+	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.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
+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.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
+expecting success of 1092.87 'sparse index is not expanded: diff-files': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-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
+	run_on_all ../edit-contents deep/a &&
 
-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
+	ensure_not_expanded diff-files &&
+	ensure_not_expanded diff-files -- deep/a &&
+	ensure_not_expanded diff-files -- "deep/*"
 
-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 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.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 1092.88 'diff-tree': 
+	init_repos &&
 
-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
+	# 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.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
+	# 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.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
+	# 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.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
+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.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
+expecting success of 1092.89 'sparse-index is not expanded: diff-tree': 
+	init_repos &&
 
-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
+	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.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
+	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.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
+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.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
+expecting success of 1092.90 'worktree': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-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
+	for repo in full-checkout sparse-checkout sparse-index
+	do
+		worktree=${repo}-wt &&
+		git -C $repo worktree add ../$worktree &&
 
-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
+		# 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.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
+		# 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.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
+		git -C $repo worktree remove ../$worktree || return 1
+	done &&
 
-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
+	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.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
+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.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
+expecting success of 1092.91 'worktree is not expanded': 
+	init_repos &&
 
-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
+	ensure_not_expanded worktree add .worktrees/hotfix &&
+	ensure_not_expanded worktree remove .worktrees/hotfix
 
-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
+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.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
+expecting success of 1092.92 'check-attr with pathspec inside sparse definition': 
+	init_repos &&
 
-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
+	echo "a -crlf myAttr" >>.gitattributes &&
+	run_on_all cp ../.gitattributes ./deep &&
 
-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
+	test_all_match git check-attr -a -- deep/a &&
 
-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
+	test_all_match git add deep/.gitattributes &&
+	test_all_match git check-attr -a --cached -- deep/a
 
-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
+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.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
+expecting success of 1092.93 'check-attr with pathspec outside sparse definition': 
+	init_repos &&
 
-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
+	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.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
+	test_all_match git check-attr -a -- folder1/a &&
 
-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
+	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.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 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.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
+checking known breakage of 1092.94 'diff --check with pathspec outside sparse definition': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo "a " >"$1"
+	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
+	test_all_match git config core.whitespace -trailing-space,-space-before-tab &&
 
-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 "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.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
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match test_must_fail git diff --check --cached -- folder1/a
 
-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 615 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+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.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 616 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+expecting success of 1092.95 'sparse-index is not expanded: check-attr': 
+	init_repos &&
 
-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 617 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+	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.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
+	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.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
+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.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
+expecting success of 1092.96 'advice.sparseIndexExpanded': 
+	init_repos &&
 
-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
+	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.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
+	git -C sparse-index sparse-checkout disable 2>err &&
+	test_line_count = 0 err
 
-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
+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.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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	deep/deeper2/deepest/
 
-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
+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.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
+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.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
+	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.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 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+{"event":"region_enter","sid":"20260314T132953.544623Z-H5c947e1c-P0000b00e","thread":"main","time":"2026-03-14T13:29:53.561727Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T132953.544623Z-H5c947e1c-P0000b00e","thread":"main","time":"2026-03-14T13:29:53.562629Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000901,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 97 - cat-file -p
 
-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 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.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
+	echo ":deep/a" >in &&
+	test_all_match git cat-file --batch <in &&
+	ensure_not_expanded cat-file --batch <in &&
 
-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
+	echo ":folder1/a" >in &&
+	test_all_match git cat-file --batch <in &&
+	ensure_expanded cat-file --batch <in &&
 
-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
+	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.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
+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":"20260314T132955.068277Z-H5c947e1c-P0000b483","thread":"main","time":"2026-03-14T13:29:55.069229Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T132955.068277Z-H5c947e1c-P0000b483","thread":"main","time":"2026-03-14T13:29:55.086165Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.016935,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T132955.345503Z-H5c947e1c-P0000b554","thread":"main","time":"2026-03-14T13:29:55.346538Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T132955.345503Z-H5c947e1c-P0000b554","thread":"main","time":"2026-03-14T13:29:55.358124Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.011586,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 98 - cat-file --batch
 
-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
+# still have 2 known breakage(s)
+# passed all remaining 96 test(s)
+1..98
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3404-rebase-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive/.git/
+expecting success of 3404.1 'setup': 
+	git switch -C primary &&
+	test_commit A file1 &&
+	test_commit B file1 &&
+	test_commit C file2 &&
+	test_commit D file1 &&
+	test_commit E file3 &&
+	git checkout -b branch1 A &&
+	test_commit F file4 &&
+	test_commit G file1 &&
+	test_commit H file5 &&
+	git checkout -b branch2 F &&
+	test_commit I file6 &&
+	git checkout -b conflict-branch A &&
+	test_commit one conflict &&
+	test_commit two conflict &&
+	test_commit three conflict &&
+	test_commit four conflict &&
+	git checkout -b no-conflict-branch A &&
+	test_commit J fileJ &&
+	test_commit K fileK &&
+	test_commit L fileL &&
+	test_commit M fileM &&
+	git checkout -b no-ff-branch A &&
+	test_commit N fileN &&
+	test_commit O fileO &&
+	test_commit P fileP
 
-expecting success of 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
+Switched to a new branch 'primary'
+[primary (root-commit) 6e62bf8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[primary 313fe96] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[primary d0f65f2] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[primary 0547e3f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[primary 8f99a4f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to a new branch 'branch1'
+[branch1 cfefd94] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[branch1 83751a6] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch1 4373208] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5
+Switched to a new branch 'branch2'
+[branch2 615be62] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file6
+Switched to a new branch 'conflict-branch'
+[conflict-branch b895952] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+[conflict-branch 766a798] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch 1eadf03] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch f91a2b3] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'no-conflict-branch'
+[no-conflict-branch 808874f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileJ
+[no-conflict-branch 265b89e] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileK
+[no-conflict-branch 6b0f5e6] L
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileL
+[no-conflict-branch 3389558] M
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileM
+Switched to a new branch 'no-ff-branch'
+[no-ff-branch 53b4423] N
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileN
+[no-ff-branch cc47714] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileO
+[no-ff-branch faef1a5] P
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileP
+ok 1 - setup
 
-expecting success of 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 3404.2 'rebase --keep-empty': 
+	git checkout -b emptybranch primary &&
+	git commit --allow-empty -m "empty" &&
+	git rebase --keep-empty -i HEAD~2 &&
+	git log --oneline >actual &&
+	test_line_count = 6 actual
 
-expecting success of 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
+Switched to a new branch 'emptybranch'
+[emptybranch da33401] empty
+ Author: A U Thor <author@example.com>
+Successfully rebased and updated refs/heads/emptybranch.
+ok 2 - rebase --keep-empty
 
-expecting success of 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
+expecting success of 3404.3 'rebase -i with empty todo list': 
+	cat >expect <<-\EOF &&
+	error: nothing to do
+	EOF
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="#" \
+			git rebase -i HEAD^ >output 2>&1
+	) &&
+	tail -n 1 output >actual &&  # Ignore output about changing todo list
+	test_cmp expect actual
 
-expecting success of 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
+ok 3 - rebase -i with empty todo list
 
-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
+expecting success of 3404.4 'rebase -i with the exec command': 
+	git checkout primary &&
+	(
+	set_fake_editor &&
+	FAKE_LINES="1 exec_>touch-one
+		2 exec_>touch-two exec_false exec_>touch-three
+		3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
+	export FAKE_LINES &&
+	test_must_fail git rebase -i A
+	) &&
+	test_path_is_file touch-one &&
+	test_path_is_file touch-two &&
+	# Missing because we should have stopped by now.
+	test_path_is_missing touch-three &&
+	test_cmp_rev C HEAD &&
+	git rebase --continue &&
+	test_path_is_file touch-three &&
+	test_path_is_file "touch-file  name with spaces" &&
+	test_path_is_file touch-after-semicolon &&
+	test_cmp_rev primary HEAD &&
+	rm -f touch-*
 
-expecting success of 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
+Switched to branch 'primary'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-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
+rebase -i script after editing:
+pick 313fe96 B
+exec >touch-one
+pick d0f65f2 C
+exec >touch-two
+exec false
+exec >touch-three
+pick 0547e3f D
+pick 8f99a4f E
+exec >"touch-file  name with spaces"; >touch-after-semicolon
+Rebasing (2/9)
Executing: >touch-one
+Rebasing (3/9)
Rebasing (4/9)
Executing: >touch-two
+Rebasing (5/9)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
 
-expecting success of 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 rebase --continue
 
-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
 
-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
+Rebasing (6/9)
Executing: >touch-three
+Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
Executing: >"touch-file  name with spaces"; >touch-after-semicolon
+Successfully rebased and updated refs/heads/primary.
+ok 4 - rebase -i with the exec command
 
-expecting success of 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
+expecting success of 3404.5 'rebase -i with the exec command runs from tree root': 
+	git checkout primary &&
+	mkdir subdir && (cd subdir &&
+	set_fake_editor &&
+	FAKE_LINES="1 exec_>touch-subdir" \
+		git rebase -i HEAD^
+	) &&
+	test_path_is_file touch-subdir &&
+	rm -fr subdir
 
-expecting success of 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
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f E
 
-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
+rebase -i script after editing:
+pick 8f99a4f E
+exec >touch-subdir
+Rebasing (2/2)
Executing: >touch-subdir
+Successfully rebased and updated refs/heads/primary.
+ok 5 - rebase -i with the exec command runs from tree root
 
-expecting success of 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
+expecting success of 3404.6 'rebase -i with exec allows git commands in subdirs': 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "git rebase --abort ||:" &&
+	git checkout primary &&
+	mkdir subdir && (cd subdir &&
+	set_fake_editor &&
+	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
+		git rebase -i HEAD^
+	)
 
-expecting success of 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
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f E
 
-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
+rebase -i script after editing:
+pick 8f99a4f E
+x cd subdir && git rev-parse --is-inside-work-tree
+Rebasing (2/2)
Executing: cd subdir && git rev-parse --is-inside-work-tree
+true
+Successfully rebased and updated refs/heads/primary.
+fatal: no rebase in progress
+ok 6 - rebase -i with exec allows git commands in subdirs
 
-expecting success of 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
+expecting success of 3404.7 'rebase -i sets work tree properly': 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "test_might_fail git rebase --abort" &&
+	mkdir subdir &&
+	git rebase -x "(cd subdir && git rev-parse --show-toplevel)" HEAD^ \
+		>actual &&
+	! grep "/subdir$" actual
 
-expecting success of 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
+Rebasing (2/2)
Executing: (cd subdir && git rev-parse --show-toplevel)
+Successfully rebased and updated refs/heads/primary.
+fatal: no rebase in progress
+ok 7 - rebase -i sets work tree properly
 
-expecting success of 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
+expecting success of 3404.8 'rebase -i with the exec command checks tree cleanness': 
+	git checkout primary &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \
+			git rebase -i HEAD^
+	) &&
+	test_cmp_rev primary^ HEAD &&
+	git reset --hard &&
+	git rebase --continue
 
-expecting success of 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
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f E
 
-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
+rebase -i script after editing:
+exec echo foo >file1
+pick 8f99a4f E
+Rebasing (1/2)
Executing: echo foo >file1
+error: cannot rebase: You have unstaged changes.
+warning: execution succeeded: echo foo >file1
+but left changes to the index and/or the working tree.
+Commit or stash your changes, and then run
 
-expecting success of 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
+  git rebase --continue
 
-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
 
-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
+HEAD is now at 0547e3f D
+Rebasing (2/2)
Successfully rebased and updated refs/heads/primary.
+ok 8 - rebase -i with the exec command checks tree cleanness
 
-expecting success of 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
+expecting success of 3404.9 'cherry-pick works with rebase --exec': 
+	test_when_finished "git cherry-pick --abort; \
+			    git rebase --abort; \
+			    git checkout primary" &&
+	echo "exec git cherry-pick G" >todo &&
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i D D
+	) &&
+	test_cmp_rev G CHERRY_PICK_HEAD
 
-expecting success of 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
+rebase -i script after editing:
+exec git cherry-pick G
+Rebasing (1/1)
Executing: git cherry-pick G
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 83751a6... G
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+file1: needs merge
+error: cannot rebase: You have unstaged changes.
+error: additionally, your index contains uncommitted changes.
+warning: execution failed: git cherry-pick G
+and made changes to the index and/or the working tree.
+You can fix the problem, and then run
 
-expecting success of 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 rebase --continue
 
-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
 
-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
+Previous HEAD position was 0547e3f D
+Switched to branch 'primary'
+ok 9 - cherry-pick works with rebase --exec
 
-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
+expecting success of 3404.10 'rebase -x with empty command fails': 
+	test_when_finished "git rebase --abort ||:" &&
+	test_must_fail env git rebase -x "" @ 2>actual &&
+	test_write_lines "error: empty exec command" >expected &&
+	test_cmp expected actual &&
+	test_must_fail env git rebase -x " " @ 2>actual &&
+	test_cmp expected actual
 
-expecting success of 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
+fatal: no rebase in progress
+ok 10 - rebase -x with empty command fails
 
-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
+expecting success of 3404.11 'rebase -x with newline in command fails': 
+	test_when_finished "git rebase --abort ||:" &&
+	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
+	test_write_lines "error: exec commands cannot contain newlines" \
+			 >expected &&
+	test_cmp expected actual
 
-expecting success of 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
+fatal: no rebase in progress
+ok 11 - rebase -x with newline in command fails
 
-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
+expecting success of 3404.12 'rebase -i with exec of inexistent command': 
+	git checkout primary &&
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
+			git rebase -i HEAD^ >actual 2>&1
+	) &&
+	! grep "Maybe git-rebase is broken" actual
 
-expecting success of 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
+Already on 'primary'
+ok 12 - rebase -i with exec of inexistent command
 
-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
+expecting success of 3404.13 'implicit interactive rebase does not invoke sequence editor': 
+	test_when_finished "git rebase --abort ||:" &&
+	GIT_SEQUENCE_EDITOR="echo bad >" git rebase -x"echo one" @^
 
-expecting success of 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
+Rebasing (2/2)
Executing: echo one
+one
+Successfully rebased and updated refs/heads/primary.
+fatal: no rebase in progress
+ok 13 - implicit interactive rebase does not invoke sequence editor
 
-expecting success of 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
+expecting success of 3404.14 'no changes are a nop': 
+	git checkout branch2 &&
+	git rebase -i F &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
+	test_cmp_rev I HEAD
 
-expecting success of 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
+Switched to branch 'branch2'
+Successfully rebased and updated refs/heads/branch2.
+ok 14 - no changes are a nop
 
-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
+expecting success of 3404.15 'test the [branch] option': 
+	git checkout -b dead-end &&
+	git rm file6 &&
+	git commit -m "stop here" &&
+	git rebase -i F branch2 &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
+	test_cmp_rev I branch2 &&
+	test_cmp_rev I HEAD
 
-expecting success of 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
+Switched to a new branch 'dead-end'
+rm 'file6'
+[dead-end f814f58] stop here
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file6
+Successfully rebased and updated refs/heads/branch2.
+ok 15 - test the [branch] option
 
-expecting success of 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
+expecting success of 3404.16 'test --onto <branch>': 
+	git checkout -b test-onto branch2 &&
+	git rebase -i --onto branch1 F &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
+	test_cmp_rev HEAD^ branch1 &&
+	test_cmp_rev I branch2
 
-expecting success of 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
+Switched to a new branch 'test-onto'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test-onto.
+ok 16 - test --onto <branch>
 
-expecting success of 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
+expecting success of 3404.17 'rebase on top of a non-conflicting commit': 
+	git checkout branch1 &&
+	git tag original-branch1 &&
+	git rebase -i branch2 &&
+	test file6 = $(git diff --name-only original-branch1) &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+	test_cmp_rev I branch2 &&
+	test_cmp_rev I HEAD~2
 
-expecting success of 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
+Switched to branch 'branch1'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
+ok 17 - rebase on top of a non-conflicting commit
 
-expecting success of 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 3404.18 'reflog for the branch shows state before rebase': 
+	test_cmp_rev branch1@{1} original-branch1
 
-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 18 - reflog for the branch shows state before rebase
 
-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 3404.19 'reflog for the branch shows correct finish message': 
+	printf "rebase (finish): refs/heads/branch1 onto %s\n" \
+		"$(git rev-parse branch2)" >expected &&
+	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
+	test_cmp expected actual
 
-expecting success of 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
+ok 19 - reflog for the branch shows correct finish message
 
-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
+expecting success of 3404.20 'exchange two commits': 
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
+	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test G = $(git cat-file commit HEAD | sed -ne \$p) &&
+	blob1=$(git rev-parse --short HEAD^:file1) &&
+	blob2=$(git rev-parse --short HEAD:file1) &&
+	commit=$(git rev-parse --short HEAD)
 
-expecting success of 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
+rebase -i script before editing:
+pick ae8f65e G
+pick f5f5249 H
 
-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
+rebase -i script after editing:
+pick f5f5249 H
+pick ae8f65e G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
+ok 20 - exchange two commits
 
-expecting success of 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
+expecting success of 3404.21 'stop on conflicting pick': 
+	cat >expect <<-EOF &&
+	diff --git a/file1 b/file1
+	index $blob1..$blob2 100644
+	--- a/file1
+	+++ b/file1
+	@@ -1 +1 @@
+	-A
+	+G
+	EOF
+	cat >expect2 <<-EOF &&
+	<<<<<<< HEAD
+	D
+	=======
+	G
+	>>>>>>> $commit (G)
+	EOF
+	git tag new-branch1 &&
+	test_must_fail git rebase -i primary &&
+	test "$(git rev-parse HEAD~3)" = "$(git rev-parse primary)" &&
+	test_cmp expect .git/rebase-merge/patch &&
+	test_cmp expect2 file1 &&
+	test "$(git diff --name-status |
+		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
+	grep -v "^#" <.git/rebase-merge/done >actual &&
+	test_line_count = 4 actual &&
+	test 0 = $(grep -c "^[^#]" <.git/rebase-merge/git-rebase-todo)
 
-expecting success of 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
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 5d18e54... G
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 5d18e54... G
+ok 21 - stop on conflicting pick
 
-expecting success of 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 3404.22 'show conflicted patch': 
+	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+	grep "show.*REBASE_HEAD" stderr &&
+	# the original stopped-sha1 is abbreviated
+	stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
+	test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
 
-expecting success of 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
+trace: run_command: git show REBASE_HEAD --
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' show REBASE_HEAD --
+trace: built-in: git show REBASE_HEAD --
+ok 22 - show conflicted patch
 
-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
+expecting success of 3404.23 'abort': 
+	git rebase --abort &&
+	test_cmp_rev new-branch1 HEAD &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+	test_path_is_missing .git/rebase-merge
 
-expecting success of 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
+ok 23 - abort
 
-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
+expecting success of 3404.24 'abort with error when new base cannot be checked out': 
+	git rm --cached file1 &&
+	git commit -m "remove file in base" &&
+	test_must_fail git rebase -i primary > output 2>&1 &&
+	test_grep "The following untracked working tree files would be overwritten by checkout:" \
+		output &&
+	test_grep "file1" output &&
+	test_path_is_missing .git/rebase-merge &&
+	rm file1 &&
+	git reset --hard HEAD^
 
-expecting success of 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
+rm 'file1'
+[branch1 2dd5570] remove file in base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+error: The following untracked working tree files would be overwritten by checkout:
+	file1
+HEAD is now at 5d18e54 G
+ok 24 - abort with error when new base cannot be checked out
 
-expecting success of 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
+expecting success of 3404.25 'retain authorship': 
+	echo A > file7 &&
+	git add file7 &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
+	git tag twerp &&
+	git rebase -i --onto primary HEAD^ &&
+	git show HEAD >actual &&
+	grep "^Author: Twerp Snog" actual
 
-expecting success of 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
+[branch1 2596307] different author
+ Author: Twerp Snog <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
+Author: Twerp Snog <author@example.com>
+ok 25 - retain authorship
 
-expecting success of 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
+expecting success of 3404.26 'retain authorship w/ conflicts': 
+	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
+	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
 
-expecting success of 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
+	git reset --hard twerp &&
+	test_commit a conflict a conflict-a &&
+	git reset --hard twerp &&
 
-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
+	GIT_AUTHOR_NAME=AttributeMe &&
+	export GIT_AUTHOR_NAME &&
+	test_commit b conflict b conflict-b &&
+	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
 
-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
+	test_must_fail git rebase -i conflict-a &&
+	echo resolved >conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test_cmp_rev conflict-a^0 HEAD^ &&
+	git show >out &&
+	grep AttributeMe out
 
-expecting success of 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
+HEAD is now at 2596307 different author
+[branch1 748a43d] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+HEAD is now at 2596307 different author
+[branch1 34d1a6c] b
+ Author: AttributeMe <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (1/1)
Auto-merging conflict
+CONFLICT (add/add): Merge conflict in conflict
+error: could not apply 34d1a6c... b
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 34d1a6c... b
+[detached HEAD 7866b12] b
+ Author: AttributeMe <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/branch1.
+Author: AttributeMe <author@example.com>
+ok 26 - retain authorship w/ conflicts
 
-expecting success of 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 3404.27 'squash': 
+	git reset --hard twerp &&
+	echo B > file7 &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
+	echo "******************************" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
+			git rebase -i --onto primary HEAD~2
+	) &&
+	test B = $(cat file7) &&
+	test_cmp_rev HEAD^ primary
 
-expecting success of 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
+HEAD is now at 2596307 different author
+[branch1 cdf577a] nitfol
+ Author: Nitfol <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+******************************
+rebase -i script before editing:
+pick 2596307 different author
+pick cdf577a nitfol
 
-expecting success of 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
+rebase -i script after editing:
+pick 2596307 different author
+squash cdf577a nitfol
+Rebasing (1/2)
Rebasing (2/2)
[detached HEAD d2d5ba7] different author
+ Author: Twerp Snog <author@example.com>
+ Date: Thu Apr 7 15:33:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Successfully rebased and updated refs/heads/branch1.
+ok 27 - squash
 
-expecting success of 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
+expecting success of 3404.28 'retain authorship when squashing': 
+	git show HEAD >actual &&
+	grep "^Author: Twerp Snog" actual
 
-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
+Author: Twerp Snog <author@example.com>
+ok 28 - retain authorship when squashing
 
-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
+expecting success of 3404.29 '--continue tries to commit': 
+	git reset --hard D &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
+		echo resolved > file1 &&
+		git add file1 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
+	test_cmp_rev HEAD^ new-branch1 &&
+	git show HEAD >actual &&
+	grep chouette actual
 
-expecting success of 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
+HEAD is now at 0547e3f D
+Rebasing (1/1)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f... D
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 0547e3f... D
+[detached HEAD e986ac9] chouette!
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/branch1.
+    chouette!
+ok 29 - --continue tries to commit
 
-expecting success of 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
+expecting success of 3404.30 'verbose flag is heeded, even after --continue': 
+	git reset --hard primary@{1} &&
+	test_tick &&
+	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
+	echo resolved > file1 &&
+	git add file1 &&
+	git rebase --continue > output &&
+	grep "^ file1 | 2 +-$" output
 
-expecting success of 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
+HEAD is now at 0547e3f D
+Changes from 6e62bf890e21973b771e4e6fc28f5ade62edb4bc to 5d18e5414f663da21d1363c271f2d684aeda7b5b:
+ file1 | 2 +-
+ file4 | 1 +
+ file5 | 1 +
+ file6 | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+ create mode 100644 file4
+ create mode 100644 file5
+ create mode 100644 file6
+Rebasing (1/1)
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f... D
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 0547e3f... D
+Successfully rebased and updated refs/heads/branch1.
+ file1 | 2 +-
+ok 30 - verbose flag is heeded, even after --continue
 
-expecting success of 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
+expecting success of 3404.31 'multi-squash only fires up editor once': 
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 squash 2 squash 3 squash 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual
 
-expecting success of 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
+rebase -i script before editing:
+pick 615be62 I
+pick 0626e8d H
+pick 5d18e54 G
+pick 7384ee8 D
 
-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
+rebase -i script after editing:
+pick 615be62 I
+squash 0626e8d H
+squash 5d18e54 G
+squash 7384ee8 D
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 450e393] I
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file5
+ create mode 100644 file6
+Successfully rebased and updated refs/heads/branch1.
+ok 31 - multi-squash only fires up editor once
 
-expecting success of 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 3404.32 'multi-fixup does not fire up editor': 
+	git checkout -b multi-fixup E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="NEVER" \
+			FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	! grep NEVER output &&
+	git checkout @{-1} &&
+	git branch -D multi-fixup
 
-expecting success of 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
+Switched to a new branch 'multi-fixup'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
+pick 313fe96 B
+fixup d0f65f2 C
+fixup 0547e3f D
+fixup 8f99a4f E
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/multi-fixup.
+Switched to branch 'branch1'
+Deleted branch multi-fixup (was b72b875).
+ok 32 - multi-fixup does not fire up editor
 
-expecting success of 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
+expecting success of 3404.33 'commit message used after conflict': 
+	git checkout -b conflict-fixup conflict-branch &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual &&
+	git checkout @{-1} &&
+	git branch -D conflict-fixup
 
-expecting success of 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
+Switched to a new branch 'conflict-fixup'
+rebase -i script before editing:
+pick b895952 one
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
 
-expecting success of 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
+rebase -i script after editing:
+pick b895952 one
+fixup 1eadf03 three
+fixup f91a2b3 four
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1eadf03... three
+[detached HEAD 0894a89] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (3/3)
Successfully rebased and updated refs/heads/conflict-fixup.
+Switched to branch 'branch1'
+Deleted branch conflict-fixup (was 72b9a95).
+ok 33 - commit message used after conflict
 
-expecting success of 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 3404.34 'commit message retained after conflict': 
+	git checkout -b conflict-squash conflict-branch &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep TWICE output >actual &&
+	test_line_count = 2 actual &&
+	git checkout @{-1} &&
+	git branch -D conflict-squash
 
-expecting success of 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
+Switched to a new branch 'conflict-squash'
+rebase -i script before editing:
+pick b895952 one
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
 
-expecting success of 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
+rebase -i script after editing:
+pick b895952 one
+fixup 1eadf03 three
+squash f91a2b3 four
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1eadf03... three
+[detached HEAD f044f69] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (3/3)
[detached HEAD e98a2cf] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Successfully rebased and updated refs/heads/conflict-squash.
+Switched to branch 'branch1'
+Deleted branch conflict-squash (was e98a2cf).
+ok 34 - commit message retained after conflict
 
-expecting success of 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
+expecting success of 3404.35 'squash and fixup generate correct log messages': 
+	cat >expect-squash-fixup <<-\EOF &&
+	B
 
-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
+	D
 
-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
+	ONCE
+	EOF
+	git checkout -b squash-fixup E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
+	test_cmp expect-squash-fixup actual-squash-fixup &&
+	git cat-file commit HEAD@{2} >actual &&
+	grep "^# This is a combination of 3 commits\." actual &&
+	git cat-file commit HEAD@{3} >actual &&
+	grep "^# This is a combination of 2 commits\." actual  &&
+	git checkout @{-1} &&
+	git branch -D squash-fixup
 
-expecting success of 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
+Switched to a new branch 'squash-fixup'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
+pick 313fe96 B
+fixup d0f65f2 C
+squash 0547e3f D
+fixup 8f99a4f E
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 2e14af9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/squash-fixup.
+# This is a combination of 3 commits.
+# This is a combination of 2 commits.
+Switched to branch 'branch1'
+Deleted branch squash-fixup (was 2e14af9).
+ok 35 - squash and fixup generate correct log messages
 
-expecting success of 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
+expecting success of 3404.36 'squash ignores comments': 
+	git checkout -b skip-comments E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual &&
+	git checkout @{-1} &&
+	git branch -D skip-comments
 
-expecting success of 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
+Switched to a new branch 'skip-comments'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
+# comment
+pick 313fe96 B
+# comment
+squash d0f65f2 C
+# comment
+squash 0547e3f D
+# comment
+squash 8f99a4f E
+# comment
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD c7441e9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/skip-comments.
+Switched to branch 'branch1'
+Deleted branch skip-comments (was c7441e9).
+ok 36 - squash ignores comments
 
-expecting success of 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
+expecting success of 3404.37 'squash ignores blank lines': 
+	git checkout -b skip-blank-lines E &&
+	base=$(git rev-parse HEAD~4) &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
+	test $base = $(git rev-parse HEAD^) &&
+	git show >output &&
+	grep ONCE output >actual &&
+	test_line_count = 1 actual &&
+	git checkout @{-1} &&
+	git branch -D skip-blank-lines
 
-expecting success of 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
+Switched to a new branch 'skip-blank-lines'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
 
-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
+pick 313fe96 B
 
-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
+squash d0f65f2 C
 
-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
+squash 0547e3f D
 
-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
+squash 8f99a4f E
 
-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
+Rebasing (3/4)
Rebasing (4/4)
Rebasing (5/4)
[detached HEAD c7441e9] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/skip-blank-lines.
+Switched to branch 'branch1'
+Deleted branch skip-blank-lines (was c7441e9).
+ok 37 - squash ignores blank lines
 
-expecting success of 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
+expecting success of 3404.38 'squash works as expected': 
+	git checkout -b squash-works no-conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3
+	) &&
+	test $one = $(git rev-parse HEAD~2)
 
-expecting success of 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
+Switched to a new branch 'squash-works'
+rebase -i script before editing:
+pick 265b89e K
+pick 6b0f5e6 L
+pick 3389558 M
 
-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
+rebase -i script after editing:
+pick 265b89e K
+s 3389558 M
+pick 6b0f5e6 L
+Rebasing (2/3)
[detached HEAD b352334] K
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileK
+ create mode 100644 fileM
+Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-works.
+ok 38 - squash works as expected
 
-expecting success of 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
+expecting success of 3404.39 'interrupted squash works as expected': 
+	git checkout -b interrupted-squash conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 3 2" \
+			git rebase -i HEAD~3
+	) &&
+	test_write_lines one two four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	echo resolved > conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test $one = $(git rev-parse HEAD~2)
 
-expecting success of 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
+Switched to a new branch 'interrupted-squash'
+rebase -i script before editing:
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
 
-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
+rebase -i script after editing:
+pick 766a798 two
+squash f91a2b3 four
+pick 1eadf03 three
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply f91a2b3... four
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f91a2b3... four
+[detached HEAD a2f4578] two
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1eadf03... three
+[detached HEAD 6b76c65] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Successfully rebased and updated refs/heads/interrupted-squash.
+ok 39 - interrupted squash works as expected
 
-expecting success of 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 3404.40 'interrupted squash works as expected (case 2)': 
+	git checkout -b interrupted-squash2 conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="3 squash 1 2" \
+			git rebase -i HEAD~3
+	) &&
+	test_write_lines one four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	test_write_lines one two four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	echo resolved > conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test $one = $(git rev-parse HEAD~2)
 
-expecting success of 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
+Switched to a new branch 'interrupted-squash2'
+rebase -i script before editing:
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
 
-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
+rebase -i script after editing:
+pick f91a2b3 four
+squash 766a798 two
+pick 1eadf03 three
+Rebasing (1/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply f91a2b3... four
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply f91a2b3... four
+[detached HEAD d1badcc] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 766a798... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 766a798... two
+[detached HEAD 13f7405] four
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:25:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1eadf03... three
+[detached HEAD 6785ad5] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Successfully rebased and updated refs/heads/interrupted-squash2.
+ok 40 - interrupted squash works as expected (case 2)
 
-expecting success of 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
+expecting success of 3404.41 '--continue tries to commit, even for "edit"': 
+	echo unrelated > file7 &&
+	git add file7 &&
+	test_tick &&
+	git commit -m "unrelated change" &&
+	parent=$(git rev-parse HEAD^) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo edited > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
+	test edited = $(git show HEAD:file7) &&
+	git show HEAD >actual &&
+	grep chouette actual &&
+	test $parent = $(git rev-parse HEAD^)
 
-expecting success of 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
+[interrupted-squash2 98947cc] unrelated change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+rebase -i script before editing:
+pick 98947cc unrelated change
 
-expecting success of 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
+rebase -i script after editing:
+edit 98947cc unrelated change
+Rebasing (1/1)
Stopped at 98947cc...  unrelated change
+You can amend the commit now, with
 
-expecting success of 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
+  git commit --amend 
 
-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
+Once you are satisfied with your changes, run
 
-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
+  git rebase --continue
+[detached HEAD 9483ccd] chouette!
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:39:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Successfully rebased and updated refs/heads/interrupted-squash2.
+    chouette!
+ok 41 - --continue tries to commit, even for "edit"
 
-expecting success of 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
+expecting success of 3404.42 'aborted --continue does not squash commits after "edit"': 
+	old=$(git rev-parse HEAD) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue
+	) &&
+	test $old = $(git rev-parse HEAD) &&
+	git rebase --abort
 
-expecting success of 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
+rebase -i script before editing:
+pick 9483ccd chouette!
 
-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
+rebase -i script after editing:
+edit 9483ccd chouette!
+Rebasing (1/1)
Stopped at 9483ccd...  chouette!
+You can amend the commit now, with
 
-expecting success of 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
+  git commit --amend 
 
-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
+Once you are satisfied with your changes, run
 
-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
+  git rebase --continue
+Aborting commit due to empty commit message.
+error: could not commit staged changes.
+ok 42 - aborted --continue does not squash commits after "edit"
 
-expecting success of 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
+expecting success of 3404.43 'auto-amend only edited commits after "edit"': 
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
+		echo "and again" > file7 &&
+		git add file7 &&
+		test_tick &&
+		test_must_fail env FAKE_COMMIT_MESSAGE="and again" \
+			git rebase --continue
+	) &&
+	git rebase --abort
 
-expecting success of 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
+rebase -i script before editing:
+pick 9483ccd chouette!
 
-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
+rebase -i script after editing:
+edit 9483ccd chouette!
+Rebasing (1/1)
Stopped at 9483ccd...  chouette!
+You can amend the commit now, with
 
-expecting success of 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
+  git commit --amend 
 
-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
+Once you are satisfied with your changes, run
 
-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
+  git rebase --continue
+[detached HEAD 9b7064d] edited file7 again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: 
+You have uncommitted changes in your working tree. Please, commit them
+first and then run 'git rebase --continue' again.
+ok 43 - auto-amend only edited commits after "edit"
 
-expecting success of 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
+expecting success of 3404.44 'clean error after failed "exec"': 
+	test_tick &&
+	test_when_finished "git rebase --abort || :" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^
+	) &&
+	echo "edited again" > file7 &&
+	git add file7 &&
+	test_must_fail git rebase --continue 2>error &&
+	test_grep "you have staged changes in your working tree" error &&
+	test_grep ! "could not open.*for reading" error
 
-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
+rebase -i script before editing:
+pick 9483ccd chouette!
 
-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
+rebase -i script after editing:
+pick 9483ccd chouette!
+exec false
+Rebasing (2/2)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
 
-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
+  git rebase --continue
 
-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
 
-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
+error: you have staged changes in your working tree
+ok 44 - clean error after failed "exec"
 
-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
+expecting success of 3404.45 'rebase a detached HEAD': 
+	grandparent=$(git rev-parse HEAD~2) &&
+	git checkout $(git rev-parse HEAD) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
+	test $grandparent = $(git rev-parse HEAD~2)
 
-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
+Note: switching to '9483ccdd3462028242a62a4b10b5300681f344d7'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 9483ccd chouette!
+rebase -i script before editing:
+pick 6785ad5 three
+pick 9483ccd chouette!
 
-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
+rebase -i script after editing:
+pick 9483ccd chouette!
+pick 6785ad5 three
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 45 - rebase a detached HEAD
 
-expecting success of 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 3404.46 'rebase a commit violating pre-commit': 
+	test_hook pre-commit <<-\EOF &&
+	test -z "$(git diff --cached --check)"
+	EOF
+	echo "monde! " >> file1 &&
+	test_tick &&
+	test_must_fail git commit -m doesnt-verify file1 &&
+	git commit -m doesnt-verify --no-verify file1 &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES=2 git rebase -i HEAD~2
+	)
 
-expecting success of 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
+[detached HEAD c2de550] doesnt-verify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+rebase -i script before editing:
+pick 2a5c937 three
+pick c2de550 doesnt-verify
 
-expecting success of 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
+rebase -i script after editing:
+pick c2de550 doesnt-verify
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 46 - rebase a commit violating pre-commit
 
-expecting success of 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
+expecting success of 3404.47 'rebase with a file named HEAD in worktree': 
+	git reset --hard &&
+	git checkout -b branch3 A &&
 
-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
+	(
+		GIT_AUTHOR_NAME="Squashed Away" &&
+		export GIT_AUTHOR_NAME &&
+		>HEAD &&
+		git add HEAD &&
+		git commit -m "Add head" &&
+		>BODY &&
+		git add BODY &&
+		git commit -m "Add body"
+	) &&
 
-expecting success of 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
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" git rebase -i @{-1}
+	) &&
+	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
 
-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 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
+HEAD is now at 772e3c6 doesnt-verify
+Warning: you are leaving 2 commits 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
+  772e3c6 doesnt-verify
+  82d2839 chouette!
 
-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
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 772e3c6
 
-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
+Switched to a new branch 'branch3'
+[branch3 838aee5] Add head
+ Author: Squashed Away <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 HEAD
+[branch3 271c26d] Add body
+ Author: Squashed Away <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 BODY
+rebase -i script before editing:
+pick 838aee5 Add head
+pick 271c26d Add body
 
-expecting success of 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
+rebase -i script after editing:
+pick 838aee5 Add head
+squash 271c26d Add body
+Rebasing (1/2)
Rebasing (2/2)
[detached HEAD b224944] Add head
+ Author: Squashed Away <author@example.com>
+ Date: Thu Apr 7 15:46:13 2005 -0700
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 BODY
+ create mode 100644 HEAD
+Successfully rebased and updated refs/heads/branch3.
+ok 47 - rebase with a file named HEAD in worktree
 
-expecting success of 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
+expecting success of 3404.48 'do "noop" when there is nothing to cherry-pick': 
 
-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
+	git checkout -b branch4 HEAD &&
+	GIT_EDITOR=: git commit --amend \
+		--author="Somebody else <somebody@else.com>" &&
+	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
+	git rebase -i branch3 &&
+	test_cmp_rev branch3 branch4
 
-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
 
-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
+Switched to a new branch 'branch4'
+[branch4 beb8dd6] Add head
+ Author: Somebody else <somebody@else.com>
+ Date: Thu Apr 7 15:46:13 2005 -0700
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 BODY
+ create mode 100644 HEAD
+warning: skipped previously applied commit beb8dd6
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Successfully rebased and updated refs/heads/branch4.
+ok 48 - do "noop" when there is nothing to cherry-pick
 
-expecting success of 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
+expecting success of 3404.49 'submodule rebase setup': 
+	git checkout A &&
+	mkdir sub &&
+	(
+		cd sub && git init && >elif &&
+		git add elif && git commit -m "submodule initial"
+	) &&
+	echo 1 >file1 &&
+	git add file1 sub &&
+	test_tick &&
+	git commit -m "One" &&
+	echo 2 >file1 &&
+	test_tick &&
+	git commit -a -m "Two" &&
+	(
+		cd sub && echo 3 >elif &&
+		git commit -a -m "submodule second"
+	) &&
+	test_tick &&
+	git commit -a -m "Three changes submodule"
 
-expecting success of 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
+Note: switching to 'A'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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 switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 6e62bf8 A
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive/sub/.git/
+[master (root-commit) 6795896] submodule initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 elif
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[detached HEAD 068ccfe] One
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 160000 sub
+[detached HEAD 8cd1639] Two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 628e79e] submodule second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD d80ae32] Three changes submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 49 - submodule rebase setup
 
-expecting success of 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
+expecting success of 3404.50 'submodule rebase -i': 
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2 3" git rebase -i A
+	)
+
+rebase -i script before editing:
+pick 068ccfe One
+pick 8cd1639 Two
+pick d80ae32 Three changes submodule
+
+rebase -i script after editing:
+pick 068ccfe One
+squash 8cd1639 Two
+pick d80ae32 Three changes submodule
+Rebasing (2/3)
[detached HEAD 1dab715] One
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:47:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 160000 sub
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 50 - submodule rebase -i
+
+expecting success of 3404.51 'submodule conflict setup': 
+	git tag submodule-base &&
+	git checkout HEAD^ &&
+	(
+		cd sub && git checkout HEAD^ && echo 4 >elif &&
+		git add elif && git commit -m "submodule conflict"
+	) &&
+	git add sub &&
+	test_tick &&
+	git commit -m "Conflict in submodule" &&
+	git tag submodule-topic
 
-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
+Previous HEAD position was b1c1bea Three changes submodule
+HEAD is now at 1dab715 One
+M	sub
+Note: switching to '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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 6795896 submodule initial
+[detached HEAD c3aa4c8] submodule conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 2f8239b] Conflict in submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 51 - submodule conflict setup
 
-expecting success of 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
+expecting success of 3404.52 'rebase -i continue with only submodule staged': 
+	test_must_fail git rebase -i submodule-base &&
+	git add sub &&
+	git rebase --continue &&
+	test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
 
-expecting success of 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
+Rebasing (1/1)
hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (sub), and either merge commit c3aa4c8
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add sub
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule sub
+CONFLICT (submodule): Merge conflict in sub
+error: could not apply 2f8239b... Conflict in submodule
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 2f8239b... Conflict in submodule
+[detached HEAD e05ea42] Conflict in submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 52 - rebase -i continue with only submodule staged
 
-expecting success of 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 3404.53 'rebase -i continue with unstaged submodule': 
+	git checkout submodule-topic &&
+	git reset --hard &&
+	test_must_fail git rebase -i submodule-base &&
+	git reset &&
+	git rebase --continue &&
+	test_cmp_rev submodule-base HEAD
 
-expecting success of 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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
+  e05ea42 Conflict in submodule
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> e05ea42
 
-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
+HEAD is now at 2f8239b Conflict in submodule
+HEAD is now at 2f8239b Conflict in submodule
+Rebasing (1/1)
hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (sub), and either merge commit c3aa4c8
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add sub
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule sub
+CONFLICT (submodule): Merge conflict in sub
+error: could not apply 2f8239b... Conflict in submodule
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 2f8239b... Conflict in submodule
+Unstaged changes after reset:
+M	sub
+Successfully rebased and updated detached HEAD.
+ok 53 - rebase -i continue with unstaged submodule
 
-expecting success of 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
+expecting success of 3404.54 'avoid unnecessary reset': 
+	git checkout primary &&
+	git reset --hard &&
+	test-tool chmtime =123456789 file3 &&
+	git update-index --refresh &&
+	HEAD=$(git rev-parse HEAD) &&
+	git rebase -i HEAD~4 &&
+	test $HEAD = $(git rev-parse HEAD) &&
+	MTIME=$(test-tool chmtime --get file3) &&
+	test 123456789 = $MTIME
 
-expecting success of 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
+warning: unable to rmdir 'sub': Directory not empty
+Previous HEAD position was b1c1bea Three changes submodule
+Switched to branch 'primary'
+HEAD is now at 8f99a4f E
+Successfully rebased and updated refs/heads/primary.
+ok 54 - avoid unnecessary reset
 
-expecting success of 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
+expecting success of 3404.55 'reword': 
+	git checkout -b reword-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \
+			git rebase -i A &&
+		git show HEAD >actual &&
+		grep "E changed" actual &&
+		test $(git rev-parse primary) != $(git rev-parse HEAD) &&
+		test_cmp_rev primary^ HEAD^ &&
+		FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
+			git rebase -i A &&
+		git show HEAD^ >actual &&
+		grep "D changed" actual &&
+		FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \
+			git rebase -i A &&
+		git show HEAD~3 >actual &&
+		grep "B changed" actual &&
+		FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \
+			git rebase -i A
+	) &&
+	git show HEAD~2 >actual &&
+	grep "C changed" actual
 
-expecting success of 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
+Switched to a new branch 'reword-branch'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+reword 8f99a4f E
+Rebasing (4/4)
[detached HEAD 7045bc0] E changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/reword-branch.
+    E changed
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 7045bc0 E changed
 
-expecting success of 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
+rebase -i script after editing:
+pick 313fe96 B
+pick d0f65f2 C
+reword 0547e3f D
+pick 7045bc0 E changed
+Rebasing (3/4)
[detached HEAD ffc34d0] D changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
+    D changed
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick ffc34d0 D changed
+pick 4804c05 E changed
 
-expecting success of 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
+rebase -i script after editing:
+reword 313fe96 B
+pick d0f65f2 C
+pick ffc34d0 D changed
+pick 4804c05 E changed
+Rebasing (1/4)
[detached HEAD ff0628d] B changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
+    B changed
+rebase -i script before editing:
+pick ff0628d B changed
+pick e73c68c C
+pick fb271b0 D changed
+pick a55d41c E changed
 
-expecting success of 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
+rebase -i script after editing:
+pick ff0628d B changed
+r e73c68c C
+pick fb271b0 D changed
+p a55d41c E changed
+Rebasing (2/4)
[detached HEAD 234d360] C changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
+    C changed
+ok 55 - reword
 
-expecting success of 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
+expecting success of 3404.56 'no uncommitted changes when rewording and the todo list is reloaded': 
+	git checkout E &&
+	test_when_finished "git checkout @{-1}" &&
+	(
+		set_fake_editor &&
+		GIT_SEQUENCE_EDITOR="\"$PWD/fake-editor.sh\"" &&
+		export GIT_SEQUENCE_EDITOR &&
+		set_reword_editor &&
+		FAKE_LINES="reword 1 reword 2" git rebase -i C
+	) &&
+	check_reworded_commits D E
 
-expecting success of 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
+Note: switching to 'E'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 8f99a4f E
+rebase -i script before editing:
+pick 0547e3f D
+pick 8f99a4f E
 
-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
+rebase -i script after editing:
+reword 0547e3f D
+reword 8f99a4f E
+Rebasing (1/2)
[detached HEAD af7a1e6] D
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Rebasing (3/3)
[detached HEAD d9fff5f] E
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Successfully rebased and updated detached HEAD.
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 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
+  d9fff5f E
+  af7a1e6 D
 
-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
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> d9fff5f
 
-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
+Switched to branch 'reword-branch'
+ok 56 - no uncommitted changes when rewording and the todo list is reloaded
 
-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
+expecting success of 3404.57 'rebase -i can copy notes': 
+	git config notes.rewrite.rebase true &&
+	git config notes.rewriteRef "refs/notes/*" &&
+	test_commit n1 &&
+	test_commit n2 &&
+	test_commit n3 &&
+	git notes add -m"a note" n3 &&
+	git rebase -i --onto n1 n2 &&
+	test "a note" = "$(git notes show HEAD)"
 
-expecting success of 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
+[reword-branch aa5df09] n1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n1.t
+[reword-branch 20afda8] n2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n2.t
+[reword-branch 9a71079] n3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n3.t
+Rebasing (1/1)
Successfully rebased and updated refs/heads/reword-branch.
+ok 57 - rebase -i can copy notes
 
-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
+expecting success of 3404.58 'rebase -i can copy notes over a fixup': 
+	cat >expect <<-\EOF &&
+	an earlier note
 
-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
+	a note
+	EOF
+	git reset --hard n3 &&
+	git notes add -m"an earlier note" n2 &&
+	(
+		set_fake_editor &&
+		GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \
+			git rebase -i n1
+	) &&
+	git notes show > output &&
+	test_cmp expect output
 
-expecting success of 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 9a71079 n3
+rebase -i script before editing:
+pick 20afda8 n2
+pick 9a71079 n3
 
-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
+rebase -i script after editing:
+pick 20afda8 n2
+f 9a71079 n3
+Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-branch.
+ok 58 - rebase -i can copy notes over a fixup
 
-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
+expecting success of 3404.59 'rebase while detaching HEAD': 
+	git symbolic-ref HEAD &&
+	grandparent=$(git rev-parse HEAD~2) &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0
+	) &&
+	test $grandparent = $(git rev-parse HEAD~2) &&
+	test_must_fail git symbolic-ref HEAD
 
-expecting success of 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
+refs/heads/reword-branch
+rebase -i script before editing:
+pick aa5df09 n1
+pick 5b2df83 n2
 
-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
+rebase -i script after editing:
+pick 5b2df83 n2
+pick aa5df09 n1
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+fatal: ref HEAD is not a symbolic ref
+ok 59 - rebase while detaching HEAD
 
-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
+expecting success of 3404.60 'always cherry-pick with --no-ff': 
+	git checkout no-ff-branch &&
+	git tag original-no-ff-branch &&
+	git rebase -i --no-ff A &&
+	for p in 0 1 2
+	do
+		test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
+		git diff HEAD~$p original-no-ff-branch~$p > out &&
+		test_must_be_empty out || return 1
+	done &&
+	test_cmp_rev HEAD~3 original-no-ff-branch~3 &&
+	git diff HEAD~3 original-no-ff-branch~3 > out &&
+	test_must_be_empty out
 
-expecting success of 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
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-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
+  9689317 n1
+  a0bd0ac n2
 
-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
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 9689317
 
-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
+Switched to branch 'no-ff-branch'
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/no-ff-branch.
+ok 60 - always cherry-pick with --no-ff
 
-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
+expecting success of 3404.61 'set up commits with funny messages': 
+	git checkout -b funny A &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "end with slash\\" &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "something (\000) that looks like octal" &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "something (\n) that looks like a newline" &&
+	echo >>file1 &&
+	test_tick &&
+	git commit -a -m "another commit"
 
-expecting success of 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
+Switched to a new branch 'funny'
+[funny f317e30] end with slash\
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[funny d68f8aa] something (\000) that looks like octal
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[funny 495c640] something (\n) that looks like a newline
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[funny 3a6cc5d] another commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 61 - set up commits with funny messages
 
-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
+expecting success of 3404.62 'rebase-i history with funny messages': 
+	git rev-list A..funny >expect &&
+	test_tick &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i A
+	) &&
+	git rev-list A.. >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+rebase -i script before editing:
+pick f317e30 end with slash\
+pick d68f8aa something (\000) that looks like octal
+pick 495c640 something (\n) that looks like a newline
+pick 3a6cc5d another commit
 
-expecting success of 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
+rebase -i script after editing:
+pick f317e30 end with slash\
+pick d68f8aa something (\000) that looks like octal
+pick 495c640 something (\n) that looks like a newline
+pick 3a6cc5d another commit
+Successfully rebased and updated refs/heads/funny.
+ok 62 - rebase-i history with funny messages
 
-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
+expecting success of 3404.63 'prepare for rebase -i --exec': 
+	git checkout primary &&
+	git checkout -b execute &&
+	test_commit one_exec main.txt one_exec &&
+	test_commit two_exec main.txt two_exec &&
+	test_commit three_exec main.txt three_exec
 
-expecting success of 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
+Switched to branch 'primary'
+Switched to a new branch 'execute'
+[execute 1983bb3] one_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main.txt
+[execute 2efd8a2] two_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[execute 66ac40d] three_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 63 - prepare for rebase -i --exec
 
-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
+expecting success of 3404.64 'running "git rebase -i --exec git show HEAD"': 
+	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-expecting success of 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
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+ok 64 - running "git rebase -i --exec git show HEAD"
 
-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
+expecting success of 3404.65 'running "git rebase --exec git show HEAD -i"': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-expecting success of 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
+HEAD is now at 66ac40d three_exec
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+ok 65 - running "git rebase --exec git show HEAD -i"
 
-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
+expecting success of 3404.66 'running "git rebase -ix git show HEAD"': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-expecting success of 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
+HEAD is now at 66ac40d three_exec
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/execute.
+ok 66 - running "git rebase -ix git show HEAD"
 
-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
+expecting success of 3404.67 'rebase -ix with several <CMD>': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,9d" expect >expected &&
+	test_cmp expected actual
 
-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
+HEAD is now at 66ac40d three_exec
+Rebasing (2/4)
Executing: git show HEAD; pwd
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/4)
Executing: git show HEAD; pwd
+Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
+Successfully rebased and updated refs/heads/execute.
+ok 67 - rebase -ix with several <CMD>
 
-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
+expecting success of 3404.68 'rebase -ix with several instances of --exec': 
+	git reset --hard execute &&
+	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
+		FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
+				exec_git_show_HEAD exec_pwd" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~2 >expect
+	) &&
+	sed -e "1,11d" expect >expected &&
+	test_cmp expected actual
 
-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
+HEAD is now at 66ac40d three_exec
+Rebasing (2/6)
Executing: git show HEAD
+Rebasing (3/6)
Executing: pwd
+Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
+Rebasing (6/6)
Executing: pwd
+Successfully rebased and updated refs/heads/execute.
+Rebasing (2/6)
Executing: git show HEAD
+Rebasing (3/6)
Executing: pwd
+Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
+Rebasing (6/6)
Executing: pwd
+Successfully rebased and updated refs/heads/execute.
+ok 68 - rebase -ix with several instances of --exec
 
-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
+expecting success of 3404.69 'rebase -ix with --autosquash': 
+	git reset --hard execute &&
+	git checkout -b autosquash &&
+	echo second >second.txt &&
+	git add second.txt &&
+	git commit -m "fixup! two_exec" &&
+	echo bis >bis.txt &&
+	git add bis.txt &&
+	git commit -m "fixup! two_exec" &&
+	git checkout -b autosquash_actual &&
+	git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual &&
+	git checkout autosquash &&
+	(
+		set_fake_editor &&
+		git checkout -b autosquash_expected &&
+		FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
+		export FAKE_LINES &&
+		git rebase -i HEAD~4 >expect
+	) &&
+	sed -e "1,13d" expect >expected &&
+	test_cmp expected actual
 
-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 66ac40d three_exec
+Switched to a new branch 'autosquash'
+[autosquash 1da6bea] fixup! two_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.txt
+[autosquash 280ba53] fixup! two_exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bis.txt
+Switched to a new branch 'autosquash_actual'
+Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
+Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/autosquash_actual.
+Switched to branch 'autosquash'
+Switched to a new branch 'autosquash_expected'
+Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
+Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
+Successfully rebased and updated refs/heads/autosquash_expected.
+ok 69 - rebase -ix with --autosquash
 
-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 3404.70 'rebase --exec works without -i ': 
+	git reset --hard execute &&
+	rm -rf exec_output &&
+	EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output"  HEAD~2 2>actual &&
+	test_grep  "Successfully rebased and updated" actual &&
+	test_line_count = 2 exec_output &&
+	test_path_is_missing invoked_editor
 
-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
+HEAD is now at 66ac40d three_exec
+Successfully rebased and updated refs/heads/autosquash_expected.
+ok 70 - rebase --exec works without -i 
 
-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
+expecting success of 3404.71 'rebase -i --exec without <CMD>': 
+	git reset --hard execute &&
+	test_must_fail git rebase -i --exec 2>actual &&
+	test_grep "requires a value" actual &&
+	git checkout primary
 
-expecting success of 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 66ac40d three_exec
+error: option `exec' requires a value
+Switched to branch 'primary'
+ok 71 - rebase -i --exec without <CMD>
 
-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 3404.72 'rebase -i --root re-order and drop commits': 
+	git checkout E &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="3 1 2 5" git rebase -i --root
+	) &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
+	test C = $(git cat-file commit HEAD^^^ | sed -ne \$p) &&
+	test 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\ )
 
-expecting success of 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
+Note: switching to 'E'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 8f99a4f E
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
+pick d0f65f2 C
+pick 6e62bf8 A
+pick 313fe96 B
+pick 8f99a4f E
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 72 - rebase -i --root re-order and drop commits
 
-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 3404.73 'rebase -i --root retain root commit author and message': 
+	git checkout A &&
+	echo B >file7 &&
+	git add file7 &&
+	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i --root
+	) &&
+	git cat-file commit HEAD >output &&
+	grep -q "^author Twerp Snog" output &&
+	git cat-file commit HEAD >actual &&
+	grep -q "^different author$" actual
 
-expecting success of 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
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
 
-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
+  8ec5b24 E
+  0680f3e B
+  2e95b98 A
+  8676e2e C
 
-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
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 8ec5b24
 
-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 6e62bf8 A
+[detached HEAD 419a8fd] different author
+ Author: Twerp Snog <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 419a8fd different author
 
-expecting success of 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
+rebase -i script after editing:
+pick 419a8fd different author
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 73 - rebase -i --root retain root commit author and message
 
-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
+expecting success of 3404.74 'rebase -i --root temporary sentinel commit': 
+	git checkout B &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="2" git rebase -i --root
+	) &&
+	git cat-file commit HEAD >actual &&
+	grep "^tree $EMPTY_TREE" actual &&
+	git rebase --abort
 
-expecting success of 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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
+  2b113fb different author
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 2b113fb
 
-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
+HEAD is now at 313fe96 B
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 313fe96 B
 
-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
+rebase -i script after editing:
+pick 313fe96 B
+Rebasing (1/1)
CONFLICT (modify/delete): file1 deleted in HEAD and modified in 313fe96 (B).  Version 313fe96 (B) of file1 left in tree.
+error: could not apply 313fe96... B
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 313fe96... B
+tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 74 - rebase -i --root temporary sentinel commit
 
-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 3404.75 'rebase -i --root fixup root commit': 
+	git checkout B &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 fixup 2" git rebase -i --root
+	) &&
+	test A = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test B = $(git show HEAD:file1) &&
+	test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
 
-expecting success of 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
+HEAD is now at 313fe96 B
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 313fe96 B
 
-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
+rebase -i script after editing:
+pick 6e62bf8 A
+fixup 313fe96 B
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 75 - rebase -i --root fixup root commit
 
-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
+expecting success of 3404.76 'rebase -i --root reword original root commit': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b reword-original-root-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
+			git rebase -i --root
+	) &&
+	git show HEAD^ >actual &&
+	grep "A changed" actual &&
+	test -z "$(git show -s --format=%p HEAD^)"
 
-expecting success of 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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
+  558b876 A
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 558b876
 
-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
+Switched to a new branch 'reword-original-root-branch'
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
+reword 6e62bf8 A
+pick 313fe96 B
+Rebasing (1/2)
[detached HEAD 903b38e] A changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-original-root-branch.
+    A changed
+fatal: no rebase in progress
+ok 76 - rebase -i --root reword original root commit
 
-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 3404.77 'rebase -i --root reword new root commit': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b reword-now-root-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
+		git rebase -i --root
+	) &&
+	git show HEAD^ >actual &&
+	grep "C changed" actual &&
+	test -z "$(git show -s --format=%p HEAD^)"
 
-expecting success of 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
+Switched to a new branch 'reword-now-root-branch'
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success of 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
+rebase -i script after editing:
+reword d0f65f2 C
+pick 6e62bf8 A
+Rebasing (1/2)
[detached HEAD a808654] C changed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-now-root-branch.
+    C changed
+fatal: no rebase in progress
+ok 77 - rebase -i --root reword new root commit
 
-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
+expecting success of 3404.78 'rebase -i --root when root has untracked file conflict': 
+	test_when_finished "reset_rebase" &&
+	git checkout -b failing-root-pick A &&
+	echo x >file2 &&
+	git rm file1 &&
+	git commit -m "remove file 1 add file 2" &&
+	echo z >file1 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2" git rebase -i --root
+	) &&
+	rm file1 &&
+	git rebase --continue &&
+	test "$(git log -1 --format=%B)" = "remove file 1 add file 2" &&
+	test "$(git rev-list --count HEAD)" = 2
 
-expecting success of 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
+Switched to a new branch 'failing-root-pick'
+rm 'file1'
+[failing-root-pick 71adfbc] remove file 1 add file 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 71adfbc remove file 1 add file 2
 
-expecting success of 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
+rebase -i script after editing:
+pick 6e62bf8 A
+pick 71adfbc remove file 1 add file 2
+Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
+	file1
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     pick 6e62bf890e21973b771e4e6fc28f5ade62edb4bc A
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
+fatal: no rebase in progress
+HEAD is now at 71adfbc remove file 1 add file 2
+Removing actual
+Removing actual-squash-fixup
+Removing error
+Removing exec_output
+Removing expect
+Removing expect-squash-fixup
+Removing expect2
+Removing expected
+Removing fake-editor.sh
+Removing fake-sequence-editor.sh
+Removing file2
+Removing out
+Removing output
+Removing reword-actual
+Removing reword-editor.sh
+Removing reword-expected
+Removing reword-log
+Removing reword-oid
+Removing reword-sequence-editor.sh
+Removing script
+Removing stderr
+Removing todo
+Removing touch-subdir
+ok 78 - rebase -i --root when root has untracked file conflict
 
-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 3404.79 'rebase -i --root reword root when root has untracked file conflict': 
+	test_when_finished "reset_rebase" &&
+	echo z>file1 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="reword 1 2" \
+			FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
+		rm file1 &&
+		FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue
+	) &&
+	test "$(git log -1 --format=%B HEAD^)" = "Reworded A" &&
+	test "$(git rev-list --count HEAD)" = 2
 
-expecting success of 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
+rebase -i script before editing:
+pick 6e62bf8 A
+pick 71adfbc remove file 1 add file 2
 
-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
+rebase -i script after editing:
+reword 6e62bf8 A
+pick 71adfbc remove file 1 add file 2
+Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
+	file1
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     reword 6e62bf890e21973b771e4e6fc28f5ade62edb4bc A
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+Rebasing (2/3)
[detached HEAD 1b0ccef] Reworded A
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
+fatal: no rebase in progress
+HEAD is now at 847f077 remove file 1 add file 2
+Removing fake-editor.sh
+ok 79 - rebase -i --root reword root when root has untracked file conflict
 
-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 3404.80 'rebase --edit-todo does not work on non-interactive rebase': 
+	git checkout reword-original-root-branch &&
+	git reset --hard &&
+	git checkout conflict-branch &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -f --apply --onto HEAD~2 HEAD~ &&
+		test_must_fail git rebase --edit-todo
+	) &&
+	git rebase --abort
 
-expecting success of 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
+Switched to branch 'reword-original-root-branch'
+HEAD is now at c9dc22b B
+Switched to branch 'conflict-branch'
+First, rewinding head to replay your work on top of it...
+Applying: four
+Using index info to reconstruct a base tree...
+M	conflict
+Falling back to patching base and 3-way merge...
+Merging:
+766a798 two
+virtual four
+found 1 common ancestor:
+virtual 3d3da6c4fe4fab218d150e2af365b8b07d465a22
+Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 four
+fatal: The --edit-todo action can only be used during interactive rebase.
+ok 80 - rebase --edit-todo does not work on non-interactive rebase
 
-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 3404.81 'rebase --edit-todo can be used to modify todo': 
+	git reset --hard &&
+	git checkout no-conflict-branch^0 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
+		FAKE_LINES="2 1" git rebase --edit-todo &&
+		git rebase --continue
+	) &&
+	test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test L = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 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
+HEAD is now at f91a2b3 four
+Note: switching to 'no-conflict-branch^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 3389558 M
+rebase -i script before editing:
+pick 265b89e K
+pick 6b0f5e6 L
+pick 3389558 M
 
-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
+rebase -i script after editing:
+edit 265b89e K
+pick 6b0f5e6 L
+pick 3389558 M
+Rebasing (1/3)
Stopped at 265b89e...  K
+You can amend the commit now, with
 
-expecting success of 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
+  git commit --amend 
 
-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
+Once you are satisfied with your changes, run
 
-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
+  git rebase --continue
+rebase -i script before editing:
+pick 6b0f5e6 L
+pick 3389558 M
+rebase -i script after editing:
+pick 3389558 M
+pick 6b0f5e6 L
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 81 - rebase --edit-todo can be used to modify todo
 
-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
+expecting success of 3404.82 'rebase -i produces readable reflog': 
+	git reset --hard &&
+	git branch -f branch-reflog-test H &&
+	git rebase -i --onto I F branch-reflog-test &&
+	cat >expect <<-\EOF &&
+	rebase (finish): returning to refs/heads/branch-reflog-test
+	rebase (pick): H
+	rebase (pick): G
+	rebase (start): checkout I
+	EOF
+	git reflog -n4 HEAD |
+	sed "s/[^:]*: //" >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+HEAD is now at e7ab20b L
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-reflog-test.
+ok 82 - rebase -i produces readable reflog
 
-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
+expecting success of 3404.83 'rebase -i respects core.commentchar': 
+	git reset --hard &&
+	git checkout E^0 &&
+	test_config core.commentchar "\\" &&
+	write_script remove-all-but-first.sh <<-\EOF &&
+	sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
+	mv "$1.tmp" "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/remove-all-but-first.sh" &&
+		git rebase -i B
+	) &&
+	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 
-expecting success of 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
+HEAD is now at d98957c H
+Note: switching to 'E^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 8f99a4f E
+Successfully rebased and updated detached HEAD.
+ok 83 - rebase -i respects core.commentchar
 
-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
+expecting success of 3404.84 'rebase -i respects core.commentchar=auto': 
+	test_config core.commentchar auto &&
+	write_script copy-edit-script.sh <<-\EOF &&
+	cp "$1" edit-script
+	EOF
+	test_when_finished "git rebase --abort || :" &&
+	(
+		test_set_editor "$(pwd)/copy-edit-script.sh" &&
+		git rebase -i HEAD^
+	) &&
+	test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
 
-expecting success of 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
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 84 - rebase -i respects core.commentchar=auto
 
-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
+expecting success of 3404.85 'rebase -i, with <onto> and <upstream> specified as :/quuxery': 
+	test_when_finished "git branch -D torebase" &&
+	git checkout -b torebase branch1 &&
+	upstream=$(git rev-parse ":/J") &&
+	onto=$(git rev-parse ":/A") &&
+	git rebase --onto $onto $upstream &&
+	git reset --hard branch1 &&
+	git rebase --onto ":/A" ":/J" &&
+	git checkout branch1
 
-expecting success of 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
+Previous HEAD position was d0f65f2 C
+Switched to a new branch 'torebase'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
+HEAD is now at 450e393 I
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
+Switched to branch 'branch1'
+Deleted branch torebase (was 08e872c).
+ok 85 - rebase -i, with <onto> and <upstream> specified as :/quuxery
 
-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 3404.86 'rebase -i with --strategy and -X': 
+	git checkout -b conflict-merge-use-theirs conflict-branch &&
+	git reset --hard HEAD^ &&
+	echo five >conflict &&
+	echo Z >file1 &&
+	git commit -a -m "one file conflict" &&
+	EDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch &&
+	test $(git show conflict-branch:conflict) = $(cat conflict) &&
+	test $(cat file1) = Z
 
-expecting success of 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
+Switched to a new branch 'conflict-merge-use-theirs'
+HEAD is now at 1eadf03 three
+[conflict-merge-use-theirs 1808efd] one file conflict
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Rebasing (1/1)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs.
+ok 86 - rebase -i with --strategy and -X
 
-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
+expecting success of 3404.87 'interrupted rebase -i with --strategy and -X': 
+	git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
+	git reset --hard HEAD^ &&
+	>breakpoint &&
+	git add breakpoint &&
+	git commit -m "breakpoint for interactive mode" &&
+	echo five >conflict &&
+	echo Z >file1 &&
+	git commit -a -m "one file conflict" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \
+			-Xours conflict-branch
+	) &&
+	git rebase --continue &&
+	test $(git show conflict-branch:conflict) = $(cat conflict) &&
+	test $(cat file1) = Z
 
-expecting success of 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
+Switched to a new branch 'conflict-merge-use-theirs-interrupted'
+HEAD is now at 1eadf03 three
+[conflict-merge-use-theirs-interrupted 661680f] breakpoint for interactive mode
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 breakpoint
+[conflict-merge-use-theirs-interrupted 14f789b] one file conflict
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+rebase -i script before editing:
+pick 661680f breakpoint for interactive mode
+pick 14f789b one file conflict
 
-expecting success of 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
+rebase -i script after editing:
+edit 661680f breakpoint for interactive mode
+pick 14f789b one file conflict
+Rebasing (1/2)
Stopped at 661680f...  breakpoint for interactive mode
+You can amend the commit now, with
 
-expecting success of 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
+  git commit --amend 
 
-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
+Once you are satisfied with your changes, run
 
-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
+  git rebase --continue
+Rebasing (2/2)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs-interrupted.
+ok 87 - interrupted rebase -i with --strategy and -X
 
-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
+expecting success of 3404.88 'rebase -i error on commits with \ in message': 
+	current_head=$(git rev-parse HEAD) &&
+	test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
+	test_commit TO-REMOVE will-conflict old-content &&
+	test_commit "\temp" will-conflict new-content dummy &&
+	test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
+	test_expect_code 1 grep  "	emp" error
 
-expecting success of 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
+[conflict-merge-use-theirs-interrupted 77c3fb4] TO-REMOVE
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 will-conflict
+[conflict-merge-use-theirs-interrupted 34a4968] \temp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+CONFLICT (modify/delete): will-conflict deleted in HEAD and modified in 34a4968 (\temp).  Version 34a4968 (\temp) of will-conflict left in tree.
+HEAD is now at f36c680 one file conflict
+ok 88 - rebase -i error on commits with \ in message
 
-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
+expecting success of 3404.89 'short commit ID setup': 
+	test_when_finished "git checkout primary" &&
+	git checkout --orphan collide &&
+	git rm -rf . &&
+	(
+	unset test_tick &&
+	test_commit collide1 collide &&
+	test_commit --notick collide2 collide &&
+	test_commit --notick collide3 collide
+	)
 
-expecting success of 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
+Switched to a new branch 'collide'
+rm 'breakpoint'
+rm 'conflict'
+rm 'file1'
+[collide (root-commit) 674fc94] collide1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 collide
+[collide 0b53f45] collide2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[collide 6bcda37] collide3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'primary'
+ok 89 - short commit ID setup
 
-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
+expecting success of 3404.90 'short commit ID collide': 
+	test_oid_cache <<-EOF &&
+	# collision-related constants
+	t3404_collision	sha1:6bcd
+	t3404_collision	sha256:0161
+	t3404_collider	sha1:ac4f2ee
+	t3404_collider	sha256:16697
+	EOF
+	test_when_finished "reset_rebase && git checkout primary" &&
+	git checkout collide &&
+	colliding_id=$(test_oid t3404_collision) &&
+	hexsz=$(test_oid hexsz) &&
+	test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
+	test_config core.abbrev 4 &&
+	(
+		unset test_tick &&
+		test_tick &&
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="collide2 $(test_oid t3404_collider)" \
+		FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
+		test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
+		grep "^pick $colliding_id " \
+			.git/rebase-merge/git-rebase-todo.tmp &&
+		grep -E "^pick [0-9a-f]{$hexsz}" \
+			.git/rebase-merge/git-rebase-todo &&
+		grep -E "^pick [0-9a-f]{$hexsz}" \
+			.git/rebase-merge/git-rebase-todo.backup &&
+		git rebase --continue
+	) &&
+	collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" &&
+	collide3="$(git rev-parse collide3 | cut -c 1-4)" &&
+	test "$collide2" = "$collide3"
 
-expecting success of 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
+Switched to branch 'collide'
+rebase -i script before editing:
+pick 0b53 collide2
+pick 6bcd collide3
 
-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
+rebase -i script after editing:
+reword 0b53 collide2
+break
+pick 6bcd collide3
+Rebasing (1/3)
[detached HEAD 6bcda37f] collide2 ac4f2ee
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Stopped at 6bcda37f (collide2 ac4f2ee)
+pick 6bcd collide3
+pick 6bcda372b23d641debbf943e0b709349f72dcd92 collide3
+pick 0b53f4541f74116336854697b0278cb818c448e2 collide2
+pick 6bcda372b23d641debbf943e0b709349f72dcd92 collide3
+Rebasing (3/3)
Successfully rebased and updated refs/heads/collide.
+fatal: no rebase in progress
+HEAD is now at fbe3cf5 collide3
+Removing actual
+Removing copy-edit-script.sh
+Removing edit-script
+Removing expect
+Removing fake-editor.sh
+Removing remove-all-but-first.sh
+Switched to branch 'primary'
+ok 90 - short commit ID collide
 
-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 3404.91 'respect core.abbrev': 
+	git config core.abbrev 12 &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i HEAD~4 >todo-list
+	) &&
+	test 4 = $(grep -c -E "pick [0-9a-f]{12,}" todo-list)
 
-expecting success of 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
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+ok 91 - respect core.abbrev
 
-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 3404.92 'todo count': 
+	write_script dump-raw.sh <<-\EOF &&
+		cat "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/dump-raw.sh" &&
+		git rebase -i HEAD~4 >actual
+	) &&
+	test_grep "^# Rebase ..* onto ..* ([0-9]" actual
 
-expecting success of 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
+Successfully rebased and updated refs/heads/primary.
+# Rebase 6e62bf890e21..8f99a4f1fbbd onto 6e62bf890e21 (4 commands)
+ok 92 - todo count
 
-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 3404.93 'rebase -i commits that overwrite untracked files (pick)': 
+	git checkout --force A &&
+	git clean -f &&
+	cat >todo <<-EOF &&
+	exec >file2
+	pick $(git rev-parse B) B
+	pick $(git rev-parse C) C
+	pick $(git rev-parse D) D
+	exec cat .git/rebase-merge/done >actual
+	EOF
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i A
+	) &&
+	test_cmp_rev HEAD B &&
+	test_cmp_rev REBASE_HEAD C &&
+	head -n3 todo >expect &&
+	test_cmp expect .git/rebase-merge/done &&
+	rm file2 &&
+	test_path_is_missing .git/rebase-merge/patch &&
+	echo changed >file1 &&
+	git add file1 &&
+	test_must_fail git rebase --continue 2>err &&
+	grep "error: you have staged changes in your working tree" err &&
+	git reset --hard HEAD &&
+	git rebase --continue &&
+	test_cmp_rev HEAD D &&
+	tail -n3 todo >>expect &&
+	test_cmp expect actual
 
-expecting success of 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
+Note: switching to 'A'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
-		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
+HEAD is now at 6e62bf890e21 A
+Removing actual
+Removing dump-raw.sh
+Removing fake-editor.sh
+Removing todo-list
+rebase -i script after editing:
+exec >file2
+pick 313fe965c0484313caa01fa597a77d2ad86d279e B
+pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
+pick 0547e3f1350de154b309493b84e37dcd3097c587 D
+exec cat .git/rebase-merge/done >actual
+Rebasing (1/5)
Executing: >file2
+Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by merge:
+	file2
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+error: you have staged changes in your working tree
+HEAD is now at 313fe965c048 B
+Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
+Successfully rebased and updated detached HEAD.
+ok 93 - rebase -i commits that overwrite untracked files (pick)
 
-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 3404.94 'rebase -i commits that overwrite untracked files (squash)': 
+	git checkout --force branch2 &&
+	git clean -f &&
+	git tag original-branch2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 squash 2" git rebase -i A
+	) &&
+	test_cmp_rev HEAD F &&
+	test_path_is_missing file6 &&
+	>file6 &&
+	test_must_fail git rebase --continue &&
+	test_cmp_rev HEAD F &&
+	test_cmp_rev REBASE_HEAD I &&
+	rm file6 &&
+	test_path_is_missing .git/rebase-merge/patch &&
+	echo changed >file1 &&
+	git add file1 &&
+	test_must_fail git rebase --continue 2>err &&
+	grep "error: you have staged changes in your working tree" err &&
+	git reset --hard HEAD &&
+	git rebase --continue &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = I &&
+	git reset --hard original-branch2
 
-expecting success of 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
+Previous HEAD position was 0547e3f1350d D
+Switched to branch 'branch2'
+Removing actual
+Removing err
+Removing expect
+Removing fake-sequence-editor.sh
+Removing script
+Removing todo
+rebase -i script before editing:
+pick cfefd94ba3b7 F
+pick 615be62cadc1 I
 
-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
+rebase -i script after editing:
+edit cfefd94ba3b7 F
+squash 615be62cadc1 I
+Rebasing (1/2)
Stopped at cfefd94ba3b7...  F
+You can amend the commit now, with
 
-expecting success of 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
+  git commit --amend 
 
-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
+Once you are satisfied with your changes, run
 
-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
+  git rebase --continue
+Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
+	file6
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     squash 615be62cadc1c85c6ac7d6974210b1aa1721c98f I
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+error: you have staged changes in your working tree
+HEAD is now at cfefd94ba3b7 F
+Rebasing (3/3)
[detached HEAD 393f3ba68ddf] F
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file4
+ create mode 100644 file6
+Successfully rebased and updated refs/heads/branch2.
+HEAD is now at 615be62cadc1 I
+ok 94 - rebase -i commits that overwrite untracked files (squash)
 
-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 3404.95 'rebase -i commits that overwrite untracked files (no ff)': 
+	git checkout --force branch2 &&
+	git clean -f &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --no-ff A
+	) &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
+	test_path_is_missing file6 &&
+	>file6 &&
+	test_must_fail git rebase --continue &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
+	test_cmp_rev REBASE_HEAD I &&
+	rm file6 &&
+	test_path_is_missing .git/rebase-merge/patch &&
+	echo changed >file1 &&
+	git add file1 &&
+	test_must_fail git rebase --continue 2>err &&
+	grep "error: you have staged changes in your working tree" err &&
+	git reset --hard HEAD &&
+	git rebase --continue &&
+	test $(git cat-file commit HEAD | sed -ne \$p) = I
 
-expecting success of 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
+Already on 'branch2'
+Removing err
+Removing fake-editor.sh
+rebase -i script before editing:
+pick cfefd94ba3b7 F
+pick 615be62cadc1 I
 
-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
+rebase -i script after editing:
+edit cfefd94ba3b7 F
+pick 615be62cadc1 I
+Rebasing (1/2)
Stopped at cfefd94ba3b7...  F
+You can amend the commit now, with
 
-expecting success of 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
+  git commit --amend 
 
-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
+Once you are satisfied with your changes, run
 
-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
+  git rebase --continue
+Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
+	file6
+Please move or remove them before you merge.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     pick 615be62cadc1c85c6ac7d6974210b1aa1721c98f I
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+error: you have staged changes in your working tree
+HEAD is now at 1cadfd8b5eb1 F
+Rebasing (3/3)
Successfully rebased and updated refs/heads/branch2.
+ok 95 - rebase -i commits that overwrite untracked files (no ff)
 
-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 3404.96 'rebase --continue removes CHERRY_PICK_HEAD': 
+	git checkout -b commit-to-skip &&
+	for double in X 3 1
+	do
+		test_seq 5 | sed "s/$double/&&/" >seq &&
+		git add seq &&
+		test_tick &&
+		git commit -m seq-$double || return 1
+	done &&
+	git tag seq-onto &&
+	git reset --hard HEAD~2 &&
+	git cherry-pick seq-onto &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES= git rebase -i seq-onto
+	) &&
+	test -d .git/rebase-merge &&
+	git rebase --continue &&
+	git diff --exit-code seq-onto &&
+	test ! -d .git/rebase-merge &&
+	test ! -f .git/CHERRY_PICK_HEAD
 
-expecting success of 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
+Switched to a new branch 'commit-to-skip'
+[commit-to-skip 91baae341a52] seq-X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 seq
+[commit-to-skip c6f9618a0f9b] seq-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[commit-to-skip 76d13d56f0bb] seq-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at 91baae341a52 seq-X
+Auto-merging seq
+[commit-to-skip 43bbefaabe73] seq-1
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:08:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 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
+    git commit --allow-empty
 
-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
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 76d13d56f0bb
+Last command done (1 command done):
+   pick 43bbefaabe73 seq-1
+No commands remaining.
+You are currently rebasing branch 'commit-to-skip' on '76d13d56f0bb'.
+  (all conflicts fixed: run "git rebase --continue")
 
-expecting success of 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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+	fake-editor.sh
+	sub/
 
-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
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 43bbefaabe73... seq-1
+Successfully rebased and updated refs/heads/commit-to-skip.
+ok 96 - rebase --continue removes CHERRY_PICK_HEAD
 
-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 3404.97 'drop': 
+	rebase_setup_and_clean drop-test &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root
+	) &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
 
-expecting success of 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
+Switched to a new branch 'drop-test'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pick 6e62bf890e21 A
+drop 313fe965c048 B
+pick d0f65f2f81ee C
+d 0547e3f1350d D
+pick 8f99a4f1fbbd E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/drop-test.
+Switched to branch 'primary'
+Deleted branch drop-test (was 51a089e089a8).
+fatal: no rebase in progress
+ok 97 - drop
 
-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
+expecting success of 3404.98 'rebase -i respects rebase.missingCommitsCheck = ignore': 
+	test_config rebase.missingCommitsCheck ignore &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 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
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 98 - rebase -i respects rebase.missingCommitsCheck = ignore
 
-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 3404.99 'rebase -i respects rebase.missingCommitsCheck = warn': 
+	cat >expect <<-EOF &&
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+	To avoid this message, use "drop" to explicitly remove a commit.
+	EOF
+	test_config rebase.missingCommitsCheck warn &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
+	) &&
+	head -n4 actual.2 >actual &&
+	test_cmp expect actual &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 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
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 99 - rebase -i respects rebase.missingCommitsCheck = warn
 
-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
+expecting success of 3404.100 'rebase -i respects rebase.missingCommitsCheck = error': 
+	cat >expect <<-EOF &&
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~2)
+	To avoid this message, use "drop" to explicitly remove a commit.
 
-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
+	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+	The possible behaviours are: ignore, warn, error.
 
-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
+	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+	Or you can abort the rebase with 'git rebase --abort'.
+	EOF
+	test_config rebase.missingCommitsCheck error &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 4" \
+			git rebase -i --root 2>actual &&
+		test_cmp expect actual &&
+		cp .git/rebase-merge/git-rebase-todo.backup \
+			.git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
+	) &&
+	git rebase --continue &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 
-expecting success of 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
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick 0547e3f1350d D
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+drop d0f65f2f81ee C
+pick 0547e3f1350d D
+drop 8f99a4f1fbbd E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 1c17f6d7b75f).
+fatal: no rebase in progress
+ok 100 - rebase -i respects rebase.missingCommitsCheck = error
 
-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 3404.101 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore': 
+	test_config rebase.missingCommitsCheck ignore &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="break 1 2 3 4 5" git rebase -i --root &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 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
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+break
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+Rebasing (1/6)
Stopped at e64c99ec4da8 ()
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 101 - rebase --edit-todo respects rebase.missingCommitsCheck = ignore
 
-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
+expecting success of 3404.102 'rebase --edit-todo respects rebase.missingCommitsCheck = warn': 
+	cat >expect <<-EOF &&
+	error: invalid command 'pickled'
+	error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
+	EOF
+	head -n5 expect >expect.2 &&
+	tail -n1 expect >>expect.2 &&
+	tail -n4 expect.2 >expect.3 &&
+	test_config rebase.missingCommitsCheck warn &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n7 actual.2 >actual &&
+		test_cmp expect actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n4 actual.2 >actual &&
+		test_cmp expect.3 actual &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 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
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pickled 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+error: invalid command 'pickled'
+error: invalid line 1: pickled 6e62bf890e21 A
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+rebase -i script before editing:
+pickled 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 102 - rebase --edit-todo respects rebase.missingCommitsCheck = warn
 
-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 3404.103 'rebase --edit-todo respects rebase.missingCommitsCheck = error': 
+	cat >expect <<-EOF &&
+	error: invalid command 'pickled'
+	error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
 
-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
+	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+	The possible behaviours are: ignore, warn, error.
 
-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
+	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+	Or you can abort the rebase with 'git rebase --abort'.
+	EOF
+	tail -n11 expect >expect.2 &&
+	head -n3 expect.2 >expect.3 &&
+	tail -n7 expect.2 >>expect.3 &&
+	test_config rebase.missingCommitsCheck error &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		test_must_fail env FAKE_LINES="2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_cmp expect actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_cmp expect.2 actual &&
+		test_must_fail git rebase --edit-todo &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		test_must_fail env FAKE_LINES="1 2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_cmp expect.3 actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_cmp expect.3 actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_grep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
 
-expecting success of 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
+Switched to a new branch 'missing-commit'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pickled 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+error: invalid command 'pickled'
+error: invalid line 1: pickled 6e62bf890e21 A
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+rebase -i script before editing:
+pickled 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+Warning: some commits may have been dropped accidentally.
+Dropped commits (newer to older):
+ - 8f99a4f1fbbd E
+ - 6e62bf890e21 A
+To avoid this message, use "drop" to explicitly remove a commit.
 
-expecting success of 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
+Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+The possible behaviours are: ignore, warn, error.
 
-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
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+drop 8f99a4f1fbbd E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
+Switched to branch 'primary'
+Deleted branch missing-commit (was 0547e3f1350d).
+fatal: no rebase in progress
+ok 103 - rebase --edit-todo respects rebase.missingCommitsCheck = error
 
-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 3404.104 'rebase.missingCommitsCheck = error after resolving conflicts': 
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="drop 1 break 2 3 4" git rebase -i A E
+	) &&
+	git rebase --edit-todo &&
+	test_must_fail git rebase --continue &&
+	echo x >file1 &&
+	git add file1 &&
+	git rebase --continue
 
-expecting success of 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
+rebase -i script before editing:
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-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
+rebase -i script after editing:
+drop 313fe965c048 B
+break
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+Rebasing (2/5)
Stopped at 6e62bf890e21 (A)
+Rebasing (3/5)
Rebasing (4/5)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f1350d... D
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 0547e3f1350d... D
+[detached HEAD c2dad584937b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (5/5)
Successfully rebased and updated detached HEAD.
+ok 104 - rebase.missingCommitsCheck = error after resolving conflicts
 
-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
+expecting success of 3404.105 'rebase.missingCommitsCheck = error when editing for a second time': 
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 break 2 3" git rebase -i A D &&
+		cp .git/rebase-merge/git-rebase-todo todo &&
+		test_must_fail env FAKE_LINES=2 git rebase --edit-todo &&
+		GIT_SEQUENCE_EDITOR="cp todo" git rebase --edit-todo &&
+		git rebase --continue
+	)
 
-expecting success of 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
+rebase -i script before editing:
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
 
-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
+rebase -i script after editing:
+pick 313fe965c048 B
+break
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+Rebasing (2/4)
Stopped at 313fe965c048 (B)
+rebase -i script before editing:
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+rebase -i script after editing:
+pick 0547e3f1350d D
+Warning: some commits may have been dropped accidentally.
+Dropped commits (newer to older):
+ - d0f65f2f81ee C
+To avoid this message, use "drop" to explicitly remove a commit.
 
-expecting success of 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
+Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
+The possible behaviours are: ignore, warn, error.
 
-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
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Or you can abort the rebase with 'git rebase --abort'.
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 105 - rebase.missingCommitsCheck = error when editing for a second time
 
-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 3404.106 'respects rebase.abbreviateCommands with fixup, squash and exec': 
+	rebase_setup_and_clean abbrevcmd &&
+	test_commit "first" file1.txt "first line" first &&
+	test_commit "second" file1.txt "another line" second &&
+	test_commit "fixup! first" file2.txt "first line again" first_fixup &&
+	test_commit "squash! second" file1.txt "another line here" second_squash &&
+	cat >expected <<-EOF &&
+	p $(git rev-list --abbrev-commit -1 first) first
+	f $(git rev-list --abbrev-commit -1 first_fixup) fixup! first
+	x git show HEAD
+	p $(git rev-list --abbrev-commit -1 second) second
+	s $(git rev-list --abbrev-commit -1 second_squash) squash! second
+	x git show HEAD
+	EOF
+	git checkout abbrevcmd &&
+	test_config rebase.abbreviateCommands true &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --exec "git show HEAD" \
+			--autosquash primary >actual
+	) &&
+	test_cmp expected actual
 
-expecting success of 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
+Previous HEAD position was 0547e3f1350d D
+Switched to a new branch 'abbrevcmd'
+[abbrevcmd 42b8f159a432] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.txt
+[abbrevcmd 4d77de6c05df] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[abbrevcmd ecff34393bc3] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.txt
+[abbrevcmd f772e337e29f] squash! second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Already on 'abbrevcmd'
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Switched to branch 'primary'
+Deleted branch abbrevcmd (was f772e337e29f).
+fatal: no rebase in progress
+ok 106 - respects rebase.abbreviateCommands with fixup, squash and exec
 
-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 3404.107 'static check of bad command': 
+	rebase_setup_and_clean bad-cmd &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
+		git rebase -i --root 2>actual &&
+		test_grep "pickled $(git rev-list --oneline -1 primary~1)" \
+				actual &&
+		test_grep "You can fix this with .git rebase --edit-todo.." \
+				actual &&
+		FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo
+	) &&
+	git rebase --continue &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test C = $(git cat-file commit HEAD^ | sed -ne \$p)
 
-expecting success of 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
+Switched to a new branch 'bad-cmd'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pickled 0547e3f1350d D
+pick 8f99a4f1fbbd E
+error: invalid line 4: pickled 0547e3f1350d D
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+error: invalid command 'pickled'
+error: invalid line 4: pickled 0547e3f1350d D
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pickled 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+drop 0547e3f1350d D
+pick 8f99a4f1fbbd E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-cmd.
+Switched to branch 'primary'
+Deleted branch bad-cmd (was 1c8ce10ab787).
+fatal: no rebase in progress
+ok 107 - static check of bad command
 
-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
+expecting success of 3404.108 'the first command cannot be a fixup': 
+	rebase_setup_and_clean fixup-first &&
 
-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
-	
-ok 1046 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf
+	cat >orig <<-EOF &&
+	fixup $(git log -1 --format="%h %s" B)
+	pick $(git log -1 --format="%h %s" C)
+	EOF
 
-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 1047 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF
+	(
+		set_replace_editor orig &&
+		test_must_fail git rebase -i A 2>actual
+	) &&
+	grep "cannot .fixup. without a previous commit" actual &&
+	grep "You can fix this with .git rebase --edit-todo.." actual &&
+	# verify that the todo list has not been truncated
+	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
+	test_cmp orig actual &&
 
-expecting success of 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 1048 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+	test_must_fail git rebase --edit-todo 2>actual &&
+	grep "cannot .fixup. without a previous commit" actual &&
+	grep "You can fix this with .git rebase --edit-todo.." actual &&
+	# verify that the todo list has not been truncated
+	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
+	test_cmp orig actual
 
-expecting success of 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 1049 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+Switched to a new branch 'fixup-first'
+rebase -i script after editing:
+fixup 313fe965c048 B
+pick d0f65f2f81ee C
+error: cannot 'fixup' without a previous commit
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+error: cannot 'fixup' without a previous commit
+error: cannot 'fixup' without a previous commit
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+Previous HEAD position was 6e62bf890e21 A
+Switched to branch 'primary'
+error: cannot delete branch 'fixup-first' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+ok 108 - the first command cannot be a fixup
 
-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 1050 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+expecting success of 3404.109 'tabs and spaces are accepted in the todolist': 
+	rebase_setup_and_clean indented-comment &&
+	write_script add-indent.sh <<-\EOF &&
+	(
+		# Turn single spaces into space/tab mix
+		sed "1s/ /	/g; 2s/ /  /g; 3s/ / 	/g" "$1"
+		printf "\n\t# comment\n #more\n\t # comment\n"
+	) >"$1.new"
+	mv "$1.new" "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/add-indent.sh" &&
+		git rebase -i HEAD^^^
+	) &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 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 1051 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+Switched to a new branch 'indented-comment'
+Successfully rebased and updated refs/heads/indented-comment.
+Switched to branch 'primary'
+Deleted branch indented-comment (was 8f99a4f1fbbd).
+fatal: no rebase in progress
+ok 109 - tabs and spaces are accepted in the todolist
 
-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 1052 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
+expecting success of 3404.110 'static check of bad SHA-1': 
+	rebase_setup_and_clean bad-sha &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
+			git rebase -i --root 2>actual &&
+			test_grep "edit XXXXXXX False commit" actual &&
+			test_grep "You can fix this with .git rebase --edit-todo.." \
+					actual &&
+		FAKE_LINES="1 2 4 5 6" git rebase --edit-todo
+	) &&
+	git rebase --continue &&
+	test E = $(git cat-file commit HEAD | sed -ne \$p)
 
-expecting success of 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
+Switched to a new branch 'bad-sha'
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-expecting success of 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
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+edit XXXXXXX False commit
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+# comment
+error: invalid line 3: edit XXXXXXX False commit
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
+error: could not parse 'XXXXXXX'
+error: invalid line 3: edit XXXXXXX False commit
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+edit XXXXXXX False commit
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+rebase -i script after editing:
+pick 6e62bf890e21 A
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-sha.
+Switched to branch 'primary'
+Deleted branch bad-sha (was 8f99a4f1fbbd).
+fatal: no rebase in progress
+ok 110 - static check of bad SHA-1
 
-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 3404.111 'editor saves as CR/LF': 
+	git checkout -b with-crlf &&
+	write_script add-crs.sh <<-\EOF &&
+	sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
+	mv -f "$1".new "$1"
+	EOF
+	(
+		test_set_editor "$(pwd)/add-crs.sh" &&
+		git rebase -i HEAD^
+	)
 
-expecting success of 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
+Switched to a new branch 'with-crlf'
+Successfully rebased and updated refs/heads/with-crlf.
+ok 111 - editor saves as CR/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 1057 - setup LF_nul checkout  with -c core.eol=crlf
+expecting success of 3404.112 'rebase -i --gpg-sign=<key-id>': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
+	test_grep "$SQ-S\"S I Gner\"$SQ" err
 
-expecting success of 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
-	
-ok 1058 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf
+  git commit --amend '-S"S I Gner"'
+ok 112 - rebase -i --gpg-sign=<key-id>
 
-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 1059 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF
+expecting success of 3404.113 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_config commit.gpgsign true &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
+	test_grep "$SQ-S\"S I Gner\"$SQ" err
 
-expecting success of 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 1060 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+  git commit --amend '-S"S I Gner"'
+ok 113 - rebase -i --gpg-sign=<key-id> overrides commit.gpgSign
 
-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 1061 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+expecting success of 3404.114 'valid author header after --root swap': 
+	rebase_setup_and_clean author-header no-conflict-branch &&
+	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
+	git cat-file commit HEAD | grep ^author >expected &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="5 1" git rebase -i --root
+	) &&
+	git cat-file commit HEAD^ | grep ^author >actual &&
+	test_cmp expected actual
 
-expecting success of 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 1062 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+Switched to a new branch 'author-header'
+[author-header d4dcc6d22bff] M
+ Author: Au 'thor <author@example.com>
+ Date: Thu Apr 7 15:29:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileM
+rebase -i script before editing:
+pick 6e62bf890e21 A
+pick 808874f7b187 J
+pick 265b89e813d4 K
+pick 6b0f5e6c3e83 L
+pick d4dcc6d22bff M
 
-expecting success of 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 1063 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+rebase -i script after editing:
+pick d4dcc6d22bff M
+pick 6e62bf890e21 A
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/author-header.
+Switched to branch 'primary'
+Deleted branch author-header (was 141d57bb9b25).
+fatal: no rebase in progress
+ok 114 - valid author header after --root swap
 
-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 1064 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
+expecting success of 3404.115 'valid author header when author contains single quote': 
+	rebase_setup_and_clean author-header no-conflict-branch &&
+	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
+	git cat-file commit HEAD | grep ^author >expected &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i HEAD~2
+	) &&
+	git cat-file commit HEAD | grep ^author >actual &&
+	test_cmp expected actual
 
-expecting success of 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
+Switched to a new branch 'author-header'
+[author-header d4dcc6d22bff] M
+ Author: Au 'thor <author@example.com>
+ Date: Thu Apr 7 15:29:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileM
+rebase -i script before editing:
+pick 6b0f5e6c3e83 L
+pick d4dcc6d22bff M
 
-expecting success of 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
+rebase -i script after editing:
+pick d4dcc6d22bff M
+Rebasing (1/1)
Successfully rebased and updated refs/heads/author-header.
+Switched to branch 'primary'
+Deleted branch author-header (was b929a6a72971).
+fatal: no rebase in progress
+ok 115 - valid author header when author contains single quote
 
-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 3404.116 'post-commit hook is called': 
+	>actual &&
+	test_hook post-commit <<-\EOS &&
+	git rev-parse HEAD >>actual
+	EOS
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
+		echo x>file3 &&
+		git add file3 &&
+		FAKE_COMMIT_MESSAGE=edited git rebase --continue
+	) &&
+	git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
+		>expect &&
+	test_cmp expect actual
 
-expecting success of 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
+rebase -i script before editing:
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
+pick 8f99a4f1fbbd E
 
-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
+rebase -i script after editing:
+edit 8f99a4f1fbbd E
+pick 313fe965c048 B
+reword d0f65f2f81ee C
+fixup 0547e3f1350d D
+Rebasing (1/4)
Stopped at 8f99a4f1fbbd...  E
+You can amend the commit now, with
 
-expecting success of 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
-	
-ok 1070 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native
+  git commit --amend 
 
-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 1071 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF
+Once you are satisfied with your changes, run
 
-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 1072 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF
+  git rebase --continue
+[detached HEAD bc867d3a07fd] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD d54e5ab0b586] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 116 - post-commit hook is called
 
-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 1073 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+expecting success of 3404.117 'correct error message for partial commit after empty pick': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1 1" &&
+		export FAKE_LINES &&
+		test_must_fail git rebase -i A D
+	) &&
+	echo x >file1 &&
+	test_must_fail git commit file1 2>err &&
+	test_grep "cannot do a partial commit during a rebase." err
 
-expecting success of 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 1074 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+rebase -i script before editing:
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
 
-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 1075 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul
+rebase -i script after editing:
+pick d0f65f2f81ee C
+pick 313fe965c048 B
+pick 313fe965c048 B
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 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 1076 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
+    git commit --allow-empty
 
-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 1077 - setup LF checkout  with -c core.eol=native
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 6e62bf890e21
+Last commands done (3 commands done):
+   pick 313fe965c048 B
+   pick 313fe965c048 B
+  (see more in file .git/rebase-merge/done)
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
 
-expecting success of 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 1078 - setup CRLF checkout  with -c core.eol=native
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.2
+	add-crs.sh
+	add-indent.sh
+	err
+	expect
+	expect.2
+	expect.3
+	expected
+	fake-editor.sh
+	fake-sequence-editor.sh
+	orig
+	out
+	script
+	sub/
+	todo
 
-expecting success of 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 1079 - setup LF_mix_CR checkout  with -c core.eol=native
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 313fe965c048... B
+fatal: cannot do a partial commit during a rebase.
+ok 117 - correct error message for partial commit after empty pick
 
-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 1080 - setup CRLF_mix_LF checkout  with -c core.eol=native
+expecting success of 3404.118 'correct error message for commit --amend after empty pick': 
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 1" &&
+		export FAKE_LINES &&
+		test_must_fail git rebase -i A D
+	) &&
+	echo x>file1 &&
+	test_must_fail git commit -a --amend 2>err &&
+	test_grep "middle of a rebase -- cannot amend." err
 
-expecting success of 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 1081 - setup LF_nul checkout  with -c core.eol=native
+rebase -i script before editing:
+pick 313fe965c048 B
+pick d0f65f2f81ee C
+pick 0547e3f1350d D
 
-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
-		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 1082 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native
+rebase -i script after editing:
+pick 313fe965c048 B
+pick 313fe965c048 B
+Rebasing (2/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 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 1083 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF
+    git commit --allow-empty
 
-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 1084 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 6e62bf890e21
+Last commands done (2 commands done):
+   pick 313fe965c048 B
+   pick 313fe965c048 B
+No commands remaining.
+You are currently rebasing.
+  (all conflicts fixed: run "git rebase --continue")
 
-expecting success of 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 1085 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.2
+	add-crs.sh
+	add-indent.sh
+	err
+	expect
+	expect.2
+	expect.3
+	expected
+	fake-editor.sh
+	fake-sequence-editor.sh
+	orig
+	out
+	script
+	sub/
+	todo
 
-expecting success of 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 1086 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 313fe965c048... B
+fatal: You are in the middle of a rebase -- cannot amend.
+ok 118 - correct error message for commit --amend after empty pick
 
-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 1087 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+expecting success of 3404.119 'todo has correct onto hash': 
+	GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual &&
+	onto=$(git rev-parse --short HEAD~4) &&
+	test_grep "^# Rebase ..* onto $onto" actual
 
-expecting success of 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 1088 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
+Successfully rebased and updated refs/heads/no-conflict-branch.
+# Rebase 6e62bf890e21..33895580a3f9 onto 6e62bf890e21 (4 commands)
+ok 119 - todo has correct onto hash
 
-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 1089 - setup LF checkout  with -c core.eol=native
+expecting success of 3404.120 'ORIG_HEAD is updated correctly': 
+	test_when_finished "git checkout primary && git branch -D test-orig-head" &&
+	git checkout -b test-orig-head A &&
+	git commit --allow-empty -m A1 &&
+	git commit --allow-empty -m A2 &&
+	git commit --allow-empty -m A3 &&
+	git commit --allow-empty -m A4 &&
+	git rebase primary &&
+	test_cmp_rev ORIG_HEAD test-orig-head@{1}
 
-expecting success of 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 1090 - setup CRLF checkout  with -c core.eol=native
+Switched to a new branch 'test-orig-head'
+[test-orig-head 988a45cf7c4d] A1
+ Author: A U Thor <author@example.com>
+[test-orig-head 001994977a57] A2
+ Author: A U Thor <author@example.com>
+[test-orig-head f8b037fdfd3c] A3
+ Author: A U Thor <author@example.com>
+[test-orig-head dee0c985c630] A4
+ Author: A U Thor <author@example.com>
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/test-orig-head.
+Switched to branch 'primary'
+Deleted branch test-orig-head (was 25c72c815b0c).
+ok 120 - ORIG_HEAD is updated correctly
 
-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 1091 - setup LF_mix_CR checkout  with -c core.eol=native
+expecting success of 3404.121 '--update-refs adds label and update-ref commands': 
+	git checkout -b update-refs no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git commit --allow-empty --fixup=third &&
+	git branch -f is-not-reordered &&
+	git commit --allow-empty --fixup=HEAD~4 &&
+	git branch -f shared-tip &&
+	(
+		set_cat_todo_editor &&
 
-expecting success of 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 1092 - setup CRLF_mix_LF checkout  with -c core.eol=native
+		cat >expect <<-EOF &&
+		pick $(git log -1 --format=%h J) J
+		fixup $(git log -1 --format=%h update-refs) fixup! J # empty
+		update-ref refs/heads/second
+		update-ref refs/heads/first
+		pick $(git log -1 --format=%h K) K
+		pick $(git log -1 --format=%h L) L
+		fixup $(git log -1 --format=%h is-not-reordered) fixup! L # empty
+		update-ref refs/heads/third
+		pick $(git log -1 --format=%h M) M
+		update-ref refs/heads/no-conflict-branch
+		update-ref refs/heads/is-not-reordered
+		update-ref refs/heads/shared-tip
+		EOF
 
-expecting success of 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 1093 - setup LF_nul checkout  with -c core.eol=native
+		test_must_fail git rebase -i --autosquash --update-refs primary >todo &&
+		test_cmp expect todo &&
 
-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
-		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 1094 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native
+		test_must_fail git -c rebase.autosquash=true \
+				   -c rebase.updaterefs=true \
+				   rebase -i primary >todo &&
 
-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 1095 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF
+		test_cmp expect todo
+	)
 
-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 1096 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+Switched to a new branch 'update-refs'
+[update-refs d580aa243c5a] fixup! L
+ Author: A U Thor <author@example.com>
+[update-refs 5921e09cdb84] fixup! J
+ Author: A U Thor <author@example.com>
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+ok 121 - --update-refs adds label and update-ref commands
 
-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 1097 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+expecting success of 3404.122 '--update-refs adds commands with --rebase-merges': 
+	git checkout -b update-refs-with-merge no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git merge -m merge branch2 &&
+	git branch -f merge-branch &&
+	git commit --fixup=third --allow-empty &&
+	(
+		set_cat_todo_editor &&
 
-expecting success of 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 1098 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+		cat >expect <<-EOF &&
+		label onto
+		reset onto
+		pick $(git log -1 --format=%h branch2~1) F
+		pick $(git log -1 --format=%h branch2) I
+		update-ref refs/heads/branch2
+		label branch2
+		reset onto
+		pick $(git log -1 --format=%h refs/heads/second) J
+		update-ref refs/heads/second
+		update-ref refs/heads/first
+		pick $(git log -1 --format=%h refs/heads/third~1) K
+		pick $(git log -1 --format=%h refs/heads/third) L
+		fixup $(git log -1 --format=%h update-refs-with-merge) fixup! L # empty
+		update-ref refs/heads/third
+		pick $(git log -1 --format=%h HEAD~2) M
+		update-ref refs/heads/no-conflict-branch
+		merge -C $(git log -1 --format=%h HEAD~1) branch2 # merge
+		update-ref refs/heads/merge-branch
+		EOF
 
-expecting success of 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 1099 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+		test_must_fail git rebase -i --autosquash \
+				   --rebase-merges=rebase-cousins \
+				   --update-refs primary >todo &&
 
-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 1100 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
+		test_cmp expect todo &&
 
-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 1101 - setup LF checkout  with -c core.eol=native
+		test_must_fail git -c rebase.autosquash=true \
+				   -c rebase.updaterefs=true \
+				   rebase -i \
+				   --rebase-merges=rebase-cousins \
+				   primary >todo &&
 
-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 1102 - setup CRLF checkout  with -c core.eol=native
+		test_cmp expect todo
+	)
 
-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 1103 - setup LF_mix_CR checkout  with -c core.eol=native
+Switched to a new branch 'update-refs-with-merge'
+Merge made by the 'ort' strategy.
+ file4 | 1 +
+ file6 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file4
+ create mode 100644 file6
+[update-refs-with-merge 29fba79037a4] fixup! L
+ Author: A U Thor <author@example.com>
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+ok 122 - --update-refs adds commands with --rebase-merges
 
-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 1104 - setup CRLF_mix_LF checkout  with -c core.eol=native
+expecting success of 3404.123 '--update-refs updates refs correctly': 
+	git checkout -B update-refs no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	test_commit extra2 fileX &&
+	git commit --amend --fixup=L &&
 
-expecting success of 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 1105 - setup LF_nul checkout  with -c core.eol=native
+	git rebase -i --autosquash --update-refs primary 2>err &&
 
-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
-		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 1106 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native
+	test_cmp_rev HEAD~3 refs/heads/first &&
+	test_cmp_rev HEAD~3 refs/heads/second &&
+	test_cmp_rev HEAD~1 refs/heads/third &&
+	test_cmp_rev HEAD refs/heads/no-conflict-branch &&
 
-expecting success of 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 1107 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF
+	q_to_tab >expect <<-\EOF &&
+	Successfully rebased and updated refs/heads/update-refs.
+	Updated the following refs with --update-refs:
+	Qrefs/heads/first
+	Qrefs/heads/no-conflict-branch
+	Qrefs/heads/second
+	Qrefs/heads/third
+	EOF
 
-expecting success of 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 1108 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
+	sed "s/Rebasing.*Successfully/Successfully/g" <err >err.trimmed &&
+	test_cmp expect err.trimmed
 
-expecting success of 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 1109 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+Switched to and reset branch 'update-refs'
+[update-refs 9da56b161557] extra2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+[update-refs c4f48e9a00f5] fixup! L
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+ok 123 - --update-refs updates refs correctly
 
-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 1110 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+expecting success of 3404.124 'respect user edits to update-ref steps': 
+	git checkout -B update-refs-break no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f unseen base &&
 
-expecting success of 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 1111 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+	# First, we will add breaks to the expected todo file
+	cat >fake-todo-1 <<-EOF &&
+	pick $(git rev-parse HEAD~3)
+	break
+	update-ref refs/heads/second
+	update-ref refs/heads/first
 
-expecting success of 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 1112 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
+	pick $(git rev-parse HEAD~2)
+	pick $(git rev-parse HEAD~1)
+	update-ref refs/heads/third
 
-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 1113 - setup LF checkout  with -c core.eol=native
+	pick $(git rev-parse HEAD)
+	update-ref refs/heads/no-conflict-branch
+	EOF
 
-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 1114 - setup CRLF checkout  with -c core.eol=native
+	# Second, we will drop some update-refs commands (and move one)
+	cat >fake-todo-2 <<-EOF &&
+	update-ref refs/heads/second
 
-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 1115 - setup LF_mix_CR checkout  with -c core.eol=native
+	pick $(git rev-parse HEAD~2)
+	update-ref refs/heads/third
+	pick $(git rev-parse HEAD~1)
+	break
 
-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 1116 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	pick $(git rev-parse HEAD)
+	EOF
 
-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 1117 - setup LF_nul checkout  with -c core.eol=native
+	# Third, we will:
+	# * insert a new one (new-branch),
+	# * re-add an old one (first), and
+	# * add a second instance of a previously-stored one (second)
+	cat >fake-todo-3 <<-EOF &&
+	update-ref refs/heads/unseen
+	update-ref refs/heads/new-branch
+	pick $(git rev-parse HEAD)
+	update-ref refs/heads/first
+	update-ref refs/heads/second
+	EOF
 
-expecting success of 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
-		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 1118 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native
+	(
+		set_replace_editor fake-todo-1 &&
+		git rebase -i --update-refs primary &&
 
-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 1119 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF
+		# These branches are currently locked.
+		for b in first second third no-conflict-branch
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
 
-expecting success of 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 1120 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+		set_replace_editor fake-todo-2 &&
+		git rebase --edit-todo &&
 
-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 1121 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+		# These branches are currently locked.
+		for b in second third
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
 
-expecting success of 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 1122 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+		# These branches are currently unlocked for checkout.
+		for b in first no-conflict-branch
+		do
+			git worktree add wt-$b $b &&
+			git worktree remove wt-$b || return 1
+		done &&
 
-expecting success of 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 1123 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+		git rebase --continue &&
 
-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 1124 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
+		set_replace_editor fake-todo-3 &&
+		git rebase --edit-todo &&
 
-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 1125 - setup LF checkout  with -c core.eol=native
+		# These branches are currently locked.
+		for b in second third first unseen
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
 
-expecting success of 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 1126 - setup CRLF checkout  with -c core.eol=native
+		# These branches are currently unlocked for checkout.
+		for b in no-conflict-branch
+		do
+			git worktree add wt-$b $b &&
+			git worktree remove wt-$b || return 1
+		done &&
 
-expecting success of 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 1127 - setup LF_mix_CR checkout  with -c core.eol=native
+		git rebase --continue
+	) &&
 
-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 1128 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	test_cmp_rev HEAD~2 refs/heads/third &&
+	test_cmp_rev HEAD~1 refs/heads/unseen &&
+	test_cmp_rev HEAD~1 refs/heads/new-branch &&
+	test_cmp_rev HEAD refs/heads/first &&
+	test_cmp_rev HEAD refs/heads/second &&
+	test_cmp_rev HEAD refs/heads/no-conflict-branch
 
-expecting success of 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 1129 - setup LF_nul checkout  with -c core.eol=native
+Switched to a new branch 'update-refs-break'
+rebase -i script after editing:
+pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
+break
+update-ref refs/heads/second
+update-ref refs/heads/first
 
-expecting success of 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
-		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 1130 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native
+pick e31be72ab52d740527956c171d40a832b63e68ca
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+update-ref refs/heads/third
 
-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 1131 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+update-ref refs/heads/no-conflict-branch
+Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
+fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'no-conflict-branch' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+rebase -i script after editing:
+update-ref refs/heads/second
 
-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 1132 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+pick e31be72ab52d740527956c171d40a832b63e68ca
+update-ref refs/heads/third
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+break
 
-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 1133 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+warning: refname 'first' is ambiguous.
+warning: refname 'first' is ambiguous.
+Preparing worktree (checking out 'first')
+warning: refname 'first' is ambiguous.
+HEAD is now at c49b6574f4e9 J
+Preparing worktree (checking out 'no-conflict-branch')
+HEAD is now at fb069ba3d9b1 M
+Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Stopped at 34033109e5a0 (L)
+rebase -i script after editing:
+update-ref refs/heads/unseen
+update-ref refs/heads/new-branch
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+update-ref refs/heads/first
+update-ref refs/heads/second
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'unseen' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
+Preparing worktree (checking out 'no-conflict-branch')
+HEAD is now at fb069ba3d9b1 M
+Rebasing (8/12)
Rebasing (9/12)
Rebasing (10/12)
Rebasing (11/12)
Rebasing (12/12)
Successfully rebased and updated refs/heads/update-refs-break.
+Updated the following refs with --update-refs:
+	refs/heads/first
+	refs/heads/new-branch
+	refs/heads/second
+	refs/heads/third
+	refs/heads/unseen
+ok 124 - respect user edits to update-ref steps
 
-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 1134 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+expecting success of 3404.125 '--update-refs: all update-ref lines removed': 
+	git checkout -b test-refs-not-removed no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f tip &&
 
-expecting success of 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 1135 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+	test_commit test-refs-not-removed &&
+	git commit --amend --fixup first &&
 
-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 1136 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
+	git rev-parse first second third tip no-conflict-branch >expect-oids &&
 
-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 1137 - setup LF checkout  with -c core.eol=native
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
+	(
+		set_replace_editor todo &&
+		git rebase -i --update-refs base
+	) &&
 
-expecting success of 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 1138 - setup CRLF checkout  with -c core.eol=native
+	# Ensure refs are not deleted and their OIDs have not changed
+	git rev-parse first second third tip no-conflict-branch >actual-oids &&
+	test_cmp expect-oids actual-oids
 
-expecting success of 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 1139 - setup LF_mix_CR checkout  with -c core.eol=native
+Switched to a new branch 'test-refs-not-removed'
+[test-refs-not-removed adbf713ec8f3] test-refs-not-removed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed.t
+warning: refname 'first' is ambiguous.
+[test-refs-not-removed 5ca2ca8d583e] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed.t
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+rebase -i script after editing:
+pick c49b6574f4e9 J
+pick e31be72ab52d K
+pick 34033109e5a0 L
+pick fb069ba3d9b1 M
+pick 5ca2ca8d583e fixup! first
+Successfully rebased and updated refs/heads/test-refs-not-removed.
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+ok 125 - --update-refs: all update-ref lines removed
 
-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 1140 - setup CRLF_mix_LF checkout  with -c core.eol=native
+expecting success of 3404.126 '--update-refs: all update-ref lines removed, then some re-added': 
+	git checkout -b test-refs-not-removed2 no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f tip &&
 
-expecting success of 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 1141 - setup LF_nul checkout  with -c core.eol=native
+	test_commit test-refs-not-removed2 &&
+	git commit --amend --fixup first &&
 
-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
-		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 1142 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native
+	git rev-parse first second third >expect-oids &&
 
-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 1143 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i \
+			--autosquash --update-refs \
+			base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
 
-expecting success of 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 1144 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+	# Add a break to the end of the todo so we can edit later
+	echo "break" >>todo &&
 
-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 1145 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+	(
+		set_replace_editor todo &&
+		git rebase -i --autosquash --update-refs base &&
+		echo "update-ref refs/heads/tip" >todo &&
+		git rebase --edit-todo &&
+		git rebase --continue
+	) &&
 
-expecting success of 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 1146 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+	# Ensure first/second/third are unchanged, but tip is updated
+	git rev-parse first second third >actual-oids &&
+	test_cmp expect-oids actual-oids &&
+	test_cmp_rev HEAD tip
 
-expecting success of 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 1147 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+Switched to a new branch 'test-refs-not-removed2'
+[test-refs-not-removed2 67d47c6fa009] test-refs-not-removed2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed2.t
+warning: refname 'first' is ambiguous.
+[test-refs-not-removed2 04193a2c3f06] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed2.t
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+warning: refname 'first' is ambiguous.
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+warning: refname 'first' is ambiguous.
+rebase -i script after editing:
+pick c49b6574f4e9 J
+pick e31be72ab52d K
+pick 34033109e5a0 L
+pick fb069ba3d9b1 M
+pick 04193a2c3f06 fixup! first
+break
+Rebasing (6/6)
Stopped at 04193a2c3f06 (fixup! first)
+rebase -i script after editing:
+update-ref refs/heads/tip
+Rebasing (7/7)
Successfully rebased and updated refs/heads/test-refs-not-removed2.
+Updated the following refs with --update-refs:
+	refs/heads/tip
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+ok 126 - --update-refs: all update-ref lines removed, then some re-added
 
-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 1148 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
+expecting success of 3404.127 '--update-refs: --edit-todo with no update-ref lines': 
+	git checkout -b test-refs-not-removed3 no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~3 &&
+	git branch -f third HEAD~1 &&
+	git branch -f tip &&
 
-expecting success of 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 1149 - setup LF checkout  with -c core.eol=native
+	test_commit test-refs-not-removed3 &&
+	git commit --amend --fixup first &&
 
-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 1150 - setup CRLF checkout  with -c core.eol=native
+	git rev-parse first second third tip no-conflict-branch >expect-oids &&
 
-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 1151 - setup LF_mix_CR checkout  with -c core.eol=native
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i \
+			--autosquash --update-refs \
+			base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
 
-expecting success of 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 1152 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	# Add a break to the beginning of the todo so we can resume with no
+	# update-ref lines
+	echo "break" >todo.new &&
+	cat todo >>todo.new &&
 
-expecting success of 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 1153 - setup LF_nul checkout  with -c core.eol=native
+	(
+		set_replace_editor todo.new &&
+		git rebase -i --autosquash --update-refs base &&
 
-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
-		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 1154 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native
+		# Make no changes when editing so update-refs is still empty
+		cat todo >todo.new &&
+		git rebase --edit-todo &&
+		git rebase --continue
+	) &&
 
-expecting success of 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 1155 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF
+	# Ensure refs are not deleted and their OIDs have not changed
+	git rev-parse first second third tip no-conflict-branch >actual-oids &&
+	test_cmp expect-oids actual-oids
 
-expecting success of 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 1156 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF
+Switched to a new branch 'test-refs-not-removed3'
+[test-refs-not-removed3 0495d4feaa2b] test-refs-not-removed3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed3.t
+warning: refname 'first' is ambiguous.
+[test-refs-not-removed3 6fcb3c6ba86d] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-refs-not-removed3.t
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+warning: refname 'first' is ambiguous.
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+warning: refname 'first' is ambiguous.
+rebase -i script after editing:
+break
+pick c49b6574f4e9 J
+pick e31be72ab52d K
+pick 34033109e5a0 L
+pick fb069ba3d9b1 M
+pick 6fcb3c6ba86d fixup! first
+Rebasing (1/6)
Stopped at 8f99a4f1fbbd (E)
+rebase -i script after editing:
+pick c49b6574f4e9 J
+pick e31be72ab52d K
+pick 34033109e5a0 L
+pick fb069ba3d9b1 M
+pick 6fcb3c6ba86d fixup! first
+Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/test-refs-not-removed3.
+warning: refname 'first' is ambiguous.
+warning: refname 'second' is ambiguous.
+ok 127 - --update-refs: --edit-todo with no update-ref lines
 
-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 1157 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+expecting success of 3404.128 '--update-refs: check failed ref update': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -B update-refs-error no-conflict-branch &&
+	git branch -f base HEAD~4 &&
+	git branch -f first HEAD~3 &&
+	git branch -f second HEAD~2 &&
+	git branch -f third HEAD~1 &&
 
-expecting success of 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 1158 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+	cat >fake-todo <<-EOF &&
+	pick $(git rev-parse HEAD~3)
+	break
+	update-ref refs/heads/first
 
-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 1159 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul
+	pick $(git rev-parse HEAD~2)
+	update-ref refs/heads/second
 
-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 1160 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
+	pick $(git rev-parse HEAD~1)
+	update-ref refs/heads/third
 
-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 1161 - setup LF checkout  with -c core.eol=native
+	pick $(git rev-parse HEAD)
+	update-ref refs/heads/no-conflict-branch
+	EOF
 
-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 1162 - setup CRLF checkout  with -c core.eol=native
+	(
+		set_replace_editor fake-todo &&
+		git rebase -i --update-refs base
+	) &&
 
-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 1163 - setup LF_mix_CR checkout  with -c core.eol=native
+	# At this point, the values of first, second, and third are
+	# recorded in the update-refs file. We will force-update the
+	# "second" ref, but "git branch -f" will not work because of
+	# the lock in the update-refs file.
+	git update-ref refs/heads/second third &&
 
-expecting success of 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 1164 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	test_must_fail git rebase --continue 2>err &&
+	grep "update_ref failed for ref 'refs/heads/second'" err &&
 
-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 1165 - setup LF_nul checkout  with -c core.eol=native
+	q_to_tab >expect <<-\EOF &&
+	Updated the following refs with --update-refs:
+	Qrefs/heads/first
+	Qrefs/heads/no-conflict-branch
+	Qrefs/heads/third
+	Failed to update the following refs with --update-refs:
+	Qrefs/heads/second
+	EOF
 
-expecting success of 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
-		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 1166 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native
+	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
+	tail -n 6 err >err.last &&
+	sed "s/Rebasing.*Successfully/Successfully/g" <err.last >err.trimmed &&
+	test_cmp expect err.trimmed
 
-expecting success of 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 1167 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF
+Switched to a new branch 'update-refs-error'
+rebase -i script after editing:
+pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
+break
+update-ref refs/heads/first
 
-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 1168 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+pick e31be72ab52d740527956c171d40a832b63e68ca
+update-ref refs/heads/second
 
-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 1169 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+update-ref refs/heads/third
 
-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 1170 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+update-ref refs/heads/no-conflict-branch
+Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
+error: update_ref failed for ref 'refs/heads/second': cannot lock ref 'refs/heads/second': is at 34033109e5a0def540b16172943d8a7e2a8a712e but expected e31be72ab52d740527956c171d40a832b63e68ca
+ok 128 - --update-refs: check failed ref update
 
-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 1171 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+expecting success of 3404.129 'bad labels and refs rejected when parsing todo list': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	cat >todo <<-\EOF &&
+	exec >execed
+	label #
+	label :invalid
+	update-ref :bad
+	update-ref topic
+	EOF
+	rm -f execed &&
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i HEAD 2>err
+	) &&
+	grep "'#' is not a valid label" err &&
+	grep "':invalid' is not a valid label" err &&
+	grep "':bad' is not a valid refname" err &&
+	grep "update-ref requires a fully qualified refname e.g. refs/heads/topic" \
+		err &&
+	test_path_is_missing execed
 
-expecting success of 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 1172 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
+rebase -i script after editing:
+exec >execed
+label #
+label :invalid
+update-ref :bad
+update-ref topic
+error: '#' is not a valid label
+error: ':invalid' is not a valid label
+error: ':bad' is not a valid refname
+error: update-ref requires a fully qualified refname e.g. refs/heads/topic
+ok 129 - bad labels and refs rejected when parsing todo list
 
-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 1173 - setup LF checkout  with -c core.eol=native
+expecting success of 3404.130 'non-merge commands reject merge commits': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout E &&
+	git merge I &&
+	oid=$(git rev-parse HEAD) &&
+	cat >todo <<-EOF &&
+	pick $oid
+	reword $oid
+	edit $oid
+	fixup $oid
+	squash $oid
+	EOF
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i HEAD 2>actual
+	) &&
+	cat >expect <<-EOF &&
+	error: ${SQ}pick${SQ} does not accept merge commits
+	hint: ${SQ}pick${SQ} does not take a merge commit. If you wanted to
+	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit.
+	hint: Disable this message with "git config set advice.rebaseTodoError false"
+	error: invalid line 1: pick $oid
+	error: ${SQ}reword${SQ} does not accept merge commits
+	hint: ${SQ}reword${SQ} does not take a merge commit. If you wanted to
+	hint: replay the merge and reword the commit message, use
+	hint: ${SQ}merge -c${SQ} on the commit
+	hint: Disable this message with "git config set advice.rebaseTodoError false"
+	error: invalid line 2: reword $oid
+	error: ${SQ}edit${SQ} does not accept merge commits
+	hint: ${SQ}edit${SQ} does not take a merge commit. If you wanted to
+	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit, and then
+	hint: ${SQ}break${SQ} to give the control back to you so that you can
+	hint: do ${SQ}git commit --amend && git rebase --continue${SQ}.
+	hint: Disable this message with "git config set advice.rebaseTodoError false"
+	error: invalid line 3: edit $oid
+	error: cannot squash merge commit into another commit
+	error: invalid line 4: fixup $oid
+	error: cannot squash merge commit into another commit
+	error: invalid line 5: squash $oid
+	You can fix this with ${SQ}git rebase --edit-todo${SQ} and then run ${SQ}git rebase --continue${SQ}.
+	Or you can abort the rebase with ${SQ}git rebase --abort${SQ}.
+	EOF
+	test_cmp expect actual
 
-expecting success of 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 1174 - setup CRLF checkout  with -c core.eol=native
+Note: switching to 'E'.
 
-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 1175 - setup LF_mix_CR checkout  with -c core.eol=native
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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 1176 - setup CRLF_mix_LF checkout  with -c core.eol=native
+If you want to 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.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 1177 - setup LF_nul checkout  with -c core.eol=native
+  git switch -c <new-branch-name>
 
-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
-		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 1178 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
+Or undo this operation with:
 
-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 1179 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF
+  git switch -
 
-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 1180 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 1181 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+HEAD is now at 8f99a4f1fbbd E
+Merge made by the 'ort' strategy.
+ file4 | 1 +
+ file6 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file4
+ create mode 100644 file6
+rebase -i script after editing:
+pick e1787ed465883b1097349020e1a6efb9957df2e7
+reword e1787ed465883b1097349020e1a6efb9957df2e7
+edit e1787ed465883b1097349020e1a6efb9957df2e7
+fixup e1787ed465883b1097349020e1a6efb9957df2e7
+squash e1787ed465883b1097349020e1a6efb9957df2e7
+ok 130 - non-merge commands reject merge commits
 
-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 1182 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+expecting success of 3404.131 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
 
-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 1183 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 131 - $EDITOR and friends are unchanged
 
-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 1184 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
+# passed all 131 test(s)
+1..131
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3509-cherry-pick-merge-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 1185 - setup LF checkout  with -c core.eol=native
+[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.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 1186 - setup CRLF checkout  with -c core.eol=native
+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.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 1187 - setup LF_mix_CR checkout  with -c core.eol=native
+	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.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 1188 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	>f1 &&
+	git add f1 &&
+	git commit -m f1
 
-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 1189 - setup LF_nul checkout  with -c core.eol=native
+checking prerequisite: SYMLINKS
 
-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
-		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 1190 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native
+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.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 1191 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF
+)
+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.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 1192 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+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.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 1193 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+HEAD is now at b71b76f f1
+Note: switching to 'main^0'.
 
-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 1194 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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 1195 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+If you want to 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.1196 'setup config for checkout attr=text ident= aeol=crlf 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
+  git switch -c <new-branch-name>
 
-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 1197 - setup LF checkout  with -c core.eol=native
+Or undo this operation with:
 
-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 1198 - setup CRLF checkout  with -c core.eol=native
+  git switch -
 
-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 1199 - setup LF_mix_CR checkout  with -c core.eol=native
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 1200 - setup CRLF_mix_LF checkout  with -c core.eol=native
+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 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 1201 - setup LF_nul checkout  with -c core.eol=native
+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 . &&
 
-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
-		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 1202 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native
+	>empty &&
+	git add empty &&
+	git commit -m "Empty file" &&
 
-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 1203 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF
+	git checkout -b simple &&
+	mv empty file &&
+	mkdir empty &&
+	mv file empty &&
+	git add empty/file &&
+	git commit -m "Empty file under empty dir" &&
 
-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 1204 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+	echo content >newfile &&
+	git add newfile &&
+	git commit -m "New file"
 
-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 1205 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+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 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 1206 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+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.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 1207 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_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)
 
-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 1208 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
+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.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 1209 - setup LF checkout  with -c core.eol=native
+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.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 1210 - setup CRLF checkout  with -c core.eol=native
+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.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 1211 - setup LF_mix_CR checkout  with -c core.eol=native
+	mkdir sub &&
+	mkdir othersub &&
+	echo content > sub/file &&
+	echo foo > othersub/whatever &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-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 1212 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	git rm -rf othersub &&
+	git mv sub/file othersub &&
+	git commit -m "Commit to merge" &&
 
-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 1213 - setup LF_nul checkout  with -c core.eol=native
+	git checkout -b newhead mergeme~1 &&
+	>independent-change &&
+	git add independent-change &&
+	git commit -m "Completely unrelated change"
 
-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
-		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 1214 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native
+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.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 1215 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF
+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.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 1216 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+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.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 1217 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+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.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 1218 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+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.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 1219 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3508-cherry-pick-many-commits.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.1220 'setup config for checkout attr=auto ident= aeol=crlf 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
+	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.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 1221 - setup LF checkout  with -c core.eol=native
+[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.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 1222 - setup CRLF checkout  with -c core.eol=native
+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.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 1223 - setup LF_mix_CR checkout  with -c core.eol=native
+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.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 1224 - setup CRLF_mix_LF checkout  with -c core.eol=native
+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.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 1225 - setup LF_nul checkout  with -c core.eol=native
+Note: switching to 'first'.
 
-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
-		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 1226 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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 1227 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=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.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 1228 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+  git switch -c <new-branch-name>
 
-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 1229 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+Or undo this operation with:
 
-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 1230 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+  git switch -
 
-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 1231 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 1232 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
+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.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 1233 - setup LF checkout  with -c core.eol=native
+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.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 1234 - setup CRLF checkout  with -c core.eol=native
+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.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 1235 - setup LF_mix_CR checkout  with -c core.eol=native
+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.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 1236 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	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.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 1237 - setup LF_nul checkout  with -c core.eol=native
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 5 - output to keep user entertained during multi-pick
 
-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
-		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 1238 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native
+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.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 1239 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF
+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.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 1240 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF
+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.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 1241 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+	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.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 1242 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 7 - output during multi-pick indicates merge strategy
 
-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 1243 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul
+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.1244 'setup config for checkout attr=-text ident= aeol=lf 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
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 8 - cherry-pick --ff first..fourth works
 
-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 1245 - setup LF checkout  with -c core.eol=native
+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.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 1246 - setup CRLF checkout  with -c core.eol=native
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 9 - cherry-pick -n first..fourth works
 
-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 1247 - setup LF_mix_CR checkout  with -c core.eol=native
+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.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 1248 - setup CRLF_mix_LF checkout  with -c core.eol=native
+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.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 1249 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1250 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native
+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.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 1251 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF
+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.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 1252 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+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.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 1253 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+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.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 1254 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+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.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 1255 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+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.1256 'setup config for checkout attr=-text ident= aeol=crlf 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
+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.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 1257 - setup LF checkout  with -c core.eol=native
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3514-cherry-pick-revert-gpg.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
+checking prerequisite: GPG
 
-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 1258 - setup CRLF checkout  with -c core.eol=native
+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.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 1259 - setup LF_mix_CR checkout  with -c core.eol=native
+	# 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.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 1260 - setup CRLF_mix_LF checkout  with -c core.eol=native
+)
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3601-rm-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 1261 - setup LF_nul checkout  with -c core.eol=native
+	git tag checkpoint
 
-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
-		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 1262 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native
+[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.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 1263 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF
+expecting success of 3601.2 'simplest': 
+	restore_checkpoint &&
 
-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 1264 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	EOF
 
-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 1265 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+	echo fileA.t | git rm --pathspec-from-file=- &&
+	verify_expect
 
-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 1266 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+ok 2 - simplest
 
-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 1267 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+expecting success of 3601.3 '--pathspec-file-nul': 
+	restore_checkpoint &&
 
-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 1268 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	D  fileB.t
+	EOF
 
-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 1269 - setup LF checkout  with -c core.eol=native
+	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
 
-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 1270 - setup CRLF checkout  with -c core.eol=native
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+rm 'fileB.t'
+ok 3 - --pathspec-file-nul
 
-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 1271 - setup LF_mix_CR checkout  with -c core.eol=native
+expecting success of 3601.4 'only touches what was listed': 
+	restore_checkpoint &&
 
-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 1272 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	cat >expect <<-\EOF &&
+	D  fileB.t
+	D  fileC.t
+	EOF
 
-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 1273 - setup LF_nul checkout  with -c core.eol=native
+	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
+	verify_expect
 
-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
-		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 1274 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native
+HEAD is now at d32ab08 files
+rm 'fileB.t'
+rm 'fileC.t'
+ok 4 - only touches what was listed
 
-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 1275 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF
+expecting success of 3601.5 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
 
-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 1276 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+	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.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 1277 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+	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.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 1278 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+	>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.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 1279 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+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.1280 'setup config for checkout attr=text ident= aeol=crlf 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
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3511-cherry-pick-x.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3511-cherry-pick-x/.git/
+expecting success of 3511.1 'setup': 
+	git config set advice.detachedhead false &&
+	echo unrelated >unrelated &&
+	git add unrelated &&
+	test_commit initial foo a &&
+	test_commit "$mesg_one_line" foo b mesg-one-line &&
+	git reset --hard initial &&
+	test_commit "$mesg_no_footer" foo b mesg-no-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_broken_footer" foo b mesg-broken-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_footer" foo b mesg-with-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_footer_sob" foo b mesg-with-footer-sob &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_cherry_footer" foo b mesg-with-cherry-footer &&
+	git reset --hard initial &&
+	test_config commit.cleanup verbatim &&
+	test_commit "$mesg_unclean" foo b mesg-unclean &&
+	test_unconfig commit.cleanup &&
+	pristine_detach initial &&
+	test_commit conflicting unrelated
 
-expecting success of 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 1281 - setup LF checkout  with -c core.eol=native
+[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.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 1282 - setup CRLF checkout  with -c core.eol=native
+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.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 1283 - setup LF_mix_CR checkout  with -c core.eol=native
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-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 1284 - setup CRLF_mix_LF checkout  with -c core.eol=native
+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.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 1285 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1286 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native
+		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.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 1287 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1288 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+  6970a53 base: commit message
 
-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 1289 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+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.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 1290 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+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.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 1291 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+		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.1292 'setup config for checkout attr=auto ident= aeol=lf 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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1293 - setup LF checkout  with -c core.eol=native
+  0fda2e1 base: commit message
 
-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 1294 - setup CRLF checkout  with -c core.eol=native
+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.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 1295 - setup LF_mix_CR checkout  with -c core.eol=native
+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.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 1296 - setup CRLF_mix_LF checkout  with -c core.eol=native
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1297 - setup LF_nul checkout  with -c core.eol=native
+  0cf5261 base: commit message
 
-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
-		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 1298 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native
+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.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 1299 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF
+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.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 1300 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-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 1301 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1302 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+  b95a0f7 base: commit message
 
-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 1303 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+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.1304 'setup config for checkout attr=auto ident= aeol=crlf 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
+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.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 1305 - setup LF checkout  with -c core.eol=native
+		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.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 1306 - setup CRLF checkout  with -c core.eol=native
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1307 - setup LF_mix_CR checkout  with -c core.eol=native
+  6f42e54 base: commit message
 
-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 1308 - setup CRLF_mix_LF checkout  with -c core.eol=native
+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.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 1309 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1310 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native
+		(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.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 1311 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1312 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+  32d2dda base: commit message
 
-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 1313 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+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.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 1314 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+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.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 1315 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1316 - setup config for checkout attr= ident= aeol= core.autocrlf=false
+  adaaef8 base: commit message
 
-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 1317 - setup LF checkout  with -c core.eol=native
+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.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 1318 - setup CRLF checkout  with -c core.eol=native
+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.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 1319 - setup LF_mix_CR checkout  with -c core.eol=native
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1320 - setup CRLF_mix_LF checkout  with -c core.eol=native
+  b62bd75 base: commit message
 
-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 1321 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1322 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native
+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.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 1323 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1324 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF
+  94e740a base: commit message
 
-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 1325 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+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.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 1326 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+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.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 1327 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1328 - setup config for checkout attr= ident= aeol= core.autocrlf=true
+  a836c16 base: commit message
 
-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 1329 - setup LF checkout  with -c core.eol=native
+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.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 1330 - setup CRLF checkout  with -c core.eol=native
+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.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 1331 - setup LF_mix_CR checkout  with -c core.eol=native
+	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
 
-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 1332 - setup CRLF_mix_LF checkout  with -c core.eol=native
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1333 - setup LF_nul checkout  with -c core.eol=native
+  2d6e386 base: commit message
 
-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
-		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 1334 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native
+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.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 1335 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF
+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.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 1336 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF
+	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
 
-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 1337 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1338 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+  96716be title
 
-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 1339 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul
+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.1340 'setup config for checkout attr=auto 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
+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.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 1341 - setup LF checkout  with -c core.eol=native
+	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
 
-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 1342 - setup CRLF checkout  with -c core.eol=native
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1343 - setup LF_mix_CR checkout  with -c core.eol=native
+  8c5d63f title
 
-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 1344 - setup CRLF_mix_LF checkout  with -c core.eol=native
+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.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 1345 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1346 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native
+	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
 
-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 1347 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1348 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF
+  6671fda title
 
-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 1349 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+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.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 1350 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+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.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 1351 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1352 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
+  19f481d title
 
-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 1353 - setup LF checkout  with -c core.eol=native
+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.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 1354 - setup CRLF checkout  with -c core.eol=native
+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.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 1355 - setup LF_mix_CR checkout  with -c core.eol=native
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1356 - setup CRLF_mix_LF checkout  with -c core.eol=native
+  7b5eb6d base: commit message
 
-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 1357 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1358 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native
+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.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 1359 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1360 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF
+  b468a7b base: commit message
 
-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 1361 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_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.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 1362 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+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.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 1363 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1364 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
+  c7c741c base: commit message
 
-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 1365 - setup LF checkout  with -c core.eol=native
+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.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 1366 - setup CRLF checkout  with -c core.eol=native
+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.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 1367 - setup LF_mix_CR checkout  with -c core.eol=native
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1368 - setup CRLF_mix_LF checkout  with -c core.eol=native
+  7a2ed43 base: commit message
 
-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 1369 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1370 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native
+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.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 1371 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1372 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF
+  ad2d5bc base: commit message
 
-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 1373 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_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.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 1374 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3507-cherry-pick-conflict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3507-cherry-pick-conflict/.git/
+expecting success of 3507.1 'setup': 
 
-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 1375 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul
+	echo unrelated >unrelated &&
+	git add unrelated &&
+	test_commit initial foo a &&
+	test_commit base foo b &&
+	test_commit picked foo c &&
+	test_commit --signoff picked-signed foo d &&
+	git checkout -b topic initial &&
+	test_commit redundant-pick foo c redundant &&
+	git commit --allow-empty --allow-empty-message &&
+	git tag empty &&
+	git checkout main &&
+	git config set advice.detachedhead false
 
-expecting success of 0027.1376 'setup config for checkout attr=auto 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
 
-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 1377 - setup LF checkout  with -c core.eol=native
+[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.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 1378 - setup CRLF checkout  with -c core.eol=native
+expecting success of 3507.2 'failed cherry-pick does not advance HEAD': 
+	pristine_detach initial &&
 
-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 1379 - setup LF_mix_CR checkout  with -c core.eol=native
+	head=$(git rev-parse HEAD) &&
+	test_must_fail git cherry-pick picked &&
+	newhead=$(git rev-parse HEAD) &&
 
-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 1380 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	test "$head" = "$newhead"
 
-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 1381 - setup LF_nul checkout  with -c core.eol=native
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 2 - failed cherry-pick does not advance HEAD
 
-expecting success of 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
-		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 1382 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native
+expecting success of 3507.3 'advice from failed cherry-pick': 
+	pristine_detach initial &&
 
-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 1383 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF
+	picked=$(git rev-parse --short picked) &&
+	cat <<-EOF >expected &&
+	error: could not apply $picked... picked
+	hint: After resolving the conflicts, mark them with
+	hint: "git add/rm <pathspec>", then run
+	hint: "git cherry-pick --continue".
+	hint: You can instead skip this commit with "git cherry-pick --skip".
+	hint: To abort and get back to the state before "git cherry-pick",
+	hint: run "git cherry-pick --abort".
+	hint: Disable this message with "git config set advice.mergeConflict false"
+	EOF
+	test_must_fail git cherry-pick picked 2>actual &&
 
-expecting success of 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 1384 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF
+	test_cmp expected actual
 
-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 1385 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native 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
+ok 3 - advice from failed cherry-pick
 
-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 1386 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+expecting success of 3507.4 'advice from failed cherry-pick --no-commit': 
+	pristine_detach initial &&
 
-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 1387 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul
+	picked=$(git rev-parse --short picked) &&
+	cat <<-EOF >expected &&
+	error: could not apply $picked... picked
+	hint: after resolving the conflicts, mark the corrected paths
+	hint: with 'git add <paths>' or 'git rm <paths>'
+	hint: Disable this message with "git config set advice.mergeConflict false"
+	EOF
+	test_must_fail git cherry-pick --no-commit picked 2>actual &&
 
-expecting success of 0027.1388 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1388 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+	test_cmp expected actual
 
-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 1389 - setup LF checkout  with -c core.eol=crlf
+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.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 1390 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1391 - 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 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 5 - failed cherry-pick sets CHERRY_PICK_HEAD
 
-expecting success of 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 1392 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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.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 1393 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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 1394 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf
+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.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 1395 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1396 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+  ccd9cfc base
 
-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 1397 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_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.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 1398 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+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.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 1399 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+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.1400 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1400 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+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.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 1401 - setup LF checkout  with -c 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.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 1402 - setup CRLF checkout  with -c core.eol=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.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 1403 - 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 apply 7e6d412... picked
+hint: and then do something else
+hint: Disable this message with "git config set advice.mergeConflict false"
+fatal: Needed a single revision
+ok 10 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD
 
-expecting success of 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 1404 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+expecting success of 3507.11 'git reset clears CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-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 1405 - setup LF_nul checkout  with -c core.eol=lf
+	test_must_fail git cherry-pick picked &&
+	git reset &&
 
-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
-		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 1406 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-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 1407 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=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 set advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+fatal: Needed a single revision
+ok 11 - git reset clears CHERRY_PICK_HEAD
 
-expecting success of 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 1408 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF
+expecting success of 3507.12 'failed commit does not clear CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-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 1409 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+	test_must_fail git cherry-pick picked &&
+	test_must_fail git commit &&
 
-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 1410 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+	test_cmp_rev picked CHERRY_PICK_HEAD
 
-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 1411 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+error: Committing is not possible because you have unmerged files.
+hint: Fix them up in the work tree, and then use 'git add/rm <file>'
+hint: as appropriate to mark resolution and make a commit.
+fatal: Exiting because of an unresolved conflict.
+U	foo
+ok 12 - failed commit does not clear CHERRY_PICK_HEAD
 
-expecting success of 0027.1412 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1412 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+expecting success of 3507.13 'cancelled commit does not clear CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-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 1413 - setup LF checkout 
+	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.1414 'setup CRLF checkout ': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1414 - setup CRLF checkout 
+	test_cmp_rev picked CHERRY_PICK_HEAD
 
-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 1415 - setup LF_mix_CR checkout 
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 2ab19ae607aabda796309682e0448237aab03047 M	foo
+error: there was a problem with the editor 'false'
+Please supply the message using either -m or -F option.
+ok 13 - cancelled commit does not clear CHERRY_PICK_HEAD
 
-expecting success of 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 1416 - setup CRLF_mix_LF checkout 
+expecting success of 3507.14 'successful commit clears CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-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 1417 - setup LF_nul checkout 
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	git commit &&
 
-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
-		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 1418 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-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 1419 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=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 set advice.mergeConflict false"
+[detached HEAD a8c44c9] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 14 - successful commit clears CHERRY_PICK_HEAD
 
-expecting success of 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 1420 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF
+expecting success of 3507.15 'partial commit of cherry-pick fails': 
+	pristine_detach initial &&
 
-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 1421 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_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.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 1422 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+	test_grep "cannot do a partial commit during a cherry-pick." err
 
-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 1423 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1424 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+  a8c44c9 picked
 
-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 1425 - setup LF checkout  with -c core.eol=native
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+fatal: cannot do a partial commit during a cherry-pick.
+ok 15 - partial commit of cherry-pick fails
 
-expecting success of 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 1426 - setup CRLF checkout  with -c core.eol=native
+expecting success of 3507.16 'commit --amend of cherry-pick fails': 
+	pristine_detach initial &&
 
-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 1427 - setup LF_mix_CR checkout  with -c core.eol=native
+	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.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 1428 - setup CRLF_mix_LF checkout  with -c core.eol=native
+	test_grep "in the middle of a cherry-pick -- cannot amend." err
 
-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 1429 - setup LF_nul checkout  with -c core.eol=native
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+fatal: You are in the middle of a cherry-pick -- cannot amend.
+ok 16 - commit --amend of cherry-pick fails
 
-expecting success of 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
-		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 1430 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native
+expecting success of 3507.17 'successful final commit clears cherry-pick state': 
+	pristine_detach initial &&
 
-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 1431 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF
+	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.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 1432 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+[detached HEAD ccd9cfc] base
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply e4ca149... picked-signed
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+[detached HEAD 53c8c73] picked-signed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 17 - successful final commit clears cherry-pick state
 
-expecting success of 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 1433 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+expecting success of 3507.18 'reset after final pick clears cherry-pick state': 
+	pristine_detach initial &&
 
-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 1434 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+	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.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 1435 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-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 1436 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
+  53c8c73 picked-signed
+  ccd9cfc base
 
-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 1437 - setup LF checkout 
+HEAD is now at df2a63d initial
+[detached HEAD ccd9cfc] base
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply e4ca149... picked-signed
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+ok 18 - reset after final pick clears cherry-pick state
 
-expecting success of 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 1438 - setup CRLF checkout 
+expecting success of 3507.19 'failed cherry-pick produces dirty index': 
+	pristine_detach initial &&
 
-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 1439 - setup LF_mix_CR checkout 
+	test_must_fail git cherry-pick picked &&
 
-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 1440 - setup CRLF_mix_LF checkout 
+	test_must_fail git update-index --refresh -q &&
+	test_must_fail git diff-index --exit-code HEAD
 
-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 1441 - setup LF_nul checkout 
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
-		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 1442 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=
+  ccd9cfc base
 
-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 1443 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=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 set advice.mergeConflict false"
+foo: needs merge
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
+ok 19 - failed cherry-pick produces dirty index
 
-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 1444 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF
+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.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 1445 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+	test_must_fail git cherry-pick picked &&
+	git ls-files --stage --unmerged >actual &&
 
-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 1446 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+	test_cmp expected actual
 
-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 1447 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 20 - failed cherry-pick registers participants in index
 
-expecting success of 0027.1448 'setup config for checkout attr=auto ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1448 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
+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.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 1449 - setup LF checkout  with -c core.eol=native
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
+		EOF
 
-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 1450 - setup CRLF checkout  with -c core.eol=native
+	test_must_fail git cherry-pick picked &&
 
-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 1451 - setup LF_mix_CR checkout  with -c core.eol=native
+	test_cmp expected .git/MERGE_MSG
 
-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 1452 - setup CRLF_mix_LF checkout  with -c core.eol=native
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 21 - cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly
 
-expecting success of 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 1453 - setup LF_nul checkout  with -c core.eol=native
+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.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
-		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 1454 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native
 
-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 1455 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF
+	test_must_fail git cherry-pick --cleanup=scissors picked &&
 
-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 1456 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF
+	test_cmp expected .git/MERGE_MSG
 
-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 1457 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native 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 set advice.mergeConflict false"
+ok 22 - cherry-pick conflict, ensure cleanup=scissors places scissors line properly
 
-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 1458 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native 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.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 1459 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul
+	test_must_fail git cherry-pick picked &&
 
-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 1460 - setup config for checkout attr= ident= aeol=lf core.autocrlf=false
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-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 1461 - setup LF checkout 
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 23 - failed cherry-pick describes conflict in work tree
 
-expecting success of 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 1462 - setup CRLF checkout 
+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.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 1463 - setup LF_mix_CR checkout 
+	test_must_fail git cherry-pick picked &&
 
-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 1464 - setup CRLF_mix_LF checkout 
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-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 1465 - setup LF_nul checkout 
+HEAD is now at df2a63d initial
+warning: cancelling a cherry picking in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 24 - diff3 -m style
 
-expecting success of 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
-		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 1466 - ls-files --eol attr=  aeol=lf core.autocrlf=false core.eol=
+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.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 1467 - checkout attr=  aeol=lf core.autocrlf=false core.eol= 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.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 1468 - checkout attr=  aeol=lf core.autocrlf=false core.eol= 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.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 1469 - checkout attr=  aeol=lf core.autocrlf=false core.eol= 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 set advice.mergeConflict false"
+foo: needs merge
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
+ok 25 - revert also handles conflicts sanely
 
-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 1470 - checkout attr=  aeol=lf core.autocrlf=false core.eol= 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.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 1471 - checkout attr=  aeol=lf core.autocrlf=false core.eol= 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 set advice.mergeConflict false"
+ok 26 - failed revert sets REVERT_HEAD
 
-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 1472 - setup config for checkout attr= ident= aeol=crlf 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.1473 'setup LF checkout ': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1473 - setup LF checkout 
+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.1474 'setup CRLF checkout ': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1474 - setup CRLF checkout 
+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.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 1475 - setup LF_mix_CR checkout 
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1476 - setup CRLF_mix_LF checkout 
+  feb2983 Revert "base"
 
-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 1477 - setup LF_nul checkout 
+HEAD is now at dc0113b base
+fatal: Needed a single revision
+ok 28 - revert --no-commit sets REVERT_HEAD
 
-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
-		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 1478 - ls-files --eol attr=  aeol=crlf core.autocrlf=false core.eol=
+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.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 1479 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= 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.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 1480 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= 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.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 1481 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= 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 set advice.mergeConflict false"
+fatal: Needed a single revision
+ok 30 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD
 
-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 1482 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= 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.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 1483 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= 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 set advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+fatal: Needed a single revision
+ok 31 - git reset clears REVERT_HEAD
 
-expecting success of 0027.1484 'setup config for checkout attr= ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1484 - setup config for checkout attr= ident= aeol=lf core.autocrlf=true
+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.1485 'setup LF checkout ': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1485 - setup LF checkout 
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+error: Committing is not possible because you have unmerged files.
+hint: Fix them up in the work tree, and then use 'git add/rm <file>'
+hint: as appropriate to mark resolution and make a commit.
+fatal: Exiting because of an unresolved conflict.
+U	foo
+ok 32 - failed commit does not clear REVERT_HEAD
 
-expecting success of 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 1486 - setup CRLF checkout 
+expecting success of 3507.33 'successful final commit clears revert state': 
+	pristine_detach picked-signed &&
 
-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 1487 - setup LF_mix_CR checkout 
+	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.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 1488 - setup CRLF_mix_LF checkout 
+Previous HEAD position was df2a63d initial
+HEAD is now at e4ca149 picked-signed
+warning: cancelling a revert in progress
+[detached HEAD b940b09] Revert "picked-signed"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert dc0113b... base
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+[detached HEAD 7342963] Revert "base"
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 33 - successful final commit clears revert state
 
-expecting success of 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 1489 - setup LF_nul checkout 
+expecting success of 3507.34 'reset after final pick clears revert state': 
+	pristine_detach picked-signed &&
 
-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
-		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 1490 - ls-files --eol attr=  aeol=lf core.autocrlf=true core.eol=
+	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.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 1491 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-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 1492 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF
+  7342963 Revert "base"
+  b940b09 Revert "picked-signed"
 
-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 1493 - checkout attr=  aeol=lf core.autocrlf=true core.eol= 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 set advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+ok 34 - reset after final pick clears revert state
 
-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 1494 - checkout attr=  aeol=lf core.autocrlf=true core.eol= 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.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 1495 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_nul
+	test_must_fail git revert picked &&
 
-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 1496 - setup config for checkout attr= ident= aeol=crlf core.autocrlf=true
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-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 1497 - setup LF checkout 
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1498 - setup CRLF checkout 
+  b940b09 Revert "picked-signed"
 
-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 1499 - setup LF_mix_CR checkout 
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 35 - revert conflict, diff3 -m style
 
-expecting success of 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 1500 - setup CRLF_mix_LF checkout 
+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.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 1501 - setup LF_nul checkout 
+		This reverts commit OBJID.
 
-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
-		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 1502 - ls-files --eol attr=  aeol=crlf core.autocrlf=true core.eol=
 
-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 1503 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= 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
-	
-ok 1504 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF
+	test_must_fail git revert picked &&
 
-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 1505 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF
+	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+	test_cmp expected actual
 
-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 1506 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR
+HEAD is now at df2a63d initial
+warning: cancelling a revert in progress
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not revert 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git revert --continue".
+hint: You can instead skip this commit with "git revert --skip".
+hint: To abort and get back to the state before "git revert",
+hint: run "git revert --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 36 - revert conflict, ensure commit.cleanup = scissors places scissors line properly
 
-expecting success of 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 1507 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_nul
+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.1508 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1508 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
+		This reverts commit OBJID.
 
-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 1509 - setup LF 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.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 1510 - setup CRLF checkout  with -c core.eol=lf
+	test_must_fail git revert --cleanup=scissors picked &&
 
-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 1511 - setup LF_mix_CR checkout  with -c core.eol=lf
+	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+	test_cmp expected actual
 
-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 1512 - setup CRLF_mix_LF 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 set advice.mergeConflict false"
+ok 37 - revert conflict, ensure cleanup=scissors places scissors line properly
 
-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 1513 - setup LF_nul checkout  with -c 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.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
-		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 1514 - ls-files --eol attr=-text ident aeol= core.autocrlf=true 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 apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Signed-off-by: C O Mitter <committer@example.com>
+ok 38 - failed cherry-pick does not forget -s
 
-expecting success of 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 1515 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF
+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.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 1516 - checkout attr=-text ident aeol= 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 e4ca149... picked-signed
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+[detached HEAD ae79e40] picked-signed
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+ok 39 - commit after failed cherry-pick does not add duplicated -s
 
-expecting success of 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 1517 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+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.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 1518 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+	git commit -a -s &&
 
-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 1519 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+	# 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.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 1520 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+	cat <<-\EOF >expected &&
+	picked
 
-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 1521 - setup LF checkout  with -c core.eol=lf
+	Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 
-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 1522 - setup CRLF checkout  with -c core.eol=lf
+	git show -s --pretty=format:%B >actual &&
+	test_cmp expected actual
 
-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 1523 - 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.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 1524 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+  ae79e40 picked-signed
 
-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 1525 - setup LF_nul 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 set advice.mergeConflict false"
+[detached HEAD 56f790d] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+ok 40 - commit after failed cherry-pick adds -s at the right place
 
-expecting success of 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
-		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 1526 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=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.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 1527 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+	# 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.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 1528 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+	git commit -a &&
+	git commit --amend -s &&
 
-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 1529 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+	# 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.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 1530 - checkout attr=-text ident aeol=lf 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.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 1531 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+  56f790d picked
 
-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 1532 - setup config for checkout attr=-text ident=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 set advice.mergeConflict false"
+[detached HEAD a795bbb] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+[detached HEAD 91df379] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 6 insertions(+)
+ok 41 - commit --amend -s places the sign-off at the right place
 
-expecting success of 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 1533 - setup LF 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.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 1534 - setup CRLF checkout  with -c core.eol=lf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 1535 - setup LF_mix_CR checkout  with -c core.eol=lf
+  91df379 picked
 
-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 1536 - setup CRLF_mix_LF 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.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 1537 - setup LF_nul checkout  with -c core.eol=lf
+    git commit --allow-empty
 
-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
-		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 1538 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf
+Otherwise, please use 'git cherry-pick --skip'
+ok 42 - cherry-pick preserves sparse-checkout
 
-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 1539 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+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.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 1540 - checkout attr=-text ident 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 set advice.mergeConflict false"
+[detached HEAD d9f497e] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 22de78d] redundant-pick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 43 - cherry-pick --continue remembers --keep-redundant-commits
 
-expecting success of 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 1541 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+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.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 1542 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-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 1543 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+  22de78d redundant-pick
+  d9f497e picked
 
-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 1544 - setup config for checkout attr=text ident=ident aeol=lf 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 set advice.mergeConflict false"
+[detached HEAD d9f497e] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD d7f7844] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 44 - cherry-pick --continue remembers --allow-empty and --allow-empty-message
 
-expecting success of 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 1545 - setup LF checkout  with -c core.eol=lf
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3602-rm-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 1546 - setup CRLF 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.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 1547 - setup LF_mix_CR 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 set advice.updateSparsePath false"
+	EOF
 
-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 1548 - setup CRLF_mix_LF 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.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 1549 - setup LF_nul checkout  with -c 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.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
-		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 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 1550 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=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.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 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 1551 - checkout attr=text ident aeol=lf core.autocrlf=true 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 3 - rm -f does not remove sparse entries
 
-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 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 1552 - checkout attr=text ident aeol=lf core.autocrlf=true 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 4 - rm --dry-run does not remove sparse entries
 
-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 1553 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+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.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 1554 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+	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.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 1555 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+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.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 1556 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+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.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 1557 - setup LF 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.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 1558 - setup CRLF 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.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 1559 - setup LF_mix_CR 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.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 1560 - setup CRLF_mix_LF 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.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 1561 - setup LF_nul 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).
+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.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
-		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 1562 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=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.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 1563 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=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).
+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.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 1564 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+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.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 1565 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_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).
+b
+ok 10 - do not warn about sparse entries with --ignore-unmatch
 
-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 1566 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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.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 1567 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+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.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 1568 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+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.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 1569 - setup LF 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.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 1570 - setup CRLF 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.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 1571 - setup LF_mix_CR 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.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 1572 - setup CRLF_mix_LF 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.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 1573 - setup LF_nul checkout  with -c 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.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
-		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 1574 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t0027-auto-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 1575 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+ok 1 - ls-files --eol -o Text/Binary
 
-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 1576 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=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.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 1577 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+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.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 1578 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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.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 1579 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+[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.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 1580 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+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.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 1581 - setup LF checkout  with -c core.eol=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.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 1582 - setup CRLF checkout  with -c core.eol=lf
+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.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 1583 - setup LF_mix_CR checkout  with -c core.eol=lf
+[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.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 1584 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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.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 1585 - setup LF_nul checkout  with -c core.eol=lf
+[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.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
-		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 1586 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf
+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.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 1587 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+[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.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 1588 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=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.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 1589 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+[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.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.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 1590 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 9 - setup commit file with mixed EOL
 
-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.10 'commit file with mixed EOL onto LF crlf=false attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1591 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+ok 10 - commit file with mixed EOL onto LF crlf=false attr=
 
-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
+expecting success of 0027.11 'commit file with mixed EOL onto CLRF attr= aeol= crlf=false': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1592 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
-
-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 1593 - setup LF checkout  with -c core.eol=lf
-
-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 1594 - setup CRLF checkout  with -c core.eol=lf
-
-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 1595 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1596 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1597 - setup LF_nul checkout  with -c core.eol=lf
+ok 11 - commit file with mixed EOL onto CLRF attr= aeol= crlf=false
 
-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
-		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.12 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1598 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf
+ok 12 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false
 
-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.13 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1599 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF
+ok 13 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false 
 
-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.14 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1600 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 14 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false
 
-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.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 1601 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 15 - setup commit file with mixed EOL
 
-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.16 'commit file with mixed EOL onto LF crlf=true attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1602 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 16 - commit file with mixed EOL onto LF crlf=true attr=
 
-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.17 'commit file with mixed EOL onto CLRF attr= aeol= crlf=true': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1603 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 17 - commit file with mixed EOL onto CLRF attr= aeol= crlf=true
 
-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
+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 1604 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
-
-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 1605 - setup LF checkout  with -c core.eol=lf
-
-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 1606 - setup CRLF checkout  with -c core.eol=lf
-
-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 1607 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1608 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1609 - setup LF_nul checkout  with -c core.eol=lf
+ok 18 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true
 
-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
-		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 1610 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf
+ok 19 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true 
 
-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.20 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1611 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+ok 20 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true
 
-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.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 1612 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+ok 21 - setup commit file with mixed EOL
 
-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.22 'commit file with mixed EOL onto LF crlf=input attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1613 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 22 - commit file with mixed EOL onto LF crlf=input attr=
 
-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.23 'commit file with mixed EOL onto CLRF attr= aeol= crlf=input': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1614 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 23 - commit file with mixed EOL onto CLRF attr= aeol= crlf=input
 
-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.24 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1615 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+ok 24 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input
 
-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
+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 1616 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
-
-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 1617 - setup LF checkout  with -c core.eol=lf
-
-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 1618 - setup CRLF checkout  with -c core.eol=lf
-
-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 1619 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1620 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1621 - setup LF_nul checkout  with -c core.eol=lf
+ok 25 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input 
 
-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
-		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.26 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1622 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf
+ok 26 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input
 
-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.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 1623 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+ok 27 - setup commit file with mixed EOL
 
-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.28 'commit file with mixed EOL onto LF crlf=false attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1624 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+ok 28 - commit file with mixed EOL onto LF crlf=false attr=auto
 
-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.29 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1625 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 29 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false
 
-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.30 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1626 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 30 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false
 
-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.31 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1627 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+ok 31 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=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
+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 1628 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
-
-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 1629 - setup LF checkout  with -c core.eol=lf
-
-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 1630 - setup CRLF checkout  with -c core.eol=lf
-
-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 1631 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1632 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1633 - setup LF_nul checkout  with -c core.eol=lf
+ok 32 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false
 
-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
-		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.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 1634 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf
+ok 33 - setup commit file with mixed EOL
 
-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.34 'commit file with mixed EOL onto LF crlf=true attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1635 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+ok 34 - commit file with mixed EOL onto LF crlf=true attr=auto
 
-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.35 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1636 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+ok 35 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true
 
-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.36 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1637 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 36 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true
 
-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.37 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1638 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 37 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true 
 
-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.38 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1639 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+ok 38 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true
 
-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
+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 1640 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
-
-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 1641 - setup LF checkout  with -c core.eol=lf
-
-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 1642 - setup CRLF checkout  with -c core.eol=lf
-
-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 1643 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1644 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1645 - setup LF_nul checkout  with -c core.eol=lf
+ok 39 - setup commit file with mixed EOL
 
-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
-		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.40 'commit file with mixed EOL onto LF crlf=input attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1646 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf
+ok 40 - commit file with mixed EOL onto LF crlf=input attr=auto
 
-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.41 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1647 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+ok 41 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input
 
-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.42 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1648 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+ok 42 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input
 
-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.43 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1649 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 43 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input 
 
-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.44 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1650 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 44 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input
 
-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.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 1651 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+ok 45 - setup commit NNO files
 
-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
+expecting success of 0027.46 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1652 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
-
-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 1653 - setup LF checkout  with -c core.eol=lf
-
-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 1654 - setup CRLF checkout  with -c core.eol=lf
-
-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 1655 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1656 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1657 - setup LF_nul checkout  with -c core.eol=lf
+ok 46 - commit NNO files crlf=false attr= LF
 
-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
-		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.47 'commit NNO files attr= aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1658 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf
+ok 47 - commit NNO files attr= aeol= crlf=false 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.48 'commit NNO files attr= aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1659 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+ok 48 - commit NNO files attr= aeol= crlf=false CRLF_mix_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.49 'commit NNO files attr= aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1660 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+ok 49 - commit NNO files attr= aeol= crlf=false LF_mix_cr
 
-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.50 'commit NNO files attr= aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1661 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 50 - commit NNO files attr= aeol= crlf=false CRLF_nul
 
-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.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 1662 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 51 - setup commit NNO files
 
-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.52 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1663 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+ok 52 - commit NNO files crlf=true attr= LF
 
-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
+expecting success of 0027.53 'commit NNO files attr= aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1664 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
-
-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 1665 - setup LF checkout  with -c core.eol=lf
-
-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 1666 - setup CRLF checkout  with -c core.eol=lf
-
-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 1667 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1668 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1669 - setup LF_nul checkout  with -c core.eol=lf
+ok 53 - commit NNO files attr= aeol= crlf=true CRLF
 
-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
-		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.54 'commit NNO files attr= aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1670 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf
+ok 54 - commit NNO files attr= aeol= crlf=true CRLF_mix_LF
 
-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.55 'commit NNO files attr= aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1671 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+ok 55 - commit NNO files attr= aeol= crlf=true LF_mix_cr
 
-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.56 'commit NNO files attr= aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1672 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+ok 56 - commit NNO files attr= aeol= crlf=true CRLF_nul
 
-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.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 1673 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 57 - setup commit NNO files
 
-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.58 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1674 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 58 - commit NNO files crlf=input attr= LF
 
-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.59 'commit NNO files attr= aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1675 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+ok 59 - commit NNO files attr= aeol= crlf=input CRLF
 
-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
+expecting success of 0027.60 'commit NNO files attr= aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1676 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
-
-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 1677 - setup LF checkout  with -c core.eol=lf
-
-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 1678 - setup CRLF checkout  with -c core.eol=lf
-
-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 1679 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1680 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1681 - setup LF_nul checkout  with -c core.eol=lf
+ok 60 - commit NNO files attr= aeol= crlf=input CRLF_mix_LF
 
-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
-		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.61 'commit NNO files attr= aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1682 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf
+ok 61 - commit NNO files attr= aeol= crlf=input LF_mix_cr
 
-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.62 'commit NNO files attr= aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1683 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 62 - commit NNO files attr= aeol= crlf=input CRLF_nul
 
-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.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 1684 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 63 - setup commit NNO files
 
-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.64 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1685 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 64 - commit NNO files crlf=false attr=auto 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.65 'commit NNO files attr=auto aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1686 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 65 - commit NNO files attr=auto aeol= crlf=false CRLF
 
-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.66 'commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1687 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 66 - commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF
 
-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
+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 1688 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
-
-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 1689 - setup LF checkout  with -c core.eol=lf
-
-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 1690 - setup CRLF checkout  with -c core.eol=lf
-
-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 1691 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1692 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1693 - setup LF_nul checkout  with -c core.eol=lf
+ok 67 - commit NNO files attr=auto aeol= crlf=false LF_mix_cr
 
-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
-		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.68 'commit NNO files attr=auto aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1694 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf
+ok 68 - commit NNO files attr=auto aeol= crlf=false CRLF_nul
 
-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.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 1695 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 69 - setup commit NNO files
 
-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.70 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1696 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 70 - commit NNO files crlf=true attr=auto LF
 
-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.71 'commit NNO files attr=auto aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1697 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 71 - commit NNO files attr=auto aeol= crlf=true CRLF
 
-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.72 'commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1698 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 72 - commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF
 
-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.73 'commit NNO files attr=auto aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1699 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+ok 73 - commit NNO files attr=auto aeol= crlf=true LF_mix_cr
 
-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
+expecting success of 0027.74 'commit NNO files attr=auto aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1700 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
-
-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 1701 - setup LF checkout  with -c core.eol=lf
-
-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 1702 - setup CRLF checkout  with -c core.eol=lf
-
-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 1703 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1704 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1705 - setup LF_nul checkout  with -c core.eol=lf
+ok 74 - commit NNO files attr=auto aeol= crlf=true CRLF_nul
 
-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
-		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.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 1706 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 75 - setup commit NNO files
 
-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.76 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1707 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 76 - commit NNO files crlf=input attr=auto 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.77 'commit NNO files attr=auto aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1708 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 77 - commit NNO files attr=auto aeol= crlf=input 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.78 'commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1709 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 78 - commit NNO files attr=auto aeol= crlf=input 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.79 'commit NNO files attr=auto aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1710 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 79 - commit NNO files attr=auto aeol= crlf=input 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.80 'commit NNO files attr=auto aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1711 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 80 - commit NNO files attr=auto aeol= crlf=input CRLF_nul
 
-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
+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 1712 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
-
-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 1713 - setup LF checkout  with -c core.eol=lf
-
-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 1714 - setup CRLF checkout  with -c core.eol=lf
-
-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 1715 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1716 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1717 - setup LF_nul checkout  with -c core.eol=lf
+ok 81 - setup commit NNO files
 
-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
-		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.82 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1718 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf
+ok 82 - commit NNO files crlf=true attr=-text LF
 
-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.83 'commit NNO files attr=-text aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1719 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 83 - commit NNO files attr=-text aeol= crlf=true CRLF
 
-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.84 'commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1720 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 84 - commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF
 
-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.85 'commit NNO files attr=-text aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1721 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 85 - commit NNO files attr=-text aeol= crlf=true LF_mix_cr
 
-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.86 'commit NNO files attr=-text aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1722 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 86 - commit NNO files attr=-text aeol= crlf=true CRLF_nul
 
-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.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 1723 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+ok 87 - setup commit NNO files
 
-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
+expecting success of 0027.88 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1724 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
-
-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 1725 - setup LF checkout  with -c core.eol=lf
-
-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 1726 - setup CRLF checkout  with -c core.eol=lf
-
-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 1727 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1728 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1729 - setup LF_nul checkout  with -c core.eol=lf
+ok 88 - commit NNO files crlf=true attr=-text LF
 
-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
-		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.89 'commit NNO files attr=-text aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1730 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 89 - commit NNO files attr=-text aeol=lf crlf=true CRLF
 
-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.90 'commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1731 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 90 - commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_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.91 'commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1732 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 91 - commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr
 
-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.92 'commit NNO files attr=-text aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1733 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 92 - commit NNO files attr=-text aeol=lf crlf=true CRLF_nul
 
-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.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 1734 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 93 - setup commit NNO files
 
-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.94 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1735 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 94 - commit NNO files crlf=true attr=-text LF
 
-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
+expecting success of 0027.95 'commit NNO files attr=-text aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1736 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
-
-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 1737 - setup LF checkout  with -c core.eol=lf
-
-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 1738 - setup CRLF checkout  with -c core.eol=lf
-
-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 1739 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1740 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1741 - setup LF_nul checkout  with -c core.eol=lf
+ok 95 - commit NNO files attr=-text aeol=crlf crlf=true CRLF
 
-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
-		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.96 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1742 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf
+ok 96 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF
 
-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.97 'commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1743 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 97 - commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr
 
-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.98 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1744 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 98 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul
 
-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.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 1745 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 99 - setup commit NNO files
 
-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.100 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1746 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 100 - commit NNO files crlf=true attr= LF
 
-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.101 'commit NNO files attr= aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1747 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+ok 101 - commit NNO files attr= aeol=lf crlf=true CRLF
 
-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
+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 1748 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
-
-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 1749 - setup LF checkout  with -c core.eol=lf
-
-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 1750 - setup CRLF checkout  with -c core.eol=lf
-
-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 1751 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1752 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1753 - setup LF_nul checkout  with -c core.eol=lf
+ok 102 - commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF
 
-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
-		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.103 'commit NNO files attr= aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1754 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 103 - commit NNO files attr= aeol=lf crlf=true LF_mix_cr
 
-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.104 'commit NNO files attr= aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1755 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 104 - commit NNO files attr= aeol=lf crlf=true CRLF_nul
 
-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.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 1756 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 105 - setup commit NNO files
 
-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.106 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1757 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 106 - commit NNO files crlf=true attr= 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.107 'commit NNO files attr= aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1758 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 107 - commit NNO files attr= aeol=crlf crlf=true CRLF
 
-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.108 'commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1759 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 108 - commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF
 
-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
+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 1760 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
-
-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 1761 - setup LF checkout  with -c core.eol=lf
-
-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 1762 - setup CRLF checkout  with -c core.eol=lf
-
-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 1763 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1764 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1765 - setup LF_nul checkout  with -c core.eol=lf
+ok 109 - commit NNO files attr= aeol=crlf crlf=true LF_mix_cr
 
-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
-		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.110 'commit NNO files attr= aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1766 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf
+ok 110 - commit NNO files attr= aeol=crlf crlf=true CRLF_nul
 
-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.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 1767 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF
+ok 111 - setup commit NNO files
 
-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.112 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1768 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 112 - commit NNO files crlf=true attr=auto LF
 
-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.113 'commit NNO files attr=auto aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1769 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 113 - commit NNO files attr=auto aeol=lf crlf=true CRLF
 
-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.114 'commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1770 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 114 - commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF
 
-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.115 'commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1771 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 115 - commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr
 
-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
+expecting success of 0027.116 'commit NNO files attr=auto aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1772 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
-
-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 1773 - setup LF checkout  with -c core.eol=lf
-
-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 1774 - setup CRLF checkout  with -c core.eol=lf
-
-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 1775 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1776 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1777 - setup LF_nul checkout  with -c core.eol=lf
+ok 116 - commit NNO files attr=auto aeol=lf crlf=true CRLF_nul
 
-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
-		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.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 1778 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf
+ok 117 - setup commit NNO files
 
-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.118 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1779 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 118 - commit NNO files crlf=true attr=auto 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.119 'commit NNO files attr=auto aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1780 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 119 - commit NNO files attr=auto aeol=crlf crlf=true 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.120 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1781 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 120 - commit NNO files attr=auto aeol=crlf crlf=true 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.121 'commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1782 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 121 - commit NNO files attr=auto aeol=crlf crlf=true 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.122 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1783 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 122 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul
 
-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
+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 1784 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
-
-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 1785 - setup LF checkout  with -c core.eol=lf
-
-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 1786 - setup CRLF checkout  with -c core.eol=lf
-
-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 1787 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1788 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1789 - setup LF_nul checkout  with -c core.eol=lf
+ok 123 - setup commit NNO files
 
-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
-		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.124 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1790 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf
+ok 124 - commit NNO files crlf=true attr=text LF
 
-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.125 'commit NNO files attr=text aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1791 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 125 - commit NNO files attr=text aeol=lf crlf=true CRLF
 
-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.126 'commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1792 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 126 - commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF
 
-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.127 'commit NNO files attr=text aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1793 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 127 - commit NNO files attr=text aeol=lf crlf=true LF_mix_cr
 
-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.128 'commit NNO files attr=text aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1794 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 128 - commit NNO files attr=text aeol=lf crlf=true CRLF_nul
 
-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.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 1795 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 129 - setup commit NNO files
 
-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
+expecting success of 0027.130 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1796 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
-
-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 1797 - setup LF checkout  with -c core.eol=lf
-
-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 1798 - setup CRLF checkout  with -c core.eol=lf
-
-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 1799 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1800 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1801 - setup LF_nul checkout  with -c core.eol=lf
+ok 130 - commit NNO files crlf=true attr=text LF
 
-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
-		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.131 'commit NNO files attr=text aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1802 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf
+ok 131 - commit NNO files attr=text aeol=crlf crlf=true CRLF
 
-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.132 'commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1803 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 132 - commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_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.133 'commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1804 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 133 - commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr
 
-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.134 'commit NNO files attr=text aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1805 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 134 - commit NNO files attr=text aeol=crlf crlf=true CRLF_nul
 
-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.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 1806 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 135 - setup commit NNO files
 
-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.136 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1807 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 136 - commit NNO files crlf=false attr=-text LF
 
-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
+expecting success of 0027.137 'commit NNO files attr=-text aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1808 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
-
-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 1809 - setup LF checkout  with -c core.eol=lf
-
-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 1810 - setup CRLF checkout  with -c core.eol=lf
-
-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 1811 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1812 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1813 - setup LF_nul checkout  with -c core.eol=lf
+ok 137 - commit NNO files attr=-text aeol= crlf=false CRLF
 
-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
-		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.138 'commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1814 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf
+ok 138 - commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF
 
-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.139 'commit NNO files attr=-text aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1815 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 139 - commit NNO files attr=-text aeol= crlf=false LF_mix_cr
 
-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.140 'commit NNO files attr=-text aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1816 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 140 - commit NNO files attr=-text aeol= crlf=false CRLF_nul
 
-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.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 1817 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 141 - setup commit NNO files
 
-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.142 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1818 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 142 - commit NNO files crlf=false attr=-text LF
 
-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.143 'commit NNO files attr=-text aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1819 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 143 - commit NNO files attr=-text aeol=lf crlf=false CRLF
 
-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
+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 1820 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
-
-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 1821 - setup LF checkout  with -c core.eol=lf
-
-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 1822 - setup CRLF checkout  with -c core.eol=lf
-
-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 1823 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-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 1824 - setup CRLF_mix_LF checkout  with -c core.eol=lf
-
-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 1825 - setup LF_nul checkout  with -c core.eol=lf
+ok 144 - commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF
 
-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
-		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.145 'commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1826 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf
+ok 145 - commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr
 
-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.146 'commit NNO files attr=-text aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1827 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 146 - commit NNO files attr=-text aeol=lf crlf=false CRLF_nul
 
-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.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 1828 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 147 - setup commit NNO files
 
-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.148 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1829 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 148 - commit NNO files crlf=false attr=-text 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.149 'commit NNO files attr=-text aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1830 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 149 - commit NNO files attr=-text aeol=crlf crlf=false CRLF
 
-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.150 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1831 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 150 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF
 
-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
+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 1832 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
-
-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 1833 - setup LF checkout  with -c core.eol=crlf
-
-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 1834 - setup CRLF checkout  with -c core.eol=crlf
-
-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 1835 - setup LF_mix_CR checkout  with -c core.eol=crlf
-
-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 1836 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
-
-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 1837 - setup LF_nul checkout  with -c core.eol=crlf
+ok 151 - commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr
 
-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
-		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.152 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1838 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf
+ok 152 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul
 
-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.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 1839 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 153 - setup commit NNO files
 
-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.154 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1840 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 154 - commit NNO files crlf=false attr= LF
 
-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.155 'commit NNO files attr= aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1841 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 155 - commit NNO files attr= aeol=lf crlf=false CRLF
 
-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.156 'commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1842 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 156 - commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF
 
-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.157 'commit NNO files attr= aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1843 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 157 - commit NNO files attr= aeol=lf crlf=false LF_mix_cr
 
-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
+expecting success of 0027.158 'commit NNO files attr= aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1844 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
-
-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 1845 - setup LF checkout  with -c core.eol=crlf
-
-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 1846 - setup CRLF checkout  with -c core.eol=crlf
-
-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 1847 - setup LF_mix_CR checkout  with -c core.eol=crlf
-
-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 1848 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
-
-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 1849 - setup LF_nul checkout  with -c core.eol=crlf
+ok 158 - commit NNO files attr= aeol=lf crlf=false CRLF_nul
 
-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
-		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.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 1850 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 159 - setup commit NNO files
 
-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.160 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1851 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 160 - commit NNO files crlf=false attr= 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.161 'commit NNO files attr= aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1852 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 161 - commit NNO files attr= aeol=crlf crlf=false 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.162 'commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1853 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 162 - commit NNO files attr= aeol=crlf crlf=false 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.163 'commit NNO files attr= aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1854 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 163 - commit NNO files attr= aeol=crlf crlf=false 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.164 'commit NNO files attr= aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1855 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 164 - commit NNO files attr= aeol=crlf crlf=false CRLF_nul
 
-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
+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 1856 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
-
-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 1857 - setup LF checkout  with -c core.eol=crlf
+ok 165 - setup commit NNO files
 
-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 1858 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1859 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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.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 1860 - setup CRLF_mix_LF checkout  with -c core.eol=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.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 1861 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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.170 'commit NNO files attr=auto aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1862 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 170 - commit NNO files attr=auto aeol=lf crlf=false CRLF_nul
 
-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.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 1863 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 171 - setup commit NNO files
 
-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.172 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1864 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 172 - commit NNO files crlf=false attr=auto LF
 
-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.173 'commit NNO files attr=auto aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1865 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 173 - commit NNO files attr=auto aeol=crlf crlf=false CRLF
 
-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.174 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1866 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 174 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF
 
-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.175 'commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1867 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 175 - commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr
 
-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
+expecting success of 0027.176 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1868 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+ok 176 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul
 
-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 1869 - setup LF checkout  with -c core.eol=crlf
+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.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 1870 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1871 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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.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 1872 - setup CRLF_mix_LF checkout  with -c core.eol=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.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 1873 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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.182 'commit NNO files attr=text aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1874 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 182 - commit NNO files attr=text aeol=lf crlf=false CRLF_nul
 
-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.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 1875 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 183 - setup commit NNO files
 
-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.184 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1876 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 184 - commit NNO files crlf=false attr=text LF
 
-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.185 'commit NNO files attr=text aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1877 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 185 - commit NNO files attr=text aeol=crlf crlf=false CRLF
 
-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.186 'commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1878 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 186 - commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF
 
-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.187 'commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1879 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 187 - commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr
 
-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
+expecting success of 0027.188 'commit NNO files attr=text aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1880 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+ok 188 - commit NNO files attr=text aeol=crlf crlf=false CRLF_nul
 
-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 1881 - setup LF checkout  with -c core.eol=crlf
+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.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 1882 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1883 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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.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 1884 - setup CRLF_mix_LF checkout  with -c core.eol=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.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 1885 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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.194 'commit NNO files attr=-text aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1886 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 194 - commit NNO files attr=-text aeol= crlf=input CRLF_nul
 
-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.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 1887 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 195 - setup commit NNO files
 
-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.196 'commit NNO files crlf=input attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1888 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 196 - commit NNO files crlf=input attr=-text LF
 
-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.197 'commit NNO files attr=-text aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1889 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 197 - commit NNO files attr=-text aeol=lf crlf=input CRLF
 
-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.198 'commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1890 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 198 - commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF
 
-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.199 'commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1891 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 199 - commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr
 
-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
+expecting success of 0027.200 'commit NNO files attr=-text aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1892 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+ok 200 - commit NNO files attr=-text aeol=lf crlf=input CRLF_nul
 
-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 1893 - setup LF checkout  with -c core.eol=crlf
+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.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 1894 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1895 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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.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 1896 - setup CRLF_mix_LF checkout  with -c core.eol=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.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 1897 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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.206 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1898 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 206 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul
 
-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.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 1899 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 207 - setup commit NNO files
 
-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.208 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1900 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 208 - commit NNO files crlf=input attr= LF
 
-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.209 'commit NNO files attr= aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1901 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 209 - commit NNO files attr= aeol=lf crlf=input CRLF
 
-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.210 'commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1902 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 210 - commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF
 
-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.211 'commit NNO files attr= aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1903 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 211 - commit NNO files attr= aeol=lf crlf=input LF_mix_cr
 
-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
+expecting success of 0027.212 'commit NNO files attr= aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1904 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+ok 212 - commit NNO files attr= aeol=lf crlf=input CRLF_nul
 
-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 1905 - setup LF checkout  with -c core.eol=crlf
+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.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 1906 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1907 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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.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 1908 - setup CRLF_mix_LF checkout  with -c core.eol=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.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 1909 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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.218 'commit NNO files attr= aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1910 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 218 - commit NNO files attr= aeol=crlf crlf=input CRLF_nul
 
-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.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 1911 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 219 - setup commit NNO files
 
-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.220 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1912 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 220 - commit NNO files crlf=input attr=auto LF
 
-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.221 'commit NNO files attr=auto aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1913 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 221 - commit NNO files attr=auto aeol=lf crlf=input CRLF
 
-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.222 'commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1914 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 222 - commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF
 
-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.223 'commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1915 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 223 - commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr
 
-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
+expecting success of 0027.224 'commit NNO files attr=auto aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1916 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+ok 224 - commit NNO files attr=auto aeol=lf crlf=input CRLF_nul
 
-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 1917 - setup LF checkout  with -c core.eol=crlf
+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.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 1918 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1919 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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.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 1920 - setup CRLF_mix_LF checkout  with -c core.eol=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.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 1921 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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.230 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1922 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf
+ok 230 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul
 
-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.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 1923 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 231 - setup commit NNO files
 
-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.232 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1924 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 232 - commit NNO files crlf=input attr=text LF
 
-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.233 'commit NNO files attr=text aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1925 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 233 - commit NNO files attr=text aeol=lf crlf=input CRLF
 
-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.234 'commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1926 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 234 - commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF
 
-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.235 'commit NNO files attr=text aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1927 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 235 - commit NNO files attr=text aeol=lf crlf=input LF_mix_cr
 
-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
+expecting success of 0027.236 'commit NNO files attr=text aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1928 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
+ok 236 - commit NNO files attr=text aeol=lf crlf=input CRLF_nul
 
-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 1929 - setup LF checkout  with -c core.eol=crlf
+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.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 1930 - setup CRLF checkout  with -c core.eol=crlf
+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.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 1931 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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.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 1932 - setup CRLF_mix_LF checkout  with -c core.eol=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.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 1933 - setup LF_nul checkout  with -c core.eol=crlf
+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.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
-		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.242 'commit NNO files attr=text aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1934 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 242 - commit NNO files attr=text aeol=crlf crlf=input CRLF_nul
 
-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.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 1935 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 243 - setup commit NNO files
 
-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.244 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1936 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 244 - commit NNO files crlf=false attr=text LF
 
-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.245 'commit NNO files attr=text aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1937 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 245 - commit NNO files attr=text aeol= crlf=false CRLF
 
-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.246 'commit NNO files attr=text aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1938 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 246 - commit NNO files attr=text aeol= crlf=false CRLF_mix_LF
 
-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.247 'commit NNO files attr=text aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1939 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 247 - commit NNO files attr=text aeol= crlf=false LF_mix_cr
 
-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
+expecting success of 0027.248 'commit NNO files attr=text aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1940 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
+ok 248 - commit NNO files attr=text aeol= crlf=false CRLF_nul
 
-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
+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.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.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.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
+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.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 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.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
+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.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
+expecting success of 0027.254 'commit NNO files attr=text aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1946 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 254 - commit NNO files attr=text aeol= crlf=true CRLF_nul
 
-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.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 1947 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 255 - setup commit NNO files
 
-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.256 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1948 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 256 - commit NNO files crlf=input attr=text LF
 
-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.257 'commit NNO files attr=text aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1949 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 257 - commit NNO files attr=text aeol= crlf=input CRLF
 
-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.258 'commit NNO files attr=text aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1950 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 258 - commit NNO files attr=text aeol= crlf=input CRLF_mix_LF
 
-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.259 'commit NNO files attr=text aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1951 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 259 - commit NNO files attr=text aeol= crlf=input LF_mix_cr
 
-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
+expecting success of 0027.260 'commit NNO files attr=text aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1952 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
+ok 260 - commit NNO files attr=text aeol= crlf=input CRLF_nul
 
-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
+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
 
-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
+[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.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
+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 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
+ok 262 - commit empty gitattribues
 
-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
+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
 
-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 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 1958 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 266 - compare_files LF NNO_attr__aeol__true_LF.txt
 
-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.267 'compare_files CRLF NNO_attr__aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 1959 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 267 - compare_files CRLF NNO_attr__aeol__true_CRLF.txt
 
-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.268 'compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 1960 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 268 - compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt
 
-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.269 'compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
 	
-ok 1961 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 269 - compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt
 
-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.270 'compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 1962 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 270 - compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt
 
-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.271 'compare_files LF NNO_attr_-text_aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 1963 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 271 - compare_files LF NNO_attr_-text_aeol__true_LF.txt
 
-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
+expecting success of 0027.272 'compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 1964 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
+ok 272 - compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt
 
-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
+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.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
+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.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
+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.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 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.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
+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.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
+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 1970 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 278 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
 
-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.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 1971 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 279 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
 
-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.280 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 1972 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 280 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
 
-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.281 'compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 1973 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 281 - compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt
 
-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.282 'compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 1974 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 282 - compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt
 
-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.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 1975 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 283 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
 
-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
+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 1976 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+ok 284 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt
 
-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
+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.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
+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.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
+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.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 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.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
+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.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
+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 1982 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 290 - compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt
 
-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.291 'compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 1983 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 291 - compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt
 
-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.292 'compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 1984 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 292 - compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt
 
-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.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 1985 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 293 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
 
-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.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 1986 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 294 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
 
-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.295 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 1987 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 295 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
 
-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
+expecting success of 0027.296 'compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 1988 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
+ok 296 - compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt
 
-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
+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.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
+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.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
+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.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
+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.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 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.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
+expecting success of 0027.302 'compare_files LF NNO_attr_text_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 1994 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 302 - compare_files LF NNO_attr_text_aeol__true_CRLF.txt
 
-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.303 'compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 1995 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 303 - compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt
 
-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.304 'compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
 	
-ok 1996 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 304 - compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt
 
-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.305 'compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 1997 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 305 - compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt
 
-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.306 'compare_files LF NNO_attr_text_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 1998 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 306 - compare_files LF NNO_attr_text_aeol_lf_true_LF.txt
 
-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.307 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 1999 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 307 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt
 
-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
+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 2000 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+ok 308 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
 
-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 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.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
+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.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
+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.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
+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.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
+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.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
+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 2006 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf
+ok 314 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
 
-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.315 'compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2007 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 315 - compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
 
-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.316 'compare_files LF NNO_attr__aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2008 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 316 - compare_files LF NNO_attr__aeol__false_LF.txt
 
-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.317 'compare_files CRLF NNO_attr__aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2009 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 317 - compare_files CRLF NNO_attr__aeol__false_CRLF.txt
 
-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.318 'compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 2010 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 318 - compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt
 
-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.319 'compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
 	
-ok 2011 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 319 - compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt
 
-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
+expecting success of 0027.320 'compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2012 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
+ok 320 - compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt
 
-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 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.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
+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.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 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.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
+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.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 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.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
+expecting success of 0027.326 'compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2018 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 326 - compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt
 
-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.327 'compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2019 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 327 - compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt
 
-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.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 2020 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 328 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
 
-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.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 2021 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 329 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
 
-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.330 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2022 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 330 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
 
-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.331 'compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2023 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 331 - compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt
 
-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
+expecting success of 0027.332 'compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2024 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+ok 332 - compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt
 
-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
+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.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
+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.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
+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.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 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.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 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.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
+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 2030 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 338 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
 
-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.339 'compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
 	
-ok 2031 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 339 - compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt
 
-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.340 'compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2032 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 340 - compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt
 
-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.341 'compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2033 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 341 - compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt
 
-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.342 'compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2034 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 342 - compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt
 
-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.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 2035 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 343 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
 
-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
+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 2036 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+ok 344 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
 
-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
+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.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 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.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
+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.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 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.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
+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.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
+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 2042 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 350 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
 
-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.351 'compare_files LF NNO_attr_text_aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2043 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 351 - compare_files LF NNO_attr_text_aeol__false_LF.txt
 
-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.352 'compare_files LF NNO_attr_text_aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2044 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 352 - compare_files LF NNO_attr_text_aeol__false_CRLF.txt
 
-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.353 'compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 2045 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 353 - compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt
 
-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.354 'compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
 	
-ok 2046 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 354 - compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt
 
-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.355 'compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2047 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 355 - compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt
 
-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
+expecting success of 0027.356 'compare_files LF NNO_attr_text_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2048 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
+ok 356 - compare_files LF NNO_attr_text_aeol_lf_false_LF.txt
 
-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
+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.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
+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.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 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.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
+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.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 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.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
+expecting success of 0027.362 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2054 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 362 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt
 
-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.363 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 2055 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 363 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
 
-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.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 2056 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 364 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
 
-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.365 'compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2057 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 365 - compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
 
-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.366 'compare_files LF NNO_attr__aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2058 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 366 - compare_files LF NNO_attr__aeol__input_LF.txt
 
-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.367 'compare_files CRLF NNO_attr__aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2059 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 367 - compare_files CRLF NNO_attr__aeol__input_CRLF.txt
 
-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
+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 2060 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
+ok 368 - compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt
 
-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
+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.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 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.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
+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.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
+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.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
+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.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
+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 2066 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 374 - compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt
 
-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.375 'compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2067 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 375 - compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt
 
-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.376 'compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2068 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 376 - compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt
 
-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.377 'compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2069 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 377 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
 
-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.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 2070 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 378 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
 
-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.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 2071 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 379 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
 
-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
+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 2072 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+ok 380 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
 
-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 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.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
+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.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 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.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
+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.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 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.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
+expecting success of 0027.386 'compare_files LF NNO_attr_auto_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2078 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 386 - compare_files LF NNO_attr_auto_aeol__input_LF.txt
 
-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.387 'compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2079 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 387 - compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt
 
-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.388 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 2080 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 388 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
 
-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.389 'compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
 	
-ok 2081 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 389 - compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt
 
-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.390 'compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2082 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 390 - compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt
 
-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.391 'compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2083 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 391 - compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt
 
-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
+expecting success of 0027.392 'compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2084 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 392 - compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt
 
-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 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.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
+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.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 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.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
+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.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 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.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
+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 2090 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf
+ok 398 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
 
-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.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 2091 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 399 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
 
-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.400 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2092 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 400 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
 
-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.401 'compare_files LF NNO_attr_text_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2093 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 401 - compare_files LF NNO_attr_text_aeol__input_LF.txt
 
-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.402 'compare_files LF NNO_attr_text_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2094 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 402 - compare_files LF NNO_attr_text_aeol__input_CRLF.txt
 
-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.403 'compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 2095 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 403 - compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt
 
-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
+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 2096 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+ok 404 - compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt
 
-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
+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.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 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.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
+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.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 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.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
+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.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
+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 2102 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf
+ok 410 - compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt
 
-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.411 'compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
 	
-ok 2103 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 411 - compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt
 
-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.412 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 2104 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 412 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt
 
-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.413 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 2105 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 413 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
 
-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.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 2106 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 414 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
 
-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.415 'compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
 	
-ok 2107 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 415 - compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
 
-expecting success of 0027.2108 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+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 2108 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
+ok 416 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2109 'setup LF checkout  with -c core.eol=crlf': 
+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 2109 - setup LF checkout  with -c core.eol=crlf
+ok 417 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2110 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2110 - setup CRLF checkout  with -c core.eol=crlf
+ok 418 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2111 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2111 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 419 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2112 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2112 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 420 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2113 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2113 - setup LF_nul checkout  with -c core.eol=crlf
+ok 421 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2114 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf': 
+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
@@ -166953,70 +174048,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2114 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf
+ok 422 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf
 
-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.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 2115 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 423 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf 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.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 2116 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 424 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf 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.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 2117 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 425 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf 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.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 2118 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 426 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf 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.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 2119 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 427 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2120 'setup config for checkout attr=text ident=ident aeol= 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 2120 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
+ok 428 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2121 'setup LF checkout  with -c core.eol=crlf': 
+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 2121 - setup LF checkout  with -c core.eol=crlf
+ok 429 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2122 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2122 - setup CRLF checkout  with -c core.eol=crlf
+ok 430 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2123 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2123 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 431 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2124 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2124 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 432 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2125 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2125 - setup LF_nul checkout  with -c core.eol=crlf
+ok 433 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2126 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf': 
+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
@@ -167031,70 +174126,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2126 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf
+ok 434 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf
 
-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.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 2127 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 435 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf 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.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 2128 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 436 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf 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.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 2129 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf 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.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.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 2130 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf 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.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.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 2131 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 439 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2132 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+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 2132 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
+ok 440 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2133 'setup LF checkout  with -c core.eol=crlf': 
+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 2133 - setup LF checkout  with -c core.eol=crlf
+ok 441 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2134 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2134 - setup CRLF checkout  with -c core.eol=crlf
+ok 442 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2135 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2135 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 443 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2136 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2136 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 444 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2137 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2137 - setup LF_nul checkout  with -c core.eol=crlf
+ok 445 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2138 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf': 
+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
@@ -167109,70 +174204,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2138 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf
+ok 446 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf
 
-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.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 2139 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 447 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf 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.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 2140 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 448 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf 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.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 2141 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf 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.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.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 2142 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf 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.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.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 2143 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 451 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2144 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+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 2144 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+ok 452 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2145 'setup LF checkout  with -c core.eol=crlf': 
+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 2145 - setup LF checkout  with -c core.eol=crlf
+ok 453 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2146 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2146 - setup CRLF checkout  with -c core.eol=crlf
+ok 454 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2147 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2147 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 455 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2148 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2148 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 456 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2149 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2149 - setup LF_nul checkout  with -c core.eol=crlf
+ok 457 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2150 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf': 
+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
@@ -167187,70 +174282,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2150 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf
+ok 458 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf
 
-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.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 2151 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 459 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf 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.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 2152 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 460 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf 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.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 2153 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf 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.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.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 2154 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf 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.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.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 2155 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 463 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2156 'setup config for checkout attr=-text ident=ident aeol= 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 2156 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
+ok 464 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2157 '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 2157 - setup LF checkout  with -c core.eol=native
+ok 465 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2158 '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 2158 - setup CRLF checkout  with -c core.eol=native
+ok 466 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2159 '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 2159 - 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.2160 '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 2160 - 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.2161 '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 2161 - setup LF_nul checkout  with -c core.eol=native
+ok 469 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2162 'ls-files --eol attr=-text ident aeol= 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
@@ -167265,70 +174360,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2162 - ls-files --eol attr=-text ident aeol= 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.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.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 2163 - checkout attr=-text ident aeol= 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.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.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 2164 - checkout attr=-text ident aeol= 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.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.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 2165 - checkout attr=-text ident aeol= 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.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.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 2166 - checkout attr=-text ident aeol= 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.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.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 2167 - checkout attr=-text ident aeol= 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.2168 'setup config for checkout attr=-text ident=ident aeol=lf 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 2168 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+ok 476 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2169 '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 2169 - setup LF checkout  with -c core.eol=native
+ok 477 - 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.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 2170 - setup CRLF checkout  with -c core.eol=native
+ok 478 - 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.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 2171 - 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.2172 '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 2172 - 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.2173 '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 2173 - setup LF_nul checkout  with -c core.eol=native
+ok 481 - 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.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
@@ -167343,70 +174438,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2174 - ls-files --eol attr=-text ident aeol=lf 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.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.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 2175 - checkout attr=-text ident aeol=lf 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.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.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 2176 - checkout attr=-text ident aeol=lf 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.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.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 2177 - checkout attr=-text ident aeol=lf 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.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.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 2178 - checkout attr=-text ident aeol=lf 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.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.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 2179 - checkout attr=-text ident aeol=lf 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.2180 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
+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 2180 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
+ok 488 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2181 '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 2181 - setup LF checkout  with -c core.eol=native
+ok 489 - 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.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 2182 - setup CRLF checkout  with -c core.eol=native
+ok 490 - 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.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 2183 - 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.2184 '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 2184 - 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.2185 '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 2185 - setup LF_nul checkout  with -c core.eol=native
+ok 493 - 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.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
@@ -167421,70 +174516,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2186 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native
+ok 494 - ls-files --eol attr=auto  aeol=crlf 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.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 2187 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 495 - checkout attr=auto  aeol=crlf 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.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 2188 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 496 - checkout attr=auto  aeol=crlf 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.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 2189 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.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.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 2190 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.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.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 2191 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.2192 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+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 2192 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+ok 500 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2193 '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 2193 - setup LF checkout  with -c core.eol=native
+ok 501 - 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.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 2194 - setup CRLF checkout  with -c core.eol=native
+ok 502 - 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.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 2195 - 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.2196 '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 2196 - 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.2197 '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 2197 - setup LF_nul checkout  with -c core.eol=native
+ok 505 - 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.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
@@ -167499,70 +174594,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2198 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native
+ok 506 - ls-files --eol attr=-text  aeol= core.autocrlf=false 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.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 2199 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 507 - checkout attr=-text  aeol= core.autocrlf=false 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.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 2200 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 508 - checkout attr=-text  aeol= core.autocrlf=false 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.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 2201 - checkout attr=text ident aeol=lf core.autocrlf=true 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.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.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 2202 - checkout attr=text ident aeol=lf core.autocrlf=true 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.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.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 2203 - checkout attr=text ident aeol=lf core.autocrlf=true 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.2204 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+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 2204 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+ok 512 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2205 '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 2205 - setup LF checkout  with -c core.eol=native
+ok 513 - 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.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 2206 - setup CRLF checkout  with -c core.eol=native
+ok 514 - 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.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 2207 - 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.2208 '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 2208 - 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.2209 '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 2209 - setup LF_nul checkout  with -c core.eol=native
+ok 517 - 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.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
@@ -167577,70 +174672,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2210 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native
+ok 518 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false 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.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 2211 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 519 - checkout attr=-text  aeol=lf core.autocrlf=false 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.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 2212 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 520 - checkout attr=-text  aeol=lf core.autocrlf=false 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.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 2213 - checkout attr=text ident aeol=crlf core.autocrlf=true 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.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.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 2214 - checkout attr=text ident aeol=crlf core.autocrlf=true 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.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.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 2215 - checkout attr=text ident aeol=crlf core.autocrlf=true 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.2216 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
+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 2216 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+ok 524 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2217 '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 2217 - setup LF checkout  with -c core.eol=native
+ok 525 - 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.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 2218 - setup CRLF checkout  with -c core.eol=native
+ok 526 - 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.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 2219 - 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.2220 '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 2220 - 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.2221 '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 2221 - setup LF_nul checkout  with -c core.eol=native
+ok 529 - 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.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
@@ -167655,70 +174750,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2222 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native
+ok 530 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false 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.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 2223 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 531 - checkout attr=-text  aeol=crlf core.autocrlf=false 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.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 2224 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 532 - checkout attr=-text  aeol=crlf core.autocrlf=false 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.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 2225 - checkout attr=auto ident aeol=lf core.autocrlf=true 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.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.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 2226 - checkout attr=auto ident aeol=lf core.autocrlf=true 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.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.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 2227 - checkout attr=auto ident aeol=lf core.autocrlf=true 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.2228 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
+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 2228 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+ok 536 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2229 '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 2229 - setup LF checkout  with -c core.eol=native
+ok 537 - 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.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 2230 - setup CRLF checkout  with -c core.eol=native
+ok 538 - 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.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 2231 - 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.2232 '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 2232 - 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.2233 '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 2233 - setup LF_nul checkout  with -c core.eol=native
+ok 541 - 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.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
@@ -167733,70 +174828,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2234 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native
+ok 542 - ls-files --eol attr=text  aeol=lf core.autocrlf=false 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.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 2235 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 543 - checkout attr=text  aeol=lf core.autocrlf=false 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.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 2236 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 544 - checkout attr=text  aeol=lf core.autocrlf=false 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.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 2237 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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.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.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 2238 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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.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.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 2239 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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.2240 'setup config for checkout attr=-text ident=ident aeol= 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 2240 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+ok 548 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2241 '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 2241 - setup LF checkout  with -c core.eol=native
+ok 549 - 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.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 2242 - setup CRLF checkout  with -c core.eol=native
+ok 550 - 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.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 2243 - 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.2244 '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 2244 - 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.2245 '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 2245 - setup LF_nul checkout  with -c core.eol=native
+ok 553 - 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.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
@@ -167811,70 +174906,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2246 - ls-files --eol attr=-text ident aeol= 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.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.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 2247 - checkout attr=-text ident aeol= 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.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.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 2248 - checkout attr=-text ident aeol= 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.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.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 2249 - checkout attr=-text ident aeol= 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.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.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 2250 - checkout attr=-text ident aeol= 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.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.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 2251 - checkout attr=-text ident aeol= 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.2252 'setup config for checkout attr=-text ident=ident aeol=lf 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 2252 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
+ok 560 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2253 '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 2253 - setup LF checkout  with -c core.eol=native
+ok 561 - 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.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 2254 - setup CRLF checkout  with -c core.eol=native
+ok 562 - 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.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 2255 - 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.2256 '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 2256 - 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.2257 '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 2257 - setup LF_nul checkout  with -c core.eol=native
+ok 565 - 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.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
@@ -167889,70 +174984,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2258 - ls-files --eol attr=-text ident aeol=lf 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.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.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 2259 - checkout attr=-text ident aeol=lf 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.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.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 2260 - checkout attr=-text ident aeol=lf 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.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.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 2261 - checkout attr=-text ident aeol=lf 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.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.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 2262 - checkout attr=-text ident aeol=lf 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.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.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 2263 - checkout attr=-text ident aeol=lf 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.2264 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
+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 2264 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
+ok 572 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2265 '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 2265 - setup LF checkout  with -c core.eol=native
+ok 573 - 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.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 2266 - setup CRLF checkout  with -c core.eol=native
+ok 574 - 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.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 2267 - 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.2268 '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 2268 - 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.2269 '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 2269 - setup LF_nul checkout  with -c core.eol=native
+ok 577 - 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.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
@@ -167967,70 +175062,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2270 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native
+ok 578 - ls-files --eol attr=auto  aeol=crlf 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.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 2271 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 579 - checkout attr=auto  aeol=crlf 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.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 2272 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 580 - checkout attr=auto  aeol=crlf 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.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 2273 - checkout attr=-text ident aeol=crlf core.autocrlf=false 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.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.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 2274 - checkout attr=-text ident aeol=crlf core.autocrlf=false 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.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.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 2275 - checkout attr=-text ident aeol=crlf core.autocrlf=false 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.2276 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
+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 2276 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
+ok 584 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2277 '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 2277 - setup LF checkout  with -c core.eol=native
+ok 585 - 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.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 2278 - setup CRLF checkout  with -c core.eol=native
+ok 586 - 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.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 2279 - 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.2280 '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 2280 - 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.2281 '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 2281 - setup LF_nul checkout  with -c core.eol=native
+ok 589 - 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.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
@@ -168045,70 +175140,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2282 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native
+ok 590 - ls-files --eol attr=-text  aeol= core.autocrlf=input 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.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 2283 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 591 - checkout attr=-text  aeol= core.autocrlf=input 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.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 2284 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 592 - checkout attr=-text  aeol= core.autocrlf=input 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.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 2285 - checkout attr=text ident aeol=lf core.autocrlf=false 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.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.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 2286 - checkout attr=text ident aeol=lf core.autocrlf=false 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.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.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 2287 - checkout attr=text ident aeol=lf core.autocrlf=false 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.2288 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
+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 2288 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
+ok 596 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2289 '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 2289 - setup LF checkout  with -c core.eol=native
+ok 597 - 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.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 2290 - setup CRLF checkout  with -c core.eol=native
+ok 598 - 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.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 2291 - 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.2292 '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 2292 - 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.2293 '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 2293 - setup LF_nul checkout  with -c core.eol=native
+ok 601 - 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.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
@@ -168123,70 +175218,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2294 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native
+ok 602 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input 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.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 2295 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 603 - checkout attr=-text  aeol=lf core.autocrlf=input 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.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 2296 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 604 - checkout attr=-text  aeol=lf core.autocrlf=input 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.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 2297 - checkout attr=text ident aeol=crlf core.autocrlf=false 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.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.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 2298 - checkout attr=text ident aeol=crlf core.autocrlf=false 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.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.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 2299 - checkout attr=text ident aeol=crlf core.autocrlf=false 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.2300 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
+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 2300 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+ok 608 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2301 '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 2301 - setup LF checkout  with -c core.eol=native
+ok 609 - 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.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 2302 - setup CRLF checkout  with -c core.eol=native
+ok 610 - 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.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 2303 - 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.2304 '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 2304 - 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.2305 '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 2305 - setup LF_nul checkout  with -c core.eol=native
+ok 613 - 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.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
@@ -168201,70 +175296,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2306 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native
+ok 614 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input 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.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 2307 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 615 - checkout attr=-text  aeol=crlf core.autocrlf=input 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.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 2308 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 616 - checkout attr=-text  aeol=crlf core.autocrlf=input 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.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 2309 - checkout attr=auto ident aeol=lf core.autocrlf=false 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.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.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 2310 - checkout attr=auto ident aeol=lf core.autocrlf=false 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.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.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 2311 - checkout attr=auto ident aeol=lf core.autocrlf=false 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.2312 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
+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 2312 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
+ok 620 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2313 '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 2313 - setup LF checkout  with -c core.eol=native
+ok 621 - 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.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 2314 - setup CRLF checkout  with -c core.eol=native
+ok 622 - 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.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 2315 - 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.2316 '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 2316 - 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.2317 '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 2317 - setup LF_nul checkout  with -c core.eol=native
+ok 625 - 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.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
@@ -168279,70 +175374,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2318 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native
+ok 626 - ls-files --eol attr=text  aeol=lf core.autocrlf=input 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.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 2319 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 627 - checkout attr=text  aeol=lf core.autocrlf=input 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.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 2320 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 628 - checkout attr=text  aeol=lf core.autocrlf=input 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.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 2321 - checkout attr=auto ident aeol=crlf core.autocrlf=false 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.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.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 2322 - checkout attr=auto ident aeol=crlf core.autocrlf=false 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.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.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 2323 - checkout attr=auto ident aeol=crlf core.autocrlf=false 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.2324 'setup config for checkout attr=-text ident=ident aeol= 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 2324 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+ok 632 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2325 '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 2325 - setup LF checkout  with -c core.eol=native
+ok 633 - 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.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 2326 - setup CRLF checkout  with -c core.eol=native
+ok 634 - 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.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 2327 - 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.2328 '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 2328 - 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.2329 '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 2329 - setup LF_nul checkout  with -c core.eol=native
+ok 637 - 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.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
@@ -168357,70 +175452,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2330 - ls-files --eol attr=-text ident aeol= 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.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.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 2331 - checkout attr=-text ident aeol= 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.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.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 2332 - checkout attr=-text ident aeol= 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.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.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 2333 - checkout attr=-text ident aeol= 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.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.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 2334 - checkout attr=-text ident aeol= 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.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.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 2335 - checkout attr=-text ident aeol= 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.2336 'setup config for checkout attr=-text ident=ident aeol=lf 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 2336 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
+ok 644 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2337 '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 2337 - setup LF checkout  with -c core.eol=native
+ok 645 - 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.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 2338 - setup CRLF checkout  with -c core.eol=native
+ok 646 - 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.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 2339 - 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.2340 '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 2340 - 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.2341 '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 2341 - setup LF_nul checkout  with -c core.eol=native
+ok 649 - 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.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
@@ -168435,70 +175530,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2342 - ls-files --eol attr=-text ident aeol=lf 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.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.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 2343 - checkout attr=-text ident aeol=lf 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.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.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 2344 - checkout attr=-text ident aeol=lf 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.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.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 2345 - checkout attr=-text ident aeol=lf 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.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.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 2346 - checkout attr=-text ident aeol=lf 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.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.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 2347 - checkout attr=-text ident aeol=lf 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.2348 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
+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 2348 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+ok 656 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2349 '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 2349 - setup LF checkout  with -c core.eol=native
+ok 657 - 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.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 2350 - setup CRLF checkout  with -c core.eol=native
+ok 658 - 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.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 2351 - 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.2352 '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 2352 - 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.2353 '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 2353 - setup LF_nul checkout  with -c core.eol=native
+ok 661 - 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.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
@@ -168513,70 +175608,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2354 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native
+ok 662 - ls-files --eol attr=auto  aeol=crlf 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.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 2355 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 663 - checkout attr=auto  aeol=crlf 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.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 2356 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 664 - checkout attr=auto  aeol=crlf 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.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 2357 - checkout attr=-text ident aeol=crlf core.autocrlf=input 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.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.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 2358 - checkout attr=-text ident aeol=crlf core.autocrlf=input 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.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.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 2359 - checkout attr=-text ident aeol=crlf core.autocrlf=input 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.2360 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
+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 2360 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+ok 668 - setup config for checkout attr= ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2361 '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 2361 - setup LF checkout  with -c core.eol=native
+ok 669 - 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.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 2362 - setup CRLF checkout  with -c core.eol=native
+ok 670 - 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.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 2363 - 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.2364 '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 2364 - 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.2365 '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 2365 - setup LF_nul checkout  with -c core.eol=native
+ok 673 - 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.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
@@ -168591,70 +175686,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2366 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native
+ok 674 - ls-files --eol attr=  aeol= core.autocrlf=false 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.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 2367 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 675 - checkout attr=  aeol= core.autocrlf=false 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.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 2368 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 676 - checkout attr=  aeol= core.autocrlf=false 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.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 2369 - checkout attr=text ident aeol=lf core.autocrlf=input 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.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.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 2370 - checkout attr=text ident aeol=lf core.autocrlf=input 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.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.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 2371 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 679 - checkout attr=  aeol= core.autocrlf=false 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.680 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
 		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 680 - setup config for checkout attr= ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2373 '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 2373 - setup LF checkout  with -c core.eol=native
+ok 681 - 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.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 2374 - setup CRLF checkout  with -c core.eol=native
+ok 682 - 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.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 2375 - 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.2376 '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 2376 - 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.2377 '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 2377 - setup LF_nul checkout  with -c core.eol=native
+ok 685 - 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.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
@@ -168669,70 +175764,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2378 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native
+ok 686 - ls-files --eol attr=  aeol= core.autocrlf=true 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.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 2379 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 687 - checkout attr=  aeol= core.autocrlf=true 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.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 2380 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 688 - checkout attr=  aeol= core.autocrlf=true 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.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 2381 - checkout attr=text ident aeol=crlf core.autocrlf=input 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.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.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 2382 - checkout attr=text ident aeol=crlf core.autocrlf=input 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.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.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 2383 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 691 - checkout attr=  aeol= core.autocrlf=true 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.692 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
 		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 692 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2385 '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 2385 - setup LF checkout  with -c core.eol=native
+ok 693 - 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.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 2386 - setup CRLF checkout  with -c core.eol=native
+ok 694 - 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.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 2387 - 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.2388 '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 2388 - 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.2389 '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 2389 - setup LF_nul checkout  with -c core.eol=native
+ok 697 - 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.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
@@ -168747,70 +175842,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2390 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native
+ok 698 - ls-files --eol attr=auto  aeol= core.autocrlf=true 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.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 2391 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 699 - checkout attr=auto  aeol= core.autocrlf=true 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.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 2392 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 700 - checkout attr=auto  aeol= core.autocrlf=true 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.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 2393 - checkout attr=auto ident aeol=lf core.autocrlf=input 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.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.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 2394 - checkout attr=auto ident aeol=lf core.autocrlf=input 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.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.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 2395 - checkout attr=auto ident aeol=lf core.autocrlf=input 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.2396 'setup config for checkout attr=auto ident=ident aeol=crlf 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 2396 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+ok 704 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2397 '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 2397 - setup LF checkout  with -c core.eol=native
+ok 705 - 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.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 2398 - setup CRLF checkout  with -c core.eol=native
+ok 706 - 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.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 2399 - 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.2400 '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 2400 - 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.2401 '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 2401 - setup LF_nul checkout  with -c core.eol=native
+ok 709 - 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.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
@@ -168825,70 +175920,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2402 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native
+ok 710 - ls-files --eol attr=text  aeol= core.autocrlf=true 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.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 2403 - checkout attr=auto ident aeol=crlf 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.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.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 2404 - checkout attr=auto ident aeol=crlf 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.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.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 2405 - checkout attr=auto ident aeol=crlf 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.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.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 2406 - checkout attr=auto ident aeol=crlf 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.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.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 2407 - checkout attr=auto ident aeol=crlf 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.2408 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+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 2408 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 716 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2409 '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 2409 - setup LF checkout  with -c core.eol=native
+ok 717 - 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.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 2410 - setup CRLF checkout  with -c core.eol=native
+ok 718 - 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.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 2411 - 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.2412 '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 2412 - 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.2413 '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 2413 - setup LF_nul checkout  with -c core.eol=native
+ok 721 - 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.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
@@ -168903,70 +175998,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2414 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native
+ok 722 - ls-files --eol attr=text  aeol= 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.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 2415 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 723 - checkout attr=text  aeol= 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.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 2416 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 724 - checkout attr=text  aeol= 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.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 2417 - checkout attr= ident aeol= core.autocrlf=false 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.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.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 2418 - checkout attr= ident aeol= core.autocrlf=false 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.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.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 2419 - checkout attr= ident aeol= core.autocrlf=false 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.2420 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+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 2420 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+ok 728 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2421 'setup LF checkout  with -c core.eol=native': 
+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 2421 - setup LF checkout  with -c core.eol=native
+ok 729 - 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.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 2422 - setup CRLF checkout  with -c core.eol=native
+ok 730 - 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.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 2423 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 731 - 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.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 2424 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 732 - 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.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 2425 - setup LF_nul checkout  with -c core.eol=native
+ok 733 - 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.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
@@ -168981,70 +176076,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2426 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native
+ok 734 - ls-files --eol attr=auto  aeol= core.autocrlf=input 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.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 2427 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 735 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2428 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 736 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2429 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 737 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2430 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 738 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2431 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 739 - checkout attr=auto  aeol= core.autocrlf=input 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.740 'setup config for checkout attr=-text 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 740 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2433 'setup LF checkout  with -c core.eol=native': 
+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 2433 - setup LF checkout  with -c core.eol=native
+ok 741 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2434 'setup CRLF checkout  with -c core.eol=native': 
+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 2434 - setup CRLF checkout  with -c core.eol=native
+ok 742 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2435 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2435 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 743 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2436 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2436 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 744 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2437 'setup LF_nul checkout  with -c core.eol=native': 
+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 2437 - setup LF_nul checkout  with -c core.eol=native
+ok 745 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2438 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native': 
+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
@@ -169059,70 +176154,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2438 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native
+ok 746 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf
 
-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.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 2439 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 747 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2440 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 748 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2441 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 749 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2442 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 750 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2443 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 751 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2444 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=true': 
+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 2444 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
+ok 752 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2445 'setup LF checkout  with -c core.eol=native': 
+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 2445 - setup LF checkout  with -c core.eol=native
+ok 753 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2446 'setup CRLF checkout  with -c core.eol=native': 
+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 2446 - setup CRLF checkout  with -c core.eol=native
+ok 754 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2447 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2447 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 755 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2448 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2448 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 756 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2449 'setup LF_nul checkout  with -c core.eol=native': 
+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 2449 - setup LF_nul checkout  with -c core.eol=native
+ok 757 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2450 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native': 
+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
@@ -169137,70 +176232,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2450 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native
+ok 758 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=crlf
 
-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.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 2451 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 759 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf 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.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 2452 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 760 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf 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.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 2453 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native 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.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.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 2454 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native 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.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.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 2455 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 763 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2456 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+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 2456 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
+ok 764 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2457 '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 2457 - setup LF checkout  with -c core.eol=native
+ok 765 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2458 '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 2458 - setup CRLF checkout  with -c core.eol=native
+ok 766 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2459 '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 2459 - 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.2460 '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 2460 - 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.2461 '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 2461 - setup LF_nul checkout  with -c core.eol=native
+ok 769 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2462 'ls-files --eol attr=text ident aeol= core.autocrlf=input 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
@@ -169215,70 +176310,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2462 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native
+ok 770 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf
 
-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.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 2463 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 771 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2464 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 772 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2465 - checkout attr=text ident aeol= core.autocrlf=input 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.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.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 2466 - checkout attr=text ident aeol= core.autocrlf=input 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.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.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 2467 - checkout attr=text ident aeol= core.autocrlf=input 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.2468 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+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 2468 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+ok 776 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2469 'setup LF checkout  with -c core.eol=native': 
+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 2469 - setup LF checkout  with -c core.eol=native
+ok 777 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2470 'setup CRLF checkout  with -c core.eol=native': 
+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 2470 - setup CRLF checkout  with -c core.eol=native
+ok 778 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2471 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2471 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 779 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2472 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2472 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 780 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2473 'setup LF_nul checkout  with -c core.eol=native': 
+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 2473 - setup LF_nul checkout  with -c core.eol=native
+ok 781 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2474 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native': 
+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
@@ -169293,70 +176388,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2474 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native
+ok 782 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf
 
-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.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 2475 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 783 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf 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.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 2476 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 784 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf 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.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 2477 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native 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.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.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 2478 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native 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.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.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 2479 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 787 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2480 'setup config for checkout attr=text ident=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 2480 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 788 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2481 'setup LF checkout  with -c core.eol=crlf': 
+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 2481 - setup LF checkout  with -c core.eol=crlf
+ok 789 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2482 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2482 - setup CRLF checkout  with -c core.eol=crlf
+ok 790 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2483 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2483 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 791 - 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': 
+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 2484 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 792 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2485 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2485 - setup LF_nul checkout  with -c core.eol=crlf
+ok 793 - 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': 
+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
@@ -169371,70 +176466,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2486 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf
+ok 794 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true 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
+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 2487 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 795 - checkout attr=text  aeol=crlf core.autocrlf=true 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
+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 2488 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 796 - checkout attr=text  aeol=crlf core.autocrlf=true 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
+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 2489 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf 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.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.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 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 798 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+
+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 2491 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 799 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2492 'setup config for checkout attr=text ident=ident aeol= 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 2492 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 800 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2493 'setup LF checkout  with -c core.eol=lf': 
+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 2493 - setup LF checkout  with -c core.eol=lf
+ok 801 - 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.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 2494 - setup CRLF checkout  with -c core.eol=lf
+ok 802 - 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.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 2495 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 803 - 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.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 2496 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 804 - 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.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 2497 - setup LF_nul checkout  with -c core.eol=lf
+ok 805 - 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.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
@@ -169449,70 +176544,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2498 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf
+ok 806 - ls-files --eol attr=auto  aeol=lf 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.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 2499 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF
+ok 807 - checkout attr=auto  aeol=lf 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.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 2500 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 808 - checkout attr=auto  aeol=lf 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.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 2501 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf 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.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.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 2502 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf 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.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.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 2503 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 811 - checkout attr=auto  aeol=lf 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.812 'setup config for checkout attr=auto ident= aeol=crlf 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 812 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2505 '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 2505 - setup LF checkout 
+ok 813 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2506 '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 2506 - setup CRLF checkout 
+ok 814 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2507 '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 2507 - setup LF_mix_CR checkout 
+ok 815 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2508 '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 2508 - setup CRLF_mix_LF checkout 
+ok 816 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2509 '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 2509 - setup LF_nul checkout 
+ok 817 - 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.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
@@ -169527,70 +176622,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2510 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=
+ok 818 - ls-files --eol attr=auto  aeol=crlf 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.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 2511 - checkout attr=text ident aeol= 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.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.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 2512 - checkout attr=text ident aeol= 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.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.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 2513 - checkout attr=text ident aeol= 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.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.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 2514 - checkout attr=text ident aeol= 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.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.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 2515 - checkout attr=text ident aeol= 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.2516 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+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 2516 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 824 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2517 'setup LF checkout  with -c core.eol=native': 
+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 2517 - setup LF checkout  with -c core.eol=native
+ok 825 - 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.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 2518 - setup CRLF checkout  with -c core.eol=native
+ok 826 - 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.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 2519 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 827 - 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.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 2520 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 828 - 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.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 2521 - setup LF_nul checkout  with -c core.eol=native
+ok 829 - 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.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
@@ -169605,70 +176700,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2522 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native
+ok 830 - ls-files --eol attr=-text  aeol= core.autocrlf=false 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.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 2523 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 831 - checkout attr=-text  aeol= core.autocrlf=false 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.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 2524 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 832 - checkout attr=-text  aeol= core.autocrlf=false 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.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 2525 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 833 - checkout attr=-text  aeol= core.autocrlf=false 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.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 2526 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 834 - checkout attr=-text  aeol= core.autocrlf=false 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.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 2527 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 835 - checkout attr=-text  aeol= core.autocrlf=false 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.836 'setup config for checkout attr=-text ident= aeol=lf 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
+ok 836 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2529 '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 2529 - setup LF checkout 
+ok 837 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2530 '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 2530 - setup CRLF checkout 
+ok 838 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2531 '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 2531 - setup LF_mix_CR checkout 
+ok 839 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2532 '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 2532 - setup CRLF_mix_LF checkout 
+ok 840 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2533 '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 2533 - setup LF_nul checkout 
+ok 841 - 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.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
@@ -169683,70 +176778,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2534 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=
+ok 842 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false 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.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 2535 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF
+ok 843 - checkout attr=-text  aeol=lf core.autocrlf=false 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.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 2536 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF
+ok 844 - checkout attr=-text  aeol=lf core.autocrlf=false 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.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 2537 - checkout attr=auto ident aeol= core.autocrlf=false 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.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.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 2538 - checkout attr=auto ident aeol= core.autocrlf=false 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.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.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 2539 - checkout attr=auto ident aeol= core.autocrlf=false 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.2540 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false': 
+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 2540 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false
+ok 848 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2541 'setup LF checkout  with -c core.eol=native': 
+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 2541 - setup LF checkout  with -c core.eol=native
+ok 849 - 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.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 2542 - setup CRLF checkout  with -c core.eol=native
+ok 850 - 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.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 2543 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 851 - 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.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 2544 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 852 - 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.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 2545 - setup LF_nul checkout  with -c core.eol=native
+ok 853 - 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.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
@@ -169761,70 +176856,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2546 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native
+ok 854 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false 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.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 2547 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 855 - checkout attr=-text  aeol=crlf core.autocrlf=false 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.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 2548 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 856 - checkout attr=-text  aeol=crlf core.autocrlf=false 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.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 2549 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native 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.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.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 2550 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native 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.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.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 2551 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 859 - checkout attr=-text  aeol=crlf core.autocrlf=false 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.860 'setup config for checkout attr=text 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
+ok 860 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2553 'setup LF checkout ': 
+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 2553 - setup LF checkout 
+ok 861 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2554 'setup CRLF checkout ': 
+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 2554 - setup CRLF checkout 
+ok 862 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2555 'setup LF_mix_CR checkout ': 
+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 2555 - setup LF_mix_CR checkout 
+ok 863 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2556 'setup CRLF_mix_LF checkout ': 
+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 2556 - setup CRLF_mix_LF checkout 
+ok 864 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2557 'setup LF_nul checkout ': 
+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 2557 - setup LF_nul checkout 
+ok 865 - 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.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
@@ -169839,70 +176934,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2558 - ls-files --eol attr= ident aeol=lf core.autocrlf=false core.eol=
+ok 866 - ls-files --eol attr=text  aeol=lf core.autocrlf=false 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.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 2559 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF
+ok 867 - checkout attr=text  aeol=lf core.autocrlf=false 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.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 2560 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF
+ok 868 - checkout attr=text  aeol=lf core.autocrlf=false 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.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 2561 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= 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.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.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 2562 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= 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.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.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 2563 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul
+ok 871 - checkout attr=text  aeol=lf core.autocrlf=false 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.872 'setup config for checkout attr=text 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
+ok 872 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2565 'setup LF checkout ': 
+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 2565 - setup LF checkout 
+ok 873 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2566 'setup CRLF checkout ': 
+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 2566 - setup CRLF checkout 
+ok 874 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2567 'setup LF_mix_CR checkout ': 
+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 2567 - setup LF_mix_CR checkout 
+ok 875 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2568 'setup CRLF_mix_LF checkout ': 
+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 2568 - setup CRLF_mix_LF checkout 
+ok 876 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2569 'setup LF_nul checkout ': 
+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 2569 - setup LF_nul checkout 
+ok 877 - 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.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
@@ -169917,70 +177012,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2570 - ls-files --eol attr= ident aeol=crlf core.autocrlf=false core.eol=
+ok 878 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false 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.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 2571 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF
+ok 879 - checkout attr=text  aeol=crlf core.autocrlf=false 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.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 2572 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF
+ok 880 - checkout attr=text  aeol=crlf core.autocrlf=false 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.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 2573 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= 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.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.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 2574 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= 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.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.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 2575 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul
+ok 883 - checkout attr=text  aeol=crlf core.autocrlf=false 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.884 'setup config for checkout attr=auto ident= aeol=lf 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 884 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2577 'setup LF checkout ': 
+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 2577 - setup LF checkout 
+ok 885 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2578 'setup CRLF checkout ': 
+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 2578 - setup CRLF checkout 
+ok 886 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2579 'setup LF_mix_CR checkout ': 
+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 2579 - setup LF_mix_CR checkout 
+ok 887 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2580 'setup CRLF_mix_LF checkout ': 
+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 2580 - setup CRLF_mix_LF checkout 
+ok 888 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2581 'setup LF_nul checkout ': 
+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 2581 - setup LF_nul checkout 
+ok 889 - 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.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
@@ -169995,70 +177090,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2582 - ls-files --eol attr= ident aeol=lf core.autocrlf=true core.eol=
+ok 890 - ls-files --eol attr=auto  aeol=lf 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.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 2583 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF
+ok 891 - checkout attr=auto  aeol=lf 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.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 2584 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF
+ok 892 - checkout attr=auto  aeol=lf 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.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 2585 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= 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.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.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 2586 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= 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.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.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 2587 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_nul
+ok 895 - checkout attr=auto  aeol=lf 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.896 'setup config for checkout attr=auto ident= aeol=crlf 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 896 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2589 'setup LF checkout ': 
+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 2589 - setup LF checkout 
+ok 897 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2590 'setup CRLF checkout ': 
+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 2590 - setup CRLF checkout 
+ok 898 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2591 'setup LF_mix_CR checkout ': 
+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 2591 - setup LF_mix_CR checkout 
+ok 899 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2592 'setup CRLF_mix_LF checkout ': 
+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 2592 - setup CRLF_mix_LF checkout 
+ok 900 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2593 'setup LF_nul checkout ': 
+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 2593 - setup LF_nul checkout 
+ok 901 - 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.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
@@ -170073,18453 +177168,11048 @@
 		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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t1092-sparse-checkout-compatibility.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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" &&
-
-		git checkout -b fd-conflict base &&
-		rm a &&
-		mkdir a &&
-		echo content >a/a &&
-		git add . &&
-		git commit -m "file to dir" &&
-
-		for side in left right
-		do
-			git checkout -b merge-$side base &&
-			echo $side >>deep/deeper2/a &&
-			echo $side >>folder1/a &&
-			echo $side >>folder2/a &&
-			git add . &&
-			git commit -m "$side" || return 1
-		done &&
-
-		git checkout -b deepest base &&
-		echo "updated deepest" >deep/deeper1/deepest/a &&
-		echo "updated deepest2" >deep/deeper1/deepest2/a &&
-		echo "updated deepest3" >deep/deeper1/deepest3/a &&
-		git commit -a -m "update deepest" &&
-
-		git checkout -f base &&
-		git reset --hard
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t1092-sparse-checkout-compatibility/initial-repo/.git/
-[master (root-commit) 703fd3e] initial commit
- Author: A U Thor <author@example.com>
- 33 files changed, 26 insertions(+)
- create mode 100644 a
- create mode 100644 before/a
- create mode 100644 before/b
- create mode 100644 deep/a
- create mode 100644 deep/before/a
- create mode 100644 deep/deeper1/0/0/0
- create mode 100644 deep/deeper1/0/1
- create mode 100644 deep/deeper1/a
- create mode 100644 deep/deeper1/deepest/a
- create mode 100644 deep/deeper1/deepest2/a
- create mode 100644 deep/deeper1/deepest3/a
- create mode 100644 deep/deeper1/e
- create mode 100644 deep/deeper2/a
- create mode 100644 deep/deeper2/deeper1/a
- create mode 100644 deep/deeper2/deeper1/deepest/a
- create mode 100644 deep/deeper2/deeper1/deepest2/a
- create mode 100644 deep/deeper2/deeper1/deepest3/a
- create mode 100644 deep/deeper2/deeper1/e
- create mode 100644 deep/e
- create mode 100644 deep/later/a
- create mode 100644 e
- create mode 100644 folder1-
- create mode 100644 folder1.x
- create mode 100644 folder1/0/0/0
- create mode 100644 folder1/0/1
- create mode 100644 folder1/a
- create mode 100644 folder10
- create mode 100644 folder2/0/0/0
- create mode 100644 folder2/0/1
- create mode 100644 folder2/a
- create mode 100644 g
- create mode 100644 x/a
- create mode 100644 z
-Switched to a new branch 'base'
-Switched to a new branch 'update-folder1'
-[update-folder1 fa14324] update folder1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'update-folder2'
-[update-folder2 2805da4] update folder2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'update-deep'
-[update-deep ac61adf] update deep
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'rename-base'
-[rename-base 5914bd8] add interesting rename content
- Author: A U Thor <author@example.com>
- 3 files changed, 15 insertions(+)
- create mode 100644 deep/deeper1/larger-content
- create mode 100644 folder1/larger-content
- create mode 100644 folder2/larger-content
-Switched to a new branch 'rename-out-to-out'
-[rename-out-to-out 4a04e79] rename folder1/... to folder2/...
- Author: A U Thor <author@example.com>
- 4 files changed, 3 insertions(+)
- rename folder1/a => folder2/b (100%)
- rename folder1/larger-content => folder2/edited-content (97%)
-Switched to a new branch 'rename-out-to-in'
-[rename-out-to-in d11c5fe] rename folder1/... to deep/deeper1/...
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename folder1/a => deep/deeper1/b (100%)
- rename folder1/larger-content => deep/deeper1/edited-content (97%)
- rename folder2/0/{ => 1}/1 (100%)
-Switched to a new branch 'rename-in-to-out'
-[rename-in-to-out e5d0f8e] rename deep/deeper1/... to folder1/...
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename folder1/0/{0 => }/0 (100%)
- rename deep/deeper1/a => folder1/b (100%)
- rename deep/deeper1/larger-content => folder1/edited-content (97%)
-Switched to a new branch 'df-conflict-1'
-[df-conflict-1 974b58d] dir to file
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 folder1
- delete mode 100644 folder1/0/0/0
- delete mode 100644 folder1/0/1
- delete mode 100644 folder1/a
-Switched to a new branch 'df-conflict-2'
-[df-conflict-2 bef3412] dir to file
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 folder2
- delete mode 100644 folder2/0/0/0
- delete mode 100644 folder2/0/1
- delete mode 100644 folder2/a
-Switched to a new branch 'fd-conflict'
-[fd-conflict 40c717f] file to dir
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 a
- create mode 100644 a/a
-Switched to a new branch 'merge-left'
-[merge-left 9721a77] left
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Switched to a new branch 'merge-right'
-[merge-right 4f73b62] right
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Switched to a new branch 'deepest'
-[deepest cb037bf] update deepest
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 3 deletions(-)
-Switched to branch 'base'
-HEAD is now at 703fd3e initial commit
-ok 1 - setup
-
-expecting success of 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" &&
-
-	# 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" &&
-
-	# Drop down to only files at root
-	test_sparse_checkout_set \
-		"" \
-		"before deep folder1 folder2 x" &&
-
-	# 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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 10c8564bace86d48e22963bebe92e40ba8cfd937 0	deep/deeper1/
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 ca1fa788550e1b7b99256573687bd1dd7994e072 0	deep/deeper2/
-040000 cb4007891397aa2a451037d1c69e57f0cf498c24 0	folder2/0/
-fatal: path 'bogus' does not exist in 'HEAD'
-fatal: path 'folder2/2/3' does not exist in 'HEAD'
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
-040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
-040000 123706f6fc38949628eaf0483edbf97ba21123ae 0	folder2/
-040000 aaff74984cccd156a469afa7d9ab10e4777beb24 0	x/
-ok 2 - sparse-index contents
-
-expecting success of 1092.3 'expanded in-memory index matches full index': 
-	init_repos &&
-	test_sparse_match git ls-files --stage
-
-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 1092.4 'root directory cannot be sparse': 
-	init_repos &&
-
-	# 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 &&
-
-	# 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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-rm 'a'
-rm 'deep/a'
-rm 'deep/before/a'
-rm 'deep/deeper1/0/0/0'
-rm 'deep/deeper1/0/1'
-rm 'deep/deeper1/a'
-rm 'deep/deeper1/deepest/a'
-rm 'deep/deeper1/deepest2/a'
-rm 'deep/deeper1/deepest3/a'
-rm 'deep/deeper1/e'
-rm 'deep/deeper2/a'
-rm 'deep/deeper2/deeper1/a'
-rm 'deep/deeper2/deeper1/deepest/a'
-rm 'deep/deeper2/deeper1/deepest2/a'
-rm 'deep/deeper2/deeper1/deepest3/a'
-rm 'deep/deeper2/deeper1/e'
-rm 'deep/e'
-rm 'deep/later/a'
-rm 'e'
-rm 'folder1-'
-rm 'folder1.x'
-rm 'folder10'
-rm 'g'
-rm 'z'
-ok 4 - root directory cannot be sparse
-
-expecting success of 1092.5 'status with options': 
-	init_repos &&
-	test_sparse_match ls &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git status --porcelain=v2 -z -u &&
-	test_all_match git status --porcelain=v2 -uno &&
-	run_on_all touch README.md &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git status --porcelain=v2 -z -u &&
-	test_all_match git status --porcelain=v2 -uno &&
-	test_all_match git add README.md &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git status --porcelain=v2 -z -u &&
-	test_all_match git status --porcelain=v2 -uno
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 5 - status with options
-
-expecting success of 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 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 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 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 1092.8 'add, commit, checkout': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-	run_on_all ../edit-contents README.md &&
-
-	test_all_match git add README.md &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "Add README.md" &&
-
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
-
-	run_on_all ../edit-contents README.md &&
-
-	test_all_match git add -A &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "Extend README.md" &&
-
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
-
-	run_on_all ../edit-contents deep/newfile &&
-
-	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" &&
-
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout -
-
-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 1092.9 'deep changes during checkout': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout set deep/deeper1/deepest &&
-	test_all_match git checkout deepest &&
-	test_all_match git checkout base
-
-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 1092.10 'checkout with modified sparse directory': 
-	init_repos &&
-
-	test_all_match git checkout rename-in-to-out -- . &&
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git checkout base
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 10 - checkout with modified sparse directory
-
-expecting success of 1092.11 'checkout orphan then non-orphan': 
-	init_repos &&
-
-	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
-
-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
-
-expecting success of 1092.12 'add outside sparse cone': 
-	init_repos &&
-
-	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
-
-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 1092.13 'commit including unstaged changes': 
-	init_repos &&
-
-	write_script edit-file <<-\EOF &&
-	echo $1 >$2
-	EOF
-
-	run_on_all ../edit-file 1 a &&
-	run_on_all ../edit-file 1 deep/a &&
-
-	test_all_match git commit -m "-a" -a &&
-	test_all_match git status --porcelain=v2 &&
-
-	run_on_all ../edit-file 2 a &&
-	run_on_all ../edit-file 2 deep/a &&
-
-	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 &&
-
-	run_on_all ../edit-file 3 a &&
-	run_on_all ../edit-file 3 deep/a &&
-
-	test_all_match git commit -m "--amend" -a --amend &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 13 - commit including unstaged changes
-
-expecting success of 1092.14 'status/add: outside sparse cone': 
-	init_repos &&
-
-	# 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 &&
-
-	test_sparse_match git status &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-	run_on_all ../edit-contents folder1/a &&
-	run_on_all ../edit-contents folder1/new &&
-
-	test_sparse_match git status --porcelain=v2 &&
-
-	# 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 discrepancies in reported
-	# "modified" files, `test_sparse_match` reset is performed separately from
-	# "full-checkout" reset, then the index contents of all repos are verified.
-
-	test_sparse_match git reset update-folder1 -- \*/a &&
-	git -C full-checkout reset update-folder1 -- \*/a &&
-	test_all_match git ls-files -s -- deep/a folder1/a &&
-
-	test_sparse_match git reset update-folder2 -- folder\* &&
-	git -C full-checkout reset update-folder2 -- folder\* &&
-	test_all_match git ls-files -s -- folder10 folder1 folder2 &&
-
-	test_sparse_match git reset base -- folder1/\* &&
-	git -C full-checkout reset base -- folder1/\* &&
-	test_all_match git ls-files -s -- folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Unstaged changes after reset:
-M	folder1/a
-Unstaged changes after reset:
-M	folder2/a
-Unstaged changes after reset:
-M	folder2/a
-ok 27 - reset with wildcard pathspec
-
-expecting success of 1092.28 'reset hard with removed sparse dir': 
-	init_repos &&
-
-	run_on_all git rm -r --sparse folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard &&
-	test_all_match git status --porcelain=v2 &&
-
-	cat >expect <<-\EOF &&
-	folder1/
-	EOF
-
-	git -C sparse-index ls-files --sparse folder1 >out &&
-	test_cmp expect out
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 28 - reset hard with removed sparse dir
-
-expecting success of 1092.29 'update-index modify outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Create & modify folder1/a
-	# Note that this setup is a manual way of reaching the erroneous
-	# condition in which a `skip-worktree` enabled, outside-of-cone file
-	# exists on disk. It is used here to ensure `update-index` is stable
-	# and behaves predictably if such a condition occurs.
-	run_on_sparse mkdir -p folder1 &&
-	run_on_sparse cp ../initial-repo/folder1/a folder1/a &&
-	run_on_all ../edit-contents folder1/a &&
-
-	# If file has skip-worktree enabled, but the file is present, it is
-	# treated the same as if skip-worktree is disabled
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# When skip-worktree is disabled (even on files outside sparse cone), file
-	# is updated in the index
-	test_sparse_match git update-index --no-skip-worktree folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 29 - update-index modify outside sparse definition
-
-expecting success of 1092.30 'update-index --add outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Create folder1, add new file
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/b &&
-
-	# The *untracked* out-of-cone file is added to the index because it does
-	# not have a `skip-worktree` bit to signal that it should be ignored
-	# (unlike in `git add`, which will fail due to the file being outside
-	# the sparse checkout definition).
-	test_all_match git update-index --add folder1/b &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 30 - update-index --add outside sparse definition
-
-expecting success of 1092.31 'update-index --remove outside sparse definition': 
-	init_repos &&
-
-	# When --ignore-skip-worktree-entries is _not_ specified:
-	# out-of-cone, not-on-disk files are removed from the index
-	test_sparse_match git update-index --remove folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out &&
-
-	test_sparse_match git diff-index --cached HEAD &&
-
-	# Reset the state
-	test_all_match git reset --hard &&
-
-	# When --ignore-skip-worktree-entries is specified, out-of-cone
-	# (skip-worktree) files are ignored
-	test_sparse_match git update-index --remove --ignore-skip-worktree-entries folder1/a &&
-	test_sparse_match git diff --cached --name-status &&
-	test_must_be_empty sparse-checkout-out &&
-
-	test_sparse_match git diff-index --cached HEAD &&
-
-	# Reset the state
-	test_all_match git reset --hard &&
-
-	# --force-remove supersedes --ignore-skip-worktree-entries, removing
-	# a skip-worktree file from the index (and disk) when both are specified
-	# with --remove
-	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out &&
-
-	test_sparse_match git diff-index --cached HEAD
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 31 - update-index --remove outside sparse definition
-
-expecting success of 1092.32 'update-index with directories': 
-	init_repos &&
-
-	# update-index will exit silently when provided with a directory name
-	# containing a trailing slash
-	test_all_match git update-index deep/ folder1/ &&
-	grep "Ignoring path deep/" sparse-checkout-err &&
-	grep "Ignoring path folder1/" sparse-checkout-err &&
-
-	# When update-index is given a directory name WITHOUT a trailing slash, it will
-	# behave in different ways depending on the status of the directory on disk:
-	# * if it exists, the command exits with an error ("add individual files instead")
-	# * if it does NOT exist (e.g., in a sparse-checkout), it is assumed to be a
-	#   file and either triggers an error ("does not exist  and --remove not passed")
-	#   or is ignored completely (when using --remove)
-	test_all_match test_must_fail git update-index deep &&
-	run_on_all test_must_fail git update-index folder1 &&
-	test_must_fail git -C full-checkout update-index --remove folder1 &&
-	test_sparse_match git update-index --remove folder1 &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Ignoring path deep/
-Ignoring path folder1/
-error: folder1: is a directory - add individual files instead
-fatal: Unable to process path folder1
-ok 32 - update-index with directories
-
-expecting success of 1092.33 'update-index --again file outside sparse definition': 
-	init_repos &&
-
-	test_all_match git checkout -b test-reupdate &&
-
-	# Update HEAD without modifying the index to introduce a difference in
-	# folder1/a
-	test_sparse_match git reset --soft update-folder1 &&
-
-	# Because folder1/a differs in the index vs HEAD,
-	# `git update-index --no-skip-worktree --again` will effectively perform
-	# `git update-index --no-skip-worktree folder1/a` and remove the skip-worktree
-	# flag from folder1/a
-	test_sparse_match git update-index --no-skip-worktree --again &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --name-status &&
-	test_cmp expect sparse-checkout-out
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 33 - update-index --again file outside sparse definition
-
-expecting success of 1092.34 'update-index --cacheinfo': 
-	init_repos &&
-
-	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
-	folder2_oid=$(git -C full-checkout rev-parse update-folder2:folder2) &&
-	folder1_a_oid=$(git -C full-checkout rev-parse update-folder1:folder1/a) &&
-
-	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Cannot add sparse directory, even in sparse index case
-	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
-
-	# Sparse match only: the new outside-of-cone entry is added *without* skip-worktree,
-	# so `git status` reports it as "deleted" in the worktree
-	test_sparse_match git update-index --add --cacheinfo 100644 $folder1_a_oid folder1/a &&
-	test_sparse_match git status --porcelain=v2 &&
-	cat >expect <<-EOF &&
-	MD folder1/a
-	EOF
-	test_sparse_match git status --short -- folder1/a &&
-	test_cmp expect sparse-checkout-out &&
-
-	# To return folder1/a to "normal" for a sparse checkout (ignored &
-	# outside-of-cone), add the skip-worktree flag.
-	test_sparse_match git update-index --skip-worktree folder1/a &&
-	cat >expect <<-EOF &&
-	S folder1/a
-	EOF
-	test_sparse_match git ls-files -t -- folder1/a &&
-	test_cmp expect sparse-checkout-out
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 34 - update-index --cacheinfo
-
-expecting success of 1092.35 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
-		init_repos &&
-
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
-
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
-
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 35 - 'read-tree -mu base HEAD update-folder2' with files outside sparse definition
-
-expecting success of 1092.36 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
-		init_repos &&
-
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
-
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
-
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 36 - 'read-tree -mu update-folder1 update-folder2' with files outside sparse definition
-
-expecting success of 1092.37 ''read-tree -mu update-folder2' with files outside sparse definition': 
-		init_repos &&
-
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
-
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
-
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 37 - 'read-tree -mu update-folder2' with files outside sparse definition
-
-expecting success of 1092.38 'read-tree --merge with edit/edit conflicts in sparse directories': 
-	init_repos &&
-
-	# Merge of multiple changes to same directory (but not same files) should
-	# succeed
-	test_all_match git read-tree -mu base rename-base update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard &&
-
-	test_all_match git read-tree -mu rename-base update-folder2 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard &&
-
-	test_all_match test_must_fail git read-tree -mu base update-folder1 rename-out-to-in &&
-	test_all_match test_must_fail git read-tree -mu rename-out-to-in update-folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 38 - read-tree --merge with edit/edit conflicts in sparse directories
-
-expecting success of 1092.39 'read-tree --prefix': 
-	init_repos &&
-
-	# If files differing between the index and target <commit-ish> exist
-	# inside the prefix, `read-tree --prefix` should fail
-	test_all_match test_must_fail git read-tree --prefix=deep/ deepest &&
-	test_all_match test_must_fail git read-tree --prefix=folder1/ update-folder1 &&
-
-	# If no differing index entries exist matching the prefix,
-	# `read-tree --prefix` updates the index successfully
-	test_all_match git rm -rf deep/deeper1/deepest/ &&
-	test_all_match git read-tree --prefix=deep/deeper1/deepest -u deepest &&
-	test_all_match git status --porcelain=v2 &&
-
-	run_on_all git rm -rf --sparse folder1/ &&
-	test_all_match git read-tree --prefix=folder1/ -u update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git rm -rf --sparse folder2/0 &&
-	test_all_match git read-tree --prefix=folder2/0/ -u rename-out-to-out &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 39 - read-tree --prefix
-
-expecting success of 1092.40 'read-tree --merge with directory-file conflicts': 
-	init_repos &&
-
-	test_all_match git checkout -b test-branch rename-base &&
-
-	# Although the index matches, without --no-sparse-checkout, outside-of-
-	# definition files will not exist on disk for sparse checkouts
-	test_sparse_match git read-tree -mu rename-out-to-out &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_path_is_missing sparse-checkout/folder2 &&
-	test_path_is_missing sparse-index/folder2 &&
-
-	test_sparse_match git read-tree --reset -u HEAD &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	test_sparse_match git read-tree -mu --no-sparse-checkout rename-out-to-out &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_cmp sparse-checkout/folder2/0/1 sparse-index/folder2/0/1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 40 - read-tree --merge with directory-file conflicts
-
-expecting success of 1092.41 'merge, cherry-pick, and rebase': 
-	init_repos &&
-
-	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
-	do
-		test_all_match git checkout -B temp update-deep &&
-		test_all_match git $OPERATION update-folder1 &&
-		test_all_match git rev-parse HEAD^{tree} &&
-		test_all_match git $OPERATION update-folder2 &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 41 - merge, cherry-pick, and rebase
-
-expecting success of 1092.42 'merge with conflict outside cone': 
-	init_repos &&
-
-	test_all_match git checkout -b merge-tip merge-left &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match test_must_fail git merge -m merge merge-right &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Resolve the conflict in different ways:
-	# 1. Revert to the base
-	test_all_match git checkout base -- deep/deeper2/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# 2. Add the file with conflict markers
-	test_sparse_match test_must_fail git add folder1/a &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder1/a &&
-	test_all_match git add --sparse folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# 3. Rename the file to another sparse filename and
-	#    accept conflict markers as resolved content.
-	run_on_all mv folder2/a folder2/z &&
-	test_sparse_match test_must_fail git add folder2 &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder2/z &&
-	test_all_match git add --sparse folder2 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git merge --continue &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git rev-parse HEAD^{tree}
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 42 - merge with conflict outside cone
-
-expecting success of 1092.43 'cherry-pick/rebase with conflict outside cone': 
-	init_repos &&
-
-	for OPERATION in cherry-pick rebase
-	do
-		test_all_match git checkout -B tip &&
-		test_all_match git reset --hard merge-left &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match test_must_fail git $OPERATION merge-right &&
-		test_all_match git status --porcelain=v2 &&
-
-		# Resolve the conflict in different ways:
-		# 1. Revert to the base
-		test_all_match git checkout base -- deep/deeper2/a &&
-		test_all_match git status --porcelain=v2 &&
-
-		# 2. Add the file with conflict markers
-		# NEEDSWORK: Even though the merge conflict removed the
-		# SKIP_WORKTREE bit from the index entry for folder1/a, we should
-		# warn that this is a problematic add.
-		test_sparse_match test_must_fail git add folder1/a &&
-		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-		test_sparse_unstaged folder1/a &&
-		test_all_match git add --sparse folder1/a &&
-		test_all_match git status --porcelain=v2 &&
-
-		# 3. Rename the file to another sparse filename and
-		#    accept conflict markers as resolved content.
-		# NEEDSWORK: This mode now fails, because folder2/z is
-		# outside of the sparse-checkout cone and does not match an
-		# existing index entry with the SKIP_WORKTREE bit cleared.
-		run_on_all mv folder2/a folder2/z &&
-		test_sparse_match test_must_fail git add folder2 &&
-		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-		test_sparse_unstaged folder2/z &&
-		test_all_match git add --sparse folder2 &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git $OPERATION --continue &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 43 - cherry-pick/rebase with conflict outside cone
-
-expecting success of 1092.44 'merge with outside renames': 
-	init_repos &&
-
-	for type in out-to-out out-to-in in-to-out
-	do
-		test_all_match git reset --hard &&
-		test_all_match git checkout -f -b merge-$type update-deep &&
-		test_all_match git merge -m "$type" rename-$type &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 44 - merge with outside renames
-
-expecting success of 1092.45 'cherry-pick with conflicts': 
-	init_repos &&
-
-	write_script edit-conflict <<-\EOF &&
-	echo $1 >conflict
-	EOF
-
-	test_all_match git checkout -b to-cherry-pick &&
-	run_on_all ../edit-conflict ABC &&
-	test_all_match git add conflict &&
-	test_all_match git commit -m "conflict to pick" &&
-
-	test_all_match git checkout -B base HEAD~1 &&
-	run_on_all ../edit-conflict DEF &&
-	test_all_match git add conflict &&
-	test_all_match git commit -m "conflict in base" &&
-
-	test_all_match test_must_fail git cherry-pick to-cherry-pick
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 45 - cherry-pick with conflicts
-
-expecting success of 1092.46 'stash': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Stash a sparse directory (folder1)
-	test_all_match git checkout -b test-branch rename-base &&
-	test_all_match git reset --soft rename-out-to-out &&
-	test_all_match git stash &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Apply the sparse directory stash without reinstating the index
-	test_all_match git stash apply -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to state where stash can be applied
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard rename-out-to-out &&
-
-	# Apply the sparse directory stash *with* reinstating the index
-	test_all_match git stash apply --index -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to state where we will get a conflict applying the stash
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard update-folder1 &&
-
-	# Apply the sparse directory stash with conflicts
-	test_all_match test_must_fail git stash apply --index -q &&
-	test_all_match test_must_fail git stash apply -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to base branch
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard base &&
-
-	# Stash & unstash an untracked file outside of the sparse checkout
-	# definition.
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/new &&
-	test_all_match git stash -u &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git stash pop -q &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 46 - stash
-
-expecting success of 1092.47 'checkout-index inside sparse definition': 
-	init_repos &&
-
-	run_on_all rm -f deep/a &&
-	test_all_match git checkout-index -- deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	echo test >>new-a &&
-	run_on_all cp ../new-a a &&
-	test_all_match test_must_fail git checkout-index -- a &&
-	test_all_match git checkout-index -f -- a &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 47 - checkout-index inside sparse definition
-
-expecting success of 1092.48 'checkout-index outside sparse definition': 
-	init_repos &&
-
-	# Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
-	# an error
-	test_sparse_match test_must_fail git checkout-index -- folder1/a &&
-	test_grep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
-	test_path_is_missing folder1/a &&
-
-	# With --ignore-skip-worktree-bits, outside-of-cone files are checked out
-	test_sparse_match git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
-	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
-	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a &&
-
-	run_on_sparse rm -rf folder1 &&
-	echo test >new-a &&
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all cp ../new-a folder1/a &&
-
-	test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
-	test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
-	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
-	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-git checkout-index: folder1/a has skip-worktree enabled; use '--ignore-skip-worktree-bits' to checkout
-ok 48 - checkout-index outside sparse definition
-
-expecting success of 1092.49 'checkout-index with folders': 
-	init_repos &&
-
-	# Inside checkout definition
-	test_all_match test_must_fail git checkout-index -f -- deep/ &&
-
-	# Outside checkout definition
-	# Note: although all tests fail (as expected), the messaging differs. For
-	# non-sparse index checkouts, the error is that the "file" does not appear
-	# in the index; for sparse checkouts, the error is explicitly that the
-	# entry is a sparse directory.
-	run_on_all test_must_fail git checkout-index -f -- folder1/ &&
-	test_cmp full-checkout-err sparse-checkout-err &&
-	! test_cmp full-checkout-err sparse-index-err &&
-	grep "is a sparse directory" sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
---- full-checkout-err	2025-02-09 06:53:57.365670891 +0000
-+++ sparse-index-err	2025-02-09 06:53:57.393671069 +0000
-@@ -1 +1 @@
--git checkout-index: folder1/ is not in the cache
-+git checkout-index: folder1/ is a sparse directory
-git checkout-index: folder1/ is a sparse directory
-ok 49 - checkout-index with folders
-
-expecting success of 1092.50 'checkout-index --all': 
-	init_repos &&
-
-	test_all_match git checkout-index --all &&
-	test_sparse_match test_path_is_missing folder1 &&
-
-	# --ignore-skip-worktree-bits will cause `skip-worktree` files to be
-	# checked out, causing the outside-of-cone `folder1` to exist on-disk
-	test_all_match git checkout-index --ignore-skip-worktree-bits --all &&
-	test_all_match test_path_exists folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 50 - checkout-index --all
-
-expecting success of 1092.51 'clean': 
-	init_repos &&
-
-	echo bogus >>.gitignore &&
-	run_on_all cp ../.gitignore . &&
-	test_all_match git add .gitignore &&
-	test_all_match git commit -m "ignore bogus files" &&
-
-	run_on_sparse mkdir folder1 &&
-	run_on_all mkdir -p deep/untracked-deep &&
-	run_on_all touch folder1/bogus &&
-	run_on_all touch folder1/untracked &&
-	run_on_all touch deep/untracked-deep/bogus &&
-	run_on_all touch deep/untracked-deep/untracked &&
-
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git clean -f &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_exists folder1/bogus &&
-	run_on_all test_path_is_missing folder1/untracked &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/untracked &&
-
-	test_all_match git clean -fd &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_exists folder1/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-	run_on_all test_path_is_missing deep/untracked-deep/untracked &&
-
-	test_all_match git clean -xf &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_is_missing folder1/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-
-	test_all_match git clean -xdf &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_is_missing deep/untracked-deep/bogus &&
-
-	test_sparse_match test_path_is_dir folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 51 - clean
-
-expecting success of 1092.52 'show (cached blobs/trees)': 
-		init_repos &&
-
-		test_all_match git show :a &&
-		test_all_match git show :deep/a &&
-		test_sparse_match git show :folder1/a &&
-
-		# The error message differs depending on whether
-		# the directory exists in the worktree.
-		test_all_match test_must_fail git show :deep/ &&
-		test_must_fail git -C full-checkout show :folder1/ &&
-		test_sparse_match test_must_fail git show :folder1/ &&
-
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
-
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git show :deep/deeper2/ &&
-
-		# deep/deeper2/deepest is not in the sparse index, but
-		# will trigger an index expansion.
-		test_sparse_match test_must_fail git show :deep/deeper2/deepest/
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-fatal: path 'folder1/' exists on disk, but not in the index
-ok 52 - show (cached blobs/trees)
-
-expecting success of 1092.53 'rev-parse (cached blobs/trees)': 
-		init_repos &&
-
-		test_all_match git rev-parse :a &&
-		test_all_match git rev-parse :deep/a &&
-		test_sparse_match git rev-parse :folder1/a &&
-
-		# The error message differs depending on whether
-		# the directory exists in the worktree.
-		test_all_match test_must_fail git rev-parse :deep/ &&
-		test_must_fail git -C full-checkout rev-parse :folder1/ &&
-		test_sparse_match test_must_fail git rev-parse :folder1/ &&
-
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
-
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
-
-		# deep/deeper2/deepest is not in the sparse index, but
-		# will trigger an index expansion.
-		test_sparse_match test_must_fail git rev-parse :deep/deeper2/deepest/
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-fatal: path 'folder1/' exists on disk, but not in the index
-:folder1/
-ok 53 - rev-parse (cached blobs/trees)
-
-expecting success of 1092.54 'submodule handling': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout add modules &&
-	test_all_match mkdir modules &&
-	test_all_match touch modules/a &&
-	test_all_match git add modules &&
-	test_all_match git commit -m "add modules directory" &&
-
-	test_config_global protocol.file.allow always &&
-
-	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
-	test_all_match git commit -m "add submodule" &&
-
-	# having a submodule prevents "modules" from collapse
-	test_sparse_match git sparse-checkout set deep/deeper1 &&
-	git -C sparse-index ls-files --sparse --stage >cache &&
-	grep "100644 .*	modules/a" cache &&
-	grep "160000 $(git -C initial-repo rev-parse HEAD) 0	modules/sub" cache
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	modules/a
-160000 703fd3e56687611d5c0264e6f007e18e96f794bf 0	modules/sub
-ok 54 - submodule handling
-
-expecting success of 1092.55 'sparse-index is expanded and converted back': 
-	init_repos &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C sparse-index reset -- folder1/a &&
-	test_region index convert_to_sparse trace2.txt &&
-	test_region index ensure_full_index trace2.txt &&
-
-	# ls-files expands on read, but does not write.
-	rm trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index ls-files &&
-	test_region index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20250209T065401.049444Z-Hcf858c9d-P0017f63b","thread":"main","time":"2025-02-09T06:54:01.051953Z","file":"sparse-index.c","line":237,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20250209T065401.049444Z-Hcf858c9d-P0017f63b","thread":"main","time":"2025-02-09T06:54:01.052089Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000137,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_enter","sid":"20250209T065401.049444Z-Hcf858c9d-P0017f63b","thread":"main","time":"2025-02-09T06:54:01.050873Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065401.049444Z-Hcf858c9d-P0017f63b","thread":"main","time":"2025-02-09T06:54:01.052370Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065401.049444Z-Hcf858c9d-P0017f63b","thread":"main","time":"2025-02-09T06:54:01.051560Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000687,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065401.049444Z-Hcf858c9d-P0017f63b","thread":"main","time":"2025-02-09T06:54:01.052551Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000181,"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":"20250209T065401.098040Z-Hcf858c9d-P0017f693","thread":"main","time":"2025-02-09T06:54:01.098987Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065401.098040Z-Hcf858c9d-P0017f693","thread":"main","time":"2025-02-09T06:54:01.099745Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000759,"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":"20250209T065401.301434Z-Hcf858c9d-P0017f7fe","thread":"main","time":"2025-02-09T06:54:01.302386Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065401.301434Z-Hcf858c9d-P0017f7fe","thread":"main","time":"2025-02-09T06:54:01.303188Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000802,"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":"20250209T065401.340323Z-Hcf858c9d-P0017f840","thread":"main","time":"2025-02-09T06:54:01.341149Z","file":"sparse-index.c","line":237,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20250209T065401.340323Z-Hcf858c9d-P0017f840","thread":"main","time":"2025-02-09T06:54:01.341319Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000169,"nesting":2,"category":"index","label":"convert_to_sparse"}
-On branch base
-You are in a sparse checkout.
-
-nothing to commit, working tree clean
-ok 56 - index.sparse disabled inline uses full index
-
-expecting success of 1092.57 'sparse-index is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded status &&
-	ensure_not_expanded ls-files --sparse &&
-	ensure_not_expanded commit --allow-empty -m empty &&
-	echo >>sparse-index/a &&
-	ensure_not_expanded commit -a -m a &&
-	echo >>sparse-index/a &&
-	ensure_not_expanded commit --include a -m a &&
-	echo >>sparse-index/deep/deeper1/a &&
-	ensure_not_expanded commit --include deep/deeper1/a -m deeper &&
-	ensure_not_expanded checkout rename-out-to-out &&
-	ensure_not_expanded checkout - &&
-	ensure_not_expanded switch rename-out-to-out &&
-	ensure_not_expanded switch - &&
-	ensure_not_expanded reset --hard &&
-	ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
-	ensure_not_expanded reset --hard &&
-	ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
-
-	echo >>sparse-index/README.md &&
-	ensure_not_expanded add -A &&
-	echo >>sparse-index/extra.txt &&
-	ensure_not_expanded add extra.txt &&
-	echo >>sparse-index/untracked.txt &&
-	ensure_not_expanded add . &&
-
-	ensure_not_expanded checkout-index -f a &&
-	ensure_not_expanded checkout-index -f --all &&
-	for ref in update-deep update-folder1 update-folder2 update-deep
-	do
-		echo >>sparse-index/README.md &&
-		ensure_not_expanded reset --hard $ref || return 1
-	done &&
-
-	ensure_not_expanded reset --mixed base &&
-	ensure_not_expanded reset --hard update-deep &&
-	ensure_not_expanded reset --keep base &&
-	ensure_not_expanded reset --merge update-deep &&
-	ensure_not_expanded reset --hard &&
-
-	ensure_not_expanded reset base -- deep/a &&
-	ensure_not_expanded reset base -- nonexistent-file &&
-	ensure_not_expanded reset deepest -- deep &&
-
-	# Although folder1 is outside the sparse definition, it exists as a
-	# directory entry in the index, so the pathspec will not force the
-	# index to be expanded.
-	ensure_not_expanded reset deepest -- folder1 &&
-	ensure_not_expanded reset deepest -- folder1/ &&
-
-	# Wildcard identifies only in-cone files, no index expansion
-	ensure_not_expanded reset deepest -- deep/\* &&
-
-	# Wildcard identifies only full sparse directories, no index expansion
-	ensure_not_expanded reset deepest -- folder\* &&
-
-	ensure_not_expanded clean -fd &&
-
-	ensure_not_expanded checkout -f update-deep &&
-	test_config -C sparse-index pull.twohead ort &&
-	(
-		sane_unset GIT_TEST_MERGE_ALGORITHM &&
-		for OPERATION in "merge -m merge" cherry-pick rebase
-		do
-			ensure_not_expanded merge -m merge update-folder1 &&
-			ensure_not_expanded merge -m merge update-folder2 || return 1
-		done
-	)
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 57 - sparse-index is not expanded
-
-expecting success of 1092.58 'sparse-index is not expanded: merge conflict in cone': 
-	init_repos &&
-
-	for side in right left
-	do
-		git -C sparse-index checkout -b expand-$side base &&
-		echo $side >sparse-index/deep/a &&
-		git -C sparse-index commit -a -m "$side" || return 1
-	done &&
-
-	(
-		sane_unset GIT_TEST_MERGE_ALGORITHM &&
-		git -C sparse-index config pull.twohead ort &&
-		ensure_not_expanded ! merge -m merged expand-right
-	)
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Switched to a new branch 'expand-right'
-[expand-right 5ebbff9] right
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'expand-left'
-[expand-left 9bcd6b8] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 58 - sparse-index is not expanded: merge conflict in cone
-
-expecting success of 1092.59 'sparse-index is not expanded: stash': 
-	init_repos &&
-
-	echo >>sparse-index/a &&
-	ensure_not_expanded stash &&
-	ensure_not_expanded stash list &&
-	ensure_not_expanded stash show stash@{0} &&
-	ensure_not_expanded stash apply stash@{0} &&
-	ensure_not_expanded stash drop stash@{0} &&
-
-	echo >>sparse-index/deep/new &&
-	ensure_not_expanded stash -u &&
-	(
-		WITHOUT_UNTRACKED_TXT=1 &&
-		ensure_not_expanded stash pop
-	) &&
-
-	ensure_not_expanded stash create &&
-	oid=$(git -C sparse-index stash create) &&
-	ensure_not_expanded stash store -m "test" $oid &&
-	ensure_not_expanded reset --hard &&
-	ensure_not_expanded stash pop
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 59 - sparse-index is not expanded: stash
-
-expecting success of 1092.60 'describe tested on all': 
-	init_repos &&
-
-	# Add tag to be read by describe
-
-	run_on_all git tag -a v1.0 -m "Version 1" &&
-	test_all_match git describe --dirty &&
-	run_on_all rm g &&
-	test_all_match git describe --dirty
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 60 - describe tested on all
-
-expecting success of 1092.61 'sparse-index is not expanded: describe': 
-	init_repos &&
-
-	# Add tag to be read by describe
-
-	git -C sparse-index tag -a v1.0 -m "Version 1" &&
-
-	ensure_not_expanded describe --dirty &&
-	echo "test" >>sparse-index/g &&
-	ensure_not_expanded describe --dirty &&
-	ensure_not_expanded describe
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 61 - sparse-index is not expanded: describe
-
-expecting success of 1092.62 'sparse index is not expanded: diff and diff-index': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Add file within cone
-	test_sparse_match git sparse-checkout set deep &&
-	run_on_all ../edit-contents deep/testfile &&
-	test_all_match git add deep/testfile &&
-	run_on_all ../edit-contents deep/testfile &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD &&
-
-	# Add file outside cone
-	test_all_match git reset --hard &&
-	run_on_all mkdir newdirectory &&
-	run_on_all ../edit-contents newdirectory/testfile &&
-	test_sparse_match git sparse-checkout set newdirectory &&
-	test_all_match git add newdirectory/testfile &&
-	run_on_all ../edit-contents newdirectory/testfile &&
-	test_sparse_match git sparse-checkout set &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD &&
-
-	# Merge conflict outside cone
-	# The sparse checkout will report a warning that is not in the
-	# full checkout, so we use `run_on_all` instead of
-	# `test_all_match`
-	run_on_all git reset --hard &&
-	test_all_match git checkout merge-left &&
-	test_all_match test_must_fail git merge merge-right &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 62 - sparse index is not expanded: diff and diff-index
-
-expecting success of 1092.63 'sparse index is not expanded: show and rev-parse': 
-	init_repos &&
-
-	ensure_not_expanded show :a &&
-	ensure_not_expanded show :deep/a &&
-	ensure_not_expanded rev-parse :a &&
-	ensure_not_expanded rev-parse :deep/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 63 - sparse index is not expanded: show and rev-parse
-
-expecting success of 1092.64 'sparse index is not expanded: update-index': 
-	init_repos &&
-
-	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
-	ensure_not_expanded update-index --cacheinfo 100644 $deep_a_oid deep/a &&
-
-	echo "test" >sparse-index/README.md &&
-	echo "test2" >sparse-index/a &&
-	rm -f sparse-index/deep/a &&
-
-	ensure_not_expanded update-index --add README.md &&
-	ensure_not_expanded update-index a &&
-	ensure_not_expanded update-index --remove deep/a &&
-
-	ensure_not_expanded reset --soft update-deep &&
-	ensure_not_expanded update-index --add --remove --again
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 64 - sparse index is not expanded: update-index
-
-expecting success of 1092.65 'sparse index is not expanded: blame': 
-	init_repos &&
-
-	for file in a \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		ensure_not_expanded blame $file || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 65 - sparse index is not expanded: blame
-
-expecting success of 1092.66 'sparse index is not expanded: fetch/pull': 
-	init_repos &&
-
-	git -C sparse-index remote add full "file://$(pwd)/full-checkout" &&
-	ensure_not_expanded fetch full &&
-	git -C full-checkout commit --allow-empty -m "for pull merge" &&
-	git -C sparse-index commit --allow-empty -m "for pull merge" &&
-	ensure_not_expanded pull full base
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-[base f236285] for pull merge
- Author: A U Thor <author@example.com>
-[base f236285] for pull merge
- Author: A U Thor <author@example.com>
-ok 66 - sparse index is not expanded: fetch/pull
-
-expecting success of 1092.67 'sparse index is not expanded: read-tree': 
-	init_repos &&
-
-	ensure_not_expanded checkout -b test-branch update-folder1 &&
-	for MERGE_TREES in "base HEAD update-folder2" \
-			   "base HEAD rename-base" \
-			   "base update-folder2" \
-			   "base rename-base" \
-			   "update-folder2"
-	do
-		ensure_not_expanded read-tree -mu $MERGE_TREES &&
-		ensure_not_expanded reset --hard || return 1
-	done &&
-
-	rm -rf sparse-index/deep/deeper2 &&
-	ensure_not_expanded add . &&
-	ensure_not_expanded commit -m "test" &&
-
-	ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 67 - sparse index is not expanded: read-tree
-
-expecting success of 1092.68 'ls-files': 
-	init_repos &&
-
-	# Use a smaller sparse-checkout for reduced output
-	test_sparse_match git sparse-checkout set &&
-
-	# Behavior agrees by default. Sparse index is expanded.
-	test_all_match git ls-files &&
-
-	# With --sparse, the sparse index data changes behavior.
-	git -C sparse-index ls-files --sparse >actual &&
-
-	cat >expect <<-\EOF &&
-	a
-	before/
-	deep/
-	e
-	folder1-
-	folder1.x
-	folder1/
-	folder10
-	folder2/
-	g
-	x/
-	z
-	EOF
-
-	test_cmp expect actual &&
-
-	# With --sparse and no sparse index, nothing changes.
-	git -C sparse-checkout ls-files >dense &&
-	git -C sparse-checkout ls-files --sparse >sparse &&
-	test_cmp dense sparse &&
-
-	# Set up a strange condition of having a file edit
-	# outside of the sparse-checkout cone. We want to verify
-	# that all modes handle this the same, and detect the
-	# modification.
-	write_script edit-content <<-\EOF &&
-	mkdir -p folder1 &&
-	echo content >>folder1/a
-	EOF
-	run_on_all ../edit-content &&
-
-	test_all_match git ls-files --modified &&
-
-	git -C sparse-index ls-files --sparse --modified >sparse-index-out &&
-	cat >expect <<-\EOF &&
-	folder1/a
-	EOF
-	test_cmp expect sparse-index-out &&
-
-	# Add folder1 to the sparse-checkout cone and
-	# check that ls-files shows the expanded files.
-	test_sparse_match git sparse-checkout add folder1 &&
-	test_all_match git ls-files --modified &&
-
-	test_all_match git ls-files &&
-	git -C sparse-index ls-files --sparse >actual &&
-
-	cat >expect <<-\EOF &&
-	a
-	before/
-	deep/
-	e
-	folder1-
-	folder1.x
-	folder1/0/0/0
-	folder1/0/1
-	folder1/a
-	folder10
-	folder2/
-	g
-	x/
-	z
-	EOF
-
-	test_cmp expect actual &&
-
-	# Double-check index expansion is avoided
-	ensure_not_expanded ls-files --sparse
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 68 - ls-files
-
-expecting success of 1092.69 'sparse index is not expanded: sparse-checkout': 
-	init_repos &&
-
-	ensure_not_expanded sparse-checkout set deep/deeper2 &&
-	ensure_not_expanded sparse-checkout set deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set deep &&
-	ensure_not_expanded sparse-checkout add folder1 &&
-	ensure_not_expanded sparse-checkout set deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set folder2 &&
-
-	# Demonstrate that the checks that "folder1/a" is a file
-	# do not cause a sparse-index expansion (since it is in the
-	# sparse-checkout cone).
-	echo >>sparse-index/folder2/a &&
-	git -C sparse-index add folder2/a &&
-
-	ensure_not_expanded sparse-checkout add folder1 &&
-
-	# Skip checks here, since deep/deeper1 is inside a sparse directory
-	# that must be expanded to check whether `deep/deeper1` is a file
-	# or not.
-	ensure_not_expanded sparse-checkout set --skip-checks deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 69 - sparse index is not expanded: sparse-checkout
-
-expecting success of 1092.70 'reset mixed and checkout orphan': 
-	init_repos &&
-
-	test_all_match git checkout rename-out-to-in &&
-
-	# Sparse checkouts do not agree with full checkouts about
-	# how to report a directory/file conflict during a reset.
-	# This command would fail with test_all_match because the
-	# full checkout reports "T folder1/0/1" while a sparse
-	# checkout reports "D folder1/0/1". This matches because
-	# the sparse checkouts skip "adding" the other side of
-	# the conflict.
-	test_sparse_match git reset --mixed HEAD~1 &&
-	test_sparse_match git ls-files --stage &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	# At this point, sparse-checkouts behave differently
-	# from the full-checkout.
-	test_sparse_match git checkout --orphan new-branch &&
-	test_sparse_match git ls-files --stage &&
-	test_sparse_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 70 - reset mixed and checkout orphan
-
-expecting success of 1092.71 'add everything with deep new file': 
-	init_repos &&
-
-	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
-
-	run_on_all touch deep/deeper1/x &&
-	test_all_match git add . &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 71 - add everything with deep new file
-
-expecting success of 1092.72 'checkout behaves oddly with df-conflict-1': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout disable &&
-
-	write_script edit-content <<-\EOF &&
-	echo content >>folder1/larger-content
-	git add folder1
-	EOF
-
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
-
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
-
-	test_all_match git status --porcelain=v2 &&
-
-	# This checkout command should fail, because we have a staged
-	# change to folder1/larger-content, but the destination changes
-	# folder1 to a file.
-	git -C full-checkout checkout df-conflict-1 \
-		1>full-checkout-out \
-		2>full-checkout-err &&
-	git -C sparse-checkout checkout df-conflict-1 \
-		1>sparse-checkout-out \
-		2>sparse-checkout-err &&
-	git -C sparse-index checkout df-conflict-1 \
-		1>sparse-index-out \
-		2>sparse-index-err &&
-
-	# Instead, the checkout deletes the folder1 file and adds the
-	# folder1/larger-content file, leaving all other paths that were
-	# in folder1/ as deleted (without any warning).
-	cat >expect <<-EOF &&
-	D	folder1
-	A	folder1/larger-content
-	EOF
-	test_cmp expect full-checkout-out &&
-	test_cmp expect sparse-checkout-out &&
-
-	# The sparse-index reports no output
-	test_must_be_empty sparse-index-out &&
-
-	# stderr: Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-checkout-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 72 - checkout behaves oddly with df-conflict-1
-
-expecting success of 1092.73 'checkout behaves oddly with df-conflict-2': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout disable &&
-
-	write_script edit-content <<-\EOF &&
-	echo content >>folder2/larger-content
-	git add folder2
-	EOF
-
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
-
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
-
-	test_all_match git status --porcelain=v2 &&
-
-	# This checkout command should fail, because we have a staged
-	# change to folder1/larger-content, but the destination changes
-	# folder1 to a file.
-	git -C full-checkout checkout df-conflict-2 \
-		1>full-checkout-out \
-		2>full-checkout-err &&
-	git -C sparse-checkout checkout df-conflict-2 \
-		1>sparse-checkout-out \
-		2>sparse-checkout-err &&
-	git -C sparse-index checkout df-conflict-2 \
-		1>sparse-index-out \
-		2>sparse-index-err &&
-
-	# The full checkout deviates from the df-conflict-1 case here!
-	# It drops the change to folder1/larger-content and leaves the
-	# folder1 path as-is on disk. The sparse-index behaves the same.
-	test_must_be_empty full-checkout-out &&
-	test_must_be_empty sparse-index-out &&
-
-	# In the sparse-checkout case, the checkout deletes the folder1
-	# file and adds the folder1/larger-content file, leaving all other
-	# paths that were in folder1/ as deleted (without any warning).
-	cat >expect <<-EOF &&
-	D	folder2
-	A	folder2/larger-content
-	EOF
-	test_cmp expect sparse-checkout-out &&
-
-	# Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 73 - checkout behaves oddly with df-conflict-2
-
-expecting success of 1092.74 'mv directory from out-of-cone to in-cone': 
-	init_repos &&
-
-	# <source> as a sparse directory (or SKIP_WORKTREE_DIR without enabling
-	# sparse index).
-	test_all_match git mv --sparse folder1 deep &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match git ls-files -t &&
-	git -C sparse-checkout ls-files -t >actual &&
-	grep -e "H deep/folder1/0/0/0" actual &&
-	grep -e "H deep/folder1/0/1" actual &&
-	grep -e "H deep/folder1/a" actual &&
-
-	test_all_match git reset --hard &&
-
-	# <source> as a directory deeper than sparse index boundary (where
-	# sparse index will expand).
-	test_sparse_match git mv --sparse folder1/0 deep &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_sparse_match git ls-files -t &&
-	git -C sparse-checkout ls-files -t >actual &&
-	grep -e "H deep/0/0/0" actual &&
-	grep -e "H deep/0/1" actual
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-H deep/folder1/0/0/0
-H deep/folder1/0/1
-H deep/folder1/a
-H deep/0/0/0
-H deep/0/1
-ok 74 - mv directory from out-of-cone to in-cone
-
-expecting success of 1092.75 'rm pathspec inside sparse definition': 
-	init_repos &&
-
-	test_all_match git rm deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# test wildcard
-	run_on_all git reset --hard &&
-	test_all_match git rm deep/* &&
-	test_all_match git status --porcelain=v2 &&
-
-	# test recursive rm
-	run_on_all git reset --hard &&
-	test_all_match git rm -r deep &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 75 - rm pathspec inside sparse definition
-
-expecting success of 1092.76 'rm pathspec outside sparse definition': 
-	init_repos &&
-
-	for file in folder1/a folder1/0/1
-	do
-		test_sparse_match test_must_fail git rm $file &&
-		test_sparse_match test_must_fail git rm --cached $file &&
-		test_sparse_match git rm --sparse $file &&
-		test_sparse_match git status --porcelain=v2 || return 1
-	done &&
-
-	cat >folder1-full <<-EOF &&
-	rm ${SQ}folder1/0/0/0${SQ}
-	rm ${SQ}folder1/0/1${SQ}
-	rm ${SQ}folder1/a${SQ}
-	EOF
-
-	cat >folder1-sparse <<-EOF &&
-	rm ${SQ}folder1/${SQ}
-	EOF
-
-	# test wildcard
-	run_on_sparse git reset --hard &&
-	run_on_sparse git sparse-checkout reapply &&
-	test_sparse_match test_must_fail git rm folder1/* &&
-	run_on_sparse git rm --sparse folder1/* &&
-	test_cmp folder1-full sparse-checkout-out &&
-	test_cmp folder1-sparse sparse-index-out &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	# test recursive rm
-	run_on_sparse git reset --hard &&
-	run_on_sparse git sparse-checkout reapply &&
-	test_sparse_match test_must_fail git rm --sparse folder1 &&
-	run_on_sparse git rm --sparse -r folder1 &&
-	test_cmp folder1-full sparse-checkout-out &&
-	test_cmp folder1-sparse sparse-index-out &&
-	test_sparse_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 76 - rm pathspec outside sparse definition
-
-expecting success of 1092.77 'rm pathspec expands index when necessary': 
-	init_repos &&
-
-	# in-cone pathspec (do not expand)
-	ensure_not_expanded rm "deep/deep*" &&
-	test_must_be_empty sparse-index-err &&
-
-	# out-of-cone pathspec (expand)
-	! ensure_not_expanded rm --sparse "folder1/a*" &&
-	test_must_be_empty sparse-index-err &&
-
-	# pathspec that should expand index
-	! ensure_not_expanded rm "*/a" &&
-	test_must_be_empty sparse-index-err &&
-
-	! ensure_not_expanded rm "**a" &&
-	test_must_be_empty sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20250209T065410.777209Z-Hcf858c9d-P00185745","thread":"main","time":"2025-02-09T06:54:10.778480Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065410.777209Z-Hcf858c9d-P00185745","thread":"main","time":"2025-02-09T06:54:10.779848Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065410.801906Z-Hcf858c9d-P0018578c","thread":"main","time":"2025-02-09T06:54:10.802901Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065410.801906Z-Hcf858c9d-P0018578c","thread":"main","time":"2025-02-09T06:54:10.804596Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065410.814024Z-Hcf858c9d-P001857be","thread":"main","time":"2025-02-09T06:54:10.814956Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065410.814024Z-Hcf858c9d-P001857be","thread":"main","time":"2025-02-09T06:54:10.816365Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 77 - rm pathspec expands index when necessary
-
-expecting success of 1092.78 'sparse index is not expanded: rm': 
-	init_repos &&
-
-	ensure_not_expanded rm deep/a &&
-
-	# test in-cone wildcard
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm deep/* &&
-
-	# test recursive rm
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm -r deep
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 78 - sparse index is not expanded: rm
-
-expecting success of 1092.79 'grep with and --cached': 
-	init_repos &&
-
-	test_all_match git grep --cached a &&
-	test_all_match git grep --cached a -- "folder1/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 79 - grep with and --cached
-
-expecting success of 1092.80 'grep is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded grep a &&
-	ensure_not_expanded grep a -- deep/* &&
-
-	# All files within the folder1/* pathspec are sparse,
-	# so this command does not find any matches
-	ensure_not_expanded ! grep a -- folder1/* &&
-
-	# test out-of-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "folder1/a" &&
-	ensure_not_expanded grep --cached a -- "folder1/*" &&
-
-	# test in-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "deep/a" &&
-	ensure_not_expanded grep --cached a -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 80 - grep is not expanded
-
-checking known breakage of 1092.81 'grep within submodules is not expanded': 
-	init_repos_as_submodules &&
-
-	# do not use ensure_not_expanded() here, because `grep` should be
-	# run in the superproject, not in "./sparse-index"
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	git grep --cached --recurse-submodules a -- "*/folder1/*" &&
-	test_region ! index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Adding existing repo at 'full-checkout' to the index
-Adding existing repo at 'sparse-checkout' to the index
-Adding existing repo at 'sparse-index' to the index
- 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
-hint: The sparse index is expanding to a full index, a slow operation.
-hint: Your working directory likely has contents that are outside of
-hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
-hint: see your sparse-checkout definition and compare it to your working
-hint: directory contents. Running 'git clean' may assist in this cleanup.
-hint: Disable this message with "git config set advice.sparseIndexExpanded false"
-full-checkout/folder1/a:a
-sparse-checkout/folder1/a:a
-sparse-index/folder1/a:a
-{"event":"region_enter","sid":"20250209T065412.515012Z-Hcf858c9d-P00186af0","thread":"main","time":"2025-02-09T06:54:12.518047Z","file":"sparse-index.c","line":372,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
-not ok 81 - grep within submodules is not expanded # TODO known breakage
-
-expecting success of 1092.82 'grep sparse directory within submodules': 
-	init_repos_as_submodules &&
-
-	cat >expect <<-\EOF &&
-	full-checkout/folder1/a:a
-	sparse-checkout/folder1/a:a
-	sparse-index/folder1/a:a
-	EOF
-	git grep --cached --recurse-submodules a -- "*/folder1/*" >actual &&
-	test_cmp actual expect
-
-warning: unable to rmdir 'full-checkout': Directory not empty
-warning: unable to rmdir 'sparse-checkout': Directory not empty
-warning: unable to rmdir 'sparse-index': Directory not empty
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Adding existing repo at 'full-checkout' to the index
-Adding existing repo at 'sparse-checkout' to the index
-Adding existing repo at 'sparse-index' to the index
- 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
-hint: The sparse index is expanding to a full index, a slow operation.
-hint: Your working directory likely has contents that are outside of
-hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
-hint: see your sparse-checkout definition and compare it to your working
-hint: directory contents. Running 'git clean' may assist in this cleanup.
-hint: Disable this message with "git config set advice.sparseIndexExpanded false"
-ok 82 - grep sparse directory within submodules
-
-expecting success of 1092.83 'write-tree': 
-	init_repos &&
-
-	test_all_match git write-tree &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	# make a change inside the sparse cone
-	run_on_all ../edit-contents deep/a &&
-	test_all_match git update-index deep/a &&
-	test_all_match git write-tree &&
-	test_all_match git status --porcelain=v2 &&
-
-	# make a change outside the sparse cone
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp a folder1/a &&
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git write-tree &&
-	test_all_match git status --porcelain=v2 &&
-
-	# check that SKIP_WORKTREE files are not materialized
-	test_path_is_missing sparse-checkout/folder2/a &&
-	test_path_is_missing sparse-index/folder2/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 83 - write-tree
-
-expecting success of 1092.84 'sparse-index is not expanded: write-tree': 
-	init_repos &&
-
-	ensure_not_expanded write-tree &&
-
-	echo "test1" >>sparse-index/a &&
-	git -C sparse-index update-index a &&
-	ensure_not_expanded write-tree
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 84 - sparse-index is not expanded: write-tree
-
-expecting success of 1092.85 'diff-files with pathspec inside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	run_on_all ../edit-contents deep/a &&
-
-	test_all_match git diff-files &&
-
-	test_all_match git diff-files -- deep/a &&
-
-	# test wildcard
-	test_all_match git diff-files -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 85 - diff-files with pathspec inside sparse definition
-
-expecting success of 1092.86 'diff-files with pathspec outside sparse definition': 
-	init_repos &&
-
-	test_sparse_match git diff-files -- folder2/a &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	# The directory "folder1" is outside the cone of interest
-	# and will not exist in the sparse checkout repositories.
-	# Create it as needed, add file "folder1/a" there with
-	# contents that is different from the staged version.
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp a folder1/a &&
-
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git diff-files &&
-	test_all_match git diff-files -- folder1/a &&
-	test_all_match git diff-files -- "folder*/a"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 86 - diff-files with pathspec outside sparse definition
-
-expecting success of 1092.87 'sparse index is not expanded: diff-files': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	run_on_all ../edit-contents deep/a &&
-
-	ensure_not_expanded diff-files &&
-	ensure_not_expanded diff-files -- deep/a &&
-	ensure_not_expanded diff-files -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 87 - sparse index is not expanded: diff-files
-
-expecting success of 1092.88 'diff-tree': 
-	init_repos &&
-
-	# Test change inside sparse cone
-	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
-	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
-	test_all_match git diff-tree $tree1 $tree2 &&
-	test_all_match git diff-tree $tree1 $tree2 -- deep/a &&
-	test_all_match git diff-tree HEAD update-deep &&
-	test_all_match git diff-tree HEAD update-deep -- deep/a &&
-
-	# Test change outside sparse cone
-	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
-	test_all_match git diff-tree $tree1 $tree3 &&
-	test_all_match git diff-tree $tree1 $tree3 -- folder1/a &&
-	test_all_match git diff-tree HEAD update-folder1 &&
-	test_all_match git diff-tree HEAD update-folder1 -- folder1/a &&
-
-	# Check that SKIP_WORKTREE files are not materialized
-	test_path_is_missing sparse-checkout/folder1/a &&
-	test_path_is_missing sparse-index/folder1/a &&
-	test_path_is_missing sparse-checkout/folder2/a &&
-	test_path_is_missing sparse-index/folder2/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 88 - diff-tree
-
-expecting success of 1092.89 'sparse-index is not expanded: diff-tree': 
-	init_repos &&
-
-	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
-	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
-	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
-
-	ensure_not_expanded diff-tree $tree1 $tree2 &&
-	ensure_not_expanded diff-tree $tree1 $tree2 -- deep/a &&
-	ensure_not_expanded diff-tree HEAD update-deep &&
-	ensure_not_expanded diff-tree HEAD update-deep -- deep/a &&
-	ensure_not_expanded diff-tree $tree1 $tree3 &&
-	ensure_not_expanded diff-tree $tree1 $tree3 -- folder1/a &&
-	ensure_not_expanded diff-tree HEAD update-folder1 &&
-	ensure_not_expanded diff-tree HEAD update-folder1 -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 89 - sparse-index is not expanded: diff-tree
-
-expecting success of 1092.90 'worktree': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	for repo in full-checkout sparse-checkout sparse-index
-	do
-		worktree=${repo}-wt &&
-		git -C $repo worktree add ../$worktree &&
-
-		# Compare worktree content with "ls"
-		(cd $repo && ls) >worktree_contents &&
-		(cd $worktree && ls) >new_worktree_contents &&
-		test_cmp worktree_contents new_worktree_contents &&
-
-		# Compare index content with "ls-files --sparse"
-		git -C $repo ls-files --sparse >index_contents &&
-		git -C $worktree ls-files --sparse >new_index_contents &&
-		test_cmp index_contents new_index_contents &&
-
-		git -C $repo worktree remove ../$worktree || return 1
-	done &&
-
-	test_all_match git worktree add .worktrees/hotfix &&
-	run_on_all ../edit-contents .worktrees/hotfix/deep/a &&
-	test_all_match test_must_fail git worktree remove .worktrees/hotfix
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'full-checkout-wt')
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'sparse-checkout-wt')
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'sparse-index-wt')
-HEAD is now at 703fd3e initial commit
-ok 90 - worktree
-
-expecting success of 1092.91 'worktree is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded worktree add .worktrees/hotfix &&
-	ensure_not_expanded worktree remove .worktrees/hotfix
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 91 - worktree is not expanded
-
-expecting success of 1092.92 'check-attr with pathspec inside sparse definition': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_all cp ../.gitattributes ./deep &&
-
-	test_all_match git check-attr -a -- deep/a &&
-
-	test_all_match git add deep/.gitattributes &&
-	test_all_match git check-attr -a --cached -- deep/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 92 - check-attr with pathspec inside sparse definition
-
-expecting success of 1092.93 'check-attr with pathspec outside sparse definition': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_sparse mkdir folder1 &&
-	run_on_all cp ../.gitattributes ./folder1 &&
-	run_on_all cp a folder1/a &&
-
-	test_all_match git check-attr -a -- folder1/a &&
-
-	git -C full-checkout add folder1/.gitattributes &&
-	test_sparse_match git add --sparse folder1/.gitattributes &&
-	test_all_match git commit -m "add .gitattributes" &&
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git check-attr -a --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 93 - check-attr with pathspec outside sparse definition
-
-checking known breakage of 1092.94 'diff --check with pathspec outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo "a " >"$1"
-	EOF
-
-	test_all_match git config core.whitespace -trailing-space,-space-before-tab &&
-
-	echo "a whitespace=trailing-space,space-before-tab" >>.gitattributes &&
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp ../.gitattributes ./folder1 &&
-	test_all_match git add --sparse folder1/.gitattributes &&
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git add --sparse folder1/a &&
-
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match test_must_fail git diff --check --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-test_must_fail: command succeeded: git diff --check --cached -- folder1/a
-not ok 94 - diff --check with pathspec outside sparse definition # TODO known breakage
-
-expecting success of 1092.95 'sparse-index is not expanded: check-attr': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	mkdir ./sparse-index/folder1 &&
-	cp ./sparse-index/a ./sparse-index/folder1/a &&
-	cp .gitattributes ./sparse-index/deep &&
-	cp .gitattributes ./sparse-index/folder1 &&
-
-	git -C sparse-index add deep/.gitattributes &&
-	git -C sparse-index add --sparse folder1/.gitattributes &&
-	ensure_not_expanded check-attr -a --cached -- deep/a &&
-	ensure_not_expanded check-attr -a --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 95 - sparse-index is not expanded: check-attr
-
-expecting success of 1092.96 'advice.sparseIndexExpanded': 
-	init_repos &&
-
-	git -C sparse-index config --unset advice.sparseIndexExpanded &&
-	git -C sparse-index sparse-checkout set deep/deeper1 &&
-	mkdir -p sparse-index/deep/deeper2/deepest &&
-	touch sparse-index/deep/deeper2/deepest/bogus &&
-	git -C sparse-index status 2>err &&
-	grep "The sparse index is expanding to a full index" err &&
-
-	git -C sparse-index sparse-checkout disable 2>err &&
-	test_line_count = 0 err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-On branch base
-You are in a sparse checkout with 49% of tracked files present.
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	deep/deeper2/deepest/
-
-nothing added to commit but untracked files present (use "git add" to track)
-hint: The sparse index is expanding to a full index, a slow operation.
-ok 96 - advice.sparseIndexExpanded
-
-expecting success of 1092.97 'cat-file -p': 
-	init_repos &&
-	echo "new content" >>full-checkout/deep/a &&
-	echo "new content" >>sparse-checkout/deep/a &&
-	echo "new content" >>sparse-index/deep/a &&
-	run_on_all git add deep/a &&
-
-	test_all_match git cat-file -p :deep/a &&
-	ensure_not_expanded cat-file -p :deep/a &&
-	test_all_match git cat-file -p :folder1/a &&
-	ensure_expanded cat-file -p :folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20250209T065418.952278Z-Hcf858c9d-P0018a8c5","thread":"main","time":"2025-02-09T06:54:18.953276Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065418.952278Z-Hcf858c9d-P0018a8c5","thread":"main","time":"2025-02-09T06:54:18.954584Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.001308,"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":"20250209T065419.143000Z-Hcf858c9d-P0018acfc","thread":"main","time":"2025-02-09T06:54:19.143934Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065419.143000Z-Hcf858c9d-P0018acfc","thread":"main","time":"2025-02-09T06:54:19.144749Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000814,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065419.181516Z-Hcf858c9d-P0018ada9","thread":"main","time":"2025-02-09T06:54:19.182598Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065419.181516Z-Hcf858c9d-P0018ada9","thread":"main","time":"2025-02-09T06:54:19.183376Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000779,"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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3431-rebase-fork-point.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3431-rebase-fork-point/.git/
-expecting success of 3431.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	git branch -t side &&
-	git reset --hard HEAD^ &&
-	test_commit D &&
-	test_commit E &&
-	git checkout side &&
-	test_commit F &&
-	test_commit G
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-branch 'side' set up to track 'main'.
-HEAD is now at d9df450 B
-[main 3e6e33e] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[main dc25130] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-[side f231f7a] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[side d8775ba] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-ok 1 - setup
-
-expecting success of 3431.2 'git rebase ': do_test_rebase 'G F E D B A' 
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 2 - git rebase 
-
-expecting success of 3431.3 'git rebase --onto D': do_test_rebase 'G F D B A' --onto D
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 3 - git rebase --onto D
-
-expecting success of 3431.4 'git rebase --keep-base': do_test_rebase 'G F C B A' --keep-base
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 4 - git rebase --keep-base
-
-expecting success of 3431.5 'git rebase --no-fork-point': do_test_rebase 'G F C E D B A' --no-fork-point
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 5 - git rebase --no-fork-point
-
-expecting success of 3431.6 'git rebase --no-fork-point --onto D': do_test_rebase 'G F C D B A' --no-fork-point --onto D
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 6 - git rebase --no-fork-point --onto D
-
-expecting success of 3431.7 'git rebase --no-fork-point --keep-base': do_test_rebase 'G F C B A' --no-fork-point --keep-base
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 7 - git rebase --no-fork-point --keep-base
-
-expecting success of 3431.8 'git rebase --fork-point refs/heads/main': do_test_rebase 'G F E D B A' --fork-point refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 8 - git rebase --fork-point refs/heads/main
-
-expecting success of 3431.9 'git rebase --fork-point main': do_test_rebase 'G F E D B A' --fork-point main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 9 - git rebase --fork-point main
-
-expecting success of 3431.10 'git rebase --fork-point --onto D refs/heads/main': do_test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 10 - git rebase --fork-point --onto D refs/heads/main
-
-expecting success of 3431.11 'git rebase --fork-point --onto D main': do_test_rebase 'G F D B A' --fork-point --onto D main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 11 - git rebase --fork-point --onto D main
-
-expecting success of 3431.12 'git rebase --fork-point --keep-base refs/heads/main': do_test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 12 - git rebase --fork-point --keep-base refs/heads/main
-
-expecting success of 3431.13 'git rebase --fork-point --keep-base main': do_test_rebase 'G F B A' --fork-point --keep-base main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 13 - git rebase --fork-point --keep-base main
-
-expecting success of 3431.14 'git rebase refs/heads/main': do_test_rebase 'G F C E D B A' refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 14 - git rebase refs/heads/main
-
-expecting success of 3431.15 'git rebase main': do_test_rebase 'G F C E D B A' main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 15 - git rebase main
-
-expecting success of 3431.16 'git rebase --onto D refs/heads/main': do_test_rebase 'G F C D B A' --onto D refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 16 - git rebase --onto D refs/heads/main
-
-expecting success of 3431.17 'git rebase --onto D main': do_test_rebase 'G F C D B A' --onto D main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 17 - git rebase --onto D main
-
-expecting success of 3431.18 'git rebase --keep-base refs/heads/main': do_test_rebase 'G F C B A' --keep-base refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 18 - git rebase --keep-base refs/heads/main
-
-expecting success of 3431.19 'git rebase --keep-base main': do_test_rebase 'G F C B A' --keep-base main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 19 - git rebase --keep-base main
-
-expecting success of 3431.20 'git rebase --fork-point with ambiguous refname': 
-	git checkout main &&
-	git checkout -b one &&
-	git checkout side &&
-	git tag one &&
-	test_must_fail git rebase --fork-point --onto D one
-
-Switched to branch 'main'
-Switched to a new branch 'one'
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-warning: refname 'one' is ambiguous.
-fatal: Ambiguous refname: 'one'
-ok 20 - git rebase --fork-point with ambiguous refname
-
-expecting success of 3431.21 '--fork-point and --root both given': 
-	test_must_fail git rebase --fork-point --root 2>err &&
-	test_grep "cannot be used together" err
-
-fatal: options '--root' and '--fork-point' cannot be used together
-ok 21 - --fork-point and --root both given
-
-expecting success of 3431.22 'rebase.forkPoint set to false': 
-	test_config rebase.forkPoint false &&
-	do_test_rebase "G F C E D B A"
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 22 - rebase.forkPoint set to false
-
-expecting success of 3431.23 'rebase.forkPoint set to false and then to true': 
-	test_config_global rebase.forkPoint false &&
-	test_config rebase.forkPoint true &&
-	do_test_rebase "G F E D B A"
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 23 - rebase.forkPoint set to false and then to true
-
-expecting success of 3431.24 'rebase.forkPoint set to false and command line says --fork-point': 
-	test_config rebase.forkPoint false &&
-	do_test_rebase "G F E D B A" --fork-point
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 24 - rebase.forkPoint set to false and command line says --fork-point
-
-expecting success of 3431.25 'rebase.forkPoint set to true and command line says --no-fork-point': 
-	test_config rebase.forkPoint true &&
-	do_test_rebase "G F C E D B A" --no-fork-point
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 25 - rebase.forkPoint set to true and command line says --no-fork-point
-
-expecting success of 3431.26 'rebase.forkPoint set to true and --root given': 
-	test_config rebase.forkPoint true &&
-	git rebase --root
-
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/side.
-ok 26 - rebase.forkPoint set to true and --root given
-
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3435-rebase-gpg-sign.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3434-rebase-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3434-rebase-i18n/.git/
-expecting success of 3434.1 'setup': 
-	test_commit one &&
-	git branch first &&
-	test_commit two &&
-	git switch first &&
-	test_commit three &&
-	git branch second &&
-	test_commit four &&
-	git switch second &&
-	test_commit five &&
-	test_commit six
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to branch 'first'
-[first 897c206] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[first 6f2ec4d] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-Switched to branch 'second'
-[second e2eded9] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-[second 666e62f] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-ok 1 - setup
-
-expecting success of 3434.2 'rebase --rebase-merges update encoding eucJP to UTF-8': 
-	git switch -c merge-eucJP-UTF-8 first &&
-	git config i18n.commitencoding eucJP &&
-	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
-	git config i18n.commitencoding UTF-8 &&
-	git rebase --rebase-merges main &&
-	compare_msg eucJP.txt eucJP UTF-8
-
-Switched to a new branch 'merge-eucJP-UTF-8'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- six.t  | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 five.t
- create mode 100644 six.t
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Successfully rebased and updated refs/heads/merge-eucJP-UTF-8.
-ok 2 - rebase --rebase-merges update encoding eucJP to UTF-8
-
-expecting success of 3434.3 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP': 
-	git switch -c merge-eucJP-ISO-2022-JP first &&
-	git config i18n.commitencoding eucJP &&
-	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
-	git config i18n.commitencoding ISO-2022-JP &&
-	git rebase --rebase-merges main &&
-	compare_msg eucJP.txt eucJP ISO-2022-JP
-
-Switched to a new branch 'merge-eucJP-ISO-2022-JP'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- six.t  | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 five.t
- create mode 100644 six.t
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Successfully rebased and updated refs/heads/merge-eucJP-ISO-2022-JP.
-ok 3 - rebase --rebase-merges update encoding eucJP to ISO-2022-JP
-
-expecting success of 3434.4 'rebase --continue update from ISO-8859-1 to UTF-8': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace -s <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
-	
-fatal: no rebase in progress
-Switched to a new branch 'conflict-ISO-8859-1-UTF-8'
-[conflict-ISO-8859-1-UTF-8 7f6df7e] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 7f6df7e... ÄËÑ�Ö
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 7f6df7e... ÄËÑ�Ö
-[detached HEAD 2d1ef83] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflict-ISO-8859-1-UTF-8.
-ok 4 - rebase --continue update from ISO-8859-1 to UTF-8
-
-expecting success of 3434.5 'rebase --continue update from eucJP to UTF-8': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace -s <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
-	
-fatal: no rebase in progress
-Switched to a new branch 'conflict-eucJP-UTF-8'
-[conflict-eucJP-UTF-8 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 4850d3a... �れ���
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 4850d3a... �れ���
-[detached HEAD 52bcbd9] �れ���
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflict-eucJP-UTF-8.
-ok 5 - rebase --continue update from eucJP to UTF-8
-
-expecting success of 3434.6 'rebase --continue update from eucJP to ISO-2022-JP': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace -s <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
-	
-fatal: no rebase in progress
-Switched to a new branch 'conflict-eucJP-ISO-2022-JP'
-[conflict-eucJP-ISO-2022-JP 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 4850d3a... ?$B$O$l$R$[$U?(B
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 4850d3a... $B$O$l$R$[$U
-[detached HEAD d0ef7c0] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflict-eucJP-ISO-2022-JP.
-ok 6 - rebase --continue update from eucJP to ISO-2022-JP
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3438-rebase-broken-files.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ok 902 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf
 
-expecting success of 3438.2 'detect missing GIT_AUTHOR_NAME': 
-		create_conflict &&
+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
 
-		grep -v $item .git/rebase-merge/author-script >tmp &&
-		mv tmp .git/rebase-merge/author-script &&
+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
 
-		check_resolve_fails
+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
 	
-Switched to a new branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: missing 'GIT_AUTHOR_NAME'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
+ok 905 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-  git commit --amend 
+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
 
-If they are meant to go into a new commit, run:
+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
 
-  git commit 
+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
 
-In both cases, once you're done, continue with:
+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
 
-  git rebase --continue
+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
 
-error: could not commit staged changes.
-ok 2 - detect missing GIT_AUTHOR_NAME
+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
 
-expecting success of 3438.3 'detect missing GIT_AUTHOR_EMAIL': 
-		create_conflict &&
+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
 
-		grep -v $item .git/rebase-merge/author-script >tmp &&
-		mv tmp .git/rebase-merge/author-script &&
+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
 
-		check_resolve_fails
+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
 	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: missing 'GIT_AUTHOR_EMAIL'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
+ok 914 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf
 
-  git commit --amend 
+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
 
-If they are meant to go into a new commit, run:
+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
 
-  git commit 
+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
 
-In both cases, once you're done, continue with:
+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
 
-  git rebase --continue
+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
 
-error: could not commit staged changes.
-ok 3 - detect missing GIT_AUTHOR_EMAIL
+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 3438.4 'detect missing GIT_AUTHOR_DATE': 
-		create_conflict &&
+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
 
-		grep -v $item .git/rebase-merge/author-script >tmp &&
-		mv tmp .git/rebase-merge/author-script &&
+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
 
-		check_resolve_fails
-	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: missing 'GIT_AUTHOR_DATE'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
+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
 
-  git commit --amend 
+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
 
-If they are meant to go into a new commit, run:
+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
 
-  git commit 
+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
 
-In both cases, once you're done, continue with:
+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
 
-  git rebase --continue
+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
 
-error: could not commit staged changes.
-ok 4 - detect missing GIT_AUTHOR_DATE
+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 3438.5 'detect duplicate GIT_AUTHOR_NAME': 
-		create_conflict &&
+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
 
-		grep -i $item .git/rebase-merge/author-script >tmp &&
-		cat tmp >>.git/rebase-merge/author-script &&
+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
 
-		check_resolve_fails
+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
 	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: 'GIT_AUTHOR_NAME' already given
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
+ok 932 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-  git commit --amend 
+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
 
-If they are meant to go into a new commit, run:
+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
 
-  git commit 
+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
 
-In both cases, once you're done, continue with:
+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
 
-  git rebase --continue
+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
 
-error: could not commit staged changes.
-ok 5 - detect duplicate GIT_AUTHOR_NAME
+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
 
-expecting success of 3438.6 'detect duplicate GIT_AUTHOR_EMAIL': 
-		create_conflict &&
+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
 
-		grep -i $item .git/rebase-merge/author-script >tmp &&
-		cat tmp >>.git/rebase-merge/author-script &&
+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
 
-		check_resolve_fails
+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
 	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: 'GIT_AUTHOR_EMAIL' already given
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
+ok 941 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-  git commit --amend 
+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
 
-If they are meant to go into a new commit, run:
+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
 
-  git commit 
+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
 
-In both cases, once you're done, continue with:
+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
 
-  git rebase --continue
+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
 
-error: could not commit staged changes.
-ok 6 - detect duplicate GIT_AUTHOR_EMAIL
+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
 
-expecting success of 3438.7 'detect duplicate GIT_AUTHOR_DATE': 
-		create_conflict &&
+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
 
-		grep -i $item .git/rebase-merge/author-script >tmp &&
-		cat tmp >>.git/rebase-merge/author-script &&
+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
 
-		check_resolve_fails
+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
 	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: 'GIT_AUTHOR_DATE' already given
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
+ok 950 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf
 
-If they are meant to go into a new commit, run:
+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
 
-  git commit 
+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
 
-In both cases, once you're done, continue with:
+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
 
-  git rebase --continue
+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
 
-error: could not commit staged changes.
-ok 7 - detect duplicate GIT_AUTHOR_DATE
+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
 
-expecting success of 3438.8 'unknown key in author-script': 
-	create_conflict &&
+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
 
-	echo "GIT_AUTHOR_BOGUS=${SQ}whatever${SQ}" \
-		>>.git/rebase-merge/author-script &&
+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
 
-	check_resolve_fails
+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
 
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: unknown variable 'GIT_AUTHOR_BOGUS'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
+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
 
-  git commit --amend 
+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
 
-If they are meant to go into a new commit, run:
+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
 
-  git commit 
+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
 
-In both cases, once you're done, continue with:
+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
 
-  git rebase --continue
+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
 
-error: could not commit staged changes.
-ok 8 - unknown key in author-script
+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
 
-checking prerequisite: SANITY
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+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
 
-	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.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
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+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
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+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
 
-)
-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 &&
+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
 
-	git checkout -b side HEAD^ &&
-	test_commit unrelated &&
-	test_must_fail git rebase --apply --onto tmp HEAD^
+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
 
-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
+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
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3436-rebase-more-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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" &&
+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
 
-	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 &&
+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
 
-	git checkout --orphan main &&
-	rm foo &&
-	test_write_lines "line 1" "        line 2" "line 3" >file &&
-	git commit -am "add file" &&
-	git tag main &&
+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
 
-	mkdir test-bin &&
-	write_script test-bin/git-merge-test <<-\EOF
-	exec git merge-recursive "$@"
-	EOF
+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
 
-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 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 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
+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
 
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-3ada4af add file
-virtual update file
-found 1 common ancestor:
-virtual cea075e2ce716201e60e4bbadc9a40706c56c362
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-ok 2 - --ignore-whitespace works with apply backend
+expecting success of 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 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
+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
 
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 139b464... update file
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 139b464... update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 3 - --ignore-whitespace works with merge backend
+expecting success of 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 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
+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
 
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-rebase -i script before editing:
-pick 139b464 update file
+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
 
-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 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
 
-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
+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
+		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
 
-[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 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 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
+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
 
-[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 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 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
+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
 
-[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
+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
 
-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 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
 
-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
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  5c38296 edited
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 5c38296
+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
 
-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 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
 
-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
+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
 
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
+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
 
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
+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
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> aa07736
+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
 
-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 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
 
-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
+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
 
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
+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
 
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
+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
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> aa07736
+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
 
-HEAD is now at bd08fd4 commit2
-[detached HEAD 832d950] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
-error: could not apply 832d950... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 832d950... commit2
-[detached HEAD 3bf7cf9] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Successfully rebased and updated detached HEAD.
-ok 10 - --committer-date-is-author-date works when committing conflict resolution
+expecting success of 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
 
-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
+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
 
-[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 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
 
-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
+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
 
-[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 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
 
-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
+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
 
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-[detached HEAD ebf54fb] 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 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
 
-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
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  ebf54fb commit2
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> ebf54fb
+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
 
-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 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
 
-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
+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
 
-Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-Updated 1 path from the index
-[detached HEAD 6982a65] 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 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
 
-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
+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
 
-[detached HEAD 8c7514d] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick 8c7514d commit3
+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
 
-rebase -i script after editing:
-reword 8c7514d commit3
-Rebasing (1/1)
[detached HEAD e80aeba] edited
- Author: A U Thor <author@example.com>
- Date: Sun Feb 9 06:54:20 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 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
 
-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 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
 
-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
+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
 
-[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 9d894c5] 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 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
 
-expecting success of 3436.19 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+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 19 - $EDITOR and friends are unchanged
+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
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3433-rebase-across-mode-change.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+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
 
-	git branch side1 &&
-	git branch side2 &&
+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
 
-	git checkout side1 &&
-	git rm -rf DS &&
-	test_ln_s_add unrelated DS &&
-	git commit -m side1 &&
+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
 
-	git checkout side2 &&
-	>unrelated &&
-	git add unrelated &&
-	git commit -m commit1 &&
+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
 
-	echo >>unrelated &&
-	git commit -am commit2
+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
 
-[master (root-commit) ba9279b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 DS/whatever
-Switched to branch 'side1'
-rm 'DS/whatever'
-checking prerequisite: SYMLINKS
+expecting success of 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
 
-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.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
 
-)
-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 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 3433.2 'rebase changes with the apply backend': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b apply-backend side2 &&
-	git rebase side1
+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
 
-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 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 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
+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
 
-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 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 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
+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
 
-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
+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
+	
+ok 1046 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3437-rebase-fixup-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+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 1047 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF
 
-	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 &&
+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 1048 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-	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 &&
+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 1049 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-	GIT_AUTHOR_NAME="Rebase Author" &&
-	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
-	GIT_COMMITTER_NAME="Rebase Committer" &&
-	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
+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 1050 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-[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 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 1051 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-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"
+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 1052 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-HEAD is now at 34b9ec4 A2
-rebase -i script before editing:
-pick 24547d2 amend! B
-pick 34b9ec4 A2
+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
 
-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 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
 
-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
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  9e14115 A2
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
+	
+ok 1058 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf
 
- git branch <new-branch-name> 9e14115
+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 1059 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF
 
-HEAD is now at 34b9ec4 A2
-rebase -i script before editing:
-pick 24547d2 amend! B
-pick 34b9ec4 A2
+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 1060 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-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 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 1061 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-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
+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 1062 - checkout attr=auto  aeol= core.autocrlf=input 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.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 1063 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-  e21ffe9 A2
+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 1064 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> e21ffe9
+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
 
-HEAD is now at 24547d2 amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
+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
 
-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 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 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
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
+	
+ok 1070 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native
 
-  b96345a new subject
+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 1071 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1072 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF
 
- git branch <new-branch-name> b96345a
+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 1073 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-HEAD is now at 24547d2 amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
+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 1074 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-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 set 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 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 1075 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 3437.6 'conflicting fixup -C after fixup with custom comment string': 
-	test_config core.commentString COMMENT &&
-	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 &&
-	echo resolved >A &&
-	git add A &&
-	FAKE_COMMIT_AMEND=edited git rebase --continue &&
-	test_commit_message HEAD <<-\EOF
-	A3
+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 1076 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
 
-	edited
-	EOF
+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 1077 - setup LF checkout  with -c core.eol=native
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1078 - setup CRLF checkout  with -c core.eol=native
 
-  df4c993 new subject
+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 1079 - setup LF_mix_CR checkout  with -c core.eol=native
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1080 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
- git branch <new-branch-name> df4c993
+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 1081 - setup LF_nul checkout  with -c core.eol=native
 
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
+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
+		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 1082 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native
 
-COMMENT Rebase e45ed32..fc6fe24 onto e45ed32 (4 commands)
-COMMENT
-COMMENT Commands:
-COMMENT p, pick <commit> = use commit
-COMMENT r, reword <commit> = use commit, but edit the commit message
-COMMENT e, edit <commit> = use commit, but stop for amending
-COMMENT s, squash <commit> = use commit, but meld into previous commit
-COMMENT f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
-COMMENT                    commit's log message, unless -C is used, in which case
-COMMENT                    keep only this commit's message; -c is same as -C but
-COMMENT                    opens the editor
-COMMENT x, exec <command> = run command (the rest of the line) using shell
-COMMENT b, break = stop here (continue rebase later with 'git rebase --continue')
-COMMENT d, drop <commit> = remove commit
-COMMENT l, label <label> = label current HEAD with a name
-COMMENT t, reset <label> = reset HEAD to a label
-COMMENT m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
-COMMENT         create a merge commit using the original merge commit's
-COMMENT         message (or the oneline, if no original merge commit was
-COMMENT         specified); use -c <commit> to reword the commit message
-COMMENT u, update-ref <ref> = track a placeholder for the <ref> to be updated
-COMMENT                       to this position in the new commits. The <ref> is
-COMMENT                       updated at the end of the rebase
-COMMENT
-COMMENT These lines can be re-ordered; they are executed from top to bottom.
-COMMENT
-COMMENT If you remove a line here THAT COMMIT WILL BE LOST.
-COMMENT
-COMMENT However, if you remove everything, the rebase will be aborted.
-COMMENT
-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 set advice.mergeConflict false"
-Could not apply fc6fe24... A3
-[detached HEAD ebea504] 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 6 - conflicting fixup -C after fixup with custom comment string
+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 1083 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 3437.7 '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"
+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 1084 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1085 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-  ebea504 A3
+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 1086 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1087 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
- git branch <new-branch-name> ebea504
+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 1088 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
+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 1089 - setup LF checkout  with -c core.eol=native
 
-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 set 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 7 - skipping fixup -C after fixup gives correct message
+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 1090 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 3437.8 '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
+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 1091 - setup LF_mix_CR checkout  with -c core.eol=native
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1092 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-  e650b85 B
+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 1093 - setup LF_nul checkout  with -c core.eol=native
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
+		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 1094 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native
 
- git branch <new-branch-name> e650b85
+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 1095 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-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
+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 1096 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-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 8 - sequence of fixup, fixup -C & squash --signoff works
+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 1097 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 3437.9 '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
+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 1098 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1099 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-  93e1c61 B
+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 1100 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1101 - setup LF checkout  with -c core.eol=native
 
- git branch <new-branch-name> 93e1c61
+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 1102 - setup CRLF checkout  with -c core.eol=native
 
-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
+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 1103 - setup LF_mix_CR checkout  with -c core.eol=native
 
-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 9 - first fixup -C commented out in sequence fixup fixup -C fixup -C
+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 1104 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 3437.10 '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
+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 1105 - setup LF_nul checkout  with -c core.eol=native
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
+		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 1106 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native
 
-  8566dee B
+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 1107 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1108 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
- git branch <new-branch-name> 8566dee
+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 1109 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
+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 1110 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-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 10 - multiple fixup -c opens editor once
+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 1111 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 3437.11 '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
+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 1112 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1113 - setup LF checkout  with -c core.eol=native
 
-  68e48e4 A3
+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 1114 - setup CRLF checkout  with -c core.eol=native
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1115 - setup LF_mix_CR checkout  with -c core.eol=native
 
- git branch <new-branch-name> 68e48e4
+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 1116 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
+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 1117 - setup LF_nul checkout  with -c core.eol=native
 
-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 11 - sequence squash, fixup & fixup -c gives combined message
+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
+		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 1118 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native
 
-expecting success of 3437.12 '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
+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 1119 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1120 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-  0a304e5 B
+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 1121 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1122 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
- git branch <new-branch-name> 0a304e5
+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 1123 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-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 12 - fixup -C works upon --autosquash with amend!
+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 1124 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 3437.13 '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
+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 1125 - setup LF checkout  with -c core.eol=native
 
-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 13 - fixup -[Cc]<commit> works
+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 1126 - setup CRLF checkout  with -c core.eol=native
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3500-cherry.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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." &&
+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 1127 - setup LF_mix_CR checkout  with -c core.eol=native
 
-	git checkout -b my-topic-branch &&
+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 1128 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-	echo Second > B &&
-	git update-index --add B &&
-	test_tick &&
-	git commit -m "Add B." &&
+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 1129 - setup LF_nul checkout  with -c core.eol=native
 
-	echo AnotherSecond > C &&
-	git update-index --add C &&
-	test_tick &&
-	git commit -m "Add C." &&
+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
+		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 1130 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native
 
-	git checkout -f main &&
-	rm -f B C &&
+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 1131 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF
 
-	echo Third >> A &&
-	git update-index A &&
-	test_tick &&
-	git commit -m "Modify A." &&
+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 1132 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
+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 1133 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-[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 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 1134 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-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) )" : "+ [^ ]*"
+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 1135 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-42
-ok 2 - check that cherry with limit returns only the top patch
+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 1136 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-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) )" : "+ [^ ]* - .*"
+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 1137 - setup LF checkout  with -c core.eol=native
 
-[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 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 1138 - setup CRLF checkout  with -c core.eol=native
 
-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 &&
+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 1139 - setup LF_mix_CR checkout  with -c core.eol=native
 
-	# 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 &&
+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 1140 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-	# A further change.  Should not match upstream.
-	test_commit change file &&
-	git log --format="+ %H" -1 >>expect &&
+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 1141 - setup LF_nul checkout  with -c core.eol=native
 
-	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
+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
+		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 1142 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native
 
-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
+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 1143 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3303-notes-subtrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3303-notes-subtrees/.git/
-expecting success of 3303.1 'setup: create 100 commits': 
+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 1144 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-	(
-		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.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 1145 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-M 644 inline file
-data <<EOF
-file in commit #$nr
-EOF
+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 1146 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-INPUT_END
+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 1147 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-		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.1148 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1148 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-deleteall
+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 1149 - setup LF checkout  with -c core.eol=native
 
-INPUT_END
+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 1150 - setup CRLF checkout  with -c core.eol=native
 
-	) |
-	git fast-import --quiet &&
-	git config core.notesRef refs/notes/commits
+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 1151 - setup LF_mix_CR checkout  with -c core.eol=native
 
-ok 1 - setup: create 100 commits
+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 1152 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-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.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 1153 - setup LF_nul checkout  with -c core.eol=native
 
-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.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
+		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 1154 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native
 
-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.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 1155 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=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.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 1156 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-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.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 1157 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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.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 1158 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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.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 1159 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-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.1160 'setup config for checkout attr=-text ident= aeol=lf 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
 
-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.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 1161 - setup LF checkout  with -c core.eol=native
 
-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.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 1162 - setup CRLF checkout  with -c core.eol=native
 
-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.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 1163 - setup LF_mix_CR checkout  with -c core.eol=native
 
-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.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 1164 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-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.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 1165 - setup LF_nul checkout  with -c core.eol=native
 
-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.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
+		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 1166 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native
 
-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.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 1167 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=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.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 1168 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-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.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 1169 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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.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 1170 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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.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 1171 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-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.1172 'setup config for checkout attr=-text ident= aeol=crlf 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
 
-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.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 1173 - setup LF checkout  with -c core.eol=native
 
-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.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 1174 - setup CRLF checkout  with -c core.eol=native
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3311-notes-merge-fanout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3311-notes-merge-fanout/.git/
-expecting success of 3311.1 'setup a few initial commits with notes (notes ref: x)': 
-	git config core.notesRef refs/notes/x &&
-	for i in 1 2 3 4 5
-	do
-		test_commit "commit$i" >/dev/null &&
-		git notes add -m "notes for commit$i" || return 1
-	done &&
+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 1175 - setup LF_mix_CR checkout  with -c core.eol=native
 
-	git log --format=oneline &&
+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 1176 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-	test_oid_cache <<-EOF
-	hash05a sha1:aed91155c7a72c2188e781fdf40e0f3761b299db
-	hash04a sha1:99fab268f9d7ee7b011e091a436c78def8eeee69
-	hash03a sha1:953c20ae26c7aa0b428c20693fe38bc687f9d1a9
-	hash02a sha1:6358796131b8916eaa2dde6902642942a1cb37e1
-	hash01a sha1:b02d459c32f0e68f2fe0981033bb34f38776ba47
-	hash03b sha1:9f506ee70e20379d7f78204c77b334f43d77410d
-	hash02b sha1:23a47d6ea7d589895faf800752054818e1e7627b
+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 1177 - setup LF_nul checkout  with -c core.eol=native
 
-	hash05a sha256:3aae5d26619d96dba93795f66325716e4cbc486884f95a6adee8fb0615a76d12
-	hash04a sha256:07e43dd3d89fe634d3252e253b426aacc7285a995dcdbcf94ac284060a1122cf
-	hash03a sha256:26fb52eaa7f4866bf735254587be7b31209ec10e525912ffd8e8ba549ba892ff
-	hash02a sha256:b57ebdf23634e750dcbc4b9a37991d70f90830d568a0e4529ce9de0a3f8d605c
-	hash01a sha256:377903b1572bd5117087a5518fcb1011b5053cccbc59e3c7c823a8615204173b
-	hash03b sha256:04e7b392fda7c185bfa17c9179b56db732edc2dc2b3bf887308dcaabb717270d
-	hash02b sha256:66099aaaec49a485ed990acadd9a9b81232ea592079964113d8f581ff69ef50b
-	EOF
+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
+		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 1178 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
 
-f6db73397fcc379ea00d1fc17a35abb42027a69a commit5
-157e8cc0aeac5befb302d276f2e706112bf6e413 commit4
-e0851358fb6b4703f23d74ef964bc4491bec7ab9 commit3
-94955c5cd7e5662c6ab40c323ecdfac458c47435 commit2
-ef004cfa88883bb87e030b6196934dd90e3548d2 commit1
-ok 1 - setup a few initial commits with notes (notes ref: x)
+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 1179 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 3311.2 'sanity check (x)': 
-	verify_notes x commit5 &&
-	verify_no_fanout x
+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 1180 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
-157e8cc0aeac5befb302d276f2e706112bf6e413
-94955c5cd7e5662c6ab40c323ecdfac458c47435
-e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ef004cfa88883bb87e030b6196934dd90e3548d2
-f6db73397fcc379ea00d1fc17a35abb42027a69a
-ok 2 - sanity check (x)
+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 1181 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 3311.3 'Add a few hundred commits w/notes to trigger fanout (x -> y)': 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	test_commit_bulk --start=6 --id=commit $((num - 5)) &&
-	i=0 &&
-	while test $i -lt $((num - 5))
-	do
-		git notes add -m "notes for commit$i" HEAD~$i || return 1
-		i=$((i + 1))
-	done &&
-	test "$(git rev-parse refs/notes/y)" != "$(git rev-parse refs/notes/x)" &&
-	# Expected number of commits and notes
-	test $(git rev-list HEAD | wc -l) = $num &&
-	test $(git notes list | wc -l) = $num &&
-	# 5 first notes unchanged
-	verify_notes y commit5
+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 1182 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-f6db73397fcc379ea00d1fc17a35abb42027a69a
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          885 (         0 duplicates                  )
-      blobs  :          295 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          295 (         0 duplicates        289 deltas of        289 attempts)
-      commits:          295 (         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:            300
-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            =        296
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      86456 /      86456
----------------------------------------------------------------------
+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 1183 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y)
+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 1184 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 3311.4 'notes tree has fanout (y)': verify_fanout y
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/7e8cc0aeac5befb302d276f2e706112bf6e413
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f6/db73397fcc379ea00d1fc17a35abb42027a69a
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 4 - notes tree has fanout (y)
+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 1185 - setup LF checkout  with -c core.eol=native
 
-expecting success of 3311.5 'No-op merge (already included) (x => y)': 
-	git update-ref refs/notes/m refs/notes/y &&
-	git config core.notesRef refs/notes/m &&
-	git notes merge x &&
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/y)"
+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 1186 - setup CRLF checkout  with -c core.eol=native
 
-Already up to date.
-ok 5 - No-op merge (already included) (x => y)
+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 1187 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 3311.6 'Fast-forward merge (y => x)': 
-	git update-ref refs/notes/m refs/notes/x &&
-	git notes merge y &&
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/y)"
+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 1188 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-Fast-forward
-ok 6 - Fast-forward merge (y => x)
+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 1189 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 3311.7 'change some of the initial 5 notes (x -> z)': 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "new notes for commit2" commit2 &&
-	git notes append -m "appended notes for commit3" commit3 &&
-	git notes remove commit4 &&
-	git notes remove commit5 &&
-	verify_notes z commit5
+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
+		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 1190 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native
 
-Overwriting existing notes for object 94955c5cd7e5662c6ab40c323ecdfac458c47435
-Removing note for object commit4
-Removing note for object commit5
-ok 7 - change some of the initial 5 notes (x -> z)
+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 1191 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 3311.8 'notes tree has no fanout (z)': verify_no_fanout z
-94955c5cd7e5662c6ab40c323ecdfac458c47435
-e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ef004cfa88883bb87e030b6196934dd90e3548d2
-ok 8 - notes tree has no fanout (z)
+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 1192 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 3311.9 'successful merge without conflicts (y => z)': 
-	git update-ref refs/notes/m refs/notes/z &&
-	git config core.notesRef refs/notes/m &&
-	git notes merge y &&
-	verify_notes m commit5 &&
-	# x/y/z unchanged
-	verify_notes x commit5 &&
-	verify_notes y commit5 &&
-	verify_notes z commit5
+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 1193 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-ok 9 - successful merge without conflicts (y => z)
+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 1194 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 3311.10 'notes tree still has fanout after merge (m)': verify_fanout m
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 10 - notes tree still has fanout after merge (m)
+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 1195 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 3311.11 'introduce conflicting changes (y -> w)': 
-	git update-ref refs/notes/w refs/notes/y &&
-	git config core.notesRef refs/notes/w &&
-	git notes add -f -m "other notes for commit1" commit1 &&
-	git notes add -f -m "other notes for commit3" commit3 &&
-	git notes add -f -m "other notes for commit4" commit4 &&
-	git notes remove commit5 &&
-	verify_notes w commit5
+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 1196 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-Overwriting existing notes for object ef004cfa88883bb87e030b6196934dd90e3548d2
-Overwriting existing notes for object e0851358fb6b4703f23d74ef964bc4491bec7ab9
-Overwriting existing notes for object 157e8cc0aeac5befb302d276f2e706112bf6e413
-Removing note for object commit5
-ok 11 - introduce conflicting changes (y -> w)
+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 1197 - setup LF checkout  with -c core.eol=native
 
-expecting success of 3311.12 'successful merge using "ours" strategy (z => w)': 
-	git update-ref refs/notes/m refs/notes/w &&
-	git config core.notesRef refs/notes/m &&
-	git notes merge -s ours z &&
-	verify_notes m commit5 &&
-	# w/x/y/z unchanged
-	verify_notes w commit5 &&
-	verify_notes x commit5 &&
-	verify_notes y commit5 &&
-	verify_notes z commit5
+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 1198 - setup CRLF checkout  with -c core.eol=native
 
-Using local notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Using local notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 12 - successful merge using "ours" strategy (z => w)
+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 1199 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 3311.13 'notes tree still has fanout after merge (m)': verify_fanout m
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/7e8cc0aeac5befb302d276f2e706112bf6e413
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 13 - notes tree still has fanout after merge (m)
+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 1200 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 3311.14 'successful merge using "theirs" strategy (z => w)': 
-	git update-ref refs/notes/m refs/notes/w &&
-	git notes merge -s theirs z &&
-	verify_notes m commit5 &&
-	# w/x/y/z unchanged
-	verify_notes w commit5 &&
-	verify_notes x commit5 &&
-	verify_notes y commit5 &&
-	verify_notes z commit5
+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 1201 - setup LF_nul checkout  with -c core.eol=native
 
-Using remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Using remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 14 - successful merge using "theirs" strategy (z => w)
+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
+		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 1202 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native
 
-expecting success of 3311.15 'notes tree still has fanout after merge (m)': verify_fanout m
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 15 - notes tree still has fanout after merge (m)
+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 1203 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 3311.16 'successful merge using "union" strategy (z => w)': 
-	git update-ref refs/notes/m refs/notes/w &&
-	git notes merge -s union z &&
-	verify_notes m commit5 &&
-	# w/x/y/z unchanged
-	verify_notes w commit5 &&
-	verify_notes x commit5 &&
-	verify_notes y commit5 &&
-	verify_notes z commit5
+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 1204 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
-Concatenating local and remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Concatenating local and remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 16 - successful merge using "union" strategy (z => w)
+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 1205 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 3311.17 'notes tree still has fanout after merge (m)': verify_fanout m
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/7e8cc0aeac5befb302d276f2e706112bf6e413
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 17 - notes tree still has fanout after merge (m)
+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 1206 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 3311.18 'successful merge using "cat_sort_uniq" strategy (z => w)': 
-	git update-ref refs/notes/m refs/notes/w &&
-	git notes merge -s cat_sort_uniq z &&
-	verify_notes m commit5 &&
-	# w/x/y/z unchanged
-	verify_notes w commit5 &&
-	verify_notes x commit5 &&
-	verify_notes y commit5 &&
-	verify_notes z commit5
+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 1207 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-Concatenating unique lines in local and remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Concatenating unique lines in local and remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 18 - successful merge using "cat_sort_uniq" strategy (z => w)
+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 1208 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 3311.19 'notes tree still has fanout after merge (m)': verify_fanout m
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/7e8cc0aeac5befb302d276f2e706112bf6e413
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 19 - notes tree still has fanout after merge (m)
+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 1209 - setup LF checkout  with -c core.eol=native
 
-expecting success of 3311.20 'fails to merge using "manual" strategy (z => w)': 
-	git update-ref refs/notes/m refs/notes/w &&
-	test_must_fail git notes merge z
+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 1210 - setup CRLF checkout  with -c core.eol=native
 
-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 157e8cc0aeac5befb302d276f2e706112bf6e413
-CONFLICT (delete/modify): Notes for object 157e8cc0aeac5befb302d276f2e706112bf6e413 deleted in refs/notes/z and modified in refs/notes/m. Version from refs/notes/m left in tree.
-Auto-merging notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-CONFLICT (content): Merge conflict in notes for object e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 20 - fails to merge using "manual" strategy (z => w)
+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 1211 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 3311.21 'notes tree still has fanout after merge (m)': verify_fanout m
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/7e8cc0aeac5befb302d276f2e706112bf6e413
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 21 - notes tree still has fanout after merge (m)
+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 1212 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 3311.22 'verify conflict entries (with no fanout)': 
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == w)
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
+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 1213 - setup LF_nul checkout  with -c core.eol=native
 
-ok 22 - verify conflict entries (with no fanout)
+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
+		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 1214 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native
 
-expecting success of 3311.23 'resolve and finalize merge (z => w)': 
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha3 <<EOF &&
-other notes for commit3
+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 1215 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF
 
-appended notes for commit3
-EOF
-	git notes merge --commit &&
-	verify_notes m commit5 &&
-	# w/x/y/z unchanged
-	verify_notes w commit5 &&
-	verify_notes x commit5 &&
-	verify_notes y commit5 &&
-	verify_notes z commit5
+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 1216 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-ok 23 - resolve and finalize merge (z => w)
+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 1217 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 3311.24 'notes tree still has fanout after merge (m)': verify_fanout m
-00/59a2ff8988844dd700659efccfd6743632f608
-00/f8b74df8cda7203edb38223fe6e88ccf9e4867
-02/96deddcaab6e784e59aa39dd1a8d20aefd16b7
-02/e82a8dbc4055adb9de6a9659582c396e5a405c
-03/0053ed24c57da4943b57df551d320cda39d301
-04/fa40d6837978ceac40e98a0477254b79ff6109
-05/a2ed5d9c61c6cf4ba308a0e07cac2a429aff65
-06/a01ff41646bc048a05917f15e10fee340f767c
-06/c14dad0e5fd835685f33ad970d094a43e1cedc
-06/e1bb3951a38f7376405b778091cd7eadec203c
-09/9a5404b8f2c60ab4b2a7cf1ebc9cdd69fd1fa9
-0a/9e6cecb44350f1408a06cd59686b5cb1fa4d79
-0c/9e3b6f605491b12a1cde5ec246115233f0f5fd
-0e/77e9a284277632ab6590d1f9b0f86d399c461e
-0e/7bc46a7af0b651a90cd01852eefac5d764dbc1
-0f/63b6e81d3b18fb134161f627844e9e5a2d942a
-0f/d39fd6ef715bb3a0b6c163199e572a7daa7af2
-0f/dfaad743779a13fea86b5092855460a1d063fe
-11/4fc5a9d7890b4a2d5ec8276dda69e37e5e616c
-11/768aa383e7caa89f5a859593052eda5782f73c
-11/906a39ecfe8796cae0e0853f06c2c335868843
-12/5a36192dc2255282d7d1800dec2a340d236a9b
-12/907a70732802196c1a0ca807a108eaa29adec5
-13/42db3bf0da6aed591bc732c1746073ff06b0f3
-15/7e8cc0aeac5befb302d276f2e706112bf6e413
-15/b9d90d3c3c6f73deacc4d9c171752b6b0d581f
-17/7c1b213fa7ebafc44c50a935e6c176b79360df
-18/9334c4b88d99963170854583fc084397152338
-19/8490da44fc075db7c29686ed3d75f9eced094a
-19/eab2791c316642c620b2494c2dce003beee3d4
-1a/50d1559b52e47799dce956a3ef59427b529e48
-1a/98e69358bfe77335598c444880178786f250f3
-1b/09302a3d79221b5923891bbdecdf6bf5c32dc4
-1c/256bbec2954ce4bbd3aa1ec894b00619c87d59
-1c/ec8d2b2103afe07295972d513c3f4abc898607
-1d/22d9f08076b2a7fc11d1df4fbf5dbb1bc5f77f
-1e/1532b6aee517f7d4fbfbc9635d18a10b12fde2
-1f/4329544f45b3a5ed56c5a1aca07b22a4999fbb
-1f/7c2e169ef55c9e168464bfe083076dbfb6690f
-1f/80b24e9c4875cbd559fb8d9434de1850c52c7e
-21/eb95433c63f657f4feb61b78b91ed2fe53574c
-22/66ca4aaa709bb00bf269087d8e13a54042a93d
-22/a8913746147a11a5828aa70482fa6fc1fff2a1
-23/6aa09ca3248e4bcde6ed9780fe1e0e17f4e62c
-23/c51031b7b5ff34b5cd75bdae5a21bb8dc387ae
-23/e92f35ff959ee71439822b19c93027ce677bc8
-24/f5d4d513327acad4f00462fe39bc96ed9aec9f
-28/fca858f4bdf40159e4fa5a63846b0aceb7431a
-29/38a35e6813c7205e7ad62ee37e2a6cc9d36a1f
-2b/a7acefc08f3462eb12453a8bb5521544905334
-2c/75f53ac534a324324b1ff15cefcd70e7afa646
-2d/65622d1ffee087504b1cf59a6d6bdbb9552760
-2d/9e37898a0e742a0163855935118ab9af5951a8
-2d/c1daa14d2d350677e34ef5fe76509f6e55063d
-2d/d18e98a3cc782944a568636289c160d81fd5a1
-30/45340fd90419dd2f5690d1c4d8633c70248bd9
-32/011ba8b26d0e39c354091b5d18b640bdaa9ec0
-32/39026a8940b414239faf0d77e274112d68d96d
-32/5dab4afdab3a8b7e7b3691f9e5623d72e6ba95
-32/67715033f21dbf69f361ad1f2373e78065949d
-34/40ffcbed4ba8626e99d1fd5de37486e336c4fa
-35/56cd79d6de9c14ac5e790317e96b48cf28a6e5
-35/e40ca1583f193dfb98af23e284a80de6fb7484
-36/63d047011bfa8f85a3503c9f54deb1a09d5adf
-37/e9a73943fb52b3af6afd3eaa0901992a63cfff
-38/07896e9e661a2e84151e396d31fd34796d1f6f
-39/65ddde0fd33b440db683e8802fe0ebcb64094c
-39/916af9733548bdbf3c7899a97969fdc1ef2e99
-39/afd70fce5e8eb6d92a041f1339d96655f2b0f6
-39/c5f743e3dc9758a4ac40bfee0fa1d1dcfda822
-3b/64761fbc713b657deb969b9855343c0d7eaa2f
-3c/066e203e841ea3c7efc4be6d87b5f719704acb
-3c/e86c1beb71106283a293ac353ce61ab3096736
-3e/c22ce4f6c24d44b2a0a1410a39d1218c184b50
-3f/28341a483b5f2d01ffdee0cc680f79f3f7e571
-40/b1ffbbe7a0ddad705c9897a8548a62e1f4876a
-41/a3870799c63de3688b300bdbaaaa6355ff24fb
-42/a4892a296f36eadfceb9d264f6e600703bf688
-43/15150561c443e54ab895a121e3c59ee39ff170
-43/da7a31eba4b4d3108e782c779cdf94b6bec116
-44/e3b4af0aa9e1af2f6db328754f45ac7726948c
-46/4aeb5723c1062fc6ad55e3205f956e8a3ef3c5
-46/59a8862a02c5227f122d894c2a001eca0d84f9
-47/dd87a8e555bd925c86bc96989593e08968b7b1
-48/14470a784d66e0318a74ab08ea7202fc3fd4cc
-4a/39c901540457bb249c18a4f94a8a0e59f0e6d1
-4b/6059c8f1c9b70b70cfcfb4614f49b3c922ca6e
-4b/87d5e91601208385a412a90deedaf14279452f
-4b/ba369e6095f2c452c4d09f1358acdeaafeae76
-4c/236aea851217323502e86ecc922143018837b0
-4d/f312eda5f4fe7f8f4a2d9d9ca7b8d0c1fa64f5
-4d/f5539d13cfe269d6558fbe78b1329b361b9590
-4f/9fd239f6237bbe9dc0cc0949bc09ba2e0a71de
-51/7516b737a8c858f54b5ce20ccdf922a9376cfa
-51/ce3b9fc8560b53c1e3881e94b2a0c876f18031
-52/0400c47b7fe950cac0119f3e0f39f77ea91f48
-52/24d3a5dee327bf2df46d0439e377af58e4e4b7
-54/6ad61cfdb3824e53156bc95274f47c52009d87
-54/95af5c04ccbe4967c06508a4a30fe6944c3178
-57/701dee98362e6576ba16ebb0f05c9b9e6c5c41
-58/61ff7dcb74969510aa40908555fdfd43e9a607
-59/6cfc19975cea95d3f9af95d3ec3822394d17c3
-5c/bad73a40be1ee94eebf156cf3f1945aa3dad8d
-5d/9d49249a3f5e6f8a2667ab2ef98bd873ea033f
-60/1e442f4370db50da9a9266fb36f1df1855da4b
-60/e04cb7f2669b592f1197d087b348f6eca6ff2a
-62/151fb4b555eb4c92c1942da6b0717af8ba787a
-64/fd88beb2d2d9f73e1a90d63c5e5bac131a540f
-65/86726dc4df291efa46b1e2587f52c80a3ddbf6
-66/2e2425a4c465e97a7dae3a3b7fab0d654ae315
-66/babe5b113fb7a4290b198c980240154b392203
-67/f28897fa34cf457d8e880b8a60a19bdc771239
-67/f6dbb066bdb6658a3ca6f582c9fca2cb8a4b7e
-68/bd8cd66f30a076bd6e9f67e9ab51fcca2a4e1b
-68/e1d1c671c6161d8e2c149e748ef92bb5cfa665
-68/fc05bece2383b55c77ece5900b5f4e4c40ba62
-69/d6c2a2fbd139aba6359a9ccbfc0fe6efcdd690
-6b/d2133f11f05075526130cb2a97c810b11bcb5e
-6b/d2e279447bd40bd32b1a438dfd52a6fe2cf14b
-6c/131adc529e2d3a59b7034ced7f99f169598411
-6c/616feca94f10bf561251a17c16b7db4b1dbdde
-6c/7461a7db47fab144addf95b814379832f4230c
-6d/6c8808dfa5be2487402591dded1ad67d908a85
-70/3dc5647be0fa24abf8ac8d5e9faed118ea31e6
-70/e91c0fd3c8a7c524c051b8e8531c8286523915
-72/80e9c59bbfcf7288d0df9636df54527880ee79
-73/939a765953cbb48cb8cb1df6ccd062919eded1
-74/c28b460bc1f4fc488ae27c0c767c90088ddbcb
-74/deae17ac1eecf64f405e05e8e14e0dd6b30543
-75/331eaadf68c823f6bc36873b625be470fdb9da
-75/337f6597d6a984ce72b370db7ac08b11115954
-76/1dedb54cfa4a530d2a8b6f0108b3630536d51c
-79/64a617c4a2d1bb45850b48f774fc57b28fea5b
-7a/0703d54958925e09013e04bd35cd19a078a90b
-7a/a80f07beae9a2f0b8ccd703c32de6744fd051e
-7b/21836a584eb1ee8ffecafa2d2ba02109ea2273
-7d/815ea015cd551ab5de80879760defb47acea6c
-7e/41915dad67d1585d33b56abf2c129432fcf426
-7f/78a61938b36a24fd4431a12b22e3dd26702757
-81/1322f632d38d635a20a148bb4c5f98b8c31d8c
-81/83a1e8450e209464100603f2a9a0b8e574ca43
-82/6d4be181ec8e60d819f4ff350dee4e501a4efa
-82/85ee71b3bd8ffe7402db5940ebc2da7234a1c4
-84/94e16f2929306d0a205b4a9cf34789ec5b52fe
-85/94f94aaed77d8365eef9f0ff37e7da9c05d50c
-86/700c1d3f3a0a31f2f954bb4188d398af2181db
-86/dcde95eebb062f0ccf716c0d3b70614cdb16a6
-88/7ac411f4b1bcc710eb561c61d18e3960e817cf
-8a/015ae1ae0dac611406357e7e2b7d3b29b51447
-8a/2d13657445f6056804c992cd8b46d1f2d9e08e
-8a/788640a312a8bbc5bbd1d35b4fedacbcc0c00a
-8a/a7d423d5a3e120d4d8c80980791ec2f209f131
-8b/36d47cabd9aa85b7a7673e43c603ce6ba76df6
-8c/e581e0bef54e004db3bc40b2f1079d24efdb96
-8d/7f0f041fa3cb769b4f5f7ab8dea329e031971d
-8d/b5bd40cac5f2043a94733d67313e392b5d9dc6
-8e/50afaa02fd9bd744f061730cb8eedef4997d5d
-8e/c3d3b6b7ee56e23a709f47db60f8561a9698ed
-8f/ef91e52599676addb79aba4224c2c0eb8601a3
-8f/f04a0672b445210fcb364650d74111c2fd82f5
-8f/f5663227734a920cf085f0e0b76d5db14172f4
-90/a84eeab5e3ce60421da43a623db6540b688a62
-93/28a88723298c70ca14eaaa241613c9574e8b44
-93/5152afbc3b4f67bb8d9ccd01b601c89a48e69e
-94/1e1bccbf627604ca6af86ad3541dee480aab0e
-94/2d87c0b27dd02c55b0112dab49b9be254473d2
-94/955c5cd7e5662c6ab40c323ecdfac458c47435
-96/3df12cc741f3004f8870a52fc5877bf9ca6013
-96/7dd7f09c2f55dfb393c021ab6000a283cf068e
-96/939443f19f5d8926e78e906c965b418d4c46d5
-96/d5867ce179d5146ed9163e8eba2acabab83122
-97/4217f2644a6e6fe401523c4f459f7c3689f9dd
-99/decb49e0f56074881831727b906117a326be85
-99/f6460ce4758ef60eff7abf0366f7bbfc9a8206
-9a/492e74e1d2afda3d4043b8b9968a29c3c13bcc
-9b/f30d1676260b8fc8bf519a4af4bc628402e95a
-9e/4729bfc0f6b9b5aee0d630bafc299a19fdedf7
-9e/aacc50711e24a8d7fb5734444338752cc979a5
-9e/ca7d34b36ad5bfcd80ff2ac0b0b9a8fae850c6
-9e/f8c372f29f8131739dc8eeab08f4323c54c47a
-a2/0d16b51cc9287469c4a2f246acb5f0c21fc098
-a2/16dcf6b46f5260b6cfff5721847e010c681e40
-a3/60d5a1639d70627543138385781dbee95812c8
-a4/d7fcdbcbac2799f0e87a5654df1e4c12345282
-a6/f7090037e529277612903dde135889721b8d24
-a7/01072f88f0fec15902916cbce38f3549cac0e6
-a7/94f10e293f1434fe75766203a47d7e3d4d8c1d
-a7/b062b1589ea7e3385124521c2d4751b44b0a4b
-a8/60edaf1326a590c32dd4ddf4ea754b8ef5be34
-ab/2db5d6e0a134ba2693c7cb74d0f41a95dbf5f3
-ac/11791a26f4a82c2d1e2b068c5d9be6564aa2d1
-ad/788402e4b81bd4f0fc8d3beba876ac30f2e801
-ad/b50ff206b638bb35775e4d8134314a4b669ee0
-ae/6bddbb17144c925e1dd30b156fd014e4a5af5e
-af/e58fc3dc97f83b97fc5cc4c0bcdc8a2923a536
-b3/5c8895207c15e1d8d64ade08db059efd46d634
-b3/a6e1262d902a183b6810d77969091aeaa8605c
-b4/0c02d0c9d21ad75a00143d3eecb1aae1683c25
-b4/a7e9c293e3b1160418b9c2652bdcd028e75742
-b8/03a8226968f1f155ebabff1429026ba58ecf94
-ba/000ce7dfaa53436a12fcb6f32cb730bc999c58
-ba/c54e6b25f59ad97e0be4e6fcda6e53dca6607d
-ba/e7d71c1c40d6670a1dfc290c7aba2deea204b6
-bb/78195e8b2beb0c006980fb5c6e7e2641524167
-bc/4c742dc1b8d1f09af2c510b3dfd730a99e6a8c
-bf/a45c5b38c41145cb203209f5bc3dc16599a5e3
-c1/06288c0595c7f2acb761e8fcdb39dd3fec3b6f
-c1/a639c2cd71f92376aba8b0cdfb7eb42fff1f54
-c1/c44c75783ebaad6ce903072e5b14af8f444bd8
-c2/1b7a79d2b2746f946b0f5be42fd3e3b59d4544
-c2/5b912bd08de3cefe1a673f2f2ca3016d1c1258
-c2/9802df7ad706dff5dc666219b1b15e53db20fb
-c3/348a7184dbff866f4c5f2f9a82deaa6f93763b
-c3/bce4b541feff853989c57fd2dc42c9f99e5f21
-c5/b7b50e501d98c810248b15cad01e4f8c3d00d8
-c6/1ad84c67d08df0fd04c00b62de24091c9b7383
-c7/2685d485e402e73f8cd1cae86797c8eecc8d20
-c8/7dbe3c22f24fdf0e49cfaa43508cd524c494f0
-c9/3aa29c5e69c1f8c67d2b33f0b5a330d1788526
-ca/d27fba7ca666bbd050e21373ad07c0a71b10bc
-cd/6aef36b96ac7dbbd94a30646d2cfe45ee8c620
-ce/5e3a94a1b9a8e2bb3ea69bc6276ff80b753db3
-cf/056ec152b13f4a4eafa61f1499b9beaec3f2c6
-cf/b2d40d0416c7b0b60db8199e1b79f640093f72
-cf/f68c1b7ed135ab19f2b95c318dc6357ddfdaa2
-d0/a377c848e3a37146acd4a8a9b891a5152a9d48
-d1/4356539993fb4c70ff4f4deb91eb9097740832
-d1/46fd69423d2f3b505d145e67afe5aca02dfe09
-d1/7af66ed98bd2bd2e18daa94c6689773993770c
-d1/9a07455999d2ab16493ec101e0dbc825206007
-d1/b856326cd5454fac386a758ed8c8918f66ba26
-d2/5789d47eb4c16b85bf9e39d9d2369a0d855d92
-d2/9e6b7e73240371022068cdec11d2d45cc0fc1a
-d2/df6c6b7335d4a71baa92177cb78cb13a71bd6c
-d3/07d48abf7d014f2adf792ab48e95dd77b3fd66
-d4/a19a929357505d72d64fc595a543b2215c39d4
-d5/6359cf0df8b4541ccbcad8e0c0a44f822eccf7
-d6/1ac6b65471750febac7d69bca2475ad7f39617
-d6/1f3c9d16964b53d020e8c21f9ecf7d791fd314
-d6/88dc5b7b307160fe01c92bc80fd608bafa923f
-d6/e2c3490a50f68c0599b1bfad824631648bfe57
-d7/3e59672de81d623318c96702bafe79ca3b01b9
-d7/5fa8b23e1610b8f3a1ab1d43e4e6bbe9848d99
-d7/944f2f885b1e976e1fd1c0b30b6c172bb52466
-d8/425743f77600e4165b653f22ae6fd38027d2b4
-d8/5974bb6248f39e51abd6d00737edd6256ee103
-da/865c12818c8ef15fc031f832d4399997476a64
-db/c93987a2f41d29e7d9ce170c4a66f31ba21a2b
-dd/336f1f082af04276827925fc2ad27560e584f4
-dd/a5e2303dc0efb1ce21091ac9609ce05f95ca11
-dd/f7332ecf611c9ea9b21b96c61b9508c8630258
-e0/2dcc2a7fc0426363d2380175ca08cd564bfa1e
-e0/59ccd2bf35dbc599e5ce5d39674d926445fc3e
-e0/851358fb6b4703f23d74ef964bc4491bec7ab9
-e0/9816883b166284284a2848821c7787a74b8170
-e2/09a0d469e26a06ce87bb3bbc3429a911e94879
-e2/7052bb2c8bb2fd16e0d235c24ca5aad3270e38
-e3/640f4f8c0e046c3cd59acdd41e9fbbee959579
-e5/4161d6eb21566f231627f845a14c312482ed8a
-e5/ce71a5e89216984d0334e19f0b86ee734b2419
-e6/405b88cddb9dfa524a7372b58e615bf4cdc730
-e6/83dd479d771604c993c307404be2aa9ac45b7d
-e7/f1a6cd9114a0ef87ba8fb5e0ff89d05796e059
-e9/4fa527e4420309ff4e420897749f95cb552444
-e9/cc8b7606e0f912773c1c6aa425319858643ae1
-ea/c6e96d764b0c25841dcea3cf4f77b7f889f215
-eb/11d8290f638dc8b3b4da8b4a56bb7f5192d80c
-eb/91b96510d8485576da96507503e779dece1777
-eb/ac41b793d2de79fc57bf0e2215785122c6fbfb
-eb/f639d1f0d2f8350a8f8efe5fce50f9387d900e
-ec/11fc9e3653f03f1c82ab32ceca3fe90c89a169
-ec/55ada1019c2cd250bec8af82e999356d32c713
-ee/79ede3b931d2796f1d48176d4859b4dde8add5
-ee/e7846fd37a3b6a89d1248e46c9bbc770bfea28
-ef/004cfa88883bb87e030b6196934dd90e3548d2
-ef/3d66358c62d9f97f72b96ea6b9848414fa8101
-ef/8596ac1ab699d85f0de0a3f9be55b2c9876078
-ef/cec8d750faa2610959fc2fb4bfd8fc095031ef
-ef/f8361a8dab5eb9b5532706575896f3953c3da8
-f0/ad20627099424af1d5c762cc2e6975fedc4325
-f1/d588e48db9e3d4239673d5030b47b08f849eea
-f3/d4332f46fb8d6a96f6cace0fe55fd3a7062258
-f3/e3510e3dc4a81d486bd077cb68e2dbb843553e
-f4/8cff0f2465f3ea3ad67d6a477c9dafe09b971a
-f4/b273648f727cd5f0f92bd3c5cdd67cfed10892
-f4/f9a1dc653674c0f7c877dda961925b1515e053
-f5/4ef3b60b96982e057642bfcff04ed29caf1207
-f5/bf3719d5450931e3979d1b9b140618fe042e22
-f7/1f7801a7ff5b40d6e346cd7ddeb492d1d83224
-f8/18a85408d9343660a7403290cd483de65f28fe
-f8/469687aceb346b06adb42f065dfd586013636d
-f8/b4f860379fcc1e6256494d4931ff46ea5852de
-f8/fea46bf5bb6034aa77d9c8c8c55953bd694594
-fa/37685cddf33cbf37404cb5314ea362557da4c5
-fa/e1e08aeadada773d1eb10851e985c808cdf655
-fb/209c09b61273835f23b39ce0d07171ab872311
-fb/480ccedc5dd98024c22a41e717fcb0ae7fca67
-fe/4314bf42a6930ab23ad01b86ba887257ccb576
-fe/9977c6f7294face7e7987f2c53bd016d035089
-ok 24 - notes tree still has fanout after merge (m)
+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 1218 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3502-cherry-pick-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3502-cherry-pick-merge/.git/
-expecting success of 3502.1 'setup': 
+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 1219 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-	>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
+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 1220 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
+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 1221 - setup LF checkout  with -c core.eol=native
 
-[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 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 1222 - setup CRLF checkout  with -c core.eol=native
 
-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
+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 1223 - setup LF_mix_CR checkout  with -c core.eol=native
 
-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 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 1224 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 3502.3 'cherry-pick explicit first parent of a non-merge': 
+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 1225 - setup LF_nul checkout  with -c core.eol=native
 
-	git reset --hard &&
-	git checkout a^0 &&
-	git cherry-pick -m 1 b &&
-	git diff --exit-code c --
+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
+		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 1226 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native
 
+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 1227 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-HEAD is now at c81ef52 Merge branch 'side'
-Note: switching to 'a^0'.
+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 1228 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=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.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 1229 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=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.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 1230 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-  git switch -c <new-branch-name>
+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 1231 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-Or undo this operation with:
+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 1232 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
 
-  git switch -
+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 1233 - setup LF checkout  with -c core.eol=native
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1234 - setup CRLF checkout  with -c core.eol=native
 
-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 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 1235 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 3502.4 'cherry pick a merge without -m should fail': 
+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 1236 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-	git reset --hard &&
-	git checkout a^0 &&
-	test_must_fail git cherry-pick c &&
-	git diff --exit-code a --
+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 1237 - setup LF_nul checkout  with -c core.eol=native
 
+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
+		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 1238 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native
 
-HEAD is now at 99ce4f9 add line to B
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1239 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF
 
-  99ce4f9 add line to B
+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 1240 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1241 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
- git branch <new-branch-name> 99ce4f9
+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 1242 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-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 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 1243 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 3502.5 'cherry pick a merge (1)': 
+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 1244 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
 
-	git reset --hard &&
-	git checkout a^0 &&
-	git cherry-pick -m 1 c &&
-	git diff --exit-code c
+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 1245 - setup LF checkout  with -c core.eol=native
 
+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 1246 - setup CRLF checkout  with -c core.eol=native
 
-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 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 1247 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 3502.6 'cherry pick a merge (2)': 
+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 1248 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-	git reset --hard &&
-	git checkout b^0 &&
-	git cherry-pick -m 2 c &&
-	git diff --exit-code c
+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 1249 - setup LF_nul checkout  with -c core.eol=native
 
+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
+		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 1250 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native
 
-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 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 1251 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF
 
-  9d31cba Merge branch 'side'
+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 1252 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1253 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
- git branch <new-branch-name> 9d31cba
+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 1254 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-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 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 1255 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 3502.7 'cherry pick a merge relative to nonexistent parent should fail': 
+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 1256 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-	git reset --hard &&
-	git checkout b^0 &&
-	test_must_fail git cherry-pick -m 3 c
+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 1257 - setup LF checkout  with -c core.eol=native
 
+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 1258 - setup CRLF checkout  with -c core.eol=native
 
-HEAD is now at 9554515 Merge branch 'side'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 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 1259 - setup LF_mix_CR checkout  with -c core.eol=native
 
-  9554515 Merge branch 'side'
+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 1260 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1261 - setup LF_nul checkout  with -c core.eol=native
 
- git branch <new-branch-name> 9554515
+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
+		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 1262 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native
 
-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 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 1263 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 3502.8 'revert explicit first parent of a non-merge': 
+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 1264 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 1 b &&
-	git diff --exit-code a --
+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 1265 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native 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
+	
+ok 1266 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-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 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 1267 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 3502.9 'revert a merge without -m should fail': 
+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 1268 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
 
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert c &&
-	git diff --exit-code c
+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 1269 - setup LF checkout  with -c core.eol=native
 
+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 1270 - setup CRLF checkout  with -c core.eol=native
 
-HEAD is now at 1b3e5cc Revert "add line to B"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1271 - setup LF_mix_CR checkout  with -c core.eol=native
 
-  1b3e5cc Revert "add line to B"
+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 1272 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1273 - setup LF_nul checkout  with -c core.eol=native
 
- git branch <new-branch-name> 1b3e5cc
+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
+		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 1274 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native
 
-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 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 1275 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 3502.10 'revert a merge (1)': 
+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 1276 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 1 c &&
-	git diff --exit-code a --
+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 1277 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native 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
+	
+ok 1278 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-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 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 1279 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 3502.11 'revert a merge (2)': 
+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 1280 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 2 c &&
-	git diff --exit-code b --
+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 1281 - setup LF checkout  with -c core.eol=native
 
+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 1282 - setup CRLF checkout  with -c core.eol=native
 
-HEAD is now at ab594ec Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 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 1283 - setup LF_mix_CR checkout  with -c core.eol=native
 
-  ab594ec Revert "Merge branch 'side'"
+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 1284 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1285 - setup LF_nul checkout  with -c core.eol=native
 
- git branch <new-branch-name> ab594ec
+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
+		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 1286 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native
 
-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 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 1287 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 3502.12 'revert a merge relative to nonexistent parent should fail': 
+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 1288 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert -m 3 c &&
-	git diff --exit-code c
+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 1289 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native 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
+	
+ok 1290 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-HEAD is now at 3f41b61 Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 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 1291 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-  3f41b61 Revert "Merge branch 'side'"
+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 1292 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1293 - setup LF checkout  with -c core.eol=native
 
- git branch <new-branch-name> 3f41b61
+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 1294 - setup CRLF checkout  with -c core.eol=native
 
-HEAD is now at c81ef52 Merge branch 'side'
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
-fatal: revert failed
-ok 12 - revert a merge relative to nonexistent parent should fail
+expecting success of 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 1295 - setup LF_mix_CR checkout  with -c core.eol=native
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3503-cherry-pick-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3503-cherry-pick-root/.git/
-expecting success of 3503.1 'setup': 
+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 1296 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
+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 1297 - setup LF_nul checkout  with -c core.eol=native
 
-	git symbolic-ref HEAD refs/heads/second &&
-	rm .git/index file1 &&
-	echo second > file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "second" &&
+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
+		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 1298 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native
 
-	git symbolic-ref HEAD refs/heads/third &&
-	rm .git/index file2 &&
-	echo third > file3 &&
-	git add file3 &&
-	test_tick &&
-	git commit -m "third"
+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 1299 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native 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
+	
+ok 1300 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
-[main (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[second (root-commit) bbcd39a] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[third (root-commit) 4911fa6] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 1 - setup
+expecting success of 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 1301 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 3503.2 'cherry-pick a root commit': 
+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 1302 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-	git checkout second^0 &&
-	git cherry-pick main &&
-	echo first >expect &&
-	test_cmp expect file1
+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 1303 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
+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 1304 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
 
-Note: switching to 'second^0'.
+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 1305 - setup LF checkout  with -c core.eol=native
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1306 - setup CRLF checkout  with -c core.eol=native
 
-If you want to 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.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 1307 - setup LF_mix_CR checkout  with -c core.eol=native
 
-  git switch -c <new-branch-name>
+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 1308 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-Or undo this operation with:
+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 1309 - setup LF_nul checkout  with -c core.eol=native
 
-  git switch -
+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
+		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 1310 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1311 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-HEAD is now at bbcd39a second
-[detached HEAD 3e6f574] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 2 - cherry-pick a root commit
+expecting success of 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 1312 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 3503.3 'revert a root commit': 
+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 1313 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-	git revert main &&
-	test_path_is_missing file1
+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 1314 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native 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
+	
+ok 1315 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-[detached HEAD 3eb7e0d] Revert "first"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-ok 3 - revert a root commit
+expecting success of 0027.1316 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1316 - setup config for checkout attr= ident= aeol= core.autocrlf=false
 
-expecting success of 3503.4 'cherry-pick a root commit with an external strategy': 
+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 1317 - setup LF checkout  with -c core.eol=native
 
-	git cherry-pick --strategy=resolve main &&
-	echo first >expect &&
-	test_cmp expect file1
+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 1318 - setup CRLF checkout  with -c core.eol=native
 
+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 1319 - setup LF_mix_CR checkout  with -c core.eol=native
 
-Trying simple merge.
-[detached HEAD 54587e2] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 4 - cherry-pick a root commit with an external strategy
+expecting success of 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 1320 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 3503.5 'revert a root commit with an external strategy': 
+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 1321 - setup LF_nul checkout  with -c core.eol=native
 
-	git revert --strategy=resolve main &&
-	test_path_is_missing file1
+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
+		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 1322 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native
 
+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 1323 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF
 
-Removing file1
-[detached HEAD a457399] Revert "first"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-ok 5 - revert a root commit with an external strategy
+expecting success of 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 1324 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 3503.6 'cherry-pick two root commits': 
+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 1325 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-	echo first >expect.file1 &&
-	echo second >expect.file2 &&
-	echo third >expect.file3 &&
+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 1326 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-	git checkout second^0 &&
-	git cherry-pick main third &&
+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 1327 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-	test_cmp expect.file1 file1 &&
-	test_cmp expect.file2 file2 &&
-	test_cmp expect.file3 file3 &&
-	git rev-parse --verify HEAD^^ &&
-	test_must_fail git rev-parse --verify HEAD^^^
+expecting success of 0027.1328 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1328 - setup config for checkout attr= ident= aeol= core.autocrlf=true
 
+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 1329 - setup LF checkout  with -c core.eol=native
 
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
+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 1330 - setup CRLF checkout  with -c core.eol=native
 
-  a457399 Revert "first"
-  54587e2 first
-  3eb7e0d Revert "first"
-  3e6f574 first
+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 1331 - setup LF_mix_CR checkout  with -c core.eol=native
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+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 1332 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
- git branch <new-branch-name> a457399
+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 1333 - setup LF_nul checkout  with -c core.eol=native
 
-HEAD is now at bbcd39a second
-[detached HEAD 3e6f574] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[detached HEAD 2069bd1] third
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-bbcd39af5b7918b8e79c884f958eeddbace1fd46
-fatal: Needed a single revision
-ok 6 - cherry-pick two root commits
+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
+		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 1334 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3430-rebase-merges.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+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 1335 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF
 
-	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
+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 1336 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-[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'.
+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 1337 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1338 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-If you want to 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.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 1339 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-  git switch -c <new-branch-name>
+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 1340 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
 
-Or undo this operation with:
+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 1341 - setup LF checkout  with -c core.eol=native
 
-  git switch -
+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 1342 - setup CRLF checkout  with -c core.eol=native
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1343 - setup LF_mix_CR checkout  with -c core.eol=native
 
-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 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 1344 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 3430.2 'create completely different structure': 
-	cat >script-from-scratch <<-\EOF &&
-	label onto
+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 1345 - setup LF_nul checkout  with -c core.eol=native
 
-	# onebranch
-	pick G
-	pick D
-	label onebranch
+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
+		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 1346 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native
 
-	# second
-	reset onto
-	pick B
-	label second
+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 1347 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF
 
-	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 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 1348 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-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 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 1349 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 3430.3 'generate correct todo list': 
-	cat >expect <<-EOF &&
-	label onto
+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 1350 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-	reset onto
-	pick $b B
-	label first
+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 1351 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-	reset onto
-	pick $c C
-	label branch-point
-	pick $f F
-	pick $g G
-	label second
+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 1352 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
 
-	reset branch-point # C
-	pick $d D
-	merge -C $e first # E
-	merge -C $h second # H
+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 1353 - setup LF checkout  with -c core.eol=native
 
-	EOF
+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 1354 - setup CRLF checkout  with -c core.eol=native
 
-	grep -v "^#" <.git/ORIGINAL-TODO >output &&
-	test_cmp expect output
+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 1355 - setup LF_mix_CR checkout  with -c core.eol=native
 
-ok 3 - generate correct todo list
+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 1356 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-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 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 1357 - setup LF_nul checkout  with -c core.eol=native
 
-Note: switching to 'B'.
+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
+		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 1358 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1359 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=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.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 1360 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-  git switch -c <new-branch-name>
+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 1361 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-Or undo this operation with:
+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 1362 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-  git switch -
+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 1363 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1364 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
 
-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 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 1365 - setup LF checkout  with -c core.eol=native
 
-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 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 1366 - setup CRLF checkout  with -c core.eol=native
 
-Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
-ok 5 - `reset` rejects trees
+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 1367 - setup LF_mix_CR checkout  with -c core.eol=native
 
-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
+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 1368 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-Rebasing (1/1)
error: could not resolve 'my-label'
-ok 6 - `reset` only looks for labels under refs/rewritten/
+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 1369 - setup LF_nul checkout  with -c core.eol=native
 
-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 &&
+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
+		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 1370 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native
 
-	: fail because of conflicting untracked file &&
-	>G.t &&
-	echo "merge -C H G" >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	test_must_fail git rebase -ir HEAD &&
-	test_cmp_rev REBASE_HEAD H^0 &&
-	grep "^merge -C .* G$" .git/rebase-merge/done &&
-	grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
-	test_path_is_missing .git/rebase-merge/patch &&
-	echo changed >file1 &&
-	git add file1 &&
-	test_must_fail git rebase --continue 2>err &&
-	grep "error: you have staged changes in your working tree" err &&
+expecting success of 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 1371 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF
 
-	: fail because of merge conflict &&
-	git reset --hard conflicting-G &&
-	test_must_fail git rebase --continue &&
-	! grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
-	test_path_is_file .git/rebase-merge/patch
+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 1372 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF
 
-Previous HEAD position was 5dee784 C
-Switched to a new branch 'conflicting-merge'
-Rebasing (1/1)
error: The following untracked working tree files would be overwritten by merge:
-	G.t
-Please move or remove them before you merge.
-Aborting
-error: could not even attempt to merge 'G'
-hint: Could not execute the todo command
-hint:
-hint:     merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
-merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
-error: you have staged changes in your working tree
-HEAD is now at 82776a5 conflicting-G
-Rebasing (2/2)
Auto-merging G.t
-CONFLICT (add/add): Merge conflict in G.t
-Could not apply 233d48a... G
-ok 7 - failed `merge -C` writes patch (may be rescheduled, too)
+expecting success of 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 1373 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 3430.8 'failed `merge <branch>` does not crash': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout conflicting-G &&
+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 1374 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-	echo "merge G" >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	test_must_fail git rebase -ir HEAD &&
-	! grep "^merge G$" .git/rebase-merge/git-rebase-todo &&
-	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
+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 1375 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-Note: switching to 'conflicting-G'.
+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 1376 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1377 - setup LF checkout  with -c core.eol=native
 
-If you want to 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.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 1378 - setup CRLF checkout  with -c core.eol=native
 
-  git switch -c <new-branch-name>
+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 1379 - setup LF_mix_CR checkout  with -c core.eol=native
 
-Or undo this operation with:
+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 1380 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-  git switch -
+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 1381 - setup LF_nul checkout  with -c core.eol=native
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
+		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 1382 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native
 
-HEAD is now at 82776a5 conflicting-G
-Rebasing (1/1)
Auto-merging G.t
-CONFLICT (add/add): Merge conflict in G.t
-Could not merge G
-Merge branch 'G'
-ok 8 - failed `merge <branch>` does not crash
+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 1383 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF
 
-expecting success of 3430.9 'merge -c commits before rewording and reloads todo-list': 
-	cat >script-from-scratch <<-\EOF &&
-	merge -c E B
-	merge -c H G
-	EOF
+expecting success of 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 1384 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF
 
-	git checkout -b merge-c H &&
-	(
-		set_reword_editor &&
-		GIT_SEQUENCE_EDITOR="\"$PWD/replace-editor.sh\"" \
-			git rebase -i -r D
-	) &&
-	check_reworded_commits E H
+expecting success of 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 1385 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-Previous HEAD position was 82776a5 conflicting-G
-Switched to a new branch 'merge-c'
-Rebasing (1/2)
[detached HEAD 3d66115] E
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Rebasing (3/3)
[detached HEAD 790085d] H
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
-Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Successfully rebased and updated refs/heads/merge-c.
-ok 9 - merge -c commits before rewording and reloads todo-list
+expecting success of 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 1386 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 3430.10 'merge -c rewords when a strategy is given': 
-	git checkout -b merge-c-with-strategy H &&
-	write_script git-merge-override <<-\EOF &&
-	echo overridden$1 >G.t
-	git add G.t
-	EOF
+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 1387 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-	PATH="$PWD:$PATH" \
-	GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
-	GIT_EDITOR="echo edited >>" \
-		git rebase --no-ff -ir -s override -Xxopt E &&
-	test_write_lines overridden--xopt >expect &&
-	test_cmp expect G.t &&
-	test_write_lines H "" edited "" >expect &&
-	git log --format=%B -1 >actual &&
-	test_cmp expect actual
+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 1388 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
+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 1389 - setup LF checkout  with -c core.eol=crlf
 
-Switched to a new branch 'merge-c-with-strategy'
-Rebasing (1/1)
Merge made by the 'override' strategy.
-Successfully rebased and updated refs/heads/merge-c-with-strategy.
-ok 10 - merge -c rewords when a strategy is given
+expecting success of 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 1390 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 3430.11 'with a branch tip that was cherry-picked already': 
-	git checkout -b already-upstream main &&
-	base="$(git rev-parse --verify HEAD)" &&
+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 1391 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-	test_commit A1 &&
-	test_commit A2 &&
-	git reset --hard $base &&
-	test_commit B1 &&
-	test_tick &&
-	git merge -m "Merge branch A" A2 &&
+expecting success of 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 1392 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-	git checkout -b upstream-with-a2 $base &&
-	test_tick &&
-	git cherry-pick A2 &&
+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 1393 - setup LF_nul checkout  with -c core.eol=crlf
 
-	git checkout already-upstream &&
-	test_tick &&
-	git rebase -i -r upstream-with-a2 &&
-	test_cmp_graph upstream-with-a2.. <<-\EOF
-	*   Merge branch A
-	|\
-	| * A1
-	* | B1
-	|/
-	o A2
-	EOF
+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
+		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 1394 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf
 
-Switched to a new branch 'already-upstream'
-[already-upstream cac3b13] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-[already-upstream 0466126] A2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A2.t
-HEAD is now at c2c3fe3 Merge the topic branch 'onebranch'
-[already-upstream fa07690] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B1.t
-Merge made by the 'ort' strategy.
- A1.t | 1 +
- A2.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 A1.t
- create mode 100644 A2.t
-Switched to a new branch 'upstream-with-a2'
-[upstream-with-a2 071ab27] A2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 A2.t
-Switched to branch 'already-upstream'
-warning: skipped previously applied commit 0466126
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/already-upstream.
-ok 11 - with a branch tip that was cherry-picked already
+expecting success of 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 1395 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 3430.12 '--no-rebase-merges countermands --rebase-merges': 
-	git checkout -b no-rebase-merges E &&
-	git rebase --rebase-merges --no-rebase-merges C &&
-	test_cmp_graph C.. <<-\EOF
-	* B
-	* D
-	o C
-	EOF
+expecting success of 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 1396 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-Switched to a new branch 'no-rebase-merges'
-Rebasing (2/2)
Successfully rebased and updated refs/heads/no-rebase-merges.
-ok 12 - --no-rebase-merges countermands --rebase-merges
+expecting success of 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 1397 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3430.13 'do not rebase cousins unless asked for': 
-	git checkout -b cousins main &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase -r HEAD^ &&
-	test_cmp_rev HEAD $before &&
-	test_tick &&
-	git rebase --rebase-merges=rebase-cousins HEAD^ &&
-	test_cmp_graph HEAD^.. <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	|/
-	o H
-	EOF
+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 1398 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-Switched to a new branch 'cousins'
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
-ok 13 - do not rebase cousins unless asked for
+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 1399 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 3430.14 'rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins': 
-	test_config rebase.rebaseMerges rebase-cousins &&
-	git checkout -b config-rebase-cousins main &&
-	git rebase HEAD^ &&
-	test_cmp_graph HEAD^.. <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	|/
-	o H
-	EOF
+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 1400 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
-Switched to a new branch 'config-rebase-cousins'
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/config-rebase-cousins.
-ok 14 - rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins
+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 1401 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 3430.15 '--no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins': 
-	test_config rebase.rebaseMerges no-rebase-cousins &&
-	git checkout -b override-config-no-rebase-cousins E &&
-	git rebase --no-rebase-merges C &&
-	test_cmp_graph C.. <<-\EOF
-	* B
-	* D
-	o C
-	EOF
+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 1402 - setup CRLF checkout  with -c core.eol=lf
 
-Switched to a new branch 'override-config-no-rebase-cousins'
-Rebasing (2/2)
Successfully rebased and updated refs/heads/override-config-no-rebase-cousins.
-ok 15 - --no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins
+expecting success of 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 1403 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 3430.16 '--rebase-merges overrides rebase.rebaseMerges=rebase-cousins': 
-	test_config rebase.rebaseMerges rebase-cousins &&
-	git checkout -b override-config-rebase-cousins E &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase --rebase-merges C &&
-	test_cmp_rev HEAD $before
+expecting success of 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 1404 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-Switched to a new branch 'override-config-rebase-cousins'
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/override-config-rebase-cousins.
-ok 16 - --rebase-merges overrides rebase.rebaseMerges=rebase-cousins
+expecting success of 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 1405 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 3430.17 'refs/rewritten/* is worktree-local': 
-	git worktree add wt &&
-	cat >wt/script-from-scratch <<-\EOF &&
-	label xyz
-	exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
-	exec git rev-parse --verify refs/rewritten/xyz >b
-	EOF
+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
+		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 1406 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf
 
-	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
-	git -C wt rebase -i HEAD &&
-	test_must_be_empty wt/a &&
-	test_cmp_rev HEAD "$(cat wt/b)"
+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 1407 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF
 
-Preparing worktree (new branch 'wt')
-HEAD is now at 2051b56 E
-Rebasing (1/3)
Rebasing (2/3)
Executing: GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
-fatal: Needed a single revision
-Rebasing (3/3)
Executing: git rev-parse --verify refs/rewritten/xyz >b
-Successfully rebased and updated refs/heads/wt.
-ok 17 - refs/rewritten/* is worktree-local
+expecting success of 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 1408 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 3430.18 '--abort cleans up refs/rewritten': 
-	git checkout -b abort-cleans-refs-rewritten H &&
-	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
-	git rev-parse --verify refs/rewritten/onto &&
-	git rebase --abort &&
-	test_must_fail git rev-parse --verify refs/rewritten/onto
+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 1409 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-Switched to a new branch 'abort-cleans-refs-rewritten'
-Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
-2051b561a3f30f5455d33a5269d3851790a86f42
-fatal: Needed a single revision
-ok 18 - --abort cleans up refs/rewritten
+expecting success of 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 1410 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 3430.19 '--quit cleans up refs/rewritten': 
-	git checkout -b quit-cleans-refs-rewritten H &&
-	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
-	git rev-parse --verify refs/rewritten/onto &&
-	git rebase --quit &&
-	test_must_fail git rev-parse --verify refs/rewritten/onto
+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 1411 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-Switched to a new branch 'quit-cleans-refs-rewritten'
-Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
-2051b561a3f30f5455d33a5269d3851790a86f42
-fatal: Needed a single revision
-ok 19 - --quit cleans up refs/rewritten
+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 1412 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
-expecting success of 3430.20 'post-rewrite hook and fixups work for merges': 
-	git checkout -b post-rewrite H &&
-	test_commit same1 &&
-	git reset --hard HEAD^ &&
-	test_commit same2 &&
-	git merge -m "to fix up" same1 &&
-	echo same old same old >same2.t &&
-	test_tick &&
-	git commit --fixup HEAD same2.t &&
-	fixup="$(git rev-parse HEAD)" &&
+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 1413 - setup LF checkout 
 
-	test_hook post-rewrite <<-\EOF &&
-	cat >actual
-	EOF
+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 1414 - setup CRLF checkout 
 
-	test_tick &&
-	git rebase -i --autosquash -r HEAD^^^ &&
-	printf "%s %s\n%s %s\n%s %s\n%s %s\n" >expect $(git rev-parse \
-		$fixup^^2 HEAD^2 \
-		$fixup^^ HEAD^ \
-		$fixup^ HEAD \
-		$fixup HEAD) &&
-	test_cmp expect actual
+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 1415 - setup LF_mix_CR checkout 
 
-Switched to a new branch 'post-rewrite'
-[post-rewrite 7b22597] same1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 same1.t
-HEAD is now at 233d48a H
-[post-rewrite 60bad05] same2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 same2.t
-Merge made by the 'ort' strategy.
- same1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 same1.t
-[post-rewrite 621ea5d] fixup! to fix up
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Successfully rebased and updated refs/heads/post-rewrite.
-ok 20 - post-rewrite hook and fixups work for merges
+expecting success of 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 1416 - setup CRLF_mix_LF checkout 
 
-expecting success of 3430.21 'refuse to merge ancestors of HEAD': 
-	echo "merge HEAD^" >script-from-scratch &&
-	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
-	before="$(git rev-parse HEAD)" &&
-	git rebase -i HEAD &&
-	test_cmp_rev HEAD $before
+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 1417 - setup LF_nul checkout 
 
-Rebasing (1/1)
Successfully rebased and updated refs/heads/post-rewrite.
-ok 21 - refuse to merge ancestors of HEAD
+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
+		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 1418 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=
 
-expecting success of 3430.22 'root commits': 
-	git checkout --orphan unrelated &&
-	test_commit --author "Parsnip <root@example.com>" second-root &&
-	test_commit third-root &&
-	cat >script-from-scratch <<-\EOF &&
-	pick third-root
-	label first-branch
-	reset [new root]
-	pick second-root
-	merge first-branch # Merge the 3rd root
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i --force-rebase --root -r &&
-	test "Parsnip" = "$(git show -s --format=%an HEAD^)" &&
-	test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) &&
-	test $(git rev-parse second-root:second-root.t) = \
-		$(git rev-parse HEAD^:second-root.t) &&
-	test_cmp_graph HEAD <<-\EOF &&
-	*   Merge the 3rd root
-	|\
-	| * third-root
-	* second-root
-	EOF
+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 1419 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF
 
-	: fast forward if possible &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_might_fail git config --unset sequence.editor &&
-	test_tick &&
-	git rebase -i --root -r &&
-	test_cmp_rev HEAD $before
+expecting success of 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 1420 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF
 
-Switched to a new branch 'unrelated'
-[unrelated (root-commit) b54e30e] second-root
- Author: Parsnip <root@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 A.t
- create mode 100644 B.t
- create mode 100644 C.t
- create mode 100644 D.t
- create mode 100644 F.t
- create mode 100644 G.t
- create mode 100644 same1.t
- create mode 100644 same2.t
- create mode 100644 second-root.t
-[unrelated d18eb0b] third-root
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third-root.t
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD 94a1433] Merge the 3rd root
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:41:13 2005 -0700
-Successfully rebased and updated refs/heads/unrelated.
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/unrelated.
-ok 22 - root commits
+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 1421 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-expecting success of 3430.23 'a "merge" into a root commit is a fast-forward': 
-	head=$(git rev-parse HEAD) &&
-	cat >script-from-scratch <<-EOF &&
-	reset [new root]
-	merge $head
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r HEAD^ &&
-	test_cmp_rev HEAD $head
+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 1422 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
 
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/unrelated.
-ok 23 - a "merge" into a root commit is a fast-forward
+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 1423 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 3430.24 'A root commit can be a cousin, treat it that way': 
-	git checkout --orphan khnum &&
-	test_commit yama &&
-	git checkout -b asherah main &&
-	test_commit shamkat &&
-	git merge --allow-unrelated-histories khnum &&
-	test_tick &&
-	git rebase -f -r HEAD^ &&
-	test_cmp_rev ! HEAD^2 khnum &&
-	test_cmp_graph HEAD^.. <<-\EOF &&
-	*   Merge branch 'khnum' into asherah
-	|\
-	| * yama
-	o shamkat
-	EOF
-	test_tick &&
-	git rebase --rebase-merges=rebase-cousins HEAD^ &&
-	test_cmp_graph HEAD^.. <<-\EOF
-	*   Merge branch 'khnum' into asherah
-	|\
-	| * yama
-	|/
-	o shamkat
-	EOF
+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 1424 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
-Switched to a new branch 'khnum'
-[khnum (root-commit) 467d393] yama
- Author: A U Thor <author@example.com>
- 11 files changed, 11 insertions(+)
- create mode 100644 A.t
- create mode 100644 B.t
- create mode 100644 C.t
- create mode 100644 D.t
- create mode 100644 F.t
- create mode 100644 G.t
- create mode 100644 same1.t
- create mode 100644 same2.t
- create mode 100644 second-root.t
- create mode 100644 third-root.t
- create mode 100644 yama.t
-Switched to a new branch 'asherah'
-[asherah 1bf96fb] shamkat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shamkat.t
-Merge made by the 'ort' strategy.
- C.t           | 1 +
- F.t           | 1 +
- same1.t       | 1 +
- same2.t       | 1 +
- second-root.t | 1 +
- third-root.t  | 1 +
- yama.t        | 1 +
- 7 files changed, 7 insertions(+)
- create mode 100644 C.t
- create mode 100644 F.t
- create mode 100644 same1.t
- create mode 100644 same2.t
- create mode 100644 second-root.t
- create mode 100644 third-root.t
- create mode 100644 yama.t
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
-ok 24 - A root commit can be a cousin, treat it that way
+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 1425 - setup LF checkout  with -c core.eol=native
 
-expecting success of 3430.25 'labels that are object IDs are rewritten': 
-	git checkout --detach B &&
-	test_commit I &&
-	third=$(git rev-parse HEAD) &&
-	git checkout -b labels main &&
-	git merge --no-commit $third &&
-	test_tick &&
-	git commit -m "Merge commit '$third' into labels" &&
-	echo noop >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r A &&
-	grep "^label $third-" .git/ORIGINAL-TODO &&
-	! grep "^label $third$" .git/ORIGINAL-TODO
+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 1426 - setup CRLF checkout  with -c core.eol=native
 
-HEAD is now at d9df450 B
-[detached HEAD fe616a2] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Previous HEAD position was fe616a2 I
-Switched to a new branch 'labels'
-Automatic merge went well; stopped before committing as requested
-[labels c2d3038] Merge commit 'fe616a237dd65b590ca6e0198de60da220f3d650' into labels
- Author: A U Thor <author@example.com>
-Successfully rebased and updated refs/heads/labels.
-label fe616a237dd65b590ca6e0198de60da220f3d650-2
-ok 25 - labels that are object IDs are rewritten
+expecting success of 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 1427 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 3430.26 'octopus merges': 
-	git checkout -b three &&
-	test_commit before-octopus &&
-	test_commit three &&
-	git checkout -b two HEAD^ &&
-	test_commit two &&
-	git checkout -b one HEAD^ &&
-	test_commit one &&
-	test_tick &&
-	(GIT_AUTHOR_NAME="Hank" GIT_AUTHOR_EMAIL="hank@sea.world" \
-	 git merge -m "Tüntenfüsch" two three) &&
+expecting success of 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 1428 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-	: fast forward if possible &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase -i -r HEAD^^ &&
-	test_cmp_rev HEAD $before &&
+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 1429 - setup LF_nul checkout  with -c core.eol=native
 
-	test_tick &&
-	git rebase -i --force-rebase -r HEAD^^ &&
-	test "Hank" = "$(git show -s --format=%an HEAD)" &&
-	test "$before" != $(git rev-parse HEAD) &&
-	test_cmp_graph HEAD^^.. <<-\EOF
-	*-.   Tüntenfüsch
-	|\ \
-	| | * three
-	| * | two
-	| |/
-	* / one
-	|/
-	o before-octopus
-	EOF
+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
+		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 1430 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native
 
-Switched to a new branch 'three'
-[three 470fcca] before-octopus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 before-octopus.t
-[three e66d291] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to a new branch 'two'
-[two a4936a4] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to a new branch 'one'
-[one 05ee3b8] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-warning: refname 'two' is ambiguous.
-warning: refname 'three' is ambiguous.
-Trying simple merge with two
-Trying simple merge with three
-Merge made by the 'octopus' strategy.
- three.t | 1 +
- two.t   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 three.t
- create mode 100644 two.t
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Successfully rebased and updated refs/heads/one.
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Trying simple merge with 0f6eed9023c4e296d1c0ee55e03ff8df76f0000a
-Trying simple merge with 890212b565584e3c1fab7e2e887b673178afac2b
-Merge made by the 'octopus' strategy.
-Successfully rebased and updated refs/heads/one.
-ok 26 - octopus merges
+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 1431 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF
 
-expecting success of 3430.27 'with --autosquash and --exec': 
-	git checkout -b with-exec H &&
-	echo Booh >B.t &&
-	test_tick &&
-	git commit --fixup B B.t &&
-	write_script show.sh <<-\EOF &&
-	subject="$(git show -s --format=%s HEAD)"
-	content="$(git diff HEAD^ HEAD | tail -n 1)"
-	echo "$subject: $content"
-	EOF
-	test_tick &&
-	git rebase -ir --autosquash --exec ./show.sh A >actual &&
-	grep "B: +Booh" actual &&
-	grep "E: +Booh" actual &&
-	grep "G: +G" actual
+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 1432 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-Switched to a new branch 'with-exec'
-[with-exec 63df3da] fixup! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/22)
Rebasing (2/22)
Rebasing (3/22)
Rebasing (4/22)
Rebasing (5/22)
Executing: ./show.sh
-Rebasing (6/22)
Rebasing (7/22)
Rebasing (8/22)
Rebasing (9/22)
Executing: ./show.sh
-Rebasing (10/22)
Rebasing (11/22)
Rebasing (12/22)
Executing: ./show.sh
-Rebasing (13/22)
Rebasing (14/22)
Executing: ./show.sh
-Rebasing (15/22)
Rebasing (16/22)
Rebasing (17/22)
Rebasing (18/22)
Executing: ./show.sh
-Rebasing (19/22)
Rebasing (20/22)
Executing: ./show.sh
-Rebasing (21/22)
Rebasing (22/22)
Executing: ./show.sh
-Successfully rebased and updated refs/heads/with-exec.
-B: +Booh
-E: +Booh
-G: +G
-ok 27 - with --autosquash and --exec
+expecting success of 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 1433 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 3430.28 '--continue after resolving conflicts after a merge': 
-	git checkout -b already-has-g E &&
-	git cherry-pick E..G &&
-	test_commit H2 &&
+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 1434 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-	git checkout -b conflicts-in-merge H &&
-	test_commit H2 H2.t conflicts H2-conflict &&
-	test_must_fail git rebase -r already-has-g &&
-	grep conflicts H2.t &&
-	echo resolved >H2.t &&
-	git add -u &&
-	git rebase --continue &&
-	test_must_fail git rev-parse --verify HEAD^2 &&
-	test_path_is_missing .git/MERGE_HEAD
+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 1435 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-Switched to a new branch 'already-has-g'
-[already-has-g b1594c7] F
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[already-has-g 0944233] G
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[already-has-g 7148914] H2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H2.t
-Switched to a new branch 'conflicts-in-merge'
-[conflicts-in-merge 43d4486] H2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H2.t
-warning: skipped previously applied commit ca2c861
-warning: skipped previously applied commit 088b00a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging H2.t
-CONFLICT (add/add): Merge conflict in H2.t
-error: could not apply 43d4486... H2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 43d4486... H2
-conflicts
-[detached HEAD a4aa1f0] H2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflicts-in-merge.
-fatal: Needed a single revision
-ok 28 - --continue after resolving conflicts after a merge
+expecting success of 0027.1436 'setup config for checkout attr=auto ident= aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1436 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
 
-expecting success of 3430.29 '--rebase-merges with strategies': 
-	git checkout -b with-a-strategy F &&
-	test_tick &&
-	git merge -m "Merge conflicting-G" conflicting-G &&
+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 1437 - setup LF checkout 
 
-	: first, test with a merge strategy option &&
-	git rebase -ir -Xtheirs G &&
-	echo conflicting-G >expect &&
-	test_cmp expect G.t &&
+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 1438 - setup CRLF checkout 
+
+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 1439 - setup LF_mix_CR checkout 
+
+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 1440 - setup CRLF_mix_LF checkout 
+
+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 1441 - setup LF_nul checkout 
+
+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
+		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 1442 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=
 
-	: now, try with a merge strategy other than recursive &&
-	git reset --hard @{1} &&
-	write_script git-merge-override <<-\EOF &&
-	echo overridden$1 >>G.t
-	git add G.t
-	EOF
-	PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
-	test_write_lines G overridden--xopt >expect &&
-	test_cmp expect G.t
+expecting success of 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 1443 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF
 
-Switched to a new branch 'with-a-strategy'
-Merge made by the 'ort' strategy.
- G.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging G.t
-Merge made by the 'ort' strategy.
-Successfully rebased and updated refs/heads/with-a-strategy.
-HEAD is now at 00d6684 Merge conflicting-G
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Merge made by the 'override' strategy.
-Successfully rebased and updated refs/heads/with-a-strategy.
-ok 29 - --rebase-merges with strategies
+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 1444 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 3430.30 '--rebase-merges with commit that can generate bad characters for filename': 
-	git checkout -b colon-in-label E &&
-	git merge -m "colon: this should work" G &&
-	git rebase --rebase-merges --force-rebase E
+expecting success of 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 1445 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-Switched to a new branch 'colon-in-label'
-Merge made by the 'ort' strategy.
- F.t | 1 +
- G.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 F.t
- create mode 100644 G.t
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/colon-in-label.
-ok 30 - --rebase-merges with commit that can generate bad characters for filename
+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 1446 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
 
-expecting success of 3430.31 '--rebase-merges with message matched with onto label': 
-	git checkout -b onto-label E &&
-	git merge -m onto G &&
-	git rebase --rebase-merges --force-rebase E &&
-	test_cmp_graph <<-\EOF
-	*   onto
-	|\
-	| * G
-	| * F
-	* |   E
-	|\ \
-	| * | B
-	* | | D
-	| |/
-	|/|
-	* | C
-	|/
-	* A
-	EOF
+expecting success of 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 1447 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul
 
-Switched to a new branch 'onto-label'
-Merge made by the 'ort' strategy.
- F.t | 1 +
- G.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 F.t
- create mode 100644 G.t
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/onto-label.
-ok 31 - --rebase-merges with message matched with onto label
+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 1448 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
 
-expecting success of 3430.32 'progress shows the correct total': 
-	git checkout -b progress H &&
-	git rebase --rebase-merges --force-rebase --verbose A 2> err &&
-	# Expecting "Rebasing (N/14)" here, no bogus total number
-	grep "^Rebasing.*/14.$" err >progress &&
-	test_line_count = 14 progress
+expecting success of 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 1449 - setup LF checkout  with -c core.eol=native
 
-Switched to a new branch 'progress'
-Changes from 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 to 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050:
-ok 32 - progress shows the correct total
+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 1450 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 3430.33 'truncate label names': 
-	commit=$(git commit-tree -p HEAD^ -p HEAD -m "0123456789 我 123" HEAD^{tree}) &&
-	git merge --ff-only $commit &&
+expecting success of 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 1451 - setup LF_mix_CR checkout  with -c core.eol=native
 
-	done="$(git rev-parse --git-path rebase-merge/done)" &&
-	git -c rebase.maxLabelLength=14 rebase --rebase-merges -x "cp \"$done\" out" --root &&
-	grep "label 0123456789-我$" out &&
-	git -c rebase.maxLabelLength=13 rebase --rebase-merges -x "cp \"$done\" out" --root &&
-	grep "label 0123456789-$" out
+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 1452 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-Updating f13795a..96fcf0c
-Fast-forward
-Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
-Successfully rebased and updated refs/heads/progress.
-label 0123456789-我
-Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
-Successfully rebased and updated refs/heads/progress.
-label 0123456789-
-ok 33 - truncate label names
+expecting success of 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 1453 - setup LF_nul checkout  with -c core.eol=native
 
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3505-cherry-pick-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3505-cherry-pick-empty/.git/
-expecting success of 3505.1 'setup': 
+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
+		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 1454 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native
 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
+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 1455 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF
 
-	git checkout -b empty-message-branch &&
-	echo third >> file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit --allow-empty-message -m "" &&
+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 1456 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-	git checkout main &&
-	git checkout -b empty-change-branch &&
-	test_tick &&
-	git commit --allow-empty -m "empty"
+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 1457 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native 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
+	
+ok 1458 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-[main (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'empty-message-branch'
-[empty-message-branch d6aa1e8] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Switched to a new branch 'empty-change-branch'
-[empty-change-branch 0f51a27] empty
- Author: A U Thor <author@example.com>
-ok 1 - setup
+expecting success of 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 1459 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 3505.2 'cherry-pick an empty commit': 
-	git checkout main &&
-	test_expect_code 1 git cherry-pick empty-change-branch
+expecting success of 0027.1460 'setup config for checkout attr= ident= aeol=lf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1460 - setup config for checkout attr= ident= aeol=lf core.autocrlf=false
 
-Switched to branch 'main'
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+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 1461 - setup LF checkout 
 
-    git commit --allow-empty
+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 1462 - setup CRLF checkout 
 
-Otherwise, please use 'git cherry-pick --skip'
-On branch main
-You are currently cherry-picking commit 0f51a27.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+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 1463 - setup LF_mix_CR checkout 
 
-nothing to commit, working tree clean
-ok 2 - cherry-pick an empty commit
+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 1464 - setup CRLF_mix_LF checkout 
 
-expecting success of 3505.3 'index lockfile was removed': 
-	test ! -f .git/index.lock
+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 1465 - setup LF_nul checkout 
 
-ok 3 - index lockfile was removed
+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
+		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 1466 - ls-files --eol attr=  aeol=lf core.autocrlf=false core.eol=
 
-expecting success of 3505.4 'cherry-pick a commit with an empty message': 
-	test_when_finished "git reset --hard empty-message-branch~1" &&
-	git checkout main &&
-	git cherry-pick empty-message-branch
+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 1467 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF
 
-Already on 'main'
-warning: cancelling a cherry picking in progress
-[main d800ed2] 
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-HEAD is now at 0c72e4f first
-ok 4 - cherry-pick a commit with an empty message
+expecting success of 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 1468 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 3505.5 'index lockfile was removed': 
-	test ! -f .git/index.lock
+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 1469 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-ok 5 - index lockfile was removed
+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 1470 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR
 
-expecting success of 3505.6 'cherry-pick a commit with an empty message with --allow-empty-message': 
-	git checkout -f main &&
-	git cherry-pick --allow-empty-message empty-message-branch
+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 1471 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_nul
 
-Already on 'main'
-[main d800ed2] 
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 6 - cherry-pick a commit with an empty message with --allow-empty-message
+expecting success of 0027.1472 'setup config for checkout attr= ident= aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1472 - setup config for checkout attr= ident= aeol=crlf core.autocrlf=false
 
-expecting success of 3505.7 'cherry pick an empty non-ff commit without --allow-empty': 
-	git checkout main &&
-	echo fourth >>file2 &&
-	git add file2 &&
-	git commit -m "fourth" &&
-	test_must_fail git cherry-pick empty-change-branch
+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 1473 - setup LF checkout 
 
-Already on 'main'
-[main 36c19c0] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 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 1474 - setup CRLF checkout 
 
-    git commit --allow-empty
+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 1475 - setup LF_mix_CR checkout 
 
-Otherwise, please use 'git cherry-pick --skip'
-On branch main
-You are currently cherry-picking commit 0f51a27.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+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 1476 - setup CRLF_mix_LF checkout 
 
-nothing to commit, working tree clean
-ok 7 - cherry pick an empty non-ff commit without --allow-empty
+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 1477 - setup LF_nul checkout 
 
-expecting success of 3505.8 'cherry pick an empty non-ff commit with --allow-empty': 
-	git checkout main &&
-	git cherry-pick --allow-empty empty-change-branch
+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
+		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 1478 - ls-files --eol attr=  aeol=crlf core.autocrlf=false core.eol=
 
-Already on 'main'
-warning: cancelling a cherry picking in progress
-[main 72a973f] empty
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-ok 8 - cherry pick an empty non-ff commit with --allow-empty
+expecting success of 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 1479 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF
 
-expecting success of 3505.9 'cherry pick with --keep-redundant-commits': 
-	git checkout main &&
-	git cherry-pick --keep-redundant-commits HEAD^
+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 1480 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF
 
-Already on 'main'
-[main 938d13f] fourth
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-ok 9 - cherry pick with --keep-redundant-commits
+expecting success of 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 1481 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-expecting success of 3505.10 'cherry-pick a commit that becomes no-op (prep)': 
-	git checkout main &&
-	git branch fork &&
-	echo foo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "add file2 on main" &&
+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 1482 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR
 
-	git checkout fork &&
-	echo foo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "add file2 on the side"
+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 1483 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_nul
 
-Already on 'main'
-[main aa68455] add file2 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'fork'
-[fork 521fc70] add file2 on the side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - cherry-pick a commit that becomes no-op (prep)
+expecting success of 0027.1484 'setup config for checkout attr= ident= aeol=lf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1484 - setup config for checkout attr= ident= aeol=lf core.autocrlf=true
 
-expecting success of 3505.11 'cherry-pick a no-op with neither --keep-redundant nor --empty': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	test_must_fail git cherry-pick main
+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 1485 - setup LF checkout 
 
-HEAD is now at 521fc70 add file2 on the side
-Note: switching to 'fork^0'.
+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 1486 - setup CRLF checkout 
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1487 - setup LF_mix_CR checkout 
 
-If you want to 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.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 1488 - setup CRLF_mix_LF checkout 
 
-  git switch -c <new-branch-name>
+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 1489 - setup LF_nul checkout 
 
-Or undo this operation with:
+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
+		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 1490 - ls-files --eol attr=  aeol=lf core.autocrlf=true core.eol=
 
-  git switch -
+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 1491 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1492 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF
 
-HEAD is now at 521fc70 add file2 on the side
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+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 1493 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF
 
-    git commit --allow-empty
+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 1494 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR
 
-Otherwise, please use 'git cherry-pick --skip'
-HEAD detached at 521fc70
-You are currently cherry-picking commit aa68455.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+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 1495 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_nul
 
-nothing to commit, working tree clean
-ok 11 - cherry-pick a no-op with neither --keep-redundant nor --empty
+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 1496 - setup config for checkout attr= ident= aeol=crlf core.autocrlf=true
 
-expecting success of 3505.12 'cherry-pick a no-op with --keep-redundant': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	git cherry-pick --keep-redundant-commits main &&
-	git show -s --format=%s >actual &&
-	echo "add file2 on main" >expect &&
-	test_cmp expect actual
+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 1497 - setup LF checkout 
 
-HEAD is now at 521fc70 add file2 on the side
-HEAD is now at 521fc70 add file2 on the side
-[detached HEAD ffffb2b] add file2 on main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
-ok 12 - cherry-pick a no-op with --keep-redundant
+expecting success of 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 1498 - setup CRLF checkout 
 
-expecting success of 3505.13 '--keep-redundant-commits is incompatible with operations': 
-	test_must_fail git cherry-pick HEAD 2>output &&
-	test_grep "The previous cherry-pick is now empty" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --continue 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --skip 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --abort 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort" output &&
-	test_must_fail git cherry-pick --keep-redundant-commits --quit 2>output &&
-	test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit" output &&
-	git cherry-pick --abort
+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 1499 - setup LF_mix_CR checkout 
 
-HEAD detached from 521fc70
-You are currently cherry-picking commit ffffb2b.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+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 1500 - setup CRLF_mix_LF checkout 
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	output
+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 1501 - setup LF_nul checkout 
 
-nothing added to commit but untracked files present (use "git add" to track)
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort
-fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit
-ok 13 - --keep-redundant-commits is incompatible with operations
+expecting success of 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
+		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 1502 - ls-files --eol attr=  aeol=crlf core.autocrlf=true core.eol=
 
-expecting success of 3505.14 '--empty is incompatible with operations': 
-	test_must_fail git cherry-pick HEAD 2>output &&
-	test_grep "The previous cherry-pick is now empty" output &&
-	test_must_fail git cherry-pick --empty=stop --continue 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --continue" output &&
-	test_must_fail git cherry-pick --empty=stop --skip 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --skip" output &&
-	test_must_fail git cherry-pick --empty=stop --abort 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --abort" output &&
-	test_must_fail git cherry-pick --empty=stop --quit 2>output &&
-	test_grep "fatal: cherry-pick: --empty cannot be used with --quit" output &&
-	git cherry-pick --abort
+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 1503 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF
 
-HEAD detached from 521fc70
-You are currently cherry-picking commit ffffb2b.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+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 1504 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	output
+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 1505 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_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.
-fatal: cherry-pick: --empty cannot be used with --continue
-fatal: cherry-pick: --empty cannot be used with --skip
-fatal: cherry-pick: --empty cannot be used with --abort
-fatal: cherry-pick: --empty cannot be used with --quit
-ok 14 - --empty is incompatible with operations
+expecting success of 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 1506 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR
 
-expecting success of 3505.15 'cherry-pick a no-op with --empty=stop': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	test_must_fail git cherry-pick --empty=stop main 2>output &&
-	test_grep "The previous cherry-pick is now empty" output
+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 1507 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_nul
 
-HEAD is now at ffffb2b add file2 on main
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1508 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
 
-  ffffb2b add file2 on main
+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 1509 - setup LF checkout  with -c core.eol=lf
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1510 - setup CRLF checkout  with -c core.eol=lf
 
- git branch <new-branch-name> ffffb2b
+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 1511 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-HEAD is now at 521fc70 add file2 on the side
-HEAD detached at 521fc70
-You are currently cherry-picking commit aa68455.
-  (all conflicts fixed: run "git cherry-pick --continue")
-  (use "git cherry-pick --skip" to skip this patch)
-  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+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 1512 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	output
+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 1513 - setup LF_nul checkout  with -c 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 15 - cherry-pick a no-op with --empty=stop
+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
+		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 1514 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 3505.16 'cherry-pick a no-op with --empty=drop': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	git cherry-pick --empty=drop main &&
-	test_commit_message HEAD -m "add file2 on the side"
+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 1515 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-HEAD is now at 521fc70 add file2 on the side
-HEAD is now at 521fc70 add file2 on the side
-dropping aa68455a495805013ddc30249c4c19aa0866fc23 add file2 on main -- patch contents already upstream
-ok 16 - cherry-pick a no-op with --empty=drop
+expecting success of 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 1516 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 3505.17 'cherry-pick a no-op with --empty=keep': 
-	git reset --hard &&
-	git checkout fork^0 &&
-	git cherry-pick --empty=keep main &&
-	test_commit_message HEAD -m "add file2 on main"
+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 1517 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-HEAD is now at 521fc70 add file2 on the side
-HEAD is now at 521fc70 add file2 on the side
-[detached HEAD ffffb2b] add file2 on main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
-ok 17 - cherry-pick a no-op with --empty=keep
+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 1518 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3504-cherry-pick-rerere.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3504-cherry-pick-rerere/.git/
-expecting success of 3504.1 'setup': 
-	test_commit foo &&
-	test_commit foo-main foo &&
-	test_commit bar-main bar &&
+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 1519 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-	git checkout -b dev foo &&
-	test_commit foo-dev foo &&
-	test_commit bar-dev bar &&
-	git config rerere.enabled 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 1520 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
 
-[main (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main b0605b8] foo-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main f55d303] bar-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'dev'
-[dev 1d8ba7e] foo-dev
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[dev 5392a79] bar-dev
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-ok 1 - setup
+expecting success of 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 1521 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 3504.2 'conflicting merge': 
-	test_must_fail git merge main
+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 1522 - setup CRLF checkout  with -c core.eol=lf
 
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-Recorded preimage for 'bar'
-Recorded preimage for 'foo'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - conflicting merge
+expecting success of 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 1523 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 3504.3 'fixup': 
-	echo foo-resolved >foo &&
-	echo bar-resolved >bar &&
-	git commit -am resolved &&
-	cp foo foo-expect &&
-	cp bar bar-expect &&
-	git reset --hard HEAD^
+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 1524 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-Recorded resolution for 'bar'.
-Recorded resolution for 'foo'.
-[dev 85492e3] resolved
- Author: A U Thor <author@example.com>
-HEAD is now at 5392a79 bar-dev
-ok 3 - fixup
+expecting success of 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 1525 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 3504.4 'cherry-pick conflict with --rerere-autoupdate': 
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	git diff-files --quiet &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
+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
+		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 1526 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf
 
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-[dev 41ff336] foo-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply f55d303... bar-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'bar' using previous resolution.
-[dev c0de054] bar-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 4 - cherry-pick conflict with --rerere-autoupdate
+expecting success of 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 1527 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 3504.5 'cherry-pick conflict respects rerere.autoUpdate': 
-	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	git diff-files --quiet &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
+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 1528 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-[dev 41ff336] foo-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply f55d303... bar-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'bar' using previous resolution.
-[dev c0de054] bar-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 5 - cherry-pick conflict respects rerere.autoUpdate
+expecting success of 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 1529 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 3504.6 'cherry-pick conflict with --no-rerere-autoupdate': 
-	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	test_must_fail git diff-files --quiet &&
-	git add foo &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	test_must_fail git diff-files --quiet &&
-	git add bar &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
+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 1530 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'foo' using previous resolution.
-[dev 41ff336] foo-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply f55d303... bar-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'bar' using previous resolution.
-[dev c0de054] bar-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 6 - cherry-pick conflict with --no-rerere-autoupdate
+expecting success of 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 1531 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 3504.7 'cherry-pick --continue rejects --rerere-autoupdate': 
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
-	echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
-	test_cmp expect actual &&
-	test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
-	echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
-	test_cmp expect actual &&
-	git cherry-pick --abort
+expecting success of 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 1532 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
 
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-ok 7 - cherry-pick --continue rejects --rerere-autoupdate
+expecting success of 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 1533 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 3504.8 'cherry-pick --rerere-autoupdate more than once': 
-	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-main &&
-	test_must_fail git diff-files --quiet &&
-	git cherry-pick --abort
+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 1534 - setup CRLF checkout  with -c core.eol=lf
 
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'foo' using previous resolution.
-ok 8 - cherry-pick --rerere-autoupdate more than once
+expecting success of 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 1535 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 3504.9 'cherry-pick conflict without rerere': 
-	test_config rerere.enabled false &&
-	test_must_fail git cherry-pick foo-main &&
-	grep ===== foo &&
-	grep foo-dev foo &&
-	grep foo-main foo
+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 1536 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-=======
-foo-dev
-foo-main
->>>>>>> b0605b8 (foo-main)
-ok 9 - cherry-pick conflict without rerere
+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 1537 - setup LF_nul checkout  with -c core.eol=lf
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3506-cherry-pick-ff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3506-cherry-pick-ff/.git/
-expecting success of 3506.1 'setup': 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
-	git tag first &&
+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
+		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 1538 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf
 
-	git checkout -b other &&
-	echo second >> file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "second" &&
-	git tag second &&
-	test_oid_cache <<-EOF
-	cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1
-	cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d
-	EOF
+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 1539 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-[main (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'other'
-[other 453a047] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+expecting success of 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 1540 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 3506.2 'cherry-pick using --ff fast forwards': 
-	git checkout main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick --ff second &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify second)"
+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 1541 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-Switched to branch 'main'
-HEAD is now at 0c72e4f first
-ok 2 - cherry-pick using --ff fast forwards
+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 1542 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 3506.3 'cherry-pick not using --ff does not fast forwards': 
-	git checkout main &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick second &&
-	test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)"
+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 1543 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-[main 43e4ff7] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 3 - cherry-pick not using --ff does not fast forwards
+expecting success of 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 1544 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 3506.4 'merge setup': 
-	git checkout main &&
-	git reset --hard first &&
-	echo new line >A &&
-	git add A &&
-	test_tick &&
-	git commit -m "add line to A" A &&
-	git tag A &&
-	git checkout -b side first &&
-	echo new line >B &&
-	git add B &&
-	test_tick &&
-	git commit -m "add line to B" B &&
-	git tag B &&
-	git checkout main &&
-	git merge side &&
-	git tag C &&
-	git checkout -b new A
+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 1545 - setup LF checkout  with -c core.eol=lf
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-[main e3ca70e] add line to A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Switched to a new branch 'side'
-[side 5faaf2e] add line to B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- B | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to a new branch 'new'
-ok 4 - merge setup
+expecting success of 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 1546 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 3506.5 'cherry-pick explicit first parent of a non-merge with --ff': 
-	git reset --hard A -- &&
-	git cherry-pick --ff -m 1 B &&
-	git diff --exit-code C --
+expecting success of 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 1547 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-HEAD is now at e3ca70e add line to A
-[new d859d20] add line to B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-ok 5 - cherry-pick explicit first parent of a non-merge with --ff
+expecting success of 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 1548 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 3506.6 'cherry pick a merge with --ff but without -m should fail': 
-	git reset --hard A -- &&
-	test_must_fail git cherry-pick --ff C &&
-	git diff --exit-code A --
+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 1549 - setup LF_nul checkout  with -c core.eol=lf
 
-HEAD is now at e3ca70e add line to A
-error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a is a merge but no -m option was given.
-fatal: cherry-pick failed
-ok 6 - cherry pick a merge with --ff but without -m should fail
+expecting success of 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
+		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 1550 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=lf
 
-expecting success of 3506.7 'cherry pick with --ff a merge (1)': 
-	git reset --hard A -- &&
-	git cherry-pick --ff -m 1 C &&
-	git diff --exit-code C &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+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 1551 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-HEAD is now at e3ca70e add line to A
-ok 7 - cherry pick with --ff a merge (1)
+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 1552 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 3506.8 'cherry pick with --ff a merge (2)': 
-	git reset --hard B -- &&
-	git cherry-pick --ff -m 2 C &&
-	git diff --exit-code C &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+expecting success of 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 1553 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-HEAD is now at 5faaf2e add line to B
-ok 8 - cherry pick with --ff a merge (2)
+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 1554 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 3506.9 'cherry pick a merge relative to nonexistent parent with --ff should fail': 
-	git reset --hard B -- &&
-	test_must_fail git cherry-pick --ff -m 3 C
+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 1555 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-HEAD is now at 5faaf2e add line to B
-error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a does not have parent 3
-fatal: cherry-pick failed
-ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail
+expecting success of 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 1556 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 3506.10 'cherry pick a root commit with --ff': 
-	git reset --hard first -- &&
-	git rm file1 &&
-	echo first >file2 &&
-	git add file2 &&
-	git commit --amend -m "file2" &&
-	git cherry-pick --ff first &&
-	test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)"
+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 1557 - setup LF checkout  with -c core.eol=lf
 
-HEAD is now at 0c72e4f first
-rm 'file1'
-[new 1654ff9] file2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[new 1df192c] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 10 - cherry pick a root commit with --ff
+expecting success of 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 1558 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 3506.11 'cherry-pick --ff on unborn branch': 
-	git checkout --orphan unborn &&
-	git rm --cached -r . &&
-	rm -rf * &&
-	git cherry-pick --ff first &&
-	test_cmp_rev first HEAD
+expecting success of 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 1559 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-Switched to a new branch 'unborn'
-rm 'file1'
-rm 'file2'
-ok 11 - cherry-pick --ff on unborn branch
+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 1560 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3501-revert-cherry-pick.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3501-revert-cherry-pick/.git/
-expecting success of 3501.1 'setup': 
+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 1561 - setup LF_nul checkout  with -c core.eol=lf
 
-	for l in a b c d e f g h i j k l m n o
-	do
-		echo $l$l$l$l$l$l$l$l$l || return 1
-	done >oops &&
+expecting success of 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
+		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 1562 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf
 
-	test_tick &&
-	git add oops &&
-	git commit -m initial &&
-	git tag initial &&
+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 1563 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-	test_tick &&
-	echo "Add extra line at the end" >>oops &&
-	git commit -a -m added &&
-	git tag added &&
+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 1564 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-	test_tick &&
-	git mv oops spoo &&
-	git commit -m rename1 &&
-	git tag rename1 &&
+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 1565 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-	test_tick &&
-	git checkout -b side initial &&
-	git mv oops opos &&
-	git commit -m rename2 &&
-	git tag rename2
+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 1566 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-[main (root-commit) a242c62] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 15 insertions(+)
- create mode 100644 oops
-[main 4399171] added
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 31df260] rename1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename oops => spoo (100%)
-Switched to a new branch 'side'
-[side f6d0551] rename2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename oops => opos (100%)
-ok 1 - setup
+expecting success of 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 1567 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 3501.2 'cherry-pick --nonsense': 
+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 1568 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
 
-	pos=$(git rev-parse HEAD) &&
-	git diff --exit-code HEAD &&
-	test_must_fail git cherry-pick --nonsense 2>msg &&
-	git diff --exit-code HEAD "$pos" &&
-	test_grep "[Uu]sage:" msg
+expecting success of 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 1569 - setup LF checkout  with -c core.eol=lf
 
-usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
-ok 2 - cherry-pick --nonsense
+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 1570 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 3501.3 'revert --nonsense': 
+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 1571 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-	pos=$(git rev-parse HEAD) &&
-	git diff --exit-code HEAD &&
-	test_must_fail git revert --nonsense 2>msg &&
-	git diff --exit-code HEAD "$pos" &&
-	test_grep "[Uu]sage:" msg
+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 1572 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-usage: git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...
-ok 3 - revert --nonsense
+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 1573 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 3501.4 'cherry-pick after renaming branch': 
+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
+		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 1574 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf
 
-	git checkout rename2 &&
-	git cherry-pick added &&
-	test_cmp_rev rename2 HEAD^ &&
-	grep "Add extra line at the end" opos &&
-	git reflog -1 | grep cherry-pick
+expecting success of 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 1575 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf 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
+	
+ok 1576 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-Note: switching to 'rename2'.
+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 1577 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1578 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-If you want to 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.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 1579 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-  git switch -c <new-branch-name>
+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 1580 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
 
-Or undo this operation with:
+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 1581 - setup LF checkout  with -c core.eol=lf
 
-  git switch -
+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 1582 - setup CRLF checkout  with -c core.eol=lf
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1583 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-HEAD is now at f6d0551 rename2
-[detached HEAD 2da2754] added
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-Add extra line at the end
-2da2754 HEAD@{0}: cherry-pick: added
-ok 4 - cherry-pick after renaming branch
+expecting success of 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 1584 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 3501.5 'revert after renaming branch': 
+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 1585 - setup LF_nul checkout  with -c core.eol=lf
 
-	git checkout rename1 &&
-	git revert added &&
-	test_cmp_rev rename1 HEAD^ &&
-	test_path_is_file spoo &&
-	test_cmp_rev initial:oops HEAD:spoo &&
-	git reflog -1 | grep revert
+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
+		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 1586 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf
 
+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 1587 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1588 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-  2da2754 added
+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 1589 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1590 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
- git branch <new-branch-name> 2da2754
+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 1591 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-HEAD is now at 31df260 rename1
-[detached HEAD 9990ddc] Revert "added"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
-9990ddc HEAD@{0}: revert: Revert "added"
-ok 5 - revert after renaming branch
+expecting success of 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 1592 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
 
-expecting success of 3501.6 'cherry-pick on stat-dirty working tree': 
-	git clone . copy &&
-	(
-		cd copy &&
-		git checkout initial &&
-		test-tool chmtime +40 oops &&
-		git cherry-pick added
-	)
+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 1593 - setup LF checkout  with -c core.eol=lf
 
-Cloning into 'copy'...
-done.
-Note: switching to '9990ddca844ef3875d864da986dfd141d1a88865'.
+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 1594 - setup CRLF checkout  with -c core.eol=lf
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1595 - setup LF_mix_CR checkout  with -c core.eol=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.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 1596 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-  git switch -c <new-branch-name>
+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 1597 - setup LF_nul checkout  with -c core.eol=lf
 
-Or undo this operation with:
+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
+		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 1598 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf
 
-  git switch -
+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 1599 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1600 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1601 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-  9990ddc Revert "added"
+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 1602 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1603 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
- git branch <new-branch-name> 9990ddc
+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 1604 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
 
-HEAD is now at a242c62 initial
-[detached HEAD 096ed54] added
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 6 - cherry-pick on stat-dirty working tree
+expecting success of 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 1605 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 3501.7 'revert forbidden on dirty working tree': 
+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 1606 - setup CRLF checkout  with -c core.eol=lf
 
-	echo content >extra_file &&
-	git add extra_file &&
-	test_must_fail git revert HEAD 2>errors &&
-	test_grep "your local changes would be overwritten by " errors
+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 1607 - setup LF_mix_CR checkout  with -c core.eol=lf
 
+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 1608 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-error: your local changes would be overwritten by revert.
-ok 7 - revert forbidden on dirty working tree
+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 1609 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 3501.8 'cherry-pick on unborn branch': 
-	git switch --orphan unborn &&
-	git rm --cached -r . &&
-	git cherry-pick initial &&
-	git diff --exit-code initial &&
-	test_cmp_rev ! initial HEAD
+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
+		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 1610 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1611 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-  9990ddc Revert "added"
+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 1612 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1613 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
- git branch <new-branch-name> 9990ddc
+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 1614 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-Switched to a new branch 'unborn'
-rm 'extra_file'
-[unborn 38e6d75] initial
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 15 insertions(+)
- create mode 100644 oops
-ok 8 - cherry-pick on unborn branch
+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 1615 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 3501.9 'cherry-pick on unborn branch with --allow-empty': 
-	git checkout --detach &&
-	git branch -D unborn &&
-	git switch --orphan unborn &&
-	git cherry-pick initial --allow-empty &&
-	git diff --exit-code initial &&
-	test_cmp_rev ! initial HEAD
+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 1616 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
 
-HEAD is now at 38e6d75 initial
-Deleted branch unborn (was 38e6d75).
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1617 - setup LF checkout  with -c core.eol=lf
 
-  38e6d75 initial
+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 1618 - setup CRLF checkout  with -c core.eol=lf
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1619 - setup LF_mix_CR checkout  with -c core.eol=lf
 
- git branch <new-branch-name> 38e6d75
+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 1620 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-Switched to a new branch 'unborn'
-[unborn 38e6d75] initial
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 15 insertions(+)
- create mode 100644 oops
-ok 9 - cherry-pick on unborn branch with --allow-empty
+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 1621 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 3501.10 'cherry-pick "-" to pick from previous branch': 
-	git checkout unborn &&
-	test_commit to-pick actual content &&
-	git checkout main &&
-	git cherry-pick - &&
-	echo content >expect &&
-	test_cmp expect actual
+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
+		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 1622 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf
 
-Already on 'unborn'
-[unborn d9ba711] to-pick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 actual
-Switched to branch 'main'
-[main 7c68b81] to-pick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 actual
-ok 10 - cherry-pick "-" to pick from previous branch
+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 1623 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 3501.11 'cherry-pick "-" is meaningless without checkout': 
-	test_create_repo afresh &&
-	(
-		cd afresh &&
-		test_commit one &&
-		test_commit two &&
-		test_commit three &&
-		test_must_fail git cherry-pick -
-	)
+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 1624 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3501-revert-cherry-pick/afresh/.git/
-[main (root-commit) 26cc6ba] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 776892e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 6c11eb3] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-fatal: bad revision '@{-1}'
-ok 11 - cherry-pick "-" is meaningless without checkout
+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 1625 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 3501.12 'cherry-pick "-" works with arguments': 
-	git checkout -b side-branch &&
-	test_commit change actual change &&
-	git checkout main &&
-	git cherry-pick -s - &&
-	echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
-	git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
-	test_cmp expect signoff &&
-	echo change >expect &&
-	test_cmp expect actual
+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 1626 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-Switched to a new branch 'side-branch'
-[side-branch 94f7852] change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-[main a524e05] change
- 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 "-" works with arguments
+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 1627 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 3501.13 'cherry-pick works with dirty renamed file': 
-	test_commit to-rename &&
-	git checkout -b unrelated &&
-	test_commit unrelated &&
-	git checkout @{-1} &&
-	git mv to-rename.t renamed &&
-	test_tick &&
-	git commit -m renamed &&
-	echo modified >renamed &&
-	git cherry-pick refs/heads/unrelated &&
-	test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
-	grep -q "^modified$" renamed
+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 1628 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
 
-[main 035700e] to-rename
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-rename.t
-Switched to a new branch 'unrelated'
-[unrelated ef4075f] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated.t
-Switched to branch 'main'
-[main 356b685] renamed
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename to-rename.t => renamed (100%)
-[main d1730b0] unrelated
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated.t
-ok 13 - cherry-pick works with dirty renamed file
+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 1629 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 3501.14 'advice from failed revert': 
-	test_when_finished "git reset --hard" &&
-	test_commit --no-tag "add dream" dream dream &&
-	dream_oid=$(git rev-parse --short HEAD) &&
-	cat <<-EOF >expected &&
-	error: could not revert $dream_oid... add dream
-	hint: After resolving the conflicts, mark them with
-	hint: "git add/rm <pathspec>", then run
-	hint: "git revert --continue".
-	hint: You can instead skip this commit with "git revert --skip".
-	hint: To abort and get back to the state before "git revert",
-	hint: run "git revert --abort".
-	hint: Disable this message with "git config set advice.mergeConflict false"
-	EOF
-	test_commit --append --no-tag "double-add dream" dream dream &&
-	test_must_fail git revert HEAD^ 2>actual &&
-	test_cmp expected actual
+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 1630 - setup CRLF checkout  with -c core.eol=lf
 
-[main 10ebfde] add dream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dream
-[main 9bf0a53] double-add dream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-CONFLICT (modify/delete): dream deleted in parent of 10ebfde (add dream) and modified in HEAD.  Version HEAD of dream left in tree.
-HEAD is now at 9bf0a53 double-add dream
-ok 14 - advice from failed revert
+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 1631 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 3501.15 'titles of fresh reverts': 
-	test_commit --no-tag A file1 &&
-	test_commit --no-tag B file1 &&
-	git revert --no-edit HEAD &&
-	test_expect_subject "Revert \"B\"" &&
-	git revert --no-edit HEAD &&
-	test_expect_subject "Reapply \"B\"" &&
-	git revert --no-edit HEAD &&
-	test_expect_subject "Revert \"Reapply \"B\"\""
+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 1632 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-[main ea33305] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[main c1d3d95] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main eef6aab] Revert "B"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main c405e54] Reapply "B"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 39eb61b] Revert "Reapply "B""
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - titles of fresh reverts
+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 1633 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 3501.16 'title of legacy double revert': 
-	test_commit --no-tag "Revert \"Revert \"B\"\"" file1 &&
-	git revert --no-edit HEAD &&
-	test_expect_subject "Revert \"Revert \"Revert \"B\"\"\""
+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
+		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 1634 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf
 
-[main 8f4de03] Revert "Revert "B""
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9de2bd4] Revert "Revert "Revert "B"""
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:26:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - title of legacy double revert
+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 1635 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 3501.17 'identification of reverted commit (default)': 
-	test_commit to-ident &&
-	test_when_finished "git reset --hard to-ident" &&
-	git checkout --detach to-ident &&
-	git revert --no-edit HEAD &&
-	git cat-file commit HEAD >actual.raw &&
-	grep "^This reverts " actual.raw >actual &&
-	echo "This reverts commit $(git rev-parse HEAD^)." >expect &&
-	test_cmp expect actual
+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 1636 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-[main bd8dd47] to-ident
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-ident.t
-HEAD is now at bd8dd47 to-ident
-M	actual
-[detached HEAD b5f3ac5] Revert "to-ident"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 to-ident.t
-HEAD is now at bd8dd47 to-ident
-ok 17 - identification of reverted commit (default)
+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 1637 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 3501.18 'identification of reverted commit (--reference)': 
-	git checkout --detach to-ident &&
-	git revert --reference --no-edit HEAD &&
-	git cat-file commit HEAD >actual.raw &&
-	grep "^This reverts " actual.raw >actual &&
-	echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
-	test_cmp expect actual
+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 1638 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-HEAD is now at bd8dd47 to-ident
-[detached HEAD 74d9825] # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 to-ident.t
-ok 18 - identification of reverted commit (--reference)
+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 1639 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 3501.19 'git revert --reference with core.commentChar': 
-	test_when_finished "git reset --hard to-ident" &&
-	git checkout --detach to-ident &&
-	GIT_EDITOR="head -n4 >actual" git -c core.commentChar=% revert \
-		--edit --reference HEAD &&
-	cat <<-EOF >expect &&
-	% *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
+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 1640 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
 
-	This reverts commit $(git show -s --pretty=reference HEAD^).
+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 1641 - setup LF checkout  with -c core.eol=lf
 
-	EOF
-	test_cmp expect actual
+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 1642 - setup CRLF checkout  with -c core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1643 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-  74d9825 # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
+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 1644 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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 1645 - setup LF_nul checkout  with -c core.eol=lf
 
- git branch <new-branch-name> 74d9825
+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
+		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 1646 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf
 
-HEAD is now at bd8dd47 to-ident
-M	actual
-[detached HEAD 79853a5] This reverts commit bd8dd47 (to-ident, 2005-04-07).
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 to-ident.t
-HEAD is now at bd8dd47 to-ident
-ok 19 - git revert --reference with core.commentChar
+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 1647 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 3501.20 'identification of reverted commit (revert.reference)': 
-	git checkout --detach to-ident &&
-	git -c revert.reference=true revert --no-edit HEAD &&
-	git cat-file commit HEAD >actual.raw &&
-	grep "^This reverts " actual.raw >actual &&
-	echo "This reverts commit $(git show -s --pretty=reference HEAD^)." >expect &&
-	test_cmp expect actual
+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 1648 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-HEAD is now at bd8dd47 to-ident
-[detached HEAD 74d9825] # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 to-ident.t
-ok 20 - identification of reverted commit (revert.reference)
+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 1649 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 3501.21 'cherry-pick is unaware of --reference (for now)': 
-	test_when_finished "git reset --hard" &&
-	test_must_fail git cherry-pick --reference HEAD 2>actual &&
-	grep "^usage: git cherry-pick" actual
+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 1650 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
-HEAD is now at 74d9825 # *** SAY WHY WE ARE REVERTING ON THE TITLE LINE ***
-ok 21 - cherry-pick is unaware of --reference (for now)
+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 1651 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3509-cherry-pick-merge-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 1652 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
 
-[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.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 1653 - setup LF checkout  with -c core.eol=lf
 
-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.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 1654 - setup CRLF checkout  with -c core.eol=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.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 1655 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-	>f1 &&
-	git add f1 &&
-	git commit -m f1
+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 1656 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-checking prerequisite: SYMLINKS
+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 1657 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1658 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf
 
-)
-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.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 1659 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-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.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 1660 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-HEAD is now at b71b76f f1
-Note: switching to 'main^0'.
+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 1661 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 1662 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-If you want to 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.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 1663 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-  git switch -c <new-branch-name>
+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 1664 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
 
-Or undo this operation with:
+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 1665 - setup LF checkout  with -c core.eol=lf
 
-  git switch -
+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 1666 - setup CRLF checkout  with -c core.eol=lf
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1667 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-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 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 1668 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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 . &&
+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 1669 - setup LF_nul checkout  with -c core.eol=lf
 
-	>empty &&
-	git add empty &&
-	git commit -m "Empty file" &&
+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
+		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 1670 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf
 
-	git checkout -b simple &&
-	mv empty file &&
-	mkdir empty &&
-	mv file empty &&
-	git add empty/file &&
-	git commit -m "Empty file under empty dir" &&
+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 1671 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-	echo content >newfile &&
-	git add newfile &&
-	git commit -m "New file"
+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 1672 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-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 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 1673 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-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.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 1674 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-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 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 1675 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-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.1676 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1676 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
 
-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.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 1677 - setup LF checkout  with -c core.eol=lf
 
-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.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 1678 - setup CRLF checkout  with -c core.eol=lf
 
-	mkdir sub &&
-	mkdir othersub &&
-	echo content > sub/file &&
-	echo foo > othersub/whatever &&
-	git add -A &&
-	git commit -m "Common commit" &&
+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 1679 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-	git rm -rf othersub &&
-	git mv sub/file othersub &&
-	git commit -m "Commit to merge" &&
+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 1680 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-	git checkout -b newhead mergeme~1 &&
-	>independent-change &&
-	git add independent-change &&
-	git commit -m "Completely unrelated change"
+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 1681 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1682 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf
 
-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.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 1683 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF
 
-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.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 1684 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-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.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 1685 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-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.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 1686 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3514-cherry-pick-revert-gpg.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
-checking prerequisite: GPG
+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 1687 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-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.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 1688 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
 
-	# 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.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 1689 - setup LF checkout  with -c core.eol=lf
 
-)
-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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3508-cherry-pick-many-commits.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 1690 - setup CRLF checkout  with -c core.eol=lf
 
-	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.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 1691 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-[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.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 1692 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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.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 1693 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1694 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf
 
-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.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 1695 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-Note: switching to 'first'.
+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 1696 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=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.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 1697 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=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.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 1698 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-  git switch -c <new-branch-name>
+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 1699 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-Or undo this operation with:
+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 1700 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
 
-  git switch -
+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 1701 - setup LF checkout  with -c core.eol=lf
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 1702 - setup CRLF checkout  with -c core.eol=lf
 
-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.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 1703 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-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.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 1704 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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.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 1705 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1706 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf
 
-	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.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 1707 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 5 - output to keep user entertained during multi-pick
+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 1708 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-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.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 1709 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-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.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 1710 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-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.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 1711 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-	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.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 1712 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 7 - output during multi-pick indicates merge strategy
+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 1713 - setup LF checkout  with -c core.eol=lf
 
-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.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 1714 - setup CRLF checkout  with -c core.eol=lf
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 8 - cherry-pick --ff first..fourth works
+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 1715 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-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.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 1716 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 9 - cherry-pick -n first..fourth works
+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 1717 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1718 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf
 
-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.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 1719 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-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.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 1720 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-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.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 1721 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-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.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 1722 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-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.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 1723 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-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.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 1724 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
 
-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.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 1725 - setup LF checkout  with -c core.eol=lf
 
-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.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 1726 - setup CRLF checkout  with -c core.eol=lf
 
-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.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 1727 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3601-rm-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 1728 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-	git tag checkpoint
+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 1729 - setup LF_nul checkout  with -c core.eol=lf
 
-[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.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
+		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 1730 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 3601.2 'simplest': 
-	restore_checkpoint &&
+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 1731 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	EOF
+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 1732 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-	echo fileA.t | git rm --pathspec-from-file=- &&
-	verify_expect
+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 1733 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-ok 2 - simplest
+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 1734 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 3601.3 '--pathspec-file-nul': 
-	restore_checkpoint &&
+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 1735 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	D  fileB.t
-	EOF
+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 1736 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
 
-	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
-	verify_expect
+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 1737 - setup LF checkout  with -c core.eol=lf
 
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-rm 'fileB.t'
-ok 3 - --pathspec-file-nul
+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 1738 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 3601.4 'only touches what was listed': 
-	restore_checkpoint &&
+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 1739 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-	cat >expect <<-\EOF &&
-	D  fileB.t
-	D  fileC.t
-	EOF
+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 1740 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
-	verify_expect
+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 1741 - setup LF_nul checkout  with -c core.eol=lf
 
-HEAD is now at d32ab08 files
-rm 'fileB.t'
-rm 'fileC.t'
-ok 4 - only touches what was listed
+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
+		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 1742 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf
 
-expecting success of 3601.5 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
+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 1743 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-	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.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 1744 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-	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.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 1745 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-	>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.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 1746 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-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.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 1747 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3511-cherry-pick-x.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3511-cherry-pick-x/.git/
-expecting success of 3511.1 'setup': 
-	git config set advice.detachedhead false &&
-	echo unrelated >unrelated &&
-	git add unrelated &&
-	test_commit initial foo a &&
-	test_commit "$mesg_one_line" foo b mesg-one-line &&
-	git reset --hard initial &&
-	test_commit "$mesg_no_footer" foo b mesg-no-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_broken_footer" foo b mesg-broken-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_footer" foo b mesg-with-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_footer_sob" foo b mesg-with-footer-sob &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_cherry_footer" foo b mesg-with-cherry-footer &&
-	git reset --hard initial &&
-	test_config commit.cleanup verbatim &&
-	test_commit "$mesg_unclean" foo b mesg-unclean &&
-	test_unconfig commit.cleanup &&
-	pristine_detach initial &&
-	test_commit conflicting unrelated
+expecting success of 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 1748 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
 
-[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.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 1749 - setup LF checkout  with -c core.eol=lf
 
-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.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 1750 - setup CRLF checkout  with -c core.eol=lf
 
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+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 1751 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-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.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 1752 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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.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 1753 - setup LF_nul checkout  with -c core.eol=lf
 
-		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.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
+		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 1754 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1755 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-  6970a53 base: commit message
+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 1756 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-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.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 1757 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-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.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 1758 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-		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.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 1759 - checkout attr=auto ident aeol=crlf 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.1760 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1760 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
 
-  0fda2e1 base: commit message
+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 1761 - setup LF checkout  with -c core.eol=lf
 
-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.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 1762 - setup CRLF checkout  with -c core.eol=lf
 
-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.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 1763 - 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.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 1764 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-  0cf5261 base: commit message
+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 1765 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1766 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf
 
-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.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 1767 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF
 
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+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 1768 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1769 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-  b95a0f7 base: commit message
+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 1770 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-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.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 1771 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-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.1772 'setup config for checkout attr= ident=ident aeol= 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
 
-		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.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 1773 - 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.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 1774 - setup CRLF checkout  with -c core.eol=lf
 
-  6f42e54 base: commit message
+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 1775 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-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.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 1776 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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.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 1777 - setup LF_nul checkout  with -c core.eol=lf
 
-		(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.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
+		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 1778 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1779 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-  32d2dda base: commit message
+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 1780 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-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.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 1781 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-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.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 1782 - checkout attr= ident aeol= 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.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 1783 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-  adaaef8 base: commit message
+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 1784 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
 
-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.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 1785 - setup LF checkout  with -c core.eol=lf
 
-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.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 1786 - setup CRLF checkout  with -c core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1787 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-  b62bd75 base: commit message
+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 1788 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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.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 1789 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1790 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1791 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-  94e740a base: commit message
+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 1792 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-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.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 1793 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-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.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 1794 - checkout attr=auto ident aeol= 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.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 1795 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-  a836c16 base: commit message
+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 1796 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
 
-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.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 1797 - setup LF checkout  with -c core.eol=lf
 
-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.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 1798 - setup CRLF checkout  with -c core.eol=lf
 
-	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
+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 1799 - 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.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 1800 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-  2d6e386 base: commit message
+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 1801 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1802 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf
 
-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.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 1803 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
+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 1804 - checkout attr=text ident 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.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 1805 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-  96716be title
+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 1806 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-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.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 1807 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-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.1808 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1808 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
 
-	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
+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 1809 - 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.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 1810 - setup CRLF checkout  with -c core.eol=lf
 
-  8c5d63f title
+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 1811 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-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.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 1812 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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.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 1813 - setup LF_nul checkout  with -c core.eol=lf
 
-	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
+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
+		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 1814 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1815 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF
 
-  6671fda title
+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 1816 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-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.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 1817 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-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.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 1818 - checkout attr=text ident aeol= core.autocrlf=input 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.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 1819 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-  19f481d title
+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 1820 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
 
-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.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 1821 - setup LF checkout  with -c core.eol=lf
 
-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.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 1822 - setup CRLF checkout  with -c core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1823 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-  7b5eb6d base: commit message
+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 1824 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-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.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 1825 - setup LF_nul checkout  with -c core.eol=lf
 
-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.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
+		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 1826 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1827 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF
 
-  b468a7b base: commit message
+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 1828 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-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.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 1829 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_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.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 1830 - checkout attr=auto ident aeol= core.autocrlf=input 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.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 1831 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-  c7c741c base: commit message
+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 1832 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
 
-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.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 1833 - setup LF checkout  with -c core.eol=crlf
 
-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.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 1834 - 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.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 1835 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-  7a2ed43 base: commit message
+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 1836 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-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.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 1837 - setup LF_nul checkout  with -c core.eol=crlf
 
-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.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
+		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 1838 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 1839 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
-  ad2d5bc base: commit message
+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 1840 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-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.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 1841 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3404-rebase-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive/.git/
-expecting success of 3404.1 'setup': 
-	git switch -C primary &&
-	test_commit A file1 &&
-	test_commit B file1 &&
-	test_commit C file2 &&
-	test_commit D file1 &&
-	test_commit E file3 &&
-	git checkout -b branch1 A &&
-	test_commit F file4 &&
-	test_commit G file1 &&
-	test_commit H file5 &&
-	git checkout -b branch2 F &&
-	test_commit I file6 &&
-	git checkout -b conflict-branch A &&
-	test_commit one conflict &&
-	test_commit two conflict &&
-	test_commit three conflict &&
-	test_commit four conflict &&
-	git checkout -b no-conflict-branch A &&
-	test_commit J fileJ &&
-	test_commit K fileK &&
-	test_commit L fileL &&
-	test_commit M fileM &&
-	git checkout -b no-ff-branch A &&
-	test_commit N fileN &&
-	test_commit O fileO &&
-	test_commit P fileP
+expecting success of 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 1842 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-Switched to a new branch 'primary'
-[primary (root-commit) 6e62bf8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[primary 313fe96] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[primary d0f65f2] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[primary 0547e3f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[primary 8f99a4f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to a new branch 'branch1'
-[branch1 cfefd94] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[branch1 83751a6] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch1 4373208] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5
-Switched to a new branch 'branch2'
-[branch2 615be62] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file6
-Switched to a new branch 'conflict-branch'
-[conflict-branch b895952] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-[conflict-branch 766a798] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch 1eadf03] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch f91a2b3] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'no-conflict-branch'
-[no-conflict-branch 808874f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileJ
-[no-conflict-branch 265b89e] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileK
-[no-conflict-branch 6b0f5e6] L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileL
-[no-conflict-branch 3389558] M
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileM
-Switched to a new branch 'no-ff-branch'
-[no-ff-branch 53b4423] N
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileN
-[no-ff-branch cc47714] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileO
-[no-ff-branch faef1a5] P
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileP
-ok 1 - setup
+expecting success of 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 1843 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 3404.2 'rebase --keep-empty': 
-	git checkout -b emptybranch primary &&
-	git commit --allow-empty -m "empty" &&
-	git rebase --keep-empty -i HEAD~2 &&
-	git log --oneline >actual &&
-	test_line_count = 6 actual
+expecting success of 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 1844 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
 
-Switched to a new branch 'emptybranch'
-[emptybranch da33401] empty
- Author: A U Thor <author@example.com>
-Successfully rebased and updated refs/heads/emptybranch.
-ok 2 - rebase --keep-empty
+expecting success of 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 1845 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 3404.3 'rebase -i with empty todo list': 
-	cat >expect <<-\EOF &&
-	error: nothing to do
-	EOF
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="#" \
-			git rebase -i HEAD^ >output 2>&1
-	) &&
-	tail -n 1 output >actual &&  # Ignore output about changing todo list
-	test_cmp expect actual
+expecting success of 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 1846 - setup CRLF checkout  with -c core.eol=crlf
 
-ok 3 - rebase -i with empty todo list
+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 1847 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3404.4 'rebase -i with the exec command': 
-	git checkout primary &&
-	(
-	set_fake_editor &&
-	FAKE_LINES="1 exec_>touch-one
-		2 exec_>touch-two exec_false exec_>touch-three
-		3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
-	export FAKE_LINES &&
-	test_must_fail git rebase -i A
-	) &&
-	test_path_is_file touch-one &&
-	test_path_is_file touch-two &&
-	# Missing because we should have stopped by now.
-	test_path_is_missing touch-three &&
-	test_cmp_rev C HEAD &&
-	git rebase --continue &&
-	test_path_is_file touch-three &&
-	test_path_is_file "touch-file  name with spaces" &&
-	test_path_is_file touch-after-semicolon &&
-	test_cmp_rev primary HEAD &&
-	rm -f touch-*
+expecting success of 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 1848 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-Switched to branch 'primary'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+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 1849 - setup LF_nul checkout  with -c core.eol=crlf
 
-rebase -i script after editing:
-pick 313fe96 B
-exec >touch-one
-pick d0f65f2 C
-exec >touch-two
-exec false
-exec >touch-three
-pick 0547e3f D
-pick 8f99a4f E
-exec >"touch-file  name with spaces"; >touch-after-semicolon
-Rebasing (2/9)
Executing: >touch-one
-Rebasing (3/9)
Rebasing (4/9)
Executing: >touch-two
-Rebasing (5/9)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+expecting success of 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
+		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 1850 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf
 
-  git rebase --continue
+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 1851 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf 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
+	
+ok 1852 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-Rebasing (6/9)
Executing: >touch-three
-Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
Executing: >"touch-file  name with spaces"; >touch-after-semicolon
-Successfully rebased and updated refs/heads/primary.
-ok 4 - rebase -i with the exec command
+expecting success of 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 1853 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3404.5 'rebase -i with the exec command runs from tree root': 
-	git checkout primary &&
-	mkdir subdir && (cd subdir &&
-	set_fake_editor &&
-	FAKE_LINES="1 exec_>touch-subdir" \
-		git rebase -i HEAD^
-	) &&
-	test_path_is_file touch-subdir &&
-	rm -fr subdir
+expecting success of 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 1854 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f E
+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 1855 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-rebase -i script after editing:
-pick 8f99a4f E
-exec >touch-subdir
-Rebasing (2/2)
Executing: >touch-subdir
-Successfully rebased and updated refs/heads/primary.
-ok 5 - rebase -i with the exec command runs from tree root
+expecting success of 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 1856 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 3404.6 'rebase -i with exec allows git commands in subdirs': 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "git rebase --abort ||:" &&
-	git checkout primary &&
-	mkdir subdir && (cd subdir &&
-	set_fake_editor &&
-	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
-		git rebase -i HEAD^
-	)
+expecting success of 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 1857 - setup LF checkout  with -c core.eol=crlf
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f E
+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 1858 - setup CRLF checkout  with -c core.eol=crlf
 
-rebase -i script after editing:
-pick 8f99a4f E
-x cd subdir && git rev-parse --is-inside-work-tree
-Rebasing (2/2)
Executing: cd subdir && git rev-parse --is-inside-work-tree
-true
-Successfully rebased and updated refs/heads/primary.
-fatal: no rebase in progress
-ok 6 - rebase -i with exec allows git commands in subdirs
+expecting success of 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 1859 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3404.7 'rebase -i sets work tree properly': 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "test_might_fail git rebase --abort" &&
-	mkdir subdir &&
-	git rebase -x "(cd subdir && git rev-parse --show-toplevel)" HEAD^ \
-		>actual &&
-	! grep "/subdir$" actual
+expecting success of 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 1860 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-Rebasing (2/2)
Executing: (cd subdir && git rev-parse --show-toplevel)
-Successfully rebased and updated refs/heads/primary.
-fatal: no rebase in progress
-ok 7 - rebase -i sets work tree properly
+expecting success of 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 1861 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 3404.8 'rebase -i with the exec command checks tree cleanness': 
-	git checkout primary &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \
-			git rebase -i HEAD^
-	) &&
-	test_cmp_rev primary^ HEAD &&
-	git reset --hard &&
-	git rebase --continue
+expecting success of 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
+		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 1862 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f E
+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 1863 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-rebase -i script after editing:
-exec echo foo >file1
-pick 8f99a4f E
-Rebasing (1/2)
Executing: echo foo >file1
-error: cannot rebase: You have unstaged changes.
-warning: execution succeeded: echo foo >file1
-but left changes to the index and/or the working tree.
-Commit or stash your changes, and then run
+expecting success of 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 1864 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-  git rebase --continue
+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 1865 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf 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
+	
+ok 1866 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-HEAD is now at 0547e3f D
-Rebasing (2/2)
Successfully rebased and updated refs/heads/primary.
-ok 8 - rebase -i with the exec command checks tree cleanness
+expecting success of 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 1867 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 3404.9 'cherry-pick works with rebase --exec': 
-	test_when_finished "git cherry-pick --abort; \
-			    git rebase --abort; \
-			    git checkout primary" &&
-	echo "exec git cherry-pick G" >todo &&
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i D D
-	) &&
-	test_cmp_rev G CHERRY_PICK_HEAD
+expecting success of 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 1868 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
 
-rebase -i script after editing:
-exec git cherry-pick G
-Rebasing (1/1)
Executing: git cherry-pick G
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 83751a6... G
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-file1: needs merge
-error: cannot rebase: You have unstaged changes.
-error: additionally, your index contains uncommitted changes.
-warning: execution failed: git cherry-pick G
-and made changes to the index and/or the working tree.
-You can fix the problem, and then run
+expecting success of 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 1869 - setup LF checkout  with -c core.eol=crlf
 
-  git rebase --continue
+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 1870 - setup CRLF checkout  with -c core.eol=crlf
 
+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 1871 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-Previous HEAD position was 0547e3f D
-Switched to branch 'primary'
-ok 9 - cherry-pick works with rebase --exec
+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 1872 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3404.10 'rebase -x with empty command fails': 
-	test_when_finished "git rebase --abort ||:" &&
-	test_must_fail env git rebase -x "" @ 2>actual &&
-	test_write_lines "error: empty exec command" >expected &&
-	test_cmp expected actual &&
-	test_must_fail env git rebase -x " " @ 2>actual &&
-	test_cmp expected actual
+expecting success of 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 1873 - setup LF_nul checkout  with -c core.eol=crlf
 
-fatal: no rebase in progress
-ok 10 - rebase -x with empty command fails
+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
+		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 1874 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf
 
-expecting success of 3404.11 'rebase -x with newline in command fails': 
-	test_when_finished "git rebase --abort ||:" &&
-	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
-	test_write_lines "error: exec commands cannot contain newlines" \
-			 >expected &&
-	test_cmp expected actual
+expecting success of 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 1875 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-fatal: no rebase in progress
-ok 11 - rebase -x with newline in command fails
+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 1876 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 3404.12 'rebase -i with exec of inexistent command': 
-	git checkout primary &&
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
-			git rebase -i HEAD^ >actual 2>&1
-	) &&
-	! grep "Maybe git-rebase is broken" actual
+expecting success of 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 1877 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-Already on 'primary'
-ok 12 - rebase -i with exec of inexistent command
+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 1878 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 3404.13 'implicit interactive rebase does not invoke sequence editor': 
-	test_when_finished "git rebase --abort ||:" &&
-	GIT_SEQUENCE_EDITOR="echo bad >" git rebase -x"echo one" @^
+expecting success of 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 1879 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-Rebasing (2/2)
Executing: echo one
-one
-Successfully rebased and updated refs/heads/primary.
-fatal: no rebase in progress
-ok 13 - implicit interactive rebase does not invoke sequence editor
+expecting success of 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 1880 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 3404.14 'no changes are a nop': 
-	git checkout branch2 &&
-	git rebase -i F &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test_cmp_rev I HEAD
+expecting success of 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 1881 - setup LF checkout  with -c core.eol=crlf
 
-Switched to branch 'branch2'
-Successfully rebased and updated refs/heads/branch2.
-ok 14 - no changes are a nop
+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 1882 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 3404.15 'test the [branch] option': 
-	git checkout -b dead-end &&
-	git rm file6 &&
-	git commit -m "stop here" &&
-	git rebase -i F branch2 &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test_cmp_rev I branch2 &&
-	test_cmp_rev I HEAD
+expecting success of 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 1883 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-Switched to a new branch 'dead-end'
-rm 'file6'
-[dead-end f814f58] stop here
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file6
-Successfully rebased and updated refs/heads/branch2.
-ok 15 - test the [branch] option
+expecting success of 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 1884 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3404.16 'test --onto <branch>': 
-	git checkout -b test-onto branch2 &&
-	git rebase -i --onto branch1 F &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
-	test_cmp_rev HEAD^ branch1 &&
-	test_cmp_rev I branch2
+expecting success of 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 1885 - setup LF_nul checkout  with -c core.eol=crlf
 
-Switched to a new branch 'test-onto'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test-onto.
-ok 16 - test --onto <branch>
+expecting success of 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
+		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 1886 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 3404.17 'rebase on top of a non-conflicting commit': 
-	git checkout branch1 &&
-	git tag original-branch1 &&
-	git rebase -i branch2 &&
-	test file6 = $(git diff --name-only original-branch1) &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
-	test_cmp_rev I branch2 &&
-	test_cmp_rev I HEAD~2
+expecting success of 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 1887 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-Switched to branch 'branch1'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
-ok 17 - rebase on top of a non-conflicting commit
+expecting success of 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 1888 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 3404.18 'reflog for the branch shows state before rebase': 
-	test_cmp_rev branch1@{1} original-branch1
+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 1889 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-ok 18 - reflog for the branch shows state before rebase
+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 1890 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 3404.19 'reflog for the branch shows correct finish message': 
-	printf "rebase (finish): refs/heads/branch1 onto %s\n" \
-		"$(git rev-parse branch2)" >expected &&
-	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
-	test_cmp expected actual
+expecting success of 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 1891 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-ok 19 - reflog for the branch shows correct finish message
+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 1892 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 3404.20 'exchange two commits': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1" git rebase -i HEAD~2
-	) &&
-	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test G = $(git cat-file commit HEAD | sed -ne \$p) &&
-	blob1=$(git rev-parse --short HEAD^:file1) &&
-	blob2=$(git rev-parse --short HEAD:file1) &&
-	commit=$(git rev-parse --short HEAD)
+expecting success of 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 1893 - setup LF checkout  with -c core.eol=crlf
 
-rebase -i script before editing:
-pick ae8f65e G
-pick f5f5249 H
+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 1894 - setup CRLF checkout  with -c core.eol=crlf
 
-rebase -i script after editing:
-pick f5f5249 H
-pick ae8f65e G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
-ok 20 - exchange two commits
+expecting success of 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 1895 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3404.21 'stop on conflicting pick': 
-	cat >expect <<-EOF &&
-	diff --git a/file1 b/file1
-	index $blob1..$blob2 100644
-	--- a/file1
-	+++ b/file1
-	@@ -1 +1 @@
-	-A
-	+G
-	EOF
-	cat >expect2 <<-EOF &&
-	<<<<<<< HEAD
-	D
-	=======
-	G
-	>>>>>>> $commit (G)
-	EOF
-	git tag new-branch1 &&
-	test_must_fail git rebase -i primary &&
-	test "$(git rev-parse HEAD~3)" = "$(git rev-parse primary)" &&
-	test_cmp expect .git/rebase-merge/patch &&
-	test_cmp expect2 file1 &&
-	test "$(git diff --name-status |
-		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
-	grep -v "^#" <.git/rebase-merge/done >actual &&
-	test_line_count = 4 actual &&
-	test 0 = $(grep -c "^[^#]" <.git/rebase-merge/git-rebase-todo)
+expecting success of 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 1896 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 5d18e54... G
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 5d18e54... G
-ok 21 - stop on conflicting pick
+expecting success of 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 1897 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 3404.22 'show conflicted patch': 
-	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-	grep "show.*REBASE_HEAD" stderr &&
-	# the original stopped-sha1 is abbreviated
-	stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
-	test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
+expecting success of 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
+		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 1898 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf
 
-trace: run_command: git show REBASE_HEAD --
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' show REBASE_HEAD --
-trace: built-in: git show REBASE_HEAD --
-ok 22 - show conflicted patch
+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 1899 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 3404.23 'abort': 
-	git rebase --abort &&
-	test_cmp_rev new-branch1 HEAD &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
-	test_path_is_missing .git/rebase-merge
+expecting success of 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 1900 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-ok 23 - abort
+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 1901 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3404.24 'abort with error when new base cannot be checked out': 
-	git rm --cached file1 &&
-	git commit -m "remove file in base" &&
-	test_must_fail git rebase -i primary > output 2>&1 &&
-	test_grep "The following untracked working tree files would be overwritten by checkout:" \
-		output &&
-	test_grep "file1" output &&
-	test_path_is_missing .git/rebase-merge &&
-	rm file1 &&
-	git reset --hard HEAD^
+expecting success of 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 1902 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-rm 'file1'
-[branch1 2dd5570] remove file in base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-error: The following untracked working tree files would be overwritten by checkout:
-	file1
-HEAD is now at 5d18e54 G
-ok 24 - abort with error when new base cannot be checked out
+expecting success of 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 1903 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 3404.25 'retain authorship': 
-	echo A > file7 &&
-	git add file7 &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
-	git tag twerp &&
-	git rebase -i --onto primary HEAD^ &&
-	git show HEAD >actual &&
-	grep "^Author: Twerp Snog" actual
+expecting success of 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 1904 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
 
-[branch1 2596307] different author
- Author: Twerp Snog <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
-Author: Twerp Snog <author@example.com>
-ok 25 - retain authorship
+expecting success of 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 1905 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 3404.26 'retain authorship w/ conflicts': 
-	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
-	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
+expecting success of 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 1906 - setup CRLF checkout  with -c core.eol=crlf
 
-	git reset --hard twerp &&
-	test_commit a conflict a conflict-a &&
-	git reset --hard twerp &&
+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 1907 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-	GIT_AUTHOR_NAME=AttributeMe &&
-	export GIT_AUTHOR_NAME &&
-	test_commit b conflict b conflict-b &&
-	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
+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 1908 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-	test_must_fail git rebase -i conflict-a &&
-	echo resolved >conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test_cmp_rev conflict-a^0 HEAD^ &&
-	git show >out &&
-	grep AttributeMe out
+expecting success of 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 1909 - setup LF_nul checkout  with -c core.eol=crlf
 
-HEAD is now at 2596307 different author
-[branch1 748a43d] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-HEAD is now at 2596307 different author
-[branch1 34d1a6c] b
- Author: AttributeMe <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (1/1)
Auto-merging conflict
-CONFLICT (add/add): Merge conflict in conflict
-error: could not apply 34d1a6c... b
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 34d1a6c... b
-[detached HEAD 7866b12] b
- Author: AttributeMe <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/branch1.
-Author: AttributeMe <author@example.com>
-ok 26 - retain authorship w/ conflicts
+expecting success of 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
+		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 1910 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 3404.27 'squash': 
-	git reset --hard twerp &&
-	echo B > file7 &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
-	echo "******************************" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
-			git rebase -i --onto primary HEAD~2
-	) &&
-	test B = $(cat file7) &&
-	test_cmp_rev HEAD^ primary
+expecting success of 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 1911 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-HEAD is now at 2596307 different author
-[branch1 cdf577a] nitfol
- Author: Nitfol <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-******************************
-rebase -i script before editing:
-pick 2596307 different author
-pick cdf577a nitfol
+expecting success of 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 1912 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-rebase -i script after editing:
-pick 2596307 different author
-squash cdf577a nitfol
-Rebasing (1/2)
Rebasing (2/2)
[detached HEAD d2d5ba7] different author
- Author: Twerp Snog <author@example.com>
- Date: Thu Apr 7 15:33:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Successfully rebased and updated refs/heads/branch1.
-ok 27 - squash
+expecting success of 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 1913 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3404.28 'retain authorship when squashing': 
-	git show HEAD >actual &&
-	grep "^Author: Twerp Snog" actual
+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 1914 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-Author: Twerp Snog <author@example.com>
-ok 28 - retain authorship when squashing
+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 1915 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 3404.29 '--continue tries to commit': 
-	git reset --hard D &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
-		echo resolved > file1 &&
-		git add file1 &&
-		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
-	) &&
-	test_cmp_rev HEAD^ new-branch1 &&
-	git show HEAD >actual &&
-	grep chouette actual
+expecting success of 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 1916 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
 
-HEAD is now at 0547e3f D
-Rebasing (1/1)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f... D
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 0547e3f... D
-[detached HEAD e986ac9] chouette!
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/branch1.
-    chouette!
-ok 29 - --continue tries to commit
+expecting success of 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 1917 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 3404.30 'verbose flag is heeded, even after --continue': 
-	git reset --hard primary@{1} &&
-	test_tick &&
-	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
-	echo resolved > file1 &&
-	git add file1 &&
-	git rebase --continue > output &&
-	grep "^ file1 | 2 +-$" output
+expecting success of 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 1918 - setup CRLF checkout  with -c core.eol=crlf
 
-HEAD is now at 0547e3f D
-Changes from 6e62bf890e21973b771e4e6fc28f5ade62edb4bc to 5d18e5414f663da21d1363c271f2d684aeda7b5b:
- file1 | 2 +-
- file4 | 1 +
- file5 | 1 +
- file6 | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 file4
- create mode 100644 file5
- create mode 100644 file6
-Rebasing (1/1)
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f... D
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 0547e3f... D
-Successfully rebased and updated refs/heads/branch1.
- file1 | 2 +-
-ok 30 - verbose flag is heeded, even after --continue
+expecting success of 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 1919 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3404.31 'multi-squash only fires up editor once': 
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="1 squash 2 squash 3 squash 4" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual
+expecting success of 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 1920 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-rebase -i script before editing:
-pick 615be62 I
-pick 0626e8d H
-pick 5d18e54 G
-pick 7384ee8 D
+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 1921 - setup LF_nul checkout  with -c core.eol=crlf
 
-rebase -i script after editing:
-pick 615be62 I
-squash 0626e8d H
-squash 5d18e54 G
-squash 7384ee8 D
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 450e393] I
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file5
- create mode 100644 file6
-Successfully rebased and updated refs/heads/branch1.
-ok 31 - multi-squash only fires up editor once
+expecting success of 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
+		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 1922 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf
 
-expecting success of 3404.32 'multi-fixup does not fire up editor': 
-	git checkout -b multi-fixup E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="NEVER" \
-			FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	! grep NEVER output &&
-	git checkout @{-1} &&
-	git branch -D multi-fixup
+expecting success of 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 1923 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF
 
-Switched to a new branch 'multi-fixup'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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 1924 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-rebase -i script after editing:
-pick 313fe96 B
-fixup d0f65f2 C
-fixup 0547e3f D
-fixup 8f99a4f E
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/multi-fixup.
-Switched to branch 'branch1'
-Deleted branch multi-fixup (was b72b875).
-ok 32 - multi-fixup does not fire up editor
+expecting success of 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 1925 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3404.33 'commit message used after conflict': 
-	git checkout -b conflict-fixup conflict-branch &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \
-			git rebase -i $base &&
-		echo three > conflict &&
-		git add conflict &&
-		FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
-			git rebase --continue
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual &&
-	git checkout @{-1} &&
-	git branch -D conflict-fixup
+expecting success of 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 1926 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-Switched to a new branch 'conflict-fixup'
-rebase -i script before editing:
-pick b895952 one
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
+expecting success of 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 1927 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-rebase -i script after editing:
-pick b895952 one
-fixup 1eadf03 three
-fixup f91a2b3 four
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1eadf03... three
-[detached HEAD 0894a89] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (3/3)
Successfully rebased and updated refs/heads/conflict-fixup.
-Switched to branch 'branch1'
-Deleted branch conflict-fixup (was 72b9a95).
-ok 33 - commit message used after conflict
+expecting success of 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 1928 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 3404.34 'commit message retained after conflict': 
-	git checkout -b conflict-squash conflict-branch &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \
-			git rebase -i $base &&
-		echo three > conflict &&
-		git add conflict &&
-		FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
-			git rebase --continue
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep TWICE output >actual &&
-	test_line_count = 2 actual &&
-	git checkout @{-1} &&
-	git branch -D conflict-squash
+expecting success of 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 1929 - setup LF checkout  with -c core.eol=crlf
 
-Switched to a new branch 'conflict-squash'
-rebase -i script before editing:
-pick b895952 one
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
+expecting success of 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 1930 - setup CRLF checkout  with -c core.eol=crlf
 
-rebase -i script after editing:
-pick b895952 one
-fixup 1eadf03 three
-squash f91a2b3 four
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1eadf03... three
-[detached HEAD f044f69] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (3/3)
[detached HEAD e98a2cf] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Successfully rebased and updated refs/heads/conflict-squash.
-Switched to branch 'branch1'
-Deleted branch conflict-squash (was e98a2cf).
-ok 34 - commit message retained after conflict
+expecting success of 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 1931 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3404.35 'squash and fixup generate correct log messages': 
-	cat >expect-squash-fixup <<-\EOF &&
-	B
+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 1932 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-	D
+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 1933 - setup LF_nul checkout  with -c core.eol=crlf
 
-	ONCE
-	EOF
-	git checkout -b squash-fixup E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
-	test_cmp expect-squash-fixup actual-squash-fixup &&
-	git cat-file commit HEAD@{2} >actual &&
-	grep "^# This is a combination of 3 commits\." actual &&
-	git cat-file commit HEAD@{3} >actual &&
-	grep "^# This is a combination of 2 commits\." actual  &&
-	git checkout @{-1} &&
-	git branch -D squash-fixup
+expecting success of 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
+		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 1934 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf
 
-Switched to a new branch 'squash-fixup'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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 1935 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-rebase -i script after editing:
-pick 313fe96 B
-fixup d0f65f2 C
-squash 0547e3f D
-fixup 8f99a4f E
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 2e14af9] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/squash-fixup.
-# This is a combination of 3 commits.
-# This is a combination of 2 commits.
-Switched to branch 'branch1'
-Deleted branch squash-fixup (was 2e14af9).
-ok 35 - squash and fixup generate correct log messages
+expecting success of 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 1936 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 3404.36 'squash ignores comments': 
-	git checkout -b skip-comments E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual &&
-	git checkout @{-1} &&
-	git branch -D skip-comments
+expecting success of 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 1937 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-Switched to a new branch 'skip-comments'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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 1938 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-rebase -i script after editing:
-# comment
-pick 313fe96 B
-# comment
-squash d0f65f2 C
-# comment
-squash 0547e3f D
-# comment
-squash 8f99a4f E
-# comment
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD c7441e9] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/skip-comments.
-Switched to branch 'branch1'
-Deleted branch skip-comments (was c7441e9).
-ok 36 - squash ignores comments
+expecting success of 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 1939 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 3404.37 'squash ignores blank lines': 
-	git checkout -b skip-blank-lines E &&
-	base=$(git rev-parse HEAD~4) &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="ONCE" \
-			FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
-			EXPECT_HEADER_COUNT=4 \
-			git rebase -i $base
-	) &&
-	test $base = $(git rev-parse HEAD^) &&
-	git show >output &&
-	grep ONCE output >actual &&
-	test_line_count = 1 actual &&
-	git checkout @{-1} &&
-	git branch -D skip-blank-lines
+expecting success of 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
 
-Switched to a new branch 'skip-blank-lines'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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
 
-rebase -i script after editing:
+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
 
-pick 313fe96 B
+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
 
-squash d0f65f2 C
+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
 
-squash 0547e3f D
+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
 
-squash 8f99a4f E
+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
 
-Rebasing (3/4)
Rebasing (4/4)
Rebasing (5/4)
[detached HEAD c7441e9] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/skip-blank-lines.
-Switched to branch 'branch1'
-Deleted branch skip-blank-lines (was c7441e9).
-ok 37 - squash ignores blank lines
+expecting success of 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
 
-expecting success of 3404.38 'squash works as expected': 
-	git checkout -b squash-works no-conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3
-	) &&
-	test $one = $(git rev-parse HEAD~2)
+expecting success of 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
 
-Switched to a new branch 'squash-works'
-rebase -i script before editing:
-pick 265b89e K
-pick 6b0f5e6 L
-pick 3389558 M
+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
 
-rebase -i script after editing:
-pick 265b89e K
-s 3389558 M
-pick 6b0f5e6 L
-Rebasing (2/3)
[detached HEAD b352334] K
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 fileK
- create mode 100644 fileM
-Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-works.
-ok 38 - squash works as expected
+expecting success of 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
 
-expecting success of 3404.39 'interrupted squash works as expected': 
-	git checkout -b interrupted-squash conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 squash 3 2" \
-			git rebase -i HEAD~3
-	) &&
-	test_write_lines one two four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	echo resolved > conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test $one = $(git rev-parse HEAD~2)
+expecting success of 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
 
-Switched to a new branch 'interrupted-squash'
-rebase -i script before editing:
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
+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
 
-rebase -i script after editing:
-pick 766a798 two
-squash f91a2b3 four
-pick 1eadf03 three
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply f91a2b3... four
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f91a2b3... four
-[detached HEAD a2f4578] two
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1eadf03... three
-[detached HEAD 6b76c65] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 3 deletions(-)
-Successfully rebased and updated refs/heads/interrupted-squash.
-ok 39 - interrupted squash works as expected
+expecting success of 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
 
-expecting success of 3404.40 'interrupted squash works as expected (case 2)': 
-	git checkout -b interrupted-squash2 conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="3 squash 1 2" \
-			git rebase -i HEAD~3
-	) &&
-	test_write_lines one four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	test_write_lines one two four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	echo resolved > conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test $one = $(git rev-parse HEAD~2)
+expecting success of 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
 
-Switched to a new branch 'interrupted-squash2'
-rebase -i script before editing:
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
+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
 
-rebase -i script after editing:
-pick f91a2b3 four
-squash 766a798 two
-pick 1eadf03 three
-Rebasing (1/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply f91a2b3... four
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f91a2b3... four
-[detached HEAD d1badcc] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 766a798... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 766a798... two
-[detached HEAD 13f7405] four
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1eadf03... three
-[detached HEAD 6785ad5] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 3 deletions(-)
-Successfully rebased and updated refs/heads/interrupted-squash2.
-ok 40 - interrupted squash works as expected (case 2)
+expecting success of 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 3404.41 '--continue tries to commit, even for "edit"': 
-	echo unrelated > file7 &&
-	git add file7 &&
-	test_tick &&
-	git commit -m "unrelated change" &&
-	parent=$(git rev-parse HEAD^) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-		echo edited > file7 &&
-		git add file7 &&
-		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
-	) &&
-	test edited = $(git show HEAD:file7) &&
-	git show HEAD >actual &&
-	grep chouette actual &&
-	test $parent = $(git rev-parse HEAD^)
+expecting success of 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
 
-[interrupted-squash2 98947cc] unrelated change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-rebase -i script before editing:
-pick 98947cc unrelated change
+expecting success of 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
 
-rebase -i script after editing:
-edit 98947cc unrelated change
-Rebasing (1/1)
Stopped at 98947cc...  unrelated change
-You can amend the commit now, with
+expecting success of 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
 
-  git commit --amend 
+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
 
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-[detached HEAD 9483ccd] chouette!
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:39:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Successfully rebased and updated refs/heads/interrupted-squash2.
-    chouette!
-ok 41 - --continue tries to commit, even for "edit"
+expecting success of 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
 
-expecting success of 3404.42 'aborted --continue does not squash commits after "edit"': 
-	old=$(git rev-parse HEAD) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-		echo "edited again" > file7 &&
-		git add file7 &&
-		test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue
-	) &&
-	test $old = $(git rev-parse HEAD) &&
-	git rebase --abort
+expecting success of 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
 
-rebase -i script before editing:
-pick 9483ccd chouette!
+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
 
-rebase -i script after editing:
-edit 9483ccd chouette!
-Rebasing (1/1)
Stopped at 9483ccd...  chouette!
-You can amend the commit now, with
+expecting success of 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
 
-  git commit --amend 
+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
 
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-Aborting commit due to empty commit message.
-error: could not commit staged changes.
-ok 42 - aborted --continue does not squash commits after "edit"
+expecting success of 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 3404.43 'auto-amend only edited commits after "edit"': 
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-		echo "edited again" > file7 &&
-		git add file7 &&
-		FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
-		echo "and again" > file7 &&
-		git add file7 &&
-		test_tick &&
-		test_must_fail env FAKE_COMMIT_MESSAGE="and again" \
-			git rebase --continue
-	) &&
-	git rebase --abort
+expecting success of 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
 
-rebase -i script before editing:
-pick 9483ccd chouette!
+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
 
-rebase -i script after editing:
-edit 9483ccd chouette!
-Rebasing (1/1)
Stopped at 9483ccd...  chouette!
-You can amend the commit now, with
+expecting success of 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
 
-  git commit --amend 
+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
 
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-[detached HEAD 9b7064d] edited file7 again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: 
-You have uncommitted changes in your working tree. Please, commit them
-first and then run 'git rebase --continue' again.
-ok 43 - auto-amend only edited commits after "edit"
+expecting success of 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
 
-expecting success of 3404.44 'clean error after failed "exec"': 
-	test_tick &&
-	test_when_finished "git rebase --abort || :" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^
-	) &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	test_must_fail git rebase --continue 2>error &&
-	test_grep "you have staged changes in your working tree" error &&
-	test_grep ! "could not open.*for reading" error
+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
 
-rebase -i script before editing:
-pick 9483ccd chouette!
+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
 
-rebase -i script after editing:
-pick 9483ccd chouette!
-exec false
-Rebasing (2/2)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+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
 
-  git rebase --continue
+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
 
+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
 
-error: you have staged changes in your working tree
-ok 44 - clean error after failed "exec"
+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 3404.45 'rebase a detached HEAD': 
-	grandparent=$(git rev-parse HEAD~2) &&
-	git checkout $(git rev-parse HEAD) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1" git rebase -i HEAD~2
-	) &&
-	test $grandparent = $(git rev-parse HEAD~2)
+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
 
-Note: switching to '9483ccdd3462028242a62a4b10b5300681f344d7'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 9483ccd chouette!
-rebase -i script before editing:
-pick 6785ad5 three
-pick 9483ccd chouette!
+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
 
-rebase -i script after editing:
-pick 9483ccd chouette!
-pick 6785ad5 three
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 45 - rebase a detached HEAD
+expecting success of 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
 
-expecting success of 3404.46 'rebase a commit violating pre-commit': 
-	test_hook pre-commit <<-\EOF &&
-	test -z "$(git diff --cached --check)"
-	EOF
-	echo "monde! " >> file1 &&
-	test_tick &&
-	test_must_fail git commit -m doesnt-verify file1 &&
-	git commit -m doesnt-verify --no-verify file1 &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES=2 git rebase -i HEAD~2
-	)
+expecting success of 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
 
-[detached HEAD c2de550] doesnt-verify
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-rebase -i script before editing:
-pick 2a5c937 three
-pick c2de550 doesnt-verify
+expecting success of 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
 
-rebase -i script after editing:
-pick c2de550 doesnt-verify
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 46 - rebase a commit violating pre-commit
+expecting success of 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 3404.47 'rebase with a file named HEAD in worktree': 
-	git reset --hard &&
-	git checkout -b branch3 A &&
+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
 
-	(
-		GIT_AUTHOR_NAME="Squashed Away" &&
-		export GIT_AUTHOR_NAME &&
-		>HEAD &&
-		git add HEAD &&
-		git commit -m "Add head" &&
-		>BODY &&
-		git add BODY &&
-		git commit -m "Add body"
-	) &&
+expecting success of 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
 
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 squash 2" git rebase -i @{-1}
-	) &&
-	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
+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
 
+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
 
-HEAD is now at 772e3c6 doesnt-verify
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+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
 
-  772e3c6 doesnt-verify
-  82d2839 chouette!
+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
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 772e3c6
+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
 
-Switched to a new branch 'branch3'
-[branch3 838aee5] Add head
- Author: Squashed Away <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 HEAD
-[branch3 271c26d] Add body
- Author: Squashed Away <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 BODY
-rebase -i script before editing:
-pick 838aee5 Add head
-pick 271c26d Add body
+expecting success of 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
 
-rebase -i script after editing:
-pick 838aee5 Add head
-squash 271c26d Add body
-Rebasing (1/2)
Rebasing (2/2)
[detached HEAD b224944] Add head
- Author: Squashed Away <author@example.com>
- Date: Thu Apr 7 15:46:13 2005 -0700
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 BODY
- create mode 100644 HEAD
-Successfully rebased and updated refs/heads/branch3.
-ok 47 - rebase with a file named HEAD in worktree
+expecting success of 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
 
-expecting success of 3404.48 'do "noop" when there is nothing to cherry-pick': 
+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
 
-	git checkout -b branch4 HEAD &&
-	GIT_EDITOR=: git commit --amend \
-		--author="Somebody else <somebody@else.com>" &&
-	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
-	git rebase -i branch3 &&
-	test_cmp_rev branch3 branch4
+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
 
+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
 
-Switched to a new branch 'branch4'
-[branch4 beb8dd6] Add head
- Author: Somebody else <somebody@else.com>
- Date: Thu Apr 7 15:46:13 2005 -0700
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 BODY
- create mode 100644 HEAD
-warning: skipped previously applied commit beb8dd6
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Successfully rebased and updated refs/heads/branch4.
-ok 48 - do "noop" when there is nothing to cherry-pick
+expecting success of 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
 
-expecting success of 3404.49 'submodule rebase setup': 
-	git checkout A &&
-	mkdir sub &&
-	(
-		cd sub && git init && >elif &&
-		git add elif && git commit -m "submodule initial"
-	) &&
-	echo 1 >file1 &&
-	git add file1 sub &&
-	test_tick &&
-	git commit -m "One" &&
-	echo 2 >file1 &&
-	test_tick &&
-	git commit -a -m "Two" &&
-	(
-		cd sub && echo 3 >elif &&
-		git commit -a -m "submodule second"
-	) &&
-	test_tick &&
-	git commit -a -m "Three changes submodule"
+expecting success of 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
 
-Note: switching to 'A'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 6e62bf8 A
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive/sub/.git/
-[master (root-commit) 6795896] submodule initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 elif
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[detached HEAD 068ccfe] One
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 160000 sub
-[detached HEAD 8cd1639] Two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 628e79e] submodule second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD d80ae32] Three changes submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 49 - submodule rebase setup
+expecting success of 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
 
-expecting success of 3404.50 'submodule rebase -i': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 squash 2 3" git rebase -i A
-	)
+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
 
-rebase -i script before editing:
-pick 068ccfe One
-pick 8cd1639 Two
-pick d80ae32 Three changes submodule
+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
 
-rebase -i script after editing:
-pick 068ccfe One
-squash 8cd1639 Two
-pick d80ae32 Three changes submodule
-Rebasing (2/3)
[detached HEAD 1dab715] One
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:47:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 160000 sub
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 50 - submodule rebase -i
+expecting success of 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
 
-expecting success of 3404.51 'submodule conflict setup': 
-	git tag submodule-base &&
-	git checkout HEAD^ &&
-	(
-		cd sub && git checkout HEAD^ && echo 4 >elif &&
-		git add elif && git commit -m "submodule conflict"
-	) &&
-	git add sub &&
-	test_tick &&
-	git commit -m "Conflict in submodule" &&
-	git tag submodule-topic
+expecting success of 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
 
-Previous HEAD position was b1c1bea Three changes submodule
-HEAD is now at 1dab715 One
-M	sub
-Note: switching to 'HEAD^'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 6795896 submodule initial
-[detached HEAD c3aa4c8] submodule conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD 2f8239b] Conflict in submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 51 - submodule conflict setup
+expecting success of 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 3404.52 'rebase -i continue with only submodule staged': 
-	test_must_fail git rebase -i submodule-base &&
-	git add sub &&
-	git rebase --continue &&
-	test $(git rev-parse submodule-base) != $(git rev-parse HEAD)
+expecting success of 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
 
-Rebasing (1/1)
hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (sub), and either merge commit c3aa4c8
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add sub
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule sub
-CONFLICT (submodule): Merge conflict in sub
-error: could not apply 2f8239b... Conflict in submodule
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 2f8239b... Conflict in submodule
-[detached HEAD e05ea42] Conflict in submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 52 - rebase -i continue with only submodule staged
+expecting success of 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
 
-expecting success of 3404.53 'rebase -i continue with unstaged submodule': 
-	git checkout submodule-topic &&
-	git reset --hard &&
-	test_must_fail git rebase -i submodule-base &&
-	git reset &&
-	git rebase --continue &&
-	test_cmp_rev submodule-base HEAD
+expecting success of 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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  e05ea42 Conflict in submodule
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> e05ea42
+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
 
-HEAD is now at 2f8239b Conflict in submodule
-HEAD is now at 2f8239b Conflict in submodule
-Rebasing (1/1)
hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (sub), and either merge commit c3aa4c8
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add sub
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule sub
-CONFLICT (submodule): Merge conflict in sub
-error: could not apply 2f8239b... Conflict in submodule
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 2f8239b... Conflict in submodule
-Unstaged changes after reset:
-M	sub
-Successfully rebased and updated detached HEAD.
-ok 53 - rebase -i continue with unstaged submodule
+expecting success of 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 3404.54 'avoid unnecessary reset': 
-	git checkout primary &&
-	git reset --hard &&
-	test-tool chmtime =123456789 file3 &&
-	git update-index --refresh &&
-	HEAD=$(git rev-parse HEAD) &&
-	git rebase -i HEAD~4 &&
-	test $HEAD = $(git rev-parse HEAD) &&
-	MTIME=$(test-tool chmtime --get file3) &&
-	test 123456789 = $MTIME
+expecting success of 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
 
-warning: unable to rmdir 'sub': Directory not empty
-Previous HEAD position was b1c1bea Three changes submodule
-Switched to branch 'primary'
-HEAD is now at 8f99a4f E
-Successfully rebased and updated refs/heads/primary.
-ok 54 - avoid unnecessary reset
+expecting success of 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 3404.55 'reword': 
-	git checkout -b reword-branch primary &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \
-			git rebase -i A &&
-		git show HEAD >actual &&
-		grep "E changed" actual &&
-		test $(git rev-parse primary) != $(git rev-parse HEAD) &&
-		test_cmp_rev primary^ HEAD^ &&
-		FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
-			git rebase -i A &&
-		git show HEAD^ >actual &&
-		grep "D changed" actual &&
-		FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \
-			git rebase -i A &&
-		git show HEAD~3 >actual &&
-		grep "B changed" actual &&
-		FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \
-			git rebase -i A
-	) &&
-	git show HEAD~2 >actual &&
-	grep "C changed" actual
+expecting success of 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
 
-Switched to a new branch 'reword-branch'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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
 
-rebase -i script after editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-reword 8f99a4f E
-Rebasing (4/4)
[detached HEAD 7045bc0] E changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Successfully rebased and updated refs/heads/reword-branch.
-    E changed
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 7045bc0 E changed
+expecting success of 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
 
-rebase -i script after editing:
-pick 313fe96 B
-pick d0f65f2 C
-reword 0547e3f D
-pick 7045bc0 E changed
-Rebasing (3/4)
[detached HEAD ffc34d0] D changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
-    D changed
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick ffc34d0 D changed
-pick 4804c05 E changed
+expecting success of 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
 
-rebase -i script after editing:
-reword 313fe96 B
-pick d0f65f2 C
-pick ffc34d0 D changed
-pick 4804c05 E changed
-Rebasing (1/4)
[detached HEAD ff0628d] B changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
-    B changed
-rebase -i script before editing:
-pick ff0628d B changed
-pick e73c68c C
-pick fb271b0 D changed
-pick a55d41c E changed
+expecting success of 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
 
-rebase -i script after editing:
-pick ff0628d B changed
-r e73c68c C
-pick fb271b0 D changed
-p a55d41c E changed
-Rebasing (2/4)
[detached HEAD 234d360] C changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/reword-branch.
-    C changed
-ok 55 - reword
+expecting success of 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 3404.56 'no uncommitted changes when rewording and the todo list is reloaded': 
-	git checkout E &&
-	test_when_finished "git checkout @{-1}" &&
-	(
-		set_fake_editor &&
-		GIT_SEQUENCE_EDITOR="\"$PWD/fake-editor.sh\"" &&
-		export GIT_SEQUENCE_EDITOR &&
-		set_reword_editor &&
-		FAKE_LINES="reword 1 reword 2" git rebase -i C
-	) &&
-	check_reworded_commits D E
+expecting success of 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
 
-Note: switching to 'E'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 8f99a4f E
-rebase -i script before editing:
-pick 0547e3f D
-pick 8f99a4f E
+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
 
-rebase -i script after editing:
-reword 0547e3f D
-reword 8f99a4f E
-Rebasing (1/2)
[detached HEAD af7a1e6] D
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Rebasing (3/3)
[detached HEAD d9fff5f] E
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Successfully rebased and updated detached HEAD.
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+expecting success of 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
 
-  d9fff5f E
-  af7a1e6 D
+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
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> d9fff5f
+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
 
-Switched to branch 'reword-branch'
-ok 56 - no uncommitted changes when rewording and the todo list is reloaded
+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
 
-expecting success of 3404.57 'rebase -i can copy notes': 
-	git config notes.rewrite.rebase true &&
-	git config notes.rewriteRef "refs/notes/*" &&
-	test_commit n1 &&
-	test_commit n2 &&
-	test_commit n3 &&
-	git notes add -m"a note" n3 &&
-	git rebase -i --onto n1 n2 &&
-	test "a note" = "$(git notes show HEAD)"
+expecting success of 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
 
-[reword-branch aa5df09] n1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 n1.t
-[reword-branch 20afda8] n2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 n2.t
-[reword-branch 9a71079] n3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 n3.t
-Rebasing (1/1)
Successfully rebased and updated refs/heads/reword-branch.
-ok 57 - rebase -i can copy notes
+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
 
-expecting success of 3404.58 'rebase -i can copy notes over a fixup': 
-	cat >expect <<-\EOF &&
-	an earlier note
+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
 
-	a note
-	EOF
-	git reset --hard n3 &&
-	git notes add -m"an earlier note" n2 &&
-	(
-		set_fake_editor &&
-		GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \
-			git rebase -i n1
-	) &&
-	git notes show > output &&
-	test_cmp expect output
+expecting success of 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
 
-HEAD is now at 9a71079 n3
-rebase -i script before editing:
-pick 20afda8 n2
-pick 9a71079 n3
+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
 
-rebase -i script after editing:
-pick 20afda8 n2
-f 9a71079 n3
-Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-branch.
-ok 58 - rebase -i can copy notes over a fixup
+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
 
-expecting success of 3404.59 'rebase while detaching HEAD': 
-	git symbolic-ref HEAD &&
-	grandparent=$(git rev-parse HEAD~2) &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0
-	) &&
-	test $grandparent = $(git rev-parse HEAD~2) &&
-	test_must_fail git symbolic-ref HEAD
+expecting success of 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
 
-refs/heads/reword-branch
-rebase -i script before editing:
-pick aa5df09 n1
-pick 5b2df83 n2
+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
 
-rebase -i script after editing:
-pick 5b2df83 n2
-pick aa5df09 n1
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-fatal: ref HEAD is not a symbolic ref
-ok 59 - rebase while detaching HEAD
+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
 
-expecting success of 3404.60 'always cherry-pick with --no-ff': 
-	git checkout no-ff-branch &&
-	git tag original-no-ff-branch &&
-	git rebase -i --no-ff A &&
-	for p in 0 1 2
-	do
-		test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
-		git diff HEAD~$p original-no-ff-branch~$p > out &&
-		test_must_be_empty out || return 1
-	done &&
-	test_cmp_rev HEAD~3 original-no-ff-branch~3 &&
-	git diff HEAD~3 original-no-ff-branch~3 > out &&
-	test_must_be_empty out
+expecting success of 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
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+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
 
-  9689317 n1
-  a0bd0ac n2
+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
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 9689317
+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
 
-Switched to branch 'no-ff-branch'
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/no-ff-branch.
-ok 60 - always cherry-pick with --no-ff
+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 3404.61 'set up commits with funny messages': 
-	git checkout -b funny A &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "end with slash\\" &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "something (\000) that looks like octal" &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "something (\n) that looks like a newline" &&
-	echo >>file1 &&
-	test_tick &&
-	git commit -a -m "another commit"
+expecting success of 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
 
-Switched to a new branch 'funny'
-[funny f317e30] end with slash\
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[funny d68f8aa] something (\000) that looks like octal
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[funny 495c640] something (\n) that looks like a newline
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[funny 3a6cc5d] another commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 61 - set up commits with funny messages
+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 3404.62 'rebase-i history with funny messages': 
-	git rev-list A..funny >expect &&
-	test_tick &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 4" git rebase -i A
-	) &&
-	git rev-list A.. >actual &&
-	test_cmp expect actual
+expecting success of 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
 
-rebase -i script before editing:
-pick f317e30 end with slash\
-pick d68f8aa something (\000) that looks like octal
-pick 495c640 something (\n) that looks like a newline
-pick 3a6cc5d another commit
+expecting success of 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
 
-rebase -i script after editing:
-pick f317e30 end with slash\
-pick d68f8aa something (\000) that looks like octal
-pick 495c640 something (\n) that looks like a newline
-pick 3a6cc5d another commit
-Successfully rebased and updated refs/heads/funny.
-ok 62 - rebase-i history with funny messages
+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
 
-expecting success of 3404.63 'prepare for rebase -i --exec': 
-	git checkout primary &&
-	git checkout -b execute &&
-	test_commit one_exec main.txt one_exec &&
-	test_commit two_exec main.txt two_exec &&
-	test_commit three_exec main.txt three_exec
+expecting success of 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
 
-Switched to branch 'primary'
-Switched to a new branch 'execute'
-[execute 1983bb3] one_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.txt
-[execute 2efd8a2] two_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[execute 66ac40d] three_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 63 - prepare for rebase -i --exec
+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
 
-expecting success of 3404.64 'running "git rebase -i --exec git show HEAD"': 
-	(
-		set_fake_editor &&
-		git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
+expecting success of 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
 
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-ok 64 - running "git rebase -i --exec git show HEAD"
+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
 
-expecting success of 3404.65 'running "git rebase --exec git show HEAD -i"': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
+expecting success of 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
 
-HEAD is now at 66ac40d three_exec
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-ok 65 - running "git rebase --exec git show HEAD -i"
+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
 
-expecting success of 3404.66 'running "git rebase -ix git show HEAD"': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase -ix "git show HEAD" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
+expecting success of 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
 
-HEAD is now at 66ac40d three_exec
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/execute.
-ok 66 - running "git rebase -ix git show HEAD"
+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
 
-expecting success of 3404.67 'rebase -ix with several <CMD>': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,9d" expect >expected &&
-	test_cmp expected actual
+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
 
-HEAD is now at 66ac40d three_exec
-Rebasing (2/4)
Executing: git show HEAD; pwd
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/4)
Executing: git show HEAD; pwd
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD; pwd
-Successfully rebased and updated refs/heads/execute.
-ok 67 - rebase -ix with several <CMD>
+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
 
-expecting success of 3404.68 'rebase -ix with several instances of --exec': 
-	git reset --hard execute &&
-	(
-		set_fake_editor &&
-		git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
-		FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
-				exec_git_show_HEAD exec_pwd" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~2 >expect
-	) &&
-	sed -e "1,11d" expect >expected &&
-	test_cmp expected actual
+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
 
-HEAD is now at 66ac40d three_exec
-Rebasing (2/6)
Executing: git show HEAD
-Rebasing (3/6)
Executing: pwd
-Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
-Rebasing (6/6)
Executing: pwd
-Successfully rebased and updated refs/heads/execute.
-Rebasing (2/6)
Executing: git show HEAD
-Rebasing (3/6)
Executing: pwd
-Rebasing (4/6)
Rebasing (5/6)
Executing: git show HEAD
-Rebasing (6/6)
Executing: pwd
-Successfully rebased and updated refs/heads/execute.
-ok 68 - rebase -ix with several instances of --exec
+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
+	
+ok 2090 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf
 
-expecting success of 3404.69 'rebase -ix with --autosquash': 
-	git reset --hard execute &&
-	git checkout -b autosquash &&
-	echo second >second.txt &&
-	git add second.txt &&
-	git commit -m "fixup! two_exec" &&
-	echo bis >bis.txt &&
-	git add bis.txt &&
-	git commit -m "fixup! two_exec" &&
-	git checkout -b autosquash_actual &&
-	git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual &&
-	git checkout autosquash &&
-	(
-		set_fake_editor &&
-		git checkout -b autosquash_expected &&
-		FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
-		export FAKE_LINES &&
-		git rebase -i HEAD~4 >expect
-	) &&
-	sed -e "1,13d" expect >expected &&
-	test_cmp expected actual
+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
 
-HEAD is now at 66ac40d three_exec
-Switched to a new branch 'autosquash'
-[autosquash 1da6bea] fixup! two_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.txt
-[autosquash 280ba53] fixup! two_exec
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bis.txt
-Switched to a new branch 'autosquash_actual'
-Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
-Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/autosquash_actual.
-Switched to branch 'autosquash'
-Switched to a new branch 'autosquash_expected'
-Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Executing: git show HEAD
-Rebasing (5/6)
Rebasing (6/6)
Executing: git show HEAD
-Successfully rebased and updated refs/heads/autosquash_expected.
-ok 69 - rebase -ix with --autosquash
+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 3404.70 'rebase --exec works without -i ': 
-	git reset --hard execute &&
-	rm -rf exec_output &&
-	EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output"  HEAD~2 2>actual &&
-	test_grep  "Successfully rebased and updated" actual &&
-	test_line_count = 2 exec_output &&
-	test_path_is_missing invoked_editor
+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
 
-HEAD is now at 66ac40d three_exec
-Successfully rebased and updated refs/heads/autosquash_expected.
-ok 70 - rebase --exec works without -i 
+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 3404.71 'rebase -i --exec without <CMD>': 
-	git reset --hard execute &&
-	test_must_fail git rebase -i --exec 2>actual &&
-	test_grep "requires a value" actual &&
-	git checkout primary
+expecting success of 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
 
-HEAD is now at 66ac40d three_exec
-error: option `exec' requires a value
-Switched to branch 'primary'
-ok 71 - rebase -i --exec without <CMD>
+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 3404.72 'rebase -i --root re-order and drop commits': 
-	git checkout E &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="3 1 2 5" git rebase -i --root
-	) &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
-	test C = $(git cat-file commit HEAD^^^ | sed -ne \$p) &&
-	test 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\ )
+expecting success of 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
 
-Note: switching to 'E'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 8f99a4f E
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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
 
-rebase -i script after editing:
-pick d0f65f2 C
-pick 6e62bf8 A
-pick 313fe96 B
-pick 8f99a4f E
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 72 - rebase -i --root re-order and drop commits
+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 3404.73 'rebase -i --root retain root commit author and message': 
-	git checkout A &&
-	echo B >file7 &&
-	git add file7 &&
-	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2" git rebase -i --root
-	) &&
-	git cat-file commit HEAD >output &&
-	grep -q "^author Twerp Snog" output &&
-	git cat-file commit HEAD >actual &&
-	grep -q "^different author$" actual
+expecting success of 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
 
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
+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
 
-  8ec5b24 E
-  0680f3e B
-  2e95b98 A
-  8676e2e C
+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
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 8ec5b24
+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 6e62bf8 A
-[detached HEAD 419a8fd] different author
- Author: Twerp Snog <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 419a8fd different author
+expecting success of 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
 
-rebase -i script after editing:
-pick 419a8fd different author
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 73 - rebase -i --root retain root commit author and message
+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
 
-expecting success of 3404.74 'rebase -i --root temporary sentinel commit': 
-	git checkout B &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="2" git rebase -i --root
-	) &&
-	git cat-file commit HEAD >actual &&
-	grep "^tree $EMPTY_TREE" actual &&
-	git rebase --abort
+expecting success of 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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  2b113fb different author
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 2b113fb
+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
 
-HEAD is now at 313fe96 B
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 313fe96 B
+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
 
-rebase -i script after editing:
-pick 313fe96 B
-Rebasing (1/1)
CONFLICT (modify/delete): file1 deleted in HEAD and modified in 313fe96 (B).  Version 313fe96 (B) of file1 left in tree.
-error: could not apply 313fe96... B
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 313fe96... B
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 74 - rebase -i --root temporary sentinel commit
+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 3404.75 'rebase -i --root fixup root commit': 
-	git checkout B &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 fixup 2" git rebase -i --root
-	) &&
-	test A = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test B = $(git show HEAD:file1) &&
-	test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
+expecting success of 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
 
-HEAD is now at 313fe96 B
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 313fe96 B
+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
 
-rebase -i script after editing:
-pick 6e62bf8 A
-fixup 313fe96 B
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 75 - rebase -i --root fixup root commit
+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
 
-expecting success of 3404.76 'rebase -i --root reword original root commit': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b reword-original-root-branch primary &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
-			git rebase -i --root
-	) &&
-	git show HEAD^ >actual &&
-	grep "A changed" actual &&
-	test -z "$(git show -s --format=%p HEAD^)"
+expecting success of 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 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
+
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  558b876 A
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 558b876
+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
 
-Switched to a new branch 'reword-original-root-branch'
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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
 
-rebase -i script after editing:
-reword 6e62bf8 A
-pick 313fe96 B
-Rebasing (1/2)
[detached HEAD 903b38e] A changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-original-root-branch.
-    A changed
-fatal: no rebase in progress
-ok 76 - rebase -i --root reword original root commit
+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
+	
+ok 2132 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
 
-expecting success of 3404.77 'rebase -i --root reword new root commit': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b reword-now-root-branch primary &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
-		git rebase -i --root
-	) &&
-	git show HEAD^ >actual &&
-	grep "C changed" actual &&
-	test -z "$(git show -s --format=%p HEAD^)"
+expecting success of 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
 
-Switched to a new branch 'reword-now-root-branch'
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 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
 
-rebase -i script after editing:
-reword d0f65f2 C
-pick 6e62bf8 A
-Rebasing (1/2)
[detached HEAD a808654] C changed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Rebasing (2/2)
Successfully rebased and updated refs/heads/reword-now-root-branch.
-    C changed
-fatal: no rebase in progress
-ok 77 - rebase -i --root reword new root commit
+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 3404.78 'rebase -i --root when root has untracked file conflict': 
-	test_when_finished "reset_rebase" &&
-	git checkout -b failing-root-pick A &&
-	echo x >file2 &&
-	git rm file1 &&
-	git commit -m "remove file 1 add file 2" &&
-	echo z >file1 &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2" git rebase -i --root
-	) &&
-	rm file1 &&
-	git rebase --continue &&
-	test "$(git log -1 --format=%B)" = "remove file 1 add file 2" &&
-	test "$(git rev-list --count HEAD)" = 2
+expecting success of 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
 
-Switched to a new branch 'failing-root-pick'
-rm 'file1'
-[failing-root-pick 71adfbc] remove file 1 add file 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 71adfbc remove file 1 add file 2
+expecting success of 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
 
-rebase -i script after editing:
-pick 6e62bf8 A
-pick 71adfbc remove file 1 add file 2
-Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
-	file1
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     pick 6e62bf890e21973b771e4e6fc28f5ade62edb4bc A
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
-fatal: no rebase in progress
-HEAD is now at 71adfbc remove file 1 add file 2
-Removing actual
-Removing actual-squash-fixup
-Removing error
-Removing exec_output
-Removing expect
-Removing expect-squash-fixup
-Removing expect2
-Removing expected
-Removing fake-editor.sh
-Removing fake-sequence-editor.sh
-Removing file2
-Removing out
-Removing output
-Removing reword-actual
-Removing reword-editor.sh
-Removing reword-expected
-Removing reword-log
-Removing reword-oid
-Removing reword-sequence-editor.sh
-Removing script
-Removing stderr
-Removing todo
-Removing touch-subdir
-ok 78 - rebase -i --root when root has untracked file conflict
+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
+	
+ok 2138 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf
 
-expecting success of 3404.79 'rebase -i --root reword root when root has untracked file conflict': 
-	test_when_finished "reset_rebase" &&
-	echo z>file1 &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="reword 1 2" \
-			FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
-		rm file1 &&
-		FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue
-	) &&
-	test "$(git log -1 --format=%B HEAD^)" = "Reworded A" &&
-	test "$(git rev-list --count HEAD)" = 2
+expecting success of 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
+	
+ok 2139 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
-rebase -i script before editing:
-pick 6e62bf8 A
-pick 71adfbc remove file 1 add file 2
+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
+	
+ok 2140 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-rebase -i script after editing:
-reword 6e62bf8 A
-pick 71adfbc remove file 1 add file 2
-Rebasing (1/2)
error: The following untracked working tree files would be overwritten by merge:
-	file1
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     reword 6e62bf890e21973b771e4e6fc28f5ade62edb4bc A
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-Rebasing (2/3)
[detached HEAD 1b0ccef] Reworded A
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Rebasing (3/3)
Successfully rebased and updated refs/heads/failing-root-pick.
-fatal: no rebase in progress
-HEAD is now at 847f077 remove file 1 add file 2
-Removing fake-editor.sh
-ok 79 - rebase -i --root reword root when root has untracked file conflict
+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
+	
+ok 2141 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3404.80 'rebase --edit-todo does not work on non-interactive rebase': 
-	git checkout reword-original-root-branch &&
-	git reset --hard &&
-	git checkout conflict-branch &&
-	(
-		set_fake_editor &&
-		test_must_fail git rebase -f --apply --onto HEAD~2 HEAD~ &&
-		test_must_fail git rebase --edit-todo
-	) &&
-	git rebase --abort
+expecting success of 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
+	
+ok 2142 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-Switched to branch 'reword-original-root-branch'
-HEAD is now at c9dc22b B
-Switched to branch 'conflict-branch'
-First, rewinding head to replay your work on top of it...
-Applying: four
-Using index info to reconstruct a base tree...
-M	conflict
-Falling back to patching base and 3-way merge...
-Merging:
-766a798 two
-virtual four
-found 1 common ancestor:
-virtual 3d3da6c4fe4fab218d150e2af365b8b07d465a22
-Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 four
-fatal: The --edit-todo action can only be used during interactive rebase.
-ok 80 - rebase --edit-todo does not work on non-interactive rebase
+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
+	
+ok 2143 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 3404.81 'rebase --edit-todo can be used to modify todo': 
-	git reset --hard &&
-	git checkout no-conflict-branch^0 &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
-		FAKE_LINES="2 1" git rebase --edit-todo &&
-		git rebase --continue
-	) &&
-	test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test L = $(git cat-file commit HEAD | sed -ne \$p)
+expecting success of 0027.2144 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2144 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
 
-HEAD is now at f91a2b3 four
-Note: switching to 'no-conflict-branch^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
+	
+ok 2150 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
+	
+ok 2151 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
-HEAD is now at 3389558 M
-rebase -i script before editing:
-pick 265b89e K
-pick 6b0f5e6 L
-pick 3389558 M
+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
+	
+ok 2152 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-rebase -i script after editing:
-edit 265b89e K
-pick 6b0f5e6 L
-pick 3389558 M
-Rebasing (1/3)
Stopped at 265b89e...  K
-You can amend the commit now, with
+expecting success of 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
+	
+ok 2153 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-  git commit --amend 
+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
+	
+ok 2154 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-Once you are satisfied with your changes, run
+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
+	
+ok 2155 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-  git rebase --continue
-rebase -i script before editing:
-pick 6b0f5e6 L
-pick 3389558 M
-rebase -i script after editing:
-pick 3389558 M
-pick 6b0f5e6 L
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 81 - rebase --edit-todo can be used to modify todo
+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
+	
+ok 2156 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
 
-expecting success of 3404.82 'rebase -i produces readable reflog': 
-	git reset --hard &&
-	git branch -f branch-reflog-test H &&
-	git rebase -i --onto I F branch-reflog-test &&
-	cat >expect <<-\EOF &&
-	rebase (finish): returning to refs/heads/branch-reflog-test
-	rebase (pick): H
-	rebase (pick): G
-	rebase (start): checkout I
-	EOF
-	git reflog -n4 HEAD |
-	sed "s/[^:]*: //" >actual &&
-	test_cmp expect actual
+expecting success of 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
 
-HEAD is now at e7ab20b L
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-reflog-test.
-ok 82 - rebase -i produces readable reflog
+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 3404.83 'rebase -i respects core.commentchar': 
-	git reset --hard &&
-	git checkout E^0 &&
-	test_config core.commentchar "\\" &&
-	write_script remove-all-but-first.sh <<-\EOF &&
-	sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
-	mv "$1.tmp" "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/remove-all-but-first.sh" &&
-		git rebase -i B
-	) &&
-	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
+expecting success of 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
 
-HEAD is now at d98957c H
-Note: switching to 'E^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 8f99a4f E
-Successfully rebased and updated detached HEAD.
-ok 83 - rebase -i respects core.commentchar
+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 3404.84 'rebase -i respects core.commentchar=auto': 
-	test_config core.commentchar auto &&
-	write_script copy-edit-script.sh <<-\EOF &&
-	cp "$1" edit-script
-	EOF
-	test_when_finished "git rebase --abort || :" &&
-	(
-		test_set_editor "$(pwd)/copy-edit-script.sh" &&
-		git rebase -i HEAD^
-	) &&
-	test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
+expecting success of 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
 
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 84 - rebase -i respects core.commentchar=auto
+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 3404.85 'rebase -i, with <onto> and <upstream> specified as :/quuxery': 
-	test_when_finished "git branch -D torebase" &&
-	git checkout -b torebase branch1 &&
-	upstream=$(git rev-parse ":/J") &&
-	onto=$(git rev-parse ":/A") &&
-	git rebase --onto $onto $upstream &&
-	git reset --hard branch1 &&
-	git rebase --onto ":/A" ":/J" &&
-	git checkout branch1
+expecting success of 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
 
-Previous HEAD position was d0f65f2 C
-Switched to a new branch 'torebase'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
-HEAD is now at 450e393 I
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/torebase.
-Switched to branch 'branch1'
-Deleted branch torebase (was 08e872c).
-ok 85 - rebase -i, with <onto> and <upstream> specified as :/quuxery
+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 3404.86 'rebase -i with --strategy and -X': 
-	git checkout -b conflict-merge-use-theirs conflict-branch &&
-	git reset --hard HEAD^ &&
-	echo five >conflict &&
-	echo Z >file1 &&
-	git commit -a -m "one file conflict" &&
-	EDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch &&
-	test $(git show conflict-branch:conflict) = $(cat conflict) &&
-	test $(cat file1) = Z
+expecting success of 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
 
-Switched to a new branch 'conflict-merge-use-theirs'
-HEAD is now at 1eadf03 three
-[conflict-merge-use-theirs 1808efd] one file conflict
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Rebasing (1/1)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs.
-ok 86 - rebase -i with --strategy and -X
+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 3404.87 'interrupted rebase -i with --strategy and -X': 
-	git checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&
-	git reset --hard HEAD^ &&
-	>breakpoint &&
-	git add breakpoint &&
-	git commit -m "breakpoint for interactive mode" &&
-	echo five >conflict &&
-	echo Z >file1 &&
-	git commit -a -m "one file conflict" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \
-			-Xours conflict-branch
-	) &&
-	git rebase --continue &&
-	test $(git show conflict-branch:conflict) = $(cat conflict) &&
-	test $(cat file1) = Z
+expecting success of 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
 
-Switched to a new branch 'conflict-merge-use-theirs-interrupted'
-HEAD is now at 1eadf03 three
-[conflict-merge-use-theirs-interrupted 661680f] breakpoint for interactive mode
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 breakpoint
-[conflict-merge-use-theirs-interrupted 14f789b] one file conflict
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-rebase -i script before editing:
-pick 661680f breakpoint for interactive mode
-pick 14f789b one file conflict
+expecting success of 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
 
-rebase -i script after editing:
-edit 661680f breakpoint for interactive mode
-pick 14f789b one file conflict
-Rebasing (1/2)
Stopped at 661680f...  breakpoint for interactive mode
-You can amend the commit now, with
+expecting success of 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
 
-  git commit --amend 
+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
 
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-Rebasing (2/2)
Successfully rebased and updated refs/heads/conflict-merge-use-theirs-interrupted.
-ok 87 - interrupted rebase -i with --strategy and -X
+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 3404.88 'rebase -i error on commits with \ in message': 
-	current_head=$(git rev-parse HEAD) &&
-	test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
-	test_commit TO-REMOVE will-conflict old-content &&
-	test_commit "\temp" will-conflict new-content dummy &&
-	test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
-	test_expect_code 1 grep  "	emp" error
+expecting success of 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
 
-[conflict-merge-use-theirs-interrupted 77c3fb4] TO-REMOVE
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 will-conflict
-[conflict-merge-use-theirs-interrupted 34a4968] \temp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-CONFLICT (modify/delete): will-conflict deleted in HEAD and modified in 34a4968 (\temp).  Version 34a4968 (\temp) of will-conflict left in tree.
-HEAD is now at f36c680 one file conflict
-ok 88 - rebase -i error on commits with \ in message
+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 3404.89 'short commit ID setup': 
-	test_when_finished "git checkout primary" &&
-	git checkout --orphan collide &&
-	git rm -rf . &&
-	(
-	unset test_tick &&
-	test_commit collide1 collide &&
-	test_commit --notick collide2 collide &&
-	test_commit --notick collide3 collide
-	)
+expecting success of 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
 
-Switched to a new branch 'collide'
-rm 'breakpoint'
-rm 'conflict'
-rm 'file1'
-[collide (root-commit) 674fc94] collide1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 collide
-[collide 0b53f45] collide2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[collide 6bcda37] collide3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'primary'
-ok 89 - short commit ID setup
+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 3404.90 'short commit ID collide': 
-	test_oid_cache <<-EOF &&
-	# collision-related constants
-	t3404_collision	sha1:6bcd
-	t3404_collision	sha256:0161
-	t3404_collider	sha1:ac4f2ee
-	t3404_collider	sha256:16697
-	EOF
-	test_when_finished "reset_rebase && git checkout primary" &&
-	git checkout collide &&
-	colliding_id=$(test_oid t3404_collision) &&
-	hexsz=$(test_oid hexsz) &&
-	test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
-	test_config core.abbrev 4 &&
-	(
-		unset test_tick &&
-		test_tick &&
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE="collide2 $(test_oid t3404_collider)" \
-		FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
-		test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
-		grep "^pick $colliding_id " \
-			.git/rebase-merge/git-rebase-todo.tmp &&
-		grep -E "^pick [0-9a-f]{$hexsz}" \
-			.git/rebase-merge/git-rebase-todo &&
-		grep -E "^pick [0-9a-f]{$hexsz}" \
-			.git/rebase-merge/git-rebase-todo.backup &&
-		git rebase --continue
-	) &&
-	collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" &&
-	collide3="$(git rev-parse collide3 | cut -c 1-4)" &&
-	test "$collide2" = "$collide3"
+expecting success of 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
 
-Switched to branch 'collide'
-rebase -i script before editing:
-pick 0b53 collide2
-pick 6bcd collide3
+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
 
-rebase -i script after editing:
-reword 0b53 collide2
-break
-pick 6bcd collide3
-Rebasing (1/3)
[detached HEAD 6bcda37f] collide2 ac4f2ee
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Stopped at 6bcda37f (collide2 ac4f2ee)
-pick 6bcd collide3
-pick 6bcda372b23d641debbf943e0b709349f72dcd92 collide3
-pick 0b53f4541f74116336854697b0278cb818c448e2 collide2
-pick 6bcda372b23d641debbf943e0b709349f72dcd92 collide3
-Rebasing (3/3)
Successfully rebased and updated refs/heads/collide.
-fatal: no rebase in progress
-HEAD is now at fbe3cf5 collide3
-Removing actual
-Removing copy-edit-script.sh
-Removing edit-script
-Removing expect
-Removing fake-editor.sh
-Removing remove-all-but-first.sh
-Switched to branch 'primary'
-ok 90 - short commit ID collide
+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 3404.91 'respect core.abbrev': 
-	git config core.abbrev 12 &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i HEAD~4 >todo-list
-	) &&
-	test 4 = $(grep -c -E "pick [0-9a-f]{12,}" todo-list)
+expecting success of 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
 
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-ok 91 - respect core.abbrev
+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 3404.92 'todo count': 
-	write_script dump-raw.sh <<-\EOF &&
-		cat "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/dump-raw.sh" &&
-		git rebase -i HEAD~4 >actual
-	) &&
-	test_grep "^# Rebase ..* onto ..* ([0-9]" actual
+expecting success of 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
 
-Successfully rebased and updated refs/heads/primary.
-# Rebase 6e62bf890e21..8f99a4f1fbbd onto 6e62bf890e21 (4 commands)
-ok 92 - todo count
+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 3404.93 'rebase -i commits that overwrite untracked files (pick)': 
-	git checkout --force A &&
-	git clean -f &&
-	cat >todo <<-EOF &&
-	exec >file2
-	pick $(git rev-parse B) B
-	pick $(git rev-parse C) C
-	pick $(git rev-parse D) D
-	exec cat .git/rebase-merge/done >actual
-	EOF
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i A
-	) &&
-	test_cmp_rev HEAD B &&
-	test_cmp_rev REBASE_HEAD C &&
-	head -n3 todo >expect &&
-	test_cmp expect .git/rebase-merge/done &&
-	rm file2 &&
-	test_path_is_missing .git/rebase-merge/patch &&
-	echo changed >file1 &&
-	git add file1 &&
-	test_must_fail git rebase --continue 2>err &&
-	grep "error: you have staged changes in your working tree" err &&
-	git reset --hard HEAD &&
-	git rebase --continue &&
-	test_cmp_rev HEAD D &&
-	tail -n3 todo >>expect &&
-	test_cmp expect actual
+expecting success of 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
 
-Note: switching to 'A'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 6e62bf890e21 A
-Removing actual
-Removing dump-raw.sh
-Removing fake-editor.sh
-Removing todo-list
-rebase -i script after editing:
-exec >file2
-pick 313fe965c0484313caa01fa597a77d2ad86d279e B
-pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
-pick 0547e3f1350de154b309493b84e37dcd3097c587 D
-exec cat .git/rebase-merge/done >actual
-Rebasing (1/5)
Executing: >file2
-Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by merge:
-	file2
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     pick d0f65f2f81ee9679b9f6e0748a682ddbf4351a33 C
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-error: you have staged changes in your working tree
-HEAD is now at 313fe965c048 B
-Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
-Successfully rebased and updated detached HEAD.
-ok 93 - rebase -i commits that overwrite untracked files (pick)
+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 3404.94 'rebase -i commits that overwrite untracked files (squash)': 
-	git checkout --force branch2 &&
-	git clean -f &&
-	git tag original-branch2 &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 squash 2" git rebase -i A
-	) &&
-	test_cmp_rev HEAD F &&
-	test_path_is_missing file6 &&
-	>file6 &&
-	test_must_fail git rebase --continue &&
-	test_cmp_rev HEAD F &&
-	test_cmp_rev REBASE_HEAD I &&
-	rm file6 &&
-	test_path_is_missing .git/rebase-merge/patch &&
-	echo changed >file1 &&
-	git add file1 &&
-	test_must_fail git rebase --continue 2>err &&
-	grep "error: you have staged changes in your working tree" err &&
-	git reset --hard HEAD &&
-	git rebase --continue &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = I &&
-	git reset --hard original-branch2
+expecting success of 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
 
-Previous HEAD position was 0547e3f1350d D
-Switched to branch 'branch2'
-Removing actual
-Removing err
-Removing expect
-Removing fake-sequence-editor.sh
-Removing script
-Removing todo
-rebase -i script before editing:
-pick cfefd94ba3b7 F
-pick 615be62cadc1 I
+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
 
-rebase -i script after editing:
-edit cfefd94ba3b7 F
-squash 615be62cadc1 I
-Rebasing (1/2)
Stopped at cfefd94ba3b7...  F
-You can amend the commit now, with
+expecting success of 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
 
-  git commit --amend 
+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
 
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
-	file6
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     squash 615be62cadc1c85c6ac7d6974210b1aa1721c98f I
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-error: you have staged changes in your working tree
-HEAD is now at cfefd94ba3b7 F
-Rebasing (3/3)
[detached HEAD 393f3ba68ddf] F
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file4
- create mode 100644 file6
-Successfully rebased and updated refs/heads/branch2.
-HEAD is now at 615be62cadc1 I
-ok 94 - rebase -i commits that overwrite untracked files (squash)
+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 3404.95 'rebase -i commits that overwrite untracked files (no ff)': 
-	git checkout --force branch2 &&
-	git clean -f &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 2" git rebase -i --no-ff A
-	) &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
-	test_path_is_missing file6 &&
-	>file6 &&
-	test_must_fail git rebase --continue &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
-	test_cmp_rev REBASE_HEAD I &&
-	rm file6 &&
-	test_path_is_missing .git/rebase-merge/patch &&
-	echo changed >file1 &&
-	git add file1 &&
-	test_must_fail git rebase --continue 2>err &&
-	grep "error: you have staged changes in your working tree" err &&
-	git reset --hard HEAD &&
-	git rebase --continue &&
-	test $(git cat-file commit HEAD | sed -ne \$p) = I
+expecting success of 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
 
-Already on 'branch2'
-Removing err
-Removing fake-editor.sh
-rebase -i script before editing:
-pick cfefd94ba3b7 F
-pick 615be62cadc1 I
+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
 
-rebase -i script after editing:
-edit cfefd94ba3b7 F
-pick 615be62cadc1 I
-Rebasing (1/2)
Stopped at cfefd94ba3b7...  F
-You can amend the commit now, with
+expecting success of 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
 
-  git commit --amend 
+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
 
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-Rebasing (2/2)
error: The following untracked working tree files would be overwritten by merge:
-	file6
-Please move or remove them before you merge.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     pick 615be62cadc1c85c6ac7d6974210b1aa1721c98f I
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-error: you have staged changes in your working tree
-HEAD is now at 1cadfd8b5eb1 F
-Rebasing (3/3)
Successfully rebased and updated refs/heads/branch2.
-ok 95 - rebase -i commits that overwrite untracked files (no ff)
+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 3404.96 'rebase --continue removes CHERRY_PICK_HEAD': 
-	git checkout -b commit-to-skip &&
-	for double in X 3 1
-	do
-		test_seq 5 | sed "s/$double/&&/" >seq &&
-		git add seq &&
-		test_tick &&
-		git commit -m seq-$double || return 1
-	done &&
-	git tag seq-onto &&
-	git reset --hard HEAD~2 &&
-	git cherry-pick seq-onto &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES= git rebase -i seq-onto
-	) &&
-	test -d .git/rebase-merge &&
-	git rebase --continue &&
-	git diff --exit-code seq-onto &&
-	test ! -d .git/rebase-merge &&
-	test ! -f .git/CHERRY_PICK_HEAD
+expecting success of 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
 
-Switched to a new branch 'commit-to-skip'
-[commit-to-skip 91baae341a52] seq-X
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 seq
-[commit-to-skip c6f9618a0f9b] seq-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[commit-to-skip 76d13d56f0bb] seq-1
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at 91baae341a52 seq-X
-Auto-merging seq
-[commit-to-skip 43bbefaabe73] seq-1
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:08:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 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
 
-    git commit --allow-empty
+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
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 76d13d56f0bb
-Last command done (1 command done):
-   pick 43bbefaabe73 seq-1
-No commands remaining.
-You are currently rebasing branch 'commit-to-skip' on '76d13d56f0bb'.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-	fake-editor.sh
-	sub/
+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
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 43bbefaabe73... seq-1
-Successfully rebased and updated refs/heads/commit-to-skip.
-ok 96 - rebase --continue removes CHERRY_PICK_HEAD
+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 3404.97 'drop': 
-	rebase_setup_and_clean drop-test &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root
-	) &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
+expecting success of 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
 
-Switched to a new branch 'drop-test'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pick 6e62bf890e21 A
-drop 313fe965c048 B
-pick d0f65f2f81ee C
-d 0547e3f1350d D
-pick 8f99a4f1fbbd E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/drop-test.
-Switched to branch 'primary'
-Deleted branch drop-test (was 51a089e089a8).
-fatal: no rebase in progress
-ok 97 - drop
+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 3404.98 'rebase -i respects rebase.missingCommitsCheck = ignore': 
-	test_config rebase.missingCommitsCheck ignore &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 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
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 98 - rebase -i respects rebase.missingCommitsCheck = ignore
+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 3404.99 'rebase -i respects rebase.missingCommitsCheck = warn': 
-	cat >expect <<-EOF &&
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
-	To avoid this message, use "drop" to explicitly remove a commit.
-	EOF
-	test_config rebase.missingCommitsCheck warn &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
-	) &&
-	head -n4 actual.2 >actual &&
-	test_cmp expect actual &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p)
+expecting success of 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
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 99 - rebase -i respects rebase.missingCommitsCheck = warn
+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 3404.100 'rebase -i respects rebase.missingCommitsCheck = error': 
-	cat >expect <<-EOF &&
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~2)
-	To avoid this message, use "drop" to explicitly remove a commit.
+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
 
-	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-	The possible behaviours are: ignore, warn, error.
+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
 
-	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-	Or you can abort the rebase with 'git rebase --abort'.
-	EOF
-	test_config rebase.missingCommitsCheck error &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2 4" \
-			git rebase -i --root 2>actual &&
-		test_cmp expect actual &&
-		cp .git/rebase-merge/git-rebase-todo.backup \
-			.git/rebase-merge/git-rebase-todo &&
-		FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
-	) &&
-	git rebase --continue &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
+expecting success of 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
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick 0547e3f1350d D
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-drop d0f65f2f81ee C
-pick 0547e3f1350d D
-drop 8f99a4f1fbbd E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 1c17f6d7b75f).
-fatal: no rebase in progress
-ok 100 - rebase -i respects rebase.missingCommitsCheck = error
+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 3404.101 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore': 
-	test_config rebase.missingCommitsCheck ignore &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="break 1 2 3 4 5" git rebase -i --root &&
-		FAKE_LINES="1 2 3 4" git rebase --edit-todo &&
-		git rebase --continue 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 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
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-break
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-Rebasing (1/6)
Stopped at e64c99ec4da8 ()
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 101 - rebase --edit-todo respects rebase.missingCommitsCheck = ignore
+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 3404.102 'rebase --edit-todo respects rebase.missingCommitsCheck = warn': 
-	cat >expect <<-EOF &&
-	error: invalid command 'pickled'
-	error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
-	To avoid this message, use "drop" to explicitly remove a commit.
-	EOF
-	head -n5 expect >expect.2 &&
-	tail -n1 expect >>expect.2 &&
-	tail -n4 expect.2 >expect.3 &&
-	test_config rebase.missingCommitsCheck warn &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
-			git rebase -i --root &&
-		cp .git/rebase-merge/git-rebase-todo.backup orig &&
-		FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
-		head -n7 actual.2 >actual &&
-		test_cmp expect actual &&
-		cp orig .git/rebase-merge/git-rebase-todo &&
-		FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
-		head -n4 actual.2 >actual &&
-		test_cmp expect.3 actual &&
-		git rebase --continue 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 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
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pickled 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-error: invalid command 'pickled'
-error: invalid line 1: pickled 6e62bf890e21 A
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-rebase -i script before editing:
-pickled 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 102 - rebase --edit-todo respects rebase.missingCommitsCheck = warn
+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 3404.103 'rebase --edit-todo respects rebase.missingCommitsCheck = error': 
-	cat >expect <<-EOF &&
-	error: invalid command 'pickled'
-	error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
-	Warning: some commits may have been dropped accidentally.
-	Dropped commits (newer to older):
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
-	To avoid this message, use "drop" to explicitly remove a commit.
+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
 
-	Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-	The possible behaviours are: ignore, warn, error.
+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
 
-	You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-	Or you can abort the rebase with 'git rebase --abort'.
-	EOF
-	tail -n11 expect >expect.2 &&
-	head -n3 expect.2 >expect.3 &&
-	tail -n7 expect.2 >>expect.3 &&
-	test_config rebase.missingCommitsCheck error &&
-	rebase_setup_and_clean missing-commit &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
-			git rebase -i --root &&
-		cp .git/rebase-merge/git-rebase-todo.backup orig &&
-		test_must_fail env FAKE_LINES="2 3 4" \
-			git rebase --edit-todo 2>actual &&
-		test_cmp expect actual &&
-		test_must_fail git rebase --continue 2>actual &&
-		test_cmp expect.2 actual &&
-		test_must_fail git rebase --edit-todo &&
-		cp orig .git/rebase-merge/git-rebase-todo &&
-		test_must_fail env FAKE_LINES="1 2 3 4" \
-			git rebase --edit-todo 2>actual &&
-		test_cmp expect.3 actual &&
-		test_must_fail git rebase --continue 2>actual &&
-		test_cmp expect.3 actual &&
-		cp orig .git/rebase-merge/git-rebase-todo &&
-		FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
-		git rebase --continue 2>actual
-	) &&
-	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test_grep \
-		"Successfully rebased and updated refs/heads/missing-commit" \
-		actual
+expecting success of 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
 
-Switched to a new branch 'missing-commit'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pickled 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-error: invalid command 'pickled'
-error: invalid line 1: pickled 6e62bf890e21 A
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-rebase -i script before editing:
-pickled 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):
- - 8f99a4f1fbbd E
- - 6e62bf890e21 A
-To avoid this message, use "drop" to explicitly remove a commit.
+expecting success of 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
 
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.
+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
 
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-drop 8f99a4f1fbbd E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/missing-commit.
-Switched to branch 'primary'
-Deleted branch missing-commit (was 0547e3f1350d).
-fatal: no rebase in progress
-ok 103 - rebase --edit-todo respects rebase.missingCommitsCheck = error
+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 3404.104 'rebase.missingCommitsCheck = error after resolving conflicts': 
-	test_config rebase.missingCommitsCheck error &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="drop 1 break 2 3 4" git rebase -i A E
-	) &&
-	git rebase --edit-todo &&
-	test_must_fail git rebase --continue &&
-	echo x >file1 &&
-	git add file1 &&
-	git rebase --continue
+expecting success of 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
 
-rebase -i script before editing:
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+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
 
-rebase -i script after editing:
-drop 313fe965c048 B
-break
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-Rebasing (2/5)
Stopped at 6e62bf890e21 (A)
-Rebasing (3/5)
Rebasing (4/5)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f1350d... D
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 0547e3f1350d... D
-[detached HEAD c2dad584937b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (5/5)
Successfully rebased and updated detached HEAD.
-ok 104 - rebase.missingCommitsCheck = error after resolving conflicts
+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 3404.105 'rebase.missingCommitsCheck = error when editing for a second time': 
-	test_config rebase.missingCommitsCheck error &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 break 2 3" git rebase -i A D &&
-		cp .git/rebase-merge/git-rebase-todo todo &&
-		test_must_fail env FAKE_LINES=2 git rebase --edit-todo &&
-		GIT_SEQUENCE_EDITOR="cp todo" git rebase --edit-todo &&
-		git rebase --continue
-	)
+expecting success of 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
 
-rebase -i script before editing:
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
+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
 
-rebase -i script after editing:
-pick 313fe965c048 B
-break
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-Rebasing (2/4)
Stopped at 313fe965c048 (B)
-rebase -i script before editing:
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-rebase -i script after editing:
-pick 0547e3f1350d D
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):
- - d0f65f2f81ee C
-To avoid this message, use "drop" to explicitly remove a commit.
+expecting success of 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
 
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.
+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
 
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 105 - rebase.missingCommitsCheck = error when editing for a second time
+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 3404.106 'respects rebase.abbreviateCommands with fixup, squash and exec': 
-	rebase_setup_and_clean abbrevcmd &&
-	test_commit "first" file1.txt "first line" first &&
-	test_commit "second" file1.txt "another line" second &&
-	test_commit "fixup! first" file2.txt "first line again" first_fixup &&
-	test_commit "squash! second" file1.txt "another line here" second_squash &&
-	cat >expected <<-EOF &&
-	p $(git rev-list --abbrev-commit -1 first) first
-	f $(git rev-list --abbrev-commit -1 first_fixup) fixup! first
-	x git show HEAD
-	p $(git rev-list --abbrev-commit -1 second) second
-	s $(git rev-list --abbrev-commit -1 second_squash) squash! second
-	x git show HEAD
-	EOF
-	git checkout abbrevcmd &&
-	test_config rebase.abbreviateCommands true &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --exec "git show HEAD" \
-			--autosquash primary >actual
-	) &&
-	test_cmp expected actual
+expecting success of 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
 
-Previous HEAD position was 0547e3f1350d D
-Switched to a new branch 'abbrevcmd'
-[abbrevcmd 42b8f159a432] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.txt
-[abbrevcmd 4d77de6c05df] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[abbrevcmd ecff34393bc3] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2.txt
-[abbrevcmd f772e337e29f] squash! second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Already on 'abbrevcmd'
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Switched to branch 'primary'
-Deleted branch abbrevcmd (was f772e337e29f).
-fatal: no rebase in progress
-ok 106 - respects rebase.abbreviateCommands with fixup, squash and exec
+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 3404.107 'static check of bad command': 
-	rebase_setup_and_clean bad-cmd &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
-		git rebase -i --root 2>actual &&
-		test_grep "pickled $(git rev-list --oneline -1 primary~1)" \
-				actual &&
-		test_grep "You can fix this with .git rebase --edit-todo.." \
-				actual &&
-		FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo
-	) &&
-	git rebase --continue &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
-	test C = $(git cat-file commit HEAD^ | sed -ne \$p)
+expecting success of 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
 
-Switched to a new branch 'bad-cmd'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pickled 0547e3f1350d D
-pick 8f99a4f1fbbd E
-error: invalid line 4: pickled 0547e3f1350d D
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-error: invalid command 'pickled'
-error: invalid line 4: pickled 0547e3f1350d D
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pickled 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-drop 0547e3f1350d D
-pick 8f99a4f1fbbd E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-cmd.
-Switched to branch 'primary'
-Deleted branch bad-cmd (was 1c8ce10ab787).
-fatal: no rebase in progress
-ok 107 - static check of bad command
+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 3404.108 'the first command cannot be a fixup': 
-	rebase_setup_and_clean fixup-first &&
+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
 
-	cat >orig <<-EOF &&
-	fixup $(git log -1 --format="%h %s" B)
-	pick $(git log -1 --format="%h %s" C)
-	EOF
+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
 
-	(
-		set_replace_editor orig &&
-		test_must_fail git rebase -i A 2>actual
-	) &&
-	grep "cannot .fixup. without a previous commit" actual &&
-	grep "You can fix this with .git rebase --edit-todo.." actual &&
-	# verify that the todo list has not been truncated
-	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
-	test_cmp orig actual &&
+expecting success of 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
 
-	test_must_fail git rebase --edit-todo 2>actual &&
-	grep "cannot .fixup. without a previous commit" actual &&
-	grep "You can fix this with .git rebase --edit-todo.." actual &&
-	# verify that the todo list has not been truncated
-	grep -v "^#" .git/rebase-merge/git-rebase-todo >actual &&
-	test_cmp orig actual
+expecting success of 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
 
-Switched to a new branch 'fixup-first'
-rebase -i script after editing:
-fixup 313fe965c048 B
-pick d0f65f2f81ee C
-error: cannot 'fixup' without a previous commit
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-error: cannot 'fixup' without a previous commit
-error: cannot 'fixup' without a previous commit
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Previous HEAD position was 6e62bf890e21 A
-Switched to branch 'primary'
-error: cannot delete branch 'fixup-first' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-ok 108 - the first command cannot be a fixup
+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 3404.109 'tabs and spaces are accepted in the todolist': 
-	rebase_setup_and_clean indented-comment &&
-	write_script add-indent.sh <<-\EOF &&
-	(
-		# Turn single spaces into space/tab mix
-		sed "1s/ /	/g; 2s/ /  /g; 3s/ / 	/g" "$1"
-		printf "\n\t# comment\n #more\n\t # comment\n"
-	) >"$1.new"
-	mv "$1.new" "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/add-indent.sh" &&
-		git rebase -i HEAD^^^
-	) &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p)
+expecting success of 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
 
-Switched to a new branch 'indented-comment'
-Successfully rebased and updated refs/heads/indented-comment.
-Switched to branch 'primary'
-Deleted branch indented-comment (was 8f99a4f1fbbd).
-fatal: no rebase in progress
-ok 109 - tabs and spaces are accepted in the todolist
+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 3404.110 'static check of bad SHA-1': 
-	rebase_setup_and_clean bad-sha &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
-			git rebase -i --root 2>actual &&
-			test_grep "edit XXXXXXX False commit" actual &&
-			test_grep "You can fix this with .git rebase --edit-todo.." \
-					actual &&
-		FAKE_LINES="1 2 4 5 6" git rebase --edit-todo
-	) &&
-	git rebase --continue &&
-	test E = $(git cat-file commit HEAD | sed -ne \$p)
+expecting success of 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
 
-Switched to a new branch 'bad-sha'
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+expecting success of 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
 
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-edit XXXXXXX False commit
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-# comment
-error: invalid line 3: edit XXXXXXX False commit
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-error: could not parse 'XXXXXXX'
-error: invalid line 3: edit XXXXXXX False commit
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-edit XXXXXXX False commit
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-rebase -i script after editing:
-pick 6e62bf890e21 A
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated refs/heads/bad-sha.
-Switched to branch 'primary'
-Deleted branch bad-sha (was 8f99a4f1fbbd).
-fatal: no rebase in progress
-ok 110 - static check of bad SHA-1
+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 3404.111 'editor saves as CR/LF': 
-	git checkout -b with-crlf &&
-	write_script add-crs.sh <<-\EOF &&
-	sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&
-	mv -f "$1".new "$1"
-	EOF
-	(
-		test_set_editor "$(pwd)/add-crs.sh" &&
-		git rebase -i HEAD^
-	)
+expecting success of 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
 
-Switched to a new branch 'with-crlf'
-Successfully rebased and updated refs/heads/with-crlf.
-ok 111 - editor saves as CR/LF
+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 3404.112 'rebase -i --gpg-sign=<key-id>': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
-			HEAD^ >out 2>err
-	) &&
-	test_grep "$SQ-S\"S I Gner\"$SQ" err
+expecting success of 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
 
-  git commit --amend '-S"S I Gner"'
-ok 112 - rebase -i --gpg-sign=<key-id>
+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 3404.113 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_config commit.gpgsign true &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
-			HEAD^ >out 2>err
-	) &&
-	test_grep "$SQ-S\"S I Gner\"$SQ" err
+expecting success of 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
 
-  git commit --amend '-S"S I Gner"'
-ok 113 - rebase -i --gpg-sign=<key-id> overrides commit.gpgSign
+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 3404.114 'valid author header after --root swap': 
-	rebase_setup_and_clean author-header no-conflict-branch &&
-	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
-	git cat-file commit HEAD | grep ^author >expected &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="5 1" git rebase -i --root
-	) &&
-	git cat-file commit HEAD^ | grep ^author >actual &&
-	test_cmp expected actual
+expecting success of 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
 
-Switched to a new branch 'author-header'
-[author-header d4dcc6d22bff] M
- Author: Au 'thor <author@example.com>
- Date: Thu Apr 7 15:29:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 fileM
-rebase -i script before editing:
-pick 6e62bf890e21 A
-pick 808874f7b187 J
-pick 265b89e813d4 K
-pick 6b0f5e6c3e83 L
-pick d4dcc6d22bff M
+expecting success of 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
 
-rebase -i script after editing:
-pick d4dcc6d22bff M
-pick 6e62bf890e21 A
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/author-header.
-Switched to branch 'primary'
-Deleted branch author-header (was 141d57bb9b25).
-fatal: no rebase in progress
-ok 114 - valid author header after --root swap
+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 3404.115 'valid author header when author contains single quote': 
-	rebase_setup_and_clean author-header no-conflict-branch &&
-	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
-	git cat-file commit HEAD | grep ^author >expected &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2" git rebase -i HEAD~2
-	) &&
-	git cat-file commit HEAD | grep ^author >actual &&
-	test_cmp expected actual
+expecting success of 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
 
-Switched to a new branch 'author-header'
-[author-header d4dcc6d22bff] M
- Author: Au 'thor <author@example.com>
- Date: Thu Apr 7 15:29:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 fileM
-rebase -i script before editing:
-pick 6b0f5e6c3e83 L
-pick d4dcc6d22bff M
+expecting success of 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
 
-rebase -i script after editing:
-pick d4dcc6d22bff M
-Rebasing (1/1)
Successfully rebased and updated refs/heads/author-header.
-Switched to branch 'primary'
-Deleted branch author-header (was b929a6a72971).
-fatal: no rebase in progress
-ok 115 - valid author header when author contains single quote
+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 3404.116 'post-commit hook is called': 
-	>actual &&
-	test_hook post-commit <<-\EOS &&
-	git rev-parse HEAD >>actual
-	EOS
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
-		echo x>file3 &&
-		git add file3 &&
-		FAKE_COMMIT_MESSAGE=edited git rebase --continue
-	) &&
-	git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
-		>expect &&
-	test_cmp expect actual
+expecting success of 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
 
-rebase -i script before editing:
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
-pick 8f99a4f1fbbd E
+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
 
-rebase -i script after editing:
-edit 8f99a4f1fbbd E
-pick 313fe965c048 B
-reword d0f65f2f81ee C
-fixup 0547e3f1350d D
-Rebasing (1/4)
Stopped at 8f99a4f1fbbd...  E
-You can amend the commit now, with
+expecting success of 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
 
-  git commit --amend 
+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
 
-Once you are satisfied with your changes, run
+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
 
-  git rebase --continue
-[detached HEAD bc867d3a07fd] edited
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD d54e5ab0b586] edited
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 116 - post-commit hook is called
+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 3404.117 'correct error message for partial commit after empty pick': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1 1" &&
-		export FAKE_LINES &&
-		test_must_fail git rebase -i A D
-	) &&
-	echo x >file1 &&
-	test_must_fail git commit file1 2>err &&
-	test_grep "cannot do a partial commit during a rebase." err
+expecting success of 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
 
-rebase -i script before editing:
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
+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
 
-rebase -i script after editing:
-pick d0f65f2f81ee C
-pick 313fe965c048 B
-pick 313fe965c048 B
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 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
 
-    git commit --allow-empty
+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
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 6e62bf890e21
-Last commands done (3 commands done):
-   pick 313fe965c048 B
-   pick 313fe965c048 B
-  (see more in file .git/rebase-merge/done)
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.2
-	add-crs.sh
-	add-indent.sh
-	err
-	expect
-	expect.2
-	expect.3
-	expected
-	fake-editor.sh
-	fake-sequence-editor.sh
-	orig
-	out
-	script
-	sub/
-	todo
+expecting success of 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
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 313fe965c048... B
-fatal: cannot do a partial commit during a rebase.
-ok 117 - correct error message for partial commit after empty pick
+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 3404.118 'correct error message for commit --amend after empty pick': 
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 1" &&
-		export FAKE_LINES &&
-		test_must_fail git rebase -i A D
-	) &&
-	echo x>file1 &&
-	test_must_fail git commit -a --amend 2>err &&
-	test_grep "middle of a rebase -- cannot amend." err
+expecting success of 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
 
-rebase -i script before editing:
-pick 313fe965c048 B
-pick d0f65f2f81ee C
-pick 0547e3f1350d D
+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
 
-rebase -i script after editing:
-pick 313fe965c048 B
-pick 313fe965c048 B
-Rebasing (2/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+expecting success of 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
 
-    git commit --allow-empty
+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
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 6e62bf890e21
-Last commands done (2 commands done):
-   pick 313fe965c048 B
-   pick 313fe965c048 B
-No commands remaining.
-You are currently rebasing.
-  (all conflicts fixed: run "git rebase --continue")
+expecting success of 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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.2
-	add-crs.sh
-	add-indent.sh
-	err
-	expect
-	expect.2
-	expect.3
-	expected
-	fake-editor.sh
-	fake-sequence-editor.sh
-	orig
-	out
-	script
-	sub/
-	todo
+expecting success of 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
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 313fe965c048... B
-fatal: You are in the middle of a rebase -- cannot amend.
-ok 118 - correct error message for commit --amend after empty pick
+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 3404.119 'todo has correct onto hash': 
-	GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual &&
-	onto=$(git rev-parse --short HEAD~4) &&
-	test_grep "^# Rebase ..* onto $onto" actual
+expecting success of 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
 
-Successfully rebased and updated refs/heads/no-conflict-branch.
-# Rebase 6e62bf890e21..33895580a3f9 onto 6e62bf890e21 (4 commands)
-ok 119 - todo has correct onto hash
+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 3404.120 'ORIG_HEAD is updated correctly': 
-	test_when_finished "git checkout primary && git branch -D test-orig-head" &&
-	git checkout -b test-orig-head A &&
-	git commit --allow-empty -m A1 &&
-	git commit --allow-empty -m A2 &&
-	git commit --allow-empty -m A3 &&
-	git commit --allow-empty -m A4 &&
-	git rebase primary &&
-	test_cmp_rev ORIG_HEAD test-orig-head@{1}
+expecting success of 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
 
-Switched to a new branch 'test-orig-head'
-[test-orig-head 988a45cf7c4d] A1
- Author: A U Thor <author@example.com>
-[test-orig-head 001994977a57] A2
- Author: A U Thor <author@example.com>
-[test-orig-head f8b037fdfd3c] A3
- Author: A U Thor <author@example.com>
-[test-orig-head dee0c985c630] A4
- Author: A U Thor <author@example.com>
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/test-orig-head.
-Switched to branch 'primary'
-Deleted branch test-orig-head (was 25c72c815b0c).
-ok 120 - ORIG_HEAD is updated correctly
+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 3404.121 '--update-refs adds label and update-ref commands': 
-	git checkout -b update-refs no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git commit --allow-empty --fixup=third &&
-	git branch -f is-not-reordered &&
-	git commit --allow-empty --fixup=HEAD~4 &&
-	git branch -f shared-tip &&
-	(
-		set_cat_todo_editor &&
+expecting success of 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
 
-		cat >expect <<-EOF &&
-		pick $(git log -1 --format=%h J) J
-		fixup $(git log -1 --format=%h update-refs) fixup! J # empty
-		update-ref refs/heads/second
-		update-ref refs/heads/first
-		pick $(git log -1 --format=%h K) K
-		pick $(git log -1 --format=%h L) L
-		fixup $(git log -1 --format=%h is-not-reordered) fixup! L # empty
-		update-ref refs/heads/third
-		pick $(git log -1 --format=%h M) M
-		update-ref refs/heads/no-conflict-branch
-		update-ref refs/heads/is-not-reordered
-		update-ref refs/heads/shared-tip
+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
 
-		test_must_fail git rebase -i --autosquash --update-refs primary >todo &&
-		test_cmp expect todo &&
+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
 
-		test_must_fail git -c rebase.autosquash=true \
-				   -c rebase.updaterefs=true \
-				   rebase -i primary >todo &&
+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
 
-		test_cmp expect todo
-	)
+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
 
-Switched to a new branch 'update-refs'
-[update-refs d580aa243c5a] fixup! L
- Author: A U Thor <author@example.com>
-[update-refs 5921e09cdb84] fixup! J
- Author: A U Thor <author@example.com>
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-ok 121 - --update-refs adds label and update-ref commands
+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 3404.122 '--update-refs adds commands with --rebase-merges': 
-	git checkout -b update-refs-with-merge no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git merge -m merge branch2 &&
-	git branch -f merge-branch &&
-	git commit --fixup=third --allow-empty &&
-	(
-		set_cat_todo_editor &&
+expecting success of 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
 
-		cat >expect <<-EOF &&
-		label onto
-		reset onto
-		pick $(git log -1 --format=%h branch2~1) F
-		pick $(git log -1 --format=%h branch2) I
-		update-ref refs/heads/branch2
-		label branch2
-		reset onto
-		pick $(git log -1 --format=%h refs/heads/second) J
-		update-ref refs/heads/second
-		update-ref refs/heads/first
-		pick $(git log -1 --format=%h refs/heads/third~1) K
-		pick $(git log -1 --format=%h refs/heads/third) L
-		fixup $(git log -1 --format=%h update-refs-with-merge) fixup! L # empty
-		update-ref refs/heads/third
-		pick $(git log -1 --format=%h HEAD~2) M
-		update-ref refs/heads/no-conflict-branch
-		merge -C $(git log -1 --format=%h HEAD~1) branch2 # merge
-		update-ref refs/heads/merge-branch
-		EOF
+expecting success of 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
 
-		test_must_fail git rebase -i --autosquash \
-				   --rebase-merges=rebase-cousins \
-				   --update-refs primary >todo &&
+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
 
-		test_cmp expect todo &&
+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
 
-		test_must_fail git -c rebase.autosquash=true \
-				   -c rebase.updaterefs=true \
-				   rebase -i \
-				   --rebase-merges=rebase-cousins \
-				   primary >todo &&
+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
 
-		test_cmp expect todo
-	)
+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
 
-Switched to a new branch 'update-refs-with-merge'
-Merge made by the 'ort' strategy.
- file4 | 1 +
- file6 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file4
- create mode 100644 file6
-[update-refs-with-merge 29fba79037a4] fixup! L
- Author: A U Thor <author@example.com>
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-ok 122 - --update-refs adds commands with --rebase-merges
+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 3404.123 '--update-refs updates refs correctly': 
-	git checkout -B update-refs no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	test_commit extra2 fileX &&
-	git commit --amend --fixup=L &&
+expecting success of 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
 
-	git rebase -i --autosquash --update-refs primary 2>err &&
+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
 
-	test_cmp_rev HEAD~3 refs/heads/first &&
-	test_cmp_rev HEAD~3 refs/heads/second &&
-	test_cmp_rev HEAD~1 refs/heads/third &&
-	test_cmp_rev HEAD refs/heads/no-conflict-branch &&
+expecting success of 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
 
-	q_to_tab >expect <<-\EOF &&
-	Successfully rebased and updated refs/heads/update-refs.
-	Updated the following refs with --update-refs:
-	Qrefs/heads/first
-	Qrefs/heads/no-conflict-branch
-	Qrefs/heads/second
-	Qrefs/heads/third
-	EOF
+expecting success of 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
 
-	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
-	sed "s/Rebasing.*Successfully/Successfully/g" <err >err.trimmed &&
-	test_cmp expect err.trimmed
+expecting success of 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
 
-Switched to and reset branch 'update-refs'
-[update-refs 9da56b161557] extra2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileX
-[update-refs c4f48e9a00f5] fixup! L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileX
-ok 123 - --update-refs updates refs correctly
+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 3404.124 'respect user edits to update-ref steps': 
-	git checkout -B update-refs-break no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f unseen base &&
+expecting success of 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
 
-	# First, we will add breaks to the expected todo file
-	cat >fake-todo-1 <<-EOF &&
-	pick $(git rev-parse HEAD~3)
-	break
-	update-ref refs/heads/second
-	update-ref refs/heads/first
+expecting success of 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
 
-	pick $(git rev-parse HEAD~2)
-	pick $(git rev-parse HEAD~1)
-	update-ref refs/heads/third
+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
 
-	pick $(git rev-parse HEAD)
-	update-ref refs/heads/no-conflict-branch
-	EOF
+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
 
-	# Second, we will drop some update-refs commands (and move one)
-	cat >fake-todo-2 <<-EOF &&
-	update-ref refs/heads/second
+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
 
-	pick $(git rev-parse HEAD~2)
-	update-ref refs/heads/third
-	pick $(git rev-parse HEAD~1)
-	break
+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
 
-	pick $(git rev-parse HEAD)
-	EOF
+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
 
-	# Third, we will:
-	# * insert a new one (new-branch),
-	# * re-add an old one (first), and
-	# * add a second instance of a previously-stored one (second)
-	cat >fake-todo-3 <<-EOF &&
-	update-ref refs/heads/unseen
-	update-ref refs/heads/new-branch
-	pick $(git rev-parse HEAD)
-	update-ref refs/heads/first
-	update-ref refs/heads/second
-	EOF
+expecting success of 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
 
-	(
-		set_replace_editor fake-todo-1 &&
-		git rebase -i --update-refs primary &&
+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
 
-		# These branches are currently locked.
-		for b in first second third no-conflict-branch
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+expecting success of 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
 
-		set_replace_editor fake-todo-2 &&
-		git rebase --edit-todo &&
+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
 
-		# These branches are currently locked.
-		for b in second third
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+expecting success of 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
 
-		# These branches are currently unlocked for checkout.
-		for b in first no-conflict-branch
-		do
-			git worktree add wt-$b $b &&
-			git worktree remove wt-$b || return 1
-		done &&
+expecting success of 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
 
-		git rebase --continue &&
+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
 
-		set_replace_editor fake-todo-3 &&
-		git rebase --edit-todo &&
+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
 
-		# These branches are currently locked.
-		for b in second third first unseen
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+expecting success of 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
 
-		# These branches are currently unlocked for checkout.
-		for b in no-conflict-branch
-		do
-			git worktree add wt-$b $b &&
-			git worktree remove wt-$b || return 1
-		done &&
+expecting success of 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
 
-		git rebase --continue
-	) &&
+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
 
-	test_cmp_rev HEAD~2 refs/heads/third &&
-	test_cmp_rev HEAD~1 refs/heads/unseen &&
-	test_cmp_rev HEAD~1 refs/heads/new-branch &&
-	test_cmp_rev HEAD refs/heads/first &&
-	test_cmp_rev HEAD refs/heads/second &&
-	test_cmp_rev HEAD refs/heads/no-conflict-branch
+expecting success of 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
 
-Switched to a new branch 'update-refs-break'
-rebase -i script after editing:
-pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
-break
-update-ref refs/heads/second
-update-ref refs/heads/first
+expecting success of 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
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-update-ref refs/heads/third
+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
 
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-update-ref refs/heads/no-conflict-branch
-Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
-fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'no-conflict-branch' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-rebase -i script after editing:
-update-ref refs/heads/second
+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
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-update-ref refs/heads/third
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-break
+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
 
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-warning: refname 'first' is ambiguous.
-warning: refname 'first' is ambiguous.
-Preparing worktree (checking out 'first')
-warning: refname 'first' is ambiguous.
-HEAD is now at c49b6574f4e9 J
-Preparing worktree (checking out 'no-conflict-branch')
-HEAD is now at fb069ba3d9b1 M
-Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Stopped at 34033109e5a0 (L)
-rebase -i script after editing:
-update-ref refs/heads/unseen
-update-ref refs/heads/new-branch
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-update-ref refs/heads/first
-update-ref refs/heads/second
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'unseen' used by worktree at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3404-rebase-interactive'
-Preparing worktree (checking out 'no-conflict-branch')
-HEAD is now at fb069ba3d9b1 M
-Rebasing (8/12)
Rebasing (9/12)
Rebasing (10/12)
Rebasing (11/12)
Rebasing (12/12)
Successfully rebased and updated refs/heads/update-refs-break.
-Updated the following refs with --update-refs:
-	refs/heads/first
-	refs/heads/new-branch
-	refs/heads/second
-	refs/heads/third
-	refs/heads/unseen
-ok 124 - respect user edits to update-ref steps
+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 3404.125 '--update-refs: all update-ref lines removed': 
-	git checkout -b test-refs-not-removed no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f tip &&
+expecting success of 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
 
-	test_commit test-refs-not-removed &&
-	git commit --amend --fixup first &&
+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
 
-	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+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
 
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --update-refs base >todo.raw &&
-		sed -e "/^update-ref/d" <todo.raw >todo
-	) &&
-	(
-		set_replace_editor todo &&
-		git rebase -i --update-refs base
-	) &&
+expecting success of 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
 
-	# Ensure refs are not deleted and their OIDs have not changed
-	git rev-parse first second third tip no-conflict-branch >actual-oids &&
-	test_cmp expect-oids actual-oids
+expecting success of 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
 
-Switched to a new branch 'test-refs-not-removed'
-[test-refs-not-removed adbf713ec8f3] test-refs-not-removed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed.t
-warning: refname 'first' is ambiguous.
-[test-refs-not-removed 5ca2ca8d583e] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed.t
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-rebase -i script after editing:
-pick c49b6574f4e9 J
-pick e31be72ab52d K
-pick 34033109e5a0 L
-pick fb069ba3d9b1 M
-pick 5ca2ca8d583e fixup! first
-Successfully rebased and updated refs/heads/test-refs-not-removed.
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-ok 125 - --update-refs: all update-ref lines removed
+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 3404.126 '--update-refs: all update-ref lines removed, then some re-added': 
-	git checkout -b test-refs-not-removed2 no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f tip &&
+expecting success of 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
 
-	test_commit test-refs-not-removed2 &&
-	git commit --amend --fixup first &&
+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
 
-	git rev-parse first second third >expect-oids &&
+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
 
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i \
-			--autosquash --update-refs \
-			base >todo.raw &&
-		sed -e "/^update-ref/d" <todo.raw >todo
-	) &&
+expecting success of 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
 
-	# Add a break to the end of the todo so we can edit later
-	echo "break" >>todo &&
+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
 
-	(
-		set_replace_editor todo &&
-		git rebase -i --autosquash --update-refs base &&
-		echo "update-ref refs/heads/tip" >todo &&
-		git rebase --edit-todo &&
-		git rebase --continue
-	) &&
+expecting success of 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
 
-	# Ensure first/second/third are unchanged, but tip is updated
-	git rev-parse first second third >actual-oids &&
-	test_cmp expect-oids actual-oids &&
-	test_cmp_rev HEAD tip
+expecting success of 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
 
-Switched to a new branch 'test-refs-not-removed2'
-[test-refs-not-removed2 67d47c6fa009] test-refs-not-removed2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed2.t
-warning: refname 'first' is ambiguous.
-[test-refs-not-removed2 04193a2c3f06] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed2.t
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-warning: refname 'first' is ambiguous.
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-warning: refname 'first' is ambiguous.
-rebase -i script after editing:
-pick c49b6574f4e9 J
-pick e31be72ab52d K
-pick 34033109e5a0 L
-pick fb069ba3d9b1 M
-pick 04193a2c3f06 fixup! first
-break
-Rebasing (6/6)
Stopped at 04193a2c3f06 (fixup! first)
-rebase -i script after editing:
-update-ref refs/heads/tip
-Rebasing (7/7)
Successfully rebased and updated refs/heads/test-refs-not-removed2.
-Updated the following refs with --update-refs:
-	refs/heads/tip
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-ok 126 - --update-refs: all update-ref lines removed, then some re-added
+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 3404.127 '--update-refs: --edit-todo with no update-ref lines': 
-	git checkout -b test-refs-not-removed3 no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~3 &&
-	git branch -f third HEAD~1 &&
-	git branch -f tip &&
+expecting success of 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
 
-	test_commit test-refs-not-removed3 &&
-	git commit --amend --fixup first &&
+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
 
-	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+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
 
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i \
-			--autosquash --update-refs \
-			base >todo.raw &&
-		sed -e "/^update-ref/d" <todo.raw >todo
-	) &&
+expecting success of 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
 
-	# Add a break to the beginning of the todo so we can resume with no
-	# update-ref lines
-	echo "break" >todo.new &&
-	cat todo >>todo.new &&
+expecting success of 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
 
-	(
-		set_replace_editor todo.new &&
-		git rebase -i --autosquash --update-refs base &&
+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
 
-		# Make no changes when editing so update-refs is still empty
-		cat todo >todo.new &&
-		git rebase --edit-todo &&
-		git rebase --continue
-	) &&
+expecting success of 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
 
-	# Ensure refs are not deleted and their OIDs have not changed
-	git rev-parse first second third tip no-conflict-branch >actual-oids &&
-	test_cmp expect-oids actual-oids
+expecting success of 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
 
-Switched to a new branch 'test-refs-not-removed3'
-[test-refs-not-removed3 0495d4feaa2b] test-refs-not-removed3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed3.t
-warning: refname 'first' is ambiguous.
-[test-refs-not-removed3 6fcb3c6ba86d] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed3.t
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-warning: refname 'first' is ambiguous.
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-warning: refname 'first' is ambiguous.
-rebase -i script after editing:
-break
-pick c49b6574f4e9 J
-pick e31be72ab52d K
-pick 34033109e5a0 L
-pick fb069ba3d9b1 M
-pick 6fcb3c6ba86d fixup! first
-Rebasing (1/6)
Stopped at 8f99a4f1fbbd (E)
-rebase -i script after editing:
-pick c49b6574f4e9 J
-pick e31be72ab52d K
-pick 34033109e5a0 L
-pick fb069ba3d9b1 M
-pick 6fcb3c6ba86d fixup! first
-Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/test-refs-not-removed3.
-warning: refname 'first' is ambiguous.
-warning: refname 'second' is ambiguous.
-ok 127 - --update-refs: --edit-todo with no update-ref lines
+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 3404.128 '--update-refs: check failed ref update': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -B update-refs-error no-conflict-branch &&
-	git branch -f base HEAD~4 &&
-	git branch -f first HEAD~3 &&
-	git branch -f second HEAD~2 &&
-	git branch -f third HEAD~1 &&
+expecting success of 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
 
-	cat >fake-todo <<-EOF &&
-	pick $(git rev-parse HEAD~3)
-	break
-	update-ref refs/heads/first
+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
 
-	pick $(git rev-parse HEAD~2)
-	update-ref refs/heads/second
+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
 
-	pick $(git rev-parse HEAD~1)
-	update-ref refs/heads/third
+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
 
-	pick $(git rev-parse HEAD)
-	update-ref refs/heads/no-conflict-branch
-	EOF
+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
 
-	(
-		set_replace_editor fake-todo &&
-		git rebase -i --update-refs base
-	) &&
+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
 
-	# At this point, the values of first, second, and third are
-	# recorded in the update-refs file. We will force-update the
-	# "second" ref, but "git branch -f" will not work because of
-	# the lock in the update-refs file.
-	git update-ref refs/heads/second third &&
+expecting success of 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
 
-	test_must_fail git rebase --continue 2>err &&
-	grep "update_ref failed for ref 'refs/heads/second'" err &&
+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
 
-	q_to_tab >expect <<-\EOF &&
-	Updated the following refs with --update-refs:
-	Qrefs/heads/first
-	Qrefs/heads/no-conflict-branch
-	Qrefs/heads/third
-	Failed to update the following refs with --update-refs:
-	Qrefs/heads/second
-	EOF
+expecting success of 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
 
-	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
-	tail -n 6 err >err.last &&
-	sed "s/Rebasing.*Successfully/Successfully/g" <err.last >err.trimmed &&
-	test_cmp expect err.trimmed
+expecting success of 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
 
-Switched to a new branch 'update-refs-error'
-rebase -i script after editing:
-pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
-break
-update-ref refs/heads/first
+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
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-update-ref refs/heads/second
+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
 
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-update-ref refs/heads/third
+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
 
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-update-ref refs/heads/no-conflict-branch
-Rebasing (2/9)
Stopped at c49b6574f4e9 (J)
-error: update_ref failed for ref 'refs/heads/second': cannot lock ref 'refs/heads/second': is at 34033109e5a0def540b16172943d8a7e2a8a712e but expected e31be72ab52d740527956c171d40a832b63e68ca
-ok 128 - --update-refs: check failed ref update
+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 3404.129 'bad labels and refs rejected when parsing todo list': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	cat >todo <<-\EOF &&
-	exec >execed
-	label #
-	label :invalid
-	update-ref :bad
-	update-ref topic
-	EOF
-	rm -f execed &&
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i HEAD 2>err
-	) &&
-	grep "'#' is not a valid label" err &&
-	grep "':invalid' is not a valid label" err &&
-	grep "':bad' is not a valid refname" err &&
-	grep "update-ref requires a fully qualified refname e.g. refs/heads/topic" \
-		err &&
-	test_path_is_missing execed
+expecting success of 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
 
-rebase -i script after editing:
-exec >execed
-label #
-label :invalid
-update-ref :bad
-update-ref topic
-error: '#' is not a valid label
-error: ':invalid' is not a valid label
-error: ':bad' is not a valid refname
-error: update-ref requires a fully qualified refname e.g. refs/heads/topic
-ok 129 - bad labels and refs rejected when parsing todo list
+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 3404.130 'non-merge commands reject merge commits': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout E &&
-	git merge I &&
-	oid=$(git rev-parse HEAD) &&
-	cat >todo <<-EOF &&
-	pick $oid
-	reword $oid
-	edit $oid
-	fixup $oid
-	squash $oid
-	EOF
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i HEAD 2>actual
-	) &&
-	cat >expect <<-EOF &&
-	error: ${SQ}pick${SQ} does not accept merge commits
-	hint: ${SQ}pick${SQ} does not take a merge commit. If you wanted to
-	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit.
-	hint: Disable this message with "git config set advice.rebaseTodoError false"
-	error: invalid line 1: pick $oid
-	error: ${SQ}reword${SQ} does not accept merge commits
-	hint: ${SQ}reword${SQ} does not take a merge commit. If you wanted to
-	hint: replay the merge and reword the commit message, use
-	hint: ${SQ}merge -c${SQ} on the commit
-	hint: Disable this message with "git config set advice.rebaseTodoError false"
-	error: invalid line 2: reword $oid
-	error: ${SQ}edit${SQ} does not accept merge commits
-	hint: ${SQ}edit${SQ} does not take a merge commit. If you wanted to
-	hint: replay the merge, use ${SQ}merge -C${SQ} on the commit, and then
-	hint: ${SQ}break${SQ} to give the control back to you so that you can
-	hint: do ${SQ}git commit --amend && git rebase --continue${SQ}.
-	hint: Disable this message with "git config set advice.rebaseTodoError false"
-	error: invalid line 3: edit $oid
-	error: cannot squash merge commit into another commit
-	error: invalid line 4: fixup $oid
-	error: cannot squash merge commit into another commit
-	error: invalid line 5: squash $oid
-	You can fix this with ${SQ}git rebase --edit-todo${SQ} and then run ${SQ}git rebase --continue${SQ}.
-	Or you can abort the rebase with ${SQ}git rebase --abort${SQ}.
-	EOF
-	test_cmp expect actual
+expecting success of 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
 
-Note: switching to 'E'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 8f99a4f1fbbd E
-Merge made by the 'ort' strategy.
- file4 | 1 +
- file6 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file4
- create mode 100644 file6
-rebase -i script after editing:
-pick e1787ed465883b1097349020e1a6efb9957df2e7
-reword e1787ed465883b1097349020e1a6efb9957df2e7
-edit e1787ed465883b1097349020e1a6efb9957df2e7
-fixup e1787ed465883b1097349020e1a6efb9957df2e7
-squash e1787ed465883b1097349020e1a6efb9957df2e7
-ok 130 - non-merge commands reject merge commits
+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 3404.131 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+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
 
-ok 131 - $EDITOR and friends are unchanged
+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
 
-# passed all 131 test(s)
-1..131
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3602-rm-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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
 
-	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.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
 
-	cat >sparse_hint <<-EOF &&
-	hint: If you intend to update such entries, try one of the following:
-	hint: * Use the --sparse option.
-	hint: * Disable or modify the sparsity rules.
-	hint: Disable this message with "git config set advice.updateSparsePath false"
-	EOF
+expecting success of 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
 
-	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.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
 
-[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.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 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
+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
 	
-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
+ok 2403 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 3602.3 'rm -f does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
+expecting success of 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
 	
-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
+ok 2404 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 3602.4 'rm --dry-run does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
+expecting success of 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
 	
-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
+ok 2405 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-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.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
 
-	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.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
 
-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.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 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.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
 
-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.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 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.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
 
-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.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 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.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
 
-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.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 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.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
 
-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.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 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.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
 
-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.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 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.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
 
-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.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 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.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
 
-	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.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
 
-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.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 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.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
 
-	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.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
 
-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.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
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3507-cherry-pick-conflict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3507-cherry-pick-conflict/.git/
-expecting success of 3507.1 'setup': 
+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
 
-	echo unrelated >unrelated &&
-	git add unrelated &&
-	test_commit initial foo a &&
-	test_commit base foo b &&
-	test_commit picked foo c &&
-	test_commit --signoff picked-signed foo d &&
-	git checkout -b topic initial &&
-	test_commit redundant-pick foo c redundant &&
-	git commit --allow-empty --allow-empty-message &&
-	git tag empty &&
-	git checkout main &&
-	git config set advice.detachedhead false
+expecting success of 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
 
-[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.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 3507.2 'failed cherry-pick does not advance HEAD': 
-	pristine_detach initial &&
+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
 
-	head=$(git rev-parse HEAD) &&
-	test_must_fail git cherry-pick picked &&
-	newhead=$(git rev-parse HEAD) &&
+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
 
-	test "$head" = "$newhead"
+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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 2 - failed cherry-pick does not advance HEAD
+expecting success of 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 3507.3 'advice from failed cherry-pick': 
-	pristine_detach initial &&
+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
 
-	picked=$(git rev-parse --short picked) &&
-	cat <<-EOF >expected &&
-	error: could not apply $picked... picked
-	hint: After resolving the conflicts, mark them with
-	hint: "git add/rm <pathspec>", then run
-	hint: "git cherry-pick --continue".
-	hint: You can instead skip this commit with "git cherry-pick --skip".
-	hint: To abort and get back to the state before "git cherry-pick",
-	hint: run "git cherry-pick --abort".
-	hint: Disable this message with "git config set advice.mergeConflict false"
-	EOF
-	test_must_fail git cherry-pick picked 2>actual &&
+expecting success of 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
 
-	test_cmp expected actual
+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
 
-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.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 3507.4 'advice from failed cherry-pick --no-commit': 
-	pristine_detach initial &&
+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
 
-	picked=$(git rev-parse --short picked) &&
-	cat <<-EOF >expected &&
-	error: could not apply $picked... picked
-	hint: after resolving the conflicts, mark the corrected paths
-	hint: with 'git add <paths>' or 'git rm <paths>'
-	hint: Disable this message with "git config set advice.mergeConflict false"
-	EOF
-	test_must_fail git cherry-pick --no-commit picked 2>actual &&
+expecting success of 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
 
-	test_cmp expected actual
+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
 
-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.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 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.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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 5 - failed cherry-pick sets CHERRY_PICK_HEAD
+expecting success of 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 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.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
 
-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.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 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.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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  ccd9cfc base
+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
 
-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.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 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.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
 
-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.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 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.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
 
-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.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 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.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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: and then do something else
-hint: Disable this message with "git config set advice.mergeConflict false"
-fatal: Needed a single revision
-ok 10 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD
+expecting success of 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 3507.11 'git reset clears CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+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
 
-	test_must_fail git cherry-pick picked &&
-	git reset &&
+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
 
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-fatal: Needed a single revision
-ok 11 - git reset clears CHERRY_PICK_HEAD
+expecting success of 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 3507.12 'failed commit does not clear CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+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
 
-	test_must_fail git cherry-pick picked &&
-	test_must_fail git commit &&
+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
 
-	test_cmp_rev picked CHERRY_PICK_HEAD
+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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-error: Committing is not possible because you have unmerged files.
-hint: Fix them up in the work tree, and then use 'git add/rm <file>'
-hint: as appropriate to mark resolution and make a commit.
-fatal: Exiting because of an unresolved conflict.
-U	foo
-ok 12 - failed commit does not clear CHERRY_PICK_HEAD
+expecting success of 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 3507.13 'cancelled commit does not clear CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+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
 
-	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.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
 
-	test_cmp_rev picked CHERRY_PICK_HEAD
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 2ab19ae607aabda796309682e0448237aab03047 M	foo
-error: there was a problem with the editor 'false'
-Please supply the message using either -m or -F option.
-ok 13 - cancelled commit does not clear CHERRY_PICK_HEAD
+expecting success of 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 3507.14 'successful commit clears CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
+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
 
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	git commit &&
+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
 
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD a8c44c9] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 14 - successful commit clears CHERRY_PICK_HEAD
+expecting success of 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 3507.15 'partial commit of cherry-pick fails': 
-	pristine_detach initial &&
+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
 
-	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.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
 
-	test_grep "cannot do a partial commit during a cherry-pick." err
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  a8c44c9 picked
+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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-fatal: cannot do a partial commit during a cherry-pick.
-ok 15 - partial commit of cherry-pick fails
+expecting success of 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 3507.16 'commit --amend of cherry-pick fails': 
-	pristine_detach initial &&
+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
 
-	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.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
 
-	test_grep "in the middle of a cherry-pick -- cannot amend." err
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-fatal: You are in the middle of a cherry-pick -- cannot amend.
-ok 16 - commit --amend of cherry-pick fails
+expecting success of 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 3507.17 'successful final commit clears cherry-pick state': 
-	pristine_detach initial &&
+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
 
-	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.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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-[detached HEAD ccd9cfc] base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply e4ca149... picked-signed
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD 53c8c73] picked-signed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 17 - successful final commit clears cherry-pick state
+expecting success of 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 3507.18 'reset after final pick clears cherry-pick state': 
-	pristine_detach initial &&
+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
 
-	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.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
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+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
 
-  53c8c73 picked-signed
-  ccd9cfc base
+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
 
-HEAD is now at df2a63d initial
-[detached HEAD ccd9cfc] base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply e4ca149... picked-signed
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-ok 18 - reset after final pick clears cherry-pick state
+expecting success of 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 3507.19 'failed cherry-pick produces dirty index': 
-	pristine_detach initial &&
+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
 
-	test_must_fail git cherry-pick picked &&
+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
 
-	test_must_fail git update-index --refresh -q &&
-	test_must_fail git diff-index --exit-code HEAD
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  ccd9cfc base
+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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-foo: needs merge
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
-ok 19 - failed cherry-pick produces dirty index
+expecting success of 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 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.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
 
-	test_must_fail git cherry-pick picked &&
-	git ls-files --stage --unmerged >actual &&
+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
 
-	test_cmp expected actual
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 20 - failed cherry-pick registers participants in index
+expecting success of 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 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.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
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
+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
 
-	test_must_fail git cherry-pick picked &&
+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
 
-	test_cmp expected .git/MERGE_MSG
+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 
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 21 - cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly
+expecting success of 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 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.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 
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
+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=
 
-	test_must_fail git cherry-pick --cleanup=scissors picked &&
+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
 
-	test_cmp expected .git/MERGE_MSG
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 22 - cherry-pick conflict, ensure cleanup=scissors places scissors line properly
+expecting success of 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 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.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
 
-	test_must_fail git cherry-pick picked &&
+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
 
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 23 - failed cherry-pick describes conflict in work tree
+expecting success of 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 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.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
 
-	test_must_fail git cherry-pick picked &&
+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
 
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 24 - diff3 -m style
+expecting success of 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 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.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
 
-	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.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
 
-	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.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
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-foo: needs merge
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
-ok 25 - revert also handles conflicts sanely
+expecting success of 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 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.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
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 26 - failed revert sets REVERT_HEAD
+expecting success of 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 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.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
 
-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.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 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.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 
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 
 
-  feb2983 Revert "base"
+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 
 
-HEAD is now at dc0113b base
-fatal: Needed a single revision
-ok 28 - revert --no-commit sets REVERT_HEAD
+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 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.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=
 
-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.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 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.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
 
-Previous HEAD position was dc0113b base
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: and then do something else
-hint: Disable this message with "git config set advice.mergeConflict false"
-fatal: Needed a single revision
-ok 30 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD
+expecting success of 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 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.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
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-fatal: Needed a single revision
-ok 31 - git reset clears REVERT_HEAD
+expecting success of 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 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.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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-error: Committing is not possible because you have unmerged files.
-hint: Fix them up in the work tree, and then use 'git add/rm <file>'
-hint: as appropriate to mark resolution and make a commit.
-fatal: Exiting because of an unresolved conflict.
-U	foo
-ok 32 - failed commit does not clear REVERT_HEAD
+expecting success of 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 3507.33 'successful final commit clears revert state': 
-	pristine_detach picked-signed &&
+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
 
-	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.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
 
-Previous HEAD position was df2a63d initial
-HEAD is now at e4ca149 picked-signed
-warning: cancelling a revert in progress
-[detached HEAD b940b09] Revert "picked-signed"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert dc0113b... base
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD 7342963] Revert "base"
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 33 - successful final commit clears revert state
+expecting success of 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 3507.34 'reset after final pick clears revert state': 
-	pristine_detach picked-signed &&
+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
 
-	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.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
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+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
 
-  7342963 Revert "base"
-  b940b09 Revert "picked-signed"
+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
 
-HEAD is now at e4ca149 picked-signed
-[detached HEAD b940b09] Revert "picked-signed"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert dc0113b... base
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-ok 34 - reset after final pick clears revert state
+expecting success of 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 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.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
 
-	test_must_fail git revert picked &&
+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
 
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 
 
-  b940b09 Revert "picked-signed"
+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 
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 35 - revert conflict, diff3 -m style
+expecting success of 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 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.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 
 
-		This reverts commit OBJID.
+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 
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
+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=
 
-	test_must_fail git revert picked &&
+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
 
-	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_cmp expected actual
+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
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 36 - revert conflict, ensure commit.cleanup = scissors places scissors line properly
+expecting success of 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 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.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
 
-		This reverts commit OBJID.
+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
 
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
+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
 
-	test_must_fail git revert --cleanup=scissors picked &&
+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 
 
-	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_cmp expected actual
+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 
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not revert 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git revert --continue".
-hint: You can instead skip this commit with "git revert --skip".
-hint: To abort and get back to the state before "git revert",
-hint: run "git revert --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 37 - revert conflict, ensure cleanup=scissors places scissors line properly
+expecting success of 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 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.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 
 
-HEAD is now at df2a63d initial
-warning: cancelling a revert in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Signed-off-by: C O Mitter <committer@example.com>
-ok 38 - failed cherry-pick does not forget -s
+expecting success of 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 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.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=
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply e4ca149... picked-signed
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD ae79e40] picked-signed
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 6 insertions(+)
-ok 39 - commit after failed cherry-pick does not add duplicated -s
+expecting success of 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 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.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
 
-	git commit -a -s &&
+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
 
-	# 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.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
 
-	cat <<-\EOF >expected &&
-	picked
+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
 
-	Signed-off-by: C O Mitter <committer@example.com>
-	EOF
+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
 
-	git show -s --pretty=format:%B >actual &&
-	test_cmp expected actual
+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 
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 
 
-  ae79e40 picked-signed
+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 
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD 56f790d] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 6 insertions(+)
-ok 40 - commit after failed cherry-pick adds -s at the right place
+expecting success of 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 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.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 
 
-	# 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.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=
 
-	git commit -a &&
-	git commit --amend -s &&
+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
 
-	# 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.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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  56f790d picked
+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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD a795bbb] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 6 insertions(+)
-[detached HEAD 91df379] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 6 insertions(+)
-ok 41 - commit --amend -s places the sign-off at the right place
+expecting success of 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 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.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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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 
 
-  91df379 picked
+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 
 
-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.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 
 
-    git commit --allow-empty
+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 
 
-Otherwise, please use 'git cherry-pick --skip'
-ok 42 - cherry-pick preserves sparse-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 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.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=
 
-HEAD is now at df2a63d initial
-warning: cancelling a cherry picking in progress
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD d9f497e] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 22de78d] redundant-pick
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 43 - cherry-pick --continue remembers --keep-redundant-commits
+expecting success of 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 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.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
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+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
 
-  22de78d redundant-pick
-  d9f497e picked
+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
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-[detached HEAD d9f497e] picked
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD d7f7844] 
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 44 - cherry-pick --continue remembers --allow-empty and --allow-empty-message
+expecting success of 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
 
-# passed all 44 test(s)
-1..44
+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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3702-add-edit.sh ***
@@ -188574,61 +188264,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3703-add-magic-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3703-add-magic-pathspec/.git/
-expecting success of 3703.1 'setup': 
-	mkdir sub anothersub &&
-	: >sub/foo &&
-	: >anothersub/foo
-
-ok 1 - setup
-
-expecting success of 3703.2 'add :/': 
-	cat >expected <<-EOF &&
-	add 'anothersub/foo'
-	add 'expected'
-	add 'sub/actual'
-	add 'sub/foo'
-	EOF
-	(cd sub && git add -n :/ >actual) &&
-	test_cmp expected sub/actual
-
-ok 2 - add :/
-
-expecting success of 3703.3 'add :/anothersub': 
-	(cd sub && git add -n :/anothersub >actual) &&
-	test_cmp expected sub/actual
-
-ok 3 - add :/anothersub
-
-expecting success of 3703.4 'add :/non-existent': 
-	(cd sub && test_must_fail git add -n :/non-existent)
-
-fatal: pathspec ':/non-existent' did not match any files
-ok 4 - add :/non-existent
-
-expecting success of 3703.5 'a file with the same (long) magic name exists': 
-	: >":(icase)ha" &&
-	test_must_fail git add -n ":(icase)ha" &&
-	git add -n "./:(icase)ha"
-
-fatal: pathspec ':(icase)ha' did not match any files
-add ':(icase)ha'
-ok 5 - a file with the same (long) magic name exists
-
-expecting success of 3703.6 'a file with the same (short) magic name exists': 
-	: >":/bar" &&
-	test_must_fail git add -n :/bar &&
-	git add -n "./:/bar"
-
-fatal: pathspec ':/bar' did not match any files
-add ':/bar'
-ok 6 - a file with the same (short) magic name exists
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3650-replay-basics.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3650-replay-basics/.git/
 expecting success of 3650.1 'setup': 
@@ -188936,6 +188571,61 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3703-add-magic-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3703-add-magic-pathspec/.git/
+expecting success of 3703.1 'setup': 
+	mkdir sub anothersub &&
+	: >sub/foo &&
+	: >anothersub/foo
+
+ok 1 - setup
+
+expecting success of 3703.2 'add :/': 
+	cat >expected <<-EOF &&
+	add 'anothersub/foo'
+	add 'expected'
+	add 'sub/actual'
+	add 'sub/foo'
+	EOF
+	(cd sub && git add -n :/ >actual) &&
+	test_cmp expected sub/actual
+
+ok 2 - add :/
+
+expecting success of 3703.3 'add :/anothersub': 
+	(cd sub && git add -n :/anothersub >actual) &&
+	test_cmp expected sub/actual
+
+ok 3 - add :/anothersub
+
+expecting success of 3703.4 'add :/non-existent': 
+	(cd sub && test_must_fail git add -n :/non-existent)
+
+fatal: pathspec ':/non-existent' did not match any files
+ok 4 - add :/non-existent
+
+expecting success of 3703.5 'a file with the same (long) magic name exists': 
+	: >":(icase)ha" &&
+	test_must_fail git add -n ":(icase)ha" &&
+	git add -n "./:(icase)ha"
+
+fatal: pathspec ':(icase)ha' did not match any files
+add ':(icase)ha'
+ok 5 - a file with the same (long) magic name exists
+
+expecting success of 3703.6 'a file with the same (short) magic name exists': 
+	: >":/bar" &&
+	test_must_fail git add -n :/bar &&
+	git add -n "./:/bar"
+
+fatal: pathspec ':/bar' did not match any files
+add ':/bar'
+ok 6 - a file with the same (short) magic name exists
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3704-add-pathspec-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3704-add-pathspec-file/.git/
 expecting success of 3704.1 'setup': 
@@ -189106,1124 +188796,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3700-add.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/.git/
-expecting success of 3700.1 'Test of git add': 
-	touch foo && git add foo
-
-ok 1 - Test of git add
-
-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 set advice.addEmptyPathspec false"
-	EOF
-	git add 2>actual &&
-	test_cmp expect actual
-
-ok 2 - Test with no pathspecs
-
-expecting success of 3700.3 'Post-check that foo is in the index': 
-	git ls-files foo | grep foo
-
-foo
-ok 3 - Post-check that foo is in the index
-
-expecting success of 3700.4 'Test that "git add -- -q" works': 
-	touch -- -q && git add -- -q
-
-ok 4 - Test that "git add -- -q" works
-
-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 &&
-
-	# 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
-
-ok 5 - git add: core.fsyncmethod=batch
-
-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 &&
-
-	# 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
-
-ok 6 - git update-index: core.fsyncmethod=batch
-
-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 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
-
-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
-pass
-ok 8 - git add: filemode=0 should not get confused by symlink
-
-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 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
-
-pass
-ok 10 - git add: filemode=0 should not get confused by symlink
-
-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 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
-
-ok 12 - .gitignore test setup
-
-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
-
-ok 13 - .gitignore is honored
-
-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
-
-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 set advice.addIgnoredFile false"
-ok 14 - error out when attempting to add ignored ones without -f
-
-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
-
-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 set advice.addIgnoredFile false"
-ok 15 - error out when attempting to add ignored ones without -f
-
-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
-
-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 set advice.addIgnoredFile false"
-a.if
-ok 16 - error out when attempting to add ignored ones but add others
-
-expecting success of 3700.17 'add ignored ones with -f': 
-	git add -f a.?? &&
-	git ls-files --error-unmatch a.ig
-
-a.ig
-ok 17 - add ignored ones with -f
-
-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
-
-d.ig/d.if
-d.ig/d.ig
-ok 18 - add ignored ones with -f
-
-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
-
-d.ig/d.if
-d.ig/d.ig
-ok 19 - add ignored ones with -f
-
-expecting success of 3700.20 '.gitignore with subdirectory': 
-
-	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
-
-sub/dir/a.ig
-sub/dir/a.ig
-ok 20 - .gitignore with subdirectory
-
-expecting success of 3700.21 'check correct prefix detection': 
-	rm -f .git/index &&
-	git add 1/2/a 1/3/b 1/2/c
-
-ok 21 - check correct prefix detection
-
-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$"
-
-100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
-120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
-ok 22 - git add with filemode=0, symlinks=0, and unmerged entries
-
-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$"
-
-rm 'file'
-rm 'symlink'
-100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
-120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
-ok 23 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1
-
-expecting success of 3700.24 'git add --refresh': 
-	>foo && git add foo && git commit -a -m "commit all" &&
-	test -z "$(git diff-index HEAD -- foo)" &&
-	git read-tree HEAD &&
-	case "$(git diff-index HEAD -- foo)" in
-	:100644" "*"M	foo") echo pass;;
-	*) echo fail; false;;
-	esac &&
-	git add --refresh -- foo &&
-	test -z "$(git diff-index HEAD -- foo)"
-
-[master (root-commit) 0254e3c] commit all
- Author: A U Thor <author@example.com>
- 6 files changed, 2 insertions(+)
- create mode 100644 1/2/a
- create mode 100644 1/2/c
- create mode 100644 1/3/b
- create mode 100755 file
- create mode 100644 foo
- create mode 120000 symlink
-pass
-ok 24 - git add --refresh
-
-expecting success of 3700.25 'git add --refresh with pathspec': 
-	git reset --hard &&
-	echo >foo && echo >bar && echo >baz &&
-	git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
-	echo "100644 $H 3	foo" | git update-index --index-info &&
-	test-tool chmtime -60 bar baz &&
-	git add --refresh bar >actual &&
-	test_must_be_empty actual &&
-
-	git diff-files --name-only >actual &&
-	! grep bar actual &&
-	grep baz actual
-
-HEAD is now at 0254e3c commit all
-rm 'foo'
-baz
-ok 25 - git add --refresh with pathspec
-
-expecting success of 3700.26 'git add --refresh correctly reports no match error': 
-	echo "fatal: pathspec ':(icase)nonexistent' did not match any files" >expect &&
-	test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
-	test_cmp expect actual
-
-ok 26 - git add --refresh correctly reports no match error
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 3700.27 'git add should fail atomically upon an unreadable file': 
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose . &&
-	! ( git ls-files foo1 | grep foo1 )
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-fatal: adding files failed
-add '-q'
-add '.gitignore'
-add 'a.if'
-add 'actual'
-add 'added_files2_actual'
-add 'added_files2_oids'
-add 'added_files_actual'
-add 'added_files_oids'
-add 'b.if'
-add 'c.if/c.if'
-add 'expect'
-add 'files'
-add 'files_base_dir1/dir1/file1.txt'
-add 'files_base_dir1/dir1/file2.txt'
-add 'files_base_dir1/dir1/file3.txt'
-add 'files_base_dir1/dir1/file4.txt'
-add 'files_base_dir1/dir2/file1.txt'
-add 'files_base_dir1/dir2/file2.txt'
-add 'files_base_dir1/dir2/file3.txt'
-add 'files_base_dir1/dir2/file4.txt'
-add 'files_base_dir2/dir1/file1.txt'
-add 'files_base_dir2/dir1/file2.txt'
-add 'files_base_dir2/dir1/file3.txt'
-add 'files_base_dir2/dir1/file4.txt'
-add 'files_base_dir2/dir2/file1.txt'
-add 'files_base_dir2/dir2/file2.txt'
-add 'files_base_dir2/dir2/file3.txt'
-add 'files_base_dir2/dir2/file4.txt'
-add 'foo1'
-ok 27 - git add should fail atomically upon an unreadable file
-
-expecting success of 3700.28 'git add --ignore-errors': 
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose --ignore-errors . &&
-	git ls-files foo1 | grep foo1
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-add '-q'
-add '.gitignore'
-add 'a.if'
-add 'actual'
-add 'added_files2_actual'
-add 'added_files2_oids'
-add 'added_files_actual'
-add 'added_files_oids'
-add 'b.if'
-add 'c.if/c.if'
-add 'expect'
-add 'files'
-add 'files_base_dir1/dir1/file1.txt'
-add 'files_base_dir1/dir1/file2.txt'
-add 'files_base_dir1/dir1/file3.txt'
-add 'files_base_dir1/dir1/file4.txt'
-add 'files_base_dir1/dir2/file1.txt'
-add 'files_base_dir1/dir2/file2.txt'
-add 'files_base_dir1/dir2/file3.txt'
-add 'files_base_dir1/dir2/file4.txt'
-add 'files_base_dir2/dir1/file1.txt'
-add 'files_base_dir2/dir1/file2.txt'
-add 'files_base_dir2/dir1/file3.txt'
-add 'files_base_dir2/dir1/file4.txt'
-add 'files_base_dir2/dir2/file1.txt'
-add 'files_base_dir2/dir2/file2.txt'
-add 'files_base_dir2/dir2/file3.txt'
-add 'files_base_dir2/dir2/file4.txt'
-add 'foo1'
-add 'stage1'
-add 'stage2'
-add 'stage3'
-add 'sub/.gitignore'
-add 'sub/dir/a.ig'
-add 'xfoo1'
-add 'xfoo2'
-add 'xfoo3'
-foo1
-ok 28 - git add --ignore-errors
-
-expecting success of 3700.29 'git add (add.ignore-errors)': 
-	git config add.ignore-errors 1 &&
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose . &&
-	git ls-files foo1 | grep foo1
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-add 'a.ig'
-add 'c.if/c.ig'
-add 'd.ig/d.if'
-add 'd.ig/d.ig'
-add 'foo1'
-add 'sub/a.ig'
-foo1
-ok 29 - git add (add.ignore-errors)
-
-expecting success of 3700.30 'git add (add.ignore-errors = false)': 
-	git config add.ignore-errors 0 &&
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose . &&
-	! ( git ls-files foo1 | grep foo1 )
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-fatal: adding files failed
-add 'foo1'
-ok 30 - git add (add.ignore-errors = false)
-
-expecting success of 3700.31 '--no-ignore-errors overrides config': 
-	git config add.ignore-errors 1 &&
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose --no-ignore-errors . &&
-	! ( git ls-files foo1 | grep foo1 ) &&
-	git config add.ignore-errors 0
-
-HEAD is now at 0254e3c commit all
-error: open("foo2"): Permission denied
-error: unable to index file 'foo2'
-fatal: adding files failed
-add 'foo1'
-ok 31 - --no-ignore-errors overrides config
-
-expecting success of 3700.32 'git add 'fo\[ou\]bar' ignores foobar': 
-	git reset --hard &&
-	touch fo\[ou\]bar foobar &&
-	git add 'fo\[ou\]bar' &&
-	git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar &&
-	! ( git ls-files foobar | grep foobar )
-
-HEAD is now at 0254e3c commit all
-fo[ou]bar
-ok 32 - git add 'fo\[ou\]bar' ignores foobar
-
-expecting success of 3700.33 'git add to resolve conflicts on otherwise ignored path': 
-	git reset --hard &&
-	H=$(git rev-parse :1/2/a) &&
-	(
-		echo "100644 $H 1	track-this" &&
-		echo "100644 $H 3	track-this"
-	) | git update-index --index-info &&
-	echo track-this >>.gitignore &&
-	echo resolved >track-this &&
-	git add track-this
-
-HEAD is now at 0254e3c commit all
-ok 33 - git add to resolve conflicts on otherwise ignored path
-
-expecting success of 3700.34 '"add non-existent" should fail': 
-	test_must_fail git add non-existent &&
-	! (git ls-files | grep "non-existent")
-
-fatal: pathspec 'non-existent' did not match any files
-ok 34 - "add non-existent" should fail
-
-expecting success of 3700.35 'git add -A on empty repo does not error out': 
-	rm -fr empty &&
-	git init empty &&
-	(
-		cd empty &&
-		git add -A . &&
-		git add -A
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/empty/.git/
-ok 35 - git add -A on empty repo does not error out
-
-expecting success of 3700.36 '"git add ." in empty repo': 
-	rm -fr empty &&
-	git init empty &&
-	(
-		cd empty &&
-		git add .
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/empty/.git/
-ok 36 - "git add ." in empty repo
-
-expecting success of 3700.37 '"git add" a embedded repository': 
-	rm -fr outer && git init outer &&
-	(
-		cd outer &&
-		for i in 1 2
-		do
-			name=inner$i &&
-			git init $name &&
-			git -C $name commit --allow-empty -m $name ||
-				return 1
-		done &&
-		git add . 2>actual &&
-		cat >expect <<-EOF &&
-		warning: adding embedded git repository: inner1
-		hint: You${SQ}ve added another git repository inside your current repository.
-		hint: Clones of the outer repository will not contain the contents of
-		hint: the embedded repository and will not know how to obtain it.
-		hint: If you meant to add a submodule, use:
-		hint:
-		hint: 	git submodule add <url> inner1
-		hint:
-		hint: If you added this path by mistake, you can remove it from the
-		hint: index with:
-		hint:
-		hint: 	git rm --cached inner1
-		hint:
-		hint: See "git help submodule" for more information.
-		hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-		warning: adding embedded git repository: inner2
-		EOF
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/outer/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3700-add/outer/inner2/.git/
-[master (root-commit) 3c517b1] inner2
- Author: A U Thor <author@example.com>
-ok 37 - "git add" a embedded repository
-
-expecting success of 3700.38 'error on a repository with no commits': 
-	rm -fr empty &&
-	git init empty &&
-	test_must_fail git add empty >actual 2>&1 &&
-	cat >expect <<-EOF &&
-	error: 'empty/' does not have a commit checked out
-	fatal: adding files failed
-	EOF
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/empty/.git/
-ok 38 - error on a repository with no commits
-
-expecting success of 3700.39 'git add --dry-run of existing changed file': 
-	echo new >>track-this &&
-	git add --dry-run track-this >actual 2>&1 &&
-	echo "add 'track-this'" | test_cmp - actual
-
-ok 39 - git add --dry-run of existing changed file
-
-expecting success of 3700.40 'git add --dry-run of non-existing file': 
-	echo ignored-file >>.gitignore &&
-	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
-
-ok 40 - git add --dry-run of non-existing file
-
-expecting success of 3700.41 'git add --dry-run of an existing file output': 
-	echo "fatal: pathspec 'ignored-file' did not match any files" >expect &&
-	test_cmp expect actual
-
-ok 41 - git add --dry-run of an existing file output
-
-expecting success of 3700.42 'git add --dry-run --ignore-missing of non-existing file': 
-	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
-
-ok 42 - git add --dry-run --ignore-missing of non-existing file
-
-expecting success of 3700.43 'git add --dry-run --ignore-missing of non-existing file output': 
-	test_cmp expect.out actual.out &&
-	test_cmp expect.err actual.err
-
-ok 43 - git add --dry-run --ignore-missing of non-existing file output
-
-expecting success of 3700.44 'git add --dry-run --interactive should fail': 
-	test_must_fail git add --dry-run --interactive
-
-fatal: options '--dry-run' and '--interactive/--patch' cannot be used together
-ok 44 - git add --dry-run --interactive should fail
-
-expecting success of 3700.45 'git add empty string should fail': 
-	test_must_fail git add ""
-
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 45 - git add empty string should fail
-
-expecting success of 3700.46 'git add --chmod=[+-]x stages correctly': 
-	rm -f foo1 &&
-	echo foo >foo1 &&
-	git add --chmod=+x foo1 &&
-	test_mode_in_index 100755 foo1 &&
-	git add --chmod=-x foo1 &&
-	test_mode_in_index 100644 foo1
-
-pass
-pass
-ok 46 - git add --chmod=[+-]x stages correctly
-
-expecting success of 3700.47 'git add --chmod=+x with symlinks': 
-	git config core.filemode 1 &&
-	git config core.symlinks 1 &&
-	rm -f foo2 &&
-	echo foo >foo2 &&
-	git add --chmod=+x foo2 &&
-	test_mode_in_index 100755 foo2
-
-pass
-ok 47 - git add --chmod=+x with symlinks
-
-expecting success of 3700.48 'git add --chmod=[+-]x changes index with already added file': 
-	rm -f foo3 xfoo3 &&
-	git reset --hard &&
-	echo foo >foo3 &&
-	git add foo3 &&
-	git add --chmod=+x foo3 &&
-	test_mode_in_index 100755 foo3 &&
-	echo foo >xfoo3 &&
-	chmod 755 xfoo3 &&
-	git add xfoo3 &&
-	git add --chmod=-x xfoo3 &&
-	test_mode_in_index 100644 xfoo3
-
-HEAD is now at 0254e3c commit all
-pass
-pass
-ok 48 - git add --chmod=[+-]x changes index with already added file
-
-expecting success of 3700.49 'git add --chmod=[+-]x does not change the working tree': 
-	echo foo >foo4 &&
-	git add foo4 &&
-	git add --chmod=+x foo4 &&
-	! test -x foo4
-
-ok 49 - git add --chmod=[+-]x does not change the working tree
-
-expecting success of 3700.50 'git add --chmod fails with non regular files (but updates the other paths)': 
-	git reset --hard &&
-	test_ln_s_add foo foo3 &&
-	touch foo4 &&
-	test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
-	test_grep "cannot chmod +x .foo3." stderr &&
-	test_mode_in_index 120000 foo3 &&
-	test_mode_in_index 100755 foo4
-
-HEAD is now at 0254e3c commit all
-error: cannot chmod +x 'foo3'
-pass
-pass
-ok 50 - git add --chmod fails with non regular files (but updates the other paths)
-
-expecting success of 3700.51 'git add --chmod honors --dry-run': 
-	git reset --hard &&
-	echo foo >foo4 &&
-	git add foo4 &&
-	git add --chmod=+x --dry-run foo4 &&
-	test_mode_in_index 100644 foo4
-
-HEAD is now at 0254e3c commit all
-pass
-ok 51 - git add --chmod honors --dry-run
-
-expecting success of 3700.52 'git add --chmod --dry-run reports error for non regular files': 
-	git reset --hard &&
-	test_ln_s_add foo foo4 &&
-	test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
-	test_grep "cannot chmod +x .foo4." stderr
-
-HEAD is now at 0254e3c commit all
-error: cannot chmod +x 'foo4'
-ok 52 - git add --chmod --dry-run reports error for non regular files
-
-expecting success of 3700.53 'git add --chmod --dry-run reports error for unmatched pathspec': 
-	test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
-	test_grep "pathspec .nonexistent. did not match any files" stderr
-
-fatal: pathspec 'nonexistent' did not match any files
-ok 53 - git add --chmod --dry-run reports error for unmatched pathspec
-
-expecting success of 3700.54 'no file status change if no pathspec is given': 
-	>foo5 &&
-	>foo6 &&
-	git add foo5 foo6 &&
-	git add --chmod=+x &&
-	test_mode_in_index 100644 foo5 &&
-	test_mode_in_index 100644 foo6
-
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config set advice.addEmptyPathspec false"
-pass
-pass
-ok 54 - no file status change if no pathspec is given
-
-expecting success of 3700.55 'no file status change if no pathspec is given in subdir': 
-	mkdir -p sub &&
-	(
-		cd sub &&
-		>sub-foo1 &&
-		>sub-foo2 &&
-		git add . &&
-		git add --chmod=+x &&
-		test_mode_in_index 100644 sub-foo1 &&
-		test_mode_in_index 100644 sub-foo2
-	)
-
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config set advice.addEmptyPathspec false"
-pass
-pass
-ok 55 - no file status change if no pathspec is given in subdir
-
-expecting success of 3700.56 'all statuses changed in folder if . is given': 
-	git init repo &&
-	(
-		cd repo &&
-		mkdir -p sub/dir &&
-		touch x y z sub/a sub/dir/b &&
-		git add -A &&
-		git add --chmod=+x . &&
-		test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
-		git add --chmod=-x . &&
-		test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/repo/.git/
-ok 56 - all statuses changed in folder if . is given
-
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
-
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 57 # skip path is case-insensitive (missing CASE_INSENSITIVE_FS)
-
-# passed all 57 test(s)
-1..57
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3705-add-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3705-add-sparse-checkout/.git/
-expecting success of 3705.1 'setup': 
-	cat >sparse_error_header <<-EOF &&
-	The following paths and/or pathspecs matched paths that exist
-	outside of your sparse-checkout definition, so will not be
-	updated in the index:
-	EOF
-
-	cat >sparse_hint <<-EOF &&
-	hint: If you intend to update such entries, try one of the following:
-	hint: * Use the --sparse option.
-	hint: * Disable or modify the sparsity rules.
-	hint: Disable this message with "git config set advice.updateSparsePath false"
-	EOF
-
-	echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&
-	cat sparse_entry_error sparse_hint >error_and_hint
-
-ok 1 - setup
-
-expecting success of 3705.2 'git add does not remove sparse entries': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	test_must_fail git add sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged
-
-[master (root-commit) c0e866f] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sparse_entry
-ok 2 - git add does not remove sparse entries
-
-expecting success of 3705.3 'git add -A does not remove sparse entries': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	setup_gitignore &&
-	git add -A 2>stderr &&
-	test_must_be_empty stderr &&
-	test_sparse_entry_unchanged
-
-[master 5de8edd] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 3 - git add -A does not remove sparse entries
-
-expecting success of 3705.4 'git add . does not remove sparse entries': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	setup_gitignore &&
-	test_must_fail git add . 2>stderr &&
-	test_sparse_entry_unstaged &&
-
-	cat sparse_error_header >expect &&
-	echo . >>expect &&
-	cat sparse_hint >>expect &&
-
-	test_cmp expect stderr &&
-	test_sparse_entry_unchanged
-
-[master e79cbb6] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 4 - git add . does not remove sparse entries
-
-expecting success of 3705.5 'git add does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 52a8d7c] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 5 - git add does not update sparse entries
-
-expecting success of 3705.6 'git add -f does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 6e383d3] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 6 - git add -f does not update sparse entries
-
-expecting success of 3705.7 'git add -u does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master bb85fed] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 7 - git add -u does not update sparse entries
-
-expecting success of 3705.8 'git add --ignore-removal does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 2bced02] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 8 - git add --ignore-removal does not update sparse entries
-
-expecting success of 3705.9 'git add --dry-run does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 1fb2ac0] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 9 - git add --dry-run does not update sparse entries
-
-expecting success of 3705.10 'git add --refresh does not update sparse entries': 
-	setup_sparse_entry &&
-	git ls-files --debug sparse_entry | grep mtime >before &&
-	test-tool chmtime -60 sparse_entry &&
-	test_must_fail git add --refresh sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	git ls-files --debug sparse_entry | grep mtime >after &&
-	test_cmp before after
-
-[master b9f487e] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 10 - git add --refresh does not update sparse entries
-
-expecting success of 3705.11 'git add --chmod does not update sparse entries': 
-	setup_sparse_entry &&
-	test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged &&
-	! test -x sparse_entry
-
-[master 46b5fb2] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 11 - git add --chmod does not update sparse entries
-
-expecting success of 3705.12 'git add --renormalize does not update sparse entries': 
-	test_when_finished rm .gitattributes &&
-	test_config core.autocrlf false &&
-	setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
-	echo "sparse_entry text=auto" >.gitattributes &&
-	test_must_fail git add --renormalize sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged
-
-[master 18a544d] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 12 - git add --renormalize does not update sparse entries
-
-expecting success of 3705.13 'git add --dry-run --ignore-missing warn on sparse path': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged
-
-[master c192c51] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
-ok 13 - git add --dry-run --ignore-missing warn on sparse path
-
-expecting success of 3705.14 'do not advice about sparse entries when they do not match the pathspec': 
-	setup_sparse_entry &&
-	test_must_fail git add nonexistent 2>stderr &&
-	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
-	! grep -F -f sparse_error_header stderr
-
-[master f9f36a2] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-fatal: pathspec 'nonexistent' did not match any files
-ok 14 - do not advice about sparse entries when they do not match the pathspec
-
-expecting success of 3705.15 'do not warn when pathspec matches dense entries': 
-	setup_sparse_entry &&
-	echo modified >sparse_entry &&
-	>dense_entry &&
-	git add "*_entry" 2>stderr &&
-	test_must_be_empty stderr &&
-	test_sparse_entry_unchanged &&
-	git ls-files --error-unmatch dense_entry
-
-[master 8db759d] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-dense_entry
-ok 15 - do not warn when pathspec matches dense entries
-
-expecting success of 3705.16 'git add fails outside of sparse-checkout definition': 
-	test_when_finished git sparse-checkout disable &&
-	test_commit a &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set a &&
-	echo >>sparse_entry &&
-
-	git update-index --no-skip-worktree sparse_entry &&
-	test_must_fail git add sparse_entry &&
-	test_sparse_entry_unstaged &&
-
-	test_must_fail git add --chmod=+x sparse_entry &&
-	test_sparse_entry_unstaged &&
-
-	test_must_fail git add --renormalize sparse_entry &&
-	test_sparse_entry_unstaged &&
-
-	# Avoid munging CRLFs to avoid an error message
-	git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
-	test_must_be_empty stderr &&
-	git ls-files --stage >actual &&
-	grep "^100644 .*sparse_entry\$" actual &&
-
-	git add --sparse --chmod=+x sparse_entry 2>stderr &&
-	test_must_be_empty stderr &&
-	git ls-files --stage >actual &&
-	grep "^100755 .*sparse_entry\$" actual &&
-
-	git reset &&
-
-	# This will print a message over stderr on Windows.
-	git add --sparse --renormalize sparse_entry &&
-	git status --porcelain >actual &&
-	grep "^M  sparse_entry\$" actual
-
-[master 2be48a2] a
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 a.t
- create mode 100644 dense_entry
-warning: The following paths were already present and thus not updated despite sparse patterns:
-	sparse_entry
-
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-warning: The following paths are not up to date and were left despite sparse patterns:
-	sparse_entry
-
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-100644 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
-100755 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
-Unstaged changes after reset:
-M	sparse_entry
-M  sparse_entry
-ok 16 - git add fails outside of sparse-checkout definition
-
-expecting success of 3705.17 'add obeys advice.updateSparsePath': 
-	setup_sparse_entry &&
-	test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp sparse_entry_error stderr
-
-
-[master 91ae5df] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 17 - add obeys advice.updateSparsePath
-
-expecting success of 3705.18 'add allows sparse entries with --sparse': 
-	git sparse-checkout set --no-cone a &&
-	echo modified >sparse_entry &&
-	test_must_fail git add sparse_entry &&
-	test_sparse_entry_unchanged &&
-	git add --sparse sparse_entry 2>stderr &&
-	test_must_be_empty stderr
-
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-ok 18 - add allows sparse entries with --sparse
-
-expecting success of 3705.19 'can add files from non-sparse dir': 
-	git sparse-checkout set w !/x y/ &&
-	mkdir -p w x/y &&
-	touch w/f x/y/f &&
-	git add w/f x/y/f 2>stderr &&
-	test_must_be_empty stderr
-
-ok 19 - can add files from non-sparse dir
-
-expecting success of 3705.20 'refuse to add non-skip-worktree file from sparse dir': 
-	git sparse-checkout set !/x y/ !x/y/z &&
-	mkdir -p x/y/z &&
-	touch x/y/z/f &&
-	test_must_fail git add x/y/z/f 2>stderr &&
-	echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
-	test_cmp expect stderr
-
-ok 20 - refuse to add non-skip-worktree file from sparse dir
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3510-cherry-pick-sequence.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3510-cherry-pick-sequence/.git/
 expecting success of 3510.1 'setup': 
@@ -192037,618 +190609,787 @@
 1..55
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3902-quoted.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3902-quoted/.git/
-expecting success of 3902.1 'setup': 
+*** t3700-add.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/.git/
+expecting success of 3700.1 'Test of git add': 
+	touch foo && git add foo
 
-	mkdir "$FN" &&
-	for_each_name "echo initial >\"\$name\"" &&
-	git add . &&
-	git commit -q -m Initial &&
+ok 1 - Test of git add
 
-	for_each_name "echo second >\"\$name\"" &&
-	git commit -a -m Second &&
+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 set advice.addEmptyPathspec false"
+	EOF
+	git add 2>actual &&
+	test_cmp expect actual
 
-	for_each_name "echo modified >\"\$name\""
+ok 2 - Test with no pathspecs
 
+expecting success of 3700.3 'Post-check that foo is in the index': 
+	git ls-files foo | grep foo
 
-[master 6e4313d] Second
- Author: A U Thor <author@example.com>
- 11 files changed, 11 insertions(+), 11 deletions(-)
-ok 1 - setup
+foo
+ok 3 - Post-check that foo is in the index
 
-expecting success of 3902.2 'setup expected files': 
-cat >expect.quoted <<\EOF &&
-Name
-"Name and a\nLF"
-"Name and an\tHT"
-"Name\""
-With SP in it
-"\346\277\261\351\207\216\t\347\264\224"
-"\346\277\261\351\207\216\n\347\264\224"
-"\346\277\261\351\207\216 \347\264\224"
-"\346\277\261\351\207\216\"\347\264\224"
-"\346\277\261\351\207\216/file"
-"\346\277\261\351\207\216\347\264\224"
-EOF
+expecting success of 3700.4 'Test that "git add -- -q" works': 
+	touch -- -q && git add -- -q
 
-cat >expect.raw <<\EOF
-Name
-"Name and a\nLF"
-"Name and an\tHT"
-"Name\""
-With SP in it
-"濱野\t純"
-"濱野\n純"
-濱野 純
-"濱野\"純"
-濱野/file
-濱野純
-EOF
+ok 4 - Test that "git add -- -q" works
 
-ok 2 - setup expected files
+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 3902.3 'check fully quoted output from ls-files': 
+	# 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
 
-	git ls-files >current && test_cmp expect.quoted current
+ok 5 - git add: core.fsyncmethod=batch
 
+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 &&
 
-ok 3 - check fully quoted output from ls-files
+	# 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 3902.4 'check fully quoted output from diff-files': 
+ok 6 - git update-index: core.fsyncmethod=batch
 
-	git diff --name-only >current &&
-	test_cmp expect.quoted current
+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 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
 
-ok 4 - check fully quoted output from diff-files
+checking prerequisite: SYMLINKS
 
-expecting success of 3902.5 'check fully quoted output from diff-index': 
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-	git diff --name-only HEAD >current &&
-	test_cmp expect.quoted current
+)
+prerequisite SYMLINKS ok
+pass
+ok 8 - git add: filemode=0 should not get confused by symlink
 
+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...
 
-ok 5 - check fully quoted output from diff-index
+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 3902.6 'check fully quoted output from diff-tree': 
+pass
+ok 10 - git add: filemode=0 should not get confused by symlink
 
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.quoted current
+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 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
 
-ok 6 - check fully quoted output from diff-tree
+ok 12 - .gitignore test setup
 
-expecting success of 3902.7 'check fully quoted output from ls-tree': 
+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
 
-	git ls-tree --name-only -r HEAD >current &&
-	test_cmp expect.quoted current
+ok 13 - .gitignore is honored
 
+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
 
-ok 7 - check fully quoted output from ls-tree
+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 set advice.addIgnoredFile false"
+ok 14 - error out when attempting to add ignored ones without -f
 
-expecting success of 3902.8 'setting core.quotepath': 
+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
 
-	git config --bool core.quotepath false
+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 set advice.addIgnoredFile false"
+ok 15 - error out when attempting to add ignored ones without -f
 
+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
 
-ok 8 - setting core.quotepath
+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 set advice.addIgnoredFile false"
+a.if
+ok 16 - error out when attempting to add ignored ones but add others
 
-expecting success of 3902.9 'check fully quoted output from ls-files': 
+expecting success of 3700.17 'add ignored ones with -f': 
+	git add -f a.?? &&
+	git ls-files --error-unmatch a.ig
 
-	git ls-files >current && test_cmp expect.raw current
+a.ig
+ok 17 - add ignored ones with -f
 
+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
 
-ok 9 - check fully quoted output from ls-files
+d.ig/d.if
+d.ig/d.ig
+ok 18 - add ignored ones with -f
 
-expecting success of 3902.10 'check fully quoted output from diff-files': 
+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
 
-	git diff --name-only >current &&
-	test_cmp expect.raw current
+d.ig/d.if
+d.ig/d.ig
+ok 19 - add ignored ones with -f
 
+expecting success of 3700.20 '.gitignore with subdirectory': 
 
-ok 10 - check fully quoted output from diff-files
+	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 3902.11 'check fully quoted output from diff-index': 
+sub/dir/a.ig
+sub/dir/a.ig
+ok 20 - .gitignore with subdirectory
 
-	git diff --name-only HEAD >current &&
-	test_cmp expect.raw current
+expecting success of 3700.21 'check correct prefix detection': 
+	rm -f .git/index &&
+	git add 1/2/a 1/3/b 1/2/c
 
+ok 21 - check correct prefix detection
 
-ok 11 - check fully quoted output from diff-index
+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 3902.12 'check fully quoted output from diff-tree': 
+100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
+120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
+ok 22 - git add with filemode=0, symlinks=0, and unmerged entries
 
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.raw current
+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$"
 
+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
 
-ok 12 - check fully quoted output from diff-tree
+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 3902.13 'check fully quoted output from ls-tree': 
+[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
 
-	git ls-tree --name-only -r HEAD >current &&
-	test_cmp expect.raw current
+expecting success of 3700.25 'git add --refresh with pathspec': 
+	git reset --hard &&
+	echo >foo && echo >bar && echo >baz &&
+	git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
+	echo "100644 $H 3	foo" | git update-index --index-info &&
+	test-tool chmtime -60 bar baz &&
+	git add --refresh bar >actual &&
+	test_must_be_empty actual &&
 
+	git diff-files --name-only >actual &&
+	! grep bar actual &&
+	grep baz actual
 
-ok 13 - check fully quoted output from ls-tree
+HEAD is now at 0254e3c commit all
+rm 'foo'
+baz
+ok 25 - git add --refresh with pathspec
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3900-i18n-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3900-i18n-commit/.git/
-expecting success of 3900.1 'setup': 
-	: >F &&
-	git add F &&
-	T=$(git write-tree) &&
-	C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) &&
-	git update-ref HEAD $C &&
-	git tag C0
+expecting success of 3700.26 'git add --refresh correctly reports no match error': 
+	echo "fatal: pathspec ':(icase)nonexistent' did not match any files" >expect &&
+	test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
+	test_cmp expect actual
 
-ok 1 - setup
+ok 26 - git add --refresh correctly reports no match error
 
-expecting success of 3900.2 'no encoding header for base case': 
-	E=$(git cat-file commit C0 | sed -ne "s/^encoding //p") &&
-	test z = "z$E"
+checking prerequisite: SANITY
 
-ok 2 - no encoding header for base case
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 3900.3 'UTF-16 refused because of NULs': 
-	echo UTF-16 >F &&
-	test_must_fail git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
+	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"
 
-error: a NUL byte in commit log message not allowed.
-fatal: failed to write commit object
-ok 3 - UTF-16 refused because of NULs
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 3900.4 'UTF-8 invalid characters refused': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	echo "UTF-8 characters" >F &&
-	printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-[master 97e22ab] Commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Warning: commit message did not conform to UTF-8.
-ok 4 - UTF-8 invalid characters refused
+)
+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 3900.5 'UTF-8 overlong sequences rejected': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	rm -f "$HOME/stderr" "$HOME/invalid" &&
-	echo "UTF-8 overlong" >F &&
-	printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+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
 
-[master f17d203] à‚©ommit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: commit message did not conform to UTF-8.
-ok 5 - UTF-8 overlong sequences rejected
+expecting success of 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 3900.6 'UTF-8 non-characters refused': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	echo "UTF-8 non-character 1" >F &&
-	printf "Commit message\n\nNon-character:\364\217\277\276\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+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
 
-[master b54194f] Commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: commit message did not conform to UTF-8.
-ok 6 - UTF-8 non-characters refused
+expecting success of 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 3900.7 'UTF-8 non-characters refused': 
-	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
-	echo "UTF-8 non-character 2." >F &&
-	printf "Commit message\n\nNon-character:\357\267\220\n" \
-		>"$HOME/invalid" &&
-	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
-	test_grep "did not conform" "$HOME"/stderr
+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)
 
-[master 65f731d] Commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: commit message did not conform to UTF-8.
-ok 7 - UTF-8 non-characters refused
+expecting success of 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 3900.8 'ISO8859-1 setup': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H C0 &&
-		echo $H >F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
-	
-Switched to a new branch 'ISO8859-1'
-[ISO8859-1 37233ac] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - ISO8859-1 setup
+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 3900.9 'eucJP setup': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H C0 &&
-		echo $H >F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
-	
-Switched to a new branch 'eucJP'
-[eucJP 2d12add] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 9 - eucJP setup
+expecting success of 3700.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 3900.10 'ISO-2022-JP setup': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H C0 &&
-		echo $H >F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
-	
-Switched to a new branch 'ISO-2022-JP'
-[ISO-2022-JP ae78d6f] $B$O$l$R$[$U(B
+HEAD is now at 0254e3c commit all
+error: open("foo2"): Permission denied
+error: unable to index file 'foo2'
+fatal: adding files failed
+add 'foo1'
+ok 31 - --no-ignore-errors overrides config
+
+expecting success of 3700.32 'git add 'fo\[ou\]bar' ignores foobar': 
+	git reset --hard &&
+	touch fo\[ou\]bar foobar &&
+	git add 'fo\[ou\]bar' &&
+	git ls-files fo\[ou\]bar | grep -F fo\[ou\]bar &&
+	! ( git ls-files foobar | grep foobar )
+
+HEAD is now at 0254e3c commit all
+fo[ou]bar
+ok 32 - git add 'fo\[ou\]bar' ignores foobar
+
+expecting success of 3700.33 'git add to resolve conflicts on otherwise ignored path': 
+	git reset --hard &&
+	H=$(git rev-parse :1/2/a) &&
+	(
+		echo "100644 $H 1	track-this" &&
+		echo "100644 $H 3	track-this"
+	) | git update-index --index-info &&
+	echo track-this >>.gitignore &&
+	echo resolved >track-this &&
+	git add track-this
+
+HEAD is now at 0254e3c commit all
+ok 33 - git add to resolve conflicts on otherwise ignored path
+
+expecting success of 3700.34 '"add non-existent" should fail': 
+	test_must_fail git add non-existent &&
+	! (git ls-files | grep "non-existent")
+
+fatal: pathspec 'non-existent' did not match any files
+ok 34 - "add non-existent" should fail
+
+expecting success of 3700.35 'git add -A on empty repo does not error out': 
+	rm -fr empty &&
+	git init empty &&
+	(
+		cd empty &&
+		git add -A . &&
+		git add -A
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/empty/.git/
+ok 35 - git add -A on empty repo does not error out
+
+expecting success of 3700.36 '"git add ." in empty repo': 
+	rm -fr empty &&
+	git init empty &&
+	(
+		cd empty &&
+		git add .
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/empty/.git/
+ok 36 - "git add ." in empty repo
+
+expecting success of 3700.37 '"git add" a embedded repository': 
+	rm -fr outer && git init outer &&
+	(
+		cd outer &&
+		for i in 1 2
+		do
+			name=inner$i &&
+			git init $name &&
+			git -C $name commit --allow-empty -m $name ||
+				return 1
+		done &&
+		git add . 2>actual &&
+		cat >expect <<-EOF &&
+		warning: adding embedded git repository: inner1
+		hint: You${SQ}ve added another git repository inside your current repository.
+		hint: Clones of the outer repository will not contain the contents of
+		hint: the embedded repository and will not know how to obtain it.
+		hint: If you meant to add a submodule, use:
+		hint:
+		hint: 	git submodule add <url> inner1
+		hint:
+		hint: If you added this path by mistake, you can remove it from the
+		hint: index with:
+		hint:
+		hint: 	git rm --cached inner1
+		hint:
+		hint: See "git help submodule" for more information.
+		hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+		warning: adding embedded git repository: inner2
+		EOF
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/outer/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/outer/inner1/.git/
+[master (root-commit) c5e40ca] inner1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 10 - ISO-2022-JP setup
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3900.11 'check encoding header for ISO8859-1': 
-		E=$(git cat-file commit ISO8859-1 | sed -ne "s/^encoding //p") &&
-		test "z$E" = "zISO8859-1"
-	
-ok 11 - check encoding header for ISO8859-1
+expecting success of 3700.38 'error on a repository with no commits': 
+	rm -fr empty &&
+	git init empty &&
+	test_must_fail git add empty >actual 2>&1 &&
+	cat >expect <<-EOF &&
+	error: 'empty/' does not have a commit checked out
+	fatal: adding files failed
+	EOF
+	test_cmp expect actual
 
-expecting success of 3900.12 'check encoding header for eucJP': 
-		E=$(git cat-file commit eucJP | sed -ne "s/^encoding //p") &&
-		test "z$E" = "zeucJP"
-	
-ok 12 - check encoding header for eucJP
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/empty/.git/
+ok 38 - error on a repository with no commits
 
-expecting success of 3900.13 'check encoding header for ISO-2022-JP': 
-		E=$(git cat-file commit ISO-2022-JP | sed -ne "s/^encoding //p") &&
-		test "z$E" = "zISO-2022-JP"
-	
-ok 13 - check encoding header for ISO-2022-JP
+expecting success of 3700.39 'git add --dry-run of existing changed file': 
+	echo new >>track-this &&
+	git add --dry-run track-this >actual 2>&1 &&
+	echo "add 'track-this'" | test_cmp - actual
 
-expecting success of 3900.14 'config to remove customization': 
-	git config --unset-all i18n.commitencoding &&
-	if Z=$(git config --get-all i18n.commitencoding)
-	then
-		echo Oops, should have failed.
-		false
-	else
-		test z = "z$Z"
-	fi &&
-	git config i18n.commitencoding UTF-8
+ok 39 - git add --dry-run of existing changed file
 
-ok 14 - config to remove customization
+expecting success of 3700.40 'git add --dry-run of non-existing file': 
+	echo ignored-file >>.gitignore &&
+	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
 
-expecting success of 3900.15 'ISO8859-1 should be shown in UTF-8 now': 
-	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+ok 40 - git add --dry-run of non-existing file
 
-ok 15 - ISO8859-1 should be shown in UTF-8 now
+expecting success of 3700.41 'git add --dry-run of an existing file output': 
+	echo "fatal: pathspec 'ignored-file' did not match any files" >expect &&
+	test_cmp expect actual
 
-expecting success of 3900.16 'eucJP should be shown in UTF-8 now': 
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 16 - eucJP should be shown in UTF-8 now
+ok 41 - git add --dry-run of an existing file output
 
-expecting success of 3900.17 'ISO-2022-JP should be shown in UTF-8 now': 
-		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 17 - ISO-2022-JP should be shown in UTF-8 now
+expecting success of 3700.42 'git add --dry-run --ignore-missing of non-existing file': 
+	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
 
-expecting success of 3900.18 'config to add customization': 
-	git config --unset-all i18n.commitencoding &&
-	if Z=$(git config --get-all i18n.commitencoding)
-	then
-		echo Oops, should have failed.
-		false
-	else
-		test z = "z$Z"
-	fi
+ok 42 - git add --dry-run --ignore-missing of non-existing file
 
-ok 18 - config to add customization
+expecting success of 3700.43 'git add --dry-run --ignore-missing of non-existing file output': 
+	test_cmp expect.out actual.out &&
+	test_cmp expect.err actual.err
 
-expecting success of 3900.19 'ISO8859-1 should be shown in itself now': 
-		git config i18n.commitencoding ISO8859-1 &&
-		compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
-	
-ok 19 - ISO8859-1 should be shown in itself now
+ok 43 - git add --dry-run --ignore-missing of non-existing file output
 
-expecting success of 3900.20 'eucJP should be shown in itself now': 
-		git config i18n.commitencoding eucJP &&
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt
-	
-ok 20 - eucJP should be shown in itself now
+expecting success of 3700.44 'git add --dry-run --interactive should fail': 
+	test_must_fail git add --dry-run --interactive
 
-expecting success of 3900.21 'ISO-2022-JP should be shown in itself now': 
-		git config i18n.commitencoding ISO-2022-JP &&
-		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
-	
-ok 21 - ISO-2022-JP should be shown in itself now
+fatal: options '--dry-run' and '--interactive/--patch' cannot be used together
+ok 44 - git add --dry-run --interactive should fail
 
-expecting success of 3900.22 'config to tweak customization': 
-	git config i18n.logoutputencoding UTF-8
+expecting success of 3700.45 'git add empty string should fail': 
+	test_must_fail git add ""
 
-ok 22 - config to tweak customization
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 45 - git add empty string should fail
 
-expecting success of 3900.23 'ISO8859-1 should be shown in UTF-8 now': 
-	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+expecting success of 3700.46 'git add --chmod=[+-]x stages correctly': 
+	rm -f foo1 &&
+	echo foo >foo1 &&
+	git add --chmod=+x foo1 &&
+	test_mode_in_index 100755 foo1 &&
+	git add --chmod=-x foo1 &&
+	test_mode_in_index 100644 foo1
 
-ok 23 - ISO8859-1 should be shown in UTF-8 now
+pass
+pass
+ok 46 - git add --chmod=[+-]x stages correctly
 
-expecting success of 3900.24 'eucJP should be shown in UTF-8 now': 
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 24 - eucJP should be shown in UTF-8 now
+expecting success of 3700.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 3900.25 'ISO-2022-JP should be shown in UTF-8 now': 
-		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 25 - ISO-2022-JP should be shown in UTF-8 now
+pass
+ok 47 - git add --chmod=+x with symlinks
 
-expecting success of 3900.26 'eucJP should be shown in eucJP now': 
-			compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
-		
-ok 26 - eucJP should be shown in eucJP now
+expecting success of 3700.48 'git add --chmod=[+-]x changes index with already added file': 
+	rm -f foo3 xfoo3 &&
+	git reset --hard &&
+	echo foo >foo3 &&
+	git add foo3 &&
+	git add --chmod=+x foo3 &&
+	test_mode_in_index 100755 foo3 &&
+	echo foo >xfoo3 &&
+	chmod 755 xfoo3 &&
+	git add xfoo3 &&
+	git add --chmod=-x xfoo3 &&
+	test_mode_in_index 100644 xfoo3
 
-expecting success of 3900.27 'ISO-2022-JP should be shown in eucJP now': 
-			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
-		
-ok 27 - ISO-2022-JP should be shown in eucJP now
+HEAD is now at 0254e3c commit all
+pass
+pass
+ok 48 - git add --chmod=[+-]x changes index with already added file
 
-expecting success of 3900.28 'eucJP should be shown in ISO-2022-JP now': 
-			compare_with eucJP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
-		
-ok 28 - eucJP should be shown in ISO-2022-JP now
+expecting success of 3700.49 'git add --chmod=[+-]x does not change the working tree': 
+	echo foo >foo4 &&
+	git add foo4 &&
+	git add --chmod=+x foo4 &&
+	! test -x foo4
+
+ok 49 - git add --chmod=[+-]x does not change the working tree
+
+expecting success of 3700.50 'git add --chmod fails with non regular files (but updates the other paths)': 
+	git reset --hard &&
+	test_ln_s_add foo foo3 &&
+	touch foo4 &&
+	test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
+	test_grep "cannot chmod +x .foo3." stderr &&
+	test_mode_in_index 120000 foo3 &&
+	test_mode_in_index 100755 foo4
+
+HEAD is now at 0254e3c commit all
+error: cannot chmod +x 'foo3'
+pass
+pass
+ok 50 - git add --chmod fails with non regular files (but updates the other paths)
+
+expecting success of 3700.51 'git add --chmod honors --dry-run': 
+	git reset --hard &&
+	echo foo >foo4 &&
+	git add foo4 &&
+	git add --chmod=+x --dry-run foo4 &&
+	test_mode_in_index 100644 foo4
+
+HEAD is now at 0254e3c commit all
+pass
+ok 51 - git add --chmod honors --dry-run
+
+expecting success of 3700.52 'git add --chmod --dry-run reports error for non regular files': 
+	git reset --hard &&
+	test_ln_s_add foo foo4 &&
+	test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
+	test_grep "cannot chmod +x .foo4." stderr
+
+HEAD is now at 0254e3c commit all
+error: cannot chmod +x 'foo4'
+ok 52 - git add --chmod --dry-run reports error for non regular files
+
+expecting success of 3700.53 'git add --chmod --dry-run reports error for unmatched pathspec': 
+	test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
+	test_grep "pathspec .nonexistent. did not match any files" stderr
 
-expecting success of 3900.29 'ISO-2022-JP should be shown in ISO-2022-JP now': 
-			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
-		
-ok 29 - ISO-2022-JP should be shown in ISO-2022-JP now
+fatal: pathspec 'nonexistent' did not match any files
+ok 53 - git add --chmod --dry-run reports error for unmatched pathspec
 
-expecting success of 3900.30 'No conversion with ISO8859-1': 
-		compare_with "--encoding=none ISO8859-1" "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
-	
-ok 30 - No conversion with ISO8859-1
+expecting success of 3700.54 'no file status change if no pathspec is given': 
+	>foo5 &&
+	>foo6 &&
+	git add foo5 foo6 &&
+	git add --chmod=+x &&
+	test_mode_in_index 100644 foo5 &&
+	test_mode_in_index 100644 foo6
 
-expecting success of 3900.31 'No conversion with eucJP': 
-		compare_with "--encoding=none eucJP" "$TEST_DIRECTORY"/t3900/eucJP.txt
-	
-ok 31 - No conversion with eucJP
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config set advice.addEmptyPathspec false"
+pass
+pass
+ok 54 - no file status change if no pathspec is given
 
-expecting success of 3900.32 'No conversion with ISO-2022-JP': 
-		compare_with "--encoding=none ISO-2022-JP" "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
-	
-ok 32 - No conversion with ISO-2022-JP
+expecting success of 3700.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 3900.33 'commit --fixup with eucJP encoding': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H-$flag C0 &&
-		echo $H >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		echo $H $flag >>F &&
-		git commit -a --$flag HEAD~1 &&
-		E=$(git cat-file commit eucJP-fixup |
-			sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		git config --unset-all i18n.commitencoding &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git log --oneline >actual &&
-		test_line_count = 3 actual
-	
-Switched to a new branch 'eucJP-fixup'
-[eucJP-fixup 2d12add] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[eucJP-fixup 4164b89] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[eucJP-fixup 762ea33] fixup! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/eucJP-fixup.
-ok 33 - commit --fixup with eucJP encoding
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config set advice.addEmptyPathspec false"
+pass
+pass
+ok 55 - no file status change if no pathspec is given in subdir
 
-expecting success of 3900.34 'commit --squash with ISO-2022-JP encoding': 
-		git config i18n.commitencoding $H &&
-		git checkout -b $H-$flag C0 &&
-		echo $H >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		echo $H $flag >>F &&
-		git commit -a --$flag HEAD~1 &&
-		E=$(git cat-file commit ISO-2022-JP-squash |
-			sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		git config --unset-all i18n.commitencoding &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git log --oneline >actual &&
-		test_line_count = 3 actual
-	
-Switched to a new branch 'ISO-2022-JP-squash'
-[ISO-2022-JP-squash 73be6f0] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ISO-2022-JP-squash 358ea4d] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[ISO-2022-JP-squash 31af1e8] squash! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
[detached HEAD 452b79b] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/ISO-2022-JP-squash.
-ok 34 - commit --squash with ISO-2022-JP encoding
+expecting success of 3700.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 3900.35 'commit --fixup into UTF-8 from ISO-8859-1': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'fixup-UTF-8-ISO-8859-1'
-[fixup-UTF-8-ISO-8859-1 f9ae2e6] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[fixup-UTF-8-ISO-8859-1 2e63169] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[fixup-UTF-8-ISO-8859-1 c8086ca] fixup! ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-UTF-8-ISO-8859-1.
-ok 35 - commit --fixup into UTF-8 from ISO-8859-1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3700-add/repo/.git/
+ok 56 - all statuses changed in folder if . is given
 
-expecting success of 3900.36 'commit --squash into ISO-8859-1 from UTF-8': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'squash-ISO-8859-1-UTF-8'
-[squash-ISO-8859-1-UTF-8 786be3a] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[squash-ISO-8859-1-UTF-8 108aa2c] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[squash-ISO-8859-1-UTF-8 1f9565f] squash! ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
[detached HEAD a65b88e] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-ISO-8859-1-UTF-8.
-ok 36 - commit --squash into ISO-8859-1 from UTF-8
+checking prerequisite: CASE_INSENSITIVE_FS
 
-expecting success of 3900.37 'commit --squash into eucJP from ISO-2022-JP': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'squash-eucJP-ISO-2022-JP'
-[squash-eucJP-ISO-2022-JP 8154dd2] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[squash-eucJP-ISO-2022-JP ac34524] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[squash-eucJP-ISO-2022-JP 60556dc] squash! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
[detached HEAD d7dba56] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-eucJP-ISO-2022-JP.
-ok 37 - commit --squash into eucJP from ISO-2022-JP
+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 3900.38 'commit --fixup into ISO-2022-JP from UTF-8': 
-		git checkout -b $flag-$old-$new C0 &&
-		git config i18n.commitencoding $old &&
-		echo $old >>F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
-		test_tick &&
-		echo intermediate stuff >>G &&
-		git add G &&
-		git commit -a -m "intermediate commit" &&
-		test_tick &&
-		git config i18n.commitencoding $new &&
-		echo $new-$flag >>F &&
-		git commit -a --$flag HEAD^ &&
-		git rebase --autosquash -i HEAD^^^ &&
-		git rev-list HEAD >actual &&
-		test_line_count = 3 actual &&
-		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
-		git cat-file commit HEAD^ >raw &&
-		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
-		test_cmp expect actual
-	
-Switched to a new branch 'fixup-ISO-2022-JP-UTF-8'
-[fixup-ISO-2022-JP-UTF-8 31ec3d8] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[fixup-ISO-2022-JP-UTF-8 1264baa] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[fixup-ISO-2022-JP-UTF-8 7683d37] fixup! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-ISO-2022-JP-UTF-8.
-ok 38 - commit --fixup into ISO-2022-JP from UTF-8
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 57 # skip path is case-insensitive (missing CASE_INSENSITIVE_FS)
 
-# passed all 38 test(s)
-1..38
+# passed all 57 test(s)
+1..57
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3426-rebase-submodule.sh ***
@@ -193586,4849 +192327,710 @@
 [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 -i replace_sub1_with_file
-not ok 23 - git_rebase_interactive: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 3426.24 'git_rebase_interactive: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 -i replace_sub1_with_file
-not ok 24 - git_rebase_interactive: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 3426.25 'git_rebase_interactive: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 25 - git_rebase_interactive: modified submodule does not update submodule work tree
-
-expecting success of 3426.26 'git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 26 - git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 3426.27 'git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Switched to a new branch 'ours'
-[ours 8fb6209] add_x
- 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.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 3426.28 'git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-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 28 - git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 3426.29 'rebase interactive ignores modified submodules': 
-	test_when_finished "rm -rf super sub" &&
-	git init sub &&
-	git -C sub commit --allow-empty -m "Initial commit" &&
-	git init super &&
-	git -c protocol.file.allow=always \
-		-C super submodule add ../sub &&
-	git -C super config submodule.sub.ignore dirty &&
-	>super/foo &&
-	git -C super add foo &&
-	git -C super commit -m "Initial commit" &&
-	test_commit -C super a &&
-	test_commit -C super b &&
-	test_commit -C super/sub c &&
-	set_fake_editor &&
-	git -C super rebase -i HEAD^^
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/sub/.git/
-[master (root-commit) b8cea33] Initial commit
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/super/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/super/sub'...
-done.
-[master (root-commit) f377606] Initial commit
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 foo
- create mode 160000 sub
-[master 4e30919] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[master 41aa191] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[master a61c667] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Successfully rebased and updated refs/heads/master.
-ok 29 - rebase interactive ignores modified submodules
-
-# still have 4 known breakage(s)
-# passed all remaining 25 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3305-notes-fanout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3305-notes-fanout/.git/
-expecting success of 3305.1 'tweak test environment': 
-	git checkout -b nondeterminism &&
-	test_commit A &&
-	git checkout --orphan with_notes;
-
-Switched to a new branch 'nondeterminism'
-[nondeterminism (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'with_notes'
-ok 1 - tweak test environment
-
-expecting success of 3305.2 'creating many notes with git-notes': 
-	num_notes=300 &&
-	i=0 &&
-	while test $i -lt $num_notes
-	do
-		i=$(($i + 1)) &&
-		test_tick &&
-		echo "file for commit #$i" > file &&
-		git add file &&
-		git commit -q -m "commit #$i" &&
-		git notes add -m "note #$i" || return 1
-	done
-
-ok 2 - creating many notes with git-notes
-
-expecting success of 3305.3 'many notes created correctly with git-notes': 
-	git log >output.raw &&
-	grep "^    " output.raw >output &&
-	i=$num_notes &&
-	while test $i -gt 0
-	do
-		echo "    commit #$i" &&
-		echo "    note #$i" &&
-		i=$(($i - 1)) || return 1
-	done > expect &&
-	test_cmp expect output
-
-ok 3 - many notes created correctly with git-notes
-
-expecting success of 3305.4 'stable fanout 0 is followed by stable fanout 1': 
-	i=$num_notes &&
-	fanout=0 &&
-	while test $i -gt 0
-	do
-		i=$(($i - 1)) &&
-		if touched_one_note_with_fanout refs/notes/commits~$i A $fanout
-		then
-			continue
-		elif test $fanout -eq 0
-		then
-			fanout=1 &&
-			if all_notes_have_fanout refs/notes/commits~$i $fanout
-			then
-				echo "Fanout 0 -> 1 at refs/notes/commits~$i" &&
-				continue
-			fi
-		fi &&
-		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
-		git ls-tree -r --name-only refs/notes/commits~$i &&
-		return 1
-	done &&
-	all_notes_have_fanout refs/notes/commits 1
-
-Fanout 0 -> 1 at refs/notes/commits~202
-ok 4 - stable fanout 0 is followed by stable fanout 1
-
-expecting success of 3305.5 'deleting most notes with git-notes': 
-	remove_notes=285 &&
-	i=0 &&
-	git rev-list HEAD >revs &&
-	while test $i -lt $remove_notes && read sha1
-	do
-		i=$(($i + 1)) &&
-		test_tick &&
-		git notes remove "$sha1" || return 1
-	done <revs
-
-Removing note for object 294487610d9e2f1885f32c5aa8c40e1feae544e6
-Removing note for object 264d6d5a375b9b4a748e868f8887139e144dd9ac
-Removing note for object f4791ca4424bf830c9c4c2fae376f8c17584ecfc
-Removing note for object 04413ee0c628c2149ce195709e68ba9739cecaeb
-Removing note for object 2cba5326a57bff88235ffe0d680843c3a875fdc6
-Removing note for object 98c3a61e7f6474b9edadcd9fd0e2c580fbff9f8c
-Removing note for object 69dd6f05596ba7dd52aece2e66312d72193f2404
-Removing note for object 06faaf7ec015a9d97368c2529bdc8cf31baf70bf
-Removing note for object 95a7e3e972db58539e6ef3cc361cd61e31b17db7
-Removing note for object 136b29822535a2e998f2926ee16b1f3802c88b3f
-Removing note for object a9d5012931c30040ee5e7b0b8ab8eaa87dd2df9e
-Removing note for object 34b0e5146919d1b0b079f4685de49d08d602c765
-Removing note for object ba8e5e2e75a66e54fa2a999671e3d602548b0fad
-Removing note for object 84773486b2f3c371913c2745322c02efe920976c
-Removing note for object 30f4912988cb9df51d6bbec5796642f1b1a9a2fc
-Removing note for object 18b7dd8f1690e8cb8399edd2d469cebf6051c8fb
-Removing note for object 80a8f06bff8197866fb6c2b10e529a67b1d0ed57
-Removing note for object 88d59face24312f906679c56c1c00f41a57aed81
-Removing note for object e591b6658f32d09dc92aaab7f518076d7219baa1
-Removing note for object 7194f853be5be737ab89c55ed8ef76999c694cfb
-Removing note for object 785a3db61beba59185813dd72a4f49cb960ba939
-Removing note for object 3dbbb4bfb12466f2662430857727af32dc37b30b
-Removing note for object a7e4d6ced9493bec81fa7a326a50a053b7dd8e47
-Removing note for object 17d18cf173f34f0c977c7d7410432c4c052e9a35
-Removing note for object 0efe5818f127e837f8c49e7ee292f2e3827b5d8c
-Removing note for object 1329c14017e18f7f75c56c6132d5070386191590
-Removing note for object 4fad07113f4b21f3d3aba2033c13576d74ed0159
-Removing note for object fd7060211fed315790db481cca508f2a59cd33fa
-Removing note for object 24bcc65e72949c7aad1e00a0ae648eb27b94a801
-Removing note for object 74017d116189d350e027f6a2fa197d76a98cb90c
-Removing note for object 829520f74568ec4a7daa4344d4e53612e8e449c6
-Removing note for object fc9c45687e413c9199ed2e2dc13732b0eee1417e
-Removing note for object 68f9d6e536ae8b39e2be3687534f96fb0cedd413
-Removing note for object 85492e5692be8052265ab35b1fb32bd632d7a034
-Removing note for object ed3b17f5fea5faec967aea73fab660c3caa4ec11
-Removing note for object c0038d5ca05de0848b621fe56fa32a95f56ac8bb
-Removing note for object 5805c46d394e6f09d122e29bfc8bc4677227c959
-Removing note for object 82a44ee370b37d4fcd2955c7dd4f59f66bb85055
-Removing note for object bebeed1d6e5df5f8e4519c02be6e36baef2a2b9f
-Removing note for object 84489b9c59967356c347b503e7be812344bec157
-Removing note for object de6bce36f8dbcebae05182254f9839ae88a89519
-Removing note for object 028084dc54b6b3a96adb0db4447c0befbfaf0f77
-Removing note for object b8f0c408564c037d30c51346cc54e5bf9b39a223
-Removing note for object 2ca369ce379b96c92fd48802bf5ca62c31495871
-Removing note for object 6c623624f0cfa64dcf5e0670626a9af249ce8fce
-Removing note for object d07926d68d5ea629bdfca003fd6dd71f4efdde8a
-Removing note for object 6160cde4d6c969e42f949a8d975e72f82ec65ff9
-Removing note for object 73b405a748dba3b757b1c4cfbca475d1a66a1396
-Removing note for object 8bfca76ecc8ffdd1c73e247e20dfc380deec169b
-Removing note for object 49d5b21b59db4b0d7e92d8d58b548c7c7f3ceab3
-Removing note for object 092fdff4f714d2ade8c2a5e0b7230b96e58fa202
-Removing note for object 8e716f1f338b7cde850738a7bcb8fc08458f6da8
-Removing note for object cbbd557f18677bca5328466c4649d42ca38ecd0b
-Removing note for object 3b5f892711e112d1ffe60cc652782db8f5436172
-Removing note for object d00c7dd01101c3f61fa408d9609bd0f34189ca0e
-Removing note for object 2d5dfff9582df22365e988c1dbf26f310ac11018
-Removing note for object b081e0909ddc4f0cd0f880a4151b7a0f93ff7c02
-Removing note for object 72db531cec33db2b935aeefaf533d7cdc8e1e498
-Removing note for object 863bdd410c7d0f81d93dadbb5129004563987cdd
-Removing note for object 53c002754b07b01a6c7b0f25e55ce49452e78998
-Removing note for object 37d37991e387d94d7470e8e1f6d2554e027eb040
-Removing note for object c2a4ca4a2728846813f90dd0f36f5dd413572e53
-Removing note for object c4b7e09bd15665daf91c5a420a56dd3721ca8c09
-Removing note for object a14371c8166385886904c730e0a531b5ac0dc1d4
-Removing note for object 3595eeb0316642224135dda2d7f4e2571d13f960
-Removing note for object b7d693fa9562fb10a24385800b92e21d77158cab
-Removing note for object 0b55bd97fdaa73e8998658138997750f9204f709
-Removing note for object 7581409289445aac9cad5685242225b69438bdb5
-Removing note for object 63e0354a05c6f2bd3ee0454b7c8a1b6ad55bbb39
-Removing note for object e122ffa8e4b75eca6c0a6138dbbbbd8fd90db924
-Removing note for object 12b5dbefaa4c85ef26c42c14bb3a48493fd79aed
-Removing note for object 6187ce5edf2f7d4d97721c6a195e9085ee0b75e0
-Removing note for object 0b29c48dd6f47ab350c0268424c5912ca68eec05
-Removing note for object 00225fa0566873e04cf85786bfcdfc8d5a1fb68b
-Removing note for object e46b064f913b6c0ec92bdb2e3cdc956a9ad929d8
-Removing note for object da6a0c7b416f1929e37ad4ab7aa9a43e40bba3a4
-Removing note for object 0e7679756bda78bcb761a92425082d33ae2eabd6
-Removing note for object 3d884933f1ff6c4b8d3ffffb2c1985295ffc7578
-Removing note for object eb5fad11a1860cbc711e7aae5f815d49739027f9
-Removing note for object 6c5b7cca48d408e6597aae06ac190bf435eea0af
-Removing note for object 9ae6abb2dd899f3453bd4a42c6083d29e5ee2c25
-Removing note for object 1c2be6e6b8a1512b49e2d0ce4f320ac62663bd7c
-Removing note for object 91ba16e88693278bac6ea5b6652be27d519c6284
-Removing note for object 04891a4865ab739593d7f5d934906d805027dcbd
-Removing note for object b727600ac1fd560a92140c46077ce7f8a20f8db2
-Removing note for object 29b24dcd761b95b975c46ffa137d98f74d956875
-Removing note for object b1a3d0c9ddc40d03b3d59b6c7930df4012a61d0a
-Removing note for object 3698be91e4a9197cfefba28d171e52fc0fb571fa
-Removing note for object 85388b2ffc9342b1a9237c75f3f7cb79cc410e64
-Removing note for object 0aed77a3e97c3854fcd751b1f94ecb6756725974
-Removing note for object 011539f0b7e8e95c22436d224695aae6c48bb3db
-Removing note for object 43aa9d033a8bbfa9f3e8b0d7c9a715d1d0096c05
-Removing note for object c35ea1a727952227b88357433be4bdfb30e55856
-Removing note for object 46f4a82d64902ab63e4d7de6c78da677c3b20f8e
-Removing note for object 695cbdb56848e3e0e403da2ea9ef18d665481c3c
-Removing note for object 7c7ef41170927a3a7999968540534c70f68ce2c9
-Removing note for object e48a2c3b1b9c23598053a0416d31f9935be4ce83
-Removing note for object 6c66c6ef6b7c907f347fca51f1dc779eee27f35e
-Removing note for object 1e436c8a45959f2f4dfda6256f00caab47c79e7b
-Removing note for object 28a86738bc402f34c2b895820e4710f9b7517ce1
-Removing note for object a4075445b64d0bfb6d601a08598d4c346391ba6e
-Removing note for object 5136d8fd93d2016a0d59ea94013508fc771d7412
-Removing note for object 581964916f22d8ed9e54c42a5f02ebeeff208a54
-Removing note for object 408b845562d9579cac992b13dcf78c7bc351b83c
-Removing note for object f6606205b38996de225eb0d20a4436613226c5b4
-Removing note for object 69ad0c3f89c0348adaeb2b245f24678ff8fc73ef
-Removing note for object 16d4da4076e02831d14264341b46adc23de10d31
-Removing note for object 61245559e67f9f9ed73efe2bc7ba05c3b0dc61a3
-Removing note for object f5fc94c753f4fd9f47311e9a96823508fdf12867
-Removing note for object 4bf49ef5b8de8cf570854c1c5249b17dbac4da6d
-Removing note for object 2b5e34f8ec5a967a8c118b504cb7c9f82425d307
-Removing note for object 71feadd9546a386bba0956643a7618130275ca2d
-Removing note for object c435f7d2da121e6ca478542d81a09b4cfb1e6d40
-Removing note for object 83b6710b31fe03be8147f88d5679dc1e7d6b93e7
-Removing note for object a5cec4217c4c9459acd08946a5936109f92b234a
-Removing note for object 3466f2562096ec7fee77cfcaf975e045d5ba8bd8
-Removing note for object 0356dbfd30b5c8109865b192297b202b8d4b93b5
-Removing note for object ef04490e0dd39166aa62f7be4cbb8a42c9e9b876
-Removing note for object c6251d973d7136acf8b2817e8275fba9e0bb102d
-Removing note for object a18e024b9c635d261c2f54612b342a67928b8068
-Removing note for object 9d03e90800a10023bd868e1e7fee6a0d54bdb972
-Removing note for object 41d89def92a9052d7cc2ae1c673e807f7ee2bc15
-Removing note for object c1c691f1ee137258e216986125ad7169bbc9944b
-Removing note for object 5536984fddffdfdad3a5007221f3b08dc46e32eb
-Removing note for object cd905ab02b0fbdec5407cc7c454d959645e4fabb
-Removing note for object 8b33d27218a7e8cab8a6d2ff5eddd348c36029ba
-Removing note for object 81491394bf0249b2639a9f4f6bfc43c0e38370d4
-Removing note for object 76bff28d5965aaff4f7ba16e4b7a4bfb05bdc334
-Removing note for object e3504135096a7ca00095a761fcf71ecdd2794043
-Removing note for object 74125e7e86a34c7385ea36bff5c5e8f481b423c5
-Removing note for object 5fed9794bc006a7326587300052cb7e44639412a
-Removing note for object 3510fb1bd504c9221f9679da3fdc2845cf21e140
-Removing note for object bf473ccfa7fdc1e61f62f9c874238a0de5fc513d
-Removing note for object fc327306de924737f321c9baeefdcca0df16d2bc
-Removing note for object 2c10f7b0afac72972ec95cb4d308ba7421755512
-Removing note for object 297d6cb08dee5d25ce9ba83eecdeaf449da865bb
-Removing note for object 545c4c1b43dcc4d0a99cd98fcda0bae1005a78b2
-Removing note for object 4a996de24e1ffe26f732c854882697c1ad516386
-Removing note for object 844420c079e48a5166c01a85a790ce6bdeb873bd
-Removing note for object 023515e4ad959899e29b27f5c5f83c8a1a2de28c
-Removing note for object 7585ebad749b486c7ebf9f8e0855ac3099d09a38
-Removing note for object 413376f50b0489aaecbce66bf7b54b98e6550e03
-Removing note for object 2873e3beec9c3d56bad8f485e61d6a2cf9a16c8c
-Removing note for object 61f865b2efc1072fdb8ed9fe06118feae86e84f7
-Removing note for object 1ea06f1458f13efee0b785253f989b694f938edb
-Removing note for object ce8b86ae2c160f88e1c799aa6837f6c773956227
-Removing note for object e3306eaa12a31c691d43bbca19f98a2d9dab4ba9
-Removing note for object c2fb991d7ec9543b161f4f98c624929675ff4c5d
-Removing note for object d11385ba15c9c5e331981f68dd6bd7164ccf3f85
-Removing note for object 6f891e8ffe677a4c89d16dd2c665ee0e14c7a299
-Removing note for object ed339d1d371f85637989f68d0eb557f351577a21
-Removing note for object 4750ac4f1a2e220c1e8f6640294532c98d99f200
-Removing note for object f292c7df6101b6388f4d124dd0e359f53665aeb9
-Removing note for object 6457f18ae180c94ff5f7e0ea32f5d33194813bd5
-Removing note for object 80dca81cb5b833d22335d913b49a273d34062db9
-Removing note for object c4a04fb500fde0e2ec185ceef5e830841ef81190
-Removing note for object 37f7f6d33ccea935fd3052dcf56f0702a5688a56
-Removing note for object b174abe99a10da71c24f307c4be43b8fd13ddd81
-Removing note for object 521324fde746e0ed1d52d3da451c3d5ce0a51853
-Removing note for object 22145dda21dc965767c9837a456e045b0b905d72
-Removing note for object 65cd0782f778269cac585ca0cfceb3b65b4b0136
-Removing note for object 9f0e002cb37dba666555cb19d9825d53bc1efc7e
-Removing note for object ff7230819570fd6ca726ec2870c7acdbc33475eb
-Removing note for object fdf030fde5370388b806af92806e62e2bfb1bb11
-Removing note for object 5bbfd9a6221cce07357876e6702a17e7a96faae5
-Removing note for object 5863cde659f7dda95d24a43459f482038bbe8eba
-Removing note for object dcbb95084ba98cb6a950efc8a6f340b84dee87c7
-Removing note for object 2f60ea03c053734f2cde5a7f31ace9bac1ee19da
-Removing note for object 7dea3506366b9b27f57bafeb6e5bd508b00c5923
-Removing note for object 589a50a5e7daf7983baf43177e3fab221b3f0781
-Removing note for object 9a87326a7e4fec8672ce330e076fc6dba7c23366
-Removing note for object 177838d572b4628311ae9ba649a598c0627c2088
-Removing note for object b00c6f3383767d26b6b6af4057c6c9e56ec72803
-Removing note for object d856441fdb792888b635d1f62bfba9e64b772960
-Removing note for object 3f023909b06329744f931861ebb9c9bd12da1b84
-Removing note for object b161b8a0267657e40c21ea0a7637c9da05cb6234
-Removing note for object c3f42ce00ec78e8c5653eee37687d86870c1d2c5
-Removing note for object fc070b682384d45f45798cb8883f6f779a8d105f
-Removing note for object 794e608cc670532a53e521b37080ac4fb39e5775
-Removing note for object ce4d96ea40482e50d733d943d3aa1326c5f27f20
-Removing note for object 93d93d194fd2c9309ad75ba0ac36eed962540471
-Removing note for object f5ddfa52c42f3fe5bc24b1d7436d269718fb4ec6
-Removing note for object 84e47a901d70a1b913359a59b0eb4128921d6764
-Removing note for object 54a943437a41a035ae36187788f7863a14677754
-Removing note for object 6a28e6066c6213cc0535eb58ea15cc26cc0cb17d
-Removing note for object 7d8ba8659bb15e61daf37be731562cafc8701af4
-Removing note for object c2a06db27f237154cdf5ae99e9336ad7ac101c75
-Removing note for object ebcbe749543cb23055bfad287b08edd5dd506e49
-Removing note for object 22e47c76aa2449f554aa282f61ce8005a9da279e
-Removing note for object 81090cc10824f5f6a229195d061d5a062241f64e
-Removing note for object 27437784483a95ad6a86161d4e6082efa3fc4b99
-Removing note for object 1becd0970add28104ec7023fa8660f59c8dc85e5
-Removing note for object 975edfc698cb84099be9cd6f54b94c6b0bdfbf3e
-Removing note for object 698172dcc506d88c5d745f6b441ce316e908ac25
-Removing note for object 6c5035c5f925f25c4081fe33bea2e87bd4344eeb
-Removing note for object 7a1b8459367f67da01cbd0852e27aafa063eae5b
-Removing note for object 34a270c65107179578d5cf71f88997941cfceb68
-Removing note for object e1ca3debff6d7f8751a0c43f8e649c37c39ddcff
-Removing note for object f2cd69f72028b7f0334dc46c677dbf6e34c64ff9
-Removing note for object b5b96cb5f658ff89cad9d65d3fe90935741d4280
-Removing note for object 3d231f1ae4643fde656b5195e8a44598a524346c
-Removing note for object 92aff6e6403899d4467dca0759a5f9ca9f6083e8
-Removing note for object d7d8923b4e4c23a1f6a66f072403269416d7bdc5
-Removing note for object f5dbbac5c21c898c8673760bc67123f9ca551f62
-Removing note for object 671b9a1a077aafd0194137ce810e99e8e17aabf7
-Removing note for object cf858fab0fd223f87642d61c2dec71777d597370
-Removing note for object 404b958c22b0eec12dd009d4e6bc043a995096ad
-Removing note for object 30e25d85636fbb5a3962893e97204525d507fe5b
-Removing note for object 68fdee2a017d2b19536a79794a90ac13ad3c9120
-Removing note for object 2beb65e939af69464e8ed5dcdd4c10f8ab65110e
-Removing note for object ae862168e1774f973a69502c447480f81c035c00
-Removing note for object 422f97df0f1f254299575475841c717032a6ca32
-Removing note for object f7b9f4caf310f040a99a8117be5928e95be0b97e
-Removing note for object 7bb335e0bde4008652eb5f427a4a7390ae288309
-Removing note for object f17072c2db1767d4e1c41e0411294506f014c2af
-Removing note for object 99c50e745458fd2faf1c0f55273b7512348d2ddc
-Removing note for object 9aa56e0371ac9a4a4f10b34878d53d83ca8190ca
-Removing note for object 8738fb580d364e7645f0f7e0206dd1f000f03c84
-Removing note for object 2db58456e56e9ee9f425944d1c7743519a24784d
-Removing note for object a33d485949f214abc9fbb192ff36632eaa4cf0b3
-Removing note for object 8e59f0f4fc11cc909b24f15a6ef1b6e1a3fa7bc8
-Removing note for object cd604ed04d960a2e7fead48dd5d1e3fd9ca7886d
-Removing note for object 0c320249ca0ddd30c6fc90374656f6331633280a
-Removing note for object f15d09c23da1e142fd85798fbd4ac0b29cb858f3
-Removing note for object 0a256346bb1c2687845aca1e06c2dcb5d1ac9cf3
-Removing note for object 03a07cdc62a571762b99320c43428698b2d3d91b
-Removing note for object 86b4ee723d450722f69493786dc1a1b3c85f456b
-Removing note for object 5ef6c6a2209bc341ee9300945ee24397668600e9
-Removing note for object eee7b5e88db8d2f4eeff2bfd4ced42dc2b77576c
-Removing note for object 331c2d29861aa09a00a73056e70f156650ef1b4a
-Removing note for object bb32de951ad1f794e77afa53a31aa9433bfdb121
-Removing note for object fe8c44ed3546c964bd8398f5fc0c8d5ee01c08dd
-Removing note for object ac00acde313fa0157a4805bdbce2f22d7e57750a
-Removing note for object 1adc2b3c4610b4da4b2c00cbf153395bb5f72ed0
-Removing note for object 59238cad6edee95b454423e535876306852f6b93
-Removing note for object 4f5bde2686729dfaa60e10051820409fc7102027
-Removing note for object 07db9a697feba6bacfc603c13c8c184c376c1fde
-Removing note for object acd7eec9dcc24a3fda4a46d9cf11056f9fb51592
-Removing note for object 198c967016d1d00e0fc01d66d500fec19cb672e2
-Removing note for object 6d7b633c45a92a296093e657ced14d46d8e86970
-Removing note for object 8f6653f2c207619ceba3794249d8bac152454b16
-Removing note for object c04389fb08740d6a3df7158a5e4843bdc07d2539
-Removing note for object 77cd9bf11d2a4b1577dbcb65eafef24ca5f8d64c
-Removing note for object 4d2fca6077788dcdecd4ef82eb45155d3d3c6ae9
-Removing note for object 7f5b0d2394f7a4410784788eb55a86357795e0ee
-Removing note for object 77c91abace28d046f8f08482515dd4d0ee20e771
-Removing note for object 407c31999146268ab83d71891c905685839800c9
-Removing note for object eb3c3aede523d729990ac25c62a93eb47c21e2e3
-Removing note for object 7d116c2f10b15fa50a8e9f229b3b81c5be8980fa
-Removing note for object 8b658fffa694c94a228bd277048256f1ede590d1
-Removing note for object 0cb7eabc69f7cd5f3859906e5aa190bf6a0080dc
-Removing note for object 1270dedbb9873b651b7661f6fd7f20eca25dcce9
-Removing note for object b944dbe8ce8fa4df89750bdf3a6cd8828ff2f1b9
-Removing note for object a8b0b847225e38e28d972bb583db100457dbf2c0
-Removing note for object 46dcf25ab1fb7b08d57dfef57c2d4ef9cdea0368
-Removing note for object 1ef946fbe3fce53728ce0f4e3f3b686f29783ea9
-Removing note for object 9fb987e1900004b51a70d9945feb70d1a26c5db9
-Removing note for object 697e0a1102060a6a7f0e78c614e6e088e22a746d
-Removing note for object 5c65b7962b5bb7291f385885ae0fe5dc5dd1f9f9
-Removing note for object bdeafb301e44b0e4db0f738a2d2a7beefdb70b70
-Removing note for object 51b4081b24cd2ae32dda79a6bf89c6ca47cd0e19
-Removing note for object 6699f4279478278b1b456670806c5114e5b94cd3
-Removing note for object 24a6294035c71abc89705f20573835a048058e48
-Removing note for object 68e303067eaade6915640259529f90f06a3d723f
-Removing note for object 47797ab742998acf558ec5ecd8f73a170767322d
-Removing note for object a68559cad834c4bf10f897cacff96708fd4c9a06
-Removing note for object 257cfeaa5d3091ff76387dc6129e83307e8ec0c5
-Removing note for object f133b89cb79d15f0d85a19317b2dbc5a871c2039
-Removing note for object bff2d39b4f7122bd4c5caee3de353a774d1e632a
-Removing note for object b2f9acae37b0cff7904de95d05e6077d318696c2
-Removing note for object 46f7cc54c0193d02dc4dff1c8f998cfebb8c17b8
-Removing note for object d38ec8f851adf470131178085bfbaab4b12ad2a7
-Removing note for object 597947c97e89280e1eddffc4c30e36c1cb5e8882
-Removing note for object f297f34cfbd904559c0d202b578b112ef5ae50c2
-Removing note for object edd7609018ee7927fd1f8604ea3223e98a44a245
-Removing note for object 03f8530d6eb3617ab8c874b47651509115d54b5e
-Removing note for object ae3ed93531b892b72e7ae1125b3c0e266df4ab70
-Removing note for object ac647561477b7eddb3807defcb481b30af7db978
-Removing note for object 3f096680dbfb873aa9008e9e22559cc94c4a634e
-Removing note for object 7d50e571ffcb9d83478504d8fdd403aecd8df6a3
-Removing note for object 19eb0d4282bc5d4e46ec80864a71cd2e48bcf18c
-Removing note for object 5a50ba526cb7a741e3736b33e111cd5a35e68d3f
-Removing note for object 90911a48f69e3d23142660e2e658bb72d6bb30d2
-Removing note for object 382d7647311957adb8d7feccfbfddfd6d092d875
-Removing note for object ab5f23d01513db15925fbc0d19e07dc67bb7695d
-ok 5 - deleting most notes with git-notes
-
-expecting success of 3305.6 'most notes deleted correctly with git-notes': 
-	git log HEAD~$remove_notes | grep "^    " > output &&
-	i=$(($num_notes - $remove_notes)) &&
-	while test $i -gt 0
-	do
-		echo "    commit #$i" &&
-		echo "    note #$i" &&
-		i=$(($i - 1)) || return 1
-	done > expect &&
-	test_cmp expect output
-
-ok 6 - most notes deleted correctly with git-notes
-
-expecting success of 3305.7 'stable fanout 1 is followed by stable fanout 0': 
-	i=$remove_notes &&
-	fanout=1 &&
-	while test $i -gt 0
-	do
-		i=$(($i - 1)) &&
-		if touched_one_note_with_fanout refs/notes/commits~$i D $fanout
-		then
-			continue
-		elif test $fanout -eq 1
-		then
-			fanout=0 &&
-			if all_notes_have_fanout refs/notes/commits~$i $fanout
-			then
-				echo "Fanout 1 -> 0 at refs/notes/commits~$i" &&
-				continue
-			fi
-		fi &&
-		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
-		git ls-tree -r --name-only refs/notes/commits~$i &&
-		return 1
-	done &&
-	all_notes_have_fanout refs/notes/commits 0
-
-Fanout 1 -> 0 at refs/notes/commits~43
-ok 7 - stable fanout 1 is followed by stable fanout 0
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3512-cherry-pick-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3901-i18n-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
-	git rebase --merge 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 12 - rebase --merge (U/U)
-
-expecting success of 3901.13 'rebase --merge (U/L)': 
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-
-	git reset --hard side &&
-	git rebase --merge 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 13 - rebase --merge (U/L)
-
-expecting success of 3901.14 'rebase --merge (L/L)': 
-	# In this test we want ISO-8859-1 encoded commits as the result
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-
-	git reset --hard side &&
-	git rebase --merge 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 14 - rebase --merge (L/L)
-
-expecting success of 3901.15 'rebase --merge (L/U)': 
-	# This is pathological -- use UTF-8 as intermediate form
-	# to get ISO-8859-1 results.
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-
-	git reset --hard side &&
-	git rebase --merge main &&
-
-	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 15 - rebase --merge (L/U)
-
-expecting success of 3901.16 'am (U/U)': 
-	# Apply UTF-8 patches with UTF-8 commitencoding
-	git config i18n.commitencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-
-	git reset --hard main &&
-	git am out-u1 out-u2 &&
-
-	check_encoding 2
-
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 16 - am (U/U)
-
-expecting success of 3901.17 'am (L/L)': 
-	# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
-	git config i18n.commitencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-
-	git reset --hard main &&
-	git am out-l1 out-l2 &&
-
-	check_encoding 2 8859
-
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 17 - am (L/L)
-
-expecting success of 3901.18 'am (U/L)': 
-	# Apply ISO-8859-1 patches with UTF-8 commitencoding
-	git config i18n.commitencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-	git reset --hard main &&
-
-	# am specifies --utf8 by default.
-	git am out-l1 out-l2 &&
-
-	check_encoding 2
-
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 18 - am (U/L)
-
-expecting success of 3901.19 'am --no-utf8 (U/L)': 
-	# Apply ISO-8859-1 patches with UTF-8 commitencoding
-	git config i18n.commitencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-
-	git reset --hard main &&
-	git am --no-utf8 out-l1 out-l2 2>err &&
-
-	# commit-tree will warn that the commit message does not contain valid UTF-8
-	# as mailinfo did not convert it
-	test_grep "did not conform" err &&
-
-	check_encoding 2
-
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-Warning: commit message did not conform to UTF-8.
-Warning: commit message did not conform to UTF-8.
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-ok 19 - am --no-utf8 (U/L)
-
-expecting success of 3901.20 'am (L/U)': 
-	# Apply UTF-8 patches with ISO-8859-1 commitencoding
-	git config i18n.commitencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-
-	git reset --hard main &&
-	# mailinfo will re-code the commit message to the charset specified by
-	# i18n.commitencoding
-	git am out-u1 out-u2 &&
-
-	check_encoding 2 8859
-
-HEAD is now at 1abbfe5 Second on main
-Applying: Second on side
-Applying: Third on side
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 20 - am (L/U)
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3904-stash-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3904-stash-patch/.git/
-expecting success of 3904.1 'setup': 
-	mkdir dir &&
-	echo parent > dir/foo &&
-	echo dummy > bar &&
-	echo committed > HEAD &&
-	git add bar dir/foo HEAD &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	echo index > dir/foo &&
-	git add dir/foo &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
-
-[master (root-commit) 797253d] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 HEAD
- create mode 100644 bar
- create mode 100644 dir/foo
-[master 1f3a67c] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3904.2 'saying "n" does nothing': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state dir/foo work index &&
-	test_write_lines n n n | test_must_fail git stash save -p &&
-	verify_state HEAD HEADfile_work HEADfile_index &&
-	verify_saved_state bar &&
-	verify_state dir/foo work index
-
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-No changes selected
-ok 2 - saying "n" does nothing
-
-expecting success of 3904.3 'git stash -p': 
-	test_write_lines y n y | git stash save -p &&
-	verify_state HEAD committed HEADfile_index &&
-	verify_saved_state bar &&
-	verify_state dir/foo head index &&
-	git reset --hard &&
-	git stash apply &&
-	verify_state HEAD HEADfile_work committed &&
-	verify_state bar dummy dummy &&
-	verify_state dir/foo work head
-
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-HEAD is now at 1f3a67c second
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   HEAD
-	modified:   dir/foo
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	_head
-	_index_bar
-	_worktree_bar
-	actual
-	expect
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 3 - git stash -p
-
-expecting success of 3904.4 'git stash -p --no-keep-index': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state bar bar_work bar_index &&
-	set_state dir/foo work index &&
-	test_write_lines y n y | git stash save -p --no-keep-index &&
-	verify_state HEAD committed committed &&
-	verify_state bar bar_work dummy &&
-	verify_state dir/foo head head &&
-	git reset --hard &&
-	git stash apply --index &&
-	verify_state HEAD HEADfile_work HEADfile_index &&
-	verify_state bar dummy bar_index &&
-	verify_state dir/foo work index
-
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-HEAD is now at 1f3a67c second
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	_head
-	_index_bar
-	_worktree_bar
-	actual
-	expect
-
-ok 4 - git stash -p --no-keep-index
-
-expecting success of 3904.5 'git stash --no-keep-index -p': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state bar bar_work bar_index &&
-	set_state dir/foo work index &&
-	test_write_lines y n y | git stash save --no-keep-index -p &&
-	verify_state HEAD committed committed &&
-	verify_state dir/foo head head &&
-	verify_state bar bar_work dummy &&
-	git reset --hard &&
-	git stash apply --index &&
-	verify_state HEAD HEADfile_work HEADfile_index &&
-	verify_state bar dummy bar_index &&
-	verify_state dir/foo work index
-
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-HEAD is now at 1f3a67c second
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	_head
-	_index_bar
-	_worktree_bar
-	actual
-	expect
-
-ok 5 - git stash --no-keep-index -p
-
-expecting success of 3904.6 'stash -p --no-keep-index -- <pathspec> does not unstage other files': 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state dir/foo work index &&
-	echo y | git stash push -p --no-keep-index -- HEAD &&
-	verify_state HEAD committed committed &&
-	verify_state dir/foo work index
-
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
-Saved working directory and index state WIP on master: 1f3a67c second
-ok 6 - stash -p --no-keep-index -- <pathspec> does not unstage other files
-
-expecting success of 3904.7 'none of this moved HEAD': 
-	verify_saved_head
-
-ok 7 - none of this moved HEAD
-
-expecting success of 3904.8 'stash -p with split hunk': 
-	git reset --hard &&
-	cat >test <<-\EOF &&
-	aaa
-	bbb
-	ccc
-	EOF
-	git add test &&
-	git commit -m "initial" &&
-	cat >test <<-\EOF &&
-	aaa
-	added line 1
-	bbb
-	added line 2
-	ccc
-	EOF
-	printf "%s\n" s n y q |
-	git stash -p 2>error &&
-	test_must_be_empty error &&
-	grep "added line 1" test &&
-	! grep "added line 2" test
-
-HEAD is now at 1f3a67c second
-[master 97cac8f] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 test
-diff --git a/test b/test
-index 1802a74..515ff88 100644
---- a/test
-+++ b/test
-@@ -1,3 +1,5 @@
- aaa
-+added line 1
- bbb
-+added line 2
- ccc
-(1/1) Stash this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
-@@ -1,2 +1,3 @@
- aaa
-+added line 1
- bbb
-(1/2) Stash this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,2 +3,3 @@
- bbb
-+added line 2
- ccc
-(2/2) Stash this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-Saved working directory and index state WIP on master: 97cac8f initial
-added line 1
-ok 8 - stash -p with split hunk
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3513-revert-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/.git/
-expecting success of 3513.1 'git_revert: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-[add_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_revert: added submodule creates empty directory
-
-expecting success of 3513.2 'git_revert: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-[add_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_revert: added submodule leaves existing empty directory alone
-
-expecting success of 3513.3 'git_revert: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-[replace_file_with_sub1 2605f87] Reapply "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-[replace_file_with_sub1 03c927a] Revert "Reapply "Replace sub1 with file""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_revert: replace tracked file with submodule creates empty directory
-
-expecting success of 3513.4 'git_revert: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-[replace_directory_with_sub1 52671cf] Reapply "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-[replace_directory_with_sub1 3cda69e] Revert "Reapply "Replace sub1 with directory""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_revert: replace directory with submodule
-
-expecting success of 3513.5 'git_revert: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-warning: unable to rmdir 'sub1': Directory not empty
-[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 5 - git_revert: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 3513.6 'git_revert: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-warning: unable to rmdir 'sub1': Directory not empty
-[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 6 - git_revert: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 3513.7 'git_revert: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 7 - git_revert: replace submodule with a directory must fail
-
-expecting success of 3513.8 'git_revert: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 8 - git_revert: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 3513.9 'git_revert: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 9 - git_revert: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 3513.10 'git_revert: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 10 - git_revert: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 3513.11 'git_revert: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Switched to branch 'modify_sub1'
-Your branch is up to date with 'origin/modify_sub1'.
-[modify_sub1 d25c1ce] Revert "Modify sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-[modify_sub1 c259f2c] Reapply "Modify sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_revert: modified submodule does not update submodule work tree
-
-expecting success of 3513.12 'git_revert: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Switched to branch 'invalid_sub1'
-Your branch is up to date with 'origin/invalid_sub1'.
-[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-[invalid_sub1 b7227e2] Reapply "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_revert: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 3513.13 'git_revert: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-[valid_sub1 b7227e2] Reapply "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-[valid_sub1 909462b] Revert "Reapply "Invalid sub1 commit""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_revert: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 3513.14 'git_revert: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-ok 14 - git_revert: added submodule doesn't remove untracked unignored file with same name
-
-# still have 2 known breakage(s)
-# passed all remaining 12 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3701-add-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/.git/
-expecting success of 3701.1 'unknown command': 
-	test_when_finished "git reset --hard; rm -f command" &&
-	echo W >command &&
-	git add -N command &&
-	git diff command >expect &&
-	cat >>expect <<-EOF &&
-	(1/1) Stage addition [y,n,q,a,d,e,p,?]? Unknown command ${SQ}W${SQ} (use ${SQ}?${SQ} for help)
-	(1/1) Stage addition [y,n,q,a,d,e,p,?]?$SP
-	EOF
-	git add -p -- command <command >actual 2>&1 &&
-	test_cmp expect actual
-
-ok 1 - unknown command
-
-expecting success of 3701.2 'setup (initial)': 
-	echo content >file &&
-	git add file &&
-	echo more >>file &&
-	echo lines >>file
-
-ok 2 - setup (initial)
-
-expecting success of 3701.3 'status works (initial)': 
-	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
-
-  1:        +1/-0        +2/-0 file
-ok 3 - status works (initial)
-
-expecting success of 3701.4 'setup expected': 
-	cat >expected <<-\EOF
-	new file mode 100644
-	index 0000000..d95f3ad
-	--- /dev/null
-	+++ b/file
-	@@ -0,0 +1 @@
-	+content
-	EOF
-
-ok 4 - setup expected
-
-expecting success of 3701.5 'diff works (initial)': 
-	test_write_lines d 1 | git add -i >output &&
-	sed -ne "/new file/,/content/p" <output >diff &&
-	diff_cmp expected diff
-
-ok 5 - diff works (initial)
-
-expecting success of 3701.6 'revert works (initial)': 
-	git add file &&
-	test_write_lines r 1 | git add -i &&
-	git ls-files >output &&
-	! grep . output
-
-           staged     unstaged path
-  1:        +3/-0      nothing file
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:        +3/-0      nothing [f]ile
-Revert>>            staged     unstaged path
-* 1:        +3/-0      nothing [f]ile
-Revert>> 
-note: file is untracked now.
-reverted 1 path
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> 
-Bye.
-ok 6 - revert works (initial)
-
-expecting success of 3701.7 'add untracked (multiple)': 
-	test_when_finished "git reset && rm [1-9]" &&
-	touch $(test_seq 9) &&
-	test_write_lines a "2-5 8-" | git add -i -- [1-9] &&
-	test_write_lines 2 3 4 5 8 9 >expected &&
-	git ls-files [1-9] >output &&
-	test_cmp expected output
-
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1: 1
-  2: 2
-  3: 3
-  4: 4
-  5: 5
-  6: 6
-  7: 7
-  8: 8
-  9: 9
-Add untracked>>            staged     unstaged path
-  1: 1
-* 2: 2
-* 3: 3
-* 4: 4
-* 5: 5
-  6: 6
-  7: 7
-* 8: 8
-* 9: 9
-Add untracked>> 
-added 6 paths
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> 
-Bye.
-ok 7 - add untracked (multiple)
-
-expecting success of 3701.8 'setup (commit)': 
-	echo baseline >file &&
-	git add file &&
-	git commit -m commit &&
-	echo content >>file &&
-	git add file &&
-	echo more >>file &&
-	echo lines >>file
-
-[main (root-commit) 4ef1e3a] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 8 - setup (commit)
-
-expecting success of 3701.9 'status works (commit)': 
-	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
-
-  1:        +1/-0        +2/-0 file
-ok 9 - status works (commit)
-
-expecting success of 3701.10 'update can stage deletions': 
-	>to-delete &&
-	git add to-delete &&
-	rm to-delete &&
-	test_write_lines u t "" | git add -i &&
-	git ls-files to-delete >output &&
-	test_must_be_empty output
-
-           staged     unstaged path
-  1:        +1/-0        +2/-0 file
-  2:        +0/-0        +0/-0 to-delete
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:        +1/-0        +2/-0 [f]ile
-  2:        +0/-0        +0/-0 [t]o-delete
-Update>>            staged     unstaged path
-  1:        +1/-0        +2/-0 [f]ile
-* 2:        +0/-0        +0/-0 [t]o-delete
-Update>> updated 1 path
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> 
-Bye.
-ok 10 - update can stage deletions
-
-expecting success of 3701.11 'setup expected': 
-	cat >expected <<-\EOF
-	index 180b47c..b6f2c08 100644
-	--- a/file
-	+++ b/file
-	@@ -1 +1,2 @@
-	 baseline
-	+content
-	EOF
-
-ok 11 - setup expected
-
-expecting success of 3701.12 'diff works (commit)': 
-	test_write_lines d 1 | git add -i >output &&
-	sed -ne "/^index/,/content/p" <output >diff &&
-	diff_cmp expected diff
-
-ok 12 - diff works (commit)
-
-expecting success of 3701.13 'revert works (commit)': 
-	git add file &&
-	test_write_lines r 1 | git add -i &&
-	git add -i </dev/null >output &&
-	grep "unchanged *+3/-0 file" output
-
-           staged     unstaged path
-  1:        +3/-0      nothing file
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:        +3/-0      nothing [f]ile
-Revert>>            staged     unstaged path
-* 1:        +3/-0      nothing [f]ile
-Revert>> 
-reverted 1 path
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> 
-Bye.
-  1:    unchanged        +3/-0 file
-ok 13 - revert works (commit)
-
-expecting success of 3701.14 'reject multi-key input': 
-	saved=$(git hash-object -w file) &&
-	test_when_finished "git cat-file blob $saved >file" &&
-	echo an extra line >>file &&
-	test_write_lines aa | git add -p >actual &&
-	test_grep "is expected, got ${SQ}aa${SQ}" actual
-
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? Only one letter is expected, got 'aa'
-ok 14 - reject multi-key input
-
-expecting success of 3701.15 'setup expected': 
-	cat >expected <<-\EOF
-	EOF
-
-ok 15 - setup expected
-
-expecting success of 3701.16 'dummy edit works': 
-	test_set_editor : &&
-	test_write_lines e a | git add -p &&
-	git diff > diff &&
-	diff_cmp expected diff
-
-diff --git a/file b/file
-index 180b47c..f910ae9 100644
---- a/file
-+++ b/file
-@@ -1 +1,4 @@
- baseline
-+content
-+more
-+lines
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 16 - dummy edit works
-
-expecting success of 3701.17 'setup patch': 
-	cat >patch <<-\EOF
-	@@ -1,1 +1,4 @@
-	 this
-	+patch
-	-does not
-	 apply
-	EOF
-
-ok 17 - setup patch
-
-expecting success of 3701.18 'setup fake editor': 
-	write_script "fake_editor.sh" <<-\EOF &&
-	mv -f "$1" oldpatch &&
-	mv -f patch "$1"
-	EOF
-	test_set_editor "$(pwd)/fake_editor.sh"
-
-ok 18 - setup fake editor
-
-expecting success of 3701.19 'bad edit rejected': 
-	git reset &&
-	test_write_lines e n d | git add -p >output &&
-	grep "hunk does not apply" output
-
-Unstaged changes after reset:
-M	file
-error: patch failed: file:1
-error: file: patch does not apply
-error: 'git apply --cached' failed
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? (1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 19 - bad edit rejected
-
-expecting success of 3701.20 'setup patch': 
-	cat >patch <<-\EOF
-	this patch
-	is garbage
-	EOF
-
-ok 20 - setup patch
-
-expecting success of 3701.21 'garbage edit rejected': 
-	git reset &&
-	test_write_lines e n d | git add -p >output &&
-	grep "hunk does not apply" output
-
-Unstaged changes after reset:
-M	file
-error: corrupt patch at line 6
-error: 'git apply --cached' failed
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? (1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 21 - garbage edit rejected
-
-expecting success of 3701.22 'setup patch': 
-	cat >patch <<-\EOF
-	@@ -1,0 +1,0 @@
-	 baseline
-	+content
-	+newcontent
-	+lines
-	EOF
-
-ok 22 - setup patch
-
-expecting success of 3701.23 'setup expected': 
-	cat >expected <<-\EOF
-	diff --git a/file b/file
-	index b5dd6c9..f910ae9 100644
-	--- a/file
-	+++ b/file
-	@@ -1,4 +1,4 @@
-	 baseline
-	 content
-	-newcontent
-	+more
-	 lines
-	EOF
-
-ok 23 - setup expected
-
-expecting success of 3701.24 'real edit works': 
-	test_write_lines e n d | git add -p &&
-	git diff >output &&
-	diff_cmp expected output
-
-diff --git a/file b/file
-index 180b47c..f910ae9 100644
---- a/file
-+++ b/file
-@@ -1 +1,4 @@
- baseline
-+content
-+more
-+lines
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 24 - real edit works
-
-expecting success of 3701.25 'setup file': 
-	test_write_lines a "" b "" c >file &&
-	git add file &&
-	test_write_lines a "" d "" c >file
-
-ok 25 - setup file
-
-expecting success of 3701.26 'setup patch': 
-	NULL="" &&
-	cat >patch <<-EOF
-	@@ -1,4 +1,4 @@
-	 a
-	$NULL
-	-b
-	+f
-	$SP
-	c
-	EOF
-
-ok 26 - setup patch
-
-expecting success of 3701.27 'setup expected': 
-	cat >expected <<-EOF
-	diff --git a/file b/file
-	index b5dd6c9..f910ae9 100644
-	--- a/file
-	+++ b/file
-	@@ -1,5 +1,5 @@
-	 a
-	$SP
-	-f
-	+d
-	$SP
-	 c
-	EOF
-
-ok 27 - setup expected
-
-expecting success of 3701.28 'edit can strip spaces from empty context lines': 
-	test_write_lines e n q | git add -p 2>error &&
-	test_must_be_empty error &&
-	git diff >output &&
-	diff_cmp expected output
-
-diff --git a/file b/file
-index bda3f38..90b7c9d 100644
---- a/file
-+++ b/file
-@@ -1,5 +1,5 @@
- a
- 
--b
-+d
- 
- c
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 28 - edit can strip spaces from empty context lines
-
-expecting success of 3701.29 'skip files similarly as commit -a': 
-	git reset &&
-	echo file >.gitignore &&
-	echo changed >file &&
-	echo y | git add -p file &&
-	git diff >output &&
-	git reset &&
-	git commit -am commit &&
-	git diff >expected &&
-	diff_cmp expected output &&
-	git reset --hard HEAD^
-
-Unstaged changes after reset:
-M	file
-diff --git a/file b/file
-index 180b47c..5ea2ed4 100644
---- a/file
-+++ b/file
-@@ -1 +1 @@
--baseline
-+changed
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-Unstaged changes after reset:
-M	file
-[main 953db45] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 4ef1e3a commit
-ok 29 - skip files similarly as commit -a
-
-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 3701.30 'patch does not affect mode': 
-	git reset --hard &&
-	echo content >>file &&
-	chmod +x file &&
-	printf "n\\ny\\n" | git add -p &&
-	git show :file | grep content &&
-	git diff file | grep "new mode"
-
-HEAD is now at 4ef1e3a commit
-diff --git a/file b/file
-index 180b47c..b6f2c08
---- a/file
-+++ b/file
-old mode 100644
-new mode 100755
-(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]? @@ -1 +1,2 @@
- baseline
-+content
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-content
-new mode 100755
-ok 30 - patch does not affect mode
-
-expecting success of 3701.31 'stage mode but not hunk': 
-	git reset --hard &&
-	echo content >>file &&
-	chmod +x file &&
-	printf "y\\nn\\n" | git add -p &&
-	git diff --cached file | grep "new mode" &&
-	git diff          file | grep "+content"
-
-HEAD is now at 4ef1e3a commit
-diff --git a/file b/file
-index 180b47c..b6f2c08
---- a/file
-+++ b/file
-old mode 100644
-new mode 100755
-(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]? @@ -1 +1,2 @@
- baseline
-+content
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-new mode 100755
-+content
-ok 31 - stage mode but not hunk
-
-expecting success of 3701.32 'stage mode and hunk': 
-	git reset --hard &&
-	echo content >>file &&
-	chmod +x file &&
-	printf "y\\ny\\n" | git add -p &&
-	git diff --cached file >out &&
-	grep "new mode" out &&
-	grep "+content" out &&
-	git diff file >out &&
-	test_must_be_empty out
-
-HEAD is now at 4ef1e3a commit
-diff --git a/file b/file
-index 180b47c..b6f2c08
---- a/file
-+++ b/file
-old mode 100644
-new mode 100755
-(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]? @@ -1 +1,2 @@
- baseline
-+content
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-new mode 100755
-+content
-ok 32 - stage mode and hunk
-
-expecting success of 3701.33 'different prompts for mode change/deleted': 
-	git reset --hard &&
-	>file &&
-	>deleted &&
-	git add --chmod=+x file deleted &&
-	echo changed >file &&
-	rm deleted &&
-	test_write_lines n n n |
-	git -c core.filemode=true add -p >actual &&
-	sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered &&
-	cat >expect <<-\EOF &&
-	(1/1) Stage deletion [y,n,q,a,d,p,?]?
-	(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]?
-	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]?
-	EOF
-	test_cmp expect actual.filtered
-
-HEAD is now at 4ef1e3a commit
-ok 33 - different prompts for mode change/deleted
-
-expecting success of 3701.34 'correct message when there is nothing to do': 
-	git reset --hard &&
-	git add -p >out &&
-	test_grep "No changes" out &&
-	printf "\\0123" >binary &&
-	git add binary &&
-	printf "\\0abc" >binary &&
-	git add -p >out &&
-	test_grep "Only binary files changed" out
-
-HEAD is now at 4ef1e3a commit
-No changes.
-Only binary files changed.
-ok 34 - correct message when there is nothing to do
-
-expecting success of 3701.35 'setup again': 
-	git reset --hard &&
-	test_chmod +x file &&
-	echo content >>file &&
-	test_write_lines A B C D>file2 &&
-	git add file2
-
-HEAD is now at 4ef1e3a commit
-ok 35 - setup again
-
-expecting success of 3701.36 'setup patch': 
-	cat >patch <<-\EOF
-	index 180b47c..b6f2c08 100644
-	--- a/file
-	+++ b/file
-	@@ -1,2 +1,4 @@
-	+firstline
-	 baseline
-	 content
-	+lastline
-	\ No newline at end of file
-	diff --git a/file2 b/file2
-	index 8422d40..35b930a 100644
-	--- a/file2
-	+++ b/file2
-	@@ -1,4 +1,5 @@
-	-A
-	+Z
-	 B
-	+Y
-	 C
-	-D
-	+X
-	EOF
-
-ok 36 - setup patch
-
-expecting success of 3701.37 'setup expected': 
-	echo diff --git a/file b/file >expected &&
-	sed -e "/^index 180b47c/s/ 100644/ 100755/" \
-	    -e /1,5/s//1,4/ \
-	    -e /Y/d patch >>expected &&
-	cat >expected-output <<-\EOF
-	--- a/file
-	+++ b/file
-	@@ -1,2 +1,4 @@
-	+firstline
-	 baseline
-	 content
-	+lastline
-	\ No newline at end of file
-	@@ -1,2 +1,3 @@
-	+firstline
-	 baseline
-	 content
-	@@ -1,2 +2,3 @@
-	 baseline
-	 content
-	+lastline
-	\ No newline at end of file
-	--- a/file2
-	+++ b/file2
-	@@ -1,4 +1,5 @@
-	-A
-	+Z
-	 B
-	+Y
-	 C
-	-D
-	+X
-	@@ -1,2 +1,2 @@
-	-A
-	+Z
-	 B
-	@@ -2,2 +2,3 @@
-	 B
-	+Y
-	 C
-	@@ -3,2 +4,2 @@
-	 C
-	-D
-	+X
-	EOF
-
-ok 37 - setup expected
-
-expecting success of 3701.38 'add first line works': 
-	git commit -am "clear local changes" &&
-	git apply patch &&
-	test_write_lines s y y s y n y | git add -p 2>error >raw-output &&
-	sed -n -e "s/^([1-9]\/[1-9]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
-	       -e "/^[-+@ \\\\]"/p raw-output >output &&
-	test_must_be_empty error &&
-	git diff --cached >diff &&
-	diff_cmp expected diff &&
-	test_cmp expected-output output
-
-[main dd8d550] clear local changes
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- mode change 100644 => 100755 file
- create mode 100644 file2
-ok 38 - add first line works
-
-expecting success of 3701.39 'setup expected': 
-	cat >expected <<-\EOF
-	diff --git a/non-empty b/non-empty
-	deleted file mode 100644
-	index d95f3ad..0000000
-	--- a/non-empty
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-content
-	EOF
-
-ok 39 - setup expected
-
-expecting success of 3701.40 'deleting a non-empty file': 
-	git reset --hard &&
-	echo content >non-empty &&
-	git add non-empty &&
-	git commit -m non-empty &&
-	rm non-empty &&
-	echo y | git add -p non-empty &&
-	git diff --cached >diff &&
-	diff_cmp expected diff
-
-HEAD is now at dd8d550 clear local changes
-[main 00556ef] non-empty
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 non-empty
-diff --git a/non-empty b/non-empty
-deleted file mode 100644
-index d95f3ad..0000000
---- a/non-empty
-+++ /dev/null
-@@ -1 +0,0 @@
--content
-(1/1) Stage deletion [y,n,q,a,d,p,?]? 
-ok 40 - deleting a non-empty file
-
-expecting success of 3701.41 'setup expected': 
-	cat >expected <<-\EOF
-	diff --git a/empty b/empty
-	deleted file mode 100644
-	index e69de29..0000000
-	EOF
-
-ok 41 - setup expected
-
-expecting success of 3701.42 'deleting an empty file': 
-	git reset --hard &&
-	> empty &&
-	git add empty &&
-	git commit -m empty &&
-	rm empty &&
-	echo y | git add -p empty &&
-	git diff --cached >diff &&
-	diff_cmp expected diff
-
-HEAD is now at 00556ef non-empty
-[main 2e6bfc0] empty
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-diff --git a/empty b/empty
-deleted file mode 100644
-index e69de29..0000000
-(1/1) Stage deletion [y,n,q,a,d,p,?]? 
-ok 42 - deleting an empty file
-
-expecting success of 3701.43 'adding an empty file': 
-	git init added &&
-	(
-		cd added &&
-		test_commit initial &&
-		>empty &&
-		git add empty &&
-		test_tick &&
-		git commit -m empty &&
-		git tag added-file &&
-		git reset --hard HEAD^ &&
-		test_path_is_missing empty &&
-
-		echo y | git checkout -p added-file -- >actual &&
-		test_path_is_file empty &&
-		test_grep "Apply addition to index and worktree" actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/added/.git/
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 47883bc] empty
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-HEAD is now at 24b24cf initial
-(1/1) Apply addition to index and worktree [y,n,q,a,d,?]? 
-ok 43 - adding an empty file
-
-expecting success of 3701.44 'split hunk setup': 
-	git reset --hard &&
-	test_write_lines 10 20 30 40 50 60 >test &&
-	git add test &&
-	test_tick &&
-	git commit -m test &&
-
-	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
-
-HEAD is now at 2e6bfc0 empty
-[main 18d1e3e] test
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+)
- create mode 100644 test
-ok 44 - split hunk setup
-
-expecting success of 3701.45 'goto hunk 1 with "g 1"': 
-	test_when_finished "git reset" &&
-	tr _ " " >expect <<-EOF &&
-	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? + 1:  -1,2 +1,3          +15
-	_ 2:  -2,4 +3,8          +21
-	go to which hunk? @@ -1,2 +1,3 @@
-	_10
-	+15
-	_20
-	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
-	EOF
-	test_write_lines s y g 1 | git add -p >actual &&
-	tail -n 7 <actual >actual.trimmed &&
-	test_cmp expect actual.trimmed
-
-Unstaged changes after reset:
-M	test
-ok 45 - goto hunk 1 with "g 1"
-
-expecting success of 3701.46 'goto hunk 1 with "g1"': 
-	test_when_finished "git reset" &&
-	tr _ " " >expect <<-EOF &&
-	_10
-	+15
-	_20
-	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
-	EOF
-	test_write_lines s y g1 | git add -p >actual &&
-	tail -n 4 <actual >actual.trimmed &&
-	test_cmp expect actual.trimmed
-
-Unstaged changes after reset:
-M	test
-ok 46 - goto hunk 1 with "g1"
-
-expecting success of 3701.47 'navigate to hunk via regex /pattern': 
-	test_when_finished "git reset" &&
-	tr _ " " >expect <<-EOF &&
-	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? @@ -1,2 +1,3 @@
-	_10
-	+15
-	_20
-	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
-	EOF
-	test_write_lines s y /1,2 | git add -p >actual &&
-	tail -n 5 <actual >actual.trimmed &&
-	test_cmp expect actual.trimmed
-
-Unstaged changes after reset:
-M	test
-ok 47 - navigate to hunk via regex /pattern
-
-expecting success of 3701.48 'navigate to hunk via regex / pattern': 
-	test_when_finished "git reset" &&
-	tr _ " " >expect <<-EOF &&
-	_10
-	+15
-	_20
-	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
-	EOF
-	test_write_lines s y / 1,2 | git add -p >actual &&
-	tail -n 4 <actual >actual.trimmed &&
-	test_cmp expect actual.trimmed
-
-Unstaged changes after reset:
-M	test
-ok 48 - navigate to hunk via regex / pattern
-
-expecting success of 3701.49 'print again the hunk': 
-	test_when_finished "git reset" &&
-	tr _ " " >expect <<-EOF &&
-	+15
-	 20
-	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -1,2 +1,3 @@
-	 10
-	+15
-	 20
-	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
-	EOF
-	test_write_lines s y g 1 p | git add -p >actual &&
-	tail -n 7 <actual >actual.trimmed &&
-	test_cmp expect actual.trimmed
-
-Unstaged changes after reset:
-M	test
-ok 49 - print again the hunk
-
-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 3701.50 'print again the hunk (PAGER)': 
-	test_when_finished "git reset" &&
-	cat >expect <<-EOF &&
-	<GREEN>+<RESET><GREEN>15<RESET>
-	 20<RESET>
-	<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>PAGER <CYAN>@@ -1,2 +1,3 @@<RESET>
-	PAGER  10<RESET>
-	PAGER <GREEN>+<RESET><GREEN>15<RESET>
-	PAGER  20<RESET>
-	<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>
-	EOF
-	test_write_lines s y g 1 P |
-	(
-		GIT_PAGER="sed s/^/PAGER\ /" &&
-		export GIT_PAGER &&
-		test_terminal git add -p >actual
-	) &&
-	tail -n 7 <actual | test_decode_color >actual.trimmed &&
-	test_cmp expect actual.trimmed
-
-Unstaged changes after reset:
-M	test
-ok 50 - print again the hunk (PAGER)
-
-expecting success of 3701.51 'P handles SIGPIPE when writing to pager': 
-	test_when_finished "rm -f huge_file; git reset" &&
-	printf "\n%2500000s" Y >huge_file &&
-	git add -N huge_file &&
-	test_write_lines P q | (
-		GIT_PAGER="head -n 1" &&
-		export GIT_PAGER &&
-		test_terminal git add -p
-	)
-
-diff --git a/huge_file b/huge_file
-new file mode 100644
-index 0000000..c97c625
---- /dev/null
-+++ b/huge_file
-@@ -0,0 +1,2 @@
-+
-+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Y
-\ No newline at end of file
-(1/1) Stage addition [y,n,q,a,d,e,p,?]? @@ -0,0 +1,2 @@
-(1/1) Stage addition [y,n,q,a,d,e,p,?]? 
-Unstaged changes after reset:
-M	test
-ok 51 - P handles SIGPIPE when writing to pager
-
-expecting success of 3701.52 'split hunk "add -p (edit)"': 
-	# Split, say Edit and do nothing.  Then:
-	#
-	# 1. Broken version results in a patch that does not apply and
-	# only takes [y/n] (edit again) so the first q is discarded
-	# and then n attempts to discard the edit. Repeat q enough
-	# times to get out.
-	#
-	# 2. Correct version applies the (not)edited version, and asks
-	#    about the next hunk, against which we say q and program
-	#    exits.
-	printf "%s\n" s e     q n q q |
-	EDITOR=: git add -p &&
-	git diff >actual &&
-	! grep "^+15" actual
-
-diff --git a/test b/test
-index 0889435..26b5645 100644
---- a/test
-+++ b/test
-@@ -1,5 +1,10 @@
- 10
-+15
- 20
-+21
-+22
-+23
-+24
- 30
- 40
- 50
-(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
-@@ -1,2 +1,3 @@
- 10
-+15
- 20
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,4 +3,8 @@
- 20
-+21
-+22
-+23
-+24
- 30
- 40
- 50
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-ok 52 - split hunk "add -p (edit)"
-
-expecting success of 3701.53 'split hunk "add -p (no, yes, edit)"': 
-	test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
-	git reset &&
-	# test sequence is s(plit), n(o), y(es), e(dit)
-	# q n q q is there to make sure we exit at the end.
-	printf "%s\n" s n y e   q n q q |
-	EDITOR=: git add -p 2>error &&
-	test_must_be_empty error &&
-	git diff >actual &&
-	! grep "^+31" actual
-
-Unstaged changes after reset:
-M	test
-diff --git a/test b/test
-index 0889435..47ab15d 100644
---- a/test
-+++ b/test
-@@ -1,6 +1,9 @@
-+5
- 10
- 20
-+21
- 30
-+31
- 40
- 50
- 60
-(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 3 hunks.
-@@ -1,2 +1,3 @@
-+5
- 10
- 20
-(1/3) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -1,3 +2,4 @@
- 10
- 20
-+21
- 30
-(2/3) Stage this hunk [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -3,4 +5,5 @@
- 30
-+31
- 40
- 50
- 60
-(3/3) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-ok 53 - split hunk "add -p (no, yes, edit)"
-
-expecting success of 3701.54 'split hunk with incomplete line at end': 
-	git reset --hard &&
-	printf "missing LF" >>test &&
-	git add test &&
-	test_write_lines before 10 20 30 40 50 60 70 >test &&
-	git grep --cached missing &&
-	test_write_lines s n y q | git add -p &&
-	test_must_fail git grep --cached missing &&
-	git grep before &&
-	test_must_fail git grep --cached before
-
-HEAD is now at 18d1e3e test
-test:missing LF
-diff --git a/test b/test
-index dd09efb..cdbfd1e 100644
---- a/test
-+++ b/test
-@@ -1,7 +1,8 @@
-+before
- 10
- 20
- 30
- 40
- 50
- 60
--missing LF
-\ No newline at end of file
-+70
-(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
-@@ -1,6 +1,7 @@
-+before
- 10
- 20
- 30
- 40
- 50
- 60
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -1,7 +2,7 @@
- 10
- 20
- 30
- 40
- 50
- 60
--missing LF
-\ No newline at end of file
-+70
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-test:before
-ok 54 - split hunk with incomplete line at end
-
-expecting success of 3701.55 'edit, adding lines to the first hunk': 
-	test_write_lines 10 11 20 30 40 50 51 60 >test &&
-	git reset &&
-	tr _ " " >patch <<-EOF &&
-	@@ -1,5 +1,6 @@
-	_10
-	+11
-	+12
-	_20
-	+21
-	+22
-	_30
-	EOF
-	# test sequence is s(plit), e(dit), n(o)
-	# q n q q is there to make sure we exit at the end.
-	printf "%s\n" s e n   q n q q |
-	EDITOR=./fake_editor.sh git add -p 2>error &&
-	test_must_be_empty error &&
-	git diff --cached >actual &&
-	grep "^+22" actual
+[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 -i replace_sub1_with_file
+not ok 23 - git_rebase_interactive: replace submodule with a file must fail # TODO known breakage
 
-Unstaged changes after reset:
-M	test
-diff --git a/test b/test
-index 0889435..cf86f12 100644
---- a/test
-+++ b/test
-@@ -1,6 +1,8 @@
- 10
-+11
- 20
- 30
- 40
- 50
-+51
- 60
-(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
-@@ -1,5 +1,6 @@
- 10
-+11
- 20
- 30
- 40
- 50
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,5 +3,6 @@
- 20
- 30
- 40
- 50
-+51
- 60
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-+22
-ok 55 - edit, adding lines to the first hunk
+checking known breakage of 3426.24 'git_rebase_interactive: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 -i replace_sub1_with_file
+not ok 24 - git_rebase_interactive: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 3701.56 'patch mode ignores unmerged entries': 
-	git reset --hard &&
-	test_commit conflict &&
-	test_commit non-conflict &&
-	git checkout -b side &&
-	test_commit side conflict.t &&
-	git checkout main &&
-	test_commit main conflict.t &&
-	test_must_fail git merge side &&
-	echo changed >non-conflict.t &&
-	echo y | git add -p >output &&
-	! grep a/conflict.t output &&
-	cat >expected <<-\EOF &&
-	* Unmerged path conflict.t
-	diff --git a/non-conflict.t b/non-conflict.t
-	index f766221..5ea2ed4 100644
-	--- a/non-conflict.t
-	+++ b/non-conflict.t
-	@@ -1 +1 @@
-	-non-conflict
-	+changed
-	EOF
-	git diff --cached >diff &&
-	diff_cmp expected diff
+expecting success of 3426.25 'git_rebase_interactive: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 25 - git_rebase_interactive: modified submodule does not update submodule work tree
 
-HEAD is now at 18d1e3e test
-[main 7573f98] conflict
+expecting success of 3426.26 'git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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(+)
- create mode 100644 conflict.t
-[main 8e66292] non-conflict
+[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 26 - git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 3426.27 'git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Switched to a new branch 'ours'
+[ours 8fb6209] add_x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 non-conflict.t
-Switched to a new branch 'side'
-[side a0a968f] side
+[ours 1145b44] Revert "add_x"
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-[main 095e8c6] main
+ 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.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 3426.28 'git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+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(+), 1 deletion(-)
-warning: refname 'side' is ambiguous.
-warning: refname 'side' is ambiguous.
-Auto-merging conflict.t
-CONFLICT (content): Merge conflict in conflict.t
-Automatic merge failed; fix conflicts and then commit the result.
-ok 56 - patch mode ignores unmerged entries
+ 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 28 - git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name
 
-expecting success of 3701.57 'index is refreshed after applying patch': 
-	git reset --hard &&
-	echo content >test &&
-	printf y | git add -p &&
-	git diff-files --exit-code
+expecting success of 3426.29 'rebase interactive ignores modified submodules': 
+	test_when_finished "rm -rf super sub" &&
+	git init sub &&
+	git -C sub commit --allow-empty -m "Initial commit" &&
+	git init super &&
+	git -c protocol.file.allow=always \
+		-C super submodule add ../sub &&
+	git -C super config submodule.sub.ignore dirty &&
+	>super/foo &&
+	git -C super add foo &&
+	git -C super commit -m "Initial commit" &&
+	test_commit -C super a &&
+	test_commit -C super b &&
+	test_commit -C super/sub c &&
+	set_fake_editor &&
+	git -C super rebase -i HEAD^^
 
-HEAD is now at 095e8c6 main
-diff --git a/test b/test
-index 0889435..d95f3ad 100644
---- a/test
-+++ b/test
-@@ -1,6 +1 @@
--10
--20
--30
--40
--50
--60
-+content
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 57 - index is refreshed after applying patch
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/sub/.git/
+[master (root-commit) b8cea33] Initial commit
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/super/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3426-rebase-submodule/super/sub'...
+done.
+[master (root-commit) f377606] Initial commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 foo
+ create mode 160000 sub
+[master 4e30919] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[master 41aa191] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[master a61c667] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Successfully rebased and updated refs/heads/master.
+ok 29 - rebase interactive ignores modified submodules
 
-expecting success of 3701.58 'diffs can be colorized': 
-	git reset --hard &&
+# still have 4 known breakage(s)
+# passed all remaining 25 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3902-quoted.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3902-quoted/.git/
+expecting success of 3902.1 'setup': 
 
-	echo content >test &&
-	printf y >y &&
-	force_color git add -p >output 2>&1 <y &&
-	git diff-files --exit-code &&
+	mkdir "$FN" &&
+	for_each_name "echo initial >\"\$name\"" &&
+	git add . &&
+	git commit -q -m Initial &&
 
-	# We do not want to depend on the exact coloring scheme
-	# git uses for diffs, so just check that we saw some kind of color.
-	grep "$(printf "\\033")" output
+	for_each_name "echo second >\"\$name\"" &&
+	git commit -a -m Second &&
 
-HEAD is now at 095e8c6 main
-diff --git a/test b/test
-index 0889435..d95f3ad 100644
---- a/test
-+++ b/test
-@@ -1,6 +1 @@
--10
--20
--30
--40
--50
--60
-+content
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 58 - diffs can be colorized
+	for_each_name "echo modified >\"\$name\""
 
-expecting success of 3701.59 'colors can be overridden': 
-	git reset --hard &&
-	test_when_finished "git rm -f color-test" &&
-	test_write_lines context old more-context >color-test &&
-	git add color-test &&
-	test_write_lines context new more-context another-one >color-test &&
 
-	echo trigger an error message >input &&
-	force_color git \
-		-c color.interactive.error=blue \
-		add -i 2>err.raw <input &&
-	test_decode_color <err.raw >err &&
-	grep "<BLUE>Huh (trigger)?<RESET>" err &&
+[master 6e4313d] Second
+ Author: A U Thor <author@example.com>
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+ok 1 - setup
 
-	test_write_lines help quit >input &&
-	force_color git \
-		-c color.interactive.header=red \
-		-c color.interactive.help=green \
-		-c color.interactive.prompt=yellow \
-		add -i >actual.raw <input &&
-	test_decode_color <actual.raw >actual &&
-	cat >expect <<-\EOF &&
-	<RED>           staged     unstaged path<RESET>
-	  1:        +3/-0        +2/-1 color-test
+expecting success of 3902.2 'setup expected files': 
+cat >expect.quoted <<\EOF &&
+Name
+"Name and a\nLF"
+"Name and an\tHT"
+"Name\""
+With SP in it
+"\346\277\261\351\207\216\t\347\264\224"
+"\346\277\261\351\207\216\n\347\264\224"
+"\346\277\261\351\207\216 \347\264\224"
+"\346\277\261\351\207\216\"\347\264\224"
+"\346\277\261\351\207\216/file"
+"\346\277\261\351\207\216\347\264\224"
+EOF
 
-	<RED>*** Commands ***<RESET>
-	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
-	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
-	<YELLOW>What now<RESET>> <GREEN>status        - show paths with changes<RESET>
-	<GREEN>update        - add working tree state to the staged set of changes<RESET>
-	<GREEN>revert        - revert staged set of changes back to the HEAD version<RESET>
-	<GREEN>patch         - pick hunks and update selectively<RESET>
-	<GREEN>diff          - view diff between HEAD and index<RESET>
-	<GREEN>add untracked - add contents of untracked files to the staged set of changes<RESET>
-	<RED>*** Commands ***<RESET>
-	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
-	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
-	<YELLOW>What now<RESET>> Bye.
-	EOF
-	test_cmp expect actual &&
+cat >expect.raw <<\EOF
+Name
+"Name and a\nLF"
+"Name and an\tHT"
+"Name\""
+With SP in it
+"濱野\t純"
+"濱野\n純"
+濱野 純
+"濱野\"純"
+濱野/file
+濱野純
+EOF
 
-	: exercise recolor_hunk by editing and then look at the hunk again &&
-	test_write_lines s e K q >input &&
-	force_color git \
-		-c color.interactive.prompt=yellow \
-		-c color.diff.meta=italic \
-		-c color.diff.frag=magenta \
-		-c color.diff.context=cyan \
-		-c color.diff.old=bold \
-		-c color.diff.new=blue \
-		-c core.editor=touch \
-		add -p >actual.raw <input &&
-	test_decode_color <actual.raw >actual.decoded &&
-	sed "s/index [0-9a-f]*\\.\\.[0-9a-f]* 100644/<INDEX-LINE>/" <actual.decoded >actual &&
-	cat >expect <<-\EOF &&
-	<ITALIC>diff --git a/color-test b/color-test<RESET>
-	<ITALIC><INDEX-LINE><RESET>
-	<ITALIC>--- a/color-test<RESET>
-	<ITALIC>+++ b/color-test<RESET>
-	<MAGENTA>@@ -1,3 +1,4 @@<RESET>
-	<CYAN> context<RESET>
-	<BOLD>-old<RESET>
-	<BLUE>+<RESET><BLUE>new<RESET>
-	<CYAN> more-context<RESET>
-	<BLUE>+<RESET><BLUE>another-one<RESET>
-	<YELLOW>(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? <RESET><BOLD>Split into 2 hunks.<RESET>
-	<MAGENTA>@@ -1,3 +1,3 @@<RESET>
-	<CYAN> context<RESET>
-	<BOLD>-old<RESET>
-	<BLUE>+<RESET><BLUE>new<RESET>
-	<CYAN> more-context<RESET>
-	<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET><MAGENTA>@@ -3 +3,2 @@<RESET>
-	<CYAN> more-context<RESET>
-	<BLUE>+<RESET><BLUE>another-one<RESET>
-	<YELLOW>(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? <RESET><MAGENTA>@@ -1,3 +1,3 @@<RESET>
-	<CYAN> context<RESET>
-	<BOLD>-old<RESET>
-	<BLUE>+new<RESET>
-	<CYAN> more-context<RESET>
-	<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>
-	EOF
-	test_cmp expect actual
+ok 2 - setup expected files
 
-HEAD is now at 095e8c6 main
-           staged     unstaged path
-  1:        +3/-0        +2/-1 color-test
+expecting success of 3902.3 'check fully quoted output from ls-files': 
 
-*** Commands ***
-  1: status	  2: update	  3: revert	  4: add untracked
-  5: patch	  6: diff	  7: quit	  8: help
-What now> *** Commands ***
-  1: status	  2: update	  3: revert	  4: add untracked
-  5: patch	  6: diff	  7: quit	  8: help
-What now> 
-Bye.
-<BLUE>Huh (trigger)?<RESET>
-rm 'color-test'
-ok 59 - colors can be overridden
+	git ls-files >current && test_cmp expect.quoted current
 
-expecting success of 3701.60 'brackets appear without color': 
-	git reset --hard &&
-	test_when_finished "git rm -f bracket-test" &&
-	test_write_lines context old more-context >bracket-test &&
-	git add bracket-test &&
-	test_write_lines context new more-context another-one >bracket-test &&
 
-	test_write_lines quit >input &&
-	git add -i >actual <input &&
+ok 3 - check fully quoted output from ls-files
 
-	sed "s/^|//" >expect <<-\EOF &&
-	|           staged     unstaged path
-	|  1:        +3/-0        +2/-1 bracket-test
-	|
-	|*** Commands ***
-	|  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-	|  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-	|What now> Bye.
-	EOF
+expecting success of 3902.4 'check fully quoted output from diff-files': 
 
-	test_cmp expect actual
+	git diff --name-only >current &&
+	test_cmp expect.quoted current
 
-HEAD is now at 095e8c6 main
-rm 'bracket-test'
-ok 60 - brackets appear without color
 
-expecting success of 3701.61 'colors can be skipped with color.ui=false': 
-	git reset --hard &&
-	test_when_finished "git rm -f color-test" &&
-	test_write_lines context old more-context >color-test &&
-	git add color-test &&
-	test_write_lines context new more-context another-one >color-test &&
+ok 4 - check fully quoted output from diff-files
 
-	test_write_lines help quit >input &&
-	force_color git \
-		-c color.ui=false \
-		add -i >actual.raw <input &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp actual.raw actual
+expecting success of 3902.5 'check fully quoted output from diff-index': 
 
-HEAD is now at 095e8c6 main
-rm 'color-test'
-ok 61 - colors can be skipped with color.ui=false
+	git diff --name-only HEAD >current &&
+	test_cmp expect.quoted current
 
-expecting success of 3701.62 'colorized diffs respect diff.wsErrorHighlight': 
-	git reset --hard &&
 
-	echo "old " >test &&
-	git add test &&
-	echo "new " >test &&
+ok 5 - check fully quoted output from diff-index
 
-	printf y >y &&
-	force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y &&
-	test_decode_color <output.raw >output &&
-	grep "old<" output
+expecting success of 3902.6 'check fully quoted output from diff-tree': 
 
-HEAD is now at 095e8c6 main
-<RED>-<RESET><RED>old<RESET><BRED> <RESET>
-ok 62 - colorized diffs respect diff.wsErrorHighlight
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.quoted current
 
-expecting success of 3701.63 'diffFilter filters diff': 
-	git reset --hard &&
 
-	echo content >test &&
-	test_config interactive.diffFilter "sed s/^/foo:/" &&
-	printf y >y &&
-	force_color git add -p >output 2>&1 <y &&
+ok 6 - check fully quoted output from diff-tree
 
-	# avoid depending on the exact coloring or content of the prompts,
-	# and just make sure we saw our diff prefixed
-	grep foo:.*content output
+expecting success of 3902.7 'check fully quoted output from ls-tree': 
 
-HEAD is now at 095e8c6 main
-foo:+content
-ok 63 - diffFilter filters diff
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.quoted current
 
-expecting success of 3701.64 'detect bogus diffFilter output': 
-	git reset --hard &&
 
-	echo content >test &&
-	test_config interactive.diffFilter "sed 6d" &&
-	printf y >y &&
-	force_color test_must_fail git add -p <y >output 2>&1 &&
-	grep "mismatched output" output
+ok 7 - check fully quoted output from ls-tree
 
-HEAD is now at 095e8c6 main
-error: mismatched output from interactive.diffFilter
-ok 64 - detect bogus diffFilter output
+expecting success of 3902.8 'setting core.quotepath': 
 
-expecting success of 3701.65 'handle iffy colored hunk headers': 
-	git reset --hard &&
+	git config --bool core.quotepath false
 
-	echo content >test &&
-	printf n >n &&
-	force_color git -c interactive.diffFilter="sed s/.*@@.*/XX/" \
-		add -p >output 2>&1 <n &&
-	grep "^XX$" output
 
-HEAD is now at 095e8c6 main
-XX
-ok 65 - handle iffy colored hunk headers
+ok 8 - setting core.quotepath
 
-expecting success of 3701.66 'handle very large filtered diff': 
-	git reset --hard &&
-	# The specific number here is not important, but it must
-	# be large enough that the output of "git diff --color"
-	# fills up the pipe buffer. 10,000 results in ~200k of
-	# colored output.
-	test_seq 10000 >test &&
-	test_config interactive.diffFilter cat &&
-	printf y >y &&
-	force_color git add -p >output 2>&1 <y &&
-	git diff-files --exit-code -- test
+expecting success of 3902.9 'check fully quoted output from ls-files': 
 
-HEAD is now at 095e8c6 main
-ok 66 - handle very large filtered diff
+	git ls-files >current && test_cmp expect.raw current
 
-expecting success of 3701.67 'diff.algorithm is passed to `git diff-files`': 
-	git reset --hard &&
 
-	>file &&
-	git add file &&
-	echo changed >file &&
-	test_must_fail git -c diff.algorithm=bogus add -p 2>err &&
-	test_grep "error: option diff-algorithm accepts " err
+ok 9 - check fully quoted output from ls-files
 
-HEAD is now at 095e8c6 main
-error: option diff-algorithm accepts "myers", "minimal", "patience" and "histogram"
-ok 67 - diff.algorithm is passed to `git diff-files`
+expecting success of 3902.10 'check fully quoted output from diff-files': 
 
-expecting success of 3701.68 'patch-mode via -i prompts for files': 
-	git reset --hard &&
+	git diff --name-only >current &&
+	test_cmp expect.raw current
 
-	echo one >file &&
-	echo two >test &&
-	git add -i <<-\EOF &&
-	patch
-	test
 
-	y
-	quit
-	EOF
+ok 10 - check fully quoted output from diff-files
 
-	echo test >expect &&
-	git diff --cached --name-only >actual &&
-	diff_cmp expect actual
+expecting success of 3902.11 'check fully quoted output from diff-index': 
 
-HEAD is now at 095e8c6 main
-           staged     unstaged path
-  1:    unchanged        +1/-2 file
-  2:    unchanged        +1/-6 test
+	git diff --name-only HEAD >current &&
+	test_cmp expect.raw current
 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:    unchanged        +1/-2 [f]ile
-  2:    unchanged        +1/-6 [t]est
-Patch update>>            staged     unstaged path
-  1:    unchanged        +1/-2 [f]ile
-* 2:    unchanged        +1/-6 [t]est
-Patch update>> diff --git a/test b/test
-index 0889435..f719efd 100644
---- a/test
-+++ b/test
-@@ -1,6 +1 @@
--10
--20
--30
--40
--50
--60
-+two
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> Bye.
-ok 68 - patch-mode via -i prompts for files
 
-expecting success of 3701.69 'add -p handles globs': 
-	git reset --hard &&
+ok 11 - check fully quoted output from diff-index
 
-	mkdir -p subdir &&
-	echo base >one.c &&
-	echo base >subdir/two.c &&
-	git add "*.c" &&
-	git commit -m base &&
+expecting success of 3902.12 'check fully quoted output from diff-tree': 
 
-	echo change >one.c &&
-	echo change >subdir/two.c &&
-	git add -p "*.c" <<-\EOF &&
-	y
-	y
-	EOF
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.raw current
 
-	cat >expect <<-\EOF &&
-	one.c
-	subdir/two.c
-	EOF
-	git diff --cached --name-only >actual &&
-	test_cmp expect actual
 
-HEAD is now at 095e8c6 main
-[main 5128550] base
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one.c
- create mode 100644 subdir/two.c
-diff --git a/one.c b/one.c
-index df967b9..0835e4f 100644
---- a/one.c
-+++ b/one.c
-@@ -1 +1 @@
--base
-+change
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-diff --git a/subdir/two.c b/subdir/two.c
-index df967b9..0835e4f 100644
---- a/subdir/two.c
-+++ b/subdir/two.c
-@@ -1 +1 @@
--base
-+change
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 69 - add -p handles globs
+ok 12 - check fully quoted output from diff-tree
 
-expecting success of 3701.70 'add -p handles relative paths': 
-	git reset --hard &&
+expecting success of 3902.13 'check fully quoted output from ls-tree': 
 
-	echo base >relpath.c &&
-	git add "*.c" &&
-	git commit -m relpath &&
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.raw current
 
-	echo change >relpath.c &&
-	mkdir -p subdir &&
-	git -C subdir add -p .. 2>error <<-\EOF &&
-	y
-	EOF
 
-	test_must_be_empty error &&
+ok 13 - check fully quoted output from ls-tree
 
-	cat >expect <<-\EOF &&
-	relpath.c
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3705-add-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3705-add-sparse-checkout/.git/
+expecting success of 3705.1 'setup': 
+	cat >sparse_error_header <<-EOF &&
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
 	EOF
-	git diff --cached --name-only >actual &&
-	test_cmp expect actual
-
-HEAD is now at 5128550 base
-[main cad2ca7] relpath
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 relpath.c
-diff --git a/relpath.c b/relpath.c
-index df967b9..0835e4f 100644
---- a/relpath.c
-+++ b/relpath.c
-@@ -1 +1 @@
--base
-+change
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 70 - add -p handles relative paths
 
-expecting success of 3701.71 'add -p does not expand argument lists': 
-	git reset --hard &&
+	cat >sparse_hint <<-EOF &&
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
+	hint: Disable this message with "git config set advice.updateSparsePath false"
+	EOF
 
-	echo content >not-changed &&
-	git add not-changed &&
-	git commit -m "add not-changed file" &&
+	echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&
+	cat sparse_entry_error sparse_hint >error_and_hint
 
-	echo change >file &&
-	GIT_TRACE=$(pwd)/trace.out git add -p . <<-\EOF &&
-	y
-	EOF
+ok 1 - setup
 
-	# we know that "file" must be mentioned since we actually
-	# update it, but we want to be sure that our "." pathspec
-	# was not expanded into the argument list of any command.
-	# So look only for "not-changed".
-	! grep -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
+expecting success of 3705.2 'git add does not remove sparse entries': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	test_must_fail git add sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
 
-HEAD is now at cad2ca7 relpath
-[main 86e6db4] add not-changed file
+[master (root-commit) c0e866f] ensure sparse_entry exists at HEAD
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 not-changed
-diff --git a/file b/file
-index b6f2c08..0835e4f 100755
---- a/file
-+++ b/file
-@@ -1,2 +1 @@
--baseline
--content
-+change
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 71 - add -p does not expand argument lists
-
-expecting success of 3701.72 'hunk-editing handles custom comment char': 
-	git reset --hard &&
-	echo change >>file &&
-	test_config core.commentChar "\$" &&
-	echo e | GIT_EDITOR=true git add -p &&
-	git diff --exit-code
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sparse_entry
+ok 2 - git add does not remove sparse entries
 
-HEAD is now at 86e6db4 add not-changed file
-diff --git a/file b/file
-index b6f2c08..59630e0 100755
---- a/file
-+++ b/file
-@@ -1,2 +1,3 @@
- baseline
- content
-+change
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 72 - hunk-editing handles custom comment char
+expecting success of 3705.3 'git add -A does not remove sparse entries': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	setup_gitignore &&
+	git add -A 2>stderr &&
+	test_must_be_empty stderr &&
+	test_sparse_entry_unchanged
 
-expecting success of 3701.73 'add -p works even with color.ui=always': 
-	git reset --hard &&
-	echo change >>file &&
-	test_config color.ui always &&
-	echo y | git add -p &&
-	echo file >expect &&
-	git diff --cached --name-only >actual &&
-	test_cmp expect actual
+[master 5de8edd] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 3 - git add -A does not remove sparse entries
 
-HEAD is now at 86e6db4 add not-changed file
-diff --git a/file b/file
-index b6f2c08..59630e0 100755
---- a/file
-+++ b/file
-@@ -1,2 +1,3 @@
- baseline
- content
-+change
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-ok 73 - add -p works even with color.ui=always
+expecting success of 3705.4 'git add . does not remove sparse entries': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	setup_gitignore &&
+	test_must_fail git add . 2>stderr &&
+	test_sparse_entry_unstaged &&
 
-expecting success of 3701.74 'setup different kinds of dirty submodules': 
-	test_create_repo for-submodules &&
-	(
-		cd for-submodules &&
-		test_commit initial &&
-		test_create_repo dirty-head &&
-		(
-			cd dirty-head &&
-			test_commit initial
-		) &&
-		cp -R dirty-head dirty-otherwise &&
-		cp -R dirty-head dirty-both-ways &&
-		git add dirty-head &&
-		git add dirty-otherwise dirty-both-ways &&
-		git commit -m initial &&
+	cat sparse_error_header >expect &&
+	echo . >>expect &&
+	cat sparse_hint >>expect &&
 
-		cd dirty-head &&
-		test_commit updated &&
-		cd ../dirty-both-ways &&
-		test_commit updated &&
-		echo dirty >>initial &&
-		: >untracked &&
-		cd ../dirty-otherwise &&
-		echo dirty >>initial &&
-		: >untracked
-	) &&
-	git -C for-submodules diff-files --name-only >actual &&
-	cat >expected <<-\EOF &&
-	dirty-both-ways
-	dirty-head
-	EOF
-	test_cmp expected actual &&
-	git -C for-submodules diff-files --name-only --ignore-submodules=none >actual &&
-	cat >expected <<-\EOF &&
-	dirty-both-ways
-	dirty-head
-	dirty-otherwise
-	EOF
-	test_cmp expected actual &&
-	git -C for-submodules diff-files --name-only --ignore-submodules=dirty >actual &&
-	cat >expected <<-\EOF &&
-	dirty-both-ways
-	dirty-head
-	EOF
-	test_cmp expected actual
+	test_cmp expect stderr &&
+	test_sparse_entry_unchanged
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/for-submodules/.git/
-[main (root-commit) 31243c6] 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.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/for-submodules/dirty-head/.git/
-[main (root-commit) 167ffd6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-warning: adding embedded git repository: dirty-head
-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> dirty-head
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached dirty-head
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-warning: adding embedded git repository: dirty-both-ways
-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> dirty-both-ways
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached dirty-both-ways
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-warning: adding embedded git repository: dirty-otherwise
-[main 6489f21] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 160000 dirty-both-ways
- create mode 160000 dirty-head
- create mode 160000 dirty-otherwise
-[main f10ac08] updated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 updated.t
-[main f86bdf4] updated
+[master e79cbb6] ensure sparse_entry exists at HEAD
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 updated.t
-ok 74 - setup different kinds of dirty submodules
-
-expecting success of 3701.75 'status ignores dirty submodules (except HEAD)': 
-	git -C for-submodules add -i </dev/null >output &&
-	grep dirty-head output &&
-	grep dirty-both-ways output &&
-	! grep dirty-otherwise output
+ok 4 - git add . does not remove sparse entries
 
-  2:    unchanged        +1/-1 dirty-head
-  1:    unchanged        +1/-1 dirty-both-ways
-ok 75 - status ignores dirty submodules (except HEAD)
+expecting success of 3705.5 'git add does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 52a8d7c] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 5 - git add does not update sparse entries
 
-expecting success of 3701.76 'handle submodules': 
-	echo 123 >>for-submodules/dirty-otherwise/initial.t &&
+expecting success of 3705.6 'git add -f does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 6e383d3] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 6 - git add -f does not update sparse entries
 
-	force_color git -C for-submodules add -p dirty-otherwise >output 2>&1 &&
-	grep "No changes" output &&
+expecting success of 3705.7 'git add -u does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master bb85fed] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 7 - git add -u does not update sparse entries
 
-	force_color git -C for-submodules add -p dirty-head >output 2>&1 <y &&
-	git -C for-submodules ls-files --stage dirty-head >actual &&
-	rev="$(git -C for-submodules/dirty-head rev-parse HEAD)" &&
-	grep "$rev" actual
+expecting success of 3705.8 'git add --ignore-removal does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 2bced02] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 8 - git add --ignore-removal does not update sparse entries
 
-No changes.
-160000 f10ac08dbe6eaf5e88125c402669e6f9b7076181 0	dirty-head
-ok 76 - handle submodules
+expecting success of 3705.9 'git add --dry-run does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 1fb2ac0] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 9 - git add --dry-run does not update sparse entries
 
-expecting success of 3701.77 'set up pathological context': 
-	git reset --hard &&
-	test_write_lines a a a a a a a a a a a >a &&
-	git add a &&
-	git commit -m a &&
-	test_write_lines c b a a a a a a a b a a a a >a &&
-	test_write_lines     a a a a a a a b a a a a >expected-1 &&
-	test_write_lines   b a a a a a a a b a a a a >expected-2 &&
-	# check editing can cope with missing header and deleted context lines
-	# as well as changes to other lines
-	test_write_lines +b " a" >patch
+expecting success of 3705.10 'git add --refresh does not update sparse entries': 
+	setup_sparse_entry &&
+	git ls-files --debug sparse_entry | grep mtime >before &&
+	test-tool chmtime -60 sparse_entry &&
+	test_must_fail git add --refresh sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	git ls-files --debug sparse_entry | grep mtime >after &&
+	test_cmp before after
 
-HEAD is now at 86e6db4 add not-changed file
-[main 9e98a5e] a
+[master b9f487e] ensure sparse_entry exists at HEAD
  Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 a
-ok 77 - set up pathological context
+ok 10 - git add --refresh does not update sparse entries
 
-expecting success of 3701.78 'add -p works with pathological context lines': 
-	git reset &&
-	printf "%s\n" n y |
-	git add -p &&
-	git cat-file blob :a >actual &&
-	test_cmp expected-1 actual
+expecting success of 3705.11 'git add --chmod does not update sparse entries': 
+	setup_sparse_entry &&
+	test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged &&
+	! test -x sparse_entry
 
-Unstaged changes after reset:
-M	a
-diff --git a/a b/a
-index f04e1e1..f39a0f0 100644
---- a/a
-+++ b/a
-@@ -1,3 +1,5 @@
-+c
-+b
- a
- a
- a
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -5,6 +7,7 @@ a
- a
- a
- a
-+b
- a
- a
- a
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-ok 78 - add -p works with pathological context lines
+[master 46b5fb2] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 11 - git add --chmod does not update sparse entries
 
-expecting success of 3701.79 'add -p patch editing works with pathological context lines': 
-	git reset &&
-	# n q q below is in case edit fails
-	printf "%s\n" e y    n q q |
-	git add -p &&
-	git cat-file blob :a >actual &&
-	test_cmp expected-2 actual
+expecting success of 3705.12 'git add --renormalize does not update sparse entries': 
+	test_when_finished rm .gitattributes &&
+	test_config core.autocrlf false &&
+	setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
+	echo "sparse_entry text=auto" >.gitattributes &&
+	test_must_fail git add --renormalize sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
 
-Unstaged changes after reset:
-M	a
-diff --git a/a b/a
-index f04e1e1..f39a0f0 100644
---- a/a
-+++ b/a
-@@ -1,3 +1,5 @@
-+c
-+b
- a
- a
- a
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -5,6 +7,7 @@ a
- a
- a
- a
-+b
- a
- a
- a
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-ok 79 - add -p patch editing works with pathological context lines
+[master 18a544d] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 12 - git add --renormalize does not update sparse entries
 
-expecting success of 3701.80 'checkout -p works with pathological context lines': 
-	test_write_lines a a a a a a >a &&
-	git add a &&
-	test_write_lines a b a b a b a b a b a >a &&
-	test_write_lines s n n y q | git checkout -p &&
-	test_write_lines a b a b a a b a b a >expect &&
-	test_cmp expect a
+expecting success of 3705.13 'git add --dry-run --ignore-missing warn on sparse path': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
 
-diff --git a/a b/a
-index 786e4a7..477d4da 100644
---- a/a
-+++ b/a
-@@ -1,6 +1,11 @@
- a
-+b
- a
-+b
- a
-+b
- a
-+b
- a
-+b
- a
-(1/1) Discard this hunk from worktree [y,n,q,a,d,s,e,p,?]? Split into 5 hunks.
-@@ -1,2 +1,3 @@
- a
-+b
- a
-(1/5) Discard this hunk from worktree [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,2 +3,3 @@
- a
-+b
- a
-(2/5) Discard this hunk from worktree [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -3,2 +5,3 @@
- a
-+b
- a
-(3/5) Discard this hunk from worktree [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -4,2 +7,3 @@
- a
-+b
- a
-(4/5) Discard this hunk from worktree [y,n,q,a,d,K,j,J,g,/,e,p,?]? 
-ok 80 - checkout -p works with pathological context lines
+[master c192c51] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ok 13 - git add --dry-run --ignore-missing warn on sparse path
 
-expecting success of 3701.81 'add -N followed by add -p patch editing': 
-	git reset --hard &&
-	(
-		setup_new_file &&
-		git add -N new-file &&
-		test_write_lines e n q | git add -p &&
-		git cat-file blob :new-file >actual &&
-		test_cmp new-file-expect actual &&
-		test_cmp patch-expect patch
-	)
+expecting success of 3705.14 'do not advice about sparse entries when they do not match the pathspec': 
+	setup_sparse_entry &&
+	test_must_fail git add nonexistent 2>stderr &&
+	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
+	! grep -F -f sparse_error_header stderr
 
-HEAD is now at 9e98a5e a
-diff --git a/new-file b/new-file
-new file mode 100644
-index 0000000..0fdf397
---- /dev/null
-+++ b/new-file
-@@ -0,0 +1,6 @@
-+a
-+b
-+c
-+d
-+e
-+f
-(1/1) Stage addition [y,n,q,a,d,e,p,?]? 
-ok 81 - add -N followed by add -p patch editing
+[master f9f36a2] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+fatal: pathspec 'nonexistent' did not match any files
+ok 14 - do not advice about sparse entries when they do not match the pathspec
 
-expecting success of 3701.82 'checkout -p patch editing of added file': 
-	git reset --hard &&
-	(
-		setup_new_file &&
-		git add new-file &&
-		git commit -m "add new file" &&
-		git rm new-file &&
-		git commit -m "remove new file" &&
-		test_write_lines e n q | git checkout -p HEAD^ &&
-		test_cmp new-file-expect new-file &&
-		test_cmp patch-expect patch
-	)
+expecting success of 3705.15 'do not warn when pathspec matches dense entries': 
+	setup_sparse_entry &&
+	echo modified >sparse_entry &&
+	>dense_entry &&
+	git add "*_entry" 2>stderr &&
+	test_must_be_empty stderr &&
+	test_sparse_entry_unchanged &&
+	git ls-files --error-unmatch dense_entry
 
-HEAD is now at 9e98a5e a
-[main 58d499b] add new file
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+)
- create mode 100644 new-file
-rm 'new-file'
-[main 4a33265] remove new file
+[master 8db759d] ensure sparse_entry exists at HEAD
  Author: A U Thor <author@example.com>
- 1 file changed, 6 deletions(-)
- delete mode 100644 new-file
-diff --git b/new-file a/new-file
-new file mode 100644
-index 0000000..0fdf397
---- /dev/null
-+++ a/new-file
-@@ -0,0 +1,6 @@
-+a
-+b
-+c
-+d
-+e
-+f
-(1/1) Apply addition to index and worktree [y,n,q,a,d,e,p,?]? 
-ok 82 - checkout -p patch editing of added file
-
-expecting success of 3701.83 'show help from add--helper': 
-	git reset --hard &&
-	cat >expect <<-EOF &&
+dense_entry
+ok 15 - do not warn when pathspec matches dense entries
 
-	<BOLD>*** Commands ***<RESET>
-	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
-	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
-	<BOLD;BLUE>What now<RESET>> <BOLD;RED>status        - show paths with changes<RESET>
-	<BOLD;RED>update        - add working tree state to the staged set of changes<RESET>
-	<BOLD;RED>revert        - revert staged set of changes back to the HEAD version<RESET>
-	<BOLD;RED>patch         - pick hunks and update selectively<RESET>
-	<BOLD;RED>diff          - view diff between HEAD and index<RESET>
-	<BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET>
-	<BOLD>*** Commands ***<RESET>
-	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
-	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
-	<BOLD;BLUE>What now<RESET>>$SP
-	Bye.
-	EOF
-	test_write_lines h | force_color git add -i >actual.colored &&
-	test_decode_color <actual.colored >actual &&
-	test_cmp expect actual
+expecting success of 3705.16 'git add fails outside of sparse-checkout definition': 
+	test_when_finished git sparse-checkout disable &&
+	test_commit a &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a &&
+	echo >>sparse_entry &&
 
-HEAD is now at 4a33265 remove new file
-ok 83 - show help from add--helper
+	git update-index --no-skip-worktree sparse_entry &&
+	test_must_fail git add sparse_entry &&
+	test_sparse_entry_unstaged &&
 
-expecting success of 3701.84 'reset -p with unmerged files': 
-	test_when_finished "git checkout --force main" &&
-	test_commit one conflict &&
-	git checkout -B side HEAD^ &&
-	test_commit two conflict &&
-	test_must_fail git merge one &&
+	test_must_fail git add --chmod=+x sparse_entry &&
+	test_sparse_entry_unstaged &&
 
-	# this is a noop with only an unmerged entry
-	git reset -p &&
+	test_must_fail git add --renormalize sparse_entry &&
+	test_sparse_entry_unstaged &&
 
-	# add files that sort before and after unmerged entry
-	echo a >a &&
-	echo z >z &&
-	git add a z &&
+	# Avoid munging CRLFs to avoid an error message
+	git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --stage >actual &&
+	grep "^100644 .*sparse_entry\$" actual &&
 
-	# confirm that we can reset those files
-	printf "%s\n" y y | git reset -p &&
-	git diff-index --cached --diff-filter=u HEAD >staged &&
-	test_must_be_empty staged
+	git add --sparse --chmod=+x sparse_entry 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --stage >actual &&
+	grep "^100755 .*sparse_entry\$" actual &&
 
-[main 4d874b0] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Switched to and reset branch 'side'
-[side 136cab8] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Auto-merging conflict
-CONFLICT (add/add): Merge conflict in conflict
-Automatic merge failed; fix conflicts and then commit the result.
-diff --git a/a b/a
-index f04e1e1..7898192 100644
---- a/a
-+++ b/a
-@@ -1,11 +1 @@
- a
--a
--a
--a
--a
--a
--a
--a
--a
--a
--a
-(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? conflict: needs merge
+	git reset &&
 
-diff --git a/z b/z
-new file mode 100644
-index 0000000..b680253
---- /dev/null
-+++ b/z
-@@ -0,0 +1 @@
-+z
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? conflict: needs merge
+	# This will print a message over stderr on Windows.
+	git add --sparse --renormalize sparse_entry &&
+	git status --porcelain >actual &&
+	grep "^M  sparse_entry\$" actual
 
-warning: refname 'main' is ambiguous.
-Switched to branch 'main'
-ok 84 - reset -p with unmerged files
+[master 2be48a2] a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 a.t
+ create mode 100644 dense_entry
+warning: The following paths were already present and thus not updated despite sparse patterns:
+	sparse_entry
 
-expecting success of 3701.85 'hunk splitting works with diff.suppressBlankEmpty': 
-	test_config diff.suppressBlankEmpty true &&
-	write_script fake-editor.sh <<-\EOF &&
-	tr F G <"$1" >"$1.tmp" &&
-	mv "$1.tmp" "$1"
-	EOF
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+warning: The following paths are not up to date and were left despite sparse patterns:
+	sparse_entry
 
-	test_write_lines a b "" c d  "" e f "" >file &&
-	git add file &&
-	test_write_lines A b "" c D  "" e F "" >file &&
-	(
-		test_set_editor "$(pwd)/fake-editor.sh" &&
-		test_write_lines s n y e q | git add -p file
-	) &&
-	git cat-file blob :file >actual &&
-	test_write_lines a b "" c D "" e G "" >expect &&
-	test_cmp expect actual
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+100644 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
+100755 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
+Unstaged changes after reset:
+M	sparse_entry
+M  sparse_entry
+ok 16 - git add fails outside of sparse-checkout definition
 
-diff --git a/file b/file
-index 5a2a9ed..6a48777 100755
---- a/file
-+++ b/file
-@@ -1,9 +1,9 @@
--a
-+A
- b
+expecting success of 3705.17 'add obeys advice.updateSparsePath': 
+	setup_sparse_entry &&
+	test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp sparse_entry_error stderr
 
- c
--d
-+D
 
- e
--f
-+F
+[master 91ae5df] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 17 - add obeys advice.updateSparsePath
 
-(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 3 hunks.
-@@ -1,4 +1,4 @@
--a
-+A
- b
+expecting success of 3705.18 'add allows sparse entries with --sparse': 
+	git sparse-checkout set --no-cone a &&
+	echo modified >sparse_entry &&
+	test_must_fail git add sparse_entry &&
+	test_sparse_entry_unchanged &&
+	git add --sparse sparse_entry 2>stderr &&
+	test_must_be_empty stderr
 
- c
-(1/3) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,6 +2,6 @@
- b
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+ok 18 - add allows sparse entries with --sparse
 
- c
--d
-+D
+expecting success of 3705.19 'can add files from non-sparse dir': 
+	git sparse-checkout set w !/x y/ &&
+	mkdir -p w x/y &&
+	touch w/f x/y/f &&
+	git add w/f x/y/f 2>stderr &&
+	test_must_be_empty stderr
 
- e
-(2/3) Stage this hunk [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -6,4 +6,4 @@
+ok 19 - can add files from non-sparse dir
 
- e
--f
-+F
+expecting success of 3705.20 'refuse to add non-skip-worktree file from sparse dir': 
+	git sparse-checkout set !/x y/ !x/y/z &&
+	mkdir -p x/y/z &&
+	touch x/y/z/f &&
+	test_must_fail git add x/y/z/f 2>stderr &&
+	echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
 
-(3/3) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-ok 85 - hunk splitting works with diff.suppressBlankEmpty
+ok 20 - refuse to add non-skip-worktree file from sparse dir
 
-# passed all 85 test(s)
-1..85
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3070-wildmatch.sh ***
@@ -211455,33 +206057,2627 @@
 expecting success of 3070.1399 'ipathmatch: no match '4' '[\1-\3]'': 
 			test_must_fail test-tool wildmatch ipathmatch '4' '[\1-\3]'
 		
-ok 1399 - ipathmatch: no match '4' '[\1-\3]'
+ok 1399 - ipathmatch: no match '4' '[\1-\3]'
+
+expecting success of 3070.1400 'ipathmatch (via ls-files): no match '[\1-\3]' '4'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1400 - ipathmatch (via ls-files): no match '[\1-\3]' '4'
+
+expecting success of 3070.1401 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 4
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1401 - cleanup after previous file test
+
+expecting success of 3070.1402 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1402 - setup match file test for \
+
+expecting success of 3070.1403 'wildmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch wildmatch '\' '[[-\]]'
+		
+ok 1403 - wildmatch: match '\' '[[-\]]'
+
+expecting success of 3070.1404 'wildmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1404 - wildmatch (via ls-files): match '[[-\]]' '\'
+
+expecting success of 3070.1405 'iwildmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch iwildmatch '\' '[[-\]]'
+		
+ok 1405 - iwildmatch: match '\' '[[-\]]'
+
+expecting success of 3070.1406 'iwildmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1406 - iwildmatch (via ls-files): match '[[-\]]' '\'
+
+expecting success of 3070.1407 'pathmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch pathmatch '\' '[[-\]]'
+		
+ok 1407 - pathmatch: match '\' '[[-\]]'
+
+expecting success of 3070.1408 'pathmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1408 - pathmatch (via ls-files): match '[[-\]]' '\'
+
+expecting success of 3070.1409 'ipathmatch: match '\' '[[-\]]'': 
+			test-tool wildmatch ipathmatch '\' '[[-\]]'
+		
+ok 1409 - ipathmatch: match '\' '[[-\]]'
+
+expecting success of 3070.1410 'ipathmatch (via ls-files): match '[[-\]]' '\'': 
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1410 - ipathmatch (via ls-files): match '[[-\]]' '\'
+
+expecting success of 3070.1411 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1411 - cleanup after previous file test
+
+expecting success of 3070.1412 'setup match file test for [': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1412 - setup match file test for [
+
+expecting success of 3070.1413 'wildmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch wildmatch '[' '[[-\]]'
+		
+ok 1413 - wildmatch: match '[' '[[-\]]'
+
+expecting success of 3070.1414 'wildmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1414 - wildmatch (via ls-files): match '[[-\]]' '['
+
+expecting success of 3070.1415 'iwildmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch iwildmatch '[' '[[-\]]'
+		
+ok 1415 - iwildmatch: match '[' '[[-\]]'
+
+expecting success of 3070.1416 'iwildmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1416 - iwildmatch (via ls-files): match '[[-\]]' '['
+
+expecting success of 3070.1417 'pathmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch pathmatch '[' '[[-\]]'
+		
+ok 1417 - pathmatch: match '[' '[[-\]]'
+
+expecting success of 3070.1418 'pathmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1418 - pathmatch (via ls-files): match '[[-\]]' '['
+
+expecting success of 3070.1419 'ipathmatch: match '[' '[[-\]]'': 
+			test-tool wildmatch ipathmatch '[' '[[-\]]'
+		
+ok 1419 - ipathmatch: match '[' '[[-\]]'
+
+expecting success of 3070.1420 'ipathmatch (via ls-files): match '[[-\]]' '['': 
+				printf '%s' '[' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1420 - ipathmatch (via ls-files): match '[[-\]]' '['
+
+expecting success of 3070.1421 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1421 - cleanup after previous file test
+
+expecting success of 3070.1422 'setup match file test for ]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1422 - setup match file test for ]
+
+expecting success of 3070.1423 'wildmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch wildmatch ']' '[[-\]]'
+		
+ok 1423 - wildmatch: match ']' '[[-\]]'
+
+expecting success of 3070.1424 'wildmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1424 - wildmatch (via ls-files): match '[[-\]]' ']'
+
+expecting success of 3070.1425 'iwildmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch iwildmatch ']' '[[-\]]'
+		
+ok 1425 - iwildmatch: match ']' '[[-\]]'
+
+expecting success of 3070.1426 'iwildmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1426 - iwildmatch (via ls-files): match '[[-\]]' ']'
+
+expecting success of 3070.1427 'pathmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch pathmatch ']' '[[-\]]'
+		
+ok 1427 - pathmatch: match ']' '[[-\]]'
+
+expecting success of 3070.1428 'pathmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1428 - pathmatch (via ls-files): match '[[-\]]' ']'
+
+expecting success of 3070.1429 'ipathmatch: match ']' '[[-\]]'': 
+			test-tool wildmatch ipathmatch ']' '[[-\]]'
+		
+ok 1429 - ipathmatch: match ']' '[[-\]]'
+
+expecting success of 3070.1430 'ipathmatch (via ls-files): match '[[-\]]' ']'': 
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1430 - ipathmatch (via ls-files): match '[[-\]]' ']'
+
+expecting success of 3070.1431 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1431 - cleanup after previous file test
+
+expecting success of 3070.1432 'setup match file test for -': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1432 - setup match file test for -
+
+expecting success of 3070.1433 'wildmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch wildmatch '-' '[[-\]]'
+		
+ok 1433 - wildmatch: no match '-' '[[-\]]'
+
+expecting success of 3070.1434 'wildmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1434 - wildmatch (via ls-files): no match '[[-\]]' '-'
+
+expecting success of 3070.1435 'iwildmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch iwildmatch '-' '[[-\]]'
+		
+ok 1435 - iwildmatch: no match '-' '[[-\]]'
+
+expecting success of 3070.1436 'iwildmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1436 - iwildmatch (via ls-files): no match '[[-\]]' '-'
+
+expecting success of 3070.1437 'pathmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch pathmatch '-' '[[-\]]'
+		
+ok 1437 - pathmatch: no match '-' '[[-\]]'
+
+expecting success of 3070.1438 'pathmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1438 - pathmatch (via ls-files): no match '[[-\]]' '-'
+
+expecting success of 3070.1439 'ipathmatch: no match '-' '[[-\]]'': 
+			test_must_fail test-tool wildmatch ipathmatch '-' '[[-\]]'
+		
+ok 1439 - ipathmatch: no match '-' '[[-\]]'
+
+expecting success of 3070.1440 'ipathmatch (via ls-files): no match '[[-\]]' '-'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1440 - ipathmatch (via ls-files): no match '[[-\]]' '-'
+
+expecting success of 3070.1441 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1441 - cleanup after previous file test
+
+expecting success of 3070.1442 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1442 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+
+expecting success of 3070.1443 'wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1443 - wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1444 'wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1444 - wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+
+expecting success of 3070.1445 'iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1445 - iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1446 'iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1446 - iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+
+expecting success of 3070.1447 'pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1447 - pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1448 'pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1448 - pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+
+expecting success of 3070.1449 'ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1449 - ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1450 'ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1450 - ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+
+expecting success of 3070.1451 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1451 - cleanup after previous file test
+
+expecting success of 3070.1452 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1452 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
+
+expecting success of 3070.1453 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1453 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1454 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1454 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+
+expecting success of 3070.1455 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1455 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1456 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1456 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+
+expecting success of 3070.1457 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1457 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1458 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1458 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+
+expecting success of 3070.1459 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1459 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1460 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1460 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+
+expecting success of 3070.1461 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1461 - cleanup after previous file test
+
+expecting success of 3070.1462 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1462 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1
+
+expecting success of 3070.1463 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1463 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1464 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1464 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+
+expecting success of 3070.1465 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1465 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1466 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1466 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+
+expecting success of 3070.1467 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1467 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1468 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1468 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+
+expecting success of 3070.1469 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
+			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1469 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+
+expecting success of 3070.1470 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1470 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+
+expecting success of 3070.1471 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -adobe-courier-bold-o-normal--12-120-75-75-/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1471 - cleanup after previous file test
+
+expecting success of 3070.1472 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1472 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1
+
+expecting success of 3070.1473 'wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1473 - wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1474 'wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1474 - wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1475 'iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1475 - iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1476 'iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1476 - iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1477 'pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1477 - pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1478 'pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1478 - pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1479 'ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1479 - ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1480 'ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
+not ok 1480 - ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1481 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 1481 - cleanup after previous file test
+
+expecting success of 3070.1482 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1482 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1
+
+expecting success of 3070.1483 'wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1483 - wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1484 'wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1484 - wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1485 'iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1485 - iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1486 'iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1486 - iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1487 'pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1487 - pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1488 'pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1488 - pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1489 'ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1489 - ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+
+checking known breakage of 3070.1490 'ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
+not ok 1490 - ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+
+expecting success of 3070.1491 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 1491 - cleanup after previous file test
+
+expecting success of 3070.1492 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1492 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt
+
+expecting success of 3070.1493 'wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1493 - wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+
+expecting success of 3070.1494 'wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1494 - wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+
+expecting success of 3070.1495 'iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1495 - iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+
+expecting success of 3070.1496 'iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1496 - iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+
+expecting success of 3070.1497 'pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1497 - pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+
+expecting success of 3070.1498 'pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1498 - pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+
+expecting success of 3070.1499 'ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
+			test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1499 - ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+
+expecting success of 3070.1500 'ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1500 - ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+
+expecting success of 3070.1501 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing abcd/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1501 - cleanup after previous file test
+
+expecting success of 3070.1502 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1502 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz
+
+expecting success of 3070.1503 'wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1503 - wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+
+expecting success of 3070.1504 'wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1504 - wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+
+expecting success of 3070.1505 'iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1505 - iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+
+expecting success of 3070.1506 'iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1506 - iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+
+expecting success of 3070.1507 'pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1507 - pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+
+expecting success of 3070.1508 'pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1508 - pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+
+expecting success of 3070.1509 'ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
+			test_must_fail test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1509 - ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+
+expecting success of 3070.1510 'ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1510 - ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+
+expecting success of 3070.1511 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing abcd/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1511 - cleanup after previous file test
+
+expecting success of 3070.1512 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1512 - setup match file test for foo
+
+expecting success of 3070.1513 'wildmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '*/*/*'
+		
+ok 1513 - wildmatch: no match 'foo' '*/*/*'
+
+expecting success of 3070.1514 'wildmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1514 - wildmatch (via ls-files): no match '*/*/*' 'foo'
+
+expecting success of 3070.1515 'iwildmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '*/*/*'
+		
+ok 1515 - iwildmatch: no match 'foo' '*/*/*'
+
+expecting success of 3070.1516 'iwildmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1516 - iwildmatch (via ls-files): no match '*/*/*' 'foo'
+
+expecting success of 3070.1517 'pathmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '*/*/*'
+		
+ok 1517 - pathmatch: no match 'foo' '*/*/*'
+
+expecting success of 3070.1518 'pathmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1518 - pathmatch (via ls-files): no match '*/*/*' 'foo'
+
+expecting success of 3070.1519 'ipathmatch: no match 'foo' '*/*/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '*/*/*'
+		
+ok 1519 - ipathmatch: no match 'foo' '*/*/*'
+
+expecting success of 3070.1520 'ipathmatch (via ls-files): no match '*/*/*' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1520 - ipathmatch (via ls-files): no match '*/*/*' 'foo'
+
+expecting success of 3070.1521 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 1521 - cleanup after previous file test
+
+expecting success of 3070.1522 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1522 - setup match file test for foo/bar
+
+expecting success of 3070.1523 'wildmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' '*/*/*'
+		
+ok 1523 - wildmatch: no match 'foo/bar' '*/*/*'
+
+expecting success of 3070.1524 'wildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1524 - wildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+
+expecting success of 3070.1525 'iwildmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' '*/*/*'
+		
+ok 1525 - iwildmatch: no match 'foo/bar' '*/*/*'
+
+expecting success of 3070.1526 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1526 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+
+expecting success of 3070.1527 'pathmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' '*/*/*'
+		
+ok 1527 - pathmatch: no match 'foo/bar' '*/*/*'
+
+expecting success of 3070.1528 'pathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1528 - pathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+
+expecting success of 3070.1529 'ipathmatch: no match 'foo/bar' '*/*/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' '*/*/*'
+		
+ok 1529 - ipathmatch: no match 'foo/bar' '*/*/*'
+
+expecting success of 3070.1530 'ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1530 - ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+
+expecting success of 3070.1531 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1531 - cleanup after previous file test
+
+expecting success of 3070.1532 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1532 - setup match file test for foo/bba/arr
+
+expecting success of 3070.1533 'wildmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch wildmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1533 - wildmatch: match 'foo/bba/arr' '*/*/*'
+
+expecting success of 3070.1534 'wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1534 - wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+
+expecting success of 3070.1535 'iwildmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch iwildmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1535 - iwildmatch: match 'foo/bba/arr' '*/*/*'
+
+expecting success of 3070.1536 'iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1536 - iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+
+expecting success of 3070.1537 'pathmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1537 - pathmatch: match 'foo/bba/arr' '*/*/*'
+
+expecting success of 3070.1538 'pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1538 - pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+
+expecting success of 3070.1539 'ipathmatch: match 'foo/bba/arr' '*/*/*'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1539 - ipathmatch: match 'foo/bba/arr' '*/*/*'
+
+expecting success of 3070.1540 'ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1540 - ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+
+expecting success of 3070.1541 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1541 - cleanup after previous file test
+
+expecting success of 3070.1542 'setup match file test for foo/bb/aa/rr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1542 - setup match file test for foo/bb/aa/rr
+
+expecting success of 3070.1543 'wildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1543 - wildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+
+expecting success of 3070.1544 'wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1544 - wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+
+expecting success of 3070.1545 'iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1545 - iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+
+expecting success of 3070.1546 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1546 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+
+expecting success of 3070.1547 'pathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
+			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1547 - pathmatch: match 'foo/bb/aa/rr' '*/*/*'
+
+expecting success of 3070.1548 'pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1548 - pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+
+expecting success of 3070.1549 'ipathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
+			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1549 - ipathmatch: match 'foo/bb/aa/rr' '*/*/*'
+
+expecting success of 3070.1550 'ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1550 - ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+
+expecting success of 3070.1551 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1551 - cleanup after previous file test
+
+expecting success of 3070.1552 'setup match file test for foo/bb/aa/rr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1552 - setup match file test for foo/bb/aa/rr
+
+expecting success of 3070.1553 'wildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch wildmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1553 - wildmatch: match 'foo/bb/aa/rr' '**/**/**'
+
+expecting success of 3070.1554 'wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1554 - wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+
+expecting success of 3070.1555 'iwildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1555 - iwildmatch: match 'foo/bb/aa/rr' '**/**/**'
+
+expecting success of 3070.1556 'iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1556 - iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+
+expecting success of 3070.1557 'pathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1557 - pathmatch: match 'foo/bb/aa/rr' '**/**/**'
+
+expecting success of 3070.1558 'pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1558 - pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+
+expecting success of 3070.1559 'ipathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
+			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1559 - ipathmatch: match 'foo/bb/aa/rr' '**/**/**'
+
+expecting success of 3070.1560 'ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1560 - ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+
+expecting success of 3070.1561 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1561 - cleanup after previous file test
+
+expecting success of 3070.1562 'setup match file test for abcXdefXghi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1562 - setup match file test for abcXdefXghi
+
+expecting success of 3070.1563 'wildmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch wildmatch 'abcXdefXghi' '*X*i'
+		
+ok 1563 - wildmatch: match 'abcXdefXghi' '*X*i'
+
+expecting success of 3070.1564 'wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1564 - wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+
+expecting success of 3070.1565 'iwildmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch iwildmatch 'abcXdefXghi' '*X*i'
+		
+ok 1565 - iwildmatch: match 'abcXdefXghi' '*X*i'
+
+expecting success of 3070.1566 'iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1566 - iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+
+expecting success of 3070.1567 'pathmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch pathmatch 'abcXdefXghi' '*X*i'
+		
+ok 1567 - pathmatch: match 'abcXdefXghi' '*X*i'
+
+expecting success of 3070.1568 'pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1568 - pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+
+expecting success of 3070.1569 'ipathmatch: match 'abcXdefXghi' '*X*i'': 
+			test-tool wildmatch ipathmatch 'abcXdefXghi' '*X*i'
+		
+ok 1569 - ipathmatch: match 'abcXdefXghi' '*X*i'
+
+expecting success of 3070.1570 'ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1570 - ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+
+expecting success of 3070.1571 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing abcXdefXghi
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1571 - cleanup after previous file test
+
+expecting success of 3070.1572 'setup match file test for ab/cXd/efXg/hi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1572 - setup match file test for ab/cXd/efXg/hi
+
+expecting success of 3070.1573 'wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
+			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1573 - wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+
+expecting success of 3070.1574 'wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1574 - wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1575 'iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1575 - iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+
+expecting success of 3070.1576 'iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1576 - iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1577 'pathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1577 - pathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+
+expecting success of 3070.1578 'pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1578 - pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1579 'ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1579 - ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+
+expecting success of 3070.1580 'ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1580 - ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1581 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1581 - cleanup after previous file test
+
+expecting success of 3070.1582 'setup match file test for ab/cXd/efXg/hi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1582 - setup match file test for ab/cXd/efXg/hi
+
+expecting success of 3070.1583 'wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1583 - wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+
+expecting success of 3070.1584 'wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1584 - wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1585 'iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1585 - iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+
+expecting success of 3070.1586 'iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1586 - iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1587 'pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1587 - pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+
+expecting success of 3070.1588 'pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1588 - pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1589 'ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1589 - ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+
+expecting success of 3070.1590 'ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1590 - ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1591 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1591 - cleanup after previous file test
+
+expecting success of 3070.1592 'setup match file test for ab/cXd/efXg/hi': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1592 - setup match file test for ab/cXd/efXg/hi
+
+expecting success of 3070.1593 'wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1593 - wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+
+expecting success of 3070.1594 'wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1594 - wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1595 'iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1595 - iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+
+expecting success of 3070.1596 'iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1596 - iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1597 'pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1597 - pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+
+expecting success of 3070.1598 'pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1598 - pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1599 'ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1599 - ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+
+expecting success of 3070.1600 'ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1600 - ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+
+expecting success of 3070.1601 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1601 - cleanup after previous file test
+
+expecting success of 3070.1602 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1602 - setup match file test for foo
+
+expecting success of 3070.1603 'wildmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' 'fo'
+		
+ok 1603 - wildmatch: no match 'foo' 'fo'
+
+expecting success of 3070.1604 'wildmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1604 - wildmatch (via ls-files): no match 'fo' 'foo'
+
+expecting success of 3070.1605 'iwildmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' 'fo'
+		
+ok 1605 - iwildmatch: no match 'foo' 'fo'
+
+expecting success of 3070.1606 'iwildmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1606 - iwildmatch (via ls-files): no match 'fo' 'foo'
+
+expecting success of 3070.1607 'pathmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' 'fo'
+		
+ok 1607 - pathmatch: no match 'foo' 'fo'
+
+expecting success of 3070.1608 'pathmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1608 - pathmatch (via ls-files): no match 'fo' 'foo'
+
+expecting success of 3070.1609 'ipathmatch: no match 'foo' 'fo'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' 'fo'
+		
+ok 1609 - ipathmatch: no match 'foo' 'fo'
+
+expecting success of 3070.1610 'ipathmatch (via ls-files): no match 'fo' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1610 - ipathmatch (via ls-files): no match 'fo' 'foo'
+
+expecting success of 3070.1611 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 1611 - cleanup after previous file test
+
+expecting success of 3070.1612 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1612 - setup match file test for foo/bar
+
+expecting success of 3070.1613 'wildmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/bar'
+		
+ok 1613 - wildmatch: match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1614 'wildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1614 - wildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1615 'iwildmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/bar'
+		
+ok 1615 - iwildmatch: match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1616 'iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1616 - iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1617 'pathmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo/bar'
+		
+ok 1617 - pathmatch: match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1618 'pathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1618 - pathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1619 'ipathmatch: match 'foo/bar' 'foo/bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo/bar'
+		
+ok 1619 - ipathmatch: match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1620 'ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1620 - ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+
+expecting success of 3070.1621 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1621 - cleanup after previous file test
+
+expecting success of 3070.1622 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1622 - setup match file test for foo/bar
+
+expecting success of 3070.1623 'wildmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/*'
+		
+ok 1623 - wildmatch: match 'foo/bar' 'foo/*'
+
+expecting success of 3070.1624 'wildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1624 - wildmatch (via ls-files): match 'foo/*' 'foo/bar'
+
+expecting success of 3070.1625 'iwildmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/*'
+		
+ok 1625 - iwildmatch: match 'foo/bar' 'foo/*'
+
+expecting success of 3070.1626 'iwildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1626 - iwildmatch (via ls-files): match 'foo/*' 'foo/bar'
+
+expecting success of 3070.1627 'pathmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo/*'
+		
+ok 1627 - pathmatch: match 'foo/bar' 'foo/*'
+
+expecting success of 3070.1628 'pathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1628 - pathmatch (via ls-files): match 'foo/*' 'foo/bar'
+
+expecting success of 3070.1629 'ipathmatch: match 'foo/bar' 'foo/*'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo/*'
+		
+ok 1629 - ipathmatch: match 'foo/bar' 'foo/*'
+
+expecting success of 3070.1630 'ipathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1630 - ipathmatch (via ls-files): match 'foo/*' 'foo/bar'
+
+expecting success of 3070.1631 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1631 - cleanup after previous file test
+
+expecting success of 3070.1632 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1632 - setup match file test for foo/bba/arr
+
+expecting success of 3070.1633 'wildmatch: no match 'foo/bba/arr' 'foo/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1633 - wildmatch: no match 'foo/bba/arr' 'foo/*'
+
+expecting success of 3070.1634 'wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1634 - wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+
+expecting success of 3070.1635 'iwildmatch: no match 'foo/bba/arr' 'foo/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1635 - iwildmatch: no match 'foo/bba/arr' 'foo/*'
+
+expecting success of 3070.1636 'iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1636 - iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+
+expecting success of 3070.1637 'pathmatch: match 'foo/bba/arr' 'foo/*'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1637 - pathmatch: match 'foo/bba/arr' 'foo/*'
+
+expecting success of 3070.1638 'pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1638 - pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+
+expecting success of 3070.1639 'ipathmatch: match 'foo/bba/arr' 'foo/*'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1639 - ipathmatch: match 'foo/bba/arr' 'foo/*'
+
+expecting success of 3070.1640 'ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1640 - ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+
+expecting success of 3070.1641 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1641 - cleanup after previous file test
+
+expecting success of 3070.1642 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1642 - setup match file test for foo/bba/arr
+
+expecting success of 3070.1643 'wildmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1643 - wildmatch: match 'foo/bba/arr' 'foo/**'
+
+expecting success of 3070.1644 'wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1644 - wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+
+expecting success of 3070.1645 'iwildmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1645 - iwildmatch: match 'foo/bba/arr' 'foo/**'
+
+expecting success of 3070.1646 'iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1646 - iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+
+expecting success of 3070.1647 'pathmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1647 - pathmatch: match 'foo/bba/arr' 'foo/**'
+
+expecting success of 3070.1648 'pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1648 - pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+
+expecting success of 3070.1649 'ipathmatch: match 'foo/bba/arr' 'foo/**'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1649 - ipathmatch: match 'foo/bba/arr' 'foo/**'
+
+expecting success of 3070.1650 'ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1650 - ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+
+expecting success of 3070.1651 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1651 - cleanup after previous file test
+
+expecting success of 3070.1652 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1652 - setup match file test for foo/bba/arr
+
+expecting success of 3070.1653 'wildmatch: no match 'foo/bba/arr' 'foo*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo*'
+		
+ok 1653 - wildmatch: no match 'foo/bba/arr' 'foo*'
+
+expecting success of 3070.1654 'wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1654 - wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+
+expecting success of 3070.1655 'iwildmatch: no match 'foo/bba/arr' 'foo*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo*'
+		
+ok 1655 - iwildmatch: no match 'foo/bba/arr' 'foo*'
+
+expecting success of 3070.1656 'iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1656 - iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+
+expecting success of 3070.1657 'pathmatch: match 'foo/bba/arr' 'foo*'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1657 - pathmatch: match 'foo/bba/arr' 'foo*'
+
+expecting success of 3070.1658 'pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1658 - pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+
+expecting success of 3070.1659 'ipathmatch: match 'foo/bba/arr' 'foo*'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1659 - ipathmatch: match 'foo/bba/arr' 'foo*'
+
+expecting success of 3070.1660 'ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1660 - ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+
+expecting success of 3070.1661 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1661 - cleanup after previous file test
+
+expecting success of 3070.1662 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1662 - setup match file test for foo/bba/arr
+
+expecting success of 3070.1663 'wildmatch: no match 'foo/bba/arr' 'foo**'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo**'
+		
+ok 1663 - wildmatch: no match 'foo/bba/arr' 'foo**'
+
+expecting success of 3070.1664 'wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1664 - wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+
+expecting success of 3070.1665 'iwildmatch: no match 'foo/bba/arr' 'foo**'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo**'
+		
+ok 1665 - iwildmatch: no match 'foo/bba/arr' 'foo**'
+
+expecting success of 3070.1666 'iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1666 - iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+
+expecting success of 3070.1667 'pathmatch: match 'foo/bba/arr' 'foo**'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo**'
+		
+ok 1667 - pathmatch: match 'foo/bba/arr' 'foo**'
+
+expecting success of 3070.1668 'pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1668 - pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+
+expecting success of 3070.1669 'ipathmatch: match 'foo/bba/arr' 'foo**'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo**'
+		
+ok 1669 - ipathmatch: match 'foo/bba/arr' 'foo**'
+
+expecting success of 3070.1670 'ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1670 - ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+
+expecting success of 3070.1671 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1671 - cleanup after previous file test
+
+expecting success of 3070.1672 'setup match file test for foo/bba/arr': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1672 - setup match file test for foo/bba/arr
+
+expecting success of 3070.1673 'wildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1673 - wildmatch: no match 'foo/bba/arr' 'foo/*arr'
+
+expecting success of 3070.1674 'wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1674 - wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+
+expecting success of 3070.1675 'iwildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1675 - iwildmatch: no match 'foo/bba/arr' 'foo/*arr'
+
+expecting success of 3070.1676 'iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1676 - iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+
+expecting success of 3070.1677 'pathmatch: match 'foo/bba/arr' 'foo/*arr'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1677 - pathmatch: match 'foo/bba/arr' 'foo/*arr'
+
+expecting success of 3070.1678 'pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1678 - pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
+
+expecting success of 3070.1679 'ipathmatch: match 'foo/bba/arr' 'foo/*arr'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1679 - ipathmatch: match 'foo/bba/arr' 'foo/*arr'
 
-expecting success of 3070.1400 'ipathmatch (via ls-files): no match '[\1-\3]' '4'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+expecting success of 3070.1680 'ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1400 - ipathmatch (via ls-files): no match '[\1-\3]' '4'
+ok 1680 - ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
 
-expecting success of 3070.1401 'cleanup after previous file test': 
+expecting success of 3070.1681 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing 4
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1401 - cleanup after previous file test
+Removing foo/
+ok 1681 - cleanup after previous file test
 
-expecting success of 3070.1402 'setup match file test for \': 
+expecting success of 3070.1682 'setup match file test for foo/bba/arr': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -211500,83 +208696,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1402 - setup match file test for \
+ok 1682 - setup match file test for foo/bba/arr
 
-expecting success of 3070.1403 'wildmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch wildmatch '\' '[[-\]]'
+expecting success of 3070.1683 'wildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**arr'
 		
-ok 1403 - wildmatch: match '\' '[[-\]]'
+ok 1683 - wildmatch: no match 'foo/bba/arr' 'foo/**arr'
 
-expecting success of 3070.1404 'wildmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1684 'wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1404 - wildmatch (via ls-files): match '[[-\]]' '\'
+ok 1684 - wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
 
-expecting success of 3070.1405 'iwildmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch iwildmatch '\' '[[-\]]'
+expecting success of 3070.1685 'iwildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**arr'
 		
-ok 1405 - iwildmatch: match '\' '[[-\]]'
+ok 1685 - iwildmatch: no match 'foo/bba/arr' 'foo/**arr'
 
-expecting success of 3070.1406 'iwildmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1686 'iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1406 - iwildmatch (via ls-files): match '[[-\]]' '\'
+ok 1686 - iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
 
-expecting success of 3070.1407 'pathmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch pathmatch '\' '[[-\]]'
+expecting success of 3070.1687 'pathmatch: match 'foo/bba/arr' 'foo/**arr'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**arr'
 		
-ok 1407 - pathmatch: match '\' '[[-\]]'
+ok 1687 - pathmatch: match 'foo/bba/arr' 'foo/**arr'
 
-expecting success of 3070.1408 'pathmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1688 'pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1408 - pathmatch (via ls-files): match '[[-\]]' '\'
+ok 1688 - pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
 
-expecting success of 3070.1409 'ipathmatch: match '\' '[[-\]]'': 
-			test-tool wildmatch ipathmatch '\' '[[-\]]'
+expecting success of 3070.1689 'ipathmatch: match 'foo/bba/arr' 'foo/**arr'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**arr'
 		
-ok 1409 - ipathmatch: match '\' '[[-\]]'
+ok 1689 - ipathmatch: match 'foo/bba/arr' 'foo/**arr'
 
-expecting success of 3070.1410 'ipathmatch (via ls-files): match '[[-\]]' '\'': 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1690 'ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1410 - ipathmatch (via ls-files): match '[[-\]]' '\'
+ok 1690 - ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
 
-expecting success of 3070.1411 'cleanup after previous file test': 
+expecting success of 3070.1691 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing "\\"
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1411 - cleanup after previous file test
+Removing foo/
+ok 1691 - cleanup after previous file test
 
-expecting success of 3070.1412 'setup match file test for [': 
+expecting success of 3070.1692 'setup match file test for foo/bba/arr': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -211595,83 +208791,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1412 - setup match file test for [
+ok 1692 - setup match file test for foo/bba/arr
 
-expecting success of 3070.1413 'wildmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch wildmatch '[' '[[-\]]'
+expecting success of 3070.1693 'wildmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*z'
 		
-ok 1413 - wildmatch: match '[' '[[-\]]'
+ok 1693 - wildmatch: no match 'foo/bba/arr' 'foo/*z'
 
-expecting success of 3070.1414 'wildmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1694 'wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1414 - wildmatch (via ls-files): match '[[-\]]' '['
+ok 1694 - wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-expecting success of 3070.1415 'iwildmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch iwildmatch '[' '[[-\]]'
+expecting success of 3070.1695 'iwildmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*z'
 		
-ok 1415 - iwildmatch: match '[' '[[-\]]'
+ok 1695 - iwildmatch: no match 'foo/bba/arr' 'foo/*z'
 
-expecting success of 3070.1416 'iwildmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1696 'iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1416 - iwildmatch (via ls-files): match '[[-\]]' '['
+ok 1696 - iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-expecting success of 3070.1417 'pathmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch pathmatch '[' '[[-\]]'
+expecting success of 3070.1697 'pathmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*z'
 		
-ok 1417 - pathmatch: match '[' '[[-\]]'
+ok 1697 - pathmatch: no match 'foo/bba/arr' 'foo/*z'
 
-expecting success of 3070.1418 'pathmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1698 'pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1418 - pathmatch (via ls-files): match '[[-\]]' '['
+ok 1698 - pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-expecting success of 3070.1419 'ipathmatch: match '[' '[[-\]]'': 
-			test-tool wildmatch ipathmatch '[' '[[-\]]'
+expecting success of 3070.1699 'ipathmatch: no match 'foo/bba/arr' 'foo/*z'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*z'
 		
-ok 1419 - ipathmatch: match '[' '[[-\]]'
+ok 1699 - ipathmatch: no match 'foo/bba/arr' 'foo/*z'
 
-expecting success of 3070.1420 'ipathmatch (via ls-files): match '[[-\]]' '['': 
-				printf '%s' '[' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1700 'ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1420 - ipathmatch (via ls-files): match '[[-\]]' '['
+ok 1700 - ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
-expecting success of 3070.1421 'cleanup after previous file test': 
+expecting success of 3070.1701 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing [
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1421 - cleanup after previous file test
+Removing foo/
+ok 1701 - cleanup after previous file test
 
-expecting success of 3070.1422 'setup match file test for ]': 
+expecting success of 3070.1702 'setup match file test for foo/bba/arr': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -211690,83 +208886,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1422 - setup match file test for ]
+ok 1702 - setup match file test for foo/bba/arr
 
-expecting success of 3070.1423 'wildmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch wildmatch ']' '[[-\]]'
+expecting success of 3070.1703 'wildmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**z'
 		
-ok 1423 - wildmatch: match ']' '[[-\]]'
+ok 1703 - wildmatch: no match 'foo/bba/arr' 'foo/**z'
 
-expecting success of 3070.1424 'wildmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1704 'wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1424 - wildmatch (via ls-files): match '[[-\]]' ']'
+ok 1704 - wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-expecting success of 3070.1425 'iwildmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch iwildmatch ']' '[[-\]]'
+expecting success of 3070.1705 'iwildmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**z'
 		
-ok 1425 - iwildmatch: match ']' '[[-\]]'
+ok 1705 - iwildmatch: no match 'foo/bba/arr' 'foo/**z'
 
-expecting success of 3070.1426 'iwildmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1706 'iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1426 - iwildmatch (via ls-files): match '[[-\]]' ']'
+ok 1706 - iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-expecting success of 3070.1427 'pathmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch pathmatch ']' '[[-\]]'
+expecting success of 3070.1707 'pathmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**z'
 		
-ok 1427 - pathmatch: match ']' '[[-\]]'
+ok 1707 - pathmatch: no match 'foo/bba/arr' 'foo/**z'
 
-expecting success of 3070.1428 'pathmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1708 'pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1428 - pathmatch (via ls-files): match '[[-\]]' ']'
+ok 1708 - pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-expecting success of 3070.1429 'ipathmatch: match ']' '[[-\]]'': 
-			test-tool wildmatch ipathmatch ']' '[[-\]]'
+expecting success of 3070.1709 'ipathmatch: no match 'foo/bba/arr' 'foo/**z'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**z'
 		
-ok 1429 - ipathmatch: match ']' '[[-\]]'
+ok 1709 - ipathmatch: no match 'foo/bba/arr' 'foo/**z'
 
-expecting success of 3070.1430 'ipathmatch (via ls-files): match '[[-\]]' ']'': 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1710 'ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1430 - ipathmatch (via ls-files): match '[[-\]]' ']'
+ok 1710 - ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
-expecting success of 3070.1431 'cleanup after previous file test': 
+expecting success of 3070.1711 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ]
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1431 - cleanup after previous file test
+Removing foo/
+ok 1711 - cleanup after previous file test
 
-expecting success of 3070.1432 'setup match file test for -': 
+expecting success of 3070.1712 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -211785,83 +208981,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1432 - setup match file test for -
+ok 1712 - setup match file test for foo/bar
 
-expecting success of 3070.1433 'wildmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch wildmatch '-' '[[-\]]'
+expecting success of 3070.1713 'wildmatch: no match 'foo/bar' 'foo?bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
 		
-ok 1433 - wildmatch: no match '-' '[[-\]]'
+ok 1713 - wildmatch: no match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1434 'wildmatch (via ls-files): no match '[[-\]]' '-'': 
+expecting success of 3070.1714 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1434 - wildmatch (via ls-files): no match '[[-\]]' '-'
+ok 1714 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1435 'iwildmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch iwildmatch '-' '[[-\]]'
+expecting success of 3070.1715 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
 		
-ok 1435 - iwildmatch: no match '-' '[[-\]]'
+ok 1715 - iwildmatch: no match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1436 'iwildmatch (via ls-files): no match '[[-\]]' '-'': 
+expecting success of 3070.1716 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1436 - iwildmatch (via ls-files): no match '[[-\]]' '-'
+ok 1716 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1437 'pathmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch pathmatch '-' '[[-\]]'
+expecting success of 3070.1717 'pathmatch: match 'foo/bar' 'foo?bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
 		
-ok 1437 - pathmatch: no match '-' '[[-\]]'
+ok 1717 - pathmatch: match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1438 'pathmatch (via ls-files): no match '[[-\]]' '-'': 
-				>expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1718 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1438 - pathmatch (via ls-files): no match '[[-\]]' '-'
+ok 1718 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1439 'ipathmatch: no match '-' '[[-\]]'': 
-			test_must_fail test-tool wildmatch ipathmatch '-' '[[-\]]'
+expecting success of 3070.1719 'ipathmatch: match 'foo/bar' 'foo?bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
 		
-ok 1439 - ipathmatch: no match '-' '[[-\]]'
+ok 1719 - ipathmatch: match 'foo/bar' 'foo?bar'
 
-expecting success of 3070.1440 'ipathmatch (via ls-files): no match '[[-\]]' '-'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+expecting success of 3070.1720 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1440 - ipathmatch (via ls-files): no match '[[-\]]' '-'
+ok 1720 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-expecting success of 3070.1441 'cleanup after previous file test': 
+expecting success of 3070.1721 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1441 - cleanup after previous file test
+Removing foo/
+ok 1721 - cleanup after previous file test
 
-expecting success of 3070.1442 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1': 
+expecting success of 3070.1722 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -211880,83 +209076,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1442 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+ok 1722 - setup match file test for foo/bar
 
-expecting success of 3070.1443 'wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1723 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1443 - wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1723 - wildmatch: no match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1444 'wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1724 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1444 - wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 1724 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1445 'iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1725 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1445 - iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1725 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1446 'iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1726 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1446 - iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 1726 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1447 'pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1727 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1447 - pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1727 - pathmatch: match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1448 'pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1728 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1448 - pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 1728 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1449 'ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1729 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
 		
-ok 1449 - ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1729 - ipathmatch: match 'foo/bar' 'foo[/]bar'
 
-expecting success of 3070.1450 'ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'': 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1730 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1450 - ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+ok 1730 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
 
-expecting success of 3070.1451 'cleanup after previous file test': 
+expecting success of 3070.1731 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1451 - cleanup after previous file test
+Removing foo/
+ok 1731 - cleanup after previous file test
 
-expecting success of 3070.1452 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1': 
+expecting success of 3070.1732 'setup match file test for foo/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -211975,83 +209171,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1452 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
+ok 1732 - setup match file test for foo/bar
 
-expecting success of 3070.1453 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1733 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1453 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1733 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1454 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+expecting success of 3070.1734 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1454 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 1734 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1455 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1735 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1455 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1735 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1456 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
+expecting success of 3070.1736 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1456 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 1736 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1457 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1737 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1457 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1737 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1458 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
-				>expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1738 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1458 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 1738 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1459 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1739 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
 		
-ok 1459 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1739 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-expecting success of 3070.1460 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1740 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1460 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+ok 1740 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3070.1461 'cleanup after previous file test': 
+expecting success of 3070.1741 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1461 - cleanup after previous file test
+Removing foo/
+ok 1741 - cleanup after previous file test
 
-expecting success of 3070.1462 'setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1': 
+expecting success of 3070.1742 'setup match file test for ab/cXd/efXg/hi': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212070,83 +209266,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1462 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1
+ok 1742 - setup match file test for ab/cXd/efXg/hi
 
-expecting success of 3070.1463 'wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1743 'wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*Xg*i'
 		
-ok 1463 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1743 - wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
 
-expecting success of 3070.1464 'wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+expecting success of 3070.1744 'wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1464 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 1744 - wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
 
-expecting success of 3070.1465 'iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1745 'iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*Xg*i'
 		
-ok 1465 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1745 - iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
 
-expecting success of 3070.1466 'iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
+expecting success of 3070.1746 'iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1466 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 1746 - iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
 
-expecting success of 3070.1467 'pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1747 'pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*Xg*i'
 		
-ok 1467 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1747 - pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
 
-expecting success of 3070.1468 'pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
-				>expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1748 'pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1468 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 1748 - pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
 
-expecting success of 3070.1469 'ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'': 
-			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+expecting success of 3070.1749 'ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*Xg*i'
 		
-ok 1469 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+ok 1749 - ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
 
-expecting success of 3070.1470 'ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+expecting success of 3070.1750 'ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1470 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+ok 1750 - ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
 
-expecting success of 3070.1471 'cleanup after previous file test': 
+expecting success of 3070.1751 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-/
+Removing ab/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1471 - cleanup after previous file test
+ok 1751 - cleanup after previous file test
 
-expecting success of 3070.1472 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1': 
+expecting success of 3070.1752 'setup match file test for a': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212165,50 +209361,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1472 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1
+ok 1752 - setup match file test for a
 
-expecting success of 3070.1473 'wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1753 'wildmatch: no match 'a' '[A-Z]'': 
+			test_must_fail test-tool wildmatch wildmatch 'a' '[A-Z]'
 		
-ok 1473 - wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1753 - wildmatch: no match 'a' '[A-Z]'
 
-checking known breakage of 3070.1474 'wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1474 - wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1754 'wildmatch (via ls-files): no match '[A-Z]' 'a'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1754 - wildmatch (via ls-files): no match '[A-Z]' 'a'
 
-expecting success of 3070.1475 'iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1755 'iwildmatch: match 'a' '[A-Z]'': 
+			test-tool wildmatch iwildmatch 'a' '[A-Z]'
 		
-ok 1475 - iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1755 - iwildmatch: match 'a' '[A-Z]'
 
-checking known breakage of 3070.1476 'iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1476 - iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1756 'iwildmatch (via ls-files): match '[A-Z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1756 - iwildmatch (via ls-files): match '[A-Z]' 'a'
 
-expecting success of 3070.1477 'pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1757 'pathmatch: no match 'a' '[A-Z]'': 
+			test_must_fail test-tool wildmatch pathmatch 'a' '[A-Z]'
 		
-ok 1477 - pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1757 - pathmatch: no match 'a' '[A-Z]'
 
-checking known breakage of 3070.1478 'pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1478 - pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1758 'pathmatch (via ls-files): no match '[A-Z]' 'a'': 
+				>expect &&
+				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1758 - pathmatch (via ls-files): no match '[A-Z]' 'a'
 
-expecting success of 3070.1479 'ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1759 'ipathmatch: match 'a' '[A-Z]'': 
+			test-tool wildmatch ipathmatch 'a' '[A-Z]'
 		
-ok 1479 - ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1759 - ipathmatch: match 'a' '[A-Z]'
 
-checking known breakage of 3070.1480 'ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1'': false
-not ok 1480 - ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1760 'ipathmatch (via ls-files): match '[A-Z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1760 - ipathmatch (via ls-files): match '[A-Z]' 'a'
 
-expecting success of 3070.1481 'cleanup after previous file test': 
+expecting success of 3070.1761 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 1481 - cleanup after previous file test
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1761 - cleanup after previous file test
 
-expecting success of 3070.1482 'setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1': 
+expecting success of 3070.1762 'setup match file test for A': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212227,50 +209456,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1482 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1
+ok 1762 - setup match file test for A
 
-expecting success of 3070.1483 'wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1763 'wildmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch wildmatch 'A' '[A-Z]'
 		
-ok 1483 - wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1763 - wildmatch: match 'A' '[A-Z]'
 
-checking known breakage of 3070.1484 'wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1484 - wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1764 'wildmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1764 - wildmatch (via ls-files): match '[A-Z]' 'A'
 
-expecting success of 3070.1485 'iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1765 'iwildmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch iwildmatch 'A' '[A-Z]'
 		
-ok 1485 - iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1765 - iwildmatch: match 'A' '[A-Z]'
 
-checking known breakage of 3070.1486 'iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1486 - iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1766 'iwildmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1766 - iwildmatch (via ls-files): match '[A-Z]' 'A'
 
-expecting success of 3070.1487 'pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1767 'pathmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch pathmatch 'A' '[A-Z]'
 		
-ok 1487 - pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1767 - pathmatch: match 'A' '[A-Z]'
 
-checking known breakage of 3070.1488 'pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1488 - pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1768 'pathmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1768 - pathmatch (via ls-files): match '[A-Z]' 'A'
 
-expecting success of 3070.1489 'ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+expecting success of 3070.1769 'ipathmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch ipathmatch 'A' '[A-Z]'
 		
-ok 1489 - ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+ok 1769 - ipathmatch: match 'A' '[A-Z]'
 
-checking known breakage of 3070.1490 'ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1'': false
-not ok 1490 - ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success of 3070.1770 'ipathmatch (via ls-files): match '[A-Z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1770 - ipathmatch (via ls-files): match '[A-Z]' 'A'
 
-expecting success of 3070.1491 'cleanup after previous file test': 
+expecting success of 3070.1771 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 1491 - cleanup after previous file test
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1771 - cleanup after previous file test
 
-expecting success of 3070.1492 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt': 
+expecting success of 3070.1772 'setup match file test for A': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212289,83 +209551,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1492 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt
+ok 1772 - setup match file test for A
 
-expecting success of 3070.1493 'wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.1773 'wildmatch: no match 'A' '[a-z]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[a-z]'
 		
-ok 1493 - wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 1773 - wildmatch: no match 'A' '[a-z]'
 
-expecting success of 3070.1494 'wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1774 'wildmatch (via ls-files): no match '[a-z]' 'A'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1494 - wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 1774 - wildmatch (via ls-files): no match '[a-z]' 'A'
 
-expecting success of 3070.1495 'iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.1775 'iwildmatch: match 'A' '[a-z]'': 
+			test-tool wildmatch iwildmatch 'A' '[a-z]'
 		
-ok 1495 - iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 1775 - iwildmatch: match 'A' '[a-z]'
 
-expecting success of 3070.1496 'iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1776 'iwildmatch (via ls-files): match '[a-z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1496 - iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 1776 - iwildmatch (via ls-files): match '[a-z]' 'A'
 
-expecting success of 3070.1497 'pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.1777 'pathmatch: no match 'A' '[a-z]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[a-z]'
 		
-ok 1497 - pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 1777 - pathmatch: no match 'A' '[a-z]'
 
-expecting success of 3070.1498 'pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1778 'pathmatch (via ls-files): no match '[a-z]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1498 - pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 1778 - pathmatch (via ls-files): no match '[a-z]' 'A'
 
-expecting success of 3070.1499 'ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'': 
-			test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+expecting success of 3070.1779 'ipathmatch: match 'A' '[a-z]'': 
+			test-tool wildmatch ipathmatch 'A' '[a-z]'
 		
-ok 1499 - ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+ok 1779 - ipathmatch: match 'A' '[a-z]'
 
-expecting success of 3070.1500 'ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'': 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1780 'ipathmatch (via ls-files): match '[a-z]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1500 - ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+ok 1780 - ipathmatch (via ls-files): match '[a-z]' 'A'
 
-expecting success of 3070.1501 'cleanup after previous file test': 
+expecting success of 3070.1781 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing abcd/
+Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1501 - cleanup after previous file test
+ok 1781 - cleanup after previous file test
 
-expecting success of 3070.1502 'setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz': 
+expecting success of 3070.1782 'setup match file test for a': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212384,83 +209646,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1502 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz
+ok 1782 - setup match file test for a
 
-expecting success of 3070.1503 'wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.1783 'wildmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch wildmatch 'a' '[a-z]'
 		
-ok 1503 - wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 1783 - wildmatch: match 'a' '[a-z]'
 
-expecting success of 3070.1504 'wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1784 'wildmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1504 - wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 1784 - wildmatch (via ls-files): match '[a-z]' 'a'
 
-expecting success of 3070.1505 'iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.1785 'iwildmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch iwildmatch 'a' '[a-z]'
 		
-ok 1505 - iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 1785 - iwildmatch: match 'a' '[a-z]'
 
-expecting success of 3070.1506 'iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1786 'iwildmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1506 - iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 1786 - iwildmatch (via ls-files): match '[a-z]' 'a'
 
-expecting success of 3070.1507 'pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.1787 'pathmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch pathmatch 'a' '[a-z]'
 		
-ok 1507 - pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 1787 - pathmatch: match 'a' '[a-z]'
 
-expecting success of 3070.1508 'pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1788 'pathmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1508 - pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 1788 - pathmatch (via ls-files): match '[a-z]' 'a'
 
-expecting success of 3070.1509 'ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'': 
-			test_must_fail test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+expecting success of 3070.1789 'ipathmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch ipathmatch 'a' '[a-z]'
 		
-ok 1509 - ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+ok 1789 - ipathmatch: match 'a' '[a-z]'
 
-expecting success of 3070.1510 'ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+expecting success of 3070.1790 'ipathmatch (via ls-files): match '[a-z]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1510 - ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+ok 1790 - ipathmatch (via ls-files): match '[a-z]' 'a'
 
-expecting success of 3070.1511 'cleanup after previous file test': 
+expecting success of 3070.1791 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing abcd/
+Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1511 - cleanup after previous file test
+ok 1791 - cleanup after previous file test
 
-expecting success of 3070.1512 'setup match file test for foo': 
+expecting success of 3070.1792 'setup match file test for a': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212479,83 +209741,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1512 - setup match file test for foo
+ok 1792 - setup match file test for a
 
-expecting success of 3070.1513 'wildmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '*/*/*'
+expecting success of 3070.1793 'wildmatch: no match 'a' '[[:upper:]]'': 
+			test_must_fail test-tool wildmatch wildmatch 'a' '[[:upper:]]'
 		
-ok 1513 - wildmatch: no match 'foo' '*/*/*'
+ok 1793 - wildmatch: no match 'a' '[[:upper:]]'
 
-expecting success of 3070.1514 'wildmatch (via ls-files): no match '*/*/*' 'foo'': 
+expecting success of 3070.1794 'wildmatch (via ls-files): no match '[[:upper:]]' 'a'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1514 - wildmatch (via ls-files): no match '*/*/*' 'foo'
+ok 1794 - wildmatch (via ls-files): no match '[[:upper:]]' 'a'
 
-expecting success of 3070.1515 'iwildmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '*/*/*'
+expecting success of 3070.1795 'iwildmatch: match 'a' '[[:upper:]]'': 
+			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
 		
-ok 1515 - iwildmatch: no match 'foo' '*/*/*'
+ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
 
-expecting success of 3070.1516 'iwildmatch (via ls-files): no match '*/*/*' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1796 'iwildmatch (via ls-files): match '[[:upper:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1516 - iwildmatch (via ls-files): no match '*/*/*' 'foo'
+ok 1796 - iwildmatch (via ls-files): match '[[:upper:]]' 'a'
 
-expecting success of 3070.1517 'pathmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '*/*/*'
+expecting success of 3070.1797 'pathmatch: no match 'a' '[[:upper:]]'': 
+			test_must_fail test-tool wildmatch pathmatch 'a' '[[:upper:]]'
 		
-ok 1517 - pathmatch: no match 'foo' '*/*/*'
+ok 1797 - pathmatch: no match 'a' '[[:upper:]]'
 
-expecting success of 3070.1518 'pathmatch (via ls-files): no match '*/*/*' 'foo'': 
+expecting success of 3070.1798 'pathmatch (via ls-files): no match '[[:upper:]]' 'a'': 
 				>expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1518 - pathmatch (via ls-files): no match '*/*/*' 'foo'
+ok 1798 - pathmatch (via ls-files): no match '[[:upper:]]' 'a'
 
-expecting success of 3070.1519 'ipathmatch: no match 'foo' '*/*/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '*/*/*'
+expecting success of 3070.1799 'ipathmatch: match 'a' '[[:upper:]]'': 
+			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
 		
-ok 1519 - ipathmatch: no match 'foo' '*/*/*'
+ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
 
-expecting success of 3070.1520 'ipathmatch (via ls-files): no match '*/*/*' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1800 'ipathmatch (via ls-files): match '[[:upper:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1520 - ipathmatch (via ls-files): no match '*/*/*' 'foo'
+ok 1800 - ipathmatch (via ls-files): match '[[:upper:]]' 'a'
 
-expecting success of 3070.1521 'cleanup after previous file test': 
+expecting success of 3070.1801 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo
-ok 1521 - cleanup after previous file test
+ok 1801 - cleanup after previous file test
 
-expecting success of 3070.1522 'setup match file test for foo/bar': 
+expecting success of 3070.1802 'setup match file test for A': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212574,83 +209836,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1522 - setup match file test for foo/bar
+ok 1802 - setup match file test for A
 
-expecting success of 3070.1523 'wildmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' '*/*/*'
+expecting success of 3070.1803 'wildmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
 		
-ok 1523 - wildmatch: no match 'foo/bar' '*/*/*'
+ok 1803 - wildmatch: match 'A' '[[:upper:]]'
 
-expecting success of 3070.1524 'wildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1804 'wildmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1524 - wildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 1804 - wildmatch (via ls-files): match '[[:upper:]]' 'A'
 
-expecting success of 3070.1525 'iwildmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' '*/*/*'
+expecting success of 3070.1805 'iwildmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
 		
-ok 1525 - iwildmatch: no match 'foo/bar' '*/*/*'
+ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
 
-expecting success of 3070.1526 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1806 'iwildmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1526 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 1806 - iwildmatch (via ls-files): match '[[:upper:]]' 'A'
 
-expecting success of 3070.1527 'pathmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' '*/*/*'
+expecting success of 3070.1807 'pathmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
 		
-ok 1527 - pathmatch: no match 'foo/bar' '*/*/*'
+ok 1807 - pathmatch: match 'A' '[[:upper:]]'
 
-expecting success of 3070.1528 'pathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1808 'pathmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1528 - pathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 1808 - pathmatch (via ls-files): match '[[:upper:]]' 'A'
 
-expecting success of 3070.1529 'ipathmatch: no match 'foo/bar' '*/*/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' '*/*/*'
+expecting success of 3070.1809 'ipathmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
 		
-ok 1529 - ipathmatch: no match 'foo/bar' '*/*/*'
+ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
 
-expecting success of 3070.1530 'ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1810 'ipathmatch (via ls-files): match '[[:upper:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1530 - ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 1810 - ipathmatch (via ls-files): match '[[:upper:]]' 'A'
 
-expecting success of 3070.1531 'cleanup after previous file test': 
+expecting success of 3070.1811 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1531 - cleanup after previous file test
+ok 1811 - cleanup after previous file test
 
-expecting success of 3070.1532 'setup match file test for foo/bba/arr': 
+expecting success of 3070.1812 'setup match file test for A': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212669,83 +209931,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1532 - setup match file test for foo/bba/arr
+ok 1812 - setup match file test for A
 
-expecting success of 3070.1533 'wildmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch wildmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.1813 'wildmatch: no match 'A' '[[:lower:]]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[[:lower:]]'
 		
-ok 1533 - wildmatch: match 'foo/bba/arr' '*/*/*'
+ok 1813 - wildmatch: no match 'A' '[[:lower:]]'
 
-expecting success of 3070.1534 'wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1814 'wildmatch (via ls-files): no match '[[:lower:]]' 'A'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1534 - wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 1814 - wildmatch (via ls-files): no match '[[:lower:]]' 'A'
 
-expecting success of 3070.1535 'iwildmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch iwildmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.1815 'iwildmatch: match 'A' '[[:lower:]]'': 
+			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
 		
-ok 1535 - iwildmatch: match 'foo/bba/arr' '*/*/*'
+ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
 
-expecting success of 3070.1536 'iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1816 'iwildmatch (via ls-files): match '[[:lower:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1536 - iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 1816 - iwildmatch (via ls-files): match '[[:lower:]]' 'A'
 
-expecting success of 3070.1537 'pathmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.1817 'pathmatch: no match 'A' '[[:lower:]]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[[:lower:]]'
 		
-ok 1537 - pathmatch: match 'foo/bba/arr' '*/*/*'
+ok 1817 - pathmatch: no match 'A' '[[:lower:]]'
 
-expecting success of 3070.1538 'pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1818 'pathmatch (via ls-files): no match '[[:lower:]]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1538 - pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 1818 - pathmatch (via ls-files): no match '[[:lower:]]' 'A'
 
-expecting success of 3070.1539 'ipathmatch: match 'foo/bba/arr' '*/*/*'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' '*/*/*'
+expecting success of 3070.1819 'ipathmatch: match 'A' '[[:lower:]]'': 
+			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
 		
-ok 1539 - ipathmatch: match 'foo/bba/arr' '*/*/*'
+ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
 
-expecting success of 3070.1540 'ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1820 'ipathmatch (via ls-files): match '[[:lower:]]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1540 - ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 1820 - ipathmatch (via ls-files): match '[[:lower:]]' 'A'
 
-expecting success of 3070.1541 'cleanup after previous file test': 
+expecting success of 3070.1821 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1541 - cleanup after previous file test
+ok 1821 - cleanup after previous file test
 
-expecting success of 3070.1542 'setup match file test for foo/bb/aa/rr': 
+expecting success of 3070.1822 'setup match file test for a': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212764,83 +210026,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1542 - setup match file test for foo/bb/aa/rr
+ok 1822 - setup match file test for a
 
-expecting success of 3070.1543 'wildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.1823 'wildmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
 		
-ok 1543 - wildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+ok 1823 - wildmatch: match 'a' '[[:lower:]]'
 
-expecting success of 3070.1544 'wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1824 'wildmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1544 - wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+ok 1824 - wildmatch (via ls-files): match '[[:lower:]]' 'a'
 
-expecting success of 3070.1545 'iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.1825 'iwildmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
 		
-ok 1545 - iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
 
-expecting success of 3070.1546 'iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1826 'iwildmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1546 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+ok 1826 - iwildmatch (via ls-files): match '[[:lower:]]' 'a'
 
-expecting success of 3070.1547 'pathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
-			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.1827 'pathmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
 		
-ok 1547 - pathmatch: match 'foo/bb/aa/rr' '*/*/*'
+ok 1827 - pathmatch: match 'a' '[[:lower:]]'
 
-expecting success of 3070.1548 'pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1828 'pathmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1548 - pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+ok 1828 - pathmatch (via ls-files): match '[[:lower:]]' 'a'
 
-expecting success of 3070.1549 'ipathmatch: match 'foo/bb/aa/rr' '*/*/*'': 
-			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '*/*/*'
+expecting success of 3070.1829 'ipathmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
 		
-ok 1549 - ipathmatch: match 'foo/bb/aa/rr' '*/*/*'
+ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
 
-expecting success of 3070.1550 'ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.1830 'ipathmatch (via ls-files): match '[[:lower:]]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1550 - ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+ok 1830 - ipathmatch (via ls-files): match '[[:lower:]]' 'a'
 
-expecting success of 3070.1551 'cleanup after previous file test': 
+expecting success of 3070.1831 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1551 - cleanup after previous file test
+ok 1831 - cleanup after previous file test
 
-expecting success of 3070.1552 'setup match file test for foo/bb/aa/rr': 
+expecting success of 3070.1832 'setup match file test for A': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212859,83 +210121,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1552 - setup match file test for foo/bb/aa/rr
+ok 1832 - setup match file test for A
 
-expecting success of 3070.1553 'wildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch wildmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.1833 'wildmatch: no match 'A' '[B-Za]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[B-Za]'
 		
-ok 1553 - wildmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 1833 - wildmatch: no match 'A' '[B-Za]'
 
-expecting success of 3070.1554 'wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.1834 'wildmatch (via ls-files): no match '[B-Za]' 'A'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1554 - wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 1834 - wildmatch (via ls-files): no match '[B-Za]' 'A'
 
-expecting success of 3070.1555 'iwildmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.1835 'iwildmatch: match 'A' '[B-Za]'': 
+			test-tool wildmatch iwildmatch 'A' '[B-Za]'
 		
-ok 1555 - iwildmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 1835 - iwildmatch: match 'A' '[B-Za]'
 
-expecting success of 3070.1556 'iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.1836 'iwildmatch (via ls-files): match '[B-Za]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1556 - iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 1836 - iwildmatch (via ls-files): match '[B-Za]' 'A'
 
-expecting success of 3070.1557 'pathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.1837 'pathmatch: no match 'A' '[B-Za]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[B-Za]'
 		
-ok 1557 - pathmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 1837 - pathmatch: no match 'A' '[B-Za]'
 
-expecting success of 3070.1558 'pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.1838 'pathmatch (via ls-files): no match '[B-Za]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1558 - pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 1838 - pathmatch (via ls-files): no match '[B-Za]' 'A'
 
-expecting success of 3070.1559 'ipathmatch: match 'foo/bb/aa/rr' '**/**/**'': 
-			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '**/**/**'
+expecting success of 3070.1839 'ipathmatch: match 'A' '[B-Za]'': 
+			test-tool wildmatch ipathmatch 'A' '[B-Za]'
 		
-ok 1559 - ipathmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 1839 - ipathmatch: match 'A' '[B-Za]'
 
-expecting success of 3070.1560 'ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'': 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+expecting success of 3070.1840 'ipathmatch (via ls-files): match '[B-Za]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1560 - ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 1840 - ipathmatch (via ls-files): match '[B-Za]' 'A'
 
-expecting success of 3070.1561 'cleanup after previous file test': 
+expecting success of 3070.1841 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1561 - cleanup after previous file test
+ok 1841 - cleanup after previous file test
 
-expecting success of 3070.1562 'setup match file test for abcXdefXghi': 
+expecting success of 3070.1842 'setup match file test for a': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -212954,83 +210216,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1562 - setup match file test for abcXdefXghi
+ok 1842 - setup match file test for a
 
-expecting success of 3070.1563 'wildmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch wildmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.1843 'wildmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch wildmatch 'a' '[B-Za]'
 		
-ok 1563 - wildmatch: match 'abcXdefXghi' '*X*i'
+ok 1843 - wildmatch: match 'a' '[B-Za]'
 
-expecting success of 3070.1564 'wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1844 'wildmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1564 - wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 1844 - wildmatch (via ls-files): match '[B-Za]' 'a'
 
-expecting success of 3070.1565 'iwildmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch iwildmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.1845 'iwildmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch iwildmatch 'a' '[B-Za]'
 		
-ok 1565 - iwildmatch: match 'abcXdefXghi' '*X*i'
+ok 1845 - iwildmatch: match 'a' '[B-Za]'
 
-expecting success of 3070.1566 'iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1846 'iwildmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1566 - iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 1846 - iwildmatch (via ls-files): match '[B-Za]' 'a'
 
-expecting success of 3070.1567 'pathmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch pathmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.1847 'pathmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch pathmatch 'a' '[B-Za]'
 		
-ok 1567 - pathmatch: match 'abcXdefXghi' '*X*i'
+ok 1847 - pathmatch: match 'a' '[B-Za]'
 
-expecting success of 3070.1568 'pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1848 'pathmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1568 - pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 1848 - pathmatch (via ls-files): match '[B-Za]' 'a'
 
-expecting success of 3070.1569 'ipathmatch: match 'abcXdefXghi' '*X*i'': 
-			test-tool wildmatch ipathmatch 'abcXdefXghi' '*X*i'
+expecting success of 3070.1849 'ipathmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch ipathmatch 'a' '[B-Za]'
 		
-ok 1569 - ipathmatch: match 'abcXdefXghi' '*X*i'
+ok 1849 - ipathmatch: match 'a' '[B-Za]'
 
-expecting success of 3070.1570 'ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'': 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1850 'ipathmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1570 - ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 1850 - ipathmatch (via ls-files): match '[B-Za]' 'a'
 
-expecting success of 3070.1571 'cleanup after previous file test': 
+expecting success of 3070.1851 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing abcXdefXghi
+Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1571 - cleanup after previous file test
+ok 1851 - cleanup after previous file test
 
-expecting success of 3070.1572 'setup match file test for ab/cXd/efXg/hi': 
+expecting success of 3070.1852 'setup match file test for A': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -213049,83 +210311,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1572 - setup match file test for ab/cXd/efXg/hi
+ok 1852 - setup match file test for A
 
-expecting success of 3070.1573 'wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
-			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.1853 'wildmatch: no match 'A' '[B-a]'': 
+			test_must_fail test-tool wildmatch wildmatch 'A' '[B-a]'
 		
-ok 1573 - wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+ok 1853 - wildmatch: no match 'A' '[B-a]'
 
-expecting success of 3070.1574 'wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
+expecting success of 3070.1854 'wildmatch (via ls-files): no match '[B-a]' 'A'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1574 - wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+ok 1854 - wildmatch (via ls-files): no match '[B-a]' 'A'
 
-expecting success of 3070.1575 'iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.1855 'iwildmatch: match 'A' '[B-a]'': 
+			test-tool wildmatch iwildmatch 'A' '[B-a]'
 		
-ok 1575 - iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+ok 1855 - iwildmatch: match 'A' '[B-a]'
 
-expecting success of 3070.1576 'iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1856 'iwildmatch (via ls-files): match '[B-a]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1576 - iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+ok 1856 - iwildmatch (via ls-files): match '[B-a]' 'A'
 
-expecting success of 3070.1577 'pathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.1857 'pathmatch: no match 'A' '[B-a]'': 
+			test_must_fail test-tool wildmatch pathmatch 'A' '[B-a]'
 		
-ok 1577 - pathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+ok 1857 - pathmatch: no match 'A' '[B-a]'
 
-expecting success of 3070.1578 'pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1858 'pathmatch (via ls-files): no match '[B-a]' 'A'': 
+				>expect &&
+				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1578 - pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+ok 1858 - pathmatch (via ls-files): no match '[B-a]' 'A'
 
-expecting success of 3070.1579 'ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*X*i'
+expecting success of 3070.1859 'ipathmatch: match 'A' '[B-a]'': 
+			test-tool wildmatch ipathmatch 'A' '[B-a]'
 		
-ok 1579 - ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+ok 1859 - ipathmatch: match 'A' '[B-a]'
 
-expecting success of 3070.1580 'ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1860 'ipathmatch (via ls-files): match '[B-a]' 'A'': 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1580 - ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+ok 1860 - ipathmatch (via ls-files): match '[B-a]' 'A'
 
-expecting success of 3070.1581 'cleanup after previous file test': 
+expecting success of 3070.1861 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ab/
+Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1581 - cleanup after previous file test
+ok 1861 - cleanup after previous file test
 
-expecting success of 3070.1582 'setup match file test for ab/cXd/efXg/hi': 
+expecting success of 3070.1862 'setup match file test for a': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -213144,83 +210406,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1582 - setup match file test for ab/cXd/efXg/hi
+ok 1862 - setup match file test for a
 
-expecting success of 3070.1583 'wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.1863 'wildmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch wildmatch 'a' '[B-a]'
 		
-ok 1583 - wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 1863 - wildmatch: match 'a' '[B-a]'
 
-expecting success of 3070.1584 'wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1864 'wildmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1584 - wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 1864 - wildmatch (via ls-files): match '[B-a]' 'a'
 
-expecting success of 3070.1585 'iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.1865 'iwildmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch iwildmatch 'a' '[B-a]'
 		
-ok 1585 - iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 1865 - iwildmatch: match 'a' '[B-a]'
 
-expecting success of 3070.1586 'iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1866 'iwildmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1586 - iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 1866 - iwildmatch (via ls-files): match '[B-a]' 'a'
 
-expecting success of 3070.1587 'pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.1867 'pathmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch pathmatch 'a' '[B-a]'
 		
-ok 1587 - pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 1867 - pathmatch: match 'a' '[B-a]'
 
-expecting success of 3070.1588 'pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1868 'pathmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1588 - pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 1868 - pathmatch (via ls-files): match '[B-a]' 'a'
 
-expecting success of 3070.1589 'ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+expecting success of 3070.1869 'ipathmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch ipathmatch 'a' '[B-a]'
 		
-ok 1589 - ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 1869 - ipathmatch: match 'a' '[B-a]'
 
-expecting success of 3070.1590 'ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1870 'ipathmatch (via ls-files): match '[B-a]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1590 - ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 1870 - ipathmatch (via ls-files): match '[B-a]' 'a'
 
-expecting success of 3070.1591 'cleanup after previous file test': 
+expecting success of 3070.1871 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ab/
+Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1591 - cleanup after previous file test
+ok 1871 - cleanup after previous file test
 
-expecting success of 3070.1592 'setup match file test for ab/cXd/efXg/hi': 
+expecting success of 3070.1872 'setup match file test for z': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -213239,83 +210501,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1592 - setup match file test for ab/cXd/efXg/hi
+ok 1872 - setup match file test for z
 
-expecting success of 3070.1593 'wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.1873 'wildmatch: no match 'z' '[Z-y]'': 
+			test_must_fail test-tool wildmatch wildmatch 'z' '[Z-y]'
 		
-ok 1593 - wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 1873 - wildmatch: no match 'z' '[Z-y]'
 
-expecting success of 3070.1594 'wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1874 'wildmatch (via ls-files): no match '[Z-y]' 'z'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1594 - wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 1874 - wildmatch (via ls-files): no match '[Z-y]' 'z'
 
-expecting success of 3070.1595 'iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.1875 'iwildmatch: match 'z' '[Z-y]'': 
+			test-tool wildmatch iwildmatch 'z' '[Z-y]'
 		
-ok 1595 - iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 1875 - iwildmatch: match 'z' '[Z-y]'
 
-expecting success of 3070.1596 'iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1876 'iwildmatch (via ls-files): match '[Z-y]' 'z'': 
+				printf '%s' 'z' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1596 - iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 1876 - iwildmatch (via ls-files): match '[Z-y]' 'z'
 
-expecting success of 3070.1597 'pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.1877 'pathmatch: no match 'z' '[Z-y]'': 
+			test_must_fail test-tool wildmatch pathmatch 'z' '[Z-y]'
 		
-ok 1597 - pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 1877 - pathmatch: no match 'z' '[Z-y]'
 
-expecting success of 3070.1598 'pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1878 'pathmatch (via ls-files): no match '[Z-y]' 'z'': 
+				>expect &&
+				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1598 - pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 1878 - pathmatch (via ls-files): no match '[Z-y]' 'z'
 
-expecting success of 3070.1599 'ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+expecting success of 3070.1879 'ipathmatch: match 'z' '[Z-y]'': 
+			test-tool wildmatch ipathmatch 'z' '[Z-y]'
 		
-ok 1599 - ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 1879 - ipathmatch: match 'z' '[Z-y]'
 
-expecting success of 3070.1600 'ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+expecting success of 3070.1880 'ipathmatch (via ls-files): match '[Z-y]' 'z'': 
+				printf '%s' 'z' >expect &&
+				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1600 - ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 1880 - ipathmatch (via ls-files): match '[Z-y]' 'z'
 
-expecting success of 3070.1601 'cleanup after previous file test': 
+expecting success of 3070.1881 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ab/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1601 - cleanup after previous file test
+Removing z
+ok 1881 - cleanup after previous file test
 
-expecting success of 3070.1602 'setup match file test for foo': 
+expecting success of 3070.1882 'setup match file test for Z': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -213334,2782 +210596,5877 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1602 - setup match file test for foo
+ok 1882 - setup match file test for Z
 
-expecting success of 3070.1603 'wildmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' 'fo'
+expecting success of 3070.1883 'wildmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch wildmatch 'Z' '[Z-y]'
 		
-ok 1603 - wildmatch: no match 'foo' 'fo'
+ok 1883 - wildmatch: match 'Z' '[Z-y]'
 
-expecting success of 3070.1604 'wildmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+expecting success of 3070.1884 'wildmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1604 - wildmatch (via ls-files): no match 'fo' 'foo'
+ok 1884 - wildmatch (via ls-files): match '[Z-y]' 'Z'
 
-expecting success of 3070.1605 'iwildmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' 'fo'
+expecting success of 3070.1885 'iwildmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
 		
-ok 1605 - iwildmatch: no match 'foo' 'fo'
+ok 1885 - iwildmatch: match 'Z' '[Z-y]'
 
-expecting success of 3070.1606 'iwildmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+expecting success of 3070.1886 'iwildmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1606 - iwildmatch (via ls-files): no match 'fo' 'foo'
+ok 1886 - iwildmatch (via ls-files): match '[Z-y]' 'Z'
 
-expecting success of 3070.1607 'pathmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' 'fo'
+expecting success of 3070.1887 'pathmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch pathmatch 'Z' '[Z-y]'
 		
-ok 1607 - pathmatch: no match 'foo' 'fo'
+ok 1887 - pathmatch: match 'Z' '[Z-y]'
 
-expecting success of 3070.1608 'pathmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+expecting success of 3070.1888 'pathmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1608 - pathmatch (via ls-files): no match 'fo' 'foo'
+ok 1888 - pathmatch (via ls-files): match '[Z-y]' 'Z'
+
+expecting success of 3070.1889 'ipathmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch ipathmatch 'Z' '[Z-y]'
+		
+ok 1889 - ipathmatch: match 'Z' '[Z-y]'
+
+expecting success of 3070.1890 'ipathmatch (via ls-files): match '[Z-y]' 'Z'': 
+				printf '%s' 'Z' >expect &&
+				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1890 - ipathmatch (via ls-files): match '[Z-y]' 'Z'
+
+expecting success of 3070.1891 'matching does not exhibit exponential behavior': 
+	{
+		test-tool wildmatch wildmatch \
+			aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab \
+			"*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a" &
+		pid=$!
+	} &&
+	sleep 2 &&
+	! kill $!
+
+./test-lib.sh: line 1024: kill: (61278) - No such process
+ok 1891 - matching does not exhibit exponential behavior
+
+# still have 40 known breakage(s)
+# passed all remaining 1851 test(s)
+1..1891
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3900-i18n-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3900-i18n-commit/.git/
+expecting success of 3900.1 'setup': 
+	: >F &&
+	git add F &&
+	T=$(git write-tree) &&
+	C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) &&
+	git update-ref HEAD $C &&
+	git tag C0
+
+ok 1 - setup
+
+expecting success of 3900.2 'no encoding header for base case': 
+	E=$(git cat-file commit C0 | sed -ne "s/^encoding //p") &&
+	test z = "z$E"
+
+ok 2 - no encoding header for base case
+
+expecting success of 3900.3 'UTF-16 refused because of NULs': 
+	echo UTF-16 >F &&
+	test_must_fail git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
+
+error: a NUL byte in commit log message not allowed.
+fatal: failed to write commit object
+ok 3 - UTF-16 refused because of NULs
+
+expecting success of 3900.4 'UTF-8 invalid characters refused': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	echo "UTF-8 characters" >F &&
+	printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master 97e22ab] Commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Warning: commit message did not conform to UTF-8.
+ok 4 - UTF-8 invalid characters refused
+
+expecting success of 3900.5 'UTF-8 overlong sequences rejected': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	rm -f "$HOME/stderr" "$HOME/invalid" &&
+	echo "UTF-8 overlong" >F &&
+	printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master f17d203] à‚©ommit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: commit message did not conform to UTF-8.
+ok 5 - UTF-8 overlong sequences rejected
+
+expecting success of 3900.6 'UTF-8 non-characters refused': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	echo "UTF-8 non-character 1" >F &&
+	printf "Commit message\n\nNon-character:\364\217\277\276\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master b54194f] Commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: commit message did not conform to UTF-8.
+ok 6 - UTF-8 non-characters refused
+
+expecting success of 3900.7 'UTF-8 non-characters refused': 
+	test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
+	echo "UTF-8 non-character 2." >F &&
+	printf "Commit message\n\nNon-character:\357\267\220\n" \
+		>"$HOME/invalid" &&
+	git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
+	test_grep "did not conform" "$HOME"/stderr
+
+[master 65f731d] Commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: commit message did not conform to UTF-8.
+ok 7 - UTF-8 non-characters refused
+
+expecting success of 3900.8 'ISO8859-1 setup': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H C0 &&
+		echo $H >F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
+	
+Switched to a new branch 'ISO8859-1'
+[ISO8859-1 37233ac] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - ISO8859-1 setup
+
+expecting success of 3900.9 'eucJP setup': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H C0 &&
+		echo $H >F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
+	
+Switched to a new branch 'eucJP'
+[eucJP 2d12add] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 9 - eucJP setup
+
+expecting success of 3900.10 'ISO-2022-JP setup': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H C0 &&
+		echo $H >F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
+	
+Switched to a new branch 'ISO-2022-JP'
+[ISO-2022-JP ae78d6f] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - ISO-2022-JP setup
+
+expecting success of 3900.11 'check encoding header for ISO8859-1': 
+		E=$(git cat-file commit ISO8859-1 | sed -ne "s/^encoding //p") &&
+		test "z$E" = "zISO8859-1"
+	
+ok 11 - check encoding header for ISO8859-1
+
+expecting success of 3900.12 'check encoding header for eucJP': 
+		E=$(git cat-file commit eucJP | sed -ne "s/^encoding //p") &&
+		test "z$E" = "zeucJP"
+	
+ok 12 - check encoding header for eucJP
+
+expecting success of 3900.13 'check encoding header for ISO-2022-JP': 
+		E=$(git cat-file commit ISO-2022-JP | sed -ne "s/^encoding //p") &&
+		test "z$E" = "zISO-2022-JP"
+	
+ok 13 - check encoding header for ISO-2022-JP
+
+expecting success of 3900.14 'config to remove customization': 
+	git config --unset-all i18n.commitencoding &&
+	if Z=$(git config --get-all i18n.commitencoding)
+	then
+		echo Oops, should have failed.
+		false
+	else
+		test z = "z$Z"
+	fi &&
+	git config i18n.commitencoding UTF-8
+
+ok 14 - config to remove customization
+
+expecting success of 3900.15 'ISO8859-1 should be shown in UTF-8 now': 
+	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+
+ok 15 - ISO8859-1 should be shown in UTF-8 now
+
+expecting success of 3900.16 'eucJP should be shown in UTF-8 now': 
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 16 - eucJP should be shown in UTF-8 now
+
+expecting success of 3900.17 'ISO-2022-JP should be shown in UTF-8 now': 
+		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 17 - ISO-2022-JP should be shown in UTF-8 now
+
+expecting success of 3900.18 'config to add customization': 
+	git config --unset-all i18n.commitencoding &&
+	if Z=$(git config --get-all i18n.commitencoding)
+	then
+		echo Oops, should have failed.
+		false
+	else
+		test z = "z$Z"
+	fi
+
+ok 18 - config to add customization
+
+expecting success of 3900.19 'ISO8859-1 should be shown in itself now': 
+		git config i18n.commitencoding ISO8859-1 &&
+		compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
+	
+ok 19 - ISO8859-1 should be shown in itself now
+
+expecting success of 3900.20 'eucJP should be shown in itself now': 
+		git config i18n.commitencoding eucJP &&
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt
+	
+ok 20 - eucJP should be shown in itself now
+
+expecting success of 3900.21 'ISO-2022-JP should be shown in itself now': 
+		git config i18n.commitencoding ISO-2022-JP &&
+		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
+	
+ok 21 - ISO-2022-JP should be shown in itself now
+
+expecting success of 3900.22 'config to tweak customization': 
+	git config i18n.logoutputencoding UTF-8
+
+ok 22 - config to tweak customization
+
+expecting success of 3900.23 'ISO8859-1 should be shown in UTF-8 now': 
+	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+
+ok 23 - ISO8859-1 should be shown in UTF-8 now
+
+expecting success of 3900.24 'eucJP should be shown in UTF-8 now': 
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 24 - eucJP should be shown in UTF-8 now
+
+expecting success of 3900.25 'ISO-2022-JP should be shown in UTF-8 now': 
+		compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 25 - ISO-2022-JP should be shown in UTF-8 now
+
+expecting success of 3900.26 'eucJP should be shown in eucJP now': 
+			compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
+		
+ok 26 - eucJP should be shown in eucJP now
+
+expecting success of 3900.27 'ISO-2022-JP should be shown in eucJP now': 
+			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
+		
+ok 27 - ISO-2022-JP should be shown in eucJP now
+
+expecting success of 3900.28 'eucJP should be shown in ISO-2022-JP now': 
+			compare_with eucJP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
+		
+ok 28 - eucJP should be shown in ISO-2022-JP now
+
+expecting success of 3900.29 'ISO-2022-JP should be shown in ISO-2022-JP now': 
+			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
+		
+ok 29 - ISO-2022-JP should be shown in ISO-2022-JP now
+
+expecting success of 3900.30 'No conversion with ISO8859-1': 
+		compare_with "--encoding=none ISO8859-1" "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
+	
+ok 30 - No conversion with ISO8859-1
+
+expecting success of 3900.31 'No conversion with eucJP': 
+		compare_with "--encoding=none eucJP" "$TEST_DIRECTORY"/t3900/eucJP.txt
+	
+ok 31 - No conversion with eucJP
+
+expecting success of 3900.32 'No conversion with ISO-2022-JP': 
+		compare_with "--encoding=none ISO-2022-JP" "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
+	
+ok 32 - No conversion with ISO-2022-JP
+
+expecting success of 3900.33 'commit --fixup with eucJP encoding': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H-$flag C0 &&
+		echo $H >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		echo $H $flag >>F &&
+		git commit -a --$flag HEAD~1 &&
+		E=$(git cat-file commit eucJP-fixup |
+			sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		git config --unset-all i18n.commitencoding &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git log --oneline >actual &&
+		test_line_count = 3 actual
+	
+Switched to a new branch 'eucJP-fixup'
+[eucJP-fixup 2d12add] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[eucJP-fixup 4164b89] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[eucJP-fixup 762ea33] fixup! $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/eucJP-fixup.
+ok 33 - commit --fixup with eucJP encoding
+
+expecting success of 3900.34 'commit --squash with ISO-2022-JP encoding': 
+		git config i18n.commitencoding $H &&
+		git checkout -b $H-$flag C0 &&
+		echo $H >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		echo $H $flag >>F &&
+		git commit -a --$flag HEAD~1 &&
+		E=$(git cat-file commit ISO-2022-JP-squash |
+			sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		git config --unset-all i18n.commitencoding &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git log --oneline >actual &&
+		test_line_count = 3 actual
+	
+Switched to a new branch 'ISO-2022-JP-squash'
+[ISO-2022-JP-squash 73be6f0] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ISO-2022-JP-squash 358ea4d] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[ISO-2022-JP-squash 31af1e8] squash! $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
[detached HEAD 452b79b] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/ISO-2022-JP-squash.
+ok 34 - commit --squash with ISO-2022-JP encoding
+
+expecting success of 3900.35 'commit --fixup into UTF-8 from ISO-8859-1': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
+	
+Switched to a new branch 'fixup-UTF-8-ISO-8859-1'
+[fixup-UTF-8-ISO-8859-1 f9ae2e6] ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[fixup-UTF-8-ISO-8859-1 2e63169] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[fixup-UTF-8-ISO-8859-1 c8086ca] fixup! ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-UTF-8-ISO-8859-1.
+ok 35 - commit --fixup into UTF-8 from ISO-8859-1
+
+expecting success of 3900.36 'commit --squash into ISO-8859-1 from UTF-8': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
+	
+Switched to a new branch 'squash-ISO-8859-1-UTF-8'
+[squash-ISO-8859-1-UTF-8 786be3a] ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[squash-ISO-8859-1-UTF-8 108aa2c] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[squash-ISO-8859-1-UTF-8 1f9565f] squash! ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
[detached HEAD a65b88e] ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-ISO-8859-1-UTF-8.
+ok 36 - commit --squash into ISO-8859-1 from UTF-8
+
+expecting success of 3900.37 'commit --squash into eucJP from ISO-2022-JP': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
+	
+Switched to a new branch 'squash-eucJP-ISO-2022-JP'
+[squash-eucJP-ISO-2022-JP 8154dd2] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[squash-eucJP-ISO-2022-JP ac34524] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[squash-eucJP-ISO-2022-JP 60556dc] squash! $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
[detached HEAD d7dba56] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-eucJP-ISO-2022-JP.
+ok 37 - commit --squash into eucJP from ISO-2022-JP
+
+expecting success of 3900.38 'commit --fixup into ISO-2022-JP from UTF-8': 
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
+	
+Switched to a new branch 'fixup-ISO-2022-JP-UTF-8'
+[fixup-ISO-2022-JP-UTF-8 31ec3d8] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[fixup-ISO-2022-JP-UTF-8 1264baa] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[fixup-ISO-2022-JP-UTF-8 7683d37] fixup! $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/fixup-ISO-2022-JP-UTF-8.
+ok 38 - commit --fixup into ISO-2022-JP from UTF-8
+
+# passed all 38 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3901-i18n-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+	git rebase --merge 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 12 - rebase --merge (U/U)
+
+expecting success of 3901.13 'rebase --merge (U/L)': 
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	git reset --hard side &&
+	git rebase --merge 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 13 - rebase --merge (U/L)
+
+expecting success of 3901.14 'rebase --merge (L/L)': 
+	# In this test we want ISO-8859-1 encoded commits as the result
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard side &&
+	git rebase --merge 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 14 - rebase --merge (L/L)
+
+expecting success of 3901.15 'rebase --merge (L/U)': 
+	# This is pathological -- use UTF-8 as intermediate form
+	# to get ISO-8859-1 results.
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard side &&
+	git rebase --merge main &&
+
+	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 15 - rebase --merge (L/U)
+
+expecting success of 3901.16 'am (U/U)': 
+	# Apply UTF-8 patches with UTF-8 commitencoding
+	git config i18n.commitencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	git reset --hard main &&
+	git am out-u1 out-u2 &&
+
+	check_encoding 2
+
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 16 - am (U/U)
+
+expecting success of 3901.17 'am (L/L)': 
+	# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
+	git config i18n.commitencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard main &&
+	git am out-l1 out-l2 &&
+
+	check_encoding 2 8859
+
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 17 - am (L/L)
+
+expecting success of 3901.18 'am (U/L)': 
+	# Apply ISO-8859-1 patches with UTF-8 commitencoding
+	git config i18n.commitencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	git reset --hard main &&
+
+	# am specifies --utf8 by default.
+	git am out-l1 out-l2 &&
+
+	check_encoding 2
+
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 18 - am (U/L)
+
+expecting success of 3901.19 'am --no-utf8 (U/L)': 
+	# Apply ISO-8859-1 patches with UTF-8 commitencoding
+	git config i18n.commitencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	git reset --hard main &&
+	git am --no-utf8 out-l1 out-l2 2>err &&
+
+	# commit-tree will warn that the commit message does not contain valid UTF-8
+	# as mailinfo did not convert it
+	test_grep "did not conform" err &&
+
+	check_encoding 2
+
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+Warning: commit message did not conform to UTF-8.
+Warning: commit message did not conform to UTF-8.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 19 - am --no-utf8 (U/L)
+
+expecting success of 3901.20 'am (L/U)': 
+	# Apply UTF-8 patches with ISO-8859-1 commitencoding
+	git config i18n.commitencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard main &&
+	# mailinfo will re-code the commit message to the charset specified by
+	# i18n.commitencoding
+	git am out-u1 out-u2 &&
+
+	check_encoding 2 8859
+
+HEAD is now at 1abbfe5 Second on main
+Applying: Second on side
+Applying: Third on side
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 20 - am (L/U)
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3904-stash-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3904-stash-patch/.git/
+expecting success of 3904.1 'setup': 
+	mkdir dir &&
+	echo parent > dir/foo &&
+	echo dummy > bar &&
+	echo committed > HEAD &&
+	git add bar dir/foo HEAD &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	echo index > dir/foo &&
+	git add dir/foo &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
+
+[master (root-commit) 797253d] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 HEAD
+ create mode 100644 bar
+ create mode 100644 dir/foo
+[master 1f3a67c] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3904.2 'saying "n" does nothing': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state dir/foo work index &&
+	test_write_lines n n n | test_must_fail git stash save -p &&
+	verify_state HEAD HEADfile_work HEADfile_index &&
+	verify_saved_state bar &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+No changes selected
+ok 2 - saying "n" does nothing
+
+expecting success of 3904.3 'git stash -p': 
+	test_write_lines y n y | git stash save -p &&
+	verify_state HEAD committed HEADfile_index &&
+	verify_saved_state bar &&
+	verify_state dir/foo head index &&
+	git reset --hard &&
+	git stash apply &&
+	verify_state HEAD HEADfile_work committed &&
+	verify_state bar dummy dummy &&
+	verify_state dir/foo work head
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+HEAD is now at 1f3a67c second
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   HEAD
+	modified:   dir/foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	_head
+	_index_bar
+	_worktree_bar
+	actual
+	expect
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 3 - git stash -p
+
+expecting success of 3904.4 'git stash -p --no-keep-index': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state bar bar_work bar_index &&
+	set_state dir/foo work index &&
+	test_write_lines y n y | git stash save -p --no-keep-index &&
+	verify_state HEAD committed committed &&
+	verify_state bar bar_work dummy &&
+	verify_state dir/foo head head &&
+	git reset --hard &&
+	git stash apply --index &&
+	verify_state HEAD HEADfile_work HEADfile_index &&
+	verify_state bar dummy bar_index &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+HEAD is now at 1f3a67c second
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	_head
+	_index_bar
+	_worktree_bar
+	actual
+	expect
+
+ok 4 - git stash -p --no-keep-index
+
+expecting success of 3904.5 'git stash --no-keep-index -p': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state bar bar_work bar_index &&
+	set_state dir/foo work index &&
+	test_write_lines y n y | git stash save --no-keep-index -p &&
+	verify_state HEAD committed committed &&
+	verify_state dir/foo head head &&
+	verify_state bar bar_work dummy &&
+	git reset --hard &&
+	git stash apply --index &&
+	verify_state HEAD HEADfile_work HEADfile_index &&
+	verify_state bar dummy bar_index &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+HEAD is now at 1f3a67c second
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   HEAD
+	modified:   bar
+	modified:   dir/foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	_head
+	_index_bar
+	_worktree_bar
+	actual
+	expect
+
+ok 5 - git stash --no-keep-index -p
+
+expecting success of 3904.6 'stash -p --no-keep-index -- <pathspec> does not unstage other files': 
+	set_state HEAD HEADfile_work HEADfile_index &&
+	set_state dir/foo work index &&
+	echo y | git stash push -p --no-keep-index -- HEAD &&
+	verify_state HEAD committed committed &&
+	verify_state dir/foo work index
+
+diff --git a/HEAD b/HEAD
+index d0fe822..e74fca5 100644
+--- a/HEAD
++++ b/HEAD
+@@ -1 +1 @@
+-committed
++HEADfile_work
+(1/1) Stash this hunk [y,n,q,a,d,e,p,?]? 
+Saved working directory and index state WIP on master: 1f3a67c second
+ok 6 - stash -p --no-keep-index -- <pathspec> does not unstage other files
+
+expecting success of 3904.7 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 7 - none of this moved HEAD
+
+expecting success of 3904.8 'stash -p with split hunk': 
+	git reset --hard &&
+	cat >test <<-\EOF &&
+	aaa
+	bbb
+	ccc
+	EOF
+	git add test &&
+	git commit -m "initial" &&
+	cat >test <<-\EOF &&
+	aaa
+	added line 1
+	bbb
+	added line 2
+	ccc
+	EOF
+	printf "%s\n" s n y q |
+	git stash -p 2>error &&
+	test_must_be_empty error &&
+	grep "added line 1" test &&
+	! grep "added line 2" test
+
+HEAD is now at 1f3a67c second
+[master 97cac8f] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 test
+diff --git a/test b/test
+index 1802a74..515ff88 100644
+--- a/test
++++ b/test
+@@ -1,3 +1,5 @@
+ aaa
++added line 1
+ bbb
++added line 2
+ ccc
+(1/1) Stash this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
+@@ -1,2 +1,3 @@
+ aaa
++added line 1
+ bbb
+(1/2) Stash this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,2 +3,3 @@
+ bbb
++added line 2
+ ccc
+(2/2) Stash this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+Saved working directory and index state WIP on master: 97cac8f initial
+added line 1
+ok 8 - stash -p with split hunk
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3908-stash-in-worktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3908-stash-in-worktree/.git/
+expecting success of 3908.1 'setup': 
+	test_commit initial &&
+	git worktree add wt &&
+	test_commit -C wt in-worktree
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Preparing worktree (new branch 'wt')
+HEAD is now at 24b24cf initial
+[wt a17e291] in-worktree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 in-worktree.t
+ok 1 - setup
+
+expecting success of 3908.2 'apply in subdirectory': 
+	mkdir wt/subdir &&
+	(
+		cd wt/subdir &&
+		echo modified >../initial.t &&
+		git stash &&
+		git stash apply >out
+	) &&
+	grep "\.\.\/initial\.t" wt/subdir/out
+
+Saved working directory and index state WIP on wt: a17e291 in-worktree
+	modified:   ../initial.t
+ok 2 - apply in subdirectory
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3512-cherry-pick-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3305-notes-fanout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3305-notes-fanout/.git/
+expecting success of 3305.1 'tweak test environment': 
+	git checkout -b nondeterminism &&
+	test_commit A &&
+	git checkout --orphan with_notes;
+
+Switched to a new branch 'nondeterminism'
+[nondeterminism (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'with_notes'
+ok 1 - tweak test environment
+
+expecting success of 3305.2 'creating many notes with git-notes': 
+	num_notes=300 &&
+	i=0 &&
+	while test $i -lt $num_notes
+	do
+		i=$(($i + 1)) &&
+		test_tick &&
+		echo "file for commit #$i" > file &&
+		git add file &&
+		git commit -q -m "commit #$i" &&
+		git notes add -m "note #$i" || return 1
+	done
+
+ok 2 - creating many notes with git-notes
+
+expecting success of 3305.3 'many notes created correctly with git-notes': 
+	git log >output.raw &&
+	grep "^    " output.raw >output &&
+	i=$num_notes &&
+	while test $i -gt 0
+	do
+		echo "    commit #$i" &&
+		echo "    note #$i" &&
+		i=$(($i - 1)) || return 1
+	done > expect &&
+	test_cmp expect output
+
+ok 3 - many notes created correctly with git-notes
+
+expecting success of 3305.4 'stable fanout 0 is followed by stable fanout 1': 
+	i=$num_notes &&
+	fanout=0 &&
+	while test $i -gt 0
+	do
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i A $fanout
+		then
+			continue
+		elif test $fanout -eq 0
+		then
+			fanout=1 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 0 -> 1 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 1
+
+Fanout 0 -> 1 at refs/notes/commits~202
+ok 4 - stable fanout 0 is followed by stable fanout 1
+
+expecting success of 3305.5 'deleting most notes with git-notes': 
+	remove_notes=285 &&
+	i=0 &&
+	git rev-list HEAD >revs &&
+	while test $i -lt $remove_notes && read sha1
+	do
+		i=$(($i + 1)) &&
+		test_tick &&
+		git notes remove "$sha1" || return 1
+	done <revs
+
+Removing note for object 294487610d9e2f1885f32c5aa8c40e1feae544e6
+Removing note for object 264d6d5a375b9b4a748e868f8887139e144dd9ac
+Removing note for object f4791ca4424bf830c9c4c2fae376f8c17584ecfc
+Removing note for object 04413ee0c628c2149ce195709e68ba9739cecaeb
+Removing note for object 2cba5326a57bff88235ffe0d680843c3a875fdc6
+Removing note for object 98c3a61e7f6474b9edadcd9fd0e2c580fbff9f8c
+Removing note for object 69dd6f05596ba7dd52aece2e66312d72193f2404
+Removing note for object 06faaf7ec015a9d97368c2529bdc8cf31baf70bf
+Removing note for object 95a7e3e972db58539e6ef3cc361cd61e31b17db7
+Removing note for object 136b29822535a2e998f2926ee16b1f3802c88b3f
+Removing note for object a9d5012931c30040ee5e7b0b8ab8eaa87dd2df9e
+Removing note for object 34b0e5146919d1b0b079f4685de49d08d602c765
+Removing note for object ba8e5e2e75a66e54fa2a999671e3d602548b0fad
+Removing note for object 84773486b2f3c371913c2745322c02efe920976c
+Removing note for object 30f4912988cb9df51d6bbec5796642f1b1a9a2fc
+Removing note for object 18b7dd8f1690e8cb8399edd2d469cebf6051c8fb
+Removing note for object 80a8f06bff8197866fb6c2b10e529a67b1d0ed57
+Removing note for object 88d59face24312f906679c56c1c00f41a57aed81
+Removing note for object e591b6658f32d09dc92aaab7f518076d7219baa1
+Removing note for object 7194f853be5be737ab89c55ed8ef76999c694cfb
+Removing note for object 785a3db61beba59185813dd72a4f49cb960ba939
+Removing note for object 3dbbb4bfb12466f2662430857727af32dc37b30b
+Removing note for object a7e4d6ced9493bec81fa7a326a50a053b7dd8e47
+Removing note for object 17d18cf173f34f0c977c7d7410432c4c052e9a35
+Removing note for object 0efe5818f127e837f8c49e7ee292f2e3827b5d8c
+Removing note for object 1329c14017e18f7f75c56c6132d5070386191590
+Removing note for object 4fad07113f4b21f3d3aba2033c13576d74ed0159
+Removing note for object fd7060211fed315790db481cca508f2a59cd33fa
+Removing note for object 24bcc65e72949c7aad1e00a0ae648eb27b94a801
+Removing note for object 74017d116189d350e027f6a2fa197d76a98cb90c
+Removing note for object 829520f74568ec4a7daa4344d4e53612e8e449c6
+Removing note for object fc9c45687e413c9199ed2e2dc13732b0eee1417e
+Removing note for object 68f9d6e536ae8b39e2be3687534f96fb0cedd413
+Removing note for object 85492e5692be8052265ab35b1fb32bd632d7a034
+Removing note for object ed3b17f5fea5faec967aea73fab660c3caa4ec11
+Removing note for object c0038d5ca05de0848b621fe56fa32a95f56ac8bb
+Removing note for object 5805c46d394e6f09d122e29bfc8bc4677227c959
+Removing note for object 82a44ee370b37d4fcd2955c7dd4f59f66bb85055
+Removing note for object bebeed1d6e5df5f8e4519c02be6e36baef2a2b9f
+Removing note for object 84489b9c59967356c347b503e7be812344bec157
+Removing note for object de6bce36f8dbcebae05182254f9839ae88a89519
+Removing note for object 028084dc54b6b3a96adb0db4447c0befbfaf0f77
+Removing note for object b8f0c408564c037d30c51346cc54e5bf9b39a223
+Removing note for object 2ca369ce379b96c92fd48802bf5ca62c31495871
+Removing note for object 6c623624f0cfa64dcf5e0670626a9af249ce8fce
+Removing note for object d07926d68d5ea629bdfca003fd6dd71f4efdde8a
+Removing note for object 6160cde4d6c969e42f949a8d975e72f82ec65ff9
+Removing note for object 73b405a748dba3b757b1c4cfbca475d1a66a1396
+Removing note for object 8bfca76ecc8ffdd1c73e247e20dfc380deec169b
+Removing note for object 49d5b21b59db4b0d7e92d8d58b548c7c7f3ceab3
+Removing note for object 092fdff4f714d2ade8c2a5e0b7230b96e58fa202
+Removing note for object 8e716f1f338b7cde850738a7bcb8fc08458f6da8
+Removing note for object cbbd557f18677bca5328466c4649d42ca38ecd0b
+Removing note for object 3b5f892711e112d1ffe60cc652782db8f5436172
+Removing note for object d00c7dd01101c3f61fa408d9609bd0f34189ca0e
+Removing note for object 2d5dfff9582df22365e988c1dbf26f310ac11018
+Removing note for object b081e0909ddc4f0cd0f880a4151b7a0f93ff7c02
+Removing note for object 72db531cec33db2b935aeefaf533d7cdc8e1e498
+Removing note for object 863bdd410c7d0f81d93dadbb5129004563987cdd
+Removing note for object 53c002754b07b01a6c7b0f25e55ce49452e78998
+Removing note for object 37d37991e387d94d7470e8e1f6d2554e027eb040
+Removing note for object c2a4ca4a2728846813f90dd0f36f5dd413572e53
+Removing note for object c4b7e09bd15665daf91c5a420a56dd3721ca8c09
+Removing note for object a14371c8166385886904c730e0a531b5ac0dc1d4
+Removing note for object 3595eeb0316642224135dda2d7f4e2571d13f960
+Removing note for object b7d693fa9562fb10a24385800b92e21d77158cab
+Removing note for object 0b55bd97fdaa73e8998658138997750f9204f709
+Removing note for object 7581409289445aac9cad5685242225b69438bdb5
+Removing note for object 63e0354a05c6f2bd3ee0454b7c8a1b6ad55bbb39
+Removing note for object e122ffa8e4b75eca6c0a6138dbbbbd8fd90db924
+Removing note for object 12b5dbefaa4c85ef26c42c14bb3a48493fd79aed
+Removing note for object 6187ce5edf2f7d4d97721c6a195e9085ee0b75e0
+Removing note for object 0b29c48dd6f47ab350c0268424c5912ca68eec05
+Removing note for object 00225fa0566873e04cf85786bfcdfc8d5a1fb68b
+Removing note for object e46b064f913b6c0ec92bdb2e3cdc956a9ad929d8
+Removing note for object da6a0c7b416f1929e37ad4ab7aa9a43e40bba3a4
+Removing note for object 0e7679756bda78bcb761a92425082d33ae2eabd6
+Removing note for object 3d884933f1ff6c4b8d3ffffb2c1985295ffc7578
+Removing note for object eb5fad11a1860cbc711e7aae5f815d49739027f9
+Removing note for object 6c5b7cca48d408e6597aae06ac190bf435eea0af
+Removing note for object 9ae6abb2dd899f3453bd4a42c6083d29e5ee2c25
+Removing note for object 1c2be6e6b8a1512b49e2d0ce4f320ac62663bd7c
+Removing note for object 91ba16e88693278bac6ea5b6652be27d519c6284
+Removing note for object 04891a4865ab739593d7f5d934906d805027dcbd
+Removing note for object b727600ac1fd560a92140c46077ce7f8a20f8db2
+Removing note for object 29b24dcd761b95b975c46ffa137d98f74d956875
+Removing note for object b1a3d0c9ddc40d03b3d59b6c7930df4012a61d0a
+Removing note for object 3698be91e4a9197cfefba28d171e52fc0fb571fa
+Removing note for object 85388b2ffc9342b1a9237c75f3f7cb79cc410e64
+Removing note for object 0aed77a3e97c3854fcd751b1f94ecb6756725974
+Removing note for object 011539f0b7e8e95c22436d224695aae6c48bb3db
+Removing note for object 43aa9d033a8bbfa9f3e8b0d7c9a715d1d0096c05
+Removing note for object c35ea1a727952227b88357433be4bdfb30e55856
+Removing note for object 46f4a82d64902ab63e4d7de6c78da677c3b20f8e
+Removing note for object 695cbdb56848e3e0e403da2ea9ef18d665481c3c
+Removing note for object 7c7ef41170927a3a7999968540534c70f68ce2c9
+Removing note for object e48a2c3b1b9c23598053a0416d31f9935be4ce83
+Removing note for object 6c66c6ef6b7c907f347fca51f1dc779eee27f35e
+Removing note for object 1e436c8a45959f2f4dfda6256f00caab47c79e7b
+Removing note for object 28a86738bc402f34c2b895820e4710f9b7517ce1
+Removing note for object a4075445b64d0bfb6d601a08598d4c346391ba6e
+Removing note for object 5136d8fd93d2016a0d59ea94013508fc771d7412
+Removing note for object 581964916f22d8ed9e54c42a5f02ebeeff208a54
+Removing note for object 408b845562d9579cac992b13dcf78c7bc351b83c
+Removing note for object f6606205b38996de225eb0d20a4436613226c5b4
+Removing note for object 69ad0c3f89c0348adaeb2b245f24678ff8fc73ef
+Removing note for object 16d4da4076e02831d14264341b46adc23de10d31
+Removing note for object 61245559e67f9f9ed73efe2bc7ba05c3b0dc61a3
+Removing note for object f5fc94c753f4fd9f47311e9a96823508fdf12867
+Removing note for object 4bf49ef5b8de8cf570854c1c5249b17dbac4da6d
+Removing note for object 2b5e34f8ec5a967a8c118b504cb7c9f82425d307
+Removing note for object 71feadd9546a386bba0956643a7618130275ca2d
+Removing note for object c435f7d2da121e6ca478542d81a09b4cfb1e6d40
+Removing note for object 83b6710b31fe03be8147f88d5679dc1e7d6b93e7
+Removing note for object a5cec4217c4c9459acd08946a5936109f92b234a
+Removing note for object 3466f2562096ec7fee77cfcaf975e045d5ba8bd8
+Removing note for object 0356dbfd30b5c8109865b192297b202b8d4b93b5
+Removing note for object ef04490e0dd39166aa62f7be4cbb8a42c9e9b876
+Removing note for object c6251d973d7136acf8b2817e8275fba9e0bb102d
+Removing note for object a18e024b9c635d261c2f54612b342a67928b8068
+Removing note for object 9d03e90800a10023bd868e1e7fee6a0d54bdb972
+Removing note for object 41d89def92a9052d7cc2ae1c673e807f7ee2bc15
+Removing note for object c1c691f1ee137258e216986125ad7169bbc9944b
+Removing note for object 5536984fddffdfdad3a5007221f3b08dc46e32eb
+Removing note for object cd905ab02b0fbdec5407cc7c454d959645e4fabb
+Removing note for object 8b33d27218a7e8cab8a6d2ff5eddd348c36029ba
+Removing note for object 81491394bf0249b2639a9f4f6bfc43c0e38370d4
+Removing note for object 76bff28d5965aaff4f7ba16e4b7a4bfb05bdc334
+Removing note for object e3504135096a7ca00095a761fcf71ecdd2794043
+Removing note for object 74125e7e86a34c7385ea36bff5c5e8f481b423c5
+Removing note for object 5fed9794bc006a7326587300052cb7e44639412a
+Removing note for object 3510fb1bd504c9221f9679da3fdc2845cf21e140
+Removing note for object bf473ccfa7fdc1e61f62f9c874238a0de5fc513d
+Removing note for object fc327306de924737f321c9baeefdcca0df16d2bc
+Removing note for object 2c10f7b0afac72972ec95cb4d308ba7421755512
+Removing note for object 297d6cb08dee5d25ce9ba83eecdeaf449da865bb
+Removing note for object 545c4c1b43dcc4d0a99cd98fcda0bae1005a78b2
+Removing note for object 4a996de24e1ffe26f732c854882697c1ad516386
+Removing note for object 844420c079e48a5166c01a85a790ce6bdeb873bd
+Removing note for object 023515e4ad959899e29b27f5c5f83c8a1a2de28c
+Removing note for object 7585ebad749b486c7ebf9f8e0855ac3099d09a38
+Removing note for object 413376f50b0489aaecbce66bf7b54b98e6550e03
+Removing note for object 2873e3beec9c3d56bad8f485e61d6a2cf9a16c8c
+Removing note for object 61f865b2efc1072fdb8ed9fe06118feae86e84f7
+Removing note for object 1ea06f1458f13efee0b785253f989b694f938edb
+Removing note for object ce8b86ae2c160f88e1c799aa6837f6c773956227
+Removing note for object e3306eaa12a31c691d43bbca19f98a2d9dab4ba9
+Removing note for object c2fb991d7ec9543b161f4f98c624929675ff4c5d
+Removing note for object d11385ba15c9c5e331981f68dd6bd7164ccf3f85
+Removing note for object 6f891e8ffe677a4c89d16dd2c665ee0e14c7a299
+Removing note for object ed339d1d371f85637989f68d0eb557f351577a21
+Removing note for object 4750ac4f1a2e220c1e8f6640294532c98d99f200
+Removing note for object f292c7df6101b6388f4d124dd0e359f53665aeb9
+Removing note for object 6457f18ae180c94ff5f7e0ea32f5d33194813bd5
+Removing note for object 80dca81cb5b833d22335d913b49a273d34062db9
+Removing note for object c4a04fb500fde0e2ec185ceef5e830841ef81190
+Removing note for object 37f7f6d33ccea935fd3052dcf56f0702a5688a56
+Removing note for object b174abe99a10da71c24f307c4be43b8fd13ddd81
+Removing note for object 521324fde746e0ed1d52d3da451c3d5ce0a51853
+Removing note for object 22145dda21dc965767c9837a456e045b0b905d72
+Removing note for object 65cd0782f778269cac585ca0cfceb3b65b4b0136
+Removing note for object 9f0e002cb37dba666555cb19d9825d53bc1efc7e
+Removing note for object ff7230819570fd6ca726ec2870c7acdbc33475eb
+Removing note for object fdf030fde5370388b806af92806e62e2bfb1bb11
+Removing note for object 5bbfd9a6221cce07357876e6702a17e7a96faae5
+Removing note for object 5863cde659f7dda95d24a43459f482038bbe8eba
+Removing note for object dcbb95084ba98cb6a950efc8a6f340b84dee87c7
+Removing note for object 2f60ea03c053734f2cde5a7f31ace9bac1ee19da
+Removing note for object 7dea3506366b9b27f57bafeb6e5bd508b00c5923
+Removing note for object 589a50a5e7daf7983baf43177e3fab221b3f0781
+Removing note for object 9a87326a7e4fec8672ce330e076fc6dba7c23366
+Removing note for object 177838d572b4628311ae9ba649a598c0627c2088
+Removing note for object b00c6f3383767d26b6b6af4057c6c9e56ec72803
+Removing note for object d856441fdb792888b635d1f62bfba9e64b772960
+Removing note for object 3f023909b06329744f931861ebb9c9bd12da1b84
+Removing note for object b161b8a0267657e40c21ea0a7637c9da05cb6234
+Removing note for object c3f42ce00ec78e8c5653eee37687d86870c1d2c5
+Removing note for object fc070b682384d45f45798cb8883f6f779a8d105f
+Removing note for object 794e608cc670532a53e521b37080ac4fb39e5775
+Removing note for object ce4d96ea40482e50d733d943d3aa1326c5f27f20
+Removing note for object 93d93d194fd2c9309ad75ba0ac36eed962540471
+Removing note for object f5ddfa52c42f3fe5bc24b1d7436d269718fb4ec6
+Removing note for object 84e47a901d70a1b913359a59b0eb4128921d6764
+Removing note for object 54a943437a41a035ae36187788f7863a14677754
+Removing note for object 6a28e6066c6213cc0535eb58ea15cc26cc0cb17d
+Removing note for object 7d8ba8659bb15e61daf37be731562cafc8701af4
+Removing note for object c2a06db27f237154cdf5ae99e9336ad7ac101c75
+Removing note for object ebcbe749543cb23055bfad287b08edd5dd506e49
+Removing note for object 22e47c76aa2449f554aa282f61ce8005a9da279e
+Removing note for object 81090cc10824f5f6a229195d061d5a062241f64e
+Removing note for object 27437784483a95ad6a86161d4e6082efa3fc4b99
+Removing note for object 1becd0970add28104ec7023fa8660f59c8dc85e5
+Removing note for object 975edfc698cb84099be9cd6f54b94c6b0bdfbf3e
+Removing note for object 698172dcc506d88c5d745f6b441ce316e908ac25
+Removing note for object 6c5035c5f925f25c4081fe33bea2e87bd4344eeb
+Removing note for object 7a1b8459367f67da01cbd0852e27aafa063eae5b
+Removing note for object 34a270c65107179578d5cf71f88997941cfceb68
+Removing note for object e1ca3debff6d7f8751a0c43f8e649c37c39ddcff
+Removing note for object f2cd69f72028b7f0334dc46c677dbf6e34c64ff9
+Removing note for object b5b96cb5f658ff89cad9d65d3fe90935741d4280
+Removing note for object 3d231f1ae4643fde656b5195e8a44598a524346c
+Removing note for object 92aff6e6403899d4467dca0759a5f9ca9f6083e8
+Removing note for object d7d8923b4e4c23a1f6a66f072403269416d7bdc5
+Removing note for object f5dbbac5c21c898c8673760bc67123f9ca551f62
+Removing note for object 671b9a1a077aafd0194137ce810e99e8e17aabf7
+Removing note for object cf858fab0fd223f87642d61c2dec71777d597370
+Removing note for object 404b958c22b0eec12dd009d4e6bc043a995096ad
+Removing note for object 30e25d85636fbb5a3962893e97204525d507fe5b
+Removing note for object 68fdee2a017d2b19536a79794a90ac13ad3c9120
+Removing note for object 2beb65e939af69464e8ed5dcdd4c10f8ab65110e
+Removing note for object ae862168e1774f973a69502c447480f81c035c00
+Removing note for object 422f97df0f1f254299575475841c717032a6ca32
+Removing note for object f7b9f4caf310f040a99a8117be5928e95be0b97e
+Removing note for object 7bb335e0bde4008652eb5f427a4a7390ae288309
+Removing note for object f17072c2db1767d4e1c41e0411294506f014c2af
+Removing note for object 99c50e745458fd2faf1c0f55273b7512348d2ddc
+Removing note for object 9aa56e0371ac9a4a4f10b34878d53d83ca8190ca
+Removing note for object 8738fb580d364e7645f0f7e0206dd1f000f03c84
+Removing note for object 2db58456e56e9ee9f425944d1c7743519a24784d
+Removing note for object a33d485949f214abc9fbb192ff36632eaa4cf0b3
+Removing note for object 8e59f0f4fc11cc909b24f15a6ef1b6e1a3fa7bc8
+Removing note for object cd604ed04d960a2e7fead48dd5d1e3fd9ca7886d
+Removing note for object 0c320249ca0ddd30c6fc90374656f6331633280a
+Removing note for object f15d09c23da1e142fd85798fbd4ac0b29cb858f3
+Removing note for object 0a256346bb1c2687845aca1e06c2dcb5d1ac9cf3
+Removing note for object 03a07cdc62a571762b99320c43428698b2d3d91b
+Removing note for object 86b4ee723d450722f69493786dc1a1b3c85f456b
+Removing note for object 5ef6c6a2209bc341ee9300945ee24397668600e9
+Removing note for object eee7b5e88db8d2f4eeff2bfd4ced42dc2b77576c
+Removing note for object 331c2d29861aa09a00a73056e70f156650ef1b4a
+Removing note for object bb32de951ad1f794e77afa53a31aa9433bfdb121
+Removing note for object fe8c44ed3546c964bd8398f5fc0c8d5ee01c08dd
+Removing note for object ac00acde313fa0157a4805bdbce2f22d7e57750a
+Removing note for object 1adc2b3c4610b4da4b2c00cbf153395bb5f72ed0
+Removing note for object 59238cad6edee95b454423e535876306852f6b93
+Removing note for object 4f5bde2686729dfaa60e10051820409fc7102027
+Removing note for object 07db9a697feba6bacfc603c13c8c184c376c1fde
+Removing note for object acd7eec9dcc24a3fda4a46d9cf11056f9fb51592
+Removing note for object 198c967016d1d00e0fc01d66d500fec19cb672e2
+Removing note for object 6d7b633c45a92a296093e657ced14d46d8e86970
+Removing note for object 8f6653f2c207619ceba3794249d8bac152454b16
+Removing note for object c04389fb08740d6a3df7158a5e4843bdc07d2539
+Removing note for object 77cd9bf11d2a4b1577dbcb65eafef24ca5f8d64c
+Removing note for object 4d2fca6077788dcdecd4ef82eb45155d3d3c6ae9
+Removing note for object 7f5b0d2394f7a4410784788eb55a86357795e0ee
+Removing note for object 77c91abace28d046f8f08482515dd4d0ee20e771
+Removing note for object 407c31999146268ab83d71891c905685839800c9
+Removing note for object eb3c3aede523d729990ac25c62a93eb47c21e2e3
+Removing note for object 7d116c2f10b15fa50a8e9f229b3b81c5be8980fa
+Removing note for object 8b658fffa694c94a228bd277048256f1ede590d1
+Removing note for object 0cb7eabc69f7cd5f3859906e5aa190bf6a0080dc
+Removing note for object 1270dedbb9873b651b7661f6fd7f20eca25dcce9
+Removing note for object b944dbe8ce8fa4df89750bdf3a6cd8828ff2f1b9
+Removing note for object a8b0b847225e38e28d972bb583db100457dbf2c0
+Removing note for object 46dcf25ab1fb7b08d57dfef57c2d4ef9cdea0368
+Removing note for object 1ef946fbe3fce53728ce0f4e3f3b686f29783ea9
+Removing note for object 9fb987e1900004b51a70d9945feb70d1a26c5db9
+Removing note for object 697e0a1102060a6a7f0e78c614e6e088e22a746d
+Removing note for object 5c65b7962b5bb7291f385885ae0fe5dc5dd1f9f9
+Removing note for object bdeafb301e44b0e4db0f738a2d2a7beefdb70b70
+Removing note for object 51b4081b24cd2ae32dda79a6bf89c6ca47cd0e19
+Removing note for object 6699f4279478278b1b456670806c5114e5b94cd3
+Removing note for object 24a6294035c71abc89705f20573835a048058e48
+Removing note for object 68e303067eaade6915640259529f90f06a3d723f
+Removing note for object 47797ab742998acf558ec5ecd8f73a170767322d
+Removing note for object a68559cad834c4bf10f897cacff96708fd4c9a06
+Removing note for object 257cfeaa5d3091ff76387dc6129e83307e8ec0c5
+Removing note for object f133b89cb79d15f0d85a19317b2dbc5a871c2039
+Removing note for object bff2d39b4f7122bd4c5caee3de353a774d1e632a
+Removing note for object b2f9acae37b0cff7904de95d05e6077d318696c2
+Removing note for object 46f7cc54c0193d02dc4dff1c8f998cfebb8c17b8
+Removing note for object d38ec8f851adf470131178085bfbaab4b12ad2a7
+Removing note for object 597947c97e89280e1eddffc4c30e36c1cb5e8882
+Removing note for object f297f34cfbd904559c0d202b578b112ef5ae50c2
+Removing note for object edd7609018ee7927fd1f8604ea3223e98a44a245
+Removing note for object 03f8530d6eb3617ab8c874b47651509115d54b5e
+Removing note for object ae3ed93531b892b72e7ae1125b3c0e266df4ab70
+Removing note for object ac647561477b7eddb3807defcb481b30af7db978
+Removing note for object 3f096680dbfb873aa9008e9e22559cc94c4a634e
+Removing note for object 7d50e571ffcb9d83478504d8fdd403aecd8df6a3
+Removing note for object 19eb0d4282bc5d4e46ec80864a71cd2e48bcf18c
+Removing note for object 5a50ba526cb7a741e3736b33e111cd5a35e68d3f
+Removing note for object 90911a48f69e3d23142660e2e658bb72d6bb30d2
+Removing note for object 382d7647311957adb8d7feccfbfddfd6d092d875
+Removing note for object ab5f23d01513db15925fbc0d19e07dc67bb7695d
+ok 5 - deleting most notes with git-notes
+
+expecting success of 3305.6 'most notes deleted correctly with git-notes': 
+	git log HEAD~$remove_notes | grep "^    " > output &&
+	i=$(($num_notes - $remove_notes)) &&
+	while test $i -gt 0
+	do
+		echo "    commit #$i" &&
+		echo "    note #$i" &&
+		i=$(($i - 1)) || return 1
+	done > expect &&
+	test_cmp expect output
+
+ok 6 - most notes deleted correctly with git-notes
+
+expecting success of 3305.7 'stable fanout 1 is followed by stable fanout 0': 
+	i=$remove_notes &&
+	fanout=1 &&
+	while test $i -gt 0
+	do
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i D $fanout
+		then
+			continue
+		elif test $fanout -eq 1
+		then
+			fanout=0 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 1 -> 0 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 0
+
+Fanout 1 -> 0 at refs/notes/commits~43
+ok 7 - stable fanout 1 is followed by stable fanout 0
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3907-stash-show-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3905-stash-include-untracked.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3905-stash-include-untracked/.git/
+expecting success of 3905.1 'stash save --include-untracked some dirty working directory': 
+	echo 1 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo 2 >file &&
+	git add file &&
+	echo 3 >file &&
+	test_tick &&
+	echo 1 >file2 &&
+	echo 1 >HEAD &&
+	mkdir untracked &&
+	echo untracked >untracked/untracked &&
+	git stash --include-untracked &&
+	git diff-files --quiet &&
+	git diff-index --cached --quiet HEAD
+
+[master (root-commit) 777c62c] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Saved working directory and index state WIP on master: 777c62c initial
+ok 1 - stash save --include-untracked some dirty working directory
+
+expecting success of 3905.2 'stash save --include-untracked cleaned the untracked files': 
+	cat >expect <<-EOF &&
+	?? actual
+	?? expect
+	EOF
+
+	git status --porcelain >actual &&
+	test_cmp expect actual
+
+ok 2 - stash save --include-untracked cleaned the untracked files
+
+expecting success of 3905.3 'stash save --include-untracked stashed the untracked files': 
+	one_blob=$(echo 1 | git hash-object --stdin) &&
+	tracked=$(git rev-parse --short "$one_blob") &&
+	untracked_blob=$(echo untracked | git hash-object --stdin) &&
+	untracked=$(git rev-parse --short "$untracked_blob") &&
+	cat >expect.diff <<-EOF &&
+	diff --git a/HEAD b/HEAD
+	new file mode 100644
+	index 0000000..$tracked
+	--- /dev/null
+	+++ b/HEAD
+	@@ -0,0 +1 @@
+	+1
+	diff --git a/file2 b/file2
+	new file mode 100644
+	index 0000000..$tracked
+	--- /dev/null
+	+++ b/file2
+	@@ -0,0 +1 @@
+	+1
+	diff --git a/untracked/untracked b/untracked/untracked
+	new file mode 100644
+	index 0000000..$untracked
+	--- /dev/null
+	+++ b/untracked/untracked
+	@@ -0,0 +1 @@
+	+untracked
+	EOF
+	cat >expect.lstree <<-EOF &&
+	HEAD
+	file2
+	untracked
+	EOF
+
+	test_path_is_missing file2 &&
+	test_path_is_missing untracked &&
+	test_path_is_missing HEAD &&
+	git diff HEAD stash^3 -- HEAD file2 untracked >actual &&
+	test_cmp expect.diff actual &&
+	git ls-tree --name-only stash^3: >actual &&
+	test_cmp expect.lstree actual
+
+ok 3 - stash save --include-untracked stashed the untracked files
+
+expecting success of 3905.4 'stash save --patch --include-untracked fails': 
+	test_must_fail git stash --patch --include-untracked
+
+Can't use --patch and --include-untracked or --all at the same time
+ok 4 - stash save --patch --include-untracked fails
+
+expecting success of 3905.5 'stash save --patch --all fails': 
+	test_must_fail git stash --patch --all
+
+Can't use --patch and --include-untracked or --all at the same time
+ok 5 - stash save --patch --all fails
+
+expecting success of 3905.6 'clean up untracked/untracked file to prepare for next tests': 
+	git clean --force --quiet
+
+
+ok 6 - clean up untracked/untracked file to prepare for next tests
+
+expecting success of 3905.7 'stash pop after save --include-untracked leaves files untracked again': 
+	cat >expect <<-EOF &&
+	 M file
+	?? HEAD
+	?? actual
+	?? expect
+	?? file2
+	?? untracked/
+	EOF
+
+	git stash pop &&
+	git status --porcelain >actual &&
+	test_cmp expect actual &&
+	echo 1 >expect_file2 &&
+	test_cmp expect_file2 file2 &&
+	echo untracked >untracked_expect &&
+	test_cmp untracked_expect untracked/untracked
+
+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
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	HEAD
+	expect
+	file2
+	untracked/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (b870f65afe7416482148902ff5b21a724244d053)
+ok 7 - stash pop after save --include-untracked leaves files untracked again
+
+expecting success of 3905.8 'clean up untracked/ directory to prepare for next tests': 
+	git clean --force --quiet -d
+
+ok 8 - clean up untracked/ directory to prepare for next tests
+
+expecting success of 3905.9 'stash save -u dirty index': 
+	echo 4 >file3 &&
+	git add file3 &&
+	test_tick &&
+	git stash -u
+
+Saved working directory and index state WIP on master: 777c62c initial
+ok 9 - stash save -u dirty index
+
+expecting success of 3905.10 'stash save --include-untracked dirty index got stashed': 
+	four_blob=$(echo 4 | git hash-object --stdin) &&
+	blob=$(git rev-parse --short "$four_blob") &&
+	cat >expect <<-EOF &&
+	diff --git a/file3 b/file3
+	new file mode 100644
+	index 0000000..$blob
+	--- /dev/null
+	+++ b/file3
+	@@ -0,0 +1 @@
+	+4
+	EOF
+
+	git stash pop --index &&
+	test_when_finished "git reset" &&
+	git diff --cached >actual &&
+	test_cmp expect actual
+
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file3
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+
+Dropped refs/stash@{0} (6fe995aa91ff10c4e2af89ab165bd888828517d0)
+Unstaged changes after reset:
+M	file
+ok 10 - stash save --include-untracked dirty index got stashed
+
+expecting success of 3905.11 'stash save --include-untracked -q is quiet': 
+	echo 1 >file5 &&
+	git stash save --include-untracked --quiet >.git/stash-output.out 2>&1 &&
+	test_line_count = 0 .git/stash-output.out &&
+	rm -f .git/stash-output.out
+
+ok 11 - stash save --include-untracked -q is quiet
+
+expecting success of 3905.12 'stash save --include-untracked removed files': 
+	rm -f file &&
+	git stash save --include-untracked &&
+	echo 1 >expect &&
+	test_when_finished "rm -f expect" &&
+	test_cmp expect file
+
+Saved working directory and index state WIP on master: 777c62c initial
+ok 12 - stash save --include-untracked removed files
+
+expecting success of 3905.13 'stash save --include-untracked removed files got stashed': 
+	git stash pop &&
+	test_path_is_missing file
+
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    file
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (909f7032bbeb8f8ef8a3aa293429dac49a9d18ff)
+ok 13 - stash save --include-untracked removed files got stashed
+
+expecting success of 3905.14 'stash save --include-untracked respects .gitignore': 
+	cat >.gitignore <<-EOF &&
+	.gitignore
+	ignored
+	ignored.d/
+	EOF
+
+	echo ignored >ignored &&
+	mkdir ignored.d &&
+	echo ignored >ignored.d/untracked &&
+	git stash -u &&
+	test_file_not_empty ignored &&
+	test_file_not_empty ignored.d/untracked &&
+	test_file_not_empty .gitignore
 
-expecting success of 3070.1609 'ipathmatch: no match 'foo' 'fo'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' 'fo'
-		
-ok 1609 - ipathmatch: no match 'foo' 'fo'
+Saved working directory and index state WIP on master: 777c62c initial
+ok 14 - stash save --include-untracked respects .gitignore
 
-expecting success of 3070.1610 'ipathmatch (via ls-files): no match 'fo' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1610 - ipathmatch (via ls-files): no match 'fo' 'foo'
+expecting success of 3905.15 'stash save -u can stash with only untracked files different': 
+	echo 4 >file4 &&
+	git stash -u &&
+	test_path_is_missing file4
 
-expecting success of 3070.1611 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 1611 - cleanup after previous file test
+Saved working directory and index state WIP on master: 777c62c initial
+ok 15 - stash save -u can stash with only untracked files different
 
-expecting success of 3070.1612 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1612 - setup match file test for foo/bar
+expecting success of 3905.16 'stash save --all does not respect .gitignore': 
+	git stash -a &&
+	test_path_is_missing ignored &&
+	test_path_is_missing ignored.d &&
+	test_path_is_missing .gitignore
 
-expecting success of 3070.1613 'wildmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/bar'
-		
-ok 1613 - wildmatch: match 'foo/bar' 'foo/bar'
+Saved working directory and index state WIP on master: 777c62c initial
+ok 16 - stash save --all does not respect .gitignore
 
-expecting success of 3070.1614 'wildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1614 - wildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+expecting success of 3905.17 'stash save --all is stash poppable': 
+	git stash pop &&
+	test_file_not_empty ignored &&
+	test_file_not_empty ignored.d/untracked &&
+	test_file_not_empty .gitignore
 
-expecting success of 3070.1615 'iwildmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/bar'
-		
-ok 1615 - iwildmatch: match 'foo/bar' 'foo/bar'
+Merging Version stash was based on with Stashed changes
+Already up to date.
+On branch master
+nothing to commit, working tree clean
+Dropped refs/stash@{0} (7e729995c69630f26ee14cf7ce02b080da67ecd1)
+ok 17 - stash save --all is stash poppable
 
-expecting success of 3070.1616 'iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1616 - iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+expecting success of 3905.18 'stash push --include-untracked with pathspec': 
+	>foo &&
+	>bar &&
+	git stash push --include-untracked -- foo &&
+	test_path_is_file bar &&
+	test_path_is_missing foo &&
+	git stash pop &&
+	test_path_is_file bar &&
+	test_path_is_file foo
 
-expecting success of 3070.1617 'pathmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo/bar'
-		
-ok 1617 - pathmatch: match 'foo/bar' 'foo/bar'
+Saved working directory and index state WIP on master: 777c62c initial
+Merging Version stash was based on with Stashed changes
+Already up to date.
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	bar
+	foo
 
-expecting success of 3070.1618 'pathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1618 - pathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+nothing added to commit but untracked files present (use "git add" to track)
+Dropped refs/stash@{0} (8c4436f5c5cee126e0672d6347a425d7e9dcfcdd)
+ok 18 - stash push --include-untracked with pathspec
 
-expecting success of 3070.1619 'ipathmatch: match 'foo/bar' 'foo/bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo/bar'
-		
-ok 1619 - ipathmatch: match 'foo/bar' 'foo/bar'
+expecting success of 3905.19 'stash push with $IFS character': 
+	>"foo bar" &&
+	>foo &&
+	>bar &&
+	git add foo* &&
+	git stash push --include-untracked -- "foo b*" &&
+	test_path_is_missing "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar &&
+	git stash pop &&
+	test_path_is_file "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar
 
-expecting success of 3070.1620 'ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1620 - ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+Saved working directory and index state WIP on master: 777c62c initial
+Merging Updated upstream with Stashed changes
+On branch master
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   foo
+	new file:   foo bar
 
-expecting success of 3070.1621 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1621 - cleanup after previous file test
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	bar
 
-expecting success of 3070.1622 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1622 - setup match file test for foo/bar
+Dropped refs/stash@{0} (35eb97973117e33f4570df8b356a559959935987)
+ok 19 - stash push with $IFS character
 
-expecting success of 3070.1623 'wildmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/*'
-		
-ok 1623 - wildmatch: match 'foo/bar' 'foo/*'
+expecting success of 3905.20 'stash previously ignored file': 
+	cat >.gitignore <<-EOF &&
+	ignored
+	ignored.d/*
+	EOF
 
-expecting success of 3070.1624 'wildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1624 - wildmatch (via ls-files): match 'foo/*' 'foo/bar'
+	git reset HEAD &&
+	git add .gitignore &&
+	git commit -m "Add .gitignore" &&
+	>ignored.d/foo &&
+	echo "!ignored.d/foo" >>.gitignore &&
+	git stash save --include-untracked &&
+	test_path_is_missing ignored.d/foo &&
+	git stash pop &&
+	test_path_is_file ignored.d/foo
 
-expecting success of 3070.1625 'iwildmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/*'
-		
-ok 1625 - iwildmatch: match 'foo/bar' 'foo/*'
+[master 14579a4] Add .gitignore
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 .gitignore
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+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:   .gitignore
 
-expecting success of 3070.1626 'iwildmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1626 - iwildmatch (via ls-files): match 'foo/*' 'foo/bar'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	bar
+	foo
+	foo bar
+	ignored.d/
 
-expecting success of 3070.1627 'pathmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo/*'
-		
-ok 1627 - pathmatch: match 'foo/bar' 'foo/*'
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (cd3bab6f4eef73edff723219ece7e89ceec0e923)
+ok 20 - stash previously ignored file
 
-expecting success of 3070.1628 'pathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1628 - pathmatch (via ls-files): match 'foo/*' 'foo/bar'
+expecting success of 3905.21 'stash -u -- <untracked> doesnt print error': 
+	>untracked &&
+	git stash push -u -- untracked 2>actual &&
+	test_path_is_missing untracked &&
+	test_line_count = 0 actual
 
-expecting success of 3070.1629 'ipathmatch: match 'foo/bar' 'foo/*'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo/*'
-		
-ok 1629 - ipathmatch: match 'foo/bar' 'foo/*'
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 21 - stash -u -- <untracked> doesnt print error
 
-expecting success of 3070.1630 'ipathmatch (via ls-files): match 'foo/*' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1630 - ipathmatch (via ls-files): match 'foo/*' 'foo/bar'
+expecting success of 3905.22 'stash -u -- <untracked> leaves rest of working tree in place': 
+	>tracked &&
+	git add tracked &&
+	>untracked &&
+	git stash push -u -- untracked &&
+	test_path_is_missing untracked &&
+	test_path_is_file tracked
 
-expecting success of 3070.1631 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1631 - cleanup after previous file test
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 22 - stash -u -- <untracked> leaves rest of working tree in place
 
-expecting success of 3070.1632 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1632 - setup match file test for foo/bba/arr
+expecting success of 3905.23 'stash -u -- <tracked> <untracked> clears changes in both': 
+	>tracked &&
+	git add tracked &&
+	>untracked &&
+	git stash push -u -- tracked untracked &&
+	test_path_is_missing tracked &&
+	test_path_is_missing untracked
 
-expecting success of 3070.1633 'wildmatch: no match 'foo/bba/arr' 'foo/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*'
-		
-ok 1633 - wildmatch: no match 'foo/bba/arr' 'foo/*'
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 23 - stash -u -- <tracked> <untracked> clears changes in both
 
-expecting success of 3070.1634 'wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1634 - wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+expecting success of 3905.24 'stash --all -- <ignored> stashes ignored file': 
+	>ignored.d/bar &&
+	git stash push --all -- ignored.d/bar &&
+	test_path_is_missing ignored.d/bar
 
-expecting success of 3070.1635 'iwildmatch: no match 'foo/bba/arr' 'foo/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*'
-		
-ok 1635 - iwildmatch: no match 'foo/bba/arr' 'foo/*'
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 24 - stash --all -- <ignored> stashes ignored file
 
-expecting success of 3070.1636 'iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1636 - iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+expecting success of 3905.25 'stash --all -- <tracked> <ignored> clears changes in both': 
+	>tracked &&
+	git add tracked &&
+	>ignored.d/bar &&
+	git stash push --all -- tracked ignored.d/bar &&
+	test_path_is_missing tracked &&
+	test_path_is_missing ignored.d/bar
 
-expecting success of 3070.1637 'pathmatch: match 'foo/bba/arr' 'foo/*'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*'
-		
-ok 1637 - pathmatch: match 'foo/bba/arr' 'foo/*'
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 25 - stash --all -- <tracked> <ignored> clears changes in both
 
-expecting success of 3070.1638 'pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1638 - pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+expecting success of 3905.26 'stash -u -- <ignored> leaves ignored file alone': 
+	>ignored.d/bar &&
+	git stash push -u -- ignored.d/bar &&
+	test_path_is_file ignored.d/bar
 
-expecting success of 3070.1639 'ipathmatch: match 'foo/bba/arr' 'foo/*'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*'
-		
-ok 1639 - ipathmatch: match 'foo/bba/arr' 'foo/*'
+No local changes to save
+ok 26 - stash -u -- <ignored> leaves ignored file alone
 
-expecting success of 3070.1640 'ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1640 - ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+expecting success of 3905.27 'stash -u -- <non-existent> shows no changes when there are none': 
+	git stash push -u -- non-existent >actual &&
+	echo "No local changes to save" >expect &&
+	test_cmp expect actual
 
-expecting success of 3070.1641 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1641 - cleanup after previous file test
+ok 27 - stash -u -- <non-existent> shows no changes when there are none
 
-expecting success of 3070.1642 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1642 - setup match file test for foo/bba/arr
+expecting success of 3905.28 'stash -u with globs': 
+	>untracked.txt &&
+	git stash -u -- ":(glob)**/*.txt" &&
+	test_path_is_missing untracked.txt
 
-expecting success of 3070.1643 'wildmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**'
-		
-ok 1643 - wildmatch: match 'foo/bba/arr' 'foo/**'
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 28 - stash -u with globs
 
-expecting success of 3070.1644 'wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1644 - wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+expecting success of 3905.29 'stash show --include-untracked shows untracked files': 
+	git reset --hard &&
+	git clean -xf &&
+	>untracked &&
+	>tracked &&
+	git add tracked &&
+	empty_blob_oid=$(git rev-parse --short :tracked) &&
+	git stash -u &&
 
-expecting success of 3070.1645 'iwildmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**'
-		
-ok 1645 - iwildmatch: match 'foo/bba/arr' 'foo/**'
+	cat >expect <<-EOF &&
+	 tracked   | 0
+	 untracked | 0
+	 2 files changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git stash show --include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show -u >actual &&
+	test_cmp expect actual &&
+	git stash show --no-include-untracked --include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --only-untracked --include-untracked >actual &&
+	test_cmp expect actual &&
+	git -c stash.showIncludeUntracked=true stash show >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3070.1646 'iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1646 - iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+	cat >expect <<-EOF &&
+	diff --git a/tracked b/tracked
+	new file mode 100644
+	index 0000000..$empty_blob_oid
+	diff --git a/untracked b/untracked
+	new file mode 100644
+	index 0000000..$empty_blob_oid
+	EOF
+	git stash show -p --include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --include-untracked -p >actual &&
+	test_cmp expect actual &&
+	git -c stash.showIncludeUntracked=true stash show -p >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.1647 'pathmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**'
-		
-ok 1647 - pathmatch: match 'foo/bba/arr' 'foo/**'
+HEAD is now at 14579a4 Add .gitignore
+Removing actual
+Removing bar
+Removing expect
+Removing foo
+Removing foo bar
+Removing ignored
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 29 - stash show --include-untracked shows untracked files
 
-expecting success of 3070.1648 'pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1648 - pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+expecting success of 3905.30 'stash show --only-untracked only shows untracked files': 
+	git reset --hard &&
+	git clean -xf &&
+	>untracked &&
+	>tracked &&
+	git add tracked &&
+	empty_blob_oid=$(git rev-parse --short :tracked) &&
+	git stash -u &&
 
-expecting success of 3070.1649 'ipathmatch: match 'foo/bba/arr' 'foo/**'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**'
-		
-ok 1649 - ipathmatch: match 'foo/bba/arr' 'foo/**'
+	cat >expect <<-EOF &&
+	 untracked | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git stash show --only-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --no-include-untracked --only-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --include-untracked --only-untracked >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3070.1650 'ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1650 - ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+	cat >expect <<-EOF &&
+	diff --git a/untracked b/untracked
+	new file mode 100644
+	index 0000000..$empty_blob_oid
+	EOF
+	git stash show -p --only-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --only-untracked -p >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.1651 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
+HEAD is now at 14579a4 Add .gitignore
 Removing actual
-Removing actual.err
-Removing actual.raw
 Removing expect
-Removing foo/
-ok 1651 - cleanup after previous file test
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 30 - stash show --only-untracked only shows untracked files
 
-expecting success of 3070.1652 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1652 - setup match file test for foo/bba/arr
+expecting success of 3905.31 'stash show --no-include-untracked cancels --{include,only}-untracked': 
+	git reset --hard &&
+	git clean -xf &&
+	>untracked &&
+	>tracked &&
+	git add tracked &&
+	git stash -u &&
 
-expecting success of 3070.1653 'wildmatch: no match 'foo/bba/arr' 'foo*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo*'
-		
-ok 1653 - wildmatch: no match 'foo/bba/arr' 'foo*'
+	cat >expect <<-EOF &&
+	 tracked | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git stash show --only-untracked --no-include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --include-untracked --no-include-untracked >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.1654 'wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1654 - wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+HEAD is now at 14579a4 Add .gitignore
+Removing actual
+Removing expect
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 31 - stash show --no-include-untracked cancels --{include,only}-untracked
 
-expecting success of 3070.1655 'iwildmatch: no match 'foo/bba/arr' 'foo*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo*'
-		
-ok 1655 - iwildmatch: no match 'foo/bba/arr' 'foo*'
+expecting success of 3905.32 'stash show --include-untracked errors on duplicate files': 
+	git reset --hard &&
+	git clean -xf &&
+	>tracked &&
+	git add tracked &&
+	tree=$(git write-tree) &&
+	i_commit=$(git commit-tree -p HEAD -m "index on any-branch" "$tree") &&
+	test_when_finished "rm -f untracked_index" &&
+	u_commit=$(
+		GIT_INDEX_FILE="untracked_index" &&
+		export GIT_INDEX_FILE &&
+		git update-index --add tracked &&
+		u_tree=$(git write-tree) &&
+		git commit-tree -m "untracked files on any-branch" "$u_tree"
+	) &&
+	w_commit=$(git commit-tree -p HEAD -p "$i_commit" -p "$u_commit" -m "WIP on any-branch" "$tree") &&
+	test_must_fail git stash show --include-untracked "$w_commit" 2>err &&
+	test_grep "worktree and untracked commit have duplicate entries: tracked" err
 
-expecting success of 3070.1656 'iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1656 - iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+HEAD is now at 14579a4 Add .gitignore
+Removing actual
+Removing expect
+error: worktree and untracked commit have duplicate entries: tracked
+ok 32 - stash show --include-untracked errors on duplicate files
 
-expecting success of 3070.1657 'pathmatch: match 'foo/bba/arr' 'foo*'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo*'
-		
-ok 1657 - pathmatch: match 'foo/bba/arr' 'foo*'
+expecting success of 3905.33 'stash show --{include,only}-untracked on stashes without untracked entries': 
+	git reset --hard &&
+	git clean -xf &&
+	>tracked &&
+	git add tracked &&
+	git stash &&
 
-expecting success of 3070.1658 'pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1658 - pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+	git stash show >expect &&
+	git stash show --include-untracked >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3070.1659 'ipathmatch: match 'foo/bba/arr' 'foo*'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo*'
-		
-ok 1659 - ipathmatch: match 'foo/bba/arr' 'foo*'
+	git stash show --only-untracked >actual &&
+	test_must_be_empty actual
 
-expecting success of 3070.1660 'ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1660 - ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+HEAD is now at 14579a4 Add .gitignore
+Removing err
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 33 - stash show --{include,only}-untracked on stashes without untracked entries
 
-expecting success of 3070.1661 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+expecting success of 3905.34 'stash -u ignores sub-repository': 
+	test_when_finished "rm -rf sub-repo" &&
+	git init sub-repo &&
+	git stash -u
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3905-stash-include-untracked/sub-repo/.git/
+Ignoring path sub-repo/
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 34 - stash -u ignores sub-repository
+
+# passed all 34 test(s)
+1..34
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3513-revert-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/.git/
+expecting success of 3513.1 'git_revert: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1661 - cleanup after previous file test
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+[add_sub1 000ad6b] Reapply "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_revert: added submodule creates empty directory
 
-expecting success of 3070.1662 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+expecting success of 3513.2 'git_revert: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1662 - setup match file test for foo/bba/arr
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+[add_sub1 000ad6b] Reapply "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_revert: added submodule leaves existing empty directory alone
 
-expecting success of 3070.1663 'wildmatch: no match 'foo/bba/arr' 'foo**'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo**'
-		
-ok 1663 - wildmatch: no match 'foo/bba/arr' 'foo**'
+expecting success of 3513.3 'git_revert: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+[replace_file_with_sub1 2605f87] Reapply "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+[replace_file_with_sub1 03c927a] Revert "Reapply "Replace sub1 with file""
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_revert: replace tracked file with submodule creates empty directory
 
-expecting success of 3070.1664 'wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1664 - wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+expecting success of 3513.4 'git_revert: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+[replace_directory_with_sub1 52671cf] Reapply "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+[replace_directory_with_sub1 3cda69e] Revert "Reapply "Replace sub1 with directory""
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_revert: replace directory with submodule
 
-expecting success of 3070.1665 'iwildmatch: no match 'foo/bba/arr' 'foo**'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo**'
-		
-ok 1665 - iwildmatch: no match 'foo/bba/arr' 'foo**'
+expecting success of 3513.5 'git_revert: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 000ad6b] Reapply "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+warning: unable to rmdir 'sub1': Directory not empty
+[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 5 - git_revert: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 3070.1666 'iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1666 - iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+expecting success of 3513.6 'git_revert: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 000ad6b] Reapply "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+warning: unable to rmdir 'sub1': Directory not empty
+[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 6 - git_revert: removed submodule leaves submodule containing a .git directory alone
 
-expecting success of 3070.1667 'pathmatch: match 'foo/bba/arr' 'foo**'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo**'
-		
-ok 1667 - pathmatch: match 'foo/bba/arr' 'foo**'
+expecting success of 3513.7 'git_revert: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+ok 7 - git_revert: replace submodule with a directory must fail
 
-expecting success of 3070.1668 'pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1668 - pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+expecting success of 3513.8 'git_revert: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+ok 8 - git_revert: replace submodule containing a .git directory with a directory must fail
 
-expecting success of 3070.1669 'ipathmatch: match 'foo/bba/arr' 'foo**'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo**'
-		
-ok 1669 - ipathmatch: match 'foo/bba/arr' 'foo**'
+checking known breakage of 3513.9 'git_revert: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 9 - git_revert: replace submodule with a file must fail # TODO known breakage
 
-expecting success of 3070.1670 'ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1670 - ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+checking known breakage of 3513.10 'git_revert: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 10 - git_revert: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 3070.1671 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+expecting success of 3513.11 'git_revert: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1671 - cleanup after previous file test
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Switched to branch 'modify_sub1'
+Your branch is up to date with 'origin/modify_sub1'.
+[modify_sub1 d25c1ce] Revert "Modify sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+[modify_sub1 c259f2c] Reapply "Modify sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_revert: modified submodule does not update submodule work tree
 
-expecting success of 3070.1672 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+expecting success of 3513.12 'git_revert: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1672 - setup match file test for foo/bba/arr
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Switched to branch 'invalid_sub1'
+Your branch is up to date with 'origin/invalid_sub1'.
+[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+[invalid_sub1 b7227e2] Reapply "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git_revert: modified submodule does not update submodule work tree to invalid commit
 
-expecting success of 3070.1673 'wildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*arr'
-		
-ok 1673 - wildmatch: no match 'foo/bba/arr' 'foo/*arr'
+expecting success of 3513.13 'git_revert: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+[valid_sub1 b7227e2] Reapply "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+[valid_sub1 909462b] Revert "Reapply "Invalid sub1 commit""
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_revert: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 3070.1674 'wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1674 - wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+expecting success of 3513.14 'git_revert: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1
+Please move or remove them before you switch branches.
+Aborting
+ok 14 - git_revert: added submodule doesn't remove untracked unignored file with same name
 
-expecting success of 3070.1675 'iwildmatch: no match 'foo/bba/arr' 'foo/*arr'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*arr'
-		
-ok 1675 - iwildmatch: no match 'foo/bba/arr' 'foo/*arr'
+# still have 2 known breakage(s)
+# passed all remaining 12 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3701-add-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/.git/
+expecting success of 3701.1 'unknown command': 
+	test_when_finished "git reset --hard; rm -f command" &&
+	echo W >command &&
+	git add -N command &&
+	git diff command >expect &&
+	cat >>expect <<-EOF &&
+	(1/1) Stage addition [y,n,q,a,d,e,p,?]? Unknown command ${SQ}W${SQ} (use ${SQ}?${SQ} for help)
+	(1/1) Stage addition [y,n,q,a,d,e,p,?]?$SP
+	EOF
+	git add -p -- command <command >actual 2>&1 &&
+	test_cmp expect actual
 
-expecting success of 3070.1676 'iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1676 - iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+ok 1 - unknown command
 
-expecting success of 3070.1677 'pathmatch: match 'foo/bba/arr' 'foo/*arr'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*arr'
-		
-ok 1677 - pathmatch: match 'foo/bba/arr' 'foo/*arr'
+expecting success of 3701.2 'setup (initial)': 
+	echo content >file &&
+	git add file &&
+	echo more >>file &&
+	echo lines >>file
 
-expecting success of 3070.1678 'pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1678 - pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
+ok 2 - setup (initial)
 
-expecting success of 3070.1679 'ipathmatch: match 'foo/bba/arr' 'foo/*arr'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*arr'
-		
-ok 1679 - ipathmatch: match 'foo/bba/arr' 'foo/*arr'
+expecting success of 3701.3 'status works (initial)': 
+	git add -i </dev/null >output &&
+	grep "+1/-0 *+2/-0 file" output
 
-expecting success of 3070.1680 'ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1680 - ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
+  1:        +1/-0        +2/-0 file
+ok 3 - status works (initial)
 
-expecting success of 3070.1681 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1681 - cleanup after previous file test
+expecting success of 3701.4 'setup expected': 
+	cat >expected <<-\EOF
+	new file mode 100644
+	index 0000000..d95f3ad
+	--- /dev/null
+	+++ b/file
+	@@ -0,0 +1 @@
+	+content
+	EOF
 
-expecting success of 3070.1682 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1682 - setup match file test for foo/bba/arr
+ok 4 - setup expected
 
-expecting success of 3070.1683 'wildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**arr'
-		
-ok 1683 - wildmatch: no match 'foo/bba/arr' 'foo/**arr'
+expecting success of 3701.5 'diff works (initial)': 
+	test_write_lines d 1 | git add -i >output &&
+	sed -ne "/new file/,/content/p" <output >diff &&
+	diff_cmp expected diff
 
-expecting success of 3070.1684 'wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1684 - wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
+ok 5 - diff works (initial)
 
-expecting success of 3070.1685 'iwildmatch: no match 'foo/bba/arr' 'foo/**arr'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**arr'
-		
-ok 1685 - iwildmatch: no match 'foo/bba/arr' 'foo/**arr'
+expecting success of 3701.6 'revert works (initial)': 
+	git add file &&
+	test_write_lines r 1 | git add -i &&
+	git ls-files >output &&
+	! grep . output
 
-expecting success of 3070.1686 'iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1686 - iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
+           staged     unstaged path
+  1:        +3/-0      nothing file
 
-expecting success of 3070.1687 'pathmatch: match 'foo/bba/arr' 'foo/**arr'': 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**arr'
-		
-ok 1687 - pathmatch: match 'foo/bba/arr' 'foo/**arr'
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:        +3/-0      nothing [f]ile
+Revert>>            staged     unstaged path
+* 1:        +3/-0      nothing [f]ile
+Revert>> 
+note: file is untracked now.
+reverted 1 path
 
-expecting success of 3070.1688 'pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1688 - pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> 
+Bye.
+ok 6 - revert works (initial)
 
-expecting success of 3070.1689 'ipathmatch: match 'foo/bba/arr' 'foo/**arr'': 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**arr'
-		
-ok 1689 - ipathmatch: match 'foo/bba/arr' 'foo/**arr'
+expecting success of 3701.7 'add untracked (multiple)': 
+	test_when_finished "git reset && rm [1-9]" &&
+	touch $(test_seq 9) &&
+	test_write_lines a "2-5 8-" | git add -i -- [1-9] &&
+	test_write_lines 2 3 4 5 8 9 >expected &&
+	git ls-files [1-9] >output &&
+	test_cmp expected output
 
-expecting success of 3070.1690 'ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'': 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1690 - ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
 
-expecting success of 3070.1691 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1691 - cleanup after previous file test
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1: 1
+  2: 2
+  3: 3
+  4: 4
+  5: 5
+  6: 6
+  7: 7
+  8: 8
+  9: 9
+Add untracked>>            staged     unstaged path
+  1: 1
+* 2: 2
+* 3: 3
+* 4: 4
+* 5: 5
+  6: 6
+  7: 7
+* 8: 8
+* 9: 9
+Add untracked>> 
+added 6 paths
 
-expecting success of 3070.1692 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1692 - setup match file test for foo/bba/arr
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> 
+Bye.
+ok 7 - add untracked (multiple)
 
-expecting success of 3070.1693 'wildmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*z'
-		
-ok 1693 - wildmatch: no match 'foo/bba/arr' 'foo/*z'
+expecting success of 3701.8 'setup (commit)': 
+	echo baseline >file &&
+	git add file &&
+	git commit -m commit &&
+	echo content >>file &&
+	git add file &&
+	echo more >>file &&
+	echo lines >>file
 
-expecting success of 3070.1694 'wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1694 - wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+[main (root-commit) 4ef1e3a] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 8 - setup (commit)
 
-expecting success of 3070.1695 'iwildmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*z'
-		
-ok 1695 - iwildmatch: no match 'foo/bba/arr' 'foo/*z'
+expecting success of 3701.9 'status works (commit)': 
+	git add -i </dev/null >output &&
+	grep "+1/-0 *+2/-0 file" output
 
-expecting success of 3070.1696 'iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1696 - iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+  1:        +1/-0        +2/-0 file
+ok 9 - status works (commit)
 
-expecting success of 3070.1697 'pathmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*z'
-		
-ok 1697 - pathmatch: no match 'foo/bba/arr' 'foo/*z'
+expecting success of 3701.10 'update can stage deletions': 
+	>to-delete &&
+	git add to-delete &&
+	rm to-delete &&
+	test_write_lines u t "" | git add -i &&
+	git ls-files to-delete >output &&
+	test_must_be_empty output
 
-expecting success of 3070.1698 'pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
-				>expect &&
-				git ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1698 - pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+           staged     unstaged path
+  1:        +1/-0        +2/-0 file
+  2:        +0/-0        +0/-0 to-delete
 
-expecting success of 3070.1699 'ipathmatch: no match 'foo/bba/arr' 'foo/*z'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*z'
-		
-ok 1699 - ipathmatch: no match 'foo/bba/arr' 'foo/*z'
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:        +1/-0        +2/-0 [f]ile
+  2:        +0/-0        +0/-0 [t]o-delete
+Update>>            staged     unstaged path
+  1:        +1/-0        +2/-0 [f]ile
+* 2:        +0/-0        +0/-0 [t]o-delete
+Update>> updated 1 path
 
-expecting success of 3070.1700 'ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1700 - ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> 
+Bye.
+ok 10 - update can stage deletions
 
-expecting success of 3070.1701 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1701 - cleanup after previous file test
+expecting success of 3701.11 'setup expected': 
+	cat >expected <<-\EOF
+	index 180b47c..b6f2c08 100644
+	--- a/file
+	+++ b/file
+	@@ -1 +1,2 @@
+	 baseline
+	+content
+	EOF
 
-expecting success of 3070.1702 'setup match file test for foo/bba/arr': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1702 - setup match file test for foo/bba/arr
+ok 11 - setup expected
 
-expecting success of 3070.1703 'wildmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**z'
-		
-ok 1703 - wildmatch: no match 'foo/bba/arr' 'foo/**z'
+expecting success of 3701.12 'diff works (commit)': 
+	test_write_lines d 1 | git add -i >output &&
+	sed -ne "/^index/,/content/p" <output >diff &&
+	diff_cmp expected diff
 
-expecting success of 3070.1704 'wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1704 - wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 12 - diff works (commit)
 
-expecting success of 3070.1705 'iwildmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**z'
-		
-ok 1705 - iwildmatch: no match 'foo/bba/arr' 'foo/**z'
+expecting success of 3701.13 'revert works (commit)': 
+	git add file &&
+	test_write_lines r 1 | git add -i &&
+	git add -i </dev/null >output &&
+	grep "unchanged *+3/-0 file" output
 
-expecting success of 3070.1706 'iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1706 - iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+           staged     unstaged path
+  1:        +3/-0      nothing file
 
-expecting success of 3070.1707 'pathmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**z'
-		
-ok 1707 - pathmatch: no match 'foo/bba/arr' 'foo/**z'
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:        +3/-0      nothing [f]ile
+Revert>>            staged     unstaged path
+* 1:        +3/-0      nothing [f]ile
+Revert>> 
+reverted 1 path
 
-expecting success of 3070.1708 'pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
-				>expect &&
-				git ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1708 - pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> 
+Bye.
+  1:    unchanged        +3/-0 file
+ok 13 - revert works (commit)
 
-expecting success of 3070.1709 'ipathmatch: no match 'foo/bba/arr' 'foo/**z'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**z'
-		
-ok 1709 - ipathmatch: no match 'foo/bba/arr' 'foo/**z'
+expecting success of 3701.14 'reject multi-key input': 
+	saved=$(git hash-object -w file) &&
+	test_when_finished "git cat-file blob $saved >file" &&
+	echo an extra line >>file &&
+	test_write_lines aa | git add -p >actual &&
+	test_grep "is expected, got ${SQ}aa${SQ}" actual
 
-expecting success of 3070.1710 'ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1710 - ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? Only one letter is expected, got 'aa'
+ok 14 - reject multi-key input
 
-expecting success of 3070.1711 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1711 - cleanup after previous file test
+expecting success of 3701.15 'setup expected': 
+	cat >expected <<-\EOF
+	EOF
 
-expecting success of 3070.1712 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1712 - setup match file test for foo/bar
+ok 15 - setup expected
 
-expecting success of 3070.1713 'wildmatch: no match 'foo/bar' 'foo?bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
-		
-ok 1713 - wildmatch: no match 'foo/bar' 'foo?bar'
+expecting success of 3701.16 'dummy edit works': 
+	test_set_editor : &&
+	test_write_lines e a | git add -p &&
+	git diff > diff &&
+	diff_cmp expected diff
 
-expecting success of 3070.1714 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1714 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+diff --git a/file b/file
+index 180b47c..f910ae9 100644
+--- a/file
++++ b/file
+@@ -1 +1,4 @@
+ baseline
++content
++more
++lines
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 16 - dummy edit works
 
-expecting success of 3070.1715 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
-		
-ok 1715 - iwildmatch: no match 'foo/bar' 'foo?bar'
+expecting success of 3701.17 'setup patch': 
+	cat >patch <<-\EOF
+	@@ -1,1 +1,4 @@
+	 this
+	+patch
+	-does not
+	 apply
+	EOF
 
-expecting success of 3070.1716 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1716 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+ok 17 - setup patch
 
-expecting success of 3070.1717 'pathmatch: match 'foo/bar' 'foo?bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
-		
-ok 1717 - pathmatch: match 'foo/bar' 'foo?bar'
+expecting success of 3701.18 'setup fake editor': 
+	write_script "fake_editor.sh" <<-\EOF &&
+	mv -f "$1" oldpatch &&
+	mv -f patch "$1"
+	EOF
+	test_set_editor "$(pwd)/fake_editor.sh"
 
-expecting success of 3070.1718 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1718 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+ok 18 - setup fake editor
 
-expecting success of 3070.1719 'ipathmatch: match 'foo/bar' 'foo?bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
-		
-ok 1719 - ipathmatch: match 'foo/bar' 'foo?bar'
+expecting success of 3701.19 'bad edit rejected': 
+	git reset &&
+	test_write_lines e n d | git add -p >output &&
+	grep "hunk does not apply" output
 
-expecting success of 3070.1720 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1720 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+Unstaged changes after reset:
+M	file
+error: patch failed: file:1
+error: file: patch does not apply
+error: 'git apply --cached' failed
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? (1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 19 - bad edit rejected
 
-expecting success of 3070.1721 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1721 - cleanup after previous file test
+expecting success of 3701.20 'setup patch': 
+	cat >patch <<-\EOF
+	this patch
+	is garbage
+	EOF
 
-expecting success of 3070.1722 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1722 - setup match file test for foo/bar
+ok 20 - setup patch
 
-expecting success of 3070.1723 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
-		
-ok 1723 - wildmatch: no match 'foo/bar' 'foo[/]bar'
+expecting success of 3701.21 'garbage edit rejected': 
+	git reset &&
+	test_write_lines e n d | git add -p >output &&
+	grep "hunk does not apply" output
 
-expecting success of 3070.1724 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1724 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+Unstaged changes after reset:
+M	file
+error: corrupt patch at line 6
+error: 'git apply --cached' failed
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? (1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 21 - garbage edit rejected
 
-expecting success of 3070.1725 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
-		
-ok 1725 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
+expecting success of 3701.22 'setup patch': 
+	cat >patch <<-\EOF
+	@@ -1,0 +1,0 @@
+	 baseline
+	+content
+	+newcontent
+	+lines
+	EOF
 
-expecting success of 3070.1726 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1726 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+ok 22 - setup patch
 
-expecting success of 3070.1727 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
-		
-ok 1727 - pathmatch: match 'foo/bar' 'foo[/]bar'
+expecting success of 3701.23 'setup expected': 
+	cat >expected <<-\EOF
+	diff --git a/file b/file
+	index b5dd6c9..f910ae9 100644
+	--- a/file
+	+++ b/file
+	@@ -1,4 +1,4 @@
+	 baseline
+	 content
+	-newcontent
+	+more
+	 lines
+	EOF
 
-expecting success of 3070.1728 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1728 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+ok 23 - setup expected
 
-expecting success of 3070.1729 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
-		
-ok 1729 - ipathmatch: match 'foo/bar' 'foo[/]bar'
+expecting success of 3701.24 'real edit works': 
+	test_write_lines e n d | git add -p &&
+	git diff >output &&
+	diff_cmp expected output
 
-expecting success of 3070.1730 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1730 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+diff --git a/file b/file
+index 180b47c..f910ae9 100644
+--- a/file
++++ b/file
+@@ -1 +1,4 @@
+ baseline
++content
++more
++lines
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 24 - real edit works
 
-expecting success of 3070.1731 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1731 - cleanup after previous file test
+expecting success of 3701.25 'setup file': 
+	test_write_lines a "" b "" c >file &&
+	git add file &&
+	test_write_lines a "" d "" c >file
 
-expecting success of 3070.1732 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1732 - setup match file test for foo/bar
+ok 25 - setup file
 
-expecting success of 3070.1733 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 1733 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3701.26 'setup patch': 
+	NULL="" &&
+	cat >patch <<-EOF
+	@@ -1,4 +1,4 @@
+	 a
+	$NULL
+	-b
+	+f
+	$SP
+	c
+	EOF
 
-expecting success of 3070.1734 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1734 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 26 - setup patch
 
-expecting success of 3070.1735 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 1735 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3701.27 'setup expected': 
+	cat >expected <<-EOF
+	diff --git a/file b/file
+	index b5dd6c9..f910ae9 100644
+	--- a/file
+	+++ b/file
+	@@ -1,5 +1,5 @@
+	 a
+	$SP
+	-f
+	+d
+	$SP
+	 c
+	EOF
 
-expecting success of 3070.1736 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1736 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 27 - setup expected
 
-expecting success of 3070.1737 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 1737 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3701.28 'edit can strip spaces from empty context lines': 
+	test_write_lines e n q | git add -p 2>error &&
+	test_must_be_empty error &&
+	git diff >output &&
+	diff_cmp expected output
 
-expecting success of 3070.1738 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1738 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+diff --git a/file b/file
+index bda3f38..90b7c9d 100644
+--- a/file
++++ b/file
+@@ -1,5 +1,5 @@
+ a
+ 
+-b
++d
+ 
+ c
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 28 - edit can strip spaces from empty context lines
 
-expecting success of 3070.1739 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 1739 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3701.29 'skip files similarly as commit -a': 
+	git reset &&
+	echo file >.gitignore &&
+	echo changed >file &&
+	echo y | git add -p file &&
+	git diff >output &&
+	git reset &&
+	git commit -am commit &&
+	git diff >expected &&
+	diff_cmp expected output &&
+	git reset --hard HEAD^
 
-expecting success of 3070.1740 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1740 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+Unstaged changes after reset:
+M	file
+diff --git a/file b/file
+index 180b47c..5ea2ed4 100644
+--- a/file
++++ b/file
+@@ -1 +1 @@
+-baseline
++changed
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+Unstaged changes after reset:
+M	file
+[main 953db45] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 4ef1e3a commit
+ok 29 - skip files similarly as commit -a
 
-expecting success of 3070.1741 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 1741 - cleanup after previous file test
+checking prerequisite: FILEMODE
 
-expecting success of 3070.1742 'setup match file test for ab/cXd/efXg/hi': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1742 - setup match file test for ab/cXd/efXg/hi
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+	test "$(git config --bool core.filemode)" = true
 
-expecting success of 3070.1743 'wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*Xg*i'
-		
-ok 1743 - wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
+)
+prerequisite FILEMODE ok
+expecting success of 3701.30 'patch does not affect mode': 
+	git reset --hard &&
+	echo content >>file &&
+	chmod +x file &&
+	printf "n\\ny\\n" | git add -p &&
+	git show :file | grep content &&
+	git diff file | grep "new mode"
 
-expecting success of 3070.1744 'wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1744 - wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
+HEAD is now at 4ef1e3a commit
+diff --git a/file b/file
+index 180b47c..b6f2c08
+--- a/file
++++ b/file
+old mode 100644
+new mode 100755
+(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]? @@ -1 +1,2 @@
+ baseline
++content
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+content
+new mode 100755
+ok 30 - patch does not affect mode
 
-expecting success of 3070.1745 'iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*Xg*i'
-		
-ok 1745 - iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
+expecting success of 3701.31 'stage mode but not hunk': 
+	git reset --hard &&
+	echo content >>file &&
+	chmod +x file &&
+	printf "y\\nn\\n" | git add -p &&
+	git diff --cached file | grep "new mode" &&
+	git diff          file | grep "+content"
 
-expecting success of 3070.1746 'iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1746 - iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
+HEAD is now at 4ef1e3a commit
+diff --git a/file b/file
+index 180b47c..b6f2c08
+--- a/file
++++ b/file
+old mode 100644
+new mode 100755
+(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]? @@ -1 +1,2 @@
+ baseline
++content
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+new mode 100755
++content
+ok 31 - stage mode but not hunk
 
-expecting success of 3070.1747 'pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*Xg*i'
-		
-ok 1747 - pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
+expecting success of 3701.32 'stage mode and hunk': 
+	git reset --hard &&
+	echo content >>file &&
+	chmod +x file &&
+	printf "y\\ny\\n" | git add -p &&
+	git diff --cached file >out &&
+	grep "new mode" out &&
+	grep "+content" out &&
+	git diff file >out &&
+	test_must_be_empty out
 
-expecting success of 3070.1748 'pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1748 - pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
+HEAD is now at 4ef1e3a commit
+diff --git a/file b/file
+index 180b47c..b6f2c08
+--- a/file
++++ b/file
+old mode 100644
+new mode 100755
+(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]? @@ -1 +1,2 @@
+ baseline
++content
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+new mode 100755
++content
+ok 32 - stage mode and hunk
 
-expecting success of 3070.1749 'ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'': 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*Xg*i'
-		
-ok 1749 - ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
+expecting success of 3701.33 'different prompts for mode change/deleted': 
+	git reset --hard &&
+	>file &&
+	>deleted &&
+	git add --chmod=+x file deleted &&
+	echo changed >file &&
+	rm deleted &&
+	test_write_lines n n n |
+	git -c core.filemode=true add -p >actual &&
+	sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered &&
+	cat >expect <<-\EOF &&
+	(1/1) Stage deletion [y,n,q,a,d,p,?]?
+	(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]?
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]?
+	EOF
+	test_cmp expect actual.filtered
 
-expecting success of 3070.1750 'ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'': 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1750 - ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
+HEAD is now at 4ef1e3a commit
+ok 33 - different prompts for mode change/deleted
 
-expecting success of 3070.1751 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing ab/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1751 - cleanup after previous file test
+expecting success of 3701.34 'correct message when there is nothing to do': 
+	git reset --hard &&
+	git add -p >out &&
+	test_grep "No changes" out &&
+	printf "\\0123" >binary &&
+	git add binary &&
+	printf "\\0abc" >binary &&
+	git add -p >out &&
+	test_grep "Only binary files changed" out
 
-expecting success of 3070.1752 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1752 - setup match file test for a
+HEAD is now at 4ef1e3a commit
+No changes.
+Only binary files changed.
+ok 34 - correct message when there is nothing to do
 
-expecting success of 3070.1753 'wildmatch: no match 'a' '[A-Z]'': 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[A-Z]'
-		
-ok 1753 - wildmatch: no match 'a' '[A-Z]'
+expecting success of 3701.35 'setup again': 
+	git reset --hard &&
+	test_chmod +x file &&
+	echo content >>file &&
+	test_write_lines A B C D>file2 &&
+	git add file2
 
-expecting success of 3070.1754 'wildmatch (via ls-files): no match '[A-Z]' 'a'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1754 - wildmatch (via ls-files): no match '[A-Z]' 'a'
+HEAD is now at 4ef1e3a commit
+ok 35 - setup again
 
-expecting success of 3070.1755 'iwildmatch: match 'a' '[A-Z]'': 
-			test-tool wildmatch iwildmatch 'a' '[A-Z]'
-		
-ok 1755 - iwildmatch: match 'a' '[A-Z]'
+expecting success of 3701.36 'setup patch': 
+	cat >patch <<-\EOF
+	index 180b47c..b6f2c08 100644
+	--- a/file
+	+++ b/file
+	@@ -1,2 +1,4 @@
+	+firstline
+	 baseline
+	 content
+	+lastline
+	\ No newline at end of file
+	diff --git a/file2 b/file2
+	index 8422d40..35b930a 100644
+	--- a/file2
+	+++ b/file2
+	@@ -1,4 +1,5 @@
+	-A
+	+Z
+	 B
+	+Y
+	 C
+	-D
+	+X
+	EOF
 
-expecting success of 3070.1756 'iwildmatch (via ls-files): match '[A-Z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1756 - iwildmatch (via ls-files): match '[A-Z]' 'a'
+ok 36 - setup patch
 
-expecting success of 3070.1757 'pathmatch: no match 'a' '[A-Z]'': 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[A-Z]'
-		
-ok 1757 - pathmatch: no match 'a' '[A-Z]'
+expecting success of 3701.37 'setup expected': 
+	echo diff --git a/file b/file >expected &&
+	sed -e "/^index 180b47c/s/ 100644/ 100755/" \
+	    -e /1,5/s//1,4/ \
+	    -e /Y/d patch >>expected &&
+	cat >expected-output <<-\EOF
+	--- a/file
+	+++ b/file
+	@@ -1,2 +1,4 @@
+	+firstline
+	 baseline
+	 content
+	+lastline
+	\ No newline at end of file
+	@@ -1,2 +1,3 @@
+	+firstline
+	 baseline
+	 content
+	@@ -1,2 +2,3 @@
+	 baseline
+	 content
+	+lastline
+	\ No newline at end of file
+	--- a/file2
+	+++ b/file2
+	@@ -1,4 +1,5 @@
+	-A
+	+Z
+	 B
+	+Y
+	 C
+	-D
+	+X
+	@@ -1,2 +1,2 @@
+	-A
+	+Z
+	 B
+	@@ -2,2 +2,3 @@
+	 B
+	+Y
+	 C
+	@@ -3,2 +4,2 @@
+	 C
+	-D
+	+X
+	EOF
 
-expecting success of 3070.1758 'pathmatch (via ls-files): no match '[A-Z]' 'a'': 
-				>expect &&
-				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1758 - pathmatch (via ls-files): no match '[A-Z]' 'a'
+ok 37 - setup expected
 
-expecting success of 3070.1759 'ipathmatch: match 'a' '[A-Z]'': 
-			test-tool wildmatch ipathmatch 'a' '[A-Z]'
-		
-ok 1759 - ipathmatch: match 'a' '[A-Z]'
+expecting success of 3701.38 'add first line works': 
+	git commit -am "clear local changes" &&
+	git apply patch &&
+	test_write_lines s y y s y n y | git add -p 2>error >raw-output &&
+	sed -n -e "s/^([1-9]\/[1-9]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
+	       -e "/^[-+@ \\\\]"/p raw-output >output &&
+	test_must_be_empty error &&
+	git diff --cached >diff &&
+	diff_cmp expected diff &&
+	test_cmp expected-output output
 
-expecting success of 3070.1760 'ipathmatch (via ls-files): match '[A-Z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1760 - ipathmatch (via ls-files): match '[A-Z]' 'a'
+[main dd8d550] clear local changes
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ mode change 100644 => 100755 file
+ create mode 100644 file2
+ok 38 - add first line works
 
-expecting success of 3070.1761 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1761 - cleanup after previous file test
+expecting success of 3701.39 'setup expected': 
+	cat >expected <<-\EOF
+	diff --git a/non-empty b/non-empty
+	deleted file mode 100644
+	index d95f3ad..0000000
+	--- a/non-empty
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-content
+	EOF
 
-expecting success of 3070.1762 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1762 - setup match file test for A
+ok 39 - setup expected
 
-expecting success of 3070.1763 'wildmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch wildmatch 'A' '[A-Z]'
-		
-ok 1763 - wildmatch: match 'A' '[A-Z]'
+expecting success of 3701.40 'deleting a non-empty file': 
+	git reset --hard &&
+	echo content >non-empty &&
+	git add non-empty &&
+	git commit -m non-empty &&
+	rm non-empty &&
+	echo y | git add -p non-empty &&
+	git diff --cached >diff &&
+	diff_cmp expected diff
 
-expecting success of 3070.1764 'wildmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1764 - wildmatch (via ls-files): match '[A-Z]' 'A'
+HEAD is now at dd8d550 clear local changes
+[main 00556ef] non-empty
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 non-empty
+diff --git a/non-empty b/non-empty
+deleted file mode 100644
+index d95f3ad..0000000
+--- a/non-empty
++++ /dev/null
+@@ -1 +0,0 @@
+-content
+(1/1) Stage deletion [y,n,q,a,d,p,?]? 
+ok 40 - deleting a non-empty file
 
-expecting success of 3070.1765 'iwildmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch iwildmatch 'A' '[A-Z]'
-		
-ok 1765 - iwildmatch: match 'A' '[A-Z]'
+expecting success of 3701.41 'setup expected': 
+	cat >expected <<-\EOF
+	diff --git a/empty b/empty
+	deleted file mode 100644
+	index e69de29..0000000
+	EOF
 
-expecting success of 3070.1766 'iwildmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1766 - iwildmatch (via ls-files): match '[A-Z]' 'A'
+ok 41 - setup expected
 
-expecting success of 3070.1767 'pathmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch pathmatch 'A' '[A-Z]'
-		
-ok 1767 - pathmatch: match 'A' '[A-Z]'
+expecting success of 3701.42 'deleting an empty file': 
+	git reset --hard &&
+	> empty &&
+	git add empty &&
+	git commit -m empty &&
+	rm empty &&
+	echo y | git add -p empty &&
+	git diff --cached >diff &&
+	diff_cmp expected diff
 
-expecting success of 3070.1768 'pathmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1768 - pathmatch (via ls-files): match '[A-Z]' 'A'
+HEAD is now at 00556ef non-empty
+[main 2e6bfc0] empty
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+diff --git a/empty b/empty
+deleted file mode 100644
+index e69de29..0000000
+(1/1) Stage deletion [y,n,q,a,d,p,?]? 
+ok 42 - deleting an empty file
 
-expecting success of 3070.1769 'ipathmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch ipathmatch 'A' '[A-Z]'
-		
-ok 1769 - ipathmatch: match 'A' '[A-Z]'
+expecting success of 3701.43 'adding an empty file': 
+	git init added &&
+	(
+		cd added &&
+		test_commit initial &&
+		>empty &&
+		git add empty &&
+		test_tick &&
+		git commit -m empty &&
+		git tag added-file &&
+		git reset --hard HEAD^ &&
+		test_path_is_missing empty &&
 
-expecting success of 3070.1770 'ipathmatch (via ls-files): match '[A-Z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1770 - ipathmatch (via ls-files): match '[A-Z]' 'A'
+		echo y | git checkout -p added-file -- >actual &&
+		test_path_is_file empty &&
+		test_grep "Apply addition to index and worktree" actual
+	)
 
-expecting success of 3070.1771 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1771 - cleanup after previous file test
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/added/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 47883bc] empty
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+HEAD is now at 24b24cf initial
+(1/1) Apply addition to index and worktree [y,n,q,a,d,?]? 
+ok 43 - adding an empty file
 
-expecting success of 3070.1772 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1772 - setup match file test for A
+expecting success of 3701.44 'split hunk setup': 
+	git reset --hard &&
+	test_write_lines 10 20 30 40 50 60 >test &&
+	git add test &&
+	test_tick &&
+	git commit -m test &&
 
-expecting success of 3070.1773 'wildmatch: no match 'A' '[a-z]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[a-z]'
-		
-ok 1773 - wildmatch: no match 'A' '[a-z]'
+	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
 
-expecting success of 3070.1774 'wildmatch (via ls-files): no match '[a-z]' 'A'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1774 - wildmatch (via ls-files): no match '[a-z]' 'A'
+HEAD is now at 2e6bfc0 empty
+[main 18d1e3e] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+)
+ create mode 100644 test
+ok 44 - split hunk setup
 
-expecting success of 3070.1775 'iwildmatch: match 'A' '[a-z]'': 
-			test-tool wildmatch iwildmatch 'A' '[a-z]'
-		
-ok 1775 - iwildmatch: match 'A' '[a-z]'
+expecting success of 3701.45 'goto hunk 1 with "g 1"': 
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? + 1:  -1,2 +1,3          +15
+	_ 2:  -2,4 +3,8          +21
+	go to which hunk? @@ -1,2 +1,3 @@
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
+	EOF
+	test_write_lines s y g 1 | git add -p >actual &&
+	tail -n 7 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
 
-expecting success of 3070.1776 'iwildmatch (via ls-files): match '[a-z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1776 - iwildmatch (via ls-files): match '[a-z]' 'A'
+Unstaged changes after reset:
+M	test
+ok 45 - goto hunk 1 with "g 1"
 
-expecting success of 3070.1777 'pathmatch: no match 'A' '[a-z]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[a-z]'
-		
-ok 1777 - pathmatch: no match 'A' '[a-z]'
+expecting success of 3701.46 'goto hunk 1 with "g1"': 
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
+	EOF
+	test_write_lines s y g1 | git add -p >actual &&
+	tail -n 4 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
 
-expecting success of 3070.1778 'pathmatch (via ls-files): no match '[a-z]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1778 - pathmatch (via ls-files): no match '[a-z]' 'A'
+Unstaged changes after reset:
+M	test
+ok 46 - goto hunk 1 with "g1"
 
-expecting success of 3070.1779 'ipathmatch: match 'A' '[a-z]'': 
-			test-tool wildmatch ipathmatch 'A' '[a-z]'
-		
-ok 1779 - ipathmatch: match 'A' '[a-z]'
+expecting success of 3701.47 'navigate to hunk via regex /pattern': 
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? @@ -1,2 +1,3 @@
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
+	EOF
+	test_write_lines s y /1,2 | git add -p >actual &&
+	tail -n 5 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
 
-expecting success of 3070.1780 'ipathmatch (via ls-files): match '[a-z]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1780 - ipathmatch (via ls-files): match '[a-z]' 'A'
+Unstaged changes after reset:
+M	test
+ok 47 - navigate to hunk via regex /pattern
 
-expecting success of 3070.1781 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1781 - cleanup after previous file test
+expecting success of 3701.48 'navigate to hunk via regex / pattern': 
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
+	EOF
+	test_write_lines s y / 1,2 | git add -p >actual &&
+	tail -n 4 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
 
-expecting success of 3070.1782 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1782 - setup match file test for a
+Unstaged changes after reset:
+M	test
+ok 48 - navigate to hunk via regex / pattern
 
-expecting success of 3070.1783 'wildmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch wildmatch 'a' '[a-z]'
-		
-ok 1783 - wildmatch: match 'a' '[a-z]'
+expecting success of 3701.49 'print again the hunk': 
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	+15
+	 20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -1,2 +1,3 @@
+	 10
+	+15
+	 20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
+	EOF
+	test_write_lines s y g 1 p | git add -p >actual &&
+	tail -n 7 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
 
-expecting success of 3070.1784 'wildmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1784 - wildmatch (via ls-files): match '[a-z]' 'a'
+Unstaged changes after reset:
+M	test
+ok 49 - print again the hunk
 
-expecting success of 3070.1785 'iwildmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch iwildmatch 'a' '[a-z]'
-		
-ok 1785 - iwildmatch: match 'a' '[a-z]'
+checking prerequisite: TTY
 
-expecting success of 3070.1786 'iwildmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1786 - iwildmatch (via ls-files): match '[a-z]' 'a'
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-expecting success of 3070.1787 'pathmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch pathmatch 'a' '[a-z]'
-		
-ok 1787 - pathmatch: match 'a' '[a-z]'
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-expecting success of 3070.1788 'pathmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1788 - pathmatch (via ls-files): match '[a-z]' 'a'
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-expecting success of 3070.1789 'ipathmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch ipathmatch 'a' '[a-z]'
-		
-ok 1789 - ipathmatch: match 'a' '[a-z]'
+)
+prerequisite TTY ok
+expecting success of 3701.50 'print again the hunk (PAGER)': 
+	test_when_finished "git reset" &&
+	cat >expect <<-EOF &&
+	<GREEN>+<RESET><GREEN>15<RESET>
+	 20<RESET>
+	<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>PAGER <CYAN>@@ -1,2 +1,3 @@<RESET>
+	PAGER  10<RESET>
+	PAGER <GREEN>+<RESET><GREEN>15<RESET>
+	PAGER  20<RESET>
+	<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>
+	EOF
+	test_write_lines s y g 1 P |
+	(
+		GIT_PAGER="sed s/^/PAGER\ /" &&
+		export GIT_PAGER &&
+		test_terminal git add -p >actual
+	) &&
+	tail -n 7 <actual | test_decode_color >actual.trimmed &&
+	test_cmp expect actual.trimmed
 
-expecting success of 3070.1790 'ipathmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1790 - ipathmatch (via ls-files): match '[a-z]' 'a'
+Unstaged changes after reset:
+M	test
+ok 50 - print again the hunk (PAGER)
 
-expecting success of 3070.1791 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1791 - cleanup after previous file test
+expecting success of 3701.51 'P handles SIGPIPE when writing to pager': 
+	test_when_finished "rm -f huge_file; git reset" &&
+	printf "\n%2500000s" Y >huge_file &&
+	git add -N huge_file &&
+	test_write_lines P q | (
+		GIT_PAGER="head -n 1" &&
+		export GIT_PAGER &&
+		test_terminal git add -p
+	)
 
-expecting success of 3070.1792 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1792 - setup match file test for a
+diff --git a/huge_file b/huge_file
+new file mode 100644
+index 0000000..c97c625
+--- /dev/null
++++ b/huge_file
+@@ -0,0 +1,2 @@
++
++                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Y
+\ No newline at end of file
+(1/1) Stage addition [y,n,q,a,d,e,p,?]? @@ -0,0 +1,2 @@
+(1/1) Stage addition [y,n,q,a,d,e,p,?]? 
+Unstaged changes after reset:
+M	test
+ok 51 - P handles SIGPIPE when writing to pager
 
-expecting success of 3070.1793 'wildmatch: no match 'a' '[[:upper:]]'': 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[[:upper:]]'
-		
-ok 1793 - wildmatch: no match 'a' '[[:upper:]]'
+expecting success of 3701.52 'split hunk "add -p (edit)"': 
+	# Split, say Edit and do nothing.  Then:
+	#
+	# 1. Broken version results in a patch that does not apply and
+	# only takes [y/n] (edit again) so the first q is discarded
+	# and then n attempts to discard the edit. Repeat q enough
+	# times to get out.
+	#
+	# 2. Correct version applies the (not)edited version, and asks
+	#    about the next hunk, against which we say q and program
+	#    exits.
+	printf "%s\n" s e     q n q q |
+	EDITOR=: git add -p &&
+	git diff >actual &&
+	! grep "^+15" actual
 
-expecting success of 3070.1794 'wildmatch (via ls-files): no match '[[:upper:]]' 'a'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1794 - wildmatch (via ls-files): no match '[[:upper:]]' 'a'
+diff --git a/test b/test
+index 0889435..26b5645 100644
+--- a/test
++++ b/test
+@@ -1,5 +1,10 @@
+ 10
++15
+ 20
++21
++22
++23
++24
+ 30
+ 40
+ 50
+(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
+@@ -1,2 +1,3 @@
+ 10
++15
+ 20
+(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,4 +3,8 @@
+ 20
++21
++22
++23
++24
+ 30
+ 40
+ 50
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+ok 52 - split hunk "add -p (edit)"
 
-expecting success of 3070.1795 'iwildmatch: match 'a' '[[:upper:]]'': 
-			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
-		
-ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
+expecting success of 3701.53 'split hunk "add -p (no, yes, edit)"': 
+	test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
+	git reset &&
+	# test sequence is s(plit), n(o), y(es), e(dit)
+	# q n q q is there to make sure we exit at the end.
+	printf "%s\n" s n y e   q n q q |
+	EDITOR=: git add -p 2>error &&
+	test_must_be_empty error &&
+	git diff >actual &&
+	! grep "^+31" actual
 
-expecting success of 3070.1796 'iwildmatch (via ls-files): match '[[:upper:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1796 - iwildmatch (via ls-files): match '[[:upper:]]' 'a'
+Unstaged changes after reset:
+M	test
+diff --git a/test b/test
+index 0889435..47ab15d 100644
+--- a/test
++++ b/test
+@@ -1,6 +1,9 @@
++5
+ 10
+ 20
++21
+ 30
++31
+ 40
+ 50
+ 60
+(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 3 hunks.
+@@ -1,2 +1,3 @@
++5
+ 10
+ 20
+(1/3) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -1,3 +2,4 @@
+ 10
+ 20
++21
+ 30
+(2/3) Stage this hunk [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -3,4 +5,5 @@
+ 30
++31
+ 40
+ 50
+ 60
+(3/3) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+ok 53 - split hunk "add -p (no, yes, edit)"
 
-expecting success of 3070.1797 'pathmatch: no match 'a' '[[:upper:]]'': 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[[:upper:]]'
-		
-ok 1797 - pathmatch: no match 'a' '[[:upper:]]'
+expecting success of 3701.54 'split hunk with incomplete line at end': 
+	git reset --hard &&
+	printf "missing LF" >>test &&
+	git add test &&
+	test_write_lines before 10 20 30 40 50 60 70 >test &&
+	git grep --cached missing &&
+	test_write_lines s n y q | git add -p &&
+	test_must_fail git grep --cached missing &&
+	git grep before &&
+	test_must_fail git grep --cached before
 
-expecting success of 3070.1798 'pathmatch (via ls-files): no match '[[:upper:]]' 'a'': 
-				>expect &&
-				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1798 - pathmatch (via ls-files): no match '[[:upper:]]' 'a'
+HEAD is now at 18d1e3e test
+test:missing LF
+diff --git a/test b/test
+index dd09efb..cdbfd1e 100644
+--- a/test
++++ b/test
+@@ -1,7 +1,8 @@
++before
+ 10
+ 20
+ 30
+ 40
+ 50
+ 60
+-missing LF
+\ No newline at end of file
++70
+(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
+@@ -1,6 +1,7 @@
++before
+ 10
+ 20
+ 30
+ 40
+ 50
+ 60
+(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -1,7 +2,7 @@
+ 10
+ 20
+ 30
+ 40
+ 50
+ 60
+-missing LF
+\ No newline at end of file
++70
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+test:before
+ok 54 - split hunk with incomplete line at end
 
-expecting success of 3070.1799 'ipathmatch: match 'a' '[[:upper:]]'': 
-			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
-		
-ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
+expecting success of 3701.55 'edit, adding lines to the first hunk': 
+	test_write_lines 10 11 20 30 40 50 51 60 >test &&
+	git reset &&
+	tr _ " " >patch <<-EOF &&
+	@@ -1,5 +1,6 @@
+	_10
+	+11
+	+12
+	_20
+	+21
+	+22
+	_30
+	EOF
+	# test sequence is s(plit), e(dit), n(o)
+	# q n q q is there to make sure we exit at the end.
+	printf "%s\n" s e n   q n q q |
+	EDITOR=./fake_editor.sh git add -p 2>error &&
+	test_must_be_empty error &&
+	git diff --cached >actual &&
+	grep "^+22" actual
 
-expecting success of 3070.1800 'ipathmatch (via ls-files): match '[[:upper:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1800 - ipathmatch (via ls-files): match '[[:upper:]]' 'a'
+Unstaged changes after reset:
+M	test
+diff --git a/test b/test
+index 0889435..cf86f12 100644
+--- a/test
++++ b/test
+@@ -1,6 +1,8 @@
+ 10
++11
+ 20
+ 30
+ 40
+ 50
++51
+ 60
+(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
+@@ -1,5 +1,6 @@
+ 10
++11
+ 20
+ 30
+ 40
+ 50
+(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,5 +3,6 @@
+ 20
+ 30
+ 40
+ 50
++51
+ 60
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
++22
+ok 55 - edit, adding lines to the first hunk
 
-expecting success of 3070.1801 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1801 - cleanup after previous file test
+expecting success of 3701.56 'patch mode ignores unmerged entries': 
+	git reset --hard &&
+	test_commit conflict &&
+	test_commit non-conflict &&
+	git checkout -b side &&
+	test_commit side conflict.t &&
+	git checkout main &&
+	test_commit main conflict.t &&
+	test_must_fail git merge side &&
+	echo changed >non-conflict.t &&
+	echo y | git add -p >output &&
+	! grep a/conflict.t output &&
+	cat >expected <<-\EOF &&
+	* Unmerged path conflict.t
+	diff --git a/non-conflict.t b/non-conflict.t
+	index f766221..5ea2ed4 100644
+	--- a/non-conflict.t
+	+++ b/non-conflict.t
+	@@ -1 +1 @@
+	-non-conflict
+	+changed
+	EOF
+	git diff --cached >diff &&
+	diff_cmp expected diff
 
-expecting success of 3070.1802 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1802 - setup match file test for A
+HEAD is now at 18d1e3e test
+[main 7573f98] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.t
+[main 8e66292] non-conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 non-conflict.t
+Switched to a new branch 'side'
+[side a0a968f] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+[main 095e8c6] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: refname 'side' is ambiguous.
+warning: refname 'side' is ambiguous.
+Auto-merging conflict.t
+CONFLICT (content): Merge conflict in conflict.t
+Automatic merge failed; fix conflicts and then commit the result.
+ok 56 - patch mode ignores unmerged entries
 
-expecting success of 3070.1803 'wildmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
-		
-ok 1803 - wildmatch: match 'A' '[[:upper:]]'
+expecting success of 3701.57 'index is refreshed after applying patch': 
+	git reset --hard &&
+	echo content >test &&
+	printf y | git add -p &&
+	git diff-files --exit-code
 
-expecting success of 3070.1804 'wildmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1804 - wildmatch (via ls-files): match '[[:upper:]]' 'A'
+HEAD is now at 095e8c6 main
+diff --git a/test b/test
+index 0889435..d95f3ad 100644
+--- a/test
++++ b/test
+@@ -1,6 +1 @@
+-10
+-20
+-30
+-40
+-50
+-60
++content
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 57 - index is refreshed after applying patch
 
-expecting success of 3070.1805 'iwildmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
-		
-ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
+expecting success of 3701.58 'diffs can be colorized': 
+	git reset --hard &&
 
-expecting success of 3070.1806 'iwildmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1806 - iwildmatch (via ls-files): match '[[:upper:]]' 'A'
+	echo content >test &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
+	git diff-files --exit-code &&
 
-expecting success of 3070.1807 'pathmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
-		
-ok 1807 - pathmatch: match 'A' '[[:upper:]]'
+	# We do not want to depend on the exact coloring scheme
+	# git uses for diffs, so just check that we saw some kind of color.
+	grep "$(printf "\\033")" output
 
-expecting success of 3070.1808 'pathmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1808 - pathmatch (via ls-files): match '[[:upper:]]' 'A'
+HEAD is now at 095e8c6 main
+diff --git a/test b/test
+index 0889435..d95f3ad 100644
+--- a/test
++++ b/test
+@@ -1,6 +1 @@
+-10
+-20
+-30
+-40
+-50
+-60
++content
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 58 - diffs can be colorized
 
-expecting success of 3070.1809 'ipathmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
-		
-ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
+expecting success of 3701.59 'colors can be overridden': 
+	git reset --hard &&
+	test_when_finished "git rm -f color-test" &&
+	test_write_lines context old more-context >color-test &&
+	git add color-test &&
+	test_write_lines context new more-context another-one >color-test &&
 
-expecting success of 3070.1810 'ipathmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1810 - ipathmatch (via ls-files): match '[[:upper:]]' 'A'
+	echo trigger an error message >input &&
+	force_color git \
+		-c color.interactive.error=blue \
+		add -i 2>err.raw <input &&
+	test_decode_color <err.raw >err &&
+	grep "<BLUE>Huh (trigger)?<RESET>" err &&
 
-expecting success of 3070.1811 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1811 - cleanup after previous file test
+	test_write_lines help quit >input &&
+	force_color git \
+		-c color.interactive.header=red \
+		-c color.interactive.help=green \
+		-c color.interactive.prompt=yellow \
+		add -i >actual.raw <input &&
+	test_decode_color <actual.raw >actual &&
+	cat >expect <<-\EOF &&
+	<RED>           staged     unstaged path<RESET>
+	  1:        +3/-0        +2/-1 color-test
 
-expecting success of 3070.1812 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1812 - setup match file test for A
+	<RED>*** Commands ***<RESET>
+	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
+	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
+	<YELLOW>What now<RESET>> <GREEN>status        - show paths with changes<RESET>
+	<GREEN>update        - add working tree state to the staged set of changes<RESET>
+	<GREEN>revert        - revert staged set of changes back to the HEAD version<RESET>
+	<GREEN>patch         - pick hunks and update selectively<RESET>
+	<GREEN>diff          - view diff between HEAD and index<RESET>
+	<GREEN>add untracked - add contents of untracked files to the staged set of changes<RESET>
+	<RED>*** Commands ***<RESET>
+	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
+	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
+	<YELLOW>What now<RESET>> Bye.
+	EOF
+	test_cmp expect actual &&
 
-expecting success of 3070.1813 'wildmatch: no match 'A' '[[:lower:]]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[[:lower:]]'
-		
-ok 1813 - wildmatch: no match 'A' '[[:lower:]]'
+	: exercise recolor_hunk by editing and then look at the hunk again &&
+	test_write_lines s e K q >input &&
+	force_color git \
+		-c color.interactive.prompt=yellow \
+		-c color.diff.meta=italic \
+		-c color.diff.frag=magenta \
+		-c color.diff.context=cyan \
+		-c color.diff.old=bold \
+		-c color.diff.new=blue \
+		-c core.editor=touch \
+		add -p >actual.raw <input &&
+	test_decode_color <actual.raw >actual.decoded &&
+	sed "s/index [0-9a-f]*\\.\\.[0-9a-f]* 100644/<INDEX-LINE>/" <actual.decoded >actual &&
+	cat >expect <<-\EOF &&
+	<ITALIC>diff --git a/color-test b/color-test<RESET>
+	<ITALIC><INDEX-LINE><RESET>
+	<ITALIC>--- a/color-test<RESET>
+	<ITALIC>+++ b/color-test<RESET>
+	<MAGENTA>@@ -1,3 +1,4 @@<RESET>
+	<CYAN> context<RESET>
+	<BOLD>-old<RESET>
+	<BLUE>+<RESET><BLUE>new<RESET>
+	<CYAN> more-context<RESET>
+	<BLUE>+<RESET><BLUE>another-one<RESET>
+	<YELLOW>(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? <RESET><BOLD>Split into 2 hunks.<RESET>
+	<MAGENTA>@@ -1,3 +1,3 @@<RESET>
+	<CYAN> context<RESET>
+	<BOLD>-old<RESET>
+	<BLUE>+<RESET><BLUE>new<RESET>
+	<CYAN> more-context<RESET>
+	<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET><MAGENTA>@@ -3 +3,2 @@<RESET>
+	<CYAN> more-context<RESET>
+	<BLUE>+<RESET><BLUE>another-one<RESET>
+	<YELLOW>(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? <RESET><MAGENTA>@@ -1,3 +1,3 @@<RESET>
+	<CYAN> context<RESET>
+	<BOLD>-old<RESET>
+	<BLUE>+new<RESET>
+	<CYAN> more-context<RESET>
+	<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>
+	EOF
+	test_cmp expect actual
 
-expecting success of 3070.1814 'wildmatch (via ls-files): no match '[[:lower:]]' 'A'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1814 - wildmatch (via ls-files): no match '[[:lower:]]' 'A'
+HEAD is now at 095e8c6 main
+           staged     unstaged path
+  1:        +3/-0        +2/-1 color-test
 
-expecting success of 3070.1815 'iwildmatch: match 'A' '[[:lower:]]'': 
-			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
-		
-ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
+*** Commands ***
+  1: status	  2: update	  3: revert	  4: add untracked
+  5: patch	  6: diff	  7: quit	  8: help
+What now> *** Commands ***
+  1: status	  2: update	  3: revert	  4: add untracked
+  5: patch	  6: diff	  7: quit	  8: help
+What now> 
+Bye.
+<BLUE>Huh (trigger)?<RESET>
+rm 'color-test'
+ok 59 - colors can be overridden
 
-expecting success of 3070.1816 'iwildmatch (via ls-files): match '[[:lower:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1816 - iwildmatch (via ls-files): match '[[:lower:]]' 'A'
+expecting success of 3701.60 'brackets appear without color': 
+	git reset --hard &&
+	test_when_finished "git rm -f bracket-test" &&
+	test_write_lines context old more-context >bracket-test &&
+	git add bracket-test &&
+	test_write_lines context new more-context another-one >bracket-test &&
 
-expecting success of 3070.1817 'pathmatch: no match 'A' '[[:lower:]]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[[:lower:]]'
-		
-ok 1817 - pathmatch: no match 'A' '[[:lower:]]'
+	test_write_lines quit >input &&
+	git add -i >actual <input &&
 
-expecting success of 3070.1818 'pathmatch (via ls-files): no match '[[:lower:]]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1818 - pathmatch (via ls-files): no match '[[:lower:]]' 'A'
+	sed "s/^|//" >expect <<-\EOF &&
+	|           staged     unstaged path
+	|  1:        +3/-0        +2/-1 bracket-test
+	|
+	|*** Commands ***
+	|  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+	|  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+	|What now> Bye.
+	EOF
 
-expecting success of 3070.1819 'ipathmatch: match 'A' '[[:lower:]]'': 
-			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
-		
-ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
+	test_cmp expect actual
 
-expecting success of 3070.1820 'ipathmatch (via ls-files): match '[[:lower:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1820 - ipathmatch (via ls-files): match '[[:lower:]]' 'A'
+HEAD is now at 095e8c6 main
+rm 'bracket-test'
+ok 60 - brackets appear without color
 
-expecting success of 3070.1821 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1821 - cleanup after previous file test
+expecting success of 3701.61 'colors can be skipped with color.ui=false': 
+	git reset --hard &&
+	test_when_finished "git rm -f color-test" &&
+	test_write_lines context old more-context >color-test &&
+	git add color-test &&
+	test_write_lines context new more-context another-one >color-test &&
 
-expecting success of 3070.1822 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1822 - setup match file test for a
+	test_write_lines help quit >input &&
+	force_color git \
+		-c color.ui=false \
+		add -i >actual.raw <input &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp actual.raw actual
 
-expecting success of 3070.1823 'wildmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
-		
-ok 1823 - wildmatch: match 'a' '[[:lower:]]'
+HEAD is now at 095e8c6 main
+rm 'color-test'
+ok 61 - colors can be skipped with color.ui=false
 
-expecting success of 3070.1824 'wildmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1824 - wildmatch (via ls-files): match '[[:lower:]]' 'a'
+expecting success of 3701.62 'colorized diffs respect diff.wsErrorHighlight': 
+	git reset --hard &&
 
-expecting success of 3070.1825 'iwildmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
-		
-ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
+	echo "old " >test &&
+	git add test &&
+	echo "new " >test &&
 
-expecting success of 3070.1826 'iwildmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1826 - iwildmatch (via ls-files): match '[[:lower:]]' 'a'
+	printf y >y &&
+	force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y &&
+	test_decode_color <output.raw >output &&
+	grep "old<" output
 
-expecting success of 3070.1827 'pathmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
-		
-ok 1827 - pathmatch: match 'a' '[[:lower:]]'
+HEAD is now at 095e8c6 main
+<RED>-<RESET><RED>old<RESET><BRED> <RESET>
+ok 62 - colorized diffs respect diff.wsErrorHighlight
 
-expecting success of 3070.1828 'pathmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1828 - pathmatch (via ls-files): match '[[:lower:]]' 'a'
+expecting success of 3701.63 'diffFilter filters diff': 
+	git reset --hard &&
 
-expecting success of 3070.1829 'ipathmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
-		
-ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
+	echo content >test &&
+	test_config interactive.diffFilter "sed s/^/foo:/" &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
 
-expecting success of 3070.1830 'ipathmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1830 - ipathmatch (via ls-files): match '[[:lower:]]' 'a'
+	# avoid depending on the exact coloring or content of the prompts,
+	# and just make sure we saw our diff prefixed
+	grep foo:.*content output
 
-expecting success of 3070.1831 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1831 - cleanup after previous file test
+HEAD is now at 095e8c6 main
+foo:+content
+ok 63 - diffFilter filters diff
 
-expecting success of 3070.1832 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1832 - setup match file test for A
+expecting success of 3701.64 'detect bogus diffFilter output': 
+	git reset --hard &&
 
-expecting success of 3070.1833 'wildmatch: no match 'A' '[B-Za]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[B-Za]'
-		
-ok 1833 - wildmatch: no match 'A' '[B-Za]'
+	echo content >test &&
+	test_config interactive.diffFilter "sed 6d" &&
+	printf y >y &&
+	force_color test_must_fail git add -p <y >output 2>&1 &&
+	grep "mismatched output" output
 
-expecting success of 3070.1834 'wildmatch (via ls-files): no match '[B-Za]' 'A'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1834 - wildmatch (via ls-files): no match '[B-Za]' 'A'
+HEAD is now at 095e8c6 main
+error: mismatched output from interactive.diffFilter
+ok 64 - detect bogus diffFilter output
 
-expecting success of 3070.1835 'iwildmatch: match 'A' '[B-Za]'': 
-			test-tool wildmatch iwildmatch 'A' '[B-Za]'
-		
-ok 1835 - iwildmatch: match 'A' '[B-Za]'
+expecting success of 3701.65 'handle iffy colored hunk headers': 
+	git reset --hard &&
 
-expecting success of 3070.1836 'iwildmatch (via ls-files): match '[B-Za]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1836 - iwildmatch (via ls-files): match '[B-Za]' 'A'
+	echo content >test &&
+	printf n >n &&
+	force_color git -c interactive.diffFilter="sed s/.*@@.*/XX/" \
+		add -p >output 2>&1 <n &&
+	grep "^XX$" output
 
-expecting success of 3070.1837 'pathmatch: no match 'A' '[B-Za]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[B-Za]'
-		
-ok 1837 - pathmatch: no match 'A' '[B-Za]'
+HEAD is now at 095e8c6 main
+XX
+ok 65 - handle iffy colored hunk headers
 
-expecting success of 3070.1838 'pathmatch (via ls-files): no match '[B-Za]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1838 - pathmatch (via ls-files): no match '[B-Za]' 'A'
+expecting success of 3701.66 'handle very large filtered diff': 
+	git reset --hard &&
+	# The specific number here is not important, but it must
+	# be large enough that the output of "git diff --color"
+	# fills up the pipe buffer. 10,000 results in ~200k of
+	# colored output.
+	test_seq 10000 >test &&
+	test_config interactive.diffFilter cat &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
+	git diff-files --exit-code -- test
 
-expecting success of 3070.1839 'ipathmatch: match 'A' '[B-Za]'': 
-			test-tool wildmatch ipathmatch 'A' '[B-Za]'
-		
-ok 1839 - ipathmatch: match 'A' '[B-Za]'
+HEAD is now at 095e8c6 main
+ok 66 - handle very large filtered diff
 
-expecting success of 3070.1840 'ipathmatch (via ls-files): match '[B-Za]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1840 - ipathmatch (via ls-files): match '[B-Za]' 'A'
+expecting success of 3701.67 'diff.algorithm is passed to `git diff-files`': 
+	git reset --hard &&
 
-expecting success of 3070.1841 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1841 - cleanup after previous file test
+	>file &&
+	git add file &&
+	echo changed >file &&
+	test_must_fail git -c diff.algorithm=bogus add -p 2>err &&
+	test_grep "error: option diff-algorithm accepts " err
 
-expecting success of 3070.1842 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1842 - setup match file test for a
+HEAD is now at 095e8c6 main
+error: option diff-algorithm accepts "myers", "minimal", "patience" and "histogram"
+ok 67 - diff.algorithm is passed to `git diff-files`
 
-expecting success of 3070.1843 'wildmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch wildmatch 'a' '[B-Za]'
-		
-ok 1843 - wildmatch: match 'a' '[B-Za]'
+expecting success of 3701.68 'patch-mode via -i prompts for files': 
+	git reset --hard &&
 
-expecting success of 3070.1844 'wildmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1844 - wildmatch (via ls-files): match '[B-Za]' 'a'
+	echo one >file &&
+	echo two >test &&
+	git add -i <<-\EOF &&
+	patch
+	test
 
-expecting success of 3070.1845 'iwildmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch iwildmatch 'a' '[B-Za]'
-		
-ok 1845 - iwildmatch: match 'a' '[B-Za]'
+	y
+	quit
+	EOF
 
-expecting success of 3070.1846 'iwildmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1846 - iwildmatch (via ls-files): match '[B-Za]' 'a'
+	echo test >expect &&
+	git diff --cached --name-only >actual &&
+	diff_cmp expect actual
 
-expecting success of 3070.1847 'pathmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch pathmatch 'a' '[B-Za]'
-		
-ok 1847 - pathmatch: match 'a' '[B-Za]'
+HEAD is now at 095e8c6 main
+           staged     unstaged path
+  1:    unchanged        +1/-2 file
+  2:    unchanged        +1/-6 test
 
-expecting success of 3070.1848 'pathmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1848 - pathmatch (via ls-files): match '[B-Za]' 'a'
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:    unchanged        +1/-2 [f]ile
+  2:    unchanged        +1/-6 [t]est
+Patch update>>            staged     unstaged path
+  1:    unchanged        +1/-2 [f]ile
+* 2:    unchanged        +1/-6 [t]est
+Patch update>> diff --git a/test b/test
+index 0889435..f719efd 100644
+--- a/test
++++ b/test
+@@ -1,6 +1 @@
+-10
+-20
+-30
+-40
+-50
+-60
++two
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> Bye.
+ok 68 - patch-mode via -i prompts for files
 
-expecting success of 3070.1849 'ipathmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch ipathmatch 'a' '[B-Za]'
-		
-ok 1849 - ipathmatch: match 'a' '[B-Za]'
+expecting success of 3701.69 'add -p handles globs': 
+	git reset --hard &&
 
-expecting success of 3070.1850 'ipathmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1850 - ipathmatch (via ls-files): match '[B-Za]' 'a'
+	mkdir -p subdir &&
+	echo base >one.c &&
+	echo base >subdir/two.c &&
+	git add "*.c" &&
+	git commit -m base &&
 
-expecting success of 3070.1851 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1851 - cleanup after previous file test
+	echo change >one.c &&
+	echo change >subdir/two.c &&
+	git add -p "*.c" <<-\EOF &&
+	y
+	y
+	EOF
 
-expecting success of 3070.1852 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1852 - setup match file test for A
+	cat >expect <<-\EOF &&
+	one.c
+	subdir/two.c
+	EOF
+	git diff --cached --name-only >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.1853 'wildmatch: no match 'A' '[B-a]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[B-a]'
-		
-ok 1853 - wildmatch: no match 'A' '[B-a]'
+HEAD is now at 095e8c6 main
+[main 5128550] base
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one.c
+ create mode 100644 subdir/two.c
+diff --git a/one.c b/one.c
+index df967b9..0835e4f 100644
+--- a/one.c
++++ b/one.c
+@@ -1 +1 @@
+-base
++change
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+diff --git a/subdir/two.c b/subdir/two.c
+index df967b9..0835e4f 100644
+--- a/subdir/two.c
++++ b/subdir/two.c
+@@ -1 +1 @@
+-base
++change
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 69 - add -p handles globs
 
-expecting success of 3070.1854 'wildmatch (via ls-files): no match '[B-a]' 'A'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1854 - wildmatch (via ls-files): no match '[B-a]' 'A'
+expecting success of 3701.70 'add -p handles relative paths': 
+	git reset --hard &&
 
-expecting success of 3070.1855 'iwildmatch: match 'A' '[B-a]'': 
-			test-tool wildmatch iwildmatch 'A' '[B-a]'
-		
-ok 1855 - iwildmatch: match 'A' '[B-a]'
+	echo base >relpath.c &&
+	git add "*.c" &&
+	git commit -m relpath &&
 
-expecting success of 3070.1856 'iwildmatch (via ls-files): match '[B-a]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1856 - iwildmatch (via ls-files): match '[B-a]' 'A'
+	echo change >relpath.c &&
+	mkdir -p subdir &&
+	git -C subdir add -p .. 2>error <<-\EOF &&
+	y
+	EOF
 
-expecting success of 3070.1857 'pathmatch: no match 'A' '[B-a]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[B-a]'
-		
-ok 1857 - pathmatch: no match 'A' '[B-a]'
+	test_must_be_empty error &&
 
-expecting success of 3070.1858 'pathmatch (via ls-files): no match '[B-a]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1858 - pathmatch (via ls-files): no match '[B-a]' 'A'
+	cat >expect <<-\EOF &&
+	relpath.c
+	EOF
+	git diff --cached --name-only >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.1859 'ipathmatch: match 'A' '[B-a]'': 
-			test-tool wildmatch ipathmatch 'A' '[B-a]'
-		
-ok 1859 - ipathmatch: match 'A' '[B-a]'
+HEAD is now at 5128550 base
+[main cad2ca7] relpath
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 relpath.c
+diff --git a/relpath.c b/relpath.c
+index df967b9..0835e4f 100644
+--- a/relpath.c
++++ b/relpath.c
+@@ -1 +1 @@
+-base
++change
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 70 - add -p handles relative paths
 
-expecting success of 3070.1860 'ipathmatch (via ls-files): match '[B-a]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1860 - ipathmatch (via ls-files): match '[B-a]' 'A'
+expecting success of 3701.71 'add -p does not expand argument lists': 
+	git reset --hard &&
 
-expecting success of 3070.1861 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1861 - cleanup after previous file test
+	echo content >not-changed &&
+	git add not-changed &&
+	git commit -m "add not-changed file" &&
 
-expecting success of 3070.1862 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1862 - setup match file test for a
+	echo change >file &&
+	GIT_TRACE=$(pwd)/trace.out git add -p . <<-\EOF &&
+	y
+	EOF
 
-expecting success of 3070.1863 'wildmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch wildmatch 'a' '[B-a]'
-		
-ok 1863 - wildmatch: match 'a' '[B-a]'
+	# we know that "file" must be mentioned since we actually
+	# update it, but we want to be sure that our "." pathspec
+	# was not expanded into the argument list of any command.
+	# So look only for "not-changed".
+	! grep -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
 
-expecting success of 3070.1864 'wildmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1864 - wildmatch (via ls-files): match '[B-a]' 'a'
+HEAD is now at cad2ca7 relpath
+[main 86e6db4] add not-changed file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 not-changed
+diff --git a/file b/file
+index b6f2c08..0835e4f 100755
+--- a/file
++++ b/file
+@@ -1,2 +1 @@
+-baseline
+-content
++change
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 71 - add -p does not expand argument lists
 
-expecting success of 3070.1865 'iwildmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch iwildmatch 'a' '[B-a]'
-		
-ok 1865 - iwildmatch: match 'a' '[B-a]'
+expecting success of 3701.72 'hunk-editing handles custom comment char': 
+	git reset --hard &&
+	echo change >>file &&
+	test_config core.commentChar "\$" &&
+	echo e | GIT_EDITOR=true git add -p &&
+	git diff --exit-code
 
-expecting success of 3070.1866 'iwildmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1866 - iwildmatch (via ls-files): match '[B-a]' 'a'
+HEAD is now at 86e6db4 add not-changed file
+diff --git a/file b/file
+index b6f2c08..59630e0 100755
+--- a/file
++++ b/file
+@@ -1,2 +1,3 @@
+ baseline
+ content
++change
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 72 - hunk-editing handles custom comment char
 
-expecting success of 3070.1867 'pathmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch pathmatch 'a' '[B-a]'
-		
-ok 1867 - pathmatch: match 'a' '[B-a]'
+expecting success of 3701.73 'add -p works even with color.ui=always': 
+	git reset --hard &&
+	echo change >>file &&
+	test_config color.ui always &&
+	echo y | git add -p &&
+	echo file >expect &&
+	git diff --cached --name-only >actual &&
+	test_cmp expect actual
 
-expecting success of 3070.1868 'pathmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1868 - pathmatch (via ls-files): match '[B-a]' 'a'
+HEAD is now at 86e6db4 add not-changed file
+diff --git a/file b/file
+index b6f2c08..59630e0 100755
+--- a/file
++++ b/file
+@@ -1,2 +1,3 @@
+ baseline
+ content
++change
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+ok 73 - add -p works even with color.ui=always
 
-expecting success of 3070.1869 'ipathmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch ipathmatch 'a' '[B-a]'
-		
-ok 1869 - ipathmatch: match 'a' '[B-a]'
+expecting success of 3701.74 'setup different kinds of dirty submodules': 
+	test_create_repo for-submodules &&
+	(
+		cd for-submodules &&
+		test_commit initial &&
+		test_create_repo dirty-head &&
+		(
+			cd dirty-head &&
+			test_commit initial
+		) &&
+		cp -R dirty-head dirty-otherwise &&
+		cp -R dirty-head dirty-both-ways &&
+		git add dirty-head &&
+		git add dirty-otherwise dirty-both-ways &&
+		git commit -m initial &&
 
-expecting success of 3070.1870 'ipathmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1870 - ipathmatch (via ls-files): match '[B-a]' 'a'
+		cd dirty-head &&
+		test_commit updated &&
+		cd ../dirty-both-ways &&
+		test_commit updated &&
+		echo dirty >>initial &&
+		: >untracked &&
+		cd ../dirty-otherwise &&
+		echo dirty >>initial &&
+		: >untracked
+	) &&
+	git -C for-submodules diff-files --name-only >actual &&
+	cat >expected <<-\EOF &&
+	dirty-both-ways
+	dirty-head
+	EOF
+	test_cmp expected actual &&
+	git -C for-submodules diff-files --name-only --ignore-submodules=none >actual &&
+	cat >expected <<-\EOF &&
+	dirty-both-ways
+	dirty-head
+	dirty-otherwise
+	EOF
+	test_cmp expected actual &&
+	git -C for-submodules diff-files --name-only --ignore-submodules=dirty >actual &&
+	cat >expected <<-\EOF &&
+	dirty-both-ways
+	dirty-head
+	EOF
+	test_cmp expected actual
 
-expecting success of 3070.1871 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1871 - cleanup after previous file test
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/for-submodules/.git/
+[main (root-commit) 31243c6] 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.48.0~rc1+next.20250101/t/trash directory.t3701-add-interactive/for-submodules/dirty-head/.git/
+[main (root-commit) 167ffd6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+warning: adding embedded git repository: dirty-head
+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> dirty-head
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached dirty-head
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+warning: adding embedded git repository: dirty-both-ways
+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> dirty-both-ways
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached dirty-both-ways
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+warning: adding embedded git repository: dirty-otherwise
+[main 6489f21] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 160000 dirty-both-ways
+ create mode 160000 dirty-head
+ create mode 160000 dirty-otherwise
+[main f10ac08] updated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 updated.t
+[main f86bdf4] updated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 updated.t
+ok 74 - setup different kinds of dirty submodules
 
-expecting success of 3070.1872 'setup match file test for z': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1872 - setup match file test for z
+expecting success of 3701.75 'status ignores dirty submodules (except HEAD)': 
+	git -C for-submodules add -i </dev/null >output &&
+	grep dirty-head output &&
+	grep dirty-both-ways output &&
+	! grep dirty-otherwise output
 
-expecting success of 3070.1873 'wildmatch: no match 'z' '[Z-y]'': 
-			test_must_fail test-tool wildmatch wildmatch 'z' '[Z-y]'
-		
-ok 1873 - wildmatch: no match 'z' '[Z-y]'
+  2:    unchanged        +1/-1 dirty-head
+  1:    unchanged        +1/-1 dirty-both-ways
+ok 75 - status ignores dirty submodules (except HEAD)
 
-expecting success of 3070.1874 'wildmatch (via ls-files): no match '[Z-y]' 'z'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1874 - wildmatch (via ls-files): no match '[Z-y]' 'z'
+expecting success of 3701.76 'handle submodules': 
+	echo 123 >>for-submodules/dirty-otherwise/initial.t &&
 
-expecting success of 3070.1875 'iwildmatch: match 'z' '[Z-y]'': 
-			test-tool wildmatch iwildmatch 'z' '[Z-y]'
-		
-ok 1875 - iwildmatch: match 'z' '[Z-y]'
+	force_color git -C for-submodules add -p dirty-otherwise >output 2>&1 &&
+	grep "No changes" output &&
 
-expecting success of 3070.1876 'iwildmatch (via ls-files): match '[Z-y]' 'z'': 
-				printf '%s' 'z' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1876 - iwildmatch (via ls-files): match '[Z-y]' 'z'
+	force_color git -C for-submodules add -p dirty-head >output 2>&1 <y &&
+	git -C for-submodules ls-files --stage dirty-head >actual &&
+	rev="$(git -C for-submodules/dirty-head rev-parse HEAD)" &&
+	grep "$rev" actual
 
-expecting success of 3070.1877 'pathmatch: no match 'z' '[Z-y]'': 
-			test_must_fail test-tool wildmatch pathmatch 'z' '[Z-y]'
-		
-ok 1877 - pathmatch: no match 'z' '[Z-y]'
+No changes.
+160000 f10ac08dbe6eaf5e88125c402669e6f9b7076181 0	dirty-head
+ok 76 - handle submodules
 
-expecting success of 3070.1878 'pathmatch (via ls-files): no match '[Z-y]' 'z'': 
-				>expect &&
-				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1878 - pathmatch (via ls-files): no match '[Z-y]' 'z'
+expecting success of 3701.77 'set up pathological context': 
+	git reset --hard &&
+	test_write_lines a a a a a a a a a a a >a &&
+	git add a &&
+	git commit -m a &&
+	test_write_lines c b a a a a a a a b a a a a >a &&
+	test_write_lines     a a a a a a a b a a a a >expected-1 &&
+	test_write_lines   b a a a a a a a b a a a a >expected-2 &&
+	# check editing can cope with missing header and deleted context lines
+	# as well as changes to other lines
+	test_write_lines +b " a" >patch
 
-expecting success of 3070.1879 'ipathmatch: match 'z' '[Z-y]'': 
-			test-tool wildmatch ipathmatch 'z' '[Z-y]'
-		
-ok 1879 - ipathmatch: match 'z' '[Z-y]'
+HEAD is now at 86e6db4 add not-changed file
+[main 9e98a5e] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 a
+ok 77 - set up pathological context
 
-expecting success of 3070.1880 'ipathmatch (via ls-files): match '[Z-y]' 'z'': 
-				printf '%s' 'z' >expect &&
-				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1880 - ipathmatch (via ls-files): match '[Z-y]' 'z'
+expecting success of 3701.78 'add -p works with pathological context lines': 
+	git reset &&
+	printf "%s\n" n y |
+	git add -p &&
+	git cat-file blob :a >actual &&
+	test_cmp expected-1 actual
 
-expecting success of 3070.1881 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing z
-ok 1881 - cleanup after previous file test
+Unstaged changes after reset:
+M	a
+diff --git a/a b/a
+index f04e1e1..f39a0f0 100644
+--- a/a
++++ b/a
+@@ -1,3 +1,5 @@
++c
++b
+ a
+ a
+ a
+(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -5,6 +7,7 @@ a
+ a
+ a
+ a
++b
+ a
+ a
+ a
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+ok 78 - add -p works with pathological context lines
 
-expecting success of 3070.1882 'setup match file test for Z': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1882 - setup match file test for Z
+expecting success of 3701.79 'add -p patch editing works with pathological context lines': 
+	git reset &&
+	# n q q below is in case edit fails
+	printf "%s\n" e y    n q q |
+	git add -p &&
+	git cat-file blob :a >actual &&
+	test_cmp expected-2 actual
 
-expecting success of 3070.1883 'wildmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch wildmatch 'Z' '[Z-y]'
-		
-ok 1883 - wildmatch: match 'Z' '[Z-y]'
+Unstaged changes after reset:
+M	a
+diff --git a/a b/a
+index f04e1e1..f39a0f0 100644
+--- a/a
++++ b/a
+@@ -1,3 +1,5 @@
++c
++b
+ a
+ a
+ a
+(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -5,6 +7,7 @@ a
+ a
+ a
+ a
++b
+ a
+ a
+ a
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+ok 79 - add -p patch editing works with pathological context lines
 
-expecting success of 3070.1884 'wildmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1884 - wildmatch (via ls-files): match '[Z-y]' 'Z'
+expecting success of 3701.80 'checkout -p works with pathological context lines': 
+	test_write_lines a a a a a a >a &&
+	git add a &&
+	test_write_lines a b a b a b a b a b a >a &&
+	test_write_lines s n n y q | git checkout -p &&
+	test_write_lines a b a b a a b a b a >expect &&
+	test_cmp expect a
 
-expecting success of 3070.1885 'iwildmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
-		
-ok 1885 - iwildmatch: match 'Z' '[Z-y]'
+diff --git a/a b/a
+index 786e4a7..477d4da 100644
+--- a/a
++++ b/a
+@@ -1,6 +1,11 @@
+ a
++b
+ a
++b
+ a
++b
+ a
++b
+ a
++b
+ a
+(1/1) Discard this hunk from worktree [y,n,q,a,d,s,e,p,?]? Split into 5 hunks.
+@@ -1,2 +1,3 @@
+ a
++b
+ a
+(1/5) Discard this hunk from worktree [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,2 +3,3 @@
+ a
++b
+ a
+(2/5) Discard this hunk from worktree [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -3,2 +5,3 @@
+ a
++b
+ a
+(3/5) Discard this hunk from worktree [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -4,2 +7,3 @@
+ a
++b
+ a
+(4/5) Discard this hunk from worktree [y,n,q,a,d,K,j,J,g,/,e,p,?]? 
+ok 80 - checkout -p works with pathological context lines
 
-expecting success of 3070.1886 'iwildmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1886 - iwildmatch (via ls-files): match '[Z-y]' 'Z'
+expecting success of 3701.81 'add -N followed by add -p patch editing': 
+	git reset --hard &&
+	(
+		setup_new_file &&
+		git add -N new-file &&
+		test_write_lines e n q | git add -p &&
+		git cat-file blob :new-file >actual &&
+		test_cmp new-file-expect actual &&
+		test_cmp patch-expect patch
+	)
 
-expecting success of 3070.1887 'pathmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch pathmatch 'Z' '[Z-y]'
-		
-ok 1887 - pathmatch: match 'Z' '[Z-y]'
+HEAD is now at 9e98a5e a
+diff --git a/new-file b/new-file
+new file mode 100644
+index 0000000..0fdf397
+--- /dev/null
++++ b/new-file
+@@ -0,0 +1,6 @@
++a
++b
++c
++d
++e
++f
+(1/1) Stage addition [y,n,q,a,d,e,p,?]? 
+ok 81 - add -N followed by add -p patch editing
 
-expecting success of 3070.1888 'pathmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1888 - pathmatch (via ls-files): match '[Z-y]' 'Z'
+expecting success of 3701.82 'checkout -p patch editing of added file': 
+	git reset --hard &&
+	(
+		setup_new_file &&
+		git add new-file &&
+		git commit -m "add new file" &&
+		git rm new-file &&
+		git commit -m "remove new file" &&
+		test_write_lines e n q | git checkout -p HEAD^ &&
+		test_cmp new-file-expect new-file &&
+		test_cmp patch-expect patch
+	)
 
-expecting success of 3070.1889 'ipathmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch ipathmatch 'Z' '[Z-y]'
-		
-ok 1889 - ipathmatch: match 'Z' '[Z-y]'
+HEAD is now at 9e98a5e a
+[main 58d499b] add new file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+)
+ create mode 100644 new-file
+rm 'new-file'
+[main 4a33265] remove new file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 deletions(-)
+ delete mode 100644 new-file
+diff --git b/new-file a/new-file
+new file mode 100644
+index 0000000..0fdf397
+--- /dev/null
++++ a/new-file
+@@ -0,0 +1,6 @@
++a
++b
++c
++d
++e
++f
+(1/1) Apply addition to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 82 - checkout -p patch editing of added file
 
-expecting success of 3070.1890 'ipathmatch (via ls-files): match '[Z-y]' 'Z'': 
-				printf '%s' 'Z' >expect &&
-				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1890 - ipathmatch (via ls-files): match '[Z-y]' 'Z'
+expecting success of 3701.83 'show help from add--helper': 
+	git reset --hard &&
+	cat >expect <<-EOF &&
 
-expecting success of 3070.1891 'matching does not exhibit exponential behavior': 
-	{
-		test-tool wildmatch wildmatch \
-			aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab \
-			"*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a*a" &
-		pid=$!
-	} &&
-	sleep 2 &&
-	! kill $!
+	<BOLD>*** Commands ***<RESET>
+	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	<BOLD;BLUE>What now<RESET>> <BOLD;RED>status        - show paths with changes<RESET>
+	<BOLD;RED>update        - add working tree state to the staged set of changes<RESET>
+	<BOLD;RED>revert        - revert staged set of changes back to the HEAD version<RESET>
+	<BOLD;RED>patch         - pick hunks and update selectively<RESET>
+	<BOLD;RED>diff          - view diff between HEAD and index<RESET>
+	<BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET>
+	<BOLD>*** Commands ***<RESET>
+	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	<BOLD;BLUE>What now<RESET>>$SP
+	Bye.
+	EOF
+	test_write_lines h | force_color git add -i >actual.colored &&
+	test_decode_color <actual.colored >actual &&
+	test_cmp expect actual
 
-t3070-wildmatch.sh: 11: kill: No such process
+HEAD is now at 4a33265 remove new file
+ok 83 - show help from add--helper
 
-ok 1891 - matching does not exhibit exponential behavior
+expecting success of 3701.84 'reset -p with unmerged files': 
+	test_when_finished "git checkout --force main" &&
+	test_commit one conflict &&
+	git checkout -B side HEAD^ &&
+	test_commit two conflict &&
+	test_must_fail git merge one &&
 
-# still have 40 known breakage(s)
-# passed all remaining 1851 test(s)
-1..1891
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3908-stash-in-worktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3908-stash-in-worktree/.git/
-expecting success of 3908.1 'setup': 
-	test_commit initial &&
-	git worktree add wt &&
-	test_commit -C wt in-worktree
+	# this is a noop with only an unmerged entry
+	git reset -p &&
 
-[master (root-commit) 24b24cf] initial
+	# add files that sort before and after unmerged entry
+	echo a >a &&
+	echo z >z &&
+	git add a z &&
+
+	# confirm that we can reset those files
+	printf "%s\n" y y | git reset -p &&
+	git diff-index --cached --diff-filter=u HEAD >staged &&
+	test_must_be_empty staged
+
+[main 4d874b0] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Preparing worktree (new branch 'wt')
-HEAD is now at 24b24cf initial
-[wt a17e291] in-worktree
+ create mode 100644 conflict
+Switched to and reset branch 'side'
+[side 136cab8] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 in-worktree.t
-ok 1 - setup
+ create mode 100644 conflict
+Auto-merging conflict
+CONFLICT (add/add): Merge conflict in conflict
+Automatic merge failed; fix conflicts and then commit the result.
+diff --git a/a b/a
+index f04e1e1..7898192 100644
+--- a/a
++++ b/a
+@@ -1,11 +1 @@
+ a
+-a
+-a
+-a
+-a
+-a
+-a
+-a
+-a
+-a
+-a
+(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? conflict: needs merge
 
-expecting success of 3908.2 'apply in subdirectory': 
-	mkdir wt/subdir &&
+diff --git a/z b/z
+new file mode 100644
+index 0000000..b680253
+--- /dev/null
++++ b/z
+@@ -0,0 +1 @@
++z
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? conflict: needs merge
+
+warning: refname 'main' is ambiguous.
+Switched to branch 'main'
+ok 84 - reset -p with unmerged files
+
+expecting success of 3701.85 'hunk splitting works with diff.suppressBlankEmpty': 
+	test_config diff.suppressBlankEmpty true &&
+	write_script fake-editor.sh <<-\EOF &&
+	tr F G <"$1" >"$1.tmp" &&
+	mv "$1.tmp" "$1"
+	EOF
+
+	test_write_lines a b "" c d  "" e f "" >file &&
+	git add file &&
+	test_write_lines A b "" c D  "" e F "" >file &&
 	(
-		cd wt/subdir &&
-		echo modified >../initial.t &&
-		git stash &&
-		git stash apply >out
+		test_set_editor "$(pwd)/fake-editor.sh" &&
+		test_write_lines s n y e q | git add -p file
 	) &&
-	grep "\.\.\/initial\.t" wt/subdir/out
+	git cat-file blob :file >actual &&
+	test_write_lines a b "" c D "" e G "" >expect &&
+	test_cmp expect actual
 
-Saved working directory and index state WIP on wt: a17e291 in-worktree
-	modified:   ../initial.t
-ok 2 - apply in subdirectory
+diff --git a/file b/file
+index 5a2a9ed..6a48777 100755
+--- a/file
++++ b/file
+@@ -1,9 +1,9 @@
+-a
++A
+ b
 
-# passed all 2 test(s)
-1..2
+ c
+-d
++D
+
+ e
+-f
++F
+
+(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 3 hunks.
+@@ -1,4 +1,4 @@
+-a
++A
+ b
+
+ c
+(1/3) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -2,6 +2,6 @@
+ b
+
+ c
+-d
++D
+
+ e
+(2/3) Stage this hunk [y,n,q,a,d,K,j,J,g,/,e,p,?]? @@ -6,4 +6,4 @@
+
+ e
+-f
++F
+
+(3/3) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+ok 85 - hunk splitting works with diff.suppressBlankEmpty
+
+# passed all 85 test(s)
+1..85
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3910-mac-os-precompose.sh ***
@@ -216130,75 +216487,6 @@
 1..0 # SKIP filesystem does not corrupt utf-8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3907-stash-show-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3909-stash-pathspec-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3909-stash-pathspec-file/.git/
 expecting success of 3909.1 'setup': 
@@ -216429,662 +216717,350 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3905-stash-include-untracked.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3905-stash-include-untracked/.git/
-expecting success of 3905.1 'stash save --include-untracked some dirty working directory': 
-	echo 1 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo 2 >file &&
-	git add file &&
-	echo 3 >file &&
-	test_tick &&
-	echo 1 >file2 &&
-	echo 1 >HEAD &&
-	mkdir untracked &&
-	echo untracked >untracked/untracked &&
-	git stash --include-untracked &&
-	git diff-files --quiet &&
-	git diff-index --cached --quiet HEAD
-
-[master (root-commit) 777c62c] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Saved working directory and index state WIP on master: 777c62c initial
-ok 1 - stash save --include-untracked some dirty working directory
-
-expecting success of 3905.2 'stash save --include-untracked cleaned the untracked files': 
-	cat >expect <<-EOF &&
-	?? actual
-	?? expect
-	EOF
-
-	git status --porcelain >actual &&
-	test_cmp expect actual
-
-ok 2 - stash save --include-untracked cleaned the untracked files
-
-expecting success of 3905.3 'stash save --include-untracked stashed the untracked files': 
-	one_blob=$(echo 1 | git hash-object --stdin) &&
-	tracked=$(git rev-parse --short "$one_blob") &&
-	untracked_blob=$(echo untracked | git hash-object --stdin) &&
-	untracked=$(git rev-parse --short "$untracked_blob") &&
-	cat >expect.diff <<-EOF &&
-	diff --git a/HEAD b/HEAD
-	new file mode 100644
-	index 0000000..$tracked
-	--- /dev/null
-	+++ b/HEAD
-	@@ -0,0 +1 @@
-	+1
-	diff --git a/file2 b/file2
-	new file mode 100644
-	index 0000000..$tracked
-	--- /dev/null
-	+++ b/file2
-	@@ -0,0 +1 @@
-	+1
-	diff --git a/untracked/untracked b/untracked/untracked
-	new file mode 100644
-	index 0000000..$untracked
-	--- /dev/null
-	+++ b/untracked/untracked
-	@@ -0,0 +1 @@
-	+untracked
-	EOF
-	cat >expect.lstree <<-EOF &&
-	HEAD
-	file2
-	untracked
-	EOF
-
-	test_path_is_missing file2 &&
-	test_path_is_missing untracked &&
-	test_path_is_missing HEAD &&
-	git diff HEAD stash^3 -- HEAD file2 untracked >actual &&
-	test_cmp expect.diff actual &&
-	git ls-tree --name-only stash^3: >actual &&
-	test_cmp expect.lstree actual
-
-ok 3 - stash save --include-untracked stashed the untracked files
-
-expecting success of 3905.4 'stash save --patch --include-untracked fails': 
-	test_must_fail git stash --patch --include-untracked
-
-Can't use --patch and --include-untracked or --all at the same time
-ok 4 - stash save --patch --include-untracked fails
-
-expecting success of 3905.5 'stash save --patch --all fails': 
-	test_must_fail git stash --patch --all
-
-Can't use --patch and --include-untracked or --all at the same time
-ok 5 - stash save --patch --all fails
-
-expecting success of 3905.6 'clean up untracked/untracked file to prepare for next tests': 
-	git clean --force --quiet
-
-
-ok 6 - clean up untracked/untracked file to prepare for next tests
-
-expecting success of 3905.7 'stash pop after save --include-untracked leaves files untracked again': 
-	cat >expect <<-EOF &&
-	 M file
-	?? HEAD
-	?? actual
-	?? expect
-	?? file2
-	?? untracked/
-	EOF
-
-	git stash pop &&
-	git status --porcelain >actual &&
-	test_cmp expect actual &&
-	echo 1 >expect_file2 &&
-	test_cmp expect_file2 file2 &&
-	echo untracked >untracked_expect &&
-	test_cmp untracked_expect untracked/untracked
-
-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
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	HEAD
-	expect
-	file2
-	untracked/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (b870f65afe7416482148902ff5b21a724244d053)
-ok 7 - stash pop after save --include-untracked leaves files untracked again
-
-expecting success of 3905.8 'clean up untracked/ directory to prepare for next tests': 
-	git clean --force --quiet -d
-
-ok 8 - clean up untracked/ directory to prepare for next tests
+*** t4005-diff-rename-2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4005-diff-rename-2/.git/
+expecting success of 4005.1 'setup reference tree': 
+	COPYING_test_data >COPYING &&
+	echo frotz >rezrov &&
+	git update-index --add COPYING rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree &&
+	sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
+	sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
+	origoid=$(git hash-object COPYING) &&
+	oid1=$(git hash-object COPYING.1) &&
+	oid2=$(git hash-object COPYING.2)
 
-expecting success of 3905.9 'stash save -u dirty index': 
-	echo 4 >file3 &&
-	git add file3 &&
-	test_tick &&
-	git stash -u
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - setup reference tree
 
-Saved working directory and index state WIP on master: 777c62c initial
-ok 9 - stash save -u dirty index
+expecting success of 4005.2 'validate output from rename/copy detection (#1)': 
+	rm -f COPYING &&
+	git update-index --add --remove COPYING COPYING.? &&
 
-expecting success of 3905.10 'stash save --include-untracked dirty index got stashed': 
-	four_blob=$(echo 4 | git hash-object --stdin) &&
-	blob=$(git rev-parse --short "$four_blob") &&
-	cat >expect <<-EOF &&
-	diff --git a/file3 b/file3
-	new file mode 100644
-	index 0000000..$blob
-	--- /dev/null
-	+++ b/file3
-	@@ -0,0 +1 @@
-	+4
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
+	:100644 100644 $origoid $oid2 R1234	COPYING	COPYING.2
 	EOF
+	git diff-index -C $tree >current &&
+	compare_diff_raw expected current
 
-	git stash pop --index &&
-	test_when_finished "git reset" &&
-	git diff --cached >actual &&
-	test_cmp expect actual
-
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file3
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   file
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-
-Dropped refs/stash@{0} (6fe995aa91ff10c4e2af89ab165bd888828517d0)
-Unstaged changes after reset:
-M	file
-ok 10 - stash save --include-untracked dirty index got stashed
-
-expecting success of 3905.11 'stash save --include-untracked -q is quiet': 
-	echo 1 >file5 &&
-	git stash save --include-untracked --quiet >.git/stash-output.out 2>&1 &&
-	test_line_count = 0 .git/stash-output.out &&
-	rm -f .git/stash-output.out
-
-ok 11 - stash save --include-untracked -q is quiet
-
-expecting success of 3905.12 'stash save --include-untracked removed files': 
-	rm -f file &&
-	git stash save --include-untracked &&
-	echo 1 >expect &&
-	test_when_finished "rm -f expect" &&
-	test_cmp expect file
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 12 - stash save --include-untracked removed files
-
-expecting success of 3905.13 'stash save --include-untracked removed files got stashed': 
-	git stash pop &&
-	test_path_is_missing file
-
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    file
+ok 2 - validate output from rename/copy detection (#1)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (909f7032bbeb8f8ef8a3aa293429dac49a9d18ff)
-ok 13 - stash save --include-untracked removed files got stashed
+expecting success of 4005.3 'validate output from rename/copy detection (#2)': 
+	mv COPYING.2 COPYING &&
+	git update-index --add --remove COPYING COPYING.1 COPYING.2 &&
 
-expecting success of 3905.14 'stash save --include-untracked respects .gitignore': 
-	cat >.gitignore <<-EOF &&
-	.gitignore
-	ignored
-	ignored.d/
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid2 M	COPYING
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
 	EOF
+	git diff-index -C $tree >current &&
+	compare_diff_raw current expected
 
-	echo ignored >ignored &&
-	mkdir ignored.d &&
-	echo ignored >ignored.d/untracked &&
-	git stash -u &&
-	test_file_not_empty ignored &&
-	test_file_not_empty ignored.d/untracked &&
-	test_file_not_empty .gitignore
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 14 - stash save --include-untracked respects .gitignore
-
-expecting success of 3905.15 'stash save -u can stash with only untracked files different': 
-	echo 4 >file4 &&
-	git stash -u &&
-	test_path_is_missing file4
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 15 - stash save -u can stash with only untracked files different
-
-expecting success of 3905.16 'stash save --all does not respect .gitignore': 
-	git stash -a &&
-	test_path_is_missing ignored &&
-	test_path_is_missing ignored.d &&
-	test_path_is_missing .gitignore
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 16 - stash save --all does not respect .gitignore
-
-expecting success of 3905.17 'stash save --all is stash poppable': 
-	git stash pop &&
-	test_file_not_empty ignored &&
-	test_file_not_empty ignored.d/untracked &&
-	test_file_not_empty .gitignore
-
-Merging Version stash was based on with Stashed changes
-Already up to date.
-On branch master
-nothing to commit, working tree clean
-Dropped refs/stash@{0} (7e729995c69630f26ee14cf7ce02b080da67ecd1)
-ok 17 - stash save --all is stash poppable
-
-expecting success of 3905.18 'stash push --include-untracked with pathspec': 
-	>foo &&
-	>bar &&
-	git stash push --include-untracked -- foo &&
-	test_path_is_file bar &&
-	test_path_is_missing foo &&
-	git stash pop &&
-	test_path_is_file bar &&
-	test_path_is_file foo
-
-Saved working directory and index state WIP on master: 777c62c initial
-Merging Version stash was based on with Stashed changes
-Already up to date.
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	bar
-	foo
-
-nothing added to commit but untracked files present (use "git add" to track)
-Dropped refs/stash@{0} (8c4436f5c5cee126e0672d6347a425d7e9dcfcdd)
-ok 18 - stash push --include-untracked with pathspec
-
-expecting success of 3905.19 'stash push with $IFS character': 
-	>"foo bar" &&
-	>foo &&
-	>bar &&
-	git add foo* &&
-	git stash push --include-untracked -- "foo b*" &&
-	test_path_is_missing "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar &&
-	git stash pop &&
-	test_path_is_file "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar
-
-Saved working directory and index state WIP on master: 777c62c initial
-Merging Updated upstream with Stashed changes
-On branch master
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   foo
-	new file:   foo bar
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	bar
+ok 3 - validate output from rename/copy detection (#2)
 
-Dropped refs/stash@{0} (35eb97973117e33f4570df8b356a559959935987)
-ok 19 - stash push with $IFS character
+expecting success of 4005.4 'validate output from rename/copy detection (#3)': 
+	COPYING_test_data >COPYING &&
+	git update-index --add --remove COPYING COPYING.1 &&
 
-expecting success of 3905.20 'stash previously ignored file': 
-	cat >.gitignore <<-EOF &&
-	ignored
-	ignored.d/*
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
 	EOF
+	git diff-index -C --find-copies-harder $tree >current &&
+	compare_diff_raw current expected
 
-	git reset HEAD &&
-	git add .gitignore &&
-	git commit -m "Add .gitignore" &&
-	>ignored.d/foo &&
-	echo "!ignored.d/foo" >>.gitignore &&
-	git stash save --include-untracked &&
-	test_path_is_missing ignored.d/foo &&
-	git stash pop &&
-	test_path_is_file ignored.d/foo
+ok 4 - validate output from rename/copy detection (#3)
 
-[master 14579a4] Add .gitignore
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 .gitignore
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-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:   .gitignore
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4000-diff-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	bar
-	foo
-	foo bar
-	ignored.d/
+ok 1 - update-index --add two files with and without +x.
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (cd3bab6f4eef73edff723219ece7e89ceec0e923)
-ok 20 - stash previously ignored file
+expecting success of 4000.2 'git diff-files -p after editing work tree.': 
+	git diff-files -p >actual
 
-expecting success of 3905.21 'stash -u -- <untracked> doesnt print error': 
-	>untracked &&
-	git stash push -u -- untracked 2>actual &&
-	test_path_is_missing untracked &&
-	test_line_count = 0 actual
+ok 2 - git diff-files -p after editing work tree.
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 21 - stash -u -- <untracked> doesnt print error
+expecting success of 4000.3 'validate git diff-files -p output.': 
+	compare_diff_patch expected actual
 
-expecting success of 3905.22 'stash -u -- <untracked> leaves rest of working tree in place': 
-	>tracked &&
-	git add tracked &&
-	>untracked &&
-	git stash push -u -- untracked &&
-	test_path_is_missing untracked &&
-	test_path_is_file tracked
+ok 3 - validate git diff-files -p output.
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 22 - stash -u -- <untracked> leaves rest of working tree in place
+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
 
-expecting success of 3905.23 'stash -u -- <tracked> <untracked> clears changes in both': 
-	>tracked &&
-	git add tracked &&
-	>untracked &&
-	git stash push -u -- tracked untracked &&
-	test_path_is_missing tracked &&
-	test_path_is_missing untracked
+ok 4 - git diff-files -s after editing work tree
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 23 - stash -u -- <tracked> <untracked> clears changes in both
+expecting success of 4000.5 'git diff-files --no-patch as synonym for -s': 
+	git diff-files --no-patch >actual 2>err &&
+	test_must_be_empty actual &&
+	test_must_be_empty err
 
-expecting success of 3905.24 'stash --all -- <ignored> stashes ignored file': 
-	>ignored.d/bar &&
-	git stash push --all -- ignored.d/bar &&
-	test_path_is_missing ignored.d/bar
+ok 5 - git diff-files --no-patch as synonym for -s
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 24 - stash --all -- <ignored> stashes ignored file
+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
 
-expecting success of 3905.25 'stash --all -- <tracked> <ignored> clears changes in both': 
-	>tracked &&
-	git add tracked &&
-	>ignored.d/bar &&
-	git stash push --all -- tracked ignored.d/bar &&
-	test_path_is_missing tracked &&
-	test_path_is_missing ignored.d/bar
+ok 6 - git diff-files --no-patch --patch shows the patch
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 25 - stash --all -- <tracked> <ignored> clears changes in both
+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
 
-expecting success of 3905.26 'stash -u -- <ignored> leaves ignored file alone': 
-	>ignored.d/bar &&
-	git stash push -u -- ignored.d/bar &&
-	test_path_is_file ignored.d/bar
+ok 7 - git diff-files --no-patch --patch-with-raw shows the patch and raw data
 
-No local changes to save
-ok 26 - stash -u -- <ignored> leaves ignored file alone
+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
 
-expecting success of 3905.27 'stash -u -- <non-existent> shows no changes when there are none': 
-	git stash push -u -- non-existent >actual &&
-	echo "No local changes to save" >expect &&
-	test_cmp expect actual
+ok 8 - git diff-files --patch --no-patch does not show the patch
 
-ok 27 - stash -u -- <non-existent> shows no changes when there are none
+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 3905.28 'stash -u with globs': 
-	>untracked.txt &&
-	git stash -u -- ":(glob)**/*.txt" &&
-	test_path_is_missing untracked.txt
+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
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 28 - stash -u with globs
+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 3905.29 'stash show --include-untracked shows untracked files': 
-	git reset --hard &&
-	git clean -xf &&
-	>untracked &&
-	>tracked &&
-	git add tracked &&
-	empty_blob_oid=$(git rev-parse --short :tracked) &&
-	git stash -u &&
+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
 
-	cat >expect <<-EOF &&
-	 tracked   | 0
-	 untracked | 0
-	 2 files changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git stash show --include-untracked >actual &&
-	test_cmp expect actual &&
-	git stash show -u >actual &&
-	test_cmp expect actual &&
-	git stash show --no-include-untracked --include-untracked >actual &&
-	test_cmp expect actual &&
-	git stash show --only-untracked --include-untracked >actual &&
-	test_cmp expect actual &&
-	git -c stash.showIncludeUntracked=true stash show >actual &&
-	test_cmp expect actual &&
+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
 
-	cat >expect <<-EOF &&
-	diff --git a/tracked b/tracked
-	new file mode 100644
-	index 0000000..$empty_blob_oid
-	diff --git a/untracked b/untracked
-	new file mode 100644
-	index 0000000..$empty_blob_oid
-	EOF
-	git stash show -p --include-untracked >actual &&
-	test_cmp expect actual &&
-	git stash show --include-untracked -p >actual &&
-	test_cmp expect actual &&
-	git -c stash.showIncludeUntracked=true stash show -p >actual &&
-	test_cmp expect actual
+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
 
-HEAD is now at 14579a4 Add .gitignore
-Removing actual
-Removing bar
-Removing expect
-Removing foo
-Removing foo bar
-Removing ignored
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 29 - stash show --include-untracked shows untracked files
+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 3905.30 'stash show --only-untracked only shows untracked files': 
-	git reset --hard &&
-	git clean -xf &&
-	>untracked &&
-	>tracked &&
-	git add tracked &&
-	empty_blob_oid=$(git rev-parse --short :tracked) &&
-	git stash -u &&
+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
 
-	cat >expect <<-EOF &&
-	 untracked | 0
-	 1 file changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git stash show --only-untracked >actual &&
-	test_cmp expect actual &&
-	git stash show --no-include-untracked --only-untracked >actual &&
-	test_cmp expect actual &&
-	git stash show --include-untracked --only-untracked >actual &&
-	test_cmp expect actual &&
+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
 
-	cat >expect <<-EOF &&
-	diff --git a/untracked b/untracked
-	new file mode 100644
-	index 0000000..$empty_blob_oid
-	EOF
-	git stash show -p --only-untracked >actual &&
-	test_cmp expect actual &&
-	git stash show --only-untracked -p >actual &&
-	test_cmp expect actual
+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
 
-HEAD is now at 14579a4 Add .gitignore
-Removing actual
-Removing expect
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 30 - stash show --only-untracked only shows untracked files
+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 3905.31 'stash show --no-include-untracked cancels --{include,only}-untracked': 
-	git reset --hard &&
-	git clean -xf &&
-	>untracked &&
-	>tracked &&
-	git add tracked &&
-	git stash -u &&
+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
 
-	cat >expect <<-EOF &&
-	 tracked | 0
-	 1 file changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git stash show --only-untracked --no-include-untracked >actual &&
-	test_cmp expect actual &&
-	git stash show --include-untracked --no-include-untracked >actual &&
-	test_cmp expect actual
+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
 
-HEAD is now at 14579a4 Add .gitignore
-Removing actual
-Removing expect
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 31 - stash show --no-include-untracked cancels --{include,only}-untracked
+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 3905.32 'stash show --include-untracked errors on duplicate files': 
-	git reset --hard &&
-	git clean -xf &&
-	>tracked &&
-	git add tracked &&
-	tree=$(git write-tree) &&
-	i_commit=$(git commit-tree -p HEAD -m "index on any-branch" "$tree") &&
-	test_when_finished "rm -f untracked_index" &&
-	u_commit=$(
-		GIT_INDEX_FILE="untracked_index" &&
-		export GIT_INDEX_FILE &&
-		git update-index --add tracked &&
-		u_tree=$(git write-tree) &&
-		git commit-tree -m "untracked files on any-branch" "$u_tree"
-	) &&
-	w_commit=$(git commit-tree -p HEAD -p "$i_commit" -p "$u_commit" -m "WIP on any-branch" "$tree") &&
-	test_must_fail git stash show --include-untracked "$w_commit" 2>err &&
-	test_grep "worktree and untracked commit have duplicate entries: tracked" err
+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
 
-HEAD is now at 14579a4 Add .gitignore
-Removing actual
-Removing expect
-error: worktree and untracked commit have duplicate entries: tracked
-ok 32 - stash show --include-untracked errors on duplicate files
+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 3905.33 'stash show --{include,only}-untracked on stashes without untracked entries': 
-	git reset --hard &&
-	git clean -xf &&
-	>tracked &&
-	git add tracked &&
-	git stash &&
+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
 
-	git stash show >expect &&
-	git stash show --include-untracked >actual &&
-	test_cmp expect actual &&
+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
 
-	git stash show --only-untracked >actual &&
-	test_must_be_empty actual
+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
 
-HEAD is now at 14579a4 Add .gitignore
-Removing err
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 33 - stash show --{include,only}-untracked on stashes without untracked entries
+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 3905.34 'stash -u ignores sub-repository': 
-	test_when_finished "rm -rf sub-repo" &&
-	git init sub-repo &&
-	git stash -u
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3905-stash-include-untracked/sub-repo/.git/
-Ignoring path sub-repo/
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 34 - stash -u ignores sub-repository
+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
 
-# passed all 34 test(s)
-1..34
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4005-diff-rename-2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4005-diff-rename-2/.git/
-expecting success of 4005.1 'setup reference tree': 
-	COPYING_test_data >COPYING &&
-	echo frotz >rezrov &&
-	git update-index --add COPYING rezrov &&
-	tree=$(git write-tree) &&
-	echo $tree &&
-	sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
-	sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
-	origoid=$(git hash-object COPYING) &&
-	oid1=$(git hash-object COPYING.1) &&
-	oid2=$(git hash-object COPYING.2)
+expecting success of 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
 
-f7f2b494dd94f6acf05bc19174516b590236eb2d
-ok 1 - setup reference tree
+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 4005.2 'validate output from rename/copy detection (#1)': 
-	rm -f COPYING &&
-	git update-index --add --remove COPYING COPYING.? &&
+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
 
-	cat <<-EOF >expected &&
-	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
-	:100644 100644 $origoid $oid2 R1234	COPYING	COPYING.2
-	EOF
-	git diff-index -C $tree >current &&
-	compare_diff_raw expected current
+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
 
-ok 2 - validate output from rename/copy detection (#1)
+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 4005.3 'validate output from rename/copy detection (#2)': 
-	mv COPYING.2 COPYING &&
-	git update-index --add --remove COPYING COPYING.1 COPYING.2 &&
+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
 
-	cat <<-EOF >expected &&
-	:100644 100644 $origoid $oid2 M	COPYING
-	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
-	EOF
-	git diff-index -C $tree >current &&
-	compare_diff_raw current expected
+expecting success of 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
 
-ok 3 - validate output from rename/copy detection (#2)
+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 4005.4 'validate output from rename/copy detection (#3)': 
-	COPYING_test_data >COPYING &&
-	git update-index --add --remove COPYING COPYING.1 &&
+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
 
-	cat <<-EOF >expected &&
-	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
-	EOF
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
+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
 
-ok 4 - validate output from rename/copy detection (#3)
+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 4 test(s)
-1..4
+# passed all 41 test(s)
+1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4006-diff-mode.sh ***
@@ -217162,6 +217138,795 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4001-diff-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4007-rename-3.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3920-crlf-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3920-crlf-messages/.git/
+expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
+	test_commit initial &&
+	create_crlf_refs
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 1 - Setup refs with commit and tag messages using CRLF
+
+expecting success of 3920.2 'branch: --verbose works with messages using CRLF': 
+	rm -f expect &&
+	for branch in $LIB_CRLF_BRANCHES
+	do
+		printf "  " >>expect &&
+		cat .crlf-subject-${branch}.txt >>expect &&
+		printf "\n" >>expect || return 1
+	done &&
+	git branch -v >tmp &&
+	# Remove first two columns, and the line for the currently checked out branch
+	current=$(git branch --show-current) &&
+	awk "/$current/ { next } { \$1 = \$2 = \"\" } 1" <tmp >actual &&
+	test_cmp expect actual
+
+ok 2 - branch: --verbose works with messages using CRLF
+
+expecting success of 3920.3 'branch: --format='%(contents:subject)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git branch --list crlf* --format="%(contents:subject)" >actual &&
+			test_cmp expect actual
+		
+ok 3 - branch: --format='%(contents:subject)' works with messages using CRLF
+
+expecting success of 3920.4 'branch: --format='%(contents:body)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git branch --list crlf* --format="%(contents:body)" >actual &&
+			test_cmp expect actual
+		
+ok 4 - branch: --format='%(contents:body)' works with messages using CRLF
+
+expecting success of 3920.5 'branch: --format='%(contents)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git branch --list crlf* --format="%(contents)" >actual &&
+			test_cmp expect actual
+		
+ok 5 - branch: --format='%(contents)' works with messages using CRLF
+
+expecting success of 3920.6 'tag: --format='%(contents:subject)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git tag --list tag-crlf* --format="%(contents:subject)" >actual &&
+			test_cmp expect actual
+		
+ok 6 - tag: --format='%(contents:subject)' works with messages using CRLF
+
+expecting success of 3920.7 'tag: --format='%(contents:body)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git tag --list tag-crlf* --format="%(contents:body)" >actual &&
+			test_cmp expect actual
+		
+ok 7 - tag: --format='%(contents:body)' works with messages using CRLF
+
+expecting success of 3920.8 'tag: --format='%(contents)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git tag --list tag-crlf* --format="%(contents)" >actual &&
+			test_cmp expect actual
+		
+ok 8 - tag: --format='%(contents)' works with messages using CRLF
+
+expecting success of 3920.9 'for-each-ref: --format='%(contents:subject)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git for-each-ref refs/heads/crlf* --format="%(contents:subject)" >actual &&
+			test_cmp expect actual
+		
+ok 9 - for-each-ref: --format='%(contents:subject)' works with messages using CRLF
+
+expecting success of 3920.10 'for-each-ref: --format='%(contents:body)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git for-each-ref refs/heads/crlf* --format="%(contents:body)" >actual &&
+			test_cmp expect actual
+		
+ok 10 - for-each-ref: --format='%(contents:body)' works with messages using CRLF
+
+expecting success of 3920.11 'for-each-ref: --format='%(contents)' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git for-each-ref refs/heads/crlf* --format="%(contents)" >actual &&
+			test_cmp expect actual
+		
+ok 11 - for-each-ref: --format='%(contents)' works with messages using CRLF
+
+expecting success of 3920.12 'log: --oneline works with messages using CRLF': 
+	for branch in $LIB_CRLF_BRANCHES
+	do
+		cat .crlf-subject-${branch}.txt >expect &&
+		printf "\n" >>expect &&
+		git log --oneline -1 ${branch} >tmp-branch &&
+		git log --oneline -1 tag-${branch} >tmp-tag &&
+		cut -d" " -f2- <tmp-branch >actual-branch &&
+		cut -d" " -f2- <tmp-tag >actual-tag &&
+		test_cmp expect actual-branch &&
+		test_cmp expect actual-tag || return 1
+	done
+
+ok 12 - log: --oneline works with messages using CRLF
+
+expecting success of 3920.13 'log: --format='%s' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git log --all --reverse --grep Subject --format="%s" >actual &&
+			test_cmp expect actual
+		
+ok 13 - log: --format='%s' works with messages using CRLF
+
+expecting success of 3920.14 'log: --format='%b' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git log --all --reverse --grep Subject --format="%b" >actual &&
+			test_cmp expect actual
+		
+ok 14 - log: --format='%b' works with messages using CRLF
+
+expecting success of 3920.15 'log: --format='%B' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git log --all --reverse --grep Subject --format="%B" >actual &&
+			test_cmp expect actual
+		
+ok 15 - log: --format='%B' works with messages using CRLF
+
+expecting success of 3920.16 'show: --format='%s' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-subject-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%s" >actual &&
+			test_cmp expect actual
+		
+ok 16 - show: --format='%s' works with messages using CRLF
+
+expecting success of 3920.17 'show: --format='%b' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-body-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%b" >actual &&
+			test_cmp expect actual
+		
+ok 17 - show: --format='%b' works with messages using CRLF
+
+expecting success of 3920.18 'show: --format='%B' works with messages using CRLF': 
+			rm -f expect &&
+			for ref in  crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline
+			do
+				cat .crlf-message-"${ref}".txt >>expect &&
+				printf "\n" >>expect || return 1
+			done &&
+			git show crlf crlf-empty-lines-after-subject crlf-two-line-subject crlf-two-line-subject-no-body crlf-two-line-subject-no-body-trailing-newline --format="%B" >actual &&
+			test_cmp expect actual
+		
+ok 18 - show: --format='%B' works with messages using CRLF
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3800-mktag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3800-mktag/.git/
 expecting success of 3800.1 'setup': 
@@ -219192,1637 +219957,561 @@
 		# Reset any leftover state from the last $subject
 		rm -rf bad-tag &&
 
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3800-mktag/bad-tag/
-ok 129 - setup: detect invalid tag timezone1
-
-expecting success of 3800.130 'hash-object & fsck unreachable: detect invalid tag timezone1': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-ok 130 - hash-object & fsck unreachable: detect invalid tag timezone1
-
-expecting success of 3800.131 'update-ref & fsck reachable: detect invalid tag timezone1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 131 - update-ref & fsck reachable: detect invalid tag timezone1
-
-expecting success of 3800.132 'for-each-ref: detect invalid tag timezone1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 132 - for-each-ref: detect invalid tag timezone1
-
-expecting success of 3800.133 'fast-export & fast-import: detect invalid tag timezone1': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 133 - fast-export & fast-import: detect invalid tag timezone1
-
-expecting success of 3800.134 'fail with [--[no-]strict]: detect invalid tag timezone2': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-ok 134 - fail with [--[no-]strict]: detect invalid tag timezone2
-
-expecting success of 3800.135 'setup: detect invalid tag timezone2': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3800-mktag/bad-tag/
-ok 135 - setup: detect invalid tag timezone2
-
-expecting success of 3800.136 'hash-object & fsck unreachable: detect invalid tag timezone2': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-ok 136 - hash-object & fsck unreachable: detect invalid tag timezone2
-
-expecting success of 3800.137 'update-ref & fsck reachable: detect invalid tag timezone2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 137 - update-ref & fsck reachable: detect invalid tag timezone2
-
-expecting success of 3800.138 'for-each-ref: detect invalid tag timezone2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 138 - for-each-ref: detect invalid tag timezone2
-
-expecting success of 3800.139 'fast-export & fast-import: detect invalid tag timezone2': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 139 - fast-export & fast-import: detect invalid tag timezone2
-
-expecting success of 3800.140 'allow invalid tag timezone': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-ok 140 - allow invalid tag timezone
-
-expecting success of 3800.141 'fail with [--[no-]strict]: detect invalid header entry': 
-		test_must_fail git mktag <tag.sig 2>err &&
-		if test -z "$no_strict"
-		then
-			test_must_fail git mktag <tag.sig 2>err2 &&
-			test_cmp err err2
-		else
-			git mktag --no-strict <tag.sig
-		fi
-	
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-ok 141 - fail with [--[no-]strict]: detect invalid header entry
-
-expecting success of 3800.142 'setup: detect invalid header entry': 
-		tag_ref=refs/tags/bad_tag &&
-
-		# Reset any leftover state from the last $subject
-		rm -rf bad-tag &&
-
-		git init --bare bad-tag &&
-		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3800-mktag/bad-tag/
-ok 142 - setup: detect invalid header entry
-
-expecting success of 3800.143 'hash-object & fsck unreachable: detect invalid header entry': 
-		if test -n "$fsck_obj_ok"
-		then
-			git -C bad-tag fsck
-		else
-			test_must_fail git -C bad-tag fsck
-		fi
-	
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-ok 143 - hash-object & fsck unreachable: detect invalid header entry
-
-expecting success of 3800.144 'update-ref & fsck reachable: detect invalid header entry': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		# The update-ref of the bad content will fail, do it
-		# anyway to see if it segfaults
-		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
-
-		# Manually create the broken, we cannot do it with
-		# update-ref
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		# Unlike fsck-ing unreachable content above, this
-		# will always fail.
-		test_must_fail git -C bad-tag fsck
-	
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-notice: HEAD points to an unborn branch (master)
-broken link from     tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
-missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 144 - update-ref & fsck reachable: detect invalid header entry
-
-expecting success of 3800.145 'for-each-ref: detect invalid header entry': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
-		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-
-		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
-		git -C bad-tag for-each-ref "$tag_ref" >actual &&
-		test_cmp expected actual &&
-
-		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
-	
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
-ok 145 - for-each-ref: detect invalid header entry
-
-expecting success of 3800.146 'fast-export & fast-import: detect invalid header entry': 
-		# Make sure the earlier test created it for us
-		git rev-parse "$bad_tag" &&
-
-		test_must_fail git -C bad-tag fast-export --all &&
-		test_must_fail git -C bad-tag fast-export "$bad_tag"
-	
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
-ok 146 - fast-export & fast-import: detect invalid header entry
-
-expecting success of 3800.147 'invalid header entry config & fsck': 
-	test_must_fail git mktag <tag.sig &&
-	git mktag --no-strict <tag.sig &&
-
-	test_must_fail git -c fsck.extraHeaderEntry=error mktag <tag.sig &&
-	test_must_fail git -c fsck.extraHeaderEntry=error mktag --no-strict <tag.sig &&
-
-	test_must_fail git -c fsck.extraHeaderEntry=warn mktag <tag.sig &&
-	git -c fsck.extraHeaderEntry=warn mktag --no-strict <tag.sig &&
-
-	git -c fsck.extraHeaderEntry=ignore mktag <tag.sig &&
-	git -c fsck.extraHeaderEntry=ignore mktag --no-strict <tag.sig &&
-
-	git fsck &&
-	git -c fsck.extraHeaderEntry=warn fsck 2>err &&
-	grep "warning .*extraHeaderEntry:" err &&
-	test_must_fail git -c fsck.extraHeaderEntry=error 2>err fsck &&
-	grep "error .* extraHeaderEntry:" err
-
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-fatal: tag on stdin did not pass our strict fsck check
-warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-27668aaff16c8e0303faa67823e07d9c4e709bd8
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-warning in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-warning in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-error in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-error in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
-ok 147 - invalid header entry config & fsck
-
-expecting success of 3800.148 'allow extra newlines at start of body': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-ok 148 - allow extra newlines at start of body
-
-expecting success of 3800.149 'allow a blank line before an empty body (1)': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-ok 149 - allow a blank line before an empty body (1)
-
-expecting success of 3800.150 'allow no blank line before an empty body (2)': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-ok 150 - allow no blank line before an empty body (2)
-
-expecting success of 3800.151 'create valid tag object': 
-		git hash-object -t tag -w --stdin <tag.sig >expected &&
-		git fsck --strict &&
-
-		git mktag <tag.sig >hash &&
-		test_cmp expected hash &&
-		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
-		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
-		git fsck --strict
-	
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
-warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
-warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
-warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
-dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
-dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
-dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
-dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
-dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
-dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
-dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
-dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
-dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
-dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
-dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
-dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
-ok 151 - create valid tag object
-
-# passed all 151 test(s)
-1..151
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4001-diff-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4000-diff-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
 	
-ok 23 - --no-patch in 'git diff --no-patch --summary' is a no-op
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3800-mktag/bad-tag/
+ok 129 - setup: detect invalid tag timezone1
 
-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
+expecting success of 3800.130 'hash-object & fsck unreachable: detect invalid tag timezone1': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
 	
-ok 24 - --no-patch in 'git diff-files --no-patch --dirstat' is a no-op
+error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+ok 130 - hash-object & fsck unreachable: detect invalid tag timezone1
 
-expecting success of 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 3800.131 'update-ref & fsck reachable: detect invalid tag timezone1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 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
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-expecting success of 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
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4000.28 '--no-patch clears all previous ones': 
-		git diff-files --$format -s -p >actual &&
-		git diff-files -p >expect &&
-		test_cmp expect actual
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
 	
-ok 28 - --no-patch clears all previous ones
+1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+error in tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 131 - update-ref & fsck reachable: detect invalid tag timezone1
 
-expecting success of 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 3800.132 'for-each-ref: detect invalid tag timezone1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 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
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-expecting success of 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
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
 	
-ok 32 - --no-patch in 'git diff --no-patch --dirstat-by-file' is a no-op
+1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 132 - for-each-ref: detect invalid tag timezone1
 
-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 3800.133 'fast-export & fast-import: detect invalid tag timezone1': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
 	
-ok 34 - --no-patch clears all previous ones
+1062f3506ae6d34c78d90b80e45b2dc2d3ddff56
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 133 - fast-export & fast-import: detect invalid tag timezone1
 
-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
+expecting success of 3800.134 'fail with [--[no-]strict]: detect invalid tag timezone2': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
 	
-ok 35 - --no-patch in 'git diff --no-patch --patch-with-raw' is a no-op
+ok 134 - fail with [--[no-]strict]: detect invalid tag timezone2
 
-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 3800.135 'setup: detect invalid tag timezone2': 
+		tag_ref=refs/tags/bad_tag &&
 
-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
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-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
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
 	
-ok 38 - --no-patch in 'git diff --no-patch --patch-with-stat' is a no-op
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3800-mktag/bad-tag/
+ok 135 - setup: detect invalid tag timezone2
 
-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
+expecting success of 3800.136 'hash-object & fsck unreachable: detect invalid tag timezone2': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
 	
-ok 39 - --no-patch in 'git diff-files --no-patch --compact-summary' is a no-op
+error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+ok 136 - hash-object & fsck unreachable: detect invalid tag timezone2
 
-expecting success of 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 3800.137 'update-ref & fsck reachable: detect invalid tag timezone2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-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
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
+
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
 	
-ok 41 - --no-patch in 'git diff --no-patch --compact-summary' is a no-op
+30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+error in tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b: badTimezone: invalid author/committer line - bad time zone
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 137 - update-ref & fsck reachable: detect invalid tag timezone2
 
-# passed all 41 test(s)
-1..41
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4007-rename-3.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+expecting success of 3800.138 'for-each-ref: detect invalid tag timezone2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 1 - prepare reference tree
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-expecting success of 4007.2 'prepare work tree': 
-	cp path0/COPYING path1/COPYING &&
-	git update-index --add --remove path0/COPYING path1/COPYING
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-ok 2 - prepare work tree
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 138 - for-each-ref: detect invalid tag timezone2
 
-expecting success of 4007.3 'copy detection': 
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
+expecting success of 3800.139 'fast-export & fast-import: detect invalid tag timezone2': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-ok 3 - copy detection
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+30b2f9b749c26e3847c032f1f8dd41e8d8e29d5b
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 139 - fast-export & fast-import: detect invalid tag timezone2
 
-expecting success of 4007.4 'copy detection, cached': 
-	git diff-index -C --find-copies-harder --cached $tree >current &&
-	compare_diff_raw current expected
+expecting success of 3800.140 'allow invalid tag timezone': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-ok 4 - copy detection, cached
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+ok 140 - allow invalid tag timezone
 
-expecting success of 4007.5 'copy, limited to a subtree': 
-	git diff-index -C --find-copies-harder $tree path1 >current &&
-	compare_diff_raw current expected
+expecting success of 3800.141 'fail with [--[no-]strict]: detect invalid header entry': 
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+ok 141 - fail with [--[no-]strict]: detect invalid header entry
 
-ok 5 - copy, limited to a subtree
+expecting success of 3800.142 'setup: detect invalid header entry': 
+		tag_ref=refs/tags/bad_tag &&
 
-expecting success of 4007.6 'tweak work tree': 
-	rm -f path0/COPYING &&
-	git update-index --remove path0/COPYING
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
 
-ok 6 - tweak work tree
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3800-mktag/bad-tag/
+ok 142 - setup: detect invalid header entry
 
-expecting success of 4007.7 'rename detection': 
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
+expecting success of 3800.143 'hash-object & fsck unreachable: detect invalid header entry': 
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+ok 143 - hash-object & fsck unreachable: detect invalid header entry
 
-ok 7 - rename detection
+expecting success of 3800.144 'update-ref & fsck reachable: detect invalid header entry': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 4007.8 'rename, limited to a subtree': 
-	git diff-index -C --find-copies-harder $tree path1 >current &&
-	compare_diff_raw current expected
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
 
-ok 8 - rename, limited to a subtree
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3920-crlf-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3920-crlf-messages/.git/
-expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
-	test_commit initial &&
-	create_crlf_refs
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+notice: HEAD points to an unborn branch (master)
+broken link from     tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+              to  commit d9df4505cb3522088b9e29d6051ac16f1564154a
+missing commit d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 144 - update-ref & fsck reachable: detect invalid header entry
 
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 1 - Setup refs with commit and tag messages using CRLF
+expecting success of 3800.145 'for-each-ref: detect invalid header entry': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 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
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-ok 2 - branch: --verbose works with messages using CRLF
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
 
-expecting success of 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
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+fatal: missing object d9df4505cb3522088b9e29d6051ac16f1564154a for refs/tags/bad_tag
+ok 145 - for-each-ref: detect invalid header entry
 
-expecting success of 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 3800.146 'fast-export & fast-import: detect invalid header entry': 
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
 
-expecting success of 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
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+fatal: bad object d9df4505cb3522088b9e29d6051ac16f1564154a
+ok 146 - fast-export & fast-import: detect invalid header entry
 
-expecting success of 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 3800.147 'invalid header entry config & fsck': 
+	test_must_fail git mktag <tag.sig &&
+	git mktag --no-strict <tag.sig &&
 
-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
+	test_must_fail git -c fsck.extraHeaderEntry=error mktag <tag.sig &&
+	test_must_fail git -c fsck.extraHeaderEntry=error mktag --no-strict <tag.sig &&
 
-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
+	test_must_fail git -c fsck.extraHeaderEntry=warn mktag <tag.sig &&
+	git -c fsck.extraHeaderEntry=warn mktag --no-strict <tag.sig &&
 
-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
+	git -c fsck.extraHeaderEntry=ignore mktag <tag.sig &&
+	git -c fsck.extraHeaderEntry=ignore mktag --no-strict <tag.sig &&
 
-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
+	git fsck &&
+	git -c fsck.extraHeaderEntry=warn fsck 2>err &&
+	grep "warning .*extraHeaderEntry:" err &&
+	test_must_fail git -c fsck.extraHeaderEntry=error 2>err fsck &&
+	grep "error .* extraHeaderEntry:" err
 
-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
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+error: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+fatal: tag on stdin did not pass our strict fsck check
+warning: tag input does not pass fsck: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+27668aaff16c8e0303faa67823e07d9c4e709bd8
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+warning in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+warning in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+error in tag 27668aaff16c8e0303faa67823e07d9c4e709bd8: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+error in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: extraHeaderEntry: invalid format - extra header(s) after 'tagger'
+ok 147 - invalid header entry config & fsck
 
-expecting success of 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
+expecting success of 3800.148 'allow extra newlines at start of body': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-ok 12 - log: --oneline works with messages using CRLF
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+ok 148 - allow extra newlines at start of body
 
-expecting success of 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 3800.149 'allow a blank line before an empty body (1)': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-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
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+ok 149 - allow a blank line before an empty body (1)
 
-expecting success of 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 3800.150 'allow no blank line before an empty body (2)': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-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
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+ok 150 - allow no blank line before an empty body (2)
 
-expecting success of 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 3800.151 'create valid tag object': 
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
 
-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
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
+	
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag 03e2668a257938d0a47497d9762e45da6c84c9f8
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+error in tag 10a38b63369e5f6b0d453612536d13ca970fdf12: badEmail: invalid author/committer line - bad email
+warning in tag 3a917b365efe8e0762ae4448ca795035d60fedbe: badTagName: invalid 'tag' name: my	tag
+warning in tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba: missingTaggerEntry: invalid format - expected 'tagger' line
+warning in tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03: missingTaggerEntry: invalid format - expected 'tagger' line
+dangling tag bfa074c29cdc9cc74319502c59a90da165e7113f
+dangling tag 0182c9c0d953da2345b39546afbd57e917ee9f4c
+dangling tag c4a19535d7c87120cb5b48094d2cd8e9b0918a03
+dangling tag 10a38b63369e5f6b0d453612536d13ca970fdf12
+dangling tag 93cc22724321522cdcfeced9652268b0eee0ccca
+dangling tag 615b33f9ac2defb77a8cc50f373183ebe0a45e4a
+dangling tag 22d42c00ce86208a0273f16e2d5808d17b3792f6
+dangling tag a10af691a2a6ef23a4f258d9bf97b1a7fc46b0ba
+dangling tag 27668aaff16c8e0303faa67823e07d9c4e709bd8
+dangling tag 3a917b365efe8e0762ae4448ca795035d60fedbe
+dangling tag 7e37723df47e24f0dfc27cec7127fa011bb1843d
+dangling tag 3f434bd651bfb4745f87bb9aa462415fddad0546
+ok 151 - create valid tag object
 
-# passed all 18 test(s)
-1..18
+# passed all 151 test(s)
+1..151
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4009-diff-rename-4.sh ***
@@ -220865,6 +220554,168 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4008-diff-break-rewrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4008-diff-break-rewrite/.git/
+expecting success of 4008.1 'setup': 
+	echo some dissimilar content >file0 &&
+	COPYING_test_data >file1 &&
+	blob0_id=$(git hash-object file0) &&
+	blob1_id=$(git hash-object file1) &&
+	git update-index --add file0 file1 &&
+	git tag reference $(git write-tree)
+
+ok 1 - setup
+
+expecting success of 4008.2 'change file1 with copy-edit of file0 and remove file0': 
+	sed -e "s/git/GIT/" file0 >file1 &&
+	blob2_id=$(git hash-object file1) &&
+	rm -f file0 &&
+	git update-index --remove file0 file1
+
+ok 2 - change file1 with copy-edit of file0 and remove file0
+
+expecting success of 4008.3 'run diff with -B (#1)': 
+	git diff-index -B --cached reference >current &&
+	cat >expect <<-EOF &&
+	:100644 000000 $blob0_id $ZERO_OID D	file0
+	:100644 100644 $blob1_id $blob2_id M100	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 3 - run diff with -B (#1)
+
+expecting success of 4008.4 'run diff with -B and -M (#2)': 
+	git diff-index -B -M reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob0_id $blob2_id R100	file0	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 4 - run diff with -B and -M (#2)
+
+expecting success of 4008.5 'swap file0 and file1': 
+	rm -f file0 file1 &&
+	git read-tree -m reference &&
+	git checkout-index -f -u -a &&
+	mv file0 tmp &&
+	mv file1 file0 &&
+	mv tmp file1 &&
+	git update-index file0 file1
+
+ok 5 - swap file0 and file1
+
+expecting success of 4008.6 'run diff with -B (#3)': 
+	git diff-index -B reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob0_id $blob1_id M100	file0
+	:100644 100644 $blob1_id $blob0_id M100	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 6 - run diff with -B (#3)
+
+expecting success of 4008.7 'run diff with -B and -M (#4)': 
+	git diff-index -B -M reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob1_id $blob1_id R100	file1	file0
+	:100644 100644 $blob0_id $blob0_id R100	file0	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 7 - run diff with -B and -M (#4)
+
+expecting success of 4008.8 'make file0 into something completely different': 
+	rm -f file0 &&
+	test_ln_s_add frotz file0 &&
+	slink_id=$(printf frotz | git hash-object --stdin) &&
+	git update-index file1
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 8 - make file0 into something completely different
+
+expecting success of 4008.9 'run diff with -B (#5)': 
+	git diff-index -B reference >current &&
+	cat >expect <<-EOF &&
+	:100644 120000 $blob0_id $slink_id T	file0
+	:100644 100644 $blob1_id $blob0_id M100	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 9 - run diff with -B (#5)
+
+expecting success of 4008.10 'run diff with -B -M (#6)': 
+	git diff-index -B -M reference >current &&
+
+	# file0 changed from regular to symlink.  file1 is the same as the preimage
+	# of file0.  Because the change does not make file0 disappear, file1 is
+	# denoted as a copy of file0
+	cat >expect <<-EOF &&
+	:100644 120000 $blob0_id $slink_id T	file0
+	:100644 100644 $blob0_id $blob0_id C	file0	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 10 - run diff with -B -M (#6)
+
+expecting success of 4008.11 'run diff with -M (#7)': 
+	git diff-index -M reference >current &&
+
+	# This should not mistake file0 as the copy source of new file1
+	# due to type differences.
+	cat >expect <<-EOF &&
+	:100644 120000 $blob0_id $slink_id T	file0
+	:100644 100644 $blob1_id $blob0_id M	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 11 - run diff with -M (#7)
+
+expecting success of 4008.12 'file1 edited to look like file0 and file0 rename-edited to file2': 
+	rm -f file0 file1 &&
+	git read-tree -m reference &&
+	git checkout-index -f -u -a &&
+	sed -e "s/git/GIT/" file0 >file1 &&
+	sed -e "s/git/GET/" file0 >file2 &&
+	blob3_id=$(git hash-object file2) &&
+	rm -f file0 &&
+	git update-index --add --remove file0 file1 file2
+
+ok 12 - file1 edited to look like file0 and file0 rename-edited to file2
+
+expecting success of 4008.13 'run diff with -B (#8)': 
+	git diff-index -B reference >current &&
+	cat >expect <<-EOF &&
+	:100644 000000 $blob0_id $ZERO_OID D	file0
+	:100644 100644 $blob1_id $blob2_id M100	file1
+	:000000 100644 $ZERO_OID $blob3_id A	file2
+	EOF
+	compare_diff_raw expect current
+
+ok 13 - run diff with -B (#8)
+
+expecting success of 4008.14 'run diff with -B -C (#9)': 
+	git diff-index -B -C reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob0_id $blob2_id C095	file0	file1
+	:100644 100644 $blob0_id $blob3_id R095	file0	file2
+	EOF
+	compare_diff_raw expect current
+
+ok 14 - run diff with -B -C (#9)
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4011-diff-symlink.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4011-diff-symlink/.git/
 expecting success of 4011.1 'diff new symlink and file': 
@@ -221041,168 +220892,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4008-diff-break-rewrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4008-diff-break-rewrite/.git/
-expecting success of 4008.1 'setup': 
-	echo some dissimilar content >file0 &&
-	COPYING_test_data >file1 &&
-	blob0_id=$(git hash-object file0) &&
-	blob1_id=$(git hash-object file1) &&
-	git update-index --add file0 file1 &&
-	git tag reference $(git write-tree)
-
-ok 1 - setup
-
-expecting success of 4008.2 'change file1 with copy-edit of file0 and remove file0': 
-	sed -e "s/git/GIT/" file0 >file1 &&
-	blob2_id=$(git hash-object file1) &&
-	rm -f file0 &&
-	git update-index --remove file0 file1
-
-ok 2 - change file1 with copy-edit of file0 and remove file0
-
-expecting success of 4008.3 'run diff with -B (#1)': 
-	git diff-index -B --cached reference >current &&
-	cat >expect <<-EOF &&
-	:100644 000000 $blob0_id $ZERO_OID D	file0
-	:100644 100644 $blob1_id $blob2_id M100	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 3 - run diff with -B (#1)
-
-expecting success of 4008.4 'run diff with -B and -M (#2)': 
-	git diff-index -B -M reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob0_id $blob2_id R100	file0	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 4 - run diff with -B and -M (#2)
-
-expecting success of 4008.5 'swap file0 and file1': 
-	rm -f file0 file1 &&
-	git read-tree -m reference &&
-	git checkout-index -f -u -a &&
-	mv file0 tmp &&
-	mv file1 file0 &&
-	mv tmp file1 &&
-	git update-index file0 file1
-
-ok 5 - swap file0 and file1
-
-expecting success of 4008.6 'run diff with -B (#3)': 
-	git diff-index -B reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob0_id $blob1_id M100	file0
-	:100644 100644 $blob1_id $blob0_id M100	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 6 - run diff with -B (#3)
-
-expecting success of 4008.7 'run diff with -B and -M (#4)': 
-	git diff-index -B -M reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob1_id $blob1_id R100	file1	file0
-	:100644 100644 $blob0_id $blob0_id R100	file0	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 7 - run diff with -B and -M (#4)
-
-expecting success of 4008.8 'make file0 into something completely different': 
-	rm -f file0 &&
-	test_ln_s_add frotz file0 &&
-	slink_id=$(printf frotz | git hash-object --stdin) &&
-	git update-index file1
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 8 - make file0 into something completely different
-
-expecting success of 4008.9 'run diff with -B (#5)': 
-	git diff-index -B reference >current &&
-	cat >expect <<-EOF &&
-	:100644 120000 $blob0_id $slink_id T	file0
-	:100644 100644 $blob1_id $blob0_id M100	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 9 - run diff with -B (#5)
-
-expecting success of 4008.10 'run diff with -B -M (#6)': 
-	git diff-index -B -M reference >current &&
-
-	# file0 changed from regular to symlink.  file1 is the same as the preimage
-	# of file0.  Because the change does not make file0 disappear, file1 is
-	# denoted as a copy of file0
-	cat >expect <<-EOF &&
-	:100644 120000 $blob0_id $slink_id T	file0
-	:100644 100644 $blob0_id $blob0_id C	file0	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 10 - run diff with -B -M (#6)
-
-expecting success of 4008.11 'run diff with -M (#7)': 
-	git diff-index -M reference >current &&
-
-	# This should not mistake file0 as the copy source of new file1
-	# due to type differences.
-	cat >expect <<-EOF &&
-	:100644 120000 $blob0_id $slink_id T	file0
-	:100644 100644 $blob1_id $blob0_id M	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 11 - run diff with -M (#7)
-
-expecting success of 4008.12 'file1 edited to look like file0 and file0 rename-edited to file2': 
-	rm -f file0 file1 &&
-	git read-tree -m reference &&
-	git checkout-index -f -u -a &&
-	sed -e "s/git/GIT/" file0 >file1 &&
-	sed -e "s/git/GET/" file0 >file2 &&
-	blob3_id=$(git hash-object file2) &&
-	rm -f file0 &&
-	git update-index --add --remove file0 file1 file2
-
-ok 12 - file1 edited to look like file0 and file0 rename-edited to file2
-
-expecting success of 4008.13 'run diff with -B (#8)': 
-	git diff-index -B reference >current &&
-	cat >expect <<-EOF &&
-	:100644 000000 $blob0_id $ZERO_OID D	file0
-	:100644 100644 $blob1_id $blob2_id M100	file1
-	:000000 100644 $ZERO_OID $blob3_id A	file2
-	EOF
-	compare_diff_raw expect current
-
-ok 13 - run diff with -B (#8)
-
-expecting success of 4008.14 'run diff with -B -C (#9)': 
-	git diff-index -B -C reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob0_id $blob2_id C095	file0	file1
-	:100644 100644 $blob0_id $blob3_id R095	file0	file2
-	EOF
-	compare_diff_raw expect current
-
-ok 14 - run diff with -B -C (#9)
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4010-diff-pathspec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4010-diff-pathspec/.git/
 expecting success of 4010.1 'setup': echo frotz >file0 &&
@@ -221501,6 +221190,93 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4016-diff-quote.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4016-diff-quote/.git/
+expecting success of 4016.1 'setup': 
+	echo P0.0 >"$P0.0" &&
+	echo P0.1 >"$P0.1" &&
+	echo P0.2 >"$P0.2" &&
+	echo P0.3 >"$P0.3" &&
+	echo P1.0 >"$P1.0" &&
+	echo P1.2 >"$P1.2" &&
+	echo P1.3 >"$P1.3" &&
+	git add . &&
+	git commit -m initial &&
+	git mv "$P0.0" "R$P0.0" &&
+	git mv "$P0.1" "R$P1.0" &&
+	git mv "$P0.2" "R$P2.0" &&
+	git mv "$P0.3" "R$P3.0" &&
+	git mv "$P1.0" "R$P0.1" &&
+	git mv "$P1.2" "R$P2.1" &&
+	git mv "$P1.3" "R$P3.1" &&
+	:
+
+[master (root-commit) ab09c26] initial
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 "pathname\twith HT.0"
+ create mode 100644 "pathname\twith HT.2"
+ create mode 100644 "pathname\twith HT.3"
+ create mode 100644 pathname.0
+ create mode 100644 pathname.1
+ create mode 100644 pathname.2
+ create mode 100644 pathname.3
+ok 1 - setup
+
+expecting success of 4016.2 'setup expected files': 
+cat >expect <<\EOF
+ rename pathname.1 => "Rpathname\twith HT.0" (100%)
+ rename pathname.3 => "Rpathname\nwith LF.0" (100%)
+ rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%)
+ rename pathname.2 => Rpathname with SP.0 (100%)
+ rename "pathname\twith HT.2" => Rpathname with SP.1 (100%)
+ rename pathname.0 => Rpathname.0 (100%)
+ rename "pathname\twith HT.0" => Rpathname.1 (100%)
+EOF
+
+ok 2 - setup expected files
+
+expecting success of 4016.3 'git diff --summary -M HEAD': 
+	git diff --summary -M HEAD >actual &&
+	test_cmp expect actual
+
+ok 3 - git diff --summary -M HEAD
+
+expecting success of 4016.4 'git diff --numstat -M HEAD': 
+	cat >expect <<-\EOF &&
+	0	0	pathname.1 => "Rpathname\twith HT.0"
+	0	0	pathname.3 => "Rpathname\nwith LF.0"
+	0	0	"pathname\twith HT.3" => "Rpathname\nwith LF.1"
+	0	0	pathname.2 => Rpathname with SP.0
+	0	0	"pathname\twith HT.2" => Rpathname with SP.1
+	0	0	pathname.0 => Rpathname.0
+	0	0	"pathname\twith HT.0" => Rpathname.1
+	EOF
+	git diff --numstat -M HEAD >actual &&
+	test_cmp expect actual
+
+ok 4 - git diff --numstat -M HEAD
+
+expecting success of 4016.5 'git diff --stat -M HEAD': 
+	cat >expect <<-\EOF &&
+	 pathname.1 => "Rpathname\twith HT.0"            | 0
+	 pathname.3 => "Rpathname\nwith LF.0"            | 0
+	 "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
+	 pathname.2 => Rpathname with SP.0               | 0
+	 "pathname\twith HT.2" => Rpathname with SP.1    | 0
+	 pathname.0 => Rpathname.0                       | 0
+	 "pathname\twith HT.0" => Rpathname.1            | 0
+	 7 files changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git diff --stat -M HEAD >actual &&
+	test_cmp expect actual
+
+ok 5 - git diff --stat -M HEAD
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4002-diff-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4002-diff-basic/.git/
 expecting success of 4002.1 'adding test file NN and Z/NN': 
@@ -221936,235 +221712,6 @@
 1..63
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4016-diff-quote.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4016-diff-quote/.git/
-expecting success of 4016.1 'setup': 
-	echo P0.0 >"$P0.0" &&
-	echo P0.1 >"$P0.1" &&
-	echo P0.2 >"$P0.2" &&
-	echo P0.3 >"$P0.3" &&
-	echo P1.0 >"$P1.0" &&
-	echo P1.2 >"$P1.2" &&
-	echo P1.3 >"$P1.3" &&
-	git add . &&
-	git commit -m initial &&
-	git mv "$P0.0" "R$P0.0" &&
-	git mv "$P0.1" "R$P1.0" &&
-	git mv "$P0.2" "R$P2.0" &&
-	git mv "$P0.3" "R$P3.0" &&
-	git mv "$P1.0" "R$P0.1" &&
-	git mv "$P1.2" "R$P2.1" &&
-	git mv "$P1.3" "R$P3.1" &&
-	:
-
-[master (root-commit) ab09c26] initial
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 "pathname\twith HT.0"
- create mode 100644 "pathname\twith HT.2"
- create mode 100644 "pathname\twith HT.3"
- create mode 100644 pathname.0
- create mode 100644 pathname.1
- create mode 100644 pathname.2
- create mode 100644 pathname.3
-ok 1 - setup
-
-expecting success of 4016.2 'setup expected files': 
-cat >expect <<\EOF
- rename pathname.1 => "Rpathname\twith HT.0" (100%)
- rename pathname.3 => "Rpathname\nwith LF.0" (100%)
- rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%)
- rename pathname.2 => Rpathname with SP.0 (100%)
- rename "pathname\twith HT.2" => Rpathname with SP.1 (100%)
- rename pathname.0 => Rpathname.0 (100%)
- rename "pathname\twith HT.0" => Rpathname.1 (100%)
-EOF
-
-ok 2 - setup expected files
-
-expecting success of 4016.3 'git diff --summary -M HEAD': 
-	git diff --summary -M HEAD >actual &&
-	test_cmp expect actual
-
-ok 3 - git diff --summary -M HEAD
-
-expecting success of 4016.4 'git diff --numstat -M HEAD': 
-	cat >expect <<-\EOF &&
-	0	0	pathname.1 => "Rpathname\twith HT.0"
-	0	0	pathname.3 => "Rpathname\nwith LF.0"
-	0	0	"pathname\twith HT.3" => "Rpathname\nwith LF.1"
-	0	0	pathname.2 => Rpathname with SP.0
-	0	0	"pathname\twith HT.2" => Rpathname with SP.1
-	0	0	pathname.0 => Rpathname.0
-	0	0	"pathname\twith HT.0" => Rpathname.1
-	EOF
-	git diff --numstat -M HEAD >actual &&
-	test_cmp expect actual
-
-ok 4 - git diff --numstat -M HEAD
-
-expecting success of 4016.5 'git diff --stat -M HEAD': 
-	cat >expect <<-\EOF &&
-	 pathname.1 => "Rpathname\twith HT.0"            | 0
-	 pathname.3 => "Rpathname\nwith LF.0"            | 0
-	 "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
-	 pathname.2 => Rpathname with SP.0               | 0
-	 "pathname\twith HT.2" => Rpathname with SP.1    | 0
-	 pathname.0 => Rpathname.0                       | 0
-	 "pathname\twith HT.0" => Rpathname.1            | 0
-	 7 files changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git diff --stat -M HEAD >actual &&
-	test_cmp expect actual
-
-ok 5 - git diff --stat -M HEAD
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4021-format-patch-numbered.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4021-format-patch-numbered/.git/
-expecting success of 4021.1 'setup': 
-
-	echo A > file &&
-	git add file &&
-	git commit -m First &&
-
-	echo B >> file &&
-	git commit -a -m Second &&
-
-	echo C >> file &&
-	git commit -a -m Third
-
-
-[master (root-commit) c3fa1f8] First
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master e967d08] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 20641e9] Third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 4021.2 'single patch defaults to no numbers': 
-	git format-patch --stdout HEAD~1 >patch0.single &&
-	test_single_no_numbered patch0.single
-
-ok 2 - single patch defaults to no numbers
-
-expecting success of 4021.3 'multiple patch defaults to numbered': 
-
-	git format-patch --stdout HEAD~2 >patch0.multiple &&
-	test_numbered patch0.multiple
-
-
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 3 - multiple patch defaults to numbered
-
-expecting success of 4021.4 'Use --numbered': 
-
-	git format-patch --numbered --stdout HEAD~1 >patch1 &&
-	test_single_numbered patch1
-
-
-Subject: [PATCH 1/1] Third
-ok 4 - Use --numbered
-
-expecting success of 4021.5 'format.numbered = true': 
-
-	git config format.numbered true &&
-	git format-patch --stdout HEAD~2 >patch2 &&
-	test_numbered patch2
-
-
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 5 - format.numbered = true
-
-expecting success of 4021.6 'format.numbered && single patch': 
-
-	git format-patch --stdout HEAD^ > patch3 &&
-	test_single_numbered patch3
-
-
-Subject: [PATCH 1/1] Third
-ok 6 - format.numbered && single patch
-
-expecting success of 4021.7 'format.numbered && --no-numbered': 
-
-	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
-	test_no_numbered patch4
-
-
-ok 7 - format.numbered && --no-numbered
-
-expecting success of 4021.8 'format.numbered && --keep-subject': 
-
-	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
-	grep "^Subject: Third" patch4a
-
-
-Subject: Third
-ok 8 - format.numbered && --keep-subject
-
-expecting success of 4021.9 'format.numbered = auto': 
-
-	git config format.numbered auto &&
-	git format-patch --stdout HEAD~2 > patch5 &&
-	test_numbered patch5
-
-
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 9 - format.numbered = auto
-
-expecting success of 4021.10 'format.numbered = auto && single patch': 
-
-	git format-patch --stdout HEAD^ > patch6 &&
-	test_single_no_numbered patch6
-
-
-ok 10 - format.numbered = auto && single patch
-
-expecting success of 4021.11 'format.numbered = auto && --no-numbered': 
-
-	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
-	test_no_numbered patch7
-
-
-ok 11 - format.numbered = auto && --no-numbered
-
-expecting success of 4021.12 '--start-number && --numbered': 
-
-	git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
-	grep "^Subject: \[PATCH 3/3\]" patch8
-
-Subject: [PATCH 3/3] Third
-ok 12 - --start-number && --numbered
-
-expecting success of 4021.13 'single patch with cover-letter defaults to numbers': 
-	git format-patch --cover-letter --stdout HEAD~1 >patch9.single &&
-	test_single_cover_letter_numbered patch9.single
-
-Subject: [PATCH 0/1] *** SUBJECT HERE ***
-Subject: [PATCH 1/1] Third
-ok 13 - single patch with cover-letter defaults to numbers
-
-expecting success of 4021.14 'Use --no-numbered and --cover-letter single patch': 
-	git format-patch --no-numbered --stdout --cover-letter HEAD~1 >patch10 &&
-	test_no_numbered patch10
-
-ok 14 - Use --no-numbered and --cover-letter single patch
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4017-diff-retval.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4017-diff-retval/.git/
 expecting success of 4017.1 'setup': 
@@ -222565,6 +222112,148 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4021-format-patch-numbered.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4021-format-patch-numbered/.git/
+expecting success of 4021.1 'setup': 
+
+	echo A > file &&
+	git add file &&
+	git commit -m First &&
+
+	echo B >> file &&
+	git commit -a -m Second &&
+
+	echo C >> file &&
+	git commit -a -m Third
+
+
+[master (root-commit) c3fa1f8] First
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master e967d08] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 20641e9] Third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 4021.2 'single patch defaults to no numbers': 
+	git format-patch --stdout HEAD~1 >patch0.single &&
+	test_single_no_numbered patch0.single
+
+ok 2 - single patch defaults to no numbers
+
+expecting success of 4021.3 'multiple patch defaults to numbered': 
+
+	git format-patch --stdout HEAD~2 >patch0.multiple &&
+	test_numbered patch0.multiple
+
+
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 3 - multiple patch defaults to numbered
+
+expecting success of 4021.4 'Use --numbered': 
+
+	git format-patch --numbered --stdout HEAD~1 >patch1 &&
+	test_single_numbered patch1
+
+
+Subject: [PATCH 1/1] Third
+ok 4 - Use --numbered
+
+expecting success of 4021.5 'format.numbered = true': 
+
+	git config format.numbered true &&
+	git format-patch --stdout HEAD~2 >patch2 &&
+	test_numbered patch2
+
+
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 5 - format.numbered = true
+
+expecting success of 4021.6 'format.numbered && single patch': 
+
+	git format-patch --stdout HEAD^ > patch3 &&
+	test_single_numbered patch3
+
+
+Subject: [PATCH 1/1] Third
+ok 6 - format.numbered && single patch
+
+expecting success of 4021.7 'format.numbered && --no-numbered': 
+
+	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
+	test_no_numbered patch4
+
+
+ok 7 - format.numbered && --no-numbered
+
+expecting success of 4021.8 'format.numbered && --keep-subject': 
+
+	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
+	grep "^Subject: Third" patch4a
+
+
+Subject: Third
+ok 8 - format.numbered && --keep-subject
+
+expecting success of 4021.9 'format.numbered = auto': 
+
+	git config format.numbered auto &&
+	git format-patch --stdout HEAD~2 > patch5 &&
+	test_numbered patch5
+
+
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 9 - format.numbered = auto
+
+expecting success of 4021.10 'format.numbered = auto && single patch': 
+
+	git format-patch --stdout HEAD^ > patch6 &&
+	test_single_no_numbered patch6
+
+
+ok 10 - format.numbered = auto && single patch
+
+expecting success of 4021.11 'format.numbered = auto && --no-numbered': 
+
+	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
+	test_no_numbered patch7
+
+
+ok 11 - format.numbered = auto && --no-numbered
+
+expecting success of 4021.12 '--start-number && --numbered': 
+
+	git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
+	grep "^Subject: \[PATCH 3/3\]" patch8
+
+Subject: [PATCH 3/3] Third
+ok 12 - --start-number && --numbered
+
+expecting success of 4021.13 'single patch with cover-letter defaults to numbers': 
+	git format-patch --cover-letter --stdout HEAD~1 >patch9.single &&
+	test_single_cover_letter_numbered patch9.single
+
+Subject: [PATCH 0/1] *** SUBJECT HERE ***
+Subject: [PATCH 1/1] Third
+ok 13 - single patch with cover-letter defaults to numbers
+
+expecting success of 4021.14 'Use --no-numbered and --cover-letter single patch': 
+	git format-patch --no-numbered --stdout --cover-letter HEAD~1 >patch10 &&
+	test_no_numbered patch10
+
+ok 14 - Use --no-numbered and --cover-letter single patch
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4019-diff-wserror.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4019-diff-wserror/.git/
 expecting success of 4019.1 'setup': 
@@ -222994,6 +222683,79 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4024-diff-optimize-common.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4025-hunk-header.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4025-hunk-header/.git/
+expecting success of 4025.1 'setup': 
+
+	(
+		echo "A $NS" &&
+		printf "  %s\n" B C D E F G H I J K &&
+		echo "L  $NS" &&
+		printf "  %s\n" M N O P Q R S T U V
+	) >file &&
+	git add file &&
+
+	sed -e "/^  [EP]/s/$/ modified/" <file >file+ &&
+	mv file+ file
+
+
+ok 1 - setup
+
+expecting success of 4025.2 'hunk header truncation with an overly long line': 
+
+	git diff | sed -n -e "s/^.*@@//p" >actual &&
+	(
+		echo " A $N$N$N$N$N$N$N$N$N2" &&
+		echo " L  $N$N$N$N$N$N$N$N$N1"
+	) >expected &&
+	test_cmp expected actual
+
+
+ok 2 - hunk header truncation with an overly long line
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4023-diff-rename-typechange.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4023-diff-rename-typechange/.git/
 expecting success of 4023.1 'setup': 
@@ -223129,79 +222891,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4025-hunk-header.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4025-hunk-header/.git/
-expecting success of 4025.1 'setup': 
-
-	(
-		echo "A $NS" &&
-		printf "  %s\n" B C D E F G H I J K &&
-		echo "L  $NS" &&
-		printf "  %s\n" M N O P Q R S T U V
-	) >file &&
-	git add file &&
-
-	sed -e "/^  [EP]/s/$/ modified/" <file >file+ &&
-	mv file+ file
-
-
-ok 1 - setup
-
-expecting success of 4025.2 'hunk header truncation with an overly long line': 
-
-	git diff | sed -n -e "s/^.*@@//p" >actual &&
-	(
-		echo " A $N$N$N$N$N$N$N$N$N2" &&
-		echo " L  $N$N$N$N$N$N$N$N$N1"
-	) >expected &&
-	test_cmp expected actual
-
-
-ok 2 - hunk header truncation with an overly long line
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4024-diff-optimize-common.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4028-format-patch-mime-headers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4028-format-patch-mime-headers/.git/
 expecting success of 4028.1 'create commit with utf-8 body': 
@@ -223493,2337 +223182,25 @@
 	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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4031-diff-rewrite-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3600-rm.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-
-expecting success of 3600.22 'Modified foo -- rm -f should work': 
-	git rm -f foo baz &&
-	test_path_is_missing foo &&
-	test_path_is_missing baz &&
-	test_must_fail git ls-files --error-unmatch foo &&
-	test_must_fail git ls-files --error-unmatch bar
-
-rm 'baz'
-rm 'foo'
-error: pathspec 'foo' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'bar' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 22 - Modified foo -- rm -f should work
-
-expecting success of 3600.23 'Re-add foo and baz for HEAD tests': 
-	echo frotz >foo &&
-	git checkout HEAD -- baz &&
-	git add foo baz &&
-	git ls-files --error-unmatch foo baz
-
-baz
-foo
-ok 23 - Re-add foo and baz for HEAD tests
-
-expecting success of 3600.24 'foo is different in index from HEAD -- rm should refuse': 
-	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 changes staged in the index:
-    foo
-(use --cached to keep the file, or -f to force removal)
-baz
-foo
-ok 24 - foo is different in index from HEAD -- rm should refuse
-
-expecting success of 3600.25 'but with -f it should work.': 
-	git rm -f foo baz &&
-	test_path_is_missing foo &&
-	test_path_is_missing baz &&
-	test_must_fail git ls-files --error-unmatch foo &&
-	test_must_fail git ls-files --error-unmatch baz
-
-rm 'baz'
-rm 'foo'
-error: pathspec 'foo' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'baz' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 25 - but with -f it should work.
-
-expecting success of 3600.26 'refuse to remove cached empty file with modifications': 
-	>empty &&
-	git add empty &&
-	echo content >empty &&
-	test_must_fail git rm --cached empty
-
-error: the following file has staged content different from both the
-file and the HEAD:
-    empty
-(use -f to force removal)
-ok 26 - refuse to remove cached empty file with modifications
-
-expecting success of 3600.27 'remove intent-to-add file without --force': 
-	echo content >intent-to-add &&
-	git add -N intent-to-add &&
-	git rm --cached intent-to-add
-
-rm 'intent-to-add'
-ok 27 - remove intent-to-add file without --force
-
-expecting success of 3600.28 'Recursive test setup': 
-	mkdir -p frotz &&
-	echo qfwfq >frotz/nitfol &&
-	git add frotz &&
-	git commit -m "subdir test"
-
-[main 5a08f40] subdir test
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename baz => empty (100%)
- create mode 100644 frotz/nitfol
-ok 28 - Recursive test setup
-
-expecting success of 3600.29 'Recursive without -r fails': 
-	test_must_fail git rm frotz &&
-	test_path_is_dir frotz &&
-	test_path_is_file frotz/nitfol
-
-fatal: not removing 'frotz' recursively without -r
-ok 29 - Recursive without -r fails
-
-expecting success of 3600.30 'Recursive with -r but dirty': 
-	echo qfwfq >>frotz/nitfol &&
-	test_must_fail git rm -r frotz &&
-	test_path_is_dir frotz &&
-	test_path_is_file frotz/nitfol
-
-error: the following file has local modifications:
-    frotz/nitfol
-(use --cached to keep the file, or -f to force removal)
-ok 30 - Recursive with -r but dirty
-
-expecting success of 3600.31 'Recursive with -r -f': 
-	git rm -f -r frotz &&
-	test_path_is_missing frotz/nitfol &&
-	test_path_is_missing frotz
-
-rm 'frotz/nitfol'
-ok 31 - Recursive with -r -f
-
-expecting success of 3600.32 'Remove nonexistent file returns nonzero exit status': 
-	test_must_fail git rm nonexistent
-
-fatal: pathspec 'nonexistent' did not match any files
-ok 32 - Remove nonexistent file returns nonzero exit status
-
-expecting success of 3600.33 'Call "rm" from outside the work tree': 
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		echo something >somefile &&
-		git add somefile &&
-		git commit -m "add a file" &&
-		(
-			cd .. &&
-			git --git-dir=repo/.git --work-tree=repo rm somefile
-		) &&
-		test_must_fail git ls-files --error-unmatch somefile
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/repo/.git/
-[main (root-commit) bc24042] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 somefile
-rm 'somefile'
-error: pathspec 'somefile' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 33 - Call "rm" from outside the work tree
-
-expecting success of 3600.34 'refresh index before checking if it is up-to-date': 
-	git reset --hard &&
-	test-tool chmtime -86400 frotz/nitfol &&
-	git rm frotz/nitfol &&
-	test_path_is_missing frotz/nitfol
-
-HEAD is now at 5a08f40 subdir test
-rm 'frotz/nitfol'
-ok 34 - refresh index before checking if it is up-to-date
-
-expecting success of 3600.35 'choking "git rm" should not let it die with cruft (induce SIGPIPE)': 
-	choke_git_rm_setup &&
-	# git command is intentionally placed upstream of pipe to induce SIGPIPE
-	git rm -n "some-file-*" | : &&
-	test_path_is_missing .git/index.lock
-
-ok 35 - choking "git rm" should not let it die with cruft (induce SIGPIPE)
-
-expecting success of 3600.36 'choking "git rm" should not let it die with cruft (induce and check SIGPIPE)': 
-	choke_git_rm_setup &&
-	OUT=$( ((trap "" PIPE && git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
-	test_match_signal 13 "$OUT" &&
-	test_path_is_missing .git/index.lock
-
-ok 36 - choking "git rm" should not let it die with cruft (induce and check SIGPIPE)
-
-expecting success of 3600.37 'Resolving by removal is not a warning-worthy event': 
-	git reset -q --hard &&
-	test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
-	blob=$(echo blob | git hash-object -w --stdin) &&
-	printf "100644 $blob %d\tblob\n" 1 2 3 | git update-index --index-info &&
-	git rm blob >msg 2>&1 &&
-	test_grep ! "needs merge" msg &&
-	test_must_fail git ls-files -s --error-unmatch blob
-
-error: pathspec 'blob' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 37 - Resolving by removal is not a warning-worthy event
-
-expecting success of 3600.38 'rm removes subdirectories recursively': 
-	mkdir -p dir/subdir/subsubdir &&
-	echo content >dir/subdir/subsubdir/file &&
-	git add dir/subdir/subsubdir/file &&
-	git rm -f dir/subdir/subsubdir/file &&
-	test_path_is_missing dir
-
-rm 'dir/subdir/subsubdir/file'
-ok 38 - rm removes subdirectories recursively
-
-expecting success of 3600.39 'rm removes empty submodules from work tree': 
-	mkdir submod &&
-	hash=$(git rev-parse HEAD) &&
-	git update-index --add --cacheinfo 160000 "$hash" submod &&
-	git config -f .gitmodules submodule.sub.url ./. &&
-	git config -f .gitmodules submodule.sub.path submod &&
-	git submodule init &&
-	git add .gitmodules &&
-	git commit -m "add submodule" &&
-	git rm submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.) registered for path 'submod'
-[main 639dc8a] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submod
-rm 'submod'
-ok 39 - rm removes empty submodules from work tree
-
-expecting success of 3600.40 'rm removes removed submodule from index and .gitmodules': 
-	git reset --hard &&
-	git -c protocol.file.allow=always submodule update &&
-	rm -rf submod &&
-	git rm submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-HEAD is now at 639dc8a add submodule
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod'...
-done.
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-rm 'submod'
-ok 40 - rm removes removed submodule from index and .gitmodules
-
-expecting success of 3600.41 'rm removes work tree of unmodified submodules': 
-	git reset --hard &&
-	git submodule update &&
-	git rm submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-rm 'submod'
-ok 41 - rm removes work tree of unmodified submodules
-
-expecting success of 3600.42 'rm removes a submodule with a trailing /': 
-	git reset --hard &&
-	git submodule update &&
-	git rm submod/ &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-rm 'submod'
-ok 42 - rm removes a submodule with a trailing /
-
-expecting success of 3600.43 'rm fails when given a file with a trailing /': 
-	test_must_fail git rm empty/
-
-fatal: pathspec 'empty/' did not match any files
-ok 43 - rm fails when given a file with a trailing /
-
-expecting success of 3600.44 'rm succeeds when given a directory with a trailing /': 
-	git rm -r frotz/
-
-rm 'frotz/nitfol'
-ok 44 - rm succeeds when given a directory with a trailing /
-
-expecting success of 3600.45 'rm of a populated submodule with different HEAD fails unless forced': 
-	git reset --hard &&
-	git submodule update &&
-	git -C submod checkout HEAD^ &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-Previous HEAD position was 5a08f40 subdir test
-HEAD is now at 308e36c remove file from rm --quiet test
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 45 - rm of a populated submodule with different HEAD fails unless forced
-
-expecting success of 3600.46 'rm --cached leaves work tree of populated submodules and .gitmodules alone': 
-	git reset --hard &&
-	git submodule update &&
-	git rm --cached submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect.cached actual &&
-	git config -f .gitmodules submodule.sub.url &&
-	git config -f .gitmodules submodule.sub.path
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-rm 'submod'
-./.
-submod
-ok 46 - rm --cached leaves work tree of populated submodules and .gitmodules alone
-
-expecting success of 3600.47 'rm --dry-run does not touch the submodule or .gitmodules': 
-	git reset --hard &&
-	git submodule update &&
-	git rm -n submod &&
-	test_path_is_file submod/.git &&
-	git diff-index --exit-code HEAD
-
-HEAD is now at 639dc8a add submodule
-rm 'submod'
-ok 47 - rm --dry-run does not touch the submodule or .gitmodules
-
-expecting success of 3600.48 'rm does not complain when no .gitmodules file is found': 
-	git reset --hard &&
-	git submodule update &&
-	git rm .gitmodules &&
-	git rm submod >actual 2>actual.err &&
-	test_must_be_empty actual.err &&
-	test_path_is_missing submod &&
-	test_path_is_missing submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect.both_deleted actual
-
-HEAD is now at 639dc8a add submodule
-rm '.gitmodules'
-ok 48 - rm does not complain when no .gitmodules file is found
-
-expecting success of 3600.49 'rm will error out on a modified .gitmodules file unless staged': 
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules foo.bar true &&
-	test_must_fail git rm submod >actual 2>actual.err &&
-	test_file_not_empty actual.err &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git diff-files --quiet -- submod &&
-	git add .gitmodules &&
-	git rm submod >actual 2>actual.err &&
-	test_must_be_empty actual.err &&
-	test_path_is_missing submod &&
-	test_path_is_missing submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect actual
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-ok 49 - rm will error out on a modified .gitmodules file unless staged
-
-expecting success of 3600.50 'rm will not error out on .gitmodules file with zero stat data': 
-	git reset --hard &&
-	git submodule update &&
-	git read-tree HEAD &&
-	git rm submod &&
-	test_path_is_missing submod
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-rm 'submod'
-ok 50 - rm will not error out on .gitmodules file with zero stat data
-
-expecting success of 3600.51 'rm issues a warning when section is not found in .gitmodules': 
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules --remove-section submodule.sub &&
-	git add .gitmodules &&
-	echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
-	git rm submod >actual 2>actual.err &&
-	test_cmp expect.err actual.err &&
-	test_path_is_missing submod &&
-	test_path_is_missing submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect actual
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-ok 51 - rm issues a warning when section is not found in .gitmodules
-
-expecting success of 3600.52 'rm of a populated submodule with modifications fails unless forced': 
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/empty &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_inside actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 52 - rm of a populated submodule with modifications fails unless forced
-
-expecting success of 3600.53 'rm of a populated submodule with untracked files fails unless forced': 
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/untracked &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_untracked actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 53 - rm of a populated submodule with untracked files fails unless forced
-
-expecting success of 3600.54 'setup submodule conflict': 
-	git reset --hard &&
-	git submodule update &&
-	git checkout -b branch1 &&
-	echo 1 >nitfol &&
-	git add nitfol &&
-	git commit -m "added nitfol 1" &&
-	git checkout -b branch2 main &&
-	echo 2 >nitfol &&
-	git add nitfol &&
-	git commit -m "added nitfol 2" &&
-	git checkout -b conflict1 main &&
-	git -C submod fetch &&
-	git -C submod checkout branch1 &&
-	git add submod &&
-	git commit -m "submod 1" &&
-	git checkout -b conflict2 main &&
-	git -C submod checkout branch2 &&
-	git add submod &&
-	git commit -m "submod 2"
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-Switched to a new branch 'branch1'
-[branch1 d0e7df6] added nitfol 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nitfol
-Switched to a new branch 'branch2'
-[branch2 e3f3428] added nitfol 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nitfol
-Switched to a new branch 'conflict1'
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.
- * [new branch]      branch1    -> origin/branch1
- * [new branch]      branch2    -> origin/branch2
- * [new branch]      conflict1  -> origin/conflict1
-Previous HEAD position was 5a08f40 subdir test
-Switched to a new branch 'branch1'
-branch 'branch1' set up to track 'origin/branch1'.
-[conflict1 8a835a1] submod 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflict2'
-M	submod
-Switched to a new branch 'branch2'
-branch 'branch2' set up to track 'origin/branch2'.
-[conflict2 db3aa7b] submod 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 54 - setup submodule conflict
-
-expecting success of 3600.55 'rm removes work tree of unmodified conflicted submodule': 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	test_must_fail git merge conflict2 &&
-	git rm submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-Switched to branch 'conflict1'
-M	submod
-HEAD is now at 8a835a1 submod 1
-Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
-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 e3f3428
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'submod'
-ok 55 - rm removes work tree of unmodified conflicted submodule
-
-expecting success of 3600.56 'rm of a conflicted populated submodule with different HEAD fails unless forced': 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	git -C submod checkout HEAD^ &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 8a835a1 submod 1
-Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
-Previous HEAD position was d0e7df6 added nitfol 1
-HEAD is now at 639dc8a add submodule
-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 e3f3428
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 56 - rm of a conflicted populated submodule with different HEAD fails unless forced
-
-expecting success of 3600.57 'rm of a conflicted populated submodule with modifications fails unless forced': 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/empty &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 8a835a1 submod 1
-Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
-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 e3f3428
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 57 - rm of a conflicted populated submodule with modifications fails unless forced
-
-expecting success of 3600.58 'rm of a conflicted populated submodule with untracked files fails unless forced': 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/untracked &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 8a835a1 submod 1
-Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
-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 e3f3428
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 58 - rm of a conflicted populated submodule with untracked files fails unless forced
-
-expecting success of 3600.59 'rm of a conflicted populated submodule with a .git directory fails even when forced': 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	(
-		cd submod &&
-		rm .git &&
-		cp -R ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_dir submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	test_must_fail git rm -f submod &&
-	test_path_is_dir submod &&
-	test_path_is_dir submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git merge --abort &&
-	rm -rf submod
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 8a835a1 submod 1
-Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
-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 e3f3428
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-Migrating git directory of 'submod' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub'
-fatal: could not migrate git directory from '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
-Migrating git directory of 'submod' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub'
-fatal: could not migrate git directory from '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
-ok 59 - rm of a conflicted populated submodule with a .git directory fails even when forced
-
-expecting success of 3600.60 'rm of a conflicted unpopulated submodule succeeds': 
-	git checkout conflict1 &&
-	git reset --hard &&
-	test_must_fail git merge conflict2 &&
-	git rm submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-Already on 'conflict1'
-D	submod
-HEAD is now at 8a835a1 submod 1
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit e3f3428
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'submod'
-ok 60 - rm of a conflicted unpopulated submodule succeeds
-
-expecting success of 3600.61 'rm of a populated submodule with a .git directory migrates git dir': 
-	git checkout -f main &&
-	git reset --hard &&
-	git submodule update &&
-	(
-		cd submod &&
-		rm .git &&
-		cp -R ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree &&
-		rm -r ../.git/modules/sub
-	) &&
-	git rm submod 2>output.err &&
-	test_path_is_missing submod &&
-	test_path_is_missing submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_file_not_empty actual &&
-	test_grep Migrating output.err
-
-Switched to branch 'main'
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-rm 'submod'
-Migrating git directory of 'submod' from
-ok 61 - rm of a populated submodule with a .git directory migrates git dir
-
-expecting success of 3600.62 'setup subsubmodule': 
-	test_config_global protocol.file.allow always &&
-	git reset --hard &&
-	git submodule update &&
-	(
-		cd submod &&
-		hash=$(git rev-parse HEAD) &&
-		git update-index --add --cacheinfo 160000 "$hash" subsubmod &&
-		git config -f .gitmodules submodule.sub.url ../. &&
-		git config -f .gitmodules submodule.sub.path subsubmod &&
-		git submodule init &&
-		git add .gitmodules &&
-		git commit -m "add subsubmodule" &&
-		git submodule update subsubmod
-	) &&
-	git commit -a -m "added deep submodule"
-
-HEAD is now at 639dc8a add submodule
-Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.) registered for path 'subsubmod'
-[detached HEAD b2c2402] add subsubmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsubmod
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/subsubmod'...
-done.
-Submodule path 'subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-[main 3a0be25] added deep submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 62 - setup subsubmodule
-
-expecting success of 3600.63 'rm recursively removes work tree of unmodified submodules': 
-	git rm submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-rm 'submod'
-ok 63 - rm recursively removes work tree of unmodified submodules
-
-expecting success of 3600.64 'rm of a populated nested submodule with different nested HEAD fails unless forced': 
-	git reset --hard &&
-	git submodule update --recursive &&
-	git -C submod/subsubmod checkout HEAD^ &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_inside actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at 3a0be25 added deep submodule
-Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
-Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-Previous HEAD position was 5a08f40 subdir test
-HEAD is now at 308e36c remove file from rm --quiet test
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 64 - rm of a populated nested submodule with different nested HEAD fails unless forced
-
-expecting success of 3600.65 'rm of a populated nested submodule with nested modifications fails unless forced': 
-	git reset --hard &&
-	git submodule update --recursive &&
-	echo X >submod/subsubmod/empty &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_inside actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at 3a0be25 added deep submodule
-Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
-Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 65 - rm of a populated nested submodule with nested modifications fails unless forced
-
-expecting success of 3600.66 'rm of a populated nested submodule with nested untracked files fails unless forced': 
-	git reset --hard &&
-	git submodule update --recursive &&
-	echo X >submod/subsubmod/untracked &&
-	test_must_fail git rm submod &&
-	test_path_is_dir submod &&
-	test_path_is_file submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_untracked actual &&
-	git rm -f submod &&
-	test_path_is_missing submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at 3a0be25 added deep submodule
-Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
-Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 66 - rm of a populated nested submodule with nested untracked files fails unless forced
-
-expecting success of 3600.67 'rm absorbs submodule's nested .git directory': 
-	git reset --hard &&
-	git submodule update --recursive &&
-	(
-		cd submod/subsubmod &&
-		rm .git &&
-		mv ../../.git/modules/sub/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	git rm submod 2>output.err &&
-	test_path_is_missing submod &&
-	test_path_is_missing submod/subsubmod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_file_not_empty actual &&
-	test_grep Migrating output.err
-
-HEAD is now at 3a0be25 added deep submodule
-Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
-Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
-rm 'submod'
-Migrating git directory of 'submod/subsubmod' from
-ok 67 - rm absorbs submodule's nested .git directory
-
-expecting success of 3600.68 'checking out a commit after submodule removal needs manual updates': 
-	git commit -m "submodule removal" submod .gitmodules &&
-	git checkout HEAD^ &&
-	git submodule update &&
-	git checkout -q HEAD^ &&
-	git checkout -q main 2>actual &&
-	test_grep "^warning: unable to rmdir 'submod':" actual &&
-	git status -s submod >actual &&
-	echo "?? submod/" >expected &&
-	test_cmp expected actual &&
-	rm -rf submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_must_be_empty actual
-
-[main a23000e] submodule removal
- Author: A U Thor <author@example.com>
- 2 files changed, 4 deletions(-)
- delete mode 160000 submod
-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 3a0be25 added deep submodule
-Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
-warning: unable to rmdir 'submod': Directory not empty
-ok 68 - checking out a commit after submodule removal needs manual updates
-
-expecting success of 3600.69 'rm of d/f when d has become a non-directory': 
-	rm -rf d &&
-	mkdir d &&
-	>d/f &&
-	git add d &&
-	rm -rf d &&
-	>d &&
-	git rm d/f &&
-	test_must_fail git rev-parse --verify :d/f &&
-	test_path_is_file d
-
-rm 'd/f'
-fatal: Needed a single revision
-ok 69 - rm of d/f when d has become a non-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 3600.70 'rm of d/f when d has become a dangling symlink': 
-	rm -rf d &&
-	mkdir d &&
-	>d/f &&
-	git add d &&
-	rm -rf d &&
-	ln -s nonexistent d &&
-	git rm d/f &&
-	test_must_fail git rev-parse --verify :d/f &&
-	test -h d &&
-	test_path_is_missing d
-
-rm 'd/f'
-fatal: Needed a single revision
-ok 70 - rm of d/f when d has become a dangling symlink
-
-expecting success of 3600.71 'rm of file when it has become a directory': 
-	rm -rf d &&
-	>d &&
-	git add d &&
-	rm -f d &&
-	mkdir d &&
-	>d/f &&
-	test_must_fail git rm d &&
-	git rev-parse --verify :d &&
-	test_path_is_file d/f
-
-fatal: git rm: 'd': Is a directory
-rm 'd'
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 71 - rm of file when it has become a directory
-
-expecting success of 3600.72 'rm across a symlinked leading path (no index)': 
-	rm -rf d e &&
-	mkdir e &&
-	echo content >e/f &&
-	ln -s e d &&
-	git add -A e d &&
-	git commit -m "symlink d to e, e/f exists" &&
-	test_must_fail git rm d/f &&
-	git rev-parse --verify :d &&
-	git rev-parse --verify :e/f &&
-	test -h d &&
-	test_path_is_file e/f
-
-[main 15c6bcf] symlink d to e, e/f exists
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 120000 d
- create mode 100644 e/f
-fatal: pathspec 'd/f' did not match any files
-9cbe6ea56f225388ae614c419249bfc6d734cc30
-d95f3ad14dee633a758d2e331151e950dd13e4ed
-ok 72 - rm across a symlinked leading path (no index)
-
-checking known breakage of 3600.73 'rm across a symlinked leading path (w/ index)': 
-	rm -rf d e &&
-	mkdir d &&
-	echo content >d/f &&
-	git add -A e d &&
-	git commit -m "d/f exists" &&
-	mv d e &&
-	ln -s e d &&
-	test_must_fail git rm d/f &&
-	git rev-parse --verify :d/f &&
-	test -h d &&
-	test_path_is_file e/f
-
-[main 362fe30] d/f exists
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- delete mode 120000 d
- rename {e => d}/f (100%)
-rm 'd/f'
-test_must_fail: command succeeded: git rm d/f
-not ok 73 - rm across a symlinked leading path (w/ index) # TODO known breakage
-
-expecting success of 3600.74 'setup for testing rm messages': 
-	>bar.txt &&
-	>foo.txt &&
-	git add bar.txt foo.txt
-
-ok 74 - setup for testing rm messages
-
-expecting success of 3600.75 'rm files with different staged content': 
-	cat >expect <<-\EOF &&
-	error: the following files have staged content different from both the
-	file and the HEAD:
-	    bar.txt
-	    foo.txt
-	(use -f to force removal)
-	EOF
-	echo content1 >foo.txt &&
-	echo content1 >bar.txt &&
-	test_must_fail git rm foo.txt bar.txt 2>actual &&
-	test_cmp expect actual
-
-ok 75 - rm files with different staged content
-
-expecting success of 3600.76 'rm files with different staged content without hints': 
-	cat >expect <<-\EOF &&
-	error: the following files have staged content different from both the
-	file and the HEAD:
-	    bar.txt
-	    foo.txt
-	EOF
-	echo content2 >foo.txt &&
-	echo content2 >bar.txt &&
-	test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
-	test_cmp expect actual
-
-ok 76 - rm files with different staged content without hints
-
-expecting success of 3600.77 'rm file with local modification': 
-	cat >expect <<-\EOF &&
-	error: the following file has local modifications:
-	    foo.txt
-	(use --cached to keep the file, or -f to force removal)
-	EOF
-	git commit -m "testing rm 3" &&
-	echo content3 >foo.txt &&
-	test_must_fail git rm foo.txt 2>actual &&
-	test_cmp expect actual
-
-[main a02d987] testing rm 3
- Author: A U Thor <author@example.com>
- 3 files changed, 1 deletion(-)
- create mode 100644 bar.txt
- delete mode 100644 d/f
- create mode 100644 foo.txt
-ok 77 - rm file with local modification
-
-expecting success of 3600.78 'rm file with local modification without hints': 
-	cat >expect <<-\EOF &&
-	error: the following file has local modifications:
-	    bar.txt
-	EOF
-	echo content4 >bar.txt &&
-	test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
-	test_cmp expect actual
-
-ok 78 - rm file with local modification without hints
-
-expecting success of 3600.79 'rm file with changes in the index': 
-	cat >expect <<-\EOF &&
-	error: the following file has changes staged in the index:
-	    foo.txt
-	(use --cached to keep the file, or -f to force removal)
-	EOF
-	git reset --hard &&
-	echo content5 >foo.txt &&
-	git add foo.txt &&
-	test_must_fail git rm foo.txt 2>actual &&
-	test_cmp expect actual
-
-HEAD is now at a02d987 testing rm 3
-ok 79 - rm file with changes in the index
-
-expecting success of 3600.80 'rm file with changes in the index without hints': 
-	cat >expect <<-\EOF &&
-	error: the following file has changes staged in the index:
-	    foo.txt
-	EOF
-	test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
-	test_cmp expect actual
-
-ok 80 - rm file with changes in the index without hints
-
-expecting success of 3600.81 'rm files with two different errors': 
-	cat >expect <<-\EOF &&
-	error: the following file has staged content different from both the
-	file and the HEAD:
-	    foo1.txt
-	(use -f to force removal)
-	error: the following file has changes staged in the index:
-	    bar1.txt
-	(use --cached to keep the file, or -f to force removal)
-	EOF
-	echo content >foo1.txt &&
-	git add foo1.txt &&
-	echo content6 >foo1.txt &&
-	echo content6 >bar1.txt &&
-	git add bar1.txt &&
-	test_must_fail git rm bar1.txt foo1.txt 2>actual &&
-	test_cmp expect actual
-
-ok 81 - rm files with two different errors
-
-expecting success of 3600.82 'rm empty string should fail': 
-	test_must_fail git rm -rf ""
-
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 82 - rm empty string should fail
-
-# still have 1 known breakage(s)
-# passed all remaining 81 test(s)
-1..82
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4027-diff-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4027-diff-submodule/.git/
-expecting success of 4027.1 'setup': 
-	test_tick &&
-	test_create_repo sub &&
-	(
-		cd sub &&
-		echo hello >world &&
-		git add world &&
-		git commit -m submodule
-	) &&
-
-	test_tick &&
-	echo frotz >nitfol &&
-	git add nitfol sub &&
-	git commit -m superproject &&
-
-	(
-		cd sub &&
-		echo goodbye >world &&
-		git add world &&
-		git commit -m "submodule #2"
-	) &&
-
-	git -C sub rev-list HEAD >revs &&
-	set x $(cat revs) &&
-	echo ":160000 160000 $3 $ZERO_OID M	sub" >expect &&
-	subtip=$3 subprev=$2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4027-diff-submodule/sub/.git/
-[master (root-commit) 4431e0b] submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) 5b035b6] superproject
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 nitfol
- create mode 160000 sub
-[master 2dd69d6] submodule #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4027.2 'git diff --raw HEAD': 
-	hexsz=$(test_oid hexsz) &&
-	git diff --raw --abbrev=$hexsz HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - git diff --raw HEAD
-
-expecting success of 4027.3 'git diff-index --raw HEAD': 
-	git diff-index --raw HEAD >actual.index &&
-	test_cmp expect actual.index
-
-ok 3 - git diff-index --raw HEAD
-
-expecting success of 4027.4 'git diff-files --raw': 
-	git diff-files --raw >actual.files &&
-	test_cmp expect actual.files
-
-ok 4 - git diff-files --raw
-
-expecting success of 4027.5 'git diff HEAD': 
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body
-
-ok 5 - git diff HEAD
-
-expecting success of 4027.6 'git diff HEAD with dirty submodule (work tree)': 
-	echo >>sub/world &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-ok 6 - git diff HEAD with dirty submodule (work tree)
-
-expecting success of 4027.7 'git diff HEAD with dirty submodule (index)': 
-	(
-		cd sub &&
-		git reset --hard &&
-		echo >>world &&
-		git add world
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 7 - git diff HEAD with dirty submodule (index)
-
-expecting success of 4027.8 'git diff HEAD with dirty submodule (untracked)': 
-	(
-		cd sub &&
-		git reset --hard &&
-		git clean -qfdx &&
-		>cruft
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 8 - git diff HEAD with dirty submodule (untracked)
-
-expecting success of 4027.9 'git diff HEAD with dirty submodule (untracked) (none ignored)': 
-	test_config diff.ignoreSubmodules none &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-ok 9 - git diff HEAD with dirty submodule (untracked) (none ignored)
-
-expecting success of 4027.10 'git diff HEAD with dirty submodule (work tree, refs match)': 
-	git commit -m "x" sub &&
-	echo >>sub/world &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git diff --ignore-submodules=untracked HEAD >actual3 &&
-	sed -e "1,/^@@/d" actual3 >actual3.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual3.body &&
-	git diff --ignore-submodules=dirty HEAD >actual4 &&
-	test_must_be_empty actual4
-
-[master e6ee575] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - git diff HEAD with dirty submodule (work tree, refs match)
-
-expecting success of 4027.11 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]': 
-	git config diff.ignoreSubmodules dirty &&
-	git diff HEAD >actual &&
-	test_must_be_empty actual &&
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config -f .gitmodules submodule.subname.ignore all &&
-	git config -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git config -f .gitmodules submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	sed -e "1,/^@@/d" actual3 >actual3.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual3.body &&
-	git config -f .gitmodules submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	test_must_be_empty actual4 &&
-	git config submodule.subname.ignore none &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	git config --unset diff.ignoreSubmodules &&
-	rm .gitmodules
-
-ok 11 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]
-
-expecting success of 4027.12 'git diff HEAD with dirty submodule (index, refs match)': 
-	(
-		cd sub &&
-		git reset --hard &&
-		echo >>world &&
-		git add world
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 12 - git diff HEAD with dirty submodule (index, refs match)
-
-expecting success of 4027.13 'git diff HEAD with dirty submodule (untracked, refs match)': 
-	(
-		cd sub &&
-		git reset --hard &&
-		git clean -qfdx &&
-		>cruft
-	) &&
-	git diff --ignore-submodules=none HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules=all HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git diff HEAD >actual3 &&
-	test_must_be_empty actual3 &&
-	git diff --ignore-submodules=dirty HEAD >actual4 &&
-	test_must_be_empty actual4
-
-HEAD is now at 2dd69d6 submodule #2
-ok 13 - git diff HEAD with dirty submodule (untracked, refs match)
-
-expecting success of 4027.14 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]': 
-	git config --add -f .gitmodules submodule.subname.ignore all &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git config -f .gitmodules submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	test_must_be_empty actual3 &&
-	git config -f .gitmodules submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	test_must_be_empty actual4 &&
-	git config submodule.subname.ignore none &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	rm .gitmodules
-
-ok 14 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]
-
-expecting success of 4027.15 'git diff between submodule commits': 
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules HEAD^..HEAD >actual &&
-	test_must_be_empty actual
-
-ok 15 - git diff between submodule commits
-
-expecting success of 4027.16 'git diff between submodule commits [.gitmodules]': 
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config -f .gitmodules submodule.subname.ignore all &&
-	git diff HEAD^..HEAD >actual &&
-	test_must_be_empty actual &&
-	git config submodule.subname.ignore dirty &&
-	git config submodule.subname.path sub &&
-	git diff  HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	rm .gitmodules
-
-ok 16 - git diff between submodule commits [.gitmodules]
-
-expecting success of 4027.17 'git diff (empty submodule dir)': 
-	rm -rf sub/* sub/.git &&
-	git diff > actual.empty &&
-	test_must_be_empty actual.empty
-
-ok 17 - git diff (empty submodule dir)
-
-expecting success of 4027.18 'conflicted submodule setup': 
-	c=$(test_oid ff_1) &&
-	(
-		echo "000000 $ZERO_OID 0	sub" &&
-		echo "160000 1$c 1	sub" &&
-		echo "160000 2$c 2	sub" &&
-		echo "160000 3$c 3	sub"
-	) | git update-index --index-info &&
-	echo >expect.nosub "diff --cc sub
-index 2ffffff,3ffffff..0000000
---- a/sub
-+++ b/sub
-@@@ -1,1 -1,1 +1,1 @@@
-- Subproject commit 2$c
- -Subproject commit 3$c
-++Subproject commit $ZERO_OID" &&
-
-	hh=$(git rev-parse HEAD) &&
-	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
-
-
-ok 18 - conflicted submodule setup
-
-expecting success of 4027.19 'combined (empty submodule)': 
-	rm -fr sub && mkdir sub &&
-	git diff >actual &&
-	test_cmp expect.nosub actual
-
-ok 19 - combined (empty submodule)
-
-expecting success of 4027.20 'combined (with submodule)': 
-	rm -fr sub &&
-	git clone --no-checkout . sub &&
-	git diff >actual &&
-	test_cmp expect.withsub actual
+	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
 
-Cloning into 'sub'...
-done.
-ok 20 - combined (with submodule)
+ok 1 - diff honors config option, diff.suppressBlankEmpty
 
-# passed all 20 test(s)
-1..20
+# passed all 1 test(s)
+1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3906-stash-submodule.sh ***
@@ -226008,8 +223385,8 @@
 branch 'no_submodule' set up to track 'origin/no_submodule'.
 branch 'add_sub1' set up to track 'origin/add_sub1'.
 Saved working directory and index state WIP on no_submodule: 27611a5 Base
---- expect	2025-02-09 06:54:27.029859632 +0000
-+++ actual	2025-02-09 06:54:27.069859886 +0000
+--- expect	2026-03-14 13:30:26.434677808 +0000
++++ actual	2026-03-14 13:30:26.594677808 +0000
 @@ -2,5 +2,3 @@
  expect
  file1
@@ -226308,8 +223685,8 @@
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'modify_sub1' set up to track 'origin/modify_sub1'.
 No local changes to save
---- expect	2025-02-09 06:54:28.965871950 +0000
-+++ actual	2025-02-09 06:54:28.981872052 +0000
+--- expect	2026-03-14 13:30:36.898677808 +0000
++++ actual	2026-03-14 13:30:37.006677808 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -226340,8 +223717,8 @@
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 No local changes to save
---- expect	2025-02-09 06:54:29.109872866 +0000
-+++ actual	2025-02-09 06:54:29.125872968 +0000
+--- expect	2026-03-14 13:30:38.034677808 +0000
++++ actual	2026-03-14 13:30:38.130677808 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -226369,8 +223746,8 @@
 fatal: Needed a single revision
 branch 'valid_sub1' set up to track 'origin/valid_sub1'.
 No local changes to save
---- expect	2025-02-09 06:54:29.185873350 +0000
-+++ actual	2025-02-09 06:54:29.201873451 +0000
+--- expect	2026-03-14 13:30:38.738677808 +0000
++++ actual	2026-03-14 13:30:38.874677808 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -226471,172 +223848,867 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4030-diff-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4030-diff-textconv/.git/
-expecting success of 4030.1 'setup binary file with history': 
-	test_commit --printf one file "\\0\\n" &&
-	test_commit --printf --append two file "\\01\\n"
+*** t4027-diff-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4027-diff-submodule/.git/
+expecting success of 4027.1 'setup': 
+	test_tick &&
+	test_create_repo sub &&
+	(
+		cd sub &&
+		echo hello >world &&
+		git add world &&
+		git commit -m submodule
+	) &&
 
-[master (root-commit) f1b27dd] one
+	test_tick &&
+	echo frotz >nitfol &&
+	git add nitfol sub &&
+	git commit -m superproject &&
+
+	(
+		cd sub &&
+		echo goodbye >world &&
+		git add world &&
+		git commit -m "submodule #2"
+	) &&
+
+	git -C sub rev-list HEAD >revs &&
+	set x $(cat revs) &&
+	echo ":160000 160000 $3 $ZERO_OID M	sub" >expect &&
+	subtip=$3 subprev=$2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4027-diff-submodule/sub/.git/
+[master (root-commit) 4431e0b] submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master e1c09e5] two
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) 5b035b6] superproject
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 1 - setup binary file with history
+ 2 files changed, 2 insertions(+)
+ create mode 100644 nitfol
+ create mode 160000 sub
+[master 2dd69d6] submodule #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 4030.2 'file is considered binary by porcelain': 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
+expecting success of 4027.2 'git diff --raw HEAD': 
+	hexsz=$(test_oid hexsz) &&
+	git diff --raw --abbrev=$hexsz HEAD >actual &&
+	test_cmp expect actual
 
-ok 2 - file is considered binary by porcelain
+ok 2 - git diff --raw HEAD
 
-expecting success of 4030.3 'file is considered binary by plumbing': 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
+expecting success of 4027.3 'git diff-index --raw HEAD': 
+	git diff-index --raw HEAD >actual.index &&
+	test_cmp expect actual.index
 
-ok 3 - file is considered binary by plumbing
+ok 3 - git diff-index --raw HEAD
 
-expecting success of 4030.4 'setup textconv filters': 
-	echo file diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/hexdump &&
-	git config diff.fail.textconv false
+expecting success of 4027.4 'git diff-files --raw': 
+	git diff-files --raw >actual.files &&
+	test_cmp expect actual.files
 
-ok 4 - setup textconv filters
+ok 4 - git diff-files --raw
 
-expecting success of 4030.5 'diff produces text': 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
+expecting success of 4027.5 'git diff HEAD': 
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body
 
-ok 5 - diff produces text
+ok 5 - git diff HEAD
 
-expecting success of 4030.6 'show commit produces text': 
-	git show HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
+expecting success of 4027.6 'git diff HEAD with dirty submodule (work tree)': 
+	echo >>sub/world &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
 
-ok 6 - show commit produces text
+ok 6 - git diff HEAD with dirty submodule (work tree)
 
-expecting success of 4030.7 'diff-tree produces binary': 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
+expecting success of 4027.7 'git diff HEAD with dirty submodule (index)': 
+	(
+		cd sub &&
+		git reset --hard &&
+		echo >>world &&
+		git add world
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
 
-ok 7 - diff-tree produces binary
+HEAD is now at 2dd69d6 submodule #2
+ok 7 - git diff HEAD with dirty submodule (index)
 
-expecting success of 4030.8 'log produces text': 
-	git log -1 -p >log &&
-	find_diff <log >actual &&
-	test_cmp expect.text actual
+expecting success of 4027.8 'git diff HEAD with dirty submodule (untracked)': 
+	(
+		cd sub &&
+		git reset --hard &&
+		git clean -qfdx &&
+		>cruft
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body
 
-ok 8 - log produces text
+HEAD is now at 2dd69d6 submodule #2
+ok 8 - git diff HEAD with dirty submodule (untracked)
 
-expecting success of 4030.9 'format-patch produces binary': 
-	git format-patch --no-binary --stdout HEAD^ >patch &&
-	find_diff <patch >actual &&
-	test_cmp expect.binary actual
+expecting success of 4027.9 'git diff HEAD with dirty submodule (untracked) (none ignored)': 
+	test_config diff.ignoreSubmodules none &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
 
-ok 9 - format-patch produces binary
+ok 9 - git diff HEAD with dirty submodule (untracked) (none ignored)
 
-expecting success of 4030.10 'status -v produces text': 
-	git reset --soft HEAD^ &&
-	git status -v >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual &&
-	git reset --soft HEAD@{1}
+expecting success of 4027.10 'git diff HEAD with dirty submodule (work tree, refs match)': 
+	git commit -m "x" sub &&
+	echo >>sub/world &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git diff --ignore-submodules=untracked HEAD >actual3 &&
+	sed -e "1,/^@@/d" actual3 >actual3.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual3.body &&
+	git diff --ignore-submodules=dirty HEAD >actual4 &&
+	test_must_be_empty actual4
 
-ok 10 - status -v produces text
+[master e6ee575] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - git diff HEAD with dirty submodule (work tree, refs match)
 
-expecting success of 4030.11 'show blob produces binary': 
-	git show HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
+expecting success of 4027.11 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]': 
+	git config diff.ignoreSubmodules dirty &&
+	git diff HEAD >actual &&
+	test_must_be_empty actual &&
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config -f .gitmodules submodule.subname.ignore all &&
+	git config -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git config -f .gitmodules submodule.subname.ignore untracked &&
+	git diff HEAD >actual3 &&
+	sed -e "1,/^@@/d" actual3 >actual3.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual3.body &&
+	git config -f .gitmodules submodule.subname.ignore dirty &&
+	git diff HEAD >actual4 &&
+	test_must_be_empty actual4 &&
+	git config submodule.subname.ignore none &&
+	git config submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	git config --unset diff.ignoreSubmodules &&
+	rm .gitmodules
 
-ok 11 - show blob produces binary
+ok 11 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]
 
-expecting success of 4030.12 'show --textconv blob produces text': 
-	git show --textconv HEAD:file >actual &&
-	printf "0\\n1\\n" >expect &&
-	test_cmp expect actual
+expecting success of 4027.12 'git diff HEAD with dirty submodule (index, refs match)': 
+	(
+		cd sub &&
+		git reset --hard &&
+		echo >>world &&
+		git add world
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body
 
-ok 12 - show --textconv blob produces text
+HEAD is now at 2dd69d6 submodule #2
+ok 12 - git diff HEAD with dirty submodule (index, refs match)
 
-expecting success of 4030.13 'show --no-textconv blob produces binary': 
-	git show --no-textconv HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
+expecting success of 4027.13 'git diff HEAD with dirty submodule (untracked, refs match)': 
+	(
+		cd sub &&
+		git reset --hard &&
+		git clean -qfdx &&
+		>cruft
+	) &&
+	git diff --ignore-submodules=none HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules=all HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git diff HEAD >actual3 &&
+	test_must_be_empty actual3 &&
+	git diff --ignore-submodules=dirty HEAD >actual4 &&
+	test_must_be_empty actual4
 
-ok 13 - show --no-textconv blob produces binary
+HEAD is now at 2dd69d6 submodule #2
+ok 13 - git diff HEAD with dirty submodule (untracked, refs match)
 
-expecting success of 4030.14 'grep-diff (-G) operates on textconv data (add)': 
-	echo one >expect &&
-	git log --root --format=%s -G0 >actual &&
-	test_cmp expect actual
+expecting success of 4027.14 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]': 
+	git config --add -f .gitmodules submodule.subname.ignore all &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git config -f .gitmodules submodule.subname.ignore untracked &&
+	git diff HEAD >actual3 &&
+	test_must_be_empty actual3 &&
+	git config -f .gitmodules submodule.subname.ignore dirty &&
+	git diff HEAD >actual4 &&
+	test_must_be_empty actual4 &&
+	git config submodule.subname.ignore none &&
+	git config submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	rm .gitmodules
 
-ok 14 - grep-diff (-G) operates on textconv data (add)
+ok 14 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]
 
-expecting success of 4030.15 'grep-diff (-G) operates on textconv data (modification)': 
-	echo two >expect &&
-	git log --root --format=%s -G1 >actual &&
-	test_cmp expect actual
+expecting success of 4027.15 'git diff between submodule commits': 
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules HEAD^..HEAD >actual &&
+	test_must_be_empty actual
 
-ok 15 - grep-diff (-G) operates on textconv data (modification)
+ok 15 - git diff between submodule commits
 
-expecting success of 4030.16 'pickaxe (-S) operates on textconv data (add)': 
-	echo one >expect &&
-	git log --root --format=%s -S0 >actual &&
-	test_cmp expect actual
+expecting success of 4027.16 'git diff between submodule commits [.gitmodules]': 
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git config -f .gitmodules submodule.subname.ignore all &&
+	git diff HEAD^..HEAD >actual &&
+	test_must_be_empty actual &&
+	git config submodule.subname.ignore dirty &&
+	git config submodule.subname.path sub &&
+	git diff  HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	rm .gitmodules
 
-ok 16 - pickaxe (-S) operates on textconv data (add)
+ok 16 - git diff between submodule commits [.gitmodules]
 
-expecting success of 4030.17 'pickaxe (-S) operates on textconv data (modification)': 
-	echo two >expect &&
-	git log --root --format=%s -S1 >actual &&
-	test_cmp expect actual
+expecting success of 4027.17 'git diff (empty submodule dir)': 
+	rm -rf sub/* sub/.git &&
+	git diff > actual.empty &&
+	test_must_be_empty actual.empty
 
-ok 17 - pickaxe (-S) operates on textconv data (modification)
+ok 17 - git diff (empty submodule dir)
 
-expecting success of 4030.18 'diffstat does not run textconv': 
-	echo file diff=fail >.gitattributes &&
-	git diff --stat HEAD^ HEAD >actual &&
-	test_cmp expect.stat actual &&
+expecting success of 4027.18 'conflicted submodule setup': 
+	c=$(test_oid ff_1) &&
+	(
+		echo "000000 $ZERO_OID 0	sub" &&
+		echo "160000 1$c 1	sub" &&
+		echo "160000 2$c 2	sub" &&
+		echo "160000 3$c 3	sub"
+	) | git update-index --index-info &&
+	echo >expect.nosub "diff --cc sub
+index 2ffffff,3ffffff..0000000
+--- a/sub
++++ b/sub
+@@@ -1,1 -1,1 +1,1 @@@
+- Subproject commit 2$c
+ -Subproject commit 3$c
+++Subproject commit $ZERO_OID" &&
 
-	head -n1 <expect.stat >expect.line1 &&
-	head -n1 <actual >actual.line1 &&
-	test_cmp expect.line1 actual.line1
+	hh=$(git rev-parse HEAD) &&
+	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
 
-ok 18 - diffstat does not run textconv
 
-expecting success of 4030.19 'textconv does not act on symlinks': 
-	rm -f file &&
-	test_ln_s_add frotz file &&
-	git commit -m typechange &&
-	git show >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.typechange actual
+ok 18 - conflicted submodule setup
 
-checking prerequisite: SYMLINKS
+expecting success of 4027.19 'combined (empty submodule)': 
+	rm -fr sub && mkdir sub &&
+	git diff >actual &&
+	test_cmp expect.nosub 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 19 - combined (empty submodule)
 
-)
-prerequisite SYMLINKS ok
-[master 552bf47] typechange
- Author: A U Thor <author@example.com>
+expecting success of 4027.20 'combined (with submodule)': 
+	rm -fr sub &&
+	git clone --no-checkout . sub &&
+	git diff >actual &&
+	test_cmp expect.withsub actual
+
+Cloning into 'sub'...
+done.
+ok 20 - combined (with submodule)
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4031-diff-rewrite-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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(-)
- mode change 100644 => 120000 file
-ok 19 - textconv does not act on symlinks
+ rewrite file (99%)
+ok 6 - diff --stat counts binary rewrite as 0 lines
 
-# passed all 19 test(s)
-1..19
+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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4020-diff-external.sh ***
@@ -227302,8 +225374,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
-file /tmp/git-blob-w307Ep/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-file2 /tmp/git-blob-I9WZVj/file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
+file /tmp/git-blob-a7JgQ9/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+file2 /tmp/git-blob-X8DxTK/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': 
@@ -227416,1120 +225488,3238 @@
 1..71
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4033-diff-patience.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t3903-stash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/.git/
+expecting success of 3903.1 'usage on cmd and subcommand invalid option': 
+	test_expect_code 129 git stash --invalid-option 2>usage &&
+	grep "or: git stash" usage &&
 
-+bX
-ok 1 - --ignore-space-at-eol with a single appended character
+	test_expect_code 129 git stash push --invalid-option 2>usage &&
+	! grep "or: git stash" usage
 
-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
+   or: git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
+   or: git stash drop [-q | --quiet] [<stash>]
+   or: git stash pop [--index] [-q | --quiet] [<stash>]
+   or: git stash apply [--index] [-q | --quiet] [<stash>]
+   or: git stash branch <branchname> [<stash>]
+   or: git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+   or: git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+   or: git stash clear
+   or: git stash create [<message>]
+   or: git stash store [(-m | --message) <message>] [-q | --quiet] <commit>
+ok 1 - usage on cmd and subcommand invalid option
+
+expecting success of 3903.2 'usage on main command -h emits a summary of subcommands': 
+	test_expect_code 129 git stash -h >usage &&
+	grep -F "usage: git stash list" usage &&
+	grep -F "or: git stash show" usage
+
+usage: git stash list [<log-options>]
+   or: git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
+ok 2 - usage on main command -h emits a summary of subcommands
+
+expecting success of 3903.3 'usage for subcommands should emit subcommand usage': 
+	test_expect_code 129 git stash push -h >usage &&
+	grep -F "usage: git stash [push" usage
+
+usage: git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+ok 3 - usage for subcommands should emit subcommand usage
+
+expecting success of 3903.4 'stash some dirty working directory': 
+	setup_stash
+
+[main (root-commit) fe7e97b] initial
  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
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 other-file
+Saved working directory and index state WIP on main: fe7e97b initial
+ok 4 - stash some dirty working directory
 
-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 3903.5 'parents of stash': 
+	test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
+	git diff stash^2..stash >output &&
+	diff_cmp expect output
 
-expecting success of 4033.4 'diff from attributes with bare repo with source': 
-		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
-			-c diff.driverA.algorithm=$STRATEGY \
-			diff HEAD:file1 HEAD:file2 >output &&
-		test_cmp expect output
-	
-ok 4 - diff from attributes with bare repo with source
+ok 5 - parents of stash
 
-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 3903.6 'applying bogus stash does nothing': 
+	test_must_fail git stash apply stash@{1} &&
+	echo 1 >expect &&
+	test_cmp expect file
 
-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
+fatal: log for 'stash' only has 1 entries
+ok 6 - applying bogus stash does nothing
 
-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 3903.7 'apply does not need clean working directory': 
+	echo 4 >other-file &&
+	git stash apply &&
+	echo 3 >expect &&
+	test_cmp expect file
 
-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
+Merging Version stash was based on with Stashed changes
+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:   file
+	modified:   other-file
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	output
+	usage
 
-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
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 7 - apply does not need clean working directory
 
-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 3903.8 'apply does not clobber working directory changes': 
+	git reset --hard &&
+	echo 4 >file &&
+	test_must_fail git stash apply &&
+	echo 4 >expect &&
+	test_cmp expect file
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4036-format-patch-signer-mime.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4036-format-patch-signer-mime/.git/
-expecting success of 4036.1 'setup': 
+HEAD is now at fe7e97b initial
+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
+Merging Version stash was based on with Stashed changes
+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:   file
 
-	>F &&
-	git add F &&
-	git commit -m initial &&
-	echo new line >F &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	output
+	usage
 
-	test_tick &&
-	git commit -m "This adds some lines to F" F
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 8 - apply does not clobber working directory changes
 
+expecting success of 3903.9 'apply stashed changes': 
+	git reset --hard &&
+	echo 5 >other-file &&
+	git add other-file &&
+	test_tick &&
+	git commit -m other-file &&
+	git stash apply &&
+	test 3 = $(cat file) &&
+	test 1 = $(git show :file) &&
+	test 1 = $(git show HEAD:file)
 
-[master (root-commit) bf01fa7] initial
+HEAD is now at fe7e97b initial
+[main 4db481e] other-file
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging Updated upstream with Stashed changes
+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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	output
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 9 - apply stashed changes
+
+expecting success of 3903.10 'apply stashed changes (including index)': 
+	git reset --hard HEAD^ &&
+	echo 6 >other-file &&
+	git add other-file &&
+	test_tick &&
+	git commit -m other-file &&
+	git stash apply --index &&
+	test 3 = $(cat file) &&
+	test 2 = $(git show :file) &&
+	test 1 = $(git show HEAD:file)
+
+HEAD is now at fe7e97b initial
+[main da68008] other-file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging Updated upstream with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   file
 
-expecting success of 4036.2 'format normally': 
+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
 
-	git format-patch --stdout -1 >output &&
-	! grep Content-Type output
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	output
+	usage
 
+ok 10 - apply stashed changes (including index)
 
-ok 2 - format normally
+expecting success of 3903.11 'unstashing in a subdirectory': 
+	git reset --hard HEAD &&
+	mkdir subdir &&
+	(
+		cd subdir &&
+		git stash apply
+	)
 
-expecting success of 4036.3 'format with signoff without funny signer name': 
+HEAD is now at da68008 other-file
+Merging Updated upstream with Stashed changes
+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:   ../file
 
-	git format-patch -s --stdout -1 >output &&
-	! grep Content-Type output
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	../expect
+	../output
+	../usage
 
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 11 - unstashing in a subdirectory
 
-ok 3 - format with signoff without funny signer name
+expecting success of 3903.12 'stash drop complains of extra options': 
+	test_must_fail git stash drop --foo
 
-expecting success of 4036.4 'format with non ASCII signer name': 
+error: unknown option `foo'
+usage: git stash drop [-q | --quiet] [<stash>]
 
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 >output &&
-	grep Content-Type output
+    -q, --[no-]quiet      be quiet, only report errors
 
+ok 12 - stash drop complains of extra options
 
-Content-Type: text/plain; charset=UTF-8
-ok 4 - format with non ASCII signer name
+expecting success of 3903.13 'drop top stash': 
+	git reset --hard &&
+	git stash list >expected &&
+	echo 7 >file &&
+	git stash &&
+	git stash drop &&
+	git stash list >actual &&
+	test_cmp expected actual &&
+	git stash apply &&
+	test 3 = $(cat file) &&
+	test 1 = $(git show :file) &&
+	test 1 = $(git show HEAD:file)
 
-expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
+HEAD is now at da68008 other-file
+Saved working directory and index state WIP on main: da68008 other-file
+Dropped refs/stash@{0} (cb250e8e47ab685a401a9258b861903a94581a26)
+Merging Updated upstream with Stashed changes
+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:   file
 
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 --attach >output &&
-	test $(grep -ci ^MIME-Version: output) = 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	usage
 
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 13 - drop top stash
 
-ok 5 - attach and signoff do not duplicate mime headers
+expecting success of 3903.14 'drop middle stash': 
+	git reset --hard &&
+	echo 8 >file &&
+	git stash &&
+	echo 9 >file &&
+	git stash &&
+	git stash drop stash@{1} &&
+	test 2 = $(git stash list | wc -l) &&
+	git stash apply &&
+	test 9 = $(cat file) &&
+	test 1 = $(git show :file) &&
+	test 1 = $(git show HEAD:file) &&
+	git reset --hard &&
+	git stash drop &&
+	git stash apply &&
+	test 3 = $(cat file) &&
+	test 1 = $(git show :file) &&
+	test 1 = $(git show HEAD:file)
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4037-diff-r-t-dirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+HEAD is now at da68008 other-file
+Saved working directory and index state WIP on main: da68008 other-file
+Saved working directory and index state WIP on main: da68008 other-file
+Dropped stash@{1} (5b715756e7f660ba9dd1619de9e5a4b24a06b7c3)
+Merging Version stash was based on with Stashed changes
+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:   file
 
-	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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	usage
 
-[master (root-commit) 26fc746] initial
+no changes added to commit (use "git add" and/or "git commit -a")
+HEAD is now at da68008 other-file
+Dropped refs/stash@{0} (236c59f58e239e74e90b6832a98fa4b7f4b33647)
+Merging Updated upstream with Stashed changes
+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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 14 - drop middle stash
+
+expecting success of 3903.15 'drop middle stash by index': 
+	git reset --hard &&
+	echo 8 >file &&
+	git stash &&
+	echo 9 >file &&
+	git stash &&
+	git stash drop 1 &&
+	test 2 = $(git stash list | wc -l) &&
+	git stash apply &&
+	test 9 = $(cat file) &&
+	test 1 = $(git show :file) &&
+	test 1 = $(git show HEAD:file) &&
+	git reset --hard &&
+	git stash drop &&
+	git stash apply &&
+	test 3 = $(cat file) &&
+	test 1 = $(git show :file) &&
+	test 1 = $(git show HEAD:file)
+
+HEAD is now at da68008 other-file
+Saved working directory and index state WIP on main: da68008 other-file
+Saved working directory and index state WIP on main: da68008 other-file
+Dropped refs/stash@{1} (5b715756e7f660ba9dd1619de9e5a4b24a06b7c3)
+Merging Version stash was based on with Stashed changes
+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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+HEAD is now at da68008 other-file
+Dropped refs/stash@{0} (236c59f58e239e74e90b6832a98fa4b7f4b33647)
+Merging Updated upstream with Stashed changes
+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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 15 - drop middle stash by index
+
+expecting success of 3903.16 'drop stash reflog updates refs/stash': 
+	git reset --hard &&
+	git rev-parse refs/stash >expect &&
+	echo 9 >file &&
+	git stash &&
+	git stash drop stash@{0} &&
+	git rev-parse refs/stash >actual &&
+	test_cmp expect actual
+
+HEAD is now at da68008 other-file
+Saved working directory and index state WIP on main: da68008 other-file
+Dropped stash@{0} (236c59f58e239e74e90b6832a98fa4b7f4b33647)
+ok 16 - drop stash reflog updates refs/stash
+
+expecting success of 3903.17 'drop stash reflog updates refs/stash with rewrite': 
+	git init repo &&
+	(
+		cd repo &&
+		setup_stash
+	) &&
+	echo 9 >repo/file &&
+
+	old_oid="$(git -C repo rev-parse stash@{0})" &&
+	git -C repo stash &&
+	new_oid="$(git -C repo rev-parse stash@{0})" &&
+
+	cat >expect <<-EOF &&
+	$new_oid
+	$old_oid
+	EOF
+	git -C repo reflog show refs/stash --format=%H >actual &&
+	test_cmp expect actual &&
+
+	git -C repo stash drop stash@{1} &&
+	git -C repo reflog show refs/stash --format=%H >actual &&
+	cat >expect <<-EOF &&
+	$new_oid
+	EOF
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
+[main (root-commit) c512db6] 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
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 other-file
+Saved working directory and index state WIP on main: c512db6 initial
+Saved working directory and index state WIP on main: c512db6 initial
+Dropped stash@{1} (886689bbf0687da9299458a427fd23c435bce4b1)
+ok 17 - drop stash reflog updates refs/stash with rewrite
+
+expecting success of 3903.18 'stash pop': 
+	git reset --hard &&
+	git stash pop &&
+	test 3 = $(cat file) &&
+	test 1 = $(git show :file) &&
+	test 1 = $(git show HEAD:file) &&
+	test 0 = $(git stash list | wc -l)
+
+HEAD is now at da68008 other-file
+Merging Updated upstream with Stashed changes
+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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (5c6ad4ca28e71ae3a007e6c77043d04bc42fa9ee)
+ok 18 - stash pop
+
+expecting success of 3903.19 'stash branch': 
+	echo foo >file &&
+	git commit file -m first &&
+	echo bar >file &&
+	echo bar2 >file2 &&
+	git add file2 &&
+	git stash &&
+	echo baz >file &&
+	git commit file -m second &&
+	git stash branch stashbranch &&
+	test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
+	test $(git rev-parse HEAD) = $(git rev-parse main^) &&
+	git diff --cached >output &&
+	diff_cmp expect output &&
+	git diff >output &&
+	diff_cmp expect1 output &&
+	git add file &&
+	git commit -m alternate\ second &&
+	git diff main..stashbranch >output &&
+	diff_cmp output expect2 &&
+	test 0 = $(git stash list | wc -l)
+
+[main ce675cf] first
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Saved working directory and index state WIP on main: ce675cf first
+[main 662e8e5] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'stashbranch'
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file2
 
-expecting success of 4037.2 'verify': 
-	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expect1
+	expect2
+	expected
+	output
+	repo/
+	usage
+
+Dropped refs/stash@{0} (cdadb37dcdb15029c2bcf635107de6d696bb3ad3)
+[stashbranch d3a23d9] alternate second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ok 19 - stash branch
+
+expecting success of 3903.20 'apply -q is quiet': 
+	echo foo >file &&
+	git stash &&
+	git stash apply -q >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 20 - apply -q is quiet
+
+expecting success of 3903.21 'apply --index -q is quiet': 
+	# Added file, deleted file, modified file all staged for commit
+	echo foo >new-file &&
+	echo test >file &&
+	git add new-file file &&
+	git rm other-file &&
+
+	git stash &&
+	git stash apply --index -q >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+rm 'other-file'
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 21 - apply --index -q is quiet
+
+expecting success of 3903.22 'save -q is quiet': 
+	git stash save --quiet >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+ok 22 - save -q is quiet
+
+expecting success of 3903.23 'pop -q works and is quiet': 
+	git stash pop -q >output.out 2>&1 &&
+	echo bar >expect &&
+	git show :file >actual &&
+	test_cmp expect actual &&
+	test_must_be_empty output.out
+
+ok 23 - pop -q works and is quiet
+
+expecting success of 3903.24 'pop -q --index works and is quiet': 
+	echo foo >file &&
+	git add file &&
+	git stash save --quiet &&
+	git stash pop -q --index >output.out 2>&1 &&
+	git diff-files file2 >file2.diff &&
+	test_must_be_empty file2.diff &&
+	test foo = "$(git show :file)" &&
+	test_must_be_empty output.out
+
+ok 24 - pop -q --index works and is quiet
+
+expecting success of 3903.25 'drop -q is quiet': 
+	git stash &&
+	git stash drop -q >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 25 - drop -q is quiet
+
+expecting success of 3903.26 'stash push -q --staged refreshes the index': 
+	git reset --hard &&
+	echo test >file &&
+	git add file &&
+	git stash push -q --staged &&
+	git diff-files >output.out &&
+	test_must_be_empty output.out
+
+HEAD is now at d3a23d9 alternate second
+ok 26 - stash push -q --staged refreshes the index
+
+expecting success of 3903.27 'stash apply -q --index refreshes the index': 
+	echo test >other-file &&
+	git add other-file &&
+	echo another-change >other-file &&
+	git diff-files >expect &&
+	git stash &&
+
+	git stash apply -q --index &&
+	git diff-files >actual &&
 	test_cmp expect actual
 
-ok 2 - verify
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 27 - stash apply -q --index refreshes the index
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4032-diff-inter-hunk-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 3903.28 'stash -k': 
+	echo bar3 >file &&
+	echo bar4 >file2 &&
+	git add file2 &&
+	git stash -k &&
+	test bar,bar4 = $(cat file),$(cat file2)
 
-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
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 28 - stash -k
 
-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 3903.29 'stash --no-keep-index': 
+	echo bar33 >file &&
+	echo bar44 >file2 &&
+	git add file2 &&
+	git stash --no-keep-index &&
+	test bar,bar2 = $(cat file),$(cat file2)
 
-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
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 29 - stash --no-keep-index
 
-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 3903.30 'stash --staged': 
+	echo bar3 >file &&
+	echo bar4 >file2 &&
+	git add file2 &&
+	git stash --staged &&
+	test bar3,bar2 = $(cat file),$(cat file2) &&
+	git reset --hard &&
+	git stash pop &&
+	test bar,bar4 = $(cat file),$(cat file2)
 
-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
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+HEAD is now at d3a23d9 alternate second
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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:   file2
 
-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)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
-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
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (87589b9806264bae268601f80dfb73d1e02c4fa4)
+ok 30 - stash --staged
 
-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 3903.31 'stash --staged with binary file': 
+	printf "\0" >file &&
+	git add file &&
+	git stash --staged &&
+	git stash pop &&
+	printf "\0" >expect &&
+	test_cmp expect file
 
-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)
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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:   file2
 
-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)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
-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)
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (d20eac4efdf0854212cea68f625b3869c0569eb8)
+ok 31 - stash --staged with binary file
 
-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 3903.32 'dont assume push with non-option args': 
+	test_must_fail git stash -q drop 2>err &&
+	test_grep -e "subcommand wasn't specified; 'push' can't be assumed due to unexpected token 'drop'" err
 
-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)
+fatal: subcommand wasn't specified; 'push' can't be assumed due to unexpected token 'drop'
+ok 32 - dont assume push with non-option args
 
-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 3903.33 'stash --invalid-option': 
+	echo bar5 >file &&
+	echo bar6 >file2 &&
+	git add file2 &&
+	test_must_fail git stash --invalid-option &&
+	test_must_fail git stash save --invalid-option &&
+	test bar5,bar6 = $(cat file),$(cat file2)
 
-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)
+error: unknown option `invalid-option'
+usage: git stash list [<log-options>]
+   or: git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
+   or: git stash drop [-q | --quiet] [<stash>]
+   or: git stash pop [--index] [-q | --quiet] [<stash>]
+   or: git stash apply [--index] [-q | --quiet] [<stash>]
+   or: git stash branch <branchname> [<stash>]
+   or: git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+                 [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]
+                 [--pathspec-from-file=<file> [--pathspec-file-nul]]
+                 [--] [<pathspec>...]]
+   or: git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+                 [-u | --include-untracked] [-a | --all] [<message>]
+   or: git stash clear
+   or: git stash create [<message>]
+   or: git stash store [(-m | --message) <message>] [-q | --quiet] <commit>
 
-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)
+    -k, --[no-]keep-index keep index
+    -S, --[no-]staged     stash staged changes only
+    -p, --[no-]patch      stash in patch mode
+    -q, --[no-]quiet      quiet mode
+    -u, --[no-]include-untracked
+                          include untracked files in stash
+    -a, --[no-]all        include ignore files
+    -m, --[no-]message <message>
+                          stash message
+    --[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 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)
+error: unknown option `invalid-option'
+usage: git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
+                 [-u | --include-untracked] [-a | --all] [<message>]
 
-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)
+    -k, --[no-]keep-index keep index
+    -S, --[no-]staged     stash staged changes only
+    -p, --[no-]patch      stash in patch mode
+    -q, --[no-]quiet      quiet mode
+    -u, --[no-]include-untracked
+                          include untracked files in stash
+    -a, --[no-]all        include ignore files
+    -m, --[no-]message <message>
+                          stash message
 
-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)
+ok 33 - stash --invalid-option
 
-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 3903.34 'stash an added file': 
+	git reset --hard &&
+	echo new >file3 &&
+	git add file3 &&
+	git stash save "added file" &&
+	! test -r file3 &&
+	git stash apply &&
+	test new = "$(cat file3)"
 
-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)
+HEAD is now at d3a23d9 alternate second
+Saved working directory and index state On stashbranch: added file
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file3
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
-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)
+ok 34 - stash an added file
 
-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 3903.35 'stash --intent-to-add file': 
+	git reset --hard &&
+	echo new >file4 &&
+	git add --intent-to-add file4 &&
+	test_when_finished "git rm -f file4" &&
+	test_must_fail git stash
 
-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)
+HEAD is now at d3a23d9 alternate second
+error: Entry 'file4' not uptodate. Cannot merge.
+Cannot save the current worktree state
+rm 'file4'
+ok 35 - stash --intent-to-add file
 
-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 3903.36 'stash rm then recreate': 
+	git reset --hard &&
+	git rm file &&
+	echo bar7 >file &&
+	git stash save "rm then recreate" &&
+	test bar = "$(cat file)" &&
+	git stash apply &&
+	test bar7 = "$(cat file)"
 
-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)
+HEAD is now at d3a23d9 alternate second
+rm 'file'
+Saved working directory and index state On stashbranch: rm then recreate
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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
 
-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)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
-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)
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 36 - stash rm then recreate
 
-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 3903.37 'stash rm and ignore': 
+	git reset --hard &&
+	git rm file &&
+	echo file >.gitignore &&
+	git stash save "rm and ignore" &&
+	test bar = "$(cat file)" &&
+	test file = "$(cat .gitignore)" &&
+	git stash apply &&
+	! test -r file &&
+	test file = "$(cat .gitignore)"
 
-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)
+HEAD is now at d3a23d9 alternate second
+rm 'file'
+Saved working directory and index state On stashbranch: rm and ignore
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    file
 
-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)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
-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)
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 37 - stash rm and ignore
 
-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 3903.38 'stash rm and ignore (stage .gitignore)': 
+	git reset --hard &&
+	git rm file &&
+	echo file >.gitignore &&
+	git add .gitignore &&
+	git stash save "rm and ignore (stage .gitignore)" &&
+	test bar = "$(cat file)" &&
+	! test -r .gitignore &&
+	git stash apply &&
+	! test -r file &&
+	test file = "$(cat .gitignore)"
 
-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)
+HEAD is now at d3a23d9 alternate second
+rm 'file'
+Saved working directory and index state On stashbranch: rm and ignore (stage .gitignore)
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   .gitignore
 
-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
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    file
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4035-diff-quiet.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4035-diff-quiet/.git/
-expecting success of 4035.1 'setup': 
-	echo 1 >a &&
-	git add . &&
-	git commit -m first &&
-	echo 2 >b &&
-	git add . &&
-	git commit -a -m second &&
-	mkdir -p test-outside/repo && (
-		cd test-outside/repo &&
-		git init &&
-		echo "1 1" >a &&
-		git add . &&
-		git commit -m 1
-	) &&
-	mkdir -p test-outside/non/git && (
-		cd test-outside/non/git &&
-		echo "1 1" >a &&
-		echo "1 1" >matching-file &&
-		echo "1 1 " >trailing-space &&
-		echo "1   1" >extra-space &&
-		echo "2" >never-match
-	)
+ok 38 - stash rm and ignore (stage .gitignore)
 
-[master (root-commit) 703ec9e] first
+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 3903.39 'stash file to symlink': 
+	git reset --hard &&
+	rm file &&
+	ln -s file2 file &&
+	git stash save "file to symlink" &&
+	test_path_is_file_not_symlink file &&
+	test bar = "$(cat file)" &&
+	git stash apply &&
+	test_path_is_symlink file &&
+	test "$(test_readlink file)" = file2
+
+HEAD is now at d3a23d9 alternate second
+Saved working directory and index state On stashbranch: file to symlink
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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)
+	typechange: file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 39 - stash file to symlink
+
+expecting success of 3903.40 'stash file to symlink (stage rm)': 
+	git reset --hard &&
+	git rm file &&
+	ln -s file2 file &&
+	git stash save "file to symlink (stage rm)" &&
+	test_path_is_file_not_symlink file &&
+	test bar = "$(cat file)" &&
+	git stash apply &&
+	test_path_is_symlink file &&
+	test "$(test_readlink file)" = file2
+
+HEAD is now at d3a23d9 alternate second
+rm 'file'
+Saved working directory and index state On stashbranch: file to symlink (stage rm)
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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)
+	typechange: file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 40 - stash file to symlink (stage rm)
+
+expecting success of 3903.41 'stash file to symlink (full stage)': 
+	git reset --hard &&
+	rm file &&
+	ln -s file2 file &&
+	git add file &&
+	git stash save "file to symlink (full stage)" &&
+	test_path_is_file_not_symlink file &&
+	test bar = "$(cat file)" &&
+	git stash apply &&
+	test_path_is_symlink file &&
+	test "$(test_readlink file)" = file2
+
+HEAD is now at d3a23d9 alternate second
+Saved working directory and index state On stashbranch: file to symlink (full stage)
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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)
+	typechange: file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 41 - stash file to symlink (full stage)
+
+expecting success of 3903.42 'stash symlink to file': 
+	git reset --hard &&
+	test_ln_s_add file filelink &&
+	git commit -m "Add symlink" &&
+	rm filelink &&
+	cp file filelink &&
+	git stash save "symlink to file"
+
+HEAD is now at d3a23d9 alternate second
+[stashbranch f202a25] Add symlink
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 3476b69] second
+ create mode 120000 filelink
+Saved working directory and index state On stashbranch: symlink to file
+ok 42 - stash symlink to file
+
+expecting success of 3903.43 'this must have re-created the symlink': 
+	test -h filelink &&
+	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+
+ok 43 - this must have re-created the symlink
+
+expecting success of 3903.44 'unstash must re-create the file': 
+	git stash apply &&
+	! test -h filelink &&
+	test bar = "$(cat file)"
+
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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)
+	typechange: filelink
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 44 - unstash must re-create the file
+
+expecting success of 3903.45 'stash symlink to file (stage rm)': 
+	git reset --hard &&
+	git rm filelink &&
+	cp file filelink &&
+	git stash save "symlink to file (stage rm)"
+
+HEAD is now at f202a25 Add symlink
+rm 'filelink'
+Saved working directory and index state On stashbranch: symlink to file (stage rm)
+ok 45 - stash symlink to file (stage rm)
+
+expecting success of 3903.46 'this must have re-created the symlink': 
+	test -h filelink &&
+	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+
+ok 46 - this must have re-created the symlink
+
+expecting success of 3903.47 'unstash must re-create the file': 
+	git stash apply &&
+	! test -h filelink &&
+	test bar = "$(cat file)"
+
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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)
+	typechange: filelink
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 47 - unstash must re-create the file
+
+expecting success of 3903.48 'stash symlink to file (full stage)': 
+	git reset --hard &&
+	rm filelink &&
+	cp file filelink &&
+	git add filelink &&
+	git stash save "symlink to file (full stage)"
+
+HEAD is now at f202a25 Add symlink
+Saved working directory and index state On stashbranch: symlink to file (full stage)
+ok 48 - stash symlink to file (full stage)
+
+expecting success of 3903.49 'this must have re-created the symlink': 
+	test -h filelink &&
+	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+
+ok 49 - this must have re-created the symlink
+
+expecting success of 3903.50 'unstash must re-create the file': 
+	git stash apply &&
+	! test -h filelink &&
+	test bar = "$(cat file)"
+
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+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)
+	typechange: filelink
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 50 - unstash must re-create the file
+
+checking known breakage of 3903.51 'stash directory to file': 
+	git reset --hard &&
+	mkdir dir &&
+	echo foo >dir/file &&
+	git add dir/file &&
+	git commit -m "Add file in dir" &&
+	rm -fr dir &&
+	echo bar >dir &&
+	git stash save "directory to file" &&
+	test_path_is_dir dir &&
+	test foo = "$(cat dir/file)" &&
+	test_must_fail git stash apply &&
+	test bar = "$(cat dir)" &&
+	git reset --soft HEAD^
+
+HEAD is now at f202a25 Add symlink
+[stashbranch 36c53af] Add file in dir
  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.48.0~rc1+next.20250101/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
-[master (root-commit) f9eeef1] 1
+ create mode 100644 dir/file
+Saved working directory and index state On stashbranch: directory to file
+Merging Version stash was based on with Stashed changes
+On branch stashbranch
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    dir/file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+test_must_fail: command succeeded: git stash apply
+not ok 51 - stash directory to file # TODO known breakage
+
+checking known breakage of 3903.52 'stash file to directory': 
+	git reset --hard &&
+	rm file &&
+	mkdir file &&
+	echo foo >file/file &&
+	git stash save "file to directory" &&
+	test_path_is_file file &&
+	test bar = "$(cat file)" &&
+	git stash apply &&
+	test_path_is_file file/file &&
+	test foo = "$(cat file/file)"
+
+HEAD is now at 36c53af Add file in dir
+Saved working directory and index state On stashbranch: file to directory
+Merging Version stash was based on with Stashed changes
+Already up to date.
+On branch stashbranch
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
+
+nothing added to commit but untracked files present (use "git add" to track)
+File file/file doesn't exist
+not ok 52 - stash file to directory # TODO known breakage
+
+expecting success of 3903.53 'giving too many ref arguments does not modify files': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	echo foo >file2 &&
+	git stash &&
+	echo bar >file2 &&
+	git stash &&
+	test-tool chmtime =123456789 file2 &&
+	for type in apply pop "branch stash-branch"
+	do
+		test_must_fail git stash $type stash@{0} stash@{1} 2>err &&
+		test_grep "Too many revisions" err &&
+		test 123456789 = $(test-tool chmtime -g file2) || return 1
+	done
+
+Saved working directory and index state WIP on stashbranch: 36c53af Add file in dir
+Saved working directory and index state WIP on stashbranch: 36c53af Add file in dir
+Too many revisions specified: 'stash@{0}' 'stash@{1}'
+Too many revisions specified: 'stash@{0}' 'stash@{1}'
+Too many revisions specified: 'stash@{0}' 'stash@{1}'
+HEAD is now at 36c53af Add file in dir
+ok 53 - giving too many ref arguments does not modify files
+
+expecting success of 3903.54 'drop: too many arguments errors out (does nothing)': 
+	git stash list >expect &&
+	test_must_fail git stash drop stash@{0} stash@{1} 2>err &&
+	test_grep "Too many revisions" err &&
+	git stash list >actual &&
+	test_cmp expect actual
+
+Too many revisions specified: 'stash@{0}' 'stash@{1}'
+ok 54 - drop: too many arguments errors out (does nothing)
+
+expecting success of 3903.55 'show: too many arguments errors out (does nothing)': 
+	test_must_fail git stash show stash@{0} stash@{1} 2>err 1>out &&
+	test_grep "Too many revisions" err &&
+	test_must_be_empty out
+
+Too many revisions specified: 'stash@{0}' 'stash@{1}'
+ok 55 - show: too many arguments errors out (does nothing)
+
+expecting success of 3903.56 'stash create - no changes': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	git stash create >actual &&
+	test_must_be_empty actual
+
+HEAD is now at 36c53af Add file in dir
+HEAD is now at 36c53af Add file in dir
+ok 56 - stash create - no changes
+
+expecting success of 3903.57 'stash branch - no stashes on stack, stash-like argument': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	echo foo >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	git stash branch stash-branch ${STASH_ID} &&
+	test_when_finished "git reset --hard HEAD && git checkout main &&
+	git branch -D stash-branch" &&
+	test $(git ls-files --modified | wc -l) -eq 1
+
+HEAD is now at 36c53af Add file in dir
+HEAD is now at 36c53af Add file in dir
+Switched to a new branch 'stash-branch'
+Merging Version stash was based on with Stashed changes
+On branch stash-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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+HEAD is now at 36c53af Add file in dir
+Switched to branch 'main'
+Deleted branch stash-branch (was 36c53af).
+HEAD is now at 662e8e5 second
+ok 57 - stash branch - no stashes on stack, stash-like argument
+
+expecting success of 3903.58 'stash branch - stashes on stack, stash-like argument': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	echo foo >>file &&
+	git stash &&
+	test_when_finished "git stash drop" &&
+	echo bar >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	git stash branch stash-branch ${STASH_ID} &&
+	test_when_finished "git reset --hard HEAD && git checkout main &&
+	git branch -D stash-branch" &&
+	test $(git ls-files --modified | wc -l) -eq 1
+
+HEAD is now at 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+HEAD is now at 662e8e5 second
+Switched to a new branch 'stash-branch'
+Merging Version stash was based on with Stashed changes
+On branch stash-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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+HEAD is now at 662e8e5 second
+Switched to branch 'main'
+Deleted branch stash-branch (was 662e8e5).
+Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
+HEAD is now at 662e8e5 second
+ok 58 - stash branch - stashes on stack, stash-like argument
+
+expecting success of 3903.59 'stash branch complains with no arguments': 
+	test_must_fail git stash branch 2>err &&
+	test_grep "No branch name specified" err
+
+No branch name specified
+ok 59 - stash branch complains with no arguments
+
+expecting success of 3903.60 'stash show format defaults to --stat': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	echo foo >>file &&
+	git stash &&
+	test_when_finished "git stash drop" &&
+	echo bar >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	cat >expected <<-EOF &&
+	 file | 1 +
+	 1 file changed, 1 insertion(+)
+	EOF
+	git stash show ${STASH_ID} >actual &&
+	test_cmp expected actual
+
+HEAD is now at 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+HEAD is now at 662e8e5 second
+Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
+HEAD is now at 662e8e5 second
+ok 60 - stash show format defaults to --stat
+
+expecting success of 3903.61 'stash show - stashes on stack, stash-like argument': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	echo foo >>file &&
+	git stash &&
+	test_when_finished "git stash drop" &&
+	echo bar >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	echo "1	0	file" >expected &&
+	git stash show --numstat ${STASH_ID} >actual &&
+	test_cmp expected actual
+
+HEAD is now at 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+HEAD is now at 662e8e5 second
+Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
+HEAD is now at 662e8e5 second
+ok 61 - stash show - stashes on stack, stash-like argument
+
+expecting success of 3903.62 'stash show -p - stashes on stack, stash-like argument': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	echo foo >>file &&
+	git stash &&
+	test_when_finished "git stash drop" &&
+	echo bar >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	cat >expected <<-EOF &&
+	diff --git a/file b/file
+	index 7601807..935fbd3 100644
+	--- a/file
+	+++ b/file
+	@@ -1 +1,2 @@
+	 baz
+	+bar
+	EOF
+	git stash show -p ${STASH_ID} >actual &&
+	diff_cmp expected actual
+
+HEAD is now at 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+HEAD is now at 662e8e5 second
+Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
+HEAD is now at 662e8e5 second
+ok 62 - stash show -p - stashes on stack, stash-like argument
+
+expecting success of 3903.63 'stash show - no stashes on stack, stash-like argument': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	echo foo >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	echo "1	0	file" >expected &&
+	git stash show --numstat ${STASH_ID} >actual &&
+	test_cmp expected actual
+
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 63 - stash show - no stashes on stack, stash-like argument
+
+expecting success of 3903.64 'stash show -p - no stashes on stack, stash-like argument': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
+	git reset --hard &&
+	echo foo >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	cat >expected <<-EOF &&
+	diff --git a/file b/file
+	index 7601807..71b52c4 100644
+	--- a/file
+	+++ b/file
+	@@ -1 +1,2 @@
+	 baz
+	+foo
+	EOF
+	git stash show -p ${STASH_ID} >actual &&
+	diff_cmp expected actual
+
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 64 - stash show -p - no stashes on stack, stash-like argument
+
+expecting success of 3903.65 'stash show --patience shows diff': 
+	git reset --hard &&
+	echo foo >>file &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	cat >expected <<-EOF &&
+	diff --git a/file b/file
+	index 7601807..71b52c4 100644
+	--- a/file
+	+++ b/file
+	@@ -1 +1,2 @@
+	 baz
+	+foo
+	EOF
+	git stash show --patience ${STASH_ID} >actual &&
+	diff_cmp expected actual
+
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 65 - stash show --patience shows diff
+
+expecting success of 3903.66 'drop: fail early if specified stash is not a stash ref': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD && git stash clear" &&
+	git reset --hard &&
+	echo foo >file &&
+	git stash &&
+	echo bar >file &&
+	git stash &&
+	test_must_fail git stash drop $(git rev-parse stash@{0}) &&
+	git stash pop &&
+	test bar = "$(cat file)" &&
+	git reset --hard HEAD
+
+HEAD is now at 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+error: 'b5efee99e793dd7b06ac07318a9440c7e09b097f' is not a stash reference
+Merging Version stash was based on with Stashed changes
+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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (b5efee99e793dd7b06ac07318a9440c7e09b097f)
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 66 - drop: fail early if specified stash is not a stash ref
+
+expecting success of 3903.67 'pop: fail early if specified stash is not a stash ref': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD && git stash clear" &&
+	git reset --hard &&
+	echo foo >file &&
+	git stash &&
+	echo bar >file &&
+	git stash &&
+	test_must_fail git stash pop $(git rev-parse stash@{0}) &&
+	git stash pop &&
+	test bar = "$(cat file)" &&
+	git reset --hard HEAD
+
+HEAD is now at 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+Saved working directory and index state WIP on main: 662e8e5 second
+error: 'b5efee99e793dd7b06ac07318a9440c7e09b097f' is not a stash reference
+Merging Version stash was based on with Stashed changes
+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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (b5efee99e793dd7b06ac07318a9440c7e09b097f)
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 67 - pop: fail early if specified stash is not a stash ref
+
+expecting success of 3903.68 'ref with non-existent reflog': 
+	git stash clear &&
+	echo bar5 >file &&
+	echo bar6 >file2 &&
+	git add file2 &&
+	git stash &&
+	test_must_fail git rev-parse --quiet --verify does-not-exist &&
+	test_must_fail git stash drop does-not-exist &&
+	test_must_fail git stash drop does-not-exist@{0} &&
+	test_must_fail git stash pop does-not-exist &&
+	test_must_fail git stash pop does-not-exist@{0} &&
+	test_must_fail git stash apply does-not-exist &&
+	test_must_fail git stash apply does-not-exist@{0} &&
+	test_must_fail git stash show does-not-exist &&
+	test_must_fail git stash show does-not-exist@{0} &&
+	test_must_fail git stash branch tmp does-not-exist &&
+	test_must_fail git stash branch tmp does-not-exist@{0} &&
+	git stash drop
+
+Saved working directory and index state WIP on main: 662e8e5 second
+error: does-not-exist is not a valid reference
+error: does-not-exist@{0} is not a valid reference
+error: does-not-exist is not a valid reference
+error: does-not-exist@{0} is not a valid reference
+error: does-not-exist is not a valid reference
+error: does-not-exist@{0} is not a valid reference
+error: does-not-exist is not a valid reference
+error: does-not-exist@{0} is not a valid reference
+error: does-not-exist is not a valid reference
+error: does-not-exist@{0} is not a valid reference
+Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
+ok 68 - ref with non-existent reflog
+
+expecting success of 3903.69 'invalid ref of the form stash@{n}, n >= N': 
+	git stash clear &&
+	test_must_fail git stash drop stash@{0} &&
+	echo bar5 >file &&
+	echo bar6 >file2 &&
+	git add file2 &&
+	git stash &&
+	test_must_fail git stash drop stash@{1} &&
+	test_must_fail git stash pop stash@{1} &&
+	test_must_fail git stash apply stash@{1} &&
+	test_must_fail git stash show stash@{1} &&
+	test_must_fail git stash branch tmp stash@{1} &&
+	git stash drop
+
+error: stash@{0} is not a valid reference
+Saved working directory and index state WIP on main: 662e8e5 second
+fatal: log for 'stash' only has 1 entries
+fatal: log for 'stash' only has 1 entries
+fatal: log for 'stash' only has 1 entries
+fatal: log for 'stash' only has 1 entries
+fatal: log for 'stash' only has 1 entries
+Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
+ok 69 - invalid ref of the form stash@{n}, n >= N
+
+expecting success of 3903.70 'invalid ref of the form "n", n >= N': 
+	git stash clear &&
+	test_must_fail git stash drop 0 &&
+	echo bar5 >file &&
+	echo bar6 >file2 &&
+	git add file2 &&
+	git stash &&
+	test_must_fail git stash drop 1 &&
+	test_must_fail git stash pop 1 &&
+	test_must_fail git stash apply 1 &&
+	test_must_fail git stash show 1 &&
+	test_must_fail git stash branch tmp 1 &&
+	git stash drop
+
+error: refs/stash@{0} is not a valid reference
+Saved working directory and index state WIP on main: 662e8e5 second
+fatal: log for 'refs/stash' only has 1 entries
+fatal: log for 'refs/stash' only has 1 entries
+fatal: log for 'refs/stash' only has 1 entries
+fatal: log for 'refs/stash' only has 1 entries
+fatal: log for 'refs/stash' only has 1 entries
+Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
+ok 70 - invalid ref of the form "n", n >= N
+
+expecting success of 3903.71 'valid ref of the form "n", n < N': 
+	git stash clear &&
+	echo bar5 >file &&
+	echo bar6 >file2 &&
+	git add file2 &&
+	git stash &&
+	git stash show 0 &&
+	git stash branch tmp 0 &&
+	git checkout main &&
+	git stash &&
+	git stash apply 0 &&
+	git reset --hard &&
+	git stash pop 0 &&
+	git stash &&
+	git stash drop 0 &&
+	test_must_fail git stash drop
+
+Saved working directory and index state WIP on main: 662e8e5 second
+ file  | 2 +-
+ file2 | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Switched to a new branch 'tmp'
+Merging Version stash was based on with Stashed changes
+On branch tmp
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file2
+
+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
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
+Switched to branch 'main'
+M	file
+A	file2
+Saved working directory and index state WIP on main: 662e8e5 second
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file2
+
+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
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+HEAD is now at 662e8e5 second
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file2
+
+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
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
+Saved working directory and index state WIP on main: 662e8e5 second
+Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
+No stash entries found.
+ok 71 - valid ref of the form "n", n < N
+
+expecting success of 3903.72 'branch: do not drop the stash if the branch exists': 
+	git stash clear &&
+	echo foo >file &&
+	git add file &&
+	git commit -m initial &&
+	echo bar >file &&
+	git stash &&
+	test_must_fail git stash branch main stash@{0} &&
+	git rev-parse stash@{0} --
+
+[main 47d5e0e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Saved working directory and index state WIP on main: 47d5e0e initial
+fatal: a branch named 'main' already exists
+68902b50f26eb6fc30df10f888c7728c286038c7
+--
+ok 72 - branch: do not drop the stash if the branch exists
+
+expecting success of 3903.73 'branch: should not drop the stash if the apply fails': 
+	git stash clear &&
+	git reset HEAD~1 --hard &&
+	echo foo >file &&
+	git add file &&
+	git commit -m initial &&
+	echo bar >file &&
+	git stash &&
+	echo baz >file &&
+	test_when_finished "git checkout main" &&
+	test_must_fail git stash branch new_branch stash@{0} &&
+	git rev-parse stash@{0} --
+
+HEAD is now at 662e8e5 second
+[main 47d5e0e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Saved working directory and index state WIP on main: 47d5e0e initial
+Switched to a new branch 'new_branch'
+M	file
+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
+Index was not unstashed.
+Merging Version stash was based on with Stashed changes
+On branch new_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:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+68902b50f26eb6fc30df10f888c7728c286038c7
+--
+Switched to branch 'main'
+M	file
+ok 73 - branch: should not drop the stash if the apply fails
+
+expecting success of 3903.74 'apply: show same status as git status (relative to ./)': 
+	git stash clear &&
+	echo 1 >subdir/subfile1 &&
+	echo 2 >subdir/subfile2 &&
+	git add subdir/subfile1 &&
+	git commit -m subdir &&
+	(
+		cd subdir &&
+		echo x >subfile1 &&
+		echo x >../file &&
+		git status >../expect &&
+		git stash &&
+		sane_unset GIT_MERGE_VERBOSITY &&
+		git stash apply
+	) |
+	sed -e 1d >actual && # drop "Saved..."
+	test_cmp expect actual
+
+[main 307367e] subdir
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 1 - setup
+ create mode 100644 subdir/subfile1
+ok 74 - apply: show same status as git status (relative to ./)
 
-expecting success of 4035.2 'git diff-tree HEAD^ HEAD': 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
-	test_line_count = 0 cnt
+expecting success of 3903.75 'stash where working directory contains "HEAD" file': 
+	git stash clear &&
+	git reset --hard &&
+	echo file-not-a-ref >HEAD &&
+	git add HEAD &&
+	test_tick &&
+	git stash &&
+	git diff-files --quiet &&
+	git diff-index --cached --quiet HEAD &&
+	test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" &&
+	git diff stash^..stash >output &&
+	diff_cmp expect output
 
-ok 2 - git diff-tree HEAD^ HEAD
+HEAD is now at 307367e subdir
+Saved working directory and index state WIP on main: 307367e subdir
+ok 75 - stash where working directory contains "HEAD" file
 
-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
+expecting success of 3903.76 'store called with invalid commit': 
+	test_must_fail git stash store foo
 
-ok 3 - git diff-tree HEAD^ HEAD -- a
+Cannot update refs/stash with foo
+ok 76 - store called with invalid commit
 
-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
+expecting success of 3903.77 'store called with non-stash commit': 
+	test_must_fail git stash store HEAD
 
-ok 4 - git diff-tree HEAD^ HEAD -- b
+fatal: '307367ef082bbeb26ff4d37194044be1a75ff404' is not a stash-like commit
+ok 77 - store called with non-stash commit
 
-expecting success of 4035.5 'echo HEAD | git diff-tree --stdin': 
-	echo $(git rev-parse HEAD) |
-	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
-	test_line_count = 1 cnt
+expecting success of 3903.78 'store updates stash ref and reflog': 
+	git stash clear &&
+	git reset --hard &&
+	echo quux >bazzy &&
+	git add bazzy &&
+	STASH_ID=$(git stash create) &&
+	git reset --hard &&
+	test_path_is_missing bazzy &&
+	git stash store -m quuxery $STASH_ID &&
+	test $(git rev-parse stash) = $STASH_ID &&
+	git reflog --format=%H stash| grep $STASH_ID &&
+	git stash pop &&
+	grep quux bazzy
 
-ok 5 - echo HEAD | git diff-tree --stdin
+HEAD is now at 307367e subdir
+HEAD is now at 307367e subdir
+47ce57b251b2eb978437ea9bbc89e32969254a93
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   bazzy
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
 
-ok 6 - git diff-tree HEAD HEAD
+Dropped refs/stash@{0} (47ce57b251b2eb978437ea9bbc89e32969254a93)
+quux
+ok 78 - store updates stash ref and reflog
 
-expecting success of 4035.7 'git diff-files': 
-	test_expect_code 0 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
+expecting success of 3903.79 'handle stash specification with spaces': 
+	git stash clear &&
+	echo pig >file &&
+	git stash &&
+	stamp=$(git log -g --format="%cd" -1 refs/stash) &&
+	test_tick &&
+	echo cow >file &&
+	git stash &&
+	git stash apply "stash@{$stamp}" &&
+	grep pig file
 
-ok 7 - git diff-files
+Saved working directory and index state WIP on main: 307367e subdir
+Saved working directory and index state WIP on main: 307367e subdir
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   bazzy
 
-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
+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
 
-ok 8 - git diff-index --cached HEAD
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
 
-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
+pig
+ok 79 - handle stash specification with spaces
 
-ok 9 - git diff-index --cached HEAD^
+expecting success of 3903.80 'setup stash with index and worktree changes': 
+	git stash clear &&
+	git reset --hard &&
+	echo index >file &&
+	git add file &&
+	echo working >file &&
+	git stash
 
-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
+HEAD is now at 307367e subdir
+Saved working directory and index state WIP on main: 307367e subdir
+ok 80 - setup stash with index and worktree changes
 
-warning: adding embedded git repository: test-outside/repo
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> test-outside/repo
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached test-outside/repo
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 10 - git diff-index --cached HEAD^
+expecting success of 3903.81 'stash list -p shows simple diff': 
+	cat >expect <<-EOF &&
+	stash@{0}
 
-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
+	diff --git a/file b/file
+	index 257cc56..d26b33d 100644
+	--- a/file
+	+++ b/file
+	@@ -1 +1 @@
+	-foo
+	+working
+	EOF
+	git stash list --format=%gd -p >actual &&
+	diff_cmp expect actual
 
-[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
+ok 81 - stash list -p shows simple diff
 
-expecting success of 4035.12 'git diff-tree -Snot-found HEAD^ HEAD -- b': 
-	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+expecting success of 3903.82 'stash list --cc shows combined diff': 
+	cat >expect <<-\EOF &&
+	stash@{0}
 
-ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
+	diff --cc file
+	index 257cc56,9015a7a..d26b33d
+	--- a/file
+	+++ b/file
+	@@@ -1,1 -1,1 +1,1 @@@
+	- foo
+	 -index
+	++working
+	EOF
+	git stash list --format=%gd -p --cc >actual &&
+	diff_cmp expect actual
 
-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 82 - stash list --cc shows combined diff
 
-ok 13 - git diff-files
+expecting success of 3903.83 'stash is not confused by partial renames': 
+	mv file renamed &&
+	git add renamed &&
+	git stash &&
+	git stash apply &&
+	test_path_is_file renamed &&
+	test_path_is_missing file
 
-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
+Saved working directory and index state WIP on main: 307367e subdir
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   renamed
 
-ok 14 - git diff-index --cached HEAD
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    file
 
-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
-	)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
 
-ok 15 - git diff, one file outside repo
+ok 83 - stash is not confused by partial renames
 
-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
-	)
+expecting success of 3903.84 'push -m shows right message': 
+	>foo &&
+	git add foo &&
+	git stash push -m "test message" &&
+	echo "stash@{0}: On main: test message" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
 
-ok 16 - git diff, both files outside repo
+Saved working directory and index state On main: test message
+ok 84 - push -m shows right message
 
-expecting success of 4035.17 'git diff --ignore-space-at-eol, one file outside repo': 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space &&
-		test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space
-	)
+expecting success of 3903.85 'push -m also works without space': 
+	>foo &&
+	git add foo &&
+	git stash push -m"unspaced test message" &&
+	echo "stash@{0}: On main: unspaced test message" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
 
-ok 17 - git diff --ignore-space-at-eol, one file outside repo
+Saved working directory and index state On main: unspaced test message
+ok 85 - push -m also works without space
 
-expecting success of 4035.18 'git diff --ignore-space-at-eol, both files outside repo': 
+expecting success of 3903.86 'store -m foo shows right message': 
+	git stash clear &&
+	git reset --hard &&
+	echo quux >bazzy &&
+	git add bazzy &&
+	STASH_ID=$(git stash create) &&
+	git stash store -m "store m" $STASH_ID &&
+	echo "stash@{0}: store m" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 307367e subdir
+ok 86 - store -m foo shows right message
+
+expecting success of 3903.87 'store -mfoo shows right message': 
+	git stash clear &&
+	git reset --hard &&
+	echo quux >bazzy &&
+	git add bazzy &&
+	STASH_ID=$(git stash create) &&
+	git stash store -m"store mfoo" $STASH_ID &&
+	echo "stash@{0}: store mfoo" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 307367e subdir
+ok 87 - store -mfoo shows right message
+
+expecting success of 3903.88 'store --message=foo shows right message': 
+	git stash clear &&
+	git reset --hard &&
+	echo quux >bazzy &&
+	git add bazzy &&
+	STASH_ID=$(git stash create) &&
+	git stash store --message="store message=foo" $STASH_ID &&
+	echo "stash@{0}: store message=foo" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 307367e subdir
+ok 88 - store --message=foo shows right message
+
+expecting success of 3903.89 'store --message foo shows right message': 
+	git stash clear &&
+	git reset --hard &&
+	echo quux >bazzy &&
+	git add bazzy &&
+	STASH_ID=$(git stash create) &&
+	git stash store --message "store message foo" $STASH_ID &&
+	echo "stash@{0}: store message foo" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 307367e subdir
+ok 89 - store --message foo shows right message
+
+expecting success of 3903.90 'push -mfoo uses right message': 
+	>foo &&
+	git add foo &&
+	git stash push -m"test mfoo" &&
+	echo "stash@{0}: On main: test mfoo" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+Saved working directory and index state On main: test mfoo
+ok 90 - push -mfoo uses right message
+
+expecting success of 3903.91 'push --message foo is synonym for -mfoo': 
+	>foo &&
+	git add foo &&
+	git stash push --message "test message foo" &&
+	echo "stash@{0}: On main: test message foo" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+Saved working directory and index state On main: test message foo
+ok 91 - push --message foo is synonym for -mfoo
+
+expecting success of 3903.92 'push --message=foo is synonym for -mfoo': 
+	>foo &&
+	git add foo &&
+	git stash push --message="test message=foo" &&
+	echo "stash@{0}: On main: test message=foo" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+Saved working directory and index state On main: test message=foo
+ok 92 - push --message=foo is synonym for -mfoo
+
+expecting success of 3903.93 'push -m shows right message': 
+	>foo &&
+	git add foo &&
+	git stash push -m "test m foo" &&
+	echo "stash@{0}: On main: test m foo" >expect &&
+	git stash list -1 >actual &&
+	test_cmp expect actual
+
+Saved working directory and index state On main: test m foo
+ok 93 - push -m shows right message
+
+expecting success of 3903.94 'create stores correct message': 
+	>foo &&
+	git add foo &&
+	STASH_ID=$(git stash create "create test message") &&
+	echo "On main: create test message" >expect &&
+	git show --pretty=%s -s ${STASH_ID} >actual &&
+	test_cmp expect actual
+
+ok 94 - create stores correct message
+
+expecting success of 3903.95 'create when branch name has /': 
+	test_when_finished "git checkout main" &&
+	git checkout -b some/topic &&
+	>foo &&
+	git add foo &&
+	STASH_ID=$(git stash create "create test message") &&
+	echo "On some/topic: create test message" >expect &&
+	git show --pretty=%s -s ${STASH_ID} >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'some/topic'
+Switched to branch 'main'
+A	foo
+ok 95 - create when branch name has /
+
+expecting success of 3903.96 'create with multiple arguments for the message': 
+	>foo &&
+	git add foo &&
+	STASH_ID=$(git stash create test untracked) &&
+	echo "On main: test untracked" >expect &&
+	git show --pretty=%s -s ${STASH_ID} >actual &&
+	test_cmp expect actual
+
+ok 96 - create with multiple arguments for the message
+
+expecting success of 3903.97 'create in a detached state': 
+	test_when_finished "git checkout main" &&
+	git checkout HEAD~1 &&
+	>foo &&
+	git add foo &&
+	STASH_ID=$(git stash create) &&
+	HEAD_ID=$(git rev-parse --short HEAD) &&
+	echo "WIP on (no branch): ${HEAD_ID} initial" >expect &&
+	git show --pretty=%s -s ${STASH_ID} >actual &&
+	test_cmp expect actual
+
+Note: switching to 'HEAD~1'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 47d5e0e initial
+A	foo
+Previous HEAD position was 47d5e0e initial
+Switched to branch 'main'
+A	foo
+ok 97 - create in a detached state
+
+expecting success of 3903.98 'stash -- <pathspec> stashes and restores the file': 
+	>foo &&
+	>bar &&
+	git add foo bar &&
+	git stash push -- foo &&
+	test_path_is_file bar &&
+	test_path_is_missing foo &&
+	git stash pop &&
+	test_path_is_file foo &&
+	test_path_is_file bar
+
+Saved working directory and index state WIP on main: 307367e subdir
+Merging Updated upstream with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   bar
+	new file:   foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
+
+Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
+ok 98 - stash -- <pathspec> stashes and restores the file
+
+expecting success of 3903.99 'stash -- <pathspec> stashes in subdirectory': 
+	mkdir sub &&
+	>foo &&
+	>bar &&
+	git add foo bar &&
 	(
-		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
-	)
+		cd sub &&
+		git stash push -- ../foo
+	) &&
+	test_path_is_file bar &&
+	test_path_is_missing foo &&
+	git stash pop &&
+	test_path_is_file foo &&
+	test_path_is_file bar
 
-ok 18 - git diff --ignore-space-at-eol, both files outside repo
+Saved working directory and index state WIP on main: 307367e subdir
+Merging Updated upstream with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   bar
+	new file:   foo
 
-expecting success of 4035.19 'git diff --ignore-all-space, one file outside repo': 
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
+
+Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
+ok 99 - stash -- <pathspec> stashes in subdirectory
+
+expecting success of 3903.100 'stash with multiple pathspec arguments': 
+	>foo &&
+	>bar &&
+	>extra &&
+	git add foo bar extra &&
+	git stash push -- foo bar &&
+	test_path_is_missing bar &&
+	test_path_is_missing foo &&
+	test_path_is_file extra &&
+	git stash pop &&
+	test_path_is_file foo &&
+	test_path_is_file bar &&
+	test_path_is_file extra
+
+Saved working directory and index state WIP on main: 307367e subdir
+Merging Updated upstream with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   bar
+	new file:   extra
+	new file:   foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
+
+Dropped refs/stash@{0} (39084c1f0c9f714051bc864ea9bde5fe251804e7)
+ok 100 - stash with multiple pathspec arguments
+
+expecting success of 3903.101 'stash with file including $IFS character': 
+	>"foo bar" &&
+	>foo &&
+	>bar &&
+	git add foo* &&
+	git stash push -- "foo b*" &&
+	test_path_is_missing "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar &&
+	git stash pop &&
+	test_path_is_file "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar
+
+Saved working directory and index state WIP on main: 307367e subdir
+Merging Updated upstream with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   bar
+	new file:   extra
+	new file:   foo
+	new file:   foo bar
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
+
+Dropped refs/stash@{0} (a0eb395f4ba4b07852ce751bcb1e058bceeddcd6)
+ok 101 - stash with file including $IFS character
+
+expecting success of 3903.102 'stash with pathspec matching multiple paths': 
+	echo original >file &&
+	echo original >other-file &&
+	git commit -m "two" file other-file &&
+	echo modified >file &&
+	echo modified >other-file &&
+	git stash push -- "*file" &&
+	echo original >expect &&
+	test_cmp expect file &&
+	test_cmp expect other-file &&
+	git stash pop &&
+	echo modified >expect &&
+	test_cmp expect file &&
+	test_cmp expect other-file
+
+[main 7a1ff97] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Saved working directory and index state WIP on main: 7a1ff97 two
+Merging Updated upstream with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   bar
+	new file:   extra
+	new file:   foo
+	new file:   foo bar
+
+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:   other-file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	usage
+
+Dropped refs/stash@{0} (a99e49675f8b387c63ffade2c2dafb4b31242b77)
+ok 102 - stash with pathspec matching multiple paths
+
+expecting success of 3903.103 'stash push -p with pathspec shows no changes only once': 
+	>foo &&
+	git add foo &&
+	git commit -m "tmp" &&
+	git stash push -p foo >actual &&
+	echo "No local changes to save" >expect &&
+	git reset --hard HEAD~ &&
+	test_cmp expect actual
+
+[main 9c8fc7b] tmp
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 extra
+ create mode 100644 foo
+ create mode 100644 foo bar
+HEAD is now at 7a1ff97 two
+ok 103 - stash push -p with pathspec shows no changes only once
+
+expecting success of 3903.104 'push <pathspec>: show no changes when there are none': 
+	>foo &&
+	git add foo &&
+	git commit -m "tmp" &&
+	git stash push foo >actual &&
+	echo "No local changes to save" >expect &&
+	git reset --hard HEAD~ &&
+	test_cmp expect actual
+
+[main a73bcf2] tmp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+HEAD is now at 7a1ff97 two
+ok 104 - push <pathspec>: show no changes when there are none
+
+expecting success of 3903.105 'push: <pathspec> not in the repository errors out': 
+	>untracked &&
+	test_must_fail git stash push untracked &&
+	test_path_is_file untracked
+
+error: pathspec ':(prefix:0)untracked' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 105 - push: <pathspec> not in the repository errors out
+
+expecting success of 3903.106 'push: -q is quiet with changes': 
+	>foo &&
+	git add foo &&
+	git stash push -q >output 2>&1 &&
+	test_must_be_empty output
+
+ok 106 - push: -q is quiet with changes
+
+expecting success of 3903.107 'push: -q is quiet with no changes': 
+	git stash push -q >output 2>&1 &&
+	test_must_be_empty output
+
+ok 107 - push: -q is quiet with no changes
+
+expecting success of 3903.108 'push: -q is quiet even if there is no initial commit': 
+	git init foo_dir &&
+	test_when_finished rm -rf foo_dir &&
 	(
-		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
+		cd foo_dir &&
+		>bar &&
+		test_must_fail git stash push -q >output 2>&1 &&
+		test_must_be_empty output
 	)
 
-ok 19 - git diff --ignore-all-space, one file outside repo
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/foo_dir/.git/
+ok 108 - push: -q is quiet even if there is no initial commit
+
+expecting success of 3903.109 'untracked files are left in place when -u is not given': 
+	>file &&
+	git add file &&
+	>untracked &&
+	git stash push file &&
+	test_path_is_file untracked
+
+Saved working directory and index state WIP on main: 7a1ff97 two
+ok 109 - untracked files are left in place when -u is not given
+
+expecting success of 3903.110 'stash without verb with pathspec': 
+	>"foo bar" &&
+	>foo &&
+	>bar &&
+	git add foo* &&
+	git stash -- "foo b*" &&
+	test_path_is_missing "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar &&
+	git stash pop &&
+	test_path_is_file "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar
+
+Saved working directory and index state WIP on main: 7a1ff97 two
+Merging Updated upstream with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   foo
+	new file:   foo bar
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	bar
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	untracked
+	usage
+
+Dropped refs/stash@{0} (ee2f40a7fbffdfcabacf51aaa804cdfb77cbd5cc)
+ok 110 - stash without verb with pathspec
+
+expecting success of 3903.111 'stash -k -- <pathspec> leaves unstaged files intact': 
+	git reset &&
+	>foo &&
+	>bar &&
+	git add foo bar &&
+	git commit -m "test" &&
+	echo "foo" >foo &&
+	echo "bar" >bar &&
+	git stash -k -- foo &&
+	test "",bar = $(cat foo),$(cat bar) &&
+	git stash pop &&
+	test foo,bar = $(cat foo),$(cat bar)
+
+[main f03eb4e] test
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 foo
+Saved working directory and index state WIP on main: f03eb4e test
+Merging Version stash was based on with Stashed changes
+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:   bar
+	modified:   foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	foo bar
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	untracked
+	usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (ba2404f46c158deabdec1768576a3ec717c3bd0e)
+ok 111 - stash -k -- <pathspec> leaves unstaged files intact
+
+expecting success of 3903.112 'stash -- <subdir> leaves untracked files in subdir intact': 
+	git reset &&
+	>subdir/untracked &&
+	>subdir/tracked1 &&
+	>subdir/tracked2 &&
+	git add subdir/tracked* &&
+	git stash -- subdir/ &&
+	test_path_is_missing subdir/tracked1 &&
+	test_path_is_missing subdir/tracked2 &&
+	test_path_is_file subdir/untracked &&
+	git stash pop &&
+	test_path_is_file subdir/tracked1 &&
+	test_path_is_file subdir/tracked2 &&
+	test_path_is_file subdir/untracked
+
+Unstaged changes after reset:
+M	bar
+M	foo
+Saved working directory and index state WIP on main: f03eb4e test
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   subdir/tracked1
+	new file:   subdir/tracked2
+
+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:   bar
+	modified:   foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	foo bar
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	subdir/untracked
+	untracked
+	usage
+
+Dropped refs/stash@{0} (2749eb7e55d7636b47e46aaec96ad1ff54f3d24c)
+ok 112 - stash -- <subdir> leaves untracked files in subdir intact
+
+expecting success of 3903.113 'stash -- <subdir> works with binary files': 
+	git reset &&
+	>subdir/untracked &&
+	>subdir/tracked &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png subdir/tracked-binary &&
+	git add subdir/tracked* &&
+	git stash -- subdir/ &&
+	test_path_is_missing subdir/tracked &&
+	test_path_is_missing subdir/tracked-binary &&
+	test_path_is_file subdir/untracked &&
+	git stash pop &&
+	test_path_is_file subdir/tracked &&
+	test_path_is_file subdir/tracked-binary &&
+	test_path_is_file subdir/untracked
 
-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
-	)
+Unstaged changes after reset:
+M	bar
+M	foo
+Saved working directory and index state WIP on main: f03eb4e test
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   subdir/tracked
+	new file:   subdir/tracked-binary
+	new file:   subdir/tracked1
+	new file:   subdir/tracked2
 
-ok 20 - git diff --ignore-all-space, both files outside repo
+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:   bar
+	modified:   foo
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	foo bar
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	subdir/untracked
+	untracked
+	usage
 
-ok 21 - git diff --quiet ignores stat-change only entries
+Dropped refs/stash@{0} (e57a3ec7bcb89795529c05afe9c1d3759e31605b)
+ok 113 - stash -- <subdir> works with binary files
 
-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 &&
+expecting success of 3903.114 'stash with user.name and user.email set works': 
+	test_config user.name "A U Thor" &&
+	test_config user.email "a.u@thor" &&
+	git stash
 
-	printf "Hello\r\nWorld\n" >crlf.txt &&
-	git diff --quiet crlf.txt
+Saved working directory and index state WIP on main: f03eb4e test
+ok 114 - stash with user.name and user.email set works
 
-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
+expecting success of 3903.115 'stash works when user.name and user.email are not set': 
+	git reset &&
+	>1 &&
+	git add 1 &&
+	echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" >expect &&
+	git stash &&
+	git show -s --format="%an <%ae>" refs/stash >actual &&
+	test_cmp expect actual &&
+	>2 &&
+	git add 2 &&
+	test_config user.useconfigonly true &&
+	(
+		sane_unset GIT_AUTHOR_NAME &&
+		sane_unset GIT_AUTHOR_EMAIL &&
+		sane_unset GIT_COMMITTER_NAME &&
+		sane_unset GIT_COMMITTER_EMAIL &&
+		test_unconfig user.email &&
+		test_unconfig user.name &&
+		test_must_fail git commit -m "should fail" &&
+		echo "git stash <git@stash>" >expect &&
+		>2 &&
+		git stash &&
+		git show -s --format="%an <%ae>" refs/stash >actual &&
+		test_cmp expect actual
+	)
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4039-diff-assume-unchanged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
+Saved working directory and index state WIP on main: f03eb4e test
+Author identity unknown
 
-[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
+*** Please tell me who you are.
 
-expecting success of 4039.2 'diff-index does not examine assume-unchanged entries': 
-	git diff-index HEAD^ -- one | grep -q $blob
+Run
 
-ok 2 - diff-index does not examine assume-unchanged entries
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
 
-expecting success of 4039.3 'diff-files does not examine assume-unchanged entries': 
-	rm one &&
-	test -z "$(git diff-files -- one)"
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
 
-ok 3 - diff-files does not examine assume-unchanged entries
+fatal: no email was given and auto-detection is disabled
+Saved working directory and index state WIP on main: f03eb4e test
+ok 115 - stash works when user.name and user.email are not set
 
-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
+expecting success of 3903.116 'stash --keep-index with file deleted in index does not resurrect it on disk': 
+	test_commit to-remove to-remove &&
+	git rm to-remove &&
+	git stash --keep-index &&
+	test_path_is_missing to-remove
 
-[master 4cf4df7] exec
+[main ebe821f] to-remove
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100755 exec
-ok 4 - find-copies-harder is not confused by mode bits
+ create mode 100644 to-remove
+rm 'to-remove'
+Saved working directory and index state WIP on main: ebe821f to-remove
+ok 116 - stash --keep-index with file deleted in index does not resurrect it on disk
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4040-whitespace-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4040-whitespace-status/.git/
-expecting success of 4040.1 'setup': 
-	mkdir a b &&
-	echo >c &&
-	echo >a/d &&
-	echo >b/e &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-	echo " " >a/d &&
-	test_tick &&
-	git commit -a -m second &&
-	echo "  " >a/d &&
-	echo " " >b/e &&
-	git add a/d
+expecting success of 3903.117 'stash --keep-index --include-untracked with empty tree': 
+	test_when_finished "rm -rf empty" &&
+	git init empty &&
+	(
+		cd empty &&
+		git commit --allow-empty --message "empty" &&
+		echo content >file &&
+		git stash push --keep-index --include-untracked &&
+		test_path_is_missing file &&
+		git stash pop &&
+		echo content >expect &&
+		test_cmp expect file
+	)
 
-[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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/empty/.git/
+[main (root-commit) 7812b59] empty
  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
+Saved working directory and index state WIP on main: 7812b59 empty
+Merging Version stash was based on with Stashed changes
+Already up to date.
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	file
 
-ok 3 - diff-tree -b --exit-code
+nothing added to commit but untracked files present (use "git add" to track)
+Dropped refs/stash@{0} (52b67168d00fa877d08441e3c26c6e24e4a24f3c)
+ok 117 - stash --keep-index --include-untracked with empty tree
 
-expecting success of 4040.4 'diff-index --cached --exit-code': 
-	test_must_fail git diff --cached --exit-code HEAD &&
-	test_must_fail git diff-index --cached --exit-code HEAD
+expecting success of 3903.118 'stash apply should succeed with unmodified file': 
+	echo base >file &&
+	git add file &&
+	git commit -m base &&
 
-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
+	# now stash a modification
+	echo modified >file &&
+	git stash &&
 
-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
+	# make the file stat dirty
+	cp file other &&
+	mv other file &&
 
-ok 5 - diff-index -b -p --cached --exit-code
+	git stash apply
 
-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
+[main 618e8ea] base
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ delete mode 100644 to-remove
+Saved working directory and index state WIP on main: 618e8ea base
+Merging Version stash was based on with Stashed changes
+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:   file
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	foo bar
+	out
+	output
+	output.out
+	repo/
+	subdir/subfile2
+	subdir/untracked
+	untracked
+	usage
 
-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
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 118 - stash apply should succeed with unmodified file
 
-ok 7 - diff-index -b -p --exit-code
+expecting success of 3903.119 'stash handles skip-worktree entries nicely': 
+	test_commit A &&
+	echo changed >A.t &&
+	git add A.t &&
+	git update-index --skip-worktree A.t &&
+	rm A.t &&
+	git stash &&
 
-expecting success of 4040.8 'diff-files --exit-code': 
-	test_must_fail git diff --exit-code &&
-	test_must_fail git diff-files --exit-code
+	git rev-parse --verify refs/stash:A.t
 
-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
+[main 3d10817] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Saved working directory and index state WIP on main: 3d10817 A
+5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+ok 119 - stash handles skip-worktree entries nicely
 
-expecting success of 4040.9 'diff-files -b -p --exit-code': 
-	git diff -b --exit-code &&
-	git diff-files -b -p --exit-code
+expecting success of 3903.120 'stash with core.fsyncmethod=batch': 
+	test_create_unique_files 2 4 files_base_dir &&
+	GIT_TEST_FSYNC=1 git -c core.fsync=loose-object -c core.fsyncmethod=batch stash push -u -- ./files_base_dir/ &&
 
-ok 9 - diff-files -b -p --exit-code
+	# The files were untracked, so use the third parent,
+	# which contains the untracked files
+	git ls-tree -r stash^3 -- ./files_base_dir/ |
+	test_parse_ls_tree_oids >stashed_files_oids &&
 
-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
+	# We created 2 dirs with 4 files each (8 files total) above
+	test_line_count = 8 stashed_files_oids &&
+	git cat-file --batch-check='%(objectname)' <stashed_files_oids >stashed_files_actual &&
+	test_cmp stashed_files_oids stashed_files_actual
 
-HEAD is now at 13a0478 second
-ok 10 - diff-files --diff-filter --quiet
+Saved working directory and index state WIP on main: 3d10817 A
+ok 120 - stash with core.fsyncmethod=batch
 
-expecting success of 4040.11 'diff-tree --diff-filter --quiet': 
-	git commit -a -m "worktree state" &&
-	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
+expecting success of 3903.121 'git stash succeeds despite directory/file change': 
+	test_create_repo directory_file_switch_v1 &&
+	(
+		cd directory_file_switch_v1 &&
+		test_commit init &&
 
-[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
+		test_write_lines this file has some words >filler &&
+		git add filler &&
+		git commit -m filler &&
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4043-diff-rename-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
+		git rm filler &&
+		mkdir filler &&
+		echo contents >filler/file &&
+		git stash push
+	)
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4043-diff-rename-binary/.git/
-[master (root-commit) 07508f6] Initial commit
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/directory_file_switch_v1/.git/
+[main (root-commit) 23406b7] init
  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/
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[main 90d1f39] filler
  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
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+rm 'filler'
+Saved working directory and index state WIP on main: 90d1f39 filler
+ok 121 - git stash succeeds despite directory/file change
 
-expecting success of 4043.3 'git show -C -C report renames': 
-	git show -C -C --raw --binary --numstat >patch-with-stat &&
-	tail -n 11 patch-with-stat >current &&
-	test_cmp expected current
+expecting success of 3903.122 'git stash can pop file -> directory saved changes': 
+	test_create_repo directory_file_switch_v2 &&
+	(
+		cd directory_file_switch_v2 &&
+		test_commit init &&
 
-ok 3 - git show -C -C report renames
+		test_write_lines this file has some words >filler &&
+		git add filler &&
+		git commit -m filler &&
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4042-diff-textconv-caching.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4042-diff-textconv-caching/.git/
-expecting success of 4042.1 'setup': 
-	echo foo content 1 >foo.bin &&
-	echo bar content 1 >bar.bin &&
-	git add . &&
-	git commit -m one &&
-	foo1=$(git rev-parse --short HEAD:foo.bin) &&
-	bar1=$(git rev-parse --short HEAD:bar.bin) &&
-	echo foo content 2 >foo.bin &&
-	echo bar content 2 >bar.bin &&
-	git commit -a -m two &&
-	foo2=$(git rev-parse --short HEAD:foo.bin) &&
-	bar2=$(git rev-parse --short HEAD:bar.bin) &&
-	echo "*.bin diff=magic" >.gitattributes &&
-	git config diff.magic.textconv ./helper &&
-	git config diff.magic.cachetextconv true
+		git rm filler &&
+		mkdir filler &&
+		echo contents >filler/file &&
+		cp filler/file expect &&
+		git stash push --include-untracked &&
+		git stash apply --index &&
+		test_cmp expect filler/file
+	)
 
-[master (root-commit) e62c20e] one
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/directory_file_switch_v2/.git/
+[main (root-commit) 23406b7] init
  Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 bar.bin
- create mode 100644 foo.bin
- create mode 100755 helper
-[master ea2ff12] two
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[main 90d1f39] filler
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
-
-expecting success of 4042.2 'first textconv works': 
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - first textconv works
-
-expecting success of 4042.3 'cached textconv produces same output': 
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+ 1 file changed, 5 insertions(+)
+ create mode 100644 filler
+rm 'filler'
+Saved working directory and index state WIP on main: 90d1f39 filler
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	deleted:    filler
 
-ok 3 - cached textconv produces same output
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	filler/
 
-expecting success of 4042.4 'cached textconv does not run helper': 
-	rm -f helper.out &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual &&
-	! test -r helper.out
+ok 122 - git stash can pop file -> directory saved changes
 
-ok 4 - cached textconv does not run helper
+expecting success of 3903.123 'git stash can pop directory -> file saved changes': 
+	test_create_repo directory_file_switch_v3 &&
+	(
+		cd directory_file_switch_v3 &&
+		test_commit init &&
 
-expecting success of 4042.5 'changing textconv invalidates cache': 
-	echo other >other &&
-	git config diff.magic.textconv "./helper other" &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+		mkdir filler &&
+		test_write_lines some words >filler/file1 &&
+		test_write_lines and stuff >filler/file2 &&
+		git add filler &&
+		git commit -m filler &&
 
-ok 5 - changing textconv invalidates cache
+		git rm -rf filler &&
+		echo contents >filler &&
+		cp filler expect &&
+		git stash push --include-untracked &&
+		git stash apply --index &&
+		test_cmp expect filler
+	)
 
-expecting success of 4042.6 'switching diff driver produces correct results': 
-	git config diff.moremagic.textconv ./helper &&
-	echo foo.bin diff=moremagic >>.gitattributes &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/directory_file_switch_v3/.git/
+[main (root-commit) 23406b7] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[main 7b72c0a] filler
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 filler/file1
+ create mode 100644 filler/file2
+rm 'filler/file1'
+rm 'filler/file2'
+Saved working directory and index state WIP on main: 7b72c0a filler
+Merging Version stash was based on with Stashed changes
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	deleted:    filler/file1
+	deleted:    filler/file2
 
-ok 6 - switching diff driver produces correct results
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	filler
 
-expecting success of 4042.7 'log notes cache and still use cache for -p': 
-	git log --no-walk -p refs/notes/textconv/magic HEAD
+ok 123 - git stash can pop directory -> file saved changes
 
-commit 9c639377525bb0485f64e3a844123312ec98541e
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+expecting success of 3903.124 'restore untracked files even when we hit conflicts': 
+	git init restore_untracked_after_conflict &&
+	(
+		cd restore_untracked_after_conflict &&
 
-    ./helper other
+		echo hi >a &&
+		echo there >b &&
+		git add . &&
+		git commit -m first &&
+		echo hello >a &&
+		echo something >c &&
 
-diff --git a/1345db2c9189a61ef9932f66b656afc986bee58f b/1345db2c9189a61ef9932f66b656afc986bee58f
-new file mode 100644
-index 0000000..01b25c5
---- /dev/null
-+++ b/1345db2c9189a61ef9932f66b656afc986bee58f
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: foo content 2
-diff --git a/28283d51eeb71548ff81d02404b90103b494b983 b/28283d51eeb71548ff81d02404b90103b494b983
-new file mode 100644
-index 0000000..dcd63a4
---- /dev/null
-+++ b/28283d51eeb71548ff81d02404b90103b494b983
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: bar content 2
-diff --git a/d5b9fe314e6004caf906e730045d20689167b3fb b/d5b9fe314e6004caf906e730045d20689167b3fb
-new file mode 100644
-index 0000000..7ef0353
---- /dev/null
-+++ b/d5b9fe314e6004caf906e730045d20689167b3fb
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: foo content 1
-diff --git a/fcf91668044fda4a569b9374589b26dada7adc49 b/fcf91668044fda4a569b9374589b26dada7adc49
-new file mode 100644
-index 0000000..5ead606
---- /dev/null
-+++ b/fcf91668044fda4a569b9374589b26dada7adc49
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: bar content 1
+		git stash push --include-untracked &&
 
-commit ea2ff12718498fa427bb0f1e263e2ba2e26a440d
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+		echo conflict >a &&
+		git add a &&
+		git commit -m second &&
 
-    two
+		test_must_fail git stash pop &&
 
-diff --git a/bar.bin b/bar.bin
-index fcf9166..28283d5 100644
---- a/bar.bin
-+++ b/bar.bin
-@@ -1,2 +1,2 @@
- converted: other
--converted: bar content 1
-+converted: bar content 2
-diff --git a/foo.bin b/foo.bin
-index d5b9fe3..1345db2 100644
---- a/foo.bin
-+++ b/foo.bin
-@@ -1 +1 @@
--converted: foo content 1
-+converted: foo content 2
-ok 7 - log notes cache and still use cache for -p
+		test_path_is_file c
+	)
 
-expecting success of 4042.8 'caching is silently ignored outside repo': 
-	mkdir -p non-repo &&
-	echo one >non-repo/one &&
-	echo two >non-repo/two &&
-	echo "* diff=test" >attr &&
-	test_expect_code 1 \
-	nongit git -c core.attributesFile="$PWD/attr" \
-		   -c diff.test.textconv="tr a-z A-Z <" \
-		   -c diff.test.cachetextconv=true \
-		   diff --no-index one two >actual &&
-	cat >expect <<-\EOF &&
-	diff --git a/one b/two
-	index 5626abf..f719efd 100644
-	--- a/one
-	+++ b/two
-	@@ -1 +1 @@
-	-ONE
-	+TWO
-	EOF
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/restore_untracked_after_conflict/.git/
+[main (root-commit) fab7b0e] first
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Saved working directory and index state WIP on main: fab7b0e first
+[main 3101a13] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging Updated upstream with Stashed changes
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+On branch main
+Unmerged paths:
+  (use "git restore --staged <file>..." to unstage)
+  (use "git add <file>..." to mark resolution)
+	both modified:   a
 
-ok 8 - caching is silently ignored outside repo
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	c
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4044-diff-index-unique-abbrev.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4044-diff-index-unique-abbrev/.git/
-expecting success of 4044.1 'setup': 
-	test_oid_cache <<-EOF &&
-	val1 sha1:4827
-	val1 sha256:5664
+no changes added to commit (use "git add" and/or "git commit -a")
+The stash entry is kept in case you need it again.
+ok 124 - restore untracked files even when we hit conflicts
 
-	val2 sha1:11742
-	val2 sha256:10625
+expecting success of 3903.125 'stash create reports a locked index': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A A.file &&
+		echo change >A.file &&
+		touch .git/index.lock &&
 
-	hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1
-	hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350
+		cat >expect <<-EOF &&
+		error: could not write index
+		EOF
+		test_must_fail git stash create 2>err &&
+		test_cmp expect err
+	)
 
-	hasht1 sha1:51d27384
-	hasht1 sha256:ae31dfff
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
+[main df044f8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.file
+ok 125 - stash create reports a locked index
 
-	hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47
-	hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5
+expecting success of 3903.126 'stash push reports a locked index': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A A.file &&
+		echo change >A.file &&
+		touch .git/index.lock &&
 
-	hasht2 sha1:51d2738e
-	hasht2 sha256:ae31dffa
-	EOF
+		cat >expect <<-EOF &&
+		error: could not write index
+		EOF
+		test_must_fail git stash push 2>err &&
+		test_cmp expect err
+	)
 
-	cat >expect_initial <<-EOF &&
-	100644 blob $(test_oid hash1)	foo
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
+[main (root-commit) a7c3470] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.file
+ok 126 - stash push reports a locked index
 
-	cat >expect_update <<-EOF &&
-	100644 blob $(test_oid hash2)	foo
-	EOF
+expecting success of 3903.127 'stash apply reports a locked index': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		test_commit A A.file &&
+		echo change >A.file &&
+		git stash push &&
+		touch .git/index.lock &&
 
-	test_oid val1 > foo &&
-	git add foo &&
-	git commit -m "initial" &&
-	git cat-file -p HEAD: > actual &&
-	test_cmp expect_initial actual &&
-	test_oid val2 > foo &&
-	git commit -a -m "update" &&
-	git cat-file -p HEAD: > actual &&
-	test_cmp expect_update actual
+		cat >expect <<-EOF &&
+		error: could not write index
+		EOF
+		test_must_fail git stash apply 2>err &&
+		test_cmp expect err
+	)
 
-[master (root-commit) eaa2693] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
+[main (root-commit) a7c3470] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 90cb371] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4044.2 'diff does not produce ambiguous index line': 
-	git diff HEAD^..HEAD | grep index > actual &&
-	test_cmp expect actual
-
-ok 2 - diff does not produce ambiguous index line
+ create mode 100644 A.file
+Saved working directory and index state WIP on main: a7c3470 A
+ok 127 - stash apply reports a locked index
 
-# passed all 2 test(s)
-1..2
+# still have 2 known breakage(s)
+# passed all remaining 125 test(s)
+1..127
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t3432-rebase-fast-forward.sh ***
@@ -238568,2408 +238758,2098 @@
 1..225
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4046-diff-unmerged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4046-diff-unmerged/.git/
-expecting success of 4046.1 'setup': 
-	for i in 0 1 2 3
-	do
-		blob=$(echo $i | git hash-object --stdin) &&
-		eval "blob$i=$blob" &&
-		eval "m$i=\"100644 \$blob$i $i\"" || return 1
-	done &&
-	paths= &&
-	for b in o x
-	do
-		for o in o x
-		do
-			for t in o x
-			do
-				path="$b$o$t" &&
-				if test "$path" != ooo
-				then
-					paths="$paths$path " &&
-					p="	$path" &&
-					case "$b" in x) echo "$m1$p" ;; esac &&
-					case "$o" in x) echo "$m2$p" ;; esac &&
-					case "$t" in x) echo "$m3$p" ;; esac ||
-					return 1
-				fi
-			done
-		done
-	done >ls-files-s.expect &&
-	git update-index --index-info <ls-files-s.expect &&
-	git ls-files -s >ls-files-s.actual &&
-	test_cmp ls-files-s.expect ls-files-s.actual
+*** t4030-diff-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4030-diff-textconv/.git/
+expecting success of 4030.1 'setup binary file with history': 
+	test_commit --printf one file "\\0\\n" &&
+	test_commit --printf --append two file "\\01\\n"
 
-ok 1 - setup
+[master (root-commit) f1b27dd] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master e1c09e5] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 1 - setup binary file with history
 
-expecting success of 4046.2 'diff-files -0': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" || return 1
-	done >diff-files-0.expect &&
-	git diff-files -0 >diff-files-0.actual &&
-	test_cmp diff-files-0.expect diff-files-0.actual
+expecting success of 4030.2 'file is considered binary by porcelain': 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
 
-ok 2 - diff-files -0
+ok 2 - file is considered binary by porcelain
 
-expecting success of 4046.3 'diff-files -1': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
-		case "$path" in
-		x??) echo ":100644 100644 $blob1 $ZERO_OID M	$path"
-		esac || return 1
-	done >diff-files-1.expect &&
-	git diff-files -1 >diff-files-1.actual &&
-	test_cmp diff-files-1.expect diff-files-1.actual
+expecting success of 4030.3 'file is considered binary by plumbing': 
+	git diff-tree -p HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
 
-ok 3 - diff-files -1
+ok 3 - file is considered binary by plumbing
 
-expecting success of 4046.4 'diff-files -2': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
-		case "$path" in
-		?x?) echo ":100644 100644 $blob2 $ZERO_OID M	$path"
-		esac || return 1
-	done >diff-files-2.expect &&
-	git diff-files -2 >diff-files-2.actual &&
-	test_cmp diff-files-2.expect diff-files-2.actual &&
-	git diff-files >diff-files-default-2.actual &&
-	test_cmp diff-files-2.expect diff-files-default-2.actual
+expecting success of 4030.4 'setup textconv filters': 
+	echo file diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/hexdump &&
+	git config diff.fail.textconv false
 
-ok 4 - diff-files -2
+ok 4 - setup textconv filters
 
-expecting success of 4046.5 'diff-files -3': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
-		case "$path" in
-		??x) echo ":100644 100644 $blob3 $ZERO_OID M	$path"
-		esac || return 1
-	done >diff-files-3.expect &&
-	git diff-files -3 >diff-files-3.actual &&
-	test_cmp diff-files-3.expect diff-files-3.actual
+expecting success of 4030.5 'diff produces text': 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
 
-ok 5 - diff-files -3
+ok 5 - diff produces text
 
-expecting success of 4046.6 'diff --stat': 
-	for path in $paths
-	do
-		echo " $path | Unmerged" || return 1
-	done >diff-stat.expect &&
-	echo " 0 files changed" >>diff-stat.expect &&
-	git diff --cached --stat >diff-stat.actual &&
-	test_cmp diff-stat.expect diff-stat.actual
+expecting success of 4030.6 'show commit produces text': 
+	git show HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
 
-ok 6 - diff --stat
+ok 6 - show commit produces text
 
-expecting success of 4046.7 'diff --quiet': 
-	test_expect_code 1 git diff --cached --quiet
+expecting success of 4030.7 'diff-tree produces binary': 
+	git diff-tree -p HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
 
-ok 7 - diff --quiet
+ok 7 - diff-tree produces binary
 
-expecting success of 4046.8 'diff --quiet --ignore-all-space': 
-	test_expect_code 1 git diff --cached --quiet --ignore-all-space
+expecting success of 4030.8 'log produces text': 
+	git log -1 -p >log &&
+	find_diff <log >actual &&
+	test_cmp expect.text actual
 
-ok 8 - diff --quiet --ignore-all-space
+ok 8 - log produces text
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t3903-stash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/.git/
-expecting success of 3903.1 'usage on cmd and subcommand invalid option': 
-	test_expect_code 129 git stash --invalid-option 2>usage &&
-	grep "or: git stash" usage &&
+expecting success of 4030.9 'format-patch produces binary': 
+	git format-patch --no-binary --stdout HEAD^ >patch &&
+	find_diff <patch >actual &&
+	test_cmp expect.binary actual
 
-	test_expect_code 129 git stash push --invalid-option 2>usage &&
-	! grep "or: git stash" usage
+ok 9 - format-patch produces binary
 
-   or: git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
-   or: git stash drop [-q | --quiet] [<stash>]
-   or: git stash pop [--index] [-q | --quiet] [<stash>]
-   or: git stash apply [--index] [-q | --quiet] [<stash>]
-   or: git stash branch <branchname> [<stash>]
-   or: git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
-   or: git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
-   or: git stash clear
-   or: git stash create [<message>]
-   or: git stash store [(-m | --message) <message>] [-q | --quiet] <commit>
-ok 1 - usage on cmd and subcommand invalid option
+expecting success of 4030.10 'status -v produces text': 
+	git reset --soft HEAD^ &&
+	git status -v >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual &&
+	git reset --soft HEAD@{1}
 
-expecting success of 3903.2 'usage on main command -h emits a summary of subcommands': 
-	test_expect_code 129 git stash -h >usage &&
-	grep -F "usage: git stash list" usage &&
-	grep -F "or: git stash show" usage
+ok 10 - status -v produces text
 
-usage: git stash list [<log-options>]
-   or: git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
-ok 2 - usage on main command -h emits a summary of subcommands
+expecting success of 4030.11 'show blob produces binary': 
+	git show HEAD:file >actual &&
+	printf "\\0\\n\\01\\n" >expect &&
+	test_cmp expect actual
 
-expecting success of 3903.3 'usage for subcommands should emit subcommand usage': 
-	test_expect_code 129 git stash push -h >usage &&
-	grep -F "usage: git stash [push" usage
+ok 11 - show blob produces binary
 
-usage: git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
-ok 3 - usage for subcommands should emit subcommand usage
+expecting success of 4030.12 'show --textconv blob produces text': 
+	git show --textconv HEAD:file >actual &&
+	printf "0\\n1\\n" >expect &&
+	test_cmp expect actual
 
-expecting success of 3903.4 'stash some dirty working directory': 
-	setup_stash
+ok 12 - show --textconv blob produces text
 
-[main (root-commit) fe7e97b] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 other-file
-Saved working directory and index state WIP on main: fe7e97b initial
-ok 4 - stash some dirty working directory
+expecting success of 4030.13 'show --no-textconv blob produces binary': 
+	git show --no-textconv HEAD:file >actual &&
+	printf "\\0\\n\\01\\n" >expect &&
+	test_cmp expect actual
 
-expecting success of 3903.5 'parents of stash': 
-	test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
-	git diff stash^2..stash >output &&
-	diff_cmp expect output
+ok 13 - show --no-textconv blob produces binary
 
-ok 5 - parents of stash
+expecting success of 4030.14 'grep-diff (-G) operates on textconv data (add)': 
+	echo one >expect &&
+	git log --root --format=%s -G0 >actual &&
+	test_cmp expect actual
 
-expecting success of 3903.6 'applying bogus stash does nothing': 
-	test_must_fail git stash apply stash@{1} &&
-	echo 1 >expect &&
-	test_cmp expect file
+ok 14 - grep-diff (-G) operates on textconv data (add)
 
-fatal: log for 'stash' only has 1 entries
-ok 6 - applying bogus stash does nothing
+expecting success of 4030.15 'grep-diff (-G) operates on textconv data (modification)': 
+	echo two >expect &&
+	git log --root --format=%s -G1 >actual &&
+	test_cmp expect actual
 
-expecting success of 3903.7 'apply does not need clean working directory': 
-	echo 4 >other-file &&
-	git stash apply &&
-	echo 3 >expect &&
-	test_cmp expect file
+ok 15 - grep-diff (-G) operates on textconv data (modification)
 
-Merging Version stash was based on with Stashed changes
-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:   file
-	modified:   other-file
+expecting success of 4030.16 'pickaxe (-S) operates on textconv data (add)': 
+	echo one >expect &&
+	git log --root --format=%s -S0 >actual &&
+	test_cmp expect actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+ok 16 - pickaxe (-S) operates on textconv data (add)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 7 - apply does not need clean working directory
+expecting success of 4030.17 'pickaxe (-S) operates on textconv data (modification)': 
+	echo two >expect &&
+	git log --root --format=%s -S1 >actual &&
+	test_cmp expect actual
 
-expecting success of 3903.8 'apply does not clobber working directory changes': 
-	git reset --hard &&
-	echo 4 >file &&
-	test_must_fail git stash apply &&
-	echo 4 >expect &&
-	test_cmp expect file
+ok 17 - pickaxe (-S) operates on textconv data (modification)
 
-HEAD is now at fe7e97b initial
-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
-Merging Version stash was based on with Stashed changes
-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:   file
+expecting success of 4030.18 'diffstat does not run textconv': 
+	echo file diff=fail >.gitattributes &&
+	git diff --stat HEAD^ HEAD >actual &&
+	test_cmp expect.stat actual &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+	head -n1 <expect.stat >expect.line1 &&
+	head -n1 <actual >actual.line1 &&
+	test_cmp expect.line1 actual.line1
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 8 - apply does not clobber working directory changes
+ok 18 - diffstat does not run textconv
 
-expecting success of 3903.9 'apply stashed changes': 
-	git reset --hard &&
-	echo 5 >other-file &&
-	git add other-file &&
-	test_tick &&
-	git commit -m other-file &&
-	git stash apply &&
-	test 3 = $(cat file) &&
-	test 1 = $(git show :file) &&
-	test 1 = $(git show HEAD:file)
+expecting success of 4030.19 'textconv does not act on symlinks': 
+	rm -f file &&
+	test_ln_s_add frotz file &&
+	git commit -m typechange &&
+	git show >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.typechange actual
 
-HEAD is now at fe7e97b initial
-[main 4db481e] other-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merging Updated upstream with Stashed changes
-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:   file
+checking prerequisite: SYMLINKS
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 9 - apply stashed changes
+)
+prerequisite SYMLINKS ok
+[master 552bf47] typechange
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 120000 file
+ok 19 - textconv does not act on symlinks
 
-expecting success of 3903.10 'apply stashed changes (including index)': 
-	git reset --hard HEAD^ &&
-	echo 6 >other-file &&
-	git add other-file &&
-	test_tick &&
-	git commit -m other-file &&
-	git stash apply --index &&
-	test 3 = $(cat file) &&
-	test 2 = $(git show :file) &&
-	test 1 = $(git show HEAD:file)
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4033-diff-patience.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-HEAD is now at fe7e97b initial
-[main da68008] other-file
++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(-)
-Merging Updated upstream with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   file
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   file
+Switched to branch 'master'
+Cloning into bare repository 'bare.git'...
+ok 2 - setup attributes files for tests with patience
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+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
 
-ok 10 - apply stashed changes (including index)
+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 3903.11 'unstashing in a subdirectory': 
-	git reset --hard HEAD &&
-	mkdir subdir &&
-	(
-		cd subdir &&
-		git stash apply
-	)
+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
 
-HEAD is now at da68008 other-file
-Merging Updated upstream with Stashed changes
-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:   ../file
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	../expect
-	../output
-	../usage
+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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 11 - unstashing in a subdirectory
+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 3903.12 'stash drop complains of extra options': 
-	test_must_fail git stash drop --foo
+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
 
-error: unknown option `foo'
-usage: git stash drop [-q | --quiet] [<stash>]
+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
 
-    -q, --[no-]quiet      be quiet, only report errors
+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
 
-ok 12 - stash drop complains of extra options
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4036-format-patch-signer-mime.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4036-format-patch-signer-mime/.git/
+expecting success of 4036.1 'setup': 
 
-expecting success of 3903.13 'drop top stash': 
-	git reset --hard &&
-	git stash list >expected &&
-	echo 7 >file &&
-	git stash &&
-	git stash drop &&
-	git stash list >actual &&
-	test_cmp expected actual &&
-	git stash apply &&
-	test 3 = $(cat file) &&
-	test 1 = $(git show :file) &&
-	test 1 = $(git show HEAD:file)
+	>F &&
+	git add F &&
+	git commit -m initial &&
+	echo new line >F &&
 
-HEAD is now at da68008 other-file
-Saved working directory and index state WIP on main: da68008 other-file
-Dropped refs/stash@{0} (cb250e8e47ab685a401a9258b861903a94581a26)
-Merging Updated upstream with Stashed changes
-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:   file
+	test_tick &&
+	git commit -m "This adds some lines to F" F
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 13 - drop top stash
+[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 3903.14 'drop middle stash': 
-	git reset --hard &&
-	echo 8 >file &&
-	git stash &&
-	echo 9 >file &&
-	git stash &&
-	git stash drop stash@{1} &&
-	test 2 = $(git stash list | wc -l) &&
-	git stash apply &&
-	test 9 = $(cat file) &&
-	test 1 = $(git show :file) &&
-	test 1 = $(git show HEAD:file) &&
-	git reset --hard &&
-	git stash drop &&
-	git stash apply &&
-	test 3 = $(cat file) &&
-	test 1 = $(git show :file) &&
-	test 1 = $(git show HEAD:file)
+expecting success of 4036.2 'format normally': 
 
-HEAD is now at da68008 other-file
-Saved working directory and index state WIP on main: da68008 other-file
-Saved working directory and index state WIP on main: da68008 other-file
-Dropped stash@{1} (5b715756e7f660ba9dd1619de9e5a4b24a06b7c3)
-Merging Version stash was based on with Stashed changes
-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:   file
+	git format-patch --stdout -1 >output &&
+	! grep Content-Type output
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
 
-no changes added to commit (use "git add" and/or "git commit -a")
-HEAD is now at da68008 other-file
-Dropped refs/stash@{0} (236c59f58e239e74e90b6832a98fa4b7f4b33647)
-Merging Updated upstream with Stashed changes
-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:   file
+ok 2 - format normally
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
+expecting success of 4036.3 'format with signoff without funny signer name': 
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 14 - drop middle stash
+	git format-patch -s --stdout -1 >output &&
+	! grep Content-Type output
 
-expecting success of 3903.15 'drop middle stash by index': 
-	git reset --hard &&
-	echo 8 >file &&
-	git stash &&
-	echo 9 >file &&
-	git stash &&
-	git stash drop 1 &&
-	test 2 = $(git stash list | wc -l) &&
-	git stash apply &&
-	test 9 = $(cat file) &&
-	test 1 = $(git show :file) &&
-	test 1 = $(git show HEAD:file) &&
-	git reset --hard &&
-	git stash drop &&
-	git stash apply &&
-	test 3 = $(cat file) &&
-	test 1 = $(git show :file) &&
-	test 1 = $(git show HEAD:file)
 
-HEAD is now at da68008 other-file
-Saved working directory and index state WIP on main: da68008 other-file
-Saved working directory and index state WIP on main: da68008 other-file
-Dropped refs/stash@{1} (5b715756e7f660ba9dd1619de9e5a4b24a06b7c3)
-Merging Version stash was based on with Stashed changes
-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:   file
+ok 3 - format with signoff without funny signer name
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
+expecting success of 4036.4 'format with non ASCII signer name': 
 
-no changes added to commit (use "git add" and/or "git commit -a")
-HEAD is now at da68008 other-file
-Dropped refs/stash@{0} (236c59f58e239e74e90b6832a98fa4b7f4b33647)
-Merging Updated upstream with Stashed changes
-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:   file
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 >output &&
+	grep Content-Type output
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 15 - drop middle stash by index
+Content-Type: text/plain; charset=UTF-8
+ok 4 - format with non ASCII signer name
 
-expecting success of 3903.16 'drop stash reflog updates refs/stash': 
-	git reset --hard &&
-	git rev-parse refs/stash >expect &&
-	echo 9 >file &&
-	git stash &&
-	git stash drop stash@{0} &&
-	git rev-parse refs/stash >actual &&
-	test_cmp expect actual
+expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
 
-HEAD is now at da68008 other-file
-Saved working directory and index state WIP on main: da68008 other-file
-Dropped stash@{0} (236c59f58e239e74e90b6832a98fa4b7f4b33647)
-ok 16 - drop stash reflog updates refs/stash
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 --attach >output &&
+	test $(grep -ci ^MIME-Version: output) = 1
 
-expecting success of 3903.17 'drop stash reflog updates refs/stash with rewrite': 
-	git init repo &&
-	(
-		cd repo &&
-		setup_stash
-	) &&
-	echo 9 >repo/file &&
 
-	old_oid="$(git -C repo rev-parse stash@{0})" &&
-	git -C repo stash &&
-	new_oid="$(git -C repo rev-parse stash@{0})" &&
+ok 5 - attach and signoff do not duplicate mime headers
 
-	cat >expect <<-EOF &&
-	$new_oid
-	$old_oid
-	EOF
-	git -C repo reflog show refs/stash --format=%H >actual &&
-	test_cmp expect actual &&
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4037-diff-r-t-dirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-	git -C repo stash drop stash@{1} &&
-	git -C repo reflog show refs/stash --format=%H >actual &&
-	cat >expect <<-EOF &&
-	$new_oid
-	EOF
-	test_cmp expect actual
+	rm -fr dt dr ft fr &&
+	mkdir da ft &&
+	for p in dc/1 da/4 dt ft/5 fc
+	do
+		echo hello >$p || exit
+	done &&
+	git add -u &&
+	git add . &&
+	test_tick &&
+	git commit -m second
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
-[main (root-commit) c512db6] initial
+[master (root-commit) 26fc746] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 other-file
-Saved working directory and index state WIP on main: c512db6 initial
-Saved working directory and index state WIP on main: c512db6 initial
-Dropped stash@{1} (886689bbf0687da9299458a427fd23c435bce4b1)
-ok 17 - drop stash reflog updates refs/stash with rewrite
+ 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 3903.18 'stash pop': 
-	git reset --hard &&
-	git stash pop &&
-	test 3 = $(cat file) &&
-	test 1 = $(git show :file) &&
-	test 1 = $(git show HEAD:file) &&
-	test 0 = $(git stash list | wc -l)
+expecting success of 4037.2 'verify': 
+	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
+	test_cmp expect actual
 
-HEAD is now at da68008 other-file
-Merging Updated upstream with Stashed changes
-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:   file
+ok 2 - verify
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	repo/
-	usage
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4032-diff-inter-hunk-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (5c6ad4ca28e71ae3a007e6c77043d04bc42fa9ee)
-ok 18 - stash pop
+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 3903.19 'stash branch': 
-	echo foo >file &&
-	git commit file -m first &&
-	echo bar >file &&
-	echo bar2 >file2 &&
-	git add file2 &&
-	git stash &&
-	echo baz >file &&
-	git commit file -m second &&
-	git stash branch stashbranch &&
-	test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
-	test $(git rev-parse HEAD) = $(git rev-parse main^) &&
-	git diff --cached >output &&
-	diff_cmp expect output &&
-	git diff >output &&
-	diff_cmp expect1 output &&
-	git add file &&
-	git commit -m alternate\ second &&
-	git diff main..stashbranch >output &&
-	diff_cmp output expect2 &&
-	test 0 = $(git stash list | wc -l)
+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)
 
-[main ce675cf] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Saved working directory and index state WIP on main: ce675cf first
-[main 662e8e5] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'stashbranch'
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file2
+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
 
-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
+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)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expect1
-	expect2
-	expected
-	output
-	repo/
-	usage
+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
 
-Dropped refs/stash@{0} (cdadb37dcdb15029c2bcf635107de6d696bb3ad3)
-[stashbranch d3a23d9] alternate second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file2
-ok 19 - stash branch
+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 3903.20 'apply -q is quiet': 
-	echo foo >file &&
-	git stash &&
-	git stash apply -q >output.out 2>&1 &&
-	test_must_be_empty output.out
+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
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 20 - apply -q is quiet
+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 3903.21 'apply --index -q is quiet': 
-	# Added file, deleted file, modified file all staged for commit
-	echo foo >new-file &&
-	echo test >file &&
-	git add new-file file &&
-	git rm other-file &&
+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)
 
-	git stash &&
-	git stash apply --index -q >output.out 2>&1 &&
-	test_must_be_empty output.out
+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)
 
-rm 'other-file'
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 21 - apply --index -q is quiet
+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 3903.22 'save -q is quiet': 
-	git stash save --quiet >output.out 2>&1 &&
-	test_must_be_empty output.out
+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)
 
-ok 22 - save -q is quiet
+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 3903.23 'pop -q works and is quiet': 
-	git stash pop -q >output.out 2>&1 &&
-	echo bar >expect &&
-	git show :file >actual &&
-	test_cmp expect actual &&
-	test_must_be_empty output.out
+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)
 
-ok 23 - pop -q works and is quiet
+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 3903.24 'pop -q --index works and is quiet': 
-	echo foo >file &&
-	git add file &&
-	git stash save --quiet &&
-	git stash pop -q --index >output.out 2>&1 &&
-	git diff-files file2 >file2.diff &&
-	test_must_be_empty file2.diff &&
-	test foo = "$(git show :file)" &&
-	test_must_be_empty output.out
+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)
 
-ok 24 - pop -q --index works and is quiet
+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 3903.25 'drop -q is quiet': 
-	git stash &&
-	git stash drop -q >output.out 2>&1 &&
-	test_must_be_empty output.out
+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)
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 25 - drop -q is quiet
+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 3903.26 'stash push -q --staged refreshes the index': 
-	git reset --hard &&
-	echo test >file &&
-	git add file &&
-	git stash push -q --staged &&
-	git diff-files >output.out &&
-	test_must_be_empty output.out
+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)
 
-HEAD is now at d3a23d9 alternate second
-ok 26 - stash push -q --staged refreshes the index
+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 3903.27 'stash apply -q --index refreshes the index': 
-	echo test >other-file &&
-	git add other-file &&
-	echo another-change >other-file &&
-	git diff-files >expect &&
-	git stash &&
+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
 
-	git stash apply -q --index &&
-	git diff-files >actual &&
-	test_cmp expect actual
+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)
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 27 - stash apply -q --index refreshes the index
+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 3903.28 'stash -k': 
-	echo bar3 >file &&
-	echo bar4 >file2 &&
-	git add file2 &&
-	git stash -k &&
-	test bar,bar4 = $(cat file),$(cat file2)
+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)
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 28 - stash -k
+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 3903.29 'stash --no-keep-index': 
-	echo bar33 >file &&
-	echo bar44 >file2 &&
-	git add file2 &&
-	git stash --no-keep-index &&
-	test bar,bar2 = $(cat file),$(cat file2)
+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)
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 29 - stash --no-keep-index
+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 3903.30 'stash --staged': 
-	echo bar3 >file &&
-	echo bar4 >file2 &&
-	git add file2 &&
-	git stash --staged &&
-	test bar3,bar2 = $(cat file),$(cat file2) &&
-	git reset --hard &&
-	git stash pop &&
-	test bar,bar4 = $(cat file),$(cat file2)
+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)
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-HEAD is now at d3a23d9 alternate second
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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:   file2
+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)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (87589b9806264bae268601f80dfb73d1e02c4fa4)
-ok 30 - stash --staged
+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 3903.31 'stash --staged with binary file': 
-	printf "\0" >file &&
-	git add file &&
-	git stash --staged &&
-	git stash pop &&
-	printf "\0" >expect &&
-	test_cmp expect file
+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)
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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:   file2
+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)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (d20eac4efdf0854212cea68f625b3869c0569eb8)
-ok 31 - stash --staged with binary file
+expecting success of 4032.37 'diff.interHunkContext invalid': 
+	git config diff.interHunkContext asdf &&
+	test_must_fail git diff &&
+	git config diff.interHunkContext -1 &&
+	test_must_fail git diff
 
-expecting success of 3903.32 'dont assume push with non-option args': 
-	test_must_fail git stash -q drop 2>err &&
-	test_grep -e "subcommand wasn't specified; 'push' can't be assumed due to unexpected token 'drop'" err
+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
 
-fatal: subcommand wasn't specified; 'push' can't be assumed due to unexpected token 'drop'
-ok 32 - dont assume push with non-option args
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4039-diff-assume-unchanged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4039-diff-assume-unchanged/.git/
+expecting success of 4039.1 'setup': 
+	echo zero > zero &&
+	git add zero &&
+	git commit -m zero &&
+	echo one > one &&
+	echo two > two &&
+	blob=$(git hash-object one) &&
+	git add one two &&
+	git commit -m onetwo &&
+	git update-index --assume-unchanged one &&
+	echo borked >> one &&
+	test "$(git ls-files -v one)" = "h one"
 
-expecting success of 3903.33 'stash --invalid-option': 
-	echo bar5 >file &&
-	echo bar6 >file2 &&
-	git add file2 &&
-	test_must_fail git stash --invalid-option &&
-	test_must_fail git stash save --invalid-option &&
-	test bar5,bar6 = $(cat file),$(cat file2)
+[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
 
-error: unknown option `invalid-option'
-usage: git stash list [<log-options>]
-   or: git stash show [-u | --include-untracked | --only-untracked] [<diff-options>] [<stash>]
-   or: git stash drop [-q | --quiet] [<stash>]
-   or: git stash pop [--index] [-q | --quiet] [<stash>]
-   or: git stash apply [--index] [-q | --quiet] [<stash>]
-   or: git stash branch <branchname> [<stash>]
-   or: git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
-                 [-u | --include-untracked] [-a | --all] [(-m | --message) <message>]
-                 [--pathspec-from-file=<file> [--pathspec-file-nul]]
-                 [--] [<pathspec>...]]
-   or: git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
-                 [-u | --include-untracked] [-a | --all] [<message>]
-   or: git stash clear
-   or: git stash create [<message>]
-   or: git stash store [(-m | --message) <message>] [-q | --quiet] <commit>
+expecting success of 4039.2 'diff-index does not examine assume-unchanged entries': 
+	git diff-index HEAD^ -- one | grep -q $blob
 
-    -k, --[no-]keep-index keep index
-    -S, --[no-]staged     stash staged changes only
-    -p, --[no-]patch      stash in patch mode
-    -q, --[no-]quiet      quiet mode
-    -u, --[no-]include-untracked
-                          include untracked files in stash
-    -a, --[no-]all        include ignore files
-    -m, --[no-]message <message>
-                          stash message
-    --[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 2 - diff-index does not examine assume-unchanged entries
 
-error: unknown option `invalid-option'
-usage: git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | --quiet]
-                 [-u | --include-untracked] [-a | --all] [<message>]
+expecting success of 4039.3 'diff-files does not examine assume-unchanged entries': 
+	rm one &&
+	test -z "$(git diff-files -- one)"
 
-    -k, --[no-]keep-index keep index
-    -S, --[no-]staged     stash staged changes only
-    -p, --[no-]patch      stash in patch mode
-    -q, --[no-]quiet      quiet mode
-    -u, --[no-]include-untracked
-                          include untracked files in stash
-    -a, --[no-]all        include ignore files
-    -m, --[no-]message <message>
-                          stash message
+ok 3 - diff-files does not examine assume-unchanged entries
 
-ok 33 - stash --invalid-option
+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
 
-expecting success of 3903.34 'stash an added file': 
-	git reset --hard &&
-	echo new >file3 &&
-	git add file3 &&
-	git stash save "added file" &&
-	! test -r file3 &&
-	git stash apply &&
-	test new = "$(cat file3)"
+[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
 
-HEAD is now at d3a23d9 alternate second
-Saved working directory and index state On stashbranch: added file
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file3
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4035-diff-quiet.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+[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.48.0~rc1+next.20250101/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
 
-ok 34 - stash an added file
+expecting success of 4035.2 'git diff-tree HEAD^ HEAD': 
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
+	test_line_count = 0 cnt
 
-expecting success of 3903.35 'stash --intent-to-add file': 
-	git reset --hard &&
-	echo new >file4 &&
-	git add --intent-to-add file4 &&
-	test_when_finished "git rm -f file4" &&
-	test_must_fail git stash
+ok 2 - git diff-tree HEAD^ HEAD
 
-HEAD is now at d3a23d9 alternate second
-error: Entry 'file4' not uptodate. Cannot merge.
-Cannot save the current worktree state
-rm 'file4'
-ok 35 - stash --intent-to-add file
+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
 
-expecting success of 3903.36 'stash rm then recreate': 
-	git reset --hard &&
-	git rm file &&
-	echo bar7 >file &&
-	git stash save "rm then recreate" &&
-	test bar = "$(cat file)" &&
-	git stash apply &&
-	test bar7 = "$(cat file)"
+ok 3 - git diff-tree HEAD^ HEAD -- a
 
-HEAD is now at d3a23d9 alternate second
-rm 'file'
-Saved working directory and index state On stashbranch: rm then recreate
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+ok 4 - git diff-tree HEAD^ HEAD -- b
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 36 - stash rm then recreate
+expecting success of 4035.5 'echo HEAD | git diff-tree --stdin': 
+	echo $(git rev-parse HEAD) |
+	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
+	test_line_count = 1 cnt
 
-expecting success of 3903.37 'stash rm and ignore': 
-	git reset --hard &&
-	git rm file &&
-	echo file >.gitignore &&
-	git stash save "rm and ignore" &&
-	test bar = "$(cat file)" &&
-	test file = "$(cat .gitignore)" &&
-	git stash apply &&
-	! test -r file &&
-	test file = "$(cat .gitignore)"
+ok 5 - echo HEAD | git diff-tree --stdin
 
-HEAD is now at d3a23d9 alternate second
-rm 'file'
-Saved working directory and index state On stashbranch: rm and ignore
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    file
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+ok 6 - git diff-tree HEAD HEAD
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 37 - stash rm and ignore
+expecting success of 4035.7 'git diff-files': 
+	test_expect_code 0 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
 
-expecting success of 3903.38 'stash rm and ignore (stage .gitignore)': 
-	git reset --hard &&
-	git rm file &&
-	echo file >.gitignore &&
-	git add .gitignore &&
-	git stash save "rm and ignore (stage .gitignore)" &&
-	test bar = "$(cat file)" &&
-	! test -r .gitignore &&
-	git stash apply &&
-	! test -r file &&
-	test file = "$(cat .gitignore)"
+ok 7 - git diff-files
 
-HEAD is now at d3a23d9 alternate second
-rm 'file'
-Saved working directory and index state On stashbranch: rm and ignore (stage .gitignore)
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   .gitignore
+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
 
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    file
+ok 8 - git diff-index --cached HEAD
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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 38 - stash rm and ignore (stage .gitignore)
+ok 9 - git diff-index --cached HEAD^
 
-checking prerequisite: SYMLINKS
+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
 
-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
+warning: adding embedded git repository: test-outside/repo
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> test-outside/repo
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached test-outside/repo
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 10 - git diff-index --cached HEAD^
 
-)
-prerequisite SYMLINKS ok
-expecting success of 3903.39 'stash file to symlink': 
-	git reset --hard &&
-	rm file &&
-	ln -s file2 file &&
-	git stash save "file to symlink" &&
-	test_path_is_file_not_symlink file &&
-	test bar = "$(cat file)" &&
-	git stash apply &&
-	test_path_is_symlink file &&
-	test "$(test_readlink file)" = file2
+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
 
-HEAD is now at d3a23d9 alternate second
-Saved working directory and index state On stashbranch: file to symlink
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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)
-	typechange: file
+[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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 39 - stash file to symlink
+ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
 
-expecting success of 3903.40 'stash file to symlink (stage rm)': 
-	git reset --hard &&
-	git rm file &&
-	ln -s file2 file &&
-	git stash save "file to symlink (stage rm)" &&
-	test_path_is_file_not_symlink file &&
-	test bar = "$(cat file)" &&
-	git stash apply &&
-	test_path_is_symlink file &&
-	test "$(test_readlink file)" = file2
+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
 
-HEAD is now at d3a23d9 alternate second
-rm 'file'
-Saved working directory and index state On stashbranch: file to symlink (stage rm)
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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)
-	typechange: file
+ok 13 - git diff-files
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 40 - stash file to symlink (stage rm)
+ok 14 - git diff-index --cached HEAD
 
-expecting success of 3903.41 'stash file to symlink (full stage)': 
-	git reset --hard &&
-	rm file &&
-	ln -s file2 file &&
-	git add file &&
-	git stash save "file to symlink (full stage)" &&
-	test_path_is_file_not_symlink file &&
-	test bar = "$(cat file)" &&
-	git stash apply &&
-	test_path_is_symlink file &&
-	test "$(test_readlink file)" = file2
+expecting success of 4035.15 'git diff, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet a ../non/git/matching-file &&
+		test_expect_code 1 git diff --quiet a ../non/git/extra-space
+	)
 
-HEAD is now at d3a23d9 alternate second
-Saved working directory and index state On stashbranch: file to symlink (full stage)
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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)
-	typechange: file
+ok 15 - git diff, one file outside repo
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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
+	)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 41 - stash file to symlink (full stage)
+ok 16 - git diff, both files outside repo
 
-expecting success of 3903.42 'stash symlink to file': 
-	git reset --hard &&
-	test_ln_s_add file filelink &&
-	git commit -m "Add symlink" &&
-	rm filelink &&
-	cp file filelink &&
-	git stash save "symlink to file"
+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
+	)
 
-HEAD is now at d3a23d9 alternate second
-[stashbranch f202a25] Add symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 filelink
-Saved working directory and index state On stashbranch: symlink to file
-ok 42 - stash symlink to file
+ok 17 - git diff --ignore-space-at-eol, one file outside repo
 
-expecting success of 3903.43 'this must have re-created the symlink': 
-	test -h filelink &&
-	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+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 43 - this must have re-created the symlink
+ok 18 - git diff --ignore-space-at-eol, both files outside repo
 
-expecting success of 3903.44 'unstash must re-create the file': 
-	git stash apply &&
-	! test -h filelink &&
-	test bar = "$(cat file)"
+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
+	)
 
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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)
-	typechange: filelink
+ok 19 - git diff --ignore-all-space, one file outside repo
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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
+	)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 44 - unstash must re-create the file
+ok 20 - git diff --ignore-all-space, both files outside repo
 
-expecting success of 3903.45 'stash symlink to file (stage rm)': 
-	git reset --hard &&
-	git rm filelink &&
-	cp file filelink &&
-	git stash save "symlink to file (stage rm)"
+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
 
-HEAD is now at f202a25 Add symlink
-rm 'filelink'
-Saved working directory and index state On stashbranch: symlink to file (stage rm)
-ok 45 - stash symlink to file (stage rm)
+ok 21 - git diff --quiet ignores stat-change only entries
 
-expecting success of 3903.46 'this must have re-created the symlink': 
-	test -h filelink &&
-	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+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 &&
 
-ok 46 - this must have re-created the symlink
+	printf "Hello\r\nWorld\n" >crlf.txt &&
+	git diff --quiet crlf.txt
 
-expecting success of 3903.47 'unstash must re-create the file': 
-	git stash apply &&
-	! test -h filelink &&
-	test bar = "$(cat file)"
+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
 
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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)
-	typechange: filelink
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t3600-rm.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+[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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 47 - unstash must re-create the file
+checking prerequisite: FUNNYNAMES
 
-expecting success of 3903.48 'stash symlink to file (full stage)': 
-	git reset --hard &&
-	rm filelink &&
-	cp file filelink &&
-	git add filelink &&
-	git stash save "symlink to file (full stage)"
+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
 
-HEAD is now at f202a25 Add symlink
-Saved working directory and index state On stashbranch: symlink to file (full stage)
-ok 48 - stash symlink to file (full stage)
+)
+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 3903.49 'this must have re-created the symlink': 
-	test -h filelink &&
-	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+[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
 
-ok 49 - this must have re-created the symlink
+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 3903.50 'unstash must re-create the file': 
-	git stash apply &&
-	! test -h filelink &&
-	test bar = "$(cat file)"
+foo
+ok 3 - Pre-check that foo exists and is in index before git rm foo
 
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-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)
-	typechange: filelink
+expecting success of 3600.4 'Test that git rm foo succeeds': 
+	git rm --cached foo
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+rm 'foo'
+ok 4 - Test that git rm foo succeeds
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 50 - unstash must re-create the file
+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
 
-checking known breakage of 3903.51 'stash directory to file': 
-	git reset --hard &&
-	mkdir dir &&
-	echo foo >dir/file &&
-	git add dir/file &&
-	git commit -m "Add file in dir" &&
-	rm -fr dir &&
-	echo bar >dir &&
-	git stash save "directory to file" &&
-	test_path_is_dir dir &&
-	test foo = "$(cat dir/file)" &&
-	test_must_fail git stash apply &&
-	test bar = "$(cat dir)" &&
-	git reset --soft HEAD^
+rm 'foo'
+ok 5 - Test that git rm --cached foo succeeds if the index matches the file
 
-HEAD is now at f202a25 Add symlink
-[stashbranch 36c53af] Add file in dir
+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(+)
- create mode 100644 dir/file
-Saved working directory and index state On stashbranch: directory to file
-Merging Version stash was based on with Stashed changes
-On branch stashbranch
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    dir/file
+rm 'foo'
+ok 6 - Test that git rm --cached foo succeeds if the index matches the file
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-test_must_fail: command succeeded: git stash apply
-not ok 51 - stash directory to file # TODO known breakage
+[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
 
-checking known breakage of 3903.52 'stash file to directory': 
-	git reset --hard &&
-	rm file &&
-	mkdir file &&
-	echo foo >file/file &&
-	git stash save "file to directory" &&
-	test_path_is_file file &&
-	test bar = "$(cat file)" &&
-	git stash apply &&
-	test_path_is_file file/file &&
-	test foo = "$(cat file/file)"
+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
 
-HEAD is now at 36c53af Add file in dir
-Saved working directory and index state On stashbranch: file to directory
-Merging Version stash was based on with Stashed changes
-Already up to date.
-On branch stashbranch
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	output
-	output.out
-	repo/
-	usage
+[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
 
-nothing added to commit but untracked files present (use "git add" to track)
-File file/file doesn't exist
-not ok 52 - stash file to directory # TODO known breakage
+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
 
-expecting success of 3903.53 'giving too many ref arguments does not modify files': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	echo foo >file2 &&
-	git stash &&
-	echo bar >file2 &&
-	git stash &&
-	test-tool chmtime =123456789 file2 &&
-	for type in apply pop "branch stash-branch"
-	do
-		test_must_fail git stash $type stash@{0} stash@{1} 2>err &&
-		test_grep "Too many revisions" err &&
-		test 123456789 = $(test-tool chmtime -g file2) || return 1
-	done
+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
 
-Saved working directory and index state WIP on stashbranch: 36c53af Add file in dir
-Saved working directory and index state WIP on stashbranch: 36c53af Add file in dir
-Too many revisions specified: 'stash@{0}' 'stash@{1}'
-Too many revisions specified: 'stash@{0}' 'stash@{1}'
-Too many revisions specified: 'stash@{0}' 'stash@{1}'
-HEAD is now at 36c53af Add file in dir
-ok 53 - giving too many ref arguments does not modify files
+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
 
-expecting success of 3903.54 'drop: too many arguments errors out (does nothing)': 
-	git stash list >expect &&
-	test_must_fail git stash drop stash@{0} stash@{1} 2>err &&
-	test_grep "Too many revisions" err &&
-	git stash list >actual &&
-	test_cmp expect actual
+bar
+ok 10 - Pre-check that bar exists and is in index before "git rm bar"
 
-Too many revisions specified: 'stash@{0}' 'stash@{1}'
-ok 54 - drop: too many arguments errors out (does nothing)
+expecting success of 3600.11 'Test that "git rm bar" succeeds': 
+	git rm bar
 
-expecting success of 3903.55 'show: too many arguments errors out (does nothing)': 
-	test_must_fail git stash show stash@{0} stash@{1} 2>err 1>out &&
-	test_grep "Too many revisions" err &&
-	test_must_be_empty out
+rm 'bar'
+ok 11 - Test that "git rm bar" succeeds
 
-Too many revisions specified: 'stash@{0}' 'stash@{1}'
-ok 55 - show: too many arguments errors out (does nothing)
+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
 
-expecting success of 3903.56 'stash create - no changes': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	git stash create >actual &&
-	test_must_be_empty actual
+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"
 
-HEAD is now at 36c53af Add file in dir
-HEAD is now at 36c53af Add file in dir
-ok 56 - stash create - no changes
+expecting success of 3600.13 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)': 
+	git rm -- -q
 
-expecting success of 3903.57 'stash branch - no stashes on stack, stash-like argument': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	echo foo >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	git stash branch stash-branch ${STASH_ID} &&
-	test_when_finished "git reset --hard HEAD && git checkout main &&
-	git branch -D stash-branch" &&
-	test $(git ls-files --modified | wc -l) -eq 1
+rm '-q'
+ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option)
 
-HEAD is now at 36c53af Add file in dir
-HEAD is now at 36c53af Add file in dir
-Switched to a new branch 'stash-branch'
-Merging Version stash was based on with Stashed changes
-On branch stash-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:   file
+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"
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+rm 'newline
+embedded'
+rm 'space embedded'
+rm 'tab	embedded'
+ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters.
 
-no changes added to commit (use "git add" and/or "git commit -a")
-HEAD is now at 36c53af Add file in dir
-Switched to branch 'main'
-Deleted branch stash-branch (was 36c53af).
-HEAD is now at 662e8e5 second
-ok 57 - stash branch - no stashes on stack, stash-like argument
+checking prerequisite: SANITY
 
-expecting success of 3903.58 'stash branch - stashes on stack, stash-like argument': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	echo foo >>file &&
-	git stash &&
-	test_when_finished "git stash drop" &&
-	echo bar >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	git stash branch stash-branch ${STASH_ID} &&
-	test_when_finished "git reset --hard HEAD && git checkout main &&
-	git branch -D stash-branch" &&
-	test $(git ls-files --modified | wc -l) -eq 1
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-HEAD is now at 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-HEAD is now at 662e8e5 second
-Switched to a new branch 'stash-branch'
-Merging Version stash was based on with Stashed changes
-On branch stash-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:   file
+	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"
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-no changes added to commit (use "git add" and/or "git commit -a")
-HEAD is now at 662e8e5 second
-Switched to branch 'main'
-Deleted branch stash-branch (was 662e8e5).
-Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
-HEAD is now at 662e8e5 second
-ok 58 - stash branch - stashes on stack, stash-like argument
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 3903.59 'stash branch complains with no arguments': 
-	test_must_fail git stash branch 2>err &&
-	test_grep "No branch name specified" err
+)
+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
 
-No branch name specified
-ok 59 - stash branch complains with no arguments
+fatal: git rm: 'baz': Permission denied
+rm 'baz'
+ok 15 - Test that "git rm -f" fails if its rm fails
 
-expecting success of 3903.60 'stash show format defaults to --stat': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	echo foo >>file &&
-	git stash &&
-	test_when_finished "git stash drop" &&
-	echo bar >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	cat >expected <<-EOF &&
-	 file | 1 +
-	 1 file changed, 1 insertion(+)
-	EOF
-	git stash show ${STASH_ID} >actual &&
-	test_cmp expected actual
+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
 
-HEAD is now at 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-HEAD is now at 662e8e5 second
-Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
-HEAD is now at 662e8e5 second
-ok 60 - stash show format defaults to --stat
+baz
+ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index
 
-expecting success of 3903.61 'stash show - stashes on stack, stash-like argument': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	echo foo >>file &&
-	git stash &&
-	test_when_finished "git stash drop" &&
-	echo bar >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	echo "1	0	file" >expected &&
-	git stash show --numstat ${STASH_ID} >actual &&
-	test_cmp expected actual
+expecting success of 3600.17 'Remove nonexistent file with --ignore-unmatch': 
+	git rm --ignore-unmatch nonexistent
 
-HEAD is now at 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-HEAD is now at 662e8e5 second
-Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
-HEAD is now at 662e8e5 second
-ok 61 - stash show - stashes on stack, stash-like argument
+ok 17 - Remove nonexistent file with --ignore-unmatch
 
-expecting success of 3903.62 'stash show -p - stashes on stack, stash-like argument': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	echo foo >>file &&
-	git stash &&
-	test_when_finished "git stash drop" &&
-	echo bar >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	cat >expected <<-EOF &&
-	diff --git a/file b/file
-	index 7601807..935fbd3 100644
-	--- a/file
-	+++ b/file
-	@@ -1 +1,2 @@
-	 baz
-	+bar
-	EOF
-	git stash show -p ${STASH_ID} >actual &&
-	diff_cmp expected actual
+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"
 
-HEAD is now at 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-HEAD is now at 662e8e5 second
-Dropped refs/stash@{0} (52fc03a924a3ab4b9767c1a1db630e729e81e22d)
-HEAD is now at 662e8e5 second
-ok 62 - stash show -p - stashes on stack, stash-like argument
+[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 3903.63 'stash show - no stashes on stack, stash-like argument': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	echo foo >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	echo "1	0	file" >expected &&
-	git stash show --numstat ${STASH_ID} >actual &&
-	test_cmp expected actual
+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"
 
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 63 - stash show - no stashes on stack, stash-like argument
+[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 3903.64 'stash show -p - no stashes on stack, stash-like argument': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD" &&
-	git reset --hard &&
-	echo foo >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	cat >expected <<-EOF &&
-	diff --git a/file b/file
-	index 7601807..71b52c4 100644
-	--- a/file
-	+++ b/file
-	@@ -1 +1,2 @@
-	 baz
-	+foo
-	EOF
-	git stash show -p ${STASH_ID} >actual &&
-	diff_cmp expected actual
+expecting success of 3600.20 'Re-add foo and baz': 
+	git add foo baz &&
+	git ls-files --error-unmatch foo baz
 
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 64 - stash show -p - no stashes on stack, stash-like argument
+baz
+foo
+ok 20 - Re-add foo and baz
 
-expecting success of 3903.65 'stash show --patience shows diff': 
-	git reset --hard &&
-	echo foo >>file &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	cat >expected <<-EOF &&
-	diff --git a/file b/file
-	index 7601807..71b52c4 100644
-	--- a/file
-	+++ b/file
-	@@ -1 +1,2 @@
-	 baz
-	+foo
-	EOF
-	git stash show --patience ${STASH_ID} >actual &&
-	diff_cmp expected actual
+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
 
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 65 - stash show --patience shows diff
+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 3903.66 'drop: fail early if specified stash is not a stash ref': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD && git stash clear" &&
-	git reset --hard &&
-	echo foo >file &&
-	git stash &&
-	echo bar >file &&
-	git stash &&
-	test_must_fail git stash drop $(git rev-parse stash@{0}) &&
-	git stash pop &&
-	test bar = "$(cat file)" &&
-	git reset --hard HEAD
+expecting success of 3600.22 'Modified foo -- rm -f should work': 
+	git rm -f foo baz &&
+	test_path_is_missing foo &&
+	test_path_is_missing baz &&
+	test_must_fail git ls-files --error-unmatch foo &&
+	test_must_fail git ls-files --error-unmatch bar
 
-HEAD is now at 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-error: 'b5efee99e793dd7b06ac07318a9440c7e09b097f' is not a stash reference
-Merging Version stash was based on with Stashed changes
-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:   file
+rm 'baz'
+rm 'foo'
+error: pathspec 'foo' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'bar' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 22 - Modified foo -- rm -f should work
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+expecting success of 3600.23 'Re-add foo and baz for HEAD tests': 
+	echo frotz >foo &&
+	git checkout HEAD -- baz &&
+	git add foo baz &&
+	git ls-files --error-unmatch foo baz
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (b5efee99e793dd7b06ac07318a9440c7e09b097f)
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 66 - drop: fail early if specified stash is not a stash ref
+baz
+foo
+ok 23 - Re-add foo and baz for HEAD tests
 
-expecting success of 3903.67 'pop: fail early if specified stash is not a stash ref': 
-	git stash clear &&
-	test_when_finished "git reset --hard HEAD && git stash clear" &&
-	git reset --hard &&
-	echo foo >file &&
-	git stash &&
-	echo bar >file &&
-	git stash &&
-	test_must_fail git stash pop $(git rev-parse stash@{0}) &&
-	git stash pop &&
-	test bar = "$(cat file)" &&
-	git reset --hard HEAD
+expecting success of 3600.24 'foo is different in index from HEAD -- rm should refuse': 
+	test_must_fail git rm foo baz &&
+	test_path_is_file foo &&
+	test_path_is_file baz &&
+	git ls-files --error-unmatch foo baz
 
-HEAD is now at 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-Saved working directory and index state WIP on main: 662e8e5 second
-error: 'b5efee99e793dd7b06ac07318a9440c7e09b097f' is not a stash reference
-Merging Version stash was based on with Stashed changes
-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:   file
+error: the following file has changes staged in the index:
+    foo
+(use --cached to keep the file, or -f to force removal)
+baz
+foo
+ok 24 - foo is different in index from HEAD -- rm should refuse
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+expecting success of 3600.25 'but with -f it should work.': 
+	git rm -f foo baz &&
+	test_path_is_missing foo &&
+	test_path_is_missing baz &&
+	test_must_fail git ls-files --error-unmatch foo &&
+	test_must_fail git ls-files --error-unmatch baz
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (b5efee99e793dd7b06ac07318a9440c7e09b097f)
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 67 - pop: fail early if specified stash is not a stash ref
+rm 'baz'
+rm 'foo'
+error: pathspec 'foo' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'baz' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 25 - but with -f it should work.
 
-expecting success of 3903.68 'ref with non-existent reflog': 
-	git stash clear &&
-	echo bar5 >file &&
-	echo bar6 >file2 &&
-	git add file2 &&
-	git stash &&
-	test_must_fail git rev-parse --quiet --verify does-not-exist &&
-	test_must_fail git stash drop does-not-exist &&
-	test_must_fail git stash drop does-not-exist@{0} &&
-	test_must_fail git stash pop does-not-exist &&
-	test_must_fail git stash pop does-not-exist@{0} &&
-	test_must_fail git stash apply does-not-exist &&
-	test_must_fail git stash apply does-not-exist@{0} &&
-	test_must_fail git stash show does-not-exist &&
-	test_must_fail git stash show does-not-exist@{0} &&
-	test_must_fail git stash branch tmp does-not-exist &&
-	test_must_fail git stash branch tmp does-not-exist@{0} &&
-	git stash drop
+expecting success of 3600.26 'refuse to remove cached empty file with modifications': 
+	>empty &&
+	git add empty &&
+	echo content >empty &&
+	test_must_fail git rm --cached empty
 
-Saved working directory and index state WIP on main: 662e8e5 second
-error: does-not-exist is not a valid reference
-error: does-not-exist@{0} is not a valid reference
-error: does-not-exist is not a valid reference
-error: does-not-exist@{0} is not a valid reference
-error: does-not-exist is not a valid reference
-error: does-not-exist@{0} is not a valid reference
-error: does-not-exist is not a valid reference
-error: does-not-exist@{0} is not a valid reference
-error: does-not-exist is not a valid reference
-error: does-not-exist@{0} is not a valid reference
-Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
-ok 68 - ref with non-existent reflog
+error: the following file has staged content different from both the
+file and the HEAD:
+    empty
+(use -f to force removal)
+ok 26 - refuse to remove cached empty file with modifications
 
-expecting success of 3903.69 'invalid ref of the form stash@{n}, n >= N': 
-	git stash clear &&
-	test_must_fail git stash drop stash@{0} &&
-	echo bar5 >file &&
-	echo bar6 >file2 &&
-	git add file2 &&
-	git stash &&
-	test_must_fail git stash drop stash@{1} &&
-	test_must_fail git stash pop stash@{1} &&
-	test_must_fail git stash apply stash@{1} &&
-	test_must_fail git stash show stash@{1} &&
-	test_must_fail git stash branch tmp stash@{1} &&
-	git stash drop
+expecting success of 3600.27 'remove intent-to-add file without --force': 
+	echo content >intent-to-add &&
+	git add -N intent-to-add &&
+	git rm --cached intent-to-add
 
-error: stash@{0} is not a valid reference
-Saved working directory and index state WIP on main: 662e8e5 second
-fatal: log for 'stash' only has 1 entries
-fatal: log for 'stash' only has 1 entries
-fatal: log for 'stash' only has 1 entries
-fatal: log for 'stash' only has 1 entries
-fatal: log for 'stash' only has 1 entries
-Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
-ok 69 - invalid ref of the form stash@{n}, n >= N
+rm 'intent-to-add'
+ok 27 - remove intent-to-add file without --force
 
-expecting success of 3903.70 'invalid ref of the form "n", n >= N': 
-	git stash clear &&
-	test_must_fail git stash drop 0 &&
-	echo bar5 >file &&
-	echo bar6 >file2 &&
-	git add file2 &&
-	git stash &&
-	test_must_fail git stash drop 1 &&
-	test_must_fail git stash pop 1 &&
-	test_must_fail git stash apply 1 &&
-	test_must_fail git stash show 1 &&
-	test_must_fail git stash branch tmp 1 &&
-	git stash drop
+expecting success of 3600.28 'Recursive test setup': 
+	mkdir -p frotz &&
+	echo qfwfq >frotz/nitfol &&
+	git add frotz &&
+	git commit -m "subdir test"
 
-error: refs/stash@{0} is not a valid reference
-Saved working directory and index state WIP on main: 662e8e5 second
-fatal: log for 'refs/stash' only has 1 entries
-fatal: log for 'refs/stash' only has 1 entries
-fatal: log for 'refs/stash' only has 1 entries
-fatal: log for 'refs/stash' only has 1 entries
-fatal: log for 'refs/stash' only has 1 entries
-Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
-ok 70 - invalid ref of the form "n", n >= N
+[main 5a08f40] subdir test
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename baz => empty (100%)
+ create mode 100644 frotz/nitfol
+ok 28 - Recursive test setup
 
-expecting success of 3903.71 'valid ref of the form "n", n < N': 
-	git stash clear &&
-	echo bar5 >file &&
-	echo bar6 >file2 &&
-	git add file2 &&
-	git stash &&
-	git stash show 0 &&
-	git stash branch tmp 0 &&
-	git checkout main &&
-	git stash &&
-	git stash apply 0 &&
-	git reset --hard &&
-	git stash pop 0 &&
-	git stash &&
-	git stash drop 0 &&
-	test_must_fail git stash drop
+expecting success of 3600.29 'Recursive without -r fails': 
+	test_must_fail git rm frotz &&
+	test_path_is_dir frotz &&
+	test_path_is_file frotz/nitfol
 
-Saved working directory and index state WIP on main: 662e8e5 second
- file  | 2 +-
- file2 | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-Switched to a new branch 'tmp'
-Merging Version stash was based on with Stashed changes
-On branch tmp
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file2
+fatal: not removing 'frotz' recursively without -r
+ok 29 - Recursive without -r fails
 
-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
+expecting success of 3600.30 'Recursive with -r but dirty': 
+	echo qfwfq >>frotz/nitfol &&
+	test_must_fail git rm -r frotz &&
+	test_path_is_dir frotz &&
+	test_path_is_file frotz/nitfol
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+error: the following file has local modifications:
+    frotz/nitfol
+(use --cached to keep the file, or -f to force removal)
+ok 30 - Recursive with -r but dirty
 
-Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
-Switched to branch 'main'
-M	file
-A	file2
-Saved working directory and index state WIP on main: 662e8e5 second
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file2
+expecting success of 3600.31 'Recursive with -r -f': 
+	git rm -f -r frotz &&
+	test_path_is_missing frotz/nitfol &&
+	test_path_is_missing frotz
 
-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
+rm 'frotz/nitfol'
+ok 31 - Recursive with -r -f
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+expecting success of 3600.32 'Remove nonexistent file returns nonzero exit status': 
+	test_must_fail git rm nonexistent
 
-HEAD is now at 662e8e5 second
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file2
+fatal: pathspec 'nonexistent' did not match any files
+ok 32 - Remove nonexistent file returns nonzero exit status
 
-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
+expecting success of 3600.33 'Call "rm" from outside the work tree': 
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		echo something >somefile &&
+		git add somefile &&
+		git commit -m "add a file" &&
+		(
+			cd .. &&
+			git --git-dir=repo/.git --work-tree=repo rm somefile
+		) &&
+		test_must_fail git ls-files --error-unmatch somefile
+	)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/repo/.git/
+[main (root-commit) bc24042] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 somefile
+rm 'somefile'
+error: pathspec 'somefile' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 33 - Call "rm" from outside the work tree
 
-Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
-Saved working directory and index state WIP on main: 662e8e5 second
-Dropped refs/stash@{0} (2292019e7bba9714c78c4046916c8d2872d65209)
-No stash entries found.
-ok 71 - valid ref of the form "n", n < N
+expecting success of 3600.34 'refresh index before checking if it is up-to-date': 
+	git reset --hard &&
+	test-tool chmtime -86400 frotz/nitfol &&
+	git rm frotz/nitfol &&
+	test_path_is_missing frotz/nitfol
 
-expecting success of 3903.72 'branch: do not drop the stash if the branch exists': 
-	git stash clear &&
-	echo foo >file &&
-	git add file &&
-	git commit -m initial &&
-	echo bar >file &&
-	git stash &&
-	test_must_fail git stash branch main stash@{0} &&
-	git rev-parse stash@{0} --
+HEAD is now at 5a08f40 subdir test
+rm 'frotz/nitfol'
+ok 34 - refresh index before checking if it is up-to-date
 
-[main 47d5e0e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Saved working directory and index state WIP on main: 47d5e0e initial
-fatal: a branch named 'main' already exists
-68902b50f26eb6fc30df10f888c7728c286038c7
---
-ok 72 - branch: do not drop the stash if the branch exists
+expecting success of 3600.35 'choking "git rm" should not let it die with cruft (induce SIGPIPE)': 
+	choke_git_rm_setup &&
+	# git command is intentionally placed upstream of pipe to induce SIGPIPE
+	git rm -n "some-file-*" | : &&
+	test_path_is_missing .git/index.lock
 
-expecting success of 3903.73 'branch: should not drop the stash if the apply fails': 
-	git stash clear &&
-	git reset HEAD~1 --hard &&
-	echo foo >file &&
-	git add file &&
-	git commit -m initial &&
-	echo bar >file &&
-	git stash &&
-	echo baz >file &&
-	test_when_finished "git checkout main" &&
-	test_must_fail git stash branch new_branch stash@{0} &&
-	git rev-parse stash@{0} --
+ok 35 - choking "git rm" should not let it die with cruft (induce SIGPIPE)
 
-HEAD is now at 662e8e5 second
-[main 47d5e0e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Saved working directory and index state WIP on main: 47d5e0e initial
-Switched to a new branch 'new_branch'
-M	file
-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
-Index was not unstashed.
-Merging Version stash was based on with Stashed changes
-On branch new_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:   file
+expecting success of 3600.36 'choking "git rm" should not let it die with cruft (induce and check SIGPIPE)': 
+	choke_git_rm_setup &&
+	OUT=$( ((trap "" PIPE && git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
+	test_match_signal 13 "$OUT" &&
+	test_path_is_missing .git/index.lock
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	usage
+ok 36 - choking "git rm" should not let it die with cruft (induce and check SIGPIPE)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-68902b50f26eb6fc30df10f888c7728c286038c7
---
-Switched to branch 'main'
-M	file
-ok 73 - branch: should not drop the stash if the apply fails
+expecting success of 3600.37 'Resolving by removal is not a warning-worthy event': 
+	git reset -q --hard &&
+	test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
+	blob=$(echo blob | git hash-object -w --stdin) &&
+	printf "100644 $blob %d\tblob\n" 1 2 3 | git update-index --index-info &&
+	git rm blob >msg 2>&1 &&
+	test_grep ! "needs merge" msg &&
+	test_must_fail git ls-files -s --error-unmatch blob
 
-expecting success of 3903.74 'apply: show same status as git status (relative to ./)': 
-	git stash clear &&
-	echo 1 >subdir/subfile1 &&
-	echo 2 >subdir/subfile2 &&
-	git add subdir/subfile1 &&
-	git commit -m subdir &&
-	(
-		cd subdir &&
-		echo x >subfile1 &&
-		echo x >../file &&
-		git status >../expect &&
-		git stash &&
-		sane_unset GIT_MERGE_VERBOSITY &&
-		git stash apply
-	) |
-	sed -e 1d >actual && # drop "Saved..."
-	test_cmp expect actual
+error: pathspec 'blob' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 37 - Resolving by removal is not a warning-worthy event
 
-[main 307367e] subdir
+expecting success of 3600.38 'rm removes subdirectories recursively': 
+	mkdir -p dir/subdir/subsubdir &&
+	echo content >dir/subdir/subsubdir/file &&
+	git add dir/subdir/subsubdir/file &&
+	git rm -f dir/subdir/subsubdir/file &&
+	test_path_is_missing dir
+
+rm 'dir/subdir/subsubdir/file'
+ok 38 - rm removes subdirectories recursively
+
+expecting success of 3600.39 'rm removes empty submodules from work tree': 
+	mkdir submod &&
+	hash=$(git rev-parse HEAD) &&
+	git update-index --add --cacheinfo 160000 "$hash" submod &&
+	git config -f .gitmodules submodule.sub.url ./. &&
+	git config -f .gitmodules submodule.sub.path submod &&
+	git submodule init &&
+	git add .gitmodules &&
+	git commit -m "add submodule" &&
+	git rm submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
+
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.) registered for path 'submod'
+[main 639dc8a] add submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/subfile1
-ok 74 - apply: show same status as git status (relative to ./)
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submod
+rm 'submod'
+ok 39 - rm removes empty submodules from work tree
 
-expecting success of 3903.75 'stash where working directory contains "HEAD" file': 
-	git stash clear &&
+expecting success of 3600.40 'rm removes removed submodule from index and .gitmodules': 
 	git reset --hard &&
-	echo file-not-a-ref >HEAD &&
-	git add HEAD &&
-	test_tick &&
-	git stash &&
-	git diff-files --quiet &&
-	git diff-index --cached --quiet HEAD &&
-	test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" &&
-	git diff stash^..stash >output &&
-	diff_cmp expect output
+	git -c protocol.file.allow=always submodule update &&
+	rm -rf submod &&
+	git rm submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-HEAD is now at 307367e subdir
-Saved working directory and index state WIP on main: 307367e subdir
-ok 75 - stash where working directory contains "HEAD" file
+HEAD is now at 639dc8a add submodule
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod'...
+done.
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+rm 'submod'
+ok 40 - rm removes removed submodule from index and .gitmodules
 
-expecting success of 3903.76 'store called with invalid commit': 
-	test_must_fail git stash store foo
+expecting success of 3600.41 'rm removes work tree of unmodified submodules': 
+	git reset --hard &&
+	git submodule update &&
+	git rm submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-Cannot update refs/stash with foo
-ok 76 - store called with invalid commit
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+rm 'submod'
+ok 41 - rm removes work tree of unmodified submodules
 
-expecting success of 3903.77 'store called with non-stash commit': 
-	test_must_fail git stash store HEAD
+expecting success of 3600.42 'rm removes a submodule with a trailing /': 
+	git reset --hard &&
+	git submodule update &&
+	git rm submod/ &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-fatal: '307367ef082bbeb26ff4d37194044be1a75ff404' is not a stash-like commit
-ok 77 - store called with non-stash commit
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+rm 'submod'
+ok 42 - rm removes a submodule with a trailing /
 
-expecting success of 3903.78 'store updates stash ref and reflog': 
-	git stash clear &&
-	git reset --hard &&
-	echo quux >bazzy &&
-	git add bazzy &&
-	STASH_ID=$(git stash create) &&
-	git reset --hard &&
-	test_path_is_missing bazzy &&
-	git stash store -m quuxery $STASH_ID &&
-	test $(git rev-parse stash) = $STASH_ID &&
-	git reflog --format=%H stash| grep $STASH_ID &&
-	git stash pop &&
-	grep quux bazzy
+expecting success of 3600.43 'rm fails when given a file with a trailing /': 
+	test_must_fail git rm empty/
 
-HEAD is now at 307367e subdir
-HEAD is now at 307367e subdir
-47ce57b251b2eb978437ea9bbc89e32969254a93
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   bazzy
+fatal: pathspec 'empty/' did not match any files
+ok 43 - rm fails when given a file with a trailing /
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+expecting success of 3600.44 'rm succeeds when given a directory with a trailing /': 
+	git rm -r frotz/
 
-Dropped refs/stash@{0} (47ce57b251b2eb978437ea9bbc89e32969254a93)
-quux
-ok 78 - store updates stash ref and reflog
+rm 'frotz/nitfol'
+ok 44 - rm succeeds when given a directory with a trailing /
 
-expecting success of 3903.79 'handle stash specification with spaces': 
-	git stash clear &&
-	echo pig >file &&
-	git stash &&
-	stamp=$(git log -g --format="%cd" -1 refs/stash) &&
-	test_tick &&
-	echo cow >file &&
-	git stash &&
-	git stash apply "stash@{$stamp}" &&
-	grep pig file
+expecting success of 3600.45 'rm of a populated submodule with different HEAD fails unless forced': 
+	git reset --hard &&
+	git submodule update &&
+	git -C submod checkout HEAD^ &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-Saved working directory and index state WIP on main: 307367e subdir
-Saved working directory and index state WIP on main: 307367e subdir
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   bazzy
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+Previous HEAD position was 5a08f40 subdir test
+HEAD is now at 308e36c remove file from rm --quiet test
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 45 - rm of a populated submodule with different HEAD fails unless forced
 
-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
+expecting success of 3600.46 'rm --cached leaves work tree of populated submodules and .gitmodules alone': 
+	git reset --hard &&
+	git submodule update &&
+	git rm --cached submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno >actual &&
+	test_cmp expect.cached actual &&
+	git config -f .gitmodules submodule.sub.url &&
+	git config -f .gitmodules submodule.sub.path
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+rm 'submod'
+./.
+submod
+ok 46 - rm --cached leaves work tree of populated submodules and .gitmodules alone
 
-pig
-ok 79 - handle stash specification with spaces
+expecting success of 3600.47 'rm --dry-run does not touch the submodule or .gitmodules': 
+	git reset --hard &&
+	git submodule update &&
+	git rm -n submod &&
+	test_path_is_file submod/.git &&
+	git diff-index --exit-code HEAD
 
-expecting success of 3903.80 'setup stash with index and worktree changes': 
-	git stash clear &&
+HEAD is now at 639dc8a add submodule
+rm 'submod'
+ok 47 - rm --dry-run does not touch the submodule or .gitmodules
+
+expecting success of 3600.48 'rm does not complain when no .gitmodules file is found': 
 	git reset --hard &&
-	echo index >file &&
-	git add file &&
-	echo working >file &&
-	git stash
+	git submodule update &&
+	git rm .gitmodules &&
+	git rm submod >actual 2>actual.err &&
+	test_must_be_empty actual.err &&
+	test_path_is_missing submod &&
+	test_path_is_missing submod/.git &&
+	git status -s -uno >actual &&
+	test_cmp expect.both_deleted actual
 
-HEAD is now at 307367e subdir
-Saved working directory and index state WIP on main: 307367e subdir
-ok 80 - setup stash with index and worktree changes
+HEAD is now at 639dc8a add submodule
+rm '.gitmodules'
+ok 48 - rm does not complain when no .gitmodules file is found
 
-expecting success of 3903.81 'stash list -p shows simple diff': 
-	cat >expect <<-EOF &&
-	stash@{0}
+expecting success of 3600.49 'rm will error out on a modified .gitmodules file unless staged': 
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules foo.bar true &&
+	test_must_fail git rm submod >actual 2>actual.err &&
+	test_file_not_empty actual.err &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git diff-files --quiet -- submod &&
+	git add .gitmodules &&
+	git rm submod >actual 2>actual.err &&
+	test_must_be_empty actual.err &&
+	test_path_is_missing submod &&
+	test_path_is_missing submod/.git &&
+	git status -s -uno >actual &&
+	test_cmp expect actual
 
-	diff --git a/file b/file
-	index 257cc56..d26b33d 100644
-	--- a/file
-	+++ b/file
-	@@ -1 +1 @@
-	-foo
-	+working
-	EOF
-	git stash list --format=%gd -p >actual &&
-	diff_cmp expect actual
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+ok 49 - rm will error out on a modified .gitmodules file unless staged
 
-ok 81 - stash list -p shows simple diff
+expecting success of 3600.50 'rm will not error out on .gitmodules file with zero stat data': 
+	git reset --hard &&
+	git submodule update &&
+	git read-tree HEAD &&
+	git rm submod &&
+	test_path_is_missing submod
 
-expecting success of 3903.82 'stash list --cc shows combined diff': 
-	cat >expect <<-\EOF &&
-	stash@{0}
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+rm 'submod'
+ok 50 - rm will not error out on .gitmodules file with zero stat data
 
-	diff --cc file
-	index 257cc56,9015a7a..d26b33d
-	--- a/file
-	+++ b/file
-	@@@ -1,1 -1,1 +1,1 @@@
-	- foo
-	 -index
-	++working
-	EOF
-	git stash list --format=%gd -p --cc >actual &&
-	diff_cmp expect actual
+expecting success of 3600.51 'rm issues a warning when section is not found in .gitmodules': 
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules --remove-section submodule.sub &&
+	git add .gitmodules &&
+	echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
+	git rm submod >actual 2>actual.err &&
+	test_cmp expect.err actual.err &&
+	test_path_is_missing submod &&
+	test_path_is_missing submod/.git &&
+	git status -s -uno >actual &&
+	test_cmp expect actual
 
-ok 82 - stash list --cc shows combined diff
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+ok 51 - rm issues a warning when section is not found in .gitmodules
 
-expecting success of 3903.83 'stash is not confused by partial renames': 
-	mv file renamed &&
-	git add renamed &&
-	git stash &&
-	git stash apply &&
-	test_path_is_file renamed &&
-	test_path_is_missing file
+expecting success of 3600.52 'rm of a populated submodule with modifications fails unless forced': 
+	git reset --hard &&
+	git submodule update &&
+	echo X >submod/empty &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_inside actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-Saved working directory and index state WIP on main: 307367e subdir
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   renamed
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 52 - rm of a populated submodule with modifications fails unless forced
 
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    file
+expecting success of 3600.53 'rm of a populated submodule with untracked files fails unless forced': 
+	git reset --hard &&
+	git submodule update &&
+	echo X >submod/untracked &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_untracked actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 53 - rm of a populated submodule with untracked files fails unless forced
 
-ok 83 - stash is not confused by partial renames
+expecting success of 3600.54 'setup submodule conflict': 
+	git reset --hard &&
+	git submodule update &&
+	git checkout -b branch1 &&
+	echo 1 >nitfol &&
+	git add nitfol &&
+	git commit -m "added nitfol 1" &&
+	git checkout -b branch2 main &&
+	echo 2 >nitfol &&
+	git add nitfol &&
+	git commit -m "added nitfol 2" &&
+	git checkout -b conflict1 main &&
+	git -C submod fetch &&
+	git -C submod checkout branch1 &&
+	git add submod &&
+	git commit -m "submod 1" &&
+	git checkout -b conflict2 main &&
+	git -C submod checkout branch2 &&
+	git add submod &&
+	git commit -m "submod 2"
+
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+Switched to a new branch 'branch1'
+[branch1 d0e7df6] added nitfol 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nitfol
+Switched to a new branch 'branch2'
+[branch2 e3f3428] added nitfol 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nitfol
+Switched to a new branch 'conflict1'
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.
+ * [new branch]      branch1    -> origin/branch1
+ * [new branch]      branch2    -> origin/branch2
+ * [new branch]      conflict1  -> origin/conflict1
+Previous HEAD position was 5a08f40 subdir test
+Switched to a new branch 'branch1'
+branch 'branch1' set up to track 'origin/branch1'.
+[conflict1 8a835a1] submod 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'conflict2'
+M	submod
+Switched to a new branch 'branch2'
+branch 'branch2' set up to track 'origin/branch2'.
+[conflict2 db3aa7b] submod 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 54 - setup submodule conflict
 
-expecting success of 3903.84 'push -m shows right message': 
-	>foo &&
-	git add foo &&
-	git stash push -m "test message" &&
-	echo "stash@{0}: On main: test message" >expect &&
-	git stash list -1 >actual &&
+expecting success of 3600.55 'rm removes work tree of unmodified conflicted submodule': 
+	git checkout conflict1 &&
+	git reset --hard &&
+	git submodule update &&
+	test_must_fail git merge conflict2 &&
+	git rm submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-Saved working directory and index state On main: test message
-ok 84 - push -m shows right message
+Switched to branch 'conflict1'
+M	submod
+HEAD is now at 8a835a1 submod 1
+Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
+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 e3f3428
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'submod'
+ok 55 - rm removes work tree of unmodified conflicted submodule
 
-expecting success of 3903.85 'push -m also works without space': 
-	>foo &&
-	git add foo &&
-	git stash push -m"unspaced test message" &&
-	echo "stash@{0}: On main: unspaced test message" >expect &&
-	git stash list -1 >actual &&
-	test_cmp expect actual
+expecting success of 3600.56 'rm of a conflicted populated submodule with different HEAD fails unless forced': 
+	git checkout conflict1 &&
+	git reset --hard &&
+	git submodule update &&
+	git -C submod checkout HEAD^ &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-Saved working directory and index state On main: unspaced test message
-ok 85 - push -m also works without space
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at 8a835a1 submod 1
+Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
+Previous HEAD position was d0e7df6 added nitfol 1
+HEAD is now at 639dc8a add submodule
+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 e3f3428
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 56 - rm of a conflicted populated submodule with different HEAD fails unless forced
 
-expecting success of 3903.86 'store -m foo shows right message': 
-	git stash clear &&
+expecting success of 3600.57 'rm of a conflicted populated submodule with modifications fails unless forced': 
+	git checkout conflict1 &&
 	git reset --hard &&
-	echo quux >bazzy &&
-	git add bazzy &&
-	STASH_ID=$(git stash create) &&
-	git stash store -m "store m" $STASH_ID &&
-	echo "stash@{0}: store m" >expect &&
-	git stash list -1 >actual &&
-	test_cmp expect actual
+	git submodule update &&
+	echo X >submod/empty &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-HEAD is now at 307367e subdir
-ok 86 - store -m foo shows right message
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at 8a835a1 submod 1
+Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
+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 e3f3428
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 57 - rm of a conflicted populated submodule with modifications fails unless forced
 
-expecting success of 3903.87 'store -mfoo shows right message': 
-	git stash clear &&
+expecting success of 3600.58 'rm of a conflicted populated submodule with untracked files fails unless forced': 
+	git checkout conflict1 &&
 	git reset --hard &&
-	echo quux >bazzy &&
-	git add bazzy &&
-	STASH_ID=$(git stash create) &&
-	git stash store -m"store mfoo" $STASH_ID &&
-	echo "stash@{0}: store mfoo" >expect &&
-	git stash list -1 >actual &&
+	git submodule update &&
+	echo X >submod/untracked &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-HEAD is now at 307367e subdir
-ok 87 - store -mfoo shows right message
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at 8a835a1 submod 1
+Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
+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 e3f3428
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 58 - rm of a conflicted populated submodule with untracked files fails unless forced
 
-expecting success of 3903.88 'store --message=foo shows right message': 
-	git stash clear &&
+expecting success of 3600.59 'rm of a conflicted populated submodule with a .git directory fails even when forced': 
+	git checkout conflict1 &&
 	git reset --hard &&
-	echo quux >bazzy &&
-	git add bazzy &&
-	STASH_ID=$(git stash create) &&
-	git stash store --message="store message=foo" $STASH_ID &&
-	echo "stash@{0}: store message=foo" >expect &&
-	git stash list -1 >actual &&
-	test_cmp expect actual
+	git submodule update &&
+	(
+		cd submod &&
+		rm .git &&
+		cp -R ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_dir submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	test_must_fail git rm -f submod &&
+	test_path_is_dir submod &&
+	test_path_is_dir submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git merge --abort &&
+	rm -rf submod
 
-HEAD is now at 307367e subdir
-ok 88 - store --message=foo shows right message
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at 8a835a1 submod 1
+Submodule path 'submod': checked out 'd0e7df645bf4f519acd9bb638b4ba20d14b7a359'
+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 e3f3428
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+Migrating git directory of 'submod' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub'
+fatal: could not migrate git directory from '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
+Migrating git directory of 'submod' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub'
+fatal: could not migrate git directory from '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/.git' to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
+ok 59 - rm of a conflicted populated submodule with a .git directory fails even when forced
 
-expecting success of 3903.89 'store --message foo shows right message': 
-	git stash clear &&
+expecting success of 3600.60 'rm of a conflicted unpopulated submodule succeeds': 
+	git checkout conflict1 &&
 	git reset --hard &&
-	echo quux >bazzy &&
-	git add bazzy &&
-	STASH_ID=$(git stash create) &&
-	git stash store --message "store message foo" $STASH_ID &&
-	echo "stash@{0}: store message foo" >expect &&
-	git stash list -1 >actual &&
+	test_must_fail git merge conflict2 &&
+	git rm submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-HEAD is now at 307367e subdir
-ok 89 - store --message foo shows right message
+Already on 'conflict1'
+D	submod
+HEAD is now at 8a835a1 submod 1
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit e3f3428
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'submod'
+ok 60 - rm of a conflicted unpopulated submodule succeeds
 
-expecting success of 3903.90 'push -mfoo uses right message': 
-	>foo &&
-	git add foo &&
-	git stash push -m"test mfoo" &&
-	echo "stash@{0}: On main: test mfoo" >expect &&
-	git stash list -1 >actual &&
-	test_cmp expect actual
+expecting success of 3600.61 'rm of a populated submodule with a .git directory migrates git dir': 
+	git checkout -f main &&
+	git reset --hard &&
+	git submodule update &&
+	(
+		cd submod &&
+		rm .git &&
+		cp -R ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree &&
+		rm -r ../.git/modules/sub
+	) &&
+	git rm submod 2>output.err &&
+	test_path_is_missing submod &&
+	test_path_is_missing submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_file_not_empty actual &&
+	test_grep Migrating output.err
 
-Saved working directory and index state On main: test mfoo
-ok 90 - push -mfoo uses right message
+Switched to branch 'main'
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+rm 'submod'
+Migrating git directory of 'submod' from
+ok 61 - rm of a populated submodule with a .git directory migrates git dir
 
-expecting success of 3903.91 'push --message foo is synonym for -mfoo': 
-	>foo &&
-	git add foo &&
-	git stash push --message "test message foo" &&
-	echo "stash@{0}: On main: test message foo" >expect &&
-	git stash list -1 >actual &&
-	test_cmp expect actual
+expecting success of 3600.62 'setup subsubmodule': 
+	test_config_global protocol.file.allow always &&
+	git reset --hard &&
+	git submodule update &&
+	(
+		cd submod &&
+		hash=$(git rev-parse HEAD) &&
+		git update-index --add --cacheinfo 160000 "$hash" subsubmod &&
+		git config -f .gitmodules submodule.sub.url ../. &&
+		git config -f .gitmodules submodule.sub.path subsubmod &&
+		git submodule init &&
+		git add .gitmodules &&
+		git commit -m "add subsubmodule" &&
+		git submodule update subsubmod
+	) &&
+	git commit -a -m "added deep submodule"
 
-Saved working directory and index state On main: test message foo
-ok 91 - push --message foo is synonym for -mfoo
+HEAD is now at 639dc8a add submodule
+Submodule path 'submod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/.) registered for path 'subsubmod'
+[detached HEAD b2c2402] add subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmod
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3600-rm/submod/subsubmod'...
+done.
+Submodule path 'subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+[main 3a0be25] added deep submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 62 - setup subsubmodule
 
-expecting success of 3903.92 'push --message=foo is synonym for -mfoo': 
-	>foo &&
-	git add foo &&
-	git stash push --message="test message=foo" &&
-	echo "stash@{0}: On main: test message=foo" >expect &&
-	git stash list -1 >actual &&
+expecting success of 3600.63 'rm recursively removes work tree of unmodified submodules': 
+	git rm submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-Saved working directory and index state On main: test message=foo
-ok 92 - push --message=foo is synonym for -mfoo
+rm 'submod'
+ok 63 - rm recursively removes work tree of unmodified submodules
 
-expecting success of 3903.93 'push -m shows right message': 
-	>foo &&
-	git add foo &&
-	git stash push -m "test m foo" &&
-	echo "stash@{0}: On main: test m foo" >expect &&
-	git stash list -1 >actual &&
+expecting success of 3600.64 'rm of a populated nested submodule with different nested HEAD fails unless forced': 
+	git reset --hard &&
+	git submodule update --recursive &&
+	git -C submod/subsubmod checkout HEAD^ &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_inside actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-Saved working directory and index state On main: test m foo
-ok 93 - push -m shows right message
+HEAD is now at 3a0be25 added deep submodule
+Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
+Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+Previous HEAD position was 5a08f40 subdir test
+HEAD is now at 308e36c remove file from rm --quiet test
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 64 - rm of a populated nested submodule with different nested HEAD fails unless forced
 
-expecting success of 3903.94 'create stores correct message': 
-	>foo &&
-	git add foo &&
-	STASH_ID=$(git stash create "create test message") &&
-	echo "On main: create test message" >expect &&
-	git show --pretty=%s -s ${STASH_ID} >actual &&
+expecting success of 3600.65 'rm of a populated nested submodule with nested modifications fails unless forced': 
+	git reset --hard &&
+	git submodule update --recursive &&
+	echo X >submod/subsubmod/empty &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_inside actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-ok 94 - create stores correct message
+HEAD is now at 3a0be25 added deep submodule
+Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
+Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 65 - rm of a populated nested submodule with nested modifications fails unless forced
 
-expecting success of 3903.95 'create when branch name has /': 
-	test_when_finished "git checkout main" &&
-	git checkout -b some/topic &&
-	>foo &&
-	git add foo &&
-	STASH_ID=$(git stash create "create test message") &&
-	echo "On some/topic: create test message" >expect &&
-	git show --pretty=%s -s ${STASH_ID} >actual &&
+expecting success of 3600.66 'rm of a populated nested submodule with nested untracked files fails unless forced': 
+	git reset --hard &&
+	git submodule update --recursive &&
+	echo X >submod/subsubmod/untracked &&
+	test_must_fail git rm submod &&
+	test_path_is_dir submod &&
+	test_path_is_file submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_untracked actual &&
+	git rm -f submod &&
+	test_path_is_missing submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-Switched to a new branch 'some/topic'
-Switched to branch 'main'
-A	foo
-ok 95 - create when branch name has /
+HEAD is now at 3a0be25 added deep submodule
+Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
+Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 66 - rm of a populated nested submodule with nested untracked files fails unless forced
 
-expecting success of 3903.96 'create with multiple arguments for the message': 
-	>foo &&
-	git add foo &&
-	STASH_ID=$(git stash create test untracked) &&
-	echo "On main: test untracked" >expect &&
-	git show --pretty=%s -s ${STASH_ID} >actual &&
-	test_cmp expect actual
+expecting success of 3600.67 'rm absorbs submodule's nested .git directory': 
+	git reset --hard &&
+	git submodule update --recursive &&
+	(
+		cd submod/subsubmod &&
+		rm .git &&
+		mv ../../.git/modules/sub/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	git rm submod 2>output.err &&
+	test_path_is_missing submod &&
+	test_path_is_missing submod/subsubmod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_file_not_empty actual &&
+	test_grep Migrating output.err
 
-ok 96 - create with multiple arguments for the message
+HEAD is now at 3a0be25 added deep submodule
+Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
+Submodule path 'submod/subsubmod': checked out '5a08f409c5f8e886af660c5b2e2d84e5d1021a40'
+rm 'submod'
+Migrating git directory of 'submod/subsubmod' from
+ok 67 - rm absorbs submodule's nested .git directory
 
-expecting success of 3903.97 'create in a detached state': 
-	test_when_finished "git checkout main" &&
-	git checkout HEAD~1 &&
-	>foo &&
-	git add foo &&
-	STASH_ID=$(git stash create) &&
-	HEAD_ID=$(git rev-parse --short HEAD) &&
-	echo "WIP on (no branch): ${HEAD_ID} initial" >expect &&
-	git show --pretty=%s -s ${STASH_ID} >actual &&
-	test_cmp expect actual
+expecting success of 3600.68 'checking out a commit after submodule removal needs manual updates': 
+	git commit -m "submodule removal" submod .gitmodules &&
+	git checkout HEAD^ &&
+	git submodule update &&
+	git checkout -q HEAD^ &&
+	git checkout -q main 2>actual &&
+	test_grep "^warning: unable to rmdir 'submod':" actual &&
+	git status -s submod >actual &&
+	echo "?? submod/" >expected &&
+	test_cmp expected actual &&
+	rm -rf submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_must_be_empty actual
 
-Note: switching to 'HEAD~1'.
+[main a23000e] submodule removal
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 deletions(-)
+ delete mode 160000 submod
+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
@@ -240986,935 +240866,826 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 47d5e0e initial
-A	foo
-Previous HEAD position was 47d5e0e initial
-Switched to branch 'main'
-A	foo
-ok 97 - create in a detached state
+HEAD is now at 3a0be25 added deep submodule
+Submodule path 'submod': checked out 'b2c2402bd19123bf7a3cf2fb2eb6e8c93e95123e'
+warning: unable to rmdir 'submod': Directory not empty
+ok 68 - checking out a commit after submodule removal needs manual updates
 
-expecting success of 3903.98 'stash -- <pathspec> stashes and restores the file': 
-	>foo &&
-	>bar &&
-	git add foo bar &&
-	git stash push -- foo &&
-	test_path_is_file bar &&
-	test_path_is_missing foo &&
-	git stash pop &&
-	test_path_is_file foo &&
-	test_path_is_file bar
+expecting success of 3600.69 'rm of d/f when d has become a non-directory': 
+	rm -rf d &&
+	mkdir d &&
+	>d/f &&
+	git add d &&
+	rm -rf d &&
+	>d &&
+	git rm d/f &&
+	test_must_fail git rev-parse --verify :d/f &&
+	test_path_is_file d
 
-Saved working directory and index state WIP on main: 307367e subdir
-Merging Updated upstream with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   bar
-	new file:   foo
+rm 'd/f'
+fatal: Needed a single revision
+ok 69 - rm of d/f when d has become a non-directory
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+checking prerequisite: SYMLINKS
 
-Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
-ok 98 - stash -- <pathspec> stashes and restores the file
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success of 3903.99 'stash -- <pathspec> stashes in subdirectory': 
-	mkdir sub &&
-	>foo &&
-	>bar &&
-	git add foo bar &&
-	(
-		cd sub &&
-		git stash push -- ../foo
-	) &&
-	test_path_is_file bar &&
-	test_path_is_missing foo &&
-	git stash pop &&
-	test_path_is_file foo &&
-	test_path_is_file bar
+)
+prerequisite SYMLINKS ok
+expecting success of 3600.70 'rm of d/f when d has become a dangling symlink': 
+	rm -rf d &&
+	mkdir d &&
+	>d/f &&
+	git add d &&
+	rm -rf d &&
+	ln -s nonexistent d &&
+	git rm d/f &&
+	test_must_fail git rev-parse --verify :d/f &&
+	test -h d &&
+	test_path_is_missing d
 
-Saved working directory and index state WIP on main: 307367e subdir
-Merging Updated upstream with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   bar
-	new file:   foo
+rm 'd/f'
+fatal: Needed a single revision
+ok 70 - rm of d/f when d has become a dangling symlink
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+expecting success of 3600.71 'rm of file when it has become a directory': 
+	rm -rf d &&
+	>d &&
+	git add d &&
+	rm -f d &&
+	mkdir d &&
+	>d/f &&
+	test_must_fail git rm d &&
+	git rev-parse --verify :d &&
+	test_path_is_file d/f
 
-Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
-ok 99 - stash -- <pathspec> stashes in subdirectory
+fatal: git rm: 'd': Is a directory
+rm 'd'
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 71 - rm of file when it has become a directory
 
-expecting success of 3903.100 'stash with multiple pathspec arguments': 
-	>foo &&
-	>bar &&
-	>extra &&
-	git add foo bar extra &&
-	git stash push -- foo bar &&
-	test_path_is_missing bar &&
-	test_path_is_missing foo &&
-	test_path_is_file extra &&
-	git stash pop &&
-	test_path_is_file foo &&
-	test_path_is_file bar &&
-	test_path_is_file extra
+expecting success of 3600.72 'rm across a symlinked leading path (no index)': 
+	rm -rf d e &&
+	mkdir e &&
+	echo content >e/f &&
+	ln -s e d &&
+	git add -A e d &&
+	git commit -m "symlink d to e, e/f exists" &&
+	test_must_fail git rm d/f &&
+	git rev-parse --verify :d &&
+	git rev-parse --verify :e/f &&
+	test -h d &&
+	test_path_is_file e/f
 
-Saved working directory and index state WIP on main: 307367e subdir
-Merging Updated upstream with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   bar
-	new file:   extra
-	new file:   foo
+[main 15c6bcf] symlink d to e, e/f exists
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 120000 d
+ create mode 100644 e/f
+fatal: pathspec 'd/f' did not match any files
+9cbe6ea56f225388ae614c419249bfc6d734cc30
+d95f3ad14dee633a758d2e331151e950dd13e4ed
+ok 72 - rm across a symlinked leading path (no index)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+checking known breakage of 3600.73 'rm across a symlinked leading path (w/ index)': 
+	rm -rf d e &&
+	mkdir d &&
+	echo content >d/f &&
+	git add -A e d &&
+	git commit -m "d/f exists" &&
+	mv d e &&
+	ln -s e d &&
+	test_must_fail git rm d/f &&
+	git rev-parse --verify :d/f &&
+	test -h d &&
+	test_path_is_file e/f
 
-Dropped refs/stash@{0} (39084c1f0c9f714051bc864ea9bde5fe251804e7)
-ok 100 - stash with multiple pathspec arguments
+[main 362fe30] d/f exists
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ delete mode 120000 d
+ rename {e => d}/f (100%)
+rm 'd/f'
+test_must_fail: command succeeded: git rm d/f
+not ok 73 - rm across a symlinked leading path (w/ index) # TODO known breakage
 
-expecting success of 3903.101 'stash with file including $IFS character': 
-	>"foo bar" &&
-	>foo &&
-	>bar &&
-	git add foo* &&
-	git stash push -- "foo b*" &&
-	test_path_is_missing "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar &&
-	git stash pop &&
-	test_path_is_file "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar
+expecting success of 3600.74 'setup for testing rm messages': 
+	>bar.txt &&
+	>foo.txt &&
+	git add bar.txt foo.txt
 
-Saved working directory and index state WIP on main: 307367e subdir
-Merging Updated upstream with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   bar
-	new file:   extra
-	new file:   foo
-	new file:   foo bar
+ok 74 - setup for testing rm messages
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+expecting success of 3600.75 'rm files with different staged content': 
+	cat >expect <<-\EOF &&
+	error: the following files have staged content different from both the
+	file and the HEAD:
+	    bar.txt
+	    foo.txt
+	(use -f to force removal)
+	EOF
+	echo content1 >foo.txt &&
+	echo content1 >bar.txt &&
+	test_must_fail git rm foo.txt bar.txt 2>actual &&
+	test_cmp expect actual
 
-Dropped refs/stash@{0} (a0eb395f4ba4b07852ce751bcb1e058bceeddcd6)
-ok 101 - stash with file including $IFS character
+ok 75 - rm files with different staged content
 
-expecting success of 3903.102 'stash with pathspec matching multiple paths': 
-	echo original >file &&
-	echo original >other-file &&
-	git commit -m "two" file other-file &&
-	echo modified >file &&
-	echo modified >other-file &&
-	git stash push -- "*file" &&
-	echo original >expect &&
-	test_cmp expect file &&
-	test_cmp expect other-file &&
-	git stash pop &&
-	echo modified >expect &&
-	test_cmp expect file &&
-	test_cmp expect other-file
+expecting success of 3600.76 'rm files with different staged content without hints': 
+	cat >expect <<-\EOF &&
+	error: the following files have staged content different from both the
+	file and the HEAD:
+	    bar.txt
+	    foo.txt
+	EOF
+	echo content2 >foo.txt &&
+	echo content2 >bar.txt &&
+	test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
+	test_cmp expect actual
 
-[main 7a1ff97] two
+ok 76 - rm files with different staged content without hints
+
+expecting success of 3600.77 'rm file with local modification': 
+	cat >expect <<-\EOF &&
+	error: the following file has local modifications:
+	    foo.txt
+	(use --cached to keep the file, or -f to force removal)
+	EOF
+	git commit -m "testing rm 3" &&
+	echo content3 >foo.txt &&
+	test_must_fail git rm foo.txt 2>actual &&
+	test_cmp expect actual
+
+[main a02d987] testing rm 3
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Saved working directory and index state WIP on main: 7a1ff97 two
-Merging Updated upstream with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   bar
-	new file:   extra
-	new file:   foo
-	new file:   foo bar
+ 3 files changed, 1 deletion(-)
+ create mode 100644 bar.txt
+ delete mode 100644 d/f
+ create mode 100644 foo.txt
+ok 77 - rm file with local modification
 
-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:   other-file
+expecting success of 3600.78 'rm file with local modification without hints': 
+	cat >expect <<-\EOF &&
+	error: the following file has local modifications:
+	    bar.txt
+	EOF
+	echo content4 >bar.txt &&
+	test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
+	test_cmp expect actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	usage
+ok 78 - rm file with local modification without hints
 
-Dropped refs/stash@{0} (a99e49675f8b387c63ffade2c2dafb4b31242b77)
-ok 102 - stash with pathspec matching multiple paths
+expecting success of 3600.79 'rm file with changes in the index': 
+	cat >expect <<-\EOF &&
+	error: the following file has changes staged in the index:
+	    foo.txt
+	(use --cached to keep the file, or -f to force removal)
+	EOF
+	git reset --hard &&
+	echo content5 >foo.txt &&
+	git add foo.txt &&
+	test_must_fail git rm foo.txt 2>actual &&
+	test_cmp expect actual
 
-expecting success of 3903.103 'stash push -p with pathspec shows no changes only once': 
-	>foo &&
-	git add foo &&
-	git commit -m "tmp" &&
-	git stash push -p foo >actual &&
-	echo "No local changes to save" >expect &&
-	git reset --hard HEAD~ &&
+HEAD is now at a02d987 testing rm 3
+ok 79 - rm file with changes in the index
+
+expecting success of 3600.80 'rm file with changes in the index without hints': 
+	cat >expect <<-\EOF &&
+	error: the following file has changes staged in the index:
+	    foo.txt
+	EOF
+	test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
 	test_cmp expect actual
 
-[main 9c8fc7b] tmp
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
- create mode 100644 extra
- create mode 100644 foo
- create mode 100644 foo bar
-HEAD is now at 7a1ff97 two
-ok 103 - stash push -p with pathspec shows no changes only once
+ok 80 - rm file with changes in the index without hints
 
-expecting success of 3903.104 'push <pathspec>: show no changes when there are none': 
-	>foo &&
-	git add foo &&
-	git commit -m "tmp" &&
-	git stash push foo >actual &&
-	echo "No local changes to save" >expect &&
-	git reset --hard HEAD~ &&
+expecting success of 3600.81 'rm files with two different errors': 
+	cat >expect <<-\EOF &&
+	error: the following file has staged content different from both the
+	file and the HEAD:
+	    foo1.txt
+	(use -f to force removal)
+	error: the following file has changes staged in the index:
+	    bar1.txt
+	(use --cached to keep the file, or -f to force removal)
+	EOF
+	echo content >foo1.txt &&
+	git add foo1.txt &&
+	echo content6 >foo1.txt &&
+	echo content6 >bar1.txt &&
+	git add bar1.txt &&
+	test_must_fail git rm bar1.txt foo1.txt 2>actual &&
 	test_cmp expect actual
 
-[main a73bcf2] tmp
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-HEAD is now at 7a1ff97 two
-ok 104 - push <pathspec>: show no changes when there are none
+ok 81 - rm files with two different errors
 
-expecting success of 3903.105 'push: <pathspec> not in the repository errors out': 
-	>untracked &&
-	test_must_fail git stash push untracked &&
-	test_path_is_file untracked
+expecting success of 3600.82 'rm empty string should fail': 
+	test_must_fail git rm -rf ""
 
-error: pathspec ':(prefix:0)untracked' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 105 - push: <pathspec> not in the repository errors out
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 82 - rm empty string should fail
 
-expecting success of 3903.106 'push: -q is quiet with changes': 
-	>foo &&
-	git add foo &&
-	git stash push -q >output 2>&1 &&
-	test_must_be_empty output
+# still have 1 known breakage(s)
+# passed all remaining 81 test(s)
+1..82
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4040-whitespace-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 106 - push: -q is quiet with changes
+[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 3903.107 'push: -q is quiet with no changes': 
-	git stash push -q >output 2>&1 &&
-	test_must_be_empty output
+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
 
-ok 107 - push: -q is quiet with no changes
+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 3903.108 'push: -q is quiet even if there is no initial commit': 
-	git init foo_dir &&
-	test_when_finished rm -rf foo_dir &&
-	(
-		cd foo_dir &&
-		>bar &&
-		test_must_fail git stash push -q >output 2>&1 &&
-		test_must_be_empty output
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/foo_dir/.git/
-ok 108 - push: -q is quiet even if there is no initial commit
+ok 3 - diff-tree -b --exit-code
 
-expecting success of 3903.109 'untracked files are left in place when -u is not given': 
-	>file &&
-	git add file &&
-	>untracked &&
-	git stash push file &&
-	test_path_is_file untracked
+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
 
-Saved working directory and index state WIP on main: 7a1ff97 two
-ok 109 - untracked files are left in place when -u is not given
+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 3903.110 'stash without verb with pathspec': 
-	>"foo bar" &&
-	>foo &&
-	>bar &&
-	git add foo* &&
-	git stash -- "foo b*" &&
-	test_path_is_missing "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar &&
-	git stash pop &&
-	test_path_is_file "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar
+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
 
-Saved working directory and index state WIP on main: 7a1ff97 two
-Merging Updated upstream with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   foo
-	new file:   foo bar
+ok 5 - diff-index -b -p --cached --exit-code
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	bar
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	untracked
-	usage
+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
 
-Dropped refs/stash@{0} (ee2f40a7fbffdfcabacf51aaa804cdfb77cbd5cc)
-ok 110 - stash without verb with pathspec
+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 3903.111 'stash -k -- <pathspec> leaves unstaged files intact': 
-	git reset &&
-	>foo &&
-	>bar &&
-	git add foo bar &&
-	git commit -m "test" &&
-	echo "foo" >foo &&
-	echo "bar" >bar &&
-	git stash -k -- foo &&
-	test "",bar = $(cat foo),$(cat bar) &&
-	git stash pop &&
-	test foo,bar = $(cat foo),$(cat bar)
+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
 
-[main f03eb4e] test
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
- create mode 100644 foo
-Saved working directory and index state WIP on main: f03eb4e test
-Merging Version stash was based on with Stashed changes
-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:   bar
-	modified:   foo
+ok 7 - diff-index -b -p --exit-code
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	foo bar
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	untracked
-	usage
+expecting success of 4040.8 'diff-files --exit-code': 
+	test_must_fail git diff --exit-code &&
+	test_must_fail git diff-files --exit-code
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (ba2404f46c158deabdec1768576a3ec717c3bd0e)
-ok 111 - stash -k -- <pathspec> leaves unstaged files intact
+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 3903.112 'stash -- <subdir> leaves untracked files in subdir intact': 
-	git reset &&
-	>subdir/untracked &&
-	>subdir/tracked1 &&
-	>subdir/tracked2 &&
-	git add subdir/tracked* &&
-	git stash -- subdir/ &&
-	test_path_is_missing subdir/tracked1 &&
-	test_path_is_missing subdir/tracked2 &&
-	test_path_is_file subdir/untracked &&
-	git stash pop &&
-	test_path_is_file subdir/tracked1 &&
-	test_path_is_file subdir/tracked2 &&
-	test_path_is_file subdir/untracked
+expecting success of 4040.9 'diff-files -b -p --exit-code': 
+	git diff -b --exit-code &&
+	git diff-files -b -p --exit-code
 
-Unstaged changes after reset:
-M	bar
-M	foo
-Saved working directory and index state WIP on main: f03eb4e test
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   subdir/tracked1
-	new file:   subdir/tracked2
+ok 9 - diff-files -b -p --exit-code
 
-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:   bar
-	modified:   foo
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	foo bar
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	subdir/untracked
-	untracked
-	usage
+HEAD is now at 13a0478 second
+ok 10 - diff-files --diff-filter --quiet
 
-Dropped refs/stash@{0} (2749eb7e55d7636b47e46aaec96ad1ff54f3d24c)
-ok 112 - stash -- <subdir> leaves untracked files in subdir intact
+expecting success of 4040.11 'diff-tree --diff-filter --quiet': 
+	git commit -a -m "worktree state" &&
+	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
 
-expecting success of 3903.113 'stash -- <subdir> works with binary files': 
-	git reset &&
-	>subdir/untracked &&
-	>subdir/tracked &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png subdir/tracked-binary &&
-	git add subdir/tracked* &&
-	git stash -- subdir/ &&
-	test_path_is_missing subdir/tracked &&
-	test_path_is_missing subdir/tracked-binary &&
-	test_path_is_file subdir/untracked &&
-	git stash pop &&
-	test_path_is_file subdir/tracked &&
-	test_path_is_file subdir/tracked-binary &&
-	test_path_is_file subdir/untracked
+[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
 
-Unstaged changes after reset:
-M	bar
-M	foo
-Saved working directory and index state WIP on main: f03eb4e test
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   subdir/tracked
-	new file:   subdir/tracked-binary
-	new file:   subdir/tracked1
-	new file:   subdir/tracked2
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4043-diff-rename-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
 
-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:   bar
-	modified:   foo
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	foo bar
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	subdir/untracked
-	untracked
-	usage
+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/"
 
-Dropped refs/stash@{0} (e57a3ec7bcb89795529c05afe9c1d3759e31605b)
-ok 113 - stash -- <subdir> works with binary files
+[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 3903.114 'stash with user.name and user.email set works': 
-	test_config user.name "A U Thor" &&
-	test_config user.email "a.u@thor" &&
-	git stash
+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
 
-Saved working directory and index state WIP on main: f03eb4e test
-ok 114 - stash with user.name and user.email set works
+ok 3 - git show -C -C report renames
 
-expecting success of 3903.115 'stash works when user.name and user.email are not set': 
-	git reset &&
-	>1 &&
-	git add 1 &&
-	echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" >expect &&
-	git stash &&
-	git show -s --format="%an <%ae>" refs/stash >actual &&
-	test_cmp expect actual &&
-	>2 &&
-	git add 2 &&
-	test_config user.useconfigonly true &&
-	(
-		sane_unset GIT_AUTHOR_NAME &&
-		sane_unset GIT_AUTHOR_EMAIL &&
-		sane_unset GIT_COMMITTER_NAME &&
-		sane_unset GIT_COMMITTER_EMAIL &&
-		test_unconfig user.email &&
-		test_unconfig user.name &&
-		test_must_fail git commit -m "should fail" &&
-		echo "git stash <git@stash>" >expect &&
-		>2 &&
-		git stash &&
-		git show -s --format="%an <%ae>" refs/stash >actual &&
-		test_cmp expect actual
-	)
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4044-diff-index-unique-abbrev.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4044-diff-index-unique-abbrev/.git/
+expecting success of 4044.1 'setup': 
+	test_oid_cache <<-EOF &&
+	val1 sha1:4827
+	val1 sha256:5664
 
-Saved working directory and index state WIP on main: f03eb4e test
-Author identity unknown
+	val2 sha1:11742
+	val2 sha256:10625
 
-*** Please tell me who you are.
+	hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1
+	hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350
 
-Run
+	hasht1 sha1:51d27384
+	hasht1 sha256:ae31dfff
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+	hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47
+	hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+	hasht2 sha1:51d2738e
+	hasht2 sha256:ae31dffa
+	EOF
 
-fatal: no email was given and auto-detection is disabled
-Saved working directory and index state WIP on main: f03eb4e test
-ok 115 - stash works when user.name and user.email are not set
+	cat >expect_initial <<-EOF &&
+	100644 blob $(test_oid hash1)	foo
+	EOF
 
-expecting success of 3903.116 'stash --keep-index with file deleted in index does not resurrect it on disk': 
-	test_commit to-remove to-remove &&
-	git rm to-remove &&
-	git stash --keep-index &&
-	test_path_is_missing to-remove
+	cat >expect_update <<-EOF &&
+	100644 blob $(test_oid hash2)	foo
+	EOF
 
-[main ebe821f] to-remove
+	test_oid val1 > foo &&
+	git add foo &&
+	git commit -m "initial" &&
+	git cat-file -p HEAD: > actual &&
+	test_cmp expect_initial actual &&
+	test_oid val2 > foo &&
+	git commit -a -m "update" &&
+	git cat-file -p HEAD: > actual &&
+	test_cmp expect_update actual
+
+[master (root-commit) eaa2693] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 to-remove
-rm 'to-remove'
-Saved working directory and index state WIP on main: ebe821f to-remove
-ok 116 - stash --keep-index with file deleted in index does not resurrect it on disk
-
-expecting success of 3903.117 'stash --keep-index --include-untracked with empty tree': 
-	test_when_finished "rm -rf empty" &&
-	git init empty &&
-	(
-		cd empty &&
-		git commit --allow-empty --message "empty" &&
-		echo content >file &&
-		git stash push --keep-index --include-untracked &&
-		test_path_is_missing file &&
-		git stash pop &&
-		echo content >expect &&
-		test_cmp expect file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/empty/.git/
-[main (root-commit) 7812b59] empty
+ create mode 100644 foo
+[master 90cb371] update
  Author: A U Thor <author@example.com>
-Saved working directory and index state WIP on main: 7812b59 empty
-Merging Version stash was based on with Stashed changes
-Already up to date.
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	file
-
-nothing added to commit but untracked files present (use "git add" to track)
-Dropped refs/stash@{0} (52b67168d00fa877d08441e3c26c6e24e4a24f3c)
-ok 117 - stash --keep-index --include-untracked with empty tree
-
-expecting success of 3903.118 'stash apply should succeed with unmodified file': 
-	echo base >file &&
-	git add file &&
-	git commit -m base &&
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-	# now stash a modification
-	echo modified >file &&
-	git stash &&
+expecting success of 4044.2 'diff does not produce ambiguous index line': 
+	git diff HEAD^..HEAD | grep index > actual &&
+	test_cmp expect actual
 
-	# make the file stat dirty
-	cp file other &&
-	mv other file &&
+ok 2 - diff does not produce ambiguous index line
 
-	git stash apply
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4042-diff-textconv-caching.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4042-diff-textconv-caching/.git/
+expecting success of 4042.1 'setup': 
+	echo foo content 1 >foo.bin &&
+	echo bar content 1 >bar.bin &&
+	git add . &&
+	git commit -m one &&
+	foo1=$(git rev-parse --short HEAD:foo.bin) &&
+	bar1=$(git rev-parse --short HEAD:bar.bin) &&
+	echo foo content 2 >foo.bin &&
+	echo bar content 2 >bar.bin &&
+	git commit -a -m two &&
+	foo2=$(git rev-parse --short HEAD:foo.bin) &&
+	bar2=$(git rev-parse --short HEAD:bar.bin) &&
+	echo "*.bin diff=magic" >.gitattributes &&
+	git config diff.magic.textconv ./helper &&
+	git config diff.magic.cachetextconv true
 
-[main 618e8ea] base
+[master (root-commit) e62c20e] one
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 2 deletions(-)
- delete mode 100644 to-remove
-Saved working directory and index state WIP on main: 618e8ea base
-Merging Version stash was based on with Stashed changes
-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:   file
+ 3 files changed, 5 insertions(+)
+ create mode 100644 bar.bin
+ create mode 100644 foo.bin
+ create mode 100755 helper
+[master ea2ff12] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	err
-	expect
-	expect1
-	expect2
-	expected
-	file2.diff
-	foo bar
-	out
-	output
-	output.out
-	repo/
-	subdir/subfile2
-	subdir/untracked
-	untracked
-	usage
+expecting success of 4042.2 'first textconv works': 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 118 - stash apply should succeed with unmodified file
+ok 2 - first textconv works
 
-expecting success of 3903.119 'stash handles skip-worktree entries nicely': 
-	test_commit A &&
-	echo changed >A.t &&
-	git add A.t &&
-	git update-index --skip-worktree A.t &&
-	rm A.t &&
-	git stash &&
+expecting success of 4042.3 'cached textconv produces same output': 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
 
-	git rev-parse --verify refs/stash:A.t
+ok 3 - cached textconv produces same output
 
-[main 3d10817] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Saved working directory and index state WIP on main: 3d10817 A
-5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-ok 119 - stash handles skip-worktree entries nicely
+expecting success of 4042.4 'cached textconv does not run helper': 
+	rm -f helper.out &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual &&
+	! test -r helper.out
 
-expecting success of 3903.120 'stash with core.fsyncmethod=batch': 
-	test_create_unique_files 2 4 files_base_dir &&
-	GIT_TEST_FSYNC=1 git -c core.fsync=loose-object -c core.fsyncmethod=batch stash push -u -- ./files_base_dir/ &&
+ok 4 - cached textconv does not run helper
 
-	# The files were untracked, so use the third parent,
-	# which contains the untracked files
-	git ls-tree -r stash^3 -- ./files_base_dir/ |
-	test_parse_ls_tree_oids >stashed_files_oids &&
+expecting success of 4042.5 'changing textconv invalidates cache': 
+	echo other >other &&
+	git config diff.magic.textconv "./helper other" &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
 
-	# We created 2 dirs with 4 files each (8 files total) above
-	test_line_count = 8 stashed_files_oids &&
-	git cat-file --batch-check='%(objectname)' <stashed_files_oids >stashed_files_actual &&
-	test_cmp stashed_files_oids stashed_files_actual
+ok 5 - changing textconv invalidates cache
 
-Saved working directory and index state WIP on main: 3d10817 A
-ok 120 - stash with core.fsyncmethod=batch
+expecting success of 4042.6 'switching diff driver produces correct results': 
+	git config diff.moremagic.textconv ./helper &&
+	echo foo.bin diff=moremagic >>.gitattributes &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 3903.121 'git stash succeeds despite directory/file change': 
-	test_create_repo directory_file_switch_v1 &&
-	(
-		cd directory_file_switch_v1 &&
-		test_commit init &&
+ok 6 - switching diff driver produces correct results
 
-		test_write_lines this file has some words >filler &&
-		git add filler &&
-		git commit -m filler &&
+expecting success of 4042.7 'log notes cache and still use cache for -p': 
+	git log --no-walk -p refs/notes/textconv/magic HEAD
 
-		git rm filler &&
-		mkdir filler &&
-		echo contents >filler/file &&
-		git stash push
-	)
+commit 9c639377525bb0485f64e3a844123312ec98541e
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/directory_file_switch_v1/.git/
-[main (root-commit) 23406b7] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[main 90d1f39] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-rm 'filler'
-Saved working directory and index state WIP on main: 90d1f39 filler
-ok 121 - git stash succeeds despite directory/file change
+    ./helper other
 
-expecting success of 3903.122 'git stash can pop file -> directory saved changes': 
-	test_create_repo directory_file_switch_v2 &&
-	(
-		cd directory_file_switch_v2 &&
-		test_commit init &&
+diff --git a/1345db2c9189a61ef9932f66b656afc986bee58f b/1345db2c9189a61ef9932f66b656afc986bee58f
+new file mode 100644
+index 0000000..01b25c5
+--- /dev/null
++++ b/1345db2c9189a61ef9932f66b656afc986bee58f
+@@ -0,0 +1,2 @@
++converted: other
++converted: foo content 2
+diff --git a/28283d51eeb71548ff81d02404b90103b494b983 b/28283d51eeb71548ff81d02404b90103b494b983
+new file mode 100644
+index 0000000..dcd63a4
+--- /dev/null
++++ b/28283d51eeb71548ff81d02404b90103b494b983
+@@ -0,0 +1,2 @@
++converted: other
++converted: bar content 2
+diff --git a/d5b9fe314e6004caf906e730045d20689167b3fb b/d5b9fe314e6004caf906e730045d20689167b3fb
+new file mode 100644
+index 0000000..7ef0353
+--- /dev/null
++++ b/d5b9fe314e6004caf906e730045d20689167b3fb
+@@ -0,0 +1,2 @@
++converted: other
++converted: foo content 1
+diff --git a/fcf91668044fda4a569b9374589b26dada7adc49 b/fcf91668044fda4a569b9374589b26dada7adc49
+new file mode 100644
+index 0000000..5ead606
+--- /dev/null
++++ b/fcf91668044fda4a569b9374589b26dada7adc49
+@@ -0,0 +1,2 @@
++converted: other
++converted: bar content 1
 
-		test_write_lines this file has some words >filler &&
-		git add filler &&
-		git commit -m filler &&
+commit ea2ff12718498fa427bb0f1e263e2ba2e26a440d
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-		git rm filler &&
-		mkdir filler &&
-		echo contents >filler/file &&
-		cp filler/file expect &&
-		git stash push --include-untracked &&
-		git stash apply --index &&
-		test_cmp expect filler/file
-	)
+    two
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/directory_file_switch_v2/.git/
-[main (root-commit) 23406b7] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[main 90d1f39] filler
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 filler
-rm 'filler'
-Saved working directory and index state WIP on main: 90d1f39 filler
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	deleted:    filler
+diff --git a/bar.bin b/bar.bin
+index fcf9166..28283d5 100644
+--- a/bar.bin
++++ b/bar.bin
+@@ -1,2 +1,2 @@
+ converted: other
+-converted: bar content 1
++converted: bar content 2
+diff --git a/foo.bin b/foo.bin
+index d5b9fe3..1345db2 100644
+--- a/foo.bin
++++ b/foo.bin
+@@ -1 +1 @@
+-converted: foo content 1
++converted: foo content 2
+ok 7 - log notes cache and still use cache for -p
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	filler/
+expecting success of 4042.8 'caching is silently ignored outside repo': 
+	mkdir -p non-repo &&
+	echo one >non-repo/one &&
+	echo two >non-repo/two &&
+	echo "* diff=test" >attr &&
+	test_expect_code 1 \
+	nongit git -c core.attributesFile="$PWD/attr" \
+		   -c diff.test.textconv="tr a-z A-Z <" \
+		   -c diff.test.cachetextconv=true \
+		   diff --no-index one two >actual &&
+	cat >expect <<-\EOF &&
+	diff --git a/one b/two
+	index 5626abf..f719efd 100644
+	--- a/one
+	+++ b/two
+	@@ -1 +1 @@
+	-ONE
+	+TWO
+	EOF
+	test_cmp expect actual
 
-ok 122 - git stash can pop file -> directory saved changes
+ok 8 - caching is silently ignored outside repo
 
-expecting success of 3903.123 'git stash can pop directory -> file saved changes': 
-	test_create_repo directory_file_switch_v3 &&
-	(
-		cd directory_file_switch_v3 &&
-		test_commit init &&
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4046-diff-unmerged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4046-diff-unmerged/.git/
+expecting success of 4046.1 'setup': 
+	for i in 0 1 2 3
+	do
+		blob=$(echo $i | git hash-object --stdin) &&
+		eval "blob$i=$blob" &&
+		eval "m$i=\"100644 \$blob$i $i\"" || return 1
+	done &&
+	paths= &&
+	for b in o x
+	do
+		for o in o x
+		do
+			for t in o x
+			do
+				path="$b$o$t" &&
+				if test "$path" != ooo
+				then
+					paths="$paths$path " &&
+					p="	$path" &&
+					case "$b" in x) echo "$m1$p" ;; esac &&
+					case "$o" in x) echo "$m2$p" ;; esac &&
+					case "$t" in x) echo "$m3$p" ;; esac ||
+					return 1
+				fi
+			done
+		done
+	done >ls-files-s.expect &&
+	git update-index --index-info <ls-files-s.expect &&
+	git ls-files -s >ls-files-s.actual &&
+	test_cmp ls-files-s.expect ls-files-s.actual
 
-		mkdir filler &&
-		test_write_lines some words >filler/file1 &&
-		test_write_lines and stuff >filler/file2 &&
-		git add filler &&
-		git commit -m filler &&
+ok 1 - setup
 
-		git rm -rf filler &&
-		echo contents >filler &&
-		cp filler expect &&
-		git stash push --include-untracked &&
-		git stash apply --index &&
-		test_cmp expect filler
-	)
+expecting success of 4046.2 'diff-files -0': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" || return 1
+	done >diff-files-0.expect &&
+	git diff-files -0 >diff-files-0.actual &&
+	test_cmp diff-files-0.expect diff-files-0.actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/directory_file_switch_v3/.git/
-[main (root-commit) 23406b7] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[main 7b72c0a] filler
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 filler/file1
- create mode 100644 filler/file2
-rm 'filler/file1'
-rm 'filler/file2'
-Saved working directory and index state WIP on main: 7b72c0a filler
-Merging Version stash was based on with Stashed changes
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	deleted:    filler/file1
-	deleted:    filler/file2
+ok 2 - diff-files -0
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	filler
+expecting success of 4046.3 'diff-files -1': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
+		case "$path" in
+		x??) echo ":100644 100644 $blob1 $ZERO_OID M	$path"
+		esac || return 1
+	done >diff-files-1.expect &&
+	git diff-files -1 >diff-files-1.actual &&
+	test_cmp diff-files-1.expect diff-files-1.actual
 
-ok 123 - git stash can pop directory -> file saved changes
+ok 3 - diff-files -1
 
-expecting success of 3903.124 'restore untracked files even when we hit conflicts': 
-	git init restore_untracked_after_conflict &&
-	(
-		cd restore_untracked_after_conflict &&
+expecting success of 4046.4 'diff-files -2': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
+		case "$path" in
+		?x?) echo ":100644 100644 $blob2 $ZERO_OID M	$path"
+		esac || return 1
+	done >diff-files-2.expect &&
+	git diff-files -2 >diff-files-2.actual &&
+	test_cmp diff-files-2.expect diff-files-2.actual &&
+	git diff-files >diff-files-default-2.actual &&
+	test_cmp diff-files-2.expect diff-files-default-2.actual
 
-		echo hi >a &&
-		echo there >b &&
-		git add . &&
-		git commit -m first &&
-		echo hello >a &&
-		echo something >c &&
+ok 4 - diff-files -2
 
-		git stash push --include-untracked &&
+expecting success of 4046.5 'diff-files -3': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
+		case "$path" in
+		??x) echo ":100644 100644 $blob3 $ZERO_OID M	$path"
+		esac || return 1
+	done >diff-files-3.expect &&
+	git diff-files -3 >diff-files-3.actual &&
+	test_cmp diff-files-3.expect diff-files-3.actual
 
-		echo conflict >a &&
-		git add a &&
-		git commit -m second &&
+ok 5 - diff-files -3
 
-		test_must_fail git stash pop &&
+expecting success of 4046.6 'diff --stat': 
+	for path in $paths
+	do
+		echo " $path | Unmerged" || return 1
+	done >diff-stat.expect &&
+	echo " 0 files changed" >>diff-stat.expect &&
+	git diff --cached --stat >diff-stat.actual &&
+	test_cmp diff-stat.expect diff-stat.actual
 
-		test_path_is_file c
-	)
+ok 6 - diff --stat
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/restore_untracked_after_conflict/.git/
-[main (root-commit) fab7b0e] first
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Saved working directory and index state WIP on main: fab7b0e first
-[main 3101a13] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merging Updated upstream with Stashed changes
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-On branch main
-Unmerged paths:
-  (use "git restore --staged <file>..." to unstage)
-  (use "git add <file>..." to mark resolution)
-	both modified:   a
+expecting success of 4046.7 'diff --quiet': 
+	test_expect_code 1 git diff --cached --quiet
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	c
+ok 7 - diff --quiet
 
-no changes added to commit (use "git add" and/or "git commit -a")
-The stash entry is kept in case you need it again.
-ok 124 - restore untracked files even when we hit conflicts
+expecting success of 4046.8 'diff --quiet --ignore-all-space': 
+	test_expect_code 1 git diff --cached --quiet --ignore-all-space
 
-expecting success of 3903.125 'stash create reports a locked index': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A A.file &&
-		echo change >A.file &&
-		touch .git/index.lock &&
+ok 8 - diff --quiet --ignore-all-space
 
-		cat >expect <<-EOF &&
-		error: could not write index
-		EOF
-		test_must_fail git stash create 2>err &&
-		test_cmp expect err
-	)
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4049-diff-stat-count.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4049-diff-stat-count/.git/
+expecting success of 4049.1 'setup': 
+	>a &&
+	>b &&
+	>c &&
+	>d &&
+	git add a b c d &&
+	git commit -m initial
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
-[main df044f8] A
+[master (root-commit) 000d1c1] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.file
-ok 125 - stash create reports a locked index
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 d
+ok 1 - setup
 
-expecting success of 3903.126 'stash push reports a locked index': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A A.file &&
-		echo change >A.file &&
-		touch .git/index.lock &&
+expecting success of 4049.2 'mode-only change show as a 0-line change': 
+	git reset --hard &&
+	test_chmod +x b d &&
+	echo a >a &&
+	echo c >c &&
+	cat >expect <<-\EOF &&
+	 a | 1 +
+	 b | 0
+	 ...
+	 4 files changed, 2 insertions(+)
+	EOF
+	git diff --stat --stat-count=2 HEAD >actual &&
+	test_cmp expect actual
 
-		cat >expect <<-EOF &&
-		error: could not write index
-		EOF
-		test_must_fail git stash push 2>err &&
-		test_cmp expect err
-	)
+HEAD is now at 000d1c1 initial
+ok 2 - mode-only change show as a 0-line change
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
-[main (root-commit) a7c3470] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.file
-ok 126 - stash push reports a locked index
+expecting success of 4049.3 'binary changes do not count in lines': 
+	git reset --hard &&
+	echo a >a &&
+	echo c >c &&
+	cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
+	cat >expect <<-\EOF &&
+	 a | 1 +
+	 c | 1 +
+	 ...
+	 3 files changed, 2 insertions(+)
+	EOF
+	git diff --stat --stat-count=2 >actual &&
+	test_cmp expect actual
 
-expecting success of 3903.127 'stash apply reports a locked index': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A A.file &&
-		echo change >A.file &&
-		git stash push &&
-		touch .git/index.lock &&
+HEAD is now at 000d1c1 initial
+ok 3 - binary changes do not count in lines
 
-		cat >expect <<-EOF &&
-		error: could not write index
-		EOF
-		test_must_fail git stash apply 2>err &&
-		test_cmp expect err
-	)
+expecting success of 4049.4 'exclude unmerged entries from total file count': 
+	git reset --hard &&
+	echo a >a &&
+	echo b >b &&
+	git ls-files -s a >x &&
+	git rm -f d &&
+	for stage in 1 2 3
+	do
+		sed -e "s/ 0	a/ $stage	d/" x || return 1
+	done |
+	git update-index --index-info &&
+	echo d >d &&
+	cat >expect <<-\EOF &&
+	 a | 1 +
+	 b | 1 +
+	 ...
+	 3 files changed, 3 insertions(+)
+	EOF
+	git diff --stat --stat-count=2 >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t3903-stash/repo/.git/
-[main (root-commit) a7c3470] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.file
-Saved working directory and index state WIP on main: a7c3470 A
-ok 127 - stash apply reports a locked index
+HEAD is now at 000d1c1 initial
+rm 'd'
+ok 4 - exclude unmerged entries from total file count
 
-# still have 2 known breakage(s)
-# passed all remaining 125 test(s)
-1..127
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4015-diff-whitespace.sh ***
@@ -244956,86 +244727,156 @@
 1..131
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4049-diff-stat-count.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4049-diff-stat-count/.git/
-expecting success of 4049.1 'setup': 
-	>a &&
-	>b &&
-	>c &&
-	>d &&
-	git add a b c d &&
-	git commit -m initial
+*** t4048-diff-combined-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4048-diff-combined-binary/.git/
+expecting success of 4048.1 'setup binary merge conflict': 
+	echo oneQ1 | q_to_nul >binary &&
+	git add binary &&
+	git commit -m one &&
+	echo twoQ2 | q_to_nul >binary &&
+	git commit -a -m two &&
+	two=$(git rev-parse --short HEAD:binary) &&
+	git checkout -b branch-binary HEAD^ &&
+	echo threeQ3 | q_to_nul >binary &&
+	git commit -a -m three &&
+	three=$(git rev-parse --short HEAD:binary) &&
+	test_must_fail git merge main &&
+	echo resolvedQhooray | q_to_nul >binary &&
+	git commit -a -m resolved &&
+	res=$(git rev-parse --short HEAD:binary)
 
-[master (root-commit) 000d1c1] initial
+[main (root-commit) 4aaee60] one
  Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 d
-ok 1 - setup
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary
+[main 37524dd] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Switched to a new branch 'branch-binary'
+[branch-binary f388a1d] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+warning: Cannot merge binary files: binary (HEAD vs. main)
+Auto-merging binary
+CONFLICT (content): Merge conflict in binary
+Automatic merge failed; fix conflicts and then commit the result.
+[branch-binary bc3cee3] resolved
+ Author: A U Thor <author@example.com>
+ok 1 - setup binary merge conflict
 
-expecting success of 4049.2 'mode-only change show as a 0-line change': 
-	git reset --hard &&
-	test_chmod +x b d &&
-	echo a >a &&
-	echo c >c &&
-	cat >expect <<-\EOF &&
-	 a | 1 +
-	 b | 0
-	 ...
-	 4 files changed, 2 insertions(+)
-	EOF
-	git diff --stat --stat-count=2 HEAD >actual &&
+expecting success of 4048.2 'diff -m indicates binary-ness': 
+	git show --format=%s -m >actual &&
 	test_cmp expect actual
 
-HEAD is now at 000d1c1 initial
-ok 2 - mode-only change show as a 0-line change
+ok 2 - diff -m indicates binary-ness
 
-expecting success of 4049.3 'binary changes do not count in lines': 
-	git reset --hard &&
-	echo a >a &&
-	echo c >c &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
-	cat >expect <<-\EOF &&
-	 a | 1 +
-	 c | 1 +
-	 ...
-	 3 files changed, 2 insertions(+)
-	EOF
-	git diff --stat --stat-count=2 >actual &&
+expecting success of 4048.3 'diff -c indicates binary-ness': 
+	git show --format=%s -c >actual &&
 	test_cmp expect actual
 
-HEAD is now at 000d1c1 initial
-ok 3 - binary changes do not count in lines
+ok 3 - diff -c indicates binary-ness
 
-expecting success of 4049.4 'exclude unmerged entries from total file count': 
-	git reset --hard &&
-	echo a >a &&
-	echo b >b &&
-	git ls-files -s a >x &&
-	git rm -f d &&
-	for stage in 1 2 3
-	do
-		sed -e "s/ 0	a/ $stage	d/" x || return 1
-	done |
-	git update-index --index-info &&
-	echo d >d &&
-	cat >expect <<-\EOF &&
-	 a | 1 +
-	 b | 1 +
-	 ...
-	 3 files changed, 3 insertions(+)
-	EOF
-	git diff --stat --stat-count=2 >actual &&
+expecting success of 4048.4 'diff --cc indicates binary-ness': 
+	git show --format=%s --cc >actual &&
 	test_cmp expect actual
 
-HEAD is now at 000d1c1 initial
-rm 'd'
-ok 4 - exclude unmerged entries from total file count
+ok 4 - diff --cc indicates binary-ness
 
-# passed all 4 test(s)
-1..4
+expecting success of 4048.5 'setup non-binary with binary attribute': 
+	git checkout main &&
+	test_commit one text &&
+	test_commit two text &&
+	two=$(git rev-parse --short HEAD:text) &&
+	git checkout -b branch-text HEAD^ &&
+	test_commit three text &&
+	three=$(git rev-parse --short HEAD:text) &&
+	test_must_fail git merge main &&
+	test_commit resolved text &&
+	res=$(git rev-parse --short HEAD:text) &&
+	echo text -diff >.gitattributes
+
+Switched to branch 'main'
+[main faa5b8e] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 text
+[main 84c76a1] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch-text'
+[branch-text 9b74371] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging text
+CONFLICT (content): Merge conflict in text
+Automatic merge failed; fix conflicts and then commit the result.
+[branch-text c916fed] resolved
+ Author: A U Thor <author@example.com>
+ok 5 - setup non-binary with binary attribute
+
+expecting success of 4048.6 'diff -m respects binary attribute': 
+	git show --format=%s -m >actual &&
+	test_cmp expect actual
+
+ok 6 - diff -m respects binary attribute
+
+expecting success of 4048.7 'diff -c respects binary attribute': 
+	git show --format=%s -c >actual &&
+	test_cmp expect actual
+
+ok 7 - diff -c respects binary attribute
+
+expecting success of 4048.8 'diff --cc respects binary attribute': 
+	git show --format=%s --cc >actual &&
+	test_cmp expect actual
+
+ok 8 - diff --cc respects binary attribute
+
+expecting success of 4048.9 'setup textconv attribute': 
+	echo "text diff=upcase" >.gitattributes &&
+	git config diff.upcase.textconv "tr a-z A-Z <"
+
+ok 9 - setup textconv attribute
+
+expecting success of 4048.10 'diff -m respects textconv attribute': 
+	git show --format=%s -m >actual &&
+	test_cmp expect actual
+
+ok 10 - diff -m respects textconv attribute
+
+expecting success of 4048.11 'diff -c respects textconv attribute': 
+	git show --format=%s -c >actual &&
+	test_cmp expect actual
+
+ok 11 - diff -c respects textconv attribute
+
+expecting success of 4048.12 'diff --cc respects textconv attribute': 
+	git show --format=%s --cc >actual &&
+	test_cmp expect actual
+
+ok 12 - diff --cc respects textconv attribute
+
+expecting success of 4048.13 'diff-tree plumbing does not respect textconv': 
+	git diff-tree HEAD -c -p >full &&
+	tail -n +2 full >actual &&
+	test_cmp expect actual
+
+ok 13 - diff-tree plumbing does not respect textconv
+
+expecting success of 4048.14 'diff --cc respects textconv on worktree file': 
+	git reset --hard HEAD^ &&
+	test_must_fail git merge main &&
+	git diff >actual &&
+	test_cmp expect actual
+
+HEAD is now at 9b74371 three
+Auto-merging text
+CONFLICT (content): Merge conflict in text
+Automatic merge failed; fix conflicts and then commit the result.
+ok 14 - diff --cc respects textconv on worktree file
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4050-diff-histogram.sh ***
@@ -245737,260 +245578,6 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4048-diff-combined-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4048-diff-combined-binary/.git/
-expecting success of 4048.1 'setup binary merge conflict': 
-	echo oneQ1 | q_to_nul >binary &&
-	git add binary &&
-	git commit -m one &&
-	echo twoQ2 | q_to_nul >binary &&
-	git commit -a -m two &&
-	two=$(git rev-parse --short HEAD:binary) &&
-	git checkout -b branch-binary HEAD^ &&
-	echo threeQ3 | q_to_nul >binary &&
-	git commit -a -m three &&
-	three=$(git rev-parse --short HEAD:binary) &&
-	test_must_fail git merge main &&
-	echo resolvedQhooray | q_to_nul >binary &&
-	git commit -a -m resolved &&
-	res=$(git rev-parse --short HEAD:binary)
-
-[main (root-commit) 4aaee60] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary
-[main 37524dd] two
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Switched to a new branch 'branch-binary'
-[branch-binary f388a1d] three
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-warning: Cannot merge binary files: binary (HEAD vs. main)
-Auto-merging binary
-CONFLICT (content): Merge conflict in binary
-Automatic merge failed; fix conflicts and then commit the result.
-[branch-binary bc3cee3] resolved
- Author: A U Thor <author@example.com>
-ok 1 - setup binary merge conflict
-
-expecting success of 4048.2 'diff -m indicates binary-ness': 
-	git show --format=%s -m >actual &&
-	test_cmp expect actual
-
-ok 2 - diff -m indicates binary-ness
-
-expecting success of 4048.3 'diff -c indicates binary-ness': 
-	git show --format=%s -c >actual &&
-	test_cmp expect actual
-
-ok 3 - diff -c indicates binary-ness
-
-expecting success of 4048.4 'diff --cc indicates binary-ness': 
-	git show --format=%s --cc >actual &&
-	test_cmp expect actual
-
-ok 4 - diff --cc indicates binary-ness
-
-expecting success of 4048.5 'setup non-binary with binary attribute': 
-	git checkout main &&
-	test_commit one text &&
-	test_commit two text &&
-	two=$(git rev-parse --short HEAD:text) &&
-	git checkout -b branch-text HEAD^ &&
-	test_commit three text &&
-	three=$(git rev-parse --short HEAD:text) &&
-	test_must_fail git merge main &&
-	test_commit resolved text &&
-	res=$(git rev-parse --short HEAD:text) &&
-	echo text -diff >.gitattributes
-
-Switched to branch 'main'
-[main faa5b8e] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 text
-[main 84c76a1] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch-text'
-[branch-text 9b74371] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging text
-CONFLICT (content): Merge conflict in text
-Automatic merge failed; fix conflicts and then commit the result.
-[branch-text c916fed] resolved
- Author: A U Thor <author@example.com>
-ok 5 - setup non-binary with binary attribute
-
-expecting success of 4048.6 'diff -m respects binary attribute': 
-	git show --format=%s -m >actual &&
-	test_cmp expect actual
-
-ok 6 - diff -m respects binary attribute
-
-expecting success of 4048.7 'diff -c respects binary attribute': 
-	git show --format=%s -c >actual &&
-	test_cmp expect actual
-
-ok 7 - diff -c respects binary attribute
-
-expecting success of 4048.8 'diff --cc respects binary attribute': 
-	git show --format=%s --cc >actual &&
-	test_cmp expect actual
-
-ok 8 - diff --cc respects binary attribute
-
-expecting success of 4048.9 'setup textconv attribute': 
-	echo "text diff=upcase" >.gitattributes &&
-	git config diff.upcase.textconv "tr a-z A-Z <"
-
-ok 9 - setup textconv attribute
-
-expecting success of 4048.10 'diff -m respects textconv attribute': 
-	git show --format=%s -m >actual &&
-	test_cmp expect actual
-
-ok 10 - diff -m respects textconv attribute
-
-expecting success of 4048.11 'diff -c respects textconv attribute': 
-	git show --format=%s -c >actual &&
-	test_cmp expect actual
-
-ok 11 - diff -c respects textconv attribute
-
-expecting success of 4048.12 'diff --cc respects textconv attribute': 
-	git show --format=%s --cc >actual &&
-	test_cmp expect actual
-
-ok 12 - diff --cc respects textconv attribute
-
-expecting success of 4048.13 'diff-tree plumbing does not respect textconv': 
-	git diff-tree HEAD -c -p >full &&
-	tail -n +2 full >actual &&
-	test_cmp expect actual
-
-ok 13 - diff-tree plumbing does not respect textconv
-
-expecting success of 4048.14 'diff --cc respects textconv on worktree file': 
-	git reset --hard HEAD^ &&
-	test_must_fail git merge main &&
-	git diff >actual &&
-	test_cmp expect actual
-
-HEAD is now at 9b74371 three
-Auto-merging text
-CONFLICT (content): Merge conflict in text
-Automatic merge failed; fix conflicts and then commit the result.
-ok 14 - diff --cc respects textconv on worktree file
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4054-diff-bogus-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4045-diff-relative.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4045-diff-relative/.git/
 expecting success of 4045.1 'setup': 
@@ -246574,8 +246161,8 @@
 Auto-merging subdir/file0
 CONFLICT (content): Merge conflict in subdir/file0
 Automatic merge failed; fix conflicts and then commit the result.
---- expected	2025-02-09 06:54:31.397887424 +0000
-+++ out	2025-02-09 06:54:31.401887449 +0000
+--- expected	2026-03-14 13:30:56.106677808 +0000
++++ out	2026-03-14 13:30:56.146677808 +0000
 @@ -1,7 +1,7 @@
 -diff --cc file0
 +diff --cc subdir/file0
@@ -246594,6 +246181,473 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4054-diff-bogus-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4051-diff-function-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4051-diff-function-context/.git/
+expecting success of 4051.1 'setup': 
+	cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \
+		"$dir/dummy.c" "$dir/dummy.c" >file.c &&
+	commit_and_tag initial file.c &&
+
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_hello file.c &&
+
+	grep -v "delete me from includes" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_includes file.c &&
+
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag appended file.c &&
+
+	cat "$dir/appended2.c" >>file.c &&
+	commit_and_tag extended file.c &&
+
+	grep -v "Begin of second part" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag long_common_tail file.c &&
+
+	git checkout initial &&
+	cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
+	commit_and_tag hello_dummy file.c &&
+
+	# overlap function context of 1st change and -u context of 2nd change
+	grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
+	sed "2a\\
+	     extra line" <"$dir/dummy.c" >>file.c &&
+	commit_and_tag changed_hello_dummy file.c &&
+
+	git checkout initial &&
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag changed_hello_appended file.c
+
+[master (root-commit) 9f6e181] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 72 insertions(+)
+ create mode 100644 file.c
+[master 5e132d0] changed_hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master 964b054] changed_includes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master d0cff11] appended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+)
+[master d16114c] extended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 35 insertions(+)
+[master fa474ba] long_common_tail
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Note: switching to 'initial'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 9f6e181 initial
+[detached HEAD cf16009] hello_dummy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 41 deletions(-)
+[detached HEAD d307f65] changed_hello_dummy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Previous HEAD position was d307f65 changed_hello_dummy
+HEAD is now at 9f6e181 initial
+[detached HEAD aca4ec7] changed_hello_appended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 4051.2 'changed function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 2 - changed function
+
+expecting success of 4051.3 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was aca4ec7 changed_hello_appended
+HEAD is now at 9f6e181 initial
+HEAD is now at 9f6e181 initial
+ok 3 -  diff applies
+
+expecting success of 4051.4 ' context includes comment': 
+	grep "^ .*Hello comment" changed_hello.diff
+
+  * Hello comment.
+ok 4 -  context includes comment
+
+expecting success of 4051.5 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello.diff
+
+ static void hello(void)	// Begin of hello
+ok 5 -  context includes begin
+
+expecting success of 4051.6 ' context includes end': 
+	grep "^ .*End of hello" changed_hello.diff
+
+ }	// End of hello
+ok 6 -  context includes end
+
+expecting success of 4051.7 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
+
+ok 7 -  context does not include other functions
+
+expecting success of 4051.8 ' context does not include preceding empty lines': 
+	test "$(first_context_line <changed_hello.diff)" != " "
+
+ok 8 -  context does not include preceding empty lines
+
+expecting success of 4051.9 ' context does not include trailing empty lines': 
+	test "$(last_context_line <changed_hello.diff)" != " "
+
+ok 9 -  context does not include trailing empty lines
+
+expecting success of 4051.10 'changed includes': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 10 - changed includes
+
+expecting success of 4051.11 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 9f6e181 initial
+HEAD is now at 5e132d0 changed_hello
+HEAD is now at 5e132d0 changed_hello
+ok 11 -  diff applies
+
+expecting success of 4051.12 ' context includes begin': 
+	grep "^ .*Begin.h" changed_includes.diff
+
+ #include <Begin.h>
+ok 12 -  context includes begin
+
+expecting success of 4051.13 ' context includes end': 
+	grep "^ .*End.h" changed_includes.diff
+
+ #include <End.h>
+ok 13 -  context includes end
+
+expecting success of 4051.14 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
+
+ok 14 -  context does not include other functions
+
+expecting success of 4051.15 ' context does not include trailing empty lines': 
+	test "$(last_context_line <changed_includes.diff)" != " "
+
+ok 15 -  context does not include trailing empty lines
+
+expecting success of 4051.16 'appended function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 16 - appended function
+
+expecting success of 4051.17 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 5e132d0 changed_hello
+HEAD is now at 964b054 changed_includes
+HEAD is now at 964b054 changed_includes
+ok 17 -  diff applies
+
+expecting success of 4051.18 ' context includes begin': 
+	grep "^[+].*Begin of first part" appended.diff
+
++int appended(void) // Begin of first part
+ok 18 -  context includes begin
+
+expecting success of 4051.19 ' context includes end': 
+	grep "^[+].*End of first part" appended.diff
+
++	printf("End of first part\n");
+ok 19 -  context includes end
+
+expecting success of 4051.20 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
+
+ok 20 -  context does not include other functions
+
+expecting success of 4051.21 'appended function part': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 21 - appended function part
+
+expecting success of 4051.22 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 964b054 changed_includes
+HEAD is now at d0cff11 appended
+HEAD is now at d0cff11 appended
+ok 22 -  diff applies
+
+expecting success of 4051.23 ' context includes begin': 
+	grep "^ .*Begin of first part" extended.diff
+
+ int appended(void) // Begin of first part
+ok 23 -  context includes begin
+
+expecting success of 4051.24 ' context includes end': 
+	grep "^[+].*End of second part" extended.diff
+
++}	// End of second part
+ok 24 -  context includes end
+
+expecting success of 4051.25 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
+
+ok 25 -  context does not include other functions
+
+expecting success of 4051.26 ' context does not include preceding empty lines': 
+	test "$(first_context_line <extended.diff)" != " "
+
+ok 26 -  context does not include preceding empty lines
+
+expecting success of 4051.27 'change with long common tail and no context': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 27 - change with long common tail and no context
+
+expecting success of 4051.28 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was d0cff11 appended
+HEAD is now at d16114c extended
+HEAD is now at d16114c extended
+ok 28 -  diff applies
+
+expecting success of 4051.29 ' context includes begin': 
+	grep "^ .*Begin of first part" long_common_tail.diff
+
+ int appended(void) // Begin of first part
+ok 29 -  context includes begin
+
+expecting success of 4051.30 ' context includes end': 
+	grep "^ .*End of second part" long_common_tail.diff
+
+ }	// End of second part
+ok 30 -  context includes end
+
+expecting success of 4051.31 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
+
+ok 31 -  context does not include other functions
+
+expecting success of 4051.32 ' context does not include preceding empty lines': 
+	test "$(first_context_line <long_common_tail.diff)" != " "
+
+ok 32 -  context does not include preceding empty lines
+
+expecting success of 4051.33 'changed function plus appended function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 33 - changed function plus appended function
+
+expecting success of 4051.34 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was d16114c extended
+HEAD is now at 9f6e181 initial
+HEAD is now at 9f6e181 initial
+ok 34 -  diff applies
+
+expecting success of 4051.35 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello_appended.diff &&
+	grep "^[+].*Begin of first part" changed_hello_appended.diff
+
+ static void hello(void)	// Begin of hello
++int appended(void) // Begin of first part
+ok 35 -  context includes begin
+
+expecting success of 4051.36 ' context includes end': 
+	grep "^ .*End of hello" changed_hello_appended.diff &&
+	grep "^[+].*End of first part" changed_hello_appended.diff
+
+ }	// End of hello
++	printf("End of first part\n");
+ok 36 -  context includes end
+
+expecting success of 4051.37 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
+
+ok 37 -  context does not include other functions
+
+expecting success of 4051.38 'changed two consecutive functions': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 38 - changed two consecutive functions
+
+expecting success of 4051.39 ' diff applies': 
+		test_when_finished "git reset --hard" &&
+		git checkout --detach "$name^" &&
+		git apply --index "$name.diff" &&
+		git diff --exit-code "$name"
+	
+Previous HEAD position was 9f6e181 initial
+HEAD is now at cf16009 hello_dummy
+HEAD is now at cf16009 hello_dummy
+ok 39 -  diff applies
+
+expecting success of 4051.40 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello_dummy.diff &&
+	grep "^ .*Begin of dummy" changed_hello_dummy.diff
+
+ static void hello(void)	// Begin of hello
+ static int dummy(void)	// Begin of dummy
+ok 40 -  context includes begin
+
+expecting success of 4051.41 ' context includes end': 
+	grep "^ .*End of hello" changed_hello_dummy.diff &&
+	grep "^ .*End of dummy" changed_hello_dummy.diff
+
+ }	// End of hello
+ }	// End of dummy
+ok 41 -  context includes end
+
+expecting success of 4051.42 ' overlapping hunks are merged': 
+	test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
+
+ok 42 -  overlapping hunks are merged
+
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4055-diff-context.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4055-diff-context/.git/
 expecting success of 4055.1 'setup': 
@@ -246706,6 +246760,362 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4053-diff-no-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4053-diff-no-index/.git/
+expecting success of 4053.1 'setup': 
+	mkdir a &&
+	mkdir b &&
+	echo 1 >a/1 &&
+	echo 2 >a/2 &&
+	git init repo &&
+	echo 1 >repo/a &&
+	mkdir -p non/git &&
+	echo 1 >non/git/a &&
+	echo 1 >non/git/b
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4053-diff-no-index/repo/.git/
+ok 1 - setup
+
+expecting success of 4053.2 'git diff --no-index --exit-code': 
+	git diff --no-index --exit-code a/1 non/git/a &&
+	test_expect_code 1 git diff --no-index --exit-code a/1 a/2
+
+diff --git a/a/1 b/a/2
+index d00491f..0cfbf08 100644
+--- a/a/1
++++ b/a/2
+@@ -1 +1 @@
+-1
++2
+ok 2 - git diff --no-index --exit-code
+
+expecting success of 4053.3 'git diff --no-index directories': 
+	test_expect_code 1 git diff --no-index a b >cnt &&
+	test_line_count = 14 cnt
+
+ok 3 - git diff --no-index directories
+
+expecting success of 4053.4 'git diff --no-index relative path outside repo': 
+	(
+		cd repo &&
+		test_expect_code 0 git diff --no-index a ../non/git/a &&
+		test_expect_code 0 git diff --no-index ../non/git/a ../non/git/b
+	)
+
+ok 4 - git diff --no-index relative path outside repo
+
+expecting success of 4053.5 'git diff --no-index with broken index': 
+	(
+		cd repo &&
+		echo broken >.git/index &&
+		git diff --no-index a ../non/git/a
+	)
+
+ok 5 - git diff --no-index with broken index
+
+expecting success of 4053.6 'git diff outside repo with broken index': 
+	(
+		cd repo &&
+		git diff ../non/git/a ../non/git/b
+	)
+
+ok 6 - git diff outside repo with broken index
+
+expecting success of 4053.7 'git diff --no-index executed outside repo gives correct error message': 
+	(
+		GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd non/git &&
+		test_must_fail git diff --no-index a 2>actual.err &&
+		test_grep "usage: git diff --no-index" actual.err
+	)
+
+usage: git diff --no-index [<options>] <path> <path>
+ok 7 - git diff --no-index executed outside repo gives correct error message
+
+expecting success of 4053.8 'diff D F and diff F D': 
+	(
+		cd repo &&
+		echo in-repo >a &&
+		echo non-repo >../non/git/a &&
+		mkdir sub &&
+		echo sub-repo >sub/a &&
+
+		test_must_fail git diff --no-index sub/a ../non/git/a >expect &&
+		test_must_fail git diff --no-index sub/a ../non/git/ >actual &&
+		test_cmp expect actual &&
+
+		test_must_fail git diff --no-index a ../non/git/a >expect &&
+		test_must_fail git diff --no-index a ../non/git/ >actual &&
+		test_cmp expect actual &&
+
+		test_must_fail git diff --no-index ../non/git/a a >expect &&
+		test_must_fail git diff --no-index ../non/git a >actual &&
+		test_cmp expect actual
+	)
+
+ok 8 - diff D F and diff F D
+
+expecting success of 4053.9 'turning a file into a directory': 
+	(
+		cd non/git &&
+		mkdir d e e/sub &&
+		echo 1 >d/sub &&
+		echo 2 >e/sub/file &&
+		printf "D\td/sub\nA\te/sub/file\n" >expect &&
+		test_must_fail git diff --no-index --name-status d e >actual &&
+		test_cmp expect actual
+	)
+
+ok 9 - turning a file into a directory
+
+expecting success of 4053.10 'diff from repo subdir shows real paths (explicit)': 
+	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff --no-index ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 10 - diff from repo subdir shows real paths (explicit)
+
+expecting success of 4053.11 'diff from repo subdir shows real paths (implicit)': 
+	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 11 - diff from repo subdir shows real paths (implicit)
+
+expecting success of 4053.12 'diff --no-index from repo subdir respects config (explicit)': 
+	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
+	test_config -C repo diff.noprefix true &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff --no-index ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 12 - diff --no-index from repo subdir respects config (explicit)
+
+expecting success of 4053.13 'diff --no-index from repo subdir respects config (implicit)': 
+	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
+	test_config -C repo diff.noprefix true &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 13 - diff --no-index from repo subdir respects config (implicit)
+
+expecting success of 4053.14 'diff --no-index from repo subdir with absolute paths': 
+	cat <<-EOF >expect &&
+	1	1	$(pwd)/non/git/{a => b}
+	EOF
+	test_expect_code 1 \
+		git -C repo/sub diff --numstat \
+		"$(pwd)/non/git/a" "$(pwd)/non/git/b" >actual &&
+	test_cmp expect actual
+
+ok 14 - diff --no-index from repo subdir with absolute paths
+
+expecting success of 4053.15 'diff --no-index allows external diff': 
+	test_expect_code 1 \
+		env GIT_EXTERNAL_DIFF="echo external ;:" \
+		git diff --no-index non/git/a non/git/b >actual &&
+	echo external >expect &&
+	test_cmp expect actual
+
+ok 15 - diff --no-index allows external diff
+
+expecting success of 4053.16 'diff --no-index normalizes mode: no changes': 
+	echo foo >x &&
+	cp x y &&
+	git diff --no-index x y >out &&
+	test_must_be_empty out
+
+ok 16 - diff --no-index normalizes mode: no changes
+
+expecting success of 4053.17 'diff --no-index normalizes mode: chmod +x': 
+	chmod +x y &&
+	cat >expected <<-\EOF &&
+	diff --git a/x b/y
+	old mode 100644
+	new mode 100755
+	EOF
+	test_expect_code 1 git diff --no-index x y >actual &&
+	test_cmp expected actual
+
+ok 17 - diff --no-index normalizes mode: chmod +x
+
+expecting success of 4053.18 'diff --no-index normalizes: mode not like git mode': 
+	chmod 666 x &&
+	chmod 777 y &&
+	cat >expected <<-\EOF &&
+	diff --git a/x b/y
+	old mode 100644
+	new mode 100755
+	EOF
+	test_expect_code 1 git diff --no-index x y >actual &&
+	test_cmp expected actual
+
+ok 18 - diff --no-index normalizes: mode not like git mode
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 4053.19 'diff --no-index normalizes: mode not like git mode (symlink)': 
+	ln -s y z &&
+	X_OID=$(git hash-object --stdin <x) &&
+	Z_OID=$(printf y | git hash-object --stdin) &&
+	cat >expected <<-EOF &&
+	diff --git a/x b/x
+	deleted file mode 100644
+	index $X_OID..$ZERO_OID
+	--- a/x
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo
+	diff --git a/z b/z
+	new file mode 120000
+	index $ZERO_OID..$Z_OID
+	--- /dev/null
+	+++ b/z
+	@@ -0,0 +1 @@
+	+y
+	\ No newline at end of file
+	EOF
+	test_expect_code 1 git -c core.abbrev=no diff --no-index x z >actual &&
+	test_cmp expected actual
+
+ok 19 - diff --no-index normalizes: mode not like git mode (symlink)
+
+expecting success of 4053.20 'external diff with mode-only change': 
+	echo content >not-executable &&
+	echo content >executable &&
+	chmod +x executable &&
+	echo executable executable $(test_oid zero) 100755 \
+		not-executable $(test_oid zero) 100644 not-executable \
+		>expect &&
+	test_expect_code 1 git -c diff.external=echo diff \
+		--no-index executable not-executable >actual &&
+	test_cmp expect actual
+
+ok 20 - external diff with mode-only change
+
+expecting success of 4053.21 'diff --no-index treats '-' as stdin': 
+	cat >expect <<-EOF &&
+	diff --git a/- b/a/1
+	index $ZERO_OID..$(git hash-object --stdin <a/1) 100644
+	--- a/-
+	+++ b/a/1
+	@@ -1 +1 @@
+	-x
+	+1
+	EOF
+
+	test_write_lines x | test_expect_code 1 \
+		git -c core.abbrev=no diff --no-index -- - a/1 >actual &&
+	test_cmp expect actual &&
+
+	test_write_lines 1 | git diff --no-index -- a/1 - >actual &&
+	test_must_be_empty actual
+
+ok 21 - diff --no-index treats '-' as stdin
+
+expecting success of 4053.22 'diff --no-index -R treats '-' as stdin': 
+	cat >expect <<-EOF &&
+	diff --git b/a/1 a/-
+	index $(git hash-object --stdin <a/1)..$ZERO_OID 100644
+	--- b/a/1
+	+++ a/-
+	@@ -1 +1 @@
+	-1
+	+x
+	EOF
+
+	test_write_lines x | test_expect_code 1 \
+		git -c core.abbrev=no diff --no-index -R -- - a/1 >actual &&
+	test_cmp expect actual &&
+
+	test_write_lines 1 | git diff --no-index -R -- a/1 - >actual &&
+	test_must_be_empty actual
+
+ok 22 - diff --no-index -R treats '-' as stdin
+
+expecting success of 4053.23 'diff --no-index refuses to diff stdin and a directory': 
+	test_must_fail git diff --no-index -- - a </dev/null 2>err &&
+	grep "fatal: cannot compare stdin to a directory" err
+
+fatal: cannot compare stdin to a directory
+ok 23 - diff --no-index refuses to diff stdin and a directory
+
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+expecting success of 4053.24 'diff --no-index refuses to diff a named pipe and a directory': 
+	test_when_finished "rm -f pipe" &&
+	mkfifo pipe &&
+	test_must_fail git diff --no-index -- pipe a 2>err &&
+	grep "fatal: cannot compare a named pipe to a directory" err
+
+fatal: cannot compare a named pipe to a directory
+ok 24 - diff --no-index refuses to diff a named pipe and a directory
+
+expecting success of 4053.25 'diff --no-index reads from pipes': 
+	test_when_finished "rm -f old new new-link" &&
+	mkfifo old &&
+	mkfifo new &&
+	ln -s new new-link &&
+	{
+		(test_write_lines a b c >old) &
+	} &&
+	test_when_finished "kill $! || :" &&
+	{
+		(test_write_lines a x c >new) &
+	} &&
+	test_when_finished "kill $! || :" &&
+
+	cat >expect <<-EOF &&
+	diff --git a/old b/new-link
+	--- a/old
+	+++ b/new-link
+	@@ -1,3 +1,3 @@
+	 a
+	-b
+	+x
+	 c
+	EOF
+
+	test_expect_code 1 git diff --no-index old new-link >actual &&
+	test_cmp expect actual
+
+./test-lib.sh: line 1016: kill: (98048) - No such process
+./test-lib.sh: line 1017: kill: (98046) - No such process
+ok 25 - diff --no-index reads from pipes
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4034-diff-words.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4034-diff-words/.git/
 expecting success of 4034.1 'setup': 
@@ -247273,803 +247683,80 @@
 	pre=$(git rev-parse --short $(git hash-object pre)) &&
 	post=$(git rev-parse --short $(git hash-object post)) &&
 	cat >expect <<-EOF &&
-	diff --git a/pre b/post
-	index $pre..$post 100644
-	--- a/pre
-	+++ b/post
-	@@ -1,3 +1,3 @@
-	a
-
-	[-b-]{+c+}
-	EOF
-	test_config diff.suppress-blank-empty true &&
-	word_diff --word-diff=plain
-
-ok 61 - word-diff with diff.sbe
-
-expecting success of 4034.62 'word-diff with no newline at EOF': 
-	printf "%s" "a a a a a" >pre &&
-	printf "%s" "a a ab a a" >post &&
-	pre=$(git rev-parse --short $(git hash-object pre)) &&
-	post=$(git rev-parse --short $(git hash-object post)) &&
-	cat >expect <<-EOF &&
-	diff --git a/pre b/post
-	index $pre..$post 100644
-	--- a/pre
-	+++ b/post
-	@@ -1 +1 @@
-	a a [-a-]{+ab+} a a
-	EOF
-	word_diff --word-diff=plain
-
-ok 62 - word-diff with no newline at EOF
-
-expecting success of 4034.63 'setup history with two files': 
-	echo "a b; c" >a.tex &&
-	echo "a b; c" >z.txt &&
-	git add a.tex z.txt &&
-	git commit -minitial &&
-
-	# modify both
-	echo "a bx; c" >a.tex &&
-	echo "a bx; c" >z.txt &&
-	git commit -mmodified -a
-
-[master (root-commit) ec761f8] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a.tex
- create mode 100644 z.txt
-[master 475cd11] modified
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 63 - setup history with two files
-
-expecting success of 4034.64 'wordRegex for the first file does not apply to the second': 
-	echo "*.tex diff=tex" >.gitattributes &&
-	test_config diff.tex.wordRegex "[a-z]+|." &&
-	cat >expect <<-\EOF &&
-		diff --git a/a.tex b/a.tex
-		--- a/a.tex
-		+++ b/a.tex
-		@@ -1 +1 @@
-		a [-b-]{+bx+}; c
-		diff --git a/z.txt b/z.txt
-		--- a/z.txt
-		+++ b/z.txt
-		@@ -1 +1 @@
-		a [-b;-]{+bx;+} c
-	EOF
-	git diff --word-diff HEAD~ >actual &&
-	compare_diff_patch expect actual
-
-ok 64 - wordRegex for the first file does not apply to the second
-
-# passed all 64 test(s)
-1..64
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4053-diff-no-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4053-diff-no-index/.git/
-expecting success of 4053.1 'setup': 
-	mkdir a &&
-	mkdir b &&
-	echo 1 >a/1 &&
-	echo 2 >a/2 &&
-	git init repo &&
-	echo 1 >repo/a &&
-	mkdir -p non/git &&
-	echo 1 >non/git/a &&
-	echo 1 >non/git/b
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4053-diff-no-index/repo/.git/
-ok 1 - setup
-
-expecting success of 4053.2 'git diff --no-index --exit-code': 
-	git diff --no-index --exit-code a/1 non/git/a &&
-	test_expect_code 1 git diff --no-index --exit-code a/1 a/2
-
-diff --git a/a/1 b/a/2
-index d00491f..0cfbf08 100644
---- a/a/1
-+++ b/a/2
-@@ -1 +1 @@
--1
-+2
-ok 2 - git diff --no-index --exit-code
-
-expecting success of 4053.3 'git diff --no-index directories': 
-	test_expect_code 1 git diff --no-index a b >cnt &&
-	test_line_count = 14 cnt
-
-ok 3 - git diff --no-index directories
-
-expecting success of 4053.4 'git diff --no-index relative path outside repo': 
-	(
-		cd repo &&
-		test_expect_code 0 git diff --no-index a ../non/git/a &&
-		test_expect_code 0 git diff --no-index ../non/git/a ../non/git/b
-	)
-
-ok 4 - git diff --no-index relative path outside repo
-
-expecting success of 4053.5 'git diff --no-index with broken index': 
-	(
-		cd repo &&
-		echo broken >.git/index &&
-		git diff --no-index a ../non/git/a
-	)
-
-ok 5 - git diff --no-index with broken index
-
-expecting success of 4053.6 'git diff outside repo with broken index': 
-	(
-		cd repo &&
-		git diff ../non/git/a ../non/git/b
-	)
-
-ok 6 - git diff outside repo with broken index
-
-expecting success of 4053.7 'git diff --no-index executed outside repo gives correct error message': 
-	(
-		GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd non/git &&
-		test_must_fail git diff --no-index a 2>actual.err &&
-		test_grep "usage: git diff --no-index" actual.err
-	)
-
-usage: git diff --no-index [<options>] <path> <path>
-ok 7 - git diff --no-index executed outside repo gives correct error message
-
-expecting success of 4053.8 'diff D F and diff F D': 
-	(
-		cd repo &&
-		echo in-repo >a &&
-		echo non-repo >../non/git/a &&
-		mkdir sub &&
-		echo sub-repo >sub/a &&
-
-		test_must_fail git diff --no-index sub/a ../non/git/a >expect &&
-		test_must_fail git diff --no-index sub/a ../non/git/ >actual &&
-		test_cmp expect actual &&
-
-		test_must_fail git diff --no-index a ../non/git/a >expect &&
-		test_must_fail git diff --no-index a ../non/git/ >actual &&
-		test_cmp expect actual &&
-
-		test_must_fail git diff --no-index ../non/git/a a >expect &&
-		test_must_fail git diff --no-index ../non/git a >actual &&
-		test_cmp expect actual
-	)
-
-ok 8 - diff D F and diff F D
-
-expecting success of 4053.9 'turning a file into a directory': 
-	(
-		cd non/git &&
-		mkdir d e e/sub &&
-		echo 1 >d/sub &&
-		echo 2 >e/sub/file &&
-		printf "D\td/sub\nA\te/sub/file\n" >expect &&
-		test_must_fail git diff --no-index --name-status d e >actual &&
-		test_cmp expect actual
-	)
-
-ok 9 - turning a file into a directory
-
-expecting success of 4053.10 'diff from repo subdir shows real paths (explicit)': 
-	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff --no-index ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 10 - diff from repo subdir shows real paths (explicit)
-
-expecting success of 4053.11 'diff from repo subdir shows real paths (implicit)': 
-	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 11 - diff from repo subdir shows real paths (implicit)
-
-expecting success of 4053.12 'diff --no-index from repo subdir respects config (explicit)': 
-	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
-	test_config -C repo diff.noprefix true &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff --no-index ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 12 - diff --no-index from repo subdir respects config (explicit)
-
-expecting success of 4053.13 'diff --no-index from repo subdir respects config (implicit)': 
-	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
-	test_config -C repo diff.noprefix true &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 13 - diff --no-index from repo subdir respects config (implicit)
-
-expecting success of 4053.14 'diff --no-index from repo subdir with absolute paths': 
-	cat <<-EOF >expect &&
-	1	1	$(pwd)/non/git/{a => b}
-	EOF
-	test_expect_code 1 \
-		git -C repo/sub diff --numstat \
-		"$(pwd)/non/git/a" "$(pwd)/non/git/b" >actual &&
-	test_cmp expect actual
-
-ok 14 - diff --no-index from repo subdir with absolute paths
-
-expecting success of 4053.15 'diff --no-index allows external diff': 
-	test_expect_code 1 \
-		env GIT_EXTERNAL_DIFF="echo external ;:" \
-		git diff --no-index non/git/a non/git/b >actual &&
-	echo external >expect &&
-	test_cmp expect actual
-
-ok 15 - diff --no-index allows external diff
-
-expecting success of 4053.16 'diff --no-index normalizes mode: no changes': 
-	echo foo >x &&
-	cp x y &&
-	git diff --no-index x y >out &&
-	test_must_be_empty out
-
-ok 16 - diff --no-index normalizes mode: no changes
-
-expecting success of 4053.17 'diff --no-index normalizes mode: chmod +x': 
-	chmod +x y &&
-	cat >expected <<-\EOF &&
-	diff --git a/x b/y
-	old mode 100644
-	new mode 100755
-	EOF
-	test_expect_code 1 git diff --no-index x y >actual &&
-	test_cmp expected actual
-
-ok 17 - diff --no-index normalizes mode: chmod +x
-
-expecting success of 4053.18 'diff --no-index normalizes: mode not like git mode': 
-	chmod 666 x &&
-	chmod 777 y &&
-	cat >expected <<-\EOF &&
-	diff --git a/x b/y
-	old mode 100644
-	new mode 100755
-	EOF
-	test_expect_code 1 git diff --no-index x y >actual &&
-	test_cmp expected actual
-
-ok 18 - diff --no-index normalizes: mode not like git mode
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 4053.19 'diff --no-index normalizes: mode not like git mode (symlink)': 
-	ln -s y z &&
-	X_OID=$(git hash-object --stdin <x) &&
-	Z_OID=$(printf y | git hash-object --stdin) &&
-	cat >expected <<-EOF &&
-	diff --git a/x b/x
-	deleted file mode 100644
-	index $X_OID..$ZERO_OID
-	--- a/x
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo
-	diff --git a/z b/z
-	new file mode 120000
-	index $ZERO_OID..$Z_OID
-	--- /dev/null
-	+++ b/z
-	@@ -0,0 +1 @@
-	+y
-	\ No newline at end of file
-	EOF
-	test_expect_code 1 git -c core.abbrev=no diff --no-index x z >actual &&
-	test_cmp expected actual
-
-ok 19 - diff --no-index normalizes: mode not like git mode (symlink)
-
-expecting success of 4053.20 'external diff with mode-only change': 
-	echo content >not-executable &&
-	echo content >executable &&
-	chmod +x executable &&
-	echo executable executable $(test_oid zero) 100755 \
-		not-executable $(test_oid zero) 100644 not-executable \
-		>expect &&
-	test_expect_code 1 git -c diff.external=echo diff \
-		--no-index executable not-executable >actual &&
-	test_cmp expect actual
-
-ok 20 - external diff with mode-only change
-
-expecting success of 4053.21 'diff --no-index treats '-' as stdin': 
-	cat >expect <<-EOF &&
-	diff --git a/- b/a/1
-	index $ZERO_OID..$(git hash-object --stdin <a/1) 100644
-	--- a/-
-	+++ b/a/1
-	@@ -1 +1 @@
-	-x
-	+1
-	EOF
-
-	test_write_lines x | test_expect_code 1 \
-		git -c core.abbrev=no diff --no-index -- - a/1 >actual &&
-	test_cmp expect actual &&
-
-	test_write_lines 1 | git diff --no-index -- a/1 - >actual &&
-	test_must_be_empty actual
-
-ok 21 - diff --no-index treats '-' as stdin
-
-expecting success of 4053.22 'diff --no-index -R treats '-' as stdin': 
-	cat >expect <<-EOF &&
-	diff --git b/a/1 a/-
-	index $(git hash-object --stdin <a/1)..$ZERO_OID 100644
-	--- b/a/1
-	+++ a/-
-	@@ -1 +1 @@
-	-1
-	+x
-	EOF
-
-	test_write_lines x | test_expect_code 1 \
-		git -c core.abbrev=no diff --no-index -R -- - a/1 >actual &&
-	test_cmp expect actual &&
-
-	test_write_lines 1 | git diff --no-index -R -- a/1 - >actual &&
-	test_must_be_empty actual
-
-ok 22 - diff --no-index -R treats '-' as stdin
-
-expecting success of 4053.23 'diff --no-index refuses to diff stdin and a directory': 
-	test_must_fail git diff --no-index -- - a </dev/null 2>err &&
-	grep "fatal: cannot compare stdin to a directory" err
-
-fatal: cannot compare stdin to a directory
-ok 23 - diff --no-index refuses to diff stdin and a directory
-
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-expecting success of 4053.24 'diff --no-index refuses to diff a named pipe and a directory': 
-	test_when_finished "rm -f pipe" &&
-	mkfifo pipe &&
-	test_must_fail git diff --no-index -- pipe a 2>err &&
-	grep "fatal: cannot compare a named pipe to a directory" err
-
-fatal: cannot compare a named pipe to a directory
-ok 24 - diff --no-index refuses to diff a named pipe and a directory
-
-expecting success of 4053.25 'diff --no-index reads from pipes': 
-	test_when_finished "rm -f old new new-link" &&
-	mkfifo old &&
-	mkfifo new &&
-	ln -s new new-link &&
-	{
-		(test_write_lines a b c >old) &
-	} &&
-	test_when_finished "kill $! || :" &&
-	{
-		(test_write_lines a x c >new) &
-	} &&
-	test_when_finished "kill $! || :" &&
-
-	cat >expect <<-EOF &&
-	diff --git a/old b/new-link
-	--- a/old
-	+++ b/new-link
-	@@ -1,3 +1,3 @@
-	 a
-	-b
-	+x
-	 c
-	EOF
-
-	test_expect_code 1 git diff --no-index old new-link >actual &&
-	test_cmp expect actual
-
-t4053-diff-no-index.sh: 3: kill: No such process
-
-t4053-diff-no-index.sh: 4: kill: No such process
-
-ok 25 - diff --no-index reads from pipes
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4051-diff-function-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4051-diff-function-context/.git/
-expecting success of 4051.1 'setup': 
-	cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \
-		"$dir/dummy.c" "$dir/dummy.c" >file.c &&
-	commit_and_tag initial file.c &&
-
-	grep -v "delete me from hello" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	commit_and_tag changed_hello file.c &&
-
-	grep -v "delete me from includes" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	commit_and_tag changed_includes file.c &&
-
-	cat "$dir/appended1.c" >>file.c &&
-	commit_and_tag appended file.c &&
-
-	cat "$dir/appended2.c" >>file.c &&
-	commit_and_tag extended file.c &&
-
-	grep -v "Begin of second part" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	commit_and_tag long_common_tail file.c &&
-
-	git checkout initial &&
-	cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
-	commit_and_tag hello_dummy file.c &&
-
-	# overlap function context of 1st change and -u context of 2nd change
-	grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
-	sed "2a\\
-	     extra line" <"$dir/dummy.c" >>file.c &&
-	commit_and_tag changed_hello_dummy file.c &&
-
-	git checkout initial &&
-	grep -v "delete me from hello" <file.c >file.c.new &&
-	mv file.c.new file.c &&
-	cat "$dir/appended1.c" >>file.c &&
-	commit_and_tag changed_hello_appended file.c
-
-[master (root-commit) 9f6e181] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 72 insertions(+)
- create mode 100644 file.c
-[master 5e132d0] changed_hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master 964b054] changed_includes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master d0cff11] appended
- Author: A U Thor <author@example.com>
- 1 file changed, 15 insertions(+)
-[master d16114c] extended
- Author: A U Thor <author@example.com>
- 1 file changed, 35 insertions(+)
-[master fa474ba] long_common_tail
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-Note: switching to 'initial'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 9f6e181 initial
-[detached HEAD cf16009] hello_dummy
- Author: A U Thor <author@example.com>
- 1 file changed, 41 deletions(-)
-[detached HEAD d307f65] changed_hello_dummy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Previous HEAD position was d307f65 changed_hello_dummy
-HEAD is now at 9f6e181 initial
-[detached HEAD aca4ec7] changed_hello_appended
- Author: A U Thor <author@example.com>
- 1 file changed, 15 insertions(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4051.2 'changed function': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 2 - changed function
-
-expecting success of 4051.3 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was aca4ec7 changed_hello_appended
-HEAD is now at 9f6e181 initial
-HEAD is now at 9f6e181 initial
-ok 3 -  diff applies
-
-expecting success of 4051.4 ' context includes comment': 
-	grep "^ .*Hello comment" changed_hello.diff
-
-  * Hello comment.
-ok 4 -  context includes comment
-
-expecting success of 4051.5 ' context includes begin': 
-	grep "^ .*Begin of hello" changed_hello.diff
-
- static void hello(void)	// Begin of hello
-ok 5 -  context includes begin
-
-expecting success of 4051.6 ' context includes end': 
-	grep "^ .*End of hello" changed_hello.diff
-
- }	// End of hello
-ok 6 -  context includes end
-
-expecting success of 4051.7 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
-
-ok 7 -  context does not include other functions
-
-expecting success of 4051.8 ' context does not include preceding empty lines': 
-	test "$(first_context_line <changed_hello.diff)" != " "
-
-ok 8 -  context does not include preceding empty lines
-
-expecting success of 4051.9 ' context does not include trailing empty lines': 
-	test "$(last_context_line <changed_hello.diff)" != " "
-
-ok 9 -  context does not include trailing empty lines
-
-expecting success of 4051.10 'changed includes': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 10 - changed includes
-
-expecting success of 4051.11 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was 9f6e181 initial
-HEAD is now at 5e132d0 changed_hello
-HEAD is now at 5e132d0 changed_hello
-ok 11 -  diff applies
-
-expecting success of 4051.12 ' context includes begin': 
-	grep "^ .*Begin.h" changed_includes.diff
-
- #include <Begin.h>
-ok 12 -  context includes begin
-
-expecting success of 4051.13 ' context includes end': 
-	grep "^ .*End.h" changed_includes.diff
-
- #include <End.h>
-ok 13 -  context includes end
-
-expecting success of 4051.14 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
-
-ok 14 -  context does not include other functions
-
-expecting success of 4051.15 ' context does not include trailing empty lines': 
-	test "$(last_context_line <changed_includes.diff)" != " "
-
-ok 15 -  context does not include trailing empty lines
-
-expecting success of 4051.16 'appended function': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 16 - appended function
-
-expecting success of 4051.17 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was 5e132d0 changed_hello
-HEAD is now at 964b054 changed_includes
-HEAD is now at 964b054 changed_includes
-ok 17 -  diff applies
-
-expecting success of 4051.18 ' context includes begin': 
-	grep "^[+].*Begin of first part" appended.diff
-
-+int appended(void) // Begin of first part
-ok 18 -  context includes begin
-
-expecting success of 4051.19 ' context includes end': 
-	grep "^[+].*End of first part" appended.diff
-
-+	printf("End of first part\n");
-ok 19 -  context includes end
-
-expecting success of 4051.20 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
-
-ok 20 -  context does not include other functions
-
-expecting success of 4051.21 'appended function part': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 21 - appended function part
-
-expecting success of 4051.22 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was 964b054 changed_includes
-HEAD is now at d0cff11 appended
-HEAD is now at d0cff11 appended
-ok 22 -  diff applies
-
-expecting success of 4051.23 ' context includes begin': 
-	grep "^ .*Begin of first part" extended.diff
-
- int appended(void) // Begin of first part
-ok 23 -  context includes begin
-
-expecting success of 4051.24 ' context includes end': 
-	grep "^[+].*End of second part" extended.diff
-
-+}	// End of second part
-ok 24 -  context includes end
-
-expecting success of 4051.25 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
-
-ok 25 -  context does not include other functions
-
-expecting success of 4051.26 ' context does not include preceding empty lines': 
-	test "$(first_context_line <extended.diff)" != " "
-
-ok 26 -  context does not include preceding empty lines
-
-expecting success of 4051.27 'change with long common tail and no context': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 27 - change with long common tail and no context
-
-expecting success of 4051.28 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was d0cff11 appended
-HEAD is now at d16114c extended
-HEAD is now at d16114c extended
-ok 28 -  diff applies
-
-expecting success of 4051.29 ' context includes begin': 
-	grep "^ .*Begin of first part" long_common_tail.diff
-
- int appended(void) // Begin of first part
-ok 29 -  context includes begin
-
-expecting success of 4051.30 ' context includes end': 
-	grep "^ .*End of second part" long_common_tail.diff
-
- }	// End of second part
-ok 30 -  context includes end
-
-expecting success of 4051.31 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
-
-ok 31 -  context does not include other functions
-
-expecting success of 4051.32 ' context does not include preceding empty lines': 
-	test "$(first_context_line <long_common_tail.diff)" != " "
-
-ok 32 -  context does not include preceding empty lines
-
-expecting success of 4051.33 'changed function plus appended function': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 33 - changed function plus appended function
-
-expecting success of 4051.34 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was d16114c extended
-HEAD is now at 9f6e181 initial
-HEAD is now at 9f6e181 initial
-ok 34 -  diff applies
-
-expecting success of 4051.35 ' context includes begin': 
-	grep "^ .*Begin of hello" changed_hello_appended.diff &&
-	grep "^[+].*Begin of first part" changed_hello_appended.diff
-
- static void hello(void)	// Begin of hello
-+int appended(void) // Begin of first part
-ok 35 -  context includes begin
-
-expecting success of 4051.36 ' context includes end': 
-	grep "^ .*End of hello" changed_hello_appended.diff &&
-	grep "^[+].*End of first part" changed_hello_appended.diff
-
- }	// End of hello
-+	printf("End of first part\n");
-ok 36 -  context includes end
-
-expecting success of 4051.37 ' context does not include other functions': 
-	test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
+	diff --git a/pre b/post
+	index $pre..$post 100644
+	--- a/pre
+	+++ b/post
+	@@ -1,3 +1,3 @@
+	a
 
-ok 37 -  context does not include other functions
+	[-b-]{+c+}
+	EOF
+	test_config diff.suppress-blank-empty true &&
+	word_diff --word-diff=plain
 
-expecting success of 4051.38 'changed two consecutive functions': 
-		git diff $options "$name^" "$name" >"$name.diff"
-	
-ok 38 - changed two consecutive functions
+ok 61 - word-diff with diff.sbe
 
-expecting success of 4051.39 ' diff applies': 
-		test_when_finished "git reset --hard" &&
-		git checkout --detach "$name^" &&
-		git apply --index "$name.diff" &&
-		git diff --exit-code "$name"
-	
-Previous HEAD position was 9f6e181 initial
-HEAD is now at cf16009 hello_dummy
-HEAD is now at cf16009 hello_dummy
-ok 39 -  diff applies
+expecting success of 4034.62 'word-diff with no newline at EOF': 
+	printf "%s" "a a a a a" >pre &&
+	printf "%s" "a a ab a a" >post &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
+	diff --git a/pre b/post
+	index $pre..$post 100644
+	--- a/pre
+	+++ b/post
+	@@ -1 +1 @@
+	a a [-a-]{+ab+} a a
+	EOF
+	word_diff --word-diff=plain
 
-expecting success of 4051.40 ' context includes begin': 
-	grep "^ .*Begin of hello" changed_hello_dummy.diff &&
-	grep "^ .*Begin of dummy" changed_hello_dummy.diff
+ok 62 - word-diff with no newline at EOF
 
- static void hello(void)	// Begin of hello
- static int dummy(void)	// Begin of dummy
-ok 40 -  context includes begin
+expecting success of 4034.63 'setup history with two files': 
+	echo "a b; c" >a.tex &&
+	echo "a b; c" >z.txt &&
+	git add a.tex z.txt &&
+	git commit -minitial &&
 
-expecting success of 4051.41 ' context includes end': 
-	grep "^ .*End of hello" changed_hello_dummy.diff &&
-	grep "^ .*End of dummy" changed_hello_dummy.diff
+	# modify both
+	echo "a bx; c" >a.tex &&
+	echo "a bx; c" >z.txt &&
+	git commit -mmodified -a
 
- }	// End of hello
- }	// End of dummy
-ok 41 -  context includes end
+[master (root-commit) ec761f8] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a.tex
+ create mode 100644 z.txt
+[master 475cd11] modified
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 63 - setup history with two files
 
-expecting success of 4051.42 ' overlapping hunks are merged': 
-	test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
+expecting success of 4034.64 'wordRegex for the first file does not apply to the second': 
+	echo "*.tex diff=tex" >.gitattributes &&
+	test_config diff.tex.wordRegex "[a-z]+|." &&
+	cat >expect <<-\EOF &&
+		diff --git a/a.tex b/a.tex
+		--- a/a.tex
+		+++ b/a.tex
+		@@ -1 +1 @@
+		a [-b-]{+bx+}; c
+		diff --git a/z.txt b/z.txt
+		--- a/z.txt
+		+++ b/z.txt
+		@@ -1 +1 @@
+		a [-b;-]{+bx;+} c
+	EOF
+	git diff --word-diff HEAD~ >actual &&
+	compare_diff_patch expect actual
 
-ok 42 -  overlapping hunks are merged
+ok 64 - wordRegex for the first file does not apply to the second
 
-# passed all 42 test(s)
-1..42
+# passed all 64 test(s)
+1..64
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4038-diff-combined.sh ***
@@ -248544,8 +248231,8 @@
 [detached HEAD 22de592] empty3
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
---- .tmp-1	2025-02-09 06:54:31.269886609 +0000
-+++ .tmp-2	2025-02-09 06:54:31.269886609 +0000
+--- .tmp-1	2026-03-14 13:30:56.078677808 +0000
++++ .tmp-2	2026-03-14 13:30:56.094677808 +0000
 @@ -1,8 +1,9 @@
  -- 3
  ---1
@@ -248856,308 +248543,6 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4056-diff-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4056-diff-order/.git/
-expecting success of 4056.1 'setup': 
-	mkdir c &&
-	create_files 1 &&
-	create_files 2 &&
-
-	cat >order_file_1 <<-\EOF &&
-	*Makefile
-	*.txt
-	*.h
-	EOF
-
-	cat >order_file_2 <<-\EOF &&
-	*Makefile
-	*.h
-	*.c
-	EOF
-
-	cat >expect_none <<-\EOF &&
-	a.h
-	b.c
-	c/Makefile
-	d.txt
-	EOF
-
-	cat >expect_1 <<-\EOF &&
-	c/Makefile
-	d.txt
-	a.h
-	b.c
-	EOF
-
-	cat >expect_2 <<-\EOF
-	c/Makefile
-	a.h
-	b.c
-	d.txt
-	EOF
-
-[main (root-commit) 770e898] 1
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 a.h
- create mode 100644 b.c
- create mode 100644 c/Makefile
- create mode 100644 d.txt
-[main 7c2d19e] 2
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+), 4 deletions(-)
-ok 1 - setup
-
-expecting success of 4056.2 'no order (=tree object order)': 
-	git diff --name-only HEAD^..HEAD >actual &&
-	test_cmp expect_none actual
-
-ok 2 - no order (=tree object order)
-
-expecting success of 4056.3 'missing orderfile': 
-	rm -f bogus_file &&
-	test_must_fail git diff -Obogus_file --name-only HEAD^..HEAD
-
-fatal: failed to read orderfile 'bogus_file': No such file or directory
-ok 3 - missing orderfile
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 4056.4 'unreadable orderfile': 
-	>unreadable_file &&
-	chmod -r unreadable_file &&
-	test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
-
-fatal: failed to read orderfile 'unreadable_file': Permission denied
-ok 4 - unreadable orderfile
-
-expecting success of 4056.5 'orderfile using option from subdir with --output': 
-	mkdir subdir &&
-	git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
-	test_cmp expect_1 actual
-
-ok 5 - orderfile using option from subdir with --output
-
-expecting success of 4056.6 'orderfile using option (1)': 
-		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 6 - orderfile using option (1)
-
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-expecting success of 4056.7 'orderfile is fifo (1)': 
-		rm -f order_fifo &&
-		mkfifo order_fifo &&
-		{
-			cat order_file_$i >order_fifo &
-		} &&
-		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
-		wait &&
-		test_cmp expect_$i actual
-	
-ok 7 - orderfile is fifo (1)
-
-expecting success of 4056.8 'orderfile using config (1)': 
-		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 8 - orderfile using config (1)
-
-expecting success of 4056.9 'cancelling configured orderfile (1)': 
-		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_none actual
-	
-ok 9 - cancelling configured orderfile (1)
-
-expecting success of 4056.10 'orderfile using option (2)': 
-		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 10 - orderfile using option (2)
-
-expecting success of 4056.11 'orderfile is fifo (2)': 
-		rm -f order_fifo &&
-		mkfifo order_fifo &&
-		{
-			cat order_file_$i >order_fifo &
-		} &&
-		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
-		wait &&
-		test_cmp expect_$i actual
-	
-ok 11 - orderfile is fifo (2)
-
-expecting success of 4056.12 'orderfile using config (2)': 
-		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_$i actual
-	
-ok 12 - orderfile using config (2)
-
-expecting success of 4056.13 'cancelling configured orderfile (2)': 
-		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
-		test_cmp expect_none actual
-	
-ok 13 - cancelling configured orderfile (2)
-
-expecting success of 4056.14 'setup for testing combine-diff order': 
-	git checkout -b tmp HEAD~ &&
-	create_files 3 &&
-	git checkout main &&
-	git merge --no-commit -s ours tmp &&
-	create_files 5
-
-Switched to a new branch 'tmp'
-[tmp ec24607] 3
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+), 4 deletions(-)
-Switched to branch 'main'
-Automatic merge went well; stopped before committing as requested
-[main e00a015] 5
- Author: A U Thor <author@example.com>
-ok 14 - setup for testing combine-diff order
-
-expecting success of 4056.15 'combine-diff: no order (=tree object order)': 
-	git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
-	test_cmp expect_none actual
-
-ok 15 - combine-diff: no order (=tree object order)
-
-expecting success of 4056.16 'combine-diff: orderfile using option (1)': 
-		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
-		test_cmp expect_$i actual
-	
-ok 16 - combine-diff: orderfile using option (1)
-
-expecting success of 4056.17 'combine-diff: orderfile using option (2)': 
-		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
-		test_cmp expect_$i actual
-	
-ok 17 - combine-diff: orderfile using option (2)
-
-expecting success of 4056.18 'rotate and skip setup': 
-	>sample1.t &&
-	>sample2.t &&
-	>sample3.t &&
-	>sample4.t &&
-	git add sample[1234].t &&
-	git commit -m "added" sample[1234].t &&
-	echo modified >>sample1.t &&
-	echo modified >>sample2.t &&
-	echo modified >>sample4.t &&
-	git commit -m "updated" sample[1234].t
-
-[main bfe9459] added
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sample1.t
- create mode 100644 sample2.t
- create mode 100644 sample3.t
- create mode 100644 sample4.t
-[main ba2bcc7] updated
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-ok 18 - rotate and skip setup
-
-expecting success of 4056.19 'diff --rotate-to': 
-	git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
-	test_write_lines sample2.t sample4.t sample1.t >expect &&
-	test_cmp expect actual
-
-ok 19 - diff --rotate-to
-
-expecting success of 4056.20 'diff --skip-to': 
-	git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
-	test_write_lines sample2.t sample4.t >expect &&
-	test_cmp expect actual
-
-ok 20 - diff --skip-to
-
-expecting success of 4056.21 'diff --rotate/skip-to error condition': 
-	test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
-	test_must_fail git diff --skip-to=sample3.t HEAD^
-
-fatal: No such path 'sample3.t' in the diff
-fatal: No such path 'sample3.t' in the diff
-ok 21 - diff --rotate/skip-to error condition
-
-expecting success of 4056.22 'log --rotate-to': 
-	git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
-	# just distill the commit header and paths
-	sed -n -e "s/^commit.*/commit/p" \
-	       -e "/^:/s/^.*	//p" raw >actual &&
-
-	cat >expect <<-\EOF &&
-	commit
-	sample4.t
-	sample1.t
-	sample2.t
-	commit
-	sample3.t
-	sample4.t
-	sample1.t
-	sample2.t
-	EOF
-
-	test_cmp expect actual
-
-ok 22 - log --rotate-to
-
-expecting success of 4056.23 'log --skip-to': 
-	git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
-	# just distill the commit header and paths
-	sed -n -e "s/^commit.*/commit/p" \
-	       -e "/^:/s/^.*	//p" raw >actual &&
-
-	cat >expect <<-\EOF &&
-	commit
-	sample4.t
-	commit
-	sample3.t
-	sample4.t
-	EOF
-
-	test_cmp expect actual
-
-ok 23 - log --skip-to
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4047-diff-dirstat.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4047-diff-dirstat/.git/
 expecting success of 4047.1 'setup': 
@@ -249852,6 +249237,308 @@
 1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4056-diff-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4056-diff-order/.git/
+expecting success of 4056.1 'setup': 
+	mkdir c &&
+	create_files 1 &&
+	create_files 2 &&
+
+	cat >order_file_1 <<-\EOF &&
+	*Makefile
+	*.txt
+	*.h
+	EOF
+
+	cat >order_file_2 <<-\EOF &&
+	*Makefile
+	*.h
+	*.c
+	EOF
+
+	cat >expect_none <<-\EOF &&
+	a.h
+	b.c
+	c/Makefile
+	d.txt
+	EOF
+
+	cat >expect_1 <<-\EOF &&
+	c/Makefile
+	d.txt
+	a.h
+	b.c
+	EOF
+
+	cat >expect_2 <<-\EOF
+	c/Makefile
+	a.h
+	b.c
+	d.txt
+	EOF
+
+[main (root-commit) 770e898] 1
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 a.h
+ create mode 100644 b.c
+ create mode 100644 c/Makefile
+ create mode 100644 d.txt
+[main 7c2d19e] 2
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+ok 1 - setup
+
+expecting success of 4056.2 'no order (=tree object order)': 
+	git diff --name-only HEAD^..HEAD >actual &&
+	test_cmp expect_none actual
+
+ok 2 - no order (=tree object order)
+
+expecting success of 4056.3 'missing orderfile': 
+	rm -f bogus_file &&
+	test_must_fail git diff -Obogus_file --name-only HEAD^..HEAD
+
+fatal: failed to read orderfile 'bogus_file': No such file or directory
+ok 3 - missing orderfile
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
+
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
+
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
+
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
+
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 4056.4 'unreadable orderfile': 
+	>unreadable_file &&
+	chmod -r unreadable_file &&
+	test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
+
+fatal: failed to read orderfile 'unreadable_file': Permission denied
+ok 4 - unreadable orderfile
+
+expecting success of 4056.5 'orderfile using option from subdir with --output': 
+	mkdir subdir &&
+	git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
+	test_cmp expect_1 actual
+
+ok 5 - orderfile using option from subdir with --output
+
+expecting success of 4056.6 'orderfile using option (1)': 
+		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
+	
+ok 6 - orderfile using option (1)
+
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+expecting success of 4056.7 'orderfile is fifo (1)': 
+		rm -f order_fifo &&
+		mkfifo order_fifo &&
+		{
+			cat order_file_$i >order_fifo &
+		} &&
+		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
+		wait &&
+		test_cmp expect_$i actual
+	
+ok 7 - orderfile is fifo (1)
+
+expecting success of 4056.8 'orderfile using config (1)': 
+		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
+	
+ok 8 - orderfile using config (1)
+
+expecting success of 4056.9 'cancelling configured orderfile (1)': 
+		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_none actual
+	
+ok 9 - cancelling configured orderfile (1)
+
+expecting success of 4056.10 'orderfile using option (2)': 
+		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
+	
+ok 10 - orderfile using option (2)
+
+expecting success of 4056.11 'orderfile is fifo (2)': 
+		rm -f order_fifo &&
+		mkfifo order_fifo &&
+		{
+			cat order_file_$i >order_fifo &
+		} &&
+		git diff -O order_fifo --name-only HEAD^..HEAD >actual &&
+		wait &&
+		test_cmp expect_$i actual
+	
+ok 11 - orderfile is fifo (2)
+
+expecting success of 4056.12 'orderfile using config (2)': 
+		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
+	
+ok 12 - orderfile using config (2)
+
+expecting success of 4056.13 'cancelling configured orderfile (2)': 
+		git -c diff.orderfile=order_file_$i diff -O/dev/null --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_none actual
+	
+ok 13 - cancelling configured orderfile (2)
+
+expecting success of 4056.14 'setup for testing combine-diff order': 
+	git checkout -b tmp HEAD~ &&
+	create_files 3 &&
+	git checkout main &&
+	git merge --no-commit -s ours tmp &&
+	create_files 5
+
+Switched to a new branch 'tmp'
+[tmp ec24607] 3
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Switched to branch 'main'
+Automatic merge went well; stopped before committing as requested
+[main e00a015] 5
+ Author: A U Thor <author@example.com>
+ok 14 - setup for testing combine-diff order
+
+expecting success of 4056.15 'combine-diff: no order (=tree object order)': 
+	git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
+	test_cmp expect_none actual
+
+ok 15 - combine-diff: no order (=tree object order)
+
+expecting success of 4056.16 'combine-diff: orderfile using option (1)': 
+		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
+		test_cmp expect_$i actual
+	
+ok 16 - combine-diff: orderfile using option (1)
+
+expecting success of 4056.17 'combine-diff: orderfile using option (2)': 
+		git diff -Oorder_file_$i --name-only HEAD HEAD^ HEAD^2 >actual &&
+		test_cmp expect_$i actual
+	
+ok 17 - combine-diff: orderfile using option (2)
+
+expecting success of 4056.18 'rotate and skip setup': 
+	>sample1.t &&
+	>sample2.t &&
+	>sample3.t &&
+	>sample4.t &&
+	git add sample[1234].t &&
+	git commit -m "added" sample[1234].t &&
+	echo modified >>sample1.t &&
+	echo modified >>sample2.t &&
+	echo modified >>sample4.t &&
+	git commit -m "updated" sample[1234].t
+
+[main bfe9459] added
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sample1.t
+ create mode 100644 sample2.t
+ create mode 100644 sample3.t
+ create mode 100644 sample4.t
+[main ba2bcc7] updated
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ok 18 - rotate and skip setup
+
+expecting success of 4056.19 'diff --rotate-to': 
+	git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
+	test_write_lines sample2.t sample4.t sample1.t >expect &&
+	test_cmp expect actual
+
+ok 19 - diff --rotate-to
+
+expecting success of 4056.20 'diff --skip-to': 
+	git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
+	test_write_lines sample2.t sample4.t >expect &&
+	test_cmp expect actual
+
+ok 20 - diff --skip-to
+
+expecting success of 4056.21 'diff --rotate/skip-to error condition': 
+	test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
+	test_must_fail git diff --skip-to=sample3.t HEAD^
+
+fatal: No such path 'sample3.t' in the diff
+fatal: No such path 'sample3.t' in the diff
+ok 21 - diff --rotate/skip-to error condition
+
+expecting success of 4056.22 'log --rotate-to': 
+	git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
+	# just distill the commit header and paths
+	sed -n -e "s/^commit.*/commit/p" \
+	       -e "/^:/s/^.*	//p" raw >actual &&
+
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	sample1.t
+	sample2.t
+	commit
+	sample3.t
+	sample4.t
+	sample1.t
+	sample2.t
+	EOF
+
+	test_cmp expect actual
+
+ok 22 - log --rotate-to
+
+expecting success of 4056.23 'log --skip-to': 
+	git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
+	# just distill the commit header and paths
+	sed -n -e "s/^commit.*/commit/p" \
+	       -e "/^:/s/^.*	//p" raw >actual &&
+
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	commit
+	sample3.t
+	sample4.t
+	EOF
+
+	test_cmp expect actual
+
+ok 23 - log --skip-to
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4057-diff-combined-paths.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4057-diff-combined-paths/.git/
 expecting success of 4057.1 'trivial merge - combine-diff empty': 
@@ -250033,6 +249720,41 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4062-diff-pickaxe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4058-diff-duplicates.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4058-diff-duplicates/.git/
 expecting success of 4058.1 'create trees with duplicate entries': 
@@ -250245,41 +249967,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4062-diff-pickaxe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4063-diff-blobs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4063-diff-blobs/.git/
 expecting success of 4063.1 'create some blobs': 
@@ -250417,112 +250104,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4059-diff-submodule-not-initialized.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4059-diff-submodule-not-initialized/.git/
-expecting success of 4059.1 'setup - submodules': 
-	test_create_repo sm2 &&
-	add_file . foo &&
-	add_file sm2 foo1 foo2 &&
-	smhead1=$(git -C sm2 rev-parse --short --verify HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4059-diff-submodule-not-initialized/sm2/.git/
-36d39d8
-1beffeb
-ok 1 - setup - submodules
-
-expecting success of 4059.2 'setup - git submodule add': 
-	git -c protocol.file.allow=always submodule add ./sm2 sm1 &&
-	commit_file sm1 .gitmodules &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$smhead1 (new submodule)
-	EOF
-	test_cmp expected actual
-
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4059-diff-submodule-not-initialized/sm1'...
-done.
-ok 2 - setup - git submodule add
-
-expecting success of 4059.3 'submodule directory removed': 
-	rm -rf sm1 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$smhead1 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 3 - submodule directory removed
-
-expecting success of 4059.4 'setup - submodule multiple commits': 
-	git submodule update --checkout sm1 &&
-	smhead2=$(add_file sm1 foo3 foo4) &&
-	commit_file sm1 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $smhead1..$smhead2:
-	  > Add foo4 ($added foo4)
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-Submodule path 'sm1': checked out '1beffeb46f4c598c329381e14c03d952fb2e60d8'
-ok 4 - setup - submodule multiple commits
-
-expecting success of 4059.5 'submodule removed multiple commits': 
-	rm -rf sm1 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $smhead1..$smhead2:
-	  > Add foo4 ($added foo4)
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-ok 5 - submodule removed multiple commits
-
-expecting success of 4059.6 'submodule not initialized in new clone': 
-	git clone . sm3 &&
-	git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $smhead1...$smhead2 (commits not present)
-	EOF
-	test_cmp expected actual
-
-Cloning into 'sm3'...
-done.
-ok 6 - submodule not initialized in new clone
-
-expecting success of 4059.7 'setup submodule moved': 
-	git submodule update --checkout sm1 &&
-	git mv sm1 sm4 &&
-	commit_file sm4 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm4 0000000...$smhead2 (new submodule)
-	EOF
-	test_cmp expected actual
-
-Submodule path 'sm1': checked out 'b762e6a22f976e7e5d55bfe47bb4c4694f97a64c'
-ok 7 - setup submodule moved
-
-expecting success of 4059.8 'submodule moved then removed': 
-	smhead3=$(add_file sm4 foo6 foo7) &&
-	commit_file sm4 &&
-	rm -rf sm4 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm4 $smhead2..$smhead3:
-	  > Add foo7 ($added foo7)
-	  > Add foo6 ($added foo6)
-	EOF
-	test_cmp expected actual
-
-ok 8 - submodule moved then removed
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4065-diff-anchored.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4065-diff-anchored/.git/
 expecting success of 4065.1 '--anchored': 
@@ -250643,103 +250224,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4066-diff-emit-delay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4066-diff-emit-delay/.git/
-expecting success of 4066.1 'set up history with a merge': 
-	test_commit A &&
-	test_commit B &&
-	git checkout -b side HEAD^ &&
-	test_commit C &&
-	git merge -m M main &&
-	test_commit D
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'side'
-[side 5dee784] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Merge made by the 'ort' strategy.
- B.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[side 4d3a2bb] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-ok 1 - set up history with a merge
-
-expecting success of 4066.2 'log --cc -p --stat --color-moved': 
-	cat >expect <<-EOF &&
-	commit D
-	---
-	 D.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/D.t b/D.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short D:D.t)
-	--- /dev/null
-	+++ b/D.t
-	@@ -0,0 +1 @@
-	+D
-	commit M
-
-	 B.t | 1 +
-	 1 file changed, 1 insertion(+)
-	commit C
-	---
-	 C.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/C.t b/C.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short C:C.t)
-	--- /dev/null
-	+++ b/C.t
-	@@ -0,0 +1 @@
-	+C
-	commit B
-	---
-	 B.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/B.t b/B.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short B:B.t)
-	--- /dev/null
-	+++ b/B.t
-	@@ -0,0 +1 @@
-	+B
-	commit A
-	---
-	 A.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/A.t b/A.t
-	new file mode 100644
-	index 0000000..$(git rev-parse --short A:A.t)
-	--- /dev/null
-	+++ b/A.t
-	@@ -0,0 +1 @@
-	+A
-	EOF
-	git log --format="commit %s" --cc -p --stat --color-moved >actual &&
-	test_cmp expect actual
-
-ok 2 - log --cc -p --stat --color-moved
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4052-stat-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4052-stat-output/.git/
 expecting success of 4052.1 'preparation': 
@@ -251396,256 +250880,207 @@
 1..88
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4102-apply-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4102-apply-rename/.git/
-expecting success of 4102.1 'setup': git update-index --add foo
-ok 1 - setup
-
-expecting success of 4102.2 'apply': git apply --index --stat --summary --apply test-patch
- bar |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename foo => bar (47%)
-ok 2 - apply
-
-checking prerequisite: FILEMODE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
-
-)
-prerequisite FILEMODE ok
-expecting success of 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
--rwxr-xr-x 1 pbuilder1 pbuilder1 12 Feb  9 06:54 bar
-ok 3 - validate
-
-expecting success of 4102.4 'apply reverse': git apply -R --index --stat --summary --apply test-patch &&
-     test "$(cat foo)" = "This is foo"
- foo |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename bar => foo (47%)
-ok 4 - apply reverse
-
-expecting success of 4102.5 'apply copy': git apply --index --stat --summary --apply test-patch &&
-     test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"
- bar |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- copy foo => bar (47%)
-ok 5 - apply copy
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4101-apply-nonl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t4066-diff-emit-delay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4066-diff-emit-delay/.git/
+expecting success of 4066.1 'set up history with a merge': 
+	test_commit A &&
+	test_commit B &&
+	git checkout -b side HEAD^ &&
+	test_commit C &&
+	git merge -m M main &&
+	test_commit D
 
-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
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'side'
+[side 5dee784] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Merge made by the 'ort' strategy.
+ B.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[side 4d3a2bb] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ok 1 - set up history with a merge
 
-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 4066.2 'log --cc -p --stat --color-moved': 
+	cat >expect <<-EOF &&
+	commit D
+	---
+	 D.t | 1 +
+	 1 file changed, 1 insertion(+)
 
-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
+	diff --git a/D.t b/D.t
+	new file mode 100644
+	index 0000000..$(git rev-parse --short D:D.t)
+	--- /dev/null
+	+++ b/D.t
+	@@ -0,0 +1 @@
+	+D
+	commit M
 
-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
+	 B.t | 1 +
+	 1 file changed, 1 insertion(+)
+	commit C
+	---
+	 C.t | 1 +
+	 1 file changed, 1 insertion(+)
 
-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
+	diff --git a/C.t b/C.t
+	new file mode 100644
+	index 0000000..$(git rev-parse --short C:C.t)
+	--- /dev/null
+	+++ b/C.t
+	@@ -0,0 +1 @@
+	+C
+	commit B
+	---
+	 B.t | 1 +
+	 1 file changed, 1 insertion(+)
 
-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
+	diff --git a/B.t b/B.t
+	new file mode 100644
+	index 0000000..$(git rev-parse --short B:B.t)
+	--- /dev/null
+	+++ b/B.t
+	@@ -0,0 +1 @@
+	+B
+	commit A
+	---
+	 A.t | 1 +
+	 1 file changed, 1 insertion(+)
 
-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
+	diff --git a/A.t b/A.t
+	new file mode 100644
+	index 0000000..$(git rev-parse --short A:A.t)
+	--- /dev/null
+	+++ b/A.t
+	@@ -0,0 +1 @@
+	+A
+	EOF
+	git log --format="commit %s" --cc -p --stat --color-moved >actual &&
+	test_cmp expect actual
 
-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
+ok 2 - log --cc -p --stat --color-moved
 
-# passed all 12 test(s)
-1..12
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4100-apply-stat.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4100-apply-stat/.git/
-expecting success of 4100.1 'rename': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 1 - rename
-
-expecting success of 4100.2 'rename with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 2 - rename with recount
-
-expecting success of 4100.3 'copy': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 3 - copy
+*** t4059-diff-submodule-not-initialized.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4059-diff-submodule-not-initialized/.git/
+expecting success of 4059.1 'setup - submodules': 
+	test_create_repo sm2 &&
+	add_file . foo &&
+	add_file sm2 foo1 foo2 &&
+	smhead1=$(git -C sm2 rev-parse --short --verify HEAD)
 
-expecting success of 4100.4 'copy with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 4 - copy with recount
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4059-diff-submodule-not-initialized/sm2/.git/
+36d39d8
+1beffeb
+ok 1 - setup - submodules
 
-expecting success of 4100.5 'rewrite': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 5 - rewrite
+expecting success of 4059.2 'setup - git submodule add': 
+	git -c protocol.file.allow=always submodule add ./sm2 sm1 &&
+	commit_file sm1 .gitmodules &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$smhead1 (new submodule)
+	EOF
+	test_cmp expected actual
 
-expecting success of 4100.6 'rewrite with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 6 - rewrite with recount
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4059-diff-submodule-not-initialized/sm1'...
+done.
+ok 2 - setup - git submodule add
 
-expecting success of 4100.7 'mode': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 7 - mode
+expecting success of 4059.3 'submodule directory removed': 
+	rm -rf sm1 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$smhead1 (new submodule)
+	EOF
+	test_cmp expected actual
 
-expecting success of 4100.8 'mode with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 8 - mode with recount
+ok 3 - submodule directory removed
 
-expecting success of 4100.9 'non git (1)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 9 - non git (1)
+expecting success of 4059.4 'setup - submodule multiple commits': 
+	git submodule update --checkout sm1 &&
+	smhead2=$(add_file sm1 foo3 foo4) &&
+	commit_file sm1 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $smhead1..$smhead2:
+	  > Add foo4 ($added foo4)
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
 
-expecting success of 4100.10 'non git (1) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 10 - non git (1) with recount
+Submodule path 'sm1': checked out '1beffeb46f4c598c329381e14c03d952fb2e60d8'
+ok 4 - setup - submodule multiple commits
 
-expecting success of 4100.11 'non git (2)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 11 - non git (2)
+expecting success of 4059.5 'submodule removed multiple commits': 
+	rm -rf sm1 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $smhead1..$smhead2:
+	  > Add foo4 ($added foo4)
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
 
-expecting success of 4100.12 'non git (2) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 12 - non git (2) with recount
+ok 5 - submodule removed multiple commits
 
-expecting success of 4100.13 'non git (3)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 13 - non git (3)
+expecting success of 4059.6 'submodule not initialized in new clone': 
+	git clone . sm3 &&
+	git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $smhead1...$smhead2 (commits not present)
+	EOF
+	test_cmp expected actual
 
-expecting success of 4100.14 'non git (3) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 14 - non git (3) with recount
+Cloning into 'sm3'...
+done.
+ok 6 - submodule not initialized in new clone
 
-expecting success of 4100.15 'incomplete (1)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 15 - incomplete (1)
+expecting success of 4059.7 'setup submodule moved': 
+	git submodule update --checkout sm1 &&
+	git mv sm1 sm4 &&
+	commit_file sm4 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm4 0000000...$smhead2 (new submodule)
+	EOF
+	test_cmp expected actual
 
-expecting success of 4100.16 'incomplete (1) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 16 - incomplete (1) with recount
+Submodule path 'sm1': checked out 'b762e6a22f976e7e5d55bfe47bb4c4694f97a64c'
+ok 7 - setup submodule moved
 
-expecting success of 4100.17 'incomplete (2)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 17 - incomplete (2)
+expecting success of 4059.8 'submodule moved then removed': 
+	smhead3=$(add_file sm4 foo6 foo7) &&
+	commit_file sm4 &&
+	rm -rf sm4 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm4 $smhead2..$smhead3:
+	  > Add foo7 ($added foo7)
+	  > Add foo6 ($added foo6)
+	EOF
+	test_cmp expected actual
 
-expecting success of 4100.18 'incomplete (2) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 18 - incomplete (2) with recount
+ok 8 - submodule moved then removed
 
-# passed all 18 test(s)
-1..18
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4064-diff-oidfind.sh ***
@@ -251840,11293 +251275,5667 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4061-diff-indent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4061-diff-indent/.git/
-expecting success of 4061.1 'prepare': 
-	cat <<-\EOF >spaces.txt &&
-	1
-	2
-	a
-
-	b
-	3
-	4
-	EOF
-
-	cat <<-\EOF >functions.c &&
-	1
-	2
-	/* function */
-	foo() {
-	    foo
-	}
-
-	3
-	4
-	EOF
-
-	git add spaces.txt functions.c &&
-	test_tick &&
-	git commit -m initial &&
-	git branch old &&
-
-	cat <<-\EOF >spaces.txt &&
-	1
-	2
-	a
-
-	b
-	a
-
-	b
-	3
-	4
-	EOF
-
-	cat <<-\EOF >functions.c &&
-	1
-	2
-	/* function */
-	bar() {
-	    foo
-	}
-
-	/* function */
-	foo() {
-	    foo
-	}
-
-	3
-	4
-	EOF
-
-	git add spaces.txt functions.c &&
-	test_tick &&
-	git commit -m initial &&
-	git branch new &&
-
-	tr "_" " " <<-\EOF >spaces-expect &&
-	diff --git a/spaces.txt b/spaces.txt
-	--- a/spaces.txt
-	+++ b/spaces.txt
-	@@ -3,5 +3,8 @@
-	 a
-	_
-	 b
-	+a
-	+
-	+b
-	 3
-	 4
-	EOF
-
-	tr "_" " " <<-\EOF >spaces-compacted-expect &&
-	diff --git a/spaces.txt b/spaces.txt
-	--- a/spaces.txt
-	+++ b/spaces.txt
-	@@ -2,6 +2,9 @@
-	 2
-	 a
-	_
-	+b
-	+a
-	+
-	 b
-	 3
-	 4
-	EOF
-
-	tr "_" " " <<-\EOF >functions-expect &&
-	diff --git a/functions.c b/functions.c
-	--- a/functions.c
-	+++ b/functions.c
-	@@ -1,6 +1,11 @@
-	 1
-	 2
-	 /* function */
-	+bar() {
-	+    foo
-	+}
-	+
-	+/* function */
-	 foo() {
-	     foo
-	 }
-	EOF
-
-	tr "_" " " <<-\EOF >functions-compacted-expect
-	diff --git a/functions.c b/functions.c
-	--- a/functions.c
-	+++ b/functions.c
-	@@ -1,5 +1,10 @@
-	 1
-	 2
-	+/* function */
-	+bar() {
-	+    foo
-	+}
-	+
-	 /* function */
-	 foo() {
-	     foo
-	EOF
-
-[main (root-commit) a2a2312] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 functions.c
- create mode 100644 spaces.txt
-[main cc6bd2a] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
-ok 1 - prepare
-
-expecting success of 4061.2 'diff: ugly spaces': 
-	git diff --no-indent-heuristic old new -- spaces.txt >out &&
-	compare_diff spaces-expect out
-
-ok 2 - diff: ugly spaces
-
-expecting success of 4061.3 'diff: --no-indent-heuristic overrides config': 
-	git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&
-	compare_diff spaces-expect out2
-
-ok 3 - diff: --no-indent-heuristic overrides config
-
-expecting success of 4061.4 'diff: nice spaces with --indent-heuristic': 
-	git -c diff.indentHeuristic=false diff --indent-heuristic old new -- spaces.txt >out-compacted &&
-	compare_diff spaces-compacted-expect out-compacted
-
-ok 4 - diff: nice spaces with --indent-heuristic
-
-expecting success of 4061.5 'diff: nice spaces with diff.indentHeuristic=true': 
-	git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&
-	compare_diff spaces-compacted-expect out-compacted2
-
-ok 5 - diff: nice spaces with diff.indentHeuristic=true
-
-expecting success of 4061.6 'diff: --indent-heuristic with --patience': 
-	git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&
-	compare_diff spaces-compacted-expect out-compacted3
-
-ok 6 - diff: --indent-heuristic with --patience
-
-expecting success of 4061.7 'diff: --indent-heuristic with --histogram': 
-	git diff --indent-heuristic --histogram old new -- spaces.txt >out-compacted4 &&
-	compare_diff spaces-compacted-expect out-compacted4
-
-ok 7 - diff: --indent-heuristic with --histogram
-
-expecting success of 4061.8 'diff: ugly functions': 
-	git diff --no-indent-heuristic old new -- functions.c >out &&
-	compare_diff functions-expect out
-
-ok 8 - diff: ugly functions
-
-expecting success of 4061.9 'diff: nice functions with --indent-heuristic': 
-	git diff --indent-heuristic old new -- functions.c >out-compacted &&
-	compare_diff functions-compacted-expect out-compacted
-
-ok 9 - diff: nice functions with --indent-heuristic
-
-expecting success of 4061.10 'blame: nice spaces with --indent-heuristic': 
-	git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&
-	compare_blame spaces-compacted-expect out-blame-compacted
-
-ok 10 - blame: nice spaces with --indent-heuristic
-
-expecting success of 4061.11 'blame: nice spaces with diff.indentHeuristic=true': 
-	git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&
-	compare_blame spaces-compacted-expect out-blame-compacted2
-
-ok 11 - blame: nice spaces with diff.indentHeuristic=true
-
-expecting success of 4061.12 'blame: ugly spaces with --no-indent-heuristic': 
-	git blame --no-indent-heuristic old..new -- spaces.txt >out-blame &&
-	compare_blame spaces-expect out-blame
-
-ok 12 - blame: ugly spaces with --no-indent-heuristic
-
-expecting success of 4061.13 'blame: ugly spaces with diff.indentHeuristic=false': 
-	git -c diff.indentHeuristic=false blame old..new -- spaces.txt >out-blame2 &&
-	compare_blame spaces-expect out-blame2
-
-ok 13 - blame: ugly spaces with diff.indentHeuristic=false
-
-expecting success of 4061.14 'blame: --no-indent-heuristic overrides config': 
-	git -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame3 &&
-	git blame old..new -- spaces.txt >out-blame &&
-	compare_blame spaces-expect out-blame3
-
-ok 14 - blame: --no-indent-heuristic overrides config
-
-expecting success of 4061.15 'blame: --indent-heuristic overrides config': 
-	git -c diff.indentHeuristic=false blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted3 &&
-	compare_blame spaces-compacted-expect out-blame-compacted2
-
-ok 15 - blame: --indent-heuristic overrides config
-
-expecting success of 4061.16 'diff-tree: nice spaces with --indent-heuristic': 
-	git diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted &&
-	compare_diff spaces-compacted-expect out-diff-tree-compacted
-
-ok 16 - diff-tree: nice spaces with --indent-heuristic
-
-expecting success of 4061.17 'diff-tree: nice spaces with diff.indentHeuristic=true': 
-	git -c diff.indentHeuristic=true diff-tree -p old new -- spaces.txt >out-diff-tree-compacted2 &&
-	compare_diff spaces-compacted-expect out-diff-tree-compacted2
-
-ok 17 - diff-tree: nice spaces with diff.indentHeuristic=true
-
-expecting success of 4061.18 'diff-tree: ugly spaces with --no-indent-heuristic': 
-	git diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree &&
-	compare_diff spaces-expect out-diff-tree
-
-ok 18 - diff-tree: ugly spaces with --no-indent-heuristic
-
-expecting success of 4061.19 'diff-tree: ugly spaces with diff.indentHeuristic=false': 
-	git -c diff.indentHeuristic=false diff-tree -p old new -- spaces.txt >out-diff-tree2 &&
-	compare_diff spaces-expect out-diff-tree2
-
-ok 19 - diff-tree: ugly spaces with diff.indentHeuristic=false
-
-expecting success of 4061.20 'diff-tree: --indent-heuristic overrides config': 
-	git -c diff.indentHeuristic=false diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted3 &&
-	compare_diff spaces-compacted-expect out-diff-tree-compacted3
-
-ok 20 - diff-tree: --indent-heuristic overrides config
-
-expecting success of 4061.21 'diff-tree: --no-indent-heuristic overrides config': 
-	git -c diff.indentHeuristic=true diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree3 &&
-	compare_diff spaces-expect out-diff-tree3
-
-ok 21 - diff-tree: --no-indent-heuristic overrides config
-
-expecting success of 4061.22 'diff-index: nice spaces with --indent-heuristic': 
-	git checkout -B diff-index &&
-	git reset --soft HEAD~ &&
-	git diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted &&
-	compare_diff spaces-compacted-expect out-diff-index-compacted &&
-	git checkout -f main
-
-Switched to a new branch 'diff-index'
-Switched to branch 'main'
-ok 22 - diff-index: nice spaces with --indent-heuristic
-
-expecting success of 4061.23 'diff-index: nice spaces with diff.indentHeuristic=true': 
-	git checkout -B diff-index &&
-	git reset --soft HEAD~ &&
-	git -c diff.indentHeuristic=true diff-index -p old -- spaces.txt >out-diff-index-compacted2 &&
-	compare_diff spaces-compacted-expect out-diff-index-compacted2 &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 23 - diff-index: nice spaces with diff.indentHeuristic=true
-
-expecting success of 4061.24 'diff-index: ugly spaces with --no-indent-heuristic': 
-	git checkout -B diff-index &&
-	git reset --soft HEAD~ &&
-	git diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&
-	compare_diff spaces-expect out-diff-index &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 24 - diff-index: ugly spaces with --no-indent-heuristic
-
-expecting success of 4061.25 'diff-index: ugly spaces with diff.indentHeuristic=false': 
-	git checkout -B diff-index &&
-	git reset --soft HEAD~ &&
-	git -c diff.indentHeuristic=false diff-index -p old -- spaces.txt >out-diff-index2 &&
-	compare_diff spaces-expect out-diff-index2 &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 25 - diff-index: ugly spaces with diff.indentHeuristic=false
-
-expecting success of 4061.26 'diff-index: --indent-heuristic overrides config': 
-	git checkout -B diff-index &&
-	git reset --soft HEAD~ &&
-	git -c diff.indentHeuristic=false diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted3 &&
-	compare_diff spaces-compacted-expect out-diff-index-compacted3 &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 26 - diff-index: --indent-heuristic overrides config
-
-expecting success of 4061.27 'diff-index: --no-indent-heuristic overrides config': 
-	git checkout -B diff-index &&
-	git reset --soft HEAD~ &&
-	git -c diff.indentHeuristic=true diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index3 &&
-	compare_diff spaces-expect out-diff-index3 &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 27 - diff-index: --no-indent-heuristic overrides config
-
-expecting success of 4061.28 'diff-files: nice spaces with --indent-heuristic': 
-	git checkout -B diff-files &&
-	git reset HEAD~ &&
-	git diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw &&
-	grep -v index out-diff-files-raw >out-diff-files-compacted &&
-	compare_diff spaces-compacted-expect out-diff-files-compacted &&
-	git checkout -f main
-
-Switched to a new branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'main'
-ok 28 - diff-files: nice spaces with --indent-heuristic
-
-expecting success of 4061.29 'diff-files: nice spaces with diff.indentHeuristic=true': 
-	git checkout -B diff-files &&
-	git reset HEAD~ &&
-	git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw2 &&
-	grep -v index out-diff-files-raw2 >out-diff-files-compacted2 &&
-	compare_diff spaces-compacted-expect out-diff-files-compacted2 &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'main'
-ok 29 - diff-files: nice spaces with diff.indentHeuristic=true
-
-expecting success of 4061.30 'diff-files: ugly spaces with --no-indent-heuristic': 
-	git checkout -B diff-files &&
-	git reset HEAD~ &&
-	git diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw &&
-	grep -v index out-diff-files-raw >out-diff-files &&
-	compare_diff spaces-expect out-diff-files &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'main'
-ok 30 - diff-files: ugly spaces with --no-indent-heuristic
-
-expecting success of 4061.31 'diff-files: ugly spaces with diff.indentHeuristic=false': 
-	git checkout -B diff-files &&
-	git reset HEAD~ &&
-	git -c diff.indentHeuristic=false diff-files -p spaces.txt >out-diff-files-raw2 &&
-	grep -v index out-diff-files-raw2 >out-diff-files &&
-	compare_diff spaces-expect out-diff-files &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'main'
-ok 31 - diff-files: ugly spaces with diff.indentHeuristic=false
-
-expecting success of 4061.32 'diff-files: --indent-heuristic overrides config': 
-	git checkout -B diff-files &&
-	git reset HEAD~ &&
-	git -c diff.indentHeuristic=false diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw3 &&
-	grep -v index out-diff-files-raw3 >out-diff-files-compacted &&
-	compare_diff spaces-compacted-expect out-diff-files-compacted &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'main'
-ok 32 - diff-files: --indent-heuristic overrides config
-
-expecting success of 4061.33 'diff-files: --no-indent-heuristic overrides config': 
-	git checkout -B diff-files &&
-	git reset HEAD~ &&
-	git -c diff.indentHeuristic=true diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw4 &&
-	grep -v index out-diff-files-raw4 >out-diff-files &&
-	compare_diff spaces-expect out-diff-files &&
-	git checkout -f main
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'main'
-ok 33 - diff-files: --no-indent-heuristic overrides config
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4106-apply-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4107-apply-ignore-whitespace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4107-apply-ignore-whitespace/.git/
-expecting success of 4107.1 'file creation': 
-	git apply patch1.patch
-
-ok 1 - file creation
-
-expecting success of 4107.2 'patch2 fails (retab)': 
-	test_must_fail git apply patch2.patch
-
-error: patch failed: main.c:10
-error: main.c: patch does not apply
-ok 2 - patch2 fails (retab)
-
-expecting success of 4107.3 'patch2 applies with --ignore-whitespace': 
-	git apply --ignore-whitespace patch2.patch
-
-ok 3 - patch2 applies with --ignore-whitespace
-
-expecting success of 4107.4 'patch2 reverse applies with --ignore-space-change': 
-	git apply -R --ignore-space-change patch2.patch
-
-ok 4 - patch2 reverse applies with --ignore-space-change
-
-expecting success of 4107.5 'patch2 applies (apply.ignorewhitespace = change)': 
-	git apply patch2.patch &&
-	test_cmp main.c.final main.c
-
-ok 5 - patch2 applies (apply.ignorewhitespace = change)
-
-expecting success of 4107.6 'patch3 fails (missing string at EOL)': 
-	test_must_fail git apply patch3.patch
-
-error: patch failed: main.c:10
-error: main.c: patch does not apply
-ok 6 - patch3 fails (missing string at EOL)
-
-expecting success of 4107.7 'patch4 fails (missing EOL at EOF)': 
-	test_must_fail git apply patch4.patch
-
-error: patch failed: main.c:21
-error: main.c: patch does not apply
-ok 7 - patch4 fails (missing EOL at EOF)
-
-expecting success of 4107.8 'patch5 fails (leading whitespace differences matter)': 
-	test_must_fail git apply patch5.patch
-
-error: patch failed: main.c:2
-error: main.c: patch does not apply
-ok 8 - patch5 fails (leading whitespace differences matter)
-
-expecting success of 4107.9 're-create file (with --ignore-whitespace)': 
-	rm -f main.c &&
-	git apply patch1.patch
-
-ok 9 - re-create file (with --ignore-whitespace)
-
-expecting success of 4107.10 'patch5 fails (--no-ignore-whitespace)': 
-	test_must_fail git apply --no-ignore-whitespace patch5.patch
-
-error: patch failed: main.c:2
-error: main.c: patch does not apply
-ok 10 - patch5 fails (--no-ignore-whitespace)
-
-expecting success of 4107.11 'apply --ignore-space-change --inaccurate-eof': 
-	echo 1 >file &&
-	git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
-	diff --git a/file b/file
-	--- a/file
-	+++ b/file
-	@@ -1 +1 @@
-	-1
-	+2
-	EOF
-	printf 2 >expect &&
-	test_cmp expect file
-
-ok 11 - apply --ignore-space-change --inaccurate-eof
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4105-apply-fuzz.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4109-apply-multifrag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4110-apply-scan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4068-diff-symmetric-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t4102-apply-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4102-apply-rename/.git/
+expecting success of 4102.1 'setup': git update-index --add foo
 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4069-remerge-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 +-
+expecting success of 4102.2 'apply': git apply --index --stat --summary --apply test-patch
+ bar |    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 &&
+ rename foo => bar (47%)
+ok 2 - apply
 
-	git checkout newside1 &&
-	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m side1 &&
+checking prerequisite: FILEMODE
 
-	git checkout newside2 &&
-	test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m side2 &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+	test "$(git config --bool core.filemode)" = true
 
-	git checkout -b newresolution newside1 &&
-	test_must_fail git merge newside2 &&
-	git checkout --theirs numbers &&
-	git add -u numbers &&
-	git commit -m resolved
+)
+prerequisite FILEMODE ok
+expecting success of 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
+-rwxr-xr-x 1 pbuilder2 pbuilder2 12 Mar 14 13:31 bar
+ok 3 - validate
 
-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>
+expecting success of 4102.4 'apply reverse': git apply -R --index --stat --summary --apply test-patch &&
+     test "$(cat foo)" = "This is foo"
+ foo |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-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
-
-expecting success of 4069.16 'remerge-diff with --reverse': 
-	git log -1 --remerge-diff --oneline ab_resolution^ >expect &&
-	git log -1 --remerge-diff --oneline ab_resolution >>expect &&
-	git log -2 --remerge-diff --oneline ab_resolution --reverse >actual &&
-	test_cmp expect actual
+ rename bar => foo (47%)
+ok 4 - apply reverse
 
-ok 16 - remerge-diff with --reverse
+expecting success of 4102.5 'apply copy': git apply --index --stat --summary --apply test-patch &&
+     test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"
+ bar |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ copy foo => bar (47%)
+ok 5 - apply copy
 
-# passed all 16 test(s)
-1..16
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4104-apply-boundary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4104-apply-boundary/.git/
-expecting success of 4104.1 'setup': 
-	test_write_lines b $L y >victim &&
-	cat victim >original &&
-	git update-index --add victim &&
-
-	# add to the head
-	test_write_lines a b $L y >victim &&
-	cat victim >add-a-expect &&
-	git diff victim >add-a-patch.with &&
-	git diff --unified=0 >add-a-patch.without &&
-
-	# insert at line two
-	test_write_lines b a $L y >victim &&
-	cat victim >insert-a-expect &&
-	git diff victim >insert-a-patch.with &&
-	git diff --unified=0 >insert-a-patch.without &&
-
-	# modify at the head
-	test_write_lines a $L y >victim &&
-	cat victim >mod-a-expect &&
-	git diff victim >mod-a-patch.with &&
-	git diff --unified=0 >mod-a-patch.without &&
-
-	# remove from the head
-	test_write_lines $L y >victim &&
-	cat victim >del-a-expect &&
-	git diff victim >del-a-patch.with &&
-	git diff --unified=0 >del-a-patch.without &&
-
-	# add to the tail
-	test_write_lines b $L y z >victim &&
-	cat victim >add-z-expect &&
-	git diff victim >add-z-patch.with &&
-	git diff --unified=0 >add-z-patch.without &&
-
-	# modify at the tail
-	test_write_lines b $L z >victim &&
-	cat victim >mod-z-expect &&
-	git diff victim >mod-z-patch.with &&
-	git diff --unified=0 >mod-z-patch.without &&
-
-	# remove from the tail
-	test_write_lines b $L >victim &&
-	cat victim >del-z-expect &&
-	git diff victim >del-z-patch.with &&
-	git diff --unified=0 >del-z-patch.without
-
-	# done
-
-ok 1 - setup
-
-expecting success of 4104.2 'apply add-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 2 - apply add-a-patch with context
-
-expecting success of 4104.3 'apply add-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 3 - apply add-z-patch with context
-
-expecting success of 4104.4 'apply insert-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 4 - apply insert-a-patch with context
-
-expecting success of 4104.5 'apply mod-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 5 - apply mod-a-patch with context
-
-expecting success of 4104.6 'apply mod-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 6 - apply mod-z-patch with context
-
-expecting success of 4104.7 'apply del-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 7 - apply del-a-patch with context
-
-expecting success of 4104.8 'apply del-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 8 - apply del-z-patch with context
-
-expecting success of 4104.9 'apply add-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 9 - apply add-a-patch without context
-
-expecting success of 4104.10 'apply add-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 10 - apply add-z-patch without context
-
-expecting success of 4104.11 'apply insert-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 11 - apply insert-a-patch without context
-
-expecting success of 4104.12 'apply mod-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 12 - apply mod-a-patch without context
-
-expecting success of 4104.13 'apply mod-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 13 - apply mod-z-patch without context
-
-expecting success of 4104.14 'apply del-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 14 - apply del-a-patch without context
-
-expecting success of 4104.15 'apply del-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 15 - apply del-z-patch without context
-
-expecting success of 4104.16 'apply non-git add-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 16 - apply non-git add-a-patch without context
-
-expecting success of 4104.17 'apply non-git add-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 17 - apply non-git add-z-patch without context
-
-expecting success of 4104.18 'apply non-git insert-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 18 - apply non-git insert-a-patch without context
-
-expecting success of 4104.19 'apply non-git mod-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 19 - apply non-git mod-a-patch without context
-
-expecting success of 4104.20 'apply non-git mod-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
+*** t4100-apply-stat.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4100-apply-stat/.git/
+expecting success of 4100.1 'rename': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
 	
-ok 20 - apply non-git mod-z-patch without context
+ok 1 - rename
 
-expecting success of 4104.21 'apply non-git del-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
+expecting success of 4100.2 'rename with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
 	
-ok 21 - apply non-git del-a-patch without context
+ok 2 - rename with recount
 
-expecting success of 4104.22 'apply non-git del-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
+expecting success of 4100.3 'copy': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
 	
-ok 22 - apply non-git del-z-patch without context
-
-expecting success of 4104.23 'two lines': 
-	>file &&
-	git add file &&
-	echo aaa >file &&
-	git diff >patch &&
-	git add file &&
-	echo bbb >file &&
-	git add file &&
-	test_must_fail git apply --check patch
-
-error: patch failed: file:0
-error: file: patch does not apply
-ok 23 - two lines
-
-expecting success of 4104.24 'apply patch with 3 context lines matching at end': 
-	test_write_lines a b c d >file &&
-	git add file &&
-	echo e >>file &&
-	git diff >patch &&
-	>file &&
-	test_must_fail git apply patch
-
-error: patch failed: file:2
-error: file: patch does not apply
-ok 24 - apply patch with 3 context lines matching at end
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4067-diff-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t4067-diff-partial-clone/server/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4067-diff-partial-clone/server/sub'...
-[master (root-commit) eff6a2b] 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 0f46ae5] 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4103-apply-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4112-apply-renames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4113-apply-ending.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4060-diff-submodule-option-diff-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/.git/
-expecting success of 4060.1 'setup repository': 
-	test_create_repo sm1 &&
-	add_file . foo &&
-	head1=$(add_file sm1 foo1 foo2) &&
-	fullhead1=$(git -C sm1 rev-parse --verify HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
-36d39d8
-ok 1 - setup repository
-
-expecting success of 4060.2 'added submodule': 
-	git add sm1 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	new file mode 100644
-	index 0000000..1715acd
-	--- /dev/null
-	+++ b/sm1/foo1
-	@@ -0,0 +1 @@
-	+foo1
-	diff --git a/sm1/foo2 b/sm1/foo2
-	new file mode 100644
-	index 0000000..54b060e
-	--- /dev/null
-	+++ b/sm1/foo2
-	@@ -0,0 +1 @@
-	+foo2
-	EOF
-	diff_cmp expected actual
-
-warning: adding embedded git repository: sm1
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm1
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm1
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 2 - added submodule
-
-expecting success of 4060.3 'added submodule, set diff.submodule': 
-	test_config diff.submodule log &&
-	git add sm1 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	new file mode 100644
-	index 0000000..1715acd
-	--- /dev/null
-	+++ b/sm1/foo1
-	@@ -0,0 +1 @@
-	+foo1
-	diff --git a/sm1/foo2 b/sm1/foo2
-	new file mode 100644
-	index 0000000..54b060e
-	--- /dev/null
-	+++ b/sm1/foo2
-	@@ -0,0 +1 @@
-	+foo2
-	EOF
-	diff_cmp expected actual
-
-ok 3 - added submodule, set diff.submodule
-
-expecting success of 4060.4 '--submodule=short overrides diff.submodule': 
-	test_config diff.submodule log &&
-	git add sm1 &&
-	git diff --submodule=short --cached >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	new file mode 160000
-	index 0000000..$head1
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead1
-	EOF
-	diff_cmp expected actual
-
-ok 4 - --submodule=short overrides diff.submodule
-
-expecting success of 4060.5 'diff.submodule does not affect plumbing': 
-	test_config diff.submodule log &&
-	git diff-index -p HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	new file mode 160000
-	index 0000000..$head1
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead1
-	EOF
-	diff_cmp expected actual
-
-ok 5 - diff.submodule does not affect plumbing
-
-expecting success of 4060.6 'modified submodule(forward)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	diff --git a/sm1/foo3 b/sm1/foo3
-	new file mode 100644
-	index 0000000..c1ec6c6
-	--- /dev/null
-	+++ b/sm1/foo3
-	@@ -0,0 +1 @@
-	+foo3
-	EOF
-	diff_cmp expected actual
-
-ok 6 - modified submodule(forward)
-
-expecting success of 4060.7 'modified submodule(forward)': 
-	git diff --submodule=diff >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	diff --git a/sm1/foo3 b/sm1/foo3
-	new file mode 100644
-	index 0000000..c1ec6c6
-	--- /dev/null
-	+++ b/sm1/foo3
-	@@ -0,0 +1 @@
-	+foo3
-	EOF
-	diff_cmp expected actual
-
-ok 7 - modified submodule(forward)
-
-expecting success of 4060.8 'modified submodule(forward) --submodule': 
-	git diff --submodule >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	diff_cmp expected actual
-
-ok 8 - modified submodule(forward) --submodule
-
-expecting success of 4060.9 'modified submodule(forward) --submodule=short': 
-	git diff --submodule=short >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	index $head1..$head2 160000
-	--- a/sm1
-	+++ b/sm1
-	@@ -1 +1 @@
-	-Subproject commit $fullhead1
-	+Subproject commit $fullhead2
-	EOF
-	diff_cmp expected actual
-
-ok 9 - modified submodule(forward) --submodule=short
-
-expecting success of 4060.10 'modified submodule(backward)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2..$head3 (rewind):
-	diff --git a/sm1/foo2 b/sm1/foo2
-	deleted file mode 100644
-	index 54b060e..0000000
-	--- a/sm1/foo2
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo2
-	diff --git a/sm1/foo3 b/sm1/foo3
-	deleted file mode 100644
-	index c1ec6c6..0000000
-	--- a/sm1/foo3
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo3
-	EOF
-	diff_cmp expected actual
-
-ok 10 - modified submodule(backward)
-
-expecting success of 4060.11 'modified submodule(backward and forward)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2...$head4:
-	diff --git a/sm1/foo2 b/sm1/foo2
-	deleted file mode 100644
-	index 54b060e..0000000
-	--- a/sm1/foo2
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo2
-	diff --git a/sm1/foo3 b/sm1/foo3
-	deleted file mode 100644
-	index c1ec6c6..0000000
-	--- a/sm1/foo3
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo3
-	diff --git a/sm1/foo4 b/sm1/foo4
-	new file mode 100644
-	index 0000000..a0016db
-	--- /dev/null
-	+++ b/sm1/foo4
-	@@ -0,0 +1 @@
-	+foo4
-	diff --git a/sm1/foo5 b/sm1/foo5
-	new file mode 100644
-	index 0000000..d6f2413
-	--- /dev/null
-	+++ b/sm1/foo5
-	@@ -0,0 +1 @@
-	+foo5
-	EOF
-	diff_cmp expected actual
-
-ok 11 - modified submodule(backward and forward)
-
-expecting success of 4060.12 'typechanged submodule(submodule->blob), --cached': 
-	git diff --submodule=diff --cached >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	deleted file mode 100644
-	index 1715acd..0000000
-	--- a/sm1/foo1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo1
-	diff --git a/sm1/foo4 b/sm1/foo4
-	deleted file mode 100644
-	index a0016db..0000000
-	--- a/sm1/foo4
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo4
-	diff --git a/sm1/foo5 b/sm1/foo5
-	deleted file mode 100644
-	index d6f2413..0000000
-	--- a/sm1/foo5
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo5
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..9da5fb8
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
-	EOF
-	diff_cmp expected actual
+ok 3 - copy
 
-ok 12 - typechanged submodule(submodule->blob), --cached
+expecting success of 4100.4 'copy with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 4 - copy with recount
 
-expecting success of 4060.13 'typechanged submodule(submodule->blob)': 
-	git diff --submodule=diff >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 100644
-	index 9da5fb8..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-sm1
-	Submodule sm1 0000000...$head4 (new submodule)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	new file mode 100644
-	index 0000000..1715acd
-	--- /dev/null
-	+++ b/sm1/foo1
-	@@ -0,0 +1 @@
-	+foo1
-	diff --git a/sm1/foo4 b/sm1/foo4
-	new file mode 100644
-	index 0000000..a0016db
-	--- /dev/null
-	+++ b/sm1/foo4
-	@@ -0,0 +1 @@
-	+foo4
-	diff --git a/sm1/foo5 b/sm1/foo5
-	new file mode 100644
-	index 0000000..d6f2413
-	--- /dev/null
-	+++ b/sm1/foo5
-	@@ -0,0 +1 @@
-	+foo5
-	EOF
-	diff_cmp expected actual
+expecting success of 4100.5 'rewrite': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 5 - rewrite
 
-ok 13 - typechanged submodule(submodule->blob)
+expecting success of 4100.6 'rewrite with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 6 - rewrite with recount
 
-expecting success of 4060.14 'typechanged submodule(submodule->blob)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..9da5fb8
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
-	EOF
-	diff_cmp expected actual
+expecting success of 4100.7 'mode': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 7 - mode
 
-ok 14 - typechanged submodule(submodule->blob)
+expecting success of 4100.8 'mode with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 8 - mode with recount
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
-expecting success of 4060.15 'nonexistent commit': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...$head6 (commits not present)
-	EOF
-	diff_cmp expected actual
+expecting success of 4100.9 'non git (1)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 9 - non git (1)
 
-ok 15 - nonexistent commit
+expecting success of 4100.10 'non git (1) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 10 - non git (1) with recount
 
-expecting success of 4060.16 'typechanged submodule(blob->submodule)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 100644
-	index 9da5fb8..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-sm1
-	Submodule sm1 0000000...$head6 (new submodule)
-	diff --git a/sm1/foo6 b/sm1/foo6
-	new file mode 100644
-	index 0000000..462398b
-	--- /dev/null
-	+++ b/sm1/foo6
-	@@ -0,0 +1 @@
-	+foo6
-	diff --git a/sm1/foo7 b/sm1/foo7
-	new file mode 100644
-	index 0000000..6e9262c
-	--- /dev/null
-	+++ b/sm1/foo7
-	@@ -0,0 +1 @@
-	+foo7
-	EOF
-	diff_cmp expected actual
+expecting success of 4100.11 'non git (2)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 11 - non git (2)
 
-ok 16 - typechanged submodule(blob->submodule)
+expecting success of 4100.12 'non git (2) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 12 - non git (2) with recount
 
-expecting success of 4060.17 'submodule is up to date': 
-	head7=$(git -C sm1 rev-parse --short --verify HEAD) &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4100.13 'non git (3)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 13 - non git (3)
 
-ok 17 - submodule is up to date
+expecting success of 4100.14 'non git (3) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 14 - non git (3) with recount
 
-expecting success of 4060.18 'submodule contains untracked content': 
-	echo new > sm1/new-file &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	EOF
-	diff_cmp expected actual
+expecting success of 4100.15 'incomplete (1)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 15 - incomplete (1)
 
-ok 18 - submodule contains untracked content
+expecting success of 4100.16 'incomplete (1) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 16 - incomplete (1) with recount
 
-expecting success of 4060.19 'submodule contains untracked content (untracked ignored)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4100.17 'incomplete (2)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 17 - incomplete (2)
 
-ok 19 - submodule contains untracked content (untracked ignored)
+expecting success of 4100.18 'incomplete (2) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 18 - incomplete (2) with recount
 
-expecting success of 4060.20 'submodule contains untracked content (dirty ignored)': 
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4101-apply-nonl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 20 - submodule contains untracked content (dirty ignored)
+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 4060.21 'submodule contains untracked content (all ignored)': 
-	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 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
 
-ok 21 - submodule contains untracked content (all ignored)
+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 4060.22 'submodule contains untracked and modified content': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 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
 
-ok 22 - submodule contains untracked and modified content
+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 4060.23 'submodule contains untracked and modified content (untracked ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 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
 
-ok 23 - submodule contains untracked and modified content (untracked ignored)
+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 4060.24 'submodule contains untracked and modified content (dirty ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 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
 
-ok 24 - submodule contains untracked and modified content (dirty ignored)
+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 4060.25 'submodule contains untracked and modified content (all ignored)': 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 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
 
-ok 25 - submodule contains untracked and modified content (all ignored)
+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
 
-expecting success of 4060.26 'submodule contains modified content': 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4061-diff-indent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4061-diff-indent/.git/
+expecting success of 4061.1 'prepare': 
+	cat <<-\EOF >spaces.txt &&
+	1
+	2
+	a
+
+	b
+	3
+	4
 	EOF
-	diff_cmp expected actual
 
-ok 26 - submodule contains modified content
+	cat <<-\EOF >functions.c &&
+	1
+	2
+	/* function */
+	foo() {
+	    foo
+	}
 
-expecting success of 4060.27 'submodule is modified': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
+	3
+	4
 	EOF
-	diff_cmp expected actual
 
-ok 27 - submodule is modified
+	git add spaces.txt functions.c &&
+	test_tick &&
+	git commit -m initial &&
+	git branch old &&
 
-expecting success of 4060.28 'modified submodule contains untracked content': 
-	echo new > sm1/new-file &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+	cat <<-\EOF >spaces.txt &&
+	1
+	2
+	a
 
-ok 28 - modified submodule contains untracked content
+	b
+	a
 
-expecting success of 4060.29 'modified submodule contains untracked content (untracked ignored)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
+	b
+	3
+	4
 	EOF
-	diff_cmp expected actual
 
-ok 29 - modified submodule contains untracked content (untracked ignored)
+	cat <<-\EOF >functions.c &&
+	1
+	2
+	/* function */
+	bar() {
+	    foo
+	}
 
-expecting success of 4060.30 'modified submodule contains untracked content (dirty ignored)': 
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+	/* function */
+	foo() {
+	    foo
+	}
 
-ok 30 - modified submodule contains untracked content (dirty ignored)
+	3
+	4
+	EOF
 
-expecting success of 4060.31 'modified submodule contains untracked content (all ignored)': 
-	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+	git add spaces.txt functions.c &&
+	test_tick &&
+	git commit -m initial &&
+	git branch new &&
 
-ok 31 - modified submodule contains untracked content (all ignored)
+	tr "_" " " <<-\EOF >spaces-expect &&
+	diff --git a/spaces.txt b/spaces.txt
+	--- a/spaces.txt
+	+++ b/spaces.txt
+	@@ -3,5 +3,8 @@
+	 a
+	_
+	 b
+	+a
+	+
+	+b
+	 3
+	 4
+	EOF
 
-expecting success of 4060.32 'modified submodule contains untracked and modified content': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..dfda541 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1,2 @@
-	-foo6
-	+new
-	+modification
+	tr "_" " " <<-\EOF >spaces-compacted-expect &&
+	diff --git a/spaces.txt b/spaces.txt
+	--- a/spaces.txt
+	+++ b/spaces.txt
+	@@ -2,6 +2,9 @@
+	 2
+	 a
+	_
+	+b
+	+a
+	+
+	 b
+	 3
+	 4
 	EOF
-	diff_cmp expected actual
 
-ok 32 - modified submodule contains untracked and modified content
+	tr "_" " " <<-\EOF >functions-expect &&
+	diff --git a/functions.c b/functions.c
+	--- a/functions.c
+	+++ b/functions.c
+	@@ -1,6 +1,11 @@
+	 1
+	 2
+	 /* function */
+	+bar() {
+	+    foo
+	+}
+	+
+	+/* function */
+	 foo() {
+	     foo
+	 }
+	EOF
 
-expecting success of 4060.33 'modified submodule contains untracked and modified content (untracked ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..e20e2d9 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1,3 @@
-	-foo6
-	+new
-	+modification
-	+modification
+	tr "_" " " <<-\EOF >functions-compacted-expect
+	diff --git a/functions.c b/functions.c
+	--- a/functions.c
+	+++ b/functions.c
+	@@ -1,5 +1,10 @@
+	 1
+	 2
+	+/* function */
+	+bar() {
+	+    foo
+	+}
+	+
+	 /* function */
+	 foo() {
+	     foo
 	EOF
-	diff_cmp expected actual
 
-ok 33 - modified submodule contains untracked and modified content (untracked ignored)
+[main (root-commit) a2a2312] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 16 insertions(+)
+ create mode 100644 functions.c
+ create mode 100644 spaces.txt
+[main cc6bd2a] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ok 1 - prepare
 
-expecting success of 4060.34 'modified submodule contains untracked and modified content (dirty ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..3e75765 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1 @@
-	-foo6
-	+new
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.2 'diff: ugly spaces': 
+	git diff --no-indent-heuristic old new -- spaces.txt >out &&
+	compare_diff spaces-expect out
 
-ok 34 - modified submodule contains untracked and modified content (dirty ignored)
+ok 2 - diff: ugly spaces
 
-expecting success of 4060.35 'modified submodule contains untracked and modified content (all ignored)': 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
-	test_must_be_empty actual
+expecting success of 4061.3 'diff: --no-indent-heuristic overrides config': 
+	git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&
+	compare_diff spaces-expect out2
 
-ok 35 - modified submodule contains untracked and modified content (all ignored)
+ok 3 - diff: --no-indent-heuristic overrides config
 
-expecting success of 4060.36 'modified submodule contains modified content': 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head7..$head8:
-	diff --git a/sm1/foo6 b/sm1/foo6
-	index 462398b..ac466ca 100644
-	--- a/sm1/foo6
-	+++ b/sm1/foo6
-	@@ -1 +1,5 @@
-	-foo6
-	+new
-	+modification
-	+modification
-	+modification
-	+modification
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.4 'diff: nice spaces with --indent-heuristic': 
+	git -c diff.indentHeuristic=false diff --indent-heuristic old new -- spaces.txt >out-compacted &&
+	compare_diff spaces-compacted-expect out-compacted
 
-ok 36 - modified submodule contains modified content
+ok 4 - diff: nice spaces with --indent-heuristic
 
-expecting success of 4060.37 'deleted submodule': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.5 'diff: nice spaces with diff.indentHeuristic=true': 
+	git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&
+	compare_diff spaces-compacted-expect out-compacted2
 
-ok 37 - deleted submodule
+ok 5 - diff: nice spaces with diff.indentHeuristic=true
 
-expecting success of 4060.38 'create second submodule': 
-	test_create_repo sm2 &&
-	head9=$(add_file sm2 foo8 foo9) &&
-	git add sm2
+expecting success of 4061.6 'diff: --indent-heuristic with --patience': 
+	git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&
+	compare_diff spaces-compacted-expect out-compacted3
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/.git/
-warning: adding embedded git repository: sm2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 38 - create second submodule
+ok 6 - diff: --indent-heuristic with --patience
 
-expecting success of 4060.39 'multiple submodules': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.7 'diff: --indent-heuristic with --histogram': 
+	git diff --indent-heuristic --histogram old new -- spaces.txt >out-compacted4 &&
+	compare_diff spaces-compacted-expect out-compacted4
 
-ok 39 - multiple submodules
+ok 7 - diff: --indent-heuristic with --histogram
 
-expecting success of 4060.40 'path filter': 
-	git diff-index -p --submodule=diff HEAD sm2 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.8 'diff: ugly functions': 
+	git diff --no-indent-heuristic old new -- functions.c >out &&
+	compare_diff functions-expect out
 
-ok 40 - path filter
+ok 8 - diff: ugly functions
 
-expecting success of 4060.41 'given commit': 
-	git diff-index -p --submodule=diff HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/.gitmodules b/.gitmodules
-	new file mode 100644
-	index 1234567..89abcde
-	--- /dev/null
-	+++ b/.gitmodules
-	@@ -0,0 +1,3 @@
-	+[submodule "sm2"]
-	+path = sm2
-	+url = bogus_url
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.9 'diff: nice functions with --indent-heuristic': 
+	git diff --indent-heuristic old new -- functions.c >out-compacted &&
+	compare_diff functions-compacted-expect out-compacted
 
-ok 41 - given commit
+ok 9 - diff: nice functions with --indent-heuristic
 
-expecting success of 4060.42 'setup .git file for sm2': 
-	git submodule absorbgitdirs sm2
+expecting success of 4061.10 'blame: nice spaces with --indent-heuristic': 
+	git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&
+	compare_blame spaces-compacted-expect out-blame-compacted
 
-Migrating git directory of 'sm2' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/.git/modules/sm2'
-ok 42 - setup .git file for sm2
+ok 10 - blame: nice spaces with --indent-heuristic
 
-expecting success of 4060.43 'diff --submodule=diff with .git file': 
-	git diff --submodule=diff HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/.gitmodules b/.gitmodules
-	new file mode 100644
-	index 1234567..89abcde
-	--- /dev/null
-	+++ b/.gitmodules
-	@@ -0,0 +1,3 @@
-	+[submodule "sm2"]
-	+path = sm2
-	+url = bogus_url
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head9 (new submodule)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.11 'blame: nice spaces with diff.indentHeuristic=true': 
+	git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&
+	compare_blame spaces-compacted-expect out-blame-compacted2
 
-ok 43 - diff --submodule=diff with .git file
+ok 11 - blame: nice spaces with diff.indentHeuristic=true
 
-expecting success of 4060.44 'deleted submodule with .git file': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 $head9...0000000 (submodule deleted)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.12 'blame: ugly spaces with --no-indent-heuristic': 
+	git blame --no-indent-heuristic old..new -- spaces.txt >out-blame &&
+	compare_blame spaces-expect out-blame
 
-ok 44 - deleted submodule with .git file
+ok 12 - blame: ugly spaces with --no-indent-heuristic
 
-expecting success of 4060.45 'typechanged(submodule->blob) submodule with .git file': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 $head9...0000000 (submodule deleted)
-	diff --git a/sm2/foo8 b/sm2/foo8
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	deleted file mode 100644
-	index 1234567..89abcde
-	--- a/sm2/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	diff --git a/sm2 b/sm2
-	new file mode 100644
-	index 1234567..89abcde
-	--- /dev/null
-	+++ b/sm2
-	@@ -0,0 +1 @@
-	+submodule-to-blob
-	EOF
-	diff_cmp expected actual
+expecting success of 4061.13 'blame: ugly spaces with diff.indentHeuristic=false': 
+	git -c diff.indentHeuristic=false blame old..new -- spaces.txt >out-blame2 &&
+	compare_blame spaces-expect out-blame2
 
-ok 45 - typechanged(submodule->blob) submodule with .git file
+ok 13 - blame: ugly spaces with diff.indentHeuristic=false
 
-expecting success of 4060.46 'setup nested submodule': 
-	git -c protocol.file.allow=always -C sm2 submodule add ../sm2 nested &&
-	git -C sm2 commit -a -m "nested sub" &&
-	head10=$(git -C sm2 rev-parse --short --verify HEAD)
+expecting success of 4061.14 'blame: --no-indent-heuristic overrides config': 
+	git -c diff.indentHeuristic=true blame --no-indent-heuristic old..new -- spaces.txt >out-blame3 &&
+	git blame old..new -- spaces.txt >out-blame &&
+	compare_blame spaces-expect out-blame3
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/nested'...
-done.
-[master 280969a] nested sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested
-ok 46 - setup nested submodule
+ok 14 - blame: --no-indent-heuristic overrides config
 
-expecting success of 4060.47 'move nested submodule HEAD': 
-	echo "nested content" >sm2/nested/file &&
-	git -C sm2/nested add file &&
-	git -C sm2/nested commit --allow-empty -m "new HEAD" &&
-	head11=$(git -C sm2/nested rev-parse --short --verify HEAD)
+expecting success of 4061.15 'blame: --indent-heuristic overrides config': 
+	git -c diff.indentHeuristic=false blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted3 &&
+	compare_blame spaces-compacted-expect out-blame-compacted2
 
-[master b55928c] new HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 47 - move nested submodule HEAD
+ok 15 - blame: --indent-heuristic overrides config
 
-expecting success of 4060.48 'diff --submodule=diff with moved nested submodule HEAD': 
-	cat >expected <<-EOF &&
-	Submodule nested $head9..$head11:
-	diff --git a/nested/file b/nested/file
-	new file mode 100644
-	index 0000000..ca281f5
-	--- /dev/null
-	+++ b/nested/file
-	@@ -0,0 +1 @@
-	+nested content
-	EOF
-	git -C sm2 diff --submodule=diff >actual 2>err &&
-	test_must_be_empty err &&
-	diff_cmp expected actual
+expecting success of 4061.16 'diff-tree: nice spaces with --indent-heuristic': 
+	git diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted &&
+	compare_diff spaces-compacted-expect out-diff-tree-compacted
 
-ok 48 - diff --submodule=diff with moved nested submodule HEAD
+ok 16 - diff-tree: nice spaces with --indent-heuristic
 
-expecting success of 4060.49 'diff --submodule=diff recurses into nested submodules': 
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 contains modified content
-	Submodule sm2 $head9..$head10:
-	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
-	new file mode 100644
-	index 0000000..3a816b8
-	--- /dev/null
-	+++ b/sm2/.gitmodules
-	@@ -0,0 +1,3 @@
-	+[submodule "nested"]
-	+	path = nested
-	+	url = ../sm2
-	Submodule nested 0000000...$head11 (new submodule)
-	diff --git a/sm2/nested/file b/sm2/nested/file
-	new file mode 100644
-	index 0000000..ca281f5
-	--- /dev/null
-	+++ b/sm2/nested/file
-	@@ -0,0 +1 @@
-	+nested content
-	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
-	new file mode 100644
-	index 0000000..db9916b
-	--- /dev/null
-	+++ b/sm2/nested/foo8
-	@@ -0,0 +1 @@
-	+foo8
-	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
-	new file mode 100644
-	index 0000000..9c3b4f6
-	--- /dev/null
-	+++ b/sm2/nested/foo9
-	@@ -0,0 +1 @@
-	+foo9
-	EOF
-	git diff --submodule=diff >actual 2>err &&
-	test_must_be_empty err &&
-	diff_cmp expected actual
+expecting success of 4061.17 'diff-tree: nice spaces with diff.indentHeuristic=true': 
+	git -c diff.indentHeuristic=true diff-tree -p old new -- spaces.txt >out-diff-tree-compacted2 &&
+	compare_diff spaces-compacted-expect out-diff-tree-compacted2
 
-ok 49 - diff --submodule=diff recurses into nested submodules
+ok 17 - diff-tree: nice spaces with diff.indentHeuristic=true
 
-expecting success of 4060.50 'diff --submodule=diff recurses into deleted nested submodules': 
-	cat >expected <<-EOF &&
-	Submodule sm1 $head7...0000000 (submodule deleted)
-	Submodule sm2 $head12...0000000 (submodule deleted)
-	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
-	deleted file mode 100644
-	index 3a816b8..0000000
-	--- a/sm2/.gitmodules
-	+++ /dev/null
-	@@ -1,3 +0,0 @@
-	-[submodule "nested"]
-	-	path = nested
-	-	url = ../sm2
-	diff --git a/sm2/foo8 b/sm2/foo8
-	deleted file mode 100644
-	index db9916b..0000000
-	--- a/sm2/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/foo9 b/sm2/foo9
-	deleted file mode 100644
-	index 9c3b4f6..0000000
-	--- a/sm2/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	Submodule nested $head11...0000000 (submodule deleted)
-	diff --git a/sm2/nested/file b/sm2/nested/file
-	deleted file mode 100644
-	index ca281f5..0000000
-	--- a/sm2/nested/file
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-nested content
-	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
-	deleted file mode 100644
-	index db9916b..0000000
-	--- a/sm2/nested/foo8
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo8
-	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
-	deleted file mode 100644
-	index 9c3b4f6..0000000
-	--- a/sm2/nested/foo9
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo9
-	EOF
-	git diff --submodule=diff >actual 2>err &&
-	test_must_be_empty err &&
-	diff_cmp expected actual
+expecting success of 4061.18 'diff-tree: ugly spaces with --no-indent-heuristic': 
+	git diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree &&
+	compare_diff spaces-expect out-diff-tree
 
-ok 50 - diff --submodule=diff recurses into deleted nested submodules
+ok 18 - diff-tree: ugly spaces with --no-indent-heuristic
 
-# passed all 50 test(s)
-1..50
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4118-apply-empty-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 4061.19 'diff-tree: ugly spaces with diff.indentHeuristic=false': 
+	git -c diff.indentHeuristic=false diff-tree -p old new -- spaces.txt >out-diff-tree2 &&
+	compare_diff spaces-expect out-diff-tree2
 
-ok 1 - setup
+ok 19 - diff-tree: ugly spaces with diff.indentHeuristic=false
 
-expecting success of 4118.2 'apply --numstat': 
+expecting success of 4061.20 'diff-tree: --indent-heuristic overrides config': 
+	git -c diff.indentHeuristic=false diff-tree --indent-heuristic -p old new -- spaces.txt >out-diff-tree-compacted3 &&
+	compare_diff spaces-compacted-expect out-diff-tree-compacted3
 
-	git apply --numstat diff.output >actual &&
-	{
-		echo "0	1	file1" &&
-		echo "0	1	file2"
-	} >expect &&
-	test_cmp expect actual
+ok 20 - diff-tree: --indent-heuristic overrides config
 
+expecting success of 4061.21 'diff-tree: --no-indent-heuristic overrides config': 
+	git -c diff.indentHeuristic=true diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree3 &&
+	compare_diff spaces-expect out-diff-tree3
 
-ok 2 - apply --numstat
+ok 21 - diff-tree: --no-indent-heuristic overrides config
 
-expecting success of 4118.3 'apply --apply': 
+expecting success of 4061.22 'diff-index: nice spaces with --indent-heuristic': 
+	git checkout -B diff-index &&
+	git reset --soft HEAD~ &&
+	git diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted &&
+	compare_diff spaces-compacted-expect out-diff-index-compacted &&
+	git checkout -f main
 
-	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
+Switched to a new branch 'diff-index'
+Switched to branch 'main'
+ok 22 - diff-index: nice spaces with --indent-heuristic
 
-ok 3 - apply --apply
+expecting success of 4061.23 'diff-index: nice spaces with diff.indentHeuristic=true': 
+	git checkout -B diff-index &&
+	git reset --soft HEAD~ &&
+	git -c diff.indentHeuristic=true diff-index -p old -- spaces.txt >out-diff-index-compacted2 &&
+	compare_diff spaces-compacted-expect out-diff-index-compacted2 &&
+	git checkout -f main
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4117-apply-reject.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4117-apply-reject/.git/
-expecting success of 4117.1 'setup': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 >file1 &&
-	cat file1 >saved.file1 &&
-	git update-index --add file1 &&
-	git commit -m initial &&
+Switched to and reset branch 'diff-index'
+Switched to branch 'main'
+ok 23 - diff-index: nice spaces with diff.indentHeuristic=true
 
-	test_write_lines 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21 >file1 &&
-	git diff >patch.1 &&
-	cat file1 >clean &&
+expecting success of 4061.24 'diff-index: ugly spaces with --no-indent-heuristic': 
+	git checkout -B diff-index &&
+	git reset --soft HEAD~ &&
+	git diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&
+	compare_diff spaces-expect out-diff-index &&
+	git checkout -f main
 
-	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21 >expected &&
+Switched to and reset branch 'diff-index'
+Switched to branch 'main'
+ok 24 - diff-index: ugly spaces with --no-indent-heuristic
 
-	mv file1 file2 &&
-	git update-index --add --remove file1 file2 &&
-	git diff -M HEAD >patch.2 &&
+expecting success of 4061.25 'diff-index: ugly spaces with diff.indentHeuristic=false': 
+	git checkout -B diff-index &&
+	git reset --soft HEAD~ &&
+	git -c diff.indentHeuristic=false diff-index -p old -- spaces.txt >out-diff-index2 &&
+	compare_diff spaces-expect out-diff-index2 &&
+	git checkout -f main
 
-	rm -f file1 file2 &&
-	mv saved.file1 file1 &&
-	git update-index --add --remove file1 file2 &&
+Switched to and reset branch 'diff-index'
+Switched to branch 'main'
+ok 25 - diff-index: ugly spaces with diff.indentHeuristic=false
 
-	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21 >file1 &&
+expecting success of 4061.26 'diff-index: --indent-heuristic overrides config': 
+	git checkout -B diff-index &&
+	git reset --soft HEAD~ &&
+	git -c diff.indentHeuristic=false diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted3 &&
+	compare_diff spaces-compacted-expect out-diff-index-compacted3 &&
+	git checkout -f main
 
-	cat file1 >saved.file1
+Switched to and reset branch 'diff-index'
+Switched to branch 'main'
+ok 26 - diff-index: --indent-heuristic overrides config
 
-[master (root-commit) 11e450e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 21 insertions(+)
- create mode 100644 file1
-ok 1 - setup
+expecting success of 4061.27 'diff-index: --no-indent-heuristic overrides config': 
+	git checkout -B diff-index &&
+	git reset --soft HEAD~ &&
+	git -c diff.indentHeuristic=true diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index3 &&
+	compare_diff spaces-expect out-diff-index3 &&
+	git checkout -f main
 
-expecting success of 4117.2 'apply --reject is incompatible with --3way': 
-	test_when_finished "cat saved.file1 >file1" &&
-	git diff >patch.0 &&
-	git checkout file1 &&
-	test_must_fail git apply --reject --3way patch.0 &&
-	git diff --exit-code
+Switched to and reset branch 'diff-index'
+Switched to branch 'main'
+ok 27 - diff-index: --no-indent-heuristic overrides config
 
-Updated 1 path from the index
-error: options '--reject' and '--3way' cannot be used together
-ok 2 - apply --reject is incompatible with --3way
+expecting success of 4061.28 'diff-files: nice spaces with --indent-heuristic': 
+	git checkout -B diff-files &&
+	git reset HEAD~ &&
+	git diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw &&
+	grep -v index out-diff-files-raw >out-diff-files-compacted &&
+	compare_diff spaces-compacted-expect out-diff-files-compacted &&
+	git checkout -f main
 
-expecting success of 4117.3 'apply without --reject should fail': 
+Switched to a new branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'main'
+ok 28 - diff-files: nice spaces with --indent-heuristic
 
-	test_must_fail git apply patch.1 &&
-	test_cmp file1 saved.file1
+expecting success of 4061.29 'diff-files: nice spaces with diff.indentHeuristic=true': 
+	git checkout -B diff-files &&
+	git reset HEAD~ &&
+	git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw2 &&
+	grep -v index out-diff-files-raw2 >out-diff-files-compacted2 &&
+	compare_diff spaces-compacted-expect out-diff-files-compacted2 &&
+	git checkout -f main
 
-error: patch failed: file1:1
-error: file1: patch does not apply
-ok 3 - apply without --reject should fail
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'main'
+ok 29 - diff-files: nice spaces with diff.indentHeuristic=true
 
-expecting success of 4117.4 'apply without --reject should fail': 
+expecting success of 4061.30 'diff-files: ugly spaces with --no-indent-heuristic': 
+	git checkout -B diff-files &&
+	git reset HEAD~ &&
+	git diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw &&
+	grep -v index out-diff-files-raw >out-diff-files &&
+	compare_diff spaces-expect out-diff-files &&
+	git checkout -f main
 
-	test_must_fail git apply --verbose patch.1 &&
-	test_cmp file1 saved.file1
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'main'
+ok 30 - diff-files: ugly spaces with --no-indent-heuristic
 
-Checking patch file1...
-error: while searching for:
-1
-2
-3
-4
-5
-6
+expecting success of 4061.31 'diff-files: ugly spaces with diff.indentHeuristic=false': 
+	git checkout -B diff-files &&
+	git reset HEAD~ &&
+	git -c diff.indentHeuristic=false diff-files -p spaces.txt >out-diff-files-raw2 &&
+	grep -v index out-diff-files-raw2 >out-diff-files &&
+	compare_diff spaces-expect out-diff-files &&
+	git checkout -f main
 
-error: patch failed: file1:1
-error: file1: patch does not apply
-ok 4 - apply without --reject should fail
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'main'
+ok 31 - diff-files: ugly spaces with diff.indentHeuristic=false
 
-expecting success of 4117.5 'apply with --reject should fail but update the file': 
+expecting success of 4061.32 'diff-files: --indent-heuristic overrides config': 
+	git checkout -B diff-files &&
+	git reset HEAD~ &&
+	git -c diff.indentHeuristic=false diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw3 &&
+	grep -v index out-diff-files-raw3 >out-diff-files-compacted &&
+	compare_diff spaces-compacted-expect out-diff-files-compacted &&
+	git checkout -f main
 
-	cat saved.file1 >file1 &&
-	rm -f file1.rej file2.rej &&
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'main'
+ok 32 - diff-files: --indent-heuristic overrides config
 
-	test_must_fail git apply --reject patch.1 &&
-	test_cmp expected file1 &&
+expecting success of 4061.33 'diff-files: --no-indent-heuristic overrides config': 
+	git checkout -B diff-files &&
+	git reset HEAD~ &&
+	git -c diff.indentHeuristic=true diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw4 &&
+	grep -v index out-diff-files-raw4 >out-diff-files &&
+	compare_diff spaces-expect out-diff-files &&
+	git checkout -f main
 
-	test_path_is_file file1.rej &&
-	test_path_is_missing file2.rej
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'main'
+ok 33 - diff-files: --no-indent-heuristic overrides config
 
-Checking patch file1...
-error: while searching for:
-1
-2
-3
-4
-5
-6
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4106-apply-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-error: patch failed: file1:1
-error: while searching for:
-18
-19
-20
-21
+ok 1 - setup
 
-error: patch failed: file1:18
-Applying patch file1 with 2 rejects...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-Rejected hunk #3.
-ok 5 - apply with --reject should fail but update the file
+expecting success of 4106.2 'git apply --numstat - < patch': 
+	echo "1	1	text" >expect &&
+	git apply --numstat - <patch >actual &&
+	test_cmp expect actual
 
-expecting success of 4117.6 'apply with --reject should fail but update the file': 
+ok 2 - git apply --numstat - < patch
 
-	cat saved.file1 >file1 &&
-	rm -f file1.rej file2.rej file2 &&
+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
 
-	test_must_fail git apply --reject patch.2 >rejects &&
-	test_path_is_missing file1 &&
-	test_cmp expected file2 &&
+ok 3 - git apply --numstat - < patch patch
 
-	test_path_is_file file2.rej &&
-	test_path_is_missing file1.rej
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4018-diff-funcname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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\$" &&
 
-Checking patch file1 => file2...
-error: while searching for:
-1
-2
-3
-4
-5
-6
+	# alternation in pattern
+	git config diff.custom3.funcname "Beer$" &&
+	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
 
-error: patch failed: file1:1
-error: while searching for:
-18
-19
-20
-21
+	# for regexp compilation tests
+	echo A >A.java &&
+	echo B >B.java
 
-error: patch failed: file1:18
-Applying patch file1 => file2 with 2 rejects...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-Rejected hunk #3.
-ok 6 - apply with --reject should fail but update the file
+ok 1 - setup
 
-expecting success of 4117.7 'the same test with --verbose': 
+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 &&
 
-	cat saved.file1 >file1 &&
-	rm -f file1.rej file2.rej file2 &&
+	# 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
 
-	test_must_fail git apply --reject --verbose patch.2 >rejects &&
-	test_path_is_missing file1 &&
-	test_cmp expected file2 &&
+ok 2 - setup: test-tool userdiff
 
-	test_path_is_file file2.rej &&
-	test_path_is_missing file1.rej
+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
 
-Checking patch file1 => file2...
-error: while searching for:
-1
-2
-3
-4
-5
-6
+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
 
-error: patch failed: file1:1
-error: while searching for:
-18
-19
-20
-21
+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
 
-error: patch failed: file1:18
-Applying patch file1 => file2 with 2 rejects...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-Rejected hunk #3.
-ok 7 - the same test with --verbose
+expecting success of 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 4117.8 'apply cleanly with --verbose': 
+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
 
-	git cat-file -p HEAD:file1 >file1 &&
-	rm -f file?.rej file2 &&
+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
 
-	git apply --verbose patch.1 &&
+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
 
-	test_cmp file1 clean
+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
 
-Checking patch file1...
-Applied patch file1 cleanly.
-ok 8 - apply cleanly with --verbose
+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
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4116-apply-reverse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4116-apply-reverse/.git/
-expecting success of 4116.1 'setup': 
+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
 
-	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 &&
+expecting success of 4018.14 'builtin cpp pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 421387d] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 41525d0] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 14 - builtin cpp pattern compiles on bare repo with --attr-source
 
-	git add file1 file2 &&
-	git commit -m initial &&
-	git tag initial &&
+expecting success of 4018.15 'builtin csharp pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 15 - builtin csharp pattern compiles
 
-	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 &&
+expecting success of 4018.16 'builtin csharp wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 16 - builtin csharp wordRegex pattern compiles
 
-	git commit -a -m second &&
-	git tag second &&
+expecting success of 4018.17 'builtin csharp pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 1baa7f2] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA c0f2914] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 17 - builtin csharp pattern compiles on bare repo with --attr-source
 
-	git diff --binary initial second >patch
+expecting success of 4018.18 'builtin css pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 18 - builtin css pattern compiles
 
+expecting success of 4018.19 'builtin css wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 19 - builtin css wordRegex pattern compiles
 
-[master (root-commit) 40ea0d8] initial
+expecting success of 4018.20 'builtin css pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 5bdd255] changing gitattributes
  Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[master 09f0b7a] second
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 54fe80d] changing gitattributes
  Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+), 6 deletions(-)
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 20 - builtin css pattern compiles on bare repo with --attr-source
 
-expecting success of 4116.2 'apply in forward': 
+expecting success of 4018.21 'builtin dts pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 21 - builtin dts pattern compiles
 
-	T0=$(git rev-parse "second^{tree}") &&
-	git reset --hard initial &&
-	git apply --index --binary patch &&
-	T1=$(git write-tree) &&
-	test "$T0" = "$T1"
+expecting success of 4018.22 'builtin dts wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 22 - builtin dts wordRegex pattern compiles
 
-HEAD is now at 40ea0d8 initial
-ok 2 - apply in forward
+expecting success of 4018.23 'builtin dts pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master aa94590] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 0284640] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 23 - builtin dts pattern compiles on bare repo with --attr-source
 
-expecting success of 4116.3 'apply in reverse': 
+expecting success of 4018.24 'builtin elixir pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 24 - builtin elixir pattern compiles
 
-	git reset --hard second &&
-	git apply --reverse --binary --index patch &&
-	git diff >diff &&
-	test_must_be_empty diff
+expecting success of 4018.25 'builtin elixir wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 25 - builtin elixir wordRegex pattern compiles
 
+expecting success of 4018.26 'builtin elixir pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 91672cc] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA b439317] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 26 - builtin elixir pattern compiles on bare repo with --attr-source
 
-HEAD is now at 09f0b7a second
-ok 3 - apply in reverse
+expecting success of 4018.27 'builtin fortran pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 27 - builtin fortran pattern compiles
 
-expecting success of 4116.4 'setup separate repository lacking postimage': 
+expecting success of 4018.28 'builtin fortran wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 28 - builtin fortran wordRegex pattern compiles
 
-	git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
-	(
-		cd initial && git init && git add .
-	) &&
+expecting success of 4018.29 'builtin fortran pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 07df8aa] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA d0563d5] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 29 - builtin fortran pattern compiles on bare repo with --attr-source
 
-	git archive --format=tar --prefix=second/ second | $TAR xf - &&
-	(
-		cd second && git init && git add .
-	)
+expecting success of 4018.30 'builtin fountain pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 30 - builtin fountain pattern compiles
 
+expecting success of 4018.31 'builtin fountain wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 31 - builtin fountain wordRegex pattern compiles
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4116-apply-reverse/initial/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4116-apply-reverse/second/.git/
-ok 4 - setup separate repository lacking postimage
+expecting success of 4018.32 'builtin fountain pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master fe25a8f] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 9c43ead] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 32 - builtin fountain pattern compiles on bare repo with --attr-source
 
-expecting success of 4116.5 'apply in forward without postimage': 
+expecting success of 4018.33 'builtin golang pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 33 - builtin golang pattern compiles
 
-	T0=$(git rev-parse "second^{tree}") &&
-	(
-		cd initial &&
-		git apply --index --binary ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
+expecting success of 4018.34 'builtin golang wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 34 - builtin golang wordRegex pattern compiles
 
-ok 5 - apply in forward without postimage
+expecting success of 4018.35 'builtin golang pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 4856536] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA e93a5a9] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 35 - builtin golang pattern compiles on bare repo with --attr-source
 
-expecting success of 4116.6 'apply in reverse without postimage': 
+expecting success of 4018.36 'builtin html pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 36 - builtin html pattern compiles
 
-	T0=$(git rev-parse "initial^{tree}") &&
-	(
-		cd second &&
-		git apply --index --binary --reverse ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
+expecting success of 4018.37 'builtin html wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 37 - builtin html wordRegex pattern compiles
 
-ok 6 - apply in reverse without postimage
+expecting success of 4018.38 'builtin html pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master da316a7] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 0c6bd19] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 38 - builtin html pattern compiles on bare repo with --attr-source
 
-expecting success of 4116.7 'reversing a whitespace introduction': 
-	sed "s/a/a /" < file1 > file1.new &&
-	mv file1.new file1 &&
-	git diff | git apply --reverse --whitespace=error
+expecting success of 4018.39 'builtin java pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 39 - builtin java pattern compiles
 
-ok 7 - reversing a whitespace introduction
+expecting success of 4018.40 'builtin java wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 40 - builtin java wordRegex pattern compiles
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4013-diff-various.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4013-diff-various/.git/
-expecting success of 4013.1 'setup': 
+expecting success of 4018.41 'builtin java pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master c684627] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA dc9d6db] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 41 - builtin java pattern compiles on bare repo with --attr-source
 
-	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 &&
+expecting success of 4018.42 'builtin kotlin pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 42 - builtin kotlin pattern compiles
 
-	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 4018.43 'builtin kotlin wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 43 - builtin kotlin wordRegex pattern compiles
 
-	git branch initial &&
-	git branch side &&
+expecting success of 4018.44 'builtin kotlin pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master fba906f] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 411b675] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 44 - builtin kotlin pattern compiles on bare repo with --attr-source
 
-	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 4018.45 'builtin markdown pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 45 - builtin markdown pattern compiles
 
-	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." &&
+expecting success of 4018.46 'builtin markdown wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 46 - builtin markdown wordRegex pattern compiles
 
-	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 4018.47 'builtin markdown pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master a36ac80] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA b175325] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 47 - builtin markdown pattern compiles on bare repo with --attr-source
 
-	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 &&
+expecting success of 4018.48 'builtin matlab pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 48 - builtin matlab pattern compiles
 
-	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 &&
+expecting success of 4018.49 'builtin matlab wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 49 - builtin matlab wordRegex pattern compiles
 
-	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 4018.50 'builtin matlab pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 4125614] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 96677f0] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 50 - builtin matlab pattern compiles on bare repo with --attr-source
 
-	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 &&
+expecting success of 4018.51 'builtin objc pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 51 - builtin objc pattern compiles
 
-	git checkout master &&
-	git pull -s ours --no-rebase . side &&
+expecting success of 4018.52 'builtin objc wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 52 - builtin objc wordRegex pattern compiles
 
-	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 &&
+expecting success of 4018.53 'builtin objc pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 542b906] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 40e9567] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 53 - builtin objc pattern compiles on bare repo with --attr-source
 
-	test_write_lines A B C >>file0 &&
-	test_write_lines 1 2 >>dir/sub &&
-	git update-index file0 dir/sub &&
+expecting success of 4018.54 'builtin pascal pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 54 - builtin pascal pattern compiles
 
-	mkdir dir3 &&
-	cp dir/sub dir3/sub &&
-	test-tool chmtime +1 dir3/sub &&
+expecting success of 4018.55 'builtin pascal wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 55 - builtin pascal wordRegex pattern compiles
 
-	git config log.showroot false &&
-	git commit --amend &&
+expecting success of 4018.56 'builtin pascal pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 0e8818e] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 7f3b5d9] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 56 - builtin pascal pattern compiles on bare repo with --attr-source
 
-	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 &&
+expecting success of 4018.57 'builtin perl pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 57 - builtin perl pattern compiles
 
-	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 4018.58 'builtin perl wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 58 - builtin perl wordRegex pattern compiles
 
-	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 &&
+expecting success of 4018.59 'builtin perl pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master ada864b] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6fd3d2c] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 59 - builtin perl pattern compiles on bare repo with --attr-source
 
-	# 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 &&
+expecting success of 4018.60 'builtin php pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 60 - builtin php pattern compiles
 
-	git config diff.renames false &&
+expecting success of 4018.61 'builtin php wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 61 - builtin php wordRegex pattern compiles
 
-	git show-branch
+expecting success of 4018.62 'builtin php pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master a9c476a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 9141fd7] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 62 - builtin php pattern compiles on bare repo with --attr-source
 
-[master (root-commit) 444ac55] Initial
+expecting success of 4018.63 'builtin python pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 63 - builtin python pattern compiles
+
+expecting success of 4018.64 'builtin python wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 64 - builtin python wordRegex pattern compiles
+
+expecting success of 4018.65 'builtin python pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master ad7b0c8] changing gitattributes
  Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 dir/sub
- create mode 100644 file0
- create mode 100644 file2
-[master 1bde4ae] Second
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 9820662] changing gitattributes
  Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 3 deletions(-)
- delete mode 100644 file2
-[master 9a6d494] Third
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 65 - builtin python pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.66 'builtin ruby pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 66 - builtin ruby pattern compiles
+
+expecting success of 4018.67 'builtin ruby wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 67 - builtin ruby wordRegex pattern compiles
+
+expecting success of 4018.68 'builtin ruby pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 41412bb] changing gitattributes
  Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 file1
-Switched to branch 'side'
-[side c7a2ab9] Side
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6cd7147] changing gitattributes
  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'
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 68 - builtin ruby pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.69 'builtin rust pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 69 - builtin rust pattern compiles
+
+expecting success of 4018.70 'builtin rust wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 70 - builtin rust wordRegex pattern compiles
+
+expecting success of 4018.71 'builtin rust pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 26ff60e] changing gitattributes
  Author: A U Thor <author@example.com>
- 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(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA d9df4e2] changing gitattributes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-Switched to a new branch 'mode'
-[mode b7e0bc6] update mode
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 71 - builtin rust pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.72 'builtin scheme pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 72 - builtin scheme pattern compiles
+
+expecting success of 4018.73 'builtin scheme wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 73 - builtin scheme wordRegex pattern compiles
+
+expecting success of 4018.74 'builtin scheme pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 1b524cd] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file0
-Switched to branch 'master'
-Switched to a new branch 'note'
-[note a6f3643] update mode (file2)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA a0d1221] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 74 - builtin scheme pattern compiles on bare repo with --attr-source
 
-expecting success of 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
+expecting success of 4018.75 'builtin tex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 2 - git diff-tree initial # magic is (not used)
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 75 - builtin tex pattern compiles
 
-expecting success of 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)
-				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
+expecting success of 4018.76 'builtin tex wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 3 - git diff-tree -r initial # magic is (not used)
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 76 - builtin tex wordRegex pattern compiles
 
-expecting success of 4013.4 'git diff-tree -r --abbrev 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
+expecting success of 4018.77 'builtin tex pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 4 - git diff-tree -r --abbrev initial # magic is (not used)
+Switched to and reset branch 'master'
+M	.gitattributes
+[master de4ccc4] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6368b67] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 77 - builtin tex pattern compiles on bare repo with --attr-source
 
-expecting success of 4013.5 'git diff-tree -r --abbrev=4 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
+expecting success of 4018.78 'builtin custom1 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 5 - git diff-tree -r --abbrev=4 initial # magic is (not used)
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 78 - builtin custom1 pattern compiles
 
-expecting success of 4013.6 'git diff-tree --root 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
+expecting success of 4018.79 'builtin custom1 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 6 - git diff-tree --root initial # magic is (not used)
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 79 - builtin custom1 wordRegex pattern compiles
 
-expecting success of 4013.7 'git diff-tree --root --abbrev 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
+expecting success of 4018.80 'builtin custom1 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 7 - git diff-tree --root --abbrev initial # magic is (not used)
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 633ec55] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 5cb29de] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 80 - builtin custom1 pattern compiles on bare repo with --attr-source
 
-expecting success of 4013.8 'git diff-tree --root --abbrev initial # magic is noellipses': 
-		{
-			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
+expecting success of 4018.81 'builtin custom2 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 8 - git diff-tree --root --abbrev initial # magic is noellipses
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 81 - builtin custom2 pattern compiles
 
-expecting success of 4013.9 'git diff-tree --root -r 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
+expecting success of 4018.82 'builtin custom2 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 9 - git diff-tree --root -r initial # magic is (not used)
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 82 - builtin custom2 wordRegex pattern compiles
 
-expecting success of 4013.10 'git diff-tree --root -r --abbrev 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
+expecting success of 4018.83 'builtin custom2 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 10 - git diff-tree --root -r --abbrev initial # magic is (not used)
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 399f11a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 3432bdd] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 83 - builtin custom2 pattern compiles on bare repo with --attr-source
 
-expecting success of 4013.11 'git diff-tree --root -r --abbrev initial # magic is noellipses': 
-		{
-			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
+expecting success of 4018.84 'builtin custom3 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 11 - git diff-tree --root -r --abbrev initial # magic is noellipses
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 84 - builtin custom3 pattern compiles
 
-expecting success of 4013.12 'git diff-tree --root -r --abbrev=4 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
+expecting success of 4018.85 'builtin custom3 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 12 - git diff-tree --root -r --abbrev=4 initial # magic is (not used)
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 85 - builtin custom3 wordRegex pattern compiles
 
-expecting success of 4013.13 'git diff-tree --root -r --abbrev=4 initial # magic is noellipses': 
-		{
-			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
+expecting success of 4018.86 'builtin custom3 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-ok 13 - git diff-tree --root -r --abbrev=4 initial # magic is noellipses
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 2a95308] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 90fa73a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 86 - builtin custom3 pattern compiles on bare repo with --attr-source
 
-expecting success of 4013.14 'git diff-tree -p 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
+expecting success of 4018.87 'last regexp must not be negated': 
+	echo "*.java diff=java" >.gitattributes &&
+	test_config diff.java.funcname "!static" &&
+	test_expect_code 128 git diff --no-index A.java B.java 2>msg &&
+	test_grep ": Last expression must not be negated:" msg
+
+fatal: Last expression must not be negated: !static
+ok 87 - last regexp must not be negated
+
+expecting success of 4018.88 'setup hunk header tests': 
+	for i in $diffpatterns
+	do
+		echo "$i-* diff=$i" || return 1
+	done > .gitattributes &&
+
+	# add all test files to the index
+	(
+		cd "$TEST_DIRECTORY"/t4018 &&
+		git --git-dir="$TRASH_DIRECTORY/.git" add .
+	) &&
+
+	# place modified files in the worktree
+	for i in $(git ls-files)
+	do
+		sed -e "s/ChangeMe/IWasChanged/" <"$TEST_DIRECTORY/t4018/$i" >"$i" || return 1
+	done
+
+ok 88 - setup hunk header tests
+
+expecting success of 4018.89 'hunk header: README': 
+		git diff -U1 README >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 14 - git diff-tree -p initial # magic is (not used)
+@@ -3,3 +3,3 @@ How to write RIGHT test cases
+ok 89 - hunk header: README
 
-expecting success of 4013.15 'git diff-tree --root -p 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
+expecting success of 4018.90 'hunk header: bash-arithmetic-function': 
+		git diff -U1 bash-arithmetic-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 15 - git diff-tree --root -p initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT()
+ok 90 - hunk header: bash-arithmetic-function
 
-expecting success of 4013.16 'git diff-tree --root -p --abbrev=10 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
+expecting success of 4018.91 'hunk header: bash-bashism-style-compact': 
+		git diff -U1 bash-bashism-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 16 - git diff-tree --root -p --abbrev=10 initial # magic is (not used)
+@@ -3,3 +3,3 @@ function RIGHT {
+ok 91 - hunk header: bash-bashism-style-compact
 
-expecting success of 4013.17 'git diff-tree --root -p --full-index 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
+expecting success of 4018.92 'hunk header: bash-bashism-style-function': 
+		git diff -U1 bash-bashism-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 17 - git diff-tree --root -p --full-index initial # magic is (not used)
+@@ -2,3 +2,3 @@ function RIGHT {
+ok 92 - hunk header: bash-bashism-style-function
 
-expecting success of 4013.18 'git diff-tree --root -p --full-index --abbrev=10 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
+expecting success of 4018.93 'hunk header: bash-bashism-style-whitespace': 
+		git diff -U1 bash-bashism-style-whitespace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 18 - git diff-tree --root -p --full-index --abbrev=10 initial # magic is (not used)
+@@ -2,3 +2,3 @@ function 	RIGHT 	( 	) 	{
+ok 93 - hunk header: bash-bashism-style-whitespace
 
-expecting success of 4013.19 'git diff-tree --patch-with-stat 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
+expecting success of 4018.94 'hunk header: bash-conditional-function': 
+		git diff -U1 bash-conditional-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 19 - git diff-tree --patch-with-stat initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT()
+ok 94 - hunk header: bash-conditional-function
 
-expecting success of 4013.20 'git diff-tree --root --patch-with-stat 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
+expecting success of 4018.95 'hunk header: bash-missing-parentheses': 
+		git diff -U1 bash-missing-parentheses >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 20 - git diff-tree --root --patch-with-stat initial # magic is (not used)
+@@ -3,3 +3,3 @@ function RIGHT {
+ok 95 - hunk header: bash-missing-parentheses
 
-expecting success of 4013.21 'git diff-tree --patch-with-raw 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
+expecting success of 4018.96 'hunk header: bash-mixed-style-compact': 
+		git diff -U1 bash-mixed-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 21 - git diff-tree --patch-with-raw initial # magic is (not used)
+@@ -2,3 +2,3 @@ function RIGHT(){
+ok 96 - hunk header: bash-mixed-style-compact
 
-expecting success of 4013.22 'git diff-tree --root --patch-with-raw 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
+expecting success of 4018.97 'hunk header: bash-mixed-style-function': 
+		git diff -U1 bash-mixed-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT() {
+ok 97 - hunk header: bash-mixed-style-function
+
+expecting success of 4018.98 'hunk header: bash-nested-functions': 
+		git diff -U1 bash-nested-functions >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 22 - git diff-tree --root --patch-with-raw initial # magic is (not used)
+@@ -3,3 +3,3 @@ RIGHT()
+ok 98 - hunk header: bash-nested-functions
 
-expecting success of 4013.23 'git diff-tree --pretty 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
+expecting success of 4018.99 'hunk header: bash-other-characters': 
+		git diff -U1 bash-other-characters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 23 - git diff-tree --pretty initial # magic is (not used)
+@@ -2,3 +2,3 @@ _RIGHT_0n()
+ok 99 - hunk header: bash-other-characters
 
-expecting success of 4013.24 'git diff-tree --pretty --root 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
+expecting success of 4018.100 'hunk header: bash-posix-style-compact': 
+		git diff -U1 bash-posix-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 24 - git diff-tree --pretty --root initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT()
+ok 100 - hunk header: bash-posix-style-compact
 
-expecting success of 4013.25 'git diff-tree --pretty -p 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
+expecting success of 4018.101 'hunk header: bash-posix-style-function': 
+		git diff -U1 bash-posix-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 25 - git diff-tree --pretty -p initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT()
+ok 101 - hunk header: bash-posix-style-function
 
-expecting success of 4013.26 'git diff-tree --pretty --stat 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
+expecting success of 4018.102 'hunk header: bash-posix-style-whitespace': 
+		git diff -U1 bash-posix-style-whitespace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 26 - git diff-tree --pretty --stat initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT 	( 	)
+ok 102 - hunk header: bash-posix-style-whitespace
 
-expecting success of 4013.27 'git diff-tree --pretty --summary 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
+expecting success of 4018.103 'hunk header: bash-subshell-function': 
+		git diff -U1 bash-subshell-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 27 - git diff-tree --pretty --summary initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT()
+ok 103 - hunk header: bash-subshell-function
 
-expecting success of 4013.28 'git diff-tree --pretty --stat --summary 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
+expecting success of 4018.104 'hunk header: bash-trailing-comment': 
+		git diff -U1 bash-trailing-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 28 - git diff-tree --pretty --stat --summary initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT()
+ok 104 - hunk header: bash-trailing-comment
 
-expecting success of 4013.29 'git diff-tree --pretty --root -p 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
+expecting success of 4018.105 'hunk header: cpp-c++-function': 
+		git diff -U1 cpp-c++-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 29 - git diff-tree --pretty --root -p initial # magic is (not used)
+@@ -2,3 +2,3 @@ Item RIGHT::DoSomething( Args with_spaces )
+ok 105 - hunk header: cpp-c++-function
 
-expecting success of 4013.30 'git diff-tree --pretty --root --stat 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
+expecting success of 4018.106 'hunk header: cpp-class-constructor': 
+		git diff -U1 cpp-class-constructor >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 30 - git diff-tree --pretty --root --stat initial # magic is (not used)
+@@ -2,3 +2,3 @@ Item::Item(int RIGHT)
+ok 106 - hunk header: cpp-class-constructor
 
-expecting success of 4013.31 'git diff-tree --pretty --root --summary 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
+expecting success of 4018.107 'hunk header: cpp-class-constructor-mem-init': 
+		git diff -U1 cpp-class-constructor-mem-init >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 31 - git diff-tree --pretty --root --summary initial # magic is (not used)
+@@ -3,3 +3,3 @@ Item::Item(int RIGHT) :
+ok 107 - hunk header: cpp-class-constructor-mem-init
 
-expecting success of 4013.32 'git diff-tree --pretty --root --summary -r 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
+expecting success of 4018.108 'hunk header: cpp-class-definition': 
+		git diff -U1 cpp-class-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 32 - git diff-tree --pretty --root --summary -r initial # magic is (not used)
+@@ -2,3 +2,3 @@ class RIGHT
+ok 108 - hunk header: cpp-class-definition
 
-expecting success of 4013.33 'git diff-tree --pretty --root --stat --summary 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
+expecting success of 4018.109 'hunk header: cpp-class-definition-derived': 
+		git diff -U1 cpp-class-definition-derived >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 33 - git diff-tree --pretty --root --stat --summary initial # magic is (not used)
+@@ -3,3 +3,3 @@ class RIGHT :
+ok 109 - hunk header: cpp-class-definition-derived
 
-expecting success of 4013.34 'git diff-tree --pretty --patch-with-stat 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
+expecting success of 4018.110 'hunk header: cpp-class-destructor': 
+		git diff -U1 cpp-class-destructor >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 34 - git diff-tree --pretty --patch-with-stat initial # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT::~RIGHT()
+ok 110 - hunk header: cpp-class-destructor
 
-expecting success of 4013.35 'git diff-tree --pretty --root --patch-with-stat 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
+expecting success of 4018.111 'hunk header: cpp-function-returning-global-type': 
+		git diff -U1 cpp-function-returning-global-type >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 35 - git diff-tree --pretty --root --patch-with-stat initial # magic is (not used)
+@@ -2,3 +2,3 @@ ::Item get::it::RIGHT()
+ok 111 - hunk header: cpp-function-returning-global-type
 
-expecting success of 4013.36 'git diff-tree --pretty --patch-with-raw 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
+expecting success of 4018.112 'hunk header: cpp-function-returning-nested': 
+		git diff -U1 cpp-function-returning-nested >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 36 - git diff-tree --pretty --patch-with-raw initial # magic is (not used)
+@@ -2,3 +2,3 @@ get::Item get::it::RIGHT()
+ok 112 - hunk header: cpp-function-returning-nested
 
-expecting success of 4013.37 'git diff-tree --pretty --root --patch-with-raw 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
+expecting success of 4018.113 'hunk header: cpp-function-returning-pointer': 
+		git diff -U1 cpp-function-returning-pointer >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 37 - git diff-tree --pretty --root --patch-with-raw initial # magic is (not used)
+@@ -2,3 +2,3 @@ const char *get_it_RIGHT(char *ptr)
+ok 113 - hunk header: cpp-function-returning-pointer
 
-expecting success of 4013.38 'git diff-tree --pretty=oneline 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
+expecting success of 4018.114 'hunk header: cpp-function-returning-reference': 
+		git diff -U1 cpp-function-returning-reference >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 38 - git diff-tree --pretty=oneline initial # magic is (not used)
+@@ -2,3 +2,3 @@ string& get::it::RIGHT(char *ptr)
+ok 114 - hunk header: cpp-function-returning-reference
 
-expecting success of 4013.39 'git diff-tree --pretty=oneline --root 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
+expecting success of 4018.115 'hunk header: cpp-gnu-style-function': 
+		git diff -U1 cpp-gnu-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 39 - git diff-tree --pretty=oneline --root initial # magic is (not used)
+@@ -3,3 +3,3 @@ RIGHT(int arg)
+ok 115 - hunk header: cpp-gnu-style-function
 
-expecting success of 4013.40 'git diff-tree --pretty=oneline -p 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
+expecting success of 4018.116 'hunk header: cpp-namespace-definition': 
+		git diff -U1 cpp-namespace-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 40 - git diff-tree --pretty=oneline -p initial # magic is (not used)
+@@ -2,3 +2,3 @@ namespace RIGHT
+ok 116 - hunk header: cpp-namespace-definition
 
-expecting success of 4013.41 'git diff-tree --pretty=oneline --root -p 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
+expecting success of 4018.117 'hunk header: cpp-operator-definition': 
+		git diff -U1 cpp-operator-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 41 - git diff-tree --pretty=oneline --root -p initial # magic is (not used)
+@@ -2,3 +2,3 @@ Value operator+(Value LEFT, Value RIGHT)
+ok 117 - hunk header: cpp-operator-definition
 
-expecting success of 4013.42 'git diff-tree --pretty=oneline --patch-with-stat 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
+expecting success of 4018.118 'hunk header: cpp-skip-access-specifiers': 
+		git diff -U1 cpp-skip-access-specifiers >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 42 - git diff-tree --pretty=oneline --patch-with-stat initial # magic is (not used)
+@@ -6,3 +6,3 @@ class RIGHT : public Baseclass
+ok 118 - hunk header: cpp-skip-access-specifiers
 
-expecting success of 4013.43 'git diff-tree --pretty=oneline --root --patch-with-stat 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
+expecting success of 4018.119 'hunk header: cpp-skip-comment-block': 
+		git diff -U1 cpp-skip-comment-block >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 43 - git diff-tree --pretty=oneline --root --patch-with-stat initial # magic is (not used)
+@@ -7,3 +7,3 @@ struct item RIGHT(int i)
+ok 119 - hunk header: cpp-skip-comment-block
 
-expecting success of 4013.44 'git diff-tree --pretty=oneline --patch-with-raw 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
+expecting success of 4018.120 'hunk header: cpp-skip-labels': 
+		git diff -U1 cpp-skip-labels >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 44 - git diff-tree --pretty=oneline --patch-with-raw initial # magic is (not used)
+@@ -6,3 +6,3 @@ void RIGHT (void)
+ok 120 - hunk header: cpp-skip-labels
 
-expecting success of 4013.45 'git diff-tree --pretty=oneline --root --patch-with-raw 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
+expecting success of 4018.121 'hunk header: cpp-struct-definition': 
+		git diff -U1 cpp-struct-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 45 - git diff-tree --pretty=oneline --root --patch-with-raw initial # magic is (not used)
+@@ -7,3 +7,3 @@ struct RIGHT {
+ok 121 - hunk header: cpp-struct-definition
 
-expecting success of 4013.46 'git diff-tree --pretty side # 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
+expecting success of 4018.122 'hunk header: cpp-struct-single-line': 
+		git diff -U1 cpp-struct-single-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 46 - git diff-tree --pretty side # magic is (not used)
+@@ -6,2 +6,2 @@ struct RIGHT_iterator_tag {};
+ok 122 - hunk header: cpp-struct-single-line
 
-expecting success of 4013.47 'git diff-tree --pretty -p side # 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
+expecting success of 4018.123 'hunk header: cpp-template-function-definition': 
+		git diff -U1 cpp-template-function-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 47 - git diff-tree --pretty -p side # magic is (not used)
+@@ -2,3 +2,3 @@ template<class T> int RIGHT(T arg)
+ok 123 - hunk header: cpp-template-function-definition
 
-expecting success of 4013.48 'git diff-tree --pretty --patch-with-stat side # 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
+expecting success of 4018.124 'hunk header: cpp-union-definition': 
+		git diff -U1 cpp-union-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 48 - git diff-tree --pretty --patch-with-stat side # magic is (not used)
+@@ -2,3 +2,3 @@ union RIGHT {
+ok 124 - hunk header: cpp-union-definition
 
-expecting success of 4013.49 'git diff-tree initial mode # 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
+expecting success of 4018.125 'hunk header: cpp-void-c-function': 
+		git diff -U1 cpp-void-c-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 49 - git diff-tree initial mode # magic is (not used)
+@@ -2,3 +2,3 @@ void RIGHT (void)
+ok 125 - hunk header: cpp-void-c-function
 
-expecting success of 4013.50 'git diff-tree --stat initial mode # 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
+expecting success of 4018.126 'hunk header: csharp-exclude-assignments': 
+		git diff -U1 csharp-exclude-assignments >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 50 - git diff-tree --stat initial mode # magic is (not used)
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 126 - hunk header: csharp-exclude-assignments
 
-expecting success of 4013.51 'git diff-tree --summary initial mode # 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
+expecting success of 4018.127 'hunk header: csharp-exclude-control-statements': 
+		git diff -U1 csharp-exclude-control-statements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 51 - git diff-tree --summary initial mode # magic is (not used)
+@@ -29,3 +29,3 @@ string Method(int RIGHT)
+ok 127 - hunk header: csharp-exclude-control-statements
 
-expecting success of 4013.52 'git diff-tree master # 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
+expecting success of 4018.128 'hunk header: csharp-exclude-exceptions': 
+		git diff -U1 csharp-exclude-exceptions >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 52 - git diff-tree master # magic is (not used)
+@@ -24,3 +24,3 @@ string Method(int RIGHT)
+ok 128 - hunk header: csharp-exclude-exceptions
 
-expecting success of 4013.53 'git diff-tree -m master # 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
+expecting success of 4018.129 'hunk header: csharp-exclude-generic-method-calls': 
+		git diff -U1 csharp-exclude-generic-method-calls >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 53 - git diff-tree -m master # magic is (not used)
+@@ -7,3 +7,3 @@ string Method(int RIGHT)
+ok 129 - hunk header: csharp-exclude-generic-method-calls
 
-expecting success of 4013.54 'git diff-tree -p master # 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
+expecting success of 4018.130 'hunk header: csharp-exclude-init-dispose': 
+		git diff -U1 csharp-exclude-init-dispose >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 54 - git diff-tree -p master # magic is (not used)
+@@ -17,3 +17,3 @@ string Method(int RIGHT)
+ok 130 - hunk header: csharp-exclude-init-dispose
 
-expecting success of 4013.55 'git diff-tree -p -m master # 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
+expecting success of 4018.131 'hunk header: csharp-exclude-iterations': 
+		git diff -U1 csharp-exclude-iterations >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 55 - git diff-tree -p -m master # magic is (not used)
+@@ -21,3 +21,3 @@ string Method(int RIGHT)
+ok 131 - hunk header: csharp-exclude-iterations
 
-expecting success of 4013.56 'git diff-tree -c master # 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
+expecting success of 4018.132 'hunk header: csharp-exclude-method-calls': 
+		git diff -U1 csharp-exclude-method-calls >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 56 - git diff-tree -c master # magic is (not used)
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 132 - hunk header: csharp-exclude-method-calls
 
-expecting success of 4013.57 'git diff-tree -c --abbrev master # 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
+expecting success of 4018.133 'hunk header: csharp-exclude-other': 
+		git diff -U1 csharp-exclude-other >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 57 - git diff-tree -c --abbrev master # magic is (not used)
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 133 - hunk header: csharp-exclude-other
 
-expecting success of 4013.58 'git diff-tree -c --abbrev master # magic is noellipses': 
-		{
-			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
+expecting success of 4018.134 'hunk header: csharp-method': 
+		git diff -U1 csharp-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 58 - git diff-tree -c --abbrev master # magic is noellipses
+@@ -7,3 +7,3 @@ string Method(int RIGHT)
+ok 134 - hunk header: csharp-method
 
-expecting success of 4013.59 'git diff-tree --cc master # 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
+expecting success of 4018.135 'hunk header: csharp-method-array': 
+		git diff -U1 csharp-method-array >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 59 - git diff-tree --cc master # magic is (not used)
+@@ -7,3 +7,3 @@ string[] Method(int RIGHT)
+ok 135 - hunk header: csharp-method-array
 
-expecting success of 4013.60 'git diff-tree -c --stat master # 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
+expecting success of 4018.136 'hunk header: csharp-method-explicit': 
+		git diff -U1 csharp-method-explicit >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 60 - git diff-tree -c --stat master # magic is (not used)
+@@ -9,3 +9,3 @@ void IDisposable.Dispose() // RIGHT
+ok 136 - hunk header: csharp-method-explicit
 
-expecting success of 4013.61 'git diff-tree --cc --stat master # 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
+expecting success of 4018.137 'hunk header: csharp-method-generics': 
+		git diff -U1 csharp-method-generics >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 61 - git diff-tree --cc --stat master # magic is (not used)
+@@ -7,3 +7,3 @@ Example<int, string> Method<TA, TB>(TA RIGHT, TB b)
+ok 137 - hunk header: csharp-method-generics
 
-expecting success of 4013.62 'git diff-tree -c --stat --summary master # 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
+expecting success of 4018.138 'hunk header: csharp-method-generics-alternate-spaces': 
+		git diff -U1 csharp-method-generics-alternate-spaces >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 62 - git diff-tree -c --stat --summary master # magic is (not used)
+@@ -7,3 +7,3 @@ Example<int,string> Method<TA ,TB>(TA RIGHT, TB b)
+ok 138 - hunk header: csharp-method-generics-alternate-spaces
 
-expecting success of 4013.63 'git diff-tree --cc --stat --summary master # 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
+expecting success of 4018.139 'hunk header: csharp-method-modifiers': 
+		git diff -U1 csharp-method-modifiers >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 63 - git diff-tree --cc --stat --summary master # magic is (not used)
+@@ -9,3 +9,3 @@ static internal async Task Method(int RIGHT)
+ok 139 - hunk header: csharp-method-modifiers
 
-expecting success of 4013.64 'git diff-tree -c --stat --summary side # 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
+expecting success of 4018.140 'hunk header: csharp-method-multiline': 
+		git diff -U1 csharp-method-multiline >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 64 - git diff-tree -c --stat --summary side # magic is (not used)
+@@ -7,3 +7,3 @@ string Method_RIGHT(
+ok 140 - hunk header: csharp-method-multiline
 
-expecting success of 4013.65 'git diff-tree --cc --stat --summary side # 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
+expecting success of 4018.141 'hunk header: csharp-method-params': 
+		git diff -U1 csharp-method-params >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 65 - git diff-tree --cc --stat --summary side # magic is (not used)
+@@ -7,3 +7,3 @@ string Method(int RIGHT, int b, int c = 42)
+ok 141 - hunk header: csharp-method-params
 
-expecting success of 4013.66 'git diff-tree --cc --shortstat master # 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
+expecting success of 4018.142 'hunk header: csharp-method-special-chars': 
+		git diff -U1 csharp-method-special-chars >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 66 - git diff-tree --cc --shortstat master # magic is (not used)
+@@ -7,3 +7,3 @@ @Some_Type @Method_With_Underscore(int RIGHT)
+ok 142 - hunk header: csharp-method-special-chars
 
-expecting success of 4013.67 'git diff-tree --cc --summary REVERSE # 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
+expecting success of 4018.143 'hunk header: csharp-method-with-spacing': 
+		git diff -U1 csharp-method-with-spacing >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 67 - git diff-tree --cc --summary REVERSE # magic is (not used)
+@@ -7,3 +7,3 @@ string   Method 	( int 	RIGHT )
+ok 143 - hunk header: csharp-method-with-spacing
 
-expecting success of 4013.68 'git diff-tree --cc --patch-with-stat master # 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
+expecting success of 4018.144 'hunk header: csharp-property': 
+		git diff -U1 csharp-property >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 68 - git diff-tree --cc --patch-with-stat master # magic is (not used)
+@@ -7,3 +7,3 @@ public bool RIGHT
+ok 144 - hunk header: csharp-property
 
-expecting success of 4013.69 'git diff-tree --cc --patch-with-stat --summary master # 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
+expecting success of 4018.145 'hunk header: csharp-property-braces-same-line': 
+		git diff -U1 csharp-property-braces-same-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 69 - git diff-tree --cc --patch-with-stat --summary master # magic is (not used)
+@@ -6,3 +6,3 @@ public bool RIGHT {
+ok 145 - hunk header: csharp-property-braces-same-line
 
-expecting success of 4013.70 'git diff-tree --cc --patch-with-stat --summary side # 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
+expecting success of 4018.146 'hunk header: css-attribute-value-selector': 
+		git diff -U1 css-attribute-value-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 70 - git diff-tree --cc --patch-with-stat --summary side # magic is (not used)
+@@ -2,3 +2,3 @@ [class*="RIGHT"] {
+ok 146 - hunk header: css-attribute-value-selector
 
-expecting success of 4013.71 'git log master # 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
+expecting success of 4018.147 'hunk header: css-block-level-@-statements': 
+		git diff -U1 css-block-level-@-statements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 71 - git log master # magic is (not used)
+@@ -3,3 +3,3 @@ @keyframes RIGHT {
+ok 147 - hunk header: css-block-level-@-statements
 
-expecting success of 4013.72 'git log -p master # 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
+expecting success of 4018.148 'hunk header: css-brace-in-col-1': 
+		git diff -U1 css-brace-in-col-1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 72 - git log -p master # magic is (not used)
+@@ -3,3 +3,3 @@ RIGHT label.control-label
+ok 148 - hunk header: css-brace-in-col-1
 
-expecting success of 4013.73 'git log --root master # 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
+expecting success of 4018.149 'hunk header: css-class-selector': 
+		git diff -U1 css-class-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 73 - git log --root master # magic is (not used)
+@@ -2,3 +2,3 @@ .RIGHT {
+ok 149 - hunk header: css-class-selector
 
-expecting success of 4013.74 'git log --root -p master # 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
+expecting success of 4018.150 'hunk header: css-colon-eol': 
+		git diff -U1 css-colon-eol >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 74 - git log --root -p master # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT h1 {
+ok 150 - hunk header: css-colon-eol
 
-expecting success of 4013.75 'git log --patch-with-stat master # 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
+expecting success of 4018.151 'hunk header: css-colon-selector': 
+		git diff -U1 css-colon-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 75 - git log --patch-with-stat master # magic is (not used)
+@@ -3,3 +3,3 @@ RIGHT a:hover {
+ok 151 - hunk header: css-colon-selector
 
-expecting success of 4013.76 'git log --root --patch-with-stat master # 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
+expecting success of 4018.152 'hunk header: css-common': 
+		git diff -U1 css-common >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 76 - git log --root --patch-with-stat master # magic is (not used)
+@@ -2,3 +2,3 @@ RIGHT label.control-label {
+ok 152 - hunk header: css-common
 
-expecting success of 4013.77 'git log --root --patch-with-stat --summary master # 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
+expecting success of 4018.153 'hunk header: css-id-selector': 
+		git diff -U1 css-id-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 77 - git log --root --patch-with-stat --summary master # magic is (not used)
+@@ -2,3 +2,3 @@ #RIGHT {
+ok 153 - hunk header: css-id-selector
 
-expecting success of 4013.78 'git log --root -c --patch-with-stat --summary master # 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
+expecting success of 4018.154 'hunk header: css-long-selector-list': 
+		git diff -U1 css-long-selector-list >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 78 - git log --root -c --patch-with-stat --summary master # magic is (not used)
+@@ -4,3 +4,3 @@ div ul#RIGHT {
+ok 154 - hunk header: css-long-selector-list
 
-expecting success of 4013.79 'git log --root --cc --patch-with-stat --summary master # 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
+expecting success of 4018.155 'hunk header: css-prop-sans-indent': 
+		git diff -U1 css-prop-sans-indent >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 79 - git log --root --cc --patch-with-stat --summary master # magic is (not used)
+@@ -3,3 +3,3 @@ RIGHT, label.control-label {
+ok 155 - hunk header: css-prop-sans-indent
 
-expecting success of 4013.80 'git log --no-diff-merges -p --first-parent master # 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
+expecting success of 4018.156 'hunk header: css-root-selector': 
+		git diff -U1 css-root-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 80 - git log --no-diff-merges -p --first-parent master # magic is (not used)
+@@ -2,3 +2,3 @@ :RIGHT {
+ok 156 - hunk header: css-root-selector
 
-expecting success of 4013.81 'git log --diff-merges=off -p --first-parent master # 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
+expecting success of 4018.157 'hunk header: css-short-selector-list': 
+		git diff -U1 css-short-selector-list >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 81 - git log --diff-merges=off -p --first-parent master # magic is (not used)
+@@ -2,3 +2,3 @@ label.control, div ul#RIGHT {
+ok 157 - hunk header: css-short-selector-list
 
-expecting success of 4013.82 'git log --first-parent --diff-merges=off -p master # 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
+expecting success of 4018.158 'hunk header: css-trailing-space': 
+		git diff -U1 css-trailing-space >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 82 - git log --first-parent --diff-merges=off -p master # magic is (not used)
+@@ -3,3 +3,3 @@ RIGHT label.control-label {
+ok 158 - hunk header: css-trailing-space
 
-expecting success of 4013.83 'git log -p --first-parent master # 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
+expecting success of 4018.159 'hunk header: custom1-pattern': 
+		git diff -U1 custom1-pattern >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 83 - git log -p --first-parent master # magic is (not used)
+@@ -9,3 +9,3 @@ int special, RIGHT;
+ok 159 - hunk header: custom1-pattern
 
-expecting success of 4013.84 'git log -p --diff-merges=first-parent master # 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
+expecting success of 4018.160 'hunk header: custom2-match-to-end-of-line': 
+		git diff -U1 custom2-match-to-end-of-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 84 - git log -p --diff-merges=first-parent master # magic is (not used)
+@@ -5,3 +5,3 @@ RIGHT_Beer
+ok 160 - hunk header: custom2-match-to-end-of-line
 
-expecting success of 4013.85 'git log --diff-merges=first-parent master # 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
+expecting success of 4018.161 'hunk header: custom3-alternation-in-pattern': 
+		git diff -U1 custom3-alternation-in-pattern >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 85 - git log --diff-merges=first-parent master # magic is (not used)
+@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
+ok 161 - hunk header: custom3-alternation-in-pattern
 
-expecting success of 4013.86 'git log -m -p --first-parent master # 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
+expecting success of 4018.162 'hunk header: dts-labels': 
+		git diff -U1 dts-labels >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 86 - git log -m -p --first-parent master # magic is (not used)
+@@ -5,3 +5,3 @@ label2: RIGHT {
+ok 162 - hunk header: dts-labels
 
-expecting success of 4013.87 'git log -m -p master # 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
+expecting success of 4018.163 'hunk header: dts-node-unitless': 
+		git diff -U1 dts-node-unitless >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 87 - git log -m -p master # magic is (not used)
+@@ -4,3 +4,3 @@ RIGHT {
+ok 163 - hunk header: dts-node-unitless
 
-expecting success of 4013.88 'git log --cc -m -p master # 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
+expecting success of 4018.164 'hunk header: dts-nodes': 
+		git diff -U1 dts-nodes >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 88 - git log --cc -m -p master # magic is (not used)
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 {
+ok 164 - hunk header: dts-nodes
 
-expecting success of 4013.89 'git log -c -m -p master # 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
+expecting success of 4018.165 'hunk header: dts-nodes-boolean-prop': 
+		git diff -U1 dts-nodes-boolean-prop >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 89 - git log -c -m -p master # magic is (not used)
+@@ -5,3 +5,3 @@ RIGHT@deadf00,4000 {
+ok 165 - hunk header: dts-nodes-boolean-prop
 
-expecting success of 4013.90 'git log -m --raw master # 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
+expecting success of 4018.166 'hunk header: dts-nodes-comment1': 
+		git diff -U1 dts-nodes-comment1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 90 - git log -m --raw master # magic is (not used)
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 /* &a comment */ {
+ok 166 - hunk header: dts-nodes-comment1
 
-expecting success of 4013.91 'git log -m --stat master # 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
+expecting success of 4018.167 'hunk header: dts-nodes-comment2': 
+		git diff -U1 dts-nodes-comment2 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 91 - git log -m --stat master # magic is (not used)
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 { /* a trailing comment */
+ok 167 - hunk header: dts-nodes-comment2
 
-expecting success of 4013.92 'git log -SF master # 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
+expecting success of 4018.168 'hunk header: dts-nodes-multiline-prop': 
+		git diff -U1 dts-nodes-multiline-prop >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 92 - git log -SF master # magic is (not used)
+@@ -9,3 +9,3 @@ RIGHT@deadf00,4000 {
+ok 168 - hunk header: dts-nodes-multiline-prop
 
-expecting success of 4013.93 'git log -S F master # 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
+expecting success of 4018.169 'hunk header: dts-reference': 
+		git diff -U1 dts-reference >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 93 - git log -S F master # magic is (not used)
+@@ -7,3 +7,3 @@ &RIGHT {
+ok 169 - hunk header: dts-reference
 
-expecting success of 4013.94 'git log -SF -p master # 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
+expecting success of 4018.170 'hunk header: dts-root': 
+		git diff -U1 dts-root >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 94 - git log -SF -p master # magic is (not used)
+@@ -3,3 +3,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
+ok 170 - hunk header: dts-root
 
-expecting success of 4013.95 'git log -SF master --max-count=0 # 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
+expecting success of 4018.171 'hunk header: dts-root-comment': 
+		git diff -U1 dts-root-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 95 - git log -SF master --max-count=0 # magic is (not used)
+@@ -6,3 +6,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
+ok 171 - hunk header: dts-root-comment
 
-expecting success of 4013.96 'git log -SF master --max-count=1 # 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
+expecting success of 4018.172 'hunk header: elixir-do-not-pick-end': 
+		git diff -U1 elixir-do-not-pick-end >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 96 - git log -SF master --max-count=1 # magic is (not used)
+@@ -4,2 +4,2 @@ defmodule RIGHT do
+ok 172 - hunk header: elixir-do-not-pick-end
 
-expecting success of 4013.97 'git log -SF master --max-count=2 # 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
+expecting success of 4018.173 'hunk header: elixir-ex-unit-test': 
+		git diff -U1 elixir-ex-unit-test >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 97 - git log -SF master --max-count=2 # magic is (not used)
+@@ -3,3 +3,3 @@ test "RIGHT" do
+ok 173 - hunk header: elixir-ex-unit-test
 
-expecting success of 4013.98 'git log -GF master # 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
+expecting success of 4018.174 'hunk header: elixir-function': 
+		git diff -U1 elixir-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 98 - git log -GF master # magic is (not used)
+@@ -3,3 +3,3 @@ def function(RIGHT, arg) do
+ok 174 - hunk header: elixir-function
 
-expecting success of 4013.99 'git log -GF -p master # 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
+expecting success of 4018.175 'hunk header: elixir-macro': 
+		git diff -U1 elixir-macro >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 99 - git log -GF -p master # magic is (not used)
+@@ -3,3 +3,3 @@ defmacro foo(RIGHT) do
+ok 175 - hunk header: elixir-macro
 
-expecting success of 4013.100 'git log -GF -p --pickaxe-all master # 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
+expecting success of 4018.176 'hunk header: elixir-module': 
+		git diff -U1 elixir-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 100 - git log -GF -p --pickaxe-all master # magic is (not used)
+@@ -5,3 +5,3 @@ defmodule RIGHT do
+ok 176 - hunk header: elixir-module
 
-expecting success of 4013.101 'git log -IA -IB -I1 -I2 -p master # 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
+expecting success of 4018.177 'hunk header: elixir-module-func': 
+		git diff -U1 elixir-module-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 101 - git log -IA -IB -I1 -I2 -p master # magic is (not used)
+@@ -5,3 +5,3 @@ def fun(RIGHT) do
+ok 177 - hunk header: elixir-module-func
 
-expecting success of 4013.102 'git log --decorate --all # 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
+expecting success of 4018.178 'hunk header: elixir-nested-module': 
+		git diff -U1 elixir-nested-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 102 - git log --decorate --all # magic is (not used)
+@@ -5,3 +5,3 @@ defmodule MyApp.RIGHT do
+ok 178 - hunk header: elixir-nested-module
 
-expecting success of 4013.103 'git log --decorate=full --all # 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
+expecting success of 4018.179 'hunk header: elixir-private-function': 
+		git diff -U1 elixir-private-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 103 - git log --decorate=full --all # magic is (not used)
+@@ -3,3 +3,3 @@ defp function(RIGHT, arg) do
+ok 179 - hunk header: elixir-private-function
 
-expecting success of 4013.104 'git log --decorate --clear-decorations --all # 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
+expecting success of 4018.180 'hunk header: elixir-protocol': 
+		git diff -U1 elixir-protocol >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 104 - git log --decorate --clear-decorations --all # magic is (not used)
+@@ -4,3 +4,3 @@ defprotocol RIGHT do
+ok 180 - hunk header: elixir-protocol
 
-expecting success of 4013.105 'git log --decorate=full --clear-decorations --all # 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
+expecting success of 4018.181 'hunk header: elixir-protocol-implementation': 
+		git diff -U1 elixir-protocol-implementation >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 105 - git log --decorate=full --clear-decorations --all # magic is (not used)
+@@ -3,3 +3,3 @@ defimpl RIGHT do
+ok 181 - hunk header: elixir-protocol-implementation
 
-expecting success of 4013.106 'git rev-list --parents HEAD # 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
+expecting success of 4018.182 'hunk header: fortran-block-data': 
+		git diff -U1 fortran-block-data >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 106 - git rev-list --parents HEAD # magic is (not used)
+@@ -2,4 +2,4 @@ BLOCK DATA RIGHT
+ok 182 - hunk header: fortran-block-data
 
-expecting success of 4013.107 'git rev-list --children HEAD # 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
+expecting success of 4018.183 'hunk header: fortran-comment': 
+		git diff -U1 fortran-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 107 - git rev-list --children HEAD # magic is (not used)
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 183 - hunk header: fortran-comment
 
-expecting success of 4013.108 'git whatchanged master # 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
+expecting success of 4018.184 'hunk header: fortran-comment-keyword': 
+		git diff -U1 fortran-comment-keyword >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 108 - git whatchanged master # magic is (not used)
+@@ -9,3 +9,3 @@ subroutine RIGHT (funcA, funcB)
+ok 184 - hunk header: fortran-comment-keyword
 
-expecting success of 4013.109 'git whatchanged master # magic is noellipses': 
-		{
-			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
+expecting success of 4018.185 'hunk header: fortran-comment-legacy': 
+		git diff -U1 fortran-comment-legacy >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 109 - git whatchanged master # magic is noellipses
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 185 - hunk header: fortran-comment-legacy
 
-expecting success of 4013.110 'git whatchanged -p master # 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
+expecting success of 4018.186 'hunk header: fortran-comment-legacy-star': 
+		git diff -U1 fortran-comment-legacy-star >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 110 - git whatchanged -p master # magic is (not used)
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 186 - hunk header: fortran-comment-legacy-star
 
-expecting success of 4013.111 'git whatchanged --root master # 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
+expecting success of 4018.187 'hunk header: fortran-external-function': 
+		git diff -U1 fortran-external-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 111 - git whatchanged --root master # magic is (not used)
+@@ -2,3 +2,3 @@ function RIGHT(a, b) result(c)
+ok 187 - hunk header: fortran-external-function
 
-expecting success of 4013.112 'git whatchanged --root master # magic is noellipses': 
-		{
-			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
+expecting success of 4018.188 'hunk header: fortran-external-subroutine': 
+		git diff -U1 fortran-external-subroutine >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 112 - git whatchanged --root master # magic is noellipses
+@@ -2,3 +2,3 @@ subroutine RIGHT
+ok 188 - hunk header: fortran-external-subroutine
 
-expecting success of 4013.113 'git whatchanged --root -p master # 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
+expecting success of 4018.189 'hunk header: fortran-module': 
+		git diff -U1 fortran-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 113 - git whatchanged --root -p master # magic is (not used)
+@@ -2,3 +2,3 @@ module RIGHT
+ok 189 - hunk header: fortran-module
 
-expecting success of 4013.114 'git whatchanged --patch-with-stat master # 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
+expecting success of 4018.190 'hunk header: fortran-module-procedure': 
+		git diff -U1 fortran-module-procedure >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 114 - git whatchanged --patch-with-stat master # magic is (not used)
+@@ -8,3 +8,3 @@ module RIGHT
+ok 190 - hunk header: fortran-module-procedure
 
-expecting success of 4013.115 'git whatchanged --root --patch-with-stat master # 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
+expecting success of 4018.191 'hunk header: fortran-program': 
+		git diff -U1 fortran-program >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 115 - git whatchanged --root --patch-with-stat master # magic is (not used)
+@@ -2,3 +2,3 @@ program RIGHT
+ok 191 - hunk header: fortran-program
 
-expecting success of 4013.116 'git whatchanged --root --patch-with-stat --summary master # 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
+expecting success of 4018.192 'hunk header: fountain-scene': 
+		git diff -U1 fountain-scene >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 116 - git whatchanged --root --patch-with-stat --summary master # magic is (not used)
+@@ -3,2 +3,2 @@ EXT. STREET RIGHT OUTSIDE - DAY
+ok 192 - hunk header: fountain-scene
 
-expecting success of 4013.117 'git whatchanged --root -c --patch-with-stat --summary master # 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
+expecting success of 4018.193 'hunk header: golang-complex-function': 
+		git diff -U1 golang-complex-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 117 - git whatchanged --root -c --patch-with-stat --summary master # magic is (not used)
+@@ -6,3 +6,3 @@ func (t *Test) RIGHT(a Type) (Type, error) {
+ok 193 - hunk header: golang-complex-function
 
-expecting success of 4013.118 'git whatchanged --root --cc --patch-with-stat --summary master # 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
+expecting success of 4018.194 'hunk header: golang-func': 
+		git diff -U1 golang-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 118 - git whatchanged --root --cc --patch-with-stat --summary master # magic is (not used)
+@@ -2,3 +2,3 @@ func RIGHT() {
+ok 194 - hunk header: golang-func
 
-expecting success of 4013.119 'git whatchanged -SF master # 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
+expecting success of 4018.195 'hunk header: golang-interface': 
+		git diff -U1 golang-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 119 - git whatchanged -SF master # magic is (not used)
+@@ -2,3 +2,3 @@ type RIGHT interface {
+ok 195 - hunk header: golang-interface
 
-expecting success of 4013.120 'git whatchanged -SF master # magic is noellipses': 
-		{
-			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
+expecting success of 4018.196 'hunk header: golang-long-func': 
+		git diff -U1 golang-long-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 120 - git whatchanged -SF master # magic is noellipses
+@@ -3,3 +3,3 @@ func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
+ok 196 - hunk header: golang-long-func
 
-expecting success of 4013.121 'git whatchanged -SF -p master # 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
+expecting success of 4018.197 'hunk header: golang-struct': 
+		git diff -U1 golang-struct >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 121 - git whatchanged -SF -p master # magic is (not used)
+@@ -2,3 +2,3 @@ type RIGHT struct {
+ok 197 - hunk header: golang-struct
 
-expecting success of 4013.122 'git log --patch-with-stat master -- dir/ # 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
+expecting success of 4018.198 'hunk header: java-class-brace-on-separate-line': 
+		git diff -U1 java-class-brace-on-separate-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 122 - git log --patch-with-stat master -- dir/ # magic is (not used)
+@@ -4,3 +4,3 @@ class RIGHT
+ok 198 - hunk header: java-class-brace-on-separate-line
 
-expecting success of 4013.123 'git whatchanged --patch-with-stat master -- dir/ # 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
+expecting success of 4018.199 'hunk header: java-class-member-function': 
+		git diff -U1 java-class-member-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 123 - git whatchanged --patch-with-stat master -- dir/ # magic is (not used)
+@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
+ok 199 - hunk header: java-class-member-function
 
-expecting success of 4013.124 'git log --patch-with-stat --summary master -- dir/ # 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
+expecting success of 4018.200 'hunk header: java-class-space-before-type-parameters': 
+		git diff -U1 java-class-space-before-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 124 - git log --patch-with-stat --summary master -- dir/ # magic is (not used)
+@@ -4,3 +4,3 @@ class RIGHT <TYPE, PARAMS, AFTER, SPACE> {
+ok 200 - hunk header: java-class-space-before-type-parameters
 
-expecting success of 4013.125 'git whatchanged --patch-with-stat --summary master -- dir/ # 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
+expecting success of 4018.201 'hunk header: java-class-type-parameters': 
+		git diff -U1 java-class-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 125 - git whatchanged --patch-with-stat --summary master -- dir/ # magic is (not used)
+@@ -4,3 +4,3 @@ class RIGHT<A, B> {
+ok 201 - hunk header: java-class-type-parameters
 
-expecting success of 4013.126 'git show 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
+expecting success of 4018.202 'hunk header: java-class-type-parameters-implements': 
+		git diff -U1 java-class-type-parameters-implements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 126 - git show initial # magic is (not used)
+@@ -4,3 +4,3 @@ class RIGHT<A, B> implements List<A> {
+ok 202 - hunk header: java-class-type-parameters-implements
 
-expecting success of 4013.127 'git show --root 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
+expecting success of 4018.203 'hunk header: java-enum-constant': 
+		git diff -U1 java-enum-constant >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 127 - git show --root initial # magic is (not used)
+@@ -4,3 +4,3 @@ private enum RIGHT {
+ok 203 - hunk header: java-enum-constant
 
-expecting success of 4013.128 'git show side # 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
+expecting success of 4018.204 'hunk header: java-interface-type-parameters': 
+		git diff -U1 java-interface-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 128 - git show side # magic is (not used)
+@@ -4,3 +4,3 @@ interface RIGHT<A, B> {
+ok 204 - hunk header: java-interface-type-parameters
 
-expecting success of 4013.129 'git show master # 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
+expecting success of 4018.205 'hunk header: java-interface-type-parameters-extends': 
+		git diff -U1 java-interface-type-parameters-extends >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 129 - git show master # magic is (not used)
+@@ -4,3 +4,3 @@ interface RIGHT<A, B> extends Function<A, B> {
+ok 205 - hunk header: java-interface-type-parameters-extends
 
-expecting success of 4013.130 'git show -c master # 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
+expecting success of 4018.206 'hunk header: java-method-return-generic-bounded': 
+		git diff -U1 java-method-return-generic-bounded >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 130 - git show -c master # magic is (not used)
+@@ -6,3 +6,3 @@ public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
+ok 206 - hunk header: java-method-return-generic-bounded
 
-expecting success of 4013.131 'git show -m master # 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
+expecting success of 4018.207 'hunk header: java-method-return-generic-wildcard': 
+		git diff -U1 java-method-return-generic-wildcard >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 131 - git show -m master # magic is (not used)
+@@ -6,3 +6,3 @@ public List<? extends Comparable> foo(String[] RIGHT) {
+ok 207 - hunk header: java-method-return-generic-wildcard
 
-expecting success of 4013.132 'git show --first-parent master # 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
+expecting success of 4018.208 'hunk header: java-nested-field': 
+		git diff -U1 java-nested-field >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 132 - git show --first-parent master # magic is (not used)
+@@ -3,3 +3,3 @@ private static class RIGHT {
+ok 208 - hunk header: java-nested-field
 
-expecting success of 4013.133 'git show --stat side # 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
+expecting success of 4018.209 'hunk header: java-non-sealed': 
+		git diff -U1 java-non-sealed >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 133 - git show --stat side # magic is (not used)
+@@ -5,3 +5,3 @@ public static non-sealed class RIGHT extends SealedClass {
+ok 209 - hunk header: java-non-sealed
 
-expecting success of 4013.134 'git show --stat --summary side # 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
+expecting success of 4018.210 'hunk header: java-record': 
+		git diff -U1 java-record >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 134 - git show --stat --summary side # magic is (not used)
+@@ -4,3 +4,3 @@ public record RIGHT(int comp1, double comp2, String comp3) {
+ok 210 - hunk header: java-record
 
-expecting success of 4013.135 'git show --patch-with-stat side # 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
+expecting success of 4018.211 'hunk header: java-record-space-before-components': 
+		git diff -U1 java-record-space-before-components >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 135 - git show --patch-with-stat side # magic is (not used)
+@@ -4,3 +4,3 @@ public record RIGHT (String components, String after, String space) {
+ok 211 - hunk header: java-record-space-before-components
 
-expecting success of 4013.136 'git show --patch-with-raw side # 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
+expecting success of 4018.212 'hunk header: java-record-type-parameters': 
+		git diff -U1 java-record-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 136 - git show --patch-with-raw side # magic is (not used)
+@@ -4,3 +4,3 @@ public record RIGHT<A, N extends Number>(A comp1, N comp2, int comp3) {
+ok 212 - hunk header: java-record-type-parameters
 
-expecting success of 4013.137 'git show --patch-with-raw side # magic is noellipses': 
-		{
-			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
+expecting success of 4018.213 'hunk header: java-sealed': 
+		git diff -U1 java-sealed >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 137 - git show --patch-with-raw side # magic is noellipses
+@@ -4,3 +4,3 @@ public abstract sealed class Sealed { // RIGHT
+ok 213 - hunk header: java-sealed
 
-expecting success of 4013.138 'git show --patch-with-stat --summary side # 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
+expecting success of 4018.214 'hunk header: java-sealed-permits': 
+		git diff -U1 java-sealed-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 138 - git show --patch-with-stat --summary side # magic is (not used)
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT permits PermittedA, PermittedB {
+ok 214 - hunk header: java-sealed-permits
 
-expecting success of 4013.139 'git format-patch --stdout initial..side # 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
+expecting success of 4018.215 'hunk header: java-sealed-type-parameters': 
+		git diff -U1 java-sealed-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 139 - git format-patch --stdout initial..side # magic is (not used)
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> {
+ok 215 - hunk header: java-sealed-type-parameters
 
-expecting success of 4013.140 'git format-patch --stdout initial..master^ # 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
+expecting success of 4018.216 'hunk header: java-sealed-type-parameters-implements-permits': 
+		git diff -U1 java-sealed-type-parameters-implements-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 140 - git format-patch --stdout initial..master^ # magic is (not used)
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> implements List<A> permits PermittedA,
+ok 216 - hunk header: java-sealed-type-parameters-implements-permits
 
-expecting success of 4013.141 'git format-patch --stdout initial..master # 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
+expecting success of 4018.217 'hunk header: java-sealed-type-parameters-permits': 
+		git diff -U1 java-sealed-type-parameters-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 141 - git format-patch --stdout initial..master # magic is (not used)
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> permits PermittedA, PermittedB {
+ok 217 - hunk header: java-sealed-type-parameters-permits
 
-expecting success of 4013.142 'git format-patch --stdout --no-numbered initial..master # 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
+expecting success of 4018.218 'hunk header: kotlin-class': 
+		git diff -U1 kotlin-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 142 - git format-patch --stdout --no-numbered initial..master # magic is (not used)
+@@ -3,3 +3,3 @@ class RIGHT {
+ok 218 - hunk header: kotlin-class
 
-expecting success of 4013.143 'git format-patch --stdout --numbered initial..master # 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
+expecting success of 4018.219 'hunk header: kotlin-enum-class': 
+		git diff -U1 kotlin-enum-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 143 - git format-patch --stdout --numbered initial..master # magic is (not used)
+@@ -3,3 +3,3 @@ enum class RIGHT{
+ok 219 - hunk header: kotlin-enum-class
 
-expecting success of 4013.144 'git format-patch --attach --stdout initial..side # 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
+expecting success of 4018.220 'hunk header: kotlin-fun': 
+		git diff -U1 kotlin-fun >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 144 - git format-patch --attach --stdout initial..side # magic is (not used)
+@@ -3,3 +3,3 @@ fun RIGHT(){
+ok 220 - hunk header: kotlin-fun
 
-expecting success of 4013.145 'git format-patch --attach --stdout --suffix=.diff initial..side # 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
+expecting success of 4018.221 'hunk header: kotlin-inheritace-class': 
+		git diff -U1 kotlin-inheritace-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 145 - git format-patch --attach --stdout --suffix=.diff initial..side # magic is (not used)
+@@ -3,3 +3,3 @@ open class RIGHT{
+ok 221 - hunk header: kotlin-inheritace-class
 
-expecting success of 4013.146 'git format-patch --attach --stdout initial..master^ # 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
+expecting success of 4018.222 'hunk header: kotlin-inline-class': 
+		git diff -U1 kotlin-inline-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 146 - git format-patch --attach --stdout initial..master^ # magic is (not used)
+@@ -3,3 +3,3 @@ value class RIGHT(Args){
+ok 222 - hunk header: kotlin-inline-class
 
-expecting success of 4013.147 'git format-patch --attach --stdout initial..master # 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
+expecting success of 4018.223 'hunk header: kotlin-interface': 
+		git diff -U1 kotlin-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 147 - git format-patch --attach --stdout initial..master # magic is (not used)
+@@ -3,3 +3,3 @@ interface RIGHT{
+ok 223 - hunk header: kotlin-interface
 
-expecting success of 4013.148 'git format-patch --inline --stdout initial..side # 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
+expecting success of 4018.224 'hunk header: kotlin-nested-fun': 
+		git diff -U1 kotlin-nested-fun >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 148 - git format-patch --inline --stdout initial..side # magic is (not used)
+@@ -5,3 +5,3 @@ fun RIGHT(  a:Int){
+ok 224 - hunk header: kotlin-nested-fun
 
-expecting success of 4013.149 'git format-patch --inline --stdout initial..master^ # 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
+expecting success of 4018.225 'hunk header: kotlin-public-class': 
+		git diff -U1 kotlin-public-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 149 - git format-patch --inline --stdout initial..master^ # magic is (not used)
+@@ -3,3 +3,3 @@ public class RIGHT{
+ok 225 - hunk header: kotlin-public-class
 
-expecting success of 4013.150 'git format-patch --inline --stdout --numbered-files initial..master # 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
+expecting success of 4018.226 'hunk header: kotlin-sealed-class': 
+		git diff -U1 kotlin-sealed-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 150 - git format-patch --inline --stdout --numbered-files initial..master # magic is (not used)
+@@ -3,3 +3,3 @@ sealed class RIGHT {
+ok 226 - hunk header: kotlin-sealed-class
 
-expecting success of 4013.151 'git format-patch --inline --stdout initial..master # 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
+expecting success of 4018.227 'hunk header: markdown-heading-indented': 
+		git diff -U1 markdown-heading-indented >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 151 - git format-patch --inline --stdout initial..master # magic is (not used)
+@@ -5,2 +5,2 @@    ### RIGHT
+ok 227 - hunk header: markdown-heading-indented
 
-expecting success of 4013.152 'git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master # 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
+expecting success of 4018.228 'hunk header: markdown-heading-non-headings': 
+		git diff -U1 markdown-heading-non-headings >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 152 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master # magic is (not used)
+@@ -16,2 +16,2 @@ # RIGHT
+ok 228 - hunk header: markdown-heading-non-headings
 
-expecting success of 4013.153 'git config format.subjectprefix DIFFERENT_PREFIX # 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
+expecting success of 4018.229 'hunk header: matlab-class-definition': 
+		git diff -U1 matlab-class-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 153 - git config format.subjectprefix DIFFERENT_PREFIX # magic is (not used)
+@@ -2,3 +2,3 @@ classdef RIGHT
+ok 229 - hunk header: matlab-class-definition
 
-expecting success of 4013.154 'git format-patch --inline --stdout initial..master^^ # 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
+expecting success of 4018.230 'hunk header: matlab-function': 
+		git diff -U1 matlab-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 154 - git format-patch --inline --stdout initial..master^^ # magic is (not used)
+@@ -2,3 +2,3 @@ function y = RIGHT()
+ok 230 - hunk header: matlab-function
 
-expecting success of 4013.155 'git format-patch --stdout --cover-letter -n initial..master^ # 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
+expecting success of 4018.231 'hunk header: matlab-octave-section-1': 
+		git diff -U1 matlab-octave-section-1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 155 - git format-patch --stdout --cover-letter -n initial..master^ # magic is (not used)
+@@ -2,2 +2,2 @@ %%% RIGHT section
+ok 231 - hunk header: matlab-octave-section-1
 
-expecting success of 4013.156 'git diff --abbrev initial..side # 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
+expecting success of 4018.232 'hunk header: matlab-octave-section-2': 
+		git diff -U1 matlab-octave-section-2 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 156 - git diff --abbrev initial..side # magic is (not used)
+@@ -2,2 +2,2 @@ ## RIGHT section
+ok 232 - hunk header: matlab-octave-section-2
 
-expecting success of 4013.157 'git diff -U initial..side # 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
+expecting success of 4018.233 'hunk header: matlab-section': 
+		git diff -U1 matlab-section >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 157 - git diff -U initial..side # magic is (not used)
+@@ -2,2 +2,2 @@ %% RIGHT section
+ok 233 - hunk header: matlab-section
 
-expecting success of 4013.158 'git diff -U1 initial..side # 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
+expecting success of 4018.234 'hunk header: perl-skip-end-of-heredoc': 
+		git diff -U1 perl-skip-end-of-heredoc >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 158 - git diff -U1 initial..side # magic is (not used)
+@@ -6,3 +6,3 @@ sub RIGHTwithheredocument {
+ok 234 - hunk header: perl-skip-end-of-heredoc
 
-expecting success of 4013.159 'git diff -r initial..side # 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
+expecting success of 4018.235 'hunk header: perl-skip-forward-decl': 
+		git diff -U1 perl-skip-forward-decl >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 159 - git diff -r initial..side # magic is (not used)
+@@ -9,2 +9,2 @@ package RIGHT;
+ok 235 - hunk header: perl-skip-forward-decl
 
-expecting success of 4013.160 'git diff --stat initial..side # 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
+expecting success of 4018.236 'hunk header: perl-skip-sub-in-pod': 
+		git diff -U1 perl-skip-sub-in-pod >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 160 - git diff --stat initial..side # magic is (not used)
+@@ -15,3 +15,3 @@ =head1 SYNOPSIS_RIGHT
+ok 236 - hunk header: perl-skip-sub-in-pod
 
-expecting success of 4013.161 'git diff -r --stat initial..side # 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
+expecting success of 4018.237 'hunk header: perl-sub-definition': 
+		git diff -U1 perl-sub-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 161 - git diff -r --stat initial..side # magic is (not used)
+@@ -2,3 +2,3 @@ sub RIGHT {
+ok 237 - hunk header: perl-sub-definition
 
-expecting success of 4013.162 'git diff initial..side # 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
+expecting success of 4018.238 'hunk header: perl-sub-definition-kr-brace': 
+		git diff -U1 perl-sub-definition-kr-brace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 162 - git diff initial..side # magic is (not used)
+@@ -2,3 +2,3 @@ sub RIGHT
+ok 238 - hunk header: perl-sub-definition-kr-brace
 
-expecting success of 4013.163 'git diff --patch-with-stat initial..side # 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
+expecting success of 4018.239 'hunk header: php-abstract-class': 
+		git diff -U1 php-abstract-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 163 - git diff --patch-with-stat initial..side # magic is (not used)
+@@ -2,3 +2,3 @@ abstract class RIGHT
+ok 239 - hunk header: php-abstract-class
 
-expecting success of 4013.164 'git diff --patch-with-raw initial..side # 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
+expecting success of 4018.240 'hunk header: php-abstract-method': 
+		git diff -U1 php-abstract-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 164 - git diff --patch-with-raw initial..side # magic is (not used)
+@@ -4,3 +4,3 @@ abstract public function RIGHT(): ?string
+ok 240 - hunk header: php-abstract-method
 
-expecting success of 4013.165 'git diff --patch-with-raw initial..side # magic is noellipses': 
-		{
-			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
+expecting success of 4018.241 'hunk header: php-class': 
+		git diff -U1 php-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 165 - git diff --patch-with-raw initial..side # magic is noellipses
+@@ -2,3 +2,3 @@ class RIGHT
+ok 241 - hunk header: php-class
 
-expecting success of 4013.166 'git diff --patch-with-stat -r initial..side # 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
+expecting success of 4018.242 'hunk header: php-enum': 
+		git diff -U1 php-enum >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 166 - git diff --patch-with-stat -r initial..side # magic is (not used)
+@@ -2,3 +2,3 @@ enum RIGHT: string
+ok 242 - hunk header: php-enum
 
-expecting success of 4013.167 'git diff --patch-with-raw -r initial..side # 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
+expecting success of 4018.243 'hunk header: php-final-class': 
+		git diff -U1 php-final-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 167 - git diff --patch-with-raw -r initial..side # magic is (not used)
+@@ -2,3 +2,3 @@ final class RIGHT
+ok 243 - hunk header: php-final-class
 
-expecting success of 4013.168 'git diff --patch-with-raw -r initial..side # magic is noellipses': 
-		{
-			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
+expecting success of 4018.244 'hunk header: php-final-method': 
+		git diff -U1 php-final-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 168 - git diff --patch-with-raw -r initial..side # magic is noellipses
+@@ -4,3 +4,3 @@ final public function RIGHT(): string
+ok 244 - hunk header: php-final-method
 
-expecting success of 4013.169 'git diff --name-status dir2 dir # 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
+expecting success of 4018.245 'hunk header: php-function': 
+		git diff -U1 php-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 169 - git diff --name-status dir2 dir # magic is (not used)
+@@ -2,3 +2,3 @@ function RIGHT()
+ok 245 - hunk header: php-function
 
-expecting success of 4013.170 'git diff --no-index --name-status dir2 dir # 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
+expecting success of 4018.246 'hunk header: php-interface': 
+		git diff -U1 php-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 170 - git diff --no-index --name-status dir2 dir # magic is (not used)
+@@ -2,3 +2,3 @@ interface RIGHT
+ok 246 - hunk header: php-interface
 
-expecting success of 4013.171 'git diff --no-index --name-status -- dir2 dir # 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
+expecting success of 4018.247 'hunk header: php-method': 
+		git diff -U1 php-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 171 - git diff --no-index --name-status -- dir2 dir # magic is (not used)
+@@ -4,3 +4,3 @@ public static function RIGHT()
+ok 247 - hunk header: php-method
 
-expecting success of 4013.172 'git diff --no-index dir dir3 # 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
+expecting success of 4018.248 'hunk header: php-trait': 
+		git diff -U1 php-trait >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 172 - git diff --no-index dir dir3 # magic is (not used)
+@@ -2,3 +2,3 @@ trait RIGHT
+ok 248 - hunk header: php-trait
 
-expecting success of 4013.173 'git diff master master^ side # 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
+expecting success of 4018.249 'hunk header: python-async-def': 
+		git diff -U1 python-async-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 173 - git diff master master^ side # magic is (not used)
+@@ -3,2 +3,2 @@ async def RIGHT(pi: int = 3.14):
+ok 249 - hunk header: python-async-def
 
-expecting success of 4013.174 'git diff --line-prefix=abc master master^ side # 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
+expecting success of 4018.250 'hunk header: python-class': 
+		git diff -U1 python-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 174 - git diff --line-prefix=abc master master^ side # magic is (not used)
+@@ -3,2 +3,2 @@ class RIGHT(int, str):
+ok 250 - hunk header: python-class
 
-expecting success of 4013.175 'git diff --dirstat master~1 master~2 # 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
+expecting success of 4018.251 'hunk header: python-def': 
+		git diff -U1 python-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 175 - git diff --dirstat master~1 master~2 # magic is (not used)
+@@ -3,2 +3,2 @@ def RIGHT(pi: int = 3.14):
+ok 251 - hunk header: python-def
 
-expecting success of 4013.176 'git diff --dirstat initial rearrange # 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
+expecting success of 4018.252 'hunk header: python-indented-async-def': 
+		git diff -U1 python-indented-async-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 176 - git diff --dirstat initial rearrange # magic is (not used)
+@@ -5,3 +5,3 @@ async def RIGHT(self, x: int):
+ok 252 - hunk header: python-indented-async-def
 
-expecting success of 4013.177 'git diff --dirstat-by-file initial rearrange # 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
+expecting success of 4018.253 'hunk header: python-indented-class': 
+		git diff -U1 python-indented-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 177 - git diff --dirstat-by-file initial rearrange # magic is (not used)
+@@ -4,2 +4,2 @@ class RIGHT:
+ok 253 - hunk header: python-indented-class
 
-expecting success of 4013.178 'git diff --dirstat --cc master~1 master # 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
+expecting success of 4018.254 'hunk header: python-indented-def': 
+		git diff -U1 python-indented-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 178 - git diff --dirstat --cc master~1 master # magic is (not used)
+@@ -5,3 +5,3 @@ def RIGHT(self, x: int):
+ok 254 - hunk header: python-indented-def
 
-expecting success of 4013.179 'git diff --raw 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
+expecting success of 4018.255 'hunk header: rust-fn': 
+		git diff -U1 rust-fn >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 179 - git diff --raw initial # magic is (not used)
+@@ -3,3 +3,3 @@ pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
+ok 255 - hunk header: rust-fn
 
-expecting success of 4013.180 'git diff --raw initial # magic is noellipses': 
-		{
-			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
+expecting success of 4018.256 'hunk header: rust-impl': 
+		git diff -U1 rust-impl >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 180 - git diff --raw initial # magic is noellipses
+@@ -2,3 +2,3 @@ impl<'a, T: AsRef<[u8]>>  std::RIGHT for Git<'a> {
+ok 256 - hunk header: rust-impl
 
-expecting success of 4013.181 'git diff --raw --abbrev=4 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
+expecting success of 4018.257 'hunk header: rust-macro-rules': 
+		git diff -U1 rust-macro-rules >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 181 - git diff --raw --abbrev=4 initial # magic is (not used)
+@@ -3,3 +3,3 @@ macro_rules! RIGHT {
+ok 257 - hunk header: rust-macro-rules
 
-expecting success of 4013.182 'git diff --raw --abbrev=4 initial # magic is noellipses': 
-		{
-			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
+expecting success of 4018.258 'hunk header: rust-struct': 
+		git diff -U1 rust-struct >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 182 - git diff --raw --abbrev=4 initial # magic is noellipses
+@@ -3,3 +3,3 @@ pub(super) struct RIGHT<'a> {
+ok 258 - hunk header: rust-struct
 
-expecting success of 4013.183 'git diff --raw --no-abbrev 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
+expecting success of 4018.259 'hunk header: rust-trait': 
+		git diff -U1 rust-trait >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 183 - git diff --raw --no-abbrev initial # magic is (not used)
+@@ -2,3 +2,3 @@ unsafe trait RIGHT<T> {
+ok 259 - hunk header: rust-trait
 
-expecting success of 4013.184 'git diff --no-index --raw dir2 dir # 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
+expecting success of 4018.260 'hunk header: scheme-class': 
+		git diff -U1 scheme-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 184 - git diff --no-index --raw dir2 dir # magic is (not used)
+@@ -3,3 +3,3 @@ (class* () object% RIGHT
+ok 260 - hunk header: scheme-class
 
-expecting success of 4013.185 'git diff --no-index --raw dir2 dir # magic is noellipses': 
-		{
-			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
+expecting success of 4018.261 'hunk header: scheme-def': 
+		git diff -U1 scheme-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 185 - git diff --no-index --raw dir2 dir # magic is noellipses
+@@ -3,2 +3,2 @@ (def (some-func x y z) RIGHT
+ok 261 - hunk header: scheme-def
 
-expecting success of 4013.186 'git diff --no-index --raw --abbrev=4 dir2 dir # 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
+expecting success of 4018.262 'hunk header: scheme-def-variant': 
+		git diff -U1 scheme-def-variant >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 186 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is (not used)
+@@ -3,2 +3,2 @@ (defmethod {print point} RIGHT
+ok 262 - hunk header: scheme-def-variant
 
-expecting success of 4013.187 'git diff --no-index --raw --abbrev=4 dir2 dir # magic is noellipses': 
-		{
-			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
+expecting success of 4018.263 'hunk header: scheme-define-slash-public': 
+		git diff -U1 scheme-define-slash-public >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 187 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is noellipses
+@@ -5,3 +5,3 @@ (define/public (foo) RIGHT
+ok 263 - hunk header: scheme-define-slash-public
 
-expecting success of 4013.188 'git diff --no-index --raw --no-abbrev dir2 dir # 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
+expecting success of 4018.264 'hunk header: scheme-define-syntax': 
+		git diff -U1 scheme-define-syntax >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 188 - git diff --no-index --raw --no-abbrev dir2 dir # magic is (not used)
+@@ -2,3 +2,3 @@ (define-syntax define-test-suite RIGHT
+ok 264 - hunk header: scheme-define-syntax
 
-expecting success of 4013.189 'git diff-tree --pretty --root --stat --compact-summary 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
+expecting success of 4018.265 'hunk header: scheme-define-variant': 
+		git diff -U1 scheme-define-variant >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 189 - git diff-tree --pretty --root --stat --compact-summary initial # magic is (not used)
+@@ -3,2 +3,2 @@ (define* (some-func x y z) RIGHT
+ok 265 - hunk header: scheme-define-variant
 
-expecting success of 4013.190 'git diff-tree --pretty -R --root --stat --compact-summary 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
+expecting success of 4018.266 'hunk header: scheme-library': 
+		git diff -U1 scheme-library >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 190 - git diff-tree --pretty -R --root --stat --compact-summary initial # magic is (not used)
+@@ -2,3 +2,3 @@ (library (my-helpers id-stuff) RIGHT
+ok 266 - hunk header: scheme-library
 
-expecting success of 4013.191 'git diff-tree --pretty note # 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
+expecting success of 4018.267 'hunk header: scheme-local-define': 
+		git diff -U1 scheme-local-define >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 191 - git diff-tree --pretty note # magic is (not used)
+@@ -3,2 +3,2 @@ (define local-function RIGHT
+ok 267 - hunk header: scheme-local-define
 
-expecting success of 4013.192 'git diff-tree --pretty --notes note # 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
+expecting success of 4018.268 'hunk header: scheme-module': 
+		git diff -U1 scheme-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 192 - git diff-tree --pretty --notes note # magic is (not used)
+@@ -2,3 +2,3 @@ (module A RIGHT
+ok 268 - hunk header: scheme-module
 
-expecting success of 4013.193 'git diff-tree --format=%N note # 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
+expecting success of 4018.269 'hunk header: scheme-top-level-define': 
+		git diff -U1 scheme-top-level-define >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 193 - git diff-tree --format=%N note # magic is (not used)
+@@ -3,2 +3,2 @@ (define (some-func x y z) RIGHT
+ok 269 - hunk header: scheme-top-level-define
 
-expecting success of 4013.194 'git diff-tree --stat --compact-summary initial mode # 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
+expecting success of 4018.270 'hunk header: scheme-user-defined-define': 
+		git diff -U1 scheme-user-defined-define >actual &&
+		grep '@@ .* @@.*RIGHT' actual
 	
-ok 194 - git diff-tree --stat --compact-summary initial mode # magic is (not used)
+@@ -4,3 +4,3 @@ (define-test-suite record\ case-tests RIGHT
+ok 270 - hunk header: scheme-user-defined-define
 
-expecting success of 4013.195 'git diff-tree -R --stat --compact-summary initial mode # 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 195 - git diff-tree -R --stat --compact-summary initial mode # magic is (not used)
+# passed all 270 test(s)
+1..270
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4105-apply-fuzz.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4105-apply-fuzz/.git/
+expecting success of 4105.1 'setup': 
 
-expecting success of 4013.196 'log -m matches pure log': 
-	git log master >result &&
-	process_diffs result >expected &&
-	git log -m >result &&
-	process_diffs result >actual &&
-	test_cmp expected actual
+	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 &&
 
-ok 196 - log -m matches pure log
+	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 &&
 
-expecting success of 4013.197 'log --diff-merges=on matches --diff-merges=separate': 
-	git log -p --diff-merges=separate master >result &&
-	process_diffs result >expected &&
-	git log -p --diff-merges=on master >result &&
-	process_diffs result >actual &&
-	test_cmp expected actual
+	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 197 - log --diff-merges=on matches --diff-merges=separate
 
-expecting success of 4013.198 'log --dd matches --diff-merges=1 -p': 
-	git log --diff-merges=1 -p master >result &&
-	process_diffs result >expected &&
-	git log --dd master >result &&
-	process_diffs result >actual &&
-	test_cmp expected actual
+ok 1 - setup
 
-ok 198 - log --dd matches --diff-merges=1 -p
+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 4013.199 'deny wrong log.diffMerges config': 
-	test_config log.diffMerges wrong-value &&
-	test_expect_code 128 git log
+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
 
-fatal: bad config variable 'log.diffmerges' in file '.git/config' at line 8
-ok 199 - deny wrong log.diffMerges config
+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 4013.200 'git config log.diffMerges first-parent': 
-	git log -p --diff-merges=first-parent master >result &&
-	process_diffs result >expected &&
-	test_config log.diffMerges first-parent &&
-	git log -p --diff-merges=on master >result &&
-	process_diffs result >actual &&
-	test_cmp expected actual
+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
 
-ok 200 - git config log.diffMerges first-parent
+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 4013.201 'git config log.diffMerges first-parent vs -m': 
-	git log -p --diff-merges=first-parent master >result &&
-	process_diffs result >expected &&
-	test_config log.diffMerges first-parent &&
-	git log -p -m master >result &&
-	process_diffs result >actual &&
-	test_cmp expected actual
+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
 
-ok 201 - git config log.diffMerges first-parent vs -m
+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 4013.202 'git diff-index -m': 
-	rm -f file1 &&
-	git diff-index HEAD >without-m &&
-	lines_count=$(wc -l <without-m) &&
-	git diff-index -m HEAD >with-m &&
-	git restore file1 &&
-	test_line_count = $((lines_count - 1)) with-m
+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
 
-ok 202 - git diff-index -m
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4069-remerge-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-expecting success of 4013.203 'log -S requires an argument': 
-	test_must_fail git log -S
+	git branch feature_a &&
+	git branch feature_b &&
+	git branch feature_c &&
 
-error: switch `S' requires a value
-ok 203 - log -S requires an argument
+	git branch ab_resolution &&
+	git branch bc_resolution &&
 
-expecting success of 4013.204 'diff --cached on unborn branch': 
-	git symbolic-ref HEAD refs/heads/unborn &&
-	git diff --cached >result &&
-	process_diffs result >actual &&
-	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
-	test_cmp expected actual
+	git checkout feature_a &&
+	test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
+	git commit -a -m change_a &&
 
-ok 204 - diff --cached on unborn branch
+	git checkout feature_b &&
+	test_write_lines 1 2 tres 4 5 6 7 8 9 >numbers &&
+	git commit -a -m change_b &&
 
-expecting success of 4013.205 'diff --cached -- file on unborn branch': 
-	git diff --cached -- file0 >result &&
-	process_diffs result >actual &&
-	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
-	test_cmp expected actual
+	git checkout feature_c &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+	git commit -a -m change_c &&
 
-ok 205 - diff --cached -- file on unborn branch
+	git checkout bc_resolution &&
+	git merge --ff-only feature_b &&
+	# no conflict
+	git merge feature_c &&
 
-expecting success of 4013.206 'diff --line-prefix with spaces': 
-	git diff --line-prefix="| | | " --cached -- file0 >result &&
-	process_diffs result >actual &&
-	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
-	test_cmp expected actual
+	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
 
-ok 206 - diff --line-prefix with spaces
+[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 4013.207 'diff-tree --stdin with log formatting': 
-	cat >expect <<-\EOF &&
-	Side
-	Third
-	Second
-	EOF
-	git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
+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 207 - diff-tree --stdin with log formatting
+ok 2 - remerge-diff on a clean merge
 
-expecting success of 4013.208 'diff-tree --stdin with pathspec': 
-	cat >expect <<-EOF &&
-	Third
+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
 
-	dir/sub
-	Second
+ok 3 - remerge-diff on a clean merge with a filter
 
-	dir/sub
+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
-	git rev-list master^ |
-	git diff-tree -r --stdin --name-only --format=%s dir >actual &&
+	# 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 208 - diff-tree --stdin with pathspec
+ok 4 - remerge-diff with both a resolved conflict and an unrelated change
 
-expecting success of 4013.209 'show A B ... -- <pathspec>': 
-	# side touches dir/sub, file0, and file3
-	# master^ touches dir/sub, and file1
-	# master^^ touches dir/sub, file0, and file2
-	git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
-	cat >expect <<-\EOF &&
-	<Side>
+expecting success of 4069.5 'pickaxe still includes additional headers for relevant changes': 
+	# reuses "expect" from the previous testcase
 
-	dir/sub
-	<Third>
+	git log --oneline --remerge-diff -Sacht ab_resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
 
-	dir/sub
-	<Second>
+ok 5 - pickaxe still includes additional headers for relevant changes
 
-	dir/sub
+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 209 - show A B ... -- <pathspec>
+ok 7 - remerge-diff also works for git-diff-tree
 
-expecting success of 4013.210 'diff -I<regex>: setup': 
-	git checkout master &&
-	test_seq 50 >file0 &&
-	git commit -m "Set up -I<regex> test file" file0 &&
-	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
-	echo >>file0
+expecting success of 4069.8 'setup non-content conflicts': 
+	git switch --orphan base &&
 
-Switched to branch 'master'
-[master 4362559] Set up -I<regex> test file
+	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>
- 1 file changed, 44 insertions(+), 3 deletions(-)
-ok 210 - diff -I<regex>: setup
+ 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 4013.211 'diff -I<regex>': 
-	git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
-	cat >expect <<-\EOF &&
-	diff --git a/file0 b/file0
-	--- a/file0
-	+++ b/file0
-	@@ -34,7 +31,6 @@
-	 34
-	 35
-	 36
-	-37
-	 38
-	 39
-	 40
+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
-	compare_diff_patch expect actual
+	# 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 &&
 
-ok 211 - diff -I<regex>
+	git show --oneline --remerge-diff resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
 
-expecting success of 4013.212 'diff -I<regex> --stat': 
-	git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
-	cat >expect <<-\EOF &&
-	 file0 | 1 -
-	 1 file changed, 1 deletion(-)
+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 212 - diff -I<regex> --stat
+ok 10 - remerge-diff w/ diff-filter=U: all conflict headers, no diff content
 
-expecting success of 4013.213 'diff -I<regex>: detect malformed regex': 
-	test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
-	test_grep "invalid regex given to -I: " error
+expecting success of 4069.11 'submodule formatting ignores additional headers': 
+	# Reuses "expect" from last testcase
 
-error: invalid regex given to -I: '^[124-9'
-ok 213 - diff -I<regex>: detect malformed regex
+	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
 
-expecting success of 4013.214 'diff-files does not respect diff.noPrefix': 
-	git -c diff.noPrefix diff-files -p >actual &&
-	check_prefix actual a/file0 b/file0
+ok 11 - submodule formatting ignores additional headers
 
-ok 214 - diff-files does not respect diff.noPrefix
+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 &&
 
-expecting success of 4013.215 'diff-files respects --no-prefix': 
-	git diff-files -p --no-prefix >actual &&
-	check_prefix actual file0 file0
+	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 215 - diff-files respects --no-prefix
+ok 12 - remerge-diff w/ diff-filter=R: relevant file + conflict header
 
-expecting success of 4013.216 'diff respects diff.noPrefix': 
-	git -c diff.noPrefix diff >actual &&
-	check_prefix actual file0 file0
+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 &&
 
-ok 216 - diff respects diff.noPrefix
+	git show --oneline --remerge-diff resolution -- "letters*" >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
 
-expecting success of 4013.217 'diff --default-prefix overrides diff.noPrefix': 
-	git -c diff.noPrefix diff --default-prefix >actual &&
-	check_prefix actual a/file0 b/file0
+ok 13 - remerge-diff w/ pathspec: limits to relevant file including conflict header
 
-ok 217 - diff --default-prefix overrides diff.noPrefix
+expecting success of 4069.14 'setup non-content conflicts': 
+	git switch --orphan newbase &&
 
-expecting success of 4013.218 'diff respects diff.mnemonicPrefix': 
-	git -c diff.mnemonicPrefix diff >actual &&
-	check_prefix actual i/file0 w/file0
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m base &&
 
-ok 218 - diff respects diff.mnemonicPrefix
+	git branch newside1 &&
+	git branch newside2 &&
 
-expecting success of 4013.219 'diff --default-prefix overrides diff.mnemonicPrefix': 
-	git -c diff.mnemonicPrefix diff --default-prefix >actual &&
-	check_prefix actual a/file0 b/file0
+	git checkout newside1 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side1 &&
 
-ok 219 - diff --default-prefix overrides diff.mnemonicPrefix
+	git checkout newside2 &&
+	test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side2 &&
 
-expecting success of 4013.220 'diff respects diff.srcPrefix': 
-	git -c diff.srcPrefix=x/ diff >actual &&
-	check_prefix actual x/file0 b/file0
+	git checkout -b newresolution newside1 &&
+	test_must_fail git merge newside2 &&
+	git checkout --theirs numbers &&
+	git add -u numbers &&
+	git commit -m resolved
 
-ok 220 - diff respects diff.srcPrefix
+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 4013.221 'diff respects diff.dstPrefix': 
-	git -c diff.dstPrefix=y/ diff >actual &&
-	check_prefix actual a/file0 y/file0
+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 &&
 
-ok 221 - diff respects diff.dstPrefix
+	git show --oneline --remerge-diff newresolution -- numbers >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
 
-expecting success of 4013.222 'diff --src-prefix overrides diff.srcPrefix': 
-	git -c diff.srcPrefix=y/ diff --src-prefix=z/ >actual &&
-	check_prefix actual z/file0 b/file0
+ok 15 - remerge-diff turns off history simplification
 
-ok 222 - diff --src-prefix overrides diff.srcPrefix
+expecting success of 4069.16 'remerge-diff with --reverse': 
+	git log -1 --remerge-diff --oneline ab_resolution^ >expect &&
+	git log -1 --remerge-diff --oneline ab_resolution >>expect &&
+	git log -2 --remerge-diff --oneline ab_resolution --reverse >actual &&
+	test_cmp expect actual
 
-expecting success of 4013.223 'diff --dst-prefix overrides diff.dstPrefix': 
-	git -c diff.dstPrefix=y/ diff --dst-prefix=z/ >actual &&
-	check_prefix actual a/file0 z/file0
+ok 16 - remerge-diff with --reverse
 
-ok 223 - diff --dst-prefix overrides diff.dstPrefix
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4068-diff-symmetric-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 4013.224 'diff.{src,dst}Prefix ignored with diff.noPrefix': 
-	git -c diff.dstPrefix=y/ -c diff.srcPrefix=x/ -c diff.noPrefix diff >actual &&
-	check_prefix actual file0 file0
+[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
 
-ok 224 - diff.{src,dst}Prefix ignored with diff.noPrefix
+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 4013.225 'diff.{src,dst}Prefix ignored with diff.mnemonicPrefix': 
-	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ -c diff.mnemonicPrefix diff >actual &&
-	check_prefix actual i/file0 w/file0
+ok 2 - diff with one merge base
 
-ok 225 - diff.{src,dst}Prefix ignored with diff.mnemonicPrefix
+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 4013.226 'diff.{src,dst}Prefix ignored with --default-prefix': 
-	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ diff --default-prefix >actual &&
-	check_prefix actual a/file0 b/file0
+ok 3 - diff with two merge bases
 
-ok 226 - diff.{src,dst}Prefix ignored with --default-prefix
+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 4013.227 'diff --no-renames cannot be abbreviated': 
-	test_expect_code 129 git diff --no-rename >actual 2>error &&
-	test_must_be_empty actual &&
-	grep "invalid option: --no-rename" error
+fatal: br2...br3: no merge base
+ok 4 - diff with no merge bases
 
-error: invalid option: --no-rename
-ok 227 - diff --no-renames cannot be abbreviated
+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
 
-# passed all 227 test(s)
-1..227
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4115-apply-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4115-apply-symlink/.git/
-expecting success of 4115.1 'setup': 
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 5 - diff with too many symmetric differences
 
-	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
-	git commit -m initial &&
+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
 
-	git branch side &&
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 6 - diff with symmetric difference and extraneous arg
 
-	rm -f link? &&
+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
 
-	test_ln_s_add htap6 link1 &&
-	git commit -m second &&
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 7 - diff with two ranges
 
-	git diff-tree -p HEAD^ HEAD >patch  &&
-	git apply --stat --summary 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
 
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 8 - diff with ranges and extra arg
 
-checking prerequisite: SYMLINKS
+expecting success of 4068.9 'diff --merge-base with no commits': 
+	test_must_fail git diff --merge-base
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+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>
 
-)
-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
+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.
 
-expecting success of 4115.2 'apply symlink patch': 
+ok 9 - diff --merge-base with no commits
 
-	git checkout side &&
-	git apply patch &&
-	git diff-files -p >patched &&
-	test_cmp patch patched
+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
 
-Switched to branch 'side'
-ok 2 - apply symlink patch
+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 4115.3 'apply --index symlink patch': 
+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
 
-	git checkout -f side &&
-	git apply --index patch &&
-	git diff-index --cached -p HEAD >patched &&
-	test_cmp patch patched
+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
 
-Already on 'side'
-ok 3 - apply --index symlink patch
+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 4115.4 'symlink setup': 
-	ln -s .git symlink &&
-	git add symlink &&
-	git commit -m "add symlink"
+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
 
-[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 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 4115.5 'symlink escape when creating new files': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
+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
 
-	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
+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
 
-	test_must_fail git apply patch 2>stderr &&
-	cat >expected_stderr <<-EOF &&
-	error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
-	EOF
-	test_cmp expected_stderr stderr &&
-	test_path_is_missing .git/create-me
+expecting success of 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
 
-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 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 4115.6 'symlink escape when modifying file': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
-	touch .git/modify-me &&
+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
 
-	cat >patch <<-EOF &&
-	diff --git a/symlink b/renamed-symlink
-	similarity index 100%
-	rename from symlink
-	rename to renamed-symlink
-	--
-	diff --git a/renamed-symlink/modify-me b/renamed-symlink/modify-me
-	index 1111111..2222222 100644
-	--- a/renamed-symlink/modify-me
-	+++ b/renamed-symlink/modify-me
-	@@ -0,0 +1,1 @@
-	+busted
-	EOF
+expecting success of 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
 
-	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
+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
 
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing stderr
-ok 6 - symlink escape when modifying file
+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 4115.7 'symlink escape when deleting file': 
-	test_when_finished "git reset --hard && git clean -dfx && rm .git/delete-me" &&
-	touch .git/delete-me &&
+expecting success of 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
 
-	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 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
 
-	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
+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
 
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing stderr
-ok 7 - symlink escape when deleting file
+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 4115.8 '--reject removes .rej symlink if it exists': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
+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
 
-	test_commit file &&
-	echo modified >file.t &&
-	git diff -- file.t >patch &&
-	echo modified-again >file.t &&
+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
 
-	ln -s foo file.t.rej &&
-	test_must_fail git apply patch --reject 2>err &&
-	test_grep "Rejected hunk" err &&
-	test_path_is_missing foo &&
-	test_path_is_file file.t.rej
+expecting success of 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
 
-[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
+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
 
-# passed all 8 test(s)
-1..8
+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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4111-apply-subdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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" &&
+*** t4067-diff-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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" &&
 
-	echo 1 >preimage &&
-	printf "%s\n" 1 2 >postimage &&
-	echo 3 >other &&
+	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_tick &&
-	git commit --allow-empty -m basis
+	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 &&
 
-[master (root-commit) 2fa880c] basis
- Author: A U Thor <author@example.com>
-ok 1 - setup
+	# 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
 
-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
-	}
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 2 - setup: subdir
+    x
 
-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
+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
 
-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 4067.2 'diff batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
 
-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
+	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 &&
 
-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
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
 
-expecting success of 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
+	# 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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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
-	)
+expecting success of 4067.3 'diff skips same-OID blobs': 
+	test_when_finished "rm -rf server client trace" &&
 
-error: corrupt patch at line 4
-ok 6 - apply half-broken patch from subdir of toplevel
+	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 &&
 
-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
+	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 &&
 
-ok 7 - apply from .git dir
+	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 &&
 
-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
+	# 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
 
-ok 8 - apply from subdir of .git dir
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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
+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 &&
 
-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
+	test_create_repo sub &&
+	test_commit -C sub first &&
 
-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
+	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 &&
 
-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
+	test_commit -C server/sub second &&
+	echo another-a >server/a &&
+	git -C server add a sub &&
+	git -C server commit -m x &&
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4120-apply-popt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	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 &&
 
-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
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
 
-expecting success of 4120.2 'apply git diff with -p2': 
-	cp file1.saved file1 &&
-	git apply -p2 patch.file
+	# 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
 
-ok 2 - apply git diff with -p2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t4067-diff-partial-clone/server/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4067-diff-partial-clone/server/sub'...
+[master (root-commit) eff6a2b] 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 0f46ae5] 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 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
+expecting success of 4067.5 'diff with rename detection batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
 
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 3 - apply with too large -p
+	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 &&
 
-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_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
 
-	cp file1.saved file1 &&
-	git apply -p2 patch.quotes &&
-	test_cmp expected file1
+	# 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
 
-ok 4 - apply (-p2) traditional diff with funny filenames
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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
+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" &&
 
-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
+	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 &&
 
-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
+	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 &&
 
-ok 6 - apply (-p2) diff, mode change only
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace
 
-checking prerequisite: FILEMODE
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
+expecting success of 4067.7 'diff --break-rewrites fetches only if necessary, and batches blobs if it does': 
+	test_when_finished "rm -rf server client trace" &&
 
-)
-prerequisite FILEMODE ok
-expecting success of 4120.7 'file mode was changed': 
-	test -x file1
+	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 &&
 
-ok 7 - file mode was changed
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
 
-expecting success of 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 &&
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace &&
 
-	cp file1.saved file1 &&
-	rm -f file2 &&
-	git apply -p2 patch.rename &&
-	test_cmp expected file2
+	# 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
 
-ok 8 - apply (-p2) diff, rename
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8 test(s)
-1..8
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4121-apply-diffs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4121-apply-diffs/.git/
-expecting success of 4121.1 'setup': git add file &&
-	git commit -q -m 1 &&
-	git checkout -b test &&
-	mv file file.tmp &&
-	echo 0 >file &&
-	cat file.tmp >>file &&
-	rm file.tmp &&
-	git commit -a -q -m 2 &&
-	echo 9 >>file &&
-	git commit -a -q -m 3 &&
-	git checkout main
-Switched to a new branch 'test'
-Switched to branch 'main'
-ok 1 - setup
+*** t4107-apply-ignore-whitespace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4107-apply-ignore-whitespace/.git/
+expecting success of 4107.1 'file creation': 
+	git apply patch1.patch
 
-expecting success of 4121.2 'check if contextually independent diffs for the same file apply': ( git diff test~2 test~1 && git diff test~1 test~0 )| git apply
-ok 2 - check if contextually independent diffs for the same file apply
+ok 1 - file creation
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4119-apply-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 4107.2 'patch2 fails (retab)': 
+	test_must_fail git apply patch2.patch
 
-ok 1 - setup
+error: patch failed: main.c:10
+error: main.c: patch does not apply
+ok 2 - patch2 fails (retab)
 
-expecting success of 4119.2 'apply --whitespace=strip': 
+expecting success of 4107.3 'patch2 applies with --ignore-whitespace': 
+	git apply --ignore-whitespace patch2.patch
 
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+ok 3 - patch2 applies with --ignore-whitespace
 
-	git apply --whitespace=strip patch.file &&
-	check_result sub/file1
+expecting success of 4107.4 'patch2 reverse applies with --ignore-space-change': 
+	git apply -R --ignore-space-change patch2.patch
 
-patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 2 - apply --whitespace=strip
+ok 4 - patch2 reverse applies with --ignore-space-change
 
-expecting success of 4119.3 'apply --whitespace=strip from config': 
+expecting success of 4107.5 'patch2 applies (apply.ignorewhitespace = change)': 
+	git apply patch2.patch &&
+	test_cmp main.c.final main.c
 
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+ok 5 - patch2 applies (apply.ignorewhitespace = change)
 
-	git config apply.whitespace strip &&
-	git apply patch.file &&
-	check_result sub/file1
+expecting success of 4107.6 'patch3 fails (missing string at EOL)': 
+	test_must_fail git apply patch3.patch
 
-patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 3 - apply --whitespace=strip from config
+error: patch failed: main.c:10
+error: main.c: patch does not apply
+ok 6 - patch3 fails (missing string at EOL)
 
-expecting success of 4119.4 'apply --whitespace=strip in subdir': 
+expecting success of 4107.7 'patch4 fails (missing EOL at EOF)': 
+	test_must_fail git apply patch4.patch
 
-	cd "$D" &&
-	git config --unset-all apply.whitespace &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+error: patch failed: main.c:21
+error: main.c: patch does not apply
+ok 7 - patch4 fails (missing EOL at EOF)
 
-	cd sub &&
-	git apply --whitespace=strip ../patch.file &&
-	check_result file1
+expecting success of 4107.8 'patch5 fails (leading whitespace differences matter)': 
+	test_must_fail git apply patch5.patch
 
-sub/../patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 4 - apply --whitespace=strip in subdir
+error: patch failed: main.c:2
+error: main.c: patch does not apply
+ok 8 - patch5 fails (leading whitespace differences matter)
 
-expecting success of 4119.5 'apply --whitespace=strip from config in subdir': 
+expecting success of 4107.9 're-create file (with --ignore-whitespace)': 
+	rm -f main.c &&
+	git apply patch1.patch
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+ok 9 - re-create file (with --ignore-whitespace)
 
-	cd sub &&
-	git apply ../patch.file &&
-	check_result file1
+expecting success of 4107.10 'patch5 fails (--no-ignore-whitespace)': 
+	test_must_fail git apply --no-ignore-whitespace patch5.patch
 
-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
+error: patch failed: main.c:2
+error: main.c: patch does not apply
+ok 10 - patch5 fails (--no-ignore-whitespace)
 
-expecting success of 4119.6 'same in subdir but with traditional patch input': 
+expecting success of 4107.11 'apply --ignore-space-change --inaccurate-eof': 
+	echo 1 >file &&
+	git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
+	diff --git a/file b/file
+	--- a/file
+	+++ b/file
+	@@ -1 +1 @@
+	-1
+	+2
+	EOF
+	printf 2 >expect &&
+	test_cmp expect file
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+ok 11 - apply --ignore-space-change --inaccurate-eof
 
-	cd sub &&
-	git apply ../gpatch.file &&
-	check_result file1
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4109-apply-multifrag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-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
+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 4119.7 'same but with traditional patch input of depth 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
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+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)
 
-	cd sub &&
-	git apply ../gpatch-sub.file &&
-	check_result file1
+expecting success of 4109.3 'git apply (3)': 
+	git apply patch1.patch patch4.patch &&
+	test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
 
-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
+patch1.patch:28: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+ok 3 - git apply (3)
 
-expecting success of 4119.8 'same but with traditional patch input of depth 2': 
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4103-apply-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+	git update-index --add --remove file1 file2 file4 &&
+	git commit -m "Initial Version" 2>/dev/null &&
 
-	cd sub &&
-	git apply ../gpatch-ab-sub.file &&
-	check_result file1
+	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" &&
 
-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
+	git diff-tree -p main binary >B.diff &&
+	git diff-tree -p -C main binary >C.diff &&
 
-expecting success of 4119.9 'same but with traditional patch input of depth 1': 
+	git diff-tree -p --binary main binary >BF.diff &&
+	git diff-tree -p --binary -C main binary >CF.diff &&
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+	git diff-tree -p --full-index main binary >B-index.diff &&
+	git diff-tree -p -C --full-index main binary >C-index.diff &&
 
-	git apply -p0 gpatch-sub.file &&
-	check_result sub/file1
+	git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
 
-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
+	git init other-repo &&
+	(
+		cd other-repo &&
+		git fetch .. main &&
+		git reset --hard FETCH_HEAD
+	)
 
-expecting success of 4119.10 'same but with traditional patch input of depth 2': 
+[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.48.0~rc1+next.20250101/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.
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+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.
 
-	git apply gpatch-ab-sub.file &&
-	check_result sub/file1
+expecting success of 4103.15 'apply binary diff with full-index': 
+	do_reset &&
+	git apply B-index.diff
 
-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
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 15 - apply binary diff with full-index
 
-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 &&
+expecting success of 4103.16 'apply binary diff with full-index (copy)': 
+	do_reset &&
+	git apply C-index.diff
 
-	cd sub &&
-	git apply ../gpatch.file &&
-	echo "B " >expect &&
-	test_cmp expect file1
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 16 - apply binary diff with full-index (copy)
 
-ok 11 - in subdir with traditional patch input
+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)
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4114-apply-typechange.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4114-apply-typechange/.git/
-expecting success of 4114.1 'setup repository and commits': 
-	echo "hello world" > foo &&
-	echo "hi planet" > bar &&
-	git update-index --add foo bar &&
-	git commit -m initial &&
-	git branch initial &&
-	rm -f foo &&
-	test_ln_s_add bar foo &&
-	git commit -m "foo symlinked to bar" &&
-	git branch foo-symlinked-to-bar &&
-	git rm -f foo &&
-	echo "how far is the sun?" > foo &&
-	git update-index --add foo &&
-	git commit -m "foo back to file" &&
-	git branch foo-back-to-file &&
-	printf "\0" > foo &&
-	git update-index foo &&
-	git commit -m "foo becomes binary" &&
-	git branch foo-becomes-binary &&
-	rm -f foo &&
-	git update-index --remove foo &&
-	mkdir foo &&
-	echo "if only I knew" > foo/baz &&
-	git update-index --add foo/baz &&
-	git commit -m "foo becomes a directory" &&
-	git branch "foo-becomes-a-directory" &&
-	echo "hello world" > foo/baz &&
-	git update-index foo/baz &&
-	git commit -m "foo/baz is the original foo" &&
-	git branch foo-baz-renamed-from-foo
-	
-[master (root-commit) 8d5a53c] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-checking prerequisite: SYMLINKS
+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
 
-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 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.
 
-)
-prerequisite SYMLINKS ok
-[master 2b1a969] foo symlinked to bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100644 => 120000 foo
-rm 'foo'
-[master 41a0307] foo back to file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 120000 => 100644 foo
-[master bd76368] foo becomes binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master 918d519] foo becomes a directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- delete mode 100644 foo
- create mode 100644 foo/baz
-[master 5d696d0] foo/baz is the original foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup repository and commits
+expecting success of 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 4114.2 'file renamed from foo to foo/baz': 
-	git checkout -f initial &&
-	git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
-	git apply --index < patch
-	
-Switched to branch 'initial'
-ok 2 - file renamed from foo to foo/baz
+expecting success of 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 4114.3 'file renamed from foo/baz to foo': 
-	git checkout -f foo-baz-renamed-from-foo &&
-	git diff-tree -M -p HEAD initial > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-baz-renamed-from-foo'
-ok 3 - file renamed from foo/baz to foo
+expecting success of 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 4114.4 'directory becomes file': 
-	git checkout -f foo-becomes-a-directory &&
-	git diff-tree -p HEAD initial > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-becomes-a-directory'
-ok 4 - directory becomes file
+expecting success of 4103.22 'apply binary -p0 diff': 
+	do_reset &&
+	git apply -p0 --index B0.diff &&
+	test -z "$(git diff --name-status binary -- file3)"
 
-expecting success of 4114.5 'file becomes directory': 
-	git checkout -f initial &&
-	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
-	git apply --index < patch
-	
-Switched to branch 'initial'
-ok 5 - file becomes directory
+HEAD is now at 8985c5f Initial Version
+Already on 'main'
+ok 22 - apply binary -p0 diff
 
-expecting success of 4114.6 'file becomes symlink': 
-	git checkout -f initial &&
-	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
-	git apply --index < patch
-	
-Already on 'initial'
-ok 6 - file becomes symlink
+expecting success of 4103.23 'reject truncated binary diff': 
+	do_reset &&
 
-expecting success of 4114.7 'symlink becomes file': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p HEAD foo-back-to-file > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-symlinked-to-bar'
-ok 7 - symlink becomes file
+	# 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 &&
 
-expecting success of 4114.8 'symlink becomes file, in reverse': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p HEAD foo-back-to-file > patch &&
-	git checkout foo-back-to-file &&
-	git apply -R --index < patch
-	
-Already on 'foo-symlinked-to-bar'
-Switched to branch 'foo-back-to-file'
-ok 8 - symlink becomes file, in reverse
+	# 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 &&
 
-expecting success of 4114.9 'binary file becomes symlink': 
-	git checkout -f foo-becomes-binary &&
-	git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-becomes-binary'
-ok 9 - binary file becomes symlink
+	do_reset &&
+	test_must_fail git apply patch.trunc
 
-expecting success of 4114.10 'symlink becomes binary file': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-symlinked-to-bar'
-ok 10 - symlink becomes binary file
+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
 
-expecting success of 4114.11 'symlink becomes directory': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
-	git apply --index < patch
-	
-Already on 'foo-symlinked-to-bar'
-ok 11 - symlink becomes directory
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4110-apply-scan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4110-apply-scan/.git/
+expecting success of 4110.1 'git apply scan': 
+	git apply \
+		"$TEST_DIRECTORY/t4110/patch1.patch" \
+		"$TEST_DIRECTORY/t4110/patch2.patch" \
+		"$TEST_DIRECTORY/t4110/patch3.patch" \
+		"$TEST_DIRECTORY/t4110/patch4.patch" \
+		"$TEST_DIRECTORY/t4110/patch5.patch" &&
+	test_cmp new.txt "$TEST_DIRECTORY/t4110/expect"
 
-expecting success of 4114.12 'directory becomes symlink': 
-	git checkout -f foo-becomes-a-directory &&
-	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-becomes-a-directory'
-ok 12 - directory becomes symlink
+ok 1 - git apply scan
 
-# passed all 12 test(s)
-1..12
+# passed all 1 test(s)
+1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4014-format-patch.sh ***
@@ -267555,8 +261364,8 @@
 	! test_cmp fail actual2
 
 Switched to branch 'patchid'
---- fail	2025-02-09 06:54:32.241892794 +0000
-+++ actual1	2025-02-09 06:54:32.185892437 +0000
+--- fail	2026-03-14 13:31:02.290677808 +0000
++++ actual1	2026-03-14 13:31:01.962677808 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -267567,8 +261376,8 @@
  -- 
  2.48.0.rc1.219.gb6b6757d772
  
---- fail	2025-02-09 06:54:32.241892794 +0000
-+++ actual2	2025-02-09 06:54:32.189892463 +0000
+--- fail	2026-03-14 13:31:02.290677808 +0000
++++ actual2	2026-03-14 13:31:02.010677808 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -268040,3483 +261849,9295 @@
 1..212
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4018-diff-funcname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.*" &&
+*** t4112-apply-renames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	# a custom pattern which matches to end of line
-	git config diff.custom2.funcname "......Beer\$" &&
+expecting success of 4112.2 'apply rename/copy patch': git apply --index patch
+ok 2 - apply rename/copy patch
 
-	# alternation in pattern
-	git config diff.custom3.funcname "Beer$" &&
-	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4104-apply-boundary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4104-apply-boundary/.git/
+expecting success of 4104.1 'setup': 
+	test_write_lines b $L y >victim &&
+	cat victim >original &&
+	git update-index --add victim &&
 
-	# for regexp compilation tests
-	echo A >A.java &&
-	echo B >B.java
+	# add to the head
+	test_write_lines a b $L y >victim &&
+	cat victim >add-a-expect &&
+	git diff victim >add-a-patch.with &&
+	git diff --unified=0 >add-a-patch.without &&
+
+	# insert at line two
+	test_write_lines b a $L y >victim &&
+	cat victim >insert-a-expect &&
+	git diff victim >insert-a-patch.with &&
+	git diff --unified=0 >insert-a-patch.without &&
+
+	# modify at the head
+	test_write_lines a $L y >victim &&
+	cat victim >mod-a-expect &&
+	git diff victim >mod-a-patch.with &&
+	git diff --unified=0 >mod-a-patch.without &&
+
+	# remove from the head
+	test_write_lines $L y >victim &&
+	cat victim >del-a-expect &&
+	git diff victim >del-a-patch.with &&
+	git diff --unified=0 >del-a-patch.without &&
+
+	# add to the tail
+	test_write_lines b $L y z >victim &&
+	cat victim >add-z-expect &&
+	git diff victim >add-z-patch.with &&
+	git diff --unified=0 >add-z-patch.without &&
+
+	# modify at the tail
+	test_write_lines b $L z >victim &&
+	cat victim >mod-z-expect &&
+	git diff victim >mod-z-patch.with &&
+	git diff --unified=0 >mod-z-patch.without &&
+
+	# remove from the tail
+	test_write_lines b $L >victim &&
+	cat victim >del-z-expect &&
+	git diff victim >del-z-patch.with &&
+	git diff --unified=0 >del-z-patch.without
+
+	# done
 
 ok 1 - setup
 
-expecting success of 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 4104.2 'apply add-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 2 - apply add-a-patch with context
 
-	# 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 4104.3 'apply add-z-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 3 - apply add-z-patch with context
 
-ok 2 - setup: test-tool userdiff
+expecting success of 4104.4 'apply insert-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 4 - apply insert-a-patch with context
 
-expecting success of 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 4104.5 'apply mod-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 5 - apply mod-a-patch with context
 
-expecting success of 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 4104.6 'apply mod-z-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 6 - apply mod-z-patch with context
 
-expecting success of 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 4104.7 'apply del-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 7 - apply del-a-patch with context
 
-expecting success of 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 4104.8 'apply del-z-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 8 - apply del-z-patch with context
 
-expecting success of 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 4104.9 'apply add-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 9 - apply add-a-patch without context
 
-expecting success of 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 4104.10 'apply add-z-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 10 - apply add-z-patch without context
 
-expecting success of 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 4104.11 'apply insert-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 11 - apply insert-a-patch without context
 
-expecting success of 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 4104.12 'apply mod-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 12 - apply mod-a-patch without context
 
-expecting success of 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 4104.13 'apply mod-z-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 13 - apply mod-z-patch without context
 
-expecting success of 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 4104.14 'apply del-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 14 - apply del-a-patch without context
 
-expecting success of 4018.13 'builtin cpp wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 13 - builtin cpp wordRegex pattern compiles
+expecting success of 4104.15 'apply del-z-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 15 - apply del-z-patch without context
 
-expecting success of 4018.14 'builtin cpp pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4104.16 'apply non-git add-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 421387d] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 41525d0] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 14 - builtin cpp pattern compiles on bare repo with --attr-source
+ok 16 - apply non-git add-a-patch without context
 
-expecting success of 4018.15 'builtin csharp pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4104.17 'apply non-git add-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 15 - builtin csharp pattern compiles
+ok 17 - apply non-git add-z-patch without context
 
-expecting success of 4018.16 'builtin csharp wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4104.18 'apply non-git insert-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 16 - builtin csharp wordRegex pattern compiles
+ok 18 - apply non-git insert-a-patch without context
 
-expecting success of 4018.17 'builtin csharp pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4104.19 'apply non-git mod-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 1baa7f2] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA c0f2914] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 17 - builtin csharp pattern compiles on bare repo with --attr-source
+ok 19 - apply non-git mod-a-patch without context
 
-expecting success of 4018.18 'builtin css pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4104.20 'apply non-git mod-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 18 - builtin css pattern compiles
+ok 20 - apply non-git mod-z-patch without context
 
-expecting success of 4018.19 'builtin css wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4104.21 'apply non-git del-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 19 - builtin css wordRegex pattern compiles
+ok 21 - apply non-git del-a-patch without context
 
-expecting success of 4018.20 'builtin css pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4104.22 'apply non-git del-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 5bdd255] changing gitattributes
+ok 22 - apply non-git del-z-patch without context
+
+expecting success of 4104.23 'two lines': 
+	>file &&
+	git add file &&
+	echo aaa >file &&
+	git diff >patch &&
+	git add file &&
+	echo bbb >file &&
+	git add file &&
+	test_must_fail git apply --check patch
+
+error: patch failed: file:0
+error: file: patch does not apply
+ok 23 - two lines
+
+expecting success of 4104.24 'apply patch with 3 context lines matching at end': 
+	test_write_lines a b c d >file &&
+	git add file &&
+	echo e >>file &&
+	git diff >patch &&
+	>file &&
+	test_must_fail git apply patch
+
+error: patch failed: file:2
+error: file: patch does not apply
+ok 24 - apply patch with 3 context lines matching at end
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4113-apply-ending.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4060-diff-submodule-option-diff-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/.git/
+expecting success of 4060.1 'setup repository': 
+	test_create_repo sm1 &&
+	add_file . foo &&
+	head1=$(add_file sm1 foo1 foo2) &&
+	fullhead1=$(git -C sm1 rev-parse --verify HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
+36d39d8
+ok 1 - setup repository
+
+expecting success of 4060.2 'added submodule': 
+	git add sm1 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	new file mode 100644
+	index 0000000..1715acd
+	--- /dev/null
+	+++ b/sm1/foo1
+	@@ -0,0 +1 @@
+	+foo1
+	diff --git a/sm1/foo2 b/sm1/foo2
+	new file mode 100644
+	index 0000000..54b060e
+	--- /dev/null
+	+++ b/sm1/foo2
+	@@ -0,0 +1 @@
+	+foo2
+	EOF
+	diff_cmp expected actual
+
+warning: adding embedded git repository: sm1
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm1
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm1
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 2 - added submodule
+
+expecting success of 4060.3 'added submodule, set diff.submodule': 
+	test_config diff.submodule log &&
+	git add sm1 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	new file mode 100644
+	index 0000000..1715acd
+	--- /dev/null
+	+++ b/sm1/foo1
+	@@ -0,0 +1 @@
+	+foo1
+	diff --git a/sm1/foo2 b/sm1/foo2
+	new file mode 100644
+	index 0000000..54b060e
+	--- /dev/null
+	+++ b/sm1/foo2
+	@@ -0,0 +1 @@
+	+foo2
+	EOF
+	diff_cmp expected actual
+
+ok 3 - added submodule, set diff.submodule
+
+expecting success of 4060.4 '--submodule=short overrides diff.submodule': 
+	test_config diff.submodule log &&
+	git add sm1 &&
+	git diff --submodule=short --cached >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	new file mode 160000
+	index 0000000..$head1
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead1
+	EOF
+	diff_cmp expected actual
+
+ok 4 - --submodule=short overrides diff.submodule
+
+expecting success of 4060.5 'diff.submodule does not affect plumbing': 
+	test_config diff.submodule log &&
+	git diff-index -p HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	new file mode 160000
+	index 0000000..$head1
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead1
+	EOF
+	diff_cmp expected actual
+
+ok 5 - diff.submodule does not affect plumbing
+
+expecting success of 4060.6 'modified submodule(forward)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	diff --git a/sm1/foo3 b/sm1/foo3
+	new file mode 100644
+	index 0000000..c1ec6c6
+	--- /dev/null
+	+++ b/sm1/foo3
+	@@ -0,0 +1 @@
+	+foo3
+	EOF
+	diff_cmp expected actual
+
+ok 6 - modified submodule(forward)
+
+expecting success of 4060.7 'modified submodule(forward)': 
+	git diff --submodule=diff >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	diff --git a/sm1/foo3 b/sm1/foo3
+	new file mode 100644
+	index 0000000..c1ec6c6
+	--- /dev/null
+	+++ b/sm1/foo3
+	@@ -0,0 +1 @@
+	+foo3
+	EOF
+	diff_cmp expected actual
+
+ok 7 - modified submodule(forward)
+
+expecting success of 4060.8 'modified submodule(forward) --submodule': 
+	git diff --submodule >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	diff_cmp expected actual
+
+ok 8 - modified submodule(forward) --submodule
+
+expecting success of 4060.9 'modified submodule(forward) --submodule=short': 
+	git diff --submodule=short >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	index $head1..$head2 160000
+	--- a/sm1
+	+++ b/sm1
+	@@ -1 +1 @@
+	-Subproject commit $fullhead1
+	+Subproject commit $fullhead2
+	EOF
+	diff_cmp expected actual
+
+ok 9 - modified submodule(forward) --submodule=short
+
+expecting success of 4060.10 'modified submodule(backward)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2..$head3 (rewind):
+	diff --git a/sm1/foo2 b/sm1/foo2
+	deleted file mode 100644
+	index 54b060e..0000000
+	--- a/sm1/foo2
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo2
+	diff --git a/sm1/foo3 b/sm1/foo3
+	deleted file mode 100644
+	index c1ec6c6..0000000
+	--- a/sm1/foo3
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo3
+	EOF
+	diff_cmp expected actual
+
+ok 10 - modified submodule(backward)
+
+expecting success of 4060.11 'modified submodule(backward and forward)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2...$head4:
+	diff --git a/sm1/foo2 b/sm1/foo2
+	deleted file mode 100644
+	index 54b060e..0000000
+	--- a/sm1/foo2
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo2
+	diff --git a/sm1/foo3 b/sm1/foo3
+	deleted file mode 100644
+	index c1ec6c6..0000000
+	--- a/sm1/foo3
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo3
+	diff --git a/sm1/foo4 b/sm1/foo4
+	new file mode 100644
+	index 0000000..a0016db
+	--- /dev/null
+	+++ b/sm1/foo4
+	@@ -0,0 +1 @@
+	+foo4
+	diff --git a/sm1/foo5 b/sm1/foo5
+	new file mode 100644
+	index 0000000..d6f2413
+	--- /dev/null
+	+++ b/sm1/foo5
+	@@ -0,0 +1 @@
+	+foo5
+	EOF
+	diff_cmp expected actual
+
+ok 11 - modified submodule(backward and forward)
+
+expecting success of 4060.12 'typechanged submodule(submodule->blob), --cached': 
+	git diff --submodule=diff --cached >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	deleted file mode 100644
+	index 1715acd..0000000
+	--- a/sm1/foo1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo1
+	diff --git a/sm1/foo4 b/sm1/foo4
+	deleted file mode 100644
+	index a0016db..0000000
+	--- a/sm1/foo4
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo4
+	diff --git a/sm1/foo5 b/sm1/foo5
+	deleted file mode 100644
+	index d6f2413..0000000
+	--- a/sm1/foo5
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo5
+	diff --git a/sm1 b/sm1
+	new file mode 100644
+	index 0000000..9da5fb8
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+sm1
+	EOF
+	diff_cmp expected actual
+
+ok 12 - typechanged submodule(submodule->blob), --cached
+
+expecting success of 4060.13 'typechanged submodule(submodule->blob)': 
+	git diff --submodule=diff >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 100644
+	index 9da5fb8..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-sm1
+	Submodule sm1 0000000...$head4 (new submodule)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	new file mode 100644
+	index 0000000..1715acd
+	--- /dev/null
+	+++ b/sm1/foo1
+	@@ -0,0 +1 @@
+	+foo1
+	diff --git a/sm1/foo4 b/sm1/foo4
+	new file mode 100644
+	index 0000000..a0016db
+	--- /dev/null
+	+++ b/sm1/foo4
+	@@ -0,0 +1 @@
+	+foo4
+	diff --git a/sm1/foo5 b/sm1/foo5
+	new file mode 100644
+	index 0000000..d6f2413
+	--- /dev/null
+	+++ b/sm1/foo5
+	@@ -0,0 +1 @@
+	+foo5
+	EOF
+	diff_cmp expected actual
+
+ok 13 - typechanged submodule(submodule->blob)
+
+expecting success of 4060.14 'typechanged submodule(submodule->blob)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	diff --git a/sm1 b/sm1
+	new file mode 100644
+	index 0000000..9da5fb8
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+sm1
+	EOF
+	diff_cmp expected actual
+
+ok 14 - typechanged submodule(submodule->blob)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
+expecting success of 4060.15 'nonexistent commit': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...$head6 (commits not present)
+	EOF
+	diff_cmp expected actual
+
+ok 15 - nonexistent commit
+
+expecting success of 4060.16 'typechanged submodule(blob->submodule)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 100644
+	index 9da5fb8..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-sm1
+	Submodule sm1 0000000...$head6 (new submodule)
+	diff --git a/sm1/foo6 b/sm1/foo6
+	new file mode 100644
+	index 0000000..462398b
+	--- /dev/null
+	+++ b/sm1/foo6
+	@@ -0,0 +1 @@
+	+foo6
+	diff --git a/sm1/foo7 b/sm1/foo7
+	new file mode 100644
+	index 0000000..6e9262c
+	--- /dev/null
+	+++ b/sm1/foo7
+	@@ -0,0 +1 @@
+	+foo7
+	EOF
+	diff_cmp expected actual
+
+ok 16 - typechanged submodule(blob->submodule)
+
+expecting success of 4060.17 'submodule is up to date': 
+	head7=$(git -C sm1 rev-parse --short --verify HEAD) &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 17 - submodule is up to date
+
+expecting success of 4060.18 'submodule contains untracked content': 
+	echo new > sm1/new-file &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	EOF
+	diff_cmp expected actual
+
+ok 18 - submodule contains untracked content
+
+expecting success of 4060.19 'submodule contains untracked content (untracked ignored)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 19 - submodule contains untracked content (untracked ignored)
+
+expecting success of 4060.20 'submodule contains untracked content (dirty ignored)': 
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 20 - submodule contains untracked content (dirty ignored)
+
+expecting success of 4060.21 'submodule contains untracked content (all ignored)': 
+	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 21 - submodule contains untracked content (all ignored)
+
+expecting success of 4060.22 'submodule contains untracked and modified content': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 22 - submodule contains untracked and modified content
+
+expecting success of 4060.23 'submodule contains untracked and modified content (untracked ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 23 - submodule contains untracked and modified content (untracked ignored)
+
+expecting success of 4060.24 'submodule contains untracked and modified content (dirty ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 24 - submodule contains untracked and modified content (dirty ignored)
+
+expecting success of 4060.25 'submodule contains untracked and modified content (all ignored)': 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 25 - submodule contains untracked and modified content (all ignored)
+
+expecting success of 4060.26 'submodule contains modified content': 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 26 - submodule contains modified content
+
+expecting success of 4060.27 'submodule is modified': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 27 - submodule is modified
+
+expecting success of 4060.28 'modified submodule contains untracked content': 
+	echo new > sm1/new-file &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 28 - modified submodule contains untracked content
+
+expecting success of 4060.29 'modified submodule contains untracked content (untracked ignored)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 29 - modified submodule contains untracked content (untracked ignored)
+
+expecting success of 4060.30 'modified submodule contains untracked content (dirty ignored)': 
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 30 - modified submodule contains untracked content (dirty ignored)
+
+expecting success of 4060.31 'modified submodule contains untracked content (all ignored)': 
+	git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 31 - modified submodule contains untracked content (all ignored)
+
+expecting success of 4060.32 'modified submodule contains untracked and modified content': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..dfda541 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1,2 @@
+	-foo6
+	+new
+	+modification
+	EOF
+	diff_cmp expected actual
+
+ok 32 - modified submodule contains untracked and modified content
+
+expecting success of 4060.33 'modified submodule contains untracked and modified content (untracked ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..e20e2d9 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1,3 @@
+	-foo6
+	+new
+	+modification
+	+modification
+	EOF
+	diff_cmp expected actual
+
+ok 33 - modified submodule contains untracked and modified content (untracked ignored)
+
+expecting success of 4060.34 'modified submodule contains untracked and modified content (dirty ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..3e75765 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1 @@
+	-foo6
+	+new
+	EOF
+	diff_cmp expected actual
+
+ok 34 - modified submodule contains untracked and modified content (dirty ignored)
+
+expecting success of 4060.35 'modified submodule contains untracked and modified content (all ignored)': 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
+	test_must_be_empty actual
+
+ok 35 - modified submodule contains untracked and modified content (all ignored)
+
+expecting success of 4060.36 'modified submodule contains modified content': 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head7..$head8:
+	diff --git a/sm1/foo6 b/sm1/foo6
+	index 462398b..ac466ca 100644
+	--- a/sm1/foo6
+	+++ b/sm1/foo6
+	@@ -1 +1,5 @@
+	-foo6
+	+new
+	+modification
+	+modification
+	+modification
+	+modification
+	EOF
+	diff_cmp expected actual
+
+ok 36 - modified submodule contains modified content
+
+expecting success of 4060.37 'deleted submodule': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	EOF
+	diff_cmp expected actual
+
+ok 37 - deleted submodule
+
+expecting success of 4060.38 'create second submodule': 
+	test_create_repo sm2 &&
+	head9=$(add_file sm2 foo8 foo9) &&
+	git add sm2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/.git/
+warning: adding embedded git repository: sm2
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm2
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm2
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 38 - create second submodule
+
+expecting success of 4060.39 'multiple submodules': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 39 - multiple submodules
+
+expecting success of 4060.40 'path filter': 
+	git diff-index -p --submodule=diff HEAD sm2 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 40 - path filter
+
+expecting success of 4060.41 'given commit': 
+	git diff-index -p --submodule=diff HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/.gitmodules b/.gitmodules
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "sm2"]
+	+path = sm2
+	+url = bogus_url
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 41 - given commit
+
+expecting success of 4060.42 'setup .git file for sm2': 
+	git submodule absorbgitdirs sm2
+
+Migrating git directory of 'sm2' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/.git/modules/sm2'
+ok 42 - setup .git file for sm2
+
+expecting success of 4060.43 'diff --submodule=diff with .git file': 
+	git diff --submodule=diff HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/.gitmodules b/.gitmodules
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "sm2"]
+	+path = sm2
+	+url = bogus_url
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	diff_cmp expected actual
+
+ok 43 - diff --submodule=diff with .git file
+
+expecting success of 4060.44 'deleted submodule with .git file': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head9...0000000 (submodule deleted)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	EOF
+	diff_cmp expected actual
+
+ok 44 - deleted submodule with .git file
+
+expecting success of 4060.45 'typechanged(submodule->blob) submodule with .git file': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head9...0000000 (submodule deleted)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	diff --git a/sm2 b/sm2
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/sm2
+	@@ -0,0 +1 @@
+	+submodule-to-blob
+	EOF
+	diff_cmp expected actual
+
+ok 45 - typechanged(submodule->blob) submodule with .git file
+
+expecting success of 4060.46 'setup nested submodule': 
+	git -c protocol.file.allow=always -C sm2 submodule add ../sm2 nested &&
+	git -C sm2 commit -a -m "nested sub" &&
+	head10=$(git -C sm2 rev-parse --short --verify HEAD)
+
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4060-diff-submodule-option-diff-format/sm2/nested'...
+done.
+[master 280969a] nested sub
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 54fe80d] changing gitattributes
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested
+ok 46 - setup nested submodule
+
+expecting success of 4060.47 'move nested submodule HEAD': 
+	echo "nested content" >sm2/nested/file &&
+	git -C sm2/nested add file &&
+	git -C sm2/nested commit --allow-empty -m "new HEAD" &&
+	head11=$(git -C sm2/nested rev-parse --short --verify HEAD)
+
+[master b55928c] new HEAD
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 20 - builtin css pattern compiles on bare repo with --attr-source
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 47 - move nested submodule HEAD
 
-expecting success of 4018.21 'builtin dts pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 21 - builtin dts pattern compiles
+expecting success of 4060.48 'diff --submodule=diff with moved nested submodule HEAD': 
+	cat >expected <<-EOF &&
+	Submodule nested $head9..$head11:
+	diff --git a/nested/file b/nested/file
+	new file mode 100644
+	index 0000000..ca281f5
+	--- /dev/null
+	+++ b/nested/file
+	@@ -0,0 +1 @@
+	+nested content
+	EOF
+	git -C sm2 diff --submodule=diff >actual 2>err &&
+	test_must_be_empty err &&
+	diff_cmp expected actual
 
-expecting success of 4018.22 'builtin dts wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 22 - builtin dts wordRegex pattern compiles
+ok 48 - diff --submodule=diff with moved nested submodule HEAD
 
-expecting success of 4018.23 'builtin dts pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master aa94590] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 0284640] changing gitattributes
+expecting success of 4060.49 'diff --submodule=diff recurses into nested submodules': 
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 contains modified content
+	Submodule sm2 $head9..$head10:
+	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
+	new file mode 100644
+	index 0000000..3a816b8
+	--- /dev/null
+	+++ b/sm2/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "nested"]
+	+	path = nested
+	+	url = ../sm2
+	Submodule nested 0000000...$head11 (new submodule)
+	diff --git a/sm2/nested/file b/sm2/nested/file
+	new file mode 100644
+	index 0000000..ca281f5
+	--- /dev/null
+	+++ b/sm2/nested/file
+	@@ -0,0 +1 @@
+	+nested content
+	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
+	new file mode 100644
+	index 0000000..db9916b
+	--- /dev/null
+	+++ b/sm2/nested/foo8
+	@@ -0,0 +1 @@
+	+foo8
+	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
+	new file mode 100644
+	index 0000000..9c3b4f6
+	--- /dev/null
+	+++ b/sm2/nested/foo9
+	@@ -0,0 +1 @@
+	+foo9
+	EOF
+	git diff --submodule=diff >actual 2>err &&
+	test_must_be_empty err &&
+	diff_cmp expected actual
+
+ok 49 - diff --submodule=diff recurses into nested submodules
+
+expecting success of 4060.50 'diff --submodule=diff recurses into deleted nested submodules': 
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head12...0000000 (submodule deleted)
+	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
+	deleted file mode 100644
+	index 3a816b8..0000000
+	--- a/sm2/.gitmodules
+	+++ /dev/null
+	@@ -1,3 +0,0 @@
+	-[submodule "nested"]
+	-	path = nested
+	-	url = ../sm2
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index db9916b..0000000
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 9c3b4f6..0000000
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	Submodule nested $head11...0000000 (submodule deleted)
+	diff --git a/sm2/nested/file b/sm2/nested/file
+	deleted file mode 100644
+	index ca281f5..0000000
+	--- a/sm2/nested/file
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-nested content
+	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
+	deleted file mode 100644
+	index db9916b..0000000
+	--- a/sm2/nested/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
+	deleted file mode 100644
+	index 9c3b4f6..0000000
+	--- a/sm2/nested/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	EOF
+	git diff --submodule=diff >actual 2>err &&
+	test_must_be_empty err &&
+	diff_cmp expected actual
+
+ok 50 - diff --submodule=diff recurses into deleted nested submodules
+
+# passed all 50 test(s)
+1..50
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4118-apply-empty-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4118-apply-empty-context/.git/
+expecting success of 4118.1 'setup': 
+	test_write_lines "" "" A B C "" >file1 &&
+	cat file1 >file1.orig &&
+	{
+		cat file1 &&
+		echo Q | tr -d "\\012"
+	} >file2 &&
+	cat file2 >file2.orig &&
+	git add file1 file2 &&
+	sed -e "/^B/d" <file1.orig >file1 &&
+	cat file1 > file2 &&
+	echo Q | tr -d "\\012" >>file2 &&
+	cat file1 >file1.mods &&
+	cat file2 >file2.mods &&
+	git diff |
+	sed -e "s/^ \$//" >diff.output
+
+ok 1 - setup
+
+expecting success of 4118.2 'apply --numstat': 
+
+	git apply --numstat diff.output >actual &&
+	{
+		echo "0	1	file1" &&
+		echo "0	1	file2"
+	} >expect &&
+	test_cmp expect actual
+
+
+ok 2 - apply --numstat
+
+expecting success of 4118.3 'apply --apply': 
+
+	cat file1.orig >file1 &&
+	cat file2.orig >file2 &&
+	git update-index file1 file2 &&
+	git apply --index diff.output &&
+	test_cmp file1.mods file1 &&
+	test_cmp file2.mods file2
+
+ok 3 - apply --apply
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4117-apply-reject.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4117-apply-reject/.git/
+expecting success of 4117.1 'setup': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 >file1 &&
+	cat file1 >saved.file1 &&
+	git update-index --add file1 &&
+	git commit -m initial &&
+
+	test_write_lines 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21 >file1 &&
+	git diff >patch.1 &&
+	cat file1 >clean &&
+
+	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21 >expected &&
+
+	mv file1 file2 &&
+	git update-index --add --remove file1 file2 &&
+	git diff -M HEAD >patch.2 &&
+
+	rm -f file1 file2 &&
+	mv saved.file1 file1 &&
+	git update-index --add --remove file1 file2 &&
+
+	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21 >file1 &&
+
+	cat file1 >saved.file1
+
+[master (root-commit) 11e450e] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 23 - builtin dts pattern compiles on bare repo with --attr-source
+ 1 file changed, 21 insertions(+)
+ create mode 100644 file1
+ok 1 - setup
 
-expecting success of 4018.24 'builtin elixir pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 24 - builtin elixir pattern compiles
+expecting success of 4117.2 'apply --reject is incompatible with --3way': 
+	test_when_finished "cat saved.file1 >file1" &&
+	git diff >patch.0 &&
+	git checkout file1 &&
+	test_must_fail git apply --reject --3way patch.0 &&
+	git diff --exit-code
 
-expecting success of 4018.25 'builtin elixir wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 25 - builtin elixir wordRegex pattern compiles
+Updated 1 path from the index
+error: options '--reject' and '--3way' cannot be used together
+ok 2 - apply --reject is incompatible with --3way
 
-expecting success of 4018.26 'builtin elixir pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 91672cc] changing gitattributes
+expecting success of 4117.3 'apply without --reject should fail': 
+
+	test_must_fail git apply patch.1 &&
+	test_cmp file1 saved.file1
+
+error: patch failed: file1:1
+error: file1: patch does not apply
+ok 3 - apply without --reject should fail
+
+expecting success of 4117.4 'apply without --reject should fail': 
+
+	test_must_fail git apply --verbose patch.1 &&
+	test_cmp file1 saved.file1
+
+Checking patch file1...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: file1: patch does not apply
+ok 4 - apply without --reject should fail
+
+expecting success of 4117.5 'apply with --reject should fail but update the file': 
+
+	cat saved.file1 >file1 &&
+	rm -f file1.rej file2.rej &&
+
+	test_must_fail git apply --reject patch.1 &&
+	test_cmp expected file1 &&
+
+	test_path_is_file file1.rej &&
+	test_path_is_missing file2.rej
+
+Checking patch file1...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: while searching for:
+18
+19
+20
+21
+
+error: patch failed: file1:18
+Applying patch file1 with 2 rejects...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+Rejected hunk #3.
+ok 5 - apply with --reject should fail but update the file
+
+expecting success of 4117.6 'apply with --reject should fail but update the file': 
+
+	cat saved.file1 >file1 &&
+	rm -f file1.rej file2.rej file2 &&
+
+	test_must_fail git apply --reject patch.2 >rejects &&
+	test_path_is_missing file1 &&
+	test_cmp expected file2 &&
+
+	test_path_is_file file2.rej &&
+	test_path_is_missing file1.rej
+
+
+Checking patch file1 => file2...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: while searching for:
+18
+19
+20
+21
+
+error: patch failed: file1:18
+Applying patch file1 => file2 with 2 rejects...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+Rejected hunk #3.
+ok 6 - apply with --reject should fail but update the file
+
+expecting success of 4117.7 'the same test with --verbose': 
+
+	cat saved.file1 >file1 &&
+	rm -f file1.rej file2.rej file2 &&
+
+	test_must_fail git apply --reject --verbose patch.2 >rejects &&
+	test_path_is_missing file1 &&
+	test_cmp expected file2 &&
+
+	test_path_is_file file2.rej &&
+	test_path_is_missing file1.rej
+
+
+Checking patch file1 => file2...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: while searching for:
+18
+19
+20
+21
+
+error: patch failed: file1:18
+Applying patch file1 => file2 with 2 rejects...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+Rejected hunk #3.
+ok 7 - the same test with --verbose
+
+expecting success of 4117.8 'apply cleanly with --verbose': 
+
+	git cat-file -p HEAD:file1 >file1 &&
+	rm -f file?.rej file2 &&
+
+	git apply --verbose patch.1 &&
+
+	test_cmp file1 clean
+
+Checking patch file1...
+Applied patch file1 cleanly.
+ok 8 - apply cleanly with --verbose
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4116-apply-reverse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA b439317] changing gitattributes
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master 09f0b7a] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 26 - builtin elixir pattern compiles on bare repo with --attr-source
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+ok 1 - setup
 
-expecting success of 4018.27 'builtin fortran pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 27 - builtin fortran pattern compiles
+expecting success of 4116.2 'apply in forward': 
 
-expecting success of 4018.28 'builtin fortran wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 28 - builtin fortran wordRegex pattern compiles
+	T0=$(git rev-parse "second^{tree}") &&
+	git reset --hard initial &&
+	git apply --index --binary patch &&
+	T1=$(git write-tree) &&
+	test "$T0" = "$T1"
 
-expecting success of 4018.29 'builtin fortran pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+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.48.0~rc1+next.20250101/t/trash directory.t4116-apply-reverse/initial/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4114-apply-typechange.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4114-apply-typechange/.git/
+expecting success of 4114.1 'setup repository and commits': 
+	echo "hello world" > foo &&
+	echo "hi planet" > bar &&
+	git update-index --add foo bar &&
+	git commit -m initial &&
+	git branch initial &&
+	rm -f foo &&
+	test_ln_s_add bar foo &&
+	git commit -m "foo symlinked to bar" &&
+	git branch foo-symlinked-to-bar &&
+	git rm -f foo &&
+	echo "how far is the sun?" > foo &&
+	git update-index --add foo &&
+	git commit -m "foo back to file" &&
+	git branch foo-back-to-file &&
+	printf "\0" > foo &&
+	git update-index foo &&
+	git commit -m "foo becomes binary" &&
+	git branch foo-becomes-binary &&
+	rm -f foo &&
+	git update-index --remove foo &&
+	mkdir foo &&
+	echo "if only I knew" > foo/baz &&
+	git update-index --add foo/baz &&
+	git commit -m "foo becomes a directory" &&
+	git branch "foo-becomes-a-directory" &&
+	echo "hello world" > foo/baz &&
+	git update-index foo/baz &&
+	git commit -m "foo/baz is the original foo" &&
+	git branch foo-baz-renamed-from-foo
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 07df8aa] changing gitattributes
+[master (root-commit) 8d5a53c] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master 2b1a969] foo symlinked to bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA d0563d5] changing gitattributes
+ mode change 100644 => 120000 foo
+rm 'foo'
+[master 41a0307] foo back to file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 29 - builtin fortran pattern compiles on bare repo with --attr-source
+ mode change 120000 => 100644 foo
+[master bd76368] foo becomes binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master 918d519] foo becomes a directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ delete mode 100644 foo
+ create mode 100644 foo/baz
+[master 5d696d0] foo/baz is the original foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup repository and commits
 
-expecting success of 4018.30 'builtin fountain pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.2 'file renamed from foo to foo/baz': 
+	git checkout -f initial &&
+	git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
+	git apply --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 30 - builtin fountain pattern compiles
+Switched to branch 'initial'
+ok 2 - file renamed from foo to foo/baz
 
-expecting success of 4018.31 'builtin fountain wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.3 'file renamed from foo/baz to foo': 
+	git checkout -f foo-baz-renamed-from-foo &&
+	git diff-tree -M -p HEAD initial > patch &&
+	git apply --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 31 - builtin fountain wordRegex pattern compiles
+Switched to branch 'foo-baz-renamed-from-foo'
+ok 3 - file renamed from foo/baz to foo
 
-expecting success of 4018.32 'builtin fountain pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.4 'directory becomes file': 
+	git checkout -f foo-becomes-a-directory &&
+	git diff-tree -p HEAD initial > patch &&
+	git apply --index < patch
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master fe25a8f] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 9c43ead] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 32 - builtin fountain pattern compiles on bare repo with --attr-source
+Switched to branch 'foo-becomes-a-directory'
+ok 4 - directory becomes file
 
-expecting success of 4018.33 'builtin golang pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.5 'file becomes directory': 
+	git checkout -f initial &&
+	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
+	git apply --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 33 - builtin golang pattern compiles
+Switched to branch 'initial'
+ok 5 - file becomes directory
 
-expecting success of 4018.34 'builtin golang wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.6 'file becomes symlink': 
+	git checkout -f initial &&
+	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 34 - builtin golang wordRegex pattern compiles
+Already on 'initial'
+ok 6 - file becomes symlink
 
-expecting success of 4018.35 'builtin golang pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.7 'symlink becomes file': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-back-to-file > patch &&
+	git apply --index < patch
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 4856536] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA e93a5a9] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 35 - builtin golang pattern compiles on bare repo with --attr-source
+Switched to branch 'foo-symlinked-to-bar'
+ok 7 - symlink becomes file
 
-expecting success of 4018.36 'builtin html pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.8 'symlink becomes file, in reverse': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-back-to-file > patch &&
+	git checkout foo-back-to-file &&
+	git apply -R --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 36 - builtin html pattern compiles
+Already on 'foo-symlinked-to-bar'
+Switched to branch 'foo-back-to-file'
+ok 8 - symlink becomes file, in reverse
 
-expecting success of 4018.37 'builtin html wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.9 'binary file becomes symlink': 
+	git checkout -f foo-becomes-binary &&
+	git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 37 - builtin html wordRegex pattern compiles
+Switched to branch 'foo-becomes-binary'
+ok 9 - binary file becomes symlink
 
-expecting success of 4018.38 'builtin html pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.10 'symlink becomes binary file': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
+	git apply --index < patch
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master da316a7] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 0c6bd19] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 38 - builtin html pattern compiles on bare repo with --attr-source
+Switched to branch 'foo-symlinked-to-bar'
+ok 10 - symlink becomes binary file
 
-expecting success of 4018.39 'builtin java pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.11 'symlink becomes directory': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
+	git apply --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 39 - builtin java pattern compiles
+Already on 'foo-symlinked-to-bar'
+ok 11 - symlink becomes directory
 
-expecting success of 4018.40 'builtin java wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4114.12 'directory becomes symlink': 
+	git checkout -f foo-becomes-a-directory &&
+	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 40 - builtin java wordRegex pattern compiles
+Switched to branch 'foo-becomes-a-directory'
+ok 12 - directory becomes symlink
 
-expecting success of 4018.41 'builtin java pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master c684627] changing gitattributes
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4121-apply-diffs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4121-apply-diffs/.git/
+expecting success of 4121.1 'setup': git add file &&
+	git commit -q -m 1 &&
+	git checkout -b test &&
+	mv file file.tmp &&
+	echo 0 >file &&
+	cat file.tmp >>file &&
+	rm file.tmp &&
+	git commit -a -q -m 2 &&
+	echo 9 >>file &&
+	git commit -a -q -m 3 &&
+	git checkout main
+Switched to a new branch 'test'
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 4121.2 'check if contextually independent diffs for the same file apply': ( git diff test~2 test~1 && git diff test~1 test~0 )| git apply
+ok 2 - check if contextually independent diffs for the same file apply
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4115-apply-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4115-apply-symlink/.git/
+expecting success of 4115.1 'setup': 
+
+	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
+	git commit -m initial &&
+
+	git branch side &&
+
+	rm -f link? &&
+
+	test_ln_s_add htap6 link1 &&
+	git commit -m second &&
+
+	git diff-tree -p HEAD^ HEAD >patch  &&
+	git apply --stat --summary patch
+
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) b8ef636] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA dc9d6db] changing gitattributes
+ 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(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 41 - builtin java pattern compiles on bare repo with --attr-source
+ link1 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 4018.42 'builtin kotlin pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 42 - builtin kotlin pattern compiles
+expecting success of 4115.2 'apply symlink patch': 
 
-expecting success of 4018.43 'builtin kotlin wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 43 - builtin kotlin wordRegex pattern compiles
+	git checkout side &&
+	git apply patch &&
+	git diff-files -p >patched &&
+	test_cmp patch patched
 
-expecting success of 4018.44 'builtin kotlin pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master fba906f] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 411b675] changing gitattributes
+
+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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 44 - builtin kotlin pattern compiles on bare repo with --attr-source
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 120000 symlink
+ok 4 - symlink setup
 
-expecting success of 4018.45 'builtin markdown pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 45 - builtin markdown pattern compiles
+expecting success of 4115.5 'symlink escape when creating new files': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
 
-expecting success of 4018.46 'builtin markdown wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 46 - builtin markdown wordRegex pattern compiles
+	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
 
-expecting success of 4018.47 'builtin markdown pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master a36ac80] changing gitattributes
+	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(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA b175325] changing gitattributes
+ 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4120-apply-popt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4111-apply-subdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 47 - builtin markdown pattern compiles on bare repo with --attr-source
+ok 1 - setup
 
-expecting success of 4018.48 'builtin matlab pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 48 - builtin matlab pattern compiles
+expecting success of 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
+	}
 
-expecting success of 4018.49 'builtin matlab wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4119-apply-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4123-apply-shrink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4125-apply-ws-fuzz.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4125-apply-ws-fuzz/.git/
+expecting success of 4125.1 'setup': 
+
+	>file &&
+	git add file &&
+
+	# file-0 is full of whitespace breakages
+	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
+
+	# patch-0 creates a whitespace broken file
+	cat file-0 >file &&
+	git diff >patch-0 &&
+	git add file &&
+
+	# file-1 is still full of whitespace breakages,
+	# but has one line updated, without fixing any
+	# whitespaces.
+	# patch-1 records that change.
+	sed -e "s/d/D/" file-0 >file-1 &&
+	cat file-1 >file &&
+	git diff >patch-1 &&
+
+	# patch-all is the effect of both patch-0 and patch-1
+	>file &&
+	git add file &&
+	cat file-1 >file &&
+	git diff >patch-all &&
+
+	# patch-2 is the same as patch-1 but is based
+	# on a version that already has whitespace fixed,
+	# and does not introduce whitespace breakages.
+	sed -e "s/ \$//" patch-1 >patch-2 &&
+
+	# If all whitespace breakages are fixed the contents
+	# should look like file-fixed
+	sed -e "s/ \$//" file-1 >file-fixed
+
+
+ok 1 - setup
+
+expecting success of 4125.2 'nofix': 
+
+	>file &&
+	git add file &&
+
+	# Baseline.  Applying without fixing any whitespace
+	# breakages.
+	git apply --whitespace=nowarn patch-0 &&
+	git apply --whitespace=nowarn patch-1 &&
+
+	# The result should obviously match.
+	test_cmp file-1 file
+
+ok 2 - nofix
+
+expecting success of 4125.3 'withfix (forward)': 
+
+	>file &&
+	git add file &&
+
+	# The first application will munge the context lines
+	# the second patch depends on.  We should be able to
+	# adjust and still apply.
+	git apply --whitespace=fix patch-0 &&
+	git apply --whitespace=fix patch-1 &&
+
+	test_cmp file-fixed file
+
+patch-0:6: trailing whitespace.
+a 
+patch-0:7: trailing whitespace.
+bb 
+patch-0:8: trailing whitespace.
+c 
+patch-0:9: trailing whitespace.
+d 
+patch-0:10: trailing whitespace.
+eeee 
+warning: squelched 3 whitespace errors
+warning: 8 lines applied after fixing whitespace errors.
+patch-1:6: trailing whitespace.
+a 
+patch-1:7: trailing whitespace.
+bb 
+patch-1:8: trailing whitespace.
+c 
+patch-1:10: trailing whitespace.
+D 
+patch-1:11: trailing whitespace.
+eeee 
+warning: squelched 2 whitespace errors
+warning: 1 line applied after fixing whitespace errors.
+ok 3 - withfix (forward)
+
+expecting success of 4125.4 'withfix (backward)': 
+
+	>file &&
+	git add file &&
+
+	# Now we have a whitespace breakages on our side.
+	git apply --whitespace=nowarn patch-0 &&
+
+	# And somebody sends in a patch based on image
+	# with whitespace already fixed.
+	git apply --whitespace=fix patch-2 &&
+
+	# The result should accept the whitespace fixed
+	# postimage.  But the line with "h" is beyond context
+	# horizon and left unfixed.
+
+	sed -e /h/d file-fixed >fixed-head &&
+	sed -e /h/d file >file-head &&
+	test_cmp fixed-head file-head &&
+
+	sed -n -e /h/p file-fixed >fixed-tail &&
+	sed -n -e /h/p file >file-tail &&
+
+	! test_cmp fixed-tail file-tail
+
+
+--- fixed-tail	2026-03-14 13:31:11.214677808 +0000
++++ file-tail	2026-03-14 13:31:11.234677808 +0000
 @@ -1 +1 @@
-[-A-]{+B+}
-ok 49 - builtin matlab wordRegex pattern compiles
+-h
++h 
+ok 4 - withfix (backward)
 
-expecting success of 4018.50 'builtin matlab pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 4125614] changing gitattributes
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4013-diff-various.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 96677f0] changing gitattributes
+ 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(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 50 - builtin matlab pattern compiles on bare repo with --attr-source
+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 4018.51 'builtin objc pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+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)
+				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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 51 - builtin objc pattern compiles
+ok 3 - git diff-tree -r initial # magic is (not used)
 
-expecting success of 4018.52 'builtin objc wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.4 'git diff-tree -r --abbrev 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 52 - builtin objc wordRegex pattern compiles
+ok 4 - git diff-tree -r --abbrev initial # magic is (not used)
 
-expecting success of 4018.53 'builtin objc pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.5 'git diff-tree -r --abbrev=4 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 542b906] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 40e9567] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 53 - builtin objc pattern compiles on bare repo with --attr-source
+ok 5 - git diff-tree -r --abbrev=4 initial # magic is (not used)
 
-expecting success of 4018.54 'builtin pascal pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.6 'git diff-tree --root 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 54 - builtin pascal pattern compiles
+ok 6 - git diff-tree --root initial # magic is (not used)
 
-expecting success of 4018.55 'builtin pascal wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.7 'git diff-tree --root --abbrev 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 55 - builtin pascal wordRegex pattern compiles
+ok 7 - git diff-tree --root --abbrev initial # magic is (not used)
 
-expecting success of 4018.56 'builtin pascal pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.8 'git diff-tree --root --abbrev initial # magic is noellipses': 
+		{
+			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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 0e8818e] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 7f3b5d9] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 56 - builtin pascal pattern compiles on bare repo with --attr-source
+ok 8 - git diff-tree --root --abbrev initial # magic is noellipses
 
-expecting success of 4018.57 'builtin perl pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.9 'git diff-tree --root -r 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 57 - builtin perl pattern compiles
+ok 9 - git diff-tree --root -r initial # magic is (not used)
 
-expecting success of 4018.58 'builtin perl wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.10 'git diff-tree --root -r --abbrev 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 58 - builtin perl wordRegex pattern compiles
+ok 10 - git diff-tree --root -r --abbrev initial # magic is (not used)
 
-expecting success of 4018.59 'builtin perl pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.11 'git diff-tree --root -r --abbrev initial # magic is noellipses': 
+		{
+			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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master ada864b] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6fd3d2c] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 59 - builtin perl pattern compiles on bare repo with --attr-source
+ok 11 - git diff-tree --root -r --abbrev initial # magic is noellipses
 
-expecting success of 4018.60 'builtin php pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.12 'git diff-tree --root -r --abbrev=4 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 60 - builtin php pattern compiles
+ok 12 - git diff-tree --root -r --abbrev=4 initial # magic is (not used)
 
-expecting success of 4018.61 'builtin php wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.13 'git diff-tree --root -r --abbrev=4 initial # magic is noellipses': 
+		{
+			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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 61 - builtin php wordRegex pattern compiles
+ok 13 - git diff-tree --root -r --abbrev=4 initial # magic is noellipses
 
-expecting success of 4018.62 'builtin php pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.14 'git diff-tree -p 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master a9c476a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 9141fd7] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 62 - builtin php pattern compiles on bare repo with --attr-source
+ok 14 - git diff-tree -p initial # magic is (not used)
 
-expecting success of 4018.63 'builtin python pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.15 'git diff-tree --root -p 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 63 - builtin python pattern compiles
+ok 15 - git diff-tree --root -p initial # magic is (not used)
 
-expecting success of 4018.64 'builtin python wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.16 'git diff-tree --root -p --abbrev=10 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 64 - builtin python wordRegex pattern compiles
+ok 16 - git diff-tree --root -p --abbrev=10 initial # magic is (not used)
 
-expecting success of 4018.65 'builtin python pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.17 'git diff-tree --root -p --full-index 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master ad7b0c8] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 9820662] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 65 - builtin python pattern compiles on bare repo with --attr-source
+ok 17 - git diff-tree --root -p --full-index initial # magic is (not used)
 
-expecting success of 4018.66 'builtin ruby pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.18 'git diff-tree --root -p --full-index --abbrev=10 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 66 - builtin ruby pattern compiles
+ok 18 - git diff-tree --root -p --full-index --abbrev=10 initial # magic is (not used)
 
-expecting success of 4018.67 'builtin ruby wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.19 'git diff-tree --patch-with-stat 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 67 - builtin ruby wordRegex pattern compiles
+ok 19 - git diff-tree --patch-with-stat initial # magic is (not used)
 
-expecting success of 4018.68 'builtin ruby pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.20 'git diff-tree --root --patch-with-stat 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 41412bb] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6cd7147] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 68 - builtin ruby pattern compiles on bare repo with --attr-source
+ok 20 - git diff-tree --root --patch-with-stat initial # magic is (not used)
 
-expecting success of 4018.69 'builtin rust pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.21 'git diff-tree --patch-with-raw 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 69 - builtin rust pattern compiles
+ok 21 - git diff-tree --patch-with-raw initial # magic is (not used)
 
-expecting success of 4018.70 'builtin rust wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.22 'git diff-tree --root --patch-with-raw 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 70 - builtin rust wordRegex pattern compiles
+ok 22 - git diff-tree --root --patch-with-raw initial # magic is (not used)
 
-expecting success of 4018.71 'builtin rust pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.23 'git diff-tree --pretty 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 26ff60e] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA d9df4e2] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 71 - builtin rust pattern compiles on bare repo with --attr-source
+ok 23 - git diff-tree --pretty initial # magic is (not used)
 
-expecting success of 4018.72 'builtin scheme pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.24 'git diff-tree --pretty --root 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 72 - builtin scheme pattern compiles
+ok 24 - git diff-tree --pretty --root initial # magic is (not used)
 
-expecting success of 4018.73 'builtin scheme wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.25 'git diff-tree --pretty -p 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 73 - builtin scheme wordRegex pattern compiles
+ok 25 - git diff-tree --pretty -p initial # magic is (not used)
 
-expecting success of 4018.74 'builtin scheme pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.26 'git diff-tree --pretty --stat 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 1b524cd] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA a0d1221] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 74 - builtin scheme pattern compiles on bare repo with --attr-source
+ok 26 - git diff-tree --pretty --stat initial # magic is (not used)
 
-expecting success of 4018.75 'builtin tex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.27 'git diff-tree --pretty --summary 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 75 - builtin tex pattern compiles
+ok 27 - git diff-tree --pretty --summary initial # magic is (not used)
 
-expecting success of 4018.76 'builtin tex wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.28 'git diff-tree --pretty --stat --summary 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 76 - builtin tex wordRegex pattern compiles
+ok 28 - git diff-tree --pretty --stat --summary initial # magic is (not used)
 
-expecting success of 4018.77 'builtin tex pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.29 'git diff-tree --pretty --root -p 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master de4ccc4] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6368b67] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 77 - builtin tex pattern compiles on bare repo with --attr-source
+ok 29 - git diff-tree --pretty --root -p initial # magic is (not used)
 
-expecting success of 4018.78 'builtin custom1 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.30 'git diff-tree --pretty --root --stat 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 78 - builtin custom1 pattern compiles
+ok 30 - git diff-tree --pretty --root --stat initial # magic is (not used)
 
-expecting success of 4018.79 'builtin custom1 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.31 'git diff-tree --pretty --root --summary 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 79 - builtin custom1 wordRegex pattern compiles
+ok 31 - git diff-tree --pretty --root --summary initial # magic is (not used)
 
-expecting success of 4018.80 'builtin custom1 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.32 'git diff-tree --pretty --root --summary -r 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 633ec55] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 5cb29de] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 80 - builtin custom1 pattern compiles on bare repo with --attr-source
+ok 32 - git diff-tree --pretty --root --summary -r initial # magic is (not used)
 
-expecting success of 4018.81 'builtin custom2 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.33 'git diff-tree --pretty --root --stat --summary 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 81 - builtin custom2 pattern compiles
+ok 33 - git diff-tree --pretty --root --stat --summary initial # magic is (not used)
 
-expecting success of 4018.82 'builtin custom2 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.34 'git diff-tree --pretty --patch-with-stat 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 82 - builtin custom2 wordRegex pattern compiles
+ok 34 - git diff-tree --pretty --patch-with-stat initial # magic is (not used)
 
-expecting success of 4018.83 'builtin custom2 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.35 'git diff-tree --pretty --root --patch-with-stat 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 399f11a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 3432bdd] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 83 - builtin custom2 pattern compiles on bare repo with --attr-source
+ok 35 - git diff-tree --pretty --root --patch-with-stat initial # magic is (not used)
 
-expecting success of 4018.84 'builtin custom3 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.36 'git diff-tree --pretty --patch-with-raw 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 84 - builtin custom3 pattern compiles
+ok 36 - git diff-tree --pretty --patch-with-raw initial # magic is (not used)
 
-expecting success of 4018.85 'builtin custom3 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.37 'git diff-tree --pretty --root --patch-with-raw 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
 	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 85 - builtin custom3 wordRegex pattern compiles
+ok 37 - git diff-tree --pretty --root --patch-with-raw initial # magic is (not used)
 
-expecting success of 4018.86 'builtin custom3 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
+expecting success of 4013.38 'git diff-tree --pretty=oneline 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
 	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 2a95308] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 90fa73a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 86 - builtin custom3 pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.87 'last regexp must not be negated': 
-	echo "*.java diff=java" >.gitattributes &&
-	test_config diff.java.funcname "!static" &&
-	test_expect_code 128 git diff --no-index A.java B.java 2>msg &&
-	test_grep ": Last expression must not be negated:" msg
-
-fatal: Last expression must not be negated: !static
-ok 87 - last regexp must not be negated
-
-expecting success of 4018.88 'setup hunk header tests': 
-	for i in $diffpatterns
-	do
-		echo "$i-* diff=$i" || return 1
-	done > .gitattributes &&
-
-	# add all test files to the index
-	(
-		cd "$TEST_DIRECTORY"/t4018 &&
-		git --git-dir="$TRASH_DIRECTORY/.git" add .
-	) &&
-
-	# place modified files in the worktree
-	for i in $(git ls-files)
-	do
-		sed -e "s/ChangeMe/IWasChanged/" <"$TEST_DIRECTORY/t4018/$i" >"$i" || return 1
-	done
-
-ok 88 - setup hunk header tests
+ok 38 - git diff-tree --pretty=oneline initial # magic is (not used)
 
-expecting success of 4018.89 'hunk header: README': 
-		git diff -U1 README >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.39 'git diff-tree --pretty=oneline --root 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
 	
-@@ -3,3 +3,3 @@ How to write RIGHT test cases
-ok 89 - hunk header: README
+ok 39 - git diff-tree --pretty=oneline --root initial # magic is (not used)
 
-expecting success of 4018.90 'hunk header: bash-arithmetic-function': 
-		git diff -U1 bash-arithmetic-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.40 'git diff-tree --pretty=oneline -p 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
 	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 90 - hunk header: bash-arithmetic-function
+ok 40 - git diff-tree --pretty=oneline -p initial # magic is (not used)
 
-expecting success of 4018.91 'hunk header: bash-bashism-style-compact': 
-		git diff -U1 bash-bashism-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.41 'git diff-tree --pretty=oneline --root -p 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
 	
-@@ -3,3 +3,3 @@ function RIGHT {
-ok 91 - hunk header: bash-bashism-style-compact
+ok 41 - git diff-tree --pretty=oneline --root -p initial # magic is (not used)
 
-expecting success of 4018.92 'hunk header: bash-bashism-style-function': 
-		git diff -U1 bash-bashism-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.42 'git diff-tree --pretty=oneline --patch-with-stat 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
 	
-@@ -2,3 +2,3 @@ function RIGHT {
-ok 92 - hunk header: bash-bashism-style-function
+ok 42 - git diff-tree --pretty=oneline --patch-with-stat initial # magic is (not used)
 
-expecting success of 4018.93 'hunk header: bash-bashism-style-whitespace': 
-		git diff -U1 bash-bashism-style-whitespace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.43 'git diff-tree --pretty=oneline --root --patch-with-stat 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
 	
-@@ -2,3 +2,3 @@ function 	RIGHT 	( 	) 	{
-ok 93 - hunk header: bash-bashism-style-whitespace
+ok 43 - git diff-tree --pretty=oneline --root --patch-with-stat initial # magic is (not used)
 
-expecting success of 4018.94 'hunk header: bash-conditional-function': 
-		git diff -U1 bash-conditional-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.44 'git diff-tree --pretty=oneline --patch-with-raw 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
 	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 94 - hunk header: bash-conditional-function
+ok 44 - git diff-tree --pretty=oneline --patch-with-raw initial # magic is (not used)
 
-expecting success of 4018.95 'hunk header: bash-missing-parentheses': 
-		git diff -U1 bash-missing-parentheses >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.45 'git diff-tree --pretty=oneline --root --patch-with-raw 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
 	
-@@ -3,3 +3,3 @@ function RIGHT {
-ok 95 - hunk header: bash-missing-parentheses
+ok 45 - git diff-tree --pretty=oneline --root --patch-with-raw initial # magic is (not used)
 
-expecting success of 4018.96 'hunk header: bash-mixed-style-compact': 
-		git diff -U1 bash-mixed-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.46 'git diff-tree --pretty side # 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
 	
-@@ -2,3 +2,3 @@ function RIGHT(){
-ok 96 - hunk header: bash-mixed-style-compact
+ok 46 - git diff-tree --pretty side # magic is (not used)
 
-expecting success of 4018.97 'hunk header: bash-mixed-style-function': 
-		git diff -U1 bash-mixed-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.47 'git diff-tree --pretty -p side # 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
 	
-@@ -2,3 +2,3 @@ function RIGHT() {
-ok 97 - hunk header: bash-mixed-style-function
+ok 47 - git diff-tree --pretty -p side # magic is (not used)
 
-expecting success of 4018.98 'hunk header: bash-nested-functions': 
-		git diff -U1 bash-nested-functions >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.48 'git diff-tree --pretty --patch-with-stat side # 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
 	
-@@ -3,3 +3,3 @@ RIGHT()
-ok 98 - hunk header: bash-nested-functions
+ok 48 - git diff-tree --pretty --patch-with-stat side # magic is (not used)
 
-expecting success of 4018.99 'hunk header: bash-other-characters': 
-		git diff -U1 bash-other-characters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.49 'git diff-tree initial mode # 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
 	
-@@ -2,3 +2,3 @@ _RIGHT_0n()
-ok 99 - hunk header: bash-other-characters
+ok 49 - git diff-tree initial mode # magic is (not used)
 
-expecting success of 4018.100 'hunk header: bash-posix-style-compact': 
-		git diff -U1 bash-posix-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.50 'git diff-tree --stat initial mode # 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
 	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 100 - hunk header: bash-posix-style-compact
+ok 50 - git diff-tree --stat initial mode # magic is (not used)
 
-expecting success of 4018.101 'hunk header: bash-posix-style-function': 
-		git diff -U1 bash-posix-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.51 'git diff-tree --summary initial mode # 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
 	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 101 - hunk header: bash-posix-style-function
+ok 51 - git diff-tree --summary initial mode # magic is (not used)
 
-expecting success of 4018.102 'hunk header: bash-posix-style-whitespace': 
-		git diff -U1 bash-posix-style-whitespace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.52 'git diff-tree master # 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
 	
-@@ -2,3 +2,3 @@ RIGHT 	( 	)
-ok 102 - hunk header: bash-posix-style-whitespace
+ok 52 - git diff-tree master # magic is (not used)
 
-expecting success of 4018.103 'hunk header: bash-subshell-function': 
-		git diff -U1 bash-subshell-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.53 'git diff-tree -m master # 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
 	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 103 - hunk header: bash-subshell-function
+ok 53 - git diff-tree -m master # magic is (not used)
 
-expecting success of 4018.104 'hunk header: bash-trailing-comment': 
-		git diff -U1 bash-trailing-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.54 'git diff-tree -p master # 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
 	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 104 - hunk header: bash-trailing-comment
+ok 54 - git diff-tree -p master # magic is (not used)
 
-expecting success of 4018.105 'hunk header: cpp-c++-function': 
-		git diff -U1 cpp-c++-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.55 'git diff-tree -p -m master # 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
 	
-@@ -2,3 +2,3 @@ Item RIGHT::DoSomething( Args with_spaces )
-ok 105 - hunk header: cpp-c++-function
+ok 55 - git diff-tree -p -m master # magic is (not used)
 
-expecting success of 4018.106 'hunk header: cpp-class-constructor': 
-		git diff -U1 cpp-class-constructor >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.56 'git diff-tree -c master # 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
 	
-@@ -2,3 +2,3 @@ Item::Item(int RIGHT)
-ok 106 - hunk header: cpp-class-constructor
+ok 56 - git diff-tree -c master # magic is (not used)
 
-expecting success of 4018.107 'hunk header: cpp-class-constructor-mem-init': 
-		git diff -U1 cpp-class-constructor-mem-init >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.57 'git diff-tree -c --abbrev master # 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
 	
-@@ -3,3 +3,3 @@ Item::Item(int RIGHT) :
-ok 107 - hunk header: cpp-class-constructor-mem-init
+ok 57 - git diff-tree -c --abbrev master # magic is (not used)
 
-expecting success of 4018.108 'hunk header: cpp-class-definition': 
-		git diff -U1 cpp-class-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.58 'git diff-tree -c --abbrev master # magic is noellipses': 
+		{
+			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
 	
-@@ -2,3 +2,3 @@ class RIGHT
-ok 108 - hunk header: cpp-class-definition
+ok 58 - git diff-tree -c --abbrev master # magic is noellipses
 
-expecting success of 4018.109 'hunk header: cpp-class-definition-derived': 
-		git diff -U1 cpp-class-definition-derived >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.59 'git diff-tree --cc master # 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
 	
-@@ -3,3 +3,3 @@ class RIGHT :
-ok 109 - hunk header: cpp-class-definition-derived
+ok 59 - git diff-tree --cc master # magic is (not used)
 
-expecting success of 4018.110 'hunk header: cpp-class-destructor': 
-		git diff -U1 cpp-class-destructor >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.60 'git diff-tree -c --stat master # 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
 	
-@@ -2,3 +2,3 @@ RIGHT::~RIGHT()
-ok 110 - hunk header: cpp-class-destructor
+ok 60 - git diff-tree -c --stat master # magic is (not used)
 
-expecting success of 4018.111 'hunk header: cpp-function-returning-global-type': 
-		git diff -U1 cpp-function-returning-global-type >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.61 'git diff-tree --cc --stat master # 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
 	
-@@ -2,3 +2,3 @@ ::Item get::it::RIGHT()
-ok 111 - hunk header: cpp-function-returning-global-type
+ok 61 - git diff-tree --cc --stat master # magic is (not used)
 
-expecting success of 4018.112 'hunk header: cpp-function-returning-nested': 
-		git diff -U1 cpp-function-returning-nested >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.62 'git diff-tree -c --stat --summary master # 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
 	
-@@ -2,3 +2,3 @@ get::Item get::it::RIGHT()
-ok 112 - hunk header: cpp-function-returning-nested
+ok 62 - git diff-tree -c --stat --summary master # magic is (not used)
 
-expecting success of 4018.113 'hunk header: cpp-function-returning-pointer': 
-		git diff -U1 cpp-function-returning-pointer >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.63 'git diff-tree --cc --stat --summary master # 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
 	
-@@ -2,3 +2,3 @@ const char *get_it_RIGHT(char *ptr)
-ok 113 - hunk header: cpp-function-returning-pointer
+ok 63 - git diff-tree --cc --stat --summary master # magic is (not used)
 
-expecting success of 4018.114 'hunk header: cpp-function-returning-reference': 
-		git diff -U1 cpp-function-returning-reference >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.64 'git diff-tree -c --stat --summary side # 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
 	
-@@ -2,3 +2,3 @@ string& get::it::RIGHT(char *ptr)
-ok 114 - hunk header: cpp-function-returning-reference
+ok 64 - git diff-tree -c --stat --summary side # magic is (not used)
 
-expecting success of 4018.115 'hunk header: cpp-gnu-style-function': 
-		git diff -U1 cpp-gnu-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.65 'git diff-tree --cc --stat --summary side # 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
 	
-@@ -3,3 +3,3 @@ RIGHT(int arg)
-ok 115 - hunk header: cpp-gnu-style-function
+ok 65 - git diff-tree --cc --stat --summary side # magic is (not used)
 
-expecting success of 4018.116 'hunk header: cpp-namespace-definition': 
-		git diff -U1 cpp-namespace-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.66 'git diff-tree --cc --shortstat master # 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
 	
-@@ -2,3 +2,3 @@ namespace RIGHT
-ok 116 - hunk header: cpp-namespace-definition
+ok 66 - git diff-tree --cc --shortstat master # magic is (not used)
 
-expecting success of 4018.117 'hunk header: cpp-operator-definition': 
-		git diff -U1 cpp-operator-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.67 'git diff-tree --cc --summary REVERSE # 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
 	
-@@ -2,3 +2,3 @@ Value operator+(Value LEFT, Value RIGHT)
-ok 117 - hunk header: cpp-operator-definition
+ok 67 - git diff-tree --cc --summary REVERSE # magic is (not used)
 
-expecting success of 4018.118 'hunk header: cpp-skip-access-specifiers': 
-		git diff -U1 cpp-skip-access-specifiers >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.68 'git diff-tree --cc --patch-with-stat master # 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
 	
-@@ -6,3 +6,3 @@ class RIGHT : public Baseclass
-ok 118 - hunk header: cpp-skip-access-specifiers
+ok 68 - git diff-tree --cc --patch-with-stat master # magic is (not used)
 
-expecting success of 4018.119 'hunk header: cpp-skip-comment-block': 
-		git diff -U1 cpp-skip-comment-block >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.69 'git diff-tree --cc --patch-with-stat --summary master # 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
 	
-@@ -7,3 +7,3 @@ struct item RIGHT(int i)
-ok 119 - hunk header: cpp-skip-comment-block
+ok 69 - git diff-tree --cc --patch-with-stat --summary master # magic is (not used)
 
-expecting success of 4018.120 'hunk header: cpp-skip-labels': 
-		git diff -U1 cpp-skip-labels >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.70 'git diff-tree --cc --patch-with-stat --summary side # 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
 	
-@@ -6,3 +6,3 @@ void RIGHT (void)
-ok 120 - hunk header: cpp-skip-labels
+ok 70 - git diff-tree --cc --patch-with-stat --summary side # magic is (not used)
 
-expecting success of 4018.121 'hunk header: cpp-struct-definition': 
-		git diff -U1 cpp-struct-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.71 'git log master # 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
 	
-@@ -7,3 +7,3 @@ struct RIGHT {
-ok 121 - hunk header: cpp-struct-definition
+ok 71 - git log master # magic is (not used)
 
-expecting success of 4018.122 'hunk header: cpp-struct-single-line': 
-		git diff -U1 cpp-struct-single-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.72 'git log -p master # 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
 	
-@@ -6,2 +6,2 @@ struct RIGHT_iterator_tag {};
-ok 122 - hunk header: cpp-struct-single-line
+ok 72 - git log -p master # magic is (not used)
 
-expecting success of 4018.123 'hunk header: cpp-template-function-definition': 
-		git diff -U1 cpp-template-function-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.73 'git log --root master # 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
 	
-@@ -2,3 +2,3 @@ template<class T> int RIGHT(T arg)
-ok 123 - hunk header: cpp-template-function-definition
+ok 73 - git log --root master # magic is (not used)
 
-expecting success of 4018.124 'hunk header: cpp-union-definition': 
-		git diff -U1 cpp-union-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.74 'git log --root -p master # 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
 	
-@@ -2,3 +2,3 @@ union RIGHT {
-ok 124 - hunk header: cpp-union-definition
+ok 74 - git log --root -p master # magic is (not used)
 
-expecting success of 4018.125 'hunk header: cpp-void-c-function': 
-		git diff -U1 cpp-void-c-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.75 'git log --patch-with-stat master # 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
 	
-@@ -2,3 +2,3 @@ void RIGHT (void)
-ok 125 - hunk header: cpp-void-c-function
+ok 75 - git log --patch-with-stat master # magic is (not used)
 
-expecting success of 4018.126 'hunk header: csharp-exclude-assignments': 
-		git diff -U1 csharp-exclude-assignments >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.76 'git log --root --patch-with-stat master # 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
 	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 126 - hunk header: csharp-exclude-assignments
+ok 76 - git log --root --patch-with-stat master # magic is (not used)
 
-expecting success of 4018.127 'hunk header: csharp-exclude-control-statements': 
-		git diff -U1 csharp-exclude-control-statements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.77 'git log --root --patch-with-stat --summary master # 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
 	
-@@ -29,3 +29,3 @@ string Method(int RIGHT)
-ok 127 - hunk header: csharp-exclude-control-statements
+ok 77 - git log --root --patch-with-stat --summary master # magic is (not used)
 
-expecting success of 4018.128 'hunk header: csharp-exclude-exceptions': 
-		git diff -U1 csharp-exclude-exceptions >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.78 'git log --root -c --patch-with-stat --summary master # 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
 	
-@@ -24,3 +24,3 @@ string Method(int RIGHT)
-ok 128 - hunk header: csharp-exclude-exceptions
+ok 78 - git log --root -c --patch-with-stat --summary master # magic is (not used)
 
-expecting success of 4018.129 'hunk header: csharp-exclude-generic-method-calls': 
-		git diff -U1 csharp-exclude-generic-method-calls >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.79 'git log --root --cc --patch-with-stat --summary master # 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
 	
-@@ -7,3 +7,3 @@ string Method(int RIGHT)
-ok 129 - hunk header: csharp-exclude-generic-method-calls
+ok 79 - git log --root --cc --patch-with-stat --summary master # magic is (not used)
 
-expecting success of 4018.130 'hunk header: csharp-exclude-init-dispose': 
-		git diff -U1 csharp-exclude-init-dispose >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.80 'git log --no-diff-merges -p --first-parent master # 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
 	
-@@ -17,3 +17,3 @@ string Method(int RIGHT)
-ok 130 - hunk header: csharp-exclude-init-dispose
+ok 80 - git log --no-diff-merges -p --first-parent master # magic is (not used)
 
-expecting success of 4018.131 'hunk header: csharp-exclude-iterations': 
-		git diff -U1 csharp-exclude-iterations >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.81 'git log --diff-merges=off -p --first-parent master # 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
 	
-@@ -21,3 +21,3 @@ string Method(int RIGHT)
-ok 131 - hunk header: csharp-exclude-iterations
+ok 81 - git log --diff-merges=off -p --first-parent master # magic is (not used)
 
-expecting success of 4018.132 'hunk header: csharp-exclude-method-calls': 
-		git diff -U1 csharp-exclude-method-calls >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.82 'git log --first-parent --diff-merges=off -p master # 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
 	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 132 - hunk header: csharp-exclude-method-calls
+ok 82 - git log --first-parent --diff-merges=off -p master # magic is (not used)
 
-expecting success of 4018.133 'hunk header: csharp-exclude-other': 
-		git diff -U1 csharp-exclude-other >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.83 'git log -p --first-parent master # 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
 	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 133 - hunk header: csharp-exclude-other
+ok 83 - git log -p --first-parent master # magic is (not used)
 
-expecting success of 4018.134 'hunk header: csharp-method': 
-		git diff -U1 csharp-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.84 'git log -p --diff-merges=first-parent master # 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
 	
-@@ -7,3 +7,3 @@ string Method(int RIGHT)
-ok 134 - hunk header: csharp-method
+ok 84 - git log -p --diff-merges=first-parent master # magic is (not used)
 
-expecting success of 4018.135 'hunk header: csharp-method-array': 
-		git diff -U1 csharp-method-array >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.85 'git log --diff-merges=first-parent master # 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
 	
-@@ -7,3 +7,3 @@ string[] Method(int RIGHT)
-ok 135 - hunk header: csharp-method-array
+ok 85 - git log --diff-merges=first-parent master # magic is (not used)
 
-expecting success of 4018.136 'hunk header: csharp-method-explicit': 
-		git diff -U1 csharp-method-explicit >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.86 'git log -m -p --first-parent master # 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
 	
-@@ -9,3 +9,3 @@ void IDisposable.Dispose() // RIGHT
-ok 136 - hunk header: csharp-method-explicit
+ok 86 - git log -m -p --first-parent master # magic is (not used)
 
-expecting success of 4018.137 'hunk header: csharp-method-generics': 
-		git diff -U1 csharp-method-generics >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.87 'git log -m -p master # 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
 	
-@@ -7,3 +7,3 @@ Example<int, string> Method<TA, TB>(TA RIGHT, TB b)
-ok 137 - hunk header: csharp-method-generics
+ok 87 - git log -m -p master # magic is (not used)
 
-expecting success of 4018.138 'hunk header: csharp-method-generics-alternate-spaces': 
-		git diff -U1 csharp-method-generics-alternate-spaces >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.88 'git log --cc -m -p master # 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
 	
-@@ -7,3 +7,3 @@ Example<int,string> Method<TA ,TB>(TA RIGHT, TB b)
-ok 138 - hunk header: csharp-method-generics-alternate-spaces
+ok 88 - git log --cc -m -p master # magic is (not used)
 
-expecting success of 4018.139 'hunk header: csharp-method-modifiers': 
-		git diff -U1 csharp-method-modifiers >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.89 'git log -c -m -p master # 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
 	
-@@ -9,3 +9,3 @@ static internal async Task Method(int RIGHT)
-ok 139 - hunk header: csharp-method-modifiers
+ok 89 - git log -c -m -p master # magic is (not used)
 
-expecting success of 4018.140 'hunk header: csharp-method-multiline': 
-		git diff -U1 csharp-method-multiline >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.90 'git log -m --raw master # 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
 	
-@@ -7,3 +7,3 @@ string Method_RIGHT(
-ok 140 - hunk header: csharp-method-multiline
+ok 90 - git log -m --raw master # magic is (not used)
 
-expecting success of 4018.141 'hunk header: csharp-method-params': 
-		git diff -U1 csharp-method-params >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.91 'git log -m --stat master # 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
 	
-@@ -7,3 +7,3 @@ string Method(int RIGHT, int b, int c = 42)
-ok 141 - hunk header: csharp-method-params
+ok 91 - git log -m --stat master # magic is (not used)
 
-expecting success of 4018.142 'hunk header: csharp-method-special-chars': 
-		git diff -U1 csharp-method-special-chars >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.92 'git log -SF master # 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
 	
-@@ -7,3 +7,3 @@ @Some_Type @Method_With_Underscore(int RIGHT)
-ok 142 - hunk header: csharp-method-special-chars
+ok 92 - git log -SF master # magic is (not used)
 
-expecting success of 4018.143 'hunk header: csharp-method-with-spacing': 
-		git diff -U1 csharp-method-with-spacing >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.93 'git log -S F master # 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
 	
-@@ -7,3 +7,3 @@ string   Method 	( int 	RIGHT )
-ok 143 - hunk header: csharp-method-with-spacing
+ok 93 - git log -S F master # magic is (not used)
 
-expecting success of 4018.144 'hunk header: csharp-property': 
-		git diff -U1 csharp-property >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.94 'git log -SF -p master # 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
 	
-@@ -7,3 +7,3 @@ public bool RIGHT
-ok 144 - hunk header: csharp-property
+ok 94 - git log -SF -p master # magic is (not used)
 
-expecting success of 4018.145 'hunk header: csharp-property-braces-same-line': 
-		git diff -U1 csharp-property-braces-same-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.95 'git log -SF master --max-count=0 # 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
 	
-@@ -6,3 +6,3 @@ public bool RIGHT {
-ok 145 - hunk header: csharp-property-braces-same-line
+ok 95 - git log -SF master --max-count=0 # magic is (not used)
 
-expecting success of 4018.146 'hunk header: css-attribute-value-selector': 
-		git diff -U1 css-attribute-value-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.96 'git log -SF master --max-count=1 # 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
 	
-@@ -2,3 +2,3 @@ [class*="RIGHT"] {
-ok 146 - hunk header: css-attribute-value-selector
+ok 96 - git log -SF master --max-count=1 # magic is (not used)
 
-expecting success of 4018.147 'hunk header: css-block-level-@-statements': 
-		git diff -U1 css-block-level-@-statements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.97 'git log -SF master --max-count=2 # 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
 	
-@@ -3,3 +3,3 @@ @keyframes RIGHT {
-ok 147 - hunk header: css-block-level-@-statements
+ok 97 - git log -SF master --max-count=2 # magic is (not used)
 
-expecting success of 4018.148 'hunk header: css-brace-in-col-1': 
-		git diff -U1 css-brace-in-col-1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.98 'git log -GF master # 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
 	
-@@ -3,3 +3,3 @@ RIGHT label.control-label
-ok 148 - hunk header: css-brace-in-col-1
+ok 98 - git log -GF master # magic is (not used)
 
-expecting success of 4018.149 'hunk header: css-class-selector': 
-		git diff -U1 css-class-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.99 'git log -GF -p master # 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
 	
-@@ -2,3 +2,3 @@ .RIGHT {
-ok 149 - hunk header: css-class-selector
+ok 99 - git log -GF -p master # magic is (not used)
 
-expecting success of 4018.150 'hunk header: css-colon-eol': 
-		git diff -U1 css-colon-eol >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.100 'git log -GF -p --pickaxe-all master # 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
 	
-@@ -2,3 +2,3 @@ RIGHT h1 {
-ok 150 - hunk header: css-colon-eol
+ok 100 - git log -GF -p --pickaxe-all master # magic is (not used)
 
-expecting success of 4018.151 'hunk header: css-colon-selector': 
-		git diff -U1 css-colon-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.101 'git log -IA -IB -I1 -I2 -p master # 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
 	
-@@ -3,3 +3,3 @@ RIGHT a:hover {
-ok 151 - hunk header: css-colon-selector
+ok 101 - git log -IA -IB -I1 -I2 -p master # magic is (not used)
 
-expecting success of 4018.152 'hunk header: css-common': 
-		git diff -U1 css-common >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.102 'git log --decorate --all # 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
 	
-@@ -2,3 +2,3 @@ RIGHT label.control-label {
-ok 152 - hunk header: css-common
+ok 102 - git log --decorate --all # magic is (not used)
 
-expecting success of 4018.153 'hunk header: css-id-selector': 
-		git diff -U1 css-id-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.103 'git log --decorate=full --all # 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
 	
-@@ -2,3 +2,3 @@ #RIGHT {
-ok 153 - hunk header: css-id-selector
+ok 103 - git log --decorate=full --all # magic is (not used)
 
-expecting success of 4018.154 'hunk header: css-long-selector-list': 
-		git diff -U1 css-long-selector-list >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.104 'git log --decorate --clear-decorations --all # 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
 	
-@@ -4,3 +4,3 @@ div ul#RIGHT {
-ok 154 - hunk header: css-long-selector-list
+ok 104 - git log --decorate --clear-decorations --all # magic is (not used)
 
-expecting success of 4018.155 'hunk header: css-prop-sans-indent': 
-		git diff -U1 css-prop-sans-indent >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.105 'git log --decorate=full --clear-decorations --all # 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
 	
-@@ -3,3 +3,3 @@ RIGHT, label.control-label {
-ok 155 - hunk header: css-prop-sans-indent
+ok 105 - git log --decorate=full --clear-decorations --all # magic is (not used)
 
-expecting success of 4018.156 'hunk header: css-root-selector': 
-		git diff -U1 css-root-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.106 'git rev-list --parents HEAD # 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
 	
-@@ -2,3 +2,3 @@ :RIGHT {
-ok 156 - hunk header: css-root-selector
+ok 106 - git rev-list --parents HEAD # magic is (not used)
 
-expecting success of 4018.157 'hunk header: css-short-selector-list': 
-		git diff -U1 css-short-selector-list >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.107 'git rev-list --children HEAD # 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
 	
-@@ -2,3 +2,3 @@ label.control, div ul#RIGHT {
-ok 157 - hunk header: css-short-selector-list
+ok 107 - git rev-list --children HEAD # magic is (not used)
 
-expecting success of 4018.158 'hunk header: css-trailing-space': 
-		git diff -U1 css-trailing-space >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.108 'git whatchanged master # 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
 	
-@@ -3,3 +3,3 @@ RIGHT label.control-label {
-ok 158 - hunk header: css-trailing-space
+ok 108 - git whatchanged master # magic is (not used)
 
-expecting success of 4018.159 'hunk header: custom1-pattern': 
-		git diff -U1 custom1-pattern >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.109 'git whatchanged master # magic is noellipses': 
+		{
+			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
 	
-@@ -9,3 +9,3 @@ int special, RIGHT;
-ok 159 - hunk header: custom1-pattern
+ok 109 - git whatchanged master # magic is noellipses
 
-expecting success of 4018.160 'hunk header: custom2-match-to-end-of-line': 
-		git diff -U1 custom2-match-to-end-of-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.110 'git whatchanged -p master # 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
 	
-@@ -5,3 +5,3 @@ RIGHT_Beer
-ok 160 - hunk header: custom2-match-to-end-of-line
+ok 110 - git whatchanged -p master # magic is (not used)
 
-expecting success of 4018.161 'hunk header: custom3-alternation-in-pattern': 
-		git diff -U1 custom3-alternation-in-pattern >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.111 'git whatchanged --root master # 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
 	
-@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
-ok 161 - hunk header: custom3-alternation-in-pattern
+ok 111 - git whatchanged --root master # magic is (not used)
 
-expecting success of 4018.162 'hunk header: dts-labels': 
-		git diff -U1 dts-labels >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.112 'git whatchanged --root master # magic is noellipses': 
+		{
+			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
 	
-@@ -5,3 +5,3 @@ label2: RIGHT {
-ok 162 - hunk header: dts-labels
+ok 112 - git whatchanged --root master # magic is noellipses
 
-expecting success of 4018.163 'hunk header: dts-node-unitless': 
-		git diff -U1 dts-node-unitless >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.113 'git whatchanged --root -p master # 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
 	
-@@ -4,3 +4,3 @@ RIGHT {
-ok 163 - hunk header: dts-node-unitless
+ok 113 - git whatchanged --root -p master # magic is (not used)
 
-expecting success of 4018.164 'hunk header: dts-nodes': 
-		git diff -U1 dts-nodes >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.114 'git whatchanged --patch-with-stat master # 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
 	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 {
-ok 164 - hunk header: dts-nodes
+ok 114 - git whatchanged --patch-with-stat master # magic is (not used)
 
-expecting success of 4018.165 'hunk header: dts-nodes-boolean-prop': 
-		git diff -U1 dts-nodes-boolean-prop >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.115 'git whatchanged --root --patch-with-stat master # 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
 	
-@@ -5,3 +5,3 @@ RIGHT@deadf00,4000 {
-ok 165 - hunk header: dts-nodes-boolean-prop
+ok 115 - git whatchanged --root --patch-with-stat master # magic is (not used)
 
-expecting success of 4018.166 'hunk header: dts-nodes-comment1': 
-		git diff -U1 dts-nodes-comment1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.116 'git whatchanged --root --patch-with-stat --summary master # 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
 	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 /* &a comment */ {
-ok 166 - hunk header: dts-nodes-comment1
+ok 116 - git whatchanged --root --patch-with-stat --summary master # magic is (not used)
 
-expecting success of 4018.167 'hunk header: dts-nodes-comment2': 
-		git diff -U1 dts-nodes-comment2 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.117 'git whatchanged --root -c --patch-with-stat --summary master # 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
 	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 { /* a trailing comment */
-ok 167 - hunk header: dts-nodes-comment2
+ok 117 - git whatchanged --root -c --patch-with-stat --summary master # magic is (not used)
 
-expecting success of 4018.168 'hunk header: dts-nodes-multiline-prop': 
-		git diff -U1 dts-nodes-multiline-prop >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.118 'git whatchanged --root --cc --patch-with-stat --summary master # 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
 	
-@@ -9,3 +9,3 @@ RIGHT@deadf00,4000 {
-ok 168 - hunk header: dts-nodes-multiline-prop
+ok 118 - git whatchanged --root --cc --patch-with-stat --summary master # magic is (not used)
 
-expecting success of 4018.169 'hunk header: dts-reference': 
-		git diff -U1 dts-reference >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.119 'git whatchanged -SF master # 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
 	
-@@ -7,3 +7,3 @@ &RIGHT {
-ok 169 - hunk header: dts-reference
+ok 119 - git whatchanged -SF master # magic is (not used)
 
-expecting success of 4018.170 'hunk header: dts-root': 
-		git diff -U1 dts-root >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.120 'git whatchanged -SF master # magic is noellipses': 
+		{
+			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
 	
-@@ -3,3 +3,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
-ok 170 - hunk header: dts-root
+ok 120 - git whatchanged -SF master # magic is noellipses
 
-expecting success of 4018.171 'hunk header: dts-root-comment': 
-		git diff -U1 dts-root-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.121 'git whatchanged -SF -p master # 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
 	
-@@ -6,3 +6,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
-ok 171 - hunk header: dts-root-comment
+ok 121 - git whatchanged -SF -p master # magic is (not used)
 
-expecting success of 4018.172 'hunk header: elixir-do-not-pick-end': 
-		git diff -U1 elixir-do-not-pick-end >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.122 'git log --patch-with-stat master -- dir/ # 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
 	
-@@ -4,2 +4,2 @@ defmodule RIGHT do
-ok 172 - hunk header: elixir-do-not-pick-end
+ok 122 - git log --patch-with-stat master -- dir/ # magic is (not used)
 
-expecting success of 4018.173 'hunk header: elixir-ex-unit-test': 
-		git diff -U1 elixir-ex-unit-test >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.123 'git whatchanged --patch-with-stat master -- dir/ # 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
 	
-@@ -3,3 +3,3 @@ test "RIGHT" do
-ok 173 - hunk header: elixir-ex-unit-test
+ok 123 - git whatchanged --patch-with-stat master -- dir/ # magic is (not used)
 
-expecting success of 4018.174 'hunk header: elixir-function': 
-		git diff -U1 elixir-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.124 'git log --patch-with-stat --summary master -- dir/ # 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
 	
-@@ -3,3 +3,3 @@ def function(RIGHT, arg) do
-ok 174 - hunk header: elixir-function
+ok 124 - git log --patch-with-stat --summary master -- dir/ # magic is (not used)
 
-expecting success of 4018.175 'hunk header: elixir-macro': 
-		git diff -U1 elixir-macro >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.125 'git whatchanged --patch-with-stat --summary master -- dir/ # 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
 	
-@@ -3,3 +3,3 @@ defmacro foo(RIGHT) do
-ok 175 - hunk header: elixir-macro
+ok 125 - git whatchanged --patch-with-stat --summary master -- dir/ # magic is (not used)
 
-expecting success of 4018.176 'hunk header: elixir-module': 
-		git diff -U1 elixir-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.126 'git show 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
 	
-@@ -5,3 +5,3 @@ defmodule RIGHT do
-ok 176 - hunk header: elixir-module
+ok 126 - git show initial # magic is (not used)
 
-expecting success of 4018.177 'hunk header: elixir-module-func': 
-		git diff -U1 elixir-module-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.127 'git show --root 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
 	
-@@ -5,3 +5,3 @@ def fun(RIGHT) do
-ok 177 - hunk header: elixir-module-func
+ok 127 - git show --root initial # magic is (not used)
 
-expecting success of 4018.178 'hunk header: elixir-nested-module': 
-		git diff -U1 elixir-nested-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.128 'git show side # 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
 	
-@@ -5,3 +5,3 @@ defmodule MyApp.RIGHT do
-ok 178 - hunk header: elixir-nested-module
+ok 128 - git show side # magic is (not used)
 
-expecting success of 4018.179 'hunk header: elixir-private-function': 
-		git diff -U1 elixir-private-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.129 'git show master # 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
 	
-@@ -3,3 +3,3 @@ defp function(RIGHT, arg) do
-ok 179 - hunk header: elixir-private-function
+ok 129 - git show master # magic is (not used)
 
-expecting success of 4018.180 'hunk header: elixir-protocol': 
-		git diff -U1 elixir-protocol >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.130 'git show -c master # 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
 	
-@@ -4,3 +4,3 @@ defprotocol RIGHT do
-ok 180 - hunk header: elixir-protocol
+ok 130 - git show -c master # magic is (not used)
 
-expecting success of 4018.181 'hunk header: elixir-protocol-implementation': 
-		git diff -U1 elixir-protocol-implementation >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.131 'git show -m master # 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
 	
-@@ -3,3 +3,3 @@ defimpl RIGHT do
-ok 181 - hunk header: elixir-protocol-implementation
+ok 131 - git show -m master # magic is (not used)
 
-expecting success of 4018.182 'hunk header: fortran-block-data': 
-		git diff -U1 fortran-block-data >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.132 'git show --first-parent master # 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
 	
-@@ -2,4 +2,4 @@ BLOCK DATA RIGHT
-ok 182 - hunk header: fortran-block-data
+ok 132 - git show --first-parent master # magic is (not used)
 
-expecting success of 4018.183 'hunk header: fortran-comment': 
-		git diff -U1 fortran-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.133 'git show --stat side # 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
 	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 183 - hunk header: fortran-comment
+ok 133 - git show --stat side # magic is (not used)
 
-expecting success of 4018.184 'hunk header: fortran-comment-keyword': 
-		git diff -U1 fortran-comment-keyword >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.134 'git show --stat --summary side # 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
 	
-@@ -9,3 +9,3 @@ subroutine RIGHT (funcA, funcB)
-ok 184 - hunk header: fortran-comment-keyword
+ok 134 - git show --stat --summary side # magic is (not used)
 
-expecting success of 4018.185 'hunk header: fortran-comment-legacy': 
-		git diff -U1 fortran-comment-legacy >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.135 'git show --patch-with-stat side # 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
 	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 185 - hunk header: fortran-comment-legacy
+ok 135 - git show --patch-with-stat side # magic is (not used)
 
-expecting success of 4018.186 'hunk header: fortran-comment-legacy-star': 
-		git diff -U1 fortran-comment-legacy-star >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.136 'git show --patch-with-raw side # 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
 	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 186 - hunk header: fortran-comment-legacy-star
+ok 136 - git show --patch-with-raw side # magic is (not used)
 
-expecting success of 4018.187 'hunk header: fortran-external-function': 
-		git diff -U1 fortran-external-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.137 'git show --patch-with-raw side # magic is noellipses': 
+		{
+			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
 	
-@@ -2,3 +2,3 @@ function RIGHT(a, b) result(c)
-ok 187 - hunk header: fortran-external-function
+ok 137 - git show --patch-with-raw side # magic is noellipses
 
-expecting success of 4018.188 'hunk header: fortran-external-subroutine': 
-		git diff -U1 fortran-external-subroutine >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.138 'git show --patch-with-stat --summary side # 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
 	
-@@ -2,3 +2,3 @@ subroutine RIGHT
-ok 188 - hunk header: fortran-external-subroutine
+ok 138 - git show --patch-with-stat --summary side # magic is (not used)
 
-expecting success of 4018.189 'hunk header: fortran-module': 
-		git diff -U1 fortran-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.139 'git format-patch --stdout initial..side # 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
 	
-@@ -2,3 +2,3 @@ module RIGHT
-ok 189 - hunk header: fortran-module
+ok 139 - git format-patch --stdout initial..side # magic is (not used)
 
-expecting success of 4018.190 'hunk header: fortran-module-procedure': 
-		git diff -U1 fortran-module-procedure >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.140 'git format-patch --stdout initial..master^ # 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
 	
-@@ -8,3 +8,3 @@ module RIGHT
-ok 190 - hunk header: fortran-module-procedure
+ok 140 - git format-patch --stdout initial..master^ # magic is (not used)
 
-expecting success of 4018.191 'hunk header: fortran-program': 
-		git diff -U1 fortran-program >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.141 'git format-patch --stdout initial..master # 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
 	
-@@ -2,3 +2,3 @@ program RIGHT
-ok 191 - hunk header: fortran-program
+ok 141 - git format-patch --stdout initial..master # magic is (not used)
 
-expecting success of 4018.192 'hunk header: fountain-scene': 
-		git diff -U1 fountain-scene >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.142 'git format-patch --stdout --no-numbered initial..master # 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
 	
-@@ -3,2 +3,2 @@ EXT. STREET RIGHT OUTSIDE - DAY
-ok 192 - hunk header: fountain-scene
+ok 142 - git format-patch --stdout --no-numbered initial..master # magic is (not used)
 
-expecting success of 4018.193 'hunk header: golang-complex-function': 
-		git diff -U1 golang-complex-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.143 'git format-patch --stdout --numbered initial..master # 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
 	
-@@ -6,3 +6,3 @@ func (t *Test) RIGHT(a Type) (Type, error) {
-ok 193 - hunk header: golang-complex-function
+ok 143 - git format-patch --stdout --numbered initial..master # magic is (not used)
 
-expecting success of 4018.194 'hunk header: golang-func': 
-		git diff -U1 golang-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.144 'git format-patch --attach --stdout initial..side # 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
 	
-@@ -2,3 +2,3 @@ func RIGHT() {
-ok 194 - hunk header: golang-func
+ok 144 - git format-patch --attach --stdout initial..side # magic is (not used)
 
-expecting success of 4018.195 'hunk header: golang-interface': 
-		git diff -U1 golang-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.145 'git format-patch --attach --stdout --suffix=.diff initial..side # 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
 	
-@@ -2,3 +2,3 @@ type RIGHT interface {
-ok 195 - hunk header: golang-interface
+ok 145 - git format-patch --attach --stdout --suffix=.diff initial..side # magic is (not used)
 
-expecting success of 4018.196 'hunk header: golang-long-func': 
-		git diff -U1 golang-long-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.146 'git format-patch --attach --stdout initial..master^ # 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
 	
-@@ -3,3 +3,3 @@ func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
-ok 196 - hunk header: golang-long-func
+ok 146 - git format-patch --attach --stdout initial..master^ # magic is (not used)
 
-expecting success of 4018.197 'hunk header: golang-struct': 
-		git diff -U1 golang-struct >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.147 'git format-patch --attach --stdout initial..master # 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
 	
-@@ -2,3 +2,3 @@ type RIGHT struct {
-ok 197 - hunk header: golang-struct
+ok 147 - git format-patch --attach --stdout initial..master # magic is (not used)
 
-expecting success of 4018.198 'hunk header: java-class-brace-on-separate-line': 
-		git diff -U1 java-class-brace-on-separate-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.148 'git format-patch --inline --stdout initial..side # 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
 	
-@@ -4,3 +4,3 @@ class RIGHT
-ok 198 - hunk header: java-class-brace-on-separate-line
+ok 148 - git format-patch --inline --stdout initial..side # magic is (not used)
 
-expecting success of 4018.199 'hunk header: java-class-member-function': 
-		git diff -U1 java-class-member-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.149 'git format-patch --inline --stdout initial..master^ # 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
 	
-@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
-ok 199 - hunk header: java-class-member-function
+ok 149 - git format-patch --inline --stdout initial..master^ # magic is (not used)
 
-expecting success of 4018.200 'hunk header: java-class-space-before-type-parameters': 
-		git diff -U1 java-class-space-before-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.150 'git format-patch --inline --stdout --numbered-files initial..master # 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
 	
-@@ -4,3 +4,3 @@ class RIGHT <TYPE, PARAMS, AFTER, SPACE> {
-ok 200 - hunk header: java-class-space-before-type-parameters
+ok 150 - git format-patch --inline --stdout --numbered-files initial..master # magic is (not used)
 
-expecting success of 4018.201 'hunk header: java-class-type-parameters': 
-		git diff -U1 java-class-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.151 'git format-patch --inline --stdout initial..master # 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
 	
-@@ -4,3 +4,3 @@ class RIGHT<A, B> {
-ok 201 - hunk header: java-class-type-parameters
+ok 151 - git format-patch --inline --stdout initial..master # magic is (not used)
 
-expecting success of 4018.202 'hunk header: java-class-type-parameters-implements': 
-		git diff -U1 java-class-type-parameters-implements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.152 'git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master # 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
 	
-@@ -4,3 +4,3 @@ class RIGHT<A, B> implements List<A> {
-ok 202 - hunk header: java-class-type-parameters-implements
+ok 152 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master # magic is (not used)
 
-expecting success of 4018.203 'hunk header: java-enum-constant': 
-		git diff -U1 java-enum-constant >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.153 'git config format.subjectprefix DIFFERENT_PREFIX # 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
 	
-@@ -4,3 +4,3 @@ private enum RIGHT {
-ok 203 - hunk header: java-enum-constant
+ok 153 - git config format.subjectprefix DIFFERENT_PREFIX # magic is (not used)
 
-expecting success of 4018.204 'hunk header: java-interface-type-parameters': 
-		git diff -U1 java-interface-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.154 'git format-patch --inline --stdout initial..master^^ # 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
 	
-@@ -4,3 +4,3 @@ interface RIGHT<A, B> {
-ok 204 - hunk header: java-interface-type-parameters
+ok 154 - git format-patch --inline --stdout initial..master^^ # magic is (not used)
 
-expecting success of 4018.205 'hunk header: java-interface-type-parameters-extends': 
-		git diff -U1 java-interface-type-parameters-extends >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.155 'git format-patch --stdout --cover-letter -n initial..master^ # 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
 	
-@@ -4,3 +4,3 @@ interface RIGHT<A, B> extends Function<A, B> {
-ok 205 - hunk header: java-interface-type-parameters-extends
+ok 155 - git format-patch --stdout --cover-letter -n initial..master^ # magic is (not used)
 
-expecting success of 4018.206 'hunk header: java-method-return-generic-bounded': 
-		git diff -U1 java-method-return-generic-bounded >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.156 'git diff --abbrev initial..side # 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
 	
-@@ -6,3 +6,3 @@ public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
-ok 206 - hunk header: java-method-return-generic-bounded
+ok 156 - git diff --abbrev initial..side # magic is (not used)
 
-expecting success of 4018.207 'hunk header: java-method-return-generic-wildcard': 
-		git diff -U1 java-method-return-generic-wildcard >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.157 'git diff -U initial..side # 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
 	
-@@ -6,3 +6,3 @@ public List<? extends Comparable> foo(String[] RIGHT) {
-ok 207 - hunk header: java-method-return-generic-wildcard
+ok 157 - git diff -U initial..side # magic is (not used)
 
-expecting success of 4018.208 'hunk header: java-nested-field': 
-		git diff -U1 java-nested-field >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.158 'git diff -U1 initial..side # 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
 	
-@@ -3,3 +3,3 @@ private static class RIGHT {
-ok 208 - hunk header: java-nested-field
+ok 158 - git diff -U1 initial..side # magic is (not used)
 
-expecting success of 4018.209 'hunk header: java-non-sealed': 
-		git diff -U1 java-non-sealed >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.159 'git diff -r initial..side # 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
 	
-@@ -5,3 +5,3 @@ public static non-sealed class RIGHT extends SealedClass {
-ok 209 - hunk header: java-non-sealed
+ok 159 - git diff -r initial..side # magic is (not used)
 
-expecting success of 4018.210 'hunk header: java-record': 
-		git diff -U1 java-record >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.160 'git diff --stat initial..side # 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
 	
-@@ -4,3 +4,3 @@ public record RIGHT(int comp1, double comp2, String comp3) {
-ok 210 - hunk header: java-record
+ok 160 - git diff --stat initial..side # magic is (not used)
 
-expecting success of 4018.211 'hunk header: java-record-space-before-components': 
-		git diff -U1 java-record-space-before-components >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.161 'git diff -r --stat initial..side # 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
 	
-@@ -4,3 +4,3 @@ public record RIGHT (String components, String after, String space) {
-ok 211 - hunk header: java-record-space-before-components
+ok 161 - git diff -r --stat initial..side # magic is (not used)
 
-expecting success of 4018.212 'hunk header: java-record-type-parameters': 
-		git diff -U1 java-record-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.162 'git diff initial..side # 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
 	
-@@ -4,3 +4,3 @@ public record RIGHT<A, N extends Number>(A comp1, N comp2, int comp3) {
-ok 212 - hunk header: java-record-type-parameters
+ok 162 - git diff initial..side # magic is (not used)
 
-expecting success of 4018.213 'hunk header: java-sealed': 
-		git diff -U1 java-sealed >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.163 'git diff --patch-with-stat initial..side # 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
 	
-@@ -4,3 +4,3 @@ public abstract sealed class Sealed { // RIGHT
-ok 213 - hunk header: java-sealed
+ok 163 - git diff --patch-with-stat initial..side # magic is (not used)
 
-expecting success of 4018.214 'hunk header: java-sealed-permits': 
-		git diff -U1 java-sealed-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.164 'git diff --patch-with-raw initial..side # 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
 	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT permits PermittedA, PermittedB {
-ok 214 - hunk header: java-sealed-permits
+ok 164 - git diff --patch-with-raw initial..side # magic is (not used)
 
-expecting success of 4018.215 'hunk header: java-sealed-type-parameters': 
-		git diff -U1 java-sealed-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.165 'git diff --patch-with-raw initial..side # magic is noellipses': 
+		{
+			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
 	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> {
-ok 215 - hunk header: java-sealed-type-parameters
+ok 165 - git diff --patch-with-raw initial..side # magic is noellipses
 
-expecting success of 4018.216 'hunk header: java-sealed-type-parameters-implements-permits': 
-		git diff -U1 java-sealed-type-parameters-implements-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.166 'git diff --patch-with-stat -r initial..side # 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
 	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> implements List<A> permits PermittedA,
-ok 216 - hunk header: java-sealed-type-parameters-implements-permits
+ok 166 - git diff --patch-with-stat -r initial..side # magic is (not used)
 
-expecting success of 4018.217 'hunk header: java-sealed-type-parameters-permits': 
-		git diff -U1 java-sealed-type-parameters-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.167 'git diff --patch-with-raw -r initial..side # 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
 	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> permits PermittedA, PermittedB {
-ok 217 - hunk header: java-sealed-type-parameters-permits
+ok 167 - git diff --patch-with-raw -r initial..side # magic is (not used)
 
-expecting success of 4018.218 'hunk header: kotlin-class': 
-		git diff -U1 kotlin-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.168 'git diff --patch-with-raw -r initial..side # magic is noellipses': 
+		{
+			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
 	
-@@ -3,3 +3,3 @@ class RIGHT {
-ok 218 - hunk header: kotlin-class
+ok 168 - git diff --patch-with-raw -r initial..side # magic is noellipses
 
-expecting success of 4018.219 'hunk header: kotlin-enum-class': 
-		git diff -U1 kotlin-enum-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.169 'git diff --name-status dir2 dir # 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
 	
-@@ -3,3 +3,3 @@ enum class RIGHT{
-ok 219 - hunk header: kotlin-enum-class
+ok 169 - git diff --name-status dir2 dir # magic is (not used)
 
-expecting success of 4018.220 'hunk header: kotlin-fun': 
-		git diff -U1 kotlin-fun >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.170 'git diff --no-index --name-status dir2 dir # 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
 	
-@@ -3,3 +3,3 @@ fun RIGHT(){
-ok 220 - hunk header: kotlin-fun
+ok 170 - git diff --no-index --name-status dir2 dir # magic is (not used)
 
-expecting success of 4018.221 'hunk header: kotlin-inheritace-class': 
-		git diff -U1 kotlin-inheritace-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.171 'git diff --no-index --name-status -- dir2 dir # 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
 	
-@@ -3,3 +3,3 @@ open class RIGHT{
-ok 221 - hunk header: kotlin-inheritace-class
+ok 171 - git diff --no-index --name-status -- dir2 dir # magic is (not used)
 
-expecting success of 4018.222 'hunk header: kotlin-inline-class': 
-		git diff -U1 kotlin-inline-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.172 'git diff --no-index dir dir3 # 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
 	
-@@ -3,3 +3,3 @@ value class RIGHT(Args){
-ok 222 - hunk header: kotlin-inline-class
+ok 172 - git diff --no-index dir dir3 # magic is (not used)
 
-expecting success of 4018.223 'hunk header: kotlin-interface': 
-		git diff -U1 kotlin-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.173 'git diff master master^ side # 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
 	
-@@ -3,3 +3,3 @@ interface RIGHT{
-ok 223 - hunk header: kotlin-interface
+ok 173 - git diff master master^ side # magic is (not used)
 
-expecting success of 4018.224 'hunk header: kotlin-nested-fun': 
-		git diff -U1 kotlin-nested-fun >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.174 'git diff --line-prefix=abc master master^ side # 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
 	
-@@ -5,3 +5,3 @@ fun RIGHT(  a:Int){
-ok 224 - hunk header: kotlin-nested-fun
+ok 174 - git diff --line-prefix=abc master master^ side # magic is (not used)
 
-expecting success of 4018.225 'hunk header: kotlin-public-class': 
-		git diff -U1 kotlin-public-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.175 'git diff --dirstat master~1 master~2 # 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
 	
-@@ -3,3 +3,3 @@ public class RIGHT{
-ok 225 - hunk header: kotlin-public-class
+ok 175 - git diff --dirstat master~1 master~2 # magic is (not used)
 
-expecting success of 4018.226 'hunk header: kotlin-sealed-class': 
-		git diff -U1 kotlin-sealed-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.176 'git diff --dirstat initial rearrange # 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
 	
-@@ -3,3 +3,3 @@ sealed class RIGHT {
-ok 226 - hunk header: kotlin-sealed-class
+ok 176 - git diff --dirstat initial rearrange # magic is (not used)
 
-expecting success of 4018.227 'hunk header: markdown-heading-indented': 
-		git diff -U1 markdown-heading-indented >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.177 'git diff --dirstat-by-file initial rearrange # 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
 	
-@@ -5,2 +5,2 @@    ### RIGHT
-ok 227 - hunk header: markdown-heading-indented
+ok 177 - git diff --dirstat-by-file initial rearrange # magic is (not used)
 
-expecting success of 4018.228 'hunk header: markdown-heading-non-headings': 
-		git diff -U1 markdown-heading-non-headings >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.178 'git diff --dirstat --cc master~1 master # 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
 	
-@@ -16,2 +16,2 @@ # RIGHT
-ok 228 - hunk header: markdown-heading-non-headings
+ok 178 - git diff --dirstat --cc master~1 master # magic is (not used)
 
-expecting success of 4018.229 'hunk header: matlab-class-definition': 
-		git diff -U1 matlab-class-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.179 'git diff --raw 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
 	
-@@ -2,3 +2,3 @@ classdef RIGHT
-ok 229 - hunk header: matlab-class-definition
+ok 179 - git diff --raw initial # magic is (not used)
 
-expecting success of 4018.230 'hunk header: matlab-function': 
-		git diff -U1 matlab-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.180 'git diff --raw initial # magic is noellipses': 
+		{
+			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
 	
-@@ -2,3 +2,3 @@ function y = RIGHT()
-ok 230 - hunk header: matlab-function
+ok 180 - git diff --raw initial # magic is noellipses
 
-expecting success of 4018.231 'hunk header: matlab-octave-section-1': 
-		git diff -U1 matlab-octave-section-1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.181 'git diff --raw --abbrev=4 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
 	
-@@ -2,2 +2,2 @@ %%% RIGHT section
-ok 231 - hunk header: matlab-octave-section-1
+ok 181 - git diff --raw --abbrev=4 initial # magic is (not used)
 
-expecting success of 4018.232 'hunk header: matlab-octave-section-2': 
-		git diff -U1 matlab-octave-section-2 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.182 'git diff --raw --abbrev=4 initial # magic is noellipses': 
+		{
+			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
 	
-@@ -2,2 +2,2 @@ ## RIGHT section
-ok 232 - hunk header: matlab-octave-section-2
+ok 182 - git diff --raw --abbrev=4 initial # magic is noellipses
 
-expecting success of 4018.233 'hunk header: matlab-section': 
-		git diff -U1 matlab-section >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.183 'git diff --raw --no-abbrev 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
 	
-@@ -2,2 +2,2 @@ %% RIGHT section
-ok 233 - hunk header: matlab-section
+ok 183 - git diff --raw --no-abbrev initial # magic is (not used)
 
-expecting success of 4018.234 'hunk header: perl-skip-end-of-heredoc': 
-		git diff -U1 perl-skip-end-of-heredoc >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.184 'git diff --no-index --raw dir2 dir # 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
 	
-@@ -6,3 +6,3 @@ sub RIGHTwithheredocument {
-ok 234 - hunk header: perl-skip-end-of-heredoc
+ok 184 - git diff --no-index --raw dir2 dir # magic is (not used)
 
-expecting success of 4018.235 'hunk header: perl-skip-forward-decl': 
-		git diff -U1 perl-skip-forward-decl >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.185 'git diff --no-index --raw dir2 dir # magic is noellipses': 
+		{
+			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
 	
-@@ -9,2 +9,2 @@ package RIGHT;
-ok 235 - hunk header: perl-skip-forward-decl
+ok 185 - git diff --no-index --raw dir2 dir # magic is noellipses
 
-expecting success of 4018.236 'hunk header: perl-skip-sub-in-pod': 
-		git diff -U1 perl-skip-sub-in-pod >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.186 'git diff --no-index --raw --abbrev=4 dir2 dir # 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
 	
-@@ -15,3 +15,3 @@ =head1 SYNOPSIS_RIGHT
-ok 236 - hunk header: perl-skip-sub-in-pod
+ok 186 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is (not used)
 
-expecting success of 4018.237 'hunk header: perl-sub-definition': 
-		git diff -U1 perl-sub-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.187 'git diff --no-index --raw --abbrev=4 dir2 dir # magic is noellipses': 
+		{
+			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
 	
-@@ -2,3 +2,3 @@ sub RIGHT {
-ok 237 - hunk header: perl-sub-definition
+ok 187 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is noellipses
 
-expecting success of 4018.238 'hunk header: perl-sub-definition-kr-brace': 
-		git diff -U1 perl-sub-definition-kr-brace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.188 'git diff --no-index --raw --no-abbrev dir2 dir # 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
 	
-@@ -2,3 +2,3 @@ sub RIGHT
-ok 238 - hunk header: perl-sub-definition-kr-brace
+ok 188 - git diff --no-index --raw --no-abbrev dir2 dir # magic is (not used)
 
-expecting success of 4018.239 'hunk header: php-abstract-class': 
-		git diff -U1 php-abstract-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.189 'git diff-tree --pretty --root --stat --compact-summary 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
 	
-@@ -2,3 +2,3 @@ abstract class RIGHT
-ok 239 - hunk header: php-abstract-class
+ok 189 - git diff-tree --pretty --root --stat --compact-summary initial # magic is (not used)
 
-expecting success of 4018.240 'hunk header: php-abstract-method': 
-		git diff -U1 php-abstract-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.190 'git diff-tree --pretty -R --root --stat --compact-summary 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
 	
-@@ -4,3 +4,3 @@ abstract public function RIGHT(): ?string
-ok 240 - hunk header: php-abstract-method
+ok 190 - git diff-tree --pretty -R --root --stat --compact-summary initial # magic is (not used)
 
-expecting success of 4018.241 'hunk header: php-class': 
-		git diff -U1 php-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.191 'git diff-tree --pretty note # 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
 	
-@@ -2,3 +2,3 @@ class RIGHT
-ok 241 - hunk header: php-class
+ok 191 - git diff-tree --pretty note # magic is (not used)
 
-expecting success of 4018.242 'hunk header: php-enum': 
-		git diff -U1 php-enum >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.192 'git diff-tree --pretty --notes note # 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
 	
-@@ -2,3 +2,3 @@ enum RIGHT: string
-ok 242 - hunk header: php-enum
+ok 192 - git diff-tree --pretty --notes note # magic is (not used)
 
-expecting success of 4018.243 'hunk header: php-final-class': 
-		git diff -U1 php-final-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.193 'git diff-tree --format=%N note # 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
 	
-@@ -2,3 +2,3 @@ final class RIGHT
-ok 243 - hunk header: php-final-class
+ok 193 - git diff-tree --format=%N note # magic is (not used)
 
-expecting success of 4018.244 'hunk header: php-final-method': 
-		git diff -U1 php-final-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.194 'git diff-tree --stat --compact-summary initial mode # 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
 	
-@@ -4,3 +4,3 @@ final public function RIGHT(): string
-ok 244 - hunk header: php-final-method
+ok 194 - git diff-tree --stat --compact-summary initial mode # magic is (not used)
 
-expecting success of 4018.245 'hunk header: php-function': 
-		git diff -U1 php-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4013.195 'git diff-tree -R --stat --compact-summary initial mode # 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
 	
-@@ -2,3 +2,3 @@ function RIGHT()
-ok 245 - hunk header: php-function
+ok 195 - git diff-tree -R --stat --compact-summary initial mode # magic is (not used)
 
-expecting success of 4018.246 'hunk header: php-interface': 
-		git diff -U1 php-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ interface RIGHT
-ok 246 - hunk header: php-interface
+expecting success of 4013.196 'log -m matches pure log': 
+	git log master >result &&
+	process_diffs result >expected &&
+	git log -m >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
 
-expecting success of 4018.247 'hunk header: php-method': 
-		git diff -U1 php-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public static function RIGHT()
-ok 247 - hunk header: php-method
+ok 196 - log -m matches pure log
 
-expecting success of 4018.248 'hunk header: php-trait': 
-		git diff -U1 php-trait >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ trait RIGHT
-ok 248 - hunk header: php-trait
+expecting success of 4013.197 'log --diff-merges=on matches --diff-merges=separate': 
+	git log -p --diff-merges=separate master >result &&
+	process_diffs result >expected &&
+	git log -p --diff-merges=on master >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
 
-expecting success of 4018.249 'hunk header: python-async-def': 
-		git diff -U1 python-async-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ async def RIGHT(pi: int = 3.14):
-ok 249 - hunk header: python-async-def
+ok 197 - log --diff-merges=on matches --diff-merges=separate
 
-expecting success of 4018.250 'hunk header: python-class': 
-		git diff -U1 python-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ class RIGHT(int, str):
-ok 250 - hunk header: python-class
+expecting success of 4013.198 'log --dd matches --diff-merges=1 -p': 
+	git log --diff-merges=1 -p master >result &&
+	process_diffs result >expected &&
+	git log --dd master >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
 
-expecting success of 4018.251 'hunk header: python-def': 
-		git diff -U1 python-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ def RIGHT(pi: int = 3.14):
-ok 251 - hunk header: python-def
+ok 198 - log --dd matches --diff-merges=1 -p
 
-expecting success of 4018.252 'hunk header: python-indented-async-def': 
-		git diff -U1 python-indented-async-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ async def RIGHT(self, x: int):
-ok 252 - hunk header: python-indented-async-def
+expecting success of 4013.199 'deny wrong log.diffMerges config': 
+	test_config log.diffMerges wrong-value &&
+	test_expect_code 128 git log
 
-expecting success of 4018.253 'hunk header: python-indented-class': 
-		git diff -U1 python-indented-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,2 +4,2 @@ class RIGHT:
-ok 253 - hunk header: python-indented-class
+fatal: bad config variable 'log.diffmerges' in file '.git/config' at line 8
+ok 199 - deny wrong log.diffMerges config
 
-expecting success of 4018.254 'hunk header: python-indented-def': 
-		git diff -U1 python-indented-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ def RIGHT(self, x: int):
-ok 254 - hunk header: python-indented-def
+expecting success of 4013.200 'git config log.diffMerges first-parent': 
+	git log -p --diff-merges=first-parent master >result &&
+	process_diffs result >expected &&
+	test_config log.diffMerges first-parent &&
+	git log -p --diff-merges=on master >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
 
-expecting success of 4018.255 'hunk header: rust-fn': 
-		git diff -U1 rust-fn >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
-ok 255 - hunk header: rust-fn
+ok 200 - git config log.diffMerges first-parent
 
-expecting success of 4018.256 'hunk header: rust-impl': 
-		git diff -U1 rust-impl >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ impl<'a, T: AsRef<[u8]>>  std::RIGHT for Git<'a> {
-ok 256 - hunk header: rust-impl
+expecting success of 4013.201 'git config log.diffMerges first-parent vs -m': 
+	git log -p --diff-merges=first-parent master >result &&
+	process_diffs result >expected &&
+	test_config log.diffMerges first-parent &&
+	git log -p -m master >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
 
-expecting success of 4018.257 'hunk header: rust-macro-rules': 
-		git diff -U1 rust-macro-rules >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ macro_rules! RIGHT {
-ok 257 - hunk header: rust-macro-rules
+ok 201 - git config log.diffMerges first-parent vs -m
 
-expecting success of 4018.258 'hunk header: rust-struct': 
-		git diff -U1 rust-struct >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ pub(super) struct RIGHT<'a> {
-ok 258 - hunk header: rust-struct
+expecting success of 4013.202 'git diff-index -m': 
+	rm -f file1 &&
+	git diff-index HEAD >without-m &&
+	lines_count=$(wc -l <without-m) &&
+	git diff-index -m HEAD >with-m &&
+	git restore file1 &&
+	test_line_count = $((lines_count - 1)) with-m
 
-expecting success of 4018.259 'hunk header: rust-trait': 
-		git diff -U1 rust-trait >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ unsafe trait RIGHT<T> {
-ok 259 - hunk header: rust-trait
+ok 202 - git diff-index -m
 
-expecting success of 4018.260 'hunk header: scheme-class': 
-		git diff -U1 scheme-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ (class* () object% RIGHT
-ok 260 - hunk header: scheme-class
+expecting success of 4013.203 'log -S requires an argument': 
+	test_must_fail git log -S
 
-expecting success of 4018.261 'hunk header: scheme-def': 
-		git diff -U1 scheme-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (def (some-func x y z) RIGHT
-ok 261 - hunk header: scheme-def
+error: switch `S' requires a value
+ok 203 - log -S requires an argument
 
-expecting success of 4018.262 'hunk header: scheme-def-variant': 
-		git diff -U1 scheme-def-variant >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (defmethod {print point} RIGHT
-ok 262 - hunk header: scheme-def-variant
+expecting success of 4013.204 'diff --cached on unborn branch': 
+	git symbolic-ref HEAD refs/heads/unborn &&
+	git diff --cached >result &&
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
+	test_cmp expected actual
 
-expecting success of 4018.263 'hunk header: scheme-define-slash-public': 
-		git diff -U1 scheme-define-slash-public >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ (define/public (foo) RIGHT
-ok 263 - hunk header: scheme-define-slash-public
+ok 204 - diff --cached on unborn branch
 
-expecting success of 4018.264 'hunk header: scheme-define-syntax': 
-		git diff -U1 scheme-define-syntax >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ (define-syntax define-test-suite RIGHT
-ok 264 - hunk header: scheme-define-syntax
+expecting success of 4013.205 'diff --cached -- file on unborn branch': 
+	git diff --cached -- file0 >result &&
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
+	test_cmp expected actual
 
-expecting success of 4018.265 'hunk header: scheme-define-variant': 
-		git diff -U1 scheme-define-variant >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define* (some-func x y z) RIGHT
-ok 265 - hunk header: scheme-define-variant
+ok 205 - diff --cached -- file on unborn branch
 
-expecting success of 4018.266 'hunk header: scheme-library': 
-		git diff -U1 scheme-library >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ (library (my-helpers id-stuff) RIGHT
-ok 266 - hunk header: scheme-library
+expecting success of 4013.206 'diff --line-prefix with spaces': 
+	git diff --line-prefix="| | | " --cached -- file0 >result &&
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
+	test_cmp expected actual
 
-expecting success of 4018.267 'hunk header: scheme-local-define': 
-		git diff -U1 scheme-local-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define local-function RIGHT
-ok 267 - hunk header: scheme-local-define
+ok 206 - diff --line-prefix with spaces
 
-expecting success of 4018.268 'hunk header: scheme-module': 
-		git diff -U1 scheme-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ (module A RIGHT
-ok 268 - hunk header: scheme-module
+expecting success of 4013.207 'diff-tree --stdin with log formatting': 
+	cat >expect <<-\EOF &&
+	Side
+	Third
+	Second
+	EOF
+	git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
+	test_cmp expect actual
 
-expecting success of 4018.269 'hunk header: scheme-top-level-define': 
-		git diff -U1 scheme-top-level-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define (some-func x y z) RIGHT
-ok 269 - hunk header: scheme-top-level-define
+ok 207 - diff-tree --stdin with log formatting
 
-expecting success of 4018.270 'hunk header: scheme-user-defined-define': 
-		git diff -U1 scheme-user-defined-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ (define-test-suite record\ case-tests RIGHT
-ok 270 - hunk header: scheme-user-defined-define
+expecting success of 4013.208 'diff-tree --stdin with pathspec': 
+	cat >expect <<-EOF &&
+	Third
 
-# passed all 270 test(s)
-1..270
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4123-apply-shrink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4123-apply-shrink/.git/
-expecting success of 4123.1 'setup': 
+	dir/sub
+	Second
 
-	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
+	dir/sub
+	EOF
+	git rev-list master^ |
+	git diff-tree -r --stdin --name-only --format=%s dir >actual &&
+	test_cmp expect actual
 
+ok 208 - diff-tree --stdin with pathspec
 
-ok 1 - setup
+expecting success of 4013.209 'show A B ... -- <pathspec>': 
+	# side touches dir/sub, file0, and file3
+	# master^ touches dir/sub, and file1
+	# master^^ touches dir/sub, file0, and file2
+	git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
+	cat >expect <<-\EOF &&
+	<Side>
 
-expecting success of 4123.2 'apply should fail gracefully': 
-	test_must_fail git apply --index patch &&
-	test_path_is_missing .git/index.lock
+	dir/sub
+	<Third>
 
-error: patch failed: F:14
-error: F: patch does not apply
-ok 2 - apply should fail gracefully
+	dir/sub
+	<Second>
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4125-apply-ws-fuzz.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4125-apply-ws-fuzz/.git/
-expecting success of 4125.1 'setup': 
+	dir/sub
+	EOF
+	test_cmp expect actual
 
-	>file &&
-	git add file &&
+ok 209 - show A B ... -- <pathspec>
 
-	# file-0 is full of whitespace breakages
-	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
+expecting success of 4013.210 'diff -I<regex>: setup': 
+	git checkout master &&
+	test_seq 50 >file0 &&
+	git commit -m "Set up -I<regex> test file" file0 &&
+	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
+	echo >>file0
 
-	# patch-0 creates a whitespace broken file
-	cat file-0 >file &&
-	git diff >patch-0 &&
-	git add file &&
+Switched to branch 'master'
+[master 4362559] Set up -I<regex> test file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 44 insertions(+), 3 deletions(-)
+ok 210 - diff -I<regex>: setup
 
-	# 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 &&
+expecting success of 4013.211 'diff -I<regex>': 
+	git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+	cat >expect <<-\EOF &&
+	diff --git a/file0 b/file0
+	--- a/file0
+	+++ b/file0
+	@@ -34,7 +31,6 @@
+	 34
+	 35
+	 36
+	-37
+	 38
+	 39
+	 40
+	EOF
+	compare_diff_patch expect actual
 
-	# patch-all is the effect of both patch-0 and patch-1
-	>file &&
-	git add file &&
-	cat file-1 >file &&
-	git diff >patch-all &&
+ok 211 - diff -I<regex>
 
-	# 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 &&
+expecting success of 4013.212 'diff -I<regex> --stat': 
+	git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+	cat >expect <<-\EOF &&
+	 file0 | 1 -
+	 1 file changed, 1 deletion(-)
+	EOF
+	test_cmp expect actual
 
-	# If all whitespace breakages are fixed the contents
-	# should look like file-fixed
-	sed -e "s/ \$//" file-1 >file-fixed
+ok 212 - diff -I<regex> --stat
 
+expecting success of 4013.213 'diff -I<regex>: detect malformed regex': 
+	test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
+	test_grep "invalid regex given to -I: " error
 
-ok 1 - setup
+error: invalid regex given to -I: '^[124-9'
+ok 213 - diff -I<regex>: detect malformed regex
 
-expecting success of 4125.2 'nofix': 
+expecting success of 4013.214 'diff-files does not respect diff.noPrefix': 
+	git -c diff.noPrefix diff-files -p >actual &&
+	check_prefix actual a/file0 b/file0
 
-	>file &&
-	git add file &&
+ok 214 - diff-files does not respect diff.noPrefix
 
-	# Baseline.  Applying without fixing any whitespace
-	# breakages.
-	git apply --whitespace=nowarn patch-0 &&
-	git apply --whitespace=nowarn patch-1 &&
+expecting success of 4013.215 'diff-files respects --no-prefix': 
+	git diff-files -p --no-prefix >actual &&
+	check_prefix actual file0 file0
 
-	# The result should obviously match.
-	test_cmp file-1 file
+ok 215 - diff-files respects --no-prefix
 
-ok 2 - nofix
+expecting success of 4013.216 'diff respects diff.noPrefix': 
+	git -c diff.noPrefix diff >actual &&
+	check_prefix actual file0 file0
 
-expecting success of 4125.3 'withfix (forward)': 
+ok 216 - diff respects diff.noPrefix
 
-	>file &&
-	git add file &&
+expecting success of 4013.217 'diff --default-prefix overrides diff.noPrefix': 
+	git -c diff.noPrefix diff --default-prefix >actual &&
+	check_prefix actual a/file0 b/file0
 
-	# 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 &&
+ok 217 - diff --default-prefix overrides diff.noPrefix
 
-	test_cmp file-fixed file
+expecting success of 4013.218 'diff respects diff.mnemonicPrefix': 
+	git -c diff.mnemonicPrefix diff >actual &&
+	check_prefix actual i/file0 w/file0
 
-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)
+ok 218 - diff respects diff.mnemonicPrefix
 
-expecting success of 4125.4 'withfix (backward)': 
+expecting success of 4013.219 'diff --default-prefix overrides diff.mnemonicPrefix': 
+	git -c diff.mnemonicPrefix diff --default-prefix >actual &&
+	check_prefix actual a/file0 b/file0
 
-	>file &&
-	git add file &&
+ok 219 - diff --default-prefix overrides diff.mnemonicPrefix
 
-	# Now we have a whitespace breakages on our side.
-	git apply --whitespace=nowarn patch-0 &&
+expecting success of 4013.220 'diff respects diff.srcPrefix': 
+	git -c diff.srcPrefix=x/ diff >actual &&
+	check_prefix actual x/file0 b/file0
 
-	# And somebody sends in a patch based on image
-	# with whitespace already fixed.
-	git apply --whitespace=fix patch-2 &&
+ok 220 - diff respects diff.srcPrefix
 
-	# The result should accept the whitespace fixed
-	# postimage.  But the line with "h" is beyond context
-	# horizon and left unfixed.
+expecting success of 4013.221 'diff respects diff.dstPrefix': 
+	git -c diff.dstPrefix=y/ diff >actual &&
+	check_prefix actual a/file0 y/file0
 
-	sed -e /h/d file-fixed >fixed-head &&
-	sed -e /h/d file >file-head &&
-	test_cmp fixed-head file-head &&
+ok 221 - diff respects diff.dstPrefix
 
-	sed -n -e /h/p file-fixed >fixed-tail &&
-	sed -n -e /h/p file >file-tail &&
+expecting success of 4013.222 'diff --src-prefix overrides diff.srcPrefix': 
+	git -c diff.srcPrefix=y/ diff --src-prefix=z/ >actual &&
+	check_prefix actual z/file0 b/file0
 
-	! test_cmp fixed-tail file-tail
+ok 222 - diff --src-prefix overrides diff.srcPrefix
 
+expecting success of 4013.223 'diff --dst-prefix overrides diff.dstPrefix': 
+	git -c diff.dstPrefix=y/ diff --dst-prefix=z/ >actual &&
+	check_prefix actual a/file0 z/file0
 
---- fixed-tail	2025-02-09 06:54:33.085898164 +0000
-+++ file-tail	2025-02-09 06:54:33.089898189 +0000
-@@ -1 +1 @@
--h
-+h 
-ok 4 - withfix (backward)
+ok 223 - diff --dst-prefix overrides diff.dstPrefix
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4133-apply-filenames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 4013.224 'diff.{src,dst}Prefix ignored with diff.noPrefix': 
+	git -c diff.dstPrefix=y/ -c diff.srcPrefix=x/ -c diff.noPrefix diff >actual &&
+	check_prefix actual file0 file0
 
-ok 1 - setup
+ok 224 - diff.{src,dst}Prefix ignored with diff.noPrefix
 
-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
+expecting success of 4013.225 'diff.{src,dst}Prefix ignored with diff.mnemonicPrefix': 
+	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ -c diff.mnemonicPrefix diff >actual &&
+	check_prefix actual i/file0 w/file0
 
-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
+ok 225 - diff.{src,dst}Prefix ignored with diff.mnemonicPrefix
 
-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
+expecting success of 4013.226 'diff.{src,dst}Prefix ignored with --default-prefix': 
+	git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ diff --default-prefix >actual &&
+	check_prefix actual a/file0 b/file0
 
-error: git diff header lacks filename information (line 4)
-ok 3 - apply diff with new filename missing from headers
+ok 226 - diff.{src,dst}Prefix ignored with --default-prefix
 
-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
+expecting success of 4013.227 'diff --no-renames cannot be abbreviated': 
+	test_expect_code 129 git diff --no-rename >actual 2>error &&
+	test_must_be_empty actual &&
+	grep "invalid option: --no-rename" error
 
-error: git diff header lacks filename information (line 4)
-ok 4 - apply diff with old filename missing from headers
+error: invalid option: --no-rename
+ok 227 - diff --no-renames cannot be abbreviated
 
-# passed all 4 test(s)
-1..4
+# passed all 227 test(s)
+1..227
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4130-apply-criss-cross-rename.sh ***
@@ -271590,10 +271211,357 @@
 	test_cmp file2 file2-swapped &&
 	test_cmp file3 file3-swapped
 
-ok 7 - apply
+ok 7 - apply
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4122-apply-symlink-inside.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4126-apply-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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
+
+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
+
+expecting success of 4126.8 'apply with no-contents and a funny pathname': 
+	test_when_finished "rm -fr \"funny \"; git reset --hard" &&
+
+	mkdir "funny " &&
+	>"funny /empty" &&
+	git add "funny /empty" &&
+	git diff HEAD -- "funny /" >sample.patch &&
+	git diff -R HEAD -- "funny /" >elpmas.patch &&
+
+	git reset --hard &&
+
+	git apply --stat --check --apply sample.patch &&
+	test_must_be_empty "funny /empty" &&
+
+	git apply --stat --check --apply elpmas.patch &&
+	test_path_is_missing "funny /empty" &&
+
+	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"
 
-# passed all 7 test(s)
-1..7
+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 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4128-apply-root.sh ***
@@ -271684,127 +271652,524 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4126-apply-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4126-apply-empty/.git/
-expecting success of 4126.1 'setup': 
-	>empty &&
-	git add empty &&
+*** t4108-apply-threeway.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4108-apply-threeway/.git/
+expecting success of 4108.1 'setup': 
 	test_tick &&
+	test_write_lines 1 2 3 4 5 6 7 >one &&
+	cat one >two &&
+	git add one two &&
 	git commit -m initial &&
-	git 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
+	git branch side &&
+
+	test_tick &&
+	test_write_lines 1 two 3 4 5 six 7 >one &&
+	test_write_lines 1 two 3 4 5 6 7 >two &&
+	git commit -a -m main &&
+
+	git checkout side &&
+	test_write_lines 1 2 3 4 five 6 7 >one &&
+	test_write_lines 1 2 3 4 five 6 7 >two &&
+	git commit -a -m side &&
+
+	git checkout main
+
+[main (root-commit) acfd9ea] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-[master 3401d02] empty commit
+ 2 files changed, 14 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+[main cc2039c] main
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Switched to branch 'side'
+[side 3dc6c9f] side
  Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 4126.2 'apply empty': 
-	rm -f missing &&
-	test_when_finished "git reset --hard" &&
-	git apply patch0 &&
-	test_cmp expect empty
+expecting success of 4108.2 'apply without --3way': 
+	git diff side^ side >P.diff &&
 
-HEAD is now at 3401d02 empty commit
-ok 2 - apply empty
+	# should fail to apply
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git apply --index P.diff &&
+	# should leave things intact
+	git diff-files --exit-code &&
+	git diff-index --exit-code --cached HEAD
 
-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
+HEAD is now at cc2039c main
+Note: switching to 'main^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 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
+If you want to 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 3401d02 empty commit
-ok 4 - apply with --allow-empty succeeds
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-HEAD is now at 3401d02 empty commit
-ok 5 - apply --index empty
+  git switch -
 
-expecting success of 4126.6 'apply create': 
-	rm -f missing &&
-	test_when_finished "git reset --hard" &&
-	git apply patch1 &&
-	test_cmp expect missing
+Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 3401d02 empty commit
-ok 6 - apply create
+HEAD is now at cc2039c main
+error: patch failed: one:2
+error: one: patch does not apply
+error: patch failed: two:2
+error: two: patch does not apply
+ok 2 - apply without --3way
 
-expecting success of 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
+expecting success of 4108.3 'apply with --3way': 
+	test_apply_with_3way
 
-HEAD is now at 3401d02 empty commit
-ok 7 - apply --index create
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+ok 3 - apply with --3way
 
-expecting success of 4126.8 'apply with no-contents and a funny pathname': 
-	test_when_finished "rm -fr \"funny \"; git reset --hard" &&
+expecting success of 4108.4 'apply with --3way with merge.conflictStyle = diff3': 
+	test_config merge.conflictStyle diff3 &&
+	test_apply_with_3way
 
-	mkdir "funny " &&
-	>"funny /empty" &&
-	git add "funny /empty" &&
-	git diff HEAD -- "funny /" >sample.patch &&
-	git diff -R HEAD -- "funny /" >elpmas.patch &&
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+ok 4 - apply with --3way with merge.conflictStyle = diff3
+
+expecting success of 4108.5 'apply with --3way --ours': 
+	test_apply_with_3way_favoritism --ours -Xours
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+Auto-merging two
+Automatic merge went well; stopped before committing as requested
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 5 - apply with --3way --ours
+
+expecting success of 4108.6 'apply with --3way --theirs': 
+	test_apply_with_3way_favoritism --theirs -Xtheirs
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+Auto-merging two
+Automatic merge went well; stopped before committing as requested
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 6 - apply with --3way --theirs
+
+expecting success of 4108.7 'apply with --3way --union': 
+	echo "* merge=union" >.gitattributes &&
+	test_apply_with_3way_favoritism --union &&
+	rm .gitattributes
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+Auto-merging two
+Automatic merge went well; stopped before committing as requested
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 7 - apply with --3way --union
+
+expecting success of 4108.8 'apply with --3way with rerere enabled': 
+	test_config rerere.enabled true &&
 
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding conflicted merge
 	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git merge --no-commit side &&
 
-	git apply --stat --check --apply sample.patch &&
-	test_must_be_empty "funny /empty" &&
+	# Manually resolve and record the resolution
+	test_write_lines 1 two 3 4 five six 7 >one &&
+	git rerere &&
+	cat one >expect &&
 
-	git apply --stat --check --apply elpmas.patch &&
-	test_path_is_missing "funny /empty" &&
+	# should fail to apply
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git apply --index --3way P.diff &&
 
-	git apply -R --stat --check --apply elpmas.patch &&
-	test_must_be_empty "funny /empty" &&
+	# but rerere should have replayed the recorded resolution
+	test_cmp expect one
 
-	git apply -R --stat --check --apply sample.patch &&
-	test_path_is_missing "funny /empty"
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Recorded preimage for 'one'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'one'.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+Resolved 'one' using previous resolution.
+ok 8 - apply with --3way with rerere enabled
 
-HEAD is now at 3401d02 empty commit
- funny /empty |    0 
- 1 file changed, 0 insertions(+), 0 deletions(-)
- funny /empty |    0 
+expecting success of 4108.9 'apply -3 with add/add conflict setup': 
+	git reset --hard &&
+
+	git checkout -b adder &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 4 5 6 7 >four &&
+	git add three four &&
+	git commit -m "add three and four" &&
+
+	git checkout -b another adder^ &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 four 5 6 7 >four &&
+	git add three four &&
+	git commit -m "add three and four" &&
+
+	# Merging another should be similar to applying this patch
+	git diff adder...another >P.diff &&
+
+	git checkout adder^0 &&
+	test_must_fail git merge --no-commit another &&
+	git ls-files -s >expect.ls &&
+	print_sanitized_conflicted_diff >expect.diff
+
+HEAD is now at cc2039c main
+Switched to a new branch 'adder'
+[adder a4ae168] add three and four
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 four
+ create mode 100644 three
+Switched to a new branch 'another'
+[another 668e9f0] add three and four
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 four
+ create mode 100644 three
+Note: switching to 'adder^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at a4ae168 add three and four
+Auto-merging four
+CONFLICT (add/add): Merge conflict in four
+Recorded preimage for 'four'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 9 - apply -3 with add/add conflict setup
+
+expecting success of 4108.10 'apply -3 with add/add conflict': 
+	# should fail to apply ...
+	git reset --hard &&
+	git checkout adder^0 &&
+	test_must_fail git apply --index --3way P.diff &&
+	# ... and leave conflicts in the index and in the working tree
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The result should resemble the corresponding merge
+	test_cmp expect.ls actual.ls &&
+	test_cmp expect.diff actual.diff
+
+HEAD is now at a4ae168 add three and four
+HEAD is now at a4ae168 add three and four
+Performing three-way merge...
+Applied patch to 'four' with conflicts.
+Performing three-way merge...
+Applied patch to 'three' cleanly.
+U four
+Recorded preimage for 'four'
+ok 10 - apply -3 with add/add conflict
+
+expecting success of 4108.11 'apply -3 with add/add conflict (dirty working tree)': 
+	# should fail to apply ...
+	git reset --hard &&
+	git checkout adder^0 &&
+	echo >>four &&
+	cat four >four.save &&
+	cat three >three.save &&
+	git ls-files -s >expect.ls &&
+	test_must_fail git apply --index --3way P.diff &&
+	# ... and should not touch anything
+	git ls-files -s >actual.ls &&
+	test_cmp expect.ls actual.ls &&
+	test_cmp four.save four &&
+	test_cmp three.save three
+
+HEAD is now at a4ae168 add three and four
+HEAD is now at a4ae168 add three and four
+Performing three-way merge...
+error: four: does not match index
+error: cannot read the current contents of 'four'
+error: four: patch does not apply
+Performing three-way merge...
+Applied patch to 'three' cleanly.
+ok 11 - apply -3 with add/add conflict (dirty working tree)
+
+expecting success of 4108.12 'apply -3 with ambiguous repeating file': 
+	git reset --hard &&
+	test_write_lines 1 2 1 2 1 2 1 2 1 2 1 >one_two_repeat &&
+	git add one_two_repeat &&
+	git commit -m "init one" &&
+	test_write_lines 1 2 1 2 1 2 1 2 one 2 1 >one_two_repeat &&
+	git commit -a -m "change one" &&
+
+	git diff HEAD~ >Repeat.diff &&
+	git reset --hard HEAD~ &&
+
+	test_write_lines 1 2 1 2 1 2 one 2 1 2 one >one_two_repeat &&
+	git commit -a -m "change surrounding one" &&
+
+	git apply --index --3way Repeat.diff &&
+	test_write_lines 1 2 1 2 1 2 one 2 one 2 one >expect &&
+
+	test_cmp expect one_two_repeat
+
+HEAD is now at a4ae168 add three and four
+[detached HEAD 4fe2a89] init one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 one_two_repeat
+[detached HEAD 0e42fdf] change one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 4fe2a89 init one
+[detached HEAD 5364b93] change surrounding one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Applied patch to 'one_two_repeat' cleanly.
+ok 12 - apply -3 with ambiguous repeating file
+
+expecting success of 4108.13 'apply with --3way --cached clean apply': 
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding cleanly applied merge
+	git reset --hard &&
+	git checkout main~ &&
+	git merge --no-commit side &&
+	git ls-files -s >expect.ls &&
+
+	# should succeed
+	git reset --hard &&
+	git checkout main~ &&
+	git apply --cached --3way P.diff &&
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The cache should resemble the corresponding merge
+	# (both files at stage #0)
+	test_cmp expect.ls actual.ls &&
+	# However the working directory should not change
+	>expect.diff &&
+	test_cmp expect.diff actual.diff
+
+HEAD is now at 5364b93 change surrounding one
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  5364b93 change surrounding one
+  4fe2a89 init one
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 5364b93
+
+HEAD is now at acfd9ea initial
+Updating acfd9ea..3dc6c9f
+Fast-forward
+ one | 2 +-
+ two | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at 3dc6c9f side
+Previous HEAD position was 3dc6c9f side
+HEAD is now at acfd9ea initial
+Applied patch to 'one' cleanly.
+Applied patch to 'two' cleanly.
+ok 13 - apply with --3way --cached clean apply
+
+expecting success of 4108.14 'apply with --3way --cached and conflicts': 
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding conflicted merge
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git merge --no-commit side &&
+	git ls-files -s >expect.ls &&
+
+	# should fail to apply
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git apply --cached --3way P.diff &&
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The cache should resemble the corresponding merge
+	# (one file at stage #0, one file at stages #1 #2 #3)
+	test_cmp expect.ls actual.ls &&
+	# However the working directory should not change
+	>expect.diff &&
+	test_cmp expect.diff actual.diff
+
+HEAD is now at acfd9ea initial
+Previous HEAD position was acfd9ea initial
+HEAD is now at cc2039c main
+Auto-merging one
+CONFLICT (content): Merge conflict in one
+Auto-merging two
+Resolved 'one' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+Applied patch to 'one' with conflicts.
+Applied patch to 'two' cleanly.
+U one
+ok 14 - apply with --3way --cached and conflicts
+
+expecting success of 4108.15 'apply binary file patch': 
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --binary >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply bin.diff
+
+HEAD is now at cc2039c main
+[detached HEAD 5c7d1bd] add binary file
+ Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- funny /empty |    0 
+ create mode 100644 bin.png
+HEAD is now at 5c7d1bd add binary file
+ok 15 - apply binary file patch
+
+expecting success of 4108.16 'apply binary file patch with 3way': 
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --binary >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply --3way --index bin.diff
+
+HEAD is now at cc2039c main
+[detached HEAD 5c7d1bd] add binary file
+ Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- funny /empty |    0 
+ create mode 100644 bin.png
+HEAD is now at 5c7d1bd add binary file
+Applied patch to 'bin.png' cleanly.
+ok 16 - apply binary file patch with 3way
+
+expecting success of 4108.17 'apply full-index patch with 3way': 
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --full-index >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply --3way --index bin.diff
+
+HEAD is now at cc2039c main
+[detached HEAD 5c7d1bd] add binary file
+ Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at 3401d02 empty commit
-ok 8 - apply with no-contents and a funny pathname
+ create mode 100644 bin.png
+HEAD is now at 5c7d1bd add binary file
+Applied patch to 'bin.png' cleanly.
+ok 17 - apply full-index patch with 3way
 
-# passed all 8 test(s)
-1..8
+expecting success of 4108.18 'apply delete then new patch with 3way': 
+	git reset --hard main &&
+	test_write_lines 2 > delnew &&
+	git add delnew &&
+	git diff --cached >> new.patch &&
+	git reset --hard &&
+	test_write_lines 1 > delnew &&
+	git add delnew &&
+	git commit -m "delnew" &&
+	rm delnew &&
+	git diff >> delete-then-new.patch &&
+	cat new.patch >> delete-then-new.patch &&
+
+	git checkout -- . &&
+	# Apply must succeed.
+	git apply --3way delete-then-new.patch
+
+HEAD is now at cc2039c main
+HEAD is now at cc2039c main
+[detached HEAD ba7e832] delnew
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 delnew
+Falling back to direct application...
+Falling back to direct application...
+ok 18 - apply delete then new patch with 3way
+
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4131-apply-fake-ancestor.sh ***
@@ -271890,6 +272255,123 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4127-apply-same-fn.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4127-apply-same-fn/.git/
+expecting success of 4127.1 'setup': 
+	test_write_lines a b c d e f g h i j k l m >same_fn &&
+	cp same_fn other_fn &&
+	git add same_fn other_fn &&
+	git commit -m initial
+
+[master (root-commit) a38c7c5] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 26 insertions(+)
+ create mode 100644 other_fn
+ create mode 100644 same_fn
+ok 1 - setup
+
+expecting success of 4127.2 'apply same filename with independent changes': 
+	modify "s/^d/z/" same_fn &&
+	git diff > patch0 &&
+	git add same_fn &&
+	modify "s/^i/y/" same_fn &&
+	git diff >> patch0 &&
+	cp same_fn same_fn2 &&
+	git reset --hard &&
+	git apply patch0 &&
+	test_cmp same_fn same_fn2
+
+HEAD is now at a38c7c5 initial
+ok 2 - apply same filename with independent changes
+
+expecting success of 4127.3 'apply same filename with overlapping changes': 
+	git reset --hard &&
+
+	# Store same_fn so that we can check apply -R in next test
+	cp same_fn same_fn1 &&
+
+	modify "s/^d/z/" same_fn &&
+	git diff > patch0 &&
+	git add same_fn &&
+	modify "s/^e/y/" same_fn &&
+	git diff >> patch0 &&
+	cp same_fn same_fn2 &&
+	git reset --hard &&
+	git apply patch0 &&
+	test_cmp same_fn same_fn2
+
+HEAD is now at a38c7c5 initial
+HEAD is now at a38c7c5 initial
+ok 3 - apply same filename with overlapping changes
+
+expecting success of 4127.4 'apply same filename with overlapping changes, in reverse': 
+	git apply -R patch0 &&
+	test_cmp same_fn same_fn1
+
+ok 4 - apply same filename with overlapping changes, in reverse
+
+expecting success of 4127.5 'apply same new filename after rename': 
+	git reset --hard &&
+	git mv same_fn new_fn &&
+	modify "s/^d/z/" new_fn &&
+	git add new_fn &&
+	git diff -M --cached > patch1 &&
+	modify "s/^e/y/" new_fn &&
+	git diff >> patch1 &&
+	cp new_fn new_fn2 &&
+	git reset --hard &&
+	git apply --index patch1 &&
+	test_cmp new_fn new_fn2
+
+HEAD is now at a38c7c5 initial
+HEAD is now at a38c7c5 initial
+ok 5 - apply same new filename after rename
+
+expecting success of 4127.6 'apply same old filename after rename -- should fail.': 
+	git reset --hard &&
+	git mv same_fn new_fn &&
+	modify "s/^d/z/" new_fn &&
+	git add new_fn &&
+	git diff -M --cached > patch1 &&
+	git mv new_fn same_fn &&
+	modify "s/^e/y/" same_fn &&
+	git diff >> patch1 &&
+	git reset --hard &&
+	test_must_fail git apply patch1
+
+HEAD is now at a38c7c5 initial
+HEAD is now at a38c7c5 initial
+error: path same_fn has been renamed/deleted
+ok 6 - apply same old filename after rename -- should fail.
+
+expecting success of 4127.7 'apply A->B (rename), C->A (rename), A->A -- should pass.': 
+	git reset --hard &&
+	git mv same_fn new_fn &&
+	modify "s/^d/z/" new_fn &&
+	git add new_fn &&
+	git diff -M --cached > patch1 &&
+	git commit -m "a rename" &&
+	git mv other_fn same_fn &&
+	modify "s/^e/y/" same_fn &&
+	git add same_fn &&
+	git diff -M --cached >> patch1 &&
+	modify "s/^g/x/" same_fn &&
+	git diff >> patch1 &&
+	git reset --hard HEAD^ &&
+	git apply patch1
+
+HEAD is now at a38c7c5 initial
+[master d59c5fe] a rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename same_fn => new_fn (92%)
+HEAD is now at a38c7c5 initial
+ok 7 - apply A->B (rename), C->A (rename), A->A -- should pass.
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4134-apply-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4134-apply-submodule/.git/
 expecting success of 4134.1 'setup': 
@@ -271926,228 +272408,70 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4122-apply-symlink-inside.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t4133-apply-filenames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-)
-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 &&
+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
 
-	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 &&
+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
 
-	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 &&
+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
 
-	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 &&
+error: git diff header lacks filename information (line 4)
+ok 3 - apply diff with new filename missing from headers
 
-	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
+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
 
-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)
+error: git diff header lacks filename information (line 4)
+ok 4 - apply diff with old filename missing from headers
 
-# passed all 7 test(s)
-1..7
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4132-apply-removal.sh ***
@@ -272713,123 +273037,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4127-apply-same-fn.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4127-apply-same-fn/.git/
-expecting success of 4127.1 'setup': 
-	test_write_lines a b c d e f g h i j k l m >same_fn &&
-	cp same_fn other_fn &&
-	git add same_fn other_fn &&
-	git commit -m initial
-
-[master (root-commit) a38c7c5] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 26 insertions(+)
- create mode 100644 other_fn
- create mode 100644 same_fn
-ok 1 - setup
-
-expecting success of 4127.2 'apply same filename with independent changes': 
-	modify "s/^d/z/" same_fn &&
-	git diff > patch0 &&
-	git add same_fn &&
-	modify "s/^i/y/" same_fn &&
-	git diff >> patch0 &&
-	cp same_fn same_fn2 &&
-	git reset --hard &&
-	git apply patch0 &&
-	test_cmp same_fn same_fn2
-
-HEAD is now at a38c7c5 initial
-ok 2 - apply same filename with independent changes
-
-expecting success of 4127.3 'apply same filename with overlapping changes': 
-	git reset --hard &&
-
-	# Store same_fn so that we can check apply -R in next test
-	cp same_fn same_fn1 &&
-
-	modify "s/^d/z/" same_fn &&
-	git diff > patch0 &&
-	git add same_fn &&
-	modify "s/^e/y/" same_fn &&
-	git diff >> patch0 &&
-	cp same_fn same_fn2 &&
-	git reset --hard &&
-	git apply patch0 &&
-	test_cmp same_fn same_fn2
-
-HEAD is now at a38c7c5 initial
-HEAD is now at a38c7c5 initial
-ok 3 - apply same filename with overlapping changes
-
-expecting success of 4127.4 'apply same filename with overlapping changes, in reverse': 
-	git apply -R patch0 &&
-	test_cmp same_fn same_fn1
-
-ok 4 - apply same filename with overlapping changes, in reverse
-
-expecting success of 4127.5 'apply same new filename after rename': 
-	git reset --hard &&
-	git mv same_fn new_fn &&
-	modify "s/^d/z/" new_fn &&
-	git add new_fn &&
-	git diff -M --cached > patch1 &&
-	modify "s/^e/y/" new_fn &&
-	git diff >> patch1 &&
-	cp new_fn new_fn2 &&
-	git reset --hard &&
-	git apply --index patch1 &&
-	test_cmp new_fn new_fn2
-
-HEAD is now at a38c7c5 initial
-HEAD is now at a38c7c5 initial
-ok 5 - apply same new filename after rename
-
-expecting success of 4127.6 'apply same old filename after rename -- should fail.': 
-	git reset --hard &&
-	git mv same_fn new_fn &&
-	modify "s/^d/z/" new_fn &&
-	git add new_fn &&
-	git diff -M --cached > patch1 &&
-	git mv new_fn same_fn &&
-	modify "s/^e/y/" same_fn &&
-	git diff >> patch1 &&
-	git reset --hard &&
-	test_must_fail git apply patch1
-
-HEAD is now at a38c7c5 initial
-HEAD is now at a38c7c5 initial
-error: path same_fn has been renamed/deleted
-ok 6 - apply same old filename after rename -- should fail.
-
-expecting success of 4127.7 'apply A->B (rename), C->A (rename), A->A -- should pass.': 
-	git reset --hard &&
-	git mv same_fn new_fn &&
-	modify "s/^d/z/" new_fn &&
-	git add new_fn &&
-	git diff -M --cached > patch1 &&
-	git commit -m "a rename" &&
-	git mv other_fn same_fn &&
-	modify "s/^e/y/" same_fn &&
-	git add same_fn &&
-	git diff -M --cached >> patch1 &&
-	modify "s/^g/x/" same_fn &&
-	git diff >> patch1 &&
-	git reset --hard HEAD^ &&
-	git apply patch1
-
-HEAD is now at a38c7c5 initial
-[master d59c5fe] a rename
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename same_fn => new_fn (92%)
-HEAD is now at a38c7c5 initial
-ok 7 - apply A->B (rename), C->A (rename), A->A -- should pass.
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4136-apply-check.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4136-apply-check/.git/
 expecting success of 4136.1 'setup': 
@@ -272906,6 +273113,262 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4129-apply-samemode.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4129-apply-samemode/.git/
+expecting success of 4129.1 'setup': 
+	echo original >file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git tag initial &&
+	echo modified >file &&
+	git diff --stat -p >patch-0.txt &&
+	chmod +x file &&
+	git diff --stat -p >patch-1.txt &&
+	sed "s/^\(new mode \).*/\1/" <patch-1.txt >patch-empty-mode.txt &&
+	sed "s/^\(new mode \).*/\1garbage/" <patch-1.txt >patch-bogus-mode.txt
+
+[master (root-commit) e950771] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+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 4129.2 'same mode (no index)': 
+	git reset --hard &&
+	chmod +x file &&
+	git apply patch-0.txt &&
+	test -x file
+
+HEAD is now at e950771 initial
+warning: file has type 100755, expected 100644
+ok 2 - same mode (no index)
+
+expecting success of 4129.3 'same mode (with index)': 
+	git reset --hard &&
+	chmod +x file &&
+	git add file &&
+	git apply --index patch-0.txt &&
+	test -x file &&
+	git diff --exit-code
+
+HEAD is now at e950771 initial
+warning: file has type 100755, expected 100644
+ok 3 - same mode (with index)
+
+expecting success of 4129.4 'same mode (index only)': 
+	git reset --hard &&
+	chmod +x file &&
+	git add file &&
+	git apply --cached patch-0.txt &&
+	git ls-files -s file >ls-files-output &&
+	test_grep "^100755" ls-files-output
+
+HEAD is now at e950771 initial
+warning: file has type 100755, expected 100644
+100755 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0	file
+ok 4 - same mode (index only)
+
+expecting success of 4129.5 'mode update (no index)': 
+	git reset --hard &&
+	git apply patch-1.txt &&
+	test -x file
+
+HEAD is now at e950771 initial
+ok 5 - mode update (no index)
+
+expecting success of 4129.6 'mode update (with index)': 
+	git reset --hard &&
+	git apply --index patch-1.txt &&
+	test -x file &&
+	git diff --exit-code
+
+HEAD is now at e950771 initial
+ok 6 - mode update (with index)
+
+expecting success of 4129.7 'mode update (index only)': 
+	git reset --hard &&
+	git apply --cached patch-1.txt &&
+	git ls-files -s file >ls-files-output &&
+	test_grep "^100755" ls-files-output
+
+HEAD is now at e950771 initial
+100755 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0	file
+ok 7 - mode update (index only)
+
+expecting success of 4129.8 'empty mode is rejected': 
+	git reset --hard &&
+	test_must_fail git apply patch-empty-mode.txt 2>err &&
+	test_grep "invalid mode" err
+
+HEAD is now at e950771 initial
+error: invalid mode on line 5: 
+ok 8 - empty mode is rejected
+
+expecting success of 4129.9 'bogus mode is rejected': 
+	git reset --hard &&
+	test_must_fail git apply patch-bogus-mode.txt 2>err &&
+	test_grep "invalid mode" err
+
+HEAD is now at e950771 initial
+error: invalid mode on line 5: garbage
+ok 9 - bogus mode is rejected
+
+expecting success of 4129.10 'do not use core.sharedRepository for working tree files': 
+	git reset --hard &&
+	test_config core.sharedRepository 0666 &&
+	(
+		# Remove a default ACL if possible.
+		(setfacl -k . 2>/dev/null || true) &&
+		umask 0077 &&
+
+		# Test both files (f1) and leading dirs (d)
+		mkdir d &&
+		touch f1 d/f2 &&
+		git add f1 d/f2 &&
+		git diff --staged >patch-f1-and-f2.txt &&
+
+		rm -rf d f1 &&
+		git apply patch-f1-and-f2.txt &&
+
+		echo "-rw-------" >f1_mode.expected &&
+		echo "drwx------" >d_mode.expected &&
+		test_modebits f1 >f1_mode.actual &&
+		test_modebits d >d_mode.actual &&
+		test_cmp f1_mode.expected f1_mode.actual &&
+		test_cmp d_mode.expected d_mode.actual
+	)
+
+HEAD is now at e950771 initial
+ok 10 - do not use core.sharedRepository for working tree files
+
+expecting success of 4129.11 'git apply respects core.fileMode': 
+	test_config core.fileMode false &&
+	echo true >script.sh &&
+	git add --chmod=+x script.sh &&
+	git ls-files -s script.sh >ls-files-output &&
+	test_grep "^100755" ls-files-output &&
+	test_tick && git commit -m "Add script" &&
+	git ls-tree -r HEAD script.sh >ls-tree-output &&
+	test_grep "^100755" ls-tree-output &&
+
+	echo true >>script.sh &&
+	test_tick && git commit -m "Modify script" script.sh &&
+	git format-patch -1 --stdout >patch &&
+	test_grep "^index.*100755$" patch &&
+
+	git switch -c branch HEAD^ &&
+	git apply --index patch 2>err &&
+	test_grep ! "has type 100644, expected 100755" err &&
+	git reset --hard &&
+
+	git apply patch 2>err &&
+	test_grep ! "has type 100644, expected 100755" err &&
+
+	git apply --cached patch 2>err &&
+	test_grep ! "has type 100644, expected 100755" err
+
+100755 27ba77ddaf61532f217964734769a42cdabc17dc 0	script.sh
+[master 7ddccb0] Add script
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ create mode 100644 d/f2
+ create mode 100644 f1
+ create mode 100755 script.sh
+100755 blob 27ba77ddaf61532f217964734769a42cdabc17dc	script.sh
+[master eb5db54] Modify script
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+index 27ba77d..bb101b6 100755
+Switched to a new branch 'branch'
+HEAD is now at 7ddccb0 Add script
+ok 11 - git apply respects core.fileMode
+
+expecting success of 4129.12 'patch mode for new file is canonicalized': 
+	cat >patch <<-\EOF &&
+	diff --git a/non-canon b/non-canon
+	new file mode 100660
+	--- /dev/null
+	+++ b/non-canon
+	+content
+	EOF
+	test_when_finished "git reset --hard" &&
+	(
+		umask 0 &&
+		git apply --index patch 2>err
+	) &&
+	test_must_be_empty err &&
+	git ls-files -s -- non-canon >staged &&
+	test_grep "^100644" staged &&
+	ls -l non-canon >worktree &&
+	test_grep "^-rw-rw-rw" worktree
+
+100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	non-canon
+-rw-rw-rw- 1 pbuilder2 pbuilder2 0 Mar 14 13:31 non-canon
+HEAD is now at 7ddccb0 Add script
+ok 12 - patch mode for new file is canonicalized
+
+expecting success of 4129.13 'patch mode for deleted file is canonicalized': 
+	test_when_finished "git reset --hard" &&
+	echo content >non-canon &&
+	chmod 666 non-canon &&
+	git add non-canon &&
+
+	cat >patch <<-\EOF &&
+	diff --git a/non-canon b/non-canon
+	deleted file mode 100660
+	--- a/non-canon
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-content
+	EOF
+	git apply --index patch 2>err &&
+	test_must_be_empty err &&
+	git ls-files -- non-canon >staged &&
+	test_must_be_empty staged &&
+	test_path_is_missing non-canon
+
+HEAD is now at 7ddccb0 Add script
+ok 13 - patch mode for deleted file is canonicalized
+
+expecting success of 4129.14 'patch mode for mode change is canonicalized': 
+	test_when_finished "git reset --hard" &&
+	echo content >non-canon &&
+	git add non-canon &&
+
+	cat >patch <<-\EOF &&
+	diff --git a/non-canon b/non-canon
+	old mode 100660
+	new mode 100770
+	EOF
+	(
+		umask 0 &&
+		git apply --index patch 2>err
+	) &&
+	test_must_be_empty err &&
+	git ls-files -s -- non-canon >staged &&
+	test_grep "^100755" staged &&
+	ls -l non-canon >worktree &&
+	test_grep "^-rwxrwxrwx" worktree
+
+100755 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	non-canon
+-rwxrwxrwx 1 pbuilder2 pbuilder2 8 Mar 14 13:31 non-canon
+HEAD is now at 7ddccb0 Add script
+ok 14 - patch mode for mode change is canonicalized
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4141-apply-too-large.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4141-apply-too-large/.git/
 checking prerequisite: EXPENSIVE
@@ -273102,526 +273565,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4108-apply-threeway.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4108-apply-threeway/.git/
-expecting success of 4108.1 'setup': 
-	test_tick &&
-	test_write_lines 1 2 3 4 5 6 7 >one &&
-	cat one >two &&
-	git add one two &&
-	git commit -m initial &&
-
-	git branch side &&
-
-	test_tick &&
-	test_write_lines 1 two 3 4 5 six 7 >one &&
-	test_write_lines 1 two 3 4 5 6 7 >two &&
-	git commit -a -m main &&
-
-	git checkout side &&
-	test_write_lines 1 2 3 4 five 6 7 >one &&
-	test_write_lines 1 2 3 4 five 6 7 >two &&
-	git commit -a -m side &&
-
-	git checkout main
-
-[main (root-commit) acfd9ea] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 one
- create mode 100644 two
-[main cc2039c] main
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+), 3 deletions(-)
-Switched to branch 'side'
-[side 3dc6c9f] side
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 4108.2 'apply without --3way': 
-	git diff side^ side >P.diff &&
-
-	# should fail to apply
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git apply --index P.diff &&
-	# should leave things intact
-	git diff-files --exit-code &&
-	git diff-index --exit-code --cached HEAD
-
-HEAD is now at cc2039c main
-Note: switching to 'main^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at cc2039c main
-error: patch failed: one:2
-error: one: patch does not apply
-error: patch failed: two:2
-error: two: patch does not apply
-ok 2 - apply without --3way
-
-expecting success of 4108.3 'apply with --3way': 
-	test_apply_with_3way
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-ok 3 - apply with --3way
-
-expecting success of 4108.4 'apply with --3way with merge.conflictStyle = diff3': 
-	test_config merge.conflictStyle diff3 &&
-	test_apply_with_3way
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-ok 4 - apply with --3way with merge.conflictStyle = diff3
-
-expecting success of 4108.5 'apply with --3way --ours': 
-	test_apply_with_3way_favoritism --ours -Xours
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-Auto-merging two
-Automatic merge went well; stopped before committing as requested
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 5 - apply with --3way --ours
-
-expecting success of 4108.6 'apply with --3way --theirs': 
-	test_apply_with_3way_favoritism --theirs -Xtheirs
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-Auto-merging two
-Automatic merge went well; stopped before committing as requested
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 6 - apply with --3way --theirs
-
-expecting success of 4108.7 'apply with --3way --union': 
-	echo "* merge=union" >.gitattributes &&
-	test_apply_with_3way_favoritism --union &&
-	rm .gitattributes
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-Auto-merging two
-Automatic merge went well; stopped before committing as requested
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 7 - apply with --3way --union
-
-expecting success of 4108.8 'apply with --3way with rerere enabled': 
-	test_config rerere.enabled true &&
-
-	# Merging side should be similar to applying this patch
-	git diff ...side >P.diff &&
-
-	# The corresponding conflicted merge
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git merge --no-commit side &&
-
-	# Manually resolve and record the resolution
-	test_write_lines 1 two 3 4 five six 7 >one &&
-	git rerere &&
-	cat one >expect &&
-
-	# should fail to apply
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git apply --index --3way P.diff &&
-
-	# but rerere should have replayed the recorded resolution
-	test_cmp expect one
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Recorded preimage for 'one'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'one'.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-Resolved 'one' using previous resolution.
-ok 8 - apply with --3way with rerere enabled
-
-expecting success of 4108.9 'apply -3 with add/add conflict setup': 
-	git reset --hard &&
-
-	git checkout -b adder &&
-	test_write_lines 1 2 3 4 5 6 7 >three &&
-	test_write_lines 1 2 3 4 5 6 7 >four &&
-	git add three four &&
-	git commit -m "add three and four" &&
-
-	git checkout -b another adder^ &&
-	test_write_lines 1 2 3 4 5 6 7 >three &&
-	test_write_lines 1 2 3 four 5 6 7 >four &&
-	git add three four &&
-	git commit -m "add three and four" &&
-
-	# Merging another should be similar to applying this patch
-	git diff adder...another >P.diff &&
-
-	git checkout adder^0 &&
-	test_must_fail git merge --no-commit another &&
-	git ls-files -s >expect.ls &&
-	print_sanitized_conflicted_diff >expect.diff
-
-HEAD is now at cc2039c main
-Switched to a new branch 'adder'
-[adder a4ae168] add three and four
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 four
- create mode 100644 three
-Switched to a new branch 'another'
-[another 668e9f0] add three and four
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 four
- create mode 100644 three
-Note: switching to 'adder^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at a4ae168 add three and four
-Auto-merging four
-CONFLICT (add/add): Merge conflict in four
-Recorded preimage for 'four'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 9 - apply -3 with add/add conflict setup
-
-expecting success of 4108.10 'apply -3 with add/add conflict': 
-	# should fail to apply ...
-	git reset --hard &&
-	git checkout adder^0 &&
-	test_must_fail git apply --index --3way P.diff &&
-	# ... and leave conflicts in the index and in the working tree
-	git ls-files -s >actual.ls &&
-	print_sanitized_conflicted_diff >actual.diff &&
-
-	# The result should resemble the corresponding merge
-	test_cmp expect.ls actual.ls &&
-	test_cmp expect.diff actual.diff
-
-HEAD is now at a4ae168 add three and four
-HEAD is now at a4ae168 add three and four
-Performing three-way merge...
-Applied patch to 'four' with conflicts.
-Performing three-way merge...
-Applied patch to 'three' cleanly.
-U four
-Recorded preimage for 'four'
-ok 10 - apply -3 with add/add conflict
-
-expecting success of 4108.11 'apply -3 with add/add conflict (dirty working tree)': 
-	# should fail to apply ...
-	git reset --hard &&
-	git checkout adder^0 &&
-	echo >>four &&
-	cat four >four.save &&
-	cat three >three.save &&
-	git ls-files -s >expect.ls &&
-	test_must_fail git apply --index --3way P.diff &&
-	# ... and should not touch anything
-	git ls-files -s >actual.ls &&
-	test_cmp expect.ls actual.ls &&
-	test_cmp four.save four &&
-	test_cmp three.save three
-
-HEAD is now at a4ae168 add three and four
-HEAD is now at a4ae168 add three and four
-Performing three-way merge...
-error: four: does not match index
-error: cannot read the current contents of 'four'
-error: four: patch does not apply
-Performing three-way merge...
-Applied patch to 'three' cleanly.
-ok 11 - apply -3 with add/add conflict (dirty working tree)
-
-expecting success of 4108.12 'apply -3 with ambiguous repeating file': 
-	git reset --hard &&
-	test_write_lines 1 2 1 2 1 2 1 2 1 2 1 >one_two_repeat &&
-	git add one_two_repeat &&
-	git commit -m "init one" &&
-	test_write_lines 1 2 1 2 1 2 1 2 one 2 1 >one_two_repeat &&
-	git commit -a -m "change one" &&
-
-	git diff HEAD~ >Repeat.diff &&
-	git reset --hard HEAD~ &&
-
-	test_write_lines 1 2 1 2 1 2 one 2 1 2 one >one_two_repeat &&
-	git commit -a -m "change surrounding one" &&
-
-	git apply --index --3way Repeat.diff &&
-	test_write_lines 1 2 1 2 1 2 one 2 one 2 one >expect &&
-
-	test_cmp expect one_two_repeat
-
-HEAD is now at a4ae168 add three and four
-[detached HEAD 4fe2a89] init one
- Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 one_two_repeat
-[detached HEAD 0e42fdf] change one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 4fe2a89 init one
-[detached HEAD 5364b93] change surrounding one
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Applied patch to 'one_two_repeat' cleanly.
-ok 12 - apply -3 with ambiguous repeating file
-
-expecting success of 4108.13 'apply with --3way --cached clean apply': 
-	# Merging side should be similar to applying this patch
-	git diff ...side >P.diff &&
-
-	# The corresponding cleanly applied merge
-	git reset --hard &&
-	git checkout main~ &&
-	git merge --no-commit side &&
-	git ls-files -s >expect.ls &&
-
-	# should succeed
-	git reset --hard &&
-	git checkout main~ &&
-	git apply --cached --3way P.diff &&
-	git ls-files -s >actual.ls &&
-	print_sanitized_conflicted_diff >actual.diff &&
-
-	# The cache should resemble the corresponding merge
-	# (both files at stage #0)
-	test_cmp expect.ls actual.ls &&
-	# However the working directory should not change
-	>expect.diff &&
-	test_cmp expect.diff actual.diff
-
-HEAD is now at 5364b93 change surrounding one
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  5364b93 change surrounding one
-  4fe2a89 init one
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 5364b93
-
-HEAD is now at acfd9ea initial
-Updating acfd9ea..3dc6c9f
-Fast-forward
- one | 2 +-
- two | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at 3dc6c9f side
-Previous HEAD position was 3dc6c9f side
-HEAD is now at acfd9ea initial
-Applied patch to 'one' cleanly.
-Applied patch to 'two' cleanly.
-ok 13 - apply with --3way --cached clean apply
-
-expecting success of 4108.14 'apply with --3way --cached and conflicts': 
-	# Merging side should be similar to applying this patch
-	git diff ...side >P.diff &&
-
-	# The corresponding conflicted merge
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git merge --no-commit side &&
-	git ls-files -s >expect.ls &&
-
-	# should fail to apply
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git apply --cached --3way P.diff &&
-	git ls-files -s >actual.ls &&
-	print_sanitized_conflicted_diff >actual.diff &&
-
-	# The cache should resemble the corresponding merge
-	# (one file at stage #0, one file at stages #1 #2 #3)
-	test_cmp expect.ls actual.ls &&
-	# However the working directory should not change
-	>expect.diff &&
-	test_cmp expect.diff actual.diff
-
-HEAD is now at acfd9ea initial
-Previous HEAD position was acfd9ea initial
-HEAD is now at cc2039c main
-Auto-merging one
-CONFLICT (content): Merge conflict in one
-Auto-merging two
-Resolved 'one' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-Applied patch to 'one' with conflicts.
-Applied patch to 'two' cleanly.
-U one
-ok 14 - apply with --3way --cached and conflicts
-
-expecting success of 4108.15 'apply binary file patch': 
-	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
-	git add bin.png &&
-	git commit -m "add binary file" &&
-
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
-
-	git diff --binary >bin.diff &&
-	git reset --hard &&
-
-	# Apply must succeed.
-	git apply bin.diff
-
-HEAD is now at cc2039c main
-[detached HEAD 5c7d1bd] add binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bin.png
-HEAD is now at 5c7d1bd add binary file
-ok 15 - apply binary file patch
-
-expecting success of 4108.16 'apply binary file patch with 3way': 
-	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
-	git add bin.png &&
-	git commit -m "add binary file" &&
-
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
-
-	git diff --binary >bin.diff &&
-	git reset --hard &&
-
-	# Apply must succeed.
-	git apply --3way --index bin.diff
-
-HEAD is now at cc2039c main
-[detached HEAD 5c7d1bd] add binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bin.png
-HEAD is now at 5c7d1bd add binary file
-Applied patch to 'bin.png' cleanly.
-ok 16 - apply binary file patch with 3way
-
-expecting success of 4108.17 'apply full-index patch with 3way': 
-	git reset --hard main &&
-	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
-	git add bin.png &&
-	git commit -m "add binary file" &&
-
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
-
-	git diff --full-index >bin.diff &&
-	git reset --hard &&
-
-	# Apply must succeed.
-	git apply --3way --index bin.diff
-
-HEAD is now at cc2039c main
-[detached HEAD 5c7d1bd] add binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bin.png
-HEAD is now at 5c7d1bd add binary file
-Applied patch to 'bin.png' cleanly.
-ok 17 - apply full-index patch with 3way
-
-expecting success of 4108.18 'apply delete then new patch with 3way': 
-	git reset --hard main &&
-	test_write_lines 2 > delnew &&
-	git add delnew &&
-	git diff --cached >> new.patch &&
-	git reset --hard &&
-	test_write_lines 1 > delnew &&
-	git add delnew &&
-	git commit -m "delnew" &&
-	rm delnew &&
-	git diff >> delete-then-new.patch &&
-	cat new.patch >> delete-then-new.patch &&
-
-	git checkout -- . &&
-	# Apply must succeed.
-	git apply --3way delete-then-new.patch
-
-HEAD is now at cc2039c main
-HEAD is now at cc2039c main
-[detached HEAD ba7e832] delnew
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 delnew
-Falling back to direct application...
-Falling back to direct application...
-ok 18 - apply delete then new patch with 3way
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4140-apply-ita.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4140-apply-ita/.git/
 expecting success of 4140.1 'setup': 
@@ -273817,262 +273760,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4129-apply-samemode.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4129-apply-samemode/.git/
-expecting success of 4129.1 'setup': 
-	echo original >file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git tag initial &&
-	echo modified >file &&
-	git diff --stat -p >patch-0.txt &&
-	chmod +x file &&
-	git diff --stat -p >patch-1.txt &&
-	sed "s/^\(new mode \).*/\1/" <patch-1.txt >patch-empty-mode.txt &&
-	sed "s/^\(new mode \).*/\1garbage/" <patch-1.txt >patch-bogus-mode.txt
-
-[master (root-commit) e950771] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-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 4129.2 'same mode (no index)': 
-	git reset --hard &&
-	chmod +x file &&
-	git apply patch-0.txt &&
-	test -x file
-
-HEAD is now at e950771 initial
-warning: file has type 100755, expected 100644
-ok 2 - same mode (no index)
-
-expecting success of 4129.3 'same mode (with index)': 
-	git reset --hard &&
-	chmod +x file &&
-	git add file &&
-	git apply --index patch-0.txt &&
-	test -x file &&
-	git diff --exit-code
-
-HEAD is now at e950771 initial
-warning: file has type 100755, expected 100644
-ok 3 - same mode (with index)
-
-expecting success of 4129.4 'same mode (index only)': 
-	git reset --hard &&
-	chmod +x file &&
-	git add file &&
-	git apply --cached patch-0.txt &&
-	git ls-files -s file >ls-files-output &&
-	test_grep "^100755" ls-files-output
-
-HEAD is now at e950771 initial
-warning: file has type 100755, expected 100644
-100755 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0	file
-ok 4 - same mode (index only)
-
-expecting success of 4129.5 'mode update (no index)': 
-	git reset --hard &&
-	git apply patch-1.txt &&
-	test -x file
-
-HEAD is now at e950771 initial
-ok 5 - mode update (no index)
-
-expecting success of 4129.6 'mode update (with index)': 
-	git reset --hard &&
-	git apply --index patch-1.txt &&
-	test -x file &&
-	git diff --exit-code
-
-HEAD is now at e950771 initial
-ok 6 - mode update (with index)
-
-expecting success of 4129.7 'mode update (index only)': 
-	git reset --hard &&
-	git apply --cached patch-1.txt &&
-	git ls-files -s file >ls-files-output &&
-	test_grep "^100755" ls-files-output
-
-HEAD is now at e950771 initial
-100755 2e0996000b7e9019eabcad29391bf0f5c7702f0b 0	file
-ok 7 - mode update (index only)
-
-expecting success of 4129.8 'empty mode is rejected': 
-	git reset --hard &&
-	test_must_fail git apply patch-empty-mode.txt 2>err &&
-	test_grep "invalid mode" err
-
-HEAD is now at e950771 initial
-error: invalid mode on line 5: 
-ok 8 - empty mode is rejected
-
-expecting success of 4129.9 'bogus mode is rejected': 
-	git reset --hard &&
-	test_must_fail git apply patch-bogus-mode.txt 2>err &&
-	test_grep "invalid mode" err
-
-HEAD is now at e950771 initial
-error: invalid mode on line 5: garbage
-ok 9 - bogus mode is rejected
-
-expecting success of 4129.10 'do not use core.sharedRepository for working tree files': 
-	git reset --hard &&
-	test_config core.sharedRepository 0666 &&
-	(
-		# Remove a default ACL if possible.
-		(setfacl -k . 2>/dev/null || true) &&
-		umask 0077 &&
-
-		# Test both files (f1) and leading dirs (d)
-		mkdir d &&
-		touch f1 d/f2 &&
-		git add f1 d/f2 &&
-		git diff --staged >patch-f1-and-f2.txt &&
-
-		rm -rf d f1 &&
-		git apply patch-f1-and-f2.txt &&
-
-		echo "-rw-------" >f1_mode.expected &&
-		echo "drwx------" >d_mode.expected &&
-		test_modebits f1 >f1_mode.actual &&
-		test_modebits d >d_mode.actual &&
-		test_cmp f1_mode.expected f1_mode.actual &&
-		test_cmp d_mode.expected d_mode.actual
-	)
-
-HEAD is now at e950771 initial
-ok 10 - do not use core.sharedRepository for working tree files
-
-expecting success of 4129.11 'git apply respects core.fileMode': 
-	test_config core.fileMode false &&
-	echo true >script.sh &&
-	git add --chmod=+x script.sh &&
-	git ls-files -s script.sh >ls-files-output &&
-	test_grep "^100755" ls-files-output &&
-	test_tick && git commit -m "Add script" &&
-	git ls-tree -r HEAD script.sh >ls-tree-output &&
-	test_grep "^100755" ls-tree-output &&
-
-	echo true >>script.sh &&
-	test_tick && git commit -m "Modify script" script.sh &&
-	git format-patch -1 --stdout >patch &&
-	test_grep "^index.*100755$" patch &&
-
-	git switch -c branch HEAD^ &&
-	git apply --index patch 2>err &&
-	test_grep ! "has type 100644, expected 100755" err &&
-	git reset --hard &&
-
-	git apply patch 2>err &&
-	test_grep ! "has type 100644, expected 100755" err &&
-
-	git apply --cached patch 2>err &&
-	test_grep ! "has type 100644, expected 100755" err
-
-100755 27ba77ddaf61532f217964734769a42cdabc17dc 0	script.sh
-[master 7ddccb0] Add script
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- create mode 100644 d/f2
- create mode 100644 f1
- create mode 100755 script.sh
-100755 blob 27ba77ddaf61532f217964734769a42cdabc17dc	script.sh
-[master eb5db54] Modify script
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-index 27ba77d..bb101b6 100755
-Switched to a new branch 'branch'
-HEAD is now at 7ddccb0 Add script
-ok 11 - git apply respects core.fileMode
-
-expecting success of 4129.12 'patch mode for new file is canonicalized': 
-	cat >patch <<-\EOF &&
-	diff --git a/non-canon b/non-canon
-	new file mode 100660
-	--- /dev/null
-	+++ b/non-canon
-	+content
-	EOF
-	test_when_finished "git reset --hard" &&
-	(
-		umask 0 &&
-		git apply --index patch 2>err
-	) &&
-	test_must_be_empty err &&
-	git ls-files -s -- non-canon >staged &&
-	test_grep "^100644" staged &&
-	ls -l non-canon >worktree &&
-	test_grep "^-rw-rw-rw" worktree
-
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	non-canon
--rw-rw-rw- 1 pbuilder1 pbuilder1 0 Feb  9 06:54 non-canon
-HEAD is now at 7ddccb0 Add script
-ok 12 - patch mode for new file is canonicalized
-
-expecting success of 4129.13 'patch mode for deleted file is canonicalized': 
-	test_when_finished "git reset --hard" &&
-	echo content >non-canon &&
-	chmod 666 non-canon &&
-	git add non-canon &&
-
-	cat >patch <<-\EOF &&
-	diff --git a/non-canon b/non-canon
-	deleted file mode 100660
-	--- a/non-canon
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-content
-	EOF
-	git apply --index patch 2>err &&
-	test_must_be_empty err &&
-	git ls-files -- non-canon >staged &&
-	test_must_be_empty staged &&
-	test_path_is_missing non-canon
-
-HEAD is now at 7ddccb0 Add script
-ok 13 - patch mode for deleted file is canonicalized
-
-expecting success of 4129.14 'patch mode for mode change is canonicalized': 
-	test_when_finished "git reset --hard" &&
-	echo content >non-canon &&
-	git add non-canon &&
-
-	cat >patch <<-\EOF &&
-	diff --git a/non-canon b/non-canon
-	old mode 100660
-	new mode 100770
-	EOF
-	(
-		umask 0 &&
-		git apply --index patch 2>err
-	) &&
-	test_must_be_empty err &&
-	git ls-files -s -- non-canon >staged &&
-	test_grep "^100755" staged &&
-	ls -l non-canon >worktree &&
-	test_grep "^-rwxrwxrwx" worktree
-
-100755 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	non-canon
--rwxrwxrwx 1 pbuilder1 pbuilder1 8 Feb  9 06:54 non-canon
-HEAD is now at 7ddccb0 Add script
-ok 14 - patch mode for mode change is canonicalized
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4135-apply-weird-filenames.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4135-apply-weird-filenames/.git/
 expecting success of 4135.1 'setup': 
@@ -274782,6 +274469,555 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4151-am-abort.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4151-am-abort/.git/
+expecting success of 4151.1 'setup': 
+	test_write_lines a b c d e f g >file-1 &&
+	cp file-1 file-2 &&
+	test_tick &&
+	git add file-1 file-2 &&
+	git commit -m initial &&
+	git tag initial &&
+	git format-patch --stdout --root initial >initial.patch &&
+	for i in 2 3 4 5 6
+	do
+		echo $i >>file-1 &&
+		echo $i >otherfile-$i &&
+		git add otherfile-$i &&
+		test_tick &&
+		git commit -a -m $i || return 1
+	done &&
+	git branch changes &&
+	git format-patch --no-numbered initial &&
+	git checkout -b conflicting initial &&
+	echo different >>file-1 &&
+	echo whatever >new-file &&
+	git add file-1 new-file &&
+	git commit -m different &&
+	git checkout -b side initial &&
+	echo local change >file-2-expect
+
+[master (root-commit) 1732241] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+[master a485f10] 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-2
+[master b72e0d7] 3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-3
+[master f1dbda2] 4
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-4
+[master 73a4960] 5
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-5
+[master 87a053c] 6
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-6
+0001-2.patch
+0002-3.patch
+0003-4.patch
+0004-5.patch
+0005-6.patch
+Switched to a new branch 'conflicting'
+[conflicting c626628] different
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 new-file
+Switched to a new branch 'side'
+ok 1 - setup
+
+expecting success of 4151.2 'am stops at a patch that does not apply': 
+
+		git reset --hard initial &&
+		cp file-2-expect file-2 &&
+
+		test_must_fail git am$with3 000[1245]-*.patch &&
+		git log --pretty=tformat:%s >actual &&
+		test_write_lines 3 2 initial >expect &&
+		test_cmp expect actual
+	
+HEAD is now at 1732241 initial
+error: patch failed: file-1:8
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: 2
+Applying: 3
+Applying: 5
+Patch failed at 0003 5
+ok 2 - am stops at a patch that does not apply
+
+expecting success of 4151.3 'am --skip continue after failed am': 
+		test_must_fail git am$with3 --skip >output &&
+		test_grep "^Applying: 6$" output &&
+		test_cmp file-2-expect file-2 &&
+		test ! -f .git/MERGE_RR
+	
+error: patch failed: file-1:9
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: 6
+ok 3 - am --skip continue after failed am
+
+expecting success of 4151.4 'am --abort goes back after failed am': 
+		git am --abort &&
+		git rev-parse HEAD >actual &&
+		git rev-parse initial >expect &&
+		test_cmp expect actual &&
+		test_cmp file-2-expect file-2 &&
+		git diff-index --exit-code --cached HEAD &&
+		test ! -f .git/MERGE_RR
+	
+ok 4 - am --abort goes back after failed am
+
+expecting success of 4151.5 'am -3 stops at a patch that does not apply': 
+
+		git reset --hard initial &&
+		cp file-2-expect file-2 &&
+
+		test_must_fail git am$with3 000[1245]-*.patch &&
+		git log --pretty=tformat:%s >actual &&
+		test_write_lines 3 2 initial >expect &&
+		test_cmp expect actual
+	
+HEAD is now at 1732241 initial
+Applying: 2
+Applying: 3
+Applying: 5
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+62dd7f8 3
+virtual 5
+found 1 common ancestor:
+virtual 2e4b8a989c579cac9d3cc1897320a3e27805d080
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0003 5
+ok 5 - am -3 stops at a patch that does not apply
+
+expecting success of 4151.6 'am -3 --skip continue after failed am -3': 
+		test_must_fail git am$with3 --skip >output &&
+		test_grep "^Applying: 6$" output &&
+		test_cmp file-2-expect file-2 &&
+		test ! -f .git/MERGE_RR
+	
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: 6
+ok 6 - am -3 --skip continue after failed am -3
+
+expecting success of 4151.7 'am --abort goes back after failed am -3': 
+		git am --abort &&
+		git rev-parse HEAD >actual &&
+		git rev-parse initial >expect &&
+		test_cmp expect actual &&
+		test_cmp file-2-expect file-2 &&
+		git diff-index --exit-code --cached HEAD &&
+		test ! -f .git/MERGE_RR
+	
+ok 7 - am --abort goes back after failed am -3
+
+expecting success of 4151.8 'am -3 --skip removes otherfile-4': 
+	git reset --hard initial &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 3 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --skip &&
+	test_cmp_rev initial HEAD &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4
+
+HEAD is now at 1732241 initial
+Applying: 4
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+1732241 initial
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 4
+ok 8 - am -3 --skip removes otherfile-4
+
+expecting success of 4151.9 'am -3 --abort removes otherfile-4': 
+	git reset --hard initial &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 3 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --abort &&
+	test_cmp_rev initial HEAD &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4
+
+HEAD is now at 1732241 initial
+Applying: 4
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+1732241 initial
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 4
+ok 9 - am -3 --abort removes otherfile-4
+
+expecting success of 4151.10 'am --abort will keep the local commits intact': 
+	test_must_fail git am 0004-*.patch &&
+	test_commit unrelated &&
+	git rev-parse HEAD >expect &&
+	git am --abort &&
+	git rev-parse HEAD >actual &&
+	test_cmp expect actual
+
+error: patch failed: file-1:8
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: 5
+Patch failed at 0001 5
+[side f386b22] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated.t
+warning: You seem to have moved HEAD since the last 'am' failure.
+Not rewinding to ORIG_HEAD
+ok 10 - am --abort will keep the local commits intact
+
+expecting success of 4151.11 'am --abort will keep dirty index intact': 
+	git reset --hard initial &&
+	echo dirtyfile >dirtyfile &&
+	cp dirtyfile dirtyfile.expected &&
+	git add dirtyfile &&
+	test_must_fail git am 0001-*.patch &&
+	test_cmp_rev initial HEAD &&
+	test_path_is_file dirtyfile &&
+	test_cmp dirtyfile.expected dirtyfile &&
+	git am --abort &&
+	test_cmp_rev initial HEAD &&
+	test_path_is_file dirtyfile &&
+	test_cmp dirtyfile.expected dirtyfile
+
+HEAD is now at 1732241 initial
+fatal: Dirty index: cannot apply patches (dirty: dirtyfile)
+ok 11 - am --abort will keep dirty index intact
+
+expecting success of 4151.12 'am -3 stops on conflict on unborn branch': 
+	git checkout -f --orphan orphan &&
+	git reset &&
+	rm -f otherfile-4 &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 2 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)"
+
+Switched to a new branch 'orphan'
+Applying: 4
+Using index info to reconstruct a base tree...
+A	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+virtual HEAD
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree at file-1~4.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 4
+ok 12 - am -3 stops on conflict on unborn branch
+
+expecting success of 4151.13 'am -3 --skip clears index on unborn branch': 
+	test_path_is_dir .git/rebase-apply &&
+	echo tmpfile >tmpfile &&
+	git add tmpfile &&
+	git am --skip &&
+	test -z "$(git ls-files)" &&
+	test_path_is_missing otherfile-4 &&
+	test_path_is_missing tmpfile
+
+ok 13 - am -3 --skip clears index on unborn branch
+
+expecting success of 4151.14 'am -3 --abort removes otherfile-4 on unborn branch': 
+	git checkout -f --orphan orphan &&
+	git reset &&
+	rm -f otherfile-4 file-1 &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 2 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --abort &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4
+
+Switched to a new branch 'orphan'
+Applying: 4
+Using index info to reconstruct a base tree...
+A	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+virtual HEAD
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 4
+ok 14 - am -3 --abort removes otherfile-4 on unborn branch
+
+expecting success of 4151.15 'am -3 --abort on unborn branch removes applied commits': 
+	git checkout -f --orphan orphan &&
+	git reset &&
+	rm -f otherfile-4 otherfile-2 file-1 file-2 &&
+	test_must_fail git am -3 initial.patch 0003-*.patch &&
+	test 3 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --abort &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4 &&
+	test_path_is_missing file-1 &&
+	test_path_is_missing file-2 &&
+	test 0 -eq $(git log --oneline 2>/dev/null | wc -l) &&
+	test refs/heads/orphan = "$(git symbolic-ref HEAD)"
+
+Switched to a new branch 'orphan'
+applying to an empty history
+Applying: initial
+Applying: 4
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+03bb45f initial
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 4
+ok 15 - am -3 --abort on unborn branch removes applied commits
+
+expecting success of 4151.16 'am --abort on unborn branch will keep local commits intact': 
+	git checkout -f --orphan orphan &&
+	git reset &&
+	test_must_fail git am 0004-*.patch &&
+	test_commit unrelated2 &&
+	git rev-parse HEAD >expect &&
+	git am --abort &&
+	git rev-parse HEAD >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'orphan'
+error: file-1: does not exist in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: 5
+Patch failed at 0001 5
+[orphan (root-commit) 823805c] unrelated2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated2.t
+warning: You seem to have moved HEAD since the last 'am' failure.
+Not rewinding to ORIG_HEAD
+ok 16 - am --abort on unborn branch will keep local commits intact
+
+expecting success of 4151.17 'am --skip leaves index stat info alone': 
+	git checkout -f --orphan skip-stat-info &&
+	git reset &&
+	test_commit skip-should-be-untouched &&
+	test-tool chmtime =0 skip-should-be-untouched.t &&
+	git update-index --refresh &&
+	git diff-files --exit-code --quiet &&
+	test_must_fail git am 0001-*.patch &&
+	git am --skip &&
+	git diff-files --exit-code --quiet
+
+Switched to a new branch 'skip-stat-info'
+[skip-stat-info (root-commit) 2297a89] skip-should-be-untouched
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 skip-should-be-untouched.t
+error: file-1: does not exist in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: 2
+Patch failed at 0001 2
+ok 17 - am --skip leaves index stat info alone
+
+expecting success of 4151.18 'am --abort leaves index stat info alone': 
+	git checkout -f --orphan abort-stat-info &&
+	git reset &&
+	test_commit abort-should-be-untouched &&
+	test-tool chmtime =0 abort-should-be-untouched.t &&
+	git update-index --refresh &&
+	git diff-files --exit-code --quiet &&
+	test_must_fail git am 0001-*.patch &&
+	git am --abort &&
+	git diff-files --exit-code --quiet
+
+Switched to a new branch 'abort-stat-info'
+[abort-stat-info (root-commit) 3038985] abort-should-be-untouched
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abort-should-be-untouched.t
+error: file-1: does not exist in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: 2
+Patch failed at 0001 2
+ok 18 - am --abort leaves index stat info alone
+
+expecting success of 4151.19 'git am --abort return failed exit status when it fails': 
+	test_when_finished "rm -rf file-2/ && git reset --hard && git am --abort" &&
+	git checkout changes &&
+	git format-patch -1 --stdout conflicting >changes.mbox &&
+	test_must_fail git am --3way changes.mbox &&
+
+	git rm file-2 &&
+	mkdir file-2 &&
+	echo precious >file-2/somefile &&
+	test_must_fail git am --abort &&
+	test_path_is_dir file-2/
+
+Switched to branch 'changes'
+Applying: different
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+87a053c 6
+virtual different
+found 1 common ancestor:
+virtual 25da5ce2d7767dfb0047e4532ae9dd5a1a8d8eb6
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 different
+rm 'file-2'
+error: Updating 'file-2' would lose untracked files in it
+fatal: failed to clean index
+HEAD is now at 87a053c 6
+ok 19 - git am --abort return failed exit status when it fails
+
+expecting success of 4151.20 'git am --abort cleans relevant files': 
+	git checkout changes &&
+	git format-patch -1 --stdout conflicting >changes.mbox &&
+	test_must_fail git am --3way changes.mbox &&
+
+	test_path_is_file new-file &&
+	echo further changes >>file-1 &&
+	echo change other file >>file-2 &&
+
+	# Abort, and expect the files touched by am to be reverted
+	git am --abort &&
+
+	test_path_is_missing new-file &&
+
+	# Files not involved in am operation are left modified
+	git diff --name-only changes >actual &&
+	test_write_lines file-2 >expect &&
+	test_cmp expect actual
+
+Already on 'changes'
+Applying: different
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+87a053c 6
+virtual different
+found 1 common ancestor:
+virtual 25da5ce2d7767dfb0047e4532ae9dd5a1a8d8eb6
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 different
+ok 20 - git am --abort cleans relevant files
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4201-shortlog.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4201-shortlog/.git/
 expecting success of 4201.1 'setup': 
@@ -275419,553 +275655,178 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4151-am-abort.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4151-am-abort/.git/
-expecting success of 4151.1 'setup': 
-	test_write_lines a b c d e f g >file-1 &&
-	cp file-1 file-2 &&
+*** t4210-log-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
-	git add file-1 file-2 &&
-	git commit -m initial &&
-	git tag initial &&
-	git format-patch --stdout --root initial >initial.patch &&
-	for i in 2 3 4 5 6
-	do
-		echo $i >>file-1 &&
-		echo $i >otherfile-$i &&
-		git add otherfile-$i &&
-		test_tick &&
-		git commit -a -m $i || return 1
-	done &&
-	git branch changes &&
-	git format-patch --no-numbered initial &&
-	git checkout -b conflicting initial &&
-	echo different >>file-1 &&
-	echo whatever >new-file &&
-	git add file-1 new-file &&
-	git commit -m different &&
-	git checkout -b side initial &&
-	echo local change >file-2-expect
+	cat >msg <<-EOF &&
+	utf8
 
-[master (root-commit) 1732241] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
-[master a485f10] 2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-2
-[master b72e0d7] 3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-3
-[master f1dbda2] 4
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-4
-[master 73a4960] 5
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-5
-[master 87a053c] 6
+	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>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-6
-0001-2.patch
-0002-3.patch
-0003-4.patch
-0004-5.patch
-0005-6.patch
-Switched to a new branch 'conflicting'
-[conflicting c626628] different
+ 1 file changed, 3 insertions(+)
+ create mode 100644 msg
+[master b077cf9] latin1
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 new-file
-Switched to a new branch 'side'
-ok 1 - setup
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - create commits in different encodings
 
-expecting success of 4151.2 'am stops at a patch that does not apply': 
+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
 
-		git reset --hard initial &&
-		cp file-2-expect file-2 &&
+ok 2 - log --grep searches in log output encoding (utf8)
 
-		test_must_fail git am$with3 000[1245]-*.patch &&
-		git log --pretty=tformat:%s >actual &&
-		test_write_lines 3 2 initial >expect &&
-		test_cmp expect actual
-	
-HEAD is now at 1732241 initial
-error: patch failed: file-1:8
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: 2
-Applying: 3
-Applying: 5
-Patch failed at 0003 5
-ok 2 - am stops at a patch that does not apply
+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 4151.3 'am --skip continue after failed am': 
-		test_must_fail git am$with3 --skip >output &&
-		test_grep "^Applying: 6$" output &&
-		test_cmp file-2-expect file-2 &&
-		test ! -f .git/MERGE_RR
-	
-error: patch failed: file-1:9
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: 6
-ok 3 - am --skip continue after failed am
+ok 3 - log --grep searches in log output encoding (latin1)
 
-expecting success of 4151.4 'am --abort goes back after failed am': 
-		git am --abort &&
-		git rev-parse HEAD >actual &&
-		git rev-parse initial >expect &&
-		test_cmp expect actual &&
-		test_cmp file-2-expect file-2 &&
-		git diff-index --exit-code --cached HEAD &&
-		test ! -f .git/MERGE_RR
-	
-ok 4 - am --abort goes back after failed am
+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 4151.5 'am -3 stops at a patch that does not apply': 
+ok 4 - log --grep does not find non-reencoded values (utf8)
 
-		git reset --hard initial &&
-		cp file-2-expect file-2 &&
+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
 
-		test_must_fail git am$with3 000[1245]-*.patch &&
-		git log --pretty=tformat:%s >actual &&
-		test_write_lines 3 2 initial >expect &&
-		test_cmp expect actual
-	
-HEAD is now at 1732241 initial
-Applying: 2
-Applying: 3
-Applying: 5
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-62dd7f8 3
-virtual 5
-found 1 common ancestor:
-virtual 2e4b8a989c579cac9d3cc1897320a3e27805d080
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0003 5
-ok 5 - am -3 stops at a patch that does not apply
+ok 5 - log --grep does not find non-reencoded values (latin1)
 
-expecting success of 4151.6 'am -3 --skip continue after failed am -3': 
-		test_must_fail git am$with3 --skip >output &&
-		test_grep "^Applying: 6$" output &&
-		test_cmp file-2-expect file-2 &&
-		test ! -f .git/MERGE_RR
+expecting success of 4210.6 'config grep.patternType=fixed': 
+		git config grep.patternType fixed
 	
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: 6
-ok 6 - am -3 --skip continue after failed am -3
+ok 6 - config grep.patternType=fixed
 
-expecting success of 4151.7 'am --abort goes back after failed am -3': 
-		git am --abort &&
-		git rev-parse HEAD >actual &&
-		git rev-parse initial >expect &&
-		test_cmp expect actual &&
-		test_cmp file-2-expect file-2 &&
-		git diff-index --exit-code --cached HEAD &&
-		test ! -f .git/MERGE_RR
+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 - am --abort goes back after failed am -3
-
-expecting success of 4151.8 'am -3 --skip removes otherfile-4': 
-	git reset --hard initial &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 3 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
-	git am --skip &&
-	test_cmp_rev initial HEAD &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4
-
-HEAD is now at 1732241 initial
-Applying: 4
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-1732241 initial
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 4
-ok 8 - am -3 --skip removes otherfile-4
-
-expecting success of 4151.9 'am -3 --abort removes otherfile-4': 
-	git reset --hard initial &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 3 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
-	git am --abort &&
-	test_cmp_rev initial HEAD &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4
-
-HEAD is now at 1732241 initial
-Applying: 4
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-1732241 initial
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 4
-ok 9 - am -3 --abort removes otherfile-4
-
-expecting success of 4151.10 'am --abort will keep the local commits intact': 
-	test_must_fail git am 0004-*.patch &&
-	test_commit unrelated &&
-	git rev-parse HEAD >expect &&
-	git am --abort &&
-	git rev-parse HEAD >actual &&
-	test_cmp expect actual
-
-error: patch failed: file-1:8
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: 5
-Patch failed at 0001 5
-[side f386b22] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated.t
-warning: You seem to have moved HEAD since the last 'am' failure.
-Not rewinding to ORIG_HEAD
-ok 10 - am --abort will keep the local commits intact
-
-expecting success of 4151.11 'am --abort will keep dirty index intact': 
-	git reset --hard initial &&
-	echo dirtyfile >dirtyfile &&
-	cp dirtyfile dirtyfile.expected &&
-	git add dirtyfile &&
-	test_must_fail git am 0001-*.patch &&
-	test_cmp_rev initial HEAD &&
-	test_path_is_file dirtyfile &&
-	test_cmp dirtyfile.expected dirtyfile &&
-	git am --abort &&
-	test_cmp_rev initial HEAD &&
-	test_path_is_file dirtyfile &&
-	test_cmp dirtyfile.expected dirtyfile
-
-HEAD is now at 1732241 initial
-fatal: Dirty index: cannot apply patches (dirty: dirtyfile)
-ok 11 - am --abort will keep dirty index intact
-
-expecting success of 4151.12 'am -3 stops on conflict on unborn branch': 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	rm -f otherfile-4 &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 2 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)"
-
-Switched to a new branch 'orphan'
-Applying: 4
-Using index info to reconstruct a base tree...
-A	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-virtual HEAD
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree at file-1~4.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 4
-ok 12 - am -3 stops on conflict on unborn branch
-
-expecting success of 4151.13 'am -3 --skip clears index on unborn branch': 
-	test_path_is_dir .git/rebase-apply &&
-	echo tmpfile >tmpfile &&
-	git add tmpfile &&
-	git am --skip &&
-	test -z "$(git ls-files)" &&
-	test_path_is_missing otherfile-4 &&
-	test_path_is_missing tmpfile
-
-ok 13 - am -3 --skip clears index on unborn branch
-
-expecting success of 4151.14 'am -3 --abort removes otherfile-4 on unborn branch': 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	rm -f otherfile-4 file-1 &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 2 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
-	git am --abort &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4
-
-Switched to a new branch 'orphan'
-Applying: 4
-Using index info to reconstruct a base tree...
-A	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-virtual HEAD
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 4
-ok 14 - am -3 --abort removes otherfile-4 on unborn branch
-
-expecting success of 4151.15 'am -3 --abort on unborn branch removes applied commits': 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	rm -f otherfile-4 otherfile-2 file-1 file-2 &&
-	test_must_fail git am -3 initial.patch 0003-*.patch &&
-	test 3 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
-	git am --abort &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4 &&
-	test_path_is_missing file-1 &&
-	test_path_is_missing file-2 &&
-	test 0 -eq $(git log --oneline 2>/dev/null | wc -l) &&
-	test refs/heads/orphan = "$(git symbolic-ref HEAD)"
-
-Switched to a new branch 'orphan'
-applying to an empty history
-Applying: initial
-Applying: 4
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-03bb45f initial
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 4
-ok 15 - am -3 --abort on unborn branch removes applied commits
-
-expecting success of 4151.16 'am --abort on unborn branch will keep local commits intact': 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	test_must_fail git am 0004-*.patch &&
-	test_commit unrelated2 &&
-	git rev-parse HEAD >expect &&
-	git am --abort &&
-	git rev-parse HEAD >actual &&
-	test_cmp expect actual
+ok 7 - log --grep does not find non-reencoded values (latin1 + locale)
 
-Switched to a new branch 'orphan'
-error: file-1: does not exist in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: 5
-Patch failed at 0001 5
-[orphan (root-commit) 823805c] unrelated2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated2.t
-warning: You seem to have moved HEAD since the last 'am' failure.
-Not rewinding to ORIG_HEAD
-ok 16 - am --abort on unborn branch will keep local commits intact
+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 4151.17 'am --skip leaves index stat info alone': 
-	git checkout -f --orphan skip-stat-info &&
-	git reset &&
-	test_commit skip-should-be-untouched &&
-	test-tool chmtime =0 skip-should-be-untouched.t &&
-	git update-index --refresh &&
-	git diff-files --exit-code --quiet &&
-	test_must_fail git am 0001-*.patch &&
-	git am --skip &&
-	git diff-files --exit-code --quiet
+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)
 
-Switched to a new branch 'skip-stat-info'
-[skip-stat-info (root-commit) 2297a89] skip-should-be-untouched
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 skip-should-be-untouched.t
-error: file-1: does not exist in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: 2
-Patch failed at 0001 2
-ok 17 - am --skip leaves index stat info alone
+expecting success of 4210.10 'config grep.patternType=basic': 
+		git config grep.patternType basic
+	
+ok 10 - config grep.patternType=basic
 
-expecting success of 4151.18 'am --abort leaves index stat info alone': 
-	git checkout -f --orphan abort-stat-info &&
-	git reset &&
-	test_commit abort-should-be-untouched &&
-	test-tool chmtime =0 abort-should-be-untouched.t &&
-	git update-index --refresh &&
-	git diff-files --exit-code --quiet &&
-	test_must_fail git am 0001-*.patch &&
-	git am --abort &&
-	git diff-files --exit-code --quiet
+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)
 
-Switched to a new branch 'abort-stat-info'
-[abort-stat-info (root-commit) 3038985] abort-should-be-untouched
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abort-should-be-untouched.t
-error: file-1: does not exist in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: 2
-Patch failed at 0001 2
-ok 18 - am --abort leaves index stat info alone
+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 4151.19 'git am --abort return failed exit status when it fails': 
-	test_when_finished "rm -rf file-2/ && git reset --hard && git am --abort" &&
-	git checkout changes &&
-	git format-patch -1 --stdout conflicting >changes.mbox &&
-	test_must_fail git am --3way changes.mbox &&
+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)
 
-	git rm file-2 &&
-	mkdir file-2 &&
-	echo precious >file-2/somefile &&
-	test_must_fail git am --abort &&
-	test_path_is_dir file-2/
+expecting success of 4210.14 'config grep.patternType=extended': 
+		git config grep.patternType extended
+	
+ok 14 - config grep.patternType=extended
 
-Switched to branch 'changes'
-Applying: different
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-87a053c 6
-virtual different
-found 1 common ancestor:
-virtual 25da5ce2d7767dfb0047e4532ae9dd5a1a8d8eb6
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 different
-rm 'file-2'
-error: Updating 'file-2' would lose untracked files in it
-fatal: failed to clean index
-HEAD is now at 87a053c 6
-ok 19 - git am --abort return failed exit status when it fails
+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 4151.20 'git am --abort cleans relevant files': 
-	git checkout changes &&
-	git format-patch -1 --stdout conflicting >changes.mbox &&
-	test_must_fail git am --3way changes.mbox &&
+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)
 
-	test_path_is_file new-file &&
-	echo further changes >>file-1 &&
-	echo change other file >>file-2 &&
+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)
 
-	# Abort, and expect the files touched by am to be reverted
-	git am --abort &&
+expecting success of 4210.18 'config grep.patternType=perl': 
+		git config grep.patternType perl
+	
+ok 18 - config grep.patternType=perl
 
-	test_path_is_missing new-file &&
+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)
 
-	# Files not involved in am operation are left modified
-	git diff --name-only changes >actual &&
-	test_write_lines file-2 >expect &&
-	test_cmp expect actual
+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)
 
-Already on 'changes'
-Applying: different
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-87a053c 6
-virtual different
-found 1 common ancestor:
-virtual 25da5ce2d7767dfb0047e4532ae9dd5a1a8d8eb6
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 different
-ok 20 - git am --abort cleans relevant files
+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 20 test(s)
-1..20
+# passed all 21 test(s)
+1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4208-log-magic-pathspec.sh ***
@@ -276304,589 +276165,971 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4210-log-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4210-log-i18n/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 4210.1 'create commits in different encodings': 
-	test_tick &&
-	cat >msg <<-EOF &&
-	utf8
-
-	t${utf8_e}st
+*** t4204-patch-id.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4204-patch-id/.git/
+expecting success of 4204.1 'setup': 
+	str="ab cd ef gh ij kl mn op" &&
+	test_write_lines $str >foo &&
+	test_write_lines $str >bar &&
+	git add foo bar &&
+	git commit -a -m initial &&
+	test_write_lines $str b >foo &&
+	test_write_lines $str b >bar &&
+	git commit -a -m first &&
+	git checkout -b same main &&
+	git commit --amend -m same-msg &&
+	git checkout -b notsame main &&
+	echo c >foo &&
+	echo c >bar &&
+	git commit --amend -a -m notsame-msg &&
+	git checkout -b with_space main~ &&
+	cat >foo <<-\EOF &&
+	a  b
+	c d
+	e    f
+	  g   h
+	    i   j
+	k l
+	m   n
+	op
 	EOF
-	git add msg &&
-	git -c i18n.commitencoding=utf8 commit -F msg &&
-	cat >msg <<-EOF &&
-	latin1
+	cp foo bar &&
+	git add foo bar &&
+	git commit --amend -m "with spaces" &&
+	test_write_lines bar foo >bar-then-foo &&
+	test_write_lines foo bar >foo-then-bar
 
-	t${latin1_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
 
-[master (root-commit) cbf2796] utf8
+[main (root-commit) f34ad56] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 msg
-[master b077cf9] latin1
+ 2 files changed, 16 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+[main 637c384] first
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - create commits in different encodings
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'same'
+[same bdbb3b3] same-msg
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'notsame'
+[notsame e083d83] notsame-msg
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 2 insertions(+), 16 deletions(-)
+Switched to a new branch 'with_space'
+[with_space 983116d] with spaces
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 16 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - setup
 
-expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
+expecting success of 4204.2 'patch-id output is well-formed': 
+	git log -p -1 >log.output &&
+	git patch-id <log.output >output &&
+	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
+
+f2e75ee7c01deac4f2c51488f8e1cc6c0ff2719f 983116d734eae4c6993305600c31050ff5dea7f1
+ok 2 - patch-id output is well-formed
+
+expecting success of 4204.3 'patch-id detects equality': 
+	get_patch_id main &&
+	get_patch_id same &&
+	test_cmp patch-id_main patch-id_same
+
+ok 3 - patch-id detects equality
+
+expecting success of 4204.4 'patch-id detects inequality': 
+	get_patch_id main &&
+	get_patch_id notsame &&
+	! test_cmp patch-id_main patch-id_notsame
+
+--- patch-id_main	2026-03-14 13:31:15.950677808 +0000
++++ patch-id_notsame	2026-03-14 13:31:16.034677808 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++6276aec15da664e9f9ce6dde29c2e2c71607e017
+ok 4 - patch-id detects inequality
+
+expecting success of 4204.5 'patch-id detects equality binary': 
+	cat >.gitattributes <<-\EOF &&
+	foo binary
+	bar binary
 	EOF
-	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
-	test_cmp expect actual
+	get_patch_id main &&
+	get_patch_id same &&
+	git log -p -1 --binary main >top-diff.output &&
+	calc_patch_id <top-diff.output main_binpatch &&
+	git log -p -1 --binary same >top-diff.output &&
+	calc_patch_id <top-diff.output same_binpatch &&
+	test_cmp patch-id_main patch-id_main_binpatch &&
+	test_cmp patch-id_same patch-id_same_binpatch &&
+	test_cmp patch-id_main patch-id_same &&
+	test_when_finished "rm .gitattributes"
 
-ok 2 - log --grep searches in log output encoding (utf8)
+ok 5 - patch-id detects equality binary
 
-expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
+expecting success of 4204.6 'patch-id detects inequality binary': 
+	cat >.gitattributes <<-\EOF &&
+	foo binary
+	bar binary
+	EOF
+	get_patch_id main &&
+	get_patch_id notsame &&
+	! test_cmp patch-id_main patch-id_notsame &&
+	test_when_finished "rm .gitattributes"
+
+--- patch-id_main	2026-03-14 13:31:16.618677808 +0000
++++ patch-id_notsame	2026-03-14 13:31:16.686677808 +0000
+@@ -1 +1 @@
+-6c46c4bc49d6541a5d8bcadf7808959c9520ae8b
++f92e710b91f98a3598e43f302e80d3e4a9bfe874
+ok 6 - patch-id detects inequality binary
+
+expecting success of 4204.7 'patch-id supports git-format-patch output': 
+	get_patch_id main &&
+	git checkout same &&
+	git format-patch -1 --stdout >format-patch.output &&
+	calc_patch_id same <format-patch.output &&
+	test_cmp patch-id_main patch-id_same &&
+	set $(git patch-id <format-patch.output) &&
+	test "$2" = $(git rev-parse HEAD)
+
+Switched to branch 'same'
+ok 7 - patch-id supports git-format-patch output
+
+expecting success of 4204.8 'whitespace is irrelevant in footer': 
+	get_patch_id main &&
+	git checkout same &&
+	git format-patch -1 --stdout >format-patch.output &&
+	sed "s/ \$//" format-patch.output | calc_patch_id same &&
+	test_cmp patch-id_main patch-id_same
+
+Already on 'same'
+ok 8 - whitespace is irrelevant in footer
+
+expecting success of 4204.9 'file order is irrelevant with --stable': 
+	test_patch_id_file_order irrelevant --stable --stable
+
+Already on 'same'
+ok 9 - file order is irrelevant with --stable
+
+expecting success of 4204.10 'file order is relevant with --unstable': 
+	test_patch_id_file_order relevant --unstable --unstable
+
+Already on 'same'
+--- patch-id_order---unstable-relevant	2026-03-14 13:31:17.578677808 +0000
++++ patch-id_ordered-order---unstable-relevant	2026-03-14 13:31:17.658677808 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 10 - file order is relevant with --unstable
+
+expecting success of 4204.11 'whitespace is relevant with --verbatim': 
+	test_patch_id_whitespace relevant --verbatim --verbatim
+
+--- patch-id_ws---verbatim-relevant	2026-03-14 13:31:17.762677808 +0000
++++ patch-id_ws-ws---verbatim-relevant	2026-03-14 13:31:17.818677808 +0000
+@@ -1 +1 @@
+-bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
++ec56d730a19f56a178db031386e5bcaabfea5677
+ok 11 - whitespace is relevant with --verbatim
+
+expecting success of 4204.12 'whitespace is irrelevant without --verbatim': 
+	test_patch_id_whitespace irrelevant --stable --stable
+
+ok 12 - whitespace is irrelevant without --verbatim
+
+expecting success of 4204.13 'default is unstable': 
+	test_patch_id relevant default
+
+Already on 'same'
+--- patch-id_order-default-relevant	2026-03-14 13:31:18.158677808 +0000
++++ patch-id_ordered-order-default-relevant	2026-03-14 13:31:18.242677808 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 13 - default is unstable
+
+expecting success of 4204.14 'patchid.stable = true is stable': 
+	test_config patchid.stable true &&
+	test_patch_id irrelevant patchid.stable=true
+
+Already on 'same'
+ok 14 - patchid.stable = true is stable
+
+expecting success of 4204.15 'patchid.stable = false is unstable': 
+	test_config patchid.stable false &&
+	test_patch_id relevant patchid.stable=false
+
+Already on 'same'
+--- patch-id_order-patchid.stable=false-relevant	2026-03-14 13:31:18.642677808 +0000
++++ patch-id_ordered-order-patchid.stable=false-relevant	2026-03-14 13:31:18.726677808 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 15 - patchid.stable = false is unstable
+
+expecting success of 4204.16 'patchid.verbatim = true is correct and stable': 
+	test_config patchid.verbatim true &&
+	test_patch_id_whitespace relevant patchid.verbatim=true &&
+	test_patch_id irrelevant patchid.verbatim=true
+
+--- patch-id_ws-patchid.verbatim=true-relevant	2026-03-14 13:31:18.886677808 +0000
++++ patch-id_ws-ws-patchid.verbatim=true-relevant	2026-03-14 13:31:18.958677808 +0000
+@@ -1 +1 @@
+-bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
++ec56d730a19f56a178db031386e5bcaabfea5677
+Already on 'same'
+ok 16 - patchid.verbatim = true is correct and stable
+
+expecting success of 4204.17 'patchid.verbatim = false is unstable': 
+	test_config patchid.verbatim false &&
+	test_patch_id relevant patchid.verbatim=false
+
+Already on 'same'
+--- patch-id_order-patchid.verbatim=false-relevant	2026-03-14 13:31:19.278677808 +0000
++++ patch-id_ordered-order-patchid.verbatim=false-relevant	2026-03-14 13:31:19.402677808 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 17 - patchid.verbatim = false is unstable
+
+expecting success of 4204.18 '--unstable overrides patchid.stable = true': 
+	test_config patchid.stable true &&
+	test_patch_id relevant patchid.stable=true--unstable --unstable
+
+Already on 'same'
+--- patch-id_order-patchid.stable=true--unstable-relevant	2026-03-14 13:31:19.578677808 +0000
++++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2026-03-14 13:31:19.694677808 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++892d1d3b08f44511b1fdc7cab43c0ad907ac772b
+ok 18 - --unstable overrides patchid.stable = true
+
+expecting success of 4204.19 '--stable overrides patchid.stable = false': 
+	test_config patchid.stable false &&
+	test_patch_id irrelevant patchid.stable=false--stable --stable
+
+Already on 'same'
+ok 19 - --stable overrides patchid.stable = false
+
+expecting success of 4204.20 '--verbatim overrides patchid.stable = false': 
+	test_config patchid.stable false &&
+	test_patch_id_whitespace relevant stable=false--verbatim --verbatim
+
+--- patch-id_ws-stable=false--verbatim-relevant	2026-03-14 13:31:20.106677808 +0000
++++ patch-id_ws-ws-stable=false--verbatim-relevant	2026-03-14 13:31:20.186677808 +0000
+@@ -1 +1 @@
+-bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
++ec56d730a19f56a178db031386e5bcaabfea5677
+ok 20 - --verbatim overrides patchid.stable = false
+
+expecting success of 4204.21 'patch-id supports git-format-patch MIME output': 
+	get_patch_id main &&
+	git checkout same &&
+	git format-patch -1 --attach --stdout >format-patch.output &&
+	calc_patch_id <format-patch.output same &&
+	test_cmp patch-id_main patch-id_same
+
+Already on 'same'
+ok 21 - patch-id supports git-format-patch MIME output
+
+expecting success of 4204.22 'patch-id respects config from subdir': 
+	test_config patchid.stable true &&
+	mkdir subdir &&
+
+	# copy these because test_patch_id() looks for them in
+	# the current directory
+	cp bar-then-foo foo-then-bar subdir &&
+
+	(
+		cd subdir &&
+		test_patch_id irrelevant patchid.stable=true
+	)
+
+Already on 'same'
+ok 22 - patch-id respects config from subdir
+
+expecting success of 4204.23 'patch-id handles no-nl-at-eof markers': 
+	cat >nonl <<-\EOF &&
+	diff --git i/a w/a
+	index e69de29..2e65efe 100644
+	--- i/a
+	+++ w/a
+	@@ -0,0 +1 @@
+	+a
+	\ No newline at end of file
+	diff --git i/b w/b
+	index e69de29..6178079 100644
+	--- i/b
+	+++ w/b
+	@@ -0,0 +1 @@
+	+b
+	EOF
+	cat >withnl <<-\EOF &&
+	diff --git i/a w/a
+	index e69de29..7898192 100644
+	--- i/a
+	+++ w/a
+	@@ -0,0 +1 @@
+	+a
+	diff --git i/b w/b
+	index e69de29..6178079 100644
+	--- i/b
+	+++ w/b
+	@@ -0,0 +1 @@
+	+b
+	EOF
+	calc_patch_id nonl <nonl &&
+	calc_patch_id withnl <withnl &&
+	test_cmp patch-id_nonl patch-id_withnl &&
+	calc_patch_id nonl-inc-ws --verbatim <nonl &&
+	calc_patch_id withnl-inc-ws --verbatim <withnl &&
+	! test_cmp patch-id_nonl-inc-ws patch-id_withnl-inc-ws
+
+--- patch-id_nonl-inc-ws	2026-03-14 13:31:21.054677808 +0000
++++ patch-id_withnl-inc-ws	2026-03-14 13:31:21.110677808 +0000
+@@ -1 +1 @@
+-7ff2bcb9c001e010d881f0fccddc20be3af94012
++897be18d6338cd2e68bf17f3848b1c48bbc17459
+ok 23 - patch-id handles no-nl-at-eof markers
+
+expecting success of 4204.24 'patch-id handles diffs with one line of before/after': 
+	cat >diffu1 <<-\EOF &&
+	diff --git a/bar b/bar
+	index bdaf90f..31051f6 100644
+	--- a/bar
+	+++ b/bar
+	@@ -2 +2,2 @@
+	 b
+	+c
+	diff --git a/car b/car
+	index 00750ed..2ae5e34 100644
+	--- a/car
+	+++ b/car
+	@@ -1 +1,2 @@
+	 3
+	+d
+	diff --git a/foo b/foo
+	index e439850..7146eb8 100644
+	--- a/foo
+	+++ b/foo
+	@@ -2 +2,2 @@
+	 a
+	+e
+	EOF
+	calc_patch_id diffu1 <diffu1 &&
+	test_config patchid.stable true &&
+	calc_patch_id diffu1stable <diffu1
+
+ok 24 - patch-id handles diffs with one line of before/after
+
+checking known breakage of 4204.25 'patch-id computes same ID with different object hashes': 
+	test_when_finished "rm -rf repo-sha1 repo-sha256" &&
+
+	cat >diff <<-\EOF &&
+	diff --git a/bar b/bar
+	index bdaf90f..31051f6 100644
+	--- a/bar
+	+++ b/bar
+	@@ -2 +2,2 @@
+	 b
+	+c
+	EOF
+
+	git init --object-format=sha1 repo-sha1 &&
+	git -C repo-sha1 patch-id <diff >patch-id-sha1 &&
+	git init --object-format=sha256 repo-sha256 &&
+	git -C repo-sha256 patch-id <diff >patch-id-sha256 &&
+	test_cmp patch-id-sha1 patch-id-sha256
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4204-patch-id/repo-sha1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4204-patch-id/repo-sha256/.git/
+--- patch-id-sha1	2026-03-14 13:31:21.482677808 +0000
++++ patch-id-sha256	2026-03-14 13:31:21.514677808 +0000
+@@ -1 +1 @@
+-412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
++f8e1e9607584d07254be0d54eebb3f8ce98ce90acb09c653b9bbda1ad2ffc516 0000000000000000000000000000000000000000000000000000000000000000
+not ok 25 - patch-id computes same ID with different object hashes # TODO known breakage
+
+expecting success of 4204.26 'patch-id without repository': 
+	cat >diff <<-\EOF &&
+	diff --git a/bar b/bar
+	index bdaf90f..31051f6 100644
+	--- a/bar
+	+++ b/bar
+	@@ -2 +2,2 @@
+	 b
+	+c
+	EOF
+	nongit git patch-id <diff
+
+412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
+ok 26 - patch-id without repository
+
+# still have 1 known breakage(s)
+# passed all remaining 25 test(s)
+1..26
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4209-log-pickaxe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4209-log-pickaxe/.git/
+expecting success of 4209.1 'setup': 
+	>expect_nomatch &&
+
+	>file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git rev-parse --verify HEAD >expect_initial &&
+
+	echo Picked >file &&
+	git add file &&
+	test_tick &&
+	git commit --author="Another Person <another@example.com>" -m second &&
+	git rev-parse --verify HEAD >expect_second
+
+[master (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master 64f6655] second
+ Author: Another Person <another@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 4209.2 'usage': 
+	test_expect_code 129 git log -S 2>err &&
+	test_grep "switch.*requires a value" err &&
+
+	test_expect_code 129 git log -G 2>err &&
+	test_grep "switch.*requires a value" err &&
+
+	test_expect_code 128 git log -Gregex -Sstring 2>err &&
+	grep "cannot be used together" err &&
+
+	test_expect_code 128 git log -Gregex --find-object=HEAD 2>err &&
+	grep "cannot be used together" err &&
+
+	test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
+	grep "cannot be used together" err &&
+
+	test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err &&
+	grep "cannot be used together" err
+
+error: switch `S' requires a value
+error: switch `G' requires a value
+fatal: options '-G', '-S', and '--find-object' cannot be used together
+fatal: options '-G', '-S', and '--find-object' cannot be used together
+fatal: options '-G', '-S', and '--find-object' cannot be used together
+fatal: options '--pickaxe-all' and '--find-object' cannot be used together, use '--pickaxe-all' with '-G' and '-S'
+ok 2 - usage
+
+expecting success of 4209.3 'usage: --pickaxe-regex': 
+	test_expect_code 128 git log -Gregex --pickaxe-regex 2>err &&
+	grep "cannot be used together" err
+
+fatal: options '-G' and '--pickaxe-regex' cannot be used together, use '--pickaxe-regex' with '-S'
+ok 3 - usage: --pickaxe-regex
+
+expecting success of 4209.4 'usage: --no-pickaxe-regex': 
 	cat >expect <<-\EOF &&
-	latin1
-	utf8
+	fatal: unrecognized argument: --no-pickaxe-regex
 	EOF
-	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
+
+	test_expect_code 128 git log -Sstring --no-pickaxe-regex 2>actual &&
+	test_cmp expect actual &&
+
+	test_expect_code 128 git log -Gstring --no-pickaxe-regex 2>err &&
 	test_cmp expect actual
 
-ok 3 - log --grep searches in log output encoding (latin1)
+ok 4 - usage: --no-pickaxe-regex
 
-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 4209.5 'log --grep (match)': 
+		git log  --grep=initial --format=%H >actual &&
+		test_cmp expect_initial actual
+	
+ok 5 - log --grep (match)
 
-ok 4 - log --grep does not find non-reencoded values (utf8)
+expecting success of 4209.6 'log --grep (nomatch)': 
+		git log  --grep=InItial --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 6 - log --grep (nomatch)
 
-expecting success of 4210.5 'log --grep does not find non-reencoded values (latin1)': 
-	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
-	test_must_be_empty actual
+expecting success of 4209.7 'log --grep --regexp-ignore-case (match)': 
+		git log --regexp-ignore-case --grep=InItial --format=%H >actual &&
+		test_cmp expect_initial actual
+	
+ok 7 - log --grep --regexp-ignore-case (match)
 
-ok 5 - log --grep does not find non-reencoded values (latin1)
+expecting success of 4209.8 'log --grep -i (match)': 
+		git log -i --grep=InItial --format=%H >actual &&
+		test_cmp expect_initial actual
+	
+ok 8 - log --grep -i (match)
 
-expecting success of 4210.6 'config grep.patternType=fixed': 
-		git config grep.patternType fixed
+expecting success of 4209.9 'log --grep --regexp-ignore-case (nomatch)': 
+		git log --regexp-ignore-case --grep=initail --format=%H >actual &&
+		test_cmp expect_nomatch actual
 	
-ok 6 - config grep.patternType=fixed
+ok 9 - log --grep --regexp-ignore-case (nomatch)
 
-expecting success of 4210.7 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log 'é' >actual &&
-		test_must_be_empty actual
+expecting success of 4209.10 'log --grep -i (nomatch)': 
+		git log -i --grep=initail --format=%H >actual &&
+		test_cmp expect_nomatch actual
 	
-ok 7 - log --grep does not find non-reencoded values (latin1 + locale)
+ok 10 - log --grep -i (nomatch)
 
-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 4209.11 'log --author (match)': 
+		git log  --author=Person --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 11 - log --author (match)
 
-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 4209.12 'log --author (nomatch)': 
+		git log  --author=person --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 12 - log --author (nomatch)
 
-expecting success of 4210.10 'config grep.patternType=basic': 
-		git config grep.patternType basic
+expecting success of 4209.13 'log --author --regexp-ignore-case (match)': 
+		git log --regexp-ignore-case --author=person --format=%H >actual &&
+		test_cmp expect_second actual
 	
-ok 10 - config grep.patternType=basic
+ok 13 - log --author --regexp-ignore-case (match)
 
-expecting success of 4210.11 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
+expecting success of 4209.14 'log --author -i (match)': 
+		git log -i --author=person --format=%H >actual &&
+		test_cmp expect_second actual
 	
-ok 11 - log --grep does not find non-reencoded values (latin1 + locale)
+ok 14 - log --author -i (match)
 
-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 4209.15 'log --author --regexp-ignore-case (nomatch)': 
+		git log --regexp-ignore-case --author=spreon --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 15 - log --author --regexp-ignore-case (nomatch)
 
-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 4209.16 'log --author -i (nomatch)': 
+		git log -i --author=spreon --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 16 - log --author -i (nomatch)
 
-expecting success of 4210.14 'config grep.patternType=extended': 
-		git config grep.patternType extended
+expecting success of 4209.17 'log -G (nomatch)': 
+		git log  -Gpicked --format=%H >actual &&
+		test_cmp expect_nomatch actual
 	
-ok 14 - config grep.patternType=extended
+ok 17 - log -G (nomatch)
 
-expecting success of 4210.15 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
+expecting success of 4209.18 'log -G (match)': 
+		git log  -GPicked --format=%H >actual &&
+		test_cmp expect_second actual
 	
-ok 15 - log --grep does not find non-reencoded values (latin1 + locale)
+ok 18 - log -G (match)
 
-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 4209.19 'log -G --regexp-ignore-case (nomatch)': 
+		git log --regexp-ignore-case -Gpickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 19 - log -G --regexp-ignore-case (nomatch)
 
-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 4209.20 'log -G -i (nomatch)': 
+		git log -i -Gpickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 20 - log -G -i (nomatch)
 
-expecting success of 4210.18 'config grep.patternType=perl': 
-		git config grep.patternType perl
+expecting success of 4209.21 'log -G --regexp-ignore-case (match)': 
+		git log --regexp-ignore-case -Gpicked --format=%H >actual &&
+		test_cmp expect_second actual
 	
-ok 18 - config grep.patternType=perl
+ok 21 - log -G --regexp-ignore-case (match)
 
-expecting success of 4210.19 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
+expecting success of 4209.22 'log -G -i (match)': 
+		git log -i -Gpicked --format=%H >actual &&
+		test_cmp expect_second actual
 	
-ok 19 - log --grep does not find non-reencoded values (latin1 + locale)
+ok 22 - log -G -i (match)
 
-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 4209.23 'log -G --textconv (missing textconv tool)': 
+	echo "* diff=test" >.gitattributes &&
+	test_must_fail git -c diff.test.textconv=missing log -Gfoo &&
+	rm .gitattributes
 
-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)
+error: cannot run missing: No such file or directory
+fatal: unable to read files to diff
+ok 23 - log -G --textconv (missing textconv tool)
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4204-patch-id.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4204-patch-id/.git/
-expecting success of 4204.1 'setup': 
-	str="ab cd ef gh ij kl mn op" &&
-	test_write_lines $str >foo &&
-	test_write_lines $str >bar &&
-	git add foo bar &&
-	git commit -a -m initial &&
-	test_write_lines $str b >foo &&
-	test_write_lines $str b >bar &&
-	git commit -a -m first &&
-	git checkout -b same main &&
-	git commit --amend -m same-msg &&
-	git checkout -b notsame main &&
-	echo c >foo &&
-	echo c >bar &&
-	git commit --amend -a -m notsame-msg &&
-	git checkout -b with_space main~ &&
-	cat >foo <<-\EOF &&
-	a  b
-	c d
-	e    f
-	  g   h
-	    i   j
-	k l
-	m   n
-	op
-	EOF
-	cp foo bar &&
-	git add foo bar &&
-	git commit --amend -m "with spaces" &&
-	test_write_lines bar foo >bar-then-foo &&
-	test_write_lines foo bar >foo-then-bar
+expecting success of 4209.24 'log -G --no-textconv (missing textconv tool)': 
+	echo "* diff=test" >.gitattributes &&
+	git -c diff.test.textconv=missing log -Gfoo --no-textconv >actual &&
+	test_cmp expect_nomatch actual &&
+	rm .gitattributes
+
+ok 24 - log -G --no-textconv (missing textconv tool)
+
+expecting success of 4209.25 'log -S (nomatch)': 
+		git log  -Spicked --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 25 - log -S (nomatch)
+
+expecting success of 4209.26 'log -S (match)': 
+		git log  -SPicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 26 - log -S (match)
+
+expecting success of 4209.27 'log -S --regexp-ignore-case (match)': 
+		git log --regexp-ignore-case -Spicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 27 - log -S --regexp-ignore-case (match)
+
+expecting success of 4209.28 'log -S -i (match)': 
+		git log -i -Spicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 28 - log -S -i (match)
+
+expecting success of 4209.29 'log -S --regexp-ignore-case (nomatch)': 
+		git log --regexp-ignore-case -Spickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 29 - log -S --regexp-ignore-case (nomatch)
+
+expecting success of 4209.30 'log -S -i (nomatch)': 
+		git log -i -Spickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 30 - log -S -i (nomatch)
+
+expecting success of 4209.31 'log -S --pickaxe-regex (nomatch)': 
+		git log --pickaxe-regex -Sp.cked --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 31 - log -S --pickaxe-regex (nomatch)
+
+expecting success of 4209.32 'log -S --pickaxe-regex (match)': 
+		git log --pickaxe-regex -SP.cked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 32 - log -S --pickaxe-regex (match)
+
+expecting success of 4209.33 'log -S --pickaxe-regex --regexp-ignore-case (match)': 
+		git log --pickaxe-regex --regexp-ignore-case -Sp.cked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 33 - log -S --pickaxe-regex --regexp-ignore-case (match)
+
+expecting success of 4209.34 'log -S --pickaxe-regex -i (match)': 
+		git log --pickaxe-regex -i -Sp.cked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 34 - log -S --pickaxe-regex -i (match)
+
+expecting success of 4209.35 'log -S --pickaxe-regex --regexp-ignore-case (nomatch)': 
+		git log --pickaxe-regex --regexp-ignore-case -Sp.ckle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 35 - log -S --pickaxe-regex --regexp-ignore-case (nomatch)
 
+expecting success of 4209.36 'log -S --pickaxe-regex -i (nomatch)': 
+		git log --pickaxe-regex -i -Sp.ckle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 36 - log -S --pickaxe-regex -i (nomatch)
 
-[main (root-commit) f34ad56] initial
+expecting success of 4209.37 'log -S --textconv (missing textconv tool)': 
+	echo "* diff=test" >.gitattributes &&
+	test_must_fail git -c diff.test.textconv=missing log -Sfoo &&
+	rm .gitattributes
+
+error: cannot run missing: No such file or directory
+fatal: unable to read files to diff
+ok 37 - log -S --textconv (missing textconv tool)
+
+expecting success of 4209.38 'log -S --no-textconv (missing textconv tool)': 
+	echo "* diff=test" >.gitattributes &&
+	git -c diff.test.textconv=missing log -Sfoo --no-textconv >actual &&
+	test_cmp expect_nomatch actual &&
+	rm .gitattributes
+
+ok 38 - log -S --no-textconv (missing textconv tool)
+
+expecting success of 4209.39 'setup log -[GS] plain & regex': 
+	test_create_repo GS-plain &&
+	test_commit -C GS-plain --append A data.txt "a" &&
+	test_commit -C GS-plain --append B data.txt "a a" &&
+	test_commit -C GS-plain --append C data.txt "b" &&
+	test_commit -C GS-plain --append D data.txt "[b]" &&
+	test_commit -C GS-plain E data.txt "" &&
+
+	# We also include E, the deletion commit
+	git -C GS-plain log --grep="[ABE]" >A-to-B-then-E-log &&
+	git -C GS-plain log --grep="[CDE]" >C-to-D-then-E-log &&
+	git -C GS-plain log --grep="[DE]" >D-then-E-log &&
+	git -C GS-plain log >full-log
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4209-log-pickaxe/GS-plain/.git/
+[master (root-commit) 39fb857] A
  Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-[main 637c384] first
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data.txt
+[master 50c3229] B
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'same'
-[same bdbb3b3] same-msg
+ 1 file changed, 1 insertion(+)
+[master 70aa019] C
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'notsame'
-[notsame e083d83] notsame-msg
+ 1 file changed, 1 insertion(+)
+[master 3f7d046] D
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 2 insertions(+), 16 deletions(-)
-Switched to a new branch 'with_space'
-[with_space 983116d] with spaces
+ 1 file changed, 1 insertion(+)
+[master 4fd79ea] E
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 16 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+ok 39 - setup log -[GS] plain & regex
 
-expecting success of 4204.2 'patch-id output is well-formed': 
-	git log -p -1 >log.output &&
-	git patch-id <log.output >output &&
-	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
+expecting success of 4209.40 'log -G trims diff new/old [-+]': 
+	git -C GS-plain log -G"[+-]a" >log &&
+	test_must_be_empty log &&
+	git -C GS-plain log -G"^a" >log &&
+	test_cmp log A-to-B-then-E-log
 
-f2e75ee7c01deac4f2c51488f8e1cc6c0ff2719f 983116d734eae4c6993305600c31050ff5dea7f1
-ok 2 - patch-id output is well-formed
+ok 40 - log -G trims diff new/old [-+]
 
-expecting success of 4204.3 'patch-id detects equality': 
-	get_patch_id main &&
-	get_patch_id same &&
-	test_cmp patch-id_main patch-id_same
+expecting success of 4209.41 'log -S<pat> is not a regex, but -S<pat> --pickaxe-regex is': 
+	git -C GS-plain log -S"a" >log &&
+	test_cmp log A-to-B-then-E-log &&
 
-ok 3 - patch-id detects equality
+	git -C GS-plain log -S"[a]" >log &&
+	test_must_be_empty log &&
 
-expecting success of 4204.4 'patch-id detects inequality': 
-	get_patch_id main &&
-	get_patch_id notsame &&
-	! test_cmp patch-id_main patch-id_notsame
+	git -C GS-plain log -S"[a]" --pickaxe-regex >log &&
+	test_cmp log A-to-B-then-E-log &&
 
---- patch-id_main	2025-02-09 06:54:33.661901829 +0000
-+++ patch-id_notsame	2025-02-09 06:54:33.681901956 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+6276aec15da664e9f9ce6dde29c2e2c71607e017
-ok 4 - patch-id detects inequality
+	git -C GS-plain log -S"[b]" >log &&
+	test_cmp log D-then-E-log &&
 
-expecting success of 4204.5 'patch-id detects equality binary': 
-	cat >.gitattributes <<-\EOF &&
-	foo binary
-	bar binary
-	EOF
-	get_patch_id main &&
-	get_patch_id same &&
-	git log -p -1 --binary main >top-diff.output &&
-	calc_patch_id <top-diff.output main_binpatch &&
-	git log -p -1 --binary same >top-diff.output &&
-	calc_patch_id <top-diff.output same_binpatch &&
-	test_cmp patch-id_main patch-id_main_binpatch &&
-	test_cmp patch-id_same patch-id_same_binpatch &&
-	test_cmp patch-id_main patch-id_same &&
-	test_when_finished "rm .gitattributes"
+	git -C GS-plain log -S"[b]" --pickaxe-regex >log &&
+	test_cmp log C-to-D-then-E-log
 
-ok 5 - patch-id detects equality binary
+ok 41 - log -S<pat> is not a regex, but -S<pat> --pickaxe-regex is
 
-expecting success of 4204.6 'patch-id detects inequality binary': 
-	cat >.gitattributes <<-\EOF &&
-	foo binary
-	bar binary
-	EOF
-	get_patch_id main &&
-	get_patch_id notsame &&
-	! test_cmp patch-id_main patch-id_notsame &&
-	test_when_finished "rm .gitattributes"
+expecting success of 4209.42 'setup log -[GS] binary & --text': 
+	test_create_repo GS-bin-txt &&
+	test_commit -C GS-bin-txt --printf A data.bin "a\na\0a\n" &&
+	test_commit -C GS-bin-txt --append --printf B data.bin "a\na\0a\n" &&
+	test_commit -C GS-bin-txt C data.bin "" &&
+	git -C GS-bin-txt log >full-log
 
---- patch-id_main	2025-02-09 06:54:33.741902338 +0000
-+++ patch-id_notsame	2025-02-09 06:54:33.749902389 +0000
-@@ -1 +1 @@
--6c46c4bc49d6541a5d8bcadf7808959c9520ae8b
-+f92e710b91f98a3598e43f302e80d3e4a9bfe874
-ok 6 - patch-id detects inequality binary
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4209-log-pickaxe/GS-bin-txt/.git/
+[master (root-commit) 988beca] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 data.bin
+[master 22cac2b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master 578ec9f] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 42 - setup log -[GS] binary & --text
 
-expecting success of 4204.7 'patch-id supports git-format-patch output': 
-	get_patch_id main &&
-	git checkout same &&
-	git format-patch -1 --stdout >format-patch.output &&
-	calc_patch_id same <format-patch.output &&
-	test_cmp patch-id_main patch-id_same &&
-	set $(git patch-id <format-patch.output) &&
-	test "$2" = $(git rev-parse HEAD)
+expecting success of 4209.43 'log -G ignores binary files': 
+	git -C GS-bin-txt log -Ga >log &&
+	test_must_be_empty log
 
-Switched to branch 'same'
-ok 7 - patch-id supports git-format-patch output
+ok 43 - log -G ignores binary files
 
-expecting success of 4204.8 'whitespace is irrelevant in footer': 
-	get_patch_id main &&
-	git checkout same &&
-	git format-patch -1 --stdout >format-patch.output &&
-	sed "s/ \$//" format-patch.output | calc_patch_id same &&
-	test_cmp patch-id_main patch-id_same
+expecting success of 4209.44 'log -G looks into binary files with -a': 
+	git -C GS-bin-txt log -a -Ga >log &&
+	test_cmp log full-log
 
-Already on 'same'
-ok 8 - whitespace is irrelevant in footer
+ok 44 - log -G looks into binary files with -a
 
-expecting success of 4204.9 'file order is irrelevant with --stable': 
-	test_patch_id_file_order irrelevant --stable --stable
+expecting success of 4209.45 'log -G looks into binary files with textconv filter': 
+	test_when_finished "rm GS-bin-txt/.gitattributes" &&
+	(
+		cd GS-bin-txt &&
+		echo "* diff=bin" >.gitattributes &&
+		git -c diff.bin.textconv=cat log -Ga >../log
+	) &&
+	test_cmp log full-log
 
-Already on 'same'
-ok 9 - file order is irrelevant with --stable
+ok 45 - log -G looks into binary files with textconv filter
 
-expecting success of 4204.10 'file order is relevant with --unstable': 
-	test_patch_id_file_order relevant --unstable --unstable
+expecting success of 4209.46 'log -S looks into binary files': 
+	git -C GS-bin-txt log -Sa >log &&
+	test_cmp log full-log
 
-Already on 'same'
---- patch-id_order---unstable-relevant	2025-02-09 06:54:33.869903152 +0000
-+++ patch-id_ordered-order---unstable-relevant	2025-02-09 06:54:33.885903254 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 10 - file order is relevant with --unstable
+ok 46 - log -S looks into binary files
 
-expecting success of 4204.11 'whitespace is relevant with --verbatim': 
-	test_patch_id_whitespace relevant --verbatim --verbatim
+expecting success of 4209.47 'log -S --pickaxe-regex looks into binary files': 
+	git -C GS-bin-txt log --pickaxe-regex -Sa >log &&
+	test_cmp log full-log &&
 
---- patch-id_ws---verbatim-relevant	2025-02-09 06:54:33.893903305 +0000
-+++ patch-id_ws-ws---verbatim-relevant	2025-02-09 06:54:33.905903381 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-ok 11 - whitespace is relevant with --verbatim
+	git -C GS-bin-txt log --pickaxe-regex -S"[a]" >log &&
+	test_cmp log full-log
 
-expecting success of 4204.12 'whitespace is irrelevant without --verbatim': 
-	test_patch_id_whitespace irrelevant --stable --stable
+ok 47 - log -S --pickaxe-regex looks into binary files
 
-ok 12 - whitespace is irrelevant without --verbatim
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4212-log-corrupt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4212-log-corrupt/.git/
+expecting success of 4212.1 'setup': 
+	test_commit foo &&
 
-expecting success of 4204.13 'default is unstable': 
-	test_patch_id relevant default
+	git cat-file commit HEAD >ok.commit &&
+	sed "s/>/>-<>/" <ok.commit >broken_email.commit &&
 
-Already on 'same'
---- patch-id_order-default-relevant	2025-02-09 06:54:33.945903636 +0000
-+++ patch-id_ordered-order-default-relevant	2025-02-09 06:54:33.957903712 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 13 - default is unstable
+	git hash-object --literally -w -t commit broken_email.commit >broken_email.hash &&
+	git update-ref refs/heads/broken_email $(cat broken_email.hash)
 
-expecting success of 4204.14 'patchid.stable = true is stable': 
-	test_config patchid.stable true &&
-	test_patch_id irrelevant patchid.stable=true
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - setup
 
-Already on 'same'
-ok 14 - patchid.stable = true is stable
+expecting success of 4212.2 'fsck notices broken commit': 
+	test_must_fail git fsck 2>actual &&
+	test_grep invalid.author actual
 
-expecting success of 4204.15 'patchid.stable = false is unstable': 
-	test_config patchid.stable false &&
-	test_patch_id relevant patchid.stable=false
+error in commit 95d34e8ea91fa7096fda0f149aaf014999b43f25: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 2 - fsck notices broken commit
 
-Already on 'same'
---- patch-id_order-patchid.stable=false-relevant	2025-02-09 06:54:34.005904017 +0000
-+++ patch-id_ordered-order-patchid.stable=false-relevant	2025-02-09 06:54:34.021904119 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 15 - patchid.stable = false is unstable
+expecting success of 4212.3 'git log with broken author email': 
+	{
+		echo commit $(cat broken_email.hash) &&
+		echo "Author: A U Thor <author@example.com>" &&
+		echo "Date:   Thu Apr 7 15:13:13 2005 -0700" &&
+		echo &&
+		echo "    foo"
+	} >expect.out &&
 
-expecting success of 4204.16 'patchid.verbatim = true is correct and stable': 
-	test_config patchid.verbatim true &&
-	test_patch_id_whitespace relevant patchid.verbatim=true &&
-	test_patch_id irrelevant patchid.verbatim=true
+	git log broken_email >actual.out 2>actual.err &&
 
---- patch-id_ws-patchid.verbatim=true-relevant	2025-02-09 06:54:34.041904247 +0000
-+++ patch-id_ws-ws-patchid.verbatim=true-relevant	2025-02-09 06:54:34.053904323 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-Already on 'same'
-ok 16 - patchid.verbatim = true is correct and stable
+	test_cmp expect.out actual.out &&
+	test_must_be_empty actual.err
 
-expecting success of 4204.17 'patchid.verbatim = false is unstable': 
-	test_config patchid.verbatim false &&
-	test_patch_id relevant patchid.verbatim=false
+ok 3 - git log with broken author email
 
-Already on 'same'
---- patch-id_order-patchid.verbatim=false-relevant	2025-02-09 06:54:34.105904654 +0000
-+++ patch-id_ordered-order-patchid.verbatim=false-relevant	2025-02-09 06:54:34.121904756 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 17 - patchid.verbatim = false is unstable
+expecting success of 4212.4 'git log --format with broken author email': 
+	echo "A U Thor+author@example.com+Thu Apr 7 15:13:13 2005 -0700" >expect.out &&
 
-expecting success of 4204.18 '--unstable overrides patchid.stable = true': 
-	test_config patchid.stable true &&
-	test_patch_id relevant patchid.stable=true--unstable --unstable
+	git log --format="%an+%ae+%ad" broken_email >actual.out 2>actual.err &&
 
-Already on 'same'
---- patch-id_order-patchid.stable=true--unstable-relevant	2025-02-09 06:54:34.145904908 +0000
-+++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2025-02-09 06:54:34.169905061 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 18 - --unstable overrides patchid.stable = true
+	test_cmp expect.out actual.out &&
+	test_must_be_empty actual.err
 
-expecting success of 4204.19 '--stable overrides patchid.stable = false': 
-	test_config patchid.stable false &&
-	test_patch_id irrelevant patchid.stable=false--stable --stable
+ok 4 - git log --format with broken author email
 
-Already on 'same'
-ok 19 - --stable overrides patchid.stable = false
+expecting success of 4212.5 '--until handles broken email': 
+	git rev-list --until=1980-01-01 broken_email >actual &&
+	test_must_be_empty actual
 
-expecting success of 4204.20 '--verbatim overrides patchid.stable = false': 
-	test_config patchid.stable false &&
-	test_patch_id_whitespace relevant stable=false--verbatim --verbatim
+ok 5 - --until handles broken email
 
---- patch-id_ws-stable=false--verbatim-relevant	2025-02-09 06:54:34.217905366 +0000
-+++ patch-id_ws-ws-stable=false--verbatim-relevant	2025-02-09 06:54:34.225905417 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-ok 20 - --verbatim overrides patchid.stable = false
+expecting success of 4212.6 'unparsable dates produce sentinel value': 
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo "Date:   Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 $commit >actual.full &&
+	grep Date <actual.full >actual &&
+	test_cmp expect actual
 
-expecting success of 4204.21 'patch-id supports git-format-patch MIME output': 
-	get_patch_id main &&
-	git checkout same &&
-	git format-patch -1 --attach --stdout >format-patch.output &&
-	calc_patch_id <format-patch.output same &&
-	test_cmp patch-id_main patch-id_same
+ok 6 - unparsable dates produce sentinel value
 
-Already on 'same'
-ok 21 - patch-id supports git-format-patch MIME output
+expecting success of 4212.7 'unparsable dates produce sentinel value (%ad)': 
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
 
-expecting success of 4204.22 'patch-id respects config from subdir': 
-	test_config patchid.stable true &&
-	mkdir subdir &&
+ok 7 - unparsable dates produce sentinel value (%ad)
 
-	# copy these because test_patch_id() looks for them in
-	# the current directory
-	cp bar-then-foo foo-then-bar subdir &&
+expecting success of 4212.8 'date parser recognizes integer overflow': 
+	commit=$(munge_author_date HEAD 18446744073709551617) &&
+	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
 
-	(
-		cd subdir &&
-		test_patch_id irrelevant patchid.stable=true
-	)
+ok 8 - date parser recognizes integer overflow
 
-Already on 'same'
-ok 22 - patch-id respects config from subdir
+expecting success of 4212.9 'date parser recognizes time_t overflow': 
+	commit=$(munge_author_date HEAD 18446744073709551614) &&
+	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
 
-expecting success of 4204.23 'patch-id handles no-nl-at-eof markers': 
-	cat >nonl <<-\EOF &&
-	diff --git i/a w/a
-	index e69de29..2e65efe 100644
-	--- i/a
-	+++ w/a
-	@@ -0,0 +1 @@
-	+a
-	\ No newline at end of file
-	diff --git i/b w/b
-	index e69de29..6178079 100644
-	--- i/b
-	+++ w/b
-	@@ -0,0 +1 @@
-	+b
-	EOF
-	cat >withnl <<-\EOF &&
-	diff --git i/a w/a
-	index e69de29..7898192 100644
-	--- i/a
-	+++ w/a
-	@@ -0,0 +1 @@
-	+a
-	diff --git i/b w/b
-	index e69de29..6178079 100644
-	--- i/b
-	+++ w/b
-	@@ -0,0 +1 @@
-	+b
-	EOF
-	calc_patch_id nonl <nonl &&
-	calc_patch_id withnl <withnl &&
-	test_cmp patch-id_nonl patch-id_withnl &&
-	calc_patch_id nonl-inc-ws --verbatim <nonl &&
-	calc_patch_id withnl-inc-ws --verbatim <withnl &&
-	! test_cmp patch-id_nonl-inc-ws patch-id_withnl-inc-ws
+ok 9 - date parser recognizes time_t overflow
 
---- patch-id_nonl-inc-ws	2025-02-09 06:54:34.333906104 +0000
-+++ patch-id_withnl-inc-ws	2025-02-09 06:54:34.337906130 +0000
-@@ -1 +1 @@
--7ff2bcb9c001e010d881f0fccddc20be3af94012
-+897be18d6338cd2e68bf17f3848b1c48bbc17459
-ok 23 - patch-id handles no-nl-at-eof markers
+expecting success of 4212.10 'absurdly far-in-future date': 
+	commit=$(munge_author_date HEAD 999999999999999999) &&
+	git log -1 --format=%ad $commit
 
-expecting success of 4204.24 'patch-id handles diffs with one line of before/after': 
-	cat >diffu1 <<-\EOF &&
-	diff --git a/bar b/bar
-	index bdaf90f..31051f6 100644
-	--- a/bar
-	+++ b/bar
-	@@ -2 +2,2 @@
-	 b
-	+c
-	diff --git a/car b/car
-	index 00750ed..2ae5e34 100644
-	--- a/car
-	+++ b/car
-	@@ -1 +1,2 @@
-	 3
-	+d
-	diff --git a/foo b/foo
-	index e439850..7146eb8 100644
-	--- a/foo
-	+++ b/foo
-	@@ -2 +2,2 @@
-	 a
-	+e
-	EOF
-	calc_patch_id diffu1 <diffu1 &&
-	test_config patchid.stable true &&
-	calc_patch_id diffu1stable <diffu1
+Thu Jan 1 00:00:00 1970 +0000
+ok 10 - absurdly far-in-future date
 
-ok 24 - patch-id handles diffs with one line of before/after
+expecting success of 4212.11 'create commits with whitespace committer dates': 
+	# It is important that this subject line is numeric, since we want to
+	# be sure we are not confused by skipping whitespace and accidentally
+	# parsing the subject as a timestamp.
+	#
+	# Do not use munge_author_date here. Besides not hitting the committer
+	# line, it leaves the timezone intact, and we want nothing but
+	# whitespace.
+	#
+	# We will make two munged commits here. The first, ws_commit, will
+	# be purely spaces. The second contains a vertical tab, which is
+	# considered a space by strtoumax(), but not by our isspace().
+	test_commit 1234567890 &&
+	git cat-file commit HEAD >commit.orig &&
+	sed "s/>.*/>    /" <commit.orig >commit.munge &&
+	ws_commit=$(git hash-object --literally -w -t commit commit.munge) &&
+	sed "s/>.*/>   $(printf "\013")/" <commit.orig >commit.munge &&
+	vt_commit=$(git hash-object --literally -w -t commit commit.munge)
 
-checking known breakage of 4204.25 'patch-id computes same ID with different object hashes': 
-	test_when_finished "rm -rf repo-sha1 repo-sha256" &&
+[master f47e17d] 1234567890
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1234567890.t
+ok 11 - create commits with whitespace committer dates
 
-	cat >diff <<-\EOF &&
-	diff --git a/bar b/bar
-	index bdaf90f..31051f6 100644
-	--- a/bar
-	+++ b/bar
-	@@ -2 +2,2 @@
-	 b
-	+c
-	EOF
+expecting success of 4212.12 '--until treats whitespace date as sentinel': 
+	echo $ws_commit >expect &&
+	git rev-list --until=1980-01-01 $ws_commit >actual &&
+	test_cmp expect actual &&
 
-	git init --object-format=sha1 repo-sha1 &&
-	git -C repo-sha1 patch-id <diff >patch-id-sha1 &&
-	git init --object-format=sha256 repo-sha256 &&
-	git -C repo-sha256 patch-id <diff >patch-id-sha256 &&
-	test_cmp patch-id-sha1 patch-id-sha256
+	echo $vt_commit >expect &&
+	git rev-list --until=1980-01-01 $vt_commit >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4204-patch-id/repo-sha1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4204-patch-id/repo-sha256/.git/
---- patch-id-sha1	2025-02-09 06:54:34.373906359 +0000
-+++ patch-id-sha256	2025-02-09 06:54:34.381906410 +0000
-@@ -1 +1 @@
--412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
-+f8e1e9607584d07254be0d54eebb3f8ce98ce90acb09c653b9bbda1ad2ffc516 0000000000000000000000000000000000000000000000000000000000000000
-not ok 25 - patch-id computes same ID with different object hashes # TODO known breakage
+ok 12 - --until treats whitespace date as sentinel
 
-expecting success of 4204.26 'patch-id without repository': 
-	cat >diff <<-\EOF &&
-	diff --git a/bar b/bar
-	index bdaf90f..31051f6 100644
-	--- a/bar
-	+++ b/bar
-	@@ -2 +2,2 @@
-	 b
-	+c
-	EOF
-	nongit git patch-id <diff
+expecting success of 4212.13 'pretty-printer handles whitespace date': 
+	# as with the %ad test above, we will show these as the empty string,
+	# not the 1970 epoch date. This is intentional; see 7d9a281941 (t4212:
+	# test bogus timestamps with git-log, 2014-02-24) for more discussion.
+	echo : >expect &&
+	git log -1 --format="%at:%ct" $ws_commit >actual &&
+	test_cmp expect actual &&
+	git log -1 --format="%at:%ct" $vt_commit >actual &&
+	test_cmp expect actual
 
-412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
-ok 26 - patch-id without repository
+ok 13 - pretty-printer handles whitespace date
 
-# still have 1 known breakage(s)
-# passed all remaining 25 test(s)
-1..26
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4124-apply-ws-rule.sh ***
@@ -278210,617 +278453,1087 @@
 1..78
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4209-log-pickaxe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4209-log-pickaxe/.git/
-expecting success of 4209.1 'setup': 
-	>expect_nomatch &&
+*** t4200-rerere.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	>file &&
-	git add file &&
+	git add a1 &&
 	test_tick &&
-	git commit -m initial &&
-	git rev-parse --verify HEAD >expect_initial &&
+	git commit -q -a -m initial &&
 
-	echo Picked >file &&
-	git add file &&
+	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 --author="Another Person <another@example.com>" -m second &&
-	git rev-parse --verify HEAD >expect_second
+	git commit -q -a -m first &&
 
-[master (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master 64f6655] second
- Author: Another Person <another@example.com>
- 1 file changed, 1 insertion(+)
+	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 4209.2 'usage': 
-	test_expect_code 129 git log -S 2>err &&
-	test_grep "switch.*requires a value" err &&
+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
 
-	test_expect_code 129 git log -G 2>err &&
-	test_grep "switch.*requires a value" err &&
+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
 
-	test_expect_code 128 git log -Gregex -Sstring 2>err &&
-	grep "cannot be used together" err &&
+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 &&
 
-	test_expect_code 128 git log -Gregex --find-object=HEAD 2>err &&
-	grep "cannot be used together" err &&
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1 &&
+	grep "^=======\$" $rr/preimage &&
+	! test -f $rr/postimage &&
+	! test -f $rr/thisimage
 
-	test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
-	grep "cannot be used together" err &&
+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)
 
-	test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err &&
-	grep "cannot be used together" err
+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 &&
 
-error: switch `S' requires a value
-error: switch `G' requires a value
-fatal: options '-G', '-S', and '--find-object' cannot be used together
-fatal: options '-G', '-S', and '--find-object' cannot be used together
-fatal: options '-G', '-S', and '--find-object' cannot be used together
-fatal: options '--pickaxe-all' and '--find-object' cannot be used together, use '--pickaxe-all' with '-G' and '-S'
-ok 2 - usage
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1 &&
+	grep ^=======$ $rr/preimage
 
-expecting success of 4209.3 'usage: --pickaxe-regex': 
-	test_expect_code 128 git log -Gregex --pickaxe-regex 2>err &&
-	grep "cannot be used together" err
+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
 
-fatal: options '-G' and '--pickaxe-regex' cannot be used together, use '--pickaxe-regex' with '-S'
-ok 3 - usage: --pickaxe-regex
+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
 
-expecting success of 4209.4 'usage: --no-pickaxe-regex': 
+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 &&
-	fatal: unrecognized argument: --no-pickaxe-regex
+	--- 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
 
-	test_expect_code 128 git log -Sstring --no-pickaxe-regex 2>actual &&
-	test_cmp expect actual &&
-
-	test_expect_code 128 git log -Gstring --no-pickaxe-regex 2>err &&
-	test_cmp expect actual
+ok 7 - rerere diff
 
-ok 4 - usage: --no-pickaxe-regex
+expecting success of 4200.8 'rerere status': 
+	echo a1 >expect &&
+	git rerere status >out &&
+	test_cmp expect out
 
-expecting success of 4209.5 'log --grep (match)': 
-		git log  --grep=initial --format=%H >actual &&
-		test_cmp expect_initial actual
-	
-ok 5 - log --grep (match)
+ok 8 - rerere status
 
-expecting success of 4209.6 'log --grep (nomatch)': 
-		git log  --grep=InItial --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 6 - log --grep (nomatch)
+expecting success of 4200.9 'first postimage wins': 
+	git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
 
-expecting success of 4209.7 'log --grep --regexp-ignore-case (match)': 
-		git log --regexp-ignore-case --grep=InItial --format=%H >actual &&
-		test_cmp expect_initial actual
-	
-ok 7 - log --grep --regexp-ignore-case (match)
+	git commit -q -a -m "prefer first over second" &&
+	test -f $rr/postimage &&
 
-expecting success of 4209.8 'log --grep -i (match)': 
-		git log -i --grep=InItial --format=%H >actual &&
-		test_cmp expect_initial actual
-	
-ok 8 - log --grep -i (match)
+	oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
 
-expecting success of 4209.9 'log --grep --regexp-ignore-case (nomatch)': 
-		git log --regexp-ignore-case --grep=initail --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 9 - log --grep --regexp-ignore-case (nomatch)
+	git checkout -b third main &&
+	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
+	git commit -q -a -m third &&
 
-expecting success of 4209.10 'log --grep -i (nomatch)': 
-		git log -i --grep=initail --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 10 - log --grep -i (nomatch)
+	test_must_fail git merge first &&
+	# rerere kicked in
+	! grep "^=======\$" a1 &&
+	test_cmp expect a1
 
-expecting success of 4209.11 'log --author (match)': 
-		git log  --author=Person --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 11 - log --author (match)
+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 4209.12 'log --author (nomatch)': 
-		git log  --author=person --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 12 - log --author (nomatch)
+expecting success of 4200.10 'rerere updates postimage timestamp': 
+	newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
+	test $oldmtimepost -lt $newmtimepost
 
-expecting success of 4209.13 'log --author --regexp-ignore-case (match)': 
-		git log --regexp-ignore-case --author=person --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 13 - log --author --regexp-ignore-case (match)
+ok 10 - rerere updates postimage timestamp
 
-expecting success of 4209.14 'log --author -i (match)': 
-		git log -i --author=person --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 14 - log --author -i (match)
+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
 
-expecting success of 4209.15 'log --author --regexp-ignore-case (nomatch)': 
-		git log --regexp-ignore-case --author=spreon --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 15 - log --author --regexp-ignore-case (nomatch)
+ok 11 - rerere clear
 
-expecting success of 4209.16 'log --author -i (nomatch)': 
-		git log -i --author=spreon --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 16 - log --author -i (nomatch)
+expecting success of 4200.12 'leftover directory': 
+	git reset --hard &&
+	mkdir -p $rr &&
+	test_must_fail git merge first &&
+	test -f $rr/preimage
 
-expecting success of 4209.17 'log -G (nomatch)': 
-		git log  -Gpicked --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 17 - log -G (nomatch)
+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 4209.18 'log -G (match)': 
-		git log  -GPicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 18 - log -G (match)
+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
 
-expecting success of 4209.19 'log -G --regexp-ignore-case (nomatch)': 
-		git log --regexp-ignore-case -Gpickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 19 - log -G --regexp-ignore-case (nomatch)
+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 4209.20 'log -G -i (nomatch)': 
-		git log -i -Gpickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 20 - log -G -i (nomatch)
+expecting success of 4200.14 'set up for garbage collection tests': 
+	mkdir -p $rr &&
+	echo Hello >$rr/preimage &&
+	echo World >$rr/postimage &&
 
-expecting success of 4209.21 'log -G --regexp-ignore-case (match)': 
-		git log --regexp-ignore-case -Gpicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 21 - log -G --regexp-ignore-case (match)
+	sha2=$(test_oid deadbeef) &&
+	rr2=.git/rr-cache/$sha2 &&
+	mkdir $rr2 &&
+	echo Hello >$rr2/preimage &&
 
-expecting success of 4209.22 'log -G -i (match)': 
-		git log -i -Gpicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 22 - log -G -i (match)
+	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)) &&
 
-expecting success of 4209.23 'log -G --textconv (missing textconv tool)': 
-	echo "* diff=test" >.gitattributes &&
-	test_must_fail git -c diff.test.textconv=missing log -Gfoo &&
-	rm .gitattributes
+	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
 
-error: cannot run missing: No such file or directory
-fatal: unable to read files to diff
-ok 23 - log -G --textconv (missing textconv tool)
+ok 14 - set up for garbage collection tests
 
-expecting success of 4209.24 'log -G --no-textconv (missing textconv tool)': 
-	echo "* diff=test" >.gitattributes &&
-	git -c diff.test.textconv=missing log -Gfoo --no-textconv >actual &&
-	test_cmp expect_nomatch actual &&
-	rm .gitattributes
+expecting success of 4200.15 'gc preserves young or recently used records': 
+	git rerere gc &&
+	test -f $rr/preimage &&
+	test -f $rr2/preimage
 
-ok 24 - log -G --no-textconv (missing textconv tool)
+ok 15 - gc preserves young or recently used records
 
-expecting success of 4209.25 'log -S (nomatch)': 
-		git log  -Spicked --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 25 - log -S (nomatch)
+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
 
-expecting success of 4209.26 'log -S (match)': 
-		git log  -SPicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 26 - log -S (match)
+ok 16 - old records rest in peace
 
-expecting success of 4209.27 'log -S --regexp-ignore-case (match)': 
-		git log --regexp-ignore-case -Spicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 27 - log -S --regexp-ignore-case (match)
+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" &&
 
-expecting success of 4209.28 'log -S -i (match)': 
-		git log -i -Spicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 28 - log -S -i (match)
+		two_days_ago=$((-2*86400)) &&
+		test-tool chmtime =$two_days_ago "$rr/preimage" &&
+		test-tool chmtime =$two_days_ago "$rr/postimage" &&
 
-expecting success of 4209.29 'log -S --regexp-ignore-case (nomatch)': 
-		git log --regexp-ignore-case -Spickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 29 - log -S --regexp-ignore-case (nomatch)
+		find .git/rr-cache -type f | sort >original &&
 
-expecting success of 4209.30 'log -S -i (nomatch)': 
-		git log -i -Spickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 30 - log -S -i (nomatch)
+		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 &&
 
-expecting success of 4209.31 'log -S --pickaxe-regex (nomatch)': 
-		git log --pickaxe-regex -Sp.cked --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 31 - log -S --pickaxe-regex (nomatch)
+		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 &&
 
-expecting success of 4209.32 'log -S --pickaxe-regex (match)': 
-		git log --pickaxe-regex -SP.cked --format=%H >actual &&
-		test_cmp expect_second 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 32 - log -S --pickaxe-regex (match)
+ok 17 - rerere gc with custom expiry (5, 0)
 
-expecting success of 4209.33 'log -S --pickaxe-regex --regexp-ignore-case (match)': 
-		git log --pickaxe-regex --regexp-ignore-case -Sp.cked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 33 - log -S --pickaxe-regex --regexp-ignore-case (match)
+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" &&
 
-expecting success of 4209.34 'log -S --pickaxe-regex -i (match)': 
-		git log --pickaxe-regex -i -Sp.cked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 34 - log -S --pickaxe-regex -i (match)
+		two_days_ago=$((-2*86400)) &&
+		test-tool chmtime =$two_days_ago "$rr/preimage" &&
+		test-tool chmtime =$two_days_ago "$rr/postimage" &&
 
-expecting success of 4209.35 'log -S --pickaxe-regex --regexp-ignore-case (nomatch)': 
-		git log --pickaxe-regex --regexp-ignore-case -Sp.ckle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 35 - log -S --pickaxe-regex --regexp-ignore-case (nomatch)
+		find .git/rr-cache -type f | sort >original &&
 
-expecting success of 4209.36 'log -S --pickaxe-regex -i (nomatch)': 
-		git log --pickaxe-regex -i -Sp.ckle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 36 - log -S --pickaxe-regex -i (nomatch)
+		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 &&
 
-expecting success of 4209.37 'log -S --textconv (missing textconv tool)': 
-	echo "* diff=test" >.gitattributes &&
-	test_must_fail git -c diff.test.textconv=missing log -Sfoo &&
-	rm .gitattributes
+		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 &&
 
-error: cannot run missing: No such file or directory
-fatal: unable to read files to diff
-ok 37 - log -S --textconv (missing textconv tool)
+		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 4209.38 'log -S --no-textconv (missing textconv tool)': 
-	echo "* diff=test" >.gitattributes &&
-	git -c diff.test.textconv=missing log -Sfoo --no-textconv >actual &&
-	test_cmp expect_nomatch actual &&
-	rm .gitattributes
+expecting success of 4200.19 'setup: file2 added differently in two branches': 
+	git reset --hard &&
 
-ok 38 - log -S --no-textconv (missing textconv tool)
+	git checkout -b fourth &&
+	echo Hallo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m version1 &&
 
-expecting success of 4209.39 'setup log -[GS] plain & regex': 
-	test_create_repo GS-plain &&
-	test_commit -C GS-plain --append A data.txt "a" &&
-	test_commit -C GS-plain --append B data.txt "a a" &&
-	test_commit -C GS-plain --append C data.txt "b" &&
-	test_commit -C GS-plain --append D data.txt "[b]" &&
-	test_commit -C GS-plain E data.txt "" &&
+	git checkout third &&
+	echo Bello >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m version2 &&
 
-	# We also include E, the deletion commit
-	git -C GS-plain log --grep="[ABE]" >A-to-B-then-E-log &&
-	git -C GS-plain log --grep="[CDE]" >C-to-D-then-E-log &&
-	git -C GS-plain log --grep="[DE]" >D-then-E-log &&
-	git -C GS-plain log >full-log
+	test_must_fail git merge fourth &&
+	echo Cello >file2 &&
+	git add file2 &&
+	git commit -m resolution
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4209-log-pickaxe/GS-plain/.git/
-[master (root-commit) 39fb857] A
+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 data.txt
-[master 50c3229] B
+ create mode 100644 file2
+Switched to branch 'third'
+[third 1f50303] version2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 70aa019] C
+ 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>
- 1 file changed, 1 insertion(+)
-[master 3f7d046] D
+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(+)
-[master 4fd79ea] E
+ create mode 100644 file3
+Switched to branch 'third'
+[third 7eec302] version2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-ok 39 - setup log -[GS] plain & regex
+ 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 4209.40 'log -G trims diff new/old [-+]': 
-	git -C GS-plain log -G"[+-]a" >log &&
-	test_must_be_empty log &&
-	git -C GS-plain log -G"^a" >log &&
-	test_cmp log A-to-B-then-E-log
+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
 
-ok 40 - log -G trims diff new/old [-+]
+HEAD is now at 7eec302 version2
+Note: switching to 'version2'.
 
-expecting success of 4209.41 'log -S<pat> is not a regex, but -S<pat> --pickaxe-regex is': 
-	git -C GS-plain log -S"a" >log &&
-	test_cmp log A-to-B-then-E-log &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git -C GS-plain log -S"[a]" >log &&
-	test_must_be_empty log &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	git -C GS-plain log -S"[a]" --pickaxe-regex >log &&
-	test_cmp log A-to-B-then-E-log &&
+  git switch -c <new-branch-name>
 
-	git -C GS-plain log -S"[b]" >log &&
-	test_cmp log D-then-E-log &&
+Or undo this operation with:
 
-	git -C GS-plain log -S"[b]" --pickaxe-regex >log &&
-	test_cmp log C-to-D-then-E-log
+  git switch -
 
-ok 41 - log -S<pat> is not a regex, but -S<pat> --pickaxe-regex is
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 4209.42 'setup log -[GS] binary & --text': 
-	test_create_repo GS-bin-txt &&
-	test_commit -C GS-bin-txt --printf A data.bin "a\na\0a\n" &&
-	test_commit -C GS-bin-txt --append --printf B data.bin "a\na\0a\n" &&
-	test_commit -C GS-bin-txt C data.bin "" &&
-	git -C GS-bin-txt log >full-log
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4209-log-pickaxe/GS-bin-txt/.git/
-[master (root-commit) 988beca] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 data.bin
-[master 22cac2b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master 578ec9f] C
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 42 - setup log -[GS] binary & --text
+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
 
-expecting success of 4209.43 'log -G ignores binary files': 
-	git -C GS-bin-txt log -Ga >log &&
-	test_must_be_empty log
+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
 
-ok 43 - log -G ignores binary files
+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
 
-expecting success of 4209.44 'log -G looks into binary files with -a': 
-	git -C GS-bin-txt log -a -Ga >log &&
-	test_cmp log full-log
+	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
 
-ok 44 - log -G looks into binary files with -a
+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 4209.45 'log -G looks into binary files with textconv filter': 
-	test_when_finished "rm GS-bin-txt/.gitattributes" &&
-	(
-		cd GS-bin-txt &&
-		echo "* diff=bin" >.gitattributes &&
-		git -c diff.bin.textconv=cat log -Ga >../log
-	) &&
-	test_cmp log full-log
+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
 
-ok 45 - log -G looks into binary files with textconv filter
+	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 &&
 
-expecting success of 4209.46 'log -S looks into binary files': 
-	git -C GS-bin-txt log -Sa >log &&
-	test_cmp log full-log
+	git ls-files --stage >failedmerge &&
+	cp file3 file3.conflict &&
 
-ok 46 - log -S looks into binary files
+	git ls-files -u >actual &&
+	test_cmp expected.unresolved actual
 
-expecting success of 4209.47 'log -S --pickaxe-regex looks into binary files': 
-	git -C GS-bin-txt log --pickaxe-regex -Sa >log &&
-	test_cmp log full-log &&
+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
 
-	git -C GS-bin-txt log --pickaxe-regex -S"[a]" >log &&
-	test_cmp log full-log
+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 &&
 
-ok 47 - log -S --pickaxe-regex looks into binary files
+	git rerere &&
+	git ls-files -u >actual &&
+	test_cmp expected.unresolved actual
 
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4212-log-corrupt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4212-log-corrupt/.git/
-expecting success of 4212.1 'setup': 
-	test_commit foo &&
+rm 'a1'
+rm 'file3'
+rm 'file3'
+file3: needs merge
+Resolved 'file3' using previous resolution.
+ok 25 - explicit rerere
 
-	git cat-file commit HEAD >ok.commit &&
-	sed "s/>/>-<>/" <ok.commit >broken_email.commit &&
+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 hash-object --literally -w -t commit broken_email.commit >broken_email.hash &&
-	git update-ref refs/heads/broken_email $(cat broken_email.hash)
+	git rerere &&
+	git update-index --refresh
 
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - setup
+rm 'a1'
+rm 'file3'
+rm 'file3'
+file3: needs merge
+Staged 'file3' using previous resolution.
+ok 26 - explicit rerere with autoupdate
 
-expecting success of 4212.2 'fsck notices broken commit': 
-	test_must_fail git fsck 2>actual &&
-	test_grep invalid.author actual
+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 &&
 
-error in commit 95d34e8ea91fa7096fda0f149aaf014999b43f25: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 2 - fsck notices broken commit
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere --rerere-autoupdate &&
+	git update-index --refresh &&
 
-expecting success of 4212.3 'git log with broken author email': 
-	{
-		echo commit $(cat broken_email.hash) &&
-		echo "Author: A U Thor <author@example.com>" &&
-		echo "Date:   Thu Apr 7 15:13:13 2005 -0700" &&
-		echo &&
-		echo "    foo"
-	} >expect.out &&
+	git 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 log broken_email >actual.out 2>actual.err &&
+	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 expect.out actual.out &&
-	test_must_be_empty actual.err
+	test_cmp expected.unresolved actual1 &&
+	test_cmp expected.unresolved actual2
 
-ok 3 - git log with broken author email
+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 4212.4 'git log --format with broken author email': 
-	echo "A U Thor+author@example.com+Thu Apr 7 15:13:13 2005 -0700" >expect.out &&
+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
 
-	git log --format="%an+%ae+%ad" broken_email >actual.out 2>actual.err &&
+rm 'a1'
+rm 'file3'
+usage: git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]
+file3: needs merge
+ok 28 - rerere --no-no-rerere-autoupdate
 
-	test_cmp expect.out actual.out &&
-	test_must_be_empty actual.err
+expecting success of 4200.29 'rerere -h': 
+	test_must_fail git rerere -h >help &&
+	test_grep [Uu]sage help
 
-ok 4 - git log --format with broken author email
+usage: git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]
+ok 29 - rerere -h
 
-expecting success of 4212.5 '--until handles broken email': 
-	git rev-list --until=1980-01-01 broken_email >actual &&
-	test_must_be_empty actual
+expecting success of 4200.30 'multiple identical conflicts': 
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
+	git reset --hard &&
 
-ok 5 - --until handles broken email
+	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 &&
 
-expecting success of 4212.6 'unparsable dates produce sentinel value': 
-	commit=$(munge_author_date HEAD totally_bogus) &&
-	echo "Date:   Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 $commit >actual.full &&
-	grep Date <actual.full >actual &&
-	test_cmp expect actual
+	# 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
 
-ok 6 - unparsable dates produce sentinel value
+	merge_conflict_resolve &&
 
-expecting success of 4212.7 'unparsable dates produce sentinel value (%ad)': 
-	commit=$(munge_author_date HEAD totally_bogus) &&
-	echo >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
+	# Check that rerere knows that file1 and file2 have conflicts
 
-ok 7 - unparsable dates produce sentinel value (%ad)
+	printf "%s\n" file1 file2 >expect &&
+	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
+	test_cmp expect actual &&
 
-expecting success of 4212.8 'date parser recognizes integer overflow': 
-	commit=$(munge_author_date HEAD 18446744073709551617) &&
-	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
+	git rerere status | sort >actual &&
+	test_cmp expect actual &&
 
-ok 8 - date parser recognizes integer overflow
+	git rerere remaining >actual &&
+	test_cmp expect actual &&
 
-expecting success of 4212.9 'date parser recognizes time_t overflow': 
-	commit=$(munge_author_date HEAD 18446744073709551614) &&
-	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
+	count_pre_post 2 0 &&
 
-ok 9 - date parser recognizes time_t overflow
+	# Pretend that the conflicts were made quite some time ago
+	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
 
-expecting success of 4212.10 'absurdly far-in-future date': 
-	commit=$(munge_author_date HEAD 999999999999999999) &&
-	git log -1 --format=%ad $commit
+	# Unresolved entries have not expired yet
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+	count_pre_post 2 0 &&
 
-Thu Jan 1 00:00:00 1970 +0000
-ok 10 - absurdly far-in-future date
+	# Unresolved entries have expired
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
+	count_pre_post 0 0 &&
 
-expecting success of 4212.11 'create commits with whitespace committer dates': 
-	# It is important that this subject line is numeric, since we want to
-	# be sure we are not confused by skipping whitespace and accidentally
-	# parsing the subject as a timestamp.
-	#
-	# Do not use munge_author_date here. Besides not hitting the committer
-	# line, it leaves the timezone intact, and we want nothing but
-	# whitespace.
-	#
-	# We will make two munged commits here. The first, ws_commit, will
-	# be purely spaces. The second contains a vertical tab, which is
-	# considered a space by strtoumax(), but not by our isspace().
-	test_commit 1234567890 &&
-	git cat-file commit HEAD >commit.orig &&
-	sed "s/>.*/>    /" <commit.orig >commit.munge &&
-	ws_commit=$(git hash-object --literally -w -t commit commit.munge) &&
-	sed "s/>.*/>   $(printf "\013")/" <commit.orig >commit.munge &&
-	vt_commit=$(git hash-object --literally -w -t commit commit.munge)
+	# Recreate the conflicted state
+	merge_conflict_resolve &&
+	count_pre_post 2 0 &&
 
-[master f47e17d] 1234567890
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1234567890.t
-ok 11 - create commits with whitespace committer dates
+	# Clear it
+	git rerere clear &&
+	count_pre_post 0 0 &&
 
-expecting success of 4212.12 '--until treats whitespace date as sentinel': 
-	echo $ws_commit >expect &&
-	git rev-list --until=1980-01-01 $ws_commit >actual &&
+	# 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 &&
 
-	echo $vt_commit >expect &&
-	git rev-list --until=1980-01-01 $vt_commit >actual &&
-	test_cmp expect actual
+	# file2 already has correct resolution, so record it again
+	git rerere &&
 
-ok 12 - --until treats whitespace date as sentinel
+	# Pretend that the resolutions are old again
+	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
 
-expecting success of 4212.13 'pretty-printer handles whitespace date': 
-	# as with the %ad test above, we will show these as the empty string,
-	# not the 1970 epoch date. This is intentional; see 7d9a281941 (t4212:
-	# test bogus timestamps with git-log, 2014-02-24) for more discussion.
-	echo : >expect &&
-	git log -1 --format="%at:%ct" $ws_commit >actual &&
+	# 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 log -1 --format="%at:%ct" $vt_commit >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
 
-ok 13 - pretty-printer handles whitespace date
+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
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4217-log-limit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4217-log-limit/.git/
-expecting success of 4217.1 'setup test': 
-	git init &&
-	echo a >file &&
-	git add file &&
-	GIT_COMMITTER_DATE="2021-02-01 00:00" git commit -m init &&
-	echo a >>file &&
-	git add file &&
-	GIT_COMMITTER_DATE="2022-02-01 00:00" git commit -m first &&
-	echo a >>file &&
-	git add file &&
-	GIT_COMMITTER_DATE="2021-03-01 00:00" git commit -m second &&
-	echo a >>file &&
-	git add file &&
-	GIT_COMMITTER_DATE="2022-03-01 00:00" git commit -m third
+expecting success of 4200.33 'setup simple stage 1 handling': 
+	test_create_repo stage_1_handling &&
+	(
+		cd stage_1_handling &&
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4217-log-limit/.git/
-[master (root-commit) 0f41f9c] init
+		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.48.0~rc1+next.20250101/t/trash directory.t4200-rerere/stage_1_handling/.git/
+[main (root-commit) 64a4a07] original
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master b839c03] first
+ 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, 1 insertion(+)
-[master 5dd5cf2] second
+ 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(+)
-[master fd219fd] third
+Switched to branch 'rerere_no_crash'
+[rerere_no_crash ff9691f] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - setup test
+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 set advice.mergeConflict false"
+Recorded preimage for 'test'
+Could not apply 5727ee8... two
+ok 35 - rerere does not crash with missing preimage
 
-expecting success of 4217.2 'git log --since-as-filter=...': 
-	git log --since-as-filter="2022-01-01" --format=%s >actual &&
-	cat >expect <<-\EOF &&
-	third
-	first
+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
-	test_cmp expect actual
+	git add test &&
+	git commit -m "two" &&
 
-ok 2 - git log --since-as-filter=...
+	git checkout rerere_no_preimage &&
+	echo "bar" >>test &&
+	git add test &&
+	git commit -m "three" &&
 
-expecting success of 4217.3 'git log --children --since-as-filter=...': 
-	git log --children --since-as-filter="2022-01-01" --format=%s >actual &&
-	cat >expect <<-\EOF &&
-	third
-	first
+	cat >test <<-EOF &&
+	foobar
+	bar
+	bar
 	EOF
-	test_cmp expect actual
+	git add test &&
+	git commit -m "four" &&
 
-ok 3 - git log --children --since-as-filter=...
+	test_must_fail git rebase main &&
+	cat >test <<-EOF &&
+	test
+	bar
+	<<<<<<< HEAD
+	foobar
+	bar
+	EOF
+	git add test &&
+	test_must_fail git rebase --continue
 
-# passed all 3 test(s)
-1..3
+[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 set 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 set 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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4211-line-log.sh ***
@@ -280402,1492 +281115,248 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4200-rerere.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t4217-log-limit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4217-log-limit/.git/
+expecting success of 4217.1 'setup test': 
+	git init &&
+	echo a >file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2021-02-01 00:00" git commit -m init &&
+	echo a >>file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2022-02-01 00:00" git commit -m first &&
+	echo a >>file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2021-03-01 00:00" git commit -m second &&
+	echo a >>file &&
+	git add file &&
+	GIT_COMMITTER_DATE="2022-03-01 00:00" git commit -m third
 
-HEAD is now at 40cb797 third
-Switched to a new branch 'fourth'
-[fourth 26401ec] version1
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4217-log-limit/.git/
+[master (root-commit) 0f41f9c] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-Switched to branch 'third'
-[third 1f50303] version2
+ create mode 100644 file
+[master b839c03] first
  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
+[master 5dd5cf2] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to branch 'third'
-[third 7eec302] version2
+[master fd219fd] third
  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
+ok 1 - setup test
 
-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
+expecting success of 4217.2 'git log --since-as-filter=...': 
+	git log --since-as-filter="2022-01-01" --format=%s >actual &&
+	cat >expect <<-\EOF &&
+	third
+	first
 	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.48.0~rc1+next.20250101/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 set 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" &&
+ok 2 - git log --since-as-filter=...
 
-	test_must_fail git rebase main &&
-	cat >test <<-EOF &&
-	test
-	bar
-	<<<<<<< HEAD
-	foobar
-	bar
+expecting success of 4217.3 'git log --children --since-as-filter=...': 
+	git log --children --since-as-filter="2022-01-01" --format=%s >actual &&
+	cat >expect <<-\EOF &&
+	third
+	first
 	EOF
-	git add test &&
-	test_must_fail git rebase --continue
+	test_cmp expect actual
 
-[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 set 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 set 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
+ok 3 - git log --children --since-as-filter=...
 
-# passed all 36 test(s)
-1..36
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4214-log-graph-octopus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4214-log-graph-octopus/.git/
-expecting success of 4214.1 'set up merge history': 
-	test_commit initial &&
-	for i in 1 2 3 4 ; do
-		git checkout main -b $i || return $?
-		# Make tag name different from branch name, to avoid
-		# ambiguity error when calling checkout.
-		test_commit $i $i $i tag$i || return $?
-	done &&
-	git checkout 1 -b merge &&
-	test_merge octopus-merge 1 2 3 4 &&
-	test_commit after-merge &&
-	git checkout 1 -b L &&
-	test_commit left &&
-	git checkout 4 -b crossover &&
-	test_commit after-4 &&
-	git checkout initial -b more-L &&
-	test_commit after-initial
+*** t4252-am-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4252-am-options/.git/
+expecting success of 4252.1 'setup': 
+	cp "$tm/file-1-0" file-1 &&
+	cp "$tm/file-2-0" file-2 &&
+	git add file-1 file-2 &&
+	test_tick &&
+	git commit -m initial &&
+	git tag initial
 
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch '1'
-[1 0152a24] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-Switched to a new branch '2'
-[2 bca45ad] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2
-Switched to a new branch '3'
-[3 ec94035] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3
-Switched to a new branch '4'
-[4 132f27d] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4
-Switched to a new branch 'merge'
-Trying simple merge with 2
-Trying simple merge with 3
-Trying simple merge with 4
-Merge made by the 'octopus' strategy.
- 2 | 1 +
- 3 | 1 +
- 4 | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 2
- create mode 100644 3
- create mode 100644 4
-[merge ce2ad1c] after-merge
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-merge.t
-Switched to a new branch 'L'
-[L d607189] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 left.t
-Switched to a new branch 'crossover'
-[crossover 7a146e9] after-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-4.t
-Switched to a new branch 'more-L'
-[more-L a2d7eba] after-initial
+[master (root-commit) f06d5e1] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-initial.t
-ok 1 - set up merge history
-
-expecting success of 4214.2 'log --graph with tricky octopus merge, no color': 
-	test_cmp_graph left octopus-merge <<-\EOF
-	* left
-	| *-.   octopus-merge
-	|/|\ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 2 - log --graph with tricky octopus merge, no color
-
-expecting success of 4214.3 'log --graph with tricky octopus merge with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* left
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
-	<RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<RED>|<RESET> * <MAGENTA>/<RESET> 2
-	<RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>/<RESET> 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph left octopus-merge
-
-ok 3 - log --graph with tricky octopus merge with colors
-
-expecting success of 4214.4 'log --graph with normal octopus merge, no color': 
-	test_cmp_graph octopus-merge <<-\EOF
-	*---.   octopus-merge
-	|\ \ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 4 - log --graph with normal octopus merge, no color
-
-expecting success of 4214.5 'log --graph with normal octopus merge with colors': 
-	cat >expect.colors <<-\EOF &&
-	*<YELLOW>-<RESET><YELLOW>-<RESET><BLUE>-<RESET><BLUE>.<RESET>   octopus-merge
-	<RED>|<RESET><GREEN>\<RESET> <YELLOW>\<RESET> <BLUE>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
-	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
-	<RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	<RED>|<RESET> * <BLUE>/<RESET> 2
-	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	* <BLUE>/<RESET> 1
-	<BLUE>|<RESET><BLUE>/<RESET>
-	* initial
-	EOF
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	test_cmp_colored_graph octopus-merge
-
-ok 5 - log --graph with normal octopus merge with colors
-
-expecting success of 4214.6 'log --graph with normal octopus merge and child, no color': 
-	test_cmp_graph after-merge <<-\EOF
-	* after-merge
-	*---.   octopus-merge
-	|\ \ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 6 - log --graph with normal octopus merge and child, no color
-
-expecting success of 4214.7 'log --graph with normal octopus and child merge with colors': 
-	cat >expect.colors <<-\EOF &&
-	* after-merge
-	*<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
-	<GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<GREEN>|<RESET> * <MAGENTA>/<RESET> 2
-	<GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>/<RESET> 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	test_cmp_colored_graph after-merge
-
-ok 7 - log --graph with normal octopus and child merge with colors
-
-expecting success of 4214.8 'log --graph with tricky octopus merge and its child, no color': 
-	test_cmp_graph left after-merge <<-\EOF
-	* left
-	| * after-merge
-	| *-.   octopus-merge
-	|/|\ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 8 - log --graph with tricky octopus merge and its child, no color
-
-expecting success of 4214.9 'log --graph with tricky octopus merge and its child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* left
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
-	<RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET>
-	<RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
-	<RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
-	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	<RED>|<RESET> * <CYAN>/<RESET> 2
-	<RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	* <CYAN>/<RESET> 1
-	<CYAN>|<RESET><CYAN>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph left after-merge
-
-ok 9 - log --graph with tricky octopus merge and its child with colors
-
-expecting success of 4214.10 'log --graph with crossover in octopus merge, no color': 
-	test_cmp_graph after-4 octopus-merge <<-\EOF
-	* after-4
-	| *---.   octopus-merge
-	| |\ \ \
-	| |_|_|/
-	|/| | |
-	* | | | 4
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+ok 1 - setup
 
-ok 10 - log --graph with crossover in octopus merge, no color
+expecting success of 4252.2 'interrupted am --whitespace=fix': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --whitespace=fix "$tm"/am-test-1-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Six$" file-2
 
-expecting success of 4214.11 'log --graph with crossover in octopus merge with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-4
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
-	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <RED>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
-	* <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> 4
-	<MAGENTA>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
-	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>_<RESET><YELLOW>|<RESET><MAGENTA>/<RESET>
-	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
-	<MAGENTA>|<RESET> <GREEN>|<RESET> * 2
-	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>/<RESET>
-	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET>
-	<MAGENTA>|<RESET> * 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-4 octopus-merge
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+.git/rebase-apply/patch:13: trailing whitespace.
+Six 
+warning: 1 line applied after fixing whitespace errors.
+Applying: Six
+3
+Six
+ok 2 - interrupted am --whitespace=fix
 
-ok 11 - log --graph with crossover in octopus merge with colors
+expecting success of 4252.3 'interrupted am -C1': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am -C1 "$tm"/am-test-2-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
 
-expecting success of 4214.12 'log --graph with crossover in octopus merge and its child, no color': 
-	test_cmp_graph after-4 after-merge <<-\EOF
-	* after-4
-	| * after-merge
-	| *---.   octopus-merge
-	| |\ \ \
-	| |_|_|/
-	|/| | |
-	* | | | 4
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+Context reduced to (1/1) to apply fragment at 2
+Applying: Six
+3
+Three
+ok 3 - interrupted am -C1
 
-ok 12 - log --graph with crossover in octopus merge and its child, no color
+expecting success of 4252.4 'interrupted am -p2': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am -p2 "$tm"/am-test-3-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
 
-expecting success of 4214.13 'log --graph with crossover in octopus merge and its child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-4
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
-	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <RED>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
-	* <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> 4
-	<CYAN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
-	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>_<RESET><BLUE>|<RESET><CYAN>/<RESET>
-	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
-	<CYAN>|<RESET> <YELLOW>|<RESET> * 2
-	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>/<RESET>
-	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET>
-	<CYAN>|<RESET> * 1
-	<CYAN>|<RESET><CYAN>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-4 after-merge
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+Applying: Six
+3
+Three
+ok 4 - interrupted am -p2
 
-ok 13 - log --graph with crossover in octopus merge and its child with colors
+expecting success of 4252.5 'interrupted am -C1 -p2': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
 
-expecting success of 4214.14 'log --graph with unrelated commit and octopus tip, no color': 
-	test_cmp_graph after-initial octopus-merge <<-\EOF
-	* after-initial
-	| *---.   octopus-merge
-	| |\ \ \
-	| | | | * 4
-	| |_|_|/
-	|/| | |
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+Context reduced to (1/1) to apply fragment at 2
+Applying: Six
+3
+Three
+ok 5 - interrupted am -C1 -p2
 
-ok 14 - log --graph with unrelated commit and octopus tip, no color
+expecting success of 4252.6 'interrupted am --directory="frotz nitfol"': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? &&
+	git am --skip &&
+	grep One "frotz nitfol/file-5"
 
-expecting success of 4214.15 'log --graph with unrelated commit and octopus tip with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-initial
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> * 2
-	<RED>|<RESET> <GREEN>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET>
-	<RED>|<RESET> * 1
-	<RED>|<RESET><RED>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-initial octopus-merge
+HEAD is now at f06d5e1 initial
+error: frotz nitfol/junk/file-2: does not exist in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Six
+Patch failed at 0001 Six
+Applying: Six
+One
+ok 6 - interrupted am --directory="frotz nitfol"
 
-ok 15 - log --graph with unrelated commit and octopus tip with colors
+expecting success of 4252.7 'apply to a funny path': 
+	with_sq="with'sq" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard initial &&
+	git am --directory="$with_sq" "$tm"/am-test-5-2 &&
+	test -f "$with_sq/file-5"
 
-expecting success of 4214.16 'log --graph with unrelated commit and octopus child, no color': 
-	test_cmp_graph after-initial after-merge <<-\EOF
-	* after-initial
-	| * after-merge
-	| *---.   octopus-merge
-	| |\ \ \
-	| | | | * 4
-	| |_|_|/
-	|/| | |
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
+HEAD is now at f06d5e1 initial
+Applying: Six
+ok 7 - apply to a funny path
 
-ok 16 - log --graph with unrelated commit and octopus child, no color
+expecting success of 4252.8 'am --reject': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --reject "$tm"/am-test-6-1 &&
+	grep "@@ -1,3 +1,3 @@" file-2.rej &&
+	test_must_fail git diff-files --exit-code --quiet file-2 &&
+	grep "[-]-reject" .git/rebase-apply/apply-opt
 
-expecting success of 4214.17 'log --graph with unrelated commit and octopus child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-initial
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
-	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> * 2
-	<RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET>
-	<RED>|<RESET> * 1
-	<RED>|<RESET><RED>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-initial after-merge
+HEAD is now at f06d5e1 initial
+Checking patch file-2...
+error: while searching for:
+0
+2
+3
 
-ok 17 - log --graph with unrelated commit and octopus child with colors
+error: patch failed: file-2:1
+Applying patch file-2 with 1 reject...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Huh
+Patch failed at 0001 Huh
+@@ -1,3 +1,3 @@
+ '--reject'
+ok 8 - am --reject
 
-# passed all 17 test(s)
-1..17
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4203-mailmap.sh ***
@@ -283239,191 +282708,409 @@
 1..71
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4252-am-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4252-am-options/.git/
-expecting success of 4252.1 'setup': 
-	cp "$tm/file-1-0" file-1 &&
-	cp "$tm/file-2-0" file-2 &&
-	git add file-1 file-2 &&
-	test_tick &&
-	git commit -m initial &&
-	git tag initial
+*** t4214-log-graph-octopus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4214-log-graph-octopus/.git/
+expecting success of 4214.1 'set up merge history': 
+	test_commit initial &&
+	for i in 1 2 3 4 ; do
+		git checkout main -b $i || return $?
+		# Make tag name different from branch name, to avoid
+		# ambiguity error when calling checkout.
+		test_commit $i $i $i tag$i || return $?
+	done &&
+	git checkout 1 -b merge &&
+	test_merge octopus-merge 1 2 3 4 &&
+	test_commit after-merge &&
+	git checkout 1 -b L &&
+	test_commit left &&
+	git checkout 4 -b crossover &&
+	test_commit after-4 &&
+	git checkout initial -b more-L &&
+	test_commit after-initial
 
-[master (root-commit) f06d5e1] initial
+[main (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
-ok 1 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch '1'
+[1 0152a24] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+Switched to a new branch '2'
+[2 bca45ad] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2
+Switched to a new branch '3'
+[3 ec94035] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3
+Switched to a new branch '4'
+[4 132f27d] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4
+Switched to a new branch 'merge'
+Trying simple merge with 2
+Trying simple merge with 3
+Trying simple merge with 4
+Merge made by the 'octopus' strategy.
+ 2 | 1 +
+ 3 | 1 +
+ 4 | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 2
+ create mode 100644 3
+ create mode 100644 4
+[merge ce2ad1c] after-merge
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-merge.t
+Switched to a new branch 'L'
+[L d607189] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 left.t
+Switched to a new branch 'crossover'
+[crossover 7a146e9] after-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-4.t
+Switched to a new branch 'more-L'
+[more-L a2d7eba] after-initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-initial.t
+ok 1 - set up merge history
 
-expecting success of 4252.2 'interrupted am --whitespace=fix': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --whitespace=fix "$tm"/am-test-1-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Six$" file-2
+expecting success of 4214.2 'log --graph with tricky octopus merge, no color': 
+	test_cmp_graph left octopus-merge <<-\EOF
+	* left
+	| *-.   octopus-merge
+	|/|\ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-.git/rebase-apply/patch:13: trailing whitespace.
-Six 
-warning: 1 line applied after fixing whitespace errors.
-Applying: Six
-3
-Six
-ok 2 - interrupted am --whitespace=fix
+ok 2 - log --graph with tricky octopus merge, no color
 
-expecting success of 4252.3 'interrupted am -C1': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -C1 "$tm"/am-test-2-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
+expecting success of 4214.3 'log --graph with tricky octopus merge with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* left
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
+	<RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	<RED>|<RESET> * <MAGENTA>/<RESET> 2
+	<RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* <MAGENTA>/<RESET> 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph left octopus-merge
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-Context reduced to (1/1) to apply fragment at 2
-Applying: Six
-3
-Three
-ok 3 - interrupted am -C1
+ok 3 - log --graph with tricky octopus merge with colors
 
-expecting success of 4252.4 'interrupted am -p2': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -p2 "$tm"/am-test-3-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
+expecting success of 4214.4 'log --graph with normal octopus merge, no color': 
+	test_cmp_graph octopus-merge <<-\EOF
+	*---.   octopus-merge
+	|\ \ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-Applying: Six
-3
-Three
-ok 4 - interrupted am -p2
+ok 4 - log --graph with normal octopus merge, no color
 
-expecting success of 4252.5 'interrupted am -C1 -p2': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
+expecting success of 4214.5 'log --graph with normal octopus merge with colors': 
+	cat >expect.colors <<-\EOF &&
+	*<YELLOW>-<RESET><YELLOW>-<RESET><BLUE>-<RESET><BLUE>.<RESET>   octopus-merge
+	<RED>|<RESET><GREEN>\<RESET> <YELLOW>\<RESET> <BLUE>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
+	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
+	<RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
+	<RED>|<RESET> * <BLUE>/<RESET> 2
+	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
+	* <BLUE>/<RESET> 1
+	<BLUE>|<RESET><BLUE>/<RESET>
+	* initial
+	EOF
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	test_cmp_colored_graph octopus-merge
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-Context reduced to (1/1) to apply fragment at 2
-Applying: Six
-3
-Three
-ok 5 - interrupted am -C1 -p2
+ok 5 - log --graph with normal octopus merge with colors
 
-expecting success of 4252.6 'interrupted am --directory="frotz nitfol"': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? &&
-	git am --skip &&
-	grep One "frotz nitfol/file-5"
+expecting success of 4214.6 'log --graph with normal octopus merge and child, no color': 
+	test_cmp_graph after-merge <<-\EOF
+	* after-merge
+	*---.   octopus-merge
+	|\ \ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
 
-HEAD is now at f06d5e1 initial
-error: frotz nitfol/junk/file-2: does not exist in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Six
-Patch failed at 0001 Six
-Applying: Six
-One
-ok 6 - interrupted am --directory="frotz nitfol"
+ok 6 - log --graph with normal octopus merge and child, no color
 
-expecting success of 4252.7 'apply to a funny path': 
-	with_sq="with'sq" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard initial &&
-	git am --directory="$with_sq" "$tm"/am-test-5-2 &&
-	test -f "$with_sq/file-5"
+expecting success of 4214.7 'log --graph with normal octopus and child merge with colors': 
+	cat >expect.colors <<-\EOF &&
+	* after-merge
+	*<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
+	<GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
+	<GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	<GREEN>|<RESET> * <MAGENTA>/<RESET> 2
+	<GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* <MAGENTA>/<RESET> 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	test_cmp_colored_graph after-merge
 
-HEAD is now at f06d5e1 initial
-Applying: Six
-ok 7 - apply to a funny path
+ok 7 - log --graph with normal octopus and child merge with colors
 
-expecting success of 4252.8 'am --reject': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --reject "$tm"/am-test-6-1 &&
-	grep "@@ -1,3 +1,3 @@" file-2.rej &&
-	test_must_fail git diff-files --exit-code --quiet file-2 &&
-	grep "[-]-reject" .git/rebase-apply/apply-opt
+expecting success of 4214.8 'log --graph with tricky octopus merge and its child, no color': 
+	test_cmp_graph left after-merge <<-\EOF
+	* left
+	| * after-merge
+	| *-.   octopus-merge
+	|/|\ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
+
+ok 8 - log --graph with tricky octopus merge and its child, no color
+
+expecting success of 4214.9 'log --graph with tricky octopus merge and its child with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* left
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET>
+	<RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
+	<RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
+	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
+	<RED>|<RESET> * <CYAN>/<RESET> 2
+	<RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
+	* <CYAN>/<RESET> 1
+	<CYAN>|<RESET><CYAN>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph left after-merge
+
+ok 9 - log --graph with tricky octopus merge and its child with colors
+
+expecting success of 4214.10 'log --graph with crossover in octopus merge, no color': 
+	test_cmp_graph after-4 octopus-merge <<-\EOF
+	* after-4
+	| *---.   octopus-merge
+	| |\ \ \
+	| |_|_|/
+	|/| | |
+	* | | | 4
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 10 - log --graph with crossover in octopus merge, no color
+
+expecting success of 4214.11 'log --graph with crossover in octopus merge with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-4
+	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
+	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <RED>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
+	* <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> 4
+	<MAGENTA>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
+	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>_<RESET><YELLOW>|<RESET><MAGENTA>/<RESET>
+	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
+	<MAGENTA>|<RESET> <GREEN>|<RESET> * 2
+	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>/<RESET>
+	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET>
+	<MAGENTA>|<RESET> * 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-4 octopus-merge
+
+ok 11 - log --graph with crossover in octopus merge with colors
+
+expecting success of 4214.12 'log --graph with crossover in octopus merge and its child, no color': 
+	test_cmp_graph after-4 after-merge <<-\EOF
+	* after-4
+	| * after-merge
+	| *---.   octopus-merge
+	| |\ \ \
+	| |_|_|/
+	|/| | |
+	* | | | 4
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 12 - log --graph with crossover in octopus merge and its child, no color
+
+expecting success of 4214.13 'log --graph with crossover in octopus merge and its child with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-4
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
+	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <RED>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
+	* <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> 4
+	<CYAN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
+	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>_<RESET><BLUE>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<CYAN>|<RESET> <YELLOW>|<RESET> * 2
+	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET>
+	<CYAN>|<RESET> * 1
+	<CYAN>|<RESET><CYAN>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-4 after-merge
+
+ok 13 - log --graph with crossover in octopus merge and its child with colors
+
+expecting success of 4214.14 'log --graph with unrelated commit and octopus tip, no color': 
+	test_cmp_graph after-initial octopus-merge <<-\EOF
+	* after-initial
+	| *---.   octopus-merge
+	| |\ \ \
+	| | | | * 4
+	| |_|_|/
+	|/| | |
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 14 - log --graph with unrelated commit and octopus tip, no color
+
+expecting success of 4214.15 'log --graph with unrelated commit and octopus tip with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-initial
+	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> * 2
+	<RED>|<RESET> <GREEN>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET>
+	<RED>|<RESET> * 1
+	<RED>|<RESET><RED>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-initial octopus-merge
+
+ok 15 - log --graph with unrelated commit and octopus tip with colors
+
+expecting success of 4214.16 'log --graph with unrelated commit and octopus child, no color': 
+	test_cmp_graph after-initial after-merge <<-\EOF
+	* after-initial
+	| * after-merge
+	| *---.   octopus-merge
+	| |\ \ \
+	| | | | * 4
+	| |_|_|/
+	|/| | |
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 16 - log --graph with unrelated commit and octopus child, no color
 
-HEAD is now at f06d5e1 initial
-Checking patch file-2...
-error: while searching for:
-0
-2
-3
+expecting success of 4214.17 'log --graph with unrelated commit and octopus child with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-initial
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> * 2
+	<RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET>
+	<RED>|<RESET> * 1
+	<RED>|<RESET><RED>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-initial after-merge
 
-error: patch failed: file-2:1
-Applying patch file-2 with 1 reject...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Huh
-Patch failed at 0001 Huh
-@@ -1,3 +1,3 @@
- '--reject'
-ok 8 - am --reject
+ok 17 - log --graph with unrelated commit and octopus child with colors
 
-# passed all 8 test(s)
-1..8
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4254-am-corrupt.sh ***
@@ -283493,32 +283180,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4256-am-format-flowed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4256-am-format-flowed/.git/
-expecting success of 4256.1 'setup': 
-	cp "$TEST_DIRECTORY/t4256/1/mailinfo.c.orig" mailinfo.c &&
-	git add mailinfo.c &&
-	git commit -m initial
-
-[master (root-commit) f699253] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1185 insertions(+)
- create mode 100644 mailinfo.c
-ok 1 - setup
-
-expecting success of 4256.2 'am with format=flowed': 
-	git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
-	test_grep "warning: Patch sent with format=flowed" stderr &&
-	test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
-
-Applying: mailinfo: support format=flowed
-warning: Patch sent with format=flowed; space at the end of lines might be lost.
-ok 2 - am with format=flowed
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4253-am-keep-cr-dos.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4253-am-keep-cr-dos/.git/
 expecting success of 4253.1 'setup repository with dos files': 
@@ -283683,6 +283344,86 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4256-am-format-flowed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4256-am-format-flowed/.git/
+expecting success of 4256.1 'setup': 
+	cp "$TEST_DIRECTORY/t4256/1/mailinfo.c.orig" mailinfo.c &&
+	git add mailinfo.c &&
+	git commit -m initial
+
+[master (root-commit) f699253] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1185 insertions(+)
+ create mode 100644 mailinfo.c
+ok 1 - setup
+
+expecting success of 4256.2 'am with format=flowed': 
+	git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
+	test_grep "warning: Patch sent with format=flowed" stderr &&
+	test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
+
+Applying: mailinfo: support format=flowed
+warning: Patch sent with format=flowed; space at the end of lines might be lost.
+ok 2 - am with format=flowed
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4258-am-quoted-cr.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4213-log-tabexpand.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4213-log-tabexpand/.git/
 expecting success of 4213.1 'setup': 
@@ -283937,60 +283678,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4258-am-quoted-cr.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4205-log-pretty-formats.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4205-log-pretty-formats/.git/
 expecting success of 4205.1 'set up basic repos': 
@@ -285464,8 +285151,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\360\237\221\250\360\237\221\250\360\237\221\250\360\237\221\250\360\237\221\250.t"
---- expected	2025-02-09 06:54:35.477913383 +0000
-+++ actual	2025-02-09 06:54:35.481913409 +0000
+--- expected	2026-03-14 13:31:29.454677808 +0000
++++ actual	2026-03-14 13:31:29.478677808 +0000
 @@ -1,4 +1,4 @@
 -👨..👨⋮
 -e�..e�e�
@@ -285847,1029 +285534,6 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5003-archive-zip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/t5003/infozip-symlinks.zip
- extracting: textfile                
-    linking: symlink                 -> textfile 
-finishing deferred symbolic links:
-  symlink                -> textfile
-prerequisite UNZIP_SYMLINKS ok
-expecting success of 5003.2 'add symlink': 
-	ln -s a a/symlink_to_a
-
-ok 2 - add symlink
-
-expecting success of 5003.3 'prepare file list': 
-	(cd a && find .) | sort >a.lst
-
-ok 3 - prepare file list
-
-expecting success of 5003.4 'add ignored file': echo ignore me >a/ignored &&
-     mkdir .git/info &&
-     echo ignored export-ignore >.git/info/attributes
-ok 4 - add ignored file
-
-expecting success of 5003.5 'add files to repository': 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
-
-[master (root-commit) 9cc2aa8] initial
- Author: A U Thor <author@example.com>
- 22 files changed, 15 insertions(+)
- create mode 100644 a/a
- create mode 100755 a/bin/sh
- create mode 100644 a/binary.cr
- create mode 100644 a/binary.crlf
- create mode 100644 a/binary.lf
- create mode 100644 a/custom.cr
- create mode 100644 a/custom.crlf
- create mode 100644 a/custom.lf
- create mode 100644 a/diff.cr
- create mode 100644 a/diff.crlf
- create mode 100644 a/diff.lf
- create mode 100644 a/ignored
- create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- create mode 100644 a/nodiff.cr
- create mode 100644 a/nodiff.crlf
- create mode 100644 a/nodiff.lf
- create mode 100644 a/substfile1
- create mode 100644 a/substfile2
- create mode 120000 a/symlink_to_a
- create mode 100644 a/text.cr
- create mode 100644 a/text.crlf
- create mode 100644 a/text.lf
-ok 5 - add files to repository
-
-expecting success of 5003.6 'setup export-subst and diff attributes': 
-	echo "a/nodiff.* -diff" >>.git/info/attributes &&
-	echo "a/diff.* diff" >>.git/info/attributes &&
-	echo "a/custom.* diff=custom" >>.git/info/attributes &&
-	git config diff.custom.binary true &&
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
-
-ok 6 - setup export-subst and diff attributes
-
-expecting success of 5003.7 'create bare clone': 
-	git clone --template= --bare . bare.git &&
-	mkdir bare.git/info &&
-	cp .git/info/attributes bare.git/info/attributes &&
-	# Recreate our changes to .git/config rather than just copying it, as
-	# we do not want to clobber core.bare or other settings.
-	git -C bare.git config diff.custom.binary true
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 7 - create bare clone
-
-expecting success of 5003.8 'remove ignored file': rm a/ignored
-ok 8 - remove ignored file
-
-expecting success of 5003.9 'git archive --format=zip': git archive --format=zip HEAD >d.zip
-ok 9 - git archive --format=zip
-
-checking prerequisite: UNZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
-
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
-
-Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
-see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
-
-Compiled with gcc 14.2.0 for Unix (Linux ELF).
-
-UnZip special compilation options:
-        ACORN_FTYPE_NFS
-        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
-        SET_DIR_ATTRIB
-        SYMLINKS (symbolic links supported, if RTL and file system permit)
-        TIMESTAMP
-        UNIXBACKUP
-        USE_EF_UT_TIME
-        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
-        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
-        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
-        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
-        VMS_TEXT_CONV
-        WILD_STOP_AT_DIR
-        [decryption, version 2.11 of 05 Jan 2007]
-
-UnZip and ZipInfo environment options:
-           UNZIP:  [none]
-        UNZIPOPT:  [none]
-         ZIPINFO:  [none]
-      ZIPINFOOPT:  [none]
-prerequisite UNZIP ok
-expecting success of 5003.10 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../d.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 10 -  extract ZIP archive
-
-expecting success of 5003.11 ' validate filenames': 
-		(cd d/a && find .) | sort >d.lst &&
-		test_cmp a.lst d.lst
-	
-ok 11 -  validate filenames
-
-expecting success of 5003.12 ' validate file contents': 
-		diff -r a d/a
-	
-ok 12 -  validate file contents
-
-checking prerequisite: UNZIP_CONVERT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_CONVERT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_CONVERT" &&
-	"$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip
-
-)
-Archive:  /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5003/infozip-symlinks.zip
- extracting: textfile                [text]  
-    linking: symlink                 -> textfile 
-finishing deferred symbolic links:
-  symlink                -> textfile
-prerequisite UNZIP_CONVERT ok
-expecting success of 5003.13 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../d.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 13 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.14 ' validate that text files are converted': 
-		test_cmp_bin eol_d/a/text.cr eol_d/a/text.crlf &&
-		test_cmp_bin eol_d/a/text.cr eol_d/a/text.lf
-	
-ok 14 -  validate that text files are converted
-
-expecting success of 5003.15 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_d/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_d/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_d/a/binary.lf
-	
-ok 15 -  validate that binary files are unchanged
-
-expecting success of 5003.16 ' validate that diff files are converted': 
-		test_cmp_bin eol_d/a/diff.cr eol_d/a/diff.crlf &&
-		test_cmp_bin eol_d/a/diff.cr eol_d/a/diff.lf
-	
-ok 16 -  validate that diff files are converted
-
-expecting success of 5003.17 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_d/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_d/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_d/a/nodiff.lf
-	
-ok 17 -  validate that -diff files are unchanged
-
-expecting success of 5003.18 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_d/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_d/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_d/a/custom.lf
-	
-ok 18 -  validate that custom diff is unchanged 
-
-expecting success of 5003.19 'git archive --format=zip in a bare repo': (cd bare.git && git archive --format=zip HEAD) >d1.zip
-ok 19 - git archive --format=zip in a bare repo
-
-expecting success of 5003.20 'git archive --format=zip vs. the same in a bare repo': test_cmp_bin d.zip d1.zip
-ok 20 - git archive --format=zip vs. the same in a bare repo
-
-expecting success of 5003.21 'git archive --format=zip with --output': git archive --format=zip --output=d2.zip HEAD &&
-    test_cmp_bin d.zip d2.zip
-ok 21 - git archive --format=zip with --output
-
-expecting success of 5003.22 'git archive with --output, inferring format (local)': 
-	git archive --output=d3.zip HEAD &&
-	test_cmp_bin d.zip d3.zip
-
-ok 22 - git archive with --output, inferring format (local)
-
-expecting success of 5003.23 'git archive with --output, inferring format (remote)': 
-	git archive --remote=. --output=d4.zip HEAD &&
-	test_cmp_bin d.zip d4.zip
-
-ok 23 - git archive with --output, inferring format (remote)
-
-expecting success of 5003.24 'git archive --format=zip with prefix': git archive --format=zip --prefix=prefix/ HEAD >e.zip
-ok 24 - git archive --format=zip with prefix
-
-expecting success of 5003.25 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../e.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: prefix/
-   creating: prefix/a/
- extracting: prefix/a/a              
-   creating: prefix/a/bin/
-  inflating: prefix/a/bin/sh         
- extracting: prefix/a/binary.cr      
- extracting: prefix/a/binary.crlf    
- extracting: prefix/a/binary.lf      
- extracting: prefix/a/custom.cr      
- extracting: prefix/a/custom.crlf    
- extracting: prefix/a/custom.lf      
- extracting: prefix/a/diff.cr        
- extracting: prefix/a/diff.crlf      
- extracting: prefix/a/diff.lf        
-   creating: prefix/a/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: prefix/a/nodiff.cr      
- extracting: prefix/a/nodiff.crlf    
- extracting: prefix/a/nodiff.lf      
- extracting: prefix/a/substfile1     
- extracting: prefix/a/substfile2     
-    linking: prefix/a/symlink_to_a   -> a 
- extracting: prefix/a/text.cr        
- extracting: prefix/a/text.crlf      
- extracting: prefix/a/text.lf        
-finishing deferred symbolic links:
-  prefix/a/symlink_to_a  -> a
-ok 25 -  extract ZIP archive
-
-expecting success of 5003.26 ' validate filenames': 
-		(cd e/prefix/a && find .) | sort >e.lst &&
-		test_cmp a.lst e.lst
-	
-ok 26 -  validate filenames
-
-expecting success of 5003.27 ' validate file contents': 
-		diff -r a e/prefix/a
-	
-ok 27 -  validate file contents
-
-expecting success of 5003.28 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../e.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: prefix/
-   creating: prefix/a/
- extracting: prefix/a/a              [text]  
-   creating: prefix/a/bin/
-  inflating: prefix/a/bin/sh         [binary]
- extracting: prefix/a/binary.cr      [binary]
- extracting: prefix/a/binary.crlf    [binary]
- extracting: prefix/a/binary.lf      [binary]
- extracting: prefix/a/custom.cr      [binary]
- extracting: prefix/a/custom.crlf    [binary]
- extracting: prefix/a/custom.lf      [binary]
- extracting: prefix/a/diff.cr        [text]  
- extracting: prefix/a/diff.crlf      [text]  
- extracting: prefix/a/diff.lf        [text]  
-   creating: prefix/a/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: prefix/a/nodiff.cr      [binary]
- extracting: prefix/a/nodiff.crlf    [binary]
- extracting: prefix/a/nodiff.lf      [binary]
- extracting: prefix/a/substfile1     [text]  
- extracting: prefix/a/substfile2     [text]  
-    linking: prefix/a/symlink_to_a   -> a 
- extracting: prefix/a/text.cr        [text]  
- extracting: prefix/a/text.crlf      [text]  
- extracting: prefix/a/text.lf        [text]  
-finishing deferred symbolic links:
-  prefix/a/symlink_to_a  -> a
-ok 28 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.29 ' validate that text files are converted': 
-		test_cmp_bin eol_e/prefix/a/text.cr eol_e/prefix/a/text.crlf &&
-		test_cmp_bin eol_e/prefix/a/text.cr eol_e/prefix/a/text.lf
-	
-ok 29 -  validate that text files are converted
-
-expecting success of 5003.30 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_e/prefix/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_e/prefix/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_e/prefix/a/binary.lf
-	
-ok 30 -  validate that binary files are unchanged
-
-expecting success of 5003.31 ' validate that diff files are converted': 
-		test_cmp_bin eol_e/prefix/a/diff.cr eol_e/prefix/a/diff.crlf &&
-		test_cmp_bin eol_e/prefix/a/diff.cr eol_e/prefix/a/diff.lf
-	
-ok 31 -  validate that diff files are converted
-
-expecting success of 5003.32 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_e/prefix/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_e/prefix/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_e/prefix/a/nodiff.lf
-	
-ok 32 -  validate that -diff files are unchanged
-
-expecting success of 5003.33 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_e/prefix/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_e/prefix/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_e/prefix/a/custom.lf
-	
-ok 33 -  validate that custom diff is unchanged 
-
-expecting success of 5003.34 'git archive -0 --format=zip on large files': 
-	test_config core.bigfilethreshold 1 &&
-	git archive -0 --format=zip HEAD >large.zip
-
-ok 34 - git archive -0 --format=zip on large files
-
-expecting success of 5003.35 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../large.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
- extracting: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 35 -  extract ZIP archive
-
-expecting success of 5003.36 ' validate filenames': 
-		(cd large/a && find .) | sort >large.lst &&
-		test_cmp a.lst large.lst
-	
-ok 36 -  validate filenames
-
-expecting success of 5003.37 ' validate file contents': 
-		diff -r a large/a
-	
-ok 37 -  validate file contents
-
-expecting success of 5003.38 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../large.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
- extracting: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 38 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.39 ' validate that text files are converted': 
-		test_cmp_bin eol_large/a/text.cr eol_large/a/text.crlf &&
-		test_cmp_bin eol_large/a/text.cr eol_large/a/text.lf
-	
-ok 39 -  validate that text files are converted
-
-expecting success of 5003.40 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_large/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_large/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_large/a/binary.lf
-	
-ok 40 -  validate that binary files are unchanged
-
-expecting success of 5003.41 ' validate that diff files are converted': 
-		test_cmp_bin eol_large/a/diff.cr eol_large/a/diff.crlf &&
-		test_cmp_bin eol_large/a/diff.cr eol_large/a/diff.lf
-	
-ok 41 -  validate that diff files are converted
-
-expecting success of 5003.42 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_large/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_large/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_large/a/nodiff.lf
-	
-ok 42 -  validate that -diff files are unchanged
-
-expecting success of 5003.43 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_large/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_large/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_large/a/custom.lf
-	
-ok 43 -  validate that custom diff is unchanged 
-
-expecting success of 5003.44 'git archive --format=zip on large files': 
-	test_config core.bigfilethreshold 1 &&
-	git archive --format=zip HEAD >large-compressed.zip
-
-ok 44 - git archive --format=zip on large files
-
-expecting success of 5003.45 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../large-compressed.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
-  inflating: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
-  inflating: a/binary.cr             
-  inflating: a/binary.crlf           
-  inflating: a/binary.lf             
-  inflating: a/custom.cr             
-  inflating: a/custom.crlf           
-  inflating: a/custom.lf             
-  inflating: a/diff.cr               
-  inflating: a/diff.crlf             
-  inflating: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-  inflating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
-  inflating: a/nodiff.cr             
-  inflating: a/nodiff.crlf           
-  inflating: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
-  inflating: a/text.cr               
-  inflating: a/text.crlf             
-  inflating: a/text.lf               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 45 -  extract ZIP archive
-
-expecting success of 5003.46 ' validate filenames': 
-		(cd large-compressed/a && find .) | sort >large-compressed.lst &&
-		test_cmp a.lst large-compressed.lst
-	
-ok 46 -  validate filenames
-
-expecting success of 5003.47 ' validate file contents': 
-		diff -r a large-compressed/a
-	
-ok 47 -  validate file contents
-
-expecting success of 5003.48 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../large-compressed.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
-  inflating: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
-  inflating: a/binary.cr             [binary]
-  inflating: a/binary.crlf           [binary]
-  inflating: a/binary.lf             [binary]
-  inflating: a/custom.cr             [binary]
-  inflating: a/custom.crlf           [binary]
-  inflating: a/custom.lf             [binary]
-  inflating: a/diff.cr               [text]  
-  inflating: a/diff.crlf             [text]  
-  inflating: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-  inflating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
-  inflating: a/nodiff.cr             [binary]
-  inflating: a/nodiff.crlf           [binary]
-  inflating: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
-  inflating: a/text.cr               [text]  
-  inflating: a/text.crlf             [text]  
-  inflating: a/text.lf               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 48 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.49 ' validate that text files are converted': 
-		test_cmp_bin eol_large-compressed/a/text.cr eol_large-compressed/a/text.crlf &&
-		test_cmp_bin eol_large-compressed/a/text.cr eol_large-compressed/a/text.lf
-	
-ok 49 -  validate that text files are converted
-
-expecting success of 5003.50 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_large-compressed/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_large-compressed/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_large-compressed/a/binary.lf
-	
-ok 50 -  validate that binary files are unchanged
-
-expecting success of 5003.51 ' validate that diff files are converted': 
-		test_cmp_bin eol_large-compressed/a/diff.cr eol_large-compressed/a/diff.crlf &&
-		test_cmp_bin eol_large-compressed/a/diff.cr eol_large-compressed/a/diff.lf
-	
-ok 51 -  validate that diff files are converted
-
-expecting success of 5003.52 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_large-compressed/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_large-compressed/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_large-compressed/a/nodiff.lf
-	
-ok 52 -  validate that -diff files are unchanged
-
-expecting success of 5003.53 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_large-compressed/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_large-compressed/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_large-compressed/a/custom.lf
-	
-ok 53 -  validate that custom diff is unchanged 
-
-expecting success of 5003.54 'git archive --format=zip --add-file': 
-	echo untracked >untracked &&
-	git archive --format=zip --add-file=untracked HEAD >with_untracked.zip
-
-ok 54 - git archive --format=zip --add-file
-
-expecting success of 5003.55 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../with_untracked.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
- extracting: untracked               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 55 -  extract ZIP archive
-
-expecting success of 5003.56 ' validate filenames': 
-		(cd with_untracked/a && find .) | sort >with_untracked.lst &&
-		test_cmp a.lst with_untracked.lst
-	
-ok 56 -  validate filenames
-
-expecting success of 5003.57 ' validate file contents': 
-		diff -r a with_untracked/a
-	
-ok 57 -  validate file contents
-
-expecting success of 5003.58 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../with_untracked.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
- extracting: untracked               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 58 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.59 ' validate that text files are converted': 
-		test_cmp_bin eol_with_untracked/a/text.cr eol_with_untracked/a/text.crlf &&
-		test_cmp_bin eol_with_untracked/a/text.cr eol_with_untracked/a/text.lf
-	
-ok 59 -  validate that text files are converted
-
-expecting success of 5003.60 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_with_untracked/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_with_untracked/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_with_untracked/a/binary.lf
-	
-ok 60 -  validate that binary files are unchanged
-
-expecting success of 5003.61 ' validate that diff files are converted': 
-		test_cmp_bin eol_with_untracked/a/diff.cr eol_with_untracked/a/diff.crlf &&
-		test_cmp_bin eol_with_untracked/a/diff.cr eol_with_untracked/a/diff.lf
-	
-ok 61 -  validate that diff files are converted
-
-expecting success of 5003.62 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_with_untracked/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_with_untracked/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_with_untracked/a/nodiff.lf
-	
-ok 62 -  validate that -diff files are unchanged
-
-expecting success of 5003.63 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_with_untracked/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_with_untracked/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_with_untracked/a/custom.lf
-	
-ok 63 -  validate that custom diff is unchanged 
-
-expecting success of 5003.64 ' validate extra file untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 64 -  validate extra file untracked
-
-expecting success of 5003.65 'git archive --format=zip --add-virtual-file': 
-	if test_have_prereq FUNNYNAMES
-	then
-		PATHNAME="pathname with : colon"
-	else
-		PATHNAME="pathname without colon"
-	fi &&
-	git archive --format=zip >with_file_with_content.zip \
-		--add-virtual-file=\""$PATHNAME"\": \
-		--add-virtual-file=hello:world $EMPTY_TREE &&
-	test_when_finished "rm -rf tmp-unpack" &&
-	mkdir tmp-unpack && (
-		cd tmp-unpack &&
-		"$GIT_UNZIP" ../with_file_with_content.zip &&
-		test_path_is_file hello &&
-		test_path_is_file "$PATHNAME" &&
-		test world = $(cat hello)
-	)
-
-checking prerequisite: FUNNYNAMES
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FUNNYNAMES" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FUNNYNAMES" &&
-	test_have_prereq !MINGW &&
-	touch -- \
-		"FUNNYNAMES tab	embedded" \
-		"FUNNYNAMES \"quote embedded\"" \
-		"FUNNYNAMES newline
-embedded" 2>/dev/null &&
-	rm -- \
-		"FUNNYNAMES tab	embedded" \
-		"FUNNYNAMES \"quote embedded\"" \
-		"FUNNYNAMES newline
-embedded" 2>/dev/null
-
-)
-prerequisite FUNNYNAMES ok
-Archive:  ../with_file_with_content.zip
- extracting: pathname with : colon   
- extracting: hello                   
-ok 65 - git archive --format=zip --add-virtual-file
-
-expecting success of 5003.66 'git archive --format=zip --add-file twice': 
-	echo untracked >untracked &&
-	git archive --format=zip --prefix=one/ --add-file=untracked \
-		--prefix=two/ --add-file=untracked \
-		--prefix= HEAD >with_untracked2.zip
-
-ok 66 - git archive --format=zip --add-file twice
-
-expecting success of 5003.67 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../with_untracked2.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
- extracting: one/untracked           
- extracting: two/untracked           
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 67 -  extract ZIP archive
-
-expecting success of 5003.68 ' validate filenames': 
-		(cd with_untracked2/a && find .) | sort >with_untracked2.lst &&
-		test_cmp a.lst with_untracked2.lst
-	
-ok 68 -  validate filenames
-
-expecting success of 5003.69 ' validate file contents': 
-		diff -r a with_untracked2/a
-	
-ok 69 -  validate file contents
-
-expecting success of 5003.70 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../with_untracked2.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
- extracting: one/untracked           [text]  
- extracting: two/untracked           [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 70 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.71 ' validate that text files are converted': 
-		test_cmp_bin eol_with_untracked2/a/text.cr eol_with_untracked2/a/text.crlf &&
-		test_cmp_bin eol_with_untracked2/a/text.cr eol_with_untracked2/a/text.lf
-	
-ok 71 -  validate that text files are converted
-
-expecting success of 5003.72 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_with_untracked2/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_with_untracked2/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_with_untracked2/a/binary.lf
-	
-ok 72 -  validate that binary files are unchanged
-
-expecting success of 5003.73 ' validate that diff files are converted': 
-		test_cmp_bin eol_with_untracked2/a/diff.cr eol_with_untracked2/a/diff.crlf &&
-		test_cmp_bin eol_with_untracked2/a/diff.cr eol_with_untracked2/a/diff.lf
-	
-ok 73 -  validate that diff files are converted
-
-expecting success of 5003.74 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_with_untracked2/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_with_untracked2/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_with_untracked2/a/nodiff.lf
-	
-ok 74 -  validate that -diff files are unchanged
-
-expecting success of 5003.75 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_with_untracked2/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_with_untracked2/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_with_untracked2/a/custom.lf
-	
-ok 75 -  validate that custom diff is unchanged 
-
-expecting success of 5003.76 ' validate extra file one/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 76 -  validate extra file one/untracked
-
-expecting success of 5003.77 ' validate extra file two/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 77 -  validate extra file two/untracked
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 77 test(s)
-# SKIP no web server found at ''
-1..77
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4202-log.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4202-log/.git/
 expecting success of 4202.1 'setup': 
@@ -289063,2259 +287727,6 @@
 1..148
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5100-mailinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5100-mailinfo/.git/
-expecting success of 5100.1 'split sample box': git mailsplit -o. "$DATA/sample.mbox" >last &&
-	last=$(cat last) &&
-	echo total is $last &&
-	test $(cat last) = 18
-total is 18
-ok 1 - split sample box
-
-expecting success of 5100.2 'mailinfo 0001': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 2 - mailinfo 0001
-
-expecting success of 5100.3 'mailinfo 0002': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 3 - mailinfo 0002
-
-expecting success of 5100.4 'mailinfo 0003': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 4 - mailinfo 0003
-
-expecting success of 5100.5 'mailinfo 0004': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 5 - mailinfo 0004
-
-expecting success of 5100.6 'mailinfo 0005': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 6 - mailinfo 0005
-
-expecting success of 5100.7 'mailinfo 0006': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 7 - mailinfo 0006
-
-expecting success of 5100.8 'mailinfo 0007': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 8 - mailinfo 0007
-
-expecting success of 5100.9 'mailinfo 0008': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 9 - mailinfo 0008
-
-expecting success of 5100.10 'mailinfo 0009': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 10 - mailinfo 0009
-
-expecting success of 5100.11 'mailinfo 0010': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 11 - mailinfo 0010
-
-expecting success of 5100.12 'mailinfo 0011': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 12 - mailinfo 0011
-
-expecting success of 5100.13 'mailinfo 0012': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 13 - mailinfo 0012
-
-expecting success of 5100.14 'mailinfo 0013': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 14 - mailinfo 0013
-
-expecting success of 5100.15 'mailinfo 0014': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 15 - mailinfo 0014
-
-expecting success of 5100.16 'mailinfo 0015': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 16 - mailinfo 0015
-
-expecting success of 5100.17 'mailinfo 0016': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 17 - mailinfo 0016
-
-expecting success of 5100.18 'mailinfo 0017': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 18 - mailinfo 0017
-
-expecting success of 5100.19 'mailinfo 0018': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 19 - mailinfo 0018
-
-expecting success of 5100.20 'split box with rfc2047 samples': mkdir rfc2047 &&
-	git mailsplit -orfc2047 "$DATA/rfc2047-samples.mbox" \
-	  >rfc2047/last &&
-	last=$(cat rfc2047/last) &&
-	echo total is $last &&
-	test $(cat rfc2047/last) = 11
-total is 11
-ok 20 - split box with rfc2047 samples
-
-expecting success of 5100.21 'mailinfo rfc2047/0001': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 21 - mailinfo rfc2047/0001
-
-expecting success of 5100.22 'mailinfo rfc2047/0002': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 22 - mailinfo rfc2047/0002
-
-expecting success of 5100.23 'mailinfo rfc2047/0003': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 23 - mailinfo rfc2047/0003
-
-expecting success of 5100.24 'mailinfo rfc2047/0004': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 24 - mailinfo rfc2047/0004
-
-expecting success of 5100.25 'mailinfo rfc2047/0005': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 25 - mailinfo rfc2047/0005
-
-expecting success of 5100.26 'mailinfo rfc2047/0006': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 26 - mailinfo rfc2047/0006
-
-expecting success of 5100.27 'mailinfo rfc2047/0007': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 27 - mailinfo rfc2047/0007
-
-expecting success of 5100.28 'mailinfo rfc2047/0008': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 28 - mailinfo rfc2047/0008
-
-expecting success of 5100.29 'mailinfo rfc2047/0009': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 29 - mailinfo rfc2047/0009
-
-expecting success of 5100.30 'mailinfo rfc2047/0010': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 30 - mailinfo rfc2047/0010
-
-expecting success of 5100.31 'mailinfo rfc2047/0011': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 31 - mailinfo rfc2047/0011
-
-expecting success of 5100.32 'respect NULs': 
-
-	git mailsplit -d3 -o. "$DATA/nul-plain" &&
-	test_cmp "$DATA/nul-plain" 001 &&
-	git mailinfo msg patch <001 &&
-	test_line_count = 4 patch
-
-
-1
-
-ok 32 - respect NULs
-
-expecting success of 5100.33 'Preserve NULs out of MIME encoded message': 
-
-	git mailsplit -d5 -o. "$DATA/nul-b64.in" &&
-	test_cmp "$DATA/nul-b64.in" 00001 &&
-	git mailinfo msg patch <00001 &&
-	test_cmp "$DATA/nul-b64.expect" patch
-
-
-1
-Author: Junio C Hamano
-Email: gitster@pobox.com
-Subject: second
-Date: Sun, 25 May 2008 00:38:18 -0700
-
-ok 33 - Preserve NULs out of MIME encoded message
-
-expecting success of 5100.34 'mailinfo on from header without name works': 
-
-	mkdir info-from &&
-	git mailsplit -oinfo-from "$DATA/info-from.in" &&
-	test_cmp "$DATA/info-from.in" info-from/0001 &&
-	git mailinfo info-from/msg info-from/patch \
-	  <info-from/0001 >info-from/out &&
-	test_cmp "$DATA/info-from.expect" info-from/out
-
-
-1
-ok 34 - mailinfo on from header without name works
-
-expecting success of 5100.35 'mailinfo finds headers after embedded From line': 
-	mkdir embed-from &&
-	git mailsplit -oembed-from "$DATA/embed-from.in" &&
-	test_cmp "$DATA/embed-from.in" embed-from/0001 &&
-	git mailinfo embed-from/msg embed-from/patch \
-	  <embed-from/0001 >embed-from/out &&
-	test_cmp "$DATA/embed-from.expect" embed-from/out
-
-1
-ok 35 - mailinfo finds headers after embedded From line
-
-expecting success of 5100.36 'mailinfo on message with quoted >From': 
-	mkdir quoted-from &&
-	git mailsplit -oquoted-from "$DATA/quoted-from.in" &&
-	test_cmp "$DATA/quoted-from.in" quoted-from/0001 &&
-	git mailinfo quoted-from/msg quoted-from/patch \
-	  <quoted-from/0001 >quoted-from/out &&
-	test_cmp "$DATA/quoted-from.expect" quoted-from/msg
-
-1
-ok 36 - mailinfo on message with quoted >From
-
-expecting success of 5100.37 'mailinfo unescapes with --mboxrd': 
-	mkdir mboxrd &&
-	git mailsplit -omboxrd --mboxrd \
-		"$DATA/sample.mboxrd" >last &&
-	test x"$(cat last)" = x2 &&
-	for i in 0001 0002
-	do
-		git mailinfo mboxrd/msg mboxrd/patch \
-		  <mboxrd/$i >mboxrd/out &&
-		test_cmp "$DATA/${i}mboxrd" mboxrd/msg || return 1
-	done &&
-	sp=" " &&
-	echo "From " >expect &&
-	echo "From " >>expect &&
-	echo >> expect &&
-	cat >sp <<-INPUT_END &&
-	From mboxrd Mon Sep 17 00:00:00 2001
-	From: trailing spacer <sp@example.com>
-	Subject: [PATCH] a commit with trailing space
-
-	From$sp
-	>From$sp
-
-	INPUT_END
-
-	git mailsplit -f2 -omboxrd --mboxrd <sp >last &&
-	test x"$(cat last)" = x1 &&
-	git mailinfo mboxrd/msg mboxrd/patch <mboxrd/0003 &&
-	test_cmp expect mboxrd/msg
-
-Author: trailing spacer
-Email: sp@example.com
-Subject: a commit with trailing space
-
-ok 37 - mailinfo unescapes with --mboxrd
-
-expecting success of 5100.38 'mailinfo handles rfc2822 quoted-string': 
-	mkdir quoted-string &&
-	git mailinfo /dev/null /dev/null <"$DATA/quoted-string.in" \
-		>quoted-string/info &&
-	test_cmp "$DATA/quoted-string.expect" quoted-string/info
-
-ok 38 - mailinfo handles rfc2822 quoted-string
-
-expecting success of 5100.39 'mailinfo handles rfc2822 comment': 
-	mkdir comment &&
-	git mailinfo /dev/null /dev/null <"$DATA/comment.in" \
-		>comment/info &&
-	test_cmp "$DATA/comment.expect" comment/info
-
-ok 39 - mailinfo handles rfc2822 comment
-
-expecting success of 5100.40 'mailinfo with mailinfo.scissors config': 
-	test_config mailinfo.scissors true &&
-	(
-		mkdir sub &&
-		cd sub &&
-		git mailinfo ../msg0014.sc ../patch0014.sc <../0014 >../info0014.sc
-	) &&
-	test_cmp "$DATA/msg0014--scissors" msg0014.sc &&
-	test_cmp "$DATA/patch0014--scissors" patch0014.sc &&
-	test_cmp "$DATA/info0014--scissors" info0014.sc
-
-ok 40 - mailinfo with mailinfo.scissors config
-
-expecting success of 5100.41 'mailinfo no options': 
-	subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
-		git mailinfo /dev/null /dev/null)" &&
-	test z"$subj" = z"Subject: message"
-
-ok 41 - mailinfo no options
-
-expecting success of 5100.42 'mailinfo -k': 
-	subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
-		git mailinfo -k /dev/null /dev/null)" &&
-	test z"$subj" = z"Subject: [PATCH] [other] [PATCH] message"
-
-ok 42 - mailinfo -k
-
-expecting success of 5100.43 'mailinfo -b no [PATCH]': 
-	subj="$(echo "Subject: [other] message" |
-		git mailinfo -b /dev/null /dev/null)" &&
-	test z"$subj" = z"Subject: [other] message"
-
-ok 43 - mailinfo -b no [PATCH]
-
-expecting success of 5100.44 'mailinfo -b leading [PATCH]': 
-	subj="$(echo "Subject: [PATCH] [other] message" |
-		git mailinfo -b /dev/null /dev/null)" &&
-	test z"$subj" = z"Subject: [other] message"
-
-ok 44 - mailinfo -b leading [PATCH]
-
-expecting success of 5100.45 'mailinfo -b double [PATCH]': 
-	subj="$(echo "Subject: [PATCH] [PATCH] message" |
-		git mailinfo -b /dev/null /dev/null)" &&
-	test z"$subj" = z"Subject: message"
-
-ok 45 - mailinfo -b double [PATCH]
-
-expecting success of 5100.46 'mailinfo -b trailing [PATCH]': 
-	subj="$(echo "Subject: [other] [PATCH] message" |
-		git mailinfo -b /dev/null /dev/null)" &&
-	test z"$subj" = z"Subject: [other] message"
-
-ok 46 - mailinfo -b trailing [PATCH]
-
-expecting success of 5100.47 'mailinfo -b separated double [PATCH]': 
-	subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
-		git mailinfo -b /dev/null /dev/null)" &&
-	test z"$subj" = z"Subject: [other] message"
-
-ok 47 - mailinfo -b separated double [PATCH]
-
-expecting success of 5100.48 'mailinfo handles unusual header whitespace': 
-	git mailinfo /dev/null /dev/null >actual <<-\EOF &&
-	From:Real Name <user@example.com>
-	Subject:    extra spaces
-	EOF
-
-	cat >expect <<-\EOF &&
-	Author: Real Name
-	Email: user@example.com
-	Subject: extra spaces
-
-	EOF
-	test_cmp expect actual
-
-ok 48 - mailinfo handles unusual header whitespace
-
-expecting success of 5100.49 'split base64 email with quoted-cr': 
-	mkdir quoted-cr &&
-	git mailsplit -oquoted-cr "$DATA/quoted-cr.mbox" >quoted-cr/last &&
-	test $(cat quoted-cr/last) = 2
-
-ok 49 - split base64 email with quoted-cr
-
-expecting success of 5100.50 'mailinfo warn CR in base64 encoded email': 
-	sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
-		>quoted-cr/0001-expected.msg &&
-	sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
-		>quoted-cr/0002-expected.msg &&
-	sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
-		>quoted-cr/0001-expected.patch &&
-	sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
-		>quoted-cr/0002-expected.patch &&
-	check_quoted_cr_mail quoted-cr/0001 &&
-	test_must_be_empty quoted-cr/0001.err &&
-	check_quoted_cr_mail quoted-cr/0002 &&
-	grep "quoted CRLF detected" quoted-cr/0002.err &&
-	check_quoted_cr_mail quoted-cr/0001 --quoted-cr=nowarn &&
-	test_must_be_empty quoted-cr/0001.err &&
-	check_quoted_cr_mail quoted-cr/0002 --quoted-cr=nowarn &&
-	test_must_be_empty quoted-cr/0002.err &&
-	cp quoted-cr/0001-expected.msg quoted-cr/0002-expected.msg &&
-	cp quoted-cr/0001-expected.patch quoted-cr/0002-expected.patch &&
-	check_quoted_cr_mail quoted-cr/0001 --quoted-cr=strip &&
-	test_must_be_empty quoted-cr/0001.err &&
-	check_quoted_cr_mail quoted-cr/0002 --quoted-cr=strip &&
-	test_must_be_empty quoted-cr/0002.err
-
-warning: quoted CRLF detected
-ok 50 - mailinfo warn CR in base64 encoded email
-
-expecting success of 5100.51 'from line with unterminated quoted string': 
-	echo "From: bob \"unterminated string smith <bob@example.com>" >in &&
-	git mailinfo /dev/null /dev/null <in >actual &&
-	cat >expect <<-\EOF &&
-	Author: bob unterminated string smith
-	Email: bob@example.com
-
-	EOF
-	test_cmp expect actual
-
-ok 51 - from line with unterminated quoted string
-
-expecting success of 5100.52 'from line with unterminated comment': 
-	echo "From: bob (unterminated comment smith <bob@example.com>" >in &&
-	git mailinfo /dev/null /dev/null <in >actual &&
-	cat >expect <<-\EOF &&
-	Author: bob (unterminated comment smith
-	Email: bob@example.com
-
-	EOF
-	test_cmp expect actual
-
-ok 52 - from line with unterminated comment
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4300-merge-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4300-merge-tree/.git/
-expecting success of 4300.1 'setup': 
-	test_commit "initial" "initial-file" "initial"
-
-[master (root-commit) c1d16d8] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial-file
-ok 1 - setup
-
-expecting success of 4300.2 'file add A, !B': 
-	git reset --hard initial &&
-	test_commit "add-a-not-b" "ONE" "AAA" &&
-	git merge-tree initial initial add-a-not-b >actual &&
-	cat >expected <<EXPECTED &&
-added in remote
-  their  100644 $(git rev-parse HEAD:ONE) ONE
-@@ -0,0 +1 @@
-+AAA
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master e55b628] add-a-not-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 2 - file add A, !B
-
-expecting success of 4300.3 'file add !A, B': 
-	git reset --hard initial &&
-	test_commit "add-not-a-b" "ONE" "AAA" &&
-	git merge-tree initial add-not-a-b initial >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master fe72a09] add-not-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 3 - file add !A, B
-
-expecting success of 4300.4 'file add A, B (same)': 
-	git reset --hard initial &&
-	test_commit "add-a-b-same-A" "ONE" "AAA" &&
-	git reset --hard initial &&
-	test_commit "add-a-b-same-B" "ONE" "AAA" &&
-	git merge-tree initial add-a-b-same-A add-a-b-same-B >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master adad022] add-a-b-same-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-HEAD is now at c1d16d8 initial
-[master c566426] add-a-b-same-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 4 - file add A, B (same)
-
-expecting success of 4300.5 'file add A, B (different)': 
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
-	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
-	cat >expected <<EXPECTED &&
-added in both
-  our    100644 $(git rev-parse add-a-b-diff-A:ONE) ONE
-  their  100644 $(git rev-parse add-a-b-diff-B:ONE) ONE
-@@ -1 +1,5 @@
-+<<<<<<< .our
- AAA
-+=======
-+BBB
-+>>>>>>> .their
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 59aa417] add-a-b-diff-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-HEAD is now at c1d16d8 initial
-[master 06b549e] add-a-b-diff-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 5 - file add A, B (different)
-
-expecting success of 4300.6 'file change A, !B': 
-	git reset --hard initial &&
-	test_commit "change-a-not-b" "initial-file" "BBB" &&
-	git merge-tree initial change-a-not-b initial >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master 46329de] change-a-not-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - file change A, !B
-
-expecting success of 4300.7 'file change !A, B': 
-	git reset --hard initial &&
-	test_commit "change-not-a-b" "initial-file" "BBB" &&
-	git merge-tree initial initial change-not-a-b >actual &&
-	cat >expected <<EXPECTED &&
-merged
-  result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file
-  our    100644 $(git rev-parse initial:initial-file       ) initial-file
-@@ -1 +1 @@
--initial
-+BBB
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 4667cad] change-not-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - file change !A, B
-
-expecting success of 4300.8 '3-way merge with --attr-source': 
-	test_when_finished rm -rf 3-way &&
-	git init 3-way &&
-	(
-		cd 3-way &&
-		test_commit initial file1 foo &&
-		base=$(git rev-parse HEAD) &&
-		git checkout -b brancha &&
-		echo bar >>file1 &&
-		git commit -am "adding bar" &&
-		source=$(git rev-parse HEAD) &&
-		git checkout @{-1} &&
-		git checkout -b branchb &&
-		echo baz >>file1 &&
-		git commit -am "adding baz" &&
-		merge=$(git rev-parse HEAD) &&
-		git checkout -b gitattributes &&
-		test_commit "gitattributes" .gitattributes "file1 merge=union" &&
-		git checkout @{-1} &&
-		tree=$(git --attr-source=gitattributes merge-tree --write-tree \
-		--merge-base "$base" --end-of-options "$source" "$merge") &&
-		test_write_lines foo bar baz >expect &&
-		git cat-file -p "$tree:file1" >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4300-merge-tree/3-way/.git/
-[master (root-commit) fd74319] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'brancha'
-[brancha fe97420] adding bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-Switched to a new branch 'branchb'
-[branchb 0d361c1] adding baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'gitattributes'
-[gitattributes 7228331] gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-Switched to branch 'branchb'
-warning: refname 'gitattributes' is ambiguous.
-ok 8 - 3-way merge with --attr-source
-
-expecting success of 4300.9 'file change A, B (same)': 
-	git reset --hard initial &&
-	test_commit "change-a-b-same-A" "initial-file" "AAA" &&
-	git reset --hard initial &&
-	test_commit "change-a-b-same-B" "initial-file" "AAA" &&
-	git merge-tree initial change-a-b-same-A change-a-b-same-B >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master 17f6774] change-a-b-same-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at c1d16d8 initial
-[master c618aaa] change-a-b-same-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - file change A, B (same)
-
-expecting success of 4300.10 'file change A, B (different)': 
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
-	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
-	cat >expected <<EXPECTED &&
-changed in both
-  base   100644 $(git rev-parse initial:initial-file          ) initial-file
-  our    100644 $(git rev-parse change-a-b-diff-A:initial-file) initial-file
-  their  100644 $(git rev-parse change-a-b-diff-B:initial-file) initial-file
-@@ -1 +1,5 @@
-+<<<<<<< .our
- AAA
-+=======
-+BBB
-+>>>>>>> .their
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master f14ee41] change-a-b-diff-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at c1d16d8 initial
-[master 6faccc3] change-a-b-diff-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - file change A, B (different)
-
-expecting success of 4300.11 'file change A, B (mixed)': 
-	git reset --hard initial &&
-	test_commit "change-a-b-mix-base" "ONE" "
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA
-AAA" &&
-	test_commit "change-a-b-mix-A" "ONE" \
-		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/BBB/;}" <ONE)" &&
-	git reset --hard change-a-b-mix-base &&
-	test_commit "change-a-b-mix-B" "ONE" \
-		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)" &&
-	git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \
-		>actual &&
-
-	cat >expected <<EXPECTED &&
-changed in both
-  base   100644 $(git rev-parse change-a-b-mix-base:ONE) ONE
-  our    100644 $(git rev-parse change-a-b-mix-A:ONE   ) ONE
-  their  100644 $(git rev-parse change-a-b-mix-B:ONE   ) ONE
-@@ -7,7 +7,11 @@
- AAA
- AAA
- AAA
-+<<<<<<< .our
- BBB
-+=======
-+CCC
-+>>>>>>> .their
- AAA
- AAA
- AAA
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 8f24aa4] change-a-b-mix-base
- Author: A U Thor <author@example.com>
- 1 file changed, 16 insertions(+)
- create mode 100644 ONE
-[master 37be425] change-a-b-mix-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 8f24aa4 change-a-b-mix-base
-[master 9bb3ceb] change-a-b-mix-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - file change A, B (mixed)
-
-expecting success of 4300.12 'file remove A, !B': 
-	git reset --hard initial &&
-	test_commit "rm-a-not-b-base" "ONE" "AAA" &&
-	git rm ONE &&
-	git commit -m "rm-a-not-b" &&
-	git tag "rm-a-not-b" &&
-	git merge-tree rm-a-not-b-base rm-a-not-b rm-a-not-b-base >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master 6bc469c] rm-a-not-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master eaee347] rm-a-not-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 12 - file remove A, !B
-
-expecting success of 4300.13 'file remove !A, B': 
-	git reset --hard initial &&
-	test_commit "rm-not-a-b-base" "ONE" "AAA" &&
-	git rm ONE &&
-	git commit -m "rm-not-a-b" &&
-	git tag "rm-not-a-b" &&
-	git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&
-	cat >expected <<EXPECTED &&
-removed in remote
-  base   100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
-  our    100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
-@@ -1 +0,0 @@
--AAA
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 4c80bfe] rm-not-a-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master f5c368c] rm-not-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 13 - file remove !A, B
-
-expecting success of 4300.14 'file remove A, B (same)': 
-	git reset --hard initial &&
-	test_commit "rm-a-b-base" "ONE" "AAA" &&
-	git rm ONE &&
-	git commit -m "rm-a-b" &&
-	git tag "rm-a-b" &&
-	git merge-tree rm-a-b-base rm-a-b rm-a-b >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master ba896b0] rm-a-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master e5794d5] rm-a-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 14 - file remove A, B (same)
-
-expecting success of 4300.15 'file change A, remove B': 
-	git reset --hard initial &&
-	test_commit "change-a-rm-b-base" "ONE" "AAA" &&
-	test_commit "change-a-rm-b-A" "ONE" "BBB" &&
-	git reset --hard change-a-rm-b-base &&
-	git rm ONE &&
-	git commit -m "change-a-rm-b-B" &&
-	git tag "change-a-rm-b-B" &&
-	git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \
-		>actual &&
-	cat >expected <<EXPECTED &&
-removed in remote
-  base   100644 $(git rev-parse change-a-rm-b-base:ONE) ONE
-  our    100644 $(git rev-parse change-a-rm-b-A:ONE   ) ONE
-@@ -1 +0,0 @@
--BBB
-EXPECTED
-
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master 425fe11] change-a-rm-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-[master d7b5417] change-a-rm-b-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 425fe11 change-a-rm-b-base
-rm 'ONE'
-[master a35c11c] change-a-rm-b-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-ok 15 - file change A, remove B
-
-expecting success of 4300.16 'file remove A, change B': 
-	git reset --hard initial &&
-	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
-
-	git rm ONE &&
-	git commit -m "rm-a-change-b-A" &&
-	git tag "rm-a-change-b-A" &&
-	git reset --hard rm-a-change-b-base &&
-	test_commit "rm-a-change-b-B" "ONE" "BBB" &&
-	git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \
-		>actual &&
-	cat >expected <<EXPECTED &&
-removed in local
-  base   100644 $(git rev-parse rm-a-change-b-base:ONE) ONE
-  their  100644 $(git rev-parse rm-a-change-b-B:ONE   ) ONE
-EXPECTED
-	test_cmp expected actual
-
-HEAD is now at c1d16d8 initial
-[master e3f76d1] rm-a-change-b-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ONE
-rm 'ONE'
-[master 12305ab] rm-a-change-b-A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 ONE
-HEAD is now at e3f76d1 rm-a-change-b-base
-[master 30c5a34] rm-a-change-b-B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - file remove A, change B
-
-expecting success of 4300.17 'tree add A, B (same)': 
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "file" add-tree-A &&
-	git merge-tree initial add-tree-A add-tree-A >actual &&
-	test_must_be_empty actual
-
-HEAD is now at c1d16d8 initial
-[master f146135] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-ok 17 - tree add A, B (same)
-
-expecting success of 4300.18 'tree add A, B (different)': 
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
-	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
-	cat >expect <<-EOF &&
-	added in both
-	  our    100644 $(git rev-parse add-tree-a-b-A:sub/file) sub/file
-	  their  100644 $(git rev-parse add-tree-a-b-B:sub/file) sub/file
-	@@ -1 +1,5 @@
-	+<<<<<<< .our
-	 AAA
-	+=======
-	+BBB
-	+>>>>>>> .their
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master 278e538] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-HEAD is now at c1d16d8 initial
-[master b437163] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-ok 18 - tree add A, B (different)
-
-expecting success of 4300.19 'tree unchanged A, removed B': 
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "AAA" tree-remove-b-initial &&
-	git rm sub/file &&
-	test_tick &&
-	git commit -m "remove sub/file" &&
-	git tag tree-remove-b-B &&
-	git merge-tree tree-remove-b-initial tree-remove-b-initial tree-remove-b-B >actual &&
-	cat >expect <<-EOF &&
-	removed in remote
-	  base   100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
-	  our    100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
-	@@ -1 +0,0 @@
-	-AAA
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master 06f44d6] add sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/file
-rm 'sub/file'
-[master 7d2ab7e] remove sub/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 sub/file
-ok 19 - tree unchanged A, removed B
-
-expecting success of 4300.20 'turn file to tree': 
-	git reset --hard initial &&
-	rm initial-file &&
-	mkdir initial-file &&
-	test_commit "turn-file-to-tree" "initial-file/ONE" "CCC" &&
-	git merge-tree initial initial turn-file-to-tree >actual &&
-	cat >expect <<-EOF &&
-	added in remote
-	  their  100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE
-	@@ -0,0 +1 @@
-	+CCC
-	removed in remote
-	  base   100644 $(git rev-parse initial:initial-file) initial-file
-	  our    100644 $(git rev-parse initial:initial-file) initial-file
-	@@ -1 +0,0 @@
-	-initial
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master c7dbe97] turn-file-to-tree
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 initial-file
- create mode 100644 initial-file/ONE
-ok 20 - turn file to tree
-
-expecting success of 4300.21 'turn tree to file': 
-	git reset --hard initial &&
-	mkdir dir &&
-	test_commit "add-tree" "dir/path" "AAA" &&
-	test_commit "add-another-tree" "dir/another" "BBB" &&
-	rm -fr dir &&
-	test_commit "make-file" "dir" "CCC" &&
-	git merge-tree add-tree add-another-tree make-file >actual &&
-	cat >expect <<-EOF &&
-	removed in remote
-	  base   100644 $(git rev-parse add-tree:dir/path) dir/path
-	  our    100644 $(git rev-parse add-tree:dir/path) dir/path
-	@@ -1 +0,0 @@
-	-AAA
-	added in remote
-	  their  100644 $(git rev-parse make-file:dir) dir
-	@@ -0,0 +1 @@
-	+CCC
-	EOF
-	test_cmp expect actual
-
-HEAD is now at c1d16d8 initial
-[master fadeed0] add-tree
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/path
-[master 2076f67] add-another-tree
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/another
-[master 8ffb08d] make-file
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 dir
- delete mode 100644 dir/another
- delete mode 100644 dir/path
-ok 21 - turn tree to file
-
-expecting success of 4300.22 'merge-tree respects core.useReplaceRefs=false': 
-	test_commit merge-to &&
-	test_commit valid base &&
-	git reset --hard HEAD^ &&
-	test_commit malicious base &&
-
-	test_when_finished "git replace -d $(git rev-parse valid^0)" &&
-	git replace valid^0 malicious^0 &&
-
-	tree=$(git -c core.useReplaceRefs=true merge-tree --write-tree merge-to valid) &&
-	merged=$(git cat-file -p $tree:base) &&
-	test malicious = $merged &&
-
-	tree=$(git -c core.useReplaceRefs=false merge-tree --write-tree merge-to valid) &&
-	merged=$(git cat-file -p $tree:base) &&
-	test valid = $merged
-
-[master cc93885] merge-to
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge-to.t
-[master 99060ff] valid
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base
-HEAD is now at cc93885 merge-to
-[master 069f0c6] malicious
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base
-Deleted replace ref '99060ffb2d3618a898040626d81aa60f425c225a'
-ok 22 - merge-tree respects core.useReplaceRefs=false
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5200-update-server-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5200-update-server-info/.git/
-expecting success of 5200.1 'setup': test_commit file
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 1 - setup
-
-expecting success of 5200.2 'create info/refs': 
-	git update-server-info &&
-	test_path_is_file .git/info/refs
-
-ok 2 - create info/refs
-
-expecting success of 5200.3 'modify and store mtime': 
-	test-tool chmtime =0 .git/info/refs &&
-	test-tool chmtime --get .git/info/refs >a
-
-ok 3 - modify and store mtime
-
-expecting success of 5200.4 'info/refs is not needlessly overwritten': 
-	git update-server-info &&
-	test-tool chmtime --get .git/info/refs >b &&
-	test_cmp a b
-
-ok 4 - info/refs is not needlessly overwritten
-
-expecting success of 5200.5 'info/refs can be forced to update': 
-	git update-server-info -f &&
-	test-tool chmtime --get .git/info/refs >b &&
-	! test_cmp a b
-
---- a	2025-02-09 06:54:36.497919873 +0000
-+++ b	2025-02-09 06:54:36.517920000 +0000
-@@ -1 +1 @@
--0
-+1739084076
-ok 5 - info/refs can be forced to update
-
-expecting success of 5200.6 'info/refs updates when changes are made': 
-	test-tool chmtime =0 .git/info/refs &&
-	test-tool chmtime --get .git/info/refs >b &&
-	test_cmp a b &&
-	git update-ref refs/heads/foo HEAD &&
-	git update-server-info &&
-	test-tool chmtime --get .git/info/refs >b &&
-	! test_cmp a b
-
---- a	2025-02-09 06:54:36.497919873 +0000
-+++ b	2025-02-09 06:54:36.537920128 +0000
-@@ -1 +1 @@
--0
-+1739084076
-ok 6 - info/refs updates when changes are made
-
-expecting success of 5200.7 'midx does not create duplicate pack entries': 
-	git repack -d --write-midx &&
-	git repack -d &&
-	grep ^P .git/objects/info/packs >packs &&
-	uniq -d <packs >dups &&
-	test_must_be_empty dups
-
-Nothing new to pack.
-ok 7 - midx does not create duplicate pack entries
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5000-tar-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5000-tar-tree/.git/
-expecting success of 5000.1 'setup': 
-	test_oid_cache <<-EOF
-	obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
-	obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
-	EOF
-
-ok 1 - setup
-
-expecting success of 5000.2 '--list notices extra parameters': 
-	test_must_fail git archive --list blah &&
-	test_must_fail git archive --remote=. --list blah
-
-fatal: extra command line parameter 'blah'
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: extra command line parameter 'blah'        
-remote: git upload-archive: archiver died with error
-ok 2 - --list notices extra parameters
-
-expecting success of 5000.3 'end-of-options is correctly eaten': 
-	git archive --list --end-of-options &&
-	git archive --remote=. --list --end-of-options
-
-tar
-tgz
-tar.gz
-zip
-tar
-tgz
-tar.gz
-zip
-ok 3 - end-of-options is correctly eaten
-
-expecting success of 5000.4 'populate workdir': 
-	mkdir a &&
-	echo "a files_named_a" >.gitattributes &&
-	git add .gitattributes &&
-	echo simple textfile >a/a &&
-	ten=0123456789 &&
-	hundred="$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten" &&
-	echo long filename >"a/four$hundred" &&
-	mkdir a/bin &&
-	test-tool genrandom "frotz" 500000 >a/bin/sh &&
-	printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
-	printf "A not substituted O" >a/substfile2 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s a a/l1
-	else
-		printf %s a >a/l1
-	fi &&
-	(
-		p=long_path_to_a_file &&
-		cd a &&
-		for depth in 1 2 3 4 5
-		do
-			mkdir $p &&
-			cd $p || exit 1
-		done &&
-		echo text >file_with_long_path
-	) &&
-	(cd a && find .) | sort >a.lst
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 4 - populate workdir
-
-expecting success of 5000.5 'add ignored file': echo ignore me >a/ignored &&
-     mkdir .git/info &&
-     echo ignored export-ignore >.git/info/attributes
-ok 5 - add ignored file
-
-expecting success of 5000.6 'add files to repository': 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
-
-[master (root-commit) cc086e8] initial
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 a/a
- create mode 100644 a/bin/sh
- create mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
- create mode 100644 a/ignored
- create mode 120000 a/l1
- create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- create mode 100644 a/substfile1
- create mode 100644 a/substfile2
-ok 6 - add files to repository
-
-expecting success of 5000.7 'setup export-subst': 
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
-
-ok 7 - setup export-subst
-
-expecting success of 5000.8 'create bare clone': 
-	git clone --template= --bare . bare.git &&
-	mkdir bare.git/info &&
-	cp .git/info/attributes bare.git/info/attributes
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 8 - create bare clone
-
-expecting success of 5000.9 'remove ignored file': 
-	rm a/ignored
-
-ok 9 - remove ignored file
-
-expecting success of 5000.10 'git archive': 
-	git archive HEAD >b.tar
-
-ok 10 - git archive
-
-expecting success of 5000.11 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 11 -  extract tar archive
-
-checking prerequisite: TAR_NEEDS_PAX_FALLBACK
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
-	(
-		mkdir pax &&
-		cd pax &&
-		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
-		test -f PaxHeaders.1791/file
-	)
-
-)
-prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
-ok 12 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.13 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 13 -  validate filenames
-
-expecting success of 5000.14 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 14 -  validate file contents
-
-expecting success of 5000.15 ' validate mtime of a/a': 
-		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
-		echo $mtime >expect.mtime &&
-		test_cmp expect.mtime actual.mtime
-	
-ok 15 -  validate mtime of a/a
-
-expecting success of 5000.16 'git archive --mtime': 
-	git archive --mtime=2002-02-02T02:02:02-0200 HEAD >with_mtime.tar
-
-ok 16 - git archive --mtime
-
-expecting success of 5000.17 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 17 -  extract tar archive
-
-ok 18 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.19 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 19 -  validate filenames
-
-expecting success of 5000.20 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 20 -  validate file contents
-
-expecting success of 5000.21 ' validate mtime of a/a': 
-		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
-		echo $mtime >expect.mtime &&
-		test_cmp expect.mtime actual.mtime
-	
-ok 21 -  validate mtime of a/a
-
-expecting success of 5000.22 'git archive --prefix=prefix/': 
-	git archive --prefix=prefix/ HEAD >with_prefix.tar
-
-ok 22 - git archive --prefix=prefix/
-
-expecting success of 5000.23 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 23 -  extract tar archive
-
-ok 24 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.25 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 25 -  validate filenames
-
-expecting success of 5000.26 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 26 -  validate file contents
-
-expecting success of 5000.27 'git-archive --prefix=olde-': 
-	git archive --prefix=olde- HEAD >with_olde-prefix.tar
-
-ok 27 - git-archive --prefix=olde-
-
-expecting success of 5000.28 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 28 -  extract tar archive
-
-ok 29 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.30 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 30 -  validate filenames
-
-expecting success of 5000.31 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 31 -  validate file contents
-
-expecting success of 5000.32 'git archive --add-file': 
-	echo untracked >untracked &&
-	git archive --add-file=untracked HEAD >with_untracked.tar
-
-ok 32 - git archive --add-file
-
-expecting success of 5000.33 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 33 -  extract tar archive
-
-ok 34 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.35 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 35 -  validate filenames
-
-expecting success of 5000.36 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 36 -  validate file contents
-
-expecting success of 5000.37 ' validate extra file untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 37 -  validate extra file untracked
-
-expecting success of 5000.38 'git archive --add-file twice': 
-	echo untracked >untracked &&
-	git archive --prefix=one/ --add-file=untracked \
-		--prefix=two/ --add-file=untracked \
-		--prefix= HEAD >with_untracked2.tar
-
-ok 38 - git archive --add-file twice
-
-expecting success of 5000.39 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 39 -  extract tar archive
-
-ok 40 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.41 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 41 -  validate filenames
-
-expecting success of 5000.42 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 42 -  validate file contents
-
-expecting success of 5000.43 ' validate extra file one/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 43 -  validate extra file one/untracked
-
-expecting success of 5000.44 ' validate extra file two/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 44 -  validate extra file two/untracked
-
-expecting success of 5000.45 'git archive on large files': 
-	test_config core.bigfilethreshold 1 &&
-	git archive HEAD >b3.tar &&
-	test_cmp_bin b.tar b3.tar
-
-ok 45 - git archive on large files
-
-expecting success of 5000.46 'git archive in a bare repo': 
-	git --git-dir bare.git archive HEAD >b3.tar
-
-ok 46 - git archive in a bare repo
-
-expecting success of 5000.47 'git archive vs. the same in a bare repo': 
-	test_cmp_bin b.tar b3.tar
-
-ok 47 - git archive vs. the same in a bare repo
-
-expecting success of 5000.48 'git archive with --output': 
-	git archive --output=b4.tar HEAD &&
-	test_cmp_bin b.tar b4.tar
-
-ok 48 - git archive with --output
-
-expecting success of 5000.49 'git archive --remote': 
-	git archive --remote=. HEAD >b5.tar &&
-	test_cmp_bin b.tar b5.tar
-
-ok 49 - git archive --remote
-
-expecting success of 5000.50 'git archive --remote with configured remote': 
-	git config remote.foo.url . &&
-	(
-		cd a &&
-		git archive --remote=foo --output=../b5-nick.tar HEAD
-	) &&
-	test_cmp_bin b.tar b5-nick.tar
-
-ok 50 - git archive --remote with configured remote
-
-expecting success of 5000.51 'git get-tar-commit-id': 
-	git get-tar-commit-id <b.tar >actual &&
-	git rev-parse HEAD >expect &&
-	test_cmp expect actual
-
-ok 51 - git get-tar-commit-id
-
-expecting success of 5000.52 'git archive with --output, override inferred format': 
-	git archive --format=tar --output=d4.zip HEAD &&
-	test_cmp_bin b.tar d4.zip
-
-ok 52 - git archive with --output, override inferred format
-
-checking prerequisite: GZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
-)
-gzip 1.13
-Copyright (C) 2023 Free Software Foundation, Inc.
-Copyright (C) 1993 Jean-loup Gailly.
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-
-Written by Jean-loup Gailly.
-prerequisite GZIP ok
-expecting success of 5000.53 'git archive with --output and --remote creates .tgz': 
-	git archive --output=d5.tgz --remote=. HEAD &&
-	gzip -d -c <d5.tgz >d5.tar &&
-	test_cmp_bin b.tar d5.tar
-
-ok 53 - git archive with --output and --remote creates .tgz
-
-expecting success of 5000.54 'git archive --list outside of a git repo': 
-	nongit git archive --list
-
-tar
-tgz
-tar.gz
-zip
-ok 54 - git archive --list outside of a git repo
-
-expecting success of 5000.55 'git archive --remote outside of a git repo': 
-	git archive HEAD >expect.tar &&
-	nongit git archive --remote="$PWD" HEAD >actual.tar &&
-	test_cmp_bin expect.tar actual.tar
-
-ok 55 - git archive --remote outside of a git repo
-
-expecting success of 5000.56 'clients cannot access unreachable commits': 
-	test_commit unreachable &&
-	sha1=$(git rev-parse HEAD) &&
-	git reset --hard HEAD^ &&
-	git archive $sha1 >remote.tar &&
-	test_must_fail git archive --remote=. $sha1 >remote.tar
-
-[master 7227b65] unreachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unreachable.t
-HEAD is now at cc086e8 initial
-remote: fatal: no such ref: 7227b65e2133d76ecf028be4e1142e6868caf227        
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: git upload-archive: archiver died with error
-ok 56 - clients cannot access unreachable commits
-
-expecting success of 5000.57 'upload-archive can allow unreachable commits': 
-	test_commit unreachable1 &&
-	sha1=$(git rev-parse HEAD) &&
-	git reset --hard HEAD^ &&
-	git archive $sha1 >remote.tar &&
-	test_config uploadarchive.allowUnreachable true &&
-	git archive --remote=. $sha1 >remote.tar
-
-[master a9e9f2b] unreachable1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unreachable1.t
-HEAD is now at cc086e8 initial
-ok 57 - upload-archive can allow unreachable commits
-
-expecting success of 5000.58 'setup tar filters': 
-	git config tar.tar.foo.command "tr ab ba" &&
-	git config tar.bar.command "tr ab ba" &&
-	git config tar.bar.remote true &&
-	git config tar.invalid baz
-
-ok 58 - setup tar filters
-
-expecting success of 5000.59 'archive --list mentions user filter': 
-	git archive --list >output &&
-	grep "^tar\.foo\$" output &&
-	grep "^bar\$" output
-
-tar.foo
-bar
-ok 59 - archive --list mentions user filter
-
-expecting success of 5000.60 'archive --list shows only enabled remote filters': 
-	git archive --list --remote=. >output &&
-	! grep "^tar\.foo\$" output &&
-	grep "^bar\$" output
-
-bar
-ok 60 - archive --list shows only enabled remote filters
-
-expecting success of 5000.61 'invoke tar filter by format': 
-	git archive --format=tar.foo HEAD >config.tar.foo &&
-	tr ab ba <config.tar.foo >config.tar &&
-	test_cmp_bin b.tar config.tar &&
-	git archive --format=bar HEAD >config.bar &&
-	tr ab ba <config.bar >config.tar &&
-	test_cmp_bin b.tar config.tar
-
-ok 61 - invoke tar filter by format
-
-expecting success of 5000.62 'invoke tar filter by extension': 
-	git archive -o config-implicit.tar.foo HEAD &&
-	test_cmp_bin config.tar.foo config-implicit.tar.foo &&
-	git archive -o config-implicit.bar HEAD &&
-	test_cmp_bin config.tar.foo config-implicit.bar
-
-ok 62 - invoke tar filter by extension
-
-expecting success of 5000.63 'default output format remains tar': 
-	git archive -o config-implicit.baz HEAD &&
-	test_cmp_bin b.tar config-implicit.baz
-
-ok 63 - default output format remains tar
-
-expecting success of 5000.64 'extension matching requires dot': 
-	git archive -o config-implicittar.foo HEAD &&
-	test_cmp_bin b.tar config-implicittar.foo
-
-ok 64 - extension matching requires dot
-
-expecting success of 5000.65 'only enabled filters are available remotely': 
-	test_must_fail git archive --remote=. --format=tar.foo HEAD \
-		>remote.tar.foo &&
-	git archive --remote=. --format=bar >remote.bar HEAD &&
-	test_cmp_bin remote.bar config.bar
-
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: Unknown archive format 'tar.foo'        
-remote: git upload-archive: archiver died with error
-ok 65 - only enabled filters are available remotely
-
-expecting success of 5000.66 'invalid filter is reported only once': 
-	test_must_fail git -c tar.invalid.command= archive --format=invalid \
-		HEAD >out 2>err &&
-	test_must_be_empty out &&
-	test_line_count = 1 err
-
-ok 66 - invalid filter is reported only once
-
-expecting success of 5000.67 'git archive --format=tgz': 
-	git archive --format=tgz HEAD >j.tgz
-
-ok 67 - git archive --format=tgz
-
-expecting success of 5000.68 'git archive --format=tar.gz': 
-	git archive --format=tar.gz HEAD >j1.tar.gz &&
-	test_cmp_bin j.tgz j1.tar.gz
-
-ok 68 - git archive --format=tar.gz
-
-expecting success of 5000.69 'infer tgz from .tgz filename': 
-	git archive --output=j2.tgz HEAD &&
-	test_cmp_bin j.tgz j2.tgz
-
-ok 69 - infer tgz from .tgz filename
-
-expecting success of 5000.70 'infer tgz from .tar.gz filename': 
-	git archive --output=j3.tar.gz HEAD &&
-	test_cmp_bin j.tgz j3.tar.gz
-
-ok 70 - infer tgz from .tar.gz filename
-
-expecting success of 5000.71 'extract tgz file': 
-	gzip -d -c <j.tgz >j.tar &&
-	test_cmp_bin b.tar j.tar
-
-ok 71 - extract tgz file
-
-expecting success of 5000.72 'remote tar.gz is allowed by default': 
-	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
-	test_cmp_bin j.tgz remote.tar.gz
-
-ok 72 - remote tar.gz is allowed by default
-
-expecting success of 5000.73 'remote tar.gz can be disabled': 
-	git config tar.tar.gz.remote false &&
-	test_must_fail git archive --remote=. --format=tar.gz HEAD \
-		>remote.tar.gz
-
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: Unknown archive format 'tar.gz'        
-remote: git upload-archive: archiver died with error
-ok 73 - remote tar.gz can be disabled
-
-expecting success of 5000.74 'git archive --format=tgz (external gzip)': 
-	test_config tar.tgz.command "gzip -cn" &&
-	git archive --format=tgz HEAD >external_gzip.tgz
-
-ok 74 - git archive --format=tgz (external gzip)
-
-expecting success of 5000.75 'git archive --format=tar.gz (external gzip)': 
-	test_config tar.tar.gz.command "gzip -cn" &&
-	git archive --format=tar.gz HEAD >external_gzip.tar.gz &&
-	test_cmp_bin external_gzip.tgz external_gzip.tar.gz
-
-ok 75 - git archive --format=tar.gz (external gzip)
-
-expecting success of 5000.76 'extract tgz file (external gzip)': 
-	gzip -d -c <external_gzip.tgz >external_gzip.tar &&
-	test_cmp_bin b.tar external_gzip.tar
-
-ok 76 - extract tgz file (external gzip)
-
-expecting success of 5000.77 'archive and :(glob)': 
-	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
-	cat >expect <<-\EOF &&
-	a/
-	a/bin/
-	a/bin/sh
-	EOF
-	test_cmp expect actual
-
-ok 77 - archive and :(glob)
-
-expecting success of 5000.78 'catch non-matching pathspec': 
-	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
-
-fatal: pathspec '*.abc' did not match any files
-ok 78 - catch non-matching pathspec
-
-expecting success of 5000.79 'reject paths outside the current directory': 
-	test_must_fail git -C a/bin archive HEAD .. >/dev/null 2>err &&
-	grep "outside the current directory" err
-
-fatal: pathspec '..' matches files outside the current directory
-ok 79 - reject paths outside the current directory
-
-expecting success of 5000.80 'allow pathspecs that resolve to the current directory': 
-	git -C a/bin archive -v HEAD ../bin >/dev/null 2>actual &&
-	cat >expect <<-\EOF &&
-	sh
-	EOF
-	test_cmp expect actual
-
-ok 80 - allow pathspecs that resolve to the current directory
-
-expecting success of 5000.81 'attr pathspec in bare repo': 
-	test_expect_code 0 git --git-dir=bare.git archive -v HEAD \
-		":(attr:files_named_a)" >/dev/null 2>actual &&
-	cat >expect <<-\EOF &&
-	a/
-	a/a
-	EOF
-	test_cmp expect actual
-
-ok 81 - attr pathspec in bare repo
-
-checking prerequisite: LONG_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-	test 8 -le "$(build_option sizeof-long)"
-
-)
-prerequisite LONG_IS_64BIT ok
-expecting success of 5000.82 'set up repository with huge blob': 
-	obj=$(test_oid obj) &&
-	path=$(test_oid_to_path $obj) &&
-	mkdir -p .git/objects/$(dirname $path) &&
-	cp "$TEST_DIRECTORY"/t5000/huge-object .git/objects/$path &&
-	rm -f .git/index &&
-	git update-index --add --cacheinfo 100644,$obj,huge &&
-	git commit -m huge
-
-[master 82a0aa8] huge
- Author: A U Thor <author@example.com>
- 10 files changed, 8 deletions(-)
- delete mode 100644 .gitattributes
- delete mode 100644 a/a
- delete mode 100644 a/bin/sh
- delete mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
- delete mode 100644 a/ignored
- delete mode 120000 a/l1
- delete mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- delete mode 100644 a/substfile1
- delete mode 100644 a/substfile2
- create mode 100644 huge
-ok 82 - set up repository with huge blob
-
-expecting success of 5000.83 'generate tar with huge size': 
-	{
-		git archive HEAD
-		echo $? >exit-code
-	} | test_copy_bytes 4096 >huge.tar &&
-	echo 141 >expect &&
-	test_cmp expect exit-code
-
-ok 83 - generate tar with huge size
-
-checking prerequisite: TAR_HUGE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
-	echo "68719476737 4147" >expect &&
-	tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
-	test_cmp expect actual
-
-)
-tar: rmtlseek not stopped at a record boundary
-tar: Error is not recoverable: exiting now
-prerequisite TAR_HUGE ok
-expecting success of 5000.84 'system tar can read our huge size': 
-	echo 68719476737 >expect &&
-	tar_info huge.tar | cut -d" " -f1 >actual &&
-	test_cmp expect actual
-
-tar: rmtlseek not stopped at a record boundary
-tar: Error is not recoverable: exiting now
-ok 84 - system tar can read our huge size
-
-checking prerequisite: TIME_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
-)
-prerequisite TIME_IS_64BIT ok
-expecting success of 5000.85 'set up repository with far-future (2^34 - 1) commit': 
-	rm -f .git/index &&
-	echo foo >file &&
-	git add file &&
-	GIT_COMMITTER_DATE="@17179869183 +0000" \
-		git commit -m "tempori parendum"
-
-[master 8127a15] tempori parendum
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 file
- delete mode 100644 huge
-ok 85 - set up repository with far-future (2^34 - 1) commit
-
-expecting success of 5000.86 'generate tar with far-future mtime': 
-	git archive HEAD >future.tar
-
-ok 86 - generate tar with far-future mtime
-
-checking prerequisite: TIME_T_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
-)
-prerequisite TIME_T_IS_64BIT ok
-expecting success of 5000.87 'system tar can read our future mtime': 
-	echo 2514 >expect &&
-	tar_info future.tar | cut -d" " -f2 >actual &&
-	test_cmp expect actual
-
-ok 87 - system tar can read our future mtime
-
-expecting success of 5000.88 'set up repository with far-far-future (2^36 + 1) commit': 
-	rm -f .git/index &&
-	echo content >file &&
-	git add file &&
-	GIT_TEST_COMMIT_GRAPH=0 GIT_COMMITTER_DATE="@68719476737 +0000" \
-		git commit -m "tempori parendum"
-
-[master c6bd888] tempori parendum
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 88 - set up repository with far-far-future (2^36 + 1) commit
-
-expecting success of 5000.89 'generate tar with far-far-future mtime': 
-	git archive HEAD >future.tar
-
-ok 89 - generate tar with far-far-future mtime
-
-expecting success of 5000.90 'system tar can read our future mtime': 
-	echo 4147 >expect &&
-	tar_info future.tar | cut -d" " -f2 >actual &&
-	test_cmp expect actual
-
-ok 90 - system tar can read our future mtime
-
-# passed all 90 test(s)
-1..90
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5301-sliding-window.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4150-am.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4150-am/.git/
 expecting success of 4150.1 'setup: messages': 
@@ -292776,8 +289187,8 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
---- at	2025-02-09 06:54:35.493913485 +0000
-+++ ct	2025-02-09 06:54:35.493913485 +0000
+--- at	2026-03-14 13:31:26.378677808 +0000
++++ ct	2026-03-14 13:31:26.394677808 +0000
 @@ -1 +1 @@
 -1112912053 -0700
 +1112912293 -0700
@@ -292806,7 +289217,7 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
-1739084075 +0000
+1773495086 +0000
 ok 62 - am --ignore-date
 
 expecting success of 4150.63 'am into an unborn branch': 
@@ -292827,7 +289238,7 @@
 	) &&
 	test_cmp expected actual
 
-HEAD is now at 6be1dcc second
+HEAD is now at daa29f5 second
 subdir/1
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4150-am/subdir/.git/
 applying to an empty history
@@ -292843,16 +289254,16 @@
 	git am <patchnl >output.out 2>&1 &&
 	test_grep "^Applying: second \\\n foo$" output.out
 
-HEAD is now at 6be1dcc second
+HEAD is now at daa29f5 second
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  6be1dcc second
+  daa29f5 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> 6be1dcc
+ git branch <new-branch-name> daa29f5
 
 HEAD is now at 6b2d93f first
 Applying: second \n foo
@@ -293510,147 +289921,825 @@
 	grep -f actual expected &&
 	grep "Creating an empty commit: empty commit" output
 
-empty commit
+empty commit
+
+Creating an empty commit: empty commit
+ok 82 - record as an empty commit when meeting e-mail message that lacks a patch
+
+expecting success of 4150.83 'skip an empty patch in the middle of an am session': 
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >out 2>err &&
+	grep "Patch is empty." out &&
+	grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git am --skip &&
+	test_path_is_missing .git/rebase-apply &&
+	git rev-parse empty-commit^ >expected &&
+	git rev-parse HEAD >actual &&
+	test_cmp expected actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e2351fc empty 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> e2351fc
+
+HEAD is now at 756adf8 renamed a file and added another
+Patch is empty.
+hint: To record the empty patch as an empty commit, run "git am --allow-empty".
+ok 83 - skip an empty patch in the middle of an am session
+
+expecting success of 4150.84 'record an empty patch as an empty commit in the middle of an am session': 
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >out 2>err &&
+	grep "Patch is empty." out &&
+	grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git am --allow-empty >output &&
+	grep "No changes - recorded it as an empty commit." output &&
+	test_path_is_missing .git/rebase-apply &&
+	git show empty-commit --format="%B" >expected &&
+	git show HEAD --format="%B" >actual &&
+	grep -f actual expected
+
+HEAD is now at 756adf8 renamed a file and added another
+Patch is empty.
+hint: To record the empty patch as an empty commit, run "git am --allow-empty".
+No changes - recorded it as an empty commit.
+empty commit
+
+ok 84 - record an empty patch as an empty commit in the middle of an am session
+
+expecting success of 4150.85 'create an non-empty commit when the index IS changed though "--allow-empty" is given': 
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >err &&
+	: >empty-file &&
+	git add empty-file &&
+	git am --allow-empty &&
+	git show empty-commit --format="%B" >expected &&
+	git show HEAD --format="%B" >actual &&
+	grep -f actual expected &&
+	git diff HEAD^..HEAD --name-only
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e2351fc empty 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> e2351fc
+
+HEAD is now at 756adf8 renamed a file and added another
+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 record the empty patch as an empty commit, run "git am --allow-empty".
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: empty commit
+empty commit
+
+empty-file
+ok 85 - create an non-empty commit when the index IS changed though "--allow-empty" is given
+
+expecting success of 4150.86 'cannot create empty commits when there is a clean index due to merge conflicts': 
+	test_when_finished "git am --abort || :" &&
+	git rev-parse HEAD >expected &&
+	test_must_fail git am seq.patch &&
+	test_must_fail git am --allow-empty >err &&
+	! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git rev-parse HEAD >actual &&
+	test_cmp actual expected
+
+error: file: does not exist in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: two
+Patch failed at 0001 two
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 86 - cannot create empty commits when there is a clean index due to merge conflicts
+
+expecting success of 4150.87 'cannot create empty commits when there is unmerged index due to merge conflicts': 
+	test_when_finished "git am --abort || :" &&
+	git rev-parse HEAD >expected &&
+	test_must_fail git am -3 seq.patch &&
+	test_must_fail git am --allow-empty >err &&
+	! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git rev-parse HEAD >actual &&
+	test_cmp actual expected
+
+Applying: two
+Using index info to reconstruct a base tree...
+A	file
+Falling back to patching base and 3-way merge...
+Merging:
+aa78eea empty commit
+virtual two
+found 1 common ancestor:
+virtual 693a3de402bb23897ed5c931273e53c78eff0495
+CONFLICT (modify/delete): file deleted in HEAD and modified in two. Version two of file left in tree.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 two
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+ok 87 - cannot create empty commits when there is unmerged index due to merge conflicts
+
+# passed all 87 test(s)
+1..87
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4300-merge-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4300-merge-tree/.git/
+expecting success of 4300.1 'setup': 
+	test_commit "initial" "initial-file" "initial"
+
+[master (root-commit) c1d16d8] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial-file
+ok 1 - setup
+
+expecting success of 4300.2 'file add A, !B': 
+	git reset --hard initial &&
+	test_commit "add-a-not-b" "ONE" "AAA" &&
+	git merge-tree initial initial add-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
+added in remote
+  their  100644 $(git rev-parse HEAD:ONE) ONE
+@@ -0,0 +1 @@
++AAA
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master e55b628] add-a-not-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 2 - file add A, !B
+
+expecting success of 4300.3 'file add !A, B': 
+	git reset --hard initial &&
+	test_commit "add-not-a-b" "ONE" "AAA" &&
+	git merge-tree initial add-not-a-b initial >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master fe72a09] add-not-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 3 - file add !A, B
+
+expecting success of 4300.4 'file add A, B (same)': 
+	git reset --hard initial &&
+	test_commit "add-a-b-same-A" "ONE" "AAA" &&
+	git reset --hard initial &&
+	test_commit "add-a-b-same-B" "ONE" "AAA" &&
+	git merge-tree initial add-a-b-same-A add-a-b-same-B >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master adad022] add-a-b-same-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+HEAD is now at c1d16d8 initial
+[master c566426] add-a-b-same-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 4 - file add A, B (same)
+
+expecting success of 4300.5 'file add A, B (different)': 
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
+	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
+added in both
+  our    100644 $(git rev-parse add-a-b-diff-A:ONE) ONE
+  their  100644 $(git rev-parse add-a-b-diff-B:ONE) ONE
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 59aa417] add-a-b-diff-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+HEAD is now at c1d16d8 initial
+[master 06b549e] add-a-b-diff-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 5 - file add A, B (different)
+
+expecting success of 4300.6 'file change A, !B': 
+	git reset --hard initial &&
+	test_commit "change-a-not-b" "initial-file" "BBB" &&
+	git merge-tree initial change-a-not-b initial >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master 46329de] change-a-not-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - file change A, !B
+
+expecting success of 4300.7 'file change !A, B': 
+	git reset --hard initial &&
+	test_commit "change-not-a-b" "initial-file" "BBB" &&
+	git merge-tree initial initial change-not-a-b >actual &&
+	cat >expected <<EXPECTED &&
+merged
+  result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file
+  our    100644 $(git rev-parse initial:initial-file       ) initial-file
+@@ -1 +1 @@
+-initial
++BBB
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 4667cad] change-not-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - file change !A, B
+
+expecting success of 4300.8 '3-way merge with --attr-source': 
+	test_when_finished rm -rf 3-way &&
+	git init 3-way &&
+	(
+		cd 3-way &&
+		test_commit initial file1 foo &&
+		base=$(git rev-parse HEAD) &&
+		git checkout -b brancha &&
+		echo bar >>file1 &&
+		git commit -am "adding bar" &&
+		source=$(git rev-parse HEAD) &&
+		git checkout @{-1} &&
+		git checkout -b branchb &&
+		echo baz >>file1 &&
+		git commit -am "adding baz" &&
+		merge=$(git rev-parse HEAD) &&
+		git checkout -b gitattributes &&
+		test_commit "gitattributes" .gitattributes "file1 merge=union" &&
+		git checkout @{-1} &&
+		tree=$(git --attr-source=gitattributes merge-tree --write-tree \
+		--merge-base "$base" --end-of-options "$source" "$merge") &&
+		test_write_lines foo bar baz >expect &&
+		git cat-file -p "$tree:file1" >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4300-merge-tree/3-way/.git/
+[master (root-commit) fd74319] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'brancha'
+[brancha fe97420] adding bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'master'
+Switched to a new branch 'branchb'
+[branchb 0d361c1] adding baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'gitattributes'
+[gitattributes 7228331] gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+Switched to branch 'branchb'
+warning: refname 'gitattributes' is ambiguous.
+ok 8 - 3-way merge with --attr-source
+
+expecting success of 4300.9 'file change A, B (same)': 
+	git reset --hard initial &&
+	test_commit "change-a-b-same-A" "initial-file" "AAA" &&
+	git reset --hard initial &&
+	test_commit "change-a-b-same-B" "initial-file" "AAA" &&
+	git merge-tree initial change-a-b-same-A change-a-b-same-B >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master 17f6774] change-a-b-same-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at c1d16d8 initial
+[master c618aaa] change-a-b-same-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - file change A, B (same)
+
+expecting success of 4300.10 'file change A, B (different)': 
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
+	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
+changed in both
+  base   100644 $(git rev-parse initial:initial-file          ) initial-file
+  our    100644 $(git rev-parse change-a-b-diff-A:initial-file) initial-file
+  their  100644 $(git rev-parse change-a-b-diff-B:initial-file) initial-file
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master f14ee41] change-a-b-diff-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at c1d16d8 initial
+[master 6faccc3] change-a-b-diff-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - file change A, B (different)
+
+expecting success of 4300.11 'file change A, B (mixed)': 
+	git reset --hard initial &&
+	test_commit "change-a-b-mix-base" "ONE" "
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA
+AAA" &&
+	test_commit "change-a-b-mix-A" "ONE" \
+		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/BBB/;}" <ONE)" &&
+	git reset --hard change-a-b-mix-base &&
+	test_commit "change-a-b-mix-B" "ONE" \
+		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)" &&
+	git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \
+		>actual &&
+
+	cat >expected <<EXPECTED &&
+changed in both
+  base   100644 $(git rev-parse change-a-b-mix-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-b-mix-A:ONE   ) ONE
+  their  100644 $(git rev-parse change-a-b-mix-B:ONE   ) ONE
+@@ -7,7 +7,11 @@
+ AAA
+ AAA
+ AAA
++<<<<<<< .our
+ BBB
++=======
++CCC
++>>>>>>> .their
+ AAA
+ AAA
+ AAA
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 8f24aa4] change-a-b-mix-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 16 insertions(+)
+ create mode 100644 ONE
+[master 37be425] change-a-b-mix-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 8f24aa4 change-a-b-mix-base
+[master 9bb3ceb] change-a-b-mix-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - file change A, B (mixed)
+
+expecting success of 4300.12 'file remove A, !B': 
+	git reset --hard initial &&
+	test_commit "rm-a-not-b-base" "ONE" "AAA" &&
+	git rm ONE &&
+	git commit -m "rm-a-not-b" &&
+	git tag "rm-a-not-b" &&
+	git merge-tree rm-a-not-b-base rm-a-not-b rm-a-not-b-base >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master 6bc469c] rm-a-not-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master eaee347] rm-a-not-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 12 - file remove A, !B
+
+expecting success of 4300.13 'file remove !A, B': 
+	git reset --hard initial &&
+	test_commit "rm-not-a-b-base" "ONE" "AAA" &&
+	git rm ONE &&
+	git commit -m "rm-not-a-b" &&
+	git tag "rm-not-a-b" &&
+	git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+  our    100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+@@ -1 +0,0 @@
+-AAA
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 4c80bfe] rm-not-a-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master f5c368c] rm-not-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 13 - file remove !A, B
+
+expecting success of 4300.14 'file remove A, B (same)': 
+	git reset --hard initial &&
+	test_commit "rm-a-b-base" "ONE" "AAA" &&
+	git rm ONE &&
+	git commit -m "rm-a-b" &&
+	git tag "rm-a-b" &&
+	git merge-tree rm-a-b-base rm-a-b rm-a-b >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master ba896b0] rm-a-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master e5794d5] rm-a-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 14 - file remove A, B (same)
+
+expecting success of 4300.15 'file change A, remove B': 
+	git reset --hard initial &&
+	test_commit "change-a-rm-b-base" "ONE" "AAA" &&
+	test_commit "change-a-rm-b-A" "ONE" "BBB" &&
+	git reset --hard change-a-rm-b-base &&
+	git rm ONE &&
+	git commit -m "change-a-rm-b-B" &&
+	git tag "change-a-rm-b-B" &&
+	git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \
+		>actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse change-a-rm-b-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-rm-b-A:ONE   ) ONE
+@@ -1 +0,0 @@
+-BBB
+EXPECTED
+
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master 425fe11] change-a-rm-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+[master d7b5417] change-a-rm-b-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 425fe11 change-a-rm-b-base
+rm 'ONE'
+[master a35c11c] change-a-rm-b-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+ok 15 - file change A, remove B
+
+expecting success of 4300.16 'file remove A, change B': 
+	git reset --hard initial &&
+	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
+
+	git rm ONE &&
+	git commit -m "rm-a-change-b-A" &&
+	git tag "rm-a-change-b-A" &&
+	git reset --hard rm-a-change-b-base &&
+	test_commit "rm-a-change-b-B" "ONE" "BBB" &&
+	git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \
+		>actual &&
+	cat >expected <<EXPECTED &&
+removed in local
+  base   100644 $(git rev-parse rm-a-change-b-base:ONE) ONE
+  their  100644 $(git rev-parse rm-a-change-b-B:ONE   ) ONE
+EXPECTED
+	test_cmp expected actual
+
+HEAD is now at c1d16d8 initial
+[master e3f76d1] rm-a-change-b-base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+rm 'ONE'
+[master 12305ab] rm-a-change-b-A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 ONE
+HEAD is now at e3f76d1 rm-a-change-b-base
+[master 30c5a34] rm-a-change-b-B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - file remove A, change B
+
+expecting success of 4300.17 'tree add A, B (same)': 
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "file" add-tree-A &&
+	git merge-tree initial add-tree-A add-tree-A >actual &&
+	test_must_be_empty actual
+
+HEAD is now at c1d16d8 initial
+[master f146135] add sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/file
+ok 17 - tree add A, B (same)
+
+expecting success of 4300.18 'tree add A, B (different)': 
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
+	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
+	cat >expect <<-EOF &&
+	added in both
+	  our    100644 $(git rev-parse add-tree-a-b-A:sub/file) sub/file
+	  their  100644 $(git rev-parse add-tree-a-b-B:sub/file) sub/file
+	@@ -1 +1,5 @@
+	+<<<<<<< .our
+	 AAA
+	+=======
+	+BBB
+	+>>>>>>> .their
+	EOF
+	test_cmp expect actual
+
+HEAD is now at c1d16d8 initial
+[master 278e538] add sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/file
+HEAD is now at c1d16d8 initial
+[master b437163] add sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/file
+ok 18 - tree add A, B (different)
+
+expecting success of 4300.19 'tree unchanged A, removed B': 
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "AAA" tree-remove-b-initial &&
+	git rm sub/file &&
+	test_tick &&
+	git commit -m "remove sub/file" &&
+	git tag tree-remove-b-B &&
+	git merge-tree tree-remove-b-initial tree-remove-b-initial tree-remove-b-B >actual &&
+	cat >expect <<-EOF &&
+	removed in remote
+	  base   100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	  our    100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	@@ -1 +0,0 @@
+	-AAA
+	EOF
+	test_cmp expect actual
+
+HEAD is now at c1d16d8 initial
+[master 06f44d6] add sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/file
+rm 'sub/file'
+[master 7d2ab7e] remove sub/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 sub/file
+ok 19 - tree unchanged A, removed B
 
-Creating an empty commit: empty commit
-ok 82 - record as an empty commit when meeting e-mail message that lacks a patch
+expecting success of 4300.20 'turn file to tree': 
+	git reset --hard initial &&
+	rm initial-file &&
+	mkdir initial-file &&
+	test_commit "turn-file-to-tree" "initial-file/ONE" "CCC" &&
+	git merge-tree initial initial turn-file-to-tree >actual &&
+	cat >expect <<-EOF &&
+	added in remote
+	  their  100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE
+	@@ -0,0 +1 @@
+	+CCC
+	removed in remote
+	  base   100644 $(git rev-parse initial:initial-file) initial-file
+	  our    100644 $(git rev-parse initial:initial-file) initial-file
+	@@ -1 +0,0 @@
+	-initial
+	EOF
+	test_cmp expect actual
 
-expecting success of 4150.83 'skip an empty patch in the middle of an am session': 
-	git checkout empty-commit^ &&
-	test_must_fail git am empty-commit.patch >out 2>err &&
-	grep "Patch is empty." out &&
-	grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
-	git am --skip &&
-	test_path_is_missing .git/rebase-apply &&
-	git rev-parse empty-commit^ >expected &&
-	git rev-parse HEAD >actual &&
-	test_cmp expected actual
+HEAD is now at c1d16d8 initial
+[master c7dbe97] turn-file-to-tree
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 initial-file
+ create mode 100644 initial-file/ONE
+ok 20 - turn file to tree
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 4300.21 'turn tree to file': 
+	git reset --hard initial &&
+	mkdir dir &&
+	test_commit "add-tree" "dir/path" "AAA" &&
+	test_commit "add-another-tree" "dir/another" "BBB" &&
+	rm -fr dir &&
+	test_commit "make-file" "dir" "CCC" &&
+	git merge-tree add-tree add-another-tree make-file >actual &&
+	cat >expect <<-EOF &&
+	removed in remote
+	  base   100644 $(git rev-parse add-tree:dir/path) dir/path
+	  our    100644 $(git rev-parse add-tree:dir/path) dir/path
+	@@ -1 +0,0 @@
+	-AAA
+	added in remote
+	  their  100644 $(git rev-parse make-file:dir) dir
+	@@ -0,0 +1 @@
+	+CCC
+	EOF
+	test_cmp expect actual
 
-  e2351fc empty commit
+HEAD is now at c1d16d8 initial
+[master fadeed0] add-tree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/path
+[master 2076f67] add-another-tree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/another
+[master 8ffb08d] make-file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 dir
+ delete mode 100644 dir/another
+ delete mode 100644 dir/path
+ok 21 - turn tree to file
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 4300.22 'merge-tree respects core.useReplaceRefs=false': 
+	test_commit merge-to &&
+	test_commit valid base &&
+	git reset --hard HEAD^ &&
+	test_commit malicious base &&
 
- git branch <new-branch-name> e2351fc
+	test_when_finished "git replace -d $(git rev-parse valid^0)" &&
+	git replace valid^0 malicious^0 &&
 
-HEAD is now at 756adf8 renamed a file and added another
-Patch is empty.
-hint: To record the empty patch as an empty commit, run "git am --allow-empty".
-ok 83 - skip an empty patch in the middle of an am session
+	tree=$(git -c core.useReplaceRefs=true merge-tree --write-tree merge-to valid) &&
+	merged=$(git cat-file -p $tree:base) &&
+	test malicious = $merged &&
 
-expecting success of 4150.84 'record an empty patch as an empty commit in the middle of an am session': 
-	git checkout empty-commit^ &&
-	test_must_fail git am empty-commit.patch >out 2>err &&
-	grep "Patch is empty." out &&
-	grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
-	git am --allow-empty >output &&
-	grep "No changes - recorded it as an empty commit." output &&
-	test_path_is_missing .git/rebase-apply &&
-	git show empty-commit --format="%B" >expected &&
-	git show HEAD --format="%B" >actual &&
-	grep -f actual expected
+	tree=$(git -c core.useReplaceRefs=false merge-tree --write-tree merge-to valid) &&
+	merged=$(git cat-file -p $tree:base) &&
+	test valid = $merged
 
-HEAD is now at 756adf8 renamed a file and added another
-Patch is empty.
-hint: To record the empty patch as an empty commit, run "git am --allow-empty".
-No changes - recorded it as an empty commit.
-empty commit
+[master cc93885] merge-to
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge-to.t
+[master 99060ff] valid
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+HEAD is now at cc93885 merge-to
+[master 069f0c6] malicious
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+Deleted replace ref '99060ffb2d3618a898040626d81aa60f425c225a'
+ok 22 - merge-tree respects core.useReplaceRefs=false
 
-ok 84 - record an empty patch as an empty commit in the middle of an am session
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5200-update-server-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5200-update-server-info/.git/
+expecting success of 5200.1 'setup': test_commit file
+[master (root-commit) 4c1911f] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 1 - setup
 
-expecting success of 4150.85 'create an non-empty commit when the index IS changed though "--allow-empty" is given': 
-	git checkout empty-commit^ &&
-	test_must_fail git am empty-commit.patch >err &&
-	: >empty-file &&
-	git add empty-file &&
-	git am --allow-empty &&
-	git show empty-commit --format="%B" >expected &&
-	git show HEAD --format="%B" >actual &&
-	grep -f actual expected &&
-	git diff HEAD^..HEAD --name-only
+expecting success of 5200.2 'create info/refs': 
+	git update-server-info &&
+	test_path_is_file .git/info/refs
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+ok 2 - create info/refs
 
-  e2351fc empty commit
+expecting success of 5200.3 'modify and store mtime': 
+	test-tool chmtime =0 .git/info/refs &&
+	test-tool chmtime --get .git/info/refs >a
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+ok 3 - modify and store mtime
 
- git branch <new-branch-name> e2351fc
+expecting success of 5200.4 'info/refs is not needlessly overwritten': 
+	git update-server-info &&
+	test-tool chmtime --get .git/info/refs >b &&
+	test_cmp a b
 
-HEAD is now at 756adf8 renamed a file and added another
-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 record the empty patch as an empty commit, run "git am --allow-empty".
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: empty commit
-empty commit
+ok 4 - info/refs is not needlessly overwritten
 
-empty-file
-ok 85 - create an non-empty commit when the index IS changed though "--allow-empty" is given
+expecting success of 5200.5 'info/refs can be forced to update': 
+	git update-server-info -f &&
+	test-tool chmtime --get .git/info/refs >b &&
+	! test_cmp a b
 
-expecting success of 4150.86 'cannot create empty commits when there is a clean index due to merge conflicts': 
-	test_when_finished "git am --abort || :" &&
-	git rev-parse HEAD >expected &&
-	test_must_fail git am seq.patch &&
-	test_must_fail git am --allow-empty >err &&
-	! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
-	git rev-parse HEAD >actual &&
-	test_cmp actual expected
+--- a	2026-03-14 13:31:35.870677808 +0000
++++ b	2026-03-14 13:31:35.966677808 +0000
+@@ -1 +1 @@
+-0
++1773495095
+ok 5 - info/refs can be forced to update
 
-error: file: does not exist in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: two
-Patch failed at 0001 two
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 86 - cannot create empty commits when there is a clean index due to merge conflicts
+expecting success of 5200.6 'info/refs updates when changes are made': 
+	test-tool chmtime =0 .git/info/refs &&
+	test-tool chmtime --get .git/info/refs >b &&
+	test_cmp a b &&
+	git update-ref refs/heads/foo HEAD &&
+	git update-server-info &&
+	test-tool chmtime --get .git/info/refs >b &&
+	! test_cmp a b
 
-expecting success of 4150.87 'cannot create empty commits when there is unmerged index due to merge conflicts': 
-	test_when_finished "git am --abort || :" &&
-	git rev-parse HEAD >expected &&
-	test_must_fail git am -3 seq.patch &&
-	test_must_fail git am --allow-empty >err &&
-	! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
-	git rev-parse HEAD >actual &&
-	test_cmp actual expected
+--- a	2026-03-14 13:31:35.870677808 +0000
++++ b	2026-03-14 13:31:36.106677808 +0000
+@@ -1 +1 @@
+-0
++1773495096
+ok 6 - info/refs updates when changes are made
 
-Applying: two
-Using index info to reconstruct a base tree...
-A	file
-Falling back to patching base and 3-way merge...
-Merging:
-aa78eea empty commit
-virtual two
-found 1 common ancestor:
-virtual 693a3de402bb23897ed5c931273e53c78eff0495
-CONFLICT (modify/delete): file deleted in HEAD and modified in two. Version two of file left in tree.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 two
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-ok 87 - cannot create empty commits when there is unmerged index due to merge conflicts
+expecting success of 5200.7 'midx does not create duplicate pack entries': 
+	git repack -d --write-midx &&
+	git repack -d &&
+	grep ^P .git/objects/info/packs >packs &&
+	uniq -d <packs >dups &&
+	test_must_be_empty dups
 
-# passed all 87 test(s)
-1..87
+Nothing new to pack.
+ok 7 - midx does not create duplicate pack entries
+
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4215-log-skewed-merges.sh ***
@@ -294762,243 +291851,2070 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5305-include-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/.git/
-expecting success of 5305.1 'setup': 
-	echo c >d &&
-	git update-index --add d &&
-	tree=$(git write-tree) &&
-	commit=$(git commit-tree $tree </dev/null) &&
-	echo "object $commit" >sig &&
-	echo "type commit" >>sig &&
-	echo "tag mytag" >>sig &&
-	echo "tagger $(git var GIT_COMMITTER_IDENT)" >>sig &&
-	echo >>sig &&
-	echo "our test tag" >>sig &&
-	tag=$(git mktag <sig) &&
-	rm d sig &&
-	git update-ref refs/tags/mytag $tag && {
-		echo $tree &&
-		echo $commit &&
-		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
-	} >obj-list
+*** t5000-tar-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 5305.2 'pack without --include-tag': 
-	packname=$(git pack-objects \
-		--window=0 \
-		test-no-include <obj-list)
+expecting success of 5000.2 '--list notices extra parameters': 
+	test_must_fail git archive --list blah &&
+	test_must_fail git archive --remote=. --list blah
 
-ok 2 - pack without --include-tag
+fatal: extra command line parameter 'blah'
+remote: fatal: extra command line parameter 'blah'        
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: git upload-archive: archiver died with error
+ok 2 - --list notices extra parameters
 
-expecting success of 5305.3 'unpack objects': 
-	rm -rf clone.git &&
-	git init clone.git &&
-	git -C clone.git unpack-objects <test-no-include-${packname}.pack
+expecting success of 5000.3 'end-of-options is correctly eaten': 
+	git archive --list --end-of-options &&
+	git archive --remote=. --list --end-of-options
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
-ok 3 - unpack objects
+tar
+tgz
+tar.gz
+zip
+tar
+tgz
+tar.gz
+zip
+ok 3 - end-of-options is correctly eaten
 
-expecting success of 5305.4 'check unpacked result (have commit, no tag)': 
-	git rev-list --objects $commit >list.expect &&
-	test_must_fail git -C clone.git cat-file -e $tag &&
-	git -C clone.git rev-list --objects $commit >list.actual &&
-	test_cmp list.expect list.actual
+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
 
-ok 4 - check unpacked result (have commit, no tag)
+checking prerequisite: SYMLINKS
 
-expecting success of 5305.5 'pack with --include-tag': 
-	packname=$(git pack-objects \
-		--window=0 \
-		--include-tag \
-		test-include <obj-list)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-ok 5 - pack with --include-tag
+)
+prerequisite SYMLINKS ok
+ok 4 - populate workdir
 
-expecting success of 5305.6 'unpack objects': 
-	rm -rf clone.git &&
-	git init clone.git &&
-	git -C clone.git unpack-objects <test-include-${packname}.pack
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
-ok 6 - unpack objects
+expecting success of 5000.6 'add files to repository': 
+	git add a &&
+	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
 
-expecting success of 5305.7 'check unpacked result (have commit, have tag)': 
-	git rev-list --objects mytag >list.expect &&
-	git -C clone.git rev-list --objects $tag >list.actual &&
-	test_cmp list.expect list.actual
+[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
 
-ok 7 - check unpacked result (have commit, have tag)
+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
 
-expecting success of 5305.8 'create hidden inner tag': 
-	test_commit commit &&
-	git tag -m inner inner HEAD &&
-	git tag -m outer outer inner &&
-	git tag -d inner
+ok 7 - setup export-subst
 
-[main (root-commit) b6b0ff3] commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 commit.t
- create mode 100644 d
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f outer inner^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-Deleted tag 'inner' (was 4a3d125)
-ok 8 - create hidden inner tag
+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
 
-expecting success of 5305.9 'pack explicit outer tag': 
-	packname=$(
-		{
-			echo HEAD &&
-			echo outer
-		} |
-		git pack-objects --revs test-hidden-explicit
-	)
+Cloning into bare repository 'bare.git'...
+done.
+ok 8 - create bare clone
 
-ok 9 - pack explicit outer tag
+expecting success of 5000.9 'remove ignored file': 
+	rm a/ignored
 
-expecting success of 5305.10 'unpack objects': 
-	rm -rf clone.git &&
-	git init clone.git &&
-	git -C clone.git unpack-objects <test-hidden-explicit-${packname}.pack
+ok 9 - remove ignored file
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
-ok 10 - unpack objects
+expecting success of 5000.10 'git archive': 
+	git archive HEAD >b.tar
 
-expecting success of 5305.11 'check unpacked result (have all objects)': 
-	git -C clone.git rev-list --objects $(git rev-parse outer HEAD)
+ok 10 - git archive
 
-b6b0ff3317698915de9c0bec0caab17e3884f5cc
-f29dea06355cfae615126151f86d323b8249923c outer
-4a3d125fea2ae6987f86d32a1f9598b386f2edcc inner
-c5b8485de618df1bc5b007d1a28eeb3e4c4deae8 
-01f9a2aac3e315c5caa00db4019f1d934171dba0 commit.t
-f2ad6c76f0115a6ba5b00456a849810e7ec0af20 d
-ok 11 - check unpacked result (have all objects)
+expecting success of 5000.11 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 11 -  extract tar archive
 
-expecting success of 5305.12 'pack implied outer tag': 
-	packname=$(
-		echo HEAD |
-		git pack-objects --revs --include-tag test-hidden-implied
+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
 	)
 
-ok 12 - pack implied outer tag
+)
+prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
+ok 12 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
 
-expecting success of 5305.13 'unpack objects': 
-	rm -rf clone.git &&
-	git init clone.git &&
-	git -C clone.git unpack-objects <test-hidden-implied-${packname}.pack
+expecting success of 5000.13 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 13 -  validate filenames
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
-ok 13 - unpack objects
+expecting success of 5000.14 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 14 -  validate file contents
 
-expecting success of 5305.14 'check unpacked result (have all objects)': 
-	git -C clone.git rev-list --objects $(git rev-parse outer HEAD)
+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
 
-b6b0ff3317698915de9c0bec0caab17e3884f5cc
-f29dea06355cfae615126151f86d323b8249923c outer
-4a3d125fea2ae6987f86d32a1f9598b386f2edcc inner
-c5b8485de618df1bc5b007d1a28eeb3e4c4deae8 
-01f9a2aac3e315c5caa00db4019f1d934171dba0 commit.t
-f2ad6c76f0115a6ba5b00456a849810e7ec0af20 d
-ok 14 - check unpacked result (have all objects)
+expecting success of 5000.16 'git archive --mtime': 
+	git archive --mtime=2002-02-02T02:02:02-0200 HEAD >with_mtime.tar
 
-expecting success of 5305.15 'single-branch clone can transfer tag': 
-	rm -rf clone.git &&
-	git clone --no-local --single-branch -b main . clone.git &&
-	git -C clone.git fsck
+ok 16 - git archive --mtime
 
-Cloning into 'clone.git'...
-ok 15 - single-branch clone can transfer tag
+expecting success of 5000.17 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 17 -  extract tar archive
 
-# passed all 15 test(s)
-1..15
+ok 18 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.19 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 19 -  validate filenames
+
+expecting success of 5000.20 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 20 -  validate file contents
+
+expecting success of 5000.21 ' validate mtime of a/a': 
+		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
+		echo $mtime >expect.mtime &&
+		test_cmp expect.mtime actual.mtime
+	
+ok 21 -  validate mtime of a/a
+
+expecting success of 5000.22 'git archive --prefix=prefix/': 
+	git archive --prefix=prefix/ HEAD >with_prefix.tar
+
+ok 22 - git archive --prefix=prefix/
+
+expecting success of 5000.23 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 23 -  extract tar archive
+
+ok 24 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.25 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 25 -  validate filenames
+
+expecting success of 5000.26 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 26 -  validate file contents
+
+expecting success of 5000.27 'git-archive --prefix=olde-': 
+	git archive --prefix=olde- HEAD >with_olde-prefix.tar
+
+ok 27 - git-archive --prefix=olde-
+
+expecting success of 5000.28 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 28 -  extract tar archive
+
+ok 29 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.30 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 30 -  validate filenames
+
+expecting success of 5000.31 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 31 -  validate file contents
+
+expecting success of 5000.32 'git archive --add-file': 
+	echo untracked >untracked &&
+	git archive --add-file=untracked HEAD >with_untracked.tar
+
+ok 32 - git archive --add-file
+
+expecting success of 5000.33 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 33 -  extract tar archive
+
+ok 34 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.35 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 35 -  validate filenames
+
+expecting success of 5000.36 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 36 -  validate file contents
+
+expecting success of 5000.37 ' validate extra file untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 37 -  validate extra file untracked
+
+expecting success of 5000.38 'git archive --add-file twice': 
+	echo untracked >untracked &&
+	git archive --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.tar
+
+ok 38 - git archive --add-file twice
+
+expecting success of 5000.39 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 39 -  extract tar archive
+
+ok 40 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.41 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 41 -  validate filenames
+
+expecting success of 5000.42 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 42 -  validate file contents
+
+expecting success of 5000.43 ' validate extra file one/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 43 -  validate extra file one/untracked
+
+expecting success of 5000.44 ' validate extra file two/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 44 -  validate extra file two/untracked
+
+expecting success of 5000.45 'git archive on large files': 
+	test_config core.bigfilethreshold 1 &&
+	git archive HEAD >b3.tar &&
+	test_cmp_bin b.tar b3.tar
+
+ok 45 - git archive on large files
+
+expecting success of 5000.46 'git archive in a bare repo': 
+	git --git-dir bare.git archive HEAD >b3.tar
+
+ok 46 - git archive in a bare repo
+
+expecting success of 5000.47 'git archive vs. the same in a bare repo': 
+	test_cmp_bin b.tar b3.tar
+
+ok 47 - git archive vs. the same in a bare repo
+
+expecting success of 5000.48 'git archive with --output': 
+	git archive --output=b4.tar HEAD &&
+	test_cmp_bin b.tar b4.tar
+
+ok 48 - git archive with --output
+
+expecting success of 5000.49 'git archive --remote': 
+	git archive --remote=. HEAD >b5.tar &&
+	test_cmp_bin b.tar b5.tar
+
+ok 49 - git archive --remote
+
+expecting success of 5000.50 'git archive --remote with configured remote': 
+	git config remote.foo.url . &&
+	(
+		cd a &&
+		git archive --remote=foo --output=../b5-nick.tar HEAD
+	) &&
+	test_cmp_bin b.tar b5-nick.tar
+
+ok 50 - git archive --remote with configured remote
+
+expecting success of 5000.51 'git get-tar-commit-id': 
+	git get-tar-commit-id <b.tar >actual &&
+	git rev-parse HEAD >expect &&
+	test_cmp expect actual
+
+ok 51 - git get-tar-commit-id
+
+expecting success of 5000.52 'git archive with --output, override inferred format': 
+	git archive --format=tar --output=d4.zip HEAD &&
+	test_cmp_bin b.tar d4.zip
+
+ok 52 - git archive with --output, override inferred format
+
+checking prerequisite: GZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
+)
+gzip 1.13
+Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 1993 Jean-loup Gailly.
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
+
+Written by Jean-loup Gailly.
+prerequisite GZIP ok
+expecting success of 5000.53 'git archive with --output and --remote creates .tgz': 
+	git archive --output=d5.tgz --remote=. HEAD &&
+	gzip -d -c <d5.tgz >d5.tar &&
+	test_cmp_bin b.tar d5.tar
+
+ok 53 - git archive with --output and --remote creates .tgz
+
+expecting success of 5000.54 'git archive --list outside of a git repo': 
+	nongit git archive --list
+
+tar
+tgz
+tar.gz
+zip
+ok 54 - git archive --list outside of a git repo
+
+expecting success of 5000.55 'git archive --remote outside of a git repo': 
+	git archive HEAD >expect.tar &&
+	nongit git archive --remote="$PWD" HEAD >actual.tar &&
+	test_cmp_bin expect.tar actual.tar
+
+ok 55 - git archive --remote outside of a git repo
+
+expecting success of 5000.56 'clients cannot access unreachable commits': 
+	test_commit unreachable &&
+	sha1=$(git rev-parse HEAD) &&
+	git reset --hard HEAD^ &&
+	git archive $sha1 >remote.tar &&
+	test_must_fail git archive --remote=. $sha1 >remote.tar
+
+[master 7227b65] unreachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unreachable.t
+HEAD is now at cc086e8 initial
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: no such ref: 7227b65e2133d76ecf028be4e1142e6868caf227        
+remote: git upload-archive: archiver died with error
+ok 56 - clients cannot access unreachable commits
+
+expecting success of 5000.57 'upload-archive can allow unreachable commits': 
+	test_commit unreachable1 &&
+	sha1=$(git rev-parse HEAD) &&
+	git reset --hard HEAD^ &&
+	git archive $sha1 >remote.tar &&
+	test_config uploadarchive.allowUnreachable true &&
+	git archive --remote=. $sha1 >remote.tar
+
+[master a9e9f2b] unreachable1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unreachable1.t
+HEAD is now at cc086e8 initial
+ok 57 - upload-archive can allow unreachable commits
+
+expecting success of 5000.58 'setup tar filters': 
+	git config tar.tar.foo.command "tr ab ba" &&
+	git config tar.bar.command "tr ab ba" &&
+	git config tar.bar.remote true &&
+	git config tar.invalid baz
+
+ok 58 - setup tar filters
+
+expecting success of 5000.59 'archive --list mentions user filter': 
+	git archive --list >output &&
+	grep "^tar\.foo\$" output &&
+	grep "^bar\$" output
+
+tar.foo
+bar
+ok 59 - archive --list mentions user filter
+
+expecting success of 5000.60 'archive --list shows only enabled remote filters': 
+	git archive --list --remote=. >output &&
+	! grep "^tar\.foo\$" output &&
+	grep "^bar\$" output
+
+bar
+ok 60 - archive --list shows only enabled remote filters
+
+expecting success of 5000.61 'invoke tar filter by format': 
+	git archive --format=tar.foo HEAD >config.tar.foo &&
+	tr ab ba <config.tar.foo >config.tar &&
+	test_cmp_bin b.tar config.tar &&
+	git archive --format=bar HEAD >config.bar &&
+	tr ab ba <config.bar >config.tar &&
+	test_cmp_bin b.tar config.tar
+
+ok 61 - invoke tar filter by format
+
+expecting success of 5000.62 'invoke tar filter by extension': 
+	git archive -o config-implicit.tar.foo HEAD &&
+	test_cmp_bin config.tar.foo config-implicit.tar.foo &&
+	git archive -o config-implicit.bar HEAD &&
+	test_cmp_bin config.tar.foo config-implicit.bar
+
+ok 62 - invoke tar filter by extension
+
+expecting success of 5000.63 'default output format remains tar': 
+	git archive -o config-implicit.baz HEAD &&
+	test_cmp_bin b.tar config-implicit.baz
+
+ok 63 - default output format remains tar
+
+expecting success of 5000.64 'extension matching requires dot': 
+	git archive -o config-implicittar.foo HEAD &&
+	test_cmp_bin b.tar config-implicittar.foo
+
+ok 64 - extension matching requires dot
+
+expecting success of 5000.65 'only enabled filters are available remotely': 
+	test_must_fail git archive --remote=. --format=tar.foo HEAD \
+		>remote.tar.foo &&
+	git archive --remote=. --format=bar >remote.bar HEAD &&
+	test_cmp_bin remote.bar config.bar
+
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: Unknown archive format 'tar.foo'        
+remote: git upload-archive: archiver died with error
+ok 65 - only enabled filters are available remotely
+
+expecting success of 5000.66 'invalid filter is reported only once': 
+	test_must_fail git -c tar.invalid.command= archive --format=invalid \
+		HEAD >out 2>err &&
+	test_must_be_empty out &&
+	test_line_count = 1 err
+
+ok 66 - invalid filter is reported only once
+
+expecting success of 5000.67 'git archive --format=tgz': 
+	git archive --format=tgz HEAD >j.tgz
+
+ok 67 - git archive --format=tgz
+
+expecting success of 5000.68 'git archive --format=tar.gz': 
+	git archive --format=tar.gz HEAD >j1.tar.gz &&
+	test_cmp_bin j.tgz j1.tar.gz
+
+ok 68 - git archive --format=tar.gz
+
+expecting success of 5000.69 'infer tgz from .tgz filename': 
+	git archive --output=j2.tgz HEAD &&
+	test_cmp_bin j.tgz j2.tgz
+
+ok 69 - infer tgz from .tgz filename
+
+expecting success of 5000.70 'infer tgz from .tar.gz filename': 
+	git archive --output=j3.tar.gz HEAD &&
+	test_cmp_bin j.tgz j3.tar.gz
+
+ok 70 - infer tgz from .tar.gz filename
+
+expecting success of 5000.71 'extract tgz file': 
+	gzip -d -c <j.tgz >j.tar &&
+	test_cmp_bin b.tar j.tar
+
+ok 71 - extract tgz file
+
+expecting success of 5000.72 'remote tar.gz is allowed by default': 
+	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
+	test_cmp_bin j.tgz remote.tar.gz
+
+ok 72 - remote tar.gz is allowed by default
+
+expecting success of 5000.73 'remote tar.gz can be disabled': 
+	git config tar.tar.gz.remote false &&
+	test_must_fail git archive --remote=. --format=tar.gz HEAD \
+		>remote.tar.gz
+
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: Unknown archive format 'tar.gz'        
+remote: git upload-archive: archiver died with error
+ok 73 - remote tar.gz can be disabled
+
+expecting success of 5000.74 'git archive --format=tgz (external gzip)': 
+	test_config tar.tgz.command "gzip -cn" &&
+	git archive --format=tgz HEAD >external_gzip.tgz
+
+ok 74 - git archive --format=tgz (external gzip)
+
+expecting success of 5000.75 'git archive --format=tar.gz (external gzip)': 
+	test_config tar.tar.gz.command "gzip -cn" &&
+	git archive --format=tar.gz HEAD >external_gzip.tar.gz &&
+	test_cmp_bin external_gzip.tgz external_gzip.tar.gz
+
+ok 75 - git archive --format=tar.gz (external gzip)
+
+expecting success of 5000.76 'extract tgz file (external gzip)': 
+	gzip -d -c <external_gzip.tgz >external_gzip.tar &&
+	test_cmp_bin b.tar external_gzip.tar
+
+ok 76 - extract tgz file (external gzip)
+
+expecting success of 5000.77 'archive and :(glob)': 
+	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
+	cat >expect <<-\EOF &&
+	a/
+	a/bin/
+	a/bin/sh
+	EOF
+	test_cmp expect actual
+
+ok 77 - archive and :(glob)
+
+expecting success of 5000.78 'catch non-matching pathspec': 
+	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
+
+fatal: pathspec '*.abc' did not match any files
+ok 78 - catch non-matching pathspec
+
+expecting success of 5000.79 'reject paths outside the current directory': 
+	test_must_fail git -C a/bin archive HEAD .. >/dev/null 2>err &&
+	grep "outside the current directory" err
+
+fatal: pathspec '..' matches files outside the current directory
+ok 79 - reject paths outside the current directory
+
+expecting success of 5000.80 'allow pathspecs that resolve to the current directory': 
+	git -C a/bin archive -v HEAD ../bin >/dev/null 2>actual &&
+	cat >expect <<-\EOF &&
+	sh
+	EOF
+	test_cmp expect actual
+
+ok 80 - allow pathspecs that resolve to the current directory
+
+expecting success of 5000.81 'attr pathspec in bare repo': 
+	test_expect_code 0 git --git-dir=bare.git archive -v HEAD \
+		":(attr:files_named_a)" >/dev/null 2>actual &&
+	cat >expect <<-\EOF &&
+	a/
+	a/a
+	EOF
+	test_cmp expect actual
+
+ok 81 - attr pathspec in bare repo
+
+checking prerequisite: LONG_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+	test 8 -le "$(build_option sizeof-long)"
+
+)
+prerequisite LONG_IS_64BIT ok
+expecting success of 5000.82 'set up repository with huge blob': 
+	obj=$(test_oid obj) &&
+	path=$(test_oid_to_path $obj) &&
+	mkdir -p .git/objects/$(dirname $path) &&
+	cp "$TEST_DIRECTORY"/t5000/huge-object .git/objects/$path &&
+	rm -f .git/index &&
+	git update-index --add --cacheinfo 100644,$obj,huge &&
+	git commit -m huge
+
+[master 82a0aa8] huge
+ Author: A U Thor <author@example.com>
+ 10 files changed, 8 deletions(-)
+ delete mode 100644 .gitattributes
+ delete mode 100644 a/a
+ delete mode 100644 a/bin/sh
+ delete mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+ delete mode 100644 a/ignored
+ delete mode 120000 a/l1
+ delete mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
+ delete mode 100644 a/substfile1
+ delete mode 100644 a/substfile2
+ create mode 100644 huge
+ok 82 - set up repository with huge blob
+
+expecting success of 5000.83 'generate tar with huge size': 
+	{
+		git archive HEAD
+		echo $? >exit-code
+	} | test_copy_bytes 4096 >huge.tar &&
+	echo 141 >expect &&
+	test_cmp expect exit-code
+
+ok 83 - generate tar with huge size
+
+checking prerequisite: TAR_HUGE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
+	echo "68719476737 4147" >expect &&
+	tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
+	test_cmp expect actual
+
+)
+tar: rmtlseek not stopped at a record boundary
+tar: Error is not recoverable: exiting now
+prerequisite TAR_HUGE ok
+expecting success of 5000.84 'system tar can read our huge size': 
+	echo 68719476737 >expect &&
+	tar_info huge.tar | cut -d" " -f1 >actual &&
+	test_cmp expect actual
+
+tar: rmtlseek not stopped at a record boundary
+tar: Error is not recoverable: exiting now
+ok 84 - system tar can read our huge size
+
+checking prerequisite: TIME_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
+)
+prerequisite TIME_IS_64BIT ok
+expecting success of 5000.85 'set up repository with far-future (2^34 - 1) commit': 
+	rm -f .git/index &&
+	echo foo >file &&
+	git add file &&
+	GIT_COMMITTER_DATE="@17179869183 +0000" \
+		git commit -m "tempori parendum"
+
+[master 8127a15] tempori parendum
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 file
+ delete mode 100644 huge
+ok 85 - set up repository with far-future (2^34 - 1) commit
+
+expecting success of 5000.86 'generate tar with far-future mtime': 
+	git archive HEAD >future.tar
+
+ok 86 - generate tar with far-future mtime
+
+checking prerequisite: TIME_T_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
+)
+prerequisite TIME_T_IS_64BIT ok
+expecting success of 5000.87 'system tar can read our future mtime': 
+	echo 2514 >expect &&
+	tar_info future.tar | cut -d" " -f2 >actual &&
+	test_cmp expect actual
+
+ok 87 - system tar can read our future mtime
+
+expecting success of 5000.88 'set up repository with far-far-future (2^36 + 1) commit': 
+	rm -f .git/index &&
+	echo content >file &&
+	git add file &&
+	GIT_TEST_COMMIT_GRAPH=0 GIT_COMMITTER_DATE="@68719476737 +0000" \
+		git commit -m "tempori parendum"
+
+[master c6bd888] tempori parendum
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 88 - set up repository with far-far-future (2^36 + 1) commit
+
+expecting success of 5000.89 'generate tar with far-far-future mtime': 
+	git archive HEAD >future.tar
+
+ok 89 - generate tar with far-far-future mtime
+
+expecting success of 5000.90 'system tar can read our future mtime': 
+	echo 4147 >expect &&
+	tar_info future.tar | cut -d" " -f2 >actual &&
+	test_cmp expect actual
+
+ok 90 - system tar can read our future mtime
+
+# passed all 90 test(s)
+1..90
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5306-pack-nobase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)) &&
+*** t5301-sliding-window.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
 
-	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
 
-ok 1 - setup base
+expecting success of 5301.2 'verify-pack -v, defaults': 
+	git verify-pack -v "$pack1"
 
-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 &&
+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
 
-	git --git-dir=../.git cat-file commit $B |
-	git hash-object -t commit -w --stdin &&
+expecting success of 5301.3 'verify-pack -v, packedGitWindowSize == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git verify-pack -v "$pack1"
 
-	git --git-dir=../.git cat-file tree "$B^{tree}" |
-	git hash-object -t tree -w --stdin
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5100-mailinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5100-mailinfo/.git/
+expecting success of 5100.1 'split sample box': git mailsplit -o. "$DATA/sample.mbox" >last &&
+	last=$(cat last) &&
+	echo total is $last &&
+	test $(cat last) = 18
+total is 18
+ok 1 - split sample box
+
+expecting success of 5100.2 'mailinfo 0001': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 2 - mailinfo 0001
+
+expecting success of 5100.3 'mailinfo 0002': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 3 - mailinfo 0002
+
+expecting success of 5100.4 'mailinfo 0003': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 4 - mailinfo 0003
+
+expecting success of 5100.5 'mailinfo 0004': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 5 - mailinfo 0004
+
+expecting success of 5100.6 'mailinfo 0005': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 6 - mailinfo 0005
+
+expecting success of 5100.7 'mailinfo 0006': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 7 - mailinfo 0006
+
+expecting success of 5100.8 'mailinfo 0007': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 8 - mailinfo 0007
+
+expecting success of 5100.9 'mailinfo 0008': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 9 - mailinfo 0008
+
+expecting success of 5100.10 'mailinfo 0009': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 10 - mailinfo 0009
+
+expecting success of 5100.11 'mailinfo 0010': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 11 - mailinfo 0010
+
+expecting success of 5100.12 'mailinfo 0011': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 12 - mailinfo 0011
+
+expecting success of 5100.13 'mailinfo 0012': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 13 - mailinfo 0012
+
+expecting success of 5100.14 'mailinfo 0013': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 14 - mailinfo 0013
+
+expecting success of 5100.15 'mailinfo 0014': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 15 - mailinfo 0014
+
+expecting success of 5100.16 'mailinfo 0015': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 16 - mailinfo 0015
+
+expecting success of 5100.17 'mailinfo 0016': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 17 - mailinfo 0016
+
+expecting success of 5100.18 'mailinfo 0017': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 18 - mailinfo 0017
+
+expecting success of 5100.19 'mailinfo 0018': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 19 - mailinfo 0018
+
+expecting success of 5100.20 'split box with rfc2047 samples': mkdir rfc2047 &&
+	git mailsplit -orfc2047 "$DATA/rfc2047-samples.mbox" \
+	  >rfc2047/last &&
+	last=$(cat rfc2047/last) &&
+	echo total is $last &&
+	test $(cat rfc2047/last) = 11
+total is 11
+ok 20 - split box with rfc2047 samples
+
+expecting success of 5100.21 'mailinfo rfc2047/0001': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 21 - mailinfo rfc2047/0001
+
+expecting success of 5100.22 'mailinfo rfc2047/0002': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 22 - mailinfo rfc2047/0002
+
+expecting success of 5100.23 'mailinfo rfc2047/0003': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 23 - mailinfo rfc2047/0003
+
+expecting success of 5100.24 'mailinfo rfc2047/0004': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 24 - mailinfo rfc2047/0004
+
+expecting success of 5100.25 'mailinfo rfc2047/0005': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 25 - mailinfo rfc2047/0005
+
+expecting success of 5100.26 'mailinfo rfc2047/0006': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 26 - mailinfo rfc2047/0006
+
+expecting success of 5100.27 'mailinfo rfc2047/0007': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 27 - mailinfo rfc2047/0007
+
+expecting success of 5100.28 'mailinfo rfc2047/0008': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 28 - mailinfo rfc2047/0008
+
+expecting success of 5100.29 'mailinfo rfc2047/0009': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 29 - mailinfo rfc2047/0009
+
+expecting success of 5100.30 'mailinfo rfc2047/0010': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 30 - mailinfo rfc2047/0010
+
+expecting success of 5100.31 'mailinfo rfc2047/0011': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 31 - mailinfo rfc2047/0011
+
+expecting success of 5100.32 'respect NULs': 
+
+	git mailsplit -d3 -o. "$DATA/nul-plain" &&
+	test_cmp "$DATA/nul-plain" 001 &&
+	git mailinfo msg patch <001 &&
+	test_line_count = 4 patch
+
+
+1
+
+ok 32 - respect NULs
+
+expecting success of 5100.33 'Preserve NULs out of MIME encoded message': 
+
+	git mailsplit -d5 -o. "$DATA/nul-b64.in" &&
+	test_cmp "$DATA/nul-b64.in" 00001 &&
+	git mailinfo msg patch <00001 &&
+	test_cmp "$DATA/nul-b64.expect" patch
+
+
+1
+Author: Junio C Hamano
+Email: gitster@pobox.com
+Subject: second
+Date: Sun, 25 May 2008 00:38:18 -0700
+
+ok 33 - Preserve NULs out of MIME encoded message
+
+expecting success of 5100.34 'mailinfo on from header without name works': 
+
+	mkdir info-from &&
+	git mailsplit -oinfo-from "$DATA/info-from.in" &&
+	test_cmp "$DATA/info-from.in" info-from/0001 &&
+	git mailinfo info-from/msg info-from/patch \
+	  <info-from/0001 >info-from/out &&
+	test_cmp "$DATA/info-from.expect" info-from/out
+
+
+1
+ok 34 - mailinfo on from header without name works
+
+expecting success of 5100.35 'mailinfo finds headers after embedded From line': 
+	mkdir embed-from &&
+	git mailsplit -oembed-from "$DATA/embed-from.in" &&
+	test_cmp "$DATA/embed-from.in" embed-from/0001 &&
+	git mailinfo embed-from/msg embed-from/patch \
+	  <embed-from/0001 >embed-from/out &&
+	test_cmp "$DATA/embed-from.expect" embed-from/out
+
+1
+ok 35 - mailinfo finds headers after embedded From line
+
+expecting success of 5100.36 'mailinfo on message with quoted >From': 
+	mkdir quoted-from &&
+	git mailsplit -oquoted-from "$DATA/quoted-from.in" &&
+	test_cmp "$DATA/quoted-from.in" quoted-from/0001 &&
+	git mailinfo quoted-from/msg quoted-from/patch \
+	  <quoted-from/0001 >quoted-from/out &&
+	test_cmp "$DATA/quoted-from.expect" quoted-from/msg
+
+1
+ok 36 - mailinfo on message with quoted >From
+
+expecting success of 5100.37 'mailinfo unescapes with --mboxrd': 
+	mkdir mboxrd &&
+	git mailsplit -omboxrd --mboxrd \
+		"$DATA/sample.mboxrd" >last &&
+	test x"$(cat last)" = x2 &&
+	for i in 0001 0002
+	do
+		git mailinfo mboxrd/msg mboxrd/patch \
+		  <mboxrd/$i >mboxrd/out &&
+		test_cmp "$DATA/${i}mboxrd" mboxrd/msg || return 1
+	done &&
+	sp=" " &&
+	echo "From " >expect &&
+	echo "From " >>expect &&
+	echo >> expect &&
+	cat >sp <<-INPUT_END &&
+	From mboxrd Mon Sep 17 00:00:00 2001
+	From: trailing spacer <sp@example.com>
+	Subject: [PATCH] a commit with trailing space
+
+	From$sp
+	>From$sp
+
+	INPUT_END
+
+	git mailsplit -f2 -omboxrd --mboxrd <sp >last &&
+	test x"$(cat last)" = x1 &&
+	git mailinfo mboxrd/msg mboxrd/patch <mboxrd/0003 &&
+	test_cmp expect mboxrd/msg
+
+Author: trailing spacer
+Email: sp@example.com
+Subject: a commit with trailing space
+
+ok 37 - mailinfo unescapes with --mboxrd
+
+expecting success of 5100.38 'mailinfo handles rfc2822 quoted-string': 
+	mkdir quoted-string &&
+	git mailinfo /dev/null /dev/null <"$DATA/quoted-string.in" \
+		>quoted-string/info &&
+	test_cmp "$DATA/quoted-string.expect" quoted-string/info
+
+ok 38 - mailinfo handles rfc2822 quoted-string
+
+expecting success of 5100.39 'mailinfo handles rfc2822 comment': 
+	mkdir comment &&
+	git mailinfo /dev/null /dev/null <"$DATA/comment.in" \
+		>comment/info &&
+	test_cmp "$DATA/comment.expect" comment/info
+
+ok 39 - mailinfo handles rfc2822 comment
+
+expecting success of 5100.40 'mailinfo with mailinfo.scissors config': 
+	test_config mailinfo.scissors true &&
+	(
+		mkdir sub &&
+		cd sub &&
+		git mailinfo ../msg0014.sc ../patch0014.sc <../0014 >../info0014.sc
 	) &&
-	C=$(git --git-dir=patch_clone/.git rev-parse HEAD)
+	test_cmp "$DATA/msg0014--scissors" msg0014.sc &&
+	test_cmp "$DATA/patch0014--scissors" patch0014.sc &&
+	test_cmp "$DATA/info0014--scissors" info0014.sc
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5306-pack-nobase/patch_clone/.git/
-b9ed80ffce4d29008783a547cd99709480fe6c9f
-f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
-ok 2 - setup patch_clone
+ok 40 - mailinfo with mailinfo.scissors config
 
-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 5100.41 'mailinfo no options': 
+	subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
+		git mailinfo /dev/null /dev/null)" &&
+	test z"$subj" = z"Subject: message"
 
-	 git pull ../patch_clone/.git &&
-	 test $(git rev-parse HEAD) = $C
-	)
+ok 41 - mailinfo no options
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5306-pack-nobase/user_clone/.git/
-From ../
- * branch            HEAD       -> FETCH_HEAD
-From ../patch_clone/
- * branch            HEAD       -> FETCH_HEAD
-Updating b9ed80f..12634d7
-Fast-forward
- text | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-ok 3 - indirectly clone patch_clone
+expecting success of 5100.42 'mailinfo -k': 
+	subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
+		git mailinfo -k /dev/null /dev/null)" &&
+	test z"$subj" = z"Subject: [PATCH] [other] [PATCH] message"
 
-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
-	)
+ok 42 - mailinfo -k
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 5100.43 'mailinfo -b no [PATCH]': 
+	subj="$(echo "Subject: [other] message" |
+		git mailinfo -b /dev/null /dev/null)" &&
+	test z"$subj" = z"Subject: [other] message"
 
-# passed all 4 test(s)
-1..4
+ok 43 - mailinfo -b no [PATCH]
+
+expecting success of 5100.44 'mailinfo -b leading [PATCH]': 
+	subj="$(echo "Subject: [PATCH] [other] message" |
+		git mailinfo -b /dev/null /dev/null)" &&
+	test z"$subj" = z"Subject: [other] message"
+
+ok 44 - mailinfo -b leading [PATCH]
+
+expecting success of 5100.45 'mailinfo -b double [PATCH]': 
+	subj="$(echo "Subject: [PATCH] [PATCH] message" |
+		git mailinfo -b /dev/null /dev/null)" &&
+	test z"$subj" = z"Subject: message"
+
+ok 45 - mailinfo -b double [PATCH]
+
+expecting success of 5100.46 'mailinfo -b trailing [PATCH]': 
+	subj="$(echo "Subject: [other] [PATCH] message" |
+		git mailinfo -b /dev/null /dev/null)" &&
+	test z"$subj" = z"Subject: [other] message"
+
+ok 46 - mailinfo -b trailing [PATCH]
+
+expecting success of 5100.47 'mailinfo -b separated double [PATCH]': 
+	subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
+		git mailinfo -b /dev/null /dev/null)" &&
+	test z"$subj" = z"Subject: [other] message"
+
+ok 47 - mailinfo -b separated double [PATCH]
+
+expecting success of 5100.48 'mailinfo handles unusual header whitespace': 
+	git mailinfo /dev/null /dev/null >actual <<-\EOF &&
+	From:Real Name <user@example.com>
+	Subject:    extra spaces
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author: Real Name
+	Email: user@example.com
+	Subject: extra spaces
+
+	EOF
+	test_cmp expect actual
+
+ok 48 - mailinfo handles unusual header whitespace
+
+expecting success of 5100.49 'split base64 email with quoted-cr': 
+	mkdir quoted-cr &&
+	git mailsplit -oquoted-cr "$DATA/quoted-cr.mbox" >quoted-cr/last &&
+	test $(cat quoted-cr/last) = 2
+
+ok 49 - split base64 email with quoted-cr
+
+expecting success of 5100.50 'mailinfo warn CR in base64 encoded email': 
+	sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
+		>quoted-cr/0001-expected.msg &&
+	sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
+		>quoted-cr/0002-expected.msg &&
+	sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
+		>quoted-cr/0001-expected.patch &&
+	sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
+		>quoted-cr/0002-expected.patch &&
+	check_quoted_cr_mail quoted-cr/0001 &&
+	test_must_be_empty quoted-cr/0001.err &&
+	check_quoted_cr_mail quoted-cr/0002 &&
+	grep "quoted CRLF detected" quoted-cr/0002.err &&
+	check_quoted_cr_mail quoted-cr/0001 --quoted-cr=nowarn &&
+	test_must_be_empty quoted-cr/0001.err &&
+	check_quoted_cr_mail quoted-cr/0002 --quoted-cr=nowarn &&
+	test_must_be_empty quoted-cr/0002.err &&
+	cp quoted-cr/0001-expected.msg quoted-cr/0002-expected.msg &&
+	cp quoted-cr/0001-expected.patch quoted-cr/0002-expected.patch &&
+	check_quoted_cr_mail quoted-cr/0001 --quoted-cr=strip &&
+	test_must_be_empty quoted-cr/0001.err &&
+	check_quoted_cr_mail quoted-cr/0002 --quoted-cr=strip &&
+	test_must_be_empty quoted-cr/0002.err
+
+warning: quoted CRLF detected
+ok 50 - mailinfo warn CR in base64 encoded email
+
+expecting success of 5100.51 'from line with unterminated quoted string': 
+	echo "From: bob \"unterminated string smith <bob@example.com>" >in &&
+	git mailinfo /dev/null /dev/null <in >actual &&
+	cat >expect <<-\EOF &&
+	Author: bob unterminated string smith
+	Email: bob@example.com
+
+	EOF
+	test_cmp expect actual
+
+ok 51 - from line with unterminated quoted string
+
+expecting success of 5100.52 'from line with unterminated comment': 
+	echo "From: bob (unterminated comment smith <bob@example.com>" >in &&
+	git mailinfo /dev/null /dev/null <in >actual &&
+	cat >expect <<-\EOF &&
+	Author: bob (unterminated comment smith
+	Email: bob@example.com
+
+	EOF
+	test_cmp expect actual
+
+ok 52 - from line with unterminated comment
+
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5004-archive-corner-cases.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5004-archive-corner-cases/.git/
+expecting success of 5004.1 'create commit with empty tree and fake empty tar': 
+	git commit --allow-empty -m foo &&
+	perl -e "print \"\\0\" x 10240" >10knuls.tar
+
+[master (root-commit) 2093db0] foo
+ Author: A U Thor <author@example.com>
+ok 1 - create commit with empty tree and fake empty tar
+
+expecting success of 5004.2 'tar archive of commit with empty tree': 
+	git archive --format=tar HEAD >empty-with-pax-header.tar &&
+	make_dir extract &&
+	"$TAR" xf empty-with-pax-header.tar -C extract &&
+	check_dir extract
+
+ok 2 - tar archive of commit with empty tree
+
+expecting success of 5004.3 'tar archive of empty tree is empty': 
+	git archive --format=tar HEAD: >empty.tar &&
+	test_cmp_bin 10knuls.tar empty.tar
+
+ok 3 - tar archive of empty tree is empty
+
+expecting success of 5004.4 'tar archive of empty tree with prefix': 
+	git archive --format=tar --prefix=foo/ HEAD >prefix.tar &&
+	make_dir extract &&
+	"$TAR" xf prefix.tar -C extract &&
+	check_dir extract foo
+
+ok 4 - tar archive of empty tree with prefix
+
+checking prerequisite: UNZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+	"$GIT_UNZIP" -v
+	test $? -ne 127
+
+)
+UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+
+Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
+see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+
+Compiled with gcc 14.2.0 for Unix (Linux ELF).
+
+UnZip special compilation options:
+        ACORN_FTYPE_NFS
+        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
+        SET_DIR_ATTRIB
+        SYMLINKS (symbolic links supported, if RTL and file system permit)
+        TIMESTAMP
+        UNIXBACKUP
+        USE_EF_UT_TIME
+        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
+        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
+        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
+        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
+        ZIP64_SUPPORT (archives using Zip64 for large files supported)
+        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
+        VMS_TEXT_CONV
+        WILD_STOP_AT_DIR
+        [decryption, version 2.11 of 05 Jan 2007]
+
+UnZip and ZipInfo environment options:
+           UNZIP:  [none]
+        UNZIPOPT:  [none]
+         ZIPINFO:  [none]
+      ZIPINFOOPT:  [none]
+prerequisite UNZIP ok
+expecting success of 5004.5 'zip archive of empty tree is empty': 
+	# Detect the exit code produced when our particular flavor of unzip
+	# sees an empty archive. Infozip will generate a warning and exit with
+	# code 1. But in the name of sanity, we do not expect other unzip
+	# implementations to do the same thing (it would be perfectly
+	# reasonable to exit 0, for example).
+	#
+	# This makes our test less rigorous on some platforms (unzip may not
+	# handle the empty repo at all, making our later check of its exit code
+	# a no-op). But we cannot do anything reasonable except skip the test
+	# on such platforms anyway, and this is the moral equivalent.
+	{
+		"$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip
+		expect_code=$?
+	} &&
+
+	git archive --format=zip HEAD >empty.zip &&
+	make_dir extract &&
+	(
+		cd extract &&
+		test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip
+	) &&
+	check_dir extract
+
+Archive:  /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5004/empty.zip
+fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e
+warning [/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5004/empty.zip]:  zipfile is empty
+Archive:  ../empty.zip
+2093db06f424f426e05da2ca90f40d2663e89387
+warning [../empty.zip]:  zipfile is empty
+ok 5 - zip archive of empty tree is empty
+
+expecting success of 5004.6 'zip archive of empty tree with prefix': 
+	# We do not have to play exit-code tricks here, because our
+	# result should not be empty; it has a directory in it.
+	git archive --format=zip --prefix=foo/ HEAD >prefix.zip &&
+	make_dir extract &&
+	(
+		cd extract &&
+		"$GIT_UNZIP" ../prefix.zip
+	) &&
+	check_dir extract foo
+
+Archive:  ../prefix.zip
+2093db06f424f426e05da2ca90f40d2663e89387
+   creating: foo/
+ok 6 - zip archive of empty tree with prefix
+
+expecting success of 5004.7 'archive complains about pathspec on empty tree': 
+	test_must_fail git archive --format=tar HEAD -- foo >/dev/null
+
+fatal: pathspec 'foo' did not match any files
+ok 7 - archive complains about pathspec on empty tree
+
+expecting success of 5004.8 'create a commit with an empty subtree': 
+	empty_tree=$(git hash-object -t tree /dev/null) &&
+	root_tree=$(printf "040000 tree $empty_tree\tsub\n" | git mktree)
+
+ok 8 - create a commit with an empty subtree
+
+expecting success of 5004.9 'archive empty subtree with no pathspec': 
+	git archive --format=tar $root_tree >subtree-all.tar &&
+	test_cmp_bin 10knuls.tar subtree-all.tar
+
+ok 9 - archive empty subtree with no pathspec
+
+expecting success of 5004.10 'archive empty subtree by direct pathspec': 
+	git archive --format=tar $root_tree -- sub >subtree-path.tar &&
+	test_cmp_bin 10knuls.tar subtree-path.tar
+
+ok 10 - archive empty subtree by direct pathspec
+
+checking prerequisite: ZIPINFO
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
+	n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* //p")
+	test "x$n" = "x0"
+
+)
+prerequisite ZIPINFO ok
+expecting success of 5004.11 'zip archive with many entries': 
+	# add a directory with 256 files
+	mkdir 00 &&
+	for a in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+	do
+		for b in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+		do
+			: >00/$a$b || return 1
+		done
+	done &&
+	git add 00 &&
+	git commit -m "256 files in 1 directory" &&
+
+	# duplicate it to get 65536 files in 256 directories
+	subtree=$(git write-tree --prefix=00/) &&
+	for c in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+	do
+		for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f
+		do
+			echo "040000 tree $subtree	$c$d" || return 1
+		done
+	done >tree &&
+	tree=$(git mktree <tree) &&
+
+	# zip them
+	git archive -o many.zip $tree &&
+
+	# check the number of entries in the ZIP file directory
+	expr 65536 + 256 >expect &&
+	"$ZIPINFO" -h many.zip >zipinfo &&
+	sed -n "2s/.* //p" <zipinfo >actual &&
+	test_cmp expect actual
+
+[master 3c2fce3] 256 files in 1 directory
+ Author: A U Thor <author@example.com>
+ 256 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 00/00
+ create mode 100644 00/01
+ create mode 100644 00/02
+ create mode 100644 00/03
+ create mode 100644 00/04
+ create mode 100644 00/05
+ create mode 100644 00/06
+ create mode 100644 00/07
+ create mode 100644 00/08
+ create mode 100644 00/09
+ create mode 100644 00/0a
+ create mode 100644 00/0b
+ create mode 100644 00/0c
+ create mode 100644 00/0d
+ create mode 100644 00/0e
+ create mode 100644 00/0f
+ create mode 100644 00/10
+ create mode 100644 00/11
+ create mode 100644 00/12
+ create mode 100644 00/13
+ create mode 100644 00/14
+ create mode 100644 00/15
+ create mode 100644 00/16
+ create mode 100644 00/17
+ create mode 100644 00/18
+ create mode 100644 00/19
+ create mode 100644 00/1a
+ create mode 100644 00/1b
+ create mode 100644 00/1c
+ create mode 100644 00/1d
+ create mode 100644 00/1e
+ create mode 100644 00/1f
+ create mode 100644 00/20
+ create mode 100644 00/21
+ create mode 100644 00/22
+ create mode 100644 00/23
+ create mode 100644 00/24
+ create mode 100644 00/25
+ create mode 100644 00/26
+ create mode 100644 00/27
+ create mode 100644 00/28
+ create mode 100644 00/29
+ create mode 100644 00/2a
+ create mode 100644 00/2b
+ create mode 100644 00/2c
+ create mode 100644 00/2d
+ create mode 100644 00/2e
+ create mode 100644 00/2f
+ create mode 100644 00/30
+ create mode 100644 00/31
+ create mode 100644 00/32
+ create mode 100644 00/33
+ create mode 100644 00/34
+ create mode 100644 00/35
+ create mode 100644 00/36
+ create mode 100644 00/37
+ create mode 100644 00/38
+ create mode 100644 00/39
+ create mode 100644 00/3a
+ create mode 100644 00/3b
+ create mode 100644 00/3c
+ create mode 100644 00/3d
+ create mode 100644 00/3e
+ create mode 100644 00/3f
+ create mode 100644 00/40
+ create mode 100644 00/41
+ create mode 100644 00/42
+ create mode 100644 00/43
+ create mode 100644 00/44
+ create mode 100644 00/45
+ create mode 100644 00/46
+ create mode 100644 00/47
+ create mode 100644 00/48
+ create mode 100644 00/49
+ create mode 100644 00/4a
+ create mode 100644 00/4b
+ create mode 100644 00/4c
+ create mode 100644 00/4d
+ create mode 100644 00/4e
+ create mode 100644 00/4f
+ create mode 100644 00/50
+ create mode 100644 00/51
+ create mode 100644 00/52
+ create mode 100644 00/53
+ create mode 100644 00/54
+ create mode 100644 00/55
+ create mode 100644 00/56
+ create mode 100644 00/57
+ create mode 100644 00/58
+ create mode 100644 00/59
+ create mode 100644 00/5a
+ create mode 100644 00/5b
+ create mode 100644 00/5c
+ create mode 100644 00/5d
+ create mode 100644 00/5e
+ create mode 100644 00/5f
+ create mode 100644 00/60
+ create mode 100644 00/61
+ create mode 100644 00/62
+ create mode 100644 00/63
+ create mode 100644 00/64
+ create mode 100644 00/65
+ create mode 100644 00/66
+ create mode 100644 00/67
+ create mode 100644 00/68
+ create mode 100644 00/69
+ create mode 100644 00/6a
+ create mode 100644 00/6b
+ create mode 100644 00/6c
+ create mode 100644 00/6d
+ create mode 100644 00/6e
+ create mode 100644 00/6f
+ create mode 100644 00/70
+ create mode 100644 00/71
+ create mode 100644 00/72
+ create mode 100644 00/73
+ create mode 100644 00/74
+ create mode 100644 00/75
+ create mode 100644 00/76
+ create mode 100644 00/77
+ create mode 100644 00/78
+ create mode 100644 00/79
+ create mode 100644 00/7a
+ create mode 100644 00/7b
+ create mode 100644 00/7c
+ create mode 100644 00/7d
+ create mode 100644 00/7e
+ create mode 100644 00/7f
+ create mode 100644 00/80
+ create mode 100644 00/81
+ create mode 100644 00/82
+ create mode 100644 00/83
+ create mode 100644 00/84
+ create mode 100644 00/85
+ create mode 100644 00/86
+ create mode 100644 00/87
+ create mode 100644 00/88
+ create mode 100644 00/89
+ create mode 100644 00/8a
+ create mode 100644 00/8b
+ create mode 100644 00/8c
+ create mode 100644 00/8d
+ create mode 100644 00/8e
+ create mode 100644 00/8f
+ create mode 100644 00/90
+ create mode 100644 00/91
+ create mode 100644 00/92
+ create mode 100644 00/93
+ create mode 100644 00/94
+ create mode 100644 00/95
+ create mode 100644 00/96
+ create mode 100644 00/97
+ create mode 100644 00/98
+ create mode 100644 00/99
+ create mode 100644 00/9a
+ create mode 100644 00/9b
+ create mode 100644 00/9c
+ create mode 100644 00/9d
+ create mode 100644 00/9e
+ create mode 100644 00/9f
+ create mode 100644 00/a0
+ create mode 100644 00/a1
+ create mode 100644 00/a2
+ create mode 100644 00/a3
+ create mode 100644 00/a4
+ create mode 100644 00/a5
+ create mode 100644 00/a6
+ create mode 100644 00/a7
+ create mode 100644 00/a8
+ create mode 100644 00/a9
+ create mode 100644 00/aa
+ create mode 100644 00/ab
+ create mode 100644 00/ac
+ create mode 100644 00/ad
+ create mode 100644 00/ae
+ create mode 100644 00/af
+ create mode 100644 00/b0
+ create mode 100644 00/b1
+ create mode 100644 00/b2
+ create mode 100644 00/b3
+ create mode 100644 00/b4
+ create mode 100644 00/b5
+ create mode 100644 00/b6
+ create mode 100644 00/b7
+ create mode 100644 00/b8
+ create mode 100644 00/b9
+ create mode 100644 00/ba
+ create mode 100644 00/bb
+ create mode 100644 00/bc
+ create mode 100644 00/bd
+ create mode 100644 00/be
+ create mode 100644 00/bf
+ create mode 100644 00/c0
+ create mode 100644 00/c1
+ create mode 100644 00/c2
+ create mode 100644 00/c3
+ create mode 100644 00/c4
+ create mode 100644 00/c5
+ create mode 100644 00/c6
+ create mode 100644 00/c7
+ create mode 100644 00/c8
+ create mode 100644 00/c9
+ create mode 100644 00/ca
+ create mode 100644 00/cb
+ create mode 100644 00/cc
+ create mode 100644 00/cd
+ create mode 100644 00/ce
+ create mode 100644 00/cf
+ create mode 100644 00/d0
+ create mode 100644 00/d1
+ create mode 100644 00/d2
+ create mode 100644 00/d3
+ create mode 100644 00/d4
+ create mode 100644 00/d5
+ create mode 100644 00/d6
+ create mode 100644 00/d7
+ create mode 100644 00/d8
+ create mode 100644 00/d9
+ create mode 100644 00/da
+ create mode 100644 00/db
+ create mode 100644 00/dc
+ create mode 100644 00/dd
+ create mode 100644 00/de
+ create mode 100644 00/df
+ create mode 100644 00/e0
+ create mode 100644 00/e1
+ create mode 100644 00/e2
+ create mode 100644 00/e3
+ create mode 100644 00/e4
+ create mode 100644 00/e5
+ create mode 100644 00/e6
+ create mode 100644 00/e7
+ create mode 100644 00/e8
+ create mode 100644 00/e9
+ create mode 100644 00/ea
+ create mode 100644 00/eb
+ create mode 100644 00/ec
+ create mode 100644 00/ed
+ create mode 100644 00/ee
+ create mode 100644 00/ef
+ create mode 100644 00/f0
+ create mode 100644 00/f1
+ create mode 100644 00/f2
+ create mode 100644 00/f3
+ create mode 100644 00/f4
+ create mode 100644 00/f5
+ create mode 100644 00/f6
+ create mode 100644 00/f7
+ create mode 100644 00/f8
+ create mode 100644 00/f9
+ create mode 100644 00/fa
+ create mode 100644 00/fb
+ create mode 100644 00/fc
+ create mode 100644 00/fd
+ create mode 100644 00/fe
+ create mode 100644 00/ff
+ok 11 - zip archive with many entries
+
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+checking prerequisite: UNZIP_ZIP64_SUPPORT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
+	"$GIT_UNZIP" -v | grep ZIP64_SUPPORT
+
+)
+        ZIP64_SUPPORT (archives using Zip64 for large files supported)
+prerequisite UNZIP_ZIP64_SUPPORT ok
+ok 12 # skip zip archive bigger than 4GB (missing EXPENSIVE of EXPENSIVE,UNZIP,UNZIP_ZIP64_SUPPORT)
+
+checking prerequisite: LONG_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+	test 8 -le "$(build_option sizeof-long)"
+
+)
+prerequisite LONG_IS_64BIT ok
+ok 13 # skip zip archive with files bigger than 4GB (missing EXPENSIVE of EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO)
+
+expecting success of 5004.14 'tar archive with long paths': 
+	blob=$(echo foo | git hash-object -w --stdin) &&
+	tree=$(build_tree $blob | git mktree) &&
+	git archive -o long_paths.tar $tree
+
+ok 14 - tar archive with long paths
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4301-merge-tree-write-tree.sh ***
@@ -296356,6 +295272,1268 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5003-archive-zip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5305-include-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/.git/
+expecting success of 5305.1 'setup': 
+	echo c >d &&
+	git update-index --add d &&
+	tree=$(git write-tree) &&
+	commit=$(git commit-tree $tree </dev/null) &&
+	echo "object $commit" >sig &&
+	echo "type commit" >>sig &&
+	echo "tag mytag" >>sig &&
+	echo "tagger $(git var GIT_COMMITTER_IDENT)" >>sig &&
+	echo >>sig &&
+	echo "our test tag" >>sig &&
+	tag=$(git mktag <sig) &&
+	rm d sig &&
+	git update-ref refs/tags/mytag $tag && {
+		echo $tree &&
+		echo $commit &&
+		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
+	} >obj-list
+
+ok 1 - setup
+
+expecting success of 5305.2 'pack without --include-tag': 
+	packname=$(git pack-objects \
+		--window=0 \
+		test-no-include <obj-list)
+
+ok 2 - pack without --include-tag
+
+expecting success of 5305.3 'unpack objects': 
+	rm -rf clone.git &&
+	git init clone.git &&
+	git -C clone.git unpack-objects <test-no-include-${packname}.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
+ok 3 - unpack objects
+
+expecting success of 5305.4 'check unpacked result (have commit, no tag)': 
+	git rev-list --objects $commit >list.expect &&
+	test_must_fail git -C clone.git cat-file -e $tag &&
+	git -C clone.git rev-list --objects $commit >list.actual &&
+	test_cmp list.expect list.actual
+
+ok 4 - check unpacked result (have commit, no tag)
+
+expecting success of 5305.5 'pack with --include-tag': 
+	packname=$(git pack-objects \
+		--window=0 \
+		--include-tag \
+		test-include <obj-list)
+
+ok 5 - pack with --include-tag
+
+expecting success of 5305.6 'unpack objects': 
+	rm -rf clone.git &&
+	git init clone.git &&
+	git -C clone.git unpack-objects <test-include-${packname}.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
+ok 6 - unpack objects
+
+expecting success of 5305.7 'check unpacked result (have commit, have tag)': 
+	git rev-list --objects mytag >list.expect &&
+	git -C clone.git rev-list --objects $tag >list.actual &&
+	test_cmp list.expect list.actual
+
+ok 7 - check unpacked result (have commit, have tag)
+
+expecting success of 5305.8 'create hidden inner tag': 
+	test_commit commit &&
+	git tag -m inner inner HEAD &&
+	git tag -m outer outer inner &&
+	git tag -d inner
+
+[main (root-commit) b6b0ff3] commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 commit.t
+ create mode 100644 d
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f outer inner^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+Deleted tag 'inner' (was 4a3d125)
+ok 8 - create hidden inner tag
+
+expecting success of 5305.9 'pack explicit outer tag': 
+	packname=$(
+		{
+			echo HEAD &&
+			echo outer
+		} |
+		git pack-objects --revs test-hidden-explicit
+	)
+
+ok 9 - pack explicit outer tag
+
+expecting success of 5305.10 'unpack objects': 
+	rm -rf clone.git &&
+	git init clone.git &&
+	git -C clone.git unpack-objects <test-hidden-explicit-${packname}.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
+ok 10 - unpack objects
+
+expecting success of 5305.11 'check unpacked result (have all objects)': 
+	git -C clone.git rev-list --objects $(git rev-parse outer HEAD)
+
+b6b0ff3317698915de9c0bec0caab17e3884f5cc
+f29dea06355cfae615126151f86d323b8249923c outer
+4a3d125fea2ae6987f86d32a1f9598b386f2edcc inner
+c5b8485de618df1bc5b007d1a28eeb3e4c4deae8 
+01f9a2aac3e315c5caa00db4019f1d934171dba0 commit.t
+f2ad6c76f0115a6ba5b00456a849810e7ec0af20 d
+ok 11 - check unpacked result (have all objects)
+
+expecting success of 5305.12 'pack implied outer tag': 
+	packname=$(
+		echo HEAD |
+		git pack-objects --revs --include-tag test-hidden-implied
+	)
+
+ok 12 - pack implied outer tag
+
+expecting success of 5305.13 'unpack objects': 
+	rm -rf clone.git &&
+	git init clone.git &&
+	git -C clone.git unpack-objects <test-hidden-implied-${packname}.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5305-include-tag/clone.git/.git/
+ok 13 - unpack objects
+
+expecting success of 5305.14 'check unpacked result (have all objects)': 
+	git -C clone.git rev-list --objects $(git rev-parse outer HEAD)
+
+b6b0ff3317698915de9c0bec0caab17e3884f5cc
+f29dea06355cfae615126151f86d323b8249923c outer
+4a3d125fea2ae6987f86d32a1f9598b386f2edcc inner
+c5b8485de618df1bc5b007d1a28eeb3e4c4deae8 
+01f9a2aac3e315c5caa00db4019f1d934171dba0 commit.t
+f2ad6c76f0115a6ba5b00456a849810e7ec0af20 d
+ok 14 - check unpacked result (have all objects)
+
+expecting success of 5305.15 'single-branch clone can transfer tag': 
+	rm -rf clone.git &&
+	git clone --no-local --single-branch -b main . clone.git &&
+	git -C clone.git fsck
+
+Cloning into 'clone.git'...
+ok 15 - single-branch clone can transfer tag
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5306-pack-nobase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5306-pack-nobase/.git/
+expecting success of 5306.1 'setup base': 
+	test_write_lines a b c d e f g h i >text &&
+	echo side >side &&
+	git update-index --add text side &&
+	A=$(echo A | git commit-tree $(git write-tree)) &&
+
+	echo m >>text &&
+	git update-index text &&
+	B=$(echo B | git commit-tree $(git write-tree) -p $A) &&
+	git update-ref HEAD $B
+
+ok 1 - setup base
+
+expecting success of 5306.2 'setup patch_clone': 
+	base_objects=$(pwd)/.git/objects &&
+	(mkdir patch_clone &&
+	cd patch_clone &&
+	git init &&
+	echo "$base_objects" >.git/objects/info/alternates &&
+	echo q >>text &&
+	git read-tree $B &&
+	git update-index text &&
+	git update-ref HEAD $(echo C | git commit-tree $(git write-tree) -p $B) &&
+	rm .git/objects/info/alternates &&
+
+	git --git-dir=../.git cat-file commit $B |
+	git hash-object -t commit -w --stdin &&
+
+	git --git-dir=../.git cat-file tree "$B^{tree}" |
+	git hash-object -t tree -w --stdin
+	) &&
+	C=$(git --git-dir=patch_clone/.git rev-parse HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5306-pack-nobase/patch_clone/.git/
+b9ed80ffce4d29008783a547cd99709480fe6c9f
+f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
+ok 2 - setup patch_clone
+
+expecting success of 5306.3 'indirectly clone patch_clone': 
+	(mkdir user_clone &&
+	 cd user_clone &&
+	 git init &&
+	 git pull ../.git &&
+	 test $(git rev-parse HEAD) = $B &&
+
+	 git pull ../patch_clone/.git &&
+	 test $(git rev-parse HEAD) = $C
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5306-pack-nobase/user_clone/.git/
+From ../
+ * branch            HEAD       -> FETCH_HEAD
+From ../patch_clone/
+ * branch            HEAD       -> FETCH_HEAD
+Updating b9ed80f..12634d7
+Fast-forward
+ text | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+ok 3 - indirectly clone patch_clone
+
+expecting success of 5306.4 'clone of patch_clone is incomplete': 
+	(mkdir user_direct &&
+	 cd user_direct &&
+	 git init &&
+	 test_must_fail git fetch ../patch_clone/.git
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5307-pack-missing-commit.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5307-pack-missing-commit/.git/
 expecting success of 5307.1 'setup': 
@@ -296497,178 +296675,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5309-pack-delta-cycles.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5309-pack-delta-cycles/.git/
-expecting success of 5309.1 'index-pack works with a single delta (A->B)': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B
-	} >ab.pack &&
-	pack_trailer ab.pack &&
-	git index-pack --stdin <ab.pack &&
-	git cat-file -t $A &&
-	git cat-file -t $B
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-blob
-blob
-ok 1 - index-pack works with a single delta (A->B)
-
-expecting success of 5309.2 'index-pack works with a single delta (B->A)': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A &&
-		pack_obj $B $A
-	} >ba.pack &&
-	pack_trailer ba.pack &&
-	git index-pack --stdin <ba.pack &&
-	git cat-file -t $A &&
-	git cat-file -t $B
-
-pack	80442ca09df79dab1a7b2ac6fc4928bfbeeddc20
-blob
-blob
-ok 2 - index-pack works with a single delta (B->A)
-
-expecting success of 5309.3 'index-pack detects missing base objects': 
-	clear_packs &&
-	{
-		pack_header 1 &&
-		pack_obj $A $B
-	} >missing.pack &&
-	pack_trailer missing.pack &&
-	test_must_fail git index-pack --fix-thin --stdin <missing.pack
-
-fatal: pack has 1 unresolved delta
-ok 3 - index-pack detects missing base objects
-
-expecting success of 5309.4 'index-pack detects REF_DELTA cycles': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B $A
-	} >cycle.pack &&
-	pack_trailer cycle.pack &&
-	test_must_fail git index-pack --fix-thin --stdin <cycle.pack
-
-fatal: pack has 2 unresolved deltas
-ok 4 - index-pack detects REF_DELTA cycles
-
-expecting success of 5309.5 'failover to an object in another pack': 
-	clear_packs &&
-	git index-pack --stdin <ab.pack &&
-	test_must_fail git index-pack --stdin --fix-thin <cycle.pack
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-fatal: REF_DELTA at offset 12 already resolved (duplicate base e68fe8129b546b101aee9510c5328e7f21ca1d18?)
-ok 5 - failover to an object in another pack
-
-expecting success of 5309.6 'failover to a duplicate object in the same pack': 
-	clear_packs &&
-	{
-		pack_header 3 &&
-		pack_obj $A $B &&
-		pack_obj $B $A &&
-		pack_obj $A
-	} >recoverable.pack &&
-	pack_trailer recoverable.pack &&
-	test_must_fail git index-pack --fix-thin --stdin <recoverable.pack
-
-fatal: REF_DELTA at offset 46 already resolved (duplicate base 01d7713666f4de822776c7622c10f1b07de280dc?)
-ok 6 - failover to a duplicate object in the same pack
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5311-pack-bitmaps-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5150-request-pull.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/.git/
 expecting success of 5150.1 'setup': 
@@ -297146,73 +297152,300 @@
 
   More detail (2005-04-07 15:13:13 -0700)
 
-----------------------------------------------------------------
-version 2
+----------------------------------------------------------------
+version 2
+
+----------------------------------------------------------------
+A U Thor (1):
+      More detail
+
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+warn: refs/tags/full found at file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/ but points to a different object
+warn: Are you sure you pushed 'tags/full' there?
+ok 9 - pull request with mismatched object
+
+expecting success of 5150.10 'pull request with stale object': 
+
+	rm -fr downstream.git &&
+	git init --bare downstream.git &&
+	(
+		cd local &&
+		git checkout initial &&
+		git merge --ff-only main &&
+		git push origin refs/tags/full &&
+		git tag -f -m"Thirty-one days" full &&
+		test_must_fail git request-pull initial "$downstream_url" tags/full \
+			2>../err
+	) &&
+	grep "points to a different object" err &&
+	grep "Are you sure you pushed" err
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/
+Previous HEAD position was cc0f4ce More detail
+HEAD is now at 7244768 "Thirty days", a reminder of month lengths
+Updating 7244768..cc0f4ce
+Fast-forward
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git
+ * [new tag]         full -> full
+Updated tag 'full' (was a82f848)
+The following changes since commit 7244768f7e34b5fbdf65e26dda6c138d29596555:
+
+  "Thirty days", a reminder of month lengths (2005-04-07 15:13:13 -0700)
+
+are available in the Git repository at:
+
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/ tags/full
+
+for you to fetch changes up to cc0f4cedef2d8246b90a5255caa6a61ad760ad56:
+
+  More detail (2005-04-07 15:13:13 -0700)
+
+----------------------------------------------------------------
+Thirty-one days
+
+----------------------------------------------------------------
+A U Thor (1):
+      More detail
+
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+warn: refs/tags/full found at file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/ but points to a different object
+warn: Are you sure you pushed 'tags/full' there?
+ok 10 - pull request with stale object
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5311-pack-bitmaps-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5309-pack-delta-cycles.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5309-pack-delta-cycles/.git/
+expecting success of 5309.1 'index-pack works with a single delta (A->B)': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A $B &&
+		pack_obj $B
+	} >ab.pack &&
+	pack_trailer ab.pack &&
+	git index-pack --stdin <ab.pack &&
+	git cat-file -t $A &&
+	git cat-file -t $B
+
+pack	8af524300e46c11647862073e882d467bc0dd22d
+blob
+blob
+ok 1 - index-pack works with a single delta (A->B)
+
+expecting success of 5309.2 'index-pack works with a single delta (B->A)': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A &&
+		pack_obj $B $A
+	} >ba.pack &&
+	pack_trailer ba.pack &&
+	git index-pack --stdin <ba.pack &&
+	git cat-file -t $A &&
+	git cat-file -t $B
+
+pack	80442ca09df79dab1a7b2ac6fc4928bfbeeddc20
+blob
+blob
+ok 2 - index-pack works with a single delta (B->A)
+
+expecting success of 5309.3 'index-pack detects missing base objects': 
+	clear_packs &&
+	{
+		pack_header 1 &&
+		pack_obj $A $B
+	} >missing.pack &&
+	pack_trailer missing.pack &&
+	test_must_fail git index-pack --fix-thin --stdin <missing.pack
+
+fatal: pack has 1 unresolved delta
+ok 3 - index-pack detects missing base objects
 
-----------------------------------------------------------------
-A U Thor (1):
-      More detail
+expecting success of 5309.4 'index-pack detects REF_DELTA cycles': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A $B &&
+		pack_obj $B $A
+	} >cycle.pack &&
+	pack_trailer cycle.pack &&
+	test_must_fail git index-pack --fix-thin --stdin <cycle.pack
 
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-warn: refs/tags/full found at file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/ but points to a different object
-warn: Are you sure you pushed 'tags/full' there?
-ok 9 - pull request with mismatched object
+fatal: pack has 2 unresolved deltas
+ok 4 - index-pack detects REF_DELTA cycles
 
-expecting success of 5150.10 'pull request with stale object': 
+expecting success of 5309.5 'failover to an object in another pack': 
+	clear_packs &&
+	git index-pack --stdin <ab.pack &&
+	test_must_fail git index-pack --stdin --fix-thin <cycle.pack
 
-	rm -fr downstream.git &&
-	git init --bare downstream.git &&
-	(
-		cd local &&
-		git checkout initial &&
-		git merge --ff-only main &&
-		git push origin refs/tags/full &&
-		git tag -f -m"Thirty-one days" full &&
-		test_must_fail git request-pull initial "$downstream_url" tags/full \
-			2>../err
-	) &&
-	grep "points to a different object" err &&
-	grep "Are you sure you pushed" err
+pack	8af524300e46c11647862073e882d467bc0dd22d
+fatal: REF_DELTA at offset 12 already resolved (duplicate base e68fe8129b546b101aee9510c5328e7f21ca1d18?)
+ok 5 - failover to an object in another pack
 
+expecting success of 5309.6 'failover to a duplicate object in the same pack': 
+	clear_packs &&
+	{
+		pack_header 3 &&
+		pack_obj $A $B &&
+		pack_obj $B $A &&
+		pack_obj $A
+	} >recoverable.pack &&
+	pack_trailer recoverable.pack &&
+	test_must_fail git index-pack --fix-thin --stdin <recoverable.pack
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/
-Previous HEAD position was cc0f4ce More detail
-HEAD is now at 7244768 "Thirty days", a reminder of month lengths
-Updating 7244768..cc0f4ce
-Fast-forward
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git
- * [new tag]         full -> full
-Updated tag 'full' (was a82f848)
-The following changes since commit 7244768f7e34b5fbdf65e26dda6c138d29596555:
+fatal: REF_DELTA at offset 46 already resolved (duplicate base 01d7713666f4de822776c7622c10f1b07de280dc?)
+ok 6 - failover to a duplicate object in the same pack
 
-  "Thirty days", a reminder of month lengths (2005-04-07 15:13:13 -0700)
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5314-pack-cycle-detection.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5314-pack-cycle-detection/.git/
+expecting success of 5314.1 'setup': 
+	test-tool genrandom base 4096 >base &&
+	for i in one two
+	do
+		# we want shared content here to encourage deltas...
+		cp base file &&
+		echo $i >>file &&
 
-are available in the Git repository at:
+		# ...whereas dummy should be short, because we do not want
+		# deltas that would create duplicates when we --fix-thin
+		echo $i >dummy &&
 
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/ tags/full
+		git add file dummy &&
+		test_tick &&
+		git commit -m $i ||
+		return 1
+	done &&
 
-for you to fetch changes up to cc0f4cedef2d8246b90a5255caa6a61ad760ad56:
+	make_pack HEAD^ HEAD &&
+	make_pack HEAD HEAD^
 
-  More detail (2005-04-07 15:13:13 -0700)
+[master (root-commit) e98f41e] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 dummy
+ create mode 100644 file
+[master 1d543a7] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+pack	86885ae86429a2983f8a2824647f8b7773ff8e16
+pack	8a63be3313e6a04258b6d166a5abfb3005aac8f8
+ok 1 - setup
 
-----------------------------------------------------------------
-Thirty-one days
+expecting success of 5314.2 'repack': 
+	# We first want to check that we do not have any internal errors,
+	# and also that we do not hit the last-ditch cycle-breaking code
+	# in write_object(), which will issue a warning to stderr.
+	git repack -ad 2>stderr &&
+	test_must_be_empty stderr &&
 
-----------------------------------------------------------------
-A U Thor (1):
-      More detail
+	# And then double-check that the resulting pack is usable (i.e.,
+	# we did not fail to notice any cycles). We know we are accessing
+	# the objects via the new pack here, because "repack -d" will have
+	# removed the others.
+	git cat-file blob HEAD:file >/dev/null &&
+	git cat-file blob HEAD^:file >/dev/null
 
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-warn: refs/tags/full found at file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5150-request-pull/downstream.git/ but points to a different object
-warn: Are you sure you pushed 'tags/full' there?
-ok 10 - pull request with stale object
+ok 2 - repack
 
-# passed all 10 test(s)
-1..10
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5312-prune-corruption.sh ***
@@ -297328,495 +297561,116 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5004-archive-corner-cases.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5004-archive-corner-cases/.git/
-expecting success of 5004.1 'create commit with empty tree and fake empty tar': 
-	git commit --allow-empty -m foo &&
-	perl -e "print \"\\0\" x 10240" >10knuls.tar
-
-[master (root-commit) 2093db0] foo
- Author: A U Thor <author@example.com>
-ok 1 - create commit with empty tree and fake empty tar
-
-expecting success of 5004.2 'tar archive of commit with empty tree': 
-	git archive --format=tar HEAD >empty-with-pax-header.tar &&
-	make_dir extract &&
-	"$TAR" xf empty-with-pax-header.tar -C extract &&
-	check_dir extract
-
-ok 2 - tar archive of commit with empty tree
-
-expecting success of 5004.3 'tar archive of empty tree is empty': 
-	git archive --format=tar HEAD: >empty.tar &&
-	test_cmp_bin 10knuls.tar empty.tar
-
-ok 3 - tar archive of empty tree is empty
-
-expecting success of 5004.4 'tar archive of empty tree with prefix': 
-	git archive --format=tar --prefix=foo/ HEAD >prefix.tar &&
-	make_dir extract &&
-	"$TAR" xf prefix.tar -C extract &&
-	check_dir extract foo
-
-ok 4 - tar archive of empty tree with prefix
-
-checking prerequisite: UNZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
-
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
-
-Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
-see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
-
-Compiled with gcc 14.2.0 for Unix (Linux ELF).
-
-UnZip special compilation options:
-        ACORN_FTYPE_NFS
-        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
-        SET_DIR_ATTRIB
-        SYMLINKS (symbolic links supported, if RTL and file system permit)
-        TIMESTAMP
-        UNIXBACKUP
-        USE_EF_UT_TIME
-        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
-        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
-        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
-        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
-        VMS_TEXT_CONV
-        WILD_STOP_AT_DIR
-        [decryption, version 2.11 of 05 Jan 2007]
-
-UnZip and ZipInfo environment options:
-           UNZIP:  [none]
-        UNZIPOPT:  [none]
-         ZIPINFO:  [none]
-      ZIPINFOOPT:  [none]
-prerequisite UNZIP ok
-expecting success of 5004.5 'zip archive of empty tree is empty': 
-	# Detect the exit code produced when our particular flavor of unzip
-	# sees an empty archive. Infozip will generate a warning and exit with
-	# code 1. But in the name of sanity, we do not expect other unzip
-	# implementations to do the same thing (it would be perfectly
-	# reasonable to exit 0, for example).
-	#
-	# This makes our test less rigorous on some platforms (unzip may not
-	# handle the empty repo at all, making our later check of its exit code
-	# a no-op). But we cannot do anything reasonable except skip the test
-	# on such platforms anyway, and this is the moral equivalent.
-	{
-		"$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip
-		expect_code=$?
-	} &&
-
-	git archive --format=zip HEAD >empty.zip &&
-	make_dir extract &&
-	(
-		cd extract &&
-		test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip
-	) &&
-	check_dir extract
-
-Archive:  /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5004/empty.zip
-fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e
-warning [/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5004/empty.zip]:  zipfile is empty
-Archive:  ../empty.zip
-2093db06f424f426e05da2ca90f40d2663e89387
-warning [../empty.zip]:  zipfile is empty
-ok 5 - zip archive of empty tree is empty
-
-expecting success of 5004.6 'zip archive of empty tree with prefix': 
-	# We do not have to play exit-code tricks here, because our
-	# result should not be empty; it has a directory in it.
-	git archive --format=zip --prefix=foo/ HEAD >prefix.zip &&
-	make_dir extract &&
-	(
-		cd extract &&
-		"$GIT_UNZIP" ../prefix.zip
-	) &&
-	check_dir extract foo
-
-Archive:  ../prefix.zip
-2093db06f424f426e05da2ca90f40d2663e89387
-   creating: foo/
-ok 6 - zip archive of empty tree with prefix
-
-expecting success of 5004.7 'archive complains about pathspec on empty tree': 
-	test_must_fail git archive --format=tar HEAD -- foo >/dev/null
-
-fatal: pathspec 'foo' did not match any files
-ok 7 - archive complains about pathspec on empty tree
-
-expecting success of 5004.8 'create a commit with an empty subtree': 
-	empty_tree=$(git hash-object -t tree /dev/null) &&
-	root_tree=$(printf "040000 tree $empty_tree\tsub\n" | git mktree)
-
-ok 8 - create a commit with an empty subtree
-
-expecting success of 5004.9 'archive empty subtree with no pathspec': 
-	git archive --format=tar $root_tree >subtree-all.tar &&
-	test_cmp_bin 10knuls.tar subtree-all.tar
-
-ok 9 - archive empty subtree with no pathspec
-
-expecting success of 5004.10 'archive empty subtree by direct pathspec': 
-	git archive --format=tar $root_tree -- sub >subtree-path.tar &&
-	test_cmp_bin 10knuls.tar subtree-path.tar
-
-ok 10 - archive empty subtree by direct pathspec
-
-checking prerequisite: ZIPINFO
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
-	n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* //p")
-	test "x$n" = "x0"
-
-)
-prerequisite ZIPINFO ok
-expecting success of 5004.11 'zip archive with many entries': 
-	# add a directory with 256 files
-	mkdir 00 &&
-	for a in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-	do
-		for b in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-		do
-			: >00/$a$b || return 1
-		done
-	done &&
-	git add 00 &&
-	git commit -m "256 files in 1 directory" &&
-
-	# duplicate it to get 65536 files in 256 directories
-	subtree=$(git write-tree --prefix=00/) &&
-	for c in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-	do
-		for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-		do
-			echo "040000 tree $subtree	$c$d" || return 1
-		done
-	done >tree &&
-	tree=$(git mktree <tree) &&
-
-	# zip them
-	git archive -o many.zip $tree &&
-
-	# check the number of entries in the ZIP file directory
-	expr 65536 + 256 >expect &&
-	"$ZIPINFO" -h many.zip >zipinfo &&
-	sed -n "2s/.* //p" <zipinfo >actual &&
-	test_cmp expect actual
-
-[master 3c2fce3] 256 files in 1 directory
- Author: A U Thor <author@example.com>
- 256 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 00/00
- create mode 100644 00/01
- create mode 100644 00/02
- create mode 100644 00/03
- create mode 100644 00/04
- create mode 100644 00/05
- create mode 100644 00/06
- create mode 100644 00/07
- create mode 100644 00/08
- create mode 100644 00/09
- create mode 100644 00/0a
- create mode 100644 00/0b
- create mode 100644 00/0c
- create mode 100644 00/0d
- create mode 100644 00/0e
- create mode 100644 00/0f
- create mode 100644 00/10
- create mode 100644 00/11
- create mode 100644 00/12
- create mode 100644 00/13
- create mode 100644 00/14
- create mode 100644 00/15
- create mode 100644 00/16
- create mode 100644 00/17
- create mode 100644 00/18
- create mode 100644 00/19
- create mode 100644 00/1a
- create mode 100644 00/1b
- create mode 100644 00/1c
- create mode 100644 00/1d
- create mode 100644 00/1e
- create mode 100644 00/1f
- create mode 100644 00/20
- create mode 100644 00/21
- create mode 100644 00/22
- create mode 100644 00/23
- create mode 100644 00/24
- create mode 100644 00/25
- create mode 100644 00/26
- create mode 100644 00/27
- create mode 100644 00/28
- create mode 100644 00/29
- create mode 100644 00/2a
- create mode 100644 00/2b
- create mode 100644 00/2c
- create mode 100644 00/2d
- create mode 100644 00/2e
- create mode 100644 00/2f
- create mode 100644 00/30
- create mode 100644 00/31
- create mode 100644 00/32
- create mode 100644 00/33
- create mode 100644 00/34
- create mode 100644 00/35
- create mode 100644 00/36
- create mode 100644 00/37
- create mode 100644 00/38
- create mode 100644 00/39
- create mode 100644 00/3a
- create mode 100644 00/3b
- create mode 100644 00/3c
- create mode 100644 00/3d
- create mode 100644 00/3e
- create mode 100644 00/3f
- create mode 100644 00/40
- create mode 100644 00/41
- create mode 100644 00/42
- create mode 100644 00/43
- create mode 100644 00/44
- create mode 100644 00/45
- create mode 100644 00/46
- create mode 100644 00/47
- create mode 100644 00/48
- create mode 100644 00/49
- create mode 100644 00/4a
- create mode 100644 00/4b
- create mode 100644 00/4c
- create mode 100644 00/4d
- create mode 100644 00/4e
- create mode 100644 00/4f
- create mode 100644 00/50
- create mode 100644 00/51
- create mode 100644 00/52
- create mode 100644 00/53
- create mode 100644 00/54
- create mode 100644 00/55
- create mode 100644 00/56
- create mode 100644 00/57
- create mode 100644 00/58
- create mode 100644 00/59
- create mode 100644 00/5a
- create mode 100644 00/5b
- create mode 100644 00/5c
- create mode 100644 00/5d
- create mode 100644 00/5e
- create mode 100644 00/5f
- create mode 100644 00/60
- create mode 100644 00/61
- create mode 100644 00/62
- create mode 100644 00/63
- create mode 100644 00/64
- create mode 100644 00/65
- create mode 100644 00/66
- create mode 100644 00/67
- create mode 100644 00/68
- create mode 100644 00/69
- create mode 100644 00/6a
- create mode 100644 00/6b
- create mode 100644 00/6c
- create mode 100644 00/6d
- create mode 100644 00/6e
- create mode 100644 00/6f
- create mode 100644 00/70
- create mode 100644 00/71
- create mode 100644 00/72
- create mode 100644 00/73
- create mode 100644 00/74
- create mode 100644 00/75
- create mode 100644 00/76
- create mode 100644 00/77
- create mode 100644 00/78
- create mode 100644 00/79
- create mode 100644 00/7a
- create mode 100644 00/7b
- create mode 100644 00/7c
- create mode 100644 00/7d
- create mode 100644 00/7e
- create mode 100644 00/7f
- create mode 100644 00/80
- create mode 100644 00/81
- create mode 100644 00/82
- create mode 100644 00/83
- create mode 100644 00/84
- create mode 100644 00/85
- create mode 100644 00/86
- create mode 100644 00/87
- create mode 100644 00/88
- create mode 100644 00/89
- create mode 100644 00/8a
- create mode 100644 00/8b
- create mode 100644 00/8c
- create mode 100644 00/8d
- create mode 100644 00/8e
- create mode 100644 00/8f
- create mode 100644 00/90
- create mode 100644 00/91
- create mode 100644 00/92
- create mode 100644 00/93
- create mode 100644 00/94
- create mode 100644 00/95
- create mode 100644 00/96
- create mode 100644 00/97
- create mode 100644 00/98
- create mode 100644 00/99
- create mode 100644 00/9a
- create mode 100644 00/9b
- create mode 100644 00/9c
- create mode 100644 00/9d
- create mode 100644 00/9e
- create mode 100644 00/9f
- create mode 100644 00/a0
- create mode 100644 00/a1
- create mode 100644 00/a2
- create mode 100644 00/a3
- create mode 100644 00/a4
- create mode 100644 00/a5
- create mode 100644 00/a6
- create mode 100644 00/a7
- create mode 100644 00/a8
- create mode 100644 00/a9
- create mode 100644 00/aa
- create mode 100644 00/ab
- create mode 100644 00/ac
- create mode 100644 00/ad
- create mode 100644 00/ae
- create mode 100644 00/af
- create mode 100644 00/b0
- create mode 100644 00/b1
- create mode 100644 00/b2
- create mode 100644 00/b3
- create mode 100644 00/b4
- create mode 100644 00/b5
- create mode 100644 00/b6
- create mode 100644 00/b7
- create mode 100644 00/b8
- create mode 100644 00/b9
- create mode 100644 00/ba
- create mode 100644 00/bb
- create mode 100644 00/bc
- create mode 100644 00/bd
- create mode 100644 00/be
- create mode 100644 00/bf
- create mode 100644 00/c0
- create mode 100644 00/c1
- create mode 100644 00/c2
- create mode 100644 00/c3
- create mode 100644 00/c4
- create mode 100644 00/c5
- create mode 100644 00/c6
- create mode 100644 00/c7
- create mode 100644 00/c8
- create mode 100644 00/c9
- create mode 100644 00/ca
- create mode 100644 00/cb
- create mode 100644 00/cc
- create mode 100644 00/cd
- create mode 100644 00/ce
- create mode 100644 00/cf
- create mode 100644 00/d0
- create mode 100644 00/d1
- create mode 100644 00/d2
- create mode 100644 00/d3
- create mode 100644 00/d4
- create mode 100644 00/d5
- create mode 100644 00/d6
- create mode 100644 00/d7
- create mode 100644 00/d8
- create mode 100644 00/d9
- create mode 100644 00/da
- create mode 100644 00/db
- create mode 100644 00/dc
- create mode 100644 00/dd
- create mode 100644 00/de
- create mode 100644 00/df
- create mode 100644 00/e0
- create mode 100644 00/e1
- create mode 100644 00/e2
- create mode 100644 00/e3
- create mode 100644 00/e4
- create mode 100644 00/e5
- create mode 100644 00/e6
- create mode 100644 00/e7
- create mode 100644 00/e8
- create mode 100644 00/e9
- create mode 100644 00/ea
- create mode 100644 00/eb
- create mode 100644 00/ec
- create mode 100644 00/ed
- create mode 100644 00/ee
- create mode 100644 00/ef
- create mode 100644 00/f0
- create mode 100644 00/f1
- create mode 100644 00/f2
- create mode 100644 00/f3
- create mode 100644 00/f4
- create mode 100644 00/f5
- create mode 100644 00/f6
- create mode 100644 00/f7
- create mode 100644 00/f8
- create mode 100644 00/f9
- create mode 100644 00/fa
- create mode 100644 00/fb
- create mode 100644 00/fc
- create mode 100644 00/fd
- create mode 100644 00/fe
- create mode 100644 00/ff
-ok 11 - zip archive with many entries
-
-checking prerequisite: EXPENSIVE
+*** t5315-pack-objects-compression.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5315-pack-objects-compression/.git/
+expecting success of 5315.1 'setup': 
+	printf "%2000000s" X |
+	git hash-object -w --stdin >object-name &&
+	# make sure it resulted in a loose object
+	ob=$(sed -e "s/\(..\).*/\1/" object-name) &&
+	ject=$(sed -e "s/..\(.*\)/\1/" object-name) &&
+	test -f .git/objects/$ob/$ject
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+ok 1 - setup
 
-)
-prerequisite EXPENSIVE not satisfied
-checking prerequisite: UNZIP_ZIP64_SUPPORT
+expecting success of 5315.2 'pack-objects with -c core.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 2 - pack-objects with -c core.compression=0
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
-	"$GIT_UNZIP" -v | grep ZIP64_SUPPORT
+expecting success of 5315.3 'pack-objects with -c core.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 3 - pack-objects with -c core.compression=9
 
-)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-prerequisite UNZIP_ZIP64_SUPPORT ok
-ok 12 # skip zip archive bigger than 4GB (missing EXPENSIVE of EXPENSIVE,UNZIP,UNZIP_ZIP64_SUPPORT)
+expecting success of 5315.4 'pack-objects with -c core.compression=0 -c pack.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 4 - pack-objects with -c core.compression=0 -c pack.compression=0
 
-checking prerequisite: LONG_IS_64BIT
+expecting success of 5315.5 'pack-objects with -c core.compression=9 -c pack.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 5 - pack-objects with -c core.compression=9 -c pack.compression=0
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-	test 8 -le "$(build_option sizeof-long)"
+expecting success of 5315.6 'pack-objects with -c core.compression=0 -c pack.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 6 - pack-objects with -c core.compression=0 -c pack.compression=9
 
-)
-prerequisite LONG_IS_64BIT ok
-ok 13 # skip zip archive with files bigger than 4GB (missing EXPENSIVE of EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO)
+expecting success of 5315.7 'pack-objects with -c core.compression=9 -c pack.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 7 - pack-objects with -c core.compression=9 -c pack.compression=9
 
-expecting success of 5004.14 'tar archive with long paths': 
-	blob=$(echo foo | git hash-object -w --stdin) &&
-	tree=$(build_tree $blob | git mktree) &&
-	git archive -o long_paths.tar $tree
+expecting success of 5315.8 'pack-objects with -c pack.compression=0': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+914337c67e9cd1ab74ffb73c96318b9e5409e0b1
+ok 8 - pack-objects with -c pack.compression=0
 
-ok 14 - tar archive with long paths
+expecting success of 5315.9 'pack-objects with -c pack.compression=9': 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(test_file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 9 - pack-objects with -c pack.compression=9
 
-# passed all 14 test(s)
-1..14
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5303-pack-corruption-resilience.sh ***
@@ -297847,7 +297701,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.952e-05 s, 33.9 kB/s
+1 byte copied, 2.68e-05 s, 37.3 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
@@ -297975,7 +297829,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.488e-05 s, 40.2 kB/s
+1 byte copied, 2.62e-05 s, 38.2 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
@@ -298079,7 +297933,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.5641e-05 s, 39.0 kB/s
+1 byte copied, 2.656e-05 s, 37.7 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
@@ -298126,7 +297980,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.492e-05 s, 40.1 kB/s
+1 byte copied, 2.576e-05 s, 38.8 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
@@ -298174,7 +298028,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.732e-05 s, 36.6 kB/s
+1 byte copied, 2.752e-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
@@ -298231,7 +298085,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.54e-05 s, 39.4 kB/s
+1 byte copied, 2.956e-05 s, 33.8 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
@@ -298260,7 +298114,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 2.836e-05 s, 70.5 kB/s
+2 bytes copied, 2.96e-05 s, 67.6 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
@@ -298307,7 +298161,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 2.608e-05 s, 76.7 kB/s
+2 bytes copied, 2.868e-05 s, 69.7 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
@@ -298393,61 +298247,6 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5314-pack-cycle-detection.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5314-pack-cycle-detection/.git/
-expecting success of 5314.1 'setup': 
-	test-tool genrandom base 4096 >base &&
-	for i in one two
-	do
-		# we want shared content here to encourage deltas...
-		cp base file &&
-		echo $i >>file &&
-
-		# ...whereas dummy should be short, because we do not want
-		# deltas that would create duplicates when we --fix-thin
-		echo $i >dummy &&
-
-		git add file dummy &&
-		test_tick &&
-		git commit -m $i ||
-		return 1
-	done &&
-
-	make_pack HEAD^ HEAD &&
-	make_pack HEAD HEAD^
-
-[master (root-commit) e98f41e] one
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 dummy
- create mode 100644 file
-[master 1d543a7] two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
-pack	86885ae86429a2983f8a2824647f8b7773ff8e16
-pack	8a63be3313e6a04258b6d166a5abfb3005aac8f8
-ok 1 - setup
-
-expecting success of 5314.2 'repack': 
-	# We first want to check that we do not have any internal errors,
-	# and also that we do not hit the last-ditch cycle-breaking code
-	# in write_object(), which will issue a warning to stderr.
-	git repack -ad 2>stderr &&
-	test_must_be_empty stderr &&
-
-	# And then double-check that the resulting pack is usable (i.e.,
-	# we did not fail to notice any cycles). We know we are accessing
-	# the objects via the new pack here, because "repack -d" will have
-	# removed the others.
-	git cat-file blob HEAD:file >/dev/null &&
-	git cat-file blob HEAD^:file >/dev/null
-
-ok 2 - repack
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5313-pack-bounds-checks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5313-pack-bounds-checks/.git/
 expecting success of 5313.1 'setup': 
@@ -298505,7 +298304,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.428e-05 s, 117 kB/s
+4 bytes copied, 3.752e-05 s, 107 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
@@ -298540,10 +298339,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.7841e-05 s, 106 kB/s
+4 bytes copied, 3.892e-05 s, 103 kB/s
 4+0 records in
 4+0 records out
-4 bytes copied, 0.000283081 s, 14.1 kB/s
+4 bytes copied, 0.0150228 s, 0.3 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
@@ -298566,7 +298365,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 0.000316962 s, 12.6 kB/s
+4 bytes copied, 0.00734028 s, 0.5 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 5 - bogus object offset (v1)
@@ -298580,7 +298379,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.824e-05 s, 105 kB/s
+4 bytes copied, 4.14e-05 s, 96.6 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)
@@ -298594,7 +298393,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.816e-05 s, 105 kB/s
+4 bytes copied, 3.448e-05 s, 116 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
@@ -298625,10 +298424,10 @@
 
 1084+0 records in
 1084+0 records out
-1084 bytes (1.1 kB, 1.1 KiB) copied, 0.000810285 s, 1.3 MB/s
+1084 bytes (1.1 kB, 1.1 KiB) copied, 0.00081236 s, 1.3 MB/s
 40+0 records in
 40+0 records out
-40 bytes copied, 5.592e-05 s, 715 kB/s
+40 bytes copied, 5.716e-05 s, 700 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
@@ -298655,7 +298454,7 @@
 
 2+0 records in
 2+0 records out
-2 bytes copied, 3.744e-05 s, 53.4 kB/s
+2 bytes copied, 0.0100311 s, 0.2 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
@@ -298664,118 +298463,6 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5315-pack-objects-compression.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5315-pack-objects-compression/.git/
-expecting success of 5315.1 'setup': 
-	printf "%2000000s" X |
-	git hash-object -w --stdin >object-name &&
-	# make sure it resulted in a loose object
-	ob=$(sed -e "s/\(..\).*/\1/" object-name) &&
-	ject=$(sed -e "s/..\(.*\)/\1/" object-name) &&
-	test -f .git/objects/$ob/$ject
-
-ok 1 - setup
-
-expecting success of 5315.2 'pack-objects with -c core.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 2 - pack-objects with -c core.compression=0
-
-expecting success of 5315.3 'pack-objects with -c core.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 3 - pack-objects with -c core.compression=9
-
-expecting success of 5315.4 'pack-objects with -c core.compression=0 -c pack.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 4 - pack-objects with -c core.compression=0 -c pack.compression=0
-
-expecting success of 5315.5 'pack-objects with -c core.compression=9 -c pack.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 5 - pack-objects with -c core.compression=9 -c pack.compression=0
-
-expecting success of 5315.6 'pack-objects with -c core.compression=0 -c pack.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 6 - pack-objects with -c core.compression=0 -c pack.compression=9
-
-expecting success of 5315.7 'pack-objects with -c core.compression=9 -c pack.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 7 - pack-objects with -c core.compression=9 -c pack.compression=9
-
-expecting success of 5315.8 'pack-objects with -c pack.compression=0': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-914337c67e9cd1ab74ffb73c96318b9e5409e0b1
-ok 8 - pack-objects with -c pack.compression=0
-
-expecting success of 5315.9 'pack-objects with -c pack.compression=9': 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(test_file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 9 - pack-objects with -c pack.compression=9
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5304-prune.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5304-prune/.git/
 expecting success of 5304.1 'setup': 
@@ -299539,1027 +299226,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5322-pack-objects-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5323-pack-redundant.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5317-pack-objects-filter-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4137-apply-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4137-apply-submodule/.git/
 expecting success of 4137.1 'apply_index: added submodule creates empty directory': 
@@ -301477,2935 +300143,2989 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5325-reverse-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t5322-pack-objects-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-[master (root-commit) d1ff1c9] base
+[main (root-commit) 24b24cf] initial
  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 &&
-
-	test_index_pack true &&
-	test_path_is_file $rev
-
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-ok 2 - index-pack with pack.writeReverseIndex
-
-expecting success of 5325.3 'index-pack with --[no-]rev-index': 
-	for conf in "" true false
-	do
-		test_index_pack "$conf" --rev-index &&
-		test_path_exists $rev &&
-
-		test_index_pack "$conf" --no-rev-index &&
-		test_path_is_missing $rev || return 1
-	done
-
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-ok 3 - index-pack with --[no-]rev-index
-
-expecting success of 5325.4 'index-pack can verify reverse indexes': 
-	test_when_finished "rm -f $rev" &&
-	test_index_pack true &&
-
-	test_path_is_file $rev &&
-	git index-pack --rev-index --verify $packdir/pack-$pack.pack &&
-
-	# Intentionally corrupt the reverse index.
-	chmod u+w $rev &&
-	printf "xxxx" | dd of=$rev bs=1 count=4 conv=notrunc &&
-
-	test_must_fail git index-pack --rev-index --verify \
-		$packdir/pack-$pack.pack 2>err &&
-	grep "validation error" err
-
-68c6c8c8538900694c32380ac1484201c8b60d8d
-4+0 records in
-4+0 records out
-4 bytes copied, 0.000903446 s, 4.4 kB/s
-fatal: sha1 file '.git/objects/pack/pack-68c6c8c8538900694c32380ac1484201c8b60d8d.rev' validation error
-ok 4 - index-pack can verify reverse indexes
-
-expecting success of 5325.5 'index-pack infers reverse index name with -o': 
-	git index-pack --rev-index -o other.idx $packdir/pack-$pack.pack &&
-	test_path_is_file other.idx &&
-	test_path_is_file other.rev
-
-68c6c8c8538900694c32380ac1484201c8b60d8d
-ok 5 - index-pack infers reverse index name with -o
-
-expecting success of 5325.6 'pack-objects respects pack.writeReverseIndex': 
-	test_when_finished "rm -fr pack-1-*" &&
-
-	git -c pack.writeReverseIndex= pack-objects --all pack-1 &&
-	test_path_is_missing pack-1-*.rev &&
-
-	git -c pack.writeReverseIndex=false pack-objects --all pack-1 &&
-	test_path_is_missing pack-1-*.rev &&
-
-	git -c pack.writeReverseIndex=true pack-objects --all pack-1 &&
-	test_path_is_file pack-1-*.rev
-
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-ok 6 - pack-objects respects pack.writeReverseIndex
-
-expecting success of 5325.7 'reverse index is not generated when available on disk': 
-	test_index_pack true &&
-	test_path_is_file $rev &&
-
-	git rev-parse HEAD >tip &&
-	GIT_TEST_REV_INDEX_DIE_IN_MEMORY=1 git cat-file \
-		--batch-check="%(objectsize:disk)" <tip
-
-68c6c8c8538900694c32380ac1484201c8b60d8d
-126
-ok 7 - reverse index is not generated when available on disk
-
-expecting success of 5325.8 'reverse index is ignored when pack.readReverseIndex is false': 
-	test_index_pack true &&
-	test_path_is_file $rev &&
-
-	test_config pack.readReverseIndex false &&
-
-	git rev-parse HEAD >tip &&
-	GIT_TEST_REV_INDEX_DIE_ON_DISK=1 git cat-file \
-		--batch-check="%(objectsize:disk)" <tip
-
-68c6c8c8538900694c32380ac1484201c8b60d8d
-126
-ok 8 - reverse index is ignored when pack.readReverseIndex is false
-
-expecting success of 5325.9 'revindex in-memory vs on-disk': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+ 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
 
-		test_commit commit &&
+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
 
-		git rev-list --objects --no-object-names --all >objects &&
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 2 - non-sparse pack-objects
 
-		git -c pack.writeReverseIndex=false repack -ad &&
-		test_path_is_missing $packdir/pack-*.rev &&
-		git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
-			<objects >in-core &&
+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
 
-		git -c pack.writeReverseIndex=true repack -ad &&
-		test_path_is_file $packdir/pack-*.rev &&
-		git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
-			<objects >on-disk &&
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 3 - sparse pack-objects
 
-		test_cmp on-disk in-core
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5325-reverse-index/repo/.git/
-[master (root-commit) aa0ac59] commit
+Switched to branch 'topic1'
+[topic1 200bcc4] Changed f3/f3/data.txt
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-ok 9 - revindex in-memory vs on-disk
-
-expecting success of 5325.10 'fsck succeeds on good rev-index': 
-	test_when_finished rm -fr repo &&
-	git init repo &&
-	(
-		cd repo &&
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - duplicate a folder from f3 and commit to topic1
 
-		test_commit commit &&
-		git -c pack.writeReverseIndex=true repack -ad &&
-		git fsck 2>err &&
-		test_must_be_empty err
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5325-reverse-index/repo/.git/
-[master (root-commit) aa0ac59] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-ok 10 - fsck succeeds on good rev-index
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 5 - non-sparse pack-objects
 
-expecting success of 5325.11 'set up rev-index corruption tests': 
-	git init corrupt &&
-	(
-		cd corrupt &&
+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
 
-		test_commit commit &&
-		git -c pack.writeReverseIndex=true repack -ad &&
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 6 - sparse pack-objects
 
-		revfile=$(ls .git/objects/pack/pack-*.rev) &&
-		chmod a+w $revfile &&
-		cp $revfile $revfile.bak
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5325-reverse-index/corrupt/.git/
-[master (root-commit) aa0ac59] commit
+[topic1 b9b902e] Copied f1/f1 to f3/f4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-ok 11 - set up rev-index corruption tests
-
-expecting success of 5325.12 'fsck catches invalid checksum': 
-	revfile=$(ls corrupt/.git/objects/pack/pack-*.rev) &&
-	orig_size=$(wc -c <$revfile) &&
-	hashpos=$((orig_size - 10)) &&
-	corrupt_rev_and_verify $hashpos bogus \
-		"invalid checksum"
-
-5+0 records in
-5+0 records out
-5 bytes copied, 0.000309922 s, 16.1 kB/s
-error: invalid checksum
-ok 12 - fsck catches invalid checksum
+ create mode 100644 f3/f4/data.txt
+ok 7 - duplicate a folder from f1 into f3
 
-expecting success of 5325.13 'fsck catches invalid row position': 
-	corrupt_rev_and_verify 14 "\07" \
-		"invalid rev-index position"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.000234681 s, 4.3 kB/s
-error: invalid rev-index position at 0: 1 != 1793
-ok 13 - fsck catches invalid row position
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 8 - non-sparse pack-objects
 
-expecting success of 5325.14 'fsck catches invalid header: magic number': 
-	corrupt_rev_and_verify 1 "\07" \
-		"reverse-index file .* has unknown signature"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.48e-05 s, 28.7 kB/s
-error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unknown signature
-ok 14 - fsck catches invalid header: magic number
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 9 - sparse pack-objects
 
-expecting success of 5325.15 'fsck catches invalid header: version': 
-	corrupt_rev_and_verify 7 "\02" \
-		"reverse-index file .* has unsupported version"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.76e-05 s, 26.6 kB/s
-error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported version 2
-ok 15 - fsck catches invalid header: version
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 10 - pack.useSparse enables algorithm
 
-expecting success of 5325.16 'fsck catches invalid header: hash function': 
-	corrupt_rev_and_verify 11 "\03" \
-		"reverse-index file .* has unsupported hash id"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.228e-05 s, 31.0 kB/s
-error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported hash id 3
-ok 16 - fsck catches invalid header: hash function
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 11 - pack.useSparse overridden
 
-# passed all 16 test(s)
-1..16
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5328-commit-graph-64bit-time.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5328-commit-graph-64bit-time/.git/
-checking prerequisite: TIME_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
-)
-prerequisite TIME_IS_64BIT ok
-checking prerequisite: TIME_T_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
-)
-prerequisite TIME_T_IS_64BIT ok
-expecting success of 5328.1 'lower layers have overflow chunk': 
-	rm -f .git/objects/info/commit-graph &&
-	test_commit --date "$FUTURE_DATE" future-1 &&
-	test_commit --date "$UNIX_EPOCH_ZERO" old-1 &&
-	git commit-graph write --reachable &&
-	test_commit --date "$FUTURE_DATE" future-2 &&
-	test_commit --date "$UNIX_EPOCH_ZERO" old-2 &&
-	git commit-graph write --reachable --split=no-merge &&
-	test_commit extra &&
-	git commit-graph write --reachable --split=no-merge &&
-	git commit-graph write --reachable &&
-	graph_read_expect 5 "generation_data generation_data_overflow" &&
-	mv .git/objects/info/commit-graph commit-graph-upgraded &&
-	git commit-graph write --reachable &&
-	graph_read_expect 5 "generation_data generation_data_overflow" &&
-	test_cmp .git/objects/info/commit-graph commit-graph-upgraded
+*** t5317-pack-objects-filter-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-[master (root-commit) 6440ef3] future-1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 future-1.t
-[master 5660aa3] old-1
+ create mode 100644 file.1
+[main 7d743f2] 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 old-1.t
-[master d9a5240] future-2
+ create mode 100644 file.2
+[main fcc1d33] 3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 future-2.t
-[master 2c4f07c] old-2
+ create mode 100644 file.3
+[main e1d918e] 4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 old-2.t
-[master 29f070a] extra
+ create mode 100644 file.4
+[main 90f11b5] 5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-ok 1 - lower layers have overflow chunk
+ create mode 100644 file.5
+ok 1 - setup r1
 
-expecting success of 5328.2 'check normal git operations: overflow': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 2 - check normal git operations: overflow
+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 &&
 
-expecting success of 5328.3 'set up and verify repo with generation data overflow chunk': 
-	git init repo &&
-	(
-		cd repo &&
-		test_commit --date "$UNIX_EPOCH_ZERO" 1 &&
-		test_commit 2 &&
-		test_commit --date "$UNIX_EPOCH_ZERO" 3 &&
-		git commit-graph write --reachable &&
-		graph_read_expect 3 generation_data &&
-		test_commit --date "$FUTURE_DATE" 4 &&
-		test_commit 5 &&
-		test_commit --date "$UNIX_EPOCH_ZERO" 6 &&
-		git branch left &&
-		git reset --hard 3 &&
-		test_commit 7 &&
-		test_commit --date "$FUTURE_DATE" 8 &&
-		test_commit 9 &&
-		git branch right &&
-		git reset --hard 3 &&
-		test_merge M left right &&
-		git commit-graph write --reachable &&
-		graph_read_expect 10 "generation_data generation_data_overflow" &&
-		git commit-graph verify
-	)
+	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../all.pack &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5328-commit-graph-64bit-time/repo/.git/
-[master (root-commit) 0131a52] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master f2c0e81] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master 6cae051] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master a8af5c7] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master f0797d2] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-[master 83bda2f] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-HEAD is now at 6cae051 3
-[master ae15ac2] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[master dcce859] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[master 199098f] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-HEAD is now at 6cae051 3
-Fast-forwarding to: left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- 4.t | 1 +
- 5.t | 1 +
- 6.t | 1 +
- 7.t | 1 +
- 8.t | 1 +
- 9.t | 1 +
- 6 files changed, 6 insertions(+)
- create mode 100644 4.t
- create mode 100644 5.t
- create mode 100644 6.t
- create mode 100644 7.t
- create mode 100644 8.t
- create mode 100644 9.t
-ok 3 - set up and verify repo with generation data overflow chunk
+	git -C r1 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 5328.4 'check normal git operations: overflow 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 4 - check normal git operations: overflow 2
+	test_cmp expected observed
 
-expecting success of 5328.5 'single commit with generation data exceeding UINT32_MAX': 
-	git init repo-uint32-max &&
-	test_commit -C repo-uint32-max --date "@4294967297 +0000" 1 &&
-	git -C repo-uint32-max commit-graph write --reachable &&
-	graph_read_expect -C repo-uint32-max 1 "generation_data" &&
-	git -C repo-uint32-max commit-graph verify
+f8dba5b5a8cb3bf6f89b1b7a911fa01dfdb554ba
+ok 2 - verify blob count in normal packfile
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5328-commit-graph-64bit-time/repo-uint32-max/.git/
-[master (root-commit) e3a555c] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-ok 5 - single commit with generation data exceeding UINT32_MAX
+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 5328.6 'reader notices out-of-bounds generation overflow': 
-	graph=.git/objects/info/commit-graph &&
-	test_when_finished "rm -rf $graph" &&
-	git commit-graph write --reachable &&
-	corrupt_chunk_file $graph GDO2 clear &&
-	test_must_fail git log 2>err &&
-	grep "commit-graph overflow generation data is too small" err
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
 
-fatal: commit-graph overflow generation data is too small
-ok 6 - reader notices out-of-bounds generation overflow
+74f9b05b95a30d347d8fdd7d07c62dd3cb5bc506
+ok 3 - verify blob:none packfile has no blobs
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5330-no-lazy-fetch-with-commit-graph.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/.git/
-expecting success of 5330.1 'setup: prepare a repository with a commit': 
-	git init with-commit &&
-	test_commit -C with-commit the-commit &&
-	oid=$(git -C with-commit rev-parse HEAD)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/with-commit/.git/
-[master (root-commit) 2bd0846] the-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 the-commit.t
-ok 1 - setup: prepare a repository with a commit
+ok 4 - verify blob:none packfile without --stdout
 
-expecting success of 5330.2 'setup: prepare a repository with commit-graph contains the commit': 
-	git init with-commit-graph &&
-	echo "$(pwd)/with-commit/.git/objects" \
-		>with-commit-graph/.git/objects/info/alternates &&
-	# create a ref that points to the commit in alternates
-	git -C with-commit-graph update-ref refs/ref_to_the_commit "$oid" &&
-	# prepare some other objects to commit-graph
-	test_commit -C with-commit-graph something &&
-	git -c gc.writeCommitGraph=true -C with-commit-graph gc &&
-	test_path_is_file with-commit-graph/.git/objects/info/commit-graph
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/with-commit-graph/.git/
-[master (root-commit) fe60e0e] something
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 something.t
-ok 2 - setup: prepare a repository with commit-graph contains the commit
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 5330.3 'setup: change the alternates to what without the commit': 
-	git init --bare without-commit &&
-	git -C with-commit-graph cat-file -e $oid &&
-	echo "$(pwd)/without-commit/objects" \
-		>with-commit-graph/.git/objects/info/alternates &&
-	test_must_fail git -C with-commit-graph cat-file -e $oid
+	test_cmp expected observed
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/without-commit/
-ok 3 - setup: change the alternates to what without the commit
+ok 5 - verify normal and blob:none packfiles have same commits/trees
 
-expecting success of 5330.4 'fetch any commit from promisor with the usage of the commit graph': 
-	# setup promisor and prepare any commit to fetch
-	git -C with-commit-graph remote add origin "$(pwd)/with-commit" &&
-	git -C with-commit-graph config remote.origin.promisor true &&
-	git -C with-commit-graph config remote.origin.partialclonefilter blob:none &&
-	test_commit -C with-commit any-commit &&
-	anycommit=$(git -C with-commit rev-parse HEAD) &&
-	test_must_fail env GIT_TRACE="$(pwd)/trace.txt" \
-		git -C with-commit-graph fetch origin $anycommit 2>err &&
-	test_grep ! "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
-	grep "git fetch origin" trace.txt >actual &&
-	test_line_count = 1 actual
+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
 
-[master ba19607] any-commit
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 any-commit.t
-ok 4 - fetch any commit from promisor with the usage of the commit graph
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5331-pack-objects-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/.git/
-expecting success of 5331.1 'setup for --stdin-packs tests': 
-	git init stdin-packs &&
-	(
-		cd stdin-packs &&
-
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
-
-		for id in A B C
-		do
-			git pack-objects .git/objects/pack/pack-$id \
-				--incremental --revs <<-EOF || exit 1
-			refs/tags/$id
-			EOF
-		done &&
+ create mode 100644 foo
+fatal: bad tree object 205f6b799e7d5c2524468ca006a0131aa57ecce7
+ok 6 - get an error for missing tree object
 
-		ls -la .git/objects/pack
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/stdin-packs/.git/
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
+[main 4b273c5] subtree
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-794781495799da912f5473db27abed9641406f96
-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
-total 36
-drwxr-xr-x  2 pbuilder1 pbuilder1  220 Feb  9 06:54 .
-drwxr-xr-x 13 pbuilder1 pbuilder1  260 Feb  9 06:54 ..
--r--r--r--  1 pbuilder1 pbuilder1 1156 Feb  9 06:54 pack-A-794781495799da912f5473db27abed9641406f96.idx
--r--r--r--  1 pbuilder1 pbuilder1  210 Feb  9 06:54 pack-A-794781495799da912f5473db27abed9641406f96.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Feb  9 06:54 pack-A-794781495799da912f5473db27abed9641406f96.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Feb  9 06:54 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
--r--r--r--  1 pbuilder1 pbuilder1  267 Feb  9 06:54 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Feb  9 06:54 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Feb  9 06:54 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
--r--r--r--  1 pbuilder1 pbuilder1  292 Feb  9 06:54 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Feb  9 06:54 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
-ok 1 - setup for --stdin-packs tests
-
-expecting success of 5331.2 '--stdin-packs with excluded packs': 
-	(
-		cd stdin-packs &&
+ create mode 100644 subtree/file
+ok 7 - setup for tests of tree:0
 
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+expecting success of 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
 
-		git pack-objects test --stdin-packs <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		EOF
+a6f7596938aae585d3cefef3aa3c06c5b75da36b
+ok 8 - verify tree:0 packfile has no blobs or trees
 
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx)
-		) >expect.raw &&
-		git show-index <$(ls test-*.idx) >actual.raw &&
+expecting success of 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
 
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
+2abcb6db3990fe53c59fd41f9590643ae34427f0
+ok 9 - grab tree directly when using tree:0
 
-d79f0a91fe88b889c156c95980949119173ad813
-ok 2 - --stdin-packs with excluded packs
+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
 
-expecting success of 5331.3 '--stdin-packs is incompatible with --filter': 
-	(
-		cd stdin-packs &&
-		test_must_fail git pack-objects --stdin-packs --stdout \
-			--filter=blob:none </dev/null 2>err &&
-		test_grep "cannot use --filter with --stdin-packs" err
-	)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-fatal: cannot use --filter with --stdin-packs
-ok 3 - --stdin-packs is incompatible with --filter
+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 &&
 
-expecting success of 5331.4 '--stdin-packs is incompatible with --revs': 
-	(
-		cd stdin-packs &&
-		test_must_fail git pack-objects --stdin-packs --revs out \
-			</dev/null 2>err &&
-		test_grep "cannot use internal rev list with --stdin-packs" err
-	)
+	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../all.pack &&
 
-fatal: cannot use internal rev list with --stdin-packs
-ok 4 - --stdin-packs is incompatible with --revs
+	git -C r2 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 5331.5 '--stdin-packs with loose objects': 
-	(
-		cd stdin-packs &&
+	test_cmp expected observed
 
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 11 - verify blob count in normal packfile
 
-		test_commit D && # loose
+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 pack-objects test2 --stdin-packs --unpacked <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		EOF
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
 
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
-			git rev-list --objects --no-object-names \
-				refs/tags/C..refs/tags/D
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 12 - verify blob:limit=500 omits all blobs
 
-		) >expect.raw &&
-		ls -la . &&
-		git show-index <$(ls test2-*.idx) >actual.raw &&
+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 &&
 
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
 
-[main 71a49b9] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
-total 60
-drwxr-xr-x 3 pbuilder1 pbuilder1  360 Feb  9 06:54 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Feb  9 06:54 ..
-drwxr-xr-x 7 pbuilder1 pbuilder1  240 Feb  9 06:54 .git
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Feb  9 06:54 A.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Feb  9 06:54 B.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Feb  9 06:54 C.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Feb  9 06:54 D.t
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Feb  9 06:54 actual
--rw-r--r-- 1 pbuilder1 pbuilder1  335 Feb  9 06:54 actual.raw
--rw-r--r-- 1 pbuilder1 pbuilder1   55 Feb  9 06:54 err
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Feb  9 06:54 expect
--rw-r--r-- 1 pbuilder1 pbuilder1  457 Feb  9 06:54 expect.raw
--r--r--r-- 1 pbuilder1 pbuilder1 1240 Feb  9 06:54 test-d79f0a91fe88b889c156c95980949119173ad813.idx
--r--r--r-- 1 pbuilder1 pbuilder1  470 Feb  9 06:54 test-d79f0a91fe88b889c156c95980949119173ad813.pack
--r--r--r-- 1 pbuilder1 pbuilder1   76 Feb  9 06:54 test-d79f0a91fe88b889c156c95980949119173ad813.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Feb  9 06:54 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
--r--r--r-- 1 pbuilder1 pbuilder1  693 Feb  9 06:54 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Feb  9 06:54 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
-ok 5 - --stdin-packs with loose objects
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 13 - verify blob:limit=1000
 
-expecting success of 5331.6 '--stdin-packs with broken links': 
-	(
-		cd stdin-packs &&
+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 &&
 
-		# make an unreachable object with a bogus parent
-		git cat-file -p HEAD >commit &&
-		sed "s/$(git rev-parse HEAD^)/$(test_oid zero)/" <commit |
-		git hash-object -w -t commit --stdin >in &&
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
 
-		git pack-objects .git/objects/pack/pack-D <in &&
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
-		PACK_D="$(basename .git/objects/pack/pack-D-*.pack)" &&
+	test_cmp expected observed
 
-		git pack-objects test3 --stdin-packs --unpacked <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		$PACK_D
-		EOF
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 14 - verify blob:limit=1001
 
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-D-*.idx) &&
-			git rev-list --objects --no-object-names \
-				refs/tags/C..refs/tags/D
-		) >expect.raw &&
-		git show-index <$(ls test3-*.idx) >actual.raw &&
+expecting success of 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 &&
 
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
 
-1c529235d2f84e54e1f186c4d2b6c65a26299d38
-ff80c980d491fa53537f36ea3206e7a9c12cf89b
-ok 6 - --stdin-packs with broken links
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 5331.7 'pack-objects --stdin with duplicate packfile': 
-	test_when_finished "rm -fr repo" &&
+	test_cmp expected observed
 
-	git init repo &&
-	(
-		cd repo &&
-		test_commit "commit" &&
-		git repack -ad &&
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 15 - verify blob:limit=10001
 
-		{
-			basename .git/objects/pack/pack-*.pack &&
-			basename .git/objects/pack/pack-*.pack
-		} >packfiles &&
+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 pack-objects --stdin-packs generated-pack <packfiles &&
-		packed_objects .git/objects/pack/pack-*.idx >expect &&
-		packed_objects generated-pack-*.idx >actual &&
-		test_cmp expect actual
-	)
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/repo/.git/
-[main (root-commit) 499d3ae] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-bb8f6d9d0f08840ee5644ac2998ee938e9ca5b57
-ok 7 - pack-objects --stdin with duplicate packfile
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 5331.8 'pack-objects --stdin with same packfile excluded and included': 
-	test_when_finished "rm -fr repo" &&
+	test_cmp expected observed
 
-	git init repo &&
-	(
-		cd repo &&
-		test_commit "commit" &&
-		git repack -ad &&
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 16 - verify blob:limit=1k
 
-		{
-			basename .git/objects/pack/pack-*.pack &&
-			printf "^%s\n" "$(basename .git/objects/pack/pack-*.pack)"
-		} >packfiles &&
+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 &&
 
-		git pack-objects --stdin-packs generated-pack <packfiles &&
-		packed_objects generated-pack-*.idx >packed-objects &&
-		test_must_be_empty packed-objects
-	)
+	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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/repo/.git/
-[main (root-commit) 499d3ae] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-ok 8 - pack-objects --stdin with same packfile excluded and included
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 5331.9 'pack-objects --stdin with packfiles from alternate object database': 
-	test_when_finished "rm -fr shared member" &&
+	test_cmp expected observed
 
-	# Set up a shared repository with a single packfile.
-	git init shared &&
-	test_commit -C shared "shared-objects" &&
-	git -C shared repack -ad &&
-	basename shared/.git/objects/pack/pack-*.pack >packfile &&
+caafb8a9cc92845f6f65afdea7e6fac6add3e5df
+ok 17 - verify explicitly specifying oversized blob in input
 
-	# Set up a repository that is connected to the shared repository. This
-	# repository has no objects on its own, but we still expect to be able
-	# to pack objects from its alternate.
-	git clone --shared shared member &&
-	git -C member pack-objects --stdin-packs generated-pack <packfile &&
-	test_cmp shared/.git/objects/pack/pack-*.pack member/generated-pack-*.pack
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/shared/.git/
-[main (root-commit) 145e1e6] shared-objects
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-objects.t
-Cloning into 'member'...
-done.
-33d7aff4e675ff5bc1d48bcdab29cb013e53965b
-ok 9 - pack-objects --stdin with packfiles from alternate object database
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
 
-expecting success of 5331.10 'pack-objects --stdin with packfiles from main and alternate object database': 
-	test_when_finished "rm -fr shared member" &&
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-	# Set up a shared repository with a single packfile.
-	git init shared &&
-	test_commit -C shared "shared-commit" &&
-	git -C shared repack -ad &&
+	test_cmp expected observed
 
-	# Set up a repository that is connected to the shared repository. This
-	# repository has a second packfile so that we can verify that it is
-	# possible to write packs that include packfiles from different object
-	# databases.
-	git clone --shared shared member &&
-	test_commit -C member "local-commit" &&
-	git -C member repack -dl &&
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 18 - verify blob:limit=1m
 
-	{
-		basename shared/.git/objects/pack/pack-*.pack &&
-		basename member/.git/objects/pack/pack-*.pack
-	} >packfiles &&
+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 &&
 
-	{
-		packed_objects shared/.git/objects/pack/pack-*.idx &&
-		packed_objects member/.git/objects/pack/pack-*.idx
-	} | sort >expected-objects &&
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-	git -C member pack-objects --stdin-packs generated-pack <packfiles &&
-	packed_objects member/generated-pack-*.idx >actual-objects &&
-	test_cmp expected-objects actual-objects
+	test_cmp expected observed
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/shared/.git/
-[main (root-commit) 4c151b8] shared-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-commit.t
-Cloning into 'member'...
-done.
-[main 7c14a26] local-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 local-commit.t
-d3e539037cb74e50eb4452759efc2fac0ae5e17a
-ok 10 - pack-objects --stdin with packfiles from main and alternate object database
+ok 19 - verify normal and blob:limit packfiles have same commits/trees
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t4216-log-bloom.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/.git/
-expecting success of 4216.1 'setup test - repo, commits, commit graph, log outputs': 
-	git init &&
-	mkdir A A/B A/B/C &&
-	test_commit c1 A/file1 &&
-	test_commit c2 A/B/file2 &&
-	test_commit c3 A/B/C/file3 &&
-	test_commit c4 A/file1 &&
-	test_commit c5 A/B/file2 &&
-	test_commit c6 A/B/C/file3 &&
-	test_commit c7 A/file1 &&
-	test_commit c8 A/B/file2 &&
-	test_commit c9 A/B/C/file3 &&
-	test_commit c10 file_to_be_deleted &&
-	git checkout -b side HEAD~4 &&
-	test_commit side-1 file4 &&
-	git checkout main &&
-	git merge side &&
-	test_commit c11 file5 &&
-	mv file5 file5_renamed &&
-	git add file5_renamed &&
-	git commit -m "rename" &&
-	rm file_to_be_deleted &&
-	git add . &&
-	git commit -m "file removed" &&
-	git commit --allow-empty -m "empty" &&
-	git commit-graph write --reachable --changed-paths &&
+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 &&
 
-	test_oid_cache <<-EOF
-	oid_version sha1:1
-	oid_version sha256:2
+	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 &&
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/.git/
-[main (root-commit) 3395ca5] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A/file1
-[main 017bcd5] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A/B/file2
-[main eaf8b6e] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A/B/C/file3
-[main 1ed2983] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b65cb8b] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f699e23] c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main a1ed958] c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 8dd186e] c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9cac964] c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9b20140] c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file_to_be_deleted
-Switched to a new branch 'side'
-[side 0a9648a] side-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- file4 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[main cee5e20] c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5
-[main a6f579e] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5_renamed
-[main e48c09d] file removed
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 file5
- delete mode 100644 file_to_be_deleted
-[main cb7b1a0] empty
- Author: A U Thor <author@example.com>
-ok 1 - setup test - repo, commits, commit graph, log outputs
-
-expecting success of 4216.2 'commit-graph write wrote out the bloom chunks': 
-	graph_read_expect 16
-
-ok 2 - commit-graph write wrote out the bloom chunks
-
-expecting success of 4216.3 'git log option:  for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 3 - git log option:  for path: A
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 4216.4 'git log option: --all for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 4 - git log option: --all for path: A
+	test_cmp expected observed
 
-expecting success of 4216.5 'git log option: --full-history for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 5 - git log option: --full-history for path: A
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 20 - verify small limit and big limit results in small limit
 
-expecting success of 4216.6 'git log option: --full-history --simplify-merges for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 6 - git log option: --full-history --simplify-merges for path: A
+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 &&
 
-expecting success of 4216.7 'git log option: --simplify-merges for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 7 - git log option: --simplify-merges for path: A
+	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 &&
 
-expecting success of 4216.8 'git log option: --simplify-by-decoration for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 8 - git log option: --simplify-by-decoration for path: A
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 4216.9 'git log option: --follow for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 9 - git log option: --follow for path: A
+	test_cmp expected observed
 
-expecting success of 4216.10 'git log option: --first-parent for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 10 - git log option: --first-parent for path: A
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 21 - verify big limit and small limit results in small limit
 
-expecting success of 4216.11 'git log option: --topo-order for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 11 - git log option: --topo-order for path: A
+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
 
-expecting success of 4216.12 'git log option: --date-order for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 12 - git log option: --date-order for path: A
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 4216.13 'git log option: --author-date-order for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 13 - git log option: --author-date-order for path: A
+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 &&
 
-expecting success of 4216.14 'git log option: --ancestry-path side..main for path: A': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 14 - git log option: --ancestry-path side..main for path: A
+	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r3 index-pack ../all.pack &&
 
-expecting success of 4216.15 'git log option:  for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 15 - git log option:  for path: A/B
+	git -C r3 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 4216.16 'git log option: --all for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 16 - git log option: --all for path: A/B
+	test_cmp expected observed
 
-expecting success of 4216.17 'git log option: --full-history for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 17 - git log option: --full-history for path: A/B
+c032f005b6a497478f1daa2fb324aa5c51224039
+ok 23 - verify blob count in normal packfile
 
-expecting success of 4216.18 'git log option: --full-history --simplify-merges for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 18 - git log option: --full-history --simplify-merges for path: A/B
+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
 
-expecting success of 4216.19 'git log option: --simplify-merges for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 19 - git log option: --simplify-merges for path: A/B
+fatal: sparse:path filters support has been dropped
+ok 24 - verify sparse:path=pattern1 fails
 
-expecting success of 4216.20 'git log option: --simplify-by-decoration for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 20 - git log option: --simplify-by-decoration for path: A/B
+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
 
-expecting success of 4216.21 'git log option: --follow for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 21 - git log option: --follow for path: A/B
+fatal: sparse:path filters support has been dropped
+ok 25 - verify sparse:path=pattern2 fails
 
-expecting success of 4216.22 'git log option: --first-parent for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 22 - git log option: --first-parent for path: A/B
+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"
 
-expecting success of 4216.23 'git log option: --topo-order for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 23 - git log option: --topo-order for path: A/B
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 4216.24 'git log option: --date-order for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 24 - git log option: --date-order for path: A/B
+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 &&
 
-expecting success of 4216.25 'git log option: --author-date-order for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 25 - git log option: --author-date-order for path: A/B
+	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../all.pack &&
 
-expecting success of 4216.26 'git log option: --ancestry-path side..main for path: A/B': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 26 - git log option: --ancestry-path side..main for path: A/B
+	git -C r4 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 4216.27 'git log option:  for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 27 - git log option:  for path: A/B/C
+	test_cmp expected observed
 
-expecting success of 4216.28 'git log option: --all for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 28 - git log option: --all for path: A/B/C
+1eda0c5015c4170144f9c7ac96c56690163e1d85
+ok 27 - verify blob count in normal packfile
 
-expecting success of 4216.29 'git log option: --full-history for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 29 - git log option: --full-history for path: A/B/C
+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 &&
 
-expecting success of 4216.30 'git log option: --full-history --simplify-merges for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 30 - git log option: --full-history --simplify-merges for path: A/B/C
+	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 &&
 
-expecting success of 4216.31 'git log option: --simplify-merges for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 31 - git log option: --simplify-merges for path: A/B/C
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 4216.32 'git log option: --simplify-by-decoration for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 32 - git log option: --simplify-by-decoration for path: A/B/C
+	test_cmp expected observed
 
-expecting success of 4216.33 'git log option: --follow for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 33 - git log option: --follow for path: A/B/C
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 28 - verify sparse:oid=OID
 
-expecting success of 4216.34 'git log option: --first-parent for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 34 - git log option: --first-parent for path: A/B/C
+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 &&
 
-expecting success of 4216.35 'git log option: --topo-order for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 35 - git log option: --topo-order for path: A/B/C
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../filter.pack &&
 
-expecting success of 4216.36 'git log option: --date-order for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 36 - git log option: --date-order for path: A/B/C
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-expecting success of 4216.37 'git log option: --author-date-order for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 37 - git log option: --author-date-order for path: A/B/C
+	test_cmp expected observed
 
-expecting success of 4216.38 'git log option: --ancestry-path side..main for path: A/B/C': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 38 - git log option: --ancestry-path side..main for path: A/B/C
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 29 - verify sparse:oid=oid-ish
 
-expecting success of 4216.39 'git log option:  for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 39 - git log option:  for path: A/file1
+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 &&
 
-expecting success of 4216.40 'git log option: --all for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 40 - git log option: --all for path: A/file1
+	for id in `sed "s|..|&/|" expected`
+	do
+		rm r1/.git/objects/$id || return 1
+	done
 
-expecting success of 4216.41 'git log option: --full-history for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 41 - git log option: --full-history for path: A/file1
+ok 30 - setup r1 - delete loose blobs
 
-expecting success of 4216.42 'git log option: --full-history --simplify-merges for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 42 - git log option: --full-history --simplify-merges for path: A/file1
+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
 
-expecting success of 4216.43 'git log option: --simplify-merges for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 43 - git log option: --simplify-merges for path: A/file1
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 31 - verify pack-objects fails w/ missing objects
 
-expecting success of 4216.44 'git log option: --simplify-by-decoration for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 44 - git log option: --simplify-by-decoration for path: A/file1
+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
 
-expecting success of 4216.45 'git log option: --follow for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 45 - git log option: --follow for path: A/file1
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 32 - verify pack-objects fails w/ --missing=error
 
-expecting success of 4216.46 'git log option: --first-parent for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 46 - git log option: --first-parent for path: A/file1
+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
 
-expecting success of 4216.47 'git log option: --topo-order for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 47 - git log option: --topo-order for path: A/file1
+ok 33 - verify pack-objects w/ --missing=allow-any
 
-expecting success of 4216.48 'git log option: --date-order for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 48 - git log option: --date-order for path: A/file1
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5323-pack-redundant.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 4216.49 'git log option: --author-date-order for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 49 - git log option: --author-date-order for path: A/file1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5323-pack-redundant/main.git/
+ok 1 - setup main repo
 
-expecting success of 4216.50 'git log option: --ancestry-path side..main for path: A/file1': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 50 - git log option: --ancestry-path side..main for path: A/file1
+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 4216.51 'git log option:  for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 51 - git log option:  for path: A/B/file2
+ok 2 - main: pack-redundant works with no packfile
 
-expecting success of 4216.52 'git log option: --all for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 52 - git log option: --all for path: A/B/file2
+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 4216.53 'git log option: --full-history for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 53 - git log option: --full-history for path: A/B/file2
+ok 3 - main: pack-redundant works with one packfile
 
-expecting success of 4216.54 'git log option: --full-history --simplify-merges for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 54 - git log option: --full-history --simplify-merges for path: A/B/file2
+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 4216.55 'git log option: --simplify-merges for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 55 - git log option: --simplify-merges for path: A/B/file2
+ok 4 - main: no redundant for pack 1, 2, 3
 
-expecting success of 4216.56 'git log option: --simplify-by-decoration for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 56 - git log option: --simplify-by-decoration for path: A/B/file2
+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 4216.57 'git log option: --follow for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 57 - git log option: --follow for path: A/B/file2
+ok 5 - main: one of pack-2/pack-3 is redundant
 
-expecting success of 4216.58 'git log option: --first-parent for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 58 - git log option: --first-parent for path: A/B/file2
+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 4216.59 'git log option: --topo-order for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 59 - git log option: --topo-order for path: A/B/file2
+ok 6 - main: pack 2, 4, and 6 are redundant
 
-expecting success of 4216.60 'git log option: --date-order for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 60 - git log option: --date-order for path: A/B/file2
+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 4216.61 'git log option: --author-date-order for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 61 - git log option: --author-date-order for path: A/B/file2
+ok 7 - main: pack-8 (subset of pack-1) is also redundant
 
-expecting success of 4216.62 'git log option: --ancestry-path side..main for path: A/B/file2': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 62 - git log option: --ancestry-path side..main for path: A/B/file2
+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 4216.63 'git log option:  for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 63 - git log option:  for path: A/B/C/file3
+ok 8 - main: clean loose objects
 
-expecting success of 4216.64 'git log option: --all for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 64 - git log option: --all for path: A/B/C/file3
+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 4216.65 'git log option: --full-history for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 65 - git log option: --full-history for path: A/B/C/file3
+notice: HEAD points to an unborn branch (master)
+ok 9 - main: remove redundant packs and pass fsck
 
-expecting success of 4216.66 'git log option: --full-history --simplify-merges for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 66 - git log option: --full-history --simplify-merges for path: A/B/C/file3
+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 4216.67 'git log option: --simplify-merges for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 67 - git log option: --simplify-merges for path: A/B/C/file3
+Cloning into bare repository 'shared.git'...
+done.
+ok 10 - setup shared.git
 
-expecting success of 4216.68 'git log option: --simplify-by-decoration for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 68 - git log option: --simplify-by-decoration for path: A/B/C/file3
+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 4216.69 'git log option: --follow for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 69 - git log option: --follow for path: A/B/C/file3
+ok 11 - shared: all packs are redundant, but no output without --alt-odb
 
-expecting success of 4216.70 'git log option: --first-parent for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 70 - git log option: --first-parent for path: A/B/C/file3
+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
+	)
 
-expecting success of 4216.71 'git log option: --topo-order for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 71 - git log option: --topo-order for path: A/B/C/file3
+ok 12 - shared: show redundant packs in stderr for verbose mode
 
-expecting success of 4216.72 'git log option: --date-order for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 72 - git log option: --date-order for path: A/B/C/file3
+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 4216.73 'git log option: --author-date-order for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 73 - git log option: --author-date-order for path: A/B/C/file3
+notice: HEAD points to an unborn branch (master)
+ok 13 - shared: remove redundant packs, no packs left
 
-expecting success of 4216.74 'git log option: --ancestry-path side..main for path: A/B/C/file3': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 74 - git log option: --ancestry-path side..main for path: A/B/C/file3
+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
 
-expecting success of 4216.75 'git log option:  for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 75 - git log option:  for path: file4
+ok 14 - shared: create new objects and packs
 
-expecting success of 4216.76 'git log option: --all for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 76 - git log option: --all for path: file4
+expecting success of 5323.15 'shared: no redundant without --alt-odb': 
+	(
+		cd "$shared_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
 
-expecting success of 4216.77 'git log option: --full-history for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 77 - git log option: --full-history for path: file4
+ok 15 - shared: no redundant without --alt-odb
 
-expecting success of 4216.78 'git log option: --full-history --simplify-merges for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 78 - git log option: --full-history --simplify-merges for path: file4
+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
+	)
 
-expecting success of 4216.79 'git log option: --simplify-merges for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 79 - git log option: --simplify-merges for path: file4
+ok 16 - shared: one pack is redundant with --alt-odb
 
-expecting success of 4216.80 'git log option: --simplify-by-decoration for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 80 - git log option: --simplify-by-decoration for path: file4
+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 4216.81 'git log option: --follow for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 81 - git log option: --follow for path: file4
+ok 17 - shared: ignore unique objects and all two packs are redundant
 
-expecting success of 4216.82 'git log option: --first-parent for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 82 - git log option: --first-parent for path: file4
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5325-reverse-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5325-reverse-index/.git/
+expecting success of 5325.1 'setup': 
+	test_commit base &&
 
-expecting success of 4216.83 'git log option: --topo-order for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 83 - git log option: --topo-order for path: file4
+	test_config pack.writeReverseIndex false &&
+	pack=$(git pack-objects --all $packdir/pack) &&
+	rev=$packdir/pack-$pack.rev &&
 
-expecting success of 4216.84 'git log option: --date-order for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 84 - git log option: --date-order for path: file4
+	test_path_is_missing $rev
 
-expecting success of 4216.85 'git log option: --author-date-order for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 85 - git log option: --author-date-order for path: file4
+[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 4216.86 'git log option: --ancestry-path side..main for path: file4': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 86 - git log option: --ancestry-path side..main for path: file4
+expecting success of 5325.2 'index-pack with pack.writeReverseIndex': 
+	test_index_pack "" &&
+	test_path_is_missing $rev &&
 
-expecting success of 4216.87 'git log option:  for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 87 - git log option:  for path: file5
+	test_index_pack false &&
+	test_path_is_missing $rev &&
 
-expecting success of 4216.88 'git log option: --all for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 88 - git log option: --all for path: file5
+	test_index_pack true &&
+	test_path_is_file $rev
 
-expecting success of 4216.89 'git log option: --full-history for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 89 - git log option: --full-history for path: file5
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+ok 2 - index-pack with pack.writeReverseIndex
 
-expecting success of 4216.90 'git log option: --full-history --simplify-merges for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 90 - git log option: --full-history --simplify-merges for path: file5
+expecting success of 5325.3 'index-pack with --[no-]rev-index': 
+	for conf in "" true false
+	do
+		test_index_pack "$conf" --rev-index &&
+		test_path_exists $rev &&
 
-expecting success of 4216.91 'git log option: --simplify-merges for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 91 - git log option: --simplify-merges for path: file5
+		test_index_pack "$conf" --no-rev-index &&
+		test_path_is_missing $rev || return 1
+	done
 
-expecting success of 4216.92 'git log option: --simplify-by-decoration for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 92 - git log option: --simplify-by-decoration for path: file5
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+ok 3 - index-pack with --[no-]rev-index
 
-expecting success of 4216.93 'git log option: --follow for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 93 - git log option: --follow for path: file5
+expecting success of 5325.4 'index-pack can verify reverse indexes': 
+	test_when_finished "rm -f $rev" &&
+	test_index_pack true &&
 
-expecting success of 4216.94 'git log option: --first-parent for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 94 - git log option: --first-parent for path: file5
+	test_path_is_file $rev &&
+	git index-pack --rev-index --verify $packdir/pack-$pack.pack &&
 
-expecting success of 4216.95 'git log option: --topo-order for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 95 - git log option: --topo-order for path: file5
+	# Intentionally corrupt the reverse index.
+	chmod u+w $rev &&
+	printf "xxxx" | dd of=$rev bs=1 count=4 conv=notrunc &&
 
-expecting success of 4216.96 'git log option: --date-order for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 96 - git log option: --date-order for path: file5
+	test_must_fail git index-pack --rev-index --verify \
+		$packdir/pack-$pack.pack 2>err &&
+	grep "validation error" err
 
-expecting success of 4216.97 'git log option: --author-date-order for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 97 - git log option: --author-date-order for path: file5
+68c6c8c8538900694c32380ac1484201c8b60d8d
+4+0 records in
+4+0 records out
+4 bytes copied, 3.36e-05 s, 119 kB/s
+fatal: sha1 file '.git/objects/pack/pack-68c6c8c8538900694c32380ac1484201c8b60d8d.rev' validation error
+ok 4 - index-pack can verify reverse indexes
 
-expecting success of 4216.98 'git log option: --ancestry-path side..main for path: file5': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 98 - git log option: --ancestry-path side..main for path: file5
+expecting success of 5325.5 'index-pack infers reverse index name with -o': 
+	git index-pack --rev-index -o other.idx $packdir/pack-$pack.pack &&
+	test_path_is_file other.idx &&
+	test_path_is_file other.rev
 
-expecting success of 4216.99 'git log option:  for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 99 - git log option:  for path: file5_renamed
+68c6c8c8538900694c32380ac1484201c8b60d8d
+ok 5 - index-pack infers reverse index name with -o
 
-expecting success of 4216.100 'git log option: --all for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 100 - git log option: --all for path: file5_renamed
+expecting success of 5325.6 'pack-objects respects pack.writeReverseIndex': 
+	test_when_finished "rm -fr pack-1-*" &&
 
-expecting success of 4216.101 'git log option: --full-history for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 101 - git log option: --full-history for path: file5_renamed
+	git -c pack.writeReverseIndex= pack-objects --all pack-1 &&
+	test_path_is_missing pack-1-*.rev &&
 
-expecting success of 4216.102 'git log option: --full-history --simplify-merges for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 102 - git log option: --full-history --simplify-merges for path: file5_renamed
+	git -c pack.writeReverseIndex=false pack-objects --all pack-1 &&
+	test_path_is_missing pack-1-*.rev &&
 
-expecting success of 4216.103 'git log option: --simplify-merges for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 103 - git log option: --simplify-merges for path: file5_renamed
+	git -c pack.writeReverseIndex=true pack-objects --all pack-1 &&
+	test_path_is_file pack-1-*.rev
 
-expecting success of 4216.104 'git log option: --simplify-by-decoration for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 104 - git log option: --simplify-by-decoration for path: file5_renamed
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+68c6c8c8538900694c32380ac1484201c8b60d8d
+ok 6 - pack-objects respects pack.writeReverseIndex
 
-expecting success of 4216.105 'git log option: --follow for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 105 - git log option: --follow for path: file5_renamed
+expecting success of 5325.7 'reverse index is not generated when available on disk': 
+	test_index_pack true &&
+	test_path_is_file $rev &&
 
-expecting success of 4216.106 'git log option: --first-parent for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 106 - git log option: --first-parent for path: file5_renamed
+	git rev-parse HEAD >tip &&
+	GIT_TEST_REV_INDEX_DIE_IN_MEMORY=1 git cat-file \
+		--batch-check="%(objectsize:disk)" <tip
 
-expecting success of 4216.107 'git log option: --topo-order for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 107 - git log option: --topo-order for path: file5_renamed
+68c6c8c8538900694c32380ac1484201c8b60d8d
+126
+ok 7 - reverse index is not generated when available on disk
 
-expecting success of 4216.108 'git log option: --date-order for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 108 - git log option: --date-order for path: file5_renamed
+expecting success of 5325.8 'reverse index is ignored when pack.readReverseIndex is false': 
+	test_index_pack true &&
+	test_path_is_file $rev &&
 
-expecting success of 4216.109 'git log option: --author-date-order for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 109 - git log option: --author-date-order for path: file5_renamed
+	test_config pack.readReverseIndex false &&
 
-expecting success of 4216.110 'git log option: --ancestry-path side..main for path: file5_renamed': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 110 - git log option: --ancestry-path side..main for path: file5_renamed
+	git rev-parse HEAD >tip &&
+	GIT_TEST_REV_INDEX_DIE_ON_DISK=1 git cat-file \
+		--batch-check="%(objectsize:disk)" <tip
 
-expecting success of 4216.111 'git log option:  for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 111 - git log option:  for path: file_to_be_deleted
+68c6c8c8538900694c32380ac1484201c8b60d8d
+126
+ok 8 - reverse index is ignored when pack.readReverseIndex is false
 
-expecting success of 4216.112 'git log option: --all for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 112 - git log option: --all for path: file_to_be_deleted
+expecting success of 5325.9 'revindex in-memory vs on-disk': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-expecting success of 4216.113 'git log option: --full-history for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 113 - git log option: --full-history for path: file_to_be_deleted
+		test_commit commit &&
 
-expecting success of 4216.114 'git log option: --full-history --simplify-merges for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 114 - git log option: --full-history --simplify-merges for path: file_to_be_deleted
+		git rev-list --objects --no-object-names --all >objects &&
 
-expecting success of 4216.115 'git log option: --simplify-merges for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 115 - git log option: --simplify-merges for path: file_to_be_deleted
+		git -c pack.writeReverseIndex=false repack -ad &&
+		test_path_is_missing $packdir/pack-*.rev &&
+		git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
+			<objects >in-core &&
 
-expecting success of 4216.116 'git log option: --simplify-by-decoration for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 116 - git log option: --simplify-by-decoration for path: file_to_be_deleted
+		git -c pack.writeReverseIndex=true repack -ad &&
+		test_path_is_file $packdir/pack-*.rev &&
+		git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
+			<objects >on-disk &&
 
-expecting success of 4216.117 'git log option: --follow for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 117 - git log option: --follow for path: file_to_be_deleted
+		test_cmp on-disk in-core
+	)
 
-expecting success of 4216.118 'git log option: --first-parent for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 118 - git log option: --first-parent for path: file_to_be_deleted
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5325-reverse-index/repo/.git/
+[master (root-commit) aa0ac59] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+ok 9 - revindex in-memory vs on-disk
 
-expecting success of 4216.119 'git log option: --topo-order for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 119 - git log option: --topo-order for path: file_to_be_deleted
+expecting success of 5325.10 'fsck succeeds on good rev-index': 
+	test_when_finished rm -fr repo &&
+	git init repo &&
+	(
+		cd repo &&
 
-expecting success of 4216.120 'git log option: --date-order for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 120 - git log option: --date-order for path: file_to_be_deleted
+		test_commit commit &&
+		git -c pack.writeReverseIndex=true repack -ad &&
+		git fsck 2>err &&
+		test_must_be_empty err
+	)
 
-expecting success of 4216.121 'git log option: --author-date-order for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 121 - git log option: --author-date-order for path: file_to_be_deleted
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5325-reverse-index/repo/.git/
+[master (root-commit) aa0ac59] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+ok 10 - fsck succeeds on good rev-index
 
-expecting success of 4216.122 'git log option: --ancestry-path side..main for path: file_to_be_deleted': 
-			test_bloom_filters_used "$option -- $path" &&
-			test_config commitgraph.readChangedPaths false &&
-			test_bloom_filters_not_used "$option -- $path"
-		
-ok 122 - git log option: --ancestry-path side..main for path: file_to_be_deleted
+expecting success of 5325.11 'set up rev-index corruption tests': 
+	git init corrupt &&
+	(
+		cd corrupt &&
 
-expecting success of 4216.123 'git log -- folder works with and without the trailing slash': 
-	test_bloom_filters_used "-- A" &&
-	test_bloom_filters_used "-- A/"
+		test_commit commit &&
+		git -c pack.writeReverseIndex=true repack -ad &&
 
-ok 123 - git log -- folder works with and without the trailing slash
+		revfile=$(ls .git/objects/pack/pack-*.rev) &&
+		chmod a+w $revfile &&
+		cp $revfile $revfile.bak
+	)
 
-expecting success of 4216.124 'git log for path that does not exist. ': 
-	test_bloom_filters_used "-- path_does_not_exist"
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5325-reverse-index/corrupt/.git/
+[master (root-commit) aa0ac59] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+ok 11 - set up rev-index corruption tests
 
-ok 124 - git log for path that does not exist. 
+expecting success of 5325.12 'fsck catches invalid checksum': 
+	revfile=$(ls corrupt/.git/objects/pack/pack-*.rev) &&
+	orig_size=$(wc -c <$revfile) &&
+	hashpos=$((orig_size - 10)) &&
+	corrupt_rev_and_verify $hashpos bogus \
+		"invalid checksum"
 
-expecting success of 4216.125 'git log with --walk-reflogs does not use Bloom filters': 
-	test_bloom_filters_not_used "--walk-reflogs -- A"
+5+0 records in
+5+0 records out
+5 bytes copied, 0.0100149 s, 0.5 kB/s
+error: invalid checksum
+ok 12 - fsck catches invalid checksum
 
-ok 125 - git log with --walk-reflogs does not use Bloom filters
+expecting success of 5325.13 'fsck catches invalid row position': 
+	corrupt_rev_and_verify 14 "\07" \
+		"invalid rev-index position"
 
-expecting success of 4216.126 'git log -- multiple path specs does not use Bloom filters': 
-	test_bloom_filters_not_used "-- file4 A/file1"
+1+0 records in
+1+0 records out
+1 byte copied, 0.00555836 s, 0.2 kB/s
+error: invalid rev-index position at 0: 1 != 1793
+ok 13 - fsck catches invalid row position
 
-ok 126 - git log -- multiple path specs does not use Bloom filters
+expecting success of 5325.14 'fsck catches invalid header: magic number': 
+	corrupt_rev_and_verify 1 "\07" \
+		"reverse-index file .* has unknown signature"
 
-expecting success of 4216.127 'git log -- "." pathspec at root does not use Bloom filters': 
-	test_bloom_filters_not_used "-- ."
+1+0 records in
+1+0 records out
+1 byte copied, 3.496e-05 s, 28.6 kB/s
+error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unknown signature
+ok 14 - fsck catches invalid header: magic number
 
-ok 127 - git log -- "." pathspec at root does not use Bloom filters
+expecting success of 5325.15 'fsck catches invalid header: version': 
+	corrupt_rev_and_verify 7 "\02" \
+		"reverse-index file .* has unsupported version"
 
-expecting success of 4216.128 'git log with wildcard that resolves to a single path uses Bloom filters': 
-	test_bloom_filters_used "-- *4" &&
-	test_bloom_filters_used "-- *renamed"
+1+0 records in
+1+0 records out
+1 byte copied, 3.852e-05 s, 26.0 kB/s
+error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported version 2
+ok 15 - fsck catches invalid header: version
 
-ok 128 - git log with wildcard that resolves to a single path uses Bloom filters
+expecting success of 5325.16 'fsck catches invalid header: hash function': 
+	corrupt_rev_and_verify 11 "\03" \
+		"reverse-index file .* has unsupported hash id"
 
-expecting success of 4216.129 'git log with wildcard that resolves to a multiple paths does not uses Bloom filters': 
-	test_bloom_filters_not_used "-- *" &&
-	test_bloom_filters_not_used "-- file*"
+1+0 records in
+1+0 records out
+1 byte copied, 3.772e-05 s, 26.5 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
 
-ok 129 - git log with wildcard that resolves to a multiple paths does not uses Bloom filters
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5328-commit-graph-64bit-time.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5328-commit-graph-64bit-time/.git/
+checking prerequisite: TIME_IS_64BIT
 
-expecting success of 4216.130 'setup - add commit-graph to the chain without Bloom filters': 
-	test_commit c14 A/anotherFile2 &&
-	test_commit c15 A/B/anotherFile2 &&
-	test_commit c16 A/B/C/anotherFile2 &&
-	git commit-graph write --reachable --split --no-changed-paths &&
-	test_line_count = 2 .git/objects/info/commit-graphs/commit-graph-chain
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
+)
+prerequisite TIME_IS_64BIT ok
+checking prerequisite: TIME_T_IS_64BIT
 
-[main c5e23fe] c14
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
+)
+prerequisite TIME_T_IS_64BIT ok
+expecting success of 5328.1 'lower layers have overflow chunk': 
+	rm -f .git/objects/info/commit-graph &&
+	test_commit --date "$FUTURE_DATE" future-1 &&
+	test_commit --date "$UNIX_EPOCH_ZERO" old-1 &&
+	git commit-graph write --reachable &&
+	test_commit --date "$FUTURE_DATE" future-2 &&
+	test_commit --date "$UNIX_EPOCH_ZERO" old-2 &&
+	git commit-graph write --reachable --split=no-merge &&
+	test_commit extra &&
+	git commit-graph write --reachable --split=no-merge &&
+	git commit-graph write --reachable &&
+	graph_read_expect 5 "generation_data generation_data_overflow" &&
+	mv .git/objects/info/commit-graph commit-graph-upgraded &&
+	git commit-graph write --reachable &&
+	graph_read_expect 5 "generation_data generation_data_overflow" &&
+	test_cmp .git/objects/info/commit-graph commit-graph-upgraded
+
+[master (root-commit) 6440ef3] future-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A/anotherFile2
-[main 46aa982] c15
+ create mode 100644 future-1.t
+[master 5660aa3] old-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A/B/anotherFile2
-[main 79a46f1] c16
+ create mode 100644 old-1.t
+[master d9a5240] future-2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A/B/C/anotherFile2
-ok 130 - setup - add commit-graph to the chain without Bloom filters
-
-expecting success of 4216.131 'use Bloom filters even if the latest graph does not have Bloom filters': 
-	# Ensure that the number of empty filters is equal to the number of
-	# filters in the latest graph layer to prove that they are loaded (and
-	# ignored).
-	test_bloom_filters_used "-- A/B" 3
+ create mode 100644 future-2.t
+[master 2c4f07c] old-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 old-2.t
+[master 29f070a] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+ok 1 - lower layers have overflow chunk
 
-ok 131 - use Bloom filters even if the latest graph does not have Bloom filters
+expecting success of 5328.2 'check normal git operations: overflow': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 2 - check normal git operations: overflow
 
-expecting success of 4216.132 'setup - add commit-graph to the chain with Bloom filters': 
-	test_commit c17 A/anotherFile3 &&
-	git commit-graph write --reachable --changed-paths --split &&
-	test_line_count = 3 .git/objects/info/commit-graphs/commit-graph-chain
+expecting success of 5328.3 'set up and verify repo with generation data overflow chunk': 
+	git init repo &&
+	(
+		cd repo &&
+		test_commit --date "$UNIX_EPOCH_ZERO" 1 &&
+		test_commit 2 &&
+		test_commit --date "$UNIX_EPOCH_ZERO" 3 &&
+		git commit-graph write --reachable &&
+		graph_read_expect 3 generation_data &&
+		test_commit --date "$FUTURE_DATE" 4 &&
+		test_commit 5 &&
+		test_commit --date "$UNIX_EPOCH_ZERO" 6 &&
+		git branch left &&
+		git reset --hard 3 &&
+		test_commit 7 &&
+		test_commit --date "$FUTURE_DATE" 8 &&
+		test_commit 9 &&
+		git branch right &&
+		git reset --hard 3 &&
+		test_merge M left right &&
+		git commit-graph write --reachable &&
+		graph_read_expect 10 "generation_data generation_data_overflow" &&
+		git commit-graph verify
+	)
 
-[main 38770ff] c17
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5328-commit-graph-64bit-time/repo/.git/
+[master (root-commit) 0131a52] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A/anotherFile3
-ok 132 - setup - add commit-graph to the chain with Bloom filters
+ create mode 100644 1.t
+[master f2c0e81] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master 6cae051] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master a8af5c7] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master f0797d2] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+[master 83bda2f] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+HEAD is now at 6cae051 3
+[master ae15ac2] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[master dcce859] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+[master 199098f] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9.t
+HEAD is now at 6cae051 3
+Fast-forwarding to: left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ 4.t | 1 +
+ 5.t | 1 +
+ 6.t | 1 +
+ 7.t | 1 +
+ 8.t | 1 +
+ 9.t | 1 +
+ 6 files changed, 6 insertions(+)
+ create mode 100644 4.t
+ create mode 100644 5.t
+ create mode 100644 6.t
+ create mode 100644 7.t
+ create mode 100644 8.t
+ create mode 100644 9.t
+ok 3 - set up and verify repo with generation data overflow chunk
 
-expecting success of 4216.133 'Use Bloom filters if they exist in the latest but not all commit graphs in the chain.': 
-	test_bloom_filters_used_when_some_filters_are_missing "-- A/B"
+expecting success of 5328.4 'check normal git operations: overflow 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 4 - check normal git operations: overflow 2
 
-ok 133 - Use Bloom filters if they exist in the latest but not all commit graphs in the chain.
+expecting success of 5328.5 'single commit with generation data exceeding UINT32_MAX': 
+	git init repo-uint32-max &&
+	test_commit -C repo-uint32-max --date "@4294967297 +0000" 1 &&
+	git -C repo-uint32-max commit-graph write --reachable &&
+	graph_read_expect -C repo-uint32-max 1 "generation_data" &&
+	git -C repo-uint32-max commit-graph verify
 
-expecting success of 4216.134 'persist filter settings': 
-	test_when_finished rm -rf .git/objects/info/commit-graph* &&
-	rm -rf .git/objects/info/commit-graph* &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=9 \
-		GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY=15 \
-		git commit-graph write --reachable --changed-paths &&
-	grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2-auto.txt" \
-		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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5328-commit-graph-64bit-time/repo-uint32-max/.git/
+[master (root-commit) e3a555c] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+ok 5 - single commit with generation data exceeding UINT32_MAX
 
-{"event":"data_json","sid":"20250209T065439.853435Z-Hcf858c9d-P001a1c74","thread":"main","time":"2025-02-09T06:54:39.857972Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.004742,"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":"20250209T065439.863335Z-Hcf858c9d-P001a1ca0","thread":"main","time":"2025-02-09T06:54:39.865886Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002754,"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 5328.6 'reader notices out-of-bounds generation overflow': 
+	graph=.git/objects/info/commit-graph &&
+	test_when_finished "rm -rf $graph" &&
+	git commit-graph write --reachable &&
+	corrupt_chunk_file $graph GDO2 clear &&
+	test_must_fail git log 2>err &&
+	grep "commit-graph overflow generation data is too small" err
 
-expecting success of 4216.135 'correctly report changes over limit': 
-	git init limits &&
-	(
-		cd limits &&
-		mkdir d &&
-		mkdir d/e &&
+fatal: commit-graph overflow generation data is too small
+ok 6 - reader notices out-of-bounds generation overflow
 
-		for i in $(test_seq 1 2)
-		do
-			printf $i >d/file$i.txt &&
-			printf $i >d/e/file$i.txt || return 1
-		done &&
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5330-no-lazy-fetch-with-commit-graph.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/.git/
+expecting success of 5330.1 'setup: prepare a repository with a commit': 
+	git init with-commit &&
+	test_commit -C with-commit the-commit &&
+	oid=$(git -C with-commit rev-parse HEAD)
 
-		mkdir mode &&
-		printf bash >mode/script.sh &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/with-commit/.git/
+[master (root-commit) 2bd0846] the-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 the-commit.t
+ok 1 - setup: prepare a repository with a commit
 
-		mkdir foo &&
-		touch foo/bar &&
-		touch foo.txt &&
+expecting success of 5330.2 'setup: prepare a repository with commit-graph contains the commit': 
+	git init with-commit-graph &&
+	echo "$(pwd)/with-commit/.git/objects" \
+		>with-commit-graph/.git/objects/info/alternates &&
+	# create a ref that points to the commit in alternates
+	git -C with-commit-graph update-ref refs/ref_to_the_commit "$oid" &&
+	# prepare some other objects to commit-graph
+	test_commit -C with-commit-graph something &&
+	git -c gc.writeCommitGraph=true -C with-commit-graph gc &&
+	test_path_is_file with-commit-graph/.git/objects/info/commit-graph
 
-		git add d foo foo.txt mode &&
-		git commit -m "files" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/with-commit-graph/.git/
+[master (root-commit) fe60e0e] something
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 something.t
+ok 2 - setup: prepare a repository with commit-graph contains the commit
 
-		# Commit has 7 file and 4 directory adds
-		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
-			GIT_TRACE2_EVENT="$(pwd)/trace" \
-			git commit-graph write --reachable --changed-paths &&
-		test_max_changed_paths 10 trace &&
-		test_filter_computed 1 trace &&
-		test_filter_trunc_large 1 trace &&
+expecting success of 5330.3 'setup: change the alternates to what without the commit': 
+	git init --bare without-commit &&
+	git -C with-commit-graph cat-file -e $oid &&
+	echo "$(pwd)/without-commit/objects" \
+		>with-commit-graph/.git/objects/info/alternates &&
+	test_must_fail git -C with-commit-graph cat-file -e $oid
 
-		for path in $(git ls-tree -r --name-only HEAD)
-		do
-			git -c commitGraph.readChangedPaths=false log \
-				-- $path >expect &&
-			git log -- $path >actual &&
-			test_cmp expect actual || return 1
-		done &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/without-commit/
+ok 3 - setup: change the alternates to what without the commit
 
-		# Make a variety of path changes
-		printf new1 >d/e/file1.txt &&
-		printf new2 >d/file2.txt &&
-		rm d/e/file2.txt &&
-		rm -r foo &&
-		printf text >foo &&
-		mkdir f &&
-		printf new1 >f/file1.txt &&
+expecting success of 5330.4 'fetch any commit from promisor with the usage of the commit graph': 
+	# setup promisor and prepare any commit to fetch
+	git -C with-commit-graph remote add origin "$(pwd)/with-commit" &&
+	git -C with-commit-graph config remote.origin.promisor true &&
+	git -C with-commit-graph config remote.origin.partialclonefilter blob:none &&
+	test_commit -C with-commit any-commit &&
+	anycommit=$(git -C with-commit rev-parse HEAD) &&
+	test_must_fail env GIT_TRACE="$(pwd)/trace.txt" \
+		git -C with-commit-graph fetch origin $anycommit 2>err &&
+	test_grep ! "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
+	grep "git fetch origin" trace.txt >actual &&
+	test_line_count = 1 actual
 
-		# including a mode-only change (counts as modified)
-		git update-index --chmod=+x mode/script.sh &&
+[master ba19607] any-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 any-commit.t
+ok 4 - fetch any commit from promisor with the usage of the commit graph
 
-		git add foo d f &&
-		git commit -m "complicated" &&
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5331-pack-objects-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/.git/
+expecting success of 5331.1 'setup for --stdin-packs tests': 
+	git init stdin-packs &&
+	(
+		cd stdin-packs &&
 
-		# start from scratch and rebuild
-		rm -f .git/objects/info/commit-graph &&
-		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
-			GIT_TRACE2_EVENT="$(pwd)/trace-edit" \
-			git commit-graph write --reachable --changed-paths &&
-		test_max_changed_paths 10 trace-edit &&
-		test_filter_computed 2 trace-edit &&
-		test_filter_trunc_large 2 trace-edit &&
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
 
-		for path in $(git ls-tree -r --name-only HEAD)
+		for id in A B C
 		do
-			git -c commitGraph.readChangedPaths=false log \
-				-- $path >expect &&
-			git log -- $path >actual &&
-			test_cmp expect actual || return 1
+			git pack-objects .git/objects/pack/pack-$id \
+				--incremental --revs <<-EOF || exit 1
+			refs/tags/$id
+			EOF
 		done &&
 
-		# start from scratch and rebuild
-		rm -f .git/objects/info/commit-graph &&
-		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=11 \
-			GIT_TRACE2_EVENT="$(pwd)/trace-update" \
-			git commit-graph write --reachable --changed-paths &&
-		test_max_changed_paths 11 trace-update &&
-		test_filter_computed 2 trace-update &&
-		test_filter_trunc_large 0 trace-update &&
-
-		for path in $(git ls-tree -r --name-only HEAD)
-		do
-			git -c commitGraph.readChangedPaths=false log \
-				-- $path >expect &&
-			git log -- $path >actual &&
-			test_cmp expect actual || return 1
-		done
+		ls -la .git/objects/pack
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/limits/.git/
-[main (root-commit) cd6b1a6] files
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/stdin-packs/.git/
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
- 7 files changed, 5 insertions(+)
- create mode 100644 d/e/file1.txt
- create mode 100644 d/e/file2.txt
- create mode 100644 d/file1.txt
- create mode 100644 d/file2.txt
- create mode 100644 foo.txt
- create mode 100644 foo/bar
- create mode 100644 mode/script.sh
-{"event":"data_json","sid":"20250209T065439.903275Z-Hcf858c9d-P001a1d5c","thread":"main","time":"2025-02-09T06:54:39.905052Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.001988,"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":"20250209T065439.903275Z-Hcf858c9d-P001a1d5c","thread":"main","time":"2025-02-09T06:54:39.904903Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001835,"t_rel":0.001835,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250209T065439.903275Z-Hcf858c9d-P001a1d5c","thread":"main","time":"2025-02-09T06:54:39.904932Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001869,"t_rel":0.001869,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"1"}
-[main 323b1c6] complicated
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
  Author: A U Thor <author@example.com>
- 7 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 d/e/file2.txt
- create mode 100644 f/file1.txt
- create mode 100644 foo
- delete mode 100644 foo/bar
- mode change 100644 => 100755 mode/script.sh
-{"event":"data_json","sid":"20250209T065440.004586Z-Hcf858c9d-P001a1f2f","thread":"main","time":"2025-02-09T06:54:40.006690Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002290,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
-{"event":"data","sid":"20250209T065440.004586Z-Hcf858c9d-P001a1f2f","thread":"main","time":"2025-02-09T06:54:40.006528Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.002123,"t_rel":0.002123,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250209T065440.004586Z-Hcf858c9d-P001a1f2f","thread":"main","time":"2025-02-09T06:54:40.006562Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.002162,"t_rel":0.002162,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
-{"event":"data_json","sid":"20250209T065440.101756Z-Hcf858c9d-P001a2127","thread":"main","time":"2025-02-09T06:54:40.103793Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002237,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":11}}
-{"event":"data","sid":"20250209T065440.101756Z-Hcf858c9d-P001a2127","thread":"main","time":"2025-02-09T06:54:40.103631Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.002070,"t_rel":0.002070,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250209T065440.101756Z-Hcf858c9d-P001a2127","thread":"main","time":"2025-02-09T06:54:40.103660Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.002104,"t_rel":0.002104,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-ok 135 - correctly report changes over limit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+794781495799da912f5473db27abed9641406f96
+3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
+c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
+total 36
+drwxr-xr-x  2 pbuilder2 pbuilder2  220 Mar 14 13:32 .
+drwxr-xr-x 13 pbuilder2 pbuilder2  260 Mar 14 13:32 ..
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Mar 14 13:32 pack-A-794781495799da912f5473db27abed9641406f96.idx
+-r--r--r--  1 pbuilder2 pbuilder2  210 Mar 14 13:32 pack-A-794781495799da912f5473db27abed9641406f96.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Mar 14 13:32 pack-A-794781495799da912f5473db27abed9641406f96.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Mar 14 13:32 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
+-r--r--r--  1 pbuilder2 pbuilder2  267 Mar 14 13:32 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Mar 14 13:32 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Mar 14 13:32 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
+-r--r--r--  1 pbuilder2 pbuilder2  292 Mar 14 13:32 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Mar 14 13:32 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
+ok 1 - setup for --stdin-packs tests
 
-expecting success of 4216.136 'correctly report commits with no changed paths': 
-	git init empty &&
-	test_when_finished "rm -fr empty" &&
+expecting success of 5331.2 '--stdin-packs with excluded packs': 
 	(
-		cd empty &&
+		cd stdin-packs &&
 
-		git commit --allow-empty -m "initial commit" &&
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
 
-		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-			git commit-graph write --reachable --changed-paths &&
-		test_filter_computed 1 trace.event &&
-		test_filter_not_computed 0 trace.event &&
-		test_filter_trunc_empty 1 trace.event &&
-		test_filter_trunc_large 0 trace.event
+		git pack-objects test --stdin-packs <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx)
+		) >expect.raw &&
+		git show-index <$(ls test-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/empty/.git/
-[main (root-commit) 9c26810] initial commit
- Author: A U Thor <author@example.com>
-{"event":"data","sid":"20250209T065440.203183Z-Hcf858c9d-P001a22ef","thread":"main","time":"2025-02-09T06:54:40.204822Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001839,"t_rel":0.001839,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250209T065440.203183Z-Hcf858c9d-P001a22ef","thread":"main","time":"2025-02-09T06:54:40.204840Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.001861,"t_rel":0.001861,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
-{"event":"data","sid":"20250209T065440.203183Z-Hcf858c9d-P001a22ef","thread":"main","time":"2025-02-09T06:54:40.204845Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.001866,"t_rel":0.001866,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
-{"event":"data","sid":"20250209T065440.203183Z-Hcf858c9d-P001a22ef","thread":"main","time":"2025-02-09T06:54:40.204850Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001871,"t_rel":0.001871,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-ok 136 - correctly report commits with no changed paths
+d79f0a91fe88b889c156c95980949119173ad813
+ok 2 - --stdin-packs with excluded packs
 
-expecting success of 4216.137 'Bloom generation is limited by --max-new-filters': 
+expecting success of 5331.3 '--stdin-packs is incompatible with --filter': 
 	(
-		cd limits &&
-		test_commit c2 filter &&
-		test_commit c3 filter &&
-		test_commit c4 no-filter &&
+		cd stdin-packs &&
+		test_must_fail git pack-objects --stdin-packs --stdout \
+			--filter=blob:none </dev/null 2>err &&
+		test_grep "cannot use --filter with --stdin-packs" err
+	)
 
-		rm -f trace.event &&
-		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-			git commit-graph write --reachable --split=replace \
-				--changed-paths --max-new-filters=2 &&
+fatal: cannot use --filter with --stdin-packs
+ok 3 - --stdin-packs is incompatible with --filter
 
-		test_filter_computed 2 trace.event &&
-		test_filter_not_computed 3 trace.event &&
-		test_filter_trunc_empty 0 trace.event &&
-		test_filter_trunc_large 0 trace.event
+expecting success of 5331.4 '--stdin-packs is incompatible with --revs': 
+	(
+		cd stdin-packs &&
+		test_must_fail git pack-objects --stdin-packs --revs out \
+			</dev/null 2>err &&
+		test_grep "cannot use internal rev list with --stdin-packs" err
 	)
 
-[main cd5d6de] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 filter
-[main 461d681] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 6810c95] c4
+fatal: cannot use internal rev list with --stdin-packs
+ok 4 - --stdin-packs is incompatible with --revs
+
+expecting success of 5331.5 '--stdin-packs with loose objects': 
+	(
+		cd stdin-packs &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+
+		test_commit D && # loose
+
+		git pack-objects test2 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
+			git rev-list --objects --no-object-names \
+				refs/tags/C..refs/tags/D
+
+		) >expect.raw &&
+		ls -la . &&
+		git show-index <$(ls test2-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
+	)
+
+[main 71a49b9] D
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 no-filter
-{"event":"data","sid":"20250209T065440.276270Z-Hcf858c9d-P001a2404","thread":"main","time":"2025-02-09T06:54:40.278701Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.002629,"t_rel":0.002629,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250209T065440.276270Z-Hcf858c9d-P001a2404","thread":"main","time":"2025-02-09T06:54:40.278724Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.002657,"t_rel":0.002657,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
-{"event":"data","sid":"20250209T065440.276270Z-Hcf858c9d-P001a2404","thread":"main","time":"2025-02-09T06:54:40.278730Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.002662,"t_rel":0.002662,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20250209T065440.276270Z-Hcf858c9d-P001a2404","thread":"main","time":"2025-02-09T06:54:40.278734Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.002667,"t_rel":0.002667,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-ok 137 - Bloom generation is limited by --max-new-filters
+ create mode 100644 D.t
+ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
+total 60
+drwxr-xr-x 3 pbuilder2 pbuilder2  360 Mar 14 13:32 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Mar 14 13:32 ..
+drwxr-xr-x 7 pbuilder2 pbuilder2  240 Mar 14 13:32 .git
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 14 13:32 A.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 14 13:32 B.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 14 13:32 C.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 14 13:32 D.t
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Mar 14 13:32 actual
+-rw-r--r-- 1 pbuilder2 pbuilder2  335 Mar 14 13:32 actual.raw
+-rw-r--r-- 1 pbuilder2 pbuilder2   55 Mar 14 13:32 err
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Mar 14 13:32 expect
+-rw-r--r-- 1 pbuilder2 pbuilder2  457 Mar 14 13:32 expect.raw
+-r--r--r-- 1 pbuilder2 pbuilder2 1240 Mar 14 13:32 test-d79f0a91fe88b889c156c95980949119173ad813.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  470 Mar 14 13:32 test-d79f0a91fe88b889c156c95980949119173ad813.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   76 Mar 14 13:32 test-d79f0a91fe88b889c156c95980949119173ad813.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Mar 14 13:32 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  693 Mar 14 13:32 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Mar 14 13:32 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
+ok 5 - --stdin-packs with loose objects
 
-expecting success of 4216.138 'Bloom generation backfills previously-skipped filters': 
-	# Check specifying commitGraph.maxNewFilters over "git config" works.
-	test_config -C limits commitGraph.maxNewFilters 1 &&
+expecting success of 5331.6 '--stdin-packs with broken links': 
 	(
-		cd limits &&
+		cd stdin-packs &&
 
-		rm -f trace.event &&
-		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-			git commit-graph write --reachable --changed-paths \
-				--split=replace &&
-		test_filter_computed 1 trace.event &&
-		test_filter_not_computed 4 trace.event &&
-		test_filter_trunc_empty 0 trace.event &&
-		test_filter_trunc_large 0 trace.event
+		# make an unreachable object with a bogus parent
+		git cat-file -p HEAD >commit &&
+		sed "s/$(git rev-parse HEAD^)/$(test_oid zero)/" <commit |
+		git hash-object -w -t commit --stdin >in &&
+
+		git pack-objects .git/objects/pack/pack-D <in &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+		PACK_D="$(basename .git/objects/pack/pack-D-*.pack)" &&
+
+		git pack-objects test3 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		$PACK_D
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-D-*.idx) &&
+			git rev-list --objects --no-object-names \
+				refs/tags/C..refs/tags/D
+		) >expect.raw &&
+		git show-index <$(ls test3-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
 	)
 
-{"event":"data","sid":"20250209T065440.317213Z-Hcf858c9d-P001a24ad","thread":"main","time":"2025-02-09T06:54:40.319036Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.002056,"t_rel":0.002056,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250209T065440.317213Z-Hcf858c9d-P001a24ad","thread":"main","time":"2025-02-09T06:54:40.319057Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.002080,"t_rel":0.002080,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250209T065440.317213Z-Hcf858c9d-P001a24ad","thread":"main","time":"2025-02-09T06:54:40.319062Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.002086,"t_rel":0.002086,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20250209T065440.317213Z-Hcf858c9d-P001a24ad","thread":"main","time":"2025-02-09T06:54:40.319067Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.002091,"t_rel":0.002091,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-ok 138 - Bloom generation backfills previously-skipped filters
+1c529235d2f84e54e1f186c4d2b6c65a26299d38
+311b91635d22c7f6c52ccf0def9203e563de1a4e
+ok 6 - --stdin-packs with broken links
 
-expecting success of 4216.139 '--max-new-filters overrides configuration': 
-	git init override &&
-	test_when_finished "rm -fr override" &&
-	test_config -C override commitGraph.maxNewFilters 2 &&
+expecting success of 5331.7 'pack-objects --stdin with duplicate packfile': 
+	test_when_finished "rm -fr repo" &&
+
+	git init repo &&
 	(
-		cd override &&
-		test_commit one &&
-		test_commit two &&
+		cd repo &&
+		test_commit "commit" &&
+		git repack -ad &&
 
-		rm -f trace.event &&
-		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-			git commit-graph write --reachable --changed-paths \
-				--max-new-filters=1 &&
-		test_filter_computed 1 trace.event &&
-		test_filter_not_computed 1 trace.event &&
-		test_filter_trunc_empty 0 trace.event &&
-		test_filter_trunc_large 0 trace.event
+		{
+			basename .git/objects/pack/pack-*.pack &&
+			basename .git/objects/pack/pack-*.pack
+		} >packfiles &&
+
+		git pack-objects --stdin-packs generated-pack <packfiles &&
+		packed_objects .git/objects/pack/pack-*.idx >expect &&
+		packed_objects generated-pack-*.idx >actual &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/override/.git/
-[main (root-commit) ff67e84] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 7c5280f] two
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/repo/.git/
+[main (root-commit) 499d3ae] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-{"event":"data","sid":"20250209T065440.398663Z-Hcf858c9d-P001a25e1","thread":"main","time":"2025-02-09T06:54:40.400291Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.002391,"t_rel":0.002391,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250209T065440.398663Z-Hcf858c9d-P001a25e1","thread":"main","time":"2025-02-09T06:54:40.400309Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.002413,"t_rel":0.002413,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
-{"event":"data","sid":"20250209T065440.398663Z-Hcf858c9d-P001a25e1","thread":"main","time":"2025-02-09T06:54:40.400315Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.002419,"t_rel":0.002419,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20250209T065440.398663Z-Hcf858c9d-P001a25e1","thread":"main","time":"2025-02-09T06:54:40.400319Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.002424,"t_rel":0.002424,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-ok 139 - --max-new-filters overrides configuration
+ create mode 100644 commit.t
+bb8f6d9d0f08840ee5644ac2998ee938e9ca5b57
+ok 7 - pack-objects --stdin with duplicate packfile
 
-expecting success of 4216.140 'Bloom generation backfills empty commits': 
-	git init empty &&
-	test_when_finished "rm -fr empty" &&
+expecting success of 5331.8 'pack-objects --stdin with same packfile excluded and included': 
+	test_when_finished "rm -fr repo" &&
+
+	git init repo &&
 	(
-		cd empty &&
-		for i in $(test_seq 1 6)
-		do
-			git commit --allow-empty -m "$i" || return 1
-		done &&
+		cd repo &&
+		test_commit "commit" &&
+		git repack -ad &&
 
-		# Generate Bloom filters for empty commits 1-6, two at a time.
-		for i in $(test_seq 1 3)
-		do
-			rm -f trace.event &&
-			GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-				git commit-graph write --reachable \
-					--changed-paths --max-new-filters=2 &&
-			test_filter_computed 2 trace.event &&
-			test_filter_not_computed 4 trace.event &&
-			test_filter_trunc_empty 2 trace.event &&
-			test_filter_trunc_large 0 trace.event || return 1
-		done &&
+		{
+			basename .git/objects/pack/pack-*.pack &&
+			printf "^%s\n" "$(basename .git/objects/pack/pack-*.pack)"
+		} >packfiles &&
 
-		# Finally, make sure that once all commits have filters, that
-		# none are subsequently recomputed.
-		rm -f trace.event &&
-		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-			git commit-graph write --reachable \
-				--changed-paths --max-new-filters=2 &&
-		test_filter_computed 0 trace.event &&
-		test_filter_not_computed 6 trace.event &&
-		test_filter_trunc_empty 0 trace.event &&
-		test_filter_trunc_large 0 trace.event
+		git pack-objects --stdin-packs generated-pack <packfiles &&
+		packed_objects generated-pack-*.idx >packed-objects &&
+		test_must_be_empty packed-objects
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/empty/.git/
-[main (root-commit) 36bf629] 1
- Author: A U Thor <author@example.com>
-[main 73266b6] 2
- Author: A U Thor <author@example.com>
-[main efbc158] 3
- Author: A U Thor <author@example.com>
-[main f013c5f] 4
- Author: A U Thor <author@example.com>
-[main 29fe1c6] 5
- Author: A U Thor <author@example.com>
-[main 55bcad0] 6
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/repo/.git/
+[main (root-commit) 499d3ae] commit
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20250209T065440.473929Z-Hcf858c9d-P001a2731","thread":"main","time":"2025-02-09T06:54:40.475679Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001948,"t_rel":0.001948,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250209T065440.473929Z-Hcf858c9d-P001a2731","thread":"main","time":"2025-02-09T06:54:40.475698Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.001972,"t_rel":0.001972,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250209T065440.473929Z-Hcf858c9d-P001a2731","thread":"main","time":"2025-02-09T06:54:40.475703Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.001977,"t_rel":0.001977,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20250209T065440.473929Z-Hcf858c9d-P001a2731","thread":"main","time":"2025-02-09T06:54:40.475708Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001982,"t_rel":0.001982,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20250209T065440.486293Z-Hcf858c9d-P001a276f","thread":"main","time":"2025-02-09T06:54:40.488016Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001930,"t_rel":0.001930,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250209T065440.486293Z-Hcf858c9d-P001a276f","thread":"main","time":"2025-02-09T06:54:40.488035Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.001952,"t_rel":0.001952,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250209T065440.486293Z-Hcf858c9d-P001a276f","thread":"main","time":"2025-02-09T06:54:40.488040Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.001957,"t_rel":0.001957,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20250209T065440.486293Z-Hcf858c9d-P001a276f","thread":"main","time":"2025-02-09T06:54:40.488045Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001962,"t_rel":0.001962,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20250209T065440.496919Z-Hcf858c9d-P001a27ae","thread":"main","time":"2025-02-09T06:54:40.498781Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.002078,"t_rel":0.002078,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20250209T065440.496919Z-Hcf858c9d-P001a27ae","thread":"main","time":"2025-02-09T06:54:40.498801Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.002102,"t_rel":0.002102,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20250209T065440.496919Z-Hcf858c9d-P001a27ae","thread":"main","time":"2025-02-09T06:54:40.498807Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.002107,"t_rel":0.002107,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20250209T065440.496919Z-Hcf858c9d-P001a27ae","thread":"main","time":"2025-02-09T06:54:40.498812Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.002113,"t_rel":0.002113,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20250209T065440.507357Z-Hcf858c9d-P001a27e3","thread":"main","time":"2025-02-09T06:54:40.508918Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001746,"t_rel":0.001746,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20250209T065440.507357Z-Hcf858c9d-P001a27e3","thread":"main","time":"2025-02-09T06:54:40.508938Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.001770,"t_rel":0.001770,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
-{"event":"data","sid":"20250209T065440.507357Z-Hcf858c9d-P001a27e3","thread":"main","time":"2025-02-09T06:54:40.508944Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.001776,"t_rel":0.001776,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20250209T065440.507357Z-Hcf858c9d-P001a27e3","thread":"main","time":"2025-02-09T06:54:40.508948Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001780,"t_rel":0.001780,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-ok 140 - Bloom generation backfills empty commits
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+ok 8 - pack-objects --stdin with same packfile excluded and included
 
-expecting success of 4216.141 'setup for mixed Bloom setting tests': 
-	repo=mixed-bloom-settings &&
+expecting success of 5331.9 'pack-objects --stdin with packfiles from alternate object database': 
+	test_when_finished "rm -fr shared member" &&
 
-	git init $repo &&
-	for i in one two three
-	do
-		test_commit -C $repo $i file || return 1
-	done
+	# Set up a shared repository with a single packfile.
+	git init shared &&
+	test_commit -C shared "shared-objects" &&
+	git -C shared repack -ad &&
+	basename shared/.git/objects/pack/pack-*.pack >packfile &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/mixed-bloom-settings/.git/
-[main (root-commit) 756b681] one
+	# Set up a repository that is connected to the shared repository. This
+	# repository has no objects on its own, but we still expect to be able
+	# to pack objects from its alternate.
+	git clone --shared shared member &&
+	git -C member pack-objects --stdin-packs generated-pack <packfile &&
+	test_cmp shared/.git/objects/pack/pack-*.pack member/generated-pack-*.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/shared/.git/
+[main (root-commit) 145e1e6] shared-objects
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 55d464c] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e3ee3ce] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 141 - setup for mixed Bloom setting tests
+ create mode 100644 shared-objects.t
+Cloning into 'member'...
+done.
+33d7aff4e675ff5bc1d48bcdab29cb013e53965b
+ok 9 - pack-objects --stdin with packfiles from alternate object database
 
-expecting success of 4216.142 'ensure Bloom filters with incompatible settings are ignored': 
-	# Compute Bloom filters with "unusual" settings.
-	git -C $repo rev-parse one >in &&
-	GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=3 git -C $repo commit-graph write \
-		--stdin-commits --changed-paths --split <in &&
-	layer=$(head -n 1 $repo/$chain) &&
+expecting success of 5331.10 'pack-objects --stdin with packfiles from main and alternate object database': 
+	test_when_finished "rm -fr shared member" &&
 
-	# A commit-graph layer without Bloom filters "hides" the layers
-	# below ...
-	git -C $repo rev-parse two >in &&
-	git -C $repo commit-graph write --stdin-commits --no-changed-paths \
-		--split=no-merge <in &&
+	# Set up a shared repository with a single packfile.
+	git init shared &&
+	test_commit -C shared "shared-commit" &&
+	git -C shared repack -ad &&
 
-	# Another commit-graph layer that has Bloom filters, but with
-	# standard settings, and is thus incompatible with the base
-	# layer written above.
-	git -C $repo rev-parse HEAD >in &&
-	git -C $repo commit-graph write --stdin-commits --changed-paths \
-		--split=no-merge <in &&
+	# Set up a repository that is connected to the shared repository. This
+	# repository has a second packfile so that we can verify that it is
+	# possible to write packs that include packfiles from different object
+	# databases.
+	git clone --shared shared member &&
+	test_commit -C member "local-commit" &&
+	git -C member repack -dl &&
 
-	test_line_count = 3 $repo/$chain &&
+	{
+		basename shared/.git/objects/pack/pack-*.pack &&
+		basename member/.git/objects/pack/pack-*.pack
+	} >packfiles &&
 
-	# Ensure that incompatible Bloom filters are ignored.
-	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- file \
-		>expect 2>err &&
-	git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
-	test_cmp expect actual &&
-	grep "disabling Bloom filters for commit-graph layer .$layer." err
+	{
+		packed_objects shared/.git/objects/pack/pack-*.idx &&
+		packed_objects member/.git/objects/pack/pack-*.idx
+	} | sort >expected-objects &&
 
-warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
-ok 142 - ensure Bloom filters with incompatible settings are ignored
+	git -C member pack-objects --stdin-packs generated-pack <packfiles &&
+	packed_objects member/generated-pack-*.idx >actual-objects &&
+	test_cmp expected-objects actual-objects
 
-expecting success of 4216.143 'merge graph layers with incompatible Bloom settings': 
-	# Ensure that incompatible Bloom filters are ignored when
-	# merging existing layers.
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C $repo commit-graph write --reachable --changed-paths 2>err &&
-	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
-	grep "{\"hash_version\":1,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5331-pack-objects-stdin/shared/.git/
+[main (root-commit) 4c151b8] shared-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-commit.t
+Cloning into 'member'...
+done.
+[main 7c14a26] local-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local-commit.t
+d3e539037cb74e50eb4452759efc2fac0ae5e17a
+ok 10 - pack-objects --stdin with packfiles from main and alternate object database
 
-	test_path_is_file $repo/$graph &&
-	test_dir_is_empty $repo/$graphdir &&
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5300-pack-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/.git/
+expecting success of 5300.1 'setup': 
+	rm -f .git/index* &&
+	perl -e "print \"a\" x 4096;" >a &&
+	perl -e "print \"b\" x 4096;" >b &&
+	perl -e "print \"c\" x 4096;" >c &&
+	test-tool genrandom "seed a" 2097152 >a_big &&
+	test-tool genrandom "seed b" 2097152 >b_big &&
+	git update-index --add a a_big b b_big c &&
+	cat c >d && echo foo >>d && git update-index --add d &&
+	tree=$(git write-tree) &&
+	commit=$(git commit-tree $tree </dev/null) &&
+	{
+		echo $tree &&
+		echo $commit &&
+		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
+	} >obj-list &&
+	{
+		git diff-tree --root -p $commit &&
+		while read object
+		do
+			t=$(git cat-file -t $object) &&
+			git cat-file $t $object || return 1
+		done <obj-list
+	} >expect
 
-	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- \
-		file >expect &&
-	trace_out="$(pwd)/trace.perf" &&
-	GIT_TRACE2_PERF="$trace_out" \
-		git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
+ok 1 - setup
 
-	test_cmp expect actual &&
-	grep "statistics:{\"filter_not_present\":0," trace.perf &&
-	test_must_be_empty err
+expecting success of 5300.2 'setup pack-object <stdin': 
+	git init pack-object-stdin &&
+	test_commit -C pack-object-stdin one &&
+	test_commit -C pack-object-stdin two
 
-warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
-{"event":"data_json","sid":"20250209T065440.628016Z-Hcf858c9d-P001a2a14","thread":"main","time":"2025-02-09T06:54:40.629968Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002139,"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}}
-06:54:40.645783 revision.c:677               | d0 | main                     | data_json    | r1  |  0.002135 |  0.002135 | bloom        | statistics:{"filter_not_present":0,"maybe":3,"definitely_not":0,"false_positive":0}
-ok 143 - merge graph layers with incompatible Bloom settings
 
-expecting success of 4216.144 'ensure Bloom filter with incompatible versions are ignored': 
-	rm "$repo/$graph" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/pack-object-stdin/.git/
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 2 - setup pack-object <stdin
 
-	git -C $repo log --oneline --no-decorate -- $CENT >expect &&
+expecting success of 5300.3 'pack-object <stdin parsing: basic [|--revs]': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	EOF
 
-	# Compute v1 Bloom filters for commits at the bottom.
-	git -C $repo rev-parse HEAD^ >in &&
-	git -C $repo commit-graph write --stdin-commits --changed-paths \
-		--split <in &&
+	git -C pack-object-stdin pack-objects basic-stdin <in &&
+	idx=$(echo pack-object-stdin/basic-stdin-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 1 actual &&
 
-	# Compute v2 Bloomfilters for the rest of the commits at the top.
-	git -C $repo rev-parse HEAD >in &&
-	git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write \
-		--stdin-commits --changed-paths --split=no-merge <in &&
+	git -C pack-object-stdin pack-objects --revs basic-stdin-revs <in &&
+	idx=$(echo pack-object-stdin/basic-stdin-revs-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 3 actual
 
-	test_line_count = 2 $repo/$chain &&
+260a913b65cbec25b7e224d8d3c7360245c0367a
+91db7b4b856b00c3e675824c5bc5389b6810037a
+ok 3 - pack-object <stdin parsing: basic [|--revs]
 
-	git -C $repo log --oneline --no-decorate -- $CENT >actual 2>err &&
-	test_cmp expect actual &&
+expecting success of 5300.4 'pack-object <stdin parsing: [|--revs] bad line': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	garbage
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	sed "s/^> //g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  garbage
 
-	layer="$(head -n 1 $repo/$chain)" &&
-	cat >expect.err <<-EOF &&
-	warning: disabling Bloom filters for commit-graph layer $SQ$layer$SQ due to incompatible settings
 	EOF
-	test_cmp expect.err err &&
+	test_must_fail git -C pack-object-stdin pack-objects bad-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
 
-	# Merge the two layers with incompatible bloom filter versions,
-	# ensuring that the v2 filters are used.
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write --reachable --changed-paths 2>err &&
-	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
-	grep "{\"hash_version\":2,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt
+	cat >err.expect <<-EOF &&
+	fatal: bad revision 'garbage'
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects --revs bad-line-stdin-revs <in 2>err.actual &&
+	test_cmp err.expect err.actual
 
-warning: disabling Bloom filters for commit-graph layer 'e338a7a1b4cfa5f6bcd31aea3e027df67d06442a' due to incompatible settings
-{"event":"data_json","sid":"20250209T065440.682741Z-Hcf858c9d-P001a2b1d","thread":"main","time":"2025-02-09T06:54:40.684688Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002142,"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
+ok 4 - pack-object <stdin parsing: [|--revs] bad line
 
-expecting success of 4216.145 'set up repo with high bit path, version 1 changed-path': 
-	git init highbit1 &&
-	test_commit -C highbit1 c1 "$CENT" &&
-	git -C highbit1 commit-graph write --reachable --changed-paths
+expecting success of 5300.5 'pack-object <stdin parsing: [|--revs] empty line': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/highbit1/.git/
-[main (root-commit) 038971c] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242"
-ok 145 - set up repo with high bit path, version 1 changed-path
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
 
-expecting success of 4216.146 'setup check value of version 1 changed-path': 
-	(
-		cd highbit1 &&
-		echo "52a9" >expect &&
-		get_first_changed_path_filter >actual
-	)
+	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  Z
 
-ok 146 - setup check value of version 1 changed-path
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
 
---- highbit1/expect	2025-02-09 06:54:40.709946673 +0000
-+++ highbit1/actual	2025-02-09 06:54:40.709946673 +0000
-@@ -1 +1 @@
--52a9
-+c01f
-ok 147 # skip check value of version 1 changed-path (missing SIGNED_CHAR_BY_DEFAULT)
+	git -C pack-object-stdin pack-objects --revs empty-line-stdin-revs <in &&
+	idx=$(echo pack-object-stdin/empty-line-stdin-revs-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 3 actual
 
-expecting success of 4216.148 'setup make another commit': 
-	# "git log" does not use Bloom filters for root commits - see how, in
-	# revision.c, rev_compare_tree() (the only code path that eventually calls
-	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
-	# has one parent. Therefore, make another commit so that we perform the tests on
-	# a non-root commit.
-	test_commit -C highbit1 anotherc1 "another$CENT"
+91db7b4b856b00c3e675824c5bc5389b6810037a
+ok 5 - pack-object <stdin parsing: [|--revs] empty line
 
-[main 3b45161] anotherc1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "another\302\242"
-ok 148 - setup make another commit
+expecting success of 5300.6 'pack-object <stdin parsing: [|--revs] with --stdin': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
 
-expecting success of 4216.149 'version 1 changed-path used when version 1 requested': 
-	(
-		cd highbit1 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
+	# There is the "--stdin-packs is incompatible with --revs"
+	# test below, but we should make sure that the revision.c
+	# --stdin is not picked up
+	cat >err.expect <<-EOF &&
+	fatal: disallowed abbreviated or ambiguous option 'stdin'
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects stdin-with-stdin-option --stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
 
-ok 149 - version 1 changed-path used when version 1 requested
+	test_must_fail git -C pack-object-stdin pack-objects --stdin --revs stdin-with-stdin-option-revs 2>err.actual <in &&
+	test_cmp err.expect err.actual
 
-expecting success of 4216.150 'version 1 changed-path not used when version 2 requested': 
-	(
-		cd highbit1 &&
-		git config --add commitGraph.changedPathsVersion 2 &&
-		test_bloom_filters_not_used "-- another$CENT"
-	)
+ok 6 - pack-object <stdin parsing: [|--revs] with --stdin
 
-ok 150 - version 1 changed-path not used when version 2 requested
+expecting success of 5300.7 'pack-object <stdin parsing: --stdin-packs handles garbage': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
 
-expecting success of 4216.151 'version 1 changed-path used when autodetect requested': 
-	(
-		cd highbit1 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
+	# That we get "two" and not "one" has to do with OID
+	# ordering. It happens to be the same here under SHA-1 and
+	# SHA-256. See commentary in pack-objects.c
+	cat >err.expect <<-EOF &&
+	fatal: could not find pack '$(git -C pack-object-stdin rev-parse two)'
+	EOF
+	test_must_fail git \
+		-C pack-object-stdin \
+		pack-objects stdin-with-stdin-option --stdin-packs \
+		<in 2>err.actual &&
+	test_cmp err.expect err.actual
 
-ok 151 - version 1 changed-path used when autodetect requested
+ok 7 - pack-object <stdin parsing: --stdin-packs handles garbage
 
-expecting success of 4216.152 'when writing another commit graph, preserve existing version 1 of changed-path': 
-	test_commit -C highbit1 c1double "$CENT$CENT" &&
-	git -C highbit1 commit-graph write --reachable --changed-paths &&
-	(
-		cd highbit1 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		echo "options: bloom(1,10,7) read_generation_data" >expect &&
-		test-tool read-graph >full &&
-		grep options full >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5300.8 'pack without delta': 
+	packname_1=$(git pack-objects --progress --window=0 test-1 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr = 0
 
-[main 8b0508a] c1double
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242\302\242"
-ok 152 - when writing another commit graph, preserve existing version 1 of changed-path
+ok 8 - pack without delta
 
-expecting success of 4216.153 'set up repo with high bit path, version 2 changed-path': 
-	git init highbit2 &&
-	git -C highbit2 config --add commitGraph.changedPathsVersion 2 &&
-	test_commit -C highbit2 c2 "$CENT" &&
-	git -C highbit2 commit-graph write --reachable --changed-paths
+expecting success of 5300.9 'negative window clamps to 0': 
+	git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
+	check_deltas stderr = 0
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/highbit2/.git/
-[main (root-commit) bc1f8bf] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242"
-ok 153 - set up repo with high bit path, version 2 changed-path
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 9 - negative window clamps to 0
 
-expecting success of 4216.154 'check value of version 2 changed-path': 
-	(
-		cd highbit2 &&
-		echo "c01f" >expect &&
-		get_first_changed_path_filter >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5300.10 'pack-objects with bogus arguments': 
+	test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list
 
-ok 154 - check value of version 2 changed-path
+usage: git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]
+   or: git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]
 
-expecting success of 4216.155 'setup make another commit': 
-	# "git log" does not use Bloom filters for root commits - see how, in
-	# revision.c, rev_compare_tree() (the only code path that eventually calls
-	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
-	# has one parent. Therefore, make another commit so that we perform the tests on
-	# a non-root commit.
-	test_commit -C highbit2 anotherc2 "another$CENT"
+    -q, --[no-]quiet      do not show progress meter
+    --[no-]progress       show progress meter
+    --[no-]all-progress   show progress meter during object writing phase
+    --[no-]all-progress-implied
+                          similar to --all-progress when progress meter is shown
+    --index-version <version>[,<offset>]
+                          write the pack index file in the specified idx format version
+    --max-pack-size <n>   maximum size of each output pack file
+    --[no-]local          ignore borrowed objects from alternate object store
+    --[no-]incremental    ignore packed objects
+    --[no-]window <n>     limit pack window by objects
+    --window-memory <n>   limit pack window by memory in addition to object limit
+    --[no-]depth <n>      maximum length of delta chain allowed in the resulting pack
+    --[no-]reuse-delta    reuse existing deltas
+    --[no-]reuse-object   reuse existing objects
+    --[no-]delta-base-offset
+                          use OFS_DELTA objects
+    --[no-]threads <n>    use threads when searching for best delta matches
+    --[no-]non-empty      do not create an empty pack output
+    --[no-]revs           read revision arguments from standard input
+    --unpacked            limit the objects to those that are not yet packed
+    --all                 include objects reachable from any reference
+    --reflog              include objects referred by reflog entries
+    --indexed-objects     include objects referred to by the index
+    --[no-]stdin-packs    read packs from stdin
+    --[no-]stdout         output pack to stdout
+    --[no-]include-tag    include tag objects that refer to objects to be packed
+    --[no-]keep-unreachable
+                          keep unreachable objects
+    --[no-]pack-loose-unreachable
+                          pack loose unreachable objects
+    --[no-]unpack-unreachable[=<time>]
+                          unpack unreachable objects newer than <time>
+    --[no-]cruft          create a cruft pack
+    --[no-]cruft-expiration[=<time>]
+                          expire cruft objects older than <time>
+    --[no-]sparse         use the sparse reachability algorithm
+    --[no-]thin           create thin packs
+    --[no-]shallow        create packs suitable for shallow fetches
+    --[no-]honor-pack-keep
+                          ignore packs that have companion .keep file
+    --[no-]keep-pack <name>
+                          ignore this pack
+    --[no-]compression <n>
+                          pack compression level
+    --[no-]keep-true-parents
+                          do not hide commits by grafts
+    --[no-]use-bitmap-index
+                          use a bitmap index if available to speed up counting objects
+    --[no-]write-bitmap-index
+                          write a bitmap index together with the pack index
+    --[no-]filter <args>  object filtering
+    --missing <action>    handling for missing objects
+    --[no-]exclude-promisor-objects
+                          do not pack objects in promisor packfiles
+    --[no-]exclude-promisor-objects-best-effort
+                          implies --missing=allow-any
+    --[no-]delta-islands  respect islands during delta compression
+    --[no-]uri-protocol <protocol>
+                          exclude any configured uploadpack.blobpackfileuri with this protocol
 
-[main 285bfce] anotherc2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "another\302\242"
-ok 155 - setup make another commit
+ok 10 - pack-objects with bogus arguments
 
-expecting success of 4216.156 'version 2 changed-path used when version 2 requested': 
-	(
-		cd highbit2 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
+expecting success of 5300.11 'unpack without delta': 
+	check_unpack test-1-${packname_1} obj-list
 
-ok 156 - version 2 changed-path used when version 2 requested
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 11 - unpack without delta
 
-expecting success of 4216.157 'version 2 changed-path not used when version 1 requested': 
-	(
-		cd highbit2 &&
-		git config --add commitGraph.changedPathsVersion 1 &&
-		test_bloom_filters_not_used "-- another$CENT"
-	)
+expecting success of 5300.12 'unpack without delta (core.fsyncmethod=batch)': 
+	check_unpack test-1-${packname_1} obj-list "$BATCH_CONFIGURATION"
 
-ok 157 - version 2 changed-path not used when version 1 requested
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 12 - unpack without delta (core.fsyncmethod=batch)
 
-expecting success of 4216.158 'version 2 changed-path used when autodetect requested': 
-	(
-		cd highbit2 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		test_bloom_filters_used "-- another$CENT"
-	)
+expecting success of 5300.13 'pack with REF_DELTA': 
+	packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
+	check_deltas stderr -gt 0
 
-ok 158 - version 2 changed-path used when autodetect requested
+ok 13 - pack with REF_DELTA
 
-expecting success of 4216.159 'when writing another commit graph, preserve existing version 2 of changed-path': 
-	test_commit -C highbit2 c2double "$CENT$CENT" &&
-	git -C highbit2 commit-graph write --reachable --changed-paths &&
-	(
-		cd highbit2 &&
-		git config --add commitGraph.changedPathsVersion -1 &&
-		echo "options: bloom(2,10,7) read_generation_data" >expect &&
-		test-tool read-graph >full &&
-		grep options full >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5300.14 'unpack with REF_DELTA': 
+	check_unpack test-2-${packname_2} obj-list
 
-[main 00b3fc0] c2double
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242\302\242"
-ok 159 - when writing another commit graph, preserve existing version 2 of changed-path
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 14 - unpack with REF_DELTA
 
-expecting success of 4216.160 'when writing commit graph, do not reuse changed-path of another version': 
-	git init doublewrite &&
-	test_commit -C doublewrite c "$CENT" &&
+expecting success of 5300.15 'unpack with REF_DELTA (core.fsyncmethod=batch)': 
+       check_unpack test-2-${packname_2} obj-list "$BATCH_CONFIGURATION"
 
-	git -C doublewrite config --add commitGraph.changedPathsVersion 1 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C doublewrite commit-graph write --reachable --changed-paths &&
-	test_filter_computed 1 trace2.txt &&
-	test_filter_upgraded 0 trace2.txt &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 15 - unpack with REF_DELTA (core.fsyncmethod=batch)
 
-	git -C doublewrite commit-graph write --reachable --changed-paths &&
-	for v in -2 3
-	do
-		git -C doublewrite config --add commitGraph.changedPathsVersion $v &&
-		git -C doublewrite commit-graph write --reachable --changed-paths 2>err &&
-		cat >expect <<-EOF &&
-		warning: attempting to write a commit-graph, but ${SQ}commitGraph.changedPathsVersion${SQ} ($v) is not supported
-		EOF
-		test_cmp expect err || return 1
-	done &&
+expecting success of 5300.16 'pack with OFS_DELTA': 
+	packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr -gt 0
 
-	git -C doublewrite config --add commitGraph.changedPathsVersion 2 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C doublewrite commit-graph write --reachable --changed-paths &&
-	test_filter_computed 1 trace2.txt &&
-	test_filter_upgraded 0 trace2.txt &&
+ok 16 - pack with OFS_DELTA
 
-	(
-		cd doublewrite &&
-		echo "c01f" >expect &&
-		get_first_changed_path_filter >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5300.17 'unpack with OFS_DELTA': 
+	check_unpack test-3-${packname_3} obj-list
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/doublewrite/.git/
-[main (root-commit) 6d8aa3d] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\302\242"
-{"event":"data","sid":"20250209T065441.027241Z-Hcf858c9d-P001a308e","thread":"main","time":"2025-02-09T06:54:41.028826Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001775,"t_rel":0.001775,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250209T065441.027241Z-Hcf858c9d-P001a308e","thread":"main","time":"2025-02-09T06:54:41.028864Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.001817,"t_rel":0.001817,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20250209T065441.066020Z-Hcf858c9d-P001a3130","thread":"main","time":"2025-02-09T06:54:41.067584Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001764,"t_rel":0.001764,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250209T065441.066020Z-Hcf858c9d-P001a3130","thread":"main","time":"2025-02-09T06:54:41.067623Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.001807,"t_rel":0.001807,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-ok 160 - when writing commit graph, do not reuse changed-path of another version
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 17 - unpack with OFS_DELTA
 
-expecting success of 4216.161 'when writing commit graph, reuse changed-path of another version where possible': 
-	git init upgrade &&
+expecting success of 5300.18 'unpack with OFS_DELTA (core.fsyncmethod=batch)': 
+	check_unpack test-3-${packname_3} obj-list "$BATCH_CONFIGURATION"
 
-	test_commit -C upgrade base no-high-bits &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 18 - unpack with OFS_DELTA (core.fsyncmethod=batch)
 
-	git -C upgrade config --add commitGraph.changedPathsVersion 1 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C upgrade commit-graph write --reachable --changed-paths &&
-	test_filter_computed 1 trace2.txt &&
-	test_filter_upgraded 0 trace2.txt &&
+expecting success of 5300.19 'compare delta flavors': 
+	perl -e '
+		defined($_ = -s $_) or die for @ARGV;
+		exit 1 if $ARGV[0] <= $ARGV[1];
+	' test-2-$packname_2.pack test-3-$packname_3.pack
 
-	git -C upgrade config --add commitGraph.changedPathsVersion 2 &&
-	>trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C upgrade commit-graph write --reachable --changed-paths &&
-	test_filter_computed 0 trace2.txt &&
-	test_filter_upgraded 1 trace2.txt
+ok 19 - compare delta flavors
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/upgrade/.git/
-[main (root-commit) 454ab1d] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no-high-bits
-{"event":"data","sid":"20250209T065441.109515Z-Hcf858c9d-P001a31dc","thread":"main","time":"2025-02-09T06:54:41.111139Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001821,"t_rel":0.001821,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20250209T065441.109515Z-Hcf858c9d-P001a31dc","thread":"main","time":"2025-02-09T06:54:41.111171Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.001857,"t_rel":0.001857,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20250209T065441.120436Z-Hcf858c9d-P001a3203","thread":"main","time":"2025-02-09T06:54:41.121986Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001732,"t_rel":0.001732,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20250209T065441.120436Z-Hcf858c9d-P001a3203","thread":"main","time":"2025-02-09T06:54:41.122172Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.001922,"t_rel":0.001922,"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 5300.20 'use packed objects': 
+	check_use_objects test-1-${packname_1}
 
-expecting success of 4216.162 'Bloom reader notices too-small data chunk': 
-	check_corrupt_graph BDAT clear 00000000 &&
-	echo "warning: ignoring too-small changed-path chunk" \
-		"(4 < 12) in commit-graph file" >expect.err &&
-	test_cmp expect.err err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 20 - use packed objects
 
-ok 162 - Bloom reader notices too-small data chunk
+expecting success of 5300.21 'use packed deltified (REF_DELTA) objects': 
+	check_use_objects test-2-${packname_2}
 
-expecting success of 4216.163 'Bloom reader notices out-of-bounds filter offsets': 
-	check_corrupt_graph BIDX 12 FFFFFFFF &&
-	# use grep to avoid depending on exact chunk size
-	grep "warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph" err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 21 - use packed deltified (REF_DELTA) objects
 
-warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
-warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
-ok 163 - Bloom reader notices out-of-bounds filter offsets
+expecting success of 5300.22 'use packed deltified (OFS_DELTA) objects': 
+	check_use_objects test-3-${packname_3}
 
-expecting success of 4216.164 'Bloom reader notices too-small index chunk': 
-	# replace the index with a single entry, making most
-	# lookups out-of-bounds
-	check_corrupt_graph BIDX clear 00000000 &&
-	echo "warning: commit-graph changed-path index chunk" \
-		"is too small" >expect.err &&
-	test_cmp expect.err err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
+ok 22 - use packed deltified (OFS_DELTA) objects
 
-ok 164 - Bloom reader notices too-small index chunk
+expecting success of 5300.23 'survive missing objects/pack directory': 
+	(
+		rm -fr missing-pack &&
+		mkdir missing-pack &&
+		cd missing-pack &&
+		git init &&
+		GOP=.git/objects/pack &&
+		rm -fr $GOP &&
+		git index-pack --stdin --keep=test <../test-3-${packname_3}.pack &&
+		test -f $GOP/pack-${packname_3}.pack &&
+		cmp $GOP/pack-${packname_3}.pack ../test-3-${packname_3}.pack &&
+		test -f $GOP/pack-${packname_3}.idx &&
+		cmp $GOP/pack-${packname_3}.idx ../test-3-${packname_3}.idx &&
+		test -f $GOP/pack-${packname_3}.keep
+	)
 
-expecting success of 4216.165 'Bloom reader notices out-of-order index offsets': 
-	# we do not know any real offsets, but we can pick
-	# something plausible; we should not get to the point of
-	# actually reading from the bogus offsets anyway.
-	corrupt_graph BIDX 4 0000000c00000005 &&
-	echo "warning: ignoring decreasing changed-path index offsets" \
-		"(12 > 5) for positions 1 and 2 of .git/objects/info/commit-graph" >expect.err &&
-	git -c core.commitGraph=false log -- A/B/file2 >expect.out &&
-	git -c core.commitGraph=true log -- A/B/file2 >out 2>err &&
-	test_cmp expect.out out &&
-	test_cmp expect.err err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/missing-pack/.git/
+keep	ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+ok 23 - survive missing objects/pack directory
 
-ok 165 - Bloom reader notices out-of-order index offsets
+expecting success of 5300.24 'verify pack': 
+	git verify-pack test-1-${packname_1}.idx \
+		test-2-${packname_2}.idx \
+		test-3-${packname_3}.idx
 
-# passed all 165 test(s)
-1..165
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5332-multi-pack-reuse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5332-multi-pack-reuse/.git/
-expecting success of 5332.1 'preferred pack is reused for single-pack reuse': 
-	test_config pack.allowPackReuse single &&
+ok 24 - verify pack
 
-	for i in A B
-	do
-		test_commit "$i" &&
-		git repack -d || return 1
-	done &&
+expecting success of 5300.25 'verify pack -v': 
+	git verify-pack -v test-1-${packname_1}.idx \
+		test-2-${packname_2}.idx \
+		test-3-${packname_3}.idx
 
-	git multi-pack-index write --bitmap &&
+3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
+ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
+9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
+012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
+c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
+6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
+0be779221aca65277fd447c8207e1b3c2706ae20 blob   4096 31 4195970
+b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4196001
+non delta: 8 objects
+test-1-0fe7826218e9201ffa2c785aa64f009dc5a98043.pack: ok
+3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
+ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
+9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
+012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
+c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
+6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
+b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
+0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 35 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
+non delta: 7 objects
+chain length = 1: 1 object
+test-2-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5.pack: ok
+3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
+ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
+9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
+012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
+c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
+6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
+b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
+0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 16 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
+non delta: 7 objects
+chain length = 1: 1 object
+test-3-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7.pack: ok
+ok 25 - verify pack -v
 
-	test_pack_objects_reused_all 3 1
+expecting success of 5300.26 'verify-pack catches mismatched .idx and .pack files': 
+	cat test-1-${packname_1}.idx >test-3.idx &&
+	cat test-2-${packname_2}.pack >test-3.pack &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
 
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-{"event":"data","sid":"20250209T065440.764845Z-Hcf858c9d-P001a2c8e","thread":"main","time":"2025-02-09T06:54:40.766212Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001556,"t_rel":0.001556,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250209T065440.764845Z-Hcf858c9d-P001a2c8e","thread":"main","time":"2025-02-09T06:54:40.766216Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001560,"t_rel":0.001560,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-de700bb9d264590842bcbfd30aa3296a833289e8
-ok 1 - preferred pack is reused for single-pack reuse
+fatal: sha1 file 'test-3.idx' validation error
+ok 26 - verify-pack catches mismatched .idx and .pack files
 
-expecting success of 5332.2 'multi-pack reuse is disabled by default': 
-	test_pack_objects_reused_all 3 1
+expecting success of 5300.27 'verify-pack catches a corrupted pack signature': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
 
-{"event":"data","sid":"20250209T065440.778349Z-Hcf858c9d-P001a2cbc","thread":"main","time":"2025-02-09T06:54:40.779558Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001400,"t_rel":0.001400,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250209T065440.778349Z-Hcf858c9d-P001a2cbc","thread":"main","time":"2025-02-09T06:54:40.779562Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001404,"t_rel":0.001404,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-de700bb9d264590842bcbfd30aa3296a833289e8
-ok 2 - multi-pack reuse is disabled by default
+1+0 records in
+1+0 records out
+1 byte copied, 0.00648468 s, 0.2 kB/s
+fatal: pack signature mismatch
+ok 27 - verify-pack catches a corrupted pack signature
 
-expecting success of 5332.3 'feature.experimental implies multi-pack reuse': 
-	test_config feature.experimental true &&
+expecting success of 5300.28 'verify-pack catches a corrupted pack version': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
 
-	test_pack_objects_reused_all 6 2
+1+0 records in
+1+0 records out
+1 byte copied, 4.296e-05 s, 23.3 kB/s
+fatal: pack version 10 unsupported
+ok 28 - verify-pack catches a corrupted pack version
 
-{"event":"data","sid":"20250209T065440.792976Z-Hcf858c9d-P001a2cfd","thread":"main","time":"2025-02-09T06:54:40.794228Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001456,"t_rel":0.001456,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20250209T065440.792976Z-Hcf858c9d-P001a2cfd","thread":"main","time":"2025-02-09T06:54:40.794232Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001460,"t_rel":0.001460,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-de700bb9d264590842bcbfd30aa3296a833289e8
-ok 3 - feature.experimental implies multi-pack reuse
+expecting success of 5300.29 'verify-pack catches a corrupted type/size of the 1st packed object data': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
+	if git verify-pack test-3.idx
+	then false
+	else :;
+	fi
 
-expecting success of 5332.4 'multi-pack reuse can be disabled with feature.experimental': 
-	test_config feature.experimental true &&
-	test_config pack.allowPackReuse single &&
+1+0 records in
+1+0 records out
+1 byte copied, 4.112e-05 s, 24.3 kB/s
+fatal: pack has bad object at offset 12: unknown object type 0
+ok 29 - verify-pack catches a corrupted type/size of the 1st packed object data
 
-	test_pack_objects_reused_all 3 1
+expecting success of 5300.30 'verify-pack catches a corrupted sum of the index file itself': 
+	l=$(wc -c <test-3.idx) &&
+	l=$(expr $l - 20) &&
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	printf "%20s" "" | dd of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
+	if git verify-pack test-3.pack
+	then false
+	else :;
+	fi
 
-{"event":"data","sid":"20250209T065440.810758Z-Hcf858c9d-P001a2d4b","thread":"main","time":"2025-02-09T06:54:40.811999Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001453,"t_rel":0.001453,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250209T065440.810758Z-Hcf858c9d-P001a2d4b","thread":"main","time":"2025-02-09T06:54:40.812003Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001458,"t_rel":0.001458,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-de700bb9d264590842bcbfd30aa3296a833289e8
-ok 4 - multi-pack reuse can be disabled with feature.experimental
+20+0 records in
+20+0 records out
+20 bytes copied, 0.0061868 s, 3.2 kB/s
+fatal: sha1 file 'test-3.idx' validation error
+ok 30 - verify-pack catches a corrupted sum of the index file itself
 
-expecting success of 5332.5 'enable multi-pack reuse': 
-	git config pack.allowPackReuse multi
+expecting success of 5300.31 'build pack index for an existing pack': 
+	cat test-1-${packname_1}.pack >test-3.pack &&
+	git index-pack -o tmp.idx test-3.pack &&
+	cmp tmp.idx test-1-${packname_1}.idx &&
 
-ok 5 - enable multi-pack reuse
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-1-${packname_1}.idx &&
 
-expecting success of 5332.6 'reuse all objects from subset of bitmapped packs': 
-	test_commit C &&
-	git repack -d &&
+	cat test-2-${packname_2}.pack >test-3.pack &&
+	git index-pack -o tmp.idx test-2-${packname_2}.pack &&
+	cmp tmp.idx test-2-${packname_2}.idx &&
 
-	git multi-pack-index write --bitmap &&
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-2-${packname_2}.idx &&
 
-	cat >in <<-EOF &&
-	$(git rev-parse C)
-	^$(git rev-parse A)
-	EOF
+	cat test-3-${packname_3}.pack >test-3.pack &&
+	git index-pack -o tmp.idx test-3-${packname_3}.pack &&
+	cmp tmp.idx test-3-${packname_3}.idx &&
 
-	test_pack_objects_reused 6 2 <in
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-3-${packname_3}.idx &&
 
-[master 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-{"event":"data","sid":"20250209T065440.874426Z-Hcf858c9d-P001a2e36","thread":"main","time":"2025-02-09T06:54:40.875586Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001351,"t_rel":0.001351,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20250209T065440.874426Z-Hcf858c9d-P001a2e36","thread":"main","time":"2025-02-09T06:54:40.875593Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001357,"t_rel":0.001357,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-530e5837dd3fc62e13d9275092d852592cab5851
-ok 6 - reuse all objects from subset of bitmapped packs
+	cat test-1-${packname_1}.pack >test-4.pack &&
+	rm -f test-4.keep &&
+	git index-pack --keep=why test-4.pack &&
+	cmp test-1-${packname_1}.idx test-4.idx &&
+	test -f test-4.keep &&
 
-expecting success of 5332.7 'reuse all objects from all packs': 
-	test_pack_objects_reused_all 9 3
+	:
 
-{"event":"data","sid":"20250209T065440.886147Z-Hcf858c9d-P001a2e66","thread":"main","time":"2025-02-09T06:54:40.887380Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001443,"t_rel":0.001443,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
-{"event":"data","sid":"20250209T065440.886147Z-Hcf858c9d-P001a2e66","thread":"main","time":"2025-02-09T06:54:40.887384Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001447,"t_rel":0.001447,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
-1340c9de031f500be0a197f1242f00a34ed6e9b8
-ok 7 - reuse all objects from all packs
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
+3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
+ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 31 - build pack index for an existing pack
 
-expecting success of 5332.8 'reuse objects from first pack with middle gap': 
-	for i in D E F
+expecting success of 5300.32 'unpacking with --strict': 
+
+	for j in a b c d e f g
 	do
-		test_commit "$i" || return 1
-	done &&
+		for i in 0 1 2 3 4 5 6 7 8 9
+		do
+			o=$(echo $j$i | git hash-object -w --stdin) &&
+			echo "100644 $o	0 $j$i" || return 1
+		done
+	done >LIST &&
+	rm -f .git/index &&
+	git update-index --index-info <LIST &&
+	LIST=$(git write-tree) &&
+	rm -f .git/index &&
+	head -n 10 LIST | git update-index --index-info &&
+	LI=$(git write-tree) &&
+	rm -f .git/index &&
+	tail -n 10 LIST | git update-index --index-info &&
+	ST=$(git write-tree) &&
+	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
+	PACK5=$( git pack-objects test-5 <actual ) &&
+	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
+	test_create_repo test-5 &&
+	(
+		cd test-5 &&
+		git unpack-objects --strict <../test-5-$PACK5.pack &&
+		git ls-tree -r $LIST &&
+		git ls-tree -r $LI &&
+		git ls-tree -r $ST
+	) &&
+	test_create_repo test-6 &&
+	(
+		# tree-only into empty repo -- many unreachables
+		cd test-6 &&
+		test_must_fail git unpack-objects --strict <../test-6-$PACK6.pack
+	) &&
+	(
+		# already populated -- no unreachables
+		cd test-5 &&
+		git unpack-objects --strict <../test-6-$PACK6.pack
+	)
 
-	# Set "pack.window" to zero to ensure that we do not create any
-	# deltas, which could alter the amount of pack reuse we perform
-	# (if, for e.g., we are not sending one or more bases).
-	D="$(git -c pack.window=0 pack-objects --all --unpacked $packdir/pack)" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-5/.git/
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
+100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
+100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
+100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
+100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
+100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
+100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
+100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
+100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
+100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
+100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
+100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
+100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
+100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
+100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
+100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
+100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
+100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
+100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
+100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
+100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
+100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
+100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
+100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
+100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
+100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
+100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
+100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
+100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
+100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
+100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
+100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
+100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
+100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
+100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
+100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
+100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
+100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
+100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
+100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
+100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
+100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
+100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
+100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
+100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
+100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
+100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
+100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
+100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
+100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-6/.git/
+fatal: object of unexpected type
+ok 32 - unpacking with --strict
 
-	d_pos="$(pack_position $(git rev-parse D) <$packdir/pack-$D.idx)" &&
-	e_pos="$(pack_position $(git rev-parse E) <$packdir/pack-$D.idx)" &&
-	f_pos="$(pack_position $(git rev-parse F) <$packdir/pack-$D.idx)" &&
+expecting success of 5300.33 'index-pack with --strict': 
 
-	# commits F, E, and D, should appear in that order at the
-	# beginning of the pack
-	test $f_pos -lt $e_pos &&
-	test $e_pos -lt $d_pos &&
+	for j in a b c d e f g
+	do
+		for i in 0 1 2 3 4 5 6 7 8 9
+		do
+			o=$(echo $j$i | git hash-object -w --stdin) &&
+			echo "100644 $o	0 $j$i" || return 1
+		done
+	done >LIST &&
+	rm -f .git/index &&
+	git update-index --index-info <LIST &&
+	LIST=$(git write-tree) &&
+	rm -f .git/index &&
+	head -n 10 LIST | git update-index --index-info &&
+	LI=$(git write-tree) &&
+	rm -f .git/index &&
+	tail -n 10 LIST | git update-index --index-info &&
+	ST=$(git write-tree) &&
+	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
+	PACK5=$( git pack-objects test-5 <actual ) &&
+	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
+	test_create_repo test-7 &&
+	(
+		cd test-7 &&
+		git index-pack --strict --stdin <../test-5-$PACK5.pack &&
+		git ls-tree -r $LIST &&
+		git ls-tree -r $LI &&
+		git ls-tree -r $ST
+	) &&
+	test_create_repo test-8 &&
+	(
+		# tree-only into empty repo -- many unreachables
+		cd test-8 &&
+		test_must_fail git index-pack --strict --stdin <../test-6-$PACK6.pack
+	) &&
+	(
+		# already populated -- no unreachables
+		cd test-7 &&
+		git index-pack --strict --stdin <../test-6-$PACK6.pack
+	)
 
-	# Ensure that the pack we are constructing sorts ahead of any
-	# other packs in lexical/bitmap order by choosing it as the
-	# preferred pack.
-	git multi-pack-index write --bitmap --preferred-pack="pack-$D.idx" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-7/.git/
+pack	580f6e9e5f1fc55c922ae4f748e6adb3737375f4
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
+100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
+100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
+100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
+100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
+100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
+100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
+100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
+100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
+100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
+100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
+100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
+100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
+100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
+100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
+100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
+100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
+100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
+100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
+100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
+100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
+100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
+100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
+100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
+100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
+100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
+100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
+100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
+100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
+100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
+100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
+100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
+100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
+100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
+100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
+100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
+100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
+100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
+100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
+100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
+100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
+100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
+100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
+100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
+100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
+100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
+100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
+100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
+100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
+100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
+100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
+100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
+100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
+100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
+100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
+100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
+100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
+100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
+100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
+100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
+100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
+100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
+100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
+100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
+100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
+100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
+100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
+100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
+100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-8/.git/
+fatal: did not receive expected object 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02
+pack	499fed00672b4ac4e35132711ee1664a089f355e
+ok 33 - index-pack with --strict
 
-	cat >in <<-EOF &&
-	$(git rev-parse E)
-	^$(git rev-parse D)
-	EOF
+expecting success of 5300.34 'setup for --strict and --fsck-objects downgrading fsck msgs': 
+	git init strict &&
+	(
+		cd strict &&
+		test_commit first hello &&
+		cat >commit <<-EOF &&
+		tree $(git rev-parse HEAD^{tree})
+		parent $(git rev-parse HEAD)
+		author A U Thor
+		committer A U Thor
 
-	test_pack_objects_reused 3 1 <in
+		commit: this is a commit with bad emails
 
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[master ee2ad00] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-[master 5374d8c] F
+		EOF
+		git hash-object --literally -t commit -w --stdin <commit >commit_list &&
+		git pack-objects test <commit_list >pack-name
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/strict/.git/
+[master (root-commit) 84f9e61] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-{"event":"data","sid":"20250209T065440.993293Z-Hcf858c9d-P001a2fff","thread":"main","time":"2025-02-09T06:54:40.994581Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001501,"t_rel":0.001501,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250209T065440.993293Z-Hcf858c9d-P001a2fff","thread":"main","time":"2025-02-09T06:54:40.994587Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001507,"t_rel":0.001507,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
-ok 8 - reuse objects from first pack with middle gap
+ create mode 100644 hello
+ok 34 - setup for --strict and --fsck-objects downgrading fsck msgs
 
-expecting success of 5332.9 'reuse objects from middle pack with middle gap': 
-	rm -fr $packdir/multi-pack-index* &&
+expecting success of 5300.35 'index-pack with --strict downgrading fsck msgs': 
+	test_with_bad_commit --strict --strict="missingEmail=ignore"
 
-	# Ensure that the pack we are constructing sort into any
-	# position *but* the first one, by choosing a different pack as
-	# the preferred one.
-	git multi-pack-index write --bitmap --preferred-pack="pack-$A.idx" &&
+error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
+ok 35 - index-pack with --strict downgrading fsck msgs
 
-	cat >in <<-EOF &&
-	$(git rev-parse E)
-	^$(git rev-parse D)
-	EOF
+expecting success of 5300.36 'index-pack with --fsck-objects downgrading fsck msgs': 
+	test_with_bad_commit --fsck-objects --fsck-objects="missingEmail=ignore"
 
-	test_pack_objects_reused 3 1 <in
+error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
+ok 36 - index-pack with --fsck-objects downgrading fsck msgs
 
-warning: unknown preferred pack: 'pack-.idx'
-{"event":"data","sid":"20250209T065441.021939Z-Hcf858c9d-P001a3074","thread":"main","time":"2025-02-09T06:54:41.023205Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001464,"t_rel":0.001464,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250209T065441.021939Z-Hcf858c9d-P001a3074","thread":"main","time":"2025-02-09T06:54:41.023211Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001470,"t_rel":0.001470,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
-ok 9 - reuse objects from middle pack with middle gap
+expecting success of 5300.37 'cleanup for --strict and --fsck-objects downgrading fsck msgs': 
+	rm -rf strict
 
-expecting success of 5332.10 'omit delta with uninteresting base (same pack)': 
-	git repack -adk &&
+ok 37 - cleanup for --strict and --fsck-objects downgrading fsck msgs
 
-	test_seq 32 >f &&
-	git add f &&
-	test_tick &&
-	git commit -m "delta" &&
-	delta="$(git rev-parse HEAD)" &&
+expecting success of 5300.38 'honor pack.packSizeLimit': 
+	git config pack.packSizeLimit 3m &&
+	packname_10=$(git pack-objects test-10 <obj-list) &&
+	test 2 = $(ls test-10-*.pack | wc -l)
 
-	test_seq 64 >f &&
-	test_tick &&
-	git commit -a -m "base" &&
-	base="$(git rev-parse HEAD)" &&
+ok 38 - honor pack.packSizeLimit
 
-	test_commit other &&
+expecting success of 5300.39 'verify resulting packs': 
+	git verify-pack test-10-*.pack
 
-	git repack -d &&
+ok 39 - verify resulting packs
 
-	have_delta "$(git rev-parse $delta:f)" "$(git rev-parse $base:f)" &&
+expecting success of 5300.40 'tolerate packsizelimit smaller than biggest object': 
+	git config pack.packSizeLimit 1 &&
+	packname_11=$(git pack-objects test-11 <obj-list) &&
+	test 5 = $(ls test-11-*.pack | wc -l)
 
-	git multi-pack-index write --bitmap &&
+warning: minimum pack size limit is 1 MiB
+ok 40 - tolerate packsizelimit smaller than biggest object
 
-	cat >in <<-EOF &&
-	$(git rev-parse other)
-	^$base
-	EOF
+expecting success of 5300.41 'verify resulting packs': 
+	git verify-pack test-11-*.pack
 
-	# We can only reuse the 3 objects corresponding to "other" from
-	# the latest pack.
-	#
-	# This is because even though we want "delta", we do not want
-	# "base", meaning that we have to inflate the delta/base-pair
-	# corresponding to the blob in commit "delta", which bypasses
-	# the pack-reuse mechanism.
-	#
-	# The remaining objects from the other pack are similarly not
-	# reused because their objects are on the uninteresting side of
-	# the query.
-	test_pack_objects_reused 3 1 <in
+ok 41 - verify resulting packs
 
-[master 16753ad] delta
- Author: A U Thor <author@example.com>
- 1 file changed, 32 insertions(+)
- create mode 100644 f
-[master f40fa4a] base
- Author: A U Thor <author@example.com>
- 1 file changed, 32 insertions(+)
-[master e389016] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-{"event":"data","sid":"20250209T065441.119801Z-Hcf858c9d-P001a3200","thread":"main","time":"2025-02-09T06:54:41.120972Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001355,"t_rel":0.001355,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250209T065441.119801Z-Hcf858c9d-P001a3200","thread":"main","time":"2025-02-09T06:54:41.120979Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001361,"t_rel":0.001361,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-341840e0d76cb213079e38bae778b53364232eb5
-ok 10 - omit delta with uninteresting base (same pack)
+expecting success of 5300.42 'set up pack for non-repo tests': 
+	# make sure we have a pack with no matching index file
+	cp test-1-*.pack foo.pack
 
-expecting success of 5332.11 'omit delta from uninteresting base (cross pack)': 
-	cat >in <<-EOF &&
-	$(git rev-parse $base)
-	^$(git rev-parse $delta)
-	EOF
+ok 42 - set up pack for non-repo tests
 
-	P="$(git pack-objects --revs $packdir/pack <in)" &&
+expecting success of 5300.43 'index-pack --stdin complains of non-repo': 
+	nongit test_must_fail git index-pack --object-format=$(test_oid algo) --stdin <foo.pack &&
+	test_path_is_missing non-repo/.git
 
-	git multi-pack-index write --bitmap --preferred-pack="pack-$P.idx" &&
+fatal: --stdin requires a git repository
+ok 43 - index-pack --stdin complains of non-repo
 
-	packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
-	objects_nr="$(git rev-list --count --all --objects)" &&
+expecting success of 5300.44 'index-pack <pack> works in non-repo': 
+	nongit git index-pack --object-format=$(test_oid algo) ../foo.pack &&
+	test_path_is_file foo.idx
 
-	test_pack_objects_reused_all $(($objects_nr - 1)) $packs_nr
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 44 - index-pack <pack> works in non-repo
 
-{"event":"data","sid":"20250209T065441.157430Z-Hcf858c9d-P001a32a2","thread":"main","time":"2025-02-09T06:54:41.159134Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001888,"t_rel":0.001888,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
-{"event":"data","sid":"20250209T065441.157430Z-Hcf858c9d-P001a32a2","thread":"main","time":"2025-02-09T06:54:41.159138Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001893,"t_rel":0.001893,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
-def7cb61a9e70183adbf1acab0912d686622303a
-ok 11 - omit delta from uninteresting base (cross pack)
+expecting success of 5300.45 'index-pack --strict <pack> works in non-repo': 
+	rm -f foo.idx &&
+	nongit git index-pack --strict --object-format=$(test_oid algo) ../foo.pack &&
+	test_path_is_file foo.idx
 
-expecting success of 5332.12 'non-omitted delta in MIDX preferred pack': 
-	test_config pack.allowPackReuse single &&
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 45 - index-pack --strict <pack> works in non-repo
 
-	cat >p1.objects <<-EOF &&
-	$(git rev-parse $base)
-	^$(git rev-parse $delta^)
-	EOF
-	cat >p2.objects <<-EOF &&
-	$(git rev-parse F)
-	EOF
+checking prerequisite: SHA1
 
-	p1="$(git pack-objects --revs $packdir/pack <p1.objects)" &&
-	p2="$(git pack-objects --revs $packdir/pack <p2.objects)" &&
+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
 
-	cat >in <<-EOF &&
-	pack-$p1.idx
-	pack-$p2.idx
-	EOF
-	git multi-pack-index write --bitmap --stdin-packs \
-		--preferred-pack=pack-$p1.pack <in &&
+)
+prerequisite SHA1 ok
+expecting success of 5300.46 'show-index works OK outside a repository': 
+	nongit git show-index <foo.idx
 
-	git show-index <$packdir/pack-$p1.idx >expect &&
+335 012b05d476b4ffc9e62d036156b99467206f1efa (c00fe8a7)
+4195970 0be779221aca65277fd447c8207e1b3c2706ae20 (e9e93ee1)
+12 3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 (8abd2aad)
+2098168 6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf (902113ef)
+304 9d235ed07cd19811a6ceb342de82f190e49c9f68 (bfe5d115)
+4196001 b010fe5253f7dc59c6605dacb92fcea00d199d4e (f8ed20b0)
+2098137 c82de19312b6c3695c0c18f70709a6c535682a67 (cf484043)
+181 ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe (512ec580)
+ok 46 - show-index works OK outside a repository
 
-	test_pack_objects_reused_all $(wc -l <expect) 1
+expecting success of 5300.47 'show-index works OK outside a repository with hash algo passed in via --object-format': 
+		test_when_finished "rm -rf explicit-hash-$hash" &&
+		git init --object-format=$hash explicit-hash-$hash &&
+		test_commit -C explicit-hash-$hash one &&
+		git -C explicit-hash-$hash rev-parse one >in &&
+		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
+		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
+		nongit git show-index --object-format=$hash <"$idx" >actual &&
+		test_line_count = 1 actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/explicit-hash-sha1/.git/
+[master (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+acdb9ae06f04f82d5e6a285e1bafea173d44bc45
+ok 47 - show-index works OK outside a repository with hash algo passed in via --object-format
 
-{"event":"data","sid":"20250209T065441.207609Z-Hcf858c9d-P001a336a","thread":"main","time":"2025-02-09T06:54:41.211010Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.003595,"t_rel":0.003595,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20250209T065441.207609Z-Hcf858c9d-P001a336a","thread":"main","time":"2025-02-09T06:54:41.211015Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.003600,"t_rel":0.003600,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-48c334c15e539df3382db77f74c864a1d31091b9
-ok 12 - non-omitted delta in MIDX preferred pack
+expecting success of 5300.48 'show-index works OK outside a repository with hash algo passed in via --object-format': 
+		test_when_finished "rm -rf explicit-hash-$hash" &&
+		git init --object-format=$hash explicit-hash-$hash &&
+		test_commit -C explicit-hash-$hash one &&
+		git -C explicit-hash-$hash rev-parse one >in &&
+		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
+		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
+		nongit git show-index --object-format=$hash <"$idx" >actual &&
+		test_line_count = 1 actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/explicit-hash-sha256/.git/
+[master (root-commit) 9185f47] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+9b2641231de0d658b94f3140148aeae12672826d54b5fbede03e02dbf4f990bd
+ok 48 - show-index works OK outside a repository with hash algo passed in via --object-format
 
-expecting success of 5332.13 'duplicate objects': 
-	git init duplicate-objects &&
-	(
-		cd duplicate-objects &&
+checking prerequisite: FAIL_PREREQS
 
-		git config pack.allowPackReuse multi &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+		test_bool_env GIT_TEST_FAIL_PREREQS false
+	
+)
+prerequisite FAIL_PREREQS not satisfied
+ok 49 # skip index-pack --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
 
-		test_commit base &&
+ok 50 # skip pack-objects --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
 
-		git repack -a &&
+expecting success of 5300.51 'pack-objects in too-many-packs mode': 
+	GIT_TEST_FULL_IN_PACK_ARRAY=1 git repack -ad &&
+	git fsck
 
-		git rev-parse HEAD^{tree} >in &&
-		p="$(git pack-objects $packdir/pack <in)" &&
+warning: minimum pack size limit is 1 MiB
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tree ebe633107a37152edb13864b30d6878084f68c92
+dangling tree eb486020614a4c764f9df37263317ed4ea372ef8
+dangling commit ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe
+ok 51 - pack-objects in too-many-packs mode
 
-		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+expecting success of 5300.52 'setup: fake a SHA1 hash collision': 
+	git init corrupt &&
+	(
+		cd corrupt &&
+		long_a=$(git hash-object -w ../a | sed -e "s!^..!&/!") &&
+		long_b=$(git hash-object -w ../b | sed -e "s!^..!&/!") &&
+		test -f	.git/objects/$long_b &&
+		cp -f	.git/objects/$long_a \
+			.git/objects/$long_b
+	)
 
-		objects_nr="$(git rev-list --count --all --objects)" &&
-		packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/corrupt/.git/
+ok 52 - setup: fake a SHA1 hash collision
 
-		test_pack_objects_reused_all $objects_nr $packs_nr
+expecting success of 5300.53 'make sure index-pack detects the SHA1 collision': 
+	(
+		cd corrupt &&
+		test_must_fail git index-pack -o ../bad.idx ../test-3.pack 2>msg &&
+		test_grep "SHA1 COLLISION FOUND" msg
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5332-multi-pack-reuse/duplicate-objects/.git/
-[master (root-commit) c1bac7b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-{"event":"data","sid":"20250209T065441.284708Z-Hcf858c9d-P001a34ac","thread":"main","time":"2025-02-09T06:54:41.285906Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001396,"t_rel":0.001396,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20250209T065441.284708Z-Hcf858c9d-P001a34ac","thread":"main","time":"2025-02-09T06:54:41.285910Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001400,"t_rel":0.001400,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-b572b333cdb15dbb54fe65e0e1361617040627d7
-ok 13 - duplicate objects
+fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
+ok 53 - make sure index-pack detects the SHA1 collision
 
-expecting success of 5332.14 'duplicate objects with verbatim reuse': 
-	git init duplicate-objects-verbatim &&
+expecting success of 5300.54 'make sure index-pack detects the SHA1 collision (large blobs)': 
 	(
-		cd duplicate-objects-verbatim &&
+		cd corrupt &&
+		test_must_fail git -c core.bigfilethreshold=1 index-pack -o ../bad.idx ../test-3.pack 2>msg &&
+		test_grep "SHA1 COLLISION FOUND" msg
+	)
 
-		git config pack.allowPackReuse multi &&
+fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
+ok 54 - make sure index-pack detects the SHA1 collision (large blobs)
 
-		test_commit_bulk 64 &&
+expecting success of 5300.55 'prefetch objects': 
+	rm -rf server client &&
 
-		# take the first object from the main pack...
-		git show-index <$(ls $packdir/pack-*.idx) >obj.raw &&
-		sort -nk1 <obj.raw | head -n1 | cut -d" " -f2 >in &&
+	git init server &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server protocol.version 2 &&
 
-		# ...and create a separate pack containing just that object
-		p="$(git pack-objects $packdir/pack <in)" &&
+	echo one >server/one &&
+	git -C server add one &&
+	git -C server commit -m one &&
+	git -C server branch one_branch &&
 
-		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+	echo two_a >server/two_a &&
+	echo two_b >server/two_b &&
+	git -C server add two_a two_b &&
+	git -C server commit -m two &&
 
-		test_pack_objects_reused_all 192 2
-	)
+	echo three >server/three &&
+	git -C server add three &&
+	git -C server commit -m three &&
+	git -C server branch three_branch &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5332-multi-pack-reuse/duplicate-objects-verbatim/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          192 (         0 duplicates                  )
-      blobs  :           64 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           64 (         0 duplicates         62 deltas of         62 attempts)
-      commits:           64 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:             64
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      15727 /      15727
----------------------------------------------------------------------
+	# Clone, fetch "two" with blobs excluded, and re-push it. This requires
+	# the client to have the blobs of "two" - verify that these are
+	# prefetched in one batch.
+	git clone --filter=blob:none --single-branch -b one_branch \
+		"file://$(pwd)/server" client &&
+	test_config -C client protocol.version 2 &&
+	TWO=$(git -C server rev-parse three_branch^) &&
+	git -C client fetch --filter=blob:none origin "$TWO" &&
+	GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch &&
+	grep "fetch> done" trace >donelines &&
+	test_line_count = 1 donelines
 
-{"event":"data","sid":"20250209T065441.357970Z-Hcf858c9d-P001a3603","thread":"main","time":"2025-02-09T06:54:41.359570Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001792,"t_rel":0.001792,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"192"}
-{"event":"data","sid":"20250209T065441.357970Z-Hcf858c9d-P001a3603","thread":"main","time":"2025-02-09T06:54:41.359574Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001796,"t_rel":0.001796,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-1ebceb2b5297fe50c38004c13872ae869e743ceb
-ok 14 - duplicate objects with verbatim reuse
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/server/.git/
+[master (root-commit) 7d92f94] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master a9c9a29] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 two_a
+ create mode 100644 two_b
+[master d4af973] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three
+Cloning into 'client'...
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/server
+ * branch            a9c9a2938d723a122aa8e03710f837cd647b4f30 -> FETCH_HEAD
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/server
+ * [new branch]      a9c9a2938d723a122aa8e03710f837cd647b4f30 -> two_branch
+ok 55 - prefetch objects
 
-# passed all 14 test(s)
-1..14
+expecting success of 5300.56 'verify-pack with sha1 packfile': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+		if test $hash = sha1
+		then
+			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+			# But with an explicit object format we should succeed.
+			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 23fa7ba] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 56 - verify-pack with sha1 packfile
+
+expecting success of 5300.57 'index-pack outside of a sha1 repository': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
+		if test $hash = sha1
+		then
+			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
+			# But with an explicit object format we should succeed.
+			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 57 - index-pack outside of a sha1 repository
+
+expecting success of 5300.58 'verify-pack with sha256 packfile': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+		if test $hash = sha1
+		then
+			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
+			# But with an explicit object format we should succeed.
+			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 24ce812] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+error: wrong index v2 file size in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx
+fatal: Cannot open existing pack idx file for '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx'
+ok 58 - verify-pack with sha256 packfile
+
+expecting success of 5300.59 'index-pack outside of a sha256 repository': 
+		test_when_finished "rm -rf repo" &&
+		git init --object-format=$hash repo &&
+		test_commit -C repo initial &&
+		git -C repo repack -ad &&
+		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
+		if test $hash = sha1
+		then
+			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		else
+			# We have no way to identify the hash used by packfiles
+			# or indices, so we always fall back to SHA1.
+			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
+			# But with an explicit object format we should succeed.
+			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
+[master (root-commit) 699ee1a] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 59 - index-pack outside of a sha256 repository
+
+# passed all 59 test(s)
+1..59
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5302-pack-index.sh ***
@@ -305503,7 +304223,7 @@
 
 20+0 records in
 20+0 records out
-20 bytes copied, 4.1361e-05 s, 484 kB/s
+20 bytes copied, 4.328e-05 s, 462 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': 
@@ -305844,148 +304564,1897 @@
 test-4-48a1956df258ba8b8a12e47466ef8e10ada5d680.pack: bad
 ok 24 - [index v1] 6) newly created pack is BAD !
 
-expecting success of 5302.25 '[index v2] 1) stream pack to repository': 
-	rm -f .git/objects/pack/* &&
-	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
-	git prune-packed &&
-	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
-	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
-	cmp "test-2-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
+expecting success of 5302.25 '[index v2] 1) stream pack to repository': 
+	rm -f .git/objects/pack/* &&
+	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+	git prune-packed &&
+	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
+	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
+	cmp "test-2-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
+
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 25 - [index v2] 1) stream pack to repository
+
+expecting success of 5302.26 '[index v2] 2) create a stealth corruption in a delta base reference': 
+	# This test assumes file_101 is a delta smaller than 16 bytes.
+	# It should be against file_100 but we substitute its base for file_099
+	sha1_101=$(git hash-object file_101) &&
+	sha1_099=$(git hash-object file_099) &&
+	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
+	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
+	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
+		if=".git/objects/pack/pack-${pack1}.idx" \
+		skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \
+		bs=1 count=$rawsz conv=notrunc &&
+	git cat-file blob $sha1_101 > file_101_foo2
+
+20+0 records in
+20+0 records out
+20 bytes copied, 4.54e-05 s, 441 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': 
+	test -f file_101_foo2 && ! cmp file_101 file_101_foo2
+
+file_101 file_101_foo2 differ: char 5, line 2
+ok 27 - [index v2] 3) corrupted delta happily returned wrong data
+
+expecting success of 5302.28 '[index v2] 4) confirm that the pack is actually corrupted': 
+	test_must_fail git fsck --full $commit
+
+error: .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack pack checksum mismatch
+error: index CRC mismatch for object 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack at offset 844032
+error: packed 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack is corrupt
+ok 28 - [index v2] 4) confirm that the pack is actually corrupted
+
+expecting success of 5302.29 '[index v2] 5) pack-objects refuses to reuse corrupted data': 
+	test_must_fail git pack-objects test-5 <obj-list &&
+	test_must_fail git pack-objects --no-reuse-object test-6 <obj-list
+
+error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
+error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
+fatal: unable to read 0b968294884af115eb5a1b941b3dabd48470c3bb
+error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
+fatal: object 0b968294884af115eb5a1b941b3dabd48470c3bb cannot be read
+ok 29 - [index v2] 5) pack-objects refuses to reuse corrupted data
+
+expecting success of 5302.30 '[index v2] 6) verify-pack detects CRC mismatch': 
+	rm -f .git/objects/pack/* &&
+	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+	git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
+	obj=$(git hash-object file_001) &&
+	nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
+	printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
+		bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
+	 ( while read obj
+	   do git cat-file -p $obj >/dev/null || exit 1
+	   done <obj-list ) &&
+	test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack"
+
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+4+0 records in
+4+0 records out
+4 bytes copied, 3.884e-05 s, 103 kB/s
+fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
+ok 30 - [index v2] 6) verify-pack detects CRC mismatch
+
+expecting success of 5302.31 'running index-pack in the object store': 
+	rm -f .git/objects/pack/* &&
+	cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack &&
+	(
+		cd .git/objects/pack &&
+		git index-pack pack-${pack1}.pack
+	) &&
+	test -f .git/objects/pack/pack-${pack1}.idx
+
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 31 - running index-pack in the object store
+
+expecting success of 5302.32 'index-pack --strict warns upon missing tagger in tag': 
+	sha=$(git rev-parse HEAD) &&
+	cat >wrong-tag <<EOF &&
+object $sha
+type commit
+tag guten tag
+
+This is an invalid tag.
+EOF
+
+	tag=$(git hash-object -t tag -w --stdin --literally <wrong-tag) &&
+	pack1=$(echo $tag $sha | git pack-objects tag-test) &&
+	echo remove tag object &&
+	thirtyeight=${tag#??} &&
+	rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight &&
+	git index-pack --strict tag-test-${pack1}.pack 2>err &&
+	grep "^warning:.* expected .tagger. line" err
+
+remove tag object
+67765b8cc9b2d3d6ffa408695798db10a387e826
+warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 32 - index-pack --strict warns upon missing tagger in tag
+
+expecting success of 5302.33 'index-pack --fsck-objects also warns upon missing tagger in tag': 
+	git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
+	grep "^warning:.* expected .tagger. line" err
+
+67765b8cc9b2d3d6ffa408695798db10a387e826
+warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 33 - index-pack --fsck-objects also warns upon missing tagger in tag
+
+expecting success of 5302.34 'index-pack -v --stdin produces progress for both phases': 
+	pack=$(git pack-objects --all pack </dev/null) &&
+	GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err &&
+	test_grep "Receiving objects" err &&
+	test_grep "Resolving deltas" err
+
+pack	37e69ad54edf78401749c7eaf0410858eb6a64ba
+Receiving objects:   0% (1/303)
Receiving objects:   1% (4/303)
Receiving objects:   2% (7/303)
Receiving objects:   3% (10/303)
Receiving objects:   4% (13/303)
Receiving objects:   5% (16/303)
Receiving objects:   6% (19/303)
Receiving objects:   7% (22/303)
Receiving objects:   8% (25/303)
Receiving objects:   9% (28/303)
Receiving objects:  10% (31/303)
Receiving objects:  11% (34/303)
Receiving objects:  12% (37/303)
Receiving objects:  13% (40/303)
Receiving objects:  14% (43/303)
Receiving objects:  15% (46/303)
Receiving objects:  16% (49/303)
Receiving objects:  17% (52/303)
Receiving objects:  18% (55/303)
Receiving objects:  19% (58/303)
Receiving objects:  20% (61/303)
Receiving objects:  21% (64/303)
Receiving objects:  22% (67/303)
Receiving objects:  23% (70/303)
Receiving objects:  24% (73/303)
Receiving objects:  25% (76/303)
Receiving objects:  26% (79/303)
Receiving objects:  27% (82/303)
Receiving objects:  28% (85/303)
Receiving objects:  29% (88/303)
Receiving objects:  30% (91/303)
Receiving objects:  31% (94/303)
Receiving objects:  32% (97/303)
Receiving objects:  33% (100/303)
Receiving objects:  34% (104/303)
Receiving objects:  35% (107/303)
Receiving objects:  36% (110/303)
Receiving objects:  37% (113/303)
Receiving objects:  38% (116/303)
Receiving objects:  39% (119/303)
Receiving objects:  40% (122/303)
Receiving objects:  41% (125/303)
Receiving objects:  42% (128/303)
Receiving objects:  43% (131/303)
Receiving objects:  44% (134/303)
Receiving objects:  45% (137/303)
Receiving objects:  46% (140/303)
Receiving objects:  47% (143/303)
Receiving objects:  48% (146/303)
Receiving objects:  49% (149/303)
Receiving objects:  50% (152/303)
Receiving objects:  51% (155/303)
Receiving objects:  52% (158/303)
Receiving objects:  53% (161/303)
Receiving objects:  54% (164/303)
Receiving objects:  55% (167/303)
Receiving objects:  56% (170/303)
Receiving objects:  57% (173/303)
Receiving objects:  58% (176/303)
Receiving objects:  59% (179/303)
Receiving objects:  60% (182/303)
Receiving objects:  61% (185/303)
Receiving objects:  62% (188/303)
Receiving objects:  63% (191/303)
Receiving objects:  64% (194/303)
Receiving objects:  65% (197/303)
Receiving objects:  66% (200/303)
Receiving objects:  67% (204/303)
Receiving objects:  68% (207/303)
Receiving objects:  69% (210/303)
Receiving objects:  70% (213/303)
Receiving objects:  71% (216/303)
Receiving objects:  72% (219/303)
Receiving objects:  73% (222/303)
Receiving objects:  74% (225/303)
Receiving objects:  75% (228/303)
Receiving objects:  76% (231/303)
Receiving objects:  77% (234/303)
Receiving objects:  78% (237/303)
Receiving objects:  79% (240/303)
Receiving objects:  80% (243/303)
Receiving objects:  81% (246/303)
Receiving objects:  82% (249/303)
Receiving objects:  83% (252/303)
Receiving objects:  84% (255/303)
Receiving objects:  85% (258/303)
Receiving objects:  86% (261/303)
Receiving objects:  87% (264/303)
Receiving objects:  88% (267/303)
Receiving objects:  89% (270/303)
Receiving objects:  90% (273/303)
Receiving objects:  91% (276/303)
Receiving objects:  92% (279/303)
Receiving objects:  93% (282/303)
Receiving objects:  94% (285/303)
Receiving objects:  95% (288/303)
Receiving objects:  96% (291/303)
Receiving objects:  97% (294/303)
Receiving objects:  98% (297/303)
Receiving objects:  99% (300/303)
Receiving objects: 100% (303/303)
Receiving objects: 100% (303/303), 833.39 KiB | 16.67 MiB/s, done.
+Resolving deltas:   0% (0/190)
Resolving deltas:   1% (2/190)
Resolving deltas:   2% (4/190)
Resolving deltas:   3% (6/190)
Resolving deltas:   4% (8/190)
Resolving deltas:   5% (10/190)
Resolving deltas:   6% (12/190)
Resolving deltas:   7% (14/190)
Resolving deltas:   8% (16/190)
Resolving deltas:   9% (18/190)
Resolving deltas:  10% (19/190)
Resolving deltas:  11% (21/190)
Resolving deltas:  12% (23/190)
Resolving deltas:  13% (25/190)
Resolving deltas:  14% (27/190)
Resolving deltas:  15% (29/190)
Resolving deltas:  16% (31/190)
Resolving deltas:  17% (33/190)
Resolving deltas:  18% (35/190)
Resolving deltas:  19% (37/190)
Resolving deltas:  20% (38/190)
Resolving deltas:  21% (40/190)
Resolving deltas:  22% (42/190)
Resolving deltas:  23% (44/190)
Resolving deltas:  24% (46/190)
Resolving deltas:  25% (48/190)
Resolving deltas:  26% (50/190)
Resolving deltas:  27% (52/190)
Resolving deltas:  28% (54/190)
Resolving deltas:  29% (56/190)
Resolving deltas:  30% (57/190)
Resolving deltas:  31% (59/190)
Resolving deltas:  32% (61/190)
Resolving deltas:  33% (63/190)
Resolving deltas:  34% (65/190)
Resolving deltas:  35% (67/190)
Resolving deltas:  36% (69/190)
Resolving deltas:  37% (71/190)
Resolving deltas:  38% (73/190)
Resolving deltas:  39% (75/190)
Resolving deltas:  40% (76/190)
Resolving deltas:  41% (78/190)
Resolving deltas:  42% (80/190)
Resolving deltas:  43% (82/190)
Resolving deltas:  44% (84/190)
Resolving deltas:  45% (86/190)
Resolving deltas:  46% (88/190)
Resolving deltas:  47% (90/190)
Resolving deltas:  48% (92/190)
Resolving deltas:  49% (94/190)
Resolving deltas:  50% (95/190)
Resolving deltas:  51% (97/190)
Resolving deltas:  52% (99/190)
Resolving deltas:  53% (101/190)
Resolving deltas:  54% (103/190)
Resolving deltas:  55% (105/190)
Resolving deltas:  56% (107/190)
Resolving deltas:  57% (109/190)
Resolving deltas:  58% (111/190)
Resolving deltas:  59% (113/190)
Resolving deltas:  60% (114/190)
Resolving deltas:  61% (116/190)
Resolving deltas:  62% (118/190)
Resolving deltas:  63% (120/190)
Resolving deltas:  64% (122/190)
Resolving deltas:  65% (124/190)
Resolving deltas:  66% (126/190)
Resolving deltas:  67% (128/190)
Resolving deltas:  68% (130/190)
Resolving deltas:  69% (132/190)
Resolving deltas:  70% (133/190)
Resolving deltas:  71% (135/190)
Resolving deltas:  72% (137/190)
Resolving deltas:  73% (139/190)
Resolving deltas:  74% (141/190)
Resolving deltas:  75% (143/190)
Resolving deltas:  76% (145/190)
Resolving deltas:  77% (147/190)
Resolving deltas:  78% (149/190)
Resolving deltas:  79% (151/190)
Resolving deltas:  80% (152/190)
Resolving deltas:  81% (154/190)
Resolving deltas:  82% (156/190)
Resolving deltas:  83% (158/190)
Resolving deltas:  84% (160/190)
Resolving deltas:  85% (162/190)
Resolving deltas:  86% (164/190)
Resolving deltas:  87% (166/190)
Resolving deltas:  88% (168/190)
Resolving deltas:  89% (170/190)
Resolving deltas:  90% (171/190)
Resolving deltas:  91% (173/190)
Resolving deltas:  92% (175/190)
Resolving deltas:  93% (177/190)
Resolving deltas:  94% (179/190)
Resolving deltas:  95% (181/190)
Resolving deltas:  96% (183/190)
Resolving deltas:  97% (185/190)
Resolving deltas:  98% (187/190)
Resolving deltas:  99% (189/190)
Resolving deltas: 100% (190/190)
Resolving deltas: 100% (190/190), done.
+ok 34 - index-pack -v --stdin produces progress for both phases
+
+expecting success of 5302.35 'too-large packs report the breach': 
+	pack=$(git pack-objects --all pack </dev/null) &&
+	sz="$(test_file_size pack-$pack.pack)" &&
+	test "$sz" -gt 20 &&
+	test_must_fail git index-pack --max-input-size=20 pack-$pack.pack 2>err &&
+	grep "maximum allowed size (20 bytes)" err
+
+fatal: pack exceeds maximum allowed size (20 bytes)
+ok 35 - too-large packs report the breach
+
+# passed all 35 test(s)
+1..35
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t4216-log-bloom.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/.git/
+expecting success of 4216.1 'setup test - repo, commits, commit graph, log outputs': 
+	git init &&
+	mkdir A A/B A/B/C &&
+	test_commit c1 A/file1 &&
+	test_commit c2 A/B/file2 &&
+	test_commit c3 A/B/C/file3 &&
+	test_commit c4 A/file1 &&
+	test_commit c5 A/B/file2 &&
+	test_commit c6 A/B/C/file3 &&
+	test_commit c7 A/file1 &&
+	test_commit c8 A/B/file2 &&
+	test_commit c9 A/B/C/file3 &&
+	test_commit c10 file_to_be_deleted &&
+	git checkout -b side HEAD~4 &&
+	test_commit side-1 file4 &&
+	git checkout main &&
+	git merge side &&
+	test_commit c11 file5 &&
+	mv file5 file5_renamed &&
+	git add file5_renamed &&
+	git commit -m "rename" &&
+	rm file_to_be_deleted &&
+	git add . &&
+	git commit -m "file removed" &&
+	git commit --allow-empty -m "empty" &&
+	git commit-graph write --reachable --changed-paths &&
+
+	test_oid_cache <<-EOF
+	oid_version sha1:1
+	oid_version sha256:2
+	EOF
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/.git/
+[main (root-commit) 3395ca5] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A/file1
+[main 017bcd5] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A/B/file2
+[main eaf8b6e] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A/B/C/file3
+[main 1ed2983] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b65cb8b] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f699e23] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main a1ed958] c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 8dd186e] c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9cac964] c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9b20140] c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file_to_be_deleted
+Switched to a new branch 'side'
+[side 0a9648a] side-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ file4 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[main cee5e20] c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5
+[main a6f579e] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5_renamed
+[main e48c09d] file removed
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 file5
+ delete mode 100644 file_to_be_deleted
+[main cb7b1a0] empty
+ Author: A U Thor <author@example.com>
+ok 1 - setup test - repo, commits, commit graph, log outputs
+
+expecting success of 4216.2 'commit-graph write wrote out the bloom chunks': 
+	graph_read_expect 16
+
+ok 2 - commit-graph write wrote out the bloom chunks
+
+expecting success of 4216.3 'git log option:  for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 3 - git log option:  for path: A
+
+expecting success of 4216.4 'git log option: --all for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 4 - git log option: --all for path: A
+
+expecting success of 4216.5 'git log option: --full-history for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 5 - git log option: --full-history for path: A
+
+expecting success of 4216.6 'git log option: --full-history --simplify-merges for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 6 - git log option: --full-history --simplify-merges for path: A
+
+expecting success of 4216.7 'git log option: --simplify-merges for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 7 - git log option: --simplify-merges for path: A
+
+expecting success of 4216.8 'git log option: --simplify-by-decoration for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 8 - git log option: --simplify-by-decoration for path: A
+
+expecting success of 4216.9 'git log option: --follow for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 9 - git log option: --follow for path: A
+
+expecting success of 4216.10 'git log option: --first-parent for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 10 - git log option: --first-parent for path: A
+
+expecting success of 4216.11 'git log option: --topo-order for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 11 - git log option: --topo-order for path: A
+
+expecting success of 4216.12 'git log option: --date-order for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 12 - git log option: --date-order for path: A
+
+expecting success of 4216.13 'git log option: --author-date-order for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 13 - git log option: --author-date-order for path: A
+
+expecting success of 4216.14 'git log option: --ancestry-path side..main for path: A': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 14 - git log option: --ancestry-path side..main for path: A
+
+expecting success of 4216.15 'git log option:  for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 15 - git log option:  for path: A/B
+
+expecting success of 4216.16 'git log option: --all for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 16 - git log option: --all for path: A/B
+
+expecting success of 4216.17 'git log option: --full-history for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 17 - git log option: --full-history for path: A/B
+
+expecting success of 4216.18 'git log option: --full-history --simplify-merges for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 18 - git log option: --full-history --simplify-merges for path: A/B
+
+expecting success of 4216.19 'git log option: --simplify-merges for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 19 - git log option: --simplify-merges for path: A/B
+
+expecting success of 4216.20 'git log option: --simplify-by-decoration for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 20 - git log option: --simplify-by-decoration for path: A/B
+
+expecting success of 4216.21 'git log option: --follow for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 21 - git log option: --follow for path: A/B
+
+expecting success of 4216.22 'git log option: --first-parent for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 22 - git log option: --first-parent for path: A/B
+
+expecting success of 4216.23 'git log option: --topo-order for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 23 - git log option: --topo-order for path: A/B
+
+expecting success of 4216.24 'git log option: --date-order for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 24 - git log option: --date-order for path: A/B
+
+expecting success of 4216.25 'git log option: --author-date-order for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 25 - git log option: --author-date-order for path: A/B
+
+expecting success of 4216.26 'git log option: --ancestry-path side..main for path: A/B': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 26 - git log option: --ancestry-path side..main for path: A/B
+
+expecting success of 4216.27 'git log option:  for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 27 - git log option:  for path: A/B/C
+
+expecting success of 4216.28 'git log option: --all for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 28 - git log option: --all for path: A/B/C
+
+expecting success of 4216.29 'git log option: --full-history for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 29 - git log option: --full-history for path: A/B/C
+
+expecting success of 4216.30 'git log option: --full-history --simplify-merges for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 30 - git log option: --full-history --simplify-merges for path: A/B/C
+
+expecting success of 4216.31 'git log option: --simplify-merges for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 31 - git log option: --simplify-merges for path: A/B/C
+
+expecting success of 4216.32 'git log option: --simplify-by-decoration for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 32 - git log option: --simplify-by-decoration for path: A/B/C
+
+expecting success of 4216.33 'git log option: --follow for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 33 - git log option: --follow for path: A/B/C
+
+expecting success of 4216.34 'git log option: --first-parent for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 34 - git log option: --first-parent for path: A/B/C
+
+expecting success of 4216.35 'git log option: --topo-order for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 35 - git log option: --topo-order for path: A/B/C
+
+expecting success of 4216.36 'git log option: --date-order for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 36 - git log option: --date-order for path: A/B/C
+
+expecting success of 4216.37 'git log option: --author-date-order for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 37 - git log option: --author-date-order for path: A/B/C
+
+expecting success of 4216.38 'git log option: --ancestry-path side..main for path: A/B/C': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 38 - git log option: --ancestry-path side..main for path: A/B/C
+
+expecting success of 4216.39 'git log option:  for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 39 - git log option:  for path: A/file1
+
+expecting success of 4216.40 'git log option: --all for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 40 - git log option: --all for path: A/file1
+
+expecting success of 4216.41 'git log option: --full-history for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 41 - git log option: --full-history for path: A/file1
+
+expecting success of 4216.42 'git log option: --full-history --simplify-merges for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 42 - git log option: --full-history --simplify-merges for path: A/file1
+
+expecting success of 4216.43 'git log option: --simplify-merges for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 43 - git log option: --simplify-merges for path: A/file1
+
+expecting success of 4216.44 'git log option: --simplify-by-decoration for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 44 - git log option: --simplify-by-decoration for path: A/file1
+
+expecting success of 4216.45 'git log option: --follow for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 45 - git log option: --follow for path: A/file1
+
+expecting success of 4216.46 'git log option: --first-parent for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 46 - git log option: --first-parent for path: A/file1
+
+expecting success of 4216.47 'git log option: --topo-order for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 47 - git log option: --topo-order for path: A/file1
+
+expecting success of 4216.48 'git log option: --date-order for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 48 - git log option: --date-order for path: A/file1
+
+expecting success of 4216.49 'git log option: --author-date-order for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 49 - git log option: --author-date-order for path: A/file1
+
+expecting success of 4216.50 'git log option: --ancestry-path side..main for path: A/file1': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 50 - git log option: --ancestry-path side..main for path: A/file1
+
+expecting success of 4216.51 'git log option:  for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 51 - git log option:  for path: A/B/file2
+
+expecting success of 4216.52 'git log option: --all for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 52 - git log option: --all for path: A/B/file2
+
+expecting success of 4216.53 'git log option: --full-history for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 53 - git log option: --full-history for path: A/B/file2
+
+expecting success of 4216.54 'git log option: --full-history --simplify-merges for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 54 - git log option: --full-history --simplify-merges for path: A/B/file2
+
+expecting success of 4216.55 'git log option: --simplify-merges for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 55 - git log option: --simplify-merges for path: A/B/file2
+
+expecting success of 4216.56 'git log option: --simplify-by-decoration for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 56 - git log option: --simplify-by-decoration for path: A/B/file2
+
+expecting success of 4216.57 'git log option: --follow for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 57 - git log option: --follow for path: A/B/file2
+
+expecting success of 4216.58 'git log option: --first-parent for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 58 - git log option: --first-parent for path: A/B/file2
+
+expecting success of 4216.59 'git log option: --topo-order for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 59 - git log option: --topo-order for path: A/B/file2
+
+expecting success of 4216.60 'git log option: --date-order for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 60 - git log option: --date-order for path: A/B/file2
+
+expecting success of 4216.61 'git log option: --author-date-order for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 61 - git log option: --author-date-order for path: A/B/file2
+
+expecting success of 4216.62 'git log option: --ancestry-path side..main for path: A/B/file2': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 62 - git log option: --ancestry-path side..main for path: A/B/file2
+
+expecting success of 4216.63 'git log option:  for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 63 - git log option:  for path: A/B/C/file3
+
+expecting success of 4216.64 'git log option: --all for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 64 - git log option: --all for path: A/B/C/file3
+
+expecting success of 4216.65 'git log option: --full-history for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 65 - git log option: --full-history for path: A/B/C/file3
+
+expecting success of 4216.66 'git log option: --full-history --simplify-merges for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 66 - git log option: --full-history --simplify-merges for path: A/B/C/file3
+
+expecting success of 4216.67 'git log option: --simplify-merges for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 67 - git log option: --simplify-merges for path: A/B/C/file3
+
+expecting success of 4216.68 'git log option: --simplify-by-decoration for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 68 - git log option: --simplify-by-decoration for path: A/B/C/file3
+
+expecting success of 4216.69 'git log option: --follow for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 69 - git log option: --follow for path: A/B/C/file3
+
+expecting success of 4216.70 'git log option: --first-parent for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 70 - git log option: --first-parent for path: A/B/C/file3
+
+expecting success of 4216.71 'git log option: --topo-order for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 71 - git log option: --topo-order for path: A/B/C/file3
+
+expecting success of 4216.72 'git log option: --date-order for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 72 - git log option: --date-order for path: A/B/C/file3
+
+expecting success of 4216.73 'git log option: --author-date-order for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 73 - git log option: --author-date-order for path: A/B/C/file3
+
+expecting success of 4216.74 'git log option: --ancestry-path side..main for path: A/B/C/file3': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 74 - git log option: --ancestry-path side..main for path: A/B/C/file3
+
+expecting success of 4216.75 'git log option:  for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 75 - git log option:  for path: file4
+
+expecting success of 4216.76 'git log option: --all for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 76 - git log option: --all for path: file4
+
+expecting success of 4216.77 'git log option: --full-history for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 77 - git log option: --full-history for path: file4
+
+expecting success of 4216.78 'git log option: --full-history --simplify-merges for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 78 - git log option: --full-history --simplify-merges for path: file4
+
+expecting success of 4216.79 'git log option: --simplify-merges for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 79 - git log option: --simplify-merges for path: file4
+
+expecting success of 4216.80 'git log option: --simplify-by-decoration for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 80 - git log option: --simplify-by-decoration for path: file4
+
+expecting success of 4216.81 'git log option: --follow for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 81 - git log option: --follow for path: file4
+
+expecting success of 4216.82 'git log option: --first-parent for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 82 - git log option: --first-parent for path: file4
+
+expecting success of 4216.83 'git log option: --topo-order for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 83 - git log option: --topo-order for path: file4
+
+expecting success of 4216.84 'git log option: --date-order for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 84 - git log option: --date-order for path: file4
+
+expecting success of 4216.85 'git log option: --author-date-order for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 85 - git log option: --author-date-order for path: file4
+
+expecting success of 4216.86 'git log option: --ancestry-path side..main for path: file4': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 86 - git log option: --ancestry-path side..main for path: file4
+
+expecting success of 4216.87 'git log option:  for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 87 - git log option:  for path: file5
+
+expecting success of 4216.88 'git log option: --all for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 88 - git log option: --all for path: file5
+
+expecting success of 4216.89 'git log option: --full-history for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 89 - git log option: --full-history for path: file5
+
+expecting success of 4216.90 'git log option: --full-history --simplify-merges for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 90 - git log option: --full-history --simplify-merges for path: file5
+
+expecting success of 4216.91 'git log option: --simplify-merges for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 91 - git log option: --simplify-merges for path: file5
+
+expecting success of 4216.92 'git log option: --simplify-by-decoration for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 92 - git log option: --simplify-by-decoration for path: file5
+
+expecting success of 4216.93 'git log option: --follow for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 93 - git log option: --follow for path: file5
+
+expecting success of 4216.94 'git log option: --first-parent for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 94 - git log option: --first-parent for path: file5
+
+expecting success of 4216.95 'git log option: --topo-order for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 95 - git log option: --topo-order for path: file5
+
+expecting success of 4216.96 'git log option: --date-order for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 96 - git log option: --date-order for path: file5
+
+expecting success of 4216.97 'git log option: --author-date-order for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 97 - git log option: --author-date-order for path: file5
+
+expecting success of 4216.98 'git log option: --ancestry-path side..main for path: file5': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 98 - git log option: --ancestry-path side..main for path: file5
+
+expecting success of 4216.99 'git log option:  for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 99 - git log option:  for path: file5_renamed
+
+expecting success of 4216.100 'git log option: --all for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 100 - git log option: --all for path: file5_renamed
+
+expecting success of 4216.101 'git log option: --full-history for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 101 - git log option: --full-history for path: file5_renamed
+
+expecting success of 4216.102 'git log option: --full-history --simplify-merges for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 102 - git log option: --full-history --simplify-merges for path: file5_renamed
+
+expecting success of 4216.103 'git log option: --simplify-merges for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 103 - git log option: --simplify-merges for path: file5_renamed
+
+expecting success of 4216.104 'git log option: --simplify-by-decoration for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 104 - git log option: --simplify-by-decoration for path: file5_renamed
+
+expecting success of 4216.105 'git log option: --follow for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 105 - git log option: --follow for path: file5_renamed
+
+expecting success of 4216.106 'git log option: --first-parent for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 106 - git log option: --first-parent for path: file5_renamed
+
+expecting success of 4216.107 'git log option: --topo-order for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 107 - git log option: --topo-order for path: file5_renamed
+
+expecting success of 4216.108 'git log option: --date-order for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 108 - git log option: --date-order for path: file5_renamed
+
+expecting success of 4216.109 'git log option: --author-date-order for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 109 - git log option: --author-date-order for path: file5_renamed
+
+expecting success of 4216.110 'git log option: --ancestry-path side..main for path: file5_renamed': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 110 - git log option: --ancestry-path side..main for path: file5_renamed
+
+expecting success of 4216.111 'git log option:  for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 111 - git log option:  for path: file_to_be_deleted
+
+expecting success of 4216.112 'git log option: --all for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 112 - git log option: --all for path: file_to_be_deleted
+
+expecting success of 4216.113 'git log option: --full-history for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 113 - git log option: --full-history for path: file_to_be_deleted
+
+expecting success of 4216.114 'git log option: --full-history --simplify-merges for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 114 - git log option: --full-history --simplify-merges for path: file_to_be_deleted
+
+expecting success of 4216.115 'git log option: --simplify-merges for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 115 - git log option: --simplify-merges for path: file_to_be_deleted
+
+expecting success of 4216.116 'git log option: --simplify-by-decoration for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 116 - git log option: --simplify-by-decoration for path: file_to_be_deleted
+
+expecting success of 4216.117 'git log option: --follow for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 117 - git log option: --follow for path: file_to_be_deleted
+
+expecting success of 4216.118 'git log option: --first-parent for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 118 - git log option: --first-parent for path: file_to_be_deleted
+
+expecting success of 4216.119 'git log option: --topo-order for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 119 - git log option: --topo-order for path: file_to_be_deleted
+
+expecting success of 4216.120 'git log option: --date-order for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 120 - git log option: --date-order for path: file_to_be_deleted
+
+expecting success of 4216.121 'git log option: --author-date-order for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 121 - git log option: --author-date-order for path: file_to_be_deleted
+
+expecting success of 4216.122 'git log option: --ancestry-path side..main for path: file_to_be_deleted': 
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		
+ok 122 - git log option: --ancestry-path side..main for path: file_to_be_deleted
+
+expecting success of 4216.123 'git log -- folder works with and without the trailing slash': 
+	test_bloom_filters_used "-- A" &&
+	test_bloom_filters_used "-- A/"
+
+ok 123 - git log -- folder works with and without the trailing slash
+
+expecting success of 4216.124 'git log for path that does not exist. ': 
+	test_bloom_filters_used "-- path_does_not_exist"
+
+ok 124 - git log for path that does not exist. 
+
+expecting success of 4216.125 'git log with --walk-reflogs does not use Bloom filters': 
+	test_bloom_filters_not_used "--walk-reflogs -- A"
+
+ok 125 - git log with --walk-reflogs does not use Bloom filters
+
+expecting success of 4216.126 'git log -- multiple path specs does not use Bloom filters': 
+	test_bloom_filters_not_used "-- file4 A/file1"
+
+ok 126 - git log -- multiple path specs does not use Bloom filters
+
+expecting success of 4216.127 'git log -- "." pathspec at root does not use Bloom filters': 
+	test_bloom_filters_not_used "-- ."
+
+ok 127 - git log -- "." pathspec at root does not use Bloom filters
+
+expecting success of 4216.128 'git log with wildcard that resolves to a single path uses Bloom filters': 
+	test_bloom_filters_used "-- *4" &&
+	test_bloom_filters_used "-- *renamed"
+
+ok 128 - git log with wildcard that resolves to a single path uses Bloom filters
+
+expecting success of 4216.129 'git log with wildcard that resolves to a multiple paths does not uses Bloom filters': 
+	test_bloom_filters_not_used "-- *" &&
+	test_bloom_filters_not_used "-- file*"
+
+ok 129 - git log with wildcard that resolves to a multiple paths does not uses Bloom filters
+
+expecting success of 4216.130 'setup - add commit-graph to the chain without Bloom filters': 
+	test_commit c14 A/anotherFile2 &&
+	test_commit c15 A/B/anotherFile2 &&
+	test_commit c16 A/B/C/anotherFile2 &&
+	git commit-graph write --reachable --split --no-changed-paths &&
+	test_line_count = 2 .git/objects/info/commit-graphs/commit-graph-chain
+
+[main c5e23fe] c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A/anotherFile2
+[main 46aa982] c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A/B/anotherFile2
+[main 79a46f1] c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A/B/C/anotherFile2
+ok 130 - setup - add commit-graph to the chain without Bloom filters
+
+expecting success of 4216.131 'use Bloom filters even if the latest graph does not have Bloom filters': 
+	# Ensure that the number of empty filters is equal to the number of
+	# filters in the latest graph layer to prove that they are loaded (and
+	# ignored).
+	test_bloom_filters_used "-- A/B" 3
+
+ok 131 - use Bloom filters even if the latest graph does not have Bloom filters
+
+expecting success of 4216.132 'setup - add commit-graph to the chain with Bloom filters': 
+	test_commit c17 A/anotherFile3 &&
+	git commit-graph write --reachable --changed-paths --split &&
+	test_line_count = 3 .git/objects/info/commit-graphs/commit-graph-chain
+
+[main 38770ff] c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A/anotherFile3
+ok 132 - setup - add commit-graph to the chain with Bloom filters
+
+expecting success of 4216.133 'Use Bloom filters if they exist in the latest but not all commit graphs in the chain.': 
+	test_bloom_filters_used_when_some_filters_are_missing "-- A/B"
+
+ok 133 - Use Bloom filters if they exist in the latest but not all commit graphs in the chain.
+
+expecting success of 4216.134 'persist filter settings': 
+	test_when_finished rm -rf .git/objects/info/commit-graph* &&
+	rm -rf .git/objects/info/commit-graph* &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=9 \
+		GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY=15 \
+		git commit-graph write --reachable --changed-paths &&
+	grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2-auto.txt" \
+		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":"20260314T133159.892832Z-H5c947e1c-P00025366","thread":"main","time":"2026-03-14T13:31:59.897026Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.004378,"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":"20260314T133159.952032Z-H5c947e1c-P0002538f","thread":"main","time":"2026-03-14T13:31:59.962619Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.010792,"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': 
+	git init limits &&
+	(
+		cd limits &&
+		mkdir d &&
+		mkdir d/e &&
+
+		for i in $(test_seq 1 2)
+		do
+			printf $i >d/file$i.txt &&
+			printf $i >d/e/file$i.txt || return 1
+		done &&
+
+		mkdir mode &&
+		printf bash >mode/script.sh &&
+
+		mkdir foo &&
+		touch foo/bar &&
+		touch foo.txt &&
+
+		git add d foo foo.txt mode &&
+		git commit -m "files" &&
+
+		# Commit has 7 file and 4 directory adds
+		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
+			GIT_TRACE2_EVENT="$(pwd)/trace" \
+			git commit-graph write --reachable --changed-paths &&
+		test_max_changed_paths 10 trace &&
+		test_filter_computed 1 trace &&
+		test_filter_trunc_large 1 trace &&
+
+		for path in $(git ls-tree -r --name-only HEAD)
+		do
+			git -c commitGraph.readChangedPaths=false log \
+				-- $path >expect &&
+			git log -- $path >actual &&
+			test_cmp expect actual || return 1
+		done &&
+
+		# Make a variety of path changes
+		printf new1 >d/e/file1.txt &&
+		printf new2 >d/file2.txt &&
+		rm d/e/file2.txt &&
+		rm -r foo &&
+		printf text >foo &&
+		mkdir f &&
+		printf new1 >f/file1.txt &&
+
+		# including a mode-only change (counts as modified)
+		git update-index --chmod=+x mode/script.sh &&
+
+		git add foo d f &&
+		git commit -m "complicated" &&
+
+		# start from scratch and rebuild
+		rm -f .git/objects/info/commit-graph &&
+		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
+			GIT_TRACE2_EVENT="$(pwd)/trace-edit" \
+			git commit-graph write --reachable --changed-paths &&
+		test_max_changed_paths 10 trace-edit &&
+		test_filter_computed 2 trace-edit &&
+		test_filter_trunc_large 2 trace-edit &&
+
+		for path in $(git ls-tree -r --name-only HEAD)
+		do
+			git -c commitGraph.readChangedPaths=false log \
+				-- $path >expect &&
+			git log -- $path >actual &&
+			test_cmp expect actual || return 1
+		done &&
+
+		# start from scratch and rebuild
+		rm -f .git/objects/info/commit-graph &&
+		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=11 \
+			GIT_TRACE2_EVENT="$(pwd)/trace-update" \
+			git commit-graph write --reachable --changed-paths &&
+		test_max_changed_paths 11 trace-update &&
+		test_filter_computed 2 trace-update &&
+		test_filter_trunc_large 0 trace-update &&
+
+		for path in $(git ls-tree -r --name-only HEAD)
+		do
+			git -c commitGraph.readChangedPaths=false log \
+				-- $path >expect &&
+			git log -- $path >actual &&
+			test_cmp expect actual || return 1
+		done
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/limits/.git/
+[main (root-commit) cd6b1a6] files
+ Author: A U Thor <author@example.com>
+ 7 files changed, 5 insertions(+)
+ create mode 100644 d/e/file1.txt
+ create mode 100644 d/e/file2.txt
+ create mode 100644 d/file1.txt
+ create mode 100644 d/file2.txt
+ create mode 100644 foo.txt
+ create mode 100644 foo/bar
+ create mode 100644 mode/script.sh
+{"event":"data_json","sid":"20260314T133200.292112Z-H5c947e1c-P00025496","thread":"main","time":"2026-03-14T13:32:00.304471Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.012556,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
+{"event":"data","sid":"20260314T133200.292112Z-H5c947e1c-P00025496","thread":"main","time":"2026-03-14T13:32:00.304316Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.012398,"t_rel":0.012398,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260314T133200.292112Z-H5c947e1c-P00025496","thread":"main","time":"2026-03-14T13:32:00.304348Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.012433,"t_rel":0.012433,"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(-)
+ delete mode 100644 d/e/file2.txt
+ create mode 100644 f/file1.txt
+ create mode 100644 foo
+ delete mode 100644 foo/bar
+ mode change 100644 => 100755 mode/script.sh
+{"event":"data_json","sid":"20260314T133201.026863Z-H5c947e1c-P000256c9","thread":"main","time":"2026-03-14T13:32:01.028740Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002078,"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":"20260314T133201.026863Z-H5c947e1c-P000256c9","thread":"main","time":"2026-03-14T13:32:01.028592Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001927,"t_rel":0.001927,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260314T133201.026863Z-H5c947e1c-P000256c9","thread":"main","time":"2026-03-14T13:32:01.028623Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001961,"t_rel":0.001961,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
+{"event":"data_json","sid":"20260314T133201.577754Z-H5c947e1c-P00025874","thread":"main","time":"2026-03-14T13:32:01.579810Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002279,"t_rel":0.000014,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":11}}
+{"event":"data","sid":"20260314T133201.577754Z-H5c947e1c-P00025874","thread":"main","time":"2026-03-14T13:32:01.579648Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.002115,"t_rel":0.002115,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260314T133201.577754Z-H5c947e1c-P00025874","thread":"main","time":"2026-03-14T13:32:01.579679Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.002149,"t_rel":0.002149,"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': 
+	git init empty &&
+	test_when_finished "rm -fr empty" &&
+	(
+		cd empty &&
+
+		git commit --allow-empty -m "initial commit" &&
+
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --changed-paths &&
+		test_filter_computed 1 trace.event &&
+		test_filter_not_computed 0 trace.event &&
+		test_filter_trunc_empty 1 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/empty/.git/
+[main (root-commit) 9c26810] initial commit
+ Author: A U Thor <author@example.com>
+{"event":"data","sid":"20260314T133202.220269Z-H5c947e1c-P00025ac9","thread":"main","time":"2026-03-14T13:32:02.229881Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.009826,"t_rel":0.009826,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260314T133202.220269Z-H5c947e1c-P00025ac9","thread":"main","time":"2026-03-14T13:32:02.229902Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.009851,"t_rel":0.009851,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
+{"event":"data","sid":"20260314T133202.220269Z-H5c947e1c-P00025ac9","thread":"main","time":"2026-03-14T13:32:02.229908Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.009857,"t_rel":0.009857,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
+{"event":"data","sid":"20260314T133202.220269Z-H5c947e1c-P00025ac9","thread":"main","time":"2026-03-14T13:32:02.229913Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.009862,"t_rel":0.009862,"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': 
+	(
+		cd limits &&
+		test_commit c2 filter &&
+		test_commit c3 filter &&
+		test_commit c4 no-filter &&
+
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --split=replace \
+				--changed-paths --max-new-filters=2 &&
+
+		test_filter_computed 2 trace.event &&
+		test_filter_not_computed 3 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+
+[main cd5d6de] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 filter
+[main 461d681] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 6810c95] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-filter
+{"event":"data","sid":"20260314T133202.646402Z-H5c947e1c-P00025c17","thread":"main","time":"2026-03-14T13:32:02.648119Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001911,"t_rel":0.001911,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260314T133202.646402Z-H5c947e1c-P00025c17","thread":"main","time":"2026-03-14T13:32:02.648137Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.001932,"t_rel":0.001932,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
+{"event":"data","sid":"20260314T133202.646402Z-H5c947e1c-P00025c17","thread":"main","time":"2026-03-14T13:32:02.648142Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.001937,"t_rel":0.001937,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260314T133202.646402Z-H5c947e1c-P00025c17","thread":"main","time":"2026-03-14T13:32:02.648147Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001941,"t_rel":0.001941,"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': 
+	# Check specifying commitGraph.maxNewFilters over "git config" works.
+	test_config -C limits commitGraph.maxNewFilters 1 &&
+	(
+		cd limits &&
+
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --changed-paths \
+				--split=replace &&
+		test_filter_computed 1 trace.event &&
+		test_filter_not_computed 4 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+
+{"event":"data","sid":"20260314T133202.820343Z-H5c947e1c-P00025cb7","thread":"main","time":"2026-03-14T13:32:02.830115Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.009960,"t_rel":0.009960,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260314T133202.820343Z-H5c947e1c-P00025cb7","thread":"main","time":"2026-03-14T13:32:02.830135Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.009984,"t_rel":0.009984,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260314T133202.820343Z-H5c947e1c-P00025cb7","thread":"main","time":"2026-03-14T13:32:02.830141Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.009990,"t_rel":0.009990,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260314T133202.820343Z-H5c947e1c-P00025cb7","thread":"main","time":"2026-03-14T13:32:02.830146Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.009995,"t_rel":0.009995,"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': 
+	git init override &&
+	test_when_finished "rm -fr override" &&
+	test_config -C override commitGraph.maxNewFilters 2 &&
+	(
+		cd override &&
+		test_commit one &&
+		test_commit two &&
+
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --changed-paths \
+				--max-new-filters=1 &&
+		test_filter_computed 1 trace.event &&
+		test_filter_not_computed 1 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/override/.git/
+[main (root-commit) ff67e84] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 7c5280f] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+{"event":"data","sid":"20260314T133203.268234Z-H5c947e1c-P00025e35","thread":"main","time":"2026-03-14T13:32:03.275864Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.007834,"t_rel":0.007834,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260314T133203.268234Z-H5c947e1c-P00025e35","thread":"main","time":"2026-03-14T13:32:03.275887Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.007861,"t_rel":0.007861,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
+{"event":"data","sid":"20260314T133203.268234Z-H5c947e1c-P00025e35","thread":"main","time":"2026-03-14T13:32:03.275893Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.007866,"t_rel":0.007866,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260314T133203.268234Z-H5c947e1c-P00025e35","thread":"main","time":"2026-03-14T13:32:03.275897Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.007871,"t_rel":0.007871,"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': 
+	git init empty &&
+	test_when_finished "rm -fr empty" &&
+	(
+		cd empty &&
+		for i in $(test_seq 1 6)
+		do
+			git commit --allow-empty -m "$i" || return 1
+		done &&
+
+		# Generate Bloom filters for empty commits 1-6, two at a time.
+		for i in $(test_seq 1 3)
+		do
+			rm -f trace.event &&
+			GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+				git commit-graph write --reachable \
+					--changed-paths --max-new-filters=2 &&
+			test_filter_computed 2 trace.event &&
+			test_filter_not_computed 4 trace.event &&
+			test_filter_trunc_empty 2 trace.event &&
+			test_filter_trunc_large 0 trace.event || return 1
+		done &&
+
+		# Finally, make sure that once all commits have filters, that
+		# none are subsequently recomputed.
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable \
+				--changed-paths --max-new-filters=2 &&
+		test_filter_computed 0 trace.event &&
+		test_filter_not_computed 6 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/empty/.git/
+[main (root-commit) 36bf629] 1
+ Author: A U Thor <author@example.com>
+[main 73266b6] 2
+ Author: A U Thor <author@example.com>
+[main efbc158] 3
+ Author: A U Thor <author@example.com>
+[main f013c5f] 4
+ Author: A U Thor <author@example.com>
+[main 29fe1c6] 5
+ Author: A U Thor <author@example.com>
+[main 55bcad0] 6
+ Author: A U Thor <author@example.com>
+{"event":"data","sid":"20260314T133203.800070Z-H5c947e1c-P00026019","thread":"main","time":"2026-03-14T13:32:03.805844Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.005969,"t_rel":0.005969,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260314T133203.800070Z-H5c947e1c-P00026019","thread":"main","time":"2026-03-14T13:32:03.805864Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.005993,"t_rel":0.005993,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260314T133203.800070Z-H5c947e1c-P00026019","thread":"main","time":"2026-03-14T13:32:03.805869Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.005999,"t_rel":0.005999,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20260314T133203.800070Z-H5c947e1c-P00026019","thread":"main","time":"2026-03-14T13:32:03.805875Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.006004,"t_rel":0.006004,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260314T133203.904442Z-H5c947e1c-P00026075","thread":"main","time":"2026-03-14T13:32:03.910891Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.006653,"t_rel":0.006653,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260314T133203.904442Z-H5c947e1c-P00026075","thread":"main","time":"2026-03-14T13:32:03.910910Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.006676,"t_rel":0.006676,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260314T133203.904442Z-H5c947e1c-P00026075","thread":"main","time":"2026-03-14T13:32:03.910916Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.006681,"t_rel":0.006681,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20260314T133203.904442Z-H5c947e1c-P00026075","thread":"main","time":"2026-03-14T13:32:03.910921Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.006686,"t_rel":0.006686,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260314T133204.014439Z-H5c947e1c-P000260d7","thread":"main","time":"2026-03-14T13:32:04.016093Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001851,"t_rel":0.001851,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20260314T133204.014439Z-H5c947e1c-P000260d7","thread":"main","time":"2026-03-14T13:32:04.016112Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.001873,"t_rel":0.001873,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20260314T133204.014439Z-H5c947e1c-P000260d7","thread":"main","time":"2026-03-14T13:32:04.016119Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.001879,"t_rel":0.001879,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20260314T133204.014439Z-H5c947e1c-P000260d7","thread":"main","time":"2026-03-14T13:32:04.016124Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.001884,"t_rel":0.001884,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20260314T133204.120226Z-H5c947e1c-P0002612a","thread":"main","time":"2026-03-14T13:32:04.129917Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.009882,"t_rel":0.009882,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20260314T133204.120226Z-H5c947e1c-P0002612a","thread":"main","time":"2026-03-14T13:32:04.129943Z","file":"commit-graph.c","line":1780,"repo":1,"t_abs":0.009912,"t_rel":0.009912,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
+{"event":"data","sid":"20260314T133204.120226Z-H5c947e1c-P0002612a","thread":"main","time":"2026-03-14T13:32:04.129949Z","file":"commit-graph.c","line":1782,"repo":1,"t_abs":0.009918,"t_rel":0.009918,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20260314T133204.120226Z-H5c947e1c-P0002612a","thread":"main","time":"2026-03-14T13:32:04.129954Z","file":"commit-graph.c","line":1784,"repo":1,"t_abs":0.009923,"t_rel":0.009923,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+ok 140 - Bloom generation backfills empty commits
+
+expecting success of 4216.141 'setup for mixed Bloom setting tests': 
+	repo=mixed-bloom-settings &&
+
+	git init $repo &&
+	for i in one two three
+	do
+		test_commit -C $repo $i file || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/mixed-bloom-settings/.git/
+[main (root-commit) 756b681] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 55d464c] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e3ee3ce] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 141 - setup for mixed Bloom setting tests
+
+expecting success of 4216.142 'ensure Bloom filters with incompatible settings are ignored': 
+	# Compute Bloom filters with "unusual" settings.
+	git -C $repo rev-parse one >in &&
+	GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=3 git -C $repo commit-graph write \
+		--stdin-commits --changed-paths --split <in &&
+	layer=$(head -n 1 $repo/$chain) &&
+
+	# A commit-graph layer without Bloom filters "hides" the layers
+	# below ...
+	git -C $repo rev-parse two >in &&
+	git -C $repo commit-graph write --stdin-commits --no-changed-paths \
+		--split=no-merge <in &&
+
+	# Another commit-graph layer that has Bloom filters, but with
+	# standard settings, and is thus incompatible with the base
+	# layer written above.
+	git -C $repo rev-parse HEAD >in &&
+	git -C $repo commit-graph write --stdin-commits --changed-paths \
+		--split=no-merge <in &&
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 25 - [index v2] 1) stream pack to repository
+	test_line_count = 3 $repo/$chain &&
 
-expecting success of 5302.26 '[index v2] 2) create a stealth corruption in a delta base reference': 
-	# This test assumes file_101 is a delta smaller than 16 bytes.
-	# It should be against file_100 but we substitute its base for file_099
-	sha1_101=$(git hash-object file_101) &&
-	sha1_099=$(git hash-object file_099) &&
-	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
-	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
-	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
-	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
-		if=".git/objects/pack/pack-${pack1}.idx" \
-		skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \
-		bs=1 count=$rawsz conv=notrunc &&
-	git cat-file blob $sha1_101 > file_101_foo2
+	# Ensure that incompatible Bloom filters are ignored.
+	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- file \
+		>expect 2>err &&
+	git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
+	test_cmp expect actual &&
+	grep "disabling Bloom filters for commit-graph layer .$layer." err
 
-20+0 records in
-20+0 records out
-20 bytes copied, 4.308e-05 s, 464 kB/s
-ok 26 - [index v2] 2) create a stealth corruption in a delta base reference
+warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
+ok 142 - ensure Bloom filters with incompatible settings are ignored
 
-expecting success of 5302.27 '[index v2] 3) corrupted delta happily returned wrong data': 
-	test -f file_101_foo2 && ! cmp file_101 file_101_foo2
+expecting success of 4216.143 'merge graph layers with incompatible Bloom settings': 
+	# Ensure that incompatible Bloom filters are ignored when
+	# merging existing layers.
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C $repo commit-graph write --reachable --changed-paths 2>err &&
+	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
+	grep "{\"hash_version\":1,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt &&
 
-file_101 file_101_foo2 differ: char 5, line 2
-ok 27 - [index v2] 3) corrupted delta happily returned wrong data
+	test_path_is_file $repo/$graph &&
+	test_dir_is_empty $repo/$graphdir &&
 
-expecting success of 5302.28 '[index v2] 4) confirm that the pack is actually corrupted': 
-	test_must_fail git fsck --full $commit
+	git -C $repo -c core.commitGraph=false log --oneline --no-decorate -- \
+		file >expect &&
+	trace_out="$(pwd)/trace.perf" &&
+	GIT_TRACE2_PERF="$trace_out" \
+		git -C $repo log --oneline --no-decorate -- file >actual 2>err &&
 
-error: .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack pack checksum mismatch
-error: index CRC mismatch for object 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack at offset 844032
-error: packed 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack is corrupt
-ok 28 - [index v2] 4) confirm that the pack is actually corrupted
+	test_cmp expect actual &&
+	grep "statistics:{\"filter_not_present\":0," trace.perf &&
+	test_must_be_empty err
 
-expecting success of 5302.29 '[index v2] 5) pack-objects refuses to reuse corrupted data': 
-	test_must_fail git pack-objects test-5 <obj-list &&
-	test_must_fail git pack-objects --no-reuse-object test-6 <obj-list
+warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
+{"event":"data_json","sid":"20260314T133204.792332Z-H5c947e1c-P00026377","thread":"main","time":"2026-03-14T13:32:04.802236Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.010103,"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}}
+13:32:04.930374 revision.c:677               | d0 | main                     | data_json    | r1  |  0.014146 |  0.014146 | bloom        | statistics:{"filter_not_present":0,"maybe":3,"definitely_not":0,"false_positive":0}
+ok 143 - merge graph layers with incompatible Bloom settings
 
-error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
-error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
-fatal: unable to read 0b968294884af115eb5a1b941b3dabd48470c3bb
-error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
-fatal: object 0b968294884af115eb5a1b941b3dabd48470c3bb cannot be read
-ok 29 - [index v2] 5) pack-objects refuses to reuse corrupted data
+expecting success of 4216.144 'ensure Bloom filter with incompatible versions are ignored': 
+	rm "$repo/$graph" &&
 
-expecting success of 5302.30 '[index v2] 6) verify-pack detects CRC mismatch': 
-	rm -f .git/objects/pack/* &&
-	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
-	git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
-	obj=$(git hash-object file_001) &&
-	nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
-	chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
-	printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
-		bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
-	 ( while read obj
-	   do git cat-file -p $obj >/dev/null || exit 1
-	   done <obj-list ) &&
-	test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack"
+	git -C $repo log --oneline --no-decorate -- $CENT >expect &&
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-4+0 records in
-4+0 records out
-4 bytes copied, 3.66e-05 s, 109 kB/s
-fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
-ok 30 - [index v2] 6) verify-pack detects CRC mismatch
+	# Compute v1 Bloom filters for commits at the bottom.
+	git -C $repo rev-parse HEAD^ >in &&
+	git -C $repo commit-graph write --stdin-commits --changed-paths \
+		--split <in &&
 
-expecting success of 5302.31 'running index-pack in the object store': 
-	rm -f .git/objects/pack/* &&
-	cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack &&
+	# Compute v2 Bloomfilters for the rest of the commits at the top.
+	git -C $repo rev-parse HEAD >in &&
+	git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write \
+		--stdin-commits --changed-paths --split=no-merge <in &&
+
+	test_line_count = 2 $repo/$chain &&
+
+	git -C $repo log --oneline --no-decorate -- $CENT >actual 2>err &&
+	test_cmp expect actual &&
+
+	layer="$(head -n 1 $repo/$chain)" &&
+	cat >expect.err <<-EOF &&
+	warning: disabling Bloom filters for commit-graph layer $SQ$layer$SQ due to incompatible settings
+	EOF
+	test_cmp expect.err err &&
+
+	# Merge the two layers with incompatible bloom filter versions,
+	# ensuring that the v2 filters are used.
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C $repo -c commitGraph.changedPathsVersion=2 commit-graph write --reachable --changed-paths 2>err &&
+	grep "disabling Bloom filters for commit-graph layer .$layer." err &&
+	grep "{\"hash_version\":2,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt
+
+warning: disabling Bloom filters for commit-graph layer 'e338a7a1b4cfa5f6bcd31aea3e027df67d06442a' due to incompatible settings
+{"event":"data_json","sid":"20260314T133205.224148Z-H5c947e1c-P000264fa","thread":"main","time":"2026-03-14T13:32:05.230276Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.006322,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":2,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":512}}
+ok 144 - ensure Bloom filter with incompatible versions are ignored
+
+expecting success of 4216.145 'set up repo with high bit path, version 1 changed-path': 
+	git init highbit1 &&
+	test_commit -C highbit1 c1 "$CENT" &&
+	git -C highbit1 commit-graph write --reachable --changed-paths
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/highbit1/.git/
+[main (root-commit) 038971c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242"
+ok 145 - set up repo with high bit path, version 1 changed-path
+
+expecting success of 4216.146 'setup check value of version 1 changed-path': 
 	(
-		cd .git/objects/pack &&
-		git index-pack pack-${pack1}.pack
-	) &&
-	test -f .git/objects/pack/pack-${pack1}.idx
+		cd highbit1 &&
+		echo "52a9" >expect &&
+		get_first_changed_path_filter >actual
+	)
 
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 31 - running index-pack in the object store
+ok 146 - setup check value of version 1 changed-path
 
-expecting success of 5302.32 'index-pack --strict warns upon missing tagger in tag': 
-	sha=$(git rev-parse HEAD) &&
-	cat >wrong-tag <<EOF &&
-object $sha
-type commit
-tag guten tag
+--- highbit1/expect	2026-03-14 13:32:05.442677808 +0000
++++ highbit1/actual	2026-03-14 13:32:05.478677808 +0000
+@@ -1 +1 @@
+-52a9
++c01f
+ok 147 # skip check value of version 1 changed-path (missing SIGNED_CHAR_BY_DEFAULT)
 
-This is an invalid tag.
-EOF
+expecting success of 4216.148 'setup make another commit': 
+	# "git log" does not use Bloom filters for root commits - see how, in
+	# revision.c, rev_compare_tree() (the only code path that eventually calls
+	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
+	# has one parent. Therefore, make another commit so that we perform the tests on
+	# a non-root commit.
+	test_commit -C highbit1 anotherc1 "another$CENT"
 
-	tag=$(git hash-object -t tag -w --stdin --literally <wrong-tag) &&
-	pack1=$(echo $tag $sha | git pack-objects tag-test) &&
-	echo remove tag object &&
-	thirtyeight=${tag#??} &&
-	rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight &&
-	git index-pack --strict tag-test-${pack1}.pack 2>err &&
-	grep "^warning:.* expected .tagger. line" err
+[main 3b45161] anotherc1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "another\302\242"
+ok 148 - setup make another commit
 
-remove tag object
-67765b8cc9b2d3d6ffa408695798db10a387e826
-warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 32 - index-pack --strict warns upon missing tagger in tag
+expecting success of 4216.149 'version 1 changed-path used when version 1 requested': 
+	(
+		cd highbit1 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
 
-expecting success of 5302.33 'index-pack --fsck-objects also warns upon missing tagger in tag': 
-	git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
-	grep "^warning:.* expected .tagger. line" err
+ok 149 - version 1 changed-path used when version 1 requested
 
-67765b8cc9b2d3d6ffa408695798db10a387e826
-warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 33 - index-pack --fsck-objects also warns upon missing tagger in tag
+expecting success of 4216.150 'version 1 changed-path not used when version 2 requested': 
+	(
+		cd highbit1 &&
+		git config --add commitGraph.changedPathsVersion 2 &&
+		test_bloom_filters_not_used "-- another$CENT"
+	)
 
-expecting success of 5302.34 'index-pack -v --stdin produces progress for both phases': 
-	pack=$(git pack-objects --all pack </dev/null) &&
-	GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err &&
-	test_grep "Receiving objects" err &&
-	test_grep "Resolving deltas" err
+ok 150 - version 1 changed-path not used when version 2 requested
 
-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 | 83.34 MiB/s, done.
-Resolving deltas:   0% (0/190)
Resolving deltas:   1% (2/190)
Resolving deltas:   2% (4/190)
Resolving deltas:   3% (6/190)
Resolving deltas:   4% (8/190)
Resolving deltas:   5% (10/190)
Resolving deltas:   6% (12/190)
Resolving deltas:   7% (14/190)
Resolving deltas:   8% (16/190)
Resolving deltas:   9% (18/190)
Resolving deltas:  10% (19/190)
Resolving deltas:  11% (21/190)
Resolving deltas:  12% (23/190)
Resolving deltas:  13% (25/190)
Resolving deltas:  14% (27/190)
Resolving deltas:  15% (29/190)
Resolving deltas:  16% (31/190)
Resolving deltas:  17% (33/190)
Resolving deltas:  18% (35/190)
Resolving deltas:  19% (37/190)
Resolving deltas:  20% (38/190)
Resolving deltas:  21% (40/190)
Resolving deltas:  22% (42/190)
Resolving deltas:  23% (44/190)
Resolving deltas:  24% (46/190)
Resolving deltas:  25% (48/190)
Resolving deltas:  26% (50/190)
Resolving deltas:  27% (52/190)
Resolving deltas:  28% (54/190)
Resolving deltas:  29% (56/190)
Resolving deltas:  30% (57/190)
Resolving deltas:  31% (59/190)
Resolving deltas:  32% (61/190)
Resolving deltas:  33% (63/190)
Resolving deltas:  34% (65/190)
Resolving deltas:  35% (67/190)
Resolving deltas:  36% (69/190)
Resolving deltas:  37% (71/190)
Resolving deltas:  38% (73/190)
Resolving deltas:  39% (75/190)
Resolving deltas:  40% (76/190)
Resolving deltas:  41% (78/190)
Resolving deltas:  42% (80/190)
Resolving deltas:  43% (82/190)
Resolving deltas:  44% (84/190)
Resolving deltas:  45% (86/190)
Resolving deltas:  46% (88/190)
Resolving deltas:  47% (90/190)
Resolving deltas:  48% (92/190)
Resolving deltas:  49% (94/190)
Resolving deltas:  50% (95/190)
Resolving deltas:  51% (97/190)
Resolving deltas:  52% (99/190)
Resolving deltas:  53% (101/190)
Resolving deltas:  54% (103/190)
Resolving deltas:  55% (105/190)
Resolving deltas:  56% (107/190)
Resolving deltas:  57% (109/190)
Resolving deltas:  58% (111/190)
Resolving deltas:  59% (113/190)
Resolving deltas:  60% (114/190)
Resolving deltas:  61% (116/190)
Resolving deltas:  62% (118/190)
Resolving deltas:  63% (120/190)
Resolving deltas:  64% (122/190)
Resolving deltas:  65% (124/190)
Resolving deltas:  66% (126/190)
Resolving deltas:  67% (128/190)
Resolving deltas:  68% (130/190)
Resolving deltas:  69% (132/190)
Resolving deltas:  70% (133/190)
Resolving deltas:  71% (135/190)
Resolving deltas:  72% (137/190)
Resolving deltas:  73% (139/190)
Resolving deltas:  74% (141/190)
Resolving deltas:  75% (143/190)
Resolving deltas:  76% (145/190)
Resolving deltas:  77% (147/190)
Resolving deltas:  78% (149/190)
Resolving deltas:  79% (151/190)
Resolving deltas:  80% (152/190)
Resolving deltas:  81% (154/190)
Resolving deltas:  82% (156/190)
Resolving deltas:  83% (158/190)
Resolving deltas:  84% (160/190)
Resolving deltas:  85% (162/190)
Resolving deltas:  86% (164/190)
Resolving deltas:  87% (166/190)
Resolving deltas:  88% (168/190)
Resolving deltas:  89% (170/190)
Resolving deltas:  90% (171/190)
Resolving deltas:  91% (173/190)
Resolving deltas:  92% (175/190)
Resolving deltas:  93% (177/190)
Resolving deltas:  94% (179/190)
Resolving deltas:  95% (181/190)
Resolving deltas:  96% (183/190)
Resolving deltas:  97% (185/190)
Resolving deltas:  98% (187/190)
Resolving deltas:  99% (189/190)
Resolving deltas: 100% (190/190)
Resolving deltas: 100% (190/190), done.
-ok 34 - index-pack -v --stdin produces progress for both phases
+expecting success of 4216.151 'version 1 changed-path used when autodetect requested': 
+	(
+		cd highbit1 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
 
-expecting success of 5302.35 'too-large packs report the breach': 
-	pack=$(git pack-objects --all pack </dev/null) &&
-	sz="$(test_file_size pack-$pack.pack)" &&
-	test "$sz" -gt 20 &&
-	test_must_fail git index-pack --max-input-size=20 pack-$pack.pack 2>err &&
-	grep "maximum allowed size (20 bytes)" err
+ok 151 - version 1 changed-path used when autodetect requested
 
-fatal: pack exceeds maximum allowed size (20 bytes)
-ok 35 - too-large packs report the breach
+expecting success of 4216.152 'when writing another commit graph, preserve existing version 1 of changed-path': 
+	test_commit -C highbit1 c1double "$CENT$CENT" &&
+	git -C highbit1 commit-graph write --reachable --changed-paths &&
+	(
+		cd highbit1 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		echo "options: bloom(1,10,7) read_generation_data" >expect &&
+		test-tool read-graph >full &&
+		grep options full >actual &&
+		test_cmp expect actual
+	)
 
-# passed all 35 test(s)
-1..35
+[main 8b0508a] c1double
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242\302\242"
+ok 152 - when writing another commit graph, preserve existing version 1 of changed-path
+
+expecting success of 4216.153 'set up repo with high bit path, version 2 changed-path': 
+	git init highbit2 &&
+	git -C highbit2 config --add commitGraph.changedPathsVersion 2 &&
+	test_commit -C highbit2 c2 "$CENT" &&
+	git -C highbit2 commit-graph write --reachable --changed-paths
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/highbit2/.git/
+[main (root-commit) bc1f8bf] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242"
+ok 153 - set up repo with high bit path, version 2 changed-path
+
+expecting success of 4216.154 'check value of version 2 changed-path': 
+	(
+		cd highbit2 &&
+		echo "c01f" >expect &&
+		get_first_changed_path_filter >actual &&
+		test_cmp expect actual
+	)
+
+ok 154 - check value of version 2 changed-path
+
+expecting success of 4216.155 'setup make another commit': 
+	# "git log" does not use Bloom filters for root commits - see how, in
+	# revision.c, rev_compare_tree() (the only code path that eventually calls
+	# get_bloom_filter()) is only called by try_to_simplify_commit() when the commit
+	# has one parent. Therefore, make another commit so that we perform the tests on
+	# a non-root commit.
+	test_commit -C highbit2 anotherc2 "another$CENT"
+
+[main 285bfce] anotherc2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "another\302\242"
+ok 155 - setup make another commit
+
+expecting success of 4216.156 'version 2 changed-path used when version 2 requested': 
+	(
+		cd highbit2 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
+
+ok 156 - version 2 changed-path used when version 2 requested
+
+expecting success of 4216.157 'version 2 changed-path not used when version 1 requested': 
+	(
+		cd highbit2 &&
+		git config --add commitGraph.changedPathsVersion 1 &&
+		test_bloom_filters_not_used "-- another$CENT"
+	)
+
+ok 157 - version 2 changed-path not used when version 1 requested
+
+expecting success of 4216.158 'version 2 changed-path used when autodetect requested': 
+	(
+		cd highbit2 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		test_bloom_filters_used "-- another$CENT"
+	)
+
+ok 158 - version 2 changed-path used when autodetect requested
+
+expecting success of 4216.159 'when writing another commit graph, preserve existing version 2 of changed-path': 
+	test_commit -C highbit2 c2double "$CENT$CENT" &&
+	git -C highbit2 commit-graph write --reachable --changed-paths &&
+	(
+		cd highbit2 &&
+		git config --add commitGraph.changedPathsVersion -1 &&
+		echo "options: bloom(2,10,7) read_generation_data" >expect &&
+		test-tool read-graph >full &&
+		grep options full >actual &&
+		test_cmp expect actual
+	)
+
+[main 00b3fc0] c2double
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242\302\242"
+ok 159 - when writing another commit graph, preserve existing version 2 of changed-path
+
+expecting success of 4216.160 'when writing commit graph, do not reuse changed-path of another version': 
+	git init doublewrite &&
+	test_commit -C doublewrite c "$CENT" &&
+
+	git -C doublewrite config --add commitGraph.changedPathsVersion 1 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C doublewrite commit-graph write --reachable --changed-paths &&
+	test_filter_computed 1 trace2.txt &&
+	test_filter_upgraded 0 trace2.txt &&
+
+	git -C doublewrite commit-graph write --reachable --changed-paths &&
+	for v in -2 3
+	do
+		git -C doublewrite config --add commitGraph.changedPathsVersion $v &&
+		git -C doublewrite commit-graph write --reachable --changed-paths 2>err &&
+		cat >expect <<-EOF &&
+		warning: attempting to write a commit-graph, but ${SQ}commitGraph.changedPathsVersion${SQ} ($v) is not supported
+		EOF
+		test_cmp expect err || return 1
+	done &&
+
+	git -C doublewrite config --add commitGraph.changedPathsVersion 2 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C doublewrite commit-graph write --reachable --changed-paths &&
+	test_filter_computed 1 trace2.txt &&
+	test_filter_upgraded 0 trace2.txt &&
+
+	(
+		cd doublewrite &&
+		echo "c01f" >expect &&
+		get_first_changed_path_filter >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/doublewrite/.git/
+[main (root-commit) 6d8aa3d] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\302\242"
+{"event":"data","sid":"20260314T133207.479808Z-H5c947e1c-P00026caa","thread":"main","time":"2026-03-14T13:32:07.481332Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001718,"t_rel":0.001718,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260314T133207.479808Z-H5c947e1c-P00026caa","thread":"main","time":"2026-03-14T13:32:07.481367Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.001757,"t_rel":0.001757,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20260314T133207.752064Z-H5c947e1c-P00026d9d","thread":"main","time":"2026-03-14T13:32:07.769661Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.017781,"t_rel":0.017781,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260314T133207.752064Z-H5c947e1c-P00026d9d","thread":"main","time":"2026-03-14T13:32:07.769698Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.017822,"t_rel":0.017822,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+ok 160 - when writing commit graph, do not reuse changed-path of another version
+
+expecting success of 4216.161 'when writing commit graph, reuse changed-path of another version where possible': 
+	git init upgrade &&
+
+	test_commit -C upgrade base no-high-bits &&
+
+	git -C upgrade config --add commitGraph.changedPathsVersion 1 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C upgrade commit-graph write --reachable --changed-paths &&
+	test_filter_computed 1 trace2.txt &&
+	test_filter_upgraded 0 trace2.txt &&
+
+	git -C upgrade config --add commitGraph.changedPathsVersion 2 &&
+	>trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C upgrade commit-graph write --reachable --changed-paths &&
+	test_filter_computed 0 trace2.txt &&
+	test_filter_upgraded 1 trace2.txt
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4216-log-bloom/upgrade/.git/
+[main (root-commit) 454ab1d] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-high-bits
+{"event":"data","sid":"20260314T133208.044206Z-H5c947e1c-P00026e89","thread":"main","time":"2026-03-14T13:32:08.057786Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.013779,"t_rel":0.013779,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20260314T133208.044206Z-H5c947e1c-P00026e89","thread":"main","time":"2026-03-14T13:32:08.057821Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.013818,"t_rel":0.013818,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20260314T133208.155296Z-H5c947e1c-P00026ee6","thread":"main","time":"2026-03-14T13:32:08.156817Z","file":"commit-graph.c","line":1778,"repo":1,"t_abs":0.001720,"t_rel":0.001720,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20260314T133208.155296Z-H5c947e1c-P00026ee6","thread":"main","time":"2026-03-14T13:32:08.156852Z","file":"commit-graph.c","line":1786,"repo":1,"t_abs":0.001759,"t_rel":0.001759,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"1"}
+ok 161 - when writing commit graph, reuse changed-path of another version where possible
+
+expecting success of 4216.162 'Bloom reader notices too-small data chunk': 
+	check_corrupt_graph BDAT clear 00000000 &&
+	echo "warning: ignoring too-small changed-path chunk" \
+		"(4 < 12) in commit-graph file" >expect.err &&
+	test_cmp expect.err err
+
+ok 162 - Bloom reader notices too-small data chunk
+
+expecting success of 4216.163 'Bloom reader notices out-of-bounds filter offsets': 
+	check_corrupt_graph BIDX 12 FFFFFFFF &&
+	# use grep to avoid depending on exact chunk size
+	grep "warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph" err
+
+warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
+warning: ignoring out-of-range offset (4294967295) for changed-path filter at pos 3 of .git/objects/info/commit-graph (chunk size: 77)
+ok 163 - Bloom reader notices out-of-bounds filter offsets
+
+expecting success of 4216.164 'Bloom reader notices too-small index chunk': 
+	# replace the index with a single entry, making most
+	# lookups out-of-bounds
+	check_corrupt_graph BIDX clear 00000000 &&
+	echo "warning: commit-graph changed-path index chunk" \
+		"is too small" >expect.err &&
+	test_cmp expect.err err
+
+ok 164 - Bloom reader notices too-small index chunk
+
+expecting success of 4216.165 'Bloom reader notices out-of-order index offsets': 
+	# we do not know any real offsets, but we can pick
+	# something plausible; we should not get to the point of
+	# actually reading from the bogus offsets anyway.
+	corrupt_graph BIDX 4 0000000c00000005 &&
+	echo "warning: ignoring decreasing changed-path index offsets" \
+		"(12 > 5) for positions 1 and 2 of .git/objects/info/commit-graph" >expect.err &&
+	git -c core.commitGraph=false log -- A/B/file2 >expect.out &&
+	git -c core.commitGraph=true log -- A/B/file2 >out 2>err &&
+	test_cmp expect.out out &&
+	test_cmp expect.err err
+
+ok 165 - Bloom reader notices out-of-order index offsets
+
+# passed all 165 test(s)
+1..165
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5334-incremental-multi-pack-index.sh ***
@@ -306054,6 +306523,361 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5332-multi-pack-reuse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5332-multi-pack-reuse/.git/
+expecting success of 5332.1 'preferred pack is reused for single-pack reuse': 
+	test_config pack.allowPackReuse single &&
+
+	for i in A B
+	do
+		test_commit "$i" &&
+		git repack -d || return 1
+	done &&
+
+	git multi-pack-index write --bitmap &&
+
+	test_pack_objects_reused_all 3 1
+
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+{"event":"data","sid":"20260314T133206.892573Z-H5c947e1c-P00026abb","thread":"main","time":"2026-03-14T13:32:06.899922Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.007547,"t_rel":0.007547,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260314T133206.892573Z-H5c947e1c-P00026abb","thread":"main","time":"2026-03-14T13:32:06.899926Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.007551,"t_rel":0.007551,"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":"20260314T133207.021828Z-H5c947e1c-P00026b26","thread":"main","time":"2026-03-14T13:32:07.023057Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001444,"t_rel":0.001444,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260314T133207.021828Z-H5c947e1c-P00026b26","thread":"main","time":"2026-03-14T13:32:07.023062Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001449,"t_rel":0.001449,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+de700bb9d264590842bcbfd30aa3296a833289e8
+ok 2 - multi-pack reuse is disabled by default
+
+expecting success of 5332.3 'feature.experimental implies multi-pack reuse': 
+	test_config feature.experimental true &&
+
+	test_pack_objects_reused_all 6 2
+
+{"event":"data","sid":"20260314T133207.134427Z-H5c947e1c-P00026b85","thread":"main","time":"2026-03-14T13:32:07.142631Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.008410,"t_rel":0.008410,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20260314T133207.134427Z-H5c947e1c-P00026b85","thread":"main","time":"2026-03-14T13:32:07.142635Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.008414,"t_rel":0.008414,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+de700bb9d264590842bcbfd30aa3296a833289e8
+ok 3 - feature.experimental implies multi-pack reuse
+
+expecting success of 5332.4 'multi-pack reuse can be disabled with feature.experimental': 
+	test_config feature.experimental true &&
+	test_config pack.allowPackReuse single &&
+
+	test_pack_objects_reused_all 3 1
+
+{"event":"data","sid":"20260314T133207.304204Z-H5c947e1c-P00026c12","thread":"main","time":"2026-03-14T13:32:07.305410Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001394,"t_rel":0.001394,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260314T133207.304204Z-H5c947e1c-P00026c12","thread":"main","time":"2026-03-14T13:32:07.305414Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001398,"t_rel":0.001398,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+de700bb9d264590842bcbfd30aa3296a833289e8
+ok 4 - multi-pack reuse can be disabled with feature.experimental
+
+expecting success of 5332.5 'enable multi-pack reuse': 
+	git config pack.allowPackReuse multi
+
+ok 5 - enable multi-pack reuse
+
+expecting success of 5332.6 'reuse all objects from subset of bitmapped packs': 
+	test_commit C &&
+	git repack -d &&
+
+	git multi-pack-index write --bitmap &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse C)
+	^$(git rev-parse A)
+	EOF
+
+	test_pack_objects_reused 6 2 <in
+
+[master 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+{"event":"data","sid":"20260314T133207.792264Z-H5c947e1c-P00026db9","thread":"main","time":"2026-03-14T13:32:07.793396Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001330,"t_rel":0.001330,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20260314T133207.792264Z-H5c947e1c-P00026db9","thread":"main","time":"2026-03-14T13:32:07.793403Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001337,"t_rel":0.001337,"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":"20260314T133207.892085Z-H5c947e1c-P00026e09","thread":"main","time":"2026-03-14T13:32:07.893393Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001494,"t_rel":0.001494,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
+{"event":"data","sid":"20260314T133207.892085Z-H5c947e1c-P00026e09","thread":"main","time":"2026-03-14T13:32:07.893397Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001498,"t_rel":0.001498,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+1340c9de031f500be0a197f1242f00a34ed6e9b8
+ok 7 - reuse all objects from all packs
+
+expecting success of 5332.8 'reuse objects from first pack with middle gap': 
+	for i in D E F
+	do
+		test_commit "$i" || return 1
+	done &&
+
+	# Set "pack.window" to zero to ensure that we do not create any
+	# deltas, which could alter the amount of pack reuse we perform
+	# (if, for e.g., we are not sending one or more bases).
+	D="$(git -c pack.window=0 pack-objects --all --unpacked $packdir/pack)" &&
+
+	d_pos="$(pack_position $(git rev-parse D) <$packdir/pack-$D.idx)" &&
+	e_pos="$(pack_position $(git rev-parse E) <$packdir/pack-$D.idx)" &&
+	f_pos="$(pack_position $(git rev-parse F) <$packdir/pack-$D.idx)" &&
+
+	# commits F, E, and D, should appear in that order at the
+	# beginning of the pack
+	test $f_pos -lt $e_pos &&
+	test $e_pos -lt $d_pos &&
+
+	# Ensure that the pack we are constructing sorts ahead of any
+	# other packs in lexical/bitmap order by choosing it as the
+	# preferred pack.
+	git multi-pack-index write --bitmap --preferred-pack="pack-$D.idx" &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse E)
+	^$(git rev-parse D)
+	EOF
+
+	test_pack_objects_reused 3 1 <in
+
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[master ee2ad00] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+[master 5374d8c] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+{"event":"data","sid":"20260314T133208.624270Z-H5c947e1c-P00027084","thread":"main","time":"2026-03-14T13:32:08.633809Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.009787,"t_rel":0.009787,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260314T133208.624270Z-H5c947e1c-P00027084","thread":"main","time":"2026-03-14T13:32:08.633815Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.009792,"t_rel":0.009792,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
+ok 8 - reuse objects from first pack with middle gap
+
+expecting success of 5332.9 'reuse objects from middle pack with middle gap': 
+	rm -fr $packdir/multi-pack-index* &&
+
+	# Ensure that the pack we are constructing sort into any
+	# position *but* the first one, by choosing a different pack as
+	# the preferred one.
+	git multi-pack-index write --bitmap --preferred-pack="pack-$A.idx" &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse E)
+	^$(git rev-parse D)
+	EOF
+
+	test_pack_objects_reused 3 1 <in
+
+warning: unknown preferred pack: 'pack-.idx'
+{"event":"data","sid":"20260314T133208.836191Z-H5c947e1c-P0002712d","thread":"main","time":"2026-03-14T13:32:08.837394Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001400,"t_rel":0.001400,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260314T133208.836191Z-H5c947e1c-P0002712d","thread":"main","time":"2026-03-14T13:32:08.837400Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001405,"t_rel":0.001405,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
+ok 9 - reuse objects from middle pack with middle gap
+
+expecting success of 5332.10 'omit delta with uninteresting base (same pack)': 
+	git repack -adk &&
+
+	test_seq 32 >f &&
+	git add f &&
+	test_tick &&
+	git commit -m "delta" &&
+	delta="$(git rev-parse HEAD)" &&
+
+	test_seq 64 >f &&
+	test_tick &&
+	git commit -a -m "base" &&
+	base="$(git rev-parse HEAD)" &&
+
+	test_commit other &&
+
+	git repack -d &&
+
+	have_delta "$(git rev-parse $delta:f)" "$(git rev-parse $base:f)" &&
+
+	git multi-pack-index write --bitmap &&
+
+	cat >in <<-EOF &&
+	$(git rev-parse other)
+	^$base
+	EOF
+
+	# We can only reuse the 3 objects corresponding to "other" from
+	# the latest pack.
+	#
+	# This is because even though we want "delta", we do not want
+	# "base", meaning that we have to inflate the delta/base-pair
+	# corresponding to the blob in commit "delta", which bypasses
+	# the pack-reuse mechanism.
+	#
+	# The remaining objects from the other pack are similarly not
+	# reused because their objects are on the uninteresting side of
+	# the query.
+	test_pack_objects_reused 3 1 <in
+
+[master 16753ad] delta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 32 insertions(+)
+ create mode 100644 f
+[master f40fa4a] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 32 insertions(+)
+[master e389016] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+{"event":"data","sid":"20260314T133209.484119Z-H5c947e1c-P00027359","thread":"main","time":"2026-03-14T13:32:09.485301Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001378,"t_rel":0.001378,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260314T133209.484119Z-H5c947e1c-P00027359","thread":"main","time":"2026-03-14T13:32:09.485307Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001384,"t_rel":0.001384,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+341840e0d76cb213079e38bae778b53364232eb5
+ok 10 - omit delta with uninteresting base (same pack)
+
+expecting success of 5332.11 'omit delta from uninteresting base (cross pack)': 
+	cat >in <<-EOF &&
+	$(git rev-parse $base)
+	^$(git rev-parse $delta)
+	EOF
+
+	P="$(git pack-objects --revs $packdir/pack <in)" &&
+
+	git multi-pack-index write --bitmap --preferred-pack="pack-$P.idx" &&
+
+	packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
+	objects_nr="$(git rev-list --count --all --objects)" &&
+
+	test_pack_objects_reused_all $(($objects_nr - 1)) $packs_nr
+
+{"event":"data","sid":"20260314T133209.804175Z-H5c947e1c-P00027463","thread":"main","time":"2026-03-14T13:32:09.813729Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.009716,"t_rel":0.009716,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
+{"event":"data","sid":"20260314T133209.804175Z-H5c947e1c-P00027463","thread":"main","time":"2026-03-14T13:32:09.813733Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.009720,"t_rel":0.009720,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+def7cb61a9e70183adbf1acab0912d686622303a
+ok 11 - omit delta from uninteresting base (cross pack)
+
+expecting success of 5332.12 'non-omitted delta in MIDX preferred pack': 
+	test_config pack.allowPackReuse single &&
+
+	cat >p1.objects <<-EOF &&
+	$(git rev-parse $base)
+	^$(git rev-parse $delta^)
+	EOF
+	cat >p2.objects <<-EOF &&
+	$(git rev-parse F)
+	EOF
+
+	p1="$(git pack-objects --revs $packdir/pack <p1.objects)" &&
+	p2="$(git pack-objects --revs $packdir/pack <p2.objects)" &&
+
+	cat >in <<-EOF &&
+	pack-$p1.idx
+	pack-$p2.idx
+	EOF
+	git multi-pack-index write --bitmap --stdin-packs \
+		--preferred-pack=pack-$p1.pack <in &&
+
+	git show-index <$packdir/pack-$p1.idx >expect &&
+
+	test_pack_objects_reused_all $(wc -l <expect) 1
+
+{"event":"data","sid":"20260314T133210.240229Z-H5c947e1c-P000275d8","thread":"main","time":"2026-03-14T13:32:10.271684Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.031645,"t_rel":0.031645,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20260314T133210.240229Z-H5c947e1c-P000275d8","thread":"main","time":"2026-03-14T13:32:10.271688Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.031649,"t_rel":0.031649,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+48c334c15e539df3382db77f74c864a1d31091b9
+ok 12 - non-omitted delta in MIDX preferred pack
+
+expecting success of 5332.13 'duplicate objects': 
+	git init duplicate-objects &&
+	(
+		cd duplicate-objects &&
+
+		git config pack.allowPackReuse multi &&
+
+		test_commit base &&
+
+		git repack -a &&
+
+		git rev-parse HEAD^{tree} >in &&
+		p="$(git pack-objects $packdir/pack <in)" &&
+
+		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+
+		objects_nr="$(git rev-list --count --all --objects)" &&
+		packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
+
+		test_pack_objects_reused_all $objects_nr $packs_nr
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5332-multi-pack-reuse/duplicate-objects/.git/
+[master (root-commit) c1bac7b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+{"event":"data","sid":"20260314T133210.692210Z-H5c947e1c-P00027745","thread":"main","time":"2026-03-14T13:32:10.693358Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001348,"t_rel":0.001348,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20260314T133210.692210Z-H5c947e1c-P00027745","thread":"main","time":"2026-03-14T13:32:10.693362Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001352,"t_rel":0.001352,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+b572b333cdb15dbb54fe65e0e1361617040627d7
+ok 13 - duplicate objects
+
+expecting success of 5332.14 'duplicate objects with verbatim reuse': 
+	git init duplicate-objects-verbatim &&
+	(
+		cd duplicate-objects-verbatim &&
+
+		git config pack.allowPackReuse multi &&
+
+		test_commit_bulk 64 &&
+
+		# take the first object from the main pack...
+		git show-index <$(ls $packdir/pack-*.idx) >obj.raw &&
+		sort -nk1 <obj.raw | head -n1 | cut -d" " -f2 >in &&
+
+		# ...and create a separate pack containing just that object
+		p="$(git pack-objects $packdir/pack <in)" &&
+
+		git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+
+		test_pack_objects_reused_all 192 2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5332-multi-pack-reuse/duplicate-objects-verbatim/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          192 (         0 duplicates                  )
+      blobs  :           64 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           64 (         0 duplicates         62 deltas of         62 attempts)
+      commits:           64 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:             64
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      15727 /      15727
+---------------------------------------------------------------------
+
+{"event":"data","sid":"20260314T133211.137870Z-H5c947e1c-P000278a8","thread":"main","time":"2026-03-14T13:32:11.139357Z","file":"builtin/pack-objects.c","line":4687,"repo":1,"t_abs":0.001704,"t_rel":0.001704,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"192"}
+{"event":"data","sid":"20260314T133211.137870Z-H5c947e1c-P000278a8","thread":"main","time":"2026-03-14T13:32:11.139361Z","file":"builtin/pack-objects.c","line":4688,"repo":1,"t_abs":0.001708,"t_rel":0.001708,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+1ebceb2b5297fe50c38004c13872ae869e743ceb
+ok 14 - duplicate objects with verbatim reuse
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t4255-am-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t4255-am-submodule/.git/
 expecting success of 4255.1 'am: added submodule creates empty directory': 
@@ -307189,1141 +308013,100 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5300-pack-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/.git/
-expecting success of 5300.1 'setup': 
-	rm -f .git/index* &&
-	perl -e "print \"a\" x 4096;" >a &&
-	perl -e "print \"b\" x 4096;" >b &&
-	perl -e "print \"c\" x 4096;" >c &&
-	test-tool genrandom "seed a" 2097152 >a_big &&
-	test-tool genrandom "seed b" 2097152 >b_big &&
-	git update-index --add a a_big b b_big c &&
-	cat c >d && echo foo >>d && git update-index --add d &&
-	tree=$(git write-tree) &&
-	commit=$(git commit-tree $tree </dev/null) &&
-	{
-		echo $tree &&
-		echo $commit &&
-		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
-	} >obj-list &&
-	{
-		git diff-tree --root -p $commit &&
-		while read object
-		do
-			t=$(git cat-file -t $object) &&
-			git cat-file $t $object || return 1
-		done <obj-list
-	} >expect
-
-ok 1 - setup
-
-expecting success of 5300.2 'setup pack-object <stdin': 
-	git init pack-object-stdin &&
-	test_commit -C pack-object-stdin one &&
-	test_commit -C pack-object-stdin two
-
+*** t5351-unpack-large-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/.git/
+expecting success of 5351.1 'create large objects (1.5 MB) and PACK': 
+	test-tool genrandom foo 1500000 >big-blob &&
+	test_commit --append foo big-blob &&
+	test-tool genrandom bar 1500000 >big-blob &&
+	test_commit --append bar big-blob &&
+	PACK=$(echo HEAD | git pack-objects --revs pack) &&
+	git verify-pack -v pack-$PACK.pack >out &&
+	sed -n -e "s/^\([0-9a-f][0-9a-f]*\).*\(commit\|tree\|blob\).*/\1/p" \
+		<out >obj-list
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/pack-object-stdin/.git/
-[master (root-commit) d79ce16] one
+[master (root-commit) b6b91a6] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 139b20d] two
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 big-blob
+[master 73e7a4c] bar
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 2 - setup pack-object <stdin
-
-expecting success of 5300.3 'pack-object <stdin parsing: basic [|--revs]': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	EOF
-
-	git -C pack-object-stdin pack-objects basic-stdin <in &&
-	idx=$(echo pack-object-stdin/basic-stdin-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 1 actual &&
-
-	git -C pack-object-stdin pack-objects --revs basic-stdin-revs <in &&
-	idx=$(echo pack-object-stdin/basic-stdin-revs-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 3 actual
-
-260a913b65cbec25b7e224d8d3c7360245c0367a
-91db7b4b856b00c3e675824c5bc5389b6810037a
-ok 3 - pack-object <stdin parsing: basic [|--revs]
-
-expecting success of 5300.4 'pack-object <stdin parsing: [|--revs] bad line': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	garbage
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	sed "s/^> //g" >err.expect <<-EOF &&
-	fatal: expected object ID, got garbage:
-	>  garbage
-
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects bad-line-stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
-
-	cat >err.expect <<-EOF &&
-	fatal: bad revision 'garbage'
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects --revs bad-line-stdin-revs <in 2>err.actual &&
-	test_cmp err.expect err.actual
-
-ok 4 - pack-object <stdin parsing: [|--revs] bad line
-
-expecting success of 5300.5 'pack-object <stdin parsing: [|--revs] empty line': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
-	fatal: expected object ID, got garbage:
-	>  Z
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 1 - create large objects (1.5 MB) and PACK
 
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
+expecting success of 5351.2 'set memory limitation to 1MB': 
+	GIT_ALLOC_LIMIT=1m &&
+	export GIT_ALLOC_LIMIT
 
-	git -C pack-object-stdin pack-objects --revs empty-line-stdin-revs <in &&
-	idx=$(echo pack-object-stdin/empty-line-stdin-revs-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 3 actual
+ok 2 - set memory limitation to 1MB
 
-91db7b4b856b00c3e675824c5bc5389b6810037a
-ok 5 - pack-object <stdin parsing: [|--revs] empty line
+expecting success of 5351.3 'unpack-objects failed under memory limitation': 
+	prepare_dest 2m &&
+	test_must_fail git -C dest.git unpack-objects <pack-$PACK.pack 2>err &&
+	grep "fatal: attempting to allocate" err
 
-expecting success of 5300.6 'pack-object <stdin parsing: [|--revs] with --stdin': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
+fatal: attempting to allocate 1500005 over limit 1048576
+ok 3 - unpack-objects failed under memory limitation
 
-	# There is the "--stdin-packs is incompatible with --revs"
-	# test below, but we should make sure that the revision.c
-	# --stdin is not picked up
-	cat >err.expect <<-EOF &&
-	fatal: disallowed abbreviated or ambiguous option 'stdin'
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects stdin-with-stdin-option --stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
+expecting success of 5351.4 'unpack-objects works with memory limitation in dry-run mode': 
+	prepare_dest 2m &&
+	git -C dest.git unpack-objects -n <pack-$PACK.pack &&
+	test_stdout_line_count = 0 find dest.git/objects -type f &&
+	test_dir_is_empty dest.git/objects/pack
 
-	test_must_fail git -C pack-object-stdin pack-objects --stdin --revs stdin-with-stdin-option-revs 2>err.actual <in &&
-	test_cmp err.expect err.actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
+ok 4 - unpack-objects works with memory limitation in dry-run mode
 
-ok 6 - pack-object <stdin parsing: [|--revs] with --stdin
+expecting success of 5351.5 'unpack big object in stream': 
+	prepare_dest 1m &&
+	git -C dest.git unpack-objects <pack-$PACK.pack &&
+	test_dir_is_empty dest.git/objects/pack
 
-expecting success of 5300.7 'pack-object <stdin parsing: --stdin-packs handles garbage': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
+ok 5 - unpack big object in stream
 
-	# That we get "two" and not "one" has to do with OID
-	# ordering. It happens to be the same here under SHA-1 and
-	# SHA-256. See commentary in pack-objects.c
-	cat >err.expect <<-EOF &&
-	fatal: could not find pack '$(git -C pack-object-stdin rev-parse two)'
+expecting success of 5351.6 'unpack big object in stream (core.fsyncmethod=batch)': 
+	prepare_dest 1m &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+	GIT_TEST_FSYNC=true \
+		git -C dest.git $BATCH_CONFIGURATION unpack-objects <pack-$PACK.pack &&
+	if grep "core.fsyncMethod = batch is unsupported" trace2.txt
+	then
+		flush_count=7
+	else
+		flush_count=1
+	fi &&
+	check_fsync_events trace2.txt <<-EOF &&
+	"name":"writeout-only","count":6
+	"name":"hardware-flush","count":$flush_count
 	EOF
-	test_must_fail git \
-		-C pack-object-stdin \
-		pack-objects stdin-with-stdin-option --stdin-packs \
-		<in 2>err.actual &&
-	test_cmp err.expect err.actual
-
-ok 7 - pack-object <stdin parsing: --stdin-packs handles garbage
-
-expecting success of 5300.8 'pack without delta': 
-	packname_1=$(git pack-objects --progress --window=0 test-1 \
-			<obj-list 2>stderr) &&
-	check_deltas stderr = 0
-
-ok 8 - pack without delta
-
-expecting success of 5300.9 'negative window clamps to 0': 
-	git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
-	check_deltas stderr = 0
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 9 - negative window clamps to 0
-
-expecting success of 5300.10 'pack-objects with bogus arguments': 
-	test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list
-
-usage: git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]
-   or: git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]
-
-    -q, --[no-]quiet      do not show progress meter
-    --[no-]progress       show progress meter
-    --[no-]all-progress   show progress meter during object writing phase
-    --[no-]all-progress-implied
-                          similar to --all-progress when progress meter is shown
-    --index-version <version>[,<offset>]
-                          write the pack index file in the specified idx format version
-    --max-pack-size <n>   maximum size of each output pack file
-    --[no-]local          ignore borrowed objects from alternate object store
-    --[no-]incremental    ignore packed objects
-    --[no-]window <n>     limit pack window by objects
-    --window-memory <n>   limit pack window by memory in addition to object limit
-    --[no-]depth <n>      maximum length of delta chain allowed in the resulting pack
-    --[no-]reuse-delta    reuse existing deltas
-    --[no-]reuse-object   reuse existing objects
-    --[no-]delta-base-offset
-                          use OFS_DELTA objects
-    --[no-]threads <n>    use threads when searching for best delta matches
-    --[no-]non-empty      do not create an empty pack output
-    --[no-]revs           read revision arguments from standard input
-    --unpacked            limit the objects to those that are not yet packed
-    --all                 include objects reachable from any reference
-    --reflog              include objects referred by reflog entries
-    --indexed-objects     include objects referred to by the index
-    --[no-]stdin-packs    read packs from stdin
-    --[no-]stdout         output pack to stdout
-    --[no-]include-tag    include tag objects that refer to objects to be packed
-    --[no-]keep-unreachable
-                          keep unreachable objects
-    --[no-]pack-loose-unreachable
-                          pack loose unreachable objects
-    --[no-]unpack-unreachable[=<time>]
-                          unpack unreachable objects newer than <time>
-    --[no-]cruft          create a cruft pack
-    --[no-]cruft-expiration[=<time>]
-                          expire cruft objects older than <time>
-    --[no-]sparse         use the sparse reachability algorithm
-    --[no-]thin           create thin packs
-    --[no-]shallow        create packs suitable for shallow fetches
-    --[no-]honor-pack-keep
-                          ignore packs that have companion .keep file
-    --[no-]keep-pack <name>
-                          ignore this pack
-    --[no-]compression <n>
-                          pack compression level
-    --[no-]keep-true-parents
-                          do not hide commits by grafts
-    --[no-]use-bitmap-index
-                          use a bitmap index if available to speed up counting objects
-    --[no-]write-bitmap-index
-                          write a bitmap index together with the pack index
-    --[no-]filter <args>  object filtering
-    --missing <action>    handling for missing objects
-    --[no-]exclude-promisor-objects
-                          do not pack objects in promisor packfiles
-    --[no-]exclude-promisor-objects-best-effort
-                          implies --missing=allow-any
-    --[no-]delta-islands  respect islands during delta compression
-    --[no-]uri-protocol <protocol>
-                          exclude any configured uploadpack.blobpackfileuri with this protocol
-
-ok 10 - pack-objects with bogus arguments
-
-expecting success of 5300.11 'unpack without delta': 
-	check_unpack test-1-${packname_1} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 11 - unpack without delta
-
-expecting success of 5300.12 'unpack without delta (core.fsyncmethod=batch)': 
-	check_unpack test-1-${packname_1} obj-list "$BATCH_CONFIGURATION"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 12 - unpack without delta (core.fsyncmethod=batch)
-
-expecting success of 5300.13 'pack with REF_DELTA': 
-	packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
-	check_deltas stderr -gt 0
-
-ok 13 - pack with REF_DELTA
-
-expecting success of 5300.14 'unpack with REF_DELTA': 
-	check_unpack test-2-${packname_2} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 14 - unpack with REF_DELTA
-
-expecting success of 5300.15 'unpack with REF_DELTA (core.fsyncmethod=batch)': 
-       check_unpack test-2-${packname_2} obj-list "$BATCH_CONFIGURATION"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 15 - unpack with REF_DELTA (core.fsyncmethod=batch)
-
-expecting success of 5300.16 'pack with OFS_DELTA': 
-	packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
-			<obj-list 2>stderr) &&
-	check_deltas stderr -gt 0
-
-ok 16 - pack with OFS_DELTA
-
-expecting success of 5300.17 'unpack with OFS_DELTA': 
-	check_unpack test-3-${packname_3} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 17 - unpack with OFS_DELTA
-
-expecting success of 5300.18 'unpack with OFS_DELTA (core.fsyncmethod=batch)': 
-	check_unpack test-3-${packname_3} obj-list "$BATCH_CONFIGURATION"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 18 - unpack with OFS_DELTA (core.fsyncmethod=batch)
-
-expecting success of 5300.19 'compare delta flavors': 
-	perl -e '
-		defined($_ = -s $_) or die for @ARGV;
-		exit 1 if $ARGV[0] <= $ARGV[1];
-	' test-2-$packname_2.pack test-3-$packname_3.pack
-
-ok 19 - compare delta flavors
-
-expecting success of 5300.20 'use packed objects': 
-	check_use_objects test-1-${packname_1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 20 - use packed objects
-
-expecting success of 5300.21 'use packed deltified (REF_DELTA) objects': 
-	check_use_objects test-2-${packname_2}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 21 - use packed deltified (REF_DELTA) objects
-
-expecting success of 5300.22 'use packed deltified (OFS_DELTA) objects': 
-	check_use_objects test-3-${packname_3}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/git2/
-ok 22 - use packed deltified (OFS_DELTA) objects
-
-expecting success of 5300.23 'survive missing objects/pack directory': 
-	(
-		rm -fr missing-pack &&
-		mkdir missing-pack &&
-		cd missing-pack &&
-		git init &&
-		GOP=.git/objects/pack &&
-		rm -fr $GOP &&
-		git index-pack --stdin --keep=test <../test-3-${packname_3}.pack &&
-		test -f $GOP/pack-${packname_3}.pack &&
-		cmp $GOP/pack-${packname_3}.pack ../test-3-${packname_3}.pack &&
-		test -f $GOP/pack-${packname_3}.idx &&
-		cmp $GOP/pack-${packname_3}.idx ../test-3-${packname_3}.idx &&
-		test -f $GOP/pack-${packname_3}.keep
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/missing-pack/.git/
-keep	ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
-ok 23 - survive missing objects/pack directory
-
-expecting success of 5300.24 'verify pack': 
-	git verify-pack test-1-${packname_1}.idx \
-		test-2-${packname_2}.idx \
-		test-3-${packname_3}.idx
-
-ok 24 - verify pack
-
-expecting success of 5300.25 'verify pack -v': 
-	git verify-pack -v test-1-${packname_1}.idx \
-		test-2-${packname_2}.idx \
-		test-3-${packname_3}.idx
-
-3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
-9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
-012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
-c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
-6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
-0be779221aca65277fd447c8207e1b3c2706ae20 blob   4096 31 4195970
-b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4196001
-non delta: 8 objects
-test-1-0fe7826218e9201ffa2c785aa64f009dc5a98043.pack: ok
-3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
-9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
-012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
-c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
-6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
-b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
-0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 35 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
-non delta: 7 objects
-chain length = 1: 1 object
-test-2-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5.pack: ok
-3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe commit 163 123 181
-9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 304
-012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 335
-c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098137
-6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf blob   2097152 2097802 2098168
-b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4195970
-0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 16 4196006 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
-non delta: 7 objects
-chain length = 1: 1 object
-test-3-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7.pack: ok
-ok 25 - verify pack -v
-
-expecting success of 5300.26 'verify-pack catches mismatched .idx and .pack files': 
-	cat test-1-${packname_1}.idx >test-3.idx &&
-	cat test-2-${packname_2}.pack >test-3.pack &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-fatal: sha1 file 'test-3.idx' validation error
-ok 26 - verify-pack catches mismatched .idx and .pack files
-
-expecting success of 5300.27 'verify-pack catches a corrupted pack signature': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-1+0 records in
-1+0 records out
-1 byte copied, 0.000233121 s, 4.3 kB/s
-fatal: pack signature mismatch
-ok 27 - verify-pack catches a corrupted pack signature
-
-expecting success of 5300.28 'verify-pack catches a corrupted pack version': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-1+0 records in
-1+0 records out
-1 byte copied, 3.808e-05 s, 26.3 kB/s
-fatal: pack version 10 unsupported
-ok 28 - verify-pack catches a corrupted pack version
-
-expecting success of 5300.29 'verify-pack catches a corrupted type/size of the 1st packed object data': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	echo | dd of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
-	if git verify-pack test-3.idx
-	then false
-	else :;
-	fi
-
-1+0 records in
-1+0 records out
-1 byte copied, 3.512e-05 s, 28.5 kB/s
-fatal: pack has bad object at offset 12: unknown object type 0
-ok 29 - verify-pack catches a corrupted type/size of the 1st packed object data
-
-expecting success of 5300.30 'verify-pack catches a corrupted sum of the index file itself': 
-	l=$(wc -c <test-3.idx) &&
-	l=$(expr $l - 20) &&
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	printf "%20s" "" | dd of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
-	if git verify-pack test-3.pack
-	then false
-	else :;
-	fi
-
-20+0 records in
-20+0 records out
-20 bytes copied, 0.000300402 s, 66.6 kB/s
-fatal: sha1 file 'test-3.idx' validation error
-ok 30 - verify-pack catches a corrupted sum of the index file itself
-
-expecting success of 5300.31 'build pack index for an existing pack': 
-	cat test-1-${packname_1}.pack >test-3.pack &&
-	git index-pack -o tmp.idx test-3.pack &&
-	cmp tmp.idx test-1-${packname_1}.idx &&
-
-	git index-pack test-3.pack &&
-	cmp test-3.idx test-1-${packname_1}.idx &&
-
-	cat test-2-${packname_2}.pack >test-3.pack &&
-	git index-pack -o tmp.idx test-2-${packname_2}.pack &&
-	cmp tmp.idx test-2-${packname_2}.idx &&
-
-	git index-pack test-3.pack &&
-	cmp test-3.idx test-2-${packname_2}.idx &&
-
-	cat test-3-${packname_3}.pack >test-3.pack &&
-	git index-pack -o tmp.idx test-3-${packname_3}.pack &&
-	cmp tmp.idx test-3-${packname_3}.idx &&
-
-	git index-pack test-3.pack &&
-	cmp test-3.idx test-3-${packname_3}.idx &&
-
-	cat test-1-${packname_1}.pack >test-4.pack &&
-	rm -f test-4.keep &&
-	git index-pack --keep=why test-4.pack &&
-	cmp test-1-${packname_1}.idx test-4.idx &&
-	test -f test-4.keep &&
-
-	:
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
-3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
-ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 31 - build pack index for an existing pack
-
-expecting success of 5300.32 'unpacking with --strict': 
-
-	for j in a b c d e f g
-	do
-		for i in 0 1 2 3 4 5 6 7 8 9
-		do
-			o=$(echo $j$i | git hash-object -w --stdin) &&
-			echo "100644 $o	0 $j$i" || return 1
-		done
-	done >LIST &&
-	rm -f .git/index &&
-	git update-index --index-info <LIST &&
-	LIST=$(git write-tree) &&
-	rm -f .git/index &&
-	head -n 10 LIST | git update-index --index-info &&
-	LI=$(git write-tree) &&
-	rm -f .git/index &&
-	tail -n 10 LIST | git update-index --index-info &&
-	ST=$(git write-tree) &&
-	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
-	PACK5=$( git pack-objects test-5 <actual ) &&
-	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
-	test_create_repo test-5 &&
-	(
-		cd test-5 &&
-		git unpack-objects --strict <../test-5-$PACK5.pack &&
-		git ls-tree -r $LIST &&
-		git ls-tree -r $LI &&
-		git ls-tree -r $ST
-	) &&
-	test_create_repo test-6 &&
-	(
-		# tree-only into empty repo -- many unreachables
-		cd test-6 &&
-		test_must_fail git unpack-objects --strict <../test-6-$PACK6.pack
-	) &&
-	(
-		# already populated -- no unreachables
-		cd test-5 &&
-		git unpack-objects --strict <../test-6-$PACK6.pack
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-5/.git/
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
-100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
-100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
-100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
-100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
-100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
-100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
-100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
-100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
-100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
-100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
-100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
-100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
-100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
-100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
-100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
-100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
-100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
-100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
-100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
-100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
-100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
-100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
-100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
-100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
-100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
-100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
-100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
-100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
-100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
-100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
-100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
-100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
-100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
-100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
-100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
-100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
-100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
-100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
-100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
-100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
-100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
-100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
-100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
-100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
-100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
-100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
-100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
-100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
-100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-6/.git/
-fatal: object of unexpected type
-ok 32 - unpacking with --strict
-
-expecting success of 5300.33 'index-pack with --strict': 
-
-	for j in a b c d e f g
-	do
-		for i in 0 1 2 3 4 5 6 7 8 9
-		do
-			o=$(echo $j$i | git hash-object -w --stdin) &&
-			echo "100644 $o	0 $j$i" || return 1
-		done
-	done >LIST &&
-	rm -f .git/index &&
-	git update-index --index-info <LIST &&
-	LIST=$(git write-tree) &&
-	rm -f .git/index &&
-	head -n 10 LIST | git update-index --index-info &&
-	LI=$(git write-tree) &&
-	rm -f .git/index &&
-	tail -n 10 LIST | git update-index --index-info &&
-	ST=$(git write-tree) &&
-	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
-	PACK5=$( git pack-objects test-5 <actual ) &&
-	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
-	test_create_repo test-7 &&
-	(
-		cd test-7 &&
-		git index-pack --strict --stdin <../test-5-$PACK5.pack &&
-		git ls-tree -r $LIST &&
-		git ls-tree -r $LI &&
-		git ls-tree -r $ST
-	) &&
-	test_create_repo test-8 &&
-	(
-		# tree-only into empty repo -- many unreachables
-		cd test-8 &&
-		test_must_fail git index-pack --strict --stdin <../test-6-$PACK6.pack
-	) &&
-	(
-		# already populated -- no unreachables
-		cd test-7 &&
-		git index-pack --strict --stdin <../test-6-$PACK6.pack
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-7/.git/
-pack	580f6e9e5f1fc55c922ae4f748e6adb3737375f4
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2270a80fbb71d7109b85e7489f3f307d0141a559	0 b0
-100644 blob c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061	0 b1
-100644 blob e6bfff5c1d0f0ecd501552b43a1e13d8008abc31	0 b2
-100644 blob 6d0875c82a99774922eab07fbc08510fc85d9e0a	0 b3
-100644 blob 8e953e84d803f13fd06416a1bd8161dcd93cfd00	0 b4
-100644 blob 90a5159bf020296276ea5ca1bcd292a9b1de9947	0 b5
-100644 blob 07eb61d36f49569a2b0649af299f9f00013d0969	0 b6
-100644 blob 6e6d33cfc7b1581413a88ae0759202b25ac4cad1	0 b7
-100644 blob 5d453c66b522d8de5d99c03bd2bf8b65ca0bcf33	0 b8
-100644 blob 9a16e0d1a643983973291127012d2694a0b17fe8	0 b9
-100644 blob caecf05cdbb03e144f113ecab2b99e5ee74df706	0 c0
-100644 blob ae9304576a6ec3419b231b2b9c8e33a06f97f9fb	0 c1
-100644 blob 16f9ec009e5568c435f473ba3a1df732d49ce8c3	0 c2
-100644 blob 0771aea884dd394a7b12783d049f05b5599f41a4	0 c3
-100644 blob a103f673dd1b7c5727aa0ae0100419adc50e1b76	0 c4
-100644 blob c36357109ce20af8f90df3c0dd0784e89408d707	0 c5
-100644 blob 86a716504cbdc40a135faa5ab199d15e364c416d	0 c6
-100644 blob 20be68787e59f4cb8983b641d170c4baf8ea25dd	0 c7
-100644 blob bb420bc8fb9e91530fdc25e363f6b822d5195309	0 c8
-100644 blob f899bd1761a5ca5978799bc3189a04d3c52d8435	0 c9
-100644 blob 79a5e858be4a3a969e3b71406fef0d3d36e1d387	0 d0
-100644 blob 6f1852975b9306ae5d8dfdf0d4cb1f5cb36ac229	0 d1
-100644 blob fd3671590780b645e1bef030d550191f6cdf1c95	0 d2
-100644 blob 69c77a9ea746edd27b46107142fc2c5288c1daf5	0 d3
-100644 blob d7b30ee07d4b9819a77a3b122282b4c04528ec21	0 d4
-100644 blob fa590f3f8bfbef6095cf6525e8497b2b2b46445c	0 d5
-100644 blob fef4390d19cb98fa97efd44c09d4e2eb7b084b40	0 d6
-100644 blob a5adf29249757619b8890c86f2cfcfeee611b5d8	0 d7
-100644 blob 1859919d049c078ba63fcecbce60e697c6da8e01	0 d8
-100644 blob b6148c82443a60d1d5ce07872a85e3c544b5f4b0	0 d9
-100644 blob 4fe4106b50b257f3d6ffd23b750d2d1945c2608b	0 e0
-100644 blob 5ff91639494693b1f238b5dc9baf8be95142c3ab	0 e1
-100644 blob 3811af3ca744c2fb44077a8025c23b4d4166a449	0 e2
-100644 blob 9338c3fa1f74d202651154257572d32aed57cc16	0 e3
-100644 blob c5195815f83aa9ef1ebac9e11f14d62b26406c99	0 e4
-100644 blob 0c44c89ef9c29077cceebc6dd9ca0b3a950c95ee	0 e5
-100644 blob f17172bc54cfa55a9e531cc845dff39855cd8df0	0 e6
-100644 blob 29870e9ccff84f86938ee588a47b39cf3a802e6b	0 e7
-100644 blob e8d01d007452cede5c6eafc3343fc80675b1e2f9	0 e8
-100644 blob 0c1945ad576ffc445ad69a3fafd1d3c04cc0bd40	0 e9
-100644 blob 844dc808a1d3d769ddcf5430eac933d4d87ff606	0 f0
-100644 blob 8e1e71d5ce34c01b6fe83bc5051545f2918c8c2b	0 f1
-100644 blob 9de77c18733ab8009a956c25e28c85fe203a17d7	0 f2
-100644 blob 45d9e0e9fc8859787c33081dffdf12f41b54fcf3	0 f3
-100644 blob c48ac4847d3abae8e5899dcc5cf490a98df55755	0 f4
-100644 blob 14c61ecf25961ce674048103c5fa5ea3c535a5cd	0 f5
-100644 blob 59ce90029dfd9e224701a040a26153e9f2feb74c	0 f6
-100644 blob 0a7bd52ffb819609cf65f40eb91be62000db47e5	0 f7
-100644 blob c7e617f6b429a1f3b462df6add2b4ea2cf702faf	0 f8
-100644 blob a720d8c8d277ad31ee5b180bef57379b5f62517c	0 f9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-100644 blob 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02	0 a0
-100644 blob da0f8ed91a8f2f0f067b3bdf26265d5ca48cf82c	0 a1
-100644 blob c1827f07e114c20547dc6a7296588870a4b5b62c	0 a2
-100644 blob d616f7380ad325123fed6f628d02fa76e1ce77c3	0 a3
-100644 blob 88ba23dca8c8529f8165539c369925a99391a4d1	0 a4
-100644 blob fafec68b313bde633804c37b46810f136ee12ea6	0 a5
-100644 blob 5b521d0587015867ac1a23fa00be3f3fce080b9f	0 a6
-100644 blob 6bac181dd20780870c30d69308f5a90b59a15102	0 a7
-100644 blob f1914bb68f8515ba7d1ab0f0cddcdf960731773d	0 a8
-100644 blob dbe2bc1151e5d5d469644f20189f923f006ed0cc	0 a9
-100644 blob 2e7d2f0b106eb8823e449a020497e26b86dc3eb1	0 g0
-100644 blob d8a17fff13638d804e8bf7f9f357c174db98f126	0 g1
-100644 blob 247c4abd244a429297a4c4b091592ae13bbf4677	0 g2
-100644 blob affaa5ba8c43cfc71469226e0d57cb6823c843da	0 g3
-100644 blob 51bc00f93e60aeef7dccfcf646e3f615056112bd	0 g4
-100644 blob 02b4fdd23d495769852f1550c10eb015f0fe0039	0 g5
-100644 blob e65aa9d64b596da2ba61e0662b1173f1e16dcbcf	0 g6
-100644 blob e19089689a05907b359f52c972ee7d2294fa96ab	0 g7
-100644 blob 30c2af9542d38e1f248390632612e0fb944fd27d	0 g8
-100644 blob 09827d7e43d81089e868e9f0f06502b865939c05	0 g9
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/test-8/.git/
-fatal: did not receive expected object 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02
-pack	499fed00672b4ac4e35132711ee1664a089f355e
-ok 33 - index-pack with --strict
-
-expecting success of 5300.34 'setup for --strict and --fsck-objects downgrading fsck msgs': 
-	git init strict &&
-	(
-		cd strict &&
-		test_commit first hello &&
-		cat >commit <<-EOF &&
-		tree $(git rev-parse HEAD^{tree})
-		parent $(git rev-parse HEAD)
-		author A U Thor
-		committer A U Thor
-
-		commit: this is a commit with bad emails
-
-		EOF
-		git hash-object --literally -t commit -w --stdin <commit >commit_list &&
-		git pack-objects test <commit_list >pack-name
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/strict/.git/
-[master (root-commit) 84f9e61] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-ok 34 - setup for --strict and --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.35 'index-pack with --strict downgrading fsck msgs': 
-	test_with_bad_commit --strict --strict="missingEmail=ignore"
-
-error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
-ok 35 - index-pack with --strict downgrading fsck msgs
-
-expecting success of 5300.36 'index-pack with --fsck-objects downgrading fsck msgs': 
-	test_with_bad_commit --fsck-objects --fsck-objects="missingEmail=ignore"
-
-error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
-ok 36 - index-pack with --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.37 'cleanup for --strict and --fsck-objects downgrading fsck msgs': 
-	rm -rf strict
-
-ok 37 - cleanup for --strict and --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.38 'honor pack.packSizeLimit': 
-	git config pack.packSizeLimit 3m &&
-	packname_10=$(git pack-objects test-10 <obj-list) &&
-	test 2 = $(ls test-10-*.pack | wc -l)
-
-ok 38 - honor pack.packSizeLimit
-
-expecting success of 5300.39 'verify resulting packs': 
-	git verify-pack test-10-*.pack
-
-ok 39 - verify resulting packs
-
-expecting success of 5300.40 'tolerate packsizelimit smaller than biggest object': 
-	git config pack.packSizeLimit 1 &&
-	packname_11=$(git pack-objects test-11 <obj-list) &&
-	test 5 = $(ls test-11-*.pack | wc -l)
-
-warning: minimum pack size limit is 1 MiB
-ok 40 - tolerate packsizelimit smaller than biggest object
-
-expecting success of 5300.41 'verify resulting packs': 
-	git verify-pack test-11-*.pack
-
-ok 41 - verify resulting packs
-
-expecting success of 5300.42 'set up pack for non-repo tests': 
-	# make sure we have a pack with no matching index file
-	cp test-1-*.pack foo.pack
-
-ok 42 - set up pack for non-repo tests
-
-expecting success of 5300.43 'index-pack --stdin complains of non-repo': 
-	nongit test_must_fail git index-pack --object-format=$(test_oid algo) --stdin <foo.pack &&
-	test_path_is_missing non-repo/.git
-
-fatal: --stdin requires a git repository
-ok 43 - index-pack --stdin complains of non-repo
-
-expecting success of 5300.44 'index-pack <pack> works in non-repo': 
-	nongit git index-pack --object-format=$(test_oid algo) ../foo.pack &&
-	test_path_is_file foo.idx
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 44 - index-pack <pack> works in non-repo
-
-expecting success of 5300.45 'index-pack --strict <pack> works in non-repo': 
-	rm -f foo.idx &&
-	nongit git index-pack --strict --object-format=$(test_oid algo) ../foo.pack &&
-	test_path_is_file foo.idx
-
-0fe7826218e9201ffa2c785aa64f009dc5a98043
-ok 45 - index-pack --strict <pack> works in non-repo
-
-checking prerequisite: 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 5300.46 'show-index works OK outside a repository': 
-	nongit git show-index <foo.idx
-
-335 012b05d476b4ffc9e62d036156b99467206f1efa (c00fe8a7)
-4195970 0be779221aca65277fd447c8207e1b3c2706ae20 (e9e93ee1)
-12 3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 (8abd2aad)
-2098168 6a9aaa62f091ea4b20590414e8b58c1b0b32b5bf (902113ef)
-304 9d235ed07cd19811a6ceb342de82f190e49c9f68 (bfe5d115)
-4196001 b010fe5253f7dc59c6605dacb92fcea00d199d4e (f8ed20b0)
-2098137 c82de19312b6c3695c0c18f70709a6c535682a67 (cf484043)
-181 ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe (512ec580)
-ok 46 - show-index works OK outside a repository
-
-expecting success of 5300.47 'show-index works OK outside a repository with hash algo passed in via --object-format': 
-		test_when_finished "rm -rf explicit-hash-$hash" &&
-		git init --object-format=$hash explicit-hash-$hash &&
-		test_commit -C explicit-hash-$hash one &&
-		git -C explicit-hash-$hash rev-parse one >in &&
-		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
-		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
-		nongit git show-index --object-format=$hash <"$idx" >actual &&
-		test_line_count = 1 actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/explicit-hash-sha1/.git/
-[master (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-acdb9ae06f04f82d5e6a285e1bafea173d44bc45
-ok 47 - show-index works OK outside a repository with hash algo passed in via --object-format
-
-expecting success of 5300.48 'show-index works OK outside a repository with hash algo passed in via --object-format': 
-		test_when_finished "rm -rf explicit-hash-$hash" &&
-		git init --object-format=$hash explicit-hash-$hash &&
-		test_commit -C explicit-hash-$hash one &&
-		git -C explicit-hash-$hash rev-parse one >in &&
-		git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
-		idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
-		nongit git show-index --object-format=$hash <"$idx" >actual &&
-		test_line_count = 1 actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/explicit-hash-sha256/.git/
-[master (root-commit) 9185f47] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-9b2641231de0d658b94f3140148aeae12672826d54b5fbede03e02dbf4f990bd
-ok 48 - show-index works OK outside a repository with hash algo passed in via --object-format
-
-checking prerequisite: FAIL_PREREQS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-		test_bool_env GIT_TEST_FAIL_PREREQS false
-	
-)
-prerequisite FAIL_PREREQS not satisfied
-ok 49 # skip index-pack --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
-
-ok 50 # skip pack-objects --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
-
-expecting success of 5300.51 'pack-objects in too-many-packs mode': 
-	GIT_TEST_FULL_IN_PACK_ARRAY=1 git repack -ad &&
-	git fsck
-
-warning: minimum pack size limit is 1 MiB
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-dangling tree ebe633107a37152edb13864b30d6878084f68c92
-dangling tree eb486020614a4c764f9df37263317ed4ea372ef8
-dangling commit ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe
-ok 51 - pack-objects in too-many-packs mode
-
-expecting success of 5300.52 'setup: fake a SHA1 hash collision': 
-	git init corrupt &&
-	(
-		cd corrupt &&
-		long_a=$(git hash-object -w ../a | sed -e "s!^..!&/!") &&
-		long_b=$(git hash-object -w ../b | sed -e "s!^..!&/!") &&
-		test -f	.git/objects/$long_b &&
-		cp -f	.git/objects/$long_a \
-			.git/objects/$long_b
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/corrupt/.git/
-ok 52 - setup: fake a SHA1 hash collision
-
-expecting success of 5300.53 'make sure index-pack detects the SHA1 collision': 
-	(
-		cd corrupt &&
-		test_must_fail git index-pack -o ../bad.idx ../test-3.pack 2>msg &&
-		test_grep "SHA1 COLLISION FOUND" msg
-	)
-
-fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
-ok 53 - make sure index-pack detects the SHA1 collision
-
-expecting success of 5300.54 'make sure index-pack detects the SHA1 collision (large blobs)': 
-	(
-		cd corrupt &&
-		test_must_fail git -c core.bigfilethreshold=1 index-pack -o ../bad.idx ../test-3.pack 2>msg &&
-		test_grep "SHA1 COLLISION FOUND" msg
-	)
 
-fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
-ok 54 - make sure index-pack detects the SHA1 collision (large blobs)
-
-expecting success of 5300.55 'prefetch objects': 
-	rm -rf server client &&
-
-	git init server &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server protocol.version 2 &&
-
-	echo one >server/one &&
-	git -C server add one &&
-	git -C server commit -m one &&
-	git -C server branch one_branch &&
-
-	echo two_a >server/two_a &&
-	echo two_b >server/two_b &&
-	git -C server add two_a two_b &&
-	git -C server commit -m two &&
-
-	echo three >server/three &&
-	git -C server add three &&
-	git -C server commit -m three &&
-	git -C server branch three_branch &&
-
-	# Clone, fetch "two" with blobs excluded, and re-push it. This requires
-	# the client to have the blobs of "two" - verify that these are
-	# prefetched in one batch.
-	git clone --filter=blob:none --single-branch -b one_branch \
-		"file://$(pwd)/server" client &&
-	test_config -C client protocol.version 2 &&
-	TWO=$(git -C server rev-parse three_branch^) &&
-	git -C client fetch --filter=blob:none origin "$TWO" &&
-	GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch &&
-	grep "fetch> done" trace >donelines &&
-	test_line_count = 1 donelines
+	test_dir_is_empty dest.git/objects/pack &&
+	git -C dest.git cat-file --batch-check="%(objectname)" <obj-list >current &&
+	cmp obj-list current
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/server/.git/
-[master (root-commit) 7d92f94] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-[master a9c9a29] two
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 two_a
- create mode 100644 two_b
-[master d4af973] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three
-Cloning into 'client'...
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/server
- * branch            a9c9a2938d723a122aa8e03710f837cd647b4f30 -> FETCH_HEAD
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/server
- * [new branch]      a9c9a2938d723a122aa8e03710f837cd647b4f30 -> two_branch
-ok 55 - prefetch objects
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
+ok 6 - unpack big object in stream (core.fsyncmethod=batch)
 
-expecting success of 5300.56 'verify-pack with sha1 packfile': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-		if test $hash = sha1
-		then
-			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-			# But with an explicit object format we should succeed.
-			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 23fa7ba] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 56 - verify-pack with sha1 packfile
+expecting success of 5351.7 'do not unpack existing large objects': 
+	prepare_dest 1m &&
+	git -C dest.git index-pack --stdin <pack-$PACK.pack &&
+	git -C dest.git unpack-objects <pack-$PACK.pack &&
 
-expecting success of 5300.57 'index-pack outside of a sha1 repository': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
-		if test $hash = sha1
-		then
-			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
-			# But with an explicit object format we should succeed.
-			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 31243c6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 57 - index-pack outside of a sha1 repository
+	# The destination came up with the exact same pack...
+	DEST_PACK=$(echo dest.git/objects/pack/pack-*.pack) &&
+	cmp pack-$PACK.pack $DEST_PACK &&
 
-expecting success of 5300.58 'verify-pack with sha256 packfile': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-		if test $hash = sha1
-		then
-			nongit git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git verify-pack "$(pwd)"/repo/.git/objects/pack/*.idx &&
-			# But with an explicit object format we should succeed.
-			nongit git verify-pack --object-format=$hash "$(pwd)"/repo/.git/objects/pack/*.idx
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 24ce812] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-error: wrong index v2 file size in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx
-fatal: Cannot open existing pack idx file for '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/objects/pack/pack-1b1240ab533163a4b525e5814f51ec3256428f79647ff13f19dfc1f2fe16cc2a.idx'
-ok 58 - verify-pack with sha256 packfile
+	# ...and wrote no loose objects
+	test_stdout_line_count = 0 find dest.git/objects -type f ! -name "pack-*"
 
-expecting success of 5300.59 'index-pack outside of a sha256 repository': 
-		test_when_finished "rm -rf repo" &&
-		git init --object-format=$hash repo &&
-		test_commit -C repo initial &&
-		git -C repo repack -ad &&
-		git -C repo index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack &&
-		if test $hash = sha1
-		then
-			nongit git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		else
-			# We have no way to identify the hash used by packfiles
-			# or indices, so we always fall back to SHA1.
-			nongit test_must_fail git index-pack --verify "$(pwd)"/repo/.git/objects/pack/*.pack 2>err &&
-			# But with an explicit object format we should succeed.
-			nongit git index-pack --object-format=$hash --verify "$(pwd)"/repo/.git/objects/pack/*.pack
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5300-pack-object/repo/.git/
-[master (root-commit) 699ee1a] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 59 - index-pack outside of a sha256 repository
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
+pack	4a1be184fdbd6bf82eab500bad78e4fee02c1909
+ok 7 - do not unpack existing large objects
 
-# passed all 59 test(s)
-1..59
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5401-update-hooks.sh ***
@@ -309370,102 +309153,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5351-unpack-large-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/.git/
-expecting success of 5351.1 'create large objects (1.5 MB) and PACK': 
-	test-tool genrandom foo 1500000 >big-blob &&
-	test_commit --append foo big-blob &&
-	test-tool genrandom bar 1500000 >big-blob &&
-	test_commit --append bar big-blob &&
-	PACK=$(echo HEAD | git pack-objects --revs pack) &&
-	git verify-pack -v pack-$PACK.pack >out &&
-	sed -n -e "s/^\([0-9a-f][0-9a-f]*\).*\(commit\|tree\|blob\).*/\1/p" \
-		<out >obj-list
-
-[master (root-commit) b6b91a6] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 big-blob
-[master 73e7a4c] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 1 - create large objects (1.5 MB) and PACK
-
-expecting success of 5351.2 'set memory limitation to 1MB': 
-	GIT_ALLOC_LIMIT=1m &&
-	export GIT_ALLOC_LIMIT
-
-ok 2 - set memory limitation to 1MB
-
-expecting success of 5351.3 'unpack-objects failed under memory limitation': 
-	prepare_dest 2m &&
-	test_must_fail git -C dest.git unpack-objects <pack-$PACK.pack 2>err &&
-	grep "fatal: attempting to allocate" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
-fatal: attempting to allocate 1500005 over limit 1048576
-ok 3 - unpack-objects failed under memory limitation
-
-expecting success of 5351.4 'unpack-objects works with memory limitation in dry-run mode': 
-	prepare_dest 2m &&
-	git -C dest.git unpack-objects -n <pack-$PACK.pack &&
-	test_stdout_line_count = 0 find dest.git/objects -type f &&
-	test_dir_is_empty dest.git/objects/pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
-ok 4 - unpack-objects works with memory limitation in dry-run mode
-
-expecting success of 5351.5 'unpack big object in stream': 
-	prepare_dest 1m &&
-	git -C dest.git unpack-objects <pack-$PACK.pack &&
-	test_dir_is_empty dest.git/objects/pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
-ok 5 - unpack big object in stream
-
-expecting success of 5351.6 'unpack big object in stream (core.fsyncmethod=batch)': 
-	prepare_dest 1m &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	GIT_TEST_FSYNC=true \
-		git -C dest.git $BATCH_CONFIGURATION unpack-objects <pack-$PACK.pack &&
-	if grep "core.fsyncMethod = batch is unsupported" trace2.txt
-	then
-		flush_count=7
-	else
-		flush_count=1
-	fi &&
-	check_fsync_events trace2.txt <<-EOF &&
-	"name":"writeout-only","count":6
-	"name":"hardware-flush","count":$flush_count
-	EOF
-
-	test_dir_is_empty dest.git/objects/pack &&
-	git -C dest.git cat-file --batch-check="%(objectname)" <obj-list >current &&
-	cmp obj-list current
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
-ok 6 - unpack big object in stream (core.fsyncmethod=batch)
-
-expecting success of 5351.7 'do not unpack existing large objects': 
-	prepare_dest 1m &&
-	git -C dest.git index-pack --stdin <pack-$PACK.pack &&
-	git -C dest.git unpack-objects <pack-$PACK.pack &&
-
-	# The destination came up with the exact same pack...
-	DEST_PACK=$(echo dest.git/objects/pack/pack-*.pack) &&
-	cmp pack-$PACK.pack $DEST_PACK &&
-
-	# ...and wrote no loose objects
-	test_stdout_line_count = 0 find dest.git/objects -type f ! -name "pack-*"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5351-unpack-large-objects/dest.git/
-pack	4a1be184fdbd6bf82eab500bad78e4fee02c1909
-ok 7 - do not unpack existing large objects
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5402-post-merge-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5402-post-merge-hook/.git/
 expecting success of 5402.1 'setup': 
@@ -309544,6 +309231,185 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5404-tracking-branches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5405-send-pack-rewind.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5318-commit-graph.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5318-commit-graph/.git/
 expecting success of 5318.1 'usage': 
@@ -310430,10 +310296,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.16e-05 s, 31.6 kB/s
+1 byte copied, 3.66e-05 s, 27.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.252e-05 s, 0.0 kB/s
+0 bytes copied, 2.524e-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
@@ -310447,10 +310313,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000267602 s, 3.7 kB/s
+1 byte copied, 3.32e-05 s, 30.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.98e-05 s, 0.0 kB/s
+0 bytes copied, 2.356e-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
@@ -310464,10 +310330,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.148e-05 s, 31.8 kB/s
+1 byte copied, 3.696e-05 s, 27.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.02e-05 s, 0.0 kB/s
+0 bytes copied, 2.416e-05 s, 0.0 kB/s
 error: commit-graph hash version 3 does not match version 1
 error: commit-graph hash version 3 does not match version 1
 ?? expect
@@ -310481,10 +310347,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.12e-05 s, 32.1 kB/s
+1 byte copied, 3.384e-05 s, 29.6 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.908e-05 s, 0.0 kB/s
+0 bytes copied, 2.388e-05 s, 0.0 kB/s
 error: final chunk has non-zero id 4f49444c
 error: final chunk has non-zero id 4f49444c
 ?? expect
@@ -310498,10 +310364,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000393242 s, 2.5 kB/s
+1 byte copied, 3.56e-05 s, 28.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.224e-05 s, 0.0 kB/s
+0 bytes copied, 2.396e-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
@@ -310515,10 +310381,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.152e-05 s, 31.7 kB/s
+1 byte copied, 0.0109584 s, 0.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.988e-05 s, 0.0 kB/s
+0 bytes copied, 2.316e-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
@@ -310532,10 +310398,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.584e-05 s, 27.9 kB/s
+1 byte copied, 0.0150532 s, 0.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.392e-05 s, 0.0 kB/s
+0 bytes copied, 2.6e-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
@@ -310549,10 +310415,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.296e-05 s, 30.3 kB/s
+1 byte copied, 3.32e-05 s, 30.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.952e-05 s, 0.0 kB/s
+0 bytes copied, 2.324e-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
@@ -310568,10 +310434,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000262602 s, 3.8 kB/s
+1 byte copied, 0.00055852 s, 1.8 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.0081e-05 s, 0.0 kB/s
+0 bytes copied, 2.336e-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
@@ -310587,10 +310453,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.2841e-05 s, 30.4 kB/s
+1 byte copied, 5.124e-05 s, 19.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.256e-05 s, 0.0 kB/s
+0 bytes copied, 2.504e-05 s, 0.0 kB/s
 commit-graph has incorrect OID order: d0dcf978085b712ac89a73020e40fb8b7e540ec4 then 01c8575ed6fc205127629848895ac35ba7529ace
 ?? expect
 ?? output
@@ -310602,10 +310468,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000228521 s, 4.4 kB/s
+1 byte copied, 3.508e-05 s, 28.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.308e-05 s, 0.0 kB/s
+0 bytes copied, 2.132e-05 s, 0.0 kB/s
 failed to parse commit 76c4cb0cede3ceaca44a01b27edce46ba498dfad from object database for commit-graph
 ?? expect
 ?? output
@@ -310617,10 +310483,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.548e-05 s, 28.2 kB/s
+1 byte copied, 0.00048972 s, 2.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.74e-05 s, 0.0 kB/s
+0 bytes copied, 2.34e-05 s, 0.0 kB/s
 root tree OID for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 016f0284c84f93b3e8df8c402054b760afac7e76 != 566f0284c84f93b3e8df8c402054b760afac7e76
 ?? expect
 ?? output
@@ -310632,10 +310498,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.432e-05 s, 29.1 kB/s
+1 byte copied, 3.44e-05 s, 29.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.1041e-05 s, 0.0 kB/s
+0 bytes copied, 2.436e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777220
 ?? expect
 ?? output
@@ -310647,10 +310513,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000234041 s, 4.3 kB/s
+1 byte copied, 0.00869196 s, 0.1 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.256e-05 s, 0.0 kB/s
 commit-graph parent list for commit 12a06f3a2c235980d878903e940b0570ddda4359 is too long
 ?? expect
 ?? output
@@ -310662,10 +310528,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.384e-05 s, 29.6 kB/s
+1 byte copied, 3.172e-05 s, 31.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.304e-05 s, 0.0 kB/s
+0 bytes copied, 2.212e-05 s, 0.0 kB/s
 commit-graph parent for 12a06f3a2c235980d878903e940b0570ddda4359 is 2c45687afab8ea0442fe2feb61881deac6f37339 != 76c4cb0cede3ceaca44a1bb27edce46ba498dfad
 ?? expect
 ?? output
@@ -310677,10 +310543,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00248438 s, 0.4 kB/s
+1 byte copied, 0.00517596 s, 0.2 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.184e-05 s, 0.0 kB/s
+0 bytes copied, 2.38e-05 s, 0.0 kB/s
 commit-graph generation for commit 2ff07863aadb0941159dda60d980783f6b7c6213 is 5 < 15
 ?? expect
 ?? output
@@ -310692,10 +310558,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.124e-05 s, 32.0 kB/s
+1 byte copied, 3.508e-05 s, 28.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.956e-05 s, 0.0 kB/s
+0 bytes copied, 2.264e-05 s, 0.0 kB/s
 commit date for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 22393313 != 1112912353
 ?? expect
 ?? output
@@ -310707,10 +310573,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4281e-05 s, 29.2 kB/s
+1 byte copied, 0.00331924 s, 0.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.144e-05 s, 0.0 kB/s
+0 bytes copied, 2.264e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777216
 ?? expect
 ?? output
@@ -310722,10 +310588,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.324e-05 s, 30.1 kB/s
+1 byte copied, 0.00042952 s, 2.3 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.448e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -310738,10 +310604,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.32e-05 s, 30.1 kB/s
+1 byte copied, 0.0114031 s, 0.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.004e-05 s, 0.0 kB/s
+0 bytes copied, 2.5e-05 s, 0 B/s
 error: commit-graph file is too small to hold 255 chunks
 error: commit-graph file is too small to hold 255 chunks
 ?? expect
@@ -310755,10 +310621,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 4.064e-05 s, 98.4 kB/s
+4 bytes copied, 4.464e-05 s, 89.6 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.66e-05 s, 0.0 kB/s
+0 bytes copied, 2.384e-05 s, 0.0 kB/s
 commit-graph has both zero and non-zero generations (e.g., commits 'ddc8575ed6fc205127629848895ac35ba7529ace' and 'd0dcf978085b712ac89a73020e40fb8b7e540ec4')
 ?? expect
 ?? output
@@ -310770,10 +310636,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.6e-05 s, 111 kB/s
+4 bytes copied, 3.9e-05 s, 103 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.356e-05 s, 0.0 kB/s
 commit-graph has both zero and non-zero generations (e.g., commits '12a06f3a2c235980d878903e940b0570ddda4359' and 'ddc8575ed6fc205127629848895ac35ba7529ace')
 ?? expect
 ?? output
@@ -310790,10 +310656,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.444e-05 s, 29.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.848e-05 s, 0.0 kB/s
+0 bytes copied, 2.416e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -310813,10 +310679,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 3.528e-05 s, 28.3 kB/s
+1 byte copied, 3.2e-05 s, 31 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.096e-05 s, 0.0 kB/s
+0 bytes copied, 2.372e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -310838,10 +310704,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 0.000281082 s, 3.6 kB/s
+1 byte copied, 3.484e-05 s, 28.7 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.356e-05 s, 0.0 kB/s
+0 bytes copied, 2.416e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -311254,6 +311120,320 @@
 1..108
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5403-post-checkout-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5329-pack-objects-cruft.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5329-pack-objects-cruft/.git/
 expecting success of 5329.1 'unreachable loose objects are packed (expire never)': 
@@ -312372,8 +312552,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"child_start","sid":"20250209T065441.786877Z-Hcf858c9d-P001a3cac","thread":"main","time":"2025-02-09T06:54:41.791537Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-1719468-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20250209T065441.786877Z-Hcf858c9d-P001a3cac/20250209T065441.792887Z-Hcf858c9d-P001a3cc2","thread":"main","time":"2025-02-09T06:54:41.792957Z","file":"common-main.c","line":58,"t_abs":0.000273,"argv":["/build/reproducible-path/git-2.48.0~rc1+next.20250101/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-1719468-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"child_start","sid":"20260314T133213.436014Z-H5c947e1c-P0002801e","thread":"main","time":"2026-03-14T13:32:13.449080Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-163870-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20260314T133213.436014Z-H5c947e1c-P0002801e/20260314T133213.462635Z-H5c947e1c-P0002802e","thread":"main","time":"2026-03-14T13:32:13.462714Z","file":"common-main.c","line":58,"t_abs":0.000273,"argv":["/build/reproducible-path/git-2.48.0~rc1+next.20250101/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-163870-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': 
@@ -312395,8 +312575,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"child_start","sid":"20250209T065441.822697Z-Hcf858c9d-P001a3d2a","thread":"main","time":"2025-02-09T06:54:41.827201Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-1719594-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20250209T065441.822697Z-Hcf858c9d-P001a3d2a/20250209T065441.828334Z-Hcf858c9d-P001a3d39","thread":"main","time":"2025-02-09T06:54:41.828406Z","file":"common-main.c","line":58,"t_abs":0.000255,"argv":["/build/reproducible-path/git-2.48.0~rc1+next.20250101/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-1719594-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"child_start","sid":"20260314T133213.724379Z-H5c947e1c-P0002811c","thread":"main","time":"2026-03-14T13:32:13.745695Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-164124-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20260314T133213.724379Z-H5c947e1c-P0002811c/20260314T133213.758669Z-H5c947e1c-P0002813a","thread":"main","time":"2026-03-14T13:32:13.758747Z","file":"common-main.c","line":58,"t_abs":0.000271,"argv":["/build/reproducible-path/git-2.48.0~rc1+next.20250101/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-164124-pack","--cruft","--honor-pack-keep","--non-empty"]}
 ok 26 - cruft repack respects --window by default
 
 expecting success of 5329.27 'cruft repack respects --quiet': 
@@ -312467,7 +312647,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
 df967b96a579e45a18b8251732d16804b2e56a55
-822216280fd1de308f55f27cdd7a4196a8f5a189 1739084081
+822216280fd1de308f55f27cdd7a4196a8f5a189 1773495134
 ok 28 - cruft --local drops unreachable objects
 
 expecting success of 5329.29 'MIDX bitmaps tolerate reachable cruft objects': 
@@ -312542,7 +312722,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-822216280fd1de308f55f27cdd7a4196a8f5a189 1739084082
+822216280fd1de308f55f27cdd7a4196a8f5a189 1773495135
 822216280fd1de308f55f27cdd7a4196a8f5a189
 ok 30 - cruft objects are freshend via loose
 
@@ -312780,72 +312960,6 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5405-send-pack-rewind.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5406-remote-rejects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5406-remote-rejects/.git/
 expecting success of 5406.1 'setup': 
@@ -312882,119 +312996,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5404-tracking-branches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5319-multi-pack-index.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5319-multi-pack-index/.git/
 expecting success of 5319.1 'setup': 
@@ -313496,7 +313497,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000266882 s, 3.7 kB/s
+1 byte copied, 0.00377588 s, 0.3 kB/s
 fatal: multi-pack-index signature 0x00494458 does not match signature 0x4d494458
 ok 31 - verify bad signature
 
@@ -313506,7 +313507,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.492e-05 s, 28.6 kB/s
+1 byte copied, 3.256e-05 s, 30.7 kB/s
 fatal: multi-pack-index version 0 not recognized
 ok 32 - verify bad version
 
@@ -313516,7 +313517,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.888e-05 s, 25.7 kB/s
+1 byte copied, 3.64e-05 s, 27.5 kB/s
 error: multi-pack-index hash version 3 does not match version 1
 ok 33 - verify bad OID version
 
@@ -313526,7 +313527,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.9721e-05 s, 25.2 kB/s
+1 byte copied, 0.0109303 s, 0.1 kB/s
 error: final chunk has non-zero id 4f494446
 ok 34 - verify truncated chunk count
 
@@ -313536,7 +313537,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00128785 s, 0.8 kB/s
+1 byte copied, 0.0106972 s, 0.1 kB/s
 error: terminating chunk id appears earlier than expected
 ok 35 - verify extended chunk count
 
@@ -313546,7 +313547,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.008e-05 s, 33.2 kB/s
+1 byte copied, 0.0143866 s, 0.1 kB/s
 fatal: multi-pack-index required pack-name chunk missing or corrupted
 ok 36 - verify missing required chunk
 
@@ -313556,7 +313557,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.64e-05 s, 27.5 kB/s
+1 byte copied, 3.444e-05 s, 29.0 kB/s
 error: improper chunk offset(s) 100000000000048 and 2d4
 ok 37 - verify invalid chunk offset
 
@@ -313566,7 +313567,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.62e-05 s, 27.6 kB/s
+1 byte copied, 3.444e-05 s, 29.0 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
 
@@ -313576,7 +313577,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000295002 s, 3.4 kB/s
+1 byte copied, 0.00046868 s, 2.1 kB/s
 failed to load pack in position 0
 failed to load pack entry for oid[41] = 8f94df605db2ec0d0bb7962abbc87d8d1b2f6f00
 ok 39 - verify packnames out of order
@@ -313587,7 +313588,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000259201 s, 3.9 kB/s
+1 byte copied, 3.408e-05 s, 29.3 kB/s
 error: oid fanout out of order: fanout[250] = 1004a > 4a = fanout[251]
 ok 40 - verify oid fanout out of order
 
@@ -313597,7 +313598,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.356e-05 s, 29.8 kB/s
+1 byte copied, 0.00717332 s, 0.1 kB/s
 oid lookup out of order: oid[15] = 2f695f39a9ae90106abc3a1efc22b6cfe2522e89 >= 005f923c2d2e1fff9ec067b42443fff88aeebc67 = oid[16]
 ok 41 - verify oid lookup out of order
 
@@ -313607,7 +313608,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.5e-05 s, 28.6 kB/s
+1 byte copied, 0.013321 s, 0.1 kB/s
 fatal: bad pack-int-id: 1797 (12 total packs)
 ok 42 - verify incorrect pack-int-id
 
@@ -313617,7 +313618,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.44e-05 s, 29.1 kB/s
+1 byte copied, 3.348e-05 s, 29.9 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 ok 43 - verify incorrect offset
 
@@ -313631,7 +313632,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00189409 s, 0.5 kB/s
+1 byte copied, 0.0138502 s, 0.1 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 incorrect checksum
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
@@ -313662,7 +313663,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.324e-05 s, 18.8 kB/s
+1 byte copied, 3.576e-05 s, 28.0 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
@@ -313675,7 +313676,7 @@
 
 10+0 records in
 10+0 records out
-10 bytes copied, 4.156e-05 s, 241 kB/s
+10 bytes copied, 4.424e-05 s, 226 kB/s
 incorrect checksum
 ok 48 - verify incorrect checksum
 
@@ -313761,21 +313762,21 @@
  1 file changed, 1 insertion(+)
  create mode 100644 4.t
 total 44
-drwxr-xr-x 2 pbuilder1 pbuilder1  300 Feb  9 06:54 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Feb  9 06:54 ..
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Feb  9 06:54 multi-pack-index
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Feb  9 06:54 multi-pack-index.bak
--r--r--r-- 1 pbuilder1 pbuilder1 1072 Feb  9 06:54 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Feb  9 06:54 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
--r--r--r-- 1 pbuilder1 pbuilder1   32 Feb  9 06:54 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
--r--r--r-- 1 pbuilder1 pbuilder1   52 Feb  9 06:54 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1156 Feb  9 06:54 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Feb  9 06:54 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
--r--r--r-- 1 pbuilder1 pbuilder1  211 Feb  9 06:54 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
--r--r--r-- 1 pbuilder1 pbuilder1   64 Feb  9 06:54 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Feb  9 06:54 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
--r--r--r-- 1 pbuilder1 pbuilder1  676 Feb  9 06:54 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Feb  9 06:54 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
+drwxr-xr-x 2 pbuilder2 pbuilder2  300 Mar 14 13:32 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Mar 14 13:32 ..
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Mar 14 13:32 multi-pack-index
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Mar 14 13:32 multi-pack-index.bak
+-r--r--r-- 1 pbuilder2 pbuilder2 1072 Mar 14 13:32 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Mar 14 13:32 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
+-r--r--r-- 1 pbuilder2 pbuilder2   32 Mar 14 13:32 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   52 Mar 14 13:32 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1156 Mar 14 13:32 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Mar 14 13:32 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
+-r--r--r-- 1 pbuilder2 pbuilder2  211 Mar 14 13:32 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   64 Mar 14 13:32 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Mar 14 13:32 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  676 Mar 14 13:32 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Mar 14 13:32 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
 ok 53 - repack preserves multi-pack-index when creating packs
 
 expecting success of 5319.54 'check normal git operations: after repack': 
@@ -313883,7 +313884,7 @@
 HEAD is now at 287f5d9
 1+0 records in
 1+0 records out
-1 byte copied, 3.308e-05 s, 30.2 kB/s
+1 byte copied, 3.132e-05 s, 31.9 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5319-multi-pack-index/repo/.git/
 ok 60 - force some 64-bit offsets with pack-objects
 
@@ -313898,8 +313899,8 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.392e-05 s, 29.5 kB/s
-incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70be4 != be4
+1 byte copied, 3.256e-05 s, 30.7 kB/s
+incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70acc != acc
 ok 62 - verify incorrect 64-bit offset
 
 expecting success of 5319.63 'setup expire tests': 
@@ -314274,12 +314275,12 @@
 		test_line_count = 4 midx-list
 	)
 
--r--r--r-- 1 pbuilder1 pbuilder1 1173 Feb  9 06:54 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
--r--r--r-- 1 pbuilder1 pbuilder1 2239 Feb  9 06:54 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
--r--r--r-- 1 pbuilder1 pbuilder1 1385 Feb  9 06:54 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
--r--r--r-- 1 pbuilder1 pbuilder1  838 Feb  9 06:54 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
--r--r--r-- 1 pbuilder1 pbuilder1  560 Feb  9 06:54 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
--r--r--r-- 1 pbuilder1 pbuilder1 4587 Feb  9 06:54 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1173 Mar 14 13:32 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 2239 Mar 14 13:32 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1385 Mar 14 13:32 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  838 Mar 14 13:32 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  560 Mar 14 13:32 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 4587 Mar 14 13:32 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
 ok 74 - expire removes repacked packs
 
 expecting success of 5319.75 'expire works when adding new packs': 
@@ -314794,318 +314795,872 @@
 1..93
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5403-post-checkout-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t5333-pseudo-merge-bitmaps.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/.git/
+expecting success of 5333.1 'setup': 
+	test_commit_bulk 512 &&
+	tag_everything
 
-[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
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:         1536 (         0 duplicates                  )
+      blobs  :          512 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          512 (         0 duplicates        501 deltas of        501 attempts)
+      commits:          512 (         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:            512
+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              =     184426 /     184426
+---------------------------------------------------------------------
+
+ok 1 - setup
+
+expecting success of 5333.2 'bitmap traversal without pseudo-merges': 
+	git repack -adb &&
+
+	git rev-list --count --all --objects >expect &&
+
+	: >trace2.txt &&
+	GIT_TRACE2_EVENT=$PWD/trace2.txt \
+		git rev-list --count --all --objects --use-bitmap-index >actual &&
+
+	test_pseudo_merges_satisfied 0 <trace2.txt &&
+	test_pseudo_merges_cascades 0 <trace2.txt &&
+	test_pseudo_merges >merges &&
+	test_must_be_empty merges &&
+	test_cmp expect actual
+
+{"event":"data","sid":"20260314T133207.914188Z-H5c947e1c-P00026e19","thread":"main","time":"2026-03-14T13:32:07.932917Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.018933,"t_rel":0.018933,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
+{"event":"data","sid":"20260314T133207.914188Z-H5c947e1c-P00026e19","thread":"main","time":"2026-03-14T13:32:07.932923Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.018940,"t_rel":0.018940,"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': 
+	test_config bitmapPseudoMerge.test.pattern "refs/tags/" &&
+	test_config bitmapPseudoMerge.test.maxMerges 8 &&
+	test_config bitmapPseudoMerge.test.stableThreshold never &&
+
+	git repack -adb &&
+
+	test_pseudo_merges >merges &&
+	test_line_count = 8 merges &&
+
+	for i in $(test_seq 0 $(($(wc -l <merges)-1)))
+	do
+		test-tool bitmap dump-pseudo-merge-commits $i >commits &&
+
+		git rev-list --objects --no-object-names --stdin <commits >expect.raw &&
+		test-tool bitmap dump-pseudo-merge-objects $i >actual.raw &&
+
+		sort -u <expect.raw >expect &&
+		sort -u <actual.raw >actual &&
+
+		test_cmp expect actual || return 1
+	done
+
+ok 3 - pseudo-merges accurately represent their objects
+
+expecting success of 5333.4 'bitmap traversal with pseudo-merges': 
+	: >trace2.txt &&
+	GIT_TRACE2_EVENT=$PWD/trace2.txt \
+		git rev-list --count --all --objects --use-bitmap-index >actual &&
+	git rev-list --count --all --objects >expect &&
+
+	test_pseudo_merges_satisfied 8 <trace2.txt &&
+	test_pseudo_merges_cascades 1 <trace2.txt &&
+	test_cmp expect actual
+
+{"event":"data","sid":"20260314T133209.620957Z-H5c947e1c-P000273cd","thread":"main","time":"2026-03-14T13:32:09.644864Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.024090,"t_rel":0.024090,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20260314T133209.620957Z-H5c947e1c-P000273cd","thread":"main","time":"2026-03-14T13:32:09.644872Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.024098,"t_rel":0.024098,"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': 
+	test_commit other &&
+
+	: >trace2.txt &&
+	GIT_TRACE2_EVENT=$PWD/trace2.txt \
+		git rev-list --count --all --objects --use-bitmap-index >actual &&
+	git rev-list --count --all --objects >expect &&
+
+	test_pseudo_merges_satisfied 8 <trace2.txt &&
+	test_pseudo_merges_cascades 1 <trace2.txt &&
+	test_cmp expect actual
+
+[master 4ed165a] other
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 1 - setup
+ create mode 100644 other.t
+{"event":"data","sid":"20260314T133209.912316Z-H5c947e1c-P000274c3","thread":"main","time":"2026-03-14T13:32:09.935700Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.023565,"t_rel":0.023565,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20260314T133209.912316Z-H5c947e1c-P000274c3","thread":"main","time":"2026-03-14T13:32:09.935714Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.023581,"t_rel":0.023581,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+ok 5 - stale bitmap traversal with pseudo-merges
 
-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 5333.6 'bitmapPseudoMerge.sampleRate adjusts commit selection rate': 
+	test_config bitmapPseudoMerge.test.pattern "refs/tags/" &&
+	test_config bitmapPseudoMerge.test.maxMerges 1 &&
+	test_config bitmapPseudoMerge.test.stableThreshold never &&
 
-Already on 'main'
-ok 2 - post-checkout receives the right arguments with HEAD unchanged 
+	commits_nr=$(git rev-list --all --count) &&
 
-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
+	for rate in 1.0 0.5 0.25
+	do
+		git -c bitmapPseudoMerge.test.sampleRate=$rate repack -adb &&
 
-Switched to a new branch 'new1'
-ok 3 - post-checkout args are correct with git checkout -b 
+		test_pseudo_merges >merges &&
+		test_line_count = 1 merges &&
+		test_pseudo_merge_commits 0 >commits &&
 
-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
+		test-tool bitmap list-commits >bitmaps &&
+		bitmaps_nr="$(wc -l <bitmaps)" &&
 
-Note: switching to 'two'.
+		perl -MPOSIX -e "print ceil(\$ARGV[0]*(\$ARGV[1]-\$ARGV[2]))" \
+			"$rate" "$commits_nr" "$bitmaps_nr" >expect &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+		test $(cat expect) -eq $(wc -l <commits) || return 1
+	done
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 6 - bitmapPseudoMerge.sampleRate adjusts commit selection rate
 
-  git switch -c <new-branch-name>
+expecting success of 5333.7 'bitmapPseudoMerge.threshold excludes newer commits': 
+	git init pseudo-merge-threshold &&
+	(
+		cd pseudo-merge-threshold &&
 
-Or undo this operation with:
+		new="1672549200" && # 2023-01-01
+		old="1641013200" && # 2022-01-01
 
-  git switch -
+		GIT_COMMITTER_DATE="$new +0000" &&
+		export GIT_COMMITTER_DATE &&
+		test_commit_bulk --message="new" --notick 128 &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		GIT_COMMITTER_DATE="$old +0000" &&
+		export GIT_COMMITTER_DATE &&
+		test_commit_bulk --message="old" --notick 128 &&
 
-HEAD is now at 139b20d two
-ok 4 - post-checkout receives the right args with HEAD changed 
+		tag_everything &&
 
-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
+		git \
+			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
+			-c bitmapPseudoMerge.test.maxMerges=1 \
+			-c bitmapPseudoMerge.test.threshold=$(($new - 1)) \
+			-c bitmapPseudoMerge.test.stableThreshold=never \
+			repack -adb &&
 
-ok 5 - post-checkout receives the right args when not switching branches 
+		test_pseudo_merges >merges &&
+		test_line_count = 1 merges &&
 
-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
+		test_pseudo_merge_commits 0 >oids &&
+		git cat-file --batch <oids >commits &&
 
-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
+		test $(wc -l <oids) = $(grep -c "^committer.*$old +0000$" commits)
+	)
 
-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'.
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-threshold/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          384 (         0 duplicates                  )
+      blobs  :          128 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          128 (         0 duplicates        125 deltas of        125 attempts)
+      commits:          128 (         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:            128
+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              =      34032 /      34032
+---------------------------------------------------------------------
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+cbdfb2f5b8100311ba33d6e13b4883c68c99d518
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          128 (       128 duplicates                  )
+      blobs  :            0 (       128 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:          128 (         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:            128
+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            =        260
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      55320 /      55320
+---------------------------------------------------------------------
 
-If you want to 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 7 - bitmapPseudoMerge.threshold excludes newer commits
 
-  git switch -c <new-branch-name>
+expecting success of 5333.8 'bitmapPseudoMerge.stableThreshold creates stable groups': 
+	(
+		cd pseudo-merge-threshold &&
 
-Or undo this operation with:
+		new="1672549200" && # 2023-01-01
+		mid="1654059600" && # 2022-06-01
+		old="1641013200" && # 2022-01-01
 
-  git switch -
+		GIT_COMMITTER_DATE="$mid +0000" &&
+		export GIT_COMMITTER_DATE &&
+		test_commit_bulk --message="mid" --notick 128 &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		git for-each-ref --format="delete %(refname)" refs/tags >in &&
+		git update-ref --stdin <in &&
 
-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
+		tag_everything &&
 
-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
+		git \
+			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
+			-c bitmapPseudoMerge.test.maxMerges=1 \
+			-c bitmapPseudoMerge.test.threshold=$(($new - 1)) \
+			-c bitmapPseudoMerge.test.stableThreshold=$(($mid - 1)) \
+			-c bitmapPseudoMerge.test.stableSize=10 \
+			repack -adb &&
 
+		test_pseudo_merges >merges &&
+		merges_nr="$(wc -l <merges)" &&
 
-Note: switching to 'two'.
+		for i in $(test_seq $(($merges_nr - 1)))
+		do
+			test_pseudo_merge_commits 0 >oids &&
+			git cat-file --batch <oids >commits &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+			expect="$(grep -c "^committer.*$old +0000$" commits)" &&
+			actual="$(wc -l <oids)" &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+			test $expect = $actual || return 1
+		done &&
 
-  git switch -c <new-branch-name>
+		test_pseudo_merge_commits $(($merges_nr - 1)) >oids &&
+		git cat-file --batch <oids >commits &&
+		test $(wc -l <oids) = $(grep -c "^committer.*$mid +0000$" commits)
+	)
 
-Or undo this operation with:
+c49de8925b0eaed08e4c1212a7dacae7610ceed9
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          128 (       128 duplicates                  )
+      blobs  :            0 (       128 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:          128 (         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:            128
+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            =        134
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      76454 /      76454
+---------------------------------------------------------------------
 
-  git switch -
+ok 8 - bitmapPseudoMerge.stableThreshold creates stable groups
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5333.9 'out of order thresholds are rejected': 
+	test_must_fail git \
+		-c bitmapPseudoMerge.test.pattern="refs/*" \
+		-c bitmapPseudoMerge.test.threshold=1.month.ago \
+		-c bitmapPseudoMerge.test.stableThreshold=1.week.ago \
+		repack -adb 2>err &&
 
-HEAD is now at 139b20d two
-error: The following untracked working tree files would be overwritten by checkout:
-fatal: no rebase in progress
-ok 9 - rebase --apply checkout does not remove untracked files
+	cat >expect <<-EOF &&
+	fatal: pseudo-merge group ${SQ}test${SQ} has unstable threshold before stable one
+	EOF
 
-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
+	test_cmp expect err
 
-expecting success of 5403.11 'post-checkout is triggered on rebase --merge with fast-forward': 
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git checkout -B ff-rebase-test rebase-on-me^ &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args rebase-on-me &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev rebase-on-me^ $old &&
-		test_cmp_rev rebase-on-me $new &&
-		test $flag = 1
-	
-Switched to and reset branch 'ff-rebase-test'
-Successfully rebased and updated refs/heads/ff-rebase-test.
-ok 11 - post-checkout is triggered on rebase --merge with fast-forward
+ok 9 - out of order thresholds are rejected
 
-expecting success of 5403.12 'rebase --merge fast-forward branch checkout runs post-checkout hook': 
-		test_when_finished "test_might_fail git rebase --abort" &&
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git update-ref refs/heads/rebase-fast-forward three &&
-		git checkout two  &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args HEAD rebase-fast-forward  &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev two $old &&
-		test_cmp_rev three $new &&
-		test $flag = 1
-	
-Note: switching to 'two'.
+expecting success of 5333.10 'pseudo-merge pattern with capture groups': 
+	git init pseudo-merge-captures &&
+	(
+		cd pseudo-merge-captures &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+		test_commit_bulk 128 &&
+		tag_everything &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		for r in $(test_seq 8)
+		do
+			test_commit_bulk 16 &&
 
-  git switch -c <new-branch-name>
+			git rev-list HEAD~16.. >in &&
 
-Or undo this operation with:
+			perl -lne "print \"create refs/remotes/$r/tags/\$. \$_\"" <in |
+			git update-ref --stdin || return 1
+		done &&
 
-  git switch -
+		git \
+			-c bitmapPseudoMerge.tags.pattern="refs/remotes/([0-9]+)/tags/" \
+			-c bitmapPseudoMerge.tags.maxMerges=1 \
+			repack -adb &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		git for-each-ref --format="%(objectname) %(refname)" >refs &&
 
-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
+		test_pseudo_merges >merges &&
+		for m in $(test_seq 0 $(($(wc -l <merges) - 1)))
+		do
+			test_pseudo_merge_commits $m >oids &&
+			grep -f oids refs |
+			perl -lne "print \$1 if /refs\/remotes\/([0-9]+)/" |
+			sort -u || return 1
+		done >remotes &&
 
-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
+		test $(wc -l <remotes) -eq $(sort -u <remotes | wc -l)
+	)
 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-captures/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          384 (         0 duplicates                  )
+      blobs  :          128 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          128 (         0 duplicates        125 deltas of        125 attempts)
+      commits:          128 (         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:            128
+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              =      32779 /      32779
+---------------------------------------------------------------------
 
-Note: switching to 'two'.
+24499547eb6a90c0b6222bac928b3e8ab2029498
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      35311 /      35311
+---------------------------------------------------------------------
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+a871400bfc24741b05db5e0a8a2f5e7c8a7a905a
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =      37840 /      37840
+---------------------------------------------------------------------
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+4701a925f823738aae20e96a6bba616acca38e3e
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =      37841 /      37841
+---------------------------------------------------------------------
 
-  git switch -c <new-branch-name>
+e6af7e81baf856d412006667c57afb795e04f0c3
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =      37842 /      37842
+---------------------------------------------------------------------
 
-Or undo this operation with:
+b66ec810ecde252d700c094ba8656c06fe77262b
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =      37841 /      37841
+---------------------------------------------------------------------
 
-  git switch -
+3f75bb14d22ce7606576f3dd53e0a4c8f7920028
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =      37842 /      37842
+---------------------------------------------------------------------
 
-Turn off this advice by setting config variable advice.detachedHead to false
+7b42f605f6da17adac689e4c59a7df435eb0566f
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =      37841 /      37841
+---------------------------------------------------------------------
 
-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
+c40a6bced397dbb9d80e7a720bf6ebbd19fe918c
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (        16 duplicates                  )
+      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           16 (         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:            128
+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            =         22
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =      37841 /      37841
+---------------------------------------------------------------------
 
-expecting success of 5403.14 'post-checkout hook is triggered by clone': 
-	mkdir -p templates/hooks &&
-	write_script templates/hooks/post-checkout <<-\EOF &&
-	echo "$@" >"$GIT_DIR/post-checkout.args"
-	EOF
-	git clone --template=templates . clone3 &&
-	test -f clone3/.git/post-checkout.args
+ok 10 - pseudo-merge pattern with capture groups
 
-Cloning into 'clone3'...
-done.
-Note: switching to '139b20d8e6c5b496de61f033f642d0e3dbff528d'.
+expecting success of 5333.11 'pseudo-merge overlap setup': 
+	git init pseudo-merge-overlap &&
+	(
+		cd pseudo-merge-overlap &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+		test_commit_bulk 256 &&
+		tag_everything &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		git \
+			-c bitmapPseudoMerge.all.pattern="refs/" \
+			-c bitmapPseudoMerge.all.maxMerges=1 \
+			-c bitmapPseudoMerge.all.stableThreshold=never \
+			-c bitmapPseudoMerge.tags.pattern="refs/tags/" \
+			-c bitmapPseudoMerge.tags.maxMerges=1 \
+			-c bitmapPseudoMerge.tags.stableThreshold=never \
+			repack -adb
+	)
 
-  git switch -c <new-branch-name>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-overlap/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          768 (         0 duplicates                  )
+      blobs  :          256 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          256 (         0 duplicates        250 deltas of        250 attempts)
+      commits:          256 (         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:            256
+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              =      76852 /      76852
+---------------------------------------------------------------------
 
-Or undo this operation with:
+ok 11 - pseudo-merge overlap setup
 
-  git switch -
+expecting success of 5333.12 'pseudo-merge overlap generates overlapping groups': 
+	(
+		cd pseudo-merge-overlap &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		test_pseudo_merges >merges &&
+		test_line_count = 2 merges &&
 
-ok 14 - post-checkout hook is triggered by clone
+		test_pseudo_merge_commits 0 >commits-0.raw &&
+		test_pseudo_merge_commits 1 >commits-1.raw &&
 
-# passed all 14 test(s)
-1..14
+		sort commits-0.raw >commits-0 &&
+		sort commits-1.raw >commits-1 &&
+
+		comm -12 commits-0 commits-1 >overlap &&
+
+		test_line_count -gt 0 overlap
+	)
+
+ok 12 - pseudo-merge overlap generates overlapping groups
+
+expecting success of 5333.13 'pseudo-merge overlap traversal': 
+	(
+		cd pseudo-merge-overlap &&
+
+		: >trace2.txt &&
+		GIT_TRACE2_EVENT=$PWD/trace2.txt \
+			git rev-list --count --all --objects --use-bitmap-index >actual &&
+		git rev-list --count --all --objects >expect &&
+
+		test_pseudo_merges_satisfied 2 <trace2.txt &&
+		test_pseudo_merges_cascades 1 <trace2.txt &&
+		test_cmp expect actual
+	)
+
+{"event":"data","sid":"20260314T133217.935955Z-H5c947e1c-P00028f97","thread":"main","time":"2026-03-14T13:32:17.944041Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.008282,"t_rel":0.008282,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20260314T133217.935955Z-H5c947e1c-P00028f97","thread":"main","time":"2026-03-14T13:32:17.944048Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.008290,"t_rel":0.008290,"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': 
+	(
+		cd pseudo-merge-overlap &&
+
+		test_commit other &&
+
+		: >trace2.txt &&
+		GIT_TRACE2_EVENT=$PWD/trace2.txt \
+			git rev-list --count --all --objects --use-bitmap-index >actual &&
+		git rev-list --count --all --objects >expect &&
+
+		test_pseudo_merges_satisfied 2 <trace2.txt &&
+		test_pseudo_merges_cascades 1 <trace2.txt &&
+		test_cmp expect actual
+	)
+
+[master 96f393a] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+{"event":"data","sid":"20260314T133218.184252Z-H5c947e1c-P00029097","thread":"main","time":"2026-03-14T13:32:18.196729Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.012669,"t_rel":0.012669,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20260314T133218.184252Z-H5c947e1c-P00029097","thread":"main","time":"2026-03-14T13:32:18.196739Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.012681,"t_rel":0.012681,"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': 
+	git init pseudo-merge-reuse &&
+	(
+		cd pseudo-merge-reuse &&
+
+		stable="1641013200" && # 2022-01-01
+		unstable="1672549200" && # 2023-01-01
+
+		GIT_COMMITTER_DATE="$stable +0000" &&
+		export GIT_COMMITTER_DATE &&
+		test_commit_bulk --notick 128 &&
+		GIT_COMMITTER_DATE="$unstable +0000" &&
+		export GIT_COMMITTER_DATE &&
+		test_commit_bulk --notick 128 &&
+
+		tag_everything &&
+
+		git \
+			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
+			-c bitmapPseudoMerge.test.maxMerges=1 \
+			-c bitmapPseudoMerge.test.threshold=now \
+			-c bitmapPseudoMerge.test.stableThreshold=$(($unstable - 1)) \
+			-c bitmapPseudoMerge.test.stableSize=512 \
+			repack -adb &&
+
+		test_pseudo_merges >merges &&
+		test_line_count = 2 merges &&
+
+		test_pseudo_merge_commits 0 >stable-oids.before &&
+		test_pseudo_merge_commits 1 >unstable-oids.before &&
+
+		: >trace2.txt &&
+		GIT_TRACE2_EVENT=$PWD/trace2.txt git \
+			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
+			-c bitmapPseudoMerge.test.maxMerges=2 \
+			-c bitmapPseudoMerge.test.threshold=now \
+			-c bitmapPseudoMerge.test.stableThreshold=$(($unstable - 1)) \
+			-c bitmapPseudoMerge.test.stableSize=512 \
+			repack -adb &&
+
+		test_pseudo_merges_reused 1 <trace2.txt &&
+
+		test_pseudo_merges >merges &&
+		test_line_count = 3 merges &&
+
+		test_pseudo_merge_commits 0 >stable-oids.after &&
+		for i in 1 2
+		do
+			test_pseudo_merge_commits $i || return 1
+		done >unstable-oids.after &&
+
+		sort -u <stable-oids.before >expect &&
+		sort -u <stable-oids.after >actual &&
+		test_cmp expect actual &&
+
+		sort -u <unstable-oids.before >expect &&
+		sort -u <unstable-oids.after >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-reuse/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          384 (         0 duplicates                  )
+      blobs  :          128 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          128 (         0 duplicates        125 deltas of        125 attempts)
+      commits:          128 (         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:            128
+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              =      34019 /      34019
+---------------------------------------------------------------------
+
+189bf17c14d3b722a282715934da048c610ae3da
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          128 (       128 duplicates                  )
+      blobs  :            0 (       128 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:          128 (         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:            128
+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            =        134
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      55372 /      55372
+---------------------------------------------------------------------
+
+{"event":"data","sid":"20260314T133219.056188Z-H5c947e1c-P000293de/20260314T133219.074662Z-H5c947e1c-P000293f2","thread":"main","time":"2026-03-14T13:32:19.171191Z","file":"pack-bitmap-write.c","line":650,"repo":1,"t_abs":0.096761,"t_rel":0.004765,"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': 
+	git init pseudo-merge-empty-group &&
+	(
+		cd pseudo-merge-empty-group &&
+
+		# Ensure that a pseudo-merge group with no unstable
+		# commits does not generate an empty pseudo-merge
+		# bitmap.
+		git config bitmapPseudoMerge.empty.pattern refs/ &&
+
+		test_commit base &&
+		git repack -adb &&
+
+		test-tool bitmap dump-pseudo-merges >merges &&
+		test_line_count = 1 merges &&
+
+		test 0 -eq "$(grep -c commits=0 <merges)"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-empty-group/.git/
+[master (root-commit) 5049680] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 16 - empty pseudo-merge group
+
+expecting success of 5333.17 'pseudo-merge closure': 
+	git init pseudo-merge-closure &&
+	(
+		cd pseudo-merge-closure &&
+
+		test_commit A &&
+		git repack -d &&
+
+		test_commit B &&
+
+		# Note that the contents of A is packed, but B is not. A
+		# (and the objects reachable from it) are thus visible
+		# to the MIDX, but the same is not true for B and its
+		# objects.
+		#
+		# Ensure that we do not attempt to create a pseudo-merge
+		# for B, depsite it matching the below pseudo-merge
+		# group pattern, as doing so would result in a failure
+		# to write a non-closed bitmap.
+		git config bitmapPseudoMerge.test.pattern refs/ &&
+		git config bitmapPseudoMerge.test.threshold now &&
+
+		git multi-pack-index write --bitmap &&
+
+		test-tool bitmap dump-pseudo-merges >pseudo-merges &&
+		test_line_count = 1 pseudo-merges &&
+
+		git rev-parse A >expect &&
+
+		test-tool bitmap list-commits >actual &&
+		test_cmp expect actual &&
+		test-tool bitmap dump-pseudo-merge-commits 0 >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-closure/.git/
+[master (root-commit) d31372d] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master 2e20069] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 17 - pseudo-merge closure
+
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5410-receive-pack-alternates.sh ***
@@ -315163,187 +315718,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5408-send-pack-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/.git/
-expecting success of 5408.1 'setup refs': 
-	cat >refs <<-\EOF &&
-	refs/heads/A
-	refs/heads/C
-	refs/tags/D
-	refs/heads/B
-	refs/tags/E
-	EOF
-	for i in $(cat refs); do
-		create_ref $i || return 1
-	done
-
-ok 1 - setup refs
-
-expecting success of 5408.2 'refs on cmdline': 
-	clear_remote &&
-	git send-pack remote.git $(cat refs) &&
-	for i in $(cat refs); do
-		verify_push $i || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      A -> A
- * [new branch]      C -> C
- * [new tag]         D -> D
- * [new branch]      B -> B
- * [new tag]         E -> E
-ok 2 - refs on cmdline
-
-expecting success of 5408.3 'refs over stdin': 
-	clear_remote &&
-	git send-pack remote.git --stdin <refs &&
-	for i in $(cat refs); do
-		verify_push $i || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      A -> A
- * [new branch]      C -> C
- * [new tag]         D -> D
- * [new branch]      B -> B
- * [new tag]         E -> E
-ok 3 - refs over stdin
-
-expecting success of 5408.4 'stdin lines are full refspecs': 
-	clear_remote &&
-	echo "A:other" >input &&
-	git send-pack remote.git --stdin <input &&
-	verify_push refs/heads/A refs/heads/other
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      A -> other
-ok 4 - stdin lines are full refspecs
-
-expecting success of 5408.5 'stdin mixed with cmdline': 
-	clear_remote &&
-	echo A >input &&
-	git send-pack remote.git --stdin B <input &&
-	verify_push A &&
-	verify_push B
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      B -> B
- * [new branch]      A -> A
-ok 5 - stdin mixed with cmdline
-
-expecting success of 5408.6 'cmdline refs written in order': 
-	clear_remote &&
-	test_must_fail git send-pack remote.git A:foo B:foo &&
-	verify_push A foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
-To remote.git
- ! [remote rejected] A -> foo (failed to update ref)
- ! [remote failure]  B -> foo (remote failed to report status)
-ok 6 - cmdline refs written in order
-
-expecting success of 5408.7 '--stdin refs come after cmdline': 
-	clear_remote &&
-	echo A:foo >input &&
-	test_must_fail git send-pack remote.git --stdin B:foo <input &&
-	verify_push B foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
-To remote.git
- ! [remote rejected] B -> foo (failed to update ref)
- ! [remote failure]  A -> foo (remote failed to report status)
-ok 7 - --stdin refs come after cmdline
-
-expecting success of 5408.8 'refspecs and --mirror do not mix (cmdline)': 
-	clear_remote &&
-	test_must_fail git send-pack remote.git --mirror $(cat refs)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-usage: git send-pack [--mirror] [--dry-run] [--force]
-                     [--receive-pack=<git-receive-pack>]
-                     [--verbose] [--thin] [--atomic]
-                     [--[no-]signed | --signed=(true|false|if-asked)]
-                     [<host>:]<directory> (--all | <ref>...)
-
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]receive-pack <receive-pack>
-                          receive pack program
-    --[no-]exec <receive-pack>
-                          receive pack program
-    --[no-]remote <remote>
-                          remote name
-    --[no-]all            push all refs
-    -n, --[no-]dry-run    dry run
-    --[no-]mirror         mirror all refs
-    -f, --[no-]force      force updates
-    --[no-]signed[=(yes|no|if-asked)]
-                          GPG sign the push
-    --[no-]push-option <server-specific>
-                          option to transmit
-    --[no-]progress       force progress reporting
-    --[no-]thin           use thin pack
-    --[no-]atomic         request atomic transaction on remote side
-    --[no-]stateless-rpc  use stateless RPC protocol
-    --[no-]stdin          read refs from stdin
-    --[no-]helper-status  print status from remote helper
-    --[no-]force-with-lease[=<refname>:<expect>]
-                          require old value of ref to be at this value
-    --[no-]force-if-includes
-                          require remote updates to be integrated locally
-
-ok 8 - refspecs and --mirror do not mix (cmdline)
-
-expecting success of 5408.9 'refspecs and --mirror do not mix (stdin)': 
-	clear_remote &&
-	test_must_fail git send-pack remote.git --mirror --stdin <refs
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
-usage: git send-pack [--mirror] [--dry-run] [--force]
-                     [--receive-pack=<git-receive-pack>]
-                     [--verbose] [--thin] [--atomic]
-                     [--[no-]signed | --signed=(true|false|if-asked)]
-                     [<host>:]<directory> (--all | <ref>...)
-
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]receive-pack <receive-pack>
-                          receive pack program
-    --[no-]exec <receive-pack>
-                          receive pack program
-    --[no-]remote <remote>
-                          remote name
-    --[no-]all            push all refs
-    -n, --[no-]dry-run    dry run
-    --[no-]mirror         mirror all refs
-    -f, --[no-]force      force updates
-    --[no-]signed[=(yes|no|if-asked)]
-                          GPG sign the push
-    --[no-]push-option <server-specific>
-                          option to transmit
-    --[no-]progress       force progress reporting
-    --[no-]thin           use thin pack
-    --[no-]atomic         request atomic transaction on remote side
-    --[no-]stateless-rpc  use stateless RPC protocol
-    --[no-]stdin          read refs from stdin
-    --[no-]helper-status  print status from remote helper
-    --[no-]force-with-lease[=<refname>:<expect>]
-                          require old value of ref to be at this value
-    --[no-]force-if-includes
-                          require remote updates to be integrated locally
-
-ok 9 - refspecs and --mirror do not mix (stdin)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5409-colorize-remote-messages.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5409-colorize-remote-messages/.git/
 expecting success of 5409.1 'setup': 
@@ -315448,39 +315822,220 @@
 	test_decode_color <output >decoded &&
 	grep "error: error" decoded
 
-remote: error: error        
-remote: prefixerror: error        
-ok 8 - no coloring for redirected output
+remote: error: error        
+remote: prefixerror: error        
+ok 8 - no coloring for redirected output
+
+expecting success of 5409.9 'push with customized color': 
+	git --git-dir child/.git -c color.remote=always -c color.remote.error=blue push -f origin HEAD:refs/heads/customized-color 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BLUE>error<RESET>:" decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded
+
+remote: <BLUE>error<RESET>: error        
+remote:   <BLUE>error<RESET>: leading space        
+remote: <BOLD;GREEN>success<RESET>: success        
+ok 9 - push with customized color
+
+expecting success of 5409.10 'error in customized color': 
+	git --git-dir child/.git -c color.remote=always -c color.remote.error=i-am-not-a-color push -f origin HEAD:refs/heads/error-customized-color 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded
+
+remote: <BOLD;GREEN>success<RESET>: success        
+ok 10 - error in customized color
+
+expecting success of 5409.11 'fallback to color.ui': 
+	git --git-dir child/.git -c color.ui=always push -f origin HEAD:refs/heads/fallback-color-ui 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;RED>error<RESET>: error" decoded
+
+remote: <BOLD;RED>error<RESET>: error        
+ok 11 - fallback to color.ui
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5408-send-pack-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/.git/
+expecting success of 5408.1 'setup refs': 
+	cat >refs <<-\EOF &&
+	refs/heads/A
+	refs/heads/C
+	refs/tags/D
+	refs/heads/B
+	refs/tags/E
+	EOF
+	for i in $(cat refs); do
+		create_ref $i || return 1
+	done
+
+ok 1 - setup refs
+
+expecting success of 5408.2 'refs on cmdline': 
+	clear_remote &&
+	git send-pack remote.git $(cat refs) &&
+	for i in $(cat refs); do
+		verify_push $i || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      A -> A
+ * [new branch]      C -> C
+ * [new tag]         D -> D
+ * [new branch]      B -> B
+ * [new tag]         E -> E
+ok 2 - refs on cmdline
+
+expecting success of 5408.3 'refs over stdin': 
+	clear_remote &&
+	git send-pack remote.git --stdin <refs &&
+	for i in $(cat refs); do
+		verify_push $i || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      A -> A
+ * [new branch]      C -> C
+ * [new tag]         D -> D
+ * [new branch]      B -> B
+ * [new tag]         E -> E
+ok 3 - refs over stdin
+
+expecting success of 5408.4 'stdin lines are full refspecs': 
+	clear_remote &&
+	echo "A:other" >input &&
+	git send-pack remote.git --stdin <input &&
+	verify_push refs/heads/A refs/heads/other
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      A -> other
+ok 4 - stdin lines are full refspecs
+
+expecting success of 5408.5 'stdin mixed with cmdline': 
+	clear_remote &&
+	echo A >input &&
+	git send-pack remote.git --stdin B <input &&
+	verify_push A &&
+	verify_push B
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      B -> B
+ * [new branch]      A -> A
+ok 5 - stdin mixed with cmdline
+
+expecting success of 5408.6 'cmdline refs written in order': 
+	clear_remote &&
+	test_must_fail git send-pack remote.git A:foo B:foo &&
+	verify_push A foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
+To remote.git
+ ! [remote rejected] A -> foo (failed to update ref)
+ ! [remote failure]  B -> foo (remote failed to report status)
+ok 6 - cmdline refs written in order
+
+expecting success of 5408.7 '--stdin refs come after cmdline': 
+	clear_remote &&
+	echo A:foo >input &&
+	test_must_fail git send-pack remote.git --stdin B:foo <input &&
+	verify_push B foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
+To remote.git
+ ! [remote rejected] B -> foo (failed to update ref)
+ ! [remote failure]  A -> foo (remote failed to report status)
+ok 7 - --stdin refs come after cmdline
+
+expecting success of 5408.8 'refspecs and --mirror do not mix (cmdline)': 
+	clear_remote &&
+	test_must_fail git send-pack remote.git --mirror $(cat refs)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+usage: git send-pack [--mirror] [--dry-run] [--force]
+                     [--receive-pack=<git-receive-pack>]
+                     [--verbose] [--thin] [--atomic]
+                     [--[no-]signed | --signed=(true|false|if-asked)]
+                     [<host>:]<directory> (--all | <ref>...)
 
-expecting success of 5409.9 'push with customized color': 
-	git --git-dir child/.git -c color.remote=always -c color.remote.error=blue push -f origin HEAD:refs/heads/customized-color 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BLUE>error<RESET>:" decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]receive-pack <receive-pack>
+                          receive pack program
+    --[no-]exec <receive-pack>
+                          receive pack program
+    --[no-]remote <remote>
+                          remote name
+    --[no-]all            push all refs
+    -n, --[no-]dry-run    dry run
+    --[no-]mirror         mirror all refs
+    -f, --[no-]force      force updates
+    --[no-]signed[=(yes|no|if-asked)]
+                          GPG sign the push
+    --[no-]push-option <server-specific>
+                          option to transmit
+    --[no-]progress       force progress reporting
+    --[no-]thin           use thin pack
+    --[no-]atomic         request atomic transaction on remote side
+    --[no-]stateless-rpc  use stateless RPC protocol
+    --[no-]stdin          read refs from stdin
+    --[no-]helper-status  print status from remote helper
+    --[no-]force-with-lease[=<refname>:<expect>]
+                          require old value of ref to be at this value
+    --[no-]force-if-includes
+                          require remote updates to be integrated locally
 
-remote: <BLUE>error<RESET>: error        
-remote:   <BLUE>error<RESET>: leading space        
-remote: <BOLD;GREEN>success<RESET>: success        
-ok 9 - push with customized color
+ok 8 - refspecs and --mirror do not mix (cmdline)
 
-expecting success of 5409.10 'error in customized color': 
-	git --git-dir child/.git -c color.remote=always -c color.remote.error=i-am-not-a-color push -f origin HEAD:refs/heads/error-customized-color 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded
+expecting success of 5408.9 'refspecs and --mirror do not mix (stdin)': 
+	clear_remote &&
+	test_must_fail git send-pack remote.git --mirror --stdin <refs
 
-remote: <BOLD;GREEN>success<RESET>: success        
-ok 10 - error in customized color
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5408-send-pack-stdin/remote.git/
+usage: git send-pack [--mirror] [--dry-run] [--force]
+                     [--receive-pack=<git-receive-pack>]
+                     [--verbose] [--thin] [--atomic]
+                     [--[no-]signed | --signed=(true|false|if-asked)]
+                     [<host>:]<directory> (--all | <ref>...)
 
-expecting success of 5409.11 'fallback to color.ui': 
-	git --git-dir child/.git -c color.ui=always push -f origin HEAD:refs/heads/fallback-color-ui 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;RED>error<RESET>: error" decoded
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]receive-pack <receive-pack>
+                          receive pack program
+    --[no-]exec <receive-pack>
+                          receive pack program
+    --[no-]remote <remote>
+                          remote name
+    --[no-]all            push all refs
+    -n, --[no-]dry-run    dry run
+    --[no-]mirror         mirror all refs
+    -f, --[no-]force      force updates
+    --[no-]signed[=(yes|no|if-asked)]
+                          GPG sign the push
+    --[no-]push-option <server-specific>
+                          option to transmit
+    --[no-]progress       force progress reporting
+    --[no-]thin           use thin pack
+    --[no-]atomic         request atomic transaction on remote side
+    --[no-]stateless-rpc  use stateless RPC protocol
+    --[no-]stdin          read refs from stdin
+    --[no-]helper-status  print status from remote helper
+    --[no-]force-with-lease[=<refname>:<expect>]
+                          require old value of ref to be at this value
+    --[no-]force-if-includes
+                          require remote updates to be integrated locally
 
-remote: <BOLD;RED>error<RESET>: error        
-ok 11 - fallback to color.ui
+ok 9 - refspecs and --mirror do not mix (stdin)
 
-# passed all 11 test(s)
-1..11
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5502-quickfetch.sh ***
@@ -316834,874 +317389,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5333-pseudo-merge-bitmaps.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/.git/
-expecting success of 5333.1 'setup': 
-	test_commit_bulk 512 &&
-	tag_everything
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:         1536 (         0 duplicates                  )
-      blobs  :          512 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          512 (         0 duplicates        501 deltas of        501 attempts)
-      commits:          512 (         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:            512
-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              =     184426 /     184426
----------------------------------------------------------------------
-
-ok 1 - setup
-
-expecting success of 5333.2 'bitmap traversal without pseudo-merges': 
-	git repack -adb &&
-
-	git rev-list --count --all --objects >expect &&
-
-	: >trace2.txt &&
-	GIT_TRACE2_EVENT=$PWD/trace2.txt \
-		git rev-list --count --all --objects --use-bitmap-index >actual &&
-
-	test_pseudo_merges_satisfied 0 <trace2.txt &&
-	test_pseudo_merges_cascades 0 <trace2.txt &&
-	test_pseudo_merges >merges &&
-	test_must_be_empty merges &&
-	test_cmp expect actual
-
-{"event":"data","sid":"20250209T065441.724219Z-Hcf858c9d-P001a3b95","thread":"main","time":"2025-02-09T06:54:41.730956Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.006918,"t_rel":0.006918,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
-{"event":"data","sid":"20250209T065441.724219Z-Hcf858c9d-P001a3b95","thread":"main","time":"2025-02-09T06:54:41.730964Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.006926,"t_rel":0.006926,"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': 
-	test_config bitmapPseudoMerge.test.pattern "refs/tags/" &&
-	test_config bitmapPseudoMerge.test.maxMerges 8 &&
-	test_config bitmapPseudoMerge.test.stableThreshold never &&
-
-	git repack -adb &&
-
-	test_pseudo_merges >merges &&
-	test_line_count = 8 merges &&
-
-	for i in $(test_seq 0 $(($(wc -l <merges)-1)))
-	do
-		test-tool bitmap dump-pseudo-merge-commits $i >commits &&
-
-		git rev-list --objects --no-object-names --stdin <commits >expect.raw &&
-		test-tool bitmap dump-pseudo-merge-objects $i >actual.raw &&
-
-		sort -u <expect.raw >expect &&
-		sort -u <actual.raw >actual &&
-
-		test_cmp expect actual || return 1
-	done
-
-ok 3 - pseudo-merges accurately represent their objects
-
-expecting success of 5333.4 'bitmap traversal with pseudo-merges': 
-	: >trace2.txt &&
-	GIT_TRACE2_EVENT=$PWD/trace2.txt \
-		git rev-list --count --all --objects --use-bitmap-index >actual &&
-	git rev-list --count --all --objects >expect &&
-
-	test_pseudo_merges_satisfied 8 <trace2.txt &&
-	test_pseudo_merges_cascades 1 <trace2.txt &&
-	test_cmp expect actual
-
-{"event":"data","sid":"20250209T065441.989640Z-Hcf858c9d-P001a3fee","thread":"main","time":"2025-02-09T06:54:41.996327Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.006887,"t_rel":0.006887,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20250209T065441.989640Z-Hcf858c9d-P001a3fee","thread":"main","time":"2025-02-09T06:54:41.996335Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.006895,"t_rel":0.006895,"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': 
-	test_commit other &&
-
-	: >trace2.txt &&
-	GIT_TRACE2_EVENT=$PWD/trace2.txt \
-		git rev-list --count --all --objects --use-bitmap-index >actual &&
-	git rev-list --count --all --objects >expect &&
-
-	test_pseudo_merges_satisfied 8 <trace2.txt &&
-	test_pseudo_merges_cascades 1 <trace2.txt &&
-	test_cmp expect actual
-
-[master 4ed165a] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-{"event":"data","sid":"20250209T065442.062480Z-Hcf858c9d-P001a4134","thread":"main","time":"2025-02-09T06:54:42.069653Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.007371,"t_rel":0.007371,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20250209T065442.062480Z-Hcf858c9d-P001a4134","thread":"main","time":"2025-02-09T06:54:42.069668Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.007387,"t_rel":0.007387,"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': 
-	test_config bitmapPseudoMerge.test.pattern "refs/tags/" &&
-	test_config bitmapPseudoMerge.test.maxMerges 1 &&
-	test_config bitmapPseudoMerge.test.stableThreshold never &&
-
-	commits_nr=$(git rev-list --all --count) &&
-
-	for rate in 1.0 0.5 0.25
-	do
-		git -c bitmapPseudoMerge.test.sampleRate=$rate repack -adb &&
-
-		test_pseudo_merges >merges &&
-		test_line_count = 1 merges &&
-		test_pseudo_merge_commits 0 >commits &&
-
-		test-tool bitmap list-commits >bitmaps &&
-		bitmaps_nr="$(wc -l <bitmaps)" &&
-
-		perl -MPOSIX -e "print ceil(\$ARGV[0]*(\$ARGV[1]-\$ARGV[2]))" \
-			"$rate" "$commits_nr" "$bitmaps_nr" >expect &&
-
-		test $(cat expect) -eq $(wc -l <commits) || return 1
-	done
-
-ok 6 - bitmapPseudoMerge.sampleRate adjusts commit selection rate
-
-expecting success of 5333.7 'bitmapPseudoMerge.threshold excludes newer commits': 
-	git init pseudo-merge-threshold &&
-	(
-		cd pseudo-merge-threshold &&
-
-		new="1672549200" && # 2023-01-01
-		old="1641013200" && # 2022-01-01
-
-		GIT_COMMITTER_DATE="$new +0000" &&
-		export GIT_COMMITTER_DATE &&
-		test_commit_bulk --message="new" --notick 128 &&
-
-		GIT_COMMITTER_DATE="$old +0000" &&
-		export GIT_COMMITTER_DATE &&
-		test_commit_bulk --message="old" --notick 128 &&
-
-		tag_everything &&
-
-		git \
-			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
-			-c bitmapPseudoMerge.test.maxMerges=1 \
-			-c bitmapPseudoMerge.test.threshold=$(($new - 1)) \
-			-c bitmapPseudoMerge.test.stableThreshold=never \
-			repack -adb &&
-
-		test_pseudo_merges >merges &&
-		test_line_count = 1 merges &&
-
-		test_pseudo_merge_commits 0 >oids &&
-		git cat-file --batch <oids >commits &&
-
-		test $(wc -l <oids) = $(grep -c "^committer.*$old +0000$" commits)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-threshold/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          384 (         0 duplicates                  )
-      blobs  :          128 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          128 (         0 duplicates        125 deltas of        125 attempts)
-      commits:          128 (         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:            128
-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              =      34032 /      34032
----------------------------------------------------------------------
-
-cbdfb2f5b8100311ba33d6e13b4883c68c99d518
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          128 (       128 duplicates                  )
-      blobs  :            0 (       128 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:          128 (         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:            128
-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            =        260
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      55320 /      55320
----------------------------------------------------------------------
-
-ok 7 - bitmapPseudoMerge.threshold excludes newer commits
-
-expecting success of 5333.8 'bitmapPseudoMerge.stableThreshold creates stable groups': 
-	(
-		cd pseudo-merge-threshold &&
-
-		new="1672549200" && # 2023-01-01
-		mid="1654059600" && # 2022-06-01
-		old="1641013200" && # 2022-01-01
-
-		GIT_COMMITTER_DATE="$mid +0000" &&
-		export GIT_COMMITTER_DATE &&
-		test_commit_bulk --message="mid" --notick 128 &&
-
-		git for-each-ref --format="delete %(refname)" refs/tags >in &&
-		git update-ref --stdin <in &&
-
-		tag_everything &&
-
-		git \
-			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
-			-c bitmapPseudoMerge.test.maxMerges=1 \
-			-c bitmapPseudoMerge.test.threshold=$(($new - 1)) \
-			-c bitmapPseudoMerge.test.stableThreshold=$(($mid - 1)) \
-			-c bitmapPseudoMerge.test.stableSize=10 \
-			repack -adb &&
-
-		test_pseudo_merges >merges &&
-		merges_nr="$(wc -l <merges)" &&
-
-		for i in $(test_seq $(($merges_nr - 1)))
-		do
-			test_pseudo_merge_commits 0 >oids &&
-			git cat-file --batch <oids >commits &&
-
-			expect="$(grep -c "^committer.*$old +0000$" commits)" &&
-			actual="$(wc -l <oids)" &&
-
-			test $expect = $actual || return 1
-		done &&
-
-		test_pseudo_merge_commits $(($merges_nr - 1)) >oids &&
-		git cat-file --batch <oids >commits &&
-		test $(wc -l <oids) = $(grep -c "^committer.*$mid +0000$" commits)
-	)
-
-c49de8925b0eaed08e4c1212a7dacae7610ceed9
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          128 (       128 duplicates                  )
-      blobs  :            0 (       128 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:          128 (         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:            128
-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            =        134
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      76454 /      76454
----------------------------------------------------------------------
-
-ok 8 - bitmapPseudoMerge.stableThreshold creates stable groups
-
-expecting success of 5333.9 'out of order thresholds are rejected': 
-	test_must_fail git \
-		-c bitmapPseudoMerge.test.pattern="refs/*" \
-		-c bitmapPseudoMerge.test.threshold=1.month.ago \
-		-c bitmapPseudoMerge.test.stableThreshold=1.week.ago \
-		repack -adb 2>err &&
-
-	cat >expect <<-EOF &&
-	fatal: pseudo-merge group ${SQ}test${SQ} has unstable threshold before stable one
-	EOF
-
-	test_cmp expect err
-
-ok 9 - out of order thresholds are rejected
-
-expecting success of 5333.10 'pseudo-merge pattern with capture groups': 
-	git init pseudo-merge-captures &&
-	(
-		cd pseudo-merge-captures &&
-
-		test_commit_bulk 128 &&
-		tag_everything &&
-
-		for r in $(test_seq 8)
-		do
-			test_commit_bulk 16 &&
-
-			git rev-list HEAD~16.. >in &&
-
-			perl -lne "print \"create refs/remotes/$r/tags/\$. \$_\"" <in |
-			git update-ref --stdin || return 1
-		done &&
-
-		git \
-			-c bitmapPseudoMerge.tags.pattern="refs/remotes/([0-9]+)/tags/" \
-			-c bitmapPseudoMerge.tags.maxMerges=1 \
-			repack -adb &&
-
-		git for-each-ref --format="%(objectname) %(refname)" >refs &&
-
-		test_pseudo_merges >merges &&
-		for m in $(test_seq 0 $(($(wc -l <merges) - 1)))
-		do
-			test_pseudo_merge_commits $m >oids &&
-			grep -f oids refs |
-			perl -lne "print \$1 if /refs\/remotes\/([0-9]+)/" |
-			sort -u || return 1
-		done >remotes &&
-
-		test $(wc -l <remotes) -eq $(sort -u <remotes | wc -l)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-captures/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          384 (         0 duplicates                  )
-      blobs  :          128 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          128 (         0 duplicates        125 deltas of        125 attempts)
-      commits:          128 (         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:            128
-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              =      32779 /      32779
----------------------------------------------------------------------
-
-24499547eb6a90c0b6222bac928b3e8ab2029498
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      35311 /      35311
----------------------------------------------------------------------
-
-a871400bfc24741b05db5e0a8a2f5e7c8a7a905a
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =      37840 /      37840
----------------------------------------------------------------------
-
-4701a925f823738aae20e96a6bba616acca38e3e
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =      37841 /      37841
----------------------------------------------------------------------
-
-e6af7e81baf856d412006667c57afb795e04f0c3
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =      37842 /      37842
----------------------------------------------------------------------
-
-b66ec810ecde252d700c094ba8656c06fe77262b
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =      37841 /      37841
----------------------------------------------------------------------
-
-3f75bb14d22ce7606576f3dd53e0a4c8f7920028
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =      37842 /      37842
----------------------------------------------------------------------
-
-7b42f605f6da17adac689e4c59a7df435eb0566f
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =      37841 /      37841
----------------------------------------------------------------------
-
-c40a6bced397dbb9d80e7a720bf6ebbd19fe918c
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (        16 duplicates                  )
-      blobs  :            0 (        16 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           16 (         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:            128
-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            =         22
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =      37841 /      37841
----------------------------------------------------------------------
-
-ok 10 - pseudo-merge pattern with capture groups
-
-expecting success of 5333.11 'pseudo-merge overlap setup': 
-	git init pseudo-merge-overlap &&
-	(
-		cd pseudo-merge-overlap &&
-
-		test_commit_bulk 256 &&
-		tag_everything &&
-
-		git \
-			-c bitmapPseudoMerge.all.pattern="refs/" \
-			-c bitmapPseudoMerge.all.maxMerges=1 \
-			-c bitmapPseudoMerge.all.stableThreshold=never \
-			-c bitmapPseudoMerge.tags.pattern="refs/tags/" \
-			-c bitmapPseudoMerge.tags.maxMerges=1 \
-			-c bitmapPseudoMerge.tags.stableThreshold=never \
-			repack -adb
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-overlap/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          768 (         0 duplicates                  )
-      blobs  :          256 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          256 (         0 duplicates        250 deltas of        250 attempts)
-      commits:          256 (         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:            256
-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              =      76852 /      76852
----------------------------------------------------------------------
-
-ok 11 - pseudo-merge overlap setup
-
-expecting success of 5333.12 'pseudo-merge overlap generates overlapping groups': 
-	(
-		cd pseudo-merge-overlap &&
-
-		test_pseudo_merges >merges &&
-		test_line_count = 2 merges &&
-
-		test_pseudo_merge_commits 0 >commits-0.raw &&
-		test_pseudo_merge_commits 1 >commits-1.raw &&
-
-		sort commits-0.raw >commits-0 &&
-		sort commits-1.raw >commits-1 &&
-
-		comm -12 commits-0 commits-1 >overlap &&
-
-		test_line_count -gt 0 overlap
-	)
-
-ok 12 - pseudo-merge overlap generates overlapping groups
-
-expecting success of 5333.13 'pseudo-merge overlap traversal': 
-	(
-		cd pseudo-merge-overlap &&
-
-		: >trace2.txt &&
-		GIT_TRACE2_EVENT=$PWD/trace2.txt \
-			git rev-list --count --all --objects --use-bitmap-index >actual &&
-		git rev-list --count --all --objects >expect &&
-
-		test_pseudo_merges_satisfied 2 <trace2.txt &&
-		test_pseudo_merges_cascades 1 <trace2.txt &&
-		test_cmp expect actual
-	)
-
-{"event":"data","sid":"20250209T065443.501766Z-Hcf858c9d-P001a5aed","thread":"main","time":"2025-02-09T06:54:43.505850Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.004261,"t_rel":0.004261,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20250209T065443.501766Z-Hcf858c9d-P001a5aed","thread":"main","time":"2025-02-09T06:54:43.505856Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.004268,"t_rel":0.004268,"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': 
-	(
-		cd pseudo-merge-overlap &&
-
-		test_commit other &&
-
-		: >trace2.txt &&
-		GIT_TRACE2_EVENT=$PWD/trace2.txt \
-			git rev-list --count --all --objects --use-bitmap-index >actual &&
-		git rev-list --count --all --objects >expect &&
-
-		test_pseudo_merges_satisfied 2 <trace2.txt &&
-		test_pseudo_merges_cascades 1 <trace2.txt &&
-		test_cmp expect actual
-	)
-
-[master 96f393a] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-{"event":"data","sid":"20250209T065443.540660Z-Hcf858c9d-P001a5b73","thread":"main","time":"2025-02-09T06:54:43.545169Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.004710,"t_rel":0.004710,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20250209T065443.540660Z-Hcf858c9d-P001a5b73","thread":"main","time":"2025-02-09T06:54:43.545182Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.004724,"t_rel":0.004724,"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': 
-	git init pseudo-merge-reuse &&
-	(
-		cd pseudo-merge-reuse &&
-
-		stable="1641013200" && # 2022-01-01
-		unstable="1672549200" && # 2023-01-01
-
-		GIT_COMMITTER_DATE="$stable +0000" &&
-		export GIT_COMMITTER_DATE &&
-		test_commit_bulk --notick 128 &&
-		GIT_COMMITTER_DATE="$unstable +0000" &&
-		export GIT_COMMITTER_DATE &&
-		test_commit_bulk --notick 128 &&
-
-		tag_everything &&
-
-		git \
-			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
-			-c bitmapPseudoMerge.test.maxMerges=1 \
-			-c bitmapPseudoMerge.test.threshold=now \
-			-c bitmapPseudoMerge.test.stableThreshold=$(($unstable - 1)) \
-			-c bitmapPseudoMerge.test.stableSize=512 \
-			repack -adb &&
-
-		test_pseudo_merges >merges &&
-		test_line_count = 2 merges &&
-
-		test_pseudo_merge_commits 0 >stable-oids.before &&
-		test_pseudo_merge_commits 1 >unstable-oids.before &&
-
-		: >trace2.txt &&
-		GIT_TRACE2_EVENT=$PWD/trace2.txt git \
-			-c bitmapPseudoMerge.test.pattern="refs/tags/" \
-			-c bitmapPseudoMerge.test.maxMerges=2 \
-			-c bitmapPseudoMerge.test.threshold=now \
-			-c bitmapPseudoMerge.test.stableThreshold=$(($unstable - 1)) \
-			-c bitmapPseudoMerge.test.stableSize=512 \
-			repack -adb &&
-
-		test_pseudo_merges_reused 1 <trace2.txt &&
-
-		test_pseudo_merges >merges &&
-		test_line_count = 3 merges &&
-
-		test_pseudo_merge_commits 0 >stable-oids.after &&
-		for i in 1 2
-		do
-			test_pseudo_merge_commits $i || return 1
-		done >unstable-oids.after &&
-
-		sort -u <stable-oids.before >expect &&
-		sort -u <stable-oids.after >actual &&
-		test_cmp expect actual &&
-
-		sort -u <unstable-oids.before >expect &&
-		sort -u <unstable-oids.after >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-reuse/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          384 (         0 duplicates                  )
-      blobs  :          128 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          128 (         0 duplicates        125 deltas of        125 attempts)
-      commits:          128 (         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:            128
-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              =      34019 /      34019
----------------------------------------------------------------------
-
-189bf17c14d3b722a282715934da048c610ae3da
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          128 (       128 duplicates                  )
-      blobs  :            0 (       128 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:          128 (         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:            128
-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            =        134
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      55372 /      55372
----------------------------------------------------------------------
-
-{"event":"data","sid":"20250209T065443.720039Z-Hcf858c9d-P001a5e68/20250209T065443.722107Z-Hcf858c9d-P001a5e74","thread":"main","time":"2025-02-09T06:54:43.734932Z","file":"pack-bitmap-write.c","line":650,"repo":1,"t_abs":0.013037,"t_rel":0.003523,"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': 
-	git init pseudo-merge-empty-group &&
-	(
-		cd pseudo-merge-empty-group &&
-
-		# Ensure that a pseudo-merge group with no unstable
-		# commits does not generate an empty pseudo-merge
-		# bitmap.
-		git config bitmapPseudoMerge.empty.pattern refs/ &&
-
-		test_commit base &&
-		git repack -adb &&
-
-		test-tool bitmap dump-pseudo-merges >merges &&
-		test_line_count = 1 merges &&
-
-		test 0 -eq "$(grep -c commits=0 <merges)"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-empty-group/.git/
-[master (root-commit) 5049680] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 16 - empty pseudo-merge group
-
-expecting success of 5333.17 'pseudo-merge closure': 
-	git init pseudo-merge-closure &&
-	(
-		cd pseudo-merge-closure &&
-
-		test_commit A &&
-		git repack -d &&
-
-		test_commit B &&
-
-		# Note that the contents of A is packed, but B is not. A
-		# (and the objects reachable from it) are thus visible
-		# to the MIDX, but the same is not true for B and its
-		# objects.
-		#
-		# Ensure that we do not attempt to create a pseudo-merge
-		# for B, depsite it matching the below pseudo-merge
-		# group pattern, as doing so would result in a failure
-		# to write a non-closed bitmap.
-		git config bitmapPseudoMerge.test.pattern refs/ &&
-		git config bitmapPseudoMerge.test.threshold now &&
-
-		git multi-pack-index write --bitmap &&
-
-		test-tool bitmap dump-pseudo-merges >pseudo-merges &&
-		test_line_count = 1 pseudo-merges &&
-
-		git rev-parse A >expect &&
-
-		test-tool bitmap list-commits >actual &&
-		test_cmp expect actual &&
-		test-tool bitmap dump-pseudo-merge-commits 0 >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5333-pseudo-merge-bitmaps/pseudo-merge-closure/.git/
-[master (root-commit) d31372d] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master 2e20069] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 17 - pseudo-merge closure
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5407-post-rewrite-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5407-post-rewrite-hook/.git/
 expecting success of 5407.1 'setup': 
@@ -318469,1318 +318156,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5501-fetch-push-alternates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/.git/
-expecting success of 5501.1 'setup': 
-	(
-		git init original &&
-		cd original &&
-		i=0 &&
-		while test $i -le 100
-		do
-			echo "$i" >count &&
-			git add count &&
-			git commit -m "$i" || exit
-			i=$(($i + 1))
-		done
-	) &&
-	(
-		git clone --reference=original "file://$(pwd)/original" one &&
-		cd one &&
-		echo Z >count &&
-		git add count &&
-		git commit -m Z &&
-		count_objects >../one.count
-	) &&
-	A=$(pwd)/original/.git/objects &&
-	git init receiver &&
-	echo "$A" >receiver/.git/objects/info/alternates &&
-	git init fetcher &&
-	echo "$A" >fetcher/.git/objects/info/alternates
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/original/.git/
-[main (root-commit) d7c40dd] 0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 count
-[main 00c614b] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 5ec1e45] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main a9efc77] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main c661cc5] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 89f590f] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 96be99a] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 7e9488d] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2f54fac] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 11134d9] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 6236019] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main bebbf7d] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b1e60f2] 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 10e978f] 13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 52d904f] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 5f1970b] 15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main d80a0ca] 16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3facc15] 17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main dd21a14] 18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 67c96e8] 19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0a5eb8d] 20
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main ed4a160] 21
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 1eb8b26] 22
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f914101] 23
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main c371026] 24
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b0c6b03] 25
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main d6851c0] 26
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9a208aa] 27
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 4b86dd7] 28
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 86a56bd] 29
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main aa18215] 30
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2e42b4c] 31
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e38e14f] 32
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f7aa34c] 33
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 1d551cb] 34
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main ed39ed7] 35
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 54de9d5] 36
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main dcfcf4c] 37
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main a67fff4] 38
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3db9e8e] 39
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 39c359d] 40
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f2920ee] 41
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2d4b8b6] 42
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 66140fd] 43
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main ed32c34] 44
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main ce3db61] 45
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b328726] 46
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 92302ab] 47
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main af56e5b] 48
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f02ac0b] 49
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f600268] 50
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 6967bfc] 51
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 6f79241] 52
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3fe3c4e] 53
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main dc5bb44] 54
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e477179] 55
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main fd9c417] 56
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main c7e9e38] 57
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 48c25a1] 58
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 6daa813] 59
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3957a75] 60
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f2ff35a] 61
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 38df9e3] 62
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 360af37] 63
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 6269302] 64
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 830052d] 65
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 34ff71d] 66
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f5c98a1] 67
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main df2b346] 68
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main c845993] 69
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b2f3c62] 70
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2342d27] 71
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main a0c2d2f] 72
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main cf25d3f] 73
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 20d3c94] 74
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main d436a89] 75
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main fe0c75d] 76
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 72c1473] 77
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main dcd8460] 78
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9d5db24] 79
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 53bba3b] 80
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 72531ec] 81
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b0f56b9] 82
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9444118] 83
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main db330fb] 84
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 74834bd] 85
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3a1af5c] 86
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main bb4543a] 87
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main bb3fe84] 88
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main d925d95] 89
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main bdcb25b] 90
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main ea11a31] 91
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 04225bc] 92
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 4427164] 93
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 3961ecb] 94
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 728c870] 95
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 1463d46] 96
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b7b22b0] 97
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e63dc2e] 98
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main a9eed53] 99
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f746b54] 100
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'one'...
-[main 1e6ca96] Z
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/receiver/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/fetcher/.git/
-ok 1 - setup
-
-expecting success of 5501.2 'pushing into a repository with the same alternate': 
-	(
-		cd one &&
-		git push ../receiver main:refs/heads/it
-	) &&
-	(
-		cd receiver &&
-		count_objects >../receiver.count
-	) &&
-	test_cmp one.count receiver.count
-
-To ../receiver
- * [new branch]      main -> it
-ok 2 - pushing into a repository with the same alternate
-
-expecting success of 5501.3 'fetching from a repository with the same alternate': 
-	(
-		cd fetcher &&
-		git fetch ../one main:refs/heads/it &&
-		count_objects >../fetcher.count
-	) &&
-	test_cmp one.count fetcher.count
-
-From ../one
- * [new branch]      main       -> it
-ok 3 - fetching from a repository with the same alternate
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5506-remote-groups.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5506-remote-groups/.git/
-expecting success of 5506.1 'setup': 
-	mkdir one && (cd one && git init) &&
-	mkdir two && (cd two && git init) &&
-	git remote add -m main one one &&
-	git remote add -m main two two
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5506-remote-groups/one/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5506-remote-groups/two/.git/
-ok 1 - setup
-
-expecting success of 5506.2 'no group updates all': 
-	mark update-all &&
-	update_repos &&
-	git remote update &&
-	repo_fetched one &&
-	repo_fetched two
-
-[main (root-commit) e3d2b21] update-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main (root-commit) e3d2b21] update-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Fetching one
-From one
- * [new branch]      main       -> one/main
-Fetching two
-From two
- * [new branch]      main       -> two/main
-repo was fetched: one
-repo was fetched: two
-ok 2 - no group updates all
-
-expecting success of 5506.3 'nonexistent group produces error': 
-	mark nonexistent &&
-	update_repos &&
-	test_must_fail git remote update nonexistent &&
-	! repo_fetched one &&
-	! repo_fetched two
-
-[main 5183ee7] nonexistent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 5183ee7] nonexistent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-fatal: no such remote or remote group: nonexistent
-repo was not fetched: one
-repo was not fetched: two
-ok 3 - nonexistent group produces error
-
-expecting success of 5506.4 'updating group updates all members (remote update)': 
-	mark group-all &&
-	update_repos &&
-	git config --add remotes.all one &&
-	git config --add remotes.all two &&
-	git remote update all &&
-	repo_fetched one &&
-	repo_fetched two
-
-[main 76ca780] group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 76ca780] group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   e3d2b21..76ca780  main       -> one/main
-Fetching two
-From two
-   e3d2b21..76ca780  main       -> two/main
-repo was fetched: one
-repo was fetched: two
-ok 4 - updating group updates all members (remote update)
-
-expecting success of 5506.5 'updating group updates all members (fetch)': 
-	mark fetch-group-all &&
-	update_repos &&
-	git fetch all &&
-	repo_fetched one &&
-	repo_fetched two
-
-[main 72c2514] fetch-group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 72c2514] fetch-group-all
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   76ca780..72c2514  main       -> one/main
-Fetching two
-From two
-   76ca780..72c2514  main       -> two/main
-repo was fetched: one
-repo was fetched: two
-ok 5 - updating group updates all members (fetch)
-
-expecting success of 5506.6 'updating group does not update non-members (remote update)': 
-	mark group-some &&
-	update_repos &&
-	git config --add remotes.some one &&
-	git remote update some &&
-	repo_fetched one &&
-	! repo_fetched two
-
-[main a4a07c1] group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main a4a07c1] group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   72c2514..a4a07c1  main       -> one/main
-repo was fetched: one
-repo was not fetched: two
-ok 6 - updating group does not update non-members (remote update)
-
-expecting success of 5506.7 'updating group does not update non-members (fetch)': 
-	mark fetch-group-some &&
-	update_repos &&
-	git config --add remotes.some one &&
-	git remote update some &&
-	repo_fetched one &&
-	! repo_fetched two
-
-[main 09f8b0e] fetch-group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 09f8b0e] fetch-group-some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   a4a07c1..09f8b0e  main       -> one/main
-repo was fetched: one
-repo was not fetched: two
-ok 7 - updating group does not update non-members (fetch)
-
-expecting success of 5506.8 'updating remote name updates that remote': 
-	mark remote-name &&
-	update_repos &&
-	git remote update one &&
-	repo_fetched one &&
-	! repo_fetched two
-
-[main 1609587] remote-name
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 1609587] remote-name
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   09f8b0e..1609587  main       -> one/main
-repo was fetched: one
-repo was not fetched: two
-ok 8 - updating remote name updates that remote
-
-expecting success of 5506.9 'updating group in parallel with a duplicate remote does not fail (fetch)': 
-	mark fetch-group-duplicate &&
-	update_repo one &&
-	git config --add remotes.duplicate one &&
-	git config --add remotes.duplicate one &&
-	git -c fetch.parallel=2 remote update duplicate &&
-	repo_fetched one
-
-[main d1132c8] fetch-group-duplicate
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Fetching one
-From one
-   1609587..d1132c8  main       -> one/main
-repo was fetched: one
-ok 9 - updating group in parallel with a duplicate remote does not fail (fetch)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5504-fetch-receive-strict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/.git/
-expecting success of 5504.1 'setup and inject "corrupt or missing" object': 
-	echo hello >greetings &&
-	git add greetings &&
-	git commit -m greetings &&
-
-	S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
-	X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
-	echo $S >S &&
-	echo $X >X &&
-	cp .git/objects/$S .git/objects/$S.back &&
-	mv -f .git/objects/$X .git/objects/$S &&
-
-	test_must_fail git fsck
-
-[main (root-commit) 1b9525e] greetings
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 greetings
-error: b023018cabc396e7692c70bbf5784a93d3f738ab: hash-path mismatch, found at: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a
-bad sha1 file: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a.back
-missing blob ce013625030ba8dba906f756967f9e9ca394464a
-ok 1 - setup and inject "corrupt or missing" object
-
-expecting success of 5504.2 'fetch without strict': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git main
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: ../.git did not send all necessary objects
-ok 2 - fetch without strict
-
-expecting success of 5504.3 'fetch with !fetch.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git main
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: ../.git did not send all necessary objects
-ok 3 - fetch with !fetch.fsckobjects
-
-expecting success of 5504.4 'fetch with fetch.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects true &&
-		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git main
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
-fatal: index-pack failed
-ok 4 - fetch with fetch.fsckobjects
-
-expecting success of 5504.5 'fetch with transfer.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git main
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
-fatal: index-pack failed
-ok 5 - fetch with transfer.fsckobjects
-
-expecting success of 5504.6 'push without strict': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects false
-	) &&
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: failed to push some refs to 'dst'
-ok 6 - push without strict
-
-expecting success of 5504.7 'push with !receive.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config receive.fsckobjects false &&
-		git config transfer.fsckobjects true
-	) &&
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: failed to push some refs to 'dst'
-ok 7 - push with !receive.fsckobjects
-
-expecting success of 5504.8 'push with receive.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config receive.fsckobjects true &&
-		git config transfer.fsckobjects false
-	) &&
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: object of unexpected type        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-ok 8 - push with receive.fsckobjects
-
-expecting success of 5504.9 'push with transfer.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config transfer.fsckobjects true
-	) &&
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: object of unexpected type        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-ok 9 - push with transfer.fsckobjects
-
-expecting success of 5504.10 'repair the "corrupt or missing" object': 
-	mv -f .git/objects/$(cat S) .git/objects/$(cat X) &&
-	mv .git/objects/$(cat S).back .git/objects/$(cat S) &&
-	rm -rf .git/objects/$(cat X) &&
-	git fsck
-
-ok 10 - repair the "corrupt or missing" object
-
-expecting success of 5504.11 'setup bogus commit': 
-	commit="$(git hash-object --literally -t commit -w --stdin <bogus-commit)"
-
-ok 11 - setup bogus commit
-
-expecting success of 5504.12 'fsck with no skipList input': 
-	test_must_fail git fsck 2>err &&
-	test_grep "missingEmail" err
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-ok 12 - fsck with no skipList input
-
-expecting success of 5504.13 'setup sorted and unsorted skipLists': 
-	cat >SKIP.unsorted <<-EOF &&
-	$(test_oid 004)
-	$(test_oid 002)
-	$commit
-	$(test_oid 001)
-	$(test_oid 003)
-	EOF
-	sort SKIP.unsorted >SKIP.sorted
-
-ok 13 - setup sorted and unsorted skipLists
-
-expecting success of 5504.14 'fsck with sorted skipList': 
-	git -c fsck.skipList=SKIP.sorted fsck
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 14 - fsck with sorted skipList
-
-expecting success of 5504.15 'fsck with unsorted skipList': 
-	git -c fsck.skipList=SKIP.unsorted fsck
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 15 - fsck with unsorted skipList
-
-expecting success of 5504.16 'fsck with invalid or bogus skipList input': 
-	git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
-	test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
-	test_grep "could not open.*: does-not-exist" err &&
-	test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
-	test_grep "invalid object name: " err
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-fatal: could not open object name list: does-not-exist
-fatal: invalid object name: [core]
-ok 16 - fsck with invalid or bogus skipList input
-
-expecting success of 5504.17 'fsck with other accepted skipList input (comments & empty lines)': 
-	cat >SKIP.with-comment <<-EOF &&
-	# Some bad commit
-	$(test_oid 001)
-	EOF
-	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
-	test_grep "missingEmail" err-with-comment &&
-	cat >SKIP.with-empty-line <<-EOF &&
-	$(test_oid 001)
-
-	$(test_oid 002)
-	EOF
-	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
-	test_grep "missingEmail" err-with-empty-line
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-ok 17 - fsck with other accepted skipList input (comments & empty lines)
-
-expecting success of 5504.18 'fsck no garbage output from comments & empty lines errors': 
-	test_line_count = 1 err-with-comment &&
-	test_line_count = 1 err-with-empty-line
-
-ok 18 - fsck no garbage output from comments & empty lines errors
-
-expecting success of 5504.19 'fsck with invalid abbreviated skipList input': 
-	echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
-	test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
-	test_grep "^fatal: invalid object name: " err-abbreviated
-
-fatal: invalid object name: 6516fe4a6d0c92028617
-ok 19 - fsck with invalid abbreviated skipList input
-
-expecting success of 5504.20 'fsck with exhaustive accepted skipList input (various types of comments etc.)': 
-	>SKIP.exhaustive &&
-	echo "# A commented line" >>SKIP.exhaustive &&
-	echo "" >>SKIP.exhaustive &&
-	echo " " >>SKIP.exhaustive &&
-	echo " # Comment after whitespace" >>SKIP.exhaustive &&
-	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
-	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
-	echo "  $(test_oid 001)" >>SKIP.exhaustive &&
-	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
-	test_must_be_empty err
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 20 - fsck with exhaustive accepted skipList input (various types of comments etc.)
-
-expecting success of 5504.21 'push with receive.fsck.skipList': 
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckObjects true &&
-	test_must_fail git push --porcelain dst bogus &&
-	echo $commit >dst/.git/SKIP &&
-
-	# receive.fsck.* does not fall back on fsck.*
-	git --git-dir=dst/.git config fsck.skipList SKIP &&
-	test_must_fail git push --porcelain dst bogus &&
-
-	# Invalid and/or bogus skipList input
-	git --git-dir=dst/.git config receive.fsck.skipList /dev/null &&
-	test_must_fail git push --porcelain dst bogus &&
-	git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
-	test_must_fail git push --porcelain dst bogus 2>err &&
-	test_grep "could not open.*: does-not-exist" err &&
-	git --git-dir=dst/.git config receive.fsck.skipList config &&
-	test_must_fail git push --porcelain dst bogus 2>err &&
-	test_grep "invalid object name: " err &&
-
-	git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
-	git push --porcelain dst bogus
-
-To .
- * [new branch]      6516fe4a6d0c9202861748d549d2e2b20e5210c9 -> bogus
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: fatal: could not open object name list: does-not-exist        
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: fatal: invalid object name: [core]        
-To dst
-*	refs/heads/bogus:refs/heads/bogus	[new branch]
-Done
-ok 21 - push with receive.fsck.skipList
-
-expecting success of 5504.22 'fetch with fetch.fsck.skipList': 
-	refspec=refs/heads/bogus:refs/heads/bogus &&
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckObjects true &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	echo $commit >dst/.git/SKIP &&
-
-	# fetch.fsck.* does not fall back on fsck.*
-	git --git-dir=dst/.git config fsck.skipList dst/.git/SKIP &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-
-	# Invalid and/or bogus skipList input
-	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
-	test_grep "could not open.*: does-not-exist" err &&
-	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
-	test_grep "invalid object name: " err &&
-
-	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
-
-Everything up-to-date
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-fatal: could not open object name list: does-not-exist
-fatal: invalid object name: [core]
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict
- * [new branch]      bogus      -> bogus
-ok 22 - fetch with fetch.fsck.skipList
-
-expecting success of 5504.23 'fsck.<unknownmsg-id> dies': 
-	test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
-	test_grep "Unhandled message id: whatever" err
-
-fatal: Unhandled message id: whatever
-ok 23 - fsck.<unknownmsg-id> dies
-
-expecting success of 5504.24 'push with receive.fsck.missingEmail=warn': 
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckobjects true &&
-	test_must_fail git push --porcelain dst bogus &&
-
-	# receive.fsck.<msg-id> does not fall back on fsck.<msg-id>
-	git --git-dir=dst/.git config fsck.missingEmail warn &&
-	test_must_fail git push --porcelain dst bogus &&
-
-	# receive.fsck.<unknownmsg-id> warns
-	git --git-dir=dst/.git config \
-		receive.fsck.whatEver error &&
-
-	git --git-dir=dst/.git config \
-		receive.fsck.missingEmail warn &&
-	git push --porcelain dst bogus >act 2>&1 &&
-	grep "missingEmail" act &&
-	test_grep "skipping unknown msg id.*whatever" act &&
-	git --git-dir=dst/.git branch -D bogus &&
-	git --git-dir=dst/.git config --add \
-		receive.fsck.missingEmail ignore &&
-	git push --porcelain dst bogus >act 2>&1 &&
-	! grep "missingEmail" act
-
-Everything up-to-date
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-warning: skipping unknown msg id 'whatever'
-Deleted branch bogus (was 6516fe4).
-ok 24 - push with receive.fsck.missingEmail=warn
-
-expecting success of 5504.25 'fetch with fetch.fsck.missingEmail=warn': 
-	refspec=refs/heads/bogus:refs/heads/bogus &&
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-
-	# fetch.fsck.<msg-id> does not fall back on fsck.<msg-id>
-	git --git-dir=dst/.git config fsck.missingEmail warn &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-
-	# receive.fsck.<unknownmsg-id> warns
-	git --git-dir=dst/.git config \
-		fetch.fsck.whatEver error &&
-
-	git --git-dir=dst/.git config \
-		fetch.fsck.missingEmail warn &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
-	grep "missingEmail" act &&
-	test_grep "Skipping unknown msg id.*whatever" act &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		fetch.fsck.missingEmail ignore &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
-	! grep "missingEmail" act
-
-Everything up-to-date
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-warning: Skipping unknown msg id 'whatever'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-ok 25 - fetch with fetch.fsck.missingEmail=warn
-
-expecting success of 5504.26 'receive.fsck.unterminatedHeader=warn triggers error': 
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		receive.fsck.unterminatedheader warn &&
-	test_must_fail git push --porcelain dst HEAD >act 2>&1 &&
-	grep "Cannot demote unterminatedheader" act
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: Cannot demote unterminatedheader to warn        
-ok 26 - receive.fsck.unterminatedHeader=warn triggers error
-
-expecting success of 5504.27 'fetch.fsck.unterminatedHeader=warn triggers error': 
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		fetch.fsck.unterminatedheader warn &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" HEAD &&
-	grep "Cannot demote unterminatedheader" act
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: Cannot demote unterminatedheader to warn
-fatal: index-pack failed
-remote: fatal: Cannot demote unterminatedheader to warn        
-ok 27 - fetch.fsck.unterminatedHeader=warn triggers error
-
-expecting success of 5504.28 'badFilemode is not a strict error': 
-	git init --bare badmode.git &&
-	tree=$(
-		cd badmode.git &&
-		blob=$(echo blob | git hash-object -w --stdin | hex2oct) &&
-		printf "123456 foo\0${blob}" |
-		git hash-object -t tree --stdin -w --literally
-	) &&
-
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	git -C dst.git config transfer.fsckObjects true &&
-
-	git -C badmode.git push ../dst.git $tree:refs/tags/tree 2>err &&
-	grep "$tree: badFilemode" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/badmode.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst.git/
-remote: warning: object 278276cbf8114c5faab23d27287904183b155e9c: badFilemode: contains bad file modes        
-ok 28 - badFilemode is not a strict error
-
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5509-fetch-push-namespaces.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5509-fetch-push-namespaces/pushee/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0.rc1.219.gb6b6757d772
-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.48.0.rc1.219.gb6b6757d772
-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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5324-split-commit-graph.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5324-split-commit-graph/.git/
 expecting success of 5324.1 'setup repo': 
@@ -320175,7 +318550,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.000243841 s, 4.1 kB/s
+1 byte copied, 3.212e-05 s, 31.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 17 - verify hashes along chain, even in shallow
 
@@ -320230,7 +318605,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.224e-05 s, 31.0 kB/s
+1 byte copied, 3.572e-05 s, 28.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 20 - verify --shallow does not check base contents
 
@@ -320250,7 +318625,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.992e-05 s, 25.1 kB/s
+1 byte copied, 3.592e-05 s, 27.8 kB/s
 warning: commit-graph chain does not match
 ok 21 - warn on base graph chunk incorrect
 
@@ -320272,11 +318647,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.000253961 s, 3.9 kB/s
+1 byte copied, 0.00667336 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, 3.3881e-05 s, 29.5 kB/s
+1 byte copied, 3.612e-05 s, 27.7 kB/s
 warning: unable to find all commit-graph files
 ok 22 - verify after commit-graph-chain corruption (base)
 
@@ -320298,11 +318673,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.000275962 s, 3.6 kB/s
+1 byte copied, 3.536e-05 s, 28.3 kB/s
 warning: invalid commit-graph chain: line '944c3272bbe885450ef5fcad419a8Gcf35d1c284' not a hash
 1+0 records in
 1+0 records out
-1 byte copied, 3.6481e-05 s, 27.4 kB/s
+1 byte copied, 3.352e-05 s, 29.8 kB/s
 warning: unable to find all commit-graph files
 ok 23 - verify after commit-graph-chain corruption (tip)
 
@@ -320347,7 +318722,7 @@
  create mode 100644 extra.t
 1+0 records in
 1+0 records out
-1 byte copied, 0.000261042 s, 3.8 kB/s
+1 byte copied, 0.00728512 s, 0.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 25 - verify across alternates
 
@@ -321432,6 +319807,1075 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5501-fetch-push-alternates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/.git/
+expecting success of 5501.1 'setup': 
+	(
+		git init original &&
+		cd original &&
+		i=0 &&
+		while test $i -le 100
+		do
+			echo "$i" >count &&
+			git add count &&
+			git commit -m "$i" || exit
+			i=$(($i + 1))
+		done
+	) &&
+	(
+		git clone --reference=original "file://$(pwd)/original" one &&
+		cd one &&
+		echo Z >count &&
+		git add count &&
+		git commit -m Z &&
+		count_objects >../one.count
+	) &&
+	A=$(pwd)/original/.git/objects &&
+	git init receiver &&
+	echo "$A" >receiver/.git/objects/info/alternates &&
+	git init fetcher &&
+	echo "$A" >fetcher/.git/objects/info/alternates
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/original/.git/
+[main (root-commit) d7c40dd] 0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 count
+[main 00c614b] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 5ec1e45] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main a9efc77] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main c661cc5] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 89f590f] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 96be99a] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 7e9488d] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2f54fac] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 11134d9] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 6236019] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main bebbf7d] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b1e60f2] 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 10e978f] 13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 52d904f] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 5f1970b] 15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main d80a0ca] 16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3facc15] 17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main dd21a14] 18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 67c96e8] 19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0a5eb8d] 20
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main ed4a160] 21
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 1eb8b26] 22
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f914101] 23
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main c371026] 24
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b0c6b03] 25
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main d6851c0] 26
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9a208aa] 27
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 4b86dd7] 28
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 86a56bd] 29
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main aa18215] 30
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2e42b4c] 31
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e38e14f] 32
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f7aa34c] 33
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 1d551cb] 34
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main ed39ed7] 35
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 54de9d5] 36
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main dcfcf4c] 37
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main a67fff4] 38
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3db9e8e] 39
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 39c359d] 40
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f2920ee] 41
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2d4b8b6] 42
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 66140fd] 43
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main ed32c34] 44
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main ce3db61] 45
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b328726] 46
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 92302ab] 47
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main af56e5b] 48
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f02ac0b] 49
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f600268] 50
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 6967bfc] 51
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 6f79241] 52
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3fe3c4e] 53
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main dc5bb44] 54
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e477179] 55
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main fd9c417] 56
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main c7e9e38] 57
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 48c25a1] 58
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 6daa813] 59
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3957a75] 60
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f2ff35a] 61
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 38df9e3] 62
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 360af37] 63
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 6269302] 64
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 830052d] 65
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 34ff71d] 66
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f5c98a1] 67
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main df2b346] 68
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main c845993] 69
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b2f3c62] 70
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2342d27] 71
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main a0c2d2f] 72
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main cf25d3f] 73
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 20d3c94] 74
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main d436a89] 75
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main fe0c75d] 76
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 72c1473] 77
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main dcd8460] 78
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9d5db24] 79
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 53bba3b] 80
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 72531ec] 81
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b0f56b9] 82
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9444118] 83
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main db330fb] 84
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 74834bd] 85
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3a1af5c] 86
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main bb4543a] 87
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main bb3fe84] 88
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main d925d95] 89
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main bdcb25b] 90
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main ea11a31] 91
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 04225bc] 92
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 4427164] 93
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 3961ecb] 94
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 728c870] 95
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 1463d46] 96
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b7b22b0] 97
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e63dc2e] 98
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main a9eed53] 99
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f746b54] 100
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'one'...
+[main 1e6ca96] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/receiver/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5501-fetch-push-alternates/fetcher/.git/
+ok 1 - setup
+
+expecting success of 5501.2 'pushing into a repository with the same alternate': 
+	(
+		cd one &&
+		git push ../receiver main:refs/heads/it
+	) &&
+	(
+		cd receiver &&
+		count_objects >../receiver.count
+	) &&
+	test_cmp one.count receiver.count
+
+To ../receiver
+ * [new branch]      main -> it
+ok 2 - pushing into a repository with the same alternate
+
+expecting success of 5501.3 'fetching from a repository with the same alternate': 
+	(
+		cd fetcher &&
+		git fetch ../one main:refs/heads/it &&
+		count_objects >../fetcher.count
+	) &&
+	test_cmp one.count fetcher.count
+
+From ../one
+ * [new branch]      main       -> it
+ok 3 - fetching from a repository with the same alternate
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5506-remote-groups.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5506-remote-groups/.git/
+expecting success of 5506.1 'setup': 
+	mkdir one && (cd one && git init) &&
+	mkdir two && (cd two && git init) &&
+	git remote add -m main one one &&
+	git remote add -m main two two
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5506-remote-groups/one/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5506-remote-groups/two/.git/
+ok 1 - setup
+
+expecting success of 5506.2 'no group updates all': 
+	mark update-all &&
+	update_repos &&
+	git remote update &&
+	repo_fetched one &&
+	repo_fetched two
+
+[main (root-commit) e3d2b21] update-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main (root-commit) e3d2b21] update-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Fetching one
+From one
+ * [new branch]      main       -> one/main
+Fetching two
+From two
+ * [new branch]      main       -> two/main
+repo was fetched: one
+repo was fetched: two
+ok 2 - no group updates all
+
+expecting success of 5506.3 'nonexistent group produces error': 
+	mark nonexistent &&
+	update_repos &&
+	test_must_fail git remote update nonexistent &&
+	! repo_fetched one &&
+	! repo_fetched two
+
+[main 5183ee7] nonexistent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 5183ee7] nonexistent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+fatal: no such remote or remote group: nonexistent
+repo was not fetched: one
+repo was not fetched: two
+ok 3 - nonexistent group produces error
+
+expecting success of 5506.4 'updating group updates all members (remote update)': 
+	mark group-all &&
+	update_repos &&
+	git config --add remotes.all one &&
+	git config --add remotes.all two &&
+	git remote update all &&
+	repo_fetched one &&
+	repo_fetched two
+
+[main 76ca780] group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 76ca780] group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   e3d2b21..76ca780  main       -> one/main
+Fetching two
+From two
+   e3d2b21..76ca780  main       -> two/main
+repo was fetched: one
+repo was fetched: two
+ok 4 - updating group updates all members (remote update)
+
+expecting success of 5506.5 'updating group updates all members (fetch)': 
+	mark fetch-group-all &&
+	update_repos &&
+	git fetch all &&
+	repo_fetched one &&
+	repo_fetched two
+
+[main 72c2514] fetch-group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 72c2514] fetch-group-all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   76ca780..72c2514  main       -> one/main
+Fetching two
+From two
+   76ca780..72c2514  main       -> two/main
+repo was fetched: one
+repo was fetched: two
+ok 5 - updating group updates all members (fetch)
+
+expecting success of 5506.6 'updating group does not update non-members (remote update)': 
+	mark group-some &&
+	update_repos &&
+	git config --add remotes.some one &&
+	git remote update some &&
+	repo_fetched one &&
+	! repo_fetched two
+
+[main a4a07c1] group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main a4a07c1] group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   72c2514..a4a07c1  main       -> one/main
+repo was fetched: one
+repo was not fetched: two
+ok 6 - updating group does not update non-members (remote update)
+
+expecting success of 5506.7 'updating group does not update non-members (fetch)': 
+	mark fetch-group-some &&
+	update_repos &&
+	git config --add remotes.some one &&
+	git remote update some &&
+	repo_fetched one &&
+	! repo_fetched two
+
+[main 09f8b0e] fetch-group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 09f8b0e] fetch-group-some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   a4a07c1..09f8b0e  main       -> one/main
+repo was fetched: one
+repo was not fetched: two
+ok 7 - updating group does not update non-members (fetch)
+
+expecting success of 5506.8 'updating remote name updates that remote': 
+	mark remote-name &&
+	update_repos &&
+	git remote update one &&
+	repo_fetched one &&
+	! repo_fetched two
+
+[main 1609587] remote-name
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 1609587] remote-name
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   09f8b0e..1609587  main       -> one/main
+repo was fetched: one
+repo was not fetched: two
+ok 8 - updating remote name updates that remote
+
+expecting success of 5506.9 'updating group in parallel with a duplicate remote does not fail (fetch)': 
+	mark fetch-group-duplicate &&
+	update_repo one &&
+	git config --add remotes.duplicate one &&
+	git config --add remotes.duplicate one &&
+	git -c fetch.parallel=2 remote update duplicate &&
+	repo_fetched one
+
+[main d1132c8] fetch-group-duplicate
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Fetching one
+From one
+   1609587..d1132c8  main       -> one/main
+repo was fetched: one
+ok 9 - updating group in parallel with a duplicate remote does not fail (fetch)
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5504-fetch-receive-strict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/.git/
+expecting success of 5504.1 'setup and inject "corrupt or missing" object': 
+	echo hello >greetings &&
+	git add greetings &&
+	git commit -m greetings &&
+
+	S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
+	X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
+	echo $S >S &&
+	echo $X >X &&
+	cp .git/objects/$S .git/objects/$S.back &&
+	mv -f .git/objects/$X .git/objects/$S &&
+
+	test_must_fail git fsck
+
+[main (root-commit) 1b9525e] greetings
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 greetings
+error: b023018cabc396e7692c70bbf5784a93d3f738ab: hash-path mismatch, found at: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a
+bad sha1 file: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a.back
+missing blob ce013625030ba8dba906f756967f9e9ca394464a
+ok 1 - setup and inject "corrupt or missing" object
+
+expecting success of 5504.2 'fetch without strict': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects false &&
+		test_must_fail git fetch ../.git main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: ../.git did not send all necessary objects
+ok 2 - fetch without strict
+
+expecting success of 5504.3 'fetch with !fetch.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects true &&
+		test_must_fail git fetch ../.git main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: ../.git did not send all necessary objects
+ok 3 - fetch with !fetch.fsckobjects
+
+expecting success of 5504.4 'fetch with fetch.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects true &&
+		git config transfer.fsckobjects false &&
+		test_must_fail git fetch ../.git main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
+fatal: index-pack failed
+ok 4 - fetch with fetch.fsckobjects
+
+expecting success of 5504.5 'fetch with transfer.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config transfer.fsckobjects true &&
+		test_must_fail git fetch ../.git main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
+fatal: index-pack failed
+ok 5 - fetch with transfer.fsckobjects
+
+expecting success of 5504.6 'push without strict': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects false
+	) &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: failed to push some refs to 'dst'
+ok 6 - push without strict
+
+expecting success of 5504.7 'push with !receive.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config receive.fsckobjects false &&
+		git config transfer.fsckobjects true
+	) &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: failed to push some refs to 'dst'
+ok 7 - push with !receive.fsckobjects
+
+expecting success of 5504.8 'push with receive.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config receive.fsckobjects true &&
+		git config transfer.fsckobjects false
+	) &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: object of unexpected type        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+ok 8 - push with receive.fsckobjects
+
+expecting success of 5504.9 'push with transfer.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config transfer.fsckobjects true
+	) &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: object of unexpected type        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+ok 9 - push with transfer.fsckobjects
+
+expecting success of 5504.10 'repair the "corrupt or missing" object': 
+	mv -f .git/objects/$(cat S) .git/objects/$(cat X) &&
+	mv .git/objects/$(cat S).back .git/objects/$(cat S) &&
+	rm -rf .git/objects/$(cat X) &&
+	git fsck
+
+ok 10 - repair the "corrupt or missing" object
+
+expecting success of 5504.11 'setup bogus commit': 
+	commit="$(git hash-object --literally -t commit -w --stdin <bogus-commit)"
+
+ok 11 - setup bogus commit
+
+expecting success of 5504.12 'fsck with no skipList input': 
+	test_must_fail git fsck 2>err &&
+	test_grep "missingEmail" err
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+ok 12 - fsck with no skipList input
+
+expecting success of 5504.13 'setup sorted and unsorted skipLists': 
+	cat >SKIP.unsorted <<-EOF &&
+	$(test_oid 004)
+	$(test_oid 002)
+	$commit
+	$(test_oid 001)
+	$(test_oid 003)
+	EOF
+	sort SKIP.unsorted >SKIP.sorted
+
+ok 13 - setup sorted and unsorted skipLists
+
+expecting success of 5504.14 'fsck with sorted skipList': 
+	git -c fsck.skipList=SKIP.sorted fsck
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 14 - fsck with sorted skipList
+
+expecting success of 5504.15 'fsck with unsorted skipList': 
+	git -c fsck.skipList=SKIP.unsorted fsck
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 15 - fsck with unsorted skipList
+
+expecting success of 5504.16 'fsck with invalid or bogus skipList input': 
+	git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
+	test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
+	test_grep "could not open.*: does-not-exist" err &&
+	test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
+	test_grep "invalid object name: " err
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+fatal: could not open object name list: does-not-exist
+fatal: invalid object name: [core]
+ok 16 - fsck with invalid or bogus skipList input
+
+expecting success of 5504.17 'fsck with other accepted skipList input (comments & empty lines)': 
+	cat >SKIP.with-comment <<-EOF &&
+	# Some bad commit
+	$(test_oid 001)
+	EOF
+	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
+	test_grep "missingEmail" err-with-comment &&
+	cat >SKIP.with-empty-line <<-EOF &&
+	$(test_oid 001)
+
+	$(test_oid 002)
+	EOF
+	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
+	test_grep "missingEmail" err-with-empty-line
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+ok 17 - fsck with other accepted skipList input (comments & empty lines)
+
+expecting success of 5504.18 'fsck no garbage output from comments & empty lines errors': 
+	test_line_count = 1 err-with-comment &&
+	test_line_count = 1 err-with-empty-line
+
+ok 18 - fsck no garbage output from comments & empty lines errors
+
+expecting success of 5504.19 'fsck with invalid abbreviated skipList input': 
+	echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
+	test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
+	test_grep "^fatal: invalid object name: " err-abbreviated
+
+fatal: invalid object name: 6516fe4a6d0c92028617
+ok 19 - fsck with invalid abbreviated skipList input
+
+expecting success of 5504.20 'fsck with exhaustive accepted skipList input (various types of comments etc.)': 
+	>SKIP.exhaustive &&
+	echo "# A commented line" >>SKIP.exhaustive &&
+	echo "" >>SKIP.exhaustive &&
+	echo " " >>SKIP.exhaustive &&
+	echo " # Comment after whitespace" >>SKIP.exhaustive &&
+	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
+	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
+	echo "  $(test_oid 001)" >>SKIP.exhaustive &&
+	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
+	test_must_be_empty err
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 20 - fsck with exhaustive accepted skipList input (various types of comments etc.)
+
+expecting success of 5504.21 'push with receive.fsck.skipList': 
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckObjects true &&
+	test_must_fail git push --porcelain dst bogus &&
+	echo $commit >dst/.git/SKIP &&
+
+	# receive.fsck.* does not fall back on fsck.*
+	git --git-dir=dst/.git config fsck.skipList SKIP &&
+	test_must_fail git push --porcelain dst bogus &&
+
+	# Invalid and/or bogus skipList input
+	git --git-dir=dst/.git config receive.fsck.skipList /dev/null &&
+	test_must_fail git push --porcelain dst bogus &&
+	git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
+	test_must_fail git push --porcelain dst bogus 2>err &&
+	test_grep "could not open.*: does-not-exist" err &&
+	git --git-dir=dst/.git config receive.fsck.skipList config &&
+	test_must_fail git push --porcelain dst bogus 2>err &&
+	test_grep "invalid object name: " err &&
+
+	git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
+	git push --porcelain dst bogus
+
+To .
+ * [new branch]      6516fe4a6d0c9202861748d549d2e2b20e5210c9 -> bogus
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: fatal: could not open object name list: does-not-exist        
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: fatal: invalid object name: [core]        
+To dst
+*	refs/heads/bogus:refs/heads/bogus	[new branch]
+Done
+ok 21 - push with receive.fsck.skipList
+
+expecting success of 5504.22 'fetch with fetch.fsck.skipList': 
+	refspec=refs/heads/bogus:refs/heads/bogus &&
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckObjects true &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	echo $commit >dst/.git/SKIP &&
+
+	# fetch.fsck.* does not fall back on fsck.*
+	git --git-dir=dst/.git config fsck.skipList dst/.git/SKIP &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+
+	# Invalid and/or bogus skipList input
+	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
+	test_grep "could not open.*: does-not-exist" err &&
+	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
+	test_grep "invalid object name: " err &&
+
+	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
+
+Everything up-to-date
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+fatal: could not open object name list: does-not-exist
+fatal: invalid object name: [core]
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict
+ * [new branch]      bogus      -> bogus
+ok 22 - fetch with fetch.fsck.skipList
+
+expecting success of 5504.23 'fsck.<unknownmsg-id> dies': 
+	test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
+	test_grep "Unhandled message id: whatever" err
+
+fatal: Unhandled message id: whatever
+ok 23 - fsck.<unknownmsg-id> dies
+
+expecting success of 5504.24 'push with receive.fsck.missingEmail=warn': 
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckobjects true &&
+	test_must_fail git push --porcelain dst bogus &&
+
+	# receive.fsck.<msg-id> does not fall back on fsck.<msg-id>
+	git --git-dir=dst/.git config fsck.missingEmail warn &&
+	test_must_fail git push --porcelain dst bogus &&
+
+	# receive.fsck.<unknownmsg-id> warns
+	git --git-dir=dst/.git config \
+		receive.fsck.whatEver error &&
+
+	git --git-dir=dst/.git config \
+		receive.fsck.missingEmail warn &&
+	git push --porcelain dst bogus >act 2>&1 &&
+	grep "missingEmail" act &&
+	test_grep "skipping unknown msg id.*whatever" act &&
+	git --git-dir=dst/.git branch -D bogus &&
+	git --git-dir=dst/.git config --add \
+		receive.fsck.missingEmail ignore &&
+	git push --porcelain dst bogus >act 2>&1 &&
+	! grep "missingEmail" act
+
+Everything up-to-date
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+warning: skipping unknown msg id 'whatever'
+Deleted branch bogus (was 6516fe4).
+ok 24 - push with receive.fsck.missingEmail=warn
+
+expecting success of 5504.25 'fetch with fetch.fsck.missingEmail=warn': 
+	refspec=refs/heads/bogus:refs/heads/bogus &&
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+
+	# fetch.fsck.<msg-id> does not fall back on fsck.<msg-id>
+	git --git-dir=dst/.git config fsck.missingEmail warn &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+
+	# receive.fsck.<unknownmsg-id> warns
+	git --git-dir=dst/.git config \
+		fetch.fsck.whatEver error &&
+
+	git --git-dir=dst/.git config \
+		fetch.fsck.missingEmail warn &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
+	grep "missingEmail" act &&
+	test_grep "Skipping unknown msg id.*whatever" act &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		fetch.fsck.missingEmail ignore &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
+	! grep "missingEmail" act
+
+Everything up-to-date
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+warning: Skipping unknown msg id 'whatever'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+ok 25 - fetch with fetch.fsck.missingEmail=warn
+
+expecting success of 5504.26 'receive.fsck.unterminatedHeader=warn triggers error': 
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		receive.fsck.unterminatedheader warn &&
+	test_must_fail git push --porcelain dst HEAD >act 2>&1 &&
+	grep "Cannot demote unterminatedheader" act
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: Cannot demote unterminatedheader to warn        
+ok 26 - receive.fsck.unterminatedHeader=warn triggers error
+
+expecting success of 5504.27 'fetch.fsck.unterminatedHeader=warn triggers error': 
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		fetch.fsck.unterminatedheader warn &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" HEAD &&
+	grep "Cannot demote unterminatedheader" act
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: Cannot demote unterminatedheader to warn
+fatal: index-pack failed
+remote: fatal: Cannot demote unterminatedheader to warn        
+ok 27 - fetch.fsck.unterminatedHeader=warn triggers error
+
+expecting success of 5504.28 'badFilemode is not a strict error': 
+	git init --bare badmode.git &&
+	tree=$(
+		cd badmode.git &&
+		blob=$(echo blob | git hash-object -w --stdin | hex2oct) &&
+		printf "123456 foo\0${blob}" |
+		git hash-object -t tree --stdin -w --literally
+	) &&
+
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	git -C dst.git config transfer.fsckObjects true &&
+
+	git -C badmode.git push ../dst.git $tree:refs/tags/tree 2>err &&
+	grep "$tree: badFilemode" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/badmode.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5504-fetch-receive-strict/dst.git/
+remote: warning: object 278276cbf8114c5faab23d27287904183b155e9c: badFilemode: contains bad file modes        
+ok 28 - badFilemode is not a strict error
+
+# passed all 28 test(s)
+1..28
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5400-send-pack.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5400-send-pack/.git/
 expecting success of 5400.1 'setup': 
@@ -322612,214 +322056,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5513-fetch-track.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5511-refspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5511-refspec/.git/
-expecting success of 5511.1 'push  (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec ''
-ok 1 - push  (invalid)
-
-expecting success of 5511.2 'push :': git ls-remote frotz
-ok 2 - push :
-
-expecting success of 5511.3 'push :: (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec '::'
-ok 3 - push :: (invalid)
-
-expecting success of 5511.4 'push +:': git ls-remote frotz
-ok 4 - push +:
-
-expecting success of 5511.5 'fetch ': git ls-remote frotz
-ok 5 - fetch 
-
-expecting success of 5511.6 'fetch :': git ls-remote frotz
-ok 6 - fetch :
-
-expecting success of 5511.7 'fetch :: (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec '::'
-ok 7 - fetch :: (invalid)
-
-expecting success of 5511.8 'push refs/heads/*:refs/remotes/frotz/*': git ls-remote frotz
-ok 8 - push refs/heads/*:refs/remotes/frotz/*
-
-expecting success of 5511.9 'push refs/heads/*:refs/remotes/frotz (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/*:refs/remotes/frotz'
-ok 9 - push refs/heads/*:refs/remotes/frotz (invalid)
-
-expecting success of 5511.10 'push refs/heads:refs/remotes/frotz/* (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads:refs/remotes/frotz/*'
-ok 10 - push refs/heads:refs/remotes/frotz/* (invalid)
-
-expecting success of 5511.11 'push refs/heads/main:refs/remotes/frotz/xyzzy': git ls-remote frotz
-ok 11 - push refs/heads/main:refs/remotes/frotz/xyzzy
-
-expecting success of 5511.12 'fetch refs/heads/*:refs/remotes/frotz/*': git ls-remote frotz
-ok 12 - fetch refs/heads/*:refs/remotes/frotz/*
-
-expecting success of 5511.13 'fetch refs/heads/*:refs/remotes/frotz (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/*:refs/remotes/frotz'
-ok 13 - fetch refs/heads/*:refs/remotes/frotz (invalid)
-
-expecting success of 5511.14 'fetch refs/heads:refs/remotes/frotz/* (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads:refs/remotes/frotz/*'
-ok 14 - fetch refs/heads:refs/remotes/frotz/* (invalid)
-
-expecting success of 5511.15 'fetch refs/heads/main:refs/remotes/frotz/xyzzy': git ls-remote frotz
-ok 15 - fetch refs/heads/main:refs/remotes/frotz/xyzzy
-
-expecting success of 5511.16 'fetch refs/heads/main::refs/remotes/frotz/xyzzy (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/main::refs/remotes/frotz/xyzzy'
-ok 16 - fetch refs/heads/main::refs/remotes/frotz/xyzzy (invalid)
-
-expecting success of 5511.17 'fetch refs/heads/maste :refs/remotes/frotz/xyzzy (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/maste :refs/remotes/frotz/xyzzy'
-ok 17 - fetch refs/heads/maste :refs/remotes/frotz/xyzzy (invalid)
-
-expecting success of 5511.18 'push main~1:refs/remotes/frotz/backup': git ls-remote frotz
-ok 18 - push main~1:refs/remotes/frotz/backup
-
-expecting success of 5511.19 'fetch main~1:refs/remotes/frotz/backup (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'main~1:refs/remotes/frotz/backup'
-ok 19 - fetch main~1:refs/remotes/frotz/backup (invalid)
-
-expecting success of 5511.20 'push HEAD~4:refs/remotes/frotz/new': git ls-remote frotz
-ok 20 - push HEAD~4:refs/remotes/frotz/new
-
-expecting success of 5511.21 'fetch HEAD~4:refs/remotes/frotz/new (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'HEAD~4:refs/remotes/frotz/new'
-ok 21 - fetch HEAD~4:refs/remotes/frotz/new (invalid)
-
-expecting success of 5511.22 'push HEAD': git ls-remote frotz
-ok 22 - push HEAD
-
-expecting success of 5511.23 'fetch HEAD': git ls-remote frotz
-ok 23 - fetch HEAD
-
-expecting success of 5511.24 'push @': git ls-remote frotz
-ok 24 - push @
-
-expecting success of 5511.25 'fetch @': git ls-remote frotz
-ok 25 - fetch @
-
-expecting success of 5511.26 'push refs/heads/ nitfol (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/ nitfol'
-ok 26 - push refs/heads/ nitfol (invalid)
-
-expecting success of 5511.27 'fetch refs/heads/ nitfol (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/ nitfol'
-ok 27 - fetch refs/heads/ nitfol (invalid)
-
-expecting success of 5511.28 'push HEAD: (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'HEAD:'
-ok 28 - push HEAD: (invalid)
-
-expecting success of 5511.29 'fetch HEAD:': git ls-remote frotz
-ok 29 - fetch HEAD:
-
-expecting success of 5511.30 'push refs/heads/ nitfol: (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/ nitfol:'
-ok 30 - push refs/heads/ nitfol: (invalid)
-
-expecting success of 5511.31 'fetch refs/heads/ nitfol: (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/ nitfol:'
-ok 31 - fetch refs/heads/ nitfol: (invalid)
-
-expecting success of 5511.32 'push :refs/remotes/frotz/deleteme': git ls-remote frotz
-ok 32 - push :refs/remotes/frotz/deleteme
-
-expecting success of 5511.33 'fetch :refs/remotes/frotz/HEAD-to-me': git ls-remote frotz
-ok 33 - fetch :refs/remotes/frotz/HEAD-to-me
-
-expecting success of 5511.34 'push :refs/remotes/frotz/delete me (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec ':refs/remotes/frotz/delete me'
-ok 34 - push :refs/remotes/frotz/delete me (invalid)
-
-expecting success of 5511.35 'fetch :refs/remotes/frotz/HEAD to me (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec ':refs/remotes/frotz/HEAD to me'
-ok 35 - fetch :refs/remotes/frotz/HEAD to me (invalid)
-
-expecting success of 5511.36 'fetch refs/heads/*/for-linus:refs/remotes/mine/*-blah': git ls-remote frotz
-ok 36 - fetch refs/heads/*/for-linus:refs/remotes/mine/*-blah
-
-expecting success of 5511.37 'push refs/heads/*/for-linus:refs/remotes/mine/*-blah': git ls-remote frotz
-ok 37 - push refs/heads/*/for-linus:refs/remotes/mine/*-blah
-
-expecting success of 5511.38 'fetch refs/heads*/for-linus:refs/remotes/mine/*': git ls-remote frotz
-ok 38 - fetch refs/heads*/for-linus:refs/remotes/mine/*
-
-expecting success of 5511.39 'push refs/heads*/for-linus:refs/remotes/mine/*': git ls-remote frotz
-ok 39 - push refs/heads*/for-linus:refs/remotes/mine/*
-
-expecting success of 5511.40 'fetch refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/*/*/for-linus:refs/remotes/mine/*'
-ok 40 - fetch refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)
-
-expecting success of 5511.41 'push refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/*/*/for-linus:refs/remotes/mine/*'
-ok 41 - push refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)
-
-expecting success of 5511.42 'fetch refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/*g*/for-linus:refs/remotes/mine/*'
-ok 42 - fetch refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)
-
-expecting success of 5511.43 'push refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/*g*/for-linus:refs/remotes/mine/*'
-ok 43 - push refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)
-
-expecting success of 5511.44 'fetch refs/heads/*/for-linus:refs/remotes/mine/*': git ls-remote frotz
-ok 44 - fetch refs/heads/*/for-linus:refs/remotes/mine/*
-
-expecting success of 5511.45 'push refs/heads/*/for-linus:refs/remotes/mine/*': git ls-remote frotz
-ok 45 - push refs/heads/*/for-linus:refs/remotes/mine/*
-
-expecting success of 5511.46 'fetch refs/heads/Ä': git ls-remote frotz
-ok 46 - fetch refs/heads/Ä
-
-expecting success of 5511.47 'fetch refs/heads/	tab (invalid)': test_must_fail git ls-remote frotz
-fatal: invalid refspec 'refs/heads/	tab'
-ok 47 - fetch refs/heads/	tab (invalid)
-
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5310-pack-bitmaps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5310-pack-bitmaps/.git/
 expecting success of 5310.1 'setup test repository': 
@@ -323096,8 +322332,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20250209T065437.859104Z-Hcf858c9d-P0019f878/20250209T065437.861247Z-Hcf858c9d-P0019f885","thread":"main","time":"2025-02-09T06:54:37.876104Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.015086,"t_rel":0.000548,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20250209T065437.859104Z-Hcf858c9d-P0019f878/20250209T065437.861247Z-Hcf858c9d-P0019f885","thread":"main","time":"2025-02-09T06:54:37.876121Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.015105,"t_rel":0.000567,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20260314T133145.287237Z-H5c947e1c-P00021fa3/20260314T133145.294904Z-H5c947e1c-P00021fad","thread":"main","time":"2026-03-14T13:31:45.363887Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.069173,"t_rel":0.000570,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20260314T133145.287237Z-H5c947e1c-P00021fa3/20260314T133145.294904Z-H5c947e1c-P00021fad","thread":"main","time":"2026-03-14T13:31:45.363908Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.069195,"t_rel":0.000592,"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': 
@@ -323634,7 +322870,7 @@
 	jgit --version
 
 )
-t5310-pack-bitmaps.sh: 7: eval: jgit: not found
+./test-lib.sh: line 1020: jgit: command not found
 prerequisite JGIT not satisfied
 checking prerequisite: SHA1
 
@@ -323903,8 +323139,8 @@
 pack_report: pack_mapped              =      26915 /      26915
 ---------------------------------------------------------------------
 
---- before	2025-02-09 06:54:39.769940692 +0000
-+++ after	2025-02-09 06:54:39.797940870 +0000
+--- before	2026-03-14 13:31:56.990677808 +0000
++++ after	2026-03-14 13:31:57.158677808 +0000
 @@ -1 +1 @@
 -5856eb049fa881263aa3ba7ed2e5edbf7e1fbcac
 +6a6543fc00ae3e5f9847cf9ca452037bed353779
@@ -323994,10 +323230,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-5925c4e1ec8bac94f428d0e74df0e946acb72c2f
 e7044c3d0754f94d7cb91400d11711b5667d7a56
-{"event":"data","sid":"20250209T065439.952274Z-Hcf858c9d-P001a1e3b","thread":"main","time":"2025-02-09T06:54:39.953473Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001415,"t_rel":0.001415,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
-{"event":"data","sid":"20250209T065439.952274Z-Hcf858c9d-P001a1e3b","thread":"main","time":"2025-02-09T06:54:39.953502Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001447,"t_rel":0.001447,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
+5925c4e1ec8bac94f428d0e74df0e946acb72c2f
+{"event":"data","sid":"20260314T133158.334732Z-H5c947e1c-P00024e04","thread":"main","time":"2026-03-14T13:31:58.335816Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001293,"t_rel":0.001293,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
+{"event":"data","sid":"20260314T133158.334732Z-H5c947e1c-P00024e04","thread":"main","time":"2026-03-14T13:31:58.335841Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001320,"t_rel":0.001320,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
 ok 74 - complains about multiple pack bitmaps
 
 expecting success of 5310.75 'setup test repository': 
@@ -324274,8 +323510,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20250209T065440.444730Z-Hcf858c9d-P001a26a8/20250209T065440.446768Z-Hcf858c9d-P001a26b1","thread":"main","time":"2025-02-09T06:54:40.462988Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.016415,"t_rel":0.001011,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20250209T065440.444730Z-Hcf858c9d-P001a26a8/20250209T065440.446768Z-Hcf858c9d-P001a26b1","thread":"main","time":"2025-02-09T06:54:40.463007Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.016436,"t_rel":0.001032,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20260314T133200.800045Z-H5c947e1c-P000255fa/20260314T133200.806787Z-H5c947e1c-P0002561f","thread":"main","time":"2026-03-14T13:32:00.883915Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.077325,"t_rel":0.000582,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20260314T133200.800045Z-H5c947e1c-P000255fa/20260314T133200.806787Z-H5c947e1c-P0002561f","thread":"main","time":"2026-03-14T13:32:00.883932Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.077344,"t_rel":0.000601,"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': 
@@ -325058,8 +324294,8 @@
 pack_report: pack_mapped              =      26911 /      26911
 ---------------------------------------------------------------------
 
---- before	2025-02-09 06:54:42.509958126 +0000
-+++ after	2025-02-09 06:54:42.529958253 +0000
+--- before	2026-03-14 13:32:13.270677808 +0000
++++ after	2026-03-14 13:32:13.406677808 +0000
 @@ -1 +1 @@
 -a3caed54c4e80e89b950a3dc3137850a7de9e11a
 +6d88075ba6ae7fa70257e63b62d2182dc9825ed1
@@ -325151,8 +324387,8 @@
  create mode 100644 other.t
 3cd8c16e652034892da5481183a4d7aa2f7803dc
 d9be34f11dab75a3315b4361ae577329c4c5c312
-{"event":"data","sid":"20250209T065442.694330Z-Hcf858c9d-P001a4bd9","thread":"main","time":"2025-02-09T06:54:42.695451Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001324,"t_rel":0.001324,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
-{"event":"data","sid":"20250209T065442.694330Z-Hcf858c9d-P001a4bd9","thread":"main","time":"2025-02-09T06:54:42.695471Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001348,"t_rel":0.001348,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
+{"event":"data","sid":"20260314T133214.464887Z-H5c947e1c-P0002839c","thread":"main","time":"2026-03-14T13:32:14.474306Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.009609,"t_rel":0.009609,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
+{"event":"data","sid":"20260314T133214.464887Z-H5c947e1c-P0002839c","thread":"main","time":"2026-03-14T13:32:14.474333Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.009639,"t_rel":0.009639,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
 ok 148 - complains about multiple pack bitmaps
 
 expecting success of 5310.149 'incremental repack fails when bitmaps are requested': 
@@ -325488,7 +324724,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250209T065442.795561Z-Hcf858c9d-P001a4e06","thread":"main","time":"2025-02-09T06:54:42.796850Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20260314T133215.040167Z-H5c947e1c-P00028582","thread":"main","time":"2026-03-14T13:32:15.041406Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -325774,7 +325010,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250209T065442.801310Z-Hcf858c9d-P001a4e36","thread":"main","time":"2025-02-09T06:54:42.802659Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20260314T133215.084162Z-H5c947e1c-P0002859c","thread":"main","time":"2026-03-14T13:32:15.085411Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326060,7 +325296,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250209T065442.806392Z-Hcf858c9d-P001a4e51","thread":"main","time":"2025-02-09T06:54:42.807693Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20260314T133215.124901Z-H5c947e1c-P000285c1","thread":"main","time":"2026-03-14T13:32:15.130353Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326346,7 +325582,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250209T065442.811896Z-Hcf858c9d-P001a4e6b","thread":"main","time":"2025-02-09T06:54:42.813232Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260314T133215.164106Z-H5c947e1c-P000285e7","thread":"main","time":"2026-03-14T13:32:15.165287Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326632,7 +325868,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250209T065442.821581Z-Hcf858c9d-P001a4ea1","thread":"main","time":"2025-02-09T06:54:42.822857Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260314T133215.223709Z-H5c947e1c-P0002860f","thread":"main","time":"2026-03-14T13:32:15.224988Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326918,7 +326154,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250209T065442.829666Z-Hcf858c9d-P001a4ec7","thread":"main","time":"2025-02-09T06:54:42.831263Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260314T133215.284307Z-H5c947e1c-P00028645","thread":"main","time":"2026-03-14T13:32:15.293562Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -327204,7 +326440,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20250209T065442.835690Z-Hcf858c9d-P001a4ee2","thread":"main","time":"2025-02-09T06:54:42.836944Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20260314T133215.332313Z-H5c947e1c-P00028673","thread":"main","time":"2026-03-14T13:32:15.339374Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 ok 151 - boundary-based traversal is used when requested
 
 expecting success of 5310.152 'left-right not confused by bitmap index': 
@@ -327495,8 +326731,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20250209T065443.315158Z-Hcf858c9d-P001a57b4/20250209T065443.317302Z-Hcf858c9d-P001a57c7","thread":"main","time":"2025-02-09T06:54:43.336104Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.019018,"t_rel":0.000590,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20250209T065443.315158Z-Hcf858c9d-P001a57b4/20250209T065443.317302Z-Hcf858c9d-P001a57c7","thread":"main","time":"2025-02-09T06:54:43.336119Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.019035,"t_rel":0.000607,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20260314T133217.992227Z-H5c947e1c-P00028fd9/20260314T133218.005163Z-H5c947e1c-P00028fe3","thread":"main","time":"2026-03-14T13:32:18.076566Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.071591,"t_rel":0.000523,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20260314T133217.992227Z-H5c947e1c-P00028fd9/20260314T133218.005163Z-H5c947e1c-P00028fe3","thread":"main","time":"2026-03-14T13:32:18.076582Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.071609,"t_rel":0.000541,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 157 - full repack creates bitmaps
 
 expecting success of 5310.158 'rev-list --test-bitmap verifies bitmaps': 
@@ -328279,8 +327515,8 @@
 pack_report: pack_mapped              =      26918 /      26918
 ---------------------------------------------------------------------
 
---- before	2025-02-09 06:54:45.321976017 +0000
-+++ after	2025-02-09 06:54:45.345976170 +0000
+--- before	2026-03-14 13:32:29.290677808 +0000
++++ after	2026-03-14 13:32:29.430677808 +0000
 @@ -1 +1 @@
 -37419f6d136228aef65f8c0814262f05f954d62a
 +ed73bac8391ee3dfb2a90e3cd7df9bd765ce5b5f
@@ -328372,8 +327608,8 @@
  create mode 100644 other.t
 92f77f689e270db411603dd57dea5c4d12ac65b6
 1a76757cab55a0d45b9ba975eda6eb7dca4f716d
-{"event":"data","sid":"20250209T065445.507078Z-Hcf858c9d-P001a80f7","thread":"main","time":"2025-02-09T06:54:45.508206Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001324,"t_rel":0.001324,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
-{"event":"data","sid":"20250209T065445.507078Z-Hcf858c9d-P001a80f7","thread":"main","time":"2025-02-09T06:54:45.508230Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001351,"t_rel":0.001351,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
+{"event":"data","sid":"20260314T133230.424083Z-H5c947e1c-P0002bf4b","thread":"main","time":"2026-03-14T13:32:30.425136Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001246,"t_rel":0.001246,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
+{"event":"data","sid":"20260314T133230.424083Z-H5c947e1c-P0002bf4b","thread":"main","time":"2026-03-14T13:32:30.425158Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001270,"t_rel":0.001270,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
 ok 227 - complains about multiple pack bitmaps
 
 expecting success of 5310.228 'verify writing bitmap lookup table when enabled': 
@@ -328381,8 +327617,8 @@
 		git repack -ad &&
 	grep "\"label\":\"writing_lookup_table\"" trace2
 
-{"event":"region_enter","sid":"20250209T065445.518635Z-Hcf858c9d-P001a812b/20250209T065445.520643Z-Hcf858c9d-P001a8137","thread":"main","time":"2025-02-09T06:54:45.537353Z","file":"pack-bitmap-write.c","line":961,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20250209T065445.518635Z-Hcf858c9d-P001a812b/20250209T065445.520643Z-Hcf858c9d-P001a8137","thread":"main","time":"2025-02-09T06:54:45.537365Z","file":"pack-bitmap-write.c","line":988,"repo":1,"t_rel":0.000013,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_enter","sid":"20260314T133230.535869Z-H5c947e1c-P0002bfa1/20260314T133230.550569Z-H5c947e1c-P0002bfbc","thread":"main","time":"2026-03-14T13:32:30.646434Z","file":"pack-bitmap-write.c","line":961,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20260314T133230.535869Z-H5c947e1c-P0002bfa1/20260314T133230.550569Z-H5c947e1c-P0002bfbc","thread":"main","time":"2026-03-14T13:32:30.646444Z","file":"pack-bitmap-write.c","line":988,"repo":1,"t_rel":0.000010,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
 ok 228 - verify writing bitmap lookup table when enabled
 
 expecting success of 5310.229 'truncated bitmap fails gracefully (lookup table)': 
@@ -328405,6 +327641,457 @@
 1..229
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5513-fetch-track.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5509-fetch-push-namespaces.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5509-fetch-push-namespaces/pushee/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0.rc1.219.gb6b6757d772
+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.48.0.rc1.219.gb6b6757d772
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5511-refspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5511-refspec/.git/
+expecting success of 5511.1 'push  (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec ''
+ok 1 - push  (invalid)
+
+expecting success of 5511.2 'push :': git ls-remote frotz
+ok 2 - push :
+
+expecting success of 5511.3 'push :: (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec '::'
+ok 3 - push :: (invalid)
+
+expecting success of 5511.4 'push +:': git ls-remote frotz
+ok 4 - push +:
+
+expecting success of 5511.5 'fetch ': git ls-remote frotz
+ok 5 - fetch 
+
+expecting success of 5511.6 'fetch :': git ls-remote frotz
+ok 6 - fetch :
+
+expecting success of 5511.7 'fetch :: (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec '::'
+ok 7 - fetch :: (invalid)
+
+expecting success of 5511.8 'push refs/heads/*:refs/remotes/frotz/*': git ls-remote frotz
+ok 8 - push refs/heads/*:refs/remotes/frotz/*
+
+expecting success of 5511.9 'push refs/heads/*:refs/remotes/frotz (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/*:refs/remotes/frotz'
+ok 9 - push refs/heads/*:refs/remotes/frotz (invalid)
+
+expecting success of 5511.10 'push refs/heads:refs/remotes/frotz/* (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads:refs/remotes/frotz/*'
+ok 10 - push refs/heads:refs/remotes/frotz/* (invalid)
+
+expecting success of 5511.11 'push refs/heads/main:refs/remotes/frotz/xyzzy': git ls-remote frotz
+ok 11 - push refs/heads/main:refs/remotes/frotz/xyzzy
+
+expecting success of 5511.12 'fetch refs/heads/*:refs/remotes/frotz/*': git ls-remote frotz
+ok 12 - fetch refs/heads/*:refs/remotes/frotz/*
+
+expecting success of 5511.13 'fetch refs/heads/*:refs/remotes/frotz (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/*:refs/remotes/frotz'
+ok 13 - fetch refs/heads/*:refs/remotes/frotz (invalid)
+
+expecting success of 5511.14 'fetch refs/heads:refs/remotes/frotz/* (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads:refs/remotes/frotz/*'
+ok 14 - fetch refs/heads:refs/remotes/frotz/* (invalid)
+
+expecting success of 5511.15 'fetch refs/heads/main:refs/remotes/frotz/xyzzy': git ls-remote frotz
+ok 15 - fetch refs/heads/main:refs/remotes/frotz/xyzzy
+
+expecting success of 5511.16 'fetch refs/heads/main::refs/remotes/frotz/xyzzy (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/main::refs/remotes/frotz/xyzzy'
+ok 16 - fetch refs/heads/main::refs/remotes/frotz/xyzzy (invalid)
+
+expecting success of 5511.17 'fetch refs/heads/maste :refs/remotes/frotz/xyzzy (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/maste :refs/remotes/frotz/xyzzy'
+ok 17 - fetch refs/heads/maste :refs/remotes/frotz/xyzzy (invalid)
+
+expecting success of 5511.18 'push main~1:refs/remotes/frotz/backup': git ls-remote frotz
+ok 18 - push main~1:refs/remotes/frotz/backup
+
+expecting success of 5511.19 'fetch main~1:refs/remotes/frotz/backup (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'main~1:refs/remotes/frotz/backup'
+ok 19 - fetch main~1:refs/remotes/frotz/backup (invalid)
+
+expecting success of 5511.20 'push HEAD~4:refs/remotes/frotz/new': git ls-remote frotz
+ok 20 - push HEAD~4:refs/remotes/frotz/new
+
+expecting success of 5511.21 'fetch HEAD~4:refs/remotes/frotz/new (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'HEAD~4:refs/remotes/frotz/new'
+ok 21 - fetch HEAD~4:refs/remotes/frotz/new (invalid)
+
+expecting success of 5511.22 'push HEAD': git ls-remote frotz
+ok 22 - push HEAD
+
+expecting success of 5511.23 'fetch HEAD': git ls-remote frotz
+ok 23 - fetch HEAD
+
+expecting success of 5511.24 'push @': git ls-remote frotz
+ok 24 - push @
+
+expecting success of 5511.25 'fetch @': git ls-remote frotz
+ok 25 - fetch @
+
+expecting success of 5511.26 'push refs/heads/ nitfol (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/ nitfol'
+ok 26 - push refs/heads/ nitfol (invalid)
+
+expecting success of 5511.27 'fetch refs/heads/ nitfol (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/ nitfol'
+ok 27 - fetch refs/heads/ nitfol (invalid)
+
+expecting success of 5511.28 'push HEAD: (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'HEAD:'
+ok 28 - push HEAD: (invalid)
+
+expecting success of 5511.29 'fetch HEAD:': git ls-remote frotz
+ok 29 - fetch HEAD:
+
+expecting success of 5511.30 'push refs/heads/ nitfol: (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/ nitfol:'
+ok 30 - push refs/heads/ nitfol: (invalid)
+
+expecting success of 5511.31 'fetch refs/heads/ nitfol: (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/ nitfol:'
+ok 31 - fetch refs/heads/ nitfol: (invalid)
+
+expecting success of 5511.32 'push :refs/remotes/frotz/deleteme': git ls-remote frotz
+ok 32 - push :refs/remotes/frotz/deleteme
+
+expecting success of 5511.33 'fetch :refs/remotes/frotz/HEAD-to-me': git ls-remote frotz
+ok 33 - fetch :refs/remotes/frotz/HEAD-to-me
+
+expecting success of 5511.34 'push :refs/remotes/frotz/delete me (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec ':refs/remotes/frotz/delete me'
+ok 34 - push :refs/remotes/frotz/delete me (invalid)
+
+expecting success of 5511.35 'fetch :refs/remotes/frotz/HEAD to me (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec ':refs/remotes/frotz/HEAD to me'
+ok 35 - fetch :refs/remotes/frotz/HEAD to me (invalid)
+
+expecting success of 5511.36 'fetch refs/heads/*/for-linus:refs/remotes/mine/*-blah': git ls-remote frotz
+ok 36 - fetch refs/heads/*/for-linus:refs/remotes/mine/*-blah
+
+expecting success of 5511.37 'push refs/heads/*/for-linus:refs/remotes/mine/*-blah': git ls-remote frotz
+ok 37 - push refs/heads/*/for-linus:refs/remotes/mine/*-blah
+
+expecting success of 5511.38 'fetch refs/heads*/for-linus:refs/remotes/mine/*': git ls-remote frotz
+ok 38 - fetch refs/heads*/for-linus:refs/remotes/mine/*
+
+expecting success of 5511.39 'push refs/heads*/for-linus:refs/remotes/mine/*': git ls-remote frotz
+ok 39 - push refs/heads*/for-linus:refs/remotes/mine/*
+
+expecting success of 5511.40 'fetch refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/*/*/for-linus:refs/remotes/mine/*'
+ok 40 - fetch refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)
+
+expecting success of 5511.41 'push refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/*/*/for-linus:refs/remotes/mine/*'
+ok 41 - push refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)
+
+expecting success of 5511.42 'fetch refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/*g*/for-linus:refs/remotes/mine/*'
+ok 42 - fetch refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)
+
+expecting success of 5511.43 'push refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/*g*/for-linus:refs/remotes/mine/*'
+ok 43 - push refs/heads/*g*/for-linus:refs/remotes/mine/* (invalid)
+
+expecting success of 5511.44 'fetch refs/heads/*/for-linus:refs/remotes/mine/*': git ls-remote frotz
+ok 44 - fetch refs/heads/*/for-linus:refs/remotes/mine/*
+
+expecting success of 5511.45 'push refs/heads/*/for-linus:refs/remotes/mine/*': git ls-remote frotz
+ok 45 - push refs/heads/*/for-linus:refs/remotes/mine/*
+
+expecting success of 5511.46 'fetch refs/heads/Ä': git ls-remote frotz
+ok 46 - fetch refs/heads/Ä
+
+expecting success of 5511.47 'fetch refs/heads/	tab (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec 'refs/heads/	tab'
+ok 47 - fetch refs/heads/	tab (invalid)
+
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5512-ls-remote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5512-ls-remote/.git/
 expecting success of 5512.1 'set up fake upload-pack': 
@@ -328575,8 +328262,8 @@
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.1
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.10
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.2
---- exp_err	2025-02-09 06:54:45.173975076 +0000
-+++ actual_err	2025-02-09 06:54:45.189975178 +0000
+--- exp_err	2026-03-14 13:32:32.698677808 +0000
++++ actual_err	2026-03-14 13:32:32.822677808 +0000
 @@ -1 +0,0 @@
 -From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5512-ls-remote/.git
 ok 17 - suppress "From <url>" with -q
@@ -329699,109 +329386,19 @@
  * [new branch]      main       -> one/main
  * [new branch]      side       -> one/side
 Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 25 - git fetch --no-all --all (fetch all remotes)
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5522-pull-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-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 5522.1 'setup': 
-	mkdir subdir &&
-	echo file >subdir/file &&
-	git add subdir/file &&
-	git commit -q -m file &&
-	git clone -q . clone-repo &&
-	ln -s clone-repo/subdir/ subdir-link &&
-	(
-		cd clone-repo &&
-		git config receive.denyCurrentBranch warn
-	) &&
-	git config receive.denyCurrentBranch warn
-
-ok 1 - setup
-
-expecting success of 5522.2 'pulling from real subdir': 
-	(
-		echo real >subdir/file &&
-		git commit -m real subdir/file &&
-		cd clone-repo/subdir/ &&
-		git pull &&
-		test real = $(cat file)
-	)
-
-[master 2467d43] real
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-symlink/.
-   4df8d9d..2467d43  master     -> origin/master
-Updating 4df8d9d..2467d43
-Fast-forward
- subdir/file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - pulling from real subdir
-
-expecting success of 5522.3 'pulling from symlinked subdir': 
-	(
-		echo link >subdir/file &&
-		git commit -m link subdir/file &&
-		cd subdir-link/ &&
-		git pull &&
-		test link = $(cat file)
-	)
-
-[master d98696f] link
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-symlink/.
-   2467d43..d98696f  master     -> origin/master
-Updating 2467d43..d98696f
-Fast-forward
- subdir/file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - pulling from symlinked subdir
-
-expecting success of 5522.4 'pushing from symlinked subdir': 
-	(
-		cd subdir-link/ &&
-		echo push >file &&
-		git commit -m push ./file &&
-		git push
-	) &&
-	echo push >expect &&
-	git show HEAD:subdir/file >actual &&
-	test_cmp expect actual
-
-[master 4aa2d47] push
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-remote: warning: updating the current branch        
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-symlink/.
-   d98696f..4aa2d47  master -> master
-ok 4 - pushing from symlinked subdir
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 25 - git fetch --no-all --all (fetch all remotes)
 
-# passed all 4 test(s)
-1..4
+# passed all 25 test(s)
+1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5517-push-mirror.sh ***
@@ -330567,7 +330164,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":"20250209T065439.473264Z-Hcf858c9d-P001a1699","thread":"main","time":"2025-02-09T06:54:39.474355Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001305,"t_rel":0.001305,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133156.667602Z-H5c947e1c-P0002487f","thread":"main","time":"2026-03-14T13:31:56.668657Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"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': 
@@ -331062,18 +330659,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 44f5f459 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 82224a27 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":"20250209T065439.473264Z-Hcf858c9d-P001a1699","thread":"main","time":"2025-02-09T06:54:39.474355Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001305,"t_rel":0.001305,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250209T065441.019198Z-Hcf858c9d-P001a306d","thread":"main","time":"2025-02-09T06:54:41.020319Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001310,"t_rel":0.001310,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133156.667602Z-H5c947e1c-P0002487f","thread":"main","time":"2026-03-14T13:31:56.668657Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133204.964234Z-H5c947e1c-P00026402","thread":"main","time":"2026-03-14T13:32:04.965305Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001269,"t_rel":0.001269,"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 / 44f5f459 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 82224a27 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
@@ -331715,19 +331312,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":"20250209T065439.473264Z-Hcf858c9d-P001a1699","thread":"main","time":"2025-02-09T06:54:39.474355Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001305,"t_rel":0.001305,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250209T065441.019198Z-Hcf858c9d-P001a306d","thread":"main","time":"2025-02-09T06:54:41.020319Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001310,"t_rel":0.001310,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250209T065442.393751Z-Hcf858c9d-P001a464c","thread":"main","time":"2025-02-09T06:54:42.394954Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001395,"t_rel":0.001395,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133156.667602Z-H5c947e1c-P0002487f","thread":"main","time":"2026-03-14T13:31:56.668657Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133204.964234Z-H5c947e1c-P00026402","thread":"main","time":"2026-03-14T13:32:04.965305Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001269,"t_rel":0.001269,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133213.772873Z-H5c947e1c-P00028148","thread":"main","time":"2026-03-14T13:32:13.782118Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.009430,"t_rel":0.009430,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 115 - reverse index exists (rev)
 
 expecting success of 5327.116 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD~
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / 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 116 - rev-list --test-bitmap verifies bitmaps
@@ -332369,7 +331966,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":"20250209T065443.706174Z-Hcf858c9d-P001a5e1b","thread":"main","time":"2025-02-09T06:54:43.707244Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001287,"t_rel":0.001287,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133221.073238Z-H5c947e1c-P00029c3e","thread":"main","time":"2026-03-14T13:32:21.074298Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"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': 
@@ -332864,18 +332461,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 1d74e562 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":"20250209T065443.706174Z-Hcf858c9d-P001a5e1b","thread":"main","time":"2025-02-09T06:54:43.707244Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001287,"t_rel":0.001287,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250209T065445.199004Z-Hcf858c9d-P001a7b43","thread":"main","time":"2025-02-09T06:54:45.200172Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001354,"t_rel":0.001354,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133221.073238Z-H5c947e1c-P00029c3e","thread":"main","time":"2026-03-14T13:32:21.074298Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133229.308154Z-H5c947e1c-P0002bacd","thread":"main","time":"2026-03-14T13:32:29.309214Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"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 / 1d74e562 checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
 ok 207 - rev-list --test-bitmap verifies bitmaps
@@ -333520,9 +333117,9 @@
 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":"20250209T065443.706174Z-Hcf858c9d-P001a5e1b","thread":"main","time":"2025-02-09T06:54:43.707244Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001287,"t_rel":0.001287,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250209T065445.199004Z-Hcf858c9d-P001a7b43","thread":"main","time":"2025-02-09T06:54:45.200172Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001354,"t_rel":0.001354,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20250209T065446.544207Z-Hcf858c9d-P001a943f","thread":"main","time":"2025-02-09T06:54:46.545445Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001436,"t_rel":0.001436,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133221.073238Z-H5c947e1c-P00029c3e","thread":"main","time":"2026-03-14T13:32:21.074298Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133229.308154Z-H5c947e1c-P0002bacd","thread":"main","time":"2026-03-14T13:32:29.309214Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001250,"t_rel":0.001250,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20260314T133237.412978Z-H5c947e1c-P0002d8e1","thread":"main","time":"2026-03-14T13:32:37.414124Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001322,"t_rel":0.001322,"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': 
@@ -333892,6 +333489,96 @@
 1..314
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5522-pull-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-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 5522.1 'setup': 
+	mkdir subdir &&
+	echo file >subdir/file &&
+	git add subdir/file &&
+	git commit -q -m file &&
+	git clone -q . clone-repo &&
+	ln -s clone-repo/subdir/ subdir-link &&
+	(
+		cd clone-repo &&
+		git config receive.denyCurrentBranch warn
+	) &&
+	git config receive.denyCurrentBranch warn
+
+ok 1 - setup
+
+expecting success of 5522.2 'pulling from real subdir': 
+	(
+		echo real >subdir/file &&
+		git commit -m real subdir/file &&
+		cd clone-repo/subdir/ &&
+		git pull &&
+		test real = $(cat file)
+	)
+
+[master 2467d43] real
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-symlink/.
+   4df8d9d..2467d43  master     -> origin/master
+Updating 4df8d9d..2467d43
+Fast-forward
+ subdir/file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - pulling from real subdir
+
+expecting success of 5522.3 'pulling from symlinked subdir': 
+	(
+		echo link >subdir/file &&
+		git commit -m link subdir/file &&
+		cd subdir-link/ &&
+		git pull &&
+		test link = $(cat file)
+	)
+
+[master d98696f] link
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-symlink/.
+   2467d43..d98696f  master     -> origin/master
+Updating 2467d43..d98696f
+Fast-forward
+ subdir/file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - pulling from symlinked subdir
+
+expecting success of 5522.4 'pushing from symlinked subdir': 
+	(
+		cd subdir-link/ &&
+		echo push >file &&
+		git commit -m push ./file &&
+		git push
+	) &&
+	echo push >expect &&
+	git show HEAD:subdir/file >actual &&
+	test_cmp expect actual
+
+[master 4aa2d47] push
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+remote: warning: updating the current branch        
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5522-pull-symlink/.
+   d98696f..4aa2d47  master -> master
+ok 4 - pushing from symlinked subdir
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5524-pull-msg.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5524-pull-msg/.git/
 expecting success of 5524.1 'setup': 
@@ -334009,6 +333696,411 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5525-fetch-tagopt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5525-fetch-tagopt/.git/
+expecting success of 5525.1 'setup': 
+	test_commit test &&
+	setup_clone one &&
+	git config remote.remote_one.tagopt --no-tags &&
+	setup_clone two &&
+	git config remote.remote_two.tagopt --tags
+	
+[master (root-commit) 14f901a] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.t
+Cloning into bare repository 'one'...
+done.
+branch 'branch_one' set up to track 'origin/master'.
+Cloning into bare repository 'two'...
+done.
+branch 'branch_two' set up to track 'origin/master'.
+ok 1 - setup
+
+expecting success of 5525.2 'fetch with tagopt=--no-tags does not get tag': 
+	git fetch remote_one &&
+	test_must_fail git show-ref tag_one &&
+	git show-ref remote_one/branch_one
+	
+From one
+ * [new branch]      branch_one -> remote_one/branch_one
+ * [new branch]      master     -> remote_one/master
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/branch_one
+ok 2 - fetch with tagopt=--no-tags does not get tag
+
+expecting success of 5525.3 'fetch --tags with tagopt=--no-tags gets tag': 
+	(
+		cd one &&
+		git branch second_branch_one
+	) &&
+	git fetch --tags remote_one &&
+	git show-ref tag_one &&
+	git show-ref remote_one/second_branch_one
+	
+branch 'second_branch_one' set up to track 'origin/master'.
+From one
+ * [new branch]      second_branch_one -> remote_one/second_branch_one
+ * [new tag]         tag_one           -> tag_one
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_one
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/second_branch_one
+ok 3 - fetch --tags with tagopt=--no-tags gets tag
+
+expecting success of 5525.4 'fetch --no-tags with tagopt=--tags does not get tag': 
+	git fetch --no-tags remote_two &&
+	test_must_fail git show-ref tag_two &&
+	git show-ref remote_two/branch_two
+	
+From two
+ * [new branch]      branch_two -> remote_two/branch_two
+ * [new branch]      master     -> remote_two/master
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/branch_two
+ok 4 - fetch --no-tags with tagopt=--tags does not get tag
+
+expecting success of 5525.5 'fetch with tagopt=--tags gets tag': 
+	(
+		cd two &&
+		git branch second_branch_two
+	) &&
+	git fetch remote_two &&
+	git show-ref tag_two &&
+	git show-ref remote_two/second_branch_two
+	
+branch 'second_branch_two' set up to track 'origin/master'.
+From two
+ * [new branch]      second_branch_two -> remote_two/second_branch_two
+ * [new tag]         tag_two           -> tag_two
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_two
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/second_branch_two
+ok 5 - fetch with tagopt=--tags gets tag
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5523-push-upstream.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/.git/
+expecting success of 5523.1 'setup bare parent': 
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+ok 1 - setup bare parent
+
+expecting success of 5523.2 'setup local commit': 
+	echo content >file &&
+	git add file &&
+	git commit -m one
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 2 - setup local commit
+
+expecting success of 5523.3 'push -u main:main': 
+	git push -u upstream main:main &&
+	check_config main upstream refs/heads/main
+
+To parent
+ * [new branch]      main -> main
+branch 'main' set up to track 'upstream/main'.
+ok 3 - push -u main:main
+
+expecting success of 5523.4 'push -u main:other': 
+	git push -u upstream main:other &&
+	check_config main upstream refs/heads/other
+
+To parent
+ * [new branch]      main -> other
+branch 'main' set up to track 'upstream/other'.
+ok 4 - push -u main:other
+
+expecting success of 5523.5 'push -u --dry-run main:otherX': 
+	git push -u --dry-run upstream main:otherX &&
+	check_config main upstream refs/heads/other
+
+To parent
+ * [new branch]      main -> otherX
+Would set upstream of 'main' to 'otherX' of 'upstream'
+ok 5 - push -u --dry-run main:otherX
+
+expecting success of 5523.6 'push -u topic_2:topic_2': 
+	git branch topic_2 &&
+	git push -u upstream topic_2:topic_2 &&
+	check_config topic_2 upstream refs/heads/topic_2
+
+To parent
+ * [new branch]      topic_2 -> topic_2
+branch 'topic_2' set up to track 'upstream/topic_2'.
+ok 6 - push -u topic_2:topic_2
+
+expecting success of 5523.7 'push -u topic_2:other2': 
+	git push -u upstream topic_2:other2 &&
+	check_config topic_2 upstream refs/heads/other2
+
+To parent
+ * [new branch]      topic_2 -> other2
+branch 'topic_2' set up to track 'upstream/other2'.
+ok 7 - push -u topic_2:other2
+
+expecting success of 5523.8 'push -u :topic_2': 
+	git push -u upstream :topic_2 &&
+	check_config topic_2 upstream refs/heads/other2
+
+To parent
+ - [deleted]         topic_2
+ok 8 - push -u :topic_2
+
+expecting success of 5523.9 'push -u --all(the same behavior with--branches)': 
+	git branch all1 &&
+	git branch all2 &&
+	git push -u --all &&
+	check_config all1 upstream refs/heads/all1 &&
+	check_config all2 upstream refs/heads/all2 &&
+	git config --get-regexp branch.all* > expect &&
+	git config --remove-section branch.all1 &&
+	git config --remove-section branch.all2 &&
+	git push -u --branches &&
+	check_config all1 upstream refs/heads/all1 &&
+	check_config all2 upstream refs/heads/all2 &&
+	git config --get-regexp branch.all* > actual &&
+	test_cmp expect actual
+
+To parent
+ * [new branch]      all1 -> all1
+ * [new branch]      all2 -> all2
+ * [new branch]      topic_2 -> topic_2
+branch 'main' set up to track 'upstream/main'.
+branch 'all1' set up to track 'upstream/all1'.
+branch 'all2' set up to track 'upstream/all2'.
+branch 'topic_2' set up to track 'upstream/topic_2'.
+Everything up-to-date
+branch 'all1' set up to track 'upstream/all1'.
+branch 'all2' set up to track 'upstream/all2'.
+branch 'main' set up to track 'upstream/main'.
+branch 'topic_2' set up to track 'upstream/topic_2'.
+ok 9 - push -u --all(the same behavior with--branches)
+
+expecting success of 5523.10 'push -u HEAD': 
+	git checkout -b headbranch &&
+	git push -u upstream HEAD &&
+	check_config headbranch upstream refs/heads/headbranch
+
+Switched to a new branch 'headbranch'
+To parent
+ * [new branch]      HEAD -> headbranch
+branch 'headbranch' set up to track 'upstream/headbranch'.
+ok 10 - push -u HEAD
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 5523.11 'progress messages go to tty': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push -u upstream main >out 2>err &&
+	test_grep "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
+ok 11 - progress messages go to tty
+
+expecting success of 5523.12 'progress messages do not go to non-tty': 
+	ensure_fresh_upstream &&
+
+	# skip progress messages, since stderr is non-tty
+	git push -u upstream main >out 2>err &&
+	test_grep ! "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+ok 12 - progress messages do not go to non-tty
+
+expecting success of 5523.13 'progress messages go to non-tty (forced)': 
+	ensure_fresh_upstream &&
+
+	# force progress messages to stderr, even though it is non-tty
+	git push -u --progress upstream main >out 2>err &&
+	test_grep "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
+ok 13 - progress messages go to non-tty (forced)
+
+expecting success of 5523.14 'push -q suppresses progress': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push -u -q upstream main >out 2>err &&
+	test_grep ! "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+ok 14 - push -q suppresses progress
+
+expecting success of 5523.15 'push --no-progress suppresses progress': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push -u --no-progress upstream main >out 2>err &&
+	test_grep ! "Unpacking objects" err &&
+	test_grep ! "Writing objects" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+ok 15 - push --no-progress suppresses progress
+
+expecting success of 5523.16 'quiet push': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push --quiet --no-progress upstream main >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+ok 16 - quiet push
+
+expecting success of 5523.17 'quiet push -u': 
+	ensure_fresh_upstream &&
+
+	test_terminal git push --quiet -u --no-progress upstream main >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
+ok 17 - quiet push -u
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5527-fetch-odd-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5527-fetch-odd-refs/long/.git/
+[main (root-commit) 92be28b] long
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 long.t
+[main c47af98] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main.t
+ok 3 - try to create repo with absurdly long refname
+
+expecting success of 5527.4 'fetch handles extremely long refname': 
+	git fetch long refs/heads/*:refs/remotes/long/* &&
+	cat >expect <<-\EOF &&
+	long
+	main
+	EOF
+	git for-each-ref --format="%(subject)" refs/remotes/long \
+		--exclude=refs/remotes/long/HEAD >actual &&
+	test_cmp expect actual
+
+From long
+ * [new branch]      0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000 -> long/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
+ * [new branch]      main       -> long/main
+ * [new tag]         long       -> long
+ * [new tag]         main       -> main
+ok 4 - fetch handles extremely long refname
+
+expecting success of 5527.5 'push handles extremely long refname': 
+	git push long :refs/heads/$ref1440 &&
+	git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
+	echo main >expect &&
+	test_cmp expect actual
+
+To long
+ - [deleted]         0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
+ok 5 - push handles extremely long refname
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5505-remote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5505-remote/.git/
 expecting success of 5505.1 'setup': 
@@ -334374,8 +334466,8 @@
 	test_cmp expect output
 
 error: src refspec refs/tags/lastbackup does not match any
---- expect	2025-02-09 06:54:44.557971156 +0000
-+++ output	2025-02-09 06:54:44.565971207 +0000
+--- expect	2026-03-14 13:32:30.078677808 +0000
++++ output	2026-03-14 13:32:30.154677808 +0000
 @@ -4,7 +4,7 @@
    HEAD branch: main
    Remote branches:
@@ -335120,5232 +335212,1453 @@
 Deleted remote-tracking branch manduca/side (was 2ce9c50).
 Deleted remote-tracking branch megaloprepus/main (was 6329a3c).
 Deleted remote-tracking branch megaloprepus/side (was 2ce9c50).
-Fetching drosophila
-From ../two
- * [new branch]      another    -> drosophila/another
- * [new branch]      main       -> drosophila/main
- * [new branch]      side       -> drosophila/side
-ok 63 - update default (overridden, with funny whitespace)
-
-expecting success of 5505.64 'update (with remotes.default defined)': 
-	(
-		cd one &&
-		for b in $(git branch -r | grep -v HEAD)
-		do
-		git branch -r -d $b || exit 1
-		done &&
-		git config remotes.default "drosophila" &&
-		git remote update &&
-		git branch -r >output &&
-		test_cmp expect output
-	)
-
-Deleted remote-tracking branch drosophila/another (was 9d34b14).
-Deleted remote-tracking branch drosophila/main (was 9d34b14).
-Deleted remote-tracking branch drosophila/side (was 2ce9c50).
-Fetching drosophila
-From ../two
- * [new branch]      another    -> drosophila/another
- * [new branch]      main       -> drosophila/main
- * [new branch]      side       -> drosophila/side
-ok 64 - update (with remotes.default defined)
-
-expecting success of 5505.65 '"remote show" does not show symbolic refs': 
-	git clone one three &&
-	(
-		cd three &&
-		git remote show origin >output &&
-		! grep "^ *HEAD$" < output &&
-		! grep -i stale < output
-	)
-
-Cloning into 'three'...
-done.
-ok 65 - "remote show" does not show symbolic refs
-
-expecting success of 5505.66 'reject adding remote with an invalid name': 
-	test_must_fail git remote add some:url desired-name
-
-fatal: 'some:url' is not a valid remote name
-ok 66 - reject adding remote with an invalid name
-
-expecting success of 5505.67 'rename a remote': 
-	test_config_global remote.pushDefault origin &&
-	git clone one four &&
-	(
-		cd four &&
-		git config branch.main.pushRemote origin &&
-		GIT_TRACE2_EVENT=$(pwd)/trace \
-			git remote rename --progress origin upstream &&
-		test_region progress "Renaming remote references" trace &&
-		grep "pushRemote" .git/config &&
-		test -z "$(git for-each-ref refs/remotes/origin)" &&
-		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&
-		test "$(git rev-parse upstream/main)" = "$(git rev-parse main)" &&
-		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
-		test "$(git config branch.main.remote)" = "upstream" &&
-		test "$(git config branch.main.pushRemote)" = "upstream" &&
-		test "$(git config --global remote.pushDefault)" = "origin"
-	)
-
-Cloning into 'four'...
-done.
-Renaming remote references:  25% (1/4)
Renaming remote references:  50% (2/4)
Renaming remote references:  75% (3/4)
Renaming remote references: 100% (4/4)
Renaming remote references: 100% (4/4), done.
-warning: The global configuration remote.pushDefault in:
-	file:2
-now names the non-existent remote 'origin'
-{"event":"region_enter","sid":"20250209T065446.149828Z-Hcf858c9d-P001a8d19","thread":"main","time":"2025-02-09T06:54:46.150921Z","file":"progress.c","line":273,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
-{"event":"region_leave","sid":"20250209T065446.149828Z-Hcf858c9d-P001a8d19","thread":"main","time":"2025-02-09T06:54:46.152075Z","file":"progress.c","line":351,"repo":1,"t_rel":0.001155,"nesting":1,"category":"progress","label":"Renaming remote references"}
-	pushRemote = upstream
-ok 67 - rename a remote
-
-expecting success of 5505.68 'rename a remote renames repo remote.pushDefault': 
-	git clone one four.1 &&
-	(
-		cd four.1 &&
-		git config remote.pushDefault origin &&
-		git remote rename origin upstream &&
-		grep pushDefault .git/config &&
-		test "$(git config --local remote.pushDefault)" = "upstream"
-	)
-
-Cloning into 'four.1'...
-done.
-	pushDefault = upstream
-ok 68 - rename a remote renames repo remote.pushDefault
-
-expecting success of 5505.69 'rename a remote renames repo remote.pushDefault but ignores global': 
-	test_config_global remote.pushDefault other &&
-	git clone one four.2 &&
-	(
-		cd four.2 &&
-		git config remote.pushDefault origin &&
-		git remote rename origin upstream &&
-		test "$(git config --global remote.pushDefault)" = "other" &&
-		test "$(git config --local remote.pushDefault)" = "upstream"
-	)
-
-Cloning into 'four.2'...
-done.
-ok 69 - rename a remote renames repo remote.pushDefault but ignores global
-
-expecting success of 5505.70 'rename a remote renames repo remote.pushDefault but keeps global': 
-	test_config_global remote.pushDefault origin &&
-	git clone one four.3 &&
-	(
-		cd four.3 &&
-		git config remote.pushDefault origin &&
-		git remote rename origin upstream &&
-		test "$(git config --global remote.pushDefault)" = "origin" &&
-		test "$(git config --local remote.pushDefault)" = "upstream"
-	)
-
-Cloning into 'four.3'...
-done.
-ok 70 - rename a remote renames repo remote.pushDefault but keeps global
-
-expecting success of 5505.71 'rename handles remote without fetch refspec': 
-	git clone --bare one no-refspec.git &&
-	# confirm assumption that bare clone does not create refspec
-	test_expect_code 5 \
-		git -C no-refspec.git config --unset-all remote.origin.fetch &&
-	git -C no-refspec.git config remote.origin.url >expect &&
-	git -C no-refspec.git remote rename origin foo &&
-	git -C no-refspec.git config remote.foo.url >actual &&
-	test_cmp expect actual
-
-Cloning into bare repository 'no-refspec.git'...
-done.
-ok 71 - rename handles remote without fetch refspec
-
-expecting success of 5505.72 'rename does not update a non-default fetch refspec': 
-	git clone one four.one &&
-	(
-		cd four.one &&
-		git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
-		git remote rename origin upstream &&
-		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
-		git rev-parse -q origin/main
-	)
-
-Cloning into 'four.one'...
-done.
-warning: Not updating non-default fetch refspec
-	+refs/heads/*:refs/heads/origin/*
-	Please update the configuration manually if necessary.
-6329a3ca5268a0b28a1dc29b602e8b72a0bc1b37
-ok 72 - rename does not update a non-default fetch refspec
-
-expecting success of 5505.73 'rename a remote with name part of fetch spec': 
-	git clone one four.two &&
-	(
-		cd four.two &&
-		git remote rename origin remote &&
-		git remote rename remote upstream &&
-		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*"
-	)
-
-Cloning into 'four.two'...
-done.
-ok 73 - rename a remote with name part of fetch spec
-
-expecting success of 5505.74 'rename a remote with name prefix of other remote': 
-	git clone one four.three &&
-	(
-		cd four.three &&
-		git remote add o git://example.com/repo.git &&
-		git remote rename o upstream &&
-		test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
-	)
-
-Cloning into 'four.three'...
-done.
-ok 74 - rename a remote with name prefix of other remote
-
-expecting success of 5505.75 'rename succeeds with existing remote.<target>.prune': 
-	git clone one four.four &&
-	test_when_finished git config --global --unset remote.upstream.prune &&
-	git config --global remote.upstream.prune true &&
-	git -C four.four remote rename origin upstream
-
-Cloning into 'four.four'...
-done.
-ok 75 - rename succeeds with existing remote.<target>.prune
-
-expecting success of 5505.76 'remove a remote': 
-	test_config_global remote.pushDefault origin &&
-	git clone one four.five &&
-	(
-		cd four.five &&
-		git config branch.main.pushRemote origin &&
-		git remote remove origin &&
-		test -z "$(git for-each-ref refs/remotes/origin)" &&
-		test_must_fail git config branch.main.remote &&
-		test_must_fail git config branch.main.pushRemote &&
-		test "$(git config --global remote.pushDefault)" = "origin"
-	)
-
-Cloning into 'four.five'...
-done.
-warning: The global configuration remote.pushDefault in:
-	file:2
-now names the non-existent remote 'origin'
-ok 76 - remove a remote
-
-expecting success of 5505.77 'remove a remote removes repo remote.pushDefault': 
-	git clone one four.five.1 &&
-	(
-		cd four.five.1 &&
-		git config remote.pushDefault origin &&
-		git remote remove origin &&
-		test_must_fail git config --local remote.pushDefault
-	)
-
-Cloning into 'four.five.1'...
-done.
-ok 77 - remove a remote removes repo remote.pushDefault
-
-expecting success of 5505.78 'remove a remote removes repo remote.pushDefault but ignores global': 
-	test_config_global remote.pushDefault other &&
-	git clone one four.five.2 &&
-	(
-		cd four.five.2 &&
-		git config remote.pushDefault origin &&
-		git remote remove origin &&
-		test "$(git config --global remote.pushDefault)" = "other" &&
-		test_must_fail git config --local remote.pushDefault
-	)
-
-Cloning into 'four.five.2'...
-done.
-ok 78 - remove a remote removes repo remote.pushDefault but ignores global
-
-expecting success of 5505.79 'remove a remote removes repo remote.pushDefault but keeps global': 
-	test_config_global remote.pushDefault origin &&
-	git clone one four.five.3 &&
-	(
-		cd four.five.3 &&
-		git config remote.pushDefault origin &&
-		git remote remove origin &&
-		test "$(git config --global remote.pushDefault)" = "origin" &&
-		test_must_fail git config --local remote.pushDefault
-	)
-
-Cloning into 'four.five.3'...
-done.
-ok 79 - remove a remote removes repo remote.pushDefault but keeps global
-
-expecting success of 5505.80 'migrate a remote from named file in $GIT_DIR/remotes': 
-	git clone one five &&
-	origin_url=$(pwd)/one &&
-	(
-		cd five &&
-		git remote remove origin &&
-		mkdir -p .git/remotes &&
-		cat ../remotes_origin >.git/remotes/origin &&
-		git remote rename origin origin &&
-		test_path_is_missing .git/remotes/origin &&
-		test "$(git config remote.origin.url)" = "$origin_url" &&
-		cat >push_expected <<-\EOF &&
-		refs/heads/main:refs/heads/upstream
-		refs/heads/next:refs/heads/upstream2
-		EOF
-		cat >fetch_expected <<-\EOF &&
-		refs/heads/main:refs/heads/origin
-		refs/heads/next:refs/heads/origin2
-		EOF
-		git config --get-all remote.origin.push >push_actual &&
-		git config --get-all remote.origin.fetch >fetch_actual &&
-		test_cmp push_expected push_actual &&
-		test_cmp fetch_expected fetch_actual
-	)
-
-Cloning into 'five'...
-done.
-ok 80 - migrate a remote from named file in $GIT_DIR/remotes
-
-expecting success of 5505.81 'migrate a remote from named file in $GIT_DIR/branches': 
-	git clone --template= one six &&
-	origin_url=$(pwd)/one &&
-	(
-		cd six &&
-		git remote rm origin &&
-		mkdir .git/branches &&
-		echo "$origin_url#main" >.git/branches/origin &&
-		git remote rename origin origin &&
-		test_path_is_missing .git/branches/origin &&
-		test "$(git config remote.origin.url)" = "$origin_url" &&
-		test "$(git config remote.origin.fetch)" = "refs/heads/main:refs/heads/origin" &&
-		test "$(git config remote.origin.push)" = "HEAD:refs/heads/main"
-	)
-
-Cloning into 'six'...
-done.
-ok 81 - migrate a remote from named file in $GIT_DIR/branches
-
-expecting success of 5505.82 'migrate a remote from named file in $GIT_DIR/branches (2)': 
-	git clone --template= one seven &&
-	(
-		cd seven &&
-		git remote rm origin &&
-		mkdir .git/branches &&
-		echo "quux#foom" > .git/branches/origin &&
-		git remote rename origin origin &&
-		test_path_is_missing .git/branches/origin &&
-		test "$(git config remote.origin.url)" = "quux" &&
-		test "$(git config remote.origin.fetch)" = "refs/heads/foom:refs/heads/origin" &&
-		test "$(git config remote.origin.push)" = "HEAD:refs/heads/foom"
-	)
-
-Cloning into 'seven'...
-done.
-ok 82 - migrate a remote from named file in $GIT_DIR/branches (2)
-
-expecting success of 5505.83 'remote prune to cause a dangling symref': 
-	git clone one eight &&
-	(
-		cd one &&
-		git checkout side2 &&
-		git branch -D main
-	) &&
-	(
-		cd eight &&
-		git remote prune origin
-	) >err 2>&1 &&
-	test_grep "has become dangling" err &&
-
-	: And the dangling symref will not cause other annoying errors &&
-	(
-		cd eight &&
-		git branch -a
-	) 2>err &&
-	! grep "points nowhere" err &&
-	(
-		cd eight &&
-		test_must_fail git branch nomore origin
-	) 2>err &&
-	test_grep "dangling symref" err
-
-Cloning into 'eight'...
-done.
-Switched to branch 'side2'
-Deleted branch main (was 6329a3c).
- refs/remotes/origin/HEAD has become dangling!
-* main
-  remotes/origin/side2
-warning: ignoring dangling symref refs/remotes/origin/HEAD
-ok 83 - remote prune to cause a dangling symref
-
-expecting success of 5505.84 'show empty remote': 
-	test_create_repo empty &&
-	git clone empty empty-clone &&
-	(
-		cd empty-clone &&
-		git remote show origin
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5505-remote/empty/.git/
-Cloning into 'empty-clone'...
-warning: You appear to have cloned an empty repository.
-done.
-* remote origin
-  Fetch URL: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5505-remote/empty
-  Push  URL: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5505-remote/empty
-  HEAD branch: (unknown)
-  Local branch configured for 'git pull':
-    main merges with remote main
-ok 84 - show empty remote
-
-expecting success of 5505.85 'remote set-branches requires a remote': 
-	test_must_fail git remote set-branches &&
-	test_must_fail git remote set-branches --add
-
-error: no remote specified
-usage: git remote set-branches <name> <branch>...
-   or: git remote set-branches --add <name> <branch>...
-
-    --[no-]add            add branch
-
-error: no remote specified
-usage: git remote set-branches <name> <branch>...
-   or: git remote set-branches --add <name> <branch>...
-
-    --[no-]add            add branch
-
-ok 85 - remote set-branches requires a remote
-
-expecting success of 5505.86 'remote set-branches': 
-	echo "+refs/heads/*:refs/remotes/scratch/*" >expect.initial &&
-	sort <<-\EOF >expect.add &&
-	+refs/heads/*:refs/remotes/scratch/*
-	+refs/heads/other:refs/remotes/scratch/other
-	EOF
-	sort <<-\EOF >expect.replace &&
-	+refs/heads/maint:refs/remotes/scratch/maint
-	+refs/heads/main:refs/remotes/scratch/main
-	+refs/heads/next:refs/remotes/scratch/next
-	EOF
-	sort <<-\EOF >expect.add-two &&
-	+refs/heads/maint:refs/remotes/scratch/maint
-	+refs/heads/main:refs/remotes/scratch/main
-	+refs/heads/next:refs/remotes/scratch/next
-	+refs/heads/seen:refs/remotes/scratch/seen
-	+refs/heads/t/topic:refs/remotes/scratch/t/topic
-	EOF
-	sort <<-\EOF >expect.setup-ffonly &&
-	refs/heads/main:refs/remotes/scratch/main
-	+refs/heads/next:refs/remotes/scratch/next
-	EOF
-	sort <<-\EOF >expect.respect-ffonly &&
-	refs/heads/main:refs/remotes/scratch/main
-	+refs/heads/next:refs/remotes/scratch/next
-	+refs/heads/seen:refs/remotes/scratch/seen
-	EOF
-
-	git clone .git/ setbranches &&
-	(
-		cd setbranches &&
-		git remote rename origin scratch &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.initial &&
-
-		git remote set-branches scratch --add other &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.add &&
-
-		git remote set-branches scratch maint main next &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.replace &&
-
-		git remote set-branches --add scratch seen t/topic &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.add-two &&
-
-		git config --unset-all remote.scratch.fetch &&
-		git config remote.scratch.fetch \
-			refs/heads/main:refs/remotes/scratch/main &&
-		git config --add remote.scratch.fetch \
-			+refs/heads/next:refs/remotes/scratch/next &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.setup-ffonly &&
-
-		git remote set-branches --add scratch seen &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.respect-ffonly
-	) &&
-	test_cmp expect.initial actual.initial &&
-	test_cmp expect.add actual.add &&
-	test_cmp expect.replace actual.replace &&
-	test_cmp expect.add-two actual.add-two &&
-	test_cmp expect.setup-ffonly actual.setup-ffonly &&
-	test_cmp expect.respect-ffonly actual.respect-ffonly
-
-Cloning into 'setbranches'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 86 - remote set-branches
-
-expecting success of 5505.87 'remote set-branches with --mirror': 
-	echo "+refs/*:refs/*" >expect.initial &&
-	echo "+refs/heads/main:refs/heads/main" >expect.replace &&
-	git clone --mirror .git/ setbranches-mirror &&
-	(
-		cd setbranches-mirror &&
-		git remote rename origin scratch &&
-		git config --get-all remote.scratch.fetch >../actual.initial &&
-
-		git remote set-branches scratch heads/main &&
-		git config --get-all remote.scratch.fetch >../actual.replace
-	) &&
-	test_cmp expect.initial actual.initial &&
-	test_cmp expect.replace actual.replace
-
-Cloning into bare repository 'setbranches-mirror'...
-warning: You appear to have cloned an empty repository.
-done.
-warning: Not updating non-default fetch refspec
-	+refs/*:refs/*
-	Please update the configuration manually if necessary.
-ok 87 - remote set-branches with --mirror
-
-expecting success of 5505.88 'new remote': 
-	git remote add someremote foo &&
-	echo foo >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
-
-ok 88 - new remote
-
-expecting success of 5505.89 'get-url on new remote': 
-	echo foo | get_url_test someremote &&
-	echo foo | get_url_test --all someremote &&
-	echo foo | get_url_test --push someremote &&
-	echo foo | get_url_test --push --all someremote
-
-ok 89 - get-url on new remote
-
-expecting success of 5505.90 'remote set-url with locked config': 
-	test_when_finished "rm -f .git/config.lock" &&
-	git config --get-all remote.someremote.url >expect &&
-	>.git/config.lock &&
-	test_must_fail git remote set-url someremote baz &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
-
-error: could not lock config file .git/config: File exists
-fatal: could not set 'remote.someremote.url' to 'baz'
-ok 90 - remote set-url with locked config
-
-expecting success of 5505.91 'remote set-url bar': 
-	git remote set-url someremote bar &&
-	echo bar >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
-
-ok 91 - remote set-url bar
-
-expecting success of 5505.92 'remote set-url baz bar': 
-	git remote set-url someremote baz bar &&
-	echo baz >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
-
-ok 92 - remote set-url baz bar
-
-expecting success of 5505.93 'remote set-url zot bar': 
-	test_must_fail git remote set-url someremote zot bar &&
-	echo baz >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
-
-fatal: No such URL found: bar
-ok 93 - remote set-url zot bar
-
-expecting success of 5505.94 'remote set-url --push zot baz': 
-	test_must_fail git remote set-url --push someremote zot baz &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-fatal: No such URL found: baz
-ok 94 - remote set-url --push zot baz
-
-expecting success of 5505.95 'remote set-url --push zot': 
-	git remote set-url --push someremote zot &&
-	echo zot >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 95 - remote set-url --push zot
-
-expecting success of 5505.96 'get-url with different urls': 
-	echo baz | get_url_test someremote &&
-	echo baz | get_url_test --all someremote &&
-	echo zot | get_url_test --push someremote &&
-	echo zot | get_url_test --push --all someremote
-
-ok 96 - get-url with different urls
-
-expecting success of 5505.97 'remote set-url --push qux zot': 
-	git remote set-url --push someremote qux zot &&
-	echo qux >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 97 - remote set-url --push qux zot
-
-expecting success of 5505.98 'remote set-url --push foo qu+x': 
-	git remote set-url --push someremote foo qu+x &&
-	echo foo >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 98 - remote set-url --push foo qu+x
-
-expecting success of 5505.99 'remote set-url --push --add aaa': 
-	git remote set-url --push --add someremote aaa &&
-	echo foo >expect &&
-	echo aaa >>expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 99 - remote set-url --push --add aaa
-
-expecting success of 5505.100 'get-url on multi push remote': 
-	echo foo | get_url_test --push someremote &&
-	get_url_test --push --all someremote <<-\EOF
-	foo
-	aaa
-	EOF
-
-ok 100 - get-url on multi push remote
-
-expecting success of 5505.101 'remote set-url --push bar aaa': 
-	git remote set-url --push someremote bar aaa &&
-	echo foo >expect &&
-	echo bar >>expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 101 - remote set-url --push bar aaa
-
-expecting success of 5505.102 'remote set-url --push --delete bar': 
-	git remote set-url --push --delete someremote bar &&
-	echo foo >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 102 - remote set-url --push --delete bar
-
-expecting success of 5505.103 'remote set-url --push --delete foo': 
-	git remote set-url --push --delete someremote foo &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 103 - remote set-url --push --delete foo
-
-expecting success of 5505.104 'remote set-url --add bbb': 
-	git remote set-url --add someremote bbb &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	echo bbb >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 104 - remote set-url --add bbb
-
-expecting success of 5505.105 'get-url on multi fetch remote': 
-	echo baz | get_url_test someremote &&
-	get_url_test --all someremote <<-\EOF
-	baz
-	bbb
-	EOF
-
-ok 105 - get-url on multi fetch remote
-
-expecting success of 5505.106 'remote set-url --delete .*': 
-	test_must_fail git remote set-url --delete someremote .\* &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	echo bbb >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-fatal: Will not delete all non-push URLs
-ok 106 - remote set-url --delete .*
-
-expecting success of 5505.107 'remote set-url --delete bbb': 
-	git remote set-url --delete someremote bbb &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 107 - remote set-url --delete bbb
-
-expecting success of 5505.108 'remote set-url --delete baz': 
-	test_must_fail git remote set-url --delete someremote baz &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-fatal: Will not delete all non-push URLs
-ok 108 - remote set-url --delete baz
-
-expecting success of 5505.109 'remote set-url --add ccc': 
-	git remote set-url --add someremote ccc &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	echo ccc >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 109 - remote set-url --add ccc
-
-expecting success of 5505.110 'remote set-url --delete baz': 
-	git remote set-url --delete someremote baz &&
-	echo "YYY" >expect &&
-	echo ccc >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
-
-ok 110 - remote set-url --delete baz
-
-expecting success of 5505.111 'extra args: setup': 
-	# add a dummy origin so that this does not trigger failure
-	git remote add origin .
-
-ok 111 - extra args: setup
-
-expecting success of 5505.112 'extra args: add nick url': 
-		test_must_fail git remote add nick url bogus_extra_arg 2>actual &&
-		test_grep '^usage:' actual
-	
-usage: git remote add [<options>] <name> <url>
-ok 112 - extra args: add nick url
-
-expecting success of 5505.113 'extra args: rename origin newname': 
-		test_must_fail git remote rename origin newname bogus_extra_arg 2>actual &&
-		test_grep '^usage:' actual
-	
-usage: git remote rename [--[no-]progress] <old> <new>
-ok 113 - extra args: rename origin newname
-
-expecting success of 5505.114 'extra args: remove origin': 
-		test_must_fail git remote remove origin bogus_extra_arg 2>actual &&
-		test_grep '^usage:' actual
-	
-usage: git remote remove <name>
-ok 114 - extra args: remove origin
-
-expecting success of 5505.115 'extra args: set-head origin main': 
-		test_must_fail git remote set-head origin main bogus_extra_arg 2>actual &&
-		test_grep '^usage:' actual
-	
-usage: git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
-ok 115 - extra args: set-head origin main
-
-expecting success of 5505.116 'extra args: get-url origin newurl': 
-		test_must_fail git remote get-url origin newurl bogus_extra_arg 2>actual &&
-		test_grep '^usage:' actual
-	
-usage: git remote get-url [--push] [--all] <name>
-ok 116 - extra args: get-url origin newurl
-
-expecting success of 5505.117 'extra args: set-url origin newurl oldurl': 
-		test_must_fail git remote set-url origin newurl oldurl bogus_extra_arg 2>actual &&
-		test_grep '^usage:' actual
-	
-usage: git remote set-url [--push] <name> <newurl> [<oldurl>]
-ok 117 - extra args: set-url origin newurl oldurl
-
-expecting success of 5505.118 'add remote matching the "insteadOf" URL': 
-	git config url.xyz@example.com.insteadOf backup &&
-	git remote add backup xyz@example.com
-
-ok 118 - add remote matching the "insteadOf" URL
-
-expecting success of 5505.119 'unqualified <dst> refspec DWIM and advice': 
-	test_when_finished "(cd test && git tag -d some-tag)" &&
-	(
-		cd test &&
-		git tag -a -m "Some tag" some-tag main &&
-		for type in commit tag tree blob
-		do
-			if test "$type" = "blob"
-			then
-				oid=$(git rev-parse some-tag:file)
-			else
-				oid=$(git rev-parse some-tag^{$type})
-			fi &&
-			test_must_fail git push origin $oid:dst 2>err &&
-			test_grep "error: The destination you" err &&
-			test_grep "hint: Did you mean" err &&
-			test_must_fail git -c advice.pushUnqualifiedRefName=false \
-				push origin $oid:dst 2>err &&
-			test_grep "error: The destination you" err &&
-			test_grep ! "hint: Did you mean" err ||
-			exit 1
-		done
-	)
-
-error: The destination you provided is not a full refname (i.e.,
-hint: Did you mean to create a new branch by pushing to
-error: The destination you provided is not a full refname (i.e.,
-error: The destination you provided is not a full refname (i.e.,
-hint: Did you mean to create a new tag by pushing to
-error: The destination you provided is not a full refname (i.e.,
-error: The destination you provided is not a full refname (i.e.,
-hint: Did you mean to tag a new tree by pushing to
-error: The destination you provided is not a full refname (i.e.,
-error: The destination you provided is not a full refname (i.e.,
-hint: Did you mean to tag a new blob by pushing to
-error: The destination you provided is not a full refname (i.e.,
-Deleted tag 'some-tag' (was 87c70a4)
-ok 119 - unqualified <dst> refspec DWIM and advice
-
-expecting success of 5505.120 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice': 
-	(
-		cd two &&
-		git tag -a -m "Some tag" my-tag main &&
-		git update-ref refs/trees/my-head-tree HEAD^{tree} &&
-		git update-ref refs/blobs/my-file-blob HEAD:file
-	) &&
-	(
-		cd test &&
-		git config --add remote.two.fetch "+refs/tags/*:refs/remotes/tags-from-two/*" &&
-		git config --add remote.two.fetch "+refs/trees/*:refs/remotes/trees-from-two/*" &&
-		git config --add remote.two.fetch "+refs/blobs/*:refs/remotes/blobs-from-two/*" &&
-		git fetch --no-tags two &&
-
-		test_must_fail git push origin refs/remotes/two/another:dst 2>err &&
-		test_grep "error: The destination you" err &&
-
-		test_must_fail git push origin refs/remotes/tags-from-two/my-tag:dst-tag 2>err &&
-		test_grep "error: The destination you" err &&
-
-		test_must_fail git push origin refs/remotes/trees-from-two/my-head-tree:dst-tree 2>err &&
-		test_grep "error: The destination you" err &&
-
-		test_must_fail git push origin refs/remotes/blobs-from-two/my-file-blob:dst-blob 2>err &&
-		test_grep "error: The destination you" err
-	)
-
-From ../two
- * [new tag]         my-tag                  -> tags-from-two/my-tag
- * [new ref]         refs/trees/my-head-tree -> trees-from-two/my-head-tree
- * [new ref]         refs/blobs/my-file-blob -> blobs-from-two/my-file-blob
-error: The destination you provided is not a full refname (i.e.,
-error: The destination you provided is not a full refname (i.e.,
-error: The destination you provided is not a full refname (i.e.,
-error: The destination you provided is not a full refname (i.e.,
-ok 120 - refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice
-
-expecting success of 5505.121 'empty config clears remote.*.url list': 
-	test_when_finished "git config --remove-section remote.multi" &&
-	git config --add remote.multi.url wrong-one &&
-	git config --add remote.multi.url wrong-two &&
-	git -c remote.multi.url= \
-	    -c remote.multi.url=right-one \
-	    -c remote.multi.url=right-two \
-	    remote show -n multi >actual.raw &&
-	grep URL actual.raw >actual &&
-	cat >expect <<-\EOF &&
-	  Fetch URL: right-one
-	  Push  URL: right-one
-	  Push  URL: right-two
-	EOF
-	test_cmp expect actual
-
-ok 121 - empty config clears remote.*.url list
-
-expecting success of 5505.122 'empty config clears remote.*.pushurl list': 
-	test_when_finished "git config --remove-section remote.multi" &&
-	git config --add remote.multi.url right &&
-	git config --add remote.multi.url will-be-ignored &&
-	git config --add remote.multi.pushurl wrong-push-one &&
-	git config --add remote.multi.pushurl wrong-push-two &&
-	git -c remote.multi.pushurl= \
-	    -c remote.multi.pushurl=right-push-one \
-	    -c remote.multi.pushurl=right-push-two \
-	    remote show -n multi >actual.raw &&
-	grep URL actual.raw >actual &&
-	cat >expect <<-\EOF &&
-	  Fetch URL: right
-	  Push  URL: right-push-one
-	  Push  URL: right-push-two
-	EOF
-	test_cmp expect actual
-
-ok 122 - empty config clears remote.*.pushurl list
-
-# still have 1 known breakage(s)
-# passed all remaining 121 test(s)
-1..122
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5525-fetch-tagopt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5525-fetch-tagopt/.git/
-expecting success of 5525.1 'setup': 
-	test_commit test &&
-	setup_clone one &&
-	git config remote.remote_one.tagopt --no-tags &&
-	setup_clone two &&
-	git config remote.remote_two.tagopt --tags
-	
-[master (root-commit) 14f901a] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.t
-Cloning into bare repository 'one'...
-done.
-branch 'branch_one' set up to track 'origin/master'.
-Cloning into bare repository 'two'...
-done.
-branch 'branch_two' set up to track 'origin/master'.
-ok 1 - setup
-
-expecting success of 5525.2 'fetch with tagopt=--no-tags does not get tag': 
-	git fetch remote_one &&
-	test_must_fail git show-ref tag_one &&
-	git show-ref remote_one/branch_one
-	
-From one
- * [new branch]      branch_one -> remote_one/branch_one
- * [new branch]      master     -> remote_one/master
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/branch_one
-ok 2 - fetch with tagopt=--no-tags does not get tag
-
-expecting success of 5525.3 'fetch --tags with tagopt=--no-tags gets tag': 
-	(
-		cd one &&
-		git branch second_branch_one
-	) &&
-	git fetch --tags remote_one &&
-	git show-ref tag_one &&
-	git show-ref remote_one/second_branch_one
-	
-branch 'second_branch_one' set up to track 'origin/master'.
-From one
- * [new branch]      second_branch_one -> remote_one/second_branch_one
- * [new tag]         tag_one           -> tag_one
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_one
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/second_branch_one
-ok 3 - fetch --tags with tagopt=--no-tags gets tag
-
-expecting success of 5525.4 'fetch --no-tags with tagopt=--tags does not get tag': 
-	git fetch --no-tags remote_two &&
-	test_must_fail git show-ref tag_two &&
-	git show-ref remote_two/branch_two
-	
-From two
- * [new branch]      branch_two -> remote_two/branch_two
- * [new branch]      master     -> remote_two/master
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/branch_two
-ok 4 - fetch --no-tags with tagopt=--tags does not get tag
-
-expecting success of 5525.5 'fetch with tagopt=--tags gets tag': 
-	(
-		cd two &&
-		git branch second_branch_two
-	) &&
-	git fetch remote_two &&
-	git show-ref tag_two &&
-	git show-ref remote_two/second_branch_two
-	
-branch 'second_branch_two' set up to track 'origin/master'.
-From two
- * [new branch]      second_branch_two -> remote_two/second_branch_two
- * [new tag]         tag_two           -> tag_two
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_two
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/second_branch_two
-ok 5 - fetch with tagopt=--tags gets tag
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5521-pull-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/.git/
-expecting success of 5521.1 'setup': 
-	mkdir parent &&
-	(cd parent && git init &&
-	 echo one >file && git add file &&
-	 git commit -m one)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/parent/.git/
-[main (root-commit) 1993c08] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 5521.2 'git pull -q --no-rebase': 
-	mkdir clonedq &&
-	(cd clonedq && git init &&
-	git pull -q --no-rebase "../parent" >out 2>err &&
-	test_must_be_empty err &&
-	test_must_be_empty out)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedq/.git/
-ok 2 - git pull -q --no-rebase
-
-expecting success of 5521.3 'git pull -q --rebase': 
-	mkdir clonedqrb &&
-	(cd clonedqrb && git init &&
-	git pull -q --rebase "../parent" >out 2>err &&
-	test_must_be_empty err &&
-	test_must_be_empty out &&
-	git pull -q --rebase "../parent" >out 2>err &&
-	test_must_be_empty err &&
-	test_must_be_empty out)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedqrb/.git/
-ok 3 - git pull -q --rebase
-
-expecting success of 5521.4 'git pull --no-rebase': 
-	mkdir cloned &&
-	(cd cloned && git init &&
-	git pull --no-rebase "../parent" >out 2>err &&
-	test -s err &&
-	test_must_be_empty out)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/cloned/.git/
-ok 4 - git pull --no-rebase
-
-expecting success of 5521.5 'git pull --rebase': 
-	mkdir clonedrb &&
-	(cd clonedrb && git init &&
-	git pull --rebase "../parent" >out 2>err &&
-	test -s err &&
-	test_must_be_empty out)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedrb/.git/
-ok 5 - git pull --rebase
-
-expecting success of 5521.6 'git pull -v --no-rebase': 
-	mkdir clonedv &&
-	(cd clonedv && git init &&
-	git pull -v --no-rebase "../parent" >out 2>err &&
-	test -s err &&
-	test_must_be_empty out)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedv/.git/
-ok 6 - git pull -v --no-rebase
-
-expecting success of 5521.7 'git pull -v --rebase': 
-	mkdir clonedvrb &&
-	(cd clonedvrb && git init &&
-	git pull -v --rebase "../parent" >out 2>err &&
-	test -s err &&
-	test_must_be_empty out)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedvrb/.git/
-ok 7 - git pull -v --rebase
-
-expecting success of 5521.8 'git pull -v -q --no-rebase': 
-	mkdir clonedvq &&
-	(cd clonedvq && git init &&
-	git pull -v -q --no-rebase "../parent" >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedvq/.git/
-ok 8 - git pull -v -q --no-rebase
-
-expecting success of 5521.9 'git pull -q -v --no-rebase': 
-	mkdir clonedqv &&
-	(cd clonedqv && git init &&
-	git pull -q -v --no-rebase "../parent" >out 2>err &&
-	test_must_be_empty out &&
-	test -s err)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedqv/.git/
-ok 9 - git pull -q -v --no-rebase
-
-expecting success of 5521.10 'git pull --cleanup errors early on invalid argument': 
-	mkdir clonedcleanup &&
-	(cd clonedcleanup && git init &&
-	test_must_fail git pull --no-rebase --cleanup invalid "../parent" >out 2>err &&
-	test_must_be_empty out &&
-	test -s err)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedcleanup/.git/
-ok 10 - git pull --cleanup errors early on invalid argument
-
-expecting success of 5521.11 'git pull --no-write-fetch-head fails': 
-	mkdir clonedwfh &&
-	(cd clonedwfh && git init &&
-	test_expect_code 129 git pull --no-write-fetch-head "../parent" >out 2>err &&
-	test_must_be_empty out &&
-	test_grep "no-write-fetch-head" err)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedwfh/.git/
-error: unknown option `no-write-fetch-head'
-ok 11 - git pull --no-write-fetch-head fails
-
-expecting success of 5521.12 'git pull --force': 
-	mkdir clonedoldstyle &&
-	(cd clonedoldstyle && git init &&
-	cat >>.git/config <<-\EOF &&
-	[remote "one"]
-		url = ../parent
-		fetch = refs/heads/main:refs/heads/mirror
-	[remote "two"]
-		url = ../parent
-		fetch = refs/heads/main:refs/heads/origin
-	[branch "main"]
-		remote = two
-		merge = refs/heads/main
-	EOF
-	git pull two &&
-	test_commit A &&
-	git branch -f origin &&
-	git pull --no-rebase --all --force
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedoldstyle/.git/
-From ../parent
- * [new branch]      main       -> origin
-[main bda2e37] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Fetching one
-From ../parent
- * [new branch]      main       -> mirror
-Fetching two
-From ../parent
- + bda2e37...1993c08 main       -> origin  (forced update)
-Already up to date.
-ok 12 - git pull --force
-
-expecting success of 5521.13 'git pull --all': 
-	mkdir clonedmulti &&
-	(cd clonedmulti && git init &&
-	cat >>.git/config <<-\EOF &&
-	[remote "one"]
-		url = ../parent
-		fetch = refs/heads/*:refs/remotes/one/*
-	[remote "two"]
-		url = ../parent
-		fetch = refs/heads/*:refs/remotes/two/*
-	[branch "main"]
-		remote = one
-		merge = refs/heads/main
-	EOF
-	git pull --all
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedmulti/.git/
-Fetching one
-From ../parent
- * [new branch]      main       -> one/main
-Fetching two
-From ../parent
- * [new branch]      main       -> two/main
-ok 13 - git pull --all
-
-expecting success of 5521.14 'git pull --dry-run': 
-	test_when_finished "rm -rf clonedry" &&
-	git init clonedry &&
-	(
-		cd clonedry &&
-		git pull --dry-run ../parent &&
-		test_path_is_missing .git/FETCH_HEAD &&
-		test_ref_missing refs/heads/main &&
-		test_path_is_missing .git/index &&
-		test_path_is_missing file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedry/.git/
-From ../parent
- * branch            HEAD       -> FETCH_HEAD
-error: reference does not exist
-ok 14 - git pull --dry-run
-
-expecting success of 5521.15 'git pull --all --dry-run': 
-	test_when_finished "rm -rf cloneddry" &&
-	git init clonedry &&
-	(
-		cd clonedry &&
-		git remote add origin ../parent &&
-		git pull --all --dry-run &&
-		test_path_is_missing .git/FETCH_HEAD &&
-		test_ref_missing refs/remotes/origin/main &&
-		test_path_is_missing .git/index &&
-		test_path_is_missing file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedry/.git/
-From ../parent
- * [new branch]      main       -> origin/main
-error: reference does not exist
-ok 15 - git pull --all --dry-run
-
-expecting success of 5521.16 'git pull --allow-unrelated-histories': 
-	test_when_finished "rm -fr src dst" &&
-	git init src &&
-	(
-		cd src &&
-		test_commit one &&
-		test_commit two
-	) &&
-	git clone src dst &&
-	(
-		cd src &&
-		git checkout --orphan side HEAD^ &&
-		test_commit three
-	) &&
-	(
-		cd dst &&
-		test_must_fail git pull ../src side &&
-		git pull --no-rebase --allow-unrelated-histories ../src side
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Cloning into 'dst'...
-done.
-Switched to a new branch 'side'
-[side (root-commit) d8f6b98] three
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one.t
- create mode 100644 three.t
-From ../src
- * branch            side       -> 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.
-From ../src
- * branch            side       -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- three.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 16 - git pull --allow-unrelated-histories
-
-expecting success of 5521.17 'git pull does not add a sign-off line': 
-	test_when_finished "rm -fr src dst actual" &&
-	git init src &&
-	test_commit -C src one &&
-	git clone src dst &&
-	test_commit -C src two &&
-	git -C dst pull --no-ff &&
-	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
-	test_must_be_empty actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
-   d79ce16..139b20d  main       -> origin/main
- * [new tag]         two        -> two
-Merge made by the 'ort' strategy.
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 17 - git pull does not add a sign-off line
-
-expecting success of 5521.18 'git pull --no-signoff does not add sign-off line': 
-	test_when_finished "rm -fr src dst actual" &&
-	git init src &&
-	test_commit -C src one &&
-	git clone src dst &&
-	test_commit -C src two &&
-	git -C dst pull --no-signoff --no-ff &&
-	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
-	test_must_be_empty actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 00bbe3d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
-   4331c28..00bbe3d  main       -> origin/main
- * [new tag]         two        -> two
-Merge made by the 'ort' strategy.
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 18 - git pull --no-signoff does not add sign-off line
-
-expecting success of 5521.19 'git pull --signoff add a sign-off line': 
-	test_when_finished "rm -fr src dst expected actual" &&
-	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
-	git init src &&
-	test_commit -C src one &&
-	git clone src dst &&
-	test_commit -C src two &&
-	git -C dst pull --signoff --no-ff &&
-	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) 6f4b17f] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 5c4888c] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
-   6f4b17f..5c4888c  main       -> origin/main
- * [new tag]         two        -> two
-Merge made by the 'ort' strategy.
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 19 - git pull --signoff add a sign-off line
-
-expecting success of 5521.20 'git pull --no-signoff flag cancels --signoff flag': 
-	test_when_finished "rm -fr src dst actual" &&
-	git init src &&
-	test_commit -C src one &&
-	git clone src dst &&
-	test_commit -C src two &&
-	git -C dst pull --signoff --no-signoff --no-ff &&
-	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
-	test_must_be_empty actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) 06e07da] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 738d2f7] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
-   06e07da..738d2f7  main       -> origin/main
- * [new tag]         two        -> two
-Merge made by the 'ort' strategy.
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 20 - git pull --no-signoff flag cancels --signoff flag
-
-expecting success of 5521.21 'git pull --no-verify flag passed to merge': 
-	test_when_finished "rm -fr src dst actual" &&
-	git init src &&
-	test_commit -C src one &&
-	git clone src dst &&
-	test_hook -C dst commit-msg <<-\EOF &&
-	false
-	EOF
-	test_commit -C src two &&
-	git -C dst pull --no-ff --no-verify
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) 0ba3da9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 9f92fa5] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
-   0ba3da9..9f92fa5  main       -> origin/main
- * [new tag]         two        -> two
-Merge made by the 'ort' strategy.
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 21 - git pull --no-verify flag passed to merge
-
-expecting success of 5521.22 'git pull --no-verify --verify passed to merge': 
-	test_when_finished "rm -fr src dst actual" &&
-	git init src &&
-	test_commit -C src one &&
-	git clone src dst &&
-	test_hook -C dst commit-msg <<-\EOF &&
-	false
-	EOF
-	test_commit -C src two &&
-	test_must_fail git -C dst pull --no-ff --no-verify --verify
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) ac97c8d] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 4ae1176] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
-   ac97c8d..4ae1176  main       -> origin/main
- * [new tag]         two        -> two
-Not committing merge; use 'git commit' to complete the merge.
-ok 22 - git pull --no-verify --verify passed to merge
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5527-fetch-odd-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5527-fetch-odd-refs/long/.git/
-[main (root-commit) 92be28b] long
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 long.t
-[main c47af98] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.t
-ok 3 - try to create repo with absurdly long refname
-
-expecting success of 5527.4 'fetch handles extremely long refname': 
-	git fetch long refs/heads/*:refs/remotes/long/* &&
-	cat >expect <<-\EOF &&
-	long
-	main
-	EOF
-	git for-each-ref --format="%(subject)" refs/remotes/long \
-		--exclude=refs/remotes/long/HEAD >actual &&
-	test_cmp expect actual
-
-From long
- * [new branch]      0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000 -> long/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
- * [new branch]      main       -> long/main
- * [new tag]         long       -> long
- * [new tag]         main       -> main
-ok 4 - fetch handles extremely long refname
-
-expecting success of 5527.5 'push handles extremely long refname': 
-	git push long :refs/heads/$ref1440 &&
-	git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
-	echo main >expect &&
-	test_cmp expect actual
-
-To long
- - [deleted]         0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
-ok 5 - push handles extremely long refname
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5529-push-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5529-push-errors/.git/
-expecting success of 5529.1 'setup commits': 
-	test_commit one
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup commits
-
-expecting success of 5529.2 'setup remote': 
-	git init --bare remote.git &&
-	git remote add origin remote.git
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5529-push-errors/remote.git/
-ok 2 - setup remote
-
-expecting success of 5529.3 'setup fake receive-pack': 
-	FAKE_RP_ROOT=$(pwd) &&
-	export FAKE_RP_ROOT &&
-	write_script fake-rp <<-\EOF &&
-	echo yes >"$FAKE_RP_ROOT"/rp-ran
-	exit 1
-	EOF
-	git config remote.origin.receivepack "\"\$FAKE_RP_ROOT/fake-rp\""
-
-ok 3 - setup fake receive-pack
-
-expecting success of 5529.4 'detect missing branches early': 
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin missing &&
-	test_cmp expect rp-ran
-
-error: src refspec missing does not match any
-error: failed to push some refs to 'remote.git'
-ok 4 - detect missing branches early
-
-expecting success of 5529.5 'detect missing sha1 expressions early': 
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin main~2:main &&
-	test_cmp expect rp-ran
-
-error: src refspec main~2 does not match any
-error: failed to push some refs to 'remote.git'
-ok 5 - detect missing sha1 expressions early
-
-expecting success of 5529.6 'detect empty remote with existing local ref': 
-	test_must_fail git push "" main 2> stderr &&
-	grep "fatal: bad repository ${SQ}${SQ}" stderr
-
-fatal: bad repository ''
-ok 6 - detect empty remote with existing local ref
-
-expecting success of 5529.7 'detect empty remote with targeted refspec': 
-	test_must_fail git push "" HEAD:refs/heads/main 2> stderr &&
-	grep "fatal: bad repository ${SQ}${SQ}" stderr
-
-fatal: bad repository ''
-ok 7 - detect empty remote with targeted refspec
-
-expecting success of 5529.8 'detect ambiguous refs early': 
-	git branch foo &&
-	git tag foo &&
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin foo &&
-	test_cmp expect rp-ran
-
-error: src refspec foo matches more than one
-error: failed to push some refs to 'remote.git'
-ok 8 - detect ambiguous refs early
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5523-push-upstream.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/.git/
-expecting success of 5523.1 'setup bare parent': 
-	ensure_fresh_upstream &&
-	git remote add upstream parent
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-ok 1 - setup bare parent
-
-expecting success of 5523.2 'setup local commit': 
-	echo content >file &&
-	git add file &&
-	git commit -m one
-
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 2 - setup local commit
-
-expecting success of 5523.3 'push -u main:main': 
-	git push -u upstream main:main &&
-	check_config main upstream refs/heads/main
-
-To parent
- * [new branch]      main -> main
-branch 'main' set up to track 'upstream/main'.
-ok 3 - push -u main:main
-
-expecting success of 5523.4 'push -u main:other': 
-	git push -u upstream main:other &&
-	check_config main upstream refs/heads/other
-
-To parent
- * [new branch]      main -> other
-branch 'main' set up to track 'upstream/other'.
-ok 4 - push -u main:other
-
-expecting success of 5523.5 'push -u --dry-run main:otherX': 
-	git push -u --dry-run upstream main:otherX &&
-	check_config main upstream refs/heads/other
-
-To parent
- * [new branch]      main -> otherX
-Would set upstream of 'main' to 'otherX' of 'upstream'
-ok 5 - push -u --dry-run main:otherX
-
-expecting success of 5523.6 'push -u topic_2:topic_2': 
-	git branch topic_2 &&
-	git push -u upstream topic_2:topic_2 &&
-	check_config topic_2 upstream refs/heads/topic_2
-
-To parent
- * [new branch]      topic_2 -> topic_2
-branch 'topic_2' set up to track 'upstream/topic_2'.
-ok 6 - push -u topic_2:topic_2
-
-expecting success of 5523.7 'push -u topic_2:other2': 
-	git push -u upstream topic_2:other2 &&
-	check_config topic_2 upstream refs/heads/other2
-
-To parent
- * [new branch]      topic_2 -> other2
-branch 'topic_2' set up to track 'upstream/other2'.
-ok 7 - push -u topic_2:other2
-
-expecting success of 5523.8 'push -u :topic_2': 
-	git push -u upstream :topic_2 &&
-	check_config topic_2 upstream refs/heads/other2
-
-To parent
- - [deleted]         topic_2
-ok 8 - push -u :topic_2
-
-expecting success of 5523.9 'push -u --all(the same behavior with--branches)': 
-	git branch all1 &&
-	git branch all2 &&
-	git push -u --all &&
-	check_config all1 upstream refs/heads/all1 &&
-	check_config all2 upstream refs/heads/all2 &&
-	git config --get-regexp branch.all* > expect &&
-	git config --remove-section branch.all1 &&
-	git config --remove-section branch.all2 &&
-	git push -u --branches &&
-	check_config all1 upstream refs/heads/all1 &&
-	check_config all2 upstream refs/heads/all2 &&
-	git config --get-regexp branch.all* > actual &&
-	test_cmp expect actual
-
-To parent
- * [new branch]      all1 -> all1
- * [new branch]      all2 -> all2
- * [new branch]      topic_2 -> topic_2
-branch 'main' set up to track 'upstream/main'.
-branch 'all1' set up to track 'upstream/all1'.
-branch 'all2' set up to track 'upstream/all2'.
-branch 'topic_2' set up to track 'upstream/topic_2'.
-Everything up-to-date
-branch 'all1' set up to track 'upstream/all1'.
-branch 'all2' set up to track 'upstream/all2'.
-branch 'main' set up to track 'upstream/main'.
-branch 'topic_2' set up to track 'upstream/topic_2'.
-ok 9 - push -u --all(the same behavior with--branches)
-
-expecting success of 5523.10 'push -u HEAD': 
-	git checkout -b headbranch &&
-	git push -u upstream HEAD &&
-	check_config headbranch upstream refs/heads/headbranch
-
-Switched to a new branch 'headbranch'
-To parent
- * [new branch]      HEAD -> headbranch
-branch 'headbranch' set up to track 'upstream/headbranch'.
-ok 10 - push -u HEAD
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
-
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
-
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
-
-)
-prerequisite TTY ok
-expecting success of 5523.11 'progress messages go to tty': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u upstream main >out 2>err &&
-	test_grep "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
-ok 11 - progress messages go to tty
-
-expecting success of 5523.12 'progress messages do not go to non-tty': 
-	ensure_fresh_upstream &&
-
-	# skip progress messages, since stderr is non-tty
-	git push -u upstream main >out 2>err &&
-	test_grep ! "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-ok 12 - progress messages do not go to non-tty
-
-expecting success of 5523.13 'progress messages go to non-tty (forced)': 
-	ensure_fresh_upstream &&
-
-	# force progress messages to stderr, even though it is non-tty
-	git push -u --progress upstream main >out 2>err &&
-	test_grep "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-Writing objects:  33% (1/3)
Writing objects:  66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 220 bytes | 220.00 KiB/s, done.
-ok 13 - progress messages go to non-tty (forced)
-
-expecting success of 5523.14 'push -q suppresses progress': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u -q upstream main >out 2>err &&
-	test_grep ! "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-ok 14 - push -q suppresses progress
-
-expecting success of 5523.15 'push --no-progress suppresses progress': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u --no-progress upstream main >out 2>err &&
-	test_grep ! "Unpacking objects" err &&
-	test_grep ! "Writing objects" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-ok 15 - push --no-progress suppresses progress
-
-expecting success of 5523.16 'quiet push': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push --quiet --no-progress upstream main >output 2>&1 &&
-	test_must_be_empty output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-ok 16 - quiet push
-
-expecting success of 5523.17 'quiet push -u': 
-	ensure_fresh_upstream &&
-
-	test_terminal git push --quiet -u --no-progress upstream main >output 2>&1 &&
-	test_must_be_empty output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5523-push-upstream/parent/
-ok 17 - quiet push -u
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5411-proc-receive-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/.git/
-expecting success of 5411.1 'setup upstream and workbench': 
-		rm -rf upstream.git &&
-		rm -rf workbench &&
-		git init --bare upstream.git &&
-		git init workbench &&
-		create_commits_in workbench A B &&
-		(
-			cd workbench &&
-			# Try to make a stable fixed width for abbreviated commit ID,
-			# this fixed-width oid will be replaced with "<OID>".
-			git config core.abbrev 7 &&
-			git tag -m "v123" v123 $A &&
-			git remote add origin ../upstream.git &&
-			git push origin main &&
-			git update-ref refs/heads/main $A $B &&
-			git -C ../upstream.git update-ref \
-				refs/heads/main $A $B
-		) &&
-		TAG=$(git -C workbench rev-parse v123) &&
-
-		# setup pre-receive hook
-		test_hook --setup -C upstream.git pre-receive <<-\EOF &&
-		exec >&2
-		echo "# pre-receive hook"
-		while read old new ref
-		do
-			echo "pre-receive< $old $new $ref"
-		done
-		EOF
-
-		# setup post-receive hook
-		test_hook --setup -C upstream.git post-receive <<-\EOF &&
-		exec >&2
-		echo "# post-receive hook"
-		while read old new ref
-		do
-			echo "post-receive< $old $new $ref"
-		done
-		EOF
-
-		upstream=upstream.git
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/upstream.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/workbench/.git/
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-To ../upstream.git
- * [new branch]      main -> main
-ok 1 - setup upstream and workbench
-
-expecting success of 5411.2 'setup receive.procReceiveRefs': 
-	git -C "$upstream" config --add receive.procReceiveRefs refs/for
-
-ok 2 - setup receive.procReceiveRefs
-
-expecting success of 5411.3 'setup proc-receive hook': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic1" \
-		-r "option fall-through" \
-		-r "ok refs/for/main/topic2" \
-		-r "option refname refs/for/changes/23/123/1" \
-		-r "option new-oid $A" \
-		-r "ok refs/for/main/topic2" \
-		-r "option refname refs/for/changes/24/124/2" \
-		-r "option old-oid $B" \
-		-r "option new-oid $A" \
-		-r "option forced-update" \
-		-r "ng refs/for/next/topic target branch not exist"
-	EOF
-
-ok 3 - setup proc-receive hook
-
-expecting success of 5411.4 'proc-receive: report status v1': 
-	{
-		if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1"
-		then
-			printf "%s %s refs/heads/main\0report-status\n" \
-				$A $B | packetize_raw
-		else
-			printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \
-				$A $B | packetize_raw
-		fi &&
-		printf "%s %s refs/for/main/topic1\n" \
-			$ZERO_OID $A | packetize &&
-		printf "%s %s refs/heads/foo\n" \
-			$ZERO_OID $A | packetize &&
-		printf "%s %s refs/for/next/topic\n" \
-			$ZERO_OID $A | packetize &&
-		printf "%s %s refs/for/main/topic2\n" \
-			$ZERO_OID $A | packetize &&
-		printf 0000 &&
-		printf "" | git -C "$upstream" pack-objects --stdout
-	} | git receive-pack "$upstream" --stateless-rpc \
-	>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	# pre-receive hook
-	pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
-	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
-	pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
-	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
-	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
-	# proc-receive hook
-	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
-	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
-	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
-	proc-receive> ok refs/for/main/topic1
-	proc-receive> option fall-through
-	proc-receive> ok refs/for/main/topic2
-	proc-receive> option refname refs/for/changes/23/123/1
-	proc-receive> option new-oid <COMMIT-A>
-	proc-receive> ok refs/for/main/topic2
-	proc-receive> option refname refs/for/changes/24/124/2
-	proc-receive> option old-oid <COMMIT-B>
-	proc-receive> option new-oid <COMMIT-A>
-	proc-receive> option forced-update
-	proc-receive> ng refs/for/next/topic target branch not exist
-	000eunpack ok
-	0017ok refs/heads/main
-	001cok refs/for/main/topic1
-	0016ok refs/heads/foo
-	0033ng refs/for/next/topic target branch not exist
-	001cok refs/for/main/topic2
-	0000# post-receive hook
-	post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
-	post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
-	post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
-	post-receive< <ZERO-OID> <COMMIT-A> refs/for/changes/23/123/1
-	post-receive< <COMMIT-B> <COMMIT-A> refs/for/changes/24/124/2
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/for/main/topic1
-	<COMMIT-A> refs/heads/foo
-	<COMMIT-B> refs/heads/main
-	EOF
-
-ok 4 - proc-receive: report status v1
-
-expecting success of 5411.5 'setup upstream and workbench': 
-		rm -rf upstream.git &&
-		rm -rf workbench &&
-		git init --bare upstream.git &&
-		git init workbench &&
-		create_commits_in workbench A B &&
-		(
-			cd workbench &&
-			# Try to make a stable fixed width for abbreviated commit ID,
-			# this fixed-width oid will be replaced with "<OID>".
-			git config core.abbrev 7 &&
-			git tag -m "v123" v123 $A &&
-			git remote add origin ../upstream.git &&
-			git push origin main &&
-			git update-ref refs/heads/main $A $B &&
-			git -C ../upstream.git update-ref \
-				refs/heads/main $A $B
-		) &&
-		TAG=$(git -C workbench rev-parse v123) &&
-
-		# setup pre-receive hook
-		test_hook --setup -C upstream.git pre-receive <<-\EOF &&
-		exec >&2
-		echo "# pre-receive hook"
-		while read old new ref
-		do
-			echo "pre-receive< $old $new $ref"
-		done
-		EOF
-
-		# setup post-receive hook
-		test_hook --setup -C upstream.git post-receive <<-\EOF &&
-		exec >&2
-		echo "# post-receive hook"
-		while read old new ref
-		do
-			echo "post-receive< $old $new $ref"
-		done
-		EOF
-
-		upstream=upstream.git
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/upstream.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/workbench/.git/
-[main (root-commit) a3899a0] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 7763d60] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-To ../upstream.git
- * [new branch]      main -> main
-ok 5 - setup upstream and workbench
-
-expecting success of 5411.6 'git-push (builtin protocol)': 
-	git -C workbench push origin \
-		$B:refs/heads/main \
-		HEAD:refs/heads/next \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
-	>  * [new branch]      HEAD -> next
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 6 - git-push (builtin protocol)
-
-expecting success of 5411.7 'git-push --atomic (builtin protocol)': 
-	test_must_fail git -C workbench push --atomic origin \
-		main \
-		$B:refs/heads/next \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; }" \
-		-e "/^ ! / { p; }" \
-		<out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> To <URL/of/upstream.git>
-	>  ! [rejected]        main -> main (non-fast-forward)
-	>  ! [rejected]        <COMMIT-B> -> next (atomic push failed)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 7 - git-push --atomic (builtin protocol)
-
-expecting success of 5411.8 'non-fast-forward git-push (builtin protocol)': 
-	test_must_fail git \
-		-C workbench \
-		-c advice.pushUpdateRejected=false \
-		push origin \
-		main \
-		$B:refs/heads/next \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> next
-	>  ! [rejected]        main -> main (non-fast-forward)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	<COMMIT-B> refs/heads/next
-	EOF
-
-ok 8 - non-fast-forward git-push (builtin protocol)
-
-expecting success of 5411.9 'git-push -f (builtin protocol)': 
-	git -C workbench push -f origin \
-		refs/tags/v123 \
-		:refs/heads/next \
-		main \
-		main:refs/review/main/topic \
-		HEAD:refs/heads/a/b/c \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
-	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
-	> To <URL/of/upstream.git>
-	>  + <COMMIT-B>...<COMMIT-A> main -> main (forced update)
-	>  - [deleted]         next
-	>  * [new tag]         v123 -> v123
-	>  * [new reference]   main -> refs/review/main/topic
-	>  * [new branch]      HEAD -> a/b/c
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/a/b/c
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/review/main/topic
-	<TAG-v123> refs/tags/v123
-	EOF
-
-ok 9 - git-push -f (builtin protocol)
-
-expecting success of 5411.10 'cleanup (builtin protocol)': 
-	(
-		cd "$upstream" &&
-		git update-ref -d refs/review/main/topic &&
-		git update-ref -d refs/tags/v123 &&
-		git update-ref -d refs/heads/a/b/c
-	)
-
-ok 10 - cleanup (builtin protocol)
-
-expecting success of 5411.11 'git-push (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		$B:refs/heads/main \
-		HEAD:refs/heads/next \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
-	> *	HEAD:refs/heads/next	[new branch]
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 11 - git-push (builtin protocol/porcelain)
-
-expecting success of 5411.12 'git-push --atomic (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --atomic --porcelain origin \
-		main \
-		$B:refs/heads/next \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "s/^# GETTEXT POISON #//" \
-		-e "/^To / { p; }" \
-		-e "/^!/ { p; }" \
-		<out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> To <URL/of/upstream.git>
-	> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
-	> !	<COMMIT-B>:refs/heads/next	[rejected] (atomic push failed)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 12 - git-push --atomic (builtin protocol/porcelain)
-
-expecting success of 5411.13 'non-fast-forward git-push (builtin protocol/porcelain)': 
-	test_must_fail git \
-		-C workbench \
-		-c advice.pushUpdateRejected=false \
-		push --porcelain origin \
-		main \
-		$B:refs/heads/next \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	>  	<COMMIT-B>:refs/heads/next	<COMMIT-A>..<COMMIT-B>
-	> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	<COMMIT-B> refs/heads/next
-	EOF
-
-ok 13 - non-fast-forward git-push (builtin protocol/porcelain)
-
-expecting success of 5411.14 'git-push -f (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain -f origin \
-		refs/tags/v123 \
-		:refs/heads/next \
-		main \
-		main:refs/review/main/topic \
-		HEAD:refs/heads/a/b/c \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
-	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
-	> To <URL/of/upstream.git>
-	> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
-	> -	:refs/heads/next	[deleted]
-	> *	refs/tags/v123:refs/tags/v123	[new tag]
-	> *	refs/heads/main:refs/review/main/topic	[new reference]
-	> *	HEAD:refs/heads/a/b/c	[new branch]
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/a/b/c
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/review/main/topic
-	<TAG-v123> refs/tags/v123
-	EOF
-
-ok 14 - git-push -f (builtin protocol/porcelain)
-
-expecting success of 5411.15 'cleanup (builtin protocol/porcelain)': 
-	(
-		cd "$upstream" &&
-		git update-ref -d refs/review/main/topic &&
-		git update-ref -d refs/tags/v123 &&
-		git update-ref -d refs/heads/a/b/c
-	)
-
-ok 15 - cleanup (builtin protocol/porcelain)
-
-expecting success of 5411.16 'setup pre-receive hook (builtin protocol)': 
-	mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
-	test_hook -C "$upstream" --clobber pre-receive <<-\EOF
-	exit 1
-	EOF
-
-ok 16 - setup pre-receive hook (builtin protocol)
-
-expecting success of 5411.17 'git-push is declined (builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		$B:refs/heads/main \
-		HEAD:refs/heads/next \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	 ! [remote rejected] <COMMIT-B> -> main (pre-receive hook declined)
-	 ! [remote rejected] HEAD -> next (pre-receive hook declined)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-\EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 17 - git-push is declined (builtin protocol)
-
-expecting success of 5411.18 'cleanup (builtin protocol)': 
-	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
-
-ok 18 - cleanup (builtin protocol)
-
-expecting success of 5411.19 'setup pre-receive hook (builtin protocol/porcelain)': 
-	mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
-	test_hook -C "$upstream" --clobber pre-receive <<-\EOF
-	exit 1
-	EOF
-
-ok 19 - setup pre-receive hook (builtin protocol/porcelain)
-
-expecting success of 5411.20 'git-push is declined (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		$B:refs/heads/main \
-		HEAD:refs/heads/next \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> To <URL/of/upstream.git>
-	> !	<COMMIT-B>:refs/heads/main	[remote rejected] (pre-receive hook declined)
-	> !	HEAD:refs/heads/next	[remote rejected] (pre-receive hook declined)
-	Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 20 - git-push is declined (builtin protocol/porcelain)
-
-expecting success of 5411.21 'cleanup (builtin protocol/porcelain)': 
-	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
-
-ok 21 - cleanup (builtin protocol/porcelain)
-
-expecting success of 5411.22 'add two receive.procReceiveRefs settings': 
-	(
-		cd "$upstream" &&
-		git config --add receive.procReceiveRefs refs/for &&
-		git config --add receive.procReceiveRefs refs/review/
-	)
-
-ok 22 - add two receive.procReceiveRefs settings
-
-expecting success of 5411.23 'proc-receive: no hook, fail to push special ref (builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:next \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: error: cannot find hook "proc-receive"        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	>  * [new branch]      HEAD -> next
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 23 - proc-receive: no hook, fail to push special ref (builtin protocol)
-
-expecting success of 5411.24 'cleanup (builtin protocol)': 
-	git -C "$upstream" update-ref -d refs/heads/next
-
-ok 24 - cleanup (builtin protocol)
-
-expecting success of 5411.25 'proc-receive: no hook, all failed for atomic push (builtin protocol)': 
-	test_must_fail git -C workbench push --atomic origin \
-		$B:main \
-		HEAD:next \
-		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: error: cannot find hook "proc-receive"        Z
-	> To <URL/of/upstream.git>
-	>  ! [remote rejected] <COMMIT-B> -> main (fail to run proc-receive hook)
-	>  ! [remote rejected] HEAD -> next (fail to run proc-receive hook)
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 25 - proc-receive: no hook, all failed for atomic push (builtin protocol)
-
-expecting success of 5411.26 'proc-receive: no hook, fail to push special ref (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:next \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: error: cannot find hook "proc-receive"        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/heads/next	[new branch]
-	> !	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 26 - proc-receive: no hook, fail to push special ref (builtin protocol/porcelain)
-
-expecting success of 5411.27 'cleanup (builtin protocol/porcelain)': 
-	git -C "$upstream" update-ref -d refs/heads/next
-
-ok 27 - cleanup (builtin protocol/porcelain)
-
-expecting success of 5411.28 'proc-receive: no hook, all failed for atomic push (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain --atomic origin \
-		$B:main \
-		HEAD:next \
-		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: error: cannot find hook "proc-receive"        Z
-	> To <URL/of/upstream.git>
-	> !	<COMMIT-B>:refs/heads/main	[remote rejected] (fail to run proc-receive hook)
-	> !	HEAD:refs/heads/next	[remote rejected] (fail to run proc-receive hook)
-	> !	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 28 - proc-receive: no hook, all failed for atomic push (builtin protocol/porcelain)
-
-expecting success of 5411.29 'setup proc-receive hook (unknown version, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --version 2
-	EOF
-
-ok 29 - setup proc-receive hook (unknown version, builtin protocol)
-
-expecting success of 5411.30 'proc-receive: bad protocol (unknown version, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-
-	# Check status report for git-push
-	sed -n \
-		-e "/^To / { p; }" \
-		-e "/^ ! / { p; }" \
-		<actual >actual-report &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual-report &&
-
-	# Check error message from "receive-pack", but ignore unstable fatal error
-	# message ("remote: fatal: the remote end hung up unexpectedly") which
-	# is different from the remote HTTP server with different locale settings.
-	grep "^remote: error:" <actual >actual-error &&
-	format_and_save_expect <<-EOF &&
-	> remote: error: proc-receive version "2" is not supported        Z
-	EOF
-	test_cmp expect actual-error &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 30 - proc-receive: bad protocol (unknown version, builtin protocol)
-
-expecting success of 5411.31 'setup proc-receive hook (hook --die-read-version, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-read-version
-	EOF
-
-ok 31 - setup proc-receive hook (hook --die-read-version, builtin protocol)
-
-expecting success of 5411.32 'proc-receive: bad protocol (hook --die-read-version, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; }" \
-		-e "/^ ! / { p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
-	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-\EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-read-version option        
-remote: error: fail to negotiate version with proc-receive hook        
-ok 32 - proc-receive: bad protocol (hook --die-read-version, builtin protocol)
-
-expecting success of 5411.33 'setup proc-receive hook (hook --die-write-version, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-write-version
-	EOF
-
-ok 33 - setup proc-receive hook (hook --die-write-version, builtin protocol)
-
-expecting success of 5411.34 'proc-receive: bad protocol (hook --die-write-version, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; }" \
-		-e "/^ ! / { p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
-	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-write-version option        
-remote: error: fail to negotiate version with proc-receive hook        
-ok 34 - proc-receive: bad protocol (hook --die-write-version, builtin protocol)
-
-expecting success of 5411.35 'setup proc-receive hook (hook --die-read-commands, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-read-commands
-	EOF
-
-ok 35 - setup proc-receive hook (hook --die-read-commands, builtin protocol)
-
-expecting success of 5411.36 'proc-receive: bad protocol (hook --die-read-commands, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; }" \
-		-e "/^ ! / { p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-read-commands option        
-ok 36 - proc-receive: bad protocol (hook --die-read-commands, builtin protocol)
-
-expecting success of 5411.37 'setup proc-receive hook (hook --die-read-push-options, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-read-push-options
-	EOF
-
-ok 37 - setup proc-receive hook (hook --die-read-push-options, builtin protocol)
-
-expecting success of 5411.38 'proc-receive: bad protocol (hook --die-read-push-options, builtin protocol)': 
-	git -C "$upstream" config receive.advertisePushOptions true &&
-	test_must_fail git -C workbench push origin \
-		-o reviewers=user1,user2 \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; }" \
-		-e "/^ ! / { p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-read-push-options option        
-ok 38 - proc-receive: bad protocol (hook --die-read-push-options, builtin protocol)
-
-expecting success of 5411.39 'setup proc-receive hook (hook --die-write-report, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-write-report
-	EOF
-
-ok 39 - setup proc-receive hook (hook --die-write-report, builtin protocol)
-
-expecting success of 5411.40 'proc-receive: bad protocol (hook --die-write-report, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; }" \
-		-e "/^ ! / { p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-write-report option        
-ok 40 - proc-receive: bad protocol (hook --die-write-report, builtin protocol)
-
-expecting success of 5411.41 'setup proc-receive hook (no report, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v
-	EOF
-
-ok 41 - setup proc-receive hook (no report, builtin protocol)
-
-expecting success of 5411.42 'proc-receive: bad protocol (no report, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/heads/next \
-		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	>  * [new branch]      HEAD -> next
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 42 - proc-receive: bad protocol (no report, builtin protocol)
-
-expecting success of 5411.43 'cleanup (builtin protocol)': 
-	git -C "$upstream" update-ref -d refs/heads/next
-
-
-ok 43 - cleanup (builtin protocol)
-
-expecting success of 5411.44 'setup proc-receive hook (no ref, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok"
-	EOF
-
-ok 44 - setup proc-receive hook (no ref, builtin protocol)
-
-expecting success of 5411.45 'proc-receive: bad protocol (no ref, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic\
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok        Z
-	> remote: error: proc-receive reported incomplete status line: "ok"        Z
-	> To <URL/of/upstream.git>
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 45 - proc-receive: bad protocol (no ref, builtin protocol)
-
-expecting success of 5411.46 'setup proc-receive hook (unknown status, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "xx refs/for/main/topic"
-	EOF
-
-ok 46 - setup proc-receive hook (unknown status, builtin protocol)
-
-expecting success of 5411.47 'proc-receive: bad protocol (unknown status, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-			HEAD:refs/for/main/topic \
-			>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> xx refs/for/main/topic        Z
-	> remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"        Z
-	> To <URL/of/upstream.git>
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 47 - proc-receive: bad protocol (unknown status, builtin protocol)
-
-expecting success of 5411.48 'setup proc-receive hook (unknown version, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --version 2
-	EOF
-
-ok 48 - setup proc-receive hook (unknown version, builtin protocol/porcelain)
-
-expecting success of 5411.49 'proc-receive: bad protocol (unknown version, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-
-	# Check status report for git-push
-	sed -n \
-		-e "/^To / { p; n; p; n; p; }" \
-		<actual >actual-report &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	Done
-	EOF
-	test_cmp expect actual-report &&
-
-	# Check error message from "receive-pack", but ignore unstable fatal error
-	# message ("remote: fatal: the remote end hung up unexpectedly") which
-	# is different from the remote HTTP server with different locale settings.
-	grep "^remote: error:" <actual >actual-error &&
-	format_and_save_expect <<-EOF &&
-	> remote: error: proc-receive version "2" is not supported        Z
-	EOF
-	test_cmp expect actual-error &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 49 - proc-receive: bad protocol (unknown version, builtin protocol/porcelain)
-
-expecting success of 5411.50 'setup proc-receive hook (hook --die-read-version, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-read-version
-	EOF
-
-ok 50 - setup proc-receive hook (hook --die-read-version, builtin protocol/porcelain)
-
-expecting success of 5411.51 'proc-receive: bad protocol (hook --die-read-version, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; n; p; n; p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	Done
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
-	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-read-version option        
-remote: error: fail to negotiate version with proc-receive hook        
-ok 51 - proc-receive: bad protocol (hook --die-read-version, builtin protocol/porcelain)
-
-expecting success of 5411.52 'setup proc-receive hook (hook --die-write-version, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-write-version
-	EOF
-
-ok 52 - setup proc-receive hook (hook --die-write-version, builtin protocol/porcelain)
-
-expecting success of 5411.53 'proc-receive: bad protocol (hook --die-write-version, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; n; p; n; p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	Done
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
-	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-write-version option        
-remote: error: fail to negotiate version with proc-receive hook        
-ok 53 - proc-receive: bad protocol (hook --die-write-version, builtin protocol/porcelain)
-
-expecting success of 5411.54 'setup proc-receive hook (hook --die-read-commands, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-read-commands
-	EOF
-
-ok 54 - setup proc-receive hook (hook --die-read-commands, builtin protocol/porcelain)
-
-expecting success of 5411.55 'proc-receive: bad protocol (hook --die-read-commands, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; n; p; n; p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	Done
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-read-commands option        
-ok 55 - proc-receive: bad protocol (hook --die-read-commands, builtin protocol/porcelain)
-
-expecting success of 5411.56 'setup proc-receive hook (hook --die-read-push-options, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-read-push-options
-	EOF
-
-ok 56 - setup proc-receive hook (hook --die-read-push-options, builtin protocol/porcelain)
-
-expecting success of 5411.57 'proc-receive: bad protocol (hook --die-read-push-options, builtin protocol/porcelain)': 
-	git -C "$upstream" config receive.advertisePushOptions true &&
-	test_must_fail git -C workbench push --porcelain origin \
-		-o reviewers=user1,user2 \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; n; p; n; p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	Done
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-read-push-options option        
-ok 57 - proc-receive: bad protocol (hook --die-read-push-options, builtin protocol/porcelain)
-
-expecting success of 5411.58 'setup proc-receive hook (hook --die-write-report, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v --die-write-report
-	EOF
-
-ok 58 - setup proc-receive hook (hook --die-write-report, builtin protocol/porcelain)
-
-expecting success of 5411.59 'proc-receive: bad protocol (hook --die-write-report, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	filter_out_user_friendly_and_stable_output \
-		-e "/^To / { p; n; p; n; p; }" \
-		<out-$test_count >actual &&
-	cat >expect <<-EOF &&
-	To <URL/of/upstream.git>
-	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
-	Done
-	EOF
-	test_cmp expect actual &&
-	grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-remote: fatal: die with the --die-write-report option        
-ok 59 - proc-receive: bad protocol (hook --die-write-report, builtin protocol/porcelain)
-
-expecting success of 5411.60 'setup proc-receive hook (no report, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v
-	EOF
-
-ok 60 - setup proc-receive hook (no report, builtin protocol/porcelain)
-
-expecting success of 5411.61 'proc-receive: bad protocol (no report, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/heads/next \
-		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/heads/next	[new branch]
-	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 61 - proc-receive: bad protocol (no report, builtin protocol/porcelain)
-
-expecting success of 5411.62 'cleanup (builtin protocol/porcelain)': 
-	git -C "$upstream" update-ref -d refs/heads/next
-
-ok 62 - cleanup (builtin protocol/porcelain)
-
-expecting success of 5411.63 'setup proc-receive hook (no ref, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok"
-	EOF
-
-ok 63 - setup proc-receive hook (no ref, builtin protocol/porcelain)
-
-expecting success of 5411.64 'proc-receive: bad protocol (no ref, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic\
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok        Z
-	> remote: error: proc-receive reported incomplete status line: "ok"        Z
-	> To <URL/of/upstream.git>
-	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 64 - proc-receive: bad protocol (no ref, builtin protocol/porcelain)
-
-expecting success of 5411.65 'setup proc-receive hook (unknown status, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "xx refs/for/main/topic"
-	EOF
-
-ok 65 - setup proc-receive hook (unknown status, builtin protocol/porcelain)
-
-expecting success of 5411.66 'proc-receive: bad protocol (unknown status, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-			HEAD:refs/for/main/topic \
-			>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> xx refs/for/main/topic        Z
-	> remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"        Z
-	> To <URL/of/upstream.git>
-	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 66 - proc-receive: bad protocol (unknown status, builtin protocol/porcelain)
-
-expecting success of 5411.67 'setup proc-receive hook (ng, no message, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ng refs/for/main/topic"
-	EOF
-
-ok 67 - setup proc-receive hook (ng, no message, builtin protocol)
-
-expecting success of 5411.68 'proc-receive: fail to update (ng, no message, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ng refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (failed)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 68 - proc-receive: fail to update (ng, no message, builtin protocol)
-
-expecting success of 5411.69 'setup proc-receive hook (ng message, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ng refs/for/main/topic error msg"
-	EOF
-
-ok 69 - setup proc-receive hook (ng message, builtin protocol)
-
-expecting success of 5411.70 'proc-receive: fail to update (ng, with message, builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ng refs/for/main/topic error msg        Z
-	> To <URL/of/upstream.git>
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (error msg)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 70 - proc-receive: fail to update (ng, with message, builtin protocol)
-
-expecting success of 5411.71 'setup proc-receive hook (ng, no message, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ng refs/for/main/topic"
-	EOF
-
-ok 71 - setup proc-receive hook (ng, no message, builtin protocol/porcelain)
-
-expecting success of 5411.72 'proc-receive: fail to update (ng, no message, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ng refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	> !	HEAD:refs/for/main/topic	[remote rejected] (failed)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 72 - proc-receive: fail to update (ng, no message, builtin protocol/porcelain)
-
-expecting success of 5411.73 'setup proc-receive hook (ng message, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ng refs/for/main/topic error msg"
-	EOF
-
-ok 73 - setup proc-receive hook (ng message, builtin protocol/porcelain)
-
-expecting success of 5411.74 'proc-receive: fail to update (ng, with message, builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ng refs/for/main/topic error msg        Z
-	> To <URL/of/upstream.git>
-	> !	HEAD:refs/for/main/topic	[remote rejected] (error msg)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 74 - proc-receive: fail to update (ng, with message, builtin protocol/porcelain)
-
-expecting success of 5411.75 'setup proc-receive hook (unexpected ref, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/heads/main"
-	EOF
-
-ok 75 - setup proc-receive hook (unexpected ref, builtin protocol)
-
-expecting success of 5411.76 'proc-receive: report unexpected ref (builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		$B:refs/heads/main \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/heads/main        Z
-	> remote: error: proc-receive reported status on unexpected ref: refs/heads/main        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	EOF
-
-ok 76 - proc-receive: report unexpected ref (builtin protocol)
-
-expecting success of 5411.77 'cleanup (builtin protocol)': 
-	git -C "$upstream" update-ref refs/heads/main $A
-
-ok 77 - cleanup (builtin protocol)
-
-expecting success of 5411.78 'setup proc-receive hook (unexpected ref, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/heads/main"
-	EOF
-
-ok 78 - setup proc-receive hook (unexpected ref, builtin protocol/porcelain)
-
-expecting success of 5411.79 'proc-receive: report unexpected ref (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		$B:refs/heads/main \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/heads/main        Z
-	> remote: error: proc-receive reported status on unexpected ref: refs/heads/main        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> To <URL/of/upstream.git>
-	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
-	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/main
-	EOF
-
-ok 79 - proc-receive: report unexpected ref (builtin protocol/porcelain)
-
-expecting success of 5411.80 'cleanup (builtin protocol/porcelain)': 
-	git -C "$upstream" update-ref refs/heads/main $A
-
-ok 80 - cleanup (builtin protocol/porcelain)
-
-expecting success of 5411.81 'setup proc-receive hook (unexpected ref, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
-
-ok 81 - setup proc-receive hook (unexpected ref, builtin protocol)
-
-expecting success of 5411.82 'proc-receive: report unknown reference (builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/a/b/c/my/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: error: proc-receive reported status on unknown ref: refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  ! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status)
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 82 - proc-receive: report unknown reference (builtin protocol)
-
-expecting success of 5411.83 'setup proc-receive hook (unexpected ref, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
-
-ok 83 - setup proc-receive hook (unexpected ref, builtin protocol/porcelain)
-
-expecting success of 5411.84 'proc-receive: report unknown reference (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/a/b/c/my/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: error: proc-receive reported status on unknown ref: refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	> !	HEAD:refs/for/a/b/c/my/topic	[remote rejected] (proc-receive failed to report status)
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 84 - proc-receive: report unknown reference (builtin protocol/porcelain)
-
-expecting success of 5411.85 'setup proc-receive hook and disable push-options (builtin protocol)': 
-	git -C "$upstream" config receive.advertisePushOptions false &&
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
-
-ok 85 - setup proc-receive hook and disable push-options (builtin protocol)
-
-expecting success of 5411.86 'proc-receive: not support push options (builtin protocol)': 
-	test_must_fail git -C workbench push \
-		-o issue=123 \
-		-o reviewer=user1 \
-		origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	test_grep "fatal: the receiving end does not support push options" \
-		actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-fatal: the receiving end does not support push options
-ok 86 - proc-receive: not support push options (builtin protocol)
-
-expecting success of 5411.87 'enable push options (builtin protocol)': 
-	git -C "$upstream" config receive.advertisePushOptions true
-
-ok 87 - enable push options (builtin protocol)
-
-expecting success of 5411.88 'setup version=0 for proc-receive hook (builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		--version 0 \
-		-r "ok refs/for/main/topic"
-	EOF
-
-ok 88 - setup version=0 for proc-receive hook (builtin protocol)
-
-expecting success of 5411.89 'proc-receive: ignore push-options for version 0 (builtin protocol)': 
-	git -C workbench push \
-		--atomic \
-		-o issue=123 \
-		-o reviewer=user1 \
-		origin \
-		HEAD:refs/heads/next \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  * [new branch]      HEAD -> next
-	>  * [new reference]   HEAD -> refs/for/main/topic
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 89 - proc-receive: ignore push-options for version 0 (builtin protocol)
-
-expecting success of 5411.90 'restore proc-receive hook (builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
-
-ok 90 - restore proc-receive hook (builtin protocol)
-
-expecting success of 5411.91 'cleanup (builtin protocol)': 
-	git -C "$upstream" update-ref -d refs/heads/next
-
-ok 91 - cleanup (builtin protocol)
-
-expecting success of 5411.92 'proc-receive: push with options (builtin protocol)': 
-	git -C workbench push \
-		--atomic \
-		-o issue=123 \
-		-o reviewer=user1 \
-		origin \
-		HEAD:refs/heads/next \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive: atomic push_options        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive< issue=123        Z
-	> remote: proc-receive< reviewer=user1        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  * [new branch]      HEAD -> next
-	>  * [new reference]   HEAD -> refs/for/main/topic
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
-
-ok 92 - proc-receive: push with options (builtin protocol)
-
-expecting success of 5411.93 'cleanup (builtin protocol)': 
-	git -C "$upstream" update-ref -d refs/heads/next
-
-ok 93 - cleanup (builtin protocol)
-
-expecting success of 5411.94 'setup proc-receive hook and disable push-options (builtin protocol/porcelain)': 
-	git -C "$upstream" config receive.advertisePushOptions false &&
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
-
-ok 94 - setup proc-receive hook and disable push-options (builtin protocol/porcelain)
-
-expecting success of 5411.95 'proc-receive: not support push options (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push \
-		--porcelain \
-		-o issue=123 \
-		-o reviewer=user1 \
-		origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	test_grep "fatal: the receiving end does not support push options" \
-		actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
-
-fatal: the receiving end does not support push options
-ok 95 - proc-receive: not support push options (builtin protocol/porcelain)
-
-expecting success of 5411.96 'enable push options (builtin protocol/porcelain)': 
-	git -C "$upstream" config receive.advertisePushOptions true
-
-ok 96 - enable push options (builtin protocol/porcelain)
-
-expecting success of 5411.97 'setup version=0 for proc-receive hook (builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		--version 0 \
-		-r "ok refs/for/main/topic"
-	EOF
-
-ok 97 - setup version=0 for proc-receive hook (builtin protocol/porcelain)
-
-expecting success of 5411.98 'proc-receive: ignore push-options for version 0 (builtin protocol/porcelain)': 
-	git -C workbench push \
-		--porcelain \
-		--atomic \
-		-o issue=123 \
-		-o reviewer=user1 \
-		origin \
-		HEAD:refs/heads/next \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/heads/next	[new branch]
-	> *	HEAD:refs/for/main/topic	[new reference]
-	> Done
-	EOF
-	test_cmp expect actual &&
-
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
+Fetching drosophila
+From ../two
+ * [new branch]      another    -> drosophila/another
+ * [new branch]      main       -> drosophila/main
+ * [new branch]      side       -> drosophila/side
+ok 63 - update default (overridden, with funny whitespace)
 
-ok 98 - proc-receive: ignore push-options for version 0 (builtin protocol/porcelain)
+expecting success of 5505.64 'update (with remotes.default defined)': 
+	(
+		cd one &&
+		for b in $(git branch -r | grep -v HEAD)
+		do
+		git branch -r -d $b || exit 1
+		done &&
+		git config remotes.default "drosophila" &&
+		git remote update &&
+		git branch -r >output &&
+		test_cmp expect output
+	)
 
-expecting success of 5411.99 'restore proc-receive hook (builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
+Deleted remote-tracking branch drosophila/another (was 9d34b14).
+Deleted remote-tracking branch drosophila/main (was 9d34b14).
+Deleted remote-tracking branch drosophila/side (was 2ce9c50).
+Fetching drosophila
+From ../two
+ * [new branch]      another    -> drosophila/another
+ * [new branch]      main       -> drosophila/main
+ * [new branch]      side       -> drosophila/side
+ok 64 - update (with remotes.default defined)
 
-ok 99 - restore proc-receive hook (builtin protocol/porcelain)
+expecting success of 5505.65 '"remote show" does not show symbolic refs': 
+	git clone one three &&
+	(
+		cd three &&
+		git remote show origin >output &&
+		! grep "^ *HEAD$" < output &&
+		! grep -i stale < output
+	)
 
-expecting success of 5411.100 'cleanup (builtin protocol/porcelain)': 
-	git -C "$upstream" update-ref -d refs/heads/next
+Cloning into 'three'...
+done.
+ok 65 - "remote show" does not show symbolic refs
 
-ok 100 - cleanup (builtin protocol/porcelain)
+expecting success of 5505.66 'reject adding remote with an invalid name': 
+	test_must_fail git remote add some:url desired-name
 
-expecting success of 5411.101 'proc-receive: push with options (builtin protocol/porcelain)': 
-	git -C workbench push \
-		--porcelain \
-		--atomic \
-		-o issue=123 \
-		-o reviewer=user1 \
-		origin \
-		HEAD:refs/heads/next \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive: atomic push_options        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive< issue=123        Z
-	> remote: proc-receive< reviewer=user1        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/heads/next	[new branch]
-	> *	HEAD:refs/for/main/topic	[new reference]
-	> Done
-	EOF
-	test_cmp expect actual &&
+fatal: 'some:url' is not a valid remote name
+ok 66 - reject adding remote with an invalid name
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/next
-	EOF
+expecting success of 5505.67 'rename a remote': 
+	test_config_global remote.pushDefault origin &&
+	git clone one four &&
+	(
+		cd four &&
+		git config branch.main.pushRemote origin &&
+		GIT_TRACE2_EVENT=$(pwd)/trace \
+			git remote rename --progress origin upstream &&
+		test_region progress "Renaming remote references" trace &&
+		grep "pushRemote" .git/config &&
+		test -z "$(git for-each-ref refs/remotes/origin)" &&
+		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&
+		test "$(git rev-parse upstream/main)" = "$(git rev-parse main)" &&
+		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
+		test "$(git config branch.main.remote)" = "upstream" &&
+		test "$(git config branch.main.pushRemote)" = "upstream" &&
+		test "$(git config --global remote.pushDefault)" = "origin"
+	)
 
-ok 101 - proc-receive: push with options (builtin protocol/porcelain)
+Cloning into 'four'...
+done.
+Renaming remote references:  25% (1/4)
Renaming remote references:  50% (2/4)
Renaming remote references:  75% (3/4)
Renaming remote references: 100% (4/4)
Renaming remote references: 100% (4/4), done.
+warning: The global configuration remote.pushDefault in:
+	file:2
+now names the non-existent remote 'origin'
+{"event":"region_enter","sid":"20260314T133239.184854Z-H5c947e1c-P0002df68","thread":"main","time":"2026-03-14T13:32:39.185906Z","file":"progress.c","line":273,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_leave","sid":"20260314T133239.184854Z-H5c947e1c-P0002df68","thread":"main","time":"2026-03-14T13:32:39.187021Z","file":"progress.c","line":351,"repo":1,"t_rel":0.001117,"nesting":1,"category":"progress","label":"Renaming remote references"}
+	pushRemote = upstream
+ok 67 - rename a remote
 
-expecting success of 5411.102 'cleanup (builtin protocol/porcelain)': 
-	git -C "$upstream" update-ref -d refs/heads/next
+expecting success of 5505.68 'rename a remote renames repo remote.pushDefault': 
+	git clone one four.1 &&
+	(
+		cd four.1 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		grep pushDefault .git/config &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
+	)
 
-ok 102 - cleanup (builtin protocol/porcelain)
+Cloning into 'four.1'...
+done.
+	pushDefault = upstream
+ok 68 - rename a remote renames repo remote.pushDefault
 
-expecting success of 5411.103 'setup proc-receive hook (ok, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
+expecting success of 5505.69 'rename a remote renames repo remote.pushDefault but ignores global': 
+	test_config_global remote.pushDefault other &&
+	git clone one four.2 &&
+	(
+		cd four.2 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		test "$(git config --global remote.pushDefault)" = "other" &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
+	)
 
-ok 103 - setup proc-receive hook (ok, builtin protocol)
+Cloning into 'four.2'...
+done.
+ok 69 - rename a remote renames repo remote.pushDefault but ignores global
 
-expecting success of 5411.104 'proc-receive: ok (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  * [new reference]   HEAD -> refs/for/main/topic
-	EOF
-	test_cmp expect actual &&
+expecting success of 5505.70 'rename a remote renames repo remote.pushDefault but keeps global': 
+	test_config_global remote.pushDefault origin &&
+	git clone one four.3 &&
+	(
+		cd four.3 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		test "$(git config --global remote.pushDefault)" = "origin" &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
+	)
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+Cloning into 'four.3'...
+done.
+ok 70 - rename a remote renames repo remote.pushDefault but keeps global
 
-ok 104 - proc-receive: ok (builtin protocol)
+expecting success of 5505.71 'rename handles remote without fetch refspec': 
+	git clone --bare one no-refspec.git &&
+	# confirm assumption that bare clone does not create refspec
+	test_expect_code 5 \
+		git -C no-refspec.git config --unset-all remote.origin.fetch &&
+	git -C no-refspec.git config remote.origin.url >expect &&
+	git -C no-refspec.git remote rename origin foo &&
+	git -C no-refspec.git config remote.foo.url >actual &&
+	test_cmp expect actual
 
-expecting success of 5411.105 'setup proc-receive hook (ok, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic"
-	EOF
+Cloning into bare repository 'no-refspec.git'...
+done.
+ok 71 - rename handles remote without fetch refspec
 
-ok 105 - setup proc-receive hook (ok, builtin protocol/porcelain)
+expecting success of 5505.72 'rename does not update a non-default fetch refspec': 
+	git clone one four.one &&
+	(
+		cd four.one &&
+		git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
+		git remote rename origin upstream &&
+		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
+		git rev-parse -q origin/main
+	)
 
-expecting success of 5411.106 'proc-receive: ok (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/for/main/topic	[new reference]
-	> Done
-	EOF
-	test_cmp expect actual &&
+Cloning into 'four.one'...
+done.
+warning: Not updating non-default fetch refspec
+	+refs/heads/*:refs/heads/origin/*
+	Please update the configuration manually if necessary.
+6329a3ca5268a0b28a1dc29b602e8b72a0bc1b37
+ok 72 - rename does not update a non-default fetch refspec
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+expecting success of 5505.73 'rename a remote with name part of fetch spec': 
+	git clone one four.two &&
+	(
+		cd four.two &&
+		git remote rename origin remote &&
+		git remote rename remote upstream &&
+		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*"
+	)
 
-ok 106 - proc-receive: ok (builtin protocol/porcelain)
+Cloning into 'four.two'...
+done.
+ok 73 - rename a remote with name part of fetch spec
 
-expecting success of 5411.107 'setup proc-receive hook (option without matching ok, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $B"
-	EOF
+expecting success of 5505.74 'rename a remote with name prefix of other remote': 
+	git clone one four.three &&
+	(
+		cd four.three &&
+		git remote add o git://example.com/repo.git &&
+		git remote rename o upstream &&
+		test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
+	)
 
-ok 107 - setup proc-receive hook (option without matching ok, builtin protocol)
+Cloning into 'four.three'...
+done.
+ok 74 - rename a remote with name prefix of other remote
 
-expecting success of 5411.108 'proc-receive: report option without matching ok (builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: error: proc-receive reported "option" without a matching "ok/ng" directive        Z
-	> To <URL/of/upstream.git>
-	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
-	EOF
-	test_cmp expect actual
+expecting success of 5505.75 'rename succeeds with existing remote.<target>.prune': 
+	git clone one four.four &&
+	test_when_finished git config --global --unset remote.upstream.prune &&
+	git config --global remote.upstream.prune true &&
+	git -C four.four remote rename origin upstream
 
-ok 108 - proc-receive: report option without matching ok (builtin protocol)
+Cloning into 'four.four'...
+done.
+ok 75 - rename succeeds with existing remote.<target>.prune
 
-expecting success of 5411.109 'setup proc-receive hook (option refname, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head"
-	EOF
+expecting success of 5505.76 'remove a remote': 
+	test_config_global remote.pushDefault origin &&
+	git clone one four.five &&
+	(
+		cd four.five &&
+		git config branch.main.pushRemote origin &&
+		git remote remove origin &&
+		test -z "$(git for-each-ref refs/remotes/origin)" &&
+		test_must_fail git config branch.main.remote &&
+		test_must_fail git config branch.main.pushRemote &&
+		test "$(git config --global remote.pushDefault)" = "origin"
+	)
 
-ok 109 - setup proc-receive hook (option refname, builtin protocol)
+Cloning into 'four.five'...
+done.
+warning: The global configuration remote.pushDefault in:
+	file:2
+now names the non-existent remote 'origin'
+ok 76 - remove a remote
 
-expecting success of 5411.110 'proc-receive: report option refname (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
-	> To <URL/of/upstream.git>
-	>  * [new reference]   HEAD -> refs/pull/123/head
-	EOF
-	test_cmp expect actual
+expecting success of 5505.77 'remove a remote removes repo remote.pushDefault': 
+	git clone one four.five.1 &&
+	(
+		cd four.five.1 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test_must_fail git config --local remote.pushDefault
+	)
 
-ok 110 - proc-receive: report option refname (builtin protocol)
+Cloning into 'four.five.1'...
+done.
+ok 77 - remove a remote removes repo remote.pushDefault
 
-expecting success of 5411.111 'setup proc-receive hook (option refname and forced-update, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "option forced-update"
-	EOF
+expecting success of 5505.78 'remove a remote removes repo remote.pushDefault but ignores global': 
+	test_config_global remote.pushDefault other &&
+	git clone one four.five.2 &&
+	(
+		cd four.five.2 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test "$(git config --global remote.pushDefault)" = "other" &&
+		test_must_fail git config --local remote.pushDefault
+	)
 
-ok 111 - setup proc-receive hook (option refname and forced-update, builtin protocol)
+Cloning into 'four.five.2'...
+done.
+ok 78 - remove a remote removes repo remote.pushDefault but ignores global
 
-expecting success of 5411.112 'proc-receive: report option refname and forced-update (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
-	> To <URL/of/upstream.git>
-	>  * [new reference]   HEAD -> refs/pull/123/head
-	EOF
-	test_cmp expect actual
+expecting success of 5505.79 'remove a remote removes repo remote.pushDefault but keeps global': 
+	test_config_global remote.pushDefault origin &&
+	git clone one four.five.3 &&
+	(
+		cd four.five.3 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test "$(git config --global remote.pushDefault)" = "origin" &&
+		test_must_fail git config --local remote.pushDefault
+	)
 
-ok 112 - proc-receive: report option refname and forced-update (builtin protocol)
+Cloning into 'four.five.3'...
+done.
+ok 79 - remove a remote removes repo remote.pushDefault but keeps global
 
-expecting success of 5411.113 'setup proc-receive hook (option refname and old-oid, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $B"
-	EOF
+expecting success of 5505.80 'migrate a remote from named file in $GIT_DIR/remotes': 
+	git clone one five &&
+	origin_url=$(pwd)/one &&
+	(
+		cd five &&
+		git remote remove origin &&
+		mkdir -p .git/remotes &&
+		cat ../remotes_origin >.git/remotes/origin &&
+		git remote rename origin origin &&
+		test_path_is_missing .git/remotes/origin &&
+		test "$(git config remote.origin.url)" = "$origin_url" &&
+		cat >push_expected <<-\EOF &&
+		refs/heads/main:refs/heads/upstream
+		refs/heads/next:refs/heads/upstream2
+		EOF
+		cat >fetch_expected <<-\EOF &&
+		refs/heads/main:refs/heads/origin
+		refs/heads/next:refs/heads/origin2
+		EOF
+		git config --get-all remote.origin.push >push_actual &&
+		git config --get-all remote.origin.fetch >fetch_actual &&
+		test_cmp push_expected push_actual &&
+		test_cmp fetch_expected fetch_actual
+	)
 
-ok 113 - setup proc-receive hook (option refname and old-oid, builtin protocol)
+Cloning into 'five'...
+done.
+ok 80 - migrate a remote from named file in $GIT_DIR/remotes
 
-expecting success of 5411.114 'proc-receive: report option refname and old-oid (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-B>..<COMMIT-A>  HEAD -> refs/pull/123/head
-	EOF
-	test_cmp expect actual
+expecting success of 5505.81 'migrate a remote from named file in $GIT_DIR/branches': 
+	git clone --template= one six &&
+	origin_url=$(pwd)/one &&
+	(
+		cd six &&
+		git remote rm origin &&
+		mkdir .git/branches &&
+		echo "$origin_url#main" >.git/branches/origin &&
+		git remote rename origin origin &&
+		test_path_is_missing .git/branches/origin &&
+		test "$(git config remote.origin.url)" = "$origin_url" &&
+		test "$(git config remote.origin.fetch)" = "refs/heads/main:refs/heads/origin" &&
+		test "$(git config remote.origin.push)" = "HEAD:refs/heads/main"
+	)
 
-ok 114 - proc-receive: report option refname and old-oid (builtin protocol)
+Cloning into 'six'...
+done.
+ok 81 - migrate a remote from named file in $GIT_DIR/branches
 
-expecting success of 5411.115 'setup proc-receive hook (option old-oid, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $B"
-	EOF
+expecting success of 5505.82 'migrate a remote from named file in $GIT_DIR/branches (2)': 
+	git clone --template= one seven &&
+	(
+		cd seven &&
+		git remote rm origin &&
+		mkdir .git/branches &&
+		echo "quux#foom" > .git/branches/origin &&
+		git remote rename origin origin &&
+		test_path_is_missing .git/branches/origin &&
+		test "$(git config remote.origin.url)" = "quux" &&
+		test "$(git config remote.origin.fetch)" = "refs/heads/foom:refs/heads/origin" &&
+		test "$(git config remote.origin.push)" = "HEAD:refs/heads/foom"
+	)
 
-ok 115 - setup proc-receive hook (option old-oid, builtin protocol)
+Cloning into 'seven'...
+done.
+ok 82 - migrate a remote from named file in $GIT_DIR/branches (2)
 
-expecting success of 5411.116 'proc-receive: report option old-oid (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-B>..<COMMIT-A>  HEAD -> refs/for/main/topic
-	EOF
-	test_cmp expect actual
+expecting success of 5505.83 'remote prune to cause a dangling symref': 
+	git clone one eight &&
+	(
+		cd one &&
+		git checkout side2 &&
+		git branch -D main
+	) &&
+	(
+		cd eight &&
+		git remote prune origin
+	) >err 2>&1 &&
+	test_grep "has become dangling" err &&
 
-ok 116 - proc-receive: report option old-oid (builtin protocol)
+	: And the dangling symref will not cause other annoying errors &&
+	(
+		cd eight &&
+		git branch -a
+	) 2>err &&
+	! grep "points nowhere" err &&
+	(
+		cd eight &&
+		test_must_fail git branch nomore origin
+	) 2>err &&
+	test_grep "dangling symref" err
 
-expecting success of 5411.117 'setup proc-receive hook (option old-oid and new-oid, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+Cloning into 'eight'...
+done.
+Switched to branch 'side2'
+Deleted branch main (was 6329a3c).
+ refs/remotes/origin/HEAD has become dangling!
+* main
+  remotes/origin/side2
+warning: ignoring dangling symref refs/remotes/origin/HEAD
+ok 83 - remote prune to cause a dangling symref
 
-ok 117 - setup proc-receive hook (option old-oid and new-oid, builtin protocol)
+expecting success of 5505.84 'show empty remote': 
+	test_create_repo empty &&
+	git clone empty empty-clone &&
+	(
+		cd empty-clone &&
+		git remote show origin
+	)
 
-expecting success of 5411.118 'proc-receive: report option old-oid and new-oid (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
-	EOF
-	test_cmp expect actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5505-remote/empty/.git/
+Cloning into 'empty-clone'...
+warning: You appear to have cloned an empty repository.
+done.
+* remote origin
+  Fetch URL: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5505-remote/empty
+  Push  URL: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5505-remote/empty
+  HEAD branch: (unknown)
+  Local branch configured for 'git pull':
+    main merges with remote main
+ok 84 - show empty remote
 
-ok 118 - proc-receive: report option old-oid and new-oid (builtin protocol)
+expecting success of 5505.85 'remote set-branches requires a remote': 
+	test_must_fail git remote set-branches &&
+	test_must_fail git remote set-branches --add
 
-expecting success of 5411.119 'setup proc-receive hook (report with multiple rewrites, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/a/b/c/topic" \
-		-r "ok refs/for/next/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/124/head" \
-		-r "option old-oid $B" \
-		-r "option forced-update" \
-		-r "option new-oid $A"
-	EOF
+error: no remote specified
+usage: git remote set-branches <name> <branch>...
+   or: git remote set-branches --add <name> <branch>...
 
-ok 119 - setup proc-receive hook (report with multiple rewrites, builtin protocol)
+    --[no-]add            add branch
 
-expecting success of 5411.120 'proc-receive: report with multiple rewrites (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/next/topic \
-		HEAD:refs/for/a/b/c/topic \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/a/b/c/topic        Z
-	> remote: proc-receive> ok refs/for/next/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/124/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
-	> To <URL/of/upstream.git>
-	>  * [new reference]   HEAD -> refs/pull/123/head
-	>  * [new reference]   HEAD -> refs/for/a/b/c/topic
-	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/pull/124/head (forced update)
-	EOF
-	test_cmp expect actual &&
+error: no remote specified
+usage: git remote set-branches <name> <branch>...
+   or: git remote set-branches --add <name> <branch>...
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+    --[no-]add            add branch
 
-ok 120 - proc-receive: report with multiple rewrites (builtin protocol)
+ok 85 - remote set-branches requires a remote
 
-expecting success of 5411.121 'setup proc-receive hook (option without matching ok, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $B"
+expecting success of 5505.86 'remote set-branches': 
+	echo "+refs/heads/*:refs/remotes/scratch/*" >expect.initial &&
+	sort <<-\EOF >expect.add &&
+	+refs/heads/*:refs/remotes/scratch/*
+	+refs/heads/other:refs/remotes/scratch/other
 	EOF
-
-ok 121 - setup proc-receive hook (option without matching ok, builtin protocol/porcelain)
-
-expecting success of 5411.122 'proc-receive: report option without matching ok (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: error: proc-receive reported "option" without a matching "ok/ng" directive        Z
-	> To <URL/of/upstream.git>
-	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
-	> Done
+	sort <<-\EOF >expect.replace &&
+	+refs/heads/maint:refs/remotes/scratch/maint
+	+refs/heads/main:refs/remotes/scratch/main
+	+refs/heads/next:refs/remotes/scratch/next
 	EOF
-	test_cmp expect actual
-
-ok 122 - proc-receive: report option without matching ok (builtin protocol/porcelain)
-
-expecting success of 5411.123 'setup proc-receive hook (option refname, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head"
+	sort <<-\EOF >expect.add-two &&
+	+refs/heads/maint:refs/remotes/scratch/maint
+	+refs/heads/main:refs/remotes/scratch/main
+	+refs/heads/next:refs/remotes/scratch/next
+	+refs/heads/seen:refs/remotes/scratch/seen
+	+refs/heads/t/topic:refs/remotes/scratch/t/topic
+	EOF
+	sort <<-\EOF >expect.setup-ffonly &&
+	refs/heads/main:refs/remotes/scratch/main
+	+refs/heads/next:refs/remotes/scratch/next
+	EOF
+	sort <<-\EOF >expect.respect-ffonly &&
+	refs/heads/main:refs/remotes/scratch/main
+	+refs/heads/next:refs/remotes/scratch/next
+	+refs/heads/seen:refs/remotes/scratch/seen
 	EOF
 
-ok 123 - setup proc-receive hook (option refname, builtin protocol/porcelain)
+	git clone .git/ setbranches &&
+	(
+		cd setbranches &&
+		git remote rename origin scratch &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.initial &&
 
-expecting success of 5411.124 'proc-receive: report option refname (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/pull/123/head	[new reference]
-	> Done
-	EOF
-	test_cmp expect actual
+		git remote set-branches scratch --add other &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.add &&
 
-ok 124 - proc-receive: report option refname (builtin protocol/porcelain)
+		git remote set-branches scratch maint main next &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.replace &&
 
-expecting success of 5411.125 'setup proc-receive hook (option refname and forced-update, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "option forced-update"
-	EOF
+		git remote set-branches --add scratch seen t/topic &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.add-two &&
 
-ok 125 - setup proc-receive hook (option refname and forced-update, builtin protocol/porcelain)
+		git config --unset-all remote.scratch.fetch &&
+		git config remote.scratch.fetch \
+			refs/heads/main:refs/remotes/scratch/main &&
+		git config --add remote.scratch.fetch \
+			+refs/heads/next:refs/remotes/scratch/next &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.setup-ffonly &&
 
-expecting success of 5411.126 'proc-receive: report option refname and forced-update (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/pull/123/head	[new reference]
-	> Done
-	EOF
-	test_cmp expect actual
+		git remote set-branches --add scratch seen &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.respect-ffonly
+	) &&
+	test_cmp expect.initial actual.initial &&
+	test_cmp expect.add actual.add &&
+	test_cmp expect.replace actual.replace &&
+	test_cmp expect.add-two actual.add-two &&
+	test_cmp expect.setup-ffonly actual.setup-ffonly &&
+	test_cmp expect.respect-ffonly actual.respect-ffonly
 
-ok 126 - proc-receive: report option refname and forced-update (builtin protocol/porcelain)
+Cloning into 'setbranches'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 86 - remote set-branches
 
-expecting success of 5411.127 'setup proc-receive hook (option refname and old-oid, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $B"
-	EOF
+expecting success of 5505.87 'remote set-branches with --mirror': 
+	echo "+refs/*:refs/*" >expect.initial &&
+	echo "+refs/heads/main:refs/heads/main" >expect.replace &&
+	git clone --mirror .git/ setbranches-mirror &&
+	(
+		cd setbranches-mirror &&
+		git remote rename origin scratch &&
+		git config --get-all remote.scratch.fetch >../actual.initial &&
 
-ok 127 - setup proc-receive hook (option refname and old-oid, builtin protocol/porcelain)
+		git remote set-branches scratch heads/main &&
+		git config --get-all remote.scratch.fetch >../actual.replace
+	) &&
+	test_cmp expect.initial actual.initial &&
+	test_cmp expect.replace actual.replace
 
-expecting success of 5411.128 'proc-receive: report option refname and old-oid (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head        Z
-	> To <URL/of/upstream.git>
-	>  	HEAD:refs/pull/123/head	<COMMIT-B>..<COMMIT-A>
-	> Done
-	EOF
-	test_cmp expect actual
+Cloning into bare repository 'setbranches-mirror'...
+warning: You appear to have cloned an empty repository.
+done.
+warning: Not updating non-default fetch refspec
+	+refs/*:refs/*
+	Please update the configuration manually if necessary.
+ok 87 - remote set-branches with --mirror
 
-ok 128 - proc-receive: report option refname and old-oid (builtin protocol/porcelain)
+expecting success of 5505.88 'new remote': 
+	git remote add someremote foo &&
+	echo foo >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-expecting success of 5411.129 'setup proc-receive hook (option old-oid, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $B"
-	EOF
+ok 88 - new remote
 
-ok 129 - setup proc-receive hook (option old-oid, builtin protocol/porcelain)
+expecting success of 5505.89 'get-url on new remote': 
+	echo foo | get_url_test someremote &&
+	echo foo | get_url_test --all someremote &&
+	echo foo | get_url_test --push someremote &&
+	echo foo | get_url_test --push --all someremote
 
-expecting success of 5411.130 'proc-receive: report option old-oid (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  	HEAD:refs/for/main/topic	<COMMIT-B>..<COMMIT-A>
-	> Done
-	EOF
-	test_cmp expect actual
+ok 89 - get-url on new remote
 
-ok 130 - proc-receive: report option old-oid (builtin protocol/porcelain)
+expecting success of 5505.90 'remote set-url with locked config': 
+	test_when_finished "rm -f .git/config.lock" &&
+	git config --get-all remote.someremote.url >expect &&
+	>.git/config.lock &&
+	test_must_fail git remote set-url someremote baz &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-expecting success of 5411.131 'setup proc-receive hook (option old-oid and new-oid, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+error: could not lock config file .git/config: File exists
+fatal: could not set 'remote.someremote.url' to 'baz'
+ok 90 - remote set-url with locked config
 
-ok 131 - setup proc-receive hook (option old-oid and new-oid, builtin protocol/porcelain)
+expecting success of 5505.91 'remote set-url bar': 
+	git remote set-url someremote bar &&
+	echo bar >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-expecting success of 5411.132 'proc-receive: report option old-oid and new-oid (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
-	> Done
-	EOF
-	test_cmp expect actual
+ok 91 - remote set-url bar
 
-ok 132 - proc-receive: report option old-oid and new-oid (builtin protocol/porcelain)
+expecting success of 5505.92 'remote set-url baz bar': 
+	git remote set-url someremote baz bar &&
+	echo baz >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-expecting success of 5411.133 'setup proc-receive hook (report with multiple rewrites, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/a/b/c/topic" \
-		-r "ok refs/for/next/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/124/head" \
-		-r "option old-oid $B" \
-		-r "option forced-update" \
-		-r "option new-oid $A"
+ok 92 - remote set-url baz bar
 
-	EOF
+expecting success of 5505.93 'remote set-url zot bar': 
+	test_must_fail git remote set-url someremote zot bar &&
+	echo baz >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-ok 133 - setup proc-receive hook (report with multiple rewrites, builtin protocol/porcelain)
+fatal: No such URL found: bar
+ok 93 - remote set-url zot bar
 
-expecting success of 5411.134 'proc-receive: report with multiple rewrites (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/next/topic \
-		HEAD:refs/for/a/b/c/topic \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/a/b/c/topic        Z
-	> remote: proc-receive> ok refs/for/next/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/124/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/pull/123/head	[new reference]
-	> *	HEAD:refs/for/a/b/c/topic	[new reference]
-	> +	HEAD:refs/pull/124/head	<COMMIT-B>...<COMMIT-A> (forced update)
-	> Done
-	EOF
-	test_cmp expect actual &&
+expecting success of 5505.94 'remote set-url --push zot baz': 
+	test_must_fail git remote set-url --push someremote zot baz &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+fatal: No such URL found: baz
+ok 94 - remote set-url --push zot baz
 
-ok 134 - proc-receive: report with multiple rewrites (builtin protocol/porcelain)
+expecting success of 5505.95 'remote set-url --push zot': 
+	git remote set-url --push someremote zot &&
+	echo zot >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-expecting success of 5411.135 'setup proc-receive hook (ft, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option fall-through"
-	EOF
+ok 95 - remote set-url --push zot
 
-ok 135 - setup proc-receive hook (ft, builtin protocol)
+expecting success of 5505.96 'get-url with different urls': 
+	echo baz | get_url_test someremote &&
+	echo baz | get_url_test --all someremote &&
+	echo zot | get_url_test --push someremote &&
+	echo zot | get_url_test --push --all someremote
 
-expecting success of 5411.136 'proc-receive: fall through, let receive-pack to execute (builtin protocol)': 
-	git -C workbench push origin \
-		$B:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  * [new reference]   <COMMIT-B> -> refs/for/main/topic
-	EOF
-	test_cmp expect actual &&
+ok 96 - get-url with different urls
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/for/main/topic
-	<COMMIT-A> refs/heads/main
-	EOF
+expecting success of 5505.97 'remote set-url --push qux zot': 
+	git remote set-url --push someremote qux zot &&
+	echo qux >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-ok 136 - proc-receive: fall through, let receive-pack to execute (builtin protocol)
+ok 97 - remote set-url --push qux zot
 
-expecting success of 5411.137 'cleanup (builtin protocol)': 
-	git -C "$upstream" update-ref -d refs/for/main/topic
+expecting success of 5505.98 'remote set-url --push foo qu+x': 
+	git remote set-url --push someremote foo qu+x &&
+	echo foo >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-ok 137 - cleanup (builtin protocol)
+ok 98 - remote set-url --push foo qu+x
 
-expecting success of 5411.138 'setup proc-receive hook (fall-through, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option fall-through"
-	EOF
+expecting success of 5505.99 'remote set-url --push --add aaa': 
+	git remote set-url --push --add someremote aaa &&
+	echo foo >expect &&
+	echo aaa >>expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-ok 138 - setup proc-receive hook (fall-through, builtin protocol/porcelain)
+ok 99 - remote set-url --push --add aaa
 
-expecting success of 5411.139 'proc-receive: fall through, let receive-pack to execute (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		$B:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	> *	<COMMIT-B>:refs/for/main/topic	[new reference]
-	> Done
+expecting success of 5505.100 'get-url on multi push remote': 
+	echo foo | get_url_test --push someremote &&
+	get_url_test --push --all someremote <<-\EOF
+	foo
+	aaa
 	EOF
-	test_cmp expect actual &&
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/for/main/topic
-	<COMMIT-A> refs/heads/main
-	EOF
+ok 100 - get-url on multi push remote
 
-ok 139 - proc-receive: fall through, let receive-pack to execute (builtin protocol/porcelain)
+expecting success of 5505.101 'remote set-url --push bar aaa': 
+	git remote set-url --push someremote bar aaa &&
+	echo foo >expect &&
+	echo bar >>expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-expecting success of 5411.140 'cleanup (builtin protocol/porcelain)': 
-	git -C "$upstream" update-ref -d refs/for/main/topic
+ok 101 - remote set-url --push bar aaa
 
-ok 140 - cleanup (builtin protocol/porcelain)
+expecting success of 5505.102 'remote set-url --push --delete bar': 
+	git remote set-url --push --delete someremote bar &&
+	echo foo >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-expecting success of 5411.141 'setup git config for remote-tracking of special refs': 
-	(
-		cd workbench &&
-		if ! git config --get-all remote.origin.fetch | grep refs/for/
-		then
-			git config --add remote.origin.fetch \
-				"+refs/for/*:refs/t/for/*" &&
-			git config --add remote.origin.fetch \
-				"+refs/pull/*:refs/t/pull/*" &&
-			git config --add remote.origin.fetch \
-				"+refs/changes/*:refs/t/changes/*"
-		fi
-	)
+ok 102 - remote set-url --push --delete bar
 
-ok 141 - setup git config for remote-tracking of special refs
+expecting success of 5505.103 'remote set-url --push --delete foo': 
+	git remote set-url --push --delete someremote foo &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-expecting success of 5411.142 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/24/124/1" \
-		-r "option old-oid $ZERO_OID" \
-		-r "option new-oid $A" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/25/125/1" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+ok 103 - remote set-url --push --delete foo
 
-ok 142 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol)
+expecting success of 5505.104 'remote set-url --add bbb': 
+	git remote set-url --add someremote bbb &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	echo bbb >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-expecting success of 5411.143 'proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/24/124/1        Z
-	> remote: proc-receive> option old-oid <ZERO-OID>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/25/125/1        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
-	>  * [new reference]   HEAD -> refs/changes/24/124/1
-	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/changes/25/125/1
-	EOF
-	test_cmp expect actual &&
+ok 104 - remote set-url --add bbb
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
+expecting success of 5505.105 'get-url on multi fetch remote': 
+	echo baz | get_url_test someremote &&
+	get_url_test --all someremote <<-\EOF
+	baz
+	bbb
 	EOF
 
-ok 143 - proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol)
+ok 105 - get-url on multi fetch remote
 
-expecting success of 5411.144 'proc-receive: check remote-tracking #1 (builtin protocol)': 
-	git -C workbench show-ref |
-		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/t/changes/24/124/1
-	<COMMIT-B> refs/t/changes/25/125/1
-	<COMMIT-B> refs/t/for/main/topic
-	EOF
-	test_cmp expect actual &&
-	git -C workbench update-ref -d refs/t/for/main/topic &&
-	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
-	git -C workbench update-ref -d refs/t/changes/25/125/1
+expecting success of 5505.106 'remote set-url --delete .*': 
+	test_must_fail git remote set-url --delete someremote .\* &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	echo bbb >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-ok 144 - proc-receive: check remote-tracking #1 (builtin protocol)
+fatal: Will not delete all non-push URLs
+ok 106 - remote set-url --delete .*
 
-expecting success of 5411.145 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/24/124/1" \
-		-r "option old-oid $ZERO_OID" \
-		-r "option new-oid $A" \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/25/125/1" \
-		-r "option old-oid $B" \
-		-r "option new-oid $A" \
-		-r "option forced-update"
-	EOF
+expecting success of 5505.107 'remote set-url --delete bbb': 
+	git remote set-url --delete someremote bbb &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-ok 145 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol)
+ok 107 - remote set-url --delete bbb
 
-expecting success of 5411.146 'proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/24/124/1        Z
-	> remote: proc-receive> option old-oid <ZERO-OID>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/25/125/1        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1        Z
-	> To <URL/of/upstream.git>
-	>  * [new reference]   HEAD -> refs/changes/24/124/1
-	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
-	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/changes/25/125/1 (forced update)
-	EOF
-	test_cmp expect actual &&
+expecting success of 5505.108 'remote set-url --delete baz': 
+	test_must_fail git remote set-url --delete someremote baz &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+fatal: Will not delete all non-push URLs
+ok 108 - remote set-url --delete baz
 
-ok 146 - proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol)
+expecting success of 5505.109 'remote set-url --add ccc': 
+	git remote set-url --add someremote ccc &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	echo ccc >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-expecting success of 5411.147 'proc-receive: check remote-tracking #2 (builtin protocol)': 
-	git -C workbench show-ref |
-		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/t/changes/24/124/1
-	<COMMIT-A> refs/t/changes/25/125/1
-	<COMMIT-B> refs/t/for/main/topic
-	EOF
-	test_cmp expect actual &&
-	git -C workbench update-ref -d refs/t/for/main/topic &&
-	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
-	git -C workbench update-ref -d refs/t/changes/25/125/1
+ok 109 - remote set-url --add ccc
 
-ok 147 - proc-receive: check remote-tracking #2 (builtin protocol)
+expecting success of 5505.110 'remote set-url --delete baz': 
+	git remote set-url --delete someremote baz &&
+	echo "YYY" >expect &&
+	echo ccc >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
 
-expecting success of 5411.148 'setup proc-receive hook (multiple rewrites for one ref, builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/23/123/1" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/24/124/2" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+ok 110 - remote set-url --delete baz
 
-ok 148 - setup proc-receive hook (multiple rewrites for one ref, builtin protocol)
+expecting success of 5505.111 'extra args: setup': 
+	# add a dummy origin so that this does not trigger failure
+	git remote add origin .
 
-expecting success of 5411.149 'proc-receive: multiple rewrites for one ref (builtin protocol)': 
-	git -C workbench push origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/23/123/1        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/24/124/2        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2        Z
-	> To <URL/of/upstream.git>
-	>  * [new reference]   HEAD -> refs/changes/23/123/1
-	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/changes/24/124/2
-	EOF
-	test_cmp expect actual &&
+ok 111 - extra args: setup
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+expecting success of 5505.112 'extra args: add nick url': 
+		test_must_fail git remote add nick url bogus_extra_arg 2>actual &&
+		test_grep '^usage:' actual
+	
+usage: git remote add [<options>] <name> <url>
+ok 112 - extra args: add nick url
 
-ok 149 - proc-receive: multiple rewrites for one ref (builtin protocol)
+expecting success of 5505.113 'extra args: rename origin newname': 
+		test_must_fail git remote rename origin newname bogus_extra_arg 2>actual &&
+		test_grep '^usage:' actual
+	
+usage: git remote rename [--[no-]progress] <old> <new>
+ok 113 - extra args: rename origin newname
 
-expecting success of 5411.150 'proc-receive: check remote-tracking #3 (builtin protocol)': 
-	git -C workbench show-ref |
-		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/t/changes/23/123/1
-	<COMMIT-B> refs/t/changes/24/124/2
-	EOF
-	test_cmp expect actual &&
-	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
-	git -C workbench update-ref -d refs/t/changes/25/125/2
+expecting success of 5505.114 'extra args: remove origin': 
+		test_must_fail git remote remove origin bogus_extra_arg 2>actual &&
+		test_grep '^usage:' actual
+	
+usage: git remote remove <name>
+ok 114 - extra args: remove origin
 
-ok 150 - proc-receive: check remote-tracking #3 (builtin protocol)
+expecting success of 5505.115 'extra args: set-head origin main': 
+		test_must_fail git remote set-head origin main bogus_extra_arg 2>actual &&
+		test_grep '^usage:' actual
+	
+usage: git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
+ok 115 - extra args: set-head origin main
 
-expecting success of 5411.151 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/24/124/1" \
-		-r "option old-oid $ZERO_OID" \
-		-r "option new-oid $A" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/25/125/1" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+expecting success of 5505.116 'extra args: get-url origin newurl': 
+		test_must_fail git remote get-url origin newurl bogus_extra_arg 2>actual &&
+		test_grep '^usage:' actual
+	
+usage: git remote get-url [--push] [--all] <name>
+ok 116 - extra args: get-url origin newurl
 
-ok 151 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol/porcelain)
+expecting success of 5505.117 'extra args: set-url origin newurl oldurl': 
+		test_must_fail git remote set-url origin newurl oldurl bogus_extra_arg 2>actual &&
+		test_grep '^usage:' actual
+	
+usage: git remote set-url [--push] <name> <newurl> [<oldurl>]
+ok 117 - extra args: set-url origin newurl oldurl
 
-expecting success of 5411.152 'proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/24/124/1        Z
-	> remote: proc-receive> option old-oid <ZERO-OID>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/25/125/1        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1        Z
-	> To <URL/of/upstream.git>
-	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
-	> *	HEAD:refs/changes/24/124/1	[new reference]
-	>  	HEAD:refs/changes/25/125/1	<COMMIT-A>..<COMMIT-B>
-	> Done
-	EOF
-	test_cmp expect actual &&
+expecting success of 5505.118 'add remote matching the "insteadOf" URL': 
+	git config url.xyz@example.com.insteadOf backup &&
+	git remote add backup xyz@example.com
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+ok 118 - add remote matching the "insteadOf" URL
 
-ok 152 - proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol/porcelain)
+expecting success of 5505.119 'unqualified <dst> refspec DWIM and advice': 
+	test_when_finished "(cd test && git tag -d some-tag)" &&
+	(
+		cd test &&
+		git tag -a -m "Some tag" some-tag main &&
+		for type in commit tag tree blob
+		do
+			if test "$type" = "blob"
+			then
+				oid=$(git rev-parse some-tag:file)
+			else
+				oid=$(git rev-parse some-tag^{$type})
+			fi &&
+			test_must_fail git push origin $oid:dst 2>err &&
+			test_grep "error: The destination you" err &&
+			test_grep "hint: Did you mean" err &&
+			test_must_fail git -c advice.pushUnqualifiedRefName=false \
+				push origin $oid:dst 2>err &&
+			test_grep "error: The destination you" err &&
+			test_grep ! "hint: Did you mean" err ||
+			exit 1
+		done
+	)
 
-expecting success of 5411.153 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/24/124/1" \
-		-r "option old-oid $ZERO_OID" \
-		-r "option new-oid $A" \
-		-r "ok refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/25/125/1" \
-		-r "option old-oid $B" \
-		-r "option new-oid $A" \
-		-r "option forced-update"
-	EOF
+error: The destination you provided is not a full refname (i.e.,
+hint: Did you mean to create a new branch by pushing to
+error: The destination you provided is not a full refname (i.e.,
+error: The destination you provided is not a full refname (i.e.,
+hint: Did you mean to create a new tag by pushing to
+error: The destination you provided is not a full refname (i.e.,
+error: The destination you provided is not a full refname (i.e.,
+hint: Did you mean to tag a new tree by pushing to
+error: The destination you provided is not a full refname (i.e.,
+error: The destination you provided is not a full refname (i.e.,
+hint: Did you mean to tag a new blob by pushing to
+error: The destination you provided is not a full refname (i.e.,
+Deleted tag 'some-tag' (was 87c70a4)
+ok 119 - unqualified <dst> refspec DWIM and advice
 
-ok 153 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol/porcelain)
+expecting success of 5505.120 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice': 
+	(
+		cd two &&
+		git tag -a -m "Some tag" my-tag main &&
+		git update-ref refs/trees/my-head-tree HEAD^{tree} &&
+		git update-ref refs/blobs/my-file-blob HEAD:file
+	) &&
+	(
+		cd test &&
+		git config --add remote.two.fetch "+refs/tags/*:refs/remotes/tags-from-two/*" &&
+		git config --add remote.two.fetch "+refs/trees/*:refs/remotes/trees-from-two/*" &&
+		git config --add remote.two.fetch "+refs/blobs/*:refs/remotes/blobs-from-two/*" &&
+		git fetch --no-tags two &&
 
-expecting success of 5411.154 'proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/24/124/1        Z
-	> remote: proc-receive> option old-oid <ZERO-OID>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/25/125/1        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/changes/24/124/1	[new reference]
-	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
-	> +	HEAD:refs/changes/25/125/1	<COMMIT-B>...<COMMIT-A> (forced update)
-	> Done
-	EOF
-	test_cmp expect actual &&
+		test_must_fail git push origin refs/remotes/two/another:dst 2>err &&
+		test_grep "error: The destination you" err &&
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+		test_must_fail git push origin refs/remotes/tags-from-two/my-tag:dst-tag 2>err &&
+		test_grep "error: The destination you" err &&
 
-ok 154 - proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol/porcelain)
+		test_must_fail git push origin refs/remotes/trees-from-two/my-head-tree:dst-tree 2>err &&
+		test_grep "error: The destination you" err &&
 
-expecting success of 5411.155 'setup proc-receive hook (multiple rewrites for one ref, builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/23/123/1" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/changes/24/124/2" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+		test_must_fail git push origin refs/remotes/blobs-from-two/my-file-blob:dst-blob 2>err &&
+		test_grep "error: The destination you" err
+	)
 
-ok 155 - setup proc-receive hook (multiple rewrites for one ref, builtin protocol/porcelain)
+From ../two
+ * [new tag]         my-tag                  -> tags-from-two/my-tag
+ * [new ref]         refs/trees/my-head-tree -> trees-from-two/my-head-tree
+ * [new ref]         refs/blobs/my-file-blob -> blobs-from-two/my-file-blob
+error: The destination you provided is not a full refname (i.e.,
+error: The destination you provided is not a full refname (i.e.,
+error: The destination you provided is not a full refname (i.e.,
+error: The destination you provided is not a full refname (i.e.,
+ok 120 - refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice
 
-expecting success of 5411.156 'proc-receive: multiple rewrites for one ref (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain origin \
-		HEAD:refs/for/main/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/23/123/1        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/changes/24/124/2        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2        Z
-	> To <URL/of/upstream.git>
-	> *	HEAD:refs/changes/23/123/1	[new reference]
-	>  	HEAD:refs/changes/24/124/2	<COMMIT-A>..<COMMIT-B>
-	> Done
+expecting success of 5505.121 'empty config clears remote.*.url list': 
+	test_when_finished "git config --remove-section remote.multi" &&
+	git config --add remote.multi.url wrong-one &&
+	git config --add remote.multi.url wrong-two &&
+	git -c remote.multi.url= \
+	    -c remote.multi.url=right-one \
+	    -c remote.multi.url=right-two \
+	    remote show -n multi >actual.raw &&
+	grep URL actual.raw >actual &&
+	cat >expect <<-\EOF &&
+	  Fetch URL: right-one
+	  Push  URL: right-one
+	  Push  URL: right-two
 	EOF
-	test_cmp expect actual &&
+	test_cmp expect actual
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
+ok 121 - empty config clears remote.*.url list
+
+expecting success of 5505.122 'empty config clears remote.*.pushurl list': 
+	test_when_finished "git config --remove-section remote.multi" &&
+	git config --add remote.multi.url right &&
+	git config --add remote.multi.url will-be-ignored &&
+	git config --add remote.multi.pushurl wrong-push-one &&
+	git config --add remote.multi.pushurl wrong-push-two &&
+	git -c remote.multi.pushurl= \
+	    -c remote.multi.pushurl=right-push-one \
+	    -c remote.multi.pushurl=right-push-two \
+	    remote show -n multi >actual.raw &&
+	grep URL actual.raw >actual &&
+	cat >expect <<-\EOF &&
+	  Fetch URL: right
+	  Push  URL: right-push-one
+	  Push  URL: right-push-two
 	EOF
+	test_cmp expect actual
 
-ok 156 - proc-receive: multiple rewrites for one ref (builtin protocol/porcelain)
+ok 122 - empty config clears remote.*.pushurl list
 
-expecting success of 5411.157 'setup proc-receive hook (builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/next/topic2" \
-		-r "ng refs/for/next/topic1 fail to call Web API" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+# still have 1 known breakage(s)
+# passed all remaining 121 test(s)
+1..122
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5521-pull-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/.git/
+expecting success of 5521.1 'setup': 
+	mkdir parent &&
+	(cd parent && git init &&
+	 echo one >file && git add file &&
+	 git commit -m one)
 
-ok 157 - setup proc-receive hook (builtin protocol)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/parent/.git/
+[main (root-commit) 1993c08] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
 
-expecting success of 5411.158 'proc-receive: report update of mixed refs (builtin protocol)': 
-	test_must_fail git -C workbench push origin \
-		$B:refs/heads/main \
-		HEAD:refs/heads/bar \
-		HEAD:refs/heads/baz \
-		HEAD:refs/for/next/topic2 \
-		HEAD:refs/for/next/topic1 \
-		HEAD:refs/heads/foo \
-		HEAD:refs/for/main/topic \
-		HEAD:refs/for/next/topic3 \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
-	> remote: proc-receive> ok refs/for/next/topic2        Z
-	> remote: proc-receive> ng refs/for/next/topic1 fail to call Web API        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
-	>  * [new branch]      HEAD -> bar
-	>  * [new branch]      HEAD -> baz
-	>  * [new reference]   HEAD -> refs/for/next/topic2
-	>  * [new branch]      HEAD -> foo
-	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
-	>  ! [remote rejected] HEAD -> refs/for/next/topic1 (fail to call Web API)
-	>  ! [remote rejected] HEAD -> refs/for/next/topic3 (proc-receive failed to report status)
-	EOF
-	test_cmp expect actual &&
+expecting success of 5521.2 'git pull -q --no-rebase': 
+	mkdir clonedq &&
+	(cd clonedq && git init &&
+	git pull -q --no-rebase "../parent" >out 2>err &&
+	test_must_be_empty err &&
+	test_must_be_empty out)
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/bar
-	<COMMIT-A> refs/heads/baz
-	<COMMIT-A> refs/heads/foo
-	<COMMIT-B> refs/heads/main
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedq/.git/
+ok 2 - git pull -q --no-rebase
 
-ok 158 - proc-receive: report update of mixed refs (builtin protocol)
+expecting success of 5521.3 'git pull -q --rebase': 
+	mkdir clonedqrb &&
+	(cd clonedqrb && git init &&
+	git pull -q --rebase "../parent" >out 2>err &&
+	test_must_be_empty err &&
+	test_must_be_empty out &&
+	git pull -q --rebase "../parent" >out 2>err &&
+	test_must_be_empty err &&
+	test_must_be_empty out)
 
-expecting success of 5411.159 'cleanup (builtin protocol)': 
-	(
-		cd "$upstream" &&
-		git update-ref refs/heads/main $A &&
-		git update-ref -d refs/heads/foo &&
-		git update-ref -d refs/heads/bar &&
-		git update-ref -d refs/heads/baz
-	)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedqrb/.git/
+ok 3 - git pull -q --rebase
 
-ok 159 - cleanup (builtin protocol)
+expecting success of 5521.4 'git pull --no-rebase': 
+	mkdir cloned &&
+	(cd cloned && git init &&
+	git pull --no-rebase "../parent" >out 2>err &&
+	test -s err &&
+	test_must_be_empty out)
 
-expecting success of 5411.160 'setup proc-receive hook (builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/next/topic2" \
-		-r "ng refs/for/next/topic1 fail to call Web API" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/for/main/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/cloned/.git/
+ok 4 - git pull --no-rebase
 
-ok 160 - setup proc-receive hook (builtin protocol/porcelain)
+expecting success of 5521.5 'git pull --rebase': 
+	mkdir clonedrb &&
+	(cd clonedrb && git init &&
+	git pull --rebase "../parent" >out 2>err &&
+	test -s err &&
+	test_must_be_empty out)
 
-expecting success of 5411.161 'proc-receive: report update of mixed refs (builtin protocol/porcelain)': 
-	test_must_fail git -C workbench push --porcelain origin \
-		$B:refs/heads/main \
-		HEAD:refs/heads/bar \
-		HEAD:refs/heads/baz \
-		HEAD:refs/for/next/topic2 \
-		HEAD:refs/for/next/topic1 \
-		HEAD:refs/heads/foo \
-		HEAD:refs/for/main/topic \
-		HEAD:refs/for/next/topic3 \
-		>out-$test_count 2>&1 &&
-	make_user_friendly_and_stable_output <out-$test_count >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
-	> remote: proc-receive> ok refs/for/next/topic2        Z
-	> remote: proc-receive> ng refs/for/next/topic1 fail to call Web API        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/for/main/topic        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
-	> To <URL/of/upstream.git>
-	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
-	> *	HEAD:refs/heads/bar	[new branch]
-	> *	HEAD:refs/heads/baz	[new branch]
-	> *	HEAD:refs/for/next/topic2	[new reference]
-	> *	HEAD:refs/heads/foo	[new branch]
-	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
-	> !	HEAD:refs/for/next/topic1	[remote rejected] (fail to call Web API)
-	> !	HEAD:refs/for/next/topic3	[remote rejected] (proc-receive failed to report status)
-	> Done
-	EOF
-	test_cmp expect actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedrb/.git/
+ok 5 - git pull --rebase
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/bar
-	<COMMIT-A> refs/heads/baz
-	<COMMIT-A> refs/heads/foo
-	<COMMIT-B> refs/heads/main
-	EOF
+expecting success of 5521.6 'git pull -v --no-rebase': 
+	mkdir clonedv &&
+	(cd clonedv && git init &&
+	git pull -v --no-rebase "../parent" >out 2>err &&
+	test -s err &&
+	test_must_be_empty out)
 
-ok 161 - proc-receive: report update of mixed refs (builtin protocol/porcelain)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedv/.git/
+ok 6 - git pull -v --no-rebase
 
-expecting success of 5411.162 'cleanup (builtin protocol/porcelain)': 
-	(
-		cd "$upstream" &&
-		git update-ref refs/heads/main $A &&
-		git update-ref -d refs/heads/foo &&
-		git update-ref -d refs/heads/bar &&
-		git update-ref -d refs/heads/baz
-	)
+expecting success of 5521.7 'git pull -v --rebase': 
+	mkdir clonedvrb &&
+	(cd clonedvrb && git init &&
+	git pull -v --rebase "../parent" >out 2>err &&
+	test -s err &&
+	test_must_be_empty out)
 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedvrb/.git/
+ok 7 - git pull -v --rebase
 
-ok 162 - cleanup (builtin protocol/porcelain)
+expecting success of 5521.8 'git pull -v -q --no-rebase': 
+	mkdir clonedvq &&
+	(cd clonedvq && git init &&
+	git pull -v -q --no-rebase "../parent" >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err)
 
-expecting success of 5411.163 'config receive.procReceiveRefs = refs (builtin protocol)': 
-	git -C "$upstream" config --unset-all receive.procReceiveRefs &&
-	git -C "$upstream" config --add receive.procReceiveRefs refs
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedvq/.git/
+ok 8 - git pull -v -q --no-rebase
 
-ok 163 - config receive.procReceiveRefs = refs (builtin protocol)
+expecting success of 5521.9 'git pull -q -v --no-rebase': 
+	mkdir clonedqv &&
+	(cd clonedqv && git init &&
+	git pull -q -v --no-rebase "../parent" >out 2>err &&
+	test_must_be_empty out &&
+	test -s err)
 
-expecting success of 5411.164 'setup upstream branches (builtin protocol)': 
-	(
-		cd "$upstream" &&
-		git update-ref refs/heads/main $B &&
-		git update-ref refs/heads/foo $A &&
-		git update-ref refs/heads/bar $A &&
-		git update-ref refs/heads/baz $A
-	)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedqv/.git/
+ok 9 - git pull -q -v --no-rebase
 
+expecting success of 5521.10 'git pull --cleanup errors early on invalid argument': 
+	mkdir clonedcleanup &&
+	(cd clonedcleanup && git init &&
+	test_must_fail git pull --no-rebase --cleanup invalid "../parent" >out 2>err &&
+	test_must_be_empty out &&
+	test -s err)
 
-ok 164 - setup upstream branches (builtin protocol)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedcleanup/.git/
+ok 10 - git pull --cleanup errors early on invalid argument
 
-expecting success of 5411.165 'setup proc-receive hook (builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/heads/main" \
-		-r "option fall-through" \
-		-r "ok refs/heads/foo" \
-		-r "option fall-through" \
-		-r "ok refs/heads/bar" \
-		-r "option fall-through" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/next/topic" \
-		-r "option refname refs/pull/124/head" \
-		-r "option old-oid $B" \
-		-r "option new-oid $A" \
-		-r "option forced-update"
-	EOF
+expecting success of 5521.11 'git pull --no-write-fetch-head fails': 
+	mkdir clonedwfh &&
+	(cd clonedwfh && git init &&
+	test_expect_code 129 git pull --no-write-fetch-head "../parent" >out 2>err &&
+	test_must_be_empty out &&
+	test_grep "no-write-fetch-head" err)
 
-ok 165 - setup proc-receive hook (builtin protocol)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedwfh/.git/
+error: unknown option `no-write-fetch-head'
+ok 11 - git pull --no-write-fetch-head fails
 
-expecting success of 5411.166 'proc-receive: process all refs (builtin protocol)': 
-	git -C workbench push -f origin \
-		HEAD:refs/heads/main \
-		:refs/heads/foo \
-		$B:refs/heads/bar \
-		HEAD:refs/for/main/topic \
-		HEAD:refs/for/next/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
-	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
-	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
-	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
-	> remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: proc-receive> ok refs/heads/main        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: proc-receive> ok refs/heads/foo        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: proc-receive> ok refs/heads/bar        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: proc-receive> ok refs/for/next/topic        Z
-	> remote: proc-receive> option refname refs/pull/124/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
-	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> bar
-	>  - [deleted]         foo
-	>  + <COMMIT-B>...<COMMIT-A> HEAD -> main (forced update)
-	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/pull/123/head
-	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/pull/124/head (forced update)
+expecting success of 5521.12 'git pull --force': 
+	mkdir clonedoldstyle &&
+	(cd clonedoldstyle && git init &&
+	cat >>.git/config <<-\EOF &&
+	[remote "one"]
+		url = ../parent
+		fetch = refs/heads/main:refs/heads/mirror
+	[remote "two"]
+		url = ../parent
+		fetch = refs/heads/main:refs/heads/origin
+	[branch "main"]
+		remote = two
+		merge = refs/heads/main
 	EOF
-	test_cmp expect actual &&
+	git pull two &&
+	test_commit A &&
+	git branch -f origin &&
+	git pull --no-rebase --all --force
+	)
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/bar
-	<COMMIT-A> refs/heads/baz
-	<COMMIT-A> refs/heads/main
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedoldstyle/.git/
+From ../parent
+ * [new branch]      main       -> origin
+[main bda2e37] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Fetching one
+From ../parent
+ * [new branch]      main       -> mirror
+Fetching two
+From ../parent
+ + bda2e37...1993c08 main       -> origin  (forced update)
+Already up to date.
+ok 12 - git pull --force
+
+expecting success of 5521.13 'git pull --all': 
+	mkdir clonedmulti &&
+	(cd clonedmulti && git init &&
+	cat >>.git/config <<-\EOF &&
+	[remote "one"]
+		url = ../parent
+		fetch = refs/heads/*:refs/remotes/one/*
+	[remote "two"]
+		url = ../parent
+		fetch = refs/heads/*:refs/remotes/two/*
+	[branch "main"]
+		remote = one
+		merge = refs/heads/main
 	EOF
+	git pull --all
+	)
 
-ok 166 - proc-receive: process all refs (builtin protocol)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedmulti/.git/
+Fetching one
+From ../parent
+ * [new branch]      main       -> one/main
+Fetching two
+From ../parent
+ * [new branch]      main       -> two/main
+ok 13 - git pull --all
 
-expecting success of 5411.167 'cleanup (builtin protocol)': 
+expecting success of 5521.14 'git pull --dry-run': 
+	test_when_finished "rm -rf clonedry" &&
+	git init clonedry &&
 	(
-		cd "$upstream" &&
-		git update-ref -d refs/heads/bar &&
-		git update-ref -d refs/heads/baz
+		cd clonedry &&
+		git pull --dry-run ../parent &&
+		test_path_is_missing .git/FETCH_HEAD &&
+		test_ref_missing refs/heads/main &&
+		test_path_is_missing .git/index &&
+		test_path_is_missing file
 	)
 
-ok 167 - cleanup (builtin protocol)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedry/.git/
+From ../parent
+ * branch            HEAD       -> FETCH_HEAD
+error: reference does not exist
+ok 14 - git pull --dry-run
 
-expecting success of 5411.168 'config receive.procReceiveRefs = refs (builtin protocol/porcelain)': 
-	git -C "$upstream" config --unset-all receive.procReceiveRefs &&
-	git -C "$upstream" config --add receive.procReceiveRefs refs
+expecting success of 5521.15 'git pull --all --dry-run': 
+	test_when_finished "rm -rf cloneddry" &&
+	git init clonedry &&
+	(
+		cd clonedry &&
+		git remote add origin ../parent &&
+		git pull --all --dry-run &&
+		test_path_is_missing .git/FETCH_HEAD &&
+		test_ref_missing refs/remotes/origin/main &&
+		test_path_is_missing .git/index &&
+		test_path_is_missing file
+	)
 
-ok 168 - config receive.procReceiveRefs = refs (builtin protocol/porcelain)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/clonedry/.git/
+From ../parent
+ * [new branch]      main       -> origin/main
+error: reference does not exist
+ok 15 - git pull --all --dry-run
 
-expecting success of 5411.169 'setup upstream branches (builtin protocol/porcelain)': 
+expecting success of 5521.16 'git pull --allow-unrelated-histories': 
+	test_when_finished "rm -fr src dst" &&
+	git init src &&
 	(
-		cd "$upstream" &&
-		git update-ref refs/heads/main $B &&
-		git update-ref refs/heads/foo $A &&
-		git update-ref refs/heads/bar $A &&
-		git update-ref refs/heads/baz $A
+		cd src &&
+		test_commit one &&
+		test_commit two
+	) &&
+	git clone src dst &&
+	(
+		cd src &&
+		git checkout --orphan side HEAD^ &&
+		test_commit three
+	) &&
+	(
+		cd dst &&
+		test_must_fail git pull ../src side &&
+		git pull --no-rebase --allow-unrelated-histories ../src side
 	)
 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Cloning into 'dst'...
+done.
+Switched to a new branch 'side'
+[side (root-commit) d8f6b98] three
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one.t
+ create mode 100644 three.t
+From ../src
+ * branch            side       -> 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.
+From ../src
+ * branch            side       -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ three.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 16 - git pull --allow-unrelated-histories
 
-ok 169 - setup upstream branches (builtin protocol/porcelain)
+expecting success of 5521.17 'git pull does not add a sign-off line': 
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	test_commit -C src two &&
+	git -C dst pull --no-ff &&
+	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+	test_must_be_empty actual
 
-expecting success of 5411.170 'setup proc-receive hook (builtin protocol/porcelain)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/heads/main" \
-		-r "option fall-through" \
-		-r "ok refs/heads/foo" \
-		-r "option fall-through" \
-		-r "ok refs/heads/bar" \
-		-r "option fall-through" \
-		-r "ok refs/for/main/topic" \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/next/topic" \
-		-r "option refname refs/pull/124/head" \
-		-r "option old-oid $B" \
-		-r "option new-oid $A" \
-		-r "option forced-update"
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'dst'...
+done.
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
+   d79ce16..139b20d  main       -> origin/main
+ * [new tag]         two        -> two
+Merge made by the 'ort' strategy.
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 17 - git pull does not add a sign-off line
 
-ok 170 - setup proc-receive hook (builtin protocol/porcelain)
+expecting success of 5521.18 'git pull --no-signoff does not add sign-off line': 
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	test_commit -C src two &&
+	git -C dst pull --no-signoff --no-ff &&
+	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+	test_must_be_empty actual
 
-expecting success of 5411.171 'proc-receive: process all refs (builtin protocol/porcelain)': 
-	git -C workbench push --porcelain -f origin \
-		HEAD:refs/heads/main \
-		:refs/heads/foo \
-		$B:refs/heads/bar \
-		HEAD:refs/for/main/topic \
-		HEAD:refs/for/next/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
-	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
-	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
-	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
-	> remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
-	> remote: proc-receive> ok refs/heads/main        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: proc-receive> ok refs/heads/foo        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: proc-receive> ok refs/heads/bar        Z
-	> remote: proc-receive> option fall-through        Z
-	> remote: proc-receive> ok refs/for/main/topic        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: proc-receive> ok refs/for/next/topic        Z
-	> remote: proc-receive> option refname refs/pull/124/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-B>        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: proc-receive> option forced-update        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
-	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
-	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
-	> To <URL/of/upstream.git>
-	>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-	> -	:refs/heads/foo	[deleted]
-	> +	HEAD:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
-	>  	HEAD:refs/pull/123/head	<COMMIT-A>..<COMMIT-B>
-	> +	HEAD:refs/pull/124/head	<COMMIT-B>...<COMMIT-A> (forced update)
-	> Done
-	EOF
-	test_cmp expect actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'dst'...
+done.
+[main 00bbe3d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
+   4331c28..00bbe3d  main       -> origin/main
+ * [new tag]         two        -> two
+Merge made by the 'ort' strategy.
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 18 - git pull --no-signoff does not add sign-off line
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/bar
-	<COMMIT-A> refs/heads/baz
-	<COMMIT-A> refs/heads/main
-	EOF
+expecting success of 5521.19 'git pull --signoff add a sign-off line': 
+	test_when_finished "rm -fr src dst expected actual" &&
+	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	test_commit -C src two &&
+	git -C dst pull --signoff --no-ff &&
+	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+	test_cmp expected actual
 
-ok 171 - proc-receive: process all refs (builtin protocol/porcelain)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) 6f4b17f] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'dst'...
+done.
+[main 5c4888c] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
+   6f4b17f..5c4888c  main       -> origin/main
+ * [new tag]         two        -> two
+Merge made by the 'ort' strategy.
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 19 - git pull --signoff add a sign-off line
 
-expecting success of 5411.172 'cleanup (builtin protocol/porcelain)': 
-	(
-		cd "$upstream" &&
-		git update-ref -d refs/heads/bar &&
-		git update-ref -d refs/heads/baz
-	)
+expecting success of 5521.20 'git pull --no-signoff flag cancels --signoff flag': 
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	test_commit -C src two &&
+	git -C dst pull --signoff --no-signoff --no-ff &&
+	git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+	test_must_be_empty actual
 
-ok 172 - cleanup (builtin protocol/porcelain)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) 06e07da] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'dst'...
+done.
+[main 738d2f7] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
+   06e07da..738d2f7  main       -> origin/main
+ * [new tag]         two        -> two
+Merge made by the 'ort' strategy.
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 20 - git pull --no-signoff flag cancels --signoff flag
 
-expecting success of 5411.173 'config receive.procReceiveRefs with modifiers (builtin protocol)': 
-	(
-		cd "$upstream" &&
-		git config --unset-all receive.procReceiveRefs &&
-		git config --add receive.procReceiveRefs m:refs/heads/main &&
-		git config --add receive.procReceiveRefs ad:refs/heads &&
-		git config --add receive.procReceiveRefs "a!:refs/heads"
-	)
+expecting success of 5521.21 'git pull --no-verify flag passed to merge': 
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	test_hook -C dst commit-msg <<-\EOF &&
+	false
+	EOF
+	test_commit -C src two &&
+	git -C dst pull --no-ff --no-verify
 
-ok 173 - config receive.procReceiveRefs with modifiers (builtin protocol)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) 0ba3da9] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'dst'...
+done.
+[main 9f92fa5] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
+   0ba3da9..9f92fa5  main       -> origin/main
+ * [new tag]         two        -> two
+Merge made by the 'ort' strategy.
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 21 - git pull --no-verify flag passed to merge
 
-expecting success of 5411.174 'setup proc-receive hook (builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/heads/main" \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/tags/v123 " \
-		-r "option refname refs/pull/124/head"
+expecting success of 5521.22 'git pull --no-verify --verify passed to merge': 
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	test_hook -C dst commit-msg <<-\EOF &&
+	false
 	EOF
+	test_commit -C src two &&
+	test_must_fail git -C dst pull --no-ff --no-verify --verify
 
-ok 174 - setup proc-receive hook (builtin protocol)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src/.git/
+[main (root-commit) ac97c8d] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'dst'...
+done.
+[main 4ae1176] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5521-pull-options/src
+   ac97c8d..4ae1176  main       -> origin/main
+ * [new tag]         two        -> two
+Not committing merge; use 'git commit' to complete the merge.
+ok 22 - git pull --no-verify --verify passed to merge
 
-expecting success of 5411.175 'proc-receive: update branch and new tag (builtin protocol)': 
-	git -C workbench push origin \
-		$B:refs/heads/main \
-		v123 >out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
-	> remote: proc-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
-	> remote: proc-receive> ok refs/heads/main        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <COMMIT-B>        Z
-	> remote: proc-receive> ok refs/tags/v123         Z
-	> remote: proc-receive> option refname refs/pull/124/head        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
-	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/pull/124/head        Z
-	> To <URL/of/upstream.git>
-	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> refs/pull/123/head
-	>  * [new reference]   v123 -> refs/pull/124/head
-	EOF
-	test_cmp expect actual &&
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5529-push-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5529-push-errors/.git/
+expecting success of 5529.1 'setup commits': 
+	test_commit one
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup commits
 
-ok 175 - proc-receive: update branch and new tag (builtin protocol)
+expecting success of 5529.2 'setup remote': 
+	git init --bare remote.git &&
+	git remote add origin remote.git
 
-expecting success of 5411.176 'setup upstream: create tags/v123 (builtin protocol)': 
-	git -C "$upstream" update-ref refs/heads/topic $A &&
-	git -C "$upstream" update-ref refs/tags/v123 $TAG &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5529-push-errors/remote.git/
+ok 2 - setup remote
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/topic
-	<TAG-v123> refs/tags/v123
+expecting success of 5529.3 'setup fake receive-pack': 
+	FAKE_RP_ROOT=$(pwd) &&
+	export FAKE_RP_ROOT &&
+	write_script fake-rp <<-\EOF &&
+	echo yes >"$FAKE_RP_ROOT"/rp-ran
+	exit 1
 	EOF
+	git config remote.origin.receivepack "\"\$FAKE_RP_ROOT/fake-rp\""
 
-ok 176 - setup upstream: create tags/v123 (builtin protocol)
+ok 3 - setup fake receive-pack
 
-expecting success of 5411.177 'setup proc-receive hook (builtin protocol)': 
-	test_hook -C "$upstream" --clobber proc-receive <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/heads/main" \
-		-r "option refname refs/pull/123/head" \
-		-r "option old-oid $A" \
-		-r "option new-oid $ZERO_OID" \
-		-r "ok refs/heads/next" \
-		-r "option refname refs/pull/124/head" \
-		-r "option new-oid $A"
-	EOF
+expecting success of 5529.4 'detect missing branches early': 
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin missing &&
+	test_cmp expect rp-ran
 
-ok 177 - setup proc-receive hook (builtin protocol)
+error: src refspec missing does not match any
+error: failed to push some refs to 'remote.git'
+ok 4 - detect missing branches early
 
-expecting success of 5411.178 'proc-receive: create/delete branch, and delete tag (builtin protocol)': 
-	git -C workbench push origin \
-		:refs/heads/main \
-		$B:refs/heads/topic \
-		$A:refs/heads/next \
-		:refs/tags/v123 >out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	format_and_save_expect <<-EOF &&
-	> remote: # pre-receive hook        Z
-	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/main        Z
-	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic        Z
-	> remote: pre-receive< <TAG-v123> <ZERO-OID> refs/tags/v123        Z
-	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: # proc-receive hook        Z
-	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/main        Z
-	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
-	> remote: proc-receive> ok refs/heads/main        Z
-	> remote: proc-receive> option refname refs/pull/123/head        Z
-	> remote: proc-receive> option old-oid <COMMIT-A>        Z
-	> remote: proc-receive> option new-oid <ZERO-OID>        Z
-	> remote: proc-receive> ok refs/heads/next        Z
-	> remote: proc-receive> option refname refs/pull/124/head        Z
-	> remote: proc-receive> option new-oid <COMMIT-A>        Z
-	> remote: # post-receive hook        Z
-	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/pull/123/head        Z
-	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic        Z
-	> remote: post-receive< <TAG-v123> <ZERO-OID> refs/tags/v123        Z
-	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/124/head        Z
-	> To <URL/of/upstream.git>
-	>  - [deleted]         refs/pull/123/head
-	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> topic
-	>  - [deleted]         v123
-	>  * [new reference]   <COMMIT-A> -> refs/pull/124/head
-	EOF
-	test_cmp expect actual &&
+expecting success of 5529.5 'detect missing sha1 expressions early': 
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin main~2:main &&
+	test_cmp expect rp-ran
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-B> refs/heads/topic
-	EOF
+error: src refspec main~2 does not match any
+error: failed to push some refs to 'remote.git'
+ok 5 - detect missing sha1 expressions early
 
-ok 178 - proc-receive: create/delete branch, and delete tag (builtin protocol)
+expecting success of 5529.6 'detect empty remote with existing local ref': 
+	test_must_fail git push "" main 2> stderr &&
+	grep "fatal: bad repository ${SQ}${SQ}" stderr
 
-checking prerequisite: NOT_ROOT
+fatal: bad repository ''
+ok 6 - detect empty remote with existing local ref
 
-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 5529.7 'detect empty remote with targeted refspec': 
+	test_must_fail git push "" HEAD:refs/heads/main 2> stderr &&
+	grep "fatal: bad repository ${SQ}${SQ}" stderr
 
-)
-prerequisite NOT_ROOT ok
-# passed all 178 test(s)
-# SKIP no web server found at ''
-1..178
+fatal: bad repository ''
+ok 7 - detect empty remote with targeted refspec
+
+expecting success of 5529.8 'detect ambiguous refs early': 
+	git branch foo &&
+	git tag foo &&
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin foo &&
+	test_cmp expect rp-ran
+
+error: src refspec foo matches more than one
+error: failed to push some refs to 'remote.git'
+ok 8 - detect ambiguous refs early
+
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5530-upload-pack-error.sh ***
@@ -340567,78 +336880,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5535-fetch-push-symref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5535-fetch-push-symref/.git/
-expecting success of 5535.1 'setup': 
-	test_commit one &&
-	git clone . src &&
-	git clone src dst1 &&
-	git clone src dst2 &&
-	test_commit two &&
-	( cd src && git pull )
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'src'...
-done.
-Cloning into 'dst1'...
-done.
-Cloning into 'dst2'...
-done.
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5535-fetch-push-symref/.
-   d79ce16..139b20d  master     -> origin/master
- * [new tag]         two        -> two
-Updating d79ce16..139b20d
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - setup
-
-expecting success of 5535.2 'push': 
-	(
-		cd src &&
-		git push ../dst1 "refs/remotes/*:refs/remotes/*"
-	) &&
-	git ls-remote src "refs/remotes/*" >expect &&
-	git ls-remote dst1 "refs/remotes/*" >actual &&
-	test_cmp expect actual &&
-	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
-	( cd dst1 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
-	test_cmp expect actual
-
-To ../dst1
-   d79ce16..139b20d  origin/HEAD -> origin/HEAD
-   d79ce16..139b20d  origin/master -> origin/master
-ok 2 - push
-
-expecting success of 5535.3 'fetch': 
-	(
-		cd dst2 &&
-		git fetch ../src "refs/remotes/*:refs/remotes/*"
-	) &&
-	git ls-remote src "refs/remotes/*" >expect &&
-	git ls-remote dst2 "refs/remotes/*" >actual &&
-	test_cmp expect actual &&
-	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
-	( cd dst2 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
-	test_cmp expect actual
-
-From ../src
-   d79ce16..139b20d  origin/master -> origin/master
- * [new tag]         two           -> two
-ok 3 - fetch
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5534-push-signed.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5534-push-signed/.git/
 expecting success of 5534.1 'setup': 
@@ -340866,1394 +337107,96 @@
 		--passphrase-fd 0 --pinentry-mode loopback \
 		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
 
-	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
-	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
-		>"${GNUPGHOME}/trustlist.txt" &&
-	(gpgconf --reload all || : ) &&
-
-	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-	       -u committer@example.com -o /dev/null --sign -
-
-)
-prerequisite GPGSM not satisfied
-ok 11 # skip fail without key and heed user.signingkey x509 (missing GPGSM)
-
-ok 12 # skip fail without key and heed user.signingkey ssh (missing GPGSSH)
-
-ok 13 # skip failed atomic push does not execute GPG (missing GPG)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5536-fetch-conflicts.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/.git/
-expecting success of 5536.1 'setup': 
-	git commit --allow-empty -m "Initial" &&
-	git branch branch1 &&
-	git tag tag1 &&
-	git commit --allow-empty -m "First" &&
-	git branch branch2 &&
-	git tag tag2
-
-[master (root-commit) d31adcd] Initial
- Author: A U Thor <author@example.com>
-[master 1a200fb] First
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 5536.2 'fetch with no conflict': 
-	setup_repository ok "+refs/heads/*:refs/remotes/origin/*" && (
-		cd ok &&
-		git fetch origin
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/ok/.git/
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts
- * [new branch]      branch1    -> origin/branch1
- * [new branch]      branch2    -> origin/branch2
- * [new branch]      master     -> origin/master
- * [new tag]         tag1       -> tag1
- * [new tag]         tag2       -> tag2
-ok 2 - fetch with no conflict
-
-expecting success of 5536.3 'fetch conflict: config vs. config': 
-	setup_repository ccc \
-		"+refs/heads/branch1:refs/remotes/origin/branch1" \
-		"+refs/heads/branch2:refs/remotes/origin/branch1" && (
-		cd ccc &&
-		test_must_fail git fetch origin 2>error &&
-		test_grep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/ccc/.git/
-fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-ok 3 - fetch conflict: config vs. config
-
-expecting success of 5536.4 'fetch duplicate: config vs. config': 
-	setup_repository dcc \
-		"+refs/heads/*:refs/remotes/origin/*" \
-		"+refs/heads/branch1:refs/remotes/origin/branch1" && (
-		cd dcc &&
-		git fetch origin
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/dcc/.git/
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts
- * [new branch]      branch1    -> origin/branch1
- * [new branch]      branch2    -> origin/branch2
- * [new branch]      master     -> origin/master
- * [new tag]         tag1       -> tag1
- * [new tag]         tag2       -> tag2
-ok 4 - fetch duplicate: config vs. config
-
-expecting success of 5536.5 'fetch conflict: arg overrides config': 
-	setup_repository aoc \
-		"+refs/heads/*:refs/remotes/origin/*" && (
-		cd aoc &&
-		git fetch origin refs/heads/branch2:refs/remotes/origin/branch1
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/aoc/.git/
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts
- * [new branch]      branch2    -> origin/branch1
- * [new tag]         tag2       -> tag2
- * [new branch]      branch2    -> origin/branch2
- * [new tag]         tag1       -> tag1
-ok 5 - fetch conflict: arg overrides config
-
-expecting success of 5536.6 'fetch conflict: arg vs. arg': 
-	setup_repository caa && (
-		cd caa &&
-		test_must_fail git fetch origin \
-			refs/heads/*:refs/remotes/origin/* \
-			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-		test_grep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/caa/.git/
-fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-ok 6 - fetch conflict: arg vs. arg
-
-expecting success of 5536.7 'fetch conflict: criss-cross args': 
-	setup_repository xaa \
-		"+refs/heads/*:refs/remotes/origin/*" && (
-		cd xaa &&
-		git fetch origin \
-			refs/heads/branch1:refs/remotes/origin/branch2 \
-			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-		test_grep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
-		test_grep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/xaa/.git/
-warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2
-warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1
-ok 7 - fetch conflict: criss-cross args
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5538-push-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5538-push-shallow/.git/
-expecting success of 5538.1 'setup': 
-	git config --global transfer.fsckObjects true &&
-	commit 1 &&
-	commit 2 &&
-	commit 3 &&
-	commit 4 &&
-	git clone . full &&
-	(
-	git init full-abc &&
-	cd full-abc &&
-	commit a &&
-	commit b &&
-	commit c
-	) &&
-	git clone --no-local --depth=2 .git shallow &&
-	git --git-dir=shallow/.git log --format=%s >actual &&
-	cat <<EOF >expect &&
-4
-3
-EOF
-	test_cmp expect actual &&
-	git clone --no-local --depth=2 full-abc/.git shallow2 &&
-	git --git-dir=shallow2/.git log --format=%s >actual &&
-	cat <<EOF >expect &&
-c
-b
-EOF
-	test_cmp expect actual
-
-[main (root-commit) 866032c] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-[main 5c48a96] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main d5dbd47] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9c53269] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'full'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5538-push-shallow/full-abc/.git/
-[main (root-commit) 5f99454] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-[main 1cf9806] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 90fec16] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'shallow'...
-Cloning into 'shallow2'...
-ok 1 - setup
-
-expecting success of 5538.2 'push from shallow clone': 
-	(
-	cd shallow &&
-	commit 5 &&
-	git push ../.git +main:refs/remotes/shallow/main
-	) &&
-	git log --format=%s shallow/main >actual &&
-	git fsck &&
-	cat <<EOF >expect &&
-5
-4
-3
-2
-1
-EOF
-	test_cmp expect actual
-
-[main a94059e] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../.git
- * [new reference]   main -> shallow/main
-ok 2 - push from shallow clone
-
-expecting success of 5538.3 'push from shallow clone, with grafted roots': 
-	(
-	cd shallow2 &&
-	test_must_fail git push ../.git +main:refs/remotes/shallow2/main 2>err &&
-	grep "shallow2/main.*shallow update not allowed" err
-	) &&
-	test_must_fail git rev-parse shallow2/main &&
-	git fsck
-
- ! [remote rejected] main -> shallow2/main (shallow update not allowed)
-fatal: ambiguous argument 'shallow2/main': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-shallow2/main
-ok 3 - push from shallow clone, with grafted roots
-
-expecting success of 5538.4 'add new shallow root with receive.updateshallow on': 
-	test_config receive.shallowupdate true &&
-	(
-	cd shallow2 &&
-	git push ../.git +main:refs/remotes/shallow2/main
-	) &&
-	git log --format=%s shallow2/main >actual &&
-	git fsck &&
-	cat <<EOF >expect &&
-c
-b
-EOF
-	test_cmp expect actual
-
-To ../.git
- * [new reference]   main -> shallow2/main
-ok 4 - add new shallow root with receive.updateshallow on
-
-expecting success of 5538.5 'push from shallow to shallow': 
-	(
-	cd shallow &&
-	git --git-dir=../shallow2/.git config receive.shallowupdate true &&
-	git push ../shallow2/.git +main:refs/remotes/shallow/main &&
-	git --git-dir=../shallow2/.git config receive.shallowupdate false
-	) &&
-	(
-	cd shallow2 &&
-	git log --format=%s shallow/main >actual &&
-	git fsck &&
-	cat <<EOF >expect &&
-5
-4
-3
-EOF
-	test_cmp expect actual
-	)
-
-To ../shallow2/.git
- * [new reference]   main -> shallow/main
-ok 5 - push from shallow to shallow
-
-expecting success of 5538.6 'push from full to shallow': 
-	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
-	commit 1 &&
-	git push shallow2/.git +main:refs/remotes/top/main &&
-	(
-	cd shallow2 &&
-	git log --format=%s top/main >actual &&
-	git fsck &&
-	cat <<EOF >expect &&
-1
-4
-3
-EOF
-	test_cmp expect actual &&
-	git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
-	)
-
-fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
-[main 4cfd8cc] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To shallow2/.git
- * [new reference]   main -> top/main
-ok 6 - push from full to shallow
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5539-fetch-http-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5540-http-push-webdav.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5541-http-push-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5537-fetch-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/.git/
-expecting success of 5537.1 'setup': 
-	commit 1 &&
-	commit 2 &&
-	commit 3 &&
-	commit 4 &&
-	git config --global transfer.fsckObjects true &&
-	test_oid_cache <<-\EOF
-	perl sha1:s/0034shallow %s/0036unshallow %s/
-	perl sha256:s/004cshallow %s/004eunshallow %s/
-	EOF
-
-[main (root-commit) 866032c] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-[main 5c48a96] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main d5dbd47] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9c53269] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 5537.2 'setup shallow clone': 
-	git clone --no-local --depth=2 .git shallow &&
-	git --git-dir=shallow/.git log --format=%s >actual &&
-	test_write_lines 4 3 >expect &&
-	test_cmp expect actual
-
-Cloning into 'shallow'...
-ok 2 - setup shallow clone
-
-expecting success of 5537.3 'clone from shallow clone': 
-	git clone --no-local shallow shallow2 &&
-	(
-	cd shallow2 &&
-	git fsck &&
-	git log --format=%s >actual &&
-	test_write_lines 4 3 >expect &&
-	test_cmp expect actual
-	)
-
-Cloning into 'shallow2'...
-ok 3 - clone from shallow clone
-
-expecting success of 5537.4 'fetch from shallow clone': 
-	(
-	cd shallow &&
-	commit 5
-	) &&
-	(
-	cd shallow2 &&
-	git fetch &&
-	git fsck &&
-	git log --format=%s origin/main >actual &&
-	test_write_lines 5 4 3 >expect &&
-	test_cmp expect actual
-	)
-
-[main a94059e] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow
-   9c53269..a94059e  main       -> origin/main
-ok 4 - fetch from shallow clone
-
-expecting success of 5537.5 'fetch --depth from shallow clone': 
-	(
-	cd shallow &&
-	commit 6
-	) &&
-	(
-	cd shallow2 &&
-	git fetch --depth=2 &&
-	git fsck &&
-	git log --format=%s origin/main >actual &&
-	test_write_lines 6 5 >expect &&
-	test_cmp expect actual
-	)
-
-[main 27db150] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow
-   a94059e..27db150  main       -> origin/main
-ok 5 - fetch --depth from shallow clone
-
-expecting success of 5537.6 'fetch --unshallow from shallow clone': 
-	(
-	cd shallow2 &&
-	git fetch --unshallow &&
-	git fsck &&
-	git log --format=%s origin/main >actual &&
-	test_write_lines 6 5 4 3 >expect &&
-	test_cmp expect actual
-	)
-
-ok 6 - fetch --unshallow from shallow clone
-
-expecting success of 5537.7 'fetch --unshallow from a full clone': 
-	git clone --no-local --depth=2 .git shallow3 &&
-	(
-	cd shallow3 &&
-	git log --format=%s >actual &&
-	test_write_lines 4 3 >expect &&
-	test_cmp expect actual &&
-	git -c fetch.writeCommitGraph fetch --unshallow &&
-	git log origin/main --format=%s >actual &&
-	test_write_lines 4 3 2 1 >expect &&
-	test_cmp expect actual
-	)
-
-Cloning into 'shallow3'...
-ok 7 - fetch --unshallow from a full clone
-
-expecting success of 5537.8 'fetch something upstream has but hidden by clients shallow boundaries': 
-	# the blob "1" is available in .git but hidden by the
-	# shallow2/.git/shallow and it should be resent
-	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null &&
-	echo 1 >1.t &&
-	git add 1.t &&
-	git commit -m add-1-back &&
-	(
-	cd shallow2 &&
-	git fetch ../.git +refs/heads/main:refs/remotes/top/main &&
-	git fsck &&
-	git log --format=%s top/main >actual &&
-	test_write_lines add-1-back 4 3 >expect &&
-	test_cmp expect actual
-	) &&
-	git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
-
-fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
-[main c7f5970] add-1-back
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-From ../
- * [new branch]      main       -> top/main
-ok 8 - fetch something upstream has but hidden by clients shallow boundaries
-
-expecting success of 5537.9 'fetch that requires changes in .git/shallow is filtered': 
-	(
-	cd shallow &&
-	git checkout --orphan no-shallow &&
-	commit no-shallow
-	) &&
-	git init notshallow &&
-	(
-	cd notshallow &&
-	git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
-	git for-each-ref --format="%(refname)" >actual.refs &&
-	echo refs/remotes/shallow/no-shallow >expect.refs &&
-	test_cmp expect.refs actual.refs &&
-	git log --format=%s shallow/no-shallow >actual &&
-	echo no-shallow >expect &&
-	test_cmp expect actual
-	)
-
-Switched to a new branch 'no-shallow'
-[no-shallow (root-commit) 20d88d1] no-shallow
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/notshallow/.git/
-warning: rejected refs/remotes/shallow/main because shallow roots are not allowed to be updated
-From ../shallow/
- * [new branch]      no-shallow -> shallow/no-shallow
-ok 9 - fetch that requires changes in .git/shallow is filtered
-
-expecting success of 5537.10 'fetch --update-shallow': 
-	(
-	cd shallow &&
-	git checkout main &&
-	commit 7 &&
-	git tag -m foo heavy-tag HEAD^ &&
-	git tag light-tag HEAD^:tracked
-	) &&
-	(
-	cd notshallow &&
-	git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
-	git fsck &&
-	git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
-	cat <<-\EOF >expect.refs &&
-	refs/remotes/shallow/main
-	refs/remotes/shallow/no-shallow
-	refs/tags/heavy-tag
-	refs/tags/light-tag
-	EOF
-	test_cmp expect.refs actual.refs &&
-	git log --format=%s shallow/main >actual &&
-	test_write_lines 7 6 5 4 3 >expect &&
-	test_cmp expect actual
-	)
-
-Switched to branch 'main'
-Your branch is ahead of 'origin/main' by 2 commits.
-  (use "git push" to publish your local commits)
-[main 96c85b9] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: Could not read 5c48a96478ec5c4cbce662a4a0a6f0be5ce4e6ab
-error: Could not read 5c48a96478ec5c4cbce662a4a0a6f0be5ce4e6ab
-From ../shallow/
- * [new branch]      main       -> shallow/main
- * [new tag]         heavy-tag  -> heavy-tag
- * [new tag]         light-tag  -> light-tag
-notice: HEAD points to an unborn branch (main)
-ok 10 - fetch --update-shallow
-
-expecting success of 5537.11 'fetch --update-shallow into a repo with submodules': 
-	test_config_global protocol.file.allow always &&
-
-	git init a-submodule &&
-	test_commit -C a-submodule foo &&
-
-	test_when_finished "rm -rf repo-with-sub" &&
-	git init repo-with-sub &&
-	git -C repo-with-sub submodule add ../a-submodule a-submodule &&
-	git -C repo-with-sub commit -m "added submodule" &&
-	git -C repo-with-sub fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/*
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/a-submodule/.git/
-[main (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/a-submodule'...
-done.
-[main (root-commit) 56fa32c] added submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a-submodule
-From ../shallow/
- * [new branch]      main       -> shallow/main
- * [new branch]      no-shallow -> shallow/no-shallow
- * [new tag]         heavy-tag  -> heavy-tag
- * [new tag]         light-tag  -> light-tag
-ok 11 - fetch --update-shallow into a repo with submodules
-
-expecting success of 5537.12 'fetch --update-shallow a commit that is also a shallow point into a repo with submodules': 
-	test_when_finished "rm -rf repo-with-sub" &&
-	git init repo-with-sub &&
-	git -c protocol.file.allow=always -C repo-with-sub \
-		submodule add ../a-submodule a-submodule &&
-	git -C repo-with-sub commit -m "added submodule" &&
-
-	SHALLOW=$(cat shallow/.git/shallow) &&
-	git -C repo-with-sub fetch --update-shallow ../shallow/.git "$SHALLOW":refs/heads/a-shallow
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/a-submodule'...
-done.
-[main (root-commit) 56fa32c] added submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a-submodule
-From ../shallow/
- * [new ref]         d5dbd47cd66da3fef8e2dc8e29365d2cf57dc0a2 -> a-shallow
-ok 12 - fetch --update-shallow a commit that is also a shallow point into a repo with submodules
-
-expecting success of 5537.13 'fetch --update-shallow (with fetch.writeCommitGraph)': 
-	(
-	cd shallow &&
-	git checkout main &&
-	commit 8 &&
-	git tag -m foo heavy-tag-for-graph HEAD^ &&
-	git tag light-tag-for-graph HEAD^:tracked
-	) &&
-	test_config -C notshallow fetch.writeCommitGraph true &&
-	(
-	cd notshallow &&
-	git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
-	git fsck &&
-	git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
-	cat <<-EOF >expect.refs &&
-	refs/remotes/shallow/main
-	refs/remotes/shallow/no-shallow
-	refs/tags/heavy-tag
-	refs/tags/heavy-tag-for-graph
-	refs/tags/light-tag
-	refs/tags/light-tag-for-graph
-	EOF
-	test_cmp expect.refs actual.refs &&
-	git log --format=%s shallow/main >actual &&
-	test_write_lines 8 7 6 5 4 3 >expect &&
-	test_cmp expect actual
-	)
-
-Already on 'main'
-Your branch is ahead of 'origin/main' by 3 commits.
-  (use "git push" to publish your local commits)
-[main a02f4de] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../shallow/
-   96c85b9..a02f4de  main                -> shallow/main
- * [new tag]         heavy-tag-for-graph -> heavy-tag-for-graph
- * [new tag]         light-tag-for-graph -> light-tag-for-graph
-notice: HEAD points to an unborn branch (main)
-ok 13 - fetch --update-shallow (with fetch.writeCommitGraph)
-
-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 5537.14 'shallow fetch from a read-only repo': 
-	cp -R .git read-only.git &&
-	test_when_finished "find read-only.git -type d -print | xargs chmod +w" &&
-	find read-only.git -print | xargs chmod -w &&
-	git clone --no-local --depth=2 read-only.git from-read-only &&
-	git --git-dir=from-read-only/.git log --format=%s >actual &&
-	test_write_lines add-1-back 4 >expect &&
-	test_cmp expect actual
-
-Cloning into 'from-read-only'...
-ok 14 - shallow fetch from a read-only repo
-
-expecting success of 5537.15 '.git/shallow is edited by repack': 
-	git init shallow-server &&
-	test_commit -C shallow-server A &&
-	test_commit -C shallow-server B &&
-	git -C shallow-server checkout -b branch &&
-	test_commit -C shallow-server C &&
-	test_commit -C shallow-server E &&
-	test_commit -C shallow-server D &&
-	d="$(git -C shallow-server rev-parse --verify D^0)" &&
-	git -C shallow-server checkout main &&
-
-	git clone --depth=1 --no-tags --no-single-branch \
-		"file://$PWD/shallow-server" shallow-client &&
-
-	: now remove the branch and fetch with prune &&
-	git -C shallow-server branch -D branch &&
-	git -C shallow-client fetch --prune --depth=1 \
-		origin "+refs/heads/*:refs/remotes/origin/*" &&
-	git -C shallow-client repack -adfl &&
-	test_must_fail git -C shallow-client rev-parse --verify $d^0 &&
-	! grep $d shallow-client/.git/shallow &&
-
-	git -C shallow-server branch branch-orig $d &&
-	git -C shallow-client fetch --prune --depth=2 \
-		origin "+refs/heads/*:refs/remotes/origin/*"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow-server/.git/
-[main (root-commit) 508df12] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9db1b4] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'branch'
-[branch 3f529c6] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[branch 71381ce] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-[branch f6a9dde] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Switched to branch 'main'
-Cloning into 'shallow-client'...
-Deleted branch branch (was f6a9dde).
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow-server
- - [deleted]         (none)     -> origin/branch
-fatal: Needed a single revision
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow-server
- * [new branch]      branch-orig -> origin/branch-orig
-ok 15 - .git/shallow is edited by repack
-
-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 15 test(s)
-# SKIP no web server found at ''
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5542-push-http-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5542-push-http-shallow/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5528-push-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5528-push-default/repo1/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
+	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
+	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
+		>"${GNUPGHOME}/trustlist.txt" &&
+	(gpgconf --reload all || : ) &&
 
-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 ""
+	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+	       -u committer@example.com -o /dev/null --sign -
 
-[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
+)
+prerequisite GPGSM not satisfied
+ok 11 # skip fail without key and heed user.signingkey x509 (missing GPGSM)
 
-    git push parent1 HEAD:foo
+ok 12 # skip fail without key and heed user.signingkey ssh (missing GPGSSH)
 
-To push to the branch of the same name on the remote, use
+ok 13 # skip failed atomic push does not execute GPG (missing GPG)
 
-    git push parent1 HEAD
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5535-fetch-push-symref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5535-fetch-push-symref/.git/
+expecting success of 5535.1 'setup': 
+	test_commit one &&
+	git clone . src &&
+	git clone src dst1 &&
+	git clone src dst2 &&
+	test_commit two &&
+	( cd src && git pull )
 
-To choose either option permanently, see push.default in 'git help config'.
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'src'...
+done.
+Cloning into 'dst1'...
+done.
+Cloning into 'dst2'...
+done.
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5535-fetch-push-symref/.
+   d79ce16..139b20d  master     -> origin/master
+ * [new tag]         two        -> two
+Updating d79ce16..139b20d
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - setup
 
-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'.
+expecting success of 5535.2 'push': 
+	(
+		cd src &&
+		git push ../dst1 "refs/remotes/*:refs/remotes/*"
+	) &&
+	git ls-remote src "refs/remotes/*" >expect &&
+	git ls-remote dst1 "refs/remotes/*" >actual &&
+	test_cmp expect actual &&
+	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
+	( cd dst1 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
+	test_cmp expect actual
 
-ok 31 - default behavior rejects non-simple push
+To ../dst1
+   d79ce16..139b20d  origin/HEAD -> origin/HEAD
+   d79ce16..139b20d  origin/master -> origin/master
+ok 2 - 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
+expecting success of 5535.3 'fetch': 
+	(
+		cd dst2 &&
+		git fetch ../src "refs/remotes/*:refs/remotes/*"
+	) &&
+	git ls-remote src "refs/remotes/*" >expect &&
+	git ls-remote dst2 "refs/remotes/*" >actual &&
+	test_cmp expect actual &&
+	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
+	( cd dst2 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
+	test_cmp expect actual
 
-[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"
+From ../src
+   d79ce16..139b20d  origin/master -> origin/master
+ * [new tag]         two           -> two
+ok 3 - fetch
 
-# still have 1 known breakage(s)
-# passed all remaining 31 test(s)
-1..32
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5326-multi-pack-bitmaps.sh ***
@@ -342541,7 +337484,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":"20250209T065439.383908Z-Hcf858c9d-P001a150d","thread":"main","time":"2025-02-09T06:54:39.385057Z","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":"20260314T133156.456868Z-H5c947e1c-P0002478f","thread":"main","time":"2026-03-14T13:31:56.458210Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001516,"t_rel":0.001516,"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': 
@@ -343036,18 +337979,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 44f5f459 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 82224a27 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":"20250209T065439.383908Z-Hcf858c9d-P001a150d","thread":"main","time":"2025-02-09T06:54:39.385057Z","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":"20250209T065440.852985Z-Hcf858c9d-P001a2de3","thread":"main","time":"2025-02-09T06:54:40.855476Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.002672,"t_rel":0.002672,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133156.456868Z-H5c947e1c-P0002478f","thread":"main","time":"2026-03-14T13:31:56.458210Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001516,"t_rel":0.001516,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133205.168277Z-H5c947e1c-P000264c6","thread":"main","time":"2026-03-14T13:32:05.169348Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001267,"t_rel":0.001267,"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': 
 		git rev-list --test-bitmap HEAD
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 44f5f459 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 82224a27 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
@@ -344059,19 +339002,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":"20250209T065439.383908Z-Hcf858c9d-P001a150d","thread":"main","time":"2025-02-09T06:54:39.385057Z","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":"20250209T065440.852985Z-Hcf858c9d-P001a2de3","thread":"main","time":"2025-02-09T06:54:40.855476Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.002672,"t_rel":0.002672,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250209T065442.628000Z-Hcf858c9d-P001a4aa4","thread":"main","time":"2025-02-09T06:54:42.629202Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001393,"t_rel":0.001393,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133156.456868Z-H5c947e1c-P0002478f","thread":"main","time":"2026-03-14T13:31:56.458210Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001516,"t_rel":0.001516,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133205.168277Z-H5c947e1c-P000264c6","thread":"main","time":"2026-03-14T13:32:05.169348Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001267,"t_rel":0.001267,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133216.274006Z-H5c947e1c-P000289bb","thread":"main","time":"2026-03-14T13:32:16.275136Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001332,"t_rel":0.001332,"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
@@ -344528,8 +339471,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2025-02-09 06:54:43.589964997 +0000
-+++ after	2025-02-09 06:54:43.637965303 +0000
+--- before	2026-03-14 13:32:21.690677808 +0000
++++ after	2026-03-14 13:32:21.866677808 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -344654,8 +339597,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2025-02-09 06:54:43.849966652 +0000
-+++ after	2025-02-09 06:54:43.869966779 +0000
+--- before	2026-03-14 13:32:22.862677808 +0000
++++ after	2026-03-14 13:32:23.058677808 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -345042,7 +339985,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":"20250209T065444.526713Z-Hcf858c9d-P001a6de7","thread":"main","time":"2025-02-09T06:54:44.527760Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001244,"t_rel":0.001244,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133226.915425Z-H5c947e1c-P0002b237","thread":"main","time":"2026-03-14T13:32:26.916509Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001296,"t_rel":0.001296,"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': 
@@ -345537,18 +340480,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 1d74e562 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":"20250209T065444.526713Z-Hcf858c9d-P001a6de7","thread":"main","time":"2025-02-09T06:54:44.527760Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001244,"t_rel":0.001244,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250209T065445.963412Z-Hcf858c9d-P001a89e7","thread":"main","time":"2025-02-09T06:54:45.964546Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001328,"t_rel":0.001328,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133226.915425Z-H5c947e1c-P0002b237","thread":"main","time":"2026-03-14T13:32:26.916509Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001296,"t_rel":0.001296,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133235.420257Z-H5c947e1c-P0002d171","thread":"main","time":"2026-03-14T13:32:35.421415Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001364,"t_rel":0.001364,"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 / 1d74e562 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
@@ -346563,9 +341506,9 @@
 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":"20250209T065444.526713Z-Hcf858c9d-P001a6de7","thread":"main","time":"2025-02-09T06:54:44.527760Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001244,"t_rel":0.001244,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250209T065445.963412Z-Hcf858c9d-P001a89e7","thread":"main","time":"2025-02-09T06:54:45.964546Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001328,"t_rel":0.001328,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20250209T065447.682395Z-Hcf858c9d-P001aaa16","thread":"main","time":"2025-02-09T06:54:47.683596Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001404,"t_rel":0.001404,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133226.915425Z-H5c947e1c-P0002b237","thread":"main","time":"2026-03-14T13:32:26.916509Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001296,"t_rel":0.001296,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133235.420257Z-H5c947e1c-P0002d171","thread":"main","time":"2026-03-14T13:32:35.421415Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001364,"t_rel":0.001364,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20260314T133246.288061Z-H5c947e1c-P0002f88c","thread":"main","time":"2026-03-14T13:32:46.289186Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001307,"t_rel":0.001307,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 299 - reverse index exists (midx)
 
 expecting success of 5326.300 'rev-list --test-bitmap verifies bitmaps': 
@@ -346683,1098 +341626,5110 @@
 	
 ok 315 - counting objects via bitmap (full bitmap, other)
 
-expecting success of 5326.316 'enumerate commits (full bitmap, other)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 316 - enumerate commits (full bitmap, other)
+expecting success of 5326.316 'enumerate commits (full bitmap, other)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 316 - enumerate commits (full bitmap, other)
+
+expecting success of 5326.317 'enumerate --objects (full bitmap, other)': 
+		git rev-list --objects --use-bitmap-index $branch >actual &&
+		git rev-list --objects $branch >expect &&
+		test_bitmap_traversal expect actual
+	
+expect actual differ: char 4101, line 101
+ok 317 - enumerate --objects (full bitmap, other)
+
+expecting success of 5326.318 'bitmap --objects handles non-commit objects (full bitmap, other)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 318 - bitmap --objects handles non-commit objects (full bitmap, other)
+
+expecting success of 5326.319 'clone from bitmapped repository': 
+		rm -fr clone.git &&
+		git clone --no-local --bare . clone.git &&
+		git rev-parse HEAD >expect &&
+		git --git-dir=clone.git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	
+Cloning into bare repository 'clone.git'...
+ok 319 - clone from bitmapped repository
+
+expecting success of 5326.320 'partial clone from bitmapped repository': 
+		test_config uploadpack.allowfilter true &&
+		rm -fr partial-clone.git &&
+		git clone --no-local --bare --filter=blob:none . partial-clone.git &&
+		(
+			cd partial-clone.git &&
+			pack=$(echo objects/pack/*.pack) &&
+			git verify-pack -v "$pack" >have &&
+			awk "/blob/ { print \$1 }" <have >blobs &&
+			# we expect this single blob because of the direct ref
+			git rev-parse refs/tags/tagged-blob >expect &&
+			test_cmp expect blobs
+		)
+	
+Cloning into bare repository 'partial-clone.git'...
+ok 320 - partial clone from bitmapped repository
+
+expecting success of 5326.321 'setup further non-bitmapped commits': 
+		test_commit_bulk --id=further 10
+	
+37cdfb15dda4b8a893283d6025391133fad61400
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           10 (        10 duplicates                  )
+      blobs  :            0 (        10 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           10 (         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:            140
+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          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       5262 /       5262
+---------------------------------------------------------------------
+
+ok 321 - setup further non-bitmapped commits
+
+expecting success of 5326.322 'counting commits via bitmap (partial bitmap, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 322 - counting commits via bitmap (partial bitmap, second)
+
+expecting success of 5326.323 'counting partial commits via bitmap (partial bitmap, second)': 
+		git rev-list --count $branch~5..$branch >expect &&
+		git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
+		test_cmp expect actual
+	
+ok 323 - counting partial commits via bitmap (partial bitmap, second)
+
+expecting success of 5326.324 'counting commits with limit (partial bitmap, second)': 
+		git rev-list --count -n 1 $branch >expect &&
+		git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
+		test_cmp expect actual
+	
+ok 324 - counting commits with limit (partial bitmap, second)
+
+expecting success of 5326.325 'counting non-linear history (partial bitmap, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 325 - counting non-linear history (partial bitmap, second)
+
+expecting success of 5326.326 'counting commits with limiting (partial bitmap, second)': 
+		git rev-list --count $branch -- 1.t >expect &&
+		git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
+		test_cmp expect actual
+	
+ok 326 - counting commits with limiting (partial bitmap, second)
+
+expecting success of 5326.327 'counting objects via bitmap (partial bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 327 - counting objects via bitmap (partial bitmap, second)
+
+expecting success of 5326.328 'enumerate commits (partial bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 328 - enumerate commits (partial bitmap, second)
+
+expecting success of 5326.329 'enumerate --objects (partial bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch >actual &&
+		git rev-list --objects $branch >expect &&
+		test_bitmap_traversal expect actual
+	
+expect actual differ: char 1, line 1
+ok 329 - enumerate --objects (partial bitmap, second)
+
+expecting success of 5326.330 'bitmap --objects handles non-commit objects (partial bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 330 - bitmap --objects handles non-commit objects (partial bitmap, second)
+
+expecting success of 5326.331 'counting commits via bitmap (partial bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 331 - counting commits via bitmap (partial bitmap, other)
+
+expecting success of 5326.332 'counting partial commits via bitmap (partial bitmap, other)': 
+		git rev-list --count $branch~5..$branch >expect &&
+		git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
+		test_cmp expect actual
+	
+ok 332 - counting partial commits via bitmap (partial bitmap, other)
+
+expecting success of 5326.333 'counting commits with limit (partial bitmap, other)': 
+		git rev-list --count -n 1 $branch >expect &&
+		git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
+		test_cmp expect actual
+	
+ok 333 - counting commits with limit (partial bitmap, other)
+
+expecting success of 5326.334 'counting non-linear history (partial bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 334 - counting non-linear history (partial bitmap, other)
+
+expecting success of 5326.335 'counting commits with limiting (partial bitmap, other)': 
+		git rev-list --count $branch -- 1.t >expect &&
+		git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
+		test_cmp expect actual
+	
+ok 335 - counting commits with limiting (partial bitmap, other)
+
+expecting success of 5326.336 'counting objects via bitmap (partial bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 336 - counting objects via bitmap (partial bitmap, other)
+
+expecting success of 5326.337 'enumerate commits (partial bitmap, other)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 337 - enumerate commits (partial bitmap, other)
+
+expecting success of 5326.338 'enumerate --objects (partial bitmap, other)': 
+		git rev-list --objects --use-bitmap-index $branch >actual &&
+		git rev-list --objects $branch >expect &&
+		test_bitmap_traversal expect actual
+	
+expect actual differ: char 4101, line 101
+ok 338 - enumerate --objects (partial bitmap, other)
+
+expecting success of 5326.339 'bitmap --objects handles non-commit objects (partial bitmap, other)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 339 - bitmap --objects handles non-commit objects (partial bitmap, other)
+
+expecting success of 5326.340 'fetch (partial bitmap)': 
+		git --git-dir=clone.git fetch origin second:second &&
+		git rev-parse HEAD >expect &&
+		git --git-dir=clone.git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/.
+   37cdfb1..8935311  second     -> second
+ok 340 - fetch (partial bitmap)
+
+expecting success of 5326.341 'enumerating progress counts pack-reused objects': 
+		count=$(git rev-list --objects --all --count) &&
+		git repack -adb &&
+
+		# check first with only reused objects; confirm that our
+		# progress showed the right number, and also that we did
+		# pack-reuse as expected.  Check only the final "done"
+		# line of the meter (there may be an arbitrary number of
+		# intermediate lines ending with CR).
+		GIT_PROGRESS_DELAY=0 \
+			git pack-objects --all --stdout --progress \
+			</dev/null >/dev/null 2>stderr &&
+		grep "Enumerating objects: $count, done" stderr &&
+		grep "pack-reused $count" stderr &&
+
+		# now the same but with one non-reused object
+		git commit --allow-empty -m "an extra commit object" &&
+		GIT_PROGRESS_DELAY=0 \
+			git pack-objects --all --stdout --progress \
+			</dev/null >/dev/null 2>stderr &&
+		grep "Enumerating objects: $((count+1)), done" stderr &&
+		grep "pack-reused $count" stderr
+	
+Enumerating objects: 766, done.
+Total 766 (delta 0), reused 0 (delta 0), pack-reused 766 (from 1)
+[second 641c264] an extra commit object
+ Author: A U Thor <author@example.com>
+Enumerating objects: 767, done.
+Total 767 (delta 0), reused 0 (delta 0), pack-reused 766 (from 1)
+ok 341 - enumerating progress counts pack-reused objects
+
+expecting success of 5326.342 'removing a MIDX clears stale bitmaps': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit base &&
+			git repack &&
+			git multi-pack-index write --bitmap &&
+
+			# Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
+			stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
+			rm $midx &&
+
+			# Then write a new MIDX.
+			test_commit new &&
+			git repack &&
+			git multi-pack-index write --bitmap &&
+
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+			test_path_is_missing $stale_bitmap
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 099797b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 4d35cd2] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+ok 342 - removing a MIDX clears stale bitmaps
+
+expecting success of 5326.343 'pack.preferBitmapTips': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+
+			test_commit_bulk --message="%s" 103 &&
+
+			git log --format="%H" >commits.raw &&
+			sort <commits.raw >commits &&
+
+			git log --format="create refs/tags/%s %H" HEAD >refs &&
+			git update-ref --stdin <refs &&
+
+			git multi-pack-index write --bitmap &&
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+			test-tool bitmap list-commits | sort >bitmaps &&
+			comm -13 bitmaps commits >before &&
+			test_line_count = 1 before &&
+
+			perl -ne "printf(\"create refs/tags/include/%d \", $.); print" \
+				<before | git update-ref --stdin &&
+
+			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+			rm -fr $midx &&
+
+			git -c pack.preferBitmapTips=refs/tags/include \
+				multi-pack-index write --bitmap &&
+			test-tool bitmap list-commits | sort >bitmaps &&
+			comm -13 bitmaps commits >after &&
+
+			! test_cmp before after
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          309 (         0 duplicates                  )
+      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
+      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:            103
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26907 /      26907
+---------------------------------------------------------------------
+
+--- before	2026-03-14 13:32:52.282677808 +0000
++++ after	2026-03-14 13:32:52.482677808 +0000
+@@ -1 +1 @@
+-a09427aadc45553b705d3a726a24ceeaa43874f0
++e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
+ok 343 - pack.preferBitmapTips
+
+expecting success of 5326.344 'writing a bitmap with --refs-snapshot': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+
+			test_commit one &&
+			test_commit two &&
+
+			git rev-parse one >snapshot &&
+
+			git repack -ad &&
+
+			# First, write a MIDX which see both refs/tags/one and
+			# refs/tags/two (causing both of those commits to receive
+			# bitmaps).
+			git multi-pack-index write --bitmap &&
+
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+			test-tool bitmap list-commits | sort >bitmaps &&
+			grep "$(git rev-parse one)" bitmaps &&
+			grep "$(git rev-parse two)" bitmaps &&
+
+			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+			rm -fr $midx &&
+
+			# Then again, but with a refs snapshot which only sees
+			# refs/tags/one.
+			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+			test-tool bitmap list-commits | sort >bitmaps &&
+			grep "$(git rev-parse one)" bitmaps &&
+			! grep "$(git rev-parse two)" bitmaps
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 9b01d55] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 3d96559] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+9b01d555d17b903201cacf13508d9da2598a89a5
+3d9655938dbedf871db7ad3f79a0636d8d0acc16
+9b01d555d17b903201cacf13508d9da2598a89a5
+ok 344 - writing a bitmap with --refs-snapshot
+
+expecting success of 5326.345 'write a bitmap with --refs-snapshot (preferred tips)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+
+			test_commit_bulk --message="%s" 103 &&
+
+			git log --format="%H" >commits.raw &&
+			sort <commits.raw >commits &&
+
+			git log --format="create refs/tags/%s %H" HEAD >refs &&
+			git update-ref --stdin <refs &&
+
+			git multi-pack-index write --bitmap &&
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+			test-tool bitmap list-commits | sort >bitmaps &&
+			comm -13 bitmaps commits >before &&
+			test_line_count = 1 before &&
+
+			(
+				grep -vf before commits.raw &&
+				# mark missing commits as preferred
+				sed "s/^/+/" before
+			) >snapshot &&
+
+			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+			rm -fr $midx &&
+
+			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+			test-tool bitmap list-commits | sort >bitmaps &&
+			comm -13 bitmaps commits >after &&
+
+			! test_cmp before after
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          309 (         0 duplicates                  )
+      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
+      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:            103
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26907 /      26907
+---------------------------------------------------------------------
+
+--- before	2026-03-14 13:32:53.658677808 +0000
++++ after	2026-03-14 13:32:53.850677808 +0000
+@@ -1 +1 @@
+-a09427aadc45553b705d3a726a24ceeaa43874f0
++e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
+ok 345 - write a bitmap with --refs-snapshot (preferred tips)
+
+expecting success of 5326.346 'hash-cache values are propagated from pack bitmaps': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+
+			test_commit base &&
+			test_commit base2 &&
+			git repack -adb &&
+
+			test-tool bitmap dump-hashes >pack.raw &&
+			test_file_not_empty pack.raw &&
+			sort pack.raw >pack.hashes &&
+
+			test_commit new &&
+			git repack &&
+			git multi-pack-index write --bitmap &&
+
+			test-tool bitmap dump-hashes >midx.raw &&
+			sort midx.raw >midx.hashes &&
+
+			# ensure that every namehash in the pack bitmap can be found in
+			# the midx bitmap (i.e., that there are no oid-namehash pairs
+			# unique to the pack bitmap).
+			comm -23 pack.hashes midx.hashes >dropped.hashes &&
+			test_must_be_empty dropped.hashes
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 099797b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 513b690] base2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base2.t
+[master c4bd5cc] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+ok 346 - hash-cache values are propagated from pack bitmaps
+
+expecting success of 5326.347 'no .bitmap is written without any objects': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+
+			empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
+			cat >packs <<-EOF &&
+			pack-$empty.idx
+			EOF
+
+			git multi-pack-index write --bitmap --stdin-packs \
+				<packs 2>err &&
+
+			grep "bitmap without any objects" err &&
+
+			test_path_is_file $midx &&
+			test_path_is_missing $midx-$(midx_checksum $objdir).bitmap
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+warning: refusing to write multi-pack .bitmap without any objects
+ok 347 - no .bitmap is written without any objects
+
+expecting success of 5326.348 'graceful fallback when missing reverse index': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+
+			test_commit base &&
+
+			# write a pack and MIDX bitmap containing base
+			git repack -adb &&
+			git multi-pack-index write --bitmap &&
+
+			GIT_TEST_MIDX_READ_RIDX=0 \
+				git rev-list --use-bitmap-index HEAD 2>err &&
+			! grep "ignoring extra bitmap file" err
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 099797b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+099797b4d0eb8d4e4edb917fe24ec0b4659190f9
+ok 348 - graceful fallback when missing reverse index
+
+expecting success of 5326.349 'multi-pack-index write writes lookup table if enabled': 
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+		test_commit base &&
+		git config pack.writeBitmapLookupTable true &&
+		git repack -ad &&
+		GIT_TRACE2_EVENT="$(pwd)/trace" \
+			git multi-pack-index write --bitmap &&
+		grep "\"label\":\"writing_lookup_table\"" trace
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 099797b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+{"event":"region_enter","sid":"20260314T133255.286510Z-H5c947e1c-P0003176e","thread":"main","time":"2026-03-14T13:32:55.288591Z","file":"pack-bitmap-write.c","line":961,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20260314T133255.286510Z-H5c947e1c-P0003176e","thread":"main","time":"2026-03-14T13:32:55.288596Z","file":"pack-bitmap-write.c","line":988,"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': 
+	git init preferred-pack-with-existing &&
+	(
+		cd preferred-pack-with-existing &&
+
+		test_commit base &&
+		test_commit other &&
+
+		git rev-list --objects --no-object-names base >p1.objects &&
+		git rev-list --objects --no-object-names other >p2.objects &&
+
+		p1="$(git pack-objects "$objdir/pack/pack" \
+			--delta-base-offset <p1.objects)" &&
+		p2="$(git pack-objects "$objdir/pack/pack" \
+			--delta-base-offset <p2.objects)" &&
+
+		# Generate a MIDX containing the first two packs,
+		# marking p1 as preferred, and ensure that it can be
+		# successfully cloned.
+		git multi-pack-index write --bitmap \
+			--preferred-pack="pack-$p1.pack" &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+		git clone --no-local . clone1 &&
+
+		# Then generate a new pack which sorts ahead of any
+		# existing pack (by tweaking the pack prefix).
+		test_commit foo &&
+		git pack-objects --all --unpacked $objdir/pack/pack0 &&
+
+		# Generate a new MIDX which changes the preferred pack
+		# to a pack contained in the existing MIDX.
+		git multi-pack-index write --bitmap \
+			--preferred-pack="pack-$p2.pack" &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		# When the above circumstances are met, the preferred
+		# pack should change appropriately and clones should
+		# (still) succeed.
+		git clone --no-local . clone2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/preferred-pack-with-existing/.git/
+[master (root-commit) 099797b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 2949ebd] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+Cloning into 'clone1'...
+[master fa5f385] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+2470b6aceb2fec8703240e640aa9aaa349180fbf
+Cloning into 'clone2'...
+ok 350 - preferred pack change with existing MIDX bitmap
+
+expecting success of 5326.351 'tagged commits are selected for bitmapping': 
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit --annotate base &&
+		git repack -d &&
+
+		# Remove refs/heads/main which points at the commit directly,
+		# leaving only a reference to the annotated tag.
+		git branch -M main &&
+		git checkout base &&
+		git branch -d main &&
+
+		git multi-pack-index write --bitmap &&
+
+		git rev-parse HEAD >want &&
+		test-tool bitmap list-commits >actual &&
+		grep $(cat want) actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 099797b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+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 099797b base
+Deleted branch main (was 099797b).
+099797b4d0eb8d4e4edb917fe24ec0b4659190f9
+ok 351 - tagged commits are selected for bitmapping
+
+expecting success of 5326.352 'do not follow replace objects for MIDX bitmap': 
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit A &&
+		test_commit B &&
+		git checkout --orphan=orphan A &&
+		test_commit orphan &&
+
+		git replace A HEAD &&
+		git repack -ad --write-midx --write-bitmap-index &&
+
+		# generating reachability bitmaps with replace refs
+		# enabled will result in broken clones
+		git clone --no-local --bare . clone.git
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) c811480] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master 610f946] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'orphan'
+[orphan (root-commit) 9d67859] orphan
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 A.t
+ create mode 100644 orphan.t
+Cloning into bare repository 'clone.git'...
+ok 352 - do not follow replace objects for MIDX bitmap
+
+expecting success of 5326.353 'git fsck correctly identifies good and bad bitmaps': 
+	git init valid &&
+	test_when_finished rm -rf valid &&
+
+	test_commit_bulk 20 &&
+	git repack -adbf &&
+
+	# Move pack-bitmap aside so it is not deleted
+	# in next repack.
+	packbitmap=$(ls .git/objects/pack/pack-*.bitmap) &&
+	mv "$packbitmap" "$packbitmap.bak" &&
+
+	test_commit_bulk 10 &&
+	git repack -b --write-midx &&
+	midxbitmap=$(ls .git/objects/pack/multi-pack-index-*.bitmap) &&
+
+	# Copy MIDX bitmap to backup. Copy pack bitmap from backup.
+	cp "$midxbitmap" "$midxbitmap.bak" &&
+	cp "$packbitmap.bak" "$packbitmap" &&
+
+	# fsck works at first
+	git fsck 2>err &&
+	test_must_be_empty err &&
+
+	corrupt_file "$packbitmap" &&
+	test_must_fail git fsck 2>err &&
+	grep "bitmap file '$packbitmap' has invalid checksum" err &&
+
+	cp "$packbitmap.bak" "$packbitmap" &&
+	corrupt_file "$midxbitmap" &&
+	test_must_fail git fsck 2>err &&
+	grep "bitmap file '$midxbitmap' has invalid checksum" err &&
+
+	corrupt_file "$packbitmap" &&
+	test_must_fail git fsck 2>err &&
+	grep "bitmap file '$midxbitmap' has invalid checksum" err &&
+	grep "bitmap file '$packbitmap' has invalid checksum" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/valid/.git/
+641c2643d50bafd6a42892f7d5901fa38d8530d5
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           60 (         0 duplicates                  )
+      blobs  :           20 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           20 (         0 duplicates         19 deltas of         19 attempts)
+      commits:           20 (         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:            144
+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            =         23
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      74956 /      74956
+---------------------------------------------------------------------
+
+56c6da2da8b7069730f28602736aab04b11dccd3
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           10 (        10 duplicates                  )
+      blobs  :            0 (        10 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:           10 (         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:            144
+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            =         16
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      84931 /      84931
+---------------------------------------------------------------------
+
+Nothing new to pack.
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+5+0 records in
+5+0 records out
+5 bytes copied, 0.00048664 s, 10.3 kB/s
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+error: bitmap file '.git/objects/pack/pack-f2037451ebf511e5dfb11f6dbb7f3ea62e2990df.bitmap' has invalid checksum
+5+0 records in
+5+0 records out
+5 bytes copied, 3.824e-05 s, 131 kB/s
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+error: bitmap file '.git/objects/pack/multi-pack-index-9d67e2406603395917f6eb9cc62c2801910eacd7.bitmap' has invalid checksum
+5+0 records in
+5+0 records out
+5 bytes copied, 0.0070946 s, 0.7 kB/s
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+error: bitmap file '.git/objects/pack/multi-pack-index-9d67e2406603395917f6eb9cc62c2801910eacd7.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-f2037451ebf511e5dfb11f6dbb7f3ea62e2990df.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': 
+	git init corrupt-midx-bitmap &&
+	(
+		cd corrupt-midx-bitmap &&
+
+		test_commit first &&
+		git repack -d &&
+		test_commit second &&
+		git repack -d &&
+
+		git multi-pack-index write --bitmap &&
+		checksum=$(midx_checksum $objdir) &&
+		for f in $midx $midx-$checksum.bitmap
+		do
+			mv $f $f.bak || return 1
+		done &&
+
+		# pack everything together, invalidating the MIDX
+		git repack -ad &&
+		# then restore the now-stale MIDX
+		for f in $midx $midx-$checksum.bitmap
+		do
+			mv $f.bak $f || return 1
+		done &&
+
+		git rev-list --count --objects --use-bitmap-index HEAD >out 2>err &&
+		# should attempt opening the broken pack twice (once
+		# from the attempt to load it via the stale bitmap, and
+		# again when attempting to load it from the stale MIDX)
+		# before falling back to the non-MIDX case
+		test 2 -eq $(grep -c "could not open pack" err) &&
+		test 6 -eq $(cat out)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/corrupt-midx-bitmap/.git/
+[master (root-commit) 1e63793] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[master e31ad28] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 354 - corrupt MIDX with bitmap causes fallback
+
+expecting success of 5326.355 'reading MIDX without BTMP chunk does not complain with single pack reuse': 
+		test_when_finished "rm -rf midx-without-btmp" &&
+		git init midx-without-btmp &&
+		(
+			cd midx-without-btmp &&
+			test_commit initial &&
+
+			git repack -Adbl --write-bitmap-index --write-midx &&
+			GIT_TEST_MIDX_READ_BTMP=false git -c pack.allowPackReuse=$allow_pack_reuse \
+				pack-objects --all --use-bitmap-index --stdout </dev/null >/dev/null 2>err &&
+			test_must_be_empty err
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/midx-without-btmp/.git/
+[master (root-commit) c8c9e8b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 355 - reading MIDX without BTMP chunk does not complain with single pack reuse
+
+expecting success of 5326.356 'reading MIDX without BTMP chunk does not complain with multi pack reuse': 
+		test_when_finished "rm -rf midx-without-btmp" &&
+		git init midx-without-btmp &&
+		(
+			cd midx-without-btmp &&
+			test_commit initial &&
+
+			git repack -Adbl --write-bitmap-index --write-midx &&
+			GIT_TEST_MIDX_READ_BTMP=false git -c pack.allowPackReuse=$allow_pack_reuse \
+				pack-objects --all --use-bitmap-index --stdout </dev/null >/dev/null 2>err &&
+			test_must_be_empty err
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/midx-without-btmp/.git/
+[master (root-commit) c8c9e8b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 356 - reading MIDX without BTMP chunk does not complain with multi pack reuse
+
+expecting success of 5326.357 'remove one packfile between MIDX bitmap writes': 
+	git init remove-pack-between-writes &&
+	(
+		cd remove-pack-between-writes &&
+
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+
+		# Create packs with the prefix "pack-A", "pack-B",
+		# "pack-C" to impose a lexicographic order on these
+		# packs so the pack being removed is always from the
+		# middle.
+		packdir=.git/objects/pack &&
+		A="$(echo A | git pack-objects $packdir/pack-A --revs)" &&
+		B="$(echo B | git pack-objects $packdir/pack-B --revs)" &&
+		C="$(echo C | git pack-objects $packdir/pack-C --revs)" &&
+
+		git multi-pack-index write --bitmap &&
+
+		cat >in <<-EOF &&
+		pack-A-$A.idx
+		pack-C-$C.idx
+		EOF
+		git multi-pack-index write --bitmap --stdin-packs <in &&
+
+		git rev-list --test-bitmap HEAD
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/remove-pack-between-writes/.git/
+[master (root-commit) 3c70836] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master 4ab4ae4] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 943fdd9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Bitmap v1 test (3 entries loaded)
+Found bitmap for '943fdd9d6899d69a092640463db2e2e71c362852'. 64 bits / e80cb860 checksum
+Verifying bitmap entries:  11% (1/9)
Verifying bitmap entries:  22% (2/9)
Verifying bitmap entries:  33% (3/9)
Verifying bitmap entries:  44% (4/9)
Verifying bitmap entries:  55% (5/9)
Verifying bitmap entries:  66% (6/9)
Verifying bitmap entries:  77% (7/9)
Verifying bitmap entries:  88% (8/9)
Verifying bitmap entries: 100% (9/9)
Verifying bitmap entries: 100% (9/9), done.
+OK!
+ok 357 - remove one packfile between MIDX bitmap writes
+
+# passed all 357 test(s)
+1..357
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5536-fetch-conflicts.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/.git/
+expecting success of 5536.1 'setup': 
+	git commit --allow-empty -m "Initial" &&
+	git branch branch1 &&
+	git tag tag1 &&
+	git commit --allow-empty -m "First" &&
+	git branch branch2 &&
+	git tag tag2
+
+[master (root-commit) d31adcd] Initial
+ Author: A U Thor <author@example.com>
+[master 1a200fb] First
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 5536.2 'fetch with no conflict': 
+	setup_repository ok "+refs/heads/*:refs/remotes/origin/*" && (
+		cd ok &&
+		git fetch origin
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/ok/.git/
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts
+ * [new branch]      branch1    -> origin/branch1
+ * [new branch]      branch2    -> origin/branch2
+ * [new branch]      master     -> origin/master
+ * [new tag]         tag1       -> tag1
+ * [new tag]         tag2       -> tag2
+ok 2 - fetch with no conflict
+
+expecting success of 5536.3 'fetch conflict: config vs. config': 
+	setup_repository ccc \
+		"+refs/heads/branch1:refs/remotes/origin/branch1" \
+		"+refs/heads/branch2:refs/remotes/origin/branch1" && (
+		cd ccc &&
+		test_must_fail git fetch origin 2>error &&
+		test_grep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/ccc/.git/
+fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
+ok 3 - fetch conflict: config vs. config
+
+expecting success of 5536.4 'fetch duplicate: config vs. config': 
+	setup_repository dcc \
+		"+refs/heads/*:refs/remotes/origin/*" \
+		"+refs/heads/branch1:refs/remotes/origin/branch1" && (
+		cd dcc &&
+		git fetch origin
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/dcc/.git/
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts
+ * [new branch]      branch1    -> origin/branch1
+ * [new branch]      branch2    -> origin/branch2
+ * [new branch]      master     -> origin/master
+ * [new tag]         tag1       -> tag1
+ * [new tag]         tag2       -> tag2
+ok 4 - fetch duplicate: config vs. config
+
+expecting success of 5536.5 'fetch conflict: arg overrides config': 
+	setup_repository aoc \
+		"+refs/heads/*:refs/remotes/origin/*" && (
+		cd aoc &&
+		git fetch origin refs/heads/branch2:refs/remotes/origin/branch1
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/aoc/.git/
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts
+ * [new branch]      branch2    -> origin/branch1
+ * [new tag]         tag2       -> tag2
+ * [new branch]      branch2    -> origin/branch2
+ * [new tag]         tag1       -> tag1
+ok 5 - fetch conflict: arg overrides config
+
+expecting success of 5536.6 'fetch conflict: arg vs. arg': 
+	setup_repository caa && (
+		cd caa &&
+		test_must_fail git fetch origin \
+			refs/heads/*:refs/remotes/origin/* \
+			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
+		test_grep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/caa/.git/
+fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
+ok 6 - fetch conflict: arg vs. arg
+
+expecting success of 5536.7 'fetch conflict: criss-cross args': 
+	setup_repository xaa \
+		"+refs/heads/*:refs/remotes/origin/*" && (
+		cd xaa &&
+		git fetch origin \
+			refs/heads/branch1:refs/remotes/origin/branch2 \
+			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
+		test_grep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
+		test_grep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5536-fetch-conflicts/xaa/.git/
+warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2
+warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1
+ok 7 - fetch conflict: criss-cross args
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5411-proc-receive-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/.git/
+expecting success of 5411.1 'setup upstream and workbench': 
+		rm -rf upstream.git &&
+		rm -rf workbench &&
+		git init --bare upstream.git &&
+		git init workbench &&
+		create_commits_in workbench A B &&
+		(
+			cd workbench &&
+			# Try to make a stable fixed width for abbreviated commit ID,
+			# this fixed-width oid will be replaced with "<OID>".
+			git config core.abbrev 7 &&
+			git tag -m "v123" v123 $A &&
+			git remote add origin ../upstream.git &&
+			git push origin main &&
+			git update-ref refs/heads/main $A $B &&
+			git -C ../upstream.git update-ref \
+				refs/heads/main $A $B
+		) &&
+		TAG=$(git -C workbench rev-parse v123) &&
+
+		# setup pre-receive hook
+		test_hook --setup -C upstream.git pre-receive <<-\EOF &&
+		exec >&2
+		echo "# pre-receive hook"
+		while read old new ref
+		do
+			echo "pre-receive< $old $new $ref"
+		done
+		EOF
+
+		# setup post-receive hook
+		test_hook --setup -C upstream.git post-receive <<-\EOF &&
+		exec >&2
+		echo "# post-receive hook"
+		while read old new ref
+		do
+			echo "post-receive< $old $new $ref"
+		done
+		EOF
+
+		upstream=upstream.git
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/upstream.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/workbench/.git/
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+To ../upstream.git
+ * [new branch]      main -> main
+ok 1 - setup upstream and workbench
+
+expecting success of 5411.2 'setup receive.procReceiveRefs': 
+	git -C "$upstream" config --add receive.procReceiveRefs refs/for
+
+ok 2 - setup receive.procReceiveRefs
+
+expecting success of 5411.3 'setup proc-receive hook': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic1" \
+		-r "option fall-through" \
+		-r "ok refs/for/main/topic2" \
+		-r "option refname refs/for/changes/23/123/1" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic2" \
+		-r "option refname refs/for/changes/24/124/2" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update" \
+		-r "ng refs/for/next/topic target branch not exist"
+	EOF
+
+ok 3 - setup proc-receive hook
+
+expecting success of 5411.4 'proc-receive: report status v1': 
+	{
+		if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1"
+		then
+			printf "%s %s refs/heads/main\0report-status\n" \
+				$A $B | packetize_raw
+		else
+			printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \
+				$A $B | packetize_raw
+		fi &&
+		printf "%s %s refs/for/main/topic1\n" \
+			$ZERO_OID $A | packetize &&
+		printf "%s %s refs/heads/foo\n" \
+			$ZERO_OID $A | packetize &&
+		printf "%s %s refs/for/next/topic\n" \
+			$ZERO_OID $A | packetize &&
+		printf "%s %s refs/for/main/topic2\n" \
+			$ZERO_OID $A | packetize &&
+		printf 0000 &&
+		printf "" | git -C "$upstream" pack-objects --stdout
+	} | git receive-pack "$upstream" --stateless-rpc \
+	>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	# pre-receive hook
+	pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
+	# proc-receive hook
+	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
+	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
+	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
+	proc-receive> ok refs/for/main/topic1
+	proc-receive> option fall-through
+	proc-receive> ok refs/for/main/topic2
+	proc-receive> option refname refs/for/changes/23/123/1
+	proc-receive> option new-oid <COMMIT-A>
+	proc-receive> ok refs/for/main/topic2
+	proc-receive> option refname refs/for/changes/24/124/2
+	proc-receive> option old-oid <COMMIT-B>
+	proc-receive> option new-oid <COMMIT-A>
+	proc-receive> option forced-update
+	proc-receive> ng refs/for/next/topic target branch not exist
+	000eunpack ok
+	0017ok refs/heads/main
+	001cok refs/for/main/topic1
+	0016ok refs/heads/foo
+	0033ng refs/for/next/topic target branch not exist
+	001cok refs/for/main/topic2
+	0000# post-receive hook
+	post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+	post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
+	post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
+	post-receive< <ZERO-OID> <COMMIT-A> refs/for/changes/23/123/1
+	post-receive< <COMMIT-B> <COMMIT-A> refs/for/changes/24/124/2
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/for/main/topic1
+	<COMMIT-A> refs/heads/foo
+	<COMMIT-B> refs/heads/main
+	EOF
+
+ok 4 - proc-receive: report status v1
+
+expecting success of 5411.5 'setup upstream and workbench': 
+		rm -rf upstream.git &&
+		rm -rf workbench &&
+		git init --bare upstream.git &&
+		git init workbench &&
+		create_commits_in workbench A B &&
+		(
+			cd workbench &&
+			# Try to make a stable fixed width for abbreviated commit ID,
+			# this fixed-width oid will be replaced with "<OID>".
+			git config core.abbrev 7 &&
+			git tag -m "v123" v123 $A &&
+			git remote add origin ../upstream.git &&
+			git push origin main &&
+			git update-ref refs/heads/main $A $B &&
+			git -C ../upstream.git update-ref \
+				refs/heads/main $A $B
+		) &&
+		TAG=$(git -C workbench rev-parse v123) &&
+
+		# setup pre-receive hook
+		test_hook --setup -C upstream.git pre-receive <<-\EOF &&
+		exec >&2
+		echo "# pre-receive hook"
+		while read old new ref
+		do
+			echo "pre-receive< $old $new $ref"
+		done
+		EOF
+
+		# setup post-receive hook
+		test_hook --setup -C upstream.git post-receive <<-\EOF &&
+		exec >&2
+		echo "# post-receive hook"
+		while read old new ref
+		do
+			echo "post-receive< $old $new $ref"
+		done
+		EOF
+
+		upstream=upstream.git
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/upstream.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5411-proc-receive-hook/workbench/.git/
+[main (root-commit) a3899a0] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main 7763d60] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+To ../upstream.git
+ * [new branch]      main -> main
+ok 5 - setup upstream and workbench
+
+expecting success of 5411.6 'git-push (builtin protocol)': 
+	git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
+	>  * [new branch]      HEAD -> next
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 6 - git-push (builtin protocol)
+
+expecting success of 5411.7 'git-push --atomic (builtin protocol)': 
+	test_must_fail git -C workbench push --atomic origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> To <URL/of/upstream.git>
+	>  ! [rejected]        main -> main (non-fast-forward)
+	>  ! [rejected]        <COMMIT-B> -> next (atomic push failed)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 7 - git-push --atomic (builtin protocol)
+
+expecting success of 5411.8 'non-fast-forward git-push (builtin protocol)': 
+	test_must_fail git \
+		-C workbench \
+		-c advice.pushUpdateRejected=false \
+		push origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> next
+	>  ! [rejected]        main -> main (non-fast-forward)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-B> refs/heads/next
+	EOF
+
+ok 8 - non-fast-forward git-push (builtin protocol)
+
+expecting success of 5411.9 'git-push -f (builtin protocol)': 
+	git -C workbench push -f origin \
+		refs/tags/v123 \
+		:refs/heads/next \
+		main \
+		main:refs/review/main/topic \
+		HEAD:refs/heads/a/b/c \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> To <URL/of/upstream.git>
+	>  + <COMMIT-B>...<COMMIT-A> main -> main (forced update)
+	>  - [deleted]         next
+	>  * [new tag]         v123 -> v123
+	>  * [new reference]   main -> refs/review/main/topic
+	>  * [new branch]      HEAD -> a/b/c
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/a/b/c
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/review/main/topic
+	<TAG-v123> refs/tags/v123
+	EOF
+
+ok 9 - git-push -f (builtin protocol)
+
+expecting success of 5411.10 'cleanup (builtin protocol)': 
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/review/main/topic &&
+		git update-ref -d refs/tags/v123 &&
+		git update-ref -d refs/heads/a/b/c
+	)
+
+ok 10 - cleanup (builtin protocol)
+
+expecting success of 5411.11 'git-push (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+	> *	HEAD:refs/heads/next	[new branch]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 11 - git-push (builtin protocol/porcelain)
+
+expecting success of 5411.12 'git-push --atomic (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --atomic --porcelain origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "s/^# GETTEXT POISON #//" \
+		-e "/^To / { p; }" \
+		-e "/^!/ { p; }" \
+		<out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> To <URL/of/upstream.git>
+	> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+	> !	<COMMIT-B>:refs/heads/next	[rejected] (atomic push failed)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 12 - git-push --atomic (builtin protocol/porcelain)
+
+expecting success of 5411.13 'non-fast-forward git-push (builtin protocol/porcelain)': 
+	test_must_fail git \
+		-C workbench \
+		-c advice.pushUpdateRejected=false \
+		push --porcelain origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/next	<COMMIT-A>..<COMMIT-B>
+	> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-B> refs/heads/next
+	EOF
+
+ok 13 - non-fast-forward git-push (builtin protocol/porcelain)
+
+expecting success of 5411.14 'git-push -f (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain -f origin \
+		refs/tags/v123 \
+		:refs/heads/next \
+		main \
+		main:refs/review/main/topic \
+		HEAD:refs/heads/a/b/c \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> To <URL/of/upstream.git>
+	> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+	> -	:refs/heads/next	[deleted]
+	> *	refs/tags/v123:refs/tags/v123	[new tag]
+	> *	refs/heads/main:refs/review/main/topic	[new reference]
+	> *	HEAD:refs/heads/a/b/c	[new branch]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/a/b/c
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/review/main/topic
+	<TAG-v123> refs/tags/v123
+	EOF
+
+ok 14 - git-push -f (builtin protocol/porcelain)
+
+expecting success of 5411.15 'cleanup (builtin protocol/porcelain)': 
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/review/main/topic &&
+		git update-ref -d refs/tags/v123 &&
+		git update-ref -d refs/heads/a/b/c
+	)
+
+ok 15 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.16 'setup pre-receive hook (builtin protocol)': 
+	mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
+	test_hook -C "$upstream" --clobber pre-receive <<-\EOF
+	exit 1
+	EOF
+
+ok 16 - setup pre-receive hook (builtin protocol)
+
+expecting success of 5411.17 'git-push is declined (builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] <COMMIT-B> -> main (pre-receive hook declined)
+	 ! [remote rejected] HEAD -> next (pre-receive hook declined)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-\EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 17 - git-push is declined (builtin protocol)
+
+expecting success of 5411.18 'cleanup (builtin protocol)': 
+	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
+
+ok 18 - cleanup (builtin protocol)
+
+expecting success of 5411.19 'setup pre-receive hook (builtin protocol/porcelain)': 
+	mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
+	test_hook -C "$upstream" --clobber pre-receive <<-\EOF
+	exit 1
+	EOF
+
+ok 19 - setup pre-receive hook (builtin protocol/porcelain)
+
+expecting success of 5411.20 'git-push is declined (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> To <URL/of/upstream.git>
+	> !	<COMMIT-B>:refs/heads/main	[remote rejected] (pre-receive hook declined)
+	> !	HEAD:refs/heads/next	[remote rejected] (pre-receive hook declined)
+	Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 20 - git-push is declined (builtin protocol/porcelain)
+
+expecting success of 5411.21 'cleanup (builtin protocol/porcelain)': 
+	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
+
+ok 21 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.22 'add two receive.procReceiveRefs settings': 
+	(
+		cd "$upstream" &&
+		git config --add receive.procReceiveRefs refs/for &&
+		git config --add receive.procReceiveRefs refs/review/
+	)
+
+ok 22 - add two receive.procReceiveRefs settings
+
+expecting success of 5411.23 'proc-receive: no hook, fail to push special ref (builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:next \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 23 - proc-receive: no hook, fail to push special ref (builtin protocol)
+
+expecting success of 5411.24 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+ok 24 - cleanup (builtin protocol)
+
+expecting success of 5411.25 'proc-receive: no hook, all failed for atomic push (builtin protocol)': 
+	test_must_fail git -C workbench push --atomic origin \
+		$B:main \
+		HEAD:next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] <COMMIT-B> -> main (fail to run proc-receive hook)
+	>  ! [remote rejected] HEAD -> next (fail to run proc-receive hook)
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 25 - proc-receive: no hook, all failed for atomic push (builtin protocol)
+
+expecting success of 5411.26 'proc-receive: no hook, fail to push special ref (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:next \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> !	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 26 - proc-receive: no hook, fail to push special ref (builtin protocol/porcelain)
+
+expecting success of 5411.27 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+ok 27 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.28 'proc-receive: no hook, all failed for atomic push (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain --atomic origin \
+		$B:main \
+		HEAD:next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> To <URL/of/upstream.git>
+	> !	<COMMIT-B>:refs/heads/main	[remote rejected] (fail to run proc-receive hook)
+	> !	HEAD:refs/heads/next	[remote rejected] (fail to run proc-receive hook)
+	> !	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 28 - proc-receive: no hook, all failed for atomic push (builtin protocol/porcelain)
+
+expecting success of 5411.29 'setup proc-receive hook (unknown version, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --version 2
+	EOF
+
+ok 29 - setup proc-receive hook (unknown version, builtin protocol)
+
+expecting success of 5411.30 'proc-receive: bad protocol (unknown version, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+
+	# Check status report for git-push
+	sed -n \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<actual >actual-report &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual-report &&
+
+	# Check error message from "receive-pack", but ignore unstable fatal error
+	# message ("remote: fatal: the remote end hung up unexpectedly") which
+	# is different from the remote HTTP server with different locale settings.
+	grep "^remote: error:" <actual >actual-error &&
+	format_and_save_expect <<-EOF &&
+	> remote: error: proc-receive version "2" is not supported        Z
+	EOF
+	test_cmp expect actual-error &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 30 - proc-receive: bad protocol (unknown version, builtin protocol)
+
+expecting success of 5411.31 'setup proc-receive hook (hook --die-read-version, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-version
+	EOF
+
+ok 31 - setup proc-receive hook (hook --die-read-version, builtin protocol)
+
+expecting success of 5411.32 'proc-receive: bad protocol (hook --die-read-version, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-\EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-read-version option        
+remote: error: fail to negotiate version with proc-receive hook        
+ok 32 - proc-receive: bad protocol (hook --die-read-version, builtin protocol)
+
+expecting success of 5411.33 'setup proc-receive hook (hook --die-write-version, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-version
+	EOF
+
+ok 33 - setup proc-receive hook (hook --die-write-version, builtin protocol)
+
+expecting success of 5411.34 'proc-receive: bad protocol (hook --die-write-version, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-write-version option        
+remote: error: fail to negotiate version with proc-receive hook        
+ok 34 - proc-receive: bad protocol (hook --die-write-version, builtin protocol)
+
+expecting success of 5411.35 'setup proc-receive hook (hook --die-read-commands, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-commands
+	EOF
+
+ok 35 - setup proc-receive hook (hook --die-read-commands, builtin protocol)
+
+expecting success of 5411.36 'proc-receive: bad protocol (hook --die-read-commands, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-read-commands option        
+ok 36 - proc-receive: bad protocol (hook --die-read-commands, builtin protocol)
+
+expecting success of 5411.37 'setup proc-receive hook (hook --die-read-push-options, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-push-options
+	EOF
+
+ok 37 - setup proc-receive hook (hook --die-read-push-options, builtin protocol)
+
+expecting success of 5411.38 'proc-receive: bad protocol (hook --die-read-push-options, builtin protocol)': 
+	git -C "$upstream" config receive.advertisePushOptions true &&
+	test_must_fail git -C workbench push origin \
+		-o reviewers=user1,user2 \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-read-push-options option        
+ok 38 - proc-receive: bad protocol (hook --die-read-push-options, builtin protocol)
+
+expecting success of 5411.39 'setup proc-receive hook (hook --die-write-report, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-report
+	EOF
+
+ok 39 - setup proc-receive hook (hook --die-write-report, builtin protocol)
+
+expecting success of 5411.40 'proc-receive: bad protocol (hook --die-write-report, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-write-report option        
+ok 40 - proc-receive: bad protocol (hook --die-write-report, builtin protocol)
+
+expecting success of 5411.41 'setup proc-receive hook (no report, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v
+	EOF
+
+ok 41 - setup proc-receive hook (no report, builtin protocol)
+
+expecting success of 5411.42 'proc-receive: bad protocol (no report, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 42 - proc-receive: bad protocol (no report, builtin protocol)
+
+expecting success of 5411.43 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+
+ok 43 - cleanup (builtin protocol)
+
+expecting success of 5411.44 'setup proc-receive hook (no ref, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok"
+	EOF
+
+ok 44 - setup proc-receive hook (no ref, builtin protocol)
+
+expecting success of 5411.45 'proc-receive: bad protocol (no ref, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic\
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok        Z
+	> remote: error: proc-receive reported incomplete status line: "ok"        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 45 - proc-receive: bad protocol (no ref, builtin protocol)
+
+expecting success of 5411.46 'setup proc-receive hook (unknown status, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "xx refs/for/main/topic"
+	EOF
+
+ok 46 - setup proc-receive hook (unknown status, builtin protocol)
+
+expecting success of 5411.47 'proc-receive: bad protocol (unknown status, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+			HEAD:refs/for/main/topic \
+			>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> xx refs/for/main/topic        Z
+	> remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 47 - proc-receive: bad protocol (unknown status, builtin protocol)
+
+expecting success of 5411.48 'setup proc-receive hook (unknown version, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --version 2
+	EOF
+
+ok 48 - setup proc-receive hook (unknown version, builtin protocol/porcelain)
+
+expecting success of 5411.49 'proc-receive: bad protocol (unknown version, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+
+	# Check status report for git-push
+	sed -n \
+		-e "/^To / { p; n; p; n; p; }" \
+		<actual >actual-report &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual-report &&
+
+	# Check error message from "receive-pack", but ignore unstable fatal error
+	# message ("remote: fatal: the remote end hung up unexpectedly") which
+	# is different from the remote HTTP server with different locale settings.
+	grep "^remote: error:" <actual >actual-error &&
+	format_and_save_expect <<-EOF &&
+	> remote: error: proc-receive version "2" is not supported        Z
+	EOF
+	test_cmp expect actual-error &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 49 - proc-receive: bad protocol (unknown version, builtin protocol/porcelain)
+
+expecting success of 5411.50 'setup proc-receive hook (hook --die-read-version, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-version
+	EOF
+
+ok 50 - setup proc-receive hook (hook --die-read-version, builtin protocol/porcelain)
+
+expecting success of 5411.51 'proc-receive: bad protocol (hook --die-read-version, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-read-version option        
+remote: error: fail to negotiate version with proc-receive hook        
+ok 51 - proc-receive: bad protocol (hook --die-read-version, builtin protocol/porcelain)
+
+expecting success of 5411.52 'setup proc-receive hook (hook --die-write-version, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-version
+	EOF
+
+ok 52 - setup proc-receive hook (hook --die-write-version, builtin protocol/porcelain)
+
+expecting success of 5411.53 'proc-receive: bad protocol (hook --die-write-version, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-write-version option        
+remote: error: fail to negotiate version with proc-receive hook        
+ok 53 - proc-receive: bad protocol (hook --die-write-version, builtin protocol/porcelain)
+
+expecting success of 5411.54 'setup proc-receive hook (hook --die-read-commands, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-commands
+	EOF
+
+ok 54 - setup proc-receive hook (hook --die-read-commands, builtin protocol/porcelain)
+
+expecting success of 5411.55 'proc-receive: bad protocol (hook --die-read-commands, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-read-commands option        
+ok 55 - proc-receive: bad protocol (hook --die-read-commands, builtin protocol/porcelain)
+
+expecting success of 5411.56 'setup proc-receive hook (hook --die-read-push-options, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-push-options
+	EOF
+
+ok 56 - setup proc-receive hook (hook --die-read-push-options, builtin protocol/porcelain)
+
+expecting success of 5411.57 'proc-receive: bad protocol (hook --die-read-push-options, builtin protocol/porcelain)': 
+	git -C "$upstream" config receive.advertisePushOptions true &&
+	test_must_fail git -C workbench push --porcelain origin \
+		-o reviewers=user1,user2 \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-read-push-options option        
+ok 57 - proc-receive: bad protocol (hook --die-read-push-options, builtin protocol/porcelain)
+
+expecting success of 5411.58 'setup proc-receive hook (hook --die-write-report, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-report
+	EOF
+
+ok 58 - setup proc-receive hook (hook --die-write-report, builtin protocol/porcelain)
+
+expecting success of 5411.59 'proc-receive: bad protocol (hook --die-write-report, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+remote: fatal: die with the --die-write-report option        
+ok 59 - proc-receive: bad protocol (hook --die-write-report, builtin protocol/porcelain)
+
+expecting success of 5411.60 'setup proc-receive hook (no report, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v
+	EOF
+
+ok 60 - setup proc-receive hook (no report, builtin protocol/porcelain)
+
+expecting success of 5411.61 'proc-receive: bad protocol (no report, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 61 - proc-receive: bad protocol (no report, builtin protocol/porcelain)
+
+expecting success of 5411.62 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+ok 62 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.63 'setup proc-receive hook (no ref, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok"
+	EOF
+
+ok 63 - setup proc-receive hook (no ref, builtin protocol/porcelain)
+
+expecting success of 5411.64 'proc-receive: bad protocol (no ref, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic\
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok        Z
+	> remote: error: proc-receive reported incomplete status line: "ok"        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 64 - proc-receive: bad protocol (no ref, builtin protocol/porcelain)
+
+expecting success of 5411.65 'setup proc-receive hook (unknown status, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "xx refs/for/main/topic"
+	EOF
+
+ok 65 - setup proc-receive hook (unknown status, builtin protocol/porcelain)
+
+expecting success of 5411.66 'proc-receive: bad protocol (unknown status, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+			HEAD:refs/for/main/topic \
+			>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> xx refs/for/main/topic        Z
+	> remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 66 - proc-receive: bad protocol (unknown status, builtin protocol/porcelain)
+
+expecting success of 5411.67 'setup proc-receive hook (ng, no message, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic"
+	EOF
+
+ok 67 - setup proc-receive hook (ng, no message, builtin protocol)
+
+expecting success of 5411.68 'proc-receive: fail to update (ng, no message, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (failed)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 68 - proc-receive: fail to update (ng, no message, builtin protocol)
+
+expecting success of 5411.69 'setup proc-receive hook (ng message, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic error msg"
+	EOF
+
+ok 69 - setup proc-receive hook (ng message, builtin protocol)
+
+expecting success of 5411.70 'proc-receive: fail to update (ng, with message, builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic error msg        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (error msg)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 70 - proc-receive: fail to update (ng, with message, builtin protocol)
+
+expecting success of 5411.71 'setup proc-receive hook (ng, no message, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic"
+	EOF
+
+ok 71 - setup proc-receive hook (ng, no message, builtin protocol/porcelain)
+
+expecting success of 5411.72 'proc-receive: fail to update (ng, no message, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (failed)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 72 - proc-receive: fail to update (ng, no message, builtin protocol/porcelain)
+
+expecting success of 5411.73 'setup proc-receive hook (ng message, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic error msg"
+	EOF
+
+ok 73 - setup proc-receive hook (ng message, builtin protocol/porcelain)
+
+expecting success of 5411.74 'proc-receive: fail to update (ng, with message, builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic error msg        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (error msg)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 74 - proc-receive: fail to update (ng, with message, builtin protocol/porcelain)
+
+expecting success of 5411.75 'setup proc-receive hook (unexpected ref, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main"
+	EOF
+
+ok 75 - setup proc-receive hook (unexpected ref, builtin protocol)
+
+expecting success of 5411.76 'proc-receive: report unexpected ref (builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: error: proc-receive reported status on unexpected ref: refs/heads/main        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	EOF
+
+ok 76 - proc-receive: report unexpected ref (builtin protocol)
+
+expecting success of 5411.77 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref refs/heads/main $A
+
+ok 77 - cleanup (builtin protocol)
+
+expecting success of 5411.78 'setup proc-receive hook (unexpected ref, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main"
+	EOF
+
+ok 78 - setup proc-receive hook (unexpected ref, builtin protocol/porcelain)
+
+expecting success of 5411.79 'proc-receive: report unexpected ref (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: error: proc-receive reported status on unexpected ref: refs/heads/main        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	EOF
+
+ok 79 - proc-receive: report unexpected ref (builtin protocol/porcelain)
+
+expecting success of 5411.80 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref refs/heads/main $A
+
+ok 80 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.81 'setup proc-receive hook (unexpected ref, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 81 - setup proc-receive hook (unexpected ref, builtin protocol)
+
+expecting success of 5411.82 'proc-receive: report unknown reference (builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/a/b/c/my/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: error: proc-receive reported status on unknown ref: refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 82 - proc-receive: report unknown reference (builtin protocol)
+
+expecting success of 5411.83 'setup proc-receive hook (unexpected ref, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 83 - setup proc-receive hook (unexpected ref, builtin protocol/porcelain)
+
+expecting success of 5411.84 'proc-receive: report unknown reference (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/a/b/c/my/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: error: proc-receive reported status on unknown ref: refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/a/b/c/my/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 84 - proc-receive: report unknown reference (builtin protocol/porcelain)
+
+expecting success of 5411.85 'setup proc-receive hook and disable push-options (builtin protocol)': 
+	git -C "$upstream" config receive.advertisePushOptions false &&
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 85 - setup proc-receive hook and disable push-options (builtin protocol)
+
+expecting success of 5411.86 'proc-receive: not support push options (builtin protocol)': 
+	test_must_fail git -C workbench push \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	test_grep "fatal: the receiving end does not support push options" \
+		actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+fatal: the receiving end does not support push options
+ok 86 - proc-receive: not support push options (builtin protocol)
+
+expecting success of 5411.87 'enable push options (builtin protocol)': 
+	git -C "$upstream" config receive.advertisePushOptions true
+
+ok 87 - enable push options (builtin protocol)
+
+expecting success of 5411.88 'setup version=0 for proc-receive hook (builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		--version 0 \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 88 - setup version=0 for proc-receive hook (builtin protocol)
+
+expecting success of 5411.89 'proc-receive: ignore push-options for version 0 (builtin protocol)': 
+	git -C workbench push \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  * [new reference]   HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 89 - proc-receive: ignore push-options for version 0 (builtin protocol)
+
+expecting success of 5411.90 'restore proc-receive hook (builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 90 - restore proc-receive hook (builtin protocol)
+
+expecting success of 5411.91 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+ok 91 - cleanup (builtin protocol)
+
+expecting success of 5411.92 'proc-receive: push with options (builtin protocol)': 
+	git -C workbench push \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive: atomic push_options        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< issue=123        Z
+	> remote: proc-receive< reviewer=user1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  * [new reference]   HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 92 - proc-receive: push with options (builtin protocol)
+
+expecting success of 5411.93 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+ok 93 - cleanup (builtin protocol)
+
+expecting success of 5411.94 'setup proc-receive hook and disable push-options (builtin protocol/porcelain)': 
+	git -C "$upstream" config receive.advertisePushOptions false &&
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 94 - setup proc-receive hook and disable push-options (builtin protocol/porcelain)
+
+expecting success of 5411.95 'proc-receive: not support push options (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push \
+		--porcelain \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	test_grep "fatal: the receiving end does not support push options" \
+		actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+fatal: the receiving end does not support push options
+ok 95 - proc-receive: not support push options (builtin protocol/porcelain)
+
+expecting success of 5411.96 'enable push options (builtin protocol/porcelain)': 
+	git -C "$upstream" config receive.advertisePushOptions true
+
+ok 96 - enable push options (builtin protocol/porcelain)
+
+expecting success of 5411.97 'setup version=0 for proc-receive hook (builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		--version 0 \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 97 - setup version=0 for proc-receive hook (builtin protocol/porcelain)
+
+expecting success of 5411.98 'proc-receive: ignore push-options for version 0 (builtin protocol/porcelain)': 
+	git -C workbench push \
+		--porcelain \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> *	HEAD:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 98 - proc-receive: ignore push-options for version 0 (builtin protocol/porcelain)
+
+expecting success of 5411.99 'restore proc-receive hook (builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 99 - restore proc-receive hook (builtin protocol/porcelain)
+
+expecting success of 5411.100 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+ok 100 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.101 'proc-receive: push with options (builtin protocol/porcelain)': 
+	git -C workbench push \
+		--porcelain \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive: atomic push_options        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< issue=123        Z
+	> remote: proc-receive< reviewer=user1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> *	HEAD:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+
+ok 101 - proc-receive: push with options (builtin protocol/porcelain)
+
+expecting success of 5411.102 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
+
+ok 102 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.103 'setup proc-receive hook (ok, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 103 - setup proc-receive hook (ok, builtin protocol)
+
+expecting success of 5411.104 'proc-receive: ok (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 104 - proc-receive: ok (builtin protocol)
+
+expecting success of 5411.105 'setup proc-receive hook (ok, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+
+ok 105 - setup proc-receive hook (ok, builtin protocol/porcelain)
+
+expecting success of 5411.106 'proc-receive: ok (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 106 - proc-receive: ok (builtin protocol/porcelain)
+
+expecting success of 5411.107 'setup proc-receive hook (option without matching ok, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+
+ok 107 - setup proc-receive hook (option without matching ok, builtin protocol)
+
+expecting success of 5411.108 'proc-receive: report option without matching ok (builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: error: proc-receive reported "option" without a matching "ok/ng" directive        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual
+
+ok 108 - proc-receive: report option without matching ok (builtin protocol)
+
+expecting success of 5411.109 'setup proc-receive hook (option refname, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head"
+	EOF
+
+ok 109 - setup proc-receive hook (option refname, builtin protocol)
+
+expecting success of 5411.110 'proc-receive: report option refname (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/pull/123/head
+	EOF
+	test_cmp expect actual
+
+ok 110 - proc-receive: report option refname (builtin protocol)
+
+expecting success of 5411.111 'setup proc-receive hook (option refname and forced-update, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option forced-update"
+	EOF
+
+ok 111 - setup proc-receive hook (option refname and forced-update, builtin protocol)
+
+expecting success of 5411.112 'proc-receive: report option refname and forced-update (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/pull/123/head
+	EOF
+	test_cmp expect actual
+
+ok 112 - proc-receive: report option refname and forced-update (builtin protocol)
+
+expecting success of 5411.113 'setup proc-receive hook (option refname and old-oid, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+
+ok 113 - setup proc-receive hook (option refname and old-oid, builtin protocol)
+
+expecting success of 5411.114 'proc-receive: report option refname and old-oid (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-B>..<COMMIT-A>  HEAD -> refs/pull/123/head
+	EOF
+	test_cmp expect actual
+
+ok 114 - proc-receive: report option refname and old-oid (builtin protocol)
+
+expecting success of 5411.115 'setup proc-receive hook (option old-oid, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $B"
+	EOF
+
+ok 115 - setup proc-receive hook (option old-oid, builtin protocol)
+
+expecting success of 5411.116 'proc-receive: report option old-oid (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-B>..<COMMIT-A>  HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual
+
+ok 116 - proc-receive: report option old-oid (builtin protocol)
+
+expecting success of 5411.117 'setup proc-receive hook (option old-oid and new-oid, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+
+ok 117 - setup proc-receive hook (option old-oid and new-oid, builtin protocol)
+
+expecting success of 5411.118 'proc-receive: report option old-oid and new-oid (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual
+
+ok 118 - proc-receive: report option old-oid and new-oid (builtin protocol)
+
+expecting success of 5411.119 'setup proc-receive hook (report with multiple rewrites, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/a/b/c/topic" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option forced-update" \
+		-r "option new-oid $A"
+	EOF
+
+ok 119 - setup proc-receive hook (report with multiple rewrites, builtin protocol)
+
+expecting success of 5411.120 'proc-receive: report with multiple rewrites (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/next/topic \
+		HEAD:refs/for/a/b/c/topic \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/a/b/c/topic        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/pull/123/head
+	>  * [new reference]   HEAD -> refs/for/a/b/c/topic
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/pull/124/head (forced update)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 120 - proc-receive: report with multiple rewrites (builtin protocol)
+
+expecting success of 5411.121 'setup proc-receive hook (option without matching ok, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+
+ok 121 - setup proc-receive hook (option without matching ok, builtin protocol/porcelain)
+
+expecting success of 5411.122 'proc-receive: report option without matching ok (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: error: proc-receive reported "option" without a matching "ok/ng" directive        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual
+
+ok 122 - proc-receive: report option without matching ok (builtin protocol/porcelain)
+
+expecting success of 5411.123 'setup proc-receive hook (option refname, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head"
+	EOF
+
+ok 123 - setup proc-receive hook (option refname, builtin protocol/porcelain)
+
+expecting success of 5411.124 'proc-receive: report option refname (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/pull/123/head	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual
+
+ok 124 - proc-receive: report option refname (builtin protocol/porcelain)
+
+expecting success of 5411.125 'setup proc-receive hook (option refname and forced-update, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option forced-update"
+	EOF
+
+ok 125 - setup proc-receive hook (option refname and forced-update, builtin protocol/porcelain)
+
+expecting success of 5411.126 'proc-receive: report option refname and forced-update (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/pull/123/head	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual
+
+ok 126 - proc-receive: report option refname and forced-update (builtin protocol/porcelain)
+
+expecting success of 5411.127 'setup proc-receive hook (option refname and old-oid, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+
+ok 127 - setup proc-receive hook (option refname and old-oid, builtin protocol/porcelain)
+
+expecting success of 5411.128 'proc-receive: report option refname and old-oid (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/pull/123/head	<COMMIT-B>..<COMMIT-A>
+	> Done
+	EOF
+	test_cmp expect actual
+
+ok 128 - proc-receive: report option refname and old-oid (builtin protocol/porcelain)
+
+expecting success of 5411.129 'setup proc-receive hook (option old-oid, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $B"
+	EOF
+
+ok 129 - setup proc-receive hook (option old-oid, builtin protocol/porcelain)
+
+expecting success of 5411.130 'proc-receive: report option old-oid (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/for/main/topic	<COMMIT-B>..<COMMIT-A>
+	> Done
+	EOF
+	test_cmp expect actual
+
+ok 130 - proc-receive: report option old-oid (builtin protocol/porcelain)
+
+expecting success of 5411.131 'setup proc-receive hook (option old-oid and new-oid, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+
+ok 131 - setup proc-receive hook (option old-oid and new-oid, builtin protocol/porcelain)
+
+expecting success of 5411.132 'proc-receive: report option old-oid and new-oid (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> Done
+	EOF
+	test_cmp expect actual
+
+ok 132 - proc-receive: report option old-oid and new-oid (builtin protocol/porcelain)
+
+expecting success of 5411.133 'setup proc-receive hook (report with multiple rewrites, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/a/b/c/topic" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option forced-update" \
+		-r "option new-oid $A"
+
+	EOF
+
+ok 133 - setup proc-receive hook (report with multiple rewrites, builtin protocol/porcelain)
+
+expecting success of 5411.134 'proc-receive: report with multiple rewrites (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/next/topic \
+		HEAD:refs/for/a/b/c/topic \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/a/b/c/topic        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/pull/123/head	[new reference]
+	> *	HEAD:refs/for/a/b/c/topic	[new reference]
+	> +	HEAD:refs/pull/124/head	<COMMIT-B>...<COMMIT-A> (forced update)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 134 - proc-receive: report with multiple rewrites (builtin protocol/porcelain)
+
+expecting success of 5411.135 'setup proc-receive hook (ft, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option fall-through"
+	EOF
+
+ok 135 - setup proc-receive hook (ft, builtin protocol)
+
+expecting success of 5411.136 'proc-receive: fall through, let receive-pack to execute (builtin protocol)': 
+	git -C workbench push origin \
+		$B:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   <COMMIT-B> -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/for/main/topic
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 136 - proc-receive: fall through, let receive-pack to execute (builtin protocol)
+
+expecting success of 5411.137 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/for/main/topic
+
+ok 137 - cleanup (builtin protocol)
+
+expecting success of 5411.138 'setup proc-receive hook (fall-through, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-\EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option fall-through"
+	EOF
+
+ok 138 - setup proc-receive hook (fall-through, builtin protocol/porcelain)
+
+expecting success of 5411.139 'proc-receive: fall through, let receive-pack to execute (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		$B:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	<COMMIT-B>:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/for/main/topic
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 139 - proc-receive: fall through, let receive-pack to execute (builtin protocol/porcelain)
+
+expecting success of 5411.140 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/for/main/topic
+
+ok 140 - cleanup (builtin protocol/porcelain)
+
+expecting success of 5411.141 'setup git config for remote-tracking of special refs': 
+	(
+		cd workbench &&
+		if ! git config --get-all remote.origin.fetch | grep refs/for/
+		then
+			git config --add remote.origin.fetch \
+				"+refs/for/*:refs/t/for/*" &&
+			git config --add remote.origin.fetch \
+				"+refs/pull/*:refs/t/pull/*" &&
+			git config --add remote.origin.fetch \
+				"+refs/changes/*:refs/t/changes/*"
+		fi
+	)
+
+ok 141 - setup git config for remote-tracking of special refs
+
+expecting success of 5411.142 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+
+ok 142 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol)
+
+expecting success of 5411.143 'proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	>  * [new reference]   HEAD -> refs/changes/24/124/1
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/changes/25/125/1
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 143 - proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol)
+
+expecting success of 5411.144 'proc-receive: check remote-tracking #1 (builtin protocol)': 
+	git -C workbench show-ref |
+		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	<COMMIT-A> refs/t/changes/24/124/1
+	<COMMIT-B> refs/t/changes/25/125/1
+	<COMMIT-B> refs/t/for/main/topic
+	EOF
+	test_cmp expect actual &&
+	git -C workbench update-ref -d refs/t/for/main/topic &&
+	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
+	git -C workbench update-ref -d refs/t/changes/25/125/1
+
+ok 144 - proc-receive: check remote-tracking #1 (builtin protocol)
+
+expecting success of 5411.145 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
+
+ok 145 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol)
+
+expecting success of 5411.146 'proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/changes/24/124/1
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/changes/25/125/1 (forced update)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 146 - proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol)
+
+expecting success of 5411.147 'proc-receive: check remote-tracking #2 (builtin protocol)': 
+	git -C workbench show-ref |
+		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	<COMMIT-A> refs/t/changes/24/124/1
+	<COMMIT-A> refs/t/changes/25/125/1
+	<COMMIT-B> refs/t/for/main/topic
+	EOF
+	test_cmp expect actual &&
+	git -C workbench update-ref -d refs/t/for/main/topic &&
+	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
+	git -C workbench update-ref -d refs/t/changes/25/125/1
+
+ok 147 - proc-receive: check remote-tracking #2 (builtin protocol)
+
+expecting success of 5411.148 'setup proc-receive hook (multiple rewrites for one ref, builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/23/123/1" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/2" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+
+ok 148 - setup proc-receive hook (multiple rewrites for one ref, builtin protocol)
+
+expecting success of 5411.149 'proc-receive: multiple rewrites for one ref (builtin protocol)': 
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/23/123/1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/2        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/changes/23/123/1
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/changes/24/124/2
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 149 - proc-receive: multiple rewrites for one ref (builtin protocol)
+
+expecting success of 5411.150 'proc-receive: check remote-tracking #3 (builtin protocol)': 
+	git -C workbench show-ref |
+		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	<COMMIT-A> refs/t/changes/23/123/1
+	<COMMIT-B> refs/t/changes/24/124/2
+	EOF
+	test_cmp expect actual &&
+	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
+	git -C workbench update-ref -d refs/t/changes/25/125/2
+
+ok 150 - proc-receive: check remote-tracking #3 (builtin protocol)
+
+expecting success of 5411.151 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+
+ok 151 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol/porcelain)
+
+expecting success of 5411.152 'proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> *	HEAD:refs/changes/24/124/1	[new reference]
+	>  	HEAD:refs/changes/25/125/1	<COMMIT-A>..<COMMIT-B>
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 152 - proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol/porcelain)
+
+expecting success of 5411.153 'setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
+
+ok 153 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol/porcelain)
+
+expecting success of 5411.154 'proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/changes/24/124/1	[new reference]
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> +	HEAD:refs/changes/25/125/1	<COMMIT-B>...<COMMIT-A> (forced update)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 154 - proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol/porcelain)
+
+expecting success of 5411.155 'setup proc-receive hook (multiple rewrites for one ref, builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/23/123/1" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/2" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+
+ok 155 - setup proc-receive hook (multiple rewrites for one ref, builtin protocol/porcelain)
+
+expecting success of 5411.156 'proc-receive: multiple rewrites for one ref (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/23/123/1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/2        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/changes/23/123/1	[new reference]
+	>  	HEAD:refs/changes/24/124/2	<COMMIT-A>..<COMMIT-B>
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+
+ok 156 - proc-receive: multiple rewrites for one ref (builtin protocol/porcelain)
+
+expecting success of 5411.157 'setup proc-receive hook (builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/next/topic2" \
+		-r "ng refs/for/next/topic1 fail to call Web API" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+
+ok 157 - setup proc-receive hook (builtin protocol)
+
+expecting success of 5411.158 'proc-receive: report update of mixed refs (builtin protocol)': 
+	test_must_fail git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/bar \
+		HEAD:refs/heads/baz \
+		HEAD:refs/for/next/topic2 \
+		HEAD:refs/for/next/topic1 \
+		HEAD:refs/heads/foo \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic3 \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: proc-receive> ok refs/for/next/topic2        Z
+	> remote: proc-receive> ng refs/for/next/topic1 fail to call Web API        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
+	>  * [new branch]      HEAD -> bar
+	>  * [new branch]      HEAD -> baz
+	>  * [new reference]   HEAD -> refs/for/next/topic2
+	>  * [new branch]      HEAD -> foo
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	>  ! [remote rejected] HEAD -> refs/for/next/topic1 (fail to call Web API)
+	>  ! [remote rejected] HEAD -> refs/for/next/topic3 (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/foo
+	<COMMIT-B> refs/heads/main
+	EOF
 
-expecting success of 5326.317 'enumerate --objects (full bitmap, other)': 
-		git rev-list --objects --use-bitmap-index $branch >actual &&
-		git rev-list --objects $branch >expect &&
-		test_bitmap_traversal expect actual
-	
-expect actual differ: char 4101, line 101
-ok 317 - enumerate --objects (full bitmap, other)
+ok 158 - proc-receive: report update of mixed refs (builtin protocol)
 
-expecting success of 5326.318 'bitmap --objects handles non-commit objects (full bitmap, other)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 318 - bitmap --objects handles non-commit objects (full bitmap, other)
+expecting success of 5411.159 'cleanup (builtin protocol)': 
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $A &&
+		git update-ref -d refs/heads/foo &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
 
-expecting success of 5326.319 'clone from bitmapped repository': 
-		rm -fr clone.git &&
-		git clone --no-local --bare . clone.git &&
-		git rev-parse HEAD >expect &&
-		git --git-dir=clone.git rev-parse HEAD >actual &&
-		test_cmp expect actual
-	
-Cloning into bare repository 'clone.git'...
-ok 319 - clone from bitmapped repository
+ok 159 - cleanup (builtin protocol)
 
-expecting success of 5326.320 'partial clone from bitmapped repository': 
-		test_config uploadpack.allowfilter true &&
-		rm -fr partial-clone.git &&
-		git clone --no-local --bare --filter=blob:none . partial-clone.git &&
-		(
-			cd partial-clone.git &&
-			pack=$(echo objects/pack/*.pack) &&
-			git verify-pack -v "$pack" >have &&
-			awk "/blob/ { print \$1 }" <have >blobs &&
-			# we expect this single blob because of the direct ref
-			git rev-parse refs/tags/tagged-blob >expect &&
-			test_cmp expect blobs
-		)
-	
-Cloning into bare repository 'partial-clone.git'...
-ok 320 - partial clone from bitmapped repository
+expecting success of 5411.160 'setup proc-receive hook (builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/next/topic2" \
+		-r "ng refs/for/next/topic1 fail to call Web API" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
 
-expecting success of 5326.321 'setup further non-bitmapped commits': 
-		test_commit_bulk --id=further 10
-	
-37cdfb15dda4b8a893283d6025391133fad61400
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           10 (        10 duplicates                  )
-      blobs  :            0 (        10 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           10 (         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:            140
-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          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       5262 /       5262
----------------------------------------------------------------------
+ok 160 - setup proc-receive hook (builtin protocol/porcelain)
 
-ok 321 - setup further non-bitmapped commits
+expecting success of 5411.161 'proc-receive: report update of mixed refs (builtin protocol/porcelain)': 
+	test_must_fail git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/bar \
+		HEAD:refs/heads/baz \
+		HEAD:refs/for/next/topic2 \
+		HEAD:refs/for/next/topic1 \
+		HEAD:refs/heads/foo \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic3 \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: proc-receive> ok refs/for/next/topic2        Z
+	> remote: proc-receive> ng refs/for/next/topic1 fail to call Web API        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+	> *	HEAD:refs/heads/bar	[new branch]
+	> *	HEAD:refs/heads/baz	[new branch]
+	> *	HEAD:refs/for/next/topic2	[new reference]
+	> *	HEAD:refs/heads/foo	[new branch]
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> !	HEAD:refs/for/next/topic1	[remote rejected] (fail to call Web API)
+	> !	HEAD:refs/for/next/topic3	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
 
-expecting success of 5326.322 'counting commits via bitmap (partial bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 322 - counting commits via bitmap (partial bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/foo
+	<COMMIT-B> refs/heads/main
+	EOF
 
-expecting success of 5326.323 'counting partial commits via bitmap (partial bitmap, second)': 
-		git rev-list --count $branch~5..$branch >expect &&
-		git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
-		test_cmp expect actual
-	
-ok 323 - counting partial commits via bitmap (partial bitmap, second)
+ok 161 - proc-receive: report update of mixed refs (builtin protocol/porcelain)
 
-expecting success of 5326.324 'counting commits with limit (partial bitmap, second)': 
-		git rev-list --count -n 1 $branch >expect &&
-		git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
-		test_cmp expect actual
-	
-ok 324 - counting commits with limit (partial bitmap, second)
+expecting success of 5411.162 'cleanup (builtin protocol/porcelain)': 
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $A &&
+		git update-ref -d refs/heads/foo &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
 
-expecting success of 5326.325 'counting non-linear history (partial bitmap, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 325 - counting non-linear history (partial bitmap, second)
 
-expecting success of 5326.326 'counting commits with limiting (partial bitmap, second)': 
-		git rev-list --count $branch -- 1.t >expect &&
-		git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
-		test_cmp expect actual
-	
-ok 326 - counting commits with limiting (partial bitmap, second)
+ok 162 - cleanup (builtin protocol/porcelain)
 
-expecting success of 5326.327 'counting objects via bitmap (partial bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 327 - counting objects via bitmap (partial bitmap, second)
+expecting success of 5411.163 'config receive.procReceiveRefs = refs (builtin protocol)': 
+	git -C "$upstream" config --unset-all receive.procReceiveRefs &&
+	git -C "$upstream" config --add receive.procReceiveRefs refs
 
-expecting success of 5326.328 'enumerate commits (partial bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 328 - enumerate commits (partial bitmap, second)
+ok 163 - config receive.procReceiveRefs = refs (builtin protocol)
 
-expecting success of 5326.329 'enumerate --objects (partial bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch >actual &&
-		git rev-list --objects $branch >expect &&
-		test_bitmap_traversal expect actual
-	
-expect actual differ: char 1, line 1
-ok 329 - enumerate --objects (partial bitmap, second)
+expecting success of 5411.164 'setup upstream branches (builtin protocol)': 
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $B &&
+		git update-ref refs/heads/foo $A &&
+		git update-ref refs/heads/bar $A &&
+		git update-ref refs/heads/baz $A
+	)
 
-expecting success of 5326.330 'bitmap --objects handles non-commit objects (partial bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 330 - bitmap --objects handles non-commit objects (partial bitmap, second)
 
-expecting success of 5326.331 'counting commits via bitmap (partial bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 331 - counting commits via bitmap (partial bitmap, other)
+ok 164 - setup upstream branches (builtin protocol)
 
-expecting success of 5326.332 'counting partial commits via bitmap (partial bitmap, other)': 
-		git rev-list --count $branch~5..$branch >expect &&
-		git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
-		test_cmp expect actual
-	
-ok 332 - counting partial commits via bitmap (partial bitmap, other)
+expecting success of 5411.165 'setup proc-receive hook (builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option fall-through" \
+		-r "ok refs/heads/foo" \
+		-r "option fall-through" \
+		-r "ok refs/heads/bar" \
+		-r "option fall-through" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
 
-expecting success of 5326.333 'counting commits with limit (partial bitmap, other)': 
-		git rev-list --count -n 1 $branch >expect &&
-		git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
-		test_cmp expect actual
-	
-ok 333 - counting commits with limit (partial bitmap, other)
+ok 165 - setup proc-receive hook (builtin protocol)
 
-expecting success of 5326.334 'counting non-linear history (partial bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 334 - counting non-linear history (partial bitmap, other)
+expecting success of 5411.166 'proc-receive: process all refs (builtin protocol)': 
+	git -C workbench push -f origin \
+		HEAD:refs/heads/main \
+		:refs/heads/foo \
+		$B:refs/heads/bar \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/foo        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/bar        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> bar
+	>  - [deleted]         foo
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> main (forced update)
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/pull/123/head
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/pull/124/head (forced update)
+	EOF
+	test_cmp expect actual &&
 
-expecting success of 5326.335 'counting commits with limiting (partial bitmap, other)': 
-		git rev-list --count $branch -- 1.t >expect &&
-		git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
-		test_cmp expect actual
-	
-ok 335 - counting commits with limiting (partial bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.336 'counting objects via bitmap (partial bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 336 - counting objects via bitmap (partial bitmap, other)
+ok 166 - proc-receive: process all refs (builtin protocol)
 
-expecting success of 5326.337 'enumerate commits (partial bitmap, other)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 337 - enumerate commits (partial bitmap, other)
+expecting success of 5411.167 'cleanup (builtin protocol)': 
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
 
-expecting success of 5326.338 'enumerate --objects (partial bitmap, other)': 
-		git rev-list --objects --use-bitmap-index $branch >actual &&
-		git rev-list --objects $branch >expect &&
-		test_bitmap_traversal expect actual
-	
-expect actual differ: char 4101, line 101
-ok 338 - enumerate --objects (partial bitmap, other)
+ok 167 - cleanup (builtin protocol)
 
-expecting success of 5326.339 'bitmap --objects handles non-commit objects (partial bitmap, other)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 339 - bitmap --objects handles non-commit objects (partial bitmap, other)
+expecting success of 5411.168 'config receive.procReceiveRefs = refs (builtin protocol/porcelain)': 
+	git -C "$upstream" config --unset-all receive.procReceiveRefs &&
+	git -C "$upstream" config --add receive.procReceiveRefs refs
 
-expecting success of 5326.340 'fetch (partial bitmap)': 
-		git --git-dir=clone.git fetch origin second:second &&
-		git rev-parse HEAD >expect &&
-		git --git-dir=clone.git rev-parse HEAD >actual &&
-		test_cmp expect actual
-	
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/.
-   37cdfb1..8935311  second     -> second
-ok 340 - fetch (partial bitmap)
+ok 168 - config receive.procReceiveRefs = refs (builtin protocol/porcelain)
 
-expecting success of 5326.341 'enumerating progress counts pack-reused objects': 
-		count=$(git rev-list --objects --all --count) &&
-		git repack -adb &&
+expecting success of 5411.169 'setup upstream branches (builtin protocol/porcelain)': 
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $B &&
+		git update-ref refs/heads/foo $A &&
+		git update-ref refs/heads/bar $A &&
+		git update-ref refs/heads/baz $A
+	)
 
-		# check first with only reused objects; confirm that our
-		# progress showed the right number, and also that we did
-		# pack-reuse as expected.  Check only the final "done"
-		# line of the meter (there may be an arbitrary number of
-		# intermediate lines ending with CR).
-		GIT_PROGRESS_DELAY=0 \
-			git pack-objects --all --stdout --progress \
-			</dev/null >/dev/null 2>stderr &&
-		grep "Enumerating objects: $count, done" stderr &&
-		grep "pack-reused $count" stderr &&
 
-		# now the same but with one non-reused object
-		git commit --allow-empty -m "an extra commit object" &&
-		GIT_PROGRESS_DELAY=0 \
-			git pack-objects --all --stdout --progress \
-			</dev/null >/dev/null 2>stderr &&
-		grep "Enumerating objects: $((count+1)), done" stderr &&
-		grep "pack-reused $count" stderr
-	
-Enumerating objects: 766, done.
-Total 766 (delta 0), reused 0 (delta 0), pack-reused 766 (from 1)
-[second 641c264] an extra commit object
- Author: A U Thor <author@example.com>
-Enumerating objects: 767, done.
-Total 767 (delta 0), reused 0 (delta 0), pack-reused 766 (from 1)
-ok 341 - enumerating progress counts pack-reused objects
+ok 169 - setup upstream branches (builtin protocol/porcelain)
 
-expecting success of 5326.342 'removing a MIDX clears stale bitmaps': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit base &&
-			git repack &&
-			git multi-pack-index write --bitmap &&
+expecting success of 5411.170 'setup proc-receive hook (builtin protocol/porcelain)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option fall-through" \
+		-r "ok refs/heads/foo" \
+		-r "option fall-through" \
+		-r "ok refs/heads/bar" \
+		-r "option fall-through" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
 
-			# Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
-			stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
-			rm $midx &&
+ok 170 - setup proc-receive hook (builtin protocol/porcelain)
 
-			# Then write a new MIDX.
-			test_commit new &&
-			git repack &&
-			git multi-pack-index write --bitmap &&
+expecting success of 5411.171 'proc-receive: process all refs (builtin protocol/porcelain)': 
+	git -C workbench push --porcelain -f origin \
+		HEAD:refs/heads/main \
+		:refs/heads/foo \
+		$B:refs/heads/bar \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/foo        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/bar        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+	> -	:refs/heads/foo	[deleted]
+	> +	HEAD:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+	>  	HEAD:refs/pull/123/head	<COMMIT-A>..<COMMIT-B>
+	> +	HEAD:refs/pull/124/head	<COMMIT-B>...<COMMIT-A> (forced update)
+	> Done
+	EOF
+	test_cmp expect actual &&
 
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
-			test_path_is_missing $stale_bitmap
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 099797b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 4d35cd2] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-ok 342 - removing a MIDX clears stale bitmaps
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.343 'pack.preferBitmapTips': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+ok 171 - proc-receive: process all refs (builtin protocol/porcelain)
 
-			test_commit_bulk --message="%s" 103 &&
+expecting success of 5411.172 'cleanup (builtin protocol/porcelain)': 
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
 
-			git log --format="%H" >commits.raw &&
-			sort <commits.raw >commits &&
+ok 172 - cleanup (builtin protocol/porcelain)
 
-			git log --format="create refs/tags/%s %H" HEAD >refs &&
-			git update-ref --stdin <refs &&
+expecting success of 5411.173 'config receive.procReceiveRefs with modifiers (builtin protocol)': 
+	(
+		cd "$upstream" &&
+		git config --unset-all receive.procReceiveRefs &&
+		git config --add receive.procReceiveRefs m:refs/heads/main &&
+		git config --add receive.procReceiveRefs ad:refs/heads &&
+		git config --add receive.procReceiveRefs "a!:refs/heads"
+	)
 
-			git multi-pack-index write --bitmap &&
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ok 173 - config receive.procReceiveRefs with modifiers (builtin protocol)
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >before &&
-			test_line_count = 1 before &&
+expecting success of 5411.174 'setup proc-receive hook (builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/tags/v123 " \
+		-r "option refname refs/pull/124/head"
+	EOF
 
-			perl -ne "printf(\"create refs/tags/include/%d \", $.); print" \
-				<before | git update-ref --stdin &&
+ok 174 - setup proc-receive hook (builtin protocol)
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+expecting success of 5411.175 'proc-receive: update branch and new tag (builtin protocol)': 
+	git -C workbench push origin \
+		$B:refs/heads/main \
+		v123 >out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/tags/v123         Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
+	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> refs/pull/123/head
+	>  * [new reference]   v123 -> refs/pull/124/head
+	EOF
+	test_cmp expect actual &&
 
-			git -c pack.preferBitmapTips=refs/tags/include \
-				multi-pack-index write --bitmap &&
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >after &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			! test_cmp before after
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          309 (         0 duplicates                  )
-      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
-      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:            103
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26907 /      26907
----------------------------------------------------------------------
+ok 175 - proc-receive: update branch and new tag (builtin protocol)
 
---- before	2025-02-09 06:54:48.557996607 +0000
-+++ after	2025-02-09 06:54:48.589996811 +0000
-@@ -1 +1 @@
--a09427aadc45553b705d3a726a24ceeaa43874f0
-+e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
-ok 343 - pack.preferBitmapTips
+expecting success of 5411.176 'setup upstream: create tags/v123 (builtin protocol)': 
+	git -C "$upstream" update-ref refs/heads/topic $A &&
+	git -C "$upstream" update-ref refs/tags/v123 $TAG &&
 
-expecting success of 5326.344 'writing a bitmap with --refs-snapshot': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/topic
+	<TAG-v123> refs/tags/v123
+	EOF
 
-			test_commit one &&
-			test_commit two &&
+ok 176 - setup upstream: create tags/v123 (builtin protocol)
 
-			git rev-parse one >snapshot &&
+expecting success of 5411.177 'setup proc-receive hook (builtin protocol)': 
+	test_hook -C "$upstream" --clobber proc-receive <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $ZERO_OID" \
+		-r "ok refs/heads/next" \
+		-r "option refname refs/pull/124/head" \
+		-r "option new-oid $A"
+	EOF
 
-			git repack -ad &&
+ok 177 - setup proc-receive hook (builtin protocol)
 
-			# First, write a MIDX which see both refs/tags/one and
-			# refs/tags/two (causing both of those commits to receive
-			# bitmaps).
-			git multi-pack-index write --bitmap &&
+expecting success of 5411.178 'proc-receive: create/delete branch, and delete tag (builtin protocol)': 
+	git -C workbench push origin \
+		:refs/heads/main \
+		$B:refs/heads/topic \
+		$A:refs/heads/next \
+		:refs/tags/v123 >out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/main        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic        Z
+	> remote: pre-receive< <TAG-v123> <ZERO-OID> refs/tags/v123        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <ZERO-OID>        Z
+	> remote: proc-receive> ok refs/heads/next        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/pull/123/head        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic        Z
+	> remote: post-receive< <TAG-v123> <ZERO-OID> refs/tags/v123        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>  - [deleted]         refs/pull/123/head
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> topic
+	>  - [deleted]         v123
+	>  * [new reference]   <COMMIT-A> -> refs/pull/124/head
+	EOF
+	test_cmp expect actual &&
 
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-B> refs/heads/topic
+	EOF
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			grep "$(git rev-parse one)" bitmaps &&
-			grep "$(git rev-parse two)" bitmaps &&
+ok 178 - proc-receive: create/delete branch, and delete tag (builtin protocol)
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+checking prerequisite: NOT_ROOT
 
-			# Then again, but with a refs snapshot which only sees
-			# refs/tags/one.
-			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+)
+prerequisite NOT_ROOT ok
+# passed all 178 test(s)
+# SKIP no web server found at ''
+1..178
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5528-push-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			grep "$(git rev-parse one)" bitmaps &&
-			! grep "$(git rev-parse two)" bitmaps
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 9b01d55] one
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5528-push-default/repo1/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-[master 3d96559] two
+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
-9b01d555d17b903201cacf13508d9da2598a89a5
-3d9655938dbedf871db7ad3f79a0636d8d0acc16
-9b01d555d17b903201cacf13508d9da2598a89a5
-ok 344 - writing a bitmap with --refs-snapshot
-
-expecting success of 5326.345 'write a bitmap with --refs-snapshot (preferred tips)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-
-			test_commit_bulk --message="%s" 103 &&
-
-			git log --format="%H" >commits.raw &&
-			sort <commits.raw >commits &&
-
-			git log --format="create refs/tags/%s %H" HEAD >refs &&
-			git update-ref --stdin <refs &&
+To repo1
+ * [new branch]      main -> foo
+ok 2 - "upstream" pushes to configured upstream
 
-			git multi-pack-index write --bitmap &&
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+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
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >before &&
-			test_line_count = 1 before &&
+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
 
-			(
-				grep -vf before commits.raw &&
-				# mark missing commits as preferred
-				sed "s/^/+/" before
-			) >snapshot &&
+    git remote add <name> <url>
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+and then push using the remote name
 
-			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >after &&
+    git push <name>
 
-			! test_cmp before after
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          309 (         0 duplicates                  )
-      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
-      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:            103
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26907 /      26907
----------------------------------------------------------------------
+ok 3 - "upstream" does not push on unconfigured remote
 
---- before	2025-02-09 06:54:48.781998032 +0000
-+++ after	2025-02-09 06:54:48.809998210 +0000
-@@ -1 +1 @@
--a09427aadc45553b705d3a726a24ceeaa43874f0
-+e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
-ok 345 - write a bitmap with --refs-snapshot (preferred tips)
+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 5326.346 'hash-cache values are propagated from pack bitmaps': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+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
 
-			test_commit base &&
-			test_commit base2 &&
-			git repack -adb &&
+    git push --set-upstream parent1 main
 
-			test-tool bitmap dump-hashes >pack.raw &&
-			test_file_not_empty pack.raw &&
-			sort pack.raw >pack.hashes &&
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-			test_commit new &&
-			git repack &&
-			git multi-pack-index write --bitmap &&
+ok 4 - "upstream" does not push on unconfigured branch
 
-			test-tool bitmap dump-hashes >midx.raw &&
-			sort midx.raw >midx.hashes &&
+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
 
-			# ensure that every namehash in the pack bitmap can be found in
-			# the midx bitmap (i.e., that there are no oid-namehash pairs
-			# unique to the pack bitmap).
-			comm -23 pack.hashes midx.hashes >dropped.hashes &&
-			test_must_be_empty dropped.hashes
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 099797b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 513b690] base2
+Already on 'main'
+[main a383792] five
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base2.t
-[master c4bd5cc] new
+ 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 new.t
-ok 346 - hash-cache values are propagated from pack bitmaps
-
-expecting success of 5326.347 'no .bitmap is written without any objects': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+ 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
 
-			empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
-			cat >packs <<-EOF &&
-			pack-$empty.idx
-			EOF
+    git remote add <name> <url>
 
-			git multi-pack-index write --bitmap --stdin-packs \
-				<packs 2>err &&
+and then push using the remote name
 
-			grep "bitmap without any objects" err &&
+    git push <name>
 
-			test_path_is_file $midx &&
-			test_path_is_missing $midx-$(midx_checksum $objdir).bitmap
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-warning: refusing to write multi-pack .bitmap without any objects
-ok 347 - no .bitmap is written without any objects
+ok 6 - "current" does not push when multiple remotes and none origin
 
-expecting success of 5326.348 'graceful fallback when missing reverse index': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+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
 
-			test_commit base &&
+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
 
-			# write a pack and MIDX bitmap containing base
-			git repack -adb &&
-			git multi-pack-index write --bitmap &&
+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
 
-			GIT_TEST_MIDX_READ_RIDX=0 \
-				git rev-list --use-bitmap-index HEAD 2>err &&
-			! grep "ignoring extra bitmap file" err
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 099797b] base
+Already on 'main'
+[main 7eb4f8b] current-origin
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-099797b4d0eb8d4e4edb917fe24ec0b4659190f9
-ok 348 - graceful fallback when missing reverse index
+ 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 5326.349 'multi-pack-index write writes lookup table if enabled': 
-	rm -fr repo &&
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-		test_commit base &&
-		git config pack.writeBitmapLookupTable true &&
-		git repack -ad &&
-		GIT_TRACE2_EVENT="$(pwd)/trace" \
-			git multi-pack-index write --bitmap &&
-		grep "\"label\":\"writing_lookup_table\"" trace
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 099797b] base
+Already on 'main'
+[main ac06b97] current-implied
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-{"event":"region_enter","sid":"20250209T065449.041406Z-Hcf858c9d-P001ac5b3","thread":"main","time":"2025-02-09T06:54:49.043642Z","file":"pack-bitmap-write.c","line":961,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20250209T065449.041406Z-Hcf858c9d-P001ac5b3","thread":"main","time":"2025-02-09T06:54:49.043648Z","file":"pack-bitmap-write.c","line":988,"repo":1,"t_rel":0.000007,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-ok 349 - multi-pack-index write writes lookup table if enabled
+ 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 5326.350 'preferred pack change with existing MIDX bitmap': 
-	git init preferred-pack-with-existing &&
-	(
-		cd preferred-pack-with-existing &&
+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
 
-		test_commit base &&
-		test_commit other &&
+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 rev-list --objects --no-object-names base >p1.objects &&
-		git rev-list --objects --no-object-names other >p2.objects &&
+    git remote add <name> <url>
 
-		p1="$(git pack-objects "$objdir/pack/pack" \
-			--delta-base-offset <p1.objects)" &&
-		p2="$(git pack-objects "$objdir/pack/pack" \
-			--delta-base-offset <p2.objects)" &&
+and then push using the remote name
 
-		# Generate a MIDX containing the first two packs,
-		# marking p1 as preferred, and ensure that it can be
-		# successfully cloned.
-		git multi-pack-index write --bitmap \
-			--preferred-pack="pack-$p1.pack" &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
-		git clone --no-local . clone1 &&
+    git push <name>
 
-		# Then generate a new pack which sorts ahead of any
-		# existing pack (by tweaking the pack prefix).
-		test_commit foo &&
-		git pack-objects --all --unpacked $objdir/pack/pack0 &&
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
 
-		# Generate a new MIDX which changes the preferred pack
-		# to a pack contained in the existing MIDX.
-		git multi-pack-index write --bitmap \
-			--preferred-pack="pack-$p2.pack" &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+    git remote add <name> <url>
 
-		# When the above circumstances are met, the preferred
-		# pack should change appropriately and clones should
-		# (still) succeed.
-		git clone --no-local . clone2
-	)
+and then push using the remote name
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/preferred-pack-with-existing/.git/
-[master (root-commit) 099797b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 2949ebd] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-Cloning into 'clone1'...
-[master fa5f385] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-2470b6aceb2fec8703240e640aa9aaa349180fbf
-Cloning into 'clone2'...
-ok 350 - preferred pack change with existing MIDX bitmap
+    git push <name>
 
-expecting success of 5326.351 'tagged commits are selected for bitmapping': 
-	rm -fr repo &&
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
 
-		test_commit --annotate base &&
-		git repack -d &&
+    git remote add <name> <url>
 
-		# Remove refs/heads/main which points at the commit directly,
-		# leaving only a reference to the annotated tag.
-		git branch -M main &&
-		git checkout base &&
-		git branch -d main &&
+and then push using the remote name
 
-		git multi-pack-index write --bitmap &&
+    git push <name>
 
-		git rev-parse HEAD >want &&
-		test-tool bitmap list-commits >actual &&
-		grep $(cat want) actual
-	)
+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.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 099797b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Note: switching to 'base'.
+    git remote add <name> <url>
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+and then push using the remote name
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+    git push <name>
 
-  git switch -c <new-branch-name>
+ok 10 - push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple 
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+    git push --set-upstream parent1 new-branch-1
 
-HEAD is now at 099797b base
-Deleted branch main (was 099797b).
-099797b4d0eb8d4e4edb917fe24ec0b4659190f9
-ok 351 - tagged commits are selected for bitmapping
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-expecting success of 5326.352 'do not follow replace objects for MIDX bitmap': 
-	rm -fr repo &&
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+fatal: The current branch new-branch-1 has no upstream branch.
+To push the current branch and set the remote as upstream, use
 
-		test_commit A &&
-		test_commit B &&
-		git checkout --orphan=orphan A &&
-		test_commit orphan &&
+    git push --set-upstream parent1 new-branch-1
 
-		git replace A HEAD &&
-		git repack -ad --write-midx --write-bitmap-index &&
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-		# generating reachability bitmaps with replace refs
-		# enabled will result in broken clones
-		git clone --no-local --bare . clone.git
-	)
+ok 11 - push from/to new branch fails with upstream and simple 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) c811480] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master 610f946] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'orphan'
-[orphan (root-commit) 9d67859] orphan
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 A.t
- create mode 100644 orphan.t
-Cloning into bare repository 'clone.git'...
-ok 352 - do not follow replace objects for MIDX bitmap
+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
 
-expecting success of 5326.353 'git fsck correctly identifies good and bad bitmaps': 
-	git init valid &&
-	test_when_finished rm -rf valid &&
+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
 
-	test_commit_bulk 20 &&
-	git repack -adbf &&
+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
 
-	# Move pack-bitmap aside so it is not deleted
-	# in next repack.
-	packbitmap=$(ls .git/objects/pack/pack-*.bitmap) &&
-	mv "$packbitmap" "$packbitmap.bak" &&
+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 
 
-	test_commit_bulk 10 &&
-	git repack -b --write-midx &&
-	midxbitmap=$(ls .git/objects/pack/multi-pack-index-*.bitmap) &&
+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
 
-	# Copy MIDX bitmap to backup. Copy pack bitmap from backup.
-	cp "$midxbitmap" "$midxbitmap.bak" &&
-	cp "$packbitmap.bak" "$packbitmap" &&
+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
 
-	# fsck works at first
-	git fsck 2>err &&
-	test_must_be_empty err &&
+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
 
-	corrupt_file "$packbitmap" &&
-	test_must_fail git fsck 2>err &&
-	grep "bitmap file '$packbitmap' has invalid checksum" err &&
+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
 
-	cp "$packbitmap.bak" "$packbitmap" &&
-	corrupt_file "$midxbitmap" &&
-	test_must_fail git fsck 2>err &&
-	grep "bitmap file '$midxbitmap' has invalid checksum" err &&
+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
 
-	corrupt_file "$packbitmap" &&
-	test_must_fail git fsck 2>err &&
-	grep "bitmap file '$midxbitmap' has invalid checksum" err &&
-	grep "bitmap file '$packbitmap' has invalid checksum" err
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5528-push-default/empty/
+Perhaps you should specify a branch.
+ok 16 - "matching" fails if none match
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/valid/.git/
-641c2643d50bafd6a42892f7d5901fa38d8530d5
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           60 (         0 duplicates                  )
-      blobs  :           20 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           20 (         0 duplicates         19 deltas of         19 attempts)
-      commits:           20 (         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:            144
-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            =         23
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      74956 /      74956
----------------------------------------------------------------------
+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
 
-56c6da2da8b7069730f28602736aab04b11dccd3
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           10 (        10 duplicates                  )
-      blobs  :            0 (        10 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:           10 (         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:            144
-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            =         16
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      91307 /      91307
----------------------------------------------------------------------
+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
 
-Nothing new to pack.
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-5+0 records in
-5+0 records out
-5 bytes copied, 3.736e-05 s, 134 kB/s
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/pack-4c7ecaab6e94899a6ffc1b6ac83bc3e81250a410.bitmap' has invalid checksum
-5+0 records in
-5+0 records out
-5 bytes copied, 0.00104197 s, 4.8 kB/s
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-53ac2d38e79486550137793b3f410224246d3f0c.bitmap' has invalid checksum
-5+0 records in
-5+0 records out
-5 bytes copied, 0.000314162 s, 15.9 kB/s
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-53ac2d38e79486550137793b3f410224246d3f0c.bitmap' has invalid checksum
-error: bitmap file '.git/objects/pack/pack-4c7ecaab6e94899a6ffc1b6ac83bc3e81250a410.bitmap' has invalid checksum
-ok 353 - git fsck correctly identifies good and bad bitmaps
+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
 
-expecting success of 5326.354 'corrupt MIDX with bitmap causes fallback': 
-	git init corrupt-midx-bitmap &&
-	(
-		cd corrupt-midx-bitmap &&
+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
 
-		test_commit first &&
-		git repack -d &&
-		test_commit second &&
-		git repack -d &&
+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
 
-		git multi-pack-index write --bitmap &&
-		checksum=$(midx_checksum $objdir) &&
-		for f in $midx $midx-$checksum.bitmap
-		do
-			mv $f $f.bak || return 1
-		done &&
+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
 
-		# pack everything together, invalidating the MIDX
-		git repack -ad &&
-		# then restore the now-stale MIDX
-		for f in $midx $midx-$checksum.bitmap
-		do
-			mv $f.bak $f || return 1
-		done &&
+    git push --set-upstream repo1 main
 
-		git rev-list --count --objects --use-bitmap-index HEAD >out 2>err &&
-		# should attempt opening the broken pack twice (once
-		# from the attempt to load it via the stale bitmap, and
-		# again when attempting to load it from the stale MIDX)
-		# before falling back to the non-MIDX case
-		test 2 -eq $(grep -c "could not open pack" err) &&
-		test 6 -eq $(cat out)
-	)
+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.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/corrupt-midx-bitmap/.git/
-[master (root-commit) 1e63793] first
+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 first.t
-[master e31ad28] second
+ 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 second.t
-ok 354 - corrupt MIDX with bitmap causes fallback
+ 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 5326.355 'reading MIDX without BTMP chunk does not complain with single pack reuse': 
-		test_when_finished "rm -rf midx-without-btmp" &&
-		git init midx-without-btmp &&
-		(
-			cd midx-without-btmp &&
-			test_commit initial &&
+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
 
-			git repack -Adbl --write-bitmap-index --write-midx &&
-			GIT_TEST_MIDX_READ_BTMP=false git -c pack.allowPackReuse=$allow_pack_reuse \
-				pack-objects --all --use-bitmap-index --stdout </dev/null >/dev/null 2>err &&
-			test_must_be_empty err
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/midx-without-btmp/.git/
-[master (root-commit) c8c9e8b] initial
+Already on 'main'
+[main ce5228b] eight
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 355 - reading MIDX without BTMP chunk does not complain with single pack reuse
+ 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
 
-expecting success of 5326.356 'reading MIDX without BTMP chunk does not complain with multi pack reuse': 
-		test_when_finished "rm -rf midx-without-btmp" &&
-		git init midx-without-btmp &&
-		(
-			cd midx-without-btmp &&
-			test_commit initial &&
+    git push repo1 HEAD:other-name
 
-			git repack -Adbl --write-bitmap-index --write-midx &&
-			GIT_TEST_MIDX_READ_BTMP=false git -c pack.allowPackReuse=$allow_pack_reuse \
-				pack-objects --all --use-bitmap-index --stdout </dev/null >/dev/null 2>err &&
-			test_must_be_empty err
-		)
+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 
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/midx-without-btmp/.git/
-[master (root-commit) c8c9e8b] initial
+[main 9a2e3d7] commit-for-current
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 356 - reading MIDX without BTMP chunk does not complain with multi pack reuse
+ 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 5326.357 'remove one packfile between MIDX bitmap writes': 
-	git init remove-pack-between-writes &&
-	(
-		cd remove-pack-between-writes &&
+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
 
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
+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
 
-		# Create packs with the prefix "pack-A", "pack-B",
-		# "pack-C" to impose a lexicographic order on these
-		# packs so the pack being removed is always from the
-		# middle.
-		packdir=.git/objects/pack &&
-		A="$(echo A | git pack-objects $packdir/pack-A --revs)" &&
-		B="$(echo B | git pack-objects $packdir/pack-B --revs)" &&
-		C="$(echo C | git pack-objects $packdir/pack-C --revs)" &&
+    git push parent1 HEAD:foo
 
-		git multi-pack-index write --bitmap &&
+To push to the branch of the same name on the remote, use
 
-		cat >in <<-EOF &&
-		pack-A-$A.idx
-		pack-C-$C.idx
-		EOF
-		git multi-pack-index write --bitmap --stdin-packs <in &&
+    git push parent1 HEAD
 
-		git rev-list --test-bitmap 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'.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5326-multi-pack-bitmaps/remove-pack-between-writes/.git/
-[master (root-commit) 3c70836] A
+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 A.t
-[master 4ab4ae4] B
+ 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 B.t
-[master 943fdd9] C
+ 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 C.t
-Bitmap v1 test (3 entries loaded)
-Found bitmap for '943fdd9d6899d69a092640463db2e2e71c362852'. 64 bits / e80cb860 checksum
-Verifying bitmap entries:  11% (1/9)
Verifying bitmap entries:  22% (2/9)
Verifying bitmap entries:  33% (3/9)
Verifying bitmap entries:  44% (4/9)
Verifying bitmap entries:  55% (5/9)
Verifying bitmap entries:  66% (6/9)
Verifying bitmap entries:  77% (7/9)
Verifying bitmap entries:  88% (8/9)
Verifying bitmap entries: 100% (9/9)
Verifying bitmap entries: 100% (9/9), done.
-OK!
-ok 357 - remove one packfile between MIDX bitmap writes
-
-# passed all 357 test(s)
-1..357
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5544-pack-objects-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5544-pack-objects-hook/.git/
-expecting success of 5544.1 'create some history to fetch': 
-	test_commit one &&
-	test_commit two
+ 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
 
-[master (root-commit) d79ce16] one
+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 one.t
-[master 139b20d] two
+ 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 two.t
-ok 1 - create some history to fetch
+ 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 5544.2 'create debugging hook script': 
-	write_script .git/hook <<-\EOF
-		echo >&2 "hook running"
-		echo "$*" >hook.args
-		cat >hook.stdin
-		"$@" <hook.stdin >hook.stdout
-		cat hook.stdout
-	EOF
+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
 
-ok 2 - create debugging hook script
+[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 5544.3 'hook runs via global config': 
-	clear_hook_results &&
-	test_config_global uploadpack.packObjectsHook ./hook &&
-	git clone --no-local . dst.git 2>stderr &&
-	grep "hook running" stderr
+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 ""
 
-remote: hook running        
-ok 3 - hook runs via global config
+[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
 
-expecting success of 5544.4 'hook outputs are sane': 
-	# check that we recorded a usable pack
-	git index-pack --stdin <.git/hook.stdout &&
+    git push parent1 HEAD:foo
 
-	# check that we recorded args and stdin. We do not check
-	# the full argument list or the exact pack contents, as it would make
-	# the test brittle. So just sanity check that we could replay
-	# the packing procedure.
-	grep "^git" .git/hook.args &&
-	$(cat .git/hook.args) <.git/hook.stdin >replay
+To push to the branch of the same name on the remote, use
 
-pack	2a0b62213eae197db6150718d99ad9a6e24df950
-git pack-objects --revs --thin --stdout --delta-base-offset
-ok 4 - hook outputs are sane
+    git push parent1 HEAD
 
-expecting success of 5544.5 'hook runs from -c config': 
-	clear_hook_results &&
-	git clone --no-local \
-	  -u "git -c uploadpack.packObjectsHook=./hook upload-pack" \
-	  . dst.git 2>stderr &&
-	grep "hook running" stderr
+To choose either option permanently, see push.default in 'git help config'.
 
-remote: hook running        
-ok 5 - hook runs from -c 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'.
 
-expecting success of 5544.6 'hook does not run from repo config': 
-	clear_hook_results &&
-	test_config uploadpack.packObjectsHook "./hook" &&
-	git clone --no-local . dst.git 2>stderr &&
-	! grep "hook running" stderr &&
-	test_path_is_missing .git/hook.args &&
-	test_path_is_missing .git/hook.stdin &&
-	test_path_is_missing .git/hook.stdout &&
+ok 31 - default behavior rejects non-simple push
 
-	# check that global config is used instead
-	test_config_global uploadpack.packObjectsHook ./hook &&
-	git clone --no-local . dst2.git 2>stderr &&
-	grep "hook running" stderr
+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
 
-remote: hook running        
-ok 6 - hook does not run from repo config
+[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"
 
-expecting success of 5544.7 'hook works with partial clone': 
-	clear_hook_results &&
-	test_config_global uploadpack.packObjectsHook ./hook &&
-	test_config_global uploadpack.allowFilter true &&
-	git clone --bare --no-local --filter=blob:none . dst.git &&
-	git -C dst.git rev-list --objects --missing=allow-any --no-object-names --all >objects &&
-	git -C dst.git cat-file --batch-check="%(objecttype)" <objects >types &&
-	! grep blob types
+# still have 1 known breakage(s)
+# passed all remaining 31 test(s)
+1..32
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5539-fetch-http-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5539-fetch-http-shallow/.git/
+checking prerequisite: NOT_ROOT
 
-Cloning into bare repository 'dst.git'...
-remote: hook running        
-ok 7 - hook works with partial clone
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-# passed all 7 test(s)
-1..7
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5520-pull.sh ***
@@ -349156,6 +348111,317 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5540-http-push-webdav.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5541-http-push-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5538-push-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5538-push-shallow/.git/
+expecting success of 5538.1 'setup': 
+	git config --global transfer.fsckObjects true &&
+	commit 1 &&
+	commit 2 &&
+	commit 3 &&
+	commit 4 &&
+	git clone . full &&
+	(
+	git init full-abc &&
+	cd full-abc &&
+	commit a &&
+	commit b &&
+	commit c
+	) &&
+	git clone --no-local --depth=2 .git shallow &&
+	git --git-dir=shallow/.git log --format=%s >actual &&
+	cat <<EOF >expect &&
+4
+3
+EOF
+	test_cmp expect actual &&
+	git clone --no-local --depth=2 full-abc/.git shallow2 &&
+	git --git-dir=shallow2/.git log --format=%s >actual &&
+	cat <<EOF >expect &&
+c
+b
+EOF
+	test_cmp expect actual
+
+[main (root-commit) 866032c] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+[main 5c48a96] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main d5dbd47] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9c53269] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'full'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5538-push-shallow/full-abc/.git/
+[main (root-commit) 5f99454] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+[main 1cf9806] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 90fec16] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'shallow'...
+Cloning into 'shallow2'...
+ok 1 - setup
+
+expecting success of 5538.2 'push from shallow clone': 
+	(
+	cd shallow &&
+	commit 5 &&
+	git push ../.git +main:refs/remotes/shallow/main
+	) &&
+	git log --format=%s shallow/main >actual &&
+	git fsck &&
+	cat <<EOF >expect &&
+5
+4
+3
+2
+1
+EOF
+	test_cmp expect actual
+
+[main a94059e] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../.git
+ * [new reference]   main -> shallow/main
+ok 2 - push from shallow clone
+
+expecting success of 5538.3 'push from shallow clone, with grafted roots': 
+	(
+	cd shallow2 &&
+	test_must_fail git push ../.git +main:refs/remotes/shallow2/main 2>err &&
+	grep "shallow2/main.*shallow update not allowed" err
+	) &&
+	test_must_fail git rev-parse shallow2/main &&
+	git fsck
+
+ ! [remote rejected] main -> shallow2/main (shallow update not allowed)
+fatal: ambiguous argument 'shallow2/main': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+shallow2/main
+ok 3 - push from shallow clone, with grafted roots
+
+expecting success of 5538.4 'add new shallow root with receive.updateshallow on': 
+	test_config receive.shallowupdate true &&
+	(
+	cd shallow2 &&
+	git push ../.git +main:refs/remotes/shallow2/main
+	) &&
+	git log --format=%s shallow2/main >actual &&
+	git fsck &&
+	cat <<EOF >expect &&
+c
+b
+EOF
+	test_cmp expect actual
+
+To ../.git
+ * [new reference]   main -> shallow2/main
+ok 4 - add new shallow root with receive.updateshallow on
+
+expecting success of 5538.5 'push from shallow to shallow': 
+	(
+	cd shallow &&
+	git --git-dir=../shallow2/.git config receive.shallowupdate true &&
+	git push ../shallow2/.git +main:refs/remotes/shallow/main &&
+	git --git-dir=../shallow2/.git config receive.shallowupdate false
+	) &&
+	(
+	cd shallow2 &&
+	git log --format=%s shallow/main >actual &&
+	git fsck &&
+	cat <<EOF >expect &&
+5
+4
+3
+EOF
+	test_cmp expect actual
+	)
+
+To ../shallow2/.git
+ * [new reference]   main -> shallow/main
+ok 5 - push from shallow to shallow
+
+expecting success of 5538.6 'push from full to shallow': 
+	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
+	commit 1 &&
+	git push shallow2/.git +main:refs/remotes/top/main &&
+	(
+	cd shallow2 &&
+	git log --format=%s top/main >actual &&
+	git fsck &&
+	cat <<EOF >expect &&
+1
+4
+3
+EOF
+	test_cmp expect actual &&
+	git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
+	)
+
+fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
+[main 4cfd8cc] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To shallow2/.git
+ * [new reference]   main -> top/main
+ok 6 - push from full to shallow
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5542-push-http-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5542-push-http-shallow/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5544-pack-objects-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5544-pack-objects-hook/.git/
+expecting success of 5544.1 'create some history to fetch': 
+	test_commit one &&
+	test_commit two
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - create some history to fetch
+
+expecting success of 5544.2 'create debugging hook script': 
+	write_script .git/hook <<-\EOF
+		echo >&2 "hook running"
+		echo "$*" >hook.args
+		cat >hook.stdin
+		"$@" <hook.stdin >hook.stdout
+		cat hook.stdout
+	EOF
+
+ok 2 - create debugging hook script
+
+expecting success of 5544.3 'hook runs via global config': 
+	clear_hook_results &&
+	test_config_global uploadpack.packObjectsHook ./hook &&
+	git clone --no-local . dst.git 2>stderr &&
+	grep "hook running" stderr
+
+remote: hook running        
+ok 3 - hook runs via global config
+
+expecting success of 5544.4 'hook outputs are sane': 
+	# check that we recorded a usable pack
+	git index-pack --stdin <.git/hook.stdout &&
+
+	# check that we recorded args and stdin. We do not check
+	# the full argument list or the exact pack contents, as it would make
+	# the test brittle. So just sanity check that we could replay
+	# the packing procedure.
+	grep "^git" .git/hook.args &&
+	$(cat .git/hook.args) <.git/hook.stdin >replay
+
+pack	2a0b62213eae197db6150718d99ad9a6e24df950
+git pack-objects --revs --thin --stdout --delta-base-offset
+ok 4 - hook outputs are sane
+
+expecting success of 5544.5 'hook runs from -c config': 
+	clear_hook_results &&
+	git clone --no-local \
+	  -u "git -c uploadpack.packObjectsHook=./hook upload-pack" \
+	  . dst.git 2>stderr &&
+	grep "hook running" stderr
+
+remote: hook running        
+ok 5 - hook runs from -c config
+
+expecting success of 5544.6 'hook does not run from repo config': 
+	clear_hook_results &&
+	test_config uploadpack.packObjectsHook "./hook" &&
+	git clone --no-local . dst.git 2>stderr &&
+	! grep "hook running" stderr &&
+	test_path_is_missing .git/hook.args &&
+	test_path_is_missing .git/hook.stdin &&
+	test_path_is_missing .git/hook.stdout &&
+
+	# check that global config is used instead
+	test_config_global uploadpack.packObjectsHook ./hook &&
+	git clone --no-local . dst2.git 2>stderr &&
+	grep "hook running" stderr
+
+remote: hook running        
+ok 6 - hook does not run from repo config
+
+expecting success of 5544.7 'hook works with partial clone': 
+	clear_hook_results &&
+	test_config_global uploadpack.packObjectsHook ./hook &&
+	test_config_global uploadpack.allowFilter true &&
+	git clone --bare --no-local --filter=blob:none . dst.git &&
+	git -C dst.git rev-list --objects --missing=allow-any --no-object-names --all >objects &&
+	git -C dst.git cat-file --batch-check="%(objecttype)" <objects >types &&
+	! grep blob types
+
+Cloning into bare repository 'dst.git'...
+remote: hook running        
+ok 7 - hook works with partial clone
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5546-receive-limits.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5546-receive-limits/.git/
 expecting success of 5546.1 'create known-size (1024 bytes) commit': 
@@ -349302,154 +348568,412 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5549-fetch-push-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5549-fetch-push-http/.git/
-checking prerequisite: NOT_ROOT
+*** t5537-fetch-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/.git/
+expecting success of 5537.1 'setup': 
+	commit 1 &&
+	commit 2 &&
+	commit 3 &&
+	commit 4 &&
+	git config --global transfer.fsckObjects true &&
+	test_oid_cache <<-\EOF
+	perl sha1:s/0034shallow %s/0036unshallow %s/
+	perl sha256:s/004cshallow %s/004eunshallow %s/
+	EOF
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+[main (root-commit) 866032c] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+[main 5c48a96] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main d5dbd47] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9c53269] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5547-push-quarantine.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 5537.2 'setup shallow clone': 
+	git clone --no-local --depth=2 .git shallow &&
+	git --git-dir=shallow/.git log --format=%s >actual &&
+	test_write_lines 4 3 >expect &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5547-push-quarantine/dest.git/
-ok 1 - create picky dest repo
+Cloning into 'shallow'...
+ok 2 - setup shallow clone
 
-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
+expecting success of 5537.3 'clone from shallow clone': 
+	git clone --no-local shallow shallow2 &&
+	(
+	cd shallow2 &&
+	git fsck &&
+	git log --format=%s >actual &&
+	test_write_lines 4 3 >expect &&
+	test_cmp expect actual
+	)
 
-[master (root-commit) c6ea792] ok
+Cloning into 'shallow2'...
+ok 3 - clone from shallow clone
+
+expecting success of 5537.4 'fetch from shallow clone': 
+	(
+	cd shallow &&
+	commit 5
+	) &&
+	(
+	cd shallow2 &&
+	git fetch &&
+	git fsck &&
+	git log --format=%s origin/main >actual &&
+	test_write_lines 5 4 3 >expect &&
+	test_cmp expect actual
+	)
+
+[main a94059e] 5
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow
+   9c53269..a94059e  main       -> origin/main
+ok 4 - fetch from shallow clone
 
-ok
-ok 2 - accepted objects work
+expecting success of 5537.5 'fetch --depth from shallow clone': 
+	(
+	cd shallow &&
+	commit 6
+	) &&
+	(
+	cd shallow2 &&
+	git fetch --depth=2 &&
+	git fsck &&
+	git log --format=%s origin/main >actual &&
+	test_write_lines 6 5 >expect &&
+	test_cmp expect actual
+	)
 
-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
+[main 27db150] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow
+   a94059e..27db150  main       -> origin/main
+ok 5 - fetch --depth from shallow clone
 
-[master d08c8eb] reject
+expecting success of 5537.6 'fetch --unshallow from shallow clone': 
+	(
+	cd shallow2 &&
+	git fetch --unshallow &&
+	git fsck &&
+	git log --format=%s origin/main >actual &&
+	test_write_lines 6 5 4 3 >expect &&
+	test_cmp expect actual
+	)
+
+ok 6 - fetch --unshallow from shallow clone
+
+expecting success of 5537.7 'fetch --unshallow from a full clone': 
+	git clone --no-local --depth=2 .git shallow3 &&
+	(
+	cd shallow3 &&
+	git log --format=%s >actual &&
+	test_write_lines 4 3 >expect &&
+	test_cmp expect actual &&
+	git -c fetch.writeCommitGraph fetch --unshallow &&
+	git log origin/main --format=%s >actual &&
+	test_write_lines 4 3 2 1 >expect &&
+	test_cmp expect actual
+	)
+
+Cloning into 'shallow3'...
+ok 7 - fetch --unshallow from a full clone
+
+expecting success of 5537.8 'fetch something upstream has but hidden by clients shallow boundaries': 
+	# the blob "1" is available in .git but hidden by the
+	# shallow2/.git/shallow and it should be resent
+	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null &&
+	echo 1 >1.t &&
+	git add 1.t &&
+	git commit -m add-1-back &&
+	(
+	cd shallow2 &&
+	git fetch ../.git +refs/heads/main:refs/remotes/top/main &&
+	git fsck &&
+	git log --format=%s top/main >actual &&
+	test_write_lines add-1-back 4 3 >expect &&
+	test_cmp expect actual
+	) &&
+	git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
+
+fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
+[main c7f5970] add-1-back
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 reject.t
-To dest.git
- ! [remote rejected] reject -> reject (pre-receive hook declined)
-error: failed to push some refs to 'dest.git'
-fatal: git cat-file d08c8eba97f4e683ece08654c7c8d2ba0c03b129: bad file
-ok 3 - rejected objects are not installed
+ create mode 100644 1.t
+From ../
+ * [new branch]      main       -> top/main
+ok 8 - fetch something upstream has but hidden by clients shallow boundaries
 
-expecting success of 5547.4 'rejected objects are removed': 
-	echo "incoming-*" >expect &&
-	(cd dest.git/objects && echo incoming-*) >actual &&
+expecting success of 5537.9 'fetch that requires changes in .git/shallow is filtered': 
+	(
+	cd shallow &&
+	git checkout --orphan no-shallow &&
+	commit no-shallow
+	) &&
+	git init notshallow &&
+	(
+	cd notshallow &&
+	git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
+	git for-each-ref --format="%(refname)" >actual.refs &&
+	echo refs/remotes/shallow/no-shallow >expect.refs &&
+	test_cmp expect.refs actual.refs &&
+	git log --format=%s shallow/no-shallow >actual &&
+	echo no-shallow >expect &&
 	test_cmp expect actual
+	)
 
-ok 4 - rejected objects are removed
+Switched to a new branch 'no-shallow'
+[no-shallow (root-commit) 20d88d1] no-shallow
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/notshallow/.git/
+warning: rejected refs/remotes/shallow/main because shallow roots are not allowed to be updated
+From ../shallow/
+ * [new branch]      no-shallow -> shallow/no-shallow
+ok 9 - fetch that requires changes in .git/shallow is filtered
 
-expecting success of 5547.5 'push to repo path with path separator (colon)': 
-	# The interesting failure case here is when the
-	# receiving end cannot access its original object directory,
-	# so make it likely for us to generate a delta by having
-	# a non-trivial file with multiple versions.
+expecting success of 5537.10 'fetch --update-shallow': 
+	(
+	cd shallow &&
+	git checkout main &&
+	commit 7 &&
+	git tag -m foo heavy-tag HEAD^ &&
+	git tag light-tag HEAD^:tracked
+	) &&
+	(
+	cd notshallow &&
+	git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
+	git fsck &&
+	git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
+	cat <<-\EOF >expect.refs &&
+	refs/remotes/shallow/main
+	refs/remotes/shallow/no-shallow
+	refs/tags/heavy-tag
+	refs/tags/light-tag
+	EOF
+	test_cmp expect.refs actual.refs &&
+	git log --format=%s shallow/main >actual &&
+	test_write_lines 7 6 5 4 3 >expect &&
+	test_cmp expect actual
+	)
 
-	test-tool genrandom foo 4096 >file.bin &&
-	git add file.bin &&
-	git commit -m bin &&
+Switched to branch 'main'
+Your branch is ahead of 'origin/main' by 2 commits.
+  (use "git push" to publish your local commits)
+[main 96c85b9] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: Could not read 5c48a96478ec5c4cbce662a4a0a6f0be5ce4e6ab
+error: Could not read 5c48a96478ec5c4cbce662a4a0a6f0be5ce4e6ab
+From ../shallow/
+ * [new branch]      main       -> shallow/main
+ * [new tag]         heavy-tag  -> heavy-tag
+ * [new tag]         light-tag  -> light-tag
+notice: HEAD points to an unborn branch (main)
+ok 10 - fetch --update-shallow
 
-	if test_have_prereq MINGW
-	then
-		pathsep=";"
-	else
-		pathsep=":"
-	fi &&
-	git clone --bare . "xxx${pathsep}yyy.git" &&
+expecting success of 5537.11 'fetch --update-shallow into a repo with submodules': 
+	test_config_global protocol.file.allow always &&
 
-	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
+	git init a-submodule &&
+	test_commit -C a-submodule foo &&
 
-[master f56dd63] bin
+	test_when_finished "rm -rf repo-with-sub" &&
+	git init repo-with-sub &&
+	git -C repo-with-sub submodule add ../a-submodule a-submodule &&
+	git -C repo-with-sub commit -m "added submodule" &&
+	git -C repo-with-sub fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/*
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/a-submodule/.git/
+[main (root-commit) ddd63c9] foo
  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'...
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/a-submodule'...
 done.
-[master 0343f66] change
+[main (root-commit) 56fa32c] added submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5547-push-quarantine/xxx:yyy.git
-   f56dd63..0343f66  HEAD -> master
-ok 5 - push to repo path with path separator (colon)
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 a-submodule
+From ../shallow/
+ * [new branch]      main       -> shallow/main
+ * [new branch]      no-shallow -> shallow/no-shallow
+ * [new tag]         heavy-tag  -> heavy-tag
+ * [new tag]         light-tag  -> light-tag
+ok 11 - fetch --update-shallow into a repo with submodules
 
-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
+expecting success of 5537.12 'fetch --update-shallow a commit that is also a shallow point into a repo with submodules': 
+	test_when_finished "rm -rf repo-with-sub" &&
+	git init repo-with-sub &&
+	git -c protocol.file.allow=always -C repo-with-sub \
+		submodule add ../a-submodule a-submodule &&
+	git -C repo-with-sub commit -m "added submodule" &&
+
+	SHALLOW=$(cat shallow/.git/shallow) &&
+	git -C repo-with-sub fetch --update-shallow ../shallow/.git "$SHALLOW":refs/heads/a-shallow
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/repo-with-sub/a-submodule'...
+done.
+[main (root-commit) 56fa32c] added submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 a-submodule
+From ../shallow/
+ * [new ref]         d5dbd47cd66da3fef8e2dc8e29365d2cf57dc0a2 -> a-shallow
+ok 12 - fetch --update-shallow a commit that is also a shallow point into a repo with submodules
+
+expecting success of 5537.13 'fetch --update-shallow (with fetch.writeCommitGraph)': 
+	(
+	cd shallow &&
+	git checkout main &&
+	commit 8 &&
+	git tag -m foo heavy-tag-for-graph HEAD^ &&
+	git tag light-tag-for-graph HEAD^:tracked
+	) &&
+	test_config -C notshallow fetch.writeCommitGraph true &&
+	(
+	cd notshallow &&
+	git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
+	git fsck &&
+	git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
+	cat <<-EOF >expect.refs &&
+	refs/remotes/shallow/main
+	refs/remotes/shallow/no-shallow
+	refs/tags/heavy-tag
+	refs/tags/heavy-tag-for-graph
+	refs/tags/light-tag
+	refs/tags/light-tag-for-graph
 	EOF
-	test_must_fail git push update.git HEAD &&
-	git -C update.git fsck
+	test_cmp expect.refs actual.refs &&
+	git log --format=%s shallow/main >actual &&
+	test_write_lines 8 7 6 5 4 3 >expect &&
+	test_cmp expect actual
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+Already on 'main'
+Your branch is ahead of 'origin/main' by 3 commits.
+  (use "git push" to publish your local commits)
+[main a02f4de] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../shallow/
+   96c85b9..a02f4de  main                -> shallow/main
+ * [new tag]         heavy-tag-for-graph -> heavy-tag-for-graph
+ * [new tag]         light-tag-for-graph -> light-tag-for-graph
+notice: HEAD points to an unborn branch (main)
+ok 13 - fetch --update-shallow (with fetch.writeCommitGraph)
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5550-http-fetch-dumb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5550-http-fetch-dumb/.git/
-checking prerequisite: NOT_ROOT
+checking prerequisite: SANITY
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	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
 
 )
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5551-http-fetch-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5551-http-fetch-smart/.git/
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 5537.14 'shallow fetch from a read-only repo': 
+	cp -R .git read-only.git &&
+	test_when_finished "find read-only.git -type d -print | xargs chmod +w" &&
+	find read-only.git -print | xargs chmod -w &&
+	git clone --no-local --depth=2 read-only.git from-read-only &&
+	git --git-dir=from-read-only/.git log --format=%s >actual &&
+	test_write_lines add-1-back 4 >expect &&
+	test_cmp expect actual
+
+Cloning into 'from-read-only'...
+ok 14 - shallow fetch from a read-only repo
+
+expecting success of 5537.15 '.git/shallow is edited by repack': 
+	git init shallow-server &&
+	test_commit -C shallow-server A &&
+	test_commit -C shallow-server B &&
+	git -C shallow-server checkout -b branch &&
+	test_commit -C shallow-server C &&
+	test_commit -C shallow-server E &&
+	test_commit -C shallow-server D &&
+	d="$(git -C shallow-server rev-parse --verify D^0)" &&
+	git -C shallow-server checkout main &&
+
+	git clone --depth=1 --no-tags --no-single-branch \
+		"file://$PWD/shallow-server" shallow-client &&
+
+	: now remove the branch and fetch with prune &&
+	git -C shallow-server branch -D branch &&
+	git -C shallow-client fetch --prune --depth=1 \
+		origin "+refs/heads/*:refs/remotes/origin/*" &&
+	git -C shallow-client repack -adfl &&
+	test_must_fail git -C shallow-client rev-parse --verify $d^0 &&
+	! grep $d shallow-client/.git/shallow &&
+
+	git -C shallow-server branch branch-orig $d &&
+	git -C shallow-client fetch --prune --depth=2 \
+		origin "+refs/heads/*:refs/remotes/origin/*"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow-server/.git/
+[main (root-commit) 508df12] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9db1b4] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'branch'
+[branch 3f529c6] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[branch 71381ce] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+[branch f6a9dde] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Switched to branch 'main'
+Cloning into 'shallow-client'...
+Deleted branch branch (was f6a9dde).
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow-server
+ - [deleted]         (none)     -> origin/branch
+fatal: Needed a single revision
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5537-fetch-shallow/shallow-server
+ * [new branch]      branch-orig -> origin/branch-orig
+ok 15 - .git/shallow is edited by repack
+
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -349460,7 +348984,9 @@
 
 )
 prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+# passed all 15 test(s)
+# SKIP no web server found at ''
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5515-fetch-merge-logic.sh ***
@@ -352694,105 +352220,1518 @@
  * [new tag]         tag-two        -> tag-two
 ok 63 - br-unconfig ../.git tag tag-one tag tag-three
 
-expecting success of 5515.64 'br-unconfig ../.git tag tag-one-tree tag tag-three-file': 
-		cp "$expect_f" expect_f &&
-		convert_expected expect_f sed_script &&
-		cp "$expect_r" expect_r &&
-		convert_expected expect_r sed_script &&
-		{
-			echo "# $cmd" &&
-			set x $cmd && shift &&
-			git symbolic-ref HEAD refs/heads/$1 && shift &&
-			rm -f .git/FETCH_HEAD &&
-			git for-each-ref \
-				refs/heads refs/remotes/rem refs/tags |
-			while read val type refname
-			do
-				git update-ref -d "$refname" "$val" || return 1
-			done &&
-			git fetch "$@" >/dev/null &&
-			cat .git/FETCH_HEAD
-		} >"$actual_f" &&
-		git show-ref >"$actual_r" &&
-		if test -f "expect_f"
-		then
-			test_cmp "expect_f" "$actual_f" &&
-			rm -f "$actual_f"
-		else
-			# this is to help developing new tests.
-			cp "$actual_f" "$expect_f"
-			false
-		fi &&
-		if test -f "expect_r"
-		then
-			test_cmp "expect_r" "$actual_r" &&
-			rm -f "$actual_r"
-		else
-			# this is to help developing new tests.
-			cp "$actual_r" "$expect_r"
-			false
-		fi
-	
-From ../
- * [new tag]         tag-one-tree   -> tag-one-tree
- * [new tag]         tag-three-file -> tag-three-file
- * [new tag]         tag-main       -> tag-main
- * [new tag]         tag-one        -> tag-one
- * [new tag]         tag-three      -> tag-three
- * [new tag]         tag-two        -> tag-two
-ok 64 - br-unconfig ../.git tag tag-one-tree tag tag-three-file
+expecting success of 5515.64 'br-unconfig ../.git tag tag-one-tree tag tag-three-file': 
+		cp "$expect_f" expect_f &&
+		convert_expected expect_f sed_script &&
+		cp "$expect_r" expect_r &&
+		convert_expected expect_r sed_script &&
+		{
+			echo "# $cmd" &&
+			set x $cmd && shift &&
+			git symbolic-ref HEAD refs/heads/$1 && shift &&
+			rm -f .git/FETCH_HEAD &&
+			git for-each-ref \
+				refs/heads refs/remotes/rem refs/tags |
+			while read val type refname
+			do
+				git update-ref -d "$refname" "$val" || return 1
+			done &&
+			git fetch "$@" >/dev/null &&
+			cat .git/FETCH_HEAD
+		} >"$actual_f" &&
+		git show-ref >"$actual_r" &&
+		if test -f "expect_f"
+		then
+			test_cmp "expect_f" "$actual_f" &&
+			rm -f "$actual_f"
+		else
+			# this is to help developing new tests.
+			cp "$actual_f" "$expect_f"
+			false
+		fi &&
+		if test -f "expect_r"
+		then
+			test_cmp "expect_r" "$actual_r" &&
+			rm -f "$actual_r"
+		else
+			# this is to help developing new tests.
+			cp "$actual_r" "$expect_r"
+			false
+		fi
+	
+From ../
+ * [new tag]         tag-one-tree   -> tag-one-tree
+ * [new tag]         tag-three-file -> tag-three-file
+ * [new tag]         tag-main       -> tag-main
+ * [new tag]         tag-one        -> tag-one
+ * [new tag]         tag-three      -> tag-three
+ * [new tag]         tag-two        -> tag-two
+ok 64 - br-unconfig ../.git tag tag-one-tree tag tag-three-file
+
+expecting success of 5515.65 'br-unconfig ../.git one tag tag-one tag tag-three-file': 
+		cp "$expect_f" expect_f &&
+		convert_expected expect_f sed_script &&
+		cp "$expect_r" expect_r &&
+		convert_expected expect_r sed_script &&
+		{
+			echo "# $cmd" &&
+			set x $cmd && shift &&
+			git symbolic-ref HEAD refs/heads/$1 && shift &&
+			rm -f .git/FETCH_HEAD &&
+			git for-each-ref \
+				refs/heads refs/remotes/rem refs/tags |
+			while read val type refname
+			do
+				git update-ref -d "$refname" "$val" || return 1
+			done &&
+			git fetch "$@" >/dev/null &&
+			cat .git/FETCH_HEAD
+		} >"$actual_f" &&
+		git show-ref >"$actual_r" &&
+		if test -f "expect_f"
+		then
+			test_cmp "expect_f" "$actual_f" &&
+			rm -f "$actual_f"
+		else
+			# this is to help developing new tests.
+			cp "$actual_f" "$expect_f"
+			false
+		fi &&
+		if test -f "expect_r"
+		then
+			test_cmp "expect_r" "$actual_r" &&
+			rm -f "$actual_r"
+		else
+			# this is to help developing new tests.
+			cp "$actual_r" "$expect_r"
+			false
+		fi
+	
+From ../
+ * branch            one            -> FETCH_HEAD
+ * [new tag]         tag-one        -> tag-one
+ * [new tag]         tag-three-file -> tag-three-file
+ * [new tag]         tag-main       -> tag-main
+ * [new tag]         tag-one-tree   -> tag-one-tree
+ * [new tag]         tag-three      -> tag-three
+ * [new tag]         tag-two        -> tag-two
+ok 65 - br-unconfig ../.git one tag tag-one tag tag-three-file
+
+# passed all 65 test(s)
+1..65
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5547-push-quarantine.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5549-fetch-push-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5549-fetch-push-http/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5550-http-fetch-dumb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5550-http-fetch-dumb/.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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5531-deep-submodule-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/.git/
+expecting success of 5531.1 'setup': 
+	mkdir pub.git &&
+	GIT_DIR=pub.git git init --bare &&
+	GIT_DIR=pub.git git config receive.fsckobjects true &&
+	mkdir work &&
+	(
+		cd work &&
+		git init &&
+		git config push.default matching &&
+		mkdir -p gar/bage &&
+		(
+			cd gar/bage &&
+			git init &&
+			git config push.default matching &&
+			>junk &&
+			git add junk &&
+			git commit -m "Initial junk"
+		) &&
+		git add gar/bage &&
+		git commit -m "Initial superproject"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/pub.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/work/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/work/gar/bage/.git/
+[main (root-commit) 6fbe593] Initial junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk
+warning: adding embedded git repository: gar/bage
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> gar/bage
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached gar/bage
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main (root-commit) 38ca8a3] Initial superproject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 gar/bage
+ok 1 - setup
+
+expecting success of 5531.2 'push works with recorded gitlink': 
+	(
+		cd work &&
+		git push ../pub.git main
+	)
+
+To ../pub.git
+ * [new branch]      main -> main
+ok 2 - push works with recorded gitlink
+
+expecting success of 5531.3 'push if submodule has no remote': 
+	(
+		cd work/gar/bage &&
+		>junk2 &&
+		git add junk2 &&
+		git commit -m "Second junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Second commit for gar/bage" &&
+		git push --recurse-submodules=check ../pub.git main
+	)
+
+[main def33d6] Second junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk2
+[main 61d752a] Second commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   38ca8a3..61d752a  main -> main
+ok 3 - push if submodule has no remote
+
+expecting success of 5531.4 'push fails if submodule commit not on remote': 
+	(
+		cd work/gar &&
+		git clone --bare bage ../../submodule.git &&
+		cd bage &&
+		git remote add origin ../../../submodule.git &&
+		git fetch &&
+		>junk3 &&
+		git add junk3 &&
+		git commit -m "Third junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Third commit for gar/bage" &&
+		# the push should fail with --recurse-submodules=check
+		# on the command line...
+		test_must_fail git push --recurse-submodules=check ../pub.git main &&
+
+		# ...or if specified in the configuration..
+		test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
+	)
+
+Cloning into bare repository '../../submodule.git'...
+done.
+From ../../../submodule
+ * [new branch]      main       -> origin/main
+[main 18a8afc] Third junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk3
+[main 7484e0a] Third commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+ok 4 - push fails if submodule commit not on remote
+
+expecting success of 5531.5 'push succeeds after commit was pushed to remote': 
+	(
+		cd work/gar/bage &&
+		git push origin main
+	) &&
+	(
+		cd work &&
+		git push --recurse-submodules=check ../pub.git main
+	)
+
+To ../../../submodule.git
+   def33d6..18a8afc  main -> main
+To ../pub.git
+   61d752a..7484e0a  main -> main
+ok 5 - push succeeds after commit was pushed to remote
+
+expecting success of 5531.6 'push succeeds if submodule commit not on remote but using on-demand on command line': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-on-command-line &&
+		git add recurse-on-demand-on-command-line &&
+		git commit -m "Recurse on-demand on command line junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on-demand on command line for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main 04ec359] Recurse on-demand on command line junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-on-command-line
+[main 034803e] Recurse on-demand on command line for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   18a8afc..04ec359  main -> main
+To ../pub.git
+   7484e0a..034803e  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 6 - push succeeds if submodule commit not on remote but using on-demand on command line
+
+expecting success of 5531.7 'push succeeds if submodule commit not on remote but using on-demand from config': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-from-config &&
+		git add recurse-on-demand-from-config &&
+		git commit -m "Recurse on-demand from config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on-demand from config for gar/bage" &&
+		git -c push.recurseSubmodules=on-demand push ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main cc28292] Recurse on-demand from config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-from-config
+[main 85a50af] Recurse on-demand from config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   04ec359..cc28292  main -> main
+To ../pub.git
+   034803e..85a50af  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 7 - push succeeds if submodule commit not on remote but using on-demand from config
+
+expecting success of 5531.8 'push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-from-submodule-recurse-config &&
+		git add recurse-on-demand-from-submodule-recurse-config &&
+		git commit -m "Recurse submodule.recurse from config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse submodule.recurse from config for gar/bage" &&
+		git -c submodule.recurse push ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main f05bcc4] Recurse submodule.recurse from config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-from-submodule-recurse-config
+[main 937e43c] Recurse submodule.recurse from config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   cc28292..f05bcc4  main -> main
+To ../pub.git
+   85a50af..937e43c  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 8 - push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config
+
+expecting success of 5531.9 'push recurse-submodules on command line overrides config': 
+	(
+		cd work/gar/bage &&
+		>recurse-check-on-command-line-overriding-config &&
+		git add recurse-check-on-command-line-overriding-config &&
+		git commit -m "Recurse on command-line overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on command-line overriding config for gar/bage" &&
+
+		# Ensure that we can override on-demand in the config
+		# to just check submodules
+		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git main &&
+		# Check that the supermodule commit did not get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main^ &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# Ensure that we can override check in the config to
+		# disable submodule recursion entirely
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git main &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# Ensure that we can override check in the config to
+		# disable submodule recursion entirely (alternative form)
+		git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git main &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# Ensure that we can override check in the config to
+		# push the submodule too
+		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main)
+	)
+
+[main b5bd2c4] Recurse on command-line overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-check-on-command-line-overriding-config
+[main 97693ab] Recurse on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+To ../pub.git
+   937e43c..97693ab  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   f05bcc4..b5bd2c4  main -> main
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 9 - push recurse-submodules on command line overrides config
+
+expecting success of 5531.10 'push recurse-submodules last one wins on command line': 
+	(
+		cd work/gar/bage &&
+		>recurse-check-on-command-line-overriding-earlier-command-line &&
+		git add recurse-check-on-command-line-overriding-earlier-command-line &&
+		git commit -m "Recurse on command-line overriding earlier command-line junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
+
+		# should result in "check"
+		test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git main &&
+		# Check that the supermodule commit did not get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main^ &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# should result in "no"
+		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git main &&
+		# Check that the supermodule commit did get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# should result in "no"
+		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git main &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+
+		# But the options in the other order should push the submodule
+		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git main &&
+		# Check that the submodule commit did get there
+		git fetch ../pub.git &&
+		(cd gar/bage && git diff --quiet origin/main main)
+	)
+
+[main 2dd0c02] Recurse on command-line overriding earlier command-line junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-check-on-command-line-overriding-earlier-command-line
+[main abee46f] Recurse on command-line overriding earlier command-line for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+To ../pub.git
+   97693ab..abee46f  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Everything up-to-date
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   b5bd2c4..2dd0c02  main -> main
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 10 - push recurse-submodules last one wins on command line
+
+expecting success of 5531.11 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config': 
+	(
+		cd work/gar/bage &&
+		>recurse-on-demand-on-command-line-overriding-config &&
+		git add recurse-on-demand-on-command-line-overriding-config &&
+		git commit -m "Recurse on-demand on command-line overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
+		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# Check that the submodule commit got there
+		cd gar/bage &&
+		git diff --quiet origin/main main
+	)
+
+[main c30f1ef] Recurse on-demand on command-line overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-on-command-line-overriding-config
+[main c41dba3] Recurse on-demand on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   2dd0c02..c30f1ef  main -> main
+To ../pub.git
+   abee46f..c41dba3  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 11 - push succeeds if submodule commit not on remote using on-demand from cmdline overriding config
+
+expecting success of 5531.12 'push succeeds if submodule commit disabling recursion from cmdline overriding config': 
+	(
+		cd work/gar/bage &&
+		>recurse-disable-on-command-line-overriding-config &&
+		git add recurse-disable-on-command-line-overriding-config &&
+		git commit -m "Recurse disable on command-line overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
+		git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# But that the submodule commit did not
+		( cd gar/bage && git diff --quiet origin/main main^ ) &&
+		# Now push it to avoid confusing future tests
+		git push --recurse-submodules=on-demand ../pub.git main
+	)
+
+[main 6738ef7] Recurse disable on command-line overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-disable-on-command-line-overriding-config
+[main b2ab521] Recurse disable on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   c41dba3..b2ab521  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   c30f1ef..6738ef7  main -> main
+Everything up-to-date
+ok 12 - push succeeds if submodule commit disabling recursion from cmdline overriding config
+
+expecting success of 5531.13 'push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config': 
+	(
+		cd work/gar/bage &&
+		>recurse-disable-on-command-line-alt-overriding-config &&
+		git add recurse-disable-on-command-line-alt-overriding-config &&
+		git commit -m "Recurse disable on command-line alternative overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
+		git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git main &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD main &&
+		# But that the submodule commit did not
+		( cd gar/bage && git diff --quiet origin/main main^ ) &&
+		# Now push it to avoid confusing future tests
+		git push --recurse-submodules=on-demand ../pub.git main
+	)
+
+[main b13707b] Recurse disable on command-line alternative overriding config junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-disable-on-command-line-alt-overriding-config
+[main bdb7e27] Recurse disable on command-line alternative overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   b2ab521..bdb7e27  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   6738ef7..b13707b  main -> main
+Everything up-to-date
+ok 13 - push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config
+
+expecting success of 5531.14 'submodule entry pointing at a tag is error': 
+	git -C work/gar/bage tag -a test1 -m "tag" &&
+	tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&
+	git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
+	git -C work commit -m "bad commit" &&
+	test_when_finished "git -C work reset --hard HEAD^" &&
+	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
+	test_grep "is a tag, not a commit" err
+
+[main 209375b] bad commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: submodule entry 'gar/bage' (eca83b4b9ad7cb2fa6583ec07cdfa5a8d4f6ebe2) is a tag, not a commit
+HEAD is now at bdb7e27 Recurse disable on command-line alternative overriding config for gar/bage
+ok 14 - submodule entry pointing at a tag is error
+
+expecting success of 5531.15 'push fails if recurse submodules option passed as yes': 
+	(
+		cd work/gar/bage &&
+		>recurse-push-fails-if-recurse-submodules-passed-as-yes &&
+		git add recurse-push-fails-if-recurse-submodules-passed-as-yes &&
+		git commit -m "Recurse push fails if recurse submodules option passed as yes"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
+		test_must_fail git push --recurse-submodules=yes ../pub.git main &&
+		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git main &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	)
+
+[main 41a3ccc] Recurse push fails if recurse submodules option passed as yes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-push-fails-if-recurse-submodules-passed-as-yes
+[main 222fffb] Recurse push fails if recurse submodules option passed as yes for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: bad recurse-submodules argument: yes
+fatal: bad push.recursesubmodules argument: yes
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   b13707b..41a3ccc  main -> main
+To ../pub.git
+   bdb7e27..222fffb  main -> main
+ok 15 - push fails if recurse submodules option passed as yes
+
+expecting success of 5531.16 'push fails when commit on multiple branches if one branch has no remote': 
+	(
+		cd work/gar/bage &&
+		>junk4 &&
+		git add junk4 &&
+		git commit -m "Fourth junk"
+	) &&
+	(
+		cd work &&
+		git branch branch2 &&
+		git add gar/bage &&
+		git commit -m "Fourth commit for gar/bage" &&
+		git checkout branch2 &&
+		(
+			cd gar/bage &&
+			git checkout HEAD~1
+		) &&
+		>junk1 &&
+		git add junk1 &&
+		git commit -m "First junk" &&
+		test_must_fail git push --recurse-submodules=check ../pub.git
+	)
+
+[main 8e0d58c] Fourth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk4
+[main 1a1015f] Fourth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'branch2'
+M	gar/bage
+Note: switching to 'HEAD~1'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 41a3ccc Recurse push fails if recurse submodules option passed as yes
+[branch2 0b7464f] First junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk1
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+ok 16 - push fails when commit on multiple branches if one branch has no remote
+
+expecting success of 5531.17 'push succeeds if submodule has no remote and is on the first superproject commit': 
+	git init --bare a &&
+	git clone a a1 &&
+	(
+		cd a1 &&
+		git init b &&
+		(
+			cd b &&
+			>junk &&
+			git add junk &&
+			git commit -m "initial"
+		) &&
+		git add b &&
+		git commit -m "added submodule" &&
+		git push --recurse-submodules=check origin main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/a/
+Cloning into 'a1'...
+warning: You appear to have cloned an empty repository.
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/a1/b/.git/
+[main (root-commit) f055ed5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk
+warning: adding embedded git repository: b
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> b
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached b
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main (root-commit) c2121a0] added submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 b
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/a
+ * [new branch]      main -> main
+ok 17 - push succeeds if submodule has no remote and is on the first superproject commit
+
+expecting success of 5531.18 'push unpushed submodules when not needed': 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git checkout main &&
+			>junk5 &&
+			git add junk5 &&
+			git commit -m "Fifth junk" &&
+			git push &&
+			git rev-parse origin/main >../../../expected
+		) &&
+		git checkout main &&
+		git add gar/bage &&
+		git commit -m "Fifth commit for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_cmp expected actual
+
+Previous HEAD position was 41a3ccc Recurse push fails if recurse submodules option passed as yes
+Switched to branch 'main'
+[main 7f851d1] Fifth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk5
+To ../../../submodule.git
+   41a3ccc..7f851d1  main -> main
+Switched to branch 'main'
+M	gar/bage
+[main fbdd783] Fifth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   222fffb..fbdd783  main -> main
+ok 18 - push unpushed submodules when not needed
+
+expecting success of 5531.19 'push unpushed submodules when not needed 2': 
+	(
+		cd submodule.git &&
+		git rev-parse main >../expected
+	) &&
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			>junk6 &&
+			git add junk6 &&
+			git commit -m "Sixth junk"
+		) &&
+		>junk2 &&
+		git add junk2 &&
+		git commit -m "Second junk for work" &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_cmp expected actual
+
+[main 1aa6921] Sixth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk6
+[main 8ea0267] Second junk for work
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk2
+To ../pub.git
+   fbdd783..8ea0267  main -> main
+ok 19 - push unpushed submodules when not needed 2
+
+expecting success of 5531.20 'push unpushed submodules recursively': 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git checkout main &&
+			> junk7 &&
+			git add junk7 &&
+			git commit -m "Seventh junk" &&
+			git rev-parse main >../../../expected
+		) &&
+		git checkout main &&
+		git add gar/bage &&
+		git commit -m "Seventh commit for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_cmp expected actual
+
+Already on 'main'
+[main a888053] Seventh junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk7
+Already on 'main'
+M	gar/bage
+[main 962ec87] Seventh commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   7f851d1..a888053  main -> main
+To ../pub.git
+   8ea0267..962ec87  main -> main
+ok 20 - push unpushed submodules recursively
+
+expecting success of 5531.21 'push unpushable submodule recursively fails': 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git rev-parse origin/main >../../../expected &&
+			git checkout main~0 &&
+			> junk8 &&
+			git add junk8 &&
+			git commit -m "Eighth junk"
+		) &&
+		git add gar/bage &&
+		git commit -m "Eighth commit for gar/bage" &&
+		test_must_fail git push --recurse-submodules=on-demand ../pub.git main
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_when_finished git -C work reset --hard main^ &&
+	test_cmp expected actual
+
+Note: switching to 'main~0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at a888053 Seventh junk
+[detached HEAD ae657ca] Eighth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk8
+[main 084f954] Eighth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+Everything up-to-date
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+HEAD is now at 962ec87 Seventh commit for gar/bage
+ok 21 - push unpushable submodule recursively fails
+
+expecting success of 5531.22 'push --dry-run does not recursively update submodules': 
+	(
+		cd work/gar/bage &&
+		git checkout main &&
+		git rev-parse main >../../../expected_submodule &&
+		> junk9 &&
+		git add junk9 &&
+		git commit -m "Ninth junk" &&
+
+		# Go up to work directory
+		cd ../.. &&
+		git checkout main &&
+		git rev-parse main >../expected_pub &&
+		git add gar/bage &&
+		git commit -m "Ninth commit for gar/bage" &&
+		git push --dry-run --recurse-submodules=on-demand ../pub.git main
+	) &&
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	test_cmp expected_pub actual_pub &&
+	test_cmp expected_submodule actual_submodule
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  ae657ca Eighth junk
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> ae657ca
+
+Switched to branch 'main'
+[main b4de299] Ninth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk9
+Already on 'main'
+M	gar/bage
+[main 506f118] Ninth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   a888053..b4de299  main -> main
+To ../pub.git
+   962ec87..506f118  main -> main
+ok 22 - push --dry-run does not recursively update submodules
+
+expecting success of 5531.23 'push --dry-run does not recursively update submodules': 
+	git -C work push --dry-run --recurse-submodules=only ../pub.git main &&
+
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	test_cmp expected_pub actual_pub &&
+	test_cmp expected_submodule actual_submodule
+
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   a888053..b4de299  main -> main
+Everything up-to-date
+ok 23 - push --dry-run does not recursively update submodules
+
+expecting success of 5531.24 'push only unpushed submodules recursively': 
+	git -C work/gar/bage rev-parse main >expected_submodule &&
+	git -C pub.git rev-parse main >expected_pub &&
+
+	git -C work push --recurse-submodules=only ../pub.git main &&
+
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   a888053..b4de299  main -> main
+Everything up-to-date
+ok 24 - push only unpushed submodules recursively
+
+expecting success of 5531.25 'push with push.recurseSubmodules=only on superproject': 
+	test_when_finished rm -rf upstream downstream &&
+	setup_subsub &&
+	new_downstream_commits &&
+	git -C downstream config push.recurseSubmodules only &&
+	git -C downstream push origin downstream-branch &&
+
+	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
+	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
+	test_must_fail git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
+[main (root-commit) 474120f] innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 innermost.t
+Adding existing repo at 'deepsub' to the index
+[main (root-commit) 368641e] middle
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 deepsub
+Adding existing repo at 'sub' to the index
+[main (root-commit) 2115e6c] outermost
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cloning into 'downstream'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
+done.
+Submodule path 'sub': checked out '368641e94e5de2829cfae22976de19274d54c11a'
+Submodule 'deepsub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
+done.
+Submodule path 'sub/deepsub': checked out '474120f894f05445b107cd92961d883bc2877e80'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+[downstream-branch 0d0452a] new-innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-innermost.t
+[downstream-branch b40b258] new-middle
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[downstream-branch 84df116] new-outermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'sub'
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub
+ * [new branch]      downstream-branch -> downstream-branch
+Everything up-to-date
+fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/downstream-branch
+b40b2588b54182e5d2c2979598807b69c2e9ca4f
+fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/downstream-branch
+ok 25 - push with push.recurseSubmodules=only on superproject
+
+expecting success of 5531.26 'push with push.recurseSubmodules=only on superproject and top-level submodule': 
+	test_when_finished rm -rf upstream downstream &&
+	setup_subsub &&
+	new_downstream_commits &&
+	git -C downstream config push.recurseSubmodules only &&
+	git -C downstream/sub config push.recurseSubmodules only &&
+	git -C downstream push origin downstream-branch 2> err &&
+
+	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
+	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
+	git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch &&
+	grep "recursing into submodule with push.recurseSubmodules=only; using on-demand instead" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
+[main (root-commit) ff9df1c] innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 innermost.t
+Adding existing repo at 'deepsub' to the index
+[main (root-commit) 1491354] middle
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 deepsub
+Adding existing repo at 'sub' to the index
+[main (root-commit) fc64eab] outermost
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cloning into 'downstream'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
+done.
+Submodule path 'sub': checked out '14913541b28e52bad23119683708fc45d9376bed'
+Submodule 'deepsub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
+done.
+Submodule path 'sub/deepsub': checked out 'ff9df1cde3a7559405c3c1eeb7ea710d906115a8'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+Switched to a new branch 'downstream-branch'
+[downstream-branch 8f905ff] new-innermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-innermost.t
+[downstream-branch 6cfd390] new-middle
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[downstream-branch bc3808e] new-outermost
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/downstream-branch
+6cfd3906f0122ec7421e24d2d05931a113c1bb83
+8f905ff36854342cf7f1871351b72bfe2022e9d6
+warning: recursing into submodule with push.recurseSubmodules=only; using on-demand instead
+ok 26 - push with push.recurseSubmodules=only on superproject and top-level submodule
+
+expecting success of 5531.27 'push propagating the remotes name to a submodule': 
+	git -C work remote add origin ../pub.git &&
+	git -C work remote add pub ../pub.git &&
+
+	> work/gar/bage/junk10 &&
+	git -C work/gar/bage add junk10 &&
+	git -C work/gar/bage commit -m "Tenth junk" &&
+	git -C work add gar/bage &&
+	git -C work commit -m "Tenth junk added to gar/bage" &&
+
+	# Fails when submodule does not have a matching remote
+	test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
+	# Succeeds when submodules has matching remote and refspec
+	git -C work push --recurse-submodules=on-demand origin main &&
+
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	git -C work/gar/bage rev-parse main >expected_submodule &&
+	git -C work rev-parse main >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+[main 598d32e] Tenth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk10
+[main f4a8571] Tenth junk added to gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: remote 'pub' not configured
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   b4de299..598d32e  main -> main
+To ../pub.git
+   962ec87..f4a8571  main -> main
+ok 27 - push propagating the remotes name to a submodule
+
+expecting success of 5531.28 'push propagating refspec to a submodule': 
+	> work/gar/bage/junk11 &&
+	git -C work/gar/bage add junk11 &&
+	git -C work/gar/bage commit -m "Eleventh junk" &&
+
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
+
+	# Fails when submodule does not have a matching branch
+	test_must_fail git -C work push --recurse-submodules=on-demand origin branch2 &&
+	# Fails when refspec includes an object id
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		"$(git -C work rev-parse branch2):refs/heads/branch2" &&
+	# Fails when refspec includes HEAD and parent and submodule do not
+	# have the same named branch checked out
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		HEAD:refs/heads/branch2 &&
+
+	git -C work/gar/bage branch branch2 main &&
+	git -C work push --recurse-submodules=on-demand origin branch2 &&
+
+	git -C submodule.git rev-parse branch2 >actual_submodule &&
+	git -C pub.git rev-parse branch2 >actual_pub &&
+	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
+	git -C work rev-parse branch2 >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+[main 0a0cd0a] Eleventh junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk11
+Switched to branch 'branch2'
+M	gar/bage
+[branch2 ec50cd3] updating gar/bage in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: src refspec 'branch2' must name a ref
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+fatal: src refspec 'ec50cd3dd859532aceefbd03eacca6540c93d099' must name a ref
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+fatal: HEAD does not match the named branch in the superproject
+fatal: process for submodule 'gar/bage' failed
+fatal: the remote end hung up unexpectedly
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+ * [new branch]      branch2 -> branch2
+To ../pub.git
+ * [new branch]      branch2 -> branch2
+ok 28 - push propagating refspec to a submodule
+
+expecting success of 5531.29 'push propagating HEAD refspec to a submodule': 
+	git -C work/gar/bage checkout branch2 &&
+	> work/gar/bage/junk12 &&
+	git -C work/gar/bage add junk12 &&
+	git -C work/gar/bage commit -m "Twelfth junk" &&
+
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
 
-expecting success of 5515.65 'br-unconfig ../.git one tag tag-one tag tag-three-file': 
-		cp "$expect_f" expect_f &&
-		convert_expected expect_f sed_script &&
-		cp "$expect_r" expect_r &&
-		convert_expected expect_r sed_script &&
-		{
-			echo "# $cmd" &&
-			set x $cmd && shift &&
-			git symbolic-ref HEAD refs/heads/$1 && shift &&
-			rm -f .git/FETCH_HEAD &&
-			git for-each-ref \
-				refs/heads refs/remotes/rem refs/tags |
-			while read val type refname
-			do
-				git update-ref -d "$refname" "$val" || return 1
-			done &&
-			git fetch "$@" >/dev/null &&
-			cat .git/FETCH_HEAD
-		} >"$actual_f" &&
-		git show-ref >"$actual_r" &&
-		if test -f "expect_f"
-		then
-			test_cmp "expect_f" "$actual_f" &&
-			rm -f "$actual_f"
-		else
-			# this is to help developing new tests.
-			cp "$actual_f" "$expect_f"
-			false
-		fi &&
-		if test -f "expect_r"
-		then
-			test_cmp "expect_r" "$actual_r" &&
-			rm -f "$actual_r"
-		else
-			# this is to help developing new tests.
-			cp "$actual_r" "$expect_r"
-			false
-		fi
-	
-From ../
- * branch            one            -> FETCH_HEAD
- * [new tag]         tag-one        -> tag-one
- * [new tag]         tag-three-file -> tag-three-file
- * [new tag]         tag-main       -> tag-main
- * [new tag]         tag-one-tree   -> tag-one-tree
- * [new tag]         tag-three      -> tag-three
- * [new tag]         tag-two        -> tag-two
-ok 65 - br-unconfig ../.git one tag tag-one tag tag-three-file
+	# Passes since the superproject and submodules HEAD are both on branch2
+	git -C work push --recurse-submodules=on-demand origin \
+		HEAD:refs/heads/branch2 &&
 
-# passed all 65 test(s)
-1..65
+	git -C submodule.git rev-parse branch2 >actual_submodule &&
+	git -C pub.git rev-parse branch2 >actual_pub &&
+	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
+	git -C work rev-parse branch2 >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+Switched to branch 'branch2'
+[branch2 073878c] Twelfth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk12
+Already on 'branch2'
+M	gar/bage
+[branch2 2a64ff7] updating gar/bage in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   0a0cd0a..073878c  HEAD -> branch2
+To ../pub.git
+   ec50cd3..2a64ff7  HEAD -> branch2
+ok 29 - push propagating HEAD refspec to a submodule
+
+# passed all 29 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5551-http-fetch-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5551-http-fetch-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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5548-push-porcelain.sh ***
@@ -353003,215 +353942,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5554-noop-fetch-negotiator.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/.git/
-expecting success of 5554.1 'noop negotiator does not emit any "have"': 
-	rm -f trace &&
-
-	test_create_repo server &&
-	test_commit -C server to_fetch &&
-
-	test_create_repo client &&
-	test_commit -C client we_have &&
-
-	test_config -C client fetch.negotiationalgorithm noop &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" &&
-
-	! grep "fetch> have" trace &&
-	grep "fetch> done" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/server/.git/
-[master (root-commit) 92dc17d] to_fetch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_fetch.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/client/.git/
-[master (root-commit) c20e644] we_have
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 we_have.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/server
- * branch            HEAD       -> FETCH_HEAD
-packet:        fetch> done
-ok 1 - noop negotiator does not emit any "have"
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5555-http-smart-common.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5555-http-smart-common/.git/
-expecting success of 5555.1 'setup': 
-	test_commit --no-tag initial
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 1 - setup
-
-expecting success of 5555.2 'git upload-pack --http-backend-info-refs and --advertise-refs are aliased': 
-	git upload-pack --http-backend-info-refs . >expected 2>err.expected &&
-	git upload-pack --advertise-refs . >actual 2>err.actual &&
-	test_cmp err.expected err.actual &&
-	test_cmp expected actual
-
-ok 2 - git upload-pack --http-backend-info-refs and --advertise-refs are aliased
-
-expecting success of 5555.3 'git receive-pack --http-backend-info-refs and --advertise-refs are aliased': 
-	git receive-pack --http-backend-info-refs . >expected 2>err.expected &&
-	git receive-pack --advertise-refs . >actual 2>err.actual &&
-	test_cmp err.expected err.actual &&
-	test_cmp expected actual
-
-ok 3 - git receive-pack --http-backend-info-refs and --advertise-refs are aliased
-
-expecting success of 5555.4 'git upload-pack --advertise-refs': 
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) HEAD
-	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
-	0000
-	EOF
-
-	# We only care about GIT_PROTOCOL, not GIT_TEST_PROTOCOL_VERSION
-	sane_unset GIT_PROTOCOL &&
-	GIT_TEST_PROTOCOL_VERSION=2 \
-	git upload-pack --advertise-refs . >out 2>err &&
-
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect &&
-
-	# The --advertise-refs alias works
-	git upload-pack --advertise-refs . >out 2>err &&
-
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect
-
-ok 4 - git upload-pack --advertise-refs
-
-expecting success of 5555.5 'git upload-pack --advertise-refs: v0': 
-	# With no specified protocol
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) HEAD
-	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
-	0000
-	EOF
-
-	git upload-pack --advertise-refs . >out 2>err &&
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect &&
-
-	# With explicit v0
-	GIT_PROTOCOL=version=0 \
-	git upload-pack --advertise-refs . >out 2>err &&
-	test-tool pkt-line unpack <out >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp actual expect
-
-
-ok 5 - git upload-pack --advertise-refs: v0
-
-expecting success of 5555.6 'git receive-pack --advertise-refs: v0': 
-	# With no specified protocol
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
-	0000
-	EOF
-
-	git receive-pack --advertise-refs . >out 2>err &&
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect &&
-
-	# With explicit v0
-	GIT_PROTOCOL=version=0 \
-	git receive-pack --advertise-refs . >out 2>err &&
-	test-tool pkt-line unpack <out >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp actual expect
-
-
-ok 6 - git receive-pack --advertise-refs: v0
-
-expecting success of 5555.7 'git upload-pack --advertise-refs: v1': 
-	# With no specified protocol
-	cat >expect <<-EOF &&
-	version 1
-	$(git rev-parse HEAD) HEAD
-	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
-	0000
-	EOF
-
-	GIT_PROTOCOL=version=1 \
-	git upload-pack --advertise-refs . >out &&
-
-	test-tool pkt-line unpack <out >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp actual expect
-
-ok 7 - git upload-pack --advertise-refs: v1
-
-expecting success of 5555.8 'git receive-pack --advertise-refs: v1': 
-	# With no specified protocol
-	cat >expect <<-EOF &&
-	version 1
-	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
-	0000
-	EOF
-
-	GIT_PROTOCOL=version=1 \
-	git receive-pack --advertise-refs . >out &&
-
-	test-tool pkt-line unpack <out >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp actual expect
-
-ok 8 - git receive-pack --advertise-refs: v1
-
-expecting success of 5555.9 'git upload-pack --advertise-refs: v2': 
-	cat >expect <<-EOF &&
-	version 2
-	agent=FAKE
-	ls-refs=unborn
-	fetch=shallow wait-for-done
-	server-option
-	object-format=$(test_oid algo)
-	0000
-	EOF
-
-	GIT_PROTOCOL=version=2 \
-	GIT_USER_AGENT=FAKE \
-	git upload-pack --advertise-refs . >out 2>err &&
-
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect
-
-ok 9 - git upload-pack --advertise-refs: v2
-
-expecting success of 5555.10 'git receive-pack --advertise-refs: v2': 
-	# There is no v2 yet for receive-pack, implicit v0
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
-	0000
-	EOF
-
-	GIT_PROTOCOL=version=2 \
-	git receive-pack --advertise-refs . >out 2>err &&
-
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect
-
-ok 10 - git receive-pack --advertise-refs: v2
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5557-http-get.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5557-http-get/.git/
 checking prerequisite: NOT_ROOT
@@ -353227,21 +353957,6 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5559-http-fetch-smart-http2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5559-http-fetch-smart-http2/.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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5543-atomic-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5543-atomic-push/.git/
 expecting success of 5543.1 'atomic push works for a single branch': 
@@ -353738,6 +354453,230 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5554-noop-fetch-negotiator.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/.git/
+expecting success of 5554.1 'noop negotiator does not emit any "have"': 
+	rm -f trace &&
+
+	test_create_repo server &&
+	test_commit -C server to_fetch &&
+
+	test_create_repo client &&
+	test_commit -C client we_have &&
+
+	test_config -C client fetch.negotiationalgorithm noop &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" &&
+
+	! grep "fetch> have" trace &&
+	grep "fetch> done" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/server/.git/
+[master (root-commit) 92dc17d] to_fetch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_fetch.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/client/.git/
+[master (root-commit) c20e644] we_have
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 we_have.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5554-noop-fetch-negotiator/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:        fetch> done
+ok 1 - noop negotiator does not emit any "have"
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5555-http-smart-common.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5555-http-smart-common/.git/
+expecting success of 5555.1 'setup': 
+	test_commit --no-tag initial
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 1 - setup
+
+expecting success of 5555.2 'git upload-pack --http-backend-info-refs and --advertise-refs are aliased': 
+	git upload-pack --http-backend-info-refs . >expected 2>err.expected &&
+	git upload-pack --advertise-refs . >actual 2>err.actual &&
+	test_cmp err.expected err.actual &&
+	test_cmp expected actual
+
+ok 2 - git upload-pack --http-backend-info-refs and --advertise-refs are aliased
+
+expecting success of 5555.3 'git receive-pack --http-backend-info-refs and --advertise-refs are aliased': 
+	git receive-pack --http-backend-info-refs . >expected 2>err.expected &&
+	git receive-pack --advertise-refs . >actual 2>err.actual &&
+	test_cmp err.expected err.actual &&
+	test_cmp expected actual
+
+ok 3 - git receive-pack --http-backend-info-refs and --advertise-refs are aliased
+
+expecting success of 5555.4 'git upload-pack --advertise-refs': 
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	# We only care about GIT_PROTOCOL, not GIT_TEST_PROTOCOL_VERSION
+	sane_unset GIT_PROTOCOL &&
+	GIT_TEST_PROTOCOL_VERSION=2 \
+	git upload-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect &&
+
+	# The --advertise-refs alias works
+	git upload-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+ok 4 - git upload-pack --advertise-refs
+
+expecting success of 5555.5 'git upload-pack --advertise-refs: v0': 
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	git upload-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect &&
+
+	# With explicit v0
+	GIT_PROTOCOL=version=0 \
+	git upload-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+
+ok 5 - git upload-pack --advertise-refs: v0
+
+expecting success of 5555.6 'git receive-pack --advertise-refs: v0': 
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	git receive-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect &&
+
+	# With explicit v0
+	GIT_PROTOCOL=version=0 \
+	git receive-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+
+ok 6 - git receive-pack --advertise-refs: v0
+
+expecting success of 5555.7 'git upload-pack --advertise-refs: v1': 
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	version 1
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=1 \
+	git upload-pack --advertise-refs . >out &&
+
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+ok 7 - git upload-pack --advertise-refs: v1
+
+expecting success of 5555.8 'git receive-pack --advertise-refs: v1': 
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	version 1
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=1 \
+	git receive-pack --advertise-refs . >out &&
+
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+ok 8 - git receive-pack --advertise-refs: v1
+
+expecting success of 5555.9 'git upload-pack --advertise-refs: v2': 
+	cat >expect <<-EOF &&
+	version 2
+	agent=FAKE
+	ls-refs=unborn
+	fetch=shallow wait-for-done
+	server-option
+	object-format=$(test_oid algo)
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=2 \
+	GIT_USER_AGENT=FAKE \
+	git upload-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+ok 9 - git upload-pack --advertise-refs: v2
+
+expecting success of 5555.10 'git receive-pack --advertise-refs: v2': 
+	# There is no v2 yet for receive-pack, implicit v0
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=2 \
+	git receive-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+ok 10 - git receive-pack --advertise-refs: v2
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5559-http-fetch-smart-http2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5559-http-fetch-smart-http2/.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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5545-push-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5545-push-options/.git/
 expecting success of 5545.1 'one push option works for a single branch': 
@@ -354146,640 +355085,499 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5531-deep-submodule-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/.git/
-expecting success of 5531.1 'setup': 
-	mkdir pub.git &&
-	GIT_DIR=pub.git git init --bare &&
-	GIT_DIR=pub.git git config receive.fsckobjects true &&
-	mkdir work &&
-	(
-		cd work &&
-		git init &&
-		git config push.default matching &&
-		mkdir -p gar/bage &&
-		(
-			cd gar/bage &&
-			git init &&
-			git config push.default matching &&
-			>junk &&
-			git add junk &&
-			git commit -m "Initial junk"
-		) &&
-		git add gar/bage &&
-		git commit -m "Initial superproject"
-	)
+*** t5564-http-proxy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5564-http-proxy/.git/
+checking prerequisite: NOT_ROOT
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/pub.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/work/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/work/gar/bage/.git/
-[main (root-commit) 6fbe593] Initial junk
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5562-http-backend-content-length.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5562-http-backend-content-length/.git/
+expecting success of 5562.1 'setup': 
+	HTTP_CONTENT_ENCODING="identity" &&
+	export HTTP_CONTENT_ENCODING &&
+	git config http.receivepack true &&
+	test_commit c0 &&
+	test_commit c1 &&
+	hash_head=$(git rev-parse HEAD) &&
+	hash_prev=$(git rev-parse HEAD~1) &&
+	{
+		packetize "want $hash_head" &&
+		printf 0000 &&
+		packetize "have $hash_prev" &&
+		packetize "done"
+	} >fetch_body &&
+	test_copy_bytes 10 <fetch_body >fetch_body.trunc &&
+	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
+	{
+		printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
+			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
+		printf 0000 &&
+		echo "$hash_next" | git pack-objects --stdout
+	} >push_body &&
+	test_copy_bytes 10 <push_body >push_body.trunc &&
+	: >empty_body
+
+[master (root-commit) a44f171] c0
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk
-warning: adding embedded git repository: gar/bage
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> gar/bage
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached gar/bage
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main (root-commit) 38ca8a3] Initial superproject
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.t
+[master 989de5e] c1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 160000 gar/bage
+ create mode 100644 c1.t
 ok 1 - setup
 
-expecting success of 5531.2 'push works with recorded gitlink': 
-	(
-		cd work &&
-		git push ../pub.git main
-	)
+checking prerequisite: GZIP
 
-To ../pub.git
- * [new branch]      main -> main
-ok 2 - push works with recorded gitlink
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
+)
+gzip 1.13
+Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 1993 Jean-loup Gailly.
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
 
-expecting success of 5531.3 'push if submodule has no remote': 
-	(
-		cd work/gar/bage &&
-		>junk2 &&
-		git add junk2 &&
-		git commit -m "Second junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Second commit for gar/bage" &&
-		git push --recurse-submodules=check ../pub.git main
-	)
+Written by Jean-loup Gailly.
+prerequisite GZIP ok
+expecting success of 5562.2 'setup, compression related': 
+	gzip -c fetch_body >fetch_body.gz &&
+	test_copy_bytes 10 <fetch_body.gz >fetch_body.gz.trunc &&
+	gzip -c push_body >push_body.gz &&
+	test_copy_bytes 10 <push_body.gz >push_body.gz.trunc
 
-[main def33d6] Second junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk2
-[main 61d752a] Second commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   38ca8a3..61d752a  main -> main
-ok 3 - push if submodule has no remote
+ok 2 - setup, compression related
 
-expecting success of 5531.4 'push fails if submodule commit not on remote': 
-	(
-		cd work/gar &&
-		git clone --bare bage ../../submodule.git &&
-		cd bage &&
-		git remote add origin ../../../submodule.git &&
-		git fetch &&
-		>junk3 &&
-		git add junk3 &&
-		git commit -m "Third junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Third commit for gar/bage" &&
-		# the push should fail with --recurse-submodules=check
-		# on the command line...
-		test_must_fail git push --recurse-submodules=check ../pub.git main &&
+expecting success of 5562.3 'fetch plain': 
+	test_http_env upload fetch_body &&
+	verify_http_result "200 OK"
 
-		# ...or if specified in the configuration..
-		test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
-	)
+ok 3 - fetch plain
 
-Cloning into bare repository '../../submodule.git'...
-done.
-From ../../../submodule
- * [new branch]      main       -> origin/main
-[main 18a8afc] Third junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk3
-[main 7484e0a] Third commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+expecting success of 5562.4 'fetch plain truncated': 
+	test_http_env upload fetch_body.trunc &&
+	! verify_http_result "200 OK"
 
-Please try
+fatal: the remote end hung up unexpectedly
+ok 4 - fetch plain truncated
 
-	git push --recurse-submodules=on-demand
+expecting success of 5562.5 'fetch plain empty': 
+	test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
 
-or cd to the path and use
+fatal: the remote end hung up unexpectedly
+ok 5 - fetch plain empty
 
-	git push
+expecting success of 5562.6 'fetch gzipped': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz &&
+	verify_http_result "200 OK"
 
-to push them to a remote.
+ok 6 - fetch gzipped
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+expecting success of 5562.7 'fetch gzipped truncated': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz.trunc &&
+	! verify_http_result "200 OK"
 
-Please try
+fatal: request ended in the middle of the gzip stream
+ok 7 - fetch gzipped truncated
 
-	git push --recurse-submodules=on-demand
+expecting success of 5562.8 'fetch gzipped empty': 
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
 
-or cd to the path and use
+fatal: request ended in the middle of the gzip stream
+ok 8 - fetch gzipped empty
 
-	git push
+expecting success of 5562.9 'push plain': 
+	test_when_finished "git branch -D newbranch" &&
+	test_http_env receive push_body &&
+	verify_http_result "200 OK" &&
+	git rev-parse newbranch >act.head &&
+	echo "$hash_next" >exp.head &&
+	test_cmp act.head exp.head
 
-to push them to a remote.
+Deleted branch newbranch (was d8aa3fa).
+ok 9 - push plain
+
+expecting success of 5562.10 'push plain truncated': 
+	test_http_env receive push_body.trunc &&
+	! verify_http_result "200 OK"
 
-fatal: Aborting.
 fatal: the remote end hung up unexpectedly
-ok 4 - push fails if submodule commit not on remote
+ok 10 - push plain truncated
 
-expecting success of 5531.5 'push succeeds after commit was pushed to remote': 
-	(
-		cd work/gar/bage &&
-		git push origin main
-	) &&
-	(
-		cd work &&
-		git push --recurse-submodules=check ../pub.git main
-	)
+expecting success of 5562.11 'push plain empty': 
+	test_http_env receive empty_body &&
+	! verify_http_result "200 OK"
 
-To ../../../submodule.git
-   def33d6..18a8afc  main -> main
-To ../pub.git
-   61d752a..7484e0a  main -> main
-ok 5 - push succeeds after commit was pushed to remote
+fatal: the remote end hung up unexpectedly
+ok 11 - push plain empty
 
-expecting success of 5531.6 'push succeeds if submodule commit not on remote but using on-demand on command line': 
-	(
-		cd work/gar/bage &&
-		>recurse-on-demand-on-command-line &&
-		git add recurse-on-demand-on-command-line &&
-		git commit -m "Recurse on-demand on command line junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on-demand on command line for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+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
 
-[main 04ec359] Recurse on-demand on command line junk
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5533-push-cas.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/.git/
+expecting success of 5533.1 'setup': 
+	# create template repository
+	test_commit A &&
+	test_commit B &&
+	test_commit C
+
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-on-command-line
-[main 034803e] Recurse on-demand on command line for gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   18a8afc..04ec359  main -> main
-To ../pub.git
-   7484e0a..034803e  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 6 - push succeeds if submodule commit not on remote but using on-demand on command line
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
 
-expecting success of 5531.7 'push succeeds if submodule commit not on remote but using on-demand from config': 
+expecting success of 5533.2 'push to update (protected)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-on-demand-from-config &&
-		git add recurse-on-demand-from-config &&
-		git commit -m "Recurse on-demand from config junk"
+		cd dst &&
+		test_commit D &&
+		test_must_fail git push --force-with-lease=main:main origin main 2>err &&
+		grep "stale info" err
 	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on-demand from config for gar/bage" &&
-		git -c push.recurseSubmodules=on-demand push ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+	git ls-remote . refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main cc28292] Recurse on-demand from config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-from-config
-[main 85a50af] Recurse on-demand from config for gar/bage
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   04ec359..cc28292  main -> main
-To ../pub.git
-   034803e..85a50af  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 7 - push succeeds if submodule commit not on remote but using on-demand from config
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ ! [rejected]        main -> main (stale info)
+ok 2 - push to update (protected)
 
-expecting success of 5531.8 'push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config': 
+expecting success of 5533.3 'push to update (protected, forced)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-on-demand-from-submodule-recurse-config &&
-		git add recurse-on-demand-from-submodule-recurse-config &&
-		git commit -m "Recurse submodule.recurse from config junk"
+		cd dst &&
+		test_commit D &&
+		git push --force --force-with-lease=main:main origin main 2>err &&
+		grep "forced update" err
 	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse submodule.recurse from config for gar/bage" &&
-		git -c submodule.recurse push ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main f05bcc4] Recurse submodule.recurse from config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-from-submodule-recurse-config
-[main 937e43c] Recurse submodule.recurse from config for gar/bage
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   cc28292..f05bcc4  main -> main
-To ../pub.git
-   85a50af..937e43c  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 8 - push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ + 35a8500...be8f64f main -> main (forced update)
+ok 3 - push to update (protected, forced)
 
-expecting success of 5531.9 'push recurse-submodules on command line overrides config': 
+expecting success of 5533.4 'push to update (protected, tracking)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-check-on-command-line-overriding-config &&
-		git add recurse-check-on-command-line-overriding-config &&
-		git commit -m "Recurse on command-line overriding config junk"
+		cd src &&
+		git checkout main &&
+		test_commit D &&
+		git checkout HEAD^0
 	) &&
+	git ls-remote src refs/heads/main >expect &&
 	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on command-line overriding config for gar/bage" &&
+		cd dst &&
+		test_commit E &&
+		git ls-remote . refs/remotes/origin/main >expect &&
+		test_must_fail git push --force-with-lease=main origin main &&
+		git ls-remote . refs/remotes/origin/main >actual &&
+		test_cmp expect actual
+	) &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-		# Ensure that we can override on-demand in the config
-		# to just check submodules
-		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git main &&
-		# Check that the supermodule commit did not get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main^ &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-		# Ensure that we can override check in the config to
-		# disable submodule recursion entirely
-		(cd gar/bage && git diff --quiet origin/main main^) &&
-		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git main &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		# Ensure that we can override check in the config to
-		# disable submodule recursion entirely (alternative form)
-		git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git main &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		# Ensure that we can override check in the config to
-		# push the submodule too
-		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		(cd gar/bage && git diff --quiet origin/main main)
-	)
+  git switch -c <new-branch-name>
 
-[main b5bd2c4] Recurse on command-line overriding config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-check-on-command-line-overriding-config
-[main 97693ab] Recurse on command-line overriding config for gar/bage
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Note: switching to 'HEAD^0'.
 
-Please try
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git push --recurse-submodules=on-demand
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-or cd to the path and use
+  git switch -c <new-branch-name>
 
-	git push
+Or undo this operation with:
 
-to push them to a remote.
+  git switch -
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-To ../pub.git
-   937e43c..97693ab  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   f05bcc4..b5bd2c4  main -> main
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 9 - push recurse-submodules on command line overrides config
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 5531.10 'push recurse-submodules last one wins on command line': 
+HEAD is now at be8f64f D
+[main 3e7056f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ ! [rejected]        main -> main (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
+ok 4 - push to update (protected, tracking)
+
+expecting success of 5533.5 'push to update (protected, tracking, forced)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-check-on-command-line-overriding-earlier-command-line &&
-		git add recurse-check-on-command-line-overriding-earlier-command-line &&
-		git commit -m "Recurse on command-line overriding earlier command-line junk"
+		cd src &&
+		git checkout main &&
+		test_commit D &&
+		git checkout HEAD^0
 	) &&
 	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
+		cd dst &&
+		test_commit E &&
+		git ls-remote . refs/remotes/origin/main >expect &&
+		git push --force --force-with-lease=main origin main
+	) &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-		# should result in "check"
-		test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git main &&
-		# Check that the supermodule commit did not get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main^ &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-		# should result in "no"
-		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git main &&
-		# Check that the supermodule commit did get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		# should result in "no"
-		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git main &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/main main^) &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		# But the options in the other order should push the submodule
-		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git main &&
-		# Check that the submodule commit did get there
-		git fetch ../pub.git &&
-		(cd gar/bage && git diff --quiet origin/main main)
-	)
+  git switch -c <new-branch-name>
 
-[main 2dd0c02] Recurse on command-line overriding earlier command-line junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-check-on-command-line-overriding-earlier-command-line
-[main abee46f] Recurse on command-line overriding earlier command-line for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+Or undo this operation with:
 
-Please try
+  git switch -
 
-	git push --recurse-submodules=on-demand
+Turn off this advice by setting config variable advice.detachedHead to false
 
-or cd to the path and use
+HEAD is now at 35a8500 C
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Note: switching to 'HEAD^0'.
 
-	git push
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-to push them to a remote.
+If you want to 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: Aborting.
-fatal: the remote end hung up unexpectedly
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-To ../pub.git
-   97693ab..abee46f  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Everything up-to-date
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   b5bd2c4..2dd0c02  main -> main
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 10 - push recurse-submodules last one wins on command line
+  git switch -c <new-branch-name>
 
-expecting success of 5531.11 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config': 
-	(
-		cd work/gar/bage &&
-		>recurse-on-demand-on-command-line-overriding-config &&
-		git add recurse-on-demand-on-command-line-overriding-config &&
-		git commit -m "Recurse on-demand on command-line overriding config junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+Or undo this operation with:
 
-[main c30f1ef] Recurse on-demand on command-line overriding config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-on-demand-on-command-line-overriding-config
-[main c41dba3] Recurse on-demand on command-line overriding config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   2dd0c02..c30f1ef  main -> main
-To ../pub.git
-   abee46f..c41dba3  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 11 - push succeeds if submodule commit not on remote using on-demand from cmdline overriding config
+  git switch -
 
-expecting success of 5531.12 'push succeeds if submodule commit disabling recursion from cmdline overriding config': 
-	(
-		cd work/gar/bage &&
-		>recurse-disable-on-command-line-overriding-config &&
-		git add recurse-disable-on-command-line-overriding-config &&
-		git commit -m "Recurse disable on command-line overriding config junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/main main^ ) &&
-		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git main
-	)
+Turn off this advice by setting config variable advice.detachedHead to false
 
-[main 6738ef7] Recurse disable on command-line overriding config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-disable-on-command-line-overriding-config
-[main b2ab521] Recurse disable on command-line overriding config for gar/bage
+HEAD is now at be8f64f D
+[main 3e7056f] E
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   c41dba3..b2ab521  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   c30f1ef..6738ef7  main -> main
-Everything up-to-date
-ok 12 - push succeeds if submodule commit disabling recursion from cmdline overriding config
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ + be8f64f...3e7056f main -> main (forced update)
+ok 5 - push to update (protected, tracking, forced)
 
-expecting success of 5531.13 'push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config': 
+expecting success of 5533.6 'push to update (allowed)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>recurse-disable-on-command-line-alt-overriding-config &&
-		git add recurse-disable-on-command-line-alt-overriding-config &&
-		git commit -m "Recurse disable on command-line alternative overriding config junk"
+		cd dst &&
+		test_commit D &&
+		git push --force-with-lease=main:main^ origin main
 	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/main main^ ) &&
-		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git main
-	)
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main b13707b] Recurse disable on command-line alternative overriding config junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-disable-on-command-line-alt-overriding-config
-[main bdb7e27] Recurse disable on command-line alternative overriding config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   b2ab521..bdb7e27  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   6738ef7..b13707b  main -> main
-Everything up-to-date
-ok 13 - push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-expecting success of 5531.14 'submodule entry pointing at a tag is error': 
-	git -C work/gar/bage tag -a test1 -m "tag" &&
-	tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&
-	git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
-	git -C work commit -m "bad commit" &&
-	test_when_finished "git -C work reset --hard HEAD^" &&
-	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
-	test_grep "is a tag, not a commit" err
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-[main 209375b] bad commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: submodule entry 'gar/bage' (eca83b4b9ad7cb2fa6583ec07cdfa5a8d4f6ebe2) is a tag, not a commit
-HEAD is now at bdb7e27 Recurse disable on command-line alternative overriding config for gar/bage
-ok 14 - submodule entry pointing at a tag is error
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 5531.15 'push fails if recurse submodules option passed as yes': 
-	(
-		cd work/gar/bage &&
-		>recurse-push-fails-if-recurse-submodules-passed-as-yes &&
-		git add recurse-push-fails-if-recurse-submodules-passed-as-yes &&
-		git commit -m "Recurse push fails if recurse submodules option passed as yes"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
-		test_must_fail git push --recurse-submodules=yes ../pub.git main &&
-		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git main &&
-		git push --recurse-submodules=on-demand ../pub.git main
-	)
+  git switch -c <new-branch-name>
 
-[main 41a3ccc] Recurse push fails if recurse submodules option passed as yes
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 recurse-push-fails-if-recurse-submodules-passed-as-yes
-[main 222fffb] Recurse push fails if recurse submodules option passed as yes for gar/bage
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: bad recurse-submodules argument: yes
-fatal: bad push.recursesubmodules argument: yes
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   b13707b..41a3ccc  main -> main
-To ../pub.git
-   bdb7e27..222fffb  main -> main
-ok 15 - push fails if recurse submodules option passed as yes
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+   35a8500..be8f64f  main -> main
+ok 6 - push to update (allowed)
 
-expecting success of 5531.16 'push fails when commit on multiple branches if one branch has no remote': 
+expecting success of 5533.7 'push to update (allowed, tracking)': 
+	setup_srcdst_basic &&
 	(
-		cd work/gar/bage &&
-		>junk4 &&
-		git add junk4 &&
-		git commit -m "Fourth junk"
+		cd dst &&
+		test_commit D &&
+		git push --force-with-lease=main origin main 2>err &&
+		! grep "forced update" err
 	) &&
-	(
-		cd work &&
-		git branch branch2 &&
-		git add gar/bage &&
-		git commit -m "Fourth commit for gar/bage" &&
-		git checkout branch2 &&
-		(
-			cd gar/bage &&
-			git checkout HEAD~1
-		) &&
-		>junk1 &&
-		git add junk1 &&
-		git commit -m "First junk" &&
-		test_must_fail git push --recurse-submodules=check ../pub.git
-	)
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-[main 8e0d58c] Fourth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk4
-[main 1a1015f] Fourth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'branch2'
-M	gar/bage
-Note: switching to 'HEAD~1'.
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -354796,216 +355594,213 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 41a3ccc Recurse push fails if recurse submodules option passed as yes
-[branch2 0b7464f] First junk
+HEAD is now at 35a8500 C
+[main be8f64f] D
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk1
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ok 7 - push to update (allowed, tracking)
 
-Please try
+expecting success of 5533.8 'push to update (allowed even though no-ff)': 
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git reset --hard HEAD^ &&
+		test_commit D &&
+		git push --force-with-lease=main origin main 2>err &&
+		grep "forced update" err
+	) &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-	git push --recurse-submodules=on-demand
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-or cd to the path and use
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git push
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-to push them to a remote.
+  git switch -c <new-branch-name>
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-ok 16 - push fails when commit on multiple branches if one branch has no remote
+Or undo this operation with:
 
-expecting success of 5531.17 'push succeeds if submodule has no remote and is on the first superproject commit': 
-	git init --bare a &&
-	git clone a a1 &&
-	(
-		cd a1 &&
-		git init b &&
-		(
-			cd b &&
-			>junk &&
-			git add junk &&
-			git commit -m "initial"
-		) &&
-		git add b &&
-		git commit -m "added submodule" &&
-		git push --recurse-submodules=check origin main
-	)
+  git switch -
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/a/
-Cloning into 'a1'...
-warning: You appear to have cloned an empty repository.
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/a1/b/.git/
-[main (root-commit) f055ed5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk
-warning: adding embedded git repository: b
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> b
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached b
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main (root-commit) c2121a0] added submodule
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+HEAD is now at d9df450 B
+[main 3e6e33e] D
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 160000 b
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/a
- * [new branch]      main -> main
-ok 17 - push succeeds if submodule has no remote and is on the first superproject commit
+ create mode 100644 D.t
+ + 35a8500...3e6e33e main -> main (forced update)
+ok 8 - push to update (allowed even though no-ff)
 
-expecting success of 5531.18 'push unpushed submodules when not needed': 
-	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git checkout main &&
-			>junk5 &&
-			git add junk5 &&
-			git commit -m "Fifth junk" &&
-			git push &&
-			git rev-parse origin/main >../../../expected
-		) &&
-		git checkout main &&
-		git add gar/bage &&
-		git commit -m "Fifth commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git main
-	) &&
+expecting success of 5533.9 'push to delete (protected)': 
+	setup_srcdst_basic &&
+	git ls-remote src refs/heads/main >expect &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		test_must_fail git push --force-with-lease=main:main^ origin :main
 	) &&
-	test_cmp expected actual
+	git ls-remote src refs/heads/main >actual &&
+	test_cmp expect actual
 
-Previous HEAD position was 41a3ccc Recurse push fails if recurse submodules option passed as yes
-Switched to branch 'main'
-[main 7f851d1] Fifth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk5
-To ../../../submodule.git
-   41a3ccc..7f851d1  main -> main
-Switched to branch 'main'
-M	gar/bage
-[main fbdd783] Fifth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   222fffb..fbdd783  main -> main
-ok 18 - push unpushed submodules when not needed
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-expecting success of 5531.19 'push unpushed submodules when not needed 2': 
-	(
-		cd submodule.git &&
-		git rev-parse main >../expected
-	) &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ ! [rejected]        (delete) -> main (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
+ok 9 - push to delete (protected)
+
+expecting success of 5533.10 'push to delete (protected, forced)': 
+	setup_srcdst_basic &&
 	(
-		cd work &&
-		(
-			cd gar/bage &&
-			>junk6 &&
-			git add junk6 &&
-			git commit -m "Sixth junk"
-		) &&
-		>junk2 &&
-		git add junk2 &&
-		git commit -m "Second junk for work" &&
-		git push --recurse-submodules=on-demand ../pub.git main
+		cd dst &&
+		git push --force --force-with-lease=main:main^ origin :main
 	) &&
+	git ls-remote src refs/heads/main >actual &&
+	test_must_be_empty actual
+
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ - [deleted]         main
+ok 10 - push to delete (protected, forced)
+
+expecting success of 5533.11 'push to delete (allowed)': 
+	setup_srcdst_basic &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		git push --force-with-lease=main origin :main 2>err &&
+		grep deleted err
 	) &&
-	test_cmp expected actual
+	git ls-remote src refs/heads/main >actual &&
+	test_must_be_empty actual
 
-[main 1aa6921] Sixth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk6
-[main 8ea0267] Second junk for work
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk2
-To ../pub.git
-   fbdd783..8ea0267  main -> main
-ok 19 - push unpushed submodules when not needed 2
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-expecting success of 5531.20 'push unpushed submodules recursively': 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+ - [deleted]         main
+ok 11 - push to delete (allowed)
+
+expecting success of 5533.12 'cover everything with default force-with-lease (protected)': 
+	setup_srcdst_basic &&
 	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git checkout main &&
-			> junk7 &&
-			git add junk7 &&
-			git commit -m "Seventh junk" &&
-			git rev-parse main >../../../expected
-		) &&
-		git checkout main &&
-		git add gar/bage &&
-		git commit -m "Seventh commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git main
+		cd src &&
+		git branch nain main^
 	) &&
+	git ls-remote src refs/heads/\* >expect &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		test_must_fail git push --force-with-lease origin main main:nain
 	) &&
-	test_cmp expected actual
+	git ls-remote src refs/heads/\* >actual &&
+	test_cmp expect actual
 
-Already on 'main'
-[main a888053] Seventh junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk7
-Already on 'main'
-M	gar/bage
-[main 962ec87] Seventh commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   7f851d1..a888053  main -> main
-To ../pub.git
-   8ea0267..962ec87  main -> main
-ok 20 - push unpushed submodules recursively
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-expecting success of 5531.21 'push unpushable submodule recursively fails': 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ ! [rejected]        main -> nain (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
+ok 12 - cover everything with default force-with-lease (protected)
+
+expecting success of 5533.13 'cover everything with default force-with-lease (allowed)': 
+	setup_srcdst_basic &&
 	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git rev-parse origin/main >../../../expected &&
-			git checkout main~0 &&
-			> junk8 &&
-			git add junk8 &&
-			git commit -m "Eighth junk"
-		) &&
-		git add gar/bage &&
-		git commit -m "Eighth commit for gar/bage" &&
-		test_must_fail git push --recurse-submodules=on-demand ../pub.git main
+		cd src &&
+		git branch nain main^
 	) &&
 	(
-		cd submodule.git &&
-		git rev-parse main >../actual
+		cd dst &&
+		git fetch &&
+		git push --force-with-lease origin main main:nain
 	) &&
-	test_when_finished git -C work reset --hard main^ &&
-	test_cmp expected actual
+	git ls-remote dst refs/heads/main |
+	sed -e "s/main/nain/" >expect &&
+	git ls-remote src refs/heads/nain >actual &&
+	test_cmp expect actual
 
-Note: switching to 'main~0'.
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -355022,395 +355817,736 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at a888053 Seventh junk
-[detached HEAD ae657ca] Eighth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk8
-[main 084f954] Eighth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-Everything up-to-date
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
+HEAD is now at 35a8500 C
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ * [new branch]      nain       -> origin/nain
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+   d9df450..35a8500  main -> nain
+ok 13 - cover everything with default force-with-lease (allowed)
 
-Please try
+expecting success of 5533.14 'new branch covered by force-with-lease': 
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch main &&
+		git push --force-with-lease=branch origin branch
+	) &&
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
 
-	git push --recurse-submodules=on-demand
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-or cd to the path and use
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git push
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-to push them to a remote.
+  git switch -c <new-branch-name>
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-HEAD is now at 962ec87 Seventh commit for gar/bage
-ok 21 - push unpushable submodule recursively fails
+Or undo this operation with:
 
-expecting success of 5531.22 'push --dry-run does not recursively update submodules': 
-	(
-		cd work/gar/bage &&
-		git checkout main &&
-		git rev-parse main >../../../expected_submodule &&
-		> junk9 &&
-		git add junk9 &&
-		git commit -m "Ninth junk" &&
+  git switch -
 
-		# Go up to work directory
-		cd ../.. &&
-		git checkout main &&
-		git rev-parse main >../expected_pub &&
-		git add gar/bage &&
-		git commit -m "Ninth commit for gar/bage" &&
-		git push --dry-run --recurse-submodules=on-demand ../pub.git main
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ * [new branch]      branch -> branch
+ok 14 - new branch covered by force-with-lease
+
+expecting success of 5533.15 'new branch covered by force-with-lease (explicit)': 
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch main &&
+		git push --force-with-lease=branch: origin branch
 	) &&
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	test_cmp expected_pub actual_pub &&
-	test_cmp expected_submodule actual_submodule
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-  ae657ca Eighth junk
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
- git branch <new-branch-name> ae657ca
+  git switch -c <new-branch-name>
 
-Switched to branch 'main'
-[main b4de299] Ninth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk9
-Already on 'main'
-M	gar/bage
-[main 506f118] Ninth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   a888053..b4de299  main -> main
-To ../pub.git
-   962ec87..506f118  main -> main
-ok 22 - push --dry-run does not recursively update submodules
+Or undo this operation with:
 
-expecting success of 5531.23 'push --dry-run does not recursively update submodules': 
-	git -C work push --dry-run --recurse-submodules=only ../pub.git main &&
+  git switch -
 
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	test_cmp expected_pub actual_pub &&
-	test_cmp expected_submodule actual_submodule
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   a888053..b4de299  main -> main
-Everything up-to-date
-ok 23 - push --dry-run does not recursively update submodules
+HEAD is now at 35a8500 C
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ * [new branch]      branch -> branch
+ok 15 - new branch covered by force-with-lease (explicit)
 
-expecting success of 5531.24 'push only unpushed submodules recursively': 
-	git -C work/gar/bage rev-parse main >expected_submodule &&
-	git -C pub.git rev-parse main >expected_pub &&
+expecting success of 5533.16 'new branch already exists': 
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git checkout -b branch main &&
+		test_commit F
+	) &&
+	(
+		cd dst &&
+		git branch branch main &&
+		test_must_fail git push --force-with-lease=branch: origin branch
+	)
 
-	git -C work push --recurse-submodules=only ../pub.git main &&
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: switching to 'HEAD^0'.
 
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   a888053..b4de299  main -> main
-Everything up-to-date
-ok 24 - push only unpushed submodules recursively
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 5531.25 'push with push.recurseSubmodules=only on superproject': 
-	test_when_finished rm -rf upstream downstream &&
-	setup_subsub &&
-	new_downstream_commits &&
-	git -C downstream config push.recurseSubmodules only &&
-	git -C downstream push origin downstream-branch &&
+  git switch -c <new-branch-name>
 
-	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
-	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
-	test_must_fail git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch
+Or undo this operation with:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
-[main (root-commit) 474120f] innermost
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 35a8500 C
+Switched to a new branch 'branch'
+[branch b6ba73d] F
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 innermost.t
-Adding existing repo at 'deepsub' to the index
-[main (root-commit) 368641e] middle
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 deepsub
-Adding existing repo at 'sub' to the index
-[main (root-commit) 2115e6c] outermost
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Cloning into 'downstream'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
-done.
-Submodule path 'sub': checked out '368641e94e5de2829cfae22976de19274d54c11a'
-Submodule 'deepsub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
-done.
-Submodule path 'sub/deepsub': checked out '474120f894f05445b107cd92961d883bc2877e80'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-[downstream-branch 0d0452a] new-innermost
+ create mode 100644 F.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
+ ! [rejected]        branch -> branch (stale info)
+error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
+ok 16 - new branch already exists
+
+expecting success of 5533.17 'background updates of REMOTE can be mitigated with a non-updated REMOTE-push': 
+	rm -rf src dst &&
+	git init --bare src.bare &&
+	test_when_finished "rm -rf src.bare" &&
+	git clone --no-local src.bare dst &&
+	test_when_finished "rm -rf dst" &&
+	(
+		cd dst &&
+		test_commit G &&
+		git remote add origin-push ../src.bare &&
+		git push origin-push main:main
+	) &&
+	git clone --no-local src.bare dst2 &&
+	test_when_finished "rm -rf dst2" &&
+	(
+		cd dst2 &&
+		test_commit H &&
+		git push
+	) &&
+	(
+		cd dst &&
+		test_commit I &&
+		git fetch origin &&
+		test_must_fail git push --force-with-lease origin-push &&
+		git fetch origin-push &&
+		git push --force-with-lease origin-push
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src.bare/
+Cloning into 'dst'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) c0a8953] G
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 new-innermost.t
-[downstream-branch b40b258] new-middle
+ create mode 100644 G.t
+To ../src.bare
+ * [new branch]      main -> main
+Cloning into 'dst2'...
+[main d19f4d4] H
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[downstream-branch 84df116] new-outermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src.bare
+   c0a8953..d19f4d4  main -> main
+[main 91bb270] I
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'sub'
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub
- * [new branch]      downstream-branch -> downstream-branch
-Everything up-to-date
-fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/downstream-branch
-b40b2588b54182e5d2c2979598807b69c2e9ca4f
-fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/downstream-branch
-ok 25 - push with push.recurseSubmodules=only on superproject
-
-expecting success of 5531.26 'push with push.recurseSubmodules=only on superproject and top-level submodule': 
-	test_when_finished rm -rf upstream downstream &&
-	setup_subsub &&
-	new_downstream_commits &&
-	git -C downstream config push.recurseSubmodules only &&
-	git -C downstream/sub config push.recurseSubmodules only &&
-	git -C downstream push origin downstream-branch 2> err &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src.bare
+ * [new branch]      main       -> origin/main
+To ../src.bare
+ ! [rejected]        main -> main (stale info)
+error: failed to push some refs to '../src.bare'
+From ../src.bare
+   c0a8953..d19f4d4  main       -> origin-push/main
+To ../src.bare
+ + d19f4d4...91bb270 main -> main (forced update)
+ok 17 - background updates of REMOTE can be mitigated with a non-updated REMOTE-push
 
-	test_must_fail git -C upstream rev-parse refs/heads/downstream-branch &&
-	git -C upstream/sub rev-parse refs/heads/downstream-branch &&
-	git -C upstream/sub/deepsub rev-parse refs/heads/downstream-branch &&
-	grep "recursing into submodule with push.recurseSubmodules=only; using on-demand instead" err
+expecting success of 5533.18 'background updates to remote can be mitigated with "--force-if-includes"': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	git ls-remote dst refs/heads/branch >expect.branch &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git fetch --all &&
+		test_must_fail git push --force-with-lease --force-if-includes --all
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	git ls-remote dst refs/heads/branch >actual.branch &&
+	test_cmp expect.main actual.main &&
+	test_cmp expect.branch actual.branch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub/.git/
-[main (root-commit) ff9df1c] innermost
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 innermost.t
-Adding existing repo at 'deepsub' to the index
-[main (root-commit) 1491354] middle
+ create mode 100644 A.t
+[main f9a2dac] B
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 deepsub
-Adding existing repo at 'sub' to the index
-[main (root-commit) fc64eab] outermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Cloning into 'downstream'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
-done.
-Submodule path 'sub': checked out '14913541b28e52bad23119683708fc45d9376bed'
-Submodule 'deepsub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5531-deep-submodule-push/downstream/sub/deepsub'...
-done.
-Submodule path 'sub/deepsub': checked out 'ff9df1cde3a7559405c3c1eeb7ea710d906115a8'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-Switched to a new branch 'downstream-branch'
-[downstream-branch 8f905ff] new-innermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 new-innermost.t
-[downstream-branch 6cfd390] new-middle
+ create mode 100644 D.t
+[branch b63fbb1] E
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[downstream-branch bc3808e] new-outermost
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: ambiguous argument 'refs/heads/downstream-branch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/downstream-branch
-6cfd3906f0122ec7421e24d2d05931a113c1bb83
-8f905ff36854342cf7f1871351b72bfe2022e9d6
-warning: recursing into submodule with push.recurseSubmodules=only; using on-demand instead
-ok 26 - push with push.recurseSubmodules=only on superproject and top-level submodule
-
-expecting success of 5531.27 'push propagating the remotes name to a submodule': 
-	git -C work remote add origin ../pub.git &&
-	git -C work remote add pub ../pub.git &&
-
-	> work/gar/bage/junk10 &&
-	git -C work/gar/bage add junk10 &&
-	git -C work/gar/bage commit -m "Tenth junk" &&
-	git -C work add gar/bage &&
-	git -C work commit -m "Tenth junk added to gar/bage" &&
-
-	# Fails when submodule does not have a matching remote
-	test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
-	# Succeeds when submodules has matching remote and refspec
-	git -C work push --recurse-submodules=on-demand origin main &&
-
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	git -C work/gar/bage rev-parse main >expected_submodule &&
-	git -C work rev-parse main >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
-
-[main 598d32e] Tenth junk
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk10
-[main f4a8571] Tenth junk added to gar/bage
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: remote 'pub' not configured
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   b4de299..598d32e  main -> main
-To ../pub.git
-   962ec87..f4a8571  main -> main
-ok 27 - push propagating the remotes name to a submodule
-
-expecting success of 5531.28 'push propagating refspec to a submodule': 
-	> work/gar/bage/junk11 &&
-	git -C work/gar/bage add junk11 &&
-	git -C work/gar/bage commit -m "Eleventh junk" &&
-
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   157d38b..b995a30  main       -> origin/main
+   b63fbb1..9cdccac  branch     -> origin/branch
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ ! [rejected]        branch -> branch (remote ref updated since checkout)
+ ! [rejected]        main -> main (remote ref updated since checkout)
+error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst'
+hint: Updates were rejected because the tip of the remote-tracking branch has
+hint: been updated since the last checkout. If you want to integrate the
+hint: remote changes, use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ok 18 - background updates to remote can be mitigated with "--force-if-includes"
 
-	# Fails when submodule does not have a matching branch
-	test_must_fail git -C work push --recurse-submodules=on-demand origin branch2 &&
-	# Fails when refspec includes an object id
-	test_must_fail git -C work push --recurse-submodules=on-demand origin \
-		"$(git -C work rev-parse branch2):refs/heads/branch2" &&
-	# Fails when refspec includes HEAD and parent and submodule do not
-	# have the same named branch checked out
-	test_must_fail git -C work push --recurse-submodules=on-demand origin \
-		HEAD:refs/heads/branch2 &&
+expecting success of 5533.19 'background updates to remote can be mitigated with "push.useForceIfIncludes"': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git fetch --all &&
+		git config --local push.useForceIfIncludes true &&
+		test_must_fail git push --force-with-lease=main origin main
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	test_cmp expect.main actual.main
 
-	git -C work/gar/bage branch branch2 main &&
-	git -C work push --recurse-submodules=on-demand origin branch2 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   157d38b..b995a30  main       -> origin/main
+   b63fbb1..9cdccac  branch     -> origin/branch
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ ! [rejected]        main -> main (remote ref updated since checkout)
+error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst'
+hint: Updates were rejected because the tip of the remote-tracking branch has
+hint: been updated since the last checkout. If you want to integrate the
+hint: remote changes, use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ok 19 - background updates to remote can be mitigated with "push.useForceIfIncludes"
 
-	git -C submodule.git rev-parse branch2 >actual_submodule &&
-	git -C pub.git rev-parse branch2 >actual_pub &&
-	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
-	git -C work rev-parse branch2 >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+expecting success of 5533.20 '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		remote_head="$(git rev-parse refs/remotes/origin/main)" &&
+		git fetch --all &&
+		test_must_fail git push --force-if-includes --force-with-lease="main:$remote_head" 2>err &&
+		grep "stale info" err
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	test_cmp expect.main actual.main
 
-[main 0a0cd0a] Eleventh junk
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk11
-Switched to branch 'branch2'
-M	gar/bage
-[branch2 ec50cd3] updating gar/bage in branch2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: src refspec 'branch2' must name a ref
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-fatal: src refspec 'ec50cd3dd859532aceefbd03eacca6540c93d099' must name a ref
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-fatal: HEAD does not match the named branch in the superproject
-fatal: process for submodule 'gar/bage' failed
-fatal: the remote end hung up unexpectedly
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
- * [new branch]      branch2 -> branch2
-To ../pub.git
- * [new branch]      branch2 -> branch2
-ok 28 - push propagating refspec to a submodule
-
-expecting success of 5531.29 'push propagating HEAD refspec to a submodule': 
-	git -C work/gar/bage checkout branch2 &&
-	> work/gar/bage/junk12 &&
-	git -C work/gar/bage add junk12 &&
-	git -C work/gar/bage commit -m "Twelfth junk" &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   157d38b..b995a30  main       -> origin/main
+   b63fbb1..9cdccac  branch     -> origin/branch
+ ! [rejected]        main -> main (stale info)
+ok 20 - "--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"
 
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
+expecting success of 5533.21 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git pull --rebase origin main &&
+		git push --force-if-includes --force-with-lease="main"
+	)
 
-	# Passes since the superproject and submodules HEAD are both on branch2
-	git -C work push --recurse-submodules=on-demand origin \
-		HEAD:refs/heads/branch2 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * branch            main       -> FETCH_HEAD
+   157d38b..b995a30  main       -> origin/main
+Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   b995a30..7c16010  main -> main
+ok 21 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase")
 
-	git -C submodule.git rev-parse branch2 >actual_submodule &&
-	git -C pub.git rev-parse branch2 >actual_pub &&
-	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
-	git -C work rev-parse branch2 >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+expecting success of 5533.22 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git pull --rebase origin main &&
+		git rebase --onto HEAD~4 HEAD~1 &&
+		git push --force-if-includes --force-with-lease="main"
+	)
 
-Switched to branch 'branch2'
-[branch2 073878c] Twelfth junk
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk12
-Already on 'branch2'
-M	gar/bage
-[branch2 2a64ff7] updating gar/bage in branch2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   0a0cd0a..073878c  HEAD -> branch2
-To ../pub.git
-   ec50cd3..2a64ff7  HEAD -> branch2
-ok 29 - push propagating HEAD refspec to a submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+[branch da1510b] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main be2465f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * branch            main       -> FETCH_HEAD
+   157d38b..b995a30  main       -> origin/main
+Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
+Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ + b995a30...e9c7db1 main -> main (forced update)
+ok 22 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)
 
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5564-http-proxy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5564-http-proxy/.git/
-checking prerequisite: NOT_ROOT
+expecting success of 5533.23 '"--force-if-includes" should allow deletes': 
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		git pull --rebase origin branch &&
+		git push --force-if-includes --force-with-lease="branch" origin :branch
+	)
 
-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.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
+Cloning into 'src'...
+warning: You appear to have cloned an empty repository.
+Cloning into 'dup'...
+warning: You appear to have cloned an empty repository.
+[main (root-commit) 112d1ac] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main f9a2dac] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 157d38b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main -> main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      main       -> origin/main
+Switched to a new branch 'branch'
+[branch ded492b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch b63fbb1] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch -> branch
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * [new branch]      branch     -> origin/branch
+branch 'branch' set up to track 'origin/branch'.
+Current branch main is up to date.
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 00b6961] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[main b995a30] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'branch'
+[branch 9cdccac] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+   b63fbb1..9cdccac  branch -> branch
+   157d38b..b995a30  main -> main
+Switched to branch 'branch'
+Your branch is up to date with 'origin/branch'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ * branch            branch     -> FETCH_HEAD
+   b63fbb1..9cdccac  branch     -> origin/branch
+Updating b63fbb1..9cdccac
+Fast-forward
+ H.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
+ - [deleted]         branch
+ok 23 - "--force-if-includes" should allow deletes
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5553-set-upstream.sh ***
@@ -355739,187 +356875,6 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5562-http-backend-content-length.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5560-http-backend-noserver.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5560-http-backend-noserver/.git/
 expecting success of 5560.1 'setup repository': 
@@ -356050,36 +357005,36 @@
 	expect_aliased 1 /etc/./passwd &&
 	expect_aliased 1 //domain/data.txt
 
---- exp.err	2025-02-09 06:54:51.758016968 +0000
-+++ act.err	2025-02-09 06:54:51.750016917 +0000
+--- exp.err	2026-03-14 13:33:18.198677808 +0000
++++ act.err	2026-03-14 13:33:18.174677808 +0000
 @@ -1 +0,0 @@
 -fatal: '/repo.git/../HEAD': aliased
---- exp.err	2025-02-09 06:54:51.762016993 +0000
-+++ act.err	2025-02-09 06:54:51.762016993 +0000
+--- exp.err	2026-03-14 13:33:18.242677808 +0000
++++ act.err	2026-03-14 13:33:18.238677808 +0000
 @@ -1 +1 @@
 -fatal: '/../etc/passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
 \ No newline at end of file
---- exp.err	2025-02-09 06:54:51.770017044 +0000
-+++ act.err	2025-02-09 06:54:51.770017044 +0000
+--- exp.err	2026-03-14 13:33:18.298677808 +0000
++++ act.err	2026-03-14 13:33:18.298677808 +0000
 @@ -1 +1 @@
 -fatal: '../etc/passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
 \ No newline at end of file
---- exp.err	2025-02-09 06:54:51.778017095 +0000
-+++ act.err	2025-02-09 06:54:51.778017095 +0000
+--- exp.err	2026-03-14 13:33:18.358677808 +0000
++++ act.err	2026-03-14 13:33:18.358677808 +0000
 @@ -1 +1 @@
 -fatal: '/etc//passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5560-http-backend-noserver//etc//passwd'
 \ No newline at end of file
---- exp.err	2025-02-09 06:54:51.786017146 +0000
-+++ act.err	2025-02-09 06:54:51.786017146 +0000
+--- exp.err	2026-03-14 13:33:18.402677808 +0000
++++ act.err	2026-03-14 13:33:18.402677808 +0000
 @@ -1 +1 @@
 -fatal: '/etc/./passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
 \ No newline at end of file
---- exp.err	2025-02-09 06:54:51.790017171 +0000
-+++ act.err	2025-02-09 06:54:51.790017171 +0000
+--- exp.err	2026-03-14 13:33:18.430677808 +0000
++++ act.err	2026-03-14 13:33:18.430677808 +0000
 @@ -1 +1 @@
 -fatal: '//domain/data.txt': aliased
 +Request not supported: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
@@ -356647,6 +357602,11 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5580-unc-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5580-unc-paths/.git/
+1..0 # SKIP skipping Windows-only path tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5573-pull-verify-signatures.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5573-pull-verify-signatures/.git/
 checking prerequisite: GPG
@@ -356733,26 +357693,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5580-unc-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5580-unc-paths/.git/
-1..0 # SKIP skipping Windows-only path tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5581-http-curl-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5571-pre-push-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5571-pre-push-hook/.git/
 expecting success of 5571.1 'setup': 
@@ -357921,8 +358861,2092 @@
  * [new branch]      b/2000 -> b/2000
 ok 11 - sigpipe does not cause pre-push hook failure
 
-# passed all 11 test(s)
-1..11
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5581-http-curl-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5570-git-daemon.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/.git/
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+expecting success of 5570.1 'daemon rejects invalid --init-timeout values': 
+	for arg in "3a" "-3"
+	do
+		test_must_fail git daemon --init-timeout="$arg" 2>err &&
+		test_grep "fatal: invalid init-timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
+		return 1
+	done
+
+fatal: invalid init-timeout '3a', expecting a non-negative integer
+fatal: invalid init-timeout '-3', expecting a non-negative integer
+ok 1 - daemon rejects invalid --init-timeout values
+
+expecting success of 5570.2 'daemon rejects invalid --timeout values': 
+	for arg in "3a" "-3"
+	do
+		test_must_fail git daemon --timeout="$arg" 2>err &&
+		test_grep "fatal: invalid timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
+		return 1
+	done
+
+fatal: invalid timeout '3a', expecting a non-negative integer
+fatal: invalid timeout '-3', expecting a non-negative integer
+ok 2 - daemon rejects invalid --timeout values
+
+expecting success of 5570.3 'daemon rejects invalid --max-connections values': 
+	arg=3a &&
+	test_must_fail git daemon --max-connections=3a 2>err &&
+	test_grep "fatal: invalid max-connections ${SQ}$arg${SQ}, expecting an integer" err
+
+fatal: invalid max-connections '3a', expecting an integer
+ok 3 - daemon rejects invalid --max-connections values
+
+Starting git daemon ...
+[223606] Ready to rumble
+expecting success of 5570.4 'setup repository': 
+	git config push.default matching &&
+	echo content >file &&
+	git add file &&
+	git commit -m one
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 4 - setup repository
+
+expecting success of 5570.5 'create git-accessible bare repository': 
+	mkdir "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	 git --bare init &&
+	 : >git-daemon-export-ok
+	) &&
+	git remote add public "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	git push public main:main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git/
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git
+ * [new branch]      main -> main
+ok 5 - create git-accessible bare repository
+
+expecting success of 5570.6 'clone git repository': 
+	git clone -v "$GIT_DAEMON_URL/repo.git" clone 2>stderr &&
+	check_verbose_connect &&
+	test_cmp file clone/file
+
+[223951] Connection from 127.0.0.1:36192
+[223951] Extended attribute "host": 127.0.0.1:5570
+[223951] Extended attribute "protocol": version=2
+[223951] Request upload-pack for '/repo.git'
+[223606] [223951] Disconnected
+Looking up 127.0.0.1 ... done.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+Looking up 127.0.0.1 ... done.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+ok 6 - clone git repository
+
+expecting success of 5570.7 'fetch changes via git protocol': 
+	echo content >>file &&
+	git commit -a -m two &&
+	git push public &&
+	(cd clone && git pull -v) 2>stderr &&
+	check_verbose_connect &&
+	test_cmp file clone/file
+
+[main 5647d5f] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git
+   f39a923..5647d5f  main -> main
+[224367] Connection from 127.0.0.1:36198
+[224367] Extended attribute "host": 127.0.0.1:5570
+[224367] Extended attribute "protocol": version=2
+[224367] Request upload-pack for '/repo.git'
+[223606] [224367] Disconnected
+Updating f39a923..5647d5f
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+Looking up 127.0.0.1 ... done.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+Looking up 127.0.0.1 ... done.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+ok 7 - fetch changes via git protocol
+
+expecting success of 5570.8 'no-op fetch -v stderr is as expected': 
+	(cd clone && git fetch -v) 2>stderr &&
+	check_verbose_connect
+
+[224704] Connection from 127.0.0.1:36212
+[224704] Extended attribute "host": 127.0.0.1:5570
+[224704] Extended attribute "protocol": version=2
+[224704] Request upload-pack for '/repo.git'
+[223606] [224704] Disconnected
+Looking up 127.0.0.1 ... done.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+Looking up 127.0.0.1 ... done.
+Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
+ok 8 - no-op fetch -v stderr is as expected
+
+expecting success of 5570.9 'no-op fetch without "-v" is quiet': 
+	(cd clone && git fetch 2>../stderr) &&
+	test_must_be_empty stderr
+
+[224926] Connection from 127.0.0.1:36216
+[224926] Extended attribute "host": 127.0.0.1:5570
+[224926] Extended attribute "protocol": version=2
+[224926] Request upload-pack for '/repo.git'
+[223606] [224926] Disconnected
+ok 9 - no-op fetch without "-v" is quiet
+
+expecting success of 5570.10 'remote detects correct HEAD': 
+	git push public main:other &&
+	(cd clone &&
+	 git remote set-head -d origin &&
+	 git remote set-head -a origin &&
+	 git symbolic-ref refs/remotes/origin/HEAD > output &&
+	 echo refs/remotes/origin/main > expect &&
+	 test_cmp expect output
+	)
+
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git
+ * [new branch]      main -> other
+[225239] Connection from 127.0.0.1:36232
+[225239] Extended attribute "host": 127.0.0.1:5570
+[225239] Extended attribute "protocol": version=2
+[225239] Request upload-pack for '/repo.git'
+'origin/HEAD' is now created and points to 'main'
+[223606] [225239] Disconnected
+ok 10 - remote detects correct HEAD
+
+expecting success of 5570.11 'prepare pack objects': 
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
+	 git --bare repack -a -d
+	)
+
+ok 11 - prepare pack objects
+
+expecting success of 5570.12 'fetch notices corrupt pack': 
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
+	 p=$(ls objects/pack/pack-*.pack) &&
+	 chmod u+w $p &&
+	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
+	) &&
+	mkdir repo_bad1.git &&
+	(cd repo_bad1.git &&
+	 git --bare init &&
+	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad1.git" &&
+	 test 0 = $(ls objects/pack/pack-*.pack | wc -l)
+	)
+
+1+0 records in
+1+0 records out
+256 bytes copied, 3.968e-05 s, 6.5 MB/s
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo_bad1.git/
+[225640] Connection from 127.0.0.1:36242
+[225640] Extended attribute "host": 127.0.0.1:5570
+[225640] Extended attribute "protocol": version=2
+[225640] Request upload-pack for '/repo_bad1.git'
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[225640] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[223606] [225640] Disconnected (with error)
+ls: cannot access 'objects/pack/pack-*.pack': No such file or directory
+ok 12 - fetch notices corrupt pack
+
+expecting success of 5570.13 'fetch notices corrupt idx': 
+	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
+	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
+	 rm -f objects/pack/multi-pack-index &&
+	 p=$(ls objects/pack/pack-*.idx) &&
+	 chmod u+w $p &&
+	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
+	) &&
+	mkdir repo_bad2.git &&
+	(cd repo_bad2.git &&
+	 git --bare init &&
+	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad2.git" &&
+	 test 0 = $(ls objects/pack | wc -l)
+	)
+
+1+0 records in
+1+0 records out
+256 bytes copied, 0.00709104 s, 36.1 kB/s
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo_bad2.git/
+[225892] Connection from 127.0.0.1:36256
+[225892] Extended attribute "host": 127.0.0.1:5570
+[225892] Extended attribute "protocol": version=2
+[225892] Request upload-pack for '/repo_bad2.git'
+fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[225892] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[223606] [225892] Disconnected (with error)
+ok 13 - fetch notices corrupt idx
+
+expecting success of 5570.14 'client refuses to ask for repo with newline': 
+	test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr &&
+	test_grep newline.is.forbidden stderr
+
+fatal: newline is forbidden in git:// hosts and repo paths
+ok 14 - client refuses to ask for repo with newline
+
+expecting success of 5570.15 'clone non-existent': test_remote_error    'access denied or repository not exported' clone nowhere.git
+[226032] Connection from 127.0.0.1:36258
+[226032] Extended attribute "host": 127.0.0.1:5570
+[226032] Extended attribute "protocol": version=2
+[226032] Request upload-pack for '/nowhere.git'
+[226032] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[223606] [226032] Disconnected (with error)
+fatal: remote error: access denied or repository not exported: /nowhere.git
+ok 15 - clone non-existent
+
+expecting success of 5570.16 'push disabled': test_remote_error    'access denied or repository not exported' push  repo.git main
+[226121] Connection from 127.0.0.1:43388
+[226121] Extended attribute "host": 127.0.0.1:5570
+[226121] Request receive-pack for '/repo.git'
+[226121] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git'
+[223606] [226121] Disconnected (with error)
+fatal: remote error: access denied or repository not exported: /repo.git
+ok 16 - push disabled
+
+expecting success of 5570.17 'read access denied': test_remote_error -x 'access denied or repository not exported' fetch repo.git
+[226228] Connection from 127.0.0.1:43398
+[226228] Extended attribute "host": 127.0.0.1:5570
+[226228] Extended attribute "protocol": version=2
+[226228] Request upload-pack for '/repo.git'
+[226228] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[223606] [226228] Disconnected (with error)
+fatal: remote error: access denied or repository not exported: /repo.git
+ok 17 - read access denied
+
+expecting success of 5570.18 'not exported': test_remote_error -n 'access denied or repository not exported' fetch repo.git
+[226314] Connection from 127.0.0.1:43400
+[226314] Extended attribute "host": 127.0.0.1:5570
+[226314] Extended attribute "protocol": version=2
+[226314] Request upload-pack for '/repo.git'
+[226314] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[223606] [226314] Disconnected (with error)
+fatal: remote error: access denied or repository not exported: /repo.git
+ok 18 - not exported
+
+Stopping git daemon ...
+Starting git daemon ...
+[226437] Ready to rumble
+expecting success of 5570.19 'clone non-existent': test_remote_error    'no such repository'      clone nowhere.git
+[226496] Connection from 127.0.0.1:43408
+[226496] Extended attribute "host": 127.0.0.1:5570
+[226496] Extended attribute "protocol": version=2
+[226496] Request upload-pack for '/nowhere.git'
+[226496] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[226437] [226496] Disconnected (with error)
+fatal: remote error: no such repository: /nowhere.git
+ok 19 - clone non-existent
+
+expecting success of 5570.20 'push disabled': test_remote_error    'service not enabled'     push  repo.git main
+[226591] Connection from 127.0.0.1:43412
+[226591] Extended attribute "host": 127.0.0.1:5570
+[226591] Request receive-pack for '/repo.git'
+[226591] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git'
+[226437] [226591] Disconnected (with error)
+fatal: remote error: service not enabled: /repo.git
+ok 20 - push disabled
+
+expecting success of 5570.21 'read access denied': test_remote_error -x 'no such repository'      fetch repo.git
+[226726] Connection from 127.0.0.1:43420
+[226726] Extended attribute "host": 127.0.0.1:5570
+[226726] Extended attribute "protocol": version=2
+[226726] Request upload-pack for '/repo.git'
+[226726] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[226437] [226726] Disconnected (with error)
+fatal: remote error: no such repository: /repo.git
+ok 21 - read access denied
+
+expecting success of 5570.22 'not exported': test_remote_error -n 'repository not exported' fetch repo.git
+[226855] Connection from 127.0.0.1:43430
+[226855] Extended attribute "host": 127.0.0.1:5570
+[226855] Extended attribute "protocol": version=2
+[226855] Request upload-pack for '/repo.git'
+[226855] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[226437] [226855] Disconnected (with error)
+fatal: remote error: repository not exported: /repo.git
+ok 22 - not exported
+
+Stopping git daemon ...
+Starting git daemon ...
+[227015] Ready to rumble
+expecting success of 5570.23 'access repo via interpolated hostname': 
+	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/localhost/interp.git" &&
+	git init --bare "$repo" &&
+	git push "$repo" HEAD &&
+	>"$repo"/git-daemon-export-ok &&
+	GIT_OVERRIDE_VIRTUAL_HOST=localhost \
+		git ls-remote "$GIT_DAEMON_URL/interp.git" &&
+	GIT_OVERRIDE_VIRTUAL_HOST=LOCALHOST \
+		git ls-remote "$GIT_DAEMON_URL/interp.git"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
+ * [new branch]      HEAD -> main
+[227248] Connection from 127.0.0.1:43442
+[227248] Extended attribute "host": localhost
+[227248] Extended attribute "protocol": version=2
+[227248] Request upload-pack for '/interp.git'
+[227248] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
+[227015] [227248] Disconnected
+[227323] Connection from 127.0.0.1:43446
+[227323] Extended attribute "host": LOCALHOST
+[227323] Extended attribute "protocol": version=2
+[227323] Request upload-pack for '/interp.git'
+[227323] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
+5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
+ok 23 - access repo via interpolated hostname
+
+[227015] [227323] Disconnected
+expecting success of 5570.24 'hostname cannot break out of directory': 
+	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
+	git init --bare "$repo" &&
+	git push "$repo" HEAD &&
+	>"$repo"/git-daemon-export-ok &&
+	test_must_fail \
+		env GIT_OVERRIDE_VIRTUAL_HOST=.. \
+		git ls-remote "$GIT_DAEMON_URL/escape.git"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/escape.git/
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/../escape.git
+ * [new branch]      HEAD -> main
+fatal: remote error: access denied or repository not exported: /escape.git
+[227592] Connection from 127.0.0.1:43454
+[227592] Extended attribute "host": ..
+[227592] Extended attribute "protocol": version=2
+[227592] Request upload-pack for '/escape.git'
+[227592] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo//escape.git'
+[227592] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+[227015] [227592] Disconnected (with error)
+ok 24 - hostname cannot break out of directory
+
+checking prerequisite: FAKENC
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
+	perl -MIO::Socket::INET -e "exit 0"
+
+)
+prerequisite FAKENC ok
+expecting success of 5570.25 'hostname interpolation works after LF-stripping': 
+	{
+		printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw &&
+		printf "0000"
+	} >input &&
+	fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
+	depacketize <output >output.raw &&
+
+	# just pick out the value of main, which avoids any protocol
+	# particulars
+	perl -lne "print \$1 if m{^(\\S+) refs/heads/main}" <output.raw >actual &&
+	git -C "$repo" rev-parse main >expect &&
+	test_cmp expect actual
+
+[227843] Connection from 127.0.0.1:43470
+[227843] Extended attribute "host": localhost
+[227843] Request upload-pack for '/interp.git'
+[227843] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[227015] [227843] Disconnected
+ok 25 - hostname interpolation works after LF-stripping
+
+Stopping git daemon ...
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5583-push-branches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5583-push-branches/.git/
+expecting success of 5583.1 'setup bare remote': 
+	git init --bare remote-1 &&
+	git -C remote-1 config gc.auto 0 &&
+	test_commit one &&
+	git push remote-1 HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5583-push-branches/remote-1/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+To remote-1
+ * [new branch]      HEAD -> main
+ok 1 - setup bare remote
+
+expecting success of 5583.2 'setup different types of references': 
+	cat >refs <<-EOF &&
+	update refs/heads/branch-1 HEAD
+	update refs/heads/branch-2 HEAD
+	EOF
+
+	git tag -a -m "annotated" annotated-1 HEAD &&
+	git tag -a -m "annotated" annotated-2 HEAD &&
+	git update-ref --stdin < refs
+
+ok 2 - setup different types of references
+
+expecting success of 5583.3 '--all and --branches have the same behavior': 
+	test_when_finished "delete_refs remote-1 \
+			   refs/heads/branch-1 \
+			   refs/heads/branch-2" &&
+	git push remote-1 --all &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	$commit refs/heads/branch-1
+	$commit refs/heads/branch-2
+	$commit refs/heads/main
+	EOF
+
+	git -C remote-1 show-ref --heads >actual.all &&
+	delete_refs remote-1 refs/heads/branch-1 refs/heads/branch-2 &&
+	git push remote-1 --branches &&
+	git -C remote-1 show-ref --heads >actual.branches &&
+	test_cmp actual.all actual.branches &&
+	test_cmp expect actual.all
+
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+ok 3 - --all and --branches have the same behavior
+
+expecting success of 5583.4 '--all or --branches can not be combined with refspecs': 
+	test_must_fail git push remote-1 --all main >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches main >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "be combined with refspecs" actual.all
+
+fatal: --all can't be combined with refspecs
+ok 4 - --all or --branches can not be combined with refspecs
+
+expecting success of 5583.5 '--all or --branches can not be combined with --mirror': 
+	test_must_fail git push remote-1 --all --mirror >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches --mirror >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "cannot be used together" actual.all
+
+fatal: options '--all/--branches' and '--mirror' cannot be used together
+ok 5 - --all or --branches can not be combined with --mirror
+
+expecting success of 5583.6 '--all or --branches can not be combined with --tags': 
+	test_must_fail git push remote-1 --all --tags >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches --tags >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "cannot be used together" actual.all
+
+fatal: options '--tags' and '--all/--branches' cannot be used together
+ok 6 - --all or --branches can not be combined with --tags
+
+expecting success of 5583.7 '--all or --branches can not be combined with --delete': 
+	test_must_fail git push remote-1 --all --delete >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches --delete >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "cannot be used together" actual.all
+
+fatal: options '--delete' and '--all/--branches' cannot be used together
+ok 7 - --all or --branches can not be combined with --delete
+
+expecting success of 5583.8 '--all or --branches combines with --follow-tags have same behavior': 
+	test_when_finished "delete_refs remote-1 \
+			   refs/heads/branch-1 \
+			   refs/heads/branch-2 \
+			   refs/tags/annotated-1 \
+			   refs/tags/annotated-2" &&
+	git push remote-1 --all --follow-tags &&
+	git -C remote-1 show-ref > actual.all &&
+	cat >expect <<-EOF &&
+	$commit refs/heads/branch-1
+	$commit refs/heads/branch-2
+	$commit refs/heads/main
+	$(git rev-parse annotated-1) refs/tags/annotated-1
+	$(git rev-parse annotated-2) refs/tags/annotated-2
+	EOF
+
+	delete_refs remote-1 \
+		    refs/heads/branch-1 \
+		    refs/heads/branch-2 \
+		    refs/tags/annotated-1 \
+		    refs/tags/annotated-2 &&
+	git push remote-1 --branches --follow-tags &&
+	git -C remote-1 show-ref >actual.branches &&
+	test_cmp actual.all actual.branches &&
+	test_cmp expect actual.all
+
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+ * [new tag]         annotated-1 -> annotated-1
+ * [new tag]         annotated-2 -> annotated-2
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+ * [new tag]         annotated-1 -> annotated-1
+ * [new tag]         annotated-2 -> annotated-2
+ok 8 - --all or --branches combines with --follow-tags have same behavior
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5602-clone-remote-exec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5602-clone-remote-exec/.git/
+expecting success of 5602.1 'setup': 
+	echo "#!/bin/sh" > not_ssh &&
+	echo "echo \"\$*\" > not_ssh_output" >> not_ssh &&
+	echo "exit 1" >> not_ssh &&
+	chmod +x not_ssh
+
+ok 1 - setup
+
+expecting success of 5602.2 'clone calls git upload-pack unqualified with no -u option': 
+	test_must_fail env GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk &&
+	echo "localhost git-upload-pack '/path/to/repo'" >expected &&
+	test_cmp expected not_ssh_output
+
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 2 - clone calls git upload-pack unqualified with no -u option
+
+expecting success of 5602.3 'clone calls specified git upload-pack with -u option': 
+	test_must_fail env GIT_SSH=./not_ssh \
+		git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk &&
+	echo "localhost ./something/bin/git-upload-pack '/path/to/repo'" >expected &&
+	test_cmp expected not_ssh_output
+
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 3 - clone calls specified git upload-pack with -u option
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5600-clone-fail-cleanup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5600-clone-fail-cleanup/.git/
+expecting success of 5600.1 'clone of non-existent source should fail': 
+	test_must_fail git clone foo bar
+
+fatal: repository 'foo' does not exist
+ok 1 - clone of non-existent source should fail
+
+expecting success of 5600.2 'failed clone should not leave a directory': 
+	test_path_is_missing bar
+
+ok 2 - failed clone should not leave a directory
+
+expecting success of 5600.3 'create a repo to clone': 
+	test_create_repo foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5600-clone-fail-cleanup/foo/.git/
+ok 3 - create a repo to clone
+
+expecting success of 5600.4 'create objects in repo for later corruption': 
+	test_commit -C foo file &&
+	git -C foo checkout --detach &&
+	test_commit -C foo detached
+
+[master (root-commit) 4c1911f] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+HEAD is now at 4c1911f file
+[detached HEAD 3928560] detached
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 detached.t
+ok 4 - create objects in repo for later corruption
+
+expecting success of 5600.5 'clone of non-existent (relative to $PWD) source should fail': 
+	test_must_fail git clone ../foo baz
+
+fatal: repository '../foo' does not exist
+ok 5 - clone of non-existent (relative to $PWD) source should fail
+
+expecting success of 5600.6 'clone should work now that source exists': 
+	git clone foo bar
+
+Cloning into 'bar'...
+done.
+Note: switching to '39285601caec51931a713514c1133dccc9cc7e13'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git 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 6 - clone should work now that source exists
+
+expecting success of 5600.7 'successful clone must leave the directory': 
+	test_path_is_dir bar
+
+ok 7 - successful clone must leave the directory
+
+expecting success of 5600.8 'failed clone --separate-git-dir should not leave any directories': 
+	corrupt_repo &&
+	test_must_fail git clone --separate-git-dir gitdir foo worktree &&
+	test_path_is_missing gitdir &&
+	test_path_is_missing worktree
+
+Cloning into 'worktree'...
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
+ok 8 - failed clone --separate-git-dir should not leave any directories
+
+expecting success of 5600.9 'failed clone into empty leaves directory (vanilla)': 
+	mkdir -p empty &&
+	corrupt_repo &&
+	test_must_fail git clone foo empty &&
+	test_dir_is_empty empty
+
+Cloning into 'empty'...
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
+ok 9 - failed clone into empty leaves directory (vanilla)
+
+expecting success of 5600.10 'failed clone into empty leaves directory (bare)': 
+	mkdir -p empty &&
+	corrupt_repo &&
+	test_must_fail git clone --bare foo empty &&
+	test_dir_is_empty empty
+
+Cloning into bare repository 'empty'...
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
+ok 10 - failed clone into empty leaves directory (bare)
+
+expecting success of 5600.11 'failed clone into empty leaves directory (separate)': 
+	mkdir -p empty-git empty-wt &&
+	corrupt_repo &&
+	test_must_fail git clone --separate-git-dir empty-git foo empty-wt &&
+	test_dir_is_empty empty-git &&
+	test_dir_is_empty empty-wt
+
+Cloning into 'empty-wt'...
+fatal: empty-git already exists
+ok 11 - failed clone into empty leaves directory (separate)
+
+expecting success of 5600.12 'failed clone into empty leaves directory (separate, git)': 
+	mkdir -p empty-git &&
+	corrupt_repo &&
+	test_must_fail git clone --separate-git-dir empty-git foo no-wt &&
+	test_dir_is_empty empty-git &&
+	test_path_is_missing no-wt
+
+Cloning into 'no-wt'...
+fatal: empty-git already exists
+ok 12 - failed clone into empty leaves directory (separate, git)
+
+expecting success of 5600.13 'failed clone into empty leaves directory (separate, wt)': 
+	mkdir -p empty-wt &&
+	corrupt_repo &&
+	test_must_fail git clone --separate-git-dir no-git foo empty-wt &&
+	test_path_is_missing no-git &&
+	test_dir_is_empty empty-wt
+
+Cloning into 'empty-wt'...
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
+ok 13 - failed clone into empty leaves directory (separate, wt)
+
+expecting success of 5600.14 'transport failure cleans up directory': 
+	test_must_fail git clone --no-local \
+		-u "f() { git-upload-pack \"\$@\"; return 1; }; f" \
+		foo broken-clone &&
+	test_path_is_missing broken-clone
+
+Cloning into 'broken-clone'...
+fatal: remote transport reported error
+ok 14 - transport failure cleans up directory
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5574-fetch-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5582-fetch-negative-refspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5582-fetch-negative-refspec/.
+ * branch            main       -> FETCH_HEAD
+fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+never-fetch-tag
+c5395f864a4757fc219a4848a19568f14918687f
+fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/prefetch/bogus/ignore
+ok 14 - --prefetch correctly modifies refspecs
+
+expecting success of 5582.15 '--prefetch succeeds when refspec becomes empty': 
+	git checkout bogus/fetched &&
+	test_commit extra &&
+
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --unset branch.main.remote &&
+	git -C one config remote.origin.fetch "+refs/tags/extra" &&
+	git -C one config remote.origin.skipfetchall true &&
+	git -C one config remote.origin.tagopt "--no-tags" &&
+
+	git -C one fetch --prefetch
+
+Switched to branch 'bogus/fetched'
+[bogus/fetched 8d8169a] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+ok 15 - --prefetch succeeds when refspec becomes empty
+
+expecting success of 5582.16 '--prefetch succeeds with empty command line refspec': 
+	git -C one fetch --prefetch origin +refs/tags/extra
+
+ok 16 - --prefetch succeeds with empty command line refspec
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5603-clone-dirname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5603-clone-dirname/.git/
+expecting success of 5603.1 'setup ssh wrapper': 
+	write_script "$TRASH_DIRECTORY/ssh-wrapper" <<-\EOF &&
+	git upload-pack "$TRASH_DIRECTORY"
+	EOF
+	GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper" &&
+	GIT_SSH_VARIANT=ssh &&
+	export GIT_SSH &&
+	export GIT_SSH_VARIANT &&
+	export TRASH_DIRECTORY
+
+ok 1 - setup ssh wrapper
+
+expecting success of 5603.2 'clone of host:foo goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 2 - clone of host:foo goes to foo (non-bare)
+
+expecting success of 5603.3 'clone of host:foo goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare host:foo &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 3 - clone of host:foo goes to foo.git (bare)
+
+expecting success of 5603.4 'clone of host:foo.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 4 - clone of host:foo.git goes to foo (non-bare)
+
+expecting success of 5603.5 'clone of host:foo.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare host:foo.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 5 - clone of host:foo.git goes to foo.git (bare)
+
+expecting success of 5603.6 'clone of host:foo/.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 6 - clone of host:foo/.git goes to foo (non-bare)
+
+expecting success of 5603.7 'clone of host:foo/.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare host:foo/.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 7 - clone of host:foo/.git goes to foo.git (bare)
+
+expecting success of 5603.8 'clone of ssh://host/foo goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 8 - clone of ssh://host/foo goes to foo (non-bare)
+
+expecting success of 5603.9 'clone of ssh://host/foo goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare ssh://host/foo &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 9 - clone of ssh://host/foo goes to foo.git (bare)
+
+expecting success of 5603.10 'clone of ssh://host/foo.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 10 - clone of ssh://host/foo.git goes to foo (non-bare)
+
+expecting success of 5603.11 'clone of ssh://host/foo.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare ssh://host/foo.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 11 - clone of ssh://host/foo.git goes to foo.git (bare)
+
+expecting success of 5603.12 'clone of ssh://host/foo/.git goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/.git &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 12 - clone of ssh://host/foo/.git goes to foo (non-bare)
+
+expecting success of 5603.13 'clone of ssh://host/foo/.git goes to foo.git (bare)': 
+		rm -rf foo.git &&
+		git clone --bare ssh://host/foo/.git &&
+		test_path_is_dir foo.git
+	
+Cloning into bare repository 'foo.git'...
+warning: You appear to have cloned an empty repository.
+ok 13 - clone of ssh://host/foo/.git goes to foo.git (bare)
+
+expecting success of 5603.14 'clone of ssh://host/foo/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 14 - clone of ssh://host/foo/ goes to foo (non-bare)
+
+expecting success of 5603.15 'clone of ssh://host/foo/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 15 - clone of ssh://host/foo/// goes to foo (non-bare)
+
+expecting success of 5603.16 'clone of ssh://host/foo/.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 16 - clone of ssh://host/foo/.git/ goes to foo (non-bare)
+
+expecting success of 5603.17 'clone of ssh://host/foo.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 17 - clone of ssh://host/foo.git/ goes to foo (non-bare)
+
+expecting success of 5603.18 'clone of ssh://host/foo.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 18 - clone of ssh://host/foo.git/// goes to foo (non-bare)
+
+expecting success of 5603.19 'clone of ssh://host/foo///.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo///.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 19 - clone of ssh://host/foo///.git/ goes to foo (non-bare)
+
+expecting success of 5603.20 'clone of ssh://host/foo/.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  ssh://host/foo/.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 20 - clone of ssh://host/foo/.git/// goes to foo (non-bare)
+
+expecting success of 5603.21 'clone of host:foo/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 21 - clone of host:foo/ goes to foo (non-bare)
+
+expecting success of 5603.22 'clone of host:foo/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 22 - clone of host:foo/// goes to foo (non-bare)
+
+expecting success of 5603.23 'clone of host:foo.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 23 - clone of host:foo.git/ goes to foo (non-bare)
+
+expecting success of 5603.24 'clone of host:foo/.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 24 - clone of host:foo/.git/ goes to foo (non-bare)
+
+expecting success of 5603.25 'clone of host:foo.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 25 - clone of host:foo.git/// goes to foo (non-bare)
+
+expecting success of 5603.26 'clone of host:foo///.git/ goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo///.git/ &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 26 - clone of host:foo///.git/ goes to foo (non-bare)
+
+expecting success of 5603.27 'clone of host:foo/.git/// goes to foo (non-bare)': 
+		rm -rf foo &&
+		git clone  host:foo/.git/// &&
+		test_path_is_dir foo
+	
+Cloning into 'foo'...
+warning: You appear to have cloned an empty repository.
+ok 27 - clone of host:foo/.git/// goes to foo (non-bare)
+
+expecting success of 5603.28 'clone of ssh://host/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://host/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 28 - clone of ssh://host/ goes to host (non-bare)
+
+expecting success of 5603.29 'clone of ssh://host:1234/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://host:1234/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 29 - clone of ssh://host:1234/ goes to host (non-bare)
+
+expecting success of 5603.30 'clone of ssh://user@host/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user@host/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 30 - clone of ssh://user@host/ goes to host (non-bare)
+
+expecting success of 5603.31 'clone of host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 31 - clone of host:/ goes to host (non-bare)
+
+expecting success of 5603.32 'clone of ssh://user:password@host/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user:password@host/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 32 - clone of ssh://user:password@host/ goes to host (non-bare)
+
+expecting success of 5603.33 'clone of ssh://user:password@host:1234/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user:password@host:1234/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 33 - clone of ssh://user:password@host:1234/ goes to host (non-bare)
+
+expecting success of 5603.34 'clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  ssh://user:passw@rd@host:1234/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 34 - clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)
+
+expecting success of 5603.35 'clone of user@host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  user@host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 35 - clone of user@host:/ goes to host (non-bare)
+
+expecting success of 5603.36 'clone of user:password@host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  user:password@host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 36 - clone of user:password@host:/ goes to host (non-bare)
+
+expecting success of 5603.37 'clone of user:passw@rd@host:/ goes to host (non-bare)': 
+		rm -rf host &&
+		git clone  user:passw@rd@host:/ &&
+		test_path_is_dir host
+	
+Cloning into 'host'...
+warning: You appear to have cloned an empty repository.
+ok 37 - clone of user:passw@rd@host:/ goes to host (non-bare)
+
+expecting success of 5603.38 'clone of ssh://host/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://host/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 38 - clone of ssh://host/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.39 'clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://host/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 39 - clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.40 'clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://user:password@host/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 40 - clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.41 'clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  ssh://user:passw@rd@host/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 41 - clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.42 'clone of host:/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  host:/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 42 - clone of host:/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.43 'clone of host:/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  host:/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 43 - clone of host:/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.44 'clone of user:password@host:/foo@bar goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  user:password@host:/foo@bar &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 44 - clone of user:password@host:/foo@bar goes to foo@bar (non-bare)
+
+expecting success of 5603.45 'clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)': 
+		rm -rf foo@bar &&
+		git clone  user:passw@rd@host:/foo@bar.git &&
+		test_path_is_dir foo@bar
+	
+Cloning into 'foo@bar'...
+warning: You appear to have cloned an empty repository.
+ok 45 - clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)
+
+expecting success of 5603.46 'clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)': 
+		rm -rf 1234 &&
+		git clone  ssh://user:password@host/test:1234 &&
+		test_path_is_dir 1234
+	
+Cloning into '1234'...
+warning: You appear to have cloned an empty repository.
+ok 46 - clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)
+
+expecting success of 5603.47 'clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)': 
+		rm -rf 1234 &&
+		git clone  ssh://user:password@host/test:1234.git &&
+		test_path_is_dir 1234
+	
+Cloning into '1234'...
+warning: You appear to have cloned an empty repository.
+ok 47 - clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)
+
+# passed all 47 test(s)
+1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5500-fetch-pack.sh ***
@@ -358044,7 +361068,7 @@
 remote: Counting objects:   0% (1/192)        
remote: Counting objects:   1% (2/192)        
remote: Counting objects:   2% (4/192)        
remote: Counting objects:   3% (6/192)        
remote: Counting objects:   4% (8/192)        
remote: Counting objects:   5% (10/192)        
remote: Counting objects:   6% (12/192)        
remote: Counting objects:   7% (14/192)        
remote: Counting objects:   8% (16/192)        
remote: Counting objects:   9% (18/192)        
remote: Counting objects:  10% (20/192)        
remote: Counting objects:  11% (22/192)        
remote: Counting objects:  12% (24/192)        
remote: Counting objects:  13% (25/192)        
remote: Counting objects:  14% (27/192)        
remote: Counting objects:  15% (29/192)        
remote: Counting objects:  16% (31/192)        
remote: Counting objects:  17% (33/192)        
remote: Counting objects:  18% (35/192)        
remote: Counting objects:  19% (37/192)        
remote: Counting objects:  20% (39/192)        
remote: Counting objects:  21% (41/192)        
remote: Counting objects:  22% (43/192)        
remote: Counting objects:  23% (45/192)        
remote: Counting objects:  24% (47/192)        
remote: Counting objects:  25% (48/192)        
remote: Counting objects:  26% (50/192)        
remote: Counting objects:  27% (52/192)        
remote: Counting objects:  28% (54/192)        
remote: Counting objects:  29% (56/192)        
remote: Counting objects:  30% (58/192)        
remote: Counting objects:  31% (60/192)        
remote: Counting objects:  32% (62/192)        
remote: Counting objects:  33% (64/192)        
remote: Counting objects:  34% (66/192)        
remote: Counting objects:  35% (68/192)        
remote: Counting objects:  36% (70/192)        
remote: Counting objects:  37% (72/192)        
remote: Counting objects:  38% (73/192)        
remote: Counting objects:  39% (75/192)        
remote: Counting objects:  40% (77/192)        
remote: Counting objects:  41% (79/192)        
remote: Counting objects:  42% (81/192)        
remote: Counting objects:  43% (83/192)        
remote: Counting objects:  44% (85/192)        
remote: Counting objects:  45% (87/192)        
remote: Counting objects:  46% (89/192)        
remote: Counting objects:  47% (91/192)        
remote: Counting objects:  48% (93/192)        
remote: Counting objects:  49% (95/192)        
remote: Counting objects:  50% (96/192)        
remote: Counting objects:  51% (98/192)        
remote: Counting objects:  52% (100/192)        
remote: Counting objects:  53% (102/192)        
remote: Counting objects:  54% (104/192)        
remote: Counting objects:  55% (106/192)        
remote: Counting objects:  56% (108/192)        
remote: Counting objects:  57% (110/192)        
remote: Counting objects:  58% (112/192)        
remote: Counting objects:  59% (114/192)        
remote: Counting objects:  60% (116/192)        
remote: Counting objects:  61% (118/192)        
remote: Counting objects:  62% (120/192)        
remote: Counting objects:  63% (121/192)        
remote: Counting objects:  64% (123/192)        
remote: Counting objects:  65% (125/192)        
remote: Counting objects:  66% (127/192)        
remote: Counting objects:  67% (129/192)        
remote: Counting objects:  68% (131/192)        
remote: Counting objects:  69% (133/192)        
remote: Counting objects:  70% (135/192)        
remote: Counting objects:  71% (137/192)        
remote: Counting objects:  72% (139/192)        
remote: Counting objects:  73% (141/192)        
remote: Counting objects:  74% (143/192)        
remote: Counting objects:  75% (144/192)        
remote: Counting objects:  76% (146/192)        
remote: Counting objects:  77% (148/192)        
remote: Counting objects:  78% (150/192)        
remote: Counting objects:  79% (152/192)        
remote: Counting objects:  80% (154/192)        
remote: Counting objects:  81% (156/192)        
remote: Counting objects:  82% (158/192)        
remote: Counting objects:  83% (160/192)        
remote: Counting objects:  84% (162/192)        
remote: Counting objects:  85% (164/192)        
remote: Counting objects:  86% (166/192)        
remote: Counting objects:  87% (168/192)        
remote: Counting objects:  88% (169/192)        
remote: Counting objects:  89% (171/192)        
remote: Counting objects:  90% (173/192)        
remote: Counting objects:  91% (175/192)        
remote: Counting objects:  92% (177/192)        
remote: Counting objects:  93% (179/192)        
remote: Counting objects:  94% (181/192)        
remote: Counting objects:  95% (183/192)        
remote: Counting objects:  96% (185/192)        
remote: Counting objects:  97% (187/192)        
remote: Counting objects:  98% (189/192)        
remote: Counting objects:  99% (191/192)        
remote: Counting objects: 100% (192/192)        
remote: Counting objects: 100% (192/192), done.        
 remote: Compressing objects:   1% (1/64)        
remote: Compressing objects:   3% (2/64)        
remote: Compressing objects:   4% (3/64)        
remote: Compressing objects:   6% (4/64)        
remote: Compressing objects:   7% (5/64)        
remote: Compressing objects:   9% (6/64)        
remote: Compressing objects:  10% (7/64)        
remote: Compressing objects:  12% (8/64)        
remote: Compressing objects:  14% (9/64)        
remote: Compressing objects:  15% (10/64)        
remote: Compressing objects:  17% (11/64)        
remote: Compressing objects:  18% (12/64)        
remote: Compressing objects:  20% (13/64)        
remote: Compressing objects:  21% (14/64)        
remote: Compressing objects:  23% (15/64)        
remote: Compressing objects:  25% (16/64)        
remote: Compressing objects:  26% (17/64)        
remote: Compressing objects:  28% (18/64)        
remote: Compressing objects:  29% (19/64)        
remote: Compressing objects:  31% (20/64)        
remote: Compressing objects:  32% (21/64)        
remote: Compressing objects:  34% (22/64)        
remote: Compressing objects:  35% (23/64)        
remote: Compressing objects:  37% (24/64)        
remote: Compressing objects:  39% (25/64)        
remote: Compressing objects:  40% (26/64)        
remote: Compressing objects:  42% (27/64)        
remote: Compressing objects:  43% (28/64)        
remote: Compressing objects:  45% (29/64)        
remote: Compressing objects:  46% (30/64)        
remote: Compressing objects:  48% (31/64)        
remote: Compressing objects:  50% (32/64)        
remote: Compressing objects:  51% (33/64)        
remote: Compressing objects:  53% (34/64)        
remote: Compressing objects:  54% (35/64)        
remote: Compressing objects:  56% (36/64)        
remote: Compressing objects:  57% (37/64)        
remote: Compressing objects:  59% (38/64)        
remote: Compressing objects:  60% (39/64)        
remote: Compressing objects:  62% (40/64)        
remote: Compressing objects:  64% (41/64)        
remote: Compressing objects:  65% (42/64)        
remote: Compressing objects:  67% (43/64)        
remote: Compressing objects:  68% (44/64)        
remote: Compressing objects:  70% (45/64)        
remote: Compressing objects:  71% (46/64)        
remote: Compressing objects:  73% (47/64)        
remote: Compressing objects:  75% (48/64)        
remote: Compressing objects:  76% (49/64)        
remote: Compressing objects:  78% (50/64)        
remote: Compressing objects:  79% (51/64)        
remote: Compressing objects:  81% (52/64)        
remote: Compressing objects:  82% (53/64)        
remote: Compressing objects:  84% (54/64)        
remote: Compressing objects:  85% (55/64)        
remote: Compressing objects:  87% (56/64)        
remote: Compressing objects:  89% (57/64)        
remote: Compressing objects:  90% (58/64)        
remote: Compressing objects:  92% (59/64)        
remote: Compressing objects:  93% (60/64)        
remote: Compressing objects:  95% (61/64)        
remote: Compressing objects:  96% (62/64)        
remote: Compressing objects:  98% (63/64)        
remote: Compressing objects: 100% (64/64)        
remote: Compressing objects: 100% (64/64), done.        
 Receiving objects:   0% (1/192)
Receiving objects:   1% (2/192)
Receiving objects:   2% (4/192)
Receiving objects:   3% (6/192)
Receiving objects:   4% (8/192)
Receiving objects:   5% (10/192)
Receiving objects:   6% (12/192)
Receiving objects:   7% (14/192)
Receiving objects:   8% (16/192)
Receiving objects:   9% (18/192)
Receiving objects:  10% (20/192)
Receiving objects:  11% (22/192)
Receiving objects:  12% (24/192)
Receiving objects:  13% (25/192)
Receiving objects:  14% (27/192)
Receiving objects:  15% (29/192)
Receiving objects:  16% (31/192)
Receiving objects:  17% (33/192)
Receiving objects:  18% (35/192)
Receiving objects:  19% (37/192)
Receiving objects:  20% (39/192)
Receiving objects:  21% (41/192)
Receiving objects:  22% (43/192)
Receiving objects:  23% (45/192)
Receiving objects:  24% (47/192)
Receiving objects:  25% (48/192)
Receiving objects:  26% (50/192)
remote: Total 192 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:  27% (52/192)
Receiving objects:  28% (54/192)
Receiving objects:  29% (56/192)
Receiving objects:  30% (58/192)
Receiving objects:  31% (60/192)
Receiving objects:  32% (62/192)
Receiving objects:  33% (64/192)
Receiving objects:  34% (66/192)
Receiving objects:  35% (68/192)
Receiving objects:  36% (70/192)
Receiving objects:  37% (72/192)
Receiving objects:  38% (73/192)
Receiving objects:  39% (75/192)
Receiving objects:  40% (77/192)
Receiving objects:  41% (79/192)
Receiving objects:  42% (81/192)
Receiving objects:  43% (83/192)
Receiving objects:  44% (85/192)
Receiving objects:  45% (87/192)
Receiving objects:  46% (89/192)
Receiving objects:  47% (91/192)
Receiving objects:  48% (93/192)
Receiving objects:  49% (95/192)
Receiving objects:  50% (96/192)
Receiving objects:  51% (98/192)
Receiving objects:  52% (100/192)
Receiving objects:  53% (102/192)
Receiving objects:  54% (104/192)
Receiving objects:  55% (106/192)
Receiving objects:  56% (108/192)
Receiving objects:  57% (110/192)
Receiving objects:  58% (112/192)
Receiving objects:  59% (114/192)
Receiving objects:  60% (116/192)
Receiving objects:  61% (118/192)
Receiving objects:  62% (120/192)
Receiving objects:  63% (121/192)
Receiving objects:  64% (123/192)
Receiving objects:  65% (125/192)
Receiving objects:  66% (127/192)
Receiving objects:  67% (129/192)
Receiving objects:  68% (131/192)
Receiving objects:  69% (133/192)
Receiving objects:  70% (135/192)
Receiving objects:  71% (137/192)
Receiving objects:  72% (139/192)
Receiving objects:  73% (141/192)
Receiving objects:  74% (143/192)
Receiving objects:  75% (144/192)
Receiving objects:  76% (146/192)
Receiving objects:  77% (148/192)
Receiving objects:  78% (150/192)
Receiving objects:  79% (152/192)
Receiving objects:  80% (154/192)
Receiving objects:  81% (156/192)
Receiving objects:  82% (158/192)
Receiving objects:  83% (160/192)
Receiving objects:  84% (162/192)
Receiving objects:  85% (164/192)
Receiving objects:  86% (166/192)
Receiving objects:  87% (168/192)
Receiving objects:  88% (169/192)
Receiving objects:  89% (171/192)
Receiving objects:  90% (173/192)
Receiving objects:  91% (175/192)
Receiving objects:  92% (177/192)
Receiving objects:  93% (179/192)
Receiving objects:  94% (181/192)
Receiving objects:  95% (183/192)
Receiving objects:  96% (185/192)
Receiving objects:  97% (187/192)
Receiving objects:  98% (189/192)
Receiving objects:  99% (191/192)
Receiving objects: 100% (192/192)
Receiving objects: 100% (192/192), 16.30 KiB | 1.02 MiB/s, done.
+Receiving objects:  27% (52/192)
Receiving objects:  28% (54/192)
Receiving objects:  29% (56/192)
Receiving objects:  30% (58/192)
Receiving objects:  31% (60/192)
Receiving objects:  32% (62/192)
Receiving objects:  33% (64/192)
Receiving objects:  34% (66/192)
Receiving objects:  35% (68/192)
Receiving objects:  36% (70/192)
Receiving objects:  37% (72/192)
Receiving objects:  38% (73/192)
Receiving objects:  39% (75/192)
Receiving objects:  40% (77/192)
Receiving objects:  41% (79/192)
Receiving objects:  42% (81/192)
Receiving objects:  43% (83/192)
Receiving objects:  44% (85/192)
Receiving objects:  45% (87/192)
Receiving objects:  46% (89/192)
Receiving objects:  47% (91/192)
Receiving objects:  48% (93/192)
Receiving objects:  49% (95/192)
Receiving objects:  50% (96/192)
Receiving objects:  51% (98/192)
Receiving objects:  52% (100/192)
Receiving objects:  53% (102/192)
Receiving objects:  54% (104/192)
Receiving objects:  55% (106/192)
Receiving objects:  56% (108/192)
Receiving objects:  57% (110/192)
Receiving objects:  58% (112/192)
Receiving objects:  59% (114/192)
Receiving objects:  60% (116/192)
Receiving objects:  61% (118/192)
Receiving objects:  62% (120/192)
Receiving objects:  63% (121/192)
Receiving objects:  64% (123/192)
Receiving objects:  65% (125/192)
Receiving objects:  66% (127/192)
Receiving objects:  67% (129/192)
Receiving objects:  68% (131/192)
Receiving objects:  69% (133/192)
Receiving objects:  70% (135/192)
Receiving objects:  71% (137/192)
Receiving objects:  72% (139/192)
Receiving objects:  73% (141/192)
Receiving objects:  74% (143/192)
Receiving objects:  75% (144/192)
Receiving objects:  76% (146/192)
Receiving objects:  77% (148/192)
Receiving objects:  78% (150/192)
Receiving objects:  79% (152/192)
Receiving objects:  80% (154/192)
Receiving objects:  81% (156/192)
Receiving objects:  82% (158/192)
Receiving objects:  83% (160/192)
Receiving objects:  84% (162/192)
Receiving objects:  85% (164/192)
Receiving objects:  86% (166/192)
Receiving objects:  87% (168/192)
Receiving objects:  88% (169/192)
Receiving objects:  89% (171/192)
Receiving objects:  90% (173/192)
Receiving objects:  91% (175/192)
Receiving objects:  92% (177/192)
Receiving objects:  93% (179/192)
Receiving objects:  94% (181/192)
Receiving objects:  95% (183/192)
Receiving objects:  96% (185/192)
Receiving objects:  97% (187/192)
Receiving objects:  98% (189/192)
Receiving objects:  99% (191/192)
Receiving objects: 100% (192/192)
Receiving objects: 100% (192/192), 16.30 KiB | 439.00 KiB/s, done.
 pack	d6698cfcaf6e075007fcb2123d8a138210d6d911
 27f494dfb7e67d2f9cd2282404adf1d97581aa34 refs/heads/B
 notice: HEAD points to an unborn branch (r)
@@ -358120,8 +361144,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 origin/B
-{"event":"data_json","sid":"20250209T065445.037374Z-Hcf858c9d-P001a77ca","thread":"main","time":"2025-02-09T06:54:45.039099Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.001931,"t_rel":0.001931,"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":"20250209T065445.037374Z-Hcf858c9d-P001a77ca","thread":"main","time":"2025-02-09T06:54:45.039099Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.001931,"t_rel":0.001931,"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":"20260314T133234.555951Z-H5c947e1c-P0002ce6b","thread":"main","time":"2026-03-14T13:32:34.560811Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.005049,"t_rel":0.005049,"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":"20260314T133234.555951Z-H5c947e1c-P0002ce6b","thread":"main","time":"2026-03-14T13:32:34.560811Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.005049,"t_rel":0.005049,"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': 
@@ -358131,7 +361155,7 @@
 	grep \"fetch-info\".*\"depth\":1 shallow0/trace2_event
 
 Cloning into 'shallow0'...
-{"event":"data_json","sid":"20250209T065445.067960Z-Hcf858c9d-P001a786f","thread":"main","time":"2025-02-09T06:54:45.069752Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.002002,"t_rel":0.002002,"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":"20260314T133234.716118Z-H5c947e1c-P0002cf10","thread":"main","time":"2026-03-14T13:32:34.722680Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.006766,"t_rel":0.006766,"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': 
@@ -358264,8 +361288,8 @@
 Fast-forward
  test.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-{"event":"data_json","sid":"20250209T065445.348244Z-Hcf858c9d-P001a7df1/20250209T065445.352998Z-Hcf858c9d-P001a7dff/20250209T065445.356541Z-Hcf858c9d-P001a7e1c","thread":"main","time":"2025-02-09T06:54:45.360515Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.004186,"t_rel":0.004186,"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":"20250209T065445.348244Z-Hcf858c9d-P001a7df1/20250209T065445.352998Z-Hcf858c9d-P001a7dff/20250209T065445.356541Z-Hcf858c9d-P001a7e1c","thread":"main","time":"2025-02-09T06:54:45.360515Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.004186,"t_rel":0.004186,"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":"20260314T133236.626103Z-H5c947e1c-P0002d5bc/20260314T133236.634906Z-H5c947e1c-P0002d5d2/20260314T133236.650591Z-H5c947e1c-P0002d5da","thread":"main","time":"2026-03-14T13:32:36.660682Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.010303,"t_rel":0.010303,"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":"20260314T133236.626103Z-H5c947e1c-P0002d5bc/20260314T133236.634906Z-H5c947e1c-P0002d5d2/20260314T133236.650591Z-H5c947e1c-P0002d5da","thread":"main","time":"2026-03-14T13:32:36.660682Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.010303,"t_rel":0.010303,"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': 
@@ -358482,9 +361506,9 @@
 		grep \"fetch-info\".*\"depth\":2147483647 trace2_event
 	)
 
-{"event":"data_json","sid":"20250209T065445.348244Z-Hcf858c9d-P001a7df1/20250209T065445.352998Z-Hcf858c9d-P001a7dff/20250209T065445.356541Z-Hcf858c9d-P001a7e1c","thread":"main","time":"2025-02-09T06:54:45.360515Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.004186,"t_rel":0.004186,"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":"20250209T065445.612164Z-Hcf858c9d-P001a8305/20250209T065445.615554Z-Hcf858c9d-P001a8319","thread":"main","time":"2025-02-09T06:54:45.619089Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.003756,"t_rel":0.003756,"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":"20250209T065445.612164Z-Hcf858c9d-P001a8305/20250209T065445.615554Z-Hcf858c9d-P001a8319","thread":"main","time":"2025-02-09T06:54:45.619089Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.003756,"t_rel":0.003756,"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":"20260314T133236.626103Z-H5c947e1c-P0002d5bc/20260314T133236.634906Z-H5c947e1c-P0002d5d2/20260314T133236.650591Z-H5c947e1c-P0002d5da","thread":"main","time":"2026-03-14T13:32:36.660682Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.010303,"t_rel":0.010303,"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":"20260314T133238.017311Z-H5c947e1c-P0002db2a/20260314T133238.036037Z-H5c947e1c-P0002db34","thread":"main","time":"2026-03-14T13:32:38.050575Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.014748,"t_rel":0.014748,"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":"20260314T133238.017311Z-H5c947e1c-P0002db2a/20260314T133238.036037Z-H5c947e1c-P0002db34","thread":"main","time":"2026-03-14T13:32:38.050575Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.014748,"t_rel":0.014748,"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': 
@@ -358794,7 +361818,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 to_fetch.t
-{"event":"data","sid":"20250209T065446.604145Z-Hcf858c9d-P001a954f","thread":"main","time":"2025-02-09T06:54:46.615845Z","file":"fetch-pack.c","line":1758,"repo":1,"t_abs":0.011916,"t_rel":0.006248,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"6"}
+{"event":"data","sid":"20260314T133242.952464Z-H5c947e1c-P0002ecab","thread":"main","time":"2026-03-14T13:32:42.994178Z","file":"fetch-pack.c","line":1758,"repo":1,"t_abs":0.041940,"t_rel":0.012847,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"6"}
 remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
 ok 44 - in_vain reset upon ACK
 
@@ -359082,10 +362106,10 @@
 remote: Enumerating objects: 267, done.        
 remote: Counting objects:   0% (1/267)        
remote: Counting objects:   1% (3/267)        
remote: Counting objects:   2% (6/267)        
remote: Counting objects:   3% (9/267)        
remote: Counting objects:   4% (11/267)        
remote: Counting objects:   5% (14/267)        
remote: Counting objects:   6% (17/267)        
remote: Counting objects:   7% (19/267)        
remote: Counting objects:   8% (22/267)        
remote: Counting objects:   9% (25/267)        
remote: Counting objects:  10% (27/267)        
remote: Counting objects:  11% (30/267)        
remote: Counting objects:  12% (33/267)        
remote: Counting objects:  13% (35/267)        
remote: Counting objects:  14% (38/267)        
remote: Counting objects:  15% (41/267)        
remote: Counting objects:  16% (43/267)        
remote: Counting objects:  17% (46/267)        
remote: Counting objects:  18% (49/267)        
remote: Counting objects:  19% (51/267)        
remote: Counting objects:  20% (54/267)        
remote: Counting objects:  21% (57/267)        
remote: Counting objects:  22% (59/267)        
remote: Counting objects:  23% (62/267)        
remote: Counting objects:  24% (65/267)        
remote: Counting objects:  25% (67/267)        
remote: Counting objects:  26% (70/267)        
remote: Counting objects:  27% (73/267)        
remote: Counting objects:  28% (75/267)        
remote: Counting objects:  29% (78/267)        
remote: Counting objects:  30% (81/267)        
remote: Counting objects:  31% (83/267)        
remote: Counting objects:  32% (86/267)        
remote: Counting objects:  33% (89/267)        
remote: Counting objects:  34% (91/267)        
remote: Counting objects:  35% (94/267)        
remote: Counting objects:  36% (97/267)        
remote: Counting objects:  37% (99/267)        
remote: Counting objects:  38% (102/267)        
remote: Counting objects:  39% (105/267)        
remote: Counting objects:  40% (107/267)        
remote: Counting objects:  41% (110/267)        
remote: Counting objects:  42% (113/267)        
remote: Counting objects:  43% (115/267)        
remote: Counting objects:  44% (118/267)        
remote: Counting objects:  45% (121/267)        
remote: Counting objects:  46% (123/267)        
remote: Counting objects:  47% (126/267)        
remote: Counting objects:  48% (129/267)        
remote: Counting objects:  49% (131/267)        
remote: Counting objects:  50% (134/267)        
remote: Counting objects:  51% (137/267)        
remote: Counting objects:  52% (139/267)        
remote: Counting objects:  53% (142/267)        
remote: Counting objects:  54% (145/267)        
remote: Counting objects:  55% (147/267)        
remote: Counting objects:  56% (150/267)        
remote: Counting objects:  57% (153/267)        
remote: Counting objects:  58% (155/267)        
remote: Counting objects:  59% (158/267)        
remote: Counting objects:  60% (161/267)        
remote: Counting objects:  61% (163/267)        
remote: Counting objects:  62% (166/267)        
remote: Counting objects:  63% (169/267)        
remote: Counting objects:  64% (171/267)        
remote: Counting objects:  65% (174/267)        
remote: Counting objects:  66% (177/267)        
remote: Counting objects:  67% (179/267)        
remote: Counting objects:  68% (182/267)        
remote: Counting objects:  69% (185/267)        
remote: Counting objects:  70% (187/267)        
remote: Counting objects:  71% (190/267)        
remote: Counting objects:  72% (193/267)        
remote: Counting objects:  73% (195/267)        
remote: Counting objects:  74% (198/267)        
remote: Counting objects:  75% (201/267)        
remote: Counting objects:  76% (203/267)        
remote: Counting objects:  77% (206/267)        
remote: Counting objects:  78% (209/267)        
remote: Counting objects:  79% (211/267)        
remote: Counting objects:  80% (214/267)        
remote: Counting objects:  81% (217/267)        
remote: Counting objects:  82% (219/267)        
remote: Counting objects:  83% (222/267)        
remote: Counting objects:  84% (225/267)        
remote: Counting objects:  85% (227/267)        
remote: Counting objects:  86% (230/267)        
remote: Counting objects:  87% (233/267)        
remote: Counting objects:  88% (235/267)        
remote: Counting objects:  89% (238/267)        
remote: Counting objects:  90% (241/267)        
remote: Counting objects:  91% (243/267)        
remote: Counting objects:  92% (246/267)        
remote: Counting objects:  93% (249/267)        
remote: Counting objects:  94% (251/267)        
remote: Counting objects:  95% (254/267)        
remote: Counting objects:  96% (257/267)        
remote: Counting objects:  97% (259/267)        
remote: Counting objects:  98% (262/267)        
remote: Counting objects:  99% (265/267)        
remote: Counting objects: 100% (267/267)        
remote: Counting objects: 100% (267/267), done.        
 remote: Compressing objects:   1% (1/96)        
remote: Compressing objects:   2% (2/96)        
remote: Compressing objects:   3% (3/96)        
remote: Compressing objects:   4% (4/96)        
remote: Compressing objects:   5% (5/96)        
remote: Compressing objects:   6% (6/96)        
remote: Compressing objects:   7% (7/96)        
remote: Compressing objects:   8% (8/96)        
remote: Compressing objects:   9% (9/96)        
remote: Compressing objects:  10% (10/96)        
remote: Compressing objects:  11% (11/96)        
remote: Compressing objects:  12% (12/96)        
remote: Compressing objects:  13% (13/96)        
remote: Compressing objects:  14% (14/96)        
remote: Compressing objects:  15% (15/96)        
remote: Compressing objects:  16% (16/96)        
remote: Compressing objects:  17% (17/96)        
remote: Compressing objects:  18% (18/96)        
remote: Compressing objects:  19% (19/96)        
remote: Compressing objects:  20% (20/96)        
remote: Compressing objects:  21% (21/96)        
remote: Compressing objects:  22% (22/96)        
remote: Compressing objects:  23% (23/96)        
remote: Compressing objects:  25% (24/96)        
remote: Compressing objects:  26% (25/96)        
remote: Compressing objects:  27% (26/96)        
remote: Compressing objects:  28% (27/96)        
remote: Compressing objects:  29% (28/96)        
remote: Compressing objects:  30% (29/96)        
remote: Compressing objects:  31% (30/96)        
remote: Compressing objects:  32% (31/96)        
remote: Compressing objects:  33% (32/96)        
remote: Compressing objects:  34% (33/96)        
remote: Compressing objects:  35% (34/96)        
remote: Compressing objects:  36% (35/96)        
remote: Compressing objects:  37% (36/96)        
remote: Compressing objects:  38% (37/96)        
remote: Compressing objects:  39% (38/96)        
remote: Compressing objects:  40% (39/96)        
remote: Compressing objects:  41% (40/96)        
remote: Compressing objects:  42% (41/96)        
remote: Compressing objects:  43% (42/96)        
remote: Compressing objects:  44% (43/96)        
remote: Compressing objects:  45% (44/96)        
remote: Compressing objects:  46% (45/96)        
remote: Compressing objects:  47% (46/96)        
remote: Compressing objects:  48% (47/96)        
remote: Compressing objects:  50% (48/96)        
remote: Compressing objects:  51% (49/96)        
remote: Compressing objects:  52% (50/96)        
remote: Compressing objects:  53% (51/96)        
remote: Compressing objects:  54% (52/96)        
remote: Compressing objects:  55% (53/96)        
remote: Compressing objects:  56% (54/96)        
remote: Compressing objects:  57% (55/96)        
remote: Compressing objects:  58% (56/96)        
remote: Compressing objects:  59% (57/96)        
remote: Compressing objects:  60% (58/96)        
remote: Compressing objects:  61% (59/96)        
remote: Compressing objects:  62% (60/96)        
remote: Compressing objects:  63% (61/96)        
remote: Compressing objects:  64% (62/96)        
remote: Compressing objects:  65% (63/96)        
remote: Compressing objects:  66% (64/96)        
remote: Compressing objects:  67% (65/96)        
remote: Compressing objects:  68% (66/96)        
remote: Compressing objects:  69% (67/96)        
remote: Compressing objects:  70% (68/96)        
remote: Compressing objects:  71% (69/96)        
remote: Compressing objects:  72% (70/96)        
remote: Compressing objects:  73% (71/96)        
remote: Compressing objects:  75% (72/96)        
remote: Compressing objects:  76% (73/96)        
remote: Compressing objects:  77% (74/96)        
remote: Compressing objects:  78% (75/96)        
remote: Compressing objects:  79% (76/96)        
remote: Compressing objects:  80% (77/96)        
remote: Compressing objects:  81% (78/96)        
remote: Compressing objects:  82% (79/96)        
remote: Compressing objects:  83% (80/96)        
remote: Compressing objects:  84% (81/96)        
remote: Compressing objects:  85% (82/96)        
remote: Compressing objects:  86% (83/96)        
remote: Compressing objects:  87% (84/96)        
remote: Compressing objects:  88% (85/96)        
remote: Compressing objects:  89% (86/96)        
remote: Compressing objects:  90% (87/96)        
remote: Compressing objects:  91% (88/96)        
remote: Compressing objects:  92% (89/96)        
remote: Compressing objects:  93% (90/96)        
remote: Compressing objects:  94% (91/96)        
remote: Compressing objects:  95% (92/96)        
remote: Compressing objects:  96% (93/96)        
remote: Compressing objects:  97% (94/96)        
remote: Compressing objects:  98% (95/96)        
remote: Compressing objects: 100% (96/96)        
remote: Compressing objects: 100% (96/96), done.        
-Receiving objects:   0% (1/267)
Receiving objects:   1% (3/267)
Receiving objects:   2% (6/267)
Receiving objects:   3% (9/267)
Receiving objects:   4% (11/267)
Receiving objects:   5% (14/267)
Receiving objects:   6% (17/267)
Receiving objects:   7% (19/267)
Receiving objects:   8% (22/267)
Receiving objects:   9% (25/267)
Receiving objects:  10% (27/267)
Receiving objects:  11% (30/267)
Receiving objects:  12% (33/267)
Receiving objects:  13% (35/267)
Receiving objects:  14% (38/267)
Receiving objects:  15% (41/267)
Receiving objects:  16% (43/267)
Receiving objects:  17% (46/267)
Receiving objects:  18% (49/267)
Receiving objects:  19% (51/267)
Receiving objects:  20% (54/267)
Receiving objects:  21% (57/267)
Receiving objects:  22% (59/267)
Receiving objects:  23% (62/267)
Receiving objects:  24% (65/267)
Receiving objects:  25% (67/267)
Receiving objects:  26% (70/267)
Receiving objects:  27% (73/267)
Receiving objects:  28% (75/267)
Receiving objects:  29% (78/267)
Receiving objects:  30% (81/267)
Receiving objects:  31% (83/267)
Receiving objects:  32% (86/267)
Receiving objects:  33% (89/267)
Receiving objects:  34% (91/267)
Receiving objects:  35% (94/267)
Receiving objects:  36% (97/267)
Receiving objects:  37% (99/267)
Receiving objects:  38% (102/267)
Receiving objects:  39% (105/267)
Receiving objects:  40% (107/267)
Receiving objects:  41% (110/267)
Receiving objects:  42% (113/267)
Receiving objects:  43% (115/267)
Receiving objects:  44% (118/267)
Receiving objects:  45% (121/267)
Receiving objects:  46% (123/267)
Receiving objects:  47% (126/267)
Receiving objects:  48% (129/267)
Receiving objects:  49% (131/267)
Receiving objects:  50% (134/267)
remote: Total 267 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:  51% (137/267)
Receiving objects:  52% (139/267)
Receiving objects:  53% (142/267)
Receiving objects:  54% (145/267)
Receiving objects:  55% (147/267)
Receiving objects:  56% (150/267)
Receiving objects:  57% (153/267)
Receiving objects:  58% (155/267)
Receiving objects:  59% (158/267)
Receiving objects:  60% (161/267)
Receiving objects:  61% (163/267)
Receiving objects:  62% (166/267)
Receiving objects:  63% (169/267)
Receiving objects:  64% (171/267)
Receiving objects:  65% (174/267)
Receiving objects:  66% (177/267)
Receiving objects:  67% (179/267)
Receiving objects:  68% (182/267)
Receiving objects:  69% (185/267)
Receiving objects:  70% (187/267)
Receiving objects:  71% (190/267)
Receiving objects:  72% (193/267)
Receiving objects:  73% (195/267)
Receiving objects:  74% (198/267)
Receiving objects:  75% (201/267)
Receiving objects:  76% (203/267)
Receiving objects:  77% (206/267)
Receiving objects:  78% (209/267)
Receiving objects:  79% (211/267)
Receiving objects:  80% (214/267)
Receiving objects:  81% (217/267)
Receiving objects:  82% (219/267)
Receiving objects:  83% (222/267)
Receiving objects:  84% (225/267)
Receiving objects:  85% (227/267)
Receiving objects:  86% (230/267)
Receiving objects:  87% (233/267)
Receiving objects:  88% (235/267)
Receiving objects:  89% (238/267)
Receiving objects:  90% (241/267)
Receiving objects:  91% (243/267)
Receiving objects:  92% (246/267)
Receiving objects:  93% (249/267)
Receiving objects:  94% (251/267)
Receiving objects:  95% (254/267)
Receiving objects:  96% (257/267)
Receiving objects:  97% (259/267)
Receiving objects:  98% (262/267)
Receiving objects:  99% (265/267)
Receiving objects: 100% (267/267)
Receiving objects: 100% (267/267), 22.47 KiB | 1.18 MiB/s, done.
-Resolving deltas:   0% (0/2)
Resolving deltas:  50% (1/2)
Resolving deltas: 100% (2/2)
Resolving deltas: 100% (2/2), done.
-keep	42424f5c5773e13b8d712a1ba00f22d6ab3c992c
+Receiving objects:   0% (1/267)
Receiving objects:   1% (3/267)
Receiving objects:   2% (6/267)
Receiving objects:   3% (9/267)
Receiving objects:   4% (11/267)
Receiving objects:   5% (14/267)
Receiving objects:   6% (17/267)
Receiving objects:   7% (19/267)
Receiving objects:   8% (22/267)
Receiving objects:   9% (25/267)
Receiving objects:  10% (27/267)
Receiving objects:  11% (30/267)
Receiving objects:  12% (33/267)
Receiving objects:  13% (35/267)
Receiving objects:  14% (38/267)
Receiving objects:  15% (41/267)
Receiving objects:  16% (43/267)
Receiving objects:  17% (46/267)
Receiving objects:  18% (49/267)
Receiving objects:  19% (51/267)
Receiving objects:  20% (54/267)
Receiving objects:  21% (57/267)
Receiving objects:  22% (59/267)
Receiving objects:  23% (62/267)
Receiving objects:  24% (65/267)
Receiving objects:  25% (67/267)
Receiving objects:  26% (70/267)
Receiving objects:  27% (73/267)
Receiving objects:  28% (75/267)
Receiving objects:  29% (78/267)
Receiving objects:  30% (81/267)
Receiving objects:  31% (83/267)
Receiving objects:  32% (86/267)
Receiving objects:  33% (89/267)
Receiving objects:  34% (91/267)
Receiving objects:  35% (94/267)
Receiving objects:  36% (97/267)
Receiving objects:  37% (99/267)
Receiving objects:  38% (102/267)
Receiving objects:  39% (105/267)
Receiving objects:  40% (107/267)
Receiving objects:  41% (110/267)
Receiving objects:  42% (113/267)
Receiving objects:  43% (115/267)
Receiving objects:  44% (118/267)
Receiving objects:  45% (121/267)
Receiving objects:  46% (123/267)
Receiving objects:  47% (126/267)
Receiving objects:  48% (129/267)
Receiving objects:  49% (131/267)
Receiving objects:  50% (134/267)
remote: Total 267 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)        
+Receiving objects:  51% (137/267)
Receiving objects:  52% (139/267)
Receiving objects:  53% (142/267)
Receiving objects:  54% (145/267)
Receiving objects:  55% (147/267)
Receiving objects:  56% (150/267)
Receiving objects:  57% (153/267)
Receiving objects:  58% (155/267)
Receiving objects:  59% (158/267)
Receiving objects:  60% (161/267)
Receiving objects:  61% (163/267)
Receiving objects:  62% (166/267)
Receiving objects:  63% (169/267)
Receiving objects:  64% (171/267)
Receiving objects:  65% (174/267)
Receiving objects:  66% (177/267)
Receiving objects:  67% (179/267)
Receiving objects:  68% (182/267)
Receiving objects:  69% (185/267)
Receiving objects:  70% (187/267)
Receiving objects:  71% (190/267)
Receiving objects:  72% (193/267)
Receiving objects:  73% (195/267)
Receiving objects:  74% (198/267)
Receiving objects:  75% (201/267)
Receiving objects:  76% (203/267)
Receiving objects:  77% (206/267)
Receiving objects:  78% (209/267)
Receiving objects:  79% (211/267)
Receiving objects:  80% (214/267)
Receiving objects:  81% (217/267)
Receiving objects:  82% (219/267)
Receiving objects:  83% (222/267)
Receiving objects:  84% (225/267)
Receiving objects:  85% (227/267)
Receiving objects:  86% (230/267)
Receiving objects:  87% (233/267)
Receiving objects:  88% (235/267)
Receiving objects:  89% (238/267)
Receiving objects:  90% (241/267)
Receiving objects:  91% (243/267)
Receiving objects:  92% (246/267)
Receiving objects:  93% (249/267)
Receiving objects:  94% (251/267)
Receiving objects:  95% (254/267)
Receiving objects:  96% (257/267)
Receiving objects:  97% (259/267)
Receiving objects:  98% (262/267)
Receiving objects:  99% (265/267)
Receiving objects: 100% (267/267)
Receiving objects: 100% (267/267), 22.41 KiB | 337.00 KiB/s, done.
+Resolving deltas:   0% (0/3)
Resolving deltas:  33% (1/3)
Resolving deltas:  66% (2/3)
Resolving deltas: 100% (3/3)
Resolving deltas: 100% (3/3), done.
+keep	af36a4e38ad65488701370467da12a1dc50c78d3
 70125409534829fdfcb67d82de93f86282574cb4 HEAD
 f85e353c1b377970afbb804118d9135948598eea refs/heads/A
 70125409534829fdfcb67d82de93f86282574cb4 refs/heads/B
@@ -360163,4356 +363187,926 @@
 		
 ok 254 - fetch-pack --diag-url ./file:[::1]:23/~re:po
 
-expecting success of 5500.255 'fetch-pack --diag-url ./[:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 255 - fetch-pack --diag-url ./[:re:po
-
-expecting success of 5500.256 'fetch-pack --diag-url ./file:[/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 256 - fetch-pack --diag-url ./file:[/~re:po
-
-expecting success of 5500.257 'fetch-pack --diag-url ./[:aa:re:po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 257 - fetch-pack --diag-url ./[:aa:re:po
-
-expecting success of 5500.258 'fetch-pack --diag-url ./file:[:aa/~re:po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 258 - fetch-pack --diag-url ./file:[:aa/~re:po
-
-expecting success of 5500.259 'fetch-pack --diag-url host:re:po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 259 - fetch-pack --diag-url host:re:po
-
-expecting success of 5500.260 'fetch-pack --diag-url host:/~re:po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 260 - fetch-pack --diag-url host:/~re:po
-
-expecting success of 5500.261 'fetch-pack --diag-url [::1]:re:po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 261 - fetch-pack --diag-url [::1]:re:po
-
-expecting success of 5500.262 'fetch-pack --diag-url [::1]:/~re:po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 262 - fetch-pack --diag-url [::1]:/~re:po
-
-expecting success of 5500.263 'fetch-pack --diag-url ssh+git://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 263 - fetch-pack --diag-url ssh+git://host/re/po
-
-expecting success of 5500.264 'fetch-pack --diag-url ssh+git://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 264 - fetch-pack --diag-url ssh+git://host/~re/po
-
-expecting success of 5500.265 'fetch-pack --diag-url ssh+git://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 265 - fetch-pack --diag-url ssh+git://host:/re/po
-
-expecting success of 5500.266 'fetch-pack --diag-url ssh+git://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 266 - fetch-pack --diag-url ssh+git://host:/~re/po
-
-expecting success of 5500.267 'fetch-pack --diag-url ssh+git://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 267 - fetch-pack --diag-url ssh+git://user@host/re/po
-
-expecting success of 5500.268 'fetch-pack --diag-url ssh+git://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 268 - fetch-pack --diag-url ssh+git://user@host/~re/po
-
-expecting success of 5500.269 'fetch-pack --diag-url ssh+git://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 269 - fetch-pack --diag-url ssh+git://user@host:/re/po
-
-expecting success of 5500.270 'fetch-pack --diag-url ssh+git://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 270 - fetch-pack --diag-url ssh+git://user@host:/~re/po
-
-expecting success of 5500.271 'fetch-pack --diag-url ssh+git://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 271 - fetch-pack --diag-url ssh+git://user@[::1]/re/po
-
-expecting success of 5500.272 'fetch-pack --diag-url ssh+git://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 272 - fetch-pack --diag-url ssh+git://user@[::1]/~re/po
-
-expecting success of 5500.273 'fetch-pack --diag-url ssh+git://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 273 - fetch-pack --diag-url ssh+git://user@[::1]:/re/po
-
-expecting success of 5500.274 'fetch-pack --diag-url ssh+git://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 274 - fetch-pack --diag-url ssh+git://user@[::1]:/~re/po
-
-expecting success of 5500.275 'fetch-pack --diag-url ssh+git://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 275 - fetch-pack --diag-url ssh+git://user@::1/re/po
-
-expecting success of 5500.276 'fetch-pack --diag-url ssh+git://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 276 - fetch-pack --diag-url ssh+git://user@::1/~re/po
-
-expecting success of 5500.277 'fetch-pack --diag-url ssh+git://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 277 - fetch-pack --diag-url ssh+git://user@::1:/re/po
-
-expecting success of 5500.278 'fetch-pack --diag-url ssh+git://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 278 - fetch-pack --diag-url ssh+git://user@::1:/~re/po
-
-expecting success of 5500.279 'fetch-pack --diag-url ssh+git://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 279 - fetch-pack --diag-url ssh+git://host:22/re/po
-
-expecting success of 5500.280 'fetch-pack --diag-url ssh+git://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 280 - fetch-pack --diag-url ssh+git://User@host:22/re/po
-
-expecting success of 5500.281 'fetch-pack --diag-url ssh+git://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 281 - fetch-pack --diag-url ssh+git://User@[::1]:22/re/po
-
-expecting success of 5500.282 'fetch-pack --diag-url git+ssh://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 282 - fetch-pack --diag-url git+ssh://host/re/po
-
-expecting success of 5500.283 'fetch-pack --diag-url git+ssh://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 283 - fetch-pack --diag-url git+ssh://host/~re/po
-
-expecting success of 5500.284 'fetch-pack --diag-url git+ssh://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 284 - fetch-pack --diag-url git+ssh://host:/re/po
-
-expecting success of 5500.285 'fetch-pack --diag-url git+ssh://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 285 - fetch-pack --diag-url git+ssh://host:/~re/po
-
-expecting success of 5500.286 'fetch-pack --diag-url git+ssh://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 286 - fetch-pack --diag-url git+ssh://user@host/re/po
-
-expecting success of 5500.287 'fetch-pack --diag-url git+ssh://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 287 - fetch-pack --diag-url git+ssh://user@host/~re/po
-
-expecting success of 5500.288 'fetch-pack --diag-url git+ssh://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 288 - fetch-pack --diag-url git+ssh://user@host:/re/po
-
-expecting success of 5500.289 'fetch-pack --diag-url git+ssh://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 289 - fetch-pack --diag-url git+ssh://user@host:/~re/po
-
-expecting success of 5500.290 'fetch-pack --diag-url git+ssh://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 290 - fetch-pack --diag-url git+ssh://user@[::1]/re/po
-
-expecting success of 5500.291 'fetch-pack --diag-url git+ssh://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 291 - fetch-pack --diag-url git+ssh://user@[::1]/~re/po
-
-expecting success of 5500.292 'fetch-pack --diag-url git+ssh://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 292 - fetch-pack --diag-url git+ssh://user@[::1]:/re/po
-
-expecting success of 5500.293 'fetch-pack --diag-url git+ssh://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 293 - fetch-pack --diag-url git+ssh://user@[::1]:/~re/po
-
-expecting success of 5500.294 'fetch-pack --diag-url git+ssh://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 294 - fetch-pack --diag-url git+ssh://user@::1/re/po
-
-expecting success of 5500.295 'fetch-pack --diag-url git+ssh://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 295 - fetch-pack --diag-url git+ssh://user@::1/~re/po
-
-expecting success of 5500.296 'fetch-pack --diag-url git+ssh://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 296 - fetch-pack --diag-url git+ssh://user@::1:/re/po
-
-expecting success of 5500.297 'fetch-pack --diag-url git+ssh://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 297 - fetch-pack --diag-url git+ssh://user@::1:/~re/po
-
-expecting success of 5500.298 'fetch-pack --diag-url git+ssh://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 298 - fetch-pack --diag-url git+ssh://host:22/re/po
-
-expecting success of 5500.299 'fetch-pack --diag-url git+ssh://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 299 - fetch-pack --diag-url git+ssh://User@host:22/re/po
-
-expecting success of 5500.300 'fetch-pack --diag-url git+ssh://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 300 - fetch-pack --diag-url git+ssh://User@[::1]:22/re/po
-
-expecting success of 5500.301 'fetch-pack --diag-url git://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 301 - fetch-pack --diag-url git://host/re/po
-
-expecting success of 5500.302 'fetch-pack --diag-url git://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 302 - fetch-pack --diag-url git://host/~re/po
-
-expecting success of 5500.303 'fetch-pack --diag-url git://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 303 - fetch-pack --diag-url git://host:/re/po
-
-expecting success of 5500.304 'fetch-pack --diag-url git://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 304 - fetch-pack --diag-url git://host:/~re/po
-
-expecting success of 5500.305 'fetch-pack --diag-url git://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 305 - fetch-pack --diag-url git://user@host/re/po
-
-expecting success of 5500.306 'fetch-pack --diag-url git://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 306 - fetch-pack --diag-url git://user@host/~re/po
-
-expecting success of 5500.307 'fetch-pack --diag-url git://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 307 - fetch-pack --diag-url git://user@host:/re/po
-
-expecting success of 5500.308 'fetch-pack --diag-url git://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 308 - fetch-pack --diag-url git://user@host:/~re/po
-
-expecting success of 5500.309 'fetch-pack --diag-url git://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 309 - fetch-pack --diag-url git://user@[::1]/re/po
-
-expecting success of 5500.310 'fetch-pack --diag-url git://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 310 - fetch-pack --diag-url git://user@[::1]/~re/po
-
-expecting success of 5500.311 'fetch-pack --diag-url git://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 311 - fetch-pack --diag-url git://user@[::1]:/re/po
-
-expecting success of 5500.312 'fetch-pack --diag-url git://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 312 - fetch-pack --diag-url git://user@[::1]:/~re/po
-
-expecting success of 5500.313 'fetch-pack --diag-url git://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 313 - fetch-pack --diag-url git://user@::1/re/po
-
-expecting success of 5500.314 'fetch-pack --diag-url git://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 314 - fetch-pack --diag-url git://user@::1/~re/po
-
-expecting success of 5500.315 'fetch-pack --diag-url git://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 315 - fetch-pack --diag-url git://user@::1:/re/po
-
-expecting success of 5500.316 'fetch-pack --diag-url git://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 316 - fetch-pack --diag-url git://user@::1:/~re/po
-
-expecting success of 5500.317 'fetch-pack --diag-url git://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 317 - fetch-pack --diag-url git://host:22/re/po
-
-expecting success of 5500.318 'fetch-pack --diag-url git://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 318 - fetch-pack --diag-url git://User@host:22/re/po
-
-expecting success of 5500.319 'fetch-pack --diag-url git://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 319 - fetch-pack --diag-url git://User@[::1]:22/re/po
-
-expecting success of 5500.320 'fetch-pack --diag-url ssh://host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 320 - fetch-pack --diag-url ssh://host/re/po
-
-expecting success of 5500.321 'fetch-pack --diag-url ssh://host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 321 - fetch-pack --diag-url ssh://host/~re/po
-
-expecting success of 5500.322 'fetch-pack --diag-url ssh://host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 322 - fetch-pack --diag-url ssh://host:/re/po
-
-expecting success of 5500.323 'fetch-pack --diag-url ssh://host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 323 - fetch-pack --diag-url ssh://host:/~re/po
-
-expecting success of 5500.324 'fetch-pack --diag-url ssh://user@host/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 324 - fetch-pack --diag-url ssh://user@host/re/po
-
-expecting success of 5500.325 'fetch-pack --diag-url ssh://user@host/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 325 - fetch-pack --diag-url ssh://user@host/~re/po
-
-expecting success of 5500.326 'fetch-pack --diag-url ssh://user@host:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 326 - fetch-pack --diag-url ssh://user@host:/re/po
-
-expecting success of 5500.327 'fetch-pack --diag-url ssh://user@host:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 327 - fetch-pack --diag-url ssh://user@host:/~re/po
-
-expecting success of 5500.328 'fetch-pack --diag-url ssh://user@[::1]/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 328 - fetch-pack --diag-url ssh://user@[::1]/re/po
-
-expecting success of 5500.329 'fetch-pack --diag-url ssh://user@[::1]/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 329 - fetch-pack --diag-url ssh://user@[::1]/~re/po
-
-expecting success of 5500.330 'fetch-pack --diag-url ssh://user@[::1]:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 330 - fetch-pack --diag-url ssh://user@[::1]:/re/po
-
-expecting success of 5500.331 'fetch-pack --diag-url ssh://user@[::1]:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 331 - fetch-pack --diag-url ssh://user@[::1]:/~re/po
-
-expecting success of 5500.332 'fetch-pack --diag-url ssh://user@::1/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 332 - fetch-pack --diag-url ssh://user@::1/re/po
-
-expecting success of 5500.333 'fetch-pack --diag-url ssh://user@::1/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 333 - fetch-pack --diag-url ssh://user@::1/~re/po
-
-expecting success of 5500.334 'fetch-pack --diag-url ssh://user@::1:/re/po': 
-					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
-				
-ok 334 - fetch-pack --diag-url ssh://user@::1:/re/po
-
-expecting success of 5500.335 'fetch-pack --diag-url ssh://user@::1:/~re/po': 
-					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
-				
-ok 335 - fetch-pack --diag-url ssh://user@::1:/~re/po
-
-expecting success of 5500.336 'fetch-pack --diag-url ssh://host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 336 - fetch-pack --diag-url ssh://host:22/re/po
-
-expecting success of 5500.337 'fetch-pack --diag-url ssh://User@host:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 337 - fetch-pack --diag-url ssh://User@host:22/re/po
-
-expecting success of 5500.338 'fetch-pack --diag-url ssh://User@[::1]:22/re/po': 
-				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
-			
-ok 338 - fetch-pack --diag-url ssh://User@[::1]:22/re/po
-
-expecting success of 5500.339 'fetch-pack --diag-url file://User@[::1]/re/po': 
-			check_prot_path $p://$h/$r $p "/$r"
-		
-ok 339 - fetch-pack --diag-url file://User@[::1]/re/po
-
-ok 340 # skip fetch-pack --diag-url file://User@[::1]/re/po (missing MINGW)
-
-ok 341 # skip fetch-pack --diag-url file:///re/po (missing MINGW)
-
-expecting success of 5500.342 'fetch-pack --diag-url file://User@[::1]/~re/po': 
-			check_prot_path $p://$h/~$r $p "/~$r"
-		
-ok 342 - fetch-pack --diag-url file://User@[::1]/~re/po
-
-ok 343 # skip fetch-pack --diag-url file://User@[::1]/~re/po (missing MINGW)
-
-expecting success of 5500.344 'fetch-pack --diag-url ./nohost:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 344 - fetch-pack --diag-url ./nohost:re/po
-
-expecting success of 5500.345 'fetch-pack --diag-url ./file:nohost/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 345 - fetch-pack --diag-url ./file:nohost/~re/po
-
-expecting success of 5500.346 'fetch-pack --diag-url ./nohost:12:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 346 - fetch-pack --diag-url ./nohost:12:re/po
-
-expecting success of 5500.347 'fetch-pack --diag-url ./file:nohost:12/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 347 - fetch-pack --diag-url ./file:nohost:12/~re/po
-
-expecting success of 5500.348 'fetch-pack --diag-url ./[::1]:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 348 - fetch-pack --diag-url ./[::1]:re/po
-
-expecting success of 5500.349 'fetch-pack --diag-url ./file:[::1]/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 349 - fetch-pack --diag-url ./file:[::1]/~re/po
-
-expecting success of 5500.350 'fetch-pack --diag-url ./[::1]:23:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 350 - fetch-pack --diag-url ./[::1]:23:re/po
-
-expecting success of 5500.351 'fetch-pack --diag-url ./file:[::1]:23/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 351 - fetch-pack --diag-url ./file:[::1]:23/~re/po
-
-expecting success of 5500.352 'fetch-pack --diag-url ./[:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 352 - fetch-pack --diag-url ./[:re/po
-
-expecting success of 5500.353 'fetch-pack --diag-url ./file:[/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 353 - fetch-pack --diag-url ./file:[/~re/po
-
-expecting success of 5500.354 'fetch-pack --diag-url ./[:aa:re/po': 
-			check_prot_path ./$h:$r $p "./$h:$r"
-		
-ok 354 - fetch-pack --diag-url ./[:aa:re/po
-
-expecting success of 5500.355 'fetch-pack --diag-url ./file:[:aa/~re/po': 
-		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
-		
-ok 355 - fetch-pack --diag-url ./file:[:aa/~re/po
-
-expecting success of 5500.356 'fetch-pack --diag-url host:re/po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 356 - fetch-pack --diag-url host:re/po
-
-expecting success of 5500.357 'fetch-pack --diag-url host:/~re/po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 357 - fetch-pack --diag-url host:/~re/po
-
-expecting success of 5500.358 'fetch-pack --diag-url [::1]:re/po': 
-			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
-		
-ok 358 - fetch-pack --diag-url [::1]:re/po
-
-expecting success of 5500.359 'fetch-pack --diag-url [::1]:/~re/po': 
-			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
-		
-ok 359 - fetch-pack --diag-url [::1]:/~re/po
-
-ok 360 # skip fetch-pack --diag-url file://c:/repo (missing MINGW)
-
-ok 361 # skip fetch-pack --diag-url c:repo (missing MINGW)
-
-expecting success of 5500.362 'clone shallow since ...': 
-	test_create_repo shallow-since &&
-	(
-	cd shallow-since &&
-	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
-	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
-	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
-	git clone --shallow-since "300000000 +0700" "file://$(pwd)/." ../shallow11 &&
-	git -C ../shallow11 log --pretty=tformat:%s HEAD >actual &&
-	echo three >expected &&
-	test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-since/.git/
-[main (root-commit) 4c9b2a3] one
- Author: A U Thor <author@example.com>
-[main e491164] two
- Author: A U Thor <author@example.com>
-[main 88fb92d] three
- Author: A U Thor <author@example.com>
-Cloning into '../shallow11'...
-ok 362 - clone shallow since ...
-
-expecting success of 5500.363 'fetch shallow since ...': 
-	GIT_TRACE2_EVENT=$(pwd)/shallow11/trace2_event \
-		git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
-	git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
-	cat >expected <<-\EOF &&
-	three
-	two
-	EOF
-	test_cmp expected actual &&
-	grep \"fetch-info\".*\"deepen-since\":true shallow11/trace2_event
-
-{"event":"data_json","sid":"20250209T065451.251504Z-Hcf858c9d-P001af3f0/20250209T065451.254628Z-Hcf858c9d-P001af401","thread":"main","time":"2025-02-09T06:54:51.256490Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.002091,"t_rel":0.002091,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":1,"wants":1,"want-refs":0,"depth":0,"shallows":1,"deepen-since":true,"deepen-not":0,"deepen-relative":false,"filter":null}}
-ok 363 - fetch shallow since ...
-
-expecting success of 5500.364 'clone shallow since selects no commits': 
-	test_create_repo shallow-since-the-future &&
-	(
-	cd shallow-since-the-future &&
-	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
-	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
-	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
-	test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-since-the-future/.git/
-[main (root-commit) 4c9b2a3] one
- Author: A U Thor <author@example.com>
-[main e491164] two
- Author: A U Thor <author@example.com>
-[main 88fb92d] three
- Author: A U Thor <author@example.com>
-Cloning into '../shallow111'...
-fatal: no commits selected for shallow requests
-fatal: the remote end hung up unexpectedly
-ok 364 - clone shallow since selects no commits
-
-expecting success of 5500.365 'shallow since with commit graph and already-seen commit': 
-	test_create_repo shallow-since-graph &&
-	(
-	cd shallow-since-graph &&
-	test_commit base &&
-	test_commit main &&
-	git checkout -b other HEAD^ &&
-	test_commit other &&
-	git commit-graph write --reachable &&
-	git config core.commitGraph true &&
-
-	GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
-	0012command=fetch
-	$(echo "object-format=$(test_oid algo)" | packetize)
-	00010013deepen-since 1
-	$(echo "want $(git rev-parse other)" | packetize)
-	$(echo "have $(git rev-parse main)" | packetize)
-	0000
-	EOF
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-since-graph/.git/
-[main (root-commit) d3ae9fb] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main a2ca354] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.t
-Switched to a new branch 'other'
-[other fb3d247] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-warning: refname 'other' is ambiguous.
-warning: refname 'main' is ambiguous.
-ok 365 - shallow since with commit graph and already-seen commit
-
-expecting success of 5500.366 'shallow clone exclude tag two': 
-	test_create_repo shallow-exclude &&
-	(
-	cd shallow-exclude &&
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	git clone --shallow-exclude two "file://$(pwd)/." ../shallow12 &&
-	git -C ../shallow12 log --pretty=tformat:%s HEAD >actual &&
-	echo three >expected &&
-	test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-exclude/.git/
-[main (root-commit) 7d32f63] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main ea3a09e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 28cfb97] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Cloning into '../shallow12'...
-ok 366 - shallow clone exclude tag two
-
-expecting success of 5500.367 'fetch exclude tag one': 
-	git -C shallow12 fetch --shallow-exclude one origin &&
-	git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
-	test_write_lines three two >expected &&
-	test_cmp expected actual
-
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-exclude/.
- * [new tag]         two        -> two
-ok 367 - fetch exclude tag one
-
-expecting success of 5500.368 'fetch exclude tag one as revision': 
-	test_when_finished rm -f rev err &&
-	git -C shallow-exclude rev-parse one >rev &&
-	test_must_fail git -C shallow12 fetch --shallow-exclude $(cat rev) origin 2>err &&
-	grep "deepen-not is not a ref:" err
-
-fatal: git upload-pack: deepen-not is not a ref: deepen-not 7d32f632cd08248ef9383667ad19becddb14d93a
-ok 368 - fetch exclude tag one as revision
-
-expecting success of 5500.369 'fetching deepen': 
-	test_create_repo shallow-deepen &&
-	(
-	cd shallow-deepen &&
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	git clone --depth 1 "file://$(pwd)/." deepen &&
-	test_commit four &&
-	git -C deepen log --pretty=tformat:%s main >actual &&
-	echo three >expected &&
-	test_cmp expected actual &&
-	git -C deepen fetch --deepen=1 &&
-	git -C deepen log --pretty=tformat:%s origin/main >actual &&
-	cat >expected <<-\EOF &&
-	four
-	three
-	two
-	EOF
-	test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-deepen/.git/
-[main (root-commit) 7d32f63] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main ea3a09e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 28cfb97] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Cloning into 'deepen'...
-[main 8f42874] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-deepen/.
-   28cfb97..8f42874  main       -> origin/main
- * [new tag]         four       -> four
- * [new tag]         two        -> two
-ok 369 - fetching deepen
-
-expecting success of 5500.370 'use ref advertisement to prune "have" lines sent': 
-	test_negotiation_algorithm_default
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 4ec3e89] both_have_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_1.t
-Deleted tag 'both_have_1' (was 4ec3e89)
-[main 0e648cf] both_have_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_2.t
-Cloning into 'client'...
-done.
-[main c107eb0] server_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 server_has.t
-[main d1fea1f] client_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 client_has.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
-packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
-packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
-packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
-ok 370 - use ref advertisement to prune "have" lines sent
-
-expecting success of 5500.371 'same as last but with config overrides': 
-	test_negotiation_algorithm_default \
-		-c feature.experimental=true \
-		-c fetch.negotiationAlgorithm=consecutive
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 9df98d9] both_have_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_1.t
-Deleted tag 'both_have_1' (was 9df98d9)
-[main 63eca65] both_have_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both_have_2.t
-Cloning into 'client'...
-done.
-[main d7eee63] server_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 server_has.t
-[main 381c2f1] client_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 client_has.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
-packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
-packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
-packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
- * tag               server_has -> FETCH_HEAD
- * tag               both_have_2 -> FETCH_HEAD
-packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
-packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
-packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
-packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
-ok 371 - same as last but with config overrides
-
-expecting success of 5500.372 'ensure bogus fetch.negotiationAlgorithm yields error': 
-	test_when_finished rm -rf clientv0 &&
-	cp -r client clientv0 &&
-	test_must_fail git -C clientv0 --fetch.negotiationAlgorithm=bogus \
-		       fetch origin server_has both_have_2
-
-unknown option: --fetch.negotiationAlgorithm=bogus
-usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
-           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
-           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]
-           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]
-           [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]
-           <command> [<args>]
-ok 372 - ensure bogus fetch.negotiationAlgorithm yields error
-
-expecting success of 5500.373 'fetch-pack with fsckObjects and keep-file does not segfault': 
-	rm -rf server client &&
-	test_create_repo server &&
-	test_commit -C server one &&
-
-	test_create_repo client &&
-	git -c fetch.fsckObjects=true \
-	    -C client fetch-pack -k -k ../server HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) b73245b] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/client/.git/
-remote: Enumerating objects: 3, done.        
-remote: Counting objects:  33% (1/3)        
remote: Counting objects:  66% (2/3)        
remote: Counting objects: 100% (3/3)        
remote: Counting objects: 100% (3/3), done.        
-remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), done.
-b73245b187a878a9334892236f3e85ef70d56705 HEAD
-ok 373 - fetch-pack with fsckObjects and keep-file does not segfault
-
-expecting success of 5500.374 'filtering by size': 
-	rm -rf server client &&
-	test_create_repo server &&
-	test_commit -C server one &&
-	test_config -C server uploadpack.allowfilter 1 &&
-
-	test_create_repo client &&
-	GIT_TRACE2_EVENT=$(pwd)/client/trace2_event \
-		git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
-
-	# Ensure that object is not inadvertently fetched
-	commit=$(git -C server rev-parse HEAD) &&
-	blob=$(git hash-object server/one.t) &&
-	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
-	! grep "$blob" oids &&
-
-	grep \"fetch-info\".*\"filter\":\"blob:limit\" client/trace2_event
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 946f2fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/client/.git/
-remote: Enumerating objects: 2, done.        
-remote: Counting objects:  50% (1/2)        
remote: Counting objects: 100% (2/2)        
remote: Counting objects: 100% (2/2), done.        
-remote: Total 2 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
-946f2fc4f06e44010ec7f3ed95172068b132ee22 HEAD
-{"event":"data_json","sid":"20250209T065452.150905Z-Hcf858c9d-P001b066b/20250209T065452.153438Z-Hcf858c9d-P001b067f","thread":"main","time":"2025-02-09T06:54:52.154806Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.001589,"t_rel":0.001589,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":"blob:limit"}}
-ok 374 - filtering by size
-
-expecting success of 5500.375 'filtering by size has no effect if support for it is not advertised': 
-	rm -rf server client &&
-	test_create_repo server &&
-	test_commit -C server one &&
-
-	test_create_repo client &&
-	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
-
-	# Ensure that object is fetched
-	commit=$(git -C server rev-parse HEAD) &&
-	blob=$(git hash-object server/one.t) &&
-	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
-	grep "$blob" oids &&
-
-	test_grep "filtering not recognized by server" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 65824a5] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/client/.git/
-65824a5afab3ce868d5dbea30006cffd06f7d620 HEAD
-5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
-warning: filtering not recognized by server, ignoring
-ok 375 - filtering by size has no effect if support for it is not advertised
-
-expecting success of 5500.376 'fetch with --filter=blob:limit=0': 
-	fetch_filter_blob_limit_zero server server
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 592fb96] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'client'...
-done.
-[main d0a5bc4] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
- * [new ref]         HEAD       -> somewhere
- * [new tag]         two        -> two
-d0a5bc4f606380cade3e239ca5f3edd4dea821d9
-ok 376 - fetch with --filter=blob:limit=0
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 376 test(s)
-# SKIP no web server found at ''
-1..376
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5583-push-branches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5583-push-branches/.git/
-expecting success of 5583.1 'setup bare remote': 
-	git init --bare remote-1 &&
-	git -C remote-1 config gc.auto 0 &&
-	test_commit one &&
-	git push remote-1 HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5583-push-branches/remote-1/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-To remote-1
- * [new branch]      HEAD -> main
-ok 1 - setup bare remote
-
-expecting success of 5583.2 'setup different types of references': 
-	cat >refs <<-EOF &&
-	update refs/heads/branch-1 HEAD
-	update refs/heads/branch-2 HEAD
-	EOF
-
-	git tag -a -m "annotated" annotated-1 HEAD &&
-	git tag -a -m "annotated" annotated-2 HEAD &&
-	git update-ref --stdin < refs
-
-ok 2 - setup different types of references
-
-expecting success of 5583.3 '--all and --branches have the same behavior': 
-	test_when_finished "delete_refs remote-1 \
-			   refs/heads/branch-1 \
-			   refs/heads/branch-2" &&
-	git push remote-1 --all &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-	$commit refs/heads/branch-1
-	$commit refs/heads/branch-2
-	$commit refs/heads/main
-	EOF
-
-	git -C remote-1 show-ref --heads >actual.all &&
-	delete_refs remote-1 refs/heads/branch-1 refs/heads/branch-2 &&
-	git push remote-1 --branches &&
-	git -C remote-1 show-ref --heads >actual.branches &&
-	test_cmp actual.all actual.branches &&
-	test_cmp expect actual.all
-
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
-ok 3 - --all and --branches have the same behavior
-
-expecting success of 5583.4 '--all or --branches can not be combined with refspecs': 
-	test_must_fail git push remote-1 --all main >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches main >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "be combined with refspecs" actual.all
-
-fatal: --all can't be combined with refspecs
-ok 4 - --all or --branches can not be combined with refspecs
-
-expecting success of 5583.5 '--all or --branches can not be combined with --mirror': 
-	test_must_fail git push remote-1 --all --mirror >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches --mirror >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "cannot be used together" actual.all
-
-fatal: options '--all/--branches' and '--mirror' cannot be used together
-ok 5 - --all or --branches can not be combined with --mirror
-
-expecting success of 5583.6 '--all or --branches can not be combined with --tags': 
-	test_must_fail git push remote-1 --all --tags >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches --tags >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "cannot be used together" actual.all
-
-fatal: options '--tags' and '--all/--branches' cannot be used together
-ok 6 - --all or --branches can not be combined with --tags
-
-expecting success of 5583.7 '--all or --branches can not be combined with --delete': 
-	test_must_fail git push remote-1 --all --delete >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches --delete >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "cannot be used together" actual.all
-
-fatal: options '--delete' and '--all/--branches' cannot be used together
-ok 7 - --all or --branches can not be combined with --delete
-
-expecting success of 5583.8 '--all or --branches combines with --follow-tags have same behavior': 
-	test_when_finished "delete_refs remote-1 \
-			   refs/heads/branch-1 \
-			   refs/heads/branch-2 \
-			   refs/tags/annotated-1 \
-			   refs/tags/annotated-2" &&
-	git push remote-1 --all --follow-tags &&
-	git -C remote-1 show-ref > actual.all &&
-	cat >expect <<-EOF &&
-	$commit refs/heads/branch-1
-	$commit refs/heads/branch-2
-	$commit refs/heads/main
-	$(git rev-parse annotated-1) refs/tags/annotated-1
-	$(git rev-parse annotated-2) refs/tags/annotated-2
-	EOF
-
-	delete_refs remote-1 \
-		    refs/heads/branch-1 \
-		    refs/heads/branch-2 \
-		    refs/tags/annotated-1 \
-		    refs/tags/annotated-2 &&
-	git push remote-1 --branches --follow-tags &&
-	git -C remote-1 show-ref >actual.branches &&
-	test_cmp actual.all actual.branches &&
-	test_cmp expect actual.all
-
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
- * [new tag]         annotated-1 -> annotated-1
- * [new tag]         annotated-2 -> annotated-2
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
- * [new tag]         annotated-1 -> annotated-1
- * [new tag]         annotated-2 -> annotated-2
-ok 8 - --all or --branches combines with --follow-tags have same behavior
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5602-clone-remote-exec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5602-clone-remote-exec/.git/
-expecting success of 5602.1 'setup': 
-	echo "#!/bin/sh" > not_ssh &&
-	echo "echo \"\$*\" > not_ssh_output" >> not_ssh &&
-	echo "exit 1" >> not_ssh &&
-	chmod +x not_ssh
-
-ok 1 - setup
-
-expecting success of 5602.2 'clone calls git upload-pack unqualified with no -u option': 
-	test_must_fail env GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk &&
-	echo "localhost git-upload-pack '/path/to/repo'" >expected &&
-	test_cmp expected not_ssh_output
-
-Cloning into 'junk'...
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-ok 2 - clone calls git upload-pack unqualified with no -u option
-
-expecting success of 5602.3 'clone calls specified git upload-pack with -u option': 
-	test_must_fail env GIT_SSH=./not_ssh \
-		git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk &&
-	echo "localhost ./something/bin/git-upload-pack '/path/to/repo'" >expected &&
-	test_cmp expected not_ssh_output
-
-Cloning into 'junk'...
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-ok 3 - clone calls specified git upload-pack with -u option
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5533-push-cas.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/.git/
-expecting success of 5533.1 'setup': 
-	# create template repository
-	test_commit A &&
-	test_commit B &&
-	test_commit C
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
-
-expecting success of 5533.2 'push to update (protected)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		test_must_fail git push --force-with-lease=main:main origin main 2>err &&
-		grep "stale info" err
-	) &&
-	git ls-remote . refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- ! [rejected]        main -> main (stale info)
-ok 2 - push to update (protected)
-
-expecting success of 5533.3 'push to update (protected, forced)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force --force-with-lease=main:main origin main 2>err &&
-		grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- + 35a8500...be8f64f main -> main (forced update)
-ok 3 - push to update (protected, forced)
-
-expecting success of 5533.4 'push to update (protected, tracking)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout main &&
-		test_commit D &&
-		git checkout HEAD^0
-	) &&
-	git ls-remote src refs/heads/main >expect &&
-	(
-		cd dst &&
-		test_commit E &&
-		git ls-remote . refs/remotes/origin/main >expect &&
-		test_must_fail git push --force-with-lease=main origin main &&
-		git ls-remote . refs/remotes/origin/main >actual &&
-		test_cmp expect actual
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at be8f64f D
-[main 3e7056f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- ! [rejected]        main -> main (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
-ok 4 - push to update (protected, tracking)
-
-expecting success of 5533.5 'push to update (protected, tracking, forced)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout main &&
-		test_commit D &&
-		git checkout HEAD^0
-	) &&
-	(
-		cd dst &&
-		test_commit E &&
-		git ls-remote . refs/remotes/origin/main >expect &&
-		git push --force --force-with-lease=main origin main
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at be8f64f D
-[main 3e7056f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- + be8f64f...3e7056f main -> main (forced update)
-ok 5 - push to update (protected, tracking, forced)
-
-expecting success of 5533.6 'push to update (allowed)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force-with-lease=main:main^ origin main
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
-   35a8500..be8f64f  main -> main
-ok 6 - push to update (allowed)
-
-expecting success of 5533.7 'push to update (allowed, tracking)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force-with-lease=main origin main 2>err &&
-		! grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-ok 7 - push to update (allowed, tracking)
-
-expecting success of 5533.8 'push to update (allowed even though no-ff)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git reset --hard HEAD^ &&
-		test_commit D &&
-		git push --force-with-lease=main origin main 2>err &&
-		grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/main >expect &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-HEAD is now at d9df450 B
-[main 3e6e33e] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- + 35a8500...3e6e33e main -> main (forced update)
-ok 8 - push to update (allowed even though no-ff)
-
-expecting success of 5533.9 'push to delete (protected)': 
-	setup_srcdst_basic &&
-	git ls-remote src refs/heads/main >expect &&
-	(
-		cd dst &&
-		test_must_fail git push --force-with-lease=main:main^ origin :main
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- ! [rejected]        (delete) -> main (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
-ok 9 - push to delete (protected)
-
-expecting success of 5533.10 'push to delete (protected, forced)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git push --force --force-with-lease=main:main^ origin :main
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_must_be_empty actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- - [deleted]         main
-ok 10 - push to delete (protected, forced)
-
-expecting success of 5533.11 'push to delete (allowed)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git push --force-with-lease=main origin :main 2>err &&
-		grep deleted err
-	) &&
-	git ls-remote src refs/heads/main >actual &&
-	test_must_be_empty actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
- - [deleted]         main
-ok 11 - push to delete (allowed)
-
-expecting success of 5533.12 'cover everything with default force-with-lease (protected)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git branch nain main^
-	) &&
-	git ls-remote src refs/heads/\* >expect &&
-	(
-		cd dst &&
-		test_must_fail git push --force-with-lease origin main main:nain
-	) &&
-	git ls-remote src refs/heads/\* >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- ! [rejected]        main -> nain (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
-ok 12 - cover everything with default force-with-lease (protected)
-
-expecting success of 5533.13 'cover everything with default force-with-lease (allowed)': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git branch nain main^
-	) &&
-	(
-		cd dst &&
-		git fetch &&
-		git push --force-with-lease origin main main:nain
-	) &&
-	git ls-remote dst refs/heads/main |
-	sed -e "s/main/nain/" >expect &&
-	git ls-remote src refs/heads/nain >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- * [new branch]      nain       -> origin/nain
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
-   d9df450..35a8500  main -> nain
-ok 13 - cover everything with default force-with-lease (allowed)
-
-expecting success of 5533.14 'new branch covered by force-with-lease': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git branch branch main &&
-		git push --force-with-lease=branch origin branch
-	) &&
-	git ls-remote dst refs/heads/branch >expect &&
-	git ls-remote src refs/heads/branch >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- * [new branch]      branch -> branch
-ok 14 - new branch covered by force-with-lease
-
-expecting success of 5533.15 'new branch covered by force-with-lease (explicit)': 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git branch branch main &&
-		git push --force-with-lease=branch: origin branch
-	) &&
-	git ls-remote dst refs/heads/branch >expect &&
-	git ls-remote src refs/heads/branch >actual &&
-	test_cmp expect actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- * [new branch]      branch -> branch
-ok 15 - new branch covered by force-with-lease (explicit)
-
-expecting success of 5533.16 'new branch already exists': 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout -b branch main &&
-		test_commit F
-	) &&
-	(
-		cd dst &&
-		git branch branch main &&
-		test_must_fail git push --force-with-lease=branch: origin branch
-	)
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: switching to 'HEAD^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 35a8500 C
-Switched to a new branch 'branch'
-[branch b6ba73d] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src
- ! [rejected]        branch -> branch (stale info)
-error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src'
-ok 16 - new branch already exists
-
-expecting success of 5533.17 'background updates of REMOTE can be mitigated with a non-updated REMOTE-push': 
-	rm -rf src dst &&
-	git init --bare src.bare &&
-	test_when_finished "rm -rf src.bare" &&
-	git clone --no-local src.bare dst &&
-	test_when_finished "rm -rf dst" &&
-	(
-		cd dst &&
-		test_commit G &&
-		git remote add origin-push ../src.bare &&
-		git push origin-push main:main
-	) &&
-	git clone --no-local src.bare dst2 &&
-	test_when_finished "rm -rf dst2" &&
-	(
-		cd dst2 &&
-		test_commit H &&
-		git push
-	) &&
-	(
-		cd dst &&
-		test_commit I &&
-		git fetch origin &&
-		test_must_fail git push --force-with-lease origin-push &&
-		git fetch origin-push &&
-		git push --force-with-lease origin-push
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src.bare/
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) c0a8953] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-To ../src.bare
- * [new branch]      main -> main
-Cloning into 'dst2'...
-[main d19f4d4] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src.bare
-   c0a8953..d19f4d4  main -> main
-[main 91bb270] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/src.bare
- * [new branch]      main       -> origin/main
-To ../src.bare
- ! [rejected]        main -> main (stale info)
-error: failed to push some refs to '../src.bare'
-From ../src.bare
-   c0a8953..d19f4d4  main       -> origin-push/main
-To ../src.bare
- + d19f4d4...91bb270 main -> main (forced update)
-ok 17 - background updates of REMOTE can be mitigated with a non-updated REMOTE-push
-
-expecting success of 5533.18 'background updates to remote can be mitigated with "--force-if-includes"': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	git ls-remote dst refs/heads/main >expect.main &&
-	git ls-remote dst refs/heads/branch >expect.branch &&
-	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git fetch --all &&
-		test_must_fail git push --force-with-lease --force-if-includes --all
-	) &&
-	git ls-remote dst refs/heads/main >actual.main &&
-	git ls-remote dst refs/heads/branch >actual.branch &&
-	test_cmp expect.main actual.main &&
-	test_cmp expect.branch actual.branch
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   157d38b..b995a30  main       -> origin/main
-   b63fbb1..9cdccac  branch     -> origin/branch
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- ! [rejected]        branch -> branch (remote ref updated since checkout)
- ! [rejected]        main -> main (remote ref updated since checkout)
-error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst'
-hint: Updates were rejected because the tip of the remote-tracking branch has
-hint: been updated since the last checkout. If you want to integrate the
-hint: remote changes, use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-ok 18 - background updates to remote can be mitigated with "--force-if-includes"
-
-expecting success of 5533.19 'background updates to remote can be mitigated with "push.useForceIfIncludes"': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	git ls-remote dst refs/heads/main >expect.main &&
-	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git fetch --all &&
-		git config --local push.useForceIfIncludes true &&
-		test_must_fail git push --force-with-lease=main origin main
-	) &&
-	git ls-remote dst refs/heads/main >actual.main &&
-	test_cmp expect.main actual.main
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   157d38b..b995a30  main       -> origin/main
-   b63fbb1..9cdccac  branch     -> origin/branch
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- ! [rejected]        main -> main (remote ref updated since checkout)
-error: failed to push some refs to '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst'
-hint: Updates were rejected because the tip of the remote-tracking branch has
-hint: been updated since the last checkout. If you want to integrate the
-hint: remote changes, use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-ok 19 - background updates to remote can be mitigated with "push.useForceIfIncludes"
-
-expecting success of 5533.20 '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	git ls-remote dst refs/heads/main >expect.main &&
-	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		remote_head="$(git rev-parse refs/remotes/origin/main)" &&
-		git fetch --all &&
-		test_must_fail git push --force-if-includes --force-with-lease="main:$remote_head" 2>err &&
-		grep "stale info" err
-	) &&
-	git ls-remote dst refs/heads/main >actual.main &&
-	test_cmp expect.main actual.main
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   157d38b..b995a30  main       -> origin/main
-   b63fbb1..9cdccac  branch     -> origin/branch
- ! [rejected]        main -> main (stale info)
-ok 20 - "--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"
-
-expecting success of 5533.21 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git pull --rebase origin main &&
-		git push --force-if-includes --force-with-lease="main"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * branch            main       -> FETCH_HEAD
-   157d38b..b995a30  main       -> origin/main
-Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   b995a30..7c16010  main -> main
-ok 21 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase")
-
-expecting success of 5533.22 '"--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	(
-		cd src &&
-		git switch branch &&
-		test_commit I &&
-		git switch main &&
-		test_commit J &&
-		git pull --rebase origin main &&
-		git rebase --onto HEAD~4 HEAD~1 &&
-		git push --force-if-includes --force-with-lease="main"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-[branch da1510b] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main be2465f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * branch            main       -> FETCH_HEAD
-   157d38b..b995a30  main       -> origin/main
-Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
-Rebasing (1/1)
Successfully rebased and updated refs/heads/main.
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- + b995a30...e9c7db1 main -> main (forced update)
-ok 22 - "--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)
-
-expecting success of 5533.23 '"--force-if-includes" should allow deletes': 
-	setup_src_dup_dst &&
-	test_when_finished "rm -fr dst src dup" &&
-	(
-		cd src &&
-		git switch branch &&
-		git pull --rebase origin branch &&
-		git push --force-if-includes --force-with-lease="branch" origin :branch
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst/
-Cloning into 'src'...
-warning: You appear to have cloned an empty repository.
-Cloning into 'dup'...
-warning: You appear to have cloned an empty repository.
-[main (root-commit) 112d1ac] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main f9a2dac] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 157d38b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main -> main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      main       -> origin/main
-Switched to a new branch 'branch'
-[branch ded492b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch b63fbb1] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch -> branch
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * [new branch]      branch     -> origin/branch
-branch 'branch' set up to track 'origin/branch'.
-Current branch main is up to date.
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 00b6961] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[main b995a30] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'branch'
-[branch 9cdccac] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
-   b63fbb1..9cdccac  branch -> branch
-   157d38b..b995a30  main -> main
-Switched to branch 'branch'
-Your branch is up to date with 'origin/branch'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- * branch            branch     -> FETCH_HEAD
-   b63fbb1..9cdccac  branch     -> origin/branch
-Updating b63fbb1..9cdccac
-Fast-forward
- H.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5533-push-cas/dst
- - [deleted]         branch
-ok 23 - "--force-if-includes" should allow deletes
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5600-clone-fail-cleanup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5600-clone-fail-cleanup/.git/
-expecting success of 5600.1 'clone of non-existent source should fail': 
-	test_must_fail git clone foo bar
-
-fatal: repository 'foo' does not exist
-ok 1 - clone of non-existent source should fail
-
-expecting success of 5600.2 'failed clone should not leave a directory': 
-	test_path_is_missing bar
-
-ok 2 - failed clone should not leave a directory
-
-expecting success of 5600.3 'create a repo to clone': 
-	test_create_repo foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5600-clone-fail-cleanup/foo/.git/
-ok 3 - create a repo to clone
-
-expecting success of 5600.4 'create objects in repo for later corruption': 
-	test_commit -C foo file &&
-	git -C foo checkout --detach &&
-	test_commit -C foo detached
-
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-HEAD is now at 4c1911f file
-[detached HEAD 3928560] detached
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 detached.t
-ok 4 - create objects in repo for later corruption
-
-expecting success of 5600.5 'clone of non-existent (relative to $PWD) source should fail': 
-	test_must_fail git clone ../foo baz
-
-fatal: repository '../foo' does not exist
-ok 5 - clone of non-existent (relative to $PWD) source should fail
-
-expecting success of 5600.6 'clone should work now that source exists': 
-	git clone foo bar
-
-Cloning into 'bar'...
-done.
-Note: switching to '39285601caec51931a713514c1133dccc9cc7e13'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git 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 6 - clone should work now that source exists
-
-expecting success of 5600.7 'successful clone must leave the directory': 
-	test_path_is_dir bar
-
-ok 7 - successful clone must leave the directory
-
-expecting success of 5600.8 'failed clone --separate-git-dir should not leave any directories': 
-	corrupt_repo &&
-	test_must_fail git clone --separate-git-dir gitdir foo worktree &&
-	test_path_is_missing gitdir &&
-	test_path_is_missing worktree
-
-Cloning into 'worktree'...
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
-ok 8 - failed clone --separate-git-dir should not leave any directories
-
-expecting success of 5600.9 'failed clone into empty leaves directory (vanilla)': 
-	mkdir -p empty &&
-	corrupt_repo &&
-	test_must_fail git clone foo empty &&
-	test_dir_is_empty empty
-
-Cloning into 'empty'...
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
-ok 9 - failed clone into empty leaves directory (vanilla)
-
-expecting success of 5600.10 'failed clone into empty leaves directory (bare)': 
-	mkdir -p empty &&
-	corrupt_repo &&
-	test_must_fail git clone --bare foo empty &&
-	test_dir_is_empty empty
-
-Cloning into bare repository 'empty'...
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
-ok 10 - failed clone into empty leaves directory (bare)
-
-expecting success of 5600.11 'failed clone into empty leaves directory (separate)': 
-	mkdir -p empty-git empty-wt &&
-	corrupt_repo &&
-	test_must_fail git clone --separate-git-dir empty-git foo empty-wt &&
-	test_dir_is_empty empty-git &&
-	test_dir_is_empty empty-wt
-
-Cloning into 'empty-wt'...
-fatal: empty-git already exists
-ok 11 - failed clone into empty leaves directory (separate)
-
-expecting success of 5600.12 'failed clone into empty leaves directory (separate, git)': 
-	mkdir -p empty-git &&
-	corrupt_repo &&
-	test_must_fail git clone --separate-git-dir empty-git foo no-wt &&
-	test_dir_is_empty empty-git &&
-	test_path_is_missing no-wt
-
-Cloning into 'no-wt'...
-fatal: empty-git already exists
-ok 12 - failed clone into empty leaves directory (separate, git)
-
-expecting success of 5600.13 'failed clone into empty leaves directory (separate, wt)': 
-	mkdir -p empty-wt &&
-	corrupt_repo &&
-	test_must_fail git clone --separate-git-dir no-git foo empty-wt &&
-	test_path_is_missing no-git &&
-	test_dir_is_empty empty-wt
-
-Cloning into 'empty-wt'...
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 39285601caec51931a713514c1133dccc9cc7e13
-ok 13 - failed clone into empty leaves directory (separate, wt)
-
-expecting success of 5600.14 'transport failure cleans up directory': 
-	test_must_fail git clone --no-local \
-		-u "f() { git-upload-pack \"\$@\"; return 1; }; f" \
-		foo broken-clone &&
-	test_path_is_missing broken-clone
-
-Cloning into 'broken-clone'...
-fatal: remote transport reported error
-ok 14 - transport failure cleans up directory
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5582-fetch-negative-refspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5582-fetch-negative-refspec/.
- * branch            main       -> FETCH_HEAD
-fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-never-fetch-tag
-c5395f864a4757fc219a4848a19568f14918687f
-fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/prefetch/bogus/ignore
-ok 14 - --prefetch correctly modifies refspecs
-
-expecting success of 5582.15 '--prefetch succeeds when refspec becomes empty': 
-	git checkout bogus/fetched &&
-	test_commit extra &&
-
-	git -C one config --unset-all remote.origin.fetch &&
-	git -C one config --unset branch.main.remote &&
-	git -C one config remote.origin.fetch "+refs/tags/extra" &&
-	git -C one config remote.origin.skipfetchall true &&
-	git -C one config remote.origin.tagopt "--no-tags" &&
-
-	git -C one fetch --prefetch
-
-Switched to branch 'bogus/fetched'
-[bogus/fetched 8d8169a] extra
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-ok 15 - --prefetch succeeds when refspec becomes empty
-
-expecting success of 5582.16 '--prefetch succeeds with empty command line refspec': 
-	git -C one fetch --prefetch origin +refs/tags/extra
-
-ok 16 - --prefetch succeeds with empty command line refspec
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5570-git-daemon.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/.git/
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-expecting success of 5570.1 'daemon rejects invalid --init-timeout values': 
-	for arg in "3a" "-3"
-	do
-		test_must_fail git daemon --init-timeout="$arg" 2>err &&
-		test_grep "fatal: invalid init-timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
-		return 1
-	done
-
-fatal: invalid init-timeout '3a', expecting a non-negative integer
-fatal: invalid init-timeout '-3', expecting a non-negative integer
-ok 1 - daemon rejects invalid --init-timeout values
-
-expecting success of 5570.2 'daemon rejects invalid --timeout values': 
-	for arg in "3a" "-3"
-	do
-		test_must_fail git daemon --timeout="$arg" 2>err &&
-		test_grep "fatal: invalid timeout ${SQ}$arg${SQ}, expecting a non-negative integer" err ||
-		return 1
-	done
-
-fatal: invalid timeout '3a', expecting a non-negative integer
-fatal: invalid timeout '-3', expecting a non-negative integer
-ok 2 - daemon rejects invalid --timeout values
-
-expecting success of 5570.3 'daemon rejects invalid --max-connections values': 
-	arg=3a &&
-	test_must_fail git daemon --max-connections=3a 2>err &&
-	test_grep "fatal: invalid max-connections ${SQ}$arg${SQ}, expecting an integer" err
-
-fatal: invalid max-connections '3a', expecting an integer
-ok 3 - daemon rejects invalid --max-connections values
-
-Starting git daemon ...
-[1768954] Ready to rumble
-expecting success of 5570.4 'setup repository': 
-	git config push.default matching &&
-	echo content >file &&
-	git add file &&
-	git commit -m one
-
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 4 - setup repository
-
-expecting success of 5570.5 'create git-accessible bare repository': 
-	mkdir "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	 git --bare init &&
-	 : >git-daemon-export-ok
-	) &&
-	git remote add public "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public main:main
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git/
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git
- * [new branch]      main -> main
-ok 5 - create git-accessible bare repository
-
-expecting success of 5570.6 'clone git repository': 
-	git clone -v "$GIT_DAEMON_URL/repo.git" clone 2>stderr &&
-	check_verbose_connect &&
-	test_cmp file clone/file
-
-[1769324] Connection from 127.0.0.1:58480
-[1769324] Extended attribute "host": 127.0.0.1:5570
-[1769324] Extended attribute "protocol": version=2
-[1769324] Request upload-pack for '/repo.git'
-[1768954] [1769324] Disconnected
-Looking up 127.0.0.1 ... done.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-Looking up 127.0.0.1 ... done.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-ok 6 - clone git repository
-
-expecting success of 5570.7 'fetch changes via git protocol': 
-	echo content >>file &&
-	git commit -a -m two &&
-	git push public &&
-	(cd clone && git pull -v) 2>stderr &&
-	check_verbose_connect &&
-	test_cmp file clone/file
-
-[main 5647d5f] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git
-   f39a923..5647d5f  main -> main
-[1770180] Connection from 127.0.0.1:58482
-[1770180] Extended attribute "host": 127.0.0.1:5570
-[1770180] Extended attribute "protocol": version=2
-[1770180] Request upload-pack for '/repo.git'
-[1768954] [1770180] Disconnected
-Updating f39a923..5647d5f
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-Looking up 127.0.0.1 ... done.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-Looking up 127.0.0.1 ... done.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-ok 7 - fetch changes via git protocol
-
-expecting success of 5570.8 'no-op fetch -v stderr is as expected': 
-	(cd clone && git fetch -v) 2>stderr &&
-	check_verbose_connect
-
-[1770802] Connection from 127.0.0.1:58496
-[1770802] Extended attribute "host": 127.0.0.1:5570
-[1770802] Extended attribute "protocol": version=2
-[1770802] Request upload-pack for '/repo.git'
-[1768954] [1770802] Disconnected
-Looking up 127.0.0.1 ... done.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-Looking up 127.0.0.1 ... done.
-Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
-ok 8 - no-op fetch -v stderr is as expected
-
-expecting success of 5570.9 'no-op fetch without "-v" is quiet': 
-	(cd clone && git fetch 2>../stderr) &&
-	test_must_be_empty stderr
-
-[1771083] Connection from 127.0.0.1:58502
-[1771083] Extended attribute "host": 127.0.0.1:5570
-[1771083] Extended attribute "protocol": version=2
-[1771083] Request upload-pack for '/repo.git'
-[1768954] [1771083] Disconnected
-ok 9 - no-op fetch without "-v" is quiet
-
-expecting success of 5570.10 'remote detects correct HEAD': 
-	git push public main:other &&
-	(cd clone &&
-	 git remote set-head -d origin &&
-	 git remote set-head -a origin &&
-	 git symbolic-ref refs/remotes/origin/HEAD > output &&
-	 echo refs/remotes/origin/main > expect &&
-	 test_cmp expect output
-	)
-
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git
- * [new branch]      main -> other
-[1771441] Connection from 127.0.0.1:58516
-[1771441] Extended attribute "host": 127.0.0.1:5570
-[1771441] Extended attribute "protocol": version=2
-[1771441] Request upload-pack for '/repo.git'
-'origin/HEAD' is now created and points to 'main'
-[1768954] [1771441] Disconnected
-ok 10 - remote detects correct HEAD
-
-expecting success of 5570.11 'prepare pack objects': 
-	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git &&
-	 git --bare repack -a -d
-	)
-
-ok 11 - prepare pack objects
-
-expecting success of 5570.12 'fetch notices corrupt pack': 
-	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
-	 p=$(ls objects/pack/pack-*.pack) &&
-	 chmod u+w $p &&
-	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
-	) &&
-	mkdir repo_bad1.git &&
-	(cd repo_bad1.git &&
-	 git --bare init &&
-	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad1.git" &&
-	 test 0 = $(ls objects/pack/pack-*.pack | wc -l)
-	)
-
-1+0 records in
-1+0 records out
-256 bytes copied, 0.000274521 s, 933 kB/s
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo_bad1.git/
-[1771796] Connection from 127.0.0.1:58526
-[1771796] Extended attribute "host": 127.0.0.1:5570
-[1771796] Extended attribute "protocol": version=2
-[1771796] Request upload-pack for '/repo_bad1.git'
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[1771796] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[1768954] [1771796] Disconnected (with error)
-fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-ls: cannot access 'objects/pack/pack-*.pack': No such file or directory
-ok 12 - fetch notices corrupt pack
-
-expecting success of 5570.13 'fetch notices corrupt idx': 
-	cp -R "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_pack.git "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
-	(cd "$GIT_DAEMON_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
-	 rm -f objects/pack/multi-pack-index &&
-	 p=$(ls objects/pack/pack-*.idx) &&
-	 chmod u+w $p &&
-	 printf %0256d 0 | dd of=$p bs=256 count=1 seek=1 conv=notrunc
-	) &&
-	mkdir repo_bad2.git &&
-	(cd repo_bad2.git &&
-	 git --bare init &&
-	 test_must_fail git --bare fetch "$GIT_DAEMON_URL/repo_bad2.git" &&
-	 test 0 = $(ls objects/pack | wc -l)
-	)
-
-1+0 records in
-1+0 records out
-256 bytes copied, 3.704e-05 s, 6.9 MB/s
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo_bad2.git/
-[1772125] Connection from 127.0.0.1:58530
-[1772125] Extended attribute "host": 127.0.0.1:5570
-[1772125] Extended attribute "protocol": version=2
-[1772125] Request upload-pack for '/repo_bad2.git'
-fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[1772125] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[1768954] [1772125] Disconnected (with error)
-ok 13 - fetch notices corrupt idx
-
-expecting success of 5570.14 'client refuses to ask for repo with newline': 
-	test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr &&
-	test_grep newline.is.forbidden stderr
-
-fatal: newline is forbidden in git:// hosts and repo paths
-ok 14 - client refuses to ask for repo with newline
+expecting success of 5500.255 'fetch-pack --diag-url ./[:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 255 - fetch-pack --diag-url ./[:re:po
 
-expecting success of 5570.15 'clone non-existent': test_remote_error    'access denied or repository not exported' clone nowhere.git
-[1772452] Connection from 127.0.0.1:58538
-[1772452] Extended attribute "host": 127.0.0.1:5570
-[1772452] Extended attribute "protocol": version=2
-[1772452] Request upload-pack for '/nowhere.git'
-[1772452] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[1768954] [1772452] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /nowhere.git
-ok 15 - clone non-existent
+expecting success of 5500.256 'fetch-pack --diag-url ./file:[/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 256 - fetch-pack --diag-url ./file:[/~re:po
 
-expecting success of 5570.16 'push disabled': test_remote_error    'access denied or repository not exported' push  repo.git main
-[1772506] Connection from 127.0.0.1:58554
-[1772506] Extended attribute "host": 127.0.0.1:5570
-[1772506] Request receive-pack for '/repo.git'
-[1772506] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git'
-[1768954] [1772506] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /repo.git
-ok 16 - push disabled
+expecting success of 5500.257 'fetch-pack --diag-url ./[:aa:re:po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 257 - fetch-pack --diag-url ./[:aa:re:po
 
-expecting success of 5570.17 'read access denied': test_remote_error -x 'access denied or repository not exported' fetch repo.git
-[1772634] Connection from 127.0.0.1:58562
-[1772634] Extended attribute "host": 127.0.0.1:5570
-[1772634] Extended attribute "protocol": version=2
-[1772634] Request upload-pack for '/repo.git'
-[1772634] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[1768954] [1772634] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /repo.git
-ok 17 - read access denied
+expecting success of 5500.258 'fetch-pack --diag-url ./file:[:aa/~re:po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 258 - fetch-pack --diag-url ./file:[:aa/~re:po
 
-expecting success of 5570.18 'not exported': test_remote_error -n 'access denied or repository not exported' fetch repo.git
-[1772711] Connection from 127.0.0.1:58570
-[1772711] Extended attribute "host": 127.0.0.1:5570
-[1772711] Extended attribute "protocol": version=2
-[1772711] Request upload-pack for '/repo.git'
-[1772711] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[1768954] [1772711] Disconnected (with error)
-fatal: remote error: access denied or repository not exported: /repo.git
-ok 18 - not exported
+expecting success of 5500.259 'fetch-pack --diag-url host:re:po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 259 - fetch-pack --diag-url host:re:po
 
-Stopping git daemon ...
-Terminated
-Starting git daemon ...
-[1772818] Ready to rumble
-expecting success of 5570.19 'clone non-existent': test_remote_error    'no such repository'      clone nowhere.git
-[1772850] Connection from 127.0.0.1:58572
-[1772850] Extended attribute "host": 127.0.0.1:5570
-[1772850] Extended attribute "protocol": version=2
-[1772850] Request upload-pack for '/nowhere.git'
-[1772850] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[1772818] [1772850] Disconnected (with error)
-fatal: remote error: no such repository: /nowhere.git
-ok 19 - clone non-existent
+expecting success of 5500.260 'fetch-pack --diag-url host:/~re:po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 260 - fetch-pack --diag-url host:/~re:po
 
-expecting success of 5570.20 'push disabled': test_remote_error    'service not enabled'     push  repo.git main
-[1772957] Connection from 127.0.0.1:58588
-[1772957] Extended attribute "host": 127.0.0.1:5570
-[1772957] Request receive-pack for '/repo.git'
-[1772957] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git'
-[1772818] [1772957] Disconnected (with error)
-fatal: remote error: service not enabled: /repo.git
-ok 20 - push disabled
+expecting success of 5500.261 'fetch-pack --diag-url [::1]:re:po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 261 - fetch-pack --diag-url [::1]:re:po
 
-expecting success of 5570.21 'read access denied': test_remote_error -x 'no such repository'      fetch repo.git
-[1773037] Connection from 127.0.0.1:58594
-[1773037] Extended attribute "host": 127.0.0.1:5570
-[1773037] Extended attribute "protocol": version=2
-[1773037] Request upload-pack for '/repo.git'
-[1773037] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[1772818] [1773037] Disconnected (with error)
-fatal: remote error: no such repository: /repo.git
-ok 21 - read access denied
+expecting success of 5500.262 'fetch-pack --diag-url [::1]:/~re:po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 262 - fetch-pack --diag-url [::1]:/~re:po
 
-expecting success of 5570.22 'not exported': test_remote_error -n 'repository not exported' fetch repo.git
-[1773087] Connection from 127.0.0.1:58610
-[1773087] Extended attribute "host": 127.0.0.1:5570
-[1773087] Extended attribute "protocol": version=2
-[1773087] Request upload-pack for '/repo.git'
-[1773087] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[1772818] [1773087] Disconnected (with error)
-fatal: remote error: repository not exported: /repo.git
-ok 22 - not exported
+expecting success of 5500.263 'fetch-pack --diag-url ssh+git://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 263 - fetch-pack --diag-url ssh+git://host/re/po
 
-Stopping git daemon ...
-Terminated
-Starting git daemon ...
-[1773192] Ready to rumble
-expecting success of 5570.23 'access repo via interpolated hostname': 
-	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/localhost/interp.git" &&
-	git init --bare "$repo" &&
-	git push "$repo" HEAD &&
-	>"$repo"/git-daemon-export-ok &&
-	GIT_OVERRIDE_VIRTUAL_HOST=localhost \
-		git ls-remote "$GIT_DAEMON_URL/interp.git" &&
-	GIT_OVERRIDE_VIRTUAL_HOST=LOCALHOST \
-		git ls-remote "$GIT_DAEMON_URL/interp.git"
+expecting success of 5500.264 'fetch-pack --diag-url ssh+git://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 264 - fetch-pack --diag-url ssh+git://host/~re/po
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
- * [new branch]      HEAD -> main
-[1773384] Connection from 127.0.0.1:58616
-[1773384] Extended attribute "host": localhost
-[1773384] Extended attribute "protocol": version=2
-[1773384] Request upload-pack for '/interp.git'
-[1773384] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
-[1773192] [1773384] Disconnected
-[1773674] Connection from 127.0.0.1:34554
-[1773674] Extended attribute "host": LOCALHOST
-[1773674] Extended attribute "protocol": version=2
-[1773674] Request upload-pack for '/interp.git'
-[1773674] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
-5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
-ok 23 - access repo via interpolated hostname
+expecting success of 5500.265 'fetch-pack --diag-url ssh+git://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 265 - fetch-pack --diag-url ssh+git://host:/re/po
 
-expecting success of 5570.24 'hostname cannot break out of directory': 
-	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
-	git init --bare "$repo" &&
-	git push "$repo" HEAD &&
-	>"$repo"/git-daemon-export-ok &&
-	test_must_fail \
-		env GIT_OVERRIDE_VIRTUAL_HOST=.. \
-		git ls-remote "$GIT_DAEMON_URL/escape.git"
+expecting success of 5500.266 'fetch-pack --diag-url ssh+git://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 266 - fetch-pack --diag-url ssh+git://host:/~re/po
 
-[1773192] [1773674] Disconnected
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/escape.git/
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/../escape.git
- * [new branch]      HEAD -> main
-[1774083] Connection from 127.0.0.1:34556
-[1774083] Extended attribute "host": ..
-[1774083] Extended attribute "protocol": version=2
-[1774083] Request upload-pack for '/escape.git'
-[1774083] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo//escape.git'
-[1774083] '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
-fatal: remote error: access denied or repository not exported: /escape.git
-ok 24 - hostname cannot break out of directory
+expecting success of 5500.267 'fetch-pack --diag-url ssh+git://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 267 - fetch-pack --diag-url ssh+git://user@host/re/po
 
-[1773192] [1774083] Disconnected (with error)
-checking prerequisite: FAKENC
+expecting success of 5500.268 'fetch-pack --diag-url ssh+git://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 268 - fetch-pack --diag-url ssh+git://user@host/~re/po
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
-	perl -MIO::Socket::INET -e "exit 0"
+expecting success of 5500.269 'fetch-pack --diag-url ssh+git://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 269 - fetch-pack --diag-url ssh+git://user@host:/re/po
 
-)
-prerequisite FAKENC ok
-expecting success of 5570.25 'hostname interpolation works after LF-stripping': 
-	{
-		printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw &&
-		printf "0000"
-	} >input &&
-	fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
-	depacketize <output >output.raw &&
+expecting success of 5500.270 'fetch-pack --diag-url ssh+git://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 270 - fetch-pack --diag-url ssh+git://user@host:/~re/po
 
-	# just pick out the value of main, which avoids any protocol
-	# particulars
-	perl -lne "print \$1 if m{^(\\S+) refs/heads/main}" <output.raw >actual &&
-	git -C "$repo" rev-parse main >expect &&
-	test_cmp expect actual
+expecting success of 5500.271 'fetch-pack --diag-url ssh+git://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 271 - fetch-pack --diag-url ssh+git://user@[::1]/re/po
 
-[1774287] Connection from 127.0.0.1:34560
-[1774287] Extended attribute "host": localhost
-[1774287] Request upload-pack for '/interp.git'
-[1774287] Interpolated dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-[1773192] [1774287] Disconnected
-ok 25 - hostname interpolation works after LF-stripping
+expecting success of 5500.272 'fetch-pack --diag-url ssh+git://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 272 - fetch-pack --diag-url ssh+git://user@[::1]/~re/po
 
-Stopping git daemon ...
-Terminated
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5574-fetch-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+expecting success of 5500.273 'fetch-pack --diag-url ssh+git://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 273 - fetch-pack --diag-url ssh+git://user@[::1]:/re/po
 
-	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 &&
+expecting success of 5500.274 'fetch-pack --diag-url ssh+git://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 274 - fetch-pack --diag-url ssh+git://user@[::1]:/~re/po
 
-	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 &&
+expecting success of 5500.275 'fetch-pack --diag-url ssh+git://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 275 - fetch-pack --diag-url ssh+git://user@::1/re/po
 
-	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
+expecting success of 5500.276 'fetch-pack --diag-url ssh+git://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 276 - fetch-pack --diag-url ssh+git://user@::1/~re/po
 
-Cloning into 'clone'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 1 - fetch with invalid output format configuration
+expecting success of 5500.277 'fetch-pack --diag-url ssh+git://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 277 - fetch-pack --diag-url ssh+git://user@::1:/re/po
 
-expecting success of 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
+expecting success of 5500.278 'fetch-pack --diag-url ssh+git://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 278 - fetch-pack --diag-url ssh+git://user@::1:/~re/po
 
-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 5500.279 'fetch-pack --diag-url ssh+git://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 279 - fetch-pack --diag-url ssh+git://host:22/re/po
 
-expecting success of 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
+expecting success of 5500.280 'fetch-pack --diag-url ssh+git://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 280 - fetch-pack --diag-url ssh+git://User@host:22/re/po
 
-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 5500.281 'fetch-pack --diag-url ssh+git://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 281 - fetch-pack --diag-url ssh+git://User@[::1]:22/re/po
 
-expecting success of 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 &&
+expecting success of 5500.282 'fetch-pack --diag-url git+ssh://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 282 - fetch-pack --diag-url git+ssh://host/re/po
 
-	# Backup to preseed.git
-	git clone --mirror . preseed.git &&
+expecting success of 5500.283 'fetch-pack --diag-url git+ssh://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 283 - fetch-pack --diag-url git+ssh://host/~re/po
 
-	# 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)
+expecting success of 5500.284 'fetch-pack --diag-url git+ssh://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 284 - fetch-pack --diag-url git+ssh://host:/re/po
 
-[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 5500.285 'fetch-pack --diag-url git+ssh://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 285 - fetch-pack --diag-url git+ssh://host:/~re/po
 
-expecting success of 5574.5 'fetch porcelain output ': 
-		test_when_finished "rm -rf porcelain" &&
+expecting success of 5500.286 'fetch-pack --diag-url git+ssh://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 286 - fetch-pack --diag-url git+ssh://user@host/re/po
 
-		# 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 &&
+expecting success of 5500.287 'fetch-pack --diag-url git+ssh://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 287 - fetch-pack --diag-url git+ssh://user@host/~re/po
 
-		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
+expecting success of 5500.288 'fetch-pack --diag-url git+ssh://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 288 - fetch-pack --diag-url git+ssh://user@host:/re/po
 
-		# Change the URL of the repository to fetch different references.
-		git -C porcelain remote set-url origin .. &&
+expecting success of 5500.289 'fetch-pack --diag-url git+ssh://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 289 - fetch-pack --diag-url git+ssh://user@host:/~re/po
 
-		# 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 &&
+expecting success of 5500.290 'fetch-pack --diag-url git+ssh://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 290 - fetch-pack --diag-url git+ssh://user@[::1]/re/po
 
-		# 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.48.0~rc1+next.20250101/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 5500.291 'fetch-pack --diag-url git+ssh://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 291 - fetch-pack --diag-url git+ssh://user@[::1]/~re/po
 
-expecting success of 5574.6 'fetch porcelain output (atomic)': 
-		test_when_finished "rm -rf porcelain" &&
+expecting success of 5500.292 'fetch-pack --diag-url git+ssh://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 292 - fetch-pack --diag-url git+ssh://user@[::1]:/re/po
 
-		# 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 &&
+expecting success of 5500.293 'fetch-pack --diag-url git+ssh://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 293 - fetch-pack --diag-url git+ssh://user@[::1]:/~re/po
 
-		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
+expecting success of 5500.294 'fetch-pack --diag-url git+ssh://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 294 - fetch-pack --diag-url git+ssh://user@::1/re/po
 
-		# Change the URL of the repository to fetch different references.
-		git -C porcelain remote set-url origin .. &&
+expecting success of 5500.295 'fetch-pack --diag-url git+ssh://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 295 - fetch-pack --diag-url git+ssh://user@::1/~re/po
 
-		# 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 &&
+expecting success of 5500.296 'fetch-pack --diag-url git+ssh://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 296 - fetch-pack --diag-url git+ssh://user@::1:/re/po
 
-		# 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.48.0~rc1+next.20250101/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 5500.297 'fetch-pack --diag-url git+ssh://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 297 - fetch-pack --diag-url git+ssh://user@::1:/~re/po
 
-expecting success of 5574.7 'fetch porcelain with multiple remotes': 
-	test_when_finished "rm -rf porcelain" &&
+expecting success of 5500.298 'fetch-pack --diag-url git+ssh://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 298 - fetch-pack --diag-url git+ssh://host:22/re/po
 
-	git switch --create multiple-remotes &&
-	git clone . porcelain &&
-	git -C porcelain remote add second-remote "$PWD" &&
-	git -C porcelain fetch second-remote &&
+expecting success of 5500.299 'fetch-pack --diag-url git+ssh://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 299 - fetch-pack --diag-url git+ssh://User@host:22/re/po
 
-	test_commit --no-tag multi-commit &&
-	old_commit=$(git rev-parse HEAD~) &&
-	new_commit=$(git rev-parse HEAD) &&
+expecting success of 5500.300 'fetch-pack --diag-url git+ssh://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 300 - fetch-pack --diag-url git+ssh://User@[::1]:22/re/po
 
-	cat >expect <<-EOF &&
-	  $old_commit $new_commit refs/remotes/origin/multiple-remotes
-	  $old_commit $new_commit refs/remotes/second-remote/multiple-remotes
-	EOF
+expecting success of 5500.301 'fetch-pack --diag-url git://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 301 - fetch-pack --diag-url git://host/re/po
 
-	git -C porcelain fetch --porcelain --all >actual 2>stderr &&
-	test_cmp expect actual &&
-	test_must_be_empty stderr
+expecting success of 5500.302 'fetch-pack --diag-url git://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 302 - fetch-pack --diag-url git://host/~re/po
 
-Switched to a new branch 'multiple-remotes'
-Cloning into 'porcelain'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 5500.303 'fetch-pack --diag-url git://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 303 - fetch-pack --diag-url git://host:/re/po
 
-expecting success of 5574.8 'fetch porcelain refuses to work with submodules': 
-	test_when_finished "rm -rf porcelain" &&
+expecting success of 5500.304 'fetch-pack --diag-url git://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 304 - fetch-pack --diag-url git://host:/~re/po
 
-	cat >expect <<-EOF &&
-	fatal: options ${SQ}--porcelain${SQ} and ${SQ}--recurse-submodules${SQ} cannot be used together
-	EOF
+expecting success of 5500.305 'fetch-pack --diag-url git://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 305 - fetch-pack --diag-url git://user@host/re/po
 
-	git init porcelain &&
-	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=yes 2>stderr &&
-	test_cmp expect stderr &&
+expecting success of 5500.306 'fetch-pack --diag-url git://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 306 - fetch-pack --diag-url git://user@host/~re/po
 
-	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=on-demand 2>stderr &&
-	test_cmp expect stderr
+expecting success of 5500.307 'fetch-pack --diag-url git://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 307 - fetch-pack --diag-url git://user@host:/re/po
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5574-fetch-output/porcelain/.git/
-ok 8 - fetch porcelain refuses to work with submodules
+expecting success of 5500.308 'fetch-pack --diag-url git://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 308 - fetch-pack --diag-url git://user@host:/~re/po
 
-expecting success of 5574.9 'fetch porcelain overrides fetch.output config': 
-	test_when_finished "rm -rf porcelain" &&
+expecting success of 5500.309 'fetch-pack --diag-url git://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 309 - fetch-pack --diag-url git://user@[::1]/re/po
 
-	git switch --create config-override &&
-	git clone . porcelain &&
-	test_commit new-commit &&
-	old_commit=$(git rev-parse HEAD~) &&
-	new_commit=$(git rev-parse HEAD) &&
+expecting success of 5500.310 'fetch-pack --diag-url git://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 310 - fetch-pack --diag-url git://user@[::1]/~re/po
 
-	cat >expect <<-EOF &&
-	  $old_commit $new_commit refs/remotes/origin/config-override
-	* $ZERO_OID $new_commit refs/tags/new-commit
-	EOF
+expecting success of 5500.311 'fetch-pack --diag-url git://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 311 - fetch-pack --diag-url git://user@[::1]:/re/po
 
-	git -C porcelain -c fetch.output=compact fetch --porcelain >stdout 2>stderr &&
-	test_must_be_empty stderr &&
-	test_cmp expect stdout
+expecting success of 5500.312 'fetch-pack --diag-url git://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 312 - fetch-pack --diag-url git://user@[::1]:/~re/po
 
-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 5500.313 'fetch-pack --diag-url git://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 313 - fetch-pack --diag-url git://user@::1/re/po
 
-expecting success of 5574.10 'fetch --no-porcelain overrides previous --porcelain': 
-	test_when_finished "rm -rf no-porcelain" &&
+expecting success of 5500.314 'fetch-pack --diag-url git://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 314 - fetch-pack --diag-url git://user@::1/~re/po
 
-	git switch --create no-porcelain &&
-	git clone . no-porcelain &&
-	test_commit --no-tag no-porcelain &&
-	old_commit=$(git rev-parse --short HEAD~) &&
-	new_commit=$(git rev-parse --short HEAD) &&
+expecting success of 5500.315 'fetch-pack --diag-url git://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 315 - fetch-pack --diag-url git://user@::1:/re/po
 
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	   $old_commit..$new_commit  no-porcelain -> origin/no-porcelain
-	EOF
+expecting success of 5500.316 'fetch-pack --diag-url git://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 316 - fetch-pack --diag-url git://user@::1:/~re/po
 
-	git -C no-porcelain fetch --porcelain --no-porcelain >stdout 2>stderr &&
-	test_cmp expect stderr &&
-	test_must_be_empty stdout
+expecting success of 5500.317 'fetch-pack --diag-url git://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 317 - fetch-pack --diag-url git://host:22/re/po
 
-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 5500.318 'fetch-pack --diag-url git://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 318 - fetch-pack --diag-url git://User@host:22/re/po
 
-expecting success of 5574.11 'fetch output with HEAD': 
-	test_when_finished "rm -rf head" &&
-	git clone . head &&
+expecting success of 5500.319 'fetch-pack --diag-url git://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 319 - fetch-pack --diag-url git://User@[::1]:22/re/po
 
-	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 &&
+expecting success of 5500.320 'fetch-pack --diag-url ssh://host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 320 - fetch-pack --diag-url ssh://host/re/po
 
-	git -C head fetch origin HEAD >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
+expecting success of 5500.321 'fetch-pack --diag-url ssh://host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 321 - fetch-pack --diag-url ssh://host/~re/po
 
-	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 &&
+expecting success of 5500.322 'fetch-pack --diag-url ssh://host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 322 - fetch-pack --diag-url ssh://host:/re/po
 
-	git -C head fetch origin HEAD:foo >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err
+expecting success of 5500.323 'fetch-pack --diag-url ssh://host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 323 - fetch-pack --diag-url ssh://host:/~re/po
 
-Cloning into 'head'...
-done.
-ok 11 - fetch output with HEAD
+expecting success of 5500.324 'fetch-pack --diag-url ssh://user@host/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 324 - fetch-pack --diag-url ssh://user@host/re/po
 
-expecting success of 5574.12 'fetch porcelain output with HEAD': 
-	test_when_finished "rm -rf head" &&
-	git clone . head &&
-	COMMIT_ID=$(git rev-parse HEAD) &&
+expecting success of 5500.325 'fetch-pack --diag-url ssh://user@host/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 325 - fetch-pack --diag-url ssh://user@host/~re/po
 
-	git -C head fetch --porcelain --dry-run origin HEAD >actual &&
-	cat >expect <<-EOF &&
-	* $ZERO_OID $COMMIT_ID FETCH_HEAD
-	EOF
-	test_cmp expect actual &&
+expecting success of 5500.326 'fetch-pack --diag-url ssh://user@host:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 326 - fetch-pack --diag-url ssh://user@host:/re/po
 
-	git -C head fetch --porcelain origin HEAD >actual &&
-	test_cmp expect actual &&
+expecting success of 5500.327 'fetch-pack --diag-url ssh://user@host:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 327 - fetch-pack --diag-url ssh://user@host:/~re/po
 
-	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 &&
+expecting success of 5500.328 'fetch-pack --diag-url ssh://user@[::1]/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 328 - fetch-pack --diag-url ssh://user@[::1]/re/po
 
-	git -C head fetch --porcelain origin HEAD:foo >actual &&
-	test_cmp expect actual
+expecting success of 5500.329 'fetch-pack --diag-url ssh://user@[::1]/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 329 - fetch-pack --diag-url ssh://user@[::1]/~re/po
 
-Cloning into 'head'...
-done.
-ok 12 - fetch porcelain output with HEAD
+expecting success of 5500.330 'fetch-pack --diag-url ssh://user@[::1]:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 330 - fetch-pack --diag-url ssh://user@[::1]:/re/po
 
-expecting success of 5574.13 'fetch output with object ID': 
-	test_when_finished "rm -rf object-id" &&
-	git clone . object-id &&
-	commit=$(git rev-parse HEAD) &&
+expecting success of 5500.331 'fetch-pack --diag-url ssh://user@[::1]:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 331 - fetch-pack --diag-url ssh://user@[::1]:/~re/po
 
-	git -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 &&
+expecting success of 5500.332 'fetch-pack --diag-url ssh://user@::1/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 332 - fetch-pack --diag-url ssh://user@::1/re/po
 
-	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
+expecting success of 5500.333 'fetch-pack --diag-url ssh://user@::1/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 333 - fetch-pack --diag-url ssh://user@::1/~re/po
 
-Cloning into 'object-id'...
-done.
-ok 13 - fetch output with object ID
+expecting success of 5500.334 'fetch-pack --diag-url ssh://user@::1:/re/po': 
+					check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
+				
+ok 334 - fetch-pack --diag-url ssh://user@::1:/re/po
 
-expecting success of 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
-	)
+expecting success of 5500.335 'fetch-pack --diag-url ssh://user@::1:/~re/po': 
+					check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
+				
+ok 335 - fetch-pack --diag-url ssh://user@::1:/~re/po
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 5500.336 'fetch-pack --diag-url ssh://host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 336 - fetch-pack --diag-url ssh://host:22/re/po
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5608-clone-2gb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5603-clone-dirname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5603-clone-dirname/.git/
-expecting success of 5603.1 'setup ssh wrapper': 
-	write_script "$TRASH_DIRECTORY/ssh-wrapper" <<-\EOF &&
-	git upload-pack "$TRASH_DIRECTORY"
-	EOF
-	GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper" &&
-	GIT_SSH_VARIANT=ssh &&
-	export GIT_SSH &&
-	export GIT_SSH_VARIANT &&
-	export TRASH_DIRECTORY
+expecting success of 5500.337 'fetch-pack --diag-url ssh://User@host:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 337 - fetch-pack --diag-url ssh://User@host:22/re/po
 
-ok 1 - setup ssh wrapper
+expecting success of 5500.338 'fetch-pack --diag-url ssh://User@[::1]:22/re/po': 
+				check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
+			
+ok 338 - fetch-pack --diag-url ssh://User@[::1]:22/re/po
 
-expecting success of 5603.2 'clone of host:foo goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 2 - clone of host:foo goes to foo (non-bare)
+expecting success of 5500.339 'fetch-pack --diag-url file://User@[::1]/re/po': 
+			check_prot_path $p://$h/$r $p "/$r"
+		
+ok 339 - fetch-pack --diag-url file://User@[::1]/re/po
 
-expecting success of 5603.3 'clone of host:foo goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare host:foo &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 3 - clone of host:foo goes to foo.git (bare)
+ok 340 # skip fetch-pack --diag-url file://User@[::1]/re/po (missing MINGW)
 
-expecting success of 5603.4 'clone of host:foo.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 4 - clone of host:foo.git goes to foo (non-bare)
+ok 341 # skip fetch-pack --diag-url file:///re/po (missing MINGW)
 
-expecting success of 5603.5 'clone of host:foo.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare host:foo.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 5 - clone of host:foo.git goes to foo.git (bare)
+expecting success of 5500.342 'fetch-pack --diag-url file://User@[::1]/~re/po': 
+			check_prot_path $p://$h/~$r $p "/~$r"
+		
+ok 342 - fetch-pack --diag-url file://User@[::1]/~re/po
 
-expecting success of 5603.6 'clone of host:foo/.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 6 - clone of host:foo/.git goes to foo (non-bare)
+ok 343 # skip fetch-pack --diag-url file://User@[::1]/~re/po (missing MINGW)
 
-expecting success of 5603.7 'clone of host:foo/.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare host:foo/.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 7 - clone of host:foo/.git goes to foo.git (bare)
+expecting success of 5500.344 'fetch-pack --diag-url ./nohost:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 344 - fetch-pack --diag-url ./nohost:re/po
 
-expecting success of 5603.8 'clone of ssh://host/foo goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 8 - clone of ssh://host/foo goes to foo (non-bare)
+expecting success of 5500.345 'fetch-pack --diag-url ./file:nohost/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 345 - fetch-pack --diag-url ./file:nohost/~re/po
 
-expecting success of 5603.9 'clone of ssh://host/foo goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare ssh://host/foo &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 9 - clone of ssh://host/foo goes to foo.git (bare)
+expecting success of 5500.346 'fetch-pack --diag-url ./nohost:12:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 346 - fetch-pack --diag-url ./nohost:12:re/po
 
-expecting success of 5603.10 'clone of ssh://host/foo.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 10 - clone of ssh://host/foo.git goes to foo (non-bare)
+expecting success of 5500.347 'fetch-pack --diag-url ./file:nohost:12/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 347 - fetch-pack --diag-url ./file:nohost:12/~re/po
 
-expecting success of 5603.11 'clone of ssh://host/foo.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare ssh://host/foo.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 11 - clone of ssh://host/foo.git goes to foo.git (bare)
+expecting success of 5500.348 'fetch-pack --diag-url ./[::1]:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 348 - fetch-pack --diag-url ./[::1]:re/po
 
-expecting success of 5603.12 'clone of ssh://host/foo/.git goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/.git &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 12 - clone of ssh://host/foo/.git goes to foo (non-bare)
+expecting success of 5500.349 'fetch-pack --diag-url ./file:[::1]/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 349 - fetch-pack --diag-url ./file:[::1]/~re/po
 
-expecting success of 5603.13 'clone of ssh://host/foo/.git goes to foo.git (bare)': 
-		rm -rf foo.git &&
-		git clone --bare ssh://host/foo/.git &&
-		test_path_is_dir foo.git
-	
-Cloning into bare repository 'foo.git'...
-warning: You appear to have cloned an empty repository.
-ok 13 - clone of ssh://host/foo/.git goes to foo.git (bare)
+expecting success of 5500.350 'fetch-pack --diag-url ./[::1]:23:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 350 - fetch-pack --diag-url ./[::1]:23:re/po
 
-expecting success of 5603.14 'clone of ssh://host/foo/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 14 - clone of ssh://host/foo/ goes to foo (non-bare)
+expecting success of 5500.351 'fetch-pack --diag-url ./file:[::1]:23/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 351 - fetch-pack --diag-url ./file:[::1]:23/~re/po
 
-expecting success of 5603.15 'clone of ssh://host/foo/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 15 - clone of ssh://host/foo/// goes to foo (non-bare)
+expecting success of 5500.352 'fetch-pack --diag-url ./[:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 352 - fetch-pack --diag-url ./[:re/po
 
-expecting success of 5603.16 'clone of ssh://host/foo/.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 16 - clone of ssh://host/foo/.git/ goes to foo (non-bare)
+expecting success of 5500.353 'fetch-pack --diag-url ./file:[/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 353 - fetch-pack --diag-url ./file:[/~re/po
 
-expecting success of 5603.17 'clone of ssh://host/foo.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 17 - clone of ssh://host/foo.git/ goes to foo (non-bare)
+expecting success of 5500.354 'fetch-pack --diag-url ./[:aa:re/po': 
+			check_prot_path ./$h:$r $p "./$h:$r"
+		
+ok 354 - fetch-pack --diag-url ./[:aa:re/po
 
-expecting success of 5603.18 'clone of ssh://host/foo.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 18 - clone of ssh://host/foo.git/// goes to foo (non-bare)
+expecting success of 5500.355 'fetch-pack --diag-url ./file:[:aa/~re/po': 
+		check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
+		
+ok 355 - fetch-pack --diag-url ./file:[:aa/~re/po
 
-expecting success of 5603.19 'clone of ssh://host/foo///.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo///.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 19 - clone of ssh://host/foo///.git/ goes to foo (non-bare)
+expecting success of 5500.356 'fetch-pack --diag-url host:re/po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 356 - fetch-pack --diag-url host:re/po
 
-expecting success of 5603.20 'clone of ssh://host/foo/.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  ssh://host/foo/.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 20 - clone of ssh://host/foo/.git/// goes to foo (non-bare)
+expecting success of 5500.357 'fetch-pack --diag-url host:/~re/po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 357 - fetch-pack --diag-url host:/~re/po
 
-expecting success of 5603.21 'clone of host:foo/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 21 - clone of host:foo/ goes to foo (non-bare)
+expecting success of 5500.358 'fetch-pack --diag-url [::1]:re/po': 
+			check_prot_host_port_path $h:$r $p "$h" NONE "$r"
+		
+ok 358 - fetch-pack --diag-url [::1]:re/po
 
-expecting success of 5603.22 'clone of host:foo/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 22 - clone of host:foo/// goes to foo (non-bare)
+expecting success of 5500.359 'fetch-pack --diag-url [::1]:/~re/po': 
+			check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
+		
+ok 359 - fetch-pack --diag-url [::1]:/~re/po
 
-expecting success of 5603.23 'clone of host:foo.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 23 - clone of host:foo.git/ goes to foo (non-bare)
+ok 360 # skip fetch-pack --diag-url file://c:/repo (missing MINGW)
 
-expecting success of 5603.24 'clone of host:foo/.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 24 - clone of host:foo/.git/ goes to foo (non-bare)
+ok 361 # skip fetch-pack --diag-url c:repo (missing MINGW)
 
-expecting success of 5603.25 'clone of host:foo.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 25 - clone of host:foo.git/// goes to foo (non-bare)
+expecting success of 5500.362 'clone shallow since ...': 
+	test_create_repo shallow-since &&
+	(
+	cd shallow-since &&
+	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
+	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
+	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
+	git clone --shallow-since "300000000 +0700" "file://$(pwd)/." ../shallow11 &&
+	git -C ../shallow11 log --pretty=tformat:%s HEAD >actual &&
+	echo three >expected &&
+	test_cmp expected actual
+	)
 
-expecting success of 5603.26 'clone of host:foo///.git/ goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo///.git/ &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 26 - clone of host:foo///.git/ goes to foo (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-since/.git/
+[main (root-commit) 4c9b2a3] one
+ Author: A U Thor <author@example.com>
+[main e491164] two
+ Author: A U Thor <author@example.com>
+[main 88fb92d] three
+ Author: A U Thor <author@example.com>
+Cloning into '../shallow11'...
+ok 362 - clone shallow since ...
 
-expecting success of 5603.27 'clone of host:foo/.git/// goes to foo (non-bare)': 
-		rm -rf foo &&
-		git clone  host:foo/.git/// &&
-		test_path_is_dir foo
-	
-Cloning into 'foo'...
-warning: You appear to have cloned an empty repository.
-ok 27 - clone of host:foo/.git/// goes to foo (non-bare)
+expecting success of 5500.363 'fetch shallow since ...': 
+	GIT_TRACE2_EVENT=$(pwd)/shallow11/trace2_event \
+		git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
+	git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
+	cat >expected <<-\EOF &&
+	three
+	two
+	EOF
+	test_cmp expected actual &&
+	grep \"fetch-info\".*\"deepen-since\":true shallow11/trace2_event
 
-expecting success of 5603.28 'clone of ssh://host/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://host/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 28 - clone of ssh://host/ goes to host (non-bare)
+{"event":"data_json","sid":"20260314T133321.444369Z-H5c947e1c-P00037878/20260314T133321.464205Z-H5c947e1c-P00037893","thread":"main","time":"2026-03-14T13:33:21.475671Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.011681,"t_rel":0.011681,"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 5603.29 'clone of ssh://host:1234/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://host:1234/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 29 - clone of ssh://host:1234/ goes to host (non-bare)
+expecting success of 5500.364 'clone shallow since selects no commits': 
+	test_create_repo shallow-since-the-future &&
+	(
+	cd shallow-since-the-future &&
+	GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
+	GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
+	GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
+	test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
+	)
 
-expecting success of 5603.30 'clone of ssh://user@host/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user@host/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 30 - clone of ssh://user@host/ goes to host (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-since-the-future/.git/
+[main (root-commit) 4c9b2a3] one
+ Author: A U Thor <author@example.com>
+[main e491164] two
+ Author: A U Thor <author@example.com>
+[main 88fb92d] three
+ Author: A U Thor <author@example.com>
+Cloning into '../shallow111'...
+fatal: no commits selected for shallow requests
+fatal: the remote end hung up unexpectedly
+ok 364 - clone shallow since selects no commits
 
-expecting success of 5603.31 'clone of host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 31 - clone of host:/ goes to host (non-bare)
+expecting success of 5500.365 'shallow since with commit graph and already-seen commit': 
+	test_create_repo shallow-since-graph &&
+	(
+	cd shallow-since-graph &&
+	test_commit base &&
+	test_commit main &&
+	git checkout -b other HEAD^ &&
+	test_commit other &&
+	git commit-graph write --reachable &&
+	git config core.commitGraph true &&
 
-expecting success of 5603.32 'clone of ssh://user:password@host/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user:password@host/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 32 - clone of ssh://user:password@host/ goes to host (non-bare)
+	GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
+	0012command=fetch
+	$(echo "object-format=$(test_oid algo)" | packetize)
+	00010013deepen-since 1
+	$(echo "want $(git rev-parse other)" | packetize)
+	$(echo "have $(git rev-parse main)" | packetize)
+	0000
+	EOF
+	)
 
-expecting success of 5603.33 'clone of ssh://user:password@host:1234/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user:password@host:1234/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 33 - clone of ssh://user:password@host:1234/ goes to host (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-since-graph/.git/
+[main (root-commit) d3ae9fb] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[main a2ca354] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main.t
+Switched to a new branch 'other'
+[other fb3d247] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+warning: refname 'other' is ambiguous.
+warning: refname 'main' is ambiguous.
+ok 365 - shallow since with commit graph and already-seen commit
 
-expecting success of 5603.34 'clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  ssh://user:passw@rd@host:1234/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 34 - clone of ssh://user:passw@rd@host:1234/ goes to host (non-bare)
+expecting success of 5500.366 'shallow clone exclude tag two': 
+	test_create_repo shallow-exclude &&
+	(
+	cd shallow-exclude &&
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	git clone --shallow-exclude two "file://$(pwd)/." ../shallow12 &&
+	git -C ../shallow12 log --pretty=tformat:%s HEAD >actual &&
+	echo three >expected &&
+	test_cmp expected actual
+	)
 
-expecting success of 5603.35 'clone of user@host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  user@host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 35 - clone of user@host:/ goes to host (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-exclude/.git/
+[main (root-commit) 7d32f63] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main ea3a09e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main 28cfb97] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Cloning into '../shallow12'...
+ok 366 - shallow clone exclude tag two
 
-expecting success of 5603.36 'clone of user:password@host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  user:password@host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 36 - clone of user:password@host:/ goes to host (non-bare)
+expecting success of 5500.367 'fetch exclude tag one': 
+	git -C shallow12 fetch --shallow-exclude one origin &&
+	git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
+	test_write_lines three two >expected &&
+	test_cmp expected actual
 
-expecting success of 5603.37 'clone of user:passw@rd@host:/ goes to host (non-bare)': 
-		rm -rf host &&
-		git clone  user:passw@rd@host:/ &&
-		test_path_is_dir host
-	
-Cloning into 'host'...
-warning: You appear to have cloned an empty repository.
-ok 37 - clone of user:passw@rd@host:/ goes to host (non-bare)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-exclude/.
+ * [new tag]         two        -> two
+ok 367 - fetch exclude tag one
 
-expecting success of 5603.38 'clone of ssh://host/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://host/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 38 - clone of ssh://host/foo@bar goes to foo@bar (non-bare)
+expecting success of 5500.368 'fetch exclude tag one as revision': 
+	test_when_finished rm -f rev err &&
+	git -C shallow-exclude rev-parse one >rev &&
+	test_must_fail git -C shallow12 fetch --shallow-exclude $(cat rev) origin 2>err &&
+	grep "deepen-not is not a ref:" err
 
-expecting success of 5603.39 'clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://host/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 39 - clone of ssh://host/foo@bar.git goes to foo@bar (non-bare)
+fatal: git upload-pack: deepen-not is not a ref: deepen-not 7d32f632cd08248ef9383667ad19becddb14d93a
+ok 368 - fetch exclude tag one as revision
 
-expecting success of 5603.40 'clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://user:password@host/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 40 - clone of ssh://user:password@host/foo@bar goes to foo@bar (non-bare)
+expecting success of 5500.369 'fetching deepen': 
+	test_create_repo shallow-deepen &&
+	(
+	cd shallow-deepen &&
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	git clone --depth 1 "file://$(pwd)/." deepen &&
+	test_commit four &&
+	git -C deepen log --pretty=tformat:%s main >actual &&
+	echo three >expected &&
+	test_cmp expected actual &&
+	git -C deepen fetch --deepen=1 &&
+	git -C deepen log --pretty=tformat:%s origin/main >actual &&
+	cat >expected <<-\EOF &&
+	four
+	three
+	two
+	EOF
+	test_cmp expected actual
+	)
 
-expecting success of 5603.41 'clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  ssh://user:passw@rd@host/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 41 - clone of ssh://user:passw@rd@host/foo@bar.git goes to foo@bar (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-deepen/.git/
+[main (root-commit) 7d32f63] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main ea3a09e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main 28cfb97] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Cloning into 'deepen'...
+[main 8f42874] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/shallow-deepen/.
+   28cfb97..8f42874  main       -> origin/main
+ * [new tag]         four       -> four
+ * [new tag]         two        -> two
+ok 369 - fetching deepen
 
-expecting success of 5603.42 'clone of host:/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  host:/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 42 - clone of host:/foo@bar goes to foo@bar (non-bare)
+expecting success of 5500.370 'use ref advertisement to prune "have" lines sent': 
+	test_negotiation_algorithm_default
 
-expecting success of 5603.43 'clone of host:/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  host:/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 43 - clone of host:/foo@bar.git goes to foo@bar (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 4ec3e89] both_have_1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 both_have_1.t
+Deleted tag 'both_have_1' (was 4ec3e89)
+[main 0e648cf] both_have_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 both_have_2.t
+Cloning into 'client'...
+done.
+[main c107eb0] server_has
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 server_has.t
+[main d1fea1f] client_has
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 client_has.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
+packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:  upload-pack< have d1fea1f29cf9ed7dd3bad159c87b04602137107f
+packet:        fetch> have 0e648cf9d30d78592ceaaece245726ca9e279151
+packet:  upload-pack< have 0e648cf9d30d78592ceaaece245726ca9e279151
+ok 370 - use ref advertisement to prune "have" lines sent
 
-expecting success of 5603.44 'clone of user:password@host:/foo@bar goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  user:password@host:/foo@bar &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 44 - clone of user:password@host:/foo@bar goes to foo@bar (non-bare)
+expecting success of 5500.371 'same as last but with config overrides': 
+	test_negotiation_algorithm_default \
+		-c feature.experimental=true \
+		-c fetch.negotiationAlgorithm=consecutive
 
-expecting success of 5603.45 'clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)': 
-		rm -rf foo@bar &&
-		git clone  user:passw@rd@host:/foo@bar.git &&
-		test_path_is_dir foo@bar
-	
-Cloning into 'foo@bar'...
-warning: You appear to have cloned an empty repository.
-ok 45 - clone of user:passw@rd@host:/foo@bar.git goes to foo@bar (non-bare)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 9df98d9] both_have_1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 both_have_1.t
+Deleted tag 'both_have_1' (was 9df98d9)
+[main 63eca65] both_have_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 both_have_2.t
+Cloning into 'client'...
+done.
+[main d7eee63] server_has
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 server_has.t
+[main 381c2f1] client_has
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 client_has.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
+packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
+packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
+packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
+ * tag               server_has -> FETCH_HEAD
+ * tag               both_have_2 -> FETCH_HEAD
+packet:        fetch> have 381c2f1c977599145037b617815f85808fe86d6c
+packet:  upload-pack< have 381c2f1c977599145037b617815f85808fe86d6c
+packet:        fetch> have 63eca652c410121f112d645c8a8840ae82123b3e
+packet:  upload-pack< have 63eca652c410121f112d645c8a8840ae82123b3e
+ok 371 - same as last but with config overrides
 
-expecting success of 5603.46 'clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)': 
-		rm -rf 1234 &&
-		git clone  ssh://user:password@host/test:1234 &&
-		test_path_is_dir 1234
-	
-Cloning into '1234'...
-warning: You appear to have cloned an empty repository.
-ok 46 - clone of ssh://user:password@host/test:1234 goes to 1234 (non-bare)
+expecting success of 5500.372 'ensure bogus fetch.negotiationAlgorithm yields error': 
+	test_when_finished rm -rf clientv0 &&
+	cp -r client clientv0 &&
+	test_must_fail git -C clientv0 --fetch.negotiationAlgorithm=bogus \
+		       fetch origin server_has both_have_2
 
-expecting success of 5603.47 'clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)': 
-		rm -rf 1234 &&
-		git clone  ssh://user:password@host/test:1234.git &&
-		test_path_is_dir 1234
-	
-Cloning into '1234'...
-warning: You appear to have cloned an empty repository.
-ok 47 - clone of ssh://user:password@host/test:1234.git goes to 1234 (non-bare)
+unknown option: --fetch.negotiationAlgorithm=bogus
+usage: git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]
+           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
+           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-lazy-fetch]
+           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]
+           [--work-tree=<path>] [--namespace=<name>] [--config-env=<name>=<envvar>]
+           <command> [<args>]
+ok 372 - ensure bogus fetch.negotiationAlgorithm yields error
 
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5609-clone-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5609-clone-branch/.git/
-expecting success of 5609.1 'setup': 
-	mkdir parent &&
-	(cd parent && git init &&
-	 echo one >file && git add file && git commit -m one &&
-	 git checkout -b two &&
-	 echo two >file && git add file && git commit -m two &&
-	 git checkout main) &&
-	mkdir empty &&
-	(cd empty && git init)
+expecting success of 5500.373 'fetch-pack with fsckObjects and keep-file does not segfault': 
+	rm -rf server client &&
+	test_create_repo server &&
+	test_commit -C server one &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5609-clone-branch/parent/.git/
-[main (root-commit) 1993c08] one
+	test_create_repo client &&
+	git -c fetch.fsckObjects=true \
+	    -C client fetch-pack -k -k ../server HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) b73245b] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-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.48.0~rc1+next.20250101/t/trash directory.t5609-clone-branch/empty/.git/
-ok 1 - setup
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/client/.git/
+remote: Enumerating objects: 3, done.        
+remote: Counting objects:  33% (1/3)        
remote: Counting objects:  66% (2/3)        
remote: Counting objects: 100% (3/3)        
remote: Counting objects: 100% (3/3), done.        
+remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
+Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), done.
+b73245b187a878a9334892236f3e85ef70d56705 HEAD
+ok 373 - fetch-pack with fsckObjects and keep-file does not segfault
 
-expecting success of 5609.2 'vanilla clone chooses HEAD': 
-	git clone parent clone &&
-	(cd clone &&
-	 check_HEAD main &&
-	 check_file one
-	)
+expecting success of 5500.374 'filtering by size': 
+	rm -rf server client &&
+	test_create_repo server &&
+	test_commit -C server one &&
+	test_config -C server uploadpack.allowfilter 1 &&
 
-Cloning into 'clone'...
-done.
-ok 2 - vanilla clone chooses HEAD
+	test_create_repo client &&
+	GIT_TRACE2_EVENT=$(pwd)/client/trace2_event \
+		git -C client fetch-pack --filter=blob:limit=0 ../server 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
-	)
+	# Ensure that object is not inadvertently fetched
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	! grep "$blob" oids &&
 
-Cloning into 'clone-two'...
-done.
-ok 3 - clone -b chooses specified branch
+	grep \"fetch-info\".*\"filter\":\"blob:limit\" client/trace2_event
 
-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
-	)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 946f2fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/client/.git/
+remote: Enumerating objects: 2, done.        
+remote: Counting objects:  50% (1/2)        
remote: Counting objects: 100% (2/2)        
remote: Counting objects: 100% (2/2), done.        
+remote: Total 2 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
+946f2fc4f06e44010ec7f3ed95172068b132ee22 HEAD
+{"event":"data_json","sid":"20260314T133327.268268Z-H5c947e1c-P00038cae/20260314T133327.291991Z-H5c947e1c-P00038cba","thread":"main","time":"2026-03-14T13:33:27.302242Z","file":"upload-pack.c","line":1603,"repo":0,"t_abs":0.010474,"t_rel":0.010474,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":"blob:limit"}}
+ok 374 - filtering by size
 
-ok 4 - clone -b sets up tracking
+expecting success of 5500.375 'filtering by size has no effect if support for it is not advertised': 
+	rm -rf server client &&
+	test_create_repo server &&
+	test_commit -C server one &&
 
-expecting success of 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
-	)
+	test_create_repo client &&
+	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
 
-ok 5 - clone -b does not munge remotes/origin/HEAD
+	# Ensure that object is fetched
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	grep "$blob" oids &&
 
-expecting success of 5609.6 'clone -b with bogus branch': 
-	test_must_fail git clone -b bogus parent clone-bogus
+	test_grep "filtering not recognized by server" err
 
-Cloning into 'clone-bogus'...
-fatal: Remote branch bogus not found in upstream origin
-ok 6 - clone -b with bogus branch
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 65824a5] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/client/.git/
+65824a5afab3ce868d5dbea30006cffd06f7d620 HEAD
+5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
+warning: filtering not recognized by server, ignoring
+ok 375 - filtering by size has no effect if support for it is not advertised
 
-expecting success of 5609.7 'clone -b not allowed with empty repos': 
-	test_must_fail git clone -b branch empty clone-branch-empty
+expecting success of 5500.376 'fetch with --filter=blob:limit=0': 
+	fetch_filter_blob_limit_zero server server
 
-Cloning into 'clone-branch-empty'...
-fatal: Remote branch branch not found in upstream origin
-ok 7 - clone -b not allowed with empty repos
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server/.git/
+[main (root-commit) 592fb96] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'client'...
+done.
+[main d0a5bc4] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5500-fetch-pack/server
+ * [new ref]         HEAD       -> somewhere
+ * [new tag]         two        -> two
+d0a5bc4f606380cade3e239ca5f3edd4dea821d9
+ok 376 - fetch with --filter=blob:limit=0
 
-# passed all 7 test(s)
-1..7
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 376 test(s)
+# SKIP no web server found at ''
+1..376
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5605-clone-local.sh ***
@@ -364791,6 +364385,11 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5608-clone-2gb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5607-clone-bundle.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5607-clone-bundle/.git/
 expecting success of 5607.1 'setup': 
@@ -365090,198 +364689,89 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5610-clone-detached.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5610-clone-detached/.git/
-expecting success of 5610.1 'setup': 
-	echo one >file &&
-	git add file &&
-	git commit -m one &&
-	echo two >file &&
-	git commit -a -m two &&
-	git tag two &&
-	echo three >file &&
-	git commit -a -m three
+*** t5609-clone-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
-[main 2f98c16] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0c9f2ac] three
+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.48.0~rc1+next.20250101/t/trash directory.t5609-clone-branch/empty/.git/
 ok 1 - setup
 
-expecting success of 5610.2 'clone repo (detached HEAD points to branch)': 
-	git checkout main^0 &&
-	git clone "file://$PWD" detached-branch
-
-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 0c9f2ac three
-Cloning into 'detached-branch'...
-ok 2 - clone repo (detached HEAD points to branch)
-
-expecting success of 5610.3 'cloned HEAD matches': 
-	echo three >expect &&
-	git --git-dir=detached-branch/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
-
-ok 3 - cloned HEAD matches
-
-checking known breakage of 5610.4 'cloned HEAD is detached': 
-	head_is_detached detached-branch
-
-0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed
-refs/heads/main
-test_must_fail: command succeeded: git --git-dir=detached-branch/.git symbolic-ref HEAD
-not ok 4 - cloned HEAD is detached # TODO known breakage
-
-expecting success of 5610.5 'clone repo (detached HEAD points to tag)': 
-	git checkout two^0 &&
-	git clone "file://$PWD" detached-tag
-
-Previous HEAD position was 0c9f2ac three
-HEAD is now at 2f98c16 two
-Cloning into 'detached-tag'...
-Note: switching to '2f98c16ed3231a950c127212a79f176334983d3a'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git 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 5 - clone repo (detached HEAD points to tag)
-
-expecting success of 5610.6 'cloned HEAD matches': 
-	echo two >expect &&
-	git --git-dir=detached-tag/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
-
-ok 6 - cloned HEAD matches
-
-expecting success of 5610.7 'cloned HEAD is detached': 
-	head_is_detached detached-tag
-
-2f98c16ed3231a950c127212a79f176334983d3a
-fatal: ref HEAD is not a symbolic ref
-ok 7 - cloned HEAD is detached
-
-expecting success of 5610.8 'clone repo (detached HEAD points to history)': 
-	git checkout two^ &&
-	git clone "file://$PWD" detached-history
-
-Previous HEAD position was 2f98c16 two
-HEAD is now at 1993c08 one
-Cloning into 'detached-history'...
-Note: switching to '1993c08d5743a2c4719f8ed3b8cc9b60d54d741e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git 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 8 - clone repo (detached HEAD points to history)
-
-expecting success of 5610.9 'cloned HEAD matches': 
-	echo one >expect &&
-	git --git-dir=detached-history/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
-
-ok 9 - cloned HEAD matches
-
-expecting success of 5610.10 'cloned HEAD is detached': 
-	head_is_detached detached-history
-
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-fatal: ref HEAD is not a symbolic ref
-ok 10 - cloned HEAD is detached
-
-expecting success of 5610.11 'clone repo (orphan detached HEAD)': 
-	git checkout main^0 &&
-	echo four >file &&
-	git commit -a -m four &&
-	git clone "file://$PWD" detached-orphan
-
-Previous HEAD position was 1993c08 one
-HEAD is now at 0c9f2ac three
-[detached HEAD 09d9fb6] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'detached-orphan'...
-Note: switching to '09d9fb6c1b2f666fb510a7b12d14c7884d01e34e'.
+expecting success of 5609.2 'vanilla clone chooses HEAD': 
+	git clone parent clone &&
+	(cd clone &&
+	 check_HEAD main &&
+	 check_file one
+	)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Cloning into 'clone'...
+done.
+ok 2 - vanilla clone chooses HEAD
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+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
+	)
 
-  git switch -c <new-branch-name>
+Cloning into 'clone-two'...
+done.
+ok 3 - clone -b chooses specified branch
 
-Or undo this operation with:
+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
+	)
 
-  git switch -
+ok 4 - clone -b sets up tracking
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 11 - clone repo (orphan detached HEAD)
+ok 5 - clone -b does not munge remotes/origin/HEAD
 
-expecting success of 5610.12 'cloned HEAD matches': 
-	echo four >expect &&
-	git --git-dir=detached-orphan/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
+expecting success of 5609.6 'clone -b with bogus branch': 
+	test_must_fail git clone -b bogus parent clone-bogus
 
-ok 12 - cloned HEAD matches
+Cloning into 'clone-bogus'...
+fatal: Remote branch bogus not found in upstream origin
+ok 6 - clone -b with bogus branch
 
-expecting success of 5610.13 'cloned HEAD is detached': 
-	head_is_detached detached-orphan
+expecting success of 5609.7 'clone -b not allowed with empty repos': 
+	test_must_fail git clone -b branch empty clone-branch-empty
 
-09d9fb6c1b2f666fb510a7b12d14c7884d01e34e
-fatal: ref HEAD is not a symbolic ref
-ok 13 - cloned HEAD is detached
+Cloning into 'clone-branch-empty'...
+fatal: Remote branch branch not found in upstream origin
+ok 7 - clone -b not allowed with empty repos
 
-# still have 1 known breakage(s)
-# passed all remaining 12 test(s)
-1..13
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5606-clone-options.sh ***
@@ -365572,250 +365062,198 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5611-clone-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t5610-clone-detached.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5610-clone-detached/.git/
+expecting success of 5610.1 'setup': 
+	echo one >file &&
+	git add file &&
+	git commit -m one &&
+	echo two >file &&
+	git commit -a -m two &&
+	git tag two &&
+	echo three >file &&
+	git commit -a -m three
 
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 1 - clone -c sets config in cloned repo
+[main (root-commit) 1993c08] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 2f98c16] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0c9f2ac] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-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
+expecting success of 5610.2 'clone repo (detached HEAD points to branch)': 
+	git checkout main^0 &&
+	git clone "file://$PWD" detached-branch
 
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 2 - clone -c can set multi-keys
+Note: switching to 'main^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 3 - clone -c can set multi-keys, including some empty
+If you want to 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 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
+  git switch -c <new-branch-name>
 
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 4 - clone -c without a value is boolean true
+Or undo this operation with:
 
-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
+  git switch -
 
-[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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 &&
+HEAD is now at 0c9f2ac three
+Cloning into 'detached-branch'...
+ok 2 - clone repo (detached HEAD points to branch)
 
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/origin/HEAD
-	refs/remotes/origin/main
-	EOF
+expecting success of 5610.3 'cloned HEAD matches': 
+	echo three >expect &&
+	git --git-dir=detached-branch/.git log -1 --format=%s >actual &&
 	test_cmp expect actual
 
-Cloning into 'child'...
-done.
-ok 6 - clone -c remote.origin.fetch=<refspec> works
+ok 3 - cloned HEAD matches
 
-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 &&
+checking known breakage of 5610.4 'cloned HEAD is detached': 
+	head_is_detached detached-branch
 
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/origin/HEAD
-	refs/remotes/origin/main
-	EOF
-	test_cmp expect actual
+0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed
+refs/heads/main
+test_must_fail: command succeeded: git --git-dir=detached-branch/.git symbolic-ref HEAD
+not ok 4 - cloned HEAD is detached # TODO known breakage
 
-Cloning into 'child'...
-done.
-ok 7 - git -c remote.origin.fetch=<refspec> clone works
+expecting success of 5610.5 'clone repo (detached HEAD points to tag)': 
+	git checkout two^0 &&
+	git clone "file://$PWD" detached-tag
 
-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 &&
+Previous HEAD position was 0c9f2ac three
+HEAD is now at 2f98c16 two
+Cloning into 'detached-tag'...
+Note: switching to '2f98c16ed3231a950c127212a79f176334983d3a'.
 
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/upstream/HEAD
-	refs/remotes/upstream/main
-	EOF
-	test_cmp expect actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Cloning into 'child'...
-done.
-ok 8 - clone -c remote.<remote>.fetch=<refspec> --origin=<name>
+If you want to 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 5611.9 'set up shallow repository': 
-	git clone --depth=1 --no-local . shallow-repo
+  git switch -c <new-branch-name>
 
-Cloning into 'shallow-repo'...
-ok 9 - set up shallow repository
+Or undo this operation with:
 
-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 switch -
 
-	git -c clone.rejectshallow=false clone --no-local shallow-repo out
+Turn off this advice by setting config variable advice.detachedHead to false
 
-fatal: source repository is shallow, reject to clone.
-Cloning into 'out'...
-ok 10 - clone.rejectshallow=true should reject cloning shallow repo
+ok 5 - clone repo (detached HEAD points to tag)
 
-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 &&
+expecting success of 5610.6 'cloned HEAD matches': 
+	echo two >expect &&
+	git --git-dir=detached-tag/.git log -1 --format=%s >actual &&
+	test_cmp expect actual
 
-	git -c clone.rejectshallow=true clone --no-reject-shallow --no-local shallow-repo out
+ok 6 - cloned HEAD matches
 
-fatal: source repository is shallow, reject to clone.
-Cloning into 'out'...
-ok 11 - option --[no-]reject-shallow override clone.rejectshallow config
+expecting success of 5610.7 'cloned HEAD is detached': 
+	head_is_detached detached-tag
 
-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
+2f98c16ed3231a950c127212a79f176334983d3a
+fatal: ref HEAD is not a symbolic ref
+ok 7 - cloned HEAD is detached
 
-Cloning into 'out'...
-ok 12 - clone.rejectshallow=true should succeed cloning normal repo
+expecting success of 5610.8 'clone repo (detached HEAD points to history)': 
+	git checkout two^ &&
+	git clone "file://$PWD" detached-history
 
-ok 13 # skip clone -c core.hideDotFiles (missing MINGW)
+Previous HEAD position was 2f98c16 two
+HEAD is now at 1993c08 one
+Cloning into 'detached-history'...
+Note: switching to '1993c08d5743a2c4719f8ed3b8cc9b60d54d741e'.
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5615-alternate-env.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/.git/
-expecting success of 5615.1 'create alternate repositories': 
-	git init --bare one.git &&
-	one=$(echo one | git -C one.git hash-object -w --stdin) &&
-	git init --bare two.git &&
-	two=$(echo two | git -C two.git hash-object -w --stdin)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/one.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/two.git/
-ok 1 - create alternate repositories
+If you want to 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 5615.2 'objects inaccessible without alternates': 
-	check_obj "" <<-EOF
-	$one missing
-	$two missing
-	EOF
+  git switch -c <new-branch-name>
 
-ok 2 - objects inaccessible without alternates
+Or undo this operation with:
 
-expecting success of 5615.3 'access alternate via absolute path': 
-	check_obj "$PWD/one.git/objects" <<-EOF
-	$one blob
-	$two missing
-	EOF
+  git switch -
 
-ok 3 - access alternate via absolute path
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 5615.4 'access multiple alternates': 
-	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
-	$one blob
-	$two blob
-	EOF
+ok 8 - clone repo (detached HEAD points to history)
 
-ok 4 - access multiple alternates
+expecting success of 5610.9 'cloned HEAD matches': 
+	echo one >expect &&
+	git --git-dir=detached-history/.git log -1 --format=%s >actual &&
+	test_cmp expect actual
 
-expecting success of 5615.5 'access alternate via relative path (bare)': 
-	git init --bare bare.git &&
-	check_obj "../one.git/objects" -C bare.git <<-EOF
-	$one blob
-	EOF
+ok 9 - cloned HEAD matches
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/bare.git/
-ok 5 - access alternate via relative path (bare)
+expecting success of 5610.10 'cloned HEAD is detached': 
+	head_is_detached detached-history
 
-expecting success of 5615.6 'access alternate via relative path (worktree)': 
-	git init worktree &&
-	check_obj "../one.git/objects" -C worktree <<-EOF
-	$one blob
-	EOF
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+fatal: ref HEAD is not a symbolic ref
+ok 10 - cloned HEAD is detached
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/worktree/.git/
-ok 6 - access alternate via relative path (worktree)
+expecting success of 5610.11 'clone repo (orphan detached HEAD)': 
+	git checkout main^0 &&
+	echo four >file &&
+	git commit -a -m four &&
+	git clone "file://$PWD" detached-orphan
 
-expecting success of 5615.7 'access alternate via relative path (subdir)': 
-	mkdir subdir &&
-	check_obj "one.git/objects" -C subdir <<-EOF
-	$one blob
-	EOF
+Previous HEAD position was 1993c08 one
+HEAD is now at 0c9f2ac three
+[detached HEAD 09d9fb6] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'detached-orphan'...
+Note: switching to '09d9fb6c1b2f666fb510a7b12d14c7884d01e34e'.
 
-ok 7 - access alternate via relative path (subdir)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 5615.8 'mix of quoted and unquoted alternates': 
-	check_obj "$quoted:$unquoted" <<-EOF
-	$one blob
-	$two blob
-	EOF
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 8 - mix of quoted and unquoted alternates
+  git switch -c <new-branch-name>
 
-expecting success of 5615.9 'broken quoting falls back to interpreting raw': 
-	mv one.git \"one.git &&
-	check_obj \"one.git/objects <<-EOF
-	$one blob
-	EOF
+Or undo this operation with:
 
-ok 9 - broken quoting falls back to interpreting raw
+  git switch -
 
-# passed all 9 test(s)
-1..9
+Turn off this advice by setting config variable advice.detachedHead to false
+
+ok 11 - clone repo (orphan detached HEAD)
+
+expecting success of 5610.12 'cloned HEAD matches': 
+	echo four >expect &&
+	git --git-dir=detached-orphan/.git log -1 --format=%s >actual &&
+	test_cmp expect actual
+
+ok 12 - cloned HEAD matches
+
+expecting success of 5610.13 'cloned HEAD is detached': 
+	head_is_detached detached-orphan
+
+09d9fb6c1b2f666fb510a7b12d14c7884d01e34e
+fatal: ref HEAD is not a symbolic ref
+ok 13 - cloned HEAD is detached
+
+# still have 1 known breakage(s)
+# passed all remaining 12 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5604-clone-reference.sh ***
@@ -366355,6 +365793,252 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5611-clone-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5615-alternate-env.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/.git/
+expecting success of 5615.1 'create alternate repositories': 
+	git init --bare one.git &&
+	one=$(echo one | git -C one.git hash-object -w --stdin) &&
+	git init --bare two.git &&
+	two=$(echo two | git -C two.git hash-object -w --stdin)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/one.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/two.git/
+ok 1 - create alternate repositories
+
+expecting success of 5615.2 'objects inaccessible without alternates': 
+	check_obj "" <<-EOF
+	$one missing
+	$two missing
+	EOF
+
+ok 2 - objects inaccessible without alternates
+
+expecting success of 5615.3 'access alternate via absolute path': 
+	check_obj "$PWD/one.git/objects" <<-EOF
+	$one blob
+	$two missing
+	EOF
+
+ok 3 - access alternate via absolute path
+
+expecting success of 5615.4 'access multiple alternates': 
+	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
+	$one blob
+	$two blob
+	EOF
+
+ok 4 - access multiple alternates
+
+expecting success of 5615.5 'access alternate via relative path (bare)': 
+	git init --bare bare.git &&
+	check_obj "../one.git/objects" -C bare.git <<-EOF
+	$one blob
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/bare.git/
+ok 5 - access alternate via relative path (bare)
+
+expecting success of 5615.6 'access alternate via relative path (worktree)': 
+	git init worktree &&
+	check_obj "../one.git/objects" -C worktree <<-EOF
+	$one blob
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5615-alternate-env/worktree/.git/
+ok 6 - access alternate via relative path (worktree)
+
+expecting success of 5615.7 'access alternate via relative path (subdir)': 
+	mkdir subdir &&
+	check_obj "one.git/objects" -C subdir <<-EOF
+	$one blob
+	EOF
+
+ok 7 - access alternate via relative path (subdir)
+
+expecting success of 5615.8 'mix of quoted and unquoted alternates': 
+	check_obj "$quoted:$unquoted" <<-EOF
+	$one blob
+	$two blob
+	EOF
+
+ok 8 - mix of quoted and unquoted alternates
+
+expecting success of 5615.9 'broken quoting falls back to interpreting raw': 
+	mv one.git \"one.git &&
+	check_obj \"one.git/objects <<-EOF
+	$one blob
+	EOF
+
+ok 9 - broken quoting falls back to interpreting raw
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5613-info-alternate.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5613-info-alternate/.git/
 expecting success of 5613.1 'preparing first repository': 
@@ -366538,21 +366222,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5619-clone-local-ambiguous-transport.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5618-alternate-refs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5618-alternate-refs/.git/
 expecting success of 5618.1 'set up local refs': 
@@ -366619,6 +366288,21 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5619-clone-local-ambiguous-transport.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5612-clone-refspec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.git/
 expecting success of 5612.1 'setup': 
@@ -366677,1808 +366361,352 @@
 	git checkout side &&
 	echo five >file &&
 	git commit -a -m five &&
-	git checkout main &&
-	echo six >file &&
-	git commit -a -m six &&
-
-	# update tag
-	git tag -d two && git tag two
-
-[main (root-commit) 1993c08] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 2f98c16] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0c9f2ac] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side 09d9fb6] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Cloning into 'dir_all'...
-done.
-Cloning into 'dir_all_no_tags'...
-done.
-Cloning into 'dir_main'...
-done.
-Cloning into 'dir_main_no_tags'...
-done.
-Switched to branch 'side'
-Cloning into 'dir_side'...
-done.
-Switched to branch 'main'
-Cloning into 'dir_side2'...
-done.
-Cloning into bare repository 'dir_mirror'...
-done.
-Cloning into bare repository 'dir_mirror_side'...
-done.
-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 1993c08 one
-Cloning into 'dir_detached'...
-done.
-Note: switching to '1993c08d5743a2c4719f8ed3b8cc9b60d54d741e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-Cloning into 'dir_tag'...
-done.
-Note: switching to '2f98c16ed3231a950c127212a79f176334983d3a'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-Cloning into 'dir_tag_no_tags'...
-done.
-Note: switching to '2f98c16ed3231a950c127212a79f176334983d3a'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-Previous HEAD position was 1993c08 one
-Switched to branch 'side'
-[side c0aa622] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-[main 5efd04f] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Deleted tag 'two' (was 2f98c16)
-ok 1 - setup
-
-expecting success of 5612.2 'by default all branches will be kept updated': 
-	(
-		cd dir_all &&
-		git fetch &&
-		git for-each-ref refs/remotes/origin >refs &&
-		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" refs >../actual
-	) &&
-	# follow both main and side
-	git for-each-ref refs/heads >expect &&
-	test_cmp expect actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
-   0c9f2ac..5efd04f  main       -> origin/main
-   09d9fb6..c0aa622  side       -> origin/side
-ok 2 - by default all branches will be kept updated
-
-expecting success of 5612.3 'by default no tags will be kept updated': 
-	(
-		cd dir_all &&
-		git fetch &&
-		git for-each-ref refs/tags >../actual
-	) &&
-	git for-each-ref refs/tags >expect &&
-	! test_cmp expect actual &&
-	test_line_count = 2 actual
-
---- expect	2025-02-09 06:54:53.714029413 +0000
-+++ actual	2025-02-09 06:54:53.710029388 +0000
-@@ -1,2 +1,2 @@
- 0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed commit	refs/tags/five
--5efd04f7018dafa5c97b7431a71f14902ebbdf7e commit	refs/tags/two
-+2f98c16ed3231a950c127212a79f176334983d3a commit	refs/tags/two
-ok 3 - by default no tags will be kept updated
-
-expecting success of 5612.4 'clone with --no-tags': 
-	(
-		cd dir_all_no_tags &&
-		grep tagOpt .git/config &&
-		git fetch &&
-		git for-each-ref refs/tags >../actual
-	) &&
-	test_must_be_empty actual
-
-	tagOpt = --no-tags
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
-   0c9f2ac..5efd04f  main       -> origin/main
-   09d9fb6..c0aa622  side       -> origin/side
-ok 4 - clone with --no-tags
-
-expecting success of 5612.5 '--single-branch while HEAD pointing at main': 
-	(
-		cd dir_main &&
-		git fetch --force &&
-		git for-each-ref refs/remotes/origin >refs &&
-		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" refs >../actual
-	) &&
-	# only follow main
-	git for-each-ref refs/heads/main >expect &&
-	# get & check latest tags
-	test_cmp expect actual &&
-	(
-		cd dir_main &&
-		git fetch --tags --force &&
-		git for-each-ref refs/tags >../actual
-	) &&
-	git for-each-ref refs/tags >expect &&
-	test_cmp expect actual &&
-	test_line_count = 2 actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
-   0c9f2ac..5efd04f  main       -> origin/main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
- t [tag update]      two        -> two
-ok 5 - --single-branch while HEAD pointing at main
-
-expecting success of 5612.6 '--single-branch while HEAD pointing at main and --no-tags': 
-	(
-		cd dir_main_no_tags &&
-		git fetch &&
-		git for-each-ref refs/remotes/origin >refs &&
-		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" refs >../actual
-	) &&
-	# only follow main
-	git for-each-ref refs/heads/main >expect &&
-	test_cmp expect actual &&
-	# get tags (noop)
-	(
-		cd dir_main_no_tags &&
-		git fetch &&
-		git for-each-ref refs/tags >../actual
-	) &&
-	test_must_be_empty actual &&
-	test_line_count = 0 actual &&
-	# get tags with --tags overrides tagOpt
-	(
-		cd dir_main_no_tags &&
-		git fetch --tags &&
-		git for-each-ref refs/tags >../actual
-	) &&
-	git for-each-ref refs/tags >expect &&
-	test_cmp expect actual &&
-	test_line_count = 2 actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
-   0c9f2ac..5efd04f  main       -> origin/main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
- * [new tag]         five       -> five
- * [new tag]         two        -> two
-ok 6 - --single-branch while HEAD pointing at main and --no-tags
-
-expecting success of 5612.7 '--single-branch while HEAD pointing at side': 
-	(
-		cd dir_side &&
-		git fetch &&
-		git for-each-ref refs/remotes/origin >refs &&
-		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" refs >../actual
-	) &&
-	# only follow side
-	git for-each-ref refs/heads/side >expect &&
-	test_cmp expect actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
-   09d9fb6..c0aa622  side       -> origin/side
-ok 7 - --single-branch while HEAD pointing at side
-
-expecting success of 5612.8 '--single-branch with explicit --branch side': 
-	(
-		cd dir_side2 &&
-		git fetch &&
-		git for-each-ref refs/remotes/origin >refs &&
-		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" refs >../actual
-	) &&
-	# only follow side
-	git for-each-ref refs/heads/side >expect &&
-	test_cmp expect actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
-   09d9fb6..c0aa622  side       -> origin/side
-ok 8 - --single-branch with explicit --branch side
-
-expecting success of 5612.9 '--single-branch with explicit --branch with tag fetches updated tag': 
-	(
-		cd dir_tag &&
-		git fetch &&
-		git for-each-ref refs/tags >../actual
-	) &&
-	git for-each-ref refs/tags >expect &&
-	test_cmp expect actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
- t [tag update]      two        -> two
-ok 9 - --single-branch with explicit --branch with tag fetches updated tag
-
-expecting success of 5612.10 '--single-branch with explicit --branch with tag fetches updated tag despite --no-tags': 
-	(
-		cd dir_tag_no_tags &&
-		git fetch &&
-		git for-each-ref refs/tags >../actual
-	) &&
-	git for-each-ref refs/tags/two >expect &&
-	test_cmp expect actual &&
-	test_line_count = 1 actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
- t [tag update]      two        -> two
-ok 10 - --single-branch with explicit --branch with tag fetches updated tag despite --no-tags
-
-expecting success of 5612.11 '--single-branch with --mirror': 
-	(
-		cd dir_mirror &&
-		git fetch &&
-		git for-each-ref refs > ../actual
-	) &&
-	git for-each-ref refs >expect &&
-	test_cmp expect actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
-   0c9f2ac..5efd04f  main       -> main
- * [new branch]      side       -> side
- t [tag update]      two        -> two
-ok 11 - --single-branch with --mirror
-
-expecting success of 5612.12 '--single-branch with explicit --branch and --mirror': 
-	(
-		cd dir_mirror_side &&
-		git fetch &&
-		git for-each-ref refs > ../actual
-	) &&
-	git for-each-ref refs >expect &&
-	test_cmp expect actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
- * [new branch]      main       -> main
-   09d9fb6..c0aa622  side       -> side
- t [tag update]      two        -> two
-ok 12 - --single-branch with explicit --branch and --mirror
-
-expecting success of 5612.13 '--single-branch with detached': 
-	(
-		cd dir_detached &&
-		git fetch &&
-		git for-each-ref refs/remotes/origin >refs &&
-		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" refs >../actual
-	) &&
-	# nothing
-	test_must_be_empty actual
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
- * branch            HEAD       -> FETCH_HEAD
-ok 13 - --single-branch with detached
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5614-clone-submodules-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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 66fff38] 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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8b00b13] 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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 9d950a0] 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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5701-git-serve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5701-git-serve/.git/
-expecting success of 5701.1 'test capability advertisement': 
-	test_oid_cache <<-EOF &&
-	wrong_algo sha1:sha256
-	wrong_algo sha256:sha1
-	EOF
-	cat >expect.base <<-EOF &&
-	version 2
-	agent=git/$(git version | cut -d" " -f3)
-	ls-refs=unborn
-	fetch=shallow wait-for-done
-	server-option
-	object-format=$(test_oid algo)
-	EOF
-	cat >expect.trailer <<-EOF &&
-	0000
-	EOF
-	cat expect.base expect.trailer >expect &&
-
-	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
-		--advertise-capabilities >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 1 - test capability advertisement
-
-expecting success of 5701.2 'stateless-rpc flag does not list capabilities': 
-	# Empty request
-	test-tool pkt-line pack >in <<-EOF &&
-	0000
-	EOF
-	test-tool serve-v2 --stateless-rpc >out <in &&
-	test_must_be_empty out &&
-
-	# EOF
-	test-tool serve-v2 --stateless-rpc >out &&
-	test_must_be_empty out
-
-ok 2 - stateless-rpc flag does not list capabilities
-
-expecting success of 5701.3 'request invalid capability': 
-	test-tool pkt-line pack >in <<-EOF &&
-	foobar
-	0000
-	EOF
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	test_grep "unknown capability" err
-
-fatal: unknown capability 'foobar'
-ok 3 - request invalid capability
-
-expecting success of 5701.4 'request with no command': 
-	test-tool pkt-line pack >in <<-EOF &&
-	agent=git/test
-	object-format=$(test_oid algo)
-	0000
-	EOF
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	test_grep "no command requested" err
-
-fatal: no command requested
-ok 4 - request with no command
-
-expecting success of 5701.5 'request invalid command': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=foo
-	object-format=$(test_oid algo)
-	agent=git/test
-	0000
-	EOF
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	test_grep "invalid command" err
-
-fatal: invalid command 'foo'
-ok 5 - request invalid command
-
-expecting success of 5701.6 'request capability as command': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=agent
-	object-format=$(test_oid algo)
-	0000
-	EOF
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	grep invalid.command.*agent err
-
-fatal: invalid command 'agent'
-ok 6 - request capability as command
-
-expecting success of 5701.7 'request command as capability': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	fetch
-	0000
-	EOF
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	grep unknown.capability err
-
-fatal: unknown capability 'fetch'
-ok 7 - request command as capability
-
-expecting success of 5701.8 'requested command is command=value': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs=whatever
-	object-format=$(test_oid algo)
-	0000
-	EOF
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	grep invalid.command.*ls-refs=whatever err
-
-fatal: invalid command 'ls-refs=whatever'
-ok 8 - requested command is command=value
-
-expecting success of 5701.9 'wrong object-format': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=fetch
-	agent=git/test
-	object-format=$(test_oid wrong_algo)
-	0000
-	EOF
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	test_grep "mismatched object format" err
-
-fatal: mismatched object format: server sha1; client sha256
-ok 9 - wrong object-format
-
-expecting success of 5701.10 'setup some refs and tags': 
-	test_commit one &&
-	git branch dev main &&
-	test_commit two &&
-	git symbolic-ref refs/heads/release refs/heads/main &&
-	git tag -a -m "annotated tag" annotated-tag
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 10 - setup some refs and tags
-
-expecting success of 5701.11 'basics of ls-refs': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	0000
-	EOF
-
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) HEAD
-	$(git rev-parse refs/heads/dev) refs/heads/dev
-	$(git rev-parse refs/heads/main) refs/heads/main
-	$(git rev-parse refs/heads/release) refs/heads/release
-	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
-	$(git rev-parse refs/tags/one) refs/tags/one
-	$(git rev-parse refs/tags/two) refs/tags/two
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 11 - basics of ls-refs
-
-expecting success of 5701.12 'ls-refs complains about unknown options': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	0001
-	no-such-arg
-	0000
-	EOF
-
-	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
-	grep unexpected.line.*no-such-arg err
-
-fatal: unexpected line: 'no-such-arg'
-ok 12 - ls-refs complains about unknown options
-
-expecting success of 5701.13 'basic ref-prefixes': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	0001
-	ref-prefix refs/heads/main
-	ref-prefix refs/tags/one
-	0000
-	EOF
-
-	cat >expect <<-EOF &&
-	$(git rev-parse refs/heads/main) refs/heads/main
-	$(git rev-parse refs/tags/one) refs/tags/one
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 13 - basic ref-prefixes
-
-expecting success of 5701.14 'refs/heads prefix': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	0001
-	ref-prefix refs/heads/
-	0000
-	EOF
-
-	cat >expect <<-EOF &&
-	$(git rev-parse refs/heads/dev) refs/heads/dev
-	$(git rev-parse refs/heads/main) refs/heads/main
-	$(git rev-parse refs/heads/release) refs/heads/release
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 14 - refs/heads prefix
-
-expecting success of 5701.15 'ignore very large set of prefixes': 
-	# generate a large number of ref-prefixes that we expect
-	# to match nothing; the value here exceeds TOO_MANY_PREFIXES
-	# from ls-refs.c.
-	{
-		echo command=ls-refs &&
-		echo object-format=$(test_oid algo) &&
-		echo 0001 &&
-		perl -le "print \"ref-prefix refs/heads/\$_\" for (1..65536)" &&
-		echo 0000
-	} |
-	test-tool pkt-line pack >in &&
-
-	# and then confirm that we see unmatched prefixes anyway (i.e.,
-	# that the prefix was not applied).
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) HEAD
-	$(git rev-parse refs/heads/dev) refs/heads/dev
-	$(git rev-parse refs/heads/main) refs/heads/main
-	$(git rev-parse refs/heads/release) refs/heads/release
-	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
-	$(git rev-parse refs/tags/one) refs/tags/one
-	$(git rev-parse refs/tags/two) refs/tags/two
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 15 - ignore very large set of prefixes
-
-expecting success of 5701.16 'peel parameter': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	0001
-	peel
-	ref-prefix refs/tags/
-	0000
-	EOF
-
-	cat >expect <<-EOF &&
-	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag peeled:$(git rev-parse refs/tags/annotated-tag^{})
-	$(git rev-parse refs/tags/one) refs/tags/one
-	$(git rev-parse refs/tags/two) refs/tags/two
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 16 - peel parameter
-
-expecting success of 5701.17 'symrefs parameter': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	0001
-	symrefs
-	ref-prefix refs/heads/
-	0000
-	EOF
-
-	cat >expect <<-EOF &&
-	$(git rev-parse refs/heads/dev) refs/heads/dev
-	$(git rev-parse refs/heads/main) refs/heads/main
-	$(git rev-parse refs/heads/release) refs/heads/release symref-target:refs/heads/main
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 17 - symrefs parameter
-
-expecting success of 5701.18 'sending server-options': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=ls-refs
-	object-format=$(test_oid algo)
-	server-option=hello
-	server-option=world
-	0001
-	ref-prefix HEAD
-	0000
-	EOF
-
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) HEAD
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 18 - sending server-options
-
-expecting success of 5701.19 'unexpected lines are not allowed in fetch request': 
-	git init server &&
-
-	test-tool pkt-line pack >in <<-EOF &&
-	command=fetch
-	object-format=$(test_oid algo)
-	0001
-	this-is-not-a-command
-	0000
-	EOF
-
-	(
-		cd server &&
-		test_must_fail test-tool serve-v2 --stateless-rpc
-	) <in >/dev/null 2>err &&
-	grep "unexpected line: .this-is-not-a-command." err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5701-git-serve/server/.git/
-fatal: unexpected line: 'this-is-not-a-command'
-ok 19 - unexpected lines are not allowed in fetch request
-
-expecting success of 5701.20 'basics of object-info': 
-	test_config transfer.advertiseObjectInfo true &&
-
-	test-tool pkt-line pack >in <<-EOF &&
-	command=object-info
-	object-format=$(test_oid algo)
-	0001
-	size
-	oid $(git rev-parse two:two.t)
-	oid $(git rev-parse two:two.t)
-	0000
-	EOF
-
-	cat >expect <<-EOF &&
-	size
-	$(git rev-parse two:two.t) $(wc -c <two.t | xargs)
-	$(git rev-parse two:two.t) $(wc -c <two.t | xargs)
-	0000
-	EOF
-
-	test-tool serve-v2 --stateless-rpc <in >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 20 - basics of object-info
-
-expecting success of 5701.21 'test capability advertisement with uploadpack.advertiseBundleURIs': 
-	test_config uploadpack.advertiseBundleURIs true &&
-
-	cat >expect.extra <<-EOF &&
-	bundle-uri
-	EOF
-	cat expect.base \
-	    expect.extra \
-	    expect.trailer >expect &&
-
-	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
-		--advertise-capabilities >out &&
-	test-tool pkt-line unpack <out >actual &&
-	test_cmp expect actual
-
-ok 21 - test capability advertisement with uploadpack.advertiseBundleURIs
-
-expecting success of 5701.22 'basics of bundle-uri: dies if not enabled': 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=bundle-uri
-	0000
-	EOF
-
-	cat >err.expect <<-\EOF &&
-	fatal: invalid command 'bundle-uri'
-	EOF
-
-	cat >expect <<-\EOF &&
-	ERR serve: invalid command 'bundle-uri'
-	EOF
-
-	test_must_fail test-tool serve-v2 --stateless-rpc <in >out 2>err.actual &&
-	test_cmp err.expect err.actual &&
-	test_must_be_empty out
-
-ok 22 - basics of bundle-uri: dies if not enabled
-
-expecting success of 5701.23 'object-info missing from capabilities when disabled': 
-	test_config transfer.advertiseObjectInfo false &&
-
-	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
-		--advertise-capabilities >out &&
-	test-tool pkt-line unpack <out >actual &&
-
-	! grep object.info actual
-
-ok 23 - object-info missing from capabilities when disabled
-
-expecting success of 5701.24 'object-info commands rejected when disabled': 
-	test_config transfer.advertiseObjectInfo false &&
-
-	test-tool pkt-line pack >in <<-EOF &&
-	command=object-info
-	EOF
-
-	test_must_fail test-tool serve-v2 --stateless-rpc <in 2>err &&
-	grep invalid.command err
-
-fatal: invalid command 'object-info'
-ok 24 - object-info commands rejected when disabled
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5617-clone-submodules-remote.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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 eb92b10] 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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5704-protocol-violations.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5704-protocol-violations/.git/
-expecting success of 5704.1 'extra delim packet in v2 ls-refs args': 
-	{
-		packetize command=ls-refs &&
-		packetize "object-format=$(test_oid algo)" &&
-		printf 0001 &&
-		# protocol expects 0000 flush here
-		printf 0001
-	} >input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git upload-pack . <input 2>err &&
-	test_grep "expected flush after ls-refs arguments" err
-
-000eversion 2
-002aagent=git/2.48.0.rc1.219.gb6b6757d772
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: expected flush after ls-refs arguments
-ok 1 - extra delim packet in v2 ls-refs args
-
-expecting success of 5704.2 'extra delim packet in v2 fetch args': 
-	{
-		packetize command=fetch &&
-		packetize "object-format=$(test_oid algo)" &&
-		printf 0001 &&
-		# protocol expects 0000 flush here
-		printf 0001
-	} >input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git upload-pack . <input 2>err &&
-	test_grep "expected flush after fetch arguments" err
-
-000eversion 2
-002aagent=git/2.48.0.rc1.219.gb6b6757d772
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: expected flush after fetch arguments
-ok 2 - extra delim packet in v2 fetch args
-
-expecting success of 5704.3 'bogus symref in v0 capabilities': 
-	test_commit foo &&
-	oid=$(git rev-parse HEAD) &&
-	dst=refs/heads/foo &&
-	{
-		printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
-			"$oid" "$GIT_DEFAULT_HASH" "$dst" |
-			test-tool pkt-line pack-raw-stdin &&
-		printf "0000"
-	} >input &&
-	git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
-	printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
-	test_cmp expect actual
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 3 - bogus symref in v0 capabilities
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5700-protocol-v1.sh ***
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-Starting git daemon ...
-[1781325] Ready to rumble
-expecting success of 5700.1 'create repo to be served by git-daemon': 
-	git init "$daemon_parent" &&
-	test_commit -C "$daemon_parent" one
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/repo/parent/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - create repo to be served by git-daemon
-
-expecting success of 5700.2 'clone with git:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
-		clone "$GIT_DAEMON_URL/parent" daemon_child 2>log &&
-
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v1
-	grep "clone> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "clone< version 1" log
-
-[1781491] Connection from 127.0.0.1:55736
-[1781491] Extended attribute "host": 127.0.0.1:5700
-[1781491] Extended attribute "protocol": version=1
-[1781491] Request upload-pack for '/parent'
-[1781325] [1781491] Disconnected
-packet:        clone> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
-packet:        clone< version 1
-ok 2 - clone with git:// using protocol v1
-
-expecting success of 5700.3 'fetch with git:// using protocol v1': 
-	test_commit -C "$daemon_parent" two &&
-
-	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
-		fetch 2>log &&
-
-	git -C daemon_child log -1 --format=%s origin/main >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v1
-	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[1781976] Connection from 127.0.0.1:55752
-[1781976] Extended attribute "host": 127.0.0.1:5700
-[1781976] Extended attribute "protocol": version=1
-[1781976] Request upload-pack for '/parent'
-[1781325] [1781976] Disconnected
-packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
-packet:        fetch< version 1
-ok 3 - fetch with git:// using protocol v1
-
-expecting success of 5700.4 'pull with git:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
-		pull 2>log &&
-
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v1
-	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-[1782367] Connection from 127.0.0.1:55762
-[1782367] Extended attribute "host": 127.0.0.1:5700
-[1782367] Extended attribute "protocol": version=1
-[1782367] Request upload-pack for '/parent'
-[1781325] [1782367] Disconnected
-Updating d79ce16..139b20d
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
-packet:        fetch< version 1
-ok 4 - pull with git:// using protocol v1
-
-expecting success of 5700.5 'push with git:// using protocol v1': 
-	test_commit -C daemon_child three &&
-
-	# Push to another branch, as the target repository has the
-	# main branch checked out and we cannot push into it.
-	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
-		push origin HEAD:client_branch 2>log &&
-
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v1
-	grep "push> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "push< version 1" log
-
-[main 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[1782593] Connection from 127.0.0.1:55764
-[1782593] Extended attribute "host": 127.0.0.1:5700
-[1782593] Extended attribute "protocol": version=1
-[1782593] Request receive-pack for '/parent'
-[1781325] [1782593] 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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/file_parent/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 6 - create repo to be served by file:// transport
-
-expecting success of 5700.7 'clone with file:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
-		clone "file://$(pwd)/file_parent" file_child 2>log &&
-
-	git -C file_child log -1 --format=%s >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "clone< version 1" log
-
-packet:        clone< version 1
-ok 7 - clone with file:// using protocol v1
-
-expecting success of 5700.8 'fetch with file:// using protocol v1': 
-	test_commit -C file_parent two &&
-
-	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
-		fetch 2>log &&
-
-	git -C file_child log -1 --format=%s origin/main >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 8 - fetch with file:// using protocol v1
-
-expecting success of 5700.9 'pull with file:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
-		pull 2>log &&
-
-	git -C file_child log -1 --format=%s >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-Updating af0b45c..1dd7f79
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 9 - pull with file:// using protocol v1
-
-expecting success of 5700.10 'push with file:// using protocol v1': 
-	test_commit -C file_child three &&
-
-	# Push to another branch, as the target repository has the
-	# main branch checked out and we cannot push into it.
-	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
-		push origin HEAD:client_branch 2>log &&
-
-	git -C file_child log -1 --format=%s >actual &&
-	git -C file_parent log -1 --format=%s client_branch >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "push< version 1" log
-
-[main a136e4a] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-packet:         push< version 1
-ok 10 - push with file:// using protocol v1
-
-expecting success of 5700.11 'cloning branchless tagless but not refless remote': 
-	rm -rf server client &&
-
-	git -c init.defaultbranch=main init server &&
-	echo foo >server/foo.txt &&
-	git -C server add foo.txt &&
-	git -C server commit -m "message" &&
-	git -C server update-ref refs/notbranch/alsonottag HEAD &&
-	git -C server checkout --detach &&
-	git -C server branch -D main &&
-	git -C server symbolic-ref HEAD refs/heads/nonexistentbranch &&
-
-	git -c protocol.version=1 clone "file://$(pwd)/server" client
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/server/.git/
-[main (root-commit) 271cf0d] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.txt
-HEAD is now at 271cf0d message
-Deleted branch main (was 271cf0d).
-Cloning into 'client'...
-warning: You appear to have cloned an empty repository.
-ok 11 - cloning branchless tagless but not refless remote
-
-expecting success of 5700.12 'setup ssh wrapper': 
-	GIT_SSH="$GIT_BUILD_DIR/t/helper/test-fake-ssh" &&
-	export GIT_SSH &&
-	GIT_SSH_VARIANT=ssh &&
-	export GIT_SSH_VARIANT &&
-	export TRASH_DIRECTORY &&
-	>"$TRASH_DIRECTORY"/ssh-output
-
-ok 12 - setup ssh wrapper
-
-expecting success of 5700.13 'create repo to be served by ssh:// transport': 
-	git init ssh_parent &&
-	test_commit -C ssh_parent one
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/ssh_parent/.git/
-[main (root-commit) 06e07da] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 13 - create repo to be served by ssh:// transport
-
-expecting success of 5700.14 'clone with ssh:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
-		clone "ssh://myhost:$(pwd)/ssh_parent" ssh_child 2>log &&
-	expect_ssh git-upload-pack &&
-
-	git -C ssh_child log -1 --format=%s >actual &&
-	git -C ssh_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "clone< version 1" log
-
-packet:        clone< version 1
-ok 14 - clone with ssh:// using protocol v1
-
-expecting success of 5700.15 'fetch with ssh:// using protocol v1': 
-	test_commit -C ssh_parent two &&
-
-	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
-		fetch 2>log &&
-	expect_ssh git-upload-pack &&
-
-	git -C ssh_child log -1 --format=%s origin/main >actual &&
-	git -C ssh_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-[main 738d2f7] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 15 - fetch with ssh:// using protocol v1
-
-expecting success of 5700.16 'pull with ssh:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
-		pull 2>log &&
-	expect_ssh git-upload-pack &&
-
-	git -C ssh_child log -1 --format=%s >actual &&
-	git -C ssh_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-Updating 06e07da..738d2f7
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 16 - pull with ssh:// using protocol v1
-
-expecting success of 5700.17 'push with ssh:// using protocol v1': 
-	test_commit -C ssh_child three &&
-
-	# Push to another branch, as the target repository has the
-	# main branch checked out and we cannot push into it.
-	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
-		push origin HEAD:client_branch 2>log &&
-	expect_ssh git-receive-pack &&
-
-	git -C ssh_child log -1 --format=%s >actual &&
-	git -C ssh_parent log -1 --format=%s client_branch >expect &&
-	test_cmp expect actual &&
+	git checkout main &&
+	echo six >file &&
+	git commit -a -m six &&
 
-	# Server responded using protocol v1
-	grep "push< version 1" log
+	# update tag
+	git tag -d two && git tag two
 
-[main 05cc2ac] three
+[main (root-commit) 1993c08] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-packet:         push< version 1
-ok 17 - push with ssh:// using protocol v1
+ create mode 100644 file
+[main 2f98c16] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0c9f2ac] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side 09d9fb6] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Cloning into 'dir_all'...
+done.
+Cloning into 'dir_all_no_tags'...
+done.
+Cloning into 'dir_main'...
+done.
+Cloning into 'dir_main_no_tags'...
+done.
+Switched to branch 'side'
+Cloning into 'dir_side'...
+done.
+Switched to branch 'main'
+Cloning into 'dir_side2'...
+done.
+Cloning into bare repository 'dir_mirror'...
+done.
+Cloning into bare repository 'dir_mirror_side'...
+done.
+Note: switching to 'two^'.
 
-expecting success of 5700.18 'clone propagates object-format from empty repo': 
-	test_when_finished "rm -fr src256 dst256" &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	echo sha256 >expect &&
-	git init --object-format=sha256 src256 &&
-	git clone --no-local src256 dst256 &&
-	git -C dst256 rev-parse --show-object-format >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:
 
-	test_cmp expect actual
+  git switch -c <new-branch-name>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/src256/.git/
-Cloning into 'dst256'...
-warning: You appear to have cloned an empty repository.
-ok 18 - clone propagates object-format from empty repo
+Or undo this operation with:
 
-checking prerequisite: NOT_ROOT
+  git switch -
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+Turn off this advice by setting config variable advice.detachedHead to false
 
-)
-prerequisite NOT_ROOT ok
-# passed all 18 test(s)
-# SKIP no web server found at ''
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5730-protocol-v2-bundle-uri-file.sh ***
-expecting success of 5730.1 'setup protocol v2 file:// tests': 
-	git init "$BUNDLE_URI_PARENT" &&
-	test_commit -C "$BUNDLE_URI_PARENT" one &&
-	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
+HEAD is now at 1993c08 one
+Cloning into 'dir_detached'...
+done.
+Note: switching to '1993c08d5743a2c4719f8ed3b8cc9b60d54d741e'.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5730-protocol-v2-bundle-uri-file/file_parent/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup protocol v2 file:// tests
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 5730.2 'connect with file:// using protocol v2: no bundle-uri': 
-	test_when_finished "rm -f log" &&
-	test_when_finished "git -C \"$BUNDLE_URI_PARENT\" config uploadpack.advertiseBundleURIs true" &&
-	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs false &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c protocol.version=2 \
-		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
-		>actual 2>err &&
+  git switch -c <new-branch-name>
 
-	# Server responded using protocol v2
-	grep "< version 2" log &&
+Or undo this operation with:
 
-	! grep bundle-uri log
+  git switch -
 
-packet:    ls-remote< version 2
-ok 2 - connect with file:// using protocol v2: no bundle-uri
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 5730.3 'connect with file:// using protocol v2: have bundle-uri': 
-	test_when_finished "rm -f log" &&
+Cloning into 'dir_tag'...
+done.
+Note: switching to '2f98c16ed3231a950c127212a79f176334983d3a'.
 
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c protocol.version=2 \
-		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
-		>actual 2>err &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	# Server responded using protocol v2
-	grep "< version 2" 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:
 
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log
+  git switch -c <new-branch-name>
 
-packet:    ls-remote< version 2
-packet:    ls-remote< bundle-uri
-ok 3 - connect with file:// using protocol v2: have bundle-uri
+Or undo this operation with:
 
-expecting success of 5730.4 'clone with file:// using protocol v2: request bundle-uris': 
-	test_when_finished "rm -rf log* cloned*" &&
+  git switch -
 
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c transfer.bundleURI=false \
-		-c protocol.version=2 \
-		clone "$BUNDLE_URI_REPO_URI" cloned \
-		>actual 2>err &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	# Server responded using protocol v2
-	grep "< version 2" log &&
+Cloning into 'dir_tag_no_tags'...
+done.
+Note: switching to '2f98c16ed3231a950c127212a79f176334983d3a'.
 
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" 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.
 
-	# Client did not issue bundle-uri command
-	! grep "> command=bundle-uri" log &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c transfer.bundleURI=true \
-		-c protocol.version=2 \
-		clone "$BUNDLE_URI_REPO_URI" cloned2 \
-		>actual 2>err &&
+  git switch -c <new-branch-name>
 
-	# Server responded using protocol v2
-	grep "< version 2" log &&
+Or undo this operation with:
 
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log &&
+  git switch -
 
-	# Client issued bundle-uri command
-	grep "> command=bundle-uri" log &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	GIT_TRACE_PACKET="$PWD/log3" \
-	git \
-		-c transfer.bundleURI=true \
-		-c protocol.version=2 \
-		clone --bundle-uri="$BUNDLE_URI_BUNDLE_URI" \
-		"$BUNDLE_URI_REPO_URI" cloned3 \
-		>actual 2>err &&
+Previous HEAD position was 1993c08 one
+Switched to branch 'side'
+[side c0aa622] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+[main 5efd04f] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Deleted tag 'two' (was 2f98c16)
+ok 1 - setup
 
-	# Server responded using protocol v2
-	grep "< version 2" log3 &&
+expecting success of 5612.2 'by default all branches will be kept updated': 
+	(
+		cd dir_all &&
+		git fetch &&
+		git for-each-ref refs/remotes/origin >refs &&
+		sed -e "/HEAD$/d" \
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
+	) &&
+	# follow both main and side
+	git for-each-ref refs/heads >expect &&
+	test_cmp expect actual
 
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log3 &&
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+   0c9f2ac..5efd04f  main       -> origin/main
+   09d9fb6..c0aa622  side       -> origin/side
+ok 2 - by default all branches will be kept updated
 
-	# Client did not issue bundle-uri command (--bundle-uri override)
-	! grep "> command=bundle-uri" log3
+expecting success of 5612.3 'by default no tags will be kept updated': 
+	(
+		cd dir_all &&
+		git fetch &&
+		git for-each-ref refs/tags >../actual
+	) &&
+	git for-each-ref refs/tags >expect &&
+	! test_cmp expect actual &&
+	test_line_count = 2 actual
 
-packet:        clone< version 2
-packet:        clone< bundle-uri
-packet:        clone< version 2
-packet:        clone< version 2
-packet:        clone< bundle-uri
-packet:        clone< bundle-uri
-packet:        clone> command=bundle-uri
-packet:        clone< version 2
-packet:        clone< bundle-uri
-ok 4 - clone with file:// using protocol v2: request bundle-uris
+--- expect	2026-03-14 13:33:33.298677808 +0000
++++ actual	2026-03-14 13:33:33.282677808 +0000
+@@ -1,2 +1,2 @@
+ 0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed commit	refs/tags/five
+-5efd04f7018dafa5c97b7431a71f14902ebbdf7e commit	refs/tags/two
++2f98c16ed3231a950c127212a79f176334983d3a commit	refs/tags/two
+ok 3 - by default no tags will be kept updated
 
-expecting success of 5730.5 'enable transfer.bundleURI for remaining tests': 
-	git config --global transfer.bundleURI true
+expecting success of 5612.4 'clone with --no-tags': 
+	(
+		cd dir_all_no_tags &&
+		grep tagOpt .git/config &&
+		git fetch &&
+		git for-each-ref refs/tags >../actual
+	) &&
+	test_must_be_empty actual
 
-ok 5 - enable transfer.bundleURI for remaining tests
+	tagOpt = --no-tags
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+   0c9f2ac..5efd04f  main       -> origin/main
+   09d9fb6..c0aa622  side       -> origin/side
+ok 4 - clone with --no-tags
 
-expecting success of 5730.6 'test bundle-uri with file:// using protocol v2': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+expecting success of 5612.5 '--single-branch while HEAD pointing at main': 
+	(
+		cd dir_main &&
+		git fetch --force &&
+		git for-each-ref refs/remotes/origin >refs &&
+		sed -e "/HEAD$/d" \
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
+	) &&
+	# only follow main
+	git for-each-ref refs/heads/main >expect &&
+	# get & check latest tags
+	test_cmp expect actual &&
+	(
+		cd dir_main &&
+		git fetch --tags --force &&
+		git for-each-ref refs/tags >../actual
+	) &&
+	git for-each-ref refs/tags >expect &&
+	test_cmp expect actual &&
+	test_line_count = 2 actual
 
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "only"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
-	EOF
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+   0c9f2ac..5efd04f  main       -> origin/main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+ t [tag update]      two        -> two
+ok 5 - --single-branch while HEAD pointing at main
 
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
+expecting success of 5612.6 '--single-branch while HEAD pointing at main and --no-tags': 
+	(
+		cd dir_main_no_tags &&
+		git fetch &&
+		git for-each-ref refs/remotes/origin >refs &&
+		sed -e "/HEAD$/d" \
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
+	) &&
+	# only follow main
+	git for-each-ref refs/heads/main >expect &&
+	test_cmp expect actual &&
+	# get tags (noop)
+	(
+		cd dir_main_no_tags &&
+		git fetch &&
+		git for-each-ref refs/tags >../actual
+	) &&
+	test_must_be_empty actual &&
+	test_line_count = 0 actual &&
+	# get tags with --tags overrides tagOpt
+	(
+		cd dir_main_no_tags &&
+		git fetch --tags &&
+		git for-each-ref refs/tags >../actual
+	) &&
+	git for-each-ref refs/tags >expect &&
+	test_cmp expect actual &&
+	test_line_count = 2 actual
 
-ok 6 - test bundle-uri with file:// using protocol v2
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+   0c9f2ac..5efd04f  main       -> origin/main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+ * [new tag]         five       -> five
+ * [new tag]         two        -> two
+ok 6 - --single-branch while HEAD pointing at main and --no-tags
 
-expecting success of 5730.7 'test bundle-uri with file:// using protocol v2 and extra data': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+expecting success of 5612.7 '--single-branch while HEAD pointing at side': 
+	(
+		cd dir_side &&
+		git fetch &&
+		git for-each-ref refs/remotes/origin >refs &&
+		sed -e "/HEAD$/d" \
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
+	) &&
+	# only follow side
+	git for-each-ref refs/heads/side >expect &&
+	test_cmp expect actual
 
-	# Extra data should be ignored
-	test_config -C "$BUNDLE_URI_PARENT" bundle.only.extra bogus &&
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+   09d9fb6..c0aa622  side       -> origin/side
+ok 7 - --single-branch while HEAD pointing at side
 
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "only"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
-	EOF
+expecting success of 5612.8 '--single-branch with explicit --branch side': 
+	(
+		cd dir_side2 &&
+		git fetch &&
+		git for-each-ref refs/remotes/origin >refs &&
+		sed -e "/HEAD$/d" \
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
+	) &&
+	# only follow side
+	git for-each-ref refs/heads/side >expect &&
+	test_cmp expect actual
 
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+   09d9fb6..c0aa622  side       -> origin/side
+ok 8 - --single-branch with explicit --branch side
 
-ok 7 - test bundle-uri with file:// using protocol v2 and extra data
+expecting success of 5612.9 '--single-branch with explicit --branch with tag fetches updated tag': 
+	(
+		cd dir_tag &&
+		git fetch &&
+		git for-each-ref refs/tags >../actual
+	) &&
+	git for-each-ref refs/tags >expect &&
+	test_cmp expect actual
 
-expecting success of 5730.8 'test bundle-uri with file:// using protocol v2 with list': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle1.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl" &&
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle2.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl" &&
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle3.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl" &&
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+ t [tag update]      two        -> two
+ok 9 - --single-branch with explicit --branch with tag fetches updated tag
 
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "bundle1"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl
-	[bundle "bundle2"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl
-	[bundle "bundle3"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl
-	EOF
+expecting success of 5612.10 '--single-branch with explicit --branch with tag fetches updated tag despite --no-tags': 
+	(
+		cd dir_tag_no_tags &&
+		git fetch &&
+		git for-each-ref refs/tags >../actual
+	) &&
+	git for-each-ref refs/tags/two >expect &&
+	test_cmp expect actual &&
+	test_line_count = 1 actual
 
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+ t [tag update]      two        -> two
+ok 10 - --single-branch with explicit --branch with tag fetches updated tag despite --no-tags
 
-ok 8 - test bundle-uri with file:// using protocol v2 with list
+expecting success of 5612.11 '--single-branch with --mirror': 
+	(
+		cd dir_mirror &&
+		git fetch &&
+		git for-each-ref refs > ../actual
+	) &&
+	git for-each-ref refs >expect &&
+	test_cmp expect actual
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5732-protocol-v2-bundle-uri-http.sh ***
-checking prerequisite: NOT_ROOT
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+   0c9f2ac..5efd04f  main       -> main
+ * [new branch]      side       -> side
+ t [tag update]      two        -> two
+ok 11 - --single-branch with --mirror
 
-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 5612.12 '--single-branch with explicit --branch and --mirror': 
+	(
+		cd dir_mirror_side &&
+		git fetch &&
+		git for-each-ref refs > ../actual
+	) &&
+	git for-each-ref refs >expect &&
+	test_cmp expect actual
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+ * [new branch]      main       -> main
+   09d9fb6..c0aa622  side       -> side
+ t [tag update]      two        -> two
+ok 12 - --single-branch with explicit --branch and --mirror
+
+expecting success of 5612.13 '--single-branch with detached': 
+	(
+		cd dir_detached &&
+		git fetch &&
+		git for-each-ref refs/remotes/origin >refs &&
+		sed -e "/HEAD$/d" \
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
+	) &&
+	# nothing
+	test_must_be_empty actual
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5612-clone-refspec/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 13 - --single-branch with detached
+
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5552-skipping-fetch-negotiator.sh ***
@@ -369825,6 +368053,1461 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5614-clone-submodules-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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 66fff38] 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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8b00b13] 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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 9d950a0] 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.48.0~rc1+next.20250101/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5701-git-serve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5701-git-serve/.git/
+expecting success of 5701.1 'test capability advertisement': 
+	test_oid_cache <<-EOF &&
+	wrong_algo sha1:sha256
+	wrong_algo sha256:sha1
+	EOF
+	cat >expect.base <<-EOF &&
+	version 2
+	agent=git/$(git version | cut -d" " -f3)
+	ls-refs=unborn
+	fetch=shallow wait-for-done
+	server-option
+	object-format=$(test_oid algo)
+	EOF
+	cat >expect.trailer <<-EOF &&
+	0000
+	EOF
+	cat expect.base expect.trailer >expect &&
+
+	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
+		--advertise-capabilities >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 1 - test capability advertisement
+
+expecting success of 5701.2 'stateless-rpc flag does not list capabilities': 
+	# Empty request
+	test-tool pkt-line pack >in <<-EOF &&
+	0000
+	EOF
+	test-tool serve-v2 --stateless-rpc >out <in &&
+	test_must_be_empty out &&
+
+	# EOF
+	test-tool serve-v2 --stateless-rpc >out &&
+	test_must_be_empty out
+
+ok 2 - stateless-rpc flag does not list capabilities
+
+expecting success of 5701.3 'request invalid capability': 
+	test-tool pkt-line pack >in <<-EOF &&
+	foobar
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	test_grep "unknown capability" err
+
+fatal: unknown capability 'foobar'
+ok 3 - request invalid capability
+
+expecting success of 5701.4 'request with no command': 
+	test-tool pkt-line pack >in <<-EOF &&
+	agent=git/test
+	object-format=$(test_oid algo)
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	test_grep "no command requested" err
+
+fatal: no command requested
+ok 4 - request with no command
+
+expecting success of 5701.5 'request invalid command': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=foo
+	object-format=$(test_oid algo)
+	agent=git/test
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	test_grep "invalid command" err
+
+fatal: invalid command 'foo'
+ok 5 - request invalid command
+
+expecting success of 5701.6 'request capability as command': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=agent
+	object-format=$(test_oid algo)
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep invalid.command.*agent err
+
+fatal: invalid command 'agent'
+ok 6 - request capability as command
+
+expecting success of 5701.7 'request command as capability': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	fetch
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep unknown.capability err
+
+fatal: unknown capability 'fetch'
+ok 7 - request command as capability
+
+expecting success of 5701.8 'requested command is command=value': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs=whatever
+	object-format=$(test_oid algo)
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep invalid.command.*ls-refs=whatever err
+
+fatal: invalid command 'ls-refs=whatever'
+ok 8 - requested command is command=value
+
+expecting success of 5701.9 'wrong object-format': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=fetch
+	agent=git/test
+	object-format=$(test_oid wrong_algo)
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	test_grep "mismatched object format" err
+
+fatal: mismatched object format: server sha1; client sha256
+ok 9 - wrong object-format
+
+expecting success of 5701.10 'setup some refs and tags': 
+	test_commit one &&
+	git branch dev main &&
+	test_commit two &&
+	git symbolic-ref refs/heads/release refs/heads/main &&
+	git tag -a -m "annotated tag" annotated-tag
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 10 - setup some refs and tags
+
+expecting success of 5701.11 'basics of ls-refs': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse refs/heads/dev) refs/heads/dev
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/heads/release) refs/heads/release
+	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
+	$(git rev-parse refs/tags/one) refs/tags/one
+	$(git rev-parse refs/tags/two) refs/tags/two
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 11 - basics of ls-refs
+
+expecting success of 5701.12 'ls-refs complains about unknown options': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	0001
+	no-such-arg
+	0000
+	EOF
+
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep unexpected.line.*no-such-arg err
+
+fatal: unexpected line: 'no-such-arg'
+ok 12 - ls-refs complains about unknown options
+
+expecting success of 5701.13 'basic ref-prefixes': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	0001
+	ref-prefix refs/heads/main
+	ref-prefix refs/tags/one
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/tags/one) refs/tags/one
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 13 - basic ref-prefixes
+
+expecting success of 5701.14 'refs/heads prefix': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	0001
+	ref-prefix refs/heads/
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	$(git rev-parse refs/heads/dev) refs/heads/dev
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/heads/release) refs/heads/release
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 14 - refs/heads prefix
+
+expecting success of 5701.15 'ignore very large set of prefixes': 
+	# generate a large number of ref-prefixes that we expect
+	# to match nothing; the value here exceeds TOO_MANY_PREFIXES
+	# from ls-refs.c.
+	{
+		echo command=ls-refs &&
+		echo object-format=$(test_oid algo) &&
+		echo 0001 &&
+		perl -le "print \"ref-prefix refs/heads/\$_\" for (1..65536)" &&
+		echo 0000
+	} |
+	test-tool pkt-line pack >in &&
+
+	# and then confirm that we see unmatched prefixes anyway (i.e.,
+	# that the prefix was not applied).
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse refs/heads/dev) refs/heads/dev
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/heads/release) refs/heads/release
+	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
+	$(git rev-parse refs/tags/one) refs/tags/one
+	$(git rev-parse refs/tags/two) refs/tags/two
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 15 - ignore very large set of prefixes
+
+expecting success of 5701.16 'peel parameter': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	0001
+	peel
+	ref-prefix refs/tags/
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag peeled:$(git rev-parse refs/tags/annotated-tag^{})
+	$(git rev-parse refs/tags/one) refs/tags/one
+	$(git rev-parse refs/tags/two) refs/tags/two
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 16 - peel parameter
+
+expecting success of 5701.17 'symrefs parameter': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	0001
+	symrefs
+	ref-prefix refs/heads/
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	$(git rev-parse refs/heads/dev) refs/heads/dev
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/heads/release) refs/heads/release symref-target:refs/heads/main
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 17 - symrefs parameter
+
+expecting success of 5701.18 'sending server-options': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	server-option=hello
+	server-option=world
+	0001
+	ref-prefix HEAD
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 18 - sending server-options
+
+expecting success of 5701.19 'unexpected lines are not allowed in fetch request': 
+	git init server &&
+
+	test-tool pkt-line pack >in <<-EOF &&
+	command=fetch
+	object-format=$(test_oid algo)
+	0001
+	this-is-not-a-command
+	0000
+	EOF
+
+	(
+		cd server &&
+		test_must_fail test-tool serve-v2 --stateless-rpc
+	) <in >/dev/null 2>err &&
+	grep "unexpected line: .this-is-not-a-command." err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5701-git-serve/server/.git/
+fatal: unexpected line: 'this-is-not-a-command'
+ok 19 - unexpected lines are not allowed in fetch request
+
+expecting success of 5701.20 'basics of object-info': 
+	test_config transfer.advertiseObjectInfo true &&
+
+	test-tool pkt-line pack >in <<-EOF &&
+	command=object-info
+	object-format=$(test_oid algo)
+	0001
+	size
+	oid $(git rev-parse two:two.t)
+	oid $(git rev-parse two:two.t)
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	size
+	$(git rev-parse two:two.t) $(wc -c <two.t | xargs)
+	$(git rev-parse two:two.t) $(wc -c <two.t | xargs)
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 20 - basics of object-info
+
+expecting success of 5701.21 'test capability advertisement with uploadpack.advertiseBundleURIs': 
+	test_config uploadpack.advertiseBundleURIs true &&
+
+	cat >expect.extra <<-EOF &&
+	bundle-uri
+	EOF
+	cat expect.base \
+	    expect.extra \
+	    expect.trailer >expect &&
+
+	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
+		--advertise-capabilities >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+
+ok 21 - test capability advertisement with uploadpack.advertiseBundleURIs
+
+expecting success of 5701.22 'basics of bundle-uri: dies if not enabled': 
+	test-tool pkt-line pack >in <<-EOF &&
+	command=bundle-uri
+	0000
+	EOF
+
+	cat >err.expect <<-\EOF &&
+	fatal: invalid command 'bundle-uri'
+	EOF
+
+	cat >expect <<-\EOF &&
+	ERR serve: invalid command 'bundle-uri'
+	EOF
+
+	test_must_fail test-tool serve-v2 --stateless-rpc <in >out 2>err.actual &&
+	test_cmp err.expect err.actual &&
+	test_must_be_empty out
+
+ok 22 - basics of bundle-uri: dies if not enabled
+
+expecting success of 5701.23 'object-info missing from capabilities when disabled': 
+	test_config transfer.advertiseObjectInfo false &&
+
+	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
+		--advertise-capabilities >out &&
+	test-tool pkt-line unpack <out >actual &&
+
+	! grep object.info actual
+
+ok 23 - object-info missing from capabilities when disabled
+
+expecting success of 5701.24 'object-info commands rejected when disabled': 
+	test_config transfer.advertiseObjectInfo false &&
+
+	test-tool pkt-line pack >in <<-EOF &&
+	command=object-info
+	EOF
+
+	test_must_fail test-tool serve-v2 --stateless-rpc <in 2>err &&
+	grep invalid.command err
+
+fatal: invalid command 'object-info'
+ok 24 - object-info commands rejected when disabled
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5617-clone-submodules-remote.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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 eb92b10] 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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5700-protocol-v1.sh ***
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+Starting git daemon ...
+[241369] Ready to rumble
+expecting success of 5700.1 'create repo to be served by git-daemon': 
+	git init "$daemon_parent" &&
+	test_commit -C "$daemon_parent" one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/repo/parent/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - create repo to be served by git-daemon
+
+expecting success of 5700.2 'clone with git:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+		clone "$GIT_DAEMON_URL/parent" daemon_child 2>log &&
+
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "clone> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "clone< version 1" log
+
+[241541] Connection from 127.0.0.1:42838
+[241541] Extended attribute "host": 127.0.0.1:5700
+[241541] Extended attribute "protocol": version=1
+[241541] Request upload-pack for '/parent'
+[241369] [241541] Disconnected
+packet:        clone> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:        clone< version 1
+ok 2 - clone with git:// using protocol v1
+
+expecting success of 5700.3 'fetch with git:// using protocol v1': 
+	test_commit -C "$daemon_parent" two &&
+
+	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+		fetch 2>log &&
+
+	git -C daemon_child log -1 --format=%s origin/main >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[241904] Connection from 127.0.0.1:42842
+[241904] Extended attribute "host": 127.0.0.1:5700
+[241904] Extended attribute "protocol": version=1
+[241904] Request upload-pack for '/parent'
+[241369] [241904] Disconnected
+packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:        fetch< version 1
+ok 3 - fetch with git:// using protocol v1
+
+expecting success of 5700.4 'pull with git:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+		pull 2>log &&
+
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[242197] Connection from 127.0.0.1:42852
+[242197] Extended attribute "host": 127.0.0.1:5700
+[242197] Extended attribute "protocol": version=1
+[242197] Request upload-pack for '/parent'
+[241369] [242197] Disconnected
+Updating d79ce16..139b20d
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:        fetch< version 1
+ok 4 - pull with git:// using protocol v1
+
+expecting success of 5700.5 'push with git:// using protocol v1': 
+	test_commit -C daemon_child three &&
+
+	# Push to another branch, as the target repository has the
+	# main branch checked out and we cannot push into it.
+	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+		push origin HEAD:client_branch 2>log &&
+
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "push> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "push< version 1" log
+
+[main 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[242522] Connection from 127.0.0.1:42856
+[242522] Extended attribute "host": 127.0.0.1:5700
+[242522] Extended attribute "protocol": version=1
+[242522] Request receive-pack for '/parent'
+[241369] [242522] Disconnected
+packet:         push> git-receive-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:         push< version 1
+ok 5 - push with git:// using protocol v1
+
+Stopping git daemon ...
+expecting success of 5700.6 'create repo to be served by file:// transport': 
+	git init file_parent &&
+	test_commit -C file_parent one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/file_parent/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 6 - create repo to be served by file:// transport
+
+expecting success of 5700.7 'clone with file:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+		clone "file://$(pwd)/file_parent" file_child 2>log &&
+
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "clone< version 1" log
+
+packet:        clone< version 1
+ok 7 - clone with file:// using protocol v1
+
+expecting success of 5700.8 'fetch with file:// using protocol v1': 
+	test_commit -C file_parent two &&
+
+	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+		fetch 2>log &&
+
+	git -C file_child log -1 --format=%s origin/main >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 8 - fetch with file:// using protocol v1
+
+expecting success of 5700.9 'pull with file:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+		pull 2>log &&
+
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+Updating af0b45c..1dd7f79
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 9 - pull with file:// using protocol v1
+
+expecting success of 5700.10 'push with file:// using protocol v1': 
+	test_commit -C file_child three &&
+
+	# Push to another branch, as the target repository has the
+	# main branch checked out and we cannot push into it.
+	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+		push origin HEAD:client_branch 2>log &&
+
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "push< version 1" log
+
+[main a136e4a] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+packet:         push< version 1
+ok 10 - push with file:// using protocol v1
+
+expecting success of 5700.11 'cloning branchless tagless but not refless remote': 
+	rm -rf server client &&
+
+	git -c init.defaultbranch=main init server &&
+	echo foo >server/foo.txt &&
+	git -C server add foo.txt &&
+	git -C server commit -m "message" &&
+	git -C server update-ref refs/notbranch/alsonottag HEAD &&
+	git -C server checkout --detach &&
+	git -C server branch -D main &&
+	git -C server symbolic-ref HEAD refs/heads/nonexistentbranch &&
+
+	git -c protocol.version=1 clone "file://$(pwd)/server" client
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/server/.git/
+[main (root-commit) 271cf0d] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.txt
+HEAD is now at 271cf0d message
+Deleted branch main (was 271cf0d).
+Cloning into 'client'...
+warning: You appear to have cloned an empty repository.
+ok 11 - cloning branchless tagless but not refless remote
+
+expecting success of 5700.12 'setup ssh wrapper': 
+	GIT_SSH="$GIT_BUILD_DIR/t/helper/test-fake-ssh" &&
+	export GIT_SSH &&
+	GIT_SSH_VARIANT=ssh &&
+	export GIT_SSH_VARIANT &&
+	export TRASH_DIRECTORY &&
+	>"$TRASH_DIRECTORY"/ssh-output
+
+ok 12 - setup ssh wrapper
+
+expecting success of 5700.13 'create repo to be served by ssh:// transport': 
+	git init ssh_parent &&
+	test_commit -C ssh_parent one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/ssh_parent/.git/
+[main (root-commit) 06e07da] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 13 - create repo to be served by ssh:// transport
+
+expecting success of 5700.14 'clone with ssh:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+		clone "ssh://myhost:$(pwd)/ssh_parent" ssh_child 2>log &&
+	expect_ssh git-upload-pack &&
+
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "clone< version 1" log
+
+packet:        clone< version 1
+ok 14 - clone with ssh:// using protocol v1
+
+expecting success of 5700.15 'fetch with ssh:// using protocol v1': 
+	test_commit -C ssh_parent two &&
+
+	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+		fetch 2>log &&
+	expect_ssh git-upload-pack &&
+
+	git -C ssh_child log -1 --format=%s origin/main >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[main 738d2f7] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 15 - fetch with ssh:// using protocol v1
+
+expecting success of 5700.16 'pull with ssh:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+		pull 2>log &&
+	expect_ssh git-upload-pack &&
+
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+Updating 06e07da..738d2f7
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 16 - pull with ssh:// using protocol v1
+
+expecting success of 5700.17 'push with ssh:// using protocol v1': 
+	test_commit -C ssh_child three &&
+
+	# Push to another branch, as the target repository has the
+	# main branch checked out and we cannot push into it.
+	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+		push origin HEAD:client_branch 2>log &&
+	expect_ssh git-receive-pack &&
+
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "push< version 1" log
+
+[main 05cc2ac] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+packet:         push< version 1
+ok 17 - push with ssh:// using protocol v1
+
+expecting success of 5700.18 'clone propagates object-format from empty repo': 
+	test_when_finished "rm -fr src256 dst256" &&
+
+	echo sha256 >expect &&
+	git init --object-format=sha256 src256 &&
+	git clone --no-local src256 dst256 &&
+	git -C dst256 rev-parse --show-object-format >actual &&
+
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5700-protocol-v1/src256/.git/
+Cloning into 'dst256'...
+warning: You appear to have cloned an empty repository.
+ok 18 - clone propagates object-format from empty repo
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 18 test(s)
+# SKIP no web server found at ''
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5704-protocol-violations.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5704-protocol-violations/.git/
+expecting success of 5704.1 'extra delim packet in v2 ls-refs args': 
+	{
+		packetize command=ls-refs &&
+		packetize "object-format=$(test_oid algo)" &&
+		printf 0001 &&
+		# protocol expects 0000 flush here
+		printf 0001
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack . <input 2>err &&
+	test_grep "expected flush after ls-refs arguments" err
+
+000eversion 2
+002aagent=git/2.48.0.rc1.219.gb6b6757d772
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: expected flush after ls-refs arguments
+ok 1 - extra delim packet in v2 ls-refs args
+
+expecting success of 5704.2 'extra delim packet in v2 fetch args': 
+	{
+		packetize command=fetch &&
+		packetize "object-format=$(test_oid algo)" &&
+		printf 0001 &&
+		# protocol expects 0000 flush here
+		printf 0001
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack . <input 2>err &&
+	test_grep "expected flush after fetch arguments" err
+
+000eversion 2
+002aagent=git/2.48.0.rc1.219.gb6b6757d772
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: expected flush after fetch arguments
+ok 2 - extra delim packet in v2 fetch args
+
+expecting success of 5704.3 'bogus symref in v0 capabilities': 
+	test_commit foo &&
+	oid=$(git rev-parse HEAD) &&
+	dst=refs/heads/foo &&
+	{
+		printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
+			"$oid" "$GIT_DEFAULT_HASH" "$dst" |
+			test-tool pkt-line pack-raw-stdin &&
+		printf "0000"
+	} >input &&
+	git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
+	printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
+	test_cmp expect actual
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 3 - bogus symref in v0 capabilities
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5732-protocol-v2-bundle-uri-http.sh ***
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5730-protocol-v2-bundle-uri-file.sh ***
+expecting success of 5730.1 'setup protocol v2 file:// tests': 
+	git init "$BUNDLE_URI_PARENT" &&
+	test_commit -C "$BUNDLE_URI_PARENT" one &&
+	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5730-protocol-v2-bundle-uri-file/file_parent/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup protocol v2 file:// tests
+
+expecting success of 5730.2 'connect with file:// using protocol v2: no bundle-uri': 
+	test_when_finished "rm -f log" &&
+	test_when_finished "git -C \"$BUNDLE_URI_PARENT\" config uploadpack.advertiseBundleURIs true" &&
+	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs false &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	! grep bundle-uri log
+
+packet:    ls-remote< version 2
+ok 2 - connect with file:// using protocol v2: no bundle-uri
+
+expecting success of 5730.3 'connect with file:// using protocol v2: have bundle-uri': 
+	test_when_finished "rm -f log" &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log
+
+packet:    ls-remote< version 2
+packet:    ls-remote< bundle-uri
+ok 3 - connect with file:// using protocol v2: have bundle-uri
+
+expecting success of 5730.4 'clone with file:// using protocol v2: request bundle-uris': 
+	test_when_finished "rm -rf log* cloned*" &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=false \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
+
+	# Client did not issue bundle-uri command
+	! grep "> command=bundle-uri" log &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=true \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned2 \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
+
+	# Client issued bundle-uri command
+	grep "> command=bundle-uri" log &&
+
+	GIT_TRACE_PACKET="$PWD/log3" \
+	git \
+		-c transfer.bundleURI=true \
+		-c protocol.version=2 \
+		clone --bundle-uri="$BUNDLE_URI_BUNDLE_URI" \
+		"$BUNDLE_URI_REPO_URI" cloned3 \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log3 &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log3 &&
+
+	# Client did not issue bundle-uri command (--bundle-uri override)
+	! grep "> command=bundle-uri" log3
+
+packet:        clone< version 2
+packet:        clone< bundle-uri
+packet:        clone< version 2
+packet:        clone< version 2
+packet:        clone< bundle-uri
+packet:        clone< bundle-uri
+packet:        clone> command=bundle-uri
+packet:        clone< version 2
+packet:        clone< bundle-uri
+ok 4 - clone with file:// using protocol v2: request bundle-uris
+
+expecting success of 5730.5 'enable transfer.bundleURI for remaining tests': 
+	git config --global transfer.bundleURI true
+
+ok 5 - enable transfer.bundleURI for remaining tests
+
+expecting success of 5730.6 'test bundle-uri with file:// using protocol v2': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+ok 6 - test bundle-uri with file:// using protocol v2
+
+expecting success of 5730.7 'test bundle-uri with file:// using protocol v2 and extra data': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+
+	# Extra data should be ignored
+	test_config -C "$BUNDLE_URI_PARENT" bundle.only.extra bogus &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+ok 7 - test bundle-uri with file:// using protocol v2 and extra data
+
+expecting success of 5730.8 'test bundle-uri with file:// using protocol v2 with list': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle1.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl" &&
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle2.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl" &&
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle3.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl" &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "bundle1"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl
+	[bundle "bundle2"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl
+	[bundle "bundle3"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+ok 8 - test bundle-uri with file:// using protocol v2 with list
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5601-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5601-clone/.git/
 expecting success of 5601.1 'setup': 
@@ -371362,6 +371045,257 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5731-protocol-v2-bundle-uri-git.sh ***
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+Starting git daemon ...
+[247678] Ready to rumble
+expecting success of 5731.1 'setup protocol v2 git:// tests': 
+	git init "$BUNDLE_URI_PARENT" &&
+	test_commit -C "$BUNDLE_URI_PARENT" one &&
+	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5731-protocol-v2-bundle-uri-git/repo/parent/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup protocol v2 git:// tests
+
+expecting success of 5731.2 'connect with git:// using protocol v2: no bundle-uri': 
+	test_when_finished "rm -f log" &&
+	test_when_finished "git -C \"$BUNDLE_URI_PARENT\" config uploadpack.advertiseBundleURIs true" &&
+	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs false &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	! grep bundle-uri log
+
+[247960] Connection from 127.0.0.1:55934
+[247960] Extended attribute "host": 127.0.0.1:5731
+[247960] Extended attribute "protocol": version=2
+[247960] Request upload-pack for '/parent'
+[247678] [247960] Disconnected
+packet:    ls-remote< version 2
+ok 2 - connect with git:// using protocol v2: no bundle-uri
+
+expecting success of 5731.3 'connect with git:// using protocol v2: have bundle-uri': 
+	test_when_finished "rm -f log" &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log
+
+[248155] Connection from 127.0.0.1:55948
+[248155] Extended attribute "host": 127.0.0.1:5731
+[248155] Extended attribute "protocol": version=2
+[248155] Request upload-pack for '/parent'
+[247678] [248155] Disconnected
+packet:    ls-remote< version 2
+packet:    ls-remote< bundle-uri
+ok 3 - connect with git:// using protocol v2: have bundle-uri
+
+expecting success of 5731.4 'clone with git:// using protocol v2: request bundle-uris': 
+	test_when_finished "rm -rf log* cloned*" &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=false \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
+
+	# Client did not issue bundle-uri command
+	! grep "> command=bundle-uri" log &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=true \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned2 \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
+
+	# Client issued bundle-uri command
+	grep "> command=bundle-uri" log &&
+
+	GIT_TRACE_PACKET="$PWD/log3" \
+	git \
+		-c transfer.bundleURI=true \
+		-c protocol.version=2 \
+		clone --bundle-uri="$BUNDLE_URI_BUNDLE_URI" \
+		"$BUNDLE_URI_REPO_URI" cloned3 \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log3 &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log3 &&
+
+	# Client did not issue bundle-uri command (--bundle-uri override)
+	! grep "> command=bundle-uri" log3
+
+[248314] Connection from 127.0.0.1:55962
+[248314] Extended attribute "host": 127.0.0.1:5731
+[248314] Extended attribute "protocol": version=2
+[248314] Request upload-pack for '/parent'
+[247678] [248314] Disconnected
+packet:        clone< version 2
+packet:        clone< bundle-uri
+[248539] Connection from 127.0.0.1:55964
+[248539] Extended attribute "host": 127.0.0.1:5731
+[248539] Extended attribute "protocol": version=2
+[248539] Request upload-pack for '/parent'
+[247678] [248539] Disconnected
+packet:        clone< version 2
+packet:        clone< version 2
+packet:        clone< bundle-uri
+packet:        clone< bundle-uri
+packet:        clone> command=bundle-uri
+[248798] Connection from 127.0.0.1:55966
+[248798] Extended attribute "host": 127.0.0.1:5731
+[248798] Extended attribute "protocol": version=2
+[248798] Request upload-pack for '/parent'
+[247678] [248798] Disconnected
+packet:        clone< version 2
+packet:        clone< bundle-uri
+ok 4 - clone with git:// using protocol v2: request bundle-uris
+
+expecting success of 5731.5 'enable transfer.bundleURI for remaining tests': 
+	git config --global transfer.bundleURI true
+
+ok 5 - enable transfer.bundleURI for remaining tests
+
+expecting success of 5731.6 'test bundle-uri with git:// using protocol v2': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+[249121] Connection from 127.0.0.1:55974
+[249121] Extended attribute "host": 127.0.0.1:5731
+[249121] Extended attribute "protocol": version=2
+[249121] Request upload-pack for '/parent'
+[247678] [249121] Disconnected
+ok 6 - test bundle-uri with git:// using protocol v2
+
+expecting success of 5731.7 'test bundle-uri with git:// using protocol v2 and extra data': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+
+	# Extra data should be ignored
+	test_config -C "$BUNDLE_URI_PARENT" bundle.only.extra bogus &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+[249440] Connection from 127.0.0.1:55982
+[249440] Extended attribute "host": 127.0.0.1:5731
+[249440] Extended attribute "protocol": version=2
+[249440] Request upload-pack for '/parent'
+[247678] [249440] Disconnected
+ok 7 - test bundle-uri with git:// using protocol v2 and extra data
+
+expecting success of 5731.8 'test bundle-uri with git:// using protocol v2 with list': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle1.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl" &&
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle2.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl" &&
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle3.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl" &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "bundle1"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl
+	[bundle "bundle2"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl
+	[bundle "bundle3"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+[249804] Connection from 127.0.0.1:55988
+[249804] Extended attribute "host": 127.0.0.1:5731
+[249804] Extended attribute "protocol": version=2
+[249804] Request upload-pack for '/parent'
+[247678] [249804] Disconnected
+ok 8 - test bundle-uri with git:// using protocol v2 with list
+
+Stopping git daemon ...
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5750-bundle-uri-parse.sh ***
 expecting success of 5750.1 'bundle_uri_parse_line() just URIs': 
 	cat >in <<-\EOF &&
@@ -371661,345 +371595,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5705-session-id-in-capabilities.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/local_pristine'...
-[master 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
-
-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.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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)
-
-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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 5705.8 'enable SID advertisement': 
-	git -C "$REPO" config transfer.advertiseSID true &&
-	git -C "$LOCAL_PRISTINE" config transfer.advertiseSID true
-
-ok 8 - enable SID advertisement
-
-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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20250209T065455.377473Z-Hcf858c9d-P001b45c4","thread":"main","time":"2025-02-09T06:54:55.381782Z","file":"transport.c","line":378,"t_abs":0.004515,"t_rel":0.003353,"nesting":3,"category":"transfer","key":"server-sid","value":"20250209T065455.377473Z-Hcf858c9d-P001b45c4/20250209T065455.380786Z-Hcf858c9d-P001b45da"}
-{"event":"data","sid":"20250209T065455.377473Z-Hcf858c9d-P001b45c4/20250209T065455.380786Z-Hcf858c9d-P001b45da","thread":"main","time":"2025-02-09T06:54:55.382256Z","file":"upload-pack.c","line":1170,"t_abs":0.001660,"t_rel":0.001660,"nesting":1,"category":"transfer","key":"client-sid","value":"20250209T065455.377473Z-Hcf858c9d-P001b45c4"}
-ok 9 - session IDs advertised (fetch v0)
-
-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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20250209T065455.452021Z-Hcf858c9d-P001b4735","thread":"main","time":"2025-02-09T06:54:55.455615Z","file":"transport.c","line":378,"t_abs":0.003792,"t_rel":0.002823,"nesting":3,"category":"transfer","key":"server-sid","value":"20250209T065455.452021Z-Hcf858c9d-P001b4735/20250209T065455.454799Z-Hcf858c9d-P001b474f"}
-{"event":"data","sid":"20250209T065455.452021Z-Hcf858c9d-P001b4735/20250209T065455.454799Z-Hcf858c9d-P001b474f","thread":"main","time":"2025-02-09T06:54:55.456082Z","file":"builtin/receive-pack.c","line":2139,"t_abs":0.001468,"t_rel":0.001468,"nesting":1,"category":"transfer","key":"client-sid","value":"20250209T065455.452021Z-Hcf858c9d-P001b4735"}
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 10 - session IDs advertised (push v0)
-
-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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20250209T065455.504871Z-Hcf858c9d-P001b485c","thread":"main","time":"2025-02-09T06:54:55.509048Z","file":"connect.c","line":178,"t_abs":0.004376,"t_rel":0.003187,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
-{"event":"data","sid":"20250209T065455.504871Z-Hcf858c9d-P001b485c/20250209T065455.508070Z-Hcf858c9d-P001b486d","thread":"main","time":"2025-02-09T06:54:55.508600Z","file":"protocol.c","line":80,"t_abs":0.000727,"t_rel":0.000727,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
-ok 11 - client & server log negotiated version (v0)
-
-expecting success of 5705.12 'session IDs advertised (fetch v1)': 
-		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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20250209T065455.541147Z-Hcf858c9d-P001b4905","thread":"main","time":"2025-02-09T06:54:55.545634Z","file":"transport.c","line":378,"t_abs":0.004714,"t_rel":0.003061,"nesting":3,"category":"transfer","key":"server-sid","value":"20250209T065455.541147Z-Hcf858c9d-P001b4905/20250209T065455.544582Z-Hcf858c9d-P001b4914"}
-{"event":"data","sid":"20250209T065455.541147Z-Hcf858c9d-P001b4905/20250209T065455.544582Z-Hcf858c9d-P001b4914","thread":"main","time":"2025-02-09T06:54:55.546108Z","file":"upload-pack.c","line":1170,"t_abs":0.001729,"t_rel":0.001729,"nesting":1,"category":"transfer","key":"client-sid","value":"20250209T065455.541147Z-Hcf858c9d-P001b4905"}
-ok 12 - session IDs advertised (fetch v1)
-
-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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20250209T065455.618873Z-Hcf858c9d-P001b4aaa","thread":"main","time":"2025-02-09T06:54:55.622684Z","file":"transport.c","line":378,"t_abs":0.004009,"t_rel":0.003022,"nesting":3,"category":"transfer","key":"server-sid","value":"20250209T065455.618873Z-Hcf858c9d-P001b4aaa/20250209T065455.621897Z-Hcf858c9d-P001b4abe"}
-{"event":"data","sid":"20250209T065455.618873Z-Hcf858c9d-P001b4aaa/20250209T065455.621897Z-Hcf858c9d-P001b4abe","thread":"main","time":"2025-02-09T06:54:55.623159Z","file":"builtin/receive-pack.c","line":2139,"t_abs":0.001462,"t_rel":0.001462,"nesting":1,"category":"transfer","key":"client-sid","value":"20250209T065455.618873Z-Hcf858c9d-P001b4aaa"}
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 13 - session IDs advertised (push v1)
-
-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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20250209T065455.662547Z-Hcf858c9d-P001b4bb9","thread":"main","time":"2025-02-09T06:54:55.666750Z","file":"connect.c","line":178,"t_abs":0.004398,"t_rel":0.003318,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
-{"event":"data","sid":"20250209T065455.662547Z-Hcf858c9d-P001b4bb9/20250209T065455.665426Z-Hcf858c9d-P001b4bca","thread":"main","time":"2025-02-09T06:54:55.665965Z","file":"protocol.c","line":80,"t_abs":0.000739,"t_rel":0.000739,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
-ok 14 - client & server log negotiated version (v1)
-
-expecting success of 5705.15 'session IDs advertised (fetch v2)': 
-		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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20250209T065455.698761Z-Hcf858c9d-P001b4c75","thread":"main","time":"2025-02-09T06:54:55.702564Z","file":"transport.c","line":361,"t_abs":0.004011,"t_rel":0.002883,"nesting":3,"category":"transfer","key":"server-sid","value":"20250209T065455.698761Z-Hcf858c9d-P001b4c75/20250209T065455.701830Z-Hcf858c9d-P001b4c91"}
-{"event":"data","sid":"20250209T065455.698761Z-Hcf858c9d-P001b4c75/20250209T065455.701830Z-Hcf858c9d-P001b4c91","thread":"main","time":"2025-02-09T06:54:55.703416Z","file":"serve.c","line":70,"t_abs":0.001790,"t_rel":0.001790,"nesting":1,"category":"transfer","key":"client-sid","value":"20250209T065455.698761Z-Hcf858c9d-P001b4c75"}
-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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20250209T065455.775111Z-Hcf858c9d-P001b4e01","thread":"main","time":"2025-02-09T06:54:55.780344Z","file":"transport.c","line":378,"t_abs":0.005437,"t_rel":0.004456,"nesting":3,"category":"transfer","key":"server-sid","value":"20250209T065455.775111Z-Hcf858c9d-P001b4e01/20250209T065455.779313Z-Hcf858c9d-P001b4e15"}
-{"event":"data","sid":"20250209T065455.775111Z-Hcf858c9d-P001b4e01/20250209T065455.779313Z-Hcf858c9d-P001b4e15","thread":"main","time":"2025-02-09T06:54:55.780536Z","file":"builtin/receive-pack.c","line":2139,"t_abs":0.001420,"t_rel":0.001420,"nesting":1,"category":"transfer","key":"client-sid","value":"20250209T065455.775111Z-Hcf858c9d-P001b4e01"}
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20250209T065455.832229Z-Hcf858c9d-P001b4f43","thread":"main","time":"2025-02-09T06:54:55.836793Z","file":"connect.c","line":178,"t_abs":0.004763,"t_rel":0.003673,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
-{"event":"data","sid":"20250209T065455.832229Z-Hcf858c9d-P001b4f43/20250209T065455.836116Z-Hcf858c9d-P001b4f5c","thread":"main","time":"2025-02-09T06:54:55.836663Z","file":"protocol.c","line":80,"t_abs":0.000750,"t_rel":0.000750,"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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5703-upload-pack-ref-in-want.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5703-upload-pack-ref-in-want/.git/
 expecting success of 5703.1 'setup repository': 
@@ -372262,7 +371857,7 @@
 
 From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5703-upload-pack-ref-in-want/repo
  * [new ref]         2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5 -> actual
-{"event":"data","sid":"20250209T065455.449811Z-Hcf858c9d-P001b472e","thread":"main","time":"2025-02-09T06:54:55.456093Z","file":"fetch-pack.c","line":1758,"repo":1,"t_abs":0.006480,"t_rel":0.002142,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"2"}
+{"event":"data","sid":"20260314T133342.083969Z-H5c947e1c-P0003c4ef","thread":"main","time":"2026-03-14T13:33:42.120052Z","file":"fetch-pack.c","line":1758,"repo":1,"t_abs":0.036272,"t_rel":0.001951,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"2"}
 packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
 packet:  upload-pack< want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
 packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
@@ -372566,1291 +372161,6 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5802-connect-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5802-connect-helper/.git/
-expecting success of 5802.1 'setup': 
-	git config --global protocol.ext.allow user &&
-	test_tick &&
-	git commit --allow-empty -m initial &&
-	test_tick &&
-	git commit --allow-empty -m second &&
-	test_tick &&
-	git commit --allow-empty -m third &&
-	test_tick &&
-	git tag -a -m "tip three" three &&
-
-	test_tick &&
-	git commit --allow-empty -m fourth
-
-[master (root-commit) 66fe8b3] initial
- Author: A U Thor <author@example.com>
-[master 5ce2b00] second
- Author: A U Thor <author@example.com>
-[master 8019b76] third
- Author: A U Thor <author@example.com>
-[master b0c6cf2] fourth
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 5802.2 'clone': 
-	cmd=$(echo "echo >&2 ext::sh invoked && %S .." | sed -e "s/ /% /g") &&
-	git clone "ext::sh -c %S% ." dst &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git config remote.origin.url "ext::sh -c $cmd" &&
-		git for-each-ref refs/heads/ refs/tags/
-	) >actual &&
-	test_cmp expect actual
-
-Cloning into 'dst'...
-ok 2 - clone
-
-expecting success of 5802.3 'update following tag': 
-	test_tick &&
-	git commit --allow-empty -m fifth &&
-	test_tick &&
-	git tag -a -m "tip five" five &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git pull &&
-		git for-each-ref refs/heads/ refs/tags/ >../actual
-	) &&
-	test_cmp expect actual
-
-[master a643494] fifth
- Author: A U Thor <author@example.com>
-ext::sh invoked
-From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
-   b0c6cf2..a643494  master     -> origin/master
- * [new tag]         five       -> five
-Updating b0c6cf2..a643494
-Fast-forward
-ok 3 - update following tag
-
-expecting success of 5802.4 'update backfilled tag': 
-	test_tick &&
-	git commit --allow-empty -m sixth &&
-	test_tick &&
-	git tag -a -m "tip two" two three^1 &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git pull &&
-		git for-each-ref refs/heads/ refs/tags/ >../actual
-	) &&
-	test_cmp expect actual
-
-[master 06b114e] sixth
- Author: A U Thor <author@example.com>
-ext::sh invoked
-From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
-   a643494..06b114e  master     -> origin/master
- * [new tag]         two        -> two
-Updating a643494..06b114e
-Fast-forward
-ok 4 - update backfilled tag
-
-expecting success of 5802.5 'update backfilled tag without primary transfer': 
-	test_tick &&
-	git tag -a -m "tip one " one two^1 &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git pull &&
-		git for-each-ref refs/heads/ refs/tags/ >../actual
-	) &&
-	test_cmp expect actual
-
-ext::sh invoked
-From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
- * [new tag]         one        -> one
-Already up to date.
-ok 5 - update backfilled tag without primary transfer
-
-expecting success of 5802.6 'set up fake git-daemon': 
-	mkdir remote &&
-	git init --bare remote/one.git &&
-	mkdir remote/host &&
-	git init --bare remote/host/two.git &&
-	write_script fake-daemon <<-\EOF &&
-	git daemon --inetd \
-		--informative-errors \
-		--export-all \
-		--base-path="$TRASH_DIRECTORY/remote" \
-		--interpolated-path="$TRASH_DIRECTORY/remote/%H%D" \
-		"$TRASH_DIRECTORY/remote"
-	EOF
-	export TRASH_DIRECTORY &&
-	PATH=$TRASH_DIRECTORY:$PATH
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5802-connect-helper/remote/one.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5812-proto-disable-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5731-protocol-v2-bundle-uri-git.sh ***
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-Starting git daemon ...
-[1786378] Ready to rumble
-expecting success of 5731.1 'setup protocol v2 git:// tests': 
-	git init "$BUNDLE_URI_PARENT" &&
-	test_commit -C "$BUNDLE_URI_PARENT" one &&
-	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5731-protocol-v2-bundle-uri-git/repo/parent/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup protocol v2 git:// tests
-
-expecting success of 5731.2 'connect with git:// using protocol v2: no bundle-uri': 
-	test_when_finished "rm -f log" &&
-	test_when_finished "git -C \"$BUNDLE_URI_PARENT\" config uploadpack.advertiseBundleURIs true" &&
-	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs false &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c protocol.version=2 \
-		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	! grep bundle-uri log
-
-[1786606] Connection from 127.0.0.1:47074
-[1786606] Extended attribute "host": 127.0.0.1:5731
-[1786606] Extended attribute "protocol": version=2
-[1786606] Request upload-pack for '/parent'
-packet:    ls-remote< version 2
-[1786378] [1786606] Disconnected
-ok 2 - connect with git:// using protocol v2: no bundle-uri
-
-expecting success of 5731.3 'connect with git:// using protocol v2: have bundle-uri': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c protocol.version=2 \
-		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log
-
-[1786901] Connection from 127.0.0.1:47082
-[1786901] Extended attribute "host": 127.0.0.1:5731
-[1786901] Extended attribute "protocol": version=2
-[1786901] Request upload-pack for '/parent'
-[1786378] [1786901] Disconnected
-packet:    ls-remote< version 2
-packet:    ls-remote< bundle-uri
-ok 3 - connect with git:// using protocol v2: have bundle-uri
-
-expecting success of 5731.4 'clone with git:// using protocol v2: request bundle-uris': 
-	test_when_finished "rm -rf log* cloned*" &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c transfer.bundleURI=false \
-		-c protocol.version=2 \
-		clone "$BUNDLE_URI_REPO_URI" cloned \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log &&
-
-	# Client did not issue bundle-uri command
-	! grep "> command=bundle-uri" log &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c transfer.bundleURI=true \
-		-c protocol.version=2 \
-		clone "$BUNDLE_URI_REPO_URI" cloned2 \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log &&
-
-	# Client issued bundle-uri command
-	grep "> command=bundle-uri" log &&
-
-	GIT_TRACE_PACKET="$PWD/log3" \
-	git \
-		-c transfer.bundleURI=true \
-		-c protocol.version=2 \
-		clone --bundle-uri="$BUNDLE_URI_BUNDLE_URI" \
-		"$BUNDLE_URI_REPO_URI" cloned3 \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log3 &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log3 &&
-
-	# Client did not issue bundle-uri command (--bundle-uri override)
-	! grep "> command=bundle-uri" log3
-
-[1787165] Connection from 127.0.0.1:47088
-[1787165] Extended attribute "host": 127.0.0.1:5731
-[1787165] Extended attribute "protocol": version=2
-[1787165] Request upload-pack for '/parent'
-[1786378] [1787165] Disconnected
-packet:        clone< version 2
-packet:        clone< bundle-uri
-[1787700] Connection from 127.0.0.1:47094
-[1787700] Extended attribute "host": 127.0.0.1:5731
-[1787700] Extended attribute "protocol": version=2
-[1787700] Request upload-pack for '/parent'
-[1786378] [1787700] Disconnected
-packet:        clone< version 2
-packet:        clone< version 2
-packet:        clone< bundle-uri
-packet:        clone< bundle-uri
-packet:        clone> command=bundle-uri
-[1788529] Connection from 127.0.0.1:47104
-[1788529] Extended attribute "host": 127.0.0.1:5731
-[1788529] Extended attribute "protocol": version=2
-[1788529] Request upload-pack for '/parent'
-[1786378] [1788529] Disconnected
-packet:        clone< version 2
-packet:        clone< bundle-uri
-ok 4 - clone with git:// using protocol v2: request bundle-uris
-
-expecting success of 5731.5 'enable transfer.bundleURI for remaining tests': 
-	git config --global transfer.bundleURI true
-
-ok 5 - enable transfer.bundleURI for remaining tests
-
-expecting success of 5731.6 'test bundle-uri with git:// using protocol v2': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
-
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "only"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
-	EOF
-
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
-
-[1789210] Connection from 127.0.0.1:47106
-[1789210] Extended attribute "host": 127.0.0.1:5731
-[1789210] Extended attribute "protocol": version=2
-[1789210] Request upload-pack for '/parent'
-[1786378] [1789210] Disconnected
-ok 6 - test bundle-uri with git:// using protocol v2
-
-expecting success of 5731.7 'test bundle-uri with git:// using protocol v2 and extra data': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
-
-	# Extra data should be ignored
-	test_config -C "$BUNDLE_URI_PARENT" bundle.only.extra bogus &&
-
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "only"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
-	EOF
-
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
-
-[1789835] Connection from 127.0.0.1:47114
-[1789835] Extended attribute "host": 127.0.0.1:5731
-[1789835] Extended attribute "protocol": version=2
-[1789835] Request upload-pack for '/parent'
-[1786378] [1789835] Disconnected
-ok 7 - test bundle-uri with git:// using protocol v2 and extra data
-
-expecting success of 5731.8 'test bundle-uri with git:// using protocol v2 with list': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle1.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl" &&
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle2.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl" &&
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle3.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl" &&
-
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "bundle1"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl
-	[bundle "bundle2"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl
-	[bundle "bundle3"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl
-	EOF
-
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
-
-[1790464] Connection from 127.0.0.1:47116
-[1790464] Extended attribute "host": 127.0.0.1:5731
-[1790464] Extended attribute "protocol": version=2
-[1790464] Request upload-pack for '/parent'
-[1786378] [1790464] 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5810-proto-disable-local.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.git/
-expecting success of 5810.1 'setup repository to clone': 
-	test_commit one
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup repository to clone
-
-expecting success of 5810.2 'clone file:// (enabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-ok 2 - clone file:// (enabled)
-
-expecting success of 5810.3 'fetch file:// (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
- * branch            HEAD       -> FETCH_HEAD
-ok 3 - fetch file:// (enabled)
-
-expecting success of 5810.4 'push file:// (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
- * [new branch]      HEAD -> pushed
-ok 4 - push file:// (enabled)
-
-expecting success of 5810.5 'push file:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-fatal: transport 'file' not allowed
-ok 5 - push file:// (disabled)
-
-expecting success of 5810.6 'fetch file:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'file' not allowed
-ok 6 - fetch file:// (disabled)
-
-expecting success of 5810.7 'clone file:// (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 7 - clone file:// (disabled)
-
-expecting success of 5810.8 'clone file:// (env var has precedence)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 8 - clone file:// (env var has precedence)
-
-expecting success of 5810.9 'clone file:// (enabled with config)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ok 9 - clone file:// (enabled with config)
-
-expecting success of 5810.10 'fetch file:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
- * branch            HEAD       -> FETCH_HEAD
-ok 10 - fetch file:// (enabled)
-
-expecting success of 5810.11 'push file:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-Everything up-to-date
-ok 11 - push file:// (enabled)
-
-expecting success of 5810.12 'push file:// (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-fatal: transport 'file' not allowed
-ok 12 - push file:// (disabled)
-
-expecting success of 5810.13 'fetch file:// (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'file' not allowed
-ok 13 - fetch file:// (disabled)
-
-expecting success of 5810.14 'clone file:// (disabled)': 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 14 - clone file:// (disabled)
-
-expecting success of 5810.15 'clone file:// (enabled)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ok 15 - clone file:// (enabled)
-
-expecting success of 5810.16 'fetch file:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
- * branch            HEAD       -> FETCH_HEAD
-ok 16 - fetch file:// (enabled)
-
-expecting success of 5810.17 'push file:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-Everything up-to-date
-ok 17 - push file:// (enabled)
-
-expecting success of 5810.18 'push file:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
-		)
-	
-fatal: transport 'file' not allowed
-ok 18 - push file:// (disabled)
-
-expecting success of 5810.19 'fetch file:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'file' not allowed
-ok 19 - fetch file:// (disabled)
-
-expecting success of 5810.20 'clone file:// (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 20 - clone file:// (disabled)
-
-expecting success of 5810.21 'clone file:// (enabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ok 21 - clone file:// (enabled)
-
-expecting success of 5810.22 'fetch file:// (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
- * branch            HEAD       -> FETCH_HEAD
-ok 22 - fetch file:// (enabled)
-
-expecting success of 5810.23 'push file:// (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-Everything up-to-date
-ok 23 - push file:// (enabled)
-
-expecting success of 5810.24 'push file:// (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'file' not allowed
-ok 24 - push file:// (disabled)
-
-expecting success of 5810.25 'fetch file:// (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'file' not allowed
-ok 25 - fetch file:// (disabled)
-
-expecting success of 5810.26 'clone file:// (disabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 26 - clone file:// (disabled)
-
-expecting success of 5810.27 'clone path (enabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-done.
-ok 27 - clone path (enabled)
-
-expecting success of 5810.28 'fetch path (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
- * branch            HEAD       -> FETCH_HEAD
-ok 28 - fetch path (enabled)
-
-expecting success of 5810.29 'push path (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-Everything up-to-date
-ok 29 - push path (enabled)
-
-expecting success of 5810.30 'push path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-fatal: transport 'file' not allowed
-ok 30 - push path (disabled)
-
-expecting success of 5810.31 'fetch path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'file' not allowed
-ok 31 - fetch path (disabled)
-
-expecting success of 5810.32 'clone path (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 32 - clone path (disabled)
-
-expecting success of 5810.33 'clone path (env var has precedence)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 33 - clone path (env var has precedence)
-
-expecting success of 5810.34 'clone path (enabled with config)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-done.
-ok 34 - clone path (enabled with config)
-
-expecting success of 5810.35 'fetch path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
- * branch            HEAD       -> FETCH_HEAD
-ok 35 - fetch path (enabled)
-
-expecting success of 5810.36 'push path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-Everything up-to-date
-ok 36 - push path (enabled)
-
-expecting success of 5810.37 'push path (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-fatal: transport 'file' not allowed
-ok 37 - push path (disabled)
-
-expecting success of 5810.38 'fetch path (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'file' not allowed
-ok 38 - fetch path (disabled)
-
-expecting success of 5810.39 'clone path (disabled)': 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 39 - clone path (disabled)
-
-expecting success of 5810.40 'clone path (enabled)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-done.
-ok 40 - clone path (enabled)
-
-expecting success of 5810.41 'fetch path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
- * branch            HEAD       -> FETCH_HEAD
-ok 41 - fetch path (enabled)
-
-expecting success of 5810.42 'push path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-Everything up-to-date
-ok 42 - push path (enabled)
-
-expecting success of 5810.43 'push path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
-		)
-	
-fatal: transport 'file' not allowed
-ok 43 - push path (disabled)
-
-expecting success of 5810.44 'fetch path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'file' not allowed
-ok 44 - fetch path (disabled)
-
-expecting success of 5810.45 'clone path (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 45 - clone path (disabled)
-
-expecting success of 5810.46 'clone path (enabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-done.
-ok 46 - clone path (enabled)
-
-expecting success of 5810.47 'fetch path (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
- * branch            HEAD       -> FETCH_HEAD
-ok 47 - fetch path (enabled)
-
-expecting success of 5810.48 'push path (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-Everything up-to-date
-ok 48 - push path (enabled)
-
-expecting success of 5810.49 'push path (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'file' not allowed
-ok 49 - push path (disabled)
-
-expecting success of 5810.50 'fetch path (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'file' not allowed
-ok 50 - fetch path (disabled)
-
-expecting success of 5810.51 'clone path (disabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 51 - clone path (disabled)
-
-expecting success of 5810.52 'setup repo with dash': 
-	git init --bare repo.git &&
-	git push repo.git HEAD &&
-	mv repo.git "$PWD/-repo.git"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/repo.git/
-To repo.git
- * [new branch]      HEAD -> master
-ok 52 - setup repo with dash
-
-expecting success of 5810.53 'repo names starting with dash are rejected': 
-	rm -f trace.out &&
-	test_must_fail env GIT_TRACE="$PWD/trace.out" git fetch -- -repo.git &&
-	! grep upload-pack trace.out
-
-fatal: strange pathname '-repo.git' blocked
-ok 53 - repo names starting with dash are rejected
-
-expecting success of 5810.54 'full paths still work': 
-	git fetch "$PWD/-repo.git"
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/-repo
- * branch            HEAD       -> FETCH_HEAD
-ok 54 - full paths still work
-
-# passed all 54 test(s)
-1..54
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5814-proto-disable-ext.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5814-proto-disable-ext/.git/
-expecting success of 5814.1 'setup ext wrapper': 
-		write_script fake-remote <<-\EOF &&
-		echo >&2 "fake-remote: $*"
-		cd "$TRASH_DIRECTORY/remote" &&
-		eval "$*"
-		EOF
-		PATH=$TRASH_DIRECTORY:$PATH &&
-		export TRASH_DIRECTORY
-	
-ok 1 - setup ext wrapper
-
-expecting success of 5814.2 'setup repository to clone': 
-	test_commit one &&
-	mkdir remote &&
-	git init --bare remote/repo.git &&
-	git push remote/repo.git HEAD
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5814-proto-disable-ext/remote/repo.git/
-To remote/repo.git
- * [new branch]      HEAD -> master
-ok 2 - setup repository to clone
-
-expecting success of 5814.3 'clone remote-helper (enabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 3 - clone remote-helper (enabled)
-
-expecting success of 5814.4 'fetch remote-helper (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 4 - fetch remote-helper (enabled)
-
-expecting success of 5814.5 'push remote-helper (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-fake-remote: git-receive-pack repo.git
-To ext::fake-remote %S repo.git
- * [new branch]      HEAD -> pushed
-ok 5 - push remote-helper (enabled)
-
-expecting success of 5814.6 'push remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-fatal: transport 'ext' not allowed
-ok 6 - push remote-helper (disabled)
-
-expecting success of 5814.7 'fetch remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'ext' not allowed
-ok 7 - fetch remote-helper (disabled)
-
-expecting success of 5814.8 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 8 - clone remote-helper (disabled)
-
-expecting success of 5814.9 'clone remote-helper (env var has precedence)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 9 - clone remote-helper (env var has precedence)
-
-expecting success of 5814.10 'clone remote-helper (enabled with config)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 10 - clone remote-helper (enabled with config)
-
-expecting success of 5814.11 'fetch remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 11 - fetch remote-helper (enabled)
-
-expecting success of 5814.12 'push remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-fake-remote: git-receive-pack repo.git
-Everything up-to-date
-ok 12 - push remote-helper (enabled)
-
-expecting success of 5814.13 'push remote-helper (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-fatal: transport 'ext' not allowed
-ok 13 - push remote-helper (disabled)
-
-expecting success of 5814.14 'fetch remote-helper (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'ext' not allowed
-ok 14 - fetch remote-helper (disabled)
-
-expecting success of 5814.15 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 15 - clone remote-helper (disabled)
-
-expecting success of 5814.16 'clone remote-helper (enabled)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 16 - clone remote-helper (enabled)
-
-expecting success of 5814.17 'fetch remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 17 - fetch remote-helper (enabled)
-
-expecting success of 5814.18 'push remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-fake-remote: git-receive-pack repo.git
-Everything up-to-date
-ok 18 - push remote-helper (enabled)
-
-expecting success of 5814.19 'push remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
-		)
-	
-fatal: transport 'ext' not allowed
-ok 19 - push remote-helper (disabled)
-
-expecting success of 5814.20 'fetch remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'ext' not allowed
-ok 20 - fetch remote-helper (disabled)
-
-expecting success of 5814.21 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 21 - clone remote-helper (disabled)
-
-expecting success of 5814.22 'clone remote-helper (enabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 22 - clone remote-helper (enabled)
-
-expecting success of 5814.23 'fetch remote-helper (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 23 - fetch remote-helper (enabled)
-
-expecting success of 5814.24 'push remote-helper (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-fake-remote: git-receive-pack repo.git
-Everything up-to-date
-ok 24 - push remote-helper (enabled)
-
-expecting success of 5814.25 'push remote-helper (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'ext' not allowed
-ok 25 - push remote-helper (disabled)
-
-expecting success of 5814.26 'fetch remote-helper (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'ext' not allowed
-ok 26 - fetch remote-helper (disabled)
-
-expecting success of 5814.27 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 27 - clone remote-helper (disabled)
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5815-submodule-protos.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module'. Retry scheduled
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module'. Retry scheduled
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5526-fetch-submodules.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/.git/
 expecting success of 5526.1 'setup': 
@@ -375614,104 +373924,601 @@
 		test_must_fail git --work-tree=. cat-file -e $head2
 	)
 
-[main c9df75f] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.t
-[main 6fe4f41] super-c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0b3ef72] c2
- Author: A U Thor <author@example.com>
+[main c9df75f] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.t
+[main 6fe4f41] super-c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0b3ef72] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.t
+[main 65e22d0] super-c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Already on 'main'
+Your branch is behind 'same-name-1/main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+rm '.gitmodules'
+rm 'submodule'
+[main ae3683b] no submodules
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 submodule
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/same-name-1
+   0474d0c..6fe4f41  main       -> same-name-1/main
+Fetching submodule submodule at commit 6fe4f41
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/same-name-1/submodule
+   4d98905..c9df75f  main       -> origin/main
+ok 51 - fetch --recurse-submodules updates name-conflicted, unpopulated submodule
+
+expecting success of 5526.52 'fetch --all with --recurse-submodules': 
+	test_when_finished "rm -fr src_clone" &&
+	git clone --recurse-submodules src src_clone &&
+	(
+		cd src_clone &&
+		git config submodule.recurse true &&
+		git config fetch.parallel 0 &&
+		git fetch --all 2>../fetch-log
+	) &&
+	grep "^Fetching submodule sub$" fetch-log >fetch-subs &&
+	test_line_count = 1 fetch-subs
+
+Cloning into 'src_clone'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src_clone/sub'...
+done.
+Submodule path 'sub': checked out '77c750218fd2379ad09b559df2108a4fa3f233e7'
+ok 52 - fetch --all with --recurse-submodules
+
+expecting success of 5526.53 'fetch --all with --recurse-submodules with multiple': 
+	test_when_finished "rm -fr src_clone" &&
+	git clone --recurse-submodules src src_clone &&
+	(
+		cd src_clone &&
+		git remote add secondary ../src &&
+		git config submodule.recurse true &&
+		git config fetch.parallel 0 &&
+		git fetch --all 2>../fetch-log
+	) &&
+	grep "Fetching submodule sub" fetch-log >fetch-subs &&
+	test_line_count = 2 fetch-subs
+
+Cloning into 'src_clone'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src_clone/sub'...
+done.
+Submodule path 'sub': checked out '77c750218fd2379ad09b559df2108a4fa3f233e7'
+Fetching origin
+Fetching secondary
+ok 53 - fetch --all with --recurse-submodules with multiple
+
+expecting success of 5526.54 'fetch --all with --no-recurse-submodules only fetches superproject': 
+	test_when_finished "rm -rf src_clone" &&
+
+	git clone --recurse-submodules src src_clone &&
+	(
+		cd src_clone &&
+		git remote add secondary ../src &&
+		git config submodule.recurse true &&
+		git fetch --all --no-recurse-submodules 2>../fetch-log
+	) &&
+	! grep "Fetching submodule" fetch-log
+
+Cloning into 'src_clone'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src_clone/sub'...
+done.
+Submodule path 'sub': checked out '77c750218fd2379ad09b559df2108a4fa3f233e7'
+Fetching origin
+Fetching secondary
+ok 54 - fetch --all with --no-recurse-submodules only fetches superproject
+
+# passed all 54 test(s)
+1..54
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5802-connect-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5802-connect-helper/.git/
+expecting success of 5802.1 'setup': 
+	git config --global protocol.ext.allow user &&
+	test_tick &&
+	git commit --allow-empty -m initial &&
+	test_tick &&
+	git commit --allow-empty -m second &&
+	test_tick &&
+	git commit --allow-empty -m third &&
+	test_tick &&
+	git tag -a -m "tip three" three &&
+
+	test_tick &&
+	git commit --allow-empty -m fourth
+
+[master (root-commit) 66fe8b3] initial
+ Author: A U Thor <author@example.com>
+[master 5ce2b00] second
+ Author: A U Thor <author@example.com>
+[master 8019b76] third
+ Author: A U Thor <author@example.com>
+[master b0c6cf2] fourth
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 5802.2 'clone': 
+	cmd=$(echo "echo >&2 ext::sh invoked && %S .." | sed -e "s/ /% /g") &&
+	git clone "ext::sh -c %S% ." dst &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git config remote.origin.url "ext::sh -c $cmd" &&
+		git for-each-ref refs/heads/ refs/tags/
+	) >actual &&
+	test_cmp expect actual
+
+Cloning into 'dst'...
+ok 2 - clone
+
+expecting success of 5802.3 'update following tag': 
+	test_tick &&
+	git commit --allow-empty -m fifth &&
+	test_tick &&
+	git tag -a -m "tip five" five &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git pull &&
+		git for-each-ref refs/heads/ refs/tags/ >../actual
+	) &&
+	test_cmp expect actual
+
+[master a643494] fifth
+ Author: A U Thor <author@example.com>
+ext::sh invoked
+From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
+   b0c6cf2..a643494  master     -> origin/master
+ * [new tag]         five       -> five
+Updating b0c6cf2..a643494
+Fast-forward
+ok 3 - update following tag
+
+expecting success of 5802.4 'update backfilled tag': 
+	test_tick &&
+	git commit --allow-empty -m sixth &&
+	test_tick &&
+	git tag -a -m "tip two" two three^1 &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git pull &&
+		git for-each-ref refs/heads/ refs/tags/ >../actual
+	) &&
+	test_cmp expect actual
+
+[master 06b114e] sixth
+ Author: A U Thor <author@example.com>
+ext::sh invoked
+From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
+   a643494..06b114e  master     -> origin/master
+ * [new tag]         two        -> two
+Updating a643494..06b114e
+Fast-forward
+ok 4 - update backfilled tag
+
+expecting success of 5802.5 'update backfilled tag without primary transfer': 
+	test_tick &&
+	git tag -a -m "tip one " one two^1 &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git pull &&
+		git for-each-ref refs/heads/ refs/tags/ >../actual
+	) &&
+	test_cmp expect actual
+
+ext::sh invoked
+From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
+ * [new tag]         one        -> one
+Already up to date.
+ok 5 - update backfilled tag without primary transfer
+
+expecting success of 5802.6 'set up fake git-daemon': 
+	mkdir remote &&
+	git init --bare remote/one.git &&
+	mkdir remote/host &&
+	git init --bare remote/host/two.git &&
+	write_script fake-daemon <<-\EOF &&
+	git daemon --inetd \
+		--informative-errors \
+		--export-all \
+		--base-path="$TRASH_DIRECTORY/remote" \
+		--interpolated-path="$TRASH_DIRECTORY/remote/%H%D" \
+		"$TRASH_DIRECTORY/remote"
+	EOF
+	export TRASH_DIRECTORY &&
+	PATH=$TRASH_DIRECTORY:$PATH
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5802-connect-helper/remote/one.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5812-proto-disable-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5705-session-id-in-capabilities.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/local_pristine'...
+[master 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
+
+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.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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)
+
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 5705.8 'enable SID advertisement': 
+	git -C "$REPO" config transfer.advertiseSID true &&
+	git -C "$LOCAL_PRISTINE" config transfer.advertiseSID true
+
+ok 8 - enable SID advertisement
+
+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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20260314T133344.660635Z-H5c947e1c-P0003cec9","thread":"main","time":"2026-03-14T13:33:44.701585Z","file":"transport.c","line":378,"t_abs":0.041148,"t_rel":0.031949,"nesting":3,"category":"transfer","key":"server-sid","value":"20260314T133344.660635Z-H5c947e1c-P0003cec9/20260314T133344.695923Z-H5c947e1c-P0003ceda"}
+{"event":"data","sid":"20260314T133344.660635Z-H5c947e1c-P0003cec9/20260314T133344.695923Z-H5c947e1c-P0003ceda","thread":"main","time":"2026-03-14T13:33:44.705538Z","file":"upload-pack.c","line":1170,"t_abs":0.009809,"t_rel":0.009809,"nesting":1,"category":"transfer","key":"client-sid","value":"20260314T133344.660635Z-H5c947e1c-P0003cec9"}
+ok 9 - session IDs advertised (fetch v0)
+
+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.48.0~rc1+next.20250101/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 c2.t
-[main 65e22d0] super-c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Already on 'main'
-Your branch is behind 'same-name-1/main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-rm '.gitmodules'
-rm 'submodule'
-[main ae3683b] no submodules
- Author: A U Thor <author@example.com>
- 2 files changed, 4 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 submodule
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/same-name-1
-   0474d0c..6fe4f41  main       -> same-name-1/main
-Fetching submodule submodule at commit 6fe4f41
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/same-name-1/submodule
-   4d98905..c9df75f  main       -> origin/main
-ok 51 - fetch --recurse-submodules updates name-conflicted, unpopulated submodule
+ create mode 100644 b.t
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+{"event":"data","sid":"20260314T133345.148388Z-H5c947e1c-P0003d10d","thread":"main","time":"2026-03-14T13:33:45.161901Z","file":"transport.c","line":378,"t_abs":0.013716,"t_rel":0.012773,"nesting":3,"category":"transfer","key":"server-sid","value":"20260314T133345.148388Z-H5c947e1c-P0003d10d/20260314T133345.161139Z-H5c947e1c-P0003d121"}
+{"event":"data","sid":"20260314T133345.148388Z-H5c947e1c-P0003d10d/20260314T133345.161139Z-H5c947e1c-P0003d121","thread":"main","time":"2026-03-14T13:33:45.162388Z","file":"builtin/receive-pack.c","line":2139,"t_abs":0.001454,"t_rel":0.001454,"nesting":1,"category":"transfer","key":"client-sid","value":"20260314T133345.148388Z-H5c947e1c-P0003d10d"}
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 10 - session IDs advertised (push v0)
 
-expecting success of 5526.52 'fetch --all with --recurse-submodules': 
-	test_when_finished "rm -fr src_clone" &&
-	git clone --recurse-submodules src src_clone &&
-	(
-		cd src_clone &&
-		git config submodule.recurse true &&
-		git config fetch.parallel 0 &&
-		git fetch --all 2>../fetch-log
-	) &&
-	grep "^Fetching submodule sub$" fetch-log >fetch-subs &&
-	test_line_count = 1 fetch-subs
+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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20260314T133345.552374Z-H5c947e1c-P0003d2f8","thread":"main","time":"2026-03-14T13:33:45.577120Z","file":"connect.c","line":178,"t_abs":0.024955,"t_rel":0.023836,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20260314T133345.552374Z-H5c947e1c-P0003d2f8/20260314T133345.576168Z-H5c947e1c-P0003d319","thread":"main","time":"2026-03-14T13:33:45.576671Z","file":"protocol.c","line":80,"t_abs":0.000708,"t_rel":0.000708,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
+ok 11 - client & server log negotiated version (v0)
 
-Cloning into 'src_clone'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src_clone/sub'...
-done.
-Submodule path 'sub': checked out '77c750218fd2379ad09b559df2108a4fa3f233e7'
-ok 52 - fetch --all with --recurse-submodules
+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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20260314T133345.825871Z-H5c947e1c-P0003d3fb","thread":"main","time":"2026-03-14T13:33:45.845633Z","file":"transport.c","line":378,"t_abs":0.019972,"t_rel":0.018848,"nesting":3,"category":"transfer","key":"server-sid","value":"20260314T133345.825871Z-H5c947e1c-P0003d3fb/20260314T133345.844083Z-H5c947e1c-P0003d404"}
+{"event":"data","sid":"20260314T133345.825871Z-H5c947e1c-P0003d3fb/20260314T133345.844083Z-H5c947e1c-P0003d404","thread":"main","time":"2026-03-14T13:33:45.853546Z","file":"upload-pack.c","line":1170,"t_abs":0.009662,"t_rel":0.009662,"nesting":1,"category":"transfer","key":"client-sid","value":"20260314T133345.825871Z-H5c947e1c-P0003d3fb"}
+ok 12 - session IDs advertised (fetch v1)
 
-expecting success of 5526.53 'fetch --all with --recurse-submodules with multiple': 
-	test_when_finished "rm -fr src_clone" &&
-	git clone --recurse-submodules src src_clone &&
-	(
-		cd src_clone &&
-		git remote add secondary ../src &&
-		git config submodule.recurse true &&
-		git config fetch.parallel 0 &&
-		git fetch --all 2>../fetch-log
-	) &&
-	grep "Fetching submodule sub" fetch-log >fetch-subs &&
-	test_line_count = 2 fetch-subs
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+{"event":"data","sid":"20260314T133346.324225Z-H5c947e1c-P0003d5b1","thread":"main","time":"2026-03-14T13:33:46.341616Z","file":"transport.c","line":378,"t_abs":0.017607,"t_rel":0.016629,"nesting":3,"category":"transfer","key":"server-sid","value":"20260314T133346.324225Z-H5c947e1c-P0003d5b1/20260314T133346.339668Z-H5c947e1c-P0003d5c6"}
+{"event":"data","sid":"20260314T133346.324225Z-H5c947e1c-P0003d5b1/20260314T133346.339668Z-H5c947e1c-P0003d5c6","thread":"main","time":"2026-03-14T13:33:46.346267Z","file":"builtin/receive-pack.c","line":2139,"t_abs":0.006779,"t_rel":0.006779,"nesting":1,"category":"transfer","key":"client-sid","value":"20260314T133346.324225Z-H5c947e1c-P0003d5b1"}
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 13 - session IDs advertised (push v1)
 
-Cloning into 'src_clone'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src_clone/sub'...
-done.
-Submodule path 'sub': checked out '77c750218fd2379ad09b559df2108a4fa3f233e7'
-Fetching origin
-Fetching secondary
-ok 53 - fetch --all with --recurse-submodules with multiple
+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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20260314T133346.720888Z-H5c947e1c-P0003d714","thread":"main","time":"2026-03-14T13:33:46.737439Z","file":"connect.c","line":178,"t_abs":0.016746,"t_rel":0.011170,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20260314T133346.720888Z-H5c947e1c-P0003d714/20260314T133346.736552Z-H5c947e1c-P0003d723","thread":"main","time":"2026-03-14T13:33:46.737026Z","file":"protocol.c","line":80,"t_abs":0.000666,"t_rel":0.000666,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
+ok 14 - client & server log negotiated version (v1)
 
-expecting success of 5526.54 'fetch --all with --no-recurse-submodules only fetches superproject': 
-	test_when_finished "rm -rf src_clone" &&
+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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20260314T133346.992362Z-H5c947e1c-P0003d807","thread":"main","time":"2026-03-14T13:33:47.008594Z","file":"transport.c","line":361,"t_abs":0.016430,"t_rel":0.015343,"nesting":3,"category":"transfer","key":"server-sid","value":"20260314T133346.992362Z-H5c947e1c-P0003d807/20260314T133347.007948Z-H5c947e1c-P0003d80e"}
+{"event":"data","sid":"20260314T133346.992362Z-H5c947e1c-P0003d807/20260314T133347.007948Z-H5c947e1c-P0003d80e","thread":"main","time":"2026-03-14T13:33:47.014342Z","file":"serve.c","line":70,"t_abs":0.006580,"t_rel":0.006580,"nesting":1,"category":"transfer","key":"client-sid","value":"20260314T133346.992362Z-H5c947e1c-P0003d807"}
+ok 15 - session IDs advertised (fetch v2)
 
-	git clone --recurse-submodules src src_clone &&
-	(
-		cd src_clone &&
-		git remote add secondary ../src &&
-		git config submodule.recurse true &&
-		git fetch --all --no-recurse-submodules 2>../fetch-log
-	) &&
-	! grep "Fetching submodule" fetch-log
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+{"event":"data","sid":"20260314T133347.471710Z-H5c947e1c-P0003d9b5","thread":"main","time":"2026-03-14T13:33:47.493581Z","file":"transport.c","line":378,"t_abs":0.022051,"t_rel":0.021141,"nesting":3,"category":"transfer","key":"server-sid","value":"20260314T133347.471710Z-H5c947e1c-P0003d9b5/20260314T133347.486505Z-H5c947e1c-P0003d9c7"}
+{"event":"data","sid":"20260314T133347.471710Z-H5c947e1c-P0003d9b5/20260314T133347.486505Z-H5c947e1c-P0003d9c7","thread":"main","time":"2026-03-14T13:33:47.494108Z","file":"builtin/receive-pack.c","line":2139,"t_abs":0.007805,"t_rel":0.007805,"nesting":1,"category":"transfer","key":"client-sid","value":"20260314T133347.471710Z-H5c947e1c-P0003d9b5"}
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 16 - session IDs advertised (push v2)
 
-Cloning into 'src_clone'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5526-fetch-submodules/src_clone/sub'...
-done.
-Submodule path 'sub': checked out '77c750218fd2379ad09b559df2108a4fa3f233e7'
-Fetching origin
-Fetching secondary
-ok 54 - fetch --all with --no-recurse-submodules only fetches superproject
+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.48.0~rc1+next.20250101/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20260314T133347.932262Z-H5c947e1c-P0003db52","thread":"main","time":"2026-03-14T13:33:47.965760Z","file":"connect.c","line":178,"t_abs":0.033698,"t_rel":0.032611,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20260314T133347.932262Z-H5c947e1c-P0003db52/20260314T133347.952150Z-H5c947e1c-P0003db5c","thread":"main","time":"2026-03-14T13:33:47.952647Z","file":"protocol.c","line":80,"t_abs":0.000694,"t_rel":0.000694,"nesting":1,"category":"transfer","key":"negotiated-version","value":"2"}
+ok 17 - client & server log negotiated version (v2)
 
-# passed all 54 test(s)
-1..54
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5811-proto-disable-git.sh ***
@@ -375728,7 +374535,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[1790535] Ready to rumble
+[252314] Ready to rumble
 expecting success of 5811.1 'create git-accessible repo': 
 	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
 	test_commit one &&
@@ -375755,11 +374562,11 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-[1790884] Connection from 127.0.0.1:58666
-[1790884] Extended attribute "host": 127.0.0.1:5811
-[1790884] Extended attribute "protocol": version=2
-[1790884] Request upload-pack for '/repo.git'
-[1790535] [1790884] Disconnected
+[252683] Connection from 127.0.0.1:57408
+[252683] Extended attribute "host": 127.0.0.1:5811
+[252683] Extended attribute "protocol": version=2
+[252683] Request upload-pack for '/repo.git'
+[252314] [252683] Disconnected
 ok 2 - clone git:// (enabled)
 
 expecting success of 5811.3 'fetch git:// (enabled)': 
@@ -375770,13 +374577,13 @@
 			git fetch
 		)
 	
-[1791442] Connection from 127.0.0.1:58680
-[1791442] Extended attribute "host": 127.0.0.1:5811
-[1791442] Extended attribute "protocol": version=2
-[1791442] Request upload-pack for '/repo.git'
+[252795] Connection from 127.0.0.1:57414
+[252795] Extended attribute "host": 127.0.0.1:5811
+[252795] Extended attribute "protocol": version=2
+[252795] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[1790535] [1791442] Disconnected
+[252314] [252795] Disconnected
 ok 3 - fetch git:// (enabled)
 
 expecting success of 5811.4 'push git:// (enabled)': 
@@ -375787,11 +374594,12 @@
 			git push origin HEAD:pushed
 		)
 	
-[1791780] Connection from 127.0.0.1:58682
-[1791780] Extended attribute "host": 127.0.0.1:5811
-[1791780] Request receive-pack for '/repo.git'
+[252951] Connection from 127.0.0.1:57418
+[252951] Extended attribute "host": 127.0.0.1:5811
+[252951] Request receive-pack for '/repo.git'
 To git://127.0.0.1:5811/repo.git
  * [new branch]      HEAD -> pushed
+[252314] [252951] Disconnected
 ok 4 - push git:// (enabled)
 
 expecting success of 5811.5 'push git:// (disabled)': 
@@ -375802,7 +374610,6 @@
 			test_must_fail git push origin HEAD:pushed
 		)
 	
-[1790535] [1791780] Disconnected
 fatal: transport 'git' not allowed
 ok 5 - push git:// (disabled)
 
@@ -375849,35 +374656,35 @@
 		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[1792297] Connection from 127.0.0.1:58696
-[1792297] Extended attribute "host": 127.0.0.1:5811
-[1792297] Extended attribute "protocol": version=2
-[1792297] Request upload-pack for '/repo.git'
-[1790535] [1792297] Disconnected
+[253393] Connection from 127.0.0.1:57428
+[253393] Extended attribute "host": 127.0.0.1:5811
+[253393] Extended attribute "protocol": version=2
+[253393] Request upload-pack for '/repo.git'
+[252314] [253393] 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
 	
-[1792799] Connection from 127.0.0.1:58708
-[1792799] Extended attribute "host": 127.0.0.1:5811
-[1792799] Extended attribute "protocol": version=2
-[1792799] Request upload-pack for '/repo.git'
+[253561] Connection from 127.0.0.1:57432
+[253561] Extended attribute "host": 127.0.0.1:5811
+[253561] Extended attribute "protocol": version=2
+[253561] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[1790535] [1792799] Disconnected
+[252314] [253561] 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
 	
-[1793099] Connection from 127.0.0.1:58710
-[1793099] Extended attribute "host": 127.0.0.1:5811
-[1793099] Request receive-pack for '/repo.git'
+[253708] Connection from 127.0.0.1:57446
+[253708] Extended attribute "host": 127.0.0.1:5811
+[253708] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 11 - push git:// (enabled)
 
-[1790535] [1793099] Disconnected
+[252314] [253708] 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
 	
@@ -375903,35 +374710,35 @@
 		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[1793251] Connection from 127.0.0.1:58718
-[1793251] Extended attribute "host": 127.0.0.1:5811
-[1793251] Extended attribute "protocol": version=2
-[1793251] Request upload-pack for '/repo.git'
-[1790535] [1793251] Disconnected
+[253870] Connection from 127.0.0.1:57460
+[253870] Extended attribute "host": 127.0.0.1:5811
+[253870] Extended attribute "protocol": version=2
+[253870] Request upload-pack for '/repo.git'
+[252314] [253870] Disconnected
 ok 15 - clone git:// (enabled)
 
 expecting success of 5811.16 'fetch git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-[1793773] Connection from 127.0.0.1:58722
-[1793773] Extended attribute "host": 127.0.0.1:5811
-[1793773] Extended attribute "protocol": version=2
-[1793773] Request upload-pack for '/repo.git'
+[254024] Connection from 127.0.0.1:57474
+[254024] Extended attribute "host": 127.0.0.1:5811
+[254024] Extended attribute "protocol": version=2
+[254024] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
+[252314] [254024] Disconnected
 ok 16 - fetch git:// (enabled)
 
-[1790535] [1793773] Disconnected
 expecting success of 5811.17 'push git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
 	
-[1794097] Connection from 127.0.0.1:58730
-[1794097] Extended attribute "host": 127.0.0.1:5811
-[1794097] Request receive-pack for '/repo.git'
+[254168] Connection from 127.0.0.1:57488
+[254168] Extended attribute "host": 127.0.0.1:5811
+[254168] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 17 - push git:// (enabled)
 
-[1790535] [1794097] Disconnected
+[252314] [254168] Disconnected
 expecting success of 5811.18 'push git:// (disabled)': 
 		(
 			cd tmp.git &&
@@ -375972,35 +374779,35 @@
 		git clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[1794232] Connection from 127.0.0.1:58732
-[1794232] Extended attribute "host": 127.0.0.1:5811
-[1794232] Extended attribute "protocol": version=2
-[1794232] Request upload-pack for '/repo.git'
-[1790535] [1794232] Disconnected
+[254419] Connection from 127.0.0.1:57492
+[254419] Extended attribute "host": 127.0.0.1:5811
+[254419] Extended attribute "protocol": version=2
+[254419] Request upload-pack for '/repo.git'
+[252314] [254419] 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
 	
-[1794718] Connection from 127.0.0.1:58740
-[1794718] Extended attribute "host": 127.0.0.1:5811
-[1794718] Extended attribute "protocol": version=2
-[1794718] Request upload-pack for '/repo.git'
+[254643] Connection from 127.0.0.1:56508
+[254643] Extended attribute "host": 127.0.0.1:5811
+[254643] Extended attribute "protocol": version=2
+[254643] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[1790535] [1794718] Disconnected
+[252314] [254643] 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
 	
-[1795068] Connection from 127.0.0.1:58750
-[1795068] Extended attribute "host": 127.0.0.1:5811
-[1795068] Request receive-pack for '/repo.git'
+[254834] Connection from 127.0.0.1:56522
+[254834] Extended attribute "host": 127.0.0.1:5811
+[254834] Request receive-pack for '/repo.git'
 Everything up-to-date
-[1790535] [1795068] Disconnected
+[252314] [254834] Disconnected
 ok 23 - push git:// (enabled)
 
 expecting success of 5811.24 'push git:// (disabled)': 
@@ -376027,11 +374834,1029 @@
 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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5814-proto-disable-ext.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5814-proto-disable-ext/.git/
+expecting success of 5814.1 'setup ext wrapper': 
+		write_script fake-remote <<-\EOF &&
+		echo >&2 "fake-remote: $*"
+		cd "$TRASH_DIRECTORY/remote" &&
+		eval "$*"
+		EOF
+		PATH=$TRASH_DIRECTORY:$PATH &&
+		export TRASH_DIRECTORY
+	
+ok 1 - setup ext wrapper
+
+expecting success of 5814.2 'setup repository to clone': 
+	test_commit one &&
+	mkdir remote &&
+	git init --bare remote/repo.git &&
+	git push remote/repo.git HEAD
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5814-proto-disable-ext/remote/repo.git/
+To remote/repo.git
+ * [new branch]      HEAD -> master
+ok 2 - setup repository to clone
+
+expecting success of 5814.3 'clone remote-helper (enabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 3 - clone remote-helper (enabled)
+
+expecting success of 5814.4 'fetch remote-helper (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 4 - fetch remote-helper (enabled)
+
+expecting success of 5814.5 'push remote-helper (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+fake-remote: git-receive-pack repo.git
+To ext::fake-remote %S repo.git
+ * [new branch]      HEAD -> pushed
+ok 5 - push remote-helper (enabled)
+
+expecting success of 5814.6 'push remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'ext' not allowed
+ok 6 - push remote-helper (disabled)
+
+expecting success of 5814.7 'fetch remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'ext' not allowed
+ok 7 - fetch remote-helper (disabled)
+
+expecting success of 5814.8 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 8 - clone remote-helper (disabled)
+
+expecting success of 5814.9 'clone remote-helper (env var has precedence)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 9 - clone remote-helper (env var has precedence)
+
+expecting success of 5814.10 'clone remote-helper (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 10 - clone remote-helper (enabled with config)
+
+expecting success of 5814.11 'fetch remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 11 - fetch remote-helper (enabled)
+
+expecting success of 5814.12 'push remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+fake-remote: git-receive-pack repo.git
+Everything up-to-date
+ok 12 - push remote-helper (enabled)
+
+expecting success of 5814.13 'push remote-helper (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+fatal: transport 'ext' not allowed
+ok 13 - push remote-helper (disabled)
+
+expecting success of 5814.14 'fetch remote-helper (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'ext' not allowed
+ok 14 - fetch remote-helper (disabled)
+
+expecting success of 5814.15 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 15 - clone remote-helper (disabled)
+
+expecting success of 5814.16 'clone remote-helper (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 16 - clone remote-helper (enabled)
+
+expecting success of 5814.17 'fetch remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 17 - fetch remote-helper (enabled)
+
+expecting success of 5814.18 'push remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+fake-remote: git-receive-pack repo.git
+Everything up-to-date
+ok 18 - push remote-helper (enabled)
+
+expecting success of 5814.19 'push remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
+		)
+	
+fatal: transport 'ext' not allowed
+ok 19 - push remote-helper (disabled)
+
+expecting success of 5814.20 'fetch remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'ext' not allowed
+ok 20 - fetch remote-helper (disabled)
+
+expecting success of 5814.21 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 21 - clone remote-helper (disabled)
+
+expecting success of 5814.22 'clone remote-helper (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 22 - clone remote-helper (enabled)
+
+expecting success of 5814.23 'fetch remote-helper (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 23 - fetch remote-helper (enabled)
+
+expecting success of 5814.24 'push remote-helper (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+fake-remote: git-receive-pack repo.git
+Everything up-to-date
+ok 24 - push remote-helper (enabled)
+
+expecting success of 5814.25 'push remote-helper (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'ext' not allowed
+ok 25 - push remote-helper (disabled)
+
+expecting success of 5814.26 'fetch remote-helper (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'ext' not allowed
+ok 26 - fetch remote-helper (disabled)
+
+expecting success of 5814.27 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 27 - clone remote-helper (disabled)
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5810-proto-disable-local.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.git/
+expecting success of 5810.1 'setup repository to clone': 
+	test_commit one
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup repository to clone
+
+expecting success of 5810.2 'clone file:// (enabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+ok 2 - clone file:// (enabled)
+
+expecting success of 5810.3 'fetch file:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
+ * branch            HEAD       -> FETCH_HEAD
+ok 3 - fetch file:// (enabled)
+
+expecting success of 5810.4 'push file:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
+ * [new branch]      HEAD -> pushed
+ok 4 - push file:// (enabled)
+
+expecting success of 5810.5 'push file:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'file' not allowed
+ok 5 - push file:// (disabled)
+
+expecting success of 5810.6 'fetch file:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'file' not allowed
+ok 6 - fetch file:// (disabled)
+
+expecting success of 5810.7 'clone file:// (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 7 - clone file:// (disabled)
+
+expecting success of 5810.8 'clone file:// (env var has precedence)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 8 - clone file:// (env var has precedence)
+
+expecting success of 5810.9 'clone file:// (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ok 9 - clone file:// (enabled with config)
+
+expecting success of 5810.10 'fetch file:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
+ * branch            HEAD       -> FETCH_HEAD
+ok 10 - fetch file:// (enabled)
+
+expecting success of 5810.11 'push file:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+Everything up-to-date
+ok 11 - push file:// (enabled)
+
+expecting success of 5810.12 'push file:// (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+fatal: transport 'file' not allowed
+ok 12 - push file:// (disabled)
+
+expecting success of 5810.13 'fetch file:// (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'file' not allowed
+ok 13 - fetch file:// (disabled)
+
+expecting success of 5810.14 'clone file:// (disabled)': 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 14 - clone file:// (disabled)
+
+expecting success of 5810.15 'clone file:// (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ok 15 - clone file:// (enabled)
+
+expecting success of 5810.16 'fetch file:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
+ * branch            HEAD       -> FETCH_HEAD
+ok 16 - fetch file:// (enabled)
+
+expecting success of 5810.17 'push file:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+Everything up-to-date
+ok 17 - push file:// (enabled)
+
+expecting success of 5810.18 'push file:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
+		)
+	
+fatal: transport 'file' not allowed
+ok 18 - push file:// (disabled)
+
+expecting success of 5810.19 'fetch file:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'file' not allowed
+ok 19 - fetch file:// (disabled)
+
+expecting success of 5810.20 'clone file:// (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 20 - clone file:// (disabled)
+
+expecting success of 5810.21 'clone file:// (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ok 21 - clone file:// (enabled)
+
+expecting success of 5810.22 'fetch file:// (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local
+ * branch            HEAD       -> FETCH_HEAD
+ok 22 - fetch file:// (enabled)
+
+expecting success of 5810.23 'push file:// (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+Everything up-to-date
+ok 23 - push file:// (enabled)
+
+expecting success of 5810.24 'push file:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'file' not allowed
+ok 24 - push file:// (disabled)
+
+expecting success of 5810.25 'fetch file:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'file' not allowed
+ok 25 - fetch file:// (disabled)
+
+expecting success of 5810.26 'clone file:// (disabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 26 - clone file:// (disabled)
+
+expecting success of 5810.27 'clone path (enabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+done.
+ok 27 - clone path (enabled)
+
+expecting success of 5810.28 'fetch path (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 28 - fetch path (enabled)
+
+expecting success of 5810.29 'push path (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+Everything up-to-date
+ok 29 - push path (enabled)
+
+expecting success of 5810.30 'push path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'file' not allowed
+ok 30 - push path (disabled)
+
+expecting success of 5810.31 'fetch path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'file' not allowed
+ok 31 - fetch path (disabled)
+
+expecting success of 5810.32 'clone path (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 32 - clone path (disabled)
+
+expecting success of 5810.33 'clone path (env var has precedence)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 33 - clone path (env var has precedence)
+
+expecting success of 5810.34 'clone path (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+done.
+ok 34 - clone path (enabled with config)
+
+expecting success of 5810.35 'fetch path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 35 - fetch path (enabled)
+
+expecting success of 5810.36 'push path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+Everything up-to-date
+ok 36 - push path (enabled)
+
+expecting success of 5810.37 'push path (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+fatal: transport 'file' not allowed
+ok 37 - push path (disabled)
+
+expecting success of 5810.38 'fetch path (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'file' not allowed
+ok 38 - fetch path (disabled)
+
+expecting success of 5810.39 'clone path (disabled)': 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 39 - clone path (disabled)
+
+expecting success of 5810.40 'clone path (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+done.
+ok 40 - clone path (enabled)
+
+expecting success of 5810.41 'fetch path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 41 - fetch path (enabled)
+
+expecting success of 5810.42 'push path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+Everything up-to-date
+ok 42 - push path (enabled)
+
+expecting success of 5810.43 'push path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
+		)
+	
+fatal: transport 'file' not allowed
+ok 43 - push path (disabled)
+
+expecting success of 5810.44 'fetch path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'file' not allowed
+ok 44 - fetch path (disabled)
+
+expecting success of 5810.45 'clone path (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 45 - clone path (disabled)
+
+expecting success of 5810.46 'clone path (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+done.
+ok 46 - clone path (enabled)
+
+expecting success of 5810.47 'fetch path (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 47 - fetch path (enabled)
+
+expecting success of 5810.48 'push path (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+Everything up-to-date
+ok 48 - push path (enabled)
+
+expecting success of 5810.49 'push path (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'file' not allowed
+ok 49 - push path (disabled)
+
+expecting success of 5810.50 'fetch path (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'file' not allowed
+ok 50 - fetch path (disabled)
+
+expecting success of 5810.51 'clone path (disabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'file' not allowed
+ok 51 - clone path (disabled)
+
+expecting success of 5810.52 'setup repo with dash': 
+	git init --bare repo.git &&
+	git push repo.git HEAD &&
+	mv repo.git "$PWD/-repo.git"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/repo.git/
+To repo.git
+ * [new branch]      HEAD -> master
+ok 52 - setup repo with dash
+
+expecting success of 5810.53 'repo names starting with dash are rejected': 
+	rm -f trace.out &&
+	test_must_fail env GIT_TRACE="$PWD/trace.out" git fetch -- -repo.git &&
+	! grep upload-pack trace.out
+
+fatal: strange pathname '-repo.git' blocked
+ok 53 - repo names starting with dash are rejected
+
+expecting success of 5810.54 'full paths still work': 
+	git fetch "$PWD/-repo.git"
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5810-proto-disable-local/-repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 54 - full paths still work
+
+# passed all 54 test(s)
+1..54
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5815-submodule-protos.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module'. Retry scheduled
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module'. Retry scheduled
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5900-repo-selection.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/.git/
+expecting success of 5900.1 'find .git dir in worktree': 
+	reset &&
+	make_tree foo &&
+	get foo &&
+	check foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 1 - find .git dir in worktree
+
+expecting success of 5900.2 'automagically add .git suffix': 
+	reset &&
+	make_bare foo.git &&
+	get foo &&
+	check foo.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 2 - automagically add .git suffix
+
+expecting success of 5900.3 'automagically add .git suffix to worktree': 
+	reset &&
+	make_tree foo.git &&
+	get foo &&
+	check foo.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/.git/
+[master (root-commit) 98b6c1b] foo.git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.git.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 3 - automagically add .git suffix to worktree
+
+expecting success of 5900.4 'prefer worktree foo over bare foo.git': 
+	reset &&
+	make_tree foo &&
+	make_bare foo.git &&
+	get foo &&
+	check foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 4 - prefer worktree foo over bare foo.git
+
+expecting success of 5900.5 'prefer bare foo over bare foo.git': 
+	reset &&
+	make_bare foo &&
+	make_bare foo.git &&
+	get foo &&
+	check foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 5 - prefer bare foo over bare foo.git
+
+expecting success of 5900.6 'disambiguate with full foo.git': 
+	reset &&
+	make_bare foo &&
+	make_bare foo.git &&
+	get foo.git &&
+	check foo.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 6 - disambiguate with full foo.git
+
+expecting success of 5900.7 'we are not fooled by non-git foo directory': 
+	reset &&
+	make_bare foo.git &&
+	mkdir foo &&
+	get foo &&
+	check foo.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 7 - we are not fooled by non-git foo directory
+
+expecting success of 5900.8 'prefer inner .git over outer bare': 
+	reset &&
+	make_tree foo &&
+	make_bare foo.git &&
+	mv foo/.git foo.git &&
+	get foo.git &&
+	check foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 8 - prefer inner .git over outer bare
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6000-rev-list-misc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6000-rev-list-misc/.git/
 expecting success of 6000.1 'setup': 
@@ -376486,148 +376311,130 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5900-repo-selection.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/.git/
-expecting success of 5900.1 'find .git dir in worktree': 
-	reset &&
-	make_tree foo &&
-	get foo &&
-	check foo
+*** t6004-rev-list-path-optim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
+[main (root-commit) 5c8df84] Initial commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 1 - find .git dir in worktree
+ 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 5900.2 'automagically add .git suffix': 
-	reset &&
-	make_bare foo.git &&
-	get foo &&
-	check foo.git
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 2 - automagically add .git suffix
+ok 2 - path-optimization
 
-expecting success of 5900.3 'automagically add .git suffix to worktree': 
-	reset &&
-	make_tree foo.git &&
-	get foo &&
-	check foo.git
+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"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/.git/
-[master (root-commit) 98b6c1b] foo.git
+Switched to a new branch 'side'
+[side d02d707] Side makes an irrelevant commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.git.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 3 - automagically add .git suffix to worktree
-
-expecting success of 5900.4 'prefer worktree foo over bare foo.git': 
-	reset &&
-	make_tree foo &&
-	make_bare foo.git &&
-	get foo &&
-	check foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
+ 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(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 4 - prefer worktree foo over bare foo.git
+ 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 5900.5 'prefer bare foo over bare foo.git': 
-	reset &&
-	make_bare foo &&
-	make_bare foo.git &&
-	get foo &&
-	check foo
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 5 - prefer bare foo over bare foo.git
+ok 4 - path optimization 2
 
-expecting success of 5900.6 'disambiguate with full foo.git': 
-	reset &&
-	make_bare foo &&
-	make_bare foo.git &&
-	get foo.git &&
-	check foo.git
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 6 - disambiguate with full foo.git
+ok 5 - pathspec with leading path
 
-expecting success of 5900.7 'we are not fooled by non-git foo directory': 
-	reset &&
-	make_bare foo.git &&
-	mkdir foo &&
-	get foo &&
-	check foo.git
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 7 - we are not fooled by non-git foo directory
+ok 6 - pathspec with glob (1)
 
-expecting success of 5900.8 'prefer inner .git over outer bare': 
-	reset &&
-	make_tree foo &&
-	make_bare foo.git &&
-	mv foo/.git foo.git &&
-	get foo.git &&
-	check foo
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 8 - prefer inner .git over outer bare
+ok 7 - pathspec with glob (2)
 
-# passed all 8 test(s)
-1..8
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5813-proto-disable-ssh.sh ***
@@ -377398,132 +377205,6 @@
 1..81
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6004-rev-list-path-optim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5702-protocol-v2.sh ***
 checking prerequisite: PIPE
 
@@ -377537,7 +377218,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[1781942] Ready to rumble
+[242173] 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
@@ -377563,18 +377244,18 @@
 	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
 	test_cmp expect actual
 
-[1782063] Connection from 127.0.0.1:60402
-[1782063] Extended attribute "host": 127.0.0.1:5702
-[1782063] Extended attribute "protocol": version=2
-[1782063] Request upload-pack for '/parent'
-[1781942] [1782063] Disconnected
+[242422] Connection from 127.0.0.1:57104
+[242422] Extended attribute "host": 127.0.0.1:5702
+[242422] Extended attribute "protocol": version=2
+[242422] Request upload-pack for '/parent'
+[242173] [242422] Disconnected
 packet:    ls-remote> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
 packet:    ls-remote< version 2
-[1782322] Connection from 127.0.0.1:60406
-[1782322] Extended attribute "host": 127.0.0.1:5702
-[1782322] Extended attribute "protocol": version=2
-[1782322] Request upload-pack for '/parent'
-[1781942] [1782322] Disconnected
+[242538] Connection from 127.0.0.1:57114
+[242538] Extended attribute "host": 127.0.0.1:5702
+[242538] Extended attribute "protocol": version=2
+[242538] Request upload-pack for '/parent'
+[242173] [242538] 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': 
@@ -377589,11 +377270,11 @@
 
 	test_cmp expect actual
 
-[1782595] Connection from 127.0.0.1:60410
-[1782595] Extended attribute "host": 127.0.0.1:5702
-[1782595] Extended attribute "protocol": version=2
-[1782595] Request upload-pack for '/parent'
-[1781942] [1782595] Disconnected
+[242700] Connection from 127.0.0.1:57122
+[242700] Extended attribute "host": 127.0.0.1:5702
+[242700] Extended attribute "protocol": version=2
+[242700] Request upload-pack for '/parent'
+[242173] [242700] Disconnected
 ok 3 - ref advertisement is filtered with ls-remote using protocol v2
 
 expecting success of 5702.4 'clone with git:// using protocol v2': 
@@ -377612,11 +377293,11 @@
 	grep "clone< version 2" log
 
 Cloning into 'daemon_child'...
-[1782902] Connection from 127.0.0.1:60426
-[1782902] Extended attribute "host": 127.0.0.1:5702
-[1782902] Extended attribute "protocol": version=2
-[1782902] Request upload-pack for '/parent'
-[1781942] [1782902] Disconnected
+[242937] Connection from 127.0.0.1:57136
+[242937] Extended attribute "host": 127.0.0.1:5702
+[242937] Extended attribute "protocol": version=2
+[242937] Request upload-pack for '/parent'
+[242173] [242937] 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
@@ -377642,11 +377323,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[1783547] Connection from 127.0.0.1:60430
-[1783547] Extended attribute "host": 127.0.0.1:5702
-[1783547] Extended attribute "protocol": version=2
-[1783547] Request upload-pack for '/parent'
-[1781942] [1783547] Disconnected
+[243318] Connection from 127.0.0.1:57138
+[243318] Extended attribute "host": 127.0.0.1:5702
+[243318] Extended attribute "protocol": version=2
+[243318] Request upload-pack for '/parent'
+[242173] [243318] Disconnected
 From git://127.0.0.1:5702/parent
    d79ce16..139b20d  main       -> origin/main
  * [new tag]         two        -> two
@@ -377670,11 +377351,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two_a.t
-[1784348] Connection from 127.0.0.1:60434
-[1784348] Extended attribute "host": 127.0.0.1:5702
-[1784348] Extended attribute "protocol": version=2
-[1784348] Request upload-pack for '/parent'
-[1781942] [1784348] Disconnected
+[243783] Connection from 127.0.0.1:57150
+[243783] Extended attribute "host": 127.0.0.1:5702
+[243783] Extended attribute "protocol": version=2
+[243783] Request upload-pack for '/parent'
+[242173] [243783] Disconnected
 From git://127.0.0.1:5702/parent
  * branch            7e9f7d092ed45f242659c87db76fd08923e99801 -> FETCH_HEAD
 packet:        fetch< version 2
@@ -377695,14 +377376,14 @@
 	# Server responded using protocol v2
 	grep "fetch< version 2" log
 
-[1784796] Connection from 127.0.0.1:60440
-[1784796] Extended attribute "host": 127.0.0.1:5702
-[1784796] Extended attribute "protocol": version=2
-[1784796] Request upload-pack for '/parent'
+[244101] Connection from 127.0.0.1:57152
+[244101] Extended attribute "host": 127.0.0.1:5702
+[244101] Extended attribute "protocol": version=2
+[244101] Request upload-pack for '/parent'
 From git://127.0.0.1:5702/parent
    139b20d..7e9f7d0  main       -> origin/main
  * [new tag]         two_a      -> two_a
-[1781942] [1784796] Disconnected
+[242173] [244101] Disconnected
 Updating d79ce16..7e9f7d0
 Fast-forward
  two.t   | 1 +
@@ -377741,16 +377422,15 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[1785366] Connection from 127.0.0.1:60444
-[1785366] Extended attribute "host": 127.0.0.1:5702
-[1785366] Request receive-pack for '/parent'
+[244534] Connection from 127.0.0.1:57160
+[244534] Extended attribute "host": 127.0.0.1:5702
+[244534] Request receive-pack for '/parent'
 To git://127.0.0.1:5702/parent
  * [new branch]      HEAD -> client_branch
-[1781942] [1785366] Disconnected
+[242173] [244534] 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
@@ -378916,6720 +378596,10748 @@
 	test_path_is_file env.trace &&
 	! grep ^GIT_PROTOCOL env.trace
 
-ok 55 - archive with custom path does not request v2
+ok 55 - archive with custom path does not request v2
+
+expecting success of 5702.56 'reject client packfile-uris if not advertised': 
+	{
+		packetize command=fetch &&
+		packetize object-format=$(test_oid algo) &&
+		printf 0001 &&
+		packetize packfile-uris https &&
+		packetize done &&
+		printf 0000
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack client <input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git -c uploadpack.blobpackfileuri \
+		upload-pack client <input &&
+	GIT_PROTOCOL=version=2 \
+		git -c uploadpack.blobpackfileuri=anything \
+		upload-pack client <input
+
+000eversion 2
+002aagent=git/2.48.0.rc1.219.gb6b6757d772
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: unexpected line: 'packfile-uris https'
+000eversion 2
+002aagent=git/2.48.0.rc1.219.gb6b6757d772
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: unexpected line: 'packfile-uris https'
+000eversion 2
+002aagent=git/2.48.0.rc1.219.gb6b6757d772
+0013ls-refs=unborn
+002efetch=shallow wait-for-done packfile-uris
+0012server-option
+0017object-format=sha1
+0000ok 56 - reject client packfile-uris if not advertised
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 56 test(s)
+# SKIP no web server found at ''
+1..56
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5801-remote-helpers.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/.git/
+expecting success of 5801.1 'setup repository': 
+	git init server &&
+	(cd server &&
+	 echo content >file &&
+	 git add file &&
+	 git commit -m one)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git/
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup repository
+
+expecting success of 5801.2 'cloning from local repo': 
+	git clone "testgit::${PWD}/server" local &&
+	test_cmp server/file local/file
+
+Cloning into 'local'...
+ok 2 - cloning from local repo
+
+expecting success of 5801.3 'clone with remote.*.vcs config': 
+	GIT_TRACE=$PWD/vcs-clone.trace \
+	git clone --no-local -c remote.origin.vcs=testgit "$PWD/server" vcs-clone &&
+	test_grep remote-testgit vcs-clone.trace
+
+Cloning into 'vcs-clone'...
+trace: run_command: git remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
+trace: exec: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
+trace: run_command: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5801/git-remote-testgit' origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
+ok 3 - clone with remote.*.vcs config
+
+expecting success of 5801.4 'fetch with configured remote.*.vcs': 
+	git init vcs-fetch &&
+	git -C vcs-fetch config remote.origin.vcs testgit &&
+	git -C vcs-fetch config remote.origin.url "$PWD/server" &&
+	GIT_TRACE=$PWD/vcs-fetch.trace \
+	git -C vcs-fetch fetch origin &&
+	test_grep remote-testgit vcs-fetch.trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/vcs-fetch/.git/
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * branch            HEAD       -> FETCH_HEAD
+trace: run_command: GIT_DIR=.git git remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
+trace: exec: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
+trace: run_command: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5801/git-remote-testgit' origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
+ok 4 - fetch with configured remote.*.vcs
+
+expecting success of 5801.5 'vcs remote with no url': 
+	NOURL_UPSTREAM=$PWD/server &&
+	export NOURL_UPSTREAM &&
+	git init vcs-nourl &&
+	git -C vcs-nourl config remote.origin.vcs nourl &&
+	git -C vcs-nourl fetch origin
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/vcs-nourl/.git/
+From origin
+ * branch            HEAD       -> FETCH_HEAD
+ok 5 - vcs remote with no url
+
+expecting success of 5801.6 'create new commit on remote': 
+	(cd server &&
+	 echo content >>file &&
+	 git commit -a -m two)
+
+[main 5647d5f] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 6 - create new commit on remote
+
+expecting success of 5801.7 'pulling from local repo': 
+	(cd local && git pull) &&
+	test_cmp server/file local/file
+
+From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+   f39a923..5647d5f  main       -> origin/main
+Updating f39a923..5647d5f
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+ok 7 - pulling from local repo
+
+expecting success of 5801.8 'pushing to local repo': 
+	(cd local &&
+	echo content >>file &&
+	git commit -a -m three &&
+	git push) &&
+	compare_refs local HEAD server HEAD
+
+[main f883ace] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+   5647d5f..f883ace  main -> main
+ok 8 - pushing to local repo
+
+expecting success of 5801.9 'fetch new branch': 
+	(cd server &&
+	 git reset --hard &&
+	 git checkout -b new &&
+	 echo content >>file &&
+	 git commit -a -m five
+	) &&
+	(cd local &&
+	 git fetch origin new
+	) &&
+	compare_refs server HEAD local FETCH_HEAD
+
+HEAD is now at f883ace three
+Switched to a new branch 'new'
+[new 9a8e2ab] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * branch            new        -> FETCH_HEAD
+ * [new branch]      new        -> origin/new
+ok 9 - fetch new branch
+
+expecting success of 5801.10 'fetch multiple branches': 
+	(cd local &&
+	 git fetch
+	) &&
+	compare_refs server main local refs/remotes/origin/main &&
+	compare_refs server new local refs/remotes/origin/new
+
+ok 10 - fetch multiple branches
+
+expecting success of 5801.11 'push when remote has extra refs': 
+	(cd local &&
+	 git reset --hard origin/main &&
+	 echo content >>file &&
+	 git commit -a -m six &&
+	 git push
+	) &&
+	compare_refs local main server main
+
+HEAD is now at f883ace three
+[main 0d4cb61] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+   f883ace..0d4cb61  main -> main
+ok 11 - push when remote has extra refs
+
+expecting success of 5801.12 'push new branch by name': 
+	(cd local &&
+	 git checkout -b new-name  &&
+	 echo content >>file &&
+	 git commit -a -m seven &&
+	 git push origin new-name
+	) &&
+	compare_refs local HEAD server refs/heads/new-name
+
+Switched to a new branch 'new-name'
+[new-name 7c93a0d] seven
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      new-name -> new-name
+ok 12 - push new branch by name
+
+expecting success of 5801.13 'push new branch with old:new refspec': 
+	(cd local &&
+	 git push origin new-name:new-refspec
+	) &&
+	compare_refs local HEAD server refs/heads/new-refspec
+
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      new-name -> new-refspec
+ok 13 - push new branch with old:new refspec
+
+expecting success of 5801.14 'push new branch with HEAD:new refspec': 
+	(cd local &&
+	 git checkout new-name &&
+	 git push origin HEAD:new-refspec-2
+	) &&
+	compare_refs local HEAD server refs/heads/new-refspec-2
+
+Already on 'new-name'
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      HEAD -> new-refspec-2
+ok 14 - push new branch with HEAD:new refspec
+
+expecting success of 5801.15 'push delete branch': 
+	(cd local &&
+	 git push origin :new-name
+	) &&
+	test_must_fail git --git-dir="server/.git" \
+	 rev-parse --verify refs/heads/new-name
+
+Everything up-to-date
+fatal: Needed a single revision
+ok 15 - push delete branch
+
+expecting success of 5801.16 'forced push': 
+	(cd local &&
+	git checkout -b force-test &&
+	echo content >> file &&
+	git commit -a -m eight &&
+	git push origin force-test &&
+	echo content >> file &&
+	git commit -a --amend -m eight-modified &&
+	git push --force origin force-test
+	) &&
+	compare_refs local refs/heads/force-test server refs/heads/force-test
+
+Switched to a new branch 'force-test'
+[force-test 518e3ec] eight
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      force-test -> force-test
+[force-test b33c694] eight-modified
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 2 insertions(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+   518e3ec..b33c694  force-test -> force-test
+ok 16 - forced push
+
+expecting success of 5801.17 'cloning without refspec': 
+	GIT_REMOTE_TESTGIT_NOREFSPEC=1 \
+	git clone "testgit::${PWD}/server" local2 2>error &&
+	test_grep "this remote helper should implement refspec capability" error &&
+	compare_refs local2 HEAD server HEAD
+
+warning: this remote helper should implement refspec capability
+ok 17 - cloning without refspec
+
+expecting success of 5801.18 'pulling without refspecs': 
+	(cd local2 &&
+	git reset --hard &&
+	GIT_REMOTE_TESTGIT_NOREFSPEC=1 git pull 2>../error) &&
+	test_grep "this remote helper should implement refspec capability" error &&
+	compare_refs local2 HEAD server HEAD
+
+HEAD is now at 9a8e2ab five
+Already up to date.
+warning: this remote helper should implement refspec capability
+ok 18 - pulling without refspecs
+
+expecting success of 5801.19 'pushing without refspecs': 
+	test_when_finished "(cd local2 && git reset --hard origin)" &&
+	(cd local2 &&
+	echo content >>file &&
+	git commit -a -m ten &&
+	GIT_REMOTE_TESTGIT_NOREFSPEC=1 &&
+	export GIT_REMOTE_TESTGIT_NOREFSPEC &&
+	test_must_fail git push 2>../error) &&
+	test_grep "remote-helper doesn.t support push; refspec needed" error
+
+[new 79634a5] ten
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+fatal: remote-helper doesn't support push; refspec needed
+HEAD is now at 9a8e2ab five
+ok 19 - pushing without refspecs
+
+expecting success of 5801.20 'pulling without marks': 
+	(cd local2 &&
+	GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
+	compare_refs local2 HEAD server HEAD
+
+Already up to date.
+ok 20 - pulling without marks
+
+checking known breakage of 5801.21 'pushing without marks': 
+	test_when_finished "(cd local2 && git reset --hard origin)" &&
+	(cd local2 &&
+	echo content >>file &&
+	git commit -a -m twelve &&
+	GIT_REMOTE_TESTGIT_NO_MARKS=1 git push) &&
+	compare_refs local2 HEAD server HEAD
+
+[new 8990571] twelve
+ Author: A U Thor <author@example.com>
+ 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-14 13:33:51.946677808 +0000
++++ actual	2026-03-14 13:33:51.978677808 +0000
+@@ -1 +1 @@
+-899057158430267bac82448fb89f21aa89c35cb0
++9a8e2abfa604731e07ce2fb257109eb918e2280b
+HEAD is now at 9a8e2ab five
+not ok 21 - pushing without marks # TODO known breakage
+
+expecting success of 5801.22 'push all with existing object': 
+	(cd local &&
+	git branch dup2 main &&
+	git push origin --all
+	) &&
+	compare_refs local dup2 server dup2
+
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      dup2 -> dup2
+   7c93a0d..7c93a0d  new-name -> new-name
+ok 22 - push all with existing object
+
+expecting success of 5801.23 'push ref with existing object': 
+	(cd local &&
+	git branch dup main &&
+	git push origin dup
+	) &&
+	compare_refs local dup server dup
+
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      dup -> dup
+ok 23 - push ref with existing 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 24 # skip push signed tag (missing GPG)
+
+ok 25 # skip push signed tag with signed-tags capability (missing GPG)
+
+expecting success of 5801.26 'push update refs': 
+	(cd local &&
+	git checkout -b update main &&
+	echo update >>file &&
+	git commit -a -m update &&
+	git push origin update &&
+	git rev-parse --verify remotes/origin/update >expect &&
+	git rev-parse --verify testgit/origin/heads/update >actual &&
+	test_cmp expect actual
+	)
+
+Switched to a new branch 'update'
+[update 900950d] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      update -> update
+ok 26 - push update refs
+
+expecting success of 5801.27 'push update refs disabled by no-private-update': 
+	(cd local &&
+	echo more-update >>file &&
+	git commit -a -m more-update &&
+	git rev-parse --verify testgit/origin/heads/update >expect &&
+	GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE=t git push origin update &&
+	git rev-parse --verify testgit/origin/heads/update >actual &&
+	test_cmp expect actual
+	)
+
+[update 297a32d] more-update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+   900950d..297a32d  update -> update
+ok 27 - push update refs disabled by no-private-update
+
+expecting success of 5801.28 'push update refs failure': 
+	(cd local &&
+	git checkout update &&
+	echo "update fail" >>file &&
+	git commit -a -m "update fail" &&
+	git rev-parse --verify testgit/origin/heads/update >expect &&
+	test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
+		git push origin update &&
+	git rev-parse --verify testgit/origin/heads/update >actual &&
+	test_cmp expect actual
+	)
+
+Already on 'update'
+[update 3e5dd5a] update fail
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+error: failed to push some refs to 'testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
+ok 28 - push update refs failure
+
+expecting success of 5801.29 'proper failure checks for fetching': 
+	(cd local &&
+	test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
+	test_grep -q "error while running fast-import" error
+	)
+
+ok 29 - proper failure checks for fetching
+
+expecting success of 5801.30 'proper failure checks for pushing': 
+	test_when_finished "rm -rf local/git.marks local/testgit.marks" &&
+	(cd local &&
+	git checkout -b crash main &&
+	echo crash >>file &&
+	git commit -a -m crash &&
+	test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
+	clean_mark ".git/testgit/origin/git.marks" &&
+	clean_mark ".git/testgit/origin/testgit.marks" &&
+	test_cmp git.marks testgit.marks
+	)
+
+Switched to a new branch 'crash'
+[crash b62b6af] crash
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+error: failed to push some refs to 'testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
+ok 30 - proper failure checks for pushing
+
+expecting success of 5801.31 'push messages': 
+	(cd local &&
+	git checkout -b new_branch main &&
+	echo new >>file &&
+	git commit -a -m new &&
+	git push origin new_branch &&
+	git fetch origin &&
+	echo new >>file &&
+	git commit -a -m new &&
+	git push origin new_branch 2> msg &&
+	! grep "\[new branch\]" msg
+	)
+
+Switched to a new branch 'new_branch'
+[new_branch 0ff7576] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      new_branch -> new_branch
+[new_branch 190f068] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 31 - push messages
+
+expecting success of 5801.32 'fetch HEAD': 
+	(cd server &&
+	git checkout main &&
+	echo more >>file &&
+	git commit -a -m more
+	) &&
+	(cd local &&
+	git fetch origin HEAD
+	) &&
+	compare_refs server HEAD local FETCH_HEAD
+
+Switched to branch 'main'
+[main b18cb6c] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+ * branch            HEAD       -> FETCH_HEAD
+ok 32 - fetch HEAD
+
+expecting success of 5801.33 'fetch url': 
+	(cd server &&
+	git checkout main &&
+	echo more >>file &&
+	git commit -a -m more
+	) &&
+	(cd local &&
+	git fetch "testgit::${PWD}/../server"
+	) &&
+	compare_refs server HEAD local FETCH_HEAD
+
+Already on 'main'
+[main 4a80143] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/local/../server
+ * branch            HEAD       -> FETCH_HEAD
+ok 33 - fetch url
+
+expecting success of 5801.34 'fetch tag': 
+	(cd server &&
+	 git tag v1.0
+	) &&
+	(cd local &&
+	 git fetch
+	) &&
+	compare_refs local v1.0 server v1.0
+
+From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
+   0d4cb61..4a80143  main          -> origin/main
+ * [new tag]         v1.0          -> v1.0
+ok 34 - fetch tag
+
+expecting success of 5801.35 'totally broken helper reports failure message': 
+	write_script git-remote-broken <<-\EOF &&
+	read cap_cmd
+	exit 1
+	EOF
+	test_must_fail \
+		env PATH="$PWD:$PATH" \
+		git clone broken://example.com/foo.git 2>stderr &&
+	grep aborted stderr
+
+fatal: remote helper 'broken' aborted session
+ok 35 - totally broken helper reports failure message
+
+# still have 1 known breakage(s)
+# passed all remaining 34 test(s)
+1..35
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6005-rev-list-count.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6005-rev-list-count/.git/
+expecting success of 6005.1 'setup': 
+    for n in 1 2 3 4 5 ; do
+	echo $n > a &&
+	git add a &&
+	git commit -m "$n" || return 1
+    done
+
+[master (root-commit) 47c1352] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 2be59de] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 78f6408] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master f4d0cb6] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master a6a826a] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6005.2 'no options': 
+	test_stdout_line_count = 5 git rev-list HEAD
+
+ok 2 - no options
+
+expecting success of 6005.3 '--max-count': 
+	test_must_fail git rev-list --max-count=1q HEAD 2>error &&
+	grep "not an integer" error &&
+
+	test_stdout_line_count = 0 git rev-list HEAD --max-count=0 &&
+	test_stdout_line_count = 3 git rev-list HEAD --max-count=3 &&
+	test_stdout_line_count = 5 git rev-list HEAD --max-count=5 &&
+	test_stdout_line_count = 5 git rev-list HEAD --max-count=10 &&
+	test_stdout_line_count = 5 git rev-list HEAD --max-count=-1
+
+fatal: '1q': not an integer
+ok 3 - --max-count
+
+expecting success of 6005.4 '--max-count all forms': 
+	test_must_fail git rev-list -1q HEAD 2>error &&
+	grep "not an integer" error &&
+	test_must_fail git rev-list --1 HEAD &&
+	test_must_fail git rev-list -n 1q HEAD 2>error &&
+	grep "not an integer" error &&
+
+	test_stdout_line_count = 1 git rev-list HEAD --max-count=1 &&
+	test_stdout_line_count = 1 git rev-list HEAD -1 &&
+	test_stdout_line_count = 1 git rev-list HEAD -n1 &&
+	test_stdout_line_count = 1 git rev-list HEAD -n 1 &&
+	test_stdout_line_count = 5 git rev-list HEAD -n -1
+
+fatal: '1q': not an integer
+usage: git rev-list [<options>] <commit>... [--] [<path>...]
+
+  limiting output:
+    --max-count=<n>
+    --max-age=<epoch>
+    --min-age=<epoch>
+    --sparse
+    --no-merges
+    --min-parents=<n>
+    --no-min-parents
+    --max-parents=<n>
+    --no-max-parents
+    --remove-empty
+    --all
+    --branches
+    --tags
+    --remotes
+    --stdin
+    --exclude-hidden=[fetch|receive|uploadpack]
+    --quiet
+  ordering output:
+    --topo-order
+    --date-order
+    --reverse
+  formatting output:
+    --parents
+    --children
+    --objects | --objects-edge
+    --disk-usage[=human]
+    --unpacked
+    --header | --pretty
+    --[no-]object-names
+    --abbrev=<n> | --no-abbrev
+    --abbrev-commit
+    --left-right
+    --count
+  special purpose:
+    --bisect
+    --bisect-vars
+    --bisect-all
+fatal: '1q': not an integer
+ok 4 - --max-count all forms
+
+expecting success of 6005.5 '--skip': 
+	test_must_fail git rev-list --skip 1q HEAD 2>error &&
+	grep "not an integer" error &&
+
+	test_stdout_line_count = 5 git rev-list HEAD --skip=0 &&
+	test_stdout_line_count = 2 git rev-list HEAD --skip=3 &&
+	test_stdout_line_count = 0 git rev-list HEAD --skip=5 &&
+	test_stdout_line_count = 0 git rev-list HEAD --skip=10
+
+fatal: '1q': not an integer
+ok 5 - --skip
+
+expecting success of 6005.6 '--skip --max-count': 
+	test_stdout_line_count = 0 git rev-list HEAD --skip=0 --max-count=0 &&
+	test_stdout_line_count = 5 git rev-list HEAD --skip=0 --max-count=10 &&
+	test_stdout_line_count = 0 git rev-list HEAD --skip=3 --max-count=0 &&
+	test_stdout_line_count = 1 git rev-list HEAD --skip=3 --max-count=1 &&
+	test_stdout_line_count = 2 git rev-list HEAD --skip=3 --max-count=2 &&
+	test_stdout_line_count = 2 git rev-list HEAD --skip=3 --max-count=10 &&
+	test_stdout_line_count = 0 git rev-list HEAD --skip=5 --max-count=10 &&
+	test_stdout_line_count = 0 git rev-list HEAD --skip=10 --max-count=10
+
+ok 6 - --skip --max-count
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5510-fetch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.git/
+expecting success of 5510.1 'setup': 
+	echo >file original &&
+	git add file &&
+	git commit -a -m original &&
+	git branch -M main
+
+[master (root-commit) 7fb3fb8] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success of 5510.2 'clone and setup child repos': 
+	git clone . one &&
+	(
+		cd one &&
+		echo >file updated by one &&
+		git commit -a -m "updated by one"
+	) &&
+	git clone . two &&
+	(
+		cd two &&
+		git config branch.main.remote one &&
+		git config remote.one.url ../one/.git/ &&
+		git config remote.one.fetch refs/heads/main:refs/heads/one
+	) &&
+	git clone . three &&
+	(
+		cd three &&
+		git config branch.main.remote two &&
+		git config branch.main.merge refs/heads/one &&
+		mkdir -p .git/remotes &&
+		cat >.git/remotes/two <<-\EOF
+		URL: ../two/.git/
+		Pull: refs/heads/main:refs/heads/two
+		Pull: refs/heads/one:refs/heads/one
+		EOF
+	) &&
+	git clone . bundle &&
+	git clone . seven
+
+Cloning into 'one'...
+done.
+[main ffc8fdd] updated by one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'two'...
+done.
+Cloning into 'three'...
+done.
+Cloning into 'bundle'...
+done.
+Cloning into 'seven'...
+done.
+ok 2 - clone and setup child repos
+
+expecting success of 5510.3 'fetch test': 
+	cd "$D" &&
+	echo >file updated by origin &&
+	git commit -a -m "updated by origin" &&
+	cd two &&
+	git fetch &&
+	git rev-parse --verify refs/heads/one &&
+	mine=$(git rev-parse refs/heads/one) &&
+	his=$(cd ../one && git rev-parse refs/heads/main) &&
+	test "z$mine" = "z$his"
+
+[main 76a8623] updated by origin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../one/
+ * [new branch]      main       -> one
+ffc8fdde31e0177ad02216ab27bb483fc88169f2
+ok 3 - fetch test
+
+expecting success of 5510.4 'fetch test for-merge': 
+	cd "$D" &&
+	cd three &&
+	git fetch &&
+	git rev-parse --verify refs/heads/two &&
+	git rev-parse --verify refs/heads/one &&
+	main_in_two=$(cd ../two && git rev-parse main) &&
+	one_in_two=$(cd ../two && git rev-parse one) &&
+	{
+		echo "$one_in_two	" &&
+		echo "$main_in_two	not-for-merge"
+	} >expected &&
+	cut -f -2 .git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+From ../two/
+ * [new branch]      one        -> one
+ * [new branch]      main       -> two
+7fb3fb8404d71a4825bdde839cc3884a77651888
+ffc8fdde31e0177ad02216ab27bb483fc88169f2
+ok 4 - fetch test for-merge
+
+expecting success of 5510.5 'fetch test remote HEAD': 
+	cd "$D" &&
+	cd two &&
+	git fetch &&
+	git rev-parse --verify refs/remotes/origin/HEAD &&
+	git rev-parse --verify refs/remotes/origin/main &&
+	head=$(git rev-parse refs/remotes/origin/HEAD) &&
+	branch=$(git rev-parse refs/remotes/origin/main) &&
+	test "z$head" = "z$branch"
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+ok 5 - fetch test remote HEAD
+
+expecting success of 5510.6 'fetch test remote HEAD change': 
+	cd "$D" &&
+	cd two &&
+	git switch -c other &&
+	git push -u origin other &&
+	git rev-parse --verify refs/remotes/origin/HEAD &&
+	git rev-parse --verify refs/remotes/origin/main &&
+	git rev-parse --verify refs/remotes/origin/other &&
+	git remote set-head origin other &&
+	git fetch &&
+	head=$(git rev-parse refs/remotes/origin/HEAD) &&
+	branch=$(git rev-parse refs/remotes/origin/other) &&
+	test "z$head" = "z$branch"
+Switched to a new branch 'other'
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      other -> other
+branch 'other' set up to track 'origin/other'.
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+   7fb3fb8..76a8623  main       -> origin/main
+ok 6 - fetch test remote HEAD change
+
+expecting success of 5510.7 'fetch test followRemoteHEAD never': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+		git config set remote.origin.followRemoteHEAD "never" &&
+		git fetch &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/HEAD
+	)
+
+fatal: Needed a single revision
+ok 7 - fetch test followRemoteHEAD never
+
+expecting success of 5510.8 'fetch test followRemoteHEAD warn no change': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		git fetch >output &&
+		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
+			"but we have ${SQ}other${SQ} locally." >expect &&
+		test_cmp expect output &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
+
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+hint: Run 'git remote set-head origin main' to follow the change, or set
+hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
+hint: if you do not want to see this message. Specifically running
+hint: 'git config set remote.origin.followRemoteHEAD main' will disable the warning
+hint: until the remote changes HEAD to something else.
+hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
+ok 8 - fetch test followRemoteHEAD warn no change
+
+expecting success of 5510.9 'fetch test followRemoteHEAD warn create': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		output=$(git fetch) &&
+		test "z" = "z$output" &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/main) &&
+		test "z$head" = "z$branch"
+	)
+
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 9 - fetch test followRemoteHEAD warn create
+
+expecting success of 5510.10 'fetch test followRemoteHEAD warn detached': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+		git update-ref refs/remotes/origin/HEAD HEAD &&
+		HEAD=$(git log --pretty="%H") &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		git fetch >output &&
+		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
+			"but we have a detached HEAD pointing to" \
+			"${SQ}${HEAD}${SQ} locally." >expect &&
+		test_cmp expect output
+	)
+
+hint: Run 'git remote set-head origin main' to follow the change, or set
+hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
+hint: if you do not want to see this message. Specifically running
+hint: 'git config set remote.origin.followRemoteHEAD main' will disable the warning
+hint: until the remote changes HEAD to something else.
+hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
+ok 10 - fetch test followRemoteHEAD warn detached
+
+expecting success of 5510.11 'fetch test followRemoteHEAD warn quiet': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		output=$(git fetch --quiet) &&
+		test "z" = "z$output" &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
+
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 11 - fetch test followRemoteHEAD warn quiet
+
+expecting success of 5510.12 'fetch test followRemoteHEAD warn-if-not-branch branch is same': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn-if-not-main" &&
+		actual=$(git fetch) &&
+		test "z" = "z$actual" &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
+
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 12 - fetch test followRemoteHEAD warn-if-not-branch branch is same
+
+expecting success of 5510.13 'fetch test followRemoteHEAD warn-if-not-branch branch is different': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn-if-not-some/different-branch" &&
+		git fetch >actual &&
+		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
+			"but we have ${SQ}other${SQ} locally." >expect &&
+		test_cmp expect actual &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
+
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+hint: Run 'git remote set-head origin main' to follow the change, or set
+hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
+hint: if you do not want to see this message. Specifically running
+hint: 'git config set remote.origin.followRemoteHEAD main' will disable the warning
+hint: until the remote changes HEAD to something else.
+hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
+ok 13 - fetch test followRemoteHEAD warn-if-not-branch branch is different
+
+expecting success of 5510.14 'fetch test followRemoteHEAD always': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "always" &&
+		git fetch &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/main) &&
+		test "z$head" = "z$branch"
+	)
+
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 14 - fetch test followRemoteHEAD always
+
+expecting success of 5510.15 'fetch --prune on its own works as expected': 
+	cd "$D" &&
+	git clone . prune &&
+	cd prune &&
+	git update-ref refs/remotes/origin/extrabranch main &&
+
+	git fetch --prune origin &&
+	test_must_fail git rev-parse origin/extrabranch
+
+Cloning into 'prune'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/extrabranch
+fatal: ambiguous argument 'origin/extrabranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+origin/extrabranch
+ok 15 - fetch --prune on its own works as expected
+
+expecting success of 5510.16 'fetch --prune with a branch name keeps branches': 
+	cd "$D" &&
+	git clone . prune-branch &&
+	cd prune-branch &&
+	git update-ref refs/remotes/origin/extrabranch main &&
+
+	git fetch --prune origin main &&
+	git rev-parse origin/extrabranch
+
+Cloning into 'prune-branch'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 16 - fetch --prune with a branch name keeps branches
+
+expecting success of 5510.17 'fetch --prune with a namespace keeps other namespaces': 
+	cd "$D" &&
+	git clone . prune-namespace &&
+	cd prune-namespace &&
+
+	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
+	git rev-parse origin/main
+
+Cloning into 'prune-namespace'...
+done.
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 17 - fetch --prune with a namespace keeps other namespaces
+
+expecting success of 5510.18 'fetch --prune handles overlapping refspecs': 
+	cd "$D" &&
+	git update-ref refs/pull/42/head main &&
+	git clone . prune-overlapping &&
+	cd prune-overlapping &&
+	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
+
+	git fetch --prune origin &&
+	git rev-parse origin/main &&
+	git rev-parse origin/pr/42 &&
+
+	git config --unset-all remote.origin.fetch &&
+	git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
+	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
+
+	git fetch --prune origin &&
+	git rev-parse origin/main &&
+	git rev-parse origin/pr/42
+
+Cloning into 'prune-overlapping'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new ref]         refs/pull/42/head -> origin/pr/42
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 18 - fetch --prune handles overlapping refspecs
+
+expecting success of 5510.19 'fetch --prune --tags prunes branches but not tags': 
+	cd "$D" &&
+	git clone . prune-tags &&
+	cd prune-tags &&
+	git tag sometag main &&
+	# Create what looks like a remote-tracking branch from an earlier
+	# fetch that has since been deleted from the remote:
+	git update-ref refs/remotes/origin/fake-remote main &&
+
+	git fetch --prune --tags origin &&
+	git rev-parse origin/main &&
+	test_must_fail git rev-parse origin/fake-remote &&
+	git rev-parse sometag
+
+Cloning into 'prune-tags'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/fake-remote
+76a8623cbad8bd56c933c6f20106742c826dad9e
+fatal: ambiguous argument 'origin/fake-remote': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+origin/fake-remote
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 19 - fetch --prune --tags prunes branches but not tags
+
+expecting success of 5510.20 'fetch --prune --tags with branch does not prune other things': 
+	cd "$D" &&
+	git clone . prune-tags-branch &&
+	cd prune-tags-branch &&
+	git tag sometag main &&
+	git update-ref refs/remotes/origin/extrabranch main &&
+
+	git fetch --prune --tags origin main &&
+	git rev-parse origin/extrabranch &&
+	git rev-parse sometag
+
+Cloning into 'prune-tags-branch'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 20 - fetch --prune --tags with branch does not prune other things
+
+expecting success of 5510.21 'fetch --prune --tags with refspec prunes based on refspec': 
+	cd "$D" &&
+	git clone . prune-tags-refspec &&
+	cd prune-tags-refspec &&
+	git tag sometag main &&
+	git update-ref refs/remotes/origin/foo/otherbranch main &&
+	git update-ref refs/remotes/origin/extrabranch main &&
+
+	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
+	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
+	git rev-parse origin/extrabranch &&
+	git rev-parse sometag
+
+Cloning into 'prune-tags-refspec'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/foo/otherbranch
+fatal: ambiguous argument 'refs/remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/foo/otherbranch
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 21 - fetch --prune --tags with refspec prunes based on refspec
+
+expecting success of 5510.22 'fetch --tags gets tags even without a configured remote': 
+	REMOTE="$(pwd)/test_tag_1" &&
+	git init test_tag_1 &&
+	(
+		cd test_tag_1 &&
+		test_commit foo
+	) &&
+	git init test_tag_2 &&
+	(
+		cd test_tag_2 &&
+		git fetch --tags "file://$REMOTE" &&
+		echo "foo" >expect &&
+		git tag >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_2/.git/
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1
+ * branch            HEAD       -> FETCH_HEAD
+ * [new tag]         foo        -> foo
+ok 22 - fetch --tags gets tags even without a configured remote
+
+expecting success of 5510.23 'fetch --prune fails to delete branches': 
+	cd "$D" &&
+	git clone . prune-fail &&
+	cd prune-fail &&
+	git update-ref refs/remotes/origin/extrabranch main &&
+	git pack-refs --all &&
+	: this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds  &&
+	>.git/packed-refs.new &&
+
+	test_must_fail git fetch --prune origin
+
+Cloning into 'prune-fail'...
+done.
+error: could not delete reference refs/remotes/origin/extrabranch: unable to create file /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-fail/.git/packed-refs.new: File exists
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/extrabranch
+ok 23 - fetch --prune fails to delete branches
+
+expecting success of 5510.24 'fetch --atomic works with a single branch': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-branch &&
+	oid=$(git rev-parse atomic-branch) &&
+	echo "$oid" >expected &&
+
+	git -C atomic fetch --atomic origin &&
+	git -C atomic rev-parse origin/atomic-branch >actual &&
+	test_cmp expected actual &&
+	test $oid = "$(git -C atomic rev-parse --verify FETCH_HEAD)"
+
+Cloning into 'atomic'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-branch -> origin/atomic-branch
+ok 24 - fetch --atomic works with a single branch
+
+expecting success of 5510.25 'fetch --atomic works with multiple branches': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-branch-1 &&
+	git branch atomic-branch-2 &&
+	git branch atomic-branch-3 &&
+	git rev-parse refs/heads/atomic-branch-1 refs/heads/atomic-branch-2 refs/heads/atomic-branch-3 >actual &&
+
+	git -C atomic fetch --atomic origin &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-branch-1 refs/remotes/origin/atomic-branch-2 refs/remotes/origin/atomic-branch-3 >expected &&
+	test_cmp expected actual
+
+Cloning into 'atomic'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-branch-1 -> origin/atomic-branch-1
+ * [new branch]      atomic-branch-2 -> origin/atomic-branch-2
+ * [new branch]      atomic-branch-3 -> origin/atomic-branch-3
+ok 25 - fetch --atomic works with multiple branches
+
+expecting success of 5510.26 'fetch --atomic works with mixed branches and tags': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-mixed-branch &&
+	git tag atomic-mixed-tag &&
+	git rev-parse refs/heads/atomic-mixed-branch refs/tags/atomic-mixed-tag >actual &&
+
+	git -C atomic fetch --tags --atomic origin &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-mixed-branch refs/tags/atomic-mixed-tag >expected &&
+	test_cmp expected actual
+
+Cloning into 'atomic'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-mixed-branch -> origin/atomic-mixed-branch
+ * [new tag]         atomic-mixed-tag    -> atomic-mixed-tag
+ok 26 - fetch --atomic works with mixed branches and tags
+
+expecting success of 5510.27 'fetch --atomic prunes references': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git branch atomic-prune-delete &&
+	git clone . atomic &&
+	git branch --delete atomic-prune-delete &&
+	git branch atomic-prune-create &&
+	git rev-parse refs/heads/atomic-prune-create >actual &&
+
+	git -C atomic fetch --prune --atomic origin &&
+	test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-prune-delete &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-prune-create >expected &&
+	test_cmp expected actual
+
+Cloning into 'atomic'...
+done.
+Deleted branch atomic-prune-delete (was 76a8623).
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)              -> origin/atomic-prune-delete
+ * [new branch]      atomic-prune-create -> origin/atomic-prune-create
+fatal: ambiguous argument 'refs/remotes/origin/atomic-prune-delete': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/atomic-prune-delete
+ok 27 - fetch --atomic prunes references
+
+expecting success of 5510.28 'fetch --atomic aborts with non-fast-forward update': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git branch atomic-non-ff &&
+	git clone . atomic &&
+	git rev-parse HEAD >actual &&
+
+	git branch atomic-new-branch &&
+	parent_commit=$(git rev-parse atomic-non-ff~) &&
+	git update-ref refs/heads/atomic-non-ff $parent_commit &&
+
+	test_must_fail git -C atomic fetch --atomic origin refs/heads/*:refs/remotes/origin/* &&
+	test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-new-branch &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-non-ff >expected &&
+	test_cmp expected actual &&
+	test_must_be_empty atomic/.git/FETCH_HEAD
+
+Cloning into 'atomic'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-new-branch -> origin/atomic-new-branch
+ ! [rejected]        atomic-non-ff     -> origin/atomic-non-ff  (non-fast-forward)
+fatal: ambiguous argument 'refs/remotes/origin/atomic-new-branch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/atomic-new-branch
+ok 28 - fetch --atomic aborts with non-fast-forward update
+
+expecting success of 5510.29 'fetch --atomic executes a single reference transaction only': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-hooks-1 &&
+	git branch atomic-hooks-2 &&
+	head_oid=$(git rev-parse HEAD) &&
+
+	cat >expected <<-EOF &&
+		prepared
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
+		committed
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
+	EOF
+
+	rm -f atomic/actual &&
+	test_hook -C atomic reference-transaction <<-\EOF &&
+		( echo "$*" && cat ) >>actual
+	EOF
+
+	git -C atomic fetch --atomic origin &&
+	test_cmp expected atomic/actual
+
+Cloning into 'atomic'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-hooks-1 -> origin/atomic-hooks-1
+ * [new branch]      atomic-hooks-2 -> origin/atomic-hooks-2
+ok 29 - fetch --atomic executes a single reference transaction only
+
+expecting success of 5510.30 'fetch --atomic aborts all reference updates if hook aborts': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-hooks-abort-1 &&
+	git branch atomic-hooks-abort-2 &&
+	git branch atomic-hooks-abort-3 &&
+	git tag atomic-hooks-abort &&
+	head_oid=$(git rev-parse HEAD) &&
+
+	cat >expected <<-EOF &&
+		prepared
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
+		$ZERO_OID $head_oid refs/tags/atomic-hooks-abort
+		aborted
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
+		$ZERO_OID $head_oid refs/tags/atomic-hooks-abort
+	EOF
+
+	rm -f atomic/actual &&
+	test_hook -C atomic/.git reference-transaction <<-\EOF &&
+		( echo "$*" && cat ) >>actual
+		exit 1
+	EOF
+
+	git -C atomic for-each-ref >expected-refs &&
+	test_must_fail git -C atomic fetch --tags --atomic origin &&
+	git -C atomic for-each-ref >actual-refs &&
+	test_cmp expected-refs actual-refs &&
+	test_must_be_empty atomic/.git/FETCH_HEAD
+
+Cloning into 'atomic'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-hooks-abort-1 -> origin/atomic-hooks-abort-1
+ * [new branch]      atomic-hooks-abort-2 -> origin/atomic-hooks-abort-2
+ * [new branch]      atomic-hooks-abort-3 -> origin/atomic-hooks-abort-3
+ * [new tag]         atomic-hooks-abort   -> atomic-hooks-abort
+fatal: ref updates aborted by hook
+ok 30 - fetch --atomic aborts all reference updates if hook aborts
+
+expecting success of 5510.31 'fetch --atomic --append appends to FETCH_HEAD': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	oid=$(git rev-parse HEAD) &&
+
+	git branch atomic-fetch-head-1 &&
+	git -C atomic fetch --atomic origin atomic-fetch-head-1 &&
+	test_line_count = 1 atomic/.git/FETCH_HEAD &&
+
+	git branch atomic-fetch-head-2 &&
+	git -C atomic fetch --atomic --append origin atomic-fetch-head-2 &&
+	test_line_count = 2 atomic/.git/FETCH_HEAD &&
+	cp atomic/.git/FETCH_HEAD expected &&
+
+	test_hook -C atomic reference-transaction <<-\EOF &&
+		exit 1
+	EOF
+
+	git branch atomic-fetch-head-3 &&
+	test_must_fail git -C atomic fetch --atomic --append origin atomic-fetch-head-3 &&
+	test_cmp expected atomic/.git/FETCH_HEAD
+
+Cloning into 'atomic'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            atomic-fetch-head-1 -> FETCH_HEAD
+ * [new branch]      atomic-fetch-head-1 -> origin/atomic-fetch-head-1
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            atomic-fetch-head-2 -> FETCH_HEAD
+ * [new branch]      atomic-fetch-head-2 -> origin/atomic-fetch-head-2
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            atomic-fetch-head-3 -> FETCH_HEAD
+ * [new branch]      atomic-fetch-head-3 -> origin/atomic-fetch-head-3
+fatal: ref updates aborted by hook
+ok 31 - fetch --atomic --append appends to FETCH_HEAD
+
+expecting success of 5510.32 '--refmap="" ignores configured refspec': 
+	cd "$TRASH_DIRECTORY" &&
+	git clone "$D" remote-refs &&
+	git -C remote-refs rev-parse remotes/origin/main >old &&
+	git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
+	git -C remote-refs rev-parse remotes/origin/main >new &&
+	git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
+	git -C remote-refs rev-parse remotes/origin/main >actual &&
+	test_cmp new actual &&
+	git -C remote-refs fetch origin &&
+	git -C remote-refs rev-parse remotes/origin/main >actual &&
+	test_cmp old actual
+
+Cloning into 'remote-refs'...
+done.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
+ * [new branch]      atomic-branch     -> refs/hidden/origin/atomic-branch
+ * [new branch]      atomic-branch-1   -> refs/hidden/origin/atomic-branch-1
+ * [new branch]      atomic-branch-2   -> refs/hidden/origin/atomic-branch-2
+ * [new branch]      atomic-branch-3   -> refs/hidden/origin/atomic-branch-3
+ * [new branch]      atomic-fetch-head-1 -> refs/hidden/origin/atomic-fetch-head-1
+ * [new branch]      atomic-fetch-head-2 -> refs/hidden/origin/atomic-fetch-head-2
+ * [new branch]      atomic-fetch-head-3 -> refs/hidden/origin/atomic-fetch-head-3
+ * [new branch]      atomic-hooks-1    -> refs/hidden/origin/atomic-hooks-1
+ * [new branch]      atomic-hooks-2    -> refs/hidden/origin/atomic-hooks-2
+ * [new branch]      atomic-hooks-abort-1 -> refs/hidden/origin/atomic-hooks-abort-1
+ * [new branch]      atomic-hooks-abort-2 -> refs/hidden/origin/atomic-hooks-abort-2
+ * [new branch]      atomic-hooks-abort-3 -> refs/hidden/origin/atomic-hooks-abort-3
+ * [new branch]      atomic-mixed-branch -> refs/hidden/origin/atomic-mixed-branch
+ * [new branch]      atomic-new-branch -> refs/hidden/origin/atomic-new-branch
+ * [new branch]      atomic-non-ff     -> refs/hidden/origin/atomic-non-ff
+ * [new branch]      atomic-prune-create -> refs/hidden/origin/atomic-prune-create
+ * [new branch]      main              -> refs/hidden/origin/main
+ * [new branch]      other             -> refs/hidden/origin/other
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
+   7fb3fb8..76a8623  main       -> origin/main
+ok 32 - --refmap="" ignores configured refspec
+
+expecting success of 5510.33 '--refmap="" and --prune': 
+	git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
+	git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
+	git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
+	git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
+	test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
+	git -C remote-refs fetch --prune origin &&
+	test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
+ - [deleted]         (none)               -> refs/hidden/foo/otherbranch
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-branch
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-branch-1
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-branch-2
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-branch-3
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-fetch-head-1
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-fetch-head-2
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-fetch-head-3
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-1
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-2
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-abort-1
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-abort-2
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-abort-3
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-mixed-branch
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-new-branch
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-non-ff
+ - [deleted]         (none)               -> refs/hidden/origin/atomic-prune-create
+ - [deleted]         (none)               -> refs/hidden/origin/main
+ - [deleted]         (none)               -> refs/hidden/origin/other
+ * [new branch]      atomic-branch        -> refs/hidden/atomic-branch
+ * [new branch]      atomic-branch-1      -> refs/hidden/atomic-branch-1
+ * [new branch]      atomic-branch-2      -> refs/hidden/atomic-branch-2
+ * [new branch]      atomic-branch-3      -> refs/hidden/atomic-branch-3
+ * [new branch]      atomic-fetch-head-1  -> refs/hidden/atomic-fetch-head-1
+ * [new branch]      atomic-fetch-head-2  -> refs/hidden/atomic-fetch-head-2
+ * [new branch]      atomic-fetch-head-3  -> refs/hidden/atomic-fetch-head-3
+ * [new branch]      atomic-hooks-1       -> refs/hidden/atomic-hooks-1
+ * [new branch]      atomic-hooks-2       -> refs/hidden/atomic-hooks-2
+ * [new branch]      atomic-hooks-abort-1 -> refs/hidden/atomic-hooks-abort-1
+ * [new branch]      atomic-hooks-abort-2 -> refs/hidden/atomic-hooks-abort-2
+ * [new branch]      atomic-hooks-abort-3 -> refs/hidden/atomic-hooks-abort-3
+ * [new branch]      atomic-mixed-branch  -> refs/hidden/atomic-mixed-branch
+ * [new branch]      atomic-new-branch    -> refs/hidden/atomic-new-branch
+ * [new branch]      atomic-non-ff        -> refs/hidden/atomic-non-ff
+ * [new branch]      atomic-prune-create  -> refs/hidden/atomic-prune-create
+ * [new branch]      main                 -> refs/hidden/main
+ * [new branch]      other                -> refs/hidden/other
+76a8623cbad8bd56c933c6f20106742c826dad9e
+fatal: ambiguous argument 'refs/hidden/foo/otherbranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/hidden/foo/otherbranch
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
+ - [deleted]         (none)     -> origin/foo/otherbranch
+fatal: ambiguous argument 'remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+remotes/origin/foo/otherbranch
+ok 33 - --refmap="" and --prune
+
+expecting success of 5510.34 'fetch tags when there is no tags': 
+
+    cd "$D" &&
+
+    mkdir notags &&
+    cd notags &&
+    git init &&
+
+    git fetch -t ..
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/notags/.git/
+From ..
+ * branch            HEAD               -> FETCH_HEAD
+ * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
+ * [new tag]         atomic-mixed-tag   -> atomic-mixed-tag
+ok 34 - fetch tags when there is no tags
+
+expecting success of 5510.35 'fetch following tags': 
+
+	cd "$D" &&
+	git tag -a -m "annotated" anno HEAD &&
+	git tag light HEAD &&
+
+	mkdir four &&
+	cd four &&
+	git init &&
+
+	git fetch .. :track &&
+	git show-ref --verify refs/tags/anno &&
+	git show-ref --verify refs/tags/light
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/four/.git/
+From ..
+ * [new ref]         HEAD               -> track
+ * [new tag]         anno               -> anno
+ * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
+ * [new tag]         atomic-mixed-tag   -> atomic-mixed-tag
+ * [new tag]         light              -> light
+39bf91b30d24dba0a5dbe320673d4f8a1f67d1f1 refs/tags/anno
+76a8623cbad8bd56c933c6f20106742c826dad9e refs/tags/light
+ok 35 - fetch following tags
+
+expecting success of 5510.36 'fetch uses remote ref names to describe new refs': 
+	cd "$D" &&
+	git init descriptive &&
+	(
+		cd descriptive &&
+		git config remote.o.url .. &&
+		git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
+		git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
+		git fetch o
+	) &&
+	git tag -a -m "Descriptive tag" descriptive-tag &&
+	git branch descriptive-branch &&
+	git checkout descriptive-branch &&
+	echo "Nuts" >crazy &&
+	git add crazy &&
+	git commit -a -m "descriptive commit" &&
+	git update-ref refs/others/crazy HEAD &&
+	(
+		cd descriptive &&
+		git fetch o 2>actual &&
+		test_grep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
+		test_grep "new tag.* -> descriptive-tag$" actual &&
+		test_grep "new ref.* -> crazy$" actual
+	) &&
+	git checkout main
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/descriptive/.git/
+From ..
+ * [new branch]      atomic-branch       -> refs/crazyheads/atomic-branch
+ * [new branch]      atomic-branch-1     -> refs/crazyheads/atomic-branch-1
+ * [new branch]      atomic-branch-2     -> refs/crazyheads/atomic-branch-2
+ * [new branch]      atomic-branch-3     -> refs/crazyheads/atomic-branch-3
+ * [new branch]      atomic-fetch-head-1 -> refs/crazyheads/atomic-fetch-head-1
+ * [new branch]      atomic-fetch-head-2 -> refs/crazyheads/atomic-fetch-head-2
+ * [new branch]      atomic-fetch-head-3 -> refs/crazyheads/atomic-fetch-head-3
+ * [new branch]      atomic-hooks-1      -> refs/crazyheads/atomic-hooks-1
+ * [new branch]      atomic-hooks-2      -> refs/crazyheads/atomic-hooks-2
+ * [new branch]      atomic-hooks-abort-1 -> refs/crazyheads/atomic-hooks-abort-1
+ * [new branch]      atomic-hooks-abort-2 -> refs/crazyheads/atomic-hooks-abort-2
+ * [new branch]      atomic-hooks-abort-3 -> refs/crazyheads/atomic-hooks-abort-3
+ * [new branch]      atomic-mixed-branch -> refs/crazyheads/atomic-mixed-branch
+ * [new branch]      atomic-new-branch   -> refs/crazyheads/atomic-new-branch
+ * [new branch]      atomic-non-ff       -> refs/crazyheads/atomic-non-ff
+ * [new branch]      atomic-prune-create -> refs/crazyheads/atomic-prune-create
+ * [new branch]      main                -> refs/crazyheads/main
+ * [new branch]      other               -> refs/crazyheads/other
+ * [new tag]         anno                -> anno
+ * [new tag]         atomic-hooks-abort  -> atomic-hooks-abort
+ * [new tag]         atomic-mixed-tag    -> atomic-mixed-tag
+ * [new tag]         light               -> light
+Switched to branch 'descriptive-branch'
+[descriptive-branch e7f94d4] descriptive commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 crazy
+ * [new branch]      descriptive-branch -> refs/crazyheads/descriptive-branch
+ * [new tag]         descriptive-tag    -> descriptive-tag
+ * [new ref]         refs/others/crazy  -> crazy
+Switched to branch 'main'
+ok 36 - fetch uses remote ref names to describe new refs
+
+expecting success of 5510.37 'fetch must not resolve short tag name': 
+
+	cd "$D" &&
+
+	mkdir five &&
+	cd five &&
+	git init &&
+
+	test_must_fail git fetch .. anno:five
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/five/.git/
+error: cannot update ref 'refs/heads/five': trying to write non-commit object 39bf91b30d24dba0a5dbe320673d4f8a1f67d1f1 to branch 'refs/heads/five'
+From ..
+ ! [new tag]         anno       -> five  (unable to update local ref)
+ * [new tag]         anno       -> anno
+ok 37 - fetch must not resolve short tag name
+
+expecting success of 5510.38 'fetch can now resolve short remote name': 
+
+	cd "$D" &&
+	git update-ref refs/remotes/six/HEAD HEAD &&
+
+	mkdir six &&
+	cd six &&
+	git init &&
+
+	git fetch .. six:six
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/six/.git/
+From ..
+ * [new ref]         six/HEAD           -> six
+ * [new tag]         anno               -> anno
+ * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
+ * [new tag]         atomic-mixed-tag   -> atomic-mixed-tag
+ * [new tag]         descriptive-tag    -> descriptive-tag
+ * [new tag]         light              -> light
+ok 38 - fetch can now resolve short remote name
+
+expecting success of 5510.39 'create bundle 1': 
+	cd "$D" &&
+	echo >file updated again by origin &&
+	git commit -a -m "tip" &&
+	git bundle create --version=3 bundle1 main^..main
+
+[main 1b60884] tip
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 39 - create bundle 1
+
+expecting success of 5510.40 'header of bundle looks right': 
+	cat >expect <<-EOF &&
+	# v3 git bundle
+	@object-format=$(test_oid algo)
+	-OID updated by origin
+	OID refs/heads/main
+
+	EOF
+	sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
+	test_cmp expect actual
+
+ok 40 - header of bundle looks right
+
+expecting success of 5510.41 'create bundle 2': 
+	cd "$D" &&
+	git bundle create bundle2 main~2..main
+
+ok 41 - create bundle 2
+
+expecting success of 5510.42 'unbundle 1': 
+	cd "$D/bundle" &&
+	git checkout -b some-branch &&
+	test_must_fail git fetch "$D/bundle1" main:main
+
+Switched to a new branch 'some-branch'
+error: Repository lacks these prerequisite commits:
+error: 76a8623cbad8bd56c933c6f20106742c826dad9e 
+ok 42 - unbundle 1
+
+expecting success of 5510.43 'bundle 1 has only 3 files ': 
+	cd "$D" &&
+	test_bundle_object_count bundle1 3
+
+e3759ee48778fefb71afa2815c2d903848b63eb6
+ok 43 - bundle 1 has only 3 files 
+
+expecting success of 5510.44 'unbundle 2': 
+	cd "$D/bundle" &&
+	git fetch ../bundle2 main:main &&
+	test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
+
+From ../bundle2
+   7fb3fb8..1b60884  main       -> main
+ok 44 - unbundle 2
+
+expecting success of 5510.45 'bundle does not prerequisite objects': 
+	cd "$D" &&
+	touch file2 &&
+	git add file2 &&
+	git commit -m add.file2 file2 &&
+	git bundle create bundle3 -1 HEAD &&
+	test_bundle_object_count bundle3 3
+
+[main b4eae8a] add.file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+92f477f64fe991be465f169fe8ba0908bf49305b
+ok 45 - bundle does not prerequisite objects
+
+expecting success of 5510.46 'bundle should be able to create a full history': 
+
+	cd "$D" &&
+	git tag -a -m "1.0" v1.0 main &&
+	git bundle create bundle4 v1.0
+
+
+ok 46 - bundle should be able to create a full history
+
+expecting success of 5510.47 'fetch with a non-applying branch.<name>.merge': 
+	git config branch.main.remote yeti &&
+	git config branch.main.merge refs/heads/bigfoot &&
+	git config remote.blub.url one &&
+	git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
+	git fetch blub
+
+From one
+ * [new branch]      main       -> one/main
+ok 47 - fetch with a non-applying branch.<name>.merge
+
+expecting success of 5510.48 'fetch from GIT URL with a non-applying branch.<name>.merge [1]': 
+	one_head=$(cd one && git rev-parse HEAD) &&
+	this_head=$(git rev-parse HEAD) &&
+	rm .git/FETCH_HEAD &&
+	git fetch one &&
+	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
+	test $this_head = "$(git rev-parse --verify HEAD)"
+
+From one
+ * branch            HEAD       -> FETCH_HEAD
+ok 48 - fetch from GIT URL with a non-applying branch.<name>.merge [1]
+
+expecting success of 5510.49 'fetch from GIT URL with a non-applying branch.<name>.merge [2]': 
+	one_ref=$(cd one && git symbolic-ref HEAD) &&
+	git config branch.main.remote blub &&
+	git config branch.main.merge "$one_ref" &&
+	rm .git/FETCH_HEAD &&
+	git fetch one &&
+	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
+	test $this_head = "$(git rev-parse --verify HEAD)"
+
+From one
+ * branch            HEAD       -> FETCH_HEAD
+ok 49 - fetch from GIT URL with a non-applying branch.<name>.merge [2]
+
+expecting success of 5510.50 'fetch from GIT URL with a non-applying branch.<name>.merge [3]': 
+	git config branch.main.merge "${one_ref}_not" &&
+	rm .git/FETCH_HEAD &&
+	git fetch one &&
+	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
+	test $this_head = "$(git rev-parse --verify HEAD)"
+
+From one
+ * branch            HEAD       -> FETCH_HEAD
+ok 50 - fetch from GIT URL with a non-applying branch.<name>.merge [3]
+
+expecting success of 5510.51 'quoting of a strangely named repo': 
+	test_must_fail git fetch "a\\!'b" > result 2>&1 &&
+	grep "fatal: 'a\\\\!'b'" result
+
+fatal: 'a\!'b' does not appear to be a git repository
+ok 51 - quoting of a strangely named repo
+
+expecting success of 5510.52 'bundle should record HEAD correctly': 
+
+	cd "$D" &&
+	git bundle create bundle5 HEAD main &&
+	git bundle list-heads bundle5 >actual &&
+	for h in HEAD refs/heads/main
+	do
+		echo "$(git rev-parse --verify $h) $h" || return 1
+	done >expect &&
+	test_cmp expect actual
+
+
+ok 52 - bundle should record HEAD correctly
+
+expecting success of 5510.53 'mark initial state of origin/main': 
+	(
+		cd three &&
+		git tag base-origin-main refs/remotes/origin/main
+	)
+
+ok 53 - mark initial state of origin/main
+
+expecting success of 5510.54 'explicit fetch should update tracking': 
+
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
+		test "$o" != "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+   7fb3fb8..b4eae8a  main       -> origin/main
+fatal: Needed a single revision
+ok 54 - explicit fetch should update tracking
+
+expecting success of 5510.55 'explicit pull should update tracking': 
+
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git pull origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
+		test "$o" != "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+   7fb3fb8..b4eae8a  main       -> origin/main
+Updating 7fb3fb8..b4eae8a
+Fast-forward
+ file  | 2 +-
+ file2 | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 file2
+fatal: Needed a single revision
+ok 55 - explicit pull should update tracking
+
+expecting success of 5510.56 'explicit --refmap is allowed only with command-line refspec': 
+	cd "$D" &&
+	(
+		cd three &&
+		test_must_fail git fetch --refmap="*:refs/remotes/none/*"
+	)
+
+fatal: --refmap option is only meaningful with command-line refspec(s)
+ok 56 - explicit --refmap is allowed only with command-line refspec
+
+expecting success of 5510.57 'explicit --refmap option overrides remote.*.fetch': 
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
+		test "$o" = "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side &&
+		git rev-parse --verify refs/remotes/other/main
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+ * [new branch]      main       -> other/main
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 57 - explicit --refmap option overrides remote.*.fetch
+
+expecting success of 5510.58 'explicitly empty --refmap option disables remote.*.fetch': 
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch --refmap="" origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
+		test "$o" = "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+fatal: Needed a single revision
+ok 58 - explicitly empty --refmap option disables remote.*.fetch
+
+expecting success of 5510.59 'configured fetch updates tracking': 
+
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch origin &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
+		test "$o" != "$n" &&
+		git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-branch        -> origin/atomic-branch
+ * [new branch]      atomic-branch-1      -> origin/atomic-branch-1
+ * [new branch]      atomic-branch-2      -> origin/atomic-branch-2
+ * [new branch]      atomic-branch-3      -> origin/atomic-branch-3
+ * [new branch]      atomic-fetch-head-1  -> origin/atomic-fetch-head-1
+ * [new branch]      atomic-fetch-head-2  -> origin/atomic-fetch-head-2
+ * [new branch]      atomic-fetch-head-3  -> origin/atomic-fetch-head-3
+ * [new branch]      atomic-hooks-1       -> origin/atomic-hooks-1
+ * [new branch]      atomic-hooks-2       -> origin/atomic-hooks-2
+ * [new branch]      atomic-hooks-abort-1 -> origin/atomic-hooks-abort-1
+ * [new branch]      atomic-hooks-abort-2 -> origin/atomic-hooks-abort-2
+ * [new branch]      atomic-hooks-abort-3 -> origin/atomic-hooks-abort-3
+ * [new branch]      atomic-mixed-branch  -> origin/atomic-mixed-branch
+ * [new branch]      atomic-new-branch    -> origin/atomic-new-branch
+ * [new branch]      atomic-non-ff        -> origin/atomic-non-ff
+ * [new branch]      atomic-prune-create  -> origin/atomic-prune-create
+ * [new branch]      descriptive-branch   -> origin/descriptive-branch
+   7fb3fb8..b4eae8a  main                 -> origin/main
+ * [new branch]      other                -> origin/other
+ * [new branch]      side                 -> origin/side
+ * [new tag]         anno                 -> anno
+ * [new tag]         atomic-hooks-abort   -> atomic-hooks-abort
+ * [new tag]         atomic-mixed-tag     -> atomic-mixed-tag
+ * [new tag]         descriptive-tag      -> descriptive-tag
+ * [new tag]         light                -> light
+ * [new tag]         v1.0                 -> v1.0
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 59 - configured fetch updates tracking
+
+expecting success of 5510.60 'non-matching refspecs do not confuse tracking update': 
+	cd "$D" &&
+	git update-ref refs/odd/location HEAD &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		git config --add remote.origin.fetch \
+			refs/odd/location:refs/remotes/origin/odd &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
+		test "$o" != "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/odd
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+   7fb3fb8..b4eae8a  main       -> origin/main
+fatal: Needed a single revision
+ok 60 - non-matching refspecs do not confuse tracking update
+
+expecting success of 5510.61 'pushing nonexistent branch by mistake should not segv': 
+
+	cd "$D" &&
+	test_must_fail git push seven no:no
+
+
+error: src refspec no does not match any
+error: failed to push some refs to 'seven'
+ok 61 - pushing nonexistent branch by mistake should not segv
+
+expecting success of 5510.62 'auto tag following fetches minimum': 
+
+	cd "$D" &&
+	git clone .git follow &&
+	git checkout HEAD^0 &&
+	(
+		for i in 1 2 3 4 5 6 7
+		do
+			echo $i >>file &&
+			git commit -m $i -a &&
+			git tag -a -m $i excess-$i || exit 1
+		done
+	) &&
+	git checkout main &&
+	(
+		cd follow &&
+		git fetch
+	)
+
+Cloning into 'follow'...
+done.
+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 b4eae8a add.file2
+[detached HEAD 43226b4] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 10af796] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 30e6c6b] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD ed46c7b] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 6cdf330] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD f577462] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD babaf0e] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Previous HEAD position was babaf0e 7
+Switched to branch 'main'
+Your branch is based on 'one/main_not', but the upstream is gone.
+  (use "git branch --unset-upstream" to fixup)
+ok 62 - auto tag following fetches minimum
+
+expecting success of 5510.63 'refuse to fetch into the current branch': 
+
+	test_must_fail git fetch . side:main
+
+
+fatal: refusing to fetch into branch 'refs/heads/main' checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch'
+ok 63 - refuse to fetch into the current branch
+
+expecting success of 5510.64 'fetch into the current branch with --update-head-ok': 
+
+	git fetch --update-head-ok . side:main
+
+
+ok 64 - fetch into the current branch with --update-head-ok
+
+expecting success of 5510.65 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written': 
+	rm -f .git/FETCH_HEAD err &&
+	git fetch --dry-run . 2>err &&
+	! test -f .git/FETCH_HEAD &&
+	grep FETCH_HEAD err
+
+ * branch            HEAD       -> FETCH_HEAD
+ok 65 - fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written
+
+expecting success of 5510.66 '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written': 
+	rm -f .git/FETCH_HEAD err &&
+	git fetch --no-write-fetch-head . 2>err &&
+	! test -f .git/FETCH_HEAD &&
+	! grep FETCH_HEAD err
+
+ok 66 - --no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written
+
+expecting success of 5510.67 '--write-fetch-head gets defeated by --dry-run': 
+	rm -f .git/FETCH_HEAD &&
+	git fetch --dry-run --write-fetch-head . &&
+	! test -f .git/FETCH_HEAD
+
+From .
+ * branch            HEAD       -> FETCH_HEAD
+ok 67 - --write-fetch-head gets defeated by --dry-run
+
+expecting success of 5510.68 'should be able to fetch with duplicate refspecs': 
+	mkdir dups &&
+	(
+		cd dups &&
+		git init &&
+		git config branch.main.remote three &&
+		git config remote.three.url ../three/.git &&
+		git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+		git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+		git fetch three
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/dups/.git/
+From ../three/
+ * [new branch]      main             -> origin/main
+ * [new branch]      one              -> origin/one
+ * [new branch]      two              -> origin/two
+ * [new tag]         base-origin-main -> base-origin-main
+ * [new tag]         v1.0             -> v1.0
+ * [new tag]         anno             -> anno
+ * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
+ * [new tag]         atomic-mixed-tag -> atomic-mixed-tag
+ * [new tag]         descriptive-tag  -> descriptive-tag
+ * [new tag]         light            -> light
+ok 68 - should be able to fetch with duplicate refspecs
+
+expecting success of 5510.69 'LHS of refspec follows ref disambiguation rules': 
+	mkdir lhs-ambiguous &&
+	(
+		cd lhs-ambiguous &&
+		git init server &&
+		test_commit -C server unwanted &&
+		test_commit -C server wanted &&
+
+		git init client &&
+
+		# Check a name coming after "refs" alphabetically ...
+		git -C server update-ref refs/heads/s wanted &&
+		git -C server update-ref refs/heads/refs/heads/s unwanted &&
+		git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
+		git -C server rev-parse wanted >expect &&
+		git -C client rev-parse checkthis >actual &&
+		test_cmp expect actual &&
+
+		# ... and one before.
+		git -C server update-ref refs/heads/q wanted &&
+		git -C server update-ref refs/heads/refs/heads/q unwanted &&
+		git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
+		git -C server rev-parse wanted >expect &&
+		git -C client rev-parse checkthis >actual &&
+		test_cmp expect actual &&
+
+		# Tags are preferred over branches like refs/{heads,tags}/*
+		git -C server update-ref refs/tags/t wanted &&
+		git -C server update-ref refs/heads/t unwanted &&
+		git -C client fetch ../server +t:refs/heads/checkthis &&
+		git -C server rev-parse wanted >expect &&
+		git -C client rev-parse checkthis >actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/lhs-ambiguous/server/.git/
+[master (root-commit) 4bd74f6] unwanted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unwanted.t
+[master 2680c84] wanted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wanted.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/lhs-ambiguous/client/.git/
+From ../server
+ * [new branch]      s          -> checkthis
+ * [new tag]         wanted     -> wanted
+ * [new tag]         unwanted   -> unwanted
+From ../server
+ * [new tag]         t          -> t
+ok 69 - LHS of refspec follows ref disambiguation rules
+
+expecting success of 5510.70 'fetch.writeCommitGraph': 
+	git clone three write &&
+	(
+		cd three &&
+		test_commit new
+	) &&
+	(
+		cd write &&
+		git -c fetch.writeCommitGraph fetch origin &&
+		test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
+	)
+
+Cloning into 'write'...
+done.
+[main 1a8b7a5] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/three
+   b4eae8a..1a8b7a5  main       -> origin/main
+ * [new tag]         new        -> new
+ok 70 - fetch.writeCommitGraph
+
+expecting success of 5510.71 'fetch.writeCommitGraph with submodules': 
+	test_config_global protocol.file.allow always &&
+	git clone dups super &&
+	(
+		cd super &&
+		git submodule add "file://$TRASH_DIRECTORY/three" &&
+		git commit -m "add submodule"
+	) &&
+	git clone "super" super-clone &&
+	(
+		cd super-clone &&
+		rm -rf .git/objects/info &&
+		git -c fetch.writeCommitGraph=true fetch origin &&
+		test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain &&
+		git -c fetch.writeCommitGraph=true fetch --recurse-submodules origin
+	)
+
+Cloning into 'super'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/super/three'...
+[master (root-commit) 2cabf04] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 three
+Cloning into 'super-clone'...
+done.
+ok 71 - fetch.writeCommitGraph with submodules
+
+expecting success of 5510.72 'fetch from multiple configured URLs in single remote': 
+	git init url1 &&
+	git remote add multipleurls url1 &&
+	git remote set-url --add multipleurls url2 &&
+	git fetch multipleurls
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/url1/.git/
+ok 72 - fetch from multiple configured URLs in single remote
+
+expecting success of 5510.73 'setup cmdline_setup variable for subsequent test': 
+			remote_url="file://$(git -C one config remote.origin.url)" &&
+			remote_fetch="$(git -C one config remote.origin.fetch)" &&
+			cmdline_setup="\"$remote_url\" \"$remote_fetch\""
+		
+ok 73 - setup cmdline_setup variable for subsequent test
+
+expecting success of 5510.74 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      atomic-branch        -> origin/atomic-branch
+ * [new branch]      atomic-branch-1      -> origin/atomic-branch-1
+ * [new branch]      atomic-branch-2      -> origin/atomic-branch-2
+ * [new branch]      atomic-branch-3      -> origin/atomic-branch-3
+ * [new branch]      atomic-fetch-head-1  -> origin/atomic-fetch-head-1
+ * [new branch]      atomic-fetch-head-2  -> origin/atomic-fetch-head-2
+ * [new branch]      atomic-fetch-head-3  -> origin/atomic-fetch-head-3
+ * [new branch]      atomic-hooks-1       -> origin/atomic-hooks-1
+ * [new branch]      atomic-hooks-2       -> origin/atomic-hooks-2
+ * [new branch]      atomic-hooks-abort-1 -> origin/atomic-hooks-abort-1
+ * [new branch]      atomic-hooks-abort-2 -> origin/atomic-hooks-abort-2
+ * [new branch]      atomic-hooks-abort-3 -> origin/atomic-hooks-abort-3
+ * [new branch]      atomic-mixed-branch  -> origin/atomic-mixed-branch
+ * [new branch]      atomic-new-branch    -> origin/atomic-new-branch
+ * [new branch]      atomic-non-ff        -> origin/atomic-non-ff
+ * [new branch]      atomic-prune-create  -> origin/atomic-prune-create
+ * [new branch]      descriptive-branch   -> origin/descriptive-branch
+   7fb3fb8..b4eae8a  main                 -> origin/main
+ * [new branch]      newbranch            -> origin/newbranch
+ * [new branch]      other                -> origin/other
+ * [new branch]      side                 -> origin/side
+ * [new tag]         anno                 -> anno
+ * [new tag]         atomic-hooks-abort   -> atomic-hooks-abort
+ * [new tag]         atomic-mixed-tag     -> atomic-mixed-tag
+ * [new tag]         descriptive-tag      -> descriptive-tag
+ * [new tag]         light                -> light
+ * [new tag]         newtag               -> newtag
+ * [new tag]         v1.0                 -> v1.0
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 74 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+
+expecting success of 5510.75 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 75 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+
+expecting success of 5510.76 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 76 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5702.56 'reject client packfile-uris if not advertised': 
-	{
-		packetize command=fetch &&
-		packetize object-format=$(test_oid algo) &&
-		printf 0001 &&
-		packetize packfile-uris https &&
-		packetize done &&
-		printf 0000
-	} >input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git upload-pack client <input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git -c uploadpack.blobpackfileuri \
-		upload-pack client <input &&
-	GIT_PROTOCOL=version=2 \
-		git -c uploadpack.blobpackfileuri=anything \
-		upload-pack client <input
+expecting success of 5510.77 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-000eversion 2
-002aagent=git/2.48.0.rc1.219.gb6b6757d772
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: unexpected line: 'packfile-uris https'
-000eversion 2
-002aagent=git/2.48.0.rc1.219.gb6b6757d772
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: unexpected line: 'packfile-uris https'
-000eversion 2
-002aagent=git/2.48.0.rc1.219.gb6b6757d772
-0013ls-refs=unborn
-002efetch=shallow wait-for-done packfile-uris
-0012server-option
-0017object-format=sha1
-0000ok 56 - reject client packfile-uris if not advertised
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-checking prerequisite: NOT_ROOT
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 77 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-)
-prerequisite NOT_ROOT ok
-# passed all 56 test(s)
-# SKIP no web server found at ''
-1..56
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6005-rev-list-count.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6005-rev-list-count/.git/
-expecting success of 6005.1 'setup': 
-    for n in 1 2 3 4 5 ; do
-	echo $n > a &&
-	git add a &&
-	git commit -m "$n" || return 1
-    done
+expecting success of 5510.78 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-[master (root-commit) 47c1352] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 2be59de] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 78f6408] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master f4d0cb6] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master a6a826a] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6005.2 'no options': 
-	test_stdout_line_count = 5 git rev-list HEAD
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 2 - no options
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 78 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 6005.3 '--max-count': 
-	test_must_fail git rev-list --max-count=1q HEAD 2>error &&
-	grep "not an integer" error &&
+expecting success of 5510.79 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	test_stdout_line_count = 0 git rev-list HEAD --max-count=0 &&
-	test_stdout_line_count = 3 git rev-list HEAD --max-count=3 &&
-	test_stdout_line_count = 5 git rev-list HEAD --max-count=5 &&
-	test_stdout_line_count = 5 git rev-list HEAD --max-count=10 &&
-	test_stdout_line_count = 5 git rev-list HEAD --max-count=-1
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-fatal: '1q': not an integer
-ok 3 - --max-count
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6005.4 '--max-count all forms': 
-	test_must_fail git rev-list -1q HEAD 2>error &&
-	grep "not an integer" error &&
-	test_must_fail git rev-list --1 HEAD &&
-	test_must_fail git rev-list -n 1q HEAD 2>error &&
-	grep "not an integer" error &&
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 79 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-	test_stdout_line_count = 1 git rev-list HEAD --max-count=1 &&
-	test_stdout_line_count = 1 git rev-list HEAD -1 &&
-	test_stdout_line_count = 1 git rev-list HEAD -n1 &&
-	test_stdout_line_count = 1 git rev-list HEAD -n 1 &&
-	test_stdout_line_count = 5 git rev-list HEAD -n -1
+expecting success of 5510.80 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-fatal: '1q': not an integer
-usage: git rev-list [<options>] <commit>... [--] [<path>...]
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-  limiting output:
-    --max-count=<n>
-    --max-age=<epoch>
-    --min-age=<epoch>
-    --sparse
-    --no-merges
-    --min-parents=<n>
-    --no-min-parents
-    --max-parents=<n>
-    --no-max-parents
-    --remove-empty
-    --all
-    --branches
-    --tags
-    --remotes
-    --stdin
-    --exclude-hidden=[fetch|receive|uploadpack]
-    --quiet
-  ordering output:
-    --topo-order
-    --date-order
-    --reverse
-  formatting output:
-    --parents
-    --children
-    --objects | --objects-edge
-    --disk-usage[=human]
-    --unpacked
-    --header | --pretty
-    --[no-]object-names
-    --abbrev=<n> | --no-abbrev
-    --abbrev-commit
-    --left-right
-    --count
-  special purpose:
-    --bisect
-    --bisect-vars
-    --bisect-all
-fatal: '1q': not an integer
-ok 4 - --max-count all forms
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6005.5 '--skip': 
-	test_must_fail git rev-list --skip 1q HEAD 2>error &&
-	grep "not an integer" error &&
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+ * [new tag]         excess-1   -> excess-1
+ * [new tag]         excess-2   -> excess-2
+ * [new tag]         excess-3   -> excess-3
+ * [new tag]         excess-4   -> excess-4
+ * [new tag]         excess-5   -> excess-5
+ * [new tag]         excess-6   -> excess-6
+ * [new tag]         excess-7   -> excess-7
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 80 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
-	test_stdout_line_count = 5 git rev-list HEAD --skip=0 &&
-	test_stdout_line_count = 2 git rev-list HEAD --skip=3 &&
-	test_stdout_line_count = 0 git rev-list HEAD --skip=5 &&
-	test_stdout_line_count = 0 git rev-list HEAD --skip=10
+expecting success of 5510.81 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-fatal: '1q': not an integer
-ok 5 - --skip
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6005.6 '--skip --max-count': 
-	test_stdout_line_count = 0 git rev-list HEAD --skip=0 --max-count=0 &&
-	test_stdout_line_count = 5 git rev-list HEAD --skip=0 --max-count=10 &&
-	test_stdout_line_count = 0 git rev-list HEAD --skip=3 --max-count=0 &&
-	test_stdout_line_count = 1 git rev-list HEAD --skip=3 --max-count=1 &&
-	test_stdout_line_count = 2 git rev-list HEAD --skip=3 --max-count=2 &&
-	test_stdout_line_count = 2 git rev-list HEAD --skip=3 --max-count=10 &&
-	test_stdout_line_count = 0 git rev-list HEAD --skip=5 --max-count=10 &&
-	test_stdout_line_count = 0 git rev-list HEAD --skip=10 --max-count=10
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 6 - --skip --max-count
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 81 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6008-rev-list-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6008-rev-list-submodule/.git/
-expecting success of 6008.1 'setup': 
-	: > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo 1 > file &&
-	test_tick &&
-	git commit -m second file &&
-	echo 2 > file &&
-	test_tick &&
-	git commit -m third file &&
+expecting success of 5510.82 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	rm .git/index &&
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-	: > super-file &&
-	git add super-file &&
-	git -c protocol.file.allow=always submodule add "$(pwd)" sub &&
-	git symbolic-ref HEAD refs/heads/super &&
-	test_tick &&
-	git commit -m super-initial &&
-	echo 1 > super-file &&
-	test_tick &&
-	git commit -m super-first super-file &&
-	echo 2 > super-file &&
-	test_tick &&
-	git commit -m super-second super-file
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-[main (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[main 534ad2c] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 1795412] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6008-rev-list-submodule/sub'...
-done.
-[super (root-commit) ad903ae] super-initial
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 100644 super-file
-[super 9c430fe] super-first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[super 4444afb] super-second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 82 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
-expecting success of 6008.2 'Ilari's test': 
-	git rev-list --objects super main ^super^
+expecting success of 5510.83 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-4444afba0d3caeab587f2f0f9ebab070a9ef0b95
-17954123b4d2a45f7e0fec2fea14972db2b90a1f
-534ad2c6e7b5b68dcaa4f008327c6c2ab1fa47ff
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a
-8cc8a696a786656a0570c911f7e2cb839121c97b 
-0cfbf08886fca9a91cb753ec8734c84fcbe52c9f super-file
-d9cc608eedd5d2cc63c262272b7a0f6ab6aed5dd 
-f27c6ae26adb8396d3861976ba268f87ad8afa0b 
-df2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file
-ok 2 - Ilari's test
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5801-remote-helpers.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/.git/
-expecting success of 5801.1 'setup repository': 
-	git init server &&
-	(cd server &&
-	 echo content >file &&
-	 git add file &&
-	 git commit -m one)
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git/
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup repository
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 83 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
-expecting success of 5801.2 'cloning from local repo': 
-	git clone "testgit::${PWD}/server" local &&
-	test_cmp server/file local/file
+expecting success of 5510.84 'name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-Cloning into 'local'...
-ok 2 - cloning from local repo
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.3 'clone with remote.*.vcs config': 
-	GIT_TRACE=$PWD/vcs-clone.trace \
-	git clone --no-local -c remote.origin.vcs=testgit "$PWD/server" vcs-clone &&
-	test_grep remote-testgit vcs-clone.trace
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-Cloning into 'vcs-clone'...
-trace: run_command: git remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
-trace: exec: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
-trace: run_command: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5801/git-remote-testgit' origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server/.git'
-ok 3 - clone with remote.*.vcs config
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 84 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-expecting success of 5801.4 'fetch with configured remote.*.vcs': 
-	git init vcs-fetch &&
-	git -C vcs-fetch config remote.origin.vcs testgit &&
-	git -C vcs-fetch config remote.origin.url "$PWD/server" &&
-	GIT_TRACE=$PWD/vcs-fetch.trace \
-	git -C vcs-fetch fetch origin &&
-	test_grep remote-testgit vcs-fetch.trace
+expecting success of 5510.85 'link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/vcs-fetch/.git/
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * branch            HEAD       -> FETCH_HEAD
-trace: run_command: GIT_DIR=.git git remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
-trace: exec: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
-trace: run_command: git-remote-testgit origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t5801/git-remote-testgit' origin '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
-ok 4 - fetch with configured remote.*.vcs
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.5 'vcs remote with no url': 
-	NOURL_UPSTREAM=$PWD/server &&
-	export NOURL_UPSTREAM &&
-	git init vcs-nourl &&
-	git -C vcs-nourl config remote.origin.vcs nourl &&
-	git -C vcs-nourl fetch origin
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/vcs-nourl/.git/
-From origin
- * branch            HEAD       -> FETCH_HEAD
-ok 5 - vcs remote with no url
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 85 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-expecting success of 5801.6 'create new commit on remote': 
-	(cd server &&
-	 echo content >>file &&
-	 git commit -a -m two)
+expecting success of 5510.86 'name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-[main 5647d5f] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 6 - create new commit on remote
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.7 'pulling from local repo': 
-	(cd local && git pull) &&
-	test_cmp server/file local/file
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
-   f39a923..5647d5f  main       -> origin/main
-Updating f39a923..5647d5f
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-ok 7 - pulling from local repo
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 86 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5801.8 'pushing to local repo': 
-	(cd local &&
-	echo content >>file &&
-	git commit -a -m three &&
-	git push) &&
-	compare_refs local HEAD server HEAD
+expecting success of 5510.87 'link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-[main f883ace] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
-   5647d5f..f883ace  main -> main
-ok 8 - pushing to local repo
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.9 'fetch new branch': 
-	(cd server &&
-	 git reset --hard &&
-	 git checkout -b new &&
-	 echo content >>file &&
-	 git commit -a -m five
-	) &&
-	(cd local &&
-	 git fetch origin new
-	) &&
-	compare_refs server HEAD local FETCH_HEAD
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-HEAD is now at f883ace three
-Switched to a new branch 'new'
-[new 9a8e2ab] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * branch            new        -> FETCH_HEAD
- * [new branch]      new        -> origin/new
-ok 9 - fetch new branch
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 87 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 5801.10 'fetch multiple branches': 
-	(cd local &&
-	 git fetch
-	) &&
-	compare_refs server main local refs/remotes/origin/main &&
-	compare_refs server new local refs/remotes/origin/new
+expecting success of 5510.88 'name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 10 - fetch multiple branches
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.11 'push when remote has extra refs': 
-	(cd local &&
-	 git reset --hard origin/main &&
-	 echo content >>file &&
-	 git commit -a -m six &&
-	 git push
-	) &&
-	compare_refs local main server main
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-HEAD is now at f883ace three
-[main 0d4cb61] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
-   f883ace..0d4cb61  main -> main
-ok 11 - push when remote has extra refs
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 88 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5801.12 'push new branch by name': 
-	(cd local &&
-	 git checkout -b new-name  &&
-	 echo content >>file &&
-	 git commit -a -m seven &&
-	 git push origin new-name
-	) &&
-	compare_refs local HEAD server refs/heads/new-name
+expecting success of 5510.89 'link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-Switched to a new branch 'new-name'
-[new-name 7c93a0d] seven
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      new-name -> new-name
-ok 12 - push new branch by name
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.13 'push new branch with old:new refspec': 
-	(cd local &&
-	 git push origin new-name:new-refspec
-	) &&
-	compare_refs local HEAD server refs/heads/new-refspec
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      new-name -> new-refspec
-ok 13 - push new branch with old:new refspec
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 89 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5801.14 'push new branch with HEAD:new refspec': 
-	(cd local &&
-	 git checkout new-name &&
-	 git push origin HEAD:new-refspec-2
-	) &&
-	compare_refs local HEAD server refs/heads/new-refspec-2
+expecting success of 5510.90 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-Already on 'new-name'
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      HEAD -> new-refspec-2
-ok 14 - push new branch with HEAD:new refspec
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.15 'push delete branch': 
-	(cd local &&
-	 git push origin :new-name
-	) &&
-	test_must_fail git --git-dir="server/.git" \
-	 rev-parse --verify refs/heads/new-name
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-Everything up-to-date
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 15 - push delete branch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 90 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5801.16 'forced push': 
-	(cd local &&
-	git checkout -b force-test &&
-	echo content >> file &&
-	git commit -a -m eight &&
-	git push origin force-test &&
-	echo content >> file &&
-	git commit -a --amend -m eight-modified &&
-	git push --force origin force-test
-	) &&
-	compare_refs local refs/heads/force-test server refs/heads/force-test
+expecting success of 5510.91 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-Switched to a new branch 'force-test'
-[force-test 518e3ec] eight
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      force-test -> force-test
-[force-test b33c694] eight-modified
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 2 insertions(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
-   518e3ec..b33c694  force-test -> force-test
-ok 16 - forced push
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.17 'cloning without refspec': 
-	GIT_REMOTE_TESTGIT_NOREFSPEC=1 \
-	git clone "testgit::${PWD}/server" local2 2>error &&
-	test_grep "this remote helper should implement refspec capability" error &&
-	compare_refs local2 HEAD server HEAD
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-warning: this remote helper should implement refspec capability
-ok 17 - cloning without refspec
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 91 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 5801.18 'pulling without refspecs': 
-	(cd local2 &&
-	git reset --hard &&
-	GIT_REMOTE_TESTGIT_NOREFSPEC=1 git pull 2>../error) &&
-	test_grep "this remote helper should implement refspec capability" error &&
-	compare_refs local2 HEAD server HEAD
+expecting success of 5510.92 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-HEAD is now at 9a8e2ab five
-Already up to date.
-warning: this remote helper should implement refspec capability
-ok 18 - pulling without refspecs
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.19 'pushing without refspecs': 
-	test_when_finished "(cd local2 && git reset --hard origin)" &&
-	(cd local2 &&
-	echo content >>file &&
-	git commit -a -m ten &&
-	GIT_REMOTE_TESTGIT_NOREFSPEC=1 &&
-	export GIT_REMOTE_TESTGIT_NOREFSPEC &&
-	test_must_fail git push 2>../error) &&
-	test_grep "remote-helper doesn.t support push; refspec needed" error
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-[new 79634a5] ten
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-fatal: remote-helper doesn't support push; refspec needed
-HEAD is now at 9a8e2ab five
-ok 19 - pushing without refspecs
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 92 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5801.20 'pulling without marks': 
-	(cd local2 &&
-	GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
-	compare_refs local2 HEAD server HEAD
+expecting success of 5510.93 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-Already up to date.
-ok 20 - pulling without marks
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-checking known breakage of 5801.21 'pushing without marks': 
-	test_when_finished "(cd local2 && git reset --hard origin)" &&
-	(cd local2 &&
-	echo content >>file &&
-	git commit -a -m twelve &&
-	GIT_REMOTE_TESTGIT_NO_MARKS=1 git push) &&
-	compare_refs local2 HEAD server HEAD
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-[new 8990571] twelve
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-warning: Not updating refs/heads/new (new tip a81a4147c0db7a0bc38d047c3205b7c3ac8fc9c5 does not contain 9a8e2abfa604731e07ce2fb257109eb918e2280b)
-Everything up-to-date
---- expect	2025-02-09 06:54:56.754048756 +0000
-+++ actual	2025-02-09 06:54:56.758048781 +0000
-@@ -1 +1 @@
--899057158430267bac82448fb89f21aa89c35cb0
-+9a8e2abfa604731e07ce2fb257109eb918e2280b
-HEAD is now at 9a8e2ab five
-not ok 21 - pushing without marks # TODO known breakage
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 93 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 5801.22 'push all with existing object': 
-	(cd local &&
-	git branch dup2 main &&
-	git push origin --all
-	) &&
-	compare_refs local dup2 server dup2
+expecting success of 5510.94 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      dup2 -> dup2
-   7c93a0d..7c93a0d  new-name -> new-name
-ok 22 - push all with existing object
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 5801.23 'push ref with existing object': 
-	(cd local &&
-	git branch dup main &&
-	git push origin dup
-	) &&
-	compare_refs local dup server dup
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      dup -> dup
-ok 23 - push ref with existing object
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 94 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-checking prerequisite: GPG
+expecting success of 5510.95 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-	# 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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-)
-prerequisite GPG not satisfied
-ok 24 # skip push signed tag (missing GPG)
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 95 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-ok 25 # skip push signed tag with signed-tags capability (missing GPG)
+expecting success of 5510.96 'name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 5801.26 'push update refs': 
-	(cd local &&
-	git checkout -b update main &&
-	echo update >>file &&
-	git commit -a -m update &&
-	git push origin update &&
-	git rev-parse --verify remotes/origin/update >expect &&
-	git rev-parse --verify testgit/origin/heads/update >actual &&
-	test_cmp expect actual
-	)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-Switched to a new branch 'update'
-[update 900950d] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      update -> update
-ok 26 - push update refs
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 5801.27 'push update refs disabled by no-private-update': 
-	(cd local &&
-	echo more-update >>file &&
-	git commit -a -m more-update &&
-	git rev-parse --verify testgit/origin/heads/update >expect &&
-	GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE=t git push origin update &&
-	git rev-parse --verify testgit/origin/heads/update >actual &&
-	test_cmp expect actual
-	)
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 96 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-[update 297a32d] more-update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
-   900950d..297a32d  update -> update
-ok 27 - push update refs disabled by no-private-update
+expecting success of 5510.97 'link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 5801.28 'push update refs failure': 
-	(cd local &&
-	git checkout update &&
-	echo "update fail" >>file &&
-	git commit -a -m "update fail" &&
-	git rev-parse --verify testgit/origin/heads/update >expect &&
-	test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
-		git push origin update &&
-	git rev-parse --verify testgit/origin/heads/update >actual &&
-	test_cmp expect actual
-	)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-Already on 'update'
-[update 3e5dd5a] update fail
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: failed to push some refs to 'testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
-ok 28 - push update refs failure
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 5801.29 'proper failure checks for fetching': 
-	(cd local &&
-	test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
-	test_grep -q "error while running fast-import" error
-	)
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 97 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-ok 29 - proper failure checks for fetching
+expecting success of 5510.98 'name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 5801.30 'proper failure checks for pushing': 
-	test_when_finished "rm -rf local/git.marks local/testgit.marks" &&
-	(cd local &&
-	git checkout -b crash main &&
-	echo crash >>file &&
-	git commit -a -m crash &&
-	test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
-	clean_mark ".git/testgit/origin/git.marks" &&
-	clean_mark ".git/testgit/origin/testgit.marks" &&
-	test_cmp git.marks testgit.marks
-	)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-Switched to a new branch 'crash'
-[crash b62b6af] crash
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: failed to push some refs to 'testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server'
-ok 30 - proper failure checks for pushing
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 5801.31 'push messages': 
-	(cd local &&
-	git checkout -b new_branch main &&
-	echo new >>file &&
-	git commit -a -m new &&
-	git push origin new_branch &&
-	git fetch origin &&
-	echo new >>file &&
-	git commit -a -m new &&
-	git push origin new_branch 2> msg &&
-	! grep "\[new branch\]" msg
-	)
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 98 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-Switched to a new branch 'new_branch'
-[new_branch 0ff7576] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * [new branch]      new_branch -> new_branch
-[new_branch 190f068] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 31 - push messages
+expecting success of 5510.99 'link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 5801.32 'fetch HEAD': 
-	(cd server &&
-	git checkout main &&
-	echo more >>file &&
-	git commit -a -m more
-	) &&
-	(cd local &&
-	git fetch origin HEAD
-	) &&
-	compare_refs server HEAD local FETCH_HEAD
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-Switched to branch 'main'
-[main b18cb6c] more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
- * branch            HEAD       -> FETCH_HEAD
-ok 32 - fetch HEAD
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 5801.33 'fetch url': 
-	(cd server &&
-	git checkout main &&
-	echo more >>file &&
-	git commit -a -m more
-	) &&
-	(cd local &&
-	git fetch "testgit::${PWD}/../server"
-	) &&
-	compare_refs server HEAD local FETCH_HEAD
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 99 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-Already on 'main'
-[main 4a80143] more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/local/../server
- * branch            HEAD       -> FETCH_HEAD
-ok 33 - fetch url
+expecting success of 5510.100 'name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 5801.34 'fetch tag': 
-	(cd server &&
-	 git tag v1.0
-	) &&
-	(cd local &&
-	 git fetch
-	) &&
-	compare_refs local v1.0 server v1.0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-From testgit::/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5801-remote-helpers/server
-   0d4cb61..4a80143  main          -> origin/main
- * [new tag]         v1.0          -> v1.0
-ok 34 - fetch tag
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 5801.35 'totally broken helper reports failure message': 
-	write_script git-remote-broken <<-\EOF &&
-	read cap_cmd
-	exit 1
-	EOF
-	test_must_fail \
-		env PATH="$PWD:$PATH" \
-		git clone broken://example.com/foo.git 2>stderr &&
-	grep aborted stderr
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 100 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-fatal: remote helper 'broken' aborted session
-ok 35 - totally broken helper reports failure message
+expecting success of 5510.101 'link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-# still have 1 known breakage(s)
-# passed all remaining 34 test(s)
-1..35
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6011-rev-list-with-bad-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6011-rev-list-with-bad-commit/.git/
-expecting success of 6011.1 'setup': 
-   git init &&
-   git config core.compression 0 &&
-   git config core.logallrefupdates false &&
-   echo "foo" > foo &&
-   git add foo &&
-   git commit -m "first commit" &&
-   echo "bar" > bar &&
-   git add bar &&
-   git commit -m "second commit" &&
-   echo "baz" > baz &&
-   git add baz &&
-   git commit -m "third commit" &&
-   echo "foo again" >> foo &&
-   git add foo &&
-   git commit -m "fourth commit" &&
-   git repack -a -f -d
-   
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6011-rev-list-with-bad-commit/.git/
-[master (root-commit) 1e22a2b] first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 869767e] second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 53fc376] third commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 baz
-[master 59070cc] fourth commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6011.2 'verify number of revisions': 
-   revs=$(git rev-list --all | wc -l) &&
-   test $revs -eq 4 &&
-   first_commit=$(git rev-parse HEAD~3)
-   
-ok 2 - verify number of revisions
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6011.3 'corrupt second commit object': 
-   perl -i.bak -pe "s/second commit/socond commit/" .git/objects/pack/*.pack &&
-   test_must_fail git fsck --full
-   
-error: .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack pack checksum mismatch
-error: index CRC mismatch for object 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
-error: inflate: data stream error (incorrect data check)
-error: cannot unpack 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
-dangling tree 89ff1a2aefcbff0f09197f0fd8beeb19a7b6e51c
-dangling commit 1e22a2b921014905366810d999b3d3a3e9514320
-ok 3 - corrupt second commit object
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 101 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 6011.4 'rev-list should fail': 
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null
+expecting success of 5510.102 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-error: inflate: data stream error (incorrect data check)
-error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
-fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
-ok 4 - rev-list should fail
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6011.5 'git repack _MUST_ fail': 
-   test_must_fail git repack -a -f -d
-   
-error: inflate: data stream error (incorrect data check)
-error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
-fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
-ok 5 - git repack _MUST_ fail
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6011.6 'first commit is still available': 
-   git log $first_commit
-   
-commit 1e22a2b921014905366810d999b3d3a3e9514320
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 102 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-    first commit
-ok 6 - first commit is still available
+expecting success of 5510.103 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6007-rev-list-cherry-pick-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6007-rev-list-cherry-pick-file/.git/
-expecting success of 6007.1 'setup': 
-	echo Hallo > foo &&
-	git add foo &&
-	test_tick &&
-	git commit -m "A" &&
-	git tag A &&
-	git checkout -b branch &&
-	echo Bello > foo &&
-	echo Cello > bar &&
-	git add foo bar &&
-	test_tick &&
-	git commit -m "C" &&
-	git tag C &&
-	echo Dello > bar &&
-	git add bar &&
-	test_tick &&
-	git commit -m "E" &&
-	git tag E &&
-	git checkout main &&
-	git checkout branch foo &&
-	test_tick &&
-	git commit -m "B" &&
-	git tag B &&
-	echo Cello > bar &&
-	git add bar &&
-	test_tick &&
-	git commit -m "D" &&
-	git tag D &&
-	echo Nello > bar &&
-	git add bar &&
-	test_tick &&
-	git commit -m "F" &&
-	git tag F
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-[main (root-commit) 87a5b85] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Switched to a new branch 'branch'
-[branch d81b112] C
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 bar
-[branch 50f946e] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Updated 1 path from 75417d5
-[main 9e00a87] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9c68531] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 555ccf5] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.2 '--left-right': 
-	git rev-list --left-right B...C > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 103 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-ok 2 - --left-right
+expecting success of 5510.104 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.3 '--count': 
-	git rev-list --count B...C > actual &&
-	test "$(cat actual)" = 2
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 3 - --count
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.4 '--cherry-pick foo comes up empty': 
-	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 104 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-ok 4 - --cherry-pick foo comes up empty
+expecting success of 5510.105 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.5 '--cherry-pick bar does not come up empty': 
-	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 5 - --cherry-pick bar does not come up empty
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.6 'bar does not come up empty': 
-	git rev-list --left-right B...C -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 105 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-ok 6 - bar does not come up empty
+expecting success of 5510.106 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.7 '--cherry-pick bar does not come up empty (II)': 
-	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 7 - --cherry-pick bar does not come up empty (II)
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.8 'name-rev multiple --refs combine inclusive': 
-	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 106 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-ok 8 - name-rev multiple --refs combine inclusive
+expecting success of 5510.107 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.9 'name-rev --refs excludes non-matched patterns': 
-	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
-	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/F" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 9 - name-rev --refs excludes non-matched patterns
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.10 'name-rev --exclude excludes matched patterns': 
-	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
-	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" --exclude="*E" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 107 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-ok 10 - name-rev --exclude excludes matched patterns
+expecting success of 5510.108 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.11 'name-rev --no-refs clears the refs list': 
-	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
-		<expect >actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 11 - name-rev --no-refs clears the refs list
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.12 '--cherry-mark': 
-	git rev-list --cherry-mark F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 108 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
-ok 12 - --cherry-mark
+expecting success of 5510.109 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.13 '--cherry-mark --left-right': 
-	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 13 - --cherry-mark --left-right
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.14 '--cherry-pick --right-only': 
-	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 109 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
-ok 14 - --cherry-pick --right-only
+expecting success of 5510.110 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.15 '--cherry-pick --left-only': 
-	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 15 - --cherry-pick --left-only
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.16 '--cherry': 
-	git rev-list --cherry F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 110 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
-ok 16 - --cherry
+expecting success of 5510.111 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.17 '--cherry --count': 
-	git rev-list --cherry --count F...E -- bar > actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 17 - --cherry --count
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.18 '--cherry-mark --count': 
-	git rev-list --cherry-mark --count F...E -- bar > actual &&
-	test_cmp expect actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 111 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
-ok 18 - --cherry-mark --count
+expecting success of 5510.112 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.19 '--cherry-mark --left-right --count': 
-	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 19 - --cherry-mark --left-right --count
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.20 '--cherry-pick with independent, but identical branches': 
-	git symbolic-ref HEAD refs/heads/independent &&
-	rm .git/index &&
-	echo Hallo > foo &&
-	git add foo &&
-	test_tick &&
-	git commit -m "independent" &&
-	echo Bello > foo &&
-	test_tick &&
-	git commit -m "independent, too" foo &&
-	test -z "$(git rev-list --left-right --cherry-pick \
-		HEAD...main -- foo)"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 112 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-[independent (root-commit) 5da548c] independent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[independent de095d9] independent, too
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 20 - --cherry-pick with independent, but identical branches
+expecting success of 5510.113 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.21 '--count --left-right': 
-	git rev-list --count --left-right C...D > actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 21 - --count --left-right
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6007.22 '--cherry-pick with duplicates on each side': 
-	git checkout -b dup-orig &&
-	test_commit dup-base &&
-	git revert dup-base &&
-	git cherry-pick dup-base &&
-	git checkout -b dup-side HEAD~3 &&
-	test_tick &&
-	git cherry-pick -3 dup-orig &&
-	git rev-list --cherry-pick dup-orig...dup-side >actual &&
-	test_must_be_empty actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 113 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
-Switched to a new branch 'dup-orig'
-[dup-orig eb9d72c] dup-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-[dup-orig 92ef1a2] Revert "dup-base"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 dup-base.t
-[dup-orig 3f88b9e] dup-base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-Switched to a new branch 'dup-side'
-[dup-side d37dce7] dup-base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-[dup-side 5e0bb86] Revert "dup-base"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 dup-base.t
-[dup-side c48d64d] dup-base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-ok 22 - --cherry-pick with duplicates on each side
+expecting success of 5510.114 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6007.23 '--cherry-pick avoids looking at full diffs': 
-	git checkout -b shy-diff &&
-	test_commit dont-look-at-me &&
-	echo Hello >dont-look-at-me.t &&
-	test_tick &&
-	git commit -m tip dont-look-at-me.t &&
-	git checkout -b mainline HEAD^ &&
-	test_commit to-cherry-pick &&
-	remove_loose_object shy-diff^:dont-look-at-me.t &&
-	git rev-list --cherry-pick ...shy-diff
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-Switched to a new branch 'shy-diff'
-[shy-diff 694eab7] dont-look-at-me
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dont-look-at-me.t
-[shy-diff 065751b] tip
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'mainline'
-[mainline edb671e] to-cherry-pick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-cherry-pick.t
-edb671edd4843042c1e4b762a9eb9a82125402aa
-065751bb4ac05081d62425d3a9670d9d9102f001
-ok 23 - --cherry-pick avoids looking at full diffs
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6014-rev-list-all.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6014-rev-list-all/.git/
-expecting success of 6014.1 'setup': 
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 114 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-	commit one &&
-	commit two &&
-	git checkout HEAD^ &&
-	commit detached
+expecting success of 5510.115 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-[master (root-commit) 86412ff] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 4931c53] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'HEAD^'.
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and 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 "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 115 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-If you want to 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 5510.116 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-  git switch -c <new-branch-name>
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-Or undo this operation with:
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-  git switch -
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 116 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5510.117 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-HEAD is now at 86412ff one
-[detached HEAD 13d8fe0] detached
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6014.2 'rev-list --all lists detached HEAD': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	test 3 = $(git rev-list --all | wc -l)
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 117 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
+expecting success of 5510.118 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 2 - rev-list --all lists detached HEAD
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6014.3 'repack does not lose detached HEAD': 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	git gc &&
-	git prune --expire=now &&
-	git show HEAD
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 118 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
+expecting success of 5510.119 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-    detached
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-diff --git a/foo b/foo
-index 5626abf..9aa4e2b 100644
---- a/foo
-+++ b/foo
-@@ -1 +1 @@
--one
-+detached
-ok 3 - repack does not lose detached HEAD
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 119 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 6014.4 'rev-list --graph --no-walk is forbidden': 
-	test_must_fail git rev-list --graph --no-walk HEAD
+expecting success of 5510.120 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-fatal: options '--no-walk' and '--graph' cannot be used together
-ok 4 - rev-list --graph --no-walk is forbidden
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6013-rev-list-reverse-parents.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6013-rev-list-reverse-parents/.git/
-expecting success of 6013.1 'set up --reverse example': 
-	commit one &&
-	git tag root &&
-	commit two &&
-	git checkout -b side HEAD^ &&
-	commit three &&
-	git checkout main &&
-	git merge -s ours side &&
-	commit five
-	
-[main (root-commit) 86412ff] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 4931c53] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side 0fcb03e] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Merge made by the 'ours' strategy.
-[main 2ed4a76] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up --reverse example
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6013.2 '--reverse --parents --full-history combines correctly': 
-	git rev-list --parents --full-history main -- foo |
-		perl -e "print reverse <>" > expected &&
-	git rev-list --reverse --parents --full-history main -- foo \
-		> actual &&
-	test_cmp expected actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 2 - --reverse --parents --full-history combines correctly
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 120 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 6013.3 '--boundary does too': 
-	git rev-list --boundary --parents --full-history main ^root -- foo |
-		perl -e "print reverse <>" > expected &&
-	git rev-list --boundary --reverse --parents --full-history \
-		main ^root -- foo > actual &&
-	test_cmp expected actual
-	
-ok 3 - --boundary does too
+expecting success of 5510.121 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6006-rev-list-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6006-rev-list-format/.git/
-expecting success of 6006.1 'setup': 
-	: >foo &&
-	git add foo &&
-	git config i18n.commitEncoding $test_encoding &&
-	echo "$added_iso88591" | git commit -F - &&
-	head1=$(git rev-parse --verify HEAD) &&
-	head1_short=$(git rev-parse --verify --short $head1) &&
-	head1_short4=$(git rev-parse --verify --short=4 $head1) &&
-	tree1=$(git rev-parse --verify HEAD:) &&
-	tree1_short=$(git rev-parse --verify --short $tree1) &&
-	echo "$changed" > foo &&
-	echo "$changed_iso88591" | git commit -a -F - &&
-	head2=$(git rev-parse --verify HEAD) &&
-	head2_short=$(git rev-parse --verify --short $head2) &&
-	head2_short4=$(git rev-parse --verify --short=4 $head2) &&
-	tree2=$(git rev-parse --verify HEAD:) &&
-	tree2_short=$(git rev-parse --verify --short $tree2) &&
-	git config --unset i18n.commitEncoding
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-[main (root-commit) 75bad09] added (hinzugefügt) foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-[main 7e50ed9] changed (geändert) foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.2 'format percent': 
-		git rev-list  --pretty=format:'%%h' main >output.percent &&
-		test_cmp expect.percent output.percent
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 2 - format percent
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 121 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 6006.3 'format hash': 
-		git rev-list  --pretty=format:'%H%n%h' main >output.hash &&
-		test_cmp expect.hash output.hash
-	
-ok 3 - format hash
+expecting success of 5510.122 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.4 'format hash-no-header': 
-		git rev-list  --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header &&
-		test_cmp expect.hash-no-header output.hash-no-header
-	
-ok 4 - format hash-no-header
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.5 'format hash-no-header-abbrev': 
-		git rev-list  --abbrev-commit --abbrev=0 --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header-abbrev &&
-		test_cmp expect.hash-no-header-abbrev output.hash-no-header-abbrev
-	
-ok 5 - format hash-no-header-abbrev
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.6 'format tree': 
-		git rev-list  --pretty=format:'%T%n%t' main >output.tree &&
-		test_cmp expect.tree output.tree
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 6 - format tree
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 122 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 6006.7 'format parents': 
-		git rev-list  --pretty=format:'%P%n%p' main >output.parents &&
-		test_cmp expect.parents output.parents
-	
-ok 7 - format parents
+expecting success of 5510.123 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.8 'format author': 
-		git rev-list  --pretty=format:'%an%n%ae%n%al%n%ad%n%aD%n%at' main >output.author &&
-		test_cmp expect.author output.author
-	
-ok 8 - format author
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.9 'format committer': 
-		git rev-list  --pretty=format:'%cn%n%ce%n%cl%n%cd%n%cD%n%ct' main >output.committer &&
-		test_cmp expect.committer output.committer
-	
-ok 9 - format committer
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.10 'format encoding': 
-		git rev-list  --pretty=format:'%e' main >output.encoding &&
-		test_cmp expect.encoding output.encoding
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 10 - format encoding
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 123 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 6006.11 'format subject': 
-		git rev-list  --pretty=format:'%s' main >output.subject &&
-		test_cmp expect.subject output.subject
-	
-ok 11 - format subject
+expecting success of 5510.124 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.12 'format subject-truncated': 
-		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.subject-truncated &&
-		test_cmp expect.subject-truncated output.subject-truncated
-	
-ok 12 - format subject-truncated
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.13 'format body': 
-		git rev-list  --pretty=format:'%b' main >output.body &&
-		test_cmp expect.body output.body
-	
-ok 13 - format body
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.14 'format raw-body': 
-		git rev-list  --pretty=format:'%B' main >output.raw-body &&
-		test_cmp expect.raw-body output.raw-body
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 14 - format raw-body
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 124 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 6006.15 'format raw-body-no-header': 
-		git rev-list  --no-commit-header --pretty=format:'%B' main >output.raw-body-no-header &&
-		test_cmp expect.raw-body-no-header output.raw-body-no-header
-	
-ok 15 - format raw-body-no-header
+expecting success of 5510.125 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.16 'pretty oneline (without --no-commit-header)': 
-		git rev-list  --pretty='oneline' main >output.oneline &&
-		test_cmp expect.oneline output.oneline
-	
-ok 16 - pretty oneline (without --no-commit-header)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.17 'pretty oneline (with --no-commit-header)': 
-		git rev-list  --no-commit-header --pretty='oneline' main >output.oneline &&
-		test_cmp expect.oneline output.oneline
-	
-ok 17 - pretty oneline (with --no-commit-header)
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.18 'pretty short (without --no-commit-header)': 
-		git rev-list  --pretty='short' main >output.short &&
-		test_cmp expect.short output.short
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 18 - pretty short (without --no-commit-header)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 125 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 6006.19 'pretty short (with --no-commit-header)': 
-		git rev-list  --no-commit-header --pretty='short' main >output.short &&
-		test_cmp expect.short output.short
-	
-ok 19 - pretty short (with --no-commit-header)
+expecting success of 5510.126 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.20 'basic colors': 
-	cat >expect <<-EOF &&
-	commit $head2
-	<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
-	EOF
-	format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
-	git rev-list --color --format="$format" -1 main >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 20 - basic colors
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.21 '%S is not a placeholder for rev-list yet': 
-	git rev-list --format="%S" -1 main | grep "%S"
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 126 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-%S
-ok 21 - %S is not a placeholder for rev-list yet
+expecting success of 5510.127 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.22 'advanced colors': 
-	cat >expect <<-EOF &&
-	commit $head2
-	<BOLD;RED;BYELLOW>foo<RESET>
-	EOF
-	format="%C(red yellow bold)foo%C(reset)" &&
-	git rev-list --color --format="$format" -1 main >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 22 - advanced colors
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.23 '%Cred does not enable color by default': 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 23 - %Cred does not enable color by default
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 127 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 6006.24 '%Cred enables colors for color.diff': 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 24 - %Cred enables colors for color.diff
+expecting success of 5510.128 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.25 '%Cred enables colors for color.ui': 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 25 - %Cred enables colors for color.ui
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.26 '%Cred respects --color': 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
-	
-ok 26 - %Cred respects --color
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.27 '%Cred respects --no-color': 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 27 - %Cred respects --no-color
-
-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 &&
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 128 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+expecting success of 5510.129 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-)
-prerequisite TTY ok
-expecting success of 6006.28 '%Cred respects --color=auto (stdout is tty)': 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 28 - %Cred respects --color=auto (stdout is tty)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.29 '%Cred respects --color=auto (stdout not tty)': 
+		# then test
 		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
 		)
 	
-ok 29 - %Cred respects --color=auto (stdout not tty)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 129 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 6006.30 '%C(...) does not enable color by default': 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 30 - %C(...) does not enable color by default
+expecting success of 5510.130 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.31 '%C(...) enables colors for color.diff': 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 31 - %C(...) enables colors for color.diff
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.32 '%C(...) enables colors for color.ui': 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 32 - %C(...) enables colors for color.ui
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.33 '%C(...) respects --color': 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 33 - %C(...) respects --color
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 130 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 6006.34 '%C(...) respects --no-color': 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 34 - %C(...) respects --no-color
+expecting success of 5510.131 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.35 '%C(...) respects --color=auto (stdout is tty)': 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 35 - %C(...) respects --color=auto (stdout is tty)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.36 '%C(...) respects --color=auto (stdout not tty)': 
+		# then test
 		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
 		)
 	
-ok 36 - %C(...) respects --color=auto (stdout not tty)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 131 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
-expecting success of 6006.37 '%C(auto,...) does not enable color by default': 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 37 - %C(auto,...) does not enable color by default
+expecting success of 5510.132 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.38 '%C(auto,...) enables colors for color.diff': 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 38 - %C(auto,...) enables colors for color.diff
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.39 '%C(auto,...) enables colors for color.ui': 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 39 - %C(auto,...) enables colors for color.ui
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.40 '%C(auto,...) respects --color': 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 40 - %C(auto,...) respects --color
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 132 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-expecting success of 6006.41 '%C(auto,...) respects --no-color': 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 41 - %C(auto,...) respects --no-color
+expecting success of 5510.133 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.42 '%C(auto,...) respects --color=auto (stdout is tty)': 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 42 - %C(auto,...) respects --color=auto (stdout is tty)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.43 '%C(auto,...) respects --color=auto (stdout not tty)': 
+		# then test
 		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
 		)
 	
-ok 43 - %C(auto,...) respects --color=auto (stdout not tty)
-
-expecting success of 6006.44 '%C(always,...) enables color even without tty': 
-	git log --format=$ALWAYS_COLOR -1 >actual &&
-	has_color actual
-
-ok 44 - %C(always,...) enables color even without tty
-
-expecting success of 6006.45 '%C(auto) respects --color': 
-	git log --color --format="%C(auto)%H" -1 >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
-	test_cmp expect actual
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 133 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
-ok 45 - %C(auto) respects --color
+expecting success of 5510.134 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.46 '%C(auto) respects --no-color': 
-	git log --no-color --format="%C(auto)%H" -1 >actual &&
-	git rev-parse HEAD >expect &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 46 - %C(auto) respects --no-color
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.47 'rev-list %C(auto,...) respects --color': 
-	git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
-		-1 HEAD >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	cat >expect <<-EOF &&
-	commit $(git rev-parse HEAD)
-	<GREEN>foo<RESET>
-	EOF
-	test_cmp expect actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 134 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-ok 47 - rev-list %C(auto,...) respects --color
+expecting success of 5510.135 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.48 'setup complex body': 
-	git config i18n.commitencoding $test_encoding &&
-	echo change2 >foo && git commit -a -F commit-msg &&
-	head3=$(git rev-parse --verify HEAD) &&
-	head3_short=$(git rev-parse --short $head3)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-[main 79c1a11] Test printing of complex bodies
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 48 - setup complex body
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.49 'format complex-encoding': 
-		git rev-list  --pretty=format:'%e' main >output.complex-encoding &&
-		test_cmp expect.complex-encoding output.complex-encoding
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --no-prune &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 49 - format complex-encoding
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 135 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
-expecting success of 6006.50 'format complex-subject': 
-		git rev-list  --pretty=format:'%s' main >output.complex-subject &&
-		test_cmp expect.complex-subject output.complex-subject
-	
-ok 50 - format complex-subject
+expecting success of 5510.136 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.51 'format complex-subject-trunc': 
-		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-trunc &&
-		test_cmp expect.complex-subject-trunc output.complex-subject-trunc
-	
-ok 51 - format complex-subject-trunc
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.52 'format complex-subject-mtrunc': 
-		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-mtrunc &&
-		test_cmp expect.complex-subject-mtrunc output.complex-subject-mtrunc
-	
-ok 52 - format complex-subject-mtrunc
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.53 'format complex-subject-ltrunc': 
-		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-ltrunc &&
-		test_cmp expect.complex-subject-ltrunc output.complex-subject-ltrunc
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 53 - format complex-subject-ltrunc
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 136 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
-expecting success of 6006.54 'setup expected messages (for test %b)': 
-	cat <<-EOF >expected.utf-8 &&
-	commit $head3
-	This commit message is much longer than the others,
-	and it will be encoded in $test_encoding. We should therefore
-	include an ISO8859 character: ¡bueno!
+expecting success of 5510.137 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	commit $head2
-	commit $head1
-	EOF
-	iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 54 - setup expected messages (for test %b)
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.55 'format complex-body': 
-		git rev-list  --pretty=format:'%b' main >output.complex-body &&
-		test_cmp expect.complex-body output.complex-body
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 55 - format complex-body
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 137 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
-expecting success of 6006.56 'format complex-subject-commitencoding-unset': 
-		git rev-list  --pretty=format:'%s' main >output.complex-subject-commitencoding-unset &&
-		test_cmp expect.complex-subject-commitencoding-unset output.complex-subject-commitencoding-unset
-	
-ok 56 - format complex-subject-commitencoding-unset
+expecting success of 5510.138 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.57 'format complex-subject-commitencoding-unset-trunc': 
-		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-commitencoding-unset-trunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-trunc output.complex-subject-commitencoding-unset-trunc
-	
-ok 57 - format complex-subject-commitencoding-unset-trunc
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.58 'format complex-subject-commitencoding-unset-mtrunc': 
-		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-commitencoding-unset-mtrunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-mtrunc output.complex-subject-commitencoding-unset-mtrunc
-	
-ok 58 - format complex-subject-commitencoding-unset-mtrunc
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.59 'format complex-subject-commitencoding-unset-ltrunc': 
-		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-commitencoding-unset-ltrunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-ltrunc output.complex-subject-commitencoding-unset-ltrunc
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
 	
-ok 59 - format complex-subject-commitencoding-unset-ltrunc
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 138 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
-expecting success of 6006.60 'format complex-body-commitencoding-unset': 
-		git rev-list  --pretty=format:'%b' main >output.complex-body-commitencoding-unset &&
-		test_cmp expect.complex-body-commitencoding-unset output.complex-body-commitencoding-unset
-	
-ok 60 - format complex-body-commitencoding-unset
+expecting success of 5510.139 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.61 '%x00 shows NUL': 
-	echo  >expect commit $head3 &&
-	echo >>expect fooQbar &&
-	git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
-	nul_to_q <actual.nul >actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 61 - %x00 shows NUL
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.62 '%ad respects --date=': 
-	echo 2005-04-07 >expect.ad-short &&
-	git log -1 --date=short --pretty=tformat:%ad >output.ad-short main &&
-	test_cmp expect.ad-short output.ad-short
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 139 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
-ok 62 - %ad respects --date=
+expecting success of 5510.140 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.63 'empty email': 
-	test_tick &&
-	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
-	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
-	test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 63 - empty email
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.64 'del LF before empty (1)': 
-	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
-	test_line_count = 2 actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 140 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
 
-ok 64 - del LF before empty (1)
+expecting success of 5510.141 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.65 'del LF before empty (2)': 
-	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
-	test_line_count = 6 actual &&
-	grep "^$" actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 65 - del LF before empty (2)
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 141 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
 
-expecting success of 6006.66 'add LF before non-empty (1)': 
-	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
-	test_line_count = 2 actual
+expecting success of 5510.142 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 66 - add LF before non-empty (1)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6006.67 'add LF before non-empty (2)': 
-	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
-	test_line_count = 6 actual &&
-	grep "^$" actual
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 142 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
 
-ok 67 - add LF before non-empty (2)
+expecting success of 5510.143 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.68 'add SP before non-empty (1)': 
-	git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
-	test $(wc -w <actual) = 3
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 68 - add SP before non-empty (1)
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.69 'add SP before non-empty (2)': 
-	git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
-	test $(wc -w <actual) = 6
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 143 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
 
-ok 69 - add SP before non-empty (2)
+expecting success of 5510.144 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.70 '--abbrev': 
-	echo SHORT SHORT SHORT >expect2 &&
-	echo LONG LONG LONG >expect3 &&
-	git log -1 --format="%h %h %h" HEAD >actual1 &&
-	git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
-	git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
-	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
-	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
-	test_cmp expect2 fuzzy2 &&
-	test_cmp expect3 fuzzy3 &&
-	! test_cmp actual1 actual2
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
---- actual1	2025-02-09 06:54:58.006056722 +0000
-+++ actual2	2025-02-09 06:54:58.010056747 +0000
-@@ -1 +1 @@
--79c1a11 79c1a11 79c1a11
-+79c1a 79c1a 79c1a
-ok 70 - --abbrev
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.71 '%H is not affected by --abbrev-commit': 
-	expected=$(($(test_oid hexsz) + 1)) &&
-	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
-	len=$(wc -c <actual) &&
-	test $len = $expected
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 144 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
 
-ok 71 - %H is not affected by --abbrev-commit
+expecting success of 5510.145 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.72 '%h is not affected by --abbrev-commit': 
-	git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
-	len=$(wc -c <actual) &&
-	test $len = 21
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 72 - %h is not affected by --abbrev-commit
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.73 '"%h %gD: %gs" is same as git-reflog': 
-	git reflog >expect &&
-	git log -g --format="%h %gD: %gs" >actual &&
-	test_cmp expect actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 145 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
 
-ok 73 - "%h %gD: %gs" is same as git-reflog
+expecting success of 5510.146 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.74 '"%h %gD: %gs" is same as git-reflog (with date)': 
-	git reflog --date=raw >expect &&
-	git log -g --format="%h %gD: %gs" --date=raw >actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 74 - "%h %gD: %gs" is same as git-reflog (with date)
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.75 '"%h %gD: %gs" is same as git-reflog (with --abbrev)': 
-	git reflog --abbrev=13 --date=raw >expect &&
-	git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
-	test_cmp expect actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 146 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
 
-ok 75 - "%h %gD: %gs" is same as git-reflog (with --abbrev)
+expecting success of 5510.147 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.76 '%gd shortens ref name': 
-	echo "main@{0}" >expect.gd-short &&
-	git log -g -1 --format=%gd refs/heads/main >actual.gd-short &&
-	test_cmp expect.gd-short actual.gd-short
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 76 - %gd shortens ref name
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.77 'reflog identity': 
-	echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
-	git log -g -1 --format="%gn:%ge" >actual &&
-	test_cmp expect actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 147 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
 
-ok 77 - reflog identity
+expecting success of 5510.148 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.78 'oneline with empty message': 
-	git commit --allow-empty --cleanup=verbatim -m "$LF" &&
-	git commit --allow-empty --allow-empty-message &&
-	git rev-list --oneline HEAD >test.txt &&
-	test_line_count = 5 test.txt &&
-	git rev-list --oneline --graph HEAD >testg.txt &&
-	test_line_count = 5 testg.txt
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-[main 45d198f] 
- Author: A U Thor <author@example.com>
-[main d12d4e0] 
- Author: A U Thor <author@example.com>
-ok 78 - oneline with empty message
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6006.79 'single-character name is parsed correctly': 
-	git commit --author="a <a@example.com>" --allow-empty -m foo &&
-	echo "a <a@example.com>" >expect &&
-	git log -1 --format="%an <%ae>" >actual &&
-	test_cmp expect actual
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 148 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
-[main d066665] foo
- Author: a <a@example.com>
-ok 79 - single-character name is parsed correctly
+expecting success of 5510.149 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6006.80 'unused %G placeholders are passed through': 
-	echo "%GX %G" >expect &&
-	git log -1 --format="%GX %G" >actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 80 - unused %G placeholders are passed through
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-# passed all 80 test(s)
-1..80
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6016-rev-list-graph-simplify-history.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 149 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
-	# 2 commits on branch B, started from A1
-	git checkout -b B A1 &&
-	test_commit B1 foo.txt &&
-	test_commit B2 abc.txt &&
+expecting success of 5510.150 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	# 2 commits on branch C, started from A2
-	git checkout -b C A2 &&
-	test_commit C1 xyz.txt &&
-	test_commit C2 xyz.txt &&
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-	# Octopus merge B and C into branch A
-	git checkout A &&
-	git merge B C -m A4 &&
-	git tag A4 &&
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	test_commit A5 bar.txt &&
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 150 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-	# 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 &&
+expecting success of 5510.151 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	test_commit A7 bar.txt
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-[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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6016.2 '--graph --all': 
-	check_graph --all <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	| * C3
-	* | A5
-	| |
-	|  \
-	*-. | A4
-	|\ \|
-	| | * C2
-	| | * C1
-	| * | B2
-	| * | B1
-	* | | A3
-	| |/
-	|/|
-	* | A2
-	|/
-	* A1
-	EOF
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 151 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-ok 2 - --graph --all
+expecting success of 5510.152 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-Deleted tag 'A4' (was c96d503)
-ok 3 - --graph --simplify-by-decoration
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6016.4 'setup: get rid of decorations on B': 
-	git tag -d B2 &&
-	git tag -d B1 &&
-	git branch -d B
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 152 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
-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 5510.153 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 5 - --graph --simplify-by-decoration prune branch B
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6016.6 '--graph --full-history -- bar.txt': 
-	check_graph --full-history --all -- bar.txt <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* | A5
-	* | A4
-	|\|
-	* | A3
-	|/
-	* A2
-	EOF
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 153 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
 
-ok 6 - --graph --full-history -- bar.txt
+expecting success of 5510.154 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 7 - --graph --full-history --simplify-merges -- bar.txt
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6016.8 '--graph -- bar.txt': 
-	check_graph --all -- bar.txt <<-\EOF
-	* A7
-	* A5
-	* A3
-	| * C4
-	|/
-	* A2
-	EOF
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 154 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-ok 8 - --graph -- bar.txt
+expecting success of 5510.155 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 9 - --graph --sparse -- bar.txt
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6016.10 '--graph ^C4': 
-	check_graph --all ^C4 <<-\EOF
-	* A7
-	* A6
-	* A5
-	*   A4
-	|\
-	| * B2
-	| * B1
-	* A3
-	EOF
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 155 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
 
-ok 10 - --graph ^C4
+expecting success of 5510.156 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6016.11 '--graph ^C3': 
-	check_graph --all ^C3 <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* A5
-	*   A4
-	|\
-	| * B2
-	| * B1
-	* A3
-	EOF
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 11 - --graph ^C3
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 156 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
 
-ok 12 - --graph --boundary ^C3
+expecting success of 5510.157 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6002-rev-list-bisect.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6002-rev-list-bisect/.git/
-expecting success of 6002.1 'bisection diff --bisect l0 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 1 - bisection diff --bisect l0 ^root <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.2 'bisection diff --bisect l1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 2 - bisection diff --bisect l1 ^root <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.3 'bisection diff --bisect l2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 3 - bisection diff --bisect l2 ^root <= 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 157 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
 
-expecting success of 6002.4 'bisection diff --bisect a0 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 4 - bisection diff --bisect a0 ^root <= 0
+expecting success of 5510.158 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.5 'bisection diff --bisect a1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 5 - bisection diff --bisect a1 ^root <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.6 'bisection diff --bisect a2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 6 - bisection diff --bisect a2 ^root <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.7 'bisection diff --bisect a3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 7 - bisection diff --bisect a3 ^root <= 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 158 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-expecting success of 6002.8 'bisection diff --bisect b1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 8 - bisection diff --bisect b1 ^root <= 0
+expecting success of 5510.159 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.9 'bisection diff --bisect b2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 9 - bisection diff --bisect b2 ^root <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.10 'bisection diff --bisect b3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 10 - bisection diff --bisect b3 ^root <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.11 'bisection diff --bisect c1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 11 - bisection diff --bisect c1 ^root <= 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 159 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-expecting success of 6002.12 'bisection diff --bisect c2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 12 - bisection diff --bisect c2 ^root <= 0
+expecting success of 5510.160 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.13 'bisection diff --bisect c3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 13 - bisection diff --bisect c3 ^root <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.14 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
-ok 14 - bisection diff --bisect E ^F <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.15 'bisection diff --bisect e1 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 15 - bisection diff --bisect e1 ^F <= 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 160 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-expecting success of 6002.16 'bisection diff --bisect e2 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 16 - bisection diff --bisect e2 ^F <= 0
+expecting success of 5510.161 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.17 'bisection diff --bisect e3 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 17 - bisection diff --bisect e3 ^F <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.18 'bisection diff --bisect e4 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 18 - bisection diff --bisect e4 ^F <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.19 'bisection diff --bisect e5 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 19 - bisection diff --bisect e5 ^F <= 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 161 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-expecting success of 6002.20 'bisection diff --bisect e6 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 20 - bisection diff --bisect e6 ^F <= 0
+expecting success of 5510.162 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.21 'bisection diff --bisect e7 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 21 - bisection diff --bisect e7 ^F <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.22 'bisection diff --bisect f1 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 22 - bisection diff --bisect f1 ^F <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.23 'bisection diff --bisect f2 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 23 - bisection diff --bisect f2 ^F <= 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 162 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-expecting success of 6002.24 'bisection diff --bisect f3 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 24 - bisection diff --bisect f3 ^F <= 0
+expecting success of 5510.163 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.25 'bisection diff --bisect f4 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 25 - bisection diff --bisect f4 ^F <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.26 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
-ok 26 - bisection diff --bisect E ^F <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.27 'bisection diff --bisect V ^U <= 1': test $_bisect_err -le $_max_diff
-ok 27 - bisection diff --bisect V ^U <= 1
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 163 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
 
-expecting success of 6002.28 'bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0': test $_bisect_err -le $_max_diff
-ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
+expecting success of 5510.164 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.29 'bisection diff --bisect u1 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 29 - bisection diff --bisect u1 ^U <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.30 'bisection diff --bisect u2 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 30 - bisection diff --bisect u2 ^U <= 0
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.31 'bisection diff --bisect u3 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 31 - bisection diff --bisect u3 ^U <= 0
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 164 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
 
-expecting success of 6002.32 'bisection diff --bisect u4 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 32 - bisection diff --bisect u4 ^U <= 0
+expecting success of 5510.165 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.33 'bisection diff --bisect u5 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 33 - bisection diff --bisect u5 ^U <= 0
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.34 '--bisect l5 ^root': check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
-ok 34 - --bisect l5 ^root
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.35 '--bisect l5 ^root ^c3': check_output bisect-l5-root-c3 "git rev-list $_bisect_option l5 ^root ^c3"
-ok 35 - --bisect l5 ^root ^c3
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+ok 165 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
 
-expecting success of 6002.36 '--bisect l5 ^root ^c3 ^b4': check_output bisect-l5-root-c3-b4 "git rev-list $_bisect_option l5 ^c3 ^b4"
-ok 36 - --bisect l5 ^root ^c3 ^b4
+expecting success of 5510.166 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.37 '--bisect l3 ^root ^c3 ^b4': check_output bisect-l3-root-c3-b4 "git rev-list $_bisect_option l3 ^root ^c3 ^b4"
-ok 37 - --bisect l3 ^root ^c3 ^b4
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.38 '--bisect l5 ^b3 ^a3 ^b4 ^a4': check_output bisect-l5-b3-a3-b4-a4 "git rev-list $_bisect_option l3 ^b3 ^a3 ^a4"
-ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.39 '--bisect l4 ^a2 ^a3 ^b ^a4': check_output bisect-l4-a2-a3-b-a4 "git rev-list $_bisect_option l4 ^a2 ^a3 ^a4"
-ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 166 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned
 
-expecting success of 6002.40 '--bisect l3 ^a2 ^a3 ^b ^a4': check_output bisect-l3-a2-a3-b-a4 "git rev-list $_bisect_option l3 ^a2 ^a3 ^a4"
-ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4
+expecting success of 5510.167 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.41 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
-ok 41 - --bisect a4 ^a2 ^a3 ^b4
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.42 '--bisect a4 ^a2 ^a3 ^b4 ^c2': check_output bisect-a4-a2-a3-b4-c2 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2"
-ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.43 '--bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3': check_output bisect-a4-a2-a3-b4-c2-c3 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2 ^c3"
-ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 167 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
-expecting success of 6002.44 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
-ok 44 - --bisect a4 ^a2 ^a3 ^b4
+expecting success of 5510.168 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.45 '--bisect c3 ^a2 ^a3 ^b4 ^c2': check_output bisect-c3-a2-a3-b4-c2 "git rev-list $_bisect_option c3 ^a2 ^a3 ^b4 ^c2"
-ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.46 'set up fake --bisect refs': 
-	git update-ref refs/bisect/bad c3 &&
-	good=$(git rev-parse b1) &&
-	git update-ref refs/bisect/good-$good $good &&
-	good=$(git rev-parse c1) &&
-	git update-ref refs/bisect/good-$good $good
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-ok 46 - set up fake --bisect refs
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 168 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned
 
-expecting success of 6002.47 'rev-list --bisect can default to good/bad refs': 
-	# the only thing between c3 and c1 is c2
-	git rev-parse c2 >expect &&
-	git rev-list --bisect >actual &&
-	test_cmp expect actual
+expecting success of 5510.169 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-ok 47 - rev-list --bisect can default to good/bad refs
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.48 'rev-parse --bisect can default to good/bad refs': 
-	git rev-parse c3 ^b1 ^c1 >expect &&
-	git rev-parse --bisect >actual &&
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	# output order depends on the refnames, which in turn depends on
-	# the exact sha1s. We just want to make sure we have the same set
-	# of lines in any order.
-	sort <expect >expect.sorted &&
-	sort <actual >actual.sorted &&
-	test_cmp expect.sorted actual.sorted
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 169 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned
 
-ok 48 - rev-parse --bisect can default to good/bad refs
+expecting success of 5510.170 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 6002.49 '--bisect --first-parent': check_output bisect-first-parent "git rev-list --bisect --first-parent E ^F"
-ok 49 - --bisect --first-parent
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6002.50 '--first-parent': check_output first-parent "git rev-list --first-parent E ^F"
-ok 50 - --first-parent
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.51 '--bisect-vars --first-parent': check_output bisect-vars-first-parent "git rev-list --bisect-vars --first-parent E ^F"
-ok 51 - --bisect-vars --first-parent
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 170 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned
 
-expecting success of 6002.52 '--bisect-all --first-parent': 
-	cat >expect.unsorted <<-EOF &&
-	$(git rev-parse E) (tag: E, dist=0)
-	$(git rev-parse e1) (tag: e1, dist=1)
-	$(git rev-parse e2) (tag: e2, dist=2)
-	$(git rev-parse e3) (tag: e3, dist=3)
-	$(git rev-parse e4) (tag: e4, dist=4)
-	$(git rev-parse e5) (tag: e5, dist=4)
-	$(git rev-parse e6) (tag: e6, dist=3)
-	$(git rev-parse e7) (tag: e7, dist=2)
-	$(git rev-parse e8) (tag: e8, dist=1)
-	EOF
+expecting success of 5510.171 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	# expect results to be ordered by distance (descending),
-	# commit hash (ascending)
-	sort -k4,4r -k1,1 expect.unsorted >expect &&
-	git rev-list --bisect-all --first-parent E ^F >actual &&
-	test_cmp expect actual
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-ok 52 - --bisect-all --first-parent
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6002.53 '--bisect without any revisions': 
-	git rev-list --bisect HEAD..HEAD >out &&
-	test_must_be_empty out
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 171 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned
 
-ok 53 - --bisect without any revisions
+expecting success of 5510.172 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-# passed all 53 test(s)
-1..53
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6003-rev-list-topo-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
-ok 2 - simple topo order
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
-ok 3 - simple date order
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 172 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned
 
-expecting success of 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 5510.173 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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)
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-expecting success of 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
-ok 6 - multiple heads
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 173 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned
 
-expecting success of 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 5510.174 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6003.11 'prune near topo': check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
-ok 11 - prune near topo
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 174 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
 
-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 5510.175 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 175 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
 
-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 5510.176 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 176 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
 
-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 5510.177 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 177 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
 
-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 5510.178 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 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
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 178 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned
 
-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 5510.179 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-expecting success of 6003.31 'head ^head --topo-order': git rev-list --topo-order  a3 ^a3
-ok 31 - head ^head --topo-order
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 179 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned
 
-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 5510.180 'remove remote.origin.fetch "one"': 
+	(
+		cd one &&
+		git config --unset-all remote.origin.fetch
+	)
 
-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)
+ok 180 - remove remote.origin.fetch "one"
 
-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 5510.181 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-expecting success of 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
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-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
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-# passed all 36 test(s)
-1..36
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6009-rev-list-parent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6009-rev-list-parent/.git/
-expecting success of 6009.1 'setup': 
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+ * branch            main       -> FETCH_HEAD
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 181 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
-	touch file &&
-	git add file &&
+expecting success of 5510.182 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
 
-	test_commit one &&
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
 
-	test_tick=$(($test_tick - 2400)) &&
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+Deleted branch newbranch (was b4eae8a).
+Deleted tag 'newtag' (was b4eae8a)
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+b4eae8a1c2baba90c41b436d5796ef43ea5df434
+fatal: Needed a single revision
+ok 182 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
-	git log --pretty=oneline --abbrev-commit
+expecting success of 5510.183 'all boundary commits are excluded': 
+	test_commit base &&
+	test_commit oneside &&
+	git checkout HEAD^ &&
+	test_commit otherside &&
+	git checkout main &&
+	test_tick &&
+	git merge otherside &&
+	ad=$(git log --no-walk --format=%ad HEAD) &&
+	git bundle create twoside-boundary.bdl main --since="$ad" &&
+	test_bundle_object_count --thin twoside-boundary.bdl 3
 
-[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
+[main dc1ab9d] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[main 0906875] four
+ create mode 100644 base.t
+[main 9ab9525] oneside
  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
+ create mode 100644 oneside.t
+Note: switching to 'HEAD^'.
 
-expecting success of 6009.2 'one is ancestor of others and should not be shown': 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git rev-list one --not four >result &&
-	test_must_be_empty result
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
+  git switch -c <new-branch-name>
 
-ok 2 - one is ancestor of others and should not be shown
+Or undo this operation with:
 
-expecting success of 6009.3 'setup roots, merges and octopuses': 
+  git switch -
 
-	git checkout --orphan newroot &&
-	test_commit five &&
-	git checkout -b sidebranch two &&
-	test_commit six &&
-	git checkout -b anotherbranch three &&
-	test_commit seven &&
-	git checkout -b yetanotherbranch four &&
-	test_commit eight &&
-	git checkout main &&
-	test_tick &&
-	git merge --allow-unrelated-histories -m normalmerge newroot &&
-	git tag normalmerge &&
-	test_tick &&
-	git merge -m tripus sidebranch anotherbranch &&
-	git tag tripus &&
-	git checkout -b tetrabranch normalmerge &&
-	test_tick &&
-	git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
-	git tag tetrapus &&
-	git checkout main
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Switched to a new branch 'newroot'
-[newroot (root-commit) 04238a1] five
- Author: A U Thor <author@example.com>
- 6 files changed, 5 insertions(+)
- create mode 100644 file
- create mode 100644 five.t
- create mode 100644 four.t
- create mode 100644 one.t
- create mode 100644 three.t
- create mode 100644 two.t
-Switched to a new branch 'sidebranch'
-[sidebranch e29a44f] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-Switched to a new branch 'anotherbranch'
-[anotherbranch f863663] seven
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 seven.t
-Switched to a new branch 'yetanotherbranch'
-[yetanotherbranch 3e13a02] eight
+HEAD is now at dc1ab9d base
+[detached HEAD 5c45805] otherside
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 eight.t
+ create mode 100644 otherside.t
+Previous HEAD position was 5c45805 otherside
 Switched to branch 'main'
+Your branch is based on 'one/main_not', but the upstream is gone.
+  (use "git branch --unset-upstream" to fixup)
 Merge made by the 'ort' strategy.
- five.t | 1 +
+ otherside.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': 
+ create mode 100644 otherside.t
+pack	fe30107d3d1ce0764ae8d8193ffe6b4c2fd3f327
+ok 183 - all boundary commits are excluded
 
-	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
-	check_revlist "--merges" tetrapus tripus normalmerge
+expecting success of 5510.184 'fetch --prune prints the remotes url': 
+	git branch goodbye &&
+	git clone . only-prunes &&
+	git branch -D goodbye &&
+	(
+		cd only-prunes &&
+		git fetch --prune origin 2>&1 | head -n1 >../actual
+	) &&
+	echo "From ${D}/." >expect &&
+	test_cmp expect actual
 
-ok 9 - rev-list merges
+Cloning into 'only-prunes'...
+done.
+Deleted branch goodbye (was a008302).
+ok 184 - fetch --prune prints the remotes url
 
-expecting success of 6009.10 'rev-list octopus': 
+expecting success of 5510.185 'branchname D/F conflict resolved by --prune': 
+	git branch dir/file &&
+	git clone . prune-df-conflict &&
+	git branch -D dir/file &&
+	git branch dir &&
+	(
+		cd prune-df-conflict &&
+		git fetch --prune &&
+		git rev-parse origin/dir >../actual
+	) &&
+	git rev-parse dir >expect &&
+	test_cmp expect actual
 
-	check_revlist "--min-parents=3" tetrapus tripus
+Cloning into 'prune-df-conflict'...
+done.
+Deleted branch dir/file (was a008302).
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/dir/file
+ * [new branch]      dir        -> origin/dir
+ok 185 - branchname D/F conflict resolved by --prune
 
-ok 10 - rev-list octopus
+expecting success of 5510.186 'branchname D/F conflict rejected with targeted error message': 
+	git clone . df-conflict-error &&
+	git branch dir_conflict &&
+	(
+		cd df-conflict-error &&
+		git update-ref refs/remotes/origin/dir_conflict/file HEAD &&
+		test_must_fail git fetch 2>err &&
+		test_grep "error: some local refs could not be updated; try running" err &&
+		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err &&
+		git pack-refs --all &&
+		test_must_fail git fetch 2>err-packed &&
+		test_grep "error: some local refs could not be updated; try running" err-packed &&
+		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err-packed
+	)
 
-expecting success of 6009.11 'rev-list ordinary commits': 
+Cloning into 'df-conflict-error'...
+done.
+error: some local refs could not be updated; try running
+ 'git remote prune origin' to remove any old, conflicting branches
+error: some local refs could not be updated; try running
+ 'git remote prune origin' to remove any old, conflicting branches
+ok 186 - branchname D/F conflict rejected with targeted error message
 
-	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
+expecting success of 5510.187 'fetching a one-level ref works': 
+	test_commit extra &&
+	git reset --hard HEAD^ &&
+	git update-ref refs/foo extra &&
+	git init one-level &&
+	(
+		cd one-level &&
+		git fetch .. HEAD refs/foo
+	)
 
-ok 11 - rev-list ordinary commits
+[main 445a4b6] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+HEAD is now at a008302 Merge tag 'otherside'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/one-level/.git/
+From ..
+ * branch            HEAD       -> FETCH_HEAD
+ * branch            refs/foo   -> FETCH_HEAD
+ok 187 - fetching a one-level ref works
 
-expecting success of 6009.12 'rev-list --merges --no-merges yields empty set': 
+expecting success of 5510.188 'fetching with auto-gc does not lock up': 
+	write_script askyesno <<-\EOF &&
+	echo "$*" &&
+	false
+	EOF
+	git clone "file://$D" auto-gc &&
+	test_commit test2 &&
+	(
+		cd auto-gc &&
+		git config fetch.unpackLimit 1 &&
+		git config gc.autoPackLimit 1 &&
+		git config gc.autoDetach false &&
+		GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
+		test_grep "Auto packing the repository" fetch.out &&
+		! grep "Should I try again" fetch.out
+	)
 
-	check_revlist "--min-parents=2 --no-merges" &&
-	check_revlist "--merges --no-merges" &&
-	check_revlist "--no-merges --merges"
+Cloning into 'auto-gc'...
+[main d0a2253] test2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test2.t
+Auto packing the repository for optimum performance.
+ok 188 - fetching with auto-gc does not lock up
 
-ok 12 - rev-list --merges --no-merges yields empty set
+expecting success of 5510.189 'fetch.hideRefs affects connectivity check': 
+		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
+			$section.hideRefs="!refs/tags/" fetch &&
+		grep "git rev-list .*--exclude-hidden=fetch" trace
+	
+trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+ok 189 - fetch.hideRefs affects connectivity check
 
-expecting success of 6009.13 'rev-list override and infinities': 
+expecting success of 5510.190 'transfer.hideRefs affects connectivity check': 
+		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
+			$section.hideRefs="!refs/tags/" fetch &&
+		grep "git rev-list .*--exclude-hidden=fetch" trace
+	
+trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
+ok 190 - transfer.hideRefs affects connectivity check
 
-	check_revlist "--min-parents=2 --max-parents=1 --max-parents=3" tripus normalmerge &&
-	check_revlist "--min-parents=1 --min-parents=2 --max-parents=7" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --max-parents=8" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --max-parents=-1" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --no-max-parents" tetrapus tripus normalmerge &&
-	check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five
+expecting success of 5510.191 'prepare source branch': 
+	echo one >onebranch &&
+	git checkout --orphan onebranch &&
+	git rm --cached -r . &&
+	git add onebranch &&
+	git commit -m onebranch &&
+	git rev-list --objects onebranch -- >actual &&
+	# 3 objects should be created, at least ...
+	test 3 -le $(wc -l <actual)
 
-ok 13 - rev-list override and infinities
+Switched to a new branch 'onebranch'
+rm 'base.t'
+rm 'file'
+rm 'file2'
+rm 'oneside.t'
+rm 'otherside.t'
+rm 'test2.t'
+[onebranch (root-commit) 609ade1] onebranch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 onebranch
+ok 191 - prepare source branch
 
-expecting success of 6009.14 'dodecapus': 
+expecting success of 5510.192 'fetch trumps transfer limit': 
+		rm -fr dest &&
+		git --bare init dest &&
+		git -C dest config fetch.unpacklimit $fetch_limit &&
+		git -C dest config transfer.unpacklimit $transfer_limit &&
+		git -C dest fetch .. onebranch &&
+		validate_store_type
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/dest/
+From ..
+ * branch            onebranch  -> FETCH_HEAD
+count: 0
+ok 192 - fetch trumps transfer limit
 
-	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 &&
+expecting success of 5510.193 'fetch trumps transfer limit': 
+		rm -fr dest &&
+		git --bare init dest &&
+		git -C dest config fetch.unpacklimit $fetch_limit &&
+		git -C dest config transfer.unpacklimit $transfer_limit &&
+		git -C dest fetch .. onebranch &&
+		validate_store_type
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/dest/
+From ..
+ * branch            onebranch  -> FETCH_HEAD
+packs: 0
+ok 193 - fetch trumps transfer limit
 
-	check_revlist "--min-parents=4" dodecapus tetrapus &&
-	check_revlist "--min-parents=8" dodecapus &&
-	check_revlist "--min-parents=12" dodecapus &&
-	check_revlist "--min-parents=13" &&
-	check_revlist "--min-parents=4 --max-parents=11" tetrapus
+expecting success of 5510.194 '--negotiation-tip limits "have" lines sent': 
+	setup_negotiation_tip server server 0 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
+		origin alpha_s beta_s &&
+	check_negotiation_tip
 
-Switched to a new branch 'root1'
-[root1 9562ee3] 1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) facd226] alpha_1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to a new branch 'root2'
-[root2 1779fe6] 2
+ create mode 100644 alpha_1.t
+[main f31e7ad] alpha_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to a new branch 'root3'
-[root3 cc9911e] 3
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) 754b9c2] beta_1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to a new branch 'root4'
-[root4 35b702f] 4
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta c202648] beta_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Switched to a new branch 'root5'
-[root5 c532809] 5
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta 0e40751] beta_s
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 5.t
-Switched to a new branch 'root6'
-[root6 f4a589f] 6
+ create mode 100644 beta_s.t
+Switched to branch 'main'
+[main 2c3426a] alpha_s
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 6.t
-Switched to a new branch 'root7'
-[root7 4f77507] 7
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was facd226)
+Deleted tag 'alpha_2' (was f31e7ad)
+Deleted tag 'beta_1' (was 754b9c2)
+Deleted tag 'beta_2' (was c202648)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server
+ * tag               alpha_s    -> FETCH_HEAD
+ * tag               beta_s     -> FETCH_HEAD
+packet:        fetch> have facd2269ff2b5eb30cddd3d918ecf236d8f8298a
+packet:        fetch> have 754b9c2db9900588a06477b6d65461d82e960d37
+ok 194 - --negotiation-tip limits "have" lines sent
+
+expecting success of 5510.195 '--negotiation-tip understands globs': 
+	setup_negotiation_tip server server 0 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--negotiation-tip=*_1 \
+		origin alpha_s beta_s &&
+	check_negotiation_tip
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) a849d09] alpha_1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 7.t
-Switched to a new branch 'root8'
-[root8 e4dbc7d] 8
+ create mode 100644 alpha_1.t
+[main 9c9efb3] alpha_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 8.t
-Switched to a new branch 'root9'
-[root9 446b36e] 9
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) dfcc514] beta_1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-Switched to a new branch 'root10'
-[root10 120147b] 10
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta a75b0f1] beta_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 10.t
-Switched to a new branch 'root11'
-[root11 ce99f6d] 11
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta a144366] beta_s
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 11.t
+ create mode 100644 beta_s.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
+[main 1f3e2f1] alpha_s
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 t2.t
-[main 17e63bf] t3
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was a849d09)
+Deleted tag 'alpha_2' (was 9c9efb3)
+Deleted tag 'beta_1' (was dfcc514)
+Deleted tag 'beta_2' (was a75b0f1)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server
+ * tag               alpha_s    -> FETCH_HEAD
+ * tag               beta_s     -> FETCH_HEAD
+packet:        fetch> have a849d093bd04034e02b320b915812e2e739a6e71
+packet:        fetch> have dfcc514b92ea54d0eec2fdc71577e40710161dd5
+ok 195 - --negotiation-tip understands globs
+
+expecting success of 5510.196 '--negotiation-tip understands abbreviated SHA-1': 
+	setup_negotiation_tip server server 0 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--negotiation-tip=$(git -C client rev-parse --short alpha_1) \
+		--negotiation-tip=$(git -C client rev-parse --short beta_1) \
+		origin alpha_s beta_s &&
+	check_negotiation_tip
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) 91c1c9f] alpha_1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 t3.t
-[main 47d7b66] t4
+ create mode 100644 alpha_1.t
+[main e0da29d] alpha_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 t4.t
-[main a42aaab] t5
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) dcd8861] beta_1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t5.t
-[main aebfe15] t6
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta 012e63c] beta_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 t6.t
-[main 7cfb595] t7
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta a6cc847] beta_s
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 t7.t
-[main fea5200] t8
+ create mode 100644 beta_s.t
+Switched to branch 'main'
+[main 60cc95d] alpha_s
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6010-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was 91c1c9f)
+Deleted tag 'alpha_2' (was e0da29d)
+Deleted tag 'beta_1' (was dcd8861)
+Deleted tag 'beta_2' (was 012e63c)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server
+ * tag               alpha_s    -> FETCH_HEAD
+ * tag               beta_s     -> FETCH_HEAD
+packet:        fetch> have 91c1c9ff43e3e8c21c626f9d53f98fd98b41a1bc
+packet:        fetch> have dcd8861f9d94ce1c6e0f4e6bc6980e72c660e839
+ok 196 - --negotiation-tip understands abbreviated SHA-1
 
-	test_commit MMR &&
-	test_commit MM1 &&
-	test_commit MM-o &&
-	test_commit MM-p &&
-	test_commit MM-q &&
-	test_commit MMA &&
-	git checkout MM1 &&
-	test_commit MM-r &&
-	test_commit MM-s &&
-	test_commit MM-t &&
-	test_commit MMB &&
-	git checkout MMR &&
-	test_commit MM-u &&
-	test_commit MM-v &&
-	test_commit MM-w &&
-	test_commit MM-x &&
-	test_commit MMC
+expecting success of 5510.197 '--negotiation-tip rejects missing OIDs': 
+	setup_negotiation_tip server server 0 &&
+	test_must_fail git -C client fetch \
+		--negotiation-tip=alpha_1 \
+		--negotiation-tip=$(test_oid zero) \
+		origin alpha_s beta_s 2>err &&
+	cat >fatal-expect <<-EOF &&
+	fatal: the object $(test_oid zero) does not exist
+EOF
+	grep fatal: err >fatal-actual &&
+	test_cmp fatal-expect fatal-actual
 
-[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>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
+[main (root-commit) 8158d9a] alpha_1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 MM1.t
-[master 4d5fde5] MM-o
- Author: A U Thor <git@au.thor.xz>
+ create mode 100644 alpha_1.t
+[main 159269a] alpha_2
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 MM-o.t
-[master ca22c18] MM-p
- Author: A U Thor <git@au.thor.xz>
+ create mode 100644 alpha_2.t
+Switched to a new branch 'beta'
+[beta (root-commit) ab9489d] beta_1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 alpha_1.t
+ create mode 100644 alpha_2.t
+ create mode 100644 beta_1.t
+[beta 66378fb] beta_2
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 MM-p.t
-[master 2659ed6] MM-q
- Author: A U Thor <git@au.thor.xz>
+ create mode 100644 beta_2.t
+Cloning into 'client'...
+done.
+[beta 5c64d87] beta_s
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 MM-q.t
-[master fdb9a8f] MMA
- Author: A U Thor <git@au.thor.xz>
+ create mode 100644 beta_s.t
+Switched to branch 'main'
+[main 92cb688] alpha_s
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 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>
+ create mode 100644 alpha_s.t
+Deleted tag 'alpha_1' (was 8158d9a)
+Deleted tag 'alpha_2' (was 159269a)
+Deleted tag 'beta_1' (was ab9489d)
+Deleted tag 'beta_2' (was 66378fb)
+ok 197 - --negotiation-tip rejects missing OIDs
 
-Or undo this operation with:
+checking prerequisite: SYMLINKS
 
-  git switch -
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-Turn off this advice by setting config variable advice.detachedHead to false
+)
+prerequisite SYMLINKS ok
+expecting success of 5510.198 'clone does not get confused by a D/F conflict': 
+	git init df-conflict &&
+	(
+		cd df-conflict &&
+		ln -s .git a &&
+		git add a &&
+		test_tick &&
+		git commit -m symlink &&
+		test_commit a- &&
+		rm a &&
+		mkdir -p a/hooks &&
+		write_script a/hooks/post-checkout <<-EOF &&
+		echo WHOOPSIE >&2
+		echo whoopsie >"$TRASH_DIRECTORY"/whoops
+		EOF
+		git add a/hooks/post-checkout &&
+		test_tick &&
+		git commit -m post-checkout
+	) &&
+	git clone df-conflict clone 2>err &&
+	test_grep ! WHOOPS err &&
+	test_path_is_missing whoops
 
-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>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/df-conflict/.git/
+[master (root-commit) ca09cd7] symlink
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 MM-x.t
-[detached HEAD 03ab457] MMC
- Author: A U Thor <git@au.thor.xz>
+ create mode 120000 a
+[master 6b77001] a-
+ Author: A U Thor <author@example.com>
  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 &&
+ create mode 100644 a-.t
+[master 32a5d28] post-checkout
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ delete mode 120000 a
+ create mode 100755 a/hooks/post-checkout
+ok 198 - clone does not get confused by a D/F conflict
 
-	test_cmp expected actual &&
-	test_cmp expected.sb actual.common &&
-	test_cmp expected.sb actual.sb
+checking prerequisite: NOT_ROOT
 
-ok 8 - merge-base A B C
+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 6010.9 'criss-cross merge-base for octopus-step': 
-	git reset --hard MMR &&
-	test_commit CC1 &&
-	git reset --hard E &&
-	test_commit CC2 &&
+)
+prerequisite NOT_ROOT ok
+# passed all 198 test(s)
+# SKIP no web server found at ''
+1..198
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6008-rev-list-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6008-rev-list-submodule/.git/
+expecting success of 6008.1 'setup': 
+	: > file &&
+	git add file &&
 	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 commit -m initial &&
+	echo 1 > file &&
+	test_tick &&
+	git commit -m second file &&
+	echo 2 > file &&
+	test_tick &&
+	git commit -m third file &&
 
-	git rev-parse CC1 CC2 >expected &&
-	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
+	rm .git/index &&
 
-	sort expected >expected.sorted &&
-	sort actual >actual.sorted &&
-	test_cmp expected.sorted actual.sorted
+	: > super-file &&
+	git add super-file &&
+	git -c protocol.file.allow=always submodule add "$(pwd)" sub &&
+	git symbolic-ref HEAD refs/heads/super &&
+	test_tick &&
+	git commit -m super-initial &&
+	echo 1 > super-file &&
+	test_tick &&
+	git commit -m super-first super-file &&
+	echo 2 > super-file &&
+	test_tick &&
+	git commit -m super-second super-file
 
-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>
+[main (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main 534ad2c] second
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- 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>
+[main 1795412] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6008-rev-list-submodule/sub'...
+done.
+[super (root-commit) ad903ae] super-initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 100644 super-file
+[super 9c430fe] super-first
+ Author: A U Thor <author@example.com>
  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
+[super 4444afb] super-second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-e34970abbab4461223052769885c56a229ee9299
-ok 11 - --fork-point works with empty reflog
+expecting success of 6008.2 'Ilari's test': 
+	git rev-list --objects super main ^super^
 
-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
+4444afba0d3caeab587f2f0f9ebab070a9ef0b95
+17954123b4d2a45f7e0fec2fea14972db2b90a1f
+534ad2c6e7b5b68dcaa4f008327c6c2ab1fa47ff
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a
+8cc8a696a786656a0570c911f7e2cb839121c97b 
+0cfbf08886fca9a91cb753ec8734c84fcbe52c9f super-file
+d9cc608eedd5d2cc63c262272b7a0f6ab6aed5dd 
+f27c6ae26adb8396d3861976ba268f87ad8afa0b 
+df2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file
+ok 2 - Ilari's test
 
-[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 +
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6011-rev-list-with-bad-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6011-rev-list-with-bad-commit/.git/
+expecting success of 6011.1 'setup': 
+   git init &&
+   git config core.compression 0 &&
+   git config core.logallrefupdates false &&
+   echo "foo" > foo &&
+   git add foo &&
+   git commit -m "first commit" &&
+   echo "bar" > bar &&
+   git add bar &&
+   git commit -m "second commit" &&
+   echo "baz" > baz &&
+   git add baz &&
+   git commit -m "third commit" &&
+   echo "foo again" >> foo &&
+   git add foo &&
+   git commit -m "fourth commit" &&
+   git repack -a -f -d
+   
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6011-rev-list-with-bad-commit/.git/
+[master (root-commit) 1e22a2b] first commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JB.t
-Merge made by the 'ort' strategy.
- JC.t | 1 +
+ create mode 100644 foo
+[master 869767e] second commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JC.t
-HEAD is now at 3782338 J
-[derived dc142e3] JTEMP3
- Author: A U Thor <git@au.thor.xz>
+ create mode 100644 bar
+[master 53fc376] third commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JTEMP3.t
-Merge made by the 'ort' strategy.
- JC.t | 1 +
+ create mode 100644 baz
+[master 59070cc] fourth commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JC.t
-ok 12 - merge-base --octopus --all for complex tree
+ok 1 - setup
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6012-rev-list-simplify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6012-rev-list-simplify/.git/
-expecting success of 6012.1 'setup': 
-	echo "Hi there" >file &&
-	echo "initial" >lost &&
-	git add file lost &&
-	test_tick && git commit -m "Initial file and lost" &&
-	note A &&
+expecting success of 6011.2 'verify number of revisions': 
+   revs=$(git rev-list --all | wc -l) &&
+   test $revs -eq 4 &&
+   first_commit=$(git rev-parse HEAD~3)
+   
+ok 2 - verify number of revisions
 
-	git branch other-branch &&
+expecting success of 6011.3 'corrupt second commit object': 
+   perl -i.bak -pe "s/second commit/socond commit/" .git/objects/pack/*.pack &&
+   test_must_fail git fsck --full
+   
+error: .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack pack checksum mismatch
+error: index CRC mismatch for object 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
+error: inflate: data stream error (incorrect data check)
+error: cannot unpack 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
+dangling tree 89ff1a2aefcbff0f09197f0fd8beeb19a7b6e51c
+dangling commit 1e22a2b921014905366810d999b3d3a3e9514320
+ok 3 - corrupt second commit object
 
-	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 &&
+expecting success of 6011.4 'rev-list should fail': 
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null
 
-	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 &&
+error: inflate: data stream error (incorrect data check)
+error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
+fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
+ok 4 - rev-list should fail
 
-	git checkout other-branch &&
+expecting success of 6011.5 'git repack _MUST_ fail': 
+   test_must_fail git repack -a -f -d
+   
+error: inflate: data stream error (incorrect data check)
+error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
+fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
+ok 5 - git repack _MUST_ fail
 
-	echo "Hello" >file &&
-	>lost &&
-	git add file lost &&
-	test_tick && git commit -m "Modified the file identically" &&
-	note C &&
+expecting success of 6011.6 'first commit is still available': 
+   git log $first_commit
+   
+commit 1e22a2b921014905366810d999b3d3a3e9514320
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-	echo "This is a stupid example" >another-file &&
-	git add another-file &&
-	test_tick && git commit -m "Add another file" &&
-	note D &&
+    first commit
+ok 6 - first commit is still available
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6007-rev-list-cherry-pick-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6007-rev-list-cherry-pick-file/.git/
+expecting success of 6007.1 'setup': 
+	echo Hallo > foo &&
+	git add foo &&
 	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 commit -m "A" &&
+	git tag A &&
+	git checkout -b branch &&
+	echo Bello > foo &&
+	echo Cello > bar &&
+	git add foo bar &&
+	test_tick &&
+	git commit -m "C" &&
+	git tag C &&
+	echo Dello > bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m "E" &&
+	git tag E &&
 	git checkout main &&
-	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
+	git checkout branch foo &&
+	test_tick &&
+	git commit -m "B" &&
+	git tag B &&
+	echo Cello > bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m "D" &&
+	git tag D &&
+	echo Nello > bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m "F" &&
+	git tag F
 
-[main (root-commit) 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
+[main (root-commit) 87a5b85] A
  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
+ create mode 100644 foo
+Switched to a new branch 'branch'
+[branch d81b112] C
  Author: A U Thor <author@example.com>
-[other-branch f67ebfb] Irrelevant change
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 bar
+[branch 50f946e] E
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 elif
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 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
+Updated 1 path from 75417d5
+[main 9e00a87] B
  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 +
+[main 9c68531] D
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 side
-[main 1be1b21] Last
+ create mode 100644 bar
+[main 555ccf5] F
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 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 6007.2 '--left-right': 
+	git rev-list --left-right B...C > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-expecting success of 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
+ok 2 - --left-right
 
-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 6007.3 '--count': 
+	git rev-list --count B...C > actual &&
+	test "$(cat actual)" = 2
 
-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
+ok 3 - --count
 
-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 6007.4 '--cherry-pick foo comes up empty': 
+	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
 
-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
+ok 4 - --cherry-pick foo comes up empty
 
-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 6007.5 '--cherry-pick bar does not come up empty': 
+	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-expecting success of 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
+ok 5 - --cherry-pick bar does not come up empty
 
-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 6007.6 'bar does not come up empty': 
+	git rev-list --left-right B...C -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-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
+ok 6 - bar does not come up empty
 
-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 6007.7 '--cherry-pick bar does not come up empty (II)': 
+	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-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
+ok 7 - --cherry-pick bar does not come up empty (II)
 
-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 6007.8 'name-rev multiple --refs combine inclusive': 
+	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
 
-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
+ok 8 - name-rev multiple --refs combine inclusive
 
-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 6007.9 'name-rev --refs excludes non-matched patterns': 
+	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
+	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
 
-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
+ok 9 - name-rev --refs excludes non-matched patterns
 
-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 6007.10 'name-rev --exclude excludes matched patterns': 
+	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
+	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" --exclude="*E" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
 
-expecting success of 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
+ok 10 - name-rev --exclude excludes matched patterns
 
-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 6007.11 'name-rev --no-refs clears the refs list': 
+	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
+		<expect >actual &&
+	test_cmp expect actual
 
-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
+ok 11 - name-rev --no-refs clears the refs list
 
-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
+expecting success of 6007.12 '--cherry-mark': 
+	git rev-list --cherry-mark F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-ok 27 - full history simplification without parent
+ok 12 - --cherry-mark
 
-expecting success of 6012.28 '--full-diff is not affected by --parents': 
-	git log -p --pretty="%H" --full-diff -- file >expected &&
-	git log -p --pretty="%H" --full-diff --parents -- file >actual &&
-	test_cmp expected actual
+expecting success of 6007.13 '--cherry-mark --left-right': 
+	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-ok 28 - --full-diff is not affected by --parents
+ok 13 - --cherry-mark --left-right
 
-expecting success of 6012.29 'setup rebuild repo': 
-	rm -rf .git * &&
-	git init &&
-	git switch -c topic &&
+expecting success of 6007.14 '--cherry-pick --right-only': 
+	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	echo base >file &&
-	git add file &&
-	test_commit I &&
+ok 14 - --cherry-pick --right-only
 
-	echo A >file &&
-	git add file &&
-	test_commit A &&
+expecting success of 6007.15 '--cherry-pick --left-only': 
+	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	git switch -c branchB I &&
-	echo B >file &&
-	git add file &&
-	test_commit B &&
+ok 15 - --cherry-pick --left-only
 
-	git switch topic &&
-	test_must_fail git merge -m "M" B &&
-	echo A >file &&
-	echo B >>file &&
-	git add file &&
-	git merge --continue &&
-	note M &&
+expecting success of 6007.16 '--cherry': 
+	git rev-list --cherry F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	echo C >other &&
-	git add other &&
-	test_commit C &&
+ok 16 - --cherry
 
-	git switch -c branchX I &&
-	echo X >file &&
-	git add file &&
-	test_commit X &&
+expecting success of 6007.17 '--cherry --count': 
+	git rev-list --cherry --count F...E -- bar > actual &&
+	test_cmp expect actual
 
-	git switch -c branchR M &&
-	git merge -m R -Xtheirs X &&
-	note R &&
+ok 17 - --cherry --count
 
-	git switch topic &&
-	git merge -m N R &&
-	note N &&
+expecting success of 6007.18 '--cherry-mark --count': 
+	git rev-list --cherry-mark --count F...E -- bar > actual &&
+	test_cmp expect actual
 
-	git switch -c branchY M &&
-	echo Y >y &&
-	git add y &&
-	test_commit Y &&
+ok 18 - --cherry-mark --count
 
-	git switch -c branchZ C &&
-	echo Z >z &&
-	git add z &&
-	test_commit Z &&
+expecting success of 6007.19 '--cherry-mark --left-right --count': 
+	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
+	test_cmp expect actual
 
-	git switch topic &&
-	git merge -m O Z &&
-	note O &&
+ok 19 - --cherry-mark --left-right --count
 
-	git merge -m P Y &&
-	note P
+expecting success of 6007.20 '--cherry-pick with independent, but identical branches': 
+	git symbolic-ref HEAD refs/heads/independent &&
+	rm .git/index &&
+	echo Hallo > foo &&
+	git add foo &&
+	test_tick &&
+	git commit -m "independent" &&
+	echo Bello > foo &&
+	test_tick &&
+	git commit -m "independent, too" foo &&
+	test -z "$(git rev-list --left-right --cherry-pick \
+		HEAD...main -- foo)"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6012-rev-list-simplify/.git/
-Switched to a new branch 'topic'
-[topic (root-commit) 8df680a] I
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 I.t
- create mode 100644 file
-[topic 93fcd66] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 A.t
-Switched to a new branch 'branchB'
-[branchB 2bc7954] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B.t
-Switched to branch 'topic'
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-[topic 58a754c] M
- Author: A U Thor <author@example.com>
-[topic f73bd6d] C
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 C.t
- create mode 100644 other
-Switched to a new branch 'branchX'
-[branchX a2f4788] X
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 X.t
-Switched to a new branch 'branchR'
-Auto-merging file
-Merge made by the 'ort' strategy.
- X.t  | 1 +
- file | 3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 X.t
-Switched to branch 'topic'
-Merge made by the 'ort' strategy.
- X.t  | 1 +
- file | 3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 X.t
-Switched to a new branch 'branchY'
-[branchY 85e7a8e] Y
+[independent (root-commit) 5da548c] independent
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 Y.t
- create mode 100644 y
-Switched to a new branch 'branchZ'
-[branchZ 35501c2] Z
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[independent de095d9] independent, too
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 Z.t
- create mode 100644 z
-Switched to branch 'topic'
-Merge made by the 'ort' strategy.
- Z.t | 1 +
- z   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 Z.t
- create mode 100644 z
-Merge made by the 'ort' strategy.
- Y.t | 1 +
- y   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 Y.t
- create mode 100644 y
-ok 29 - setup rebuild repo
-
-expecting success of 6012.30 'log -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 30 - log -- file
-
-expecting success of 6012.31 'log --show-pulls -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 31 - log --show-pulls -- file
-
-expecting success of 6012.32 'log --full-history --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 32 - log --full-history --topo-order -- file
-
-expecting success of 6012.33 'log --simplify-merges --topo-order --show-pulls -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 33 - log --simplify-merges --topo-order --show-pulls -- file
-
-expecting success of 6012.34 'log --simplify-merges --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 34 - log --simplify-merges --topo-order -- file
-
-expecting success of 6012.35 'log --first-parent -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 35 - log --first-parent -- file
-
-expecting success of 6012.36 'log --first-parent --show-pulls -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 36 - log --first-parent --show-pulls -- file
-
-expecting success of 6012.37 'log --topo-order --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 37 - log --topo-order --ancestry-path A..HEAD -- file
-
-expecting success of 6012.38 'log --topo-order --show-pulls --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 38 - log --topo-order --show-pulls --ancestry-path A..HEAD -- file
-
-expecting success of 6012.39 'log --topo-order --full-history --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 39 - log --topo-order --full-history --ancestry-path A..HEAD -- file
-
-expecting success of 6012.40 'log --topo-order --simplify-merges --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 40 - log --topo-order --simplify-merges --ancestry-path A..HEAD -- file
-
-expecting success of 6012.41 'log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 41 - log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 20 - --cherry-pick with independent, but identical branches
 
-expecting success of 6012.42 'log --graph --simplify-merges --show-pulls': 
-	cat >expect <<-\EOF &&
-	* N
-	*   R
-	|\  
-	| * X
-	* |   M
-	|\ \  
-	| * | B
-	| |/  
-	* / A
-	|/  
-	* I
-	EOF
-	git log --graph --pretty="%s" \
-		--simplify-merges --show-pulls \
-		-- file >actual &&
+expecting success of 6007.21 '--count --left-right': 
+	git rev-list --count --left-right C...D > actual &&
 	test_cmp expect actual
 
-ok 42 - log --graph --simplify-merges --show-pulls
+ok 21 - --count --left-right
 
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6019-rev-list-ancestry-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6019-rev-list-ancestry-path/.git/
-expecting success of 6019.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	test_commit D &&
-	test_commit E &&
-	test_commit F &&
-	git reset --hard C &&
-	test_commit G &&
-	test_merge E H &&
-	test_commit I &&
-	test_merge F J &&
-	git reset --hard A &&
-	test_commit K &&
-	test_merge J L &&
-	test_commit M
+expecting success of 6007.22 '--cherry-pick with duplicates on each side': 
+	git checkout -b dup-orig &&
+	test_commit dup-base &&
+	git revert dup-base &&
+	git cherry-pick dup-base &&
+	git checkout -b dup-side HEAD~3 &&
+	test_tick &&
+	git cherry-pick -3 dup-orig &&
+	git rev-list --cherry-pick dup-orig...dup-side >actual &&
+	test_must_be_empty actual
 
-[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
+Switched to a new branch 'dup-orig'
+[dup-orig eb9d72c] dup-base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 E.t
-[main 5374d8c] F
+ create mode 100644 dup-base.t
+[dup-orig 92ef1a2] Revert "dup-base"
  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
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 dup-base.t
+[dup-orig 3f88b9e] dup-base
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Merge made by the 'ours' strategy.
-[main 4e719b9] I
+ create mode 100644 dup-base.t
+Switched to a new branch 'dup-side'
+[dup-side d37dce7] dup-base
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Merge made by the 'ours' strategy.
-HEAD is now at 0ddfaf1 A
-[main 0f470b0] K
+ create mode 100644 dup-base.t
+[dup-side 5e0bb86] Revert "dup-base"
  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
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 dup-base.t
+[dup-side c48d64d] dup-base
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 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
+ create mode 100644 dup-base.t
+ok 22 - --cherry-pick with duplicates on each side
 
-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)
+expecting success of 6007.23 '--cherry-pick avoids looking at full diffs': 
+	git checkout -b shy-diff &&
+	test_commit dont-look-at-me &&
+	echo Hello >dont-look-at-me.t &&
+	test_tick &&
+	git commit -m tip dont-look-at-me.t &&
+	git checkout -b mainline HEAD^ &&
+	test_commit to-cherry-pick &&
+	remove_loose_object shy-diff^:dont-look-at-me.t &&
+	git rev-list --cherry-pick ...shy-diff
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6019-rev-list-ancestry-path/criss-cross/.git/
-[main (root-commit) 617a709] A
+Switched to a new branch 'shy-diff'
+[shy-diff 694eab7] dont-look-at-me
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'xb'
-[xb 7dfaf8e] B
+ create mode 100644 dont-look-at-me.t
+[shy-diff 065751b] tip
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'mainline'
+[mainline edb671e] to-cherry-pick
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 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
+ create mode 100644 to-cherry-pick.t
+edb671edd4843042c1e4b762a9eb9a82125402aa
+065751bb4ac05081d62425d3a9670d9d9102f001
+ok 23 - --cherry-pick avoids looking at full diffs
 
-# passed all 18 test(s)
-1..18
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6017-rev-list-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6017-rev-list-stdin/.git/
-expecting success of 6017.1 'setup': 
-	(
-		for i in 0 $them
-		do
-			for j in $them
-			do
-				echo $i.$j >file-$j &&
-				git add file-$j || exit
-			done &&
-			test_tick &&
-			git commit -m $i || exit
-		done &&
-		for i in $them
-		do
-			git checkout -b side-$i main~$i &&
-			echo updated $i >file-$i &&
-			git add file-$i &&
-			test_tick &&
-			git commit -m side-$i || exit
-		done &&
-
-		git update-ref refs/heads/-dashed-branch HEAD
-	)
-
-[main (root-commit) b2718df] 0
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
- create mode 100644 file-3
- create mode 100644 file-4
- create mode 100644 file-5
- create mode 100644 file-6
- create mode 100644 file-7
-[main 4c7c799] 1
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main a24e200] 2
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main 72c7eca] 3
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main 680e5c3] 4
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main 496e2a9] 5
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main c5757f4] 6
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main a21e804] 7
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-Switched to a new branch 'side-1'
-[side-1 c52bcff] side-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-2'
-[side-2 fe893aa] side-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-3'
-[side-3 48694b2] side-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-4'
-[side-4 e31c210] side-4
+*** t6013-rev-list-reverse-parents.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6013-rev-list-reverse-parents/.git/
+expecting success of 6013.1 'set up --reverse example': 
+	commit one &&
+	git tag root &&
+	commit two &&
+	git checkout -b side HEAD^ &&
+	commit three &&
+	git checkout main &&
+	git merge -s ours side &&
+	commit five
+	
+[main (root-commit) 86412ff] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-5'
-[side-5 5786a4a] side-5
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main 4931c53] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-6'
-[side-6 6879e94] side-6
+Switched to a new branch 'side'
+[side 0fcb03e] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-7'
-[side-7 a65952b] side-7
+Switched to branch 'main'
+Merge made by the 'ours' strategy.
+[main 2ed4a76] five
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6017.2 'check rev-list main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input main
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 2 - check rev-list main
-
-expecting success of 6017.3 'check log --stat main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input main
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 3 - check log --stat main
-
-expecting success of 6017.4 'check rev-list side-1 ^side-4': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-ok 4 - check rev-list side-1 ^side-4
-
-expecting success of 6017.5 'check log --stat side-1 ^side-4': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-4
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-ok 5 - check log --stat side-1 ^side-4
-
-expecting success of 6017.6 'check rev-list side-1 ^side-7 --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-ok 6 - check rev-list side-1 ^side-7 --
-
-expecting success of 6017.7 'check log --stat side-1 ^side-7 --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-ok 7 - check log --stat side-1 ^side-7 --
-
-expecting success of 6017.8 'check rev-list side-1 ^side-7 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-1
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-ok 8 - check rev-list side-1 ^side-7 -- file-1
-
-expecting success of 6017.9 'check log --stat side-1 ^side-7 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-1
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - check log --stat side-1 ^side-7 -- file-1
-
-expecting success of 6017.10 'check rev-list side-1 ^side-7 -- file-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-2
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-ok 10 - check rev-list side-1 ^side-7 -- file-2
-
-expecting success of 6017.11 'check log --stat side-1 ^side-7 -- file-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-2
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - check log --stat side-1 ^side-7 -- file-2
-
-expecting success of 6017.12 'check rev-list side-3 ^side-4 -- file-3': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-4
-input --
-input file-3
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-ok 12 - check rev-list side-3 ^side-4 -- file-3
-
-expecting success of 6017.13 'check log --stat side-3 ^side-4 -- file-3': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-4
-input --
-input file-3
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - check log --stat side-3 ^side-4 -- file-3
-
-expecting success of 6017.14 'check rev-list side-3 ^side-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-ok 14 - check rev-list side-3 ^side-2
-
-expecting success of 6017.15 'check log --stat side-3 ^side-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - check log --stat side-3 ^side-2
-
-expecting success of 6017.16 'check rev-list side-3 ^side-2 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-input --
-input file-1
-ok 16 - check rev-list side-3 ^side-2 -- file-1
-
-expecting success of 6017.17 'check log --stat side-3 ^side-2 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-input --
-input file-1
-ok 17 - check log --stat side-3 ^side-2 -- file-1
-
-expecting success of 6017.18 'check rev-list --all': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 18 - check rev-list --all
-
-expecting success of 6017.19 'check log --stat --all': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 19 - check log --stat --all
-
-expecting success of 6017.20 'check rev-list --all --not --branches': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input --branches
-ok 20 - check rev-list --all --not --branches
-
-expecting success of 6017.21 'check log --stat --all --not --branches': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input --branches
-ok 21 - check log --stat --all --not --branches
-
-expecting success of 6017.22 'check rev-list --glob=refs/heads': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 22 - check rev-list --glob=refs/heads
-
-expecting success of 6017.23 'check log --stat --glob=refs/heads': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 23 - check log --stat --glob=refs/heads
-
-expecting success of 6017.24 'check rev-list --glob=refs/heads --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 24 - check rev-list --glob=refs/heads --
-
-expecting success of 6017.25 'check log --stat --glob=refs/heads --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 25 - check log --stat --glob=refs/heads --
-
-expecting success of 6017.26 'check rev-list --glob=refs/heads -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-input file-1
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 26 - check rev-list --glob=refs/heads -- file-1
-
-expecting success of 6017.27 'check log --stat --glob=refs/heads -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-input file-1
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  1 file changed, 1 insertion(+)
-ok 27 - check log --stat --glob=refs/heads -- file-1
+ok 1 - set up --reverse example
 
-expecting success of 6017.28 'check rev-list --end-of-options -dashed-branch': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --end-of-options
-input -dashed-branch
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 28 - check rev-list --end-of-options -dashed-branch
+expecting success of 6013.2 '--reverse --parents --full-history combines correctly': 
+	git rev-list --parents --full-history main -- foo |
+		perl -e "print reverse <>" > expected &&
+	git rev-list --reverse --parents --full-history main -- foo \
+		> actual &&
+	test_cmp expected actual
+	
+ok 2 - --reverse --parents --full-history combines correctly
 
-expecting success of 6017.29 'check log --stat --end-of-options -dashed-branch': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --end-of-options
-input -dashed-branch
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 29 - check log --stat --end-of-options -dashed-branch
+expecting success of 6013.3 '--boundary does too': 
+	git rev-list --boundary --parents --full-history main ^root -- foo |
+		perl -e "print reverse <>" > expected &&
+	git rev-list --boundary --reverse --parents --full-history \
+		main ^root -- foo > actual &&
+	test_cmp expected actual
+	
+ok 3 - --boundary does too
 
-expecting success of 6017.30 'check rev-list --all --not refs/heads/main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input refs/heads/main
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-ok 30 - check rev-list --all --not refs/heads/main
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6014-rev-list-all.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6014-rev-list-all/.git/
+expecting success of 6014.1 'setup': 
 
-expecting success of 6017.31 'check log --stat --all --not refs/heads/main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input refs/heads/main
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 31 - check log --stat --all --not refs/heads/main
+	commit one &&
+	commit two &&
+	git checkout HEAD^ &&
+	commit detached
 
-expecting success of 6017.32 'not only --stdin': 
-	cat >expect <<-EOF &&
-	7
 
-	file-1
-	file-2
-	EOF
-	cat >input <<-EOF &&
-	^main^
-	--
-	file-2
-	EOF
-	git log --pretty=tformat:%s --name-only --stdin main -- file-1 \
-		<input >actual &&
-	test_cmp expect actual
+[master (root-commit) 86412ff] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 4931c53] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'HEAD^'.
 
-ok 32 - not only --stdin
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 6017.33 'pseudo-opt with missing value': 
-	cat >input <<-EOF &&
-	--glob
-	refs/heads
-	EOF
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	cat >expect <<-EOF &&
-	fatal: Option ${SQ}--glob${SQ} requires a value
-	EOF
+  git switch -c <new-branch-name>
 
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
+Or undo this operation with:
 
-ok 33 - pseudo-opt with missing value
+  git switch -
 
-expecting success of 6017.34 'pseudo-opt with invalid value': 
-	cat >input <<-EOF &&
-	--no-walk=garbage
-	EOF
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	cat >expect <<-EOF &&
-	error: invalid argument to --no-walk
-	fatal: invalid option ${SQ}--no-walk=garbage${SQ} in --stdin mode
-	EOF
+HEAD is now at 86412ff one
+[detached HEAD 13d8fe0] detached
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
+expecting success of 6014.2 'rev-list --all lists detached HEAD': 
 
-ok 34 - pseudo-opt with invalid value
+	test 3 = $(git rev-list --all | wc -l)
 
-expecting success of 6017.35 'unknown option without --end-of-options': 
-	cat >input <<-EOF &&
-	-dashed-branch
-	EOF
 
-	cat >expect <<-EOF &&
-	fatal: invalid option ${SQ}-dashed-branch${SQ} in --stdin mode
-	EOF
+ok 2 - rev-list --all lists detached HEAD
 
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
+expecting success of 6014.3 'repack does not lose detached HEAD': 
 
-ok 35 - unknown option without --end-of-options
+	git gc &&
+	git prune --expire=now &&
+	git show HEAD
 
-expecting success of 6017.36 '--not on command line does not influence revisions read via --stdin': 
-	cat >input <<-EOF &&
-	refs/heads/main
-	EOF
-	git rev-list refs/heads/main >expect &&
 
-	git rev-list refs/heads/main --not --stdin <input >actual &&
-	test_cmp expect actual
+commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-ok 36 - --not on command line does not influence revisions read via --stdin
+    detached
 
-expecting success of 6017.37 '--not via stdin does not influence revisions from command line': 
-	cat >input <<-EOF &&
-	--not
-	EOF
-	git rev-list refs/heads/main >expect &&
+diff --git a/foo b/foo
+index 5626abf..9aa4e2b 100644
+--- a/foo
++++ b/foo
+@@ -1 +1 @@
+-one
++detached
+ok 3 - repack does not lose detached HEAD
 
-	git rev-list refs/heads/main --stdin refs/heads/main <input >actual &&
-	test_cmp expect actual
+expecting success of 6014.4 'rev-list --graph --no-walk is forbidden': 
+	test_must_fail git rev-list --graph --no-walk HEAD
 
-ok 37 - --not via stdin does not influence revisions from command line
+fatal: options '--no-walk' and '--graph' cannot be used together
+ok 4 - rev-list --graph --no-walk is forbidden
 
-# passed all 37 test(s)
-1..37
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6021-rev-list-exclude-hidden.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+*** t6006-rev-list-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6006-rev-list-format/.git/
+expecting success of 6006.1 'setup': 
+	: >foo &&
+	git add foo &&
+	git config i18n.commitEncoding $test_encoding &&
+	echo "$added_iso88591" | git commit -F - &&
+	head1=$(git rev-parse --verify HEAD) &&
+	head1_short=$(git rev-parse --verify --short $head1) &&
+	head1_short4=$(git rev-parse --verify --short=4 $head1) &&
+	tree1=$(git rev-parse --verify HEAD:) &&
+	tree1_short=$(git rev-parse --verify --short $tree1) &&
+	echo "$changed" > foo &&
+	echo "$changed_iso88591" | git commit -a -F - &&
+	head2=$(git rev-parse --verify HEAD) &&
+	head2_short=$(git rev-parse --verify --short $head2) &&
+	head2_short4=$(git rev-parse --verify --short=4 $head2) &&
+	tree2=$(git rev-parse --verify HEAD:) &&
+	tree2_short=$(git rev-parse --verify --short $tree2) &&
+	git config --unset i18n.commitEncoding
 
-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
----------------------------------------------------------------------
+[main (root-commit) 75bad09] added (hinzugefügt) foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+[main 7e50ed9] changed (geändert) foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+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              =        220 /        220
----------------------------------------------------------------------
+expecting success of 6006.2 'format percent': 
+		git rev-list  --pretty=format:'%%h' main >output.percent &&
+		test_cmp expect.percent output.percent
+	
+ok 2 - format percent
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        228 /        228
----------------------------------------------------------------------
+expecting success of 6006.3 'format hash': 
+		git rev-list  --pretty=format:'%H%n%h' main >output.hash &&
+		test_cmp expect.hash output.hash
+	
+ok 3 - format hash
 
-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
----------------------------------------------------------------------
+expecting success of 6006.4 'format hash-no-header': 
+		git rev-list  --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header &&
+		test_cmp expect.hash-no-header output.hash-no-header
+	
+ok 4 - format hash-no-header
 
-ok 1 - setup
+expecting success of 6006.5 'format hash-no-header-abbrev': 
+		git rev-list  --abbrev-commit --abbrev=0 --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header-abbrev &&
+		test_cmp expect.hash-no-header-abbrev output.hash-no-header-abbrev
+	
+ok 5 - format hash-no-header-abbrev
 
-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
+expecting success of 6006.6 'format tree': 
+		git rev-list  --pretty=format:'%T%n%t' main >output.tree &&
+		test_cmp expect.tree output.tree
+	
+ok 6 - format tree
 
-ok 2 - invalid section
+expecting success of 6006.7 'format parents': 
+		git rev-list  --pretty=format:'%P%n%p' main >output.parents &&
+		test_cmp expect.parents output.parents
+	
+ok 7 - format parents
 
-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
+expecting success of 6006.8 'format author': 
+		git rev-list  --pretty=format:'%an%n%ae%n%al%n%ad%n%aD%n%at' main >output.author &&
+		test_cmp expect.author output.author
 	
-ok 3 - fetch: passed multiple times
+ok 8 - format author
 
-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
+expecting success of 6006.9 'format committer': 
+		git rev-list  --pretty=format:'%cn%n%ce%n%cl%n%cd%n%cD%n%ct' main >output.committer &&
+		test_cmp expect.committer output.committer
 	
-ok 4 - fetch: without hiddenRefs
+ok 9 - format committer
 
-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
+expecting success of 6006.10 'format encoding': 
+		git rev-list  --pretty=format:'%e' main >output.encoding &&
+		test_cmp expect.encoding output.encoding
 	
-ok 5 - fetch: hidden via transfer.hideRefs
+ok 10 - format encoding
 
-expecting success of 6021.6 'fetch: hidden via fetch.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.11 'format subject': 
+		git rev-list  --pretty=format:'%s' main >output.subject &&
+		test_cmp expect.subject output.subject
 	
-ok 6 - fetch: hidden via fetch.hideRefs
+ok 11 - format subject
 
-expecting success of 6021.7 'fetch: respects both transfer.hideRefs and fetch.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.12 'format subject-truncated': 
+		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.subject-truncated &&
+		test_cmp expect.subject-truncated output.subject-truncated
 	
-ok 7 - fetch: respects both transfer.hideRefs and fetch.hideRefs
+ok 12 - format subject-truncated
 
-expecting success of 6021.8 'fetch: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
+expecting success of 6006.13 'format body': 
+		git rev-list  --pretty=format:'%b' main >output.body &&
+		test_cmp expect.body output.body
 	
-ok 8 - fetch: negation without hidden refs marks everything as uninteresting
+ok 13 - format body
 
-expecting success of 6021.9 'fetch: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
+expecting success of 6006.14 'format raw-body': 
+		git rev-list  --pretty=format:'%B' main >output.raw-body &&
+		test_cmp expect.raw-body output.raw-body
 	
-ok 9 - fetch: negation with hidden refs marks them as interesting
+ok 14 - format raw-body
 
-expecting success of 6021.10 'fetch: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.15 'format raw-body-no-header': 
+		git rev-list  --no-commit-header --pretty=format:'%B' main >output.raw-body-no-header &&
+		test_cmp expect.raw-body-no-header output.raw-body-no-header
 	
-ok 10 - fetch: hidden refs and excludes work together
+ok 15 - format raw-body-no-header
 
-expecting success of 6021.11 'fetch: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.16 'pretty oneline (without --no-commit-header)': 
+		git rev-list  --pretty='oneline' main >output.oneline &&
+		test_cmp expect.oneline output.oneline
 	
-ok 11 - fetch: excluded hidden refs get reset
+ok 16 - pretty oneline (without --no-commit-header)
 
-expecting success of 6021.12 'fetch: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
+expecting success of 6006.17 'pretty oneline (with --no-commit-header)': 
+		git rev-list  --no-commit-header --pretty='oneline' main >output.oneline &&
+		test_cmp expect.oneline output.oneline
 	
-ok 12 - fetch: excluded hidden refs can be used with multiple pseudo-refs
+ok 17 - pretty oneline (with --no-commit-header)
 
-expecting success of 6021.13 'fetch: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.18 'pretty short (without --no-commit-header)': 
+		git rev-list  --pretty='short' main >output.short &&
+		test_cmp expect.short output.short
 	
-ok 13 - fetch: works with --glob
+ok 18 - pretty short (without --no-commit-header)
 
-expecting success of 6021.14 'fetch: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.19 'pretty short (with --no-commit-header)': 
+		git rev-list  --no-commit-header --pretty='short' main >output.short &&
+		test_cmp expect.short output.short
 	
-ok 14 - fetch: operates on stripped refs by default
+ok 19 - pretty short (with --no-commit-header)
 
-expecting success of 6021.15 'fetch: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.20 'basic colors': 
+	cat >expect <<-EOF &&
+	commit $head2
+	<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
+	EOF
+	format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
+	git rev-list --color --format="$format" -1 main >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 20 - basic colors
+
+expecting success of 6006.21 '%S is not a placeholder for rev-list yet': 
+	git rev-list --format="%S" -1 main | grep "%S"
+
+%S
+ok 21 - %S is not a placeholder for rev-list yet
+
+expecting success of 6006.22 'advanced colors': 
+	cat >expect <<-EOF &&
+	commit $head2
+	<BOLD;RED;BYELLOW>foo<RESET>
+	EOF
+	format="%C(red yellow bold)foo%C(reset)" &&
+	git rev-list --color --format="$format" -1 main >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 22 - advanced colors
+
+expecting success of 6006.23 '%Cred does not enable color by default': 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
 	
-ok 15 - fetch: does not hide namespace by default
+ok 23 - %Cred does not enable color by default
 
-expecting success of 6021.16 'fetch: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.24 '%Cred enables colors for color.diff': 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
 	
-ok 16 - fetch: can operate on unstripped refs
+ok 24 - %Cred enables colors for color.diff
 
-expecting success of 6021.17 'fetch: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 17 - fetch: fails with --remotes
+expecting success of 6006.25 '%Cred enables colors for color.ui': 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 25 - %Cred enables colors for color.ui
 
-expecting success of 6021.18 'fetch: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 18 - fetch: fails with --remotes=pattern
+expecting success of 6006.26 '%Cred respects --color': 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
+	
+ok 26 - %Cred respects --color
 
-expecting success of 6021.19 'fetch: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 19 - fetch: fails with --branches
+expecting success of 6006.27 '%Cred respects --no-color': 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
+	
+ok 27 - %Cred respects --no-color
 
-expecting success of 6021.20 'fetch: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 20 - fetch: fails with --branches=pattern
+checking prerequisite: TTY
 
-expecting success of 6021.21 'fetch: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 21 - fetch: fails with --tags
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-expecting success of 6021.22 'fetch: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 22 - fetch: fails with --tags=pattern
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-expecting success of 6021.23 'receive: passed multiple times': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 6006.28 '%Cred respects --color=auto (stdout is tty)': 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
 	
-ok 23 - receive: passed multiple times
+ok 28 - %Cred respects --color=auto (stdout is tty)
 
-expecting success of 6021.24 'receive: without hiddenRefs': 
-		git rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.29 '%Cred respects --color=auto (stdout not tty)': 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
 	
-ok 24 - receive: without hiddenRefs
+ok 29 - %Cred respects --color=auto (stdout not tty)
 
-expecting success of 6021.25 'receive: hidden via transfer.hideRefs': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.30 '%C(...) does not enable color by default': 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
 	
-ok 25 - receive: hidden via transfer.hideRefs
+ok 30 - %C(...) does not enable color by default
 
-expecting success of 6021.26 'receive: hidden via receive.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.31 '%C(...) enables colors for color.diff': 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
 	
-ok 26 - receive: hidden via receive.hideRefs
+ok 31 - %C(...) enables colors for color.diff
 
-expecting success of 6021.27 'receive: respects both transfer.hideRefs and receive.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.32 '%C(...) enables colors for color.ui': 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
 	
-ok 27 - receive: respects both transfer.hideRefs and receive.hideRefs
+ok 32 - %C(...) enables colors for color.ui
 
-expecting success of 6021.28 'receive: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
+expecting success of 6006.33 '%C(...) respects --color': 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
 	
-ok 28 - receive: negation without hidden refs marks everything as uninteresting
+ok 33 - %C(...) respects --color
 
-expecting success of 6021.29 'receive: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
+expecting success of 6006.34 '%C(...) respects --no-color': 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
 	
-ok 29 - receive: negation with hidden refs marks them as interesting
+ok 34 - %C(...) respects --no-color
 
-expecting success of 6021.30 'receive: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.35 '%C(...) respects --color=auto (stdout is tty)': 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
 	
-ok 30 - receive: hidden refs and excludes work together
+ok 35 - %C(...) respects --color=auto (stdout is tty)
 
-expecting success of 6021.31 'receive: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.36 '%C(...) respects --color=auto (stdout not tty)': 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
 	
-ok 31 - receive: excluded hidden refs get reset
+ok 36 - %C(...) respects --color=auto (stdout not tty)
 
-expecting success of 6021.32 'receive: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
+expecting success of 6006.37 '%C(auto,...) does not enable color by default': 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
 	
-ok 32 - receive: excluded hidden refs can be used with multiple pseudo-refs
+ok 37 - %C(auto,...) does not enable color by default
 
-expecting success of 6021.33 'receive: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.38 '%C(auto,...) enables colors for color.diff': 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
 	
-ok 33 - receive: works with --glob
+ok 38 - %C(auto,...) enables colors for color.diff
 
-expecting success of 6021.34 'receive: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.39 '%C(auto,...) enables colors for color.ui': 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
 	
-ok 34 - receive: operates on stripped refs by default
+ok 39 - %C(auto,...) enables colors for color.ui
 
-expecting success of 6021.35 'receive: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.40 '%C(auto,...) respects --color': 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
 	
-ok 35 - receive: does not hide namespace by default
+ok 40 - %C(auto,...) respects --color
 
-expecting success of 6021.36 'receive: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.41 '%C(auto,...) respects --no-color': 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
 	
-ok 36 - receive: can operate on unstripped refs
+ok 41 - %C(auto,...) respects --no-color
 
-expecting success of 6021.37 'receive: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 37 - receive: fails with --remotes
+expecting success of 6006.42 '%C(auto,...) respects --color=auto (stdout is tty)': 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
+	
+ok 42 - %C(auto,...) respects --color=auto (stdout is tty)
 
-expecting success of 6021.38 'receive: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 38 - receive: fails with --remotes=pattern
+expecting success of 6006.43 '%C(auto,...) respects --color=auto (stdout not tty)': 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
+	
+ok 43 - %C(auto,...) respects --color=auto (stdout not tty)
 
-expecting success of 6021.39 'receive: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 39 - receive: fails with --branches
+expecting success of 6006.44 '%C(always,...) enables color even without tty': 
+	git log --format=$ALWAYS_COLOR -1 >actual &&
+	has_color actual
 
-expecting success of 6021.40 'receive: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 40 - receive: fails with --branches=pattern
+ok 44 - %C(always,...) enables color even without tty
 
-expecting success of 6021.41 'receive: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 41 - receive: fails with --tags
+expecting success of 6006.45 '%C(auto) respects --color': 
+	git log --color --format="%C(auto)%H" -1 >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
+	test_cmp expect actual
 
-expecting success of 6021.42 'receive: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 42 - receive: fails with --tags=pattern
+ok 45 - %C(auto) respects --color
 
-expecting success of 6021.43 'uploadpack: passed multiple times': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 43 - uploadpack: passed multiple times
+expecting success of 6006.46 '%C(auto) respects --no-color': 
+	git log --no-color --format="%C(auto)%H" -1 >actual &&
+	git rev-parse HEAD >expect &&
+	test_cmp expect actual
 
-expecting success of 6021.44 'uploadpack: without hiddenRefs': 
-		git rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 44 - uploadpack: without hiddenRefs
+ok 46 - %C(auto) respects --no-color
 
-expecting success of 6021.45 'uploadpack: hidden via transfer.hideRefs': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 45 - uploadpack: hidden via transfer.hideRefs
+expecting success of 6006.47 'rev-list %C(auto,...) respects --color': 
+	git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
+		-1 HEAD >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat >expect <<-EOF &&
+	commit $(git rev-parse HEAD)
+	<GREEN>foo<RESET>
+	EOF
+	test_cmp expect actual
 
-expecting success of 6021.46 'uploadpack: hidden via uploadpack.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+ok 47 - rev-list %C(auto,...) respects --color
+
+expecting success of 6006.48 'setup complex body': 
+	git config i18n.commitencoding $test_encoding &&
+	echo change2 >foo && git commit -a -F commit-msg &&
+	head3=$(git rev-parse --verify HEAD) &&
+	head3_short=$(git rev-parse --short $head3)
+
+[main 79c1a11] Test printing of complex bodies
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 48 - setup complex body
+
+expecting success of 6006.49 'format complex-encoding': 
+		git rev-list  --pretty=format:'%e' main >output.complex-encoding &&
+		test_cmp expect.complex-encoding output.complex-encoding
 	
-ok 46 - uploadpack: hidden via uploadpack.hideRefs
+ok 49 - format complex-encoding
 
-expecting success of 6021.47 'uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.50 'format complex-subject': 
+		git rev-list  --pretty=format:'%s' main >output.complex-subject &&
+		test_cmp expect.complex-subject output.complex-subject
 	
-ok 47 - uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs
+ok 50 - format complex-subject
 
-expecting success of 6021.48 'uploadpack: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
+expecting success of 6006.51 'format complex-subject-trunc': 
+		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-trunc &&
+		test_cmp expect.complex-subject-trunc output.complex-subject-trunc
 	
-ok 48 - uploadpack: negation without hidden refs marks everything as uninteresting
+ok 51 - format complex-subject-trunc
 
-expecting success of 6021.49 'uploadpack: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
+expecting success of 6006.52 'format complex-subject-mtrunc': 
+		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-mtrunc &&
+		test_cmp expect.complex-subject-mtrunc output.complex-subject-mtrunc
 	
-ok 49 - uploadpack: negation with hidden refs marks them as interesting
+ok 52 - format complex-subject-mtrunc
 
-expecting success of 6021.50 'uploadpack: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.53 'format complex-subject-ltrunc': 
+		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-ltrunc &&
+		test_cmp expect.complex-subject-ltrunc output.complex-subject-ltrunc
 	
-ok 50 - uploadpack: hidden refs and excludes work together
+ok 53 - format complex-subject-ltrunc
 
-expecting success of 6021.51 'uploadpack: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.54 'setup expected messages (for test %b)': 
+	cat <<-EOF >expected.utf-8 &&
+	commit $head3
+	This commit message is much longer than the others,
+	and it will be encoded in $test_encoding. We should therefore
+	include an ISO8859 character: ¡bueno!
+
+	commit $head2
+	commit $head1
+	EOF
+	iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
+
+ok 54 - setup expected messages (for test %b)
+
+expecting success of 6006.55 'format complex-body': 
+		git rev-list  --pretty=format:'%b' main >output.complex-body &&
+		test_cmp expect.complex-body output.complex-body
 	
-ok 51 - uploadpack: excluded hidden refs get reset
+ok 55 - format complex-body
 
-expecting success of 6021.52 'uploadpack: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
+expecting success of 6006.56 'format complex-subject-commitencoding-unset': 
+		git rev-list  --pretty=format:'%s' main >output.complex-subject-commitencoding-unset &&
+		test_cmp expect.complex-subject-commitencoding-unset output.complex-subject-commitencoding-unset
 	
-ok 52 - uploadpack: excluded hidden refs can be used with multiple pseudo-refs
+ok 56 - format complex-subject-commitencoding-unset
 
-expecting success of 6021.53 'uploadpack: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.57 'format complex-subject-commitencoding-unset-trunc': 
+		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-commitencoding-unset-trunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-trunc output.complex-subject-commitencoding-unset-trunc
 	
-ok 53 - uploadpack: works with --glob
+ok 57 - format complex-subject-commitencoding-unset-trunc
 
-expecting success of 6021.54 'uploadpack: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.58 'format complex-subject-commitencoding-unset-mtrunc': 
+		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-commitencoding-unset-mtrunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-mtrunc output.complex-subject-commitencoding-unset-mtrunc
 	
-ok 54 - uploadpack: operates on stripped refs by default
+ok 58 - format complex-subject-commitencoding-unset-mtrunc
 
-expecting success of 6021.55 'uploadpack: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.59 'format complex-subject-commitencoding-unset-ltrunc': 
+		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-commitencoding-unset-ltrunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-ltrunc output.complex-subject-commitencoding-unset-ltrunc
 	
-ok 55 - uploadpack: does not hide namespace by default
+ok 59 - format complex-subject-commitencoding-unset-ltrunc
 
-expecting success of 6021.56 'uploadpack: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
+expecting success of 6006.60 'format complex-body-commitencoding-unset': 
+		git rev-list  --pretty=format:'%b' main >output.complex-body-commitencoding-unset &&
+		test_cmp expect.complex-body-commitencoding-unset output.complex-body-commitencoding-unset
 	
-ok 56 - uploadpack: can operate on unstripped refs
+ok 60 - format complex-body-commitencoding-unset
 
-expecting success of 6021.57 'uploadpack: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 57 - uploadpack: fails with --remotes
+expecting success of 6006.61 '%x00 shows NUL': 
+	echo  >expect commit $head3 &&
+	echo >>expect fooQbar &&
+	git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
+	nul_to_q <actual.nul >actual &&
+	test_cmp expect actual
 
-expecting success of 6021.58 'uploadpack: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 58 - uploadpack: fails with --remotes=pattern
+ok 61 - %x00 shows NUL
 
-expecting success of 6021.59 'uploadpack: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 59 - uploadpack: fails with --branches
+expecting success of 6006.62 '%ad respects --date=': 
+	echo 2005-04-07 >expect.ad-short &&
+	git log -1 --date=short --pretty=tformat:%ad >output.ad-short main &&
+	test_cmp expect.ad-short output.ad-short
 
-expecting success of 6021.60 'uploadpack: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 60 - uploadpack: fails with --branches=pattern
+ok 62 - %ad respects --date=
 
-expecting success of 6021.61 'uploadpack: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 61 - uploadpack: fails with --tags
+expecting success of 6006.63 'empty email': 
+	test_tick &&
+	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
+	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
+	test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
 
-expecting success of 6021.62 'uploadpack: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 62 - uploadpack: fails with --tags=pattern
+ok 63 - empty email
 
-# passed all 62 test(s)
-1..62
+expecting success of 6006.64 'del LF before empty (1)': 
+	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
+	test_line_count = 2 actual
+
+ok 64 - del LF before empty (1)
+
+expecting success of 6006.65 'del LF before empty (2)': 
+	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
+	test_line_count = 6 actual &&
+	grep "^$" actual
+
+
+ok 65 - del LF before empty (2)
+
+expecting success of 6006.66 'add LF before non-empty (1)': 
+	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
+	test_line_count = 2 actual
+
+ok 66 - add LF before non-empty (1)
+
+expecting success of 6006.67 'add LF before non-empty (2)': 
+	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
+	test_line_count = 6 actual &&
+	grep "^$" actual
+
+
+ok 67 - add LF before non-empty (2)
+
+expecting success of 6006.68 'add SP before non-empty (1)': 
+	git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
+	test $(wc -w <actual) = 3
+
+ok 68 - add SP before non-empty (1)
+
+expecting success of 6006.69 'add SP before non-empty (2)': 
+	git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
+	test $(wc -w <actual) = 6
+
+ok 69 - add SP before non-empty (2)
+
+expecting success of 6006.70 '--abbrev': 
+	echo SHORT SHORT SHORT >expect2 &&
+	echo LONG LONG LONG >expect3 &&
+	git log -1 --format="%h %h %h" HEAD >actual1 &&
+	git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
+	git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
+	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
+	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
+	test_cmp expect2 fuzzy2 &&
+	test_cmp expect3 fuzzy3 &&
+	! test_cmp actual1 actual2
+
+--- actual1	2026-03-14 13:34:01.062677808 +0000
++++ actual2	2026-03-14 13:34:01.086677808 +0000
+@@ -1 +1 @@
+-79c1a11 79c1a11 79c1a11
++79c1a 79c1a 79c1a
+ok 70 - --abbrev
+
+expecting success of 6006.71 '%H is not affected by --abbrev-commit': 
+	expected=$(($(test_oid hexsz) + 1)) &&
+	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
+	len=$(wc -c <actual) &&
+	test $len = $expected
+
+ok 71 - %H is not affected by --abbrev-commit
+
+expecting success of 6006.72 '%h is not affected by --abbrev-commit': 
+	git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
+	len=$(wc -c <actual) &&
+	test $len = 21
+
+ok 72 - %h is not affected by --abbrev-commit
+
+expecting success of 6006.73 '"%h %gD: %gs" is same as git-reflog': 
+	git reflog >expect &&
+	git log -g --format="%h %gD: %gs" >actual &&
+	test_cmp expect actual
+
+ok 73 - "%h %gD: %gs" is same as git-reflog
+
+expecting success of 6006.74 '"%h %gD: %gs" is same as git-reflog (with date)': 
+	git reflog --date=raw >expect &&
+	git log -g --format="%h %gD: %gs" --date=raw >actual &&
+	test_cmp expect actual
+
+ok 74 - "%h %gD: %gs" is same as git-reflog (with date)
+
+expecting success of 6006.75 '"%h %gD: %gs" is same as git-reflog (with --abbrev)': 
+	git reflog --abbrev=13 --date=raw >expect &&
+	git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
+	test_cmp expect actual
+
+ok 75 - "%h %gD: %gs" is same as git-reflog (with --abbrev)
+
+expecting success of 6006.76 '%gd shortens ref name': 
+	echo "main@{0}" >expect.gd-short &&
+	git log -g -1 --format=%gd refs/heads/main >actual.gd-short &&
+	test_cmp expect.gd-short actual.gd-short
+
+ok 76 - %gd shortens ref name
+
+expecting success of 6006.77 'reflog identity': 
+	echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
+	git log -g -1 --format="%gn:%ge" >actual &&
+	test_cmp expect actual
+
+ok 77 - reflog identity
+
+expecting success of 6006.78 'oneline with empty message': 
+	git commit --allow-empty --cleanup=verbatim -m "$LF" &&
+	git commit --allow-empty --allow-empty-message &&
+	git rev-list --oneline HEAD >test.txt &&
+	test_line_count = 5 test.txt &&
+	git rev-list --oneline --graph HEAD >testg.txt &&
+	test_line_count = 5 testg.txt
+
+[main 45d198f] 
+ Author: A U Thor <author@example.com>
+[main d12d4e0] 
+ Author: A U Thor <author@example.com>
+ok 78 - oneline with empty message
+
+expecting success of 6006.79 'single-character name is parsed correctly': 
+	git commit --author="a <a@example.com>" --allow-empty -m foo &&
+	echo "a <a@example.com>" >expect &&
+	git log -1 --format="%an <%ae>" >actual &&
+	test_cmp expect actual
+
+[main d066665] foo
+ Author: a <a@example.com>
+ok 79 - single-character name is parsed correctly
+
+expecting success of 6006.80 'unused %G placeholders are passed through': 
+	echo "%GX %G" >expect &&
+	git log -1 --format="%GX %G" >actual &&
+	test_cmp expect actual
+
+ok 80 - unused %G placeholders are passed through
+
+# passed all 80 test(s)
+1..80
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5516-fetch-push.sh ***
@@ -385779,7 +389487,7 @@
  create mode 100644 unrelated_commit.t
 To testrepo
  * [new reference]   main -> origin/main
-{"event":"data","sid":"20250209T065445.497456Z-Hcf858c9d-P001a80c3/20250209T065445.505872Z-Hcf858c9d-P001a80ed","thread":"main","time":"2025-02-09T06:54:45.508295Z","file":"builtin/pack-objects.c","line":1417,"repo":1,"t_abs":0.002611,"t_rel":0.000754,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
+{"event":"data","sid":"20260314T133235.276020Z-H5c947e1c-P0002d0fd/20260314T133235.311585Z-H5c947e1c-P0002d118","thread":"main","time":"2026-03-14T13:32:35.356863Z","file":"builtin/pack-objects.c","line":1417,"repo":1,"t_abs":0.045487,"t_rel":0.000661,"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': 
@@ -385803,8 +389511,8 @@
  create mode 100644 unrelated_commit.t
 To testrepo
  * [new reference]   main -> origin/main
-{"event":"data","sid":"20250209T065445.593220Z-Hcf858c9d-P001a829f/20250209T065445.598521Z-Hcf858c9d-P001a82c0","thread":"main","time":"2025-02-09T06:54:45.604053Z","file":"fetch-pack.c","line":2241,"repo":1,"t_abs":0.005729,"t_rel":0.004911,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
-{"event":"data","sid":"20250209T065445.593220Z-Hcf858c9d-P001a829f/20250209T065445.606728Z-Hcf858c9d-P001a82ec","thread":"main","time":"2025-02-09T06:54:45.609426Z","file":"builtin/pack-objects.c","line":1417,"repo":1,"t_abs":0.002880,"t_rel":0.000414,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"2"}
+{"event":"data","sid":"20260314T133235.912044Z-H5c947e1c-P0002d319/20260314T133235.938874Z-H5c947e1c-P0002d32d","thread":"main","time":"2026-03-14T13:32:35.966296Z","file":"fetch-pack.c","line":2241,"repo":1,"t_abs":0.027634,"t_rel":0.026773,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+{"event":"data","sid":"20260314T133235.912044Z-H5c947e1c-P0002d319/20260314T133235.987259Z-H5c947e1c-P0002d353","thread":"main","time":"2026-03-14T13:32:36.002968Z","file":"builtin/pack-objects.c","line":1417,"repo":1,"t_abs":0.015897,"t_rel":0.000414,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"2"}
 ok 11 - push with negotiation
 
 expecting success of 5516.12 'push with negotiation proceeds anyway even if negotiation fails': 
@@ -385825,7 +389533,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 unrelated_commit.t
-{"event":"data","sid":"20250209T065445.693428Z-Hcf858c9d-P001a84bd/20250209T065445.705770Z-Hcf858c9d-P001a8506","thread":"main","time":"2025-02-09T06:54:45.709087Z","file":"builtin/pack-objects.c","line":1417,"repo":1,"t_abs":0.003521,"t_rel":0.000703,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
+{"event":"data","sid":"20260314T133236.494715Z-H5c947e1c-P0002d53b/20260314T133236.566659Z-H5c947e1c-P0002d58c","thread":"main","time":"2026-03-14T13:32:36.606245Z","file":"builtin/pack-objects.c","line":1417,"repo":1,"t_abs":0.039775,"t_rel":0.000706,"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
 
@@ -385872,7 +389580,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 unrelated_commit.t
-{"event":"data","sid":"20250209T065445.984097Z-Hcf858c9d-P001a8a46/20250209T065445.994342Z-Hcf858c9d-P001a8a70","thread":"main","time":"2025-02-09T06:54:45.999751Z","file":"fetch-pack.c","line":2241,"repo":1,"t_abs":0.005652,"t_rel":0.004783,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+{"event":"data","sid":"20260314T133238.287031Z-H5c947e1c-P0002dc1f/20260314T133238.330737Z-H5c947e1c-P0002dc3d","thread":"main","time":"2026-03-14T13:32:38.343239Z","file":"fetch-pack.c","line":2241,"repo":1,"t_abs":0.012723,"t_rel":0.011954,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
 ok 14 - push with negotiation does not attempt to fetch submodules
 
 expecting success of 5516.15 'push without wildcard': 
@@ -386053,8 +389761,8 @@
 remote: warning: updating the current branch        
 To testrepo
  + 9ad36e1...935970f main -> main (forced update)
---- expect	2025-02-09 06:54:46.717984900 +0000
-+++ actual	2025-02-09 06:54:46.717984900 +0000
+--- expect	2026-03-14 13:32:43.142677808 +0000
++++ actual	2026-03-14 13:32:43.158677808 +0000
 @@ -1 +1 @@
 -9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
 +935970ff2fd2257ae1a73d15652c0ac6f837cf17
@@ -386086,8 +389794,8 @@
 remote: warning: updating the current branch        
 To testrepo
  + 9ad36e1...935970f main -> main (forced update)
---- expect	2025-02-09 06:54:46.853985765 +0000
-+++ actual	2025-02-09 06:54:46.857985790 +0000
+--- expect	2026-03-14 13:32:43.966677808 +0000
++++ actual	2026-03-14 13:32:43.974677808 +0000
 @@ -1 +1 @@
 -9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
 +935970ff2fd2257ae1a73d15652c0ac6f837cf17
@@ -389115,9507 +392823,7249 @@
 To testrepo
  * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
 Already on 'main'
-{"event":"child_start","sid":"20250209T065459.149116Z-Hcf858c9d-P001b931b","thread":"main","time":"2025-02-09T06:54:59.152995Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
-{"event":"child_start","sid":"20250209T065459.189826Z-Hcf858c9d-P001b93e7","thread":"main","time":"2025-02-09T06:54:59.193934Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
-{"event":"child_start","sid":"20250209T065459.226880Z-Hcf858c9d-P001b94b0","thread":"main","time":"2025-02-09T06:54:59.230752Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q","--no-use-bitmap-index"]}
+{"event":"child_start","sid":"20260314T133401.952333Z-H5c947e1c-P00040bbc","thread":"main","time":"2026-03-14T13:34:01.973753Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
+{"event":"child_start","sid":"20260314T133402.154538Z-H5c947e1c-P00040c80","thread":"main","time":"2026-03-14T13:34:02.169866Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
+{"event":"child_start","sid":"20260314T133402.324255Z-H5c947e1c-P00040d2a","thread":"main","time":"2026-03-14T13:34:02.340759Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q","--no-use-bitmap-index"]}
 ok 120 - push with config push.useBitmaps
 
 # passed all 120 test(s)
 1..120
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6018-rev-list-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6018-rev-list-glob/.git/
-expecting success of 6018.1 'setup': 
+*** t6016-rev-list-graph-simplify-history.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-	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
+	# 2 commits on branch B, started from A1
+	git checkout -b B A1 &&
+	test_commit B1 foo.txt &&
+	test_commit B2 abc.txt &&
 
-[main (root-commit) f9b107a] main
+	# 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
-Switched to a new branch 'subspace/one'
-[subspace/one ca90b7f] one
+ create mode 100644 foo.txt
+[main 02e4832] A2
  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
+ 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 'subspace-x'
-[subspace-x e241fee] subspace-x
+Switched to a new branch 'B'
+[B 4accf7e] B1
  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
+[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 a new branch 'someref'
-[someref dffcf3f] some
+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 'main'
-[main 2bdf448] topic_2
+Switched to branch 'C'
+[C f01c181] C3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0e3b4df] topic_3
+[C 406947e] C4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[main 88fe3d2] topic_4
+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 - setup
+ok 1 - set up rev-list --graph test
 
-expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
+expecting success of 6016.2 '--graph --all': 
+	check_graph --all <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	| |
+	|  \
+	*-. | A4
+	|\ \|
+	| | * C2
+	| | * C1
+	| * | B2
+	| * | B1
+	* | | A3
+	| |/
+	|/|
+	* | A2
+	|/
+	* A1
+	EOF
 
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+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
 
-ok 2 - rev-parse --glob=refs/heads/subspace/*
+Deleted tag 'A4' (was c96d503)
+ok 3 - --graph --simplify-by-decoration
 
-expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
+expecting success of 6016.4 'setup: get rid of decorations on B': 
+	git tag -d B2 &&
+	git tag -d B1 &&
+	git branch -d B
 
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
+Deleted tag 'B2' (was e76ada1)
+Deleted tag 'B1' (was 4accf7e)
+Deleted branch B (was e76ada1).
+ok 4 - setup: get rid of decorations on B
 
+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 3 - rev-parse --glob=heads/subspace/*
+ok 5 - --graph --simplify-by-decoration prune branch B
 
-expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
+expecting success of 6016.6 '--graph --full-history -- bar.txt': 
+	check_graph --full-history --all -- bar.txt <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	* | A4
+	|\|
+	* | A3
+	|/
+	* A2
+	EOF
 
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+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 4 - rev-parse --glob=refs/heads/subspace/
+ok 7 - --graph --full-history --simplify-merges -- bar.txt
 
-expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
+expecting success of 6016.8 '--graph -- bar.txt': 
+	check_graph --all -- bar.txt <<-\EOF
+	* A7
+	* A5
+	* A3
+	| * C4
+	|/
+	* A2
+	EOF
 
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
+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 5 - rev-parse --glob=heads/subspace/
+ok 9 - --graph --sparse -- bar.txt
 
-expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
+expecting success of 6016.10 '--graph ^C4': 
+	check_graph --all ^C4 <<-\EOF
+	* A7
+	* A6
+	* A5
+	*   A4
+	|\
+	| * B2
+	| * B1
+	* A3
+	EOF
 
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
+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 6 - rev-parse --glob=heads/subspace
+ok 11 - --graph ^C3
 
-checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
+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
 
-	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
+ok 12 - --graph --boundary ^C3
 
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6010-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6010-merge-base/.git/
+expecting success of 6010.1 'setup': 
+	T=$(git mktree </dev/null)
 
-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
+ok 1 - setup
 
-checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
+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)
 
-	compare rev-parse "main" "--glob --symbolic main"
+ok 2 - set up G and H
 
+expecting success of 6010.3 'merge-base G H': 
+	git name-rev $B >expected &&
 
---- expected	2025-02-09 06:54:58.470059674 +0000
-+++ actual	2025-02-09 06:54:58.474059699 +0000
-@@ -1 +1,2 @@
--88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
-+--glob
-+main
-not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
+	MB=$(git merge-base G H) &&
+	git name-rev "$MB" >actual.single &&
 
-expecting success of 6018.9 'rev-parse --branches=subspace/*': 
+	MB=$(git merge-base --all G H) &&
+	git name-rev "$MB" >actual.all &&
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
+	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 9 - rev-parse --branches=subspace/*
+ok 3 - merge-base G H
 
-expecting success of 6018.10 'rev-parse --branches=subspace/': 
+expecting success of 6010.4 'merge-base/show-branch --independent': 
+	git name-rev "$H" >expected1 &&
+	git name-rev "$H" "$G" >expected2 &&
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
+	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 &&
 
-ok 10 - rev-parse --branches=subspace/
+	test_cmp expected1 actual1.mb &&
+	test_cmp expected2 actual2.mb &&
+	test_cmp expected1 actual1.sb &&
+	test_cmp expected2 actual2.sb
 
-expecting success of 6018.11 'rev-parse --branches=subspace': 
+ok 4 - merge-base/show-branch --independent
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
+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) &&
 
-ok 11 - rev-parse --branches=subspace
+	C0=$(doit -3 C0 $S) &&
+	C1=$(doit -2 C1 $C0) &&
+	C2=$(doit -1 C2 $C1) &&
 
-expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
+	L0=$(doit  1 L0 $S) &&
+	L1=$(doit  2 L1 $L0) &&
+	L2=$(doit  3 L2 $L1) &&
 
-	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+	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) &&
 
-ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
+	git name-rev $C2 >expected &&
 
-expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
+	MB=$(git merge-base PL PR) &&
+	git name-rev "$MB" >actual.single &&
 
-	compare rev-parse "main" "--glob=heads/someref/* main"
+	MB=$(git merge-base --all PL PR) &&
+	git name-rev "$MB" >actual.all &&
 
+	test_cmp expected actual.single &&
+	test_cmp expected actual.all
 
-ok 13 - rev-parse --glob=heads/someref/* main
+ok 5 - unsynchronized clocks
 
-expecting success of 6018.14 'rev-parse --glob=heads/*': 
+expecting success of 6010.6 '--independent with unsynchronized clocks': 
+	IB=$(doit 0 IB) &&
+	I1=$(doit -10 I1 $IB) &&
+	I2=$(doit  -9 I2 $I1) &&
+	I3=$(doit  -8 I3 $I2) &&
+	I4=$(doit  -7 I4 $I3) &&
+	I5=$(doit  -6 I5 $I4) &&
+	I6=$(doit  -5 I6 $I5) &&
+	I7=$(doit  -4 I7 $I6) &&
+	I8=$(doit  -3 I8 $I7) &&
+	IH=$(doit  -2 IH $I8) &&
 
-	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+	echo $IH >expected &&
+	git merge-base --independent IB IH >actual &&
+	test_cmp expected actual
 
+ok 6 - --independent with unsynchronized clocks
 
-ok 14 - rev-parse --glob=heads/*
+expecting success of 6010.7 'merge-base for octopus-step (setup)': 
+	# Another set to demonstrate base between one commit and a merge
+	# in the documentation.
+	#
+	# * C (MMC) * B (MMB) * A  (MMA)
+	# * o       * o       * o
+	# * o       * o       * o
+	# * o       * o       * o
+	# * o       | _______/
+	# |         |/
+	# |         * 1 (MM1)
+	# | _______/
+	# |/
+	# * root (MMR)
 
-expecting success of 6018.15 'rev-parse --tags=foo': 
+	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
 
-	compare rev-parse "foo/bar" "--tags=foo"
+[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.
 
-ok 15 - rev-parse --tags=foo
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 6018.16 'rev-parse --remotes=foo': 
+  git switch -c <new-branch-name>
 
-	compare rev-parse "foo/baz" "--remotes=foo"
+Or undo this operation with:
 
+  git switch -
 
-ok 16 - rev-parse --remotes=foo
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6018.17 'rev-parse --exclude with --branches': 
-	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
+HEAD is now at 91243c1 MM1
+[detached HEAD c35e31c] MM-r
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-r.t
+[detached HEAD 44e361c] MM-s
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-s.t
+[detached HEAD a5daa7f] MM-t
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-t.t
+[detached HEAD bca1425] MMB
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MMB.t
+Previous HEAD position was bca1425 MMB
+HEAD is now at 0075405 MMR
+[detached HEAD 174b4d1] MM-u
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-u.t
+[detached HEAD c171a6c] MM-v
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-v.t
+[detached HEAD c25d00b] MM-w
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-w.t
+[detached HEAD 610cc22] MM-x
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-x.t
+[detached HEAD 03ab457] MMC
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MMC.t
+ok 7 - merge-base for octopus-step (setup)
 
-ok 17 - rev-parse --exclude with --branches
+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 6018.18 'rev-parse --exclude with --all': 
-	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
+	git merge-base --all MMA MMB MMC >actual &&
+	git merge-base --all --octopus MMA MMB MMC >actual.common &&
+	git show-branch --merge-base MMA MMB MMC >actual.sb &&
 
-ok 18 - rev-parse --exclude with --all
+	test_cmp expected actual &&
+	test_cmp expected.sb actual.common &&
+	test_cmp expected.sb actual.sb
 
-expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
-	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+ok 8 - merge-base A B C
 
-ok 19 - rev-parse accumulates multiple --exclude
+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 6018.20 'rev-parse --branches clears --exclude': 
-	compare rev-parse "--exclude=* --branches --branches" "--branches"
+	git rev-parse CC1 CC2 >expected &&
+	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
 
-ok 20 - rev-parse --branches clears --exclude
+	sort expected >expected.sorted &&
+	sort actual >actual.sorted &&
+	test_cmp expected.sorted actual.sorted
 
-expecting success of 6018.21 'rev-parse --tags clears --exclude': 
-	compare rev-parse "--exclude=* --tags --tags" "--tags"
+HEAD is now at 0075405 MMR
+[detached HEAD 4141141] CC1
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 CC1.t
+HEAD is now at e34970a E
+[detached HEAD d33e00c] CC2
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 CC2.t
+Merge made by the 'ours' strategy.
+[detached HEAD 48e3312] CC-o
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 CC-o.t
+[detached HEAD dda5641] CCB
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 CCB.t
+HEAD is now at 4141141 CC1
+Merge made by the 'ours' strategy.
+[detached HEAD 6d30b69] CCA
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 CCA.t
+ok 9 - criss-cross merge-base for octopus-step
 
-ok 21 - rev-parse --tags clears --exclude
+expecting success of 6010.10 'using reflog to find the fork point': 
+	git reset --hard &&
+	git checkout -b base $E &&
 
-expecting success of 6018.22 'rev-parse --all clears --exclude': 
-	compare rev-parse "--exclude=* --all --all" "--all"
+	(
+		for count in 1 2 3
+		do
+			git commit --allow-empty -m "Base commit #$count" &&
+			git rev-parse HEAD >expect$count &&
+			git checkout -B derived &&
+			git commit --allow-empty -m "Derived #$count" &&
+			git rev-parse HEAD >derived$count &&
+			git checkout -B base $E || exit 1
+		done &&
 
-ok 22 - rev-parse --all clears --exclude
+		for count in 1 2 3
+		do
+			git merge-base --fork-point base $(cat derived$count) >actual &&
+			test_cmp expect$count actual || exit 1
+		done
 
-expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
-	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+	) &&
+	# check that we correctly default to HEAD
+	git checkout derived &&
+	git merge-base --fork-point base >actual &&
+	test_cmp expect3 actual
 
-ok 23 - rev-parse --exclude=glob with --branches=glob
+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 6018.24 'rev-parse --exclude=glob with --tags=glob': 
-	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+expecting success of 6010.11 '--fork-point works with empty reflog': 
+	git -c core.logallrefupdates=false branch no-reflog base &&
+	git merge-base --fork-point no-reflog derived &&
+	test_cmp expect3 actual
 
-ok 24 - rev-parse --exclude=glob with --tags=glob
+e34970abbab4461223052769885c56a229ee9299
+ok 11 - --fork-point works with empty reflog
 
-expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+expecting success of 6010.12 'merge-base --octopus --all for complex tree': 
+	# Best common ancestor for JE, JAA and JDD is JC
+	#             JE
+	#            / |
+	#           /  |
+	#          /   |
+	#  JAA    /    |
+	#   |\   /     |
+	#   | \  | JDD |
+	#   |  \ |/ |  |
+	#   |   JC JD  |
+	#   |    | /|  |
+	#   |    |/ |  |
+	#  JA    |  |  |
+	#   |\  /|  |  |
+	#   X JB |  X  X
+	#   \  \ | /   /
+	#    \__\|/___/
+	#        J
+	test_commit J &&
+	test_commit JB &&
+	git reset --hard J &&
+	test_commit JC &&
+	git reset --hard J &&
+	test_commit JTEMP1 &&
+	test_merge JA JB &&
+	test_merge JAA JC &&
+	git reset --hard J &&
+	test_commit JTEMP2 &&
+	test_merge JD JB &&
+	test_merge JDD JC &&
+	git reset --hard J &&
+	test_commit JTEMP3 &&
+	test_merge JE JC &&
+	git rev-parse JC >expected &&
+	git merge-base --all --octopus JAA JDD JE >actual &&
+	test_cmp expected actual
 
-ok 25 - rev-parse --exclude=glob with --remotes=glob
+[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
 
-expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
-	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6009-rev-list-parent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6009-rev-list-parent/.git/
+expecting success of 6009.1 'setup': 
 
-ok 26 - rev-parse --exclude=ref with --branches=glob
+	touch file &&
+	git add file &&
 
-expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
-	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+	test_commit one &&
 
-ok 27 - rev-parse --exclude=ref with --tags=glob
+	test_tick=$(($test_tick - 2400)) &&
 
-expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
 
-ok 28 - rev-parse --exclude=ref with --remotes=glob
+	git log --pretty=oneline --abbrev-commit
 
-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
+[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 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 6009.2 'one is ancestor of others and should not be shown': 
 
-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
+	git rev-list one --not four >result &&
+	test_must_be_empty result
 
-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
+ok 2 - one is ancestor of others and should not be shown
 
-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 6009.3 'setup roots, merges and octopuses': 
 
-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
+	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 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
+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 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 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 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
+	test_must_fail git rev-list --min-parents=1q HEAD 2>error &&
+	grep "not an integer" error &&
 
-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
+	git rev-list --max-parents=1 --min-parents=1 HEAD &&
+	git rev-list --max-parents=-1 --min-parents=-1 HEAD
 
-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
+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 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 6009.5 'rev-list roots': 
 
-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
+	check_revlist "--max-parents=0" one five
 
-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
+ok 5 - rev-list roots
 
-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 6009.6 'rev-list no merges': 
 
-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
+	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 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
+ok 6 - rev-list no merges
 
-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 6009.7 'rev-list no octopuses': 
 
-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
+	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
 
-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
+ok 7 - rev-list no octopuses
 
-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 6009.8 'rev-list no roots': 
 
-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
+	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
 
-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
+ok 8 - rev-list no roots
 
-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 6009.9 'rev-list merges': 
 
-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
+	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
+	check_revlist "--merges" tetrapus tripus normalmerge
 
-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
+ok 9 - rev-list merges
 
-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 6009.10 'rev-list octopus': 
 
-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
+	check_revlist "--min-parents=3" tetrapus tripus
 
-expecting success of 6018.58 'rev-parse --exclude-hidden=uploadpack fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 58 - rev-parse --exclude-hidden=uploadpack fails with --tags
+ok 10 - rev-list octopus
 
-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 6009.11 'rev-list ordinary commits': 
 
-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
+	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
 
-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
+ok 11 - rev-list ordinary commits
 
-expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
-	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+expecting success of 6009.12 'rev-list --merges --no-merges yields empty set': 
 
-ok 62 - rev-list --exclude=glob with --branches=glob
+	check_revlist "--min-parents=2 --no-merges" &&
+	check_revlist "--merges --no-merges" &&
+	check_revlist "--no-merges --merges"
 
-expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
-	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+ok 12 - rev-list --merges --no-merges yields empty set
 
-ok 63 - rev-list --exclude=glob with --tags=glob
+expecting success of 6009.13 'rev-list override and infinities': 
 
-expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
-	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+	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 64 - rev-list --exclude=glob with --remotes=glob
+ok 13 - rev-list override and infinities
 
-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 6009.14 'dodecapus': 
 
-ok 65 - rev-list --exclude=ref with --branches=glob
+	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 &&
 
-expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
-	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+	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
 
-ok 66 - rev-list --exclude=ref with --tags=glob
+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 6018.67 'rev-list --exclude=ref with --remotes=glob': 
-	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+expecting success of 6009.15 'ancestors with the same commit time': 
 
-ok 67 - rev-list --exclude=ref with --remotes=glob
+	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 6018.68 'rev-list --glob=refs/heads/subspace/*': 
+[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
 
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6019-rev-list-ancestry-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 68 - rev-list --glob=refs/heads/subspace/*
+expecting success of 6019.2 'log D..M': 
+		test_write_lines E F G H I J K L M >expect &&
+		git log --format=%s D..M >raw &&
 
-expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
+		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
 
-	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
+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
 
-ok 69 - rev-list --glob refs/heads/subspace/*
+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 &&
 
-expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
+		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
 
-	compare rev-list "main" "--glob -0 main"
+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
 
-ok 70 - rev-list not confused by option-like --glob arg
+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 6018.71 'rev-list --glob=heads/subspace/*': 
+		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
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
+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
 
-ok 71 - rev-list --glob=heads/subspace/*
+expecting success of 6019.8 'log --ancestry-path=F --ancestry-path=K D..M': 
+		test_write_lines E F J K L M >expect &&
+		git log --format=%s --ancestry-path=F --ancestry-path=K D..M >raw &&
 
-expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
+		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
 
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+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
 
-ok 72 - rev-list --glob=refs/heads/subspace/
+expecting success of 6019.10 'log --ancestry-path D..M -- M.t': 
+		test_write_lines M >expect &&
+		git log --format=%s --ancestry-path D..M -- M.t >raw &&
 
-expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
+		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
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
+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
 
-ok 73 - rev-list --glob=heads/subspace/
+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 6018.74 'rev-list --glob=heads/subspace': 
+		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
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
+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
 
-ok 74 - rev-list --glob=heads/subspace
+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 6018.75 'rev-list --branches=subspace/*': 
+		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
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
+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
 
-ok 75 - rev-list --branches=subspace/*
+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)
 
-expecting success of 6018.76 'rev-list --branches=subspace/': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
+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
 
-ok 76 - rev-list --branches=subspace/
+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)
 
-expecting success of 6018.77 'rev-list --branches=subspace': 
+ok 18 - criss-cross: rev-list --ancestry-path --all ^cb
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace"
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6002-rev-list-bisect.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6002-rev-list-bisect/.git/
+expecting success of 6002.1 'bisection diff --bisect l0 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 1 - bisection diff --bisect l0 ^root <= 0
 
+expecting success of 6002.2 'bisection diff --bisect l1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 2 - bisection diff --bisect l1 ^root <= 0
 
-ok 77 - rev-list --branches=subspace
+expecting success of 6002.3 'bisection diff --bisect l2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 3 - bisection diff --bisect l2 ^root <= 0
 
-expecting success of 6018.78 'rev-list --branches': 
+expecting success of 6002.4 'bisection diff --bisect a0 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 4 - bisection diff --bisect a0 ^root <= 0
 
-	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
+expecting success of 6002.5 'bisection diff --bisect a1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 5 - bisection diff --bisect a1 ^root <= 0
 
+expecting success of 6002.6 'bisection diff --bisect a2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 6 - bisection diff --bisect a2 ^root <= 0
 
-ok 78 - rev-list --branches
+expecting success of 6002.7 'bisection diff --bisect a3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 7 - bisection diff --bisect a3 ^root <= 0
 
-expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
+expecting success of 6002.8 'bisection diff --bisect b1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 8 - bisection diff --bisect b1 ^root <= 0
 
-	compare rev-list "main" "--glob=heads/someref/* main"
+expecting success of 6002.9 'bisection diff --bisect b2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 9 - bisection diff --bisect b2 ^root <= 0
 
+expecting success of 6002.10 'bisection diff --bisect b3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 10 - bisection diff --bisect b3 ^root <= 0
 
-ok 79 - rev-list --glob=heads/someref/* main
+expecting success of 6002.11 'bisection diff --bisect c1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 11 - bisection diff --bisect c1 ^root <= 0
 
-expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
+expecting success of 6002.12 'bisection diff --bisect c2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 12 - bisection diff --bisect c2 ^root <= 0
 
-	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+expecting success of 6002.13 'bisection diff --bisect c3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 13 - bisection diff --bisect c3 ^root <= 0
 
+expecting success of 6002.14 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
+ok 14 - bisection diff --bisect E ^F <= 0
 
-ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
+expecting success of 6002.15 'bisection diff --bisect e1 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 15 - bisection diff --bisect e1 ^F <= 0
 
-expecting success of 6018.81 'rev-list --glob=heads/*': 
+expecting success of 6002.16 'bisection diff --bisect e2 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 16 - bisection diff --bisect e2 ^F <= 0
 
-	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+expecting success of 6002.17 'bisection diff --bisect e3 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 17 - bisection diff --bisect e3 ^F <= 0
 
+expecting success of 6002.18 'bisection diff --bisect e4 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 18 - bisection diff --bisect e4 ^F <= 0
 
-ok 81 - rev-list --glob=heads/*
+expecting success of 6002.19 'bisection diff --bisect e5 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 19 - bisection diff --bisect e5 ^F <= 0
 
-expecting success of 6018.82 'rev-list --tags=foo': 
+expecting success of 6002.20 'bisection diff --bisect e6 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 20 - bisection diff --bisect e6 ^F <= 0
 
-	compare rev-list "foo/bar" "--tags=foo"
+expecting success of 6002.21 'bisection diff --bisect e7 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 21 - bisection diff --bisect e7 ^F <= 0
 
+expecting success of 6002.22 'bisection diff --bisect f1 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 22 - bisection diff --bisect f1 ^F <= 0
 
-ok 82 - rev-list --tags=foo
+expecting success of 6002.23 'bisection diff --bisect f2 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 23 - bisection diff --bisect f2 ^F <= 0
 
-expecting success of 6018.83 'rev-list --tags': 
+expecting success of 6002.24 'bisection diff --bisect f3 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 24 - bisection diff --bisect f3 ^F <= 0
 
-	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
+expecting success of 6002.25 'bisection diff --bisect f4 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 25 - bisection diff --bisect f4 ^F <= 0
 
+expecting success of 6002.26 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
+ok 26 - bisection diff --bisect E ^F <= 0
 
-ok 83 - rev-list --tags
+expecting success of 6002.27 'bisection diff --bisect V ^U <= 1': test $_bisect_err -le $_max_diff
+ok 27 - bisection diff --bisect V ^U <= 1
 
-expecting success of 6018.84 'rev-list --remotes=foo': 
+expecting success of 6002.28 'bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0': test $_bisect_err -le $_max_diff
+ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
 
-	compare rev-list "foo/baz" "--remotes=foo"
+expecting success of 6002.29 'bisection diff --bisect u1 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 29 - bisection diff --bisect u1 ^U <= 0
 
+expecting success of 6002.30 'bisection diff --bisect u2 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 30 - bisection diff --bisect u2 ^U <= 0
 
-ok 84 - rev-list --remotes=foo
+expecting success of 6002.31 'bisection diff --bisect u3 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 31 - bisection diff --bisect u3 ^U <= 0
 
-expecting success of 6018.85 'rev-list --exclude with --branches': 
-	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
+expecting success of 6002.32 'bisection diff --bisect u4 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 32 - bisection diff --bisect u4 ^U <= 0
 
-ok 85 - rev-list --exclude with --branches
+expecting success of 6002.33 'bisection diff --bisect u5 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 33 - bisection diff --bisect u5 ^U <= 0
 
-expecting success of 6018.86 'rev-list --exclude with --all': 
-	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
+expecting success of 6002.34 '--bisect l5 ^root': check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
+ok 34 - --bisect l5 ^root
 
-ok 86 - rev-list --exclude with --all
+expecting success of 6002.35 '--bisect l5 ^root ^c3': check_output bisect-l5-root-c3 "git rev-list $_bisect_option l5 ^root ^c3"
+ok 35 - --bisect l5 ^root ^c3
 
-expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
-	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+expecting success of 6002.36 '--bisect l5 ^root ^c3 ^b4': check_output bisect-l5-root-c3-b4 "git rev-list $_bisect_option l5 ^c3 ^b4"
+ok 36 - --bisect l5 ^root ^c3 ^b4
 
-ok 87 - rev-list accumulates multiple --exclude
+expecting success of 6002.37 '--bisect l3 ^root ^c3 ^b4': check_output bisect-l3-root-c3-b4 "git rev-list $_bisect_option l3 ^root ^c3 ^b4"
+ok 37 - --bisect l3 ^root ^c3 ^b4
 
-expecting success of 6018.88 'rev-list should succeed with empty output on empty stdin': 
-	git rev-list --stdin </dev/null >actual &&
-	test_must_be_empty actual
+expecting success of 6002.38 '--bisect l5 ^b3 ^a3 ^b4 ^a4': check_output bisect-l5-b3-a3-b4-a4 "git rev-list $_bisect_option l3 ^b3 ^a3 ^a4"
+ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4
 
-ok 88 - rev-list should succeed with empty output on empty stdin
+expecting success of 6002.39 '--bisect l4 ^a2 ^a3 ^b ^a4': check_output bisect-l4-a2-a3-b-a4 "git rev-list $_bisect_option l4 ^a2 ^a3 ^a4"
+ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4
 
-expecting success of 6018.89 'rev-list should succeed with empty output with all refs excluded': 
-	git rev-list --exclude=* --all >actual &&
-	test_must_be_empty actual
+expecting success of 6002.40 '--bisect l3 ^a2 ^a3 ^b ^a4': check_output bisect-l3-a2-a3-b-a4 "git rev-list $_bisect_option l3 ^a2 ^a3 ^a4"
+ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4
 
-ok 89 - rev-list should succeed with empty output with all refs excluded
+expecting success of 6002.41 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
+ok 41 - --bisect a4 ^a2 ^a3 ^b4
 
-expecting success of 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
-	)
+expecting success of 6002.42 '--bisect a4 ^a2 ^a3 ^b4 ^c2': check_output bisect-a4-a2-a3-b4-c2 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2"
+ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6018-rev-list-glob/empty/.git/
-ok 90 - rev-list should succeed with empty output with empty --all
+expecting success of 6002.43 '--bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3': check_output bisect-a4-a2-a3-b4-c2-c3 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2 ^c3"
+ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3
 
-expecting success of 6018.91 'rev-list should succeed with empty output with empty glob': 
-	git rev-list --glob=does-not-match-anything >actual &&
-	test_must_be_empty actual
+expecting success of 6002.44 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
+ok 44 - --bisect a4 ^a2 ^a3 ^b4
 
-ok 91 - rev-list should succeed with empty output with empty glob
+expecting success of 6002.45 '--bisect c3 ^a2 ^a3 ^b4 ^c2': check_output bisect-c3-a2-a3-b4-c2 "git rev-list $_bisect_option c3 ^a2 ^a3 ^b4 ^c2"
+ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2
 
-expecting success of 6018.92 'rev-list should succeed with empty output when ignoring missing': 
-	git rev-list --ignore-missing $ZERO_OID >actual &&
-	test_must_be_empty actual
+expecting success of 6002.46 'set up fake --bisect refs': 
+	git update-ref refs/bisect/bad c3 &&
+	good=$(git rev-parse b1) &&
+	git update-ref refs/bisect/good-$good $good &&
+	good=$(git rev-parse c1) &&
+	git update-ref refs/bisect/good-$good $good
 
-ok 92 - rev-list should succeed with empty output when ignoring missing
+ok 46 - set up fake --bisect refs
 
-expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
+expecting success of 6002.47 'rev-list --bisect can default to good/bad refs': 
+	# the only thing between c3 and c1 is c2
+	git rev-parse c2 >expect &&
+	git rev-list --bisect >actual &&
+	test_cmp expect actual
 
-	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 47 - rev-list --bisect can default to good/bad refs
 
+expecting success of 6002.48 'rev-parse --bisect can default to good/bad refs': 
+	git rev-parse c3 ^b1 ^c1 >expect &&
+	git rev-parse --bisect >actual &&
 
-ok 93 - shortlog accepts --glob/--tags/--remotes
+	# output order depends on the refnames, which in turn depends on
+	# the exact sha1s. We just want to make sure we have the same set
+	# of lines in any order.
+	sort <expect >expect.sorted &&
+	sort <actual >actual.sorted &&
+	test_cmp expect.sorted actual.sorted
 
-checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
+ok 48 - rev-parse --bisect can default to good/bad refs
 
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob heads/*"
+expecting success of 6002.49 '--bisect --first-parent': check_output bisect-first-parent "git rev-list --bisect --first-parent E ^F"
+ok 49 - --bisect --first-parent
 
+expecting success of 6002.50 '--first-parent': check_output first-parent "git rev-list --first-parent E ^F"
+ok 50 - --first-parent
 
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
+expecting success of 6002.51 '--bisect-vars --first-parent': check_output bisect-vars-first-parent "git rev-list --bisect-vars --first-parent E ^F"
+ok 51 - --bisect-vars --first-parent
 
-    -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 6002.52 '--bisect-all --first-parent': 
+	cat >expect.unsorted <<-EOF &&
+	$(git rev-parse E) (tag: E, dist=0)
+	$(git rev-parse e1) (tag: e1, dist=1)
+	$(git rev-parse e2) (tag: e2, dist=2)
+	$(git rev-parse e3) (tag: e3, dist=3)
+	$(git rev-parse e4) (tag: e4, dist=4)
+	$(git rev-parse e5) (tag: e5, dist=4)
+	$(git rev-parse e6) (tag: e6, dist=3)
+	$(git rev-parse e7) (tag: e7, dist=2)
+	$(git rev-parse e8) (tag: e8, dist=1)
+	EOF
 
-not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
+	# expect results to be ordered by distance (descending),
+	# commit hash (ascending)
+	sort -k4,4r -k1,1 expect.unsorted >expect &&
+	git rev-list --bisect-all --first-parent E ^F >actual &&
+	test_cmp expect actual
 
-checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
+ok 52 - --bisect-all --first-parent
 
-	compare shortlog main "--glob -e main"
+expecting success of 6002.53 '--bisect without any revisions': 
+	git rev-list --bisect HEAD..HEAD >out &&
+	test_must_be_empty out
 
+ok 53 - --bisect without any revisions
 
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
+# passed all 53 test(s)
+1..53
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6012-rev-list-simplify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-    -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
+	git branch other-branch &&
 
-not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
+	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 &&
 
-# still have 4 known breakage(s)
-# passed all remaining 91 test(s)
-1..95
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6100-rev-list-in-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	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 &&
 
-[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
+	git checkout other-branch &&
 
-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 &&
+	echo "Hello" >file &&
+	>lost &&
+	git add file lost &&
+	test_tick && git commit -m "Modified the file identically" &&
+	note C &&
 
-	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 &&
+	echo "This is a stupid example" >another-file &&
+	git add another-file &&
+	test_tick && git commit -m "Add another file" &&
+	note D &&
 
-	test_cmp expect actual
+	test_tick &&
+	test_must_fail git merge -m "merge" main &&
+	>lost && git commit -a -m "merge" &&
+	note E &&
 
-ok 2 - rev-list --in-commit-order
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Irrelevant change" &&
+	note F &&
 
-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 checkout main &&
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Another irrelevant change" &&
+	note G &&
 
-	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_tick && git merge -m "merge" other-branch &&
+	note H &&
 
-	test_cmp expect actual
+	echo "Final change" >file &&
+	test_tick && git commit -a -m "Final change" &&
+	note I &&
 
-ok 3 - rev-list lists blobs and trees after commits
+	git checkout main &&
+	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
+	note K &&
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6040-tracking-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	echo "Immaterial" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Last" &&
+	note L
 
-[main (root-commit) cc33353] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[main 7e1cf2d] b
+[main (root-commit) 2ce5a1a] Initial file and lost
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-[main ac11e55] c
+ 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 c
-Cloning into 'test'...
-done.
-Switched to a new branch 'b1'
-branch 'b1' set up to track 'origin/main'.
-HEAD is now at 7e1cf2d b
-[b1 afc0d66] d
+ create mode 100644 side
+Switched to branch 'main'
+[main 1a21661] Modified file and lost
  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
+ 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 e
-[b4 59ecd1d] f
+ 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 f
-Switched to a new branch 'brokenbase'
-branch 'brokenbase' set up to track 'origin/main'.
-Switched to a new branch 'b5'
-branch 'b5' set up to track 'brokenbase'.
-[b5 d8d0202] g
+ create mode 100644 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>
- 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
+[other-branch f67ebfb] Irrelevant change
  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
-
+ create mode 100644 elif
 Switched to branch 'main'
-fatal: cannot set up tracking information; starting point 'light' is not a branch
-error: pathspec 'lighttrack' did not match any file(s) known to git
-ok 20 - fail to track lightweight tags
-
-expecting success of 6040.21 'fail to track annotated tags': 
-	git checkout main &&
-	git tag -m heavy heavy &&
-	test_must_fail git branch --track heavytrack heavy >actual &&
-	test_grep ! "set up to track" actual &&
-	test_must_fail git checkout heavytrack
-
-Already on 'main'
-fatal: cannot set up tracking information; starting point 'heavy' is not a branch
-error: pathspec 'heavytrack' did not match any file(s) known to git
-ok 21 - fail to track annotated tags
-
-expecting success of 6040.22 '--set-upstream-to does not change branch': 
-	git branch from-main main &&
-	git branch --set-upstream-to main from-main &&
-	git branch from-topic_2 main &&
-	test_must_fail git config branch.from-topic_2.merge > actual &&
-	git rev-list from-topic_2 &&
-	git update-ref refs/heads/from-topic_2 from-topic_2^ &&
-	git rev-parse from-topic_2 >expect2 &&
-	git branch --set-upstream-to main from-topic_2 &&
-	git config branch.from-main.merge > actual &&
-	git rev-parse from-topic_2 >actual2 &&
-	grep -q "^refs/heads/main$" actual &&
-	cmp expect2 actual2
-
-branch 'from-main' set up to track 'main'.
-ac11e552c8e799a6af00e91a64888439b699d9fd
-7e1cf2dc889e845623128125195d11533d8aef5e
-cc33353f1c71fb0fa9b4671a6a0a8539ad9ecd0a
-branch 'from-topic_2' set up to track 'main'.
-ok 22 - --set-upstream-to does not change branch
-
-expecting success of 6040.23 '--set-upstream-to @{-1}': 
-	git checkout follower &&
-	git checkout from-topic_2 &&
-	git config branch.from-topic_2.merge > expect2 &&
-	git branch --set-upstream-to @{-1} from-main &&
-	git config branch.from-main.merge > actual &&
-	git config branch.from-topic_2.merge > actual2 &&
-	git branch --set-upstream-to follower from-main &&
-	git config branch.from-main.merge > expect &&
-	test_cmp expect2 actual2 &&
-	test_cmp expect actual
-
-Switched to branch 'follower'
-Your branch is ahead of 'main' by 1 commit.
-  (use "git push" to publish your local commits)
-Switched to branch 'from-topic_2'
-Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-branch 'from-main' set up to track 'follower'.
-branch 'from-main' set up to track 'follower'.
-ok 23 - --set-upstream-to @{-1}
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5510-fetch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.git/
-expecting success of 5510.1 'setup': 
-	echo >file original &&
-	git add file &&
-	git commit -a -m original &&
-	git branch -M main
-
-[master (root-commit) 7fb3fb8] original
+[main b2dce95] Another irrelevant change
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 5510.2 'clone and setup child repos': 
-	git clone . one &&
-	(
-		cd one &&
-		echo >file updated by one &&
-		git commit -a -m "updated by one"
-	) &&
-	git clone . two &&
-	(
-		cd two &&
-		git config branch.main.remote one &&
-		git config remote.one.url ../one/.git/ &&
-		git config remote.one.fetch refs/heads/main:refs/heads/one
-	) &&
-	git clone . three &&
-	(
-		cd three &&
-		git config branch.main.remote two &&
-		git config branch.main.merge refs/heads/one &&
-		mkdir -p .git/remotes &&
-		cat >.git/remotes/two <<-\EOF
-		URL: ../two/.git/
-		Pull: refs/heads/main:refs/heads/two
-		Pull: refs/heads/one:refs/heads/one
-		EOF
-	) &&
-	git clone . bundle &&
-	git clone . seven
-
-Cloning into 'one'...
-done.
-[main ffc8fdd] updated by one
+ 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(-)
-Cloning into 'two'...
-done.
-Cloning into 'three'...
-done.
-Cloning into 'bundle'...
-done.
-Cloning into 'seven'...
-done.
-ok 2 - clone and setup child repos
-
-expecting success of 5510.3 'fetch test': 
-	cd "$D" &&
-	echo >file updated by origin &&
-	git commit -a -m "updated by origin" &&
-	cd two &&
-	git fetch &&
-	git rev-parse --verify refs/heads/one &&
-	mine=$(git rev-parse refs/heads/one) &&
-	his=$(cd ../one && git rev-parse refs/heads/main) &&
-	test "z$mine" = "z$his"
-
-[main 76a8623] updated by origin
+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(-)
-From ../one/
- * [new branch]      main       -> one
-ffc8fdde31e0177ad02216ab27bb483fc88169f2
-ok 3 - fetch test
-
-expecting success of 5510.4 'fetch test for-merge': 
-	cd "$D" &&
-	cd three &&
-	git fetch &&
-	git rev-parse --verify refs/heads/two &&
-	git rev-parse --verify refs/heads/one &&
-	main_in_two=$(cd ../two && git rev-parse main) &&
-	one_in_two=$(cd ../two && git rev-parse one) &&
-	{
-		echo "$one_in_two	" &&
-		echo "$main_in_two	not-for-merge"
-	} >expected &&
-	cut -f -2 .git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-From ../two/
- * [new branch]      one        -> one
- * [new branch]      main       -> two
-7fb3fb8404d71a4825bdde839cc3884a77651888
-ffc8fdde31e0177ad02216ab27bb483fc88169f2
-ok 4 - fetch test for-merge
-
-expecting success of 5510.5 'fetch test remote HEAD': 
-	cd "$D" &&
-	cd two &&
-	git fetch &&
-	git rev-parse --verify refs/remotes/origin/HEAD &&
-	git rev-parse --verify refs/remotes/origin/main &&
-	head=$(git rev-parse refs/remotes/origin/HEAD) &&
-	branch=$(git rev-parse refs/remotes/origin/main) &&
-	test "z$head" = "z$branch"
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-ok 5 - fetch test remote HEAD
-
-expecting success of 5510.6 'fetch test remote HEAD change': 
-	cd "$D" &&
-	cd two &&
-	git switch -c other &&
-	git push -u origin other &&
-	git rev-parse --verify refs/remotes/origin/HEAD &&
-	git rev-parse --verify refs/remotes/origin/main &&
-	git rev-parse --verify refs/remotes/origin/other &&
-	git remote set-head origin other &&
-	git fetch &&
-	head=$(git rev-parse refs/remotes/origin/HEAD) &&
-	branch=$(git rev-parse refs/remotes/origin/other) &&
-	test "z$head" = "z$branch"
-Switched to a new branch 'other'
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      other -> other
-branch 'other' set up to track 'origin/other'.
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
-   7fb3fb8..76a8623  main       -> origin/main
-ok 6 - fetch test remote HEAD change
-
-expecting success of 5510.7 'fetch test followRemoteHEAD never': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
-		git config set remote.origin.followRemoteHEAD "never" &&
-		git fetch &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/HEAD
-	)
-
-fatal: Needed a single revision
-ok 7 - fetch test followRemoteHEAD never
-
-expecting success of 5510.8 'fetch test followRemoteHEAD warn no change': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		git fetch >output &&
-		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
-			"but we have ${SQ}other${SQ} locally." >expect &&
-		test_cmp expect output &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-hint: Run 'git remote set-head origin main' to follow the change, or set
-hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
-hint: if you do not want to see this message. Specifically running
-hint: 'git config set remote.origin.followRemoteHEAD main' will disable the warning
-hint: until the remote changes HEAD to something else.
-hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
-ok 8 - fetch test followRemoteHEAD warn no change
-
-expecting success of 5510.9 'fetch test followRemoteHEAD warn create': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		output=$(git fetch) &&
-		test "z" = "z$output" &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/main) &&
-		test "z$head" = "z$branch"
-	)
-
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 9 - fetch test followRemoteHEAD warn create
-
-expecting success of 5510.10 'fetch test followRemoteHEAD warn detached': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
-		git update-ref refs/remotes/origin/HEAD HEAD &&
-		HEAD=$(git log --pretty="%H") &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		git fetch >output &&
-		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
-			"but we have a detached HEAD pointing to" \
-			"${SQ}${HEAD}${SQ} locally." >expect &&
-		test_cmp expect output
-	)
-
-hint: Run 'git remote set-head origin main' to follow the change, or set
-hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
-hint: if you do not want to see this message. Specifically running
-hint: 'git config set remote.origin.followRemoteHEAD main' will disable the warning
-hint: until the remote changes HEAD to something else.
-hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
-ok 10 - fetch test followRemoteHEAD warn detached
-
-expecting success of 5510.11 'fetch test followRemoteHEAD warn quiet': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		output=$(git fetch --quiet) &&
-		test "z" = "z$output" &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 11 - fetch test followRemoteHEAD warn quiet
-
-expecting success of 5510.12 'fetch test followRemoteHEAD warn-if-not-branch branch is same': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn-if-not-main" &&
-		actual=$(git fetch) &&
-		test "z" = "z$actual" &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 12 - fetch test followRemoteHEAD warn-if-not-branch branch is same
-
-expecting success of 5510.13 'fetch test followRemoteHEAD warn-if-not-branch branch is different': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn-if-not-some/different-branch" &&
-		git fetch >actual &&
-		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
-			"but we have ${SQ}other${SQ} locally." >expect &&
-		test_cmp expect actual &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-hint: Run 'git remote set-head origin main' to follow the change, or set
-hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
-hint: if you do not want to see this message. Specifically running
-hint: 'git config set remote.origin.followRemoteHEAD main' will disable the warning
-hint: until the remote changes HEAD to something else.
-hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
-ok 13 - fetch test followRemoteHEAD warn-if-not-branch branch is different
-
-expecting success of 5510.14 'fetch test followRemoteHEAD always': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "always" &&
-		git fetch &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/main) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 14 - fetch test followRemoteHEAD always
-
-expecting success of 5510.15 'fetch --prune on its own works as expected': 
-	cd "$D" &&
-	git clone . prune &&
-	cd prune &&
-	git update-ref refs/remotes/origin/extrabranch main &&
-
-	git fetch --prune origin &&
-	test_must_fail git rev-parse origin/extrabranch
-
-Cloning into 'prune'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/extrabranch
-fatal: ambiguous argument 'origin/extrabranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-origin/extrabranch
-ok 15 - fetch --prune on its own works as expected
-
-expecting success of 5510.16 'fetch --prune with a branch name keeps branches': 
-	cd "$D" &&
-	git clone . prune-branch &&
-	cd prune-branch &&
-	git update-ref refs/remotes/origin/extrabranch main &&
+ok 1 - setup
 
-	git fetch --prune origin main &&
-	git rev-parse origin/extrabranch
+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
 
-Cloning into 'prune-branch'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 16 - fetch --prune with a branch name keeps branches
+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 5510.17 'fetch --prune with a namespace keeps other namespaces': 
-	cd "$D" &&
-	git clone . prune-namespace &&
-	cd prune-namespace &&
+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
 
-	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
-	git rev-parse origin/main
+expecting success of 6012.5 'log --full-history --author-date-order': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 5 - log --full-history --author-date-order
 
-Cloning into 'prune-namespace'...
-done.
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 17 - fetch --prune with a namespace keeps other namespaces
+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 5510.18 'fetch --prune handles overlapping refspecs': 
-	cd "$D" &&
-	git update-ref refs/pull/42/head main &&
-	git clone . prune-overlapping &&
-	cd prune-overlapping &&
-	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
+expecting success of 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
 
-	git fetch --prune origin &&
-	git rev-parse origin/main &&
-	git rev-parse origin/pr/42 &&
+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
 
-	git config --unset-all remote.origin.fetch &&
-	git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
-	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
+expecting success of 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
 
-	git fetch --prune origin &&
-	git rev-parse origin/main &&
-	git rev-parse origin/pr/42
+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
 
-Cloning into 'prune-overlapping'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new ref]         refs/pull/42/head -> origin/pr/42
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 18 - fetch --prune handles overlapping refspecs
+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 5510.19 'fetch --prune --tags prunes branches but not tags': 
-	cd "$D" &&
-	git clone . prune-tags &&
-	cd prune-tags &&
-	git tag sometag main &&
-	# Create what looks like a remote-tracking branch from an earlier
-	# fetch that has since been deleted from the remote:
-	git update-ref refs/remotes/origin/fake-remote main &&
+expecting success of 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
 
-	git fetch --prune --tags origin &&
-	git rev-parse origin/main &&
-	test_must_fail git rev-parse origin/fake-remote &&
-	git rev-parse sometag
+expecting success of 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
 
-Cloning into 'prune-tags'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/fake-remote
-76a8623cbad8bd56c933c6f20106742c826dad9e
-fatal: ambiguous argument 'origin/fake-remote': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-origin/fake-remote
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 19 - fetch --prune --tags prunes branches but not tags
+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 5510.20 'fetch --prune --tags with branch does not prune other things': 
-	cd "$D" &&
-	git clone . prune-tags-branch &&
-	cd prune-tags-branch &&
-	git tag sometag main &&
-	git update-ref refs/remotes/origin/extrabranch main &&
+expecting success of 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
 
-	git fetch --prune --tags origin main &&
-	git rev-parse origin/extrabranch &&
-	git rev-parse sometag
+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
 
-Cloning into 'prune-tags-branch'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 20 - fetch --prune --tags with branch does not prune other things
+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 5510.21 'fetch --prune --tags with refspec prunes based on refspec': 
-	cd "$D" &&
-	git clone . prune-tags-refspec &&
-	cd prune-tags-refspec &&
-	git tag sometag main &&
-	git update-ref refs/remotes/origin/foo/otherbranch main &&
-	git update-ref refs/remotes/origin/extrabranch main &&
+expecting success of 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
 
-	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
-	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
-	git rev-parse origin/extrabranch &&
-	git rev-parse sometag
+expecting success of 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
 
-Cloning into 'prune-tags-refspec'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/foo/otherbranch
-fatal: ambiguous argument 'refs/remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/foo/otherbranch
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 21 - fetch --prune --tags with refspec prunes based on refspec
+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 5510.22 'fetch --tags gets tags even without a configured remote': 
-	REMOTE="$(pwd)/test_tag_1" &&
-	git init test_tag_1 &&
-	(
-		cd test_tag_1 &&
-		test_commit foo
-	) &&
-	git init test_tag_2 &&
-	(
-		cd test_tag_2 &&
-		git fetch --tags "file://$REMOTE" &&
-		echo "foo" >expect &&
-		git tag >actual &&
-		test_cmp expect actual
-	)
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1/.git/
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_2/.git/
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1
- * branch            HEAD       -> FETCH_HEAD
- * [new tag]         foo        -> foo
-ok 22 - fetch --tags gets tags even without a configured remote
+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 5510.23 'fetch --prune fails to delete branches': 
-	cd "$D" &&
-	git clone . prune-fail &&
-	cd prune-fail &&
-	git update-ref refs/remotes/origin/extrabranch main &&
-	git pack-refs --all &&
-	: this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds  &&
-	>.git/packed-refs.new &&
+expecting success of 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
 
-	test_must_fail git fetch --prune origin
+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
 
-Cloning into 'prune-fail'...
-done.
-error: could not delete reference refs/remotes/origin/extrabranch: unable to create file /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/prune-fail/.git/packed-refs.new: File exists
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/extrabranch
-ok 23 - fetch --prune fails to delete branches
+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 5510.24 'fetch --atomic works with a single branch': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+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
 
-	cd "$D" &&
-	git clone . atomic &&
-	git branch atomic-branch &&
-	oid=$(git rev-parse atomic-branch) &&
-	echo "$oid" >expected &&
+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
 
-	git -C atomic fetch --atomic origin &&
-	git -C atomic rev-parse origin/atomic-branch >actual &&
-	test_cmp expected actual &&
-	test $oid = "$(git -C atomic rev-parse --verify FETCH_HEAD)"
+ok 27 - full history simplification without parent
 
-Cloning into 'atomic'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-branch -> origin/atomic-branch
-ok 24 - fetch --atomic works with a single branch
+expecting success of 6012.28 '--full-diff is not affected by --parents': 
+	git log -p --pretty="%H" --full-diff -- file >expected &&
+	git log -p --pretty="%H" --full-diff --parents -- file >actual &&
+	test_cmp expected actual
 
-expecting success of 5510.25 'fetch --atomic works with multiple branches': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+ok 28 - --full-diff is not affected by --parents
 
-	cd "$D" &&
-	git clone . atomic &&
-	git branch atomic-branch-1 &&
-	git branch atomic-branch-2 &&
-	git branch atomic-branch-3 &&
-	git rev-parse refs/heads/atomic-branch-1 refs/heads/atomic-branch-2 refs/heads/atomic-branch-3 >actual &&
+expecting success of 6012.29 'setup rebuild repo': 
+	rm -rf .git * &&
+	git init &&
+	git switch -c topic &&
 
-	git -C atomic fetch --atomic origin &&
-	git -C atomic rev-parse refs/remotes/origin/atomic-branch-1 refs/remotes/origin/atomic-branch-2 refs/remotes/origin/atomic-branch-3 >expected &&
-	test_cmp expected actual
+	echo base >file &&
+	git add file &&
+	test_commit I &&
 
-Cloning into 'atomic'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-branch-1 -> origin/atomic-branch-1
- * [new branch]      atomic-branch-2 -> origin/atomic-branch-2
- * [new branch]      atomic-branch-3 -> origin/atomic-branch-3
-ok 25 - fetch --atomic works with multiple branches
+	echo A >file &&
+	git add file &&
+	test_commit A &&
 
-expecting success of 5510.26 'fetch --atomic works with mixed branches and tags': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+	git switch -c branchB I &&
+	echo B >file &&
+	git add file &&
+	test_commit B &&
 
-	cd "$D" &&
-	git clone . atomic &&
-	git branch atomic-mixed-branch &&
-	git tag atomic-mixed-tag &&
-	git rev-parse refs/heads/atomic-mixed-branch refs/tags/atomic-mixed-tag >actual &&
+	git switch topic &&
+	test_must_fail git merge -m "M" B &&
+	echo A >file &&
+	echo B >>file &&
+	git add file &&
+	git merge --continue &&
+	note M &&
 
-	git -C atomic fetch --tags --atomic origin &&
-	git -C atomic rev-parse refs/remotes/origin/atomic-mixed-branch refs/tags/atomic-mixed-tag >expected &&
-	test_cmp expected actual
+	echo C >other &&
+	git add other &&
+	test_commit C &&
 
-Cloning into 'atomic'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-mixed-branch -> origin/atomic-mixed-branch
- * [new tag]         atomic-mixed-tag    -> atomic-mixed-tag
-ok 26 - fetch --atomic works with mixed branches and tags
+	git switch -c branchX I &&
+	echo X >file &&
+	git add file &&
+	test_commit X &&
 
-expecting success of 5510.27 'fetch --atomic prunes references': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+	git switch -c branchR M &&
+	git merge -m R -Xtheirs X &&
+	note R &&
 
-	cd "$D" &&
-	git branch atomic-prune-delete &&
-	git clone . atomic &&
-	git branch --delete atomic-prune-delete &&
-	git branch atomic-prune-create &&
-	git rev-parse refs/heads/atomic-prune-create >actual &&
+	git switch topic &&
+	git merge -m N R &&
+	note N &&
 
-	git -C atomic fetch --prune --atomic origin &&
-	test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-prune-delete &&
-	git -C atomic rev-parse refs/remotes/origin/atomic-prune-create >expected &&
-	test_cmp expected actual
+	git switch -c branchY M &&
+	echo Y >y &&
+	git add y &&
+	test_commit Y &&
 
-Cloning into 'atomic'...
-done.
-Deleted branch atomic-prune-delete (was 76a8623).
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)              -> origin/atomic-prune-delete
- * [new branch]      atomic-prune-create -> origin/atomic-prune-create
-fatal: ambiguous argument 'refs/remotes/origin/atomic-prune-delete': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/atomic-prune-delete
-ok 27 - fetch --atomic prunes references
+	git switch -c branchZ C &&
+	echo Z >z &&
+	git add z &&
+	test_commit Z &&
 
-expecting success of 5510.28 'fetch --atomic aborts with non-fast-forward update': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+	git switch topic &&
+	git merge -m O Z &&
+	note O &&
 
-	cd "$D" &&
-	git branch atomic-non-ff &&
-	git clone . atomic &&
-	git rev-parse HEAD >actual &&
+	git merge -m P Y &&
+	note P
 
-	git branch atomic-new-branch &&
-	parent_commit=$(git rev-parse atomic-non-ff~) &&
-	git update-ref refs/heads/atomic-non-ff $parent_commit &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6012-rev-list-simplify/.git/
+Switched to a new branch 'topic'
+[topic (root-commit) 8df680a] I
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 I.t
+ create mode 100644 file
+[topic 93fcd66] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 A.t
+Switched to a new branch 'branchB'
+[branchB 2bc7954] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B.t
+Switched to branch 'topic'
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+[topic 58a754c] M
+ Author: A U Thor <author@example.com>
+[topic f73bd6d] C
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 other
+Switched to a new branch 'branchX'
+[branchX a2f4788] X
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 X.t
+Switched to a new branch 'branchR'
+Auto-merging file
+Merge made by the 'ort' strategy.
+ X.t  | 1 +
+ file | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 X.t
+Switched to branch 'topic'
+Merge made by the 'ort' strategy.
+ X.t  | 1 +
+ file | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 X.t
+Switched to a new branch 'branchY'
+[branchY 85e7a8e] Y
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Y.t
+ create mode 100644 y
+Switched to a new branch 'branchZ'
+[branchZ 35501c2] Z
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Z.t
+ create mode 100644 z
+Switched to branch 'topic'
+Merge made by the 'ort' strategy.
+ Z.t | 1 +
+ z   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Z.t
+ create mode 100644 z
+Merge made by the 'ort' strategy.
+ Y.t | 1 +
+ y   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Y.t
+ create mode 100644 y
+ok 29 - setup rebuild repo
 
-	test_must_fail git -C atomic fetch --atomic origin refs/heads/*:refs/remotes/origin/* &&
-	test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-new-branch &&
-	git -C atomic rev-parse refs/remotes/origin/atomic-non-ff >expected &&
-	test_cmp expected actual &&
-	test_must_be_empty atomic/.git/FETCH_HEAD
+expecting success of 6012.30 'log -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 30 - log -- file
 
-Cloning into 'atomic'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-new-branch -> origin/atomic-new-branch
- ! [rejected]        atomic-non-ff     -> origin/atomic-non-ff  (non-fast-forward)
-fatal: ambiguous argument 'refs/remotes/origin/atomic-new-branch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/atomic-new-branch
-ok 28 - fetch --atomic aborts with non-fast-forward update
+expecting success of 6012.31 'log --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 31 - log --show-pulls -- file
 
-expecting success of 5510.29 'fetch --atomic executes a single reference transaction only': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+expecting success of 6012.32 'log --full-history --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 32 - log --full-history --topo-order -- file
 
-	cd "$D" &&
-	git clone . atomic &&
-	git branch atomic-hooks-1 &&
-	git branch atomic-hooks-2 &&
-	head_oid=$(git rev-parse HEAD) &&
+expecting success of 6012.33 'log --simplify-merges --topo-order --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 33 - log --simplify-merges --topo-order --show-pulls -- file
 
-	cat >expected <<-EOF &&
-		prepared
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
-		committed
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
-	EOF
+expecting success of 6012.34 'log --simplify-merges --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 34 - log --simplify-merges --topo-order -- file
 
-	rm -f atomic/actual &&
-	test_hook -C atomic reference-transaction <<-\EOF &&
-		( echo "$*" && cat ) >>actual
-	EOF
+expecting success of 6012.35 'log --first-parent -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 35 - log --first-parent -- file
 
-	git -C atomic fetch --atomic origin &&
-	test_cmp expected atomic/actual
+expecting success of 6012.36 'log --first-parent --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 36 - log --first-parent --show-pulls -- file
 
-Cloning into 'atomic'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-hooks-1 -> origin/atomic-hooks-1
- * [new branch]      atomic-hooks-2 -> origin/atomic-hooks-2
-ok 29 - fetch --atomic executes a single reference transaction only
+expecting success of 6012.37 'log --topo-order --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 37 - log --topo-order --ancestry-path A..HEAD -- file
 
-expecting success of 5510.30 'fetch --atomic aborts all reference updates if hook aborts': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+expecting success of 6012.38 'log --topo-order --show-pulls --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 38 - log --topo-order --show-pulls --ancestry-path A..HEAD -- file
 
-	cd "$D" &&
-	git clone . atomic &&
-	git branch atomic-hooks-abort-1 &&
-	git branch atomic-hooks-abort-2 &&
-	git branch atomic-hooks-abort-3 &&
-	git tag atomic-hooks-abort &&
-	head_oid=$(git rev-parse HEAD) &&
+expecting success of 6012.39 'log --topo-order --full-history --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 39 - log --topo-order --full-history --ancestry-path A..HEAD -- file
 
-	cat >expected <<-EOF &&
-		prepared
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
-		$ZERO_OID $head_oid refs/tags/atomic-hooks-abort
-		aborted
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
-		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
-		$ZERO_OID $head_oid refs/tags/atomic-hooks-abort
-	EOF
+expecting success of 6012.40 'log --topo-order --simplify-merges --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 40 - log --topo-order --simplify-merges --ancestry-path A..HEAD -- file
 
-	rm -f atomic/actual &&
-	test_hook -C atomic/.git reference-transaction <<-\EOF &&
-		( echo "$*" && cat ) >>actual
-		exit 1
+expecting success of 6012.41 'log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 41 - log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file
+
+expecting success of 6012.42 'log --graph --simplify-merges --show-pulls': 
+	cat >expect <<-\EOF &&
+	* N
+	*   R
+	|\  
+	| * X
+	* |   M
+	|\ \  
+	| * | B
+	| |/  
+	* / A
+	|/  
+	* I
 	EOF
+	git log --graph --pretty="%s" \
+		--simplify-merges --show-pulls \
+		-- file >actual &&
+	test_cmp expect actual
 
-	git -C atomic for-each-ref >expected-refs &&
-	test_must_fail git -C atomic fetch --tags --atomic origin &&
-	git -C atomic for-each-ref >actual-refs &&
-	test_cmp expected-refs actual-refs &&
-	test_must_be_empty atomic/.git/FETCH_HEAD
+ok 42 - log --graph --simplify-merges --show-pulls
 
-Cloning into 'atomic'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-hooks-abort-1 -> origin/atomic-hooks-abort-1
- * [new branch]      atomic-hooks-abort-2 -> origin/atomic-hooks-abort-2
- * [new branch]      atomic-hooks-abort-3 -> origin/atomic-hooks-abort-3
- * [new tag]         atomic-hooks-abort   -> atomic-hooks-abort
-fatal: ref updates aborted by hook
-ok 30 - fetch --atomic aborts all reference updates if hook aborts
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6003-rev-list-topo-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 5510.31 'fetch --atomic --append appends to FETCH_HEAD': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+expecting success of 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
+ok 2 - simple topo order
 
-	cd "$D" &&
-	git clone . atomic &&
-	oid=$(git rev-parse HEAD) &&
+expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
+ok 3 - simple date order
 
-	git branch atomic-fetch-head-1 &&
-	git -C atomic fetch --atomic origin atomic-fetch-head-1 &&
-	test_line_count = 1 atomic/.git/FETCH_HEAD &&
+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
 
-	git branch atomic-fetch-head-2 &&
-	git -C atomic fetch --atomic --append origin atomic-fetch-head-2 &&
-	test_line_count = 2 atomic/.git/FETCH_HEAD &&
-	cp atomic/.git/FETCH_HEAD expected &&
+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)
 
-	test_hook -C atomic reference-transaction <<-\EOF &&
-		exit 1
-	EOF
+expecting success of 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
+ok 6 - multiple heads
 
-	git branch atomic-fetch-head-3 &&
-	test_must_fail git -C atomic fetch --atomic --append origin atomic-fetch-head-3 &&
-	test_cmp expected atomic/.git/FETCH_HEAD
+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
 
-Cloning into 'atomic'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            atomic-fetch-head-1 -> FETCH_HEAD
- * [new branch]      atomic-fetch-head-1 -> origin/atomic-fetch-head-1
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            atomic-fetch-head-2 -> FETCH_HEAD
- * [new branch]      atomic-fetch-head-2 -> origin/atomic-fetch-head-2
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            atomic-fetch-head-3 -> FETCH_HEAD
- * [new branch]      atomic-fetch-head-3 -> origin/atomic-fetch-head-3
-fatal: ref updates aborted by hook
-ok 31 - fetch --atomic --append appends to FETCH_HEAD
+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 5510.32 '--refmap="" ignores configured refspec': 
-	cd "$TRASH_DIRECTORY" &&
-	git clone "$D" remote-refs &&
-	git -C remote-refs rev-parse remotes/origin/main >old &&
-	git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
-	git -C remote-refs rev-parse remotes/origin/main >new &&
-	git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
-	git -C remote-refs rev-parse remotes/origin/main >actual &&
-	test_cmp new actual &&
-	git -C remote-refs fetch origin &&
-	git -C remote-refs rev-parse remotes/origin/main >actual &&
-	test_cmp old actual
+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
 
-Cloning into 'remote-refs'...
-done.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
- * [new branch]      atomic-branch     -> refs/hidden/origin/atomic-branch
- * [new branch]      atomic-branch-1   -> refs/hidden/origin/atomic-branch-1
- * [new branch]      atomic-branch-2   -> refs/hidden/origin/atomic-branch-2
- * [new branch]      atomic-branch-3   -> refs/hidden/origin/atomic-branch-3
- * [new branch]      atomic-fetch-head-1 -> refs/hidden/origin/atomic-fetch-head-1
- * [new branch]      atomic-fetch-head-2 -> refs/hidden/origin/atomic-fetch-head-2
- * [new branch]      atomic-fetch-head-3 -> refs/hidden/origin/atomic-fetch-head-3
- * [new branch]      atomic-hooks-1    -> refs/hidden/origin/atomic-hooks-1
- * [new branch]      atomic-hooks-2    -> refs/hidden/origin/atomic-hooks-2
- * [new branch]      atomic-hooks-abort-1 -> refs/hidden/origin/atomic-hooks-abort-1
- * [new branch]      atomic-hooks-abort-2 -> refs/hidden/origin/atomic-hooks-abort-2
- * [new branch]      atomic-hooks-abort-3 -> refs/hidden/origin/atomic-hooks-abort-3
- * [new branch]      atomic-mixed-branch -> refs/hidden/origin/atomic-mixed-branch
- * [new branch]      atomic-new-branch -> refs/hidden/origin/atomic-new-branch
- * [new branch]      atomic-non-ff     -> refs/hidden/origin/atomic-non-ff
- * [new branch]      atomic-prune-create -> refs/hidden/origin/atomic-prune-create
- * [new branch]      main              -> refs/hidden/origin/main
- * [new branch]      other             -> refs/hidden/origin/other
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
-   7fb3fb8..76a8623  main       -> origin/main
-ok 32 - --refmap="" ignores configured refspec
+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 5510.33 '--refmap="" and --prune': 
-	git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
-	git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
-	git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
-	git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
-	test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
-	git -C remote-refs fetch --prune origin &&
-	test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
+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
 
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
- - [deleted]         (none)               -> refs/hidden/foo/otherbranch
- - [deleted]         (none)               -> refs/hidden/origin/atomic-branch
- - [deleted]         (none)               -> refs/hidden/origin/atomic-branch-1
- - [deleted]         (none)               -> refs/hidden/origin/atomic-branch-2
- - [deleted]         (none)               -> refs/hidden/origin/atomic-branch-3
- - [deleted]         (none)               -> refs/hidden/origin/atomic-fetch-head-1
- - [deleted]         (none)               -> refs/hidden/origin/atomic-fetch-head-2
- - [deleted]         (none)               -> refs/hidden/origin/atomic-fetch-head-3
- - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-1
- - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-2
- - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-abort-1
- - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-abort-2
- - [deleted]         (none)               -> refs/hidden/origin/atomic-hooks-abort-3
- - [deleted]         (none)               -> refs/hidden/origin/atomic-mixed-branch
- - [deleted]         (none)               -> refs/hidden/origin/atomic-new-branch
- - [deleted]         (none)               -> refs/hidden/origin/atomic-non-ff
- - [deleted]         (none)               -> refs/hidden/origin/atomic-prune-create
- - [deleted]         (none)               -> refs/hidden/origin/main
- - [deleted]         (none)               -> refs/hidden/origin/other
- * [new branch]      atomic-branch        -> refs/hidden/atomic-branch
- * [new branch]      atomic-branch-1      -> refs/hidden/atomic-branch-1
- * [new branch]      atomic-branch-2      -> refs/hidden/atomic-branch-2
- * [new branch]      atomic-branch-3      -> refs/hidden/atomic-branch-3
- * [new branch]      atomic-fetch-head-1  -> refs/hidden/atomic-fetch-head-1
- * [new branch]      atomic-fetch-head-2  -> refs/hidden/atomic-fetch-head-2
- * [new branch]      atomic-fetch-head-3  -> refs/hidden/atomic-fetch-head-3
- * [new branch]      atomic-hooks-1       -> refs/hidden/atomic-hooks-1
- * [new branch]      atomic-hooks-2       -> refs/hidden/atomic-hooks-2
- * [new branch]      atomic-hooks-abort-1 -> refs/hidden/atomic-hooks-abort-1
- * [new branch]      atomic-hooks-abort-2 -> refs/hidden/atomic-hooks-abort-2
- * [new branch]      atomic-hooks-abort-3 -> refs/hidden/atomic-hooks-abort-3
- * [new branch]      atomic-mixed-branch  -> refs/hidden/atomic-mixed-branch
- * [new branch]      atomic-new-branch    -> refs/hidden/atomic-new-branch
- * [new branch]      atomic-non-ff        -> refs/hidden/atomic-non-ff
- * [new branch]      atomic-prune-create  -> refs/hidden/atomic-prune-create
- * [new branch]      main                 -> refs/hidden/main
- * [new branch]      other                -> refs/hidden/other
-76a8623cbad8bd56c933c6f20106742c826dad9e
-fatal: ambiguous argument 'refs/hidden/foo/otherbranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/hidden/foo/otherbranch
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch
- - [deleted]         (none)     -> origin/foo/otherbranch
-fatal: ambiguous argument 'remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-remotes/origin/foo/otherbranch
-ok 33 - --refmap="" and --prune
+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 5510.34 'fetch tags when there is no tags': 
+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
 
-    cd "$D" &&
+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
 
-    mkdir notags &&
-    cd notags &&
-    git init &&
+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
 
-    git fetch -t ..
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/notags/.git/
-From ..
- * branch            HEAD               -> FETCH_HEAD
- * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
- * [new tag]         atomic-mixed-tag   -> atomic-mixed-tag
-ok 34 - fetch tags when there is no tags
+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 5510.35 'fetch following tags': 
+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
 
-	cd "$D" &&
-	git tag -a -m "annotated" anno HEAD &&
-	git tag light HEAD &&
+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
 
-	mkdir four &&
-	cd four &&
-	git init &&
+expecting success of 6003.21 'max-count 10 - topo order': check_output max-count-10-topo-order "git rev-list --topo-order  --max-count=10 l5"
+ok 21 - max-count 10 - topo order
 
-	git fetch .. :track &&
-	git show-ref --verify refs/tags/anno &&
-	git show-ref --verify refs/tags/light
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/four/.git/
-From ..
- * [new ref]         HEAD               -> track
- * [new tag]         anno               -> anno
- * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
- * [new tag]         atomic-mixed-tag   -> atomic-mixed-tag
- * [new tag]         light              -> light
-39bf91b30d24dba0a5dbe320673d4f8a1f67d1f1 refs/tags/anno
-76a8623cbad8bd56c933c6f20106742c826dad9e refs/tags/light
-ok 35 - fetch following tags
+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 5510.36 'fetch uses remote ref names to describe new refs': 
-	cd "$D" &&
-	git init descriptive &&
-	(
-		cd descriptive &&
-		git config remote.o.url .. &&
-		git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
-		git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
-		git fetch o
-	) &&
-	git tag -a -m "Descriptive tag" descriptive-tag &&
-	git branch descriptive-branch &&
-	git checkout descriptive-branch &&
-	echo "Nuts" >crazy &&
-	git add crazy &&
-	git commit -a -m "descriptive commit" &&
-	git update-ref refs/others/crazy HEAD &&
-	(
-		cd descriptive &&
-		git fetch o 2>actual &&
-		test_grep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
-		test_grep "new tag.* -> descriptive-tag$" actual &&
-		test_grep "new ref.* -> crazy$" actual
-	) &&
-	git checkout main
+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.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/descriptive/.git/
-From ..
- * [new branch]      atomic-branch       -> refs/crazyheads/atomic-branch
- * [new branch]      atomic-branch-1     -> refs/crazyheads/atomic-branch-1
- * [new branch]      atomic-branch-2     -> refs/crazyheads/atomic-branch-2
- * [new branch]      atomic-branch-3     -> refs/crazyheads/atomic-branch-3
- * [new branch]      atomic-fetch-head-1 -> refs/crazyheads/atomic-fetch-head-1
- * [new branch]      atomic-fetch-head-2 -> refs/crazyheads/atomic-fetch-head-2
- * [new branch]      atomic-fetch-head-3 -> refs/crazyheads/atomic-fetch-head-3
- * [new branch]      atomic-hooks-1      -> refs/crazyheads/atomic-hooks-1
- * [new branch]      atomic-hooks-2      -> refs/crazyheads/atomic-hooks-2
- * [new branch]      atomic-hooks-abort-1 -> refs/crazyheads/atomic-hooks-abort-1
- * [new branch]      atomic-hooks-abort-2 -> refs/crazyheads/atomic-hooks-abort-2
- * [new branch]      atomic-hooks-abort-3 -> refs/crazyheads/atomic-hooks-abort-3
- * [new branch]      atomic-mixed-branch -> refs/crazyheads/atomic-mixed-branch
- * [new branch]      atomic-new-branch   -> refs/crazyheads/atomic-new-branch
- * [new branch]      atomic-non-ff       -> refs/crazyheads/atomic-non-ff
- * [new branch]      atomic-prune-create -> refs/crazyheads/atomic-prune-create
- * [new branch]      main                -> refs/crazyheads/main
- * [new branch]      other               -> refs/crazyheads/other
- * [new tag]         anno                -> anno
- * [new tag]         atomic-hooks-abort  -> atomic-hooks-abort
- * [new tag]         atomic-mixed-tag    -> atomic-mixed-tag
- * [new tag]         light               -> light
-Switched to branch 'descriptive-branch'
-[descriptive-branch e7f94d4] descriptive commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 crazy
- * [new branch]      descriptive-branch -> refs/crazyheads/descriptive-branch
- * [new tag]         descriptive-tag    -> descriptive-tag
- * [new ref]         refs/others/crazy  -> crazy
-Switched to branch 'main'
-ok 36 - fetch uses remote ref names to describe new refs
+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 5510.37 'fetch must not resolve short tag name': 
+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
 
-	cd "$D" &&
+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
 
-	mkdir five &&
-	cd five &&
-	git init &&
+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
 
-	test_must_fail git fetch .. anno:five
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/five/.git/
-error: cannot update ref 'refs/heads/five': trying to write non-commit object 39bf91b30d24dba0a5dbe320673d4f8a1f67d1f1 to branch 'refs/heads/five'
-From ..
- ! [new tag]         anno       -> five  (unable to update local ref)
- * [new tag]         anno       -> anno
-ok 37 - fetch must not resolve short tag name
+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 5510.38 'fetch can now resolve short remote name': 
+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)
 
-	cd "$D" &&
-	git update-ref refs/remotes/six/HEAD HEAD &&
+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)
 
-	mkdir six &&
-	cd six &&
-	git init &&
+expecting success of 6003.35 'don't print things unreachable from one branch': check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
+ok 35 - don't print things unreachable from one branch
 
-	git fetch .. six:six
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/six/.git/
-From ..
- * [new ref]         six/HEAD           -> six
- * [new tag]         anno               -> anno
- * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
- * [new tag]         atomic-mixed-tag   -> atomic-mixed-tag
- * [new tag]         descriptive-tag    -> descriptive-tag
- * [new tag]         light              -> light
-ok 38 - fetch can now resolve short remote name
+# passed all 36 test(s)
+1..36
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6017-rev-list-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6017-rev-list-stdin/.git/
+expecting success of 6017.1 'setup': 
+	(
+		for i in 0 $them
+		do
+			for j in $them
+			do
+				echo $i.$j >file-$j &&
+				git add file-$j || exit
+			done &&
+			test_tick &&
+			git commit -m $i || exit
+		done &&
+		for i in $them
+		do
+			git checkout -b side-$i main~$i &&
+			echo updated $i >file-$i &&
+			git add file-$i &&
+			test_tick &&
+			git commit -m side-$i || exit
+		done &&
 
-expecting success of 5510.39 'create bundle 1': 
-	cd "$D" &&
-	echo >file updated again by origin &&
-	git commit -a -m "tip" &&
-	git bundle create --version=3 bundle1 main^..main
+		git update-ref refs/heads/-dashed-branch HEAD
+	)
 
-[main 1b60884] tip
+[main (root-commit) b2718df] 0
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+ create mode 100644 file-3
+ create mode 100644 file-4
+ create mode 100644 file-5
+ create mode 100644 file-6
+ create mode 100644 file-7
+[main 4c7c799] 1
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main a24e200] 2
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 72c7eca] 3
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 680e5c3] 4
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 496e2a9] 5
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main c5757f4] 6
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main a21e804] 7
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+Switched to a new branch 'side-1'
+[side-1 c52bcff] side-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 39 - create bundle 1
+Switched to a new branch 'side-2'
+[side-2 fe893aa] side-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-3'
+[side-3 48694b2] side-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-4'
+[side-4 e31c210] side-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-5'
+[side-5 5786a4a] side-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-6'
+[side-6 6879e94] side-6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-7'
+[side-7 a65952b] side-7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 5510.40 'header of bundle looks right': 
-	cat >expect <<-EOF &&
-	# v3 git bundle
-	@object-format=$(test_oid algo)
-	-OID updated by origin
-	OID refs/heads/main
+expecting success of 6017.2 'check rev-list main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input main
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 2 - check rev-list main
 
-	EOF
-	sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
-	test_cmp expect actual
+expecting success of 6017.3 'check log --stat main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input main
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 3 - check log --stat main
 
-ok 40 - header of bundle looks right
+expecting success of 6017.4 'check rev-list side-1 ^side-4': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+ok 4 - check rev-list side-1 ^side-4
 
-expecting success of 5510.41 'create bundle 2': 
-	cd "$D" &&
-	git bundle create bundle2 main~2..main
+expecting success of 6017.5 'check log --stat side-1 ^side-4': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-4
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+ok 5 - check log --stat side-1 ^side-4
 
-ok 41 - create bundle 2
+expecting success of 6017.6 'check rev-list side-1 ^side-7 --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 6 - check rev-list side-1 ^side-7 --
 
-expecting success of 5510.42 'unbundle 1': 
-	cd "$D/bundle" &&
-	git checkout -b some-branch &&
-	test_must_fail git fetch "$D/bundle1" main:main
+expecting success of 6017.7 'check log --stat side-1 ^side-7 --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+ok 7 - check log --stat side-1 ^side-7 --
 
-Switched to a new branch 'some-branch'
-error: Repository lacks these prerequisite commits:
-error: 76a8623cbad8bd56c933c6f20106742c826dad9e 
-ok 42 - unbundle 1
+expecting success of 6017.8 'check rev-list side-1 ^side-7 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-1
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 8 - check rev-list side-1 ^side-7 -- file-1
 
-expecting success of 5510.43 'bundle 1 has only 3 files ': 
-	cd "$D" &&
-	test_bundle_object_count bundle1 3
+expecting success of 6017.9 'check log --stat side-1 ^side-7 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-1
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - check log --stat side-1 ^side-7 -- file-1
 
-e3759ee48778fefb71afa2815c2d903848b63eb6
-ok 43 - bundle 1 has only 3 files 
+expecting success of 6017.10 'check rev-list side-1 ^side-7 -- file-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-2
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 10 - check rev-list side-1 ^side-7 -- file-2
 
-expecting success of 5510.44 'unbundle 2': 
-	cd "$D/bundle" &&
-	git fetch ../bundle2 main:main &&
-	test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
+expecting success of 6017.11 'check log --stat side-1 ^side-7 -- file-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-2
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - check log --stat side-1 ^side-7 -- file-2
 
-From ../bundle2
-   7fb3fb8..1b60884  main       -> main
-ok 44 - unbundle 2
+expecting success of 6017.12 'check rev-list side-3 ^side-4 -- file-3': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-4
+input --
+input file-3
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+ok 12 - check rev-list side-3 ^side-4 -- file-3
 
-expecting success of 5510.45 'bundle does not prerequisite objects': 
-	cd "$D" &&
-	touch file2 &&
-	git add file2 &&
-	git commit -m add.file2 file2 &&
-	git bundle create bundle3 -1 HEAD &&
-	test_bundle_object_count bundle3 3
+expecting success of 6017.13 'check log --stat side-3 ^side-4 -- file-3': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-4
+input --
+input file-3
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - check log --stat side-3 ^side-4 -- file-3
 
-[main b4eae8a] add.file2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-92f477f64fe991be465f169fe8ba0908bf49305b
-ok 45 - bundle does not prerequisite objects
+expecting success of 6017.14 'check rev-list side-3 ^side-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+ok 14 - check rev-list side-3 ^side-2
 
-expecting success of 5510.46 'bundle should be able to create a full history': 
+expecting success of 6017.15 'check log --stat side-3 ^side-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - check log --stat side-3 ^side-2
 
-	cd "$D" &&
-	git tag -a -m "1.0" v1.0 main &&
-	git bundle create bundle4 v1.0
+expecting success of 6017.16 'check rev-list side-3 ^side-2 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+input --
+input file-1
+ok 16 - check rev-list side-3 ^side-2 -- file-1
 
+expecting success of 6017.17 'check log --stat side-3 ^side-2 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+input --
+input file-1
+ok 17 - check log --stat side-3 ^side-2 -- file-1
 
-ok 46 - bundle should be able to create a full history
+expecting success of 6017.18 'check rev-list --all': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 18 - check rev-list --all
 
-expecting success of 5510.47 'fetch with a non-applying branch.<name>.merge': 
-	git config branch.main.remote yeti &&
-	git config branch.main.merge refs/heads/bigfoot &&
-	git config remote.blub.url one &&
-	git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
-	git fetch blub
+expecting success of 6017.19 'check log --stat --all': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 19 - check log --stat --all
 
-From one
- * [new branch]      main       -> one/main
-ok 47 - fetch with a non-applying branch.<name>.merge
+expecting success of 6017.20 'check rev-list --all --not --branches': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input --branches
+ok 20 - check rev-list --all --not --branches
 
-expecting success of 5510.48 'fetch from GIT URL with a non-applying branch.<name>.merge [1]': 
-	one_head=$(cd one && git rev-parse HEAD) &&
-	this_head=$(git rev-parse HEAD) &&
-	rm .git/FETCH_HEAD &&
-	git fetch one &&
-	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
-	test $this_head = "$(git rev-parse --verify HEAD)"
+expecting success of 6017.21 'check log --stat --all --not --branches': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input --branches
+ok 21 - check log --stat --all --not --branches
 
-From one
- * branch            HEAD       -> FETCH_HEAD
-ok 48 - fetch from GIT URL with a non-applying branch.<name>.merge [1]
+expecting success of 6017.22 'check rev-list --glob=refs/heads': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 22 - check rev-list --glob=refs/heads
 
-expecting success of 5510.49 'fetch from GIT URL with a non-applying branch.<name>.merge [2]': 
-	one_ref=$(cd one && git symbolic-ref HEAD) &&
-	git config branch.main.remote blub &&
-	git config branch.main.merge "$one_ref" &&
-	rm .git/FETCH_HEAD &&
-	git fetch one &&
-	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
-	test $this_head = "$(git rev-parse --verify HEAD)"
+expecting success of 6017.23 'check log --stat --glob=refs/heads': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 23 - check log --stat --glob=refs/heads
 
-From one
- * branch            HEAD       -> FETCH_HEAD
-ok 49 - fetch from GIT URL with a non-applying branch.<name>.merge [2]
+expecting success of 6017.24 'check rev-list --glob=refs/heads --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 24 - check rev-list --glob=refs/heads --
 
-expecting success of 5510.50 'fetch from GIT URL with a non-applying branch.<name>.merge [3]': 
-	git config branch.main.merge "${one_ref}_not" &&
-	rm .git/FETCH_HEAD &&
-	git fetch one &&
-	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
-	test $this_head = "$(git rev-parse --verify HEAD)"
+expecting success of 6017.25 'check log --stat --glob=refs/heads --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 25 - check log --stat --glob=refs/heads --
 
-From one
- * branch            HEAD       -> FETCH_HEAD
-ok 50 - fetch from GIT URL with a non-applying branch.<name>.merge [3]
+expecting success of 6017.26 'check rev-list --glob=refs/heads -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+input file-1
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 26 - check rev-list --glob=refs/heads -- file-1
 
-expecting success of 5510.51 'quoting of a strangely named repo': 
-	test_must_fail git fetch "a\\!'b" > result 2>&1 &&
-	grep "fatal: 'a\\\\!'b'" result
+expecting success of 6017.27 'check log --stat --glob=refs/heads -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+input file-1
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  1 file changed, 1 insertion(+)
+ok 27 - check log --stat --glob=refs/heads -- file-1
 
-fatal: 'a\!'b' does not appear to be a git repository
-ok 51 - quoting of a strangely named repo
+expecting success of 6017.28 'check rev-list --end-of-options -dashed-branch': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --end-of-options
+input -dashed-branch
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 28 - check rev-list --end-of-options -dashed-branch
 
-expecting success of 5510.52 'bundle should record HEAD correctly': 
+expecting success of 6017.29 'check log --stat --end-of-options -dashed-branch': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --end-of-options
+input -dashed-branch
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 29 - check log --stat --end-of-options -dashed-branch
 
-	cd "$D" &&
-	git bundle create bundle5 HEAD main &&
-	git bundle list-heads bundle5 >actual &&
-	for h in HEAD refs/heads/main
-	do
-		echo "$(git rev-parse --verify $h) $h" || return 1
-	done >expect &&
+expecting success of 6017.30 'check rev-list --all --not refs/heads/main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input refs/heads/main
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+ok 30 - check rev-list --all --not refs/heads/main
+
+expecting success of 6017.31 'check log --stat --all --not refs/heads/main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input refs/heads/main
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 31 - check log --stat --all --not refs/heads/main
+
+expecting success of 6017.32 'not only --stdin': 
+	cat >expect <<-EOF &&
+	7
+
+	file-1
+	file-2
+	EOF
+	cat >input <<-EOF &&
+	^main^
+	--
+	file-2
+	EOF
+	git log --pretty=tformat:%s --name-only --stdin main -- file-1 \
+		<input >actual &&
 	test_cmp expect actual
 
+ok 32 - not only --stdin
 
-ok 52 - bundle should record HEAD correctly
+expecting success of 6017.33 'pseudo-opt with missing value': 
+	cat >input <<-EOF &&
+	--glob
+	refs/heads
+	EOF
 
-expecting success of 5510.53 'mark initial state of origin/main': 
-	(
-		cd three &&
-		git tag base-origin-main refs/remotes/origin/main
-	)
+	cat >expect <<-EOF &&
+	fatal: Option ${SQ}--glob${SQ} requires a value
+	EOF
 
-ok 53 - mark initial state of origin/main
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
 
-expecting success of 5510.54 'explicit fetch should update tracking': 
+ok 33 - pseudo-opt with missing value
 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/main base-origin-main &&
-		o=$(git rev-parse --verify refs/remotes/origin/main) &&
-		git fetch origin main &&
-		n=$(git rev-parse --verify refs/remotes/origin/main) &&
-		test "$o" != "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side
-	)
+expecting success of 6017.34 'pseudo-opt with invalid value': 
+	cat >input <<-EOF &&
+	--no-walk=garbage
+	EOF
 
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-   7fb3fb8..b4eae8a  main       -> origin/main
-fatal: Needed a single revision
-ok 54 - explicit fetch should update tracking
+	cat >expect <<-EOF &&
+	error: invalid argument to --no-walk
+	fatal: invalid option ${SQ}--no-walk=garbage${SQ} in --stdin mode
+	EOF
 
-expecting success of 5510.55 'explicit pull should update tracking': 
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/main base-origin-main &&
-		o=$(git rev-parse --verify refs/remotes/origin/main) &&
-		git pull origin main &&
-		n=$(git rev-parse --verify refs/remotes/origin/main) &&
-		test "$o" != "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side
-	)
+ok 34 - pseudo-opt with invalid value
 
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-   7fb3fb8..b4eae8a  main       -> origin/main
-Updating 7fb3fb8..b4eae8a
-Fast-forward
- file  | 2 +-
- file2 | 0
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 file2
-fatal: Needed a single revision
-ok 55 - explicit pull should update tracking
+expecting success of 6017.35 'unknown option without --end-of-options': 
+	cat >input <<-EOF &&
+	-dashed-branch
+	EOF
 
-expecting success of 5510.56 'explicit --refmap is allowed only with command-line refspec': 
-	cd "$D" &&
-	(
-		cd three &&
-		test_must_fail git fetch --refmap="*:refs/remotes/none/*"
-	)
+	cat >expect <<-EOF &&
+	fatal: invalid option ${SQ}-dashed-branch${SQ} in --stdin mode
+	EOF
 
-fatal: --refmap option is only meaningful with command-line refspec(s)
-ok 56 - explicit --refmap is allowed only with command-line refspec
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
 
-expecting success of 5510.57 'explicit --refmap option overrides remote.*.fetch': 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/main base-origin-main &&
-		o=$(git rev-parse --verify refs/remotes/origin/main) &&
-		git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
-		n=$(git rev-parse --verify refs/remotes/origin/main) &&
-		test "$o" = "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side &&
-		git rev-parse --verify refs/remotes/other/main
-	)
+ok 35 - unknown option without --end-of-options
 
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
- * [new branch]      main       -> other/main
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 57 - explicit --refmap option overrides remote.*.fetch
+expecting success of 6017.36 '--not on command line does not influence revisions read via --stdin': 
+	cat >input <<-EOF &&
+	refs/heads/main
+	EOF
+	git rev-list refs/heads/main >expect &&
 
-expecting success of 5510.58 'explicitly empty --refmap option disables remote.*.fetch': 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/main base-origin-main &&
-		o=$(git rev-parse --verify refs/remotes/origin/main) &&
-		git fetch --refmap="" origin main &&
-		n=$(git rev-parse --verify refs/remotes/origin/main) &&
-		test "$o" = "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side
-	)
+	git rev-list refs/heads/main --not --stdin <input >actual &&
+	test_cmp expect actual
 
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-fatal: Needed a single revision
-ok 58 - explicitly empty --refmap option disables remote.*.fetch
+ok 36 - --not on command line does not influence revisions read via --stdin
 
-expecting success of 5510.59 'configured fetch updates tracking': 
+expecting success of 6017.37 '--not via stdin does not influence revisions from command line': 
+	cat >input <<-EOF &&
+	--not
+	EOF
+	git rev-list refs/heads/main >expect &&
 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/main base-origin-main &&
-		o=$(git rev-parse --verify refs/remotes/origin/main) &&
-		git fetch origin &&
-		n=$(git rev-parse --verify refs/remotes/origin/main) &&
-		test "$o" != "$n" &&
-		git rev-parse --verify refs/remotes/origin/side
-	)
+	git rev-list refs/heads/main --stdin refs/heads/main <input >actual &&
+	test_cmp expect actual
 
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-branch        -> origin/atomic-branch
- * [new branch]      atomic-branch-1      -> origin/atomic-branch-1
- * [new branch]      atomic-branch-2      -> origin/atomic-branch-2
- * [new branch]      atomic-branch-3      -> origin/atomic-branch-3
- * [new branch]      atomic-fetch-head-1  -> origin/atomic-fetch-head-1
- * [new branch]      atomic-fetch-head-2  -> origin/atomic-fetch-head-2
- * [new branch]      atomic-fetch-head-3  -> origin/atomic-fetch-head-3
- * [new branch]      atomic-hooks-1       -> origin/atomic-hooks-1
- * [new branch]      atomic-hooks-2       -> origin/atomic-hooks-2
- * [new branch]      atomic-hooks-abort-1 -> origin/atomic-hooks-abort-1
- * [new branch]      atomic-hooks-abort-2 -> origin/atomic-hooks-abort-2
- * [new branch]      atomic-hooks-abort-3 -> origin/atomic-hooks-abort-3
- * [new branch]      atomic-mixed-branch  -> origin/atomic-mixed-branch
- * [new branch]      atomic-new-branch    -> origin/atomic-new-branch
- * [new branch]      atomic-non-ff        -> origin/atomic-non-ff
- * [new branch]      atomic-prune-create  -> origin/atomic-prune-create
- * [new branch]      descriptive-branch   -> origin/descriptive-branch
-   7fb3fb8..b4eae8a  main                 -> origin/main
- * [new branch]      other                -> origin/other
- * [new branch]      side                 -> origin/side
- * [new tag]         anno                 -> anno
- * [new tag]         atomic-hooks-abort   -> atomic-hooks-abort
- * [new tag]         atomic-mixed-tag     -> atomic-mixed-tag
- * [new tag]         descriptive-tag      -> descriptive-tag
- * [new tag]         light                -> light
- * [new tag]         v1.0                 -> v1.0
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 59 - configured fetch updates tracking
+ok 37 - --not via stdin does not influence revisions from command line
 
-expecting success of 5510.60 'non-matching refspecs do not confuse tracking update': 
-	cd "$D" &&
-	git update-ref refs/odd/location HEAD &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/main base-origin-main &&
-		git config --add remote.origin.fetch \
-			refs/odd/location:refs/remotes/origin/odd &&
-		o=$(git rev-parse --verify refs/remotes/origin/main) &&
-		git fetch origin main &&
-		n=$(git rev-parse --verify refs/remotes/origin/main) &&
-		test "$o" != "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/odd
-	)
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6021-rev-list-exclude-hidden.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
 
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-   7fb3fb8..b4eae8a  main       -> origin/main
-fatal: Needed a single revision
-ok 60 - non-matching refspecs do not confuse tracking update
+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 5510.61 'pushing nonexistent branch by mistake should not segv': 
+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
+---------------------------------------------------------------------
 
-	cd "$D" &&
-	test_must_fail git push seven no:no
+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
+---------------------------------------------------------------------
 
-error: src refspec no does not match any
-error: failed to push some refs to 'seven'
-ok 61 - pushing nonexistent branch by mistake should not segv
+ok 1 - setup
 
-expecting success of 5510.62 'auto tag following fetches minimum': 
+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
 
-	cd "$D" &&
-	git clone .git follow &&
-	git checkout HEAD^0 &&
-	(
-		for i in 1 2 3 4 5 6 7
-		do
-			echo $i >>file &&
-			git commit -m $i -a &&
-			git tag -a -m $i excess-$i || exit 1
-		done
-	) &&
-	git checkout main &&
-	(
-		cd follow &&
-		git fetch
-	)
+ok 2 - invalid section
 
-Cloning into 'follow'...
-done.
-Note: switching to 'HEAD^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6021.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
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6021.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
 
-  git switch -c <new-branch-name>
+expecting success of 6021.6 'fetch: hidden via fetch.hideRefs': 
+		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 6 - fetch: hidden via fetch.hideRefs
 
-Or undo this operation with:
+expecting success of 6021.7 'fetch: respects both transfer.hideRefs and fetch.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 7 - fetch: respects both transfer.hideRefs and fetch.hideRefs
 
-  git switch -
+expecting success of 6021.8 'fetch: negation without hidden refs marks everything as uninteresting': 
+		git rev-list --all --exclude-hidden=$section --not --all >out &&
+		test_must_be_empty out
+	
+ok 8 - fetch: negation without hidden refs marks everything as uninteresting
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6021.9 'fetch: negation with hidden refs marks them as interesting': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		EOF
+		test_cmp expected out
+	
+ok 9 - fetch: negation with hidden refs marks them as interesting
 
-HEAD is now at b4eae8a add.file2
-[detached HEAD 43226b4] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD 10af796] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD 30e6c6b] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD ed46c7b] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD 6cdf330] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD f577462] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD babaf0e] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Previous HEAD position was babaf0e 7
-Switched to branch 'main'
-Your branch is based on 'one/main_not', but the upstream is gone.
-  (use "git branch --unset-upstream" to fixup)
-ok 62 - auto tag following fetches minimum
+expecting success of 6021.10 'fetch: hidden refs and excludes work together': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 10 - fetch: hidden refs and excludes work together
 
-expecting success of 5510.63 'refuse to fetch into the current branch': 
+expecting success of 6021.11 'fetch: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 11 - fetch: excluded hidden refs get reset
 
-	test_must_fail git fetch . side:main
+expecting success of 6021.12 'fetch: excluded hidden refs can be used with multiple pseudo-refs': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
+		test_must_be_empty out
+	
+ok 12 - fetch: excluded hidden refs can be used with multiple pseudo-refs
 
+expecting success of 6021.13 'fetch: works with --glob': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
+		cat >expected <<-EOF &&
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 13 - fetch: works with --glob
 
-fatal: refusing to fetch into branch 'refs/heads/main' checked out at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch'
-ok 63 - refuse to fetch into the current branch
+expecting success of 6021.14 'fetch: operates on stripped refs by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 14 - fetch: operates on stripped refs by default
 
-expecting success of 5510.64 'fetch into the current branch with --update-head-ok': 
+expecting success of 6021.15 'fetch: does not hide namespace by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 15 - fetch: does not hide namespace by default
 
-	git fetch --update-head-ok . side:main
+expecting success of 6021.16 'fetch: can operate on unstripped refs': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 16 - fetch: can operate on unstripped refs
 
+expecting success of 6021.17 'fetch: fails with --remotes': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 17 - fetch: fails with --remotes
 
-ok 64 - fetch into the current branch with --update-head-ok
+expecting success of 6021.18 'fetch: fails with --remotes=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 18 - fetch: fails with --remotes=pattern
 
-expecting success of 5510.65 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written': 
-	rm -f .git/FETCH_HEAD err &&
-	git fetch --dry-run . 2>err &&
-	! test -f .git/FETCH_HEAD &&
-	grep FETCH_HEAD err
+expecting success of 6021.19 'fetch: fails with --branches': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 19 - fetch: fails with --branches
 
- * branch            HEAD       -> FETCH_HEAD
-ok 65 - fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written
+expecting success of 6021.20 'fetch: fails with --branches=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 20 - fetch: fails with --branches=pattern
 
-expecting success of 5510.66 '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written': 
-	rm -f .git/FETCH_HEAD err &&
-	git fetch --no-write-fetch-head . 2>err &&
-	! test -f .git/FETCH_HEAD &&
-	! grep FETCH_HEAD err
+expecting success of 6021.21 'fetch: fails with --tags': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 21 - fetch: fails with --tags
 
-ok 66 - --no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written
+expecting success of 6021.22 'fetch: fails with --tags=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 22 - fetch: fails with --tags=pattern
 
-expecting success of 5510.67 '--write-fetch-head gets defeated by --dry-run': 
-	rm -f .git/FETCH_HEAD &&
-	git fetch --dry-run --write-fetch-head . &&
-	! test -f .git/FETCH_HEAD
+expecting success of 6021.23 'receive: passed multiple times': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 23 - receive: passed multiple times
 
-From .
- * branch            HEAD       -> FETCH_HEAD
-ok 67 - --write-fetch-head gets defeated by --dry-run
+expecting success of 6021.24 'receive: without hiddenRefs': 
+		git rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 24 - receive: without hiddenRefs
 
-expecting success of 5510.68 'should be able to fetch with duplicate refspecs': 
-	mkdir dups &&
-	(
-		cd dups &&
-		git init &&
-		git config branch.main.remote three &&
-		git config remote.three.url ../three/.git &&
-		git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
-		git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
-		git fetch three
-	)
+expecting success of 6021.25 'receive: hidden via transfer.hideRefs': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 25 - receive: hidden via transfer.hideRefs
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/dups/.git/
-From ../three/
- * [new branch]      main             -> origin/main
- * [new branch]      one              -> origin/one
- * [new branch]      two              -> origin/two
- * [new tag]         base-origin-main -> base-origin-main
- * [new tag]         v1.0             -> v1.0
- * [new tag]         anno             -> anno
- * [new tag]         atomic-hooks-abort -> atomic-hooks-abort
- * [new tag]         atomic-mixed-tag -> atomic-mixed-tag
- * [new tag]         descriptive-tag  -> descriptive-tag
- * [new tag]         light            -> light
-ok 68 - should be able to fetch with duplicate refspecs
+expecting success of 6021.26 'receive: hidden via receive.hideRefs': 
+		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 26 - receive: hidden via receive.hideRefs
 
-expecting success of 5510.69 'LHS of refspec follows ref disambiguation rules': 
-	mkdir lhs-ambiguous &&
-	(
-		cd lhs-ambiguous &&
-		git init server &&
-		test_commit -C server unwanted &&
-		test_commit -C server wanted &&
+expecting success of 6021.27 'receive: respects both transfer.hideRefs and receive.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 27 - receive: respects both transfer.hideRefs and receive.hideRefs
 
-		git init client &&
+expecting success of 6021.28 'receive: negation without hidden refs marks everything as uninteresting': 
+		git rev-list --all --exclude-hidden=$section --not --all >out &&
+		test_must_be_empty out
+	
+ok 28 - receive: negation without hidden refs marks everything as uninteresting
 
-		# Check a name coming after "refs" alphabetically ...
-		git -C server update-ref refs/heads/s wanted &&
-		git -C server update-ref refs/heads/refs/heads/s unwanted &&
-		git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
-		git -C server rev-parse wanted >expect &&
-		git -C client rev-parse checkthis >actual &&
-		test_cmp expect actual &&
+expecting success of 6021.29 'receive: negation with hidden refs marks them as interesting': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		EOF
+		test_cmp expected out
+	
+ok 29 - receive: negation with hidden refs marks them as interesting
 
-		# ... and one before.
-		git -C server update-ref refs/heads/q wanted &&
-		git -C server update-ref refs/heads/refs/heads/q unwanted &&
-		git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
-		git -C server rev-parse wanted >expect &&
-		git -C client rev-parse checkthis >actual &&
-		test_cmp expect actual &&
+expecting success of 6021.30 'receive: hidden refs and excludes work together': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 30 - receive: hidden refs and excludes work together
 
-		# Tags are preferred over branches like refs/{heads,tags}/*
-		git -C server update-ref refs/tags/t wanted &&
-		git -C server update-ref refs/heads/t unwanted &&
-		git -C client fetch ../server +t:refs/heads/checkthis &&
-		git -C server rev-parse wanted >expect &&
-		git -C client rev-parse checkthis >actual
-	)
+expecting success of 6021.31 'receive: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 31 - receive: excluded hidden refs get reset
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/lhs-ambiguous/server/.git/
-[master (root-commit) 4bd74f6] unwanted
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unwanted.t
-[master 2680c84] wanted
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wanted.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/lhs-ambiguous/client/.git/
-From ../server
- * [new branch]      s          -> checkthis
- * [new tag]         wanted     -> wanted
- * [new tag]         unwanted   -> unwanted
-From ../server
- * [new tag]         t          -> t
-ok 69 - LHS of refspec follows ref disambiguation rules
+expecting success of 6021.32 'receive: excluded hidden refs can be used with multiple pseudo-refs': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
+		test_must_be_empty out
+	
+ok 32 - receive: excluded hidden refs can be used with multiple pseudo-refs
 
-expecting success of 5510.70 'fetch.writeCommitGraph': 
-	git clone three write &&
-	(
-		cd three &&
-		test_commit new
-	) &&
-	(
-		cd write &&
-		git -c fetch.writeCommitGraph fetch origin &&
-		test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
-	)
+expecting success of 6021.33 'receive: works with --glob': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
+		cat >expected <<-EOF &&
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 33 - receive: works with --glob
 
-Cloning into 'write'...
-done.
-[main 1a8b7a5] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/three
-   b4eae8a..1a8b7a5  main       -> origin/main
- * [new tag]         new        -> new
-ok 70 - fetch.writeCommitGraph
+expecting success of 6021.34 'receive: operates on stripped refs by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 34 - receive: operates on stripped refs by default
 
-expecting success of 5510.71 'fetch.writeCommitGraph with submodules': 
-	test_config_global protocol.file.allow always &&
-	git clone dups super &&
-	(
-		cd super &&
-		git submodule add "file://$TRASH_DIRECTORY/three" &&
-		git commit -m "add submodule"
-	) &&
-	git clone "super" super-clone &&
-	(
-		cd super-clone &&
-		rm -rf .git/objects/info &&
-		git -c fetch.writeCommitGraph=true fetch origin &&
-		test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain &&
-		git -c fetch.writeCommitGraph=true fetch --recurse-submodules origin
-	)
+expecting success of 6021.35 'receive: does not hide namespace by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 35 - receive: does not hide namespace by default
 
-Cloning into 'super'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/super/three'...
-[master (root-commit) 2cabf04] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 three
-Cloning into 'super-clone'...
-done.
-ok 71 - fetch.writeCommitGraph with submodules
+expecting success of 6021.36 'receive: can operate on unstripped refs': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 36 - receive: can operate on unstripped refs
 
-expecting success of 5510.72 'fetch from multiple configured URLs in single remote': 
-	git init url1 &&
-	git remote add multipleurls url1 &&
-	git remote set-url --add multipleurls url2 &&
-	git fetch multipleurls
+expecting success of 6021.37 'receive: fails with --remotes': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 37 - receive: fails with --remotes
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/url1/.git/
-ok 72 - fetch from multiple configured URLs in single remote
+expecting success of 6021.38 'receive: fails with --remotes=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 38 - receive: fails with --remotes=pattern
 
-expecting success of 5510.73 'setup cmdline_setup variable for subsequent test': 
-			remote_url="file://$(git -C one config remote.origin.url)" &&
-			remote_fetch="$(git -C one config remote.origin.fetch)" &&
-			cmdline_setup="\"$remote_url\" \"$remote_fetch\""
+expecting success of 6021.39 'receive: fails with --branches': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
 		
-ok 73 - setup cmdline_setup variable for subsequent test
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 39 - receive: fails with --branches
 
-expecting success of 5510.74 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6021.40 'receive: fails with --branches=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 40 - receive: fails with --branches=pattern
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6021.41 'receive: fails with --tags': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 41 - receive: fails with --tags
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6021.42 'receive: fails with --tags=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 42 - receive: fails with --tags=pattern
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+expecting success of 6021.43 'uploadpack: passed multiple times': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
 	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      atomic-branch        -> origin/atomic-branch
- * [new branch]      atomic-branch-1      -> origin/atomic-branch-1
- * [new branch]      atomic-branch-2      -> origin/atomic-branch-2
- * [new branch]      atomic-branch-3      -> origin/atomic-branch-3
- * [new branch]      atomic-fetch-head-1  -> origin/atomic-fetch-head-1
- * [new branch]      atomic-fetch-head-2  -> origin/atomic-fetch-head-2
- * [new branch]      atomic-fetch-head-3  -> origin/atomic-fetch-head-3
- * [new branch]      atomic-hooks-1       -> origin/atomic-hooks-1
- * [new branch]      atomic-hooks-2       -> origin/atomic-hooks-2
- * [new branch]      atomic-hooks-abort-1 -> origin/atomic-hooks-abort-1
- * [new branch]      atomic-hooks-abort-2 -> origin/atomic-hooks-abort-2
- * [new branch]      atomic-hooks-abort-3 -> origin/atomic-hooks-abort-3
- * [new branch]      atomic-mixed-branch  -> origin/atomic-mixed-branch
- * [new branch]      atomic-new-branch    -> origin/atomic-new-branch
- * [new branch]      atomic-non-ff        -> origin/atomic-non-ff
- * [new branch]      atomic-prune-create  -> origin/atomic-prune-create
- * [new branch]      descriptive-branch   -> origin/descriptive-branch
-   7fb3fb8..b4eae8a  main                 -> origin/main
- * [new branch]      newbranch            -> origin/newbranch
- * [new branch]      other                -> origin/other
- * [new branch]      side                 -> origin/side
- * [new tag]         anno                 -> anno
- * [new tag]         atomic-hooks-abort   -> atomic-hooks-abort
- * [new tag]         atomic-mixed-tag     -> atomic-mixed-tag
- * [new tag]         descriptive-tag      -> descriptive-tag
- * [new tag]         light                -> light
- * [new tag]         newtag               -> newtag
- * [new tag]         v1.0                 -> v1.0
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 74 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 43 - uploadpack: passed multiple times
 
-expecting success of 5510.75 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6021.44 'uploadpack: without hiddenRefs': 
+		git rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 44 - uploadpack: without hiddenRefs
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6021.45 'uploadpack: hidden via transfer.hideRefs': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 45 - uploadpack: hidden via transfer.hideRefs
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6021.46 'uploadpack: hidden via uploadpack.hideRefs': 
+		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 46 - uploadpack: hidden via uploadpack.hideRefs
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+expecting success of 6021.47 'uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
 	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 75 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 47 - uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs
 
-expecting success of 5510.76 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6021.48 'uploadpack: negation without hidden refs marks everything as uninteresting': 
+		git rev-list --all --exclude-hidden=$section --not --all >out &&
+		test_must_be_empty out
+	
+ok 48 - uploadpack: negation without hidden refs marks everything as uninteresting
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6021.49 'uploadpack: negation with hidden refs marks them as interesting': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		EOF
+		test_cmp expected out
+	
+ok 49 - uploadpack: negation with hidden refs marks them as interesting
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6021.50 'uploadpack: hidden refs and excludes work together': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 50 - uploadpack: hidden refs and excludes work together
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+expecting success of 6021.51 'uploadpack: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
 	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 76 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 51 - uploadpack: excluded hidden refs get reset
 
-expecting success of 5510.77 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6021.52 'uploadpack: excluded hidden refs can be used with multiple pseudo-refs': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
+		test_must_be_empty out
+	
+ok 52 - uploadpack: excluded hidden refs can be used with multiple pseudo-refs
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6021.53 'uploadpack: works with --glob': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
+		cat >expected <<-EOF &&
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 53 - uploadpack: works with --glob
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6021.54 'uploadpack: operates on stripped refs by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 54 - uploadpack: operates on stripped refs by default
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+expecting success of 6021.55 'uploadpack: does not hide namespace by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
 	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 77 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 55 - uploadpack: does not hide namespace by default
 
-expecting success of 5510.78 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6021.56 'uploadpack: can operate on unstripped refs': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 56 - uploadpack: can operate on unstripped refs
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6021.57 'uploadpack: fails with --remotes': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 57 - uploadpack: fails with --remotes
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6021.58 'uploadpack: fails with --remotes=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 58 - uploadpack: fails with --remotes=pattern
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 78 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+expecting success of 6021.59 'uploadpack: fails with --branches': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 59 - uploadpack: fails with --branches
 
-expecting success of 5510.79 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6021.60 'uploadpack: fails with --branches=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 60 - uploadpack: fails with --branches=pattern
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6021.61 'uploadpack: fails with --tags': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 61 - uploadpack: fails with --tags
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6021.62 'uploadpack: fails with --tags=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 62 - uploadpack: fails with --tags=pattern
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 79 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+# passed all 62 test(s)
+1..62
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6018-rev-list-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6018-rev-list-glob/.git/
+expecting success of 6018.1 'setup': 
 
-expecting success of 5510.80 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+[main (root-commit) f9b107a] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to a new branch 'subspace/one'
+[subspace/one ca90b7f] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace/two'
+[subspace/two 65ee8ea] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace-x'
+[subspace-x e241fee] subspace-x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'other/three'
+[other/three ec1efc4] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'someref'
+[someref dffcf3f] some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+[main 2bdf448] topic_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0e3b4df] topic_3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 88fe3d2] topic_4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
- * [new tag]         excess-1   -> excess-1
- * [new tag]         excess-2   -> excess-2
- * [new tag]         excess-3   -> excess-3
- * [new tag]         excess-4   -> excess-4
- * [new tag]         excess-5   -> excess-5
- * [new tag]         excess-6   -> excess-6
- * [new tag]         excess-7   -> excess-7
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 80 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-expecting success of 5510.81 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 2 - rev-parse --glob=refs/heads/subspace/*
+
+expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 81 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+ok 3 - rev-parse --glob=heads/subspace/*
 
-expecting success of 5510.82 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 82 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+ok 4 - rev-parse --glob=refs/heads/subspace/
 
-expecting success of 5510.83 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 83 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+ok 5 - rev-parse --glob=heads/subspace/
 
-expecting success of 5510.84 'name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 84 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 6 - rev-parse --glob=heads/subspace
 
-expecting success of 5510.85 'link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 85 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+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
 
-expecting success of 5510.86 'name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "main" "--glob --symbolic main"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 86 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+--- expected	2026-03-14 13:34:03.738677808 +0000
++++ actual	2026-03-14 13:34:03.754677808 +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 5510.87 'link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.9 'rev-parse --branches=subspace/*': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 87 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 9 - rev-parse --branches=subspace/*
 
-expecting success of 5510.88 'name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.10 'rev-parse --branches=subspace/': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 88 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 10 - rev-parse --branches=subspace/
 
-expecting success of 5510.89 'link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.11 'rev-parse --branches=subspace': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 89 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 11 - rev-parse --branches=subspace
 
-expecting success of 5510.90 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 90 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
 
-expecting success of 5510.91 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "main" "--glob=heads/someref/* main"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 91 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+ok 13 - rev-parse --glob=heads/someref/* main
 
-expecting success of 5510.92 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.14 'rev-parse --glob=heads/*': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 92 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 14 - rev-parse --glob=heads/*
 
-expecting success of 5510.93 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.15 'rev-parse --tags=foo': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "foo/bar" "--tags=foo"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 93 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 15 - rev-parse --tags=foo
 
-expecting success of 5510.94 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.16 'rev-parse --remotes=foo': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare rev-parse "foo/baz" "--remotes=foo"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 94 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 16 - rev-parse --remotes=foo
 
-expecting success of 5510.95 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.17 'rev-parse --exclude with --branches': 
+	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 17 - rev-parse --exclude with --branches
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.18 'rev-parse --exclude with --all': 
+	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 95 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 18 - rev-parse --exclude with --all
 
-expecting success of 5510.96 'name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
+	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 19 - rev-parse accumulates multiple --exclude
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.20 'rev-parse --branches clears --exclude': 
+	compare rev-parse "--exclude=* --branches --branches" "--branches"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 96 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 20 - rev-parse --branches clears --exclude
 
-expecting success of 5510.97 'link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.21 'rev-parse --tags clears --exclude': 
+	compare rev-parse "--exclude=* --tags --tags" "--tags"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 21 - rev-parse --tags clears --exclude
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.22 'rev-parse --all clears --exclude': 
+	compare rev-parse "--exclude=* --all --all" "--all"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 97 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 22 - rev-parse --all clears --exclude
 
-expecting success of 5510.98 'name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
+	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 23 - rev-parse --exclude=glob with --branches=glob
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.24 'rev-parse --exclude=glob with --tags=glob': 
+	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 98 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 24 - rev-parse --exclude=glob with --tags=glob
 
-expecting success of 5510.99 'link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 25 - rev-parse --exclude=glob with --remotes=glob
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
+	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 99 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 26 - rev-parse --exclude=ref with --branches=glob
 
-expecting success of 5510.100 'name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
+	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 27 - rev-parse --exclude=ref with --tags=glob
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+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"
 	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 100 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 29 - rev-parse --exclude-hidden=fetch with --all
 
-expecting success of 5510.101 'link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+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
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+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
 	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 101 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
 
-expecting success of 5510.102 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6018.35 'rev-parse --exclude-hidden=fetch fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 35 - rev-parse --exclude-hidden=fetch fails with --branches=pattern
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+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"
 	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 102 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 40 - rev-parse --exclude-hidden=receive with --all
 
-expecting success of 5510.103 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+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
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+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
 	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 103 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
 
-expecting success of 5510.104 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6018.46 'rev-parse --exclude-hidden=receive fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 46 - rev-parse --exclude-hidden=receive fails with --branches=pattern
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+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"
 	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 104 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 51 - rev-parse --exclude-hidden=uploadpack with --all
 
-expecting success of 5510.105 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+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
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
+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
 	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 105 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 55 - rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref
 
-expecting success of 5510.106 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6018.57 'rev-parse --exclude-hidden=uploadpack fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 57 - rev-parse --exclude-hidden=uploadpack fails with --branches=pattern
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 106 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+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 5510.107 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 6018.61 'rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 61 - rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
+	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 107 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 62 - rev-list --exclude=glob with --branches=glob
 
-expecting success of 5510.108 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
+	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 63 - rev-list --exclude=glob with --tags=glob
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
+	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 108 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+ok 64 - rev-list --exclude=glob with --remotes=glob
 
-expecting success of 5510.109 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.65 'rev-list --exclude=ref with --branches=glob': 
+	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 65 - rev-list --exclude=ref with --branches=glob
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
+	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 109 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+ok 66 - rev-list --exclude=ref with --tags=glob
 
-expecting success of 5510.110 'name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
+	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 67 - rev-list --exclude=ref with --remotes=glob
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 110 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-expecting success of 5510.111 'link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 68 - rev-list --glob=refs/heads/subspace/*
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 111 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
 
-expecting success of 5510.112 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 69 - rev-list --glob refs/heads/subspace/*
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 112 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+	compare rev-list "main" "--glob -0 main"
 
-expecting success of 5510.113 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 70 - rev-list not confused by option-like --glob arg
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 113 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
 
-expecting success of 5510.114 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 71 - rev-list --glob=heads/subspace/*
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 114 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
 
-expecting success of 5510.115 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 72 - rev-list --glob=refs/heads/subspace/
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 115 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
 
-expecting success of 5510.116 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 73 - rev-list --glob=heads/subspace/
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.74 'rev-list --glob=heads/subspace': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 116 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
 
-expecting success of 5510.117 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 74 - rev-list --glob=heads/subspace
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.75 'rev-list --branches=subspace/*': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 117 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
 
-expecting success of 5510.118 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 75 - rev-list --branches=subspace/*
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.76 'rev-list --branches=subspace/': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 118 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
 
-expecting success of 5510.119 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 76 - rev-list --branches=subspace/
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.77 'rev-list --branches=subspace': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 119 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+	compare rev-list "subspace/one subspace/two" "--branches=subspace"
 
-expecting success of 5510.120 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 77 - rev-list --branches=subspace
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.78 'rev-list --branches': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 120 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
 
-expecting success of 5510.121 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 78 - rev-list --branches
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 121 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+	compare rev-list "main" "--glob=heads/someref/* main"
 
-expecting success of 5510.122 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 79 - rev-list --glob=heads/someref/* main
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 122 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
 
-expecting success of 5510.123 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.81 'rev-list --glob=heads/*': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 123 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
-expecting success of 5510.124 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 81 - rev-list --glob=heads/*
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.82 'rev-list --tags=foo': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 124 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+	compare rev-list "foo/bar" "--tags=foo"
 
-expecting success of 5510.125 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 82 - rev-list --tags=foo
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.83 'rev-list --tags': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 125 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
 
-expecting success of 5510.126 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 83 - rev-list --tags
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.84 'rev-list --remotes=foo': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 126 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+	compare rev-list "foo/baz" "--remotes=foo"
 
-expecting success of 5510.127 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 84 - rev-list --remotes=foo
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.85 'rev-list --exclude with --branches': 
+	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 127 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 85 - rev-list --exclude with --branches
 
-expecting success of 5510.128 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.86 'rev-list --exclude with --all': 
+	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 86 - rev-list --exclude with --all
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
+	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 128 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 87 - rev-list accumulates multiple --exclude
 
-expecting success of 5510.129 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.88 'rev-list should succeed with empty output on empty stdin': 
+	git rev-list --stdin </dev/null >actual &&
+	test_must_be_empty actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 88 - rev-list should succeed with empty output on empty stdin
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.89 'rev-list should succeed with empty output with all refs excluded': 
+	git rev-list --exclude=* --all >actual &&
+	test_must_be_empty actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 129 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 89 - rev-list should succeed with empty output with all refs excluded
 
-expecting success of 5510.130 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.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
+	)
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6018-rev-list-glob/empty/.git/
+ok 90 - rev-list should succeed with empty output with empty --all
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 130 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+ok 91 - rev-list should succeed with empty output with empty glob
 
-expecting success of 5510.131 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6018.92 'rev-list should succeed with empty output when ignoring missing': 
+	git rev-list --ignore-missing $ZERO_OID >actual &&
+	test_must_be_empty actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 92 - rev-list should succeed with empty output when ignoring missing
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 131 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+	compare shortlog "subspace/one subspace/two" --branches=subspace &&
+	compare shortlog \
+	  "main subspace-x someref other/three subspace/one subspace/two" \
+	  --branches &&
+	compare shortlog main "--glob=heads/someref/* main" &&
+	compare shortlog "subspace/one subspace/two other/three" \
+	  "--glob=heads/subspace/* --glob=heads/other/*" &&
+	compare shortlog \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob=heads/*" &&
+	compare shortlog foo/bar --tags=foo &&
+	compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
+	compare shortlog foo/baz --remotes=foo
 
-expecting success of 5510.132 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 93 - shortlog accepts --glob/--tags/--remotes
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 132 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+	compare shortlog \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob heads/*"
 
-expecting success of 5510.133 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+    -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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 133 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
 
-expecting success of 5510.134 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	compare shortlog main "--glob -e main"
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 134 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-expecting success of 5510.135 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+    -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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+# still have 4 known breakage(s)
+# passed all remaining 91 test(s)
+1..95
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6100-rev-list-in-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 135 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+[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 5510.136 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6100.2 'rev-list --in-commit-order': 
+	git rev-list --in-commit-order --objects HEAD >actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	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 &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	test_cmp expect actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 136 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+ok 2 - rev-list --in-commit-order
 
-expecting success of 5510.137 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6100.3 'rev-list lists blobs and trees after commits': 
+	git rev-list --objects HEAD >actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	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 &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	test_cmp expect actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 137 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+ok 3 - rev-list lists blobs and trees after commits
 
-expecting success of 5510.138 'name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6040-tracking-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+[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
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6040.2 'branch -v': 
+	(
+		cd test &&
+		git branch -v
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 138 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+ok 2 - branch -v
 
-expecting success of 5510.139 'link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6040.3 'branch -vv': 
+	(
+		cd test &&
+		git branch -vv
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 3 - branch -vv
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6040.4 'checkout (diverged from upstream)': 
+	(
+		cd test && git checkout b1
+	) >actual &&
+	test_grep "have 1 and 1 different" actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 139 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+Switched to branch 'b1'
+and have 1 and 1 different commits each, respectively.
+ok 4 - checkout (diverged from upstream)
 
-expecting success of 5510.140 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6040.5 'checkout with local tracked branch': 
+	git checkout main &&
+	git checkout follower >actual &&
+	test_grep "is ahead of" actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Switched to branch 'main'
+Switched to branch 'follower'
+Your branch is ahead of 'main' by 1 commit.
+ok 5 - checkout with local tracked branch
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6040.6 'checkout (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5
+	) >actual &&
+	test_grep "is based on .*, but the upstream is gone." actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 140 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
+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 5510.141 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Switched to branch 'b6'
+Your branch is up to date with 'origin/main'.
+ok 10 - status (up-to-date with upstream)
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 141 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
+Switched to branch 'b1'
+ok 11 - status -s -b (diverged from upstream)
 
-expecting success of 5510.142 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Already on 'b1'
+ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 142 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
+Already on 'b1'
+ok 13 - status.aheadbehind=false status -s -b (diverged from upstream)
 
-expecting success of 5510.143 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6040.14 'status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b | head -3
+	) >actual &&
+	test_cmp expect actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Already on 'b1'
+ok 14 - status --long --branch
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 143 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
+Already on 'b1'
+ok 15 - status --long --branch
 
-expecting success of 5510.144 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Already on 'b1'
+ok 16 - status --long --branch --no-ahead-behind
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 144 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
+Already on 'b1'
+ok 17 - status.aheadbehind=false status --long --branch
 
-expecting success of 5510.145 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Switched to branch 'b5'
+ok 18 - status -s -b (upstream is gone)
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 145 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
+Switched to branch 'b6'
+ok 19 - status -s -b (up-to-date with upstream)
 
-expecting success of 5510.146 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Switched to branch 'main'
+fatal: cannot set up tracking information; starting point 'light' is not a branch
+error: pathspec 'lighttrack' did not match any file(s) known to git
+ok 20 - fail to track lightweight tags
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6040.21 'fail to track annotated tags': 
+	git checkout main &&
+	git tag -m heavy heavy &&
+	test_must_fail git branch --track heavytrack heavy >actual &&
+	test_grep ! "set up to track" actual &&
+	test_must_fail git checkout heavytrack
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 146 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
+Already on 'main'
+fatal: cannot set up tracking information; starting point 'heavy' is not a branch
+error: pathspec 'heavytrack' did not match any file(s) known to git
+ok 21 - fail to track annotated tags
 
-expecting success of 5510.147 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 6040.22 '--set-upstream-to does not change branch': 
+	git branch from-main main &&
+	git branch --set-upstream-to main from-main &&
+	git branch from-topic_2 main &&
+	test_must_fail git config branch.from-topic_2.merge > actual &&
+	git rev-list from-topic_2 &&
+	git update-ref refs/heads/from-topic_2 from-topic_2^ &&
+	git rev-parse from-topic_2 >expect2 &&
+	git branch --set-upstream-to main from-topic_2 &&
+	git config branch.from-main.merge > actual &&
+	git rev-parse from-topic_2 >actual2 &&
+	grep -q "^refs/heads/main$" actual &&
+	cmp expect2 actual2
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+branch 'from-main' set up to track 'main'.
+ac11e552c8e799a6af00e91a64888439b699d9fd
+7e1cf2dc889e845623128125195d11533d8aef5e
+cc33353f1c71fb0fa9b4671a6a0a8539ad9ecd0a
+branch 'from-topic_2' set up to track 'main'.
+ok 22 - --set-upstream-to does not change branch
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 6040.23 '--set-upstream-to @{-1}': 
+	git checkout follower &&
+	git checkout from-topic_2 &&
+	git config branch.from-topic_2.merge > expect2 &&
+	git branch --set-upstream-to @{-1} from-main &&
+	git config branch.from-main.merge > actual &&
+	git config branch.from-topic_2.merge > actual2 &&
+	git branch --set-upstream-to follower from-main &&
+	git config branch.from-main.merge > expect &&
+	test_cmp expect2 actual2 &&
+	test_cmp expect actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 147 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
+Switched to branch 'follower'
+Your branch is ahead of 'main' by 1 commit.
+  (use "git push" to publish your local commits)
+Switched to branch 'from-topic_2'
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+branch 'from-main' set up to track 'follower'.
+branch 'from-main' set up to track 'follower'.
+ok 23 - --set-upstream-to @{-1}
 
-expecting success of 5510.148 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t5616-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/.git/
+expecting success of 5616.1 'setup normal src repo': 
+	echo "{print \$1}" >print_1.awk &&
+	echo "{print \$2}" >print_2.awk &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	git init src &&
+	for n in 1 2 3 4
+	do
+		echo "This is file: $n" > src/file.$n.txt &&
+		git -C src add file.$n.txt &&
+		git -C src commit -m "file $n" &&
+		git -C src ls-files -s file.$n.txt >>temp || return 1
+	done &&
+	awk -f print_2.awk <temp | sort >expect_1.oids &&
+	test_line_count = 4 expect_1.oids
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
+[main (root-commit) a042509] file 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.1.txt
+[main 6a6b7aa] file 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.2.txt
+[main 2b2f6e6] file 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.3.txt
+[main aeb0144] file 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.4.txt
+ok 1 - setup normal src repo
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 148 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+expecting success of 5616.2 'setup bare clone for server': 
+	git clone --bare "file://$(pwd)/src" srv.bare &&
+	git -C srv.bare config --local uploadpack.allowfilter 1 &&
+	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
 
-expecting success of 5510.149 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+Cloning into bare repository 'srv.bare'...
+ok 2 - setup bare clone for server
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.3 'do partial clone 1': 
+	git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed.oids &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 149 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+	test_cmp expect_1.oids observed.oids &&
+	test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
+	test "$(git -C pc1 config --local remote.origin.promisor)" = "true" &&
+	test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
 
-expecting success of 5510.150 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+Cloning into 'pc1'...
+ok 3 - do partial clone 1
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.4 'rev-list --missing=allow-promisor on partial clone': 
+	git -C pc1 rev-list --objects --missing=allow-promisor HEAD >actual &&
+	git -C pc1 rev-list --objects --missing=print HEAD >expect.raw &&
+	grep -v "^?" expect.raw >expect &&
+	test_cmp expect actual
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+ok 4 - rev-list --missing=allow-promisor on partial clone
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 150 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
+expecting success of 5616.5 'verify that .promisor file contains refs fetched': 
+	ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
+	test_line_count = 1 promisorlist &&
+	git -C srv.bare rev-parse --verify HEAD >headhash &&
+	grep "$(cat headhash) HEAD" $(cat promisorlist) &&
+	grep "$(cat headhash) refs/heads/main" $(cat promisorlist)
 
-expecting success of 5510.151 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+aeb0144502699ac86da4c2c98d4cd3b741c6c645 HEAD
+aeb0144502699ac86da4c2c98d4cd3b741c6c645 refs/heads/main
+ok 5 - verify that .promisor file contains refs fetched
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.6 'verify checkout with dynamic object fetch': 
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
+	test_line_count = 4 observed &&
+	git -C pc1 checkout main &&
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
+	test_line_count = 0 observed
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+ok 6 - verify checkout with dynamic object fetch
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 151 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
+expecting success of 5616.7 'push new commits to server': 
+	git -C src remote add srv "file://$(pwd)/srv.bare" &&
+	for x in a b c d e
+	do
+		echo "Mod file.1.txt $x" >>src/file.1.txt &&
+		git -C src add file.1.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src blame main -- file.1.txt >expect.blame &&
+	git -C src push -u srv main
 
-expecting success of 5510.152 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+[main b4a5c87] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 2260bed] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 85d45de] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main f571048] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main d0edb11] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   aeb0144..d0edb11  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 7 - push new commits to server
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.8 'partial fetch inherits filter settings': 
+	git -C pc1 fetch origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 5 observed
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   aeb0144..d0edb11  main       -> origin/main
+ok 8 - partial fetch inherits filter settings
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 152 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+expecting success of 5616.9 'verify diff causes dynamic object fetch': 
+	git -C pc1 diff main..origin/main -- file.1.txt &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		 main..origin/main >observed &&
+	test_line_count = 4 observed
 
-expecting success of 5510.153 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+diff --git a/file.1.txt b/file.1.txt
+index 54ff69b..5cc7250 100644
+--- a/file.1.txt
++++ b/file.1.txt
+@@ -1 +1,6 @@
+ This is file: 1
++Mod file.1.txt a
++Mod file.1.txt b
++Mod file.1.txt c
++Mod file.1.txt d
++Mod file.1.txt e
+ok 9 - verify diff causes dynamic object fetch
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.10 'verify blame causes dynamic object fetch': 
+	git -C pc1 blame origin/main -- file.1.txt >observed.blame &&
+	test_cmp expect.blame observed.blame &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 0 observed
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+ok 10 - verify blame causes dynamic object fetch
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 153 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+expecting success of 5616.11 'push new commits to server for file.2.txt': 
+	for x in a b c d e f
+	do
+		echo "Mod file.2.txt $x" >>src/file.2.txt &&
+		git -C src add file.2.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src push -u srv main
 
-expecting success of 5510.154 'name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+[main 50dbe65] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 71d1ab3] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main c2c95e9] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 95992c5] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main ac0a329] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 03262f2] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   d0edb11..03262f2  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 11 - push new commits to server for file.2.txt
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.12 'override inherited filter-spec using --no-filter': 
+	git -C pc1 fetch --no-filter origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 0 observed
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   d0edb11..03262f2  main       -> origin/main
+ok 12 - override inherited filter-spec using --no-filter
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 154 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
+expecting success of 5616.13 'push new commits to server for file.3.txt': 
+	for x in a b c d e f
+	do
+		echo "Mod file.3.txt $x" >>src/file.3.txt &&
+		git -C src add file.3.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src push -u srv main
 
-expecting success of 5510.155 'link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+[main 2456429] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main f359f06] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main ed3a9d1] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 42a1e60] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 2827aa8] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 3f5edd7] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   03262f2..3f5edd7  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 13 - push new commits to server for file.3.txt
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.14 'manual prefetch of missing objects': 
+	git -C pc1 fetch --filter=blob:none origin &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		 main..origin/main >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed.oids &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 155 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
+	test_line_count = 6 observed.oids &&
+	git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
 
-expecting success of 5510.156 'name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed.oids &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	test_line_count = 0 observed.oids
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   03262f2..3f5edd7  main       -> origin/main
+remote: Enumerating objects: 6, done.        
+remote: Counting objects:  16% (1/6)        
remote: Counting objects:  33% (2/6)        
remote: Counting objects:  50% (3/6)        
remote: Counting objects:  66% (4/6)        
remote: Counting objects:  83% (5/6)        
remote: Counting objects: 100% (6/6)        
remote: Counting objects: 100% (6/6), done.        
+remote: Compressing objects:  20% (1/5)        
remote: Compressing objects:  40% (2/5)        
remote: Compressing objects:  60% (3/5)        
remote: Compressing objects:  80% (4/5)        
remote: Compressing objects: 100% (5/5)        
remote: Compressing objects: 100% (5/5), done.        
+remote: Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 (from 0)        
+7724cffe11579f391f6c098265878597ecd1ca74 7724cffe11579f391f6c098265878597ecd1ca74
+7c22d416ccef0f2e04b1909d448fa12714ed0c5a 7c22d416ccef0f2e04b1909d448fa12714ed0c5a
+7d87eff241fc01757db1d4f2f4710fbaeacd9950 7d87eff241fc01757db1d4f2f4710fbaeacd9950
+9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d 9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d
+a5e78dc6f3d20c8de85b54d4596946979a89d383 a5e78dc6f3d20c8de85b54d4596946979a89d383
+e5f3bec205041acafa4538978741f185e437e1ee e5f3bec205041acafa4538978741f185e437e1ee
+ok 14 - manual prefetch of missing objects
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 156 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
+expecting success of 5616.15 'push new commits to server for file.4.txt': 
+	for x in a b c d e f
+	do
+		echo "Mod file.4.txt $x" >src/file.4.txt &&
+		if list_contains "a,b" "$x"; then
+			printf "%10000s" X >>src/file.4.txt
+		fi &&
+		if list_contains "c,d" "$x"; then
+			printf "%20000s" X >>src/file.4.txt
+		fi &&
+		git -C src add file.4.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src push -u srv main
 
-expecting success of 5510.157 'link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+[main e9880ed] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+[main b08fb33] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main dc63000] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+[main d79e7f2] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0e6343d] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+[main 129c8a2] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   3f5edd7..129c8a2  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 15 - push new commits to server for file.4.txt
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.16 'apply a different filter using --refetch': 
+	git -C pc1 fetch --filter=blob:limit=999 origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 4 observed &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	git -C pc1 fetch --filter=blob:limit=19999 --refetch origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 2 observed &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 157 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
+	git -c protocol.version=0 -C pc1 fetch --filter=blob:limit=29999 \
+		--refetch origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 0 observed
 
-expecting success of 5510.158 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   3f5edd7..129c8a2  main       -> origin/main
+ok 16 - apply a different filter using --refetch
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.17 'fetch --refetch works with a shallow clone': 
+	git clone --no-checkout --depth=1 --filter=blob:none "file://$(pwd)/srv.bare" pc1s &&
+	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
+	test_line_count = 6 observed &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	GIT_TRACE=1 git -C pc1s fetch --filter=blob:limit=999 --refetch origin &&
+	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
+	test_line_count = 6 observed
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 158 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+Cloning into 'pc1s'...
+trace: built-in: git fetch --filter=blob:limit=999 --refetch origin
+trace: run_command: unset GIT_PREFIX; GIT_PROTOCOL=version=2 'git-upload-pack '\''/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'\'''
+trace: start_command: /bin/sh -c 'git-upload-pack '\''/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'\''' 'git-upload-pack '\''/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'\'''
+trace: built-in: git upload-pack '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'
+trace: run_command: git --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
+remote: trace: built-in: git pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999        
+trace: run_command: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' index-pack --stdin --fix-thin --promisor --pack_header=2,6
+trace: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
+run_processes_parallel: preparing to run up to 1 tasks
+run_processes_parallel: done
+trace: run_command: git maintenance run --auto --no-quiet --detach
+trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' maintenance run --auto --no-quiet --detach
+trace: built-in: git maintenance run --auto --no-quiet --detach
+ok 17 - fetch --refetch works with a shallow clone
 
-expecting success of 5510.159 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.18 'fetch --refetch triggers repacking': 
+	GIT_TRACE2_CONFIG_PARAMS=gc.autoPackLimit,maintenance.incremental-repack.auto &&
+	export GIT_TRACE2_CONFIG_PARAMS &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	GIT_TRACE2_EVENT="$PWD/trace1.event" \
+	git -C pc1 fetch --refetch origin &&
+	test_subcommand git maintenance run --auto --no-quiet --detach <trace1.event &&
+	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace1.event &&
+	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace1.event &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	GIT_TRACE2_EVENT="$PWD/trace2.event" \
+	git -c protocol.version=0 \
+		-c gc.autoPackLimit=0 \
+		-c maintenance.incremental-repack.auto=1234 \
+		-C pc1 fetch --refetch origin &&
+	test_subcommand git maintenance run --auto --no-quiet --detach <trace2.event &&
+	grep \"param\":\"gc.autopacklimit\",\"value\":\"0\" trace2.event &&
+	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace2.event &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 159 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+	GIT_TRACE2_EVENT="$PWD/trace3.event" \
+	git -c protocol.version=0 \
+		-c gc.autoPackLimit=1234 \
+		-c maintenance.incremental-repack.auto=0 \
+		-C pc1 fetch --refetch origin &&
+	test_subcommand git maintenance run --auto --no-quiet --detach <trace3.event &&
+	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
+	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
 
-expecting success of 5510.160 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+{"event":"child_start","sid":"20260314T133339.460332Z-H5c947e1c-P0003ba4d","thread":"main","time":"2026-03-14T13:33:39.615407Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20260314T133339.460332Z-H5c947e1c-P0003ba4d/20260314T133339.623417Z-H5c947e1c-P0003bb05","thread":"main","time":"2026-03-14T13:33:39.623940Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260314T133339.460332Z-H5c947e1c-P0003ba4d/20260314T133339.623417Z-H5c947e1c-P0003bb05/20260314T133339.658622Z-H5c947e1c-P0003bb22","thread":"main","time":"2026-03-14T13:33:39.658932Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260314T133339.460332Z-H5c947e1c-P0003ba4d/20260314T133339.623417Z-H5c947e1c-P0003bb05","thread":"main","time":"2026-03-14T13:33:39.623945Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20260314T133339.460332Z-H5c947e1c-P0003ba4d/20260314T133339.623417Z-H5c947e1c-P0003bb05/20260314T133339.658622Z-H5c947e1c-P0003bb22","thread":"main","time":"2026-03-14T13:33:39.658937Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20260314T133339.460332Z-H5c947e1c-P0003ba4d/20260314T133339.623417Z-H5c947e1c-P0003bb05/20260314T133339.658622Z-H5c947e1c-P0003bb22/20260314T133339.678694Z-H5c947e1c-P0003bb34","thread":"main","time":"2026-03-14T13:33:39.679078Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20260314T133339.696454Z-H5c947e1c-P0003bb52","thread":"main","time":"2026-03-14T13:33:39.826716Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20260314T133339.696454Z-H5c947e1c-P0003bb52","thread":"main","time":"2026-03-14T13:33:39.696970Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260314T133339.696454Z-H5c947e1c-P0003bb52/20260314T133339.778100Z-H5c947e1c-P0003bba0","thread":"main","time":"2026-03-14T13:33:39.778614Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260314T133339.696454Z-H5c947e1c-P0003bb52/20260314T133339.778100Z-H5c947e1c-P0003bba0/20260314T133339.815319Z-H5c947e1c-P0003bbd4","thread":"main","time":"2026-03-14T13:33:39.815837Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260314T133339.696454Z-H5c947e1c-P0003bb52/20260314T133339.850695Z-H5c947e1c-P0003bbee","thread":"main","time":"2026-03-14T13:33:39.851250Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20260314T133339.696454Z-H5c947e1c-P0003bb52/20260314T133339.850695Z-H5c947e1c-P0003bbee","thread":"main","time":"2026-03-14T13:33:39.851258Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42","thread":"main","time":"2026-03-14T13:33:40.071569Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.082715Z-H5c947e1c-P0003bcef","thread":"main","time":"2026-03-14T13:33:40.083246Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.082715Z-H5c947e1c-P0003bcef/20260314T133340.113480Z-H5c947e1c-P0003bd17","thread":"main","time":"2026-03-14T13:33:40.113807Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.082715Z-H5c947e1c-P0003bcef/20260314T133340.113480Z-H5c947e1c-P0003bd17/20260314T133340.124763Z-H5c947e1c-P0003bd24","thread":"main","time":"2026-03-14T13:33:40.125111Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42","thread":"main","time":"2026-03-14T13:33:39.921826Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.020836Z-H5c947e1c-P0003bc96","thread":"main","time":"2026-03-14T13:33:40.021337Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.020836Z-H5c947e1c-P0003bc96/20260314T133340.062805Z-H5c947e1c-P0003bcd5","thread":"main","time":"2026-03-14T13:33:40.063404Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.082715Z-H5c947e1c-P0003bcef","thread":"main","time":"2026-03-14T13:33:40.083243Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.082715Z-H5c947e1c-P0003bcef/20260314T133340.113480Z-H5c947e1c-P0003bd17","thread":"main","time":"2026-03-14T13:33:40.113803Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20260314T133339.917013Z-H5c947e1c-P0003bc42/20260314T133340.082715Z-H5c947e1c-P0003bcef/20260314T133340.113480Z-H5c947e1c-P0003bd17/20260314T133340.124763Z-H5c947e1c-P0003bd24","thread":"main","time":"2026-03-14T13:33:40.125107Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+ok 18 - fetch --refetch triggers repacking
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.19 'partial clone with transfer.fsckobjects=1 works with submodules': 
+	test_create_repo submodule &&
+	test_commit -C submodule mycommit &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	test_create_repo src_with_sub &&
+	git -C src_with_sub config uploadpack.allowfilter 1 &&
+	git -C src_with_sub config uploadpack.allowanysha1inwant 1 &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 160 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+	test_config_global protocol.file.allow always &&
 
-expecting success of 5510.161 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git -C src_with_sub submodule add "file://$(pwd)/submodule" mysub &&
+	git -C src_with_sub commit -m "commit with submodule" &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	git -c transfer.fsckobjects=1 \
+		clone --filter="blob:none" "file://$(pwd)/src_with_sub" dst &&
+	test_when_finished rm -rf dst
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/submodule/.git/
+[main (root-commit) 35ce5a7] mycommit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 mycommit.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src_with_sub/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src_with_sub/mysub'...
+[main (root-commit) 165258d] commit with submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 mysub
+Cloning into 'dst'...
+ok 19 - partial clone with transfer.fsckobjects=1 works with submodules
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 161 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+expecting success of 5616.20 'lazily fetched .gitmodules works': 
+	git clone --filter="blob:none" --no-checkout "file://$(pwd)/src_with_sub" dst &&
+	git -C dst fetch &&
+	test_when_finished rm -rf dst
 
-expecting success of 5510.162 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+Cloning into 'dst'...
+ok 20 - lazily fetched .gitmodules works
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.21 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects': 
+	git init src &&
+	test_commit -C src x &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
+		clone --filter="blob:none" "file://$(pwd)/src" dst &&
+	grep "git index-pack.*--fsck-objects" trace
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 162 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
+[main 1fb08d4] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Cloning into 'dst'...
+trace: run_command: git index-pack --stdin --fix-thin '--keep=fetch-pack 246665 on i-capture-the-hostname' --promisor --fsck-objects
+trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 246665 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: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
+ok 21 - partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects
 
-expecting success of 5510.163 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.22 'use fsck before and after manually fetching a missing subtree': 
+	# push new commit so server has a subtree
+	mkdir src/dir &&
+	echo "in dir" >src/dir/file.txt &&
+	git -C src add dir/file.txt &&
+	git -C src commit -m "file in dir" &&
+	git -C src push -u srv main &&
+	SUBTREE=$(git -C src rev-parse HEAD:dir) &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	rm -rf dst &&
+	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" dst &&
+	git -C dst fsck &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	# Make sure we only have commits, and all trees and blobs are missing.
+	git -C dst rev-list --missing=allow-any --objects main \
+		>fetched_objects &&
+	awk -f print_1.awk fetched_objects |
+	xargs -n1 git -C dst cat-file -t >fetched_types &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 163 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+	sort -u fetched_types >unique_types.observed &&
+	echo commit >unique_types.expected &&
+	test_cmp unique_types.expected unique_types.observed &&
 
-expecting success of 5510.164 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	# Auto-fetch a tree with cat-file.
+	git -C dst cat-file -p $SUBTREE >tree_contents &&
+	grep file.txt tree_contents &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	# fsck still works after an auto-fetch of a tree.
+	git -C dst fsck &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	# Auto-fetch all remaining trees and blobs with --missing=error
+	git -C dst rev-list --missing=error --objects main >fetched_objects &&
+	test_line_count = 88 fetched_objects &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch origin --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 164 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+	awk -f print_1.awk fetched_objects |
+	xargs -n1 git -C dst cat-file -t >fetched_types &&
 
-expecting success of 5510.165 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	sort -u fetched_types >unique_types.observed &&
+	test_write_lines blob commit tree >unique_types.expected &&
+	test_cmp unique_types.expected unique_types.observed
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+[main 957c60b] file in dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/file.txt
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   129c8a2..957c60b  main -> main
+branch 'main' set up to track 'srv/main'.
+Cloning into 'dst'...
+100644 blob d2cebd4f0a9e97a48a6139d09cafdb513ad8fee3	file.txt
+dangling tree bc1967ebf96a4e914801c7ef8328140456a10f41
+ok 22 - use fsck before and after manually fetching a missing subtree
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.23 'implicitly construct combine: filter with repeated flags': 
+	GIT_TRACE=$(pwd)/trace git clone --bare \
+		--filter=blob:none --filter=tree:1 \
+		"file://$(pwd)/srv.bare" pc2 &&
+	grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \
+		trace &&
+	git -C pc2 rev-list --objects --missing=allow-any HEAD >objects &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-ok 165 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+	# We should have gotten some root trees.
+	grep " $" objects &&
+	# Should not have gotten any non-root trees or blobs.
+	! grep " ." objects &&
 
-expecting success of 5510.166 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	xargs -n 1 git -C pc2 cat-file -t <objects >types &&
+	sort -u types >unique_types.actual &&
+	test_write_lines commit tree >unique_types.expected &&
+	test_cmp unique_types.expected unique_types.actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Cloning into bare repository 'pc2'...
+trace: run_command: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
+trace: built-in: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
+849950ea25ea502730806953150a8b29fbc04fd1 
+5e06b9e5aed2904563066a6d041bd48487b00cba 
+94a1afd9afa4ab1486352ab1c059762e3e872ce4 
+e77db3bdb5e7e6af01bd93bcd0f99a69d939d0aa 
+e6f42a769ea1225565ede9aa9e708186165aad4c 
+7eaccd314b25541fb2e12c6a9041510af10e1518 
+fdb7f75e829001ecb4ca2d6217d7fd04457e275c 
+f0075f67c4ce0cc5963de5143fb89b89762976ea 
+e891efadd67ca0c01b1c518a2fd91130d40f5904 
+b1ada3a7551c02bc311cab409bcdb3210cc0db2b 
+a00681e4a08fb4916de7e62d89de5b662ef1860a 
+6a1c4b6f6db25436faf11feadebfa98132273db5 
+a7d56826180d177dcd33e04e00c6ae488eda8dd2 
+91d0f663d7a546b2e8dfad2b8298f743aae0b020 
+ddb185bb2b7d210636855cd4f053ea8ff15c8f1c 
+974a5d9aee9b30da804ae932f36ed0eb7f5a2c50 
+2ce2a26473b0751a79d9c42a2a4480fa73fe4f15 
+f7e2c683a7004d4fb81563ae0a3087442db18354 
+26f5e35d8a7ae9658923cf3ccdfc19c86a3e1424 
+4c015c7e720cb846212f85d6513eaf497ea021fe 
+b1d4c4f82f23b1f0779bc7e8f360950eaab333da 
+aa3aad2daa2266f2379fa0b387e0c47ce7fc59bd 
+5768e37e39ded4ab416a0e61f824cad46e996fec 
+3a35e4cd4fbd2d3dbcd056d0e997a47518d10432 
+3246c304205324149983025431c5211438f41931 
+dfce1aed58f95775a6963107c4471a9f0bfff6e6 
+25c201430fa73e4f524ad53e88ef255c807b27e0 
+aa8fcdda393dec1e72abbb7f868b7d971b730a19 
+3f2b9ee6d5378134943b47172ba029ae46a49419 
+ok 23 - implicitly construct combine: filter with repeated flags
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.24 'upload-pack complains of bogus filter config': 
+	printf 0000 |
+	test_must_fail git \
+		-c uploadpackfilter.tree.maxdepth \
+		upload-pack . >/dev/null 2>err &&
+	test_grep "unable to parse.*tree.maxdepth" err
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch origin --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 166 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned
+fatal: unable to parse 'uploadpackfilter.tree.maxdepth' from command-line config
+ok 24 - upload-pack complains of bogus filter config
 
-expecting success of 5510.167 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.25 'upload-pack fails banned object filters': 
+	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "filter 'blob:none' not supported" err
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+fatal: filter 'blob:none' not supported
+fatal: remote error: filter 'blob:none' not supported
+ok 25 - upload-pack fails banned object filters
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.26 'upload-pack fails banned combine object filters': 
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_config -C srv.bare uploadpackfilter.combine.allow true &&
+	test_config -C srv.bare uploadpackfilter.tree.allow true &&
+	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
+		--filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "filter 'blob:none' not supported" err
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 167 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
+fatal: filter 'blob:none' not supported
+fatal: remote error: filter 'blob:none' not supported
+ok 26 - upload-pack fails banned combine object filters
 
-expecting success of 5510.168 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.27 'upload-pack fails banned object filters with fallback': 
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "filter 'blob:none' not supported" err
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+fatal: filter 'blob:none' not supported
+fatal: remote error: filter 'blob:none' not supported
+ok 27 - upload-pack fails banned object filters with fallback
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.28 'upload-pack limits tree depth filters': 
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_config -C srv.bare uploadpackfilter.tree.allow true &&
+	test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "tree filter allows max depth 0, but got 1" err &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags origin &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 168 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned
+	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
 
-expecting success of 5510.169 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	test_config -C srv.bare uploadpackfilter.tree.maxDepth 5 &&
+	git clone --no-checkout --filter=tree:5 "file://$(pwd)/srv.bare" pc5 &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:6 \
+		"file://$(pwd)/srv.bare" pc6 2>err &&
+	test_grep "tree filter allows max depth 5, but got 6" err
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+fatal: tree filter allows max depth 0, but got 1
+fatal: remote error: tree filter allows max depth 0, but got 1
+Cloning into 'pc4'...
+Cloning into 'pc5'...
+fatal: tree filter allows max depth 5, but got 6
+fatal: remote error: tree filter allows max depth 5, but got 6
+ok 28 - upload-pack limits tree depth filters
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.29 'partial clone fetches blobs pointed to by refs even if normally filtered out': 
+	rm -rf src dst &&
+	git init src &&
+	test_commit -C src x &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune --prune-tags file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 169 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned
+	# Create a tag pointing to a blob.
+	BLOB=$(echo blob-contents | git -C src hash-object --stdin -w) &&
+	git -C src tag myblob "$BLOB" &&
 
-expecting success of 5510.170 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git clone --filter="blob:none" "file://$(pwd)/src" dst 2>err &&
+	! grep "does not point to a valid object" err &&
+	git -C dst fsck
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
+[main (root-commit) d63d3b7] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+ok 29 - partial clone fetches blobs pointed to by refs even if normally filtered out
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.30 'fetch what is specified on CLI even if already promised': 
+	rm -rf src dst.git &&
+	git init src &&
+	test_commit -C src foo &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 170 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned
+	git hash-object --stdin <src/foo.t >blob &&
 
-expecting success of 5510.171 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git clone --bare --filter=blob:none "file://$(pwd)/src" dst.git &&
+	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_before &&
+	grep "?$(cat blob)" missing_before &&
+	git -C dst.git fetch origin $(cat blob) &&
+	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_after &&
+	! grep "?$(cat blob)" missing_after
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
+[main (root-commit) f80cabb] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into bare repository 'dst.git'...
+?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src
+ * branch            257cc5642cb1a054f08cc83f2d943e56fd3ebe99 -> FETCH_HEAD
+ok 30 - fetch what is specified on CLI even if already promised
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.31 'setup src repo for sparse filter': 
+	git init sparse-src &&
+	git -C sparse-src config --local uploadpack.allowfilter 1 &&
+	git -C sparse-src config --local uploadpack.allowanysha1inwant 1 &&
+	test_commit -C sparse-src one &&
+	test_commit -C sparse-src two &&
+	echo /one.t >sparse-src/only-one &&
+	git -C sparse-src add . &&
+	git -C sparse-src commit -m "add sparse checkout files"
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 171 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/sparse-src/.git/
+[main (root-commit) 6f4b17f] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 5c4888c] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main cc88d32] add sparse checkout files
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 only-one
+ok 31 - setup src repo for sparse filter
 
-expecting success of 5510.172 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.32 'partial clone with sparse filter succeeds': 
+	rm -rf dst.git &&
+	git clone --no-local --bare \
+		  --filter=sparse:oid=main:only-one \
+		  sparse-src dst.git &&
+	(
+		cd dst.git &&
+		git rev-list --objects --missing=print HEAD >out &&
+		grep "^$(git rev-parse HEAD:one.t)" out &&
+		grep "^?$(git rev-parse HEAD:two.t)" out
+	)
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Cloning into bare repository 'dst.git'...
+5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
+?f719efd430d52bcfc8566a43b2eb655688d38871
+ok 32 - partial clone with sparse filter succeeds
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.33 'partial clone with unresolvable sparse filter fails cleanly': 
+	rm -rf dst.git &&
+	test_must_fail git clone --no-local --bare \
+				 --filter=sparse:oid=main:no-such-name \
+				 sparse-src dst.git 2>err &&
+	test_grep "unable to access sparse blob in .main:no-such-name" err &&
+	test_must_fail git clone --no-local --bare \
+				 --filter=sparse:oid=main \
+				 sparse-src dst.git 2>err &&
+	test_grep "unable to parse sparse filter data in" err
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 172 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:pruned tag:pruned
+remote: fatal: unable to access sparse blob in 'main:no-such-name'        
+remote: fatal: unable to parse sparse filter data in cc88d32db343d6bb15610824107d11c391b515ca        
+ok 33 - partial clone with unresolvable sparse filter fails cleanly
 
-expecting success of 5510.173 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.34 'fetch lazy-fetches only to resolve deltas': 
+	setup_triangle &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big tree (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" main &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 173 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) b380020] initial
+ Author: A U Thor <author@example.com>
+ 100 files changed, 100 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file10
+ create mode 100644 file100
+ create mode 100644 file11
+ create mode 100644 file12
+ create mode 100644 file13
+ create mode 100644 file14
+ create mode 100644 file15
+ create mode 100644 file16
+ create mode 100644 file17
+ create mode 100644 file18
+ create mode 100644 file19
+ create mode 100644 file2
+ create mode 100644 file20
+ create mode 100644 file21
+ create mode 100644 file22
+ create mode 100644 file23
+ create mode 100644 file24
+ create mode 100644 file25
+ create mode 100644 file26
+ create mode 100644 file27
+ create mode 100644 file28
+ create mode 100644 file29
+ create mode 100644 file3
+ create mode 100644 file30
+ create mode 100644 file31
+ create mode 100644 file32
+ create mode 100644 file33
+ create mode 100644 file34
+ create mode 100644 file35
+ create mode 100644 file36
+ create mode 100644 file37
+ create mode 100644 file38
+ create mode 100644 file39
+ create mode 100644 file4
+ create mode 100644 file40
+ create mode 100644 file41
+ create mode 100644 file42
+ create mode 100644 file43
+ create mode 100644 file44
+ create mode 100644 file45
+ create mode 100644 file46
+ create mode 100644 file47
+ create mode 100644 file48
+ create mode 100644 file49
+ create mode 100644 file5
+ create mode 100644 file50
+ create mode 100644 file51
+ create mode 100644 file52
+ create mode 100644 file53
+ create mode 100644 file54
+ create mode 100644 file55
+ create mode 100644 file56
+ create mode 100644 file57
+ create mode 100644 file58
+ create mode 100644 file59
+ create mode 100644 file6
+ create mode 100644 file60
+ create mode 100644 file61
+ create mode 100644 file62
+ create mode 100644 file63
+ create mode 100644 file64
+ create mode 100644 file65
+ create mode 100644 file66
+ create mode 100644 file67
+ create mode 100644 file68
+ create mode 100644 file69
+ create mode 100644 file7
+ create mode 100644 file70
+ create mode 100644 file71
+ create mode 100644 file72
+ create mode 100644 file73
+ create mode 100644 file74
+ create mode 100644 file75
+ create mode 100644 file76
+ create mode 100644 file77
+ create mode 100644 file78
+ create mode 100644 file79
+ create mode 100644 file8
+ create mode 100644 file80
+ create mode 100644 file81
+ create mode 100644 file82
+ create mode 100644 file83
+ create mode 100644 file84
+ create mode 100644 file85
+ create mode 100644 file86
+ create mode 100644 file87
+ create mode 100644 file88
+ create mode 100644 file89
+ create mode 100644 file9
+ create mode 100644 file90
+ create mode 100644 file91
+ create mode 100644 file92
+ create mode 100644 file93
+ create mode 100644 file94
+ create mode 100644 file95
+ create mode 100644 file96
+ create mode 100644 file97
+ create mode 100644 file98
+ create mode 100644 file99
+Cloning into bare repository 'client'...
+[main 85be905] incremental change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/promisor-remote/.git/
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
+ * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
+count: 0
+in-pack: 2
+[main (root-commit) 06e07da] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+warning: filtering not recognized by server, ignoring
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
+ * branch            main       -> FETCH_HEAD
+packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
+packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
+ok 34 - fetch lazy-fetches only to resolve deltas
 
-expecting success of 5510.174 'name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.35 'fetch lazy-fetches only to resolve deltas, protocol v2': 
+	setup_triangle &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	git -C server config --local protocol.version 2 &&
+	git -C client config --local protocol.version 2 &&
+	git -C promisor-remote config --local protocol.version 2 &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big blob (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" main &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch origin &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 174 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
+	# Verify that protocol version 2 was used.
+	grep "fetch< version 2" trace &&
 
-expecting success of 5510.175 'link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) 9bc3270] initial
+ Author: A U Thor <author@example.com>
+ 100 files changed, 100 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file10
+ create mode 100644 file100
+ create mode 100644 file11
+ create mode 100644 file12
+ create mode 100644 file13
+ create mode 100644 file14
+ create mode 100644 file15
+ create mode 100644 file16
+ create mode 100644 file17
+ create mode 100644 file18
+ create mode 100644 file19
+ create mode 100644 file2
+ create mode 100644 file20
+ create mode 100644 file21
+ create mode 100644 file22
+ create mode 100644 file23
+ create mode 100644 file24
+ create mode 100644 file25
+ create mode 100644 file26
+ create mode 100644 file27
+ create mode 100644 file28
+ create mode 100644 file29
+ create mode 100644 file3
+ create mode 100644 file30
+ create mode 100644 file31
+ create mode 100644 file32
+ create mode 100644 file33
+ create mode 100644 file34
+ create mode 100644 file35
+ create mode 100644 file36
+ create mode 100644 file37
+ create mode 100644 file38
+ create mode 100644 file39
+ create mode 100644 file4
+ create mode 100644 file40
+ create mode 100644 file41
+ create mode 100644 file42
+ create mode 100644 file43
+ create mode 100644 file44
+ create mode 100644 file45
+ create mode 100644 file46
+ create mode 100644 file47
+ create mode 100644 file48
+ create mode 100644 file49
+ create mode 100644 file5
+ create mode 100644 file50
+ create mode 100644 file51
+ create mode 100644 file52
+ create mode 100644 file53
+ create mode 100644 file54
+ create mode 100644 file55
+ create mode 100644 file56
+ create mode 100644 file57
+ create mode 100644 file58
+ create mode 100644 file59
+ create mode 100644 file6
+ create mode 100644 file60
+ create mode 100644 file61
+ create mode 100644 file62
+ create mode 100644 file63
+ create mode 100644 file64
+ create mode 100644 file65
+ create mode 100644 file66
+ create mode 100644 file67
+ create mode 100644 file68
+ create mode 100644 file69
+ create mode 100644 file7
+ create mode 100644 file70
+ create mode 100644 file71
+ create mode 100644 file72
+ create mode 100644 file73
+ create mode 100644 file74
+ create mode 100644 file75
+ create mode 100644 file76
+ create mode 100644 file77
+ create mode 100644 file78
+ create mode 100644 file79
+ create mode 100644 file8
+ create mode 100644 file80
+ create mode 100644 file81
+ create mode 100644 file82
+ create mode 100644 file83
+ create mode 100644 file84
+ create mode 100644 file85
+ create mode 100644 file86
+ create mode 100644 file87
+ create mode 100644 file88
+ create mode 100644 file89
+ create mode 100644 file9
+ create mode 100644 file90
+ create mode 100644 file91
+ create mode 100644 file92
+ create mode 100644 file93
+ create mode 100644 file94
+ create mode 100644 file95
+ create mode 100644 file96
+ create mode 100644 file97
+ create mode 100644 file98
+ create mode 100644 file99
+Cloning into bare repository 'client'...
+[main 014bae7] incremental change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/promisor-remote/.git/
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
+ * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
+count: 0
+in-pack: 2
+[main (root-commit) d944c64] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+warning: filtering not recognized by server, ignoring
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
+ * branch            main       -> FETCH_HEAD
+packet:        fetch< version 2
+packet:        fetch< version 2
+packet:        fetch< version 2
+packet:        fetch< version 2
+packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
+packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
+packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
+packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
+ok 35 - fetch lazy-fetches only to resolve deltas, protocol v2
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success of 5616.36 'fetch does not lazy-fetch missing targets of its refs': 
+	rm -rf server client trace &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 175 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
+	test_create_repo server &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_commit -C server foo &&
 
-expecting success of 5510.176 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	# Make all refs point to nothing by deleting all objects.
+	rm client/.git/objects/pack/* &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	test_commit -C server bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--no-tags --recurse-submodules=no \
+		origin refs/tags/bar &&
+	FOO_HASH=$(git -C server rev-parse foo) &&
+	! grep "want $FOO_HASH" trace
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) 92a62de] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'client'...
+[main 92e3d69] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
+ * tag               bar        -> FETCH_HEAD
+ok 36 - fetch does not lazy-fetch missing targets of its refs
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch origin &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 176 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:pruned tag:pruned
+expecting success of 5616.37 'verify fetch succeeds when asking for new tags': 
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test &&
+	for i in I J K
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch --tags origin +refs/heads/*:refs/heads/* &&
+	git -C tag-test -c protocol.version=2 fetch --tags origin
 
-expecting success of 5510.177 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+Cloning into 'tag-test'...
+[main f18c5f5] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+[main a03a6a6] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+[main 367cc8f] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src
+ * [new branch]      I          -> I
+ * [new branch]      J          -> J
+ * [new branch]      K          -> K
+ + 957c60b...367cc8f main       -> main  (forced update)
+ * [new tag]         I          -> I
+ * [new tag]         J          -> J
+ * [new tag]         K          -> K
+ * [new tag]         foo        -> foo
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+ + 957c60b...367cc8f main       -> origin/main  (forced update)
+ * [new branch]      I          -> origin/I
+ * [new branch]      J          -> origin/J
+ * [new branch]      K          -> origin/K
+ * [new tag]         I          -> I
+ * [new tag]         J          -> J
+ * [new tag]         K          -> K
+ * [new tag]         foo        -> foo
+ok 37 - verify fetch succeeds when asking for new tags
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success of 5616.38 'verify fetch downloads only one pack when updating refs': 
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" pack-test &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 2 pack-list &&
+	for i in A B C
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch origin +refs/heads/*:refs/heads/* &&
+	git -C pack-test fetch origin &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 3 pack-list
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+Cloning into 'pack-test'...
+[main bc03829] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main 525529d] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 66f5bb0] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src
+ * [new branch]      A          -> A
+ * [new branch]      B          -> B
+ * [new branch]      C          -> C
+   367cc8f..66f5bb0  main       -> main
+ * [new tag]         A          -> A
+ * [new tag]         B          -> B
+ * [new tag]         C          -> C
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
+   367cc8f..66f5bb0  main       -> origin/main
+ * [new branch]      A          -> origin/A
+ * [new branch]      B          -> origin/B
+ * [new branch]      C          -> origin/C
+ * [new tag]         A          -> A
+ * [new tag]         B          -> B
+ * [new tag]         C          -> C
+ok 38 - verify fetch downloads only one pack when updating refs
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
+expecting success of 5616.39 'single-branch tag following respects partial clone': 
+	git clone --single-branch -b B --filter=blob:none \
+		"file://$(pwd)/srv.bare" single &&
+	git -C single rev-parse --verify refs/tags/B &&
+	git -C single rev-parse --verify refs/tags/A &&
+	test_must_fail git -C single rev-parse --verify refs/tags/C
+
+Cloning into 'single'...
+525529d87f8f318d404aa60b6d2b41ed0f49123b
+bc03829a3804fb49ee75372a845d1554afc2e83f
 fatal: Needed a single revision
-ok 177 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
+ok 39 - single-branch tag following respects partial clone
 
-expecting success of 5510.178 'name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.40 'fetch from a partial clone, protocol v0': 
+	rm -rf server client trace &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	# Pretend that the server is a partial clone
+	git init server &&
+	git -C server remote add a_remote "file://$(pwd)/" &&
+	test_config -C server core.repositoryformatversion 1 &&
+	test_config -C server extensions.partialclone a_remote &&
+	test_config -C server protocol.version 0 &&
+	test_commit -C server foo &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	# Fetch from the server
+	git init client &&
+	test_config -C client protocol.version 0 &&
+	test_commit -C client bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
+	! grep "version 2" trace
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch origin &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 178 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:pruned tag:pruned
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) b259608] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/client/.git/
+[main (root-commit) 76913b4] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+warning: no common commits
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
+ * branch            HEAD       -> FETCH_HEAD
+ok 40 - fetch from a partial clone, protocol v0
 
-expecting success of 5510.179 'link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.41 'fetch from a partial clone, protocol v2': 
+	rm -rf server client trace &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	# Pretend that the server is a partial clone
+	git init server &&
+	git -C server remote add a_remote "file://$(pwd)/" &&
+	test_config -C server core.repositoryformatversion 1 &&
+	test_config -C server extensions.partialclone a_remote &&
+	test_config -C server protocol.version 2 &&
+	test_commit -C server foo &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	# Fetch from the server
+	git init client &&
+	test_config -C client protocol.version 2 &&
+	test_commit -C client bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
+	grep "version 2" trace
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 179 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) bbef54c] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/client/.git/
+[main (root-commit) 10dc217] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:  upload-pack> version 2
+packet:        fetch< version 2
+ok 41 - fetch from a partial clone, protocol v2
 
-expecting success of 5510.180 'remove remote.origin.fetch "one"': 
-	(
-		cd one &&
-		git config --unset-all remote.origin.fetch
-	)
+expecting success of 5616.42 'repack does not loosen promisor objects': 
+	rm -rf client trace &&
+	git clone --bare --filter=blob:none "file://$(pwd)/srv.bare" client &&
+	test_when_finished "rm -rf client trace" &&
+	GIT_TRACE2_PERF="$(pwd)/trace" git -C client repack -A -d &&
+	grep "loosen_unused_packed_objects/loosened:0" trace
 
-ok 180 - remove remote.origin.fetch "one"
+Cloning into bare repository 'client'...
+13:34:06.536108 builtin/pack-objects.c:4039  | d1 | main                     | data         | r0  |  0.001232 |  0.000381 | pack-objects | ..loosen_unused_packed_objects/loosened:0
+ok 42 - repack does not loosen promisor objects
 
-expecting success of 5510.181 'name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success of 5616.43 'lazy-fetch in submodule succeeds': 
+	# setup
+	test_config_global protocol.file.allow always &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	test_when_finished "rm -rf src-sub" &&
+	git init src-sub &&
+	git -C src-sub config uploadpack.allowfilter 1 &&
+	git -C src-sub config uploadpack.allowanysha1inwant 1 &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	# This blob must be missing in the subsequent commit.
+	echo foo >src-sub/file &&
+	git -C src-sub add file &&
+	git -C src-sub commit -m "submodule one" &&
+	SUB_ONE=$(git -C src-sub rev-parse HEAD) &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch origin --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
- * branch            main       -> FETCH_HEAD
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 181 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
+	echo bar >src-sub/file &&
+	git -C src-sub add file &&
+	git -C src-sub commit -m "submodule two" &&
+	SUB_TWO=$(git -C src-sub rev-parse HEAD) &&
 
-expecting success of 5510.182 'link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned': 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	test_when_finished "rm -rf src-super" &&
+	git init src-super &&
+	git -C src-super config uploadpack.allowfilter 1 &&
+	git -C src-super config uploadpack.allowanysha1inwant 1 &&
+	git -C src-super submodule add ../src-sub src-sub &&
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+	git -C src-super/src-sub checkout $SUB_ONE &&
+	git -C src-super add src-sub &&
+	git -C src-super commit -m "superproject one" &&
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+	git -C src-super/src-sub checkout $SUB_TWO &&
+	git -C src-super add src-sub &&
+	git -C src-super commit -m "superproject two" &&
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch file\:\/\/\/build\/reproducible\-path\/git\-2\.48\.0\~rc1\+next\.20250101\/t\/trash\ directory\.t5510\-fetch\/\. --prune --prune-tags &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-Deleted branch newbranch (was b4eae8a).
-Deleted tag 'newtag' (was b4eae8a)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-b4eae8a1c2baba90c41b436d5796ef43ea5df434
-fatal: Needed a single revision
-ok 182 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
+	# the fetch
+	test_when_finished "rm -rf client" &&
+	git clone --filter=blob:none --also-filter-submodules \
+		--recurse-submodules "file://$(pwd)/src-super" client &&
 
-expecting success of 5510.183 'all boundary commits are excluded': 
-	test_commit base &&
-	test_commit oneside &&
-	git checkout HEAD^ &&
-	test_commit otherside &&
-	git checkout main &&
-	test_tick &&
-	git merge otherside &&
-	ad=$(git log --no-walk --format=%ad HEAD) &&
-	git bundle create twoside-boundary.bdl main --since="$ad" &&
-	test_bundle_object_count --thin twoside-boundary.bdl 3
+	# Trigger lazy-fetch from the superproject
+	git -C client restore --recurse-submodules --source=HEAD^ :/
 
-[main dc1ab9d] base
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-sub/.git/
+[main (root-commit) 801106d] submodule one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main 9ab9525] oneside
+ create mode 100644 file
+[main acdf0b1] submodule two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oneside.t
-Note: switching to 'HEAD^'.
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-super/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-super/src-sub'...
+done.
+Note: switching to '801106d77b703b74d29c28581b66e9e382e71a99'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -398632,458 +400082,427 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at dc1ab9d base
-[detached HEAD 5c45805] otherside
+HEAD is now at 801106d submodule one
+[main (root-commit) 5f7f3e0] superproject one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 otherside.t
-Previous HEAD position was 5c45805 otherside
-Switched to branch 'main'
-Your branch is based on 'one/main_not', but the upstream is gone.
-  (use "git branch --unset-upstream" to fixup)
-Merge made by the 'ort' strategy.
- otherside.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 otherside.t
-pack	fe30107d3d1ce0764ae8d8193ffe6b4c2fd3f327
-ok 183 - all boundary commits are excluded
-
-expecting success of 5510.184 'fetch --prune prints the remotes url': 
-	git branch goodbye &&
-	git clone . only-prunes &&
-	git branch -D goodbye &&
-	(
-		cd only-prunes &&
-		git fetch --prune origin 2>&1 | head -n1 >../actual
-	) &&
-	echo "From ${D}/." >expect &&
-	test_cmp expect actual
-
-Cloning into 'only-prunes'...
-done.
-Deleted branch goodbye (was a008302).
-ok 184 - fetch --prune prints the remotes url
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 src-sub
+Previous HEAD position was 801106d submodule one
+HEAD is now at acdf0b1 submodule two
+[main 9a05ac3] superproject two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'client'...
+Submodule 'src-sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-sub) registered for path 'src-sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/client/src-sub'...
+Submodule path 'src-sub': checked out 'acdf0b16fe4ce2869af73bab3c07737b60472b68'
+ok 43 - lazy-fetch in submodule succeeds
 
-expecting success of 5510.185 'branchname D/F conflict resolved by --prune': 
-	git branch dir/file &&
-	git clone . prune-df-conflict &&
-	git branch -D dir/file &&
-	git branch dir &&
-	(
-		cd prune-df-conflict &&
-		git fetch --prune &&
-		git rev-parse origin/dir >../actual
-	) &&
-	git rev-parse dir >expect &&
-	test_cmp expect actual
+expecting success of 5616.44 'after fetching descendants of non-promisor commits, gc works': 
+	# Setup
+	git init full &&
+	git -C full config uploadpack.allowfilter 1 &&
+	git -C full config uploadpack.allowanysha1inwant 1 &&
+	touch full/foo &&
+	git -C full add foo &&
+	git -C full commit -m "commit 1" &&
+	git -C full checkout --detach &&
 
-Cloning into 'prune-df-conflict'...
-done.
-Deleted branch dir/file (was a008302).
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/dir/file
- * [new branch]      dir        -> origin/dir
-ok 185 - branchname D/F conflict resolved by --prune
+	# Partial clone and push commit to remote
+	git clone "file://$(pwd)/full" --filter=blob:none partial &&
+	echo "hello" > partial/foo &&
+	git -C partial commit -a -m "commit 2" &&
+	git -C partial push &&
 
-expecting success of 5510.186 'branchname D/F conflict rejected with targeted error message': 
-	git clone . df-conflict-error &&
-	git branch dir_conflict &&
-	(
-		cd df-conflict-error &&
-		git update-ref refs/remotes/origin/dir_conflict/file HEAD &&
-		test_must_fail git fetch 2>err &&
-		test_grep "error: some local refs could not be updated; try running" err &&
-		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err &&
-		git pack-refs --all &&
-		test_must_fail git fetch 2>err-packed &&
-		test_grep "error: some local refs could not be updated; try running" err-packed &&
-		test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err-packed
-	)
+	# gc in partial repo
+	git -C partial gc --prune=now &&
 
-Cloning into 'df-conflict-error'...
-done.
-error: some local refs could not be updated; try running
- 'git remote prune origin' to remove any old, conflicting branches
-error: some local refs could not be updated; try running
- 'git remote prune origin' to remove any old, conflicting branches
-ok 186 - branchname D/F conflict rejected with targeted error message
+	# Create another commit in normal repo
+	git -C full checkout main &&
+	echo " world" >> full/foo &&
+	git -C full commit -a -m "commit 3" &&
 
-expecting success of 5510.187 'fetching a one-level ref works': 
-	test_commit extra &&
-	git reset --hard HEAD^ &&
-	git update-ref refs/foo extra &&
-	git init one-level &&
-	(
-		cd one-level &&
-		git fetch .. HEAD refs/foo
-	)
+	# Pull from remote in partial repo, and run gc again
+	git -C partial pull &&
+	git -C partial gc --prune=now
 
-[main 445a4b6] extra
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/full/.git/
+[main (root-commit) 08368f5] commit 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+HEAD is now at 08368f5 commit 1
+Cloning into 'partial'...
+[main d697f4a] commit 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-HEAD is now at a008302 Merge tag 'otherside'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/one-level/.git/
-From ..
- * branch            HEAD       -> FETCH_HEAD
- * branch            refs/foo   -> FETCH_HEAD
-ok 187 - fetching a one-level ref works
-
-expecting success of 5510.188 'fetching with auto-gc does not lock up': 
-	write_script askyesno <<-\EOF &&
-	echo "$*" &&
-	false
-	EOF
-	git clone "file://$D" auto-gc &&
-	test_commit test2 &&
-	(
-		cd auto-gc &&
-		git config fetch.unpackLimit 1 &&
-		git config gc.autoPackLimit 1 &&
-		git config gc.autoDetach false &&
-		GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
-		test_grep "Auto packing the repository" fetch.out &&
-		! grep "Should I try again" fetch.out
-	)
-
-Cloning into 'auto-gc'...
-[main d0a2253] test2
+To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/full
+   08368f5..d697f4a  main -> main
+Previous HEAD position was 08368f5 commit 1
+Switched to branch 'main'
+[main 5b8be83] commit 3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 test2.t
-Auto packing the repository for optimum performance.
-ok 188 - fetching with auto-gc does not lock up
+From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/full
+   d697f4a..5b8be83  main       -> origin/main
+Updating d697f4a..5b8be83
+Fast-forward
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ok 44 - after fetching descendants of non-promisor commits, gc works
 
-expecting success of 5510.189 'fetch.hideRefs affects connectivity check': 
-		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
-			$section.hideRefs="!refs/tags/" fetch &&
-		grep "git rev-list .*--exclude-hidden=fetch" trace
-	
-trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-ok 189 - fetch.hideRefs affects connectivity check
+checking prerequisite: NOT_ROOT
 
-expecting success of 5510.190 'transfer.hideRefs affects connectivity check': 
-		GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
-			$section.hideRefs="!refs/tags/" fetch &&
-		grep "git rev-list .*--exclude-hidden=fetch" trace
-	
-trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: run_command: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-trace: built-in: git rev-list --objects --stdin --not --exclude-hidden=fetch --all --quiet --alternate-refs
-ok 190 - transfer.hideRefs affects connectivity check
+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 5510.191 'prepare source branch': 
-	echo one >onebranch &&
-	git checkout --orphan onebranch &&
-	git rm --cached -r . &&
-	git add onebranch &&
-	git commit -m onebranch &&
-	git rev-list --objects onebranch -- >actual &&
-	# 3 objects should be created, at least ...
-	test 3 -le $(wc -l <actual)
+)
+prerequisite NOT_ROOT ok
+# passed all 44 test(s)
+# SKIP no web server found at ''
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6060-merge-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Switched to a new branch 'onebranch'
-rm 'base.t'
-rm 'file'
-rm 'file2'
-rm 'oneside.t'
-rm 'otherside.t'
-rm 'test2.t'
-[onebranch (root-commit) 609ade1] onebranch
+[master (root-commit) 69c42a0] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 onebranch
-ok 191 - prepare source branch
+ 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 5510.192 'fetch trumps transfer limit': 
-		rm -fr dest &&
-		git --bare init dest &&
-		git -C dest config fetch.unpacklimit $fetch_limit &&
-		git -C dest config transfer.unpacklimit $transfer_limit &&
-		git -C dest fetch .. onebranch &&
-		validate_store_type
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/dest/
-From ..
- * branch            onebranch  -> FETCH_HEAD
-count: 0
-ok 192 - fetch trumps transfer limit
+expecting success of 6060.2 'read-tree does not resolve content merge': 
+	git read-tree -i -m base ten two &&
+	echo file >expect &&
+	git diff-files --name-only --diff-filter=U >unmerged &&
+	test_cmp expect unmerged
 
-expecting success of 5510.193 'fetch trumps transfer limit': 
-		rm -fr dest &&
-		git --bare init dest &&
-		git -C dest config fetch.unpacklimit $fetch_limit &&
-		git -C dest config transfer.unpacklimit $transfer_limit &&
-		git -C dest fetch .. onebranch &&
-		validate_store_type
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/dest/
-From ..
- * branch            onebranch  -> FETCH_HEAD
-packs: 0
-ok 193 - fetch trumps transfer limit
+ok 2 - read-tree does not resolve content merge
 
-expecting success of 5510.194 '--negotiation-tip limits "have" lines sent': 
-	setup_negotiation_tip server server 0 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
-		origin alpha_s beta_s &&
-	check_negotiation_tip
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) facd226] alpha_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main f31e7ad] alpha_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) 754b9c2] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta c202648] beta_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
+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.
-[beta 0e40751] beta_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_s.t
-Switched to branch 'main'
-[main 2c3426a] alpha_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was facd226)
-Deleted tag 'alpha_2' (was f31e7ad)
-Deleted tag 'beta_1' (was 754b9c2)
-Deleted tag 'beta_2' (was c202648)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server
- * tag               alpha_s    -> FETCH_HEAD
- * tag               beta_s     -> FETCH_HEAD
-packet:        fetch> have facd2269ff2b5eb30cddd3d918ecf236d8f8298a
-packet:        fetch> have 754b9c2db9900588a06477b6d65461d82e960d37
-ok 194 - --negotiation-tip limits "have" lines sent
+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 5510.195 '--negotiation-tip understands globs': 
-	setup_negotiation_tip server server 0 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--negotiation-tip=*_1 \
-		origin alpha_s beta_s &&
-	check_negotiation_tip
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) a849d09] alpha_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main 9c9efb3] alpha_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) dfcc514] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta a75b0f1] beta_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
+Cloning into 'subdir/child'...
 done.
-[beta a144366] beta_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_s.t
-Switched to branch 'main'
-[main 1f3e2f1] alpha_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was a849d09)
-Deleted tag 'alpha_2' (was 9c9efb3)
-Deleted tag 'beta_1' (was dfcc514)
-Deleted tag 'beta_2' (was a75b0f1)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server
- * tag               alpha_s    -> FETCH_HEAD
- * tag               beta_s     -> FETCH_HEAD
-packet:        fetch> have a849d093bd04034e02b320b915812e2e739a6e71
-packet:        fetch> have dfcc514b92ea54d0eec2fdc71577e40710161dd5
-ok 195 - --negotiation-tip understands globs
+Auto-merging file
+ok 7 - merge-one-file respects core.worktree
 
-expecting success of 5510.196 '--negotiation-tip understands abbreviated SHA-1': 
-	setup_negotiation_tip server server 0 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--negotiation-tip=$(git -C client rev-parse --short alpha_1) \
-		--negotiation-tip=$(git -C client rev-parse --short beta_1) \
-		origin alpha_s beta_s &&
-	check_negotiation_tip
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6110-rev-list-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) 91c1c9f] alpha_1
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main e0da29d] alpha_2
+ create mode 100644 A.t
+[main d9df450] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) dcd8861] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta 012e63c] beta_2
+ create mode 100644 B.t
+[main 35a8500] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
-done.
-[beta a6cc847] beta_s
+ 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 beta_s.t
-Switched to branch 'main'
-[main 60cc95d] alpha_s
+ create mode 100644 D.t
+[side dc25130] E
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was 91c1c9f)
-Deleted tag 'alpha_2' (was e0da29d)
-Deleted tag 'beta_1' (was dcd8861)
-Deleted tag 'beta_2' (was 012e63c)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server
- * tag               alpha_s    -> FETCH_HEAD
- * tag               beta_s     -> FETCH_HEAD
-packet:        fetch> have 91c1c9ff43e3e8c21c626f9d53f98fd98b41a1bc
-packet:        fetch> have dcd8861f9d94ce1c6e0f4e6bc6980e72c660e839
-ok 196 - --negotiation-tip understands abbreviated SHA-1
+ 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 5510.197 '--negotiation-tip rejects missing OIDs': 
-	setup_negotiation_tip server server 0 &&
-	test_must_fail git -C client fetch \
-		--negotiation-tip=alpha_1 \
-		--negotiation-tip=$(test_oid zero) \
-		origin alpha_s beta_s 2>err &&
-	cat >fatal-expect <<-EOF &&
-	fatal: the object $(test_oid zero) does not exist
-EOF
-	grep fatal: err >fatal-actual &&
-	test_cmp fatal-expect fatal-actual
+expecting success of 6110.2 'rev-list --first-parent --boundary': 
+	git rev-list --first-parent --boundary HEAD^..
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/server/.git/
-[main (root-commit) 8158d9a] alpha_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_1.t
-[main 159269a] alpha_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_2.t
-Switched to a new branch 'beta'
-[beta (root-commit) ab9489d] beta_1
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 alpha_1.t
- create mode 100644 alpha_2.t
- create mode 100644 beta_1.t
-[beta 66378fb] beta_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_2.t
-Cloning into 'client'...
-done.
-[beta 5c64d87] beta_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 beta_s.t
-Switched to branch 'main'
-[main 92cb688] alpha_s
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpha_s.t
-Deleted tag 'alpha_1' (was 8158d9a)
-Deleted tag 'alpha_2' (was 159269a)
-Deleted tag 'beta_1' (was ab9489d)
-Deleted tag 'beta_2' (was 66378fb)
-ok 197 - --negotiation-tip rejects missing OIDs
+e8ee201b06a2eb86519e2b246f4c082e43aa5e90
+-35a8500a6c116c9ddf35e140fa3277a7fe0b4196
+-dc25130fe5e9f5d4a18aa4e0dff022e489b22c75
+ok 2 - rev-list --first-parent --boundary
 
-checking prerequisite: SYMLINKS
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6102-rev-list-unexpected-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6102-rev-list-unexpected-objects/.git/
+expecting success of 6102.1 'setup well-formed objects': 
+	blob="$(printf "foo" | git hash-object -w --stdin)" &&
+	tree="$(printf "100644 blob $blob\tfoo" | git mktree)" &&
+	commit="$(git commit-tree $tree -m "first commit")" &&
+	git cat-file commit $commit >good-commit
 
-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 1 - setup well-formed objects
 
-)
-prerequisite SYMLINKS ok
-expecting success of 5510.198 'clone does not get confused by a D/F conflict': 
-	git init df-conflict &&
-	(
-		cd df-conflict &&
-		ln -s .git a &&
-		git add a &&
-		test_tick &&
-		git commit -m symlink &&
-		test_commit a- &&
-		rm a &&
-		mkdir -p a/hooks &&
-		write_script a/hooks/post-checkout <<-EOF &&
-		echo WHOOPSIE >&2
-		echo whoopsie >"$TRASH_DIRECTORY"/whoops
-		EOF
-		git add a/hooks/post-checkout &&
-		test_tick &&
-		git commit -m post-checkout
-	) &&
-	git clone df-conflict clone 2>err &&
-	test_grep ! WHOOPS err &&
-	test_path_is_missing whoops
+expecting success of 6102.2 'setup unexpected non-blob entry': 
+	printf "100644 foo\0$(echo $tree | hex2oct)" >broken-tree &&
+	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5510-fetch/df-conflict/.git/
-[master (root-commit) ca09cd7] symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 a
-[master 6b77001] a-
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a-.t
-[master 32a5d28] post-checkout
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+), 1 deletion(-)
- delete mode 120000 a
- create mode 100755 a/hooks/post-checkout
-ok 198 - clone does not get confused by a D/F conflict
+ok 2 - setup unexpected non-blob entry
 
-checking prerequisite: NOT_ROOT
+expecting success of 6102.3 'TODO (should fail!): traverse unexpected non-blob entry (lone)': 
+	sed "s/Z$//" >expect <<-EOF &&
+	$broken_tree Z
+	$tree foo
+	EOF
+	git rev-list --objects $broken_tree >actual &&
+	test_cmp expect actual
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+ok 3 - TODO (should fail!): traverse unexpected non-blob entry (lone)
 
-)
-prerequisite NOT_ROOT ok
-# passed all 198 test(s)
-# SKIP no web server found at ''
-1..198
+expecting success of 6102.4 'traverse unexpected non-blob entry (seen)': 
+	test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
+	test_grep "is not a blob" output
+
+fatal: entry 'foo' in tree f9a0e545d60bd011757113bec85ba95242fa6c4e has blob mode, but is not a blob
+ok 4 - traverse unexpected non-blob entry (seen)
+
+expecting success of 6102.5 'setup unexpected non-tree entry': 
+	printf "40000 foo\0$(echo $blob | hex2oct)" >broken-tree &&
+	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
+
+ok 5 - setup unexpected non-tree entry
+
+expecting success of 6102.6 'traverse unexpected non-tree entry (lone)': 
+	test_must_fail git rev-list --objects $broken_tree
+
+error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
+fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
+10cd09cb3996f045aaf5417c833c0fa1ee7227e9 
+ok 6 - traverse unexpected non-tree entry (lone)
+
+expecting success of 6102.7 'traverse unexpected non-tree entry (seen)': 
+	test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
+	test_grep "is not a tree" output
+
+fatal: entry 'foo' in tree 10cd09cb3996f045aaf5417c833c0fa1ee7227e9 has tree mode, but is not a tree
+ok 7 - traverse unexpected non-tree entry (seen)
+
+expecting success of 6102.8 'setup unexpected non-commit parent': 
+	sed "/^author/ { h; s/.*/parent $blob/; G; }" <good-commit \
+		>broken-commit &&
+	broken_commit="$(git hash-object -w --literally -t commit \
+		broken-commit)"
+
+ok 8 - setup unexpected non-commit parent
+
+expecting success of 6102.9 'traverse unexpected non-commit parent (lone)': 
+	test_must_fail git rev-list --objects $broken_commit >output 2>&1 &&
+	test_grep "not a commit" output
+
+error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a commit
+ok 9 - traverse unexpected non-commit parent (lone)
+
+expecting success of 6102.10 'traverse unexpected non-commit parent (seen)': 
+	test_must_fail git rev-list --objects $blob $broken_commit \
+		>output 2>&1 &&
+	test_grep "not a commit" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
+ok 10 - traverse unexpected non-commit parent (seen)
+
+expecting success of 6102.11 'setup unexpected non-tree root': 
+	sed -e "s/$tree/$blob/" <good-commit >broken-commit &&
+	broken_commit="$(git hash-object -w --literally -t commit \
+		broken-commit)"
+
+ok 11 - setup unexpected non-tree root
+
+expecting success of 6102.12 'traverse unexpected non-tree root (lone)': 
+	test_must_fail git rev-list --objects $broken_commit
+
+error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
+fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
+0751a6c0afe31568a8dfe6a1b216fc464faa46ae
+ok 12 - traverse unexpected non-tree root (lone)
+
+expecting success of 6102.13 'traverse unexpected non-tree root (seen)': 
+	test_must_fail git rev-list --objects $blob $broken_commit \
+		>output 2>&1 &&
+	test_grep "not a tree" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
+ok 13 - traverse unexpected non-tree root (seen)
+
+expecting success of 6102.14 'setup unexpected non-commit tag': 
+	git tag -a -m "tagged commit" tag $commit &&
+	git cat-file tag tag >good-tag &&
+	test_when_finished "git tag -d tag" &&
+	sed -e "s/$commit/$blob/" <good-tag >broken-tag &&
+	tag=$(git hash-object -w --literally -t tag broken-tag)
+
+Deleted tag 'tag' (was a857fb4)
+ok 14 - setup unexpected non-commit tag
+
+expecting success of 6102.15 'traverse unexpected non-commit tag (lone)': 
+	test_must_fail git rev-list --objects $tag
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a commit, not a blob
+fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
+ok 15 - traverse unexpected non-commit tag (lone)
+
+expecting success of 6102.16 'traverse unexpected non-commit tag (seen)': 
+	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
+	test_grep "not a commit" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
+ok 16 - traverse unexpected non-commit tag (seen)
+
+expecting success of 6102.17 'setup unexpected non-tree tag': 
+	git tag -a -m "tagged tree" tag $tree &&
+	git cat-file tag tag >good-tag &&
+	test_when_finished "git tag -d tag" &&
+	sed -e "s/$tree/$blob/" <good-tag >broken-tag &&
+	tag=$(git hash-object -w --literally -t tag broken-tag)
+
+Deleted tag 'tag' (was 7f85285)
+ok 17 - setup unexpected non-tree tag
+
+expecting success of 6102.18 'traverse unexpected non-tree tag (lone)': 
+	test_must_fail git rev-list --objects $tag
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a tree, not a blob
+fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
+ok 18 - traverse unexpected non-tree tag (lone)
+
+expecting success of 6102.19 'traverse unexpected non-tree tag (seen)': 
+	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
+	test_grep "not a tree" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
+ok 19 - traverse unexpected non-tree tag (seen)
+
+expecting success of 6102.20 'setup unexpected non-blob tag': 
+	git tag -a -m "tagged blob" tag $blob &&
+	git cat-file tag tag >good-tag &&
+	test_when_finished "git tag -d tag" &&
+	sed -e "s/$blob/$commit/" <good-tag >broken-tag &&
+	tag=$(git hash-object -w --literally -t tag broken-tag)
+
+Deleted tag 'tag' (was 5ff9998)
+ok 20 - setup unexpected non-blob tag
+
+expecting success of 6102.21 'traverse unexpected non-blob tag (lone)': 
+	test_must_fail git rev-list --objects $tag
+
+error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a blob, not a commit
+fatal: bad object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd
+ok 21 - traverse unexpected non-blob tag (lone)
+
+expecting success of 6102.22 'traverse unexpected non-blob tag (seen)': 
+	test_must_fail git rev-list --objects $commit $tag >output 2>&1 &&
+	test_grep "not a blob" output
+
+error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a commit, not a blob
+ok 22 - traverse unexpected non-blob tag (seen)
+
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6022-rev-list-missing.sh ***
@@ -400716,344 +402135,6 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6060-merge-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6110-rev-list-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6102-rev-list-unexpected-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6102-rev-list-unexpected-objects/.git/
-expecting success of 6102.1 'setup well-formed objects': 
-	blob="$(printf "foo" | git hash-object -w --stdin)" &&
-	tree="$(printf "100644 blob $blob\tfoo" | git mktree)" &&
-	commit="$(git commit-tree $tree -m "first commit")" &&
-	git cat-file commit $commit >good-commit
-
-ok 1 - setup well-formed objects
-
-expecting success of 6102.2 'setup unexpected non-blob entry': 
-	printf "100644 foo\0$(echo $tree | hex2oct)" >broken-tree &&
-	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
-
-ok 2 - setup unexpected non-blob entry
-
-expecting success of 6102.3 'TODO (should fail!): traverse unexpected non-blob entry (lone)': 
-	sed "s/Z$//" >expect <<-EOF &&
-	$broken_tree Z
-	$tree foo
-	EOF
-	git rev-list --objects $broken_tree >actual &&
-	test_cmp expect actual
-
-ok 3 - TODO (should fail!): traverse unexpected non-blob entry (lone)
-
-expecting success of 6102.4 'traverse unexpected non-blob entry (seen)': 
-	test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
-	test_grep "is not a blob" output
-
-fatal: entry 'foo' in tree f9a0e545d60bd011757113bec85ba95242fa6c4e has blob mode, but is not a blob
-ok 4 - traverse unexpected non-blob entry (seen)
-
-expecting success of 6102.5 'setup unexpected non-tree entry': 
-	printf "40000 foo\0$(echo $blob | hex2oct)" >broken-tree &&
-	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
-
-ok 5 - setup unexpected non-tree entry
-
-expecting success of 6102.6 'traverse unexpected non-tree entry (lone)': 
-	test_must_fail git rev-list --objects $broken_tree
-
-error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
-fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
-10cd09cb3996f045aaf5417c833c0fa1ee7227e9 
-ok 6 - traverse unexpected non-tree entry (lone)
-
-expecting success of 6102.7 'traverse unexpected non-tree entry (seen)': 
-	test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
-	test_grep "is not a tree" output
-
-fatal: entry 'foo' in tree 10cd09cb3996f045aaf5417c833c0fa1ee7227e9 has tree mode, but is not a tree
-ok 7 - traverse unexpected non-tree entry (seen)
-
-expecting success of 6102.8 'setup unexpected non-commit parent': 
-	sed "/^author/ { h; s/.*/parent $blob/; G; }" <good-commit \
-		>broken-commit &&
-	broken_commit="$(git hash-object -w --literally -t commit \
-		broken-commit)"
-
-ok 8 - setup unexpected non-commit parent
-
-expecting success of 6102.9 'traverse unexpected non-commit parent (lone)': 
-	test_must_fail git rev-list --objects $broken_commit >output 2>&1 &&
-	test_grep "not a commit" output
-
-error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a commit
-ok 9 - traverse unexpected non-commit parent (lone)
-
-expecting success of 6102.10 'traverse unexpected non-commit parent (seen)': 
-	test_must_fail git rev-list --objects $blob $broken_commit \
-		>output 2>&1 &&
-	test_grep "not a commit" output
-
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
-ok 10 - traverse unexpected non-commit parent (seen)
-
-expecting success of 6102.11 'setup unexpected non-tree root': 
-	sed -e "s/$tree/$blob/" <good-commit >broken-commit &&
-	broken_commit="$(git hash-object -w --literally -t commit \
-		broken-commit)"
-
-ok 11 - setup unexpected non-tree root
-
-expecting success of 6102.12 'traverse unexpected non-tree root (lone)': 
-	test_must_fail git rev-list --objects $broken_commit
-
-error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
-fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
-0751a6c0afe31568a8dfe6a1b216fc464faa46ae
-ok 12 - traverse unexpected non-tree root (lone)
-
-expecting success of 6102.13 'traverse unexpected non-tree root (seen)': 
-	test_must_fail git rev-list --objects $blob $broken_commit \
-		>output 2>&1 &&
-	test_grep "not a tree" output
-
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
-ok 13 - traverse unexpected non-tree root (seen)
-
-expecting success of 6102.14 'setup unexpected non-commit tag': 
-	git tag -a -m "tagged commit" tag $commit &&
-	git cat-file tag tag >good-tag &&
-	test_when_finished "git tag -d tag" &&
-	sed -e "s/$commit/$blob/" <good-tag >broken-tag &&
-	tag=$(git hash-object -w --literally -t tag broken-tag)
-
-Deleted tag 'tag' (was a857fb4)
-ok 14 - setup unexpected non-commit tag
-
-expecting success of 6102.15 'traverse unexpected non-commit tag (lone)': 
-	test_must_fail git rev-list --objects $tag
-
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a commit, not a blob
-fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
-ok 15 - traverse unexpected non-commit tag (lone)
-
-expecting success of 6102.16 'traverse unexpected non-commit tag (seen)': 
-	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
-	test_grep "not a commit" output
-
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
-ok 16 - traverse unexpected non-commit tag (seen)
-
-expecting success of 6102.17 'setup unexpected non-tree tag': 
-	git tag -a -m "tagged tree" tag $tree &&
-	git cat-file tag tag >good-tag &&
-	test_when_finished "git tag -d tag" &&
-	sed -e "s/$tree/$blob/" <good-tag >broken-tag &&
-	tag=$(git hash-object -w --literally -t tag broken-tag)
-
-Deleted tag 'tag' (was 7f85285)
-ok 17 - setup unexpected non-tree tag
-
-expecting success of 6102.18 'traverse unexpected non-tree tag (lone)': 
-	test_must_fail git rev-list --objects $tag
-
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a tree, not a blob
-fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
-ok 18 - traverse unexpected non-tree tag (lone)
-
-expecting success of 6102.19 'traverse unexpected non-tree tag (seen)': 
-	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
-	test_grep "not a tree" output
-
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
-ok 19 - traverse unexpected non-tree tag (seen)
-
-expecting success of 6102.20 'setup unexpected non-blob tag': 
-	git tag -a -m "tagged blob" tag $blob &&
-	git cat-file tag tag >good-tag &&
-	test_when_finished "git tag -d tag" &&
-	sed -e "s/$blob/$commit/" <good-tag >broken-tag &&
-	tag=$(git hash-object -w --literally -t tag broken-tag)
-
-Deleted tag 'tag' (was 5ff9998)
-ok 20 - setup unexpected non-blob tag
-
-expecting success of 6102.21 'traverse unexpected non-blob tag (lone)': 
-	test_must_fail git rev-list --objects $tag
-
-error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a blob, not a commit
-fatal: bad object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd
-ok 21 - traverse unexpected non-blob tag (lone)
-
-expecting success of 6102.22 'traverse unexpected non-blob tag (seen)': 
-	test_must_fail git rev-list --objects $commit $tag >output 2>&1 &&
-	test_grep "not a blob" output
-
-error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a commit, not a blob
-ok 22 - traverse unexpected non-blob tag (seen)
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6114-keep-packs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6114-keep-packs/.git/
 expecting success of 6114.1 'setup': 
@@ -401128,1410 +402209,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t5616-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/.git/
-expecting success of 5616.1 'setup normal src repo': 
-	echo "{print \$1}" >print_1.awk &&
-	echo "{print \$2}" >print_2.awk &&
-
-	git init src &&
-	for n in 1 2 3 4
-	do
-		echo "This is file: $n" > src/file.$n.txt &&
-		git -C src add file.$n.txt &&
-		git -C src commit -m "file $n" &&
-		git -C src ls-files -s file.$n.txt >>temp || return 1
-	done &&
-	awk -f print_2.awk <temp | sort >expect_1.oids &&
-	test_line_count = 4 expect_1.oids
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) a042509] file 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.1.txt
-[main 6a6b7aa] file 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.2.txt
-[main 2b2f6e6] file 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.3.txt
-[main aeb0144] file 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.4.txt
-ok 1 - setup normal src repo
-
-expecting success of 5616.2 'setup bare clone for server': 
-	git clone --bare "file://$(pwd)/src" srv.bare &&
-	git -C srv.bare config --local uploadpack.allowfilter 1 &&
-	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
-
-Cloning into bare repository 'srv.bare'...
-ok 2 - setup bare clone for server
-
-expecting success of 5616.3 'do partial clone 1': 
-	git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
-
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed.oids &&
-
-	test_cmp expect_1.oids observed.oids &&
-	test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
-	test "$(git -C pc1 config --local remote.origin.promisor)" = "true" &&
-	test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
-
-Cloning into 'pc1'...
-ok 3 - do partial clone 1
-
-expecting success of 5616.4 'rev-list --missing=allow-promisor on partial clone': 
-	git -C pc1 rev-list --objects --missing=allow-promisor HEAD >actual &&
-	git -C pc1 rev-list --objects --missing=print HEAD >expect.raw &&
-	grep -v "^?" expect.raw >expect &&
-	test_cmp expect actual
-
-ok 4 - rev-list --missing=allow-promisor on partial clone
-
-expecting success of 5616.5 'verify that .promisor file contains refs fetched': 
-	ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
-	test_line_count = 1 promisorlist &&
-	git -C srv.bare rev-parse --verify HEAD >headhash &&
-	grep "$(cat headhash) HEAD" $(cat promisorlist) &&
-	grep "$(cat headhash) refs/heads/main" $(cat promisorlist)
-
-aeb0144502699ac86da4c2c98d4cd3b741c6c645 HEAD
-aeb0144502699ac86da4c2c98d4cd3b741c6c645 refs/heads/main
-ok 5 - verify that .promisor file contains refs fetched
-
-expecting success of 5616.6 'verify checkout with dynamic object fetch': 
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
-	test_line_count = 4 observed &&
-	git -C pc1 checkout main &&
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
-	test_line_count = 0 observed
-
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-ok 6 - verify checkout with dynamic object fetch
-
-expecting success of 5616.7 'push new commits to server': 
-	git -C src remote add srv "file://$(pwd)/srv.bare" &&
-	for x in a b c d e
-	do
-		echo "Mod file.1.txt $x" >>src/file.1.txt &&
-		git -C src add file.1.txt &&
-		git -C src commit -m "mod $x" || return 1
-	done &&
-	git -C src blame main -- file.1.txt >expect.blame &&
-	git -C src push -u srv main
-
-[main b4a5c87] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 2260bed] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 85d45de] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main f571048] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main d0edb11] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   aeb0144..d0edb11  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 7 - push new commits to server
-
-expecting success of 5616.8 'partial fetch inherits filter settings': 
-	git -C pc1 fetch origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 5 observed
-
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   aeb0144..d0edb11  main       -> origin/main
-ok 8 - partial fetch inherits filter settings
-
-expecting success of 5616.9 'verify diff causes dynamic object fetch': 
-	git -C pc1 diff main..origin/main -- file.1.txt &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		 main..origin/main >observed &&
-	test_line_count = 4 observed
-
-diff --git a/file.1.txt b/file.1.txt
-index 54ff69b..5cc7250 100644
---- a/file.1.txt
-+++ b/file.1.txt
-@@ -1 +1,6 @@
- This is file: 1
-+Mod file.1.txt a
-+Mod file.1.txt b
-+Mod file.1.txt c
-+Mod file.1.txt d
-+Mod file.1.txt e
-ok 9 - verify diff causes dynamic object fetch
-
-expecting success of 5616.10 'verify blame causes dynamic object fetch': 
-	git -C pc1 blame origin/main -- file.1.txt >observed.blame &&
-	test_cmp expect.blame observed.blame &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 0 observed
-
-ok 10 - verify blame causes dynamic object fetch
-
-expecting success of 5616.11 'push new commits to server for file.2.txt': 
-	for x in a b c d e f
-	do
-		echo "Mod file.2.txt $x" >>src/file.2.txt &&
-		git -C src add file.2.txt &&
-		git -C src commit -m "mod $x" || return 1
-	done &&
-	git -C src push -u srv main
-
-[main 50dbe65] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 71d1ab3] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main c2c95e9] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 95992c5] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main ac0a329] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 03262f2] mod f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   d0edb11..03262f2  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 11 - push new commits to server for file.2.txt
-
-expecting success of 5616.12 'override inherited filter-spec using --no-filter': 
-	git -C pc1 fetch --no-filter origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 0 observed
-
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   d0edb11..03262f2  main       -> origin/main
-ok 12 - override inherited filter-spec using --no-filter
-
-expecting success of 5616.13 'push new commits to server for file.3.txt': 
-	for x in a b c d e f
-	do
-		echo "Mod file.3.txt $x" >>src/file.3.txt &&
-		git -C src add file.3.txt &&
-		git -C src commit -m "mod $x" || return 1
-	done &&
-	git -C src push -u srv main
-
-[main 2456429] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main f359f06] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main ed3a9d1] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 42a1e60] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 2827aa8] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3f5edd7] mod f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   03262f2..3f5edd7  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 13 - push new commits to server for file.3.txt
-
-expecting success of 5616.14 'manual prefetch of missing objects': 
-	git -C pc1 fetch --filter=blob:none origin &&
-
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		 main..origin/main >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed.oids &&
-
-	test_line_count = 6 observed.oids &&
-	git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
-
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed.oids &&
-
-	test_line_count = 0 observed.oids
-
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   03262f2..3f5edd7  main       -> origin/main
-remote: Enumerating objects: 6, done.        
-remote: Counting objects:  16% (1/6)        
remote: Counting objects:  33% (2/6)        
remote: Counting objects:  50% (3/6)        
remote: Counting objects:  66% (4/6)        
remote: Counting objects:  83% (5/6)        
remote: Counting objects: 100% (6/6)        
remote: Counting objects: 100% (6/6), done.        
-remote: Compressing objects:  20% (1/5)        
remote: Compressing objects:  40% (2/5)        
remote: Compressing objects:  60% (3/5)        
remote: Compressing objects:  80% (4/5)        
remote: Compressing objects: 100% (5/5)        
remote: Compressing objects: 100% (5/5), done.        
-remote: Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 (from 0)        
-7724cffe11579f391f6c098265878597ecd1ca74 7724cffe11579f391f6c098265878597ecd1ca74
-7c22d416ccef0f2e04b1909d448fa12714ed0c5a 7c22d416ccef0f2e04b1909d448fa12714ed0c5a
-7d87eff241fc01757db1d4f2f4710fbaeacd9950 7d87eff241fc01757db1d4f2f4710fbaeacd9950
-9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d 9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d
-a5e78dc6f3d20c8de85b54d4596946979a89d383 a5e78dc6f3d20c8de85b54d4596946979a89d383
-e5f3bec205041acafa4538978741f185e437e1ee e5f3bec205041acafa4538978741f185e437e1ee
-ok 14 - manual prefetch of missing objects
-
-expecting success of 5616.15 'push new commits to server for file.4.txt': 
-	for x in a b c d e f
-	do
-		echo "Mod file.4.txt $x" >src/file.4.txt &&
-		if list_contains "a,b" "$x"; then
-			printf "%10000s" X >>src/file.4.txt
-		fi &&
-		if list_contains "c,d" "$x"; then
-			printf "%20000s" X >>src/file.4.txt
-		fi &&
-		git -C src add file.4.txt &&
-		git -C src commit -m "mod $x" || return 1
-	done &&
-	git -C src push -u srv main
-
-[main e9880ed] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-[main b08fb33] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main dc63000] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-[main d79e7f2] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0e6343d] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-[main 129c8a2] mod f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   3f5edd7..129c8a2  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 15 - push new commits to server for file.4.txt
-
-expecting success of 5616.16 'apply a different filter using --refetch': 
-	git -C pc1 fetch --filter=blob:limit=999 origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 4 observed &&
-
-	git -C pc1 fetch --filter=blob:limit=19999 --refetch origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 2 observed &&
-
-	git -c protocol.version=0 -C pc1 fetch --filter=blob:limit=29999 \
-		--refetch origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 0 observed
-
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   3f5edd7..129c8a2  main       -> origin/main
-ok 16 - apply a different filter using --refetch
-
-expecting success of 5616.17 'fetch --refetch works with a shallow clone': 
-	git clone --no-checkout --depth=1 --filter=blob:none "file://$(pwd)/srv.bare" pc1s &&
-	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
-	test_line_count = 6 observed &&
-
-	GIT_TRACE=1 git -C pc1s fetch --filter=blob:limit=999 --refetch origin &&
-	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
-	test_line_count = 6 observed
-
-Cloning into 'pc1s'...
-trace: built-in: git fetch --filter=blob:limit=999 --refetch origin
-trace: run_command: unset GIT_PREFIX; GIT_PROTOCOL=version=2 'git-upload-pack '\''/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'\'''
-trace: start_command: /bin/sh -c 'git-upload-pack '\''/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'\''' 'git-upload-pack '\''/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'\'''
-trace: built-in: git upload-pack '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare'
-trace: run_command: git --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
-remote: trace: built-in: git pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999        
-trace: run_command: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' index-pack --stdin --fix-thin --promisor --pack_header=2,6
-trace: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
-run_processes_parallel: preparing to run up to 1 tasks
-run_processes_parallel: done
-trace: run_command: git maintenance run --auto --no-quiet --detach
-trace: start_command: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git' maintenance run --auto --no-quiet --detach
-trace: built-in: git maintenance run --auto --no-quiet --detach
-ok 17 - fetch --refetch works with a shallow clone
-
-expecting success of 5616.18 'fetch --refetch triggers repacking': 
-	GIT_TRACE2_CONFIG_PARAMS=gc.autoPackLimit,maintenance.incremental-repack.auto &&
-	export GIT_TRACE2_CONFIG_PARAMS &&
-
-	GIT_TRACE2_EVENT="$PWD/trace1.event" \
-	git -C pc1 fetch --refetch origin &&
-	test_subcommand git maintenance run --auto --no-quiet --detach <trace1.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace1.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace1.event &&
-
-	GIT_TRACE2_EVENT="$PWD/trace2.event" \
-	git -c protocol.version=0 \
-		-c gc.autoPackLimit=0 \
-		-c maintenance.incremental-repack.auto=1234 \
-		-C pc1 fetch --refetch origin &&
-	test_subcommand git maintenance run --auto --no-quiet --detach <trace2.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"0\" trace2.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace2.event &&
-
-	GIT_TRACE2_EVENT="$PWD/trace3.event" \
-	git -c protocol.version=0 \
-		-c gc.autoPackLimit=1234 \
-		-c maintenance.incremental-repack.auto=0 \
-		-C pc1 fetch --refetch origin &&
-	test_subcommand git maintenance run --auto --no-quiet --detach <trace3.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
-
-{"event":"child_start","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc","thread":"main","time":"2025-02-09T06:54:54.866557Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc/20250209T065454.868475Z-Hcf858c9d-P001b3bab","thread":"main","time":"2025-02-09T06:54:54.869028Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc/20250209T065454.868475Z-Hcf858c9d-P001b3bab/20250209T065454.872141Z-Hcf858c9d-P001b3bc6","thread":"main","time":"2025-02-09T06:54:54.872456Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc/20250209T065454.868475Z-Hcf858c9d-P001b3bab/20250209T065454.872141Z-Hcf858c9d-P001b3bc6/20250209T065454.874126Z-Hcf858c9d-P001b3bd4","thread":"main","time":"2025-02-09T06:54:54.874451Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc/20250209T065454.868475Z-Hcf858c9d-P001b3bab","thread":"main","time":"2025-02-09T06:54:54.869033Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc/20250209T065454.868475Z-Hcf858c9d-P001b3bab/20250209T065454.872141Z-Hcf858c9d-P001b3bc6","thread":"main","time":"2025-02-09T06:54:54.872461Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc/20250209T065454.868475Z-Hcf858c9d-P001b3bab/20250209T065454.872141Z-Hcf858c9d-P001b3bc6/20250209T065454.874126Z-Hcf858c9d-P001b3bd4","thread":"main","time":"2025-02-09T06:54:54.874456Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20250209T065454.829826Z-Hcf858c9d-P001b3adc/20250209T065454.868475Z-Hcf858c9d-P001b3bab/20250209T065454.872141Z-Hcf858c9d-P001b3bc6/20250209T065454.877827Z-Hcf858c9d-P001b3be4","thread":"main","time":"2025-02-09T06:54:54.878510Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20250209T065454.882325Z-Hcf858c9d-P001b3bfd","thread":"main","time":"2025-02-09T06:54:54.909365Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20250209T065454.882325Z-Hcf858c9d-P001b3bfd","thread":"main","time":"2025-02-09T06:54:54.882880Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250209T065454.882325Z-Hcf858c9d-P001b3bfd/20250209T065454.902459Z-Hcf858c9d-P001b3c67","thread":"main","time":"2025-02-09T06:54:54.903016Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250209T065454.882325Z-Hcf858c9d-P001b3bfd/20250209T065454.902459Z-Hcf858c9d-P001b3c67/20250209T065454.906497Z-Hcf858c9d-P001b3c85","thread":"main","time":"2025-02-09T06:54:54.907066Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250209T065454.882325Z-Hcf858c9d-P001b3bfd/20250209T065454.911098Z-Hcf858c9d-P001b3c9c","thread":"main","time":"2025-02-09T06:54:54.911645Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20250209T065454.882325Z-Hcf858c9d-P001b3bfd/20250209T065454.911098Z-Hcf858c9d-P001b3c9c","thread":"main","time":"2025-02-09T06:54:54.911654Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3","thread":"main","time":"2025-02-09T06:54:54.952189Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.955309Z-Hcf858c9d-P001b3d67","thread":"main","time":"2025-02-09T06:54:54.955857Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.955309Z-Hcf858c9d-P001b3d67/20250209T065454.958183Z-Hcf858c9d-P001b3d7e","thread":"main","time":"2025-02-09T06:54:54.958495Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.955309Z-Hcf858c9d-P001b3d67/20250209T065454.958183Z-Hcf858c9d-P001b3d7e/20250209T065454.960070Z-Hcf858c9d-P001b3d8b","thread":"main","time":"2025-02-09T06:54:54.960403Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3","thread":"main","time":"2025-02-09T06:54:54.921634Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.938472Z-Hcf858c9d-P001b3d14","thread":"main","time":"2025-02-09T06:54:54.939043Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.938472Z-Hcf858c9d-P001b3d14/20250209T065454.949227Z-Hcf858c9d-P001b3d44","thread":"main","time":"2025-02-09T06:54:54.949805Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.955309Z-Hcf858c9d-P001b3d67","thread":"main","time":"2025-02-09T06:54:54.955854Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.955309Z-Hcf858c9d-P001b3d67/20250209T065454.958183Z-Hcf858c9d-P001b3d7e","thread":"main","time":"2025-02-09T06:54:54.958492Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.955309Z-Hcf858c9d-P001b3d67/20250209T065454.958183Z-Hcf858c9d-P001b3d7e/20250209T065454.960070Z-Hcf858c9d-P001b3d8b","thread":"main","time":"2025-02-09T06:54:54.960399Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20250209T065454.921030Z-Hcf858c9d-P001b3cc3/20250209T065454.955309Z-Hcf858c9d-P001b3d67/20250209T065454.958183Z-Hcf858c9d-P001b3d7e/20250209T065454.965568Z-Hcf858c9d-P001b3d99","thread":"main","time":"2025-02-09T06:54:54.965885Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-ok 18 - fetch --refetch triggers repacking
-
-expecting success of 5616.19 'partial clone with transfer.fsckobjects=1 works with submodules': 
-	test_create_repo submodule &&
-	test_commit -C submodule mycommit &&
-
-	test_create_repo src_with_sub &&
-	git -C src_with_sub config uploadpack.allowfilter 1 &&
-	git -C src_with_sub config uploadpack.allowanysha1inwant 1 &&
-
-	test_config_global protocol.file.allow always &&
-
-	git -C src_with_sub submodule add "file://$(pwd)/submodule" mysub &&
-	git -C src_with_sub commit -m "commit with submodule" &&
-
-	git -c transfer.fsckobjects=1 \
-		clone --filter="blob:none" "file://$(pwd)/src_with_sub" dst &&
-	test_when_finished rm -rf dst
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/submodule/.git/
-[main (root-commit) 35ce5a7] mycommit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 mycommit.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src_with_sub/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src_with_sub/mysub'...
-[main (root-commit) 165258d] commit with submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 mysub
-Cloning into 'dst'...
-ok 19 - partial clone with transfer.fsckobjects=1 works with submodules
-
-expecting success of 5616.20 'lazily fetched .gitmodules works': 
-	git clone --filter="blob:none" --no-checkout "file://$(pwd)/src_with_sub" dst &&
-	git -C dst fetch &&
-	test_when_finished rm -rf dst
-
-Cloning into 'dst'...
-ok 20 - lazily fetched .gitmodules works
-
-expecting success of 5616.21 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects': 
-	git init src &&
-	test_commit -C src x &&
-	test_config -C src uploadpack.allowfilter 1 &&
-	test_config -C src uploadpack.allowanysha1inwant 1 &&
-
-	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
-		clone --filter="blob:none" "file://$(pwd)/src" dst &&
-	grep "git index-pack.*--fsck-objects" trace
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
-[main 1fb08d4] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Cloning into 'dst'...
-trace: run_command: git index-pack --stdin --fix-thin '--keep=fetch-pack 1786435 on codethink04-arm64' --promisor --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 1786435 on codethink04-arm64' --promisor --fsck-objects
-trace: run_command: git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
-ok 21 - partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects
-
-expecting success of 5616.22 'use fsck before and after manually fetching a missing subtree': 
-	# push new commit so server has a subtree
-	mkdir src/dir &&
-	echo "in dir" >src/dir/file.txt &&
-	git -C src add dir/file.txt &&
-	git -C src commit -m "file in dir" &&
-	git -C src push -u srv main &&
-	SUBTREE=$(git -C src rev-parse HEAD:dir) &&
-
-	rm -rf dst &&
-	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" dst &&
-	git -C dst fsck &&
-
-	# Make sure we only have commits, and all trees and blobs are missing.
-	git -C dst rev-list --missing=allow-any --objects main \
-		>fetched_objects &&
-	awk -f print_1.awk fetched_objects |
-	xargs -n1 git -C dst cat-file -t >fetched_types &&
-
-	sort -u fetched_types >unique_types.observed &&
-	echo commit >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.observed &&
-
-	# Auto-fetch a tree with cat-file.
-	git -C dst cat-file -p $SUBTREE >tree_contents &&
-	grep file.txt tree_contents &&
-
-	# fsck still works after an auto-fetch of a tree.
-	git -C dst fsck &&
-
-	# Auto-fetch all remaining trees and blobs with --missing=error
-	git -C dst rev-list --missing=error --objects main >fetched_objects &&
-	test_line_count = 88 fetched_objects &&
-
-	awk -f print_1.awk fetched_objects |
-	xargs -n1 git -C dst cat-file -t >fetched_types &&
-
-	sort -u fetched_types >unique_types.observed &&
-	test_write_lines blob commit tree >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.observed
-
-[main 957c60b] file in dir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/file.txt
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   129c8a2..957c60b  main -> main
-branch 'main' set up to track 'srv/main'.
-Cloning into 'dst'...
-100644 blob d2cebd4f0a9e97a48a6139d09cafdb513ad8fee3	file.txt
-dangling tree bc1967ebf96a4e914801c7ef8328140456a10f41
-ok 22 - use fsck before and after manually fetching a missing subtree
-
-expecting success of 5616.23 'implicitly construct combine: filter with repeated flags': 
-	GIT_TRACE=$(pwd)/trace git clone --bare \
-		--filter=blob:none --filter=tree:1 \
-		"file://$(pwd)/srv.bare" pc2 &&
-	grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \
-		trace &&
-	git -C pc2 rev-list --objects --missing=allow-any HEAD >objects &&
-
-	# We should have gotten some root trees.
-	grep " $" objects &&
-	# Should not have gotten any non-root trees or blobs.
-	! grep " ." objects &&
-
-	xargs -n 1 git -C pc2 cat-file -t <objects >types &&
-	sort -u types >unique_types.actual &&
-	test_write_lines commit tree >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.actual
-
-Cloning into bare repository 'pc2'...
-trace: run_command: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
-trace: built-in: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
-849950ea25ea502730806953150a8b29fbc04fd1 
-5e06b9e5aed2904563066a6d041bd48487b00cba 
-94a1afd9afa4ab1486352ab1c059762e3e872ce4 
-e77db3bdb5e7e6af01bd93bcd0f99a69d939d0aa 
-e6f42a769ea1225565ede9aa9e708186165aad4c 
-7eaccd314b25541fb2e12c6a9041510af10e1518 
-fdb7f75e829001ecb4ca2d6217d7fd04457e275c 
-f0075f67c4ce0cc5963de5143fb89b89762976ea 
-e891efadd67ca0c01b1c518a2fd91130d40f5904 
-b1ada3a7551c02bc311cab409bcdb3210cc0db2b 
-a00681e4a08fb4916de7e62d89de5b662ef1860a 
-6a1c4b6f6db25436faf11feadebfa98132273db5 
-a7d56826180d177dcd33e04e00c6ae488eda8dd2 
-91d0f663d7a546b2e8dfad2b8298f743aae0b020 
-ddb185bb2b7d210636855cd4f053ea8ff15c8f1c 
-974a5d9aee9b30da804ae932f36ed0eb7f5a2c50 
-2ce2a26473b0751a79d9c42a2a4480fa73fe4f15 
-f7e2c683a7004d4fb81563ae0a3087442db18354 
-26f5e35d8a7ae9658923cf3ccdfc19c86a3e1424 
-4c015c7e720cb846212f85d6513eaf497ea021fe 
-b1d4c4f82f23b1f0779bc7e8f360950eaab333da 
-aa3aad2daa2266f2379fa0b387e0c47ce7fc59bd 
-5768e37e39ded4ab416a0e61f824cad46e996fec 
-3a35e4cd4fbd2d3dbcd056d0e997a47518d10432 
-3246c304205324149983025431c5211438f41931 
-dfce1aed58f95775a6963107c4471a9f0bfff6e6 
-25c201430fa73e4f524ad53e88ef255c807b27e0 
-aa8fcdda393dec1e72abbb7f868b7d971b730a19 
-3f2b9ee6d5378134943b47172ba029ae46a49419 
-ok 23 - implicitly construct combine: filter with repeated flags
-
-expecting success of 5616.24 'upload-pack complains of bogus filter config': 
-	printf 0000 |
-	test_must_fail git \
-		-c uploadpackfilter.tree.maxdepth \
-		upload-pack . >/dev/null 2>err &&
-	test_grep "unable to parse.*tree.maxdepth" err
-
-fatal: unable to parse 'uploadpackfilter.tree.maxdepth' from command-line config
-ok 24 - upload-pack complains of bogus filter config
-
-expecting success of 5616.25 'upload-pack fails banned object filters': 
-	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
-		"file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "filter 'blob:none' not supported" err
-
-fatal: filter 'blob:none' not supported
-fatal: remote error: filter 'blob:none' not supported
-ok 25 - upload-pack fails banned object filters
-
-expecting success of 5616.26 'upload-pack fails banned combine object filters': 
-	test_config -C srv.bare uploadpackfilter.allow false &&
-	test_config -C srv.bare uploadpackfilter.combine.allow true &&
-	test_config -C srv.bare uploadpackfilter.tree.allow true &&
-	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
-		--filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "filter 'blob:none' not supported" err
-
-fatal: filter 'blob:none' not supported
-fatal: remote error: filter 'blob:none' not supported
-ok 26 - upload-pack fails banned combine object filters
-
-expecting success of 5616.27 'upload-pack fails banned object filters with fallback': 
-	test_config -C srv.bare uploadpackfilter.allow false &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
-		"file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "filter 'blob:none' not supported" err
-
-fatal: filter 'blob:none' not supported
-fatal: remote error: filter 'blob:none' not supported
-ok 27 - upload-pack fails banned object filters with fallback
-
-expecting success of 5616.28 'upload-pack limits tree depth filters': 
-	test_config -C srv.bare uploadpackfilter.allow false &&
-	test_config -C srv.bare uploadpackfilter.tree.allow true &&
-	test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
-		"file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "tree filter allows max depth 0, but got 1" err &&
-
-	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
-
-	test_config -C srv.bare uploadpackfilter.tree.maxDepth 5 &&
-	git clone --no-checkout --filter=tree:5 "file://$(pwd)/srv.bare" pc5 &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:6 \
-		"file://$(pwd)/srv.bare" pc6 2>err &&
-	test_grep "tree filter allows max depth 5, but got 6" err
-
-fatal: tree filter allows max depth 0, but got 1
-fatal: remote error: tree filter allows max depth 0, but got 1
-Cloning into 'pc4'...
-Cloning into 'pc5'...
-fatal: tree filter allows max depth 5, but got 6
-fatal: remote error: tree filter allows max depth 5, but got 6
-ok 28 - upload-pack limits tree depth filters
-
-expecting success of 5616.29 'partial clone fetches blobs pointed to by refs even if normally filtered out': 
-	rm -rf src dst &&
-	git init src &&
-	test_commit -C src x &&
-	test_config -C src uploadpack.allowfilter 1 &&
-	test_config -C src uploadpack.allowanysha1inwant 1 &&
-
-	# Create a tag pointing to a blob.
-	BLOB=$(echo blob-contents | git -C src hash-object --stdin -w) &&
-	git -C src tag myblob "$BLOB" &&
-
-	git clone --filter="blob:none" "file://$(pwd)/src" dst 2>err &&
-	! grep "does not point to a valid object" err &&
-	git -C dst fsck
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) d63d3b7] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-ok 29 - partial clone fetches blobs pointed to by refs even if normally filtered out
-
-expecting success of 5616.30 'fetch what is specified on CLI even if already promised': 
-	rm -rf src dst.git &&
-	git init src &&
-	test_commit -C src foo &&
-	test_config -C src uploadpack.allowfilter 1 &&
-	test_config -C src uploadpack.allowanysha1inwant 1 &&
-
-	git hash-object --stdin <src/foo.t >blob &&
-
-	git clone --bare --filter=blob:none "file://$(pwd)/src" dst.git &&
-	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_before &&
-	grep "?$(cat blob)" missing_before &&
-	git -C dst.git fetch origin $(cat blob) &&
-	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_after &&
-	! grep "?$(cat blob)" missing_after
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) f80cabb] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into bare repository 'dst.git'...
-?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src
- * branch            257cc5642cb1a054f08cc83f2d943e56fd3ebe99 -> FETCH_HEAD
-ok 30 - fetch what is specified on CLI even if already promised
-
-expecting success of 5616.31 'setup src repo for sparse filter': 
-	git init sparse-src &&
-	git -C sparse-src config --local uploadpack.allowfilter 1 &&
-	git -C sparse-src config --local uploadpack.allowanysha1inwant 1 &&
-	test_commit -C sparse-src one &&
-	test_commit -C sparse-src two &&
-	echo /one.t >sparse-src/only-one &&
-	git -C sparse-src add . &&
-	git -C sparse-src commit -m "add sparse checkout files"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/sparse-src/.git/
-[main (root-commit) 6f4b17f] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 5c4888c] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main cc88d32] add sparse checkout files
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 only-one
-ok 31 - setup src repo for sparse filter
-
-expecting success of 5616.32 'partial clone with sparse filter succeeds': 
-	rm -rf dst.git &&
-	git clone --no-local --bare \
-		  --filter=sparse:oid=main:only-one \
-		  sparse-src dst.git &&
-	(
-		cd dst.git &&
-		git rev-list --objects --missing=print HEAD >out &&
-		grep "^$(git rev-parse HEAD:one.t)" out &&
-		grep "^?$(git rev-parse HEAD:two.t)" out
-	)
-
-Cloning into bare repository 'dst.git'...
-5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
-?f719efd430d52bcfc8566a43b2eb655688d38871
-ok 32 - partial clone with sparse filter succeeds
-
-expecting success of 5616.33 'partial clone with unresolvable sparse filter fails cleanly': 
-	rm -rf dst.git &&
-	test_must_fail git clone --no-local --bare \
-				 --filter=sparse:oid=main:no-such-name \
-				 sparse-src dst.git 2>err &&
-	test_grep "unable to access sparse blob in .main:no-such-name" err &&
-	test_must_fail git clone --no-local --bare \
-				 --filter=sparse:oid=main \
-				 sparse-src dst.git 2>err &&
-	test_grep "unable to parse sparse filter data in" err
-
-remote: fatal: unable to access sparse blob in 'main:no-such-name'        
-remote: fatal: unable to parse sparse filter data in cc88d32db343d6bb15610824107d11c391b515ca        
-ok 33 - partial clone with unresolvable sparse filter fails cleanly
-
-expecting success of 5616.34 'fetch lazy-fetches only to resolve deltas': 
-	setup_triangle &&
-
-	# Exercise to make sure it works. Git will not fetch anything from the
-	# promisor remote other than for the big tree (because it needs to
-	# resolve the delta).
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
-		fetch "file://$(pwd)/server" main &&
-
-	# Verify the assumption that the client needed to fetch the delta base
-	# to resolve the delta.
-	git -C server rev-parse HEAD~1^{tree} >hash &&
-	grep "want $(cat hash)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) b380020] initial
- Author: A U Thor <author@example.com>
- 100 files changed, 100 insertions(+)
- create mode 100644 file1
- create mode 100644 file10
- create mode 100644 file100
- create mode 100644 file11
- create mode 100644 file12
- create mode 100644 file13
- create mode 100644 file14
- create mode 100644 file15
- create mode 100644 file16
- create mode 100644 file17
- create mode 100644 file18
- create mode 100644 file19
- create mode 100644 file2
- create mode 100644 file20
- create mode 100644 file21
- create mode 100644 file22
- create mode 100644 file23
- create mode 100644 file24
- create mode 100644 file25
- create mode 100644 file26
- create mode 100644 file27
- create mode 100644 file28
- create mode 100644 file29
- create mode 100644 file3
- create mode 100644 file30
- create mode 100644 file31
- create mode 100644 file32
- create mode 100644 file33
- create mode 100644 file34
- create mode 100644 file35
- create mode 100644 file36
- create mode 100644 file37
- create mode 100644 file38
- create mode 100644 file39
- create mode 100644 file4
- create mode 100644 file40
- create mode 100644 file41
- create mode 100644 file42
- create mode 100644 file43
- create mode 100644 file44
- create mode 100644 file45
- create mode 100644 file46
- create mode 100644 file47
- create mode 100644 file48
- create mode 100644 file49
- create mode 100644 file5
- create mode 100644 file50
- create mode 100644 file51
- create mode 100644 file52
- create mode 100644 file53
- create mode 100644 file54
- create mode 100644 file55
- create mode 100644 file56
- create mode 100644 file57
- create mode 100644 file58
- create mode 100644 file59
- create mode 100644 file6
- create mode 100644 file60
- create mode 100644 file61
- create mode 100644 file62
- create mode 100644 file63
- create mode 100644 file64
- create mode 100644 file65
- create mode 100644 file66
- create mode 100644 file67
- create mode 100644 file68
- create mode 100644 file69
- create mode 100644 file7
- create mode 100644 file70
- create mode 100644 file71
- create mode 100644 file72
- create mode 100644 file73
- create mode 100644 file74
- create mode 100644 file75
- create mode 100644 file76
- create mode 100644 file77
- create mode 100644 file78
- create mode 100644 file79
- create mode 100644 file8
- create mode 100644 file80
- create mode 100644 file81
- create mode 100644 file82
- create mode 100644 file83
- create mode 100644 file84
- create mode 100644 file85
- create mode 100644 file86
- create mode 100644 file87
- create mode 100644 file88
- create mode 100644 file89
- create mode 100644 file9
- create mode 100644 file90
- create mode 100644 file91
- create mode 100644 file92
- create mode 100644 file93
- create mode 100644 file94
- create mode 100644 file95
- create mode 100644 file96
- create mode 100644 file97
- create mode 100644 file98
- create mode 100644 file99
-Cloning into bare repository 'client'...
-[main 85be905] incremental change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/promisor-remote/.git/
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
- * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
-count: 0
-in-pack: 2
-[main (root-commit) 06e07da] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-warning: filtering not recognized by server, ignoring
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
- * branch            main       -> FETCH_HEAD
-packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
-packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
-ok 34 - fetch lazy-fetches only to resolve deltas
-
-expecting success of 5616.35 'fetch lazy-fetches only to resolve deltas, protocol v2': 
-	setup_triangle &&
-
-	git -C server config --local protocol.version 2 &&
-	git -C client config --local protocol.version 2 &&
-	git -C promisor-remote config --local protocol.version 2 &&
-
-	# Exercise to make sure it works. Git will not fetch anything from the
-	# promisor remote other than for the big blob (because it needs to
-	# resolve the delta).
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
-		fetch "file://$(pwd)/server" main &&
-
-	# Verify that protocol version 2 was used.
-	grep "fetch< version 2" trace &&
-
-	# Verify the assumption that the client needed to fetch the delta base
-	# to resolve the delta.
-	git -C server rev-parse HEAD~1^{tree} >hash &&
-	grep "want $(cat hash)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) 9bc3270] initial
- Author: A U Thor <author@example.com>
- 100 files changed, 100 insertions(+)
- create mode 100644 file1
- create mode 100644 file10
- create mode 100644 file100
- create mode 100644 file11
- create mode 100644 file12
- create mode 100644 file13
- create mode 100644 file14
- create mode 100644 file15
- create mode 100644 file16
- create mode 100644 file17
- create mode 100644 file18
- create mode 100644 file19
- create mode 100644 file2
- create mode 100644 file20
- create mode 100644 file21
- create mode 100644 file22
- create mode 100644 file23
- create mode 100644 file24
- create mode 100644 file25
- create mode 100644 file26
- create mode 100644 file27
- create mode 100644 file28
- create mode 100644 file29
- create mode 100644 file3
- create mode 100644 file30
- create mode 100644 file31
- create mode 100644 file32
- create mode 100644 file33
- create mode 100644 file34
- create mode 100644 file35
- create mode 100644 file36
- create mode 100644 file37
- create mode 100644 file38
- create mode 100644 file39
- create mode 100644 file4
- create mode 100644 file40
- create mode 100644 file41
- create mode 100644 file42
- create mode 100644 file43
- create mode 100644 file44
- create mode 100644 file45
- create mode 100644 file46
- create mode 100644 file47
- create mode 100644 file48
- create mode 100644 file49
- create mode 100644 file5
- create mode 100644 file50
- create mode 100644 file51
- create mode 100644 file52
- create mode 100644 file53
- create mode 100644 file54
- create mode 100644 file55
- create mode 100644 file56
- create mode 100644 file57
- create mode 100644 file58
- create mode 100644 file59
- create mode 100644 file6
- create mode 100644 file60
- create mode 100644 file61
- create mode 100644 file62
- create mode 100644 file63
- create mode 100644 file64
- create mode 100644 file65
- create mode 100644 file66
- create mode 100644 file67
- create mode 100644 file68
- create mode 100644 file69
- create mode 100644 file7
- create mode 100644 file70
- create mode 100644 file71
- create mode 100644 file72
- create mode 100644 file73
- create mode 100644 file74
- create mode 100644 file75
- create mode 100644 file76
- create mode 100644 file77
- create mode 100644 file78
- create mode 100644 file79
- create mode 100644 file8
- create mode 100644 file80
- create mode 100644 file81
- create mode 100644 file82
- create mode 100644 file83
- create mode 100644 file84
- create mode 100644 file85
- create mode 100644 file86
- create mode 100644 file87
- create mode 100644 file88
- create mode 100644 file89
- create mode 100644 file9
- create mode 100644 file90
- create mode 100644 file91
- create mode 100644 file92
- create mode 100644 file93
- create mode 100644 file94
- create mode 100644 file95
- create mode 100644 file96
- create mode 100644 file97
- create mode 100644 file98
- create mode 100644 file99
-Cloning into bare repository 'client'...
-[main 014bae7] incremental change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/promisor-remote/.git/
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
- * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
-count: 0
-in-pack: 2
-[main (root-commit) d944c64] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-warning: filtering not recognized by server, ignoring
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
- * branch            main       -> FETCH_HEAD
-packet:        fetch< version 2
-packet:        fetch< version 2
-packet:        fetch< version 2
-packet:        fetch< version 2
-packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
-packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
-packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
-packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
-ok 35 - fetch lazy-fetches only to resolve deltas, protocol v2
-
-expecting success of 5616.36 'fetch does not lazy-fetch missing targets of its refs': 
-	rm -rf server client trace &&
-
-	test_create_repo server &&
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	test_commit -C server foo &&
-
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	# Make all refs point to nothing by deleting all objects.
-	rm client/.git/objects/pack/* &&
-
-	test_commit -C server bar &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--no-tags --recurse-submodules=no \
-		origin refs/tags/bar &&
-	FOO_HASH=$(git -C server rev-parse foo) &&
-	! grep "want $FOO_HASH" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) 92a62de] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'client'...
-[main 92e3d69] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
- * tag               bar        -> FETCH_HEAD
-ok 36 - fetch does not lazy-fetch missing targets of its refs
-
-expecting success of 5616.37 'verify fetch succeeds when asking for new tags': 
-	git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test &&
-	for i in I J K
-	do
-		test_commit -C src $i &&
-		git -C src branch $i || return 1
-	done &&
-	git -C srv.bare fetch --tags origin +refs/heads/*:refs/heads/* &&
-	git -C tag-test -c protocol.version=2 fetch --tags origin
-
-Cloning into 'tag-test'...
-[main f18c5f5] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-[main a03a6a6] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-[main 367cc8f] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 K.t
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src
- * [new branch]      I          -> I
- * [new branch]      J          -> J
- * [new branch]      K          -> K
- + 957c60b...367cc8f main       -> main  (forced update)
- * [new tag]         I          -> I
- * [new tag]         J          -> J
- * [new tag]         K          -> K
- * [new tag]         foo        -> foo
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
- + 957c60b...367cc8f main       -> origin/main  (forced update)
- * [new branch]      I          -> origin/I
- * [new branch]      J          -> origin/J
- * [new branch]      K          -> origin/K
- * [new tag]         I          -> I
- * [new tag]         J          -> J
- * [new tag]         K          -> K
- * [new tag]         foo        -> foo
-ok 37 - verify fetch succeeds when asking for new tags
-
-expecting success of 5616.38 'verify fetch downloads only one pack when updating refs': 
-	git clone --filter=blob:none "file://$(pwd)/srv.bare" pack-test &&
-	ls pack-test/.git/objects/pack/*pack >pack-list &&
-	test_line_count = 2 pack-list &&
-	for i in A B C
-	do
-		test_commit -C src $i &&
-		git -C src branch $i || return 1
-	done &&
-	git -C srv.bare fetch origin +refs/heads/*:refs/heads/* &&
-	git -C pack-test fetch origin &&
-	ls pack-test/.git/objects/pack/*pack >pack-list &&
-	test_line_count = 3 pack-list
-
-Cloning into 'pack-test'...
-[main bc03829] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 525529d] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 66f5bb0] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src
- * [new branch]      A          -> A
- * [new branch]      B          -> B
- * [new branch]      C          -> C
-   367cc8f..66f5bb0  main       -> main
- * [new tag]         A          -> A
- * [new tag]         B          -> B
- * [new tag]         C          -> C
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/srv.bare
-   367cc8f..66f5bb0  main       -> origin/main
- * [new branch]      A          -> origin/A
- * [new branch]      B          -> origin/B
- * [new branch]      C          -> origin/C
- * [new tag]         A          -> A
- * [new tag]         B          -> B
- * [new tag]         C          -> C
-ok 38 - verify fetch downloads only one pack when updating refs
-
-expecting success of 5616.39 'single-branch tag following respects partial clone': 
-	git clone --single-branch -b B --filter=blob:none \
-		"file://$(pwd)/srv.bare" single &&
-	git -C single rev-parse --verify refs/tags/B &&
-	git -C single rev-parse --verify refs/tags/A &&
-	test_must_fail git -C single rev-parse --verify refs/tags/C
-
-Cloning into 'single'...
-525529d87f8f318d404aa60b6d2b41ed0f49123b
-bc03829a3804fb49ee75372a845d1554afc2e83f
-fatal: Needed a single revision
-ok 39 - single-branch tag following respects partial clone
-
-expecting success of 5616.40 'fetch from a partial clone, protocol v0': 
-	rm -rf server client trace &&
-
-	# Pretend that the server is a partial clone
-	git init server &&
-	git -C server remote add a_remote "file://$(pwd)/" &&
-	test_config -C server core.repositoryformatversion 1 &&
-	test_config -C server extensions.partialclone a_remote &&
-	test_config -C server protocol.version 0 &&
-	test_commit -C server foo &&
-
-	# Fetch from the server
-	git init client &&
-	test_config -C client protocol.version 0 &&
-	test_commit -C client bar &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
-	! grep "version 2" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) b259608] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/client/.git/
-[main (root-commit) 76913b4] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-warning: no common commits
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
- * branch            HEAD       -> FETCH_HEAD
-ok 40 - fetch from a partial clone, protocol v0
-
-expecting success of 5616.41 'fetch from a partial clone, protocol v2': 
-	rm -rf server client trace &&
-
-	# Pretend that the server is a partial clone
-	git init server &&
-	git -C server remote add a_remote "file://$(pwd)/" &&
-	test_config -C server core.repositoryformatversion 1 &&
-	test_config -C server extensions.partialclone a_remote &&
-	test_config -C server protocol.version 2 &&
-	test_commit -C server foo &&
-
-	# Fetch from the server
-	git init client &&
-	test_config -C client protocol.version 2 &&
-	test_commit -C client bar &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
-	grep "version 2" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) bbef54c] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/client/.git/
-[main (root-commit) 10dc217] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/server
- * branch            HEAD       -> FETCH_HEAD
-packet:  upload-pack> version 2
-packet:        fetch< version 2
-ok 41 - fetch from a partial clone, protocol v2
-
-expecting success of 5616.42 'repack does not loosen promisor objects': 
-	rm -rf client trace &&
-	git clone --bare --filter=blob:none "file://$(pwd)/srv.bare" client &&
-	test_when_finished "rm -rf client trace" &&
-	GIT_TRACE2_PERF="$(pwd)/trace" git -C client repack -A -d &&
-	grep "loosen_unused_packed_objects/loosened:0" trace
-
-Cloning into bare repository 'client'...
-06:54:59.414176 builtin/pack-objects.c:4039  | d1 | main                     | data         | r0  |  0.001378 |  0.000420 | pack-objects | ..loosen_unused_packed_objects/loosened:0
-ok 42 - repack does not loosen promisor objects
-
-expecting success of 5616.43 'lazy-fetch in submodule succeeds': 
-	# setup
-	test_config_global protocol.file.allow always &&
-
-	test_when_finished "rm -rf src-sub" &&
-	git init src-sub &&
-	git -C src-sub config uploadpack.allowfilter 1 &&
-	git -C src-sub config uploadpack.allowanysha1inwant 1 &&
-
-	# This blob must be missing in the subsequent commit.
-	echo foo >src-sub/file &&
-	git -C src-sub add file &&
-	git -C src-sub commit -m "submodule one" &&
-	SUB_ONE=$(git -C src-sub rev-parse HEAD) &&
-
-	echo bar >src-sub/file &&
-	git -C src-sub add file &&
-	git -C src-sub commit -m "submodule two" &&
-	SUB_TWO=$(git -C src-sub rev-parse HEAD) &&
-
-	test_when_finished "rm -rf src-super" &&
-	git init src-super &&
-	git -C src-super config uploadpack.allowfilter 1 &&
-	git -C src-super config uploadpack.allowanysha1inwant 1 &&
-	git -C src-super submodule add ../src-sub src-sub &&
-
-	git -C src-super/src-sub checkout $SUB_ONE &&
-	git -C src-super add src-sub &&
-	git -C src-super commit -m "superproject one" &&
-
-	git -C src-super/src-sub checkout $SUB_TWO &&
-	git -C src-super add src-sub &&
-	git -C src-super commit -m "superproject two" &&
-
-	# the fetch
-	test_when_finished "rm -rf client" &&
-	git clone --filter=blob:none --also-filter-submodules \
-		--recurse-submodules "file://$(pwd)/src-super" client &&
-
-	# Trigger lazy-fetch from the superproject
-	git -C client restore --recurse-submodules --source=HEAD^ :/
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-sub/.git/
-[main (root-commit) 801106d] submodule one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main acdf0b1] submodule two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-super/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-super/src-sub'...
-done.
-Note: switching to '801106d77b703b74d29c28581b66e9e382e71a99'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 801106d submodule one
-[main (root-commit) 5f7f3e0] superproject one
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 src-sub
-Previous HEAD position was 801106d submodule one
-HEAD is now at acdf0b1 submodule two
-[main 9a05ac3] superproject two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'client'...
-Submodule 'src-sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/src-sub) registered for path 'src-sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/client/src-sub'...
-Submodule path 'src-sub': checked out 'acdf0b16fe4ce2869af73bab3c07737b60472b68'
-ok 43 - lazy-fetch in submodule succeeds
-
-expecting success of 5616.44 'after fetching descendants of non-promisor commits, gc works': 
-	# Setup
-	git init full &&
-	git -C full config uploadpack.allowfilter 1 &&
-	git -C full config uploadpack.allowanysha1inwant 1 &&
-	touch full/foo &&
-	git -C full add foo &&
-	git -C full commit -m "commit 1" &&
-	git -C full checkout --detach &&
-
-	# Partial clone and push commit to remote
-	git clone "file://$(pwd)/full" --filter=blob:none partial &&
-	echo "hello" > partial/foo &&
-	git -C partial commit -a -m "commit 2" &&
-	git -C partial push &&
-
-	# gc in partial repo
-	git -C partial gc --prune=now &&
-
-	# Create another commit in normal repo
-	git -C full checkout main &&
-	echo " world" >> full/foo &&
-	git -C full commit -a -m "commit 3" &&
-
-	# Pull from remote in partial repo, and run gc again
-	git -C partial pull &&
-	git -C partial gc --prune=now
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/full/.git/
-[main (root-commit) 08368f5] commit 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-HEAD is now at 08368f5 commit 1
-Cloning into 'partial'...
-[main d697f4a] commit 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/full
-   08368f5..d697f4a  main -> main
-Previous HEAD position was 08368f5 commit 1
-Switched to branch 'main'
-[main 5b8be83] commit 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5616-partial-clone/full
-   d697f4a..5b8be83  main       -> origin/main
-Updating d697f4a..5b8be83
-Fast-forward
- foo | 1 +
- 1 file changed, 1 insertion(+)
-ok 44 - after fetching descendants of non-promisor commits, gc works
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 44 test(s)
-# SKIP no web server found at ''
-1..44
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6115-rev-list-du.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6115-rev-list-du/.git/
 expecting success of 6115.1 'set up repository': 
@@ -402874,1019 +402551,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6130-pathspec-noglob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6050-replace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6050-replace/.git/
-expecting success of 6050.1 'set up buggy branch': 
-	echo "line 1" >>hello &&
-	echo "line 2" >>hello &&
-	echo "line 3" >>hello &&
-	echo "line 4" >>hello &&
-	add_and_commit_file hello "4 lines" &&
-	HASH1=$(git rev-parse --verify HEAD) &&
-	echo "line BUG" >>hello &&
-	echo "line 6" >>hello &&
-	echo "line 7" >>hello &&
-	echo "line 8" >>hello &&
-	add_and_commit_file hello "4 more lines with a BUG" &&
-	HASH2=$(git rev-parse --verify HEAD) &&
-	echo "line 9" >>hello &&
-	echo "line 10" >>hello &&
-	add_and_commit_file hello "2 more lines" &&
-	HASH3=$(git rev-parse --verify HEAD) &&
-	echo "line 11" >>hello &&
-	add_and_commit_file hello "1 more line" &&
-	HASH4=$(git rev-parse --verify HEAD) &&
-	sed -e "s/BUG/5/" hello >hello.new &&
-	mv hello.new hello &&
-	add_and_commit_file hello "BUG fixed" &&
-	HASH5=$(git rev-parse --verify HEAD) &&
-	echo "line 12" >>hello &&
-	echo "line 13" >>hello &&
-	add_and_commit_file hello "2 more lines" &&
-	HASH6=$(git rev-parse --verify HEAD) &&
-	echo "line 14" >>hello &&
-	echo "line 15" >>hello &&
-	echo "line 16" >>hello &&
-	add_and_commit_file hello "again 3 more lines" &&
-	HASH7=$(git rev-parse --verify HEAD)
-
-ok 1 - set up buggy branch
-
-expecting success of 6050.2 'replace the author': 
-	git cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	R=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
-	git cat-file commit $R >actual &&
-	test_grep "author O Thor" actual &&
-	git update-ref refs/replace/$HASH2 $R &&
-	git show HEAD~5 >actual &&
-	test_grep "O Thor" actual &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual
-
-author A U Thor <author@example.com> 1112912053 -0700
-author O Thor <author@example.com> 1112912053 -0700
-Author: O Thor <author@example.com>
-Author: O Thor <author@example.com>
-ok 2 - replace the author
-
-expecting success of 6050.3 'test --no-replace-objects option': 
-	git cat-file commit $HASH2 >actual &&
-	test_grep "author O Thor" actual &&
-	git --no-replace-objects cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual &&
-	git --no-replace-objects show $HASH2 >actual &&
-	test_grep "A U Thor" actual
-
-author O Thor <author@example.com> 1112912053 -0700
-author A U Thor <author@example.com> 1112912053 -0700
-Author: O Thor <author@example.com>
-Author: A U Thor <author@example.com>
-ok 3 - test --no-replace-objects option
-
-expecting success of 6050.4 'test GIT_NO_REPLACE_OBJECTS env variable': 
-	GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 >actual &&
-	test_grep "A U Thor" actual
-
-author A U Thor <author@example.com> 1112912053 -0700
-Author: A U Thor <author@example.com>
-ok 4 - test GIT_NO_REPLACE_OBJECTS env variable
-
-expecting success of 6050.5 'test core.usereplacerefs config option': 
-	test_config core.usereplacerefs false &&
-	git cat-file commit $HASH2 >actual &&
-	test_grep "author A U Thor" actual &&
-	git show $HASH2 >actual &&
-	test_grep "A U Thor" actual
-
-author A U Thor <author@example.com> 1112912053 -0700
-Author: A U Thor <author@example.com>
-ok 5 - test core.usereplacerefs config option
-
-expecting success of 6050.6 'tag replaced commit': 
-	git update-ref refs/tags/mytag $(git mktag <tag.sig)
-
-ok 6 - tag replaced commit
-
-expecting success of 6050.7 '"git fsck" works': 
-	git fsck main >fsck_main.out &&
-	test_grep "dangling commit $R" fsck_main.out &&
-	test_grep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
-	test -z "$(git fsck)"
-
-dangling commit c06ac9b8cd2f38349af40ec00e5d5c761b3bf513
-dangling tag e25dc7954f0832d962347872884aab2dffb426c5
-ok 7 - "git fsck" works
-
-expecting success of 6050.8 'repack, clone and fetch work': 
-	git repack -a -d &&
-	git clone --no-hardlinks . clone_dir &&
-	(
-		cd clone_dir &&
-		git show HEAD~5 >actual &&
-		test_grep "A U Thor" actual &&
-		git show $HASH2 >actual &&
-		test_grep "A U Thor" actual &&
-		git cat-file commit $R &&
-		git repack -a -d &&
-		test_must_fail git cat-file commit $R &&
-		git fetch ../ "refs/replace/*:refs/replace/*" &&
-		git show HEAD~5 >actual &&
-		test_grep "O Thor" actual &&
-		git show $HASH2 >actual &&
-		test_grep "O Thor" actual &&
-		git cat-file commit $R
-	)
-
-Cloning into 'clone_dir'...
-done.
-Author: A U Thor <author@example.com>
-Author: A U Thor <author@example.com>
-tree 242e3e36d5c0616fbf715682c322254dadb55168
-parent 00ad688edb1a79423184992de45a5f0322c8bdf5
-author O Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-
-hello: 4 more lines with a BUG
-fatal: git cat-file c06ac9b8cd2f38349af40ec00e5d5c761b3bf513: bad file
-From ..
- * [new ref]         refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0 -> refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0
-Author: O Thor <author@example.com>
-Author: O Thor <author@example.com>
-tree 242e3e36d5c0616fbf715682c322254dadb55168
-parent 00ad688edb1a79423184992de45a5f0322c8bdf5
-author O Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-
-hello: 4 more lines with a BUG
-ok 8 - repack, clone and fetch work
-
-expecting success of 6050.9 '"git replace" listing and deleting': 
-	test "$HASH2" = "$(git replace -l)" &&
-	test "$HASH2" = "$(git replace)" &&
-	aa=${HASH2%??????????????????????????????????????} &&
-	test "$HASH2" = "$(git replace --list "$aa*")" &&
-	test_must_fail git replace -d $R &&
-	test_must_fail git replace --delete &&
-	test_must_fail git replace -l -d $HASH2 &&
-	git replace -d $HASH2 &&
-	git show $HASH2 >actual &&
-	test_grep "A U Thor" actual &&
-	test -z "$(git replace -l)"
-
-error: replace ref 'c06ac9b8cd2f38349af40ec00e5d5c761b3bf513' not found
-fatal: -d needs at least one argument
-
-usage: git replace [-f] <object> <replacement>
-   or: git replace [-f] --edit <object>
-   or: git replace [-f] --graft <commit> [<parent>...]
-   or: git replace [-f] --convert-graft-file
-   or: git replace -d <object>...
-   or: git replace [--format=<format>] [-l [<pattern>]]
-
-    -l, --list            list replace refs
-    -d, --delete          delete replace refs
-    -e, --edit            edit existing object
-    -g, --graft           change a commit's parents
-    --convert-graft-file  convert existing graft file
-    -f, --[no-]force      replace the ref if it exists
-    --[no-]raw            do not pretty-print contents for --edit
-    --[no-]format <format>
-                          use this format
-
-error: options '-d' and '-l' cannot be used together
-Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
-Author: A U Thor <author@example.com>
-ok 9 - "git replace" listing and deleting
-
-expecting success of 6050.10 '"git replace" replacing': 
-	git replace $HASH2 $R &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual &&
-	test_must_fail git replace $HASH2 $R &&
-	git replace -f $HASH2 $R &&
-	test_must_fail git replace -f &&
-	test "$HASH2" = "$(git replace)"
-
-Author: O Thor <author@example.com>
-error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
-fatal: -f only makes sense when writing a replacement
-
-usage: git replace [-f] <object> <replacement>
-   or: git replace [-f] --edit <object>
-   or: git replace [-f] --graft <commit> [<parent>...]
-   or: git replace [-f] --convert-graft-file
-   or: git replace -d <object>...
-   or: git replace [--format=<format>] [-l [<pattern>]]
-
-    -l, --list            list replace refs
-    -d, --delete          delete replace refs
-    -e, --edit            edit existing object
-    -g, --graft           change a commit's parents
-    --convert-graft-file  convert existing graft file
-    -f, --[no-]force      replace the ref if it exists
-    --[no-]raw            do not pretty-print contents for --edit
-    --[no-]format <format>
-                          use this format
-
-ok 10 - "git replace" replacing
-
-expecting success of 6050.11 '"git replace" resolves sha1': 
-	SHORTHASH2=$(git rev-parse --short=8 $HASH2) &&
-	git replace -d $SHORTHASH2 &&
-	git replace $SHORTHASH2 $R &&
-	git show $HASH2 >actual &&
-	test_grep "O Thor" actual &&
-	test_must_fail git replace $HASH2 $R &&
-	git replace -f $HASH2 $R &&
-	test_must_fail git replace --force &&
-	test "$HASH2" = "$(git replace)"
-
-Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
-Author: O Thor <author@example.com>
-error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
-fatal: -f only makes sense when writing a replacement
-
-usage: git replace [-f] <object> <replacement>
-   or: git replace [-f] --edit <object>
-   or: git replace [-f] --graft <commit> [<parent>...]
-   or: git replace [-f] --convert-graft-file
-   or: git replace -d <object>...
-   or: git replace [--format=<format>] [-l [<pattern>]]
-
-    -l, --list            list replace refs
-    -d, --delete          delete replace refs
-    -e, --edit            edit existing object
-    -g, --graft           change a commit's parents
-    --convert-graft-file  convert existing graft file
-    -f, --[no-]force      replace the ref if it exists
-    --[no-]raw            do not pretty-print contents for --edit
-    --[no-]format <format>
-                          use this format
-
-ok 11 - "git replace" resolves sha1
-
-expecting success of 6050.12 'create parallel branch without the bug': 
-	git replace -d $HASH2 &&
-	git show $HASH2 >actual &&
-	test_grep "A U Thor" actual &&
-	git checkout $HASH1 &&
-	git cherry-pick $HASH2 &&
-	git show $HASH5 >actual &&
-	git apply actual &&
-	git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
-	PARA2=$(git rev-parse --verify HEAD) &&
-	git cherry-pick $HASH3 &&
-	PARA3=$(git rev-parse --verify HEAD) &&
-	git cherry-pick $HASH4 &&
-	PARA4=$(git rev-parse --verify HEAD) &&
-	git cherry-pick $HASH6 &&
-	PARA6=$(git rev-parse --verify HEAD) &&
-	git replace $HASH6 $PARA6 &&
-	git checkout main &&
-	cur=$(git rev-parse --verify HEAD) &&
-	test "$cur" = "$HASH7" &&
-	git log --pretty=oneline >actual &&
-	test_grep $PARA2 actual &&
-	git remote add cloned ./clone_dir
-
-Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
-Author: A U Thor <author@example.com>
-Note: switching to '00ad688edb1a79423184992de45a5f0322c8bdf5'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 00ad688 hello: 4 lines
-[detached HEAD dcda230] hello: 4 more lines with a BUG
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 4 insertions(+)
-[detached HEAD af6d994] hello: 4 more lines WITHOUT the bug
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 4 insertions(+)
-Auto-merging hello
-[detached HEAD a3fb2e1] hello: 2 more lines
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Auto-merging hello
-[detached HEAD f486255] hello: 1 more line
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
-[detached HEAD 911408d] hello: 2 more lines
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Previous HEAD position was 911408d hello: 2 more lines
-Switched to branch 'main'
-af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
-ok 12 - create parallel branch without the bug
-
-expecting success of 6050.13 'push to cloned repo': 
-	git push cloned $HASH6^:refs/heads/parallel &&
-	(
-		cd clone_dir &&
-		git checkout parallel &&
-		git log --pretty=oneline >actual &&
-		test_grep $PARA2 actual
-	)
-
-To ./clone_dir
- * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel
-Switched to branch 'parallel'
-af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
-ok 13 - push to cloned repo
-
-expecting success of 6050.14 'push branch with replacement': 
-	git cat-file commit $PARA3 >actual &&
-	test_grep "author A U Thor" actual &&
-	S=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
-	git cat-file commit $S >actual &&
-	test_grep "author O Thor" actual &&
-	git replace $PARA3 $S &&
-	git show $HASH6~2 >actual &&
-	test_grep "O Thor" actual &&
-	git show $PARA3 >actual &&
-	test_grep "O Thor" actual &&
-	git push cloned $HASH6^:refs/heads/parallel2 &&
-	(
-		cd clone_dir &&
-		git checkout parallel2 &&
-		git log --pretty=oneline >actual &&
-		test_grep $PARA3 actual &&
-		git show $PARA3 >actual &&
-		test_grep "A U Thor" actual
-	)
-
-author A U Thor <author@example.com> 1112912113 -0700
-author O Thor <author@example.com> 1112912113 -0700
-Author: O Thor <author@example.com>
-Author: O Thor <author@example.com>
-To ./clone_dir
- * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel2
-Switched to branch 'parallel2'
-a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
-Author: A U Thor <author@example.com>
-ok 14 - push branch with replacement
-
-expecting success of 6050.15 'fetch branch with replacement': 
-	git branch tofetch $HASH6 &&
-	(
-		cd clone_dir &&
-		git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
-		git log --pretty=oneline parallel3 >output.txt &&
-		test_grep ! $PARA3 output.txt &&
-		git show $PARA3 >para3.txt &&
-		test_grep "A U Thor" para3.txt &&
-		git fetch origin "refs/replace/*:refs/replace/*" &&
-		git log --pretty=oneline parallel3 >output.txt &&
-		test_grep $PARA3 output.txt &&
-		git show $PARA3 >para3.txt &&
-		test_grep "O Thor" para3.txt
-	)
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t6050-replace/.
- * [new ref]         refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856 -> refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856
- * [new ref]         refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173 -> refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173
-a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
-Author: O Thor <author@example.com>
-ok 15 - fetch branch with replacement
-
-expecting success of 6050.16 'bisect and replacements': 
-	git bisect start $HASH7 $HASH1 &&
-	test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
-	git bisect reset &&
-	GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
-	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
-	git bisect reset &&
-	git --no-replace-objects bisect start $HASH7 $HASH1 &&
-	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
-	git bisect reset
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[a3fb2e1845a1aaf129b7975048973414dc172173] hello: 2 more lines
-Previous HEAD position was a3fb2e1 hello: 2 more lines
-Switched to branch 'main'
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  40237c8 hello: 1 more line
-  8fc2a8e hello: 2 more lines
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 40237c8
-
-Switched to branch 'main'
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  40237c8 hello: 1 more line
-  8fc2a8e hello: 2 more lines
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 40237c8
-
-Switched to branch 'main'
-ok 16 - bisect and replacements
-
-expecting success of 6050.17 'index-pack and replacements': 
-	git --no-replace-objects rev-list --objects HEAD >actual &&
-	git --no-replace-objects pack-objects test- <actual &&
-	git index-pack test-*.pack
-
-d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
-d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
-ok 17 - index-pack and replacements
-
-expecting success of 6050.18 'not just commits': 
-	echo replaced >file &&
-	git add file &&
-	REPLACED=$(git rev-parse :file) &&
-	mv file file.replaced &&
-
-	echo original >file &&
-	git add file &&
-	ORIGINAL=$(git rev-parse :file) &&
-	git update-ref refs/replace/$ORIGINAL $REPLACED &&
-	mv file file.original &&
-
-	git checkout file &&
-	test_cmp file.replaced file
-
-Updated 1 path from the index
-ok 18 - not just commits
-
-expecting success of 6050.19 'replaced and replacement objects must be of the same type': 
-	test_must_fail git replace mytag $HASH1 &&
-	test_must_fail git replace HEAD^{tree} HEAD~1 &&
-	BLOB=$(git rev-parse :file) &&
-	test_must_fail git replace HEAD^ $BLOB
-
-error: Objects must be of the same type.
-'mytag' points to a replaced object of type 'tag'
-while '00ad688edb1a79423184992de45a5f0322c8bdf5' points to a replacement object of type 'commit'.
-error: Objects must be of the same type.
-'HEAD^{tree}' points to a replaced object of type 'tree'
-while 'HEAD~1' points to a replacement object of type 'commit'.
-error: Objects must be of the same type.
-'HEAD^' points to a replaced object of type 'commit'
-while '4b48deed3a433909bfd6b6ab3d4b91348b6af464' points to a replacement object of type 'blob'.
-ok 19 - replaced and replacement objects must be of the same type
-
-expecting success of 6050.20 '-f option bypasses the type check': 
-	git replace -f mytag $HASH1 &&
-	git replace --force HEAD^{tree} HEAD~1 &&
-	git replace -f HEAD^ $BLOB
-
-ok 20 - -f option bypasses the type check
-
-expecting success of 6050.21 'git cat-file --batch works on replace objects': 
-	git replace >actual &&
-	test_grep $PARA3 actual &&
-	echo $PARA3 | git cat-file --batch
-
-a3fb2e1845a1aaf129b7975048973414dc172173
-a3fb2e1845a1aaf129b7975048973414dc172173 commit 229
-tree 2b0c71265a7705e0c171a5530d9ed18d5e1c31a6
-parent af6d994c7106b0846fb80f09fa5bcbc460432c6d
-author O Thor <author@example.com> 1112912113 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
-
-hello: 2 more lines
-
-ok 21 - git cat-file --batch works on replace objects
-
-expecting success of 6050.22 'test --format bogus': 
-	test_must_fail git replace --format bogus >/dev/null 2>&1
-
-ok 22 - test --format bogus
-
-expecting success of 6050.23 'test --format short': 
-	git replace --format=short >actual &&
-	git replace >expected &&
-	test_cmp expected actual
-
-ok 23 - test --format short
-
-expecting success of 6050.24 'test --format medium': 
-	H1=$(git --no-replace-objects rev-parse HEAD~1) &&
-	HT=$(git --no-replace-objects rev-parse HEAD^{tree}) &&
-	MYTAG=$(git --no-replace-objects rev-parse mytag) &&
-	{
-		echo "$H1 -> $BLOB" &&
-		echo "$BLOB -> $REPLACED" &&
-		echo "$HT -> $H1" &&
-		echo "$PARA3 -> $S" &&
-		echo "$MYTAG -> $HASH1"
-	} | sort >expected &&
-	git replace -l --format medium >output &&
-	sort output >actual &&
-	test_cmp expected actual
-
-ok 24 - test --format medium
-
-expecting success of 6050.25 'test --format long': 
-	{
-		echo "$H1 (commit) -> $BLOB (blob)" &&
-		echo "$BLOB (blob) -> $REPLACED (blob)" &&
-		echo "$HT (tree) -> $H1 (commit)" &&
-		echo "$PARA3 (commit) -> $S (commit)" &&
-		echo "$MYTAG (tag) -> $HASH1 (commit)"
-	} | sort >expected &&
-	git replace --format=long >output &&
-	sort output >actual &&
-	test_cmp expected actual
-
-ok 25 - test --format long
-
-expecting success of 6050.26 'setup fake editors': 
-	write_script fakeeditor <<-\EOF &&
-		sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
-		mv "$1.new" "$1"
-	EOF
-	write_script failingfakeeditor <<-\EOF
-		./fakeeditor "$@"
-		false
-	EOF
-
-ok 26 - setup fake editors
-
-expecting success of 6050.27 '--edit with and without already replaced object': 
-	test_must_fail env GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
-	GIT_EDITOR=./fakeeditor git replace --force --edit "$PARA3" &&
-	git replace -l >actual &&
-	test_grep "$PARA3" actual &&
-	git cat-file commit "$PARA3" >actual &&
-	test_grep "A fake Thor" actual &&
-	git replace -d "$PARA3" &&
-	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
-	git replace -l >actual &&
-	test_grep "$PARA3" actual &&
-	git cat-file commit "$PARA3" >actual &&
-	test_grep "A fake Thor" actual
-
-error: replace ref 'refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173' already exists
-a3fb2e1845a1aaf129b7975048973414dc172173
-author A fake Thor <author@example.com> 1112912113 -0700
-Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
-a3fb2e1845a1aaf129b7975048973414dc172173
-author A fake Thor <author@example.com> 1112912113 -0700
-ok 27 - --edit with and without already replaced object
-
-expecting success of 6050.28 '--edit and change nothing or command failed': 
-	git replace -d "$PARA3" &&
-	test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
-	test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
-	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
-	git replace -l >actual &&
-	test_grep "$PARA3" actual &&
-	git cat-file commit "$PARA3" >actual &&
-	test_grep "A fake Thor" actual
-
-Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
-error: new object is the same as the old one: 'a3fb2e1845a1aaf129b7975048973414dc172173'
-error: there was a problem with the editor './failingfakeeditor'
-error: editing object file failed
-a3fb2e1845a1aaf129b7975048973414dc172173
-author A fake Thor <author@example.com> 1112912113 -0700
-ok 28 - --edit and change nothing or command failed
-
-expecting success of 6050.29 'replace ref cleanup': 
-	test -n "$(git replace)" &&
-	git replace -d $(git replace) &&
-	test -z "$(git replace)"
-
-Deleted replace ref '14ac020163ea60a9d683ce68e36c946f31ecc856'
-Deleted replace ref '4b48deed3a433909bfd6b6ab3d4b91348b6af464'
-Deleted replace ref '5c37393794868bc8e708cccd7c9d9aaa7a5e53cb'
-Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
-Deleted replace ref 'e25dc7954f0832d962347872884aab2dffb426c5'
-ok 29 - replace ref cleanup
-
-expecting success of 6050.30 '--graft with and without already replaced object': 
-	git log --oneline >log &&
-	test_line_count = 7 log &&
-	git replace --graft $HASH5 &&
-	git log --oneline >log &&
-	test_line_count = 3 log &&
-	commit_has_parents $HASH5 &&
-	test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
-	git replace --force -g $HASH5 $HASH4 $HASH3 &&
-	commit_has_parents $HASH5 $HASH4 $HASH3 &&
-	git replace -d $HASH5
-
-fatal: Needed a single revision
-error: replace ref 'refs/replace/093e41a79d4a8bfe3c758a96c95e5bf9e35ed89c' already exists
-fatal: Needed a single revision
-Deleted replace ref '093e41a79d4a8bfe3c758a96c95e5bf9e35ed89c'
-ok 30 - --graft with and without already replaced object
-
-expecting success of 6050.31 '--graft using a tag as the new parent': 
-	git tag new_parent $HASH5 &&
-	git replace --graft $HASH7 new_parent &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7 &&
-	git tag -a -m "annotated new parent tag" annotated_new_parent $HASH5 &&
-	git replace --graft $HASH7 annotated_new_parent &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7
-
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-ok 31 - --graft using a tag as the new parent
-
-expecting success of 6050.32 '--graft using a tag as the replaced object': 
-	git tag replaced_object $HASH7 &&
-	git replace --graft replaced_object $HASH5 &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7 &&
-	git tag -a -m "annotated replaced object tag" annotated_replaced_object $HASH7 &&
-	git replace --graft annotated_replaced_object $HASH5 &&
-	commit_has_parents $HASH7 $HASH5 &&
-	git replace -d $HASH7
-
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-fatal: Needed a single revision
-Deleted replace ref 'ffccc9d552388844dbe94a361c07e7cb1731e12f'
-ok 32 - --graft using a tag as the replaced object
-
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-ok 33 # skip set up a signed commit (missing GPG)
-
-ok 34 # skip --graft with a signed commit (missing GPG)
-
-ok 35 # skip set up a merge commit with a mergetag (missing GPG)
-
-ok 36 # skip --graft on a commit with a mergetag (missing GPG)
-
-expecting success of 6050.37 '--convert-graft-file': 
-	git checkout -b with-graft-file &&
-	test_commit root2 &&
-	git reset --hard root2^ &&
-	test_commit root1 &&
-	test_commit after-root1 &&
-	test_tick &&
-	git merge -m merge-root2 root2 &&
-
-	: add and convert graft file &&
-	printf "%s\n%s %s\n\n# comment\n%s\n" \
-		$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
-		>.git/info/grafts &&
-	git status 2>stderr &&
-	test_grep "hint:.*grafts is deprecated" stderr &&
-	git replace --convert-graft-file 2>stderr &&
-	test_grep ! "hint:.*grafts is deprecated" stderr &&
-	test_path_is_missing .git/info/grafts &&
-
-	: verify that the history is now "grafted" &&
-	git rev-list HEAD >out &&
-	test_line_count = 4 out &&
-
-	: create invalid graft file and verify that it is not deleted &&
-	test_when_finished "rm -f .git/info/grafts" &&
-	echo $EMPTY_BLOB $EMPTY_TREE >.git/info/grafts &&
-	test_must_fail git replace --convert-graft-file 2>err &&
-	test_grep "$EMPTY_BLOB $EMPTY_TREE" err &&
-	test_grep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
-
-Switched to a new branch 'with-graft-file'
-[with-graft-file 614a70e] root2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 root2.t
-HEAD is now at ffccc9d hello: again 3 more lines
-[with-graft-file bf41581] root1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 root1.t
-[with-graft-file f85c1b2] after-root1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-root1.t
-Merge made by the 'ort' strategy.
- file    | 1 +
- root2.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 root2.t
-On branch with-graft-file
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	clone_dir/
-	err
-	expected
-	failingfakeeditor
-	fakeeditor
-	file.original
-	file.replaced
-	fsck_main.out
-	log
-	output
-	payload
-	stderr
-	tag.sig
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.idx
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.pack
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.rev
-
-nothing added to commit but untracked files present (use "git add" to track)
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-	e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 37 - --convert-graft-file
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6101-rev-parse-parents.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6101-rev-parse-parents/.git/
 expecting success of 6101.1 'setup': 
@@ -405430,174 +404094,1187 @@
 merge^-0
 ok 26 - rev-parse merge^-0 (invalid parent)
 
-expecting success of 6101.27 'rev-parse merge^-3 (invalid parent)': 
-	test_must_fail git rev-parse merge^-3
+expecting success of 6101.27 'rev-parse merge^-3 (invalid parent)': 
+	test_must_fail git rev-parse merge^-3
+
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+fatal: ambiguous argument 'merge^-3': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+merge^-3
+ok 27 - rev-parse merge^-3 (invalid parent)
+
+expecting success of 6101.28 'rev-parse merge^-^ (garbage after ^-)': 
+	test_must_fail git rev-parse merge^-^
+
+fatal: ambiguous argument 'merge^-^': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+merge^-^
+ok 28 - rev-parse merge^-^ (garbage after ^-)
+
+expecting success of 6101.29 'rev-parse merge^-1x (garbage after ^-1)': 
+	test_must_fail git rev-parse merge^-1x
+
+fatal: ambiguous argument 'merge^-1x': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+merge^-1x
+ok 29 - rev-parse merge^-1x (garbage after ^-1)
+
+expecting success of 6101.30 'rev-list merge^- = merge^..merge': 
+	git rev-list merge^..merge >expect &&
+	git rev-list merge^- >actual &&
+	test_cmp expect actual
+
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 30 - rev-list merge^- = merge^..merge
+
+expecting success of 6101.31 'rev-list merge^-1 = merge^1..merge': 
+	git rev-list merge^1..merge >expect &&
+	git rev-list merge^-1 >actual &&
+	test_cmp expect actual
+
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 31 - rev-list merge^-1 = merge^1..merge
+
+expecting success of 6101.32 'rev-list merge^-2 = merge^2..merge': 
+	git rev-list merge^2..merge >expect &&
+	git rev-list merge^-2 >actual &&
+	test_cmp expect actual
+
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 32 - rev-list merge^-2 = merge^2..merge
+
+expecting success of 6101.33 'rev-list merge^-0 (invalid parent)': 
+	test_must_fail git rev-list merge^-0
+
+fatal: ambiguous argument 'merge^-0': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 33 - rev-list merge^-0 (invalid parent)
+
+expecting success of 6101.34 'rev-list merge^-3 (invalid parent)': 
+	test_must_fail git rev-list merge^-3
+
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+fatal: ambiguous argument 'merge^-3': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 34 - rev-list merge^-3 (invalid parent)
+
+expecting success of 6101.35 'rev-list merge^-^ (garbage after ^-)': 
+	test_must_fail git rev-list merge^-^
+
+fatal: ambiguous argument 'merge^-^': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 35 - rev-list merge^-^ (garbage after ^-)
+
+expecting success of 6101.36 'rev-list merge^-1x (garbage after ^-1)': 
+	test_must_fail git rev-list merge^-1x
+
+fatal: ambiguous argument 'merge^-1x': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 36 - rev-list merge^-1x (garbage after ^-1)
+
+expecting success of 6101.37 'rev-parse $garbage^@ does not segfault': 
+	test_must_fail git rev-parse $EMPTY_TREE^@
+
+error: object 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is a tree, not a commit
+fatal: ambiguous argument '4b825dc642cb6eb9a060e54bf8d69288fbee4904^@': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+4b825dc642cb6eb9a060e54bf8d69288fbee4904^@
+ok 37 - rev-parse $garbage^@ does not segfault
+
+expecting success of 6101.38 'rev-parse $garbage...$garbage does not segfault': 
+	test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB
+
+error: object 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is a tree, not a commit
+fatal: ambiguous argument '4b825dc642cb6eb9a060e54bf8d69288fbee4904...e69de29bb2d1d6434b8b29ae775ad8c2e48c5391': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+4b825dc642cb6eb9a060e54bf8d69288fbee4904
+4b825dc642cb6eb9a060e54bf8d69288fbee4904...e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 38 - rev-parse $garbage...$garbage does not segfault
+
+# passed all 38 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6130-pathspec-noglob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6050-replace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6050-replace/.git/
+expecting success of 6050.1 'set up buggy branch': 
+	echo "line 1" >>hello &&
+	echo "line 2" >>hello &&
+	echo "line 3" >>hello &&
+	echo "line 4" >>hello &&
+	add_and_commit_file hello "4 lines" &&
+	HASH1=$(git rev-parse --verify HEAD) &&
+	echo "line BUG" >>hello &&
+	echo "line 6" >>hello &&
+	echo "line 7" >>hello &&
+	echo "line 8" >>hello &&
+	add_and_commit_file hello "4 more lines with a BUG" &&
+	HASH2=$(git rev-parse --verify HEAD) &&
+	echo "line 9" >>hello &&
+	echo "line 10" >>hello &&
+	add_and_commit_file hello "2 more lines" &&
+	HASH3=$(git rev-parse --verify HEAD) &&
+	echo "line 11" >>hello &&
+	add_and_commit_file hello "1 more line" &&
+	HASH4=$(git rev-parse --verify HEAD) &&
+	sed -e "s/BUG/5/" hello >hello.new &&
+	mv hello.new hello &&
+	add_and_commit_file hello "BUG fixed" &&
+	HASH5=$(git rev-parse --verify HEAD) &&
+	echo "line 12" >>hello &&
+	echo "line 13" >>hello &&
+	add_and_commit_file hello "2 more lines" &&
+	HASH6=$(git rev-parse --verify HEAD) &&
+	echo "line 14" >>hello &&
+	echo "line 15" >>hello &&
+	echo "line 16" >>hello &&
+	add_and_commit_file hello "again 3 more lines" &&
+	HASH7=$(git rev-parse --verify HEAD)
+
+ok 1 - set up buggy branch
+
+expecting success of 6050.2 'replace the author': 
+	git cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	R=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
+	git cat-file commit $R >actual &&
+	test_grep "author O Thor" actual &&
+	git update-ref refs/replace/$HASH2 $R &&
+	git show HEAD~5 >actual &&
+	test_grep "O Thor" actual &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual
+
+author A U Thor <author@example.com> 1112912053 -0700
+author O Thor <author@example.com> 1112912053 -0700
+Author: O Thor <author@example.com>
+Author: O Thor <author@example.com>
+ok 2 - replace the author
+
+expecting success of 6050.3 'test --no-replace-objects option': 
+	git cat-file commit $HASH2 >actual &&
+	test_grep "author O Thor" actual &&
+	git --no-replace-objects cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual &&
+	git --no-replace-objects show $HASH2 >actual &&
+	test_grep "A U Thor" actual
+
+author O Thor <author@example.com> 1112912053 -0700
+author A U Thor <author@example.com> 1112912053 -0700
+Author: O Thor <author@example.com>
+Author: A U Thor <author@example.com>
+ok 3 - test --no-replace-objects option
+
+expecting success of 6050.4 'test GIT_NO_REPLACE_OBJECTS env variable': 
+	GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 >actual &&
+	test_grep "A U Thor" actual
+
+author A U Thor <author@example.com> 1112912053 -0700
+Author: A U Thor <author@example.com>
+ok 4 - test GIT_NO_REPLACE_OBJECTS env variable
+
+expecting success of 6050.5 'test core.usereplacerefs config option': 
+	test_config core.usereplacerefs false &&
+	git cat-file commit $HASH2 >actual &&
+	test_grep "author A U Thor" actual &&
+	git show $HASH2 >actual &&
+	test_grep "A U Thor" actual
+
+author A U Thor <author@example.com> 1112912053 -0700
+Author: A U Thor <author@example.com>
+ok 5 - test core.usereplacerefs config option
+
+expecting success of 6050.6 'tag replaced commit': 
+	git update-ref refs/tags/mytag $(git mktag <tag.sig)
+
+ok 6 - tag replaced commit
+
+expecting success of 6050.7 '"git fsck" works': 
+	git fsck main >fsck_main.out &&
+	test_grep "dangling commit $R" fsck_main.out &&
+	test_grep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
+	test -z "$(git fsck)"
+
+dangling commit c06ac9b8cd2f38349af40ec00e5d5c761b3bf513
+dangling tag e25dc7954f0832d962347872884aab2dffb426c5
+ok 7 - "git fsck" works
+
+expecting success of 6050.8 'repack, clone and fetch work': 
+	git repack -a -d &&
+	git clone --no-hardlinks . clone_dir &&
+	(
+		cd clone_dir &&
+		git show HEAD~5 >actual &&
+		test_grep "A U Thor" actual &&
+		git show $HASH2 >actual &&
+		test_grep "A U Thor" actual &&
+		git cat-file commit $R &&
+		git repack -a -d &&
+		test_must_fail git cat-file commit $R &&
+		git fetch ../ "refs/replace/*:refs/replace/*" &&
+		git show HEAD~5 >actual &&
+		test_grep "O Thor" actual &&
+		git show $HASH2 >actual &&
+		test_grep "O Thor" actual &&
+		git cat-file commit $R
+	)
+
+Cloning into 'clone_dir'...
+done.
+Author: A U Thor <author@example.com>
+Author: A U Thor <author@example.com>
+tree 242e3e36d5c0616fbf715682c322254dadb55168
+parent 00ad688edb1a79423184992de45a5f0322c8bdf5
+author O Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+
+hello: 4 more lines with a BUG
+fatal: git cat-file c06ac9b8cd2f38349af40ec00e5d5c761b3bf513: bad file
+From ..
+ * [new ref]         refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0 -> refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0
+Author: O Thor <author@example.com>
+Author: O Thor <author@example.com>
+tree 242e3e36d5c0616fbf715682c322254dadb55168
+parent 00ad688edb1a79423184992de45a5f0322c8bdf5
+author O Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+
+hello: 4 more lines with a BUG
+ok 8 - repack, clone and fetch work
+
+expecting success of 6050.9 '"git replace" listing and deleting': 
+	test "$HASH2" = "$(git replace -l)" &&
+	test "$HASH2" = "$(git replace)" &&
+	aa=${HASH2%??????????????????????????????????????} &&
+	test "$HASH2" = "$(git replace --list "$aa*")" &&
+	test_must_fail git replace -d $R &&
+	test_must_fail git replace --delete &&
+	test_must_fail git replace -l -d $HASH2 &&
+	git replace -d $HASH2 &&
+	git show $HASH2 >actual &&
+	test_grep "A U Thor" actual &&
+	test -z "$(git replace -l)"
+
+error: replace ref 'c06ac9b8cd2f38349af40ec00e5d5c761b3bf513' not found
+fatal: -d needs at least one argument
+
+usage: git replace [-f] <object> <replacement>
+   or: git replace [-f] --edit <object>
+   or: git replace [-f] --graft <commit> [<parent>...]
+   or: git replace [-f] --convert-graft-file
+   or: git replace -d <object>...
+   or: git replace [--format=<format>] [-l [<pattern>]]
+
+    -l, --list            list replace refs
+    -d, --delete          delete replace refs
+    -e, --edit            edit existing object
+    -g, --graft           change a commit's parents
+    --convert-graft-file  convert existing graft file
+    -f, --[no-]force      replace the ref if it exists
+    --[no-]raw            do not pretty-print contents for --edit
+    --[no-]format <format>
+                          use this format
+
+error: options '-d' and '-l' cannot be used together
+Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
+Author: A U Thor <author@example.com>
+ok 9 - "git replace" listing and deleting
+
+expecting success of 6050.10 '"git replace" replacing': 
+	git replace $HASH2 $R &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual &&
+	test_must_fail git replace $HASH2 $R &&
+	git replace -f $HASH2 $R &&
+	test_must_fail git replace -f &&
+	test "$HASH2" = "$(git replace)"
+
+Author: O Thor <author@example.com>
+error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
+fatal: -f only makes sense when writing a replacement
+
+usage: git replace [-f] <object> <replacement>
+   or: git replace [-f] --edit <object>
+   or: git replace [-f] --graft <commit> [<parent>...]
+   or: git replace [-f] --convert-graft-file
+   or: git replace -d <object>...
+   or: git replace [--format=<format>] [-l [<pattern>]]
+
+    -l, --list            list replace refs
+    -d, --delete          delete replace refs
+    -e, --edit            edit existing object
+    -g, --graft           change a commit's parents
+    --convert-graft-file  convert existing graft file
+    -f, --[no-]force      replace the ref if it exists
+    --[no-]raw            do not pretty-print contents for --edit
+    --[no-]format <format>
+                          use this format
+
+ok 10 - "git replace" replacing
+
+expecting success of 6050.11 '"git replace" resolves sha1': 
+	SHORTHASH2=$(git rev-parse --short=8 $HASH2) &&
+	git replace -d $SHORTHASH2 &&
+	git replace $SHORTHASH2 $R &&
+	git show $HASH2 >actual &&
+	test_grep "O Thor" actual &&
+	test_must_fail git replace $HASH2 $R &&
+	git replace -f $HASH2 $R &&
+	test_must_fail git replace --force &&
+	test "$HASH2" = "$(git replace)"
+
+Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
+Author: O Thor <author@example.com>
+error: replace ref 'refs/replace/4217adb325b9db7bfc0c7b223183cc8546638cf0' already exists
+fatal: -f only makes sense when writing a replacement
+
+usage: git replace [-f] <object> <replacement>
+   or: git replace [-f] --edit <object>
+   or: git replace [-f] --graft <commit> [<parent>...]
+   or: git replace [-f] --convert-graft-file
+   or: git replace -d <object>...
+   or: git replace [--format=<format>] [-l [<pattern>]]
+
+    -l, --list            list replace refs
+    -d, --delete          delete replace refs
+    -e, --edit            edit existing object
+    -g, --graft           change a commit's parents
+    --convert-graft-file  convert existing graft file
+    -f, --[no-]force      replace the ref if it exists
+    --[no-]raw            do not pretty-print contents for --edit
+    --[no-]format <format>
+                          use this format
+
+ok 11 - "git replace" resolves sha1
+
+expecting success of 6050.12 'create parallel branch without the bug': 
+	git replace -d $HASH2 &&
+	git show $HASH2 >actual &&
+	test_grep "A U Thor" actual &&
+	git checkout $HASH1 &&
+	git cherry-pick $HASH2 &&
+	git show $HASH5 >actual &&
+	git apply actual &&
+	git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
+	PARA2=$(git rev-parse --verify HEAD) &&
+	git cherry-pick $HASH3 &&
+	PARA3=$(git rev-parse --verify HEAD) &&
+	git cherry-pick $HASH4 &&
+	PARA4=$(git rev-parse --verify HEAD) &&
+	git cherry-pick $HASH6 &&
+	PARA6=$(git rev-parse --verify HEAD) &&
+	git replace $HASH6 $PARA6 &&
+	git checkout main &&
+	cur=$(git rev-parse --verify HEAD) &&
+	test "$cur" = "$HASH7" &&
+	git log --pretty=oneline >actual &&
+	test_grep $PARA2 actual &&
+	git remote add cloned ./clone_dir
+
+Deleted replace ref '4217adb325b9db7bfc0c7b223183cc8546638cf0'
+Author: A U Thor <author@example.com>
+Note: switching to '00ad688edb1a79423184992de45a5f0322c8bdf5'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 00ad688 hello: 4 lines
+[detached HEAD dcda230] hello: 4 more lines with a BUG
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 4 insertions(+)
+[detached HEAD af6d994] hello: 4 more lines WITHOUT the bug
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 4 insertions(+)
+Auto-merging hello
+[detached HEAD a3fb2e1] hello: 2 more lines
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Auto-merging hello
+[detached HEAD f486255] hello: 1 more line
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+[detached HEAD 911408d] hello: 2 more lines
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Previous HEAD position was 911408d hello: 2 more lines
+Switched to branch 'main'
+af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
+ok 12 - create parallel branch without the bug
+
+expecting success of 6050.13 'push to cloned repo': 
+	git push cloned $HASH6^:refs/heads/parallel &&
+	(
+		cd clone_dir &&
+		git checkout parallel &&
+		git log --pretty=oneline >actual &&
+		test_grep $PARA2 actual
+	)
+
+To ./clone_dir
+ * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel
+Switched to branch 'parallel'
+af6d994c7106b0846fb80f09fa5bcbc460432c6d hello: 4 more lines WITHOUT the bug
+ok 13 - push to cloned repo
+
+expecting success of 6050.14 'push branch with replacement': 
+	git cat-file commit $PARA3 >actual &&
+	test_grep "author A U Thor" actual &&
+	S=$(sed -e "s/A U/O/" actual | git hash-object -t commit --stdin -w) &&
+	git cat-file commit $S >actual &&
+	test_grep "author O Thor" actual &&
+	git replace $PARA3 $S &&
+	git show $HASH6~2 >actual &&
+	test_grep "O Thor" actual &&
+	git show $PARA3 >actual &&
+	test_grep "O Thor" actual &&
+	git push cloned $HASH6^:refs/heads/parallel2 &&
+	(
+		cd clone_dir &&
+		git checkout parallel2 &&
+		git log --pretty=oneline >actual &&
+		test_grep $PARA3 actual &&
+		git show $PARA3 >actual &&
+		test_grep "A U Thor" actual
+	)
+
+author A U Thor <author@example.com> 1112912113 -0700
+author O Thor <author@example.com> 1112912113 -0700
+Author: O Thor <author@example.com>
+Author: O Thor <author@example.com>
+To ./clone_dir
+ * [new branch]      14ac020163ea60a9d683ce68e36c946f31ecc856^ -> parallel2
+Switched to branch 'parallel2'
+a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
+Author: A U Thor <author@example.com>
+ok 14 - push branch with replacement
+
+expecting success of 6050.15 'fetch branch with replacement': 
+	git branch tofetch $HASH6 &&
+	(
+		cd clone_dir &&
+		git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
+		git log --pretty=oneline parallel3 >output.txt &&
+		test_grep ! $PARA3 output.txt &&
+		git show $PARA3 >para3.txt &&
+		test_grep "A U Thor" para3.txt &&
+		git fetch origin "refs/replace/*:refs/replace/*" &&
+		git log --pretty=oneline parallel3 >output.txt &&
+		test_grep $PARA3 output.txt &&
+		git show $PARA3 >para3.txt &&
+		test_grep "O Thor" para3.txt
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t6050-replace/.
+ * [new ref]         refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856 -> refs/replace/14ac020163ea60a9d683ce68e36c946f31ecc856
+ * [new ref]         refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173 -> refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173
+a3fb2e1845a1aaf129b7975048973414dc172173 hello: 2 more lines
+Author: O Thor <author@example.com>
+ok 15 - fetch branch with replacement
+
+expecting success of 6050.16 'bisect and replacements': 
+	git bisect start $HASH7 $HASH1 &&
+	test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
+	git bisect reset &&
+	GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
+	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
+	git bisect reset &&
+	git --no-replace-objects bisect start $HASH7 $HASH1 &&
+	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
+	git bisect reset
+
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[a3fb2e1845a1aaf129b7975048973414dc172173] hello: 2 more lines
+Previous HEAD position was a3fb2e1 hello: 2 more lines
+Switched to branch 'main'
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  40237c8 hello: 1 more line
+  8fc2a8e hello: 2 more lines
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 40237c8
+
+Switched to branch 'main'
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[40237c8b8add42b8ca9d277edebf9dd36b4edbd8] hello: 1 more line
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  40237c8 hello: 1 more line
+  8fc2a8e hello: 2 more lines
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 40237c8
+
+Switched to branch 'main'
+ok 16 - bisect and replacements
+
+expecting success of 6050.17 'index-pack and replacements': 
+	git --no-replace-objects rev-list --objects HEAD >actual &&
+	git --no-replace-objects pack-objects test- <actual &&
+	git index-pack test-*.pack
+
+d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
+d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
+ok 17 - index-pack and replacements
+
+expecting success of 6050.18 'not just commits': 
+	echo replaced >file &&
+	git add file &&
+	REPLACED=$(git rev-parse :file) &&
+	mv file file.replaced &&
+
+	echo original >file &&
+	git add file &&
+	ORIGINAL=$(git rev-parse :file) &&
+	git update-ref refs/replace/$ORIGINAL $REPLACED &&
+	mv file file.original &&
+
+	git checkout file &&
+	test_cmp file.replaced file
+
+Updated 1 path from the index
+ok 18 - not just commits
+
+expecting success of 6050.19 'replaced and replacement objects must be of the same type': 
+	test_must_fail git replace mytag $HASH1 &&
+	test_must_fail git replace HEAD^{tree} HEAD~1 &&
+	BLOB=$(git rev-parse :file) &&
+	test_must_fail git replace HEAD^ $BLOB
+
+error: Objects must be of the same type.
+'mytag' points to a replaced object of type 'tag'
+while '00ad688edb1a79423184992de45a5f0322c8bdf5' points to a replacement object of type 'commit'.
+error: Objects must be of the same type.
+'HEAD^{tree}' points to a replaced object of type 'tree'
+while 'HEAD~1' points to a replacement object of type 'commit'.
+error: Objects must be of the same type.
+'HEAD^' points to a replaced object of type 'commit'
+while '4b48deed3a433909bfd6b6ab3d4b91348b6af464' points to a replacement object of type 'blob'.
+ok 19 - replaced and replacement objects must be of the same type
+
+expecting success of 6050.20 '-f option bypasses the type check': 
+	git replace -f mytag $HASH1 &&
+	git replace --force HEAD^{tree} HEAD~1 &&
+	git replace -f HEAD^ $BLOB
+
+ok 20 - -f option bypasses the type check
+
+expecting success of 6050.21 'git cat-file --batch works on replace objects': 
+	git replace >actual &&
+	test_grep $PARA3 actual &&
+	echo $PARA3 | git cat-file --batch
+
+a3fb2e1845a1aaf129b7975048973414dc172173
+a3fb2e1845a1aaf129b7975048973414dc172173 commit 229
+tree 2b0c71265a7705e0c171a5530d9ed18d5e1c31a6
+parent af6d994c7106b0846fb80f09fa5bcbc460432c6d
+author O Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912353 -0700
+
+hello: 2 more lines
+
+ok 21 - git cat-file --batch works on replace objects
+
+expecting success of 6050.22 'test --format bogus': 
+	test_must_fail git replace --format bogus >/dev/null 2>&1
+
+ok 22 - test --format bogus
+
+expecting success of 6050.23 'test --format short': 
+	git replace --format=short >actual &&
+	git replace >expected &&
+	test_cmp expected actual
+
+ok 23 - test --format short
+
+expecting success of 6050.24 'test --format medium': 
+	H1=$(git --no-replace-objects rev-parse HEAD~1) &&
+	HT=$(git --no-replace-objects rev-parse HEAD^{tree}) &&
+	MYTAG=$(git --no-replace-objects rev-parse mytag) &&
+	{
+		echo "$H1 -> $BLOB" &&
+		echo "$BLOB -> $REPLACED" &&
+		echo "$HT -> $H1" &&
+		echo "$PARA3 -> $S" &&
+		echo "$MYTAG -> $HASH1"
+	} | sort >expected &&
+	git replace -l --format medium >output &&
+	sort output >actual &&
+	test_cmp expected actual
+
+ok 24 - test --format medium
+
+expecting success of 6050.25 'test --format long': 
+	{
+		echo "$H1 (commit) -> $BLOB (blob)" &&
+		echo "$BLOB (blob) -> $REPLACED (blob)" &&
+		echo "$HT (tree) -> $H1 (commit)" &&
+		echo "$PARA3 (commit) -> $S (commit)" &&
+		echo "$MYTAG (tag) -> $HASH1 (commit)"
+	} | sort >expected &&
+	git replace --format=long >output &&
+	sort output >actual &&
+	test_cmp expected actual
+
+ok 25 - test --format long
+
+expecting success of 6050.26 'setup fake editors': 
+	write_script fakeeditor <<-\EOF &&
+		sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
+		mv "$1.new" "$1"
+	EOF
+	write_script failingfakeeditor <<-\EOF
+		./fakeeditor "$@"
+		false
+	EOF
+
+ok 26 - setup fake editors
+
+expecting success of 6050.27 '--edit with and without already replaced object': 
+	test_must_fail env GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
+	GIT_EDITOR=./fakeeditor git replace --force --edit "$PARA3" &&
+	git replace -l >actual &&
+	test_grep "$PARA3" actual &&
+	git cat-file commit "$PARA3" >actual &&
+	test_grep "A fake Thor" actual &&
+	git replace -d "$PARA3" &&
+	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
+	git replace -l >actual &&
+	test_grep "$PARA3" actual &&
+	git cat-file commit "$PARA3" >actual &&
+	test_grep "A fake Thor" actual
+
+error: replace ref 'refs/replace/a3fb2e1845a1aaf129b7975048973414dc172173' already exists
+a3fb2e1845a1aaf129b7975048973414dc172173
+author A fake Thor <author@example.com> 1112912113 -0700
+Deleted replace ref 'a3fb2e1845a1aaf129b7975048973414dc172173'
+a3fb2e1845a1aaf129b7975048973414dc172173
+author A fake Thor <author@example.com> 1112912113 -0700
+ok 27 - --edit with and without already replaced object
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-fatal: ambiguous argument 'merge^-3': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-merge^-3
-ok 27 - rev-parse merge^-3 (invalid parent)
+expecting success of 6050.28 '--edit and change nothing or command failed': 
+	git replace -d "$PARA3" &&
+	test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
+	test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
+	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
+	git replace -l >actual &&
+	test_grep "$PARA3" actual &&
+	git cat-file commit "$PARA3" >actual &&
+	test_grep "A fake Thor" actual
 
-expecting success of 6101.28 'rev-parse merge^-^ (garbage after ^-)': 
-	test_must_fail git rev-parse merge^-^
+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
 
-fatal: ambiguous argument 'merge^-^': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-merge^-^
-ok 28 - rev-parse merge^-^ (garbage after ^-)
+expecting success of 6050.29 'replace ref cleanup': 
+	test -n "$(git replace)" &&
+	git replace -d $(git replace) &&
+	test -z "$(git replace)"
 
-expecting success of 6101.29 'rev-parse merge^-1x (garbage after ^-1)': 
-	test_must_fail git rev-parse merge^-1x
+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
 
-fatal: ambiguous argument 'merge^-1x': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-merge^-1x
-ok 29 - rev-parse merge^-1x (garbage after ^-1)
+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
 
-expecting success of 6101.30 'rev-list merge^- = merge^..merge': 
-	git rev-list merge^..merge >expect &&
-	git rev-list merge^- >actual &&
-	test_cmp expect actual
+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
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 30 - rev-list merge^- = merge^..merge
+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
 
-expecting success of 6101.31 'rev-list merge^-1 = merge^1..merge': 
-	git rev-list merge^1..merge >expect &&
-	git rev-list merge^-1 >actual &&
-	test_cmp expect actual
+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
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 31 - rev-list merge^-1 = merge^1..merge
+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
 
-expecting success of 6101.32 'rev-list merge^-2 = merge^2..merge': 
-	git rev-list merge^2..merge >expect &&
-	git rev-list merge^-2 >actual &&
-	test_cmp expect actual
+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
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 32 - rev-list merge^-2 = merge^2..merge
+checking prerequisite: GPG
 
-expecting success of 6101.33 'rev-list merge^-0 (invalid parent)': 
-	test_must_fail git rev-list merge^-0
+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
 
-fatal: ambiguous argument 'merge^-0': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 33 - rev-list merge^-0 (invalid parent)
+	# 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 6101.34 'rev-list merge^-3 (invalid parent)': 
-	test_must_fail git rev-list merge^-3
+)
+prerequisite GPG not satisfied
+ok 33 # skip set up a signed commit (missing GPG)
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-fatal: ambiguous argument 'merge^-3': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 34 - rev-list merge^-3 (invalid parent)
+ok 34 # skip --graft with a signed commit (missing GPG)
 
-expecting success of 6101.35 'rev-list merge^-^ (garbage after ^-)': 
-	test_must_fail git rev-list merge^-^
+ok 35 # skip set up a merge commit with a mergetag (missing GPG)
 
-fatal: ambiguous argument 'merge^-^': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 35 - rev-list merge^-^ (garbage after ^-)
+ok 36 # skip --graft on a commit with a mergetag (missing GPG)
 
-expecting success of 6101.36 'rev-list merge^-1x (garbage after ^-1)': 
-	test_must_fail git rev-list merge^-1x
+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 &&
 
-fatal: ambiguous argument 'merge^-1x': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 36 - rev-list merge^-1x (garbage after ^-1)
+	: 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 &&
 
-expecting success of 6101.37 'rev-parse $garbage^@ does not segfault': 
-	test_must_fail git rev-parse $EMPTY_TREE^@
+	: verify that the history is now "grafted" &&
+	git rev-list HEAD >out &&
+	test_line_count = 4 out &&
 
-error: object 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is a tree, not a commit
-fatal: ambiguous argument '4b825dc642cb6eb9a060e54bf8d69288fbee4904^@': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-4b825dc642cb6eb9a060e54bf8d69288fbee4904^@
-ok 37 - rev-parse $garbage^@ does not segfault
+	: 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
 
-expecting success of 6101.38 'rev-parse $garbage...$garbage does not segfault': 
-	test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB
+Switched to a new branch 'with-graft-file'
+[with-graft-file 614a70e] root2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 root2.t
+HEAD is now at ffccc9d hello: again 3 more lines
+[with-graft-file bf41581] root1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 root1.t
+[with-graft-file f85c1b2] after-root1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-root1.t
+Merge made by the 'ort' strategy.
+ file    | 1 +
+ root2.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 root2.t
+On branch with-graft-file
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	clone_dir/
+	err
+	expected
+	failingfakeeditor
+	fakeeditor
+	file.original
+	file.replaced
+	fsck_main.out
+	log
+	output
+	payload
+	stderr
+	tag.sig
+	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.idx
+	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.pack
+	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.rev
 
-error: object 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is a tree, not a commit
-fatal: ambiguous argument '4b825dc642cb6eb9a060e54bf8d69288fbee4904...e69de29bb2d1d6434b8b29ae775ad8c2e48c5391': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-4b825dc642cb6eb9a060e54bf8d69288fbee4904
-4b825dc642cb6eb9a060e54bf8d69288fbee4904...e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 38 - rev-parse $garbage...$garbage does not segfault
+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 38 test(s)
-1..38
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6131-pathspec-icase.sh ***
@@ -405833,56 +405510,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6136-pathspec-in-bare.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t6136-pathspec-in-bare/bare/.'
-fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t6136-pathspec-in-bare/.git/.'
-fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6111-rev-list-treesame.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6111-rev-list-treesame/.git/
 expecting success of 6111.1 'setup': 
@@ -406497,1070 +406124,51 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6020-bundle-misc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/.git/
-expecting success of 6020.1 'usage: git bundle create needs an argument': 
-		test_expect_code 129 git bundle $cmd
-	
-fatal: need a <file> argument
-
-usage: git bundle create [-q | --quiet | --progress]
-                         [--version=<version>] <file> <git-rev-list-args>
-
-    -q, --[no-]quiet      do not show progress meter
-    --[no-]progress       show progress meter
-    --[no-]version <n>    specify bundle format version
-
-ok 1 - usage: git bundle create needs an argument
-
-expecting success of 6020.2 'usage: git bundle verify needs an argument': 
-		test_expect_code 129 git bundle $cmd
-	
-fatal: need a <file> argument
-
-usage: git bundle verify [-q | --quiet] <file>
-
-    -q, --[no-]quiet      do not show bundle details
-
-ok 2 - usage: git bundle verify needs an argument
-
-expecting success of 6020.3 'usage: git bundle list-heads needs an argument': 
-		test_expect_code 129 git bundle $cmd
-	
-fatal: need a <file> argument
-
-usage: git bundle list-heads <file> [<refname>...]
-
-ok 3 - usage: git bundle list-heads needs an argument
-
-expecting success of 6020.4 'usage: git bundle unbundle needs an argument': 
-		test_expect_code 129 git bundle $cmd
-	
-fatal: need a <file> argument
-
-usage: git bundle unbundle [--progress] <file> [<refname>...]
-
-    --[no-]progress       show progress meter
-
-ok 4 - usage: git bundle unbundle needs an argument
-
-expecting success of 6020.5 'setup': 
-	# Try to make a stable fixed width for abbreviated commit ID,
-	# this fixed-width oid will be replaced with "<OID>".
-	git config core.abbrev 7 &&
-
-	# branch main: commit A & B
-	test_commit_setvar A "Commit A" main.txt &&
-	test_commit_setvar B "Commit B" main.txt &&
-
-	# branch topic/1: commit C & D, refs/pull/1/head
-	git checkout -b topic/1 &&
-	test_commit_setvar C "Commit C" topic-1.txt &&
-	test_commit_setvar D "Commit D" topic-1.txt &&
-	git update-ref refs/pull/1/head HEAD &&
-
-	# branch topic/1: commit E, tag v1
-	git checkout main &&
-	test_commit_setvar E "Commit E" main.txt &&
-	test_commit_setvar --tag TAG1 v1 &&
-
-	# branch topic/2: commit F & G, refs/pull/2/head
-	git checkout -b topic/2 &&
-	test_commit_setvar F "Commit F" topic-2.txt &&
-	test_commit_setvar G "Commit G" topic-2.txt &&
-	git update-ref refs/pull/2/head HEAD &&
-	test_commit_setvar H "Commit H" topic-2.txt &&
-
-	# branch main: merge commit I & J
-	git checkout main &&
-	test_commit_setvar --merge I topic/1 "Merge commit I" &&
-	test_commit_setvar --merge J refs/pull/2/head "Merge commit J" &&
-
-	# branch main: commit K
-	git checkout main &&
-	test_commit_setvar K "Commit K" main.txt &&
-
-	# branch release:
-	git checkout -b release &&
-	test_commit_setvar L "Commit L" release.txt &&
-	test_commit_setvar M "Commit M" release.txt &&
-	test_commit_setvar --tag TAG2 v2 &&
-	test_commit_setvar N "Commit N" release.txt &&
-	test_commit_setvar --tag TAG3 v3 &&
-
-	# branch main: merge commit O, commit P
-	git checkout main &&
-	test_commit_setvar --merge O tags/v2 "Merge commit O" &&
-	test_commit_setvar P "Commit P" main.txt
+*** t6136-pathspec-in-bare.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-[main (root-commit) ccd06f3] Commit A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.txt
-[main 4c9e3a4] Commit B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic/1'
-[topic/1 7bebff0] Commit C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 topic-1.txt
-[topic/1 c01a682] Commit D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-[main 7caaa10] Commit E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic/2'
-[topic/2 065b216] Commit F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 topic-2.txt
-[topic/2 2ead555] Commit G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic/2 d1a87a2] Commit H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- topic-1.txt | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 topic-1.txt
-Merge made by the 'ort' strategy.
- topic-2.txt | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 topic-2.txt
-Already on 'main'
-[main 81bc341] Commit K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'release'
-[release 5e98a21] Commit L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 release.txt
-[release 961846a] Commit M
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[release 75dc67d] Commit N
+[master (root-commit) 69af168] file1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- release.txt | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 release.txt
-[main da43db6] Commit P
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - setup
-
-expecting success of 6020.6 'create bundle from special rev: main^!': 
-	git bundle create special-rev.bdl "main^!" &&
-
-	git bundle list-heads special-rev.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	cat >expect <<-\EOF &&
-	<COMMIT-P> refs/heads/main
-	EOF
-	test_cmp expect actual &&
-
-	git bundle verify special-rev.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	format_and_save_expect <<-EOF &&
-	The bundle contains this ref:
-	<COMMIT-P> refs/heads/main
-	The bundle requires this ref:
-	<COMMIT-O> Z
-	$HASH_MESSAGE
-	EOF
-	test_cmp expect actual &&
-
-	test_bundle_object_count special-rev.bdl 3
-
-special-rev.bdl is okay
-7696cea8d97b544e04fc553088e850feaa4d4a6a
-ok 6 - create bundle from special rev: main^!
-
-expecting success of 6020.7 'create bundle with --max-count option': 
-	git bundle create max-count.bdl --max-count 1 \
-		main \
-		"^release" \
-		refs/tags/v1 \
-		refs/pull/1/head \
-		refs/pull/2/head &&
-
-	git bundle verify max-count.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	format_and_save_expect <<-EOF &&
-	The bundle contains these 2 refs:
-	<COMMIT-P> refs/heads/main
-	<TAG-1> refs/tags/v1
-	The bundle requires this ref:
-	<COMMIT-O> Z
-	$HASH_MESSAGE
-	EOF
-	test_cmp expect actual &&
-
-	test_bundle_object_count max-count.bdl 4
-
-max-count.bdl is okay
-9c7321ed0aaaf5a03665dec65aa9d42371c74f66
-ok 7 - create bundle with --max-count option
-
-expecting success of 6020.8 'create bundle with --since option': 
-	git log -1 --pretty="%ad" $M >actual &&
-	cat >expect <<-\EOF &&
-	Thu Apr 7 15:26:13 2005 -0700
-	EOF
-	test_cmp expect actual &&
-
-	git bundle create since.bdl \
-		--since "Thu Apr 7 15:27:00 2005 -0700" \
-		--all &&
-
-	git bundle verify since.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	format_and_save_expect <<-EOF &&
-	The bundle contains these 5 refs:
-	<COMMIT-P> refs/heads/main
-	<COMMIT-N> refs/heads/release
-	<TAG-2> refs/tags/v2
-	<TAG-3> refs/tags/v3
-	<COMMIT-P> HEAD
-	The bundle requires these 2 refs:
-	<COMMIT-M> Z
-	<COMMIT-K> Z
-	$HASH_MESSAGE
-	EOF
-	test_cmp expect actual &&
-
-	test_bundle_object_count --thin since.bdl 13
-
-warning: ref 'refs/heads/topic/1' is excluded by the rev-list options
-warning: ref 'refs/heads/topic/2' is excluded by the rev-list options
-warning: ref 'refs/pull/1/head' is excluded by the rev-list options
-warning: ref 'refs/pull/2/head' is excluded by the rev-list options
-since.bdl is okay
-pack	28760d9eafb6db46ad14a1e184216684f150f058
-ok 8 - create bundle with --since option
-
-expecting success of 6020.9 'create bundle 1 - no prerequisites': 
-	# create bundle from args
-	git bundle create 1.bdl topic/1 topic/2 &&
-
-	# create bundle from stdin
-	cat >input <<-\EOF &&
-	topic/1
-	topic/2
-	EOF
-	git bundle create stdin-1.bdl --stdin <input &&
-
-	format_and_save_expect <<-EOF &&
-	The bundle contains these 2 refs:
-	<COMMIT-D> refs/heads/topic/1
-	<COMMIT-H> refs/heads/topic/2
-	The bundle records a complete history.
-	$HASH_MESSAGE
-	EOF
-
-	# verify bundle, which has no prerequisites
-	git bundle verify 1.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	git bundle verify stdin-1.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	test_bundle_object_count       1.bdl 24 &&
-	test_bundle_object_count stdin-1.bdl 24
-
-1.bdl is okay
-stdin-1.bdl is okay
-fc1b47c4364c691cacf21c7812c14f9fe0810f9d
-fc1b47c4364c691cacf21c7812c14f9fe0810f9d
-ok 9 - create bundle 1 - no prerequisites
-
-expecting success of 6020.10 'create bundle 2 - has prerequisites': 
-	# create bundle from args
-	git bundle create 2.bdl \
-		--ignore-missing \
-		^topic/deleted \
-		^$D \
-		^topic/2 \
-		release &&
-
-	# create bundle from stdin
-	# input has a non-exist reference: "topic/deleted"
-	cat >input <<-EOF &&
-	^topic/deleted
-	^$D
-	^topic/2
-	EOF
-	git bundle create stdin-2.bdl \
-		--ignore-missing \
-		--stdin \
-		release <input &&
-
-	format_and_save_expect <<-EOF &&
-	The bundle contains this ref:
-	<COMMIT-N> refs/heads/release
-	The bundle requires these 3 refs:
-	<COMMIT-D> Z
-	<COMMIT-E> Z
-	<COMMIT-G> Z
-	$HASH_MESSAGE
-	EOF
-
-	git bundle verify 2.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	git bundle verify stdin-2.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	test_bundle_object_count       2.bdl 16 &&
-	test_bundle_object_count stdin-2.bdl 16
-
-2.bdl is okay
-stdin-2.bdl is okay
-67e31c4a052133ac6423670d40df061e5e8d6402
-67e31c4a052133ac6423670d40df061e5e8d6402
-ok 10 - create bundle 2 - has prerequisites
-
-expecting success of 6020.11 'fail to verify bundle without prerequisites': 
-	git init --bare test1.git &&
-
-	format_and_save_expect <<-\EOF &&
-	error: Repository lacks these prerequisite commits:
-	error: <COMMIT-D> Z
-	error: <COMMIT-E> Z
-	error: <COMMIT-G> Z
-	EOF
-
-	test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/test1.git/
-ok 11 - fail to verify bundle without prerequisites
-
-expecting success of 6020.12 'create bundle 3 - two refs, same object': 
-	# create bundle from args
-	git bundle create --version=3 3.bdl \
-		^release \
-		^topic/1 \
-		^topic/2 \
-		main \
-		HEAD &&
-
-	# create bundle from stdin
-	cat >input <<-\EOF &&
-	^release
-	^topic/1
-	^topic/2
-	EOF
-	git bundle create --version=3 stdin-3.bdl \
-		--stdin \
-		main HEAD <input &&
-
-	format_and_save_expect <<-EOF &&
-	The bundle contains these 2 refs:
-	<COMMIT-P> refs/heads/main
-	<COMMIT-P> HEAD
-	The bundle requires these 2 refs:
-	<COMMIT-M> Z
-	<COMMIT-K> Z
-	$HASH_MESSAGE
-	EOF
-
-	git bundle verify 3.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	git bundle verify stdin-3.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	test_bundle_object_count       3.bdl 4 &&
-	test_bundle_object_count stdin-3.bdl 4
-
-3.bdl is okay
-stdin-3.bdl is okay
-26f60185a0e22eee88717e14f5771ff9294abe28
-26f60185a0e22eee88717e14f5771ff9294abe28
-ok 12 - create bundle 3 - two refs, same object
-
-expecting success of 6020.13 'create bundle 4 - with tags': 
-	# create bundle from args
-	git bundle create 4.bdl \
-		^main \
-		^release \
-		^topic/1 \
-		^topic/2 \
-		--all &&
-
-	# create bundle from stdin
-	cat >input <<-\EOF &&
-	^main
-	^release
-	^topic/1
-	^topic/2
-	EOF
-	git bundle create stdin-4.bdl \
-		--ignore-missing \
-		--stdin \
-		--all <input &&
-
-	cat >expect <<-EOF &&
-	The bundle contains these 3 refs:
-	<TAG-1> refs/tags/v1
-	<TAG-2> refs/tags/v2
-	<TAG-3> refs/tags/v3
-	The bundle records a complete history.
-	$HASH_MESSAGE
-	EOF
-
-	git bundle verify 4.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	git bundle verify stdin-4.bdl |
-		make_user_friendly_and_stable_output >actual &&
-	test_cmp expect actual &&
-
-	test_bundle_object_count       4.bdl 3 &&
-	test_bundle_object_count stdin-4.bdl 3
-
-4.bdl is okay
-stdin-4.bdl is okay
-7892bf753220726226756d43102d34efa3c0cf30
-7892bf753220726226756d43102d34efa3c0cf30
-ok 13 - create bundle 4 - with tags
-
-expecting success of 6020.14 'clone from bundle': 
-	git clone --mirror 1.bdl mirror.git &&
-	git -C mirror.git show-ref |
-		make_user_friendly_and_stable_output >actual &&
-	cat >expect <<-\EOF &&
-	<COMMIT-D> refs/heads/topic/1
-	<COMMIT-H> refs/heads/topic/2
-	EOF
-	test_cmp expect actual &&
-
-	git -C mirror.git fetch ../2.bdl "+refs/*:refs/*" &&
-	git -C mirror.git show-ref |
-		make_user_friendly_and_stable_output >actual &&
-	cat >expect <<-\EOF &&
-	<COMMIT-N> refs/heads/release
-	<COMMIT-D> refs/heads/topic/1
-	<COMMIT-H> refs/heads/topic/2
-	EOF
-	test_cmp expect actual &&
-
-	git -C mirror.git fetch ../3.bdl "+refs/*:refs/*" &&
-	git -C mirror.git show-ref |
-		make_user_friendly_and_stable_output >actual &&
-	cat >expect <<-\EOF &&
-	<COMMIT-P> refs/heads/main
-	<COMMIT-N> refs/heads/release
-	<COMMIT-D> refs/heads/topic/1
-	<COMMIT-H> refs/heads/topic/2
-	EOF
-	test_cmp expect actual &&
-
-	git -C mirror.git fetch ../4.bdl "+refs/*:refs/*" &&
-	git -C mirror.git show-ref |
-		make_user_friendly_and_stable_output >actual &&
-	cat >expect <<-\EOF &&
-	<COMMIT-P> refs/heads/main
-	<COMMIT-N> refs/heads/release
-	<COMMIT-D> refs/heads/topic/1
-	<COMMIT-H> refs/heads/topic/2
-	<TAG-1> refs/tags/v1
-	<TAG-2> refs/tags/v2
-	<TAG-3> refs/tags/v3
-	EOF
-	test_cmp expect actual
-
-Cloning into bare repository 'mirror.git'...
-From ../2.bdl
- * [new branch]      release    -> release
-From ../3.bdl
- * [new branch]      main       -> main
-From ../4.bdl
- * [new tag]         v3         -> v3
- * [new tag]         v2         -> v2
- * [new tag]         v1         -> v1
-ok 14 - clone from bundle
-
-expecting success of 6020.15 'unfiltered bundle with --objects': 
-	git bundle create all-objects.bdl \
-		--all --objects &&
-	git bundle create all.bdl \
-		--all &&
-
-	# Compare the headers of these files.
-	sed -n -e "/^$/q" -e "p" all.bdl >expect &&
-	sed -n -e "/^$/q" -e "p" all-objects.bdl >actual &&
-	test_cmp expect actual
-
-ok 15 - unfiltered bundle with --objects
-
-expecting success of 6020.16 'full bundle upto annotated tag': 
-	git bundle create v2.bdl \
-		v2 &&
-
-	git bundle verify v2.bdl |
-		make_user_friendly_and_stable_output >actual &&
-
-	format_and_save_expect <<-EOF &&
-	The bundle contains this ref:
-	<TAG-2> refs/tags/v2
-	The bundle records a complete history.
-	$HASH_MESSAGE
-	EOF
-	test_cmp expect actual
-
-v2.bdl is okay
-ok 16 - full bundle upto annotated tag
-
-expecting success of 6020.17 'clone from full bundle upto annotated tag': 
-	git clone --mirror v2.bdl tag-clone.git &&
-	git -C tag-clone.git show-ref |
-		make_user_friendly_and_stable_output >actual &&
-	cat >expect <<-\EOF &&
-	<TAG-2> refs/tags/v2
-	EOF
-	test_cmp expect actual
-
-Cloning into bare repository 'tag-clone.git'...
-ok 17 - clone from full bundle upto annotated tag
-
-expecting success of 6020.18 'incremental bundle between two annotated tags': 
-	git bundle create v1-v2.bdl \
-		v1..v2 &&
-
-	git bundle verify v1-v2.bdl |
-		make_user_friendly_and_stable_output >actual &&
-
-	format_and_save_expect <<-EOF &&
-	The bundle contains this ref:
-	<TAG-2> refs/tags/v2
-	The bundle requires these 2 refs:
-	<COMMIT-E> Z
-	<COMMIT-B> Z
-	$HASH_MESSAGE
-	EOF
-	test_cmp expect actual
-
-v1-v2.bdl is okay
-ok 18 - incremental bundle between two annotated tags
-
-expecting success of 6020.19 'filtered bundle: blob:none': 
-		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
-		git bundle create partial.bdl \
-			--all \
-			--filter=$filter &&
-
-		git bundle verify partial.bdl >unfiltered &&
-		make_user_friendly_and_stable_output <unfiltered >actual &&
-
-		cat >expect <<-EOF &&
-		The bundle contains these 10 refs:
-		<COMMIT-P> refs/heads/main
-		<COMMIT-N> refs/heads/release
-		<COMMIT-D> refs/heads/topic/1
-		<COMMIT-H> refs/heads/topic/2
-		<COMMIT-D> refs/pull/1/head
-		<COMMIT-G> refs/pull/2/head
-		<TAG-1> refs/tags/v1
-		<TAG-2> refs/tags/v2
-		<TAG-3> refs/tags/v3
-		<COMMIT-P> HEAD
-		The bundle records a complete history.
-		$HASH_MESSAGE
-		The bundle uses this filter: $filter
-		EOF
-		test_cmp expect actual &&
-
-		test_config uploadpack.allowfilter 1 &&
-		test_config uploadpack.allowanysha1inwant 1 &&
-		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
-
-		git init unbundled &&
-		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
-		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
-		test_line_count = 1 promisor &&
-
-		# Count the same number of reachable objects.
-		reflist=$(git for-each-ref --format="%(objectname)") &&
-		git rev-list --objects --filter=$filter --missing=allow-any \
-			$reflist >expect &&
-		for repo in cloned unbundled
-		do
-			git -C $repo rev-list --objects --missing=allow-any \
-				$reflist >actual &&
-			test_cmp expect actual || return 1
-		done
-	
-partial.bdl is okay
-Cloning into bare repository 'cloned'...
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
-ok 19 - filtered bundle: blob:none
-
-expecting success of 6020.20 'filtered bundle: tree:0': 
-		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
-		git bundle create partial.bdl \
-			--all \
-			--filter=$filter &&
-
-		git bundle verify partial.bdl >unfiltered &&
-		make_user_friendly_and_stable_output <unfiltered >actual &&
-
-		cat >expect <<-EOF &&
-		The bundle contains these 10 refs:
-		<COMMIT-P> refs/heads/main
-		<COMMIT-N> refs/heads/release
-		<COMMIT-D> refs/heads/topic/1
-		<COMMIT-H> refs/heads/topic/2
-		<COMMIT-D> refs/pull/1/head
-		<COMMIT-G> refs/pull/2/head
-		<TAG-1> refs/tags/v1
-		<TAG-2> refs/tags/v2
-		<TAG-3> refs/tags/v3
-		<COMMIT-P> HEAD
-		The bundle records a complete history.
-		$HASH_MESSAGE
-		The bundle uses this filter: $filter
-		EOF
-		test_cmp expect actual &&
-
-		test_config uploadpack.allowfilter 1 &&
-		test_config uploadpack.allowanysha1inwant 1 &&
-		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
-
-		git init unbundled &&
-		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
-		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
-		test_line_count = 1 promisor &&
-
-		# Count the same number of reachable objects.
-		reflist=$(git for-each-ref --format="%(objectname)") &&
-		git rev-list --objects --filter=$filter --missing=allow-any \
-			$reflist >expect &&
-		for repo in cloned unbundled
-		do
-			git -C $repo rev-list --objects --missing=allow-any \
-				$reflist >actual &&
-			test_cmp expect actual || return 1
-		done
-	
-partial.bdl is okay
-Cloning into bare repository 'cloned'...
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
-ok 20 - filtered bundle: tree:0
-
-expecting success of 6020.21 'filtered bundle: tree:1': 
-		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
-		git bundle create partial.bdl \
-			--all \
-			--filter=$filter &&
-
-		git bundle verify partial.bdl >unfiltered &&
-		make_user_friendly_and_stable_output <unfiltered >actual &&
-
-		cat >expect <<-EOF &&
-		The bundle contains these 10 refs:
-		<COMMIT-P> refs/heads/main
-		<COMMIT-N> refs/heads/release
-		<COMMIT-D> refs/heads/topic/1
-		<COMMIT-H> refs/heads/topic/2
-		<COMMIT-D> refs/pull/1/head
-		<COMMIT-G> refs/pull/2/head
-		<TAG-1> refs/tags/v1
-		<TAG-2> refs/tags/v2
-		<TAG-3> refs/tags/v3
-		<COMMIT-P> HEAD
-		The bundle records a complete history.
-		$HASH_MESSAGE
-		The bundle uses this filter: $filter
-		EOF
-		test_cmp expect actual &&
-
-		test_config uploadpack.allowfilter 1 &&
-		test_config uploadpack.allowanysha1inwant 1 &&
-		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
-
-		git init unbundled &&
-		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
-		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
-		test_line_count = 1 promisor &&
-
-		# Count the same number of reachable objects.
-		reflist=$(git for-each-ref --format="%(objectname)") &&
-		git rev-list --objects --filter=$filter --missing=allow-any \
-			$reflist >expect &&
-		for repo in cloned unbundled
-		do
-			git -C $repo rev-list --objects --missing=allow-any \
-				$reflist >actual &&
-			test_cmp expect actual || return 1
-		done
-	
-partial.bdl is okay
-Cloning into bare repository 'cloned'...
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
-ok 21 - filtered bundle: tree:1
-
-expecting success of 6020.22 'filtered bundle: blob:limit=100': 
-		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
-		git bundle create partial.bdl \
-			--all \
-			--filter=$filter &&
-
-		git bundle verify partial.bdl >unfiltered &&
-		make_user_friendly_and_stable_output <unfiltered >actual &&
-
-		cat >expect <<-EOF &&
-		The bundle contains these 10 refs:
-		<COMMIT-P> refs/heads/main
-		<COMMIT-N> refs/heads/release
-		<COMMIT-D> refs/heads/topic/1
-		<COMMIT-H> refs/heads/topic/2
-		<COMMIT-D> refs/pull/1/head
-		<COMMIT-G> refs/pull/2/head
-		<TAG-1> refs/tags/v1
-		<TAG-2> refs/tags/v2
-		<TAG-3> refs/tags/v3
-		<COMMIT-P> HEAD
-		The bundle records a complete history.
-		$HASH_MESSAGE
-		The bundle uses this filter: $filter
-		EOF
-		test_cmp expect actual &&
-
-		test_config uploadpack.allowfilter 1 &&
-		test_config uploadpack.allowanysha1inwant 1 &&
-		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
-
-		git init unbundled &&
-		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
-		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
-		test_line_count = 1 promisor &&
-
-		# Count the same number of reachable objects.
-		reflist=$(git for-each-ref --format="%(objectname)") &&
-		git rev-list --objects --filter=$filter --missing=allow-any \
-			$reflist >expect &&
-		for repo in cloned unbundled
-		do
-			git -C $repo rev-list --objects --missing=allow-any \
-				$reflist >actual &&
-			test_cmp expect actual || return 1
-		done
-	
-partial.bdl is okay
-Cloning into bare repository 'cloned'...
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
-ok 22 - filtered bundle: blob:limit=100
-
-expecting success of 6020.23 'cloning from filtered bundle has useful error': 
-	git bundle create partial.bdl \
-		--all \
-		--filter=blob:none &&
-	test_must_fail git clone --bare partial.bdl partial 2>err &&
-	grep "cannot clone from filtered bundle" err
-
-fatal: cannot clone from filtered bundle
-ok 23 - cloning from filtered bundle has useful error
+ create mode 100644 file1.t
+Cloning into bare repository 'bare'...
+done.
+ok 1 - setup a bare and non-bare repository
 
-expecting success of 6020.24 'verify catches unreachable, broken prerequisites': 
-	test_when_finished rm -rf clone-from clone-to &&
-	git init clone-from &&
-	(
-		cd clone-from &&
-		git checkout -b base &&
-		test_commit A &&
-		git checkout -b tip &&
-		git commit --allow-empty -m "will drop by shallow" &&
-		git commit --allow-empty -m "will keep by shallow" &&
-		git commit --allow-empty -m "for bundle, not clone" &&
-		git bundle create tip.bundle tip~1..tip &&
-		git reset --hard HEAD~1 &&
-		git checkout base
-	) &&
-	BAD_OID=$(git -C clone-from rev-parse tip~1) &&
-	TIP_OID=$(git -C clone-from rev-parse tip) &&
-	git clone --depth=1 --no-single-branch \
-		"file://$(pwd)/clone-from" clone-to &&
+expecting success of 6136.2 'log and ls-files in a bare repository': 
 	(
-		cd clone-to &&
-
-		# Set up broken history by removing shallow markers
-		git update-ref -d refs/remotes/origin/tip &&
-		rm .git/shallow &&
-
-		# Verify should fail
-		test_must_fail git bundle verify \
-			../clone-from/tip.bundle 2>err &&
-		grep "some prerequisite commits .* are not connected" err &&
-		test_line_count = 1 err &&
+		cd bare &&
+		test_must_fail git log -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_grep "outside repository" err &&
 
-		# Unbundling should fail
-		test_must_fail git bundle unbundle \
-			../clone-from/tip.bundle 2>err &&
-		grep "some prerequisite commits .* are not connected" err &&
-		test_line_count = 1 err
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_grep "outside repository" err
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/clone-from/.git/
-Switched to a new branch 'base'
-[base (root-commit) 818c4b4] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'tip'
-[tip 55d0edb] will drop by shallow
- Author: A U Thor <author@example.com>
-[tip 95b68c9] will keep by shallow
- Author: A U Thor <author@example.com>
-[tip 67095cd] for bundle, not clone
- Author: A U Thor <author@example.com>
-HEAD is now at 95b68c9 will keep by shallow
-Switched to branch 'base'
-Cloning into 'clone-to'...
-The bundle contains this ref:
-67095cdad769c1047892f03dc8fb54a849281a7c refs/heads/tip
-The bundle requires this ref:
-95b68c91366fa02ea282d8dc3dd5f5acae55d179 
-The bundle uses this hash algorithm: sha1
-error: some prerequisite commits exist in the object store, but are not connected to the repository's history
-error: some prerequisite commits exist in the object store, but are not connected to the repository's history
-ok 24 - verify catches unreachable, broken prerequisites
-
-expecting success of 6020.25 'bundle progress includes write phase': 
-	GIT_PROGRESS_DELAY=0 \
-		git bundle create --progress out.bundle --all 2>err &&
-	grep Writing err
-
-Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 762.00 KiB/s, done.
-ok 25 - bundle progress includes write phase
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
-
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
-
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
-
-)
-prerequisite TTY ok
-expecting success of 6020.26 'create --quiet disables all bundle progress': 
-	test_terminal env GIT_PROGRESS_DELAY=0 \
-		git bundle create --quiet out.bundle --all 2>err &&
-	test_must_be_empty err
-
-ok 26 - create --quiet disables all bundle progress
-
-expecting success of 6020.27 'bundle progress with --no-quiet': 
-	GIT_PROGRESS_DELAY=0 \
-		git bundle create --no-quiet out.bundle --all 2>err &&
-	grep "%" err
-
-Counting objects:   2% (1/47)
Counting objects:   4% (2/47)
Counting objects:   6% (3/47)
Counting objects:   8% (4/47)
Counting objects:  10% (5/47)
Counting objects:  12% (6/47)
Counting objects:  14% (7/47)
Counting objects:  17% (8/47)
Counting objects:  19% (9/47)
Counting objects:  21% (10/47)
Counting objects:  23% (11/47)
Counting objects:  25% (12/47)
Counting objects:  27% (13/47)
Counting objects:  29% (14/47)
Counting objects:  31% (15/47)
Counting objects:  34% (16/47)
Counting objects:  36% (17/47)
Counting objects:  38% (18/47)
Counting objects:  40% (19/47)
Counting objects:  42% (20/47)
Counting objects:  44% (21/47)
Counting objects:  46% (22/47)
Counting objects:  48% (23/47)
Counting objects:  51% (24/47)
Counting objects:  53% (25/47)
Counting objects:  55% (26/47)
Counting objects:  57% (27/47)
Counting objects:  59% (28/47)
Counting objects:  61% (29/47)
Counting objects:  63% (30/47)
Counting objects:  65% (31/47)
Counting objects:  68% (32/47)
Counting objects:  70% (33/47)
Counting objects:  72% (34/47)
Counting objects:  74% (35/47)
Counting objects:  76% (36/47)
Counting objects:  78% (37/47)
Counting objects:  80% (38/47)
Counting objects:  82% (39/47)
Counting objects:  85% (40/47)
Counting objects:  87% (41/47)
Counting objects:  89% (42/47)
Counting objects:  91% (43/47)
Counting objects:  93% (44/47)
Counting objects:  95% (45/47)
Counting objects:  97% (46/47)
Counting objects: 100% (47/47)
Counting objects: 100% (47/47), done.
-Compressing objects:   3% (1/31)
Compressing objects:   6% (2/31)
Compressing objects:   9% (3/31)
Compressing objects:  12% (4/31)
Compressing objects:  16% (5/31)
Compressing objects:  19% (6/31)
Compressing objects:  22% (7/31)
Compressing objects:  25% (8/31)
Compressing objects:  29% (9/31)
Compressing objects:  32% (10/31)
Compressing objects:  35% (11/31)
Compressing objects:  38% (12/31)
Compressing objects:  41% (13/31)
Compressing objects:  45% (14/31)
Compressing objects:  48% (15/31)
Compressing objects:  51% (16/31)
Compressing objects:  54% (17/31)
Compressing objects:  58% (18/31)
Compressing objects:  61% (19/31)
Compressing objects:  64% (20/31)
Compressing objects:  67% (21/31)
Compressing objects:  70% (22/31)
Compressing objects:  74% (23/31)
Compressing objects:  77% (24/31)
Compressing objects:  80% (25/31)
Compressing objects:  83% (26/31)
Compressing objects:  87% (27/31)
Compressing objects:  90% (28/31)
Compressing objects:  93% (29/31)
Compressing objects:  96% (30/31)
Compressing objects: 100% (31/31)
Compressing objects: 100% (31/31), done.
-Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 762.00 KiB/s, done.
-ok 27 - bundle progress with --no-quiet
-
-expecting success of 6020.28 'read bundle over stdin': 
-	git bundle create some.bundle HEAD &&
-
-	git bundle verify - <some.bundle 2>err &&
-	grep "<stdin> is okay" err &&
-
-	git bundle list-heads some.bundle >expect &&
-	git bundle list-heads - <some.bundle >actual &&
-	test_cmp expect actual &&
-
-	git bundle unbundle some.bundle >expect &&
-	git bundle unbundle - <some.bundle >actual &&
-	test_cmp expect actual
-
-The bundle contains this ref:
-da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
-The bundle records a complete history.
-The bundle uses this hash algorithm: sha1
-<stdin> is okay
-ok 28 - read bundle over stdin
-
-expecting success of 6020.29 'send a bundle to standard output': 
-	git bundle create - --all HEAD >bundle-one &&
-	mkdir -p down &&
-	git -C down bundle create - --all HEAD >bundle-two &&
-	git bundle verify bundle-one &&
-	git bundle verify bundle-two &&
-	git ls-remote bundle-one >expect &&
-	git ls-remote bundle-two >actual &&
-	test_cmp expect actual
-
-bundle-one is okay
-The bundle contains these 10 refs:
-da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
-75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
-d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
-2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
-bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
-ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
-64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
-da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
-The bundle records a complete history.
-The bundle uses this hash algorithm: sha1
-bundle-two is okay
-The bundle contains these 10 refs:
-da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
-75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
-d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
-c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
-2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
-bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
-ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
-64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
-da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
-The bundle records a complete history.
-The bundle uses this hash algorithm: sha1
-ok 29 - send a bundle to standard output
-
-expecting success of 6020.30 'unbundle outside of a repository': 
-	git bundle create some.bundle HEAD &&
-	echo "fatal: Need a repository to unbundle." >expect &&
-	nongit test_must_fail git bundle unbundle "$(pwd)/some.bundle" 2>err &&
-	test_cmp expect err
-
-ok 30 - unbundle outside of a repository
-
-expecting success of 6020.31 'list-heads outside of a repository': 
-	git bundle create some.bundle HEAD &&
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD) HEAD
-	EOF
-	nongit git bundle list-heads "$(pwd)/some.bundle" >actual &&
-	test_cmp expect actual
-
-ok 31 - list-heads outside of a repository
-
-expecting success of 6020.32 'list-heads with bundle using sha1': 
-		test_when_finished "rm -rf hash" &&
-		git init --object-format=$hash hash &&
-		test_commit -C hash initial &&
-		git -C hash bundle create hash.bundle HEAD &&
-
-		cat >expect <<-EOF &&
-		$(git -C hash rev-parse HEAD) HEAD
-		EOF
-		git bundle list-heads hash/hash.bundle >actual &&
-		test_cmp expect actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/hash/.git/
-[main (root-commit) ee4b540] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 32 - list-heads with bundle using sha1
-
-expecting success of 6020.33 'list-heads with bundle using sha256': 
-		test_when_finished "rm -rf hash" &&
-		git init --object-format=$hash hash &&
-		test_commit -C hash initial &&
-		git -C hash bundle create hash.bundle HEAD &&
-
-		cat >expect <<-EOF &&
-		$(git -C hash rev-parse HEAD) HEAD
-		EOF
-		git bundle list-heads hash/hash.bundle >actual &&
-		test_cmp expect actual
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/hash/.git/
-[main (root-commit) 8b2bc6b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 33 - list-heads with bundle using sha256
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6134-pathspec-in-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6136-pathspec-in-bare/bare/.'
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6136-pathspec-in-bare/bare/.'
+ok 2 - log and ls-files in a bare repository
 
-ok 2 - error message for path inside submodule
+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 &&
 
-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
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_grep "outside repository" err
+	)
 
-fatal: in unpopulated submodule 'sub'
-ok 3 - error message for path inside submodule from within submodule
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6136-pathspec-in-bare/.git/.'
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6136-pathspec-in-bare/.git/.'
+ok 3 - log and ls-files in .git directory
 
 # passed all 3 test(s)
 1..3
@@ -408402,6 +407010,51 @@
 1..55
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6134-pathspec-in-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6301-for-each-ref-errors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6301-for-each-ref-errors/.git/
 expecting success of 6301.1 'setup': 
@@ -409016,107 +407669,1028 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6401-merge-criss-cross.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t6020-bundle-misc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/.git/
+expecting success of 6020.1 'usage: git bundle create needs an argument': 
+		test_expect_code 129 git bundle $cmd
+	
+fatal: need a <file> argument
 
-	git branch A &&
-	git branch B &&
-	git checkout A &&
+usage: git bundle create [-q | --quiet | --progress]
+                         [--version=<version>] <file> <git-rev-list-args>
 
-	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 &&
+    -q, --[no-]quiet      do not show progress meter
+    --[no-]progress       show progress meter
+    --[no-]version <n>    specify bundle format version
 
-	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 &&
+ok 1 - usage: git bundle create needs an argument
 
-	git merge -m "pre E3 merge" A &&
+expecting success of 6020.2 'usage: git bundle verify needs an argument': 
+		test_expect_code 129 git bundle $cmd
+	
+fatal: need a <file> argument
 
-	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 &&
+usage: git bundle verify [-q | --quiet] <file>
 
-	git checkout A &&
-	git merge -m "pre D8 merge" C3 &&
-	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
+    -q, --[no-]quiet      do not show bundle details
 
-	git commit -m D8 file
+ok 2 - usage: git bundle verify needs an argument
 
-[master (root-commit) 40a1fcc] Initial commit
+expecting success of 6020.3 'usage: git bundle list-heads needs an argument': 
+		test_expect_code 129 git bundle $cmd
+	
+fatal: need a <file> argument
+
+usage: git bundle list-heads <file> [<refname>...]
+
+ok 3 - usage: git bundle list-heads needs an argument
+
+expecting success of 6020.4 'usage: git bundle unbundle needs an argument': 
+		test_expect_code 129 git bundle $cmd
+	
+fatal: need a <file> argument
+
+usage: git bundle unbundle [--progress] <file> [<refname>...]
+
+    --[no-]progress       show progress meter
+
+ok 4 - usage: git bundle unbundle needs an argument
+
+expecting success of 6020.5 'setup': 
+	# Try to make a stable fixed width for abbreviated commit ID,
+	# this fixed-width oid will be replaced with "<OID>".
+	git config core.abbrev 7 &&
+
+	# branch main: commit A & B
+	test_commit_setvar A "Commit A" main.txt &&
+	test_commit_setvar B "Commit B" main.txt &&
+
+	# branch topic/1: commit C & D, refs/pull/1/head
+	git checkout -b topic/1 &&
+	test_commit_setvar C "Commit C" topic-1.txt &&
+	test_commit_setvar D "Commit D" topic-1.txt &&
+	git update-ref refs/pull/1/head HEAD &&
+
+	# branch topic/1: commit E, tag v1
+	git checkout main &&
+	test_commit_setvar E "Commit E" main.txt &&
+	test_commit_setvar --tag TAG1 v1 &&
+
+	# branch topic/2: commit F & G, refs/pull/2/head
+	git checkout -b topic/2 &&
+	test_commit_setvar F "Commit F" topic-2.txt &&
+	test_commit_setvar G "Commit G" topic-2.txt &&
+	git update-ref refs/pull/2/head HEAD &&
+	test_commit_setvar H "Commit H" topic-2.txt &&
+
+	# branch main: merge commit I & J
+	git checkout main &&
+	test_commit_setvar --merge I topic/1 "Merge commit I" &&
+	test_commit_setvar --merge J refs/pull/2/head "Merge commit J" &&
+
+	# branch main: commit K
+	git checkout main &&
+	test_commit_setvar K "Commit K" main.txt &&
+
+	# branch release:
+	git checkout -b release &&
+	test_commit_setvar L "Commit L" release.txt &&
+	test_commit_setvar M "Commit M" release.txt &&
+	test_commit_setvar --tag TAG2 v2 &&
+	test_commit_setvar N "Commit N" release.txt &&
+	test_commit_setvar --tag TAG3 v3 &&
+
+	# branch main: merge commit O, commit P
+	git checkout main &&
+	test_commit_setvar --merge O tags/v2 "Merge commit O" &&
+	test_commit_setvar P "Commit P" main.txt
+
+[main (root-commit) ccd06f3] Commit A
  Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-Switched to branch 'A'
-[A 3e86c96] B8
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main.txt
+[main 4c9e3a4] Commit B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'B'
-[B 039abf7] C3
+Switched to a new branch 'topic/1'
+[topic/1 7bebff0] Commit C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic-1.txt
+[topic/1 c01a682] Commit D
  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 +-
+Switched to branch 'main'
+[main 7caaa10] Commit E
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[B 4628fbc] E3
+Switched to a new branch 'topic/2'
+[topic/2 065b216] Commit F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic-2.txt
+[topic/2 2ead555] Commit G
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Auto-merging file
+[topic/2 d1a87a2] Commit H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
 Merge made by the 'ort' strategy.
- file | 2 +-
+ topic-1.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic-1.txt
+Merge made by the 'ort' strategy.
+ topic-2.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic-2.txt
+Already on 'main'
+[main 81bc341] Commit K
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[A 1f51d3d] D8
+Switched to a new branch 'release'
+[release 5e98a21] Commit L
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 release.txt
+[release 961846a] Commit M
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - prepare repository
-
-expecting success of 6401.2 'Criss-cross merge': 
-	git merge -m "final merge" B
-
-  From inner merge:  Auto-merging file
-Auto-merging file
+[release 75dc67d] Commit N
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
 Merge made by the 'ort' strategy.
- file | 2 +-
+ release.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 release.txt
+[main da43db6] Commit P
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - Criss-cross merge
+ok 5 - setup
 
-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
+expecting success of 6020.6 'create bundle from special rev: main^!': 
+	git bundle create special-rev.bdl "main^!" &&
+
+	git bundle list-heads special-rev.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
 	EOF
+	test_cmp expect actual &&
 
-	test_cmp file-expect file
+	git bundle verify special-rev.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	format_and_save_expect <<-EOF &&
+	The bundle contains this ref:
+	<COMMIT-P> refs/heads/main
+	The bundle requires this ref:
+	<COMMIT-O> Z
+	$HASH_MESSAGE
+	EOF
+	test_cmp expect actual &&
 
-ok 3 - Criss-cross merge result
+	test_bundle_object_count special-rev.bdl 3
 
-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
+special-rev.bdl is okay
+7696cea8d97b544e04fc553088e850feaa4d4a6a
+ok 6 - create bundle from special rev: main^!
 
-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 6020.7 'create bundle with --max-count option': 
+	git bundle create max-count.bdl --max-count 1 \
+		main \
+		"^release" \
+		refs/tags/v1 \
+		refs/pull/1/head \
+		refs/pull/2/head &&
 
-# passed all 4 test(s)
-1..4
+	git bundle verify max-count.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	format_and_save_expect <<-EOF &&
+	The bundle contains these 2 refs:
+	<COMMIT-P> refs/heads/main
+	<TAG-1> refs/tags/v1
+	The bundle requires this ref:
+	<COMMIT-O> Z
+	$HASH_MESSAGE
+	EOF
+	test_cmp expect actual &&
+
+	test_bundle_object_count max-count.bdl 4
+
+max-count.bdl is okay
+9c7321ed0aaaf5a03665dec65aa9d42371c74f66
+ok 7 - create bundle with --max-count option
+
+expecting success of 6020.8 'create bundle with --since option': 
+	git log -1 --pretty="%ad" $M >actual &&
+	cat >expect <<-\EOF &&
+	Thu Apr 7 15:26:13 2005 -0700
+	EOF
+	test_cmp expect actual &&
+
+	git bundle create since.bdl \
+		--since "Thu Apr 7 15:27:00 2005 -0700" \
+		--all &&
+
+	git bundle verify since.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	format_and_save_expect <<-EOF &&
+	The bundle contains these 5 refs:
+	<COMMIT-P> refs/heads/main
+	<COMMIT-N> refs/heads/release
+	<TAG-2> refs/tags/v2
+	<TAG-3> refs/tags/v3
+	<COMMIT-P> HEAD
+	The bundle requires these 2 refs:
+	<COMMIT-M> Z
+	<COMMIT-K> Z
+	$HASH_MESSAGE
+	EOF
+	test_cmp expect actual &&
+
+	test_bundle_object_count --thin since.bdl 13
+
+warning: ref 'refs/heads/topic/1' is excluded by the rev-list options
+warning: ref 'refs/heads/topic/2' is excluded by the rev-list options
+warning: ref 'refs/pull/1/head' is excluded by the rev-list options
+warning: ref 'refs/pull/2/head' is excluded by the rev-list options
+since.bdl is okay
+pack	28760d9eafb6db46ad14a1e184216684f150f058
+ok 8 - create bundle with --since option
+
+expecting success of 6020.9 'create bundle 1 - no prerequisites': 
+	# create bundle from args
+	git bundle create 1.bdl topic/1 topic/2 &&
+
+	# create bundle from stdin
+	cat >input <<-\EOF &&
+	topic/1
+	topic/2
+	EOF
+	git bundle create stdin-1.bdl --stdin <input &&
+
+	format_and_save_expect <<-EOF &&
+	The bundle contains these 2 refs:
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	The bundle records a complete history.
+	$HASH_MESSAGE
+	EOF
+
+	# verify bundle, which has no prerequisites
+	git bundle verify 1.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-1.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       1.bdl 24 &&
+	test_bundle_object_count stdin-1.bdl 24
+
+1.bdl is okay
+stdin-1.bdl is okay
+fc1b47c4364c691cacf21c7812c14f9fe0810f9d
+fc1b47c4364c691cacf21c7812c14f9fe0810f9d
+ok 9 - create bundle 1 - no prerequisites
+
+expecting success of 6020.10 'create bundle 2 - has prerequisites': 
+	# create bundle from args
+	git bundle create 2.bdl \
+		--ignore-missing \
+		^topic/deleted \
+		^$D \
+		^topic/2 \
+		release &&
+
+	# create bundle from stdin
+	# input has a non-exist reference: "topic/deleted"
+	cat >input <<-EOF &&
+	^topic/deleted
+	^$D
+	^topic/2
+	EOF
+	git bundle create stdin-2.bdl \
+		--ignore-missing \
+		--stdin \
+		release <input &&
+
+	format_and_save_expect <<-EOF &&
+	The bundle contains this ref:
+	<COMMIT-N> refs/heads/release
+	The bundle requires these 3 refs:
+	<COMMIT-D> Z
+	<COMMIT-E> Z
+	<COMMIT-G> Z
+	$HASH_MESSAGE
+	EOF
+
+	git bundle verify 2.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-2.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       2.bdl 16 &&
+	test_bundle_object_count stdin-2.bdl 16
+
+2.bdl is okay
+stdin-2.bdl is okay
+67e31c4a052133ac6423670d40df061e5e8d6402
+67e31c4a052133ac6423670d40df061e5e8d6402
+ok 10 - create bundle 2 - has prerequisites
+
+expecting success of 6020.11 'fail to verify bundle without prerequisites': 
+	git init --bare test1.git &&
+
+	format_and_save_expect <<-\EOF &&
+	error: Repository lacks these prerequisite commits:
+	error: <COMMIT-D> Z
+	error: <COMMIT-E> Z
+	error: <COMMIT-G> Z
+	EOF
+
+	test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/test1.git/
+ok 11 - fail to verify bundle without prerequisites
+
+expecting success of 6020.12 'create bundle 3 - two refs, same object': 
+	# create bundle from args
+	git bundle create --version=3 3.bdl \
+		^release \
+		^topic/1 \
+		^topic/2 \
+		main \
+		HEAD &&
+
+	# create bundle from stdin
+	cat >input <<-\EOF &&
+	^release
+	^topic/1
+	^topic/2
+	EOF
+	git bundle create --version=3 stdin-3.bdl \
+		--stdin \
+		main HEAD <input &&
+
+	format_and_save_expect <<-EOF &&
+	The bundle contains these 2 refs:
+	<COMMIT-P> refs/heads/main
+	<COMMIT-P> HEAD
+	The bundle requires these 2 refs:
+	<COMMIT-M> Z
+	<COMMIT-K> Z
+	$HASH_MESSAGE
+	EOF
+
+	git bundle verify 3.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-3.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       3.bdl 4 &&
+	test_bundle_object_count stdin-3.bdl 4
+
+3.bdl is okay
+stdin-3.bdl is okay
+26f60185a0e22eee88717e14f5771ff9294abe28
+26f60185a0e22eee88717e14f5771ff9294abe28
+ok 12 - create bundle 3 - two refs, same object
+
+expecting success of 6020.13 'create bundle 4 - with tags': 
+	# create bundle from args
+	git bundle create 4.bdl \
+		^main \
+		^release \
+		^topic/1 \
+		^topic/2 \
+		--all &&
+
+	# create bundle from stdin
+	cat >input <<-\EOF &&
+	^main
+	^release
+	^topic/1
+	^topic/2
+	EOF
+	git bundle create stdin-4.bdl \
+		--ignore-missing \
+		--stdin \
+		--all <input &&
+
+	cat >expect <<-EOF &&
+	The bundle contains these 3 refs:
+	<TAG-1> refs/tags/v1
+	<TAG-2> refs/tags/v2
+	<TAG-3> refs/tags/v3
+	The bundle records a complete history.
+	$HASH_MESSAGE
+	EOF
+
+	git bundle verify 4.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-4.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       4.bdl 3 &&
+	test_bundle_object_count stdin-4.bdl 3
+
+4.bdl is okay
+stdin-4.bdl is okay
+7892bf753220726226756d43102d34efa3c0cf30
+7892bf753220726226756d43102d34efa3c0cf30
+ok 13 - create bundle 4 - with tags
+
+expecting success of 6020.14 'clone from bundle': 
+	git clone --mirror 1.bdl mirror.git &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	EOF
+	test_cmp expect actual &&
+
+	git -C mirror.git fetch ../2.bdl "+refs/*:refs/*" &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-N> refs/heads/release
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	EOF
+	test_cmp expect actual &&
+
+	git -C mirror.git fetch ../3.bdl "+refs/*:refs/*" &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	<COMMIT-N> refs/heads/release
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	EOF
+	test_cmp expect actual &&
+
+	git -C mirror.git fetch ../4.bdl "+refs/*:refs/*" &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	<COMMIT-N> refs/heads/release
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	<TAG-1> refs/tags/v1
+	<TAG-2> refs/tags/v2
+	<TAG-3> refs/tags/v3
+	EOF
+	test_cmp expect actual
+
+Cloning into bare repository 'mirror.git'...
+From ../2.bdl
+ * [new branch]      release    -> release
+From ../3.bdl
+ * [new branch]      main       -> main
+From ../4.bdl
+ * [new tag]         v3         -> v3
+ * [new tag]         v2         -> v2
+ * [new tag]         v1         -> v1
+ok 14 - clone from bundle
+
+expecting success of 6020.15 'unfiltered bundle with --objects': 
+	git bundle create all-objects.bdl \
+		--all --objects &&
+	git bundle create all.bdl \
+		--all &&
+
+	# Compare the headers of these files.
+	sed -n -e "/^$/q" -e "p" all.bdl >expect &&
+	sed -n -e "/^$/q" -e "p" all-objects.bdl >actual &&
+	test_cmp expect actual
+
+ok 15 - unfiltered bundle with --objects
+
+expecting success of 6020.16 'full bundle upto annotated tag': 
+	git bundle create v2.bdl \
+		v2 &&
+
+	git bundle verify v2.bdl |
+		make_user_friendly_and_stable_output >actual &&
+
+	format_and_save_expect <<-EOF &&
+	The bundle contains this ref:
+	<TAG-2> refs/tags/v2
+	The bundle records a complete history.
+	$HASH_MESSAGE
+	EOF
+	test_cmp expect actual
+
+v2.bdl is okay
+ok 16 - full bundle upto annotated tag
+
+expecting success of 6020.17 'clone from full bundle upto annotated tag': 
+	git clone --mirror v2.bdl tag-clone.git &&
+	git -C tag-clone.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<TAG-2> refs/tags/v2
+	EOF
+	test_cmp expect actual
+
+Cloning into bare repository 'tag-clone.git'...
+ok 17 - clone from full bundle upto annotated tag
+
+expecting success of 6020.18 'incremental bundle between two annotated tags': 
+	git bundle create v1-v2.bdl \
+		v1..v2 &&
+
+	git bundle verify v1-v2.bdl |
+		make_user_friendly_and_stable_output >actual &&
+
+	format_and_save_expect <<-EOF &&
+	The bundle contains this ref:
+	<TAG-2> refs/tags/v2
+	The bundle requires these 2 refs:
+	<COMMIT-E> Z
+	<COMMIT-B> Z
+	$HASH_MESSAGE
+	EOF
+	test_cmp expect actual
+
+v1-v2.bdl is okay
+ok 18 - incremental bundle between two annotated tags
+
+expecting success of 6020.19 'filtered bundle: blob:none': 
+		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
+		git bundle create partial.bdl \
+			--all \
+			--filter=$filter &&
+
+		git bundle verify partial.bdl >unfiltered &&
+		make_user_friendly_and_stable_output <unfiltered >actual &&
+
+		cat >expect <<-EOF &&
+		The bundle contains these 10 refs:
+		<COMMIT-P> refs/heads/main
+		<COMMIT-N> refs/heads/release
+		<COMMIT-D> refs/heads/topic/1
+		<COMMIT-H> refs/heads/topic/2
+		<COMMIT-D> refs/pull/1/head
+		<COMMIT-G> refs/pull/2/head
+		<TAG-1> refs/tags/v1
+		<TAG-2> refs/tags/v2
+		<TAG-3> refs/tags/v3
+		<COMMIT-P> HEAD
+		The bundle records a complete history.
+		$HASH_MESSAGE
+		The bundle uses this filter: $filter
+		EOF
+		test_cmp expect actual &&
+
+		test_config uploadpack.allowfilter 1 &&
+		test_config uploadpack.allowanysha1inwant 1 &&
+		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
+
+		git init unbundled &&
+		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
+		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
+		test_line_count = 1 promisor &&
+
+		# Count the same number of reachable objects.
+		reflist=$(git for-each-ref --format="%(objectname)") &&
+		git rev-list --objects --filter=$filter --missing=allow-any \
+			$reflist >expect &&
+		for repo in cloned unbundled
+		do
+			git -C $repo rev-list --objects --missing=allow-any \
+				$reflist >actual &&
+			test_cmp expect actual || return 1
+		done
+	
+partial.bdl is okay
+Cloning into bare repository 'cloned'...
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
+ok 19 - filtered bundle: blob:none
+
+expecting success of 6020.20 'filtered bundle: tree:0': 
+		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
+		git bundle create partial.bdl \
+			--all \
+			--filter=$filter &&
+
+		git bundle verify partial.bdl >unfiltered &&
+		make_user_friendly_and_stable_output <unfiltered >actual &&
+
+		cat >expect <<-EOF &&
+		The bundle contains these 10 refs:
+		<COMMIT-P> refs/heads/main
+		<COMMIT-N> refs/heads/release
+		<COMMIT-D> refs/heads/topic/1
+		<COMMIT-H> refs/heads/topic/2
+		<COMMIT-D> refs/pull/1/head
+		<COMMIT-G> refs/pull/2/head
+		<TAG-1> refs/tags/v1
+		<TAG-2> refs/tags/v2
+		<TAG-3> refs/tags/v3
+		<COMMIT-P> HEAD
+		The bundle records a complete history.
+		$HASH_MESSAGE
+		The bundle uses this filter: $filter
+		EOF
+		test_cmp expect actual &&
+
+		test_config uploadpack.allowfilter 1 &&
+		test_config uploadpack.allowanysha1inwant 1 &&
+		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
+
+		git init unbundled &&
+		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
+		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
+		test_line_count = 1 promisor &&
+
+		# Count the same number of reachable objects.
+		reflist=$(git for-each-ref --format="%(objectname)") &&
+		git rev-list --objects --filter=$filter --missing=allow-any \
+			$reflist >expect &&
+		for repo in cloned unbundled
+		do
+			git -C $repo rev-list --objects --missing=allow-any \
+				$reflist >actual &&
+			test_cmp expect actual || return 1
+		done
+	
+partial.bdl is okay
+Cloning into bare repository 'cloned'...
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
+ok 20 - filtered bundle: tree:0
+
+expecting success of 6020.21 'filtered bundle: tree:1': 
+		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
+		git bundle create partial.bdl \
+			--all \
+			--filter=$filter &&
+
+		git bundle verify partial.bdl >unfiltered &&
+		make_user_friendly_and_stable_output <unfiltered >actual &&
+
+		cat >expect <<-EOF &&
+		The bundle contains these 10 refs:
+		<COMMIT-P> refs/heads/main
+		<COMMIT-N> refs/heads/release
+		<COMMIT-D> refs/heads/topic/1
+		<COMMIT-H> refs/heads/topic/2
+		<COMMIT-D> refs/pull/1/head
+		<COMMIT-G> refs/pull/2/head
+		<TAG-1> refs/tags/v1
+		<TAG-2> refs/tags/v2
+		<TAG-3> refs/tags/v3
+		<COMMIT-P> HEAD
+		The bundle records a complete history.
+		$HASH_MESSAGE
+		The bundle uses this filter: $filter
+		EOF
+		test_cmp expect actual &&
+
+		test_config uploadpack.allowfilter 1 &&
+		test_config uploadpack.allowanysha1inwant 1 &&
+		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
+
+		git init unbundled &&
+		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
+		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
+		test_line_count = 1 promisor &&
+
+		# Count the same number of reachable objects.
+		reflist=$(git for-each-ref --format="%(objectname)") &&
+		git rev-list --objects --filter=$filter --missing=allow-any \
+			$reflist >expect &&
+		for repo in cloned unbundled
+		do
+			git -C $repo rev-list --objects --missing=allow-any \
+				$reflist >actual &&
+			test_cmp expect actual || return 1
+		done
+	
+partial.bdl is okay
+Cloning into bare repository 'cloned'...
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
+ok 21 - filtered bundle: tree:1
+
+expecting success of 6020.22 'filtered bundle: blob:limit=100': 
+		test_when_finished rm -rf .git/objects/pack cloned unbundled &&
+		git bundle create partial.bdl \
+			--all \
+			--filter=$filter &&
+
+		git bundle verify partial.bdl >unfiltered &&
+		make_user_friendly_and_stable_output <unfiltered >actual &&
+
+		cat >expect <<-EOF &&
+		The bundle contains these 10 refs:
+		<COMMIT-P> refs/heads/main
+		<COMMIT-N> refs/heads/release
+		<COMMIT-D> refs/heads/topic/1
+		<COMMIT-H> refs/heads/topic/2
+		<COMMIT-D> refs/pull/1/head
+		<COMMIT-G> refs/pull/2/head
+		<TAG-1> refs/tags/v1
+		<TAG-2> refs/tags/v2
+		<TAG-3> refs/tags/v3
+		<COMMIT-P> HEAD
+		The bundle records a complete history.
+		$HASH_MESSAGE
+		The bundle uses this filter: $filter
+		EOF
+		test_cmp expect actual &&
+
+		test_config uploadpack.allowfilter 1 &&
+		test_config uploadpack.allowanysha1inwant 1 &&
+		git clone --no-local --filter=$filter --bare "file://$(pwd)" cloned &&
+
+		git init unbundled &&
+		git -C unbundled bundle unbundle ../partial.bdl >ref-list.txt &&
+		ls unbundled/.git/objects/pack/pack-*.promisor >promisor &&
+		test_line_count = 1 promisor &&
+
+		# Count the same number of reachable objects.
+		reflist=$(git for-each-ref --format="%(objectname)") &&
+		git rev-list --objects --filter=$filter --missing=allow-any \
+			$reflist >expect &&
+		for repo in cloned unbundled
+		do
+			git -C $repo rev-list --objects --missing=allow-any \
+				$reflist >actual &&
+			test_cmp expect actual || return 1
+		done
+	
+partial.bdl is okay
+Cloning into bare repository 'cloned'...
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/unbundled/.git/
+ok 22 - filtered bundle: blob:limit=100
+
+expecting success of 6020.23 'cloning from filtered bundle has useful error': 
+	git bundle create partial.bdl \
+		--all \
+		--filter=blob:none &&
+	test_must_fail git clone --bare partial.bdl partial 2>err &&
+	grep "cannot clone from filtered bundle" err
+
+fatal: cannot clone from filtered bundle
+ok 23 - cloning from filtered bundle has useful error
+
+expecting success of 6020.24 'verify catches unreachable, broken prerequisites': 
+	test_when_finished rm -rf clone-from clone-to &&
+	git init clone-from &&
+	(
+		cd clone-from &&
+		git checkout -b base &&
+		test_commit A &&
+		git checkout -b tip &&
+		git commit --allow-empty -m "will drop by shallow" &&
+		git commit --allow-empty -m "will keep by shallow" &&
+		git commit --allow-empty -m "for bundle, not clone" &&
+		git bundle create tip.bundle tip~1..tip &&
+		git reset --hard HEAD~1 &&
+		git checkout base
+	) &&
+	BAD_OID=$(git -C clone-from rev-parse tip~1) &&
+	TIP_OID=$(git -C clone-from rev-parse tip) &&
+	git clone --depth=1 --no-single-branch \
+		"file://$(pwd)/clone-from" clone-to &&
+	(
+		cd clone-to &&
+
+		# Set up broken history by removing shallow markers
+		git update-ref -d refs/remotes/origin/tip &&
+		rm .git/shallow &&
+
+		# Verify should fail
+		test_must_fail git bundle verify \
+			../clone-from/tip.bundle 2>err &&
+		grep "some prerequisite commits .* are not connected" err &&
+		test_line_count = 1 err &&
+
+		# Unbundling should fail
+		test_must_fail git bundle unbundle \
+			../clone-from/tip.bundle 2>err &&
+		grep "some prerequisite commits .* are not connected" err &&
+		test_line_count = 1 err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/clone-from/.git/
+Switched to a new branch 'base'
+[base (root-commit) 818c4b4] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'tip'
+[tip 55d0edb] will drop by shallow
+ Author: A U Thor <author@example.com>
+[tip 95b68c9] will keep by shallow
+ Author: A U Thor <author@example.com>
+[tip 67095cd] for bundle, not clone
+ Author: A U Thor <author@example.com>
+HEAD is now at 95b68c9 will keep by shallow
+Switched to branch 'base'
+Cloning into 'clone-to'...
+The bundle contains this ref:
+67095cdad769c1047892f03dc8fb54a849281a7c refs/heads/tip
+The bundle requires this ref:
+95b68c91366fa02ea282d8dc3dd5f5acae55d179 
+The bundle uses this hash algorithm: sha1
+error: some prerequisite commits exist in the object store, but are not connected to the repository's history
+error: some prerequisite commits exist in the object store, but are not connected to the repository's history
+ok 24 - verify catches unreachable, broken prerequisites
+
+expecting success of 6020.25 'bundle progress includes write phase': 
+	GIT_PROGRESS_DELAY=0 \
+		git bundle create --progress out.bundle --all 2>err &&
+	grep Writing err
+
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 952.00 KiB/s, done.
+ok 25 - bundle progress includes write phase
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 6020.26 'create --quiet disables all bundle progress': 
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git bundle create --quiet out.bundle --all 2>err &&
+	test_must_be_empty err
+
+ok 26 - create --quiet disables all bundle progress
+
+expecting success of 6020.27 'bundle progress with --no-quiet': 
+	GIT_PROGRESS_DELAY=0 \
+		git bundle create --no-quiet out.bundle --all 2>err &&
+	grep "%" err
+
+Counting objects:   2% (1/47)
Counting objects:   4% (2/47)
Counting objects:   6% (3/47)
Counting objects:   8% (4/47)
Counting objects:  10% (5/47)
Counting objects:  12% (6/47)
Counting objects:  14% (7/47)
Counting objects:  17% (8/47)
Counting objects:  19% (9/47)
Counting objects:  21% (10/47)
Counting objects:  23% (11/47)
Counting objects:  25% (12/47)
Counting objects:  27% (13/47)
Counting objects:  29% (14/47)
Counting objects:  31% (15/47)
Counting objects:  34% (16/47)
Counting objects:  36% (17/47)
Counting objects:  38% (18/47)
Counting objects:  40% (19/47)
Counting objects:  42% (20/47)
Counting objects:  44% (21/47)
Counting objects:  46% (22/47)
Counting objects:  48% (23/47)
Counting objects:  51% (24/47)
Counting objects:  53% (25/47)
Counting objects:  55% (26/47)
Counting objects:  57% (27/47)
Counting objects:  59% (28/47)
Counting objects:  61% (29/47)
Counting objects:  63% (30/47)
Counting objects:  65% (31/47)
Counting objects:  68% (32/47)
Counting objects:  70% (33/47)
Counting objects:  72% (34/47)
Counting objects:  74% (35/47)
Counting objects:  76% (36/47)
Counting objects:  78% (37/47)
Counting objects:  80% (38/47)
Counting objects:  82% (39/47)
Counting objects:  85% (40/47)
Counting objects:  87% (41/47)
Counting objects:  89% (42/47)
Counting objects:  91% (43/47)
Counting objects:  93% (44/47)
Counting objects:  95% (45/47)
Counting objects:  97% (46/47)
Counting objects: 100% (47/47)
Counting objects: 100% (47/47), done.
+Compressing objects:   3% (1/31)
Compressing objects:   6% (2/31)
Compressing objects:   9% (3/31)
Compressing objects:  12% (4/31)
Compressing objects:  16% (5/31)
Compressing objects:  19% (6/31)
Compressing objects:  22% (7/31)
Compressing objects:  25% (8/31)
Compressing objects:  29% (9/31)
Compressing objects:  32% (10/31)
Compressing objects:  35% (11/31)
Compressing objects:  38% (12/31)
Compressing objects:  41% (13/31)
Compressing objects:  45% (14/31)
Compressing objects:  48% (15/31)
Compressing objects:  51% (16/31)
Compressing objects:  54% (17/31)
Compressing objects:  58% (18/31)
Compressing objects:  61% (19/31)
Compressing objects:  64% (20/31)
Compressing objects:  67% (21/31)
Compressing objects:  70% (22/31)
Compressing objects:  74% (23/31)
Compressing objects:  77% (24/31)
Compressing objects:  80% (25/31)
Compressing objects:  83% (26/31)
Compressing objects:  87% (27/31)
Compressing objects:  90% (28/31)
Compressing objects:  93% (29/31)
Compressing objects:  96% (30/31)
Compressing objects: 100% (31/31)
Compressing objects: 100% (31/31), done.
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 423.00 KiB/s, done.
+ok 27 - bundle progress with --no-quiet
+
+expecting success of 6020.28 'read bundle over stdin': 
+	git bundle create some.bundle HEAD &&
+
+	git bundle verify - <some.bundle 2>err &&
+	grep "<stdin> is okay" err &&
+
+	git bundle list-heads some.bundle >expect &&
+	git bundle list-heads - <some.bundle >actual &&
+	test_cmp expect actual &&
+
+	git bundle unbundle some.bundle >expect &&
+	git bundle unbundle - <some.bundle >actual &&
+	test_cmp expect actual
+
+The bundle contains this ref:
+da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+<stdin> is okay
+ok 28 - read bundle over stdin
+
+expecting success of 6020.29 'send a bundle to standard output': 
+	git bundle create - --all HEAD >bundle-one &&
+	mkdir -p down &&
+	git -C down bundle create - --all HEAD >bundle-two &&
+	git bundle verify bundle-one &&
+	git bundle verify bundle-two &&
+	git ls-remote bundle-one >expect &&
+	git ls-remote bundle-two >actual &&
+	test_cmp expect actual
+
+bundle-one is okay
+The bundle contains these 10 refs:
+da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
+75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
+d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
+2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
+bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
+ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
+64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
+da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+bundle-two is okay
+The bundle contains these 10 refs:
+da43db66582d34cbfc17b239b8fcbf1431323fb5 refs/heads/main
+75dc67d2894ccd900ed1f4b992544e0a7df90d3a refs/heads/release
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/heads/topic/1
+d1a87a27cb017e8a16a8899db4d52c6adf190756 refs/heads/topic/2
+c01a682f2bdbfbbf50cd8e83539dd80b7b6207db refs/pull/1/head
+2ead555f48a6ed17cf79c8bce97af0ae7bf686fc refs/pull/2/head
+bb88e543a8e18a6087c5190d3dc2bf22b4a7682e refs/tags/v1
+ed9aedd63f3cc030121642c1c240a9117eb9a121 refs/tags/v2
+64694153379bb61e8d6713ea7273107893c2185c refs/tags/v3
+da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+ok 29 - send a bundle to standard output
+
+expecting success of 6020.30 'unbundle outside of a repository': 
+	git bundle create some.bundle HEAD &&
+	echo "fatal: Need a repository to unbundle." >expect &&
+	nongit test_must_fail git bundle unbundle "$(pwd)/some.bundle" 2>err &&
+	test_cmp expect err
+
+ok 30 - unbundle outside of a repository
+
+expecting success of 6020.31 'list-heads outside of a repository': 
+	git bundle create some.bundle HEAD &&
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	EOF
+	nongit git bundle list-heads "$(pwd)/some.bundle" >actual &&
+	test_cmp expect actual
+
+ok 31 - list-heads outside of a repository
+
+expecting success of 6020.32 'list-heads with bundle using sha1': 
+		test_when_finished "rm -rf hash" &&
+		git init --object-format=$hash hash &&
+		test_commit -C hash initial &&
+		git -C hash bundle create hash.bundle HEAD &&
+
+		cat >expect <<-EOF &&
+		$(git -C hash rev-parse HEAD) HEAD
+		EOF
+		git bundle list-heads hash/hash.bundle >actual &&
+		test_cmp expect actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/hash/.git/
+[main (root-commit) ee4b540] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 32 - list-heads with bundle using sha1
+
+expecting success of 6020.33 'list-heads with bundle using sha256': 
+		test_when_finished "rm -rf hash" &&
+		git init --object-format=$hash hash &&
+		test_commit -C hash initial &&
+		git -C hash bundle create hash.bundle HEAD &&
+
+		cat >expect <<-EOF &&
+		$(git -C hash rev-parse HEAD) HEAD
+		EOF
+		git bundle list-heads hash/hash.bundle >actual &&
+		test_cmp expect actual
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6020-bundle-misc/hash/.git/
+[main (root-commit) 8b2bc6b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 33 - list-heads with bundle using sha256
+
+# passed all 33 test(s)
+1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6135-pathspec-with-attrs.sh ***
@@ -409513,7 +409087,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 23 - check that attr magic works for git add --all
 
 expecting success of 6135.24 'check that attr magic works for git add -u': 
@@ -409679,7 +409252,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': 
@@ -409696,8 +409268,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 37 - builtin_objectmode attr can be excluded
 
 # passed all 37 test(s)
@@ -409975,629 +409545,322 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6403-merge-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6403-merge-file/.git/
-expecting success of 6403.1 'setup': 
-	cat >orig.txt <<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	EOF
-
-	cat >new1.txt <<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	cat >new2.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	EOF
-
-	cat >new3.txt <<-\EOF &&
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	EOF
-
-	cat >new4.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	EOF
-
-	printf "propter nomen suum." >>new4.txt &&
-
-	cat >base.c <<-\EOF &&
-	int f(int x, int y)
-	{
-		if (x == 0)
-		{
-			return y;
-		}
-		return x;
-	}
-
-	int g(size_t u)
-	{
-		while (u < 30)
-		{
-			u++;
-		}
-		return u;
-	}
-	EOF
-
-	cat >ours.c <<-\EOF &&
-	int g(size_t u)
-	{
-		while (u < 30)
-		{
-			u++;
-		}
-		return u;
-	}
-
-	int h(int x, int y, int z)
-	{
-		if (z == 0)
-		{
-			return x;
-		}
-		return y;
-	}
-	EOF
-
-	cat >theirs.c <<-\EOF
-	int f(int x, int y)
-	{
-		if (x == 0)
-		{
-			return y;
-		}
-		return x;
-	}
-
-	int g(size_t u)
-	{
-		while (u > 34)
-		{
-			u--;
-		}
-		return u;
-	}
-	EOF
-
-ok 1 - setup
-
-expecting success of 6403.2 'merge with no changes': 
-	cp orig.txt test.txt &&
-	git merge-file test.txt orig.txt orig.txt &&
-	test_cmp test.txt orig.txt
-
-ok 2 - merge with no changes
-
-expecting success of 6403.3 'merge with no changes with --object-id': 
-	git add orig.txt &&
-	git merge-file -p --object-id :orig.txt :orig.txt :orig.txt >actual &&
-	test_cmp actual orig.txt
-
-ok 3 - merge with no changes with --object-id
-
-expecting success of 6403.4 'merge without conflict': 
-	cp new1.txt test.txt &&
-	git merge-file test.txt orig.txt new2.txt
-
-ok 4 - merge without conflict
-
-expecting success of 6403.5 'merge without conflict with --object-id': 
-	git add orig.txt new2.txt &&
-	git merge-file --object-id :orig.txt :orig.txt :new2.txt >actual &&
-	git rev-parse :new2.txt >expected &&
-	test_cmp actual expected
-
-ok 5 - merge without conflict with --object-id
-
-expecting success of 6403.6 'can accept object ID with --object-id': 
-	git merge-file --object-id $(test_oid empty_blob) $(test_oid empty_blob) :new2.txt >actual &&
-	git rev-parse :new2.txt >expected &&
-	test_cmp actual expected
-
-ok 6 - can accept object ID with --object-id
-
-expecting success of 6403.7 'works in subdirectory': 
-	mkdir dir &&
-	cp new1.txt dir/a.txt &&
-	cp orig.txt dir/o.txt &&
-	cp new2.txt dir/b.txt &&
-	( cd dir && git merge-file a.txt o.txt b.txt ) &&
-	test_path_is_missing a.txt
-
-ok 7 - works in subdirectory
-
-expecting success of 6403.8 'merge without conflict (--quiet)': 
-	cp new1.txt test.txt &&
-	git merge-file --quiet test.txt orig.txt new2.txt
-
-ok 8 - merge without conflict (--quiet)
-
-checking known breakage of 6403.9 'merge without conflict (missing LF at EOF)': 
-	cp new1.txt test2.txt &&
-	git merge-file test2.txt orig.txt new4.txt
-
-not ok 9 - merge without conflict (missing LF at EOF) # TODO known breakage
-
-checking known breakage of 6403.10 'merge result added missing LF': 
-	test_cmp test.txt test2.txt
-
---- test.txt	2025-02-09 06:55:01.170076853 +0000
-+++ test2.txt	2025-02-09 06:55:01.174076879 +0000
-@@ -3,7 +3,11 @@
- super aquam refectionis educavit me;
- animam meam convertit,
- deduxit me super semitas jusitiae,
-+<<<<<<< test2.txt
- propter nomen suum.
- Nam et si ambulavero in medio umbrae mortis,
- non timebo mala, quoniam tu mecum es:
- virga tua et baculus tuus ipsa me consolata sunt.
-+=======
-+propter nomen suum.
-+>>>>>>> new4.txt
-not ok 10 - merge result added missing LF # TODO known breakage
-
-expecting success of 6403.11 'merge without conflict (missing LF at EOF, away from change in the other file)': 
-	cp new4.txt test3.txt &&
-	git merge-file --quiet test3.txt new2.txt new3.txt
-
-ok 11 - merge without conflict (missing LF at EOF, away from change in the other file)
-
-expecting success of 6403.12 'merge does not add LF away of change': 
-	cat >expect.txt <<-\EOF &&
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	EOF
-	printf "propter nomen suum." >>expect.txt &&
-
-	test_cmp expect.txt test3.txt
-
-ok 12 - merge does not add LF away of change
-
-expecting success of 6403.13 'merge with conflicts': 
-	cp test.txt backup.txt &&
-	test_must_fail git merge-file test.txt orig.txt new3.txt
-
-ok 13 - merge with conflicts
-
-expecting success of 6403.14 'expected conflict markers': 
-	cat >expect.txt <<-\EOF &&
-	<<<<<<< test.txt
-	Dominus regit me, et nihil mihi deerit.
-	=======
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	>>>>>>> new3.txt
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
-
-	test_cmp expect.txt test.txt
+*** t6401-merge-criss-cross.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-ok 14 - expected conflict markers
+	git branch A &&
+	git branch B &&
+	git checkout A &&
 
-expecting success of 6403.15 'merge with conflicts with --object-id': 
-	git add backup.txt orig.txt new3.txt &&
-	test_must_fail git merge-file -p --object-id :backup.txt :orig.txt :new3.txt >actual &&
-	sed -e "s/<< test.txt/<< :backup.txt/" \
-	    -e "s/>> new3.txt/>> :new3.txt/" \
-	    expect.txt >expect &&
-	test_cmp expect actual &&
-	test_must_fail git merge-file --object-id :backup.txt :orig.txt :new3.txt >oid &&
-	git cat-file blob "$(cat oid)" >actual &&
-	test_cmp expect actual
+	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 15 - merge with conflicts with --object-id
+	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 6403.16 'merge with conflicts with --object-id with labels': 
-	git add backup.txt orig.txt new3.txt &&
-	test_must_fail git merge-file -p --object-id \
-		-L test.txt -L orig.txt -L new3.txt \
-		:backup.txt :orig.txt :new3.txt >actual &&
-	test_cmp expect.txt actual &&
-	test_must_fail git merge-file --object-id \
-		-L test.txt -L orig.txt -L new3.txt \
-		:backup.txt :orig.txt :new3.txt >oid &&
-	git cat-file blob "$(cat oid)" >actual &&
-	test_cmp expect.txt actual
+	git merge -m "pre E3 merge" A &&
 
-ok 16 - merge with conflicts with --object-id with labels
+	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 6403.17 'merge conflicting with --ours': 
-	cp backup.txt test.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 >expect.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
+	git commit -m D8 file
 
-	git merge-file --ours test.txt orig.txt new3.txt &&
-	test_cmp expect.txt test.txt
+[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 17 - merge conflicting with --ours
+expecting success of 6401.2 'Criss-cross merge': 
+	git merge -m "final merge" B
 
-expecting success of 6403.18 'merge conflicting with --theirs': 
-	cp backup.txt test.txt &&
+  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 >expect.txt <<-\EOF &&
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
+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
 
-	git merge-file --theirs test.txt orig.txt new3.txt &&
-	test_cmp expect.txt test.txt
-
-ok 18 - merge conflicting with --theirs
+	test_cmp file-expect file
 
-expecting success of 6403.19 'merge conflicting with --union': 
-	cp backup.txt test.txt &&
+ok 3 - Criss-cross merge result
 
-	cat >expect.txt <<-\EOF &&
-	Dominus regit me, et nihil mihi deerit.
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
+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
 
-	git merge-file --union test.txt orig.txt new3.txt &&
-	test_cmp expect.txt test.txt
+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)
 
-ok 19 - merge conflicting with --union
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6404-recursive-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-expecting success of 6403.20 'merge with conflicts, using -L': 
-	cp backup.txt test.txt &&
+	git checkout -b A main &&
+	echo A >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
 
-	test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt
+	git checkout -b B main &&
+	echo B >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
 
-ok 20 - merge with conflicts, using -L
+	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.21 'expected conflict markers, with -L': 
-	cat >expect.txt <<-\EOF &&
-	<<<<<<< 1
-	Dominus regit me, et nihil mihi deerit.
-	=======
-	DOMINUS regit me,
-	et nihil mihi deerit.
-	>>>>>>> new3.txt
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam tu mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	EOF
+	git symbolic-ref HEAD refs/heads/other &&
+	echo 2 >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
 
-	test_cmp expect.txt test.txt
+	git checkout -b C &&
+	echo C >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
 
-ok 21 - expected conflict markers, with -L
+	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 &&
 
-expecting success of 6403.22 'conflict in removed tail': 
-	sed "s/ tu / TU /" <new1.txt >new5.txt &&
-	test_must_fail git merge-file -p orig.txt new1.txt new5.txt >out
+	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 &&
 
-ok 22 - conflict in removed tail
+	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 &&
 
-expecting success of 6403.23 'expected conflict markers': 
-	cat >expect <<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	<<<<<<< orig.txt
-	=======
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam TU mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
-	>>>>>>> new5.txt
+	test_oid_cache <<-EOF
+	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
+	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
 	EOF
 
-	test_cmp expect out
-
-ok 23 - expected conflict markers
-
-expecting success of 6403.24 'binary files cannot be merged': 
-	test_must_fail git merge-file -p \
-		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
-	grep "Cannot merge binary files" merge.err
-
-error: Cannot merge binary files: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-binary-1.png
-ok 24 - binary files cannot be merged
-
-expecting success of 6403.25 'binary files cannot be merged with --object-id': 
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
-	git add orig.txt new1.txt test-binary-1.png &&
-	test_must_fail git merge-file --object-id \
-		:orig.txt :test-binary-1.png :new1.txt 2> merge.err &&
-	grep "Cannot merge binary files" merge.err
-
-error: Cannot merge binary files: :test-binary-1.png
-ok 25 - binary files cannot be merged with --object-id
-
-expecting success of 6403.26 'MERGE_ZEALOUS simplifies non-conflicts': 
-	sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" <new5.txt >new6.txt &&
-	sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" <new5.txt >new7.txt &&
-
-	test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
-	test 1 = $(grep ======= <output | wc -l)
-
-ok 26 - MERGE_ZEALOUS simplifies non-conflicts
-
-expecting success of 6403.27 'ZEALOUS_ALNUM': 
-	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit;/" <new6.txt | tr % "\012" >new8.txt &&
-	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit --/" <new7.txt | tr % "\012" >new9.txt &&
+[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
 
-	test_must_fail git merge-file -p \
-		new8.txt new5.txt new9.txt >merge.out &&
-	test 1 = $(grep ======= <merge.out | wc -l)
+expecting success of 6404.2 'combined merge conflicts': 
+	test_must_fail git merge -m final G
 
-ok 27 - ZEALOUS_ALNUM
+  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 6403.28 '"diff3 -m" style output (1)': 
+expecting success of 6404.3 'result contains a conflict': 
 	cat >expect <<-\EOF &&
-	Dominus regit me,
-	<<<<<<< new8.txt
-	et nihil mihi deerit;
-
-
-
-
-	In loco pascuae ibi me collocavit;
-	super aquam refectionis educavit me.
-	||||||| new5.txt
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
+	<<<<<<< HEAD
+	F
 	=======
-	et nihil mihi deerit,
-
-
-
-
-	In loco pascuae ibi me collocavit --
-	super aquam refectionis educavit me,
-	>>>>>>> new9.txt
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam TU mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
+	G
+	>>>>>>> G
 	EOF
 
-	test_must_fail git merge-file -p --diff3 \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-
-ok 28 - "diff3 -m" style output (1)
-
-expecting success of 6403.29 '"diff3 -m" style output (2)': 
-	git config merge.conflictstyle diff3 &&
-	test_must_fail git merge-file -p \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-
-ok 29 - "diff3 -m" style output (2)
-
-expecting success of 6403.30 'marker size': 
-	cat >expect <<-\EOF &&
-	Dominus regit me,
-	<<<<<<<<<< new8.txt
-	et nihil mihi deerit;
-
-
-
-
-	In loco pascuae ibi me collocavit;
-	super aquam refectionis educavit me.
-	|||||||||| new5.txt
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	==========
-	et nihil mihi deerit,
-
+	test_cmp expect a1
 
+ok 3 - result contains a conflict
 
+expecting success of 6404.4 'virtual trees were processed': 
+	# TODO: fragile test, relies on ambiguous merge-base resolution
+	git ls-files --stage >out &&
 
-	In loco pascuae ibi me collocavit --
-	super aquam refectionis educavit me,
-	>>>>>>>>>> new9.txt
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	Nam et si ambulavero in medio umbrae mortis,
-	non timebo mala, quoniam TU mecum es:
-	virga tua et baculus tuus ipsa me consolata sunt.
+	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_must_fail git merge-file -p --marker-size=10 \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-
-ok 30 - marker size
-
-expecting success of 6403.31 'conflict at EOF without LF resolved by --ours': 
-	printf "line1\nline2\nline3" >nolf-orig.txt &&
-	printf "line1\nline2\nline3x" >nolf-diff1.txt &&
-	printf "line1\nline2\nline3y" >nolf-diff2.txt &&
-
-	git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	printf "line1\nline2\nline3x" >expect.txt &&
-	test_cmp expect.txt output.txt
-
-ok 31 - conflict at EOF without LF resolved by --ours
-
-expecting success of 6403.32 'conflict at EOF without LF resolved by --theirs': 
-	git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	printf "line1\nline2\nline3y" >expect.txt &&
-	test_cmp expect.txt output.txt
-
-ok 32 - conflict at EOF without LF resolved by --theirs
-
-expecting success of 6403.33 'conflict at EOF without LF resolved by --union': 
-	git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	printf "line1\nline2\nline3x\nline3y" >expect.txt &&
-	test_cmp expect.txt output.txt
-
-ok 33 - conflict at EOF without LF resolved by --union
-
-expecting success of 6403.34 'conflict sections match existing line endings': 
-	printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
-	printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
-	printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
-	test_must_fail git -c core.eol=crlf merge-file -p \
-		crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
-	test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
-	test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
-	test_must_fail git -c core.eol=crlf merge-file -p \
-		nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
-	test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
-
-ok 34 - conflict sections match existing line endings
-
-expecting success of 6403.35 '--object-id fails without repository': 
-	empty="$(test_oid empty_blob)" &&
-	nongit test_must_fail git merge-file --object-id $empty $empty $empty 2>err &&
-	grep "not a git repository" err
-
-fatal: not a git repository (or any of the parent directories): .git
-ok 35 - --object-id fails without repository
-
-expecting success of 6403.36 'merging C files with "myers" diff algorithm creates some spurious conflicts': 
-	cat >expect.c <<-\EOF &&
-	int g(size_t u)
-	{
-		while (u < 30)
-		{
-			u++;
-		}
-		return u;
-	}
-
-	int h(int x, int y, int z)
-	{
-	<<<<<<< ours.c
-		if (z == 0)
-	||||||| base.c
-		while (u < 30)
-	=======
-		while (u > 34)
-	>>>>>>> theirs.c
-		{
-	<<<<<<< ours.c
-			return x;
-	||||||| base.c
-			u++;
-	=======
-			u--;
-	>>>>>>> theirs.c
-		}
-		return y;
-	}
-	EOF
+	test_cmp expect out
 
-	test_must_fail git merge-file -p --diff3 --diff-algorithm myers ours.c base.c theirs.c >myers_output.c &&
-	test_cmp expect.c myers_output.c
+ok 4 - virtual trees were processed
 
-ok 36 - merging C files with "myers" diff algorithm creates some spurious conflicts
+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
 
-expecting success of 6403.37 'merging C files with "histogram" diff algorithm avoids some spurious conflicts': 
-	cat >expect.c <<-\EOF &&
-	int g(size_t u)
-	{
-		while (u > 34)
-		{
-			u--;
-		}
-		return u;
-	}
+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
 
-	int h(int x, int y, int z)
-	{
-		if (z == 0)
-		{
-			return x;
-		}
-		return y;
-	}
-	EOF
+expecting success of 6404.6 'mark rename/delete as unmerged': 
 
-	git merge-file -p --diff3 --diff-algorithm histogram ours.c base.c theirs.c >histogram_output.c &&
-	test_cmp expect.c histogram_output.c
+	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
 
-ok 37 - merging C files with "histogram" diff algorithm avoids some spurious conflicts
+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
 
-# still have 2 known breakage(s)
-# passed all remaining 35 test(s)
-1..37
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6405-merge-symlinks.sh ***
@@ -411413,432 +410676,629 @@
 1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6404-recursive-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t6403-merge-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 checkout -b A main &&
-	echo A >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+	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
 
-	git checkout -b B main &&
-	echo B >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+	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
 
-	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 &&
+	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 symbolic-ref HEAD refs/heads/other &&
-	echo 2 >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+	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
 
-	git checkout -b C &&
-	echo C >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+	printf "propter nomen suum." >>new4.txt &&
 
-	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 &&
+	cat >base.c <<-\EOF &&
+	int f(int x, int y)
+	{
+		if (x == 0)
+		{
+			return y;
+		}
+		return x;
+	}
 
-	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 &&
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
+	EOF
 
-	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 &&
+	cat >ours.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
 
-	test_oid_cache <<-EOF
-	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
-	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
+	int h(int x, int y, int z)
+	{
+		if (z == 0)
+		{
+			return x;
+		}
+		return y;
+	}
 	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
+	cat >theirs.c <<-\EOF
+	int f(int x, int y)
+	{
+		if (x == 0)
+		{
+			return y;
+		}
+		return x;
+	}
 
-expecting success of 6404.2 'combined merge conflicts': 
-	test_must_fail git merge -m final G
+	int g(size_t u)
+	{
+		while (u > 34)
+		{
+			u--;
+		}
+		return u;
+	}
+	EOF
 
-  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
+ok 1 - setup
 
-expecting success of 6404.3 'result contains a conflict': 
-	cat >expect <<-\EOF &&
-	<<<<<<< HEAD
-	F
+expecting success of 6403.2 'merge with no changes': 
+	cp orig.txt test.txt &&
+	git merge-file test.txt orig.txt orig.txt &&
+	test_cmp test.txt orig.txt
+
+ok 2 - merge with no changes
+
+expecting success of 6403.3 'merge with no changes with --object-id': 
+	git add orig.txt &&
+	git merge-file -p --object-id :orig.txt :orig.txt :orig.txt >actual &&
+	test_cmp actual orig.txt
+
+ok 3 - merge with no changes with --object-id
+
+expecting success of 6403.4 'merge without conflict': 
+	cp new1.txt test.txt &&
+	git merge-file test.txt orig.txt new2.txt
+
+ok 4 - merge without conflict
+
+expecting success of 6403.5 'merge without conflict with --object-id': 
+	git add orig.txt new2.txt &&
+	git merge-file --object-id :orig.txt :orig.txt :new2.txt >actual &&
+	git rev-parse :new2.txt >expected &&
+	test_cmp actual expected
+
+ok 5 - merge without conflict with --object-id
+
+expecting success of 6403.6 'can accept object ID with --object-id': 
+	git merge-file --object-id $(test_oid empty_blob) $(test_oid empty_blob) :new2.txt >actual &&
+	git rev-parse :new2.txt >expected &&
+	test_cmp actual expected
+
+ok 6 - can accept object ID with --object-id
+
+expecting success of 6403.7 'works in subdirectory': 
+	mkdir dir &&
+	cp new1.txt dir/a.txt &&
+	cp orig.txt dir/o.txt &&
+	cp new2.txt dir/b.txt &&
+	( cd dir && git merge-file a.txt o.txt b.txt ) &&
+	test_path_is_missing a.txt
+
+ok 7 - works in subdirectory
+
+expecting success of 6403.8 'merge without conflict (--quiet)': 
+	cp new1.txt test.txt &&
+	git merge-file --quiet test.txt orig.txt new2.txt
+
+ok 8 - merge without conflict (--quiet)
+
+checking known breakage of 6403.9 'merge without conflict (missing LF at EOF)': 
+	cp new1.txt test2.txt &&
+	git merge-file test2.txt orig.txt new4.txt
+
+not ok 9 - merge without conflict (missing LF at EOF) # TODO known breakage
+
+checking known breakage of 6403.10 'merge result added missing LF': 
+	test_cmp test.txt test2.txt
+
+--- test.txt	2026-03-14 13:34:23.278677808 +0000
++++ test2.txt	2026-03-14 13:34:23.334677808 +0000
+@@ -3,7 +3,11 @@
+ super aquam refectionis educavit me;
+ animam meam convertit,
+ deduxit me super semitas jusitiae,
++<<<<<<< test2.txt
+ propter nomen suum.
+ Nam et si ambulavero in medio umbrae mortis,
+ non timebo mala, quoniam tu mecum es:
+ virga tua et baculus tuus ipsa me consolata sunt.
++=======
++propter nomen suum.
++>>>>>>> new4.txt
+not ok 10 - merge result added missing LF # TODO known breakage
+
+expecting success of 6403.11 'merge without conflict (missing LF at EOF, away from change in the other file)': 
+	cp new4.txt test3.txt &&
+	git merge-file --quiet test3.txt new2.txt new3.txt
+
+ok 11 - merge without conflict (missing LF at EOF, away from change in the other file)
+
+expecting success of 6403.12 'merge does not add LF away of change': 
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	EOF
+	printf "propter nomen suum." >>expect.txt &&
+
+	test_cmp expect.txt test3.txt
+
+ok 12 - merge does not add LF away of change
+
+expecting success of 6403.13 'merge with conflicts': 
+	cp test.txt backup.txt &&
+	test_must_fail git merge-file test.txt orig.txt new3.txt
+
+ok 13 - merge with conflicts
+
+expecting success of 6403.14 'expected conflict markers': 
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< test.txt
+	Dominus regit me, et nihil mihi deerit.
 	=======
-	G
-	>>>>>>> G
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
 	EOF
 
-	test_cmp expect a1
+	test_cmp expect.txt test.txt
 
-ok 3 - result contains a conflict
+ok 14 - expected conflict markers
 
-expecting success of 6404.4 'virtual trees were processed': 
-	# TODO: fragile test, relies on ambiguous merge-base resolution
-	git ls-files --stage >out &&
+expecting success of 6403.15 'merge with conflicts with --object-id': 
+	git add backup.txt orig.txt new3.txt &&
+	test_must_fail git merge-file -p --object-id :backup.txt :orig.txt :new3.txt >actual &&
+	sed -e "s/<< test.txt/<< :backup.txt/" \
+	    -e "s/>> new3.txt/>> :new3.txt/" \
+	    expect.txt >expect &&
+	test_cmp expect actual &&
+	test_must_fail git merge-file --object-id :backup.txt :orig.txt :new3.txt >oid &&
+	git cat-file blob "$(cat oid)" >actual &&
+	test_cmp expect actual
 
-	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
+ok 15 - merge with conflicts with --object-id
+
+expecting success of 6403.16 'merge with conflicts with --object-id with labels': 
+	git add backup.txt orig.txt new3.txt &&
+	test_must_fail git merge-file -p --object-id \
+		-L test.txt -L orig.txt -L new3.txt \
+		:backup.txt :orig.txt :new3.txt >actual &&
+	test_cmp expect.txt actual &&
+	test_must_fail git merge-file --object-id \
+		-L test.txt -L orig.txt -L new3.txt \
+		:backup.txt :orig.txt :new3.txt >oid &&
+	git cat-file blob "$(cat oid)" >actual &&
+	test_cmp expect.txt actual
+
+ok 16 - merge with conflicts with --object-id with labels
+
+expecting success of 6403.17 'merge conflicting with --ours': 
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --ours test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+
+ok 17 - merge conflicting with --ours
+
+expecting success of 6403.18 'merge conflicting with --theirs': 
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --theirs test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+
+ok 18 - merge conflicting with --theirs
+
+expecting success of 6403.19 'merge conflicting with --union': 
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --union test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+
+ok 19 - merge conflicting with --union
+
+expecting success of 6403.20 'merge with conflicts, using -L': 
+	cp backup.txt test.txt &&
+
+	test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt
+
+ok 20 - merge with conflicts, using -L
+
+expecting success of 6403.21 'expected conflict markers, with -L': 
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< 1
+	Dominus regit me, et nihil mihi deerit.
+	=======
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_cmp expect.txt test.txt
+
+ok 21 - expected conflict markers, with -L
+
+expecting success of 6403.22 'conflict in removed tail': 
+	sed "s/ tu / TU /" <new1.txt >new5.txt &&
+	test_must_fail git merge-file -p orig.txt new1.txt new5.txt >out
+
+ok 22 - conflict in removed tail
+
+expecting success of 6403.23 'expected conflict markers': 
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	<<<<<<< orig.txt
+	=======
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	>>>>>>> new5.txt
 	EOF
 
 	test_cmp expect out
 
-ok 4 - virtual trees were processed
+ok 23 - expected conflict markers
 
-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
+expecting success of 6403.24 'binary files cannot be merged': 
+	test_must_fail git merge-file -p \
+		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
+	grep "Cannot merge binary files" merge.err
 
-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
+error: Cannot merge binary files: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-binary-1.png
+ok 24 - binary files cannot be merged
 
-expecting success of 6404.6 'mark rename/delete as unmerged': 
+expecting success of 6403.25 'binary files cannot be merged with --object-id': 
+	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	git add orig.txt new1.txt test-binary-1.png &&
+	test_must_fail git merge-file --object-id \
+		:orig.txt :test-binary-1.png :new1.txt 2> merge.err &&
+	grep "Cannot merge binary files" merge.err
 
-	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
+error: Cannot merge binary files: :test-binary-1.png
+ok 25 - binary files cannot be merged with --object-id
 
-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
+expecting success of 6403.26 'MERGE_ZEALOUS simplifies non-conflicts': 
+	sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" <new5.txt >new6.txt &&
+	sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" <new5.txt >new7.txt &&
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6407-merge-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6407-merge-binary/.git/
-expecting success of 6407.1 'setup': 
+	test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
+	test 1 = $(grep ======= <output | wc -l)
 
-	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" &&
+ok 26 - MERGE_ZEALOUS simplifies non-conflicts
 
-	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" &&
+expecting success of 6403.27 'ZEALOUS_ALNUM': 
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit;/" <new6.txt | tr % "\012" >new8.txt &&
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit --/" <new7.txt | tr % "\012" >new9.txt &&
 
-	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" &&
+	test_must_fail git merge-file -p \
+		new8.txt new5.txt new9.txt >merge.out &&
+	test 1 = $(grep ======= <merge.out | wc -l)
 
-	git tag anchor &&
+ok 27 - ZEALOUS_ALNUM
 
-	cat E0 E1 E2 E3 >expect
+expecting success of 6403.28 '"diff3 -m" style output (1)': 
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<< new8.txt
+	et nihil mihi deerit;
 
-[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
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	=======
+	et nihil mihi deerit,
 
-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_GUBMqE
-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
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_must_fail git merge-file -p --diff3 \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+
+ok 28 - "diff3 -m" style output (1)
+
+expecting success of 6403.29 '"diff3 -m" style output (2)': 
+	git config merge.conflictstyle diff3 &&
+	test_must_fail git merge-file -p \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+
+ok 29 - "diff3 -m" style output (2)
+
+expecting success of 6403.30 'marker size': 
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<<<<< new8.txt
+	et nihil mihi deerit;
+
 
-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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6408-merge-up-to-date.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6408-merge-up-to-date/.git/
-expecting success of 6408.1 'setup': 
-	>file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git tag c0 &&
 
-	echo second >file &&
-	git add file &&
-	test_tick &&
-	git commit -m second &&
-	git tag c1 &&
-	git branch test &&
-	echo third >file &&
-	git add file &&
-	test_tick &&
-	git commit -m third &&
-	git tag c2
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	|||||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	==========
+	et nihil mihi deerit,
 
-[master (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master e042178] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 52cad15] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
 
-expecting success of 6408.2 'merge -s recursive up-to-date': 
 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s recursive c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
 
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
 
-HEAD is now at e042178 second
-Already up to date.
-ok 2 - merge -s recursive up-to-date
+	test_must_fail git merge-file -p --marker-size=10 \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
 
-expecting success of 6408.3 'merge -s recursive fast-forward': 
+ok 30 - marker size
 
-	git reset --hard c0 &&
-	test_tick &&
-	git merge -s recursive c1 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
+expecting success of 6403.31 'conflict at EOF without LF resolved by --ours': 
+	printf "line1\nline2\nline3" >nolf-orig.txt &&
+	printf "line1\nline2\nline3x" >nolf-diff1.txt &&
+	printf "line1\nline2\nline3y" >nolf-diff2.txt &&
 
+	git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x" >expect.txt &&
+	test_cmp expect.txt output.txt
 
-HEAD is now at 1bd44cb initial
-Updating 1bd44cb..e042178
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-ok 3 - merge -s recursive fast-forward
+ok 31 - conflict at EOF without LF resolved by --ours
 
-expecting success of 6408.4 'merge -s ours up-to-date': 
+expecting success of 6403.32 'conflict at EOF without LF resolved by --theirs': 
+	git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s ours c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
+ok 32 - conflict at EOF without LF resolved by --theirs
 
+expecting success of 6403.33 'conflict at EOF without LF resolved by --union': 
+	git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
 
-HEAD is now at e042178 second
-Already up to date.
-ok 4 - merge -s ours up-to-date
+ok 33 - conflict at EOF without LF resolved by --union
 
-expecting success of 6408.5 'merge -s ours fast-forward': 
+expecting success of 6403.34 'conflict sections match existing line endings': 
+	printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
+	printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
+	printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
+	test_must_fail git -c core.eol=crlf merge-file -p \
+		crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
+	test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
+	test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
+	test_must_fail git -c core.eol=crlf merge-file -p \
+		nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
+	test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
 
-	git reset --hard c0 &&
-	test_tick &&
-	git merge -s ours c1 &&
-	expect=$(git rev-parse c0^{tree}) &&
-	current=$(git rev-parse HEAD^{tree}) &&
-	test "$expect" = "$current"
+ok 34 - conflict sections match existing line endings
 
+expecting success of 6403.35 '--object-id fails without repository': 
+	empty="$(test_oid empty_blob)" &&
+	nongit test_must_fail git merge-file --object-id $empty $empty $empty 2>err &&
+	grep "not a git repository" err
 
-HEAD is now at 1bd44cb initial
-Merge made by the 'ours' strategy.
-ok 5 - merge -s ours fast-forward
+fatal: not a git repository (or any of the parent directories): .git
+ok 35 - --object-id fails without repository
 
-expecting success of 6408.6 'merge -s subtree up-to-date': 
+expecting success of 6403.36 'merging C files with "myers" diff algorithm creates some spurious conflicts': 
+	cat >expect.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s subtree c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
+	int h(int x, int y, int z)
+	{
+	<<<<<<< ours.c
+		if (z == 0)
+	||||||| base.c
+		while (u < 30)
+	=======
+		while (u > 34)
+	>>>>>>> theirs.c
+		{
+	<<<<<<< ours.c
+			return x;
+	||||||| base.c
+			u++;
+	=======
+			u--;
+	>>>>>>> theirs.c
+		}
+		return y;
+	}
+	EOF
 
+	test_must_fail git merge-file -p --diff3 --diff-algorithm myers ours.c base.c theirs.c >myers_output.c &&
+	test_cmp expect.c myers_output.c
 
-HEAD is now at e042178 second
-Already up to date.
-ok 6 - merge -s subtree up-to-date
+ok 36 - merging C files with "myers" diff algorithm creates some spurious conflicts
 
-expecting success of 6408.7 'merge fast-forward octopus': 
+expecting success of 6403.37 'merging C files with "histogram" diff algorithm avoids some spurious conflicts': 
+	cat >expect.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u > 34)
+		{
+			u--;
+		}
+		return u;
+	}
 
-	git reset --hard c0 &&
-	test_tick &&
-	git merge c1 c2 &&
-	expect=$(git rev-parse c2) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
+	int h(int x, int y, int z)
+	{
+		if (z == 0)
+		{
+			return x;
+		}
+		return y;
+	}
+	EOF
 
-HEAD is now at 1bd44cb initial
-Updating 1bd44cb..52cad15
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-ok 7 - merge fast-forward octopus
+	git merge-file -p --diff3 --diff-algorithm histogram ours.c base.c theirs.c >histogram_output.c &&
+	test_cmp expect.c histogram_output.c
 
-# passed all 7 test(s)
-1..7
+ok 37 - merging C files with "histogram" diff algorithm avoids some spurious conflicts
+
+# still have 2 known breakage(s)
+# passed all remaining 35 test(s)
+1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6200-fmt-merge-msg.sh ***
@@ -412818,323 +412278,217 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6413-merge-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t6407-merge-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 line from a | append_cr >file &&
-	git commit -m "add line from a" file &&
-	git tag a &&
+	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 line from b | append_cr >file &&
-	git commit -m "add line from b" file &&
-	git tag b &&
-	git checkout main
+	echo rezrov >>m &&
+	git add m &&
+	git ls-files -s m | sed -e "s/ 0	/ 2	/" >E2 &&
+	test_tick &&
+	git commit -m "side modifies" &&
 
-[main (root-commit) e0f7379] Initial
+	git tag anchor &&
+
+	cat E0 E1 E2 E3 >expect
+
+[main (root-commit) f315366] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 8798c05] add line from a
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 m
+[main f94be88] main adds some
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 1 insertion(+)
+ create mode 100644 a
 Switched to branch 'side'
-[side 5296996] add line from b
+[side 020cbcd] side modifies
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 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
+expecting success of 6407.2 'resolve': 
 
-HEAD is now at e0f7379 Initial
-Merge made by the 'ours' strategy.
-ok 2 - Check "ours" is CRLF
+	rm -f a* m* &&
+	git reset --hard anchor &&
 
-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
+	test_must_fail git merge -s resolve main &&
+	git ls-files -s >current &&
+	test_cmp expect current
 
-HEAD is now at 8798c05 add line from a
-Auto-merging file
-CONFLICT (content): Merge conflict in file
+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_LqAKlK
+ERROR: content conflict in m
+fatal: merge program failed
 Automatic merge failed; fix conflicts and then commit the result.
-ok 3 - Check that conflict file is CRLF
+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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6409-merge-subtree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6409-merge-subtree/.git/
-expecting success of 6409.1 'setup': 
-
-	s="1 2 3 4 5 6 7 8" &&
-	test_write_lines $s >hello &&
-	git add hello &&
+*** t6408-merge-up-to-date.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6408-merge-up-to-date/.git/
+expecting success of 6408.1 'setup': 
+	>file &&
+	git add file &&
+	test_tick &&
 	git commit -m initial &&
-	git checkout -b side &&
-	echo >>hello world &&
-	git add hello &&
-	git commit -m second &&
-	git checkout main &&
-	test_write_lines mundo $s >hello &&
-	git add hello &&
-	git commit -m main
+	git tag c0 &&
 
+	echo second >file &&
+	git add file &&
+	test_tick &&
+	git commit -m second &&
+	git tag c1 &&
+	git branch test &&
+	echo third >file &&
+	git add file &&
+	test_tick &&
+	git commit -m third &&
+	git tag c2
 
-[main (root-commit) 0333478] initial
+[master (root-commit) 1bd44cb] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 hello
-Switched to a new branch 'side'
-[side 9067c9d] second
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master e042178] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'main'
-[main 88d037e] main
+[master 52cad15] third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 6409.2 'subtree available and works like recursive': 
+expecting success of 6408.2 'merge -s recursive up-to-date': 
 
-	git merge -s subtree side &&
-	test_write_lines mundo $s world >expect &&
-	test_cmp expect hello
+	git reset --hard c1 &&
+	test_tick &&
+	git merge -s recursive c0 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
 
 
-Merging:
-88d037e main
-virtual side
-found 1 common ancestor:
-0333478 initial
-Auto-merging hello
-Merge made by the 'subtree' strategy.
- hello | 1 +
- 1 file changed, 1 insertion(+)
-ok 2 - subtree available and works like recursive
+HEAD is now at e042178 second
+Already up to date.
+ok 2 - merge -s recursive up-to-date
 
-expecting success of 6409.3 'setup branch sub': 
-	git checkout --orphan sub &&
-	git rm -rf . &&
-	test_commit foo
+expecting success of 6408.3 'merge -s recursive fast-forward': 
 
-Switched to a new branch 'sub'
-rm 'hello'
-[sub (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 3 - setup branch sub
+	git reset --hard c0 &&
+	test_tick &&
+	git merge -s recursive c1 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
 
-expecting success of 6409.4 'setup topic branch': 
-	git checkout -b topic main &&
-	git merge -s ours --no-commit --allow-unrelated-histories sub &&
-	git read-tree --prefix=dir/ -u sub &&
-	git commit -m "initial merge of sub into topic" &&
-	test_path_is_file dir/foo.t &&
-	test_path_is_file hello
 
-Switched to a new branch 'topic'
-Automatic merge went well; stopped before committing as requested
-[topic a9c3c06] initial merge of sub into topic
- Author: A U Thor <author@example.com>
-ok 4 - setup topic branch
+HEAD is now at 1bd44cb initial
+Updating 1bd44cb..e042178
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+ok 3 - merge -s recursive fast-forward
 
-expecting success of 6409.5 'update branch sub': 
-	git checkout sub &&
-	test_commit bar
+expecting success of 6408.4 'merge -s ours up-to-date': 
 
-Switched to branch 'sub'
-[sub 46a08c5] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 5 - update branch sub
+	git reset --hard c1 &&
+	test_tick &&
+	git merge -s ours c0 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
 
-expecting success of 6409.6 'update topic branch': 
-	git checkout topic &&
-	git merge -s subtree sub -m "second merge of sub into topic" &&
-	test_path_is_file dir/bar.t &&
-	test_path_is_file dir/foo.t &&
-	test_path_is_file hello
 
-Switched to branch 'topic'
-Merging:
-a9c3c06 initial merge of sub into topic
-virtual sub
-found 1 common ancestor:
-ddd63c9 foo
-Merge made by the 'subtree' strategy.
- dir/bar.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/bar.t
-ok 6 - update topic branch
+HEAD is now at e042178 second
+Already up to date.
+ok 4 - merge -s ours up-to-date
 
-expecting success of 6409.7 'setup': 
-	mkdir git-gui &&
-	cd git-gui &&
-	git init &&
-	echo git-gui > git-gui.sh &&
-	o1=$(git hash-object git-gui.sh) &&
-	git add git-gui.sh &&
-	git commit -m "initial git-gui" &&
-	cd .. &&
-	mkdir git &&
-	cd git &&
-	git init &&
-	echo git >git.c &&
-	o2=$(git hash-object git.c) &&
-	git add git.c &&
-	git commit -m "initial git"
+expecting success of 6408.5 'merge -s ours fast-forward': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6409-merge-subtree/git-gui/.git/
-[main (root-commit) a175596] initial git-gui
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git-gui.sh
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6409-merge-subtree/git/.git/
-[main (root-commit) 724c210] initial git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git.c
-ok 7 - setup
+	git reset --hard c0 &&
+	test_tick &&
+	git merge -s ours c1 &&
+	expect=$(git rev-parse c0^{tree}) &&
+	current=$(git rev-parse HEAD^{tree}) &&
+	test "$expect" = "$current"
 
-expecting success of 6409.8 'initial merge': 
-	git remote add -f gui ../git-gui &&
-	git merge -s ours --no-commit --allow-unrelated-histories gui/main &&
-	git read-tree --prefix=git-gui/ -u gui/main &&
-	git commit -m "Merge git-gui as our subdirectory" &&
-	git checkout -b work &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	git-gui/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
 
-Updating gui
-From ../git-gui
- * [new branch]      main       -> gui/main
-Automatic merge went well; stopped before committing as requested
-[main b741856] Merge git-gui as our subdirectory
- Author: A U Thor <author@example.com>
-Switched to a new branch 'work'
-ok 8 - initial merge
+HEAD is now at 1bd44cb initial
+Merge made by the 'ours' strategy.
+ok 5 - merge -s ours fast-forward
 
-expecting success of 6409.9 'merge update': 
-	cd ../git-gui &&
-	echo git-gui2 > git-gui.sh &&
-	o3=$(git hash-object git-gui.sh) &&
-	git add git-gui.sh &&
-	git checkout -b topic_2 &&
-	git commit -m "update git-gui" &&
-	cd ../git &&
-	git pull --no-rebase -s subtree gui topic_2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o3 0	git-gui/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
+expecting success of 6408.6 'merge -s subtree up-to-date': 
 
-Switched to a new branch 'topic_2'
-[topic_2 c9333be] update git-gui
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../git-gui
- * branch            topic_2    -> FETCH_HEAD
- * [new branch]      topic_2    -> gui/topic_2
-Merging:
-b741856 Merge git-gui as our subdirectory
-virtual c9333bebe07f90e76933cfa634ab72516dede3df
-found 1 common ancestor:
-a175596 initial git-gui
-Merge made by the 'subtree' strategy.
- git-gui/git-gui.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - merge update
+	git reset --hard c1 &&
+	test_tick &&
+	git merge -s subtree c0 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
 
-expecting success of 6409.10 'initial ambiguous subtree': 
-	cd ../git &&
-	git reset --hard main &&
-	git checkout -b topic_2 &&
-	git merge -s ours --no-commit gui/main &&
-	git read-tree --prefix=git-gui2/ -u gui/main &&
-	git commit -m "Merge git-gui2 as our subdirectory" &&
-	git checkout -b work2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	git-gui/git-gui.sh" &&
-		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
 
-HEAD is now at b741856 Merge git-gui as our subdirectory
-Switched to a new branch 'topic_2'
+HEAD is now at e042178 second
 Already up to date.
-[topic_2 b1fd074] Merge git-gui2 as our subdirectory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git-gui2/git-gui.sh
-Switched to a new branch 'work2'
-ok 10 - initial ambiguous subtree
-
-expecting success of 6409.11 'merge using explicit': 
-	cd ../git &&
-	git reset --hard topic_2 &&
-	git pull --no-rebase -Xsubtree=git-gui gui topic_2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o3 0	git-gui/git-gui.sh" &&
-		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
+ok 6 - merge -s subtree up-to-date
 
-HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
-From ../git-gui
- * branch            topic_2    -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- git-gui/git-gui.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - merge using explicit
+expecting success of 6408.7 'merge fast-forward octopus': 
 
-expecting success of 6409.12 'merge2 using explicit': 
-	cd ../git &&
-	git reset --hard topic_2 &&
-	git pull --no-rebase -Xsubtree=git-gui2 gui topic_2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	git-gui/git-gui.sh" &&
-		echo "100644 $o3 0	git-gui2/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
+	git reset --hard c0 &&
+	test_tick &&
+	git merge c1 c2 &&
+	expect=$(git rev-parse c2) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
 
-HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
-From ../git-gui
- * branch            topic_2    -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- git-gui2/git-gui.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 12 - merge2 using explicit
+HEAD is now at 1bd44cb initial
+Updating 1bd44cb..52cad15
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+ok 7 - merge fast-forward octopus
 
-# passed all 12 test(s)
-1..12
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6406-merge-attr.sh ***
@@ -413560,413 +412914,265 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6414-merge-rename-nocruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6414-merge-rename-nocruft/.git/
-expecting success of 6414.1 'setup': 
-	cat >A <<-\EOF &&
-	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-	c cccccccccccccccccccccccccccccccccccccccccccccccc
-	d dddddddddddddddddddddddddddddddddddddddddddddddd
-	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-	f ffffffffffffffffffffffffffffffffffffffffffffffff
-	g gggggggggggggggggggggggggggggggggggggggggggggggg
-	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-	l llllllllllllllllllllllllllllllllllllllllllllllll
-	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-	o oooooooooooooooooooooooooooooooooooooooooooooooo
-	EOF
-
-	cat >M <<-\EOF &&
-	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-	EOF
-
-	git add A M &&
-	git commit -m "initial has A and M" &&
-	git branch white &&
-	git branch red &&
-	git branch blue &&
-
-	git checkout white &&
-	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-	rm -f A M &&
-	git update-index --add --remove A B M N &&
-	git commit -m "white renames A->B, M->N" &&
-
-	git checkout red &&
-	echo created by red >R &&
-	git update-index --add R &&
-	git commit -m "red creates R" &&
+*** t6409-merge-subtree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6409-merge-subtree/.git/
+expecting success of 6409.1 'setup': 
 
-	git checkout blue &&
-	sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
-	rm -f A &&
-	mv B A &&
-	git update-index A &&
-	git commit -m "blue modify A" &&
+	s="1 2 3 4 5 6 7 8" &&
+	test_write_lines $s >hello &&
+	git add hello &&
+	git commit -m initial &&
+	git checkout -b side &&
+	echo >>hello world &&
+	git add hello &&
+	git commit -m second &&
+	git checkout main &&
+	test_write_lines mundo $s >hello &&
+	git add hello &&
+	git commit -m main
 
-	git checkout main
 
-[main (root-commit) 7bbb60a] initial has A and M
- Author: A U Thor <author@example.com>
- 2 files changed, 30 insertions(+)
- create mode 100644 A
- create mode 100644 M
-Switched to branch 'white'
-[white 72f28f0] white renames A->B, M->N
+[main (root-commit) 0333478] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-Switched to branch 'red'
-[red f4afd94] red creates R
+ 1 file changed, 8 insertions(+)
+ create mode 100644 hello
+Switched to a new branch 'side'
+[side 9067c9d] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 R
-Switched to branch 'blue'
-[blue ea35213] blue modify A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'main'
+[main 88d037e] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
 ok 1 - setup
 
-expecting success of 6414.2 'merge white into red (A->B,M->N)': 
-	git checkout -b red-white red &&
-	git merge white &&
-	git write-tree &&
-	test_path_is_file B &&
-	test_path_is_file N &&
-	test_path_is_file R &&
-	test_path_is_missing A &&
-	test_path_is_missing M
+expecting success of 6409.2 'subtree available and works like recursive': 
 
-Switched to a new branch 'red-white'
-Merge made by the 'ort' strategy.
- A => B | 2 +-
- M => N | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-2f1341e5f32ecb7f45a35d122e62999a76d463cf
-ok 2 - merge white into red (A->B,M->N)
+	git merge -s subtree side &&
+	test_write_lines mundo $s world >expect &&
+	test_cmp expect hello
 
-expecting success of 6414.3 'merge blue into white (A->B, mod A, A untracked)': 
-	git checkout -b white-blue white &&
-	echo dirty >A &&
-	git merge blue &&
-	git write-tree &&
-	test_path_is_file A &&
-	echo dirty >expect &&
-	test_cmp expect A &&
-	test_path_is_file B &&
-	test_path_is_file N &&
-	test_path_is_missing M
 
-Switched to a new branch 'white-blue'
-Auto-merging B
-Merge made by the 'ort' strategy.
- B | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-1db6abaa095ec16043333967f8d0dbaa01cdf029
-ok 3 - merge blue into white (A->B, mod A, A untracked)
+Merging:
+88d037e main
+virtual side
+found 1 common ancestor:
+0333478 initial
+Auto-merging hello
+Merge made by the 'subtree' strategy.
+ hello | 1 +
+ 1 file changed, 1 insertion(+)
+ok 2 - subtree available and works like recursive
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6411-merge-filemode.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6411-merge-filemode/.git/
-expecting success of 6411.1 'set up mode change in one branch': 
-	: >file1 &&
-	git add file1 &&
-	git commit -m initial &&
-	git checkout -b a1 main &&
-	: >dummy &&
-	git add dummy &&
-	git commit -m a &&
-	git checkout -b b1 main &&
-	test_chmod +x file1 &&
-	git add file1 &&
-	git commit -m b1
+expecting success of 6409.3 'setup branch sub': 
+	git checkout --orphan sub &&
+	git rm -rf . &&
+	test_commit foo
 
-[main (root-commit) acd9408] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-Switched to a new branch 'a1'
-[a1 8d8c073] a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dummy
-Switched to a new branch 'b1'
-[b1 3dfda39] b1
+Switched to a new branch 'sub'
+rm 'hello'
+[sub (root-commit) ddd63c9] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file1
-ok 1 - set up mode change in one branch
-
-expecting success of 6411.2 'resolve single mode change (recursive, a1)': 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'a1'
-Merge made by the 'ort' strategy.
- file1 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file1
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 2 - resolve single mode change (recursive, a1)
-
-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 6411.3 'verify executable bit on file (recursive, a1)': 
-		test -x file1
-	
-ok 3 - verify executable bit on file (recursive, a1)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 3 - setup branch sub
 
-expecting success of 6411.4 'resolve single mode change (recursive, b1)': 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'b1'
-Updating 3dfda39..e9857f3
-Fast-forward
- dummy | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dummy
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 4 - resolve single mode change (recursive, b1)
+expecting success of 6409.4 'setup topic branch': 
+	git checkout -b topic main &&
+	git merge -s ours --no-commit --allow-unrelated-histories sub &&
+	git read-tree --prefix=dir/ -u sub &&
+	git commit -m "initial merge of sub into topic" &&
+	test_path_is_file dir/foo.t &&
+	test_path_is_file hello
 
-expecting success of 6411.5 'verify executable bit on file (recursive, b1)': 
-		test -x file1
-	
-ok 5 - verify executable bit on file (recursive, b1)
+Switched to a new branch 'topic'
+Automatic merge went well; stopped before committing as requested
+[topic a9c3c06] initial merge of sub into topic
+ Author: A U Thor <author@example.com>
+ok 4 - setup topic branch
 
-expecting success of 6411.6 'resolve single mode change (resolve, a1)': 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'a1'
-Already up to date.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 6 - resolve single mode change (resolve, a1)
+expecting success of 6409.5 'update branch sub': 
+	git checkout sub &&
+	test_commit bar
 
-expecting success of 6411.7 'verify executable bit on file (resolve, a1)': 
-		test -x file1
-	
-ok 7 - verify executable bit on file (resolve, a1)
+Switched to branch 'sub'
+[sub 46a08c5] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 5 - update branch sub
 
-expecting success of 6411.8 'resolve single mode change (resolve, b1)': 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'b1'
-Already up to date.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 8 - resolve single mode change (resolve, b1)
+expecting success of 6409.6 'update topic branch': 
+	git checkout topic &&
+	git merge -s subtree sub -m "second merge of sub into topic" &&
+	test_path_is_file dir/bar.t &&
+	test_path_is_file dir/foo.t &&
+	test_path_is_file hello
 
-expecting success of 6411.9 'verify executable bit on file (resolve, b1)': 
-		test -x file1
-	
-ok 9 - verify executable bit on file (resolve, b1)
+Switched to branch 'topic'
+Merging:
+a9c3c06 initial merge of sub into topic
+virtual sub
+found 1 common ancestor:
+ddd63c9 foo
+Merge made by the 'subtree' strategy.
+ dir/bar.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/bar.t
+ok 6 - update topic branch
 
-expecting success of 6411.10 'set up mode change in both branches': 
-	git reset --hard HEAD &&
-	git checkout -b a2 main &&
-	: >file2 &&
-	H=$(git hash-object file2) &&
-	test_chmod +x file2 &&
-	git commit -m a2 &&
-	git checkout -b b2 main &&
-	: >file2 &&
-	git add file2 &&
-	git commit -m b2 &&
-	cat >expect <<-EOF
-	100755 $H 2	file2
-	100644 $H 3	file2
-	EOF
+expecting success of 6409.7 'setup': 
+	mkdir git-gui &&
+	cd git-gui &&
+	git init &&
+	echo git-gui > git-gui.sh &&
+	o1=$(git hash-object git-gui.sh) &&
+	git add git-gui.sh &&
+	git commit -m "initial git-gui" &&
+	cd .. &&
+	mkdir git &&
+	cd git &&
+	git init &&
+	echo git >git.c &&
+	o2=$(git hash-object git.c) &&
+	git add git.c &&
+	git commit -m "initial git"
 
-HEAD is now at e9857f3 Merge branch 'b1' into a1
-Switched to a new branch 'a2'
-[a2 e027a38] a2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6409-merge-subtree/git-gui/.git/
+[main (root-commit) a175596] initial git-gui
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100755 file2
-Switched to a new branch 'b2'
-[b2 ef0d9fd] b2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git-gui.sh
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6409-merge-subtree/git/.git/
+[main (root-commit) 724c210] initial git
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-ok 10 - set up mode change in both branches
-
-expecting success of 6411.11 'detect conflict on double mode change (recursive)': 
-		git reset --hard &&
-		git checkout -f a2 &&
-		test_must_fail git merge -s $strategy b2 &&
-		git ls-files -u >actual &&
-		test_cmp expect actual &&
-		git ls-files -s file2 | grep ^100755
-	
-HEAD is now at ef0d9fd b2
-Switched to branch 'a2'
-CONFLICT (add/add): Merge conflict in file2
-Automatic merge failed; fix conflicts and then commit the result.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
-ok 11 - detect conflict on double mode change (recursive)
-
-expecting success of 6411.12 'verify executable bit on file (recursive)': 
-		test -x file2
-	
-ok 12 - verify executable bit on file (recursive)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git.c
+ok 7 - setup
 
-expecting success of 6411.13 'detect conflict on double mode change (resolve)': 
-		git reset --hard &&
-		git checkout -f a2 &&
-		test_must_fail git merge -s $strategy b2 &&
-		git ls-files -u >actual &&
-		test_cmp expect actual &&
-		git ls-files -s file2 | grep ^100755
-	
-HEAD is now at e027a38 a2
-Already on 'a2'
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-ERROR: File file2 added identically in both branches,
-ERROR: but permissions conflict 100755->100644.
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
-ok 13 - detect conflict on double mode change (resolve)
+expecting success of 6409.8 'initial merge': 
+	git remote add -f gui ../git-gui &&
+	git merge -s ours --no-commit --allow-unrelated-histories gui/main &&
+	git read-tree --prefix=git-gui/ -u gui/main &&
+	git commit -m "Merge git-gui as our subdirectory" &&
+	git checkout -b work &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	git-gui/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
 
-expecting success of 6411.14 'verify executable bit on file (resolve)': 
-		test -x file2
-	
-ok 14 - verify executable bit on file (resolve)
+Updating gui
+From ../git-gui
+ * [new branch]      main       -> gui/main
+Automatic merge went well; stopped before committing as requested
+[main b741856] Merge git-gui as our subdirectory
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'work'
+ok 8 - initial merge
 
-expecting success of 6411.15 'set up delete/modechange scenario': 
-	git reset --hard &&
-	git checkout -b deletion main &&
-	git rm file1 &&
-	git commit -m deletion
+expecting success of 6409.9 'merge update': 
+	cd ../git-gui &&
+	echo git-gui2 > git-gui.sh &&
+	o3=$(git hash-object git-gui.sh) &&
+	git add git-gui.sh &&
+	git checkout -b topic_2 &&
+	git commit -m "update git-gui" &&
+	cd ../git &&
+	git pull --no-rebase -s subtree gui topic_2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o3 0	git-gui/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
 
-HEAD is now at e027a38 a2
-Switched to a new branch 'deletion'
-rm 'file1'
-[deletion 676a5f7] deletion
+Switched to a new branch 'topic_2'
+[topic_2 c9333be] update git-gui
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 file1
-ok 15 - set up delete/modechange scenario
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../git-gui
+ * branch            topic_2    -> FETCH_HEAD
+ * [new branch]      topic_2    -> gui/topic_2
+Merging:
+b741856 Merge git-gui as our subdirectory
+virtual c9333bebe07f90e76933cfa634ab72516dede3df
+found 1 common ancestor:
+a175596 initial git-gui
+Merge made by the 'subtree' strategy.
+ git-gui/git-gui.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - merge update
 
-expecting success of 6411.16 'detect delete/modechange conflict (recursive, b1)': 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at 676a5f7 deletion
-Switched to branch 'b1'
-CONFLICT (modify/delete): file1 deleted in deletion and modified in HEAD.  Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 16 - detect delete/modechange conflict (recursive, b1)
+expecting success of 6409.10 'initial ambiguous subtree': 
+	cd ../git &&
+	git reset --hard main &&
+	git checkout -b topic_2 &&
+	git merge -s ours --no-commit gui/main &&
+	git read-tree --prefix=git-gui2/ -u gui/main &&
+	git commit -m "Merge git-gui2 as our subdirectory" &&
+	git checkout -b work2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	git-gui/git-gui.sh" &&
+		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
 
-expecting success of 6411.17 'detect delete/modechange conflict (recursive, deletion)': 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at e9857f3 Merge branch 'b1' into a1
-Switched to branch 'deletion'
-CONFLICT (modify/delete): file1 deleted in HEAD and modified in b1.  Version b1 of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 17 - detect delete/modechange conflict (recursive, deletion)
+HEAD is now at b741856 Merge git-gui as our subdirectory
+Switched to a new branch 'topic_2'
+Already up to date.
+[topic_2 b1fd074] Merge git-gui2 as our subdirectory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git-gui2/git-gui.sh
+Switched to a new branch 'work2'
+ok 10 - initial ambiguous subtree
 
-expecting success of 6411.18 'detect delete/modechange conflict (resolve, b1)': 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at 676a5f7 deletion
-Switched to branch 'b1'
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-ERROR: File file1 deleted on one branch but had its
-ERROR: permissions changed on the other.
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 18 - detect delete/modechange conflict (resolve, b1)
+expecting success of 6409.11 'merge using explicit': 
+	cd ../git &&
+	git reset --hard topic_2 &&
+	git pull --no-rebase -Xsubtree=git-gui gui topic_2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o3 0	git-gui/git-gui.sh" &&
+		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
 
-expecting success of 6411.19 'detect delete/modechange conflict (resolve, deletion)': 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at e9857f3 Merge branch 'b1' into a1
-Switched to branch 'deletion'
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-ERROR: File file1 deleted on one branch but had its
-ERROR: permissions changed on the other.
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 19 - detect delete/modechange conflict (resolve, deletion)
+HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
+From ../git-gui
+ * branch            topic_2    -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ git-gui/git-gui.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - merge using explicit
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6419-merge-ignorecase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6419-merge-ignorecase/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
+expecting success of 6409.12 'merge2 using explicit': 
+	cd ../git &&
+	git reset --hard topic_2 &&
+	git pull --no-rebase -Xsubtree=git-gui2 gui topic_2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	git-gui/git-gui.sh" &&
+		echo "100644 $o3 0	git-gui2/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
+HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
+From ../git-gui
+ * branch            topic_2    -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ git-gui2/git-gui.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 12 - merge2 using explicit
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-1..0 # SKIP skipping case insensitive tests - case sensitive file system
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6030-bisect-porcelain.sh ***
@@ -414528,2905 +413734,285 @@
 		exit 255
 	else
 		exit 127
-	fi
-	EOF
-	cat <<-'EOF' >expect &&
-	unable to verify './fail.sh' on good revision
-	EOF
-	test_when_finished 'git bisect reset' &&
-	git bisect start &&
-	git bisect good 88bcdc1839f0ad191ffdd65cae2a2a862d682151 &&
-	git bisect bad 32a594a3fdac2d57cf6d02987e30eec68511498c &&
-	! git bisect run ./fail.sh 2>err &&
-	sed -n 's/.*\(unable to verify.*\)/\1/p' err >actual &&
-	test_cmp expect actual
-
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-running './fail.sh'
-[88bcdc1839f0ad191ffdd65cae2a2a862d682151] Create file <hello> with <1: Hello World> inside.
-running './fail.sh'
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'other'
-ok 29 - git bisect run: unable to verify on good
-
-expecting success of 6030.30 '"git bisect run" simple case': 
-	write_script test_script.sh <<-\EOF &&
-	! grep Another hello >/dev/null
-	EOF
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH3 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset
-
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
-Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
-Switched to branch 'other'
-ok 30 - "git bisect run" simple case
-
-expecting success of 6030.31 '"git bisect run" simple case': 
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect run printf "%s %s\n" reset --bisect-skip >my_bisect_log.txt &&
-	grep -e "reset --bisect-skip" my_bisect_log.txt &&
-	git bisect reset
-
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-reset --bisect-skip
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'other'
-ok 31 - "git bisect run" simple case
-
-expecting success of 6030.32 '"git bisect run" with more complex "git bisect start"': 
-	write_script test_script.sh <<-\EOF &&
-	! grep Ciao hello >/dev/null
-	EOF
-	git bisect start $HASH4 $HASH1 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH4 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset
-
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-32a594a3fdac2d57cf6d02987e30eec68511498c is the first bad commit
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'other'
-ok 32 - "git bisect run" with more complex "git bisect start"
-
-expecting success of 6030.33 'bisect run accepts exit code 126 as bad': 
-	test_when_finished "git bisect reset" &&
-	write_script test_script.sh <<-\EOF &&
-	! grep Another hello || exit 126 >/dev/null
-	EOF
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH3 is the first bad commit" my_bisect_log.txt
-
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
-Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
-Switched to branch 'other'
-ok 33 - bisect run accepts exit code 126 as bad
-
-expecting success of 6030.34 'bisect run fails with non-executable test script': 
-	test_when_finished "git bisect reset" &&
-	>not-executable.sh &&
-	chmod -x not-executable.sh &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	test_must_fail git bisect run ./not-executable.sh >my_bisect_log.txt &&
-	! grep "is the first bad commit" my_bisect_log.txt
-
-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 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
-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'
-ok 34 - bisect run fails with non-executable test script
-
-expecting success of 6030.35 'bisect run accepts exit code 127 as bad': 
-	test_when_finished "git bisect reset" &&
-	write_script test_script.sh <<-\EOF &&
-	! grep Another hello || exit 127 >/dev/null
-	EOF
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH3 is the first bad commit" my_bisect_log.txt
-
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
-Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
-Switched to branch 'other'
-ok 35 - bisect run accepts exit code 127 as bad
-
-expecting success of 6030.36 'bisect run fails with missing test script': 
-	test_when_finished "git bisect reset" &&
-	rm -f does-not-exist.sh &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	test_must_fail git bisect run ./does-not-exist.sh >my_bisect_log.txt &&
-	! grep "is the first bad commit" my_bisect_log.txt
-
-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 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
-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'
-ok 36 - bisect run fails with missing test script
-
-expecting success of 6030.37 'bisect skip: add line and then a new test': 
-	add_line_into_file "5: Another new line." hello &&
-	HASH5=$(git rev-parse --verify HEAD) &&
-	git bisect start $HASH5 $HASH1 &&
-	git bisect skip &&
-	git bisect good > my_bisect_log.txt &&
-	grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
-	git bisect log > log_to_replay.txt &&
-	git bisect reset
-
-Bisecting: 1 revision left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-Bisecting: 1 revision left to test after this (roughly 1 step)
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-3082e11d3a0f2edca194c8ce1eb802256e38e75e is the first bad commit
-Previous HEAD position was 32a594a Add <4: Ciao for now> into <hello>.
-Switched to branch 'other'
-ok 37 - bisect skip: add line and then a new test
-
-expecting success of 6030.38 'bisect skip and bisect replay': 
-	git bisect replay log_to_replay.txt > my_bisect_log.txt &&
-	grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset
-
-3082e11d3a0f2edca194c8ce1eb802256e38e75e is the first bad commit
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'other'
-ok 38 - bisect skip and bisect replay
-
-expecting success of 6030.39 'bisect run & skip: cannot tell between 2': 
-	add_line_into_file "6: Yet a line." hello &&
-	HASH6=$(git rev-parse --verify HEAD) &&
-	write_script test_script.sh <<-\EOF &&
-	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
-	! grep line hello >/dev/null
-	EOF
-	git bisect start $HASH6 $HASH1 &&
-	test_expect_code 2 git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt &&
-	! grep $HASH3 my_bisect_log.txt &&
-	! grep $HASH6 my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	grep $HASH5 my_bisect_log.txt
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-error: bisect run cannot continue any more
-The first bad commit could be any of:
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-32a594a3fdac2d57cf6d02987e30eec68511498c
-[3082e11d3a0f2edca194c8ce1eb802256e38e75e] Add <5: Another new line.> into <hello>.
-3082e11d3a0f2edca194c8ce1eb802256e38e75e
-ok 39 - bisect run & skip: cannot tell between 2
-
-expecting success of 6030.40 'bisect run & skip: find first bad': 
-	git bisect reset &&
-	add_line_into_file "7: Should be the last line." hello &&
-	HASH7=$(git rev-parse --verify HEAD) &&
-	write_script test_script.sh <<-\EOF &&
-	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
-	sed -ne \$p hello | grep day >/dev/null && exit 125
-	! grep Yet hello >/dev/null
-	EOF
-	git bisect start $HASH7 $HASH1 &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$HASH6 is the first bad commit" my_bisect_log.txt
-
-Previous HEAD position was 32a594a Add <4: Ciao for now> into <hello>.
-Switched to branch 'other'
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-ff29dcbe6fe49a0b462bddf0691a013c12a53316 is the first bad commit
-ok 40 - bisect run & skip: find first bad
-
-expecting success of 6030.41 'bisect skip only one range': 
-	git bisect reset &&
-	git bisect start $HASH7 $HASH1 &&
-	git bisect skip $HASH1..$HASH5 &&
-	test "$HASH6" = "$(git rev-parse --verify HEAD)" &&
-	test_must_fail git bisect bad > my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt
-
-Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
-Switched to branch 'other'
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
-The first bad commit could be any of:
-ok 41 - bisect skip only one range
-
-expecting success of 6030.42 'bisect skip many ranges': 
-	git bisect start $HASH7 $HASH1 &&
-	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
-	git bisect skip $HASH2 $HASH2.. ..$HASH5 &&
-	test "$HASH6" = "$(git rev-parse --verify HEAD)" &&
-	test_must_fail git bisect bad > my_bisect_log.txt &&
-	grep "first bad commit could be any of" my_bisect_log.txt
-
-Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
-Switched to branch 'other'
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
-The first bad commit could be any of:
-ok 42 - bisect skip many ranges
-
-expecting success of 6030.43 'bisect starting with a detached HEAD': 
-	git bisect reset &&
-	git checkout main^ &&
-	HEAD=$(git rev-parse --verify HEAD) &&
-	git bisect start &&
-	test $HEAD = $(cat .git/BISECT_START) &&
-	git bisect reset &&
-	test $HEAD = $(git rev-parse --verify HEAD)
-
-Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
-Switched to branch 'other'
-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 3de952f Add <3: Another new day for git> into <hello>.
-status: waiting for both good and bad commits
-HEAD is now at 3de952f Add <3: Another new day for git> into <hello>.
-ok 43 - bisect starting with a detached HEAD
-
-expecting success of 6030.44 'bisect errors out if bad and good are mistaken': 
-	git bisect reset &&
-	test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
-	test_grep "mistook good and bad" rev_list_error &&
-	git bisect reset
-
-Maybe you mistook good and bad revs?
-ok 44 - bisect errors out if bad and good are mistaken
-
-expecting success of 6030.45 'bisect does not create a "bisect" branch': 
-	git bisect reset &&
-	git bisect start $HASH7 $HASH1 &&
-	git branch bisect &&
-	rev_hash4=$(git rev-parse --verify HEAD) &&
-	test "$rev_hash4" = "$HASH4" &&
-	git branch -D bisect &&
-	git bisect good &&
-	git branch bisect &&
-	rev_hash6=$(git rev-parse --verify HEAD) &&
-	test "$rev_hash6" = "$HASH6" &&
-	git bisect good > my_bisect_log.txt &&
-	grep "$HASH7 is the first bad commit" my_bisect_log.txt &&
-	git bisect reset &&
-	rev_hash6=$(git rev-parse --verify bisect) &&
-	test "$rev_hash6" = "$HASH6" &&
-	git branch -D bisect
-
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-Deleted branch bisect (was 32a594a).
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
-3659270ffa1e67547111a107f53191676dff3424 is the first bad commit
-Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
-HEAD is now at 3de952f Add <3: Another new day for git> into <hello>.
-Deleted branch bisect (was ff29dcb).
-ok 45 - bisect does not create a "bisect" branch
-
-expecting success of 6030.46 'side branch creation': 
-	git bisect reset &&
-	git checkout -b side $HASH4 &&
-	add_line_into_file "5(side): first line on a side branch" hello2 &&
-	SIDE_HASH5=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "6(side): second line on a side branch" hello2 &&
-	SIDE_HASH6=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "7(side): third line on a side branch" hello2 &&
-	SIDE_HASH7=$(git rev-parse --verify HEAD)
-
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to a new branch 'side'
-ok 46 - side branch creation
-
-expecting success of 6030.47 'good merge base when good and bad are siblings': 
-	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
-	test_grep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	git bisect good > my_bisect_log.txt &&
-	! grep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH6 my_bisect_log.txt &&
-	git bisect reset
-
-Bisecting: a merge base must be tested
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
-Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
-Switched to branch 'side'
-ok 47 - good merge base when good and bad are siblings
-
-expecting success of 6030.48 'skipped merge base when good and bad are siblings': 
-	git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt &&
-	test_grep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	git bisect skip > my_bisect_log.txt 2>&1 &&
-	grep "warning" my_bisect_log.txt &&
-	grep $SIDE_HASH6 my_bisect_log.txt &&
-	git bisect reset
-
-Bisecting: a merge base must be tested
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-warning: the merge base between 5f781ef4cb0a9c22dd8218d08759770f336c6b8b and [3659270ffa1e67547111a107f53191676dff3424] must be skipped.
-[11ec2d5fe9fe0e901ce1c6680bb1025a3431ebcf] Add <6(side): second line on a side branch> into <hello2>.
-Previous HEAD position was 11ec2d5 Add <6(side): second line on a side branch> into <hello2>.
-Switched to branch 'side'
-ok 48 - skipped merge base when good and bad are siblings
-
-expecting success of 6030.49 'bad merge base when good and bad are siblings': 
-	git bisect start "$HASH7" HEAD > my_bisect_log.txt &&
-	test_grep "merge base must be tested" my_bisect_log.txt &&
-	grep $HASH4 my_bisect_log.txt &&
-	test_must_fail git bisect bad > my_bisect_log.txt 2>&1 &&
-	test_grep "merge base $HASH4 is bad" my_bisect_log.txt &&
-	test_grep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
-	git bisect reset
-
-Bisecting: a merge base must be tested
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-The merge base 32a594a3fdac2d57cf6d02987e30eec68511498c is bad.
-This means the bug has been fixed between 32a594a3fdac2d57cf6d02987e30eec68511498c and [5f781ef4cb0a9c22dd8218d08759770f336c6b8b].
-Previous HEAD position was 32a594a Add <4: Ciao for now> into <hello>.
-Switched to branch 'side'
-ok 49 - bad merge base when good and bad are siblings
-
-expecting success of 6030.50 'many merge bases creation': 
-	git checkout "$SIDE_HASH5" &&
-	git merge -m "merge HASH5 and SIDE_HASH5" "$HASH5" &&
-	A_HASH=$(git rev-parse --verify HEAD) &&
-	git checkout side &&
-	git merge -m "merge HASH7 and SIDE_HASH7" "$HASH7" &&
-	B_HASH=$(git rev-parse --verify HEAD) &&
-	git merge-base --all "$A_HASH" "$B_HASH" > merge_bases.txt &&
-	test_line_count = 2 merge_bases.txt &&
-	grep "$HASH5" merge_bases.txt &&
-	grep "$SIDE_HASH5" merge_bases.txt
-
-Note: switching to '7208484534e368cca8612445f78d2afcf429f37e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 7208484 Create file <hello2> with <5(side): first line on a side branch> inside.
-Merge made by the 'ort' strategy.
- hello | 1 +
- 1 file changed, 1 insertion(+)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b9ff094 merge HASH5 and SIDE_HASH5
-
-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> b9ff094
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- hello | 3 +++
- 1 file changed, 3 insertions(+)
-3082e11d3a0f2edca194c8ce1eb802256e38e75e
-7208484534e368cca8612445f78d2afcf429f37e
-ok 50 - many merge bases creation
-
-expecting success of 6030.51 '"git bisect run --first-parent" simple case': 
-	git rev-list --first-parent $B_HASH ^$HASH4 >first_parent_chain.txt &&
-	write_script test_script.sh <<-\EOF &&
-	grep $(git rev-parse HEAD) first_parent_chain.txt || exit -1
-	! grep line hello >/dev/null
-	EOF
-	git bisect start --first-parent &&
-	test_path_is_file ".git/BISECT_FIRST_PARENT" &&
-	git bisect good $HASH4 &&
-	git bisect bad $B_HASH &&
-	git bisect run ./test_script.sh >my_bisect_log.txt &&
-	grep "$B_HASH is the first bad commit" my_bisect_log.txt &&
-	git bisect reset &&
-	test_path_is_missing .git/BISECT_FIRST_PARENT
-
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 1 revision left to test after this (roughly 1 step)
-[11ec2d5fe9fe0e901ce1c6680bb1025a3431ebcf] Add <6(side): second line on a side branch> into <hello2>.
-fe9323c3283b1fd8f5356e35e66d011387629714 is the first bad commit
-Previous HEAD position was 5f781ef Add <7(side): third line on a side branch> into <hello2>.
-Switched to branch 'side'
-ok 51 - "git bisect run --first-parent" simple case
-
-expecting success of 6030.52 'good merge bases when good and bad are siblings': 
-	git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
-	test_grep "merge base must be tested" my_bisect_log.txt &&
-	git bisect good > my_bisect_log2.txt &&
-	test_grep "merge base must be tested" my_bisect_log2.txt &&
-	{
-		{
-			grep "$SIDE_HASH5" my_bisect_log.txt &&
-			grep "$HASH5" my_bisect_log2.txt
-		} || {
-			grep "$SIDE_HASH5" my_bisect_log2.txt &&
-			grep "$HASH5" my_bisect_log.txt
-		}
-	} &&
-	git bisect reset
-
-Bisecting: a merge base must be tested
-Bisecting: a merge base must be tested
-[7208484534e368cca8612445f78d2afcf429f37e] Create file <hello2> with <5(side): first line on a side branch> inside.
-[3082e11d3a0f2edca194c8ce1eb802256e38e75e] Add <5: Another new line.> into <hello>.
-Previous HEAD position was 3082e11 Add <5: Another new line.> into <hello>.
-Switched to branch 'side'
-ok 52 - good merge bases when good and bad are siblings
-
-expecting success of 6030.53 'optimized merge base checks': 
-	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
-	test_grep "merge base must be tested" my_bisect_log.txt &&
-	grep "$HASH4" my_bisect_log.txt &&
-	git bisect good > my_bisect_log2.txt &&
-	test -f ".git/BISECT_ANCESTORS_OK" &&
-	test "$HASH6" = $(git rev-parse --verify HEAD) &&
-	git bisect bad &&
-	git bisect good "$A_HASH" > my_bisect_log4.txt &&
-	test_grep "merge base must be tested" my_bisect_log4.txt &&
-	test_path_is_missing ".git/BISECT_ANCESTORS_OK"
-
-Bisecting: a merge base must be tested
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[3082e11d3a0f2edca194c8ce1eb802256e38e75e] Add <5: Another new line.> into <hello>.
-Bisecting: a merge base must be tested
-ok 53 - optimized merge base checks
-
-expecting success of 6030.54 '"parallel" side branch creation': 
-	git bisect reset &&
-	git checkout -b parallel $HASH1 &&
-	mkdir dir1 dir2 &&
-	add_line_into_file "1(para): line 1 on parallel branch" dir1/file1 &&
-	PARA_HASH1=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "2(para): line 2 on parallel branch" dir2/file2 &&
-	PARA_HASH2=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "3(para): line 3 on parallel branch" dir2/file3 &&
-	PARA_HASH3=$(git rev-parse --verify HEAD) &&
-	git merge -m "merge HASH4 and PARA_HASH3" "$HASH4" &&
-	PARA_HASH4=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "5(para): add line on parallel branch" dir1/file1 &&
-	PARA_HASH5=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "6(para): add line on parallel branch" dir2/file2 &&
-	PARA_HASH6=$(git rev-parse --verify HEAD) &&
-	git merge -m "merge HASH7 and PARA_HASH6" "$HASH7" &&
-	PARA_HASH7=$(git rev-parse --verify HEAD)
-
-Previous HEAD position was 3082e11 Add <5: Another new line.> into <hello>.
-Switched to branch 'side'
-Switched to a new branch 'parallel'
-Merge made by the 'ort' strategy.
- hello | 3 +++
- 1 file changed, 3 insertions(+)
-Merge made by the 'ort' strategy.
- hello | 3 +++
- 1 file changed, 3 insertions(+)
-ok 54 - "parallel" side branch creation
-
-expecting success of 6030.55 'restricting bisection on one dir': 
-	git bisect reset &&
-	git bisect start HEAD $HASH1 -- dir1 &&
-	para1=$(git rev-parse --verify HEAD) &&
-	test "$para1" = "$PARA_HASH1" &&
-	git bisect bad > my_bisect_log.txt &&
-	grep "$PARA_HASH1 is the first bad commit" my_bisect_log.txt
-
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[de049b9c4e10f2524a46e151b65aa4f156fd52d6] Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
-de049b9c4e10f2524a46e151b65aa4f156fd52d6 is the first bad commit
-ok 55 - restricting bisection on one dir
-
-expecting success of 6030.56 'restricting bisection on one dir and a file': 
-	git bisect reset &&
-	git bisect start HEAD $HASH1 -- dir1 hello &&
-	para4=$(git rev-parse --verify HEAD) &&
-	test "$para4" = "$PARA_HASH4" &&
-	git bisect bad &&
-	hash3=$(git rev-parse --verify HEAD) &&
-	test "$hash3" = "$HASH3" &&
-	git bisect good &&
-	hash4=$(git rev-parse --verify HEAD) &&
-	test "$hash4" = "$HASH4" &&
-	git bisect good &&
-	para1=$(git rev-parse --verify HEAD) &&
-	test "$para1" = "$PARA_HASH1" &&
-	git bisect good > my_bisect_log.txt &&
-	grep "$PARA_HASH4 is the first bad commit" my_bisect_log.txt
-
-Previous HEAD position was de049b9 Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
-Switched to branch 'parallel'
-Bisecting: 4 revisions left to test after this (roughly 2 steps)
-[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-Bisecting: 1 revision left to test after this (roughly 1 step)
-[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[de049b9c4e10f2524a46e151b65aa4f156fd52d6] Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
-3f04efc661812c541a2f96ecaae46a79c6ea2464 is the first bad commit
-ok 56 - restricting bisection on one dir and a file
-
-expecting success of 6030.57 'skipping away from skipped commit': 
-	git bisect start $PARA_HASH7 $HASH1 &&
-	para4=$(git rev-parse --verify HEAD) &&
-	test "$para4" = "$PARA_HASH4" &&
-        git bisect skip &&
-	hash7=$(git rev-parse --verify HEAD) &&
-	test "$hash7" = "$HASH7" &&
-        git bisect skip &&
-	para3=$(git rev-parse --verify HEAD) &&
-	test "$para3" = "$PARA_HASH3"
-
-Previous HEAD position was de049b9 Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
-Switched to branch 'parallel'
-Bisecting: 5 revisions left to test after this (roughly 3 steps)
-[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
-Bisecting: 6 revisions left to test after this (roughly 3 steps)
-[3659270ffa1e67547111a107f53191676dff3424] Add <7: Should be the last line.> into <hello>.
-Bisecting: 6 revisions left to test after this (roughly 3 steps)
-[a5a4dc83955e310a4f693ab6f6bcea46c8544843] Create file <dir2/file3> with <3(para): line 3 on parallel branch> inside.
-ok 57 - skipping away from skipped commit
-
-expecting success of 6030.58 'erroring out when using bad path arguments': 
-	test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
-	test_grep "bad path arguments" error.txt
-
-Maybe you started with bad path arguments?
-ok 58 - erroring out when using bad path arguments
-
-expecting success of 6030.59 'test bisection on bare repo - --no-checkout specified': 
-	git clone --bare . bare.nocheckout &&
-	(
-		cd bare.nocheckout &&
-		git bisect start --no-checkout &&
-		git bisect good $HASH1 &&
-		git bisect bad $HASH4 &&
-		git bisect run eval \
-			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
-			>../nocheckout.log
-	) &&
-	grep "$HASH3 is the first bad commit" nocheckout.log
-
-Cloning into bare repository 'bare.nocheckout'...
-done.
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
-ok 59 - test bisection on bare repo - --no-checkout specified
-
-expecting success of 6030.60 'test bisection on bare repo - --no-checkout defaulted': 
-	git clone --bare . bare.defaulted &&
-	(
-		cd bare.defaulted &&
-		git bisect start &&
-		git bisect good $HASH1 &&
-		git bisect bad $HASH4 &&
-		git bisect run eval \
-			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
-			>../defaulted.log
-	) &&
-	grep "$HASH3 is the first bad commit" defaulted.log
-
-Cloning into bare repository 'bare.defaulted'...
-done.
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
-ok 60 - test bisection on bare repo - --no-checkout defaulted
-
-expecting success of 6030.61 'broken branch creation': 
-	git bisect reset &&
-	git checkout -b broken $HASH4 &&
-	git tag BROKEN_HASH4 $HASH4 &&
-	add_line_into_file "5(broken): first line on a broken branch" hello2 &&
-	git tag BROKEN_HASH5 &&
-	mkdir missing &&
-	:> missing/MISSING &&
-	git add missing/MISSING &&
-	git commit -m "6(broken): Added file that will be deleted" &&
-	git tag BROKEN_HASH6 &&
-	deleted=$(git rev-parse --verify HEAD:missing) &&
-	add_line_into_file "7(broken): second line on a broken branch" hello2 &&
-	git tag BROKEN_HASH7 &&
-	add_line_into_file "8(broken): third line on a broken branch" hello2 &&
-	git tag BROKEN_HASH8 &&
-	git rm missing/MISSING &&
-	git commit -m "9(broken): Remove missing file" &&
-	git tag BROKEN_HASH9 &&
-	rm .git/objects/$(test_oid_to_path $deleted)
-
-Switched to a new branch 'broken'
-[broken 55bdac5] 6(broken): Added file that will be deleted
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 missing/MISSING
-rm 'missing/MISSING'
-[broken 508db08] 9(broken): Remove missing file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 missing/MISSING
-ok 61 - broken branch creation
-
-expecting success of 6030.62 'bisect fails if tree is broken on start commit': 
-	git bisect reset &&
-	test_must_fail git bisect start BROKEN_HASH7 BROKEN_HASH4 2>error.txt &&
-	test_cmp expected.missing-tree.default error.txt
-
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-ok 62 - bisect fails if tree is broken on start commit
-
-expecting success of 6030.63 'bisect fails if tree is broken on trial commit': 
-	git bisect reset &&
-	test_must_fail git bisect start BROKEN_HASH9 BROKEN_HASH4 2>error.txt &&
-	git reset --hard broken &&
-	git checkout broken &&
-	test_cmp expected.missing-tree.default error.txt
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-HEAD is now at 508db08 9(broken): Remove missing file
-Already on 'broken'
-ok 63 - bisect fails if tree is broken on trial commit
-
-expecting success of 6030.64 'bisect: --no-checkout - start commit bad': 
-	git bisect reset &&
-	git bisect start BROKEN_HASH7 BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect reset
-
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
-Checking BROKEN_HASH6 is the same as BISECT_HEAD
-ok 64 - bisect: --no-checkout - start commit bad
-
-expecting success of 6030.65 'bisect: --no-checkout - trial commit bad': 
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect reset
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
-Checking BROKEN_HASH6 is the same as BISECT_HEAD
-ok 65 - bisect: --no-checkout - trial commit bad
-
-expecting success of 6030.66 'bisect: --no-checkout - target before breakage': 
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect bad BISECT_HEAD &&
-	check_same BROKEN_HASH5 BISECT_HEAD &&
-	git bisect bad BISECT_HEAD &&
-	check_same BROKEN_HASH5 bisect/bad &&
-	git bisect reset
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
-Checking BROKEN_HASH6 is the same as BISECT_HEAD
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[fd9df6dc932ed4e1539696448c064bc31b947f3f] Create file <hello2> with <5(broken): first line on a broken branch> inside.
-Checking BROKEN_HASH5 is the same as BISECT_HEAD
-fd9df6dc932ed4e1539696448c064bc31b947f3f is the first bad commit
-commit fd9df6dc932ed4e1539696448c064bc31b947f3f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:28:13 2005 -0700
-
-    Create file <hello2> with <5(broken): first line on a broken branch> inside.
-
- hello2 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 hello2
-Checking BROKEN_HASH5 is the same as bisect/bad
-ok 66 - bisect: --no-checkout - target before breakage
-
-expecting success of 6030.67 'bisect: --no-checkout - target in breakage': 
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect bad BISECT_HEAD &&
-	check_same BROKEN_HASH5 BISECT_HEAD &&
-	test_must_fail git bisect good BISECT_HEAD &&
-	check_same BROKEN_HASH6 bisect/bad &&
-	git bisect reset
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
-Checking BROKEN_HASH6 is the same as BISECT_HEAD
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[fd9df6dc932ed4e1539696448c064bc31b947f3f] Create file <hello2> with <5(broken): first line on a broken branch> inside.
-Checking BROKEN_HASH5 is the same as BISECT_HEAD
-55bdac58da30a5a429094bf5466b8095b29ecbf0 is the first bad commit
-fatal: unable to read tree (39f7e61a724187ab767d2e08442d9b6b9dab587d)
-fatal: unable to start 'show' for object '55bdac58da30a5a429094bf5466b8095b29ecbf0'
-Checking BROKEN_HASH6 is the same as bisect/bad
-ok 67 - bisect: --no-checkout - target in breakage
-
-expecting success of 6030.68 'bisect: --no-checkout - target after breakage': 
-	git bisect reset &&
-	git bisect start broken BROKEN_HASH4 --no-checkout &&
-	check_same BROKEN_HASH6 BISECT_HEAD &&
-	git bisect good BISECT_HEAD &&
-	check_same BROKEN_HASH8 BISECT_HEAD &&
-	test_must_fail git bisect good BISECT_HEAD &&
-	check_same BROKEN_HASH9 bisect/bad &&
-	git bisect reset
-
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
-Checking BROKEN_HASH6 is the same as BISECT_HEAD
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[3df15bfcf4745f4f8ff0007d5ca42e75eba04ff9] Add <8(broken): third line on a broken branch> into <hello2>.
-Checking BROKEN_HASH8 is the same as BISECT_HEAD
-508db08019a8b4b05c3cfe2447ada8a4c78fe3de is the first bad commit
-fatal: unable to read tree (39f7e61a724187ab767d2e08442d9b6b9dab587d)
-fatal: unable to start 'show' for object '508db08019a8b4b05c3cfe2447ada8a4c78fe3de'
-Checking BROKEN_HASH9 is the same as bisect/bad
-ok 68 - bisect: --no-checkout - target after breakage
-
-expecting success of 6030.69 'bisect: demonstrate identification of damage boundary': 
-	git bisect reset &&
-	git checkout broken &&
-	git bisect start broken main --no-checkout &&
-	test_must_fail git bisect run "$SHELL_PATH" -c '
-		GOOD=$(git for-each-ref "--format=%(objectname)" refs/bisect/good-*) &&
-		git rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&
-		git pack-objects --stdout >/dev/null < tmp.$$
-		rc=$?
-		rm -f tmp.$$
-		test $rc = 0' &&
-	check_same BROKEN_HASH6 bisect/bad &&
-	git bisect reset
-
-Already on 'broken'
-Bisecting: 2 revisions left to test after this (roughly 1 step)
-[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
-running '/bin/sh' '-c' '
-		GOOD=$(git for-each-ref "--format=%(objectname)" refs/bisect/good-*) &&
-		git rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&
-		git pack-objects --stdout >/dev/null < tmp.$$
-		rc=$?
-		rm -f tmp.$$
-		test $rc = 0'
-fatal: bad tree object 39f7e61a724187ab767d2e08442d9b6b9dab587d
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[fd9df6dc932ed4e1539696448c064bc31b947f3f] Create file <hello2> with <5(broken): first line on a broken branch> inside.
-running '/bin/sh' '-c' '
-		GOOD=$(git for-each-ref "--format=%(objectname)" refs/bisect/good-*) &&
-		git rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&
-		git pack-objects --stdout >/dev/null < tmp.$$
-		rc=$?
-		rm -f tmp.$$
-		test $rc = 0'
-fatal: unable to read tree (39f7e61a724187ab767d2e08442d9b6b9dab587d)
-fatal: unable to start 'show' for object '55bdac58da30a5a429094bf5466b8095b29ecbf0'
-Checking BROKEN_HASH6 is the same as bisect/bad
-ok 69 - bisect: demonstrate identification of damage boundary
-
-expecting success of 6030.70 'bisect log: successful result': 
-	git bisect reset &&
-	git bisect start $HASH4 $HASH2 &&
-	git bisect good &&
-	git bisect log >bisect-log.txt &&
-	test_cmp expected.bisect-log bisect-log.txt &&
-	git bisect reset
-
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-32a594a3fdac2d57cf6d02987e30eec68511498c is the first bad commit
-commit 32a594a3fdac2d57cf6d02987e30eec68511498c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:16:13 2005 -0700
-
-    Add <4: Ciao for now> into <hello>.
-
- hello | 1 +
- 1 file changed, 1 insertion(+)
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'broken'
-ok 70 - bisect log: successful result
-
-expecting success of 6030.71 'bisect log: only skip commits left': 
-	git bisect reset &&
-	git bisect start $HASH4 $HASH2 &&
-	test_must_fail git bisect skip &&
-	git bisect log >bisect-skip-log.txt &&
-	test_cmp expected.bisect-skip-log bisect-skip-log.txt &&
-	git bisect reset
-
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-There are only 'skip'ped commits left to test.
-The first bad commit could be any of:
-3de952f2416b6084f557ec417709eac740c6818c
-32a594a3fdac2d57cf6d02987e30eec68511498c
-We cannot bisect more!
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'broken'
-ok 71 - bisect log: only skip commits left
-
-expecting success of 6030.72 '"git bisect bad HEAD" behaves as "git bisect bad"': 
-	git checkout parallel &&
-	git bisect start HEAD $HASH1 &&
-	git bisect good HEAD &&
-	git bisect bad HEAD &&
-	test "$HASH6" = $(git rev-parse --verify HEAD) &&
-	git bisect reset
-
-Switched to branch 'parallel'
-Bisecting: 5 revisions left to test after this (roughly 3 steps)
-[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
-Bisecting: 2 revisions left to test after this (roughly 2 steps)
-[3659270ffa1e67547111a107f53191676dff3424] Add <7: Should be the last line.> into <hello>.
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
-Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
-Switched to branch 'parallel'
-ok 72 - "git bisect bad HEAD" behaves as "git bisect bad"
-
-expecting success of 6030.73 'bisect starts with only one new': 
-	git bisect reset &&
-	git bisect start &&
-	git bisect new $HASH4 &&
-	git bisect next
-
-status: waiting for both good and bad commits
-status: waiting for good commit(s), bad commit known
-warning: bisecting only with a new commit
-Bisecting: 1 revision left to test after this (roughly 1 step)
-[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-ok 73 - bisect starts with only one new
-
-expecting success of 6030.74 'bisect does not start with only one old': 
-	git bisect reset &&
-	git bisect start &&
-	git bisect old $HASH1 &&
-	test_must_fail git bisect next
-
-Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
-Switched to branch 'parallel'
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-error: You need to give me at least one bad|new and good|old revision.
-You can use "git bisect bad|new" and "git bisect good|old" for that.
-ok 74 - bisect does not start with only one old
-
-expecting success of 6030.75 'bisect start with one new and old': 
-	git bisect reset &&
-	git bisect start &&
-	git bisect old $HASH1 &&
-	git bisect new $HASH4 &&
-	git bisect new &&
-	git bisect new >bisect_result &&
-	grep "$HASH2 is the first new commit" bisect_result &&
-	git bisect log >log_to_replay.txt &&
-	git bisect reset
-
-Already on 'parallel'
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first new commit
-Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
-Switched to branch 'parallel'
-ok 75 - bisect start with one new and old
-
-expecting success of 6030.76 'bisect replay with old and new': 
-	git bisect replay log_to_replay.txt >bisect_result &&
-	grep "$HASH2 is the first new commit" bisect_result &&
-	git bisect reset
-
-7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first new commit
-Already on 'parallel'
-ok 76 - bisect replay with old and new
-
-expecting success of 6030.77 'bisect replay with CRLF log': 
-	append_cr <log_to_replay.txt >log_to_replay_crlf.txt &&
-	git bisect replay log_to_replay_crlf.txt >bisect_result_crlf &&
-	grep "$HASH2 is the first new commit" bisect_result_crlf &&
-	git bisect reset
-
-7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first new commit
-Already on 'parallel'
-ok 77 - bisect replay with CRLF log
-
-expecting success of 6030.78 'bisect cannot mix old/new and good/bad': 
-	git bisect start &&
-	git bisect bad $HASH4 &&
-	test_must_fail git bisect old $HASH1
-
-status: waiting for both good and bad commits
-status: waiting for good commit(s), bad commit known
-error: Invalid command: you're currently in a bad/good bisect
-fatal: unknown command: 'old'
-
-usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-   or: git bisect (good|bad) [<rev>...]
-   or: git bisect terms [--term-good | --term-bad]
-   or: git bisect skip [(<rev>|<range>)...]
-   or: git bisect next
-   or: git bisect reset [<commit>]
-   or: git bisect visualize
-   or: git bisect replay <logfile>
-   or: git bisect log
-   or: git bisect run <cmd> [<arg>...]
-
-ok 78 - bisect cannot mix old/new and good/bad
-
-expecting success of 6030.79 'bisect terms needs 0 or 1 argument': 
-	git bisect reset &&
-	test_must_fail git bisect terms only-one &&
-	test_must_fail git bisect terms 1 2 &&
-	test_must_fail git bisect terms 2>actual &&
-	echo "error: no terms defined" >expected &&
-	test_cmp expected actual
-
-Already on 'parallel'
-error: no terms defined
-error: 'git bisect terms' requires 0 or 1 argument
-ok 79 - bisect terms needs 0 or 1 argument
-
-expecting success of 6030.80 'bisect terms shows good/bad after start': 
-	git bisect reset &&
-	git bisect start HEAD $HASH1 &&
-	git bisect terms --term-good >actual &&
-	echo good >expected &&
-	test_cmp expected actual &&
-	git bisect terms --term-bad >actual &&
-	echo bad >expected &&
-	test_cmp expected actual
-
-Bisecting: 5 revisions left to test after this (roughly 3 steps)
-[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
-ok 80 - bisect terms shows good/bad after start
-
-expecting success of 6030.81 'bisect start with one term1 and term2': 
-	git bisect reset &&
-	git bisect start --term-old term2 --term-new term1 &&
-	git bisect term2 $HASH1 &&
-	git bisect term1 $HASH4 &&
-	git bisect term1 &&
-	git bisect term1 >bisect_result &&
-	grep "$HASH2 is the first term1 commit" bisect_result &&
-	git bisect log >log_to_replay.txt &&
-	git bisect reset
-
-Previous HEAD position was 3f04efc merge HASH4 and PARA_HASH3
-Switched to branch 'parallel'
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first term1 commit
-Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
-Switched to branch 'parallel'
-ok 81 - bisect start with one term1 and term2
-
-expecting success of 6030.82 'bogus command does not start bisect': 
-	git bisect reset &&
-	test_must_fail git bisect --bisect-terms 1 2 2>out &&
-	! grep "You need to start" out &&
-	test_must_fail git bisect --bisect-terms 2>out &&
-	! grep "You need to start" out &&
-	grep "git bisect.*visualize" out &&
-	git bisect reset
-
-   or: git bisect visualize
-ok 82 - bogus command does not start bisect
-
-expecting success of 6030.83 'bisect replay with term1 and term2': 
-	git bisect replay log_to_replay.txt >bisect_result &&
-	grep "$HASH2 is the first term1 commit" bisect_result &&
-	git bisect reset
-
-7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first term1 commit
-Already on 'parallel'
-ok 83 - bisect replay with term1 and term2
-
-expecting success of 6030.84 'bisect start term1 term2': 
-	git bisect reset &&
-	git bisect start --term-new term1 --term-old term2 $HASH4 $HASH1 &&
-	git bisect term1 &&
-	git bisect term1 >bisect_result &&
-	grep "$HASH2 is the first term1 commit" bisect_result &&
-	git bisect log >log_to_replay.txt &&
-	git bisect reset
-
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
-7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first term1 commit
-Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
-Switched to branch 'parallel'
-ok 84 - bisect start term1 term2
-
-expecting success of 6030.85 'bisect cannot mix terms': 
-	git bisect reset &&
-	git bisect start --term-good term1 --term-bad term2 $HASH4 $HASH1 &&
-	test_must_fail git bisect a &&
-	test_must_fail git bisect b &&
-	test_must_fail git bisect bad &&
-	test_must_fail git bisect good &&
-	test_must_fail git bisect new &&
-	test_must_fail git bisect old
-
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-error: Invalid command: you're currently in a term2/term1 bisect
-fatal: unknown command: 'a'
-
-usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-   or: git bisect (good|bad) [<rev>...]
-   or: git bisect terms [--term-good | --term-bad]
-   or: git bisect skip [(<rev>|<range>)...]
-   or: git bisect next
-   or: git bisect reset [<commit>]
-   or: git bisect visualize
-   or: git bisect replay <logfile>
-   or: git bisect log
-   or: git bisect run <cmd> [<arg>...]
-
-error: Invalid command: you're currently in a term2/term1 bisect
-fatal: unknown command: 'b'
-
-usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-   or: git bisect (good|bad) [<rev>...]
-   or: git bisect terms [--term-good | --term-bad]
-   or: git bisect skip [(<rev>|<range>)...]
-   or: git bisect next
-   or: git bisect reset [<commit>]
-   or: git bisect visualize
-   or: git bisect replay <logfile>
-   or: git bisect log
-   or: git bisect run <cmd> [<arg>...]
-
-error: Invalid command: you're currently in a term2/term1 bisect
-fatal: unknown command: 'bad'
-
-usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-   or: git bisect (good|bad) [<rev>...]
-   or: git bisect terms [--term-good | --term-bad]
-   or: git bisect skip [(<rev>|<range>)...]
-   or: git bisect next
-   or: git bisect reset [<commit>]
-   or: git bisect visualize
-   or: git bisect replay <logfile>
-   or: git bisect log
-   or: git bisect run <cmd> [<arg>...]
-
-error: Invalid command: you're currently in a term2/term1 bisect
-fatal: unknown command: 'good'
-
-usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-   or: git bisect (good|bad) [<rev>...]
-   or: git bisect terms [--term-good | --term-bad]
-   or: git bisect skip [(<rev>|<range>)...]
-   or: git bisect next
-   or: git bisect reset [<commit>]
-   or: git bisect visualize
-   or: git bisect replay <logfile>
-   or: git bisect log
-   or: git bisect run <cmd> [<arg>...]
-
-error: Invalid command: you're currently in a term2/term1 bisect
-fatal: unknown command: 'new'
-
-usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-   or: git bisect (good|bad) [<rev>...]
-   or: git bisect terms [--term-good | --term-bad]
-   or: git bisect skip [(<rev>|<range>)...]
-   or: git bisect next
-   or: git bisect reset [<commit>]
-   or: git bisect visualize
-   or: git bisect replay <logfile>
-   or: git bisect log
-   or: git bisect run <cmd> [<arg>...]
-
-error: Invalid command: you're currently in a term2/term1 bisect
-fatal: unknown command: 'old'
-
-usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
-   or: git bisect (good|bad) [<rev>...]
-   or: git bisect terms [--term-good | --term-bad]
-   or: git bisect skip [(<rev>|<range>)...]
-   or: git bisect next
-   or: git bisect reset [<commit>]
-   or: git bisect visualize
-   or: git bisect replay <logfile>
-   or: git bisect log
-   or: git bisect run <cmd> [<arg>...]
-
-ok 85 - bisect cannot mix terms
-
-expecting success of 6030.86 'bisect terms rejects invalid terms': 
-	git bisect reset &&
-	test_must_fail git bisect start --term-good &&
-	test_must_fail git bisect start --term-good invalid..term &&
-	test_must_fail git bisect start --term-bad &&
-	test_must_fail git bisect terms --term-bad invalid..term &&
-	test_must_fail git bisect terms --term-good bad &&
-	test_must_fail git bisect terms --term-good old &&
-	test_must_fail git bisect terms --term-good skip &&
-	test_must_fail git bisect terms --term-good reset &&
-	test_path_is_missing .git/BISECT_TERMS
-
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'parallel'
-error: '' is not a valid term
-error: 'invalid..term' is not a valid term
-error: '' is not a valid term
-error: 'git bisect terms' requires 0 or 1 argument
-error: 'git bisect terms' requires 0 or 1 argument
-error: 'git bisect terms' requires 0 or 1 argument
-error: 'git bisect terms' requires 0 or 1 argument
-error: 'git bisect terms' requires 0 or 1 argument
-ok 86 - bisect terms rejects invalid terms
-
-expecting success of 6030.87 'bisect start --term-* does store terms': 
-	git bisect reset &&
-	git bisect start --term-bad=one --term-good=two &&
-	git bisect terms >actual &&
-	cat <<-EOF >expected &&
-	Your current terms are two for the old state
-	and one for the new state.
-	EOF
-	test_cmp expected actual &&
-	git bisect terms --term-bad >actual &&
-	echo one >expected &&
-	test_cmp expected actual &&
-	git bisect terms --term-good >actual &&
-	echo two >expected &&
-	test_cmp expected actual
-
-Already on 'parallel'
-status: waiting for both good and bad commits
-ok 87 - bisect start --term-* does store terms
-
-expecting success of 6030.88 'bisect start takes options and revs in any order': 
-	git bisect reset &&
-	git bisect start --term-good one $HASH4 \
-		--term-good two --term-bad bad-term \
-		$HASH1 --term-good three -- &&
-	(git bisect terms --term-bad && git bisect terms --term-good) >actual &&
-	printf "%s\n%s\n" bad-term three >expected &&
-	test_cmp expected actual
-
-Already on 'parallel'
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-ok 88 - bisect start takes options and revs in any order
-
-expecting success of 6030.89 'bisect skip works with --term*': 
-	git bisect reset &&
-	git bisect start --term-new=fixed --term-old=unfixed HEAD $HASH1 &&
-	hash_skipped_from=$(git rev-parse --verify HEAD) &&
-	git bisect skip &&
-	hash_skipped_to=$(git rev-parse --verify HEAD) &&
-	test "$hash_skipped_from" != "$hash_skipped_to"
-
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'parallel'
-Bisecting: 5 revisions left to test after this (roughly 3 steps)
-[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
-Bisecting: 6 revisions left to test after this (roughly 3 steps)
-[3659270ffa1e67547111a107f53191676dff3424] Add <7: Should be the last line.> into <hello>.
-ok 89 - bisect skip works with --term*
-
-expecting success of 6030.90 'git bisect reset cleans bisection state properly': 
-	git bisect reset &&
-	git bisect start &&
-	git bisect good $HASH1 &&
-	git bisect bad $HASH4 &&
-	git bisect reset &&
-	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	test_ref_missing BISECT_EXPECTED_REV &&
-	test_path_is_missing ".git/BISECT_ANCESTORS_OK" &&
-	test_path_is_missing ".git/BISECT_LOG" &&
-	test_path_is_missing ".git/BISECT_RUN" &&
-	test_path_is_missing ".git/BISECT_TERMS" &&
-	test_path_is_missing ".git/BISECT_HEAD" &&
-	test_path_is_missing ".git/BISECT_START"
-
-Previous HEAD position was 3659270 Add <7: Should be the last line.> into <hello>.
-Switched to branch 'parallel'
-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 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
-Switched to branch 'parallel'
-error: reference does not exist
-ok 90 - git bisect reset cleans bisection state properly
-
-expecting success of 6030.91 'bisect handles annotated tags': 
-	test_commit commit-one &&
-	git tag -m foo tag-one &&
-	test_commit commit-two &&
-	git tag -m foo tag-two &&
-	git bisect start &&
-	git bisect good tag-one &&
-	git bisect bad tag-two >output &&
-	bad=$(git rev-parse --verify tag-two^{commit}) &&
-	grep "$bad is the first bad commit" output
-
-[parallel f1585f4] commit-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-one.t
-[parallel e0be3ae] commit-two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-two.t
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-e0be3aebb5267e11957031f9de30f2ae54b3a230 is the first bad commit
-ok 91 - bisect handles annotated tags
-
-expecting success of 6030.92 'bisect run fails with exit code equals or greater than 128': 
-	write_script test_script.sh <<-\EOF &&
-	exit 128
-	EOF
-	test_must_fail git bisect run ./test_script.sh &&
-	write_script test_script.sh <<-\EOF &&
-	exit 255
-	EOF
-	test_must_fail git bisect run ./test_script.sh
-
-running './test_script.sh'
-error: bisect run failed: exit code 128 from './test_script.sh' is < 0 or >= 128
-running './test_script.sh'
-error: bisect run failed: exit code 255 from './test_script.sh' is < 0 or >= 128
-ok 92 - bisect run fails with exit code equals or greater than 128
-
-expecting success of 6030.93 'bisect visualize with a filename with dash and space': 
-	echo "My test line" >>"./-hello 2" &&
-	git add -- "./-hello 2" &&
-	git commit --quiet -m "Add test line" -- "./-hello 2" &&
-	git bisect visualize -p -- "-hello 2"
-
-commit 3cbde3a4f793d47d680a620ed5dc56faa69ec7d6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:32:13 2005 -0700
-
-    Add test line
-
-diff --git a/-hello 2 b/-hello 2
-new file mode 100644
-index 0000000..2b57c7c
---- /dev/null
-+++ b/-hello 2	
-@@ -0,0 +1 @@
-+My test line
-ok 93 - bisect visualize with a filename with dash and space
-
-expecting success of 6030.94 'bisect state output with multiple good commits': 
-	git bisect reset &&
-	git bisect start >output &&
-	grep "waiting for both good and bad commits" output &&
-	git bisect log >output &&
-	grep "waiting for both good and bad commits" output &&
-	git bisect good "$HASH1" >output &&
-	grep "waiting for bad commit, 1 good commit known" output &&
-	git bisect log >output &&
-	grep "waiting for bad commit, 1 good commit known" output &&
-	git bisect good "$HASH2" >output &&
-	grep "waiting for bad commit, 2 good commits known" output &&
-	git bisect log >output &&
-	grep "waiting for bad commit, 2 good commits known" output
-
-Already on 'parallel'
-status: waiting for both good and bad commits
-# status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-# status: waiting for bad commit, 1 good commit known
-status: waiting for bad commit, 2 good commits known
-# status: waiting for bad commit, 2 good commits known
-ok 94 - bisect state output with multiple good commits
-
-expecting success of 6030.95 'bisect state output with bad commit': 
-	git bisect reset &&
-	git bisect start >output &&
-	grep "waiting for both good and bad commits" output &&
-	git bisect log >output &&
-	grep "waiting for both good and bad commits" output &&
-	git bisect bad "$HASH4" >output &&
-	grep -F "waiting for good commit(s), bad commit known" output &&
-	git bisect log >output &&
-	grep -F "waiting for good commit(s), bad commit known" output
-
-Already on 'parallel'
-status: waiting for both good and bad commits
-# status: waiting for both good and bad commits
-status: waiting for good commit(s), bad commit known
-# status: waiting for good commit(s), bad commit known
-ok 95 - bisect state output with bad commit
-
-expecting success of 6030.96 'verify correct error message': 
-	git bisect reset &&
-	git bisect start $HASH4 $HASH1 &&
-	write_script test_script.sh <<-\EOF &&
-	rm .git/BISECT*
-	EOF
-	test_must_fail git bisect run ./test_script.sh 2>error &&
-	grep "git bisect good.*exited with error code" error
-
-Already on 'parallel'
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-running './test_script.sh'
-error: bisect run failed: 'git bisect good' exited with error code -1
-ok 96 - verify correct error message
-
-# passed all 96 test(s)
-1..96
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6418-merge-text-auto.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6418-merge-text-auto/.git/
-expecting success of 6418.1 'setup': 
-	git config core.autocrlf false &&
-
-	echo first line | append_cr >file &&
-	echo first line >control_file &&
-	echo only line >inert_file &&
-
-	git add file control_file inert_file &&
-	test_tick &&
-	git commit -m "Initial" &&
-	git tag initial &&
-	git branch side &&
-
-	echo "* text=auto" >.gitattributes &&
-	echo first line >file &&
-	git add .gitattributes file &&
-	test_tick &&
-	git commit -m "normalize file" &&
-
-	echo same line | append_cr >>file &&
-	echo same line >>control_file &&
-	git add file control_file &&
-	test_tick &&
-	git commit -m "add line from a" &&
-	git tag a &&
-
-	git rm .gitattributes &&
-	rm file &&
-	git checkout file &&
-	test_tick &&
-	git commit -m "remove .gitattributes" &&
-	git tag c &&
-
-	git checkout side &&
-	echo same line | append_cr >>file &&
-	echo same line >>control_file &&
-	git add file control_file &&
-	test_tick &&
-	git commit -m "add line from b" &&
-	git tag b &&
-
-	git checkout main
-
-[main (root-commit) 1c56df1] Initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 control_file
- create mode 100644 file
- create mode 100644 inert_file
-[main 2747e77] normalize file
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 .gitattributes
-warning: in the working copy of 'file', CRLF will be replaced by LF the next time Git touches it
-[main 99f8882] add line from a
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-rm '.gitattributes'
-Updated 1 path from the index
-[main 2f716ad] remove .gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 .gitattributes
-Switched to branch 'side'
-[side 0d9ffb6] add line from b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6418.2 'set up fuzz_conflict() helper': 
-	fuzz_conflict() {
-		sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"
-	}
-
-ok 2 - set up fuzz_conflict() helper
-
-expecting success of 6418.3 'Merge after setting text=auto': 
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	if test_have_prereq NATIVE_CRLF; then
-		append_cr <expected >expected.temp &&
-		mv expected.temp expected
-	fi &&
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard a &&
-	git merge b &&
-	compare_files expected file
-
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 99f8882 add line from a
-Auto-merging file
-Merge made by the 'ort' strategy.
-ok 3 - Merge after setting text=auto
-
-expecting success of 6418.4 'Merge addition of text=auto eol=LF': 
-	git config core.eol lf &&
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard b &&
-	git merge a &&
-	compare_files  expected file
-
-rm '.gitattributes'
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 0d9ffb6 add line from b
-Auto-merging file
-Merge made by the 'ort' strategy.
- .gitattributes | 1 +
- file           | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 .gitattributes
-ok 4 - Merge addition of text=auto eol=LF
-
-expecting success of 6418.5 'Merge addition of text=auto eol=CRLF': 
-	git config core.eol crlf &&
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	append_cr <expected >expected.temp &&
-	mv expected.temp expected &&
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard b &&
-	echo >&2 "After git reset --hard b" &&
-	git ls-files -s --eol >&2 &&
-	git merge a &&
-	compare_files  expected file
-
-rm '.gitattributes'
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 0d9ffb6 add line from b
-After git reset --hard b
-100644 99b633103c15c20cebebf821133ab526b0ff90b2 0	i/lf    w/lf    attr/                 	control_file
-100644 ad55e240aeb42e0d9a0e18d6d8b02dd82ee3e527 0	i/crlf  w/crlf  attr/                 	file
-100644 1bd3656f87a6720d97252137876e81ee56eef249 0	i/lf    w/lf    attr/                 	inert_file
-Auto-merging file
-Merge made by the 'ort' strategy.
- .gitattributes | 1 +
- file           | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 .gitattributes
-ok 5 - Merge addition of text=auto eol=CRLF
-
-expecting success of 6418.6 'Detect CRLF/LF conflict after setting text=auto': 
-	git config core.eol native &&
-	echo "<<<<<<<" >expected &&
-	echo first line >>expected &&
-	echo same line >>expected &&
-	echo ======= >>expected &&
-	echo first line | append_cr >>expected &&
-	echo same line | append_cr >>expected &&
-	echo ">>>>>>>" >>expected &&
-	git config merge.renormalize false &&
-	rm -f .gitattributes &&
-	git reset --hard a &&
-	test_must_fail git merge b &&
-	fuzz_conflict file >file.fuzzy &&
-	compare_files expected file.fuzzy
-
-HEAD is now at 99f8882 add line from a
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - Detect CRLF/LF conflict after setting text=auto
-
-expecting success of 6418.7 'Detect LF/CRLF conflict from addition of text=auto': 
-	echo "<<<<<<<" >expected &&
-	echo first line | append_cr >>expected &&
-	echo same line | append_cr >>expected &&
-	echo ======= >>expected &&
-	echo first line >>expected &&
-	echo same line >>expected &&
-	echo ">>>>>>>" >>expected &&
-	git config merge.renormalize false &&
-	rm -f .gitattributes &&
-	git reset --hard b &&
-	test_must_fail git merge a &&
-	fuzz_conflict file >file.fuzzy &&
-	compare_files expected file.fuzzy
-
-HEAD is now at 0d9ffb6 add line from b
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 7 - Detect LF/CRLF conflict from addition of text=auto
-
-expecting success of 6418.8 'checkout -m after setting text=auto': 
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard initial &&
-	git restore --source=a -- . &&
-	git checkout -m b &&
-	git diff --no-index --ignore-cr-at-eol expected file
-
-rm '.gitattributes'
-rm 'control_file'
-rm 'file'
-rm 'file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 1c56df1 Initial
-Note: switching to 'b'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 0d9ffb6 add line from b
-M	file
-ok 8 - checkout -m after setting text=auto
-
-expecting success of 6418.9 'checkout -m addition of text=auto': 
-	cat <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	rm -f .gitattributes file &&
-	git reset --hard initial &&
-	git restore --source=b -- . &&
-	git checkout -m a &&
-	git diff --no-index --ignore-cr-at-eol expected file
-
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 1c56df1 Initial
-Previous HEAD position was 1c56df1 Initial
-HEAD is now at 99f8882 add line from a
-ok 9 - checkout -m addition of text=auto
-
-expecting success of 6418.10 'Test delete/normalize conflict': 
-	git checkout -f side &&
-	git rm -fr . &&
-	rm -f .gitattributes &&
-	git reset --hard initial &&
-	git rm file &&
-	git commit -m "remove file" &&
-	git checkout main &&
-	git reset --hard a^ &&
-	git merge side &&
-	test_path_is_missing file
-
-Previous HEAD position was 99f8882 add line from a
-Switched to branch 'side'
-rm 'control_file'
-rm 'file'
-rm 'inert_file'
-HEAD is now at 1c56df1 Initial
-rm 'file'
-[side 7dc5d25] remove file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-Switched to branch 'main'
-HEAD is now at 2747e77 normalize file
-Merge made by the 'ort' strategy.
- file | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-ok 10 - Test delete/normalize conflict
-
-expecting success of 6418.11 'rename/delete vs. renormalization': 
-	git init subrepo &&
-	(
-		cd subrepo &&
-		echo foo >oldfile &&
-		git add oldfile &&
-		git commit -m original &&
-
-		git branch rename &&
-		git branch nuke &&
-
-		git checkout rename &&
-		git mv oldfile newfile &&
-		git commit -m renamed &&
-
-		git checkout nuke &&
-		git rm oldfile &&
-		git commit -m deleted &&
-
-		git checkout rename^0 &&
-		test_must_fail git -c merge.renormalize=true merge nuke >out &&
-
-		grep "rename/delete" out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6418-merge-text-auto/subrepo/.git/
-[main (root-commit) 6bccdb0] original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oldfile
-Switched to branch 'rename'
-[rename 0094749] renamed
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename oldfile => newfile (100%)
-Switched to branch 'nuke'
-rm 'oldfile'
-[nuke 5c3f422] deleted
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 oldfile
-Note: switching to 'rename^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 0094749 renamed
-CONFLICT (rename/delete): oldfile renamed to newfile in HEAD, but deleted in nuke.
-ok 11 - rename/delete vs. renormalization
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6417-merge-ours-theirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6417-merge-ours-theirs/.git/
-expecting success of 6417.1 'setup': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
-	git add file &&
-	cp file elif &&
-	git commit -m initial &&
-
-	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
-	git commit -a -m ours &&
-
-	git checkout -b side HEAD^ &&
-
-	sed -e "s/9/nueve/" >file <elif &&
-	git commit -a -m theirs &&
-
-	git checkout main^0
-
-[main (root-commit) b1c5b20] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-[main de72ed3] ours
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'side'
-[side 9035321] theirs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'main^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at de72ed3 ours
-ok 1 - setup
-
-expecting success of 6417.2 'plain recursive - should conflict': 
-	git reset --hard main &&
-	test_must_fail git merge -s recursive side &&
-	grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-nine
-nueve
-one
-ok 2 - plain recursive - should conflict
-
-expecting success of 6417.3 'recursive favouring theirs': 
-	git reset --hard main &&
-	git merge -s recursive -Xtheirs side &&
-	! grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-nueve
-one
-ok 3 - recursive favouring theirs
-
-expecting success of 6417.4 'recursive favouring ours': 
-	git reset --hard main &&
-	git merge -s recursive -X ours side &&
-	grep nine file &&
-	! grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'ort' strategy.
-nine
-one
-ok 4 - recursive favouring ours
-
-expecting success of 6417.5 'binary file with -Xours/-Xtheirs': 
-	echo file binary >.gitattributes &&
-
-	git reset --hard main &&
-	git merge -s recursive -X theirs side &&
-	git diff --exit-code side HEAD -- file &&
-
-	git reset --hard main &&
-	git merge -s recursive -X ours side &&
-	git diff --exit-code main HEAD -- file
-
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at de72ed3 ours
-Auto-merging file
-Merge made by the 'ort' strategy.
-ok 5 - binary file with -Xours/-Xtheirs
-
-expecting success of 6417.6 'pull passes -X to underlying merge': 
-	git reset --hard main && git pull --no-rebase -s recursive -Xours . side &&
-	git reset --hard main && git pull --no-rebase -s recursive -X ours . side &&
-	git reset --hard main && git pull --no-rebase -s recursive -Xtheirs . side &&
-	git reset --hard main && git pull --no-rebase -s recursive -X theirs . side &&
-	git reset --hard main && test_must_fail git pull --no-rebase -s recursive -X bork . side
-
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'ort' strategy.
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'ort' strategy.
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at de72ed3 ours
-From .
- * branch            side       -> FETCH_HEAD
-fatal: unknown strategy option: -Xbork
-ok 6 - pull passes -X to underlying merge
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 6417.7 'symlink with -Xours/-Xtheirs': 
-	git reset --hard main &&
-	git checkout -b two main &&
-	ln -s target-zero link &&
-	git add link &&
-	git commit -m "add link pointing to zero" &&
-
-	ln -f -s target-two link &&
-	git commit -m "add link pointing to two" link &&
-
-	git checkout -b one HEAD^ &&
-	ln -f -s target-one link &&
-	git commit -m "add link pointing to one" link &&
-
-	# we expect symbolic links not to resolve automatically, of course
-	git checkout one^0 &&
-	test_must_fail git merge -s recursive two &&
-
-	# favor theirs to resolve to target-two?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X theirs two &&
-	git diff --exit-code two HEAD link &&
-
-	# favor ours to resolve to target-one?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X ours two &&
-	git diff --exit-code one HEAD link
-
-
-HEAD is now at de72ed3 ours
-Switched to a new branch 'two'
-[two c4561a4] add link pointing to zero
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 link
-[two 6164de8] add link pointing to two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'one'
-[one 4961603] add link pointing to one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'one^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 4961603 add link pointing to one
-CONFLICT (content): Merge conflict in link
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 4961603 add link pointing to one
-HEAD is now at 4961603 add link pointing to one
-Merge made by the 'ort' strategy.
- link | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 6efe9ee Merge branch 'two' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6efe9ee Merge branch 'two' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 6efe9ee
-
-HEAD is now at 4961603 add link pointing to one
-Merge made by the 'ort' strategy.
-ok 7 - symlink with -Xours/-Xtheirs
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6412-merge-large-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-
-expecting success of 6412.7 '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
-	
-Switched to branch 'main'
-Deleted branch test5 (was 2d6f47f).
-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 7 - rename (5, ok)
-
-expecting success of 6412.8 'rename (6, fail)': 
-	n=6 &&
-	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'
-error: branch 'test6' not found
-HEAD is now at 6ce5622 initial
-[main 09e502a] add=6
- Author: A U Thor <author@example.com>
- 6 files changed, 132 insertions(+)
- create mode 100644 1
- create mode 100644 2
- create mode 100644 3
- create mode 100644 4
- create mode 100644 5
- create mode 100644 6
-[main ffecf28] change=6
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+), 6 deletions(-)
-Switched to a new branch 'test6'
-rm '1'
-rm '2'
-rm '3'
-rm '4'
-rm '5'
-rm '6'
-[test6 dcaf00c] change+rename=6
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+), 6 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%)
- rename 6 => 6.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.
-CONFLICT (modify/delete): 6 deleted in HEAD and modified in main.  Version main of 6 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 6 and retry the command.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 8 - rename (6, fail)
-
-expecting success of 6412.9 'setup large simple rename': 
-	git config --unset merge.renamelimit &&
-	git config --unset diff.renamelimit &&
-
-	git reset --hard initial &&
-	for i in $(count 200); do
-		make_text foo bar baz >$i || return 1
-	done &&
-	git add . &&
-	git commit -m create-files &&
-
-	git branch simple-change &&
-	git checkout -b simple-rename &&
-
-	mkdir builtin &&
-	git mv [0-9]* builtin/ &&
-	git commit -m renamed &&
-
-	git checkout simple-change &&
-	>unrelated-change &&
-	git add unrelated-change &&
-	git commit -m unrelated-change
-
-HEAD is now at 6ce5622 initial
-[test6 47a98b9] create-files
- Author: A U Thor <author@example.com>
- 200 files changed, 4400 insertions(+)
- create mode 100644 1
- create mode 100644 10
- create mode 100644 100
- create mode 100644 101
- create mode 100644 102
- create mode 100644 103
- create mode 100644 104
- create mode 100644 105
- create mode 100644 106
- create mode 100644 107
- create mode 100644 108
- create mode 100644 109
- create mode 100644 11
- create mode 100644 110
- create mode 100644 111
- create mode 100644 112
- create mode 100644 113
- create mode 100644 114
- create mode 100644 115
- create mode 100644 116
- create mode 100644 117
- create mode 100644 118
- create mode 100644 119
- create mode 100644 12
- create mode 100644 120
- create mode 100644 121
- create mode 100644 122
- create mode 100644 123
- create mode 100644 124
- create mode 100644 125
- create mode 100644 126
- create mode 100644 127
- create mode 100644 128
- create mode 100644 129
- create mode 100644 13
- create mode 100644 130
- create mode 100644 131
- create mode 100644 132
- create mode 100644 133
- create mode 100644 134
- create mode 100644 135
- create mode 100644 136
- create mode 100644 137
- create mode 100644 138
- create mode 100644 139
- create mode 100644 14
- create mode 100644 140
- create mode 100644 141
- create mode 100644 142
- create mode 100644 143
- create mode 100644 144
- create mode 100644 145
- create mode 100644 146
- create mode 100644 147
- create mode 100644 148
- create mode 100644 149
- create mode 100644 15
- create mode 100644 150
- create mode 100644 151
- create mode 100644 152
- create mode 100644 153
- create mode 100644 154
- create mode 100644 155
- create mode 100644 156
- create mode 100644 157
- create mode 100644 158
- create mode 100644 159
- create mode 100644 16
- create mode 100644 160
- create mode 100644 161
- create mode 100644 162
- create mode 100644 163
- create mode 100644 164
- create mode 100644 165
- create mode 100644 166
- create mode 100644 167
- create mode 100644 168
- create mode 100644 169
- create mode 100644 17
- create mode 100644 170
- create mode 100644 171
- create mode 100644 172
- create mode 100644 173
- create mode 100644 174
- create mode 100644 175
- create mode 100644 176
- create mode 100644 177
- create mode 100644 178
- create mode 100644 179
- create mode 100644 18
- create mode 100644 180
- create mode 100644 181
- create mode 100644 182
- create mode 100644 183
- create mode 100644 184
- create mode 100644 185
- create mode 100644 186
- create mode 100644 187
- create mode 100644 188
- create mode 100644 189
- create mode 100644 19
- create mode 100644 190
- create mode 100644 191
- create mode 100644 192
- create mode 100644 193
- create mode 100644 194
- create mode 100644 195
- create mode 100644 196
- create mode 100644 197
- create mode 100644 198
- create mode 100644 199
- create mode 100644 2
- create mode 100644 20
- create mode 100644 200
- create mode 100644 21
- create mode 100644 22
- create mode 100644 23
- create mode 100644 24
- create mode 100644 25
- create mode 100644 26
- create mode 100644 27
- create mode 100644 28
- create mode 100644 29
- create mode 100644 3
- create mode 100644 30
- create mode 100644 31
- create mode 100644 32
- create mode 100644 33
- create mode 100644 34
- create mode 100644 35
- create mode 100644 36
- create mode 100644 37
- create mode 100644 38
- create mode 100644 39
- create mode 100644 4
- create mode 100644 40
- create mode 100644 41
- create mode 100644 42
- create mode 100644 43
- create mode 100644 44
- create mode 100644 45
- create mode 100644 46
- create mode 100644 47
- create mode 100644 48
- create mode 100644 49
- create mode 100644 5
- create mode 100644 50
- create mode 100644 51
- create mode 100644 52
- create mode 100644 53
- create mode 100644 54
- create mode 100644 55
- create mode 100644 56
- create mode 100644 57
- create mode 100644 58
- create mode 100644 59
- create mode 100644 6
- create mode 100644 60
- create mode 100644 61
- create mode 100644 62
- create mode 100644 63
- create mode 100644 64
- create mode 100644 65
- create mode 100644 66
- create mode 100644 67
- create mode 100644 68
- create mode 100644 69
- create mode 100644 7
- create mode 100644 70
- create mode 100644 71
- create mode 100644 72
- create mode 100644 73
- create mode 100644 74
- create mode 100644 75
- create mode 100644 76
- create mode 100644 77
- create mode 100644 78
- create mode 100644 79
- create mode 100644 8
- create mode 100644 80
- create mode 100644 81
- create mode 100644 82
- create mode 100644 83
- create mode 100644 84
- create mode 100644 85
- create mode 100644 86
- create mode 100644 87
- create mode 100644 88
- create mode 100644 89
- create mode 100644 9
- create mode 100644 90
- create mode 100644 91
- create mode 100644 92
- create mode 100644 93
- create mode 100644 94
- create mode 100644 95
- create mode 100644 96
- create mode 100644 97
- create mode 100644 98
- create mode 100644 99
-Switched to a new branch 'simple-rename'
-[simple-rename 4602847] renamed
- Author: A U Thor <author@example.com>
- 200 files changed, 0 insertions(+), 0 deletions(-)
- rename 1 => builtin/1 (100%)
- rename 10 => builtin/10 (100%)
- rename 100 => builtin/100 (100%)
- rename 101 => builtin/101 (100%)
- rename 102 => builtin/102 (100%)
- rename 103 => builtin/103 (100%)
- rename 104 => builtin/104 (100%)
- rename 105 => builtin/105 (100%)
- rename 106 => builtin/106 (100%)
- rename 107 => builtin/107 (100%)
- rename 108 => builtin/108 (100%)
- rename 109 => builtin/109 (100%)
- rename 11 => builtin/11 (100%)
- rename 110 => builtin/110 (100%)
- rename 111 => builtin/111 (100%)
- rename 112 => builtin/112 (100%)
- rename 113 => builtin/113 (100%)
- rename 114 => builtin/114 (100%)
- rename 115 => builtin/115 (100%)
- rename 116 => builtin/116 (100%)
- rename 117 => builtin/117 (100%)
- rename 118 => builtin/118 (100%)
- rename 119 => builtin/119 (100%)
- rename 12 => builtin/12 (100%)
- rename 120 => builtin/120 (100%)
- rename 121 => builtin/121 (100%)
- rename 122 => builtin/122 (100%)
- rename 123 => builtin/123 (100%)
- rename 124 => builtin/124 (100%)
- rename 125 => builtin/125 (100%)
- rename 126 => builtin/126 (100%)
- rename 127 => builtin/127 (100%)
- rename 128 => builtin/128 (100%)
- rename 129 => builtin/129 (100%)
- rename 13 => builtin/13 (100%)
- rename 130 => builtin/130 (100%)
- rename 131 => builtin/131 (100%)
- rename 132 => builtin/132 (100%)
- rename 133 => builtin/133 (100%)
- rename 134 => builtin/134 (100%)
- rename 135 => builtin/135 (100%)
- rename 136 => builtin/136 (100%)
- rename 137 => builtin/137 (100%)
- rename 138 => builtin/138 (100%)
- rename 139 => builtin/139 (100%)
- rename 14 => builtin/14 (100%)
- rename 140 => builtin/140 (100%)
- rename 141 => builtin/141 (100%)
- rename 142 => builtin/142 (100%)
- rename 143 => builtin/143 (100%)
- rename 144 => builtin/144 (100%)
- rename 145 => builtin/145 (100%)
- rename 146 => builtin/146 (100%)
- rename 147 => builtin/147 (100%)
- rename 148 => builtin/148 (100%)
- rename 149 => builtin/149 (100%)
- rename 15 => builtin/15 (100%)
- rename 150 => builtin/150 (100%)
- rename 151 => builtin/151 (100%)
- rename 152 => builtin/152 (100%)
- rename 153 => builtin/153 (100%)
- rename 154 => builtin/154 (100%)
- rename 155 => builtin/155 (100%)
- rename 156 => builtin/156 (100%)
- rename 157 => builtin/157 (100%)
- rename 158 => builtin/158 (100%)
- rename 159 => builtin/159 (100%)
- rename 16 => builtin/16 (100%)
- rename 160 => builtin/160 (100%)
- rename 161 => builtin/161 (100%)
- rename 162 => builtin/162 (100%)
- rename 163 => builtin/163 (100%)
- rename 164 => builtin/164 (100%)
- rename 165 => builtin/165 (100%)
- rename 166 => builtin/166 (100%)
- rename 167 => builtin/167 (100%)
- rename 168 => builtin/168 (100%)
- rename 169 => builtin/169 (100%)
- rename 17 => builtin/17 (100%)
- rename 170 => builtin/170 (100%)
- rename 171 => builtin/171 (100%)
- rename 172 => builtin/172 (100%)
- rename 173 => builtin/173 (100%)
- rename 174 => builtin/174 (100%)
- rename 175 => builtin/175 (100%)
- rename 176 => builtin/176 (100%)
- rename 177 => builtin/177 (100%)
- rename 178 => builtin/178 (100%)
- rename 179 => builtin/179 (100%)
- rename 18 => builtin/18 (100%)
- rename 180 => builtin/180 (100%)
- rename 181 => builtin/181 (100%)
- rename 182 => builtin/182 (100%)
- rename 183 => builtin/183 (100%)
- rename 184 => builtin/184 (100%)
- rename 185 => builtin/185 (100%)
- rename 186 => builtin/186 (100%)
- rename 187 => builtin/187 (100%)
- rename 188 => builtin/188 (100%)
- rename 189 => builtin/189 (100%)
- rename 19 => builtin/19 (100%)
- rename 190 => builtin/190 (100%)
- rename 191 => builtin/191 (100%)
- rename 192 => builtin/192 (100%)
- rename 193 => builtin/193 (100%)
- rename 194 => builtin/194 (100%)
- rename 195 => builtin/195 (100%)
- rename 196 => builtin/196 (100%)
- rename 197 => builtin/197 (100%)
- rename 198 => builtin/198 (100%)
- rename 199 => builtin/199 (100%)
- rename 2 => builtin/2 (100%)
- rename 20 => builtin/20 (100%)
- rename 200 => builtin/200 (100%)
- rename 21 => builtin/21 (100%)
- rename 22 => builtin/22 (100%)
- rename 23 => builtin/23 (100%)
- rename 24 => builtin/24 (100%)
- rename 25 => builtin/25 (100%)
- rename 26 => builtin/26 (100%)
- rename 27 => builtin/27 (100%)
- rename 28 => builtin/28 (100%)
- rename 29 => builtin/29 (100%)
- rename 3 => builtin/3 (100%)
- rename 30 => builtin/30 (100%)
- rename 31 => builtin/31 (100%)
- rename 32 => builtin/32 (100%)
- rename 33 => builtin/33 (100%)
- rename 34 => builtin/34 (100%)
- rename 35 => builtin/35 (100%)
- rename 36 => builtin/36 (100%)
- rename 37 => builtin/37 (100%)
- rename 38 => builtin/38 (100%)
- rename 39 => builtin/39 (100%)
- rename 4 => builtin/4 (100%)
- rename 40 => builtin/40 (100%)
- rename 41 => builtin/41 (100%)
- rename 42 => builtin/42 (100%)
- rename 43 => builtin/43 (100%)
- rename 44 => builtin/44 (100%)
- rename 45 => builtin/45 (100%)
- rename 46 => builtin/46 (100%)
- rename 47 => builtin/47 (100%)
- rename 48 => builtin/48 (100%)
- rename 49 => builtin/49 (100%)
- rename 5 => builtin/5 (100%)
- rename 50 => builtin/50 (100%)
- rename 51 => builtin/51 (100%)
- rename 52 => builtin/52 (100%)
- rename 53 => builtin/53 (100%)
- rename 54 => builtin/54 (100%)
- rename 55 => builtin/55 (100%)
- rename 56 => builtin/56 (100%)
- rename 57 => builtin/57 (100%)
- rename 58 => builtin/58 (100%)
- rename 59 => builtin/59 (100%)
- rename 6 => builtin/6 (100%)
- rename 60 => builtin/60 (100%)
- rename 61 => builtin/61 (100%)
- rename 62 => builtin/62 (100%)
- rename 63 => builtin/63 (100%)
- rename 64 => builtin/64 (100%)
- rename 65 => builtin/65 (100%)
- rename 66 => builtin/66 (100%)
- rename 67 => builtin/67 (100%)
- rename 68 => builtin/68 (100%)
- rename 69 => builtin/69 (100%)
- rename 7 => builtin/7 (100%)
- rename 70 => builtin/70 (100%)
- rename 71 => builtin/71 (100%)
- rename 72 => builtin/72 (100%)
- rename 73 => builtin/73 (100%)
- rename 74 => builtin/74 (100%)
- rename 75 => builtin/75 (100%)
- rename 76 => builtin/76 (100%)
- rename 77 => builtin/77 (100%)
- rename 78 => builtin/78 (100%)
- rename 79 => builtin/79 (100%)
- rename 8 => builtin/8 (100%)
- rename 80 => builtin/80 (100%)
- rename 81 => builtin/81 (100%)
- rename 82 => builtin/82 (100%)
- rename 83 => builtin/83 (100%)
- rename 84 => builtin/84 (100%)
- rename 85 => builtin/85 (100%)
- rename 86 => builtin/86 (100%)
- rename 87 => builtin/87 (100%)
- rename 88 => builtin/88 (100%)
- rename 89 => builtin/89 (100%)
- rename 9 => builtin/9 (100%)
- rename 90 => builtin/90 (100%)
- rename 91 => builtin/91 (100%)
- rename 92 => builtin/92 (100%)
- rename 93 => builtin/93 (100%)
- rename 94 => builtin/94 (100%)
- rename 95 => builtin/95 (100%)
- rename 96 => builtin/96 (100%)
- rename 97 => builtin/97 (100%)
- rename 98 => builtin/98 (100%)
- rename 99 => builtin/99 (100%)
-Switched to branch 'simple-change'
-[simple-change d125115] unrelated-change
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated-change
-ok 9 - setup large simple rename
+	fi
+	EOF
+	cat <<-'EOF' >expect &&
+	unable to verify './fail.sh' on good revision
+	EOF
+	test_when_finished 'git bisect reset' &&
+	git bisect start &&
+	git bisect good 88bcdc1839f0ad191ffdd65cae2a2a862d682151 &&
+	git bisect bad 32a594a3fdac2d57cf6d02987e30eec68511498c &&
+	! git bisect run ./fail.sh 2>err &&
+	sed -n 's/.*\(unable to verify.*\)/\1/p' err >actual &&
+	test_cmp expect actual
 
-expecting success of 6412.10 'massive simple rename does not spam added files': 
-	sane_unset GIT_MERGE_VERBOSITY &&
-	git merge --no-stat simple-rename | grep -v Removing >output &&
-	test_line_count -lt 5 output
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+running './fail.sh'
+[88bcdc1839f0ad191ffdd65cae2a2a862d682151] Create file <hello> with <1: Hello World> inside.
+running './fail.sh'
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'other'
+ok 29 - git bisect run: unable to verify on good
 
-ok 10 - massive simple rename does not spam added files
+expecting success of 6030.30 '"git bisect run" simple case': 
+	write_script test_script.sh <<-\EOF &&
+	! grep Another hello >/dev/null
+	EOF
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$HASH3 is the first bad commit" my_bisect_log.txt &&
+	git bisect reset
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6415-merge-dir-to-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
+Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
+Switched to branch 'other'
+ok 30 - "git bisect run" simple case
 
-[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
+expecting success of 6030.31 '"git bisect run" simple case': 
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	git bisect run printf "%s %s\n" reset --bisect-skip >my_bisect_log.txt &&
+	grep -e "reset --bisect-skip" my_bisect_log.txt &&
+	git bisect reset
 
-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
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+reset --bisect-skip
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'other'
+ok 31 - "git bisect run" simple case
 
-)
-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 6030.32 '"git bisect run" with more complex "git bisect start"': 
+	write_script test_script.sh <<-\EOF &&
+	! grep Ciao hello >/dev/null
+	EOF
+	git bisect start $HASH4 $HASH1 &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$HASH4 is the first bad commit" my_bisect_log.txt &&
+	git bisect reset
 
-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
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+32a594a3fdac2d57cf6d02987e30eec68511498c is the first bad commit
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'other'
+ok 32 - "git bisect run" with more complex "git bisect start"
 
-Note: switching to 'HEAD^0'.
+expecting success of 6030.33 'bisect run accepts exit code 126 as bad': 
+	test_when_finished "git bisect reset" &&
+	write_script test_script.sh <<-\EOF &&
+	! grep Another hello || exit 126 >/dev/null
+	EOF
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$HASH3 is the first bad commit" my_bisect_log.txt
+
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
+Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
+Switched to branch 'other'
+ok 33 - bisect run accepts exit code 126 as bad
+
+expecting success of 6030.34 'bisect run fails with non-executable test script': 
+	test_when_finished "git bisect reset" &&
+	>not-executable.sh &&
+	chmod -x not-executable.sh &&
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	test_must_fail git bisect run ./not-executable.sh >my_bisect_log.txt &&
+	! grep "is the first bad commit" my_bisect_log.txt
+
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+'./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'
+ok 34 - bisect run fails with non-executable test script
+
+expecting success of 6030.35 'bisect run accepts exit code 127 as bad': 
+	test_when_finished "git bisect reset" &&
+	write_script test_script.sh <<-\EOF &&
+	! grep Another hello || exit 127 >/dev/null
+	EOF
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$HASH3 is the first bad commit" my_bisect_log.txt
+
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
+Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
+Switched to branch 'other'
+ok 35 - bisect run accepts exit code 127 as bad
+
+expecting success of 6030.36 'bisect run fails with missing test script': 
+	test_when_finished "git bisect reset" &&
+	rm -f does-not-exist.sh &&
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	test_must_fail git bisect run ./does-not-exist.sh >my_bisect_log.txt &&
+	! grep "is the first bad commit" my_bisect_log.txt
+
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+'./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'
+ok 36 - bisect run fails with missing test script
+
+expecting success of 6030.37 'bisect skip: add line and then a new test': 
+	add_line_into_file "5: Another new line." hello &&
+	HASH5=$(git rev-parse --verify HEAD) &&
+	git bisect start $HASH5 $HASH1 &&
+	git bisect skip &&
+	git bisect good > my_bisect_log.txt &&
+	grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
+	git bisect log > log_to_replay.txt &&
+	git bisect reset
+
+Bisecting: 1 revision left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+Bisecting: 1 revision left to test after this (roughly 1 step)
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+3082e11d3a0f2edca194c8ce1eb802256e38e75e is the first bad commit
+Previous HEAD position was 32a594a Add <4: Ciao for now> into <hello>.
+Switched to branch 'other'
+ok 37 - bisect skip: add line and then a new test
+
+expecting success of 6030.38 'bisect skip and bisect replay': 
+	git bisect replay log_to_replay.txt > my_bisect_log.txt &&
+	grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
+	git bisect reset
+
+3082e11d3a0f2edca194c8ce1eb802256e38e75e is the first bad commit
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'other'
+ok 38 - bisect skip and bisect replay
+
+expecting success of 6030.39 'bisect run & skip: cannot tell between 2': 
+	add_line_into_file "6: Yet a line." hello &&
+	HASH6=$(git rev-parse --verify HEAD) &&
+	write_script test_script.sh <<-\EOF &&
+	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
+	! grep line hello >/dev/null
+	EOF
+	git bisect start $HASH6 $HASH1 &&
+	test_expect_code 2 git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "first bad commit could be any of" my_bisect_log.txt &&
+	! grep $HASH3 my_bisect_log.txt &&
+	! grep $HASH6 my_bisect_log.txt &&
+	grep $HASH4 my_bisect_log.txt &&
+	grep $HASH5 my_bisect_log.txt
+
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+error: bisect run cannot continue any more
+The first bad commit could be any of:
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+32a594a3fdac2d57cf6d02987e30eec68511498c
+[3082e11d3a0f2edca194c8ce1eb802256e38e75e] Add <5: Another new line.> into <hello>.
+3082e11d3a0f2edca194c8ce1eb802256e38e75e
+ok 39 - bisect run & skip: cannot tell between 2
+
+expecting success of 6030.40 'bisect run & skip: find first bad': 
+	git bisect reset &&
+	add_line_into_file "7: Should be the last line." hello &&
+	HASH7=$(git rev-parse --verify HEAD) &&
+	write_script test_script.sh <<-\EOF &&
+	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
+	sed -ne \$p hello | grep day >/dev/null && exit 125
+	! grep Yet hello >/dev/null
+	EOF
+	git bisect start $HASH7 $HASH1 &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$HASH6 is the first bad commit" my_bisect_log.txt
+
+Previous HEAD position was 32a594a Add <4: Ciao for now> into <hello>.
+Switched to branch 'other'
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+ff29dcbe6fe49a0b462bddf0691a013c12a53316 is the first bad commit
+ok 40 - bisect run & skip: find first bad
+
+expecting success of 6030.41 'bisect skip only one range': 
+	git bisect reset &&
+	git bisect start $HASH7 $HASH1 &&
+	git bisect skip $HASH1..$HASH5 &&
+	test "$HASH6" = "$(git rev-parse --verify HEAD)" &&
+	test_must_fail git bisect bad > my_bisect_log.txt &&
+	grep "first bad commit could be any of" my_bisect_log.txt
+
+Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
+Switched to branch 'other'
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
+The first bad commit could be any of:
+ok 41 - bisect skip only one range
+
+expecting success of 6030.42 'bisect skip many ranges': 
+	git bisect start $HASH7 $HASH1 &&
+	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
+	git bisect skip $HASH2 $HASH2.. ..$HASH5 &&
+	test "$HASH6" = "$(git rev-parse --verify HEAD)" &&
+	test_must_fail git bisect bad > my_bisect_log.txt &&
+	grep "first bad commit could be any of" my_bisect_log.txt
+
+Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
+Switched to branch 'other'
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
+The first bad commit could be any of:
+ok 42 - bisect skip many ranges
+
+expecting success of 6030.43 'bisect starting with a detached HEAD': 
+	git bisect reset &&
+	git checkout main^ &&
+	HEAD=$(git rev-parse --verify HEAD) &&
+	git bisect start &&
+	test $HEAD = $(cat .git/BISECT_START) &&
+	git bisect reset &&
+	test $HEAD = $(git rev-parse --verify HEAD)
+
+Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
+Switched to branch 'other'
+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
@@ -417443,437 +414029,1576 @@
 
 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
+HEAD is now at 3de952f Add <3: Another new day for git> into <hello>.
+status: waiting for both good and bad commits
+HEAD is now at 3de952f Add <3: Another new day for git> into <hello>.
+ok 43 - bisect starting with a detached HEAD
 
-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
+expecting success of 6030.44 'bisect errors out if bad and good are mistaken': 
+	git bisect reset &&
+	test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
+	test_grep "mistook good and bad" rev_list_error &&
+	git bisect reset
 
-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:
+Maybe you mistook good and bad revs?
+ok 44 - bisect errors out if bad and good are mistaken
 
-  87dcb4b untracked symlink remains
+expecting success of 6030.45 'bisect does not create a "bisect" branch': 
+	git bisect reset &&
+	git bisect start $HASH7 $HASH1 &&
+	git branch bisect &&
+	rev_hash4=$(git rev-parse --verify HEAD) &&
+	test "$rev_hash4" = "$HASH4" &&
+	git branch -D bisect &&
+	git bisect good &&
+	git branch bisect &&
+	rev_hash6=$(git rev-parse --verify HEAD) &&
+	test "$rev_hash6" = "$HASH6" &&
+	git bisect good > my_bisect_log.txt &&
+	grep "$HASH7 is the first bad commit" my_bisect_log.txt &&
+	git bisect reset &&
+	rev_hash6=$(git rev-parse --verify bisect) &&
+	test "$rev_hash6" = "$HASH6" &&
+	git branch -D bisect
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+Deleted branch bisect (was 32a594a).
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
+3659270ffa1e67547111a107f53191676dff3424 is the first bad commit
+Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
+HEAD is now at 3de952f Add <3: Another new day for git> into <hello>.
+Deleted branch bisect (was ff29dcb).
+ok 45 - bisect does not create a "bisect" branch
 
- git branch <new-branch-name> 87dcb4b
+expecting success of 6030.46 'side branch creation': 
+	git bisect reset &&
+	git checkout -b side $HASH4 &&
+	add_line_into_file "5(side): first line on a side branch" hello2 &&
+	SIDE_HASH5=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "6(side): second line on a side branch" hello2 &&
+	SIDE_HASH6=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "7(side): third line on a side branch" hello2 &&
+	SIDE_HASH7=$(git rev-parse --verify HEAD)
 
-HEAD is now at d2c335b base
-ok 3 - a/b-2/c/d is kept when clobbering symlink b
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to a new branch 'side'
+ok 46 - side branch creation
 
-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
+expecting success of 6030.47 'good merge base when good and bad are siblings': 
+	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
+	test_grep "merge base must be tested" my_bisect_log.txt &&
+	grep $HASH4 my_bisect_log.txt &&
+	git bisect good > my_bisect_log.txt &&
+	! grep "merge base must be tested" my_bisect_log.txt &&
+	grep $HASH6 my_bisect_log.txt &&
+	git bisect reset
 
-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
+Bisecting: a merge base must be tested
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
+Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
+Switched to branch 'side'
+ok 47 - good merge base when good and bad are siblings
 
-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
+expecting success of 6030.48 'skipped merge base when good and bad are siblings': 
+	git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt &&
+	test_grep "merge base must be tested" my_bisect_log.txt &&
+	grep $HASH4 my_bisect_log.txt &&
+	git bisect skip > my_bisect_log.txt 2>&1 &&
+	grep "warning" my_bisect_log.txt &&
+	grep $SIDE_HASH6 my_bisect_log.txt &&
+	git bisect reset
 
-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
+Bisecting: a merge base must be tested
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+warning: the merge base between 5f781ef4cb0a9c22dd8218d08759770f336c6b8b and [3659270ffa1e67547111a107f53191676dff3424] must be skipped.
+[11ec2d5fe9fe0e901ce1c6680bb1025a3431ebcf] Add <6(side): second line on a side branch> into <hello2>.
+Previous HEAD position was 11ec2d5 Add <6(side): second line on a side branch> into <hello2>.
+Switched to branch 'side'
+ok 48 - skipped merge base when good and bad are siblings
 
-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
+expecting success of 6030.49 'bad merge base when good and bad are siblings': 
+	git bisect start "$HASH7" HEAD > my_bisect_log.txt &&
+	test_grep "merge base must be tested" my_bisect_log.txt &&
+	grep $HASH4 my_bisect_log.txt &&
+	test_must_fail git bisect bad > my_bisect_log.txt 2>&1 &&
+	test_grep "merge base $HASH4 is bad" my_bisect_log.txt &&
+	test_grep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
+	git bisect reset
 
-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)
+Bisecting: a merge base must be tested
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+The merge base 32a594a3fdac2d57cf6d02987e30eec68511498c is bad.
+This means the bug has been fixed between 32a594a3fdac2d57cf6d02987e30eec68511498c and [5f781ef4cb0a9c22dd8218d08759770f336c6b8b].
+Previous HEAD position was 32a594a Add <4: Ciao for now> into <hello>.
+Switched to branch 'side'
+ok 49 - bad merge base when good and bad are siblings
 
-expecting success of 6415.7 'a/b was resolved as symlink': 
-	test -h a/b
+expecting success of 6030.50 'many merge bases creation': 
+	git checkout "$SIDE_HASH5" &&
+	git merge -m "merge HASH5 and SIDE_HASH5" "$HASH5" &&
+	A_HASH=$(git rev-parse --verify HEAD) &&
+	git checkout side &&
+	git merge -m "merge HASH7 and SIDE_HASH7" "$HASH7" &&
+	B_HASH=$(git rev-parse --verify HEAD) &&
+	git merge-base --all "$A_HASH" "$B_HASH" > merge_bases.txt &&
+	test_line_count = 2 merge_bases.txt &&
+	grep "$HASH5" merge_bases.txt &&
+	grep "$SIDE_HASH5" merge_bases.txt
 
-ok 7 - a/b was resolved as symlink
+Note: switching to '7208484534e368cca8612445f78d2afcf429f37e'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-HEAD is now at deb429a Merge branch 'main' into HEAD
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 7208484 Create file <hello2> with <5(side): first line on a side branch> inside.
+Merge made by the 'ort' strategy.
+ hello | 1 +
+ 1 file changed, 1 insertion(+)
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  deb429a Merge branch 'main' into HEAD
+  b9ff094 merge HASH5 and SIDE_HASH5
 
 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
+ git branch <new-branch-name> b9ff094
 
-HEAD is now at d35741f x
+Switched to branch 'side'
 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)
+ hello | 3 +++
+ 1 file changed, 3 insertions(+)
+3082e11d3a0f2edca194c8ce1eb802256e38e75e
+7208484534e368cca8612445f78d2afcf429f37e
+ok 50 - many merge bases creation
 
-expecting success of 6415.9 'a/b was resolved as symlink': 
-	test -h a/b
+expecting success of 6030.51 '"git bisect run --first-parent" simple case': 
+	git rev-list --first-parent $B_HASH ^$HASH4 >first_parent_chain.txt &&
+	write_script test_script.sh <<-\EOF &&
+	grep $(git rev-parse HEAD) first_parent_chain.txt || exit -1
+	! grep line hello >/dev/null
+	EOF
+	git bisect start --first-parent &&
+	test_path_is_file ".git/BISECT_FIRST_PARENT" &&
+	git bisect good $HASH4 &&
+	git bisect bad $B_HASH &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$B_HASH is the first bad commit" my_bisect_log.txt &&
+	git bisect reset &&
+	test_path_is_missing .git/BISECT_FIRST_PARENT
 
-ok 9 - a/b was resolved as symlink
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 1 revision left to test after this (roughly 1 step)
+[11ec2d5fe9fe0e901ce1c6680bb1025a3431ebcf] Add <6(side): second line on a side branch> into <hello2>.
+fe9323c3283b1fd8f5356e35e66d011387629714 is the first bad commit
+Previous HEAD position was 5f781ef Add <7(side): third line on a side branch> into <hello2>.
+Switched to branch 'side'
+ok 51 - "git bisect run --first-parent" simple case
 
-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
+expecting success of 6030.52 'good merge bases when good and bad are siblings': 
+	git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
+	test_grep "merge base must be tested" my_bisect_log.txt &&
+	git bisect good > my_bisect_log2.txt &&
+	test_grep "merge base must be tested" my_bisect_log2.txt &&
+	{
+		{
+			grep "$SIDE_HASH5" my_bisect_log.txt &&
+			grep "$HASH5" my_bisect_log2.txt
+		} || {
+			grep "$SIDE_HASH5" my_bisect_log2.txt &&
+			grep "$HASH5" my_bisect_log.txt
+		}
+	} &&
+	git bisect reset
 
-HEAD is now at deb429a Merge branch 'main' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+Bisecting: a merge base must be tested
+Bisecting: a merge base must be tested
+[7208484534e368cca8612445f78d2afcf429f37e] Create file <hello2> with <5(side): first line on a side branch> inside.
+[3082e11d3a0f2edca194c8ce1eb802256e38e75e] Add <5: Another new line.> into <hello>.
+Previous HEAD position was 3082e11 Add <5: Another new line.> into <hello>.
+Switched to branch 'side'
+ok 52 - good merge bases when good and bad are siblings
 
-  deb429a Merge branch 'main' into HEAD
+expecting success of 6030.53 'optimized merge base checks': 
+	git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
+	test_grep "merge base must be tested" my_bisect_log.txt &&
+	grep "$HASH4" my_bisect_log.txt &&
+	git bisect good > my_bisect_log2.txt &&
+	test -f ".git/BISECT_ANCESTORS_OK" &&
+	test "$HASH6" = $(git rev-parse --verify HEAD) &&
+	git bisect bad &&
+	git bisect good "$A_HASH" > my_bisect_log4.txt &&
+	test_grep "merge base must be tested" my_bisect_log4.txt &&
+	test_path_is_missing ".git/BISECT_ANCESTORS_OK"
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Bisecting: a merge base must be tested
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[3082e11d3a0f2edca194c8ce1eb802256e38e75e] Add <5: Another new line.> into <hello>.
+Bisecting: a merge base must be tested
+ok 53 - optimized merge base checks
 
- git branch <new-branch-name> deb429a
+expecting success of 6030.54 '"parallel" side branch creation': 
+	git bisect reset &&
+	git checkout -b parallel $HASH1 &&
+	mkdir dir1 dir2 &&
+	add_line_into_file "1(para): line 1 on parallel branch" dir1/file1 &&
+	PARA_HASH1=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "2(para): line 2 on parallel branch" dir2/file2 &&
+	PARA_HASH2=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "3(para): line 3 on parallel branch" dir2/file3 &&
+	PARA_HASH3=$(git rev-parse --verify HEAD) &&
+	git merge -m "merge HASH4 and PARA_HASH3" "$HASH4" &&
+	PARA_HASH4=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "5(para): add line on parallel branch" dir1/file1 &&
+	PARA_HASH5=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "6(para): add line on parallel branch" dir2/file2 &&
+	PARA_HASH6=$(git rev-parse --verify HEAD) &&
+	git merge -m "merge HASH7 and PARA_HASH6" "$HASH7" &&
+	PARA_HASH7=$(git rev-parse --verify HEAD)
 
-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 +
+Previous HEAD position was 3082e11 Add <5: Another new line.> into <hello>.
+Switched to branch 'side'
+Switched to a new branch 'parallel'
+Merge made by the 'ort' strategy.
+ hello | 3 +++
+ 1 file changed, 3 insertions(+)
+Merge made by the 'ort' strategy.
+ hello | 3 +++
+ 1 file changed, 3 insertions(+)
+ok 54 - "parallel" side branch creation
+
+expecting success of 6030.55 'restricting bisection on one dir': 
+	git bisect reset &&
+	git bisect start HEAD $HASH1 -- dir1 &&
+	para1=$(git rev-parse --verify HEAD) &&
+	test "$para1" = "$PARA_HASH1" &&
+	git bisect bad > my_bisect_log.txt &&
+	grep "$PARA_HASH1 is the first bad commit" my_bisect_log.txt
+
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[de049b9c4e10f2524a46e151b65aa4f156fd52d6] Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
+de049b9c4e10f2524a46e151b65aa4f156fd52d6 is the first bad commit
+ok 55 - restricting bisection on one dir
+
+expecting success of 6030.56 'restricting bisection on one dir and a file': 
+	git bisect reset &&
+	git bisect start HEAD $HASH1 -- dir1 hello &&
+	para4=$(git rev-parse --verify HEAD) &&
+	test "$para4" = "$PARA_HASH4" &&
+	git bisect bad &&
+	hash3=$(git rev-parse --verify HEAD) &&
+	test "$hash3" = "$HASH3" &&
+	git bisect good &&
+	hash4=$(git rev-parse --verify HEAD) &&
+	test "$hash4" = "$HASH4" &&
+	git bisect good &&
+	para1=$(git rev-parse --verify HEAD) &&
+	test "$para1" = "$PARA_HASH1" &&
+	git bisect good > my_bisect_log.txt &&
+	grep "$PARA_HASH4 is the first bad commit" my_bisect_log.txt
+
+Previous HEAD position was de049b9 Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
+Switched to branch 'parallel'
+Bisecting: 4 revisions left to test after this (roughly 2 steps)
+[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+Bisecting: 1 revision left to test after this (roughly 1 step)
+[32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[de049b9c4e10f2524a46e151b65aa4f156fd52d6] Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
+3f04efc661812c541a2f96ecaae46a79c6ea2464 is the first bad commit
+ok 56 - restricting bisection on one dir and a file
+
+expecting success of 6030.57 'skipping away from skipped commit': 
+	git bisect start $PARA_HASH7 $HASH1 &&
+	para4=$(git rev-parse --verify HEAD) &&
+	test "$para4" = "$PARA_HASH4" &&
+        git bisect skip &&
+	hash7=$(git rev-parse --verify HEAD) &&
+	test "$hash7" = "$HASH7" &&
+        git bisect skip &&
+	para3=$(git rev-parse --verify HEAD) &&
+	test "$para3" = "$PARA_HASH3"
+
+Previous HEAD position was de049b9 Create file <dir1/file1> with <1(para): line 1 on parallel branch> inside.
+Switched to branch 'parallel'
+Bisecting: 5 revisions left to test after this (roughly 3 steps)
+[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
+Bisecting: 6 revisions left to test after this (roughly 3 steps)
+[3659270ffa1e67547111a107f53191676dff3424] Add <7: Should be the last line.> into <hello>.
+Bisecting: 6 revisions left to test after this (roughly 3 steps)
+[a5a4dc83955e310a4f693ab6f6bcea46c8544843] Create file <dir2/file3> with <3(para): line 3 on parallel branch> inside.
+ok 57 - skipping away from skipped commit
+
+expecting success of 6030.58 'erroring out when using bad path arguments': 
+	test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
+	test_grep "bad path arguments" error.txt
+
+Maybe you started with bad path arguments?
+ok 58 - erroring out when using bad path arguments
+
+expecting success of 6030.59 'test bisection on bare repo - --no-checkout specified': 
+	git clone --bare . bare.nocheckout &&
+	(
+		cd bare.nocheckout &&
+		git bisect start --no-checkout &&
+		git bisect good $HASH1 &&
+		git bisect bad $HASH4 &&
+		git bisect run eval \
+			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
+			>../nocheckout.log
+	) &&
+	grep "$HASH3 is the first bad commit" nocheckout.log
+
+Cloning into bare repository 'bare.nocheckout'...
+done.
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
+ok 59 - test bisection on bare repo - --no-checkout specified
+
+expecting success of 6030.60 'test bisection on bare repo - --no-checkout defaulted': 
+	git clone --bare . bare.defaulted &&
+	(
+		cd bare.defaulted &&
+		git bisect start &&
+		git bisect good $HASH1 &&
+		git bisect bad $HASH4 &&
+		git bisect run eval \
+			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
+			>../defaulted.log
+	) &&
+	grep "$HASH3 is the first bad commit" defaulted.log
+
+Cloning into bare repository 'bare.defaulted'...
+done.
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
+ok 60 - test bisection on bare repo - --no-checkout defaulted
+
+expecting success of 6030.61 'broken branch creation': 
+	git bisect reset &&
+	git checkout -b broken $HASH4 &&
+	git tag BROKEN_HASH4 $HASH4 &&
+	add_line_into_file "5(broken): first line on a broken branch" hello2 &&
+	git tag BROKEN_HASH5 &&
+	mkdir missing &&
+	:> missing/MISSING &&
+	git add missing/MISSING &&
+	git commit -m "6(broken): Added file that will be deleted" &&
+	git tag BROKEN_HASH6 &&
+	deleted=$(git rev-parse --verify HEAD:missing) &&
+	add_line_into_file "7(broken): second line on a broken branch" hello2 &&
+	git tag BROKEN_HASH7 &&
+	add_line_into_file "8(broken): third line on a broken branch" hello2 &&
+	git tag BROKEN_HASH8 &&
+	git rm missing/MISSING &&
+	git commit -m "9(broken): Remove missing file" &&
+	git tag BROKEN_HASH9 &&
+	rm .git/objects/$(test_oid_to_path $deleted)
+
+Switched to a new branch 'broken'
+[broken 55bdac5] 6(broken): Added file that will be deleted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 missing/MISSING
+rm 'missing/MISSING'
+[broken 508db08] 9(broken): Remove missing file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 missing/MISSING
+ok 61 - broken branch creation
+
+expecting success of 6030.62 'bisect fails if tree is broken on start commit': 
+	git bisect reset &&
+	test_must_fail git bisect start BROKEN_HASH7 BROKEN_HASH4 2>error.txt &&
+	test_cmp expected.missing-tree.default error.txt
+
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+ok 62 - bisect fails if tree is broken on start commit
+
+expecting success of 6030.63 'bisect fails if tree is broken on trial commit': 
+	git bisect reset &&
+	test_must_fail git bisect start BROKEN_HASH9 BROKEN_HASH4 2>error.txt &&
+	git reset --hard broken &&
+	git checkout broken &&
+	test_cmp expected.missing-tree.default error.txt
+
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+HEAD is now at 508db08 9(broken): Remove missing file
+Already on 'broken'
+ok 63 - bisect fails if tree is broken on trial commit
+
+expecting success of 6030.64 'bisect: --no-checkout - start commit bad': 
+	git bisect reset &&
+	git bisect start BROKEN_HASH7 BROKEN_HASH4 --no-checkout &&
+	check_same BROKEN_HASH6 BISECT_HEAD &&
+	git bisect reset
+
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
+Checking BROKEN_HASH6 is the same as BISECT_HEAD
+ok 64 - bisect: --no-checkout - start commit bad
+
+expecting success of 6030.65 'bisect: --no-checkout - trial commit bad': 
+	git bisect reset &&
+	git bisect start broken BROKEN_HASH4 --no-checkout &&
+	check_same BROKEN_HASH6 BISECT_HEAD &&
+	git bisect reset
+
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
+Checking BROKEN_HASH6 is the same as BISECT_HEAD
+ok 65 - bisect: --no-checkout - trial commit bad
+
+expecting success of 6030.66 'bisect: --no-checkout - target before breakage': 
+	git bisect reset &&
+	git bisect start broken BROKEN_HASH4 --no-checkout &&
+	check_same BROKEN_HASH6 BISECT_HEAD &&
+	git bisect bad BISECT_HEAD &&
+	check_same BROKEN_HASH5 BISECT_HEAD &&
+	git bisect bad BISECT_HEAD &&
+	check_same BROKEN_HASH5 bisect/bad &&
+	git bisect reset
+
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
+Checking BROKEN_HASH6 is the same as BISECT_HEAD
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[fd9df6dc932ed4e1539696448c064bc31b947f3f] Create file <hello2> with <5(broken): first line on a broken branch> inside.
+Checking BROKEN_HASH5 is the same as BISECT_HEAD
+fd9df6dc932ed4e1539696448c064bc31b947f3f is the first bad commit
+commit fd9df6dc932ed4e1539696448c064bc31b947f3f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:28:13 2005 -0700
+
+    Create file <hello2> with <5(broken): first line on a broken branch> inside.
+
+ hello2 | 1 +
  1 file changed, 1 insertion(+)
-ok 10 - Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)
+ create mode 100644 hello2
+Checking BROKEN_HASH5 is the same as bisect/bad
+ok 66 - bisect: --no-checkout - target before breakage
 
-expecting success of 6415.11 'a/b was resolved as symlink': 
-	test -h a/b
+expecting success of 6030.67 'bisect: --no-checkout - target in breakage': 
+	git bisect reset &&
+	git bisect start broken BROKEN_HASH4 --no-checkout &&
+	check_same BROKEN_HASH6 BISECT_HEAD &&
+	git bisect bad BISECT_HEAD &&
+	check_same BROKEN_HASH5 BISECT_HEAD &&
+	test_must_fail git bisect good BISECT_HEAD &&
+	check_same BROKEN_HASH6 bisect/bad &&
+	git bisect reset
 
-ok 11 - a/b was resolved as symlink
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
+Checking BROKEN_HASH6 is the same as BISECT_HEAD
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[fd9df6dc932ed4e1539696448c064bc31b947f3f] Create file <hello2> with <5(broken): first line on a broken branch> inside.
+Checking BROKEN_HASH5 is the same as BISECT_HEAD
+55bdac58da30a5a429094bf5466b8095b29ecbf0 is the first bad commit
+fatal: unable to read tree (39f7e61a724187ab767d2e08442d9b6b9dab587d)
+fatal: unable to start 'show' for object '55bdac58da30a5a429094bf5466b8095b29ecbf0'
+Checking BROKEN_HASH6 is the same as bisect/bad
+ok 67 - bisect: --no-checkout - target in breakage
 
-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
+expecting success of 6030.68 'bisect: --no-checkout - target after breakage': 
+	git bisect reset &&
+	git bisect start broken BROKEN_HASH4 --no-checkout &&
+	check_same BROKEN_HASH6 BISECT_HEAD &&
+	git bisect good BISECT_HEAD &&
+	check_same BROKEN_HASH8 BISECT_HEAD &&
+	test_must_fail git bisect good BISECT_HEAD &&
+	check_same BROKEN_HASH9 bisect/bad &&
+	git bisect reset
 
-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:
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
+Checking BROKEN_HASH6 is the same as BISECT_HEAD
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[3df15bfcf4745f4f8ff0007d5ca42e75eba04ff9] Add <8(broken): third line on a broken branch> into <hello2>.
+Checking BROKEN_HASH8 is the same as BISECT_HEAD
+508db08019a8b4b05c3cfe2447ada8a4c78fe3de is the first bad commit
+fatal: unable to read tree (39f7e61a724187ab767d2e08442d9b6b9dab587d)
+fatal: unable to start 'show' for object '508db08019a8b4b05c3cfe2447ada8a4c78fe3de'
+Checking BROKEN_HASH9 is the same as bisect/bad
+ok 68 - bisect: --no-checkout - target after breakage
 
-  d961b81 Merge commit 'baseline^0' into HEAD
+expecting success of 6030.69 'bisect: demonstrate identification of damage boundary': 
+	git bisect reset &&
+	git checkout broken &&
+	git bisect start broken main --no-checkout &&
+	test_must_fail git bisect run "$SHELL_PATH" -c '
+		GOOD=$(git for-each-ref "--format=%(objectname)" refs/bisect/good-*) &&
+		git rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&
+		git pack-objects --stdout >/dev/null < tmp.$$
+		rc=$?
+		rm -f tmp.$$
+		test $rc = 0' &&
+	check_same BROKEN_HASH6 bisect/bad &&
+	git bisect reset
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Already on 'broken'
+Bisecting: 2 revisions left to test after this (roughly 1 step)
+[55bdac58da30a5a429094bf5466b8095b29ecbf0] 6(broken): Added file that will be deleted
+running '/bin/sh' '-c' '
+		GOOD=$(git for-each-ref "--format=%(objectname)" refs/bisect/good-*) &&
+		git rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&
+		git pack-objects --stdout >/dev/null < tmp.$$
+		rc=$?
+		rm -f tmp.$$
+		test $rc = 0'
+fatal: bad tree object 39f7e61a724187ab767d2e08442d9b6b9dab587d
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[fd9df6dc932ed4e1539696448c064bc31b947f3f] Create file <hello2> with <5(broken): first line on a broken branch> inside.
+running '/bin/sh' '-c' '
+		GOOD=$(git for-each-ref "--format=%(objectname)" refs/bisect/good-*) &&
+		git rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&
+		git pack-objects --stdout >/dev/null < tmp.$$
+		rc=$?
+		rm -f tmp.$$
+		test $rc = 0'
+fatal: unable to read tree (39f7e61a724187ab767d2e08442d9b6b9dab587d)
+fatal: unable to start 'show' for object '55bdac58da30a5a429094bf5466b8095b29ecbf0'
+Checking BROKEN_HASH6 is the same as bisect/bad
+ok 69 - bisect: demonstrate identification of damage boundary
 
- git branch <new-branch-name> d961b81
+expecting success of 6030.70 'bisect log: successful result': 
+	git bisect reset &&
+	git bisect start $HASH4 $HASH2 &&
+	git bisect good &&
+	git bisect log >bisect-log.txt &&
+	test_cmp expected.bisect-log bisect-log.txt &&
+	git bisect reset
 
-HEAD is now at 1750beb dir to symlink
-Merge made by the 'ort' strategy.
- a/x | 1 +
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+32a594a3fdac2d57cf6d02987e30eec68511498c is the first bad commit
+commit 32a594a3fdac2d57cf6d02987e30eec68511498c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:16:13 2005 -0700
+
+    Add <4: Ciao for now> into <hello>.
+
+ hello | 1 +
  1 file changed, 1 insertion(+)
-ok 12 - Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'broken'
+ok 70 - bisect log: successful result
 
-expecting success of 6415.13 'a/b was resolved as symlink': 
-	test -h a/b
+expecting success of 6030.71 'bisect log: only skip commits left': 
+	git bisect reset &&
+	git bisect start $HASH4 $HASH2 &&
+	test_must_fail git bisect skip &&
+	git bisect log >bisect-skip-log.txt &&
+	test_cmp expected.bisect-skip-log bisect-skip-log.txt &&
+	git bisect reset
 
-ok 13 - a/b was resolved as symlink
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+There are only 'skip'ped commits left to test.
+The first bad commit could be any of:
+3de952f2416b6084f557ec417709eac740c6818c
+32a594a3fdac2d57cf6d02987e30eec68511498c
+We cannot bisect more!
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'broken'
+ok 71 - bisect log: only skip commits left
 
-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
+expecting success of 6030.72 '"git bisect bad HEAD" behaves as "git bisect bad"': 
+	git checkout parallel &&
+	git bisect start HEAD $HASH1 &&
+	git bisect good HEAD &&
+	git bisect bad HEAD &&
+	test "$HASH6" = $(git rev-parse --verify HEAD) &&
+	git bisect reset
 
-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:
+Switched to branch 'parallel'
+Bisecting: 5 revisions left to test after this (roughly 3 steps)
+[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
+Bisecting: 2 revisions left to test after this (roughly 2 steps)
+[3659270ffa1e67547111a107f53191676dff3424] Add <7: Should be the last line.> into <hello>.
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[ff29dcbe6fe49a0b462bddf0691a013c12a53316] Add <6: Yet a line.> into <hello>.
+Previous HEAD position was ff29dcb Add <6: Yet a line.> into <hello>.
+Switched to branch 'parallel'
+ok 72 - "git bisect bad HEAD" behaves as "git bisect bad"
 
-  d961b81 Merge commit 'baseline^0' into HEAD
+expecting success of 6030.73 'bisect starts with only one new': 
+	git bisect reset &&
+	git bisect start &&
+	git bisect new $HASH4 &&
+	git bisect next
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+status: waiting for both good and bad commits
+status: waiting for good commit(s), bad commit known
+warning: bisecting only with a new commit
+Bisecting: 1 revision left to test after this (roughly 1 step)
+[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
+ok 73 - bisect starts with only one new
 
- git branch <new-branch-name> d961b81
+expecting success of 6030.74 'bisect does not start with only one old': 
+	git bisect reset &&
+	git bisect start &&
+	git bisect old $HASH1 &&
+	test_must_fail git bisect next
 
-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
+Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
+Switched to branch 'parallel'
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+error: You need to give me at least one bad|new and good|old revision.
+You can use "git bisect bad|new" and "git bisect good|old" for that.
+ok 74 - bisect does not start with only one old
 
-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
+expecting success of 6030.75 'bisect start with one new and old': 
+	git bisect reset &&
+	git bisect start &&
+	git bisect old $HASH1 &&
+	git bisect new $HASH4 &&
+	git bisect new &&
+	git bisect new >bisect_result &&
+	grep "$HASH2 is the first new commit" bisect_result &&
+	git bisect log >log_to_replay.txt &&
+	git bisect reset
 
-HEAD is now at deb429a Merge branch 'main' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+Already on 'parallel'
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
+7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first new commit
+Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
+Switched to branch 'parallel'
+ok 75 - bisect start with one new and old
 
-  deb429a Merge branch 'main' into HEAD
+expecting success of 6030.76 'bisect replay with old and new': 
+	git bisect replay log_to_replay.txt >bisect_result &&
+	grep "$HASH2 is the first new commit" bisect_result &&
+	git bisect reset
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first new commit
+Already on 'parallel'
+ok 76 - bisect replay with old and new
 
- git branch <new-branch-name> deb429a
+expecting success of 6030.77 'bisect replay with CRLF log': 
+	append_cr <log_to_replay.txt >log_to_replay_crlf.txt &&
+	git bisect replay log_to_replay_crlf.txt >bisect_result_crlf &&
+	grep "$HASH2 is the first new commit" bisect_result_crlf &&
+	git bisect reset
 
-HEAD is now at d35741f x
-error: Updating the following directories would lose untracked files in them:
-	a/b
+7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first new commit
+Already on 'parallel'
+ok 77 - bisect replay with CRLF log
 
-Aborting
-Merge with strategy ort failed.
-ok 15 - do not lose untracked in merge (recursive)
+expecting success of 6030.78 'bisect cannot mix old/new and good/bad': 
+	git bisect start &&
+	git bisect bad $HASH4 &&
+	test_must_fail git bisect old $HASH1
 
-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
+status: waiting for both good and bad commits
+status: waiting for good commit(s), bad commit known
+error: Invalid command: you're currently in a bad/good bisect
+fatal: unknown command: 'old'
 
-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)
+usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
+   or: git bisect (good|bad) [<rev>...]
+   or: git bisect terms [--term-good | --term-bad]
+   or: git bisect skip [(<rev>|<range>)...]
+   or: git bisect next
+   or: git bisect reset [<commit>]
+   or: git bisect visualize
+   or: git bisect replay <logfile>
+   or: git bisect log
+   or: git bisect run <cmd> [<arg>...]
 
-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
+ok 78 - bisect cannot mix old/new and good/bad
 
-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
+expecting success of 6030.79 'bisect terms needs 0 or 1 argument': 
+	git bisect reset &&
+	test_must_fail git bisect terms only-one &&
+	test_must_fail git bisect terms 1 2 &&
+	test_must_fail git bisect terms 2>actual &&
+	echo "error: no terms defined" >expected &&
+	test_cmp expected actual
 
-Aborting
-Merge with strategy ort failed.
-ok 17 - do not lose modifications in merge (recursive)
+Already on 'parallel'
+error: no terms defined
+error: 'git bisect terms' requires 0 or 1 argument
+ok 79 - bisect terms needs 0 or 1 argument
 
-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
+expecting success of 6030.80 'bisect terms shows good/bad after start': 
+	git bisect reset &&
+	git bisect start HEAD $HASH1 &&
+	git bisect terms --term-good >actual &&
+	echo good >expected &&
+	test_cmp expected actual &&
+	git bisect terms --term-bad >actual &&
+	echo bad >expected &&
+	test_cmp expected actual
 
-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
+Bisecting: 5 revisions left to test after this (roughly 3 steps)
+[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
+ok 80 - bisect terms shows good/bad after start
 
-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
+expecting success of 6030.81 'bisect start with one term1 and term2': 
+	git bisect reset &&
+	git bisect start --term-old term2 --term-new term1 &&
+	git bisect term2 $HASH1 &&
+	git bisect term1 $HASH4 &&
+	git bisect term1 &&
+	git bisect term1 >bisect_result &&
+	grep "$HASH2 is the first term1 commit" bisect_result &&
+	git bisect log >log_to_replay.txt &&
+	git bisect reset
 
-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)
+Previous HEAD position was 3f04efc merge HASH4 and PARA_HASH3
+Switched to branch 'parallel'
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
+7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first term1 commit
+Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
+Switched to branch 'parallel'
+ok 81 - bisect start with one term1 and term2
 
-expecting success of 6415.20 'a/b-2 was resolved as symlink': 
-	test -h a/b-2
+expecting success of 6030.82 'bogus command does not start bisect': 
+	git bisect reset &&
+	test_must_fail git bisect --bisect-terms 1 2 2>out &&
+	! grep "You need to start" out &&
+	test_must_fail git bisect --bisect-terms 2>out &&
+	! grep "You need to start" out &&
+	grep "git bisect.*visualize" out &&
+	git bisect reset
 
-ok 20 - a/b-2 was resolved as symlink
+   or: git bisect visualize
+ok 82 - bogus command does not start bisect
 
-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
+expecting success of 6030.83 'bisect replay with term1 and term2': 
+	git bisect replay log_to_replay.txt >bisect_result &&
+	grep "$HASH2 is the first term1 commit" bisect_result &&
+	git bisect reset
 
-HEAD is now at 57dad8a Merge tag 'test2' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first term1 commit
+Already on 'parallel'
+ok 83 - bisect replay with term1 and term2
 
-  57dad8a Merge tag 'test2' into HEAD
+expecting success of 6030.84 'bisect start term1 term2': 
+	git bisect reset &&
+	git bisect start --term-new term1 --term-old term2 $HASH4 $HASH1 &&
+	git bisect term1 &&
+	git bisect term1 >bisect_result &&
+	grep "$HASH2 is the first term1 commit" bisect_result &&
+	git bisect log >log_to_replay.txt &&
+	git bisect reset
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[7b7f204a749c3125d5224ed61ea2ae1187ad046f] Add <2: A new day for git> into <hello>.
+7b7f204a749c3125d5224ed61ea2ae1187ad046f is the first term1 commit
+Previous HEAD position was 7b7f204 Add <2: A new day for git> into <hello>.
+Switched to branch 'parallel'
+ok 84 - bisect start term1 term2
 
- git branch <new-branch-name> 57dad8a
+expecting success of 6030.85 'bisect cannot mix terms': 
+	git bisect reset &&
+	git bisect start --term-good term1 --term-bad term2 $HASH4 $HASH1 &&
+	test_must_fail git bisect a &&
+	test_must_fail git bisect b &&
+	test_must_fail git bisect bad &&
+	test_must_fail git bisect good &&
+	test_must_fail git bisect new &&
+	test_must_fail git bisect old
 
-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)
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+error: Invalid command: you're currently in a term2/term1 bisect
+fatal: unknown command: 'a'
 
-expecting success of 6415.22 'a/b-2 was resolved as symlink': 
-	test -h a/b-2
+usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
+   or: git bisect (good|bad) [<rev>...]
+   or: git bisect terms [--term-good | --term-bad]
+   or: git bisect skip [(<rev>|<range>)...]
+   or: git bisect next
+   or: git bisect reset [<commit>]
+   or: git bisect visualize
+   or: git bisect replay <logfile>
+   or: git bisect log
+   or: git bisect run <cmd> [<arg>...]
 
-ok 22 - a/b-2 was resolved as symlink
+error: Invalid command: you're currently in a term2/term1 bisect
+fatal: unknown command: 'b'
 
-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
+usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
+   or: git bisect (good|bad) [<rev>...]
+   or: git bisect terms [--term-good | --term-bad]
+   or: git bisect skip [(<rev>|<range>)...]
+   or: git bisect next
+   or: git bisect reset [<commit>]
+   or: git bisect visualize
+   or: git bisect replay <logfile>
+   or: git bisect log
+   or: git bisect run <cmd> [<arg>...]
 
-HEAD is now at 57dad8a Merge tag 'test2' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+error: Invalid command: you're currently in a term2/term1 bisect
+fatal: unknown command: 'bad'
 
-  57dad8a Merge tag 'test2' into HEAD
+usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
+   or: git bisect (good|bad) [<rev>...]
+   or: git bisect terms [--term-good | --term-bad]
+   or: git bisect skip [(<rev>|<range>)...]
+   or: git bisect next
+   or: git bisect reset [<commit>]
+   or: git bisect visualize
+   or: git bisect replay <logfile>
+   or: git bisect log
+   or: git bisect run <cmd> [<arg>...]
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+error: Invalid command: you're currently in a term2/term1 bisect
+fatal: unknown command: 'good'
 
- git branch <new-branch-name> 57dad8a
+usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
+   or: git bisect (good|bad) [<rev>...]
+   or: git bisect terms [--term-good | --term-bad]
+   or: git bisect skip [(<rev>|<range>)...]
+   or: git bisect next
+   or: git bisect reset [<commit>]
+   or: git bisect visualize
+   or: git bisect replay <logfile>
+   or: git bisect log
+   or: git bisect run <cmd> [<arg>...]
 
-Switched to a new branch 'foo'
-Merge made by the 'ort' strategy.
- a/x | 1 +
+error: Invalid command: you're currently in a term2/term1 bisect
+fatal: unknown command: 'new'
+
+usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
+   or: git bisect (good|bad) [<rev>...]
+   or: git bisect terms [--term-good | --term-bad]
+   or: git bisect skip [(<rev>|<range>)...]
+   or: git bisect next
+   or: git bisect reset [<commit>]
+   or: git bisect visualize
+   or: git bisect replay <logfile>
+   or: git bisect log
+   or: git bisect run <cmd> [<arg>...]
+
+error: Invalid command: you're currently in a term2/term1 bisect
+fatal: unknown command: 'old'
+
+usage: git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
+   or: git bisect (good|bad) [<rev>...]
+   or: git bisect terms [--term-good | --term-bad]
+   or: git bisect skip [(<rev>|<range>)...]
+   or: git bisect next
+   or: git bisect reset [<commit>]
+   or: git bisect visualize
+   or: git bisect replay <logfile>
+   or: git bisect log
+   or: git bisect run <cmd> [<arg>...]
+
+ok 85 - bisect cannot mix terms
+
+expecting success of 6030.86 'bisect terms rejects invalid terms': 
+	git bisect reset &&
+	test_must_fail git bisect start --term-good &&
+	test_must_fail git bisect start --term-good invalid..term &&
+	test_must_fail git bisect start --term-bad &&
+	test_must_fail git bisect terms --term-bad invalid..term &&
+	test_must_fail git bisect terms --term-good bad &&
+	test_must_fail git bisect terms --term-good old &&
+	test_must_fail git bisect terms --term-good skip &&
+	test_must_fail git bisect terms --term-good reset &&
+	test_path_is_missing .git/BISECT_TERMS
+
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'parallel'
+error: '' is not a valid term
+error: 'invalid..term' is not a valid term
+error: '' is not a valid term
+error: 'git bisect terms' requires 0 or 1 argument
+error: 'git bisect terms' requires 0 or 1 argument
+error: 'git bisect terms' requires 0 or 1 argument
+error: 'git bisect terms' requires 0 or 1 argument
+error: 'git bisect terms' requires 0 or 1 argument
+ok 86 - bisect terms rejects invalid terms
+
+expecting success of 6030.87 'bisect start --term-* does store terms': 
+	git bisect reset &&
+	git bisect start --term-bad=one --term-good=two &&
+	git bisect terms >actual &&
+	cat <<-EOF >expected &&
+	Your current terms are two for the old state
+	and one for the new state.
+	EOF
+	test_cmp expected actual &&
+	git bisect terms --term-bad >actual &&
+	echo one >expected &&
+	test_cmp expected actual &&
+	git bisect terms --term-good >actual &&
+	echo two >expected &&
+	test_cmp expected actual
+
+Already on 'parallel'
+status: waiting for both good and bad commits
+ok 87 - bisect start --term-* does store terms
+
+expecting success of 6030.88 'bisect start takes options and revs in any order': 
+	git bisect reset &&
+	git bisect start --term-good one $HASH4 \
+		--term-good two --term-bad bad-term \
+		$HASH1 --term-good three -- &&
+	(git bisect terms --term-bad && git bisect terms --term-good) >actual &&
+	printf "%s\n%s\n" bad-term three >expected &&
+	test_cmp expected actual
+
+Already on 'parallel'
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+ok 88 - bisect start takes options and revs in any order
+
+expecting success of 6030.89 'bisect skip works with --term*': 
+	git bisect reset &&
+	git bisect start --term-new=fixed --term-old=unfixed HEAD $HASH1 &&
+	hash_skipped_from=$(git rev-parse --verify HEAD) &&
+	git bisect skip &&
+	hash_skipped_to=$(git rev-parse --verify HEAD) &&
+	test "$hash_skipped_from" != "$hash_skipped_to"
+
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'parallel'
+Bisecting: 5 revisions left to test after this (roughly 3 steps)
+[3f04efc661812c541a2f96ecaae46a79c6ea2464] merge HASH4 and PARA_HASH3
+Bisecting: 6 revisions left to test after this (roughly 3 steps)
+[3659270ffa1e67547111a107f53191676dff3424] Add <7: Should be the last line.> into <hello>.
+ok 89 - bisect skip works with --term*
+
+expecting success of 6030.90 'git bisect reset cleans bisection state properly': 
+	git bisect reset &&
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	git bisect reset &&
+	test -z "$(git for-each-ref "refs/bisect/*")" &&
+	test_ref_missing BISECT_EXPECTED_REV &&
+	test_path_is_missing ".git/BISECT_ANCESTORS_OK" &&
+	test_path_is_missing ".git/BISECT_LOG" &&
+	test_path_is_missing ".git/BISECT_RUN" &&
+	test_path_is_missing ".git/BISECT_TERMS" &&
+	test_path_is_missing ".git/BISECT_HEAD" &&
+	test_path_is_missing ".git/BISECT_START"
+
+Previous HEAD position was 3659270 Add <7: Should be the last line.> into <hello>.
+Switched to branch 'parallel'
+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 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
+Switched to branch 'parallel'
+error: reference does not exist
+ok 90 - git bisect reset cleans bisection state properly
+
+expecting success of 6030.91 'bisect handles annotated tags': 
+	test_commit commit-one &&
+	git tag -m foo tag-one &&
+	test_commit commit-two &&
+	git tag -m foo tag-two &&
+	git bisect start &&
+	git bisect good tag-one &&
+	git bisect bad tag-two >output &&
+	bad=$(git rev-parse --verify tag-two^{commit}) &&
+	grep "$bad is the first bad commit" output
+
+[parallel f1585f4] commit-one
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 23 - merge should not have F/D conflicts (recursive)
+ create mode 100644 commit-one.t
+[parallel e0be3ae] commit-two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-two.t
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+e0be3aebb5267e11957031f9de30f2ae54b3a230 is the first bad commit
+ok 91 - bisect handles annotated tags
 
-expecting success of 6415.24 'a/b-2 was resolved as symlink': 
-	test -h a/b-2
+expecting success of 6030.92 'bisect run fails with exit code equals or greater than 128': 
+	write_script test_script.sh <<-\EOF &&
+	exit 128
+	EOF
+	test_must_fail git bisect run ./test_script.sh &&
+	write_script test_script.sh <<-\EOF &&
+	exit 255
+	EOF
+	test_must_fail git bisect run ./test_script.sh
 
-ok 24 - a/b-2 was resolved as symlink
+running './test_script.sh'
+error: bisect run failed: exit code 128 from './test_script.sh' is < 0 or >= 128
+running './test_script.sh'
+error: bisect run failed: exit code 255 from './test_script.sh' is < 0 or >= 128
+ok 92 - bisect run fails with exit code equals or greater than 128
 
-# still have 1 known breakage(s)
-# passed all remaining 23 test(s)
-1..24
+expecting success of 6030.93 'bisect visualize with a filename with dash and space': 
+	echo "My test line" >>"./-hello 2" &&
+	git add -- "./-hello 2" &&
+	git commit --quiet -m "Add test line" -- "./-hello 2" &&
+	git bisect visualize -p -- "-hello 2"
+
+commit 3cbde3a4f793d47d680a620ed5dc56faa69ec7d6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:32:13 2005 -0700
+
+    Add test line
+
+diff --git a/-hello 2 b/-hello 2
+new file mode 100644
+index 0000000..2b57c7c
+--- /dev/null
++++ b/-hello 2	
+@@ -0,0 +1 @@
++My test line
+ok 93 - bisect visualize with a filename with dash and space
+
+expecting success of 6030.94 'bisect state output with multiple good commits': 
+	git bisect reset &&
+	git bisect start >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect log >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect good "$HASH1" >output &&
+	grep "waiting for bad commit, 1 good commit known" output &&
+	git bisect log >output &&
+	grep "waiting for bad commit, 1 good commit known" output &&
+	git bisect good "$HASH2" >output &&
+	grep "waiting for bad commit, 2 good commits known" output &&
+	git bisect log >output &&
+	grep "waiting for bad commit, 2 good commits known" output
+
+Already on 'parallel'
+status: waiting for both good and bad commits
+# status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+# status: waiting for bad commit, 1 good commit known
+status: waiting for bad commit, 2 good commits known
+# status: waiting for bad commit, 2 good commits known
+ok 94 - bisect state output with multiple good commits
+
+expecting success of 6030.95 'bisect state output with bad commit': 
+	git bisect reset &&
+	git bisect start >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect log >output &&
+	grep "waiting for both good and bad commits" output &&
+	git bisect bad "$HASH4" >output &&
+	grep -F "waiting for good commit(s), bad commit known" output &&
+	git bisect log >output &&
+	grep -F "waiting for good commit(s), bad commit known" output
+
+Already on 'parallel'
+status: waiting for both good and bad commits
+# status: waiting for both good and bad commits
+status: waiting for good commit(s), bad commit known
+# status: waiting for good commit(s), bad commit known
+ok 95 - bisect state output with bad commit
+
+expecting success of 6030.96 'verify correct error message': 
+	git bisect reset &&
+	git bisect start $HASH4 $HASH1 &&
+	write_script test_script.sh <<-\EOF &&
+	rm .git/BISECT*
+	EOF
+	test_must_fail git bisect run ./test_script.sh 2>error &&
+	grep "git bisect good.*exited with error code" error
+
+Already on 'parallel'
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
+running './test_script.sh'
+error: bisect run failed: 'git bisect good' exited with error code -1
+ok 96 - verify correct error message
+
+# passed all 96 test(s)
+1..96
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6425-merge-rename-delete.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6425-merge-rename-delete/.git/
-expecting success of 6425.1 'rename/delete': 
-	echo foo >A &&
-	git add A &&
-	git commit -m "initial" &&
+*** t6413-merge-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git checkout -b rename &&
-	git mv A B &&
-	git commit -m "rename" &&
+[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
 
-	git checkout main &&
-	git rm A &&
-	git commit -m "delete" &&
+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
 
-	test_must_fail git merge --strategy=recursive rename >output &&
-	test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
-	test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
+HEAD is now at e0f7379 Initial
+Merge made by the 'ours' strategy.
+ok 2 - Check "ours" is CRLF
 
-[main (root-commit) 6604e52] initial
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6414-merge-rename-nocruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6414-merge-rename-nocruft/.git/
+expecting success of 6414.1 'setup': 
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
+
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
+
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
+
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
+
+	git checkout red &&
+	echo created by red >R &&
+	git update-index --add R &&
+	git commit -m "red creates R" &&
+
+	git checkout blue &&
+	sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
+	rm -f A &&
+	mv B A &&
+	git update-index A &&
+	git commit -m "blue modify A" &&
+
+	git checkout main
+
+[main (root-commit) 7bbb60a] initial has A and M
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 2 files changed, 30 insertions(+)
  create mode 100644 A
-Switched to a new branch 'rename'
-[rename f088787] rename
+ create mode 100644 M
+Switched to branch 'white'
+[white 72f28f0] white renames A->B, M->N
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename A => B (100%)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+Switched to branch 'red'
+[red f4afd94] red creates R
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 R
+Switched to branch 'blue'
+[blue ea35213] blue modify A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'main'
-rm 'A'
-[main b4eee36] delete
+ok 1 - setup
+
+expecting success of 6414.2 'merge white into red (A->B,M->N)': 
+	git checkout -b red-white red &&
+	git merge white &&
+	git write-tree &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_file R &&
+	test_path_is_missing A &&
+	test_path_is_missing M
+
+Switched to a new branch 'red-white'
+Merge made by the 'ort' strategy.
+ A => B | 2 +-
+ M => N | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+2f1341e5f32ecb7f45a35d122e62999a76d463cf
+ok 2 - merge white into red (A->B,M->N)
+
+expecting success of 6414.3 'merge blue into white (A->B, mod A, A untracked)': 
+	git checkout -b white-blue white &&
+	echo dirty >A &&
+	git merge blue &&
+	git write-tree &&
+	test_path_is_file A &&
+	echo dirty >expect &&
+	test_cmp expect A &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_missing M
+
+Switched to a new branch 'white-blue'
+Auto-merging B
+Merge made by the 'ort' strategy.
+ B | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+1db6abaa095ec16043333967f8d0dbaa01cdf029
+ok 3 - merge blue into white (A->B, mod A, A untracked)
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6411-merge-filemode.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6411-merge-filemode/.git/
+expecting success of 6411.1 'set up mode change in one branch': 
+	: >file1 &&
+	git add file1 &&
+	git commit -m initial &&
+	git checkout -b a1 main &&
+	: >dummy &&
+	git add dummy &&
+	git commit -m a &&
+	git checkout -b b1 main &&
+	test_chmod +x file1 &&
+	git add file1 &&
+	git commit -m b1
+
+[main (root-commit) acd9408] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A
-CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
-CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
-ok 1 - rename/delete
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+Switched to a new branch 'a1'
+[a1 8d8c073] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dummy
+Switched to a new branch 'b1'
+[b1 3dfda39] b1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file1
+ok 1 - set up mode change in one branch
 
-# passed all 1 test(s)
-1..1
+expecting success of 6411.2 'resolve single mode change (recursive, a1)': 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'a1'
+Merge made by the 'ort' strategy.
+ file1 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file1
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 2 - resolve single mode change (recursive, a1)
+
+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 6411.3 'verify executable bit on file (recursive, a1)': 
+		test -x file1
+	
+ok 3 - verify executable bit on file (recursive, a1)
+
+expecting success of 6411.4 'resolve single mode change (recursive, b1)': 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'b1'
+Updating 3dfda39..e9857f3
+Fast-forward
+ dummy | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dummy
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 4 - resolve single mode change (recursive, b1)
+
+expecting success of 6411.5 'verify executable bit on file (recursive, b1)': 
+		test -x file1
+	
+ok 5 - verify executable bit on file (recursive, b1)
+
+expecting success of 6411.6 'resolve single mode change (resolve, a1)': 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'a1'
+Already up to date.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 6 - resolve single mode change (resolve, a1)
+
+expecting success of 6411.7 'verify executable bit on file (resolve, a1)': 
+		test -x file1
+	
+ok 7 - verify executable bit on file (resolve, a1)
+
+expecting success of 6411.8 'resolve single mode change (resolve, b1)': 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'b1'
+Already up to date.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 8 - resolve single mode change (resolve, b1)
+
+expecting success of 6411.9 'verify executable bit on file (resolve, b1)': 
+		test -x file1
+	
+ok 9 - verify executable bit on file (resolve, b1)
+
+expecting success of 6411.10 'set up mode change in both branches': 
+	git reset --hard HEAD &&
+	git checkout -b a2 main &&
+	: >file2 &&
+	H=$(git hash-object file2) &&
+	test_chmod +x file2 &&
+	git commit -m a2 &&
+	git checkout -b b2 main &&
+	: >file2 &&
+	git add file2 &&
+	git commit -m b2 &&
+	cat >expect <<-EOF
+	100755 $H 2	file2
+	100644 $H 3	file2
+	EOF
+
+HEAD is now at e9857f3 Merge branch 'b1' into a1
+Switched to a new branch 'a2'
+[a2 e027a38] a2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100755 file2
+Switched to a new branch 'b2'
+[b2 ef0d9fd] b2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+ok 10 - set up mode change in both branches
+
+expecting success of 6411.11 'detect conflict on double mode change (recursive)': 
+		git reset --hard &&
+		git checkout -f a2 &&
+		test_must_fail git merge -s $strategy b2 &&
+		git ls-files -u >actual &&
+		test_cmp expect actual &&
+		git ls-files -s file2 | grep ^100755
+	
+HEAD is now at ef0d9fd b2
+Switched to branch 'a2'
+CONFLICT (add/add): Merge conflict in file2
+Automatic merge failed; fix conflicts and then commit the result.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
+ok 11 - detect conflict on double mode change (recursive)
+
+expecting success of 6411.12 'verify executable bit on file (recursive)': 
+		test -x file2
+	
+ok 12 - verify executable bit on file (recursive)
+
+expecting success of 6411.13 'detect conflict on double mode change (resolve)': 
+		git reset --hard &&
+		git checkout -f a2 &&
+		test_must_fail git merge -s $strategy b2 &&
+		git ls-files -u >actual &&
+		test_cmp expect actual &&
+		git ls-files -s file2 | grep ^100755
+	
+HEAD is now at e027a38 a2
+Already on 'a2'
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+ERROR: File file2 added identically in both branches,
+ERROR: but permissions conflict 100755->100644.
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
+ok 13 - detect conflict on double mode change (resolve)
+
+expecting success of 6411.14 'verify executable bit on file (resolve)': 
+		test -x file2
+	
+ok 14 - verify executable bit on file (resolve)
+
+expecting success of 6411.15 'set up delete/modechange scenario': 
+	git reset --hard &&
+	git checkout -b deletion main &&
+	git rm file1 &&
+	git commit -m deletion
+
+HEAD is now at e027a38 a2
+Switched to a new branch 'deletion'
+rm 'file1'
+[deletion 676a5f7] deletion
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 file1
+ok 15 - set up delete/modechange scenario
+
+expecting success of 6411.16 'detect delete/modechange conflict (recursive, b1)': 
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at 676a5f7 deletion
+Switched to branch 'b1'
+CONFLICT (modify/delete): file1 deleted in deletion and modified in HEAD.  Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 16 - detect delete/modechange conflict (recursive, b1)
+
+expecting success of 6411.17 'detect delete/modechange conflict (recursive, deletion)': 
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at e9857f3 Merge branch 'b1' into a1
+Switched to branch 'deletion'
+CONFLICT (modify/delete): file1 deleted in HEAD and modified in b1.  Version b1 of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 17 - detect delete/modechange conflict (recursive, deletion)
+
+expecting success of 6411.18 'detect delete/modechange conflict (resolve, b1)': 
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at 676a5f7 deletion
+Switched to branch 'b1'
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+ERROR: File file1 deleted on one branch but had its
+ERROR: permissions changed on the other.
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 18 - detect delete/modechange conflict (resolve, b1)
+
+expecting success of 6411.19 'detect delete/modechange conflict (resolve, deletion)': 
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at e9857f3 Merge branch 'b1' into a1
+Switched to branch 'deletion'
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+ERROR: File file1 deleted on one branch but had its
+ERROR: permissions changed on the other.
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 19 - detect delete/modechange conflict (resolve, deletion)
+
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6120-describe.sh ***
@@ -419060,8 +416785,8 @@
 		echo "$expect" >expect &&
 		test_cmp expect actual
 	
---- expect	2025-02-09 06:55:02.886087772 +0000
-+++ actual	2025-02-09 06:55:02.886087772 +0000
+--- expect	2026-03-14 13:34:29.346677808 +0000
++++ actual	2026-03-14 13:34:29.346677808 +0000
 @@ -1 +1 @@
 -A-3-gHASH
 +B-4-gHASH
@@ -419122,8 +416847,8 @@
 		echo "$expect" >expect &&
 		test_cmp expect actual
 	
---- expect	2025-02-09 06:55:03.010088561 +0000
-+++ actual	2025-02-09 06:55:03.010088561 +0000
+--- expect	2026-03-14 13:34:30.030677808 +0000
++++ actual	2026-03-14 13:34:30.026677808 +0000
 @@ -1 +1 @@
 -B-3-gHASH
 +A-5-gHASH
@@ -419208,6 +416933,1500 @@
 1..98
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6419-merge-ignorecase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6419-merge-ignorecase/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+1..0 # SKIP skipping case insensitive tests - case sensitive file system
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6417-merge-ours-theirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6417-merge-ours-theirs/.git/
+expecting success of 6417.1 'setup': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
+	git add file &&
+	cp file elif &&
+	git commit -m initial &&
+
+	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
+	git commit -a -m ours &&
+
+	git checkout -b side HEAD^ &&
+
+	sed -e "s/9/nueve/" >file <elif &&
+	git commit -a -m theirs &&
+
+	git checkout main^0
+
+[main (root-commit) b1c5b20] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+[main de72ed3] ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'side'
+[side 9035321] theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'main^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at de72ed3 ours
+ok 1 - setup
+
+expecting success of 6417.2 'plain recursive - should conflict': 
+	git reset --hard main &&
+	test_must_fail git merge -s recursive side &&
+	grep nine file &&
+	grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+nine
+nueve
+one
+ok 2 - plain recursive - should conflict
+
+expecting success of 6417.3 'recursive favouring theirs': 
+	git reset --hard main &&
+	git merge -s recursive -Xtheirs side &&
+	! grep nine file &&
+	grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+nueve
+one
+ok 3 - recursive favouring theirs
+
+expecting success of 6417.4 'recursive favouring ours': 
+	git reset --hard main &&
+	git merge -s recursive -X ours side &&
+	grep nine file &&
+	! grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'ort' strategy.
+nine
+one
+ok 4 - recursive favouring ours
+
+expecting success of 6417.5 'binary file with -Xours/-Xtheirs': 
+	echo file binary >.gitattributes &&
+
+	git reset --hard main &&
+	git merge -s recursive -X theirs side &&
+	git diff --exit-code side HEAD -- file &&
+
+	git reset --hard main &&
+	git merge -s recursive -X ours side &&
+	git diff --exit-code main HEAD -- file
+
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at de72ed3 ours
+Auto-merging file
+Merge made by the 'ort' strategy.
+ok 5 - binary file with -Xours/-Xtheirs
+
+expecting success of 6417.6 'pull passes -X to underlying merge': 
+	git reset --hard main && git pull --no-rebase -s recursive -Xours . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -X ours . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -Xtheirs . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -X theirs . side &&
+	git reset --hard main && test_must_fail git pull --no-rebase -s recursive -X bork . side
+
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'ort' strategy.
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'ort' strategy.
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at de72ed3 ours
+From .
+ * branch            side       -> FETCH_HEAD
+fatal: unknown strategy option: -Xbork
+ok 6 - pull passes -X to underlying merge
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 6417.7 'symlink with -Xours/-Xtheirs': 
+	git reset --hard main &&
+	git checkout -b two main &&
+	ln -s target-zero link &&
+	git add link &&
+	git commit -m "add link pointing to zero" &&
+
+	ln -f -s target-two link &&
+	git commit -m "add link pointing to two" link &&
+
+	git checkout -b one HEAD^ &&
+	ln -f -s target-one link &&
+	git commit -m "add link pointing to one" link &&
+
+	# we expect symbolic links not to resolve automatically, of course
+	git checkout one^0 &&
+	test_must_fail git merge -s recursive two &&
+
+	# favor theirs to resolve to target-two?
+	git reset --hard &&
+	git checkout one^0 &&
+	git merge -s recursive -X theirs two &&
+	git diff --exit-code two HEAD link &&
+
+	# favor ours to resolve to target-one?
+	git reset --hard &&
+	git checkout one^0 &&
+	git merge -s recursive -X ours two &&
+	git diff --exit-code one HEAD link
+
+
+HEAD is now at de72ed3 ours
+Switched to a new branch 'two'
+[two c4561a4] add link pointing to zero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 link
+[two 6164de8] add link pointing to two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'one'
+[one 4961603] add link pointing to one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'one^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 4961603 add link pointing to one
+CONFLICT (content): Merge conflict in link
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 4961603 add link pointing to one
+HEAD is now at 4961603 add link pointing to one
+Merge made by the 'ort' strategy.
+ link | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 6efe9ee Merge branch 'two' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  6efe9ee Merge branch 'two' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 6efe9ee
+
+HEAD is now at 4961603 add link pointing to one
+Merge made by the 'ort' strategy.
+ok 7 - symlink with -Xours/-Xtheirs
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6418-merge-text-auto.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6418-merge-text-auto/.git/
+expecting success of 6418.1 'setup': 
+	git config core.autocrlf false &&
+
+	echo first line | append_cr >file &&
+	echo first line >control_file &&
+	echo only line >inert_file &&
+
+	git add file control_file inert_file &&
+	test_tick &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
+
+	echo "* text=auto" >.gitattributes &&
+	echo first line >file &&
+	git add .gitattributes file &&
+	test_tick &&
+	git commit -m "normalize file" &&
+
+	echo same line | append_cr >>file &&
+	echo same line >>control_file &&
+	git add file control_file &&
+	test_tick &&
+	git commit -m "add line from a" &&
+	git tag a &&
+
+	git rm .gitattributes &&
+	rm file &&
+	git checkout file &&
+	test_tick &&
+	git commit -m "remove .gitattributes" &&
+	git tag c &&
+
+	git checkout side &&
+	echo same line | append_cr >>file &&
+	echo same line >>control_file &&
+	git add file control_file &&
+	test_tick &&
+	git commit -m "add line from b" &&
+	git tag b &&
+
+	git checkout main
+
+[main (root-commit) 1c56df1] Initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 control_file
+ create mode 100644 file
+ create mode 100644 inert_file
+[main 2747e77] normalize file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 .gitattributes
+warning: in the working copy of 'file', CRLF will be replaced by LF the next time Git touches it
+[main 99f8882] add line from a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+rm '.gitattributes'
+Updated 1 path from the index
+[main 2f716ad] remove .gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 .gitattributes
+Switched to branch 'side'
+[side 0d9ffb6] add line from b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 6418.2 'set up fuzz_conflict() helper': 
+	fuzz_conflict() {
+		sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"
+	}
+
+ok 2 - set up fuzz_conflict() helper
+
+expecting success of 6418.3 'Merge after setting text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	if test_have_prereq NATIVE_CRLF; then
+		append_cr <expected >expected.temp &&
+		mv expected.temp expected
+	fi &&
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard a &&
+	git merge b &&
+	compare_files expected file
+
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 99f8882 add line from a
+Auto-merging file
+Merge made by the 'ort' strategy.
+ok 3 - Merge after setting text=auto
+
+expecting success of 6418.4 'Merge addition of text=auto eol=LF': 
+	git config core.eol lf &&
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	git merge a &&
+	compare_files  expected file
+
+rm '.gitattributes'
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 0d9ffb6 add line from b
+Auto-merging file
+Merge made by the 'ort' strategy.
+ .gitattributes | 1 +
+ file           | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 .gitattributes
+ok 4 - Merge addition of text=auto eol=LF
+
+expecting success of 6418.5 'Merge addition of text=auto eol=CRLF': 
+	git config core.eol crlf &&
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	append_cr <expected >expected.temp &&
+	mv expected.temp expected &&
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	echo >&2 "After git reset --hard b" &&
+	git ls-files -s --eol >&2 &&
+	git merge a &&
+	compare_files  expected file
+
+rm '.gitattributes'
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 0d9ffb6 add line from b
+After git reset --hard b
+100644 99b633103c15c20cebebf821133ab526b0ff90b2 0	i/lf    w/lf    attr/                 	control_file
+100644 ad55e240aeb42e0d9a0e18d6d8b02dd82ee3e527 0	i/crlf  w/crlf  attr/                 	file
+100644 1bd3656f87a6720d97252137876e81ee56eef249 0	i/lf    w/lf    attr/                 	inert_file
+Auto-merging file
+Merge made by the 'ort' strategy.
+ .gitattributes | 1 +
+ file           | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 .gitattributes
+ok 5 - Merge addition of text=auto eol=CRLF
+
+expecting success of 6418.6 'Detect CRLF/LF conflict after setting text=auto': 
+	git config core.eol native &&
+	echo "<<<<<<<" >expected &&
+	echo first line >>expected &&
+	echo same line >>expected &&
+	echo ======= >>expected &&
+	echo first line | append_cr >>expected &&
+	echo same line | append_cr >>expected &&
+	echo ">>>>>>>" >>expected &&
+	git config merge.renormalize false &&
+	rm -f .gitattributes &&
+	git reset --hard a &&
+	test_must_fail git merge b &&
+	fuzz_conflict file >file.fuzzy &&
+	compare_files expected file.fuzzy
+
+HEAD is now at 99f8882 add line from a
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - Detect CRLF/LF conflict after setting text=auto
+
+expecting success of 6418.7 'Detect LF/CRLF conflict from addition of text=auto': 
+	echo "<<<<<<<" >expected &&
+	echo first line | append_cr >>expected &&
+	echo same line | append_cr >>expected &&
+	echo ======= >>expected &&
+	echo first line >>expected &&
+	echo same line >>expected &&
+	echo ">>>>>>>" >>expected &&
+	git config merge.renormalize false &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	test_must_fail git merge a &&
+	fuzz_conflict file >file.fuzzy &&
+	compare_files expected file.fuzzy
+
+HEAD is now at 0d9ffb6 add line from b
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 7 - Detect LF/CRLF conflict from addition of text=auto
+
+expecting success of 6418.8 'checkout -m after setting text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard initial &&
+	git restore --source=a -- . &&
+	git checkout -m b &&
+	git diff --no-index --ignore-cr-at-eol expected file
+
+rm '.gitattributes'
+rm 'control_file'
+rm 'file'
+rm 'file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 1c56df1 Initial
+Note: switching to 'b'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 0d9ffb6 add line from b
+M	file
+ok 8 - checkout -m after setting text=auto
+
+expecting success of 6418.9 'checkout -m addition of text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
+
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes file &&
+	git reset --hard initial &&
+	git restore --source=b -- . &&
+	git checkout -m a &&
+	git diff --no-index --ignore-cr-at-eol expected file
+
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 1c56df1 Initial
+Previous HEAD position was 1c56df1 Initial
+HEAD is now at 99f8882 add line from a
+ok 9 - checkout -m addition of text=auto
+
+expecting success of 6418.10 'Test delete/normalize conflict': 
+	git checkout -f side &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard initial &&
+	git rm file &&
+	git commit -m "remove file" &&
+	git checkout main &&
+	git reset --hard a^ &&
+	git merge side &&
+	test_path_is_missing file
+
+Previous HEAD position was 99f8882 add line from a
+Switched to branch 'side'
+rm 'control_file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 1c56df1 Initial
+rm 'file'
+[side 7dc5d25] remove file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+Switched to branch 'main'
+HEAD is now at 2747e77 normalize file
+Merge made by the 'ort' strategy.
+ file | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+ok 10 - Test delete/normalize conflict
+
+expecting success of 6418.11 'rename/delete vs. renormalization': 
+	git init subrepo &&
+	(
+		cd subrepo &&
+		echo foo >oldfile &&
+		git add oldfile &&
+		git commit -m original &&
+
+		git branch rename &&
+		git branch nuke &&
+
+		git checkout rename &&
+		git mv oldfile newfile &&
+		git commit -m renamed &&
+
+		git checkout nuke &&
+		git rm oldfile &&
+		git commit -m deleted &&
+
+		git checkout rename^0 &&
+		test_must_fail git -c merge.renormalize=true merge nuke >out &&
+
+		grep "rename/delete" out
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6418-merge-text-auto/subrepo/.git/
+[main (root-commit) 6bccdb0] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 oldfile
+Switched to branch 'rename'
+[rename 0094749] renamed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename oldfile => newfile (100%)
+Switched to branch 'nuke'
+rm 'oldfile'
+[nuke 5c3f422] deleted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 oldfile
+Note: switching to 'rename^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 0094749 renamed
+CONFLICT (rename/delete): oldfile renamed to newfile in HEAD, but deleted in nuke.
+ok 11 - rename/delete vs. renormalization
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6425-merge-rename-delete.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6425-merge-rename-delete/.git/
+expecting success of 6425.1 'rename/delete': 
+	echo foo >A &&
+	git add A &&
+	git commit -m "initial" &&
+
+	git checkout -b rename &&
+	git mv A B &&
+	git commit -m "rename" &&
+
+	git checkout main &&
+	git rm A &&
+	git commit -m "delete" &&
+
+	test_must_fail git merge --strategy=recursive rename >output &&
+	test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
+	test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
+
+[main (root-commit) 6604e52] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'rename'
+[rename f088787] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename A => B (100%)
+Switched to branch 'main'
+rm 'A'
+[main b4eee36] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A
+CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
+CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
+ok 1 - rename/delete
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6412-merge-large-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+
+expecting success of 6412.7 '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
+	
+Switched to branch 'main'
+Deleted branch test5 (was 2d6f47f).
+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 7 - rename (5, ok)
+
+expecting success of 6412.8 'rename (6, fail)': 
+	n=6 &&
+	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'
+error: branch 'test6' not found
+HEAD is now at 6ce5622 initial
+[main 09e502a] add=6
+ Author: A U Thor <author@example.com>
+ 6 files changed, 132 insertions(+)
+ create mode 100644 1
+ create mode 100644 2
+ create mode 100644 3
+ create mode 100644 4
+ create mode 100644 5
+ create mode 100644 6
+[main ffecf28] change=6
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+Switched to a new branch 'test6'
+rm '1'
+rm '2'
+rm '3'
+rm '4'
+rm '5'
+rm '6'
+[test6 dcaf00c] change+rename=6
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+), 6 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%)
+ rename 6 => 6.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.
+CONFLICT (modify/delete): 6 deleted in HEAD and modified in main.  Version main of 6 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 6 and retry the command.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 8 - rename (6, fail)
+
+expecting success of 6412.9 'setup large simple rename': 
+	git config --unset merge.renamelimit &&
+	git config --unset diff.renamelimit &&
+
+	git reset --hard initial &&
+	for i in $(count 200); do
+		make_text foo bar baz >$i || return 1
+	done &&
+	git add . &&
+	git commit -m create-files &&
+
+	git branch simple-change &&
+	git checkout -b simple-rename &&
+
+	mkdir builtin &&
+	git mv [0-9]* builtin/ &&
+	git commit -m renamed &&
+
+	git checkout simple-change &&
+	>unrelated-change &&
+	git add unrelated-change &&
+	git commit -m unrelated-change
+
+HEAD is now at 6ce5622 initial
+[test6 47a98b9] create-files
+ Author: A U Thor <author@example.com>
+ 200 files changed, 4400 insertions(+)
+ create mode 100644 1
+ create mode 100644 10
+ create mode 100644 100
+ create mode 100644 101
+ create mode 100644 102
+ create mode 100644 103
+ create mode 100644 104
+ create mode 100644 105
+ create mode 100644 106
+ create mode 100644 107
+ create mode 100644 108
+ create mode 100644 109
+ create mode 100644 11
+ create mode 100644 110
+ create mode 100644 111
+ create mode 100644 112
+ create mode 100644 113
+ create mode 100644 114
+ create mode 100644 115
+ create mode 100644 116
+ create mode 100644 117
+ create mode 100644 118
+ create mode 100644 119
+ create mode 100644 12
+ create mode 100644 120
+ create mode 100644 121
+ create mode 100644 122
+ create mode 100644 123
+ create mode 100644 124
+ create mode 100644 125
+ create mode 100644 126
+ create mode 100644 127
+ create mode 100644 128
+ create mode 100644 129
+ create mode 100644 13
+ create mode 100644 130
+ create mode 100644 131
+ create mode 100644 132
+ create mode 100644 133
+ create mode 100644 134
+ create mode 100644 135
+ create mode 100644 136
+ create mode 100644 137
+ create mode 100644 138
+ create mode 100644 139
+ create mode 100644 14
+ create mode 100644 140
+ create mode 100644 141
+ create mode 100644 142
+ create mode 100644 143
+ create mode 100644 144
+ create mode 100644 145
+ create mode 100644 146
+ create mode 100644 147
+ create mode 100644 148
+ create mode 100644 149
+ create mode 100644 15
+ create mode 100644 150
+ create mode 100644 151
+ create mode 100644 152
+ create mode 100644 153
+ create mode 100644 154
+ create mode 100644 155
+ create mode 100644 156
+ create mode 100644 157
+ create mode 100644 158
+ create mode 100644 159
+ create mode 100644 16
+ create mode 100644 160
+ create mode 100644 161
+ create mode 100644 162
+ create mode 100644 163
+ create mode 100644 164
+ create mode 100644 165
+ create mode 100644 166
+ create mode 100644 167
+ create mode 100644 168
+ create mode 100644 169
+ create mode 100644 17
+ create mode 100644 170
+ create mode 100644 171
+ create mode 100644 172
+ create mode 100644 173
+ create mode 100644 174
+ create mode 100644 175
+ create mode 100644 176
+ create mode 100644 177
+ create mode 100644 178
+ create mode 100644 179
+ create mode 100644 18
+ create mode 100644 180
+ create mode 100644 181
+ create mode 100644 182
+ create mode 100644 183
+ create mode 100644 184
+ create mode 100644 185
+ create mode 100644 186
+ create mode 100644 187
+ create mode 100644 188
+ create mode 100644 189
+ create mode 100644 19
+ create mode 100644 190
+ create mode 100644 191
+ create mode 100644 192
+ create mode 100644 193
+ create mode 100644 194
+ create mode 100644 195
+ create mode 100644 196
+ create mode 100644 197
+ create mode 100644 198
+ create mode 100644 199
+ create mode 100644 2
+ create mode 100644 20
+ create mode 100644 200
+ create mode 100644 21
+ create mode 100644 22
+ create mode 100644 23
+ create mode 100644 24
+ create mode 100644 25
+ create mode 100644 26
+ create mode 100644 27
+ create mode 100644 28
+ create mode 100644 29
+ create mode 100644 3
+ create mode 100644 30
+ create mode 100644 31
+ create mode 100644 32
+ create mode 100644 33
+ create mode 100644 34
+ create mode 100644 35
+ create mode 100644 36
+ create mode 100644 37
+ create mode 100644 38
+ create mode 100644 39
+ create mode 100644 4
+ create mode 100644 40
+ create mode 100644 41
+ create mode 100644 42
+ create mode 100644 43
+ create mode 100644 44
+ create mode 100644 45
+ create mode 100644 46
+ create mode 100644 47
+ create mode 100644 48
+ create mode 100644 49
+ create mode 100644 5
+ create mode 100644 50
+ create mode 100644 51
+ create mode 100644 52
+ create mode 100644 53
+ create mode 100644 54
+ create mode 100644 55
+ create mode 100644 56
+ create mode 100644 57
+ create mode 100644 58
+ create mode 100644 59
+ create mode 100644 6
+ create mode 100644 60
+ create mode 100644 61
+ create mode 100644 62
+ create mode 100644 63
+ create mode 100644 64
+ create mode 100644 65
+ create mode 100644 66
+ create mode 100644 67
+ create mode 100644 68
+ create mode 100644 69
+ create mode 100644 7
+ create mode 100644 70
+ create mode 100644 71
+ create mode 100644 72
+ create mode 100644 73
+ create mode 100644 74
+ create mode 100644 75
+ create mode 100644 76
+ create mode 100644 77
+ create mode 100644 78
+ create mode 100644 79
+ create mode 100644 8
+ create mode 100644 80
+ create mode 100644 81
+ create mode 100644 82
+ create mode 100644 83
+ create mode 100644 84
+ create mode 100644 85
+ create mode 100644 86
+ create mode 100644 87
+ create mode 100644 88
+ create mode 100644 89
+ create mode 100644 9
+ create mode 100644 90
+ create mode 100644 91
+ create mode 100644 92
+ create mode 100644 93
+ create mode 100644 94
+ create mode 100644 95
+ create mode 100644 96
+ create mode 100644 97
+ create mode 100644 98
+ create mode 100644 99
+Switched to a new branch 'simple-rename'
+[simple-rename 4602847] renamed
+ Author: A U Thor <author@example.com>
+ 200 files changed, 0 insertions(+), 0 deletions(-)
+ rename 1 => builtin/1 (100%)
+ rename 10 => builtin/10 (100%)
+ rename 100 => builtin/100 (100%)
+ rename 101 => builtin/101 (100%)
+ rename 102 => builtin/102 (100%)
+ rename 103 => builtin/103 (100%)
+ rename 104 => builtin/104 (100%)
+ rename 105 => builtin/105 (100%)
+ rename 106 => builtin/106 (100%)
+ rename 107 => builtin/107 (100%)
+ rename 108 => builtin/108 (100%)
+ rename 109 => builtin/109 (100%)
+ rename 11 => builtin/11 (100%)
+ rename 110 => builtin/110 (100%)
+ rename 111 => builtin/111 (100%)
+ rename 112 => builtin/112 (100%)
+ rename 113 => builtin/113 (100%)
+ rename 114 => builtin/114 (100%)
+ rename 115 => builtin/115 (100%)
+ rename 116 => builtin/116 (100%)
+ rename 117 => builtin/117 (100%)
+ rename 118 => builtin/118 (100%)
+ rename 119 => builtin/119 (100%)
+ rename 12 => builtin/12 (100%)
+ rename 120 => builtin/120 (100%)
+ rename 121 => builtin/121 (100%)
+ rename 122 => builtin/122 (100%)
+ rename 123 => builtin/123 (100%)
+ rename 124 => builtin/124 (100%)
+ rename 125 => builtin/125 (100%)
+ rename 126 => builtin/126 (100%)
+ rename 127 => builtin/127 (100%)
+ rename 128 => builtin/128 (100%)
+ rename 129 => builtin/129 (100%)
+ rename 13 => builtin/13 (100%)
+ rename 130 => builtin/130 (100%)
+ rename 131 => builtin/131 (100%)
+ rename 132 => builtin/132 (100%)
+ rename 133 => builtin/133 (100%)
+ rename 134 => builtin/134 (100%)
+ rename 135 => builtin/135 (100%)
+ rename 136 => builtin/136 (100%)
+ rename 137 => builtin/137 (100%)
+ rename 138 => builtin/138 (100%)
+ rename 139 => builtin/139 (100%)
+ rename 14 => builtin/14 (100%)
+ rename 140 => builtin/140 (100%)
+ rename 141 => builtin/141 (100%)
+ rename 142 => builtin/142 (100%)
+ rename 143 => builtin/143 (100%)
+ rename 144 => builtin/144 (100%)
+ rename 145 => builtin/145 (100%)
+ rename 146 => builtin/146 (100%)
+ rename 147 => builtin/147 (100%)
+ rename 148 => builtin/148 (100%)
+ rename 149 => builtin/149 (100%)
+ rename 15 => builtin/15 (100%)
+ rename 150 => builtin/150 (100%)
+ rename 151 => builtin/151 (100%)
+ rename 152 => builtin/152 (100%)
+ rename 153 => builtin/153 (100%)
+ rename 154 => builtin/154 (100%)
+ rename 155 => builtin/155 (100%)
+ rename 156 => builtin/156 (100%)
+ rename 157 => builtin/157 (100%)
+ rename 158 => builtin/158 (100%)
+ rename 159 => builtin/159 (100%)
+ rename 16 => builtin/16 (100%)
+ rename 160 => builtin/160 (100%)
+ rename 161 => builtin/161 (100%)
+ rename 162 => builtin/162 (100%)
+ rename 163 => builtin/163 (100%)
+ rename 164 => builtin/164 (100%)
+ rename 165 => builtin/165 (100%)
+ rename 166 => builtin/166 (100%)
+ rename 167 => builtin/167 (100%)
+ rename 168 => builtin/168 (100%)
+ rename 169 => builtin/169 (100%)
+ rename 17 => builtin/17 (100%)
+ rename 170 => builtin/170 (100%)
+ rename 171 => builtin/171 (100%)
+ rename 172 => builtin/172 (100%)
+ rename 173 => builtin/173 (100%)
+ rename 174 => builtin/174 (100%)
+ rename 175 => builtin/175 (100%)
+ rename 176 => builtin/176 (100%)
+ rename 177 => builtin/177 (100%)
+ rename 178 => builtin/178 (100%)
+ rename 179 => builtin/179 (100%)
+ rename 18 => builtin/18 (100%)
+ rename 180 => builtin/180 (100%)
+ rename 181 => builtin/181 (100%)
+ rename 182 => builtin/182 (100%)
+ rename 183 => builtin/183 (100%)
+ rename 184 => builtin/184 (100%)
+ rename 185 => builtin/185 (100%)
+ rename 186 => builtin/186 (100%)
+ rename 187 => builtin/187 (100%)
+ rename 188 => builtin/188 (100%)
+ rename 189 => builtin/189 (100%)
+ rename 19 => builtin/19 (100%)
+ rename 190 => builtin/190 (100%)
+ rename 191 => builtin/191 (100%)
+ rename 192 => builtin/192 (100%)
+ rename 193 => builtin/193 (100%)
+ rename 194 => builtin/194 (100%)
+ rename 195 => builtin/195 (100%)
+ rename 196 => builtin/196 (100%)
+ rename 197 => builtin/197 (100%)
+ rename 198 => builtin/198 (100%)
+ rename 199 => builtin/199 (100%)
+ rename 2 => builtin/2 (100%)
+ rename 20 => builtin/20 (100%)
+ rename 200 => builtin/200 (100%)
+ rename 21 => builtin/21 (100%)
+ rename 22 => builtin/22 (100%)
+ rename 23 => builtin/23 (100%)
+ rename 24 => builtin/24 (100%)
+ rename 25 => builtin/25 (100%)
+ rename 26 => builtin/26 (100%)
+ rename 27 => builtin/27 (100%)
+ rename 28 => builtin/28 (100%)
+ rename 29 => builtin/29 (100%)
+ rename 3 => builtin/3 (100%)
+ rename 30 => builtin/30 (100%)
+ rename 31 => builtin/31 (100%)
+ rename 32 => builtin/32 (100%)
+ rename 33 => builtin/33 (100%)
+ rename 34 => builtin/34 (100%)
+ rename 35 => builtin/35 (100%)
+ rename 36 => builtin/36 (100%)
+ rename 37 => builtin/37 (100%)
+ rename 38 => builtin/38 (100%)
+ rename 39 => builtin/39 (100%)
+ rename 4 => builtin/4 (100%)
+ rename 40 => builtin/40 (100%)
+ rename 41 => builtin/41 (100%)
+ rename 42 => builtin/42 (100%)
+ rename 43 => builtin/43 (100%)
+ rename 44 => builtin/44 (100%)
+ rename 45 => builtin/45 (100%)
+ rename 46 => builtin/46 (100%)
+ rename 47 => builtin/47 (100%)
+ rename 48 => builtin/48 (100%)
+ rename 49 => builtin/49 (100%)
+ rename 5 => builtin/5 (100%)
+ rename 50 => builtin/50 (100%)
+ rename 51 => builtin/51 (100%)
+ rename 52 => builtin/52 (100%)
+ rename 53 => builtin/53 (100%)
+ rename 54 => builtin/54 (100%)
+ rename 55 => builtin/55 (100%)
+ rename 56 => builtin/56 (100%)
+ rename 57 => builtin/57 (100%)
+ rename 58 => builtin/58 (100%)
+ rename 59 => builtin/59 (100%)
+ rename 6 => builtin/6 (100%)
+ rename 60 => builtin/60 (100%)
+ rename 61 => builtin/61 (100%)
+ rename 62 => builtin/62 (100%)
+ rename 63 => builtin/63 (100%)
+ rename 64 => builtin/64 (100%)
+ rename 65 => builtin/65 (100%)
+ rename 66 => builtin/66 (100%)
+ rename 67 => builtin/67 (100%)
+ rename 68 => builtin/68 (100%)
+ rename 69 => builtin/69 (100%)
+ rename 7 => builtin/7 (100%)
+ rename 70 => builtin/70 (100%)
+ rename 71 => builtin/71 (100%)
+ rename 72 => builtin/72 (100%)
+ rename 73 => builtin/73 (100%)
+ rename 74 => builtin/74 (100%)
+ rename 75 => builtin/75 (100%)
+ rename 76 => builtin/76 (100%)
+ rename 77 => builtin/77 (100%)
+ rename 78 => builtin/78 (100%)
+ rename 79 => builtin/79 (100%)
+ rename 8 => builtin/8 (100%)
+ rename 80 => builtin/80 (100%)
+ rename 81 => builtin/81 (100%)
+ rename 82 => builtin/82 (100%)
+ rename 83 => builtin/83 (100%)
+ rename 84 => builtin/84 (100%)
+ rename 85 => builtin/85 (100%)
+ rename 86 => builtin/86 (100%)
+ rename 87 => builtin/87 (100%)
+ rename 88 => builtin/88 (100%)
+ rename 89 => builtin/89 (100%)
+ rename 9 => builtin/9 (100%)
+ rename 90 => builtin/90 (100%)
+ rename 91 => builtin/91 (100%)
+ rename 92 => builtin/92 (100%)
+ rename 93 => builtin/93 (100%)
+ rename 94 => builtin/94 (100%)
+ rename 95 => builtin/95 (100%)
+ rename 96 => builtin/96 (100%)
+ rename 97 => builtin/97 (100%)
+ rename 98 => builtin/98 (100%)
+ rename 99 => builtin/99 (100%)
+Switched to branch 'simple-change'
+[simple-change d125115] unrelated-change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated-change
+ok 9 - setup large simple rename
+
+expecting success of 6412.10 'massive simple rename does not spam added files': 
+	sane_unset GIT_MERGE_VERBOSITY &&
+	git merge --no-stat simple-rename | grep -v Removing >output &&
+	test_line_count -lt 5 output
+
+ok 10 - massive simple rename does not spam added files
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6421-merge-partial-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6421-merge-partial-clone/.git/
 expecting success of 6421.1 'Objects downloaded for single relevant rename': 
@@ -419509,88 +418728,542 @@
 			-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 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6415-merge-dir-to-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-		# 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 &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-		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
-	)
+ git branch <new-branch-name> 57dad8a
 
-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.
+HEAD is now at d35741f x
 Merge made by the 'ort' strategy.
-ok 2 - Objects downloaded when a directory rename triggered
+ 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 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 &&
+expecting success of 6415.22 'a/b-2 was resolved as symlink': 
+	test -h a/b-2
 
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-before &&
+ok 22 - a/b-2 was resolved as symlink
 
-		git checkout -q origin/A &&
+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
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
-			-c merge.directoryRenames=true merge --no-stat \
-			--no-progress origin/B-many &&
+HEAD is now at 57dad8a Merge tag 'test2' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-		# 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 &&
+  57dad8a Merge tag 'test2' into HEAD
 
-		# 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 &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-		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
-	)
+ git branch <new-branch-name> 57dad8a
 
-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
+Switched to a new branch 'foo'
 Merge made by the 'ort' strategy.
-ok 3 - Objects downloaded with lots of renames and modifications
+ a/x | 1 +
+ 1 file changed, 1 insertion(+)
+ok 23 - merge should not have F/D conflicts (recursive)
 
-# passed all 3 test(s)
-1..3
+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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6041-bisect-submodule.sh ***
@@ -420169,4040 +419842,83 @@
 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6428-merge-conflicts-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6427-diff3-conflict-markers.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/.git/
-expecting success of 6427.1 'setup no merge base': 
-	git init no_merge_base &&
-	(
-		cd no_merge_base &&
-
-		git checkout -b L &&
-		test_commit A content A &&
-
-		git checkout --orphan R &&
-		test_commit B content B
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/no_merge_base/.git/
-Switched to a new branch 'L'
-[L (root-commit) ccbdd10] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content
-Switched to a new branch 'R'
-[R (root-commit) 8e39672] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content
-ok 1 - setup no merge base
-
-expecting success of 6427.2 'check no merge base': 
-	(
-		cd no_merge_base &&
-
-		git checkout L^0 &&
-
-		test_must_fail git -c merge.conflictstyle=diff3 merge --allow-unrelated-histories -s recursive R^0 &&
-
-		grep "|||||| empty tree" content
-	)
-
-Note: switching to 'L^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at ccbdd10 A
-Auto-merging content
-CONFLICT (add/add): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| empty tree
-ok 2 - check no merge base
-
-expecting success of 6427.3 'setup unique merge base': 
-	git init unique_merge_base &&
-	(
-		cd unique_merge_base &&
-
-		test_commit base content "1
-2
-3
-4
-5
-" &&
-
-		git branch L &&
-		git branch R &&
-
-		git checkout L &&
-		test_commit L content "1
-2
-3
-4
-5
-7" &&
-
-		git checkout R &&
-		git rm content &&
-		test_commit R renamed "1
-2
-3
-4
-5
-six"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/unique_merge_base/.git/
-[main (root-commit) 8b7da6e] base
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+)
- create mode 100644 content
-Switched to branch 'L'
-[L e1c672f] L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'R'
-rm 'content'
-[R 17f77e6] R
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename content => renamed (71%)
-ok 3 - setup unique merge base
-
-expecting success of 6427.4 'check unique merge base': 
-	(
-		cd unique_merge_base &&
-
-		git checkout L^0 &&
-		MAIN=$(git rev-parse --short main) &&
-
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
-
-		grep "|||||| $MAIN:content" renamed
-	)
-
-warning: refname 'L' is ambiguous.
-warning: refname 'L' is ambiguous.
-Note: switching to 'L^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at e1c672f L
-warning: refname 'R' is ambiguous.
-warning: refname 'R' is ambiguous.
-Auto-merging renamed
-CONFLICT (content): Merge conflict in renamed
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| 8b7da6e:content
-ok 4 - check unique merge base
-
-expecting success of 6427.5 'setup multiple merge bases': 
-	git init multiple_merge_bases &&
-	(
-		cd multiple_merge_bases &&
-
-		test_commit initial content "1
-2
-3
-4
-5" &&
-
-		git branch L &&
-		git branch R &&
-
-		# Create L1
-		git checkout L &&
-		test_commit L1 content "0
-1
-2
-3
-4
-5" &&
-
-		# Create R1
-		git checkout R &&
-		test_commit R1 content "1
-2
-3
-4
-5
-6" &&
-
-		# Create L2
-		git checkout L &&
-		git merge R1 &&
-
-		# Create R2
-		git checkout R &&
-		git merge L1 &&
-
-		# Create L3
-		git checkout L &&
-		test_commit L3 content "0
-1
-2
-3
-4
-5
-A" &&
-
-		# Create R3
-		git checkout R &&
-		git rm content &&
-		test_commit R3 renamed "0
-2
-3
-4
-5
-six"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/multiple_merge_bases/.git/
-[main (root-commit) 79a87bb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 content
-Switched to branch 'L'
-[L 2e587ed] L1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'R'
-[R 6e9e69f] R1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'L'
-Auto-merging content
-Merge made by the 'ort' strategy.
- content | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'R'
-Auto-merging content
-Merge made by the 'ort' strategy.
- content | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'L'
-[L 614f030] L3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'R'
-rm 'content'
-[R 8a53b94] R3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
- rename content => renamed (71%)
-ok 5 - setup multiple merge bases
-
-expecting success of 6427.6 'check multiple merge bases': 
-	(
-		cd multiple_merge_bases &&
-
-		git checkout L^0 &&
-
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
-
-		grep "|||||| merged common ancestors:content" renamed
-	)
-
-Note: switching to 'L^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 614f030 L3
-  From inner merge:  Auto-merging content
-Auto-merging renamed
-CONFLICT (content): Merge conflict in renamed
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| merged common ancestors:content
-ok 6 - check multiple merge bases
-
-expecting success of 6427.7 'rebase --merge describes parent of commit being picked': 
-	git init rebase &&
-	(
-		cd rebase &&
-		test_commit base file &&
-		test_commit main file &&
-		git checkout -b side HEAD^ &&
-		test_commit side file &&
-		test_must_fail git -c merge.conflictstyle=diff3 rebase --merge main &&
-		grep "||||||| parent of" file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/rebase/.git/
-[main (root-commit) 215235d] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 9d7b901] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side 748f431] side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 748f431... side
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 748f431... side
-||||||| parent of 748f431 (side)
-ok 7 - rebase --merge describes parent of commit being picked
-
-expecting success of 6427.8 'rebase --apply describes fake ancestor base': 
-	(
-		cd rebase &&
-		git rebase --abort &&
-		test_must_fail git -c merge.conflictstyle=diff3 rebase --apply main &&
-		grep "||||||| constructed merge base" file
-	)
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: side
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-9d7b901 main
-virtual side
-found 1 common ancestor:
-virtual 6d5f482d15035cdd7733b1b551d1fead28d22592
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 side
-||||||| constructed merge base
-ok 8 - rebase --apply describes fake ancestor base
-
-expecting success of 6427.9 'check zdiff3 markers': 
-	test_setup_zdiff3 &&
-	(
-		cd zdiff3 &&
-
-		git checkout left^0 &&
-
-		base=$(git rev-parse --short HEAD^1) &&
-		test_must_fail git -c merge.conflictstyle=zdiff3 merge -s recursive right^0 &&
-
-		test_write_lines 1 2 3 4 A \
-				 "<<<<<<< HEAD" B C D \
-				 "||||||| $base" 5 6 \
-				 ======= X C Y \
-				 ">>>>>>> right^0" \
-				 E 7 8 9 \
-				 >expect &&
-		test_cmp expect basic &&
-
-		test_write_lines 1 2 3 \
-				 "<<<<<<< HEAD" CC \
-				 "||||||| $base" AA \
-				 ======= EE \
-				 ">>>>>>> right^0" \
-				 4 5 \
-				 "<<<<<<< HEAD" DD \
-				 "||||||| $base" BB \
-				 ======= FF \
-				 ">>>>>>> right^0" \
-				 6 7 8 \
-				 >expect &&
-		test_cmp expect middle-common &&
-
-		test_write_lines 1 2 3 4 A B C \
-				 "<<<<<<< HEAD" D E F \
-				 "||||||| $base" 5 6 \
-				 ======= 5 6 \
-				 ">>>>>>> right^0" \
-				 G H I J 7 8 9 \
-				 >expect &&
-		test_cmp expect interesting &&
-
-		# Not passing this one yet; the common "B C" lines is still
-		# being left in the conflict blocks on the left and right
-		# sides.
-		test_write_lines 1 2 3 4 \
-				 "<<<<<<< HEAD" X A \
-				 "||||||| $base" 5 6 \
-				 ======= Y A B C \
-				 ">>>>>>> right^0" \
-				 B C 7 8 9 \
-				 >expect &&
-		test_cmp expect evil
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/zdiff3/.git/
-[main (root-commit) 682cee2] base
- Author: A U Thor <author@example.com>
- 4 files changed, 37 insertions(+)
- create mode 100644 basic
- create mode 100644 evil
- create mode 100644 interesting
- create mode 100644 middle-common
-Switched to branch 'left'
-[left 8ffb720] letters
- Author: A U Thor <author@example.com>
- 4 files changed, 21 insertions(+), 8 deletions(-)
-Switched to branch 'right'
-[right 11127f3] permuted
- Author: A U Thor <author@example.com>
- 4 files changed, 20 insertions(+), 6 deletions(-)
-Note: switching to 'left^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 8ffb720 letters
-Auto-merging basic
-CONFLICT (content): Merge conflict in basic
-Auto-merging evil
-CONFLICT (content): Merge conflict in evil
-Auto-merging interesting
-CONFLICT (content): Merge conflict in interesting
-Auto-merging middle-common
-CONFLICT (content): Merge conflict in middle-common
-Automatic merge failed; fix conflicts and then commit the result.
-ok 9 - check zdiff3 markers
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6431-merge-criscross.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6431-merge-criscross/.git/
-expecting success of 6431.1 'setup repo with criss-cross history': 
-	mkdir data &&
-
-	# create a bunch of files
-	n=1 &&
-	while test $n -le 10
-	do
-		echo $n > data/$n &&
-		n=$(($n+1)) ||
-		return 1
-	done &&
-
-	# check them in
-	git add data &&
-	git commit -m A &&
-	git branch A &&
-
-	# a file in one branch
-	git checkout -b B A &&
-	git rm data/9 &&
-	git add data &&
-	git commit -m B &&
-
-	# with a branch off of it
-	git branch D &&
-
-	# put some commits on D
-	git checkout D &&
-	echo testD > data/testD &&
-	git add data &&
-	git commit -m D &&
-
-	# back up to the top, create another branch and cause
-	# a rename conflict with the file we deleted earlier
-	git checkout -b C A &&
-	git mv data/9 data/new-9 &&
-	git add data &&
-	git commit -m C &&
-
-	# with a branch off of it
-	git branch E &&
-
-	# put a commit on E
-	git checkout E &&
-	echo testE > data/testE &&
-	git add data &&
-	git commit -m E &&
-
-	# now, merge E into B
-	git checkout B &&
-	test_must_fail git merge E &&
-	# force-resolve
-	git add data &&
-	git commit -m F &&
-	git branch F &&
-
-	# and merge D into C
-	git checkout C &&
-	test_must_fail git merge D &&
-	# force-resolve
-	git add data &&
-	git commit -m G &&
-	git branch G
-
-[master (root-commit) 7287aa7] A
- Author: A U Thor <author@example.com>
- 10 files changed, 10 insertions(+)
- create mode 100644 data/1
- create mode 100644 data/10
- create mode 100644 data/2
- create mode 100644 data/3
- create mode 100644 data/4
- create mode 100644 data/5
- create mode 100644 data/6
- create mode 100644 data/7
- create mode 100644 data/8
- create mode 100644 data/9
-Switched to a new branch 'B'
-rm 'data/9'
-[B 53e80c3] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 data/9
-Switched to branch 'D'
-[D c132a69] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testD
-Switched to a new branch 'C'
-[C e11feee] C
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename data/{9 => new-9} (100%)
-Switched to branch 'E'
-[E da98b4a] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testE
-Switched to branch 'B'
-CONFLICT (rename/delete): data/9 renamed to data/new-9 in E, but deleted in HEAD.
-Automatic merge failed; fix conflicts and then commit the result.
-[B 9eb2311] F
- Author: A U Thor <author@example.com>
-Switched to branch 'C'
-CONFLICT (rename/delete): data/9 renamed to data/new-9 in HEAD, but deleted in D.
-Automatic merge failed; fix conflicts and then commit the result.
-[C dc9a020] G
- Author: A U Thor <author@example.com>
-ok 1 - setup repo with criss-cross history
-
-expecting success of 6431.2 'recursive merge between F and G does not cause segfault': 
-	git merge F
-
-  From inner merge:  CONFLICT (rename/delete): data/9 renamed to data/new-9 in Temporary merge branch 1, but deleted in Temporary merge branch 2.
-Merge made by the 'ort' strategy.
- data/testE | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testE
-ok 2 - recursive merge between F and G does not cause segfault
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6402-merge-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
-expecting success of 6402.1 'setup': 
-	cat >A <<-\EOF &&
-	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-	c cccccccccccccccccccccccccccccccccccccccccccccccc
-	d dddddddddddddddddddddddddddddddddddddddddddddddd
-	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-	f ffffffffffffffffffffffffffffffffffffffffffffffff
-	g gggggggggggggggggggggggggggggggggggggggggggggggg
-	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-	l llllllllllllllllllllllllllllllllllllllllllllllll
-	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-	o oooooooooooooooooooooooooooooooooooooooooooooooo
-	EOF
-
-	cat >M <<-\EOF &&
-	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-	EOF
-
-	git add A M &&
-	git commit -m "initial has A and M" &&
-	git branch white &&
-	git branch red &&
-	git branch blue &&
-	git branch yellow &&
-	git branch change &&
-	git branch change+rename &&
-
-	sed -e "/^g /s/.*/g : main changes a line/" <A >A+ &&
-	mv A+ A &&
-	git commit -a -m "main updates A" &&
-
-	git checkout yellow &&
-	rm -f M &&
-	git commit -a -m "yellow removes M" &&
-
-	git checkout white &&
-	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-	rm -f A M &&
-	git update-index --add --remove A B M N &&
-	git commit -m "white renames A->B, M->N" &&
-
-	git checkout red &&
-	sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
-	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-	rm -f A M &&
-	git update-index --add --remove A B M N &&
-	git commit -m "red renames A->B, M->N" &&
-
-	git checkout blue &&
-	sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
-	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-	rm -f A M &&
-	git update-index --add --remove A C M N &&
-	git commit -m "blue renames A->C, M->N" &&
-
-	git checkout change &&
-	sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
-	mv A+ A &&
-	git commit -q -a -m "changed" &&
-
-	git checkout change+rename &&
-	sed -e "/^g /s/.*/g : changed line/" <A >B &&
-	rm A &&
-	git update-index --add B &&
-	git commit -q -a -m "changed and renamed" &&
-
-	git checkout main
-
-[main (root-commit) 7bbb60a] initial has A and M
- Author: A U Thor <author@example.com>
- 2 files changed, 30 insertions(+)
- create mode 100644 A
- create mode 100644 M
-[main a533371] main updates A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'yellow'
-[yellow 1f86866] yellow removes M
- Author: A U Thor <author@example.com>
- 1 file changed, 15 deletions(-)
- delete mode 100644 M
-Switched to branch 'white'
-[white 72f28f0] white renames A->B, M->N
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-Switched to branch 'red'
-[red 9020b53] red renames A->B, M->N
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-Switched to branch 'blue'
-[blue b706750] blue renames A->C, M->N
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => C (93%)
- rename M => N (93%)
-Switched to branch 'change'
-Switched to branch 'change+rename'
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6402.2 'pull renaming branch into unrenaming one': 
-	git show-branch &&
-	test_expect_code 1 git pull --no-rebase . white &&
-	git ls-files -s &&
-	test_stdout_line_count = 3 git ls-files -u B &&
-	test_stdout_line_count = 1 git ls-files -s N &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep main &&
-	git diff --exit-code white N
-
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [main] main updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-+++*+++ [yellow^] initial has A and M
-From .
- * branch            white      -> FETCH_HEAD
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-100644 aed72d761b68c20ffce8249a5a0426494098d376 1	B
-100644 c66800d1e70e6f0f7285c884b0ccb4bdc1e54800 2	B
-100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 3	B
-100644 ba41fb96393979b22691106b06bf5231eab57b85 0	N
-g : main changes a line
-ok 2 - pull renaming branch into unrenaming one
-
-expecting success of 6402.3 'pull renaming branch into another renaming one': 
-	rm -f B &&
-	git reset --hard &&
-	git checkout red &&
-	test_expect_code 1 git pull --no-rebase . white &&
-	test_stdout_line_count = 3 git ls-files -u B &&
-	test_stdout_line_count = 1 git ls-files -s N &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep red &&
-	git diff --exit-code white N
-
-HEAD is now at a533371 main updates A
-Switched to branch 'red'
-From .
- * branch            white      -> FETCH_HEAD
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-g : red changes a line
-ok 3 - pull renaming branch into another renaming one
-
-expecting success of 6402.4 'pull unrenaming branch into renaming one': 
-	git reset --hard &&
-	git show-branch &&
-	test_expect_code 1 git pull --no-rebase . main &&
-	test_stdout_line_count = 3 git ls-files -u B &&
-	test_stdout_line_count = 1 git ls-files -s N &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep red &&
-	git diff --exit-code white N
-
-HEAD is now at 9020b53 red renames A->B, M->N
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [main] main updates A
-    * [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    *   [red] red renames A->B, M->N
-   +    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-++++*++ [yellow^] initial has A and M
-From .
- * branch            main       -> FETCH_HEAD
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-g : red changes a line
-ok 4 - pull unrenaming branch into renaming one
-
-expecting success of 6402.5 'pull conflicting renames': 
-	git reset --hard &&
-	git show-branch &&
-	test_expect_code 1 git pull --no-rebase . blue &&
-	test_stdout_line_count = 1 git ls-files -u A &&
-	test_stdout_line_count = 1 git ls-files -u B &&
-	test_stdout_line_count = 1 git ls-files -u C &&
-	test_stdout_line_count = 1 git ls-files -s N &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep red &&
-	git diff --exit-code white N
-
-HEAD is now at 9020b53 red renames A->B, M->N
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [main] main updates A
-    * [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    *   [red] red renames A->B, M->N
-   +    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-++++*++ [yellow^] initial has A and M
-From .
- * branch            blue       -> FETCH_HEAD
-Auto-merging A
-CONFLICT (rename/rename): A renamed to B in HEAD and to C in b706750f611415f609730a3078d3ca7a6942b4f1.
-Automatic merge failed; fix conflicts and then commit the result.
-g : red changes a line
-ok 5 - pull conflicting renames
-
-expecting success of 6402.6 'interference with untracked working tree file': 
-	git reset --hard &&
-	git show-branch &&
-	echo >A this file should not matter &&
-	test_expect_code 1 git pull --no-rebase . white &&
-	test_path_is_file A
-
-HEAD is now at 9020b53 red renames A->B, M->N
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [main] main updates A
-    * [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    *   [red] red renames A->B, M->N
-   +    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-++++*++ [yellow^] initial has A and M
-From .
- * branch            white      -> FETCH_HEAD
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - interference with untracked working tree file
-
-expecting success of 6402.7 'interference with untracked working tree file': 
-	git reset --hard &&
-	git checkout white &&
-	git show-branch &&
-	rm -f A &&
-	echo >A this file should not matter &&
-	test_expect_code 1 git pull --no-rebase . red &&
-	test_path_is_file A
-
-HEAD is now at 9020b53 red renames A->B, M->N
-Switched to branch 'white'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [main] main updates A
-    ! [red] red renames A->B, M->N
-     * [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     *  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   +    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-+++++*+ [yellow^] initial has A and M
-From .
- * branch            red        -> FETCH_HEAD
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-ok 7 - interference with untracked working tree file
-
-expecting success of 6402.8 'interference with untracked working tree file': 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f main &&
-	git tag -f anchor &&
-	git show-branch &&
-	git pull --no-rebase . yellow &&
-	test_path_is_missing M &&
-	git reset --hard anchor
-
-HEAD is now at 72f28f0 white renames A->B, M->N
-Switched to branch 'main'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [main] main updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-+++*+++ [yellow^] initial has A and M
-From .
- * branch            yellow     -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- M | 15 ---------------
- 1 file changed, 15 deletions(-)
- delete mode 100644 M
-HEAD is now at a533371 main updates A
-ok 8 - interference with untracked working tree file
-
-expecting success of 6402.9 'updated working tree file should prevent the merge': 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f main &&
-	git tag -f anchor &&
-	git show-branch &&
-	echo >>M one line addition &&
-	cat M >M.saved &&
-	test_expect_code 128 git pull . yellow &&
-	test_cmp M M.saved &&
-	rm -f M.saved
-
-HEAD is now at a533371 main updates A
-Already on 'main'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [main] main updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-+++*+++ [yellow^] initial has A and M
-From .
- * branch            yellow     -> 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.
-ok 9 - updated working tree file should prevent the merge
-
-expecting success of 6402.10 'updated working tree file should prevent the merge': 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f main &&
-	git tag -f anchor &&
-	git show-branch &&
-	echo >>M one line addition &&
-	cat M >M.saved &&
-	git update-index M &&
-	test_expect_code 2 git pull --no-rebase . yellow &&
-	test_cmp M M.saved &&
-	rm -f M.saved
-
-HEAD is now at a533371 main updates A
-Already on 'main'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [main] main updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-+++*+++ [yellow^] initial has A and M
-From .
- * branch            yellow     -> FETCH_HEAD
-error: Your local changes to the following files would be overwritten by merge:
-  M
-Merge with strategy ort failed.
-ok 10 - updated working tree file should prevent the merge
-
-expecting success of 6402.11 'interference with untracked working tree file': 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f yellow &&
-	git tag -f anchor &&
-	git show-branch &&
-	echo >M this file should not matter &&
-	git pull --no-rebase . main &&
-	test_path_is_file M &&
-	! {
-		git ls-files -s |
-		grep M
-	} &&
-	git reset --hard anchor
-
-HEAD is now at a533371 main updates A
-Switched to branch 'yellow'
-Updated tag 'anchor' (was a533371)
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [main] main updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      * [yellow] yellow removes M
--------
-      * [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   +    [main] main updates A
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-++++++* [yellow^] initial has A and M
-From .
- * branch            main       -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- A | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 1f86866 yellow removes M
-ok 11 - interference with untracked working tree file
-
-expecting success of 6402.12 'merge of identical changes in a renamed file': 
-	rm -f A M N &&
-	git reset --hard &&
-	git checkout change+rename &&
-
-	test-tool chmtime --get -3600 B >old-mtime &&
-	GIT_MERGE_VERBOSITY=3 git merge change >out &&
-
-	test-tool chmtime --get B >new-mtime &&
-	test_cmp old-mtime new-mtime &&
-
-	git reset --hard HEAD^ &&
-	git checkout change &&
-
-	# A will be renamed to B; we check mtimes and file presence
-	test_path_is_missing B &&
-	test-tool chmtime --get -3600 A >old-mtime &&
-	GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
-
-	test_path_is_missing A &&
-	test-tool chmtime --get B >new-mtime &&
-	test $(cat old-mtime) -lt $(cat new-mtime)
-
-HEAD is now at 1f86866 yellow removes M
-Switched to branch 'change+rename'
-HEAD is now at df47076 changed and renamed
-Switched to branch 'change'
-ok 12 - merge of identical changes in a renamed file
-
-expecting success of 6402.13 'setup for rename + d/f conflicts': 
-	git reset --hard &&
-	git checkout --orphan dir-in-way &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir sub &&
-	mkdir dir &&
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
-	echo foo >dir/file-in-the-way &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	echo 11 >>sub/file &&
-	echo more >>dir/file-in-the-way &&
-	git add -u &&
-	git commit -m "Commit to merge, with dir in the way" &&
-
-	git checkout -b dir-not-in-way &&
-	git reset --soft HEAD^ &&
-	git rm -rf dir &&
-	git commit -m "Commit to merge, with dir removed" -- dir sub/file &&
-
-	git checkout -b renamed-file-has-no-conflicts dir-in-way~1 &&
-	git rm -rf dir &&
-	git rm sub/file &&
-	printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n" >dir &&
-	git add dir &&
-	git commit -m "Independent change" &&
-
-	git checkout -b renamed-file-has-conflicts dir-in-way~1 &&
-	git rm -rf dir &&
-	git mv sub/file dir &&
-	echo 12 >>dir &&
-	git add dir &&
-	git commit -m "Conflicting change"
-
-HEAD is now at 5fdefee Merge branch 'change+rename' into change
-Switched to a new branch 'dir-in-way'
-rm 'B'
-rm 'M'
-[dir-in-way (root-commit) 90faa3c] Common commit
- Author: A U Thor <author@example.com>
- 2 files changed, 11 insertions(+)
- create mode 100644 dir/file-in-the-way
- create mode 100644 sub/file
-[dir-in-way cd90736] Commit to merge, with dir in the way
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'dir-not-in-way'
-rm 'dir/file-in-the-way'
-[dir-not-in-way a8845d3] Commit to merge, with dir removed
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 dir/file-in-the-way
-Switched to a new branch 'renamed-file-has-no-conflicts'
-rm 'dir/file-in-the-way'
-rm 'sub/file'
-[renamed-file-has-no-conflicts 8c7fff4] Independent change
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 2 deletions(-)
- rename sub/file => dir (79%)
- delete mode 100644 dir/file-in-the-way
-Switched to a new branch 'renamed-file-has-conflicts'
-rm 'dir/file-in-the-way'
-[renamed-file-has-conflicts 53f2d73] Conflicting change
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename sub/file => dir (87%)
- delete mode 100644 dir/file-in-the-way
-ok 13 - setup for rename + d/f conflicts
-
-expecting success of 6402.14 'Rename+D/F conflict; renamed file merges + dir not in way': 
-	git reset --hard &&
-	git checkout -q renamed-file-has-no-conflicts^0 &&
-
-	git merge --strategy=recursive dir-not-in-way &&
-
-	git diff --quiet &&
-	test_path_is_file dir &&
-	test_write_lines 1 2 3 4 5555 6 7 8 9 10 11 >expected &&
-	test_cmp expected dir
-
-HEAD is now at 53f2d73 Conflicting change
-Auto-merging dir
-Merge made by the 'ort' strategy.
- dir | 1 +
- 1 file changed, 1 insertion(+)
-ok 14 - Rename+D/F conflict; renamed file merges + dir not in way
-
-expecting success of 6402.15 'Rename+D/F conflict; renamed file merges but dir in way': 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q renamed-file-has-no-conflicts^0 &&
-	test_must_fail git merge --strategy=recursive dir-in-way >output &&
-
-	test_grep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
-	test_grep "Auto-merging dir" output &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_grep "moving it to dir~HEAD instead" output
-	else
-		test_grep "Adding as dir~HEAD instead" output
-	fi &&
-
-	test_stdout_line_count = 3 git ls-files -u &&
-	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test_path_is_file dir/file-in-the-way &&
-	test_path_is_file dir~HEAD &&
-	test_cmp expected dir~HEAD
-
-HEAD is now at 7b1d99c Merge branch 'dir-not-in-way' into HEAD
-CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way.  Version dir-in-way of dir/file-in-the-way left in tree.
-Auto-merging dir~HEAD
-CONFLICT (file/directory): directory in the way of dir from HEAD; moving it to dir~HEAD instead.
-ok 15 - Rename+D/F conflict; renamed file merges but dir in way
-
-expecting success of 6402.16 'Same as previous, but merged other way': 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q dir-in-way^0 &&
-	test_must_fail git merge --strategy=recursive renamed-file-has-no-conflicts >output 2>errors &&
-
-	! grep "error: refusing to lose untracked file at" errors &&
-	test_grep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
-	test_grep "Auto-merging dir" output &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_grep "moving it to dir~renamed-file-has-no-conflicts instead" output
-	else
-		test_grep "Adding as dir~renamed-file-has-no-conflicts instead" output
-	fi &&
-
-	test_stdout_line_count = 3 git ls-files -u &&
-	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test_path_is_file dir/file-in-the-way &&
-	test_path_is_file dir~renamed-file-has-no-conflicts &&
-	test_cmp expected dir~renamed-file-has-no-conflicts
-
-HEAD is now at 8c7fff4 Independent change
-CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-no-conflicts and modified in HEAD.  Version HEAD of dir/file-in-the-way left in tree.
-Auto-merging dir~renamed-file-has-no-conflicts
-CONFLICT (file/directory): directory in the way of dir from renamed-file-has-no-conflicts; moving it to dir~renamed-file-has-no-conflicts instead.
-ok 16 - Same as previous, but merged other way
-
-expecting success of 6402.17 'Rename+D/F conflict; renamed file cannot merge, dir not in way': 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q renamed-file-has-conflicts^0 &&
-	test_must_fail git merge --strategy=recursive dir-not-in-way &&
-
-	test_stdout_line_count = 3 git ls-files -u &&
-	test_stdout_line_count = 3 git ls-files -u dir &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test_path_is_file dir &&
-	cat >expected <<-\EOF &&
-	1
-	2
-	3
-	4
-	5
-	6
-	7
-	8
-	9
-	10
-	<<<<<<< HEAD:dir
-	12
-	=======
-	11
-	>>>>>>> dir-not-in-way:sub/file
-	EOF
-	test_cmp expected dir
-
-HEAD is now at cd90736 Commit to merge, with dir in the way
-Auto-merging dir
-CONFLICT (content): Merge conflict in dir
-Automatic merge failed; fix conflicts and then commit the result.
-ok 17 - Rename+D/F conflict; renamed file cannot merge, dir not in way
-
-expecting success of 6402.18 'Rename+D/F conflict; renamed file cannot merge and dir in the way': 
-	modify s/dir-not-in-way/dir-in-way/ expected &&
-
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q renamed-file-has-conflicts^0 &&
-	test_must_fail git merge --strategy=recursive dir-in-way &&
-
-	test_stdout_line_count = 5 git ls-files -u &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_stdout_line_count = 3 git ls-files -u dir~HEAD
-	else
-		git ls-files -u dir >out &&
-		test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
-		rm -f out
-	fi &&
-	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test_path_is_file dir/file-in-the-way &&
-	test_path_is_file dir~HEAD &&
-	test_cmp expected dir~HEAD
-
-HEAD is now at 53f2d73 Conflicting change
-CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way.  Version dir-in-way of dir/file-in-the-way left in tree.
-CONFLICT (file/directory): directory in the way of dir from HEAD; moving it to dir~HEAD instead.
-Auto-merging dir~HEAD
-CONFLICT (content): Merge conflict in dir~HEAD
-Automatic merge failed; fix conflicts and then commit the result.
-ok 18 - Rename+D/F conflict; renamed file cannot merge and dir in the way
-
-expecting success of 6402.19 'Same as previous, but merged other way': 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q dir-in-way^0 &&
-	test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
-
-	test_stdout_line_count = 5 git ls-files -u &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_stdout_line_count = 3 git ls-files -u dir~renamed-file-has-conflicts
-	else
-		git ls-files -u dir >out &&
-		test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
-		rm -f out
-	fi &&
-	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test_path_is_file dir/file-in-the-way &&
-	test_path_is_file dir~renamed-file-has-conflicts &&
-	cat >expected <<-\EOF &&
-	1
-	2
-	3
-	4
-	5
-	6
-	7
-	8
-	9
-	10
-	<<<<<<< HEAD:sub/file
-	11
-	=======
-	12
-	>>>>>>> renamed-file-has-conflicts:dir
-	EOF
-	test_cmp expected dir~renamed-file-has-conflicts
-
-HEAD is now at 53f2d73 Conflicting change
-CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-conflicts and modified in HEAD.  Version HEAD of dir/file-in-the-way left in tree.
-CONFLICT (file/directory): directory in the way of dir from renamed-file-has-conflicts; moving it to dir~renamed-file-has-conflicts instead.
-Auto-merging dir~renamed-file-has-conflicts
-CONFLICT (content): Merge conflict in dir~renamed-file-has-conflicts
-Automatic merge failed; fix conflicts and then commit the result.
-ok 19 - Same as previous, but merged other way
-
-expecting success of 6402.20 'setup both rename source and destination involved in D/F conflict': 
-	git reset --hard &&
-	git checkout --orphan rename-dest &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir one &&
-	echo stuff >one/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git mv one/file destdir &&
-	git commit -m "Renamed to destdir" &&
-
-	git checkout -b source-conflict HEAD~1 &&
-	git rm -rf one &&
-	mkdir destdir &&
-	touch one destdir/foo &&
-	git add -A &&
-	git commit -m "Conflicts in the way"
-
-HEAD is now at cd90736 Commit to merge, with dir in the way
-Switched to a new branch 'rename-dest'
-rm 'dir/file-in-the-way'
-rm 'sub/file'
-[rename-dest (root-commit) 3156d6d] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one/file
-[rename-dest 4fde1d0] Renamed to destdir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename one/file => destdir (100%)
-Switched to a new branch 'source-conflict'
-rm 'one/file'
-[source-conflict 58f64f9] Conflicts in the way
- Author: A U Thor <author@example.com>
- 3 files changed, 1 deletion(-)
- create mode 100644 destdir/foo
- create mode 100644 one
- delete mode 100644 one/file
-ok 20 - setup both rename source and destination involved in D/F conflict
-
-expecting success of 6402.21 'both rename source and destination involved in D/F conflict': 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q rename-dest^0 &&
-	test_must_fail git merge --strategy=recursive source-conflict &&
-
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_stdout_line_count = 2 git ls-files -u
-	else
-		test_stdout_line_count = 1 git ls-files -u
-	fi &&
-
-	test_must_fail git diff --quiet &&
-
-	test_path_is_file destdir/foo &&
-	test_path_is_file one &&
-	test_path_is_file destdir~HEAD &&
-	test "stuff" = "$(cat destdir~HEAD)"
-
-HEAD is now at 58f64f9 Conflicts in the way
-CONFLICT (rename/delete): one/file renamed to destdir in HEAD, but deleted in source-conflict.
-CONFLICT (file/directory): directory in the way of destdir from HEAD; moving it to destdir~HEAD instead.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 21 - both rename source and destination involved in D/F conflict
-
-expecting success of 6402.22 'setup pair rename to parent of other (D/F conflicts)': 
-	git reset --hard &&
-	git checkout --orphan rename-two &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir one &&
-	mkdir two &&
-	echo stuff >one/file &&
-	echo other >two/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git rm -rf one &&
-	git mv two/file one &&
-	git commit -m "Rename two/file -> one" &&
-
-	git checkout -b rename-one HEAD~1 &&
-	git rm -rf two &&
-	git mv one/file two &&
-	rm -r one &&
-	git commit -m "Rename one/file -> two"
-
-HEAD is now at 4fde1d0 Renamed to destdir
-Switched to a new branch 'rename-two'
-rm 'destdir'
-[rename-two (root-commit) 0765ccc] Common commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one/file
- create mode 100644 two/file
-rm 'one/file'
-[rename-two c518e9e] Rename two/file -> one
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename two/file => one (100%)
- delete mode 100644 one/file
-Switched to a new branch 'rename-one'
-rm 'two/file'
-[rename-one a4e3198] Rename one/file -> two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename one/file => two (100%)
- delete mode 100644 two/file
-ok 22 - setup pair rename to parent of other (D/F conflicts)
-
-expecting success of 6402.23 'pair rename to parent of other (D/F conflicts) w/ untracked dir': 
-		git checkout -q rename-one^0 &&
-		mkdir one &&
-		test_must_fail git merge --strategy=recursive rename-two &&
-
-		test_stdout_line_count = 4 git ls-files -u &&
-		test_stdout_line_count = 2 git ls-files -u one &&
-		test_stdout_line_count = 2 git ls-files -u two &&
-
-		test_must_fail git diff --quiet &&
-
-		test 3 -eq $(find . | grep -v .git | wc -l) &&
-
-		test_path_is_file one &&
-		test_path_is_file two &&
-		test "other" = $(cat one) &&
-		test "stuff" = $(cat two)
-	
-CONFLICT (rename/delete): two/file renamed to one in rename-two, but deleted in HEAD.
-CONFLICT (rename/delete): one/file renamed to two in HEAD, but deleted in rename-two.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 23 - pair rename to parent of other (D/F conflicts) w/ untracked dir
-
-expecting success of 6402.24 'pair rename to parent of other (D/F conflicts) w/ clean start': 
-	git reset --hard &&
-	git clean -fdqx &&
-	test_must_fail git merge --strategy=recursive rename-two &&
-
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_stdout_line_count = 4 git ls-files -u &&
-		test_stdout_line_count = 2 git ls-files -u one &&
-		test_stdout_line_count = 2 git ls-files -u two
-	else
-		test_stdout_line_count = 2 git ls-files -u &&
-		test_stdout_line_count = 1 git ls-files -u one &&
-		test_stdout_line_count = 1 git ls-files -u two
-	fi &&
-
-	test_must_fail git diff --quiet &&
-
-	test 3 -eq $(find . | grep -v .git | wc -l) &&
-
-	test_path_is_file one &&
-	test_path_is_file two &&
-	test "other" = $(cat one) &&
-	test "stuff" = $(cat two)
-
-HEAD is now at a4e3198 Rename one/file -> two
-CONFLICT (rename/delete): two/file renamed to one in rename-two, but deleted in HEAD.
-CONFLICT (rename/delete): one/file renamed to two in HEAD, but deleted in rename-two.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 24 - pair rename to parent of other (D/F conflicts) w/ clean start
-
-expecting success of 6402.25 'setup rename of one file to two, with directories in the way': 
-	git reset --hard &&
-	git checkout --orphan first-rename &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	echo stuff >original &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	mkdir two &&
-	>two/file &&
-	git add two/file &&
-	git mv original one &&
-	git commit -m "Put two/file in the way, rename to one" &&
-
-	git checkout -b second-rename HEAD~1 &&
-	mkdir one &&
-	>one/file &&
-	git add one/file &&
-	git mv original two &&
-	git commit -m "Put one/file in the way, rename to two"
-
-HEAD is now at a4e3198 Rename one/file -> two
-Switched to a new branch 'first-rename'
-rm 'two'
-[first-rename (root-commit) 3ec06ba] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 original
-[first-rename 1d86576] Put two/file in the way, rename to one
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename original => one (100%)
- create mode 100644 two/file
-Switched to a new branch 'second-rename'
-[second-rename 35e7177] Put one/file in the way, rename to two
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 one/file
- rename original => two (100%)
-ok 25 - setup rename of one file to two, with directories in the way
-
-expecting success of 6402.26 'check handling of differently renamed file with D/F conflicts': 
-	git checkout -q first-rename^0 &&
-	test_must_fail git merge --strategy=recursive second-rename &&
-
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_stdout_line_count = 5 git ls-files -s &&
-		test_stdout_line_count = 3 git ls-files -u &&
-		test_stdout_line_count = 1 git ls-files -u one~HEAD &&
-		test_stdout_line_count = 1 git ls-files -u two~second-rename &&
-		test_stdout_line_count = 1 git ls-files -u original &&
-		test_stdout_line_count = 0 git ls-files -o
-	else
-		test_stdout_line_count = 5 git ls-files -s &&
-		test_stdout_line_count = 3 git ls-files -u &&
-		test_stdout_line_count = 1 git ls-files -u one &&
-		test_stdout_line_count = 1 git ls-files -u two &&
-		test_stdout_line_count = 1 git ls-files -u original &&
-		test_stdout_line_count = 2 git ls-files -o
-	fi &&
-
-	test_path_is_file one/file &&
-	test_path_is_file two/file &&
-	test_path_is_file one~HEAD &&
-	test_path_is_file two~second-rename &&
-	test_path_is_missing original
-
-CONFLICT (file/directory): directory in the way of one from HEAD; moving it to one~HEAD instead.
-CONFLICT (rename/rename): original renamed to one in HEAD and to two in second-rename.
-CONFLICT (file/directory): directory in the way of two from second-rename; moving it to two~second-rename instead.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 26 - check handling of differently renamed file with D/F conflicts
-
-expecting success of 6402.27 'setup rename one file to two; directories moving out of the way': 
-	git reset --hard &&
-	git checkout --orphan first-rename-redo &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	echo stuff >original &&
-	mkdir one two &&
-	touch one/file two/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git rm -rf one &&
-	git mv original one &&
-	git commit -m "Rename to one" &&
-
-	git checkout -b second-rename-redo HEAD~1 &&
-	git rm -rf two &&
-	git mv original two &&
-	git commit -m "Rename to two"
-
-HEAD is now at 1d86576 Put two/file in the way, rename to one
-Switched to a new branch 'first-rename-redo'
-rm 'one'
-rm 'two/file'
-[first-rename-redo (root-commit) 7f6a382] Common commit
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- create mode 100644 one/file
- create mode 100644 original
- create mode 100644 two/file
-rm 'one/file'
-[first-rename-redo 5a00903] Rename to one
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename original => one (100%)
- delete mode 100644 one/file
-Switched to a new branch 'second-rename-redo'
-rm 'two/file'
-[second-rename-redo 28aa9be] Rename to two
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename original => two (100%)
- delete mode 100644 two/file
-ok 27 - setup rename one file to two; directories moving out of the way
-
-expecting success of 6402.28 'check handling of differently renamed file with D/F conflicts': 
-	git checkout -q first-rename-redo^0 &&
-	test_must_fail git merge --strategy=recursive second-rename-redo &&
-
-	test_stdout_line_count = 3 git ls-files -u &&
-	test_stdout_line_count = 1 git ls-files -u one &&
-	test_stdout_line_count = 1 git ls-files -u two &&
-	test_stdout_line_count = 1 git ls-files -u original &&
-	test_stdout_line_count = 0 git ls-files -o &&
-
-	test_path_is_file one &&
-	test_path_is_file two &&
-	test_path_is_missing original
-
-CONFLICT (rename/rename): original renamed to one in HEAD and to two in second-rename-redo.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 28 - check handling of differently renamed file with D/F conflicts
-
-expecting success of 6402.29 'setup avoid unnecessary update, normal rename': 
-	git reset --hard &&
-	git checkout --orphan avoid-unnecessary-update-1 &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git mv original rename &&
-	echo 11 >>rename &&
-	git add -u &&
-	git commit -m "Renamed and modified" &&
-
-	git checkout -b merge-branch-1 HEAD~1 &&
-	echo "random content" >random-file &&
-	git add -A &&
-	git commit -m "Random, unrelated changes"
-
-HEAD is now at 5a00903 Rename to one
-Switched to a new branch 'avoid-unnecessary-update-1'
-rm 'one'
-rm 'two/file'
-[avoid-unnecessary-update-1 (root-commit) 2079f93] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 original
-[avoid-unnecessary-update-1 fb0186c] Renamed and modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename original => rename (87%)
-Switched to a new branch 'merge-branch-1'
-[merge-branch-1 65bbd67] Random, unrelated changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 random-file
-ok 29 - setup avoid unnecessary update, normal rename
-
-expecting success of 6402.30 'avoid unnecessary update, normal rename': 
-	git checkout -q avoid-unnecessary-update-1^0 &&
-	test-tool chmtime --get -3600 rename >expect &&
-	git merge merge-branch-1 &&
-	test-tool chmtime --get rename >actual &&
-	test_cmp expect actual # "rename" should have stayed intact
-
-Merge made by the 'ort' strategy.
- random-file | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 random-file
-ok 30 - avoid unnecessary update, normal rename
-
-expecting success of 6402.31 'setup to test avoiding unnecessary update, with D/F conflict': 
-	git reset --hard &&
-	git checkout --orphan avoid-unnecessary-update-2 &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir df &&
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git mv df/file temp &&
-	rm -rf df &&
-	git mv temp df &&
-	echo 11 >>df &&
-	git add -u &&
-	git commit -m "Renamed and modified" &&
-
-	git checkout -b merge-branch-2 HEAD~1 &&
-	>unrelated-change &&
-	git add unrelated-change &&
-	git commit -m "Only unrelated changes"
-
-HEAD is now at 284061b Merge branch 'merge-branch-1' into HEAD
-Switched to a new branch 'avoid-unnecessary-update-2'
-rm 'random-file'
-rm 'rename'
-[avoid-unnecessary-update-2 (root-commit) e635445] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 df/file
-[avoid-unnecessary-update-2 fb8c6d0] Renamed and modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename df/file => df (87%)
-Switched to a new branch 'merge-branch-2'
-[merge-branch-2 0787898] Only unrelated changes
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated-change
-ok 31 - setup to test avoiding unnecessary update, with D/F conflict
-
-expecting success of 6402.32 'avoid unnecessary update, with D/F conflict': 
-	git checkout -q avoid-unnecessary-update-2^0 &&
-	test-tool chmtime --get -3600 df >expect &&
-	git merge merge-branch-2 &&
-	test-tool chmtime --get df >actual &&
-	test_cmp expect actual # "df" should have stayed intact
-
-Merge made by the 'ort' strategy.
- unrelated-change | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated-change
-ok 32 - avoid unnecessary update, with D/F conflict
-
-expecting success of 6402.33 'setup avoid unnecessary update, dir->(file,nothing)': 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	>irrelevant &&
-	mkdir df &&
-	>df/file &&
-	git add -A &&
-	git commit -mA &&
-
-	git checkout -b side &&
-	git rm -rf df &&
-	git commit -mB &&
-
-	git checkout main &&
-	git rm -rf df &&
-	echo bla >df &&
-	git add -A &&
-	git commit -m "Add a newfile"
-
-rm 'df'
-rm 'unrelated-change'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
-[main (root-commit) 0238749] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 df/file
- create mode 100644 irrelevant
-Switched to a new branch 'side'
-rm 'df/file'
-[side 32a928c] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 df/file
-Switched to branch 'main'
-rm 'df/file'
-[main 90ac8b3] Add a newfile
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 df
- delete mode 100644 df/file
-ok 33 - setup avoid unnecessary update, dir->(file,nothing)
-
-expecting success of 6402.34 'avoid unnecessary update, dir->(file,nothing)': 
-	git checkout -q main^0 &&
-	test-tool chmtime --get -3600 df >expect &&
-	git merge side &&
-	test-tool chmtime --get df >actual &&
-	test_cmp expect actual # "df" should have stayed intact
-
-Merge made by the 'ort' strategy.
-ok 34 - avoid unnecessary update, dir->(file,nothing)
-
-expecting success of 6402.35 'setup avoid unnecessary update, modify/delete': 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	>irrelevant &&
-	>file &&
-	git add -A &&
-	git commit -mA &&
-
-	git checkout -b side &&
-	git rm -f file &&
-	git commit -m "Delete file" &&
-
-	git checkout main &&
-	echo bla >file &&
-	git add -A &&
-	git commit -m "Modify file"
-
-rm 'df'
-rm 'irrelevant'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
-[main (root-commit) bec55b4] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
- create mode 100644 irrelevant
-Switched to a new branch 'side'
-rm 'file'
-[side d8f9927] Delete file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 file
-Switched to branch 'main'
-[main 27c30f6] Modify file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 35 - setup avoid unnecessary update, modify/delete
-
-expecting success of 6402.36 'avoid unnecessary update, modify/delete': 
-	git checkout -q main^0 &&
-	test-tool chmtime --get -3600 file >expect &&
-	test_must_fail git merge side &&
-	test-tool chmtime --get file >actual &&
-	test_cmp expect actual # "file" should have stayed intact
-
-CONFLICT (modify/delete): file deleted in side and modified in HEAD.  Version HEAD of file left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 36 - avoid unnecessary update, modify/delete
-
-expecting success of 6402.37 'setup avoid unnecessary update, rename/add-dest': 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >file &&
-	git add -A &&
-	git commit -mA &&
-
-	git checkout -b side &&
-	cp file newfile &&
-	git add -A &&
-	git commit -m "Add file copy" &&
-
-	git checkout main &&
-	git mv file newfile &&
-	git commit -m "Rename file"
-
-rm 'file'
-rm 'file'
-rm 'irrelevant'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
-[main (root-commit) 61e6524] A
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 file
-Switched to a new branch 'side'
-[side 8c16f55] Add file copy
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 newfile
-Switched to branch 'main'
-[main b01e819] Rename file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => newfile (100%)
-ok 37 - setup avoid unnecessary update, rename/add-dest
-
-expecting success of 6402.38 'avoid unnecessary update, rename/add-dest': 
-	git checkout -q main^0 &&
-	test-tool chmtime --get -3600 newfile >expect &&
-	git merge side &&
-	test-tool chmtime --get newfile >actual &&
-	test_cmp expect actual # "file" should have stayed intact
-
-Merge made by the 'ort' strategy.
-ok 38 - avoid unnecessary update, rename/add-dest
-
-expecting success of 6402.39 'setup merge of rename + small change': 
-	git reset --hard &&
-	git checkout --orphan rename-plus-small-change &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	echo ORIGINAL >file &&
-	git add file &&
-
-	test_tick &&
-	git commit -m Initial &&
-	git checkout -b rename_branch &&
-	git mv file renamed_file &&
-	git commit -m Rename &&
-	git checkout rename-plus-small-change &&
-	echo NEW-VERSION >file &&
-	git commit -a -m Reformat
-
-HEAD is now at 826dab9 Merge branch 'side' into HEAD
-Switched to a new branch 'rename-plus-small-change'
-rm 'newfile'
-[rename-plus-small-change (root-commit) e44eadc] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'rename_branch'
-[rename_branch f706812] Rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => renamed_file (100%)
-Switched to branch 'rename-plus-small-change'
-[rename-plus-small-change 068ab66] Reformat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 39 - setup merge of rename + small change
-
-expecting success of 6402.40 'merge rename + small change': 
-	git merge rename_branch &&
-
-	test_stdout_line_count = 1 git ls-files -s &&
-	test_stdout_line_count = 0 git ls-files -o &&
-	newhash=$(git rev-parse HEAD:renamed_file) &&
-	oldhash=$(git rev-parse HEAD~1:file) &&
-	test $newhash = $oldhash
-
-Merge made by the 'ort' strategy.
- file => renamed_file | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => renamed_file (100%)
-ok 40 - merge rename + small change
-
-expecting success of 6402.41 'setup for use of extended merge markers': 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
-	git add original_file &&
-	git commit -mA &&
-
-	git checkout -b rename &&
-	echo 9 >>original_file &&
-	git add original_file &&
-	git mv original_file renamed_file &&
-	git commit -mB &&
-
-	git checkout main &&
-	echo 8.5 >>original_file &&
-	git add original_file &&
-	git commit -mC
-
-rm 'renamed_file'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
-[main (root-commit) 4847e8a] A
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 original_file
-Switched to a new branch 'rename'
-[rename e9adddb] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename original_file => renamed_file (88%)
-Switched to branch 'main'
-[main 0487bb6] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 41 - setup for use of extended merge markers
-
-expecting success of 6402.42 'merge main into rename has correct extended markers': 
-	git checkout rename^0 &&
-	test_must_fail git merge -s recursive main^0 &&
-
-	cat >expected <<-\EOF &&
-	1
-	2
-	3
-	4
-	5
-	6
-	7
-	8
-	<<<<<<< HEAD:renamed_file
-	9
-	=======
-	8.5
-	>>>>>>> main^0:original_file
-	EOF
-	test_cmp expected renamed_file
-
-Note: switching to 'rename^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at e9adddb B
-Auto-merging renamed_file
-CONFLICT (content): Merge conflict in renamed_file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 42 - merge main into rename has correct extended markers
-
-expecting success of 6402.43 'merge rename into main has correct extended markers': 
-	git reset --hard &&
-	git checkout main^0 &&
-	test_must_fail git merge -s recursive rename^0 &&
-
-	cat >expected <<-\EOF &&
-	1
-	2
-	3
-	4
-	5
-	6
-	7
-	8
-	<<<<<<< HEAD:original_file
-	8.5
-	=======
-	9
-	>>>>>>> rename^0:renamed_file
-	EOF
-	test_cmp expected renamed_file
-
-HEAD is now at e9adddb B
-Previous HEAD position was e9adddb B
-HEAD is now at 0487bb6 C
-Auto-merging renamed_file
-CONFLICT (content): Merge conflict in renamed_file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 43 - merge rename into main has correct extended markers
-
-expecting success of 6402.44 'setup spurious "refusing to lose untracked" message': 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	> irrelevant_file &&
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
-	git add irrelevant_file original_file &&
-	git commit -mA &&
-
-	git checkout -b rename &&
-	git mv original_file renamed_file &&
-	git commit -mB &&
-
-	git checkout main &&
-	git rm original_file &&
-	git commit -mC
-
-rm 'renamed_file'
-rm 'renamed_file'
-rm 'renamed_file'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
-[main (root-commit) e476651] A
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 irrelevant_file
- create mode 100644 original_file
-Switched to a new branch 'rename'
-[rename 951e2d3] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename original_file => renamed_file (100%)
-Switched to branch 'main'
-rm 'original_file'
-[main 52b2874] C
- Author: A U Thor <author@example.com>
- 1 file changed, 8 deletions(-)
- delete mode 100644 original_file
-ok 44 - setup spurious "refusing to lose untracked" message
-
-expecting success of 6402.45 'no spurious "refusing to lose untracked" message': 
-	git checkout main^0 &&
-	test_must_fail git merge rename^0 2>errors.txt &&
-	! grep "refusing to lose untracked file" errors.txt
-
-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 52b2874 C
-CONFLICT (rename/delete): original_file renamed to renamed_file in rename^0, but deleted in HEAD.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 45 - no spurious "refusing to lose untracked" message
-
-expecting success of 6402.46 'do not follow renames for empty files': 
-	git checkout -f -b empty-base &&
-	>empty1 &&
-	git add empty1 &&
-	git commit -m base &&
-	echo content >empty1 &&
-	git add empty1 &&
-	git commit -m fill &&
-	git checkout -b empty-topic HEAD^ &&
-	git mv empty1 empty2 &&
-	git commit -m rename &&
-	test_must_fail git merge empty-base &&
-	test_must_be_empty empty2
-
-Switched to a new branch 'empty-base'
-[empty-base a940ee2] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty1
-[empty-base d42ce4d] fill
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'empty-topic'
-[empty-topic ab32619] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename empty1 => empty2 (100%)
-CONFLICT (modify/delete): empty1 deleted in HEAD and modified in empty-base.  Version empty-base of empty1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 46 - do not follow renames for empty files
-
-# passed all 46 test(s)
-1..46
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6432-merge-recursive-space-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6432-merge-recursive-space-options/.git/
-expecting success of 6432.1 'setup': 
-	conflict_hunks () {
-		sed $SED_OPTIONS -n -e "
-			/^<<<</ b conflict
-			b
-			: conflict
-			p
-			/^>>>>/ b
-			n
-			b conflict
-		" "$@"
-	} &&
-
-	cat <<-\EOF >text.txt &&
-	    Hope, he says, cherishes the soul of him who lives in
-	    justice and holiness and is the nurse of his age and the
-	    companion of his journey;--hope which is mightiest to sway
-	    the restless soul of man.
-
-	How admirable are his words!  And the great blessing of riches, I do
-	not say to every man, but to a good man, is, that he has had no
-	occasion to deceive or to defraud others, either intentionally or
-	unintentionally; and when he departs to the world below he is not in
-	any apprehension about offerings due to the gods or debts which he owes
-	to men.  Now to this peace of mind the possession of wealth greatly
-	contributes; and therefore I say, that, setting one thing against
-	another, of the many advantages which wealth has to give, to a man of
-	sense this is in my opinion the greatest.
-
-	Well said, Cephalus, I replied; but as concerning justice, what is
-	it?--to speak the truth and to pay your debts--no more than this?  And
-	even to this are there not exceptions?  Suppose that a friend when in
-	his right mind has deposited arms with me and he asks for them when he
-	is not in his right mind, ought I to give them back to him?  No one
-	would say that I ought or that I should be right in doing so, any more
-	than they would say that I ought always to speak the truth to one who
-	is in his condition.
-
-	You are quite right, he replied.
-
-	But then, I said, speaking the truth and paying your debts is not a
-	correct definition of justice.
-
-	CEPHALUS - SOCRATES - POLEMARCHUS
-
-	Quite correct, Socrates, if Simonides is to be believed, said
-	Polemarchus interposing.
-
-	I fear, said Cephalus, that I must go now, for I have to look after the
-	sacrifices, and I hand over the argument to Polemarchus and the company.
-	EOF
-	git add text.txt &&
-	test_tick &&
-	git commit -m "Initial revision" &&
-
-	git checkout -b remote &&
-	sed -e "
-			s/\.  /\. /g
-			s/[?]  /? /g
-			s/    /	/g
-			s/--/---/g
-			s/but as concerning/but as con cerning/
-			/CEPHALUS - SOCRATES - POLEMARCHUS/ d
-		" text.txt >text.txt+ &&
-	mv text.txt+ text.txt &&
-	git commit -a -m "Remove cruft" &&
-
-	git checkout main &&
-	sed -e "
-			s/\(not in his right mind\),\(.*\)/\1;\2Q/
-			s/Quite correct\(.*\)/It is too correct\1Q/
-			s/unintentionally/un intentionally/
-			/un intentionally/ s/$/Q/
-			s/Polemarchus interposing./Polemarchus, interposing.Q/
-			/justice and holiness/ s/$/Q/
-			/pay your debts/ s/$/Q/
-		" text.txt | q_to_cr >text.txt+ &&
-	mv text.txt+ text.txt &&
-	git commit -a -m "Clarify" &&
-	git show-branch --all
-
-[main (root-commit) c1e95d9] Initial revision
- Author: A U Thor <author@example.com>
- 1 file changed, 36 insertions(+)
- create mode 100644 text.txt
-Switched to a new branch 'remote'
-[remote be82dcf] Remove cruft
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+), 10 deletions(-)
-Switched to branch 'main'
-[main 0ab7224] Clarify
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+), 6 deletions(-)
-* [main] Clarify
- ! [remote] Remove cruft
---
- + [remote] Remove cruft
-*  [main] Clarify
-*+ [remote^] Initial revision
-ok 1 - setup
-
-expecting success of 6432.2 'naive merge fails': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive HEAD^ -- HEAD remote &&
-	test_must_fail git update-index --refresh &&
-	grep "<<<<<<" text.txt
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-text.txt: needs merge
-<<<<<<< HEAD
-<<<<<<< HEAD
-ok 2 - naive merge fails
-
-expecting success of 6432.3 '--ignore-space-change makes merge succeed': 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 3 - --ignore-space-change makes merge succeed
-
-expecting success of 6432.4 'naive cherry-pick fails': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git cherry-pick --no-commit remote &&
-	git read-tree --reset -u HEAD &&
-	test_must_fail git cherry-pick remote &&
-	test_must_fail git update-index --refresh &&
-	grep "<<<<<<" text.txt
-
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-error: could not apply be82dcf... Remove cruft
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: Disable this message with "git config set advice.mergeConflict false"
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-error: could not apply be82dcf... Remove cruft
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-text.txt: needs merge
-<<<<<<< HEAD
-<<<<<<< HEAD
-ok 4 - naive cherry-pick fails
-
-expecting success of 6432.5 '-Xignore-space-change makes cherry-pick succeed': 
-	git read-tree --reset -u HEAD &&
-	git cherry-pick --no-commit -Xignore-space-change remote
-
-Auto-merging text.txt
-ok 5 - -Xignore-space-change makes cherry-pick succeed
-
-expecting success of 6432.6 '--ignore-space-change: our w/s-only change wins': 
-	q_to_cr <<-\EOF >expected &&
-	    justice and holiness and is the nurse of his age and theQ
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
-	grep "justice and holiness" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 6 - --ignore-space-change: our w/s-only change wins
-
-expecting success of 6432.7 '--ignore-space-change: their real change wins over w/s': 
-	cat <<-\EOF >expected &&
-	it?---to speak the truth and to pay your debts---no more than this? And
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
-	grep "pay your debts" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 7 - --ignore-space-change: their real change wins over w/s
-
-expecting success of 6432.8 '--ignore-space-change: does not ignore new spaces': 
-	cat <<-\EOF >expected1 &&
-	Well said, Cephalus, I replied; but as con cerning justice, what is
-	EOF
-	q_to_cr <<-\EOF >expected2 &&
-	un intentionally; and when he departs to the world below he is not inQ
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
-	grep "Well said" text.txt >actual1 &&
-	grep "when he departs" text.txt >actual2 &&
-	test_cmp expected1 actual1 &&
-	test_cmp expected2 actual2
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 8 - --ignore-space-change: does not ignore new spaces
-
-expecting success of 6432.9 '--ignore-all-space drops their new spaces': 
-	cat <<-\EOF >expected &&
-	Well said, Cephalus, I replied; but as concerning justice, what is
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
-	grep "Well said" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 9 - --ignore-all-space drops their new spaces
-
-expecting success of 6432.10 '--ignore-all-space keeps our new spaces': 
-	q_to_cr <<-\EOF >expected &&
-	un intentionally; and when he departs to the world below he is not inQ
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
-	grep "when he departs" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 10 - --ignore-all-space keeps our new spaces
-
-expecting success of 6432.11 '--ignore-space-at-eol': 
-	q_to_cr <<-\EOF >expected &&
-	<<<<<<< HEAD
-	is not in his right mind; ought I to give them back to him?  No oneQ
-	=======
-	is not in his right mind, ought I to give them back to him? No one
-	>>>>>>> remote
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --ignore-space-at-eol \
-						 HEAD^ -- HEAD remote &&
-	conflict_hunks text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-ok 11 - --ignore-space-at-eol
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6424-merge-unrelated-index-changes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6424-merge-unrelated-index-changes/.git/
-expecting success of 6424.1 'setup trivial merges': 
-	test_seq 1 10 >a &&
-	git add a &&
-	test_tick && git commit -m A &&
-
-	git branch A &&
-	git branch B &&
-	git branch C &&
-	git branch D &&
-	git branch E &&
-	git branch F &&
-
-	git checkout B &&
-	echo b >b &&
-	echo 11 >>a &&
-	git add a b &&
-	test_tick && git commit -m B &&
-
-	git checkout C &&
-	echo c >c &&
-	git add c &&
-	test_tick && git commit -m C &&
-
-	git checkout D &&
-	test_seq 2 10 >a &&
-	echo d >d &&
-	git add a d &&
-	test_tick && git commit -m D &&
-
-	git checkout E &&
-	mkdir subdir &&
-	git mv a subdir/a &&
-	echo e >subdir/e &&
-	git add subdir &&
-	test_tick && git commit -m E &&
-
-	git checkout F &&
-	test_tick && git commit --allow-empty -m F
-
-[master (root-commit) 87af29c] A
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 a
-Switched to branch 'B'
-[B ed5d5a6] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 b
-Switched to branch 'C'
-[C 4fa59ce] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Switched to branch 'D'
-[D c3c5299] D
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 d
-Switched to branch 'E'
-[E b615563] E
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename a => subdir/a (100%)
- create mode 100644 subdir/e
-Switched to branch 'F'
-[F 83c2e21] F
- Author: A U Thor <author@example.com>
-ok 1 - setup trivial merges
-
-expecting success of 6424.2 'ff update': 
-	git reset --hard &&
-	git checkout A^0 &&
-
-	touch random_file && git add random_file &&
-
-	git merge E^0 &&
-
-	test_must_fail git rev-parse HEAD:random_file &&
-	test "$(git diff --name-only --cached E)" = "random_file" &&
-	test_path_is_file random_file &&
-	git rev-parse --verify :random_file
-
-HEAD is now at 83c2e21 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 87af29c A
-Updating 87af29c..b615563
-Fast-forward
- a => subdir/a | 0
- subdir/e      | 1 +
- 2 files changed, 1 insertion(+)
- rename a => subdir/a (100%)
- create mode 100644 subdir/e
-fatal: path 'random_file' exists on disk, but not in 'HEAD'
-HEAD:random_file
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 2 - ff update
-
-expecting success of 6424.3 'ff update, important file modified': 
-	git reset --hard &&
-	git checkout A^0 &&
-
-	mkdir subdir &&
-	touch subdir/e &&
-	git add subdir/e &&
-
-	test_must_fail git merge E^0 &&
-	test_path_is_file subdir/e &&
-	git rev-parse --verify :subdir/e &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at b615563 E
-Previous HEAD position was b615563 E
-HEAD is now at 87af29c A
-error: Your local changes to the following files would be overwritten by merge:
-	subdir/e
-Please commit your changes or stash them before you merge.
-Aborting
-Updating 87af29c..b615563
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 3 - ff update, important file modified
-
-expecting success of 6424.4 'resolve, trivial': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	touch random_file && git add random_file &&
-
-	test_must_fail git merge -s resolve C^0 &&
-	test_path_is_file random_file &&
-	git rev-parse --verify :random_file &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at 87af29c A
-Previous HEAD position was 87af29c A
-HEAD is now at ed5d5a6 B
-error: Your local changes to the following files would be overwritten by merge:
-  random_file
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 4 - resolve, trivial
-
-expecting success of 6424.5 'resolve, non-trivial': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	touch random_file && git add random_file &&
-
-	test_must_fail git merge -s resolve D^0 &&
-	test_path_is_file random_file &&
-	git rev-parse --verify :random_file &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-error: Your local changes to the following files would be overwritten by merge:
-  random_file
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 5 - resolve, non-trivial
-
-expecting success of 6424.6 'resolve, trivial, related file removed': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	git rm a &&
-	test_path_is_missing a &&
-
-	test_must_fail git merge -s resolve C^0 &&
-
-	test_path_is_missing a &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-rm 'a'
-error: Your local changes to the following files would be overwritten by merge:
-  a
-ok 6 - resolve, trivial, related file removed
-
-expecting success of 6424.7 'resolve, non-trivial, related file removed': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	git rm a &&
-	test_path_is_missing a &&
-
-	# We also ask for recursive in order to turn off the "allow_trivial"
-	# setting in builtin/merge.c, and ensure that resolve really does
-	# correctly fail the merge (I guess this also tests that recursive
-	# correctly fails the merge, but the main thing we are attempting
-	# to test here is resolve and are just using the side effect of
-	# adding recursive to ensure that resolve is actually tested rather
-	# than the trivial merge codepath)
-	test_must_fail git merge -s resolve -s recursive D^0 &&
-
-	test_path_is_missing a &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-rm 'a'
-Trying merge strategy resolve...
-Error: Your local changes to the following files would be overwritten by merge
-    a
-Rewinding the tree to pristine...
-error: Your local changes to the following files would be overwritten by merge:
-  a
-Trying merge strategy ort...
-No merge strategy handled the merge.
-ok 7 - resolve, non-trivial, related file removed
-
-expecting success of 6424.8 'recursive': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	touch random_file && git add random_file &&
-
-	test_must_fail git merge -s recursive C^0 &&
-	test_path_is_file random_file &&
-	git rev-parse --verify :random_file &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-error: Your local changes to the following files would be overwritten by merge:
-  random_file
-Merge with strategy ort failed.
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 8 - recursive
-
-expecting success of 6424.9 'recursive, when merge branch matches merge base': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	touch random_file && git add random_file &&
-
-	test_must_fail git merge -s recursive F^0 &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-error: Your local changes to the following files would be overwritten by merge:
-  random_file
-Merge with strategy ort failed.
-ok 9 - recursive, when merge branch matches merge base
-
-expecting success of 6424.10 'merge-recursive, when index==head but head!=HEAD': 
-	git reset --hard &&
-	git checkout C^0 &&
-
-	# Make index match B
-	git diff C B -- | git apply --cached &&
-	test_when_finished "git clean -fd" &&  # Do not leave untracked around
-	# Merge B & F, with B as "head"
-	git merge-recursive A -- B F > out &&
-	test_grep "Already up to date" out
-
-HEAD is now at ed5d5a6 B
-Previous HEAD position was ed5d5a6 B
-HEAD is now at 4fa59ce C
-Already up to date.
-Removing c
-Removing out
-ok 10 - merge-recursive, when index==head but head!=HEAD
-
-expecting success of 6424.11 'recursive, when file has staged changes not matching HEAD nor what a merge would give': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	mkdir subdir &&
-	test_seq 1 10 >subdir/a &&
-	git add subdir/a &&
-	git rev-parse --verify :subdir/a >expect &&
-
-	# We have staged changes; merge should error out
-	test_must_fail git merge -s recursive E^0 2>err &&
-	git rev-parse --verify :subdir/a >actual &&
-	test_cmp expect actual &&
-	test_grep "changes to the following files would be overwritten" err
-
-HEAD is now at 4fa59ce C
-Previous HEAD position was 4fa59ce C
-HEAD is now at ed5d5a6 B
-error: Your local changes to the following files would be overwritten by merge:
-ok 11 - recursive, when file has staged changes not matching HEAD nor what a merge would give
-
-expecting success of 6424.12 'recursive, when file has staged changes matching what a merge would give': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	mkdir subdir &&
-	test_seq 1 11 >subdir/a &&
-	git add subdir/a &&
-	git rev-parse --verify :subdir/a >expect &&
-
-	# We have staged changes; merge should error out
-	test_must_fail git merge -s recursive E^0 2>err &&
-	git rev-parse --verify :subdir/a >actual &&
-	test_cmp expect actual &&
-	test_grep "changes to the following files would be overwritten" err
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-error: Your local changes to the following files would be overwritten by merge:
-ok 12 - recursive, when file has staged changes matching what a merge would give
-
-expecting success of 6424.13 'octopus, unrelated file touched': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	touch random_file && git add random_file &&
-
-	test_must_fail git merge C^0 D^0 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	git rev-parse --verify :random_file &&
-	test_path_exists random_file
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-Error: Your local changes to the following files would be overwritten by merge
-    random_file
-Merge with strategy octopus failed.
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 13 - octopus, unrelated file touched
-
-expecting success of 6424.14 'octopus, related file removed': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	git rm b &&
-
-	test_must_fail git merge C^0 D^0 &&
-	test_path_is_missing b &&
-	test_must_fail git rev-parse --verify :b &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-rm 'b'
-Error: Your local changes to the following files would be overwritten by merge
-    b
-Merge with strategy octopus failed.
-fatal: Needed a single revision
-ok 14 - octopus, related file removed
-
-expecting success of 6424.15 'octopus, related file modified': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	echo 12 >>a && git add a &&
-	git rev-parse --verify :a >expect &&
-
-	test_must_fail git merge C^0 D^0 &&
-	test_path_is_file a &&
-	git rev-parse --verify :a >actual &&
-	test_cmp expect actual &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-Error: Your local changes to the following files would be overwritten by merge
-    a
-Merge with strategy octopus failed.
-ok 15 - octopus, related file modified
-
-expecting success of 6424.16 'ours': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	touch random_file && git add random_file &&
-
-	test_must_fail git merge -s ours C^0 &&
-	test_path_is_file random_file &&
-	git rev-parse --verify :random_file &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-Merge with strategy ours failed.
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 16 - ours
-
-expecting success of 6424.17 'subtree': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	touch random_file && git add random_file &&
-
-	test_must_fail git merge -s subtree E^0 &&
-	test_path_is_file random_file &&
-	git rev-parse --verify :random_file &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-error: Your local changes to the following files would be overwritten by merge:
-  random_file
-Merge with strategy subtree failed.
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 17 - subtree
-
-expecting success of 6424.18 'avoid failure due to stat-dirty files': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	# Make "a" be stat-dirty
-	test-tool chmtime =+1 a &&
-
-	# stat-dirty file should not prevent stash creation in builtin/merge.c
-	git merge -s resolve -s recursive D^0
-
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-Trying merge strategy resolve...
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging a
-Merge made by the 'resolve' strategy.
- a | 1 -
- d | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 d
-ok 18 - avoid failure due to stat-dirty files
-
-expecting success of 6424.19 'with multiple strategies, recursive or ort failure do not early abort': 
-	git reset --hard &&
-	git checkout B^0 &&
-
-	test_seq 0 10 >a &&
-	git add a &&
-	git rev-parse :a >expect &&
-
-	sane_unset GIT_TEST_MERGE_ALGORITHM &&
-	test_must_fail git merge -s recursive -s ort -s octopus C^0 >output 2>&1 &&
-
-	grep "Trying merge strategy recursive..." output &&
-	grep "Trying merge strategy ort..." output &&
-	grep "Trying merge strategy octopus..." output &&
-	grep "No merge strategy handled the merge." output &&
-
-	# Changes to "a" should remain staged
-	git rev-parse :a >actual &&
-	test_cmp expect actual
-
-HEAD is now at c1fdbe2 Merge commit 'D^0' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c1fdbe2 Merge commit 'D^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> c1fdbe2
-
-HEAD is now at ed5d5a6 B
-Trying merge strategy recursive...
-Trying merge strategy ort...
-Trying merge strategy octopus...
-No merge strategy handled the merge.
-ok 19 - with multiple strategies, recursive or ort failure do not early abort
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6435-merge-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6435-merge-sparse/.git/
-expecting success of 6435.1 'setup': 
-	test_file checked-out init &&
-	test_file modify_delete modify_delete_init &&
-	test_commit_this init &&
-	test_file modify_delete modify_delete_theirs &&
-	test_commit_this theirs &&
-	git reset --hard init &&
-	git rm modify_delete &&
-	test_commit_this ours &&
-	git config core.sparseCheckout true &&
-	mkdir .git/info &&
-	echo "/checked-out" >.git/info/sparse-checkout &&
-	git reset --hard &&
-	test_must_fail git merge theirs
-
-[master (root-commit) badb3ac] init
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 checked-out
- create mode 100644 modify_delete
-[master 1c06c2f] theirs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at badb3ac init
-rm 'modify_delete'
-[master 3dfe889] ours
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 modify_delete
-HEAD is now at 3dfe889 ours
-CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 1 - setup
-
-expecting success of 6435.2 'reset --hard works after the conflict': 
-	git reset --hard
-
-HEAD is now at 3dfe889 ours
-ok 2 - reset --hard works after the conflict
-
-expecting success of 6435.3 'is reset properly': 
-	git status --porcelain -- modify_delete >out &&
-	test_must_be_empty out &&
-	test_path_is_missing modify_delete
-
-ok 3 - is reset properly
-
-expecting success of 6435.4 'setup: conflict back': 
-	test_must_fail git merge theirs
-
-CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - setup: conflict back
-
-expecting success of 6435.5 'Merge abort works after the conflict': 
-	git merge --abort
-
-ok 5 - Merge abort works after the conflict
-
-expecting success of 6435.6 'is aborted properly': 
-	git status --porcelain -- modify_delete >out &&
-	test_must_be_empty out &&
-	test_path_is_missing modify_delete
-
-ok 6 - is aborted properly
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6429-merge-sequence-rename-caching.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/.git/
-expecting success of 6429.1 'caching renames does not preclude finding new ones': 
-	git init caching-renames-and-new-renames &&
-	(
-		cd caching-renames-and-new-renames &&
-
-		test_seq 2 10 >numbers &&
-		test_seq 2 10 >values &&
-		git add numbers values &&
-		git commit -m orig &&
-
-		git branch upstream &&
-		git branch topic &&
-
-		git switch upstream &&
-		test_seq 1 10 >numbers &&
-		test_seq 1 10 >values &&
-		git add numbers values &&
-		git commit -m "Tweaked both files" &&
-
-		git switch topic &&
-
-		test_seq 2 12 >numbers &&
-		git add numbers &&
-		git mv numbers sequence &&
-		git commit -m A &&
-
-		test_seq 2 12 >values &&
-		git add values &&
-		git mv values scruples &&
-		git commit -m B &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		git ls-files >tracked-files &&
-		test_line_count = 2 tracked-files &&
-		test_seq 1 12 >expect &&
-		test_cmp expect sequence &&
-		test_cmp expect scruples
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/caching-renames-and-new-renames/.git/
-[master (root-commit) 29f8a28] orig
- Author: A U Thor <author@example.com>
- 2 files changed, 18 insertions(+)
- create mode 100644 numbers
- create mode 100644 values
-Switched to branch 'upstream'
-[upstream a12dbe8] Tweaked both files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to branch 'topic'
-[topic e84d01a] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename numbers => sequence (76%)
-[topic 1354771] B
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename values => scruples (76%)
-Switched to branch 'upstream'
-Switched to branch 'topic'
-ok 1 - caching renames does not preclude finding new ones
-
-expecting success of 6429.2 'cherry-pick both a commit and its immediate revert': 
-	git init pick-commit-and-its-immediate-revert &&
-	(
-		cd pick-commit-and-its-immediate-revert &&
-
-		test_seq 11 30 >numbers &&
-		git add numbers &&
-		git commit -m orig &&
-
-		git branch upstream &&
-		git branch topic &&
-
-		git switch upstream &&
-		test_seq 1 30 >numbers &&
-		git add numbers &&
-		git mv numbers sequence &&
-		git commit -m "Renamed (and modified) numbers -> sequence" &&
-
-		git switch topic &&
-
-		test_seq 11 13 >numbers &&
-		git add numbers &&
-		git commit -m A &&
-
-		git revert HEAD &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 1 calls
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/pick-commit-and-its-immediate-revert/.git/
-[master (root-commit) 4bf57ba] orig
- Author: A U Thor <author@example.com>
- 1 file changed, 20 insertions(+)
- create mode 100644 numbers
-Switched to branch 'upstream'
-[upstream ab0f48c] Renamed (and modified) numbers -> sequence
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- rename numbers => sequence (74%)
-Switched to branch 'topic'
-[topic 0105939] A
- Author: A U Thor <author@example.com>
- 1 file changed, 17 deletions(-)
-[topic 5ed36dd] Revert "A"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 17 insertions(+)
-Switched to branch 'upstream'
-Switched to branch 'topic'
-ok 2 - cherry-pick both a commit and its immediate revert
-
-expecting success of 6429.3 'rename same file identically, then reintroduce it': 
-	git init rename-rename-1to1-then-add-old-filename &&
-	(
-		cd rename-rename-1to1-then-add-old-filename &&
-
-		test_seq 3 8 >sequence &&
-		git add sequence &&
-		git commit -m orig &&
-
-		git branch upstream &&
-		git branch topic &&
-
-		git switch upstream &&
-		test_seq 1 8 >sequence &&
-		git add sequence &&
-		git mv sequence values &&
-		git commit -m "Renamed (and modified) sequence -> values" &&
-
-		git switch topic &&
-
-		test_seq 3 10 >sequence &&
-		git add sequence &&
-		git mv sequence values &&
-		git commit -m A &&
-
-		test_write_lines A B C D E F G H I J >sequence &&
-		git add sequence &&
-		git commit -m B &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		git ls-files >tracked &&
-		test_line_count = 2 tracked &&
-		test_path_is_file values &&
-		test_path_is_file sequence &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 2 calls
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/rename-rename-1to1-then-add-old-filename/.git/
-[master (root-commit) d064880] orig
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+)
- create mode 100644 sequence
-Switched to branch 'upstream'
-[upstream 685755c] Renamed (and modified) sequence -> values
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename sequence => values (75%)
-Switched to branch 'topic'
-[topic a049c8f] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename sequence => values (70%)
-[topic ca60f7a] B
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 sequence
-Switched to branch 'upstream'
-Switched to branch 'topic'
-ok 3 - rename same file identically, then reintroduce it
-
-expecting success of 6429.4 'rename same file identically, then add file to old dir': 
-	git init rename-rename-1to1-then-add-file-to-old-dir &&
-	(
-		cd rename-rename-1to1-then-add-file-to-old-dir &&
-
-		mkdir olddir/ &&
-		test_seq 3 8 >olddir/valuesZ &&
-		test_seq 3 8 >olddir/valuesY &&
-		test_seq 3 8 >olddir/valuesX &&
-		git add olddir &&
-		git commit -m orig &&
-
-		git branch upstream &&
-		git branch topic &&
-
-		git switch upstream &&
-		test_seq 1 8 >olddir/valuesZ &&
-		test_seq 1 8 >olddir/valuesY &&
-		test_seq 1 8 >olddir/valuesX &&
-		git add olddir &&
-		mkdir dirA &&
-		git mv olddir/valuesZ olddir/valuesY dirA &&
-		git mv olddir/ dirB/ &&
-		git commit -m "Renamed (and modified) values*" &&
-
-		git switch topic &&
-
-		test_seq 3 10 >olddir/valuesZ &&
-		test_seq 3 10 >olddir/valuesY &&
-		git add olddir &&
-		mkdir dirA &&
-		git mv olddir/valuesZ olddir/valuesY dirA &&
-		git commit -m A &&
-
-		>olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m B &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-		git config merge.directoryRenames true &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		git ls-files >tracked &&
-		test_line_count = 4 tracked &&
-		test_path_is_file dirA/valuesZ &&
-		test_path_is_file dirA/valuesY &&
-		test_path_is_file dirB/valuesX &&
-		test_path_is_file dirB/newfile &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 3 calls
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/rename-rename-1to1-then-add-file-to-old-dir/.git/
-[master (root-commit) c0deec2] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 18 insertions(+)
- create mode 100644 olddir/valuesX
- create mode 100644 olddir/valuesY
- create mode 100644 olddir/valuesZ
-Switched to branch 'upstream'
-[upstream 19abd35] Renamed (and modified) values*
- Author: A U Thor <author@example.com>
- 3 files changed, 6 insertions(+)
- rename {olddir => dirA}/valuesY (75%)
- rename {olddir => dirA}/valuesZ (75%)
- rename {olddir => dirB}/valuesX (75%)
-Switched to branch 'topic'
-[topic bea1a85] A
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- rename {olddir => dirA}/valuesY (70%)
- rename {olddir => dirA}/valuesZ (70%)
-[topic c04e0a1] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 olddir/newfile
-Switched to branch 'upstream'
-Switched to branch 'topic'
-ok 4 - rename same file identically, then add file to old dir
-
-expecting success of 6429.5 'cached dir rename does not prevent noticing later conflict': 
-	git init dir-rename-cache-not-occluding-later-conflict &&
-	(
-		cd dir-rename-cache-not-occluding-later-conflict &&
-
-		mkdir olddir &&
-		test_seq 3 10 >olddir/a &&
-		test_seq 3 10 >olddir/b &&
-		git add olddir &&
-		git commit -m orig &&
-
-		git branch upstream &&
-		git branch topic &&
-
-		git switch upstream &&
-		test_seq 3 10 >olddir/a &&
-		test_seq 3 10 >olddir/b &&
-		git add olddir &&
-		git mv olddir newdir &&
-		git commit -m "Dir renamed" &&
-
-		git switch topic &&
-
-		>olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m A &&
-
-		test_seq 1 8 >olddir/a &&
-		test_seq 1 8 >olddir/b &&
-		git add olddir &&
-		git mv olddir otherdir &&
-		git commit -m B &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-		git config merge.directoryRenames true &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		test_must_fail git replay --onto HEAD upstream~1..topic >output &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 2 calls
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/dir-rename-cache-not-occluding-later-conflict/.git/
-[master (root-commit) de8bf0f] orig
- Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 olddir/a
- create mode 100644 olddir/b
-Switched to branch 'upstream'
-[upstream 525dfa0] Dir renamed
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {olddir => newdir}/a (100%)
- rename {olddir => newdir}/b (100%)
-Switched to branch 'topic'
-[topic 2c93a7d] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 olddir/newfile
-[topic 81a8875] B
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+), 4 deletions(-)
- rename {olddir => otherdir}/a (70%)
- rename {olddir => otherdir}/b (70%)
- rename {olddir => otherdir}/newfile (100%)
-Switched to branch 'upstream'
-ok 5 - cached dir rename does not prevent noticing later conflict
-
-expecting success of 6429.6 'dir rename unneeded, then add new file to old dir': 
-	test_setup_upstream_rename dir-rename-unneeded-until-new-file &&
-	(
-		cd dir-rename-unneeded-until-new-file &&
-
-		git switch topic &&
-
-		test_seq 3 10 >relevant-rename &&
-		git add relevant-rename &&
-		git commit -m A &&
-
-		echo foo >olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m B &&
-
-		echo bar >>olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m C &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-		git config merge.directoryRenames true &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 2 calls &&
-
-		git ls-files >tracked &&
-		test_line_count = 5 tracked &&
-		test_path_is_missing olddir/newfile &&
-		test_path_is_file newdir/newfile
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/dir-rename-unneeded-until-new-file/.git/
-[master (root-commit) af0596a] orig
- Author: A U Thor <author@example.com>
- 4 files changed, 26 insertions(+)
- create mode 100644 olddir/a
- create mode 100644 olddir/b
- create mode 100644 relevant-rename
- create mode 100644 somefile
-Switched to branch 'upstream'
-[upstream c545414] Dir renamed
- Author: A U Thor <author@example.com>
- 4 files changed, 6 insertions(+)
- rename {olddir => newdir}/a (87%)
- rename {olddir => newdir}/b (87%)
- rename relevant-rename => renamed (75%)
-Switched to branch 'topic'
-[topic 63565df] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[topic 8540faf] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 olddir/newfile
-[topic f859e8f] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'upstream'
-Switched to branch 'topic'
-ok 6 - dir rename unneeded, then add new file to old dir
-
-expecting success of 6429.7 'dir rename unneeded, then rename existing file into old dir': 
-	test_setup_upstream_rename dir-rename-unneeded-until-file-moved-inside &&
-	(
-		cd dir-rename-unneeded-until-file-moved-inside &&
-
-		git switch topic &&
-
-		test_seq 3 10 >relevant-rename &&
-		git add relevant-rename &&
-		git commit -m A &&
-
-		test_seq 1 10 >somefile &&
-		git add somefile &&
-		git mv somefile olddir/newfile &&
-		git commit -m B &&
-
-		test_seq 1 12 >olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m C &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-		git config merge.directoryRenames true &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 3 calls &&
-
-		test_path_is_missing somefile &&
-		test_path_is_missing olddir/newfile &&
-		test_path_is_file newdir/newfile &&
-		git ls-files >tracked &&
-		test_line_count = 4 tracked
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/dir-rename-unneeded-until-file-moved-inside/.git/
-[master (root-commit) af0596a] orig
- Author: A U Thor <author@example.com>
- 4 files changed, 26 insertions(+)
- create mode 100644 olddir/a
- create mode 100644 olddir/b
- create mode 100644 relevant-rename
- create mode 100644 somefile
-Switched to branch 'upstream'
-[upstream c545414] Dir renamed
- Author: A U Thor <author@example.com>
- 4 files changed, 6 insertions(+)
- rename {olddir => newdir}/a (87%)
- rename {olddir => newdir}/b (87%)
- rename relevant-rename => renamed (75%)
-Switched to branch 'topic'
-[topic 63565df] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[topic 538c5a2] B
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- rename somefile => olddir/newfile (57%)
-[topic f3a758f] C
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'upstream'
-Switched to branch 'topic'
-ok 7 - dir rename unneeded, then rename existing file into old dir
-
-expecting success of 6429.8 'caching renames only on upstream side, part 1': 
-	test_setup_topic_rename cache-renames-only-upstream-add-file &&
-	(
-		cd cache-renames-only-upstream-add-file &&
-
-		git switch upstream &&
-
-		>olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m "Add newfile" &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-
-		git config merge.directoryRenames true &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 1 calls &&
-
-		git ls-files >tracked &&
-		test_line_count = 5 tracked &&
-		test_path_is_missing newdir/unrelated-file &&
-		test_path_is_file olddir/unrelated-file &&
-		test_path_is_file newdir/newfile &&
-		test_path_is_file newdir/b &&
-		test_path_is_file newdir/a &&
-		test_path_is_file somefile
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/cache-renames-only-upstream-add-file/.git/
-[master (root-commit) 3584a53] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 13 insertions(+)
- create mode 100644 olddir/a
- create mode 100644 olddir/b
- create mode 100644 somefile
-Switched to branch 'topic'
-[topic 3a60cc7] Dir renamed
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- rename {olddir => newdir}/a (75%)
- rename {olddir => newdir}/b (100%)
-[topic 4b8f8d7] Unrelated file in recreated old dir
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 olddir/unrelated-file
-Switched to branch 'upstream'
-[upstream a04aaa8] Add newfile
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 olddir/newfile
-Already on 'upstream'
-Switched to branch 'topic'
-ok 8 - caching renames only on upstream side, part 1
-
-expecting success of 6429.9 'caching renames only on upstream side, part 2': 
-	test_setup_topic_rename cache-renames-only-upstream-rename-file &&
-	(
-		cd cache-renames-only-upstream-rename-file &&
-
-		git switch upstream &&
-
-		git mv somefile olddir/newfile &&
-		git commit -m "Add newfile" &&
-
-		#
-		# Actual testing
-		#
-
-		git switch upstream &&
-
-		git config merge.directoryRenames true &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
-
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
-
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 2 calls &&
-
-		git ls-files >tracked &&
-		test_line_count = 4 tracked &&
-		test_path_is_missing newdir/unrelated-file &&
-		test_path_is_file olddir/unrelated-file &&
-		test_path_is_file newdir/newfile &&
-		test_path_is_file newdir/b &&
-		test_path_is_file newdir/a
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/cache-renames-only-upstream-rename-file/.git/
-[master (root-commit) 3584a53] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 13 insertions(+)
- create mode 100644 olddir/a
- create mode 100644 olddir/b
- create mode 100644 somefile
-Switched to branch 'topic'
-[topic 3a60cc7] Dir renamed
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- rename {olddir => newdir}/a (75%)
- rename {olddir => newdir}/b (100%)
-[topic 4b8f8d7] Unrelated file in recreated old dir
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 olddir/unrelated-file
-Switched to branch 'upstream'
-[upstream 531f940] Add newfile
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename somefile => olddir/newfile (100%)
-Already on 'upstream'
-Switched to branch 'topic'
-ok 9 - caching renames only on upstream side, part 2
-
-expecting success of 6429.10 'avoid assuming we detected renames': 
-	git init redo-weirdness &&
-	(
-		cd redo-weirdness &&
-
-		mkdir unrelated &&
-		for i in $(test_seq 1 10)
-		do
-			>unrelated/$i || exit 1
-		done &&
-		test_seq  2 10 >numbers &&
-		test_seq 12 20 >values &&
-		git add numbers values unrelated/ &&
-		git commit -m orig &&
-
-		git branch upstream &&
-		git branch topic &&
-
-		git switch upstream &&
-		test_seq  1 10 >numbers &&
-		test_seq 11 20 >values &&
-		git add numbers &&
-		git commit -m "Some tweaks" &&
-
-		git switch topic &&
-
-		>unrelated/foo &&
-		test_seq  2 12 >numbers &&
-		test_seq 12 22 >values &&
-		git add numbers values unrelated/ &&
-		git mv numbers sequence &&
-		git mv values progression &&
-		git commit -m A &&
-
-		#
-		# Actual testing
-		#
-
-		git switch --detach topic^0 &&
-
-		test_must_fail git -c merge.renameLimit=1 rebase upstream &&
-
-		git ls-files -u >actual &&
-		test_line_count = 2 actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/redo-weirdness/.git/
-[master (root-commit) f6e027e] orig
- Author: A U Thor <author@example.com>
- 12 files changed, 18 insertions(+)
- create mode 100644 numbers
- create mode 100644 unrelated/1
- create mode 100644 unrelated/10
- create mode 100644 unrelated/2
- create mode 100644 unrelated/3
- create mode 100644 unrelated/4
- create mode 100644 unrelated/5
- create mode 100644 unrelated/6
- create mode 100644 unrelated/7
- create mode 100644 unrelated/8
- create mode 100644 unrelated/9
- create mode 100644 values
-Switched to branch 'upstream'
-[upstream df355b1] Some tweaks
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'topic'
-M	values
-[topic f96ebc9] A
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- rename values => progression (81%)
- rename numbers => sequence (76%)
- create mode 100644 unrelated/foo
-HEAD is now at f96ebc9 A
-Rebasing (1/1)
CONFLICT (modify/delete): numbers deleted in f96ebc9 (A) and modified in HEAD.  Version HEAD of numbers 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 2 and retry the command.
-error: could not apply f96ebc9... 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 set advice.mergeConflict false"
-Could not apply f96ebc9... A
-ok 10 - avoid assuming we detected renames
+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
 
-# passed all 10 test(s)
-1..10
+# still have 2 known breakage(s)
+# passed all remaining 12 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6426-merge-skip-unneeded-updates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/.git/
-expecting success of 6426.1 '1a-L: Modify(A)/Modify(B), change on B subset of A': 
-	test_setup_1a L &&
+*** t6428-merge-conflicts-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1a_L &&
+		cd numerals_plain &&
 
 		git checkout A^0 &&
 
-		test-tool chmtime --get -3600 b >old-mtime &&
+		test_path_is_file README &&
+		test_path_is_file numerals &&
 
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
 
-		test_must_be_empty err &&
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
 
-		# Make sure b was NOT updated
-		test-tool chmtime --get b >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+		test_must_fail git merge -s recursive B^0 &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+		git ls-files -t >index_files &&
+		test_cmp expected-index index_files &&
 
-		git rev-parse >actual HEAD:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+		test_path_is_file README &&
+		test_path_is_file numerals &&
 
-		git hash-object b   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual
+		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.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/1a_L/.git/
-[master (root-commit) 105387b] O
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6428-merge-conflicts-sparse/numerals_plain/.git/
+[master (root-commit) e14c99c] O
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
 Switched to branch 'A'
-[A 14800cf] A
+[A 016e05e] A
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
+ 1 file changed, 1 insertion(+)
 Switched to branch 'B'
-[B dfd7e13] B
+[B 5ca8904] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Note: switching to 'A^0'.
@@ -424222,51 +419938,57 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 14800cf A
-ok 1 - 1a-L: Modify(A)/Modify(B), change on B subset of A
+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 6426.2 '1a-R: Modify(A)/Modify(B), change on B subset of A': 
-	test_setup_1a R &&
+expecting success of 6428.2 'present-despite-SKIP_WORKTREE handled reasonably': 
+	test_setup_numerals in_the_way &&
 	(
-		cd 1a_R &&
+		cd numerals_in_the_way &&
 
-		git checkout B^0 &&
+		git checkout A^0 &&
 
-		test-tool chmtime --get -3600 b >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+		test_path_is_file README &&
+		test_path_is_file numerals &&
 
-		# Make sure b WAS updated
-		test-tool chmtime --get b >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
 
-		test_must_be_empty err &&
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+		echo foobar >numerals &&
 
-		git rev-parse >actual HEAD:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+		test_must_fail git merge -s recursive B^0 &&
 
-		git hash-object b   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual
+		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.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/1a_R/.git/
-[master (root-commit) 105387b] O
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6428-merge-conflicts-sparse/numerals_in_the_way/.git/
+[master (root-commit) e14c99c] O
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
 Switched to branch 'A'
-[A 14800cf] A
+[A 016e05e] A
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
+ 1 file changed, 1 insertion(+)
 Switched to branch 'B'
-[B dfd7e13] B
+[B 5ca8904] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Note: switching to '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
@@ -424283,669 +420005,1498 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at dfd7e13 B
-ok 2 - 1a-R: Modify(A)/Modify(B), change on B subset of A
+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
 
-expecting success of 6426.3 '2a-L: Modify/rename, merge into modify side': 
-	test_setup_2a L &&
-	(
-		cd 2a_L &&
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6402-merge-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
+expecting success of 6402.1 'setup': 
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
 
-		git checkout A^0 &&
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
 
-		test_path_is_missing c &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
+	git branch yellow &&
+	git branch change &&
+	git branch change+rename &&
 
-		test_path_is_file c &&
+	sed -e "/^g /s/.*/g : main changes a line/" <A >A+ &&
+	mv A+ A &&
+	git commit -a -m "main updates A" &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+	git checkout yellow &&
+	rm -f M &&
+	git commit -a -m "yellow removes M" &&
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
 
-		git hash-object c   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual &&
+	git checkout red &&
+	sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "red renames A->B, M->N" &&
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+	git checkout blue &&
+	sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A C M N &&
+	git commit -m "blue renames A->C, M->N" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2a_L/.git/
-[master (root-commit) 105387b] O
+	git checkout change &&
+	sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
+	mv A+ A &&
+	git commit -q -a -m "changed" &&
+
+	git checkout change+rename &&
+	sed -e "/^g /s/.*/g : changed line/" <A >B &&
+	rm A &&
+	git update-index --add B &&
+	git commit -q -a -m "changed and renamed" &&
+
+	git checkout main
+
+[main (root-commit) 7bbb60a] initial has A and M
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A c2d59c7] A
+ 2 files changed, 30 insertions(+)
+ create mode 100644 A
+ create mode 100644 M
+[main a533371] main updates A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 6283fcf] B
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'yellow'
+[yellow 1f86866] yellow removes M
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 15 deletions(-)
+ delete mode 100644 M
+Switched to branch 'white'
+[white 72f28f0] white renames A->B, M->N
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+Switched to branch 'red'
+[red 9020b53] red renames A->B, M->N
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+Switched to branch 'blue'
+[blue b706750] blue renames A->C, M->N
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => C (93%)
+ rename M => N (93%)
+Switched to branch 'change'
+Switched to branch 'change+rename'
+Switched to branch 'main'
+ok 1 - setup
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6402.2 'pull renaming branch into unrenaming one': 
+	git show-branch &&
+	test_expect_code 1 git pull --no-rebase . white &&
+	git ls-files -s &&
+	test_stdout_line_count = 3 git ls-files -u B &&
+	test_stdout_line_count = 1 git ls-files -s N &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep main &&
+	git diff --exit-code white N
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [main] main updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            white      -> FETCH_HEAD
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+100644 aed72d761b68c20ffce8249a5a0426494098d376 1	B
+100644 c66800d1e70e6f0f7285c884b0ccb4bdc1e54800 2	B
+100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 3	B
+100644 ba41fb96393979b22691106b06bf5231eab57b85 0	N
+g : main changes a line
+ok 2 - pull renaming branch into unrenaming one
 
-  git switch -c <new-branch-name>
+expecting success of 6402.3 'pull renaming branch into another renaming one': 
+	rm -f B &&
+	git reset --hard &&
+	git checkout red &&
+	test_expect_code 1 git pull --no-rebase . white &&
+	test_stdout_line_count = 3 git ls-files -u B &&
+	test_stdout_line_count = 1 git ls-files -s N &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep red &&
+	git diff --exit-code white N
 
-Or undo this operation with:
+HEAD is now at a533371 main updates A
+Switched to branch 'red'
+From .
+ * branch            white      -> FETCH_HEAD
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+g : red changes a line
+ok 3 - pull renaming branch into another renaming one
 
-  git switch -
+expecting success of 6402.4 'pull unrenaming branch into renaming one': 
+	git reset --hard &&
+	git show-branch &&
+	test_expect_code 1 git pull --no-rebase . main &&
+	test_stdout_line_count = 3 git ls-files -u B &&
+	test_stdout_line_count = 1 git ls-files -s N &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep red &&
+	git diff --exit-code white N
 
-Turn off this advice by setting config variable advice.detachedHead to false
+HEAD is now at 9020b53 red renames A->B, M->N
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [main] main updates A
+    * [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    *   [red] red renames A->B, M->N
+   +    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++*++ [yellow^] initial has A and M
+From .
+ * branch            main       -> FETCH_HEAD
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+g : red changes a line
+ok 4 - pull unrenaming branch into renaming one
 
-HEAD is now at c2d59c7 A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 3 - 2a-L: Modify/rename, merge into modify side
+expecting success of 6402.5 'pull conflicting renames': 
+	git reset --hard &&
+	git show-branch &&
+	test_expect_code 1 git pull --no-rebase . blue &&
+	test_stdout_line_count = 1 git ls-files -u A &&
+	test_stdout_line_count = 1 git ls-files -u B &&
+	test_stdout_line_count = 1 git ls-files -u C &&
+	test_stdout_line_count = 1 git ls-files -s N &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep red &&
+	git diff --exit-code white N
 
-expecting success of 6426.4 '2a-R: Modify/rename, merge into rename side': 
-	test_setup_2a R &&
-	(
-		cd 2a_R &&
+HEAD is now at 9020b53 red renames A->B, M->N
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [main] main updates A
+    * [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    *   [red] red renames A->B, M->N
+   +    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++*++ [yellow^] initial has A and M
+From .
+ * branch            blue       -> FETCH_HEAD
+Auto-merging A
+CONFLICT (rename/rename): A renamed to B in HEAD and to C in b706750f611415f609730a3078d3ca7a6942b4f1.
+Automatic merge failed; fix conflicts and then commit the result.
+g : red changes a line
+ok 5 - pull conflicting renames
 
-		git checkout B^0 &&
+expecting success of 6402.6 'interference with untracked working tree file': 
+	git reset --hard &&
+	git show-branch &&
+	echo >A this file should not matter &&
+	test_expect_code 1 git pull --no-rebase . white &&
+	test_path_is_file A
 
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+HEAD is now at 9020b53 red renames A->B, M->N
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [main] main updates A
+    * [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    *   [red] red renames A->B, M->N
+   +    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++*++ [yellow^] initial has A and M
+From .
+ * branch            white      -> FETCH_HEAD
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - interference with untracked working tree file
 
-		# Make sure c WAS updated
-		test-tool chmtime --get c >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
+expecting success of 6402.7 'interference with untracked working tree file': 
+	git reset --hard &&
+	git checkout white &&
+	git show-branch &&
+	rm -f A &&
+	echo >A this file should not matter &&
+	test_expect_code 1 git pull --no-rebase . red &&
+	test_path_is_file A
 
-		test_must_be_empty err &&
+HEAD is now at 9020b53 red renames A->B, M->N
+Switched to branch 'white'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [main] main updates A
+    ! [red] red renames A->B, M->N
+     * [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     *  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   +    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++++*+ [yellow^] initial has A and M
+From .
+ * branch            red        -> FETCH_HEAD
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+ok 7 - interference with untracked working tree file
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+expecting success of 6402.8 'interference with untracked working tree file': 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f main &&
+	git tag -f anchor &&
+	git show-branch &&
+	git pull --no-rebase . yellow &&
+	test_path_is_missing M &&
+	git reset --hard anchor
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+HEAD is now at 72f28f0 white renames A->B, M->N
+Switched to branch 'main'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [main] main updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            yellow     -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ M | 15 ---------------
+ 1 file changed, 15 deletions(-)
+ delete mode 100644 M
+HEAD is now at a533371 main updates A
+ok 8 - interference with untracked working tree file
 
-		git hash-object c   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual &&
+expecting success of 6402.9 'updated working tree file should prevent the merge': 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f main &&
+	git tag -f anchor &&
+	git show-branch &&
+	echo >>M one line addition &&
+	cat M >M.saved &&
+	test_expect_code 128 git pull . yellow &&
+	test_cmp M M.saved &&
+	rm -f M.saved
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+HEAD is now at a533371 main updates A
+Already on 'main'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [main] main updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            yellow     -> 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.
+ok 9 - updated working tree file should prevent the merge
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2a_R/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A c2d59c7] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 6283fcf] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Note: switching to 'B^0'.
+expecting success of 6402.10 'updated working tree file should prevent the merge': 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f main &&
+	git tag -f anchor &&
+	git show-branch &&
+	echo >>M one line addition &&
+	cat M >M.saved &&
+	git update-index M &&
+	test_expect_code 2 git pull --no-rebase . yellow &&
+	test_cmp M M.saved &&
+	rm -f M.saved
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+HEAD is now at a533371 main updates A
+Already on 'main'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [main] main updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            yellow     -> FETCH_HEAD
+error: Your local changes to the following files would be overwritten by merge:
+  M
+Merge with strategy ort failed.
+ok 10 - updated working tree file should prevent the merge
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6402.11 'interference with untracked working tree file': 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f yellow &&
+	git tag -f anchor &&
+	git show-branch &&
+	echo >M this file should not matter &&
+	git pull --no-rebase . main &&
+	test_path_is_file M &&
+	! {
+		git ls-files -s |
+		grep M
+	} &&
+	git reset --hard anchor
 
-  git switch -c <new-branch-name>
+HEAD is now at a533371 main updates A
+Switched to branch 'yellow'
+Updated tag 'anchor' (was a533371)
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [main] main updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      * [yellow] yellow removes M
+-------
+      * [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   +    [main] main updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++++* [yellow^] initial has A and M
+From .
+ * branch            main       -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ A | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 1f86866 yellow removes M
+ok 11 - interference with untracked working tree file
 
-Or undo this operation with:
+expecting success of 6402.12 'merge of identical changes in a renamed file': 
+	rm -f A M N &&
+	git reset --hard &&
+	git checkout change+rename &&
 
-  git switch -
+	test-tool chmtime --get -3600 B >old-mtime &&
+	GIT_MERGE_VERBOSITY=3 git merge change >out &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	test-tool chmtime --get B >new-mtime &&
+	test_cmp old-mtime new-mtime &&
 
-HEAD is now at 6283fcf B
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 4 - 2a-R: Modify/rename, merge into rename side
+	git reset --hard HEAD^ &&
+	git checkout change &&
 
-expecting success of 6426.5 '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A': 
-	test_setup_2b L &&
-	(
-		cd 2b_L &&
+	# A will be renamed to B; we check mtimes and file presence
+	test_path_is_missing B &&
+	test-tool chmtime --get -3600 A >old-mtime &&
+	GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
 
-		git checkout A^0 &&
+	test_path_is_missing A &&
+	test-tool chmtime --get B >new-mtime &&
+	test $(cat old-mtime) -lt $(cat new-mtime)
 
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+HEAD is now at 1f86866 yellow removes M
+Switched to branch 'change+rename'
+HEAD is now at df47076 changed and renamed
+Switched to branch 'change'
+ok 12 - merge of identical changes in a renamed file
 
-		test_must_be_empty err &&
+expecting success of 6402.13 'setup for rename + d/f conflicts': 
+	git reset --hard &&
+	git checkout --orphan dir-in-way &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-		# Make sure c WAS updated
-		test-tool chmtime --get c >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+	mkdir sub &&
+	mkdir dir &&
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
+	echo foo >dir/file-in-the-way &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+	echo 11 >>sub/file &&
+	echo more >>dir/file-in-the-way &&
+	git add -u &&
+	git commit -m "Commit to merge, with dir in the way" &&
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
+	git checkout -b dir-not-in-way &&
+	git reset --soft HEAD^ &&
+	git rm -rf dir &&
+	git commit -m "Commit to merge, with dir removed" -- dir sub/file &&
 
-		git hash-object c   >actual &&
-		git rev-parse   A:c >expect &&
-		test_cmp expect actual &&
+	git checkout -b renamed-file-has-no-conflicts dir-in-way~1 &&
+	git rm -rf dir &&
+	git rm sub/file &&
+	printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n" >dir &&
+	git add dir &&
+	git commit -m "Independent change" &&
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+	git checkout -b renamed-file-has-conflicts dir-in-way~1 &&
+	git rm -rf dir &&
+	git mv sub/file dir &&
+	echo 12 >>dir &&
+	git add dir &&
+	git commit -m "Conflicting change"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2b_L/.git/
-[master (root-commit) 105387b] O
+HEAD is now at 5fdefee Merge branch 'change+rename' into change
+Switched to a new branch 'dir-in-way'
+rm 'B'
+rm 'M'
+[dir-in-way (root-commit) 90faa3c] Common commit
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A fed518a] A
+ 2 files changed, 11 insertions(+)
+ create mode 100644 dir/file-in-the-way
+ create mode 100644 sub/file
+[dir-in-way cd90736] Commit to merge, with dir in the way
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename b => c (70%)
-Switched to branch 'B'
-[B dfd7e13] B
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'dir-not-in-way'
+rm 'dir/file-in-the-way'
+[dir-not-in-way a8845d3] Commit to merge, with dir removed
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 dir/file-in-the-way
+Switched to a new branch 'renamed-file-has-no-conflicts'
+rm 'dir/file-in-the-way'
+rm 'sub/file'
+[renamed-file-has-no-conflicts 8c7fff4] Independent change
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ rename sub/file => dir (79%)
+ delete mode 100644 dir/file-in-the-way
+Switched to a new branch 'renamed-file-has-conflicts'
+rm 'dir/file-in-the-way'
+[renamed-file-has-conflicts 53f2d73] Conflicting change
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename sub/file => dir (87%)
+ delete mode 100644 dir/file-in-the-way
+ok 13 - setup for rename + d/f conflicts
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 6402.14 'Rename+D/F conflict; renamed file merges + dir not in way': 
+	git reset --hard &&
+	git checkout -q renamed-file-has-no-conflicts^0 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git merge --strategy=recursive dir-not-in-way &&
 
-  git switch -c <new-branch-name>
+	git diff --quiet &&
+	test_path_is_file dir &&
+	test_write_lines 1 2 3 4 5555 6 7 8 9 10 11 >expected &&
+	test_cmp expected dir
 
-Or undo this operation with:
+HEAD is now at 53f2d73 Conflicting change
+Auto-merging dir
+Merge made by the 'ort' strategy.
+ dir | 1 +
+ 1 file changed, 1 insertion(+)
+ok 14 - Rename+D/F conflict; renamed file merges + dir not in way
 
-  git switch -
+expecting success of 6402.15 'Rename+D/F conflict; renamed file merges but dir in way': 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q renamed-file-has-no-conflicts^0 &&
+	test_must_fail git merge --strategy=recursive dir-in-way >output &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	test_grep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
+	test_grep "Auto-merging dir" output &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_grep "moving it to dir~HEAD instead" output
+	else
+		test_grep "Adding as dir~HEAD instead" output
+	fi &&
 
-HEAD is now at fed518a A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 5 - 2b-L: Rename+Mod(A)/Mod(B), B mods subset of A
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
-expecting success of 6426.6 '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A': 
-	test_setup_2b R &&
-	(
-		cd 2b_R &&
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
 
-		git checkout B^0 &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~HEAD &&
+	test_cmp expected dir~HEAD
 
-		test_path_is_missing c &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+HEAD is now at 7b1d99c Merge branch 'dir-not-in-way' into HEAD
+CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way.  Version dir-in-way of dir/file-in-the-way left in tree.
+Auto-merging dir~HEAD
+CONFLICT (file/directory): directory in the way of dir from HEAD; moving it to dir~HEAD instead.
+ok 15 - Rename+D/F conflict; renamed file merges but dir in way
 
-		# Make sure c now present (and thus was updated)
-		test_path_is_file c &&
+expecting success of 6402.16 'Same as previous, but merged other way': 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q dir-in-way^0 &&
+	test_must_fail git merge --strategy=recursive renamed-file-has-no-conflicts >output 2>errors &&
 
-		test_must_be_empty err &&
+	! grep "error: refusing to lose untracked file at" errors &&
+	test_grep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
+	test_grep "Auto-merging dir" output &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_grep "moving it to dir~renamed-file-has-no-conflicts instead" output
+	else
+		test_grep "Adding as dir~renamed-file-has-no-conflicts instead" output
+	fi &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
 
-		git hash-object c   >actual &&
-		git rev-parse   A:c >expect &&
-		test_cmp expect actual &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~renamed-file-has-no-conflicts &&
+	test_cmp expected dir~renamed-file-has-no-conflicts
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+HEAD is now at 8c7fff4 Independent change
+CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-no-conflicts and modified in HEAD.  Version HEAD of dir/file-in-the-way left in tree.
+Auto-merging dir~renamed-file-has-no-conflicts
+CONFLICT (file/directory): directory in the way of dir from renamed-file-has-no-conflicts; moving it to dir~renamed-file-has-no-conflicts instead.
+ok 16 - Same as previous, but merged other way
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2b_R/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A fed518a] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename b => c (70%)
-Switched to branch 'B'
-[B dfd7e13] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'B^0'.
+expecting success of 6402.17 'Rename+D/F conflict; renamed file cannot merge, dir not in way': 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q renamed-file-has-conflicts^0 &&
+	test_must_fail git merge --strategy=recursive dir-not-in-way &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 3 git ls-files -u dir &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
 
-  git switch -c <new-branch-name>
+	test_path_is_file dir &&
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	9
+	10
+	<<<<<<< HEAD:dir
+	12
+	=======
+	11
+	>>>>>>> dir-not-in-way:sub/file
+	EOF
+	test_cmp expected dir
 
-Or undo this operation with:
+HEAD is now at cd90736 Commit to merge, with dir in the way
+Auto-merging dir
+CONFLICT (content): Merge conflict in dir
+Automatic merge failed; fix conflicts and then commit the result.
+ok 17 - Rename+D/F conflict; renamed file cannot merge, dir not in way
 
-  git switch -
+expecting success of 6402.18 'Rename+D/F conflict; renamed file cannot merge and dir in the way': 
+	modify s/dir-not-in-way/dir-in-way/ expected &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q renamed-file-has-conflicts^0 &&
+	test_must_fail git merge --strategy=recursive dir-in-way &&
 
-HEAD is now at dfd7e13 B
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 6 - 2b-R: Rename+Mod(A)/Mod(B), B mods subset of A
+	test_stdout_line_count = 5 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 3 git ls-files -u dir~HEAD
+	else
+		git ls-files -u dir >out &&
+		test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
+		rm -f out
+	fi &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
-expecting success of 6426.7 '2c: Modify b & add c VS rename b->c': 
-	test_setup_2c &&
-	(
-		cd 2c &&
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
 
-		git checkout A^0 &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~HEAD &&
+	test_cmp expected dir~HEAD
 
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
+HEAD is now at 53f2d73 Conflicting change
+CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way.  Version dir-in-way of dir/file-in-the-way left in tree.
+CONFLICT (file/directory): directory in the way of dir from HEAD; moving it to dir~HEAD instead.
+Auto-merging dir~HEAD
+CONFLICT (content): Merge conflict in dir~HEAD
+Automatic merge failed; fix conflicts and then commit the result.
+ok 18 - Rename+D/F conflict; renamed file cannot merge and dir in the way
 
-		test_grep "CONFLICT (.*/add):" out &&
-		test_must_be_empty err &&
+expecting success of 6402.19 'Same as previous, but merged other way': 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q dir-in-way^0 &&
+	test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+	test_stdout_line_count = 5 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 3 git ls-files -u dir~renamed-file-has-conflicts
+	else
+		git ls-files -u dir >out &&
+		test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
+		rm -f out
+	fi &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
-		# Ensure b was removed
-		test_path_is_missing b &&
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
 
-		# Make sure c WAS updated...
-		test-tool chmtime --get c >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~renamed-file-has-conflicts &&
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	9
+	10
+	<<<<<<< HEAD:sub/file
+	11
+	=======
+	12
+	>>>>>>> renamed-file-has-conflicts:dir
+	EOF
+	test_cmp expected dir~renamed-file-has-conflicts
 
-		# ...and has correct index entries and working tree contents
-		git rev-parse >actual :2:c :3:c &&
-		git rev-parse >expect A:c  A:b  &&
-		test_cmp expect actual &&
+HEAD is now at 53f2d73 Conflicting change
+CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-conflicts and modified in HEAD.  Version HEAD of dir/file-in-the-way left in tree.
+CONFLICT (file/directory): directory in the way of dir from renamed-file-has-conflicts; moving it to dir~renamed-file-has-conflicts instead.
+Auto-merging dir~renamed-file-has-conflicts
+CONFLICT (content): Merge conflict in dir~renamed-file-has-conflicts
+Automatic merge failed; fix conflicts and then commit the result.
+ok 19 - Same as previous, but merged other way
 
-		git cat-file -p A:b >>merge-me &&
-		git cat-file -p A:c >>merged &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			merged empty merge-me &&
-		test_cmp merged c
-	)
+expecting success of 6402.20 'setup both rename source and destination involved in D/F conflict': 
+	git reset --hard &&
+	git checkout --orphan rename-dest &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2c/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A edf631f] A
+	mkdir one &&
+	echo stuff >one/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git mv one/file destdir &&
+	git commit -m "Renamed to destdir" &&
+
+	git checkout -b source-conflict HEAD~1 &&
+	git rm -rf one &&
+	mkdir destdir &&
+	touch one destdir/foo &&
+	git add -A &&
+	git commit -m "Conflicts in the way"
+
+HEAD is now at cd90736 Commit to merge, with dir in the way
+Switched to a new branch 'rename-dest'
+rm 'dir/file-in-the-way'
+rm 'sub/file'
+[rename-dest (root-commit) 3156d6d] Common commit
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c
-Switched to branch 'B'
-[B 6283fcf] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one/file
+[rename-dest 4fde1d0] Renamed to destdir
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Note: switching to 'A^0'.
+ rename one/file => destdir (100%)
+Switched to a new branch 'source-conflict'
+rm 'one/file'
+[source-conflict 58f64f9] Conflicts in the way
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 deletion(-)
+ create mode 100644 destdir/foo
+ create mode 100644 one
+ delete mode 100644 one/file
+ok 20 - setup both rename source and destination involved in D/F conflict
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6402.21 'both rename source and destination involved in D/F conflict': 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q rename-dest^0 &&
+	test_must_fail git merge --strategy=recursive source-conflict &&
 
-If you want to 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 "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 2 git ls-files -u
+	else
+		test_stdout_line_count = 1 git ls-files -u
+	fi &&
 
-  git switch -c <new-branch-name>
+	test_must_fail git diff --quiet &&
 
-Or undo this operation with:
+	test_path_is_file destdir/foo &&
+	test_path_is_file one &&
+	test_path_is_file destdir~HEAD &&
+	test "stuff" = "$(cat destdir~HEAD)"
 
-  git switch -
+HEAD is now at 58f64f9 Conflicts in the way
+CONFLICT (rename/delete): one/file renamed to destdir in HEAD, but deleted in source-conflict.
+CONFLICT (file/directory): directory in the way of destdir from HEAD; moving it to destdir~HEAD instead.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 21 - both rename source and destination involved in D/F conflict
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6402.22 'setup pair rename to parent of other (D/F conflicts)': 
+	git reset --hard &&
+	git checkout --orphan rename-two &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-HEAD is now at edf631f A
-CONFLICT (add/add): Merge conflict in c
-ok 7 - 2c: Modify b & add c VS rename b->c
+	mkdir one &&
+	mkdir two &&
+	echo stuff >one/file &&
+	echo other >two/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-expecting success of 6426.8 '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3a L &&
-	(
-		cd 3a_L &&
+	git rm -rf one &&
+	git mv two/file one &&
+	git commit -m "Rename two/file -> one" &&
 
-		git checkout A^0 &&
+	git checkout -b rename-one HEAD~1 &&
+	git rm -rf two &&
+	git mv one/file two &&
+	rm -r one &&
+	git commit -m "Rename one/file -> two"
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+HEAD is now at 4fde1d0 Renamed to destdir
+Switched to a new branch 'rename-two'
+rm 'destdir'
+[rename-two (root-commit) 0765ccc] Common commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one/file
+ create mode 100644 two/file
+rm 'one/file'
+[rename-two c518e9e] Rename two/file -> one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename two/file => one (100%)
+ delete mode 100644 one/file
+Switched to a new branch 'rename-one'
+rm 'two/file'
+[rename-one a4e3198] Rename one/file -> two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename one/file => two (100%)
+ delete mode 100644 two/file
+ok 22 - setup pair rename to parent of other (D/F conflicts)
 
-		test_must_be_empty err &&
+expecting success of 6402.23 'pair rename to parent of other (D/F conflicts) w/ untracked dir': 
+		git checkout -q rename-one^0 &&
+		mkdir one &&
+		test_must_fail git merge --strategy=recursive rename-two &&
 
-		test_path_is_file bar/bq &&
+		test_stdout_line_count = 4 git ls-files -u &&
+		test_stdout_line_count = 2 git ls-files -u one &&
+		test_stdout_line_count = 2 git ls-files -u two &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+		test_must_fail git diff --quiet &&
 
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect A:foo/bq    A:foo/whatever &&
-		test_cmp expect actual &&
+		test 3 -eq $(find . | grep -v .git | wc -l) &&
 
-		git hash-object bar/bq   bar/whatever   >actual &&
-		git rev-parse   A:foo/bq A:foo/whatever >expect &&
-		test_cmp expect actual &&
+		test_path_is_file one &&
+		test_path_is_file two &&
+		test "other" = $(cat one) &&
+		test "stuff" = $(cat two)
+	
+CONFLICT (rename/delete): two/file renamed to one in rename-two, but deleted in HEAD.
+CONFLICT (rename/delete): one/file renamed to two in HEAD, but deleted in rename-two.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 23 - pair rename to parent of other (D/F conflicts) w/ untracked dir
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+expecting success of 6402.24 'pair rename to parent of other (D/F conflicts) w/ clean start': 
+	git reset --hard &&
+	git clean -fdqx &&
+	test_must_fail git merge --strategy=recursive rename-two &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3a_L/.git/
-[master (root-commit) 1e2aa57] O
- Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A 5576138] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename bq => foo/bq (87%)
-Switched to branch 'B'
-[B 69c0854] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'A^0'.
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 4 git ls-files -u &&
+		test_stdout_line_count = 2 git ls-files -u one &&
+		test_stdout_line_count = 2 git ls-files -u two
+	else
+		test_stdout_line_count = 2 git ls-files -u &&
+		test_stdout_line_count = 1 git ls-files -u one &&
+		test_stdout_line_count = 1 git ls-files -u two
+	fi &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	test_must_fail git diff --quiet &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	test 3 -eq $(find . | grep -v .git | wc -l) &&
 
-  git switch -c <new-branch-name>
+	test_path_is_file one &&
+	test_path_is_file two &&
+	test "other" = $(cat one) &&
+	test "stuff" = $(cat two)
 
-Or undo this operation with:
+HEAD is now at a4e3198 Rename one/file -> two
+CONFLICT (rename/delete): two/file renamed to one in rename-two, but deleted in HEAD.
+CONFLICT (rename/delete): one/file renamed to two in HEAD, but deleted in rename-two.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 24 - pair rename to parent of other (D/F conflicts) w/ clean start
 
-  git switch -
+expecting success of 6402.25 'setup rename of one file to two, with directories in the way': 
+	git reset --hard &&
+	git checkout --orphan first-rename &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	echo stuff >original &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-HEAD is now at 5576138 A
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 8 - 3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+	mkdir two &&
+	>two/file &&
+	git add two/file &&
+	git mv original one &&
+	git commit -m "Put two/file in the way, rename to one" &&
 
-expecting success of 6426.9 '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3a R &&
-	(
-		cd 3a_R &&
+	git checkout -b second-rename HEAD~1 &&
+	mkdir one &&
+	>one/file &&
+	git add one/file &&
+	git mv original two &&
+	git commit -m "Put one/file in the way, rename to two"
 
-		git checkout B^0 &&
+HEAD is now at a4e3198 Rename one/file -> two
+Switched to a new branch 'first-rename'
+rm 'two'
+[first-rename (root-commit) 3ec06ba] Common commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 original
+[first-rename 1d86576] Put two/file in the way, rename to one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename original => one (100%)
+ create mode 100644 two/file
+Switched to a new branch 'second-rename'
+[second-rename 35e7177] Put one/file in the way, rename to two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 one/file
+ rename original => two (100%)
+ok 25 - setup rename of one file to two, with directories in the way
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+expecting success of 6402.26 'check handling of differently renamed file with D/F conflicts': 
+	git checkout -q first-rename^0 &&
+	test_must_fail git merge --strategy=recursive second-rename &&
 
-		test_must_be_empty err &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 5 git ls-files -s &&
+		test_stdout_line_count = 3 git ls-files -u &&
+		test_stdout_line_count = 1 git ls-files -u one~HEAD &&
+		test_stdout_line_count = 1 git ls-files -u two~second-rename &&
+		test_stdout_line_count = 1 git ls-files -u original &&
+		test_stdout_line_count = 0 git ls-files -o
+	else
+		test_stdout_line_count = 5 git ls-files -s &&
+		test_stdout_line_count = 3 git ls-files -u &&
+		test_stdout_line_count = 1 git ls-files -u one &&
+		test_stdout_line_count = 1 git ls-files -u two &&
+		test_stdout_line_count = 1 git ls-files -u original &&
+		test_stdout_line_count = 2 git ls-files -o
+	fi &&
 
-		test_path_is_file bar/bq &&
+	test_path_is_file one/file &&
+	test_path_is_file two/file &&
+	test_path_is_file one~HEAD &&
+	test_path_is_file two~second-rename &&
+	test_path_is_missing original
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+CONFLICT (file/directory): directory in the way of one from HEAD; moving it to one~HEAD instead.
+CONFLICT (rename/rename): original renamed to one in HEAD and to two in second-rename.
+CONFLICT (file/directory): directory in the way of two from second-rename; moving it to two~second-rename instead.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 26 - check handling of differently renamed file with D/F conflicts
 
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect A:foo/bq    A:foo/whatever &&
-		test_cmp expect actual &&
+expecting success of 6402.27 'setup rename one file to two; directories moving out of the way': 
+	git reset --hard &&
+	git checkout --orphan first-rename-redo &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-		git hash-object bar/bq   bar/whatever   >actual &&
-		git rev-parse   A:foo/bq A:foo/whatever >expect &&
-		test_cmp expect actual &&
+	echo stuff >original &&
+	mkdir one two &&
+	touch one/file two/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+	git rm -rf one &&
+	git mv original one &&
+	git commit -m "Rename to one" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3a_R/.git/
-[master (root-commit) 1e2aa57] O
+	git checkout -b second-rename-redo HEAD~1 &&
+	git rm -rf two &&
+	git mv original two &&
+	git commit -m "Rename to two"
+
+HEAD is now at 1d86576 Put two/file in the way, rename to one
+Switched to a new branch 'first-rename-redo'
+rm 'one'
+rm 'two/file'
+[first-rename-redo (root-commit) 7f6a382] Common commit
  Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A 5576138] A
+ 3 files changed, 1 insertion(+)
+ create mode 100644 one/file
+ create mode 100644 original
+ create mode 100644 two/file
+rm 'one/file'
+[first-rename-redo 5a00903] Rename to one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename bq => foo/bq (87%)
-Switched to branch 'B'
-[B 69c0854] B
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename original => one (100%)
+ delete mode 100644 one/file
+Switched to a new branch 'second-rename-redo'
+rm 'two/file'
+[second-rename-redo 28aa9be] Rename to two
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'B^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename original => two (100%)
+ delete mode 100644 two/file
+ok 27 - setup rename one file to two; directories moving out of the way
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6402.28 'check handling of differently renamed file with D/F conflicts': 
+	git checkout -q first-rename-redo^0 &&
+	test_must_fail git merge --strategy=recursive second-rename-redo &&
 
-  git switch -c <new-branch-name>
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 1 git ls-files -u one &&
+	test_stdout_line_count = 1 git ls-files -u two &&
+	test_stdout_line_count = 1 git ls-files -u original &&
+	test_stdout_line_count = 0 git ls-files -o &&
 
-Or undo this operation with:
+	test_path_is_file one &&
+	test_path_is_file two &&
+	test_path_is_missing original
 
-  git switch -
+CONFLICT (rename/rename): original renamed to one in HEAD and to two in second-rename-redo.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 28 - check handling of differently renamed file with D/F conflicts
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6402.29 'setup avoid unnecessary update, normal rename': 
+	git reset --hard &&
+	git checkout --orphan avoid-unnecessary-update-1 &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-HEAD is now at 69c0854 B
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 9 - 3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-expecting success of 6426.10 '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3b L &&
-	(
-		cd 3b_L &&
+	git mv original rename &&
+	echo 11 >>rename &&
+	git add -u &&
+	git commit -m "Renamed and modified" &&
 
-		git checkout A^0 &&
+	git checkout -b merge-branch-1 HEAD~1 &&
+	echo "random content" >random-file &&
+	git add -A &&
+	git commit -m "Random, unrelated changes"
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+HEAD is now at 5a00903 Rename to one
+Switched to a new branch 'avoid-unnecessary-update-1'
+rm 'one'
+rm 'two/file'
+[avoid-unnecessary-update-1 (root-commit) 2079f93] Common commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 original
+[avoid-unnecessary-update-1 fb0186c] Renamed and modified
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename original => rename (87%)
+Switched to a new branch 'merge-branch-1'
+[merge-branch-1 65bbd67] Random, unrelated changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 random-file
+ok 29 - setup avoid unnecessary update, normal rename
 
-		test_must_be_empty err &&
+expecting success of 6402.30 'avoid unnecessary update, normal rename': 
+	git checkout -q avoid-unnecessary-update-1^0 &&
+	test-tool chmtime --get -3600 rename >expect &&
+	git merge merge-branch-1 &&
+	test-tool chmtime --get rename >actual &&
+	test_cmp expect actual # "rename" should have stayed intact
 
-		test_path_is_file bar/bq &&
+Merge made by the 'ort' strategy.
+ random-file | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 random-file
+ok 30 - avoid unnecessary update, normal rename
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+expecting success of 6402.31 'setup to test avoiding unnecessary update, with D/F conflict': 
+	git reset --hard &&
+	git checkout --orphan avoid-unnecessary-update-2 &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect B:bq        A:foo/whatever &&
-		test_cmp expect actual &&
+	mkdir df &&
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-		git hash-object bar/bq bar/whatever   >actual &&
-		git rev-parse   B:bq   A:foo/whatever >expect &&
-		test_cmp expect actual &&
+	git mv df/file temp &&
+	rm -rf df &&
+	git mv temp df &&
+	echo 11 >>df &&
+	git add -u &&
+	git commit -m "Renamed and modified" &&
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+	git checkout -b merge-branch-2 HEAD~1 &&
+	>unrelated-change &&
+	git add unrelated-change &&
+	git commit -m "Only unrelated changes"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3b_L/.git/
-[master (root-commit) 1e2aa57] O
+HEAD is now at 284061b Merge branch 'merge-branch-1' into HEAD
+Switched to a new branch 'avoid-unnecessary-update-2'
+rm 'random-file'
+rm 'rename'
+[avoid-unnecessary-update-2 (root-commit) e635445] Common commit
  Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A d02b71c] A
+ 1 file changed, 10 insertions(+)
+ create mode 100644 df/file
+[avoid-unnecessary-update-2 fb8c6d0] Renamed and modified
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename bq => foo/bq (100%)
-Switched to branch 'B'
-[B 2f47892] B
+ 1 file changed, 1 insertion(+)
+ rename df/file => df (87%)
+Switched to a new branch 'merge-branch-2'
+[merge-branch-2 0787898] Only unrelated changes
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated-change
+ok 31 - setup to test avoiding unnecessary update, with D/F conflict
 
-Or undo this operation with:
+expecting success of 6402.32 'avoid unnecessary update, with D/F conflict': 
+	git checkout -q avoid-unnecessary-update-2^0 &&
+	test-tool chmtime --get -3600 df >expect &&
+	git merge merge-branch-2 &&
+	test-tool chmtime --get df >actual &&
+	test_cmp expect actual # "df" should have stayed intact
 
-  git switch -
+Merge made by the 'ort' strategy.
+ unrelated-change | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated-change
+ok 32 - avoid unnecessary update, with D/F conflict
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6402.33 'setup avoid unnecessary update, dir->(file,nothing)': 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
 
-HEAD is now at d02b71c A
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 10 - 3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+	>irrelevant &&
+	mkdir df &&
+	>df/file &&
+	git add -A &&
+	git commit -mA &&
 
-expecting success of 6426.11 '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3b R &&
-	(
-		cd 3b_R &&
+	git checkout -b side &&
+	git rm -rf df &&
+	git commit -mB &&
 
-		git checkout B^0 &&
+	git checkout main &&
+	git rm -rf df &&
+	echo bla >df &&
+	git add -A &&
+	git commit -m "Add a newfile"
 
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+rm 'df'
+rm 'unrelated-change'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
+[main (root-commit) 0238749] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 df/file
+ create mode 100644 irrelevant
+Switched to a new branch 'side'
+rm 'df/file'
+[side 32a928c] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 df/file
+Switched to branch 'main'
+rm 'df/file'
+[main 90ac8b3] Add a newfile
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 df
+ delete mode 100644 df/file
+ok 33 - setup avoid unnecessary update, dir->(file,nothing)
 
-		test_must_be_empty err &&
+expecting success of 6402.34 'avoid unnecessary update, dir->(file,nothing)': 
+	git checkout -q main^0 &&
+	test-tool chmtime --get -3600 df >expect &&
+	git merge side &&
+	test-tool chmtime --get df >actual &&
+	test_cmp expect actual # "df" should have stayed intact
 
-		test_path_is_file bar/bq &&
+Merge made by the 'ort' strategy.
+ok 34 - avoid unnecessary update, dir->(file,nothing)
 
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
+expecting success of 6402.35 'setup avoid unnecessary update, modify/delete': 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
 
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect B:bq        A:foo/whatever &&
-		test_cmp expect actual &&
+	>irrelevant &&
+	>file &&
+	git add -A &&
+	git commit -mA &&
 
-		git hash-object bar/bq bar/whatever   >actual &&
-		git rev-parse   B:bq   A:foo/whatever >expect &&
-		test_cmp expect actual &&
+	git checkout -b side &&
+	git rm -f file &&
+	git commit -m "Delete file" &&
 
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
+	git checkout main &&
+	echo bla >file &&
+	git add -A &&
+	git commit -m "Modify file"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3b_R/.git/
-[master (root-commit) 1e2aa57] O
+rm 'df'
+rm 'irrelevant'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
+[main (root-commit) bec55b4] A
  Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A d02b71c] A
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+ create mode 100644 irrelevant
+Switched to a new branch 'side'
+rm 'file'
+[side d8f9927] Delete file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- rename bq => foo/bq (100%)
-Switched to branch 'B'
-[B 2f47892] B
+ delete mode 100644 file
+Switched to branch 'main'
+[main 27c30f6] Modify file
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'B^0'.
+ 1 file changed, 1 insertion(+)
+ok 35 - setup avoid unnecessary update, modify/delete
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 6402.36 'avoid unnecessary update, modify/delete': 
+	git checkout -q main^0 &&
+	test-tool chmtime --get -3600 file >expect &&
+	test_must_fail git merge side &&
+	test-tool chmtime --get file >actual &&
+	test_cmp expect actual # "file" should have stayed intact
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+CONFLICT (modify/delete): file deleted in side and modified in HEAD.  Version HEAD of file left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 36 - avoid unnecessary update, modify/delete
 
-  git switch -c <new-branch-name>
+expecting success of 6402.37 'setup avoid unnecessary update, rename/add-dest': 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
 
-Or undo this operation with:
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >file &&
+	git add -A &&
+	git commit -mA &&
 
-  git switch -
+	git checkout -b side &&
+	cp file newfile &&
+	git add -A &&
+	git commit -m "Add file copy" &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	git checkout main &&
+	git mv file newfile &&
+	git commit -m "Rename file"
 
-HEAD is now at 2f47892 B
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 11 - 3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+rm 'file'
+rm 'file'
+rm 'irrelevant'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
+[main (root-commit) 61e6524] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side 8c16f55] Add file copy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 newfile
+Switched to branch 'main'
+[main b01e819] Rename file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => newfile (100%)
+ok 37 - setup avoid unnecessary update, rename/add-dest
 
-expecting success of 6426.12 '4a: Change on A, change on B subset of A, dirty mods present': 
-	test_setup_4a &&
-	(
-		cd 4a &&
+expecting success of 6402.38 'avoid unnecessary update, rename/add-dest': 
+	git checkout -q main^0 &&
+	test-tool chmtime --get -3600 newfile >expect &&
+	git merge side &&
+	test-tool chmtime --get newfile >actual &&
+	test_cmp expect actual # "file" should have stayed intact
 
-		git checkout A^0 &&
-		echo "File rewritten" >b &&
+Merge made by the 'ort' strategy.
+ok 38 - avoid unnecessary update, rename/add-dest
 
-		test-tool chmtime --get -3600 b >old-mtime &&
+expecting success of 6402.39 'setup merge of rename + small change': 
+	git reset --hard &&
+	git checkout --orphan rename-plus-small-change &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+	echo ORIGINAL >file &&
+	git add file &&
 
-		test_must_be_empty err &&
+	test_tick &&
+	git commit -m Initial &&
+	git checkout -b rename_branch &&
+	git mv file renamed_file &&
+	git commit -m Rename &&
+	git checkout rename-plus-small-change &&
+	echo NEW-VERSION >file &&
+	git commit -a -m Reformat
 
-		# Make sure b was NOT updated
-		test-tool chmtime --get b >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+HEAD is now at 826dab9 Merge branch 'side' into HEAD
+Switched to a new branch 'rename-plus-small-change'
+rm 'newfile'
+[rename-plus-small-change (root-commit) e44eadc] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'rename_branch'
+[rename_branch f706812] Rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => renamed_file (100%)
+Switched to branch 'rename-plus-small-change'
+[rename-plus-small-change 068ab66] Reformat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 39 - setup merge of rename + small change
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+expecting success of 6402.40 'merge rename + small change': 
+	git merge rename_branch &&
 
-		git rev-parse >actual :0:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+	test_stdout_line_count = 1 git ls-files -s &&
+	test_stdout_line_count = 0 git ls-files -o &&
+	newhash=$(git rev-parse HEAD:renamed_file) &&
+	oldhash=$(git rev-parse HEAD~1:file) &&
+	test $newhash = $oldhash
 
-		git hash-object b >actual &&
-		echo "File rewritten" | git hash-object --stdin >expect &&
-		test_cmp expect actual
-	)
+Merge made by the 'ort' strategy.
+ file => renamed_file | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => renamed_file (100%)
+ok 40 - merge rename + small change
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/4a/.git/
-[master (root-commit) 105387b] O
+expecting success of 6402.41 'setup for use of extended merge markers': 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
+	git add original_file &&
+	git commit -mA &&
+
+	git checkout -b rename &&
+	echo 9 >>original_file &&
+	git add original_file &&
+	git mv original_file renamed_file &&
+	git commit -mB &&
+
+	git checkout main &&
+	echo 8.5 >>original_file &&
+	git add original_file &&
+	git commit -mC
+
+rm 'renamed_file'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
+[main (root-commit) 4847e8a] A
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
+ 1 file changed, 8 insertions(+)
+ create mode 100644 original_file
+Switched to a new branch 'rename'
+[rename e9adddb] B
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
+ 1 file changed, 1 insertion(+)
+ rename original_file => renamed_file (88%)
+Switched to branch 'main'
+[main 0487bb6] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+ok 41 - setup for use of extended merge markers
+
+expecting success of 6402.42 'merge main into rename has correct extended markers': 
+	git checkout rename^0 &&
+	test_must_fail git merge -s recursive main^0 &&
+
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	<<<<<<< HEAD:renamed_file
+	9
+	=======
+	8.5
+	>>>>>>> main^0:original_file
+	EOF
+	test_cmp expected renamed_file
+
+Note: switching to 'rename^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -424962,57 +421513,89 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 14800cf A
-ok 12 - 4a: Change on A, change on B subset of A, dirty mods present
-
-expecting success of 6426.13 '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present': 
-	test_setup_4b &&
-	(
-		cd 4b &&
-
-		git checkout A^0 &&
-		echo "File rewritten" >c &&
-
-		test-tool chmtime --get -3600 c >old-mtime &&
+HEAD is now at e9adddb B
+Auto-merging renamed_file
+CONFLICT (content): Merge conflict in renamed_file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 42 - merge main into rename has correct extended markers
 
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+expecting success of 6402.43 'merge rename into main has correct extended markers': 
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git merge -s recursive rename^0 &&
 
-		test_must_be_empty err &&
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	<<<<<<< HEAD:original_file
+	8.5
+	=======
+	9
+	>>>>>>> rename^0:renamed_file
+	EOF
+	test_cmp expected renamed_file
 
-		# Make sure c was NOT updated
-		test-tool chmtime --get c >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+HEAD is now at e9adddb B
+Previous HEAD position was e9adddb B
+HEAD is now at 0487bb6 C
+Auto-merging renamed_file
+CONFLICT (content): Merge conflict in renamed_file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 43 - merge rename into main has correct extended markers
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+expecting success of 6402.44 'setup spurious "refusing to lose untracked" message': 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
 
-		git rev-parse >actual :0:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
+	> irrelevant_file &&
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
+	git add irrelevant_file original_file &&
+	git commit -mA &&
 
-		git hash-object c >actual &&
-		echo "File rewritten" | git hash-object --stdin >expect &&
-		test_cmp expect actual &&
+	git checkout -b rename &&
+	git mv original_file renamed_file &&
+	git commit -mB &&
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+	git checkout main &&
+	git rm original_file &&
+	git commit -mC
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/4b/.git/
-[master (root-commit) 105387b] O
+rm 'renamed_file'
+rm 'renamed_file'
+rm 'renamed_file'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6402-merge-rename/.git/
+[main (root-commit) e476651] A
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A fed518a] A
+ 2 files changed, 8 insertions(+)
+ create mode 100644 irrelevant_file
+ create mode 100644 original_file
+Switched to a new branch 'rename'
+[rename 951e2d3] B
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- rename b => c (70%)
-Switched to branch 'B'
-[B dfd7e13] B
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename original_file => renamed_file (100%)
+Switched to branch 'main'
+rm 'original_file'
+[main 52b2874] C
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+ 1 file changed, 8 deletions(-)
+ delete mode 100644 original_file
+ok 44 - setup spurious "refusing to lose untracked" message
+
+expecting success of 6402.45 'no spurious "refusing to lose untracked" message': 
+	git checkout main^0 &&
+	test_must_fail git merge rename^0 2>errors.txt &&
+	! grep "refusing to lose untracked file" errors.txt
+
+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
@@ -425029,395 +421612,173 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at fed518a A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 13 - 4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6430-merge-recursive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6430-merge-recursive/.git/
-expecting success of 6430.1 'setup 1': 
-
-	echo hello >a &&
-	o0=$(git hash-object a) &&
-	cp a b &&
-	cp a c &&
-	mkdir d &&
-	cp a d/e &&
-
-	test_tick &&
-	git add a b c d/e &&
-	git commit -m initial &&
-	c0=$(git rev-parse --verify HEAD) &&
-	git branch side &&
-	git branch df-1 &&
-	git branch df-2 &&
-	git branch df-3 &&
-	git branch remove &&
-	git branch submod &&
-	git branch copy &&
-	git branch rename &&
-	git branch rename-ln &&
-
-	echo hello >>a &&
-	cp a d/e &&
-	o1=$(git hash-object a) &&
-
-	git add a d/e &&
+HEAD is now at 52b2874 C
+CONFLICT (rename/delete): original_file renamed to renamed_file in rename^0, but deleted in HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 45 - no spurious "refusing to lose untracked" message
 
-	test_tick &&
-	git commit -m "main modifies a and d/e" &&
-	c1=$(git rev-parse --verify HEAD) &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o1	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o1	d/e" &&
-		echo "100644 $o1 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual
+expecting success of 6402.46 'do not follow renames for empty files': 
+	git checkout -f -b empty-base &&
+	>empty1 &&
+	git add empty1 &&
+	git commit -m base &&
+	echo content >empty1 &&
+	git add empty1 &&
+	git commit -m fill &&
+	git checkout -b empty-topic HEAD^ &&
+	git mv empty1 empty2 &&
+	git commit -m rename &&
+	test_must_fail git merge empty-base &&
+	test_must_be_empty empty2
 
-[main (root-commit) 88eeecf] initial
+Switched to a new branch 'empty-base'
+[empty-base a940ee2] base
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 d/e
-[main fdc9054] main modifies a and d/e
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty1
+[empty-base d42ce4d] fill
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-ok 1 - setup 1
-
-expecting success of 6430.2 'setup 2': 
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'empty-topic'
+[empty-topic ab32619] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename empty1 => empty2 (100%)
+CONFLICT (modify/delete): empty1 deleted in HEAD and modified in empty-base.  Version empty-base of empty1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 46 - do not follow renames for empty files
 
-	rm -rf [abcd] &&
-	git checkout side &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+# passed all 46 test(s)
+1..46
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6427-diff3-conflict-markers.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/.git/
+expecting success of 6427.1 'setup no merge base': 
+	git init no_merge_base &&
 	(
-		echo "100644 blob $o0	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o0 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual &&
-
-	echo goodbye >>a &&
-	o2=$(git hash-object a) &&
+		cd no_merge_base &&
 
-	git add a &&
+		git checkout -b L &&
+		test_commit A content A &&
 
-	test_tick &&
-	git commit -m "side modifies a" &&
-	c2=$(git rev-parse --verify HEAD) &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o2	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o2 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual
+		git checkout --orphan R &&
+		test_commit B content B
+	)
 
-Switched to branch 'side'
-D	b
-D	c
-[side 4419332] side modifies a
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/no_merge_base/.git/
+Switched to a new branch 'L'
+[L (root-commit) ccbdd10] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 2 - setup 2
-
-expecting success of 6430.3 'setup 3': 
-
-	rm -rf [abcd] &&
-	git checkout df-1 &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o0	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o0 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual &&
-
-	rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
-	o3=$(git hash-object b/c) &&
-
-	test_tick &&
-	git commit -m "df-1 makes b/c" &&
-	c3=$(git rev-parse --verify HEAD) &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o0	a" &&
-		echo "100644 blob $o3	b/c" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o0 0	a" &&
-		echo "100644 $o3 0	b/c" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual
-
-Switched to branch 'df-1'
-D	b
-D	c
-D	d/e
-[df-1 918ade1] df-1 makes b/c
+ create mode 100644 content
+Switched to a new branch 'R'
+[R (root-commit) 8e39672] B
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 b
- create mode 100644 b/c
-ok 3 - setup 3
-
-expecting success of 6430.4 'setup 4': 
+ 1 file changed, 1 insertion(+)
+ create mode 100644 content
+ok 1 - setup no merge base
 
-	rm -rf [abcd] &&
-	git checkout df-2 &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+expecting success of 6427.2 'check no merge base': 
 	(
-		echo "100644 blob $o0	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o0 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual &&
+		cd no_merge_base &&
 
-	rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
-	o4=$(git hash-object a/c) &&
+		git checkout L^0 &&
 
-	test_tick &&
-	git commit -m "df-2 makes a/c" &&
-	c4=$(git rev-parse --verify HEAD) &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o4	a/c" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o4 0	a/c" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual
+		test_must_fail git -c merge.conflictstyle=diff3 merge --allow-unrelated-histories -s recursive R^0 &&
 
-Switched to branch 'df-2'
-D	a
-D	c
-D	d/e
-[df-2 833bf24] df-2 makes a/c
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 a
- create mode 100644 a/c
-ok 4 - setup 4
+		grep "|||||| empty tree" content
+	)
 
-expecting success of 6430.5 'setup 5': 
+Note: switching to 'L^0'.
 
-	rm -rf [abcd] &&
-	git checkout remove &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o0	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o0 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	rm -f b &&
-	echo remove-conflict >a &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	git add a &&
-	git rm b &&
-	o5=$(git hash-object a) &&
+  git switch -c <new-branch-name>
 
-	test_tick &&
-	git commit -m "remove removes b and modifies a" &&
-	c5=$(git rev-parse --verify HEAD) &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o5	a" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o5 0	a" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual
+Or undo this operation with:
 
+  git switch -
 
-Switched to branch 'remove'
-D	b
-D	c
-D	d/e
-rm 'b'
-[remove 968f3e1] remove removes b and modifies a
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 2 deletions(-)
- delete mode 100644 b
-ok 5 - setup 5
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6430.6 'setup 6': 
+HEAD is now at ccbdd10 A
+Auto-merging content
+CONFLICT (add/add): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| empty tree
+ok 2 - check no merge base
 
-	rm -rf [abcd] &&
-	git checkout df-3 &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+expecting success of 6427.3 'setup unique merge base': 
+	git init unique_merge_base &&
 	(
-		echo "100644 blob $o0	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 $o0 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e"
-	) >expected &&
-	test_cmp expected actual &&
-
-	rm -fr d && echo df-3 >d && git add d &&
-	o6=$(git hash-object d) &&
+		cd unique_merge_base &&
 
-	test_tick &&
-	git commit -m "df-3 makes d" &&
-	c6=$(git rev-parse --verify HEAD) &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o0	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o6	d" &&
-		echo "100644 $o0 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o6 0	d"
-	) >expected &&
-	test_cmp expected actual
+		test_commit base content "1
+2
+3
+4
+5
+" &&
 
-Switched to branch 'df-3'
-D	c
-D	d/e
-[df-3 9d284b3] df-3 makes d
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 d
- delete mode 100644 d/e
-ok 6 - setup 6
+		git branch L &&
+		git branch R &&
 
-expecting success of 6430.7 'setup 7': 
+		git checkout L &&
+		test_commit L content "1
+2
+3
+4
+5
+7" &&
 
-	git checkout submod &&
-	git rm d/e &&
-	test_tick &&
-	git commit -m "remove d/e" &&
-	git update-index --add --cacheinfo 160000 $c1 d &&
-	test_tick &&
-	git commit -m "make d/ a submodule"
+		git checkout R &&
+		git rm content &&
+		test_commit R renamed "1
+2
+3
+4
+5
+six"
+	)
 
-Switched to branch 'submod'
-D	c
-rm 'd/e'
-[submod a09e90e] remove d/e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 d/e
-[submod 408d7a9] make d/ a submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/unique_merge_base/.git/
+[main (root-commit) 8b7da6e] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 d
-ok 7 - setup 7
-
-expecting success of 6430.8 'setup 8': 
-	git checkout rename &&
-	git mv a e &&
-	git add e &&
-	test_tick &&
-	git commit -m "rename a->e" &&
-	c7=$(git rev-parse --verify HEAD) &&
-	git checkout rename-ln &&
-	git mv a e &&
-	test_ln_s_add e a &&
-	test_tick &&
-	git commit -m "rename a->e, symlink a->e" &&
-	oln=$(printf e | git hash-object --stdin)
-
-Switched to branch 'rename'
-D	c
-[rename 5dd9bd8] rename a->e
+ 1 file changed, 6 insertions(+)
+ create mode 100644 content
+Switched to branch 'L'
+[L e1c672f] L
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a => e (100%)
-Switched to branch 'rename-ln'
-D	c
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[rename-ln 7e1ee82] rename a->e, symlink a->e
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'R'
+rm 'content'
+[R 17f77e6] R
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- mode change 100644 => 120000 a
- create mode 100644 e
-ok 8 - setup 8
-
-expecting success of 6430.9 'setup 9': 
-	git checkout copy &&
-	cp a e &&
-	git add e &&
-	test_tick &&
-	git commit -m "copy a->e"
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename content => renamed (71%)
+ok 3 - setup unique merge base
 
-Switched to branch 'copy'
-D	c
-[copy a40ced5] copy a->e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e
-ok 9 - setup 9
+expecting success of 6427.4 'check unique merge base': 
+	(
+		cd unique_merge_base &&
 
-expecting success of 6430.10 'merge-recursive simple': 
+		git checkout L^0 &&
+		MAIN=$(git rev-parse --short main) &&
 
-	rm -fr [abcd] &&
-	git checkout -f "$c2" &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
 
-	test_expect_code 1 git merge-recursive "$c0" -- "$c2" "$c1"
+		grep "|||||| $MAIN:content" renamed
+	)
 
-Note: switching to '441933296d498d45ed4c5cbe9135259386a2e2b2'.
+warning: refname 'L' is ambiguous.
+warning: refname 'L' is ambiguous.
+Note: switching to 'L^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -425434,1484 +421795,834 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 4419332 side modifies a
-Merging 441933296d498d45ed4c5cbe9135259386a2e2b2 with fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
-Merging:
-4419332 side modifies a
-fdc9054 main modifies a and d/e
-found 1 common ancestor:
-88eeecf initial
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-ok 10 - merge-recursive simple
-
-expecting success of 6430.11 'merge-recursive result': 
-
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o0 1	a" &&
-		echo "100644 $o2 2	a" &&
-		echo "100644 $o1 3	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual
-
-
-ok 11 - merge-recursive result
-
-expecting success of 6430.12 'fail if the index has unresolved entries': 
-
-	rm -fr [abcd] &&
-	git checkout -f "$c1" &&
-
-	test_must_fail git merge "$c5" &&
-	test_must_fail git merge "$c5" 2> out &&
-	test_grep "not possible because you have unmerged files" out &&
-	git add -u &&
-	test_must_fail git merge "$c5" 2> out &&
-	test_grep "You have not concluded your merge" out &&
-	rm -f .git/MERGE_HEAD &&
-	test_must_fail git merge "$c5" 2> out &&
-	test_grep "Your local changes to the following files would be overwritten by merge:" out
-
-Previous HEAD position was 4419332 side modifies a
-HEAD is now at fdc9054 main modifies a and d/e
-Auto-merging a
-CONFLICT (content): Merge conflict in a
+HEAD is now at e1c672f L
+warning: refname 'R' is ambiguous.
+warning: refname 'R' is ambiguous.
+Auto-merging renamed
+CONFLICT (content): Merge conflict in renamed
 Automatic merge failed; fix conflicts and then commit the result.
-error: Merging is not possible because you have unmerged files.
-fatal: You have not concluded your merge (MERGE_HEAD exists).
-error: Your local changes to the following files would be overwritten by merge:
-ok 12 - fail if the index has unresolved entries
-
-expecting success of 6430.13 'merge-recursive remove conflict': 
-
-	rm -fr [abcd] &&
-	git checkout -f "$c1" &&
-
-	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c5"
-
-HEAD is now at fdc9054 main modifies a and d/e
-Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 968f3e182d39cc5676d733434b2b1fcade6d5fdb
-Merging:
-fdc9054 main modifies a and d/e
-968f3e1 remove removes b and modifies a
-found 1 common ancestor:
-88eeecf initial
-Removing b
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-ok 13 - merge-recursive remove conflict
-
-expecting success of 6430.14 'merge-recursive remove conflict': 
+||||||| 8b7da6e:content
+ok 4 - check unique merge base
 
-	git ls-files -s >actual &&
+expecting success of 6427.5 'setup multiple merge bases': 
+	git init multiple_merge_bases &&
 	(
-		echo "100644 $o0 1	a" &&
-		echo "100644 $o1 2	a" &&
-		echo "100644 $o5 3	a" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual
-
-
-ok 14 - merge-recursive remove conflict
-
-expecting success of 6430.15 'merge-recursive d/f simple': 
-	rm -fr [abcd] &&
-	git reset --hard &&
-	git checkout -f "$c1" &&
-
-	git merge-recursive "$c0" -- "$c1" "$c3"
-
-HEAD is now at fdc9054 main modifies a and d/e
-HEAD is now at fdc9054 main modifies a and d/e
-Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 918ade1d06dd1c0da47b644356c64b1b2122e705
-Merging:
-fdc9054 main modifies a and d/e
-918ade1 df-1 makes b/c
-found 1 common ancestor:
-88eeecf initial
-Adding b/c
-Removing b to make room for subdirectory
-
-Removing b
-ok 15 - merge-recursive d/f simple
-
-expecting success of 6430.16 'merge-recursive result': 
+		cd multiple_merge_bases &&
 
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	a" &&
-		echo "100644 $o3 0	b/c" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual
+		test_commit initial content "1
+2
+3
+4
+5" &&
 
+		git branch L &&
+		git branch R &&
 
-ok 16 - merge-recursive result
+		# Create L1
+		git checkout L &&
+		test_commit L1 content "0
+1
+2
+3
+4
+5" &&
 
-expecting success of 6430.17 'merge-recursive d/f conflict': 
+		# Create R1
+		git checkout R &&
+		test_commit R1 content "1
+2
+3
+4
+5
+6" &&
 
-	rm -fr [abcd] &&
-	git reset --hard &&
-	git checkout -f "$c1" &&
+		# Create L2
+		git checkout L &&
+		git merge R1 &&
 
-	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c4"
+		# Create R2
+		git checkout R &&
+		git merge L1 &&
 
-HEAD is now at fdc9054 main modifies a and d/e
-HEAD is now at fdc9054 main modifies a and d/e
-Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 833bf240c9e2636a0e5eb3dd8f735d2a92181f22
-Merging:
-fdc9054 main modifies a and d/e
-833bf24 df-2 makes a/c
-found 1 common ancestor:
-88eeecf initial
-Adding a/c
-Removing a to make room for subdirectory
+		# Create L3
+		git checkout L &&
+		test_commit L3 content "0
+1
+2
+3
+4
+5
+A" &&
 
-CONFLICT (modify/delete): a deleted in 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of a left in tree at a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e.
-ok 17 - merge-recursive d/f conflict
+		# Create R3
+		git checkout R &&
+		git rm content &&
+		test_commit R3 renamed "0
+2
+3
+4
+5
+six"
+	)
 
-expecting success of 6430.18 'merge-recursive d/f conflict result': 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/multiple_merge_bases/.git/
+[main (root-commit) 79a87bb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 content
+Switched to branch 'L'
+[L 2e587ed] L1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'R'
+[R 6e9e69f] R1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'L'
+Auto-merging content
+Merge made by the 'ort' strategy.
+ content | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'R'
+Auto-merging content
+Merge made by the 'ort' strategy.
+ content | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'L'
+[L 614f030] L3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'R'
+rm 'content'
+[R 8a53b94] R3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ rename content => renamed (71%)
+ok 5 - setup multiple merge bases
 
-	git ls-files -s >actual &&
+expecting success of 6427.6 'check multiple merge bases': 
 	(
-		echo "100644 $o0 1	a" &&
-		echo "100644 $o1 2	a" &&
-		echo "100644 $o4 0	a/c" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual
-
-
-ok 18 - merge-recursive d/f conflict result
-
-expecting success of 6430.19 'merge-recursive d/f conflict the other way': 
-
-	rm -fr [abcd] &&
-	git reset --hard &&
-	git checkout -f "$c4" &&
+		cd multiple_merge_bases &&
 
-	test_expect_code 1 git merge-recursive "$c0" -- "$c4" "$c1"
+		git checkout L^0 &&
 
-HEAD is now at fdc9054 main modifies a and d/e
-Previous HEAD position was fdc9054 main modifies a and d/e
-HEAD is now at 833bf24 df-2 makes a/c
-Merging 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 with fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
-Merging:
-833bf24 df-2 makes a/c
-fdc9054 main modifies a and d/e
-found 1 common ancestor:
-88eeecf initial
-Adding a/c
-CONFLICT (modify/delete): a deleted in 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of a left in tree at a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0.
-ok 19 - merge-recursive d/f conflict the other way
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
 
-expecting success of 6430.20 'merge-recursive d/f conflict result the other way': 
+		grep "|||||| merged common ancestors:content" renamed
+	)
 
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o0 1	a" &&
-		echo "100644 $o1 3	a" &&
-		echo "100644 $o4 0	a/c" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual
+Note: switching to 'L^0'.
 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 20 - merge-recursive d/f conflict result the other way
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 6430.21 'merge-recursive d/f conflict': 
+  git switch -c <new-branch-name>
 
-	rm -fr [abcd] &&
-	git reset --hard &&
-	git checkout -f "$c1" &&
+Or undo this operation with:
 
-	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c6"
+  git switch -
 
-HEAD is now at 833bf24 df-2 makes a/c
-Previous HEAD position was 833bf24 df-2 makes a/c
-HEAD is now at fdc9054 main modifies a and d/e
-Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 9d284b3a95aea72df4581977e913e55da89d5e3d
-Merging:
-fdc9054 main modifies a and d/e
-9d284b3 df-3 makes d
-found 1 common ancestor:
-88eeecf initial
-CONFLICT (modify/delete): d/e deleted in 9d284b3a95aea72df4581977e913e55da89d5e3d and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of d/e left in tree.
-CONFLICT (directory/file): There is a directory with name d in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Adding d as d~9d284b3a95aea72df4581977e913e55da89d5e3d
-ok 21 - merge-recursive d/f conflict
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6430.22 'merge-recursive d/f conflict result': 
+HEAD is now at 614f030 L3
+  From inner merge:  Auto-merging content
+Auto-merging renamed
+CONFLICT (content): Merge conflict in renamed
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| merged common ancestors:content
+ok 6 - check multiple merge bases
 
-	git ls-files -s >actual &&
+expecting success of 6427.7 'rebase --merge describes parent of commit being picked': 
+	git init rebase &&
 	(
-		echo "100644 $o1 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o6 3	d" &&
-		echo "100644 $o0 1	d/e" &&
-		echo "100644 $o1 2	d/e"
-	) >expected &&
-	test_cmp expected actual
-
-
-ok 22 - merge-recursive d/f conflict result
-
-expecting success of 6430.23 'merge-recursive d/f conflict': 
+		cd rebase &&
+		test_commit base file &&
+		test_commit main file &&
+		git checkout -b side HEAD^ &&
+		test_commit side file &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --merge main &&
+		grep "||||||| parent of" file
+	)
 
-	rm -fr [abcd] &&
-	git reset --hard &&
-	git checkout -f "$c6" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/rebase/.git/
+[main (root-commit) 215235d] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 9d7b901] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side 748f431] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 748f431... side
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 748f431... side
+||||||| parent of 748f431 (side)
+ok 7 - rebase --merge describes parent of commit being picked
 
-	test_expect_code 1 git merge-recursive "$c0" -- "$c6" "$c1"
+expecting success of 6427.8 'rebase --apply describes fake ancestor base': 
+	(
+		cd rebase &&
+		git rebase --abort &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --apply main &&
+		grep "||||||| constructed merge base" file
+	)
 
-HEAD is now at fdc9054 main modifies a and d/e
-Previous HEAD position was fdc9054 main modifies a and d/e
-HEAD is now at 9d284b3 df-3 makes d
-Merging 9d284b3a95aea72df4581977e913e55da89d5e3d with fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: side
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
 Merging:
-9d284b3 df-3 makes d
-fdc9054 main modifies a and d/e
+9d7b901 main
+virtual side
 found 1 common ancestor:
-88eeecf initial
-CONFLICT (modify/delete): d/e deleted in 9d284b3a95aea72df4581977e913e55da89d5e3d and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of d/e left in tree.
-Removing d to make room for subdirectory
-
-CONFLICT (file/directory): There is a directory with name d in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Adding d as d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
-ok 23 - merge-recursive d/f conflict
-
-expecting success of 6430.24 'merge-recursive d/f conflict result': 
+virtual 6d5f482d15035cdd7733b1b551d1fead28d22592
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 side
+||||||| constructed merge base
+ok 8 - rebase --apply describes fake ancestor base
 
-	git ls-files -s >actual &&
+expecting success of 6427.9 'check zdiff3 markers': 
+	test_setup_zdiff3 &&
 	(
-		echo "100644 $o1 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o6 2	d" &&
-		echo "100644 $o0 1	d/e" &&
-		echo "100644 $o1 3	d/e"
-	) >expected &&
-	test_cmp expected actual
-
+		cd zdiff3 &&
 
-ok 24 - merge-recursive d/f conflict result
+		git checkout left^0 &&
 
-expecting success of 6430.25 'dir in working tree with symlink ancestor does not produce d/f conflict': 
-	git init sym &&
-	(
-		cd sym &&
-		ln -s . foo &&
-		mkdir bar &&
-		>bar/file &&
-		git add foo bar/file &&
-		git commit -m "foo symlink" &&
+		base=$(git rev-parse --short HEAD^1) &&
+		test_must_fail git -c merge.conflictstyle=zdiff3 merge -s recursive right^0 &&
 
-		git checkout -b branch1 &&
-		git commit --allow-empty -m "empty commit" &&
+		test_write_lines 1 2 3 4 A \
+				 "<<<<<<< HEAD" B C D \
+				 "||||||| $base" 5 6 \
+				 ======= X C Y \
+				 ">>>>>>> right^0" \
+				 E 7 8 9 \
+				 >expect &&
+		test_cmp expect basic &&
 
-		git checkout main &&
-		git rm foo &&
-		mkdir foo &&
-		>foo/bar &&
-		git add foo/bar &&
-		git commit -m "replace foo symlink with real foo dir and foo/bar file" &&
+		test_write_lines 1 2 3 \
+				 "<<<<<<< HEAD" CC \
+				 "||||||| $base" AA \
+				 ======= EE \
+				 ">>>>>>> right^0" \
+				 4 5 \
+				 "<<<<<<< HEAD" DD \
+				 "||||||| $base" BB \
+				 ======= FF \
+				 ">>>>>>> right^0" \
+				 6 7 8 \
+				 >expect &&
+		test_cmp expect middle-common &&
 
-		git checkout branch1 &&
+		test_write_lines 1 2 3 4 A B C \
+				 "<<<<<<< HEAD" D E F \
+				 "||||||| $base" 5 6 \
+				 ======= 5 6 \
+				 ">>>>>>> right^0" \
+				 G H I J 7 8 9 \
+				 >expect &&
+		test_cmp expect interesting &&
 
-		git cherry-pick main &&
-		test_path_is_dir foo &&
-		test_path_is_file foo/bar
+		# Not passing this one yet; the common "B C" lines is still
+		# being left in the conflict blocks on the left and right
+		# sides.
+		test_write_lines 1 2 3 4 \
+				 "<<<<<<< HEAD" X A \
+				 "||||||| $base" 5 6 \
+				 ======= Y A B C \
+				 ">>>>>>> right^0" \
+				 B C 7 8 9 \
+				 >expect &&
+		test_cmp expect evil
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6430-merge-recursive/sym/.git/
-[main (root-commit) 8fb1559] foo symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 bar/file
- create mode 120000 foo
-Switched to a new branch 'branch1'
-[branch1 9371671] empty commit
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6427-diff3-conflict-markers/zdiff3/.git/
+[main (root-commit) 682cee2] base
  Author: A U Thor <author@example.com>
-Switched to branch 'main'
-rm 'foo'
-[main 8f162ab] replace foo symlink with real foo dir and foo/bar file
+ 4 files changed, 37 insertions(+)
+ create mode 100644 basic
+ create mode 100644 evil
+ create mode 100644 interesting
+ create mode 100644 middle-common
+Switched to branch 'left'
+[left 8ffb720] letters
  Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- delete mode 120000 foo
- create mode 100644 foo/bar
-Switched to branch 'branch1'
-[branch1 f190fac] replace foo symlink with real foo dir and foo/bar file
+ 4 files changed, 21 insertions(+), 8 deletions(-)
+Switched to branch 'right'
+[right 11127f3] permuted
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:24:13 2005 -0700
- 2 files changed, 1 deletion(-)
- delete mode 120000 foo
- create mode 100644 foo/bar
-ok 25 - dir in working tree with symlink ancestor does not produce d/f conflict
-
-expecting success of 6430.26 'reset and 3-way merge': 
-
-	git reset --hard "$c2" &&
-	git read-tree -m "$c0" "$c2" "$c1"
-
-
-warning: unable to unlink 'd': Is a directory
-HEAD is now at 4419332 side modifies a
-ok 26 - reset and 3-way merge
-
-expecting success of 6430.27 'reset and bind merge': 
-
-	git reset --hard main &&
-	git read-tree --prefix=M/ main &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	M/a" &&
-		echo "100644 $o0 0	M/b" &&
-		echo "100644 $o0 0	M/c" &&
-		echo "100644 $o1 0	M/d/e" &&
-		echo "100644 $o1 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual &&
-
-	git read-tree --prefix=a1/ main &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	M/a" &&
-		echo "100644 $o0 0	M/b" &&
-		echo "100644 $o0 0	M/c" &&
-		echo "100644 $o1 0	M/d/e" &&
-		echo "100644 $o1 0	a" &&
-		echo "100644 $o1 0	a1/a" &&
-		echo "100644 $o0 0	a1/b" &&
-		echo "100644 $o0 0	a1/c" &&
-		echo "100644 $o1 0	a1/d/e" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e"
-	) >expected &&
-	test_cmp expected actual &&
+ 4 files changed, 20 insertions(+), 6 deletions(-)
+Note: switching to 'left^0'.
 
-	git read-tree --prefix=z/ main &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	M/a" &&
-		echo "100644 $o0 0	M/b" &&
-		echo "100644 $o0 0	M/c" &&
-		echo "100644 $o1 0	M/d/e" &&
-		echo "100644 $o1 0	a" &&
-		echo "100644 $o1 0	a1/a" &&
-		echo "100644 $o0 0	a1/b" &&
-		echo "100644 $o0 0	a1/c" &&
-		echo "100644 $o1 0	a1/d/e" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o1 0	d/e" &&
-		echo "100644 $o1 0	z/a" &&
-		echo "100644 $o0 0	z/b" &&
-		echo "100644 $o0 0	z/c" &&
-		echo "100644 $o1 0	z/d/e"
-	) >expected &&
-	test_cmp expected actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
+If you want to 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 fdc9054 main modifies a and d/e
-ok 27 - reset and bind merge
+  git switch -c <new-branch-name>
 
-expecting success of 6430.28 'merge-recursive w/ empty work tree - ours has rename': 
-	(
-		GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
-		export GIT_WORK_TREE &&
-		GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
-		export GIT_INDEX_FILE &&
-		mkdir "$GIT_WORK_TREE" &&
-		git read-tree -i -m $c7 2>actual-err &&
-		test_must_be_empty actual-err &&
-		git update-index --ignore-missing --refresh 2>actual-err &&
-		test_must_be_empty actual-err &&
-		git merge-recursive $c0 -- $c7 $c3 2>actual-err &&
-		test_must_be_empty actual-err &&
-		git ls-files -s >actual-files 2>actual-err &&
-		test_must_be_empty actual-err
-	) &&
-	cat >expected-files <<-EOF &&
-	100644 $o3 0	b/c
-	100644 $o0 0	c
-	100644 $o0 0	d/e
-	100644 $o0 0	e
-	EOF
-	test_cmp expected-files actual-files
+Or undo this operation with:
 
-Merging 5dd9bd8ddad823127f5e40fcbc297d40f91d9a53 with 918ade1d06dd1c0da47b644356c64b1b2122e705
-Merging:
-5dd9bd8 rename a->e
-918ade1 df-1 makes b/c
-found 1 common ancestor:
-88eeecf initial
-Skipped e (merged same as existing)
-Adding b/c
-Removing b to make room for subdirectory
+  git switch -
 
-Removing b
-ok 28 - merge-recursive w/ empty work tree - ours has rename
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6430.29 'merge-recursive w/ empty work tree - theirs has rename': 
-	(
-		GIT_WORK_TREE="$PWD/theirs-has-rename-work" &&
-		export GIT_WORK_TREE &&
-		GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
-		export GIT_INDEX_FILE &&
-		mkdir "$GIT_WORK_TREE" &&
-		git read-tree -i -m $c3 2>actual-err &&
-		test_must_be_empty actual-err &&
-		git update-index --ignore-missing --refresh 2>actual-err &&
-		test_must_be_empty actual-err &&
-		git merge-recursive $c0 -- $c3 $c7 2>actual-err &&
-		test_must_be_empty actual-err &&
-		git ls-files -s >actual-files 2>actual-err &&
-		test_must_be_empty actual-err
-	) &&
-	cat >expected-files <<-EOF &&
-	100644 $o3 0	b/c
-	100644 $o0 0	c
-	100644 $o0 0	d/e
-	100644 $o0 0	e
-	EOF
-	test_cmp expected-files actual-files
+HEAD is now at 8ffb720 letters
+Auto-merging basic
+CONFLICT (content): Merge conflict in basic
+Auto-merging evil
+CONFLICT (content): Merge conflict in evil
+Auto-merging interesting
+CONFLICT (content): Merge conflict in interesting
+Auto-merging middle-common
+CONFLICT (content): Merge conflict in middle-common
+Automatic merge failed; fix conflicts and then commit the result.
+ok 9 - check zdiff3 markers
 
-Merging 918ade1d06dd1c0da47b644356c64b1b2122e705 with 5dd9bd8ddad823127f5e40fcbc297d40f91d9a53
-Merging:
-918ade1 df-1 makes b/c
-5dd9bd8 rename a->e
-found 1 common ancestor:
-88eeecf initial
-Adding b/c
-ok 29 - merge-recursive w/ empty work tree - theirs has rename
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6431-merge-criscross.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6431-merge-criscross/.git/
+expecting success of 6431.1 'setup repo with criss-cross history': 
+	mkdir data &&
 
-expecting success of 6430.30 'merge removes empty directories': 
+	# create a bunch of files
+	n=1 &&
+	while test $n -le 10
+	do
+		echo $n > data/$n &&
+		n=$(($n+1)) ||
+		return 1
+	done &&
 
-	git reset --hard main &&
-	git checkout -b rm &&
-	git rm d/e &&
-	git commit -mremoved-d/e &&
-	git checkout main &&
-	git merge -s recursive rm &&
-	test_path_is_missing d
+	# check them in
+	git add data &&
+	git commit -m A &&
+	git branch A &&
 
-HEAD is now at fdc9054 main modifies a and d/e
-Switched to a new branch 'rm'
-rm 'd/e'
-[rm d70191d] removed-d/e
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 d/e
-Switched to branch 'main'
-Updating fdc9054..d70191d
-Fast-forward
- d/e | 2 --
- 1 file changed, 2 deletions(-)
- delete mode 100644 d/e
-ok 30 - merge removes empty directories
+	# a file in one branch
+	git checkout -b B A &&
+	git rm data/9 &&
+	git add data &&
+	git commit -m B &&
 
-expecting success of 6430.31 'merge-recursive simple w/submodule': 
+	# with a branch off of it
+	git branch D &&
 
-	git checkout submod &&
-	git merge remove
+	# put some commits on D
+	git checkout D &&
+	echo testD > data/testD &&
+	git add data &&
+	git commit -m D &&
 
-Switched to branch 'submod'
-Merge made by the 'ort' strategy.
- a | 2 +-
- b | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
- delete mode 100644 b
-ok 31 - merge-recursive simple w/submodule
+	# back up to the top, create another branch and cause
+	# a rename conflict with the file we deleted earlier
+	git checkout -b C A &&
+	git mv data/9 data/new-9 &&
+	git add data &&
+	git commit -m C &&
 
-expecting success of 6430.32 'merge-recursive simple w/submodule result': 
+	# with a branch off of it
+	git branch E &&
 
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o5 0	a" &&
-		echo "100644 $o0 0	c" &&
-		echo "160000 $c1 0	d"
-	) >expected &&
-	test_cmp expected actual
+	# put a commit on E
+	git checkout E &&
+	echo testE > data/testE &&
+	git add data &&
+	git commit -m E &&
 
-ok 32 - merge-recursive simple w/submodule result
+	# now, merge E into B
+	git checkout B &&
+	test_must_fail git merge E &&
+	# force-resolve
+	git add data &&
+	git commit -m F &&
+	git branch F &&
 
-expecting success of 6430.33 'merge-recursive copy vs. rename': 
-	git checkout -f copy &&
-	git merge rename &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 blob $o0	e" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e" &&
-		echo "100644 $o0 0	e"
-	) >expected &&
-	test_cmp expected actual
+	# and merge D into C
+	git checkout C &&
+	test_must_fail git merge D &&
+	# force-resolve
+	git add data &&
+	git commit -m G &&
+	git branch G
 
-Switched to branch 'copy'
-Merge made by the 'ort' strategy.
- a | 1 -
+[master (root-commit) 7287aa7] A
+ Author: A U Thor <author@example.com>
+ 10 files changed, 10 insertions(+)
+ create mode 100644 data/1
+ create mode 100644 data/10
+ create mode 100644 data/2
+ create mode 100644 data/3
+ create mode 100644 data/4
+ create mode 100644 data/5
+ create mode 100644 data/6
+ create mode 100644 data/7
+ create mode 100644 data/8
+ create mode 100644 data/9
+Switched to a new branch 'B'
+rm 'data/9'
+[B 53e80c3] B
+ Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
- delete mode 100644 a
-ok 33 - merge-recursive copy vs. rename
-
-expecting success of 6430.34 'merge-recursive rename vs. rename/symlink': 
-
-	git checkout -f rename &&
-	git merge rename-ln &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "120000 blob $oln	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 blob $o0	e" &&
-		echo "120000 $oln 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e" &&
-		echo "100644 $o0 0	e"
-	) >expected &&
-	test_cmp expected actual
-
-Switched to branch 'rename'
-Merge made by the 'ort' strategy.
- a | 1 +
+ delete mode 100644 data/9
+Switched to branch 'D'
+[D c132a69] D
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 120000 a
-ok 34 - merge-recursive rename vs. rename/symlink
-
-expecting success of 6430.35 'merging with triple rename across D/F conflict': 
-	git reset --hard HEAD &&
-	git checkout -b topic &&
-	git rm -rf . &&
-
-	echo "just a file" >sub1 &&
-	mkdir -p sub2 &&
-	echo content1 >sub2/file1 &&
-	echo content2 >sub2/file2 &&
-	echo content3 >sub2/file3 &&
-	mkdir simple &&
-	echo base >simple/bar &&
-	git add -A &&
-	test_tick &&
-	git commit -m base &&
-
-	git checkout -b other &&
-	echo more >>simple/bar &&
-	test_tick &&
-	git commit -a -m changesimplefile &&
-
-	git checkout topic &&
-	git rm sub1 &&
-	git mv sub2 sub1 &&
-	test_tick &&
-	git commit -m changefiletodir &&
-
-	test_tick &&
-	git merge other
-
-HEAD is now at b57c6be Merge branch 'rename-ln' into rename
-Switched to a new branch 'topic'
-rm 'a'
-rm 'b'
-rm 'c'
-rm 'd/e'
-rm 'e'
-warning: adding embedded git repository: sym
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sym
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sym
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[topic a5d19b4] base
+ create mode 100644 data/testD
+Switched to a new branch 'C'
+[C e11feee] C
  Author: A U Thor <author@example.com>
- 22 files changed, 42 insertions(+), 2 deletions(-)
- delete mode 120000 a
- create mode 100644 actual
- create mode 100644 actual-err
- create mode 100644 actual-files
- rename b => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e (50%)
- rename c => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0 (50%)
- create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d
- create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
- delete mode 100644 e
- create mode 100644 expected
- create mode 100644 expected-files
- create mode 100644 ours-has-rename-index
- create mode 100644 ours-has-rename-work/b/c
- create mode 100644 out
- create mode 100644 simple/bar
- create mode 100644 sub1
- create mode 100644 sub2/file1
- create mode 100644 sub2/file2
- create mode 100644 sub2/file3
- create mode 160000 sym
- create mode 100644 theirs-has-rename-index
- rename {d => theirs-has-rename-work}/e (100%)
-Switched to a new branch 'other'
-[other 9b19f5f] changesimplefile
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename data/{9 => new-9} (100%)
+Switched to branch 'E'
+[E da98b4a] E
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'topic'
-rm 'sub1'
-[topic 66c86e7] changefiletodir
+ create mode 100644 data/testE
+Switched to branch 'B'
+CONFLICT (rename/delete): data/9 renamed to data/new-9 in E, but deleted in HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+[B 9eb2311] F
  Author: A U Thor <author@example.com>
- 4 files changed, 1 deletion(-)
- delete mode 100644 sub1
- rename {sub2 => sub1}/file1 (100%)
- rename {sub2 => sub1}/file2 (100%)
- rename {sub2 => sub1}/file3 (100%)
-Merge made by the 'ort' strategy.
- simple/bar | 1 +
- 1 file changed, 1 insertion(+)
-ok 35 - merging with triple rename across D/F conflict
-
-expecting success of 6430.36 'merge-recursive remembers the names of all base trees': 
-	git reset --hard HEAD &&
-
-	# make the index match $c1 so that merge-recursive below does not
-	# fail early
-	git diff --binary HEAD $c1 -- | git apply --cached &&
-
-	# more trees than static slots used by oid_to_hex()
-	for commit in $c0 $c2 $c4 $c5 $c6 $c7
-	do
-		git rev-parse "$commit^{tree}" || return 1
-	done >trees &&
-
-	# ignore the return code; it only fails because the input is weird...
-	test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
+Switched to branch 'C'
+CONFLICT (rename/delete): data/9 renamed to data/new-9 in HEAD, but deleted in D.
+Automatic merge failed; fix conflicts and then commit the result.
+[C dc9a020] G
+ Author: A U Thor <author@example.com>
+ok 1 - setup repo with criss-cross history
 
-	# ...but make sure it fails in the expected way
-	test_grep CONFLICT.*rename/rename out &&
+expecting success of 6431.2 'recursive merge between F and G does not cause segfault': 
+	git merge F
 
-	# merge-recursive prints in reverse order, but we do not care
-	sort <trees >expect &&
-	sed -n "s/^virtual //p" out | sort >actual &&
-	test_cmp expect actual &&
+  From inner merge:  CONFLICT (rename/delete): data/9 renamed to data/new-9 in Temporary merge branch 1, but deleted in Temporary merge branch 2.
+Merge made by the 'ort' strategy.
+ data/testE | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data/testE
+ok 2 - recursive merge between F and G does not cause segfault
 
-	git clean -fd
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6432-merge-recursive-space-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6432-merge-recursive-space-options/.git/
+expecting success of 6432.1 'setup': 
+	conflict_hunks () {
+		sed $SED_OPTIONS -n -e "
+			/^<<<</ b conflict
+			b
+			: conflict
+			p
+			/^>>>>/ b
+			n
+			b conflict
+		" "$@"
+	} &&
 
-HEAD is now at 0922b90 Merge branch 'other' into topic
-CONFLICT (rename/rename): Rename e->a in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Rename a~Temporary merge branch 2_0->a in 918ade1d06dd1c0da47b644356c64b1b2122e705
-Removing actual
-Removing actual-err
-Removing actual-files
-Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
-Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0
-Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d
-Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
-Removing expect
-Removing expected
-Removing expected-files
-Removing ours-has-rename-index
-Removing ours-has-rename-work/
-Removing out
-Removing simple/
-Removing sub1/
-Removing theirs-has-rename-index
-Removing theirs-has-rename-work/
-Removing trees
-ok 36 - merge-recursive remembers the names of all base trees
+	cat <<-\EOF >text.txt &&
+	    Hope, he says, cherishes the soul of him who lives in
+	    justice and holiness and is the nurse of his age and the
+	    companion of his journey;--hope which is mightiest to sway
+	    the restless soul of man.
 
-expecting success of 6430.37 'merge-recursive internal merge resolves to the sameness': 
-	git reset --hard HEAD &&
+	How admirable are his words!  And the great blessing of riches, I do
+	not say to every man, but to a good man, is, that he has had no
+	occasion to deceive or to defraud others, either intentionally or
+	unintentionally; and when he departs to the world below he is not in
+	any apprehension about offerings due to the gods or debts which he owes
+	to men.  Now to this peace of mind the possession of wealth greatly
+	contributes; and therefore I say, that, setting one thing against
+	another, of the many advantages which wealth has to give, to a man of
+	sense this is in my opinion the greatest.
 
-	# We are going to create a history leading to two criss-cross
-	# branches A and B.  The common ancestor at the bottom, O0,
-	# has two child commits O1 and O2, both of which will be merge
-	# base between A and B, like so:
-	#
-	#       O1---A
-	#      /  \ /
-	#    O0    .
-	#      \  / \
-	#       O2---B
-	#
-	# The recently added "check to see if the index is different from
-	# the tree into which something else is getting merged" check must
-	# NOT kick in when an inner merge between O1 and O2 is made.  Both
-	# O1 and O2 happen to have the same tree as O0 in this test to
-	# trigger the bug---whether the inner merge is made by merging O2
-	# into O1 or O1 into O2, their common ancestor O0 and the branch
-	# being merged have the same tree.  We should not trigger the "is
-	# the index dirty?" check in this case.
+	Well said, Cephalus, I replied; but as concerning justice, what is
+	it?--to speak the truth and to pay your debts--no more than this?  And
+	even to this are there not exceptions?  Suppose that a friend when in
+	his right mind has deposited arms with me and he asks for them when he
+	is not in his right mind, ought I to give them back to him?  No one
+	would say that I ought or that I should be right in doing so, any more
+	than they would say that I ought always to speak the truth to one who
+	is in his condition.
 
-	echo "zero" >file &&
-	git add file &&
-	test_tick &&
-	git commit -m "O0" &&
-	O0=$(git rev-parse HEAD) &&
+	You are quite right, he replied.
 
-	test_tick &&
-	git commit --allow-empty -m "O1" &&
-	O1=$(git rev-parse HEAD) &&
+	But then, I said, speaking the truth and paying your debts is not a
+	correct definition of justice.
 
-	git reset --hard $O0 &&
-	test_tick &&
-	git commit --allow-empty -m "O2" &&
-	O2=$(git rev-parse HEAD) &&
+	CEPHALUS - SOCRATES - POLEMARCHUS
 
-	test_tick &&
-	git merge -s ours $O1 &&
-	B=$(git rev-parse HEAD) &&
+	Quite correct, Socrates, if Simonides is to be believed, said
+	Polemarchus interposing.
 
-	git reset --hard $O1 &&
+	I fear, said Cephalus, that I must go now, for I have to look after the
+	sacrifices, and I hand over the argument to Polemarchus and the company.
+	EOF
+	git add text.txt &&
 	test_tick &&
-	git merge -s ours $O2 &&
-	A=$(git rev-parse HEAD) &&
-
-	git merge $B
+	git commit -m "Initial revision" &&
 
-HEAD is now at 0922b90 Merge branch 'other' into topic
-[topic d5d3a53] O0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[topic 5f23c2a] O1
- Author: A U Thor <author@example.com>
-HEAD is now at d5d3a53 O0
-[topic 3bf6782] O2
- Author: A U Thor <author@example.com>
-Merge made by the 'ours' strategy.
-HEAD is now at 5f23c2a O1
-Merge made by the 'ours' strategy.
-Merge made by the 'ort' strategy.
-ok 37 - merge-recursive internal merge resolves to the sameness
+	git checkout -b remote &&
+	sed -e "
+			s/\.  /\. /g
+			s/[?]  /? /g
+			s/    /	/g
+			s/--/---/g
+			s/but as concerning/but as con cerning/
+			/CEPHALUS - SOCRATES - POLEMARCHUS/ d
+		" text.txt >text.txt+ &&
+	mv text.txt+ text.txt &&
+	git commit -a -m "Remove cruft" &&
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6434-merge-recursive-rename-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
+	git checkout main &&
+	sed -e "
+			s/\(not in his right mind\),\(.*\)/\1;\2Q/
+			s/Quite correct\(.*\)/It is too correct\1Q/
+			s/unintentionally/un intentionally/
+			/un intentionally/ s/$/Q/
+			s/Polemarchus interposing./Polemarchus, interposing.Q/
+			/justice and holiness/ s/$/Q/
+			/pay your debts/ s/$/Q/
+		" text.txt | q_to_cr >text.txt+ &&
+	mv text.txt+ text.txt &&
+	git commit -a -m "Clarify" &&
+	git show-branch --all
 
-[main (root-commit) f9f9b59] base
+[main (root-commit) c1e95d9] Initial revision
  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
+ 1 file changed, 36 insertions(+)
+ create mode 100644 text.txt
+Switched to a new branch 'remote'
+[remote be82dcf] Remove cruft
  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
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+Switched to branch 'main'
+[main 0ab7224] Clarify
  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
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+* [main] Clarify
+ ! [remote] Remove cruft
+--
+ + [remote] Remove cruft
+*  [main] Clarify
+*+ [remote^] Initial revision
+ok 1 - setup
 
-expecting success of 6434.14 'last wins in --find-renames --no-renames': 
+expecting success of 6432.2 'naive merge fails': 
 	git read-tree --reset -u HEAD &&
-	git merge-recursive --find-renames --no-renames $tail &&
-	check_no_renames
+	test_must_fail git merge-recursive HEAD^ -- HEAD remote &&
+	test_must_fail git update-index --refresh &&
+	grep "<<<<<<" text.txt
 
-Merging HEAD with main
+Merging HEAD with remote
 Merging:
-056f2c0 rename
-f3f4da2 delete
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-f9f9b59 base
-ok 14 - last wins in --find-renames --no-renames
+c1e95d9 Initial revision
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+text.txt: needs merge
+<<<<<<< HEAD
+<<<<<<< HEAD
+ok 2 - naive merge fails
 
-expecting success of 6434.15 'assumption for further tests: trivial merge succeeds': 
+expecting success of 6432.3 '--ignore-space-change makes merge succeed': 
 	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
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote
 
-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 HEAD with remote
 Merging:
-056f2c0 rename
-056f2c0 rename
+0ab7224 Clarify
+be82dcf Remove cruft
 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
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 3 - --ignore-space-change makes merge succeed
 
-expecting success of 6434.18 'rename-threshold=<n> is a synonym for find-renames=<n>': 
+expecting success of 6432.4 'naive cherry-pick fails': 
 	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>': 
+	test_must_fail git cherry-pick --no-commit remote &&
 	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --no-renames --rename-threshold=$th0 $tail &&
-	check_threshold_0
+	test_must_fail git cherry-pick remote &&
+	test_must_fail git update-index --refresh &&
+	grep "<<<<<<" text.txt
 
-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>
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+error: could not apply be82dcf... Remove cruft
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: Disable this message with "git config set advice.mergeConflict false"
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+error: could not apply be82dcf... Remove cruft
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+text.txt: needs merge
+<<<<<<< HEAD
+<<<<<<< HEAD
+ok 4 - naive cherry-pick fails
 
-expecting success of 6434.20 'last wins in --rename-threshold=<n> --no-renames': 
+expecting success of 6432.5 '-Xignore-space-change makes cherry-pick succeed': 
 	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
+	git cherry-pick --no-commit -Xignore-space-change remote
 
-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
+Auto-merging text.txt
+ok 5 - -Xignore-space-change makes cherry-pick succeed
 
-fatal: unknown option --rename-threshold=-25
-ok 21 - --rename-threshold=<n> rejects negative argument
+expecting success of 6432.6 '--ignore-space-change: our w/s-only change wins': 
+	q_to_cr <<-\EOF >expected &&
+	    justice and holiness and is the nurse of his age and theQ
+	EOF
 
-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
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
+	grep "justice and holiness" text.txt >actual &&
+	test_cmp expected actual
 
-fatal: unknown option --rename-threshold=0xf
-ok 22 - --rename-threshold=<n> rejects non-numbers
+Merging HEAD with remote
+Merging:
+0ab7224 Clarify
+be82dcf Remove cruft
+found 1 common ancestor:
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 6 - --ignore-space-change: our w/s-only change wins
+
+expecting success of 6432.7 '--ignore-space-change: their real change wins over w/s': 
+	cat <<-\EOF >expected &&
+	it?---to speak the truth and to pay your debts---no more than this? And
+	EOF
 
-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
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
+	grep "pay your debts" text.txt >actual &&
+	test_cmp expected actual
 
-Merging HEAD with main
+Merging HEAD with remote
 Merging:
-056f2c0 rename
-f3f4da2 delete
+0ab7224 Clarify
+be82dcf Remove cruft
 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>
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 7 - --ignore-space-change: their real change wins over w/s
+
+expecting success of 6432.8 '--ignore-space-change: does not ignore new spaces': 
+	cat <<-\EOF >expected1 &&
+	Well said, Cephalus, I replied; but as con cerning justice, what is
+	EOF
+	q_to_cr <<-\EOF >expected2 &&
+	un intentionally; and when he departs to the world below he is not inQ
+	EOF
 
-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
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
+	grep "Well said" text.txt >actual1 &&
+	grep "when he departs" text.txt >actual2 &&
+	test_cmp expected1 actual1 &&
+	test_cmp expected2 actual2
 
-Merging HEAD with main
+Merging HEAD with remote
 Merging:
-056f2c0 rename
-f3f4da2 delete
+0ab7224 Clarify
+be82dcf Remove cruft
 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>
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 8 - --ignore-space-change: does not ignore new spaces
+
+expecting success of 6432.9 '--ignore-all-space drops their new spaces': 
+	cat <<-\EOF >expected &&
+	Well said, Cephalus, I replied; but as concerning justice, what is
+	EOF
 
-expecting success of 6434.25 'merge.renames disables rename detection': 
 	git read-tree --reset -u HEAD &&
-	git -c merge.renames=false merge-recursive $tail &&
-	check_no_renames
+	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
+	grep "Well said" text.txt >actual &&
+	test_cmp expected actual
 
-Merging HEAD with main
+Merging HEAD with remote
 Merging:
-056f2c0 rename
-f3f4da2 delete
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-f9f9b59 base
-ok 25 - merge.renames disables rename detection
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 9 - --ignore-all-space drops their new spaces
+
+expecting success of 6432.10 '--ignore-all-space keeps our new spaces': 
+	q_to_cr <<-\EOF >expected &&
+	un intentionally; and when he departs to the world below he is not inQ
+	EOF
 
-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
+	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
+	grep "when he departs" text.txt >actual &&
+	test_cmp expected actual
 
-Merging HEAD with main
+Merging HEAD with remote
 Merging:
-056f2c0 rename
-f3f4da2 delete
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-f9f9b59 base
-ok 26 - merge.renames defaults to diff.renames
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 10 - --ignore-all-space keeps our new spaces
+
+expecting success of 6432.11 '--ignore-space-at-eol': 
+	q_to_cr <<-\EOF >expected &&
+	<<<<<<< HEAD
+	is not in his right mind; ought I to give them back to him?  No oneQ
+	=======
+	is not in his right mind, ought I to give them back to him? No one
+	>>>>>>> remote
+	EOF
 
-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
+	test_must_fail git merge-recursive --ignore-space-at-eol \
+						 HEAD^ -- HEAD remote &&
+	conflict_hunks text.txt >actual &&
+	test_cmp expected actual
 
-Merging HEAD with main
+Merging HEAD with remote
 Merging:
-056f2c0 rename
-f3f4da2 delete
+0ab7224 Clarify
+be82dcf Remove cruft
 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
+c1e95d9 Initial revision
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+ok 11 - --ignore-space-at-eol
 
-# passed all 27 test(s)
-1..27
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6439-merge-co-error-msgs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6439-merge-co-error-msgs/.git/
-expecting success of 6439.1 'setup': 
-	echo one >one &&
-	git add one &&
-	git commit -a -m First &&
-
-	git checkout -b branch &&
-	echo two >two &&
-	echo three >three &&
-	echo four >four &&
-	echo five >five &&
-	git add two three four five &&
-	git commit -m Second &&
-
-	git checkout main &&
-	echo other >two &&
-	echo other >three &&
-	echo other >four &&
-	echo other >five
-
-[main (root-commit) 3083e2d] First
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-Switched to a new branch 'branch'
-[branch c53906c] Second
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 five
- create mode 100644 four
- create mode 100644 three
- create mode 100644 two
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6439.2 'untracked files overwritten by merge (fast and non-fast forward)': 
-	test_must_fail git merge branch 2>out &&
-	test_cmp out expect &&
-	git commit --allow-empty -m empty &&
-	(
-		GIT_MERGE_VERBOSITY=0 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge branch 2>out2
-	) &&
-	echo "Merge with strategy ${GIT_TEST_MERGE_ALGORITHM:-ort} failed." >>expect &&
-	test_cmp out2 expect &&
-	git reset --hard HEAD^
-
-Updating 3083e2d..c53906c
-[main 47a855e] empty
- Author: A U Thor <author@example.com>
-HEAD is now at 3083e2d First
-ok 2 - untracked files overwritten by merge (fast and non-fast forward)
-
-expecting success of 6439.3 'untracked files or local changes overwritten by merge': 
-	git add two &&
-	git add three &&
-	git add four &&
-	test_must_fail git merge branch 2>out &&
-	test_cmp out expect
+*** t6424-merge-unrelated-index-changes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6424-merge-unrelated-index-changes/.git/
+expecting success of 6424.1 'setup trivial merges': 
+	test_seq 1 10 >a &&
+	git add a &&
+	test_tick && git commit -m A &&
 
-Updating 3083e2d..c53906c
-ok 3 - untracked files or local changes overwritten by merge
+	git branch A &&
+	git branch B &&
+	git branch C &&
+	git branch D &&
+	git branch E &&
+	git branch F &&
 
-expecting success of 6439.4 'cannot switch branches because of local changes': 
-	git add five &&
-	mkdir rep &&
-	echo one >rep/one &&
-	echo two >rep/two &&
-	git add rep/one rep/two &&
-	git commit -m Fourth &&
-	git checkout main &&
-	echo uno >rep/one &&
-	echo dos >rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_cmp out expect
+	git checkout B &&
+	echo b >b &&
+	echo 11 >>a &&
+	git add a b &&
+	test_tick && git commit -m B &&
 
-[main d37de72] Fourth
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 five
- create mode 100644 four
- create mode 100644 rep/one
- create mode 100644 rep/two
- create mode 100644 three
- create mode 100644 two
-Already on 'main'
-ok 4 - cannot switch branches because of local changes
+	git checkout C &&
+	echo c >c &&
+	git add c &&
+	test_tick && git commit -m C &&
 
-expecting success of 6439.5 'not uptodate file porcelain checkout error': 
-	git add rep/one rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_cmp out expect
+	git checkout D &&
+	test_seq 2 10 >a &&
+	echo d >d &&
+	git add a d &&
+	test_tick && git commit -m D &&
 
-ok 5 - not uptodate file porcelain checkout error
+	git checkout E &&
+	mkdir subdir &&
+	git mv a subdir/a &&
+	echo e >subdir/e &&
+	git add subdir &&
+	test_tick && git commit -m E &&
 
-expecting success of 6439.6 'not_uptodate_dir porcelain checkout error': 
-	git init uptodate &&
-	cd uptodate &&
-	mkdir rep &&
-	mkdir rep2 &&
-	touch rep/foo &&
-	touch rep2/foo &&
-	git add rep/foo rep2/foo &&
-	git commit -m init &&
-	git checkout -b branch &&
-	git rm rep -r &&
-	git rm rep2 -r &&
-	>rep &&
-	>rep2 &&
-	git add rep rep2 &&
-	git commit -m "added test as a file" &&
-	git checkout main &&
-	>rep/untracked-file &&
-	>rep2/untracked-file &&
-	test_must_fail git checkout branch 2>out &&
-	test_cmp out ../expect
+	git checkout F &&
+	test_tick && git commit --allow-empty -m F
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6439-merge-co-error-msgs/uptodate/.git/
-[main (root-commit) 12cbe1c] init
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 rep/foo
- create mode 100644 rep2/foo
-Switched to a new branch 'branch'
-rm 'rep/foo'
-rm 'rep2/foo'
-[branch 5db55b7] added test as a file
+[master (root-commit) 87af29c] A
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename rep/foo => rep (100%)
- rename rep2/foo => rep2 (100%)
-Switched to branch 'main'
-ok 6 - not_uptodate_dir porcelain checkout error
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6436-merge-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ 1 file changed, 10 insertions(+)
+ create mode 100644 a
+Switched to branch 'B'
+[B ed5d5a6] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[main 7b51d7c] c1
+ 2 files changed, 2 insertions(+)
+ create mode 100644 b
+Switched to branch 'C'
+[C 4fa59ce] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-[main 4e7fedb] c1a
+ create mode 100644 c
+Switched to branch 'D'
+[D c3c5299] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 934056f c0
-[main 48f99e1] c2
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 d
+Switched to branch 'E'
+[E b615563] E
  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
+ 2 files changed, 1 insertion(+)
+ rename a => subdir/a (100%)
+ create mode 100644 subdir/e
+Switched to branch 'F'
+[F 83c2e21] F
  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
+ok 1 - setup trivial merges
 
-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
+expecting success of 6424.2 'ff update': 
+	git reset --hard &&
+	git checkout A^0 &&
 
-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
+	touch random_file && git add random_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
+	git merge E^0 &&
 
-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'.
+	test_must_fail git rev-parse HEAD:random_file &&
+	test "$(git diff --name-only --cached E)" = "random_file" &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file
+
+HEAD is now at 83c2e21 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
@@ -426928,4676 +422639,4572 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 48f99e1 c2
-ok 3 - will overwrite tracked file
+HEAD is now at 87af29c A
+Updating 87af29c..b615563
+Fast-forward
+ a => subdir/a | 0
+ subdir/e      | 1 +
+ 2 files changed, 1 insertion(+)
+ rename a => subdir/a (100%)
+ create mode 100644 subdir/e
+fatal: path 'random_file' exists on disk, but not in 'HEAD'
+HEAD:random_file
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 2 - ff update
 
-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 6424.3 'ff update, important file modified': 
+	git reset --hard &&
+	git checkout A^0 &&
 
-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
+	mkdir subdir &&
+	touch subdir/e &&
+	git add subdir/e &&
 
-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
+	test_must_fail git merge E^0 &&
+	test_path_is_file subdir/e &&
+	git rev-parse --verify :subdir/e &&
+	test_path_is_missing .git/MERGE_HEAD
 
-HEAD is now at 7b51d7c c1
+HEAD is now at b615563 E
+Previous HEAD position was b615563 E
+HEAD is now at 87af29c A
 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
+	subdir/e
+Please commit your changes or stash them before you merge.
+Aborting
+Updating 87af29c..b615563
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 3 - ff update, important file modified
 
-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 6424.4 'resolve, trivial': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	touch random_file && git add random_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
+	test_must_fail git merge -s resolve C^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
+	test_path_is_missing .git/MERGE_HEAD
 
-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
+HEAD is now at 87af29c A
+Previous HEAD position was 87af29c A
+HEAD is now at ed5d5a6 B
 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
+  random_file
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 4 - resolve, trivial
 
-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 6424.5 'resolve, non-trivial': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	touch random_file && git add random_file &&
+
+	test_must_fail git merge -s resolve D^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
+	test_path_is_missing .git/MERGE_HEAD
+
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
 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
+  random_file
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 5 - resolve, non-trivial
 
-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 6424.6 'resolve, trivial, related file removed': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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%)
+	git rm a &&
+	test_path_is_missing a &&
+
+	test_must_fail git merge -s resolve C^0 &&
+
+	test_path_is_missing a &&
+	test_path_is_missing .git/MERGE_HEAD
+
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+rm 'a'
 error: Your local changes to the following files would be overwritten by merge:
-ok 9 - will not overwrite unstaged changes in renamed file
+  a
+ok 6 - resolve, trivial, related file removed
 
-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 6424.7 'resolve, non-trivial, related file removed': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-HEAD is now at 934056f c0
-error: Updating the following directories would lose untracked files in them:
-	sub/f
+	git rm a &&
+	test_path_is_missing a &&
 
-Aborting
-Updating 934056f..55608b7
-ok 10 - will not overwrite untracked subtree
+	# We also ask for recursive in order to turn off the "allow_trivial"
+	# setting in builtin/merge.c, and ensure that resolve really does
+	# correctly fail the merge (I guess this also tests that recursive
+	# correctly fails the merge, but the main thing we are attempting
+	# to test here is resolve and are just using the side effect of
+	# adding recursive to ensure that resolve is actually tested rather
+	# than the trivial merge codepath)
+	test_must_fail git merge -s resolve -s recursive D^0 &&
 
-expecting success of 6436.11 'will not overwrite untracked file in leading path': 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	cp important sub &&
-	cp important sub2 &&
-	test_must_fail git merge sub 2>out &&
-	test_cmp out expect &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important sub &&
-	test_cmp important sub2 &&
-	rm -f sub sub2
+	test_path_is_missing a &&
+	test_path_is_missing .git/MERGE_HEAD
 
-HEAD is now at 934056f c0
-Updating 934056f..55608b7
-ok 11 - will not overwrite untracked file in leading path
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+rm 'a'
+Trying merge strategy resolve...
+Error: Your local changes to the following files would be overwritten by merge
+    a
+Rewinding the tree to pristine...
+error: Your local changes to the following files would be overwritten by merge:
+  a
+Trying merge strategy ort...
+No merge strategy handled the merge.
+ok 7 - resolve, non-trivial, related file removed
 
-checking prerequisite: SYMLINKS
+expecting success of 6424.8 'recursive': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	touch random_file && git add random_file &&
 
-)
-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_must_fail git merge -s recursive C^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
 	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
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+error: Your local changes to the following files would be overwritten by merge:
+  random_file
+Merge with strategy ort failed.
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 8 - recursive
 
-expecting success of 6436.13 'will not be confused by symlink in leading path': 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	test_ln_s_add sub2 sub &&
-	git commit -m ln &&
-	git checkout sub
+expecting success of 6424.9 'recursive, when merge branch matches merge base': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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:
+	touch random_file && git add random_file &&
 
-  6d387d8 ln
+	test_must_fail git merge -s recursive F^0 &&
+	test_path_is_missing .git/MERGE_HEAD
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+error: Your local changes to the following files would be overwritten by merge:
+  random_file
+Merge with strategy ort failed.
+ok 9 - recursive, when merge branch matches merge base
 
- git branch <new-branch-name> 6d387d8
+expecting success of 6424.10 'merge-recursive, when index==head but head!=HEAD': 
+	git reset --hard &&
+	git checkout C^0 &&
 
-HEAD is now at 55608b7 sub
-ok 13 - will not be confused by symlink in leading path
+	# Make index match B
+	git diff C B -- | git apply --cached &&
+	test_when_finished "git clean -fd" &&  # Do not leave untracked around
+	# Merge B & F, with B as "head"
+	git merge-recursive A -- B F > out &&
+	test_grep "Already up to date" out
 
-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 ed5d5a6 B
+Previous HEAD position was ed5d5a6 B
+HEAD is now at 4fa59ce C
+Already up to date.
+Removing c
+Removing out
+ok 10 - merge-recursive, when index==head but head!=HEAD
 
-HEAD is now at 934056f c0
-rm 'c0.c'
-Switched to a new branch 'new'
-D	c0.c
-ok 14 - will not overwrite untracked file on unborn branch
+expecting success of 6424.11 'recursive, when file has staged changes not matching HEAD nor what a merge would give': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	mkdir subdir &&
+	test_seq 1 10 >subdir/a &&
+	git add subdir/a &&
+	git rev-parse --verify :subdir/a >expect &&
 
-ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
+	# We have staged changes; merge should error out
+	test_must_fail git merge -s recursive E^0 2>err &&
+	git rev-parse --verify :subdir/a >actual &&
+	test_cmp expect actual &&
+	test_grep "changes to the following files would be overwritten" err
 
-expecting success of 6436.16 'failed merge leaves unborn branch in the womb': 
-	test_must_fail git rev-parse --verify HEAD
+HEAD is now at 4fa59ce C
+Previous HEAD position was 4fa59ce C
+HEAD is now at ed5d5a6 B
+error: Your local changes to the following files would be overwritten by merge:
+ok 11 - recursive, when file has staged changes not matching HEAD nor what a merge would give
 
-fatal: Needed a single revision
-ok 16 - failed merge leaves unborn branch in the womb
+expecting success of 6424.12 'recursive, when file has staged changes matching what a merge would give': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	mkdir subdir &&
+	test_seq 1 11 >subdir/a &&
+	git add subdir/a &&
+	git rev-parse --verify :subdir/a >expect &&
 
-ok 17 - set up unborn branch and content
+	# We have staged changes; merge should error out
+	test_must_fail git merge -s recursive E^0 2>err &&
+	git rev-parse --verify :subdir/a >actual &&
+	test_cmp expect actual &&
+	test_grep "changes to the following files would be overwritten" err
 
-expecting success of 6436.18 'will not clobber WT/index when merging into unborn': 
-	git merge main &&
-	grep foo tracked-file &&
-	git show :tracked-file >expect &&
-	grep foo expect &&
-	grep bar untracked-file
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+error: Your local changes to the following files would be overwritten by merge:
+ok 12 - recursive, when file has staged changes matching what a merge would give
 
-foo
-foo
-bar
-ok 18 - will not clobber WT/index when merging into unborn
+expecting success of 6424.13 'octopus, unrelated file touched': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6433-merge-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	touch random_file && git add random_file &&
 
-[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
+	test_must_fail git merge C^0 D^0 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	git rev-parse --verify :random_file &&
+	test_path_exists random_file
 
-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
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+Error: Your local changes to the following files would be overwritten by merge
+    random_file
+Merge with strategy octopus failed.
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 13 - octopus, unrelated file touched
 
-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 6424.14 'octopus, related file removed': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	git rm b &&
 
-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
+	test_must_fail git merge C^0 D^0 &&
+	test_path_is_missing b &&
+	test_must_fail git rev-parse --verify :b &&
+	test_path_is_missing .git/MERGE_HEAD
+
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+rm 'b'
+Error: Your local changes to the following files would be overwritten by merge
+    b
+Merge with strategy octopus failed.
 fatal: Needed a single revision
-ok 3 - merge an octopus, fast-forward (ff)
+ok 14 - octopus, related file removed
 
-expecting success of 6433.4 'merge octopus, non-fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git merge --no-ff left right &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse one three four | sort >expect &&
-	test_cmp expect actual
+expecting success of 6424.15 'octopus, related file modified': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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)
+	echo 12 >>a && git add a &&
+	git rev-parse --verify :a >expect &&
 
-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
+	test_must_fail git merge C^0 D^0 &&
+	test_path_is_file a &&
+	git rev-parse --verify :a >actual &&
+	test_cmp expect actual &&
+	test_path_is_missing .git/MERGE_HEAD
 
-Reset branch 'main'
-Trying simple merge with left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 5 - merge octopus, fast-forward (does not ff)
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+Error: Your local changes to the following files would be overwritten by merge
+    a
+Merge with strategy octopus failed.
+ok 15 - octopus, related file modified
 
-expecting success of 6433.6 'merge octopus, non-fast-forward': 
-	t3033_reset &&
-	git merge --no-ff left right &&
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
+expecting success of 6424.16 'ours': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	touch random_file && git add random_file &&
 
-expecting success of 6433.7 'merge FETCH_HEAD octopus into void': 
-	t3033_reset &&
-	git checkout --orphan test &&
-	git rm -fr . &&
-	git fetch . left right &&
-	test_must_fail git merge FETCH_HEAD &&
-	test_must_fail git rev-parse --verify HEAD &&
-	git diff --quiet &&
-	test_must_fail git rev-parse HEAD
+	test_must_fail git merge -s ours C^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
+	test_path_is_missing .git/MERGE_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
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+Merge with strategy ours failed.
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 16 - ours
 
-expecting success of 6433.8 'merge FETCH_HEAD octopus fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git fetch . left right &&
-	git merge FETCH_HEAD &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^3 &&
-	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
-	git rev-parse three four | sort >expect &&
-	test_cmp expect actual
+expecting success of 6424.17 'subtree': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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)
+	touch random_file && git add random_file &&
 
-expecting success of 6433.9 'merge FETCH_HEAD octopus non-fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git fetch . left right &&
-	git merge --no-ff FETCH_HEAD &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse one three four | sort >expect &&
-	test_cmp expect actual
+	test_must_fail git merge -s subtree E^0 &&
+	test_path_is_file random_file &&
+	git rev-parse --verify :random_file &&
+	test_path_is_missing .git/MERGE_HEAD
 
-Reset branch 'main'
-HEAD is now at d79ce16 one
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 9 - merge FETCH_HEAD octopus non-fast-forward (ff)
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+error: Your local changes to the following files would be overwritten by merge:
+  random_file
+Merge with strategy subtree failed.
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 17 - subtree
 
-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
+expecting success of 6424.18 'avoid failure due to stat-dirty files': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-Reset branch 'main'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 10 - merge FETCH_HEAD octopus fast-forward (does not ff)
+	# Make "a" be stat-dirty
+	test-tool chmtime =+1 a &&
 
-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
+	# stat-dirty file should not prevent stash creation in builtin/merge.c
+	git merge -s resolve -s recursive D^0
 
-Reset branch 'main'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 11 - merge FETCH_HEAD octopus non-fast-forward
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+Trying merge strategy resolve...
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging a
+Merge made by the 'resolve' strategy.
+ a | 1 -
+ d | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 d
+ok 18 - avoid failure due to stat-dirty files
 
-expecting success of 6433.12 'refuse two-project merge by default': 
-	t3033_reset &&
-	git reset --hard four &&
-	test_must_fail git merge five
+expecting success of 6424.19 'with multiple strategies, recursive or ort failure do not early abort': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-Reset branch 'main'
-HEAD is now at bd0edcc four
-fatal: refusing to merge unrelated histories
-ok 12 - refuse two-project merge by default
+	test_seq 0 10 >a &&
+	git add a &&
+	git rev-parse :a >expect &&
 
-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 &&
+	sane_unset GIT_TEST_MERGE_ALGORITHM &&
+	test_must_fail git merge -s recursive -s ort -s octopus C^0 >output 2>&1 &&
+
+	grep "Trying merge strategy recursive..." output &&
+	grep "Trying merge strategy ort..." output &&
+	grep "Trying merge strategy octopus..." output &&
+	grep "No merge strategy handled the merge." output &&
+
+	# Changes to "a" should remain staged
+	git rev-parse :a >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
+HEAD is now at c1fdbe2 Merge commit 'D^0' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
+  c1fdbe2 Merge commit 'D^0' into HEAD
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> c1fdbe2
 
-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
+HEAD is now at ed5d5a6 B
+Trying merge strategy recursive...
+Trying merge strategy ort...
+Trying merge strategy octopus...
+No merge strategy handled the merge.
+ok 19 - with multiple strategies, recursive or ort failure do not early abort
 
-# passed all 15 test(s)
-1..15
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6300-for-each-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6300-for-each-ref/.git/
-expecting success of 6300.1 'setup': 
-	# setup .mailmap
-	cat >.mailmap <<-EOF &&
-	A Thor <athor@example.com> A U Thor <author@example.com>
-	C Mitter <cmitter@example.com> C O Mitter <committer@example.com>
-	EOF
-
-	setdate_and_increment &&
-	echo "Using $datestamp" > one &&
-	git add one &&
-	git commit -m "Initial" &&
-	git branch -M main &&
-	setdate_and_increment &&
-	git tag -a -m "Tagging at $datestamp" testtag &&
-	git update-ref refs/remotes/origin/main main &&
-	git remote add origin nowhere &&
-	git config branch.main.remote origin &&
-	git config branch.main.merge refs/heads/main &&
-	git remote add myfork elsewhere &&
-	git config remote.pushdefault myfork &&
-	git config push.default current
+*** t6435-merge-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6435-merge-sparse/.git/
+expecting success of 6435.1 'setup': 
+	test_file checked-out init &&
+	test_file modify_delete modify_delete_init &&
+	test_commit_this init &&
+	test_file modify_delete modify_delete_theirs &&
+	test_commit_this theirs &&
+	git reset --hard init &&
+	git rm modify_delete &&
+	test_commit_this ours &&
+	git config core.sparseCheckout true &&
+	mkdir .git/info &&
+	echo "/checked-out" >.git/info/sparse-checkout &&
+	git reset --hard &&
+	test_must_fail git merge theirs
 
-[master (root-commit) ea12284] Initial
+[master (root-commit) badb3ac] init
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
+ 2 files changed, 2 insertions(+)
+ create mode 100644 checked-out
+ create mode 100644 modify_delete
+[master 1c06c2f] theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at badb3ac init
+rm 'modify_delete'
+[master 3dfe889] ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 modify_delete
+HEAD is now at 3dfe889 ours
+CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
 ok 1 - setup
 
-expecting success of 6300.2 'basic atom: refs/heads/main refname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 2 - basic atom: refs/heads/main refname
+expecting success of 6435.2 'reset --hard works after the conflict': 
+	git reset --hard
 
-expecting success of 6300.3 'basic atom: refs/heads/main refname:': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 3 - basic atom: refs/heads/main refname:
+HEAD is now at 3dfe889 ours
+ok 2 - reset --hard works after the conflict
 
-expecting success of 6300.4 'basic atom: refs/heads/main refname:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 4 - basic atom: refs/heads/main refname:short
+expecting success of 6435.3 'is reset properly': 
+	git status --porcelain -- modify_delete >out &&
+	test_must_be_empty out &&
+	test_path_is_missing modify_delete
 
-expecting success of 6300.5 'basic atom: refs/heads/main refname:lstrip=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 5 - basic atom: refs/heads/main refname:lstrip=1
+ok 3 - is reset properly
 
-expecting success of 6300.6 'basic atom: refs/heads/main refname:lstrip=2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 6 - basic atom: refs/heads/main refname:lstrip=2
+expecting success of 6435.4 'setup: conflict back': 
+	test_must_fail git merge theirs
 
-expecting success of 6300.7 'basic atom: refs/heads/main refname:lstrip=-1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 7 - basic atom: refs/heads/main refname:lstrip=-1
+CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - setup: conflict back
 
-expecting success of 6300.8 'basic atom: refs/heads/main refname:lstrip=-2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 8 - basic atom: refs/heads/main refname:lstrip=-2
+expecting success of 6435.5 'Merge abort works after the conflict': 
+	git merge --abort
 
-expecting success of 6300.9 'basic atom: refs/heads/main refname:rstrip=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 9 - basic atom: refs/heads/main refname:rstrip=1
+ok 5 - Merge abort works after the conflict
 
-expecting success of 6300.10 'basic atom: refs/heads/main refname:rstrip=2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 10 - basic atom: refs/heads/main refname:rstrip=2
+expecting success of 6435.6 'is aborted properly': 
+	git status --porcelain -- modify_delete >out &&
+	test_must_be_empty out &&
+	test_path_is_missing modify_delete
 
-expecting success of 6300.11 'basic atom: refs/heads/main refname:rstrip=-1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 11 - basic atom: refs/heads/main refname:rstrip=-1
+ok 6 - is aborted properly
 
-expecting success of 6300.12 'basic atom: refs/heads/main refname:rstrip=-2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 12 - basic atom: refs/heads/main refname:rstrip=-2
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6429-merge-sequence-rename-caching.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/.git/
+expecting success of 6429.1 'caching renames does not preclude finding new ones': 
+	git init caching-renames-and-new-renames &&
+	(
+		cd caching-renames-and-new-renames &&
 
-expecting success of 6300.13 'basic atom: refs/heads/main refname:strip=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 13 - basic atom: refs/heads/main refname:strip=1
+		test_seq 2 10 >numbers &&
+		test_seq 2 10 >values &&
+		git add numbers values &&
+		git commit -m orig &&
 
-expecting success of 6300.14 'basic atom: refs/heads/main refname:strip=2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 14 - basic atom: refs/heads/main refname:strip=2
+		git branch upstream &&
+		git branch topic &&
 
-expecting success of 6300.15 'basic atom: refs/heads/main refname:strip=-1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 15 - basic atom: refs/heads/main refname:strip=-1
+		git switch upstream &&
+		test_seq 1 10 >numbers &&
+		test_seq 1 10 >values &&
+		git add numbers values &&
+		git commit -m "Tweaked both files" &&
 
-expecting success of 6300.16 'basic atom: refs/heads/main refname:strip=-2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 16 - basic atom: refs/heads/main refname:strip=-2
+		git switch topic &&
 
-expecting success of 6300.17 'basic atom: refs/heads/main upstream': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 17 - basic atom: refs/heads/main upstream
+		test_seq 2 12 >numbers &&
+		git add numbers &&
+		git mv numbers sequence &&
+		git commit -m A &&
 
-expecting success of 6300.18 'basic atom: refs/heads/main upstream:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 18 - basic atom: refs/heads/main upstream:short
+		test_seq 2 12 >values &&
+		git add values &&
+		git mv values scruples &&
+		git commit -m B &&
 
-expecting success of 6300.19 'basic atom: refs/heads/main upstream:lstrip=2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 19 - basic atom: refs/heads/main upstream:lstrip=2
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.20 'basic atom: refs/heads/main upstream:lstrip=-2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 20 - basic atom: refs/heads/main upstream:lstrip=-2
+		git switch upstream &&
 
-expecting success of 6300.21 'basic atom: refs/heads/main upstream:rstrip=2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 21 - basic atom: refs/heads/main upstream:rstrip=2
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.22 'basic atom: refs/heads/main upstream:rstrip=-2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 22 - basic atom: refs/heads/main upstream:rstrip=-2
+		git ls-files >tracked-files &&
+		test_line_count = 2 tracked-files &&
+		test_seq 1 12 >expect &&
+		test_cmp expect sequence &&
+		test_cmp expect scruples
+	)
 
-expecting success of 6300.23 'basic atom: refs/heads/main upstream:strip=2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 23 - basic atom: refs/heads/main upstream:strip=2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/caching-renames-and-new-renames/.git/
+[master (root-commit) 29f8a28] orig
+ Author: A U Thor <author@example.com>
+ 2 files changed, 18 insertions(+)
+ create mode 100644 numbers
+ create mode 100644 values
+Switched to branch 'upstream'
+[upstream a12dbe8] Tweaked both files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to branch 'topic'
+[topic e84d01a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename numbers => sequence (76%)
+[topic 1354771] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename values => scruples (76%)
+Switched to branch 'upstream'
+Switched to branch 'topic'
+ok 1 - caching renames does not preclude finding new ones
 
-expecting success of 6300.24 'basic atom: refs/heads/main upstream:strip=-2': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 24 - basic atom: refs/heads/main upstream:strip=-2
+expecting success of 6429.2 'cherry-pick both a commit and its immediate revert': 
+	git init pick-commit-and-its-immediate-revert &&
+	(
+		cd pick-commit-and-its-immediate-revert &&
 
-expecting success of 6300.25 'basic atom: refs/heads/main push': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 25 - basic atom: refs/heads/main push
+		test_seq 11 30 >numbers &&
+		git add numbers &&
+		git commit -m orig &&
 
-expecting success of 6300.26 'basic atom: refs/heads/main push:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 26 - basic atom: refs/heads/main push:short
+		git branch upstream &&
+		git branch topic &&
 
-expecting success of 6300.27 'basic atom: refs/heads/main push:lstrip=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 27 - basic atom: refs/heads/main push:lstrip=1
+		git switch upstream &&
+		test_seq 1 30 >numbers &&
+		git add numbers &&
+		git mv numbers sequence &&
+		git commit -m "Renamed (and modified) numbers -> sequence" &&
 
-expecting success of 6300.28 'basic atom: refs/heads/main push:lstrip=-1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 28 - basic atom: refs/heads/main push:lstrip=-1
+		git switch topic &&
 
-expecting success of 6300.29 'basic atom: refs/heads/main push:rstrip=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 29 - basic atom: refs/heads/main push:rstrip=1
+		test_seq 11 13 >numbers &&
+		git add numbers &&
+		git commit -m A &&
 
-expecting success of 6300.30 'basic atom: refs/heads/main push:rstrip=-1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 30 - basic atom: refs/heads/main push:rstrip=-1
+		git revert HEAD &&
 
-expecting success of 6300.31 'basic atom: refs/heads/main push:strip=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 31 - basic atom: refs/heads/main push:strip=1
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.32 'basic atom: refs/heads/main push:strip=-1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 32 - basic atom: refs/heads/main push:strip=-1
+		git switch upstream &&
 
-expecting success of 6300.33 'basic atom: refs/heads/main objecttype': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 33 - basic atom: refs/heads/main objecttype
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.34 'basic atom: refs/heads/main objectsize': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 34 - basic atom: refs/heads/main objectsize
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.35 'basic atom: refs/heads/main objectsize:disk': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 35 - basic atom: refs/heads/main objectsize:disk
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 1 calls
+	)
 
-expecting success of 6300.36 'basic atom: refs/heads/main deltabase': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 36 - basic atom: refs/heads/main deltabase
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/pick-commit-and-its-immediate-revert/.git/
+[master (root-commit) 4bf57ba] orig
+ Author: A U Thor <author@example.com>
+ 1 file changed, 20 insertions(+)
+ create mode 100644 numbers
+Switched to branch 'upstream'
+[upstream ab0f48c] Renamed (and modified) numbers -> sequence
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ rename numbers => sequence (74%)
+Switched to branch 'topic'
+[topic 0105939] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 17 deletions(-)
+[topic 5ed36dd] Revert "A"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 17 insertions(+)
+Switched to branch 'upstream'
+Switched to branch 'topic'
+ok 2 - cherry-pick both a commit and its immediate revert
 
-expecting success of 6300.37 'basic atom: refs/heads/main objectname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 37 - basic atom: refs/heads/main objectname
+expecting success of 6429.3 'rename same file identically, then reintroduce it': 
+	git init rename-rename-1to1-then-add-old-filename &&
+	(
+		cd rename-rename-1to1-then-add-old-filename &&
 
-expecting success of 6300.38 'basic atom: refs/heads/main objectname:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 38 - basic atom: refs/heads/main objectname:short
+		test_seq 3 8 >sequence &&
+		git add sequence &&
+		git commit -m orig &&
 
-expecting success of 6300.39 'basic atom: refs/heads/main objectname:short=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 39 - basic atom: refs/heads/main objectname:short=1
+		git branch upstream &&
+		git branch topic &&
 
-expecting success of 6300.40 'basic atom: refs/heads/main objectname:short=10': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 40 - basic atom: refs/heads/main objectname:short=10
+		git switch upstream &&
+		test_seq 1 8 >sequence &&
+		git add sequence &&
+		git mv sequence values &&
+		git commit -m "Renamed (and modified) sequence -> values" &&
 
-expecting success of 6300.41 'basic atom: refs/heads/main tree': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 41 - basic atom: refs/heads/main tree
+		git switch topic &&
 
-expecting success of 6300.42 'basic atom: refs/heads/main tree:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 42 - basic atom: refs/heads/main tree:short
+		test_seq 3 10 >sequence &&
+		git add sequence &&
+		git mv sequence values &&
+		git commit -m A &&
 
-expecting success of 6300.43 'basic atom: refs/heads/main tree:short=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 43 - basic atom: refs/heads/main tree:short=1
+		test_write_lines A B C D E F G H I J >sequence &&
+		git add sequence &&
+		git commit -m B &&
 
-expecting success of 6300.44 'basic atom: refs/heads/main tree:short=10': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 44 - basic atom: refs/heads/main tree:short=10
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.45 'basic atom: refs/heads/main parent': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 45 - basic atom: refs/heads/main parent
+		git switch upstream &&
 
-expecting success of 6300.46 'basic atom: refs/heads/main parent:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 46 - basic atom: refs/heads/main parent:short
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.47 'basic atom: refs/heads/main parent:short=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 47 - basic atom: refs/heads/main parent:short=1
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.48 'basic atom: refs/heads/main parent:short=10': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 48 - basic atom: refs/heads/main parent:short=10
+		git ls-files >tracked &&
+		test_line_count = 2 tracked &&
+		test_path_is_file values &&
+		test_path_is_file sequence &&
 
-expecting success of 6300.49 'basic atom: refs/heads/main numparent': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 49 - basic atom: refs/heads/main numparent
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls
+	)
 
-expecting success of 6300.50 'basic atom: refs/heads/main object': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 50 - basic atom: refs/heads/main object
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/rename-rename-1to1-then-add-old-filename/.git/
+[master (root-commit) d064880] orig
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+)
+ create mode 100644 sequence
+Switched to branch 'upstream'
+[upstream 685755c] Renamed (and modified) sequence -> values
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename sequence => values (75%)
+Switched to branch 'topic'
+[topic a049c8f] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename sequence => values (70%)
+[topic ca60f7a] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 sequence
+Switched to branch 'upstream'
+Switched to branch 'topic'
+ok 3 - rename same file identically, then reintroduce it
 
-expecting success of 6300.51 'basic atom: refs/heads/main type': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 51 - basic atom: refs/heads/main type
+expecting success of 6429.4 'rename same file identically, then add file to old dir': 
+	git init rename-rename-1to1-then-add-file-to-old-dir &&
+	(
+		cd rename-rename-1to1-then-add-file-to-old-dir &&
 
-expecting success of 6300.52 'basic atom: refs/heads/main raw': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 52 - basic atom: refs/heads/main raw
+		mkdir olddir/ &&
+		test_seq 3 8 >olddir/valuesZ &&
+		test_seq 3 8 >olddir/valuesY &&
+		test_seq 3 8 >olddir/valuesX &&
+		git add olddir &&
+		git commit -m orig &&
 
-expecting success of 6300.53 'basic atom: refs/heads/main *objectname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 53 - basic atom: refs/heads/main *objectname
+		git branch upstream &&
+		git branch topic &&
 
-expecting success of 6300.54 'basic atom: refs/heads/main *objecttype': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 54 - basic atom: refs/heads/main *objecttype
+		git switch upstream &&
+		test_seq 1 8 >olddir/valuesZ &&
+		test_seq 1 8 >olddir/valuesY &&
+		test_seq 1 8 >olddir/valuesX &&
+		git add olddir &&
+		mkdir dirA &&
+		git mv olddir/valuesZ olddir/valuesY dirA &&
+		git mv olddir/ dirB/ &&
+		git commit -m "Renamed (and modified) values*" &&
 
-expecting success of 6300.55 'basic atom: refs/heads/main author': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 55 - basic atom: refs/heads/main author
+		git switch topic &&
 
-expecting success of 6300.56 'basic atom: refs/heads/main authorname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 56 - basic atom: refs/heads/main authorname
+		test_seq 3 10 >olddir/valuesZ &&
+		test_seq 3 10 >olddir/valuesY &&
+		git add olddir &&
+		mkdir dirA &&
+		git mv olddir/valuesZ olddir/valuesY dirA &&
+		git commit -m A &&
 
-expecting success of 6300.57 'basic atom: refs/heads/main authorname:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 57 - basic atom: refs/heads/main authorname:mailmap
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m B &&
 
-expecting success of 6300.58 'basic atom: refs/heads/main authoremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 58 - basic atom: refs/heads/main authoremail
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.59 'basic atom: refs/heads/main authoremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 59 - basic atom: refs/heads/main authoremail:trim
+		git switch upstream &&
+		git config merge.directoryRenames true &&
 
-expecting success of 6300.60 'basic atom: refs/heads/main authoremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 60 - basic atom: refs/heads/main authoremail:localpart
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.61 'basic atom: refs/heads/main authoremail:trim,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 61 - basic atom: refs/heads/main authoremail:trim,localpart
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.62 'basic atom: refs/heads/main authoremail:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 62 - basic atom: refs/heads/main authoremail:mailmap
+		git ls-files >tracked &&
+		test_line_count = 4 tracked &&
+		test_path_is_file dirA/valuesZ &&
+		test_path_is_file dirA/valuesY &&
+		test_path_is_file dirB/valuesX &&
+		test_path_is_file dirB/newfile &&
 
-expecting success of 6300.63 'basic atom: refs/heads/main authoremail:mailmap,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 63 - basic atom: refs/heads/main authoremail:mailmap,trim
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 3 calls
+	)
 
-expecting success of 6300.64 'basic atom: refs/heads/main authoremail:trim,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 64 - basic atom: refs/heads/main authoremail:trim,mailmap
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/rename-rename-1to1-then-add-file-to-old-dir/.git/
+[master (root-commit) c0deec2] orig
+ Author: A U Thor <author@example.com>
+ 3 files changed, 18 insertions(+)
+ create mode 100644 olddir/valuesX
+ create mode 100644 olddir/valuesY
+ create mode 100644 olddir/valuesZ
+Switched to branch 'upstream'
+[upstream 19abd35] Renamed (and modified) values*
+ Author: A U Thor <author@example.com>
+ 3 files changed, 6 insertions(+)
+ rename {olddir => dirA}/valuesY (75%)
+ rename {olddir => dirA}/valuesZ (75%)
+ rename {olddir => dirB}/valuesX (75%)
+Switched to branch 'topic'
+[topic bea1a85] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ rename {olddir => dirA}/valuesY (70%)
+ rename {olddir => dirA}/valuesZ (70%)
+[topic c04e0a1] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 olddir/newfile
+Switched to branch 'upstream'
+Switched to branch 'topic'
+ok 4 - rename same file identically, then add file to old dir
 
-expecting success of 6300.65 'basic atom: refs/heads/main authoremail:mailmap,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 65 - basic atom: refs/heads/main authoremail:mailmap,localpart
+expecting success of 6429.5 'cached dir rename does not prevent noticing later conflict': 
+	git init dir-rename-cache-not-occluding-later-conflict &&
+	(
+		cd dir-rename-cache-not-occluding-later-conflict &&
 
-expecting success of 6300.66 'basic atom: refs/heads/main authoremail:localpart,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 66 - basic atom: refs/heads/main authoremail:localpart,mailmap
+		mkdir olddir &&
+		test_seq 3 10 >olddir/a &&
+		test_seq 3 10 >olddir/b &&
+		git add olddir &&
+		git commit -m orig &&
 
-expecting success of 6300.67 'basic atom: refs/heads/main authoremail:mailmap,trim,localpart,mailmap,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 67 - basic atom: refs/heads/main authoremail:mailmap,trim,localpart,mailmap,trim
+		git branch upstream &&
+		git branch topic &&
 
-expecting success of 6300.68 'basic atom: refs/heads/main authordate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 68 - basic atom: refs/heads/main authordate
+		git switch upstream &&
+		test_seq 3 10 >olddir/a &&
+		test_seq 3 10 >olddir/b &&
+		git add olddir &&
+		git mv olddir newdir &&
+		git commit -m "Dir renamed" &&
 
-expecting success of 6300.69 'basic atom: refs/heads/main committer': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 69 - basic atom: refs/heads/main committer
+		git switch topic &&
 
-expecting success of 6300.70 'basic atom: refs/heads/main committername': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 70 - basic atom: refs/heads/main committername
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m A &&
 
-expecting success of 6300.71 'basic atom: refs/heads/main committername:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 71 - basic atom: refs/heads/main committername:mailmap
+		test_seq 1 8 >olddir/a &&
+		test_seq 1 8 >olddir/b &&
+		git add olddir &&
+		git mv olddir otherdir &&
+		git commit -m B &&
 
-expecting success of 6300.72 'basic atom: refs/heads/main committeremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 72 - basic atom: refs/heads/main committeremail
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.73 'basic atom: refs/heads/main committeremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 73 - basic atom: refs/heads/main committeremail:trim
+		git switch upstream &&
+		git config merge.directoryRenames true &&
 
-expecting success of 6300.74 'basic atom: refs/heads/main committeremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 74 - basic atom: refs/heads/main committeremail:localpart
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.75 'basic atom: refs/heads/main committeremail:localpart,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 75 - basic atom: refs/heads/main committeremail:localpart,trim
+		test_must_fail git replay --onto HEAD upstream~1..topic >output &&
 
-expecting success of 6300.76 'basic atom: refs/heads/main committeremail:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 76 - basic atom: refs/heads/main committeremail:mailmap
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls
+	)
 
-expecting success of 6300.77 'basic atom: refs/heads/main committeremail:mailmap,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 77 - basic atom: refs/heads/main committeremail:mailmap,trim
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/dir-rename-cache-not-occluding-later-conflict/.git/
+[master (root-commit) de8bf0f] orig
+ Author: A U Thor <author@example.com>
+ 2 files changed, 16 insertions(+)
+ create mode 100644 olddir/a
+ create mode 100644 olddir/b
+Switched to branch 'upstream'
+[upstream 525dfa0] Dir renamed
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {olddir => newdir}/a (100%)
+ rename {olddir => newdir}/b (100%)
+Switched to branch 'topic'
+[topic 2c93a7d] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 olddir/newfile
+[topic 81a8875] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+ rename {olddir => otherdir}/a (70%)
+ rename {olddir => otherdir}/b (70%)
+ rename {olddir => otherdir}/newfile (100%)
+Switched to branch 'upstream'
+ok 5 - cached dir rename does not prevent noticing later conflict
 
-expecting success of 6300.78 'basic atom: refs/heads/main committeremail:trim,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 78 - basic atom: refs/heads/main committeremail:trim,mailmap
+expecting success of 6429.6 'dir rename unneeded, then add new file to old dir': 
+	test_setup_upstream_rename dir-rename-unneeded-until-new-file &&
+	(
+		cd dir-rename-unneeded-until-new-file &&
 
-expecting success of 6300.79 'basic atom: refs/heads/main committeremail:mailmap,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 79 - basic atom: refs/heads/main committeremail:mailmap,localpart
+		git switch topic &&
 
-expecting success of 6300.80 'basic atom: refs/heads/main committeremail:localpart,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 80 - basic atom: refs/heads/main committeremail:localpart,mailmap
+		test_seq 3 10 >relevant-rename &&
+		git add relevant-rename &&
+		git commit -m A &&
 
-expecting success of 6300.81 'basic atom: refs/heads/main committeremail:trim,mailmap,trim,trim,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 81 - basic atom: refs/heads/main committeremail:trim,mailmap,trim,trim,localpart
+		echo foo >olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m B &&
 
-expecting success of 6300.82 'basic atom: refs/heads/main committerdate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 82 - basic atom: refs/heads/main committerdate
+		echo bar >>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m C &&
 
-expecting success of 6300.83 'basic atom: refs/heads/main tag': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 83 - basic atom: refs/heads/main tag
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.84 'basic atom: refs/heads/main tagger': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 84 - basic atom: refs/heads/main tagger
+		git switch upstream &&
+		git config merge.directoryRenames true &&
 
-expecting success of 6300.85 'basic atom: refs/heads/main taggername': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 85 - basic atom: refs/heads/main taggername
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.86 'basic atom: refs/heads/main taggeremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 86 - basic atom: refs/heads/main taggeremail
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.87 'basic atom: refs/heads/main taggeremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 87 - basic atom: refs/heads/main taggeremail:trim
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls &&
 
-expecting success of 6300.88 'basic atom: refs/heads/main taggeremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 88 - basic atom: refs/heads/main taggeremail:localpart
+		git ls-files >tracked &&
+		test_line_count = 5 tracked &&
+		test_path_is_missing olddir/newfile &&
+		test_path_is_file newdir/newfile
+	)
 
-expecting success of 6300.89 'basic atom: refs/heads/main taggerdate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 89 - basic atom: refs/heads/main taggerdate
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/dir-rename-unneeded-until-new-file/.git/
+[master (root-commit) af0596a] orig
+ Author: A U Thor <author@example.com>
+ 4 files changed, 26 insertions(+)
+ create mode 100644 olddir/a
+ create mode 100644 olddir/b
+ create mode 100644 relevant-rename
+ create mode 100644 somefile
+Switched to branch 'upstream'
+[upstream c545414] Dir renamed
+ Author: A U Thor <author@example.com>
+ 4 files changed, 6 insertions(+)
+ rename {olddir => newdir}/a (87%)
+ rename {olddir => newdir}/b (87%)
+ rename relevant-rename => renamed (75%)
+Switched to branch 'topic'
+[topic 63565df] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[topic 8540faf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 olddir/newfile
+[topic f859e8f] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'upstream'
+Switched to branch 'topic'
+ok 6 - dir rename unneeded, then add new file to old dir
 
-expecting success of 6300.90 'basic atom: refs/heads/main creator': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 90 - basic atom: refs/heads/main creator
+expecting success of 6429.7 'dir rename unneeded, then rename existing file into old dir': 
+	test_setup_upstream_rename dir-rename-unneeded-until-file-moved-inside &&
+	(
+		cd dir-rename-unneeded-until-file-moved-inside &&
 
-expecting success of 6300.91 'basic atom: refs/heads/main creatordate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 91 - basic atom: refs/heads/main creatordate
+		git switch topic &&
 
-expecting success of 6300.92 'basic atom: refs/heads/main subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 92 - basic atom: refs/heads/main subject
+		test_seq 3 10 >relevant-rename &&
+		git add relevant-rename &&
+		git commit -m A &&
 
-expecting success of 6300.93 'basic atom: refs/heads/main subject:sanitize': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 93 - basic atom: refs/heads/main subject:sanitize
+		test_seq 1 10 >somefile &&
+		git add somefile &&
+		git mv somefile olddir/newfile &&
+		git commit -m B &&
 
-expecting success of 6300.94 'basic atom: refs/heads/main contents:subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 94 - basic atom: refs/heads/main contents:subject
+		test_seq 1 12 >olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m C &&
 
-expecting success of 6300.95 'basic atom: refs/heads/main body': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 95 - basic atom: refs/heads/main body
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.96 'basic atom: refs/heads/main contents:body': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 96 - basic atom: refs/heads/main contents:body
+		git switch upstream &&
+		git config merge.directoryRenames true &&
 
-expecting success of 6300.97 'basic atom: refs/heads/main contents:signature': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 97 - basic atom: refs/heads/main contents:signature
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.98 'basic atom: refs/heads/main contents': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 98 - basic atom: refs/heads/main contents
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.99 'basic atom: refs/heads/main contents:size': 
-			type=$(git cat-file -t "$ref") &&
-			case $type in
-			tag)
-				# We cannot use $3 as it expects sanitize_pgp to run
-				git cat-file tag $ref >out &&
-				expect=$(tail -n +6 out | wc -c) &&
-				rm -f out ;;
-			tree | blob)
-				expect="" ;;
-			commit)
-				: "use the calculated expect" ;;
-			*)
-				BUG "unknown object type" ;;
-			esac &&
-			# Leave $expect unquoted to lose possible leading whitespaces
-			echo $expect >expected &&
-			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
-			test_cmp expected actual
-		
-ok 99 - basic atom: refs/heads/main contents:size
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 3 calls &&
 
-expecting success of 6300.100 'basic atom: refs/heads/main HEAD': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 100 - basic atom: refs/heads/main HEAD
+		test_path_is_missing somefile &&
+		test_path_is_missing olddir/newfile &&
+		test_path_is_file newdir/newfile &&
+		git ls-files >tracked &&
+		test_line_count = 4 tracked
+	)
 
-expecting success of 6300.101 'basic atom: refs/tags/testtag refname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 101 - basic atom: refs/tags/testtag refname
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/dir-rename-unneeded-until-file-moved-inside/.git/
+[master (root-commit) af0596a] orig
+ Author: A U Thor <author@example.com>
+ 4 files changed, 26 insertions(+)
+ create mode 100644 olddir/a
+ create mode 100644 olddir/b
+ create mode 100644 relevant-rename
+ create mode 100644 somefile
+Switched to branch 'upstream'
+[upstream c545414] Dir renamed
+ Author: A U Thor <author@example.com>
+ 4 files changed, 6 insertions(+)
+ rename {olddir => newdir}/a (87%)
+ rename {olddir => newdir}/b (87%)
+ rename relevant-rename => renamed (75%)
+Switched to branch 'topic'
+[topic 63565df] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[topic 538c5a2] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ rename somefile => olddir/newfile (57%)
+[topic f3a758f] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'upstream'
+Switched to branch 'topic'
+ok 7 - dir rename unneeded, then rename existing file into old dir
 
-expecting success of 6300.102 'basic atom: refs/tags/testtag refname:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 102 - basic atom: refs/tags/testtag refname:short
+expecting success of 6429.8 'caching renames only on upstream side, part 1': 
+	test_setup_topic_rename cache-renames-only-upstream-add-file &&
+	(
+		cd cache-renames-only-upstream-add-file &&
 
-expecting success of 6300.103 'basic atom: refs/tags/testtag upstream': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 103 - basic atom: refs/tags/testtag upstream
+		git switch upstream &&
 
-expecting success of 6300.104 'basic atom: refs/tags/testtag push': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 104 - basic atom: refs/tags/testtag push
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m "Add newfile" &&
 
-expecting success of 6300.105 'basic atom: refs/tags/testtag objecttype': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 105 - basic atom: refs/tags/testtag objecttype
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.106 'basic atom: refs/tags/testtag objectsize': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 106 - basic atom: refs/tags/testtag objectsize
+		git switch upstream &&
 
-expecting success of 6300.107 'basic atom: refs/tags/testtag objectsize:disk': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 107 - basic atom: refs/tags/testtag objectsize:disk
+		git config merge.directoryRenames true &&
 
-expecting success of 6300.108 'basic atom: refs/tags/testtag *objectsize:disk': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 108 - basic atom: refs/tags/testtag *objectsize:disk
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.109 'basic atom: refs/tags/testtag deltabase': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 109 - basic atom: refs/tags/testtag deltabase
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.110 'basic atom: refs/tags/testtag *deltabase': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 110 - basic atom: refs/tags/testtag *deltabase
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 1 calls &&
 
-expecting success of 6300.111 'basic atom: refs/tags/testtag objectname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 111 - basic atom: refs/tags/testtag objectname
+		git ls-files >tracked &&
+		test_line_count = 5 tracked &&
+		test_path_is_missing newdir/unrelated-file &&
+		test_path_is_file olddir/unrelated-file &&
+		test_path_is_file newdir/newfile &&
+		test_path_is_file newdir/b &&
+		test_path_is_file newdir/a &&
+		test_path_is_file somefile
+	)
 
-expecting success of 6300.112 'basic atom: refs/tags/testtag objectname:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 112 - basic atom: refs/tags/testtag objectname:short
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/cache-renames-only-upstream-add-file/.git/
+[master (root-commit) 3584a53] orig
+ Author: A U Thor <author@example.com>
+ 3 files changed, 13 insertions(+)
+ create mode 100644 olddir/a
+ create mode 100644 olddir/b
+ create mode 100644 somefile
+Switched to branch 'topic'
+[topic 3a60cc7] Dir renamed
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ rename {olddir => newdir}/a (75%)
+ rename {olddir => newdir}/b (100%)
+[topic 4b8f8d7] Unrelated file in recreated old dir
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 olddir/unrelated-file
+Switched to branch 'upstream'
+[upstream a04aaa8] Add newfile
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 olddir/newfile
+Already on 'upstream'
+Switched to branch 'topic'
+ok 8 - caching renames only on upstream side, part 1
 
-expecting success of 6300.113 'basic atom: refs/heads/main objectname:short=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 113 - basic atom: refs/heads/main objectname:short=1
+expecting success of 6429.9 'caching renames only on upstream side, part 2': 
+	test_setup_topic_rename cache-renames-only-upstream-rename-file &&
+	(
+		cd cache-renames-only-upstream-rename-file &&
 
-expecting success of 6300.114 'basic atom: refs/heads/main objectname:short=10': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 114 - basic atom: refs/heads/main objectname:short=10
+		git switch upstream &&
 
-expecting success of 6300.115 'basic atom: refs/tags/testtag tree': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 115 - basic atom: refs/tags/testtag tree
+		git mv somefile olddir/newfile &&
+		git commit -m "Add newfile" &&
 
-expecting success of 6300.116 'basic atom: refs/tags/testtag tree:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 116 - basic atom: refs/tags/testtag tree:short
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.117 'basic atom: refs/tags/testtag tree:short=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 117 - basic atom: refs/tags/testtag tree:short=1
+		git switch upstream &&
 
-expecting success of 6300.118 'basic atom: refs/tags/testtag tree:short=10': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 118 - basic atom: refs/tags/testtag tree:short=10
+		git config merge.directoryRenames true &&
 
-expecting success of 6300.119 'basic atom: refs/tags/testtag parent': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 119 - basic atom: refs/tags/testtag parent
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6300.120 'basic atom: refs/tags/testtag parent:short': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 120 - basic atom: refs/tags/testtag parent:short
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-expecting success of 6300.121 'basic atom: refs/tags/testtag parent:short=1': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 121 - basic atom: refs/tags/testtag parent:short=1
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls &&
 
-expecting success of 6300.122 'basic atom: refs/tags/testtag parent:short=10': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 122 - basic atom: refs/tags/testtag parent:short=10
+		git ls-files >tracked &&
+		test_line_count = 4 tracked &&
+		test_path_is_missing newdir/unrelated-file &&
+		test_path_is_file olddir/unrelated-file &&
+		test_path_is_file newdir/newfile &&
+		test_path_is_file newdir/b &&
+		test_path_is_file newdir/a
+	)
 
-expecting success of 6300.123 'basic atom: refs/tags/testtag numparent': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 123 - basic atom: refs/tags/testtag numparent
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/cache-renames-only-upstream-rename-file/.git/
+[master (root-commit) 3584a53] orig
+ Author: A U Thor <author@example.com>
+ 3 files changed, 13 insertions(+)
+ create mode 100644 olddir/a
+ create mode 100644 olddir/b
+ create mode 100644 somefile
+Switched to branch 'topic'
+[topic 3a60cc7] Dir renamed
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ rename {olddir => newdir}/a (75%)
+ rename {olddir => newdir}/b (100%)
+[topic 4b8f8d7] Unrelated file in recreated old dir
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 olddir/unrelated-file
+Switched to branch 'upstream'
+[upstream 531f940] Add newfile
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename somefile => olddir/newfile (100%)
+Already on 'upstream'
+Switched to branch 'topic'
+ok 9 - caching renames only on upstream side, part 2
 
-expecting success of 6300.124 'basic atom: refs/tags/testtag object': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 124 - basic atom: refs/tags/testtag object
+expecting success of 6429.10 'avoid assuming we detected renames': 
+	git init redo-weirdness &&
+	(
+		cd redo-weirdness &&
 
-expecting success of 6300.125 'basic atom: refs/tags/testtag type': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 125 - basic atom: refs/tags/testtag type
+		mkdir unrelated &&
+		for i in $(test_seq 1 10)
+		do
+			>unrelated/$i || exit 1
+		done &&
+		test_seq  2 10 >numbers &&
+		test_seq 12 20 >values &&
+		git add numbers values unrelated/ &&
+		git commit -m orig &&
 
-expecting success of 6300.126 'basic atom: refs/tags/testtag *objectname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 126 - basic atom: refs/tags/testtag *objectname
+		git branch upstream &&
+		git branch topic &&
 
-expecting success of 6300.127 'basic atom: refs/tags/testtag *objecttype': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 127 - basic atom: refs/tags/testtag *objecttype
+		git switch upstream &&
+		test_seq  1 10 >numbers &&
+		test_seq 11 20 >values &&
+		git add numbers &&
+		git commit -m "Some tweaks" &&
 
-expecting success of 6300.128 'basic atom: refs/tags/testtag author': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 128 - basic atom: refs/tags/testtag author
+		git switch topic &&
 
-expecting success of 6300.129 'basic atom: refs/tags/testtag authorname': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 129 - basic atom: refs/tags/testtag authorname
+		>unrelated/foo &&
+		test_seq  2 12 >numbers &&
+		test_seq 12 22 >values &&
+		git add numbers values unrelated/ &&
+		git mv numbers sequence &&
+		git mv values progression &&
+		git commit -m A &&
 
-expecting success of 6300.130 'basic atom: refs/tags/testtag authorname:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 130 - basic atom: refs/tags/testtag authorname:mailmap
+		#
+		# Actual testing
+		#
 
-expecting success of 6300.131 'basic atom: refs/tags/testtag authoremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 131 - basic atom: refs/tags/testtag authoremail
+		git switch --detach topic^0 &&
 
-expecting success of 6300.132 'basic atom: refs/tags/testtag authoremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 132 - basic atom: refs/tags/testtag authoremail:trim
+		test_must_fail git -c merge.renameLimit=1 rebase upstream &&
 
-expecting success of 6300.133 'basic atom: refs/tags/testtag authoremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 133 - basic atom: refs/tags/testtag authoremail:localpart
+		git ls-files -u >actual &&
+		test_line_count = 2 actual
+	)
 
-expecting success of 6300.134 'basic atom: refs/tags/testtag authoremail:trim,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 134 - basic atom: refs/tags/testtag authoremail:trim,localpart
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6429-merge-sequence-rename-caching/redo-weirdness/.git/
+[master (root-commit) f6e027e] orig
+ Author: A U Thor <author@example.com>
+ 12 files changed, 18 insertions(+)
+ create mode 100644 numbers
+ create mode 100644 unrelated/1
+ create mode 100644 unrelated/10
+ create mode 100644 unrelated/2
+ create mode 100644 unrelated/3
+ create mode 100644 unrelated/4
+ create mode 100644 unrelated/5
+ create mode 100644 unrelated/6
+ create mode 100644 unrelated/7
+ create mode 100644 unrelated/8
+ create mode 100644 unrelated/9
+ create mode 100644 values
+Switched to branch 'upstream'
+[upstream df355b1] Some tweaks
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'topic'
+M	values
+[topic f96ebc9] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ rename values => progression (81%)
+ rename numbers => sequence (76%)
+ create mode 100644 unrelated/foo
+HEAD is now at f96ebc9 A
+Rebasing (1/1)
CONFLICT (modify/delete): numbers deleted in f96ebc9 (A) and modified in HEAD.  Version HEAD of numbers 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 2 and retry the command.
+error: could not apply f96ebc9... 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 set advice.mergeConflict false"
+Could not apply f96ebc9... A
+ok 10 - avoid assuming we detected renames
 
-expecting success of 6300.135 'basic atom: refs/tags/testtag authoremail:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 135 - basic atom: refs/tags/testtag authoremail:mailmap
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6426-merge-skip-unneeded-updates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/.git/
+expecting success of 6426.1 '1a-L: Modify(A)/Modify(B), change on B subset of A': 
+	test_setup_1a L &&
+	(
+		cd 1a_L &&
 
-expecting success of 6300.136 'basic atom: refs/tags/testtag authoremail:mailmap,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 136 - basic atom: refs/tags/testtag authoremail:mailmap,trim
+		git checkout A^0 &&
 
-expecting success of 6300.137 'basic atom: refs/tags/testtag authoremail:trim,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 137 - basic atom: refs/tags/testtag authoremail:trim,mailmap
+		test-tool chmtime --get -3600 b >old-mtime &&
 
-expecting success of 6300.138 'basic atom: refs/tags/testtag authoremail:mailmap,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 138 - basic atom: refs/tags/testtag authoremail:mailmap,localpart
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-expecting success of 6300.139 'basic atom: refs/tags/testtag authoremail:localpart,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 139 - basic atom: refs/tags/testtag authoremail:localpart,mailmap
+		test_must_be_empty err &&
 
-expecting success of 6300.140 'basic atom: refs/tags/testtag authoremail:mailmap,trim,localpart,mailmap,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 140 - basic atom: refs/tags/testtag authoremail:mailmap,trim,localpart,mailmap,trim
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
-expecting success of 6300.141 'basic atom: refs/tags/testtag authordate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 141 - basic atom: refs/tags/testtag authordate
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-expecting success of 6300.142 'basic atom: refs/tags/testtag committer': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 142 - basic atom: refs/tags/testtag committer
+		git rev-parse >actual HEAD:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
 
-expecting success of 6300.143 'basic atom: refs/tags/testtag committername': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 143 - basic atom: refs/tags/testtag committername
+		git hash-object b   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual
+	)
 
-expecting success of 6300.144 'basic atom: refs/tags/testtag committername:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 144 - basic atom: refs/tags/testtag committername:mailmap
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/1a_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
 
-expecting success of 6300.145 'basic atom: refs/tags/testtag committeremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 145 - basic atom: refs/tags/testtag committeremail
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6300.146 'basic atom: refs/tags/testtag committeremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 146 - basic atom: refs/tags/testtag committeremail:trim
+If you want to 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 6300.147 'basic atom: refs/tags/testtag committeremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 147 - basic atom: refs/tags/testtag committeremail:localpart
+  git switch -c <new-branch-name>
 
-expecting success of 6300.148 'basic atom: refs/tags/testtag committeremail:localpart,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 148 - basic atom: refs/tags/testtag committeremail:localpart,trim
+Or undo this operation with:
 
-expecting success of 6300.149 'basic atom: refs/tags/testtag committeremail:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 149 - basic atom: refs/tags/testtag committeremail:mailmap
+  git switch -
 
-expecting success of 6300.150 'basic atom: refs/tags/testtag committeremail:mailmap,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 150 - basic atom: refs/tags/testtag committeremail:mailmap,trim
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6300.151 'basic atom: refs/tags/testtag committeremail:trim,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 151 - basic atom: refs/tags/testtag committeremail:trim,mailmap
+HEAD is now at 14800cf A
+ok 1 - 1a-L: Modify(A)/Modify(B), change on B subset of A
 
-expecting success of 6300.152 'basic atom: refs/tags/testtag committeremail:mailmap,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 152 - basic atom: refs/tags/testtag committeremail:mailmap,localpart
+expecting success of 6426.2 '1a-R: Modify(A)/Modify(B), change on B subset of A': 
+	test_setup_1a R &&
+	(
+		cd 1a_R &&
 
-expecting success of 6300.153 'basic atom: refs/tags/testtag committeremail:localpart,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 153 - basic atom: refs/tags/testtag committeremail:localpart,mailmap
+		git checkout B^0 &&
 
-expecting success of 6300.154 'basic atom: refs/tags/testtag committeremail:trim,mailmap,trim,trim,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 154 - basic atom: refs/tags/testtag committeremail:trim,mailmap,trim,trim,localpart
+		test-tool chmtime --get -3600 b >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-expecting success of 6300.155 'basic atom: refs/tags/testtag committerdate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 155 - basic atom: refs/tags/testtag committerdate
+		# Make sure b WAS updated
+		test-tool chmtime --get b >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
 
-expecting success of 6300.156 'basic atom: refs/tags/testtag tag': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 156 - basic atom: refs/tags/testtag tag
+		test_must_be_empty err &&
 
-expecting success of 6300.157 'basic atom: refs/tags/testtag tagger': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 157 - basic atom: refs/tags/testtag tagger
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-expecting success of 6300.158 'basic atom: refs/tags/testtag taggername': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 158 - basic atom: refs/tags/testtag taggername
+		git rev-parse >actual HEAD:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
 
-expecting success of 6300.159 'basic atom: refs/tags/testtag taggername:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 159 - basic atom: refs/tags/testtag taggername:mailmap
+		git hash-object b   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual
+	)
 
-expecting success of 6300.160 'basic atom: refs/tags/testtag taggeremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 160 - basic atom: refs/tags/testtag taggeremail
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/1a_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'B^0'.
 
-expecting success of 6300.161 'basic atom: refs/tags/testtag taggeremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 161 - basic atom: refs/tags/testtag taggeremail:trim
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6300.162 'basic atom: refs/tags/testtag taggeremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 162 - basic atom: refs/tags/testtag taggeremail:localpart
+If you want to 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 6300.163 'basic atom: refs/tags/testtag taggeremail:trim,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 163 - basic atom: refs/tags/testtag taggeremail:trim,localpart
+  git switch -c <new-branch-name>
 
-expecting success of 6300.164 'basic atom: refs/tags/testtag taggeremail:mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 164 - basic atom: refs/tags/testtag taggeremail:mailmap
+Or undo this operation with:
 
-expecting success of 6300.165 'basic atom: refs/tags/testtag taggeremail:mailmap,trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 165 - basic atom: refs/tags/testtag taggeremail:mailmap,trim
+  git switch -
 
-expecting success of 6300.166 'basic atom: refs/tags/testtag taggeremail:trim,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 166 - basic atom: refs/tags/testtag taggeremail:trim,mailmap
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6300.167 'basic atom: refs/tags/testtag taggeremail:mailmap,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 167 - basic atom: refs/tags/testtag taggeremail:mailmap,localpart
+HEAD is now at dfd7e13 B
+ok 2 - 1a-R: Modify(A)/Modify(B), change on B subset of A
 
-expecting success of 6300.168 'basic atom: refs/tags/testtag taggeremail:localpart,mailmap': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 168 - basic atom: refs/tags/testtag taggeremail:localpart,mailmap
+expecting success of 6426.3 '2a-L: Modify/rename, merge into modify side': 
+	test_setup_2a L &&
+	(
+		cd 2a_L &&
 
-expecting success of 6300.169 'basic atom: refs/tags/testtag taggeremail:trim,mailmap,trim,localpart,localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 169 - basic atom: refs/tags/testtag taggeremail:trim,mailmap,trim,localpart,localpart
+		git checkout A^0 &&
 
-expecting success of 6300.170 'basic atom: refs/tags/testtag taggerdate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 170 - basic atom: refs/tags/testtag taggerdate
+		test_path_is_missing c &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-expecting success of 6300.171 'basic atom: refs/tags/testtag creator': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 171 - basic atom: refs/tags/testtag creator
+		test_path_is_file c &&
 
-expecting success of 6300.172 'basic atom: refs/tags/testtag creatordate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 172 - basic atom: refs/tags/testtag creatordate
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-expecting success of 6300.173 'basic atom: refs/tags/testtag subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 173 - basic atom: refs/tags/testtag subject
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
 
-expecting success of 6300.174 'basic atom: refs/tags/testtag subject:sanitize': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 174 - basic atom: refs/tags/testtag subject:sanitize
+		git hash-object c   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual &&
 
-expecting success of 6300.175 'basic atom: refs/tags/testtag contents:subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 175 - basic atom: refs/tags/testtag contents:subject
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
 
-expecting success of 6300.176 'basic atom: refs/tags/testtag body': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 176 - basic atom: refs/tags/testtag body
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2a_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A c2d59c7] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Note: switching to 'A^0'.
 
-expecting success of 6300.177 'basic atom: refs/tags/testtag contents:body': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 177 - basic atom: refs/tags/testtag contents:body
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6300.178 'basic atom: refs/tags/testtag contents:signature': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 178 - basic atom: refs/tags/testtag contents:signature
+If you want to 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 6300.179 'basic atom: refs/tags/testtag contents': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 179 - basic atom: refs/tags/testtag contents
+  git switch -c <new-branch-name>
 
-expecting success of 6300.180 'basic atom: refs/tags/testtag contents:size': 
-			type=$(git cat-file -t "$ref") &&
-			case $type in
-			tag)
-				# We cannot use $3 as it expects sanitize_pgp to run
-				git cat-file tag $ref >out &&
-				expect=$(tail -n +6 out | wc -c) &&
-				rm -f out ;;
-			tree | blob)
-				expect="" ;;
-			commit)
-				: "use the calculated expect" ;;
-			*)
-				BUG "unknown object type" ;;
-			esac &&
-			# Leave $expect unquoted to lose possible leading whitespaces
-			echo $expect >expected &&
-			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
-			test_cmp expected actual
-		
-ok 180 - basic atom: refs/tags/testtag contents:size
+Or undo this operation with:
 
-expecting success of 6300.181 'basic atom: refs/tags/testtag HEAD': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 181 - basic atom: refs/tags/testtag HEAD
+  git switch -
 
-expecting success of 6300.182 'basic atom: refs/tags/testtag *raw': 
-	git cat-file commit refs/tags/testtag^{} >expected &&
-	git for-each-ref --format="%(*raw)" refs/tags/testtag >actual &&
-	sanitize_pgp <expected >expected.clean &&
-	echo >>expected.clean &&
-	sanitize_pgp <actual >actual.clean &&
-	test_cmp expected.clean actual.clean
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 182 - basic atom: refs/tags/testtag *raw
+HEAD is now at c2d59c7 A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 3 - 2a-L: Modify/rename, merge into modify side
 
-expecting success of 6300.183 'Check invalid atoms names are errors': 
-	test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
+expecting success of 6426.4 '2a-R: Modify/rename, merge into rename side': 
+	test_setup_2a R &&
+	(
+		cd 2a_R &&
 
-fatal: unknown field name: INVALID
-ok 183 - Check invalid atoms names are errors
+		git checkout B^0 &&
 
-expecting success of 6300.184 'Check format specifiers are ignored in naming date atoms': 
-	git for-each-ref --format="%(authordate)" refs/heads &&
-	git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
-	git for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
-	git for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-Tue Jul 4 01:18:44 2006 +0200
-Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
-Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
-Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
-ok 184 - Check format specifiers are ignored in naming date atoms
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
 
-expecting success of 6300.185 'Check valid format specifiers for date fields': 
-	git for-each-ref --format="%(authordate:default)" refs/heads &&
-	git for-each-ref --format="%(authordate:relative)" refs/heads &&
-	git for-each-ref --format="%(authordate:short)" refs/heads &&
-	git for-each-ref --format="%(authordate:local)" refs/heads &&
-	git for-each-ref --format="%(authordate:iso8601)" refs/heads &&
-	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
+		test_must_be_empty err &&
 
-Tue Jul 4 01:18:44 2006 +0200
-19 years ago
-2006-07-04
-Mon Jul 3 23:18:44 2006
-2006-07-04 01:18:44 +0200
-Tue, 4 Jul 2006 01:18:44 +0200
-ok 185 - Check valid format specifiers for date fields
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-expecting success of 6300.186 'Check invalid format specifiers are errors': 
-	test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
 
-fatal: unknown date format INVALID
-ok 186 - Check invalid format specifiers are errors
+		git hash-object c   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual &&
 
-expecting success of 6300.187 'arguments to %(objectname:short=) must be positive integers': 
-	test_must_fail git for-each-ref --format="%(objectname:short=0)" &&
-	test_must_fail git for-each-ref --format="%(objectname:short=-1)" &&
-	test_must_fail git for-each-ref --format="%(objectname:short=foo)"
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
 
-fatal: positive value expected '0' in %(objectname:short=0)
-fatal: positive value expected '-1' in %(objectname:short=-1)
-fatal: positive value expected 'foo' in %(objectname:short=foo)
-ok 187 - arguments to %(objectname:short=) must be positive integers
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2a_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A c2d59c7] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Note: switching to 'B^0'.
 
-expecting success of 6300.188 'err basic atom: refs/heads/main authoremail:foo': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 188 - err basic atom: refs/heads/main authoremail:foo
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 6300.189 'err basic atom: refs/heads/main authoremail:mailmap,trim,bar': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 189 - err basic atom: refs/heads/main authoremail:mailmap,trim,bar
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 6300.190 'err basic atom: refs/heads/main authoremail:trim,': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 190 - err basic atom: refs/heads/main authoremail:trim,
+  git switch -c <new-branch-name>
 
-expecting success of 6300.191 'err basic atom: refs/heads/main authoremail:mailmaptrim': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 191 - err basic atom: refs/heads/main authoremail:mailmaptrim
+Or undo this operation with:
 
-expecting success of 6300.192 'err basic atom: refs/heads/main committeremail: ': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 192 - err basic atom: refs/heads/main committeremail: 
+  git switch -
 
-expecting success of 6300.193 'err basic atom: refs/heads/main committeremail: trim,foo': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 193 - err basic atom: refs/heads/main committeremail: trim,foo
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6300.194 'err basic atom: refs/heads/main committeremail:mailmap,localpart ': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 194 - err basic atom: refs/heads/main committeremail:mailmap,localpart 
+HEAD is now at 6283fcf B
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 4 - 2a-R: Modify/rename, merge into rename side
 
-expecting success of 6300.195 'err basic atom: refs/heads/main committeremail:trim_localpart': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 195 - err basic atom: refs/heads/main committeremail:trim_localpart
+expecting success of 6426.5 '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A': 
+	test_setup_2b L &&
+	(
+		cd 2b_L &&
 
-expecting success of 6300.196 'err basic atom: refs/heads/main committeremail:localpart,,,trim': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 196 - err basic atom: refs/heads/main committeremail:localpart,,,trim
+		git checkout A^0 &&
 
-expecting success of 6300.197 'err basic atom: refs/tags/testtag taggeremail:mailmap,trim, foo ': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 197 - err basic atom: refs/tags/testtag taggeremail:mailmap,trim, foo 
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-expecting success of 6300.198 'err basic atom: refs/tags/testtag taggeremail:trim,localpart,': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 198 - err basic atom: refs/tags/testtag taggeremail:trim,localpart,
+		test_must_be_empty err &&
 
-expecting success of 6300.199 'err basic atom: refs/tags/testtag taggeremail:mailmap;localpart trim': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 199 - err basic atom: refs/tags/testtag taggeremail:mailmap;localpart trim
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
-expecting success of 6300.200 'err basic atom: refs/tags/testtag taggeremail:localpart trim': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 200 - err basic atom: refs/tags/testtag taggeremail:localpart trim
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-expecting success of 6300.201 'err basic atom: refs/tags/testtag taggeremail:mailmap,mailmap,trim,qux,localpart,trim': 
-		test_must_fail git for-each-ref \
-			--format="%($format)" "$ref" 2>error &&
-		test_cmp expect error
-	
-ok 201 - err basic atom: refs/tags/testtag taggeremail:mailmap,mailmap,trim,qux,localpart,trim
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
 
-expecting success of 6300.202 'Check unformatted date fields output': 
-	test_date "" \
-		"Tue Jul 4 01:18:43 2006 +0200" \
-		"Tue Jul 4 01:18:44 2006 +0200" \
-		"Tue Jul 4 01:18:45 2006 +0200"
+		git hash-object c   >actual &&
+		git rev-parse   A:c >expect &&
+		test_cmp expect actual &&
 
-ok 202 - Check unformatted date fields output
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
 
-expecting success of 6300.203 'Check format "default" formatted date fields output': 
-	test_date default \
-		"Tue Jul 4 01:18:43 2006 +0200" \
-		"Tue Jul 4 01:18:44 2006 +0200" \
-		"Tue Jul 4 01:18:45 2006 +0200"
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2b_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
 
-ok 203 - Check format "default" formatted date fields 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 6300.204 'Check format "default-local" date fields output': 
-	test_date default-local "Mon Jul 3 23:18:43 2006" "Mon Jul 3 23:18:44 2006" "Mon Jul 3 23:18:45 2006"
+If you want to 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 204 - Check format "default-local" date fields output
+  git switch -c <new-branch-name>
 
-expecting success of 6300.205 'Check format "relative" date fields output': 
-	f=relative &&
-	(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
-	git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual
+Or undo this operation with:
 
-ok 205 - Check format "relative" date fields output
+  git switch -
 
-expecting success of 6300.206 'Check format "relative-local" date fields output': 
-	test_date relative-local \
-		"$(git for-each-ref --format="%(committerdate:relative)" refs/heads)" \
-		"$(git for-each-ref --format="%(authordate:relative)" refs/heads)" \
-		"$(git for-each-ref --format="%(taggerdate:relative)" refs/tags)"
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 206 - Check format "relative-local" date fields output
+HEAD is now at fed518a A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 5 - 2b-L: Rename+Mod(A)/Mod(B), B mods subset of A
 
-expecting success of 6300.207 'Check format "short" date fields output': 
-	test_date short 2006-07-04 2006-07-04 2006-07-04
+expecting success of 6426.6 '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A': 
+	test_setup_2b R &&
+	(
+		cd 2b_R &&
 
-ok 207 - Check format "short" date fields output
+		git checkout B^0 &&
 
-expecting success of 6300.208 'Check format "short-local" date fields output': 
-	test_date short-local 2006-07-03 2006-07-03 2006-07-03
+		test_path_is_missing c &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-ok 208 - Check format "short-local" date fields output
+		# Make sure c now present (and thus was updated)
+		test_path_is_file c &&
 
-expecting success of 6300.209 'Check format "local" date fields output': 
-	test_date local \
-		"Mon Jul 3 23:18:43 2006" \
-		"Mon Jul 3 23:18:44 2006" \
-		"Mon Jul 3 23:18:45 2006"
+		test_must_be_empty err &&
 
-ok 209 - Check format "local" date fields output
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-expecting success of 6300.210 'Check format "iso8601" date fields output': 
-	test_date iso8601 \
-		"2006-07-04 01:18:43 +0200" \
-		"2006-07-04 01:18:44 +0200" \
-		"2006-07-04 01:18:45 +0200"
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
 
-ok 210 - Check format "iso8601" date fields output
+		git hash-object c   >actual &&
+		git rev-parse   A:c >expect &&
+		test_cmp expect actual &&
 
-expecting success of 6300.211 'Check format "iso8601-local" date fields output': 
-	test_date iso8601-local "2006-07-03 23:18:43 +0000" "2006-07-03 23:18:44 +0000" "2006-07-03 23:18:45 +0000"
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
 
-ok 211 - Check format "iso8601-local" date fields output
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2b_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'B^0'.
 
-expecting success of 6300.212 'Check format "rfc2822" date fields output': 
-	test_date rfc2822 \
-		"Tue, 4 Jul 2006 01:18:43 +0200" \
-		"Tue, 4 Jul 2006 01:18:44 +0200" \
-		"Tue, 4 Jul 2006 01:18:45 +0200"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 212 - Check format "rfc2822" date fields output
+If you want to 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 6300.213 'Check format "rfc2822-local" date fields output': 
-	test_date rfc2822-local "Mon, 3 Jul 2006 23:18:43 +0000" "Mon, 3 Jul 2006 23:18:44 +0000" "Mon, 3 Jul 2006 23:18:45 +0000"
+  git switch -c <new-branch-name>
 
-ok 213 - Check format "rfc2822-local" date fields output
+Or undo this operation with:
 
-expecting success of 6300.214 'Check format "raw" date fields output': 
-	test_date raw "1151968723 +0200" "1151968724 +0200" "1151968725 +0200"
+  git switch -
 
-ok 214 - Check format "raw" date fields output
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6300.215 'Check format "raw-local" date fields output': 
-	test_date raw-local "1151968723 +0000" "1151968724 +0000" "1151968725 +0000"
+HEAD is now at dfd7e13 B
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 6 - 2b-R: Rename+Mod(A)/Mod(B), B mods subset of A
 
-ok 215 - Check format "raw-local" date fields output
+expecting success of 6426.7 '2c: Modify b & add c VS rename b->c': 
+	test_setup_2c &&
+	(
+		cd 2c &&
 
-expecting success of 6300.216 'Check format of strftime date fields': 
-	echo "my date is 2006-07-04" >expected &&
-	git for-each-ref \
-	  --format="%(authordate:format:my date is %Y-%m-%d)" \
-	  refs/heads >actual &&
-	test_cmp expected actual
+		git checkout A^0 &&
 
-ok 216 - Check format of strftime date fields
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 &&
+		export GIT_MERGE_VERBOSITY &&
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-expecting success of 6300.217 'Check format of strftime-local date fields': 
-	echo "my date is 2006-07-03" >expected &&
-	git for-each-ref \
-	  --format="%(authordate:format-local:my date is %Y-%m-%d)" \
-	  refs/heads >actual &&
-	test_cmp expected actual
+		test_grep "CONFLICT (.*/add):" out &&
+		test_must_be_empty err &&
 
-ok 217 - Check format of strftime-local date fields
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
 
-expecting success of 6300.218 'exercise strftime with odd fields': 
-	echo >expected &&
-	git for-each-ref --format="%(authordate:format:)" refs/heads >actual &&
-	test_cmp expected actual &&
-	long="long format -- $ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID" &&
-	echo $long >expected &&
-	git for-each-ref --format="%(authordate:format:$long)" refs/heads >actual &&
-	test_cmp expected actual
+		# Ensure b was removed
+		test_path_is_missing b &&
 
-ok 218 - exercise strftime with odd fields
+		# Make sure c WAS updated...
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
 
-expecting success of 6300.219 'Verify ascending sort': 
-	git for-each-ref --format="%(refname)" --sort=refname >actual &&
-	test_cmp expected actual
+		# ...and has correct index entries and working tree contents
+		git rev-parse >actual :2:c :3:c &&
+		git rev-parse >expect A:c  A:b  &&
+		test_cmp expect actual &&
 
-ok 219 - Verify ascending sort
+		git cat-file -p A:b >>merge-me &&
+		git cat-file -p A:c >>merged &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "HEAD" \
+			-L "" \
+			-L "B^0" \
+			merged empty merge-me &&
+		test_cmp merged c
+	)
 
-expecting success of 6300.220 'Verify descending sort': 
-	git for-each-ref --format="%(refname)" --sort=-refname >actual &&
-	test_cmp expected actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/2c/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A edf631f] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Note: switching to 'A^0'.
 
-ok 220 - Verify descending sort
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6300.221 'Give help even with invalid sort atoms': 
-	test_expect_code 129 git for-each-ref --sort=bogus -h >actual 2>&1 &&
-	grep "^usage: git for-each-ref" 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:
 
-usage: git for-each-ref [<options>] [<pattern>]
-ok 221 - Give help even with invalid sort atoms
+  git switch -c <new-branch-name>
 
-expecting success of 6300.222 'exercise patterns with prefixes': 
-	git tag testtag-2 &&
-	test_when_finished "git tag -d testtag-2" &&
-	git for-each-ref --format="%(refname)" \
-		refs/tags/testtag refs/tags/testtag-2 >actual &&
-	test_cmp expected actual
+Or undo this operation with:
 
-Deleted tag 'testtag-2' (was ea12284)
-ok 222 - exercise patterns with prefixes
+  git switch -
 
-expecting success of 6300.223 'exercise glob patterns with prefixes': 
-	git tag testtag-2 &&
-	test_when_finished "git tag -d testtag-2" &&
-	git for-each-ref --format="%(refname)" \
-		refs/tags/testtag "refs/tags/testtag-*" >actual &&
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Deleted tag 'testtag-2' (was ea12284)
-ok 223 - exercise glob patterns with prefixes
+HEAD is now at edf631f A
+CONFLICT (add/add): Merge conflict in c
+ok 7 - 2c: Modify b & add c VS rename b->c
 
-expecting success of 6300.224 'exercise patterns with prefix exclusions': 
-	for tag in foo/one foo/two foo/three bar baz
-	do
-		git tag "$tag" || return 1
-	done &&
-	test_when_finished "git tag -d foo/one foo/two foo/three bar baz" &&
-	git for-each-ref --format="%(refname)" \
-		refs/tags/ --exclude=refs/tags/foo >actual &&
-	test_cmp expected actual
+expecting success of 6426.8 '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3a L &&
+	(
+		cd 3a_L &&
 
-Deleted tag 'foo/one' (was ea12284)
-Deleted tag 'foo/two' (was ea12284)
-Deleted tag 'foo/three' (was ea12284)
-Deleted tag 'bar' (was ea12284)
-Deleted tag 'baz' (was ea12284)
-ok 224 - exercise patterns with prefix exclusions
+		git checkout A^0 &&
 
-expecting success of 6300.225 'exercise patterns with pattern exclusions': 
-	for tag in foo/one foo/two foo/three bar baz
-	do
-		git tag "$tag" || return 1
-	done &&
-	test_when_finished "git tag -d foo/one foo/two foo/three bar baz" &&
-	git for-each-ref --format="%(refname)" \
-		refs/tags/ --exclude="refs/tags/foo/t*" >actual &&
-	test_cmp expected actual
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-Deleted tag 'foo/one' (was ea12284)
-Deleted tag 'foo/two' (was ea12284)
-Deleted tag 'foo/three' (was ea12284)
-Deleted tag 'bar' (was ea12284)
-Deleted tag 'baz' (was ea12284)
-ok 225 - exercise patterns with pattern exclusions
+		test_must_be_empty err &&
 
-expecting success of 6300.226 'Quoting style: shell': 
-	git for-each-ref --shell --format="%(refname)" >actual &&
-	test_cmp expected actual
+		test_path_is_file bar/bq &&
 
-ok 226 - Quoting style: shell
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
 
-expecting success of 6300.227 'Quoting style: perl': 
-	git for-each-ref --perl --format="%(refname)" >actual &&
-	test_cmp expected actual
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect A:foo/bq    A:foo/whatever &&
+		test_cmp expect actual &&
 
-ok 227 - Quoting style: perl
+		git hash-object bar/bq   bar/whatever   >actual &&
+		git rev-parse   A:foo/bq A:foo/whatever >expect &&
+		test_cmp expect actual &&
 
-expecting success of 6300.228 'Quoting style: python': 
-	git for-each-ref --python --format="%(refname)" >actual &&
-	test_cmp expected actual
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
 
-ok 228 - Quoting style: python
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3a_L/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A 5576138] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename bq => foo/bq (87%)
+Switched to branch 'B'
+[B 69c0854] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {foo => bar}/whatever (100%)
+Note: switching to 'A^0'.
 
-expecting success of 6300.229 'Quoting style: tcl': 
-	git for-each-ref --tcl --format="%(refname)" >actual &&
-	test_cmp expected actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 229 - Quoting style: tcl
+If you want to 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 6300.230 'more than one quoting style: --perl --shell': 
-		test_must_fail git for-each-ref --perl --shell 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 230 - more than one quoting style: --perl --shell
+  git switch -c <new-branch-name>
 
-expecting success of 6300.231 'more than one quoting style: -s --python': 
-		test_must_fail git for-each-ref -s --python 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 231 - more than one quoting style: -s --python
+Or undo this operation with:
 
-expecting success of 6300.232 'more than one quoting style: --python --tcl': 
-		test_must_fail git for-each-ref --python --tcl 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 232 - more than one quoting style: --python --tcl
+  git switch -
 
-expecting success of 6300.233 'more than one quoting style: --tcl --perl': 
-		test_must_fail git for-each-ref --tcl --perl 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 233 - more than one quoting style: --tcl --perl
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6300.234 'setup for upstream:track[short]': 
-	test_commit two
+HEAD is now at 5576138 A
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 8 - 3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
 
-[main 4ddde45] two
+expecting success of 6426.9 '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3a R &&
+	(
+		cd 3a_R &&
+
+		git checkout B^0 &&
+
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		test_path_is_file bar/bq &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect A:foo/bq    A:foo/whatever &&
+		test_cmp expect actual &&
+
+		git hash-object bar/bq   bar/whatever   >actual &&
+		git rev-parse   A:foo/bq A:foo/whatever >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3a_R/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A 5576138] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 234 - setup for upstream:track[short]
+ rename bq => foo/bq (87%)
+Switched to branch 'B'
+[B 69c0854] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {foo => bar}/whatever (100%)
+Note: switching to 'B^0'.
 
-expecting success of 6300.235 'basic atom: refs/heads/main upstream:track': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 235 - basic atom: refs/heads/main upstream:track
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6300.236 'basic atom: refs/heads/main upstream:trackshort': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 236 - basic atom: refs/heads/main upstream:trackshort
+If you want to 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 6300.237 'basic atom: refs/heads/main upstream:track,nobracket': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 237 - basic atom: refs/heads/main upstream:track,nobracket
+  git switch -c <new-branch-name>
 
-expecting success of 6300.238 'basic atom: refs/heads/main upstream:nobracket,track': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 238 - basic atom: refs/heads/main upstream:nobracket,track
+Or undo this operation with:
 
-expecting success of 6300.239 'setup for push:track[short]': 
-	test_commit third &&
-	git update-ref refs/remotes/myfork/main main &&
-	git reset main~1
+  git switch -
 
-[main f6c71aa] third
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 69c0854 B
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 9 - 3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success of 6426.10 '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3b L &&
+	(
+		cd 3b_L &&
+
+		git checkout A^0 &&
+
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		test_path_is_file bar/bq &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect B:bq        A:foo/whatever &&
+		test_cmp expect actual &&
+
+		git hash-object bar/bq bar/whatever   >actual &&
+		git rev-parse   B:bq   A:foo/whatever >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3b_L/.git/
+[master (root-commit) 1e2aa57] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-ok 239 - setup for push:track[short]
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A d02b71c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bq => foo/bq (100%)
+Switched to branch 'B'
+[B 2f47892] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename {foo => bar}/whatever (100%)
+Note: switching to 'A^0'.
 
-expecting success of 6300.240 'basic atom: refs/heads/main push:track': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 240 - basic atom: refs/heads/main push:track
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6300.241 'basic atom: refs/heads/main push:trackshort': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 241 - basic atom: refs/heads/main push:trackshort
+If you want to 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 6300.242 'Check that :track[short] cannot be used with other atoms': 
-	test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
-	test_must_fail git for-each-ref --format="%(refname:trackshort)" 2>/dev/null
+  git switch -c <new-branch-name>
 
-ok 242 - Check that :track[short] cannot be used with other atoms
+Or undo this operation with:
 
-expecting success of 6300.243 'Check that :track[short] works when upstream is invalid': 
-	cat >expected <<-\EOF &&
-	[gone]
+  git switch -
 
-	EOF
-	test_when_finished "git config branch.main.merge refs/heads/main" &&
-	git config branch.main.merge refs/heads/does-not-exist &&
-	git for-each-ref \
-		--format="%(upstream:track)$LF%(upstream:trackshort)" \
-		refs/heads >actual &&
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 243 - Check that :track[short] works when upstream is invalid
+HEAD is now at d02b71c A
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 10 - 3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
 
-expecting success of 6300.244 'Check for invalid refname format': 
-	test_must_fail git for-each-ref --format="%(refname:INVALID)"
+expecting success of 6426.11 '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3b R &&
+	(
+		cd 3b_R &&
 
-fatal: unrecognized %(refname) argument: INVALID
-ok 244 - Check for invalid refname format
+		git checkout B^0 &&
 
-expecting success of 6300.245 'set up color tests': 
-	cat >expected.color <<-EOF &&
-	$(git rev-parse --short refs/heads/main) <GREEN>main<RESET>
-	$(git rev-parse --short refs/remotes/myfork/main) <GREEN>myfork/main<RESET>
-	$(git rev-parse --short refs/remotes/origin/main) <GREEN>origin/main<RESET>
-	$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
-	$(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
-	$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
-	EOF
-	sed "s/<[^>]*>//g" <expected.color >expected.bare &&
-	color_format="%(objectname:short) %(color:green)%(refname:short)"
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-ok 245 - set up color tests
+		test_must_be_empty err &&
 
-checking prerequisite: TTY
+		test_path_is_file bar/bq &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
 
-	# 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 rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect B:bq        A:foo/whatever &&
+		test_cmp expect actual &&
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+		git hash-object bar/bq bar/whatever   >actual &&
+		git rev-parse   B:bq   A:foo/whatever >expect &&
+		test_cmp expect actual &&
 
-)
-prerequisite TTY ok
-expecting success of 6300.246 '%(color) shows color with a tty': 
-	test_terminal git for-each-ref --format="$color_format" >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expected.color actual
+		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
+	)
 
-ok 246 - %(color) shows color with a tty
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/3b_R/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A d02b71c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bq => foo/bq (100%)
+Switched to branch 'B'
+[B 2f47892] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename {foo => bar}/whatever (100%)
+Note: switching to 'B^0'.
 
-expecting success of 6300.247 '%(color) does not show color without tty': 
-	TERM=vt100 git for-each-ref --format="$color_format" >actual &&
-	test_cmp expected.bare 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 247 - %(color) does not show color without tty
+If you want to 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 6300.248 '--color can override tty check': 
-	git for-each-ref --color --format="$color_format" >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expected.color actual
+  git switch -c <new-branch-name>
 
-ok 248 - --color can override tty check
+Or undo this operation with:
 
-expecting success of 6300.249 'color.ui=always does not override tty check': 
-	git -c color.ui=always for-each-ref --format="$color_format" >actual &&
-	test_cmp expected.bare actual
+  git switch -
 
-ok 249 - color.ui=always does not override tty check
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6300.250 'setup for describe atom tests': 
-	git init -b master describe-repo &&
+HEAD is now at 2f47892 B
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 11 - 3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success of 6426.12 '4a: Change on A, change on B subset of A, dirty mods present': 
+	test_setup_4a &&
 	(
-		cd describe-repo &&
+		cd 4a &&
+
+		git checkout A^0 &&
+		echo "File rewritten" >b &&
+
+		test-tool chmtime --get -3600 b >old-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-		test_commit --no-tag one &&
-		git tag tagone &&
+		git rev-parse >actual :0:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
 
-		test_commit --no-tag two &&
-		git tag -a -m "tag two" tagtwo
+		git hash-object b >actual &&
+		echo "File rewritten" | git hash-object --stdin >expect &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6300-for-each-ref/describe-repo/.git/
-[master (root-commit) 4331c28] one
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/4a/.git/
+[master (root-commit) 105387b] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 00bbe3d] two
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 250 - setup for describe atom tests
+Note: switching to 'A^0'.
 
-expecting success of 6300.251 'describe atom vs git describe': 
-	(
-		cd describe-repo &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		git for-each-ref --format="%(objectname)" \
-			refs/tags/ >obj &&
-		while read hash
-		do
-			if desc=$(git describe $hash)
-			then
-				: >expect-contains-good
-			else
-				: >expect-contains-bad
-			fi &&
-			echo "$hash $desc" || return 1
-		done <obj >expect &&
-		test_path_exists expect-contains-good &&
-		test_path_exists expect-contains-bad &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		git for-each-ref --format="%(objectname) %(describe)" \
-			refs/tags/ >actual 2>err &&
-		test_cmp expect actual &&
-		test_must_be_empty err
-	)
+  git switch -c <new-branch-name>
 
-fatal: No annotated tags can describe '4331c280ae8691e937f22f78e998805a89a91a07'.
-However, there were unannotated tags: try --tags.
-ok 251 - describe atom vs git describe
+Or undo this operation with:
 
-expecting success of 6300.252 'describe:tags vs describe --tags': 
-	(
-		cd describe-repo &&
-		git describe --tags >expect &&
-		git for-each-ref --format="%(describe:tags)" \
-				refs/heads/master >actual &&
-		test_cmp expect actual
-	)
+  git switch -
 
-ok 252 - describe:tags vs describe --tags
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6300.253 'describe:abbrev=... vs describe --abbrev=...': 
+HEAD is now at 14800cf A
+ok 12 - 4a: Change on A, change on B subset of A, dirty mods present
+
+expecting success of 6426.13 '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present': 
+	test_setup_4b &&
 	(
-		cd describe-repo &&
+		cd 4b &&
 
-		# Case 1: We have commits between HEAD and the most
-		#	  recent tag reachable from it
-		test_commit --no-tag file &&
-		git describe --abbrev=14 >expect &&
-		git for-each-ref --format="%(describe:abbrev=14)" \
-			refs/heads/master >actual &&
-		test_cmp expect actual &&
+		git checkout A^0 &&
+		echo "File rewritten" >c &&
 
-		# Make sure the hash used is at least 14 digits long
-		sed -e "s/^.*-g\([0-9a-f]*\)$/\1/" <actual >hexpart &&
-		test 15 -le $(wc -c <hexpart) &&
+		test-tool chmtime --get -3600 c >old-mtime &&
 
-		# Case 2: We have a tag at HEAD, describe directly gives
-		#	  the name of the tag
-		git tag -a -m tagged tagname &&
-		git describe --abbrev=14 >expect &&
-		git for-each-ref --format="%(describe:abbrev=14)" \
-			refs/heads/master >actual &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure c was NOT updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual :0:c &&
+		git rev-parse >expect A:c &&
 		test_cmp expect actual &&
-		test tagname = $(cat actual)
+
+		git hash-object c >actual &&
+		echo "File rewritten" | git hash-object --stdin >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
 	)
 
-[master 5fc8694] file
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6426-merge-skip-unneeded-updates/4b/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 253 - describe:abbrev=... vs describe --abbrev=...
+Note: switching to 'A^0'.
 
-expecting success of 6300.254 'describe:match=... vs describe --match ...': 
-	(
-		cd describe-repo &&
-		git tag -a -m "tag foo" tag-foo &&
-		git describe --match "*-foo" >expect &&
-		git for-each-ref --format="%(describe:match="*-foo")" \
-			refs/heads/master >actual &&
-		test_cmp expect actual
-	)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 254 - describe:match=... vs describe --match ...
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 6300.255 'describe:exclude:... vs describe --exclude ...': 
-	(
-		cd describe-repo &&
-		git tag -a -m "tag bar" tag-bar &&
-		git describe --exclude "*-bar" >expect &&
-		git for-each-ref --format="%(describe:exclude="*-bar")" \
-			refs/heads/master >actual &&
-		test_cmp expect actual
-	)
+  git switch -c <new-branch-name>
 
-ok 255 - describe:exclude:... vs describe --exclude ...
+Or undo this operation with:
 
-expecting success of 6300.256 'deref with describe atom': 
-	(
-		cd describe-repo &&
-		cat >expect <<-\EOF &&
+  git switch -
 
-		tagname
-		tagname
-		tagname
+Turn off this advice by setting config variable advice.detachedHead to false
 
-		tagtwo
-		EOF
-		git for-each-ref --format="%(*describe)" >actual &&
-		test_cmp expect actual
-	)
+HEAD is now at fed518a A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 13 - 4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
 
-ok 256 - deref with describe atom
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6430-merge-recursive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6430-merge-recursive/.git/
+expecting success of 6430.1 'setup 1': 
 
-expecting success of 6300.257 'err on bad describe atom arg': 
-	(
-		cd describe-repo &&
+	echo hello >a &&
+	o0=$(git hash-object a) &&
+	cp a b &&
+	cp a c &&
+	mkdir d &&
+	cp a d/e &&
 
-		# The bad arg is the only arg passed to describe atom
-		cat >expect <<-\EOF &&
-		fatal: unrecognized %(describe) argument: baz
-		EOF
-		test_must_fail git for-each-ref --format="%(describe:baz)" \
-			refs/heads/master 2>actual &&
-		test_cmp expect actual &&
+	test_tick &&
+	git add a b c d/e &&
+	git commit -m initial &&
+	c0=$(git rev-parse --verify HEAD) &&
+	git branch side &&
+	git branch df-1 &&
+	git branch df-2 &&
+	git branch df-3 &&
+	git branch remove &&
+	git branch submod &&
+	git branch copy &&
+	git branch rename &&
+	git branch rename-ln &&
 
-		# The bad arg is in the middle of the option string
-		# passed to the describe atom
-		cat >expect <<-\EOF &&
-		fatal: unrecognized %(describe) argument: qux=1,abbrev=14
-		EOF
-		test_must_fail git for-each-ref \
-			--format="%(describe:tags,qux=1,abbrev=14)" \
-			ref/heads/master 2>actual &&
-		test_cmp expect actual
-	)
+	echo hello >>a &&
+	cp a d/e &&
+	o1=$(git hash-object a) &&
 
-ok 257 - err on bad describe atom arg
+	git add a d/e &&
 
-expecting success of 6300.258 'Check ambiguous head and tag refs (strict)': 
-	git config --bool core.warnambiguousrefs true &&
-	git checkout -b newtag &&
-	echo "Using $datestamp" > one &&
-	git add one &&
-	git commit -m "Branch" &&
-	setdate_and_increment &&
-	git tag -m "Tagging at $datestamp" main &&
-	git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
+	test_tick &&
+	git commit -m "main modifies a and d/e" &&
+	c1=$(git rev-parse --verify HEAD) &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o1	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o1	d/e" &&
+		echo "100644 $o1 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
 	test_cmp expected actual
 
-Switched to a new branch 'newtag'
-[newtag dd26b11] Branch
+[main (root-commit) 88eeecf] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 258 - Check ambiguous head and tag refs (strict)
+ 4 files changed, 4 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 d/e
+[main fdc9054] main modifies a and d/e
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ok 1 - setup 1
 
-expecting success of 6300.259 'Check ambiguous head and tag refs (loose)': 
-	git config --bool core.warnambiguousrefs false &&
-	git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
-	test_cmp expected actual
+expecting success of 6430.2 'setup 2': 
 
-ok 259 - Check ambiguous head and tag refs (loose)
+	rm -rf [abcd] &&
+	git checkout side &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o0 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual &&
 
-expecting success of 6300.260 'Check ambiguous head and tag refs II (loose)': 
-	git checkout main &&
-	git tag ambiguous testtag^0 &&
-	git branch ambiguous testtag^0 &&
-	git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
-	test_cmp expected actual
+	echo goodbye >>a &&
+	o2=$(git hash-object a) &&
 
-Switched to branch 'main'
-Your branch is ahead of 'origin/main' by 1 commit.
-  (use "git push" to publish your local commits)
-ok 260 - Check ambiguous head and tag refs II (loose)
+	git add a &&
 
-expecting success of 6300.261 'create tag without tagger': 
-	git tag -a -m "Broken tag" taggerless &&
-	git tag -f taggerless $(git cat-file tag taggerless |
-		sed -e "/^tagger /d" |
-		git hash-object --literally --stdin -w -t tag)
+	test_tick &&
+	git commit -m "side modifies a" &&
+	c2=$(git rev-parse --verify HEAD) &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o2	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o2 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-Updated tag 'taggerless' (was 6a6c6a7)
-ok 261 - create tag without tagger
+Switched to branch 'side'
+D	b
+D	c
+[side 4419332] side modifies a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 2 - setup 2
 
-expecting success of 6300.262 'basic atom: refs/tags/taggerless type': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 262 - basic atom: refs/tags/taggerless type
+expecting success of 6430.3 'setup 3': 
 
-expecting success of 6300.263 'basic atom: refs/tags/taggerless tag': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 263 - basic atom: refs/tags/taggerless tag
+	rm -rf [abcd] &&
+	git checkout df-1 &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o0 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual &&
 
-expecting success of 6300.264 'basic atom: refs/tags/taggerless tagger': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 264 - basic atom: refs/tags/taggerless tagger
+	rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
+	o3=$(git hash-object b/c) &&
 
-expecting success of 6300.265 'basic atom: refs/tags/taggerless taggername': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 265 - basic atom: refs/tags/taggerless taggername
+	test_tick &&
+	git commit -m "df-1 makes b/c" &&
+	c3=$(git rev-parse --verify HEAD) &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	a" &&
+		echo "100644 blob $o3	b/c" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o0 0	a" &&
+		echo "100644 $o3 0	b/c" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-expecting success of 6300.266 'basic atom: refs/tags/taggerless taggeremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 266 - basic atom: refs/tags/taggerless taggeremail
+Switched to branch 'df-1'
+D	b
+D	c
+D	d/e
+[df-1 918ade1] df-1 makes b/c
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 b
+ create mode 100644 b/c
+ok 3 - setup 3
 
-expecting success of 6300.267 'basic atom: refs/tags/taggerless taggeremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 267 - basic atom: refs/tags/taggerless taggeremail:trim
+expecting success of 6430.4 'setup 4': 
 
-expecting success of 6300.268 'basic atom: refs/tags/taggerless taggeremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 268 - basic atom: refs/tags/taggerless taggeremail:localpart
+	rm -rf [abcd] &&
+	git checkout df-2 &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o0 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual &&
 
-expecting success of 6300.269 'basic atom: refs/tags/taggerless taggerdate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 269 - basic atom: refs/tags/taggerless taggerdate
+	rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
+	o4=$(git hash-object a/c) &&
 
-expecting success of 6300.270 'basic atom: refs/tags/taggerless committer': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 270 - basic atom: refs/tags/taggerless committer
+	test_tick &&
+	git commit -m "df-2 makes a/c" &&
+	c4=$(git rev-parse --verify HEAD) &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o4	a/c" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o4 0	a/c" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-expecting success of 6300.271 'basic atom: refs/tags/taggerless committername': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 271 - basic atom: refs/tags/taggerless committername
+Switched to branch 'df-2'
+D	a
+D	c
+D	d/e
+[df-2 833bf24] df-2 makes a/c
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 a
+ create mode 100644 a/c
+ok 4 - setup 4
 
-expecting success of 6300.272 'basic atom: refs/tags/taggerless committeremail': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 272 - basic atom: refs/tags/taggerless committeremail
+expecting success of 6430.5 'setup 5': 
 
-expecting success of 6300.273 'basic atom: refs/tags/taggerless committeremail:trim': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 273 - basic atom: refs/tags/taggerless committeremail:trim
+	rm -rf [abcd] &&
+	git checkout remove &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o0 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual &&
 
-expecting success of 6300.274 'basic atom: refs/tags/taggerless committeremail:localpart': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 274 - basic atom: refs/tags/taggerless committeremail:localpart
+	rm -f b &&
+	echo remove-conflict >a &&
 
-expecting success of 6300.275 'basic atom: refs/tags/taggerless committerdate': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 275 - basic atom: refs/tags/taggerless committerdate
+	git add a &&
+	git rm b &&
+	o5=$(git hash-object a) &&
 
-expecting success of 6300.276 'basic atom: refs/tags/taggerless subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 276 - basic atom: refs/tags/taggerless subject
+	test_tick &&
+	git commit -m "remove removes b and modifies a" &&
+	c5=$(git rev-parse --verify HEAD) &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o5	a" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o5 0	a" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-expecting success of 6300.277 'an unusual tag with an incomplete line': 
 
-	git tag -m "bogo" bogo &&
-	bogo=$(git cat-file tag bogo) &&
-	bogo=$(printf "%s" "$bogo" | git mktag) &&
-	git tag -f bogo "$bogo" &&
-	git for-each-ref --format "%(body)" refs/tags/bogo
+Switched to branch 'remove'
+D	b
+D	c
+D	d/e
+rm 'b'
+[remove 968f3e1] remove removes b and modifies a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ delete mode 100644 b
+ok 5 - setup 5
 
+expecting success of 6430.6 'setup 6': 
 
-Updated tag 'bogo' (was 89437ea)
+	rm -rf [abcd] &&
+	git checkout df-3 &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 $o0 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e"
+	) >expected &&
+	test_cmp expected actual &&
 
-ok 277 - an unusual tag with an incomplete line
+	rm -fr d && echo df-3 >d && git add d &&
+	o6=$(git hash-object d) &&
 
-expecting success of 6300.278 'create tag with subject and body content': 
-	cat >>msg <<-\EOF &&
-		the subject line
+	test_tick &&
+	git commit -m "df-3 makes d" &&
+	c6=$(git rev-parse --verify HEAD) &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o6	d" &&
+		echo "100644 $o0 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o6 0	d"
+	) >expected &&
+	test_cmp expected actual
 
-		first body line
-		second body line
-	EOF
-	git tag -F msg subject-body
+Switched to branch 'df-3'
+D	c
+D	d/e
+[df-3 9d284b3] df-3 makes d
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 d
+ delete mode 100644 d/e
+ok 6 - setup 6
 
-ok 278 - create tag with subject and body content
+expecting success of 6430.7 'setup 7': 
 
-expecting success of 6300.279 'basic atom: refs/tags/subject-body subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 279 - basic atom: refs/tags/subject-body subject
+	git checkout submod &&
+	git rm d/e &&
+	test_tick &&
+	git commit -m "remove d/e" &&
+	git update-index --add --cacheinfo 160000 $c1 d &&
+	test_tick &&
+	git commit -m "make d/ a submodule"
 
-expecting success of 6300.280 'basic atom: refs/tags/subject-body subject:sanitize': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 280 - basic atom: refs/tags/subject-body subject:sanitize
+Switched to branch 'submod'
+D	c
+rm 'd/e'
+[submod a09e90e] remove d/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 d/e
+[submod 408d7a9] make d/ a submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 d
+ok 7 - setup 7
 
-expecting success of 6300.281 'basic atom: refs/tags/subject-body body': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 281 - basic atom: refs/tags/subject-body body
+expecting success of 6430.8 'setup 8': 
+	git checkout rename &&
+	git mv a e &&
+	git add e &&
+	test_tick &&
+	git commit -m "rename a->e" &&
+	c7=$(git rev-parse --verify HEAD) &&
+	git checkout rename-ln &&
+	git mv a e &&
+	test_ln_s_add e a &&
+	test_tick &&
+	git commit -m "rename a->e, symlink a->e" &&
+	oln=$(printf e | git hash-object --stdin)
 
-expecting success of 6300.282 'basic atom: refs/tags/subject-body contents': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 282 - basic atom: refs/tags/subject-body contents
+Switched to branch 'rename'
+D	c
+[rename 5dd9bd8] rename a->e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a => e (100%)
+Switched to branch 'rename-ln'
+D	c
+checking prerequisite: SYMLINKS
 
-expecting success of 6300.283 'basic atom: refs/tags/subject-body contents:size': 
-			type=$(git cat-file -t "$ref") &&
-			case $type in
-			tag)
-				# We cannot use $3 as it expects sanitize_pgp to run
-				git cat-file tag $ref >out &&
-				expect=$(tail -n +6 out | wc -c) &&
-				rm -f out ;;
-			tree | blob)
-				expect="" ;;
-			commit)
-				: "use the calculated expect" ;;
-			*)
-				BUG "unknown object type" ;;
-			esac &&
-			# Leave $expect unquoted to lose possible leading whitespaces
-			echo $expect >expected &&
-			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
-			test_cmp expected actual
-		
-ok 283 - basic atom: refs/tags/subject-body contents:size
+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 6300.284 'create tag with multiline subject': 
-	cat >msg <<-\EOF &&
-		first subject line
-		second subject line
+)
+prerequisite SYMLINKS ok
+[rename-ln 7e1ee82] rename a->e, symlink a->e
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ mode change 100644 => 120000 a
+ create mode 100644 e
+ok 8 - setup 8
 
-		first body line
-		second body line
-	EOF
-	git tag -F msg multiline
+expecting success of 6430.9 'setup 9': 
+	git checkout copy &&
+	cp a e &&
+	git add e &&
+	test_tick &&
+	git commit -m "copy a->e"
 
-ok 284 - create tag with multiline subject
+Switched to branch 'copy'
+D	c
+[copy a40ced5] copy a->e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e
+ok 9 - setup 9
 
-expecting success of 6300.285 'basic atom: refs/tags/multiline subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 285 - basic atom: refs/tags/multiline subject
+expecting success of 6430.10 'merge-recursive simple': 
 
-expecting success of 6300.286 'basic atom: refs/tags/multiline subject:sanitize': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 286 - basic atom: refs/tags/multiline subject:sanitize
+	rm -fr [abcd] &&
+	git checkout -f "$c2" &&
 
-expecting success of 6300.287 'basic atom: refs/tags/multiline contents:subject': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 287 - basic atom: refs/tags/multiline contents:subject
+	test_expect_code 1 git merge-recursive "$c0" -- "$c2" "$c1"
 
-expecting success of 6300.288 'basic atom: refs/tags/multiline body': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 288 - basic atom: refs/tags/multiline body
+Note: switching to '441933296d498d45ed4c5cbe9135259386a2e2b2'.
 
-expecting success of 6300.289 'basic atom: refs/tags/multiline contents:body': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 289 - basic atom: refs/tags/multiline contents:body
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6300.290 'basic atom: refs/tags/multiline contents:signature': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 290 - basic atom: refs/tags/multiline contents:signature
+If you want to 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 6300.291 'basic atom: refs/tags/multiline contents': 
-		git for-each-ref --format="%($format)" "$ref" >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 291 - basic atom: refs/tags/multiline contents
+  git switch -c <new-branch-name>
 
-expecting success of 6300.292 'basic atom: refs/tags/multiline contents:size': 
-			type=$(git cat-file -t "$ref") &&
-			case $type in
-			tag)
-				# We cannot use $3 as it expects sanitize_pgp to run
-				git cat-file tag $ref >out &&
-				expect=$(tail -n +6 out | wc -c) &&
-				rm -f out ;;
-			tree | blob)
-				expect="" ;;
-			commit)
-				: "use the calculated expect" ;;
-			*)
-				BUG "unknown object type" ;;
-			esac &&
-			# Leave $expect unquoted to lose possible leading whitespaces
-			echo $expect >expected &&
-			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
-			test_cmp expected actual
-		
-ok 292 - basic atom: refs/tags/multiline contents:size
+Or undo this operation with:
 
-checking prerequisite: GPG
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	# 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
+HEAD is now at 4419332 side modifies a
+Merging 441933296d498d45ed4c5cbe9135259386a2e2b2 with fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
+Merging:
+4419332 side modifies a
+fdc9054 main modifies a and d/e
+found 1 common ancestor:
+88eeecf initial
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+ok 10 - merge-recursive simple
 
-)
-prerequisite GPG not satisfied
-ok 293 # skip create signed tags (missing GPG)
+expecting success of 6430.11 'merge-recursive result': 
 
-ok 294 # skip basic atom: refs/tags/signed-empty subject (missing GPG)
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o0 1	a" &&
+		echo "100644 $o2 2	a" &&
+		echo "100644 $o1 3	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-ok 295 # skip basic atom: refs/tags/signed-empty subject:sanitize (missing GPG)
 
-ok 296 # skip basic atom: refs/tags/signed-empty contents:subject (missing GPG)
+ok 11 - merge-recursive result
 
-ok 297 # skip basic atom: refs/tags/signed-empty body (missing GPG)
+expecting success of 6430.12 'fail if the index has unresolved entries': 
 
-ok 298 # skip basic atom: refs/tags/signed-empty contents:body (missing GPG)
+	rm -fr [abcd] &&
+	git checkout -f "$c1" &&
 
-ok 299 # skip basic atom: refs/tags/signed-empty contents:signature (missing GPG)
+	test_must_fail git merge "$c5" &&
+	test_must_fail git merge "$c5" 2> out &&
+	test_grep "not possible because you have unmerged files" out &&
+	git add -u &&
+	test_must_fail git merge "$c5" 2> out &&
+	test_grep "You have not concluded your merge" out &&
+	rm -f .git/MERGE_HEAD &&
+	test_must_fail git merge "$c5" 2> out &&
+	test_grep "Your local changes to the following files would be overwritten by merge:" out
 
-ok 300 # skip basic atom: refs/tags/signed-empty contents (missing GPG)
+Previous HEAD position was 4419332 side modifies a
+HEAD is now at fdc9054 main modifies a and d/e
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Automatic merge failed; fix conflicts and then commit the result.
+error: Merging is not possible because you have unmerged files.
+fatal: You have not concluded your merge (MERGE_HEAD exists).
+error: Your local changes to the following files would be overwritten by merge:
+ok 12 - fail if the index has unresolved entries
 
-ok 301 # skip basic atom: refs/tags/signed-empty contents:size (missing GPG)
+expecting success of 6430.13 'merge-recursive remove conflict': 
 
-ok 302 # skip basic atom: refs/tags/signed-empty raw (missing GPG)
+	rm -fr [abcd] &&
+	git checkout -f "$c1" &&
 
-ok 303 # skip basic atom: refs/tags/signed-short subject (missing GPG)
+	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c5"
 
-ok 304 # skip basic atom: refs/tags/signed-short subject:sanitize (missing GPG)
+HEAD is now at fdc9054 main modifies a and d/e
+Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 968f3e182d39cc5676d733434b2b1fcade6d5fdb
+Merging:
+fdc9054 main modifies a and d/e
+968f3e1 remove removes b and modifies a
+found 1 common ancestor:
+88eeecf initial
+Removing b
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+ok 13 - merge-recursive remove conflict
 
-ok 305 # skip basic atom: refs/tags/signed-short contents:subject (missing GPG)
+expecting success of 6430.14 'merge-recursive remove conflict': 
 
-ok 306 # skip basic atom: refs/tags/signed-short body (missing GPG)
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o0 1	a" &&
+		echo "100644 $o1 2	a" &&
+		echo "100644 $o5 3	a" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-ok 307 # skip basic atom: refs/tags/signed-short contents:body (missing GPG)
 
-ok 308 # skip basic atom: refs/tags/signed-short contents:signature (missing GPG)
+ok 14 - merge-recursive remove conflict
 
-ok 309 # skip basic atom: refs/tags/signed-short contents (missing GPG)
+expecting success of 6430.15 'merge-recursive d/f simple': 
+	rm -fr [abcd] &&
+	git reset --hard &&
+	git checkout -f "$c1" &&
 
-ok 310 # skip basic atom: refs/tags/signed-short contents:size (missing GPG)
+	git merge-recursive "$c0" -- "$c1" "$c3"
 
-ok 311 # skip basic atom: refs/tags/signed-short raw (missing GPG)
+HEAD is now at fdc9054 main modifies a and d/e
+HEAD is now at fdc9054 main modifies a and d/e
+Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 918ade1d06dd1c0da47b644356c64b1b2122e705
+Merging:
+fdc9054 main modifies a and d/e
+918ade1 df-1 makes b/c
+found 1 common ancestor:
+88eeecf initial
+Adding b/c
+Removing b to make room for subdirectory
 
-ok 312 # skip basic atom: refs/tags/signed-long subject (missing GPG)
+Removing b
+ok 15 - merge-recursive d/f simple
 
-ok 313 # skip basic atom: refs/tags/signed-long subject:sanitize (missing GPG)
+expecting success of 6430.16 'merge-recursive result': 
 
-ok 314 # skip basic atom: refs/tags/signed-long contents:subject (missing GPG)
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	a" &&
+		echo "100644 $o3 0	b/c" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-ok 315 # skip basic atom: refs/tags/signed-long body (missing GPG)
 
-ok 316 # skip basic atom: refs/tags/signed-long contents:body (missing GPG)
+ok 16 - merge-recursive result
 
-ok 317 # skip basic atom: refs/tags/signed-long contents:signature (missing GPG)
+expecting success of 6430.17 'merge-recursive d/f conflict': 
 
-ok 318 # skip basic atom: refs/tags/signed-long contents (missing GPG)
+	rm -fr [abcd] &&
+	git reset --hard &&
+	git checkout -f "$c1" &&
 
-ok 319 # skip basic atom: refs/tags/signed-long contents:size (missing GPG)
+	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c4"
 
-ok 320 # skip basic atom: refs/tags/signed-long raw (missing GPG)
+HEAD is now at fdc9054 main modifies a and d/e
+HEAD is now at fdc9054 main modifies a and d/e
+Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 833bf240c9e2636a0e5eb3dd8f735d2a92181f22
+Merging:
+fdc9054 main modifies a and d/e
+833bf24 df-2 makes a/c
+found 1 common ancestor:
+88eeecf initial
+Adding a/c
+Removing a to make room for subdirectory
 
-expecting success of 6300.321 'set up refs pointing to tree and blob': 
-	git update-ref refs/mytrees/first refs/heads/main^{tree} &&
-	git update-ref refs/myblobs/first refs/heads/main:one
+CONFLICT (modify/delete): a deleted in 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of a left in tree at a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e.
+ok 17 - merge-recursive d/f conflict
 
-ok 321 - set up refs pointing to tree and blob
+expecting success of 6430.18 'merge-recursive d/f conflict result': 
 
-ok 322 # skip basic atom: refs/mytrees/first subject (missing GPG)
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o0 1	a" &&
+		echo "100644 $o1 2	a" &&
+		echo "100644 $o4 0	a/c" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-ok 323 # skip basic atom: refs/mytrees/first contents:subject (missing GPG)
 
-ok 324 # skip basic atom: refs/mytrees/first body (missing GPG)
+ok 18 - merge-recursive d/f conflict result
 
-ok 325 # skip basic atom: refs/mytrees/first contents:body (missing GPG)
+expecting success of 6430.19 'merge-recursive d/f conflict the other way': 
 
-ok 326 # skip basic atom: refs/mytrees/first contents:signature (missing GPG)
+	rm -fr [abcd] &&
+	git reset --hard &&
+	git checkout -f "$c4" &&
 
-ok 327 # skip basic atom: refs/mytrees/first contents (missing GPG)
+	test_expect_code 1 git merge-recursive "$c0" -- "$c4" "$c1"
 
-ok 328 # skip basic atom: refs/mytrees/first contents:size (missing GPG)
+HEAD is now at fdc9054 main modifies a and d/e
+Previous HEAD position was fdc9054 main modifies a and d/e
+HEAD is now at 833bf24 df-2 makes a/c
+Merging 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 with fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
+Merging:
+833bf24 df-2 makes a/c
+fdc9054 main modifies a and d/e
+found 1 common ancestor:
+88eeecf initial
+Adding a/c
+CONFLICT (modify/delete): a deleted in 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of a left in tree at a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0.
+ok 19 - merge-recursive d/f conflict the other way
 
-expecting success of 6300.329 'basic atom: refs/mytrees/first raw': 
-	git cat-file tree refs/mytrees/first >expected &&
-	echo >>expected &&
-	git for-each-ref --format="%(raw)" refs/mytrees/first >actual &&
-	test_cmp expected actual &&
-	git cat-file -s refs/mytrees/first >expected &&
-	git for-each-ref --format="%(raw:size)" refs/mytrees/first >actual &&
-	test_cmp expected actual
+expecting success of 6430.20 'merge-recursive d/f conflict result the other way': 
 
-ok 329 - basic atom: refs/mytrees/first raw
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o0 1	a" &&
+		echo "100644 $o1 3	a" &&
+		echo "100644 $o4 0	a/c" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
+	test_cmp expected actual
 
-ok 330 # skip basic atom: refs/myblobs/first subject (missing GPG)
 
-ok 331 # skip basic atom: refs/myblobs/first contents:subject (missing GPG)
+ok 20 - merge-recursive d/f conflict result the other way
 
-ok 332 # skip basic atom: refs/myblobs/first body (missing GPG)
+expecting success of 6430.21 'merge-recursive d/f conflict': 
 
-ok 333 # skip basic atom: refs/myblobs/first contents:body (missing GPG)
+	rm -fr [abcd] &&
+	git reset --hard &&
+	git checkout -f "$c1" &&
 
-ok 334 # skip basic atom: refs/myblobs/first contents:signature (missing GPG)
+	test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c6"
 
-ok 335 # skip basic atom: refs/myblobs/first contents (missing GPG)
+HEAD is now at 833bf24 df-2 makes a/c
+Previous HEAD position was 833bf24 df-2 makes a/c
+HEAD is now at fdc9054 main modifies a and d/e
+Merging fdc905408c9d6dd868ab5d3b6939a2a4f33e068e with 9d284b3a95aea72df4581977e913e55da89d5e3d
+Merging:
+fdc9054 main modifies a and d/e
+9d284b3 df-3 makes d
+found 1 common ancestor:
+88eeecf initial
+CONFLICT (modify/delete): d/e deleted in 9d284b3a95aea72df4581977e913e55da89d5e3d and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of d/e left in tree.
+CONFLICT (directory/file): There is a directory with name d in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Adding d as d~9d284b3a95aea72df4581977e913e55da89d5e3d
+ok 21 - merge-recursive d/f conflict
 
-ok 336 # skip basic atom: refs/myblobs/first contents:size (missing GPG)
+expecting success of 6430.22 'merge-recursive d/f conflict result': 
 
-expecting success of 6300.337 'basic atom: refs/myblobs/first raw': 
-	git cat-file blob refs/myblobs/first >expected &&
-	echo >>expected &&
-	git for-each-ref --format="%(raw)" refs/myblobs/first >actual &&
-	test_cmp expected actual &&
-	git cat-file -s refs/myblobs/first >expected &&
-	git for-each-ref --format="%(raw:size)" refs/myblobs/first >actual &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o6 3	d" &&
+		echo "100644 $o0 1	d/e" &&
+		echo "100644 $o1 2	d/e"
+	) >expected &&
 	test_cmp expected actual
 
-ok 337 - basic atom: refs/myblobs/first raw
-
-expecting success of 6300.338 'set up refs pointing to binary blob': 
-	printf "a\0b\0c" >blob1 &&
-	printf "a\0c\0b" >blob2 &&
-	printf "\0a\0b\0c" >blob3 &&
-	printf "abc" >blob4 &&
-	printf "\0 \0 \0 " >blob5 &&
-	printf "\0 \0a\0 " >blob6 &&
-	printf "  " >blob7 &&
-	>blob8 &&
-	obj=$(git hash-object -w blob1) &&
-	git update-ref refs/myblobs/blob1 "$obj" &&
-	obj=$(git hash-object -w blob2) &&
-	git update-ref refs/myblobs/blob2 "$obj" &&
-	obj=$(git hash-object -w blob3) &&
-	git update-ref refs/myblobs/blob3 "$obj" &&
-	obj=$(git hash-object -w blob4) &&
-	git update-ref refs/myblobs/blob4 "$obj" &&
-	obj=$(git hash-object -w blob5) &&
-	git update-ref refs/myblobs/blob5 "$obj" &&
-	obj=$(git hash-object -w blob6) &&
-	git update-ref refs/myblobs/blob6 "$obj" &&
-	obj=$(git hash-object -w blob7) &&
-	git update-ref refs/myblobs/blob7 "$obj" &&
-	obj=$(git hash-object -w blob8) &&
-	git update-ref refs/myblobs/blob8 "$obj"
 
-ok 338 - set up refs pointing to binary blob
+ok 22 - merge-recursive d/f conflict result
 
-expecting success of 6300.339 'Verify sorts with raw': 
-	cat >expected <<-EOF &&
-	refs/myblobs/blob8
-	refs/myblobs/blob5
-	refs/myblobs/blob6
-	refs/myblobs/blob3
-	refs/myblobs/blob7
-	refs/mytrees/first
-	refs/myblobs/first
-	refs/myblobs/blob1
-	refs/myblobs/blob2
-	refs/myblobs/blob4
-	refs/heads/main
-	EOF
-	git for-each-ref --format="%(refname)" --sort=raw \
-		refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
-	test_cmp expected actual
+expecting success of 6430.23 'merge-recursive d/f conflict': 
 
-ok 339 - Verify sorts with raw
+	rm -fr [abcd] &&
+	git reset --hard &&
+	git checkout -f "$c6" &&
 
-expecting success of 6300.340 'Verify sorts with raw:size': 
-	cat >expected <<-EOF &&
-	refs/myblobs/blob8
-	refs/myblobs/blob7
-	refs/myblobs/blob4
-	refs/myblobs/blob1
-	refs/myblobs/blob2
-	refs/myblobs/blob3
-	refs/myblobs/blob5
-	refs/myblobs/blob6
-	refs/myblobs/first
-	refs/mytrees/first
-	refs/heads/main
-	EOF
-	git for-each-ref --format="%(refname)" --sort=raw:size \
-		refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
-	test_cmp expected actual
+	test_expect_code 1 git merge-recursive "$c0" -- "$c6" "$c1"
 
-ok 340 - Verify sorts with raw:size
+HEAD is now at fdc9054 main modifies a and d/e
+Previous HEAD position was fdc9054 main modifies a and d/e
+HEAD is now at 9d284b3 df-3 makes d
+Merging 9d284b3a95aea72df4581977e913e55da89d5e3d with fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
+Merging:
+9d284b3 df-3 makes d
+fdc9054 main modifies a and d/e
+found 1 common ancestor:
+88eeecf initial
+CONFLICT (modify/delete): d/e deleted in 9d284b3a95aea72df4581977e913e55da89d5e3d and modified in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Version fdc905408c9d6dd868ab5d3b6939a2a4f33e068e of d/e left in tree.
+Removing d to make room for subdirectory
 
-expecting success of 6300.341 'validate raw atom with %(if:equals)': 
-	cat >expected <<-EOF &&
-	not equals
-	not equals
-	not equals
-	not equals
-	not equals
-	not equals
-	refs/myblobs/blob4
-	not equals
-	not equals
-	not equals
-	not equals
-	not equals
-	EOF
-	git for-each-ref --format="%(if:equals=abc)%(raw)%(then)%(refname)%(else)not equals%(end)" \
-		refs/myblobs/ refs/heads/ >actual &&
-	test_cmp expected actual
+CONFLICT (file/directory): There is a directory with name d in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Adding d as d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
+ok 23 - merge-recursive d/f conflict
 
-ok 341 - validate raw atom with %(if:equals)
+expecting success of 6430.24 'merge-recursive d/f conflict result': 
 
-expecting success of 6300.342 'validate raw atom with %(if:notequals)': 
-	cat >expected <<-EOF &&
-	refs/heads/ambiguous
-	refs/heads/main
-	refs/heads/newtag
-	refs/myblobs/blob1
-	refs/myblobs/blob2
-	refs/myblobs/blob3
-	equals
-	refs/myblobs/blob5
-	refs/myblobs/blob6
-	refs/myblobs/blob7
-	refs/myblobs/blob8
-	refs/myblobs/first
-	EOF
-	git for-each-ref --format="%(if:notequals=abc)%(raw)%(then)%(refname)%(else)equals%(end)" \
-		refs/myblobs/ refs/heads/ >actual &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o6 2	d" &&
+		echo "100644 $o0 1	d/e" &&
+		echo "100644 $o1 3	d/e"
+	) >expected &&
 	test_cmp expected actual
 
-ok 342 - validate raw atom with %(if:notequals)
 
-expecting success of 6300.343 'empty raw refs with %(if)': 
-	cat >expected <<-EOF &&
-	refs/myblobs/blob1 not empty
-	refs/myblobs/blob2 not empty
-	refs/myblobs/blob3 not empty
-	refs/myblobs/blob4 not empty
-	refs/myblobs/blob5 not empty
-	refs/myblobs/blob6 not empty
-	refs/myblobs/blob7 empty
-	refs/myblobs/blob8 empty
-	refs/myblobs/first not empty
-	EOF
-	git for-each-ref --format="%(refname) %(if)%(raw)%(then)not empty%(else)empty%(end)" \
-		refs/myblobs/ >actual &&
-	test_cmp expected actual
+ok 24 - merge-recursive d/f conflict result
 
-ok 343 - empty raw refs with %(if)
+expecting success of 6430.25 'dir in working tree with symlink ancestor does not produce d/f conflict': 
+	git init sym &&
+	(
+		cd sym &&
+		ln -s . foo &&
+		mkdir bar &&
+		>bar/file &&
+		git add foo bar/file &&
+		git commit -m "foo symlink" &&
 
-expecting success of 6300.344 '%(raw) with --python must fail': 
-	test_must_fail git for-each-ref --format="%(raw)" --python
+		git checkout -b branch1 &&
+		git commit --allow-empty -m "empty commit" &&
 
-fatal: --format=raw cannot be used with --python, --shell, --tcl
-ok 344 - %(raw) with --python must fail
+		git checkout main &&
+		git rm foo &&
+		mkdir foo &&
+		>foo/bar &&
+		git add foo/bar &&
+		git commit -m "replace foo symlink with real foo dir and foo/bar file" &&
 
-expecting success of 6300.345 '%(raw) with --tcl must fail': 
-	test_must_fail git for-each-ref --format="%(raw)" --tcl
+		git checkout branch1 &&
 
-fatal: --format=raw cannot be used with --python, --shell, --tcl
-ok 345 - %(raw) with --tcl must fail
+		git cherry-pick main &&
+		test_path_is_dir foo &&
+		test_path_is_file foo/bar
+	)
 
-expecting success of 6300.346 '%(raw) with --perl': 
-	git for-each-ref --format="\$name= %(raw);
-print \"\$name\"" refs/myblobs/blob1 --perl | perl >actual &&
-	cmp blob1 actual &&
-	git for-each-ref --format="\$name= %(raw);
-print \"\$name\"" refs/myblobs/blob3 --perl | perl >actual &&
-	cmp blob3 actual &&
-	git for-each-ref --format="\$name= %(raw);
-print \"\$name\"" refs/myblobs/blob8 --perl | perl >actual &&
-	cmp blob8 actual &&
-	git for-each-ref --format="\$name= %(raw);
-print \"\$name\"" refs/myblobs/first --perl | perl >actual &&
-	cmp one actual &&
-	git cat-file tree refs/mytrees/first > expected &&
-	git for-each-ref --format="\$name= %(raw);
-print \"\$name\"" refs/mytrees/first --perl | perl >actual &&
-	cmp expected actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6430-merge-recursive/sym/.git/
+[main (root-commit) 8fb1559] foo symlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 bar/file
+ create mode 120000 foo
+Switched to a new branch 'branch1'
+[branch1 9371671] empty commit
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+rm 'foo'
+[main 8f162ab] replace foo symlink with real foo dir and foo/bar file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ delete mode 120000 foo
+ create mode 100644 foo/bar
+Switched to branch 'branch1'
+[branch1 f190fac] replace foo symlink with real foo dir and foo/bar file
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:24:13 2005 -0700
+ 2 files changed, 1 deletion(-)
+ delete mode 120000 foo
+ create mode 100644 foo/bar
+ok 25 - dir in working tree with symlink ancestor does not produce d/f conflict
 
-ok 346 - %(raw) with --perl
+expecting success of 6430.26 'reset and 3-way merge': 
 
-expecting success of 6300.347 '%(raw) with --shell must fail': 
-	test_must_fail git for-each-ref --format="%(raw)" --shell
+	git reset --hard "$c2" &&
+	git read-tree -m "$c0" "$c2" "$c1"
 
-fatal: --format=raw cannot be used with --python, --shell, --tcl
-ok 347 - %(raw) with --shell must fail
 
-expecting success of 6300.348 '%(raw) with --shell and --sort=raw must fail': 
-	test_must_fail git for-each-ref --format="%(raw)" --sort=raw --shell
+warning: unable to unlink 'd': Is a directory
+HEAD is now at 4419332 side modifies a
+ok 26 - reset and 3-way merge
 
-fatal: --format=raw cannot be used with --python, --shell, --tcl
-ok 348 - %(raw) with --shell and --sort=raw must fail
+expecting success of 6430.27 'reset and bind merge': 
 
-expecting success of 6300.349 '%(raw:size) with --shell': 
-	git for-each-ref --format="%(raw:size)" | sed "s/^/$SQ/;s/$/$SQ/" >expect &&
-	git for-each-ref --format="%(raw:size)" --shell >actual &&
-	test_cmp expect actual
+	git reset --hard main &&
+	git read-tree --prefix=M/ main &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	M/a" &&
+		echo "100644 $o0 0	M/b" &&
+		echo "100644 $o0 0	M/c" &&
+		echo "100644 $o1 0	M/d/e" &&
+		echo "100644 $o1 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
+	test_cmp expected actual &&
 
-ok 349 - %(raw:size) with --shell
+	git read-tree --prefix=a1/ main &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	M/a" &&
+		echo "100644 $o0 0	M/b" &&
+		echo "100644 $o0 0	M/c" &&
+		echo "100644 $o1 0	M/d/e" &&
+		echo "100644 $o1 0	a" &&
+		echo "100644 $o1 0	a1/a" &&
+		echo "100644 $o0 0	a1/b" &&
+		echo "100644 $o0 0	a1/c" &&
+		echo "100644 $o1 0	a1/d/e" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e"
+	) >expected &&
+	test_cmp expected actual &&
 
-expecting success of 6300.350 'for-each-ref --format compare with cat-file --batch': 
-	git rev-parse refs/mytrees/first | git cat-file --batch >expected &&
-	git for-each-ref --format="%(objectname) %(objecttype) %(objectsize)
-%(raw)" refs/mytrees/first >actual &&
+	git read-tree --prefix=z/ main &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	M/a" &&
+		echo "100644 $o0 0	M/b" &&
+		echo "100644 $o0 0	M/c" &&
+		echo "100644 $o1 0	M/d/e" &&
+		echo "100644 $o1 0	a" &&
+		echo "100644 $o1 0	a1/a" &&
+		echo "100644 $o0 0	a1/b" &&
+		echo "100644 $o0 0	a1/c" &&
+		echo "100644 $o1 0	a1/d/e" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o1 0	d/e" &&
+		echo "100644 $o1 0	z/a" &&
+		echo "100644 $o0 0	z/b" &&
+		echo "100644 $o0 0	z/c" &&
+		echo "100644 $o1 0	z/d/e"
+	) >expected &&
 	test_cmp expected actual
 
-ok 350 - for-each-ref --format compare with cat-file --batch
 
-expecting success of 6300.351 'verify sorts with contents:size': 
-	cat >expect <<-\EOF &&
-	refs/heads/main
-	refs/heads/newtag
-	refs/heads/ambiguous
-	EOF
-	git for-each-ref --format="%(refname)" \
-		--sort=contents:size refs/heads/ >actual &&
-	test_cmp expect actual
+HEAD is now at fdc9054 main modifies a and d/e
+ok 27 - reset and bind merge
 
-ok 351 - verify sorts with contents:size
+expecting success of 6430.28 'merge-recursive w/ empty work tree - ours has rename': 
+	(
+		GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
+		export GIT_WORK_TREE &&
+		GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
+		export GIT_INDEX_FILE &&
+		mkdir "$GIT_WORK_TREE" &&
+		git read-tree -i -m $c7 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git update-index --ignore-missing --refresh 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git merge-recursive $c0 -- $c7 $c3 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git ls-files -s >actual-files 2>actual-err &&
+		test_must_be_empty actual-err
+	) &&
+	cat >expected-files <<-EOF &&
+	100644 $o3 0	b/c
+	100644 $o0 0	c
+	100644 $o0 0	d/e
+	100644 $o0 0	e
+	EOF
+	test_cmp expected-files actual-files
 
-expecting success of 6300.352 'set up multiple-sort tags': 
-	for when in 100000 200000
-	do
-		for email in user1 user2
-		do
-			for ref in ref1 ref2
-			do
-				GIT_COMMITTER_DATE="@$when +0000" \
-				GIT_COMMITTER_EMAIL="$email@example.com" \
-				git tag -m "tag $ref-$when-$email" \
-				multi-$ref-$when-$email || return 1
-			done
-		done
-	done
+Merging 5dd9bd8ddad823127f5e40fcbc297d40f91d9a53 with 918ade1d06dd1c0da47b644356c64b1b2122e705
+Merging:
+5dd9bd8 rename a->e
+918ade1 df-1 makes b/c
+found 1 common ancestor:
+88eeecf initial
+Skipped e (merged same as existing)
+Adding b/c
+Removing b to make room for subdirectory
 
-ok 352 - set up multiple-sort tags
+Removing b
+ok 28 - merge-recursive w/ empty work tree - ours has rename
 
-expecting success of 6300.353 'Verify sort with multiple keys': 
-	cat >expected <<-\EOF &&
-	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
-	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
-	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
-	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
-	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
-	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
-	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
-	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
+expecting success of 6430.29 'merge-recursive w/ empty work tree - theirs has rename': 
+	(
+		GIT_WORK_TREE="$PWD/theirs-has-rename-work" &&
+		export GIT_WORK_TREE &&
+		GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
+		export GIT_INDEX_FILE &&
+		mkdir "$GIT_WORK_TREE" &&
+		git read-tree -i -m $c3 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git update-index --ignore-missing --refresh 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git merge-recursive $c0 -- $c3 $c7 2>actual-err &&
+		test_must_be_empty actual-err &&
+		git ls-files -s >actual-files 2>actual-err &&
+		test_must_be_empty actual-err
+	) &&
+	cat >expected-files <<-EOF &&
+	100644 $o3 0	b/c
+	100644 $o0 0	c
+	100644 $o0 0	d/e
+	100644 $o0 0	e
 	EOF
-	git for-each-ref \
-		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
-		--sort=-refname \
-		--sort=taggeremail \
-		--sort=taggerdate \
-		"refs/tags/multi-*" >actual &&
-	test_cmp expected actual
-
-ok 353 - Verify sort with multiple keys
+	test_cmp expected-files actual-files
 
-expecting success of 6300.354 'equivalent sorts fall back on refname': 
-	cat >expected <<-\EOF &&
-	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
-	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
-	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
-	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
-	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
-	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
-	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
-	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
-	EOF
-	git for-each-ref \
-		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
-		--sort=taggerdate \
-		"refs/tags/multi-*" >actual &&
-	test_cmp expected actual
+Merging 918ade1d06dd1c0da47b644356c64b1b2122e705 with 5dd9bd8ddad823127f5e40fcbc297d40f91d9a53
+Merging:
+918ade1 df-1 makes b/c
+5dd9bd8 rename a->e
+found 1 common ancestor:
+88eeecf initial
+Adding b/c
+ok 29 - merge-recursive w/ empty work tree - theirs has rename
 
-ok 354 - equivalent sorts fall back on refname
+expecting success of 6430.30 'merge removes empty directories': 
 
-expecting success of 6300.355 '--no-sort cancels the previous sort keys': 
-	cat >expected <<-\EOF &&
-	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
-	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
-	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
-	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
-	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
-	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
-	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
-	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
-	EOF
-	git for-each-ref \
-		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
-		--sort=-refname \
-		--sort=taggeremail \
-		--no-sort \
-		--sort=taggerdate \
-		"refs/tags/multi-*" >actual &&
-	test_cmp expected actual
+	git reset --hard main &&
+	git checkout -b rm &&
+	git rm d/e &&
+	git commit -mremoved-d/e &&
+	git checkout main &&
+	git merge -s recursive rm &&
+	test_path_is_missing d
 
-ok 355 - --no-sort cancels the previous sort keys
+HEAD is now at fdc9054 main modifies a and d/e
+Switched to a new branch 'rm'
+rm 'd/e'
+[rm d70191d] removed-d/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 d/e
+Switched to branch 'main'
+Updating fdc9054..d70191d
+Fast-forward
+ d/e | 2 --
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 d/e
+ok 30 - merge removes empty directories
 
-expecting success of 6300.356 '--no-sort without subsequent --sort prints expected refs': 
-	cat >expected <<-\EOF &&
-	refs/tags/multi-ref1-100000-user1
-	refs/tags/multi-ref1-100000-user2
-	refs/tags/multi-ref1-200000-user1
-	refs/tags/multi-ref1-200000-user2
-	refs/tags/multi-ref2-100000-user1
-	refs/tags/multi-ref2-100000-user2
-	refs/tags/multi-ref2-200000-user1
-	refs/tags/multi-ref2-200000-user2
-	EOF
+expecting success of 6430.31 'merge-recursive simple w/submodule': 
 
-	# Sort the results with `sort` for a consistent comparison against
-	# expected
-	git for-each-ref \
-		--format="%(refname)" \
-		--no-sort \
-		"refs/tags/multi-*" | sort >actual &&
-	test_cmp expected actual
+	git checkout submod &&
+	git merge remove
 
-ok 356 - --no-sort without subsequent --sort prints expected refs
+Switched to branch 'submod'
+Merge made by the 'ort' strategy.
+ a | 2 +-
+ b | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ delete mode 100644 b
+ok 31 - merge-recursive simple w/submodule
 
-expecting success of 6300.357 'set up custom date sorting': 
-	# Dates:
-	# - Wed Feb 07 2024 21:34:20 +0000
-	# - Tue Dec 14 1999 00:05:22 +0000
-	# - Fri Jun 04 2021 11:26:51 +0000
-	# - Mon Jan 22 2007 16:44:01 GMT+0000
-	i=1 &&
-	for when in 1707341660 945129922 1622806011 1169484241
-	do
-		GIT_COMMITTER_DATE="@$when +0000" \
-		GIT_COMMITTER_EMAIL="user@example.com" \
-		git tag -m "tag $when" custom-dates-$i &&
-		i=$(($i+1)) || return 1
-	done
+expecting success of 6430.32 'merge-recursive simple w/submodule result': 
 
-ok 357 - set up custom date sorting
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o5 0	a" &&
+		echo "100644 $o0 0	c" &&
+		echo "160000 $c1 0	d"
+	) >expected &&
+	test_cmp expected actual
 
-expecting success of 6300.358 'sort by date defaults to full timestamp': 
-	cat >expected <<-\EOF &&
-	945129922 refs/tags/custom-dates-2
-	1169484241 refs/tags/custom-dates-4
-	1622806011 refs/tags/custom-dates-3
-	1707341660 refs/tags/custom-dates-1
-	EOF
+ok 32 - merge-recursive simple w/submodule result
 
-	git for-each-ref \
-		--format="%(creatordate:unix) %(refname)" \
-		--sort=creatordate \
-		"refs/tags/custom-dates-*" >actual &&
+expecting success of 6430.33 'merge-recursive copy vs. rename': 
+	git checkout -f copy &&
+	git merge rename &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 blob $o0	e" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e" &&
+		echo "100644 $o0 0	e"
+	) >expected &&
 	test_cmp expected actual
 
-ok 358 - sort by date defaults to full timestamp
+Switched to branch 'copy'
+Merge made by the 'ort' strategy.
+ a | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 a
+ok 33 - merge-recursive copy vs. rename
 
-expecting success of 6300.359 'sort by custom date format': 
-	cat >expected <<-\EOF &&
-	00:05:22 refs/tags/custom-dates-2
-	11:26:51 refs/tags/custom-dates-3
-	16:44:01 refs/tags/custom-dates-4
-	21:34:20 refs/tags/custom-dates-1
-	EOF
+expecting success of 6430.34 'merge-recursive rename vs. rename/symlink': 
 
-	git for-each-ref \
-		--format="%(creatordate:format:%H:%M:%S) %(refname)" \
-		--sort="creatordate:format:%H:%M:%S" \
-		"refs/tags/custom-dates-*" >actual &&
+	git checkout -f rename &&
+	git merge rename-ln &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "120000 blob $oln	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 blob $o0	e" &&
+		echo "120000 $oln 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e" &&
+		echo "100644 $o0 0	e"
+	) >expected &&
 	test_cmp expected actual
 
-ok 359 - sort by custom date format
+Switched to branch 'rename'
+Merge made by the 'ort' strategy.
+ a | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 a
+ok 34 - merge-recursive rename vs. rename/symlink
 
-expecting success of 6300.360 'do not dereference NULL upon %(HEAD) on unborn branch': 
-	test_when_finished "git checkout main" &&
-	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
-	sed -e "s/^\* /  /" actual >expect &&
-	git checkout --orphan orphaned-branch &&
-	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
-	test_cmp expect actual
+expecting success of 6430.35 'merging with triple rename across D/F conflict': 
+	git reset --hard HEAD &&
+	git checkout -b topic &&
+	git rm -rf . &&
 
-Switched to a new branch 'orphaned-branch'
-Switched to branch 'main'
-Your branch is ahead of 'origin/main' by 1 commit.
-  (use "git push" to publish your local commits)
-ok 360 - do not dereference NULL upon %(HEAD) on unborn branch
+	echo "just a file" >sub1 &&
+	mkdir -p sub2 &&
+	echo content1 >sub2/file1 &&
+	echo content2 >sub2/file2 &&
+	echo content3 >sub2/file3 &&
+	mkdir simple &&
+	echo base >simple/bar &&
+	git add -A &&
+	test_tick &&
+	git commit -m base &&
 
-expecting success of 6300.361 'set up trailers for next test': 
-	echo "Some contents" > two &&
-	git add two &&
-	git commit -F - <<-EOF
-	trailers: this commit message has trailers
+	git checkout -b other &&
+	echo more >>simple/bar &&
+	test_tick &&
+	git commit -a -m changesimplefile &&
 
-	Some message contents
+	git checkout topic &&
+	git rm sub1 &&
+	git mv sub2 sub1 &&
+	test_tick &&
+	git commit -m changefiletodir &&
 
-	$(cat trailers)
-	EOF
+	test_tick &&
+	git merge other
 
-[main 36c72cc] trailers: this commit message has trailers
+HEAD is now at b57c6be Merge branch 'rename-ln' into rename
+Switched to a new branch 'topic'
+rm 'a'
+rm 'b'
+rm 'c'
+rm 'd/e'
+rm 'e'
+warning: adding embedded git repository: sym
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sym
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sym
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[topic a277014] base
+ Author: A U Thor <author@example.com>
+ 22 files changed, 42 insertions(+), 2 deletions(-)
+ delete mode 120000 a
+ create mode 100644 actual
+ create mode 100644 actual-err
+ create mode 100644 actual-files
+ rename b => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e (50%)
+ rename c => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0 (50%)
+ create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d
+ create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
+ delete mode 100644 e
+ create mode 100644 expected
+ create mode 100644 expected-files
+ create mode 100644 ours-has-rename-index
+ create mode 100644 ours-has-rename-work/b/c
+ create mode 100644 out
+ create mode 100644 simple/bar
+ create mode 100644 sub1
+ create mode 100644 sub2/file1
+ create mode 100644 sub2/file2
+ create mode 100644 sub2/file3
+ create mode 160000 sym
+ create mode 100644 theirs-has-rename-index
+ rename {d => theirs-has-rename-work}/e (100%)
+Switched to a new branch 'other'
+[other 76dbf77] changesimplefile
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two
-ok 361 - set up trailers for next test
-
-expecting success of 6300.362 '%(trailers:unfold) unfolds trailers': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 362 - %(trailers:unfold) unfolds trailers
-
-expecting success of 6300.363 '%(trailers:only) shows only "key: value" trailers': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 363 - %(trailers:only) shows only "key: value" trailers
-
-expecting success of 6300.364 '%(trailers:only=no,only=true) shows only "key: value" trailers': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 364 - %(trailers:only=no,only=true) shows only "key: value" trailers
+Switched to branch 'topic'
+rm 'sub1'
+[topic 99228d6] changefiletodir
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 deletion(-)
+ delete mode 100644 sub1
+ rename {sub2 => sub1}/file1 (100%)
+ rename {sub2 => sub1}/file2 (100%)
+ rename {sub2 => sub1}/file3 (100%)
+Merge made by the 'ort' strategy.
+ simple/bar | 1 +
+ 1 file changed, 1 insertion(+)
+ok 35 - merging with triple rename across D/F conflict
 
-expecting success of 6300.365 '%(trailers:only=yes) shows only "key: value" trailers': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 365 - %(trailers:only=yes) shows only "key: value" trailers
+expecting success of 6430.36 'merge-recursive remembers the names of all base trees': 
+	git reset --hard HEAD &&
 
-expecting success of 6300.366 '%(trailers:only=no) shows all trailers': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 366 - %(trailers:only=no) shows all trailers
+	# make the index match $c1 so that merge-recursive below does not
+	# fail early
+	git diff --binary HEAD $c1 -- | git apply --cached &&
 
-expecting success of 6300.367 '%(trailers:only) and %(trailers:unfold) work together': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 367 - %(trailers:only) and %(trailers:unfold) work together
+	# more trees than static slots used by oid_to_hex()
+	for commit in $c0 $c2 $c4 $c5 $c6 $c7
+	do
+		git rev-parse "$commit^{tree}" || return 1
+	done >trees &&
 
-expecting success of 6300.368 '%(trailers:unfold) and %(trailers:only) work together': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 368 - %(trailers:unfold) and %(trailers:only) work together
+	# ignore the return code; it only fails because the input is weird...
+	test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
 
-expecting success of 6300.369 '%(trailers:key=foo) shows that trailer': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 369 - %(trailers:key=foo) shows that trailer
+	# ...but make sure it fails in the expected way
+	test_grep CONFLICT.*rename/rename out &&
 
-expecting success of 6300.370 '%(trailers:key=foo) is case insensitive': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 370 - %(trailers:key=foo) is case insensitive
+	# merge-recursive prints in reverse order, but we do not care
+	sort <trees >expect &&
+	sed -n "s/^virtual //p" out | sort >actual &&
+	test_cmp expect actual &&
 
-expecting success of 6300.371 '%(trailers:key=foo:) trailing colon also works': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 371 - %(trailers:key=foo:) trailing colon also works
+	git clean -fd
 
-expecting success of 6300.372 '%(trailers:key=foo) multiple keys': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 372 - %(trailers:key=foo) multiple keys
+HEAD is now at aed014f Merge branch 'other' into topic
+CONFLICT (rename/rename): Rename e->a in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Rename a~Temporary merge branch 2_0->a in 918ade1d06dd1c0da47b644356c64b1b2122e705
+Removing actual
+Removing actual-err
+Removing actual-files
+Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
+Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0
+Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d
+Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
+Removing expect
+Removing expected
+Removing expected-files
+Removing ours-has-rename-index
+Removing ours-has-rename-work/
+Removing out
+Removing simple/
+Removing sub1/
+Removing theirs-has-rename-index
+Removing theirs-has-rename-work/
+Removing trees
+ok 36 - merge-recursive remembers the names of all base trees
 
-expecting success of 6300.373 '%(trailers:key=nonexistent) becomes empty': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 373 - %(trailers:key=nonexistent) becomes empty
+expecting success of 6430.37 'merge-recursive internal merge resolves to the sameness': 
+	git reset --hard HEAD &&
 
-expecting success of 6300.374 '%(trailers:key=foo) handles multiple lines even if folded': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 374 - %(trailers:key=foo) handles multiple lines even if folded
+	# We are going to create a history leading to two criss-cross
+	# branches A and B.  The common ancestor at the bottom, O0,
+	# has two child commits O1 and O2, both of which will be merge
+	# base between A and B, like so:
+	#
+	#       O1---A
+	#      /  \ /
+	#    O0    .
+	#      \  / \
+	#       O2---B
+	#
+	# The recently added "check to see if the index is different from
+	# the tree into which something else is getting merged" check must
+	# NOT kick in when an inner merge between O1 and O2 is made.  Both
+	# O1 and O2 happen to have the same tree as O0 in this test to
+	# trigger the bug---whether the inner merge is made by merging O2
+	# into O1 or O1 into O2, their common ancestor O0 and the branch
+	# being merged have the same tree.  We should not trigger the "is
+	# the index dirty?" check in this case.
 
-expecting success of 6300.375 '%(trailers:key=foo,unfold) properly unfolds': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 375 - %(trailers:key=foo,unfold) properly unfolds
+	echo "zero" >file &&
+	git add file &&
+	test_tick &&
+	git commit -m "O0" &&
+	O0=$(git rev-parse HEAD) &&
 
-expecting success of 6300.376 '%(trailers:key=foo,only=no) also includes nontrailer lines': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 376 - %(trailers:key=foo,only=no) also includes nontrailer lines
+	test_tick &&
+	git commit --allow-empty -m "O1" &&
+	O1=$(git rev-parse HEAD) &&
 
-expecting success of 6300.377 '%(trailers:key=foo,valueonly) shows only value': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 377 - %(trailers:key=foo,valueonly) shows only value
+	git reset --hard $O0 &&
+	test_tick &&
+	git commit --allow-empty -m "O2" &&
+	O2=$(git rev-parse HEAD) &&
 
-expecting success of 6300.378 '%(trailers:separator) changes separator': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 378 - %(trailers:separator) changes separator
+	test_tick &&
+	git merge -s ours $O1 &&
+	B=$(git rev-parse HEAD) &&
 
-expecting success of 6300.379 '%(trailers:key_value_separator) changes key-value separator': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 379 - %(trailers:key_value_separator) changes key-value separator
+	git reset --hard $O1 &&
+	test_tick &&
+	git merge -s ours $O2 &&
+	A=$(git rev-parse HEAD) &&
 
-expecting success of 6300.380 '%(trailers:separator,key_value_separator) changes both separators': 
-		git for-each-ref --format="%($option)" refs/heads/main >actual &&
-		test_cmp expect actual &&
-		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
-		test_cmp expect actual
-	
-ok 380 - %(trailers:separator,key_value_separator) changes both separators
+	git merge $B
 
-expecting success of 6300.381 'multiple %(trailers) use their own options': 
-	git tag -F - tag-with-trailers <<-\EOF &&
-	body
+HEAD is now at aed014f Merge branch 'other' into topic
+[topic ee34096] O0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[topic 3e063dc] O1
+ Author: A U Thor <author@example.com>
+HEAD is now at ee34096 O0
+[topic f889116] O2
+ Author: A U Thor <author@example.com>
+Merge made by the 'ours' strategy.
+HEAD is now at 3e063dc O1
+Merge made by the 'ours' strategy.
+Merge made by the 'ort' strategy.
+ok 37 - merge-recursive internal merge resolves to the sameness
 
-	one: foo
-	one: bar
-	two: baz
-	two: qux
-	EOF
-	t1="%(trailers:key=one,key_value_separator=W,separator=X)" &&
-	t2="%(trailers:key=two,key_value_separator=Y,separator=Z)" &&
-	git for-each-ref --format="$t1%0a$t2" refs/tags/tag-with-trailers >actual &&
-	cat >expect <<-\EOF &&
-	oneWfooXoneWbar
-	twoYbazZtwoYqux
-	EOF
-	test_cmp expect actual
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6436-merge-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 381 - multiple %(trailers) use their own options
+[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 6300.382 '%(trailers) rejects unknown trailers arguments': 
-		# error message cannot be checked under i18n
-		test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
-		test_cmp expect actual &&
-		test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
-		test_cmp expect actual
-	
-ok 382 - %(trailers) rejects unknown trailers arguments
+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
 
-expecting success of 6300.383 '%(trailers:key) without value is error': 
-		# error message cannot be checked under i18n
-		test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
-		test_cmp expect actual &&
-		test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
-		test_cmp expect actual
-	
-ok 383 - %(trailers:key) without value is error
+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 6300.384 'if arguments, %(contents:trailers) shows error if colon is missing': 
-	cat >expect <<-EOF &&
-	fatal: unrecognized %(contents) argument: trailersonly
-	EOF
-	test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
-	test_cmp expect actual
+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 384 - if arguments, %(contents:trailers) shows error if colon is missing
+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 6300.385 'basic atom: head contents:trailers': 
-	git for-each-ref --format="%(contents:trailers)" refs/heads/main >actual &&
-	sanitize_pgp <actual >actual.clean &&
-	# git for-each-ref ends with a blank line
-	cat >expect <<-EOF &&
-	$(cat trailers)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 expect actual.clean
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 385 - basic atom: head contents:trailers
+  git switch -c <new-branch-name>
 
-expecting success of 6300.386 'basic atom: rest must fail': 
-	test_must_fail git for-each-ref --format="%(rest)" refs/heads/main
+Or undo this operation with:
 
-fatal: this command reject atom %(rest)
-ok 386 - basic atom: rest must fail
+  git switch -
 
-expecting success of 6300.387 'HEAD atom does not take arguments': 
-	test_must_fail git for-each-ref --format="%(HEAD:foo)" 2>err &&
-	echo "fatal: %(HEAD) does not take arguments" >expect &&
-	test_cmp expect err
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 387 - HEAD atom does not take arguments
+HEAD is now at 48f99e1 c2
+ok 3 - will overwrite tracked file
 
-expecting success of 6300.388 'subject atom rejects unknown arguments': 
-	test_must_fail git for-each-ref --format="%(subject:foo)" 2>err &&
-	echo "fatal: unrecognized %(subject) argument: foo" >expect &&
-	test_cmp expect err
+expecting success of 6436.4 'will not overwrite new file': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c2.c
 
-ok 388 - subject atom rejects unknown arguments
+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 6300.389 'refname atom rejects unknown arguments': 
-	test_must_fail git for-each-ref --format="%(refname:foo)" 2>err &&
-	echo "fatal: unrecognized %(refname) argument: foo" >expect &&
-	test_cmp expect err
+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
 
-ok 389 - refname atom rejects unknown arguments
+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 6300.390 'trailer parsing not fooled by --- line': 
-	git commit --allow-empty -F - <<-\EOF &&
-	this is the subject
+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
 
-	This is the body. The message has a "---" line which would confuse a
-	message+patch parser. But here we know we have only a commit message,
-	so we get it right.
+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
 
-	trailer: wrong
-	---
-	This is more body.
+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
 
-	trailer: right
-	EOF
+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
 
-	{
-		echo "trailer: right" &&
-		echo
-	} >expect &&
-	git for-each-ref --format="%(trailers)" refs/heads/main >actual &&
-	test_cmp expect actual
+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
 
-[main 162c31a] this is the subject
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
  Author: A U Thor <author@example.com>
-ok 390 - trailer parsing not fooled by --- line
+ 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 6300.391 'Add symbolic ref for the following tests': 
-	git symbolic-ref refs/heads/sym refs/heads/main
+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
 
-ok 391 - Add symbolic ref for the following tests
+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 6300.392 'Verify usage of %(symref) atom': 
-	git for-each-ref --format="%(symref)" refs/heads/sym >actual &&
-	test_cmp expected actual
+expecting success of 6436.10 'will not overwrite untracked subtree': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	mkdir -p sub/f &&
+	cp important sub/f/important &&
+	test_must_fail git merge sub &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important sub/f/important
 
-ok 392 - Verify usage of %(symref) atom
+HEAD is now at 934056f c0
+error: Updating the following directories would lose untracked files in them:
+	sub/f
 
-expecting success of 6300.393 'Verify usage of %(symref:short) atom': 
-	git for-each-ref --format="%(symref:short)" refs/heads/sym >actual &&
-	test_cmp expected actual
+Aborting
+Updating 934056f..55608b7
+ok 10 - will not overwrite untracked subtree
 
-ok 393 - Verify usage of %(symref:short) atom
+expecting success of 6436.11 'will not overwrite untracked file in leading path': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	cp important sub &&
+	cp important sub2 &&
+	test_must_fail git merge sub 2>out &&
+	test_cmp out expect &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important sub &&
+	test_cmp important sub2 &&
+	rm -f sub sub2
 
-expecting success of 6300.394 'Verify usage of %(symref:lstrip) atom': 
-	git for-each-ref --format="%(symref:lstrip=2)" refs/heads/sym > actual &&
-	git for-each-ref --format="%(symref:lstrip=-2)" refs/heads/sym >> actual &&
-	test_cmp expected actual &&
+HEAD is now at 934056f c0
+Updating 934056f..55608b7
+ok 11 - will not overwrite untracked file in leading path
 
-	git for-each-ref --format="%(symref:strip=2)" refs/heads/sym > actual &&
-	git for-each-ref --format="%(symref:strip=-2)" refs/heads/sym >> actual &&
-	test_cmp expected actual
+checking prerequisite: SYMLINKS
 
-ok 394 - Verify usage of %(symref:lstrip) atom
+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 6300.395 'Verify usage of %(symref:rstrip) atom': 
-	git for-each-ref --format="%(symref:rstrip=2)" refs/heads/sym > actual &&
-	git for-each-ref --format="%(symref:rstrip=-2)" refs/heads/sym >> actual &&
-	test_cmp expected actual
+)
+prerequisite SYMLINKS ok
+expecting success of 6436.12 'will not overwrite untracked symlink in leading path': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	mkdir sub2 &&
+	ln -s sub2 sub &&
+	test_must_fail git merge sub &&
+	test_path_is_missing .git/MERGE_HEAD
 
-ok 395 - Verify usage of %(symref:rstrip) atom
+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 6300.396 ':remotename and :remoteref': 
-	git init remote-tests &&
-	(
-		cd remote-tests &&
-		test_commit initial &&
-		git branch -M main &&
-		git remote add from fifth.coffee:blub &&
-		git config branch.main.remote from &&
-		git config branch.main.merge refs/heads/stable &&
-		git remote add to southridge.audio:repo &&
-		git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
-		git config branch.main.pushRemote to &&
-		for pair in "%(upstream)=refs/remotes/from/stable" \
-			"%(upstream:remotename)=from" \
-			"%(upstream:remoteref)=refs/heads/stable" \
-			"%(push)=refs/remotes/to/pushed/main" \
-			"%(push:remotename)=to" \
-			"%(push:remoteref)=refs/heads/pushed/main"
-		do
-			echo "${pair#*=}" >expect &&
-			git for-each-ref --format="${pair%=*}" \
-				refs/heads/main >actual &&
-			test_cmp expect actual || exit 1
-		done &&
-		git branch push-simple &&
-		git config branch.push-simple.pushRemote from &&
-		actual="$(git for-each-ref \
-			--format="%(push:remotename),%(push:remoteref)" \
-			refs/heads/push-simple)" &&
-		test from, = "$actual"
-	)
+expecting success of 6436.13 'will not be confused by symlink in leading path': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	test_ln_s_add sub2 sub &&
+	git commit -m ln &&
+	git checkout sub
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6300-for-each-ref/remote-tests/.git/
-[master (root-commit) d39e3de] initial
+HEAD is now at 934056f c0
+[detached HEAD 6d387d8] ln
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 396 - :remotename and :remoteref
-
-expecting success of 6300.397 'for-each-ref --ignore-case ignores case': 
-	git for-each-ref --format="%(refname)" refs/heads/MAIN >actual &&
-	test_must_be_empty actual &&
-
-	echo refs/heads/main >expect &&
-	git for-each-ref --format="%(refname)" --ignore-case \
-		refs/heads/MAIN >actual &&
-	test_cmp expect actual
-
-ok 397 - for-each-ref --ignore-case ignores case
+ create mode 120000 sub
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 6300.398 'for-each-ref --omit-empty works': 
-	git for-each-ref --format="%(refname)" >actual &&
-	test_line_count -gt 1 actual &&
-	git for-each-ref --format="%(if:equals=refs/heads/main)%(refname)%(then)%(refname)%(end)" --omit-empty >actual &&
-	echo refs/heads/main >expect &&
-	test_cmp expect actual
+  6d387d8 ln
 
-ok 398 - for-each-ref --omit-empty works
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 6300.399 'for-each-ref --ignore-case works on multiple sort keys': 
-	# name refs numerically to avoid case-insensitive filesystem conflicts
-	nr=0 &&
-	for email in a A b B
-	do
-		for subject in a A b B
-		do
-			GIT_COMMITTER_EMAIL="$email@example.com" \
-			git tag -m "tag $subject" icase-$(printf %02d $nr) &&
-			nr=$((nr+1))||
-			return 1
-		done
-	done &&
-	git for-each-ref --ignore-case \
-		--format="%(taggeremail) %(subject) %(refname)" \
-		--sort=refname \
-		--sort=subject \
-		--sort=taggeremail \
-		refs/tags/icase-* >actual &&
-	cat >expect <<-\EOF &&
-	<a@example.com> tag a refs/tags/icase-00
-	<a@example.com> tag A refs/tags/icase-01
-	<A@example.com> tag a refs/tags/icase-04
-	<A@example.com> tag A refs/tags/icase-05
-	<a@example.com> tag b refs/tags/icase-02
-	<a@example.com> tag B refs/tags/icase-03
-	<A@example.com> tag b refs/tags/icase-06
-	<A@example.com> tag B refs/tags/icase-07
-	<b@example.com> tag a refs/tags/icase-08
-	<b@example.com> tag A refs/tags/icase-09
-	<B@example.com> tag a refs/tags/icase-12
-	<B@example.com> tag A refs/tags/icase-13
-	<b@example.com> tag b refs/tags/icase-10
-	<b@example.com> tag B refs/tags/icase-11
-	<B@example.com> tag b refs/tags/icase-14
-	<B@example.com> tag B refs/tags/icase-15
-	EOF
-	test_cmp expect actual
+ git branch <new-branch-name> 6d387d8
 
-ok 399 - for-each-ref --ignore-case works on multiple sort keys
+HEAD is now at 55608b7 sub
+ok 13 - will not be confused by symlink in leading path
 
-expecting success of 6300.400 'for-each-ref reports broken tags': 
-	git tag -m "good tag" broken-tag-good HEAD &&
-	git cat-file tag broken-tag-good >good &&
-	sed s/commit/blob/ <good >bad &&
-	bad=$(git hash-object -w -t tag bad) &&
-	git update-ref refs/tags/broken-tag-bad $bad &&
-	test_must_fail git for-each-ref --format="%(*objectname)" \
-		refs/tags/broken-tag-*
+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
 
-error: object 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 is a blob, not a commit
-error: bad tag pointer to 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 in e255b902e9d4c778ee8afe8f03860bf47e156c33
-fatal: parse_object_buffer failed on e255b902e9d4c778ee8afe8f03860bf47e156c33 for refs/tags/broken-tag-good
-162c31a2a5b32b318cc50810cb2d7e9167ed5df4
-ok 400 - for-each-ref reports broken tags
+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 6300.401 'set up tag with signature and no blank lines': 
-	git tag -F - fake-sig-no-blanks <<-\EOF
-	this is the subject
-	-----BEGIN PGP SIGNATURE-----
-	not a real signature, but we just care about the
-	subject/body parsing. It is important here that
-	there are no blank lines in the signature.
-	-----END PGP SIGNATURE-----
-	EOF
+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 401 - set up tag with signature and no blank lines
+ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
 
-ok 402 # skip basic atom: refs/tags/fake-sig-no-blanks contents:subject (missing GPG)
+expecting success of 6436.16 'failed merge leaves unborn branch in the womb': 
+	test_must_fail git rev-parse --verify HEAD
 
-ok 403 # skip basic atom: refs/tags/fake-sig-no-blanks contents:body (missing GPG)
+fatal: Needed a single revision
+ok 16 - failed merge leaves unborn branch in the womb
 
-ok 404 # skip basic atom: refs/tags/fake-sig-no-blanks contents:signature (missing GPG)
+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
 
-expecting success of 6300.405 'set up tag with CRLF signature': 
-	append_cr <<-\EOF |
-	this is the subject
-	-----BEGIN PGP SIGNATURE-----
+ok 17 - set up unborn branch and content
 
-	not a real signature, but we just care about
-	the subject/body parsing. It is important here
-	that there is a blank line separating this
-	from the signature header.
-	-----END PGP SIGNATURE-----
-	EOF
-	git tag -F - --cleanup=verbatim fake-sig-crlf
+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
 
-ok 405 - set up tag with CRLF signature
+foo
+foo
+bar
+ok 18 - will not clobber WT/index when merging into unborn
 
-ok 406 # skip basic atom: refs/tags/fake-sig-crlf contents:subject (missing GPG)
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6439-merge-co-error-msgs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6439-merge-co-error-msgs/.git/
+expecting success of 6439.1 'setup': 
+	echo one >one &&
+	git add one &&
+	git commit -a -m First &&
 
-ok 407 # skip basic atom: refs/tags/fake-sig-crlf contents:body (missing GPG)
+	git checkout -b branch &&
+	echo two >two &&
+	echo three >three &&
+	echo four >four &&
+	echo five >five &&
+	git add two three four five &&
+	git commit -m Second &&
 
-ok 408 # skip basic atom: refs/tags/fake-sig-crlf contents:signature (missing GPG)
+	git checkout main &&
+	echo other >two &&
+	echo other >three &&
+	echo other >four &&
+	echo other >five
 
-expecting success of 6300.409 'set up tag with signature and trailers': 
-	git tag -F - fake-sig-trailer <<-\EOF
-	this is the subject
+[main (root-commit) 3083e2d] First
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+Switched to a new branch 'branch'
+[branch c53906c] Second
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 five
+ create mode 100644 four
+ create mode 100644 three
+ create mode 100644 two
+Switched to branch 'main'
+ok 1 - setup
 
-	this is the body
+expecting success of 6439.2 'untracked files overwritten by merge (fast and non-fast forward)': 
+	test_must_fail git merge branch 2>out &&
+	test_cmp out expect &&
+	git commit --allow-empty -m empty &&
+	(
+		GIT_MERGE_VERBOSITY=0 &&
+		export GIT_MERGE_VERBOSITY &&
+		test_must_fail git merge branch 2>out2
+	) &&
+	echo "Merge with strategy ${GIT_TEST_MERGE_ALGORITHM:-ort} failed." >>expect &&
+	test_cmp out2 expect &&
+	git reset --hard HEAD^
 
-	My-Trailer: foo
-	-----BEGIN PGP SIGNATURE-----
+Updating 3083e2d..c53906c
+[main 47a855e] empty
+ Author: A U Thor <author@example.com>
+HEAD is now at 3083e2d First
+ok 2 - untracked files overwritten by merge (fast and non-fast forward)
 
-	not a real signature, but we just care about the
-	subject/body/trailer parsing.
-	-----END PGP SIGNATURE-----
-	EOF
+expecting success of 6439.3 'untracked files or local changes overwritten by merge': 
+	git add two &&
+	git add three &&
+	git add four &&
+	test_must_fail git merge branch 2>out &&
+	test_cmp out expect
 
-ok 409 - set up tag with signature and trailers
+Updating 3083e2d..c53906c
+ok 3 - untracked files or local changes overwritten by merge
 
-ok 410 # skip basic atom: refs/tags/fake-sig-trailer trailers:separator= (missing GPG)
+expecting success of 6439.4 'cannot switch branches because of local changes': 
+	git add five &&
+	mkdir rep &&
+	echo one >rep/one &&
+	echo two >rep/two &&
+	git add rep/one rep/two &&
+	git commit -m Fourth &&
+	git checkout main &&
+	echo uno >rep/one &&
+	echo dos >rep/two &&
+	test_must_fail git checkout branch 2>out &&
+	test_cmp out expect
 
-expecting success of 6300.411 'git for-each-ref --stdin: empty': 
-	>in &&
-	git for-each-ref --format="%(refname)" --stdin <in >actual &&
-	git for-each-ref --format="%(refname)" >expect &&
-	test_cmp expect actual
+[main d37de72] Fourth
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 five
+ create mode 100644 four
+ create mode 100644 rep/one
+ create mode 100644 rep/two
+ create mode 100644 three
+ create mode 100644 two
+Already on 'main'
+ok 4 - cannot switch branches because of local changes
 
-ok 411 - git for-each-ref --stdin: empty
+expecting success of 6439.5 'not uptodate file porcelain checkout error': 
+	git add rep/one rep/two &&
+	test_must_fail git checkout branch 2>out &&
+	test_cmp out expect
 
-expecting success of 6300.412 'git for-each-ref --stdin: fails if extra args': 
-	>in &&
-	test_must_fail git for-each-ref --format="%(refname)" \
-		--stdin refs/heads/extra <in 2>err &&
-	grep "unknown arguments supplied with --stdin" err
+ok 5 - not uptodate file porcelain checkout error
 
-fatal: unknown arguments supplied with --stdin
-ok 412 - git for-each-ref --stdin: fails if extra args
+expecting success of 6439.6 'not_uptodate_dir porcelain checkout error': 
+	git init uptodate &&
+	cd uptodate &&
+	mkdir rep &&
+	mkdir rep2 &&
+	touch rep/foo &&
+	touch rep2/foo &&
+	git add rep/foo rep2/foo &&
+	git commit -m init &&
+	git checkout -b branch &&
+	git rm rep -r &&
+	git rm rep2 -r &&
+	>rep &&
+	>rep2 &&
+	git add rep rep2 &&
+	git commit -m "added test as a file" &&
+	git checkout main &&
+	>rep/untracked-file &&
+	>rep2/untracked-file &&
+	test_must_fail git checkout branch 2>out &&
+	test_cmp out ../expect
 
-expecting success of 6300.413 'git for-each-ref --stdin: matches': 
-	cat >in <<-EOF &&
-	refs/tags/multi*
-	refs/heads/amb*
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6439-merge-co-error-msgs/uptodate/.git/
+[main (root-commit) 12cbe1c] init
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 rep/foo
+ create mode 100644 rep2/foo
+Switched to a new branch 'branch'
+rm 'rep/foo'
+rm 'rep2/foo'
+[branch 5db55b7] added test as a file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename rep/foo => rep (100%)
+ rename rep2/foo => rep2 (100%)
+Switched to branch 'main'
+ok 6 - not_uptodate_dir porcelain checkout error
 
-	cat >expect <<-EOF &&
-	refs/heads/ambiguous
-	refs/tags/multi-ref1-100000-user1
-	refs/tags/multi-ref1-100000-user2
-	refs/tags/multi-ref1-200000-user1
-	refs/tags/multi-ref1-200000-user2
-	refs/tags/multi-ref2-100000-user1
-	refs/tags/multi-ref2-100000-user2
-	refs/tags/multi-ref2-200000-user1
-	refs/tags/multi-ref2-200000-user2
-	refs/tags/multiline
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6434-merge-recursive-rename-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
 
-	git for-each-ref --format="%(refname)" --stdin <in >actual &&
-	test_cmp expect actual
-
-ok 413 - git for-each-ref --stdin: matches
-
-expecting success of 6300.414 'git for-each-ref with non-existing refs': 
-	cat >in <<-EOF &&
-	refs/heads/this-ref-does-not-exist
-	refs/tags/bogus
-	EOF
+[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
 
-	git for-each-ref --format="%(refname)" --stdin <in >actual &&
-	test_must_be_empty actual &&
+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%"
 
-	xargs git for-each-ref --format="%(refname)" <in >actual &&
-	test_must_be_empty actual
+ok 2 - setup thresholds
 
-ok 414 - git for-each-ref with non-existing refs
+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
 
-expecting success of 6300.415 'git for-each-ref with nested tags': 
-	git tag -am "Normal tag" nested/base HEAD &&
-	git tag -am "Nested tag" nested/nest1 refs/tags/nested/base &&
-	git tag -am "Double nested tag" nested/nest2 refs/tags/nested/nest1 &&
+ok 3 - assumption for tests: rename detection with diff
 
-	head_oid="$(git rev-parse HEAD)" &&
-	base_tag_oid="$(git rev-parse refs/tags/nested/base)" &&
-	nest1_tag_oid="$(git rev-parse refs/tags/nested/nest1)" &&
-	nest2_tag_oid="$(git rev-parse refs/tags/nested/nest2)" &&
+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
 
-	cat >expect <<-EOF &&
-	refs/tags/nested/base $base_tag_oid tag $head_oid commit
-	refs/tags/nested/nest1 $nest1_tag_oid tag $head_oid commit
-	refs/tags/nested/nest2 $nest2_tag_oid tag $head_oid commit
-	EOF
+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%
 
-	git for-each-ref \
-		--format="%(refname) %(objectname) %(objecttype) %(*objectname) %(*objecttype)" \
-		refs/tags/nested/ >actual &&
-	test_cmp expect actual
+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
 
-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/nest1 refs/tags/nested/base^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f nested/nest2 refs/tags/nested/nest1^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-ok 415 - git for-each-ref with nested tags
+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 6300.416 'is-base atom with non-commits': 
-	git for-each-ref --format="%(is-base:HEAD) %(refname)" >out 2>err &&
-	grep "(HEAD) refs/heads/main" out &&
+expecting success of 6434.6 'medium rename threshold': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th1 $tail &&
+	check_threshold_1
 
-	test_line_count = 2 err &&
-	grep "error: object .* is a commit, not a blob" err &&
-	grep "error: bad tag pointer to" err
+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
 
-(HEAD) refs/heads/main
-error: object 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 is a commit, not a blob
-error: bad tag pointer to 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 in 353e4af1e10eb770022fdbffe88f62e05fa29e05
-ok 416 - is-base atom with non-commits
+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
 
-ok 417 # skip setup for signature atom using gpg (missing GPG)
+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
 
-checking prerequisite: GPGSSH
+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
 
-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;
+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
 
-	# 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 &&
+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
 
-	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
+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
 
-	# 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
+expecting success of 6434.10 'disabled rename detection': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --no-renames $tail &&
+	check_no_renames
 
-)
-prerequisite GPGSSH not satisfied
-ok 418 # skip setup for signature atom using ssh (missing GPGSSH)
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 10 - disabled rename detection
 
-checking prerequisite: GPG2
+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
 
-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
+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>
 
-	case "$gpg_version" in
-	"gpg (GnuPG) "[01].*)
-		say "This test requires a GPG version >= v2.0.0"
-		exit 1
-		;;
-	*)
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
+expecting success of 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
 
-)
-prerequisite GPG2 not satisfied
-ok 419 # skip bare signature atom (missing GPG2)
+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
 
-ok 420 # skip show good signature with custom format (missing GPG)
+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
 
-ok 421 # skip show good signature with custom format with ssh (missing GPGSSH)
+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
 
-ok 422 # skip signature atom with grade option and bad signature (missing GPG)
+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
 
-ok 423 # skip show untrusted signature with custom format (missing GPG)
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 14 - last wins in --find-renames --no-renames
 
-ok 424 # skip show untrusted signature with undefined trust level (missing GPG)
+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
 
-ok 425 # skip show untrusted signature with ultimate trust level (missing GPG)
+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
 
-ok 426 # skip show unknown signature with custom format (missing GPG)
+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
 
-ok 427 # skip show lack of signature with custom format (missing GPG)
+fatal: unknown option --find-renames=-25
+ok 16 - --find-renames rejects negative argument
 
-# passed all 427 test(s)
-1..427
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6700-tree-depth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6700-tree-depth/.git/
-expecting success of 6700.1 'create small tree': 
-	mkdeep small $small_depth
+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
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           53 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           51 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              2
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
+fatal: unknown option --find-renames=0xf
+ok 17 - --find-renames rejects non-numbers
 
-ok 1 - create small tree
+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
 
-expecting success of 6700.2 'create big tree': 
-	mkdeep big $big_depth
+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>
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:         4103 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :         4101 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              2
-Memory total:          2868 KiB
-       pools:          2516 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =     152731 /     152731
----------------------------------------------------------------------
+expecting success of 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
 
-ok 2 - create big tree
+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 6700.3 'limit recursion of git-archive': 
-	git $small_ok archive small >/dev/null &&
-	test_must_fail git $small_no archive small >/dev/null
+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
 
-error: exceeded maximum allowed tree depth
-fatal: failed to unpack tree object 89dec2e140b538c88e6d3990453ffc27adfa7fc1
-ok 3 - limit recursion of git-archive
+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 6700.4 'default limit for git-archive fails gracefully': 
-	test_must_fail git archive big >/dev/null
+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
 
-error: exceeded maximum allowed tree depth
-fatal: failed to unpack tree object e0fe3d6d3d70bfe6a08264a50dd1a104cd787427
-ok 4 - default limit for git-archive fails gracefully
+fatal: unknown option --rename-threshold=-25
+ok 21 - --rename-threshold=<n> rejects negative argument
 
-expecting success of 6700.5 'limit recursion of ls-tree -r': 
-	git $small_ok ls-tree -r small &&
-	test_must_fail git $small_no ls-tree -r small
+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
 
-100644 blob d7178a291fc27940d51a7ac20784bb91c5ae524c	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
-error: exceeded maximum allowed tree depth
-ok 5 - limit recursion of ls-tree -r
+fatal: unknown option --rename-threshold=0xf
+ok 22 - --rename-threshold=<n> rejects non-numbers
 
-expecting success of 6700.6 'default limit for ls-tree fails gracefully': 
-	test_must_fail git ls-tree -r big >/dev/null
+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
 
-error: exceeded maximum allowed tree depth
-ok 6 - default limit for ls-tree fails gracefully
+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 6700.7 'limit recursion of rev-list --objects': 
-	git $small_ok rev-list --objects small >/dev/null &&
-	test_must_fail git $small_no rev-list --objects small >/dev/null
+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
 
-fatal: exceeded maximum allowed tree depth
-ok 7 - limit recursion of rev-list --objects
+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 6700.8 'default limit for rev-list fails gracefully': 
-	test_must_fail git rev-list --objects big >/dev/null
+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
 
-fatal: exceeded maximum allowed tree depth
-ok 8 - default limit for rev-list fails gracefully
+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 6700.9 'limit recursion of diff-tree -r': 
-	git $small_ok diff-tree -r $EMPTY_TREE small &&
-	test_must_fail git $small_no diff-tree -r $EMPTY_TREE small
+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
 
-:000000 100644 0000000000000000000000000000000000000000 d7178a291fc27940d51a7ac20784bb91c5ae524c A	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
-fatal: exceeded maximum allowed tree depth
-ok 9 - limit recursion of diff-tree -r
+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 6700.10 'default limit for diff-tree fails gracefully': 
-	test_must_fail git diff-tree -r $EMPTY_TREE big
+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
 
-fatal: exceeded maximum allowed tree depth
-ok 10 - default limit for diff-tree fails gracefully
+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 10 test(s)
-1..10
+# passed all 27 test(s)
+1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6501-freshen-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
-expecting success of 6501.1 'make repo completely empty (loose)': 
-		rm -rf .git &&
-		git init
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
-ok 1 - make repo completely empty (loose)
-
-expecting success of 6501.2 'disable reflogs (loose)': 
-		git config core.logallrefupdates false &&
-		git reflog expire --expire=all --all
-	
-ok 2 - disable reflogs (loose)
+*** t6433-merge-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 6501.3 'setup basic history (loose)': 
-		commit base
-	
-[main (root-commit) 8539479] base
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base
-ok 3 - setup basic history (loose)
-
-expecting success of 6501.4 'create and abandon some objects (loose)': 
-		git checkout -b experiment &&
-		commit abandon &&
-		maybe_repack &&
-		git checkout main &&
-		git branch -D experiment
-	
-Switched to a new branch 'experiment'
-[experiment 20673e5] abandon
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 abandon
-Switched to branch 'main'
-Deleted branch experiment (was 20673e5).
-ok 4 - create and abandon some objects (loose)
-
-expecting success of 6501.5 'simulate time passing (loose)': 
-		test-tool chmtime --get -86400 $(find .git/objects -type f)
-	
-1738997704
-1738997704
-1738997704
-1738997704
-1738997704
-1738997704
-ok 5 - simulate time passing (loose)
-
-expecting success of 6501.6 'start writing new commit with old blob (loose)': 
-		tree=$(
-			GIT_INDEX_FILE=index.tmp &&
-			export GIT_INDEX_FILE &&
-			git read-tree HEAD &&
-			add unrelated &&
-			add abandon &&
-			git write-tree
-		)
-	
-ok 6 - start writing new commit with old blob (loose)
-
-expecting success of 6501.7 'simultaneous gc (loose)': 
-		git gc --no-cruft --prune=12.hours.ago
-	
-ok 7 - simultaneous gc (loose)
-
-expecting success of 6501.8 'finish writing out commit (loose)': 
-		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
-		git update-ref HEAD $commit
-	
-ok 8 - finish writing out commit (loose)
-
-expecting success of 6501.9 'repository passes fsck (loose)': 
-		git fsck
-	
-ok 9 - repository passes fsck (loose)
-
-expecting success of 6501.10 'abandon objects again (loose)': 
-		git reset --hard HEAD^ &&
-		test-tool chmtime --get -86400 $(find .git/objects -type f)
-	
-HEAD is now at 8539479 base
-1738997705
-1738997704
-1738997704
-1738997704
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-ok 10 - abandon objects again (loose)
-
-expecting success of 6501.11 'start writing new commit with same tree (loose)': 
-		tree=$(
-			GIT_INDEX_FILE=index.tmp &&
-			export GIT_INDEX_FILE &&
-			git read-tree HEAD &&
-			add abandon &&
-			add unrelated &&
-			git write-tree
-		)
-	
-ok 11 - start writing new commit with same tree (loose)
-
-expecting success of 6501.12 'simultaneous gc (loose)': 
-		git gc --no-cruft --prune=12.hours.ago
-	
-ok 12 - simultaneous gc (loose)
-
-expecting success of 6501.13 'finish writing out commit (loose)': 
-		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
-		git update-ref HEAD $commit
-	
-ok 13 - finish writing out commit (loose)
-
-expecting success of 6501.14 'make repo completely empty (repack)': 
-		rm -rf .git &&
-		git init
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
-ok 14 - make repo completely empty (repack)
-
-expecting success of 6501.15 'disable reflogs (repack)': 
-		git config core.logallrefupdates false &&
-		git reflog expire --expire=all --all
-	
-ok 15 - disable reflogs (repack)
-
-expecting success of 6501.16 'setup basic history (repack)': 
-		commit base
-	
-[main (root-commit) aa8ecd7] base
+ 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 base
-ok 16 - setup basic history (repack)
-
-expecting success of 6501.17 'create and abandon some objects (repack)': 
-		git checkout -b experiment &&
-		commit abandon &&
-		maybe_repack &&
-		git checkout main &&
-		git branch -D experiment
-	
-Switched to a new branch 'experiment'
-[experiment ff26f38] abandon
+ 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 abandon
+ 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'
-Deleted branch experiment (was ff26f38).
-ok 17 - create and abandon some objects (repack)
-
-expecting success of 6501.18 'simulate time passing (repack)': 
-		test-tool chmtime --get -86400 $(find .git/objects -type f)
-	
-1738997705
-1738997705
-1738997705
-1738997705
-ok 18 - simulate time passing (repack)
-
-expecting success of 6501.19 'start writing new commit with old blob (repack)': 
-		tree=$(
-			GIT_INDEX_FILE=index.tmp &&
-			export GIT_INDEX_FILE &&
-			git read-tree HEAD &&
-			add unrelated &&
-			add abandon &&
-			git write-tree
-		)
-	
-ok 19 - start writing new commit with old blob (repack)
+ok 1 - setup
 
-expecting success of 6501.20 'simultaneous gc (repack)': 
-		git gc --no-cruft --prune=12.hours.ago
-	
-ok 20 - simultaneous gc (repack)
+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
 
-expecting success of 6501.21 'finish writing out commit (repack)': 
-		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
-		git update-ref HEAD $commit
-	
-ok 21 - finish writing out commit (repack)
+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 6501.22 'repository passes fsck (repack)': 
-		git fsck
-	
-dangling commit ff26f380b0104eb69bd2bf57d64d6e29a12ae5fd
-ok 22 - repository passes fsck (repack)
+expecting success of 6433.3 'merge an octopus, fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git merge left right &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^3 &&
+	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
+	git rev-parse three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6501.23 'abandon objects again (repack)': 
-		git reset --hard HEAD^ &&
-		test-tool chmtime --get -86400 $(find .git/objects -type f)
-	
-HEAD is now at aa8ecd7 base
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-ok 23 - abandon objects again (repack)
+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 6501.24 'start writing new commit with same tree (repack)': 
-		tree=$(
-			GIT_INDEX_FILE=index.tmp &&
-			export GIT_INDEX_FILE &&
-			git read-tree HEAD &&
-			add abandon &&
-			add unrelated &&
-			git write-tree
-		)
-	
-ok 24 - start writing new commit with same tree (repack)
+expecting success of 6433.4 'merge octopus, non-fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git merge --no-ff left right &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse one three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6501.25 'simultaneous gc (repack)': 
-		git gc --no-cruft --prune=12.hours.ago
-	
-ok 25 - simultaneous gc (repack)
+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 6501.26 'finish writing out commit (repack)': 
-		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
-		git update-ref HEAD $commit
-	
-ok 26 - finish writing out commit (repack)
+expecting success of 6433.5 'merge octopus, fast-forward (does not ff)': 
+	t3033_reset &&
+	git merge left right &&
+	# two (main) is not an ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6501.27 'make repo completely empty (bitmap)': 
-		rm -rf .git &&
-		git init
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
-ok 27 - make repo completely empty (bitmap)
+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 6501.28 'disable reflogs (bitmap)': 
-		git config core.logallrefupdates false &&
-		git reflog expire --expire=all --all
-	
-ok 28 - disable reflogs (bitmap)
+expecting success of 6433.6 'merge octopus, non-fast-forward': 
+	t3033_reset &&
+	git merge --no-ff left right &&
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6501.29 'setup basic history (bitmap)': 
-		commit base
-	
-[main (root-commit) 41163df] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base
-ok 29 - setup basic history (bitmap)
+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 6501.30 'create and abandon some objects (bitmap)': 
-		git checkout -b experiment &&
-		commit abandon &&
-		maybe_repack &&
-		git checkout main &&
-		git branch -D experiment
-	
-Switched to a new branch 'experiment'
-[experiment 155cd68] abandon
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abandon
-Switched to branch 'main'
-Deleted branch experiment (was 155cd68).
-ok 30 - create and abandon some objects (bitmap)
+expecting success of 6433.7 'merge FETCH_HEAD octopus into void': 
+	t3033_reset &&
+	git checkout --orphan test &&
+	git rm -fr . &&
+	git fetch . left right &&
+	test_must_fail git merge FETCH_HEAD &&
+	test_must_fail git rev-parse --verify HEAD &&
+	git diff --quiet &&
+	test_must_fail git rev-parse HEAD
 
-expecting success of 6501.31 'simulate time passing (bitmap)': 
-		test-tool chmtime --get -86400 $(find .git/objects -type f)
-	
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-ok 31 - simulate time passing (bitmap)
+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 6501.32 'start writing new commit with old blob (bitmap)': 
-		tree=$(
-			GIT_INDEX_FILE=index.tmp &&
-			export GIT_INDEX_FILE &&
-			git read-tree HEAD &&
-			add unrelated &&
-			add abandon &&
-			git write-tree
-		)
-	
-ok 32 - start writing new commit with old blob (bitmap)
+expecting success of 6433.8 'merge FETCH_HEAD octopus fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git fetch . left right &&
+	git merge FETCH_HEAD &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^3 &&
+	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
+	git rev-parse three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6501.33 'simultaneous gc (bitmap)': 
-		git gc --no-cruft --prune=12.hours.ago
-	
-ok 33 - simultaneous gc (bitmap)
+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 6501.34 'finish writing out commit (bitmap)': 
-		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
-		git update-ref HEAD $commit
-	
-ok 34 - finish writing out commit (bitmap)
+expecting success of 6433.9 'merge FETCH_HEAD octopus non-fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git fetch . left right &&
+	git merge --no-ff FETCH_HEAD &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse one three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6501.35 'repository passes fsck (bitmap)': 
-		git fsck
-	
-dangling commit 155cd68c3a09dd48d8ccf822869623886fc88557
-ok 35 - repository passes fsck (bitmap)
+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 6501.36 'abandon objects again (bitmap)': 
-		git reset --hard HEAD^ &&
-		test-tool chmtime --get -86400 $(find .git/objects -type f)
-	
-HEAD is now at 41163df base
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-1738997705
-ok 36 - abandon objects again (bitmap)
+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
 
-expecting success of 6501.37 'start writing new commit with same tree (bitmap)': 
-		tree=$(
-			GIT_INDEX_FILE=index.tmp &&
-			export GIT_INDEX_FILE &&
-			git read-tree HEAD &&
-			add abandon &&
-			add unrelated &&
-			git write-tree
-		)
-	
-ok 37 - start writing new commit with same tree (bitmap)
+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 6501.38 'simultaneous gc (bitmap)': 
-		git gc --no-cruft --prune=12.hours.ago
-	
-ok 38 - simultaneous gc (bitmap)
+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
 
-expecting success of 6501.39 'finish writing out commit (bitmap)': 
-		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
-		git update-ref HEAD $commit
-	
-ok 39 - finish writing out commit (bitmap)
+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 6501.40 'do not complain about existing broken links (commit)': 
-	cat >broken-commit <<-EOF &&
-	tree $(test_oid 001)
-	parent $(test_oid 002)
-	author whatever <whatever@example.com> 1234 -0000
-	committer whatever <whatever@example.com> 1234 -0000
+expecting success of 6433.12 'refuse two-project merge by default': 
+	t3033_reset &&
+	git reset --hard four &&
+	test_must_fail git merge five
 
-	some message
-	EOF
-	commit=$(git hash-object -t commit -w broken-commit) &&
-	git gc --no-cruft -q 2>stderr &&
-	git cat-file -e $commit &&
-	test_must_be_empty stderr
+Reset branch 'main'
+HEAD is now at bd0edcc four
+fatal: refusing to merge unrelated histories
+ok 12 - refuse two-project merge by default
 
-ok 40 - do not complain about existing broken links (commit)
+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
 
-expecting success of 6501.41 'do not complain about existing broken links (tree)': 
-	cat >broken-tree <<-EOF &&
-	100644 blob $(test_oid 003)	foo
-	EOF
-	tree=$(git mktree --missing <broken-tree) &&
-	git gc --no-cruft -q 2>stderr &&
-	git cat-file -e $tree &&
-	test_must_be_empty stderr
+Reset branch 'main'
+HEAD is now at bd0edcc four
+ok 13 - refuse two-project merge by default, quit before --autostash happens
 
-ok 41 - do not complain about existing broken links (tree)
+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
 
-expecting success of 6501.42 'do not complain about existing broken links (tag)': 
-	cat >broken-tag <<-EOF &&
-	object $(test_oid 004)
-	type commit
-	tag broken
-	tagger whatever <whatever@example.com> 1234 -0000
+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
 
-	this is a broken tag
-	EOF
-	tag=$(git hash-object -t tag -w broken-tag) &&
-	git gc --no-cruft -q 2>stderr &&
-	git cat-file -e $tag &&
-	test_must_be_empty stderr
+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
 
-ok 42 - do not complain about existing broken links (tag)
+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 42 test(s)
-1..42
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6422-merge-rename-corner-cases.sh ***
@@ -433375,31 +428982,151 @@
  rename orig => orig-B (91%)
 Note: switching to 'A^0'.
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 7acac62 orig-A
+warning: Cannot merge binary files: orig (HEAD:orig-A vs. B^0:orig-B)
+Auto-merging orig
+CONFLICT (rename/rename): orig renamed to orig-A in HEAD and to orig-B in B^0.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 25 - rename/rename(1to2) with a binary file
+
+# still have 7 known breakage(s)
+# passed all remaining 18 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6700-tree-depth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6700-tree-depth/.git/
+expecting success of 6700.1 'create small tree': 
+	mkdeep small $small_depth
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           53 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           51 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              2
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 1 - create small tree
+
+expecting success of 6700.2 'create big tree': 
+	mkdeep big $big_depth
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:         4103 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :         4101 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              2
+Memory total:          2868 KiB
+       pools:          2516 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     152731 /     152731
+---------------------------------------------------------------------
+
+ok 2 - create big tree
+
+expecting success of 6700.3 'limit recursion of git-archive': 
+	git $small_ok archive small >/dev/null &&
+	test_must_fail git $small_no archive small >/dev/null
+
+error: exceeded maximum allowed tree depth
+fatal: failed to unpack tree object 89dec2e140b538c88e6d3990453ffc27adfa7fc1
+ok 3 - limit recursion of git-archive
+
+expecting success of 6700.4 'default limit for git-archive fails gracefully': 
+	test_must_fail git archive big >/dev/null
+
+error: exceeded maximum allowed tree depth
+fatal: failed to unpack tree object e0fe3d6d3d70bfe6a08264a50dd1a104cd787427
+ok 4 - default limit for git-archive fails gracefully
+
+expecting success of 6700.5 'limit recursion of ls-tree -r': 
+	git $small_ok ls-tree -r small &&
+	test_must_fail git $small_no ls-tree -r small
+
+100644 blob d7178a291fc27940d51a7ac20784bb91c5ae524c	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
+error: exceeded maximum allowed tree depth
+ok 5 - limit recursion of ls-tree -r
+
+expecting success of 6700.6 'default limit for ls-tree fails gracefully': 
+	test_must_fail git ls-tree -r big >/dev/null
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+error: exceeded maximum allowed tree depth
+ok 6 - default limit for ls-tree fails gracefully
 
-  git switch -c <new-branch-name>
+expecting success of 6700.7 'limit recursion of rev-list --objects': 
+	git $small_ok rev-list --objects small >/dev/null &&
+	test_must_fail git $small_no rev-list --objects small >/dev/null
 
-Or undo this operation with:
+fatal: exceeded maximum allowed tree depth
+ok 7 - limit recursion of rev-list --objects
 
-  git switch -
+expecting success of 6700.8 'default limit for rev-list fails gracefully': 
+	test_must_fail git rev-list --objects big >/dev/null
 
-Turn off this advice by setting config variable advice.detachedHead to false
+fatal: exceeded maximum allowed tree depth
+ok 8 - default limit for rev-list fails gracefully
 
-HEAD is now at 7acac62 orig-A
-warning: Cannot merge binary files: orig (HEAD:orig-A vs. B^0:orig-B)
-Auto-merging orig
-CONFLICT (rename/rename): orig renamed to orig-A in HEAD and to orig-B in B^0.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 25 - rename/rename(1to2) with a binary file
+expecting success of 6700.9 'limit recursion of diff-tree -r': 
+	git $small_ok diff-tree -r $EMPTY_TREE small &&
+	test_must_fail git $small_no diff-tree -r $EMPTY_TREE small
 
-# still have 7 known breakage(s)
-# passed all remaining 18 test(s)
-1..25
+:000000 100644 0000000000000000000000000000000000000000 d7178a291fc27940d51a7ac20784bb91c5ae524c A	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
+fatal: exceeded maximum allowed tree depth
+ok 9 - limit recursion of diff-tree -r
+
+expecting success of 6700.10 'default limit for diff-tree fails gracefully': 
+	test_must_fail git diff-tree -r $EMPTY_TREE big
+
+fatal: exceeded maximum allowed tree depth
+ok 10 - default limit for diff-tree fails gracefully
+
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6416-recursive-corner-cases.sh ***
@@ -435435,368 +431162,4314 @@
 		test_tick && git commit -m "left merge, rename b->m" &&
 		git tag L2 &&
 
-		# Create first merge on right side
-		git checkout R &&
-		test_must_fail git merge L1 &&
-		mv -f b_R2 b &&
-		mv -f a_R2 a &&
-		git add b a &&
-		git mv a m &&
-		test_tick && git commit -m "right merge, rename a->m" &&
-		git tag R2
-	)
+		# Create first merge on right side
+		git checkout R &&
+		test_must_fail git merge L1 &&
+		mv -f b_R2 b &&
+		mv -f a_R2 a &&
+		git add b a &&
+		git mv a m &&
+		test_tick && git commit -m "right merge, rename a->m" &&
+		git tag R2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6416-recursive-corner-cases/nested_conflicts/.git/
+[main (root-commit) 64965f6] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 22 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Switched to branch 'L'
+[L e512e8b] version L1 of files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to branch 'R'
+[R ff2c09e] version R1 of files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to branch 'L'
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Automatic merge failed; fix conflicts and then commit the result.
+[L 4085c94] left merge, rename b->m
+ Author: A U Thor <author@example.com>
+Switched to branch 'R'
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Automatic merge failed; fix conflicts and then commit the result.
+[R 6322e9f] right merge, rename a->m
+ Author: A U Thor <author@example.com>
+ok 37 - setup nested conflicts
+
+expecting success of 6416.38 'check nested conflicts': 
+	(
+		cd nested_conflicts &&
+
+		git clean -f &&
+		MAIN=$(git rev-parse --short main) &&
+		git checkout L2^0 &&
+
+		# Merge must fail; there is a conflict
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R2^0 &&
+
+		# Make sure the index has the right number of entries
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		# Ensure we have the correct number of untracked files
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		# Create a and b from virtual merge base X
+		git cat-file -p main:a >base &&
+		git cat-file -p L1:a >ours &&
+		git cat-file -p R1:a >theirs &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "$MAIN"  \
+			-L "Temporary merge branch 2" \
+			ours  \
+			base  \
+			theirs &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_a &&
+
+		git cat-file -p main:b >base &&
+		git cat-file -p L1:b >ours &&
+		git cat-file -p R1:b >theirs &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "$MAIN"  \
+			-L "Temporary merge branch 2" \
+			ours  \
+			base  \
+			theirs &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_b &&
+
+		# Compare :2:m to expected values
+		git cat-file -p L2:m >ours &&
+		git cat-file -p R2:b >theirs &&
+		test_must_fail git merge-file --diff3  \
+			-L "HEAD:m"                    \
+			-L "merged common ancestors:b" \
+			-L "R2^0:b"                    \
+			ours                           \
+			vmb_b                          \
+			theirs                         &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_2 &&
+		git cat-file -p :2:m >actual &&
+		test_cmp m_stage_2 actual &&
+
+		# Compare :3:m to expected values
+		git cat-file -p L2:a >ours &&
+		git cat-file -p R2:m >theirs &&
+		test_must_fail git merge-file --diff3  \
+			-L "HEAD:a"                    \
+			-L "merged common ancestors:a" \
+			-L "R2^0:m"                    \
+			ours                           \
+			vmb_a                          \
+			theirs                         &&
+		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_3 &&
+		git cat-file -p :3:m >actual &&
+		test_cmp m_stage_3 actual &&
+
+		# Compare m to expected contents
+		>empty &&
+		cp m_stage_2 expected_final_m &&
+		test_must_fail git merge-file --diff3 \
+			-L "HEAD"                     \
+			-L "merged common ancestors"  \
+			-L "R2^0"                     \
+			expected_final_m              \
+			empty                         \
+			m_stage_3                     &&
+		test_cmp expected_final_m m
+	)
+
+Removing initial
+Note: switching to 'L2^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 4085c94 left merge, rename b->m
+  From inner merge:  Auto-merging a
+  From inner merge:  CONFLICT (content): Merge conflict in a
+Auto-merging a
+  From inner merge:  Auto-merging b
+  From inner merge:  CONFLICT (content): Merge conflict in b
+Auto-merging b
+CONFLICT (rename involved in collision): rename of a -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
+CONFLICT (rename involved in collision): rename of b -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
+Auto-merging m
+CONFLICT (add/add): Merge conflict in m
+Automatic merge failed; fix conflicts and then commit the result.
+ok 38 - check nested conflicts
+
+expecting success of 6416.39 'setup virtual merge base with nested conflicts': 
+	git init virtual_merge_base_has_nested_conflicts &&
+	(
+		cd virtual_merge_base_has_nested_conflicts &&
+
+		# Create some related files now
+		printf "Random base content line %d\n" $(test_seq 1 10) >content &&
+
+		# Setup original commit
+		git add content &&
+		test_tick && git commit -m initial &&
+
+		git branch L &&
+		git branch R &&
+
+		# Create L1
+		git checkout L &&
+		echo left >>content &&
+		git add content &&
+		test_tick && git commit -m "version L1 of content" &&
+		git tag L1 &&
+
+		# Create R1
+		git checkout R &&
+		echo right >>content &&
+		git add content &&
+		test_tick && git commit -m "version R1 of content" &&
+		git tag R1 &&
+
+		# Create L2
+		git checkout L &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge R1 &&
+		git checkout L1 content &&
+		test_tick && git commit -m "version L2 of content" &&
+		git tag L2 &&
+
+		# Create R2
+		git checkout R &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge L1 &&
+		git checkout R1 content &&
+		test_tick && git commit -m "version R2 of content" &&
+		git tag R2 &&
+
+		# Create L3
+		git checkout L &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge R2 &&
+		git checkout L1 content &&
+		test_tick && git commit -m "version L3 of content" &&
+		git tag L3 &&
+
+		# Create R3
+		git checkout R &&
+		test_must_fail git -c merge.conflictstyle=diff3 merge L2 &&
+		git checkout R1 content &&
+		test_tick && git commit -m "version R3 of content" &&
+		git tag R3
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6416-recursive-corner-cases/virtual_merge_base_has_nested_conflicts/.git/
+[main (root-commit) 0e6d233] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 content
+Switched to branch 'L'
+[L 80f6449] version L1 of content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'R'
+[R 49ac0f6] version R1 of content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'L'
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 42730fb
+[L b5f1211] version L2 of content
+ Author: A U Thor <author@example.com>
+Switched to branch 'R'
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 5ac3d63
+[R d9b26ef] version R2 of content
+ Author: A U Thor <author@example.com>
+Switched to branch 'L'
+  From inner merge:  Auto-merging content
+  From inner merge:  CONFLICT (content): Merge conflict in content
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 42730fb
+[L 747e690] version L3 of content
+ Author: A U Thor <author@example.com>
+Switched to branch 'R'
+  From inner merge:  Auto-merging content
+  From inner merge:  CONFLICT (content): Merge conflict in content
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from 5ac3d63
+[R 1e5e557] version R3 of content
+ Author: A U Thor <author@example.com>
+ok 39 - setup virtual merge base with nested conflicts
+
+expecting success of 6416.40 'check virtual merge base with nested conflicts': 
+	(
+		cd virtual_merge_base_has_nested_conflicts &&
+
+		MAIN=$(git rev-parse --short main) &&
+		git checkout L3^0 &&
+
+		# Merge must fail; there is a conflict
+		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R3^0 &&
+
+		# Make sure the index has the right number of entries
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		# Ensure we have the correct number of untracked files
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		# Compare :[23]:content to expected values
+		git rev-parse L1:content R1:content >expect &&
+		git rev-parse :2:content :3:content >actual &&
+		test_cmp expect actual &&
+
+		# Imitate X1 merge base, except without long enough conflict
+		# markers because a subsequent sed will modify them.  Put
+		# result into vmb.
+		git cat-file -p main:content >base &&
+		git cat-file -p L:content >left &&
+		git cat-file -p R:content >right &&
+		cp left merged-once &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "$MAIN"  \
+			-L "Temporary merge branch 2" \
+			merged-once \
+			base        \
+			right       &&
+		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-once >vmb &&
+
+		# Imitate X2 merge base, overwriting vmb.  Note that we
+		# extend both sets of conflict markers to make them longer
+		# with the sed command.
+		cp left merged-twice &&
+		test_must_fail git merge-file --diff3 \
+			-L "Temporary merge branch 1" \
+			-L "merged common ancestors"  \
+			-L "Temporary merge branch 2" \
+			merged-twice \
+			vmb          \
+			right        &&
+		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-twice >vmb &&
+
+		# Compare :1:content to expected value
+		git cat-file -p :1:content >actual &&
+		test_cmp vmb actual &&
+
+		# Determine expected content in final outer merge, compare to
+		# what the merge generated.
+		cp -f left expect &&
+		test_must_fail git merge-file --diff3                      \
+			-L "HEAD"  -L "merged common ancestors"  -L "R3^0" \
+			expect     vmb                           right     &&
+		test_cmp expect content
+	)
+
+Note: switching to 'L3^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 747e690 version L3 of content
+  From inner merge:    Auto-merging content
+  From inner merge:    CONFLICT (content): Merge conflict in content
+  From inner merge:  Auto-merging content
+  From inner merge:  CONFLICT (content): Merge conflict in content
+Auto-merging content
+CONFLICT (content): Merge conflict in content
+Automatic merge failed; fix conflicts and then commit the result.
+ok 40 - check virtual merge base with nested conflicts
+
+# still have 3 known breakage(s)
+# passed all remaining 37 test(s)
+1..40
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6501-freshen-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
+expecting success of 6501.1 'make repo completely empty (loose)': 
+		rm -rf .git &&
+		git init
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
+ok 1 - make repo completely empty (loose)
+
+expecting success of 6501.2 'disable reflogs (loose)': 
+		git config core.logallrefupdates false &&
+		git reflog expire --expire=all --all
+	
+ok 2 - disable reflogs (loose)
+
+expecting success of 6501.3 'setup basic history (loose)': 
+		commit base
+	
+[main (root-commit) 8539479] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+ok 3 - setup basic history (loose)
+
+expecting success of 6501.4 'create and abandon some objects (loose)': 
+		git checkout -b experiment &&
+		commit abandon &&
+		maybe_repack &&
+		git checkout main &&
+		git branch -D experiment
+	
+Switched to a new branch 'experiment'
+[experiment 20673e5] abandon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abandon
+Switched to branch 'main'
+Deleted branch experiment (was 20673e5).
+ok 4 - create and abandon some objects (loose)
+
+expecting success of 6501.5 'simulate time passing (loose)': 
+		test-tool chmtime --get -86400 $(find .git/objects -type f)
+	
+1773408888
+1773408888
+1773408888
+1773408887
+1773408887
+1773408887
+ok 5 - simulate time passing (loose)
+
+expecting success of 6501.6 'start writing new commit with old blob (loose)': 
+		tree=$(
+			GIT_INDEX_FILE=index.tmp &&
+			export GIT_INDEX_FILE &&
+			git read-tree HEAD &&
+			add unrelated &&
+			add abandon &&
+			git write-tree
+		)
+	
+ok 6 - start writing new commit with old blob (loose)
+
+expecting success of 6501.7 'simultaneous gc (loose)': 
+		git gc --no-cruft --prune=12.hours.ago
+	
+ok 7 - simultaneous gc (loose)
+
+expecting success of 6501.8 'finish writing out commit (loose)': 
+		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
+		git update-ref HEAD $commit
+	
+ok 8 - finish writing out commit (loose)
+
+expecting success of 6501.9 'repository passes fsck (loose)': 
+		git fsck
+	
+ok 9 - repository passes fsck (loose)
+
+expecting success of 6501.10 'abandon objects again (loose)': 
+		git reset --hard HEAD^ &&
+		test-tool chmtime --get -86400 $(find .git/objects -type f)
+	
+HEAD is now at 8539479 base
+1773408888
+1773408888
+1773408888
+1773408888
+1773408888
+1773408888
+1773408888
+1773408888
+1773408888
+ok 10 - abandon objects again (loose)
+
+expecting success of 6501.11 'start writing new commit with same tree (loose)': 
+		tree=$(
+			GIT_INDEX_FILE=index.tmp &&
+			export GIT_INDEX_FILE &&
+			git read-tree HEAD &&
+			add abandon &&
+			add unrelated &&
+			git write-tree
+		)
+	
+ok 11 - start writing new commit with same tree (loose)
+
+expecting success of 6501.12 'simultaneous gc (loose)': 
+		git gc --no-cruft --prune=12.hours.ago
+	
+ok 12 - simultaneous gc (loose)
+
+expecting success of 6501.13 'finish writing out commit (loose)': 
+		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
+		git update-ref HEAD $commit
+	
+ok 13 - finish writing out commit (loose)
+
+expecting success of 6501.14 'make repo completely empty (repack)': 
+		rm -rf .git &&
+		git init
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
+ok 14 - make repo completely empty (repack)
+
+expecting success of 6501.15 'disable reflogs (repack)': 
+		git config core.logallrefupdates false &&
+		git reflog expire --expire=all --all
+	
+ok 15 - disable reflogs (repack)
+
+expecting success of 6501.16 'setup basic history (repack)': 
+		commit base
+	
+[main (root-commit) aa8ecd7] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+ok 16 - setup basic history (repack)
+
+expecting success of 6501.17 'create and abandon some objects (repack)': 
+		git checkout -b experiment &&
+		commit abandon &&
+		maybe_repack &&
+		git checkout main &&
+		git branch -D experiment
+	
+Switched to a new branch 'experiment'
+[experiment ff26f38] abandon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abandon
+Switched to branch 'main'
+Deleted branch experiment (was ff26f38).
+ok 17 - create and abandon some objects (repack)
+
+expecting success of 6501.18 'simulate time passing (repack)': 
+		test-tool chmtime --get -86400 $(find .git/objects -type f)
+	
+1773408889
+1773408889
+1773408889
+1773408889
+ok 18 - simulate time passing (repack)
+
+expecting success of 6501.19 'start writing new commit with old blob (repack)': 
+		tree=$(
+			GIT_INDEX_FILE=index.tmp &&
+			export GIT_INDEX_FILE &&
+			git read-tree HEAD &&
+			add unrelated &&
+			add abandon &&
+			git write-tree
+		)
+	
+ok 19 - start writing new commit with old blob (repack)
+
+expecting success of 6501.20 'simultaneous gc (repack)': 
+		git gc --no-cruft --prune=12.hours.ago
+	
+ok 20 - simultaneous gc (repack)
+
+expecting success of 6501.21 'finish writing out commit (repack)': 
+		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
+		git update-ref HEAD $commit
+	
+ok 21 - finish writing out commit (repack)
+
+expecting success of 6501.22 'repository passes fsck (repack)': 
+		git fsck
+	
+dangling commit ff26f380b0104eb69bd2bf57d64d6e29a12ae5fd
+ok 22 - repository passes fsck (repack)
+
+expecting success of 6501.23 'abandon objects again (repack)': 
+		git reset --hard HEAD^ &&
+		test-tool chmtime --get -86400 $(find .git/objects -type f)
+	
+HEAD is now at aa8ecd7 base
+1773408889
+1773408889
+1773408889
+1773408889
+1773408889
+1773408889
+1773408889
+1773408889
+1773408889
+1773408889
+1773408889
+ok 23 - abandon objects again (repack)
+
+expecting success of 6501.24 'start writing new commit with same tree (repack)': 
+		tree=$(
+			GIT_INDEX_FILE=index.tmp &&
+			export GIT_INDEX_FILE &&
+			git read-tree HEAD &&
+			add abandon &&
+			add unrelated &&
+			git write-tree
+		)
+	
+ok 24 - start writing new commit with same tree (repack)
+
+expecting success of 6501.25 'simultaneous gc (repack)': 
+		git gc --no-cruft --prune=12.hours.ago
+	
+ok 25 - simultaneous gc (repack)
+
+expecting success of 6501.26 'finish writing out commit (repack)': 
+		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
+		git update-ref HEAD $commit
+	
+ok 26 - finish writing out commit (repack)
+
+expecting success of 6501.27 'make repo completely empty (bitmap)': 
+		rm -rf .git &&
+		git init
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6501-freshen-objects/.git/
+ok 27 - make repo completely empty (bitmap)
+
+expecting success of 6501.28 'disable reflogs (bitmap)': 
+		git config core.logallrefupdates false &&
+		git reflog expire --expire=all --all
+	
+ok 28 - disable reflogs (bitmap)
+
+expecting success of 6501.29 'setup basic history (bitmap)': 
+		commit base
+	
+[main (root-commit) 41163df] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+ok 29 - setup basic history (bitmap)
+
+expecting success of 6501.30 'create and abandon some objects (bitmap)': 
+		git checkout -b experiment &&
+		commit abandon &&
+		maybe_repack &&
+		git checkout main &&
+		git branch -D experiment
+	
+Switched to a new branch 'experiment'
+[experiment 155cd68] abandon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abandon
+Switched to branch 'main'
+Deleted branch experiment (was 155cd68).
+ok 30 - create and abandon some objects (bitmap)
+
+expecting success of 6501.31 'simulate time passing (bitmap)': 
+		test-tool chmtime --get -86400 $(find .git/objects -type f)
+	
+1773408890
+1773408890
+1773408890
+1773408890
+1773408890
+ok 31 - simulate time passing (bitmap)
+
+expecting success of 6501.32 'start writing new commit with old blob (bitmap)': 
+		tree=$(
+			GIT_INDEX_FILE=index.tmp &&
+			export GIT_INDEX_FILE &&
+			git read-tree HEAD &&
+			add unrelated &&
+			add abandon &&
+			git write-tree
+		)
+	
+ok 32 - start writing new commit with old blob (bitmap)
+
+expecting success of 6501.33 'simultaneous gc (bitmap)': 
+		git gc --no-cruft --prune=12.hours.ago
+	
+ok 33 - simultaneous gc (bitmap)
+
+expecting success of 6501.34 'finish writing out commit (bitmap)': 
+		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
+		git update-ref HEAD $commit
+	
+ok 34 - finish writing out commit (bitmap)
+
+expecting success of 6501.35 'repository passes fsck (bitmap)': 
+		git fsck
+	
+dangling commit 155cd68c3a09dd48d8ccf822869623886fc88557
+ok 35 - repository passes fsck (bitmap)
+
+expecting success of 6501.36 'abandon objects again (bitmap)': 
+		git reset --hard HEAD^ &&
+		test-tool chmtime --get -86400 $(find .git/objects -type f)
+	
+HEAD is now at 41163df base
+1773408891
+1773408890
+1773408890
+1773408890
+1773408890
+1773408890
+1773408891
+1773408891
+1773408891
+1773408891
+1773408891
+ok 36 - abandon objects again (bitmap)
+
+expecting success of 6501.37 'start writing new commit with same tree (bitmap)': 
+		tree=$(
+			GIT_INDEX_FILE=index.tmp &&
+			export GIT_INDEX_FILE &&
+			git read-tree HEAD &&
+			add abandon &&
+			add unrelated &&
+			git write-tree
+		)
+	
+ok 37 - start writing new commit with same tree (bitmap)
+
+expecting success of 6501.38 'simultaneous gc (bitmap)': 
+		git gc --no-cruft --prune=12.hours.ago
+	
+ok 38 - simultaneous gc (bitmap)
+
+expecting success of 6501.39 'finish writing out commit (bitmap)': 
+		commit=$(echo foo | git commit-tree -p HEAD $tree) &&
+		git update-ref HEAD $commit
+	
+ok 39 - finish writing out commit (bitmap)
+
+expecting success of 6501.40 'do not complain about existing broken links (commit)': 
+	cat >broken-commit <<-EOF &&
+	tree $(test_oid 001)
+	parent $(test_oid 002)
+	author whatever <whatever@example.com> 1234 -0000
+	committer whatever <whatever@example.com> 1234 -0000
+
+	some message
+	EOF
+	commit=$(git hash-object -t commit -w broken-commit) &&
+	git gc --no-cruft -q 2>stderr &&
+	git cat-file -e $commit &&
+	test_must_be_empty stderr
+
+ok 40 - do not complain about existing broken links (commit)
+
+expecting success of 6501.41 'do not complain about existing broken links (tree)': 
+	cat >broken-tree <<-EOF &&
+	100644 blob $(test_oid 003)	foo
+	EOF
+	tree=$(git mktree --missing <broken-tree) &&
+	git gc --no-cruft -q 2>stderr &&
+	git cat-file -e $tree &&
+	test_must_be_empty stderr
+
+ok 41 - do not complain about existing broken links (tree)
+
+expecting success of 6501.42 'do not complain about existing broken links (tag)': 
+	cat >broken-tag <<-EOF &&
+	object $(test_oid 004)
+	type commit
+	tag broken
+	tagger whatever <whatever@example.com> 1234 -0000
+
+	this is a broken tag
+	EOF
+	tag=$(git hash-object -t tag -w broken-tag) &&
+	git gc --no-cruft -q 2>stderr &&
+	git cat-file -e $tag &&
+	test_must_be_empty stderr
+
+ok 42 - do not complain about existing broken links (tag)
+
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6300-for-each-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6300-for-each-ref/.git/
+expecting success of 6300.1 'setup': 
+	# setup .mailmap
+	cat >.mailmap <<-EOF &&
+	A Thor <athor@example.com> A U Thor <author@example.com>
+	C Mitter <cmitter@example.com> C O Mitter <committer@example.com>
+	EOF
+
+	setdate_and_increment &&
+	echo "Using $datestamp" > one &&
+	git add one &&
+	git commit -m "Initial" &&
+	git branch -M main &&
+	setdate_and_increment &&
+	git tag -a -m "Tagging at $datestamp" testtag &&
+	git update-ref refs/remotes/origin/main main &&
+	git remote add origin nowhere &&
+	git config branch.main.remote origin &&
+	git config branch.main.merge refs/heads/main &&
+	git remote add myfork elsewhere &&
+	git config remote.pushdefault myfork &&
+	git config push.default current
+
+[master (root-commit) ea12284] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+ok 1 - setup
+
+expecting success of 6300.2 'basic atom: refs/heads/main refname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 2 - basic atom: refs/heads/main refname
+
+expecting success of 6300.3 'basic atom: refs/heads/main refname:': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 3 - basic atom: refs/heads/main refname:
+
+expecting success of 6300.4 'basic atom: refs/heads/main refname:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 4 - basic atom: refs/heads/main refname:short
+
+expecting success of 6300.5 'basic atom: refs/heads/main refname:lstrip=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 5 - basic atom: refs/heads/main refname:lstrip=1
+
+expecting success of 6300.6 'basic atom: refs/heads/main refname:lstrip=2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 6 - basic atom: refs/heads/main refname:lstrip=2
+
+expecting success of 6300.7 'basic atom: refs/heads/main refname:lstrip=-1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 7 - basic atom: refs/heads/main refname:lstrip=-1
+
+expecting success of 6300.8 'basic atom: refs/heads/main refname:lstrip=-2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 8 - basic atom: refs/heads/main refname:lstrip=-2
+
+expecting success of 6300.9 'basic atom: refs/heads/main refname:rstrip=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 9 - basic atom: refs/heads/main refname:rstrip=1
+
+expecting success of 6300.10 'basic atom: refs/heads/main refname:rstrip=2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 10 - basic atom: refs/heads/main refname:rstrip=2
+
+expecting success of 6300.11 'basic atom: refs/heads/main refname:rstrip=-1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 11 - basic atom: refs/heads/main refname:rstrip=-1
+
+expecting success of 6300.12 'basic atom: refs/heads/main refname:rstrip=-2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 12 - basic atom: refs/heads/main refname:rstrip=-2
+
+expecting success of 6300.13 'basic atom: refs/heads/main refname:strip=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 13 - basic atom: refs/heads/main refname:strip=1
+
+expecting success of 6300.14 'basic atom: refs/heads/main refname:strip=2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 14 - basic atom: refs/heads/main refname:strip=2
+
+expecting success of 6300.15 'basic atom: refs/heads/main refname:strip=-1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 15 - basic atom: refs/heads/main refname:strip=-1
+
+expecting success of 6300.16 'basic atom: refs/heads/main refname:strip=-2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 16 - basic atom: refs/heads/main refname:strip=-2
+
+expecting success of 6300.17 'basic atom: refs/heads/main upstream': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 17 - basic atom: refs/heads/main upstream
+
+expecting success of 6300.18 'basic atom: refs/heads/main upstream:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 18 - basic atom: refs/heads/main upstream:short
+
+expecting success of 6300.19 'basic atom: refs/heads/main upstream:lstrip=2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 19 - basic atom: refs/heads/main upstream:lstrip=2
+
+expecting success of 6300.20 'basic atom: refs/heads/main upstream:lstrip=-2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 20 - basic atom: refs/heads/main upstream:lstrip=-2
+
+expecting success of 6300.21 'basic atom: refs/heads/main upstream:rstrip=2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 21 - basic atom: refs/heads/main upstream:rstrip=2
+
+expecting success of 6300.22 'basic atom: refs/heads/main upstream:rstrip=-2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 22 - basic atom: refs/heads/main upstream:rstrip=-2
+
+expecting success of 6300.23 'basic atom: refs/heads/main upstream:strip=2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 23 - basic atom: refs/heads/main upstream:strip=2
+
+expecting success of 6300.24 'basic atom: refs/heads/main upstream:strip=-2': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 24 - basic atom: refs/heads/main upstream:strip=-2
+
+expecting success of 6300.25 'basic atom: refs/heads/main push': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 25 - basic atom: refs/heads/main push
+
+expecting success of 6300.26 'basic atom: refs/heads/main push:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 26 - basic atom: refs/heads/main push:short
+
+expecting success of 6300.27 'basic atom: refs/heads/main push:lstrip=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 27 - basic atom: refs/heads/main push:lstrip=1
+
+expecting success of 6300.28 'basic atom: refs/heads/main push:lstrip=-1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 28 - basic atom: refs/heads/main push:lstrip=-1
+
+expecting success of 6300.29 'basic atom: refs/heads/main push:rstrip=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 29 - basic atom: refs/heads/main push:rstrip=1
+
+expecting success of 6300.30 'basic atom: refs/heads/main push:rstrip=-1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 30 - basic atom: refs/heads/main push:rstrip=-1
+
+expecting success of 6300.31 'basic atom: refs/heads/main push:strip=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 31 - basic atom: refs/heads/main push:strip=1
+
+expecting success of 6300.32 'basic atom: refs/heads/main push:strip=-1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 32 - basic atom: refs/heads/main push:strip=-1
+
+expecting success of 6300.33 'basic atom: refs/heads/main objecttype': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 33 - basic atom: refs/heads/main objecttype
+
+expecting success of 6300.34 'basic atom: refs/heads/main objectsize': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 34 - basic atom: refs/heads/main objectsize
+
+expecting success of 6300.35 'basic atom: refs/heads/main objectsize:disk': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 35 - basic atom: refs/heads/main objectsize:disk
+
+expecting success of 6300.36 'basic atom: refs/heads/main deltabase': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 36 - basic atom: refs/heads/main deltabase
+
+expecting success of 6300.37 'basic atom: refs/heads/main objectname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 37 - basic atom: refs/heads/main objectname
+
+expecting success of 6300.38 'basic atom: refs/heads/main objectname:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 38 - basic atom: refs/heads/main objectname:short
+
+expecting success of 6300.39 'basic atom: refs/heads/main objectname:short=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 39 - basic atom: refs/heads/main objectname:short=1
+
+expecting success of 6300.40 'basic atom: refs/heads/main objectname:short=10': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 40 - basic atom: refs/heads/main objectname:short=10
+
+expecting success of 6300.41 'basic atom: refs/heads/main tree': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 41 - basic atom: refs/heads/main tree
+
+expecting success of 6300.42 'basic atom: refs/heads/main tree:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 42 - basic atom: refs/heads/main tree:short
+
+expecting success of 6300.43 'basic atom: refs/heads/main tree:short=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 43 - basic atom: refs/heads/main tree:short=1
+
+expecting success of 6300.44 'basic atom: refs/heads/main tree:short=10': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 44 - basic atom: refs/heads/main tree:short=10
+
+expecting success of 6300.45 'basic atom: refs/heads/main parent': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 45 - basic atom: refs/heads/main parent
+
+expecting success of 6300.46 'basic atom: refs/heads/main parent:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 46 - basic atom: refs/heads/main parent:short
+
+expecting success of 6300.47 'basic atom: refs/heads/main parent:short=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 47 - basic atom: refs/heads/main parent:short=1
+
+expecting success of 6300.48 'basic atom: refs/heads/main parent:short=10': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 48 - basic atom: refs/heads/main parent:short=10
+
+expecting success of 6300.49 'basic atom: refs/heads/main numparent': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 49 - basic atom: refs/heads/main numparent
+
+expecting success of 6300.50 'basic atom: refs/heads/main object': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 50 - basic atom: refs/heads/main object
+
+expecting success of 6300.51 'basic atom: refs/heads/main type': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 51 - basic atom: refs/heads/main type
+
+expecting success of 6300.52 'basic atom: refs/heads/main raw': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 52 - basic atom: refs/heads/main raw
+
+expecting success of 6300.53 'basic atom: refs/heads/main *objectname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 53 - basic atom: refs/heads/main *objectname
+
+expecting success of 6300.54 'basic atom: refs/heads/main *objecttype': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 54 - basic atom: refs/heads/main *objecttype
+
+expecting success of 6300.55 'basic atom: refs/heads/main author': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 55 - basic atom: refs/heads/main author
+
+expecting success of 6300.56 'basic atom: refs/heads/main authorname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 56 - basic atom: refs/heads/main authorname
+
+expecting success of 6300.57 'basic atom: refs/heads/main authorname:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 57 - basic atom: refs/heads/main authorname:mailmap
+
+expecting success of 6300.58 'basic atom: refs/heads/main authoremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 58 - basic atom: refs/heads/main authoremail
+
+expecting success of 6300.59 'basic atom: refs/heads/main authoremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 59 - basic atom: refs/heads/main authoremail:trim
+
+expecting success of 6300.60 'basic atom: refs/heads/main authoremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 60 - basic atom: refs/heads/main authoremail:localpart
+
+expecting success of 6300.61 'basic atom: refs/heads/main authoremail:trim,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 61 - basic atom: refs/heads/main authoremail:trim,localpart
+
+expecting success of 6300.62 'basic atom: refs/heads/main authoremail:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 62 - basic atom: refs/heads/main authoremail:mailmap
+
+expecting success of 6300.63 'basic atom: refs/heads/main authoremail:mailmap,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 63 - basic atom: refs/heads/main authoremail:mailmap,trim
+
+expecting success of 6300.64 'basic atom: refs/heads/main authoremail:trim,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 64 - basic atom: refs/heads/main authoremail:trim,mailmap
+
+expecting success of 6300.65 'basic atom: refs/heads/main authoremail:mailmap,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 65 - basic atom: refs/heads/main authoremail:mailmap,localpart
+
+expecting success of 6300.66 'basic atom: refs/heads/main authoremail:localpart,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 66 - basic atom: refs/heads/main authoremail:localpart,mailmap
+
+expecting success of 6300.67 'basic atom: refs/heads/main authoremail:mailmap,trim,localpart,mailmap,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 67 - basic atom: refs/heads/main authoremail:mailmap,trim,localpart,mailmap,trim
+
+expecting success of 6300.68 'basic atom: refs/heads/main authordate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 68 - basic atom: refs/heads/main authordate
+
+expecting success of 6300.69 'basic atom: refs/heads/main committer': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 69 - basic atom: refs/heads/main committer
+
+expecting success of 6300.70 'basic atom: refs/heads/main committername': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 70 - basic atom: refs/heads/main committername
+
+expecting success of 6300.71 'basic atom: refs/heads/main committername:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 71 - basic atom: refs/heads/main committername:mailmap
+
+expecting success of 6300.72 'basic atom: refs/heads/main committeremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 72 - basic atom: refs/heads/main committeremail
+
+expecting success of 6300.73 'basic atom: refs/heads/main committeremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 73 - basic atom: refs/heads/main committeremail:trim
+
+expecting success of 6300.74 'basic atom: refs/heads/main committeremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 74 - basic atom: refs/heads/main committeremail:localpart
+
+expecting success of 6300.75 'basic atom: refs/heads/main committeremail:localpart,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 75 - basic atom: refs/heads/main committeremail:localpart,trim
+
+expecting success of 6300.76 'basic atom: refs/heads/main committeremail:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 76 - basic atom: refs/heads/main committeremail:mailmap
+
+expecting success of 6300.77 'basic atom: refs/heads/main committeremail:mailmap,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 77 - basic atom: refs/heads/main committeremail:mailmap,trim
+
+expecting success of 6300.78 'basic atom: refs/heads/main committeremail:trim,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 78 - basic atom: refs/heads/main committeremail:trim,mailmap
+
+expecting success of 6300.79 'basic atom: refs/heads/main committeremail:mailmap,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 79 - basic atom: refs/heads/main committeremail:mailmap,localpart
+
+expecting success of 6300.80 'basic atom: refs/heads/main committeremail:localpart,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 80 - basic atom: refs/heads/main committeremail:localpart,mailmap
+
+expecting success of 6300.81 'basic atom: refs/heads/main committeremail:trim,mailmap,trim,trim,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 81 - basic atom: refs/heads/main committeremail:trim,mailmap,trim,trim,localpart
+
+expecting success of 6300.82 'basic atom: refs/heads/main committerdate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 82 - basic atom: refs/heads/main committerdate
+
+expecting success of 6300.83 'basic atom: refs/heads/main tag': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 83 - basic atom: refs/heads/main tag
+
+expecting success of 6300.84 'basic atom: refs/heads/main tagger': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 84 - basic atom: refs/heads/main tagger
+
+expecting success of 6300.85 'basic atom: refs/heads/main taggername': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 85 - basic atom: refs/heads/main taggername
+
+expecting success of 6300.86 'basic atom: refs/heads/main taggeremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 86 - basic atom: refs/heads/main taggeremail
+
+expecting success of 6300.87 'basic atom: refs/heads/main taggeremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 87 - basic atom: refs/heads/main taggeremail:trim
+
+expecting success of 6300.88 'basic atom: refs/heads/main taggeremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 88 - basic atom: refs/heads/main taggeremail:localpart
+
+expecting success of 6300.89 'basic atom: refs/heads/main taggerdate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 89 - basic atom: refs/heads/main taggerdate
+
+expecting success of 6300.90 'basic atom: refs/heads/main creator': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 90 - basic atom: refs/heads/main creator
+
+expecting success of 6300.91 'basic atom: refs/heads/main creatordate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 91 - basic atom: refs/heads/main creatordate
+
+expecting success of 6300.92 'basic atom: refs/heads/main subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 92 - basic atom: refs/heads/main subject
+
+expecting success of 6300.93 'basic atom: refs/heads/main subject:sanitize': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 93 - basic atom: refs/heads/main subject:sanitize
+
+expecting success of 6300.94 'basic atom: refs/heads/main contents:subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 94 - basic atom: refs/heads/main contents:subject
+
+expecting success of 6300.95 'basic atom: refs/heads/main body': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 95 - basic atom: refs/heads/main body
+
+expecting success of 6300.96 'basic atom: refs/heads/main contents:body': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 96 - basic atom: refs/heads/main contents:body
+
+expecting success of 6300.97 'basic atom: refs/heads/main contents:signature': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 97 - basic atom: refs/heads/main contents:signature
+
+expecting success of 6300.98 'basic atom: refs/heads/main contents': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 98 - basic atom: refs/heads/main contents
+
+expecting success of 6300.99 'basic atom: refs/heads/main contents:size': 
+			type=$(git cat-file -t "$ref") &&
+			case $type in
+			tag)
+				# We cannot use $3 as it expects sanitize_pgp to run
+				git cat-file tag $ref >out &&
+				expect=$(tail -n +6 out | wc -c) &&
+				rm -f out ;;
+			tree | blob)
+				expect="" ;;
+			commit)
+				: "use the calculated expect" ;;
+			*)
+				BUG "unknown object type" ;;
+			esac &&
+			# Leave $expect unquoted to lose possible leading whitespaces
+			echo $expect >expected &&
+			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
+			test_cmp expected actual
+		
+ok 99 - basic atom: refs/heads/main contents:size
+
+expecting success of 6300.100 'basic atom: refs/heads/main HEAD': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 100 - basic atom: refs/heads/main HEAD
+
+expecting success of 6300.101 'basic atom: refs/tags/testtag refname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 101 - basic atom: refs/tags/testtag refname
+
+expecting success of 6300.102 'basic atom: refs/tags/testtag refname:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 102 - basic atom: refs/tags/testtag refname:short
+
+expecting success of 6300.103 'basic atom: refs/tags/testtag upstream': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 103 - basic atom: refs/tags/testtag upstream
+
+expecting success of 6300.104 'basic atom: refs/tags/testtag push': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 104 - basic atom: refs/tags/testtag push
+
+expecting success of 6300.105 'basic atom: refs/tags/testtag objecttype': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 105 - basic atom: refs/tags/testtag objecttype
+
+expecting success of 6300.106 'basic atom: refs/tags/testtag objectsize': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 106 - basic atom: refs/tags/testtag objectsize
+
+expecting success of 6300.107 'basic atom: refs/tags/testtag objectsize:disk': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 107 - basic atom: refs/tags/testtag objectsize:disk
+
+expecting success of 6300.108 'basic atom: refs/tags/testtag *objectsize:disk': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 108 - basic atom: refs/tags/testtag *objectsize:disk
+
+expecting success of 6300.109 'basic atom: refs/tags/testtag deltabase': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 109 - basic atom: refs/tags/testtag deltabase
+
+expecting success of 6300.110 'basic atom: refs/tags/testtag *deltabase': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 110 - basic atom: refs/tags/testtag *deltabase
+
+expecting success of 6300.111 'basic atom: refs/tags/testtag objectname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 111 - basic atom: refs/tags/testtag objectname
+
+expecting success of 6300.112 'basic atom: refs/tags/testtag objectname:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 112 - basic atom: refs/tags/testtag objectname:short
+
+expecting success of 6300.113 'basic atom: refs/heads/main objectname:short=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 113 - basic atom: refs/heads/main objectname:short=1
+
+expecting success of 6300.114 'basic atom: refs/heads/main objectname:short=10': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 114 - basic atom: refs/heads/main objectname:short=10
+
+expecting success of 6300.115 'basic atom: refs/tags/testtag tree': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 115 - basic atom: refs/tags/testtag tree
+
+expecting success of 6300.116 'basic atom: refs/tags/testtag tree:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 116 - basic atom: refs/tags/testtag tree:short
+
+expecting success of 6300.117 'basic atom: refs/tags/testtag tree:short=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 117 - basic atom: refs/tags/testtag tree:short=1
+
+expecting success of 6300.118 'basic atom: refs/tags/testtag tree:short=10': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 118 - basic atom: refs/tags/testtag tree:short=10
+
+expecting success of 6300.119 'basic atom: refs/tags/testtag parent': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 119 - basic atom: refs/tags/testtag parent
+
+expecting success of 6300.120 'basic atom: refs/tags/testtag parent:short': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 120 - basic atom: refs/tags/testtag parent:short
+
+expecting success of 6300.121 'basic atom: refs/tags/testtag parent:short=1': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 121 - basic atom: refs/tags/testtag parent:short=1
+
+expecting success of 6300.122 'basic atom: refs/tags/testtag parent:short=10': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 122 - basic atom: refs/tags/testtag parent:short=10
+
+expecting success of 6300.123 'basic atom: refs/tags/testtag numparent': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 123 - basic atom: refs/tags/testtag numparent
+
+expecting success of 6300.124 'basic atom: refs/tags/testtag object': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 124 - basic atom: refs/tags/testtag object
+
+expecting success of 6300.125 'basic atom: refs/tags/testtag type': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 125 - basic atom: refs/tags/testtag type
+
+expecting success of 6300.126 'basic atom: refs/tags/testtag *objectname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 126 - basic atom: refs/tags/testtag *objectname
+
+expecting success of 6300.127 'basic atom: refs/tags/testtag *objecttype': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 127 - basic atom: refs/tags/testtag *objecttype
+
+expecting success of 6300.128 'basic atom: refs/tags/testtag author': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 128 - basic atom: refs/tags/testtag author
+
+expecting success of 6300.129 'basic atom: refs/tags/testtag authorname': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 129 - basic atom: refs/tags/testtag authorname
+
+expecting success of 6300.130 'basic atom: refs/tags/testtag authorname:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 130 - basic atom: refs/tags/testtag authorname:mailmap
+
+expecting success of 6300.131 'basic atom: refs/tags/testtag authoremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 131 - basic atom: refs/tags/testtag authoremail
+
+expecting success of 6300.132 'basic atom: refs/tags/testtag authoremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 132 - basic atom: refs/tags/testtag authoremail:trim
+
+expecting success of 6300.133 'basic atom: refs/tags/testtag authoremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 133 - basic atom: refs/tags/testtag authoremail:localpart
+
+expecting success of 6300.134 'basic atom: refs/tags/testtag authoremail:trim,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 134 - basic atom: refs/tags/testtag authoremail:trim,localpart
+
+expecting success of 6300.135 'basic atom: refs/tags/testtag authoremail:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 135 - basic atom: refs/tags/testtag authoremail:mailmap
+
+expecting success of 6300.136 'basic atom: refs/tags/testtag authoremail:mailmap,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 136 - basic atom: refs/tags/testtag authoremail:mailmap,trim
+
+expecting success of 6300.137 'basic atom: refs/tags/testtag authoremail:trim,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 137 - basic atom: refs/tags/testtag authoremail:trim,mailmap
+
+expecting success of 6300.138 'basic atom: refs/tags/testtag authoremail:mailmap,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 138 - basic atom: refs/tags/testtag authoremail:mailmap,localpart
+
+expecting success of 6300.139 'basic atom: refs/tags/testtag authoremail:localpart,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 139 - basic atom: refs/tags/testtag authoremail:localpart,mailmap
+
+expecting success of 6300.140 'basic atom: refs/tags/testtag authoremail:mailmap,trim,localpart,mailmap,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 140 - basic atom: refs/tags/testtag authoremail:mailmap,trim,localpart,mailmap,trim
+
+expecting success of 6300.141 'basic atom: refs/tags/testtag authordate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 141 - basic atom: refs/tags/testtag authordate
+
+expecting success of 6300.142 'basic atom: refs/tags/testtag committer': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 142 - basic atom: refs/tags/testtag committer
+
+expecting success of 6300.143 'basic atom: refs/tags/testtag committername': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 143 - basic atom: refs/tags/testtag committername
+
+expecting success of 6300.144 'basic atom: refs/tags/testtag committername:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 144 - basic atom: refs/tags/testtag committername:mailmap
+
+expecting success of 6300.145 'basic atom: refs/tags/testtag committeremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 145 - basic atom: refs/tags/testtag committeremail
+
+expecting success of 6300.146 'basic atom: refs/tags/testtag committeremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 146 - basic atom: refs/tags/testtag committeremail:trim
+
+expecting success of 6300.147 'basic atom: refs/tags/testtag committeremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 147 - basic atom: refs/tags/testtag committeremail:localpart
+
+expecting success of 6300.148 'basic atom: refs/tags/testtag committeremail:localpart,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 148 - basic atom: refs/tags/testtag committeremail:localpart,trim
+
+expecting success of 6300.149 'basic atom: refs/tags/testtag committeremail:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 149 - basic atom: refs/tags/testtag committeremail:mailmap
+
+expecting success of 6300.150 'basic atom: refs/tags/testtag committeremail:mailmap,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 150 - basic atom: refs/tags/testtag committeremail:mailmap,trim
+
+expecting success of 6300.151 'basic atom: refs/tags/testtag committeremail:trim,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 151 - basic atom: refs/tags/testtag committeremail:trim,mailmap
+
+expecting success of 6300.152 'basic atom: refs/tags/testtag committeremail:mailmap,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 152 - basic atom: refs/tags/testtag committeremail:mailmap,localpart
+
+expecting success of 6300.153 'basic atom: refs/tags/testtag committeremail:localpart,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 153 - basic atom: refs/tags/testtag committeremail:localpart,mailmap
+
+expecting success of 6300.154 'basic atom: refs/tags/testtag committeremail:trim,mailmap,trim,trim,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 154 - basic atom: refs/tags/testtag committeremail:trim,mailmap,trim,trim,localpart
+
+expecting success of 6300.155 'basic atom: refs/tags/testtag committerdate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 155 - basic atom: refs/tags/testtag committerdate
+
+expecting success of 6300.156 'basic atom: refs/tags/testtag tag': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 156 - basic atom: refs/tags/testtag tag
+
+expecting success of 6300.157 'basic atom: refs/tags/testtag tagger': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 157 - basic atom: refs/tags/testtag tagger
+
+expecting success of 6300.158 'basic atom: refs/tags/testtag taggername': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 158 - basic atom: refs/tags/testtag taggername
+
+expecting success of 6300.159 'basic atom: refs/tags/testtag taggername:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 159 - basic atom: refs/tags/testtag taggername:mailmap
+
+expecting success of 6300.160 'basic atom: refs/tags/testtag taggeremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 160 - basic atom: refs/tags/testtag taggeremail
+
+expecting success of 6300.161 'basic atom: refs/tags/testtag taggeremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 161 - basic atom: refs/tags/testtag taggeremail:trim
+
+expecting success of 6300.162 'basic atom: refs/tags/testtag taggeremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 162 - basic atom: refs/tags/testtag taggeremail:localpart
+
+expecting success of 6300.163 'basic atom: refs/tags/testtag taggeremail:trim,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 163 - basic atom: refs/tags/testtag taggeremail:trim,localpart
+
+expecting success of 6300.164 'basic atom: refs/tags/testtag taggeremail:mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 164 - basic atom: refs/tags/testtag taggeremail:mailmap
+
+expecting success of 6300.165 'basic atom: refs/tags/testtag taggeremail:mailmap,trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 165 - basic atom: refs/tags/testtag taggeremail:mailmap,trim
+
+expecting success of 6300.166 'basic atom: refs/tags/testtag taggeremail:trim,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 166 - basic atom: refs/tags/testtag taggeremail:trim,mailmap
+
+expecting success of 6300.167 'basic atom: refs/tags/testtag taggeremail:mailmap,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 167 - basic atom: refs/tags/testtag taggeremail:mailmap,localpart
+
+expecting success of 6300.168 'basic atom: refs/tags/testtag taggeremail:localpart,mailmap': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 168 - basic atom: refs/tags/testtag taggeremail:localpart,mailmap
+
+expecting success of 6300.169 'basic atom: refs/tags/testtag taggeremail:trim,mailmap,trim,localpart,localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 169 - basic atom: refs/tags/testtag taggeremail:trim,mailmap,trim,localpart,localpart
+
+expecting success of 6300.170 'basic atom: refs/tags/testtag taggerdate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 170 - basic atom: refs/tags/testtag taggerdate
+
+expecting success of 6300.171 'basic atom: refs/tags/testtag creator': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 171 - basic atom: refs/tags/testtag creator
+
+expecting success of 6300.172 'basic atom: refs/tags/testtag creatordate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 172 - basic atom: refs/tags/testtag creatordate
+
+expecting success of 6300.173 'basic atom: refs/tags/testtag subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 173 - basic atom: refs/tags/testtag subject
+
+expecting success of 6300.174 'basic atom: refs/tags/testtag subject:sanitize': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 174 - basic atom: refs/tags/testtag subject:sanitize
+
+expecting success of 6300.175 'basic atom: refs/tags/testtag contents:subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 175 - basic atom: refs/tags/testtag contents:subject
+
+expecting success of 6300.176 'basic atom: refs/tags/testtag body': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 176 - basic atom: refs/tags/testtag body
+
+expecting success of 6300.177 'basic atom: refs/tags/testtag contents:body': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 177 - basic atom: refs/tags/testtag contents:body
+
+expecting success of 6300.178 'basic atom: refs/tags/testtag contents:signature': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 178 - basic atom: refs/tags/testtag contents:signature
+
+expecting success of 6300.179 'basic atom: refs/tags/testtag contents': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 179 - basic atom: refs/tags/testtag contents
+
+expecting success of 6300.180 'basic atom: refs/tags/testtag contents:size': 
+			type=$(git cat-file -t "$ref") &&
+			case $type in
+			tag)
+				# We cannot use $3 as it expects sanitize_pgp to run
+				git cat-file tag $ref >out &&
+				expect=$(tail -n +6 out | wc -c) &&
+				rm -f out ;;
+			tree | blob)
+				expect="" ;;
+			commit)
+				: "use the calculated expect" ;;
+			*)
+				BUG "unknown object type" ;;
+			esac &&
+			# Leave $expect unquoted to lose possible leading whitespaces
+			echo $expect >expected &&
+			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
+			test_cmp expected actual
+		
+ok 180 - basic atom: refs/tags/testtag contents:size
+
+expecting success of 6300.181 'basic atom: refs/tags/testtag HEAD': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 181 - basic atom: refs/tags/testtag HEAD
+
+expecting success of 6300.182 'basic atom: refs/tags/testtag *raw': 
+	git cat-file commit refs/tags/testtag^{} >expected &&
+	git for-each-ref --format="%(*raw)" refs/tags/testtag >actual &&
+	sanitize_pgp <expected >expected.clean &&
+	echo >>expected.clean &&
+	sanitize_pgp <actual >actual.clean &&
+	test_cmp expected.clean actual.clean
+
+ok 182 - basic atom: refs/tags/testtag *raw
+
+expecting success of 6300.183 'Check invalid atoms names are errors': 
+	test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
+
+fatal: unknown field name: INVALID
+ok 183 - Check invalid atoms names are errors
+
+expecting success of 6300.184 'Check format specifiers are ignored in naming date atoms': 
+	git for-each-ref --format="%(authordate)" refs/heads &&
+	git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
+	git for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
+	git for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
+
+Tue Jul 4 01:18:44 2006 +0200
+Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
+Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
+Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
+ok 184 - Check format specifiers are ignored in naming date atoms
+
+expecting success of 6300.185 'Check valid format specifiers for date fields': 
+	git for-each-ref --format="%(authordate:default)" refs/heads &&
+	git for-each-ref --format="%(authordate:relative)" refs/heads &&
+	git for-each-ref --format="%(authordate:short)" refs/heads &&
+	git for-each-ref --format="%(authordate:local)" refs/heads &&
+	git for-each-ref --format="%(authordate:iso8601)" refs/heads &&
+	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
+
+Tue Jul 4 01:18:44 2006 +0200
+20 years ago
+2006-07-04
+Mon Jul 3 23:18:44 2006
+2006-07-04 01:18:44 +0200
+Tue, 4 Jul 2006 01:18:44 +0200
+ok 185 - Check valid format specifiers for date fields
+
+expecting success of 6300.186 'Check invalid format specifiers are errors': 
+	test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads
+
+fatal: unknown date format INVALID
+ok 186 - Check invalid format specifiers are errors
+
+expecting success of 6300.187 'arguments to %(objectname:short=) must be positive integers': 
+	test_must_fail git for-each-ref --format="%(objectname:short=0)" &&
+	test_must_fail git for-each-ref --format="%(objectname:short=-1)" &&
+	test_must_fail git for-each-ref --format="%(objectname:short=foo)"
+
+fatal: positive value expected '0' in %(objectname:short=0)
+fatal: positive value expected '-1' in %(objectname:short=-1)
+fatal: positive value expected 'foo' in %(objectname:short=foo)
+ok 187 - arguments to %(objectname:short=) must be positive integers
+
+expecting success of 6300.188 'err basic atom: refs/heads/main authoremail:foo': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 188 - err basic atom: refs/heads/main authoremail:foo
+
+expecting success of 6300.189 'err basic atom: refs/heads/main authoremail:mailmap,trim,bar': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 189 - err basic atom: refs/heads/main authoremail:mailmap,trim,bar
+
+expecting success of 6300.190 'err basic atom: refs/heads/main authoremail:trim,': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 190 - err basic atom: refs/heads/main authoremail:trim,
+
+expecting success of 6300.191 'err basic atom: refs/heads/main authoremail:mailmaptrim': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 191 - err basic atom: refs/heads/main authoremail:mailmaptrim
+
+expecting success of 6300.192 'err basic atom: refs/heads/main committeremail: ': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 192 - err basic atom: refs/heads/main committeremail: 
+
+expecting success of 6300.193 'err basic atom: refs/heads/main committeremail: trim,foo': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 193 - err basic atom: refs/heads/main committeremail: trim,foo
+
+expecting success of 6300.194 'err basic atom: refs/heads/main committeremail:mailmap,localpart ': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 194 - err basic atom: refs/heads/main committeremail:mailmap,localpart 
+
+expecting success of 6300.195 'err basic atom: refs/heads/main committeremail:trim_localpart': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 195 - err basic atom: refs/heads/main committeremail:trim_localpart
+
+expecting success of 6300.196 'err basic atom: refs/heads/main committeremail:localpart,,,trim': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 196 - err basic atom: refs/heads/main committeremail:localpart,,,trim
+
+expecting success of 6300.197 'err basic atom: refs/tags/testtag taggeremail:mailmap,trim, foo ': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 197 - err basic atom: refs/tags/testtag taggeremail:mailmap,trim, foo 
+
+expecting success of 6300.198 'err basic atom: refs/tags/testtag taggeremail:trim,localpart,': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 198 - err basic atom: refs/tags/testtag taggeremail:trim,localpart,
+
+expecting success of 6300.199 'err basic atom: refs/tags/testtag taggeremail:mailmap;localpart trim': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 199 - err basic atom: refs/tags/testtag taggeremail:mailmap;localpart trim
+
+expecting success of 6300.200 'err basic atom: refs/tags/testtag taggeremail:localpart trim': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 200 - err basic atom: refs/tags/testtag taggeremail:localpart trim
+
+expecting success of 6300.201 'err basic atom: refs/tags/testtag taggeremail:mailmap,mailmap,trim,qux,localpart,trim': 
+		test_must_fail git for-each-ref \
+			--format="%($format)" "$ref" 2>error &&
+		test_cmp expect error
+	
+ok 201 - err basic atom: refs/tags/testtag taggeremail:mailmap,mailmap,trim,qux,localpart,trim
+
+expecting success of 6300.202 'Check unformatted date fields output': 
+	test_date "" \
+		"Tue Jul 4 01:18:43 2006 +0200" \
+		"Tue Jul 4 01:18:44 2006 +0200" \
+		"Tue Jul 4 01:18:45 2006 +0200"
+
+ok 202 - Check unformatted date fields output
+
+expecting success of 6300.203 'Check format "default" formatted date fields output': 
+	test_date default \
+		"Tue Jul 4 01:18:43 2006 +0200" \
+		"Tue Jul 4 01:18:44 2006 +0200" \
+		"Tue Jul 4 01:18:45 2006 +0200"
+
+ok 203 - Check format "default" formatted date fields output
+
+expecting success of 6300.204 'Check format "default-local" date fields output': 
+	test_date default-local "Mon Jul 3 23:18:43 2006" "Mon Jul 3 23:18:44 2006" "Mon Jul 3 23:18:45 2006"
+
+ok 204 - Check format "default-local" date fields output
+
+expecting success of 6300.205 'Check format "relative" date fields output': 
+	f=relative &&
+	(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
+	git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual
+
+ok 205 - Check format "relative" date fields output
+
+expecting success of 6300.206 'Check format "relative-local" date fields output': 
+	test_date relative-local \
+		"$(git for-each-ref --format="%(committerdate:relative)" refs/heads)" \
+		"$(git for-each-ref --format="%(authordate:relative)" refs/heads)" \
+		"$(git for-each-ref --format="%(taggerdate:relative)" refs/tags)"
+
+ok 206 - Check format "relative-local" date fields output
+
+expecting success of 6300.207 'Check format "short" date fields output': 
+	test_date short 2006-07-04 2006-07-04 2006-07-04
+
+ok 207 - Check format "short" date fields output
+
+expecting success of 6300.208 'Check format "short-local" date fields output': 
+	test_date short-local 2006-07-03 2006-07-03 2006-07-03
+
+ok 208 - Check format "short-local" date fields output
+
+expecting success of 6300.209 'Check format "local" date fields output': 
+	test_date local \
+		"Mon Jul 3 23:18:43 2006" \
+		"Mon Jul 3 23:18:44 2006" \
+		"Mon Jul 3 23:18:45 2006"
+
+ok 209 - Check format "local" date fields output
+
+expecting success of 6300.210 'Check format "iso8601" date fields output': 
+	test_date iso8601 \
+		"2006-07-04 01:18:43 +0200" \
+		"2006-07-04 01:18:44 +0200" \
+		"2006-07-04 01:18:45 +0200"
+
+ok 210 - Check format "iso8601" date fields output
+
+expecting success of 6300.211 'Check format "iso8601-local" date fields output': 
+	test_date iso8601-local "2006-07-03 23:18:43 +0000" "2006-07-03 23:18:44 +0000" "2006-07-03 23:18:45 +0000"
+
+ok 211 - Check format "iso8601-local" date fields output
+
+expecting success of 6300.212 'Check format "rfc2822" date fields output': 
+	test_date rfc2822 \
+		"Tue, 4 Jul 2006 01:18:43 +0200" \
+		"Tue, 4 Jul 2006 01:18:44 +0200" \
+		"Tue, 4 Jul 2006 01:18:45 +0200"
+
+ok 212 - Check format "rfc2822" date fields output
+
+expecting success of 6300.213 'Check format "rfc2822-local" date fields output': 
+	test_date rfc2822-local "Mon, 3 Jul 2006 23:18:43 +0000" "Mon, 3 Jul 2006 23:18:44 +0000" "Mon, 3 Jul 2006 23:18:45 +0000"
+
+ok 213 - Check format "rfc2822-local" date fields output
+
+expecting success of 6300.214 'Check format "raw" date fields output': 
+	test_date raw "1151968723 +0200" "1151968724 +0200" "1151968725 +0200"
+
+ok 214 - Check format "raw" date fields output
+
+expecting success of 6300.215 'Check format "raw-local" date fields output': 
+	test_date raw-local "1151968723 +0000" "1151968724 +0000" "1151968725 +0000"
+
+ok 215 - Check format "raw-local" date fields output
+
+expecting success of 6300.216 'Check format of strftime date fields': 
+	echo "my date is 2006-07-04" >expected &&
+	git for-each-ref \
+	  --format="%(authordate:format:my date is %Y-%m-%d)" \
+	  refs/heads >actual &&
+	test_cmp expected actual
+
+ok 216 - Check format of strftime date fields
+
+expecting success of 6300.217 'Check format of strftime-local date fields': 
+	echo "my date is 2006-07-03" >expected &&
+	git for-each-ref \
+	  --format="%(authordate:format-local:my date is %Y-%m-%d)" \
+	  refs/heads >actual &&
+	test_cmp expected actual
+
+ok 217 - Check format of strftime-local date fields
+
+expecting success of 6300.218 'exercise strftime with odd fields': 
+	echo >expected &&
+	git for-each-ref --format="%(authordate:format:)" refs/heads >actual &&
+	test_cmp expected actual &&
+	long="long format -- $ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID" &&
+	echo $long >expected &&
+	git for-each-ref --format="%(authordate:format:$long)" refs/heads >actual &&
+	test_cmp expected actual
+
+ok 218 - exercise strftime with odd fields
+
+expecting success of 6300.219 'Verify ascending sort': 
+	git for-each-ref --format="%(refname)" --sort=refname >actual &&
+	test_cmp expected actual
+
+ok 219 - Verify ascending sort
+
+expecting success of 6300.220 'Verify descending sort': 
+	git for-each-ref --format="%(refname)" --sort=-refname >actual &&
+	test_cmp expected actual
+
+ok 220 - Verify descending sort
+
+expecting success of 6300.221 'Give help even with invalid sort atoms': 
+	test_expect_code 129 git for-each-ref --sort=bogus -h >actual 2>&1 &&
+	grep "^usage: git for-each-ref" actual
+
+usage: git for-each-ref [<options>] [<pattern>]
+ok 221 - Give help even with invalid sort atoms
+
+expecting success of 6300.222 'exercise patterns with prefixes': 
+	git tag testtag-2 &&
+	test_when_finished "git tag -d testtag-2" &&
+	git for-each-ref --format="%(refname)" \
+		refs/tags/testtag refs/tags/testtag-2 >actual &&
+	test_cmp expected actual
+
+Deleted tag 'testtag-2' (was ea12284)
+ok 222 - exercise patterns with prefixes
+
+expecting success of 6300.223 'exercise glob patterns with prefixes': 
+	git tag testtag-2 &&
+	test_when_finished "git tag -d testtag-2" &&
+	git for-each-ref --format="%(refname)" \
+		refs/tags/testtag "refs/tags/testtag-*" >actual &&
+	test_cmp expected actual
+
+Deleted tag 'testtag-2' (was ea12284)
+ok 223 - exercise glob patterns with prefixes
+
+expecting success of 6300.224 'exercise patterns with prefix exclusions': 
+	for tag in foo/one foo/two foo/three bar baz
+	do
+		git tag "$tag" || return 1
+	done &&
+	test_when_finished "git tag -d foo/one foo/two foo/three bar baz" &&
+	git for-each-ref --format="%(refname)" \
+		refs/tags/ --exclude=refs/tags/foo >actual &&
+	test_cmp expected actual
+
+Deleted tag 'foo/one' (was ea12284)
+Deleted tag 'foo/two' (was ea12284)
+Deleted tag 'foo/three' (was ea12284)
+Deleted tag 'bar' (was ea12284)
+Deleted tag 'baz' (was ea12284)
+ok 224 - exercise patterns with prefix exclusions
+
+expecting success of 6300.225 'exercise patterns with pattern exclusions': 
+	for tag in foo/one foo/two foo/three bar baz
+	do
+		git tag "$tag" || return 1
+	done &&
+	test_when_finished "git tag -d foo/one foo/two foo/three bar baz" &&
+	git for-each-ref --format="%(refname)" \
+		refs/tags/ --exclude="refs/tags/foo/t*" >actual &&
+	test_cmp expected actual
+
+Deleted tag 'foo/one' (was ea12284)
+Deleted tag 'foo/two' (was ea12284)
+Deleted tag 'foo/three' (was ea12284)
+Deleted tag 'bar' (was ea12284)
+Deleted tag 'baz' (was ea12284)
+ok 225 - exercise patterns with pattern exclusions
+
+expecting success of 6300.226 'Quoting style: shell': 
+	git for-each-ref --shell --format="%(refname)" >actual &&
+	test_cmp expected actual
+
+ok 226 - Quoting style: shell
+
+expecting success of 6300.227 'Quoting style: perl': 
+	git for-each-ref --perl --format="%(refname)" >actual &&
+	test_cmp expected actual
+
+ok 227 - Quoting style: perl
+
+expecting success of 6300.228 'Quoting style: python': 
+	git for-each-ref --python --format="%(refname)" >actual &&
+	test_cmp expected actual
+
+ok 228 - Quoting style: python
+
+expecting success of 6300.229 'Quoting style: tcl': 
+	git for-each-ref --tcl --format="%(refname)" >actual &&
+	test_cmp expected actual
+
+ok 229 - Quoting style: tcl
+
+expecting success of 6300.230 'more than one quoting style: --perl --shell': 
+		test_must_fail git for-each-ref --perl --shell 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 230 - more than one quoting style: --perl --shell
+
+expecting success of 6300.231 'more than one quoting style: -s --python': 
+		test_must_fail git for-each-ref -s --python 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 231 - more than one quoting style: -s --python
+
+expecting success of 6300.232 'more than one quoting style: --python --tcl': 
+		test_must_fail git for-each-ref --python --tcl 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 232 - more than one quoting style: --python --tcl
+
+expecting success of 6300.233 'more than one quoting style: --tcl --perl': 
+		test_must_fail git for-each-ref --tcl --perl 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 233 - more than one quoting style: --tcl --perl
+
+expecting success of 6300.234 'setup for upstream:track[short]': 
+	test_commit two
+
+[main 4ddde45] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 234 - setup for upstream:track[short]
+
+expecting success of 6300.235 'basic atom: refs/heads/main upstream:track': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 235 - basic atom: refs/heads/main upstream:track
+
+expecting success of 6300.236 'basic atom: refs/heads/main upstream:trackshort': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 236 - basic atom: refs/heads/main upstream:trackshort
+
+expecting success of 6300.237 'basic atom: refs/heads/main upstream:track,nobracket': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 237 - basic atom: refs/heads/main upstream:track,nobracket
+
+expecting success of 6300.238 'basic atom: refs/heads/main upstream:nobracket,track': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 238 - basic atom: refs/heads/main upstream:nobracket,track
+
+expecting success of 6300.239 'setup for push:track[short]': 
+	test_commit third &&
+	git update-ref refs/remotes/myfork/main main &&
+	git reset main~1
+
+[main f6c71aa] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+ok 239 - setup for push:track[short]
+
+expecting success of 6300.240 'basic atom: refs/heads/main push:track': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 240 - basic atom: refs/heads/main push:track
+
+expecting success of 6300.241 'basic atom: refs/heads/main push:trackshort': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 241 - basic atom: refs/heads/main push:trackshort
+
+expecting success of 6300.242 'Check that :track[short] cannot be used with other atoms': 
+	test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
+	test_must_fail git for-each-ref --format="%(refname:trackshort)" 2>/dev/null
+
+ok 242 - Check that :track[short] cannot be used with other atoms
+
+expecting success of 6300.243 'Check that :track[short] works when upstream is invalid': 
+	cat >expected <<-\EOF &&
+	[gone]
+
+	EOF
+	test_when_finished "git config branch.main.merge refs/heads/main" &&
+	git config branch.main.merge refs/heads/does-not-exist &&
+	git for-each-ref \
+		--format="%(upstream:track)$LF%(upstream:trackshort)" \
+		refs/heads >actual &&
+	test_cmp expected actual
+
+ok 243 - Check that :track[short] works when upstream is invalid
+
+expecting success of 6300.244 'Check for invalid refname format': 
+	test_must_fail git for-each-ref --format="%(refname:INVALID)"
+
+fatal: unrecognized %(refname) argument: INVALID
+ok 244 - Check for invalid refname format
+
+expecting success of 6300.245 'set up color tests': 
+	cat >expected.color <<-EOF &&
+	$(git rev-parse --short refs/heads/main) <GREEN>main<RESET>
+	$(git rev-parse --short refs/remotes/myfork/main) <GREEN>myfork/main<RESET>
+	$(git rev-parse --short refs/remotes/origin/main) <GREEN>origin/main<RESET>
+	$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
+	$(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
+	$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
+	EOF
+	sed "s/<[^>]*>//g" <expected.color >expected.bare &&
+	color_format="%(objectname:short) %(color:green)%(refname:short)"
+
+ok 245 - set up color tests
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 6300.246 '%(color) shows color with a tty': 
+	test_terminal git for-each-ref --format="$color_format" >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expected.color actual
+
+ok 246 - %(color) shows color with a tty
+
+expecting success of 6300.247 '%(color) does not show color without tty': 
+	TERM=vt100 git for-each-ref --format="$color_format" >actual &&
+	test_cmp expected.bare actual
+
+ok 247 - %(color) does not show color without tty
+
+expecting success of 6300.248 '--color can override tty check': 
+	git for-each-ref --color --format="$color_format" >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expected.color actual
+
+ok 248 - --color can override tty check
+
+expecting success of 6300.249 'color.ui=always does not override tty check': 
+	git -c color.ui=always for-each-ref --format="$color_format" >actual &&
+	test_cmp expected.bare actual
+
+ok 249 - color.ui=always does not override tty check
+
+expecting success of 6300.250 'setup for describe atom tests': 
+	git init -b master describe-repo &&
+	(
+		cd describe-repo &&
+
+		test_commit --no-tag one &&
+		git tag tagone &&
+
+		test_commit --no-tag two &&
+		git tag -a -m "tag two" tagtwo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6300-for-each-ref/describe-repo/.git/
+[master (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 00bbe3d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 250 - setup for describe atom tests
+
+expecting success of 6300.251 'describe atom vs git describe': 
+	(
+		cd describe-repo &&
+
+		git for-each-ref --format="%(objectname)" \
+			refs/tags/ >obj &&
+		while read hash
+		do
+			if desc=$(git describe $hash)
+			then
+				: >expect-contains-good
+			else
+				: >expect-contains-bad
+			fi &&
+			echo "$hash $desc" || return 1
+		done <obj >expect &&
+		test_path_exists expect-contains-good &&
+		test_path_exists expect-contains-bad &&
+
+		git for-each-ref --format="%(objectname) %(describe)" \
+			refs/tags/ >actual 2>err &&
+		test_cmp expect actual &&
+		test_must_be_empty err
+	)
+
+fatal: No annotated tags can describe '4331c280ae8691e937f22f78e998805a89a91a07'.
+However, there were unannotated tags: try --tags.
+ok 251 - describe atom vs git describe
+
+expecting success of 6300.252 'describe:tags vs describe --tags': 
+	(
+		cd describe-repo &&
+		git describe --tags >expect &&
+		git for-each-ref --format="%(describe:tags)" \
+				refs/heads/master >actual &&
+		test_cmp expect actual
+	)
+
+ok 252 - describe:tags vs describe --tags
+
+expecting success of 6300.253 'describe:abbrev=... vs describe --abbrev=...': 
+	(
+		cd describe-repo &&
+
+		# Case 1: We have commits between HEAD and the most
+		#	  recent tag reachable from it
+		test_commit --no-tag file &&
+		git describe --abbrev=14 >expect &&
+		git for-each-ref --format="%(describe:abbrev=14)" \
+			refs/heads/master >actual &&
+		test_cmp expect actual &&
+
+		# Make sure the hash used is at least 14 digits long
+		sed -e "s/^.*-g\([0-9a-f]*\)$/\1/" <actual >hexpart &&
+		test 15 -le $(wc -c <hexpart) &&
+
+		# Case 2: We have a tag at HEAD, describe directly gives
+		#	  the name of the tag
+		git tag -a -m tagged tagname &&
+		git describe --abbrev=14 >expect &&
+		git for-each-ref --format="%(describe:abbrev=14)" \
+			refs/heads/master >actual &&
+		test_cmp expect actual &&
+		test tagname = $(cat actual)
+	)
+
+[master 5fc8694] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 253 - describe:abbrev=... vs describe --abbrev=...
+
+expecting success of 6300.254 'describe:match=... vs describe --match ...': 
+	(
+		cd describe-repo &&
+		git tag -a -m "tag foo" tag-foo &&
+		git describe --match "*-foo" >expect &&
+		git for-each-ref --format="%(describe:match="*-foo")" \
+			refs/heads/master >actual &&
+		test_cmp expect actual
+	)
+
+ok 254 - describe:match=... vs describe --match ...
+
+expecting success of 6300.255 'describe:exclude:... vs describe --exclude ...': 
+	(
+		cd describe-repo &&
+		git tag -a -m "tag bar" tag-bar &&
+		git describe --exclude "*-bar" >expect &&
+		git for-each-ref --format="%(describe:exclude="*-bar")" \
+			refs/heads/master >actual &&
+		test_cmp expect actual
+	)
+
+ok 255 - describe:exclude:... vs describe --exclude ...
+
+expecting success of 6300.256 'deref with describe atom': 
+	(
+		cd describe-repo &&
+		cat >expect <<-\EOF &&
+
+		tagname
+		tagname
+		tagname
+
+		tagtwo
+		EOF
+		git for-each-ref --format="%(*describe)" >actual &&
+		test_cmp expect actual
+	)
+
+ok 256 - deref with describe atom
+
+expecting success of 6300.257 'err on bad describe atom arg': 
+	(
+		cd describe-repo &&
+
+		# The bad arg is the only arg passed to describe atom
+		cat >expect <<-\EOF &&
+		fatal: unrecognized %(describe) argument: baz
+		EOF
+		test_must_fail git for-each-ref --format="%(describe:baz)" \
+			refs/heads/master 2>actual &&
+		test_cmp expect actual &&
+
+		# The bad arg is in the middle of the option string
+		# passed to the describe atom
+		cat >expect <<-\EOF &&
+		fatal: unrecognized %(describe) argument: qux=1,abbrev=14
+		EOF
+		test_must_fail git for-each-ref \
+			--format="%(describe:tags,qux=1,abbrev=14)" \
+			ref/heads/master 2>actual &&
+		test_cmp expect actual
+	)
+
+ok 257 - err on bad describe atom arg
+
+expecting success of 6300.258 'Check ambiguous head and tag refs (strict)': 
+	git config --bool core.warnambiguousrefs true &&
+	git checkout -b newtag &&
+	echo "Using $datestamp" > one &&
+	git add one &&
+	git commit -m "Branch" &&
+	setdate_and_increment &&
+	git tag -m "Tagging at $datestamp" main &&
+	git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
+	test_cmp expected actual
+
+Switched to a new branch 'newtag'
+[newtag dd26b11] Branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 258 - Check ambiguous head and tag refs (strict)
+
+expecting success of 6300.259 'Check ambiguous head and tag refs (loose)': 
+	git config --bool core.warnambiguousrefs false &&
+	git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
+	test_cmp expected actual
+
+ok 259 - Check ambiguous head and tag refs (loose)
+
+expecting success of 6300.260 'Check ambiguous head and tag refs II (loose)': 
+	git checkout main &&
+	git tag ambiguous testtag^0 &&
+	git branch ambiguous testtag^0 &&
+	git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
+	test_cmp expected actual
+
+Switched to branch 'main'
+Your branch is ahead of 'origin/main' by 1 commit.
+  (use "git push" to publish your local commits)
+ok 260 - Check ambiguous head and tag refs II (loose)
+
+expecting success of 6300.261 'create tag without tagger': 
+	git tag -a -m "Broken tag" taggerless &&
+	git tag -f taggerless $(git cat-file tag taggerless |
+		sed -e "/^tagger /d" |
+		git hash-object --literally --stdin -w -t tag)
+
+Updated tag 'taggerless' (was 6a6c6a7)
+ok 261 - create tag without tagger
+
+expecting success of 6300.262 'basic atom: refs/tags/taggerless type': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 262 - basic atom: refs/tags/taggerless type
+
+expecting success of 6300.263 'basic atom: refs/tags/taggerless tag': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 263 - basic atom: refs/tags/taggerless tag
+
+expecting success of 6300.264 'basic atom: refs/tags/taggerless tagger': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 264 - basic atom: refs/tags/taggerless tagger
+
+expecting success of 6300.265 'basic atom: refs/tags/taggerless taggername': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 265 - basic atom: refs/tags/taggerless taggername
+
+expecting success of 6300.266 'basic atom: refs/tags/taggerless taggeremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 266 - basic atom: refs/tags/taggerless taggeremail
+
+expecting success of 6300.267 'basic atom: refs/tags/taggerless taggeremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 267 - basic atom: refs/tags/taggerless taggeremail:trim
+
+expecting success of 6300.268 'basic atom: refs/tags/taggerless taggeremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 268 - basic atom: refs/tags/taggerless taggeremail:localpart
+
+expecting success of 6300.269 'basic atom: refs/tags/taggerless taggerdate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 269 - basic atom: refs/tags/taggerless taggerdate
+
+expecting success of 6300.270 'basic atom: refs/tags/taggerless committer': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 270 - basic atom: refs/tags/taggerless committer
+
+expecting success of 6300.271 'basic atom: refs/tags/taggerless committername': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 271 - basic atom: refs/tags/taggerless committername
+
+expecting success of 6300.272 'basic atom: refs/tags/taggerless committeremail': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 272 - basic atom: refs/tags/taggerless committeremail
+
+expecting success of 6300.273 'basic atom: refs/tags/taggerless committeremail:trim': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 273 - basic atom: refs/tags/taggerless committeremail:trim
+
+expecting success of 6300.274 'basic atom: refs/tags/taggerless committeremail:localpart': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 274 - basic atom: refs/tags/taggerless committeremail:localpart
+
+expecting success of 6300.275 'basic atom: refs/tags/taggerless committerdate': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 275 - basic atom: refs/tags/taggerless committerdate
+
+expecting success of 6300.276 'basic atom: refs/tags/taggerless subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 276 - basic atom: refs/tags/taggerless subject
+
+expecting success of 6300.277 'an unusual tag with an incomplete line': 
+
+	git tag -m "bogo" bogo &&
+	bogo=$(git cat-file tag bogo) &&
+	bogo=$(printf "%s" "$bogo" | git mktag) &&
+	git tag -f bogo "$bogo" &&
+	git for-each-ref --format "%(body)" refs/tags/bogo
+
+
+Updated tag 'bogo' (was 89437ea)
+
+ok 277 - an unusual tag with an incomplete line
+
+expecting success of 6300.278 'create tag with subject and body content': 
+	cat >>msg <<-\EOF &&
+		the subject line
+
+		first body line
+		second body line
+	EOF
+	git tag -F msg subject-body
+
+ok 278 - create tag with subject and body content
+
+expecting success of 6300.279 'basic atom: refs/tags/subject-body subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 279 - basic atom: refs/tags/subject-body subject
+
+expecting success of 6300.280 'basic atom: refs/tags/subject-body subject:sanitize': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 280 - basic atom: refs/tags/subject-body subject:sanitize
+
+expecting success of 6300.281 'basic atom: refs/tags/subject-body body': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 281 - basic atom: refs/tags/subject-body body
+
+expecting success of 6300.282 'basic atom: refs/tags/subject-body contents': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 282 - basic atom: refs/tags/subject-body contents
+
+expecting success of 6300.283 'basic atom: refs/tags/subject-body contents:size': 
+			type=$(git cat-file -t "$ref") &&
+			case $type in
+			tag)
+				# We cannot use $3 as it expects sanitize_pgp to run
+				git cat-file tag $ref >out &&
+				expect=$(tail -n +6 out | wc -c) &&
+				rm -f out ;;
+			tree | blob)
+				expect="" ;;
+			commit)
+				: "use the calculated expect" ;;
+			*)
+				BUG "unknown object type" ;;
+			esac &&
+			# Leave $expect unquoted to lose possible leading whitespaces
+			echo $expect >expected &&
+			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
+			test_cmp expected actual
+		
+ok 283 - basic atom: refs/tags/subject-body contents:size
+
+expecting success of 6300.284 'create tag with multiline subject': 
+	cat >msg <<-\EOF &&
+		first subject line
+		second subject line
+
+		first body line
+		second body line
+	EOF
+	git tag -F msg multiline
+
+ok 284 - create tag with multiline subject
+
+expecting success of 6300.285 'basic atom: refs/tags/multiline subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 285 - basic atom: refs/tags/multiline subject
+
+expecting success of 6300.286 'basic atom: refs/tags/multiline subject:sanitize': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 286 - basic atom: refs/tags/multiline subject:sanitize
+
+expecting success of 6300.287 'basic atom: refs/tags/multiline contents:subject': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 287 - basic atom: refs/tags/multiline contents:subject
+
+expecting success of 6300.288 'basic atom: refs/tags/multiline body': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 288 - basic atom: refs/tags/multiline body
+
+expecting success of 6300.289 'basic atom: refs/tags/multiline contents:body': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 289 - basic atom: refs/tags/multiline contents:body
+
+expecting success of 6300.290 'basic atom: refs/tags/multiline contents:signature': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 290 - basic atom: refs/tags/multiline contents:signature
+
+expecting success of 6300.291 'basic atom: refs/tags/multiline contents': 
+		git for-each-ref --format="%($format)" "$ref" >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 291 - basic atom: refs/tags/multiline contents
+
+expecting success of 6300.292 'basic atom: refs/tags/multiline contents:size': 
+			type=$(git cat-file -t "$ref") &&
+			case $type in
+			tag)
+				# We cannot use $3 as it expects sanitize_pgp to run
+				git cat-file tag $ref >out &&
+				expect=$(tail -n +6 out | wc -c) &&
+				rm -f out ;;
+			tree | blob)
+				expect="" ;;
+			commit)
+				: "use the calculated expect" ;;
+			*)
+				BUG "unknown object type" ;;
+			esac &&
+			# Leave $expect unquoted to lose possible leading whitespaces
+			echo $expect >expected &&
+			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
+			test_cmp expected actual
+		
+ok 292 - basic atom: refs/tags/multiline contents:size
+
+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 293 # skip create signed tags (missing GPG)
+
+ok 294 # skip basic atom: refs/tags/signed-empty subject (missing GPG)
+
+ok 295 # skip basic atom: refs/tags/signed-empty subject:sanitize (missing GPG)
+
+ok 296 # skip basic atom: refs/tags/signed-empty contents:subject (missing GPG)
+
+ok 297 # skip basic atom: refs/tags/signed-empty body (missing GPG)
+
+ok 298 # skip basic atom: refs/tags/signed-empty contents:body (missing GPG)
+
+ok 299 # skip basic atom: refs/tags/signed-empty contents:signature (missing GPG)
+
+ok 300 # skip basic atom: refs/tags/signed-empty contents (missing GPG)
+
+ok 301 # skip basic atom: refs/tags/signed-empty contents:size (missing GPG)
+
+ok 302 # skip basic atom: refs/tags/signed-empty raw (missing GPG)
+
+ok 303 # skip basic atom: refs/tags/signed-short subject (missing GPG)
+
+ok 304 # skip basic atom: refs/tags/signed-short subject:sanitize (missing GPG)
+
+ok 305 # skip basic atom: refs/tags/signed-short contents:subject (missing GPG)
+
+ok 306 # skip basic atom: refs/tags/signed-short body (missing GPG)
+
+ok 307 # skip basic atom: refs/tags/signed-short contents:body (missing GPG)
+
+ok 308 # skip basic atom: refs/tags/signed-short contents:signature (missing GPG)
+
+ok 309 # skip basic atom: refs/tags/signed-short contents (missing GPG)
+
+ok 310 # skip basic atom: refs/tags/signed-short contents:size (missing GPG)
+
+ok 311 # skip basic atom: refs/tags/signed-short raw (missing GPG)
+
+ok 312 # skip basic atom: refs/tags/signed-long subject (missing GPG)
+
+ok 313 # skip basic atom: refs/tags/signed-long subject:sanitize (missing GPG)
+
+ok 314 # skip basic atom: refs/tags/signed-long contents:subject (missing GPG)
+
+ok 315 # skip basic atom: refs/tags/signed-long body (missing GPG)
+
+ok 316 # skip basic atom: refs/tags/signed-long contents:body (missing GPG)
+
+ok 317 # skip basic atom: refs/tags/signed-long contents:signature (missing GPG)
+
+ok 318 # skip basic atom: refs/tags/signed-long contents (missing GPG)
+
+ok 319 # skip basic atom: refs/tags/signed-long contents:size (missing GPG)
+
+ok 320 # skip basic atom: refs/tags/signed-long raw (missing GPG)
+
+expecting success of 6300.321 'set up refs pointing to tree and blob': 
+	git update-ref refs/mytrees/first refs/heads/main^{tree} &&
+	git update-ref refs/myblobs/first refs/heads/main:one
+
+ok 321 - set up refs pointing to tree and blob
+
+ok 322 # skip basic atom: refs/mytrees/first subject (missing GPG)
+
+ok 323 # skip basic atom: refs/mytrees/first contents:subject (missing GPG)
+
+ok 324 # skip basic atom: refs/mytrees/first body (missing GPG)
+
+ok 325 # skip basic atom: refs/mytrees/first contents:body (missing GPG)
+
+ok 326 # skip basic atom: refs/mytrees/first contents:signature (missing GPG)
+
+ok 327 # skip basic atom: refs/mytrees/first contents (missing GPG)
+
+ok 328 # skip basic atom: refs/mytrees/first contents:size (missing GPG)
+
+expecting success of 6300.329 'basic atom: refs/mytrees/first raw': 
+	git cat-file tree refs/mytrees/first >expected &&
+	echo >>expected &&
+	git for-each-ref --format="%(raw)" refs/mytrees/first >actual &&
+	test_cmp expected actual &&
+	git cat-file -s refs/mytrees/first >expected &&
+	git for-each-ref --format="%(raw:size)" refs/mytrees/first >actual &&
+	test_cmp expected actual
+
+ok 329 - basic atom: refs/mytrees/first raw
+
+ok 330 # skip basic atom: refs/myblobs/first subject (missing GPG)
+
+ok 331 # skip basic atom: refs/myblobs/first contents:subject (missing GPG)
+
+ok 332 # skip basic atom: refs/myblobs/first body (missing GPG)
+
+ok 333 # skip basic atom: refs/myblobs/first contents:body (missing GPG)
+
+ok 334 # skip basic atom: refs/myblobs/first contents:signature (missing GPG)
+
+ok 335 # skip basic atom: refs/myblobs/first contents (missing GPG)
+
+ok 336 # skip basic atom: refs/myblobs/first contents:size (missing GPG)
+
+expecting success of 6300.337 'basic atom: refs/myblobs/first raw': 
+	git cat-file blob refs/myblobs/first >expected &&
+	echo >>expected &&
+	git for-each-ref --format="%(raw)" refs/myblobs/first >actual &&
+	test_cmp expected actual &&
+	git cat-file -s refs/myblobs/first >expected &&
+	git for-each-ref --format="%(raw:size)" refs/myblobs/first >actual &&
+	test_cmp expected actual
+
+ok 337 - basic atom: refs/myblobs/first raw
+
+expecting success of 6300.338 'set up refs pointing to binary blob': 
+	printf "a\0b\0c" >blob1 &&
+	printf "a\0c\0b" >blob2 &&
+	printf "\0a\0b\0c" >blob3 &&
+	printf "abc" >blob4 &&
+	printf "\0 \0 \0 " >blob5 &&
+	printf "\0 \0a\0 " >blob6 &&
+	printf "  " >blob7 &&
+	>blob8 &&
+	obj=$(git hash-object -w blob1) &&
+	git update-ref refs/myblobs/blob1 "$obj" &&
+	obj=$(git hash-object -w blob2) &&
+	git update-ref refs/myblobs/blob2 "$obj" &&
+	obj=$(git hash-object -w blob3) &&
+	git update-ref refs/myblobs/blob3 "$obj" &&
+	obj=$(git hash-object -w blob4) &&
+	git update-ref refs/myblobs/blob4 "$obj" &&
+	obj=$(git hash-object -w blob5) &&
+	git update-ref refs/myblobs/blob5 "$obj" &&
+	obj=$(git hash-object -w blob6) &&
+	git update-ref refs/myblobs/blob6 "$obj" &&
+	obj=$(git hash-object -w blob7) &&
+	git update-ref refs/myblobs/blob7 "$obj" &&
+	obj=$(git hash-object -w blob8) &&
+	git update-ref refs/myblobs/blob8 "$obj"
+
+ok 338 - set up refs pointing to binary blob
+
+expecting success of 6300.339 'Verify sorts with raw': 
+	cat >expected <<-EOF &&
+	refs/myblobs/blob8
+	refs/myblobs/blob5
+	refs/myblobs/blob6
+	refs/myblobs/blob3
+	refs/myblobs/blob7
+	refs/mytrees/first
+	refs/myblobs/first
+	refs/myblobs/blob1
+	refs/myblobs/blob2
+	refs/myblobs/blob4
+	refs/heads/main
+	EOF
+	git for-each-ref --format="%(refname)" --sort=raw \
+		refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
+	test_cmp expected actual
+
+ok 339 - Verify sorts with raw
+
+expecting success of 6300.340 'Verify sorts with raw:size': 
+	cat >expected <<-EOF &&
+	refs/myblobs/blob8
+	refs/myblobs/blob7
+	refs/myblobs/blob4
+	refs/myblobs/blob1
+	refs/myblobs/blob2
+	refs/myblobs/blob3
+	refs/myblobs/blob5
+	refs/myblobs/blob6
+	refs/myblobs/first
+	refs/mytrees/first
+	refs/heads/main
+	EOF
+	git for-each-ref --format="%(refname)" --sort=raw:size \
+		refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
+	test_cmp expected actual
+
+ok 340 - Verify sorts with raw:size
+
+expecting success of 6300.341 'validate raw atom with %(if:equals)': 
+	cat >expected <<-EOF &&
+	not equals
+	not equals
+	not equals
+	not equals
+	not equals
+	not equals
+	refs/myblobs/blob4
+	not equals
+	not equals
+	not equals
+	not equals
+	not equals
+	EOF
+	git for-each-ref --format="%(if:equals=abc)%(raw)%(then)%(refname)%(else)not equals%(end)" \
+		refs/myblobs/ refs/heads/ >actual &&
+	test_cmp expected actual
+
+ok 341 - validate raw atom with %(if:equals)
+
+expecting success of 6300.342 'validate raw atom with %(if:notequals)': 
+	cat >expected <<-EOF &&
+	refs/heads/ambiguous
+	refs/heads/main
+	refs/heads/newtag
+	refs/myblobs/blob1
+	refs/myblobs/blob2
+	refs/myblobs/blob3
+	equals
+	refs/myblobs/blob5
+	refs/myblobs/blob6
+	refs/myblobs/blob7
+	refs/myblobs/blob8
+	refs/myblobs/first
+	EOF
+	git for-each-ref --format="%(if:notequals=abc)%(raw)%(then)%(refname)%(else)equals%(end)" \
+		refs/myblobs/ refs/heads/ >actual &&
+	test_cmp expected actual
+
+ok 342 - validate raw atom with %(if:notequals)
+
+expecting success of 6300.343 'empty raw refs with %(if)': 
+	cat >expected <<-EOF &&
+	refs/myblobs/blob1 not empty
+	refs/myblobs/blob2 not empty
+	refs/myblobs/blob3 not empty
+	refs/myblobs/blob4 not empty
+	refs/myblobs/blob5 not empty
+	refs/myblobs/blob6 not empty
+	refs/myblobs/blob7 empty
+	refs/myblobs/blob8 empty
+	refs/myblobs/first not empty
+	EOF
+	git for-each-ref --format="%(refname) %(if)%(raw)%(then)not empty%(else)empty%(end)" \
+		refs/myblobs/ >actual &&
+	test_cmp expected actual
+
+ok 343 - empty raw refs with %(if)
+
+expecting success of 6300.344 '%(raw) with --python must fail': 
+	test_must_fail git for-each-ref --format="%(raw)" --python
+
+fatal: --format=raw cannot be used with --python, --shell, --tcl
+ok 344 - %(raw) with --python must fail
+
+expecting success of 6300.345 '%(raw) with --tcl must fail': 
+	test_must_fail git for-each-ref --format="%(raw)" --tcl
+
+fatal: --format=raw cannot be used with --python, --shell, --tcl
+ok 345 - %(raw) with --tcl must fail
+
+expecting success of 6300.346 '%(raw) with --perl': 
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob1 --perl | perl >actual &&
+	cmp blob1 actual &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob3 --perl | perl >actual &&
+	cmp blob3 actual &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob8 --perl | perl >actual &&
+	cmp blob8 actual &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/first --perl | perl >actual &&
+	cmp one actual &&
+	git cat-file tree refs/mytrees/first > expected &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/mytrees/first --perl | perl >actual &&
+	cmp expected actual
+
+ok 346 - %(raw) with --perl
+
+expecting success of 6300.347 '%(raw) with --shell must fail': 
+	test_must_fail git for-each-ref --format="%(raw)" --shell
+
+fatal: --format=raw cannot be used with --python, --shell, --tcl
+ok 347 - %(raw) with --shell must fail
+
+expecting success of 6300.348 '%(raw) with --shell and --sort=raw must fail': 
+	test_must_fail git for-each-ref --format="%(raw)" --sort=raw --shell
+
+fatal: --format=raw cannot be used with --python, --shell, --tcl
+ok 348 - %(raw) with --shell and --sort=raw must fail
+
+expecting success of 6300.349 '%(raw:size) with --shell': 
+	git for-each-ref --format="%(raw:size)" | sed "s/^/$SQ/;s/$/$SQ/" >expect &&
+	git for-each-ref --format="%(raw:size)" --shell >actual &&
+	test_cmp expect actual
+
+ok 349 - %(raw:size) with --shell
+
+expecting success of 6300.350 'for-each-ref --format compare with cat-file --batch': 
+	git rev-parse refs/mytrees/first | git cat-file --batch >expected &&
+	git for-each-ref --format="%(objectname) %(objecttype) %(objectsize)
+%(raw)" refs/mytrees/first >actual &&
+	test_cmp expected actual
+
+ok 350 - for-each-ref --format compare with cat-file --batch
+
+expecting success of 6300.351 'verify sorts with contents:size': 
+	cat >expect <<-\EOF &&
+	refs/heads/main
+	refs/heads/newtag
+	refs/heads/ambiguous
+	EOF
+	git for-each-ref --format="%(refname)" \
+		--sort=contents:size refs/heads/ >actual &&
+	test_cmp expect actual
+
+ok 351 - verify sorts with contents:size
+
+expecting success of 6300.352 'set up multiple-sort tags': 
+	for when in 100000 200000
+	do
+		for email in user1 user2
+		do
+			for ref in ref1 ref2
+			do
+				GIT_COMMITTER_DATE="@$when +0000" \
+				GIT_COMMITTER_EMAIL="$email@example.com" \
+				git tag -m "tag $ref-$when-$email" \
+				multi-$ref-$when-$email || return 1
+			done
+		done
+	done
+
+ok 352 - set up multiple-sort tags
+
+expecting success of 6300.353 'Verify sort with multiple keys': 
+	cat >expected <<-\EOF &&
+	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
+	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
+	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
+	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
+	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
+	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
+	EOF
+	git for-each-ref \
+		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
+		--sort=-refname \
+		--sort=taggeremail \
+		--sort=taggerdate \
+		"refs/tags/multi-*" >actual &&
+	test_cmp expected actual
+
+ok 353 - Verify sort with multiple keys
+
+expecting success of 6300.354 'equivalent sorts fall back on refname': 
+	cat >expected <<-\EOF &&
+	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
+	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
+	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
+	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
+	EOF
+	git for-each-ref \
+		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
+		--sort=taggerdate \
+		"refs/tags/multi-*" >actual &&
+	test_cmp expected actual
+
+ok 354 - equivalent sorts fall back on refname
+
+expecting success of 6300.355 '--no-sort cancels the previous sort keys': 
+	cat >expected <<-\EOF &&
+	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
+	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
+	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
+	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
+	EOF
+	git for-each-ref \
+		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
+		--sort=-refname \
+		--sort=taggeremail \
+		--no-sort \
+		--sort=taggerdate \
+		"refs/tags/multi-*" >actual &&
+	test_cmp expected actual
+
+ok 355 - --no-sort cancels the previous sort keys
+
+expecting success of 6300.356 '--no-sort without subsequent --sort prints expected refs': 
+	cat >expected <<-\EOF &&
+	refs/tags/multi-ref1-100000-user1
+	refs/tags/multi-ref1-100000-user2
+	refs/tags/multi-ref1-200000-user1
+	refs/tags/multi-ref1-200000-user2
+	refs/tags/multi-ref2-100000-user1
+	refs/tags/multi-ref2-100000-user2
+	refs/tags/multi-ref2-200000-user1
+	refs/tags/multi-ref2-200000-user2
+	EOF
+
+	# Sort the results with `sort` for a consistent comparison against
+	# expected
+	git for-each-ref \
+		--format="%(refname)" \
+		--no-sort \
+		"refs/tags/multi-*" | sort >actual &&
+	test_cmp expected actual
+
+ok 356 - --no-sort without subsequent --sort prints expected refs
+
+expecting success of 6300.357 'set up custom date sorting': 
+	# Dates:
+	# - Wed Feb 07 2024 21:34:20 +0000
+	# - Tue Dec 14 1999 00:05:22 +0000
+	# - Fri Jun 04 2021 11:26:51 +0000
+	# - Mon Jan 22 2007 16:44:01 GMT+0000
+	i=1 &&
+	for when in 1707341660 945129922 1622806011 1169484241
+	do
+		GIT_COMMITTER_DATE="@$when +0000" \
+		GIT_COMMITTER_EMAIL="user@example.com" \
+		git tag -m "tag $when" custom-dates-$i &&
+		i=$(($i+1)) || return 1
+	done
+
+ok 357 - set up custom date sorting
+
+expecting success of 6300.358 'sort by date defaults to full timestamp': 
+	cat >expected <<-\EOF &&
+	945129922 refs/tags/custom-dates-2
+	1169484241 refs/tags/custom-dates-4
+	1622806011 refs/tags/custom-dates-3
+	1707341660 refs/tags/custom-dates-1
+	EOF
+
+	git for-each-ref \
+		--format="%(creatordate:unix) %(refname)" \
+		--sort=creatordate \
+		"refs/tags/custom-dates-*" >actual &&
+	test_cmp expected actual
+
+ok 358 - sort by date defaults to full timestamp
+
+expecting success of 6300.359 'sort by custom date format': 
+	cat >expected <<-\EOF &&
+	00:05:22 refs/tags/custom-dates-2
+	11:26:51 refs/tags/custom-dates-3
+	16:44:01 refs/tags/custom-dates-4
+	21:34:20 refs/tags/custom-dates-1
+	EOF
+
+	git for-each-ref \
+		--format="%(creatordate:format:%H:%M:%S) %(refname)" \
+		--sort="creatordate:format:%H:%M:%S" \
+		"refs/tags/custom-dates-*" >actual &&
+	test_cmp expected actual
+
+ok 359 - sort by custom date format
+
+expecting success of 6300.360 'do not dereference NULL upon %(HEAD) on unborn branch': 
+	test_when_finished "git checkout main" &&
+	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
+	sed -e "s/^\* /  /" actual >expect &&
+	git checkout --orphan orphaned-branch &&
+	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'orphaned-branch'
+Switched to branch 'main'
+Your branch is ahead of 'origin/main' by 1 commit.
+  (use "git push" to publish your local commits)
+ok 360 - do not dereference NULL upon %(HEAD) on unborn branch
+
+expecting success of 6300.361 'set up trailers for next test': 
+	echo "Some contents" > two &&
+	git add two &&
+	git commit -F - <<-EOF
+	trailers: this commit message has trailers
+
+	Some message contents
+
+	$(cat trailers)
+	EOF
+
+[main 36c72cc] trailers: this commit message has trailers
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+ok 361 - set up trailers for next test
+
+expecting success of 6300.362 '%(trailers:unfold) unfolds trailers': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 362 - %(trailers:unfold) unfolds trailers
+
+expecting success of 6300.363 '%(trailers:only) shows only "key: value" trailers': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 363 - %(trailers:only) shows only "key: value" trailers
+
+expecting success of 6300.364 '%(trailers:only=no,only=true) shows only "key: value" trailers': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 364 - %(trailers:only=no,only=true) shows only "key: value" trailers
+
+expecting success of 6300.365 '%(trailers:only=yes) shows only "key: value" trailers': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 365 - %(trailers:only=yes) shows only "key: value" trailers
+
+expecting success of 6300.366 '%(trailers:only=no) shows all trailers': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 366 - %(trailers:only=no) shows all trailers
+
+expecting success of 6300.367 '%(trailers:only) and %(trailers:unfold) work together': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 367 - %(trailers:only) and %(trailers:unfold) work together
+
+expecting success of 6300.368 '%(trailers:unfold) and %(trailers:only) work together': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 368 - %(trailers:unfold) and %(trailers:only) work together
+
+expecting success of 6300.369 '%(trailers:key=foo) shows that trailer': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 369 - %(trailers:key=foo) shows that trailer
+
+expecting success of 6300.370 '%(trailers:key=foo) is case insensitive': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 370 - %(trailers:key=foo) is case insensitive
+
+expecting success of 6300.371 '%(trailers:key=foo:) trailing colon also works': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 371 - %(trailers:key=foo:) trailing colon also works
+
+expecting success of 6300.372 '%(trailers:key=foo) multiple keys': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 372 - %(trailers:key=foo) multiple keys
+
+expecting success of 6300.373 '%(trailers:key=nonexistent) becomes empty': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 373 - %(trailers:key=nonexistent) becomes empty
+
+expecting success of 6300.374 '%(trailers:key=foo) handles multiple lines even if folded': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 374 - %(trailers:key=foo) handles multiple lines even if folded
+
+expecting success of 6300.375 '%(trailers:key=foo,unfold) properly unfolds': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 375 - %(trailers:key=foo,unfold) properly unfolds
+
+expecting success of 6300.376 '%(trailers:key=foo,only=no) also includes nontrailer lines': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 376 - %(trailers:key=foo,only=no) also includes nontrailer lines
+
+expecting success of 6300.377 '%(trailers:key=foo,valueonly) shows only value': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 377 - %(trailers:key=foo,valueonly) shows only value
+
+expecting success of 6300.378 '%(trailers:separator) changes separator': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 378 - %(trailers:separator) changes separator
+
+expecting success of 6300.379 '%(trailers:key_value_separator) changes key-value separator': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 379 - %(trailers:key_value_separator) changes key-value separator
+
+expecting success of 6300.380 '%(trailers:separator,key_value_separator) changes both separators': 
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	
+ok 380 - %(trailers:separator,key_value_separator) changes both separators
+
+expecting success of 6300.381 'multiple %(trailers) use their own options': 
+	git tag -F - tag-with-trailers <<-\EOF &&
+	body
+
+	one: foo
+	one: bar
+	two: baz
+	two: qux
+	EOF
+	t1="%(trailers:key=one,key_value_separator=W,separator=X)" &&
+	t2="%(trailers:key=two,key_value_separator=Y,separator=Z)" &&
+	git for-each-ref --format="$t1%0a$t2" refs/tags/tag-with-trailers >actual &&
+	cat >expect <<-\EOF &&
+	oneWfooXoneWbar
+	twoYbazZtwoYqux
+	EOF
+	test_cmp expect actual
+
+ok 381 - multiple %(trailers) use their own options
+
+expecting success of 6300.382 '%(trailers) rejects unknown trailers arguments': 
+		# error message cannot be checked under i18n
+		test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
+		test_cmp expect actual &&
+		test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
+		test_cmp expect actual
+	
+ok 382 - %(trailers) rejects unknown trailers arguments
+
+expecting success of 6300.383 '%(trailers:key) without value is error': 
+		# error message cannot be checked under i18n
+		test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
+		test_cmp expect actual &&
+		test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
+		test_cmp expect actual
+	
+ok 383 - %(trailers:key) without value is error
+
+expecting success of 6300.384 'if arguments, %(contents:trailers) shows error if colon is missing': 
+	cat >expect <<-EOF &&
+	fatal: unrecognized %(contents) argument: trailersonly
+	EOF
+	test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
+	test_cmp expect actual
+
+ok 384 - if arguments, %(contents:trailers) shows error if colon is missing
+
+expecting success of 6300.385 'basic atom: head contents:trailers': 
+	git for-each-ref --format="%(contents:trailers)" refs/heads/main >actual &&
+	sanitize_pgp <actual >actual.clean &&
+	# git for-each-ref ends with a blank line
+	cat >expect <<-EOF &&
+	$(cat trailers)
+
+	EOF
+	test_cmp expect actual.clean
+
+ok 385 - basic atom: head contents:trailers
+
+expecting success of 6300.386 'basic atom: rest must fail': 
+	test_must_fail git for-each-ref --format="%(rest)" refs/heads/main
+
+fatal: this command reject atom %(rest)
+ok 386 - basic atom: rest must fail
+
+expecting success of 6300.387 'HEAD atom does not take arguments': 
+	test_must_fail git for-each-ref --format="%(HEAD:foo)" 2>err &&
+	echo "fatal: %(HEAD) does not take arguments" >expect &&
+	test_cmp expect err
+
+ok 387 - HEAD atom does not take arguments
+
+expecting success of 6300.388 'subject atom rejects unknown arguments': 
+	test_must_fail git for-each-ref --format="%(subject:foo)" 2>err &&
+	echo "fatal: unrecognized %(subject) argument: foo" >expect &&
+	test_cmp expect err
+
+ok 388 - subject atom rejects unknown arguments
+
+expecting success of 6300.389 'refname atom rejects unknown arguments': 
+	test_must_fail git for-each-ref --format="%(refname:foo)" 2>err &&
+	echo "fatal: unrecognized %(refname) argument: foo" >expect &&
+	test_cmp expect err
+
+ok 389 - refname atom rejects unknown arguments
+
+expecting success of 6300.390 'trailer parsing not fooled by --- line': 
+	git commit --allow-empty -F - <<-\EOF &&
+	this is the subject
+
+	This is the body. The message has a "---" line which would confuse a
+	message+patch parser. But here we know we have only a commit message,
+	so we get it right.
+
+	trailer: wrong
+	---
+	This is more body.
+
+	trailer: right
+	EOF
+
+	{
+		echo "trailer: right" &&
+		echo
+	} >expect &&
+	git for-each-ref --format="%(trailers)" refs/heads/main >actual &&
+	test_cmp expect actual
+
+[main 162c31a] this is the subject
+ Author: A U Thor <author@example.com>
+ok 390 - trailer parsing not fooled by --- line
+
+expecting success of 6300.391 'Add symbolic ref for the following tests': 
+	git symbolic-ref refs/heads/sym refs/heads/main
+
+ok 391 - Add symbolic ref for the following tests
+
+expecting success of 6300.392 'Verify usage of %(symref) atom': 
+	git for-each-ref --format="%(symref)" refs/heads/sym >actual &&
+	test_cmp expected actual
+
+ok 392 - Verify usage of %(symref) atom
+
+expecting success of 6300.393 'Verify usage of %(symref:short) atom': 
+	git for-each-ref --format="%(symref:short)" refs/heads/sym >actual &&
+	test_cmp expected actual
+
+ok 393 - Verify usage of %(symref:short) atom
+
+expecting success of 6300.394 'Verify usage of %(symref:lstrip) atom': 
+	git for-each-ref --format="%(symref:lstrip=2)" refs/heads/sym > actual &&
+	git for-each-ref --format="%(symref:lstrip=-2)" refs/heads/sym >> actual &&
+	test_cmp expected actual &&
+
+	git for-each-ref --format="%(symref:strip=2)" refs/heads/sym > actual &&
+	git for-each-ref --format="%(symref:strip=-2)" refs/heads/sym >> actual &&
+	test_cmp expected actual
+
+ok 394 - Verify usage of %(symref:lstrip) atom
+
+expecting success of 6300.395 'Verify usage of %(symref:rstrip) atom': 
+	git for-each-ref --format="%(symref:rstrip=2)" refs/heads/sym > actual &&
+	git for-each-ref --format="%(symref:rstrip=-2)" refs/heads/sym >> actual &&
+	test_cmp expected actual
+
+ok 395 - Verify usage of %(symref:rstrip) atom
+
+expecting success of 6300.396 ':remotename and :remoteref': 
+	git init remote-tests &&
+	(
+		cd remote-tests &&
+		test_commit initial &&
+		git branch -M main &&
+		git remote add from fifth.coffee:blub &&
+		git config branch.main.remote from &&
+		git config branch.main.merge refs/heads/stable &&
+		git remote add to southridge.audio:repo &&
+		git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
+		git config branch.main.pushRemote to &&
+		for pair in "%(upstream)=refs/remotes/from/stable" \
+			"%(upstream:remotename)=from" \
+			"%(upstream:remoteref)=refs/heads/stable" \
+			"%(push)=refs/remotes/to/pushed/main" \
+			"%(push:remotename)=to" \
+			"%(push:remoteref)=refs/heads/pushed/main"
+		do
+			echo "${pair#*=}" >expect &&
+			git for-each-ref --format="${pair%=*}" \
+				refs/heads/main >actual &&
+			test_cmp expect actual || exit 1
+		done &&
+		git branch push-simple &&
+		git config branch.push-simple.pushRemote from &&
+		actual="$(git for-each-ref \
+			--format="%(push:remotename),%(push:remoteref)" \
+			refs/heads/push-simple)" &&
+		test from, = "$actual"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6300-for-each-ref/remote-tests/.git/
+[master (root-commit) d39e3de] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 396 - :remotename and :remoteref
+
+expecting success of 6300.397 'for-each-ref --ignore-case ignores case': 
+	git for-each-ref --format="%(refname)" refs/heads/MAIN >actual &&
+	test_must_be_empty actual &&
+
+	echo refs/heads/main >expect &&
+	git for-each-ref --format="%(refname)" --ignore-case \
+		refs/heads/MAIN >actual &&
+	test_cmp expect actual
+
+ok 397 - for-each-ref --ignore-case ignores case
+
+expecting success of 6300.398 'for-each-ref --omit-empty works': 
+	git for-each-ref --format="%(refname)" >actual &&
+	test_line_count -gt 1 actual &&
+	git for-each-ref --format="%(if:equals=refs/heads/main)%(refname)%(then)%(refname)%(end)" --omit-empty >actual &&
+	echo refs/heads/main >expect &&
+	test_cmp expect actual
+
+ok 398 - for-each-ref --omit-empty works
+
+expecting success of 6300.399 'for-each-ref --ignore-case works on multiple sort keys': 
+	# name refs numerically to avoid case-insensitive filesystem conflicts
+	nr=0 &&
+	for email in a A b B
+	do
+		for subject in a A b B
+		do
+			GIT_COMMITTER_EMAIL="$email@example.com" \
+			git tag -m "tag $subject" icase-$(printf %02d $nr) &&
+			nr=$((nr+1))||
+			return 1
+		done
+	done &&
+	git for-each-ref --ignore-case \
+		--format="%(taggeremail) %(subject) %(refname)" \
+		--sort=refname \
+		--sort=subject \
+		--sort=taggeremail \
+		refs/tags/icase-* >actual &&
+	cat >expect <<-\EOF &&
+	<a@example.com> tag a refs/tags/icase-00
+	<a@example.com> tag A refs/tags/icase-01
+	<A@example.com> tag a refs/tags/icase-04
+	<A@example.com> tag A refs/tags/icase-05
+	<a@example.com> tag b refs/tags/icase-02
+	<a@example.com> tag B refs/tags/icase-03
+	<A@example.com> tag b refs/tags/icase-06
+	<A@example.com> tag B refs/tags/icase-07
+	<b@example.com> tag a refs/tags/icase-08
+	<b@example.com> tag A refs/tags/icase-09
+	<B@example.com> tag a refs/tags/icase-12
+	<B@example.com> tag A refs/tags/icase-13
+	<b@example.com> tag b refs/tags/icase-10
+	<b@example.com> tag B refs/tags/icase-11
+	<B@example.com> tag b refs/tags/icase-14
+	<B@example.com> tag B refs/tags/icase-15
+	EOF
+	test_cmp expect actual
+
+ok 399 - for-each-ref --ignore-case works on multiple sort keys
+
+expecting success of 6300.400 'for-each-ref reports broken tags': 
+	git tag -m "good tag" broken-tag-good HEAD &&
+	git cat-file tag broken-tag-good >good &&
+	sed s/commit/blob/ <good >bad &&
+	bad=$(git hash-object -w -t tag bad) &&
+	git update-ref refs/tags/broken-tag-bad $bad &&
+	test_must_fail git for-each-ref --format="%(*objectname)" \
+		refs/tags/broken-tag-*
+
+error: object 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 is a blob, not a commit
+error: bad tag pointer to 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 in e255b902e9d4c778ee8afe8f03860bf47e156c33
+fatal: parse_object_buffer failed on e255b902e9d4c778ee8afe8f03860bf47e156c33 for refs/tags/broken-tag-good
+162c31a2a5b32b318cc50810cb2d7e9167ed5df4
+ok 400 - for-each-ref reports broken tags
+
+expecting success of 6300.401 'set up tag with signature and no blank lines': 
+	git tag -F - fake-sig-no-blanks <<-\EOF
+	this is the subject
+	-----BEGIN PGP SIGNATURE-----
+	not a real signature, but we just care about the
+	subject/body parsing. It is important here that
+	there are no blank lines in the signature.
+	-----END PGP SIGNATURE-----
+	EOF
+
+ok 401 - set up tag with signature and no blank lines
+
+ok 402 # skip basic atom: refs/tags/fake-sig-no-blanks contents:subject (missing GPG)
+
+ok 403 # skip basic atom: refs/tags/fake-sig-no-blanks contents:body (missing GPG)
+
+ok 404 # skip basic atom: refs/tags/fake-sig-no-blanks contents:signature (missing GPG)
+
+expecting success of 6300.405 'set up tag with CRLF signature': 
+	append_cr <<-\EOF |
+	this is the subject
+	-----BEGIN PGP SIGNATURE-----
+
+	not a real signature, but we just care about
+	the subject/body parsing. It is important here
+	that there is a blank line separating this
+	from the signature header.
+	-----END PGP SIGNATURE-----
+	EOF
+	git tag -F - --cleanup=verbatim fake-sig-crlf
+
+ok 405 - set up tag with CRLF signature
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6416-recursive-corner-cases/nested_conflicts/.git/
-[main (root-commit) 64965f6] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 22 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Switched to branch 'L'
-[L e512e8b] version L1 of files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to branch 'R'
-[R ff2c09e] version R1 of files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to branch 'L'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Automatic merge failed; fix conflicts and then commit the result.
-[L 4085c94] left merge, rename b->m
- Author: A U Thor <author@example.com>
-Switched to branch 'R'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Automatic merge failed; fix conflicts and then commit the result.
-[R 6322e9f] right merge, rename a->m
- Author: A U Thor <author@example.com>
-ok 37 - setup nested conflicts
+ok 406 # skip basic atom: refs/tags/fake-sig-crlf contents:subject (missing GPG)
 
-expecting success of 6416.38 'check nested conflicts': 
-	(
-		cd nested_conflicts &&
+ok 407 # skip basic atom: refs/tags/fake-sig-crlf contents:body (missing GPG)
 
-		git clean -f &&
-		MAIN=$(git rev-parse --short main) &&
-		git checkout L2^0 &&
+ok 408 # skip basic atom: refs/tags/fake-sig-crlf contents:signature (missing GPG)
 
-		# Merge must fail; there is a conflict
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R2^0 &&
+expecting success of 6300.409 'set up tag with signature and trailers': 
+	git tag -F - fake-sig-trailer <<-\EOF
+	this is the subject
 
-		# Make sure the index has the right number of entries
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		# Ensure we have the correct number of untracked files
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+	this is the body
 
-		# Create a and b from virtual merge base X
-		git cat-file -p main:a >base &&
-		git cat-file -p L1:a >ours &&
-		git cat-file -p R1:a >theirs &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "$MAIN"  \
-			-L "Temporary merge branch 2" \
-			ours  \
-			base  \
-			theirs &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_a &&
+	My-Trailer: foo
+	-----BEGIN PGP SIGNATURE-----
 
-		git cat-file -p main:b >base &&
-		git cat-file -p L1:b >ours &&
-		git cat-file -p R1:b >theirs &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "$MAIN"  \
-			-L "Temporary merge branch 2" \
-			ours  \
-			base  \
-			theirs &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_b &&
+	not a real signature, but we just care about the
+	subject/body/trailer parsing.
+	-----END PGP SIGNATURE-----
+	EOF
 
-		# Compare :2:m to expected values
-		git cat-file -p L2:m >ours &&
-		git cat-file -p R2:b >theirs &&
-		test_must_fail git merge-file --diff3  \
-			-L "HEAD:m"                    \
-			-L "merged common ancestors:b" \
-			-L "R2^0:b"                    \
-			ours                           \
-			vmb_b                          \
-			theirs                         &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_2 &&
-		git cat-file -p :2:m >actual &&
-		test_cmp m_stage_2 actual &&
+ok 409 - set up tag with signature and trailers
 
-		# Compare :3:m to expected values
-		git cat-file -p L2:a >ours &&
-		git cat-file -p R2:m >theirs &&
-		test_must_fail git merge-file --diff3  \
-			-L "HEAD:a"                    \
-			-L "merged common ancestors:a" \
-			-L "R2^0:m"                    \
-			ours                           \
-			vmb_a                          \
-			theirs                         &&
-		sed -e "s/^\([<|=>]\)/\1\1/" ours >m_stage_3 &&
-		git cat-file -p :3:m >actual &&
-		test_cmp m_stage_3 actual &&
+ok 410 # skip basic atom: refs/tags/fake-sig-trailer trailers:separator= (missing GPG)
 
-		# Compare m to expected contents
-		>empty &&
-		cp m_stage_2 expected_final_m &&
-		test_must_fail git merge-file --diff3 \
-			-L "HEAD"                     \
-			-L "merged common ancestors"  \
-			-L "R2^0"                     \
-			expected_final_m              \
-			empty                         \
-			m_stage_3                     &&
-		test_cmp expected_final_m m
-	)
+expecting success of 6300.411 'git for-each-ref --stdin: empty': 
+	>in &&
+	git for-each-ref --format="%(refname)" --stdin <in >actual &&
+	git for-each-ref --format="%(refname)" >expect &&
+	test_cmp expect actual
 
-Removing initial
-Note: switching to 'L2^0'.
+ok 411 - git for-each-ref --stdin: empty
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6300.412 'git for-each-ref --stdin: fails if extra args': 
+	>in &&
+	test_must_fail git for-each-ref --format="%(refname)" \
+		--stdin refs/heads/extra <in 2>err &&
+	grep "unknown arguments supplied with --stdin" err
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+fatal: unknown arguments supplied with --stdin
+ok 412 - git for-each-ref --stdin: fails if extra args
 
-  git switch -c <new-branch-name>
+expecting success of 6300.413 'git for-each-ref --stdin: matches': 
+	cat >in <<-EOF &&
+	refs/tags/multi*
+	refs/heads/amb*
+	EOF
 
-Or undo this operation with:
+	cat >expect <<-EOF &&
+	refs/heads/ambiguous
+	refs/tags/multi-ref1-100000-user1
+	refs/tags/multi-ref1-100000-user2
+	refs/tags/multi-ref1-200000-user1
+	refs/tags/multi-ref1-200000-user2
+	refs/tags/multi-ref2-100000-user1
+	refs/tags/multi-ref2-100000-user2
+	refs/tags/multi-ref2-200000-user1
+	refs/tags/multi-ref2-200000-user2
+	refs/tags/multiline
+	EOF
 
-  git switch -
+	git for-each-ref --format="%(refname)" --stdin <in >actual &&
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 413 - git for-each-ref --stdin: matches
 
-HEAD is now at 4085c94 left merge, rename b->m
-  From inner merge:  Auto-merging a
-  From inner merge:  CONFLICT (content): Merge conflict in a
-Auto-merging a
-  From inner merge:  Auto-merging b
-  From inner merge:  CONFLICT (content): Merge conflict in b
-Auto-merging b
-CONFLICT (rename involved in collision): rename of a -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
-CONFLICT (rename involved in collision): rename of b -> m has content conflicts AND collides with another path; this may result in nested conflict markers.
-Auto-merging m
-CONFLICT (add/add): Merge conflict in m
-Automatic merge failed; fix conflicts and then commit the result.
-ok 38 - check nested conflicts
+expecting success of 6300.414 'git for-each-ref with non-existing refs': 
+	cat >in <<-EOF &&
+	refs/heads/this-ref-does-not-exist
+	refs/tags/bogus
+	EOF
 
-expecting success of 6416.39 'setup virtual merge base with nested conflicts': 
-	git init virtual_merge_base_has_nested_conflicts &&
-	(
-		cd virtual_merge_base_has_nested_conflicts &&
+	git for-each-ref --format="%(refname)" --stdin <in >actual &&
+	test_must_be_empty actual &&
 
-		# Create some related files now
-		printf "Random base content line %d\n" $(test_seq 1 10) >content &&
+	xargs git for-each-ref --format="%(refname)" <in >actual &&
+	test_must_be_empty actual
 
-		# Setup original commit
-		git add content &&
-		test_tick && git commit -m initial &&
+ok 414 - git for-each-ref with non-existing refs
 
-		git branch L &&
-		git branch R &&
+expecting success of 6300.415 'git for-each-ref with nested tags': 
+	git tag -am "Normal tag" nested/base HEAD &&
+	git tag -am "Nested tag" nested/nest1 refs/tags/nested/base &&
+	git tag -am "Double nested tag" nested/nest2 refs/tags/nested/nest1 &&
 
-		# Create L1
-		git checkout L &&
-		echo left >>content &&
-		git add content &&
-		test_tick && git commit -m "version L1 of content" &&
-		git tag L1 &&
+	head_oid="$(git rev-parse HEAD)" &&
+	base_tag_oid="$(git rev-parse refs/tags/nested/base)" &&
+	nest1_tag_oid="$(git rev-parse refs/tags/nested/nest1)" &&
+	nest2_tag_oid="$(git rev-parse refs/tags/nested/nest2)" &&
 
-		# Create R1
-		git checkout R &&
-		echo right >>content &&
-		git add content &&
-		test_tick && git commit -m "version R1 of content" &&
-		git tag R1 &&
+	cat >expect <<-EOF &&
+	refs/tags/nested/base $base_tag_oid tag $head_oid commit
+	refs/tags/nested/nest1 $nest1_tag_oid tag $head_oid commit
+	refs/tags/nested/nest2 $nest2_tag_oid tag $head_oid commit
+	EOF
 
-		# Create L2
-		git checkout L &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge R1 &&
-		git checkout L1 content &&
-		test_tick && git commit -m "version L2 of content" &&
-		git tag L2 &&
+	git for-each-ref \
+		--format="%(refname) %(objectname) %(objecttype) %(*objectname) %(*objecttype)" \
+		refs/tags/nested/ >actual &&
+	test_cmp expect actual
 
-		# Create R2
-		git checkout R &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge L1 &&
-		git checkout R1 content &&
-		test_tick && git commit -m "version R2 of content" &&
-		git tag R2 &&
+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/nest1 refs/tags/nested/base^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f nested/nest2 refs/tags/nested/nest1^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+ok 415 - git for-each-ref with nested tags
 
-		# Create L3
-		git checkout L &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge R2 &&
-		git checkout L1 content &&
-		test_tick && git commit -m "version L3 of content" &&
-		git tag L3 &&
+expecting success of 6300.416 'is-base atom with non-commits': 
+	git for-each-ref --format="%(is-base:HEAD) %(refname)" >out 2>err &&
+	grep "(HEAD) refs/heads/main" out &&
 
-		# Create R3
-		git checkout R &&
-		test_must_fail git -c merge.conflictstyle=diff3 merge L2 &&
-		git checkout R1 content &&
-		test_tick && git commit -m "version R3 of content" &&
-		git tag R3
-	)
+	test_line_count = 2 err &&
+	grep "error: object .* is a commit, not a blob" err &&
+	grep "error: bad tag pointer to" err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6416-recursive-corner-cases/virtual_merge_base_has_nested_conflicts/.git/
-[main (root-commit) 0e6d233] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 content
-Switched to branch 'L'
-[L 80f6449] version L1 of content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'R'
-[R 49ac0f6] version R1 of content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'L'
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 42730fb
-[L b5f1211] version L2 of content
- Author: A U Thor <author@example.com>
-Switched to branch 'R'
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 5ac3d63
-[R d9b26ef] version R2 of content
- Author: A U Thor <author@example.com>
-Switched to branch 'L'
-  From inner merge:  Auto-merging content
-  From inner merge:  CONFLICT (content): Merge conflict in content
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 42730fb
-[L 747e690] version L3 of content
- Author: A U Thor <author@example.com>
-Switched to branch 'R'
-  From inner merge:  Auto-merging content
-  From inner merge:  CONFLICT (content): Merge conflict in content
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 5ac3d63
-[R 1e5e557] version R3 of content
- Author: A U Thor <author@example.com>
-ok 39 - setup virtual merge base with nested conflicts
+(HEAD) refs/heads/main
+error: object 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 is a commit, not a blob
+error: bad tag pointer to 162c31a2a5b32b318cc50810cb2d7e9167ed5df4 in 353e4af1e10eb770022fdbffe88f62e05fa29e05
+ok 416 - is-base atom with non-commits
 
-expecting success of 6416.40 'check virtual merge base with nested conflicts': 
-	(
-		cd virtual_merge_base_has_nested_conflicts &&
+ok 417 # skip setup for signature atom using gpg (missing GPG)
 
-		MAIN=$(git rev-parse --short main) &&
-		git checkout L3^0 &&
+checking prerequisite: GPGSSH
 
-		# Merge must fail; there is a conflict
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R3^0 &&
+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;
 
-		# Make sure the index has the right number of entries
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		# Ensure we have the correct number of untracked files
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+	# 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 &&
 
-		# Compare :[23]:content to expected values
-		git rev-parse L1:content R1:content >expect &&
-		git rev-parse :2:content :3:content >actual &&
-		test_cmp expect actual &&
+	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
 
-		# Imitate X1 merge base, except without long enough conflict
-		# markers because a subsequent sed will modify them.  Put
-		# result into vmb.
-		git cat-file -p main:content >base &&
-		git cat-file -p L:content >left &&
-		git cat-file -p R:content >right &&
-		cp left merged-once &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "$MAIN"  \
-			-L "Temporary merge branch 2" \
-			merged-once \
-			base        \
-			right       &&
-		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-once >vmb &&
+	# 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
 
-		# Imitate X2 merge base, overwriting vmb.  Note that we
-		# extend both sets of conflict markers to make them longer
-		# with the sed command.
-		cp left merged-twice &&
-		test_must_fail git merge-file --diff3 \
-			-L "Temporary merge branch 1" \
-			-L "merged common ancestors"  \
-			-L "Temporary merge branch 2" \
-			merged-twice \
-			vmb          \
-			right        &&
-		sed -e "s/^\([<|=>]\)/\1\1\1/" merged-twice >vmb &&
+)
+prerequisite GPGSSH not satisfied
+ok 418 # skip setup for signature atom using ssh (missing GPGSSH)
 
-		# Compare :1:content to expected value
-		git cat-file -p :1:content >actual &&
-		test_cmp vmb actual &&
+checking prerequisite: GPG2
 
-		# Determine expected content in final outer merge, compare to
-		# what the merge generated.
-		cp -f left expect &&
-		test_must_fail git merge-file --diff3                      \
-			-L "HEAD"  -L "merged common ancestors"  -L "R3^0" \
-			expect     vmb                           right     &&
-		test_cmp expect content
-	)
+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
 
-Note: switching to 'L3^0'.
+	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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 GPG2 not satisfied
+ok 419 # skip bare signature atom (missing GPG2)
 
-If you want to 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 420 # skip show good signature with custom format (missing GPG)
 
-  git switch -c <new-branch-name>
+ok 421 # skip show good signature with custom format with ssh (missing GPGSSH)
 
-Or undo this operation with:
+ok 422 # skip signature atom with grade option and bad signature (missing GPG)
 
-  git switch -
+ok 423 # skip show untrusted signature with custom format (missing GPG)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 424 # skip show untrusted signature with undefined trust level (missing GPG)
 
-HEAD is now at 747e690 version L3 of content
-  From inner merge:    Auto-merging content
-  From inner merge:    CONFLICT (content): Merge conflict in content
-  From inner merge:  Auto-merging content
-  From inner merge:  CONFLICT (content): Merge conflict in content
-Auto-merging content
-CONFLICT (content): Merge conflict in content
-Automatic merge failed; fix conflicts and then commit the result.
-ok 40 - check virtual merge base with nested conflicts
+ok 425 # skip show untrusted signature with ultimate trust level (missing GPG)
 
-# still have 3 known breakage(s)
-# passed all remaining 37 test(s)
-1..40
+ok 426 # skip show unknown signature with custom format (missing GPG)
+
+ok 427 # skip show lack of signature with custom format (missing GPG)
+
+# passed all 427 test(s)
+1..427
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6437-submodule-merge.sh ***
@@ -436583,7 +436256,7 @@
 Automatic merge failed; fix conflicts and then commit the result.
 Checking if contents from B1:path/file showed up
 Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 9 Feb  9 06:55 path/file
+-rw-r--r-- 1 pbuilder2 pbuilder2 9 Mar 14 13:34 path/file
 HEAD is now at 90b0bac A
 not ok 18 - directory/submodule conflict; keep submodule clean # TODO known breakage
 
@@ -437783,457 +437456,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7010-setup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testerx
-fatal: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testex
-fatal: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7011-skip-worktree-reading.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7030-verify-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7030-verify-tag/.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 tags (missing GPG)
-
-checking prerequisite: GPGSM
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
-	test_have_prereq GPG &&
-	# Available key info:
-	# * see t/lib-gpg/gpgsm-gen-key.in
-	# To generate new certificate:
-	#  * no passphrase
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		-o /tmp/gpgsm.crt.user \
-	#		--generate-key \
-	#		--batch t/lib-gpg/gpgsm-gen-key.in
-	# To import certificate:
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		--import /tmp/gpgsm.crt.user
-	# To export into a .p12 we can later import:
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		-o t/lib-gpg/gpgsm_cert.p12 \
-	#		--export-secret-key-p12 "committer@example.com"
-	echo | gpgsm --homedir "${GNUPGHOME}" \
-		--passphrase-fd 0 --pinentry-mode loopback \
-		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
-
-	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
-	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
-		>"${GNUPGHOME}/trustlist.txt" &&
-	(gpgconf --reload all || : ) &&
-
-	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-	       -u committer@example.com -o /dev/null --sign -
-
-)
-prerequisite GPGSM not satisfied
-ok 2 # skip create signed tags x509  (missing GPGSM)
-
-ok 3 # skip verify and show signatures (missing GPG)
-
-ok 4 # skip verify and show signatures x509 (missing GPGSM)
-
-ok 5 # skip verify and show signatures x509 with low minTrustLevel (missing GPGSM)
-
-ok 6 # skip verify and show signatures x509 with matching minTrustLevel (missing GPGSM)
-
-ok 7 # skip verify and show signatures x509 with high minTrustLevel (missing GPGSM)
-
-ok 8 # skip detect fudged signature (missing GPG)
-
-ok 9 # skip verify signatures with --raw (missing GPG)
-
-ok 10 # skip verify signatures with --raw x509 (missing GPGSM)
-
-ok 11 # skip verify multiple tags (missing GPG)
-
-ok 12 # skip verify multiple tags x509 (missing GPGSM)
-
-ok 13 # skip verifying tag with --format (missing GPG)
-
-ok 14 # skip verifying tag with --format="%(rest)" must fail (missing GPG)
-
-ok 15 # skip verifying a forged tag with --format should fail silently (missing GPG)
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t5572-pull-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t5572-pull-submodule/.git/
 expecting success of 5572.1 'git_pull: added submodule creates empty directory': 
@@ -440734,470 +439956,455 @@
 1..68
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7008-filter-branch-null-sha1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t7010-setup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/.git/
+expecting success of 7010.1 'setup': 
 
-[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
+	mkdir -p a/b/c a/e &&
+	D=$(pwd) &&
+	>a/b/c/d &&
+	>a/e/f
 
-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 1 - setup
 
-ok 2 - setup: a commit with a bogus null sha1 in the tree
+expecting success of 7010.2 'git add (absolute)': 
 
-expecting success of 7008.3 'setup: bring HEAD and index in sync': 
-	test_tick &&
-	git commit -a -m "back to normal"
+	git add "$D/a/b/c/d" &&
+	git ls-files >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
 
-[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"
+ok 2 - git add (absolute)
 
-
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 7010.3 'git add (funny relative)': 
 
-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"
+	rm -f .git/index &&
+	(
+		cd a/b &&
+		git add "../e/./f"
+	) &&
+	git ls-files >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
 
-
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
+ok 3 - git add (funny relative)
 
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
-rm 'broken'
-
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (5/5) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/master' was rewritten
-ok 6 - removing the broken entry works
+expecting success of 7010.4 'git rm (absolute)': 
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7012-skip-worktree-writing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	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
 
-[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
+rm 'a/b/c/d'
+ok 4 - git rm (absolute)
 
-Note: switching to 'top'.
+expecting success of 7010.5 'git rm (funny relative)': 
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	rm -f .git/index &&
+	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
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
 
-  git switch -c <new-branch-name>
+rm 'a/e/f'
+ok 5 - git rm (funny relative)
 
-Or undo this operation with:
+expecting success of 7010.6 'git ls-files (absolute)': 
 
-  git switch -
+	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
 
-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
+ok 6 - git ls-files (absolute)
 
-expecting success of 7012.3 'read-tree updates worktree, dirty case': 
-	git checkout -f top &&
-	git update-index --skip-worktree init.t &&
-	echo dirty >> init.t &&
-	test_must_fail git read-tree -m -u HEAD^ &&
-	grep -q dirty init.t &&
-	test "$(git ls-files -t init.t)" = "S init.t" &&
-	git update-index --no-skip-worktree init.t
+expecting success of 7010.7 'git ls-files (relative #1)': 
 
-HEAD is now at fa1ce8e modified and added
-error: Entry 'init.t' not uptodate. Cannot merge.
-ok 3 - read-tree updates worktree, dirty case
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git ls-files "../b/c"
+	)  >current &&
+	echo c/d >expect &&
+	test_cmp expect current
 
-expecting success of 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
+ok 7 - git ls-files (relative #1)
 
-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
+expecting success of 7010.8 'git ls-files (relative #2)': 
 
-HEAD is now at fa1ce8e modified and added
-error: Entry 'added' not uptodate. Cannot merge.
-ok 5 - read-tree removes worktree, dirty case
+	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
 
-expecting success of 7012.6 'index setup': 
-	git checkout -f init &&
+
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testerx
+fatal: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testex
+fatal: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7011-skip-worktree-reading.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 expected result
+	git ls-files -t >result &&
+	test_cmp expect.skip result
 
-Previous HEAD position was fa1ce8e modified and added
-HEAD is now at 2519212 init
-ok 6 - index setup
+[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 7012.7 'git-rm fails if worktree is dirty': 
+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 &&
-	test_must_fail git rm 1 &&
+	git update-index 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 set advice.updateSparsePath false"
-ok 7 - git-rm fails if worktree is dirty
+ok 3 - update-index
 
-expecting success of 7012.8 'git-clean, absent case': 
+expecting success of 7011.4 'update-index --remove': 
 	setup_absent &&
-	git clean -n > result &&
-	test_cmp expected result
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	test ! -f 1
 
-ok 8 - git-clean, absent case
+ok 4 - update-index --remove
 
-expecting success of 7012.9 'git-clean, dirty case': 
+expecting success of 7011.5 'update-index --remove': 
 	setup_dirty &&
-	git clean -n > result &&
-	test_cmp expected result
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	echo dirty >expected &&
+	test_cmp expected 1
 
-ok 9 - git-clean, dirty case
+ok 5 - update-index --remove
 
-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 &&
+expecting success of 7011.6 'ls-files --deleted': 
+	setup_absent &&
+	test -z "$(git ls-files -d)"
 
-	: ignoring the worktree &&
-	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
-	git diff-index --cached --exit-code HEAD &&
+ok 6 - ls-files --deleted
 
-	: 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
+expecting success of 7011.7 'ls-files --deleted': 
+	setup_dirty &&
+	test -z "$(git ls-files -d)"
 
-[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
+ok 7 - ls-files --deleted
 
-expecting success of 7012.11 'stash restore in sparse checkout': 
-	test_create_repo stash-restore &&
-	(
-		cd stash-restore &&
+expecting success of 7011.8 'ls-files --modified': 
+	setup_absent &&
+	test -z "$(git ls-files -m)"
 
-		mkdir subdir &&
-		echo A >subdir/A &&
-		echo untouched >untouched &&
-		echo removeme >removeme &&
-		echo modified >modified &&
-		git add . &&
-		git commit -m Initial &&
+ok 8 - ls-files --modified
 
-		echo AA >>subdir/A &&
-		echo addme >addme &&
-		echo tweaked >>modified &&
-		rm removeme &&
-		git add addme &&
+expecting success of 7011.9 'ls-files --modified': 
+	setup_dirty &&
+	test -z "$(git ls-files -m)"
 
-		git stash push &&
+ok 9 - ls-files --modified
 
-		git sparse-checkout set --no-cone subdir &&
+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
 
-		# 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 &&
+ok 10 - diff-index does not examine skip-worktree absent entries
 
-		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 &&
+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
 
-		# Put a file in the working directory in the way
-		echo in the way >modified &&
-		test_must_fail git stash apply 2>error&&
+ok 11 - diff-index does not examine skip-worktree dirty entries
 
-		grep "changes.*would be overwritten by merge" error &&
+expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
+	setup_absent &&
+	test -z "$(git diff-files -- one)"
 
-		echo in the way >expect &&
-		test_cmp expect modified &&
-		git diff --quiet HEAD ":!modified" &&
+ok 12 - diff-files does not examine skip-worktree absent entries
 
-		# ...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
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
 
-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
+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)
-	actual
-	error
-	expect
+	1
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
 
-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
+nothing added to commit but untracked files present (use "git add" to track)
+ok 15 - commit on skip-worktree dirty entries
 
-# passed all 11 test(s)
-1..11
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7031-verify-tag-signed-ssh.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7031-verify-tag-signed-ssh/.git/
-checking prerequisite: GPGSSH
+*** t7030-verify-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7030-verify-tag/.git/
+checking prerequisite: GPG
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
-	ssh_version=$(ssh-keygen -Y find-principals -n "git" 2>&1)
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 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
+	# 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 GPGSSH not satisfied
-ok 1 # skip create signed tags ssh (missing GPGSSH)
+prerequisite GPG not satisfied
+ok 1 # skip create signed tags (missing GPG)
 
-checking prerequisite: GPGSSH_VERIFYTIME
+checking prerequisite: GPGSM
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH_VERIFYTIME" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
 (
-	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 &&
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
+	test_have_prereq GPG &&
+	# Available key info:
+	# * see t/lib-gpg/gpgsm-gen-key.in
+	# To generate new certificate:
+	#  * no passphrase
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o /tmp/gpgsm.crt.user \
+	#		--generate-key \
+	#		--batch t/lib-gpg/gpgsm-gen-key.in
+	# To import certificate:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		--import /tmp/gpgsm.crt.user
+	# To export into a .p12 we can later import:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o t/lib-gpg/gpgsm_cert.p12 \
+	#		--export-secret-key-p12 "committer@example.com"
+	echo | gpgsm --homedir "${GNUPGHOME}" \
+		--passphrase-fd 0 --pinentry-mode loopback \
+		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
 
-	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
+	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
+	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
+		>"${GNUPGHOME}/trustlist.txt" &&
+	(gpgconf --reload all || : ) &&
 
-	# 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)
+	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+	       -u committer@example.com -o /dev/null --sign -
 
 )
-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)
+prerequisite GPGSM not satisfied
+ok 2 # skip create signed tags x509  (missing GPGSM)
 
-ok 7 # skip verify-tag fails with tag date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+ok 3 # skip verify and show signatures (missing GPG)
 
-ok 8 # skip detect fudged ssh signature (missing GPGSSH)
+ok 4 # skip verify and show signatures x509 (missing GPGSM)
 
-ok 9 # skip verify ssh signatures with --raw (missing GPGSSH)
+ok 5 # skip verify and show signatures x509 with low minTrustLevel (missing GPGSM)
 
-ok 10 # skip verify signatures with --raw ssh (missing GPGSSH)
+ok 6 # skip verify and show signatures x509 with matching minTrustLevel (missing GPGSM)
 
-ok 11 # skip verify multiple tags ssh (missing GPGSSH)
+ok 7 # skip verify and show signatures x509 with high minTrustLevel (missing GPGSM)
 
-ok 12 # skip verifying tag with --format - ssh (missing GPGSSH)
+ok 8 # skip detect fudged signature (missing GPG)
 
-ok 13 # skip verifying a forged tag with --format should fail silently - ssh (missing GPGSSH)
+ok 9 # skip verify signatures with --raw (missing GPG)
 
-ok 14 # skip rev-list --format=%G (missing GPGSSH)
+ok 10 # skip verify signatures with --raw x509 (missing GPGSM)
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7062-wtstatus-ignorecase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7062-wtstatus-ignorecase/.git/
-expecting success of 7062.1 'status with hash collisions': 
-	# note: "V/", "V/XQANY/" and "WURZAUP/" produce the same hash code
-	# in name-hash.c::hash_name
-	mkdir V &&
-	mkdir V/XQANY &&
-	mkdir WURZAUP &&
-	touch V/XQANY/test &&
-	git config core.ignorecase true &&
-	git add . &&
-	# test is successful if git status completes (no endless loop)
-	git status
+ok 11 # skip verify multiple tags (missing GPG)
 
-On branch master
+ok 12 # skip verify multiple tags x509 (missing GPGSM)
 
-No commits yet
+ok 13 # skip verifying tag with --format (missing GPG)
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-	new file:   V/XQANY/test
+ok 14 # skip verifying tag with --format="%(rest)" must fail (missing GPG)
 
-ok 1 - status with hash collisions
+ok 15 # skip verifying a forged tag with --format should fail silently (missing GPG)
 
-# passed all 1 test(s)
-1..1
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6500-gc.sh ***
@@ -441810,7 +441017,7 @@
 		gc --cruft --max-cruft-size=1M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=1048576 <trace2.txt
 
-{"event":"child_start","sid":"20250209T065506.785504Z-Hcf858c9d-P001c22fe","thread":"main","time":"2025-02-09T06:55:06.793301Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=1048576"]}
+{"event":"child_start","sid":"20260314T133458.237088Z-H5c947e1c-P0004d855","thread":"main","time":"2026-03-14T13:34:58.284092Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=1048576"]}
 ok 26 - --max-cruft-size sets appropriate repack options
 
 expecting success of 6500.27 'gc.maxCruftSize sets appropriate repack options': 
@@ -441823,8 +441030,8 @@
 		--max-cruft-size=3M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=3145728 <trace2.txt
 
-{"event":"child_start","sid":"20250209T065506.832918Z-Hcf858c9d-P001c23dc","thread":"main","time":"2025-02-09T06:55:06.841398Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=2097152"]}
-{"event":"child_start","sid":"20250209T065506.871590Z-Hcf858c9d-P001c2492","thread":"main","time":"2025-02-09T06:55:06.878167Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=3145728"]}
+{"event":"child_start","sid":"20260314T133458.449318Z-H5c947e1c-P0004d915","thread":"main","time":"2026-03-14T13:34:58.472502Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=2097152"]}
+{"event":"child_start","sid":"20260314T133458.646633Z-H5c947e1c-P0004d9c4","thread":"main","time":"2026-03-14T13:34:58.675757Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=3145728"]}
 ok 27 - gc.maxCruftSize sets appropriate repack options
 
 expecting success of 6500.28 'background auto gc does not run if gc.log is present and recent but does if it is old': 
@@ -441968,6 +441175,1381 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7012-skip-worktree-writing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 set 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7031-verify-tag-signed-ssh.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 fails 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7008-filter-branch-null-sha1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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) (1 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (3/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
+error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+fatal: git-write-tree: error building trees
+fatal: not a valid object name 
+could not write rewritten commit
+ok 4 - noop filter-branch complains
+
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7062-wtstatus-ignorecase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7062-wtstatus-ignorecase/.git/
+expecting success of 7062.1 'status with hash collisions': 
+	# note: "V/", "V/XQANY/" and "WURZAUP/" produce the same hash code
+	# in name-hash.c::hash_name
+	mkdir V &&
+	mkdir V/XQANY &&
+	mkdir WURZAUP &&
+	touch V/XQANY/test &&
+	git config core.ignorecase true &&
+	git add . &&
+	# test is successful if git status completes (no endless loop)
+	git status
+
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+	new file:   V/XQANY/test
+
+ok 1 - status with hash collisions
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7101-reset-empty-subdirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7001-mv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
+expecting success of 7001.1 'mv -f refreshes updated index entry': 
+	echo test >bar &&
+	git add bar &&
+	git commit -m test &&
+
+	echo foo >foo &&
+	git add foo &&
+
+	# Wait one second to ensure ctime of rename will differ from original
+	# file creation ctime.
+	sleep 1 &&
+	git mv -f foo bar &&
+	git reset --merge HEAD &&
+
+	# Verify the index has been reset
+	git diff-files >out &&
+	test_must_be_empty out
+
+[master (root-commit) dd702a3] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+ok 1 - mv -f refreshes updated index entry
+
+expecting success of 7001.2 'prepare reference tree': 
+	mkdir path0 path1 &&
+	COPYING_test_data >path0/COPYING &&
+	git add path0/COPYING &&
+	git commit -m add -a
+
+[master a081f64] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 18 insertions(+)
+ create mode 100644 path0/COPYING
+ok 2 - prepare reference tree
+
+expecting success of 7001.3 'moving the file out of subdirectory': 
+	git -C path0 mv COPYING ../path1/COPYING
+
+ok 3 - moving the file out of subdirectory
+
+expecting success of 7001.4 'commiting the change': 
+	git commit -m move-out -a
+
+[master e61e243] move-out
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {path0 => path1}/COPYING (100%)
+ok 4 - commiting the change
+
+expecting success of 7001.5 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path0/COPYING..*path1/COPYING" actual
+
+R100	path0/COPYING	path1/COPYING
+ok 5 - checking the commit
+
+expecting success of 7001.6 'moving the file back into subdirectory': 
+	git -C path0 mv ../path1/COPYING COPYING
+
+ok 6 - moving the file back into subdirectory
+
+expecting success of 7001.7 'commiting the change': 
+	git commit -m move-in -a
+
+[master 965f93d] move-in
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {path1 => path0}/COPYING (100%)
+ok 7 - commiting the change
+
+expecting success of 7001.8 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path1/COPYING..*path0/COPYING" actual
+
+R100	path1/COPYING	path0/COPYING
+ok 8 - checking the commit
+
+expecting success of 7001.9 'mv --dry-run does not move file': 
+	git mv -n path0/COPYING MOVED &&
+	test_path_is_file path0/COPYING &&
+	test_path_is_missing MOVED
+
+Checking rename of 'path0/COPYING' to 'MOVED'
+Renaming path0/COPYING to MOVED
+ok 9 - mv --dry-run does not move file
+
+expecting success of 7001.10 'checking -k on non-existing file': 
+	git mv -k idontexist path0
+
+ok 10 - checking -k on non-existing file
+
+expecting success of 7001.11 'checking -k on untracked file': 
+	>untracked1 &&
+	git mv -k untracked1 path0 &&
+	test_path_is_file untracked1 &&
+	test_path_is_missing path0/untracked1
+
+ok 11 - checking -k on untracked file
+
+expecting success of 7001.12 'checking -k on multiple untracked files': 
+	>untracked2 &&
+	git mv -k untracked1 untracked2 path0 &&
+	test_path_is_file untracked1 &&
+	test_path_is_file untracked2 &&
+	test_path_is_missing path0/untracked1 &&
+	test_path_is_missing path0/untracked2
+
+ok 12 - checking -k on multiple untracked files
+
+expecting success of 7001.13 'checking -f on untracked file with existing target': 
+	>path0/untracked1 &&
+	test_must_fail git mv -f untracked1 path0 &&
+	test_path_is_missing .git/index.lock &&
+	test_path_is_file untracked1 &&
+	test_path_is_file path0/untracked1
+
+fatal: not under version control, source=untracked1, destination=path0/untracked1
+ok 13 - checking -f on untracked file with existing target
+
+expecting success of 7001.14 'moving to absent target with trailing slash': 
+	test_must_fail git mv path0/COPYING no-such-dir/ &&
+	test_must_fail git mv path0/COPYING no-such-dir// &&
+	git mv path0/ no-such-dir/ &&
+	test_path_is_dir no-such-dir
+
+fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
+fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
+ok 14 - moving to absent target with trailing slash
+
+expecting success of 7001.15 'clean up': 
+	git reset --hard
+
+HEAD is now at 965f93d move-in
+ok 15 - clean up
+
+expecting success of 7001.16 'moving to existing untracked target with trailing slash': 
+	mkdir path1 &&
+	git mv path0/ path1/ &&
+	test_path_is_dir path1/path0/
+
+ok 16 - moving to existing untracked target with trailing slash
+
+expecting success of 7001.17 'moving to existing tracked target with trailing slash': 
+	mkdir path2 &&
+	>path2/file && git add path2/file &&
+	git mv path1/path0/ path2/ &&
+	test_path_is_dir path2/path0/
+
+ok 17 - moving to existing tracked target with trailing slash
+
+expecting success of 7001.18 'clean up': 
+	git reset --hard
+
+HEAD is now at 965f93d move-in
+ok 18 - clean up
+
+expecting success of 7001.19 'adding another file': 
+	COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
+	git add path0/README &&
+	git commit -m add2 -a
+
+[master 0c7076e] add2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 18 insertions(+)
+ create mode 100644 path0/README
+ok 19 - adding another file
+
+expecting success of 7001.20 'moving whole subdirectory': 
+	git mv path0 path2
+
+ok 20 - moving whole subdirectory
+
+expecting success of 7001.21 'commiting the change': 
+	git commit -m dir-move -a
+
+[master d877af0] dir-move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {path0 => path2}/COPYING (100%)
+ rename {path0 => path2}/README (100%)
+ok 21 - commiting the change
+
+expecting success of 7001.22 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+	grep "^R100..*path0/README..*path2/README" actual
+
+R100	path0/COPYING	path2/COPYING
+R100	path0/README	path2/README
+ok 22 - checking the commit
+
+expecting success of 7001.23 'succeed when source is a prefix of destination': 
+	git mv path2/COPYING path2/COPYING-renamed
+
+ok 23 - succeed when source is a prefix of destination
+
+expecting success of 7001.24 'moving whole subdirectory into subdirectory': 
+	git mv path2 path1
+
+ok 24 - moving whole subdirectory into subdirectory
+
+expecting success of 7001.25 'commiting the change': 
+	git commit -m dir-move -a
+
+[master a4d744b] dir-move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename path2/COPYING => path1/path2/COPYING-renamed (100%)
+ rename {path2 => path1/path2}/README (100%)
+ok 25 - commiting the change
+
+expecting success of 7001.26 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+	grep "^R100..*path2/README..*path1/path2/README" actual
+
+R100	path2/COPYING	path1/path2/COPYING-renamed
+R100	path2/README	path1/path2/README
+ok 26 - checking the commit
+
+expecting success of 7001.27 'do not move directory over existing directory': 
+	mkdir path0 &&
+	mkdir path0/path2 &&
+	test_must_fail git mv path2 path0
+
+fatal: bad source, source=path2, destination=path0/path2
+ok 27 - do not move directory over existing directory
+
+expecting success of 7001.28 'rename directory to non-existing directory': 
+	mkdir dir-a &&
+	>dir-a/f &&
+	git add dir-a &&
+	git mv dir-a non-existing-dir
+
+ok 28 - rename directory to non-existing directory
+
+expecting success of 7001.29 'move into "."': 
+	git mv path1/path2/ .
+
+ok 29 - move into "."
+
+expecting success of 7001.30 'Michael Cassar's test case': 
+	rm -fr .git papers partA &&
+	git init &&
+	mkdir -p papers/unsorted papers/all-papers partA &&
+	echo a >papers/unsorted/Thesis.pdf &&
+	echo b >partA/outline.txt &&
+	echo c >papers/unsorted/_another &&
+	git add papers partA &&
+	T1=$(git write-tree) &&
+
+	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
+
+	T=$(git write-tree) &&
+	git ls-tree -r $T >out &&
+	grep partA/outline.txt out
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
+100644 blob 61780798228d17af2d34fce4cfbdf35556832472	partA/outline.txt
+ok 30 - Michael Cassar's test case
+
+expecting success of 7001.31 'Sergey Vlasov's test case': 
+	rm -fr .git &&
+	git init &&
+	mkdir ab &&
+	date >ab.c &&
+	date >ab/d &&
+	git add ab.c ab &&
+	git commit -m "initial" &&
+	git mv ab a
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
+[master (root-commit) 27556cf] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 ab.c
+ create mode 100644 ab/d
+ok 31 - Sergey Vlasov's test case
+
+expecting success of 7001.32 'absolute pathname': 
+	(
+		rm -fr mine &&
+		mkdir mine &&
+		cd mine &&
+		test_create_repo one &&
+		cd one &&
+		mkdir sub &&
+		>sub/file &&
+		git add sub/file &&
+
+		git mv sub "$(pwd)/in" &&
+		test_path_is_missing sub &&
+		test_path_is_dir in &&
+		git ls-files --error-unmatch in/file
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/one/.git/
+in/file
+ok 32 - absolute pathname
+
+expecting success of 7001.33 'absolute pathname outside should fail': 
+	(
+		rm -fr mine &&
+		mkdir mine &&
+		cd mine &&
+		out=$(pwd) &&
+		test_create_repo one &&
+		cd one &&
+		mkdir sub &&
+		>sub/file &&
+		git add sub/file &&
+
+		test_must_fail git mv sub "$out/out" &&
+		test_path_is_dir sub &&
+		test_path_is_missing ../in &&
+		git ls-files --error-unmatch sub/file
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/one/.git/
+fatal: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/out' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/one'
+sub/file
+ok 33 - absolute pathname outside should fail
+
+expecting success of 7001.34 'git mv to move multiple sources into a directory': 
+	rm -fr .git && git init &&
+	mkdir dir other &&
+	>dir/a.txt &&
+	>dir/b.txt &&
+	git add dir/?.txt &&
+	git mv dir/a.txt dir/b.txt other &&
+	git ls-files >actual &&
+	cat >expect <<-\EOF &&
+	other/a.txt
+	other/b.txt
+	EOF
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
+ok 34 - git mv to move multiple sources into a directory
+
+expecting success of 7001.35 'git mv should not change sha1 of moved cache entry': 
+	rm -fr .git &&
+	git init &&
+	echo 1 >dirty &&
+	git add dirty &&
+	entry="$(index_at_path dirty)" &&
+	git mv dirty dirty2 &&
+	test "$entry" = "$(index_at_path dirty2)" &&
+	echo 2 >dirty2 &&
+	git mv dirty2 dirty &&
+	test "$entry" = "$(index_at_path dirty)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
+ok 35 - git mv should not change sha1 of moved cache entry
+
+expecting success of 7001.36 'git mv error on conflicted file': 
+	rm -fr .git &&
+	git init &&
+	>conflict &&
+	test_when_finished "rm -f conflict" &&
+	cfhash=$(git hash-object -w conflict) &&
+	q_to_tab <<-EOF | git update-index --index-info &&
+	0 $cfhash 0Qconflict
+	100644 $cfhash 1Qconflict
+	EOF
+
+	test_must_fail git mv conflict newname 2>actual &&
+	test_grep "conflicted" actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
+fatal: conflicted, source=conflict, destination=newname
+ok 36 - git mv error on conflicted file
+
+expecting success of 7001.37 'git mv should overwrite symlink to a file': 
+	rm -fr .git &&
+	git init &&
+	echo 1 >moved &&
+	test_ln_s_add moved symlink &&
+	git add moved &&
+	test_must_fail git mv moved symlink &&
+	git mv -f moved symlink &&
+	test_path_is_missing moved &&
+	test_path_is_file symlink &&
+	test "$(cat symlink)" = 1 &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.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
+fatal: destination exists, source=moved, destination=symlink
+ok 37 - git mv should overwrite symlink to a file
+
+expecting success of 7001.38 'git mv should overwrite file with a symlink': 
+	rm -fr .git &&
+	git init &&
+	echo 1 >moved &&
+	test_ln_s_add moved symlink &&
+	git add moved &&
+	test_must_fail git mv symlink moved &&
+	git mv -f symlink moved &&
+	test_path_is_missing symlink &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
+fatal: destination exists, source=symlink, destination=moved
+ok 38 - git mv should overwrite file with a symlink
+
+expecting success of 7001.39 'check moved symlink': 
+	test_path_is_symlink moved
+
+ok 39 - check moved symlink
+
+expecting success of 7001.40 'setup submodule': 
+	test_config_global protocol.file.allow always &&
+	git commit -m initial &&
+	git reset --hard &&
+	git submodule add ./. sub &&
+	echo content >file &&
+	git add file &&
+	git commit -m "added sub and file" &&
+	mkdir -p deep/directory/hierarchy &&
+	git submodule add ./. deep/directory/hierarchy/sub &&
+	git commit -m "added another submodule" &&
+	git branch submodule
+
+[master (root-commit) 335301e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 moved
+HEAD is now at 335301e initial
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub'...
+done.
+[master 7b21d91] added sub and file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 file
+ create mode 160000 sub
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/deep/directory/hierarchy/sub'...
+done.
+[master d0b8d3f] added another submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 deep/directory/hierarchy/sub
+ok 40 - setup submodule
+
+expecting success of 7001.41 'git mv cannot move a submodule in a file': 
+	test_must_fail git mv sub file
+
+fatal: destination already exists, source=sub, destination=file
+ok 41 - git mv cannot move a submodule in a file
+
+expecting success of 7001.42 'git mv moves a submodule with a .git directory and no .gitmodules': 
+	entry="$(index_at_path sub)" &&
+	git rm .gitmodules &&
+	(
+		cd sub &&
+		rm -f .git &&
+		cp -R -P -p ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	mkdir mod &&
+	git mv sub mod/sub &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+rm '.gitmodules'
+On branch master
+Your branch is up to date with 'origin/master'.
+
+nothing to commit, working tree clean
+ok 42 - git mv moves a submodule with a .git directory and no .gitmodules
+
+expecting success of 7001.43 'git mv moves a submodule with a .git directory and .gitmodules': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	entry="$(index_at_path sub)" &&
+	(
+		cd sub &&
+		rm -f .git &&
+		cp -R -P -p ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	mkdir mod &&
+	git mv sub mod/sub &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	echo mod/sub >expected &&
+	git config -f .gitmodules submodule.sub.path >actual &&
+	test_cmp expected actual &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 43 - git mv moves a submodule with a .git directory and .gitmodules
+
+expecting success of 7001.44 'git mv moves a submodule with gitfile': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	entry="$(index_at_path sub)" &&
+	mkdir mod &&
+	git -C mod mv ../sub/ . &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	echo mod/sub >expected &&
+	git config -f .gitmodules submodule.sub.path >actual &&
+	test_cmp expected actual &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 44 - git mv moves a submodule with gitfile
+
+expecting success of 7001.45 'mv does not complain when no .gitmodules file is found': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	git rm .gitmodules &&
+	entry="$(index_at_path sub)" &&
+	mkdir mod &&
+	git mv sub mod/sub 2>actual.err &&
+	test_must_be_empty actual.err &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+rm '.gitmodules'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 45 - mv does not complain when no .gitmodules file is found
+
+expecting success of 7001.46 'mv will error out on a modified .gitmodules file unless staged': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules foo.bar true &&
+	entry="$(index_at_path sub)" &&
+	mkdir mod &&
+	test_must_fail git mv sub mod/sub 2>actual.err &&
+	test_file_not_empty actual.err &&
+	test_path_exists sub &&
+	git diff-files --quiet -- sub &&
+	git add .gitmodules &&
+	git mv sub mod/sub 2>actual.err &&
+	test_must_be_empty actual.err &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 46 - mv will error out on a modified .gitmodules file unless staged
+
+expecting success of 7001.47 'mv issues a warning when section is not found in .gitmodules': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules --remove-section submodule.sub &&
+	git add .gitmodules &&
+	entry="$(index_at_path sub)" &&
+	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
+	mkdir mod &&
+	git mv sub mod/sub 2>actual.err &&
+	test_cmp expect.err actual.err &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 47 - mv issues a warning when section is not found in .gitmodules
+
+expecting success of 7001.48 'mv --dry-run does not touch the submodule or .gitmodules': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	mkdir mod &&
+	git mv -n sub mod/sub 2>actual.err &&
+	test_path_is_file sub/.git &&
+	git diff-index --exit-code HEAD &&
+	git update-index --refresh &&
+	git diff-files --quiet -- sub .gitmodules
+
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+Checking rename of 'sub' to 'mod/sub'
+Renaming sub to mod/sub
+ok 48 - mv --dry-run does not touch the submodule or .gitmodules
+
+expecting success of 7001.49 'checking out a commit before submodule moved needs manual updates': 
+	git mv sub sub2 &&
+	git commit -m "moved sub to sub2" &&
+	git checkout -q HEAD^ 2>actual &&
+	test_grep "^warning: unable to rmdir 'sub2':" actual &&
+	git status -s sub2 >actual &&
+	echo "?? sub2/" >expected &&
+	test_cmp expected actual &&
+	test_path_is_missing sub/.git &&
+	test_path_is_file sub2/.git &&
+	git submodule update &&
+	test_path_is_file sub/.git &&
+	rm -rf sub2 &&
+	git diff-index --exit-code HEAD &&
+	git update-index --refresh &&
+	git diff-files --quiet -- sub .gitmodules &&
+	git status -s sub2 >actual &&
+	test_must_be_empty actual
+
+[master 6dd6220] moved sub to sub2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename sub => sub2 (100%)
+warning: unable to rmdir 'sub2': Directory not empty
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+ok 49 - checking out a commit before submodule moved needs manual updates
+
+expecting success of 7001.50 'mv -k does not accidentally destroy submodules': 
+	git checkout submodule &&
+	mkdir dummy dest &&
+	git mv -k dummy sub dest &&
+	git status --porcelain >actual &&
+	grep "^R  sub -> dest/sub" actual &&
+	git reset --hard &&
+	git checkout .
+
+Switched to branch 'submodule'
+R  sub -> dest/sub
+warning: unable to rmdir 'dest/sub': Directory not empty
+HEAD is now at d0b8d3f added another submodule
+Updated 0 paths from the index
+ok 50 - mv -k does not accidentally destroy submodules
+
+expecting success of 7001.51 'moving a submodule in nested directories': 
+	(
+		cd deep &&
+		git mv directory ../ &&
+		# git status would fail if the update of linking git dir to
+		# work dir of the submodule failed.
+		git status &&
+		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
+		echo "directory/hierarchy/sub" >../expect
+	) &&
+	test_cmp expect actual
+
+On branch submodule
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   ../.gitmodules
+	renamed:    directory/hierarchy/sub -> ../directory/hierarchy/sub
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	../.gitconfig
+	../a/
+	../ab.c
+	../actual
+	../actual.err
+	../bar
+	../dest/
+	../expect
+	../expect.err
+	../expected
+	../mine/
+	../non-existing-dir/
+	../other/
+	../out
+
+ok 51 - moving a submodule in nested directories
+
+expecting success of 7001.52 'moving nested submodules': 
+	test_config_global protocol.file.allow always &&
+	git commit -am "cleanup commit" &&
+	mkdir sub_nested_nested &&
+	(
+		cd sub_nested_nested &&
+		>nested_level2 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 2"
+	) &&
+	mkdir sub_nested &&
+	(
+		cd sub_nested &&
+		>nested_level1 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 1" &&
+		git submodule add ../sub_nested_nested &&
+		git commit -m "add nested level 2"
+	) &&
+	git submodule add ./sub_nested nested_move &&
+	git commit -m "add nested_move" &&
+	git submodule update --init --recursive &&
+	git mv nested_move sub_nested_moved &&
+	git status
+
+[submodule 61d0f20] cleanup commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename {deep/directory => directory}/hierarchy/sub (100%)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested_nested/.git/
+[master (root-commit) 3d81f5f] nested level 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nested_level2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested/.git/
+[master (root-commit) 8e39d83] nested level 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nested_level1
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested/sub_nested_nested'...
+done.
+[master 4ba474d] add nested level 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub_nested_nested
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/nested_move'...
+done.
+[submodule 4d404d9] add nested_move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 nested_move
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/./.) registered for path 'directory/hierarchy/sub/sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/directory/hierarchy/sub/sub'...
+done.
+Submodule path 'directory/hierarchy/sub/sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+Submodule 'sub_nested_nested' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested_nested) registered for path 'nested_move/sub_nested_nested'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/nested_move/sub_nested_nested'...
+done.
+Submodule path 'nested_move/sub_nested_nested': checked out '3d81f5fbdb0173269895972bd0ca2f0372e7edc5'
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+On branch submodule
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   .gitmodules
+	renamed:    nested_move -> sub_nested_moved
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	a/
+	ab.c
+	actual
+	actual.err
+	bar
+	dest/
+	expect
+	expect.err
+	expected
+	mine/
+	non-existing-dir/
+	other/
+	out
+	sub_nested/
+	sub_nested_nested/
+
+ok 52 - moving nested submodules
+
+checking known breakage of 7001.53 'nonsense mv triggers assertion failure and partially updated index': 
+	test_when_finished git reset --hard HEAD &&
+	git reset --hard HEAD &&
+	mkdir -p a &&
+	mkdir -p b &&
+	>a/a.txt &&
+	git add a/a.txt &&
+	test_must_fail git mv a/a.txt a b &&
+	git status --porcelain >actual &&
+	grep "^A[ ]*a/a.txt$" actual
+
+warning: unable to rmdir 'sub_nested_moved': Directory not empty
+HEAD is now at 4d404d9 add nested_move
+git: builtin/mv.c:508: cmd_mv: Assertion `pos >= 0' failed.
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-lib-functions.sh: line 1175: 322675 Aborted                 "$@" 2>&7
+test_must_fail: died by signal 6: git mv a/a.txt a b
+fatal: Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/index.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.
+not ok 53 - nonsense mv triggers assertion failure and partially updated index # TODO known breakage
+
+# still have 1 known breakage(s)
+# passed all remaining 52 test(s)
+1..53
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7061-wtstatus-ignore.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7061-wtstatus-ignore/.git/
 expecting success of 7061.1 'status untracked directory with --ignored': 
@@ -442185,88 +442767,6 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7101-reset-empty-subdirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7060-wtstatus.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7060-wtstatus/.git/
 expecting success of 7060.1 'setup': 
@@ -442671,6 +443171,67 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7104-reset-hard.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7104-reset-hard/.git/
+expecting success of 7104.1 'setup': 
+
+	mkdir before later &&
+	>before/1 &&
+	>before/2 &&
+	>hello &&
+	>later/3 &&
+	git add before hello later &&
+	git commit -m world &&
+
+	H=$(git rev-parse :hello) &&
+	git rm --cached hello &&
+	echo "100644 $H 2	hello" | git update-index --index-info &&
+
+	rm -f hello &&
+	mkdir -p hello &&
+	>hello/world &&
+	test "$(git ls-files -o)" = hello/world
+
+
+[master (root-commit) 53313cc] world
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 before/1
+ create mode 100644 before/2
+ create mode 100644 hello
+ create mode 100644 later/3
+rm 'hello'
+ok 1 - setup
+
+expecting success of 7104.2 'reset --hard should restore unmerged ones': 
+
+	git reset --hard &&
+	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
+	test -f hello
+
+
+HEAD is now at 53313cc world
+before/1
+before/2
+hello
+later/3
+ok 2 - reset --hard should restore unmerged ones
+
+expecting success of 7104.3 'reset --hard did not corrupt index or cache-tree': 
+
+	T=$(git write-tree) &&
+	rm -f .git/index &&
+	git add before hello later &&
+	U=$(git write-tree) &&
+	test "$T" = "$U"
+
+
+ok 3 - reset --hard did not corrupt index or cache-tree
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7103-reset-bare.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7103-reset-bare/.git/
 expecting success of 7103.1 'setup non-bare': 
@@ -442773,67 +443334,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7104-reset-hard.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7104-reset-hard/.git/
-expecting success of 7104.1 'setup': 
-
-	mkdir before later &&
-	>before/1 &&
-	>before/2 &&
-	>hello &&
-	>later/3 &&
-	git add before hello later &&
-	git commit -m world &&
-
-	H=$(git rev-parse :hello) &&
-	git rm --cached hello &&
-	echo "100644 $H 2	hello" | git update-index --index-info &&
-
-	rm -f hello &&
-	mkdir -p hello &&
-	>hello/world &&
-	test "$(git ls-files -o)" = hello/world
-
-
-[master (root-commit) 53313cc] world
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 before/1
- create mode 100644 before/2
- create mode 100644 hello
- create mode 100644 later/3
-rm 'hello'
-ok 1 - setup
-
-expecting success of 7104.2 'reset --hard should restore unmerged ones': 
-
-	git reset --hard &&
-	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
-	test -f hello
-
-
-HEAD is now at 53313cc world
-before/1
-before/2
-hello
-later/3
-ok 2 - reset --hard should restore unmerged ones
-
-expecting success of 7104.3 'reset --hard did not corrupt index or cache-tree': 
-
-	T=$(git write-tree) &&
-	rm -f .git/index &&
-	git add before hello later &&
-	U=$(git write-tree) &&
-	test "$T" = "$U"
-
-
-ok 3 - reset --hard did not corrupt index or cache-tree
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7106-reset-unborn-branch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7106-reset-unborn-branch/.git/
 expecting success of 7106.1 'setup': 
@@ -442912,6 +443412,241 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7107-reset-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7107-reset-pathspec-file/.git/
+expecting success of 7107.1 'setup': 
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add . &&
+	git commit --include . -m "Commit" &&
+	git tag checkpoint
+
+[master (root-commit) 4b301d4] Commit
+ Author: A U Thor <author@example.com>
+ 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 7107.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
+
+	git rm fileA.t &&
+	echo fileA.t | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+Unstaged changes after reset:
+D	fileA.t
+ok 2 - --pathspec-from-file from stdin
+
+expecting success of 7107.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
+
+	git rm fileA.t &&
+	echo fileA.t >list &&
+	git reset --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+Unstaged changes after reset:
+D	fileA.t
+ok 3 - --pathspec-from-file from file
+
+expecting success of 7107.4 'NUL delimiters': 
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 4 - NUL delimiters
+
+expecting success of 7107.5 'LF delimiters': 
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 5 - LF delimiters
+
+expecting success of 7107.6 'no trailing delimiter': 
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 6 - no trailing delimiter
+
+expecting success of 7107.7 'CRLF delimiters': 
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 7 - CRLF delimiters
+
+expecting success of 7107.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git rm fileA.t &&
+	git reset --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+Unstaged changes after reset:
+D	fileA.t
+ok 8 - quotes
+
+expecting success of 7107.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	# Note: "git reset" has not yet learned to fail on wrong pathspecs
+	git reset --pathspec-from-file=list --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect !
+
+HEAD is now at 4b301d4 Commit
+--- expect	2026-03-14 13:35:08.842677808 +0000
++++ actual	2026-03-14 13:35:08.858677808 +0000
+@@ -1 +0,0 @@
+- D fileA.t
+ok 9 - quotes not compatible with --pathspec-file-nul
+
+expecting success of 7107.10 'only touches what was listed': 
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t fileC.t fileD.t &&
+	printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	 D fileB.t
+	 D fileC.t
+	D  fileD.t
+	EOF
+	verify_expect
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+rm 'fileC.t'
+rm 'fileD.t'
+Unstaged changes after reset:
+D	fileB.t
+D	fileC.t
+ok 10 - only touches what was listed
+
+expecting success of 7107.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	git rm fileA.t &&
+
+	test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+
+	test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+
+	test_must_fail git reset --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
+	test_grep -e "fatal: Cannot do soft reset with paths" err &&
+
+	test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
+	test_grep -e "fatal: Cannot do hard reset with paths" err
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+fatal: options '--pathspec-from-file' and '--patch' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+ok 11 - error conditions
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7064-wtstatus-pv2.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7064-wtstatus-pv2/.git/
 expecting success of 7064.1 'setup': 
@@ -443519,1036 +444254,209 @@
 
 		git status --porcelain=v2 --branch --untracked-files=all >actual &&
 		test_cmp expect actual
-	)
-
-Already on 'initial-branch'
-Cloning into 'sub_repo'...
-done.
-Cloning into 'super_repo'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7064-wtstatus-pv2/super_repo/sub1'...
-done.
-ok 21 - create and add submodule, submodule appears clean (A. S...)
-
-expecting success of 7064.22 'untracked changes in added submodule (AM S..U)': 
-	(	cd super_repo &&
-		## create untracked file in the submodule.
-		(	cd sub1 &&
-			echo "xxxx" >file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 22 - untracked changes in added submodule (AM S..U)
-
-expecting success of 7064.23 'staged changes in added submodule (AM S.M.)': 
-	(	cd super_repo &&
-		## stage the changes in the submodule.
-		(	cd sub1 &&
-			git add file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 23 - staged changes in added submodule (AM S.M.)
-
-expecting success of 7064.24 'staged and unstaged changes in added (AM S.M.)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## make additional unstaged changes (on the same file) in the submodule.
-			## This does not cause us to get S.MU (because the submodule does not report
-			## a "?" line for the unstaged changes).
-			echo "more changes" >>file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 24 - staged and unstaged changes in added (AM S.M.)
-
-expecting success of 7064.25 'staged and untracked changes in added submodule (AM S.MU)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## stage new changes in tracked file.
-			git add file_in_sub &&
-			## create new untracked file.
-			echo "yyyy" >>another_file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 25 - staged and untracked changes in added submodule (AM S.MU)
-
-expecting success of 7064.26 'commit within the submodule appears as new commit in super (AM SC..)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## Make a new commit in the submodule.
-			git add file_in_sub &&
-			rm -f another_file_in_sub &&
-			git commit -m "new commit"
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-[initial-branch 49ed2bd] new commit
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 file_in_sub
-ok 26 - commit within the submodule appears as new commit in super (AM SC..)
-
-expecting success of 7064.27 'stage submodule in super and commit': 
-	(	cd super_repo &&
-		## Stage the new submodule commit in the super.
-		git add sub1 &&
-		## Commit the super so that the sub no longer appears as added.
-		git commit -m "super commit" &&
-
-		HSUP=$(git rev-parse HEAD) &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +1 -0
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-[initial-branch 9939ebd] super commit
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
-ok 27 - stage submodule in super and commit
-
-expecting success of 7064.28 'make unstaged changes in existing submodule (.M S.M.)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			echo "zzzz" >>file_in_sub
-		) &&
-
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$(cd sub1 && git rev-parse HEAD) &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +1 -0
-		1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 28 - make unstaged changes in existing submodule (.M S.M.)
-
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7001-mv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
-expecting success of 7001.1 'mv -f refreshes updated index entry': 
-	echo test >bar &&
-	git add bar &&
-	git commit -m test &&
-
-	echo foo >foo &&
-	git add foo &&
-
-	# Wait one second to ensure ctime of rename will differ from original
-	# file creation ctime.
-	sleep 1 &&
-	git mv -f foo bar &&
-	git reset --merge HEAD &&
-
-	# Verify the index has been reset
-	git diff-files >out &&
-	test_must_be_empty out
-
-[master (root-commit) dd702a3] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-ok 1 - mv -f refreshes updated index entry
-
-expecting success of 7001.2 'prepare reference tree': 
-	mkdir path0 path1 &&
-	COPYING_test_data >path0/COPYING &&
-	git add path0/COPYING &&
-	git commit -m add -a
-
-[master a081f64] add
- Author: A U Thor <author@example.com>
- 1 file changed, 18 insertions(+)
- create mode 100644 path0/COPYING
-ok 2 - prepare reference tree
-
-expecting success of 7001.3 'moving the file out of subdirectory': 
-	git -C path0 mv COPYING ../path1/COPYING
-
-ok 3 - moving the file out of subdirectory
-
-expecting success of 7001.4 'commiting the change': 
-	git commit -m move-out -a
-
-[master e61e243] move-out
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {path0 => path1}/COPYING (100%)
-ok 4 - commiting the change
-
-expecting success of 7001.5 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path0/COPYING..*path1/COPYING" actual
-
-R100	path0/COPYING	path1/COPYING
-ok 5 - checking the commit
-
-expecting success of 7001.6 'moving the file back into subdirectory': 
-	git -C path0 mv ../path1/COPYING COPYING
-
-ok 6 - moving the file back into subdirectory
-
-expecting success of 7001.7 'commiting the change': 
-	git commit -m move-in -a
-
-[master 965f93d] move-in
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {path1 => path0}/COPYING (100%)
-ok 7 - commiting the change
-
-expecting success of 7001.8 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path1/COPYING..*path0/COPYING" actual
-
-R100	path1/COPYING	path0/COPYING
-ok 8 - checking the commit
-
-expecting success of 7001.9 'mv --dry-run does not move file': 
-	git mv -n path0/COPYING MOVED &&
-	test_path_is_file path0/COPYING &&
-	test_path_is_missing MOVED
-
-Checking rename of 'path0/COPYING' to 'MOVED'
-Renaming path0/COPYING to MOVED
-ok 9 - mv --dry-run does not move file
-
-expecting success of 7001.10 'checking -k on non-existing file': 
-	git mv -k idontexist path0
-
-ok 10 - checking -k on non-existing file
-
-expecting success of 7001.11 'checking -k on untracked file': 
-	>untracked1 &&
-	git mv -k untracked1 path0 &&
-	test_path_is_file untracked1 &&
-	test_path_is_missing path0/untracked1
-
-ok 11 - checking -k on untracked file
-
-expecting success of 7001.12 'checking -k on multiple untracked files': 
-	>untracked2 &&
-	git mv -k untracked1 untracked2 path0 &&
-	test_path_is_file untracked1 &&
-	test_path_is_file untracked2 &&
-	test_path_is_missing path0/untracked1 &&
-	test_path_is_missing path0/untracked2
-
-ok 12 - checking -k on multiple untracked files
-
-expecting success of 7001.13 'checking -f on untracked file with existing target': 
-	>path0/untracked1 &&
-	test_must_fail git mv -f untracked1 path0 &&
-	test_path_is_missing .git/index.lock &&
-	test_path_is_file untracked1 &&
-	test_path_is_file path0/untracked1
-
-fatal: not under version control, source=untracked1, destination=path0/untracked1
-ok 13 - checking -f on untracked file with existing target
-
-expecting success of 7001.14 'moving to absent target with trailing slash': 
-	test_must_fail git mv path0/COPYING no-such-dir/ &&
-	test_must_fail git mv path0/COPYING no-such-dir// &&
-	git mv path0/ no-such-dir/ &&
-	test_path_is_dir no-such-dir
-
-fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
-fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
-ok 14 - moving to absent target with trailing slash
-
-expecting success of 7001.15 'clean up': 
-	git reset --hard
-
-HEAD is now at 965f93d move-in
-ok 15 - clean up
-
-expecting success of 7001.16 'moving to existing untracked target with trailing slash': 
-	mkdir path1 &&
-	git mv path0/ path1/ &&
-	test_path_is_dir path1/path0/
-
-ok 16 - moving to existing untracked target with trailing slash
-
-expecting success of 7001.17 'moving to existing tracked target with trailing slash': 
-	mkdir path2 &&
-	>path2/file && git add path2/file &&
-	git mv path1/path0/ path2/ &&
-	test_path_is_dir path2/path0/
-
-ok 17 - moving to existing tracked target with trailing slash
-
-expecting success of 7001.18 'clean up': 
-	git reset --hard
-
-HEAD is now at 965f93d move-in
-ok 18 - clean up
-
-expecting success of 7001.19 'adding another file': 
-	COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
-	git add path0/README &&
-	git commit -m add2 -a
-
-[master 0c7076e] add2
- Author: A U Thor <author@example.com>
- 1 file changed, 18 insertions(+)
- create mode 100644 path0/README
-ok 19 - adding another file
-
-expecting success of 7001.20 'moving whole subdirectory': 
-	git mv path0 path2
-
-ok 20 - moving whole subdirectory
-
-expecting success of 7001.21 'commiting the change': 
-	git commit -m dir-move -a
-
-[master d877af0] dir-move
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {path0 => path2}/COPYING (100%)
- rename {path0 => path2}/README (100%)
-ok 21 - commiting the change
-
-expecting success of 7001.22 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
-	grep "^R100..*path0/README..*path2/README" actual
-
-R100	path0/COPYING	path2/COPYING
-R100	path0/README	path2/README
-ok 22 - checking the commit
-
-expecting success of 7001.23 'succeed when source is a prefix of destination': 
-	git mv path2/COPYING path2/COPYING-renamed
-
-ok 23 - succeed when source is a prefix of destination
-
-expecting success of 7001.24 'moving whole subdirectory into subdirectory': 
-	git mv path2 path1
-
-ok 24 - moving whole subdirectory into subdirectory
-
-expecting success of 7001.25 'commiting the change': 
-	git commit -m dir-move -a
-
-[master a4d744b] dir-move
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename path2/COPYING => path1/path2/COPYING-renamed (100%)
- rename {path2 => path1/path2}/README (100%)
-ok 25 - commiting the change
-
-expecting success of 7001.26 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
-	grep "^R100..*path2/README..*path1/path2/README" actual
-
-R100	path2/COPYING	path1/path2/COPYING-renamed
-R100	path2/README	path1/path2/README
-ok 26 - checking the commit
-
-expecting success of 7001.27 'do not move directory over existing directory': 
-	mkdir path0 &&
-	mkdir path0/path2 &&
-	test_must_fail git mv path2 path0
-
-fatal: bad source, source=path2, destination=path0/path2
-ok 27 - do not move directory over existing directory
-
-expecting success of 7001.28 'rename directory to non-existing directory': 
-	mkdir dir-a &&
-	>dir-a/f &&
-	git add dir-a &&
-	git mv dir-a non-existing-dir
-
-ok 28 - rename directory to non-existing directory
-
-expecting success of 7001.29 'move into "."': 
-	git mv path1/path2/ .
-
-ok 29 - move into "."
-
-expecting success of 7001.30 'Michael Cassar's test case': 
-	rm -fr .git papers partA &&
-	git init &&
-	mkdir -p papers/unsorted papers/all-papers partA &&
-	echo a >papers/unsorted/Thesis.pdf &&
-	echo b >partA/outline.txt &&
-	echo c >papers/unsorted/_another &&
-	git add papers partA &&
-	T1=$(git write-tree) &&
-
-	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
-
-	T=$(git write-tree) &&
-	git ls-tree -r $T >out &&
-	grep partA/outline.txt out
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
-100644 blob 61780798228d17af2d34fce4cfbdf35556832472	partA/outline.txt
-ok 30 - Michael Cassar's test case
-
-expecting success of 7001.31 'Sergey Vlasov's test case': 
-	rm -fr .git &&
-	git init &&
-	mkdir ab &&
-	date >ab.c &&
-	date >ab/d &&
-	git add ab.c ab &&
-	git commit -m "initial" &&
-	git mv ab a
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
-[master (root-commit) 9d06393] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 ab.c
- create mode 100644 ab/d
-ok 31 - Sergey Vlasov's test case
-
-expecting success of 7001.32 'absolute pathname': 
-	(
-		rm -fr mine &&
-		mkdir mine &&
-		cd mine &&
-		test_create_repo one &&
-		cd one &&
-		mkdir sub &&
-		>sub/file &&
-		git add sub/file &&
-
-		git mv sub "$(pwd)/in" &&
-		test_path_is_missing sub &&
-		test_path_is_dir in &&
-		git ls-files --error-unmatch in/file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/one/.git/
-in/file
-ok 32 - absolute pathname
-
-expecting success of 7001.33 'absolute pathname outside should fail': 
-	(
-		rm -fr mine &&
-		mkdir mine &&
-		cd mine &&
-		out=$(pwd) &&
-		test_create_repo one &&
-		cd one &&
-		mkdir sub &&
-		>sub/file &&
-		git add sub/file &&
-
-		test_must_fail git mv sub "$out/out" &&
-		test_path_is_dir sub &&
-		test_path_is_missing ../in &&
-		git ls-files --error-unmatch sub/file
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/one/.git/
-fatal: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/out' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/mine/one'
-sub/file
-ok 33 - absolute pathname outside should fail
-
-expecting success of 7001.34 'git mv to move multiple sources into a directory': 
-	rm -fr .git && git init &&
-	mkdir dir other &&
-	>dir/a.txt &&
-	>dir/b.txt &&
-	git add dir/?.txt &&
-	git mv dir/a.txt dir/b.txt other &&
-	git ls-files >actual &&
-	cat >expect <<-\EOF &&
-	other/a.txt
-	other/b.txt
-	EOF
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
-ok 34 - git mv to move multiple sources into a directory
-
-expecting success of 7001.35 'git mv should not change sha1 of moved cache entry': 
-	rm -fr .git &&
-	git init &&
-	echo 1 >dirty &&
-	git add dirty &&
-	entry="$(index_at_path dirty)" &&
-	git mv dirty dirty2 &&
-	test "$entry" = "$(index_at_path dirty2)" &&
-	echo 2 >dirty2 &&
-	git mv dirty2 dirty &&
-	test "$entry" = "$(index_at_path dirty)"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
-ok 35 - git mv should not change sha1 of moved cache entry
-
-expecting success of 7001.36 'git mv error on conflicted file': 
-	rm -fr .git &&
-	git init &&
-	>conflict &&
-	test_when_finished "rm -f conflict" &&
-	cfhash=$(git hash-object -w conflict) &&
-	q_to_tab <<-EOF | git update-index --index-info &&
-	0 $cfhash 0Qconflict
-	100644 $cfhash 1Qconflict
-	EOF
-
-	test_must_fail git mv conflict newname 2>actual &&
-	test_grep "conflicted" actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
-fatal: conflicted, source=conflict, destination=newname
-ok 36 - git mv error on conflicted file
-
-expecting success of 7001.37 'git mv should overwrite symlink to a file': 
-	rm -fr .git &&
-	git init &&
-	echo 1 >moved &&
-	test_ln_s_add moved symlink &&
-	git add moved &&
-	test_must_fail git mv moved symlink &&
-	git mv -f moved symlink &&
-	test_path_is_missing moved &&
-	test_path_is_file symlink &&
-	test "$(cat symlink)" = 1 &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.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
-fatal: destination exists, source=moved, destination=symlink
-ok 37 - git mv should overwrite symlink to a file
-
-expecting success of 7001.38 'git mv should overwrite file with a symlink': 
-	rm -fr .git &&
-	git init &&
-	echo 1 >moved &&
-	test_ln_s_add moved symlink &&
-	git add moved &&
-	test_must_fail git mv symlink moved &&
-	git mv -f symlink moved &&
-	test_path_is_missing symlink &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/
-fatal: destination exists, source=symlink, destination=moved
-ok 38 - git mv should overwrite file with a symlink
-
-expecting success of 7001.39 'check moved symlink': 
-	test_path_is_symlink moved
-
-ok 39 - check moved symlink
-
-expecting success of 7001.40 'setup submodule': 
-	test_config_global protocol.file.allow always &&
-	git commit -m initial &&
-	git reset --hard &&
-	git submodule add ./. sub &&
-	echo content >file &&
-	git add file &&
-	git commit -m "added sub and file" &&
-	mkdir -p deep/directory/hierarchy &&
-	git submodule add ./. deep/directory/hierarchy/sub &&
-	git commit -m "added another submodule" &&
-	git branch submodule
+	)
 
-[master (root-commit) 335301e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 moved
-HEAD is now at 335301e initial
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub'...
+Already on 'initial-branch'
+Cloning into 'sub_repo'...
 done.
-[master 7b21d91] added sub and file
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 file
- create mode 160000 sub
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/deep/directory/hierarchy/sub'...
+Cloning into 'super_repo'...
 done.
-[master d0b8d3f] added another submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 deep/directory/hierarchy/sub
-ok 40 - setup submodule
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7064-wtstatus-pv2/super_repo/sub1'...
+done.
+ok 21 - create and add submodule, submodule appears clean (A. S...)
 
-expecting success of 7001.41 'git mv cannot move a submodule in a file': 
-	test_must_fail git mv sub file
+expecting success of 7064.22 'untracked changes in added submodule (AM S..U)': 
+	(	cd super_repo &&
+		## create untracked file in the submodule.
+		(	cd sub1 &&
+			echo "xxxx" >file_in_sub
+		) &&
 
-fatal: destination already exists, source=sub, destination=file
-ok 41 - git mv cannot move a submodule in a file
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-expecting success of 7001.42 'git mv moves a submodule with a .git directory and no .gitmodules': 
-	entry="$(index_at_path sub)" &&
-	git rm .gitmodules &&
-	(
-		cd sub &&
-		rm -f .git &&
-		cp -R -P -p ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	mkdir mod &&
-	git mv sub mod/sub &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-rm '.gitmodules'
-On branch master
-Your branch is up to date with 'origin/master'.
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-nothing to commit, working tree clean
-ok 42 - git mv moves a submodule with a .git directory and no .gitmodules
+ok 22 - untracked changes in added submodule (AM S..U)
 
-expecting success of 7001.43 'git mv moves a submodule with a .git directory and .gitmodules': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	entry="$(index_at_path sub)" &&
-	(
-		cd sub &&
-		rm -f .git &&
-		cp -R -P -p ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	mkdir mod &&
-	git mv sub mod/sub &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	echo mod/sub >expected &&
-	git config -f .gitmodules submodule.sub.path >actual &&
-	test_cmp expected actual &&
-	git update-index --refresh &&
-	git diff-files --quiet
+expecting success of 7064.23 'staged changes in added submodule (AM S.M.)': 
+	(	cd super_repo &&
+		## stage the changes in the submodule.
+		(	cd sub1 &&
+			git add file_in_sub
+		) &&
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 43 - git mv moves a submodule with a .git directory and .gitmodules
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-expecting success of 7001.44 'git mv moves a submodule with gitfile': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	entry="$(index_at_path sub)" &&
-	mkdir mod &&
-	git -C mod mv ../sub/ . &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	echo mod/sub >expected &&
-	git config -f .gitmodules submodule.sub.path >actual &&
-	test_cmp expected actual &&
-	git update-index --refresh &&
-	git diff-files --quiet
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 44 - git mv moves a submodule with gitfile
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 7001.45 'mv does not complain when no .gitmodules file is found': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git rm .gitmodules &&
-	entry="$(index_at_path sub)" &&
-	mkdir mod &&
-	git mv sub mod/sub 2>actual.err &&
-	test_must_be_empty actual.err &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+ok 23 - staged changes in added submodule (AM S.M.)
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-rm '.gitmodules'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 45 - mv does not complain when no .gitmodules file is found
+expecting success of 7064.24 'staged and unstaged changes in added (AM S.M.)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## make additional unstaged changes (on the same file) in the submodule.
+			## This does not cause us to get S.MU (because the submodule does not report
+			## a "?" line for the unstaged changes).
+			echo "more changes" >>file_in_sub
+		) &&
 
-expecting success of 7001.46 'mv will error out on a modified .gitmodules file unless staged': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules foo.bar true &&
-	entry="$(index_at_path sub)" &&
-	mkdir mod &&
-	test_must_fail git mv sub mod/sub 2>actual.err &&
-	test_file_not_empty actual.err &&
-	test_path_exists sub &&
-	git diff-files --quiet -- sub &&
-	git add .gitmodules &&
-	git mv sub mod/sub 2>actual.err &&
-	test_must_be_empty actual.err &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 46 - mv will error out on a modified .gitmodules file unless staged
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-expecting success of 7001.47 'mv issues a warning when section is not found in .gitmodules': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules --remove-section submodule.sub &&
-	git add .gitmodules &&
-	entry="$(index_at_path sub)" &&
-	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
-	mkdir mod &&
-	git mv sub mod/sub 2>actual.err &&
-	test_cmp expect.err actual.err &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 47 - mv issues a warning when section is not found in .gitmodules
+ok 24 - staged and unstaged changes in added (AM S.M.)
 
-expecting success of 7001.48 'mv --dry-run does not touch the submodule or .gitmodules': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	mkdir mod &&
-	git mv -n sub mod/sub 2>actual.err &&
-	test_path_is_file sub/.git &&
-	git diff-index --exit-code HEAD &&
-	git update-index --refresh &&
-	git diff-files --quiet -- sub .gitmodules
+expecting success of 7064.25 'staged and untracked changes in added submodule (AM S.MU)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## stage new changes in tracked file.
+			git add file_in_sub &&
+			## create new untracked file.
+			echo "yyyy" >>another_file_in_sub
+		) &&
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-Checking rename of 'sub' to 'mod/sub'
-Renaming sub to mod/sub
-ok 48 - mv --dry-run does not touch the submodule or .gitmodules
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-expecting success of 7001.49 'checking out a commit before submodule moved needs manual updates': 
-	git mv sub sub2 &&
-	git commit -m "moved sub to sub2" &&
-	git checkout -q HEAD^ 2>actual &&
-	test_grep "^warning: unable to rmdir 'sub2':" actual &&
-	git status -s sub2 >actual &&
-	echo "?? sub2/" >expected &&
-	test_cmp expected actual &&
-	test_path_is_missing sub/.git &&
-	test_path_is_file sub2/.git &&
-	git submodule update &&
-	test_path_is_file sub/.git &&
-	rm -rf sub2 &&
-	git diff-index --exit-code HEAD &&
-	git update-index --refresh &&
-	git diff-files --quiet -- sub .gitmodules &&
-	git status -s sub2 >actual &&
-	test_must_be_empty actual
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-[master 6dd6220] moved sub to sub2
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename sub => sub2 (100%)
-warning: unable to rmdir 'sub2': Directory not empty
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-ok 49 - checking out a commit before submodule moved needs manual updates
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 7001.50 'mv -k does not accidentally destroy submodules': 
-	git checkout submodule &&
-	mkdir dummy dest &&
-	git mv -k dummy sub dest &&
-	git status --porcelain >actual &&
-	grep "^R  sub -> dest/sub" actual &&
-	git reset --hard &&
-	git checkout .
+ok 25 - staged and untracked changes in added submodule (AM S.MU)
 
-Switched to branch 'submodule'
-R  sub -> dest/sub
-warning: unable to rmdir 'dest/sub': Directory not empty
-HEAD is now at d0b8d3f added another submodule
-Updated 0 paths from the index
-ok 50 - mv -k does not accidentally destroy submodules
+expecting success of 7064.26 'commit within the submodule appears as new commit in super (AM SC..)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## Make a new commit in the submodule.
+			git add file_in_sub &&
+			rm -f another_file_in_sub &&
+			git commit -m "new commit"
+		) &&
 
-expecting success of 7001.51 'moving a submodule in nested directories': 
-	(
-		cd deep &&
-		git mv directory ../ &&
-		# git status would fail if the update of linking git dir to
-		# work dir of the submodule failed.
-		git status &&
-		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
-		echo "directory/hierarchy/sub" >../expect
-	) &&
-	test_cmp expect actual
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-On branch submodule
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   ../.gitmodules
-	renamed:    directory/hierarchy/sub -> ../directory/hierarchy/sub
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	../.gitconfig
-	../a/
-	../ab.c
-	../actual
-	../actual.err
-	../bar
-	../dest/
-	../expect
-	../expect.err
-	../expected
-	../mine/
-	../non-existing-dir/
-	../other/
-	../out
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-ok 51 - moving a submodule in nested directories
+[initial-branch 49ed2bd] new commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file_in_sub
+ok 26 - commit within the submodule appears as new commit in super (AM SC..)
 
-expecting success of 7001.52 'moving nested submodules': 
-	test_config_global protocol.file.allow always &&
-	git commit -am "cleanup commit" &&
-	mkdir sub_nested_nested &&
-	(
-		cd sub_nested_nested &&
-		>nested_level2 &&
-		git init &&
-		git add . &&
-		git commit -m "nested level 2"
-	) &&
-	mkdir sub_nested &&
-	(
-		cd sub_nested &&
-		>nested_level1 &&
-		git init &&
-		git add . &&
-		git commit -m "nested level 1" &&
-		git submodule add ../sub_nested_nested &&
-		git commit -m "add nested level 2"
-	) &&
-	git submodule add ./sub_nested nested_move &&
-	git commit -m "add nested_move" &&
-	git submodule update --init --recursive &&
-	git mv nested_move sub_nested_moved &&
-	git status
+expecting success of 7064.27 'stage submodule in super and commit': 
+	(	cd super_repo &&
+		## Stage the new submodule commit in the super.
+		git add sub1 &&
+		## Commit the super so that the sub no longer appears as added.
+		git commit -m "super commit" &&
 
-[submodule 61d0f20] cleanup commit
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename {deep/directory => directory}/hierarchy/sub (100%)
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested_nested/.git/
-[master (root-commit) 3d81f5f] nested level 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nested_level2
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested/.git/
-[master (root-commit) 8e39d83] nested level 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nested_level1
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested/sub_nested_nested'...
-done.
-[master 4ba474d] add nested level 2
+		HSUP=$(git rev-parse HEAD) &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +1 -0
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+[initial-branch 9939ebd] super commit
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub_nested_nested
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/nested_move'...
-done.
-[submodule 4d404d9] add nested_move
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 nested_move
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/./.) registered for path 'directory/hierarchy/sub/sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/directory/hierarchy/sub/sub'...
-done.
-Submodule path 'directory/hierarchy/sub/sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-Submodule 'sub_nested_nested' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/sub_nested_nested) registered for path 'nested_move/sub_nested_nested'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/nested_move/sub_nested_nested'...
-done.
-Submodule path 'nested_move/sub_nested_nested': checked out '3d81f5fbdb0173269895972bd0ca2f0372e7edc5'
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-On branch submodule
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   .gitmodules
-	renamed:    nested_move -> sub_nested_moved
+ create mode 160000 sub1
+ok 27 - stage submodule in super and commit
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	a/
-	ab.c
-	actual
-	actual.err
-	bar
-	dest/
-	expect
-	expect.err
-	expected
-	mine/
-	non-existing-dir/
-	other/
-	out
-	sub_nested/
-	sub_nested_nested/
+expecting success of 7064.28 'make unstaged changes in existing submodule (.M S.M.)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			echo "zzzz" >>file_in_sub
+		) &&
 
-ok 52 - moving nested submodules
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$(cd sub1 && git rev-parse HEAD) &&
 
-checking known breakage of 7001.53 'nonsense mv triggers assertion failure and partially updated index': 
-	test_when_finished git reset --hard HEAD &&
-	git reset --hard HEAD &&
-	mkdir -p a &&
-	mkdir -p b &&
-	>a/a.txt &&
-	git add a/a.txt &&
-	test_must_fail git mv a/a.txt a b &&
-	git status --porcelain >actual &&
-	grep "^A[ ]*a/a.txt$" actual
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +1 -0
+		1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
+		EOF
 
-warning: unable to rmdir 'sub_nested_moved': Directory not empty
-HEAD is now at 4d404d9 add nested_move
-git: builtin/mv.c:508: cmd_mv: Assertion `pos >= 0' failed.
-Aborted
-test_must_fail: died by signal 6: git mv a/a.txt a b
-fatal: Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7001-mv/.git/index.lock': File exists.
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-not ok 53 - nonsense mv triggers assertion failure and partially updated index # TODO known breakage
+ok 28 - make unstaged changes in existing submodule (.M S.M.)
 
-# still have 1 known breakage(s)
-# passed all remaining 52 test(s)
-1..53
+# passed all 28 test(s)
+1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7105-reset-patch.sh ***
@@ -444725,241 +444633,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7107-reset-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7107-reset-pathspec-file/.git/
-expecting success of 7107.1 'setup': 
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
-	git add . &&
-	git commit --include . -m "Commit" &&
-	git tag checkpoint
-
-[master (root-commit) 4b301d4] Commit
- Author: A U Thor <author@example.com>
- 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 7107.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
-
-	git rm fileA.t &&
-	echo fileA.t | git reset --pathspec-from-file=- &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-Unstaged changes after reset:
-D	fileA.t
-ok 2 - --pathspec-from-file from stdin
-
-expecting success of 7107.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
-
-	git rm fileA.t &&
-	echo fileA.t >list &&
-	git reset --pathspec-from-file=list &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-Unstaged changes after reset:
-D	fileA.t
-ok 3 - --pathspec-from-file from file
-
-expecting success of 7107.4 'NUL delimiters': 
-	restore_checkpoint &&
-
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 4 - NUL delimiters
-
-expecting success of 7107.5 'LF delimiters': 
-	restore_checkpoint &&
-
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 5 - LF delimiters
-
-expecting success of 7107.6 'no trailing delimiter': 
-	restore_checkpoint &&
-
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 6 - no trailing delimiter
-
-expecting success of 7107.7 'CRLF delimiters': 
-	restore_checkpoint &&
-
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 7 - CRLF delimiters
-
-expecting success of 7107.8 'quotes': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	git rm fileA.t &&
-	git reset --pathspec-from-file=list &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-Unstaged changes after reset:
-D	fileA.t
-ok 8 - quotes
-
-expecting success of 7107.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	# Note: "git reset" has not yet learned to fail on wrong pathspecs
-	git reset --pathspec-from-file=list --pathspec-file-nul &&
-
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect !
-
-HEAD is now at 4b301d4 Commit
---- expect	2025-02-09 06:55:08.078120807 +0000
-+++ actual	2025-02-09 06:55:08.078120807 +0000
-@@ -1 +0,0 @@
-- D fileA.t
-ok 9 - quotes not compatible with --pathspec-file-nul
-
-expecting success of 7107.10 'only touches what was listed': 
-	restore_checkpoint &&
-
-	git rm fileA.t fileB.t fileC.t fileD.t &&
-	printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
-
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	 D fileB.t
-	 D fileC.t
-	D  fileD.t
-	EOF
-	verify_expect
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-rm 'fileC.t'
-rm 'fileD.t'
-Unstaged changes after reset:
-D	fileB.t
-D	fileC.t
-ok 10 - only touches what was listed
-
-expecting success of 7107.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	git rm fileA.t &&
-
-	test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
-
-	test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
-
-	test_must_fail git reset --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
-
-	test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
-	test_grep -e "fatal: Cannot do soft reset with paths" err &&
-
-	test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
-	test_grep -e "fatal: Cannot do hard reset with paths" err
-
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-fatal: options '--pathspec-from-file' and '--patch' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-ok 11 - error conditions
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7113-post-index-change-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7113-post-index-change-hook/.git/
 expecting success of 7113.1 'setup': 
@@ -445125,6 +444798,1473 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7110-reset-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7110-reset-merge/.git/
+expecting success of 7110.1 'setup': 
+	printf "line %d\n" 1 2 3 >file1 &&
+	cat file1 >file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m "Initial commit" &&
+	git tag initial &&
+	echo line 4 >>file1 &&
+	cat file1 >file2 &&
+	test_tick &&
+	git commit -m "add line 4 to file1" file1 &&
+	git tag second
+
+[master (root-commit) 294b13e] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master 91b6f65] add line 4 to file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 7110.2 'reset --merge is ok with changes in file it does not touch': 
+	git reset --merge HEAD^ &&
+	! grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
+
+line 4
+ok 2 - reset --merge is ok with changes in file it does not touch
+
+expecting success of 7110.3 'reset --merge is ok when switching back': 
+	git reset --merge second &&
+	grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
+
+line 4
+line 4
+ok 3 - reset --merge is ok when switching back
+
+expecting success of 7110.4 'reset --keep is ok with changes in file it does not touch': 
+	git reset --hard second &&
+	cat file1 >file2 &&
+	git reset --keep HEAD^ &&
+	! grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
+
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 4 - reset --keep is ok with changes in file it does not touch
+
+expecting success of 7110.5 'reset --keep is ok when switching back': 
+	git reset --keep second &&
+	grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
+
+line 4
+line 4
+ok 5 - reset --keep is ok when switching back
+
+expecting success of 7110.6 'reset --merge discards changes added to index (1)': 
+	git reset --hard second &&
+	cat file1 >file2 &&
+	echo "line 5" >> file1 &&
+	git add file1 &&
+	git reset --merge HEAD^ &&
+	! grep 4 file1 &&
+	! grep 5 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
+
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 6 - reset --merge discards changes added to index (1)
+
+expecting success of 7110.7 'reset --merge is ok again when switching back (1)': 
+	git reset --hard initial &&
+	echo "line 5" >> file2 &&
+	git add file2 &&
+	git reset --merge second &&
+	! grep 4 file2 &&
+	! grep 5 file1 &&
+	grep 4 file1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
+
+HEAD is now at 294b13e Initial commit
+line 4
+ok 7 - reset --merge is ok again when switching back (1)
+
+expecting success of 7110.8 'reset --keep fails with changes in index in files it touches': 
+	git reset --hard second &&
+	echo "line 5" >> file1 &&
+	git add file1 &&
+	test_must_fail git reset --keep HEAD^
+
+HEAD is now at 91b6f65 add line 4 to file1
+error: Entry 'file1' would be overwritten by merge. Cannot merge.
+fatal: Could not reset index file to revision 'HEAD^'.
+ok 8 - reset --keep fails with changes in index in files it touches
+
+expecting success of 7110.9 'reset --merge discards changes added to index (2)': 
+	git reset --hard second &&
+	echo "line 4" >> file2 &&
+	git add file2 &&
+	git reset --merge HEAD^ &&
+	! grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --cached)"
+
+HEAD is now at 91b6f65 add line 4 to file1
+ok 9 - reset --merge discards changes added to index (2)
+
+expecting success of 7110.10 'reset --merge is ok again when switching back (2)': 
+	git reset --hard initial &&
+	git reset --merge second &&
+	! grep 4 file2 &&
+	grep 4 file1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
+
+HEAD is now at 294b13e Initial commit
+line 4
+ok 10 - reset --merge is ok again when switching back (2)
+
+expecting success of 7110.11 'reset --keep keeps changes it does not touch': 
+	git reset --hard second &&
+	echo "line 4" >> file2 &&
+	git add file2 &&
+	git reset --keep HEAD^ &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
+
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 11 - reset --keep keeps changes it does not touch
+
+expecting success of 7110.12 'reset --keep keeps changes when switching back': 
+	git reset --keep second &&
+	grep 4 file2 &&
+	grep 4 file1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
+
+line 4
+line 4
+ok 12 - reset --keep keeps changes when switching back
+
+expecting success of 7110.13 'reset --merge fails with changes in file it touches': 
+	git reset --hard second &&
+	echo "line 5" >> file1 &&
+	test_tick &&
+	git commit -m "add line 5" file1 &&
+	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+	mv file3 file1 &&
+	test_must_fail git reset --merge HEAD^ 2>err.log &&
+	grep file1 err.log | grep "not uptodate"
+
+HEAD is now at 91b6f65 add line 4 to file1
+[master 7799e7c] add line 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+error: Entry 'file1' not uptodate. Cannot merge.
+ok 13 - reset --merge fails with changes in file it touches
+
+expecting success of 7110.14 'reset --keep fails with changes in file it touches': 
+	git reset --hard second &&
+	echo "line 5" >> file1 &&
+	test_tick &&
+	git commit -m "add line 5" file1 &&
+	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+	mv file3 file1 &&
+	test_must_fail git reset --keep HEAD^ 2>err.log &&
+	grep file1 err.log | grep "not uptodate"
+
+HEAD is now at 91b6f65 add line 4 to file1
+[master f1894d3] add line 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+error: Entry 'file1' not uptodate. Cannot merge.
+ok 14 - reset --keep fails with changes in file it touches
+
+expecting success of 7110.15 'setup 3 different branches': 
+	git reset --hard second &&
+	git branch branch1 &&
+	git branch branch2 &&
+	git branch branch3 &&
+	git checkout branch1 &&
+	echo "line 5 in branch1" >> file1 &&
+	test_tick &&
+	git commit -a -m "change in branch1" &&
+	git checkout branch2 &&
+	echo "line 5 in branch2" >> file1 &&
+	test_tick &&
+	git commit -a -m "change in branch2" &&
+	git tag third &&
+	git checkout branch3 &&
+	echo a new file >file3 &&
+	rm -f file1 &&
+	git add file3 &&
+	test_tick &&
+	git commit -a -m "change in branch3"
+
+HEAD is now at 91b6f65 add line 4 to file1
+Switched to branch 'branch1'
+[branch1 4afd189] change in branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 077fd6d] change in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch3'
+[branch3 05419f2] change in branch3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+ delete mode 100644 file1
+ create mode 100644 file3
+ok 15 - setup 3 different branches
+
+expecting success of 7110.16 '"reset --merge HEAD^" is ok with pending merge': 
+	git checkout third &&
+	test_must_fail git merge branch1 &&
+	git reset --merge HEAD^ &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)" &&
+	test -z "$(git diff)"
+
+Note: switching to 'third'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 16 - "reset --merge HEAD^" is ok with pending merge
+
+expecting success of 7110.17 '"reset --keep HEAD^" fails with pending merge': 
+	git reset --hard third &&
+	test_must_fail git merge branch1 &&
+	test_must_fail git reset --keep HEAD^ 2>err.log &&
+	test_grep "middle of a merge" err.log
+
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 17 - "reset --keep HEAD^" fails with pending merge
+
+expecting success of 7110.18 '"reset --merge HEAD" is ok with pending merge': 
+	git reset --hard third &&
+	test_must_fail git merge branch1 &&
+	git reset --merge HEAD &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
+	test -z "$(git diff --cached)" &&
+	test -z "$(git diff)"
+
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 18 - "reset --merge HEAD" is ok with pending merge
+
+expecting success of 7110.19 '"reset --keep HEAD" fails with pending merge': 
+	git reset --hard third &&
+	test_must_fail git merge branch1 &&
+	test_must_fail git reset --keep HEAD 2>err.log &&
+	test_grep "middle of a merge" err.log
+
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 19 - "reset --keep HEAD" fails with pending merge
+
+expecting success of 7110.20 '--merge is ok with added/deleted merge': 
+	git reset --hard third &&
+	rm -f file2 &&
+	test_must_fail git merge branch3 &&
+	! test -f file2 &&
+	test -f file3 &&
+	git diff --exit-code file3 &&
+	git diff --exit-code branch3 file3 &&
+	git reset --merge HEAD &&
+	! test -f file3 &&
+	! test -f file2 &&
+	git diff --exit-code --cached
+
+HEAD is now at 077fd6d change in branch2
+CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 20 - --merge is ok with added/deleted merge
+
+expecting success of 7110.21 '--keep fails with added/deleted merge': 
+	git reset --hard third &&
+	rm -f file2 &&
+	test_must_fail git merge branch3 &&
+	! test -f file2 &&
+	test -f file3 &&
+	git diff --exit-code file3 &&
+	git diff --exit-code branch3 file3 &&
+	test_must_fail git reset --keep HEAD 2>err.log &&
+	test_grep "middle of a merge" err.log
+
+HEAD is now at 077fd6d change in branch2
+CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 21 - --keep fails with added/deleted merge
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t6600-test-reach.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6600-test-reach/.git/
+expecting success of 6600.1 'setup': 
+	for i in $(test_seq 1 10)
+	do
+		test_commit "1-$i" &&
+		git branch -f commit-1-$i &&
+		git tag -a -m "1-$i" tag-1-$i commit-1-$i || return 1
+	done &&
+	for j in $(test_seq 1 9)
+	do
+		git reset --hard commit-$j-1 &&
+		x=$(($j + 1)) &&
+		test_commit "$x-1" &&
+		git branch -f commit-$x-1 &&
+		git tag -a -m "$x-1" tag-$x-1 commit-$x-1 &&
+
+		for i in $(test_seq 2 10)
+		do
+			git merge commit-$j-$i -m "$x-$i" &&
+			git branch -f commit-$x-$i &&
+			git tag -a -m "$x-$i" tag-$x-$i commit-$x-$i || return 1
+		done
+	done &&
+	git commit-graph write --reachable &&
+	mv .git/objects/info/commit-graph commit-graph-full &&
+	chmod u+w commit-graph-full &&
+	git show-ref -s commit-5-5 | git commit-graph write --stdin-commits &&
+	mv .git/objects/info/commit-graph commit-graph-half &&
+	chmod u+w commit-graph-half &&
+	git -c commitGraph.generationVersion=1 commit-graph write --reachable &&
+	mv .git/objects/info/commit-graph commit-graph-no-gdat &&
+	chmod u+w commit-graph-no-gdat &&
+	git config core.commitGraph true
+
+[master (root-commit) 0d15007] 1-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-1.t
+[master d299b7f] 1-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+[master 4824988] 1-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+[master 365457e] 1-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+[master c37c079] 1-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+[master a87f56a] 1-6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+[master e7afdd6] 1-7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+[master 2855ea4] 1-8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+[master 5d90ff6] 1-9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+[master be2c2f9] 1-10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at 0d15007 1-1
+[master 7393be9] 2-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at 7393be9 2-1
+[master 3195915] 3-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at 3195915 3-1
+[master af41a20] 4-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at af41a20 4-1
+[master 2948e13] 5-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at 2948e13 5-1
+[master d213662] 6-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at d213662 6-1
+[master 3c4cef0] 7-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at 3c4cef0 7-1
+[master 25a847a] 8-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at 25a847a 8-1
+[master 48082f2] 9-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+HEAD is now at 48082f2 9-1
+[master b42f416] 10-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10-1.t
+Merge made by the 'ort' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merge made by the 'ort' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merge made by the 'ort' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merge made by the 'ort' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merge made by the 'ort' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merge made by the 'ort' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merge made by the 'ort' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merge made by the 'ort' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merge made by the 'ort' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+ok 1 - setup
+
+expecting success of 6600.2 'ref_newer:miss': 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	B:commit-4-9
+	EOF
+	echo "ref_newer(A,B):0" >expect &&
+	test_all_modes ref_newer
+
+ok 2 - ref_newer:miss
+
+expecting success of 6600.3 'ref_newer:hit': 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	B:commit-2-3
+	EOF
+	echo "ref_newer(A,B):1" >expect &&
+	test_all_modes ref_newer
+
+ok 3 - ref_newer:hit
+
+expecting success of 6600.4 'in_merge_bases:hit': 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	B:commit-8-8
+	EOF
+	echo "in_merge_bases(A,B):1" >expect &&
+	test_all_modes in_merge_bases
+
+ok 4 - in_merge_bases:hit
+
+expecting success of 6600.5 'in_merge_bases:miss': 
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	B:commit-5-9
+	EOF
+	echo "in_merge_bases(A,B):0" >expect &&
+	test_all_modes in_merge_bases
+
+ok 5 - in_merge_bases:miss
+
+expecting success of 6600.6 'in_merge_bases_many:hit': 
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	X:commit-6-9
+	X:commit-5-7
+	EOF
+	echo "in_merge_bases_many(A,X):1" >expect &&
+	test_all_modes in_merge_bases_many
+
+ok 6 - in_merge_bases_many:hit
+
+expecting success of 6600.7 'in_merge_bases_many:miss': 
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	X:commit-7-7
+	X:commit-8-6
+	EOF
+	echo "in_merge_bases_many(A,X):0" >expect &&
+	test_all_modes in_merge_bases_many
+
+ok 7 - in_merge_bases_many:miss
+
+expecting success of 6600.8 'in_merge_bases_many:miss-heuristic': 
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	X:commit-7-5
+	X:commit-6-6
+	EOF
+	echo "in_merge_bases_many(A,X):0" >expect &&
+	test_all_modes in_merge_bases_many
+
+ok 8 - in_merge_bases_many:miss-heuristic
+
+expecting success of 6600.9 'is_descendant_of:hit': 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	X:commit-4-8
+	X:commit-6-6
+	X:commit-1-1
+	EOF
+	echo "is_descendant_of(A,X):1" >expect &&
+	test_all_modes is_descendant_of
+
+ok 9 - is_descendant_of:hit
+
+expecting success of 6600.10 'is_descendant_of:miss': 
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	X:commit-5-9
+	X:commit-4-10
+	X:commit-7-6
+	EOF
+	echo "is_descendant_of(A,X):0" >expect &&
+	test_all_modes is_descendant_of
+
+ok 10 - is_descendant_of:miss
+
+expecting success of 6600.11 'get_merge_bases_many': 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	X:commit-4-8
+	X:commit-6-6
+	X:commit-8-3
+	EOF
+	{
+		echo "get_merge_bases_many(A,X):" &&
+		git rev-parse commit-5-6 \
+			      commit-4-7 | sort
+	} >expect &&
+	test_all_modes get_merge_bases_many
+
+ok 11 - get_merge_bases_many
+
+expecting success of 6600.12 'reduce_heads': 
+	cat >input <<-\EOF &&
+	X:commit-1-10
+	X:commit-2-8
+	X:commit-3-6
+	X:commit-4-4
+	X:commit-1-7
+	X:commit-2-5
+	X:commit-3-3
+	X:commit-5-1
+	EOF
+	{
+		echo "reduce_heads(X):" &&
+		git rev-parse commit-5-1 \
+			      commit-4-4 \
+			      commit-3-6 \
+			      commit-2-8 \
+			      commit-1-10 | sort
+	} >expect &&
+	test_all_modes reduce_heads
+
+ok 12 - reduce_heads
+
+expecting success of 6600.13 'can_all_from_reach:hit': 
+	cat >input <<-\EOF &&
+	X:commit-2-10
+	X:commit-3-9
+	X:commit-4-8
+	X:commit-5-7
+	X:commit-6-6
+	X:commit-7-5
+	X:commit-8-4
+	X:commit-9-3
+	Y:commit-1-9
+	Y:commit-2-8
+	Y:commit-3-7
+	Y:commit-4-6
+	Y:commit-5-5
+	Y:commit-6-4
+	Y:commit-7-3
+	Y:commit-8-1
+	EOF
+	echo "can_all_from_reach(X,Y):1" >expect &&
+	test_all_modes can_all_from_reach
+
+ok 13 - can_all_from_reach:hit
+
+expecting success of 6600.14 'can_all_from_reach:miss': 
+	cat >input <<-\EOF &&
+	X:commit-2-10
+	X:commit-3-9
+	X:commit-4-8
+	X:commit-5-7
+	X:commit-6-6
+	X:commit-7-5
+	X:commit-8-4
+	X:commit-9-3
+	Y:commit-1-9
+	Y:commit-2-8
+	Y:commit-3-7
+	Y:commit-4-6
+	Y:commit-5-5
+	Y:commit-6-4
+	Y:commit-8-5
+	EOF
+	echo "can_all_from_reach(X,Y):0" >expect &&
+	test_all_modes can_all_from_reach
+
+ok 14 - can_all_from_reach:miss
+
+expecting success of 6600.15 'can_all_from_reach_with_flag: tags case': 
+	cat >input <<-\EOF &&
+	X:tag-2-10
+	X:tag-3-9
+	X:tag-4-8
+	X:commit-5-7
+	X:commit-6-6
+	X:commit-7-5
+	X:commit-8-4
+	X:commit-9-3
+	Y:tag-1-9
+	Y:tag-2-8
+	Y:tag-3-7
+	Y:commit-4-6
+	Y:commit-5-5
+	Y:commit-6-4
+	Y:commit-7-3
+	Y:commit-8-1
+	EOF
+	echo "can_all_from_reach_with_flag(X,_,_,0,0):1" >expect &&
+	test_all_modes can_all_from_reach_with_flag
+
+ok 15 - can_all_from_reach_with_flag: tags case
+
+expecting success of 6600.16 'commit_contains:hit': 
+	cat >input <<-\EOF &&
+	A:commit-7-7
+	X:commit-2-10
+	X:commit-3-9
+	X:commit-4-8
+	X:commit-5-7
+	X:commit-6-6
+	X:commit-7-5
+	X:commit-8-4
+	X:commit-9-3
+	EOF
+	echo "commit_contains(_,A,X,_):1" >expect &&
+	test_all_modes commit_contains &&
+	test_all_modes commit_contains --tag
+
+ok 16 - commit_contains:hit
+
+expecting success of 6600.17 'commit_contains:miss': 
+	cat >input <<-\EOF &&
+	A:commit-6-5
+	X:commit-2-10
+	X:commit-3-9
+	X:commit-4-8
+	X:commit-5-7
+	X:commit-6-6
+	X:commit-7-5
+	X:commit-8-4
+	X:commit-9-3
+	EOF
+	echo "commit_contains(_,A,X,_):0" >expect &&
+	test_all_modes commit_contains &&
+	test_all_modes commit_contains --tag
+
+ok 17 - commit_contains:miss
+
+expecting success of 6600.18 'rev-list: basic topo-order': 
+	git rev-parse \
+		commit-6-6 commit-5-6 commit-4-6 commit-3-6 commit-2-6 commit-1-6 \
+		commit-6-5 commit-5-5 commit-4-5 commit-3-5 commit-2-5 commit-1-5 \
+		commit-6-4 commit-5-4 commit-4-4 commit-3-4 commit-2-4 commit-1-4 \
+		commit-6-3 commit-5-3 commit-4-3 commit-3-3 commit-2-3 commit-1-3 \
+		commit-6-2 commit-5-2 commit-4-2 commit-3-2 commit-2-2 commit-1-2 \
+		commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
+	>expect &&
+	run_all_modes git rev-list --topo-order commit-6-6
+
+ok 18 - rev-list: basic topo-order
+
+expecting success of 6600.19 'rev-list: first-parent topo-order': 
+	git rev-parse \
+		commit-6-6 \
+		commit-6-5 \
+		commit-6-4 \
+		commit-6-3 \
+		commit-6-2 \
+		commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
+	>expect &&
+	run_all_modes git rev-list --first-parent --topo-order commit-6-6
+
+ok 19 - rev-list: first-parent topo-order
+
+expecting success of 6600.20 'rev-list: range topo-order': 
+	git rev-parse \
+		commit-6-6 commit-5-6 commit-4-6 commit-3-6 commit-2-6 commit-1-6 \
+		commit-6-5 commit-5-5 commit-4-5 commit-3-5 commit-2-5 commit-1-5 \
+		commit-6-4 commit-5-4 commit-4-4 commit-3-4 commit-2-4 commit-1-4 \
+		commit-6-3 commit-5-3 commit-4-3 \
+		commit-6-2 commit-5-2 commit-4-2 \
+		commit-6-1 commit-5-1 commit-4-1 \
+	>expect &&
+	run_all_modes git rev-list --topo-order commit-3-3..commit-6-6
+
+ok 20 - rev-list: range topo-order
+
+expecting success of 6600.21 'rev-list: range topo-order': 
+	git rev-parse \
+		commit-6-6 commit-5-6 commit-4-6 \
+		commit-6-5 commit-5-5 commit-4-5 \
+		commit-6-4 commit-5-4 commit-4-4 \
+		commit-6-3 commit-5-3 commit-4-3 \
+		commit-6-2 commit-5-2 commit-4-2 \
+		commit-6-1 commit-5-1 commit-4-1 \
+	>expect &&
+	run_all_modes git rev-list --topo-order commit-3-8..commit-6-6
+
+ok 21 - rev-list: range topo-order
+
+expecting success of 6600.22 'rev-list: first-parent range topo-order': 
+	git rev-parse \
+		commit-6-6 \
+		commit-6-5 \
+		commit-6-4 \
+		commit-6-3 \
+		commit-6-2 \
+		commit-6-1 commit-5-1 commit-4-1 \
+	>expect &&
+	run_all_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
+
+ok 22 - rev-list: first-parent range topo-order
+
+expecting success of 6600.23 'rev-list: ancestry-path topo-order': 
+	git rev-parse \
+		commit-6-6 commit-5-6 commit-4-6 commit-3-6 \
+		commit-6-5 commit-5-5 commit-4-5 commit-3-5 \
+		commit-6-4 commit-5-4 commit-4-4 commit-3-4 \
+		commit-6-3 commit-5-3 commit-4-3 \
+	>expect &&
+	run_all_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
+
+ok 23 - rev-list: ancestry-path topo-order
+
+expecting success of 6600.24 'rev-list: symmetric difference topo-order': 
+	git rev-parse \
+		commit-6-6 commit-5-6 commit-4-6 \
+		commit-6-5 commit-5-5 commit-4-5 \
+		commit-6-4 commit-5-4 commit-4-4 \
+		commit-6-3 commit-5-3 commit-4-3 \
+		commit-6-2 commit-5-2 commit-4-2 \
+		commit-6-1 commit-5-1 commit-4-1 \
+		commit-3-8 commit-2-8 commit-1-8 \
+		commit-3-7 commit-2-7 commit-1-7 \
+	>expect &&
+	run_all_modes git rev-list --topo-order commit-3-8...commit-6-6
+
+ok 24 - rev-list: symmetric difference topo-order
+
+expecting success of 6600.25 'get_reachable_subset:all': 
+	cat >input <<-\EOF &&
+	X:commit-9-1
+	X:commit-8-3
+	X:commit-7-5
+	X:commit-6-6
+	X:commit-1-7
+	Y:commit-3-3
+	Y:commit-1-7
+	Y:commit-5-6
+	EOF
+	(
+		echo "get_reachable_subset(X,Y)" &&
+		git rev-parse commit-3-3 \
+			      commit-1-7 \
+			      commit-5-6 | sort
+	) >expect &&
+	test_all_modes get_reachable_subset
+
+ok 25 - get_reachable_subset:all
+
+expecting success of 6600.26 'get_reachable_subset:some': 
+	cat >input <<-\EOF &&
+	X:commit-9-1
+	X:commit-8-3
+	X:commit-7-5
+	X:commit-1-7
+	Y:commit-3-3
+	Y:commit-1-7
+	Y:commit-5-6
+	EOF
+	(
+		echo "get_reachable_subset(X,Y)" &&
+		git rev-parse commit-3-3 \
+			      commit-1-7 | sort
+	) >expect &&
+	test_all_modes get_reachable_subset
+
+ok 26 - get_reachable_subset:some
+
+expecting success of 6600.27 'get_reachable_subset:none': 
+	cat >input <<-\EOF &&
+	X:commit-9-1
+	X:commit-8-3
+	X:commit-7-5
+	X:commit-1-7
+	Y:commit-9-3
+	Y:commit-7-6
+	Y:commit-2-8
+	EOF
+	echo "get_reachable_subset(X,Y)" >expect &&
+	test_all_modes get_reachable_subset
+
+ok 27 - get_reachable_subset:none
+
+expecting success of 6600.28 'for-each-ref ahead-behind:linear': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-1-3
+	refs/heads/commit-1-5
+	refs/heads/commit-1-8
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1 0 8
+	refs/heads/commit-1-3 0 6
+	refs/heads/commit-1-5 0 4
+	refs/heads/commit-1-8 0 1
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname) %(ahead-behind:commit-1-9)" --stdin
+
+ok 28 - for-each-ref ahead-behind:linear
+
+expecting success of 6600.29 'for-each-ref ahead-behind:all': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-2-4
+	refs/heads/commit-4-2
+	refs/heads/commit-4-4
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1 0 24
+	refs/heads/commit-2-4 0 17
+	refs/heads/commit-4-2 0 17
+	refs/heads/commit-4-4 0 9
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname) %(ahead-behind:commit-5-5)" --stdin
+
+ok 29 - for-each-ref ahead-behind:all
+
+expecting success of 6600.30 'for-each-ref ahead-behind:some': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-5-3
+	refs/heads/commit-4-8
+	refs/heads/commit-9-9
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1 0 53
+	refs/heads/commit-4-8 8 30
+	refs/heads/commit-5-3 0 39
+	refs/heads/commit-9-9 27 0
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname) %(ahead-behind:commit-9-6)" --stdin
+
+ok 30 - for-each-ref ahead-behind:some
+
+expecting success of 6600.31 'for-each-ref ahead-behind:some, multibase': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-5-3
+	refs/heads/commit-7-8
+	refs/heads/commit-4-8
+	refs/heads/commit-9-9
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1 0 53 0 53
+	refs/heads/commit-4-8 8 30 0 22
+	refs/heads/commit-5-3 0 39 0 39
+	refs/heads/commit-7-8 14 12 8 6
+	refs/heads/commit-9-9 27 0 27 0
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname) %(ahead-behind:commit-9-6) %(ahead-behind:commit-6-9)" \
+		--stdin
+
+ok 31 - for-each-ref ahead-behind:some, multibase
+
+expecting success of 6600.32 'for-each-ref ahead-behind:none': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-7-5
+	refs/heads/commit-4-8
+	refs/heads/commit-9-9
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-4-8 16 16
+	refs/heads/commit-7-5 7 4
+	refs/heads/commit-9-9 49 0
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname) %(ahead-behind:commit-8-4)" --stdin
+
+ok 32 - for-each-ref ahead-behind:none
+
+expecting success of 6600.33 'for-each-ref merged:linear': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-1-3
+	refs/heads/commit-1-5
+	refs/heads/commit-1-8
+	refs/heads/commit-2-1
+	refs/heads/commit-5-1
+	refs/heads/commit-9-1
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-1-3
+	refs/heads/commit-1-5
+	refs/heads/commit-1-8
+	EOF
+	run_all_modes git for-each-ref --merged=commit-1-9 \
+		--format="%(refname)" --stdin
+
+ok 33 - for-each-ref merged:linear
+
+expecting success of 6600.34 'for-each-ref merged:all': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-2-4
+	refs/heads/commit-4-2
+	refs/heads/commit-4-4
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-2-4
+	refs/heads/commit-4-2
+	refs/heads/commit-4-4
+	EOF
+	run_all_modes git for-each-ref --merged=commit-5-5 \
+		--format="%(refname)" --stdin
+
+ok 34 - for-each-ref merged:all
+
+expecting success of 6600.35 'for-each-ref ahead-behind:some': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-5-3
+	refs/heads/commit-4-8
+	refs/heads/commit-9-9
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-5-3
+	EOF
+	run_all_modes git for-each-ref --merged=commit-9-6 \
+		--format="%(refname)" --stdin
+
+ok 35 - for-each-ref ahead-behind:some
+
+expecting success of 6600.36 'for-each-ref merged:some, multibase': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-5-3
+	refs/heads/commit-7-8
+	refs/heads/commit-4-8
+	refs/heads/commit-9-9
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-4-8
+	refs/heads/commit-5-3
+	EOF
+	run_all_modes git for-each-ref \
+		--merged=commit-5-8 \
+		--merged=commit-8-5 \
+		--format="%(refname)" \
+		--stdin
+
+ok 36 - for-each-ref merged:some, multibase
+
+expecting success of 6600.37 'for-each-ref merged:none': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-7-5
+	refs/heads/commit-4-8
+	refs/heads/commit-9-9
+	EOF
+	>expect &&
+	run_all_modes git for-each-ref --merged=commit-8-4 \
+		--format="%(refname)" --stdin
+
+ok 37 - for-each-ref merged:none
+
+expecting success of 6600.38 'get_branch_base_for_tip: none reach': 
+	# (2,3) branched from the first tip (i,4) in X with i > 2
+	cat >input <<-\EOF &&
+		A:commit-2-3
+		X:commit-1-2
+		X:commit-1-4
+		X:commit-4-4
+		X:commit-8-4
+		X:commit-10-4
+	EOF
+	echo "get_branch_base_for_tip(A,X):2" >expect &&
+	test_all_modes get_branch_base_for_tip
+
+ok 38 - get_branch_base_for_tip: none reach
+
+expecting success of 6600.39 'get_branch_base_for_tip: equal to tip': 
+	# (2,3) branched from the first tip (i,4) in X with i > 2
+	cat >input <<-\EOF &&
+		A:commit-8-4
+		X:commit-1-2
+		X:commit-1-4
+		X:commit-4-4
+		X:commit-8-4
+		X:commit-10-4
+	EOF
+	echo "get_branch_base_for_tip(A,X):3" >expect &&
+	test_all_modes get_branch_base_for_tip
+
+ok 39 - get_branch_base_for_tip: equal to tip
+
+expecting success of 6600.40 'get_branch_base_for_tip: all reach tip': 
+	# (2,3) branched from the first tip (i,4) in X with i > 2
+	cat >input <<-\EOF &&
+		A:commit-4-1
+		X:commit-4-2
+		X:commit-5-1
+	EOF
+	echo "get_branch_base_for_tip(A,X):0" >expect &&
+	test_all_modes get_branch_base_for_tip
+
+ok 40 - get_branch_base_for_tip: all reach tip
+
+expecting success of 6600.41 'for-each-ref is-base: none reach': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-4-2
+	refs/heads/commit-4-4
+	refs/heads/commit-8-4
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1:
+	refs/heads/commit-4-2:(commit-2-3)
+	refs/heads/commit-4-4:
+	refs/heads/commit-8-4:
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname):%(is-base:commit-2-3)" --stdin
+
+ok 41 - for-each-ref is-base: none reach
+
+expecting success of 6600.42 'for-each-ref is-base: all reach': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-4-2
+	refs/heads/commit-5-1
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-4-2:(commit-4-1)
+	refs/heads/commit-5-1:
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname):%(is-base:commit-4-1)" --stdin
+
+ok 42 - for-each-ref is-base: all reach
+
+expecting success of 6600.43 'for-each-ref is-base: equal to tip': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-4-2
+	refs/heads/commit-5-1
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-4-2:(commit-4-2)
+	refs/heads/commit-5-1:
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname):%(is-base:commit-4-2)" --stdin
+
+ok 43 - for-each-ref is-base: equal to tip
+
+expecting success of 6600.44 'for-each-ref is-base:multiple': 
+	cat >input <<-\EOF &&
+	refs/heads/commit-1-1
+	refs/heads/commit-4-2
+	refs/heads/commit-4-4
+	refs/heads/commit-8-4
+	EOF
+	cat >expect <<-\EOF &&
+	refs/heads/commit-1-1[-]
+	refs/heads/commit-4-2[(commit-2-3)-]
+	refs/heads/commit-4-4[-]
+	refs/heads/commit-8-4[-(commit-6-5)]
+	EOF
+	run_all_modes git for-each-ref \
+		--format="%(refname)[%(is-base:commit-2-3)-%(is-base:commit-6-5)]" --stdin
+
+ok 44 - for-each-ref is-base:multiple
+
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7102-reset.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7102-reset/.git/
 expecting success of 7102.1 'creating initial files and commits': 
@@ -445899,1701 +447039,3614 @@
 	+4
 	EOF
 
-	test_cmp cached_expect output
+	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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7004-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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 'HEAD is forbidden as a tagname': 
+	test_when_finished "git update-ref --no-deref -d refs/tags/HEAD || :" &&
+	test_must_fail git tag HEAD &&
+	test_must_fail git tag -a -m "useless" HEAD
+
+fatal: 'HEAD' is not a valid tag name.
+fatal: 'HEAD' is not a valid tag name.
+ok 10 - HEAD is forbidden as a tagname
+
+expecting success of 7004.11 '"git tag" can remove a tag named HEAD': 
+	test_when_finished "git update-ref --no-deref -d refs/tags/HEAD || :" &&
+	git update-ref refs/tags/HEAD HEAD &&
+	git tag -d HEAD
+
+Deleted tag 'HEAD' (was 86e17e4)
+ok 11 - "git tag" can remove a tag named HEAD
+
+expecting success of 7004.12 '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 12 - creating a tag with --create-reflog should create reflog
+
+expecting success of 7004.13 '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 13 - annotated tag with --create-reflog has correct message
+
+expecting success of 7004.14 '--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 14 - --create-reflog does not create reflog on failure
+
+expecting success of 7004.15 '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 15 - option core.logAllRefUpdates=always creates reflog
+
+expecting success of 7004.16 'listing all tags if one exists should succeed': 
+	git tag -l &&
+	git tag
+
+mytag
+mytag
+ok 16 - listing all tags if one exists should succeed
+
+expecting success of 7004.17 '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 17 - Multiple -l or --list options are equivalent to one -l option
+
+expecting success of 7004.18 'listing all tags if one exists should output that tag': 
+	test $(git tag -l) = mytag &&
+	test $(git tag) = mytag
+
+ok 18 - listing all tags if one exists should output that tag
+
+expecting success of 7004.19 'listing a tag using a matching pattern should succeed': 
+	git tag -l mytag
+
+mytag
+ok 19 - listing a tag using a matching pattern should succeed
+
+expecting success of 7004.20 'listing a tag with --ignore-case': 
+	test $(git tag -l --ignore-case MYTAG) = mytag
+
+ok 20 - listing a tag with --ignore-case
+
+expecting success of 7004.21 'listing a tag using a matching pattern should output that tag': 
+	test $(git tag -l mytag) = mytag
+
+ok 21 - listing a tag using a matching pattern should output that tag
+
+expecting success of 7004.22 'listing tags using a non-matching pattern should succeed': 
+	git tag -l xxx
+
+ok 22 - listing tags using a non-matching pattern should succeed
+
+expecting success of 7004.23 'listing tags using a non-matching pattern should output nothing': 
+	test $(git tag -l xxx | wc -l) -eq 0
+
+ok 23 - listing tags using a non-matching pattern should output nothing
+
+expecting success of 7004.24 '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 24 - trying to create a tag with the name of one existing should fail
+
+expecting success of 7004.25 '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 25 - trying to create a tag with a non-valid name should fail
+
+expecting success of 7004.26 'creating a tag using HEAD directly should succeed': 
+	git tag myhead HEAD &&
+	tag_exists myhead
+
+ok 26 - creating a tag using HEAD directly should succeed
+
+expecting success of 7004.27 '--force can create a tag with the name of one existing': 
+	tag_exists mytag &&
+	git tag --force mytag &&
+	tag_exists mytag
+ok 27 - --force can create a tag with the name of one existing
+
+expecting success of 7004.28 '--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 28 - --force is moot with a non-existing tag name
+
+expecting success of 7004.29 '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 29 - trying to delete an unknown tag should fail
+
+expecting success of 7004.30 '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 30 - trying to delete tags without params should succeed and do nothing
+
+expecting success of 7004.31 '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 31 - deleting two existing tags in one command should succeed
+
+expecting success of 7004.32 'creating a tag with the name of another deleted one should succeed': 
+	! tag_exists mytag &&
+	git tag mytag &&
+	tag_exists mytag
+
+ok 32 - creating a tag with the name of another deleted one should succeed
+
+expecting success of 7004.33 '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 33 - trying to delete two tags, existing and not, should fail in the 2nd
+
+expecting success of 7004.34 'trying to delete an already deleted tag should fail': 
+	test_must_fail git tag -d mytag
+
+error: tag 'mytag' not found.
+ok 34 - trying to delete an already deleted tag should fail
+
+expecting success of 7004.35 '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 35 - listing all tags should print them ordered
+
+expecting success of 7004.36 '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 36 - listing tags with substring as pattern must print those matching
+
+expecting success of 7004.37 '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 37 - listing tags with a suffix as pattern must print those matching
+
+expecting success of 7004.38 '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 38 - listing tags with a prefix as pattern must print those matching
+
+expecting success of 7004.39 '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 39 - listing tags using a name as pattern must print that one matching
+
+expecting success of 7004.40 '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 40 - listing tags using a name as pattern must print that one matching
+
+expecting success of 7004.41 '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 41 - listing tags with ? in the pattern should print those matching
+
+expecting success of 7004.42 'listing tags using v.* should print nothing because none have v.': 
+	git tag -l "v.*" >actual &&
+	test_must_be_empty actual
+
+ok 42 - listing tags using v.* should print nothing because none have v.
+
+expecting success of 7004.43 '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 43 - listing tags using v* should print only those having v
+
+expecting success of 7004.44 '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 44 - tag -l can accept multiple patterns
+
+expecting success of 7004.45 '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 45 - tag -l <pattern> -l <pattern> works, as our buggy documentation previously suggested
+
+expecting success of 7004.46 '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 46 - listing tags in column
+
+expecting success of 7004.47 '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 47 - listing tags in column with column.*
+
+expecting success of 7004.48 'listing tag with -n --column should fail': 
+	test_must_fail git tag --column -n
+
+fatal: options '--column' and '-n' cannot be used together
+ok 48 - listing tag with -n --column should fail
+
+expecting success of 7004.49 '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 49 - listing tags -n in column with column.ui ignored
+
+expecting success of 7004.50 '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 50 - a non-annotated tag created without parameters should point to HEAD
+
+expecting success of 7004.51 'trying to verify an unknown tag should fail': 
+	test_must_fail git tag -v unknown-tag
+
+error: tag 'unknown-tag' not found.
+ok 51 - trying to verify an unknown tag should fail
+
+expecting success of 7004.52 '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 52 - trying to verify a non-annotated and non-signed tag should fail
+
+expecting success of 7004.53 '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 53 - trying to verify many non-annotated or unknown tags, should fail
+
+expecting success of 7004.54 '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 54 - creating an annotated tag with -m message should succeed
+
+expecting success of 7004.55 'set up editor': 
+	write_script fakeeditor <<-\EOF
+	sed -e "s/A message/An edited message/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+
+ok 55 - set up editor
+
+expecting success of 7004.56 '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 56 - creating an annotated tag with -m message --edit should succeed
+
+expecting success of 7004.57 '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 57 - creating an annotated tag with -F messagefile should succeed
+
+expecting success of 7004.58 'set up editor': 
+	write_script fakeeditor <<-\EOF
+	sed -e "s/Another message/Another edited message/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+
+ok 58 - set up editor
+
+expecting success of 7004.59 '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 59 - creating an annotated tag with -F messagefile --edit should succeed
+
+expecting success of 7004.60 '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 60 - creating an annotated tag with -F - should succeed
+
+expecting success of 7004.61 '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 61 - trying to create a tag with a non-existing -F file should fail
+
+expecting success of 7004.62 '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 62 - trying to create tags giving both -m or -F options should fail
+
+expecting success of 7004.63 '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 63 - creating a tag with an empty -m message should succeed
+
+expecting success of 7004.64 '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 64 - creating a tag with an empty -F messagefile should succeed
+
+expecting success of 7004.65 '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 65 - extra blanks in the message for an annotated tag should be removed
+
+expecting success of 7004.66 '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 66 - creating a tag with blank -m message with spaces should succeed
+
+expecting success of 7004.67 '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 67 - creating a tag with blank -F messagefile with spaces should succeed
+
+expecting success of 7004.68 '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 68 - creating a tag with -F file of spaces and no newline should succeed
+
+expecting success of 7004.69 '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.
+	EOF
+	get_tag_header comments-annotated-tag $commit commit $time >expect &&
+	cat >>expect <<-\EOF &&
+	The message.
+	One line.
+
+	Another line.
+
+	Last line.
+	EOF
+	git tag -F commentsfile comments-annotated-tag &&
+	get_tag_msg comments-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 69 - creating a tag using a -F messagefile with #comments should succeed
+
+expecting success of 7004.70 'creating a tag with a #comment in the -m message should succeed': 
+	get_tag_header comment-annotated-tag $commit commit $time >expect &&
+	git tag -m "#comment" comment-annotated-tag &&
+	get_tag_msg comment-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 70 - creating a tag with a #comment in the -m message should succeed
+
+expecting success of 7004.71 'creating a tag with #comments in the -F messagefile should succeed': 
+	echo "#comment" >commentfile &&
+	echo ""         >>commentfile &&
+	echo "####"     >>commentfile &&
+	get_tag_header commentfile-annotated-tag $commit commit $time >expect &&
+	git tag -F commentfile commentfile-annotated-tag &&
+	get_tag_msg commentfile-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 71 - creating a tag with #comments in the -F messagefile should succeed
+
+expecting success of 7004.72 'creating a tag with a file of #comment and no newline should succeed': 
+	printf "#comment" >commentnonlfile &&
+	get_tag_header commentnonlfile-annotated-tag $commit commit $time >expect &&
+	git tag -F commentnonlfile commentnonlfile-annotated-tag &&
+	get_tag_msg commentnonlfile-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 72 - creating a tag with a file of #comment and no newline should succeed
+
+expecting success of 7004.73 'create tag with -m and --trailer': 
+	get_tag_header tag-with-inline-message-and-trailers $commit commit $time >expect &&
+	cat >>expect <<-\EOF &&
+	create tag with trailers
+
+	my-trailer: here
+	alt-trailer: there
+	EOF
+	git tag -m "create tag with trailers" \
+		--trailer my-trailer=here \
+		--trailer alt-trailer=there \
+		tag-with-inline-message-and-trailers &&
+	get_tag_msg tag-with-inline-message-and-trailers >actual &&
+	test_cmp expect actual
+
+ok 73 - create tag with -m and --trailer
+
+expecting success of 7004.74 'list tag extracting trailers': 
+	cat >expect <<-\EOF &&
+	my-trailer: here
+	alt-trailer: there
+
+	EOF
+	git tag --list --format="%(trailers)" tag-with-inline-message-and-trailers >actual &&
+	test_cmp expect actual
+
+ok 74 - list tag extracting trailers
+
+expecting success of 7004.75 'create tag with -F and --trailer': 
+	echo "create tag from message file using --trailer" >messagefilewithnotrailers &&
+	get_tag_header tag-with-file-message-and-trailers $commit commit $time >expect &&
+	cat >>expect <<-\EOF &&
+	create tag from message file using --trailer
+
+	my-trailer: here
+	alt-trailer: there
+	EOF
+	git tag -F messagefilewithnotrailers \
+		--trailer my-trailer=here \
+		--trailer alt-trailer=there \
+		tag-with-file-message-and-trailers &&
+	get_tag_msg tag-with-file-message-and-trailers >actual &&
+	test_cmp expect actual
+
+ok 75 - create tag with -F and --trailer
+
+expecting success of 7004.76 'create tag with -m and --trailer and --edit': 
+	write_script fakeeditor <<-\EOF &&
+	sed -e "1s/^/EDITED: /g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+	get_tag_header tag-with-edited-inline-message-and-trailers $commit commit $time >expect &&
+	cat >>expect <<-\EOF &&
+	EDITED: create tag with trailers
+
+	my-trailer: here
+	alt-trailer: there
+	EOF
+	GIT_EDITOR=./fakeeditor git tag --edit \
+		-m "create tag with trailers" \
+		--trailer my-trailer=here \
+		--trailer alt-trailer=there \
+		tag-with-edited-inline-message-and-trailers &&
+	get_tag_msg tag-with-edited-inline-message-and-trailers >actual &&
+	test_cmp expect actual
+
+ok 76 - create tag with -m and --trailer and --edit
+
+expecting success of 7004.77 'create tag with -F and --trailer and --edit': 
+	echo "create tag from message file using --trailer" >messagefilewithnotrailers &&
+	get_tag_header tag-with-edited-file-message-and-trailers $commit commit $time >expect &&
+	cat >>expect <<-\EOF &&
+	EDITED: create tag from message file using --trailer
+
+	my-trailer: here
+	alt-trailer: there
+	EOF
+	GIT_EDITOR=./fakeeditor git tag --edit \
+		-F messagefilewithnotrailers \
+		--trailer my-trailer=here \
+		--trailer alt-trailer=there \
+		tag-with-edited-file-message-and-trailers &&
+	get_tag_msg tag-with-edited-file-message-and-trailers >actual &&
+	test_cmp expect actual
+
+ok 77 - create tag with -F and --trailer and --edit
+
+expecting success of 7004.78 'create annotated tag and force editor when only --trailer is given': 
+	write_script fakeeditor <<-\EOF &&
+	echo "add a line" >"$1-"
+	cat <"$1" >>"$1-"
+	mv "$1-" "$1"
+	EOF
+	get_tag_header tag-with-trailers-and-no-message $commit commit $time >expect &&
+	cat >>expect <<-\EOF &&
+	add a line
+
+	my-trailer: here
+	alt-trailer: there
+	EOF
+	GIT_EDITOR=./fakeeditor git tag \
+		--trailer my-trailer=here \
+		--trailer alt-trailer=there \
+		tag-with-trailers-and-no-message &&
+	get_tag_msg tag-with-trailers-and-no-message >actual &&
+	test_cmp expect actual
+
+ok 78 - create annotated tag and force editor when only --trailer is given
+
+expecting success of 7004.79 'bad editor causes panic when only --trailer is given': 
+	test_must_fail env GIT_EDITOR=false git tag --trailer my-trailer=here tag-will-not-exist
+
+error: there was a problem with the editor 'false'
+Please supply the message using either -m or -F option.
+ok 79 - bad editor causes panic when only --trailer is given
+
+expecting success of 7004.80 'listing the one-line message of a non-signed tag should succeed': 
+	git tag -m "A msg" tag-one-line &&
+
+	echo "tag-one-line" >expect &&
+	git tag -l | grep "^tag-one-line" >actual &&
+	test_cmp expect actual &&
+	git tag -n0 -l | grep "^tag-one-line" >actual &&
+	test_cmp expect actual &&
+	git tag -n0 -l tag-one-line >actual &&
+	test_cmp expect actual &&
+
+	git tag -n0 | grep "^tag-one-line" >actual &&
+	test_cmp expect actual &&
+	git tag -n0 tag-one-line >actual &&
+	test_cmp expect actual &&
+
+	echo "tag-one-line    A msg" >expect &&
+	git tag -n1 -l | grep "^tag-one-line" >actual &&
+	test_cmp expect actual &&
+	git tag -n -l | grep "^tag-one-line" >actual &&
+	test_cmp expect actual &&
+	git tag -n1 -l tag-one-line >actual &&
+	test_cmp expect actual &&
+	git tag -n2 -l tag-one-line >actual &&
+	test_cmp expect actual &&
+	git tag -n999 -l tag-one-line >actual &&
+	test_cmp expect actual
+
+ok 80 - listing the one-line message of a non-signed tag should succeed
+
+expecting success of 7004.81 'The -n 100 invocation means -n --list 100, not -n100': 
+	git tag -n 100 >actual &&
+	test_must_be_empty actual &&
+
+	git tag -m "A msg" 100 &&
+	echo "100             A msg" >expect &&
+	git tag -n 100 >actual &&
+	test_cmp expect actual
+
+ok 81 - The -n 100 invocation means -n --list 100, not -n100
+
+expecting success of 7004.82 'listing the zero-lines message of a non-signed tag should succeed': 
+	git tag -m "" tag-zero-lines &&
+
+	echo "tag-zero-lines" >expect &&
+	git tag -l | grep "^tag-zero-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n0 -l | grep "^tag-zero-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n0 -l tag-zero-lines >actual &&
+	test_cmp expect actual &&
+
+	echo "tag-zero-lines  " >expect &&
+	git tag -n1 -l | grep "^tag-zero-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n -l | grep "^tag-zero-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n1 -l tag-zero-lines >actual &&
+	test_cmp expect actual &&
+	git tag -n2 -l tag-zero-lines >actual &&
+	test_cmp expect actual &&
+	git tag -n999 -l tag-zero-lines >actual &&
+	test_cmp expect actual
+
+ok 82 - listing the zero-lines message of a non-signed tag should succeed
+
+expecting success of 7004.83 'listing many message lines of a non-signed tag should succeed': 
+	echo "tag line one" >annotagmsg &&
+	echo "tag line two" >>annotagmsg &&
+	echo "tag line three" >>annotagmsg  &&
+	git tag -F annotagmsg tag-lines &&
+
+	echo "tag-lines" >expect &&
+	git tag -l | grep "^tag-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n0 -l | grep "^tag-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n0 -l tag-lines >actual &&
+	test_cmp expect actual &&
+
+	echo "tag-lines       tag line one" >expect &&
+	git tag -n1 -l | grep "^tag-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n -l | grep "^tag-lines" >actual &&
+	test_cmp expect actual &&
+	git tag -n1 -l tag-lines >actual &&
+	test_cmp expect actual &&
+
+	echo "    tag line two" >>expect &&
+	git tag -n2 -l | grep "^ *tag.line" >actual &&
+	test_cmp expect actual &&
+	git tag -n2 -l tag-lines >actual &&
+	test_cmp expect actual &&
+
+	echo "    tag line three" >>expect &&
+	git tag -n3 -l | grep "^ *tag.line" >actual &&
+	test_cmp expect actual &&
+	git tag -n3 -l tag-lines >actual &&
+	test_cmp expect actual &&
+	git tag -n4 -l | grep "^ *tag.line" >actual &&
+	test_cmp expect actual &&
+	git tag -n4 -l tag-lines >actual &&
+	test_cmp expect actual &&
+	git tag -n99 -l | grep "^ *tag.line" >actual &&
+	test_cmp expect actual &&
+	git tag -n99 -l tag-lines >actual &&
+	test_cmp expect actual
+
+ok 83 - listing many message lines of a non-signed tag should succeed
+
+expecting success of 7004.84 'annotations for blobs are empty': 
+	blob=$(git hash-object -w --stdin <<-\EOF
+	Blob paragraph 1.
+
+	Blob paragraph 2.
+	EOF
+	) &&
+	git tag tag-blob $blob &&
+	echo "tag-blob        " >expect &&
+	git tag -n1 -l tag-blob >actual &&
+	test_cmp expect actual
+
+ok 84 - annotations for blobs are empty
+
+expecting success of 7004.85 'git tag --format with ahead-behind': 
+	test_when_finished git reset --hard tag-one-line &&
+	git commit --allow-empty -m "left" &&
+	git tag -a -m left tag-left &&
+	git reset --hard HEAD~1 &&
+	git commit --allow-empty -m "right" &&
+	git tag -a -m left tag-right &&
+
+	# Use " !" at the end to demonstrate whitespace
+	# around empty ahead-behind token for tag-blob.
+	cat >expect <<-EOF &&
+	refs/tags/tag-blob  !
+	refs/tags/tag-left 1 1 !
+	refs/tags/tag-lines 0 1 !
+	refs/tags/tag-one-line 0 1 !
+	refs/tags/tag-right 0 0 !
+	refs/tags/tag-with-edited-file-message-and-trailers 0 1 !
+	refs/tags/tag-with-edited-inline-message-and-trailers 0 1 !
+	refs/tags/tag-with-file-message-and-trailers 0 1 !
+	refs/tags/tag-with-inline-message-and-trailers 0 1 !
+	refs/tags/tag-with-trailers-and-no-message 0 1 !
+	refs/tags/tag-zero-lines 0 1 !
+	EOF
+	git tag -l --format="%(refname) %(ahead-behind:HEAD) !" >actual 2>err &&
+	grep "refs/tags/tag" actual >actual.focus &&
+	test_cmp expect actual.focus &&
+
+	# Error reported for tags that point to non-commits.
+	grep "error: object [0-9a-f]* is a blob, not a commit" err
+
+[main e4512a0] left
+ Author: A U Thor <author@example.com>
+HEAD is now at 86e17e4 Foo
+[main 1d485fd] right
+ Author: A U Thor <author@example.com>
+error: object fc33d716ad1ef3e46e3c05586c188aef7c225de9 is a blob, not a commit
+HEAD is now at 86e17e4 Foo
+ok 85 - git tag --format with ahead-behind
+
+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 86 # skip trying to verify an annotated non-signed tag should fail (missing GPG)
+
+ok 87 # skip trying to verify a file-annotated non-signed tag should fail (missing GPG)
+
+ok 88 # skip trying to verify two annotated non-signed tags should fail (missing GPG)
+
+ok 89 # skip creating a signed tag with -m message should succeed (missing GPG)
+
+ok 90 # skip sign with a given key id (missing GPG)
+
+ok 91 # skip sign with an unknown id (1) (missing GPG)
+
+ok 92 # skip sign with an unknown id (2) (missing GPG)
+
+ok 93 # skip -u implies signed tag (missing GPG)
+
+ok 94 # skip creating a signed tag with -F messagefile should succeed (missing GPG)
+
+ok 95 # skip creating a signed tag with -F - should succeed (missing GPG)
+
+ok 96 # skip -s implies annotated tag (missing GPG)
+
+ok 97 # skip git tag -s implied if configured with tag.forcesignannotated (missing GPG)
+
+ok 98 # skip lightweight with no message when configured with tag.forcesignannotated (missing GPG)
+
+ok 99 # skip git tag -a disable configured tag.forcesignannotated (missing GPG)
+
+ok 100 # skip git tag --sign enable GPG sign (missing GPG)
+
+ok 101 # skip git tag configured tag.gpgsign enables GPG sign (missing GPG)
+
+ok 102 # skip git tag --no-sign configured tag.gpgsign skip GPG sign (missing GPG)
+
+ok 103 # skip trying to create a signed tag with non-existing -F file should fail (missing GPG)
+
+ok 104 # skip verifying a signed tag should succeed (missing GPG)
+
+ok 105 # skip verifying two signed tags in one command should succeed (missing GPG)
+
+ok 106 # skip verifying many signed and non-signed tags should fail (missing GPG)
+
+ok 107 # skip verifying a forged tag should fail (missing GPG)
+
+ok 108 # skip verifying a proper tag with --format pass and format accordingly (missing GPG)
+
+ok 109 # skip verifying a forged tag with --format should fail silently (missing GPG)
+
+ok 110 # skip creating a signed tag with an empty -m message should succeed (missing GPG)
+
+ok 111 # skip creating a signed tag with an empty -F messagefile should succeed (missing GPG)
+
+ok 112 # skip extra blanks in the message for a signed tag should be removed (missing GPG)
+
+ok 113 # skip creating a signed tag with a blank -m message should succeed (missing GPG)
+
+ok 114 # skip creating a signed tag with blank -F file with spaces should succeed (missing GPG)
+
+ok 115 # skip creating a signed tag with spaces and no newline should succeed (missing GPG)
+
+ok 116 # skip signed tag with embedded PGP message (missing GPG)
+
+ok 117 # skip creating a signed tag with a -F file with #comments should succeed (missing GPG)
+
+ok 118 # skip creating a signed tag with #commented -m message should succeed (missing GPG)
+
+ok 119 # skip creating a signed tag with #commented -F messagefile should succeed (missing GPG)
+
+ok 120 # skip creating a signed tag with a #comment and no newline should succeed (missing GPG)
+
+ok 121 # skip listing the one-line message of a signed tag should succeed (missing GPG)
+
+ok 122 # skip listing the zero-lines message of a signed tag should succeed (missing GPG)
+
+ok 123 # skip listing many message lines of a signed tag should succeed (missing GPG)
+
+ok 124 # skip creating a signed tag pointing to a tree should succeed (missing GPG)
+
+ok 125 # skip creating a signed tag pointing to a blob should succeed (missing GPG)
+
+ok 126 # skip creating a signed tag pointing to another tag should succeed (missing GPG)
+
+checking prerequisite: RFC1991
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-RFC1991" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-RFC1991" &&
+	test_have_prereq GPG &&
+	echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null
+
+)
+prerequisite RFC1991 not satisfied
+ok 127 # skip creating a signed tag with rfc1991 (missing RFC1991,GPG of GPG,RFC1991)
+
+ok 128 # skip reediting a signed tag body omits signature (missing RFC1991,GPG of GPG,RFC1991)
+
+ok 129 # skip verifying rfc1991 signature (missing RFC1991,GPG of GPG,RFC1991)
+
+ok 130 # skip list tag with rfc1991 signature (missing RFC1991,GPG of GPG,RFC1991)
+
+ok 131 # skip verifying rfc1991 signature without --rfc1991 (missing RFC1991,GPG of GPG,RFC1991)
+
+ok 132 # skip list tag with rfc1991 signature without --rfc1991 (missing RFC1991,GPG of GPG,RFC1991)
+
+ok 133 # skip reediting a signed tag body omits signature (missing RFC1991,GPG of GPG,RFC1991)
+
+ok 134 # skip git tag -s fails if gpg is misconfigured (bad key) (missing GPG)
+
+ok 135 # skip git tag -s fails if gpg is misconfigured (bad signature format) (missing GPG)
+
+ok 136 # skip git verifies tag is valid with double signature (missing GPG)
+
+checking prerequisite: GPGSM
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
+	test_have_prereq GPG &&
+	# Available key info:
+	# * see t/lib-gpg/gpgsm-gen-key.in
+	# To generate new certificate:
+	#  * no passphrase
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o /tmp/gpgsm.crt.user \
+	#		--generate-key \
+	#		--batch t/lib-gpg/gpgsm-gen-key.in
+	# To import certificate:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		--import /tmp/gpgsm.crt.user
+	# To export into a .p12 we can later import:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o t/lib-gpg/gpgsm_cert.p12 \
+	#		--export-secret-key-p12 "committer@example.com"
+	echo | gpgsm --homedir "${GNUPGHOME}" \
+		--passphrase-fd 0 --pinentry-mode loopback \
+		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
+
+	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
+	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
+		>"${GNUPGHOME}/trustlist.txt" &&
+	(gpgconf --reload all || : ) &&
+
+	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+	       -u committer@example.com -o /dev/null --sign -
+
+)
+prerequisite GPGSM not satisfied
+ok 137 # skip git tag -s fails if gpgsm is misconfigured (bad key) (missing GPGSM)
+
+ok 138 # skip git tag -s fails if gpgsm is misconfigured (bad signature format) (missing GPGSM)
+
+ok 139 # skip verify signed tag fails when public key is not present (missing GPG)
+
+expecting success of 7004.140 'git tag -a fails if tag annotation is empty': 
+	! (GIT_EDITOR=cat git tag -a initial-comment)
+
+
+#
+# Write a message for tag:
+#   initial-comment
+# Lines starting with '#' will be ignored.
+fatal: no tag message?
+ok 140 - git tag -a fails if tag annotation is empty
+
+expecting success of 7004.141 'message in editor has initial comment': 
+	! (GIT_EDITOR=cat git tag -a initial-comment >actual)
+
+fatal: no tag message?
+ok 141 - message in editor has initial comment
+
+expecting success of 7004.142 'message in editor has initial comment: first line': 
+	# check the first line --- should be empty
+	echo >first.expect &&
+	sed -e 1q <actual >first.actual &&
+	test_cmp first.expect first.actual
+
+ok 142 - message in editor has initial comment: first line
+
+expecting success of 7004.143 'message in editor has initial comment: remainder': 
+	# remove commented lines from the remainder -- should be empty
+	sed -e 1d -e "/^#/d" <actual >rest.actual &&
+	test_must_be_empty rest.actual
+
+ok 143 - message in editor has initial comment: remainder
+
+expecting success of 7004.144 'overwriting an annotated tag should use its previous body': 
+	get_tag_header reuse $commit commit $time >expect &&
+	echo "An annotation to be reused" >>expect &&
+	git tag -a -m "An annotation to be reused" reuse &&
+	GIT_EDITOR=true git tag -f -a reuse &&
+	get_tag_msg reuse >actual &&
+	test_cmp expect actual
+
+ok 144 - overwriting an annotated tag should use its previous body
+
+expecting success of 7004.145 'filename for the message is relative to cwd': 
+	mkdir subdir &&
+	echo "Tag message in top directory" >msgfile-5 &&
+	echo "Tag message in sub directory" >subdir/msgfile-5 &&
+	(
+		cd subdir &&
+		git tag -a -F msgfile-5 tag-from-subdir
+	) &&
+	git cat-file tag tag-from-subdir | grep "in sub directory"
+
+Tag message in sub directory
+ok 145 - filename for the message is relative to cwd
+
+expecting success of 7004.146 'filename for the message is relative to cwd': 
+	echo "Tag message in sub directory" >subdir/msgfile-6 &&
+	(
+		cd subdir &&
+		git tag -a -F msgfile-6 tag-from-subdir-2
+	) &&
+	git cat-file tag tag-from-subdir-2 | grep "in sub directory"
+
+Tag message in sub directory
+ok 146 - filename for the message is relative to cwd
+
+expecting success of 7004.147 'creating second commit and tag': 
+	hash1=$(git rev-parse HEAD) &&
+	echo foo-2.0 >foo &&
+	git add foo &&
+	git commit -m second &&
+	git tag v2.0
+
+[main d3200cb] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 147 - creating second commit and tag
+
+expecting success of 7004.148 'creating third commit without tag': 
+	hash2=$(git rev-parse HEAD) &&
+	echo foo-dev >foo &&
+	git add foo &&
+	git commit -m third
+
+[main c282771] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 148 - creating third commit without tag
+
+expecting success of 7004.149 'checking that first commit is in all tags (hash)': 
+	hash3=$(git rev-parse HEAD) &&
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	EOF
+	git tag -l --contains $hash1 v* >actual &&
+	test_cmp expected actual
+
+ok 149 - checking that first commit is in all tags (hash)
+
+expecting success of 7004.150 'checking that first commit is in all tags (tag)': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	EOF
+	git tag -l --contains v1.0 v* >actual &&
+	test_cmp expected actual
+
+ok 150 - checking that first commit is in all tags (tag)
+
+expecting success of 7004.151 'checking that first commit is in all tags (relative)': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	EOF
+	git tag -l --contains HEAD~2 v* >actual &&
+	test_cmp expected actual
+
+ok 151 - checking that first commit is in all tags (relative)
+
+expecting success of 7004.152 'checking that first commit is not listed in any tag with --no-contains  (hash)': 
+	git tag -l --no-contains $hash1 v* >actual &&
+	test_must_be_empty actual
+
+ok 152 - checking that first commit is not listed in any tag with --no-contains  (hash)
+
+expecting success of 7004.153 'checking that first commit is in all tags (tag)': 
+	git tag -l --no-contains v1.0 v* >actual &&
+	test_must_be_empty actual
+
+ok 153 - checking that first commit is in all tags (tag)
+
+expecting success of 7004.154 'checking that first commit is in all tags (relative)': 
+	git tag -l --no-contains HEAD~2 v* >actual &&
+	test_must_be_empty actual
+
+ok 154 - checking that first commit is in all tags (relative)
+
+expecting success of 7004.155 'checking that second commit only has one tag': 
+	cat >expected <<-\EOF &&
+	v2.0
+	EOF
+	git tag -l --contains $hash2 v* >actual &&
+	test_cmp expected actual
+
+ok 155 - checking that second commit only has one tag
+
+expecting success of 7004.156 'inverse of the last test, with --no-contains': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	EOF
+	git tag -l --no-contains $hash2 v* >actual &&
+	test_cmp expected actual
+
+ok 156 - inverse of the last test, with --no-contains
+
+expecting success of 7004.157 'checking that third commit has no tags': 
+	git tag -l --contains $hash3 v* >actual &&
+	test_must_be_empty actual
+
+ok 157 - checking that third commit has no tags
+
+expecting success of 7004.158 'conversely --no-contains on the third commit lists all tags': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	EOF
+	git tag -l --no-contains $hash3 v* >actual &&
+	test_cmp expected actual
+
+ok 158 - conversely --no-contains on the third commit lists all tags
+
+expecting success of 7004.159 'creating simple branch': 
+	git branch stable v2.0 &&
+        git checkout stable &&
+	echo foo-3.0 >foo &&
+	git commit foo -m fourth &&
+	git tag v3.0
+
+Switched to branch 'stable'
+[stable 820ea75] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 159 - creating simple branch
+
+expecting success of 7004.160 'checking that branch head only has one tag': 
+	hash4=$(git rev-parse HEAD) &&
+	cat >expected <<-\EOF &&
+	v3.0
+	EOF
+	git tag -l --contains $hash4 v* >actual &&
+	test_cmp expected actual
+
+ok 160 - checking that branch head only has one tag
+
+expecting success of 7004.161 'checking that branch head with --no-contains lists all but one tag': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	EOF
+	git tag -l --no-contains $hash4 v* >actual &&
+	test_cmp expected actual
+
+ok 161 - checking that branch head with --no-contains lists all but one tag
+
+expecting success of 7004.162 'merging original branch into this branch': 
+	git merge --strategy=ours main &&
+        git tag v4.0
+
+Merge made by the 'ours' strategy.
+ok 162 - merging original branch into this branch
+
+expecting success of 7004.163 'checking that original branch head has one tag now': 
+	cat >expected <<-\EOF &&
+	v4.0
+	EOF
+	git tag -l --contains $hash3 v* >actual &&
+	test_cmp expected actual
+
+ok 163 - checking that original branch head has one tag now
+
+expecting success of 7004.164 'checking that original branch head with --no-contains lists all but one tag now': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	v3.0
+	EOF
+	git tag -l --no-contains $hash3 v* >actual &&
+	test_cmp expected actual
+
+ok 164 - checking that original branch head with --no-contains lists all but one tag now
+
+expecting success of 7004.165 'checking that initial commit is in all tags': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	v3.0
+	v4.0
+	EOF
+	git tag -l --contains $hash1 v* >actual &&
+	test_cmp expected actual
+
+ok 165 - checking that initial commit is in all tags
+
+expecting success of 7004.166 'checking that --contains can be used in non-list mode': 
+	cat >expected <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	v2.0
+	v3.0
+	v4.0
+	EOF
+	git tag --contains $hash1 v* >actual &&
+	test_cmp expected actual
+
+ok 166 - checking that --contains can be used in non-list mode
+
+expecting success of 7004.167 'checking that initial commit is in all tags with --no-contains': 
+	git tag -l --no-contains $hash1 v* >actual &&
+	test_must_be_empty actual
+
+ok 167 - checking that initial commit is in all tags with --no-contains
+
+expecting success of 7004.168 'mixing incompatibles modes and options is forbidden': 
+	test_must_fail git tag -a &&
+	test_must_fail git tag -a -l &&
+	test_must_fail git tag -s &&
+	test_must_fail git tag -s -l &&
+	test_must_fail git tag -m &&
+	test_must_fail git tag -m -l &&
+	test_must_fail git tag -m "hlagh" &&
+	test_must_fail git tag -m "hlagh" -l &&
+	test_must_fail git tag -F &&
+	test_must_fail git tag -F -l &&
+	test_must_fail git tag -f &&
+	test_must_fail git tag -f -l &&
+	test_must_fail git tag -a -s -m -F &&
+	test_must_fail git tag -a -s -m -F -l &&
+	test_must_fail git tag -l -v &&
+	test_must_fail git tag -l -d &&
+	test_must_fail git tag -l -v -d &&
+	test_must_fail git tag -n 100 -v &&
+	test_must_fail git tag -l -m msg &&
+	test_must_fail git tag -l -F some file &&
+	test_must_fail git tag -v -s &&
+	test_must_fail git tag --contains tag-tree &&
+	test_must_fail git tag --contains tag-blob &&
+	test_must_fail git tag --no-contains tag-tree &&
+	test_must_fail git tag --no-contains tag-blob &&
+	test_must_fail git tag --contains --no-contains &&
+	test_must_fail git tag --no-with HEAD &&
+	test_must_fail git tag --no-without HEAD
+
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
+
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
+
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
+
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
+
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
+
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
+
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
+
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
+
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
+
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
+
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-[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>
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-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"
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-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
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-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
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at 14b96fb files
-ok 26 - resetting an unmodified path is a no-op
+error: switch `m' requires a value
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-expecting success of 7102.27 '--mixed refreshes the index': 
-	# Verify default behavior (without --[no-]refresh or reset.refresh)
-	test_reset_refreshes_index &&
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-	# With --quiet
-	test_reset_refreshes_index "" --quiet
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-HEAD is now at 14b96fb files
-rm 'file2'
-HEAD is now at 14b96fb files
-rm 'file2'
-ok 27 - --mixed refreshes the index
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-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
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-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
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-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 &&
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-	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
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-ok 29 - --mixed preserves skip-worktree
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-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
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-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
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-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
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-M	secondfile
-ok 31 - disambiguation (1)
+error: switch `F' requires a value
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-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
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-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)
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-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
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 33 - disambiguation (3)
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-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
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 34 - disambiguation (4)
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-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
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at eed6733 modify 2nd file (geändert)
-Unstaged changes after reset:
-M	secondfile
-ok 35 - reset with paths accepts tree
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-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 &&
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-	tree=$(git write-tree) &&
-	git ls-tree $tree new-file >actual &&
-	test_must_be_empty actual &&
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-	git diff --name-only >actual &&
-	echo new-file >expect &&
-	test_cmp expect actual
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-Unstaged changes after reset:
-A	new-file
-ok 36 - reset -N keeps removed files as intent-to-add
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-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
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-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
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at d1a4bc3 remove 1st and rename 2nd
-ok 38 - reset handles --end-of-options
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-# passed all 38 test(s)
-1..38
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7110-reset-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7110-reset-merge/.git/
-expecting success of 7110.1 'setup': 
-	printf "line %d\n" 1 2 3 >file1 &&
-	cat file1 >file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m "Initial commit" &&
-	git tag initial &&
-	echo line 4 >>file1 &&
-	cat file1 >file2 &&
-	test_tick &&
-	git commit -m "add line 4 to file1" file1 &&
-	git tag second
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-[master (root-commit) 294b13e] Initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[master 91b6f65] add line 4 to file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-expecting success of 7110.2 'reset --merge is ok with changes in file it does not touch': 
-	git reset --merge HEAD^ &&
-	! grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-line 4
-ok 2 - reset --merge is ok with changes in file it does not touch
+error: options '-v' and '-l' cannot be used together
+error: options '-d' and '-l' cannot be used together
+error: options '-v' and '-l' cannot be used together
+fatal: the '-n' option is only allowed in list mode
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-expecting success of 7110.3 'reset --merge is ok when switching back': 
-	git reset --merge second &&
-	grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-line 4
-line 4
-ok 3 - reset --merge is ok when switching back
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-expecting success of 7110.4 'reset --keep is ok with changes in file it does not touch': 
-	git reset --hard second &&
-	cat file1 >file2 &&
-	git reset --keep HEAD^ &&
-	! grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 4 - reset --keep is ok with changes in file it does not touch
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-expecting success of 7110.5 'reset --keep is ok when switching back': 
-	git reset --keep second &&
-	grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-line 4
-line 4
-ok 5 - reset --keep is ok when switching back
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-expecting success of 7110.6 'reset --merge discards changes added to index (1)': 
-	git reset --hard second &&
-	cat file1 >file2 &&
-	echo "line 5" >> file1 &&
-	git add file1 &&
-	git reset --merge HEAD^ &&
-	! grep 4 file1 &&
-	! grep 5 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 6 - reset --merge discards changes added to index (1)
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-expecting success of 7110.7 'reset --merge is ok again when switching back (1)': 
-	git reset --hard initial &&
-	echo "line 5" >> file2 &&
-	git add file2 &&
-	git reset --merge second &&
-	! grep 4 file2 &&
-	! grep 5 file1 &&
-	grep 4 file1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-HEAD is now at 294b13e Initial commit
-line 4
-ok 7 - reset --merge is ok again when switching back (1)
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-expecting success of 7110.8 'reset --keep fails with changes in index in files it touches': 
-	git reset --hard second &&
-	echo "line 5" >> file1 &&
-	git add file1 &&
-	test_must_fail git reset --keep HEAD^
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at 91b6f65 add line 4 to file1
-error: Entry 'file1' would be overwritten by merge. Cannot merge.
-fatal: Could not reset index file to revision 'HEAD^'.
-ok 8 - reset --keep fails with changes in index in files it touches
+error: malformed object name tag-tree
+error: object fc33d716ad1ef3e46e3c05586c188aef7c225de9 is a blob, not a commit
+error: no such commit tag-blob
+error: malformed object name tag-tree
+error: object fc33d716ad1ef3e46e3c05586c188aef7c225de9 is a blob, not a commit
+error: no such commit tag-blob
+error: malformed object name --no-contains
+error: unknown option `no-with'
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-expecting success of 7110.9 'reset --merge discards changes added to index (2)': 
-	git reset --hard second &&
-	echo "line 4" >> file2 &&
-	git add file2 &&
-	git reset --merge HEAD^ &&
-	! grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff)" &&
-	test -z "$(git diff --cached)"
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-HEAD is now at 91b6f65 add line 4 to file1
-ok 9 - reset --merge discards changes added to index (2)
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-expecting success of 7110.10 'reset --merge is ok again when switching back (2)': 
-	git reset --hard initial &&
-	git reset --merge second &&
-	! grep 4 file2 &&
-	grep 4 file1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-HEAD is now at 294b13e Initial commit
-line 4
-ok 10 - reset --merge is ok again when switching back (2)
+error: unknown option `no-without'
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+               [(--trailer <token>[(=|:)<value>])...]
+               <tagname> [<commit> | <object>]
+   or: git tag -d <tagname>...
+   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
+               [--points-at <object>] [--column[=<options>] | --no-column]
+               [--create-reflog] [--sort=<key>] [--format=<format>]
+               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
+   or: git tag -v [--format=<format>] <tagname>...
 
-expecting success of 7110.11 'reset --keep keeps changes it does not touch': 
-	git reset --hard second &&
-	echo "line 4" >> file2 &&
-	git add file2 &&
-	git reset --keep HEAD^ &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+    -l, --list            list tag names
+    -n[<n>]               print <n> lines of each tag message
+    -d, --delete          delete tags
+    -v, --verify          verify tags
 
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 11 - reset --keep keeps changes it does not touch
+Tag creation options
+    -a, --[no-]annotate   annotated tag, needs a message
+    -m, --message <message>
+                          tag message
+    -F, --[no-]file <file>
+                          read message from file
+    --trailer <trailer>   add custom trailer(s)
+    -e, --[no-]edit       force edit of tag message
+    -s, --[no-]sign       annotated and GPG-signed tag
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    -u, --[no-]local-user <key-id>
+                          use another key to sign the tag
+    -f, --[no-]force      replace the tag if exists
+    --[no-]create-reflog  create a reflog
 
-expecting success of 7110.12 'reset --keep keeps changes when switching back': 
-	git reset --keep second &&
-	grep 4 file2 &&
-	grep 4 file1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+Tag listing options
+    --[no-]column[=<style>]
+                          show tag list in columns
+    --contains <commit>   print only tags that contain the commit
+    --no-contains <commit>
+                          print only tags that don't contain the commit
+    --merged <commit>     print only tags that are merged
+    --no-merged <commit>  print only tags that are not merged
+    --[no-]omit-empty     do not output a newline after empty formatted refs
+    --[no-]sort <key>     field name to sort on
+    --[no-]points-at <object>
+                          print only tags of the object
+    --[no-]format <format>
+                          format to use for the output
+    --[no-]color[=<when>] respect format colors
+    -i, --[no-]ignore-case
+                          sorting and filtering are case insensitive
 
-line 4
-line 4
-ok 12 - reset --keep keeps changes when switching back
+ok 168 - mixing incompatibles modes and options is forbidden
 
-expecting success of 7110.13 'reset --merge fails with changes in file it touches': 
-	git reset --hard second &&
-	echo "line 5" >> file1 &&
-	test_tick &&
-	git commit -m "add line 5" file1 &&
-	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-	mv file3 file1 &&
-	test_must_fail git reset --merge HEAD^ 2>err.log &&
-	grep file1 err.log | grep "not uptodate"
+expecting success of 7004.169 'mixing incompatible modes with --contains is forbidden': 
+		test_must_fail git tag -d $option HEAD &&
+		test_must_fail git tag -d $option HEAD some-tag &&
+		test_must_fail git tag -v $option HEAD
+	
+fatal: the '--contains' option is only allowed in list mode
+fatal: the '--contains' option is only allowed in list mode
+fatal: the '--contains' option is only allowed in list mode
+ok 169 - mixing incompatible modes with --contains is forbidden
 
-HEAD is now at 91b6f65 add line 4 to file1
-[master 7799e7c] add line 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: Entry 'file1' not uptodate. Cannot merge.
-ok 13 - reset --merge fails with changes in file it touches
+expecting success of 7004.170 'Doing 'git tag --list-like --contains <commit> <pattern> is permitted': 
+		git tag -n $option HEAD HEAD &&
+		git tag $option HEAD HEAD &&
+		git tag $option
+	
+v4.0
+ok 170 - Doing 'git tag --list-like --contains <commit> <pattern> is permitted
 
-expecting success of 7110.14 'reset --keep fails with changes in file it touches': 
-	git reset --hard second &&
-	echo "line 5" >> file1 &&
-	test_tick &&
-	git commit -m "add line 5" file1 &&
-	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-	mv file3 file1 &&
-	test_must_fail git reset --keep HEAD^ 2>err.log &&
-	grep file1 err.log | grep "not uptodate"
+expecting success of 7004.171 'mixing incompatible modes with --with is forbidden': 
+		test_must_fail git tag -d $option HEAD &&
+		test_must_fail git tag -d $option HEAD some-tag &&
+		test_must_fail git tag -v $option HEAD
+	
+fatal: the '--contains' option is only allowed in list mode
+fatal: the '--contains' option is only allowed in list mode
+fatal: the '--contains' option is only allowed in list mode
+ok 171 - mixing incompatible modes with --with is forbidden
 
-HEAD is now at 91b6f65 add line 4 to file1
-[master f1894d3] add line 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: Entry 'file1' not uptodate. Cannot merge.
-ok 14 - reset --keep fails with changes in file it touches
+expecting success of 7004.172 'Doing 'git tag --list-like --with <commit> <pattern> is permitted': 
+		git tag -n $option HEAD HEAD &&
+		git tag $option HEAD HEAD &&
+		git tag $option
+	
+v4.0
+ok 172 - Doing 'git tag --list-like --with <commit> <pattern> is permitted
 
-expecting success of 7110.15 'setup 3 different branches': 
-	git reset --hard second &&
-	git branch branch1 &&
-	git branch branch2 &&
-	git branch branch3 &&
-	git checkout branch1 &&
-	echo "line 5 in branch1" >> file1 &&
-	test_tick &&
-	git commit -a -m "change in branch1" &&
-	git checkout branch2 &&
-	echo "line 5 in branch2" >> file1 &&
-	test_tick &&
-	git commit -a -m "change in branch2" &&
-	git tag third &&
-	git checkout branch3 &&
-	echo a new file >file3 &&
-	rm -f file1 &&
-	git add file3 &&
-	test_tick &&
-	git commit -a -m "change in branch3"
+expecting success of 7004.173 'mixing incompatible modes with --no-contains is forbidden': 
+		test_must_fail git tag -d $option HEAD &&
+		test_must_fail git tag -d $option HEAD some-tag &&
+		test_must_fail git tag -v $option HEAD
+	
+fatal: the '--no-contains' option is only allowed in list mode
+fatal: the '--no-contains' option is only allowed in list mode
+fatal: the '--no-contains' option is only allowed in list mode
+ok 173 - mixing incompatible modes with --no-contains is forbidden
 
-HEAD is now at 91b6f65 add line 4 to file1
-Switched to branch 'branch1'
-[branch1 4afd189] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 077fd6d] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch3'
-[branch3 05419f2] change in branch3
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 4 deletions(-)
- delete mode 100644 file1
- create mode 100644 file3
-ok 15 - setup 3 different branches
+expecting success of 7004.174 'Doing 'git tag --list-like --no-contains <commit> <pattern> is permitted': 
+		git tag -n $option HEAD HEAD &&
+		git tag $option HEAD HEAD &&
+		git tag $option
+	
+100
+a1
+aa1
+annotated-tag
+annotated-tag-edit
+blank-annotated-tag
+blankfile-annotated-tag
+blanknonlfile-annotated-tag
+blanks-annotated-tag
+cba
+comment-annotated-tag
+commentfile-annotated-tag
+commentnonlfile-annotated-tag
+comments-annotated-tag
+empty-annotated-tag
+emptyfile-annotated-tag
+file-annotated-tag
+file-annotated-tag-edit
+non-annotated-tag
+reuse
+stdin-annotated-tag
+t210
+t211
+tag-from-subdir
+tag-from-subdir-2
+tag-left
+tag-lines
+tag-one-line
+tag-right
+tag-with-edited-file-message-and-trailers
+tag-with-edited-inline-message-and-trailers
+tag-with-file-message-and-trailers
+tag-with-inline-message-and-trailers
+tag-with-trailers-and-no-message
+tag-zero-lines
+v0.2.1
+v1.0
+v1.0.1
+v1.1.3
+v2.0
+v3.0
+ok 174 - Doing 'git tag --list-like --no-contains <commit> <pattern> is permitted
 
-expecting success of 7110.16 '"reset --merge HEAD^" is ok with pending merge': 
-	git checkout third &&
-	test_must_fail git merge branch1 &&
-	git reset --merge HEAD^ &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)" &&
-	test -z "$(git diff)"
+expecting success of 7004.175 'mixing incompatible modes with --without is forbidden': 
+		test_must_fail git tag -d $option HEAD &&
+		test_must_fail git tag -d $option HEAD some-tag &&
+		test_must_fail git tag -v $option HEAD
+	
+fatal: the '--no-contains' option is only allowed in list mode
+fatal: the '--no-contains' option is only allowed in list mode
+fatal: the '--no-contains' option is only allowed in list mode
+ok 175 - mixing incompatible modes with --without is forbidden
 
-Note: switching to 'third'.
+expecting success of 7004.176 'Doing 'git tag --list-like --without <commit> <pattern> is permitted': 
+		git tag -n $option HEAD HEAD &&
+		git tag $option HEAD HEAD &&
+		git tag $option
+	
+100
+a1
+aa1
+annotated-tag
+annotated-tag-edit
+blank-annotated-tag
+blankfile-annotated-tag
+blanknonlfile-annotated-tag
+blanks-annotated-tag
+cba
+comment-annotated-tag
+commentfile-annotated-tag
+commentnonlfile-annotated-tag
+comments-annotated-tag
+empty-annotated-tag
+emptyfile-annotated-tag
+file-annotated-tag
+file-annotated-tag-edit
+non-annotated-tag
+reuse
+stdin-annotated-tag
+t210
+t211
+tag-from-subdir
+tag-from-subdir-2
+tag-left
+tag-lines
+tag-one-line
+tag-right
+tag-with-edited-file-message-and-trailers
+tag-with-edited-inline-message-and-trailers
+tag-with-file-message-and-trailers
+tag-with-inline-message-and-trailers
+tag-with-trailers-and-no-message
+tag-zero-lines
+v0.2.1
+v1.0
+v1.0.1
+v1.1.3
+v2.0
+v3.0
+ok 176 - Doing 'git tag --list-like --without <commit> <pattern> is permitted
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 7004.177 'mixing incompatible modes with --merged is forbidden': 
+		test_must_fail git tag -d $option HEAD &&
+		test_must_fail git tag -d $option HEAD some-tag &&
+		test_must_fail git tag -v $option HEAD
+	
+fatal: the '--merged' option is only allowed in list mode
+fatal: the '--merged' option is only allowed in list mode
+fatal: the '--merged' option is only allowed in list mode
+ok 177 - mixing incompatible modes with --merged is forbidden
 
-If you want to 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 7004.178 'Doing 'git tag --list-like --merged <commit> <pattern> is permitted': 
+		git tag -n $option HEAD HEAD &&
+		git tag $option HEAD HEAD &&
+		git tag $option
+	
+100
+a1
+aa1
+annotated-tag
+annotated-tag-edit
+blank-annotated-tag
+blankfile-annotated-tag
+blanknonlfile-annotated-tag
+blanks-annotated-tag
+cba
+comment-annotated-tag
+commentfile-annotated-tag
+commentnonlfile-annotated-tag
+comments-annotated-tag
+empty-annotated-tag
+emptyfile-annotated-tag
+file-annotated-tag
+file-annotated-tag-edit
+non-annotated-tag
+reuse
+stdin-annotated-tag
+t210
+t211
+tag-from-subdir
+tag-from-subdir-2
+tag-lines
+tag-one-line
+tag-with-edited-file-message-and-trailers
+tag-with-edited-inline-message-and-trailers
+tag-with-file-message-and-trailers
+tag-with-inline-message-and-trailers
+tag-with-trailers-and-no-message
+tag-zero-lines
+v0.2.1
+v1.0
+v1.0.1
+v1.1.3
+v2.0
+v3.0
+v4.0
+ok 178 - Doing 'git tag --list-like --merged <commit> <pattern> is permitted
 
-  git switch -c <new-branch-name>
+expecting success of 7004.179 'mixing incompatible modes with --no-merged is forbidden': 
+		test_must_fail git tag -d $option HEAD &&
+		test_must_fail git tag -d $option HEAD some-tag &&
+		test_must_fail git tag -v $option HEAD
+	
+fatal: the '--no-merged' option is only allowed in list mode
+fatal: the '--no-merged' option is only allowed in list mode
+fatal: the '--no-merged' option is only allowed in list mode
+ok 179 - mixing incompatible modes with --no-merged is forbidden
 
-Or undo this operation with:
+expecting success of 7004.180 'Doing 'git tag --list-like --no-merged <commit> <pattern> is permitted': 
+		git tag -n $option HEAD HEAD &&
+		git tag $option HEAD HEAD &&
+		git tag $option
+	
+tag-left
+tag-right
+ok 180 - Doing 'git tag --list-like --no-merged <commit> <pattern> is permitted
 
-  git switch -
+expecting success of 7004.181 'mixing incompatible modes with --points-at is forbidden': 
+		test_must_fail git tag -d $option HEAD &&
+		test_must_fail git tag -d $option HEAD some-tag &&
+		test_must_fail git tag -v $option HEAD
+	
+fatal: the '--points-at' option is only allowed in list mode
+fatal: the '--points-at' option is only allowed in list mode
+fatal: the '--points-at' option is only allowed in list mode
+ok 181 - mixing incompatible modes with --points-at is forbidden
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7004.182 'Doing 'git tag --list-like --points-at <commit> <pattern> is permitted': 
+		git tag -n $option HEAD HEAD &&
+		git tag $option HEAD HEAD &&
+		git tag $option
+	
+v4.0
+ok 182 - Doing 'git tag --list-like --points-at <commit> <pattern> is permitted
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 16 - "reset --merge HEAD^" is ok with pending merge
+expecting success of 7004.183 '--points-at can be used in non-list mode': 
+	echo v4.0 >expect &&
+	git tag --points-at=v4.0 "v*" >actual &&
+	test_cmp expect actual
 
-expecting success of 7110.17 '"reset --keep HEAD^" fails with pending merge': 
-	git reset --hard third &&
-	test_must_fail git merge branch1 &&
-	test_must_fail git reset --keep HEAD^ 2>err.log &&
-	test_grep "middle of a merge" err.log
+ok 183 - --points-at can be used in non-list mode
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 17 - "reset --keep HEAD^" fails with pending merge
+expecting success of 7004.184 '--points-at is a synonym for --points-at HEAD': 
+	echo v4.0 >expect &&
+	git tag --points-at >actual &&
+	test_cmp expect actual
 
-expecting success of 7110.18 '"reset --merge HEAD" is ok with pending merge': 
-	git reset --hard third &&
-	test_must_fail git merge branch1 &&
-	git reset --merge HEAD &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
-	test -z "$(git diff --cached)" &&
-	test -z "$(git diff)"
+ok 184 - --points-at is a synonym for --points-at HEAD
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 18 - "reset --merge HEAD" is ok with pending merge
+expecting success of 7004.185 '--points-at finds lightweight tags': 
+	echo v4.0 >expect &&
+	git tag --points-at v4.0 >actual &&
+	test_cmp expect actual
 
-expecting success of 7110.19 '"reset --keep HEAD" fails with pending merge': 
-	git reset --hard third &&
-	test_must_fail git merge branch1 &&
-	test_must_fail git reset --keep HEAD 2>err.log &&
-	test_grep "middle of a merge" err.log
+ok 185 - --points-at finds lightweight tags
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 19 - "reset --keep HEAD" fails with pending merge
+expecting success of 7004.186 '--points-at finds annotated tags of commits': 
+	git tag -m "v4.0, annotated" annotated-v4.0 v4.0 &&
+	echo annotated-v4.0 >expect &&
+	git tag -l --points-at v4.0 "annotated*" >actual &&
+	test_cmp expect actual
 
-expecting success of 7110.20 '--merge is ok with added/deleted merge': 
-	git reset --hard third &&
-	rm -f file2 &&
-	test_must_fail git merge branch3 &&
-	! test -f file2 &&
-	test -f file3 &&
-	git diff --exit-code file3 &&
-	git diff --exit-code branch3 file3 &&
-	git reset --merge HEAD &&
-	! test -f file3 &&
-	! test -f file2 &&
-	git diff --exit-code --cached
+ok 186 - --points-at finds annotated tags of commits
 
-HEAD is now at 077fd6d change in branch2
-CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 20 - --merge is ok with added/deleted merge
+expecting success of 7004.187 '--points-at finds annotated tags of tags': 
+	git tag -m "describing the v4.0 tag object" \
+		annotated-again-v4.0 annotated-v4.0 &&
+	cat >expect <<-\EOF &&
+	annotated-again-v4.0
+	annotated-v4.0
+	EOF
+	git tag --points-at=annotated-v4.0 >actual &&
+	test_cmp expect actual
 
-expecting success of 7110.21 '--keep fails with added/deleted merge': 
-	git reset --hard third &&
-	rm -f file2 &&
-	test_must_fail git merge branch3 &&
-	! test -f file2 &&
-	test -f file3 &&
-	git diff --exit-code file3 &&
-	git diff --exit-code branch3 file3 &&
-	test_must_fail git reset --keep HEAD 2>err.log &&
-	test_grep "middle of a merge" err.log
+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 annotated-again-v4.0 annotated-v4.0^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+ok 187 - --points-at finds annotated tags of tags
 
-HEAD is now at 077fd6d change in branch2
-CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 21 - --keep fails with added/deleted merge
+expecting success of 7004.188 'recursive tagging should give advice': 
+	cat >expect <<-EOF &&
+	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 annotated-v4.0^{}
+	hint: Disable this message with "git config set advice.nestedTag false"
+	EOF
+	git tag -m nested nested annotated-v4.0 2>actual &&
+	test_cmp expect actual
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t6600-test-reach.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t6600-test-reach/.git/
-expecting success of 6600.1 'setup': 
-	for i in $(test_seq 1 10)
-	do
-		test_commit "1-$i" &&
-		git branch -f commit-1-$i &&
-		git tag -a -m "1-$i" tag-1-$i commit-1-$i || return 1
-	done &&
-	for j in $(test_seq 1 9)
-	do
-		git reset --hard commit-$j-1 &&
-		x=$(($j + 1)) &&
-		test_commit "$x-1" &&
-		git branch -f commit-$x-1 &&
-		git tag -a -m "$x-1" tag-$x-1 commit-$x-1 &&
+ok 188 - recursive tagging should give advice
 
-		for i in $(test_seq 2 10)
-		do
-			git merge commit-$j-$i -m "$x-$i" &&
-			git branch -f commit-$x-$i &&
-			git tag -a -m "$x-$i" tag-$x-$i commit-$x-$i || return 1
-		done
-	done &&
-	git commit-graph write --reachable &&
-	mv .git/objects/info/commit-graph commit-graph-full &&
-	chmod u+w commit-graph-full &&
-	git show-ref -s commit-5-5 | git commit-graph write --stdin-commits &&
-	mv .git/objects/info/commit-graph commit-graph-half &&
-	chmod u+w commit-graph-half &&
-	git -c commitGraph.generationVersion=1 commit-graph write --reachable &&
-	mv .git/objects/info/commit-graph commit-graph-no-gdat &&
-	chmod u+w commit-graph-no-gdat &&
-	git config core.commitGraph true
+expecting success of 7004.189 'multiple --points-at are OR-ed together': 
+	cat >expect <<-\EOF &&
+	v2.0
+	v3.0
+	EOF
+	git tag --points-at=v2.0 --points-at=v3.0 >actual &&
+	test_cmp expect actual
 
-[master (root-commit) 0d15007] 1-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-1.t
-[master d299b7f] 1-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-[master 4824988] 1-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-[master 365457e] 1-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-[master c37c079] 1-5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-[master a87f56a] 1-6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-[master e7afdd6] 1-7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-[master 2855ea4] 1-8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-[master 5d90ff6] 1-9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-[master be2c2f9] 1-10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at 0d15007 1-1
-[master 7393be9] 2-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at 7393be9 2-1
-[master 3195915] 3-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at 3195915 3-1
-[master af41a20] 4-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at af41a20 4-1
-[master 2948e13] 5-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at 2948e13 5-1
-[master d213662] 6-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at d213662 6-1
-[master 3c4cef0] 7-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at 3c4cef0 7-1
-[master 25a847a] 8-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at 25a847a 8-1
-[master 48082f2] 9-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-HEAD is now at 48082f2 9-1
-[master b42f416] 10-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10-1.t
-Merge made by the 'ort' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merge made by the 'ort' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merge made by the 'ort' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merge made by the 'ort' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merge made by the 'ort' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merge made by the 'ort' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merge made by the 'ort' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merge made by the 'ort' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merge made by the 'ort' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-ok 1 - setup
+ok 189 - multiple --points-at are OR-ed together
 
-expecting success of 6600.2 'ref_newer:miss': 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	B:commit-4-9
+expecting success of 7004.190 'lexical sort': 
+	git tag foo1.3 &&
+	git tag foo1.6 &&
+	git tag foo1.10 &&
+	git tag -l --sort=refname "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.10
+	foo1.3
+	foo1.6
 	EOF
-	echo "ref_newer(A,B):0" >expect &&
-	test_all_modes ref_newer
+	test_cmp expect actual
 
-ok 2 - ref_newer:miss
+ok 190 - lexical sort
 
-expecting success of 6600.3 'ref_newer:hit': 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	B:commit-2-3
+expecting success of 7004.191 'version sort': 
+	git tag -l --sort=version:refname "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.3
+	foo1.6
+	foo1.10
 	EOF
-	echo "ref_newer(A,B):1" >expect &&
-	test_all_modes ref_newer
+	test_cmp expect actual
 
-ok 3 - ref_newer:hit
+ok 191 - version sort
 
-expecting success of 6600.4 'in_merge_bases:hit': 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	B:commit-8-8
+expecting success of 7004.192 'reverse version sort': 
+	git tag -l --sort=-version:refname "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.10
+	foo1.6
+	foo1.3
 	EOF
-	echo "in_merge_bases(A,B):1" >expect &&
-	test_all_modes in_merge_bases
+	test_cmp expect actual
 
-ok 4 - in_merge_bases:hit
+ok 192 - reverse version sort
 
-expecting success of 6600.5 'in_merge_bases:miss': 
-	cat >input <<-\EOF &&
-	A:commit-6-8
-	B:commit-5-9
+expecting success of 7004.193 'reverse lexical sort': 
+	git tag -l --sort=-refname "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.6
+	foo1.3
+	foo1.10
 	EOF
-	echo "in_merge_bases(A,B):0" >expect &&
-	test_all_modes in_merge_bases
+	test_cmp expect actual
 
-ok 5 - in_merge_bases:miss
+ok 193 - reverse lexical sort
 
-expecting success of 6600.6 'in_merge_bases_many:hit': 
-	cat >input <<-\EOF &&
-	A:commit-6-8
-	X:commit-6-9
-	X:commit-5-7
+expecting success of 7004.194 'configured lexical sort': 
+	test_config tag.sort "v:refname" &&
+	git tag -l "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.3
+	foo1.6
+	foo1.10
 	EOF
-	echo "in_merge_bases_many(A,X):1" >expect &&
-	test_all_modes in_merge_bases_many
+	test_cmp expect actual
 
-ok 6 - in_merge_bases_many:hit
+ok 194 - configured lexical sort
 
-expecting success of 6600.7 'in_merge_bases_many:miss': 
-	cat >input <<-\EOF &&
-	A:commit-6-8
-	X:commit-7-7
-	X:commit-8-6
+expecting success of 7004.195 'option override configured sort': 
+	test_config tag.sort "v:refname" &&
+	git tag -l --sort=-refname "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.6
+	foo1.3
+	foo1.10
 	EOF
-	echo "in_merge_bases_many(A,X):0" >expect &&
-	test_all_modes in_merge_bases_many
+	test_cmp expect actual
 
-ok 7 - in_merge_bases_many:miss
+ok 195 - option override configured sort
 
-expecting success of 6600.8 'in_merge_bases_many:miss-heuristic': 
-	cat >input <<-\EOF &&
-	A:commit-6-8
-	X:commit-7-5
-	X:commit-6-6
+expecting success of 7004.196 '--no-sort cancels config sort keys': 
+	test_config tag.sort "-refname" &&
+
+	# objecttype is identical for all of them, so sort falls back on
+	# default (ascending refname)
+	git tag -l \
+		--no-sort \
+		--sort="objecttype" \
+		"foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.10
+	foo1.3
+	foo1.6
 	EOF
-	echo "in_merge_bases_many(A,X):0" >expect &&
-	test_all_modes in_merge_bases_many
+	test_cmp expect actual
 
-ok 8 - in_merge_bases_many:miss-heuristic
+ok 196 - --no-sort cancels config sort keys
 
-expecting success of 6600.9 'is_descendant_of:hit': 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	X:commit-4-8
-	X:commit-6-6
-	X:commit-1-1
+expecting success of 7004.197 '--no-sort cancels command line sort keys': 
+	# objecttype is identical for all of them, so sort falls back on
+	# default (ascending refname)
+	git tag -l \
+		--sort="-refname" \
+		--no-sort \
+		--sort="objecttype" \
+		"foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.10
+	foo1.3
+	foo1.6
 	EOF
-	echo "is_descendant_of(A,X):1" >expect &&
-	test_all_modes is_descendant_of
+	test_cmp expect actual
 
-ok 9 - is_descendant_of:hit
+ok 197 - --no-sort cancels command line sort keys
 
-expecting success of 6600.10 'is_descendant_of:miss': 
-	cat >input <<-\EOF &&
-	A:commit-6-8
-	X:commit-5-9
-	X:commit-4-10
-	X:commit-7-6
+expecting success of 7004.198 '--no-sort without subsequent --sort prints expected tags': 
+	# Sort the results with `sort` for a consistent comparison against
+	# expected
+	git tag -l --no-sort "foo*" | sort >actual &&
+	cat >expect <<-\EOF &&
+	foo1.10
+	foo1.3
+	foo1.6
 	EOF
-	echo "is_descendant_of(A,X):0" >expect &&
-	test_all_modes is_descendant_of
+	test_cmp expect actual
 
-ok 10 - is_descendant_of:miss
+ok 198 - --no-sort without subsequent --sort prints expected tags
 
-expecting success of 6600.11 'get_merge_bases_many': 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	X:commit-4-8
-	X:commit-6-6
-	X:commit-8-3
+expecting success of 7004.199 'invalid sort parameter on command line': 
+	test_must_fail git tag -l --sort=notvalid "foo*" >actual
+
+fatal: unknown field name: notvalid
+ok 199 - invalid sort parameter on command line
+
+expecting success of 7004.200 'invalid sort parameter in configuratoin': 
+	test_config tag.sort "v:notvalid" &&
+	test_must_fail git tag -l "foo*"
+
+fatal: unknown field name: notvalid
+ok 200 - invalid sort parameter in configuratoin
+
+expecting success of 7004.201 'version sort handles empty value for versionsort.{prereleaseSuffix,suffix}': 
+	cp .git/config .git/config.orig &&
+	test_when_finished mv .git/config.orig .git/config &&
+
+	cat >>.git/config <<-\EOF &&
+	[versionsort]
+		prereleaseSuffix
+		suffix
 	EOF
-	{
-		echo "get_merge_bases_many(A,X):" &&
-		git rev-parse commit-5-6 \
-			      commit-4-7 | sort
-	} >expect &&
-	test_all_modes get_merge_bases_many
+	cat >expect <<-\EOF &&
+	error: missing value for 'versionsort.suffix'
+	error: missing value for 'versionsort.prereleasesuffix'
+	EOF
+	git tag -l --sort=version:refname 2>actual &&
+	test_cmp expect actual
 
-ok 11 - get_merge_bases_many
+100
+a1
+aa1
+annotated-again-v4.0
+annotated-tag
+annotated-tag-edit
+annotated-v4.0
+blank-annotated-tag
+blankfile-annotated-tag
+blanknonlfile-annotated-tag
+blanks-annotated-tag
+cba
+comment-annotated-tag
+commentfile-annotated-tag
+commentnonlfile-annotated-tag
+comments-annotated-tag
+empty-annotated-tag
+emptyfile-annotated-tag
+file-annotated-tag
+file-annotated-tag-edit
+foo1.3
+foo1.6
+foo1.10
+nested
+non-annotated-tag
+reuse
+stdin-annotated-tag
+t210
+t211
+tag-blob
+tag-from-subdir
+tag-from-subdir-2
+tag-left
+tag-lines
+tag-one-line
+tag-right
+tag-with-edited-file-message-and-trailers
+tag-with-edited-inline-message-and-trailers
+tag-with-file-message-and-trailers
+tag-with-inline-message-and-trailers
+tag-with-trailers-and-no-message
+tag-zero-lines
+v0.2.1
+v1.0
+v1.0.1
+v1.1.3
+v2.0
+v3.0
+v4.0
+ok 201 - version sort handles empty value for versionsort.{prereleaseSuffix,suffix}
 
-expecting success of 6600.12 'reduce_heads': 
-	cat >input <<-\EOF &&
-	X:commit-1-10
-	X:commit-2-8
-	X:commit-3-6
-	X:commit-4-4
-	X:commit-1-7
-	X:commit-2-5
-	X:commit-3-3
-	X:commit-5-1
+expecting success of 7004.202 'version sort with prerelease reordering': 
+	test_config versionsort.prereleaseSuffix -rc &&
+	git tag foo1.6-rc1 &&
+	git tag foo1.6-rc2 &&
+	git tag -l --sort=version:refname "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.3
+	foo1.6-rc1
+	foo1.6-rc2
+	foo1.6
+	foo1.10
 	EOF
-	{
-		echo "reduce_heads(X):" &&
-		git rev-parse commit-5-1 \
-			      commit-4-4 \
-			      commit-3-6 \
-			      commit-2-8 \
-			      commit-1-10 | sort
-	} >expect &&
-	test_all_modes reduce_heads
+	test_cmp expect actual
 
-ok 12 - reduce_heads
+ok 202 - version sort with prerelease reordering
 
-expecting success of 6600.13 'can_all_from_reach:hit': 
-	cat >input <<-\EOF &&
-	X:commit-2-10
-	X:commit-3-9
-	X:commit-4-8
-	X:commit-5-7
-	X:commit-6-6
-	X:commit-7-5
-	X:commit-8-4
-	X:commit-9-3
-	Y:commit-1-9
-	Y:commit-2-8
-	Y:commit-3-7
-	Y:commit-4-6
-	Y:commit-5-5
-	Y:commit-6-4
-	Y:commit-7-3
-	Y:commit-8-1
+expecting success of 7004.203 'reverse version sort with prerelease reordering': 
+	test_config versionsort.prereleaseSuffix -rc &&
+	git tag -l --sort=-version:refname "foo*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.10
+	foo1.6
+	foo1.6-rc2
+	foo1.6-rc1
+	foo1.3
 	EOF
-	echo "can_all_from_reach(X,Y):1" >expect &&
-	test_all_modes can_all_from_reach
+	test_cmp expect actual
 
-ok 13 - can_all_from_reach:hit
+ok 203 - reverse version sort with prerelease reordering
 
-expecting success of 6600.14 'can_all_from_reach:miss': 
-	cat >input <<-\EOF &&
-	X:commit-2-10
-	X:commit-3-9
-	X:commit-4-8
-	X:commit-5-7
-	X:commit-6-6
-	X:commit-7-5
-	X:commit-8-4
-	X:commit-9-3
-	Y:commit-1-9
-	Y:commit-2-8
-	Y:commit-3-7
-	Y:commit-4-6
-	Y:commit-5-5
-	Y:commit-6-4
-	Y:commit-8-5
+expecting success of 7004.204 'version sort with prerelease reordering and common leading character': 
+	test_config versionsort.prereleaseSuffix -before &&
+	git tag foo1.7-before1 &&
+	git tag foo1.7 &&
+	git tag foo1.7-after1 &&
+	git tag -l --sort=version:refname "foo1.7*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.7-before1
+	foo1.7
+	foo1.7-after1
 	EOF
-	echo "can_all_from_reach(X,Y):0" >expect &&
-	test_all_modes can_all_from_reach
+	test_cmp expect actual
 
-ok 14 - can_all_from_reach:miss
+ok 204 - version sort with prerelease reordering and common leading character
 
-expecting success of 6600.15 'can_all_from_reach_with_flag: tags case': 
-	cat >input <<-\EOF &&
-	X:tag-2-10
-	X:tag-3-9
-	X:tag-4-8
-	X:commit-5-7
-	X:commit-6-6
-	X:commit-7-5
-	X:commit-8-4
-	X:commit-9-3
-	Y:tag-1-9
-	Y:tag-2-8
-	Y:tag-3-7
-	Y:commit-4-6
-	Y:commit-5-5
-	Y:commit-6-4
-	Y:commit-7-3
-	Y:commit-8-1
+expecting success of 7004.205 'version sort with prerelease reordering, multiple suffixes and common leading character': 
+	test_config versionsort.prereleaseSuffix -before &&
+	git config --add versionsort.prereleaseSuffix -after &&
+	git tag -l --sort=version:refname "foo1.7*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.7-before1
+	foo1.7-after1
+	foo1.7
 	EOF
-	echo "can_all_from_reach_with_flag(X,_,_,0,0):1" >expect &&
-	test_all_modes can_all_from_reach_with_flag
+	test_cmp expect actual
 
-ok 15 - can_all_from_reach_with_flag: tags case
+ok 205 - version sort with prerelease reordering, multiple suffixes and common leading character
 
-expecting success of 6600.16 'commit_contains:hit': 
-	cat >input <<-\EOF &&
-	A:commit-7-7
-	X:commit-2-10
-	X:commit-3-9
-	X:commit-4-8
-	X:commit-5-7
-	X:commit-6-6
-	X:commit-7-5
-	X:commit-8-4
-	X:commit-9-3
+expecting success of 7004.206 'version sort with prerelease reordering, multiple suffixes match the same tag': 
+	test_config versionsort.prereleaseSuffix -bar &&
+	git config --add versionsort.prereleaseSuffix -foo-baz &&
+	git config --add versionsort.prereleaseSuffix -foo-bar &&
+	git tag foo1.8-foo-bar &&
+	git tag foo1.8-foo-baz &&
+	git tag foo1.8 &&
+	git tag -l --sort=version:refname "foo1.8*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.8-foo-baz
+	foo1.8-foo-bar
+	foo1.8
 	EOF
-	echo "commit_contains(_,A,X,_):1" >expect &&
-	test_all_modes commit_contains &&
-	test_all_modes commit_contains --tag
+	test_cmp expect actual
 
-ok 16 - commit_contains:hit
+ok 206 - version sort with prerelease reordering, multiple suffixes match the same tag
 
-expecting success of 6600.17 'commit_contains:miss': 
-	cat >input <<-\EOF &&
-	A:commit-6-5
-	X:commit-2-10
-	X:commit-3-9
-	X:commit-4-8
-	X:commit-5-7
-	X:commit-6-6
-	X:commit-7-5
-	X:commit-8-4
-	X:commit-9-3
+expecting success of 7004.207 'version sort with prerelease reordering, multiple suffixes match starting at the same position': 
+	test_config versionsort.prereleaseSuffix -pre &&
+	git config --add versionsort.prereleaseSuffix -prerelease &&
+	git tag foo1.9-pre1 &&
+	git tag foo1.9-pre2 &&
+	git tag foo1.9-prerelease1 &&
+	git tag -l --sort=version:refname "foo1.9*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.9-pre1
+	foo1.9-pre2
+	foo1.9-prerelease1
 	EOF
-	echo "commit_contains(_,A,X,_):0" >expect &&
-	test_all_modes commit_contains &&
-	test_all_modes commit_contains --tag
+	test_cmp expect actual
 
-ok 17 - commit_contains:miss
+ok 207 - version sort with prerelease reordering, multiple suffixes match starting at the same position
 
-expecting success of 6600.18 'rev-list: basic topo-order': 
-	git rev-parse \
-		commit-6-6 commit-5-6 commit-4-6 commit-3-6 commit-2-6 commit-1-6 \
-		commit-6-5 commit-5-5 commit-4-5 commit-3-5 commit-2-5 commit-1-5 \
-		commit-6-4 commit-5-4 commit-4-4 commit-3-4 commit-2-4 commit-1-4 \
-		commit-6-3 commit-5-3 commit-4-3 commit-3-3 commit-2-3 commit-1-3 \
-		commit-6-2 commit-5-2 commit-4-2 commit-3-2 commit-2-2 commit-1-2 \
-		commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
-	>expect &&
-	run_all_modes git rev-list --topo-order commit-6-6
+expecting success of 7004.208 'version sort with general suffix reordering': 
+	test_config versionsort.suffix -alpha &&
+	git config --add versionsort.suffix -beta &&
+	git config --add versionsort.suffix ""  &&
+	git config --add versionsort.suffix -gamma &&
+	git config --add versionsort.suffix -delta &&
+	git tag foo1.10-alpha &&
+	git tag foo1.10-beta &&
+	git tag foo1.10-gamma &&
+	git tag foo1.10-delta &&
+	git tag foo1.10-unlisted-suffix &&
+	git tag -l --sort=version:refname "foo1.10*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.10-alpha
+	foo1.10-beta
+	foo1.10
+	foo1.10-unlisted-suffix
+	foo1.10-gamma
+	foo1.10-delta
+	EOF
+	test_cmp expect actual
 
-ok 18 - rev-list: basic topo-order
+ok 208 - version sort with general suffix reordering
 
-expecting success of 6600.19 'rev-list: first-parent topo-order': 
-	git rev-parse \
-		commit-6-6 \
-		commit-6-5 \
-		commit-6-4 \
-		commit-6-3 \
-		commit-6-2 \
-		commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
-	>expect &&
-	run_all_modes git rev-list --first-parent --topo-order commit-6-6
+expecting success of 7004.209 'versionsort.suffix overrides versionsort.prereleaseSuffix': 
+	test_config versionsort.suffix -before &&
+	test_config versionsort.prereleaseSuffix -after &&
+	git tag -l --sort=version:refname "foo1.7*" >actual &&
+	cat >expect <<-\EOF &&
+	foo1.7-before1
+	foo1.7
+	foo1.7-after1
+	EOF
+	test_cmp expect actual
 
-ok 19 - rev-list: first-parent topo-order
+warning: ignoring versionsort.prereleasesuffix because versionsort.suffix is set
+ok 209 - versionsort.suffix overrides versionsort.prereleaseSuffix
 
-expecting success of 6600.20 'rev-list: range topo-order': 
-	git rev-parse \
-		commit-6-6 commit-5-6 commit-4-6 commit-3-6 commit-2-6 commit-1-6 \
-		commit-6-5 commit-5-5 commit-4-5 commit-3-5 commit-2-5 commit-1-5 \
-		commit-6-4 commit-5-4 commit-4-4 commit-3-4 commit-2-4 commit-1-4 \
-		commit-6-3 commit-5-3 commit-4-3 \
-		commit-6-2 commit-5-2 commit-4-2 \
-		commit-6-1 commit-5-1 commit-4-1 \
-	>expect &&
-	run_all_modes git rev-list --topo-order commit-3-3..commit-6-6
+expecting success of 7004.210 'version sort with very long prerelease suffix': 
+	test_config versionsort.prereleaseSuffix -very-looooooooooooooooooooooooong-prerelease-suffix &&
+	git tag -l --sort=version:refname
 
-ok 20 - rev-list: range topo-order
+100
+a1
+aa1
+annotated-again-v4.0
+annotated-tag
+annotated-tag-edit
+annotated-v4.0
+blank-annotated-tag
+blankfile-annotated-tag
+blanknonlfile-annotated-tag
+blanks-annotated-tag
+cba
+comment-annotated-tag
+commentfile-annotated-tag
+commentnonlfile-annotated-tag
+comments-annotated-tag
+empty-annotated-tag
+emptyfile-annotated-tag
+file-annotated-tag
+file-annotated-tag-edit
+foo1.3
+foo1.6
+foo1.6-rc1
+foo1.6-rc2
+foo1.7
+foo1.7-after1
+foo1.7-before1
+foo1.8
+foo1.8-foo-bar
+foo1.8-foo-baz
+foo1.9-pre1
+foo1.9-pre2
+foo1.9-prerelease1
+foo1.10
+foo1.10-alpha
+foo1.10-beta
+foo1.10-delta
+foo1.10-gamma
+foo1.10-unlisted-suffix
+nested
+non-annotated-tag
+reuse
+stdin-annotated-tag
+t210
+t211
+tag-blob
+tag-from-subdir
+tag-from-subdir-2
+tag-left
+tag-lines
+tag-one-line
+tag-right
+tag-with-edited-file-message-and-trailers
+tag-with-edited-inline-message-and-trailers
+tag-with-file-message-and-trailers
+tag-with-inline-message-and-trailers
+tag-with-trailers-and-no-message
+tag-zero-lines
+v0.2.1
+v1.0
+v1.0.1
+v1.1.3
+v2.0
+v3.0
+v4.0
+ok 210 - version sort with very long prerelease suffix
 
-expecting success of 6600.21 'rev-list: range topo-order': 
-	git rev-parse \
-		commit-6-6 commit-5-6 commit-4-6 \
-		commit-6-5 commit-5-5 commit-4-5 \
-		commit-6-4 commit-5-4 commit-4-4 \
-		commit-6-3 commit-5-3 commit-4-3 \
-		commit-6-2 commit-5-2 commit-4-2 \
-		commit-6-1 commit-5-1 commit-4-1 \
-	>expect &&
-	run_all_modes git rev-list --topo-order commit-3-8..commit-6-6
+checking prerequisite: ULIMIT_STACK_SIZE
 
-ok 21 - rev-list: range topo-order
+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
 
-expecting success of 6600.22 'rev-list: first-parent range topo-order': 
-	git rev-parse \
-		commit-6-6 \
-		commit-6-5 \
-		commit-6-4 \
-		commit-6-3 \
-		commit-6-2 \
-		commit-6-1 commit-5-1 commit-4-1 \
-	>expect &&
-	run_all_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
+)
+prerequisite ULIMIT_STACK_SIZE ok
+expecting success of 7004.211 '--contains and --no-contains work 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^ &&
+	run_with_limited_stack git tag --contains HEAD >actual &&
+	test_must_be_empty actual &&
+	run_with_limited_stack git tag --no-contains HEAD >actual &&
+	test_line_count "-gt" 10 actual
 
-ok 22 - rev-list: first-parent range topo-order
+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:              1
+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              =    1177891 /    1177891
+---------------------------------------------------------------------
 
-expecting success of 6600.23 'rev-list: ancestry-path topo-order': 
-	git rev-parse \
-		commit-6-6 commit-5-6 commit-4-6 commit-3-6 \
-		commit-6-5 commit-5-5 commit-4-5 commit-3-5 \
-		commit-6-4 commit-5-4 commit-4-4 commit-3-4 \
-		commit-6-3 commit-5-3 commit-4-3 \
-	>expect &&
-	run_all_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
+Switched to branch 'main'
+ok 211 - --contains and --no-contains work in a deep repo
 
-ok 23 - rev-list: ancestry-path topo-order
+expecting success of 7004.212 '--format should list tags as per format given': 
+	cat >expect <<-\EOF &&
+	refname : refs/tags/v1.0
+	refname : refs/tags/v1.0.1
+	refname : refs/tags/v1.1.3
+	EOF
+	git tag -l --format="refname : %(refname)" "v1*" >actual &&
+	test_cmp expect actual
 
-expecting success of 6600.24 'rev-list: symmetric difference topo-order': 
-	git rev-parse \
-		commit-6-6 commit-5-6 commit-4-6 \
-		commit-6-5 commit-5-5 commit-4-5 \
-		commit-6-4 commit-5-4 commit-4-4 \
-		commit-6-3 commit-5-3 commit-4-3 \
-		commit-6-2 commit-5-2 commit-4-2 \
-		commit-6-1 commit-5-1 commit-4-1 \
-		commit-3-8 commit-2-8 commit-1-8 \
-		commit-3-7 commit-2-7 commit-1-7 \
-	>expect &&
-	run_all_modes git rev-list --topo-order commit-3-8...commit-6-6
+ok 212 - --format should list tags as per format given
 
-ok 24 - rev-list: symmetric difference topo-order
+expecting success of 7004.213 '--format --omit-empty works': 
+	cat >expect <<-\EOF &&
+	refname : refs/tags/v1.0
 
-expecting success of 6600.25 'get_reachable_subset:all': 
-	cat >input <<-\EOF &&
-	X:commit-9-1
-	X:commit-8-3
-	X:commit-7-5
-	X:commit-6-6
-	X:commit-1-7
-	Y:commit-3-3
-	Y:commit-1-7
-	Y:commit-5-6
+	refname : refs/tags/v1.1.3
 	EOF
-	(
-		echo "get_reachable_subset(X,Y)" &&
-		git rev-parse commit-3-3 \
-			      commit-1-7 \
-			      commit-5-6 | sort
-	) >expect &&
-	test_all_modes get_reachable_subset
+	git tag -l --format="%(if:notequals=refs/tags/v1.0.1)%(refname)%(then)refname : %(refname)%(end)" "v1*" >actual &&
+	test_cmp expect actual &&
+	cat >expect <<-\EOF &&
+	refname : refs/tags/v1.0
+	refname : refs/tags/v1.1.3
+	EOF
+	git tag -l --omit-empty --format="%(if:notequals=refs/tags/v1.0.1)%(refname)%(then)refname : %(refname)%(end)" "v1*" >actual &&
+	test_cmp expect actual
 
-ok 25 - get_reachable_subset:all
+ok 213 - --format --omit-empty works
 
-expecting success of 6600.26 'get_reachable_subset:some': 
-	cat >input <<-\EOF &&
-	X:commit-9-1
-	X:commit-8-3
-	X:commit-7-5
-	X:commit-1-7
-	Y:commit-3-3
-	Y:commit-1-7
-	Y:commit-5-6
-	EOF
-	(
-		echo "get_reachable_subset(X,Y)" &&
-		git rev-parse commit-3-3 \
-			      commit-1-7 | sort
-	) >expect &&
-	test_all_modes get_reachable_subset
+expecting success of 7004.214 'git tag -l with --format="%(rest)" must fail': 
+	test_must_fail git tag -l --format="%(rest)" "v1*"
 
-ok 26 - get_reachable_subset:some
+fatal: this command reject atom %(rest)
+ok 214 - git tag -l with --format="%(rest)" must fail
 
-expecting success of 6600.27 'get_reachable_subset:none': 
-	cat >input <<-\EOF &&
-	X:commit-9-1
-	X:commit-8-3
-	X:commit-7-5
-	X:commit-1-7
-	Y:commit-9-3
-	Y:commit-7-6
-	Y:commit-2-8
-	EOF
-	echo "get_reachable_subset(X,Y)" >expect &&
-	test_all_modes get_reachable_subset
+expecting success of 7004.215 'set up color tests': 
+	echo "<RED>v1.0<RESET>" >expect.color &&
+	echo "v1.0" >expect.bare &&
+	color_args="--format=%(color:red)%(refname:short) --list v1.0"
 
-ok 27 - get_reachable_subset:none
+ok 215 - set up color tests
 
-expecting success of 6600.28 'for-each-ref ahead-behind:linear': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-1-3
-	refs/heads/commit-1-5
-	refs/heads/commit-1-8
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1 0 8
-	refs/heads/commit-1-3 0 6
-	refs/heads/commit-1-5 0 4
-	refs/heads/commit-1-8 0 1
-	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname) %(ahead-behind:commit-1-9)" --stdin
+expecting success of 7004.216 '%(color) omitted without tty': 
+	TERM=vt100 git tag $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.bare actual
 
-ok 28 - for-each-ref ahead-behind:linear
+ok 216 - %(color) omitted without tty
 
-expecting success of 6600.29 'for-each-ref ahead-behind:all': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-2-4
-	refs/heads/commit-4-2
-	refs/heads/commit-4-4
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1 0 24
-	refs/heads/commit-2-4 0 17
-	refs/heads/commit-4-2 0 17
-	refs/heads/commit-4-4 0 9
-	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname) %(ahead-behind:commit-5-5)" --stdin
+checking prerequisite: TTY
 
-ok 29 - for-each-ref ahead-behind:all
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-expecting success of 6600.30 'for-each-ref ahead-behind:some': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-5-3
-	refs/heads/commit-4-8
-	refs/heads/commit-9-9
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1 0 53
-	refs/heads/commit-4-8 8 30
-	refs/heads/commit-5-3 0 39
-	refs/heads/commit-9-9 27 0
-	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname) %(ahead-behind:commit-9-6)" --stdin
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-ok 30 - for-each-ref ahead-behind:some
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-expecting success of 6600.31 'for-each-ref ahead-behind:some, multibase': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-5-3
-	refs/heads/commit-7-8
-	refs/heads/commit-4-8
-	refs/heads/commit-9-9
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1 0 53 0 53
-	refs/heads/commit-4-8 8 30 0 22
-	refs/heads/commit-5-3 0 39 0 39
-	refs/heads/commit-7-8 14 12 8 6
-	refs/heads/commit-9-9 27 0 27 0
-	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname) %(ahead-behind:commit-9-6) %(ahead-behind:commit-6-9)" \
-		--stdin
+)
+prerequisite TTY ok
+expecting success of 7004.217 '%(color) present with tty': 
+	test_terminal git tag $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
 
-ok 31 - for-each-ref ahead-behind:some, multibase
+ok 217 - %(color) present with tty
 
-expecting success of 6600.32 'for-each-ref ahead-behind:none': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-7-5
-	refs/heads/commit-4-8
-	refs/heads/commit-9-9
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-4-8 16 16
-	refs/heads/commit-7-5 7 4
-	refs/heads/commit-9-9 49 0
-	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname) %(ahead-behind:commit-8-4)" --stdin
+expecting success of 7004.218 '--color overrides auto-color': 
+	git tag --color $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
 
-ok 32 - for-each-ref ahead-behind:none
+ok 218 - --color overrides auto-color
 
-expecting success of 6600.33 'for-each-ref merged:linear': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-1-3
-	refs/heads/commit-1-5
-	refs/heads/commit-1-8
-	refs/heads/commit-2-1
-	refs/heads/commit-5-1
-	refs/heads/commit-9-1
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-1-3
-	refs/heads/commit-1-5
-	refs/heads/commit-1-8
-	EOF
-	run_all_modes git for-each-ref --merged=commit-1-9 \
-		--format="%(refname)" --stdin
+expecting success of 7004.219 'color.ui=always overrides auto-color': 
+	git -c color.ui=always tag $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
 
-ok 33 - for-each-ref merged:linear
+ok 219 - color.ui=always overrides auto-color
 
-expecting success of 6600.34 'for-each-ref merged:all': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-2-4
-	refs/heads/commit-4-2
-	refs/heads/commit-4-4
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-2-4
-	refs/heads/commit-4-2
-	refs/heads/commit-4-4
-	EOF
-	run_all_modes git for-each-ref --merged=commit-5-5 \
-		--format="%(refname)" --stdin
+expecting success of 7004.220 'setup --merged test tags': 
+	git tag mergetest-1 HEAD~2 &&
+	git tag mergetest-2 HEAD~1 &&
+	git tag mergetest-3 HEAD
 
-ok 34 - for-each-ref merged:all
+ok 220 - setup --merged test tags
 
-expecting success of 6600.35 'for-each-ref ahead-behind:some': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-5-3
-	refs/heads/commit-4-8
-	refs/heads/commit-9-9
-	EOF
+expecting success of 7004.221 '--merged can be used in non-list mode': 
 	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-5-3
+	mergetest-1
+	mergetest-2
 	EOF
-	run_all_modes git for-each-ref --merged=commit-9-6 \
-		--format="%(refname)" --stdin
+	git tag --merged=mergetest-2 "mergetest*" >actual &&
+	test_cmp expect actual
 
-ok 35 - for-each-ref ahead-behind:some
+ok 221 - --merged can be used in non-list mode
 
-expecting success of 6600.36 'for-each-ref merged:some, multibase': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-5-3
-	refs/heads/commit-7-8
-	refs/heads/commit-4-8
-	refs/heads/commit-9-9
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-4-8
-	refs/heads/commit-5-3
-	EOF
-	run_all_modes git for-each-ref \
-		--merged=commit-5-8 \
-		--merged=commit-8-5 \
-		--format="%(refname)" \
-		--stdin
+expecting success of 7004.222 '--merged is compatible with --no-merged': 
+	git tag --merged HEAD --no-merged HEAD
 
-ok 36 - for-each-ref merged:some, multibase
+ok 222 - --merged is compatible with --no-merged
 
-expecting success of 6600.37 'for-each-ref merged:none': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-7-5
-	refs/heads/commit-4-8
-	refs/heads/commit-9-9
+expecting success of 7004.223 '--merged shows merged tags': 
+	cat >expect <<-\EOF &&
+	mergetest-1
+	mergetest-2
 	EOF
-	>expect &&
-	run_all_modes git for-each-ref --merged=commit-8-4 \
-		--format="%(refname)" --stdin
+	git tag -l --merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
 
-ok 37 - for-each-ref merged:none
+ok 223 - --merged shows merged tags
 
-expecting success of 6600.38 'get_branch_base_for_tip: none reach': 
-	# (2,3) branched from the first tip (i,4) in X with i > 2
-	cat >input <<-\EOF &&
-		A:commit-2-3
-		X:commit-1-2
-		X:commit-1-4
-		X:commit-4-4
-		X:commit-8-4
-		X:commit-10-4
+expecting success of 7004.224 '--no-merged show unmerged tags': 
+	cat >expect <<-\EOF &&
+	mergetest-3
 	EOF
-	echo "get_branch_base_for_tip(A,X):2" >expect &&
-	test_all_modes get_branch_base_for_tip
+	git tag -l --no-merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
 
-ok 38 - get_branch_base_for_tip: none reach
+ok 224 - --no-merged show unmerged tags
 
-expecting success of 6600.39 'get_branch_base_for_tip: equal to tip': 
-	# (2,3) branched from the first tip (i,4) in X with i > 2
-	cat >input <<-\EOF &&
-		A:commit-8-4
-		X:commit-1-2
-		X:commit-1-4
-		X:commit-4-4
-		X:commit-8-4
-		X:commit-10-4
-	EOF
-	echo "get_branch_base_for_tip(A,X):3" >expect &&
-	test_all_modes get_branch_base_for_tip
+expecting success of 7004.225 '--no-merged can be used in non-list mode': 
+	git tag --no-merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
 
-ok 39 - get_branch_base_for_tip: equal to tip
+ok 225 - --no-merged can be used in non-list mode
 
-expecting success of 6600.40 'get_branch_base_for_tip: all reach tip': 
-	# (2,3) branched from the first tip (i,4) in X with i > 2
-	cat >input <<-\EOF &&
-		A:commit-4-1
-		X:commit-4-2
-		X:commit-5-1
-	EOF
-	echo "get_branch_base_for_tip(A,X):0" >expect &&
-	test_all_modes get_branch_base_for_tip
+expecting success of 7004.226 'ambiguous branch/tags not marked': 
+	git tag ambiguous &&
+	git branch ambiguous &&
+	echo ambiguous >expect &&
+	git tag -l ambiguous >actual &&
+	test_cmp expect actual
 
-ok 40 - get_branch_base_for_tip: all reach tip
+ok 226 - ambiguous branch/tags not marked
 
-expecting success of 6600.41 'for-each-ref is-base: none reach': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-4-2
-	refs/heads/commit-4-4
-	refs/heads/commit-8-4
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1:
-	refs/heads/commit-4-2:(commit-2-3)
-	refs/heads/commit-4-4:
-	refs/heads/commit-8-4:
-	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname):%(is-base:commit-2-3)" --stdin
+expecting success of 7004.227 '--contains combined with --no-contains': 
+	(
+		git init no-contains &&
+		cd no-contains &&
+		test_commit v0.1 &&
+		test_commit v0.2 &&
+		test_commit v0.3 &&
+		test_commit v0.4 &&
+		test_commit v0.5 &&
+		cat >expected <<-\EOF &&
+		v0.2
+		v0.3
+		v0.4
+		EOF
+		git tag --contains v0.2 --no-contains v0.5 >actual &&
+		test_cmp expected actual
+	)
 
-ok 41 - for-each-ref is-base: none reach
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7004-tag/no-contains/.git/
+[main (root-commit) fdf35a1] v0.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.1.t
+[main 82f1d18] v0.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.2.t
+[main 4c097b6] v0.3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.3.t
+[main 8804202] v0.4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.4.t
+[main 947a091] v0.5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.5.t
+ok 227 - --contains combined with --no-contains
 
-expecting success of 6600.42 'for-each-ref is-base: all reach': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-4-2
-	refs/heads/commit-5-1
+expecting success of 7004.228 'Does --[no-]contains stop at commits? Yes!': 
+	cd no-contains &&
+	blob=$(git rev-parse v0.3:v0.3.t) &&
+	tree=$(git rev-parse v0.3^{tree}) &&
+	git tag tag-blob $blob &&
+	git tag tag-tree $tree &&
+	git tag --contains v0.3 >actual &&
+	cat >expected <<-\EOF &&
+	v0.3
+	v0.4
+	v0.5
 	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-4-2:(commit-4-1)
-	refs/heads/commit-5-1:
+	test_cmp expected actual &&
+	git tag --no-contains v0.3 >actual &&
+	cat >expected <<-\EOF &&
+	v0.1
+	v0.2
 	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname):%(is-base:commit-4-1)" --stdin
+	test_cmp expected actual
 
-ok 42 - for-each-ref is-base: all reach
+ok 228 - Does --[no-]contains stop at commits? Yes!
 
-expecting success of 6600.43 'for-each-ref is-base: equal to tip': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-4-2
-	refs/heads/commit-5-1
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-4-2:(commit-4-2)
-	refs/heads/commit-5-1:
+expecting success of 7004.229 'If tag is created then tag message file is unlinked': 
+	test_when_finished "git tag -d foo" &&
+	write_script fakeeditor <<-\EOF &&
+	echo Message >.git/TAG_EDITMSG
 	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname):%(is-base:commit-4-2)" --stdin
+	GIT_EDITOR=./fakeeditor git tag -a foo &&
+	test_path_is_missing .git/TAG_EDITMSG
 
-ok 43 - for-each-ref is-base: equal to tip
+Deleted tag 'foo' (was 299fb5e)
+ok 229 - If tag is created then tag message file is unlinked
 
-expecting success of 6600.44 'for-each-ref is-base:multiple': 
-	cat >input <<-\EOF &&
-	refs/heads/commit-1-1
-	refs/heads/commit-4-2
-	refs/heads/commit-4-4
-	refs/heads/commit-8-4
-	EOF
-	cat >expect <<-\EOF &&
-	refs/heads/commit-1-1[-]
-	refs/heads/commit-4-2[(commit-2-3)-]
-	refs/heads/commit-4-4[-]
-	refs/heads/commit-8-4[-(commit-6-5)]
+expecting success of 7004.230 'If tag cannot be created then tag message file is not unlinked': 
+	test_when_finished "git tag -d foo/bar && rm .git/TAG_EDITMSG" &&
+	write_script fakeeditor <<-\EOF &&
+	echo Message >.git/TAG_EDITMSG
 	EOF
-	run_all_modes git for-each-ref \
-		--format="%(refname)[%(is-base:commit-2-3)-%(is-base:commit-6-5)]" --stdin
+	git tag foo/bar &&
+	test_must_fail env GIT_EDITOR=./fakeeditor git tag -a foo &&
+	test_path_exists .git/TAG_EDITMSG
 
-ok 44 - for-each-ref is-base:multiple
+The tag message has been left in .git/TAG_EDITMSG
+fatal: cannot lock ref 'refs/tags/foo': 'refs/tags/foo/bar' exists; cannot create 'refs/tags/foo'
+Deleted tag 'foo/bar' (was 947a091)
+ok 230 - If tag cannot be created then tag message file is not unlinked
 
-# passed all 44 test(s)
-1..44
+# passed all 230 test(s)
+1..230
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7301-clean-interactive.sh ***
@@ -447735,7 +450788,7 @@
 *** Commands ***
     1: clean                2: filter by pattern    3: select by numbers
     4: ask each             5: quit                 6: help
-What now> Huh ()?
+What now> Huh (\04)?
 *** Commands ***
     1: clean                2: filter by pattern    3: select by numbers
     4: ask each             5: quit                 6: help
@@ -449579,4673 +452632,3802 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7004-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t7402-submodule-rebase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7402-submodule-rebase/.git/
+expecting success of 7402.1 'setup': 
 
-ok 3 - listing all tags in an empty tree should output nothing
+	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
 
-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.48.0~rc1+next.20250101/t/trash directory.t7004-tag/sort/.git/
-[main (root-commit) 24b24cf] initial
+[master (root-commit) ffefb50] 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
+ create mode 100644 file
+Cloning into 'submodule'...
+done.
+warning: adding embedded git repository: submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submodule
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submodule
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master 9bd10db] submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-ok 9 - creating a tag using default HEAD should succeed
-
-expecting success of 7004.10 'HEAD is forbidden as a tagname': 
-	test_when_finished "git update-ref --no-deref -d refs/tags/HEAD || :" &&
-	test_must_fail git tag HEAD &&
-	test_must_fail git tag -a -m "useless" HEAD
-
-fatal: 'HEAD' is not a valid tag name.
-fatal: 'HEAD' is not a valid tag name.
-ok 10 - HEAD is forbidden as a tagname
-
-expecting success of 7004.11 '"git tag" can remove a tag named HEAD': 
-	test_when_finished "git update-ref --no-deref -d refs/tags/HEAD || :" &&
-	git update-ref refs/tags/HEAD HEAD &&
-	git tag -d HEAD
-
-Deleted tag 'HEAD' (was 86e17e4)
-ok 11 - "git tag" can remove a tag named HEAD
-
-expecting success of 7004.12 '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 12 - creating a tag with --create-reflog should create reflog
-
-expecting success of 7004.13 '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 13 - annotated tag with --create-reflog has correct message
-
-expecting success of 7004.14 '--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
+ create mode 160000 submodule
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-fatal: tag 'mytag' already exists
-ok 14 - --create-reflog does not create reflog on failure
+expecting success of 7402.2 'rebase with a dirty submodule': 
 
-expecting success of 7004.15 '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
+	(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)
 
-Deleted tag 'tag_with_reflog3' (was 86e17e4)
-ok 15 - option core.logAllRefUpdates=always creates reflog
 
-expecting success of 7004.16 'listing all tags if one exists should succeed': 
-	git tag -l &&
-	git tag
+[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.48.0~rc1+next.20250101/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
 
-mytag
-mytag
-ok 16 - listing all tags if one exists should succeed
+expecting success of 7402.3 'interactive rebase with a dirty submodule': 
 
-expecting success of 7004.17 '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 &&
+	echo submodule >expect &&
+	git diff --name-only >actual &&
 	test_cmp expect actual &&
-	git tag --list -l --list >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
 
-ok 17 - Multiple -l or --list options are equivalent to one -l option
-
-expecting success of 7004.18 'listing all tags if one exists should output that tag': 
-	test $(git tag -l) = mytag &&
-	test $(git tag) = mytag
-
-ok 18 - listing all tags if one exists should output that tag
-
-expecting success of 7004.19 'listing a tag using a matching pattern should succeed': 
-	git tag -l mytag
-
-mytag
-ok 19 - listing a tag using a matching pattern should succeed
-
-expecting success of 7004.20 'listing a tag with --ignore-case': 
-	test $(git tag -l --ignore-case MYTAG) = mytag
-
-ok 20 - listing a tag with --ignore-case
-
-expecting success of 7004.21 'listing a tag using a matching pattern should output that tag': 
-	test $(git tag -l mytag) = mytag
-
-ok 21 - listing a tag using a matching pattern should output that tag
-
-expecting success of 7004.22 'listing tags using a non-matching pattern should succeed': 
-	git tag -l xxx
-
-ok 22 - listing tags using a non-matching pattern should succeed
-
-expecting success of 7004.23 'listing tags using a non-matching pattern should output nothing': 
-	test $(git tag -l xxx | wc -l) -eq 0
-
-ok 23 - listing tags using a non-matching pattern should output nothing
-
-expecting success of 7004.24 '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 24 - trying to create a tag with the name of one existing should fail
-
-expecting success of 7004.25 '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 25 - trying to create a tag with a non-valid name should fail
-
-expecting success of 7004.26 'creating a tag using HEAD directly should succeed': 
-	git tag myhead HEAD &&
-	tag_exists myhead
-
-ok 26 - creating a tag using HEAD directly should succeed
+pick 81a011672801a6d53f73688ebde4d518274102e6
+Successfully rebased and updated refs/heads/master.
+ok 3 - interactive rebase with a dirty submodule
 
-expecting success of 7004.27 '--force can create a tag with the name of one existing': 
-	tag_exists mytag &&
-	git tag --force mytag &&
-	tag_exists mytag
-ok 27 - --force can create a tag with the name of one existing
+expecting success of 7402.4 'rebase with dirty file and submodule fails': 
 
-expecting success of 7004.28 '--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
+	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^
 
-Deleted tag 'newtag' (was 86e17e4)
-Deleted tag 'forcetag' (was 86e17e4)
-ok 28 - --force is moot with a non-existing tag name
 
-expecting success of 7004.29 'trying to delete an unknown tag should fail': 
-	! tag_exists unknown-tag &&
-	test_must_fail git tag -d unknown-tag
+[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
 
-error: tag 'unknown-tag' not found.
-ok 29 - trying to delete an unknown tag should fail
+expecting success of 7402.5 'stash with a dirty submodule': 
 
-expecting success of 7004.30 'trying to delete tags without params should succeed and do nothing': 
-	cat >expect <<-\EOF &&
-	myhead
-	mytag
-	EOF
-	git tag -l >actual &&
+	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 &&
-	git tag -d &&
-	git tag -l >actual &&
-	test_cmp expect actual
-
-ok 30 - trying to delete tags without params should succeed and do nothing
-
-expecting success of 7004.31 '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 31 - deleting two existing tags in one command should succeed
-
-expecting success of 7004.32 'creating a tag with the name of another deleted one should succeed': 
-	! tag_exists mytag &&
-	git tag mytag &&
-	tag_exists mytag
-
-ok 32 - creating a tag with the name of another deleted one should succeed
-
-expecting success of 7004.33 '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 33 - trying to delete two tags, existing and not, should fail in the 2nd
-
-expecting success of 7004.34 'trying to delete an already deleted tag should fail': 
-	test_must_fail git tag -d mytag
 
-error: tag 'mytag' not found.
-ok 34 - trying to delete an already deleted tag should fail
-
-expecting success of 7004.35 '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 &&
+	echo "$CURRENT" >expect &&
+	git -C submodule rev-parse HEAD >actual &&
 	test_cmp expect actual &&
-	git tag >actual &&
-	test_cmp expect actual
-
-ok 35 - listing all tags should print them ordered
-
-expecting success of 7004.36 '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 36 - listing tags with substring as pattern must print those matching
-
-expecting success of 7004.37 '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 37 - listing tags with a suffix as pattern must print those matching
-
-expecting success of 7004.38 '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 38 - listing tags with a prefix as pattern must print those matching
-
-expecting success of 7004.39 '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 39 - listing tags using a name as pattern must print that one matching
-
-expecting success of 7004.40 '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 40 - listing tags using a name as pattern must print that one matching
-
-expecting success of 7004.41 '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 41 - listing tags with ? in the pattern should print those matching
-
-expecting success of 7004.42 'listing tags using v.* should print nothing because none have v.': 
-	git tag -l "v.*" >actual &&
-	test_must_be_empty actual
-
-ok 42 - listing tags using v.* should print nothing because none have v.
-
-expecting success of 7004.43 '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 43 - listing tags using v* should print only those having v
-
-expecting success of 7004.44 '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 44 - tag -l can accept multiple patterns
-
-expecting success of 7004.45 '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 45 - tag -l <pattern> -l <pattern> works, as our buggy documentation previously suggested
-
-expecting success of 7004.46 '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 46 - listing tags in column
-
-expecting success of 7004.47 '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 47 - listing tags in column with column.*
-
-expecting success of 7004.48 'listing tag with -n --column should fail': 
-	test_must_fail git tag --column -n
-
-fatal: options '--column' and '-n' cannot be used together
-ok 48 - listing tag with -n --column should fail
-
-expecting success of 7004.49 '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 49 - listing tags -n in column with column.ui ignored
-
-expecting success of 7004.50 '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 50 - a non-annotated tag created without parameters should point to HEAD
-
-expecting success of 7004.51 'trying to verify an unknown tag should fail': 
-	test_must_fail git tag -v unknown-tag
-
-error: tag 'unknown-tag' not found.
-ok 51 - trying to verify an unknown tag should fail
-
-expecting success of 7004.52 '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 52 - trying to verify a non-annotated and non-signed tag should fail
-
-expecting success of 7004.53 '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 53 - trying to verify many non-annotated or unknown tags, should fail
-
-expecting success of 7004.54 '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 54 - creating an annotated tag with -m message should succeed
-
-expecting success of 7004.55 'set up editor': 
-	write_script fakeeditor <<-\EOF
-	sed -e "s/A message/An edited message/g" <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
-
-ok 55 - set up editor
-
-expecting success of 7004.56 '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 56 - creating an annotated tag with -m message --edit should succeed
-
-expecting success of 7004.57 '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 57 - creating an annotated tag with -F messagefile should succeed
-
-expecting success of 7004.58 'set up editor': 
-	write_script fakeeditor <<-\EOF
-	sed -e "s/Another message/Another edited message/g" <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
-
-ok 58 - set up editor
-
-expecting success of 7004.59 '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 59 - creating an annotated tag with -F messagefile --edit should succeed
-
-expecting success of 7004.60 '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 60 - creating an annotated tag with -F - should succeed
-
-expecting success of 7004.61 '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 61 - trying to create a tag with a non-existing -F file should fail
-
-expecting success of 7004.62 '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 62 - trying to create tags giving both -m or -F options should fail
-
-expecting success of 7004.63 '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 63 - creating a tag with an empty -m message should succeed
-
-expecting success of 7004.64 '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 64 - creating a tag with an empty -F messagefile should succeed
-
-expecting success of 7004.65 '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 65 - extra blanks in the message for an annotated tag should be removed
-
-expecting success of 7004.66 '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 66 - creating a tag with blank -m message with spaces should succeed
-
-expecting success of 7004.67 '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 67 - creating a tag with blank -F messagefile with spaces should succeed
-
-expecting success of 7004.68 '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 68 - creating a tag with -F file of spaces and no newline should succeed
-
-expecting success of 7004.69 '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.
-	EOF
-	get_tag_header comments-annotated-tag $commit commit $time >expect &&
-	cat >>expect <<-\EOF &&
-	The message.
-	One line.
-
-	Another line.
-
-	Last line.
-	EOF
-	git tag -F commentsfile comments-annotated-tag &&
-	get_tag_msg comments-annotated-tag >actual &&
-	test_cmp expect actual
-
-ok 69 - creating a tag using a -F messagefile with #comments should succeed
-
-expecting success of 7004.70 'creating a tag with a #comment in the -m message should succeed': 
-	get_tag_header comment-annotated-tag $commit commit $time >expect &&
-	git tag -m "#comment" comment-annotated-tag &&
-	get_tag_msg comment-annotated-tag >actual &&
-	test_cmp expect actual
-
-ok 70 - creating a tag with a #comment in the -m message should succeed
-
-expecting success of 7004.71 'creating a tag with #comments in the -F messagefile should succeed': 
-	echo "#comment" >commentfile &&
-	echo ""         >>commentfile &&
-	echo "####"     >>commentfile &&
-	get_tag_header commentfile-annotated-tag $commit commit $time >expect &&
-	git tag -F commentfile commentfile-annotated-tag &&
-	get_tag_msg commentfile-annotated-tag >actual &&
-	test_cmp expect actual
-
-ok 71 - creating a tag with #comments in the -F messagefile should succeed
 
-expecting success of 7004.72 'creating a tag with a file of #comment and no newline should succeed': 
-	printf "#comment" >commentnonlfile &&
-	get_tag_header commentnonlfile-annotated-tag $commit commit $time >expect &&
-	git tag -F commentnonlfile commentnonlfile-annotated-tag &&
-	get_tag_msg commentnonlfile-annotated-tag >actual &&
+	git stash apply &&
+	test new = $(cat file) &&
+	echo "$CURRENT" >expect &&
+	git -C submodule rev-parse HEAD >actual &&
 	test_cmp expect actual
 
-ok 72 - creating a tag with a file of #comment and no newline should succeed
-
-expecting success of 7004.73 'create tag with -m and --trailer': 
-	get_tag_header tag-with-inline-message-and-trailers $commit commit $time >expect &&
-	cat >>expect <<-\EOF &&
-	create tag with trailers
 
-	my-trailer: here
-	alt-trailer: there
-	EOF
-	git tag -m "create tag with trailers" \
-		--trailer my-trailer=here \
-		--trailer alt-trailer=there \
-		tag-with-inline-message-and-trailers &&
-	get_tag_msg tag-with-inline-message-and-trailers >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)
 
-ok 73 - create tag with -m and --trailer
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	fake-editor.sh
 
-expecting success of 7004.74 'list tag extracting trailers': 
-	cat >expect <<-\EOF &&
-	my-trailer: here
-	alt-trailer: there
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 5 - stash with a dirty submodule
 
-	EOF
-	git tag --list --format="%(trailers)" tag-with-inline-message-and-trailers >actual &&
-	test_cmp expect actual
+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 &&
 
-ok 74 - list tag extracting trailers
+	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
 
-expecting success of 7004.75 'create tag with -F and --trailer': 
-	echo "create tag from message file using --trailer" >messagefilewithnotrailers &&
-	get_tag_header tag-with-file-message-and-trailers $commit commit $time >expect &&
-	cat >>expect <<-\EOF &&
-	create tag from message file using --trailer
+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
 
-	my-trailer: here
-	alt-trailer: there
-	EOF
-	git tag -F messagefilewithnotrailers \
-		--trailer my-trailer=here \
-		--trailer alt-trailer=there \
-		tag-with-file-message-and-trailers &&
-	get_tag_msg tag-with-file-message-and-trailers >actual &&
-	test_cmp expect actual
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7300-clean.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/.git/
+expecting success of 7300.1 'setup': 
 
-ok 75 - create tag with -F and --trailer
+	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 .
 
-expecting success of 7004.76 'create tag with -m and --trailer and --edit': 
-	write_script fakeeditor <<-\EOF &&
-	sed -e "1s/^/EDITED: /g" <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
-	get_tag_header tag-with-edited-inline-message-and-trailers $commit commit $time >expect &&
-	cat >>expect <<-\EOF &&
-	EDITED: create tag with trailers
 
-	my-trailer: here
-	alt-trailer: there
-	EOF
-	GIT_EDITOR=./fakeeditor git tag --edit \
-		-m "create tag with trailers" \
-		--trailer my-trailer=here \
-		--trailer alt-trailer=there \
-		tag-with-edited-inline-message-and-trailers &&
-	get_tag_msg tag-with-edited-inline-message-and-trailers >actual &&
-	test_cmp expect actual
+[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
 
-ok 76 - create tag with -m and --trailer and --edit
+expecting success of 7300.2 'git clean with skip-worktree .gitignore': 
+	git update-index --skip-worktree .gitignore &&
+	rm .gitignore &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so &&
+	git update-index --no-skip-worktree .gitignore &&
+	git checkout .gitignore
 
-expecting success of 7004.77 'create tag with -F and --trailer and --edit': 
-	echo "create tag from message file using --trailer" >messagefilewithnotrailers &&
-	get_tag_header tag-with-edited-file-message-and-trailers $commit commit $time >expect &&
-	cat >>expect <<-\EOF &&
-	EDITED: create tag from message file using --trailer
+Removing a.out
+Removing src/part3.c
+Updated 1 path from the index
+ok 2 - git clean with skip-worktree .gitignore
 
-	my-trailer: here
-	alt-trailer: there
-	EOF
-	GIT_EDITOR=./fakeeditor git tag --edit \
-		-F messagefilewithnotrailers \
-		--trailer my-trailer=here \
-		--trailer alt-trailer=there \
-		tag-with-edited-file-message-and-trailers &&
-	get_tag_msg tag-with-edited-file-message-and-trailers >actual &&
-	test_cmp expect actual
+expecting success of 7300.3 'git clean': 
 
-ok 77 - create tag with -F and --trailer and --edit
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-expecting success of 7004.78 'create annotated tag and force editor when only --trailer is given': 
-	write_script fakeeditor <<-\EOF &&
-	echo "add a line" >"$1-"
-	cat <"$1" >>"$1-"
-	mv "$1-" "$1"
-	EOF
-	get_tag_header tag-with-trailers-and-no-message $commit commit $time >expect &&
-	cat >>expect <<-\EOF &&
-	add a line
 
-	my-trailer: here
-	alt-trailer: there
-	EOF
-	GIT_EDITOR=./fakeeditor git tag \
-		--trailer my-trailer=here \
-		--trailer alt-trailer=there \
-		tag-with-trailers-and-no-message &&
-	get_tag_msg tag-with-trailers-and-no-message >actual &&
-	test_cmp expect actual
+Removing a.out
+Removing src/part3.c
+ok 3 - git clean
 
-ok 78 - create annotated tag and force editor when only --trailer is given
+expecting success of 7300.4 'git clean src/': 
 
-expecting success of 7004.79 'bad editor causes panic when only --trailer is given': 
-	test_must_fail env GIT_EDITOR=false git tag --trailer my-trailer=here tag-will-not-exist
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-error: there was a problem with the editor 'false'
-Please supply the message using either -m or -F option.
-ok 79 - bad editor causes panic when only --trailer is given
 
-expecting success of 7004.80 'listing the one-line message of a non-signed tag should succeed': 
-	git tag -m "A msg" tag-one-line &&
+Removing src/part3.c
+ok 4 - git clean src/
 
-	echo "tag-one-line" >expect &&
-	git tag -l | grep "^tag-one-line" >actual &&
-	test_cmp expect actual &&
-	git tag -n0 -l | grep "^tag-one-line" >actual &&
-	test_cmp expect actual &&
-	git tag -n0 -l tag-one-line >actual &&
-	test_cmp expect actual &&
+expecting success of 7300.5 'git clean src/ src/': 
 
-	git tag -n0 | grep "^tag-one-line" >actual &&
-	test_cmp expect actual &&
-	git tag -n0 tag-one-line >actual &&
-	test_cmp expect actual &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ src/ &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-	echo "tag-one-line    A msg" >expect &&
-	git tag -n1 -l | grep "^tag-one-line" >actual &&
-	test_cmp expect actual &&
-	git tag -n -l | grep "^tag-one-line" >actual &&
-	test_cmp expect actual &&
-	git tag -n1 -l tag-one-line >actual &&
-	test_cmp expect actual &&
-	git tag -n2 -l tag-one-line >actual &&
-	test_cmp expect actual &&
-	git tag -n999 -l tag-one-line >actual &&
-	test_cmp expect actual
 
-ok 80 - listing the one-line message of a non-signed tag should succeed
+Removing src/part3.c
+ok 5 - git clean src/ src/
 
-expecting success of 7004.81 'The -n 100 invocation means -n --list 100, not -n100': 
-	git tag -n 100 >actual &&
-	test_must_be_empty actual &&
+expecting success of 7300.6 'git clean with prefix': 
 
-	git tag -m "A msg" 100 &&
-	echo "100             A msg" >expect &&
-	git tag -n 100 >actual &&
-	test_cmp expect actual
+	mkdir -p build docs src/test &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
+	(cd src/ && git clean) &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file src/test/1.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-ok 81 - The -n 100 invocation means -n --list 100, not -n100
 
-expecting success of 7004.82 'listing the zero-lines message of a non-signed tag should succeed': 
-	git tag -m "" tag-zero-lines &&
+Removing part3.c
+ok 6 - git clean with prefix
 
-	echo "tag-zero-lines" >expect &&
-	git tag -l | grep "^tag-zero-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n0 -l | grep "^tag-zero-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n0 -l tag-zero-lines >actual &&
-	test_cmp expect actual &&
+expecting success of 7300.7 'git clean with relative prefix': 
 
-	echo "tag-zero-lines  " >expect &&
-	git tag -n1 -l | grep "^tag-zero-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n -l | grep "^tag-zero-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n1 -l tag-zero-lines >actual &&
-	test_cmp expect actual &&
-	git tag -n2 -l tag-zero-lines >actual &&
-	test_cmp expect actual &&
-	git tag -n999 -l tag-zero-lines >actual &&
-	test_cmp expect actual
+	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 82 - listing the zero-lines message of a non-signed tag should succeed
+ok 7 - git clean with relative prefix
 
-expecting success of 7004.83 'listing many message lines of a non-signed tag should succeed': 
-	echo "tag line one" >annotagmsg &&
-	echo "tag line two" >>annotagmsg &&
-	echo "tag line three" >>annotagmsg  &&
-	git tag -F annotagmsg tag-lines &&
+expecting success of 7300.8 'git clean with absolute path': 
 
-	echo "tag-lines" >expect &&
-	git tag -l | grep "^tag-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n0 -l | grep "^tag-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n0 -l tag-lines >actual &&
-	test_cmp expect actual &&
+	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
 
-	echo "tag-lines       tag line one" >expect &&
-	git tag -n1 -l | grep "^tag-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n -l | grep "^tag-lines" >actual &&
-	test_cmp expect actual &&
-	git tag -n1 -l tag-lines >actual &&
-	test_cmp expect actual &&
+ok 8 - git clean with absolute path
 
-	echo "    tag line two" >>expect &&
-	git tag -n2 -l | grep "^ *tag.line" >actual &&
-	test_cmp expect actual &&
-	git tag -n2 -l tag-lines >actual &&
-	test_cmp expect actual &&
+expecting success of 7300.9 'git clean with out of work tree relative path': 
 
-	echo "    tag line three" >>expect &&
-	git tag -n3 -l | grep "^ *tag.line" >actual &&
-	test_cmp expect actual &&
-	git tag -n3 -l tag-lines >actual &&
-	test_cmp expect actual &&
-	git tag -n4 -l | grep "^ *tag.line" >actual &&
-	test_cmp expect actual &&
-	git tag -n4 -l tag-lines >actual &&
-	test_cmp expect actual &&
-	git tag -n99 -l | grep "^ *tag.line" >actual &&
-	test_cmp expect actual &&
-	git tag -n99 -l tag-lines >actual &&
-	test_cmp expect actual
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	(
+		cd docs &&
+		test_must_fail git clean -n ../..
+	)
 
-ok 83 - listing many message lines of a non-signed tag should succeed
+fatal: ../..: '../..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean'
+ok 9 - git clean with out of work tree relative path
 
-expecting success of 7004.84 'annotations for blobs are empty': 
-	blob=$(git hash-object -w --stdin <<-\EOF
-	Blob paragraph 1.
+expecting success of 7300.10 'git clean with out of work tree absolute path': 
 
-	Blob paragraph 2.
-	EOF
-	) &&
-	git tag tag-blob $blob &&
-	echo "tag-blob        " >expect &&
-	git tag -n1 -l tag-blob >actual &&
-	test_cmp expect actual
+	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
+	)
 
-ok 84 - annotations for blobs are empty
+fatal: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean'
+ok 10 - git clean with out of work tree absolute path
 
-expecting success of 7004.85 'git tag --format with ahead-behind': 
-	test_when_finished git reset --hard tag-one-line &&
-	git commit --allow-empty -m "left" &&
-	git tag -a -m left tag-left &&
-	git reset --hard HEAD~1 &&
-	git commit --allow-empty -m "right" &&
-	git tag -a -m left tag-right &&
+expecting success of 7300.11 'git clean -d with prefix and path': 
 
-	# Use " !" at the end to demonstrate whitespace
-	# around empty ahead-behind token for tag-blob.
-	cat >expect <<-EOF &&
-	refs/tags/tag-blob  !
-	refs/tags/tag-left 1 1 !
-	refs/tags/tag-lines 0 1 !
-	refs/tags/tag-one-line 0 1 !
-	refs/tags/tag-right 0 0 !
-	refs/tags/tag-with-edited-file-message-and-trailers 0 1 !
-	refs/tags/tag-with-edited-inline-message-and-trailers 0 1 !
-	refs/tags/tag-with-file-message-and-trailers 0 1 !
-	refs/tags/tag-with-inline-message-and-trailers 0 1 !
-	refs/tags/tag-with-trailers-and-no-message 0 1 !
-	refs/tags/tag-zero-lines 0 1 !
-	EOF
-	git tag -l --format="%(refname) %(ahead-behind:HEAD) !" >actual 2>err &&
-	grep "refs/tags/tag" actual >actual.focus &&
-	test_cmp expect actual.focus &&
+	mkdir -p build docs src/feature &&
+	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
+	(cd src/ && git clean -d feature/) &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_missing src/feature/file.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-	# Error reported for tags that point to non-commits.
-	grep "error: object [0-9a-f]* is a blob, not a commit" err
 
-[main e4512a0] left
- Author: A U Thor <author@example.com>
-HEAD is now at 86e17e4 Foo
-[main 1d485fd] right
- Author: A U Thor <author@example.com>
-error: object fc33d716ad1ef3e46e3c05586c188aef7c225de9 is a blob, not a commit
-HEAD is now at 86e17e4 Foo
-ok 85 - git tag --format with ahead-behind
+Removing feature/
+ok 11 - git clean -d with prefix and path
 
-checking prerequisite: GPG
+checking prerequisite: SYMLINKS
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
 (
-	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-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
 )
-prerequisite GPG not satisfied
-ok 86 # skip trying to verify an annotated non-signed tag should fail (missing GPG)
+prerequisite SYMLINKS ok
+expecting success of 7300.12 'git clean symbolic link': 
 
-ok 87 # skip trying to verify a file-annotated non-signed tag should fail (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	ln -s docs/manual.txt src/part4.c &&
+	git clean &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-ok 88 # skip trying to verify two annotated non-signed tags should fail (missing GPG)
 
-ok 89 # skip creating a signed tag with -m message should succeed (missing GPG)
+Removing a.out
+Removing src/part3.c
+Removing src/part4.c
+ok 12 - git clean symbolic link
 
-ok 90 # skip sign with a given key id (missing GPG)
+expecting success of 7300.13 'git clean with wildcard': 
 
-ok 91 # skip sign with an unknown id (1) (missing GPG)
+	touch a.clean b.clean other.c &&
+	git clean "*.clean" &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.clean &&
+	test_path_is_missing b.clean &&
+	test_path_is_file other.c
 
-ok 92 # skip sign with an unknown id (2) (missing GPG)
 
-ok 93 # skip -u implies signed tag (missing GPG)
+Removing a.clean
+Removing b.clean
+ok 13 - git clean with wildcard
 
-ok 94 # skip creating a signed tag with -F messagefile should succeed (missing GPG)
+expecting success of 7300.14 'git clean -n': 
 
-ok 95 # skip creating a signed tag with -F - should succeed (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-ok 96 # skip -s implies annotated tag (missing GPG)
 
-ok 97 # skip git tag -s implied if configured with tag.forcesignannotated (missing GPG)
+Would remove a.out
+Would remove other.c
+Would remove src/part3.c
+ok 14 - git clean -n
 
-ok 98 # skip lightweight with no message when configured with tag.forcesignannotated (missing GPG)
+expecting success of 7300.15 'git clean -d': 
 
-ok 99 # skip git tag -a disable configured tag.forcesignannotated (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing docs &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-ok 100 # skip git tag --sign enable GPG sign (missing GPG)
 
-ok 101 # skip git tag configured tag.gpgsign enables GPG sign (missing GPG)
+Removing a.out
+Removing docs/
+Removing other.c
+Removing src/part3.c
+Removing src/test/
+ok 15 - git clean -d
 
-ok 102 # skip git tag --no-sign configured tag.gpgsign skip GPG sign (missing GPG)
+expecting success of 7300.16 'git clean -d src/ examples/': 
 
-ok 103 # skip trying to create a signed tag with non-existing -F file should fail (missing GPG)
+	mkdir -p build docs examples &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
+	git clean -d src/ examples/ &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing examples/1.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-ok 104 # skip verifying a signed tag should succeed (missing GPG)
 
-ok 105 # skip verifying two signed tags in one command should succeed (missing GPG)
+Removing examples/
+Removing src/part3.c
+ok 16 - git clean -d src/ examples/
 
-ok 106 # skip verifying many signed and non-signed tags should fail (missing GPG)
+expecting success of 7300.17 'git clean -x': 
 
-ok 107 # skip verifying a forged tag should fail (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -x &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_file build/lib.so
 
-ok 108 # skip verifying a proper tag with --format pass and format accordingly (missing GPG)
 
-ok 109 # skip verifying a forged tag with --format should fail silently (missing GPG)
+Removing a.out
+Removing obj.o
+Removing src/part3.c
+ok 17 - git clean -x
 
-ok 110 # skip creating a signed tag with an empty -m message should succeed (missing GPG)
+expecting success of 7300.18 'git clean -d -x': 
 
-ok 111 # skip creating a signed tag with an empty -F messagefile should succeed (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing docs &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-ok 112 # skip extra blanks in the message for a signed tag should be removed (missing GPG)
 
-ok 113 # skip creating a signed tag with a blank -m message should succeed (missing GPG)
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+Removing src/part3.c
+ok 18 - git clean -d -x
 
-ok 114 # skip creating a signed tag with blank -F file with spaces should succeed (missing GPG)
+expecting success of 7300.19 'git clean -d -x with ignored tracked directory': 
 
-ok 115 # skip creating a signed tag with spaces and no newline should succeed (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x -e src &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_missing docs &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-ok 116 # skip signed tag with embedded PGP message (missing GPG)
 
-ok 117 # skip creating a signed tag with a -F file with #comments should succeed (missing GPG)
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+ok 19 - git clean -d -x with ignored tracked directory
 
-ok 118 # skip creating a signed tag with #commented -m message should succeed (missing GPG)
+expecting success of 7300.20 'git clean -X': 
 
-ok 119 # skip creating a signed tag with #commented -F messagefile should succeed (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -X &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_file build/lib.so
 
-ok 120 # skip creating a signed tag with a #comment and no newline should succeed (missing GPG)
 
-ok 121 # skip listing the one-line message of a signed tag should succeed (missing GPG)
+Removing obj.o
+ok 20 - git clean -X
 
-ok 122 # skip listing the zero-lines message of a signed tag should succeed (missing GPG)
+expecting success of 7300.21 'git clean -d -X': 
 
-ok 123 # skip listing many message lines of a signed tag should succeed (missing GPG)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-ok 124 # skip creating a signed tag pointing to a tree should succeed (missing GPG)
 
-ok 125 # skip creating a signed tag pointing to a blob should succeed (missing GPG)
+Removing build/
+Removing obj.o
+ok 21 - git clean -d -X
 
-ok 126 # skip creating a signed tag pointing to another tag should succeed (missing GPG)
+expecting success of 7300.22 'git clean -d -X with ignored tracked directory': 
 
-checking prerequisite: RFC1991
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X -e src &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-RFC1991" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-RFC1991" &&
-	test_have_prereq GPG &&
-	echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null
 
-)
-prerequisite RFC1991 not satisfied
-ok 127 # skip creating a signed tag with rfc1991 (missing RFC1991,GPG of GPG,RFC1991)
+Removing build/
+Removing obj.o
+Removing src/part3.c
+ok 22 - git clean -d -X with ignored tracked directory
 
-ok 128 # skip reediting a signed tag body omits signature (missing RFC1991,GPG of GPG,RFC1991)
+expecting success of 7300.23 'clean.requireForce defaults to true': 
 
-ok 129 # skip verifying rfc1991 signature (missing RFC1991,GPG of GPG,RFC1991)
+	git config --unset clean.requireForce &&
+	test_must_fail git clean
 
-ok 130 # skip list tag with rfc1991 signature (missing RFC1991,GPG of GPG,RFC1991)
 
-ok 131 # skip verifying rfc1991 signature without --rfc1991 (missing RFC1991,GPG of GPG,RFC1991)
+fatal: clean.requireForce is true and -f not given: refusing to clean
+ok 23 - clean.requireForce defaults to true
 
-ok 132 # skip list tag with rfc1991 signature without --rfc1991 (missing RFC1991,GPG of GPG,RFC1991)
+expecting success of 7300.24 'clean.requireForce': 
 
-ok 133 # skip reediting a signed tag body omits signature (missing RFC1991,GPG of GPG,RFC1991)
+	git config clean.requireForce true &&
+	test_must_fail git clean
 
-ok 134 # skip git tag -s fails if gpg is misconfigured (bad key) (missing GPG)
 
-ok 135 # skip git tag -s fails if gpg is misconfigured (bad signature format) (missing GPG)
+fatal: clean.requireForce is true and -f not given: refusing to clean
+ok 24 - clean.requireForce
 
-ok 136 # skip git verifies tag is valid with double signature (missing GPG)
+expecting success of 7300.25 'clean.requireForce and -n': 
 
-checking prerequisite: GPGSM
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
-	test_have_prereq GPG &&
-	# Available key info:
-	# * see t/lib-gpg/gpgsm-gen-key.in
-	# To generate new certificate:
-	#  * no passphrase
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		-o /tmp/gpgsm.crt.user \
-	#		--generate-key \
-	#		--batch t/lib-gpg/gpgsm-gen-key.in
-	# To import certificate:
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		--import /tmp/gpgsm.crt.user
-	# To export into a .p12 we can later import:
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		-o t/lib-gpg/gpgsm_cert.p12 \
-	#		--export-secret-key-p12 "committer@example.com"
-	echo | gpgsm --homedir "${GNUPGHOME}" \
-		--passphrase-fd 0 --pinentry-mode loopback \
-		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
 
-	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
-	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
-		>"${GNUPGHOME}/trustlist.txt" &&
-	(gpgconf --reload all || : ) &&
+Would remove a.out
+Would remove src/part3.c
+ok 25 - clean.requireForce and -n
 
-	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-	       -u committer@example.com -o /dev/null --sign -
+expecting success of 7300.26 'clean.requireForce and -f': 
 
-)
-prerequisite GPGSM not satisfied
-ok 137 # skip git tag -s fails if gpgsm is misconfigured (bad key) (missing GPGSM)
+	git clean -f &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-ok 138 # skip git tag -s fails if gpgsm is misconfigured (bad signature format) (missing GPGSM)
 
-ok 139 # skip verify signed tag fails when public key is not present (missing GPG)
+Removing a.out
+Removing src/part3.c
+ok 26 - clean.requireForce and -f
 
-expecting success of 7004.140 'git tag -a fails if tag annotation is empty': 
-	! (GIT_EDITOR=cat git tag -a initial-comment)
+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
 
-#
-# Write a message for tag:
-#   initial-comment
-# Lines starting with '#' will be ignored.
-fatal: no tag message?
-ok 140 - git tag -a fails if tag annotation is empty
+expecting success of 7300.28 'core.excludesfile': 
 
-expecting success of 7004.141 'message in editor has initial comment': 
-	! (GIT_EDITOR=cat git tag -a initial-comment >actual)
+	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
 
-fatal: no tag message?
-ok 141 - message in editor has initial comment
 
-expecting success of 7004.142 'message in editor has initial comment: first line': 
-	# check the first line --- should be empty
-	echo >first.expect &&
-	sed -e 1q <actual >first.actual &&
-	test_cmp first.expect first.actual
+ok 28 - core.excludesfile
 
-ok 142 - message in editor has initial comment: first line
+checking prerequisite: SANITY
 
-expecting success of 7004.143 'message in editor has initial comment: remainder': 
-	# remove commented lines from the remainder -- should be empty
-	sed -e 1d -e "/^#/d" <actual >rest.actual &&
-	test_must_be_empty rest.actual
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-ok 143 - message in editor has initial comment: remainder
+	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 7004.144 'overwriting an annotated tag should use its previous body': 
-	get_tag_header reuse $commit commit $time >expect &&
-	echo "An annotation to be reused" >>expect &&
-	git tag -a -m "An annotation to be reused" reuse &&
-	GIT_EDITOR=true git tag -f -a reuse &&
-	get_tag_msg reuse >actual &&
-	test_cmp expect actual
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-ok 144 - overwriting an annotated tag should use its previous body
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 7004.145 'filename for the message is relative to cwd': 
-	mkdir subdir &&
-	echo "Tag message in top directory" >msgfile-5 &&
-	echo "Tag message in sub directory" >subdir/msgfile-5 &&
-	(
-		cd subdir &&
-		git tag -a -F msgfile-5 tag-from-subdir
-	) &&
-	git cat-file tag tag-from-subdir | grep "in sub directory"
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 7300.29 'removal failure': 
 
-Tag message in sub directory
-ok 145 - filename for the message is relative to cwd
+	mkdir foo &&
+	touch foo/bar &&
+	test_when_finished "chmod 755 foo" &&
+	(exec <foo/bar &&
+	 chmod 0 foo &&
+	 test_must_fail git clean -f -d)
 
-expecting success of 7004.146 'filename for the message is relative to cwd': 
-	echo "Tag message in sub directory" >subdir/msgfile-6 &&
+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 subdir &&
-		git tag -a -F msgfile-6 tag-from-subdir-2
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
 	) &&
-	git cat-file tag tag-from-subdir-2 | grep "in sub directory"
-
-Tag message in sub directory
-ok 146 - filename for the message is relative to cwd
-
-expecting success of 7004.147 'creating second commit and tag': 
-	hash1=$(git rev-parse HEAD) &&
-	echo foo-2.0 >foo &&
-	git add foo &&
-	git commit -m second &&
-	git tag v2.0
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -d &&
+	test_path_is_file foo/.git/index &&
+	test_path_is_file foo/hello.world &&
+	test_path_is_file baz/boo/.git/index &&
+	test_path_is_file baz/boo/deeper.world &&
+	test_path_is_missing bar
 
-[main d3200cb] second
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/foo/.git/
+[master (root-commit) abd8674] nested
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 147 - creating second commit and tag
-
-expecting success of 7004.148 'creating third commit without tag': 
-	hash2=$(git rev-parse HEAD) &&
-	echo foo-dev >foo &&
-	git add foo &&
-	git commit -m third
-
-[main c282771] third
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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(+), 1 deletion(-)
-ok 148 - creating third commit without tag
+ 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 7004.149 'checking that first commit is in all tags (hash)': 
-	hash3=$(git rev-parse HEAD) &&
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
+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
-	git tag -l --contains $hash1 v* >actual &&
-	test_cmp expected actual
-
-ok 149 - checking that first commit is in all tags (hash)
-
-expecting success of 7004.150 'checking that first commit is in all tags (tag)': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
+	cp -r almost_git/.git/ almost_bare_git &&
+	mkdir almost_submodule/ &&
+	cat >almost_submodule/.git <<-\EOF &&
+	garbage
 	EOF
-	git tag -l --contains v1.0 v* >actual &&
-	test_cmp expected actual
+	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
 
-ok 150 - checking that first commit is in all tags (tag)
+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 7004.151 'checking that first commit is in all tags (relative)': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
-	EOF
-	git tag -l --contains HEAD~2 v* >actual &&
-	test_cmp expected actual
+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
 
-ok 151 - checking that first commit is in all tags (relative)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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 7004.152 'checking that first commit is not listed in any tag with --no-contains  (hash)': 
-	git tag -l --no-contains $hash1 v* >actual &&
-	test_must_be_empty actual
+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
 
-ok 152 - checking that first commit is not listed in any tag with --no-contains  (hash)
+Skipping repository baz/boo
+Removing to_clean/
+ok 33 - should avoid cleaning possible submodules
 
-expecting success of 7004.153 'checking that first commit is in all tags (tag)': 
-	git tag -l --no-contains v1.0 v* >actual &&
-	test_must_be_empty actual
+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
 
-ok 153 - checking that first commit is in all tags (tag)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7004.154 'checking that first commit is in all tags (relative)': 
-	git tag -l --no-contains HEAD~2 v* >actual &&
-	test_must_be_empty actual
+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
 
-ok 154 - checking that first commit is in all tags (relative)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 7004.155 'checking that second commit only has one tag': 
-	cat >expected <<-\EOF &&
-	v2.0
-	EOF
-	git tag -l --contains $hash2 v* >actual &&
-	test_cmp expected actual
+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
 
-ok 155 - checking that second commit only has one tag
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/strange_bare/.git/
+Skipping repository baz/boo
+Path exists:
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Mar 14 13:35 strange_bare
+not ok 36 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
-expecting success of 7004.156 'inverse of the last test, with --no-contains': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	EOF
-	git tag -l --no-contains $hash2 v* >actual &&
-	test_cmp expected actual
+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
 
-ok 156 - inverse of the last test, with --no-contains
+Cloning into bare repository 'strange_bare/.git'...
+done.
+Skipping repository baz/boo
+Path exists:
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Mar 14 13:35 strange_bare
+not ok 37 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
-expecting success of 7004.157 'checking that third commit has no tags': 
-	git tag -l --contains $hash3 v* >actual &&
-	test_must_be_empty actual
+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
 
-ok 157 - checking that third commit has no tags
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7004.158 'conversely --no-contains on the third commit lists all tags': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
-	EOF
-	git tag -l --no-contains $hash3 v* >actual &&
-	test_cmp expected actual
+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/
 
-ok 158 - conversely --no-contains on the third commit lists all tags
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7004.159 'creating simple branch': 
-	git branch stable v2.0 &&
-        git checkout stable &&
-	echo foo-3.0 >foo &&
-	git commit foo -m fourth &&
-	git tag v3.0
+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/
 
-Switched to branch 'stable'
-[stable 820ea75] fourth
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 159 - creating simple branch
-
-expecting success of 7004.160 'checking that branch head only has one tag': 
-	hash4=$(git rev-parse HEAD) &&
-	cat >expected <<-\EOF &&
-	v3.0
-	EOF
-	git tag -l --contains $hash4 v* >actual &&
-	test_cmp expected actual
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+ok 40 - giving path to nested .git/ will NOT remove contents
 
-ok 160 - checking that branch head only has one tag
+expecting success of 7300.41 'force removal of nested git work tree': 
+	rm -fr foo bar baz &&
+	mkdir -p foo bar baz/boo &&
+	(
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
+	) &&
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -f -d &&
+	test_path_is_missing foo &&
+	test_path_is_missing bar &&
+	test_path_is_missing baz
 
-expecting success of 7004.161 'checking that branch head with --no-contains lists all but one tag': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
-	EOF
-	git tag -l --no-contains $hash4 v* >actual &&
-	test_cmp expected actual
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7300-clean/baz/boo/.git/
+[master (root-commit) 3f7f1fc] deeply.nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deeper.world
+Removing actual
+Removing bar/
+Removing baz/
+Removing empty_repo/
+Removing expect
+Removing foo/
+Removing repo/
+Removing strange_bare/
+Removing sub2/
+Removing untracked/
+ok 41 - force removal of nested git work tree
 
-ok 161 - checking that branch head with --no-contains lists all but one tag
+expecting success of 7300.42 'git clean -e': 
+	rm -fr repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		touch known 1 2 3 &&
+		git add known &&
+		git clean -f -e 1 -e 2 &&
+		test_path_exists 1 &&
+		test_path_exists 2 &&
+		test_path_is_missing 3 &&
+		test_path_exists known
+	)
 
-expecting success of 7004.162 'merging original branch into this branch': 
-	git merge --strategy=ours main &&
-        git tag v4.0
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/repo/.git/
+Removing 3
+ok 42 - git clean -e
 
-Merge made by the 'ours' strategy.
-ok 162 - merging original branch into this branch
+expecting success of 7300.43 'git clean -d with an unreadable empty directory': 
+	mkdir foo &&
+	chmod a= foo &&
+	git clean -dfx foo &&
+	test_path_is_missing foo
 
-expecting success of 7004.163 'checking that original branch head has one tag now': 
-	cat >expected <<-\EOF &&
-	v4.0
-	EOF
-	git tag -l --contains $hash3 v* >actual &&
-	test_cmp expected actual
+warning: could not open directory 'foo/': Permission denied
+Removing foo/
+ok 43 - git clean -d with an unreadable empty directory
 
-ok 163 - checking that original branch head has one tag now
+expecting success of 7300.44 'git clean -d respects pathspecs (dir is prefix of pathspec)': 
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foobar &&
+	test_path_is_dir foo &&
+	test_path_is_missing foobar
 
-expecting success of 7004.164 'checking that original branch head with --no-contains lists all but one tag now': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
-	v3.0
-	EOF
-	git tag -l --no-contains $hash3 v* >actual &&
-	test_cmp expected actual
+Removing foobar/
+ok 44 - git clean -d respects pathspecs (dir is prefix of pathspec)
 
-ok 164 - checking that original branch head with --no-contains lists all but one tag now
+expecting success of 7300.45 'git clean -d respects pathspecs (pathspec is prefix of dir)': 
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foo &&
+	test_path_is_missing foo &&
+	test_path_is_dir foobar
 
-expecting success of 7004.165 'checking that initial commit is in all tags': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
-	v3.0
-	v4.0
-	EOF
-	git tag -l --contains $hash1 v* >actual &&
-	test_cmp expected actual
+Removing foo/
+ok 45 - git clean -d respects pathspecs (pathspec is prefix of dir)
 
-ok 165 - checking that initial commit is in all tags
+expecting success of 7300.46 'git clean -d skips untracked dirs containing ignored files': 
+	echo /foo/bar >.gitignore &&
+	echo ignoreme >>.gitignore &&
+	rm -rf foo &&
+	mkdir -p foo/a/aa/aaa foo/b/bb/bbb &&
+	touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 &&
+	git clean -df &&
+	test_path_is_dir foo &&
+	test_path_is_file foo/bar &&
+	test_path_is_missing foo/baz &&
+	test_path_is_file foo/a/aa/ignoreme &&
+	test_path_is_missing foo/a/aa/aaa &&
+	test_path_is_file foo/b/ignoreme &&
+	test_path_is_missing foo/b/bb
 
-expecting success of 7004.166 'checking that --contains can be used in non-list mode': 
-	cat >expected <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	v2.0
-	v3.0
-	v4.0
-	EOF
-	git tag --contains $hash1 v* >actual &&
-	test_cmp expected actual
+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
 
-ok 166 - checking that --contains can be used in non-list mode
+expecting success of 7300.47 'git clean -d skips nested repo containing ignored files': 
+	test_when_finished "rm -rf nested-repo-with-ignored-file" &&
 
-expecting success of 7004.167 'checking that initial commit is in all tags with --no-contains': 
-	git tag -l --no-contains $hash1 v* >actual &&
-	test_must_be_empty actual
+	git init nested-repo-with-ignored-file &&
+	(
+		cd nested-repo-with-ignored-file &&
+		>file &&
+		git add file &&
+		git commit -m Initial &&
 
-ok 167 - checking that initial commit is in all tags with --no-contains
+		# This file is ignored by a .gitignore rule in the outer repo
+		# added in the previous test.
+		>ignoreme
+	) &&
 
-expecting success of 7004.168 'mixing incompatibles modes and options is forbidden': 
-	test_must_fail git tag -a &&
-	test_must_fail git tag -a -l &&
-	test_must_fail git tag -s &&
-	test_must_fail git tag -s -l &&
-	test_must_fail git tag -m &&
-	test_must_fail git tag -m -l &&
-	test_must_fail git tag -m "hlagh" &&
-	test_must_fail git tag -m "hlagh" -l &&
-	test_must_fail git tag -F &&
-	test_must_fail git tag -F -l &&
-	test_must_fail git tag -f &&
-	test_must_fail git tag -f -l &&
-	test_must_fail git tag -a -s -m -F &&
-	test_must_fail git tag -a -s -m -F -l &&
-	test_must_fail git tag -l -v &&
-	test_must_fail git tag -l -d &&
-	test_must_fail git tag -l -v -d &&
-	test_must_fail git tag -n 100 -v &&
-	test_must_fail git tag -l -m msg &&
-	test_must_fail git tag -l -F some file &&
-	test_must_fail git tag -v -s &&
-	test_must_fail git tag --contains tag-tree &&
-	test_must_fail git tag --contains tag-blob &&
-	test_must_fail git tag --no-contains tag-tree &&
-	test_must_fail git tag --no-contains tag-blob &&
-	test_must_fail git tag --contains --no-contains &&
-	test_must_fail git tag --no-with HEAD &&
-	test_must_fail git tag --no-without HEAD
+	git clean -fd &&
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+	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
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+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
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+Removing d1/ut
+Removing d2/ut
+ok 48 - git clean handles being told what to clean
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+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
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+Removing d1/ut
+Removing d2/ut
+ok 49 - git clean handles being told what to clean, with -d
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+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
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+Removing d1/ut
+Removing d2/ut
+ok 50 - git clean works if a glob is passed without -d
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+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
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+Removing d1/ut
+Removing d2/ut
+ok 51 - git clean works if a glob is passed with -d
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+ok 52 # skip handle clean & core.longpaths = false nicely (missing MINGW)
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+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
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/untracked/.git/
+Removing dir/file.txt
+ok 53 - clean untracked paths by pathspec
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+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 &&
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+		mkdir -p untracked/subdir/with/a &&
+		>untracked/subdir/with/a/random-file.txt &&
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+		git clean -ffdxn -e untracked
+	) &&
 
-error: switch `m' requires a value
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+	# 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
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/avoid-traversing-deep-hierarchy/.git/
+ok 54 - avoid traversing into ignored directories
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+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 &&
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+		git clean -fX modules/foobar >../output &&
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+		grep Removing ../output &&
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+		test_path_is_missing modules/foobar/src/generated/code.c &&
+		test_path_is_file modules/foobar/Makefile
+	)
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+# still have 2 known breakage(s)
+# passed all remaining 53 test(s)
+1..55
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7006-pager.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+ok 1 - determine default pager
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+expecting success of 7006.2 'setup': 
+	sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
+	test_unconfig core.pager &&
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+	PAGER="cat >paginated.out" &&
+	export PAGER &&
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+	test_commit initial
 
-error: switch `F' requires a value
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+[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
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+checking prerequisite: TTY
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+	# 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 &&
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+)
+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
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+ok 3 - some commands use a pager
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+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
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+ls: cannot access 'subdir/paginated.out': No such file or directory
+--- expected	2026-03-14 13:34:54.830677808 +0000
++++ actual	2026-03-14 13:34:55.006677808 +0000
+@@ -1 +1 @@
+-subdir/paginated.out
++paginated.out
+not ok 4 - pager runs from subdir # TODO known breakage
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+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 &&
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+		test_terminal git log
+	) &&
+	grep ^LESS= pager-env.out &&
+	grep ^LV= pager-env.out
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+      5      20     248
+LESS=FRX
+LV=-c
+ok 5 - LESS and LV envvars are set for pagination
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+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
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+      0       0       0
+LESS=FRX
+LV=-c
+ok 6 - LESS and LV envvars set by git-sh-setup
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+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
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+ok 7 - some commands do not use a pager
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+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
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+    initial
+ok 8 - no pager when stdout is a pipe
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+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
 
-error: options '-v' and '-l' cannot be used together
-error: options '-d' and '-l' cannot be used together
-error: options '-v' and '-l' cannot be used together
-fatal: the '-n' option is only allowed in list mode
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+ok 9 - no pager when stdout is a regular file
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+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
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+ok 10 - git --paginate rev-list uses a pager
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+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
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+    initial
+ok 11 - no pager even with --paginate when stdout is a pipe
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+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
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380 (HEAD -> master, tag: initial)
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+    initial
+ok 12 - no pager with --no-pager
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+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 &&
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+	rm -f paginated.out &&
+	test_config pager.grep false &&
+	test_terminal git grep initial &&
+	test_path_is_missing paginated.out
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+initial.t:initial
+ok 13 - configuration can disable pager
 
-error: malformed object name tag-tree
-error: object fc33d716ad1ef3e46e3c05586c188aef7c225de9 is a blob, not a commit
-error: no such commit tag-blob
-error: malformed object name tag-tree
-error: object fc33d716ad1ef3e46e3c05586c188aef7c225de9 is a blob, not a commit
-error: no such commit tag-blob
-error: malformed object name --no-contains
-error: unknown option `no-with'
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+expecting success of 7006.14 'configuration can enable pager (from subdir)': 
+	rm -f paginated.out &&
+	mkdir -p subdir &&
+	test_config pager.bundle true &&
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+	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
+	}
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+ok 14 - configuration can enable pager (from subdir)
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+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
 
-error: unknown option `no-without'
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-               [(--trailer <token>[(=|:)<value>])...]
-               <tagname> [<commit> | <object>]
-   or: git tag -d <tagname>...
-   or: git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
-               [--points-at <object>] [--column[=<options>] | --no-column]
-               [--create-reflog] [--sort=<key>] [--format=<format>]
-               [--merged <commit>] [--no-merged <commit>] [<pattern>...]
-   or: git tag -v [--format=<format>] <tagname>...
+ok 15 - git tag -l defaults to paging
 
-    -l, --list            list tag names
-    -n[<n>]               print <n> lines of each tag message
-    -d, --delete          delete tags
-    -v, --verify          verify tags
+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
 
-Tag creation options
-    -a, --[no-]annotate   annotated tag, needs a message
-    -m, --message <message>
-                          tag message
-    -F, --[no-]file <file>
-                          read message from file
-    --trailer <trailer>   add custom trailer(s)
-    -e, --[no-]edit       force edit of tag message
-    -s, --[no-]sign       annotated and GPG-signed tag
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    -u, --[no-]local-user <key-id>
-                          use another key to sign the tag
-    -f, --[no-]force      replace the tag if exists
-    --[no-]create-reflog  create a reflog
+initial
+ok 16 - git tag -l respects pager.tag
 
-Tag listing options
-    --[no-]column[=<style>]
-                          show tag list in columns
-    --contains <commit>   print only tags that contain the commit
-    --no-contains <commit>
-                          print only tags that don't contain the commit
-    --merged <commit>     print only tags that are merged
-    --no-merged <commit>  print only tags that are not merged
-    --[no-]omit-empty     do not output a newline after empty formatted refs
-    --[no-]sort <key>     field name to sort on
-    --[no-]points-at <object>
-                          print only tags of the object
-    --[no-]format <format>
-                          format to use for the output
-    --[no-]color[=<when>] respect format colors
-    -i, --[no-]ignore-case
-                          sorting and filtering are case insensitive
+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
 
-ok 168 - mixing incompatibles modes and options is forbidden
+initial
+ok 17 - git tag -l respects --no-pager
 
-expecting success of 7004.169 'mixing incompatible modes with --contains is forbidden': 
-		test_must_fail git tag -d $option HEAD &&
-		test_must_fail git tag -d $option HEAD some-tag &&
-		test_must_fail git tag -v $option HEAD
-	
-fatal: the '--contains' option is only allowed in list mode
-fatal: the '--contains' option is only allowed in list mode
-fatal: the '--contains' option is only allowed in list mode
-ok 169 - mixing incompatible modes with --contains is forbidden
+expecting success of 7006.18 'git tag with no args defaults to paging': 
+	# no args implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git tag &&
+	test_path_is_file paginated.out
 
-expecting success of 7004.170 'Doing 'git tag --list-like --contains <commit> <pattern> is permitted': 
-		git tag -n $option HEAD HEAD &&
-		git tag $option HEAD HEAD &&
-		git tag $option
-	
-v4.0
-ok 170 - Doing 'git tag --list-like --contains <commit> <pattern> is permitted
+ok 18 - git tag with no args defaults to paging
 
-expecting success of 7004.171 'mixing incompatible modes with --with is forbidden': 
-		test_must_fail git tag -d $option HEAD &&
-		test_must_fail git tag -d $option HEAD some-tag &&
-		test_must_fail git tag -v $option HEAD
-	
-fatal: the '--contains' option is only allowed in list mode
-fatal: the '--contains' option is only allowed in list mode
-fatal: the '--contains' option is only allowed in list mode
-ok 171 - mixing incompatible modes with --with is forbidden
+expecting success of 7006.19 'git tag with no args respects pager.tag': 
+	# no args implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false tag &&
+	test_path_is_missing paginated.out
 
-expecting success of 7004.172 'Doing 'git tag --list-like --with <commit> <pattern> is permitted': 
-		git tag -n $option HEAD HEAD &&
-		git tag $option HEAD HEAD &&
-		git tag $option
-	
-v4.0
-ok 172 - Doing 'git tag --list-like --with <commit> <pattern> is permitted
+initial
+ok 19 - git tag with no args respects pager.tag
 
-expecting success of 7004.173 'mixing incompatible modes with --no-contains is forbidden': 
-		test_must_fail git tag -d $option HEAD &&
-		test_must_fail git tag -d $option HEAD some-tag &&
-		test_must_fail git tag -v $option HEAD
-	
-fatal: the '--no-contains' option is only allowed in list mode
-fatal: the '--no-contains' option is only allowed in list mode
-fatal: the '--no-contains' option is only allowed in list mode
-ok 173 - mixing incompatible modes with --no-contains is forbidden
+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
 
-expecting success of 7004.174 'Doing 'git tag --list-like --no-contains <commit> <pattern> is permitted': 
-		git tag -n $option HEAD HEAD &&
-		git tag $option HEAD HEAD &&
-		git tag $option
-	
-100
-a1
-aa1
-annotated-tag
-annotated-tag-edit
-blank-annotated-tag
-blankfile-annotated-tag
-blanknonlfile-annotated-tag
-blanks-annotated-tag
-cba
-comment-annotated-tag
-commentfile-annotated-tag
-commentnonlfile-annotated-tag
-comments-annotated-tag
-empty-annotated-tag
-emptyfile-annotated-tag
-file-annotated-tag
-file-annotated-tag-edit
-non-annotated-tag
-reuse
-stdin-annotated-tag
-t210
-t211
-tag-from-subdir
-tag-from-subdir-2
-tag-left
-tag-lines
-tag-one-line
-tag-right
-tag-with-edited-file-message-and-trailers
-tag-with-edited-inline-message-and-trailers
-tag-with-file-message-and-trailers
-tag-with-inline-message-and-trailers
-tag-with-trailers-and-no-message
-tag-zero-lines
-v0.2.1
-v1.0
-v1.0.1
-v1.1.3
-v2.0
-v3.0
-ok 174 - Doing 'git tag --list-like --no-contains <commit> <pattern> is permitted
+ok 20 - git tag --contains defaults to paging
 
-expecting success of 7004.175 'mixing incompatible modes with --without is forbidden': 
-		test_must_fail git tag -d $option HEAD &&
-		test_must_fail git tag -d $option HEAD some-tag &&
-		test_must_fail git tag -v $option HEAD
-	
-fatal: the '--no-contains' option is only allowed in list mode
-fatal: the '--no-contains' option is only allowed in list mode
-fatal: the '--no-contains' option is only allowed in list mode
-ok 175 - mixing incompatible modes with --without is forbidden
+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
 
-expecting success of 7004.176 'Doing 'git tag --list-like --without <commit> <pattern> is permitted': 
-		git tag -n $option HEAD HEAD &&
-		git tag $option HEAD HEAD &&
-		git tag $option
-	
-100
-a1
-aa1
-annotated-tag
-annotated-tag-edit
-blank-annotated-tag
-blankfile-annotated-tag
-blanknonlfile-annotated-tag
-blanks-annotated-tag
-cba
-comment-annotated-tag
-commentfile-annotated-tag
-commentnonlfile-annotated-tag
-comments-annotated-tag
-empty-annotated-tag
-emptyfile-annotated-tag
-file-annotated-tag
-file-annotated-tag-edit
-non-annotated-tag
-reuse
-stdin-annotated-tag
-t210
-t211
-tag-from-subdir
-tag-from-subdir-2
-tag-left
-tag-lines
-tag-one-line
-tag-right
-tag-with-edited-file-message-and-trailers
-tag-with-edited-inline-message-and-trailers
-tag-with-file-message-and-trailers
-tag-with-inline-message-and-trailers
-tag-with-trailers-and-no-message
-tag-zero-lines
-v0.2.1
-v1.0
-v1.0.1
-v1.1.3
-v2.0
-v3.0
-ok 176 - Doing 'git tag --list-like --without <commit> <pattern> is permitted
+initial
+ok 21 - git tag --contains respects pager.tag
 
-expecting success of 7004.177 'mixing incompatible modes with --merged is forbidden': 
-		test_must_fail git tag -d $option HEAD &&
-		test_must_fail git tag -d $option HEAD some-tag &&
-		test_must_fail git tag -v $option HEAD
-	
-fatal: the '--merged' option is only allowed in list mode
-fatal: the '--merged' option is only allowed in list mode
-fatal: the '--merged' option is only allowed in list mode
-ok 177 - mixing incompatible modes with --merged is forbidden
+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
 
-expecting success of 7004.178 'Doing 'git tag --list-like --merged <commit> <pattern> is permitted': 
-		git tag -n $option HEAD HEAD &&
-		git tag $option HEAD HEAD &&
-		git tag $option
-	
-100
-a1
-aa1
-annotated-tag
-annotated-tag-edit
-blank-annotated-tag
-blankfile-annotated-tag
-blanknonlfile-annotated-tag
-blanks-annotated-tag
-cba
-comment-annotated-tag
-commentfile-annotated-tag
-commentnonlfile-annotated-tag
-comments-annotated-tag
-empty-annotated-tag
-emptyfile-annotated-tag
-file-annotated-tag
-file-annotated-tag-edit
-non-annotated-tag
-reuse
-stdin-annotated-tag
-t210
-t211
-tag-from-subdir
-tag-from-subdir-2
-tag-lines
-tag-one-line
-tag-with-edited-file-message-and-trailers
-tag-with-edited-inline-message-and-trailers
-tag-with-file-message-and-trailers
-tag-with-inline-message-and-trailers
-tag-with-trailers-and-no-message
-tag-zero-lines
-v0.2.1
-v1.0
-v1.0.1
-v1.1.3
-v2.0
-v3.0
-v4.0
-ok 178 - Doing 'git tag --list-like --merged <commit> <pattern> is permitted
+Deleted tag 'newtag' (was a052248)
+ok 22 - git tag -a defaults to not paging
 
-expecting success of 7004.179 'mixing incompatible modes with --no-merged is forbidden': 
-		test_must_fail git tag -d $option HEAD &&
-		test_must_fail git tag -d $option HEAD some-tag &&
-		test_must_fail git tag -v $option HEAD
-	
-fatal: the '--no-merged' option is only allowed in list mode
-fatal: the '--no-merged' option is only allowed in list mode
-fatal: the '--no-merged' option is only allowed in list mode
-ok 179 - mixing incompatible modes with --no-merged is forbidden
+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
 
-expecting success of 7004.180 'Doing 'git tag --list-like --no-merged <commit> <pattern> is permitted': 
-		git tag -n $option HEAD HEAD &&
-		git tag $option HEAD HEAD &&
-		git tag $option
-	
-tag-left
-tag-right
-ok 180 - Doing 'git tag --list-like --no-merged <commit> <pattern> is permitted
+Deleted tag 'newtag' (was a052248)
+ok 23 - git tag -a ignores pager.tag
 
-expecting success of 7004.181 'mixing incompatible modes with --points-at is forbidden': 
-		test_must_fail git tag -d $option HEAD &&
-		test_must_fail git tag -d $option HEAD some-tag &&
-		test_must_fail git tag -v $option HEAD
-	
-fatal: the '--points-at' option is only allowed in list mode
-fatal: the '--points-at' option is only allowed in list mode
-fatal: the '--points-at' option is only allowed in list mode
-ok 181 - mixing incompatible modes with --points-at is forbidden
+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
 
-expecting success of 7004.182 'Doing 'git tag --list-like --points-at <commit> <pattern> is permitted': 
-		git tag -n $option HEAD HEAD &&
-		git tag $option HEAD HEAD &&
-		git tag $option
-	
-v4.0
-ok 182 - Doing 'git tag --list-like --points-at <commit> <pattern> is permitted
+Deleted tag 'newtag' (was a052248)
+ok 24 - git tag -a respects --paginate
 
-expecting success of 7004.183 '--points-at can be used in non-list mode': 
-	echo v4.0 >expect &&
-	git tag --points-at=v4.0 "v*" >actual &&
-	test_cmp expect actual
+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
 
-ok 183 - --points-at can be used in non-list mode
+Deleted tag 'newtag' (was a052248)
+ok 25 - git tag as alias ignores pager.tag with -a
 
-expecting success of 7004.184 '--points-at is a synonym for --points-at HEAD': 
-	echo v4.0 >expect &&
-	git tag --points-at >actual &&
-	test_cmp expect actual
+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
 
-ok 184 - --points-at is a synonym for --points-at HEAD
+initial
+ok 26 - git tag as alias respects pager.tag with -l
 
-expecting success of 7004.185 '--points-at finds lightweight tags': 
-	echo v4.0 >expect &&
-	git tag --points-at v4.0 >actual &&
-	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
 
-ok 185 - --points-at finds lightweight tags
+ok 27 - git branch defaults to paging
 
-expecting success of 7004.186 '--points-at finds annotated tags of commits': 
-	git tag -m "v4.0, annotated" annotated-v4.0 v4.0 &&
-	echo annotated-v4.0 >expect &&
-	git tag -l --points-at v4.0 "annotated*" >actual &&
-	test_cmp expect actual
+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
 
-ok 186 - --points-at finds annotated tags of commits
+* master
+ok 28 - git branch respects pager.branch
 
-expecting success of 7004.187 '--points-at finds annotated tags of tags': 
-	git tag -m "describing the v4.0 tag object" \
-		annotated-again-v4.0 annotated-v4.0 &&
-	cat >expect <<-\EOF &&
-	annotated-again-v4.0
-	annotated-v4.0
-	EOF
-	git tag --points-at=annotated-v4.0 >actual &&
-	test_cmp expect actual
+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
 
-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 annotated-again-v4.0 annotated-v4.0^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-ok 187 - --points-at finds annotated tags of tags
+* master
+ok 29 - git branch respects --no-pager
 
-expecting success of 7004.188 'recursive tagging should give advice': 
-	cat >expect <<-EOF &&
-	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 annotated-v4.0^{}
-	hint: Disable this message with "git config set advice.nestedTag false"
+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
-	git tag -m nested nested annotated-v4.0 2>actual &&
-	test_cmp expect actual
+	EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
 
-ok 188 - recursive tagging should give advice
+hint: Waiting for your editor to close the file... 
ok 30 - git branch --edit-description ignores pager.branch
 
-expecting success of 7004.189 'multiple --points-at are OR-ed together': 
-	cat >expect <<-\EOF &&
-	v2.0
-	v3.0
-	EOF
-	git tag --points-at=v2.0 --points-at=v3.0 >actual &&
-	test_cmp expect actual
+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
 
-ok 189 - multiple --points-at are OR-ed together
+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 7004.190 'lexical sort': 
-	git tag foo1.3 &&
-	git tag foo1.6 &&
-	git tag foo1.10 &&
-	git tag -l --sort=refname "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.10
-	foo1.3
-	foo1.6
-	EOF
-	test_cmp expect actual
+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 190 - lexical sort
+ok 32 - git config ignores pager.config when setting
 
-expecting success of 7004.191 'version sort': 
-	git tag -l --sort=version:refname "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.3
-	foo1.6
-	foo1.10
+expecting success of 7006.33 'git config --edit ignores pager.config': 
+	rm -f paginated.out editor.used &&
+	write_script editor <<-\EOF &&
+		touch editor.used
 	EOF
-	test_cmp expect actual
-
-ok 191 - version sort
+	EDITOR=./editor test_terminal git -c pager.config config --edit &&
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
 
-expecting success of 7004.192 'reverse version sort': 
-	git tag -l --sort=-version:refname "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.10
-	foo1.6
-	foo1.3
-	EOF
-	test_cmp expect actual
+hint: Waiting for your editor to close the file... 
ok 33 - git config --edit ignores pager.config
 
-ok 192 - reverse version sort
+expecting success of 7006.34 'git config --get ignores pager.config': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.config config --get foo.bar &&
+	test_path_is_missing paginated.out
 
-expecting success of 7004.193 'reverse lexical sort': 
-	git tag -l --sort=-refname "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.6
-	foo1.3
-	foo1.10
-	EOF
-	test_cmp expect actual
+bar
+ok 34 - git config --get ignores pager.config
 
-ok 193 - reverse lexical sort
+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
 
-expecting success of 7004.194 'configured lexical sort': 
-	test_config tag.sort "v:refname" &&
-	git tag -l "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.3
-	foo1.6
-	foo1.10
-	EOF
-	test_cmp expect actual
+ok 35 - git config --get-urlmatch defaults to paging
 
-ok 194 - configured lexical sort
+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
 
-expecting success of 7004.195 'option override configured sort': 
-	test_config tag.sort "v:refname" &&
-	git tag -l --sort=-refname "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.6
-	foo1.3
-	foo1.10
-	EOF
-	test_cmp expect actual
+bar
+ok 36 - git config --get-all respects pager.config
 
-ok 195 - option override configured sort
+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
 
-expecting success of 7004.196 '--no-sort cancels config sort keys': 
-	test_config tag.sort "-refname" &&
+ok 37 - git config --list defaults to paging
 
-	# objecttype is identical for all of them, so sort falls back on
-	# default (ascending refname)
-	git tag -l \
-		--no-sort \
-		--sort="objecttype" \
-		"foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.10
-	foo1.3
-	foo1.6
-	EOF
-	test_cmp expect actual
+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 196 - --no-sort cancels config sort keys
+ok 38 - tests can detect color
 
-expecting success of 7004.197 '--no-sort cancels command line sort keys': 
-	# objecttype is identical for all of them, so sort falls back on
-	# default (ascending refname)
-	git tag -l \
-		--sort="-refname" \
-		--no-sort \
-		--sort="objecttype" \
-		"foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.10
-	foo1.3
-	foo1.6
-	EOF
-	test_cmp expect actual
+expecting success of 7006.39 'no color when stdout is a regular file': 
+	rm -f colorless.log &&
+	test_config color.ui auto &&
+	git log >colorless.log &&
+	! colorful colorless.log
 
-ok 197 - --no-sort cancels command line sort keys
+ok 39 - no color when stdout is a regular file
 
-expecting success of 7004.198 '--no-sort without subsequent --sort prints expected tags': 
-	# Sort the results with `sort` for a consistent comparison against
-	# expected
-	git tag -l --no-sort "foo*" | sort >actual &&
-	cat >expect <<-\EOF &&
-	foo1.10
-	foo1.3
-	foo1.6
-	EOF
-	test_cmp expect actual
+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 198 - --no-sort without subsequent --sort prints expected tags
+ok 40 - color when writing to a pager
 
-expecting success of 7004.199 'invalid sort parameter on command line': 
-	test_must_fail git tag -l --sort=notvalid "foo*" >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
 
-fatal: unknown field name: notvalid
-ok 199 - invalid sort parameter on command line
+ok 41 - colors are suppressed by color.pager
 
-expecting success of 7004.200 'invalid sort parameter in configuratoin': 
-	test_config tag.sort "v:notvalid" &&
-	test_must_fail git tag -l "foo*"
+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
 
-fatal: unknown field name: notvalid
-ok 200 - invalid sort parameter in configuratoin
+ok 42 - color when writing to a file intended for a pager
 
-expecting success of 7004.201 'version sort handles empty value for versionsort.{prereleaseSuffix,suffix}': 
-	cp .git/config .git/config.orig &&
-	test_when_finished mv .git/config.orig .git/config &&
+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
 
-	cat >>.git/config <<-\EOF &&
-	[versionsort]
-		prereleaseSuffix
-		suffix
-	EOF
-	cat >expect <<-\EOF &&
-	error: missing value for 'versionsort.suffix'
-	error: missing value for 'versionsort.prereleasesuffix'
-	EOF
-	git tag -l --sort=version:refname 2>actual &&
-	test_cmp expect actual
+ok 43 - colors are sent to pager for external commands
 
-100
-a1
-aa1
-annotated-again-v4.0
-annotated-tag
-annotated-tag-edit
-annotated-v4.0
-blank-annotated-tag
-blankfile-annotated-tag
-blanknonlfile-annotated-tag
-blanks-annotated-tag
-cba
-comment-annotated-tag
-commentfile-annotated-tag
-commentnonlfile-annotated-tag
-comments-annotated-tag
-empty-annotated-tag
-emptyfile-annotated-tag
-file-annotated-tag
-file-annotated-tag-edit
-foo1.3
-foo1.6
-foo1.10
-nested
-non-annotated-tag
-reuse
-stdin-annotated-tag
-t210
-t211
-tag-blob
-tag-from-subdir
-tag-from-subdir-2
-tag-left
-tag-lines
-tag-one-line
-tag-right
-tag-with-edited-file-message-and-trailers
-tag-with-edited-inline-message-and-trailers
-tag-with-file-message-and-trailers
-tag-with-inline-message-and-trailers
-tag-with-trailers-and-no-message
-tag-zero-lines
-v0.2.1
-v1.0
-v1.0.1
-v1.1.3
-v2.0
-v3.0
-v4.0
-ok 201 - version sort handles empty value for versionsort.{prereleaseSuffix,suffix}
+expecting success of 7006.44 'setup: some aliases': 
+	git config alias.aliasedlog log &&
+	git config alias.true "!true"
 
-expecting success of 7004.202 'version sort with prerelease reordering': 
-	test_config versionsort.prereleaseSuffix -rc &&
-	git tag foo1.6-rc1 &&
-	git tag foo1.6-rc2 &&
-	git tag -l --sort=version:refname "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.3
-	foo1.6-rc1
-	foo1.6-rc2
-	foo1.6
-	foo1.10
-	EOF
-	test_cmp expect actual
+ok 44 - setup: some aliases
 
-ok 202 - version sort with prerelease reordering
+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 7004.203 'reverse version sort with prerelease reordering': 
-	test_config versionsort.prereleaseSuffix -rc &&
-	git tag -l --sort=-version:refname "foo*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.10
-	foo1.6
-	foo1.6-rc2
-	foo1.6-rc1
-	foo1.3
-	EOF
-	test_cmp expect actual
+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
 
-ok 203 - reverse version sort with prerelease reordering
+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 7004.204 'version sort with prerelease reordering and common leading character': 
-	test_config versionsort.prereleaseSuffix -before &&
-	git tag foo1.7-before1 &&
-	git tag foo1.7 &&
-	git tag foo1.7-after1 &&
-	git tag -l --sort=version:refname "foo1.7*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.7-before1
-	foo1.7
-	foo1.7-after1
-	EOF
-	test_cmp expect actual
+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
 
-ok 204 - version sort with prerelease reordering and common leading character
+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 7004.205 'version sort with prerelease reordering, multiple suffixes and common leading character': 
-	test_config versionsort.prereleaseSuffix -before &&
-	git config --add versionsort.prereleaseSuffix -after &&
-	git tag -l --sort=version:refname "foo1.7*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.7-before1
-	foo1.7-after1
-	foo1.7
-	EOF
-	test_cmp expect actual
+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
 
-ok 205 - version sort with prerelease reordering, multiple suffixes and common leading character
+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 7004.206 'version sort with prerelease reordering, multiple suffixes match the same tag': 
-	test_config versionsort.prereleaseSuffix -bar &&
-	git config --add versionsort.prereleaseSuffix -foo-baz &&
-	git config --add versionsort.prereleaseSuffix -foo-bar &&
-	git tag foo1.8-foo-bar &&
-	git tag foo1.8-foo-baz &&
-	git tag foo1.8 &&
-	git tag -l --sort=version:refname "foo1.8*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.8-foo-baz
-	foo1.8-foo-bar
-	foo1.8
-	EOF
-	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
 
-ok 206 - version sort with prerelease reordering, multiple suffixes match the same tag
+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 7004.207 'version sort with prerelease reordering, multiple suffixes match starting at the same position': 
-	test_config versionsort.prereleaseSuffix -pre &&
-	git config --add versionsort.prereleaseSuffix -prerelease &&
-	git tag foo1.9-pre1 &&
-	git tag foo1.9-pre2 &&
-	git tag foo1.9-prerelease1 &&
-	git tag -l --sort=version:refname "foo1.9*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.9-pre1
-	foo1.9-pre2
-	foo1.9-prerelease1
-	EOF
-	test_cmp expect actual
+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
 
-ok 207 - version sort with prerelease reordering, multiple suffixes match starting at the same position
+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 7004.208 'version sort with general suffix reordering': 
-	test_config versionsort.suffix -alpha &&
-	git config --add versionsort.suffix -beta &&
-	git config --add versionsort.suffix ""  &&
-	git config --add versionsort.suffix -gamma &&
-	git config --add versionsort.suffix -delta &&
-	git tag foo1.10-alpha &&
-	git tag foo1.10-beta &&
-	git tag foo1.10-gamma &&
-	git tag foo1.10-delta &&
-	git tag foo1.10-unlisted-suffix &&
-	git tag -l --sort=version:refname "foo1.10*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.10-alpha
-	foo1.10-beta
-	foo1.10
-	foo1.10-unlisted-suffix
-	foo1.10-gamma
-	foo1.10-delta
-	EOF
-	test_cmp expect actual
+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
 
-ok 208 - version sort with general suffix reordering
+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 7004.209 'versionsort.suffix overrides versionsort.prereleaseSuffix': 
-	test_config versionsort.suffix -before &&
-	test_config versionsort.prereleaseSuffix -after &&
-	git tag -l --sort=version:refname "foo1.7*" >actual &&
-	cat >expect <<-\EOF &&
-	foo1.7-before1
-	foo1.7
-	foo1.7-after1
-	EOF
-	test_cmp expect actual
+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
 
-warning: ignoring versionsort.prereleasesuffix because versionsort.suffix is set
-ok 209 - versionsort.suffix overrides versionsort.prereleaseSuffix
+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 7004.210 'version sort with very long prerelease suffix': 
-	test_config versionsort.prereleaseSuffix -very-looooooooooooooooooooooooong-prerelease-suffix &&
-	git tag -l --sort=version:refname
+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
 
-100
-a1
-aa1
-annotated-again-v4.0
-annotated-tag
-annotated-tag-edit
-annotated-v4.0
-blank-annotated-tag
-blankfile-annotated-tag
-blanknonlfile-annotated-tag
-blanks-annotated-tag
-cba
-comment-annotated-tag
-commentfile-annotated-tag
-commentnonlfile-annotated-tag
-comments-annotated-tag
-empty-annotated-tag
-emptyfile-annotated-tag
-file-annotated-tag
-file-annotated-tag-edit
-foo1.3
-foo1.6
-foo1.6-rc1
-foo1.6-rc2
-foo1.7
-foo1.7-after1
-foo1.7-before1
-foo1.8
-foo1.8-foo-bar
-foo1.8-foo-baz
-foo1.9-pre1
-foo1.9-pre2
-foo1.9-prerelease1
-foo1.10
-foo1.10-alpha
-foo1.10-beta
-foo1.10-delta
-foo1.10-gamma
-foo1.10-unlisted-suffix
-nested
-non-annotated-tag
-reuse
-stdin-annotated-tag
-t210
-t211
-tag-blob
-tag-from-subdir
-tag-from-subdir-2
-tag-left
-tag-lines
-tag-one-line
-tag-right
-tag-with-edited-file-message-and-trailers
-tag-with-edited-inline-message-and-trailers
-tag-with-file-message-and-trailers
-tag-with-inline-message-and-trailers
-tag-with-trailers-and-no-message
-tag-zero-lines
-v0.2.1
-v1.0
-v1.0.1
-v1.1.3
-v2.0
-v3.0
-v4.0
-ok 210 - version sort with very long prerelease suffix
+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
 
-checking prerequisite: ULIMIT_STACK_SIZE
+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
 
-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
+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
 
-)
-prerequisite ULIMIT_STACK_SIZE ok
-expecting success of 7004.211 '--contains and --no-contains work 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^ &&
-	run_with_limited_stack git tag --contains HEAD >actual &&
-	test_must_be_empty actual &&
-	run_with_limited_stack git tag --no-contains HEAD >actual &&
-	test_line_count "-gt" 10 actual
+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
 
-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:              1
-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              =    1177891 /    1177891
----------------------------------------------------------------------
+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
 
-Switched to branch 'main'
-ok 211 - --contains and --no-contains work in a deep repo
+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 7004.212 '--format should list tags as per format given': 
-	cat >expect <<-\EOF &&
-	refname : refs/tags/v1.0
-	refname : refs/tags/v1.0.1
-	refname : refs/tags/v1.1.3
-	EOF
-	git tag -l --format="refname : %(refname)" "v1*" >actual &&
-	test_cmp expect actual
+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
 
-ok 212 - --format should list tags as per format given
+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 7004.213 '--format --omit-empty works': 
-	cat >expect <<-\EOF &&
-	refname : refs/tags/v1.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
 
-	refname : refs/tags/v1.1.3
-	EOF
-	git tag -l --format="%(if:notequals=refs/tags/v1.0.1)%(refname)%(then)refname : %(refname)%(end)" "v1*" >actual &&
-	test_cmp expect actual &&
-	cat >expect <<-\EOF &&
-	refname : refs/tags/v1.0
-	refname : refs/tags/v1.1.3
-	EOF
-	git tag -l --omit-empty --format="%(if:notequals=refs/tags/v1.0.1)%(refname)%(then)refname : %(refname)%(end)" "v1*" >actual &&
-	test_cmp expect actual
+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
 
-ok 213 - --format --omit-empty works
+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 7004.214 'git tag -l with --format="%(rest)" must fail': 
-	test_must_fail git tag -l --format="%(rest)" "v1*"
+expecting success of 7006.72 'git -p request-pull - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_must_fail test_terminal  git -p request-pull &&
+		test_path_is_file core.pager_used
+	
+ok 72 - git -p request-pull - repository-local core.pager setting overrides PAGER
 
-fatal: this command reject atom %(rest)
-ok 214 - git tag -l with --format="%(rest)" must fail
+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 7004.215 'set up color tests': 
-	echo "<RED>v1.0<RESET>" >expect.color &&
-	echo "v1.0" >expect.bare &&
-	color_args="--format=%(color:red)%(refname:short) --list v1.0"
+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
 
-ok 215 - set up color tests
+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 7004.216 '%(color) omitted without tty': 
-	TERM=vt100 git tag $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.bare actual
+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
 
-ok 216 - %(color) omitted without tty
+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
 
-checking prerequisite: TTY
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+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
+	)
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+ok 79 - core.pager in repo config works and retains cwd
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+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
+	)
 
-)
-prerequisite TTY ok
-expecting success of 7004.217 '%(color) present with tty': 
-	test_terminal git tag $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+ok 80 - core.pager is found via alias in subdirectory
 
-ok 217 - %(color) present with tty
+checking known breakage of 7006.81 'no pager for 'git -p nonsense'': 
+		rm -f GIT_PAGER_used &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_must_fail test_terminal  git -p nonsense &&
+		test_path_is_missing GIT_PAGER_used
+	
+Path exists:
+-rw-r--r-- 1 pbuilder2 pbuilder2 24 Mar 14 13:35 GIT_PAGER_used
+not ok 81 - no pager for 'git -p nonsense' # TODO known breakage
 
-expecting success of 7004.218 '--color overrides auto-color': 
-	git tag --color $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+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
 
-ok 218 - --color overrides auto-color
+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 7004.219 'color.ui=always overrides auto-color': 
-	git -c color.ui=always tag $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+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
 
-ok 219 - color.ui=always overrides auto-color
+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 7004.220 'setup --merged test tags': 
-	git tag mergetest-1 HEAD~2 &&
-	git tag mergetest-2 HEAD~1 &&
-	git tag mergetest-3 HEAD
+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
 
-ok 220 - setup --merged test tags
+expecting success of 7006.87 'setup: configure shortlog not to paginate': 
+	git config pager.shortlog false
 
-expecting success of 7004.221 '--merged can be used in non-list mode': 
-	cat >expect <<-\EOF &&
-	mergetest-1
-	mergetest-2
-	EOF
-	git tag --merged=mergetest-2 "mergetest*" >actual &&
-	test_cmp expect actual
+ok 87 - setup: configure shortlog not to paginate
 
-ok 221 - --merged can be used in non-list mode
+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 7004.222 '--merged is compatible with --no-merged': 
-	git tag --merged HEAD --no-merged HEAD
+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
 
-ok 222 - --merged is compatible with --no-merged
+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 7004.223 '--merged shows merged tags': 
-	cat >expect <<-\EOF &&
-	mergetest-1
-	mergetest-2
-	EOF
-	git tag -l --merged=mergetest-2 mergetest-* >actual &&
-	test_cmp expect actual
+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
 
-ok 223 - --merged shows merged tags
+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 7004.224 '--no-merged show unmerged tags': 
-	cat >expect <<-\EOF &&
-	mergetest-3
-	EOF
-	git tag -l --no-merged=mergetest-2 mergetest-* >actual &&
+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 224 - --no-merged show unmerged tags
+ok 93 - command-specific pager
 
-expecting success of 7004.225 '--no-merged can be used in non-list mode': 
-	git tag --no-merged=mergetest-2 mergetest-* >actual &&
+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 225 - --no-merged can be used in non-list mode
+ok 94 - command-specific pager overrides core.pager
 
-expecting success of 7004.226 'ambiguous branch/tags not marked': 
-	git tag ambiguous &&
-	git branch ambiguous &&
-	echo ambiguous >expect &&
-	git tag -l ambiguous >actual &&
+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 226 - ambiguous branch/tags not marked
-
-expecting success of 7004.227 '--contains combined with --no-contains': 
-	(
-		git init no-contains &&
-		cd no-contains &&
-		test_commit v0.1 &&
-		test_commit v0.2 &&
-		test_commit v0.3 &&
-		test_commit v0.4 &&
-		test_commit v0.5 &&
-		cat >expected <<-\EOF &&
-		v0.2
-		v0.3
-		v0.4
-		EOF
-		git tag --contains v0.2 --no-contains v0.5 >actual &&
-		test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7004-tag/no-contains/.git/
-[main (root-commit) fdf35a1] v0.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.1.t
-[main 82f1d18] v0.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.2.t
-[main 4c097b6] v0.3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.3.t
-[main 8804202] v0.4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.4.t
-[main 947a091] v0.5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.5.t
-ok 227 - --contains combined with --no-contains
-
-expecting success of 7004.228 'Does --[no-]contains stop at commits? Yes!': 
-	cd no-contains &&
-	blob=$(git rev-parse v0.3:v0.3.t) &&
-	tree=$(git rev-parse v0.3^{tree}) &&
-	git tag tag-blob $blob &&
-	git tag tag-tree $tree &&
-	git tag --contains v0.3 >actual &&
-	cat >expected <<-\EOF &&
-	v0.3
-	v0.4
-	v0.5
-	EOF
-	test_cmp expected actual &&
-	git tag --no-contains v0.3 >actual &&
-	cat >expected <<-\EOF &&
-	v0.1
-	v0.2
-	EOF
-	test_cmp expected actual
-
-ok 228 - Does --[no-]contains stop at commits? Yes!
-
-expecting success of 7004.229 'If tag is created then tag message file is unlinked': 
-	test_when_finished "git tag -d foo" &&
-	write_script fakeeditor <<-\EOF &&
-	echo Message >.git/TAG_EDITMSG
-	EOF
-	GIT_EDITOR=./fakeeditor git tag -a foo &&
-	test_path_is_missing .git/TAG_EDITMSG
-
-Deleted tag 'foo' (was 299fb5e)
-ok 229 - If tag is created then tag message file is unlinked
+ok 95 - command-specific pager overridden by environment
 
-expecting success of 7004.230 'If tag cannot be created then tag message file is not unlinked': 
-	test_when_finished "git tag -d foo/bar && rm .git/TAG_EDITMSG" &&
-	write_script fakeeditor <<-\EOF &&
-	echo Message >.git/TAG_EDITMSG
+expecting success of 7006.96 'setup external command': 
+	cat >git-external <<-\EOF &&
+	#!/bin/sh
+	git "$@"
 	EOF
-	git tag foo/bar &&
-	test_must_fail env GIT_EDITOR=./fakeeditor git tag -a foo &&
-	test_path_exists .git/TAG_EDITMSG
-
-The tag message has been left in .git/TAG_EDITMSG
-fatal: cannot lock ref 'refs/tags/foo': 'refs/tags/foo/bar' exists; cannot create 'refs/tags/foo'
-Deleted tag 'foo/bar' (was 947a091)
-ok 230 - If tag cannot be created then tag message file is not unlinked
-
-# passed all 230 test(s)
-1..230
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7300-clean.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 .
-
+	chmod +x git-external
 
-[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
+ok 96 - setup external command
 
-expecting success of 7300.2 'git clean with skip-worktree .gitignore': 
-	git update-index --skip-worktree .gitignore &&
-	rm .gitignore &&
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so &&
-	git update-index --no-skip-worktree .gitignore &&
-	git checkout .gitignore
+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
 
-Removing a.out
-Removing src/part3.c
-Updated 1 path from the index
-ok 2 - git clean with skip-worktree .gitignore
+ok 97 - command-specific pager works for external commands
 
-expecting success of 7300.3 'git clean': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Removing a.out
-Removing src/part3.c
-ok 3 - git clean
+initial
+ok 99 - external command pagers override sub-commands
 
-expecting success of 7300.4 'git clean src/': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Removing src/part3.c
-ok 4 - git clean src/
+[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 7300.5 'git clean src/ src/': 
+expecting success of 7006.102 'setup trace2': 
+	GIT_TRACE2_BRIEF=1 &&
+	export GIT_TRACE2_BRIEF
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ src/ &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+ok 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
 
-Removing src/part3.c
-ok 5 - git clean src/ src/
+[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 7300.6 'git clean with prefix': 
+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" &&
 
-	mkdir -p build docs src/test &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
-	(cd src/ && git clean) &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file src/test/1.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	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
 
-Removing part3.c
-ok 6 - git clean with prefix
+died of signal 13 at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-terminal.perl line 33.
+child_exit[0] pid:336087 code:0 elapsed:0.025146
+ok 104 - git returns SIGPIPE on early pager exit
 
-expecting success of 7300.7 'git clean with relative prefix': 
+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" &&
 
-	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
+	if test_have_prereq !MINGW
+	then
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
+	else
+		test_terminal git log
+	fi &&
 
-ok 7 - git clean with relative prefix
+	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 7300.8 'git clean with absolute path': 
+died of signal 13 at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-terminal.perl line 33.
+child_exit[0] pid:336393 code:1 elapsed:0.044556
+ok 105 - git returns SIGPIPE on early pager non-zero exit
 
-	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
+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" &&
 
-ok 8 - git clean with absolute path
+	test_terminal git log &&
 
-expecting success of 7300.9 'git clean with out of work tree relative path': 
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:1 " child-exits &&
+	test_path_is_file pager-used
 
-	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 ../..
-	)
+child_exit[0] pid:336743 code:1 elapsed:0.032296
+ok 106 - git discards pager non-zero exit without SIGPIPE
 
-fatal: ../..: '../..' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean'
-ok 9 - git clean with out of work tree relative path
+expecting success of 7006.107 'git errors when asked to execute nonexisting pager': 
+	test_when_finished "rm -f err" &&
+	test_config core.pager "does-not-exist" &&
+	test_must_fail test_terminal git log 2>err &&
+	test_grep "unable to execute pager" err
 
-expecting success of 7300.10 'git clean with out of work tree absolute path': 
+fatal: unable to execute pager 'does-not-exist'
+ok 107 - git errors when asked to execute nonexisting pager
 
-	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
-	)
+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" &&
 
-fatal: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t' is outside repository at '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean'
-ok 10 - git clean with out of work tree absolute path
+	if test_have_prereq !MINGW
+	then
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
+	else
+		test_terminal git log
+	fi &&
 
-expecting success of 7300.11 'git clean -d with prefix and path': 
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:143 " child-exits &&
+	test_path_is_file pager-used
 
-	mkdir -p build docs src/feature &&
-	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
-	(cd src/ && git clean -d feature/) &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_missing src/feature/file.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+died of signal 13 at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-terminal.perl line 33.
+child_exit[0] pid:337308 code:143 elapsed:0.032150
+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
 
-Removing feature/
-ok 11 - git clean -d with prefix and path
+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
 
-checking prerequisite: SYMLINKS
+# still have 3 known breakage(s)
+# passed all remaining 106 test(s)
+1..109
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7063-status-untracked-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7063-status-untracked-cache/.git/
+checking prerequisite: UNTRACKED_CACHE
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+	{ git update-index --test-untracked-cache; ret=$?; } &&
+	test $ret -ne 1
 
 )
-prerequisite SYMLINKS ok
-expecting success of 7300.12 'git clean symbolic link': 
+Testing mtime in '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	ln -s docs/manual.txt src/part4.c &&
-	git clean &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Removing a.out
-Removing src/part3.c
-Removing src/part4.c
-ok 12 - git clean symbolic link
+	exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
+	exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
 
-expecting success of 7300.13 'git clean with wildcard': 
+	done sha1:1946f0437f90c5005533cbe1736a6451ca301714
+	done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
+	EOF
 
-	touch a.clean b.clean other.c &&
-	git clean "*.clean" &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.clean &&
-	test_path_is_missing b.clean &&
-	test_path_is_file other.c
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Removing a.clean
-Removing b.clean
-ok 13 - git clean with wildcard
+ok 3 - untracked cache is empty
 
-expecting success of 7300.14 'git clean -n': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Would remove a.out
-Would remove other.c
-Would remove src/part3.c
-ok 14 - git clean -n
+ok 5 - untracked cache after first status
 
-expecting success of 7300.15 'git clean -d': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing docs &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Removing a.out
-Removing docs/
-Removing other.c
-Removing src/part3.c
-Removing src/test/
-ok 15 - git clean -d
+ok 7 - untracked cache after second status
 
-expecting success of 7300.16 'git clean -d src/ examples/': 
+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
 
-	mkdir -p build docs examples &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
-	git clean -d src/ examples/ &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing examples/1.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Removing examples/
-Removing src/part3.c
-ok 16 - git clean -d src/ examples/
+ok 9 - untracked cache remains after bypass
 
-expecting success of 7300.17 'git clean -x': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -x &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Removing a.out
-Removing obj.o
-Removing src/part3.c
-ok 17 - git clean -x
+ok 11 - if -uall was configured, untracked cache is populated
 
-expecting success of 7300.18 'git clean -d -x': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing docs &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+ok 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
 
-Removing a.out
-Removing build/
-Removing docs/
-Removing obj.o
-Removing src/part3.c
-ok 18 - git clean -d -x
+ok 13 - if -uall is configured, untracked cache is bypassed with -unormal
 
-expecting success of 7300.19 'git clean -d -x with ignored tracked directory': 
+expecting success of 7063.14 'repopulate untracked cache for -unormal': 
+	git status --porcelain
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x -e src &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_missing docs &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+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
 
-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': 
+ok 15 - modify in root directory, one dir invalidation
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -X &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Removing obj.o
-ok 20 - git clean -X
+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
 
-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_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+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
 
-Removing build/
-Removing obj.o
-ok 21 - git clean -d -X
+ok 18 - verify untracked cache dump
 
-expecting success of 7300.22 'git clean -d -X with ignored tracked directory': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -X -e src &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+ok 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
 
-Removing build/
-Removing obj.o
-Removing src/part3.c
-ok 22 - git clean -d -X with ignored tracked directory
+ok 20 - verify untracked cache dump
 
-expecting success of 7300.23 'clean.requireForce defaults to true': 
+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
 
-	git config --unset clean.requireForce &&
-	test_must_fail git clean
+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
 
-fatal: clean.requireForce is true and -f not given: refusing to clean
-ok 23 - clean.requireForce defaults to true
+ok 22 - status after the move
 
-expecting success of 7300.24 'clean.requireForce': 
+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
 
-	git config clean.requireForce true &&
-	test_must_fail git clean
+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
 
-fatal: clean.requireForce is true and -f not given: refusing to clean
-ok 24 - clean.requireForce
+ok 24 - move two from untracked to tracked
 
-expecting success of 7300.25 'clean.requireForce and -n': 
+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
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+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
 
-Would remove a.out
-Would remove src/part3.c
-ok 25 - clean.requireForce and -n
+ok 26 - verify untracked cache dump
 
-expecting success of 7300.26 'clean.requireForce and -f': 
+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"
 
-	git clean -f &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+[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
 
-Removing a.out
-Removing src/part3.c
-ok 26 - clean.requireForce and -f
+ok 28 - status after commit
 
-expecting success of 7300.27 'clean.requireForce and --interactive': 
-	git clean --interactive </dev/null >output 2>error &&
-	test_grep ! "requireForce is true and" error &&
-	test_grep "\*\*\* Commands \*\*\*" output
+expecting success of 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
 
-*** Commands ***
-ok 27 - clean.requireForce and --interactive
+ok 29 - untracked cache correct after commit
 
-expecting success of 7300.28 'core.excludesfile': 
+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
 
-	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
+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 28 - core.excludesfile
+ok 31 - create/modify files, some of which are gitignored
 
-checking prerequisite: SANITY
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+ok 32 - test sparse status with untracked cache
 
-	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 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
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+ok 33 - untracked cache correct after status
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $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
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 7300.29 'removal failure': 
+ok 34 - test sparse status again with untracked cache
 
-	mkdir foo &&
-	touch foo/bar &&
-	test_when_finished "chmod 755 foo" &&
-	(exec <foo/bar &&
-	 chmod 0 foo &&
-	 test_must_fail git clean -f -d)
+expecting success of 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
 
-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
+ok 35 - set up for test of subdir and sparse checkouts
 
-expecting success of 7300.30 'nested git work tree': 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
-	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
-	) &&
-	git clean -f -d &&
-	test_path_is_file foo/.git/index &&
-	test_path_is_file foo/hello.world &&
-	test_path_is_file baz/boo/.git/index &&
-	test_path_is_file baz/boo/deeper.world &&
-	test_path_is_missing bar
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7300-clean/baz/boo/.git/
-[master (root-commit) 3f7f1fc] deeply.nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deeper.world
-Removing bar/
-Skipping repository baz/boo
-ok 30 - nested git work tree
+ok 36 - test sparse status with untracked cache and subdir
 
-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
+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
 
-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
+ok 37 - verify untracked cache dump (sparse/subdirs)
 
-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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
+ok 38 - test sparse status again with untracked cache and subdir
 
-expecting success of 7300.33 'should avoid cleaning possible submodules': 
-	rm -fr to_clean possible_sub1 &&
-	mkdir to_clean possible_sub1 &&
-	test_when_finished "rm -rf possible_sub*" &&
-	echo "gitdir: foo" >possible_sub1/.git &&
-	>possible_sub1/hello.world &&
-	chmod 0 possible_sub1/.git &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file possible_sub1/.git &&
-	test_path_is_file possible_sub1/hello.world &&
-	test_path_is_missing to_clean
+expecting success of 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
 
-Skipping repository baz/boo
-Removing to_clean/
-ok 33 - should avoid cleaning possible submodules
+ok 39 - move entry in subdir from untracked to cached
 
-expecting success of 7300.34 'nested (empty) git should be kept': 
-	rm -fr empty_repo to_clean &&
-	git init empty_repo &&
-	mkdir to_clean &&
-	>to_clean/should_clean.this &&
-	# Note that we put the expect file in the .git directory so that it
-	# does not get cleaned.
-	find empty_repo | sort >.git/expect &&
-	git clean -f -d &&
-	find empty_repo | sort >actual &&
-	test_cmp .git/expect actual &&
-	test_path_is_missing to_clean
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/empty_repo/.git/
-Skipping repository baz/boo
-Removing to_clean/
-ok 34 - nested (empty) git should be kept
+rm 'dtwo/two'
+ok 40 - move entry in subdir from cached to untracked
 
-expecting success of 7300.35 'nested bare repositories should be cleaned': 
-	rm -fr bare1 bare2 subdir &&
-	git init --bare bare1 &&
-	git clone --local --bare . bare2 &&
-	mkdir subdir &&
-	cp -r bare2 subdir/bare3 &&
-	git clean -f -d &&
-	test_path_is_missing bare1 &&
-	test_path_is_missing bare2 &&
-	test_path_is_missing subdir
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ok 41 - --no-untracked-cache removes the cache
 
-checking known breakage of 7300.36 'nested (empty) bare repositories should be cleaned even when in .git': 
-	rm -fr strange_bare &&
-	mkdir strange_bare &&
-	git init --bare strange_bare/.git &&
-	git clean -f -d &&
-	test_path_is_missing strange_bare
+expecting success of 7063.42 'git status does not change anything': 
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-no-uc ../actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/strange_bare/.git/
-Skipping repository baz/boo
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb  9 06:55 strange_bare
-not ok 36 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
+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
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
 
-Cloning into bare repository 'strange_bare/.git'...
-done.
-Skipping repository baz/boo
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb  9 06:55 strange_bare
-not ok 37 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 42 - git status does not change anything
 
-expecting success of 7300.38 'giving path in nested git work tree will NOT remove it': 
-	rm -fr repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		mkdir -p bar/baz &&
-		test_commit msg bar/baz/hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/bar/baz &&
-	find repo | sort >actual &&
-	test_cmp expect actual
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+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
 
-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/
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+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 7300.40 'giving path to nested .git/ will NOT remove contents': 
-	rm -fr repo untracked &&
-	mkdir repo untracked &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/.git/ &&
-	find repo | sort >actual &&
-	test_cmp expect actual &&
-	test_path_is_dir untracked/
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+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 7300.41 'force removal of nested git work tree': 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
-	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
-	) &&
-	git clean -f -f -d &&
-	test_path_is_missing foo &&
-	test_path_is_missing bar &&
-	test_path_is_missing baz
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
+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
 
-expecting success of 7300.42 'git clean -e': 
-	rm -fr repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		touch known 1 2 3 &&
-		git add known &&
-		git clean -f -e 1 -e 2 &&
-		test_path_exists 1 &&
-		test_path_exists 2 &&
-		test_path_is_missing 3 &&
-		test_path_exists known
-	)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/repo/.git/
-Removing 3
-ok 42 - git clean -e
+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 7300.43 'git clean -d with an unreadable empty directory': 
-	mkdir foo &&
-	chmod a= foo &&
-	git clean -dfx foo &&
-	test_path_is_missing foo
+expecting success of 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: could not open directory 'foo/': Permission denied
-Removing foo/
-ok 43 - git clean -d with an unreadable empty directory
+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 7300.44 'git clean -d respects pathspecs (dir is prefix of pathspec)': 
-	mkdir -p foo &&
-	mkdir -p foobar &&
-	git clean -df foobar &&
-	test_path_is_dir foo &&
-	test_path_is_missing foobar
+expecting success of 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
 
-Removing foobar/
-ok 44 - git clean -d respects pathspecs (dir is prefix of pathspec)
+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
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
 
-Removing foo/
-ok 45 - git clean -d respects pathspecs (pathspec is prefix of dir)
+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
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
 
-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
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 47 - setting core.untrackedCache to keep
 
-expecting success of 7300.47 'git clean -d skips nested repo containing ignored files': 
-	test_when_finished "rm -rf nested-repo-with-ignored-file" &&
+expecting success of 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
 
-	git init nested-repo-with-ignored-file &&
-	(
-		cd nested-repo-with-ignored-file &&
-		>file &&
-		git add file &&
-		git commit -m Initial &&
+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
 
-		# This file is ignored by a .gitignore rule in the outer repo
-		# added in the previous test.
-		>ignoreme
-	) &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	done/five
+	done/four
+	done/sub/
+	dtwo/
+	four
 
-	git clean -fd &&
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 48 - test ident field is working
 
-	test_path_is_file nested-repo-with-ignored-file/.git/index &&
-	test_path_is_file nested-repo-with-ignored-file/ignoreme &&
-	test_path_is_file nested-repo-with-ignored-file/file
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/nested-repo-with-ignored-file/.git/
-[master (root-commit) 4208a61] Initial
+[main 9462075] empty
  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
+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
 
-Removing d1/ut
-Removing d2/ut
-ok 48 - git clean handles being told what to clean
+expecting success of 7063.50 'untracked cache survives a commit': 
+	test-tool dump-untracked-cache >../before &&
+	git add done/two &&
+	git commit -m commit &&
+	test-tool dump-untracked-cache >../after &&
+	test_cmp ../before ../after
 
-expecting success of 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
+[main 527fa0b] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 50 - untracked cache survives a commit
 
-Removing d1/ut
-Removing d2/ut
-ok 49 - git clean handles being told what to clean, with -d
+expecting success of 7063.51 'teardown worktree': 
+	cd ..
 
-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
+ok 51 - teardown worktree
 
-Removing d1/ut
-Removing d2/ut
-ok 50 - git clean works if a glob is passed without -d
+checking prerequisite: SYMLINKS
 
-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
+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
 
-Removing d1/ut
-Removing d2/ut
-ok 51 - git clean works if a glob is passed with -d
+)
+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"
 
-ok 52 # skip handle clean & core.longpaths = false nicely (missing MINGW)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7063-status-untracked-cache/worktree-symlink/.git/
+[main (root-commit) 294fddc] first commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 one/file
+ create mode 100644 two/file
+rm 'one/file'
+[main b7cd1f6] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 one
+ delete mode 100644 one/file
+ok 52 - setup worktree for symlink test
 
-expecting success of 7300.53 'clean untracked paths by pathspec': 
-	git init untracked &&
-	mkdir untracked/dir &&
-	echo >untracked/dir/file.txt &&
-	git -C untracked clean -f dir/file.txt &&
-	ls untracked/dir >actual &&
-	test_must_be_empty actual
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/untracked/.git/
-Removing dir/file.txt
-ok 53 - clean untracked paths by pathspec
+Note: switching to 'HEAD~'.
 
-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 &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 untracked/subdir/with/a &&
-		>untracked/subdir/with/a/random-file.txt &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-		git clean -ffdxn -e untracked
-	) &&
+  git switch -c <new-branch-name>
 
-	# 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
+Or undo this operation with:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7300-clean/avoid-traversing-deep-hierarchy/.git/
-ok 54 - avoid traversing into ignored directories
+  git switch -
 
-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 &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-		git clean -fX modules/foobar >../output &&
+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
 
-		grep Removing ../output &&
+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
 
-		test_path_is_missing modules/foobar/src/generated/code.c &&
-		test_path_is_file modules/foobar/Makefile
-	)
+Note: switching to 'HEAD~'.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-# still have 2 known breakage(s)
-# passed all remaining 53 test(s)
-1..55
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7402-submodule-rebase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7402-submodule-rebase/.git/
-expecting success of 7402.1 'setup': 
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	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
+  git switch -c <new-branch-name>
 
+Or undo this operation with:
 
-[master (root-commit) ffefb50] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'submodule'...
-done.
-warning: adding embedded git repository: submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submodule
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submodule
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master 9bd10db] submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 submodule
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7402-submodule-rebase/.
-   ffefb50..9bd10db  master     -> origin/master
-Updating ffefb50..9bd10db
-Fast-forward
- submodule | 1 +
- 1 file changed, 1 insertion(+)
- create mode 160000 submodule
-[master 041f541] file-and-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 1 - setup
+  git switch -
 
-expecting success of 7402.2 'rebase with a dirty submodule': 
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	(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)
+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"
 
-[master eb5e1a6] fork
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b5e9d7b] unrelated
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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>
- 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 0558445] 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.48.0~rc1+next.20250101/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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename one/file => one (100%)
+ok 55 - setup worktree for non-symlink test
 
-expecting success of 7402.3 'interactive rebase with a dirty submodule': 
+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
 
-	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 56 - "status" after file 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.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
 
-	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
- 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
+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
 
-# passed all 6 test(s)
-1..6
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7201-co.sh ***
@@ -454730,2911 +456912,631 @@
 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7401-submodule-summary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7401-submodule-summary/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success of 7401.1 'added submodule': 
-	git add sm1 &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 0000000...a2c4dab (2):
-	  > Add foo2
-
-	EOF
-	test_cmp expected actual
-
-warning: adding embedded git repository: sm1
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm1
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm1
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 1 - added submodule
-
-expecting success of 7401.2 'added submodule (subdirectory)': 
-	mkdir sub &&
-	(
-		cd sub &&
-		git submodule summary >../actual
-	) &&
-	cat >expected <<-EOF &&
-	* ../sm1 0000000...a2c4dab (2):
-	  > Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 2 - added submodule (subdirectory)
-
-expecting success of 7401.3 'added submodule (subdirectory only)': 
-	(
-		cd sub &&
-		git submodule summary . >../actual
-	) &&
-	test_must_be_empty actual
-
-ok 3 - added submodule (subdirectory only)
-
-expecting success of 7401.4 'added submodule (subdirectory with explicit path)': 
-	(
-		cd sub &&
-		git submodule summary ../sm1 >../actual
-	) &&
-	cat >expected <<-EOF &&
-	* ../sm1 0000000...a2c4dab (2):
-	  > Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 4 - added submodule (subdirectory with explicit path)
-
-expecting success of 7401.5 'modified submodule(forward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
-
-	EOF
-	test_cmp expected actual
-
-ok 5 - modified submodule(forward)
-
-expecting success of 7401.6 'modified submodule(forward), --files': 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
-
-	EOF
-	test_cmp expected actual
-
-ok 6 - modified submodule(forward), --files
-
-expecting success of 7401.7 'no ignore=all setting has any effect': 
-	git config -f .gitmodules submodule.sm1.path sm1 &&
-	git config -f .gitmodules submodule.sm1.ignore all &&
-	git config submodule.sm1.ignore all &&
-	git config diff.ignoreSubmodules all &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
-
-	EOF
-	test_cmp expected actual &&
-	git config --unset diff.ignoreSubmodules &&
-	git config --remove-section submodule.sm1 &&
-	git config -f .gitmodules --remove-section submodule.sm1
-
-ok 7 - no ignore=all setting has any effect
-
-expecting success of 7401.8 'modified submodule(backward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...db425b6 (2):
-	  < Add foo3
-	  < Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 8 - modified submodule(backward)
-
-expecting success of 7401.9 'modified submodule(backward and forward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...41fbea9 (4):
-	  > Add foo5
-	  > Add foo4
-	  < Add foo3
-	  < Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 9 - modified submodule(backward and forward)
-
-expecting success of 7401.10 '--summary-limit': 
-	git submodule summary -n 3 >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...41fbea9 (4):
-	  > Add foo5
-	  > Add foo4
-	  < Add foo3
-
-	EOF
-	test_cmp expected actual
-
-ok 10 - --summary-limit
-
-expecting success of 7401.11 'typechanged submodule(submodule->blob), --cached': 
-	git submodule summary --cached >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
-	  < Add foo5
-
-	EOF
-	test_cmp expected actual
-
-ok 11 - typechanged submodule(submodule->blob), --cached
-
-expecting success of 7401.12 'typechanged submodule(submodule->blob), --files': 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-	* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
-	  > Add foo5
-
-	EOF
-	test_cmp expected actual
-
-ok 12 - typechanged submodule(submodule->blob), --files
-
-expecting success of 7401.13 'typechanged submodule(submodule->blob)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9(submodule)->9da5fb8(blob):
-
-	EOF
-	test_cmp expected actual
-
-fatal: exec 'rev-parse': cd to 'sm1' failed: Not a directory
-ok 13 - typechanged submodule(submodule->blob)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success of 7401.14 'nonexistent commit': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9...6858906:
-	  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
-
-	EOF
-	test_cmp expected actual
-
-ok 14 - nonexistent commit
-
-expecting success of 7401.15 'typechanged submodule(blob->submodule)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 9da5fb8(blob)->6858906(submodule) (2):
-	  > Add foo7
-
-	EOF
-	test_cmp expected actual
-
-ok 15 - typechanged submodule(blob->submodule)
-
-expecting success of 7401.16 'deleted submodule': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
-
-	EOF
-	test_cmp expected actual
-
-ok 16 - deleted submodule
-
-expecting success of 7401.17 'create second submodule': 
-	test_create_repo sm2 &&
-	head7=$(add_file sm2 foo8 foo9) &&
-	git add sm2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7401-submodule-summary/sm2/.git/
-warning: adding embedded git repository: sm2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 17 - create second submodule
-
-expecting success of 7401.18 'multiple submodules': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
-
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-	test_cmp expected actual
-
-ok 18 - multiple submodules
-
-expecting success of 7401.19 'path filter': 
-	git submodule summary sm2 >actual &&
-	cat >expected <<-EOF &&
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-	test_cmp expected actual
-
-ok 19 - path filter
-
-expecting success of 7401.20 'given commit': 
-	git submodule summary HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
-
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-	test_cmp expected actual
-
-ok 20 - given commit
-
-expecting success of 7401.21 '--for-status': 
-	git submodule summary --for-status HEAD^ >actual &&
-	test_cmp - actual <<-EOF
-	* sm1 6858906...0000000:
-
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-
-ok 21 - --for-status
-
-expecting success of 7401.22 'fail when using --files together with --cached': 
-	test_must_fail git submodule summary --files --cached
-
-fatal: options '--cached' and '--files' cannot be used together
-ok 22 - fail when using --files together with --cached
-
-expecting success of 7401.23 'should not fail in an empty repo': 
-	git init xyzzy &&
-	cd xyzzy &&
-	git submodule summary >output 2>&1 &&
-	test_must_be_empty output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7409-submodule-detached-work-tree.sh ***
-expecting success of 7409.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7409.2 'submodule on detached working tree': 
-	git init --bare remote &&
-	test_create_repo bundle1 &&
-	(
-		cd bundle1 &&
-		test_commit "shoot" &&
-		git rev-parse --verify HEAD >../expect
-	) &&
-	mkdir home &&
-	(
-		cd home &&
-		GIT_WORK_TREE="$(pwd)" &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_WORK_TREE GIT_DIR &&
-		git clone --bare ../remote .dotfiles &&
-		git submodule add ../bundle1 .vim/bundle/sogood &&
-		test_commit "sogood" &&
-		(
-			unset GIT_WORK_TREE GIT_DIR &&
-			cd .vim/bundle/sogood &&
-			git rev-parse --verify HEAD >actual &&
-			test_cmp ../../../../expect actual
-		) &&
-		git push origin main
-	) &&
-	mkdir home2 &&
-	(
-		cd home2 &&
-		git clone --bare ../remote .dotfiles &&
-		GIT_WORK_TREE="$(pwd)" &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_WORK_TREE GIT_DIR &&
-		git checkout main &&
-		git submodule update --init &&
-		(
-			unset GIT_WORK_TREE GIT_DIR &&
-			cd .vim/bundle/sogood &&
-			git rev-parse --verify HEAD >actual &&
-			test_cmp ../../../../expect actual
-		)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/remote/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home2/.vim/bundle/sogood'...
-done.
-Submodule path '.vim/bundle/sogood': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
-ok 2 - submodule on detached working tree
-
-expecting success of 7409.3 'submodule on detached working pointed by core.worktree': 
-	mkdir home3 &&
-	(
-		cd home3 &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_DIR &&
-		git clone --bare ../remote "$GIT_DIR" &&
-		git config core.bare false &&
-		git config core.worktree .. &&
-		git checkout main &&
-		git submodule add ../bundle1 .vim/bundle/dupe &&
-		test_commit "dupe" &&
-		git push origin main
-	) &&
-	(
-		cd home &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_DIR &&
-		git config core.bare false &&
-		git config core.worktree .. &&
-		git pull &&
-		git submodule update --init &&
-		test -f .vim/bundle/dupe/shoot.t
-	)
-
-Cloning into bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
-done.
-Already on 'main'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
-   2f89248..e996493  main -> main
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7403-submodule-sync.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/.git/
-expecting success of 7403.1 'setup': 
-	git config --global protocol.file.allow always &&
-
-	echo file >file &&
-	git add file &&
-	test_tick &&
-	git commit -m upstream &&
-	git clone . super &&
-	git clone super submodule &&
-	(
-		cd submodule &&
-		git submodule add ../submodule sub-submodule &&
-		test_tick &&
-		git commit -m "sub-submodule"
-	) &&
-	(
-		cd super &&
-		git submodule add ../submodule submodule &&
-		test_tick &&
-		git commit -m "submodule"
-	) &&
-	git clone super super-clone &&
-	(
-		cd super-clone &&
-		git submodule update --init --recursive
-	) &&
-	git clone super empty-clone &&
-	(
-		cd empty-clone &&
-		git submodule init
-	) &&
-	git clone super top-only-clone &&
-	git clone super relative-clone &&
-	(
-		cd relative-clone &&
-		git submodule update --init --recursive
-	) &&
-	git clone super recursive-clone &&
-	(
-		cd recursive-clone &&
-		git submodule update --init --recursive
-	)
-
-[main (root-commit) 0c90624] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'super'...
-done.
-Cloning into 'submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule/sub-submodule'...
-done.
-[main 5a446ba] sub-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub-submodule
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super/submodule'...
-done.
-[main 78df3af] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-Cloning into 'super-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super-clone/submodule/sub-submodule'...
-done.
-Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Cloning into 'empty-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into 'top-only-clone'...
-done.
-Cloning into 'relative-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/relative-clone/submodule/sub-submodule'...
-done.
-Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Cloning into 'recursive-clone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/recursive-clone/submodule/sub-submodule'...
-done.
-Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-ok 1 - setup
-
-expecting success of 7403.2 'change submodule': 
-	(
-		cd submodule &&
-		echo second line >>file &&
-		test_tick &&
-		git commit -a -m "change submodule"
-	)
-
-[main c61fc01] change submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 2 - change submodule
-
-expecting success of 7403.3 'change submodule url': 
-	(
-		cd super &&
-		cd submodule &&
-		git checkout main &&
-		git pull
-	) &&
-	mv submodule moved-submodule &&
-	(
-		cd moved-submodule &&
-		git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
-		test_tick &&
-		git commit -a -m moved-sub-submodule
-	) &&
-	(
-		cd super &&
-		git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
-		test_tick &&
-		git commit -a -m moved-submodule
-	)
-
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule
-   5a446ba..c61fc01  main       -> origin/main
-Updating 5a446ba..c61fc01
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-[main 9f583c0] moved-sub-submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main f2e88dd] moved-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 3 - change submodule url
-
-expecting success of 7403.4 '"git submodule sync" should update submodule URLs': 
-	(
-		cd super-clone &&
-		git pull --no-recurse-submodules &&
-		git submodule sync
-	) &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test ! -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule &&
-		git checkout main &&
-		git pull
-	) &&
-	(
-		cd super-clone &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  main       -> origin/main
-Updating 78df3af..f2e88dd
-Fast-forward
- .gitmodules | 2 +-
- submodule   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Synchronizing submodule url for 'submodule'
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/moved-submodule
-   5a446ba..9f583c0  main       -> origin/main
-Updating 5a446ba..9f583c0
-Fast-forward
- .gitmodules | 2 +-
- file        | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 4 - "git submodule sync" should update submodule URLs
-
-expecting success of 7403.5 '"git submodule sync --recursive" should update all submodule URLs': 
-	(
-		cd super-clone &&
-		(
-			cd submodule &&
-			git pull --no-recurse-submodules
-		) &&
-		git submodule sync --recursive
-	) &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule/sub-submodule &&
-		git checkout main &&
-		git pull
-	)
-
-Already up to date.
-Synchronizing submodule url for 'submodule'
-Synchronizing submodule url for 'submodule/sub-submodule'
-Previous HEAD position was 0c90624 upstream
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/moved-submodule
-   5a446ba..9f583c0  main       -> origin/main
-Updating 5a446ba..9f583c0
-Fast-forward
- .gitmodules | 2 +-
- file        | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 5 - "git submodule sync --recursive" should update all submodule URLs
-
-expecting success of 7403.6 'reset submodule URLs': 
-	reset_submodule_urls super-clone
-
-ok 6 - reset submodule URLs
-
-expecting success of 7403.7 '"git submodule sync" should update submodule URLs - subdirectory': 
-	(
-		cd super-clone &&
-		git pull --no-recurse-submodules &&
-		mkdir -p sub &&
-		cd sub &&
-		git submodule sync >../../output
-	) &&
-	test_grep "\\.\\./submodule" output &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test ! -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule &&
-		git checkout main &&
-		git pull
-	) &&
-	(
-		cd super-clone &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-Already up to date.
-Synchronizing submodule url for '../submodule'
-Already on 'main'
-M	sub-submodule
-Your branch is up to date with 'origin/main'.
-Already up to date.
-ok 7 - "git submodule sync" should update submodule URLs - subdirectory
-
-expecting success of 7403.8 '"git submodule sync --recursive" should update all submodule URLs - subdirectory': 
-	(
-		cd super-clone &&
-		(
-			cd submodule &&
-			git pull --no-recurse-submodules
-		) &&
-		mkdir -p sub &&
-		cd sub &&
-		git submodule sync --recursive >../../output
-	) &&
-	test_grep "\\.\\./submodule/sub-submodule" output &&
-	test -d "$(
-		cd super-clone/submodule &&
-		git config remote.origin.url
-	)" &&
-	test -d "$(
-		cd super-clone/submodule/sub-submodule &&
-		git config remote.origin.url
-	)" &&
-	(
-		cd super-clone/submodule/sub-submodule &&
-		git checkout main &&
-		git pull
-	)
-
-Already up to date.
-Synchronizing submodule url for '../submodule/sub-submodule'
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-Already up to date.
-ok 8 - "git submodule sync --recursive" should update all submodule URLs - subdirectory
-
-expecting success of 7403.9 '"git submodule sync" should update known submodule URLs': 
-	(
-		cd empty-clone &&
-		git pull &&
-		git submodule sync &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  main       -> origin/main
-Could not access submodule 'submodule' at commit f2e88dd
-Updating 78df3af..f2e88dd
-Fast-forward
- .gitmodules | 2 +-
- submodule   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Synchronizing submodule url for 'submodule'
-ok 9 - "git submodule sync" should update known submodule URLs
-
-expecting success of 7403.10 '"git submodule sync" should not vivify uninteresting submodule': 
-	(
-		cd top-only-clone &&
-		git pull &&
-		git submodule sync &&
-		test -z "$(git config submodule.submodule.url)" &&
-		git submodule sync submodule &&
-		test -z "$(git config submodule.submodule.url)"
-	)
-
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  main       -> origin/main
-Updating 78df3af..f2e88dd
-Fast-forward
- .gitmodules | 2 +-
- submodule   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 10 - "git submodule sync" should not vivify uninteresting submodule
-
-expecting success of 7403.11 '"git submodule sync" handles origin URL of the form foo': 
-	(
-		cd relative-clone &&
-		git remote set-url origin foo &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual fails with: "cannot strip off url foo
-			test "$(git config remote.origin.url)" = "../submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 11 - "git submodule sync" handles origin URL of the form foo
-
-expecting success of 7403.12 '"git submodule sync" handles origin URL of the form foo/bar': 
-	(
-		cd relative-clone &&
-		git remote set-url origin foo/bar &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual foo/submodule
-			test "$(git config remote.origin.url)" = "../foo/submodule"
-		) &&
-		(
-			cd submodule/sub-submodule &&
-			test "$(git config remote.origin.url)" != "../../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 12 - "git submodule sync" handles origin URL of the form foo/bar
-
-expecting success of 7403.13 '"git submodule sync --recursive" propagates changes in origin': 
-	(
-		cd recursive-clone &&
-		git remote set-url origin foo/bar &&
-		git submodule sync --recursive &&
-		(
-			cd submodule &&
-			#actual foo/submodule
-			test "$(git config remote.origin.url)" = "../foo/submodule"
-		) &&
-		(
-			cd submodule/sub-submodule &&
-			test "$(git config remote.origin.url)" = "../../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-Synchronizing submodule url for 'submodule/sub-submodule'
-ok 13 - "git submodule sync --recursive" propagates changes in origin
-
-expecting success of 7403.14 '"git submodule sync" handles origin URL of the form ./foo': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ./foo &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ./submodule
-			test "$(git config remote.origin.url)" = "../submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 14 - "git submodule sync" handles origin URL of the form ./foo
-
-expecting success of 7403.15 '"git submodule sync" handles origin URL of the form ./foo/bar': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ./foo/bar &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ./foo/submodule
-			test "$(git config remote.origin.url)" = "../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 15 - "git submodule sync" handles origin URL of the form ./foo/bar
-
-expecting success of 7403.16 '"git submodule sync" handles origin URL of the form ../foo': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ../foo &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ../submodule
-			test "$(git config remote.origin.url)" = "../../submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 16 - "git submodule sync" handles origin URL of the form ../foo
-
-expecting success of 7403.17 '"git submodule sync" handles origin URL of the form ../foo/bar': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ../foo/bar &&
-		git submodule sync &&
-		(
-			cd submodule &&
-			#actual ../foo/submodule
-			test "$(git config remote.origin.url)" = "../../foo/submodule"
-		)
-	)
-
-Synchronizing submodule url for 'submodule'
-ok 17 - "git submodule sync" handles origin URL of the form ../foo/bar
-
-expecting success of 7403.18 '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule': 
-	(
-		cd relative-clone &&
-		git remote set-url origin ../foo/bar &&
-		mkdir -p a/b/c &&
-		(
-			cd a/b/c &&
-			git init &&
-			>.gitignore &&
-			git add .gitignore &&
-			test_tick &&
-			git commit -m "initial commit"
-		) &&
-		git submodule add ../bar/a/b/c ./a/b/c &&
-		git submodule sync &&
-		(
-			cd a/b/c &&
-			#actual ../foo/bar/a/b/c
-			test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
-		)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/relative-clone/a/b/c/.git/
-[main (root-commit) 1f9e67a] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 .gitignore
-Adding existing repo at 'a/b/c' to the index
-Synchronizing submodule url for 'a/b/c'
-Synchronizing submodule url for 'submodule'
-ok 18 - "git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7006-pager.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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-02-09 06:55:06.086108132 +0000
-+++ actual	2025-02-09 06:55:06.134108438 +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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 40 - color when writing to 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:
 
-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
+  git switch -c <new-branch-name>
 
-ok 41 - colors are suppressed by color.pager
+Or undo this operation with:
 
-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
+  git switch -
 
-ok 42 - color when writing to a file intended for a pager
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at ab76817 Side M one, D two, A three
+ok 17 - checkout with ambiguous tag/branch names
 
-ok 43 - colors are sent to pager for external commands
+expecting success of 7201.18 'switch branches while in subdirectory': 
+	git reset --hard &&
+	git checkout main &&
 
-expecting success of 7006.44 'setup: some aliases': 
-	git config alias.aliasedlog log &&
-	git config alias.true "!true"
+	mkdir subs &&
+	git -C subs checkout side &&
+	! test -f subs/one &&
+	rm -fr subs
 
-ok 44 - setup: some aliases
+HEAD is now at ab76817 Side M one, D two, A three
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to branch 'main'
+Switched to branch 'side'
+ok 18 - switch branches while in subdirectory
 
-expecting success of 7006.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 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" &&
 
-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 main &&
+	mkdir -p subs &&
+	git -C subs checkout side -- bero &&
+	test -f subs/bero
 
-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
+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 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 7201.20 'checkout w/--track sets up tracking': 
+	git config branch.autosetupmerge false &&
+	git checkout main &&
+	git checkout --track -b track1 &&
+	test "$(git config branch.track1.remote)" &&
+	test "$(git config branch.track1.merge)"
 
-expecting success of 7006.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
+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 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 7201.21 'checkout w/autosetupmerge=always sets up tracking': 
+	test_when_finished git config branch.autosetupmerge false &&
+	git config branch.autosetupmerge always &&
+	git checkout main &&
+	git checkout -b track2 &&
+	test "$(git config branch.track2.remote)" &&
+	test "$(git config branch.track2.merge)"
 
-expecting success of 7006.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
+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 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 7201.22 'checkout w/--track from non-branch HEAD fails': 
+	git checkout main^0 &&
+	test_must_fail git symbolic-ref HEAD &&
+	test_must_fail git checkout --track -b track &&
+	test_must_fail git rev-parse --verify track &&
+	test_must_fail git symbolic-ref HEAD &&
+	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 
-expecting success of 7006.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
+Note: switching to 'main^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+fatal: cannot set up tracking information; starting point 'HEAD' is not a branch
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 22 - checkout w/--track from non-branch HEAD fails
 
-expecting success of 7006.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 7201.23 'checkout w/--track from tag fails': 
+	git checkout main^0 &&
+	test_must_fail git symbolic-ref HEAD &&
+	test_must_fail git checkout --track -b track frotz &&
+	test_must_fail git rev-parse --verify track &&
+	test_must_fail git symbolic-ref HEAD &&
+	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 
-expecting success of 7006.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
+HEAD is now at 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+warning: refname 'frotz' is ambiguous.
+warning: refname 'frotz' is ambiguous.
+fatal: ambiguous object name: 'frotz'
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 23 - checkout w/--track from tag fails
 
-expecting success of 7006.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 7201.24 'detach a symbolic link HEAD': 
+	git checkout main &&
+	git config --bool core.prefersymlinkrefs yes &&
+	git checkout side &&
+	git checkout main &&
+	it=$(git symbolic-ref HEAD) &&
+	test "z$it" = zrefs/heads/main &&
+	here=$(git rev-parse --verify refs/heads/main) &&
+	git checkout side^ &&
+	test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
 
-expecting success of 7006.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
+Switched to branch 'main'
+A	subs/bero
+Switched to branch 'side'
+Switched to branch 'main'
+Note: switching to 'side^'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.67 'git -p true - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git -p true &&
-		test_path_is_file core.pager_used
-	
-ok 67 - git -p true - repository-local core.pager setting overrides PAGER
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-expecting success of 7006.69 'git -p true - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git -p true &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 69 - git -p true - GIT_PAGER overrides core.pager
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at ab76817 Side M one, D two, A three
+ok 24 - detach a symbolic link HEAD
 
-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 7201.25 'checkout with --track fakes a sensible -b <name>': 
+	git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
+	git update-ref refs/remotes/origin/koala/bear renamer &&
 
-expecting success of 7006.73 'git -p request-pull - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_must_fail test_terminal  git -p request-pull
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 73 - git -p request-pull - core.pager overrides PAGER from subdirectory
+	git checkout --track origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-expecting success of 7006.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
+	git checkout main && git branch -D koala/bear &&
 
-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 --track refs/remotes/origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-expecting success of 7006.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
+	git checkout main && git branch -D koala/bear &&
 
-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
+	git checkout --track remotes/origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
 
-expecting success of 7006.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
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+Switched to branch 'main'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+Switched to branch 'main'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+ok 25 - checkout with --track fakes a sensible -b <name>
 
-expecting success of 7006.79 'core.pager in repo config works and retains cwd': 
-	sane_unset GIT_PAGER &&
-	test_config core.pager "cat >cwd-retained" &&
-	(
-		cd sub &&
-		rm -f cwd-retained &&
-		test_terminal git -p rev-parse HEAD &&
-		test_path_is_file cwd-retained
-	)
+expecting success of 7201.26 'checkout with --track, but without -b, fails with too short tracked name': 
+	test_must_fail git checkout --track renamer
 
-ok 79 - core.pager in repo config works and retains cwd
+fatal: missing branch name; try -b
+ok 26 - checkout with --track, but without -b, fails with too short tracked name
 
-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
-	)
+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
 
-ok 80 - core.pager is found via alias in subdirectory
+error: path 'file' is unmerged
+ok 27 - checkout an unmerged path should fail
 
-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 Feb  9 06:55 GIT_PAGER_used
-not ok 81 - no pager for 'git -p nonsense' # TODO known breakage
+expecting success of 7201.28 'checkout with an unmerged path can be ignored': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -f fild file filf &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp sample file
 
-expecting success of 7006.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
+warning: path 'file' is unmerged
+Updated 2 paths from the index
+ok 28 - checkout with an unmerged path can be ignored
 
-expecting success of 7006.83 'git shortlog - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_file PAGER_used
-	
-ok 83 - git shortlog - PAGER overrides default pager
+expecting success of 7201.29 'checkout unmerged stage': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --ours . &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp expect file &&
+	git checkout --theirs file &&
+	test ztheirside = "z$(cat file)"
 
-expecting success of 7006.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
+Updated 3 paths from the index
+Updated 1 path from the index
+ok 29 - checkout unmerged stage
 
-expecting success of 7006.85 'git shortlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git shortlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 85 - git shortlog - core.pager overrides PAGER from subdirectory
+expecting success of 7201.30 'checkout --ours is incompatible with switching': 
+	test_must_fail git checkout --ours 2>error &&
+	test_grep "needs the paths to check out" error &&
 
-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
+	test_must_fail git checkout --ours HEAD 2>error &&
+	test_grep "cannot be used with switching" error &&
 
-expecting success of 7006.87 'setup: configure shortlog not to paginate': 
-	git config pager.shortlog false
+	test_must_fail git checkout --ours main 2>error &&
+	test_grep "cannot be used with switching" error &&
 
-ok 87 - setup: configure shortlog not to paginate
+	git checkout --ours file
 
-expecting success of 7006.88 'no pager for 'git shortlog'': 
-		rm -f GIT_PAGER_used &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_missing GIT_PAGER_used
-	
-ok 88 - no pager for 'git shortlog'
+fatal: '--ours/--theirs' needs the paths to check out
+fatal: '--ours/--theirs' cannot be used with switching branches
+fatal: '--ours/--theirs' cannot be used with switching branches
+Updated 1 path from the index
+ok 30 - checkout --ours is incompatible with switching
 
-expecting success of 7006.89 'git shortlog - core.pager is not used from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git shortlog
-		) &&
-		! test_path_is_file core.pager_used
-	
-File core.pager_used doesn't exist
-ok 89 - git shortlog - core.pager is not used from subdirectory
+expecting success of 7201.31 'checkout path with --merge from tree-ish is a no-no': 
+	setup_conflicting_index &&
+	test_must_fail git checkout -m HEAD -- file
 
-expecting success of 7006.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
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+ok 31 - checkout path with --merge from tree-ish is a no-no
 
-expecting success of 7006.91 'git -p shortlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p shortlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 91 - git -p shortlog - core.pager overrides PAGER from subdirectory
+expecting success of 7201.32 'checkout with --merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -m -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-expecting success of 7006.92 'git -p apply </dev/null - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_must_fail test_terminal  git -p apply </dev/null
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 92 - git -p apply </dev/null - core.pager overrides PAGER from subdirectory
+ok 32 - checkout with --merge
 
-expecting success of 7006.93 'command-specific pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_unconfig core.pager &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.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 93 - command-specific pager
+ok 33 - checkout -m works after (mistaken) resolution
 
-expecting success of 7006.94 'command-specific pager overrides core.pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config core.pager "exit 1" &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.34 'checkout -m works after (mistaken) resolution to remove': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	# resolve to remove
+	git rm file &&
+	git checkout --merge -- fild file filf &&
+	{
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	} >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-ok 94 - command-specific pager overrides core.pager
+rm 'file'
+ok 34 - checkout -m works after (mistaken) resolution to remove
 
-expecting success of 7006.95 'command-specific pager overridden by environment': 
-	GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
-	>actual &&
-	echo "foo:initial" >expect &&
-	test_config pager.log "exit 1" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.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 95 - command-specific pager overridden by environment
+ok 35 - checkout with --merge, in diff3 -m style
 
-expecting success of 7006.96 'setup external command': 
-	cat >git-external <<-\EOF &&
-	#!/bin/sh
-	git "$@"
-	EOF
-	chmod +x git-external
+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 96 - setup external command
+ok 36 - checkout --conflict=merge, overriding config
 
-expecting success of 7006.97 'command-specific pager works for external commands': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config pager.external "sed s/^/foo:/ >actual" &&
-	test_terminal git --exec-path="$(pwd)" external log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.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 97 - command-specific pager works for external commands
+ok 37 - checkout --conflict=diff3
 
-expecting success of 7006.98 'sub-commands of externals use their own pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git --exec-path=. external log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.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 98 - sub-commands of externals use their own pager
+ok 38 - checkout --conflict=diff3 --no-conflict does not merge
 
-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
+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
 
-initial
-ok 99 - external command pagers override sub-commands
+ok 39 - checkout --conflict=diff3 --no-merge does not merge
 
-expecting success of 7006.100 'command with underscores does not complain': 
-	write_script git-under_score <<-\EOF &&
-	echo ok
+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
-	git --exec-path=. under_score >actual 2>&1 &&
-	echo ok >expect &&
-	test_cmp expect actual
+	test_cmp expect file
 
-ok 100 - command with underscores does not complain
+ok 40 - checkout --no-merge --conflict=diff3 does merge
 
-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 &&
+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 &&
-	initial  one      two      three    four     five
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
 	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 
+	test_cmp expect file
 
-expecting success of 7006.102 'setup trace2': 
-	GIT_TRACE2_BRIEF=1 &&
-	export GIT_TRACE2_BRIEF
+ok 41 - checkout --merge --conflict=diff3 --no-conflict does merge
 
-ok 102 - setup trace2
+expecting success of 7201.42 'checkout with invalid conflict style': 
+	test_must_fail git checkout --conflict=bad 2>actual -- file &&
+	echo "error: unknown conflict style ${SQ}bad${SQ}" >expect &&
+	test_cmp expect actual
 
-expecting success of 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
+ok 42 - checkout with invalid conflict style
 
-[master 06d9144] this is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit message
- Author: A U Thor <author@example.com>
-ok 103 - setup large log output
+expecting success of 7201.43 'failing checkout -b should not break working tree': 
+	git clean -fd &&  # Remove untracked files in the way
+	git reset --hard main &&
+	git symbolic-ref HEAD refs/heads/main &&
+	test_must_fail git checkout -b renamer side^ &&
+	test $(git symbolic-ref HEAD) = refs/heads/main &&
+	git diff --exit-code &&
+	git diff --cached --exit-code
 
-expecting success of 7006.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" &&
+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
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+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
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:0 " child-exits &&
-	test_path_is_file pager-used
+HEAD is now at 7329388 Initial A one, A two
+Note: switching to 'main^0'.
 
-died of signal 13 at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-terminal.perl line 33.
-child_exit[0] pid:1865754 code:0 elapsed:0.004797
-ok 104 - git returns SIGPIPE on early pager exit
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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 you want to 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:1 " child-exits &&
-	test_path_is_file pager-used
+Or undo this operation with:
 
-died of signal 13 at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-terminal.perl line 33.
-child_exit[0] pid:1866138 code:1 elapsed:0.005101
-ok 105 - git returns SIGPIPE on early pager non-zero exit
+  git switch -
 
-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" &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	test_terminal git log &&
+HEAD is now at 7329388 Initial A one, A two
+ok 44 - switch out of non-branch
 
-	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 7201.45 'custom merge driver with checkout -m': 
+	git reset --hard &&
 
-child_exit[0] pid:1866508 code:1 elapsed:0.010912
-ok 106 - git discards pager non-zero exit without SIGPIPE
+	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
+	git config merge.filfre.name "Feel-free merge driver" &&
+	git config merge.filfre.recursive binary &&
+	echo "arm merge=filfre" >.gitattributes &&
 
-expecting success of 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
+	git checkout -b left &&
+	echo neutral >arm &&
+	git add arm .gitattributes &&
+	test_tick &&
+	git commit -m neutral &&
+	git branch right &&
 
-fatal: unable to execute pager 'does-not-exist'
-ok 107 - git errors when asked to execute nonexisting pager
+	echo left >arm &&
+	test_tick &&
+	git commit -a -m left &&
+	git checkout right &&
 
-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" &&
+	echo right >arm &&
+	test_tick &&
+	git commit -a -m right &&
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+	test_must_fail git merge left &&
+	(
+		for t in filfre-common left right
+		do
+			grep $t arm || exit 1
+		done
+	) &&
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:143 " child-exits &&
-	test_path_is_file pager-used
+	mv arm expect &&
+	git checkout -m arm &&
+	test_cmp expect arm
 
-died of signal 13 at /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/test-terminal.perl line 33.
-child_exit[0] pid:1867147 code:143 elapsed:0.004139
-ok 108 - git returns SIGPIPE on propagated signals from pager
+HEAD is now at 7329388 Initial A one, A two
+Switched to a new branch 'left'
+[left b257dc6] neutral
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 arm
+[left 2459c9d] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'right'
+[right 6b476b9] right
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging arm
+CONFLICT (content): Merge conflict in arm
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| filfre-common
+left
+right
+Recreated 1 merge conflict
+ok 45 - custom merge driver with checkout -m
 
-expecting success of 7006.109 'non-existent pager doesnt cause crash': 
-	test_config pager.show invalid-pager &&
-	test_must_fail test_terminal git show
+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
 
-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 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
 
-# still have 3 known breakage(s)
-# passed all remaining 106 test(s)
-1..109
+# passed all 46 test(s)
+1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6423-merge-rename-directories.sh ***
@@ -463461,390 +463363,441 @@
 1..76
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7408-submodule-reference.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/.git/
-expecting success of 7408.1 'setup': 
+*** t7409-submodule-detached-work-tree.sh ***
+expecting success of 7409.1 'setup': 
 	git config --global protocol.file.allow always
 
 ok 1 - setup
 
-expecting success of 7408.2 'preparing first repository': 
-	test_create_repo A &&
+expecting success of 7409.2 'submodule on detached working tree': 
+	git init --bare remote &&
+	test_create_repo bundle1 &&
 	(
-		cd A &&
-		echo first >file1 &&
-		git add file1 &&
-		git commit -m A-initial
+		cd bundle1 &&
+		test_commit "shoot" &&
+		git rev-parse --verify HEAD >../expect
+	) &&
+	mkdir home &&
+	(
+		cd home &&
+		GIT_WORK_TREE="$(pwd)" &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_WORK_TREE GIT_DIR &&
+		git clone --bare ../remote .dotfiles &&
+		git submodule add ../bundle1 .vim/bundle/sogood &&
+		test_commit "sogood" &&
+		(
+			unset GIT_WORK_TREE GIT_DIR &&
+			cd .vim/bundle/sogood &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../../expect actual
+		) &&
+		git push origin main
+	) &&
+	mkdir home2 &&
+	(
+		cd home2 &&
+		git clone --bare ../remote .dotfiles &&
+		GIT_WORK_TREE="$(pwd)" &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_WORK_TREE GIT_DIR &&
+		git checkout main &&
+		git submodule update --init &&
+		(
+			unset GIT_WORK_TREE GIT_DIR &&
+			cd .vim/bundle/sogood &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../../expect actual
+		)
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A/.git/
-[master (root-commit) 3f492fa] A-initial
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/remote/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 file1
-ok 2 - preparing first repository
+ 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7408.3 'preparing second repository': 
-	git clone A B &&
+expecting success of 7409.3 'submodule on detached working pointed by core.worktree': 
+	mkdir home3 &&
 	(
-		cd B &&
-		echo second >file2 &&
-		git add file2 &&
-		git commit -m B-addition &&
-		git repack -a -d &&
-		git prune
+		cd home3 &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_DIR &&
+		git clone --bare ../remote "$GIT_DIR" &&
+		git config core.bare false &&
+		git config core.worktree .. &&
+		git checkout main &&
+		git submodule add ../bundle1 .vim/bundle/dupe &&
+		test_commit "dupe" &&
+		git push origin main
+	) &&
+	(
+		cd home &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_DIR &&
+		git config core.bare false &&
+		git config core.worktree .. &&
+		git pull &&
+		git submodule update --init &&
+		test -f .vim/bundle/dupe/shoot.t
 	)
 
-Cloning into 'B'...
+Cloning into bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
 done.
-[master c9a83e7] B-addition
+Already on 'main'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home3/.vim/bundle/dupe'...
+done.
+[main e996493] dupe
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 3 - preparing second repository
+ 3 files changed, 5 insertions(+)
+ create mode 160000 .vim/bundle/dupe
+ create mode 100644 dupe.t
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
+   2f89248..e996493  main -> main
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/dupe'...
+done.
+Submodule path '.vim/bundle/dupe': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
+ok 3 - submodule on detached working pointed by core.worktree
 
-expecting success of 7408.4 'preparing superproject': 
-	test_create_repo super &&
-	(
-		cd super &&
-		echo file >file &&
-		git add file &&
-		git commit -m B-super-initial
-	)
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7401-submodule-summary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7401-submodule-summary/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super/.git/
-[master (root-commit) 0776138] B-super-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 4 - preparing superproject
+	EOF
+	test_cmp expected actual
 
-expecting success of 7408.5 'submodule add --reference uses alternates': 
+warning: adding embedded git repository: sm1
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm1
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm1
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 1 - added submodule
+
+expecting success of 7401.2 'added submodule (subdirectory)': 
+	mkdir sub &&
 	(
-		cd super &&
-		git submodule add --reference ../B "file://$base_dir/A" sub &&
-		git commit -m B-super-added &&
-		git repack -ad
+		cd sub &&
+		git submodule summary >../actual
 	) &&
-	test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
+	cat >expected <<-EOF &&
+	* ../sm1 0000000...a2c4dab (2):
+	  > Add foo2
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super/sub'...
-[master 6aa4065] B-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 5 - submodule add --reference uses alternates
+	EOF
+	test_cmp expected actual
 
-expecting success of 7408.6 'submodule add --reference with --dissociate does not use alternates': 
+ok 2 - added submodule (subdirectory)
+
+expecting success of 7401.3 'added submodule (subdirectory only)': 
 	(
-		cd super &&
-		git submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate &&
-		git commit -m B-super-added &&
-		git repack -ad
+		cd sub &&
+		git submodule summary . >../actual
 	) &&
-	test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates
+	test_must_be_empty actual
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super/sub-dissociate'...
-[master 315654d] B-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub-dissociate
-ok 6 - submodule add --reference with --dissociate does not use alternates
+ok 3 - added submodule (subdirectory only)
 
-expecting success of 7408.7 'that reference gets used with add': 
+expecting success of 7401.4 'added submodule (subdirectory with explicit path)': 
 	(
-		cd super/sub &&
-		echo "0 objects, 0 kilobytes" >expected &&
-		git count-objects >current &&
-		diff expected current
-	)
+		cd sub &&
+		git submodule summary ../sm1 >../actual
+	) &&
+	cat >expected <<-EOF &&
+	* ../sm1 0000000...a2c4dab (2):
+	  > Add foo2
 
-ok 7 - that reference gets used with add
+	EOF
+	test_cmp expected actual
 
-expecting success of 7408.8 'updating superproject keeps alternates': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super-clone &&
-	git -C super-clone submodule update --init --reference ../B &&
-	test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
+ok 4 - added submodule (subdirectory with explicit path)
 
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 8 - updating superproject keeps alternates
+expecting success of 7401.5 'modified submodule(forward)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
 
-expecting success of 7408.9 'updating superproject with --dissociate does not keep alternates': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super-clone &&
-	git -C super-clone submodule update --init --reference ../B --dissociate &&
-	test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates
+	EOF
+	test_cmp expected actual
 
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 9 - updating superproject with --dissociate does not keep alternates
+ok 5 - modified submodule(forward)
 
-expecting success of 7408.10 'submodules use alternates when cloning a superproject': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone --reference super --recursive super super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# test submodule has correct setup
-		test_alternate_is_used .git/modules/sub/objects/info/alternates sub
-	)
+expecting success of 7401.6 'modified submodule(forward), --files': 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
 
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 10 - submodules use alternates when cloning a superproject
+	EOF
+	test_cmp expected actual
 
-expecting success of 7408.11 'missing submodule alternate fails clone and submodule update': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super2 &&
-	test_must_fail git clone --recursive --reference super2 super2 super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# update of the submodule succeeds
-		test_must_fail git submodule update --init &&
-		# and we have no alternates:
-		test_path_is_missing .git/modules/sub/objects/info/alternates &&
-		test_path_is_missing sub/file1
-	)
+ok 6 - modified submodule(forward), --files
 
-Cloning into 'super2'...
-done.
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-ok 11 - missing submodule alternate fails clone and submodule update
+expecting success of 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 7408.12 'ignoring missing submodule alternates passes clone and submodule update': 
-	test_when_finished "rm -rf super-clone" &&
-	git clone --reference-if-able super2 --recursive super2 super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# update of the submodule succeeds
-		git submodule update --init &&
-		# and we have no alternates:
-		test_path_is_missing .git/modules/sub/objects/info/alternates &&
-		test_path_is_file sub/file1
-	)
+	EOF
+	test_cmp expected actual &&
+	git config --unset diff.ignoreSubmodules &&
+	git config --remove-section submodule.sm1 &&
+	git config -f .gitmodules --remove-section submodule.sm1
 
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 12 - ignoring missing submodule alternates passes clone and submodule update
+ok 7 - no ignore=all setting has any effect
 
-expecting success of 7408.13 'preparing second superproject with a nested submodule plus partial clone': 
-	test_create_repo supersuper &&
-	(
-		cd supersuper &&
-		echo "I am super super." >file &&
-		git add file &&
-		git commit -m B-super-super-initial &&
-		git submodule add "file://$base_dir/super" subwithsub &&
-		git commit -m B-super-super-added &&
-		git submodule update --init --recursive &&
-		git repack -ad
-	) &&
-	git clone supersuper supersuper2 &&
-	(
-		cd supersuper2 &&
-		git submodule update --init
-	)
+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.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/.git/
-[master (root-commit) c928525] B-super-super-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/subwithsub'...
-[master dd96979] B-super-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subwithsub
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Cloning into 'supersuper2'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/subwithsub'...
-Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
-ok 13 - preparing second superproject with a nested submodule plus partial clone
+	EOF
+	test_cmp expected actual
 
-expecting success of 7408.14 'nested submodule alternate in works and is actually used': 
-	test_when_finished "rm -rf supersuper-clone" &&
-	git clone --recursive --reference supersuper supersuper supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# immediate submodule has alternate:
-		test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
-		# nested submodule also has alternate:
-		test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
-	)
+ok 8 - modified submodule(backward)
 
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 14 - nested submodule alternate in works and is actually used
+expecting success of 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
 
-expecting success of 7408.15 'missing nested submodule alternate fails clone and submodule update': 
-	test_when_finished "rm -rf supersuper-clone" &&
-	test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		check_that_two_of_three_alternates_are_used &&
-		# update of the submodule fails
-		cat >expect <<-\EOF &&
-		fatal: submodule 'sub' cannot add alternate: path ... does not exist
-		Failed to clone 'sub'. Retry scheduled
-		fatal: submodule 'sub-dissociate' cannot add alternate: path ... does not exist
-		Failed to clone 'sub-dissociate'. Retry scheduled
-		fatal: submodule 'sub' cannot add alternate: path ... does not exist
-		Failed to clone 'sub' a second time, aborting
-		fatal: Failed to recurse into submodule path ...
-		EOF
-		test_must_fail git submodule update --init --recursive 2>err &&
-		grep -e fatal: -e ^Failed err >actual.raw &&
-		sed -e "s/path $SQ[^$SQ]*$SQ/path .../" <actual.raw >actual &&
-		test_cmp expect actual
-	)
+	EOF
+	test_cmp expected actual
 
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-hint: An alternate computed from a superproject's alternate is invalid.
-hint: To allow Git to clone without an alternate in such a case, set
-hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
-hint: '--reference-if-able' instead of '--reference'.
-fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-fatal: Failed to recurse into submodule path 'subwithsub'
-ok 15 - missing nested submodule alternate fails clone and submodule update
+ok 9 - modified submodule(backward and forward)
 
-expecting success of 7408.16 'missing nested submodule alternate in --reference-if-able mode': 
-	test_when_finished "rm -rf supersuper-clone" &&
-	git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		check_that_two_of_three_alternates_are_used &&
-		# update of the submodule succeeds
-		git submodule update --init --recursive
-	)
+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
 
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
-submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
-ok 16 - missing nested submodule alternate in --reference-if-able mode
+	EOF
+	test_cmp expected actual
 
-# passed all 16 test(s)
-1..16
+ok 10 - --summary-limit
+
+expecting success of 7401.11 'typechanged submodule(submodule->blob), --cached': 
+	git submodule summary --cached >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
+	  < Add foo5
+
+	EOF
+	test_cmp expected actual
+
+ok 11 - typechanged submodule(submodule->blob), --cached
+
+expecting success of 7401.12 'typechanged submodule(submodule->blob), --files': 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+	* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
+	  > Add foo5
+
+	EOF
+	test_cmp expected actual
+
+ok 12 - typechanged submodule(submodule->blob), --files
+
+expecting success of 7401.13 'typechanged submodule(submodule->blob)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9(submodule)->9da5fb8(blob):
+
+	EOF
+	test_cmp expected actual
+
+fatal: exec 'rev-parse': cd to 'sm1' failed: Not a directory
+ok 13 - typechanged submodule(submodule->blob)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7401-submodule-summary/sm1/.git/
+expecting success of 7401.14 'nonexistent commit': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9...6858906:
+	  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
+
+	EOF
+	test_cmp expected actual
+
+ok 14 - nonexistent commit
+
+expecting success of 7401.15 'typechanged submodule(blob->submodule)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 9da5fb8(blob)->6858906(submodule) (2):
+	  > Add foo7
+
+	EOF
+	test_cmp expected actual
+
+ok 15 - typechanged submodule(blob->submodule)
+
+expecting success of 7401.16 'deleted submodule': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
+
+	EOF
+	test_cmp expected actual
+
+ok 16 - deleted submodule
+
+expecting success of 7401.17 'create second submodule': 
+	test_create_repo sm2 &&
+	head7=$(add_file sm2 foo8 foo9) &&
+	git add sm2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7401-submodule-summary/sm2/.git/
+warning: adding embedded git repository: sm2
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm2
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm2
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 17 - create second submodule
+
+expecting success of 7401.18 'multiple submodules': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
+
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+	test_cmp expected actual
+
+ok 18 - multiple submodules
+
+expecting success of 7401.19 'path filter': 
+	git submodule summary sm2 >actual &&
+	cat >expected <<-EOF &&
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+	test_cmp expected actual
+
+ok 19 - path filter
+
+expecting success of 7401.20 'given commit': 
+	git submodule summary HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
+
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+	test_cmp expected actual
+
+ok 20 - given commit
+
+expecting success of 7401.21 '--for-status': 
+	git submodule summary --for-status HEAD^ >actual &&
+	test_cmp - actual <<-EOF
+	* sm1 6858906...0000000:
+
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+
+ok 21 - --for-status
+
+expecting success of 7401.22 'fail when using --files together with --cached': 
+	test_must_fail git submodule summary --files --cached
+
+fatal: options '--cached' and '--files' cannot be used together
+ok 22 - fail when using --files together with --cached
+
+expecting success of 7401.23 'should not fail in an empty repo': 
+	git init xyzzy &&
+	cd xyzzy &&
+	git submodule summary >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7411-submodule-config.sh ***
@@ -464235,58 +464188,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7417-submodule-path-url.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7413-submodule-is-active.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7413-submodule-is-active/.git/
 expecting success of 7413.1 'setup': 
@@ -464445,6 +464346,554 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7403-submodule-sync.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/.git/
+expecting success of 7403.1 'setup': 
+	git config --global protocol.file.allow always &&
+
+	echo file >file &&
+	git add file &&
+	test_tick &&
+	git commit -m upstream &&
+	git clone . super &&
+	git clone super submodule &&
+	(
+		cd submodule &&
+		git submodule add ../submodule sub-submodule &&
+		test_tick &&
+		git commit -m "sub-submodule"
+	) &&
+	(
+		cd super &&
+		git submodule add ../submodule submodule &&
+		test_tick &&
+		git commit -m "submodule"
+	) &&
+	git clone super super-clone &&
+	(
+		cd super-clone &&
+		git submodule update --init --recursive
+	) &&
+	git clone super empty-clone &&
+	(
+		cd empty-clone &&
+		git submodule init
+	) &&
+	git clone super top-only-clone &&
+	git clone super relative-clone &&
+	(
+		cd relative-clone &&
+		git submodule update --init --recursive
+	) &&
+	git clone super recursive-clone &&
+	(
+		cd recursive-clone &&
+		git submodule update --init --recursive
+	)
+
+[main (root-commit) 0c90624] upstream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'super'...
+done.
+Cloning into 'submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule/sub-submodule'...
+done.
+[main 5a446ba] sub-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub-submodule
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super/submodule'...
+done.
+[main 78df3af] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into 'super-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super-clone/submodule/sub-submodule'...
+done.
+Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Cloning into 'empty-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into 'top-only-clone'...
+done.
+Cloning into 'relative-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/relative-clone/submodule/sub-submodule'...
+done.
+Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Cloning into 'recursive-clone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/recursive-clone/submodule/sub-submodule'...
+done.
+Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+ok 1 - setup
+
+expecting success of 7403.2 'change submodule': 
+	(
+		cd submodule &&
+		echo second line >>file &&
+		test_tick &&
+		git commit -a -m "change submodule"
+	)
+
+[main c61fc01] change submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 2 - change submodule
+
+expecting success of 7403.3 'change submodule url': 
+	(
+		cd super &&
+		cd submodule &&
+		git checkout main &&
+		git pull
+	) &&
+	mv submodule moved-submodule &&
+	(
+		cd moved-submodule &&
+		git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
+		test_tick &&
+		git commit -a -m moved-sub-submodule
+	) &&
+	(
+		cd super &&
+		git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
+		test_tick &&
+		git commit -a -m moved-submodule
+	)
+
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/submodule
+   5a446ba..c61fc01  main       -> origin/main
+Updating 5a446ba..c61fc01
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+[main 9f583c0] moved-sub-submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f2e88dd] moved-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 3 - change submodule url
+
+expecting success of 7403.4 '"git submodule sync" should update submodule URLs': 
+	(
+		cd super-clone &&
+		git pull --no-recurse-submodules &&
+		git submodule sync
+	) &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test ! -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule &&
+		git checkout main &&
+		git pull
+	) &&
+	(
+		cd super-clone &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  main       -> origin/main
+Updating 78df3af..f2e88dd
+Fast-forward
+ .gitmodules | 2 +-
+ submodule   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Synchronizing submodule url for 'submodule'
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/moved-submodule
+   5a446ba..9f583c0  main       -> origin/main
+Updating 5a446ba..9f583c0
+Fast-forward
+ .gitmodules | 2 +-
+ file        | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 4 - "git submodule sync" should update submodule URLs
+
+expecting success of 7403.5 '"git submodule sync --recursive" should update all submodule URLs': 
+	(
+		cd super-clone &&
+		(
+			cd submodule &&
+			git pull --no-recurse-submodules
+		) &&
+		git submodule sync --recursive
+	) &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule/sub-submodule &&
+		git checkout main &&
+		git pull
+	)
+
+Already up to date.
+Synchronizing submodule url for 'submodule'
+Synchronizing submodule url for 'submodule/sub-submodule'
+Previous HEAD position was 0c90624 upstream
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/moved-submodule
+   5a446ba..9f583c0  main       -> origin/main
+Updating 5a446ba..9f583c0
+Fast-forward
+ .gitmodules | 2 +-
+ file        | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 5 - "git submodule sync --recursive" should update all submodule URLs
+
+expecting success of 7403.6 'reset submodule URLs': 
+	reset_submodule_urls super-clone
+
+ok 6 - reset submodule URLs
+
+expecting success of 7403.7 '"git submodule sync" should update submodule URLs - subdirectory': 
+	(
+		cd super-clone &&
+		git pull --no-recurse-submodules &&
+		mkdir -p sub &&
+		cd sub &&
+		git submodule sync >../../output
+	) &&
+	test_grep "\\.\\./submodule" output &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test ! -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule &&
+		git checkout main &&
+		git pull
+	) &&
+	(
+		cd super-clone &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+Already up to date.
+Synchronizing submodule url for '../submodule'
+Already on 'main'
+M	sub-submodule
+Your branch is up to date with 'origin/main'.
+Already up to date.
+ok 7 - "git submodule sync" should update submodule URLs - subdirectory
+
+expecting success of 7403.8 '"git submodule sync --recursive" should update all submodule URLs - subdirectory': 
+	(
+		cd super-clone &&
+		(
+			cd submodule &&
+			git pull --no-recurse-submodules
+		) &&
+		mkdir -p sub &&
+		cd sub &&
+		git submodule sync --recursive >../../output
+	) &&
+	test_grep "\\.\\./submodule/sub-submodule" output &&
+	test -d "$(
+		cd super-clone/submodule &&
+		git config remote.origin.url
+	)" &&
+	test -d "$(
+		cd super-clone/submodule/sub-submodule &&
+		git config remote.origin.url
+	)" &&
+	(
+		cd super-clone/submodule/sub-submodule &&
+		git checkout main &&
+		git pull
+	)
+
+Already up to date.
+Synchronizing submodule url for '../submodule/sub-submodule'
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+Already up to date.
+ok 8 - "git submodule sync --recursive" should update all submodule URLs - subdirectory
+
+expecting success of 7403.9 '"git submodule sync" should update known submodule URLs': 
+	(
+		cd empty-clone &&
+		git pull &&
+		git submodule sync &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  main       -> origin/main
+Could not access submodule 'submodule' at commit f2e88dd
+Updating 78df3af..f2e88dd
+Fast-forward
+ .gitmodules | 2 +-
+ submodule   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Synchronizing submodule url for 'submodule'
+ok 9 - "git submodule sync" should update known submodule URLs
+
+expecting success of 7403.10 '"git submodule sync" should not vivify uninteresting submodule': 
+	(
+		cd top-only-clone &&
+		git pull &&
+		git submodule sync &&
+		test -z "$(git config submodule.submodule.url)" &&
+		git submodule sync submodule &&
+		test -z "$(git config submodule.submodule.url)"
+	)
+
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  main       -> origin/main
+Updating 78df3af..f2e88dd
+Fast-forward
+ .gitmodules | 2 +-
+ submodule   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 10 - "git submodule sync" should not vivify uninteresting submodule
+
+expecting success of 7403.11 '"git submodule sync" handles origin URL of the form foo': 
+	(
+		cd relative-clone &&
+		git remote set-url origin foo &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual fails with: "cannot strip off url foo
+			test "$(git config remote.origin.url)" = "../submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 11 - "git submodule sync" handles origin URL of the form foo
+
+expecting success of 7403.12 '"git submodule sync" handles origin URL of the form foo/bar': 
+	(
+		cd relative-clone &&
+		git remote set-url origin foo/bar &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual foo/submodule
+			test "$(git config remote.origin.url)" = "../foo/submodule"
+		) &&
+		(
+			cd submodule/sub-submodule &&
+			test "$(git config remote.origin.url)" != "../../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 12 - "git submodule sync" handles origin URL of the form foo/bar
+
+expecting success of 7403.13 '"git submodule sync --recursive" propagates changes in origin': 
+	(
+		cd recursive-clone &&
+		git remote set-url origin foo/bar &&
+		git submodule sync --recursive &&
+		(
+			cd submodule &&
+			#actual foo/submodule
+			test "$(git config remote.origin.url)" = "../foo/submodule"
+		) &&
+		(
+			cd submodule/sub-submodule &&
+			test "$(git config remote.origin.url)" = "../../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+Synchronizing submodule url for 'submodule/sub-submodule'
+ok 13 - "git submodule sync --recursive" propagates changes in origin
+
+expecting success of 7403.14 '"git submodule sync" handles origin URL of the form ./foo': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ./foo &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ./submodule
+			test "$(git config remote.origin.url)" = "../submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 14 - "git submodule sync" handles origin URL of the form ./foo
+
+expecting success of 7403.15 '"git submodule sync" handles origin URL of the form ./foo/bar': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ./foo/bar &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ./foo/submodule
+			test "$(git config remote.origin.url)" = "../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 15 - "git submodule sync" handles origin URL of the form ./foo/bar
+
+expecting success of 7403.16 '"git submodule sync" handles origin URL of the form ../foo': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ../foo &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ../submodule
+			test "$(git config remote.origin.url)" = "../../submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 16 - "git submodule sync" handles origin URL of the form ../foo
+
+expecting success of 7403.17 '"git submodule sync" handles origin URL of the form ../foo/bar': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ../foo/bar &&
+		git submodule sync &&
+		(
+			cd submodule &&
+			#actual ../foo/submodule
+			test "$(git config remote.origin.url)" = "../../foo/submodule"
+		)
+	)
+
+Synchronizing submodule url for 'submodule'
+ok 17 - "git submodule sync" handles origin URL of the form ../foo/bar
+
+expecting success of 7403.18 '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule': 
+	(
+		cd relative-clone &&
+		git remote set-url origin ../foo/bar &&
+		mkdir -p a/b/c &&
+		(
+			cd a/b/c &&
+			git init &&
+			>.gitignore &&
+			git add .gitignore &&
+			test_tick &&
+			git commit -m "initial commit"
+		) &&
+		git submodule add ../bar/a/b/c ./a/b/c &&
+		git submodule sync &&
+		(
+			cd a/b/c &&
+			#actual ../foo/bar/a/b/c
+			test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
+		)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7403-submodule-sync/relative-clone/a/b/c/.git/
+[main (root-commit) 1f9e67a] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 .gitignore
+Adding existing repo at 'a/b/c' to the index
+Synchronizing submodule url for 'a/b/c'
+Synchronizing submodule url for 'submodule'
+ok 18 - "git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7417-submodule-path-url.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7412-submodule-absorbgitdirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7412-submodule-absorbgitdirs/.git/
 expecting success of 7412.1 'setup a real submodule': 
@@ -464727,293 +465176,390 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7420-submodule-set-url.sh ***
-expecting success of 7420.1 'setup': 
+*** t7408-submodule-reference.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/.git/
+expecting success of 7408.1 'setup': 
 	git config --global protocol.file.allow always
 
 ok 1 - setup
 
-expecting success of 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 &&
+expecting success of 7408.2 'preparing first repository': 
+	test_create_repo A &&
 	(
-		cd super &&
-		git init &&
-		git submodule add ../submodule &&
-		git submodule add --name thename ../namedsubmodule thepath &&
-		git commit -m "add submodules"
+		cd A &&
+		echo first >file1 &&
+		git add file1 &&
+		git commit -m A-initial
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7420-submodule-set-url/namedsubmodule/.git/
-[master (root-commit) c663a66] 1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A/.git/
+[master (root-commit) 3f492fa] A-initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7420-submodule-set-url/super/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7420-submodule-set-url/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7420-submodule-set-url/super/thepath'...
+ create mode 100644 file1
+ok 2 - preparing first repository
+
+expecting success of 7408.3 'preparing second repository': 
+	git clone A B &&
+	(
+		cd B &&
+		echo second >file2 &&
+		git add file2 &&
+		git commit -m B-addition &&
+		git repack -a -d &&
+		git prune
+	)
+
+Cloning into 'B'...
 done.
-[master (root-commit) 7cd7856] add submodules
+[master c9a83e7] B-addition
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 3 - preparing second repository
 
-expecting success of 7420.3 'test submodule set-url': 
-	# add commits and move the submodules (change the urls)
+expecting success of 7408.4 'preparing superproject': 
+	test_create_repo super &&
 	(
-		cd submodule &&
-		echo b >>file &&
+		cd super &&
+		echo file >file &&
 		git add file &&
-		git commit -mb
-	) &&
-	mv submodule newsubmodule &&
+		git commit -m B-super-initial
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super/.git/
+[master (root-commit) 0776138] B-super-initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 4 - preparing superproject
 
+expecting success of 7408.5 'submodule add --reference uses alternates': 
 	(
-		cd namedsubmodule &&
-		echo 2 >>file &&
-		git add file &&
-		git commit -m2
+		cd super &&
+		git submodule add --reference ../B "file://$base_dir/A" sub &&
+		git commit -m B-super-added &&
+		git repack -ad
 	) &&
-	mv namedsubmodule newnamedsubmodule &&
+	test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
 
-	git -C newsubmodule show >expect &&
-	git -C newnamedsubmodule show >>expect &&
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super/sub'...
+[master 6aa4065] B-super-added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 5 - submodule add --reference uses alternates
+
+expecting success of 7408.6 'submodule add --reference with --dissociate does not use alternates': 
 	(
 		cd super &&
-		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 submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate &&
+		git commit -m B-super-added &&
+		git repack -ad
 	) &&
-	git -C super/submodule show >actual &&
-	git -C super/thepath show >>actual &&
-	test_cmp expect actual
+	test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates
 
-[master 8063db2] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 35c4e2f] 2
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super/sub-dissociate'...
+[master 315654d] B-super-added
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-fatal: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub-dissociate
+ok 6 - submodule add --reference with --dissociate does not use alternates
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7418-submodule-sparse-gitmodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
-expecting success of 7418.1 'setup': 
-	git config --global protocol.file.allow always
+expecting success of 7408.7 'that reference gets used with add': 
+	(
+		cd super/sub &&
+		echo "0 objects, 0 kilobytes" >expected &&
+		git count-objects >current &&
+		diff expected current
+	)
 
-ok 1 - setup
+ok 7 - that reference gets used with add
 
-expecting success of 7418.2 'sparse checkout setup which hides .gitmodules': 
-	git init upstream &&
-	git init submodule &&
-	(cd submodule &&
-		echo file >file &&
-		git add file &&
-		test_tick &&
-		git commit -m "Add file"
-	) &&
-	(cd upstream &&
-		git submodule add ../submodule &&
-		test_tick &&
-		git commit -m "Add submodule"
-	) &&
-	git clone --template= upstream super &&
-	(cd super &&
-		mkdir .git/info &&
-		cat >.git/info/sparse-checkout <<-\EOF &&
-		/*
-		!/.gitmodules
-		EOF
-		git config core.sparsecheckout true &&
-		git read-tree -m -u HEAD &&
-		test_path_is_missing .gitmodules
-	)
+expecting success of 7408.8 'updating superproject keeps alternates': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super-clone &&
+	git -C super-clone submodule update --init --reference ../B &&
+	test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule/.git/
-[master (root-commit) a939200] Add file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
-done.
-[master (root-commit) caa93e1] Add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-Cloning into 'super'...
+Cloning into 'super-clone'...
 done.
-ok 2 - sparse checkout setup which hides .gitmodules
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 8 - updating superproject keeps alternates
 
-expecting success of 7418.3 'reading gitmodules config file when it is not checked out': 
-	echo "../submodule" >expect &&
-	test-tool -C super submodule config-list submodule.submodule.url >actual &&
-	test_cmp expect actual
+expecting success of 7408.9 'updating superproject with --dissociate does not keep alternates': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super-clone &&
+	git -C super-clone submodule update --init --reference ../B --dissociate &&
+	test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates
 
-ok 3 - reading gitmodules config file when it is not checked out
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 9 - updating superproject with --dissociate does not keep alternates
 
-expecting success of 7418.4 'not writing gitmodules config file when it is not checked out': 
-	test_must_fail test-tool -C super submodule config-set submodule.submodule.url newurl &&
-	test_path_is_missing super/.gitmodules
+expecting success of 7408.10 'submodules use alternates when cloning a superproject': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone --reference super --recursive super super-clone &&
+	(
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# test submodule has correct setup
+		test_alternate_is_used .git/modules/sub/objects/info/alternates sub
+	)
 
-fatal: please make sure that the .gitmodules file is in the working tree
-ok 4 - not writing gitmodules config file when it is not checked out
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 10 - submodules use alternates when cloning a superproject
 
-expecting success of 7418.5 'initialising submodule when the gitmodules config is not checked out': 
-	test_must_fail git -C super config submodule.submodule.url &&
-	git -C super submodule init &&
-	git -C super config submodule.submodule.url >actual &&
-	echo "$(pwd)/submodule" >expect &&
-	test_cmp expect actual
+expecting success of 7408.11 'missing submodule alternate fails clone and submodule update': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super2 &&
+	test_must_fail git clone --recursive --reference super2 super2 super-clone &&
+	(
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# update of the submodule succeeds
+		test_must_fail git submodule update --init &&
+		# and we have no alternates:
+		test_path_is_missing .git/modules/sub/objects/info/alternates &&
+		test_path_is_missing sub/file1
+	)
 
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule) registered for path 'submodule'
-ok 5 - initialising submodule when the gitmodules config is not checked out
+Cloning into 'super2'...
+done.
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+ok 11 - missing submodule alternate fails clone and submodule update
 
-expecting success of 7418.6 'updating submodule when the gitmodules config is not checked out': 
-	test_path_is_missing super/submodule/file &&
-	git -C super submodule update &&
-	test_cmp submodule/file super/submodule/file
+expecting success of 7408.12 'ignoring missing submodule alternates passes clone and submodule update': 
+	test_when_finished "rm -rf super-clone" &&
+	git clone --reference-if-able super2 --recursive super2 super-clone &&
+	(
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# update of the submodule succeeds
+		git submodule update --init &&
+		# and we have no alternates:
+		test_path_is_missing .git/modules/sub/objects/info/alternates &&
+		test_path_is_file sub/file1
+	)
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/super/submodule'...
+Cloning into 'super-clone'...
 done.
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-ok 6 - updating submodule when the gitmodules config is not checked out
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 12 - ignoring missing submodule alternates passes clone and submodule update
 
-expecting success of 7418.7 're-updating submodule when the gitmodules config is not checked out': 
-	test_when_finished "git -C submodule reset --hard $ORIG_SUBMODULE;
-			    git -C upstream reset --hard $ORIG_UPSTREAM;
-			    git -C super reset --hard $ORIG_SUPER;
-			    git -C upstream submodule update --remote;
-			    git -C super pull;
-			    git -C super submodule update --remote" &&
-	(cd submodule &&
-		echo file2 >file2 &&
-		git add file2 &&
-		test_tick &&
-		git commit -m "Add file2 to submodule"
-	) &&
-	(cd upstream &&
-		git submodule update --remote &&
-		git add submodule &&
-		test_tick &&
-		git commit -m "Update submodule"
+expecting success of 7408.13 'preparing second superproject with a nested submodule plus partial clone': 
+	test_create_repo supersuper &&
+	(
+		cd supersuper &&
+		echo "I am super super." >file &&
+		git add file &&
+		git commit -m B-super-super-initial &&
+		git submodule add "file://$base_dir/super" subwithsub &&
+		git commit -m B-super-super-added &&
+		git submodule update --init --recursive &&
+		git repack -ad
 	) &&
-	git -C super pull &&
-	# The --for-status options reads the gitmodules config
-	git -C super submodule summary --for-status >actual &&
-	rev1=$(git -C submodule rev-parse --short HEAD) &&
-	rev2=$(git -C submodule rev-parse --short HEAD^) &&
-	cat >expect <<-EOF &&
-	* submodule ${rev1}...${rev2} (1):
-	  < Add file2 to submodule
-
-	EOF
-	test_cmp expect actual &&
-	# Test that the update actually succeeds
-	test_path_is_missing super/submodule/file2 &&
-	git -C super submodule update &&
-	test_cmp submodule/file2 super/submodule/file2 &&
-	git -C super status --short >output &&
-	test_must_be_empty output
+	git clone supersuper supersuper2 &&
+	(
+		cd supersuper2 &&
+		git submodule update --init
+	)
 
-[master 83d36b8] Add file2 to submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/.git/
+[master (root-commit) c928525] B-super-super-initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
-   a939200..83d36b8  master     -> origin/master
-Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
-[master 5ae4276] Update submodule
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/subwithsub'...
+[master dd96979] B-super-super-added
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
-   caa93e1..5ae4276  master     -> origin/master
-Fetching submodule submodule
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
-   a939200..83d36b8  master     -> origin/master
-Updating caa93e1..5ae4276
-Fast-forward
- submodule | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
-HEAD is now at a939200 Add file
-HEAD is now at caa93e1 Add submodule
-HEAD is now at caa93e1 Add submodule
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
- + 83d36b8...a939200 master     -> origin/master  (forced update)
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
- + 5ae4276...caa93e1 master     -> origin/master  (forced update)
-Already up to date.
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
- + 83d36b8...a939200 master     -> origin/master  (forced update)
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-ok 7 - re-updating submodule when the gitmodules config is not checked out
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subwithsub
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Cloning into 'supersuper2'...
+done.
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/subwithsub'...
+Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
+ok 13 - preparing second superproject with a nested submodule plus partial clone
 
-expecting success of 7418.8 'not adding submodules when the gitmodules config is not checked out': 
-	git clone submodule new_submodule &&
-	test_must_fail git -C super submodule add ../new_submodule &&
-	test_path_is_missing .gitmodules
+expecting success of 7408.14 'nested submodule alternate in works and is actually used': 
+	test_when_finished "rm -rf supersuper-clone" &&
+	git clone --recursive --reference supersuper supersuper supersuper-clone &&
+	(
+		cd supersuper-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# immediate submodule has alternate:
+		test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
+		# nested submodule also has alternate:
+		test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
+	)
 
-Cloning into 'new_submodule'...
+Cloning into 'supersuper-clone'...
 done.
-fatal: please make sure that the .gitmodules file is in the working tree
-ok 8 - not adding submodules when the gitmodules config is not checked out
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 14 - nested submodule alternate in works and is actually used
 
-expecting success of 7418.9 'init submodule still works even after the previous add failed': 
-	git -C super submodule init
+expecting success of 7408.15 'missing nested submodule alternate fails clone and submodule update': 
+	test_when_finished "rm -rf supersuper-clone" &&
+	test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
+	(
+		cd supersuper-clone &&
+		check_that_two_of_three_alternates_are_used &&
+		# update of the submodule fails
+		cat >expect <<-\EOF &&
+		fatal: submodule 'sub' cannot add alternate: path ... does not exist
+		Failed to clone 'sub'. Retry scheduled
+		fatal: submodule 'sub-dissociate' cannot add alternate: path ... does not exist
+		Failed to clone 'sub-dissociate'. Retry scheduled
+		fatal: submodule 'sub' cannot add alternate: path ... does not exist
+		Failed to clone 'sub' a second time, aborting
+		fatal: Failed to recurse into submodule path ...
+		EOF
+		test_must_fail git submodule update --init --recursive 2>err &&
+		grep -e fatal: -e ^Failed err >actual.raw &&
+		sed -e "s/path $SQ[^$SQ]*$SQ/path .../" <actual.raw >actual &&
+		test_cmp expect actual
+	)
 
-ok 9 - init submodule still works even after the previous add failed
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+hint: An alternate computed from a superproject's alternate is invalid.
+hint: To allow Git to clone without an alternate in such a case, set
+hint: submodule.alternateErrorStrategy to 'info' or, equivalently, clone with
+hint: '--reference-if-able' instead of '--reference'.
+fatal: submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+fatal: Failed to recurse into submodule path 'subwithsub'
+ok 15 - missing nested submodule alternate fails clone and submodule update
 
-# passed all 9 test(s)
-1..9
+expecting success of 7408.16 'missing nested submodule alternate in --reference-if-able mode': 
+	test_when_finished "rm -rf supersuper-clone" &&
+	git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
+	(
+		cd supersuper-clone &&
+		check_that_two_of_three_alternates_are_used &&
+		# update of the submodule succeeds
+		git submodule update --init --recursive
+	)
+
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '315654d237456d9854e2290c536ec74880ef6de4'
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+submodule 'sub' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
+submodule 'sub-dissociate' cannot add alternate: path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+Submodule path 'subwithsub/sub-dissociate': checked out '3f492fa355d2b55bd9e19f5535ac5e32c035e10f'
+ok 16 - missing nested submodule alternate in --reference-if-able mode
+
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7416-submodule-dash-url.sh ***
@@ -465383,6 +465929,295 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7420-submodule-set-url/super/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7420-submodule-set-url/super/submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7418-submodule-sparse-gitmodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
+expecting success of 7418.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+expecting success of 7418.2 'sparse checkout setup which hides .gitmodules': 
+	git init upstream &&
+	git init submodule &&
+	(cd submodule &&
+		echo file >file &&
+		git add file &&
+		test_tick &&
+		git commit -m "Add file"
+	) &&
+	(cd upstream &&
+		git submodule add ../submodule &&
+		test_tick &&
+		git commit -m "Add submodule"
+	) &&
+	git clone --template= upstream super &&
+	(cd super &&
+		mkdir .git/info &&
+		cat >.git/info/sparse-checkout <<-\EOF &&
+		/*
+		!/.gitmodules
+		EOF
+		git config core.sparsecheckout true &&
+		git read-tree -m -u HEAD &&
+		test_path_is_missing .gitmodules
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule/.git/
+[master (root-commit) a939200] Add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
+done.
+[master (root-commit) caa93e1] Add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into 'super'...
+done.
+ok 2 - sparse checkout setup which hides .gitmodules
+
+expecting success of 7418.3 'reading gitmodules config file when it is not checked out': 
+	echo "../submodule" >expect &&
+	test-tool -C super submodule config-list submodule.submodule.url >actual &&
+	test_cmp expect actual
+
+ok 3 - reading gitmodules config file when it is not checked out
+
+expecting success of 7418.4 'not writing gitmodules config file when it is not checked out': 
+	test_must_fail test-tool -C super submodule config-set submodule.submodule.url newurl &&
+	test_path_is_missing super/.gitmodules
+
+fatal: please make sure that the .gitmodules file is in the working tree
+ok 4 - not writing gitmodules config file when it is not checked out
+
+expecting success of 7418.5 'initialising submodule when the gitmodules config is not checked out': 
+	test_must_fail git -C super config submodule.submodule.url &&
+	git -C super submodule init &&
+	git -C super config submodule.submodule.url >actual &&
+	echo "$(pwd)/submodule" >expect &&
+	test_cmp expect actual
+
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule) registered for path 'submodule'
+ok 5 - initialising submodule when the gitmodules config is not checked out
+
+expecting success of 7418.6 'updating submodule when the gitmodules config is not checked out': 
+	test_path_is_missing super/submodule/file &&
+	git -C super submodule update &&
+	test_cmp submodule/file super/submodule/file
+
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/super/submodule'...
+done.
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+ok 6 - updating submodule when the gitmodules config is not checked out
+
+expecting success of 7418.7 're-updating submodule when the gitmodules config is not checked out': 
+	test_when_finished "git -C submodule reset --hard $ORIG_SUBMODULE;
+			    git -C upstream reset --hard $ORIG_UPSTREAM;
+			    git -C super reset --hard $ORIG_SUPER;
+			    git -C upstream submodule update --remote;
+			    git -C super pull;
+			    git -C super submodule update --remote" &&
+	(cd submodule &&
+		echo file2 >file2 &&
+		git add file2 &&
+		test_tick &&
+		git commit -m "Add file2 to submodule"
+	) &&
+	(cd upstream &&
+		git submodule update --remote &&
+		git add submodule &&
+		test_tick &&
+		git commit -m "Update submodule"
+	) &&
+	git -C super pull &&
+	# The --for-status options reads the gitmodules config
+	git -C super submodule summary --for-status >actual &&
+	rev1=$(git -C submodule rev-parse --short HEAD) &&
+	rev2=$(git -C submodule rev-parse --short HEAD^) &&
+	cat >expect <<-EOF &&
+	* submodule ${rev1}...${rev2} (1):
+	  < Add file2 to submodule
+
+	EOF
+	test_cmp expect actual &&
+	# Test that the update actually succeeds
+	test_path_is_missing super/submodule/file2 &&
+	git -C super submodule update &&
+	test_cmp submodule/file2 super/submodule/file2 &&
+	git -C super status --short >output &&
+	test_must_be_empty output
+
+[master 83d36b8] Add file2 to submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+   a939200..83d36b8  master     -> origin/master
+Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
+[master 5ae4276] Update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
+   caa93e1..5ae4276  master     -> origin/master
+Fetching submodule submodule
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+   a939200..83d36b8  master     -> origin/master
+Updating caa93e1..5ae4276
+Fast-forward
+ submodule | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': checked out '83d36b861ad581dea26a4034aeffa2f715923589'
+HEAD is now at a939200 Add file
+HEAD is now at caa93e1 Add submodule
+HEAD is now at caa93e1 Add submodule
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+ + 83d36b8...a939200 master     -> origin/master  (forced update)
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
+ + 5ae4276...caa93e1 master     -> origin/master  (forced update)
+Already up to date.
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+ + 83d36b8...a939200 master     -> origin/master  (forced update)
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+ok 7 - re-updating submodule when the gitmodules config is not checked out
+
+expecting success of 7418.8 'not adding submodules when the gitmodules config is not checked out': 
+	git clone submodule new_submodule &&
+	test_must_fail git -C super submodule add ../new_submodule &&
+	test_path_is_missing .gitmodules
+
+Cloning into 'new_submodule'...
+done.
+fatal: please make sure that the .gitmodules file is in the working tree
+ok 8 - not adding submodules when the gitmodules config is not checked out
+
+expecting success of 7418.9 'init submodule still works even after the previous add failed': 
+	git -C super submodule init
+
+ok 9 - init submodule still works even after the previous add failed
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7423-submodule-symlinks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7423-submodule-symlinks/.git/
 expecting success of 7423.1 'prepare': 
@@ -465605,800 +466440,145 @@
 	(cd submodule &&
 		git init &&
 		echo a >a &&
-		git add . &&
-		git commit -ma &&
-		git checkout -b topic &&
-		echo b >a &&
-		git add . &&
-		git commit -mb &&
-		git checkout main
-	) &&
-	mkdir super &&
-	(cd super &&
-		git init &&
-		git submodule add ../submodule &&
-		git submodule add --name thename ../submodule thepath &&
-		git commit -m "add submodules"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/submodule/.git/
-[main (root-commit) 7bdc13c] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Switched to a new branch 'topic'
-[topic 45d819c] b
- 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.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/super/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/super/thepath'...
-done.
-[main (root-commit) 4a5a70f] 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 7419.3 'ensure submodule branch is unset': 
-	(cd super &&
-		test_cmp_config "" -f .gitmodules --default "" submodule.submodule.branch
-	)
-
-ok 3 - ensure submodule branch is unset
-
-expecting success of 7419.4 'test submodule set-branch --branch': 
-	(cd super &&
-		git submodule set-branch --branch topic submodule &&
-		test_cmp_config topic -f .gitmodules submodule.submodule.branch &&
-		git submodule update --remote &&
-		cat <<-\EOF >expect &&
-		b
-		EOF
-		git -C submodule show -s --pretty=%s >actual &&
-		test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
-ok 4 - test submodule set-branch --branch
-
-expecting success of 7419.5 'test submodule set-branch --default': 
-	(cd super &&
-		git submodule set-branch --default submodule &&
-		test_cmp_config "" -f .gitmodules --default "" submodule.submodule.branch &&
-		git submodule update --remote &&
-		cat <<-\EOF >expect &&
-		a
-		EOF
-		git -C submodule show -s --pretty=%s >actual &&
-		test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
-ok 5 - test submodule set-branch --default
-
-expecting success of 7419.6 'test submodule set-branch -b': 
-	(cd super &&
-		git submodule set-branch -b topic submodule &&
-		test_cmp_config topic -f .gitmodules submodule.submodule.branch &&
-		git submodule update --remote &&
-		cat <<-\EOF >expect &&
-		b
-		EOF
-		git -C submodule show -s --pretty=%s >actual &&
-		test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
-ok 6 - test submodule set-branch -b
-
-expecting success of 7419.7 'test submodule set-branch -d': 
-	(cd super &&
-		git submodule set-branch -d submodule &&
-		test_cmp_config "" -f .gitmodules --default "" submodule.submodule.branch &&
-		git submodule update --remote &&
-		cat <<-\EOF >expect &&
-		a
-		EOF
-		git -C submodule show -s --pretty=%s >actual &&
-		test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
-ok 7 - test submodule set-branch -d
-
-expecting success of 7419.8 'test submodule set-branch --branch with named submodule': 
-	(cd super &&
-		git submodule set-branch --branch topic thepath &&
-		test_cmp_config topic -f .gitmodules submodule.thename.branch &&
-		test_cmp_config "" -f .gitmodules --default "" submodule.thepath.branch &&
-		git submodule update --remote &&
-		cat <<-\EOF >expect &&
-		b
-		EOF
-		git -C thepath show -s --pretty=%s >actual &&
-		test_cmp expect actual
-	)
-
-Submodule path 'thepath': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
-ok 8 - test submodule set-branch --branch with named submodule
-
-expecting success of 7419.9 'test submodule set-branch --default with named submodule': 
-	(cd super &&
-		git submodule set-branch --default thepath &&
-		test_cmp_config "" -f .gitmodules --default "" submodule.thename.branch &&
-		git submodule update --remote &&
-		cat <<-\EOF >expect &&
-		a
-		EOF
-		git -C thepath show -s --pretty=%s >actual &&
-		test_cmp expect actual
-	)
-
-Submodule path 'thepath': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
-ok 9 - test submodule set-branch --default with named submodule
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7407-submodule-foreach.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/.git/
-expecting success of 7407.1 'setup a submodule tree': 
-	git config --global protocol.file.allow always &&
-	echo file > file &&
-	git add file &&
-	test_tick &&
-	git commit -m upstream &&
-	git clone . super &&
-	git clone super submodule &&
-	(
-		cd super &&
-		git submodule add ../submodule sub1 &&
-		git submodule add ../submodule sub2 &&
-		git submodule add ../submodule sub3 &&
-		git config -f .gitmodules --rename-section \
-			submodule.sub1 submodule.foo1 &&
-		git config -f .gitmodules --rename-section \
-			submodule.sub2 submodule.foo2 &&
-		git config -f .gitmodules --rename-section \
-			submodule.sub3 submodule.foo3 &&
-		git add .gitmodules &&
-		test_tick &&
-		git commit -m "submodules" &&
-		git submodule init sub1 &&
-		git submodule init sub2 &&
-		git submodule init sub3
-	) &&
-	(
-		cd submodule &&
-		echo different > file &&
-		git add file &&
-		test_tick &&
-		git commit -m "different"
-	) &&
-	(
-		cd super &&
-		(
-			cd sub3 &&
-			git pull
-		) &&
-		git add sub3 &&
-		test_tick &&
-		git commit -m "update sub3"
-	)
-
-[main (root-commit) 0c90624] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'super'...
-done.
-Cloning into 'submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/sub3'...
-done.
-[main 33b977a] submodules
- Author: A U Thor <author@example.com>
- 4 files changed, 12 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
- create mode 160000 sub2
- create mode 160000 sub3
-Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-[main 509f622] different
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule
-   0c90624..509f622  main       -> origin/main
-Updating 0c90624..509f622
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main ed2a820] update sub3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup a submodule tree
-
-expecting success of 7407.2 'test basic "submodule foreach" usage': 
-	git clone super clone &&
-	(
-		cd clone &&
-		git submodule update --init -- sub1 sub3 &&
-		git submodule foreach "echo \$toplevel-\$name-\$path-\$sha1" > ../actual &&
-		git config foo.bar zar &&
-		git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
-	) &&
-	test_cmp expect actual
-
-Cloning into 'clone'...
-done.
-Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone/sub3'...
-done.
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Entering 'sub1'
-zar
-Entering 'sub3'
-zar
-ok 2 - test basic "submodule foreach" usage
-
-expecting success of 7407.3 'test "submodule foreach" from subdirectory': 
-	mkdir clone/sub &&
-	(
-		cd clone/sub &&
-		git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
-	) &&
-	test_cmp expect actual
-
-ok 3 - test "submodule foreach" from subdirectory
-
-expecting success of 7407.4 'setup nested submodules': 
-	git clone submodule nested1 &&
-	git clone submodule nested2 &&
-	git clone submodule nested3 &&
-	(
-		cd nested3 &&
-		git submodule add ../submodule submodule &&
-		test_tick &&
-		git commit -m "submodule" &&
-		git submodule init submodule
-	) &&
-	(
-		cd nested2 &&
-		git submodule add ../nested3 nested3 &&
-		test_tick &&
-		git commit -m "nested3" &&
-		git submodule init nested3
-	) &&
-	(
-		cd nested1 &&
-		git submodule add ../nested2 nested2 &&
-		test_tick &&
-		git commit -m "nested2" &&
-		git submodule init nested2
-	) &&
-	(
-		cd super &&
-		git submodule add ../nested1 nested1 &&
-		test_tick &&
-		git commit -m "nested1" &&
-		git submodule init nested1
-	)
-
-Cloning into 'nested1'...
-done.
-Cloning into 'nested2'...
-done.
-Cloning into 'nested3'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3/submodule'...
-done.
-[main 5ec8351] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2/nested3'...
-done.
-[main 2e69c85] nested3
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested3
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1/nested2'...
-done.
-[main b23f134] nested2
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested2
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/nested1'...
-done.
-[main 427ccd0] nested1
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 nested1
-ok 4 - setup nested submodules
-
-expecting success of 7407.5 'use "submodule foreach" to checkout 2nd level submodule': 
-	git clone super clone2 &&
-	(
-		cd clone2 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
-		git submodule update --init &&
-		git rev-parse --resolve-git-dir sub1/.git &&
-		git rev-parse --resolve-git-dir sub2/.git &&
-		git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git submodule foreach "git submodule update --init" &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/nested3/.git
-	)
-
-Cloning into 'clone2'...
-done.
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-fatal: not a gitdir 'nested1/.git'
-Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo2
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo3
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1
-fatal: not a gitdir 'nested1/nested2/.git'
-Entering 'nested1'
-Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2'...
-done.
-Submodule path 'nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Entering 'sub1'
-Entering 'sub2'
-Entering 'sub3'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2
-fatal: not a gitdir 'nested1/nested2/nested3/.git'
-ok 5 - use "submodule foreach" to checkout 2nd level submodule
-
-expecting success of 7407.6 'usage: foreach -- --not-an-option': 
-	test_expect_code 1 git submodule foreach -- --not-an-option &&
-	test_expect_code 1 git -C clone2 submodule foreach -- --not-an-option
-
-usage: git submodule [--quiet] [--cached]
-   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
-   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] init [--] [<path>...]
-   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
-   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
-   or: git submodule [--quiet] set-url [--] <path> <newurl>
-   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
-   or: git submodule [--quiet] foreach [--recursive] <command>
-   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
-usage: git submodule [--quiet] [--cached]
-   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
-   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] init [--] [<path>...]
-   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
-   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
-   or: git submodule [--quiet] set-url [--] <path> <newurl>
-   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
-   or: git submodule [--quiet] foreach [--recursive] <command>
-   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
-ok 6 - usage: foreach -- --not-an-option
-
-expecting success of 7407.7 'use "foreach --recursive" to checkout all submodules': 
-	(
-		cd clone2 &&
-		git submodule foreach --recursive "git submodule update --init" &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
-	)
-
-Entering 'nested1'
-Entering 'nested1/nested2'
-Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3'...
-done.
-Submodule path 'nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Entering 'nested1/nested2/nested3'
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Entering 'nested1/nested2/nested3/submodule'
-Entering 'sub1'
-Entering 'sub2'
-Entering 'sub3'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 7 - use "foreach --recursive" to checkout all submodules
-
-expecting success of 7407.8 'test messages from "foreach --recursive"': 
-	(
-		cd clone2 &&
-		git submodule foreach --recursive "true" > ../actual
-	) &&
-	test_cmp expect actual
-
-ok 8 - test messages from "foreach --recursive"
-
-expecting success of 7407.9 'test messages from "foreach --recursive" from subdirectory': 
-	(
-		cd clone2 &&
-		mkdir untracked &&
-		cd untracked &&
-		git submodule foreach --recursive >../../actual
-	) &&
-	test_cmp expect actual
-
-ok 9 - test messages from "foreach --recursive" from subdirectory
-
-expecting success of 7407.10 'test "submodule foreach --recursive" from subdirectory': 
-	(
-		cd clone2/untracked &&
-		git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
-	) &&
-	test_cmp expect actual
-
-ok 10 - test "submodule foreach --recursive" from subdirectory
-
-expecting success of 7407.11 'test "foreach --quiet --recursive"': 
-	(
-		cd clone2 &&
-		git submodule foreach -q --recursive "echo \$name-\$path" > ../actual
-	) &&
-	test_cmp expect actual
-
-ok 11 - test "foreach --quiet --recursive"
-
-expecting success of 7407.12 'use "update --recursive" to checkout all submodules': 
-	git clone super clone3 &&
-	(
-		cd clone3 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
-		git submodule update --init --recursive &&
-		git rev-parse --resolve-git-dir sub1/.git &&
-		git rev-parse --resolve-git-dir sub2/.git &&
-		git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
-	)
-
-Cloning into 'clone3'...
-done.
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-fatal: not a gitdir 'nested1/.git'
-Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo2
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo3
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 12 - use "update --recursive" to checkout all submodules
-
-expecting success of 7407.13 'test "status --recursive"': 
-	(
-		cd clone3 &&
-		git submodule status --recursive > ../actual
-	) &&
-	test_cmp expect actual
-
-ok 13 - test "status --recursive"
-
-expecting success of 7407.14 'ensure "status --cached --recursive" preserves the --cached flag': 
-	(
-		cd clone3 &&
-		(
-			cd nested1/nested2 &&
-			test_commit file2
-		) &&
-		git submodule status --cached --recursive -- nested1 > ../actual
-	) &&
-	test_cmp expect actual
-
-[detached HEAD 25d56d1] file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2.t
-ok 14 - ensure "status --cached --recursive" preserves the --cached flag
-
-expecting success of 7407.15 'test "status --recursive" from sub directory': 
-	(
-		cd clone3 &&
-		mkdir tmp && cd tmp &&
-		git submodule status --recursive > ../../actual
+		git add . &&
+		git commit -ma &&
+		git checkout -b topic &&
+		echo b >a &&
+		git add . &&
+		git commit -mb &&
+		git checkout main
 	) &&
-	test_cmp expect actual
-
-ok 15 - test "status --recursive" from sub directory
-
-expecting success of 7407.16 'use "git clone --recursive" to checkout all submodules': 
-	git clone --recursive super clone4 &&
-	(
-		cd clone4 &&
-		git rev-parse --resolve-git-dir .git &&
-		git rev-parse --resolve-git-dir sub1/.git &&
-		git rev-parse --resolve-git-dir sub2/.git &&
-		git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	mkdir super &&
+	(cd super &&
+		git init &&
+		git submodule add ../submodule &&
+		git submodule add --name thename ../submodule thepath &&
+		git commit -m "add submodules"
 	)
 
-Cloning into 'clone4'...
-done.
-Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3'...
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/submodule/.git/
+[main (root-commit) 7bdc13c] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Switched to a new branch 'topic'
+[topic 45d819c] b
+ 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.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/super/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/super/submodule'...
 done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3/submodule'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7419-submodule-set-branch/super/thepath'...
 done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-.git
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo2
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo3
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 16 - use "git clone --recursive" to checkout all submodules
+[main (root-commit) 4a5a70f] 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 7407.17 'test "update --recursive" with a flag with spaces': 
-	git clone super "common objects" &&
-	git clone super clone5 &&
-	(
-		cd clone5 &&
-		test_must_fail git rev-parse --resolve-git-dir d nested1/.git &&
-		git submodule update --init --recursive --reference="$(dirname "$PWD")/common objects" &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		test -f .git/modules/nested1/objects/info/alternates &&
-		test -f .git/modules/nested1/modules/nested2/objects/info/alternates &&
-		test -f .git/modules/nested1/modules/nested2/modules/nested3/objects/info/alternates
+expecting success of 7419.3 'ensure submodule branch is unset': 
+	(cd super &&
+		test_cmp_config "" -f .gitmodules --default "" submodule.submodule.branch
 	)
 
-Cloning into 'common objects'...
-done.
-Cloning into 'clone5'...
-done.
-fatal: not a gitdir 'd'
-Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2/modules/nested3
-ok 17 - test "update --recursive" with a flag with spaces
+ok 3 - ensure submodule branch is unset
 
-expecting success of 7407.18 'use "update --recursive nested1" to checkout all submodules rooted in nested1': 
-	git clone super clone6 &&
-	(
-		cd clone6 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
-		git submodule update --init --recursive -- nested1 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+expecting success of 7419.4 'test submodule set-branch --branch': 
+	(cd super &&
+		git submodule set-branch --branch topic submodule &&
+		test_cmp_config topic -f .gitmodules submodule.submodule.branch &&
+		git submodule update --remote &&
+		cat <<-\EOF >expect &&
+		b
+		EOF
+		git -C submodule show -s --pretty=%s >actual &&
+		test_cmp expect actual
 	)
 
-Cloning into 'clone6'...
-done.
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-fatal: not a gitdir 'nested1/.git'
-Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 18 - use "update --recursive nested1" to checkout all submodules rooted in nested1
+Submodule path 'submodule': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
+ok 4 - test submodule set-branch --branch
 
-expecting success of 7407.19 'command passed to foreach retains notion of stdin': 
-	(
-		cd super &&
-		git submodule foreach echo success >../expected &&
-		yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual
-	) &&
-	test_cmp expected actual
+expecting success of 7419.5 'test submodule set-branch --default': 
+	(cd super &&
+		git submodule set-branch --default submodule &&
+		test_cmp_config "" -f .gitmodules --default "" submodule.submodule.branch &&
+		git submodule update --remote &&
+		cat <<-\EOF >expect &&
+		a
+		EOF
+		git -C submodule show -s --pretty=%s >actual &&
+		test_cmp expect actual
+	)
 
-ok 19 - command passed to foreach retains notion of stdin
+Submodule path 'submodule': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
+ok 5 - test submodule set-branch --default
 
-expecting success of 7407.20 'command passed to foreach --recursive retains notion of stdin': 
-	(
-		cd clone2 &&
-		git submodule foreach --recursive echo success >../expected &&
-		yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual
-	) &&
-	test_cmp expected actual
+expecting success of 7419.6 'test submodule set-branch -b': 
+	(cd super &&
+		git submodule set-branch -b topic submodule &&
+		test_cmp_config topic -f .gitmodules submodule.submodule.branch &&
+		git submodule update --remote &&
+		cat <<-\EOF >expect &&
+		b
+		EOF
+		git -C submodule show -s --pretty=%s >actual &&
+		test_cmp expect actual
+	)
 
-ok 20 - command passed to foreach --recursive retains notion of stdin
+Submodule path 'submodule': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
+ok 6 - test submodule set-branch -b
 
-expecting success of 7407.21 'multi-argument command passed to foreach is not shell-evaluated twice': 
-	(
-		cd super &&
-		git submodule foreach "echo \\\"quoted\\\"" > ../expected &&
-		git submodule foreach echo \"quoted\" > ../actual
-	) &&
-	test_cmp expected actual
+expecting success of 7419.7 'test submodule set-branch -d': 
+	(cd super &&
+		git submodule set-branch -d submodule &&
+		test_cmp_config "" -f .gitmodules --default "" submodule.submodule.branch &&
+		git submodule update --remote &&
+		cat <<-\EOF >expect &&
+		a
+		EOF
+		git -C submodule show -s --pretty=%s >actual &&
+		test_cmp expect actual
+	)
 
-ok 21 - multi-argument command passed to foreach is not shell-evaluated twice
+Submodule path 'submodule': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
+ok 7 - test submodule set-branch -d
 
-expecting success of 7407.22 'option-like arguments passed to foreach commands are not lost': 
-	(
-		cd super &&
-		git submodule foreach "echo be --quiet" > ../expected &&
-		git submodule foreach echo be --quiet > ../actual
-	) &&
-	grep -sq -e "--quiet" expected &&
-	test_cmp expected actual
+expecting success of 7419.8 'test submodule set-branch --branch with named submodule': 
+	(cd super &&
+		git submodule set-branch --branch topic thepath &&
+		test_cmp_config topic -f .gitmodules submodule.thename.branch &&
+		test_cmp_config "" -f .gitmodules --default "" submodule.thepath.branch &&
+		git submodule update --remote &&
+		cat <<-\EOF >expect &&
+		b
+		EOF
+		git -C thepath show -s --pretty=%s >actual &&
+		test_cmp expect actual
+	)
 
-ok 22 - option-like arguments passed to foreach commands are not lost
+Submodule path 'thepath': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
+ok 8 - test submodule set-branch --branch with named submodule
 
-expecting success of 7407.23 'option-like arguments passed to foreach recurse correctly': 
-	git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
-	git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
-	grep -e "--an-option" expect &&
-	test_cmp expect actual
+expecting success of 7419.9 'test submodule set-branch --default with named submodule': 
+	(cd super &&
+		git submodule set-branch --default thepath &&
+		test_cmp_config "" -f .gitmodules --default "" submodule.thename.branch &&
+		git submodule update --remote &&
+		cat <<-\EOF >expect &&
+		a
+		EOF
+		git -C thepath show -s --pretty=%s >actual &&
+		test_cmp expect actual
+	)
 
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-ok 23 - option-like arguments passed to foreach recurse correctly
+Submodule path 'thepath': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
+ok 9 - test submodule set-branch --default with named submodule
 
-# passed all 23 test(s)
-1..23
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7424-submodule-mixed-ref-formats.sh ***
@@ -466640,319 +466820,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7422-submodule-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S) registered for path 'S'
-Submodule 'S.C' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S.C) registered for path 'S.C'
-Submodule 'S.C.D' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S.C.D) registered for path 'S.C.D'
-Submodule 'S.D' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S.D) registered for path 'S.D'
-Submodule 'X' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./X) registered for path 'X'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S.C'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S.C.D'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S.D'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7450-bad-git-dotfiles.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/.git/
 expecting success of 7450.1 'setup': 
@@ -467209,13 +467076,13 @@
  create mode 100644 .gitmodules
 173+0 records in
 173+0 records out
-173 bytes copied, 0.00015356 s, 1.1 MB/s
+173 bytes copied, 0.00015288 s, 1.1 MB/s
 49+0 records in
 49+0 records out
-49 bytes copied, 6.1921e-05 s, 791 kB/s
+49 bytes copied, 6.236e-05 s, 786 kB/s
 122+0 records in
 122+0 records out
-122 bytes copied, 0.00011256 s, 1.1 MB/s
+122 bytes copied, 0.00011736 s, 1.0 MB/s
 ok 12 - create oddly ordered pack
 
 expecting success of 7450.13 'transfer.fsckObjects handles odd pack (unpack)': 
@@ -467863,18 +467730,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.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1'...
 done.
-fatal: not a git repository: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2/../.git/modules/hippo/hooks
+error: submodule git dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+fatal: refusing to create/use '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2/../.git/modules/hippo/hooks
+error: submodule git dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+fatal: refusing to create/use '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+error: submodule git dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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': 
@@ -467909,6 +467778,838 @@
 1..49
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7500-commit-template-squash-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/.git/
+expecting success of 7500.1 'a basic commit in an empty tree should succeed': 
+	echo content > foo &&
+	git add foo &&
+	git commit -m "initial commit"
+
+[master (root-commit) 02efb91] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+ok 1 - a basic commit in an empty tree should succeed
+
+expecting success of 7500.2 'nonexistent template file should return error': 
+	echo changes >> foo &&
+	git add foo &&
+	(
+		GIT_EDITOR="echo hello >\"\$1\"" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit --template "$PWD"/notexist
+	)
+
+fatal: could not read '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
+ok 2 - nonexistent template file should return error
+
+expecting success of 7500.3 'nonexistent template file in config should return error': 
+	test_config commit.template "$PWD"/notexist &&
+	(
+		GIT_EDITOR="echo hello >\"\$1\"" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit
+	)
+
+fatal: could not read '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
+ok 3 - nonexistent template file in config should return error
+
+expecting success of 7500.4 'unedited template should not commit': 
+	echo "template line" > "$TEMPLATE" &&
+	test_must_fail git commit --template "$TEMPLATE"
+
+Aborting commit; you did not edit the message.
+ok 4 - unedited template should not commit
+
+expecting success of 7500.5 'unedited template with comments should not commit': 
+	echo "# comment in template" >> "$TEMPLATE" &&
+	test_must_fail git commit --template "$TEMPLATE"
+
+Aborting commit; you did not edit the message.
+ok 5 - unedited template with comments should not commit
+
+expecting success of 7500.6 'a Signed-off-by line by itself should not commit': 
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-signed-off &&
+		test_must_fail git commit --template "$TEMPLATE"
+	)
+
+Aborting commit; you did not edit the message.
+ok 6 - a Signed-off-by line by itself should not commit
+
+expecting success of 7500.7 'adding comments to a template should not commit': 
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-comments &&
+		test_must_fail git commit --template "$TEMPLATE"
+	)
+
+Aborting commit; you did not edit the message.
+ok 7 - adding comments to a template should not commit
+
+expecting success of 7500.8 'adding real content to a template should commit': 
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit --template "$TEMPLATE"
+	) &&
+	commit_msg_is "template linecommit message"
+
+[master 0439be9] template line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - adding real content to a template should commit
+
+expecting success of 7500.9 '-t option should be short for --template': 
+	echo "short template" > "$TEMPLATE" &&
+	echo "new content" >> foo &&
+	git add foo &&
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit -t "$TEMPLATE"
+	) &&
+	commit_msg_is "short templatecommit message"
+
+[master e42593e] short template
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 9 - -t option should be short for --template
+
+expecting success of 7500.10 'config-specified template should commit': 
+	echo "new template" > "$TEMPLATE" &&
+	test_config commit.template "$TEMPLATE" &&
+	echo "more content" >> foo &&
+	git add foo &&
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit
+	) &&
+	commit_msg_is "new templatecommit message"
+
+[master 811561e] new template
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - config-specified template should commit
+
+expecting success of 7500.11 'explicit commit message should override template': 
+	echo "still more content" >> foo &&
+	git add foo &&
+	GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-content git commit --template "$TEMPLATE" \
+		-m "command line msg" &&
+	commit_msg_is "command line msg"
+
+[master d8cbf96] command line msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 11 - explicit commit message should override template
+
+expecting success of 7500.12 'commit message from file should override template': 
+	echo "content galore" >> foo &&
+	git add foo &&
+	echo "standard input msg" |
+	(
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+		git commit --template "$TEMPLATE" --file -
+	) &&
+	commit_msg_is "standard input msg"
+
+[master 65e5eb1] standard input msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 12 - commit message from file should override template
+
+expecting success of 7500.13 'commit message from template with whitespace issue': 
+	echo "content galore" >>foo &&
+	git add foo &&
+	GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
+	git commit --template "$TEMPLATE" &&
+	commit_msg_is "commit message"
+
+[master 5e66887] commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 13 - commit message from template with whitespace issue
+
+expecting success of 7500.14 'using alternate GIT_INDEX_FILE (1)': 
+
+	cp .git/index saved-index &&
+	(
+		echo some new content >file &&
+	        GIT_INDEX_FILE=.git/another_index &&
+		export GIT_INDEX_FILE &&
+		git add file &&
+		git commit -m "commit using another index" &&
+		git diff-index --exit-code HEAD &&
+		git diff-files --exit-code
+	) &&
+	cmp .git/index saved-index >/dev/null
+
+
+[master 7c961fb] commit using another index
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+ create mode 100644 file
+ delete mode 100644 foo
+ok 14 - using alternate GIT_INDEX_FILE (1)
+
+expecting success of 7500.15 'using alternate GIT_INDEX_FILE (2)': 
+
+	cp .git/index saved-index &&
+	(
+		rm -f .git/no-such-index &&
+		GIT_INDEX_FILE=.git/no-such-index &&
+		export GIT_INDEX_FILE &&
+		git commit -m "commit using nonexistent index" &&
+		test -z "$(git ls-files)" &&
+		test -z "$(git ls-tree HEAD)"
+
+	) &&
+	cmp .git/index saved-index >/dev/null
+
+[master 4e95e06] commit using nonexistent index
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+ok 15 - using alternate GIT_INDEX_FILE (2)
+
+expecting success of 7500.16 '--signoff': 
+	echo "yet another content *narf*" >> foo &&
+	echo "zort" | git commit -s -F - foo &&
+	git cat-file commit HEAD | sed "1,/^\$/d" > output &&
+	test_cmp expect output
+
+[master 5b1a0f3] zort
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 foo
+ok 16 - --signoff
+
+expecting success of 7500.17 'commit message from file (1)': 
+	mkdir subdir &&
+	echo "Log in top directory" >log &&
+	echo "Log in sub directory" >subdir/log &&
+	(
+		cd subdir &&
+		git commit --allow-empty -F log
+	) &&
+	commit_msg_is "Log in sub directory"
+
+[master 101c1bd] Log in sub directory
+ Author: A U Thor <author@example.com>
+ok 17 - commit message from file (1)
+
+expecting success of 7500.18 'commit message from file (2)': 
+	rm -f log &&
+	echo "Log in sub directory" >subdir/log &&
+	(
+		cd subdir &&
+		git commit --allow-empty -F log
+	) &&
+	commit_msg_is "Log in sub directory"
+
+[master 83046dc] Log in sub directory
+ Author: A U Thor <author@example.com>
+ok 18 - commit message from file (2)
+
+expecting success of 7500.19 'commit message from stdin': 
+	(
+		cd subdir &&
+		echo "Log with foo word" | git commit --allow-empty -F -
+	) &&
+	commit_msg_is "Log with foo word"
+
+[master 2f170f9] Log with foo word
+ Author: A U Thor <author@example.com>
+ok 19 - commit message from stdin
+
+expecting success of 7500.20 'commit -F overrides -t': 
+	(
+		cd subdir &&
+		echo "-F log" > f.log &&
+		echo "-t template" > t.template &&
+		git commit --allow-empty -F f.log -t t.template
+	) &&
+	commit_msg_is "-F log"
+
+[master df55417] -F log
+ Author: A U Thor <author@example.com>
+ok 20 - commit -F overrides -t
+
+expecting success of 7500.21 'Commit without message is allowed with --allow-empty-message': 
+	echo "more content" >>foo &&
+	git add foo &&
+	>empty &&
+	git commit --allow-empty-message <empty &&
+	commit_msg_is "" &&
+	git tag empty-message-commit
+
+[master 5cf7fec] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 21 - Commit without message is allowed with --allow-empty-message
+
+expecting success of 7500.22 'Commit without message is no-no without --allow-empty-message': 
+	echo "more content" >>foo &&
+	git add foo &&
+	>empty &&
+	test_must_fail git commit <empty
+
+Aborting commit due to empty commit message.
+ok 22 - Commit without message is no-no without --allow-empty-message
+
+expecting success of 7500.23 'Commit a message with --allow-empty-message': 
+	echo "even more content" >>foo &&
+	git add foo &&
+	git commit --allow-empty-message -m"hello there" &&
+	commit_msg_is "hello there"
+
+[master 1a05b50] hello there
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 23 - Commit a message with --allow-empty-message
+
+expecting success of 7500.24 'commit -C empty respects --allow-empty-message': 
+	echo more >>foo &&
+	git add foo &&
+	test_must_fail git commit -C empty-message-commit &&
+	git commit -C empty-message-commit --allow-empty-message &&
+	commit_msg_is ""
+
+Aborting commit due to empty commit message.
+[master 7c3a153] 
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 24 - commit -C empty respects --allow-empty-message
+
+expecting success of 7500.25 'commit --fixup provides correct one-line commit message': 
+	commit_for_rebase_autosquash_setup &&
+	EDITOR="echo ignored >>" git commit --fixup HEAD~1 &&
+	commit_msg_is "fixup! target message subject line"
+
+[master 9b5b399] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5b2adcc] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 77c550c] fixup! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 25 - commit --fixup provides correct one-line commit message
+
+expecting success of 7500.26 'commit --fixup -m"something" -m"extra"': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --fixup HEAD~1 -m"something" -m"extra" &&
+	commit_msg_is "fixup! target message subject linesomething
+
+extra"
+
+[master d870198] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 4134eb8] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d256be7] fixup! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 26 - commit --fixup -m"something" -m"extra"
+
+expecting success of 7500.27 'commit --fixup --edit': 
+	commit_for_rebase_autosquash_setup &&
+	EDITOR="printf \"something\nextra\" >>" git commit --fixup HEAD~1 --edit &&
+	commit_msg_is "fixup! target message subject linesomething
+extra"
+
+[master 68474d9] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d9cd24a] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b813bdf] fixup! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 27 - commit --fixup --edit
+
+expecting success of 7500.28 'commit --fixup=amend: creates amend! commit': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=amend:HEAD~
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual
+
+[master 25d4b87] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 49d2e45] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 6a95a22] amend! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 28 - commit --fixup=amend: creates amend! commit
+
+expecting success of 7500.29 '--fixup=amend: --only ignores staged changes': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=amend:HEAD~ --only
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual &&
+	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
+	test_cmp_rev HEAD@{1} HEAD^ &&
+	test_expect_code 1 git diff --cached --exit-code &&
+	git cat-file blob :foo >actual &&
+	test_cmp foo actual
+
+[master 495438c] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master edaae07] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 948c995] amend! target message subject line
+ Author: A U Thor <author@example.com>
+diff --git a/foo b/foo
+index 42c2cbb..b6c6366 100644
+--- a/foo
++++ b/foo
+@@ -24,3 +24,4 @@ second content line
+ third content line
+ first content line
+ second content line
++third content line
+ok 29 - --fixup=amend: --only ignores staged changes
+
+expecting success of 7500.30 '--fixup=reword: ignores staged changes': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=reword:HEAD~
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual &&
+	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
+	test_cmp_rev HEAD@{1} HEAD^ &&
+	test_expect_code 1 git diff --cached --exit-code &&
+	git cat-file blob :foo >actual &&
+	test_cmp foo actual
+
+[master ed4d665] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 218b136] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ee78bdc] amend! target message subject line
+ Author: A U Thor <author@example.com>
+diff --git a/foo b/foo
+index 0b75f14..a67f15d 100644
+--- a/foo
++++ b/foo
+@@ -27,3 +27,4 @@ second content line
+ third content line
+ first content line
+ second content line
++third content line
+ok 30 - --fixup=reword: ignores staged changes
+
+expecting success of 7500.31 '--fixup=reword: error out with -m option': 
+	commit_for_rebase_autosquash_setup &&
+	echo "fatal: options '-m' and '--fixup:reword' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=reword:HEAD~ -m "reword commit message" 2>actual &&
+	test_cmp expect actual
+
+[master 9d96c85] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 5b2f7bf] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 31 - --fixup=reword: error out with -m option
+
+expecting success of 7500.32 '--fixup=amend: error out with -m option': 
+	commit_for_rebase_autosquash_setup &&
+	echo "fatal: options '-m' and '--fixup:amend' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=amend:HEAD~ -m "amend commit message" 2>actual &&
+	test_cmp expect actual
+
+[master a94321d] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 7600d55] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 32 - --fixup=amend: error out with -m option
+
+expecting success of 7500.33 'consecutive amend! commits remove amend! line from commit msg body': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited 1
+
+	edited 2
+	EOF
+	echo "reword new commit message" >actual &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited 1" \
+			git commit --fixup=reword:HEAD~ &&
+		FAKE_COMMIT_AMEND="edited 2" \
+			git commit --fixup=reword:HEAD
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual
+
+[master 2a99715] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 550158e] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 38fd587] amend! target message subject line
+ Author: A U Thor <author@example.com>
+[master 1a502bb] amend! amend! target message subject line
+ Author: A U Thor <author@example.com>
+ok 33 - consecutive amend! commits remove amend! line from commit msg body
+
+expecting success of 7500.34 'deny to create amend! commit if its commit msg body is empty': 
+	commit_for_rebase_autosquash_setup &&
+	echo "Aborting commit due to empty commit message body." >expected &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_COMMIT_MESSAGE="amend! target message subject line" \
+			git commit --fixup=amend:HEAD~ 2>actual
+	) &&
+	test_cmp expected actual
+
+[master c428437] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master ac86728] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 34 - deny to create amend! commit if its commit msg body is empty
+
+expecting success of 7500.35 'amend! commit allows empty commit msg body with --allow-empty-message': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="amend! target message subject line" \
+			git commit --fixup=amend:HEAD~ --allow-empty-message &&
+		get_commit_msg HEAD >actual
+	) &&
+	test_cmp expected actual
+
+[master d75d1dc] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 95b8327] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master a8cf642] amend! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 35 - amend! commit allows empty commit msg body with --allow-empty-message
+
+expecting success of 7500.36 '--fixup=reword: incompatible with --all': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --all 2>actual &&
+		test_cmp expect actual
+	
+ok 36 - --fixup=reword: incompatible with --all
+
+expecting success of 7500.37 '--fixup=reword: incompatible with --include': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --include 2>actual &&
+		test_cmp expect actual
+	
+ok 37 - --fixup=reword: incompatible with --include
+
+expecting success of 7500.38 '--fixup=reword: incompatible with --only': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --only 2>actual &&
+		test_cmp expect actual
+	
+ok 38 - --fixup=reword: incompatible with --only
+
+expecting success of 7500.39 '--fixup=reword: incompatible with --interactive': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --interactive 2>actual &&
+		test_cmp expect actual
+	
+ok 39 - --fixup=reword: incompatible with --interactive
+
+expecting success of 7500.40 '--fixup=reword: incompatible with --patch': 
+		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
+		test_must_fail git commit --fixup=reword:HEAD~ --patch 2>actual &&
+		test_cmp expect actual
+	
+ok 40 - --fixup=reword: incompatible with --patch
+
+expecting success of 7500.41 '--fixup=reword: give error with pathsec': 
+	commit_for_rebase_autosquash_setup &&
+	echo "fatal: reword option of '--fixup' and path 'foo' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=reword:HEAD~ -- foo 2>actual &&
+	test_cmp expect actual
+
+[master c3507b6] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master f054bdc] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 41 - --fixup=reword: give error with pathsec
+
+expecting success of 7500.42 '--fixup=reword: -F give error message': 
+	echo "fatal: options '-F' and '--fixup' cannot be used together" >expect &&
+	test_must_fail git commit --fixup=reword:HEAD~ -F msg  2>actual &&
+	test_cmp expect actual
+
+ok 42 - --fixup=reword: -F give error message
+
+expecting success of 7500.43 'commit --squash works with -F': 
+	commit_for_rebase_autosquash_setup &&
+	echo "log message from file" >msgfile &&
+	git commit --squash HEAD~1 -F msgfile  &&
+	commit_msg_is "squash! target message subject linelog message from file"
+
+[master 21cad69] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master 2bfb665] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master bc37c4c] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 43 - commit --squash works with -F
+
+expecting success of 7500.44 'commit --squash works with -m': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --squash HEAD~1 -m "foo bar\nbaz" &&
+	commit_msg_is "squash! target message subject linefoo bar\nbaz"
+
+[master 34d018d] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9280558] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 74b4402] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 44 - commit --squash works with -m
+
+expecting success of 7500.45 'commit --squash works with -C': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --squash HEAD~1 -C HEAD &&
+	commit_msg_is "squash! target message subject lineintermediate commit"
+
+[master 6ba9d60] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master a1fa052] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 3059308] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 45 - commit --squash works with -C
+
+expecting success of 7500.46 'commit --squash works with -c': 
+	commit_for_rebase_autosquash_setup &&
+	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
+	git commit --squash HEAD~1 -c HEAD &&
+	commit_msg_is "squash! target message subject lineedited commit"
+
+[master 2cb0c38] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 81a0468] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9792f72] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 46 - commit --squash works with -c
+
+expecting success of 7500.47 'commit --squash works with -C for same commit': 
+	commit_for_rebase_autosquash_setup &&
+	git commit --squash HEAD -C HEAD &&
+	commit_msg_is "squash! intermediate commit"
+
+[master fcc9597] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 3fba3a1] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b6827cd] squash! intermediate commit
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 47 - commit --squash works with -C for same commit
+
+expecting success of 7500.48 'commit --squash works with -c for same commit': 
+	commit_for_rebase_autosquash_setup &&
+	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
+	git commit --squash HEAD -c HEAD &&
+	commit_msg_is "squash! edited commit"
+
+[master 35e184e] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 328d91f] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d7c0314] squash! edited commit
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 48 - commit --squash works with -c for same commit
+
+expecting success of 7500.49 'commit --squash works with editor': 
+	commit_for_rebase_autosquash_setup &&
+	test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
+	git commit --squash HEAD~1 &&
+	commit_msg_is "squash! target message subject linecommit message"
+
+[master acfdcf4] target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5a82cf8] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 8042530] squash! target message subject line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 49 - commit --squash works with editor
+
+expecting success of 7500.50 'invalid message options when using --fixup': 
+	echo changes >>foo &&
+	echo "message" >log &&
+	git add foo &&
+	test_must_fail git commit --fixup HEAD~1 --squash HEAD~2 &&
+	test_must_fail git commit --fixup HEAD~1 -C HEAD~2 &&
+	test_must_fail git commit --fixup HEAD~1 -c HEAD~2 &&
+	test_must_fail git commit --fixup HEAD~1 -F log
+
+fatal: options '--squash' and '--fixup' cannot be used together
+fatal: options '-C' and '--fixup' cannot be used together
+fatal: options '-c' and '--fixup' cannot be used together
+fatal: options '-F' and '--fixup' cannot be used together
+ok 50 - invalid message options when using --fixup
+
+expecting success of 7500.51 'new line found before status message in commit template': 
+	git checkout -b commit-template-check &&
+	git reset --hard HEAD &&
+	touch commit-template-check &&
+	git add commit-template-check &&
+	GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
+	test_cmp expected-template editor-input
+
+Switched to a new branch 'commit-template-check'
+HEAD is now at 8042530 squash! target message subject line
+[commit-template-check c1e58ac] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 commit-template-check
+ok 51 - new line found before status message in commit template
+
+expecting success of 7500.52 'setup empty commit with unstaged rename and copy': 
+	test_create_repo unstaged_rename_and_copy &&
+	(
+		cd unstaged_rename_and_copy &&
+
+		echo content >orig &&
+		git add orig &&
+		test_commit orig &&
+
+		cp orig new_copy &&
+		mv orig new_rename &&
+		git add -N new_copy new_rename
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/unstaged_rename_and_copy/.git/
+[master (root-commit) bac0952] orig
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 orig
+ create mode 100644 orig.t
+ok 52 - setup empty commit with unstaged rename and copy
+
+expecting success of 7500.53 'check commit with unstaged rename and copy': 
+	(
+		cd unstaged_rename_and_copy &&
+
+		test_must_fail git -c diff.renames=copy commit
+	)
+
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	copied:     orig -> new_copy
+	renamed:    orig -> new_rename
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 53 - check commit with unstaged rename and copy
+
+expecting success of 7500.54 'commit without staging files fails and displays hints': 
+	echo "initial" >file &&
+	git add file &&
+	git commit -m initial &&
+	echo "changes" >>file &&
+	test_must_fail git commit -m update >actual &&
+	test_grep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
+
+[commit-template-check cfa8638] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 54 - commit without staging files fails and displays hints
+
+# passed all 54 test(s)
+1..54
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7501-commit-basic-functionality.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7501-commit-basic-functionality/.git/
 expecting success of 7501.1 'initial status': 
@@ -467917,2157 +468618,4479 @@
 	git status >actual &&
 	test_grep "No commits yet" actual
 
-No commits yet
-ok 1 - initial status
+No commits yet
+ok 1 - initial status
+
+expecting success of 7501.2 'fail initial amend': 
+	test_must_fail git commit --amend
+
+fatal: You have nothing to amend.
+ok 2 - fail initial amend
+
+expecting success of 7501.3 'setup: initial commit': 
+	git commit -m initial
+
+[main (root-commit) 402702b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 3 - setup: initial commit
+
+expecting success of 7501.4 '-m and -F do not mix': 
+	git checkout HEAD file && echo >>file && git add file &&
+	test_must_fail git commit -m foo -m bar -F file
+
+Updated 0 paths from a0cb959
+fatal: options '-m' and '-F' cannot be used together
+ok 4 - -m and -F do not mix
+
+expecting success of 7501.5 '-m and -C do not mix': 
+	git checkout HEAD file && echo >>file && git add file &&
+	test_must_fail git commit -C HEAD -m illegal
+
+Updated 1 path from a0cb959
+fatal: options '-m' and '-C' cannot be used together
+ok 5 - -m and -C do not mix
+
+expecting success of 7501.6 'paths and -a do not mix': 
+	echo King of the bongo >file &&
+	test_must_fail git commit -m foo -a file
+
+fatal: paths 'file ...' with -a does not make sense
+ok 6 - paths and -a do not mix
+
+expecting success of 7501.7 'can use paths with --interactive': 
+	echo bong-o-bong >file &&
+	# 2: update, 1:st path, that is all, 7: quit
+	test_write_lines 2 1 "" 7 |
+	git commit -m foo --interactive file &&
+	git reset --hard HEAD^
+
+           staged     unstaged path
+  1:        +1/-0        +1/-2 file
+
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:        +1/-0        +1/-2 [f]ile
+Update>>            staged     unstaged path
+* 1:        +1/-0        +1/-2 [f]ile
+Update>> updated 1 path
+
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> Bye.
+[main 54cbdc6] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 402702b initial
+ok 7 - can use paths with --interactive
+
+expecting success of 7501.8 'removed files and relative paths': 
+	test_when_finished "rm -rf foo" &&
+	git init foo &&
+	>foo/foo.txt &&
+	git -C foo add foo.txt &&
+	git -C foo commit -m first &&
+	git -C foo rm foo.txt &&
+
+	mkdir -p foo/bar &&
+	git -C foo/bar commit -m second ../foo.txt
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7501-commit-basic-functionality/foo/.git/
+[main (root-commit) c087cbd] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo.txt
+rm 'foo.txt'
+[main 332404f] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 foo.txt
+ok 8 - removed files and relative paths
+
+expecting success of 7501.9 'using invalid commit with -C': 
+	test_must_fail git commit --allow-empty -C bogus
+
+fatal: could not lookup commit 'bogus'
+ok 9 - using invalid commit with -C
+
+expecting success of 7501.10 'nothing to commit': 
+	git reset --hard &&
+	test_must_fail git commit -m initial
+
+HEAD is now at 402702b initial
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 10 - nothing to commit
+
+expecting success of 7501.11 '--dry-run fails with nothing to commit': 
+	test_must_fail git commit -m initial --dry-run
+
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 11 - --dry-run fails with nothing to commit
+
+expecting success of 7501.12 '--short fails with nothing to commit': 
+	test_must_fail git commit -m initial --short
+
+?? actual
+ok 12 - --short fails with nothing to commit
+
+expecting success of 7501.13 '--porcelain fails with nothing to commit': 
+	test_must_fail git commit -m initial --porcelain
+
+?? actual
+ok 13 - --porcelain fails with nothing to commit
+
+expecting success of 7501.14 '--long fails with nothing to commit': 
+	test_must_fail git commit -m initial --long
+
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 14 - --long fails with nothing to commit
+
+expecting success of 7501.15 'fail to commit untracked file (even with --include/--only)': 
+	echo content >baz &&
+	error="error: pathspec .baz. did not match any file(s) known to git" &&
+
+	test_must_fail git commit -m "baz" baz 2>err &&
+	test_grep -e "$error" err &&
+
+	test_must_fail git commit --only -m "baz" baz 2>err &&
+	test_grep -e "$error" err &&
+
+	test_must_fail git commit --include -m "baz" baz 2>err &&
+	test_grep -e "$error" err
+
+error: pathspec 'baz' did not match any file(s) known to git
+error: pathspec 'baz' did not match any file(s) known to git
+error: pathspec 'baz' did not match any file(s) known to git
+ok 15 - fail to commit untracked file (even with --include/--only)
+
+expecting success of 7501.16 'setup: non-initial commit': 
+	echo bongo bongo bongo >file &&
+	git commit -m next -a
+
+[main b49f306] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - setup: non-initial commit
+
+expecting success of 7501.17 '--dry-run with stuff to commit returns ok': 
+	echo bongo bongo bongo >>file &&
+	git commit -m next -a --dry-run
+
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	baz
+	err
+
+ok 17 - --dry-run with stuff to commit returns ok
+
+expecting success of 7501.18 '--short with stuff to commit returns ok': 
+	echo bongo bongo bongo >>file &&
+	git commit -m next -a --short
+
+M  file
+?? actual
+?? baz
+?? err
+ok 18 - --short with stuff to commit returns ok
+
+expecting success of 7501.19 '--porcelain with stuff to commit returns ok': 
+	echo bongo bongo bongo >>file &&
+	git commit -m next -a --porcelain
+
+M  file
+?? actual
+?? baz
+?? err
+ok 19 - --porcelain with stuff to commit returns ok
+
+expecting success of 7501.20 '--long with stuff to commit returns ok': 
+	echo bongo bongo bongo >>file &&
+	git commit -m next -a --long
+
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	baz
+	err
+
+ok 20 - --long with stuff to commit returns ok
+
+expecting success of 7501.21 'exclude additional staged changes when given pathspec': 
+		echo content >>file &&
+		echo content >>baz &&
+		git add baz &&
+		git commit $opt -m "file" file &&
+
+		git diff --name-only >actual &&
+		test_must_be_empty actual &&
+
+		test_write_lines baz >expect &&
+		git diff --name-only --cached >actual &&
+		test_cmp expect actual &&
+
+		test_write_lines file >expect &&
+		git diff --name-only HEAD^ HEAD >actual &&
+		test_cmp expect actual
+	
+[main 0058760] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ok 21 - exclude additional staged changes when given pathspec
+
+expecting success of 7501.22 'exclude additional staged changes when given pathspec': 
+		echo content >>file &&
+		echo content >>baz &&
+		git add baz &&
+		git commit $opt -m "file" file &&
+
+		git diff --name-only >actual &&
+		test_must_be_empty actual &&
+
+		test_write_lines baz >expect &&
+		git diff --name-only --cached >actual &&
+		test_cmp expect actual &&
+
+		test_write_lines file >expect &&
+		git diff --name-only HEAD^ HEAD >actual &&
+		test_cmp expect actual
+	
+[main 62fc6c3] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 22 - exclude additional staged changes when given pathspec
+
+expecting success of 7501.23 'exclude additional staged changes when given pathspec': 
+		echo content >>file &&
+		echo content >>baz &&
+		git add baz &&
+		git commit $opt -m "file" file &&
+
+		git diff --name-only >actual &&
+		test_must_be_empty actual &&
+
+		test_write_lines baz >expect &&
+		git diff --name-only --cached >actual &&
+		test_cmp expect actual &&
+
+		test_write_lines file >expect &&
+		git diff --name-only HEAD^ HEAD >actual &&
+		test_cmp expect actual
+	
+[main 9671b57] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 23 - exclude additional staged changes when given pathspec
+
+expecting success of 7501.24 '-i/--include includes staged changes': 
+	echo content >>file &&
+	echo content >>baz &&
+	git add file &&
+
+	# baz is in the index, therefore, it will be committed
+	git commit --include -m "file and baz" baz  &&
+
+	git diff --name-only HEAD >remaining &&
+	test_must_be_empty remaining &&
+
+	test_write_lines baz file >expect &&
+	git diff --name-only HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+[main fee1730] file and baz
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 baz
+ok 24 - -i/--include includes staged changes
+
+expecting success of 7501.25 '--include and --only do not mix': 
+	test_when_finished "git reset --hard" &&
+	echo content >>file &&
+	echo content >>baz &&
+	test_must_fail git commit --include --only -m "file baz" file baz 2>actual &&
+	test_grep -e "fatal: options .-i/--include. and .-o/--only. cannot be used together" actual
+
+fatal: options '-i/--include' and '-o/--only' cannot be used together
+HEAD is now at fee1730 file and baz
+ok 25 - --include and --only do not mix
+
+expecting success of 7501.26 'commit message from non-existing file': 
+	echo more bongo: bongo bongo bongo bongo >file &&
+	test_must_fail git commit -F gah -a
+
+fatal: could not read log file 'gah': No such file or directory
+ok 26 - commit message from non-existing file
+
+expecting success of 7501.27 'empty commit message': 
+	# Empty except stray tabs and spaces on a few lines.
+	sed -e "s/@//g" >msg <<-\EOF &&
+		@		@
+		@@
+		@  @
+		@Signed-off-by: hula@
+	EOF
+	test_must_fail git commit -F msg -a
+
+Aborting commit due to empty commit message.
+ok 27 - empty commit message
+
+expecting success of 7501.28 'template "emptyness" check does not kick in with -F': 
+	git checkout HEAD file && echo >>file && git add file &&
+	git commit -t file -F file
+
+Updated 1 path from 87f11f5
+[main 00e5646] bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo content content content content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 28 - template "emptyness" check does not kick in with -F
+
+expecting success of 7501.29 'template "emptyness" check': 
+	git checkout HEAD file && echo >>file && git add file &&
+	test_must_fail git commit -t file 2>err &&
+	test_grep "did not edit" err
+
+Updated 0 paths from 3f95331
+Aborting commit; you did not edit the message.
+ok 29 - template "emptyness" check
+
+expecting success of 7501.30 'setup: commit message from file': 
+	git checkout HEAD file && echo >>file && git add file &&
+	echo this is the commit message, coming from a file >msg &&
+	git commit -F msg -a
+
+Updated 1 path from 3f95331
+[main 4ce73b9] this is the commit message, coming from a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 30 - setup: commit message from file
+
+expecting success of 7501.31 'amend commit': 
+	cat >editor <<-\EOF &&
+	#!/bin/sh
+	sed -e "s/a file/an amend commit/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+	chmod 755 editor &&
+	EDITOR=./editor git commit --amend
+
+[main 7990fc4] this is the commit message, coming from an amend commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 31 - amend commit
+
+expecting success of 7501.32 'amend --only ignores staged contents': 
+	cp file file.expect &&
+	echo changed >file &&
+	git add file &&
+	git commit --no-edit --amend --only &&
+	git cat-file blob HEAD:file >file.actual &&
+	test_cmp file.expect file.actual &&
+	git diff --exit-code
+
+[main 7990fc4] this is the commit message, coming from an amend commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 32 - amend --only ignores staged contents
+
+expecting success of 7501.33 'allow-empty --only ignores staged contents': 
+	echo changed-again >file &&
+	git add file &&
+	git commit --allow-empty --only -m "empty" &&
+	git cat-file blob HEAD:file >file.actual &&
+	test_cmp file.expect file.actual &&
+	git diff --exit-code
+
+[main 5d11af6] empty
+ Author: A U Thor <author@example.com>
+ok 33 - allow-empty --only ignores staged contents
+
+expecting success of 7501.34 'set up editor': 
+	cat >editor <<-\EOF &&
+	#!/bin/sh
+	sed -e "s/unamended/amended/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+	chmod 755 editor
+
+ok 34 - set up editor
+
+expecting success of 7501.35 'amend without launching editor': 
+	echo unamended >expect &&
+	git commit --allow-empty -m "unamended" &&
+	echo needs more bongo >file &&
+	git add file &&
+	EDITOR=./editor git commit --no-edit --amend &&
+	git diff --exit-code HEAD -- file &&
+	git diff-tree -s --format=%s HEAD >msg &&
+	test_cmp expect msg
+
+[main 5b0b93b] unamended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+[main 2b43b14] unamended
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+ok 35 - amend without launching editor
+
+expecting success of 7501.36 '--amend --edit': 
+	echo amended >expect &&
+	git commit --allow-empty -m "unamended" &&
+	echo bongo again >file &&
+	git add file &&
+	EDITOR=./editor git commit --edit --amend &&
+	git diff-tree -s --format=%s HEAD >msg &&
+	test_cmp expect msg
+
+[main 0d559e0] unamended
+ Author: A U Thor <author@example.com>
+[main 1f4126b] amended
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 36 - --amend --edit
+
+expecting success of 7501.37 '--amend --edit of empty message': 
+	cat >replace <<-\EOF &&
+	#!/bin/sh
+	echo "amended" >"$1"
+	EOF
+	chmod 755 replace &&
+	git commit --allow-empty --allow-empty-message -m "" &&
+	echo more bongo >file &&
+	git add file &&
+	EDITOR=./replace git commit --edit --amend &&
+	git diff-tree -s --format=%s HEAD >msg &&
+	./replace expect &&
+	test_cmp expect msg
+
+[main 52e8630] 
+ Author: A U Thor <author@example.com>
+[main 5cf5ffd] amended
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 37 - --amend --edit of empty message
+
+expecting success of 7501.38 '--amend to set message to empty': 
+	echo bata >file &&
+	git add file &&
+	git commit -m "unamended" &&
+	git commit --amend --allow-empty-message -m "" &&
+	git diff-tree -s --format=%s HEAD >msg &&
+	echo "" >expect &&
+	test_cmp expect msg
+
+[main ee5d27e] unamended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 4d5dffe] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 38 - --amend to set message to empty
+
+expecting success of 7501.39 '--amend to set empty message needs --allow-empty-message': 
+	echo conga >file &&
+	git add file &&
+	git commit -m "unamended" &&
+	test_must_fail git commit --amend -m "" &&
+	git diff-tree -s --format=%s HEAD >msg &&
+	echo "unamended" >expect &&
+	test_cmp expect msg
+
+[main ecd0b3f] unamended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Aborting commit due to empty commit message.
+ok 39 - --amend to set empty message needs --allow-empty-message
+
+expecting success of 7501.40 '-m --edit': 
+	echo amended >expect &&
+	git commit --allow-empty -m buffer &&
+	echo bongo bongo >file &&
+	git add file &&
+	EDITOR=./editor git commit -m unamended --edit &&
+	git diff-tree -s  --format=%s HEAD >msg &&
+	test_cmp expect msg
+
+[main ac77246] buffer
+ Author: A U Thor <author@example.com>
+[main a64b909] amended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 40 - -m --edit
+
+expecting success of 7501.41 '-m and -F do not mix': 
+	echo enough with the bongos >file &&
+	test_must_fail git commit -F msg -m amending .
+
+fatal: options '-m' and '-F' cannot be used together
+ok 41 - -m and -F do not mix
+
+expecting success of 7501.42 'using message from other commit': 
+	git commit -C HEAD^ .
+
+[main b679af0] buffer
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 42 - using message from other commit
+
+expecting success of 7501.43 'editing message from other commit': 
+	cat >editor <<-\EOF &&
+	#!/bin/sh
+	sed -e "s/amend/older/g"  <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+	chmod 755 editor &&
+	echo hula hula >file &&
+	EDITOR=./editor git commit -c HEAD^ -a
+
+[main a9488ae] oldered
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 43 - editing message from other commit
+
+expecting success of 7501.44 'message from stdin': 
+	echo silly new contents >file &&
+	echo commit message from stdin |
+	git commit -F - -a
+
+[main c658950] commit message from stdin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 44 - message from stdin
+
+expecting success of 7501.45 'overriding author from command line': 
+	echo gak >file &&
+	git commit -m author \
+		--author "Rubber Duck <rduck@convoy.org>" -a >output 2>&1 &&
+	grep Rubber.Duck output
+
+ Author: Rubber Duck <rduck@convoy.org>
+ok 45 - overriding author from command line
+
+expecting success of 7501.46 'interactive add': 
+	echo 7 | test_must_fail git commit --interactive >out &&
+	grep "What now" out
+
+What now> Bye.
+ok 46 - interactive add
+
+expecting success of 7501.47 'commit --interactive doesn't change index if editor aborts': 
+	echo zoo >file &&
+	test_must_fail git diff --exit-code >diff1 &&
+	test_write_lines u "*" q |
+	(
+		EDITOR=: &&
+		export EDITOR &&
+		test_must_fail git commit --interactive
+	) &&
+	git diff >diff2 &&
+	compare_diff_patch diff1 diff2
+
+           staged     unstaged path
+  1:    unchanged        +1/-1 file
+
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:    unchanged        +1/-1 [f]ile
+Update>> updated 1 path
+
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> Aborting commit due to empty commit message.
+Bye.
+ok 47 - commit --interactive doesn't change index if editor aborts
+
+expecting success of 7501.48 'editor not invoked if -F is given': 
+	cat >editor <<-\EOF &&
+	#!/bin/sh
+	sed -e s/good/bad/g <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+	chmod 755 editor &&
+
+	echo A good commit message. >msg &&
+	echo moo >file &&
+
+	EDITOR=./editor git commit -a -F msg &&
+	git show -s --pretty=format:%s >subject &&
+	grep -q good subject &&
+
+	echo quack >file &&
+	echo Another good message. |
+	EDITOR=./editor git commit -a -F - &&
+	git show -s --pretty=format:%s >subject &&
+	grep -q good subject
+
+[main 0b6afa6] A good commit message.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main f1d1700] Another good message.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 48 - editor not invoked if -F is given
+
+expecting success of 7501.49 'partial commit that involves removal (1)': 
+
+	git rm --cached file &&
+	mv file elif &&
+	git add elif &&
+	git commit -m "Partial: add elif" elif &&
+	git diff-tree --name-status HEAD^ HEAD >current &&
+	echo "A	elif" >expected &&
+	test_cmp expected current
+
+
+rm 'file'
+[main a544592] Partial: add elif
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 elif
+ok 49 - partial commit that involves removal (1)
+
+expecting success of 7501.50 'partial commit that involves removal (2)': 
+
+	git commit -m "Partial: remove file" file &&
+	git diff-tree --name-status HEAD^ HEAD >current &&
+	echo "D	file" >expected &&
+	test_cmp expected current
+
+
+[main 90f7b41] Partial: remove file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+ok 50 - partial commit that involves removal (2)
+
+expecting success of 7501.51 'partial commit that involves removal (3)': 
+
+	git rm --cached elif &&
+	echo elif >elif &&
+	git commit -m "Partial: modify elif" elif &&
+	git diff-tree --name-status HEAD^ HEAD >current &&
+	echo "M	elif" >expected &&
+	test_cmp expected current
+
+
+rm 'elif'
+[main 27fe9d1] Partial: modify elif
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 51 - partial commit that involves removal (3)
+
+expecting success of 7501.52 '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 27fe9d1 Partial: modify elif
+[main 3d703d4] Partial: modify elif
+ Author: The Real Author <someguy@his.email.org>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 52 - amend commit to fix author
+
+expecting success of 7501.53 'amend commit to fix date': 
+
+	test_tick &&
+	newtick=$GIT_AUTHOR_DATE &&
+	git reset --hard &&
+	git cat-file -p HEAD >commit &&
+	sed -e "s/author.*/author $author $newtick/" \
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
+	git commit --amend --date="$newtick" &&
+	git cat-file -p HEAD >current &&
+	test_cmp expected current
+
+
+HEAD is now at 3d703d4 Partial: modify elif
+[main 5fe0f07] Partial: modify elif
+ Author: The Real Author <someguy@his.email.org>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 53 - amend commit to fix date
+
+expecting success of 7501.54 'amend commit to add signoff': 
+
+	test_commit "msg" file content &&
+	git commit --amend --signoff &&
+	test_commit_message HEAD <<-EOF
+	msg
+
+	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+
+[main b95965d] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main fd588e7] msg
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 54 - amend commit to add signoff
+
+expecting success of 7501.55 'amend does not add signoff if it already exists': 
+
+	test_commit --signoff "tenor" file newcontent &&
+	git commit --amend --signoff &&
+	test_commit_message HEAD <<-EOF
+	tenor
+
+	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+
+[main e32b577] tenor
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main e32b577] tenor
+ 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 - amend does not add signoff if it already exists
+
+expecting success of 7501.56 'commit mentions forced date in output': 
+	git commit --amend --date=2010-01-02T03:04:05 >output &&
+	grep "Date: *Sat Jan 2 03:04:05 2010" output
+
+ Date: Sat Jan 2 03:04:05 2010 +0000
+ok 56 - commit mentions forced date in output
+
+expecting success of 7501.57 'commit complains about completely bogus dates': 
+	test_must_fail git commit --amend --date=seventeen
+
+fatal: invalid date format: seventeen
+ok 57 - commit complains about completely bogus dates
+
+expecting success of 7501.58 'commit --date allows approxidate': 
+	git commit --amend \
+		--date="midnight the 12th of october, anno domini 1979" &&
+	echo "Fri Oct 12 00:00:00 1979 +0000" >expect &&
+	git log -1 --format=%ad >actual &&
+	test_cmp expect actual
+
+[main 3af6070] tenor
+ Author: A U Thor <author@example.com>
+ Date: Fri Oct 12 00:00:00 1979 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 58 - commit --date allows approxidate
+
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7422-submodule-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S) registered for path 'S'
+Submodule 'S.C' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S.C) registered for path 'S.C'
+Submodule 'S.C.D' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S.C.D) registered for path 'S.C.D'
+Submodule 'S.D' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./S.D) registered for path 'S.D'
+Submodule 'X' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/./X) registered for path 'X'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S.C'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S.C.D'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7422-submodule-output/X/S.D'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
+expecting success of 7503.1 'root commit': 
+	echo "root" >file &&
+	git add file &&
+	git commit -m "zeroth" &&
+	git checkout -b side &&
+	echo "foo" >foo &&
+	git add foo &&
+	git commit -m "make it non-ff" &&
+	git branch side-orig side &&
+	git checkout main
+
+[main (root-commit) 0e29351] zeroth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side f4a0fae] make it non-ff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to branch 'main'
+ok 1 - root commit
+
+expecting success of 7503.2 'setup conflicting branches': 
+	test_when_finished "git checkout main" &&
+	git checkout -b conflicting-a main &&
+	echo a >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-a &&
+	git checkout -b conflicting-b main &&
+	echo b >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-b
+
+Switched to a new branch 'conflicting-a'
+[conflicting-a 3f25523] conflicting-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflicting
+Switched to a new branch 'conflicting-b'
+[conflicting-b 8c264fe] conflicting-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflicting
+Switched to branch 'main'
+ok 2 - setup conflicting branches
+
+expecting success of 7503.3 'with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "foo" >file &&
+	git add file &&
+	git commit -m "first" &&
+	test_path_is_missing actual_hooks
+
+[main e0ed36d] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - with no hook
+
+expecting success of 7503.4 'with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 4 - with no hook (merge)
+
+expecting success of 7503.5 '--no-verify with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "bar" >file &&
+	git add file &&
+	git commit --no-verify -m "bar" &&
+	test_path_is_missing actual_hooks
+
+[main 9b1e6a8] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - --no-verify with no hook
+
+expecting success of 7503.6 '--no-verify with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 6 - --no-verify with no hook (merge)
+
+expecting success of 7503.7 'with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "more" >>file &&
+	git add file &&
+	git commit -m "more" &&
+	test_cmp expected_hooks actual_hooks
+
+[main 7901543] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 7 - with succeeding hook
+
+expecting success of 7503.8 'with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+ok 8 - with succeeding hook (merge)
+
+expecting success of 7503.9 'automatic merge fails; both hooks are available': 
+	setup_success_hook "pre-commit" &&
+	setup_success_hook "pre-merge-commit" &&
+
+	git checkout conflicting-a &&
+	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
+	test_path_is_missing actual_hooks &&
+
+	echo "pre-commit" >expected_hooks &&
+	echo a+b >conflicting &&
+	git add conflicting &&
+	git commit -m "resolve conflict" &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'conflicting-a'
+Auto-merging conflicting
+CONFLICT (add/add): Merge conflict in conflicting
+Automatic merge failed; fix conflicts and then commit the result.
+[conflicting-a ff0069b] resolve conflict
+ Author: A U Thor <author@example.com>
+ok 9 - automatic merge fails; both hooks are available
+
+expecting success of 7503.10 '--no-verify with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "even more" >>file &&
+	git add file &&
+	git commit --no-verify -m "even more" &&
+	test_path_is_missing actual_hooks
+
+[conflicting-a 79fc96c] even more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - --no-verify with succeeding hook
+
+expecting success of 7503.11 '--no-verify with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 11 - --no-verify with succeeding hook (merge)
+
+expecting success of 7503.12 'with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	test_when_finished "rm -f expected_hooks" &&
+	echo "pre-commit-failing-hook" >expected_hooks &&
+
+	echo "another" >>file &&
+	git add file &&
+	test_must_fail git commit -m "another" &&
+	test_cmp expected_hooks actual_hooks
+
+ok 12 - with failing hook
+
+expecting success of 7503.13 '--no-verify with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	echo "stuff" >>file &&
+	git add file &&
+	git commit --no-verify -m "stuff" &&
+	test_path_is_missing actual_hooks
+
+[main 9073eff] stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 13 - --no-verify with failing hook
+
+expecting success of 7503.14 'with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
+	echo "pre-merge-commit-failing-hook" >expected_hooks &&
+	git checkout side &&
+	test_must_fail git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'side'
+Not committing merge; use 'git commit' to complete the merge.
+Switched to branch 'main'
+ok 14 - with failing hook (merge)
+
+expecting success of 7503.15 '--no-verify with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
+
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 15 - --no-verify with failing hook (merge)
+
+expecting success of 7503.16 'with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "content" >>file &&
+	git add file &&
+	git commit -m "content" &&
+	test_path_is_missing actual_hooks
+
+hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config set advice.ignoredHook false`.
+[main be1df3a] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 16 - with non-executable hook
+
+expecting success of 7503.17 '--no-verify with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "more content" >>file &&
+	git add file &&
+	git commit --no-verify -m "more content" &&
+	test_path_is_missing actual_hooks
+
+[main dd373ff] more content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 17 - --no-verify with non-executable hook
+
+expecting success of 7503.18 'with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 18 - with non-executable hook (merge)
+
+expecting success of 7503.19 '--no-verify with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 19 - --no-verify with non-executable hook (merge)
+
+expecting success of 7503.20 'with hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks success" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir success &&
+	(
+		cd success &&
+		git commit -m "hook requires GIT_PREFIX = success/"
+	) &&
+	test_cmp expected_hooks actual_hooks
+
+[main 91e0a75] hook requires GIT_PREFIX = success/
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 20 - with hook requiring GIT_PREFIX
+
+expecting success of 7503.21 'with failing hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks fail" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir fail &&
+	(
+		cd fail &&
+		test_must_fail git commit -m "hook must fail"
+	) &&
+	git checkout -- file &&
+	test_cmp expected_hooks actual_hooks
+
+ok 21 - with failing hook requiring GIT_PREFIX
+
+expecting success of 7503.22 'check the author in hook': 
+	setup_require_author_hook &&
+	cat >expected_hooks <<-EOF &&
+	check-author
+	check-author
+	check-author
+	EOF
+	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
+	(
+		GIT_AUTHOR_NAME="New Author" &&
+		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
+		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+		git commit --allow-empty -m "by new.author via env" &&
+		git show -s
+	) &&
+	git commit --author="New Author <newauthor@example.com>" \
+		--allow-empty -m "by new.author via command line" &&
+	git show -s &&
+	test_cmp expected_hooks actual_hooks
+
+[main 1b3a79e] by new.author via env
+ Author: New Author <newauthor@example.com>
+ 1 file changed, 1 insertion(+)
+commit 1b3a79eec1cf60fc72bbc0d27901d153c90e4abe
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    by new.author via env
+[main 155e737] by new.author via command line
+ Author: New Author <newauthor@example.com>
+commit 155e73716852370372b22eca0576dacb5016aa2e
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    by new.author via command line
+ok 22 - check the author in hook
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7407-submodule-foreach.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/.git/
+expecting success of 7407.1 'setup a submodule tree': 
+	git config --global protocol.file.allow always &&
+	echo file > file &&
+	git add file &&
+	test_tick &&
+	git commit -m upstream &&
+	git clone . super &&
+	git clone super submodule &&
+	(
+		cd super &&
+		git submodule add ../submodule sub1 &&
+		git submodule add ../submodule sub2 &&
+		git submodule add ../submodule sub3 &&
+		git config -f .gitmodules --rename-section \
+			submodule.sub1 submodule.foo1 &&
+		git config -f .gitmodules --rename-section \
+			submodule.sub2 submodule.foo2 &&
+		git config -f .gitmodules --rename-section \
+			submodule.sub3 submodule.foo3 &&
+		git add .gitmodules &&
+		test_tick &&
+		git commit -m "submodules" &&
+		git submodule init sub1 &&
+		git submodule init sub2 &&
+		git submodule init sub3
+	) &&
+	(
+		cd submodule &&
+		echo different > file &&
+		git add file &&
+		test_tick &&
+		git commit -m "different"
+	) &&
+	(
+		cd super &&
+		(
+			cd sub3 &&
+			git pull
+		) &&
+		git add sub3 &&
+		test_tick &&
+		git commit -m "update sub3"
+	)
+
+[main (root-commit) 0c90624] upstream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'super'...
+done.
+Cloning into 'submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/sub3'...
+done.
+[main 33b977a] submodules
+ Author: A U Thor <author@example.com>
+ 4 files changed, 12 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ create mode 160000 sub2
+ create mode 160000 sub3
+Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+[main 509f622] different
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule
+   0c90624..509f622  main       -> origin/main
+Updating 0c90624..509f622
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main ed2a820] update sub3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup a submodule tree
+
+expecting success of 7407.2 'test basic "submodule foreach" usage': 
+	git clone super clone &&
+	(
+		cd clone &&
+		git submodule update --init -- sub1 sub3 &&
+		git submodule foreach "echo \$toplevel-\$name-\$path-\$sha1" > ../actual &&
+		git config foo.bar zar &&
+		git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
+	) &&
+	test_cmp expect actual
+
+Cloning into 'clone'...
+done.
+Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone/sub3'...
+done.
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Entering 'sub1'
+zar
+Entering 'sub3'
+zar
+ok 2 - test basic "submodule foreach" usage
+
+expecting success of 7407.3 'test "submodule foreach" from subdirectory': 
+	mkdir clone/sub &&
+	(
+		cd clone/sub &&
+		git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
+	) &&
+	test_cmp expect actual
+
+ok 3 - test "submodule foreach" from subdirectory
+
+expecting success of 7407.4 'setup nested submodules': 
+	git clone submodule nested1 &&
+	git clone submodule nested2 &&
+	git clone submodule nested3 &&
+	(
+		cd nested3 &&
+		git submodule add ../submodule submodule &&
+		test_tick &&
+		git commit -m "submodule" &&
+		git submodule init submodule
+	) &&
+	(
+		cd nested2 &&
+		git submodule add ../nested3 nested3 &&
+		test_tick &&
+		git commit -m "nested3" &&
+		git submodule init nested3
+	) &&
+	(
+		cd nested1 &&
+		git submodule add ../nested2 nested2 &&
+		test_tick &&
+		git commit -m "nested2" &&
+		git submodule init nested2
+	) &&
+	(
+		cd super &&
+		git submodule add ../nested1 nested1 &&
+		test_tick &&
+		git commit -m "nested1" &&
+		git submodule init nested1
+	)
+
+Cloning into 'nested1'...
+done.
+Cloning into 'nested2'...
+done.
+Cloning into 'nested3'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3/submodule'...
+done.
+[main 5ec8351] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2/nested3'...
+done.
+[main 2e69c85] nested3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested3
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1/nested2'...
+done.
+[main b23f134] nested2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested2
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/super/nested1'...
+done.
+[main 427ccd0] nested1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 nested1
+ok 4 - setup nested submodules
+
+expecting success of 7407.5 'use "submodule foreach" to checkout 2nd level submodule': 
+	git clone super clone2 &&
+	(
+		cd clone2 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
+		git submodule update --init &&
+		git rev-parse --resolve-git-dir sub1/.git &&
+		git rev-parse --resolve-git-dir sub2/.git &&
+		git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git submodule foreach "git submodule update --init" &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/nested3/.git
+	)
+
+Cloning into 'clone2'...
+done.
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+fatal: not a gitdir 'nested1/.git'
+Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/sub3'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo2
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo3
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1
+fatal: not a gitdir 'nested1/nested2/.git'
+Entering 'nested1'
+Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2'...
+done.
+Submodule path 'nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Entering 'sub1'
+Entering 'sub2'
+Entering 'sub3'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2
+fatal: not a gitdir 'nested1/nested2/nested3/.git'
+ok 5 - use "submodule foreach" to checkout 2nd level submodule
+
+expecting success of 7407.6 'usage: foreach -- --not-an-option': 
+	test_expect_code 1 git submodule foreach -- --not-an-option &&
+	test_expect_code 1 git -C clone2 submodule foreach -- --not-an-option
+
+usage: git submodule [--quiet] [--cached]
+   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
+   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] init [--] [<path>...]
+   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
+   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
+   or: git submodule [--quiet] set-url [--] <path> <newurl>
+   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
+   or: git submodule [--quiet] foreach [--recursive] <command>
+   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
+usage: git submodule [--quiet] [--cached]
+   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
+   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] init [--] [<path>...]
+   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
+   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
+   or: git submodule [--quiet] set-url [--] <path> <newurl>
+   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
+   or: git submodule [--quiet] foreach [--recursive] <command>
+   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
+ok 6 - usage: foreach -- --not-an-option
+
+expecting success of 7407.7 'use "foreach --recursive" to checkout all submodules': 
+	(
+		cd clone2 &&
+		git submodule foreach --recursive "git submodule update --init" &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Entering 'nested1'
+Entering 'nested1/nested2'
+Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3'...
+done.
+Submodule path 'nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Entering 'nested1/nested2/nested3'
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Entering 'nested1/nested2/nested3/submodule'
+Entering 'sub1'
+Entering 'sub2'
+Entering 'sub3'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 7 - use "foreach --recursive" to checkout all submodules
+
+expecting success of 7407.8 'test messages from "foreach --recursive"': 
+	(
+		cd clone2 &&
+		git submodule foreach --recursive "true" > ../actual
+	) &&
+	test_cmp expect actual
+
+ok 8 - test messages from "foreach --recursive"
+
+expecting success of 7407.9 'test messages from "foreach --recursive" from subdirectory': 
+	(
+		cd clone2 &&
+		mkdir untracked &&
+		cd untracked &&
+		git submodule foreach --recursive >../../actual
+	) &&
+	test_cmp expect actual
+
+ok 9 - test messages from "foreach --recursive" from subdirectory
+
+expecting success of 7407.10 'test "submodule foreach --recursive" from subdirectory': 
+	(
+		cd clone2/untracked &&
+		git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
+	) &&
+	test_cmp expect actual
+
+ok 10 - test "submodule foreach --recursive" from subdirectory
+
+expecting success of 7407.11 'test "foreach --quiet --recursive"': 
+	(
+		cd clone2 &&
+		git submodule foreach -q --recursive "echo \$name-\$path" > ../actual
+	) &&
+	test_cmp expect actual
+
+ok 11 - test "foreach --quiet --recursive"
+
+expecting success of 7407.12 'use "update --recursive" to checkout all submodules': 
+	git clone super clone3 &&
+	(
+		cd clone3 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
+		git submodule update --init --recursive &&
+		git rev-parse --resolve-git-dir sub1/.git &&
+		git rev-parse --resolve-git-dir sub2/.git &&
+		git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Cloning into 'clone3'...
+done.
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+fatal: not a gitdir 'nested1/.git'
+Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/sub3'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo2
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo3
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 12 - use "update --recursive" to checkout all submodules
+
+expecting success of 7407.13 'test "status --recursive"': 
+	(
+		cd clone3 &&
+		git submodule status --recursive > ../actual
+	) &&
+	test_cmp expect actual
+
+ok 13 - test "status --recursive"
+
+expecting success of 7407.14 'ensure "status --cached --recursive" preserves the --cached flag': 
+	(
+		cd clone3 &&
+		(
+			cd nested1/nested2 &&
+			test_commit file2
+		) &&
+		git submodule status --cached --recursive -- nested1 > ../actual
+	) &&
+	test_cmp expect actual
+
+[detached HEAD 25d56d1] file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.t
+ok 14 - ensure "status --cached --recursive" preserves the --cached flag
+
+expecting success of 7407.15 'test "status --recursive" from sub directory': 
+	(
+		cd clone3 &&
+		mkdir tmp && cd tmp &&
+		git submodule status --recursive > ../../actual
+	) &&
+	test_cmp expect actual
+
+ok 15 - test "status --recursive" from sub directory
+
+expecting success of 7407.16 'use "git clone --recursive" to checkout all submodules': 
+	git clone --recursive super clone4 &&
+	(
+		cd clone4 &&
+		git rev-parse --resolve-git-dir .git &&
+		git rev-parse --resolve-git-dir sub1/.git &&
+		git rev-parse --resolve-git-dir sub2/.git &&
+		git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Cloning into 'clone4'...
+done.
+Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/sub3'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+.git
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo2
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo3
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 16 - use "git clone --recursive" to checkout all submodules
+
+expecting success of 7407.17 'test "update --recursive" with a flag with spaces': 
+	git clone super "common objects" &&
+	git clone super clone5 &&
+	(
+		cd clone5 &&
+		test_must_fail git rev-parse --resolve-git-dir d nested1/.git &&
+		git submodule update --init --recursive --reference="$(dirname "$PWD")/common objects" &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		test -f .git/modules/nested1/objects/info/alternates &&
+		test -f .git/modules/nested1/modules/nested2/objects/info/alternates &&
+		test -f .git/modules/nested1/modules/nested2/modules/nested3/objects/info/alternates
+	)
+
+Cloning into 'common objects'...
+done.
+Cloning into 'clone5'...
+done.
+fatal: not a gitdir 'd'
+Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/sub3'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2/modules/nested3
+ok 17 - test "update --recursive" with a flag with spaces
+
+expecting success of 7407.18 'use "update --recursive nested1" to checkout all submodules rooted in nested1': 
+	git clone super clone6 &&
+	(
+		cd clone6 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
+		git submodule update --init --recursive -- nested1 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Cloning into 'clone6'...
+done.
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+fatal: not a gitdir 'nested1/.git'
+Submodule 'nested1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 18 - use "update --recursive nested1" to checkout all submodules rooted in nested1
+
+expecting success of 7407.19 'command passed to foreach retains notion of stdin': 
+	(
+		cd super &&
+		git submodule foreach echo success >../expected &&
+		yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual
+	) &&
+	test_cmp expected actual
+
+ok 19 - command passed to foreach retains notion of stdin
+
+expecting success of 7407.20 'command passed to foreach --recursive retains notion of stdin': 
+	(
+		cd clone2 &&
+		git submodule foreach --recursive echo success >../expected &&
+		yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual
+	) &&
+	test_cmp expected actual
+
+ok 20 - command passed to foreach --recursive retains notion of stdin
+
+expecting success of 7407.21 'multi-argument command passed to foreach is not shell-evaluated twice': 
+	(
+		cd super &&
+		git submodule foreach "echo \\\"quoted\\\"" > ../expected &&
+		git submodule foreach echo \"quoted\" > ../actual
+	) &&
+	test_cmp expected actual
+
+ok 21 - multi-argument command passed to foreach is not shell-evaluated twice
+
+expecting success of 7407.22 'option-like arguments passed to foreach commands are not lost': 
+	(
+		cd super &&
+		git submodule foreach "echo be --quiet" > ../expected &&
+		git submodule foreach echo be --quiet > ../actual
+	) &&
+	grep -sq -e "--quiet" expected &&
+	test_cmp expected actual
+
+ok 22 - option-like arguments passed to foreach commands are not lost
+
+expecting success of 7407.23 'option-like arguments passed to foreach recurse correctly': 
+	git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
+	git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
+	grep -e "--an-option" expect &&
+	test_cmp expect actual
+
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+ok 23 - option-like arguments passed to foreach recurse correctly
 
-expecting success of 7501.2 'fail initial amend': 
-	test_must_fail git commit --amend
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7504-commit-msg-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7504-commit-msg-hook/.git/
+expecting success of 7504.1 'with no hook': 
 
-fatal: You have nothing to amend.
-ok 2 - fail initial amend
+	echo "foo" > file &&
+	git add file &&
+	git commit -m "first"
 
-expecting success of 7501.3 'setup: initial commit': 
-	git commit -m initial
 
-[main (root-commit) 402702b] initial
+[main (root-commit) d6ab80b] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-ok 3 - setup: initial commit
+ok 1 - with no hook
 
-expecting success of 7501.4 '-m and -F do not mix': 
-	git checkout HEAD file && echo >>file && git add file &&
-	test_must_fail git commit -m foo -m bar -F file
+expecting success of 7504.2 'with no hook (editor)': 
 
-Updated 0 paths from a0cb959
-fatal: options '-m' and '-F' cannot be used together
-ok 4 - -m and -F do not mix
+	echo "more foo" >> file &&
+	git add file &&
+	echo "more foo" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
 
-expecting success of 7501.5 '-m and -C do not mix': 
-	git checkout HEAD file && echo >>file && git add file &&
-	test_must_fail git commit -C HEAD -m illegal
 
-Updated 1 path from a0cb959
-fatal: options '-m' and '-C' cannot be used together
-ok 5 - -m and -C do not mix
+[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 7501.6 'paths and -a do not mix': 
-	echo King of the bongo >file &&
-	test_must_fail git commit -m foo -a file
+expecting success of 7504.3 '--no-verify with no hook': 
 
-fatal: paths 'file ...' with -a does not make sense
-ok 6 - paths and -a do not mix
+	echo "bar" > file &&
+	git add file &&
+	git commit --no-verify -m "bar"
 
-expecting success of 7501.7 'can use paths with --interactive': 
-	echo bong-o-bong >file &&
-	# 2: update, 1:st path, that is all, 7: quit
-	test_write_lines 2 1 "" 7 |
-	git commit -m foo --interactive file &&
-	git reset --hard HEAD^
 
-           staged     unstaged path
-  1:        +1/-0        +1/-2 file
+[main 854c7e2] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 3 - --no-verify with no hook
 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:        +1/-0        +1/-2 [f]ile
-Update>>            staged     unstaged path
-* 1:        +1/-0        +1/-2 [f]ile
-Update>> updated 1 path
+expecting success of 7504.4 '--no-verify with no hook (editor)': 
 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> Bye.
-[main 54cbdc6] foo
+	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(-)
-HEAD is now at 402702b initial
-ok 7 - can use paths with --interactive
-
-expecting success of 7501.8 'removed files and relative paths': 
-	test_when_finished "rm -rf foo" &&
-	git init foo &&
-	>foo/foo.txt &&
-	git -C foo add foo.txt &&
-	git -C foo commit -m first &&
-	git -C foo rm foo.txt &&
+ok 4 - --no-verify with no hook (editor)
 
-	mkdir -p foo/bar &&
-	git -C foo/bar commit -m second ../foo.txt
+expecting success of 7504.5 'setup: commit-msg hook that always succeeds': 
+	test_hook --setup commit-msg <<-\EOF
+	exit 0
+	EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7501-commit-basic-functionality/foo/.git/
-[main (root-commit) c087cbd] first
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo.txt
-rm 'foo.txt'
-[main 332404f] second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 foo.txt
-ok 8 - removed files and relative paths
+ok 5 - setup: commit-msg hook that always succeeds
 
-expecting success of 7501.9 'using invalid commit with -C': 
-	test_must_fail git commit --allow-empty -C bogus
+expecting success of 7504.6 'with succeeding hook': 
 
-fatal: could not lookup commit 'bogus'
-ok 9 - using invalid commit with -C
+	echo "more" >> file &&
+	git add file &&
+	git commit -m "more"
 
-expecting success of 7501.10 'nothing to commit': 
-	git reset --hard &&
-	test_must_fail git commit -m initial
 
-HEAD is now at 402702b initial
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
+[main 329307f] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 6 - with succeeding hook
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 10 - nothing to commit
+expecting success of 7504.7 'with succeeding hook (editor)': 
 
-expecting success of 7501.11 '--dry-run fails with nothing to commit': 
-	test_must_fail git commit -m initial --dry-run
+	echo "more more" >> file &&
+	git add file &&
+	echo "more more" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
 
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 11 - --dry-run fails with nothing to 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 7501.12 '--short fails with nothing to commit': 
-	test_must_fail git commit -m initial --short
+expecting success of 7504.8 '--no-verify with succeeding hook': 
 
-?? actual
-ok 12 - --short fails with nothing to commit
+	echo "even more" >> file &&
+	git add file &&
+	git commit --no-verify -m "even more"
 
-expecting success of 7501.13 '--porcelain fails with nothing to commit': 
-	test_must_fail git commit -m initial --porcelain
 
-?? actual
-ok 13 - --porcelain fails with nothing to commit
+[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 7501.14 '--long fails with nothing to commit': 
-	test_must_fail git commit -m initial --long
+expecting success of 7504.9 '--no-verify with succeeding hook (editor)': 
 
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
+	echo "even more more" >> file &&
+	git add file &&
+	echo "even more more" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 14 - --long fails with nothing to commit
 
-expecting success of 7501.15 'fail to commit untracked file (even with --include/--only)': 
-	echo content >baz &&
-	error="error: pathspec .baz. did not match any file(s) known to git" &&
+[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)
 
-	test_must_fail git commit -m "baz" baz 2>err &&
-	test_grep -e "$error" err &&
+expecting success of 7504.10 'setup: commit-msg hook that always fails': 
+	test_hook --clobber commit-msg <<-\EOF
+	exit 1
+	EOF
 
-	test_must_fail git commit --only -m "baz" baz 2>err &&
-	test_grep -e "$error" err &&
+ok 10 - setup: commit-msg hook that always fails
 
-	test_must_fail git commit --include -m "baz" baz 2>err &&
-	test_grep -e "$error" err
+expecting success of 7504.11 'with failing hook': 
 
-error: pathspec 'baz' did not match any file(s) known to git
-error: pathspec 'baz' did not match any file(s) known to git
-error: pathspec 'baz' did not match any file(s) known to git
-ok 15 - fail to commit untracked file (even with --include/--only)
+	echo "another" >> file &&
+	git add file &&
+	test_must_fail git commit -m "another"
 
-expecting success of 7501.16 'setup: non-initial commit': 
-	echo bongo bongo bongo >file &&
-	git commit -m next -a
 
-[main b49f306] next
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - setup: non-initial commit
+ok 11 - with failing hook
 
-expecting success of 7501.17 '--dry-run with stuff to commit returns ok': 
-	echo bongo bongo bongo >>file &&
-	git commit -m next -a --dry-run
+expecting success of 7504.12 'with failing hook (editor)': 
 
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   file
+	echo "more another" >> file &&
+	git add file &&
+	echo "more another" > FAKE_MSG &&
+	! (GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	baz
-	err
 
-ok 17 - --dry-run with stuff to commit returns ok
+ok 12 - with failing hook (editor)
 
-expecting success of 7501.18 '--short with stuff to commit returns ok': 
-	echo bongo bongo bongo >>file &&
-	git commit -m next -a --short
+expecting success of 7504.13 '--no-verify with failing hook': 
 
-M  file
-?? actual
-?? baz
-?? err
-ok 18 - --short with stuff to commit returns ok
+	echo "stuff" >> file &&
+	git add file &&
+	git commit --no-verify -m "stuff"
 
-expecting success of 7501.19 '--porcelain with stuff to commit returns ok': 
-	echo bongo bongo bongo >>file &&
-	git commit -m next -a --porcelain
 
-M  file
-?? actual
-?? baz
-?? err
-ok 19 - --porcelain with stuff to commit returns ok
+[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 7501.20 '--long with stuff to commit returns ok': 
-	echo bongo bongo bongo >>file &&
-	git commit -m next -a --long
+expecting success of 7504.14 '-n followed by --verify with failing hook': 
 
-On branch main
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   file
+	echo "even more" >> file &&
+	git add file &&
+	test_must_fail git commit -n --verify -m "even more"
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	baz
-	err
 
-ok 20 - --long with stuff to commit returns ok
+ok 14 - -n followed by --verify with failing hook
 
-expecting success of 7501.21 'exclude additional staged changes when given pathspec': 
-		echo content >>file &&
-		echo content >>baz &&
-		git add baz &&
-		git commit $opt -m "file" file &&
+expecting success of 7504.15 '--no-verify with failing hook (editor)': 
 
-		git diff --name-only >actual &&
-		test_must_be_empty actual &&
+	echo "more stuff" >> file &&
+	git add file &&
+	echo "more stuff" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
 
-		test_write_lines baz >expect &&
-		git diff --name-only --cached >actual &&
-		test_cmp expect actual &&
 
-		test_write_lines file >expect &&
-		git diff --name-only HEAD^ HEAD >actual &&
-		test_cmp expect actual
-	
-[main 0058760] file
+[main 254c35b] more stuff
  Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-ok 21 - exclude additional staged changes when given pathspec
+ 1 file changed, 2 insertions(+)
+ok 15 - --no-verify with failing hook (editor)
 
-expecting success of 7501.22 'exclude additional staged changes when given pathspec': 
-		echo content >>file &&
-		echo content >>baz &&
-		git add baz &&
-		git commit $opt -m "file" file &&
+expecting success of 7504.16 'merge fails with failing hook': 
 
-		git diff --name-only >actual &&
-		test_must_be_empty actual &&
+	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
 
-		test_write_lines baz >expect &&
-		git diff --name-only --cached >actual &&
-		test_cmp expect actual &&
 
-		test_write_lines file >expect &&
-		git diff --name-only HEAD^ HEAD >actual &&
-		test_cmp expect actual
-	
-[main 62fc6c3] file
+Switched to a new branch 'newbranch'
+[newbranch (root-commit) 73906b9] in-side-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 22 - exclude additional staged changes when given pathspec
-
-expecting success of 7501.23 'exclude additional staged changes when given pathspec': 
-		echo content >>file &&
-		echo content >>baz &&
-		git add baz &&
-		git commit $opt -m "file" file &&
+ 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
 
-		git diff --name-only >actual &&
-		test_must_be_empty actual &&
+expecting success of 7504.17 'merge bypasses failing hook with --no-verify': 
 
-		test_write_lines baz >expect &&
-		git diff --name-only --cached >actual &&
-		test_cmp expect actual &&
+	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"
 
-		test_write_lines file >expect &&
-		git diff --name-only HEAD^ HEAD >actual &&
-		test_cmp expect actual
-	
-[main 9671b57] file
+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, 1 insertion(+)
-ok 23 - exclude additional staged changes when given pathspec
+ 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 7501.24 '-i/--include includes staged changes': 
-	echo content >>file &&
-	echo content >>baz &&
-	git add file &&
+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"
 
-	# baz is in the index, therefore, it will be committed
-	git commit --include -m "file and baz" baz  &&
+ok 18 - setup: commit-msg hook made non-executable
 
-	git diff --name-only HEAD >remaining &&
-	test_must_be_empty remaining &&
+expecting success of 7504.19 'with non-executable hook': 
 
-	test_write_lines baz file >expect &&
-	git diff --name-only HEAD^ HEAD >actual &&
-	test_cmp expect actual
+	echo "content" >file &&
+	git add file &&
+	git commit -m "content"
 
-[main fee1730] file and baz
+
+hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config set advice.ignoredHook false`.
+[main 89fb8ae] content
  Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 baz
-ok 24 - -i/--include includes staged changes
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+ok 19 - with non-executable hook
 
-expecting success of 7501.25 '--include and --only do not mix': 
-	test_when_finished "git reset --hard" &&
-	echo content >>file &&
-	echo content >>baz &&
-	test_must_fail git commit --include --only -m "file baz" file baz 2>actual &&
-	test_grep -e "fatal: options .-i/--include. and .-o/--only. cannot be used together" actual
+expecting success of 7504.20 'with non-executable hook (editor)': 
 
-fatal: options '-i/--include' and '-o/--only' cannot be used together
-HEAD is now at fee1730 file and baz
-ok 25 - --include and --only do not mix
+	echo "content again" >> file &&
+	git add file &&
+	echo "content again" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -m "content again"
 
-expecting success of 7501.26 'commit message from non-existing file': 
-	echo more bongo: bongo bongo bongo bongo >file &&
-	test_must_fail git commit -F gah -a
 
-fatal: could not read log file 'gah': No such file or directory
-ok 26 - commit message from non-existing file
+hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config set advice.ignoredHook false`.
+[main 888e6c6] content again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 20 - with non-executable hook (editor)
 
-expecting success of 7501.27 'empty commit message': 
-	# Empty except stray tabs and spaces on a few lines.
-	sed -e "s/@//g" >msg <<-\EOF &&
-		@		@
-		@@
-		@  @
-		@Signed-off-by: hula@
-	EOF
-	test_must_fail git commit -F msg -a
+expecting success of 7504.21 '--no-verify with non-executable hook': 
 
-Aborting commit due to empty commit message.
-ok 27 - empty commit message
+	echo "more content" >> file &&
+	git add file &&
+	git commit --no-verify -m "more content"
 
-expecting success of 7501.28 'template "emptyness" check does not kick in with -F': 
-	git checkout HEAD file && echo >>file && git add file &&
-	git commit -t file -F file
 
-Updated 1 path from 87f11f5
-[main 00e5646] bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo bongo content content content content
+[main 7569859] more content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 28 - template "emptyness" check does not kick in with -F
+ok 21 - --no-verify with non-executable hook
 
-expecting success of 7501.29 'template "emptyness" check': 
-	git checkout HEAD file && echo >>file && git add file &&
-	test_must_fail git commit -t file 2>err &&
-	test_grep "did not edit" err
+expecting success of 7504.22 '--no-verify with non-executable hook (editor)': 
 
-Updated 0 paths from 3f95331
-Aborting commit; you did not edit the message.
-ok 29 - template "emptyness" check
+	echo "even more content" >> file &&
+	git add file &&
+	echo "even more content" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
 
-expecting success of 7501.30 'setup: commit message from file': 
-	git checkout HEAD file && echo >>file && git add file &&
-	echo this is the commit message, coming from a file >msg &&
-	git commit -F msg -a
 
-Updated 1 path from 3f95331
-[main 4ce73b9] this is the commit message, coming from a file
+[main 275f9c1] even more content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 30 - setup: commit message from file
+ok 22 - --no-verify with non-executable hook (editor)
 
-expecting success of 7501.31 'amend commit': 
-	cat >editor <<-\EOF &&
-	#!/bin/sh
-	sed -e "s/a file/an amend commit/g" <"$1" >"$1-"
-	mv "$1-" "$1"
+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
-	chmod 755 editor &&
-	EDITOR=./editor git commit --amend
 
-[main 7990fc4] this is the commit message, coming from an amend commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 31 - amend commit
+ok 23 - setup: commit-msg hook that edits the commit message
 
-expecting success of 7501.32 'amend --only ignores staged contents': 
-	cp file file.expect &&
-	echo changed >file &&
+expecting success of 7504.24 'hook edits commit message': 
+
+	echo "additional" >> file &&
 	git add file &&
-	git commit --no-edit --amend --only &&
-	git cat-file blob HEAD:file >file.actual &&
-	test_cmp file.expect file.actual &&
-	git diff --exit-code
+	git commit -m "additional" &&
+	commit_msg_is "new message"
 
-[main 7990fc4] this is the commit message, coming from an amend commit
+
+[main fe8ba48] new message
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
-ok 32 - amend --only ignores staged contents
+ok 24 - hook edits commit message
 
-expecting success of 7501.33 'allow-empty --only ignores staged contents': 
-	echo changed-again >file &&
+expecting success of 7504.25 'hook edits commit message (editor)': 
+
+	echo "additional content" >> file &&
 	git add file &&
-	git commit --allow-empty --only -m "empty" &&
-	git cat-file blob HEAD:file >file.actual &&
-	test_cmp file.expect file.actual &&
-	git diff --exit-code
+	echo "additional content" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
+	commit_msg_is "new message"
 
-[main 5d11af6] empty
- Author: A U Thor <author@example.com>
-ok 33 - allow-empty --only ignores staged contents
 
-expecting success of 7501.34 'set up editor': 
-	cat >editor <<-\EOF &&
-	#!/bin/sh
-	sed -e "s/unamended/amended/g" <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
-	chmod 755 editor
+[main 01f87e3] new message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 25 - hook edits commit message (editor)
 
-ok 34 - set up editor
+expecting success of 7504.26 'hook doesn't edit commit message': 
 
-expecting success of 7501.35 'amend without launching editor': 
-	echo unamended >expect &&
-	git commit --allow-empty -m "unamended" &&
-	echo needs more bongo >file &&
+	echo "plus" >> file &&
 	git add file &&
-	EDITOR=./editor git commit --no-edit --amend &&
-	git diff --exit-code HEAD -- file &&
-	git diff-tree -s --format=%s HEAD >msg &&
-	test_cmp expect msg
-
-[main 5b0b93b] unamended
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 11 deletions(-)
-[main 2b43b14] unamended
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 11 deletions(-)
-ok 35 - amend without launching editor
+	git commit --no-verify -m "plus" &&
+	commit_msg_is "plus"
 
-expecting success of 7501.36 '--amend --edit': 
-	echo amended >expect &&
-	git commit --allow-empty -m "unamended" &&
-	echo bongo again >file &&
-	git add file &&
-	EDITOR=./editor git commit --edit --amend &&
-	git diff-tree -s --format=%s HEAD >msg &&
-	test_cmp expect msg
 
-[main 0d559e0] unamended
- Author: A U Thor <author@example.com>
-[main 1f4126b] amended
+[main b89da1b] plus
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 36 - --amend --edit
-
-expecting success of 7501.37 '--amend --edit of empty message': 
-	cat >replace <<-\EOF &&
-	#!/bin/sh
-	echo "amended" >"$1"
-	EOF
-	chmod 755 replace &&
-	git commit --allow-empty --allow-empty-message -m "" &&
-	echo more bongo >file &&
-	git add file &&
-	EDITOR=./replace git commit --edit --amend &&
-	git diff-tree -s --format=%s HEAD >msg &&
-	./replace expect &&
-	test_cmp expect msg
+ 1 file changed, 1 insertion(+)
+ok 26 - hook doesn't edit commit message
 
-[main 52e8630] 
- Author: A U Thor <author@example.com>
-[main 5cf5ffd] amended
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 37 - --amend --edit of empty message
+expecting success of 7504.27 'hook doesn't edit commit message (editor)': 
 
-expecting success of 7501.38 '--amend to set message to empty': 
-	echo bata >file &&
+	echo "more plus" >> file &&
 	git add file &&
-	git commit -m "unamended" &&
-	git commit --amend --allow-empty-message -m "" &&
-	git diff-tree -s --format=%s HEAD >msg &&
-	echo "" >expect &&
-	test_cmp expect msg
+	echo "more plus" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
+	commit_msg_is "more plus"
 
-[main ee5d27e] unamended
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 4d5dffe] 
+[main f4fdd67] more plus
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 38 - --amend to set message to empty
+ 1 file changed, 1 insertion(+)
+ok 27 - hook doesn't edit commit message (editor)
 
-expecting success of 7501.39 '--amend to set empty message needs --allow-empty-message': 
-	echo conga >file &&
-	git add file &&
-	git commit -m "unamended" &&
-	test_must_fail git commit --amend -m "" &&
-	git diff-tree -s --format=%s HEAD >msg &&
-	echo "unamended" >expect &&
-	test_cmp expect msg
+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"
 
-[main ecd0b3f] unamended
+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, 1 insertion(+), 1 deletion(-)
-Aborting commit due to empty commit message.
-ok 39 - --amend to set empty message needs --allow-empty-message
+ 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
 
-expecting success of 7501.40 '-m --edit': 
-	echo amended >expect &&
-	git commit --allow-empty -m buffer &&
-	echo bongo bongo >file &&
-	git add file &&
-	EDITOR=./editor git commit -m unamended --edit &&
-	git diff-tree -s  --format=%s HEAD >msg &&
-	test_cmp expect msg
+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
 
-[main ac77246] buffer
+Already on 'main'
+[main 4c03054] add file2 to main
  Author: A U Thor <author@example.com>
-[main a64b909] amended
+ 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(+), 1 deletion(-)
-ok 40 - -m --edit
-
-expecting success of 7501.41 '-m and -F do not mix': 
-	echo enough with the bongos >file &&
-	test_must_fail git commit -F msg -m amending .
-
-fatal: options '-m' and '-F' cannot be used together
-ok 41 - -m and -F do not mix
+ 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 7501.42 'using message from other commit': 
-	git commit -C HEAD^ .
+expecting success of 7504.30 'hook is called for reword during `rebase -i`': 
 
-[main b679af0] buffer
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 42 - using message from other commit
+	GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ &&
+	commit_msg_is "new message"
 
-expecting success of 7501.43 'editing message from other commit': 
-	cat >editor <<-\EOF &&
-	#!/bin/sh
-	sed -e "s/amend/older/g"  <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
-	chmod 755 editor &&
-	echo hula hula >file &&
-	EDITOR=./editor git commit -c HEAD^ -a
 
-[main a9488ae] oldered
+Rebasing (1/1)
[detached HEAD 7d30ea0] new message
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 43 - editing message from other commit
+ 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`
 
-expecting success of 7501.44 'message from stdin': 
-	echo silly new contents >file &&
-	echo commit message from stdin |
-	git commit -F - -a
+# still have 1 known breakage(s)
+# passed all remaining 29 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7502-commit-porcelain.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7502-commit-porcelain/.git/
+expecting success of 7502.1 'output summary format': 
 
-[main c658950] commit message from stdin
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 44 - message from stdin
+	echo new >file1 &&
+	git add file1 &&
+	check_summary_oneline "root-commit" "initial" &&
 
-expecting success of 7501.45 'overriding author from command line': 
-	echo gak >file &&
-	git commit -m author \
-		--author "Rubber Duck <rduck@convoy.org>" -a >output 2>&1 &&
-	grep Rubber.Duck output
+	echo change >>file1 &&
+	git add file1
 
- Author: Rubber Duck <rduck@convoy.org>
-ok 45 - overriding author from command line
+ok 1 - output summary format
 
-expecting success of 7501.46 'interactive add': 
-	echo 7 | test_must_fail git commit --interactive >out &&
-	grep "What now" out
+expecting success of 7502.2 'output summary format: root-commit': 
+	check_summary_oneline "" "a change"
 
-What now> Bye.
-ok 46 - interactive add
+ok 2 - output summary format: root-commit
 
-expecting success of 7501.47 'commit --interactive doesn't change index if editor aborts': 
-	echo zoo >file &&
-	test_must_fail git diff --exit-code >diff1 &&
-	test_write_lines u "*" q |
-	(
-		EDITOR=: &&
-		export EDITOR &&
-		test_must_fail git commit --interactive
-	) &&
-	git diff >diff2 &&
-	compare_diff_patch diff1 diff2
+expecting success of 7502.3 'output summary format for commit with an empty diff': 
 
-           staged     unstaged path
-  1:    unchanged        +1/-1 file
+	check_summary_oneline "" "empty" "--allow-empty"
 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:    unchanged        +1/-1 [f]ile
-Update>> updated 1 path
+ok 3 - output summary format for commit with an empty diff
 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> Aborting commit due to empty commit message.
-Bye.
-ok 47 - commit --interactive doesn't change index if editor aborts
+expecting success of 7502.4 'output summary format for merges': 
 
-expecting success of 7501.48 'editor not invoked if -F is given': 
-	cat >editor <<-\EOF &&
-	#!/bin/sh
-	sed -e s/good/bad/g <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
-	chmod 755 editor &&
+	git checkout -b recursive-base &&
+	test_commit base file1 &&
 
-	echo A good commit message. >msg &&
-	echo moo >file &&
+	git checkout -b recursive-a recursive-base &&
+	test_commit commit-a file1 &&
 
-	EDITOR=./editor git commit -a -F msg &&
-	git show -s --pretty=format:%s >subject &&
-	grep -q good subject &&
+	git checkout -b recursive-b recursive-base &&
+	test_commit commit-b file1 &&
 
-	echo quack >file &&
-	echo Another good message. |
-	EDITOR=./editor git commit -a -F - &&
-	git show -s --pretty=format:%s >subject &&
-	grep -q good subject
+	# 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"
 
-[main 0b6afa6] A good commit message.
+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(-)
-[main f1d1700] Another good message.
+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(-)
-ok 48 - editor not invoked if -F is given
-
-expecting success of 7501.49 'partial commit that involves removal (1)': 
+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
 
-	git rm --cached file &&
-	mv file elif &&
-	git add elif &&
-	git commit -m "Partial: add elif" elif &&
-	git diff-tree --name-status HEAD^ HEAD >current &&
-	echo "A	elif" >expected &&
-	test_cmp expected current
+expecting success of 7502.5 'the basics': 
 
+	output_tests_cleanup &&
 
-rm 'file'
-[main a544592] Partial: add elif
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 elif
-ok 49 - partial commit that involves removal (1)
+	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" &&
 
-expecting success of 7501.50 'partial commit that involves removal (2)': 
+	git cat-file blob HEAD:"commit is" >current.1 &&
+	git cat-file blob HEAD:not/forbid >current.2 &&
 
-	git commit -m "Partial: remove file" file &&
-	git diff-tree --name-status HEAD^ HEAD >current &&
-	echo "D	file" >expected &&
-	test_cmp expected current
+	cmp current.1 "commit is" &&
+	cmp current.2 not/forbid
 
 
-[main 90f7b41] Partial: remove file
+Switched to branch 'main'
+rm 'file1'
+[main 34ca441] cleanup
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-ok 50 - partial commit that involves removal (2)
-
-expecting success of 7501.51 'partial commit that involves removal (3)': 
-
-	git rm --cached elif &&
-	echo elif >elif &&
-	git commit -m "Partial: modify elif" elif &&
-	git diff-tree --name-status HEAD^ HEAD >current &&
-	echo "M	elif" >expected &&
-	test_cmp expected current
-
-
-rm 'elif'
-[main 27fe9d1] Partial: modify elif
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 file1
+[main 8a2203d] initial with -a
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 51 - partial commit that involves removal (3)
+ 2 files changed, 2 insertions(+)
+ create mode 100644 commit is
+ create mode 100644 not/forbid
+ok 5 - the basics
 
-expecting success of 7501.52 'amend commit to fix author': 
+expecting success of 7502.6 'partial': 
 
-	oldtick=$GIT_AUTHOR_DATE &&
+	echo another >"commit is" &&
+	echo another >not/forbid &&
 	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 27fe9d1 Partial: modify elif
-[main 3d703d4] Partial: modify elif
- Author: The Real Author <someguy@his.email.org>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 52 - amend commit to fix author
-
-expecting success of 7501.53 'amend commit to fix date': 
+	git commit -m "partial commit to handle a file" "commit is" &&
 
-	test_tick &&
-	newtick=$GIT_AUTHOR_DATE &&
-	git reset --hard &&
-	git cat-file -p HEAD >commit &&
-	sed -e "s/author.*/author $author $newtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
-		commit >expected &&
-	git commit --amend --date="$newtick" &&
-	git cat-file -p HEAD >current &&
-	test_cmp expected current
+	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
+	test "$changed" = "commit is"
 
 
-HEAD is now at 3d703d4 Partial: modify elif
-[main 5fe0f07] Partial: modify elif
- Author: The Real Author <someguy@his.email.org>
- Date: Thu Apr 7 15:15:13 2005 -0700
+[main 3302250] partial commit to handle a file
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 53 - amend commit to fix date
-
-expecting success of 7501.54 'amend commit to add signoff': 
-
-	test_commit "msg" file content &&
-	git commit --amend --signoff &&
-	test_commit_message HEAD <<-EOF
-	msg
-
-	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
+ok 6 - partial
 
-[main b95965d] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main fd588e7] msg
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 54 - amend commit to add signoff
+expecting success of 7502.7 'partial modification in a subdirectory': 
 
-expecting success of 7501.55 'amend does not add signoff if it already exists': 
+	test_tick &&
+	git commit -m "partial commit to subdirectory" not &&
 
-	test_commit --signoff "tenor" file newcontent &&
-	git commit --amend --signoff &&
-	test_commit_message HEAD <<-EOF
-	tenor
+	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
+	test "$changed" = "not/forbid"
 
-	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
 
-[main e32b577] tenor
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main e32b577] tenor
+[main 742b3a6] partial commit to subdirectory
  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 - amend does not add signoff if it already exists
-
-expecting success of 7501.56 'commit mentions forced date in output': 
-	git commit --amend --date=2010-01-02T03:04:05 >output &&
-	grep "Date: *Sat Jan 2 03:04:05 2010" output
+ok 7 - partial modification in a subdirectory
 
- Date: Sat Jan 2 03:04:05 2010 +0000
-ok 56 - commit mentions forced date in output
+expecting success of 7502.8 'partial removal': 
 
-expecting success of 7501.57 'commit complains about completely bogus dates': 
-	test_must_fail git commit --amend --date=seventeen
+	git rm not/forbid &&
+	git commit -m "partial commit to remove not/forbid" not &&
 
-fatal: invalid date format: seventeen
-ok 57 - commit complains about completely bogus dates
+	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"
 
-expecting success of 7501.58 'commit --date allows approxidate': 
-	git commit --amend \
-		--date="midnight the 12th of october, anno domini 1979" &&
-	echo "Fri Oct 12 00:00:00 1979 +0000" >expect &&
-	git log -1 --format=%ad >actual &&
-	test_cmp expect actual
 
-[main 3af6070] tenor
+rm 'not/forbid'
+[main 09fd303] partial commit to remove not/forbid
  Author: A U Thor <author@example.com>
- Date: Fri Oct 12 00:00:00 1979 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 58 - commit --date allows approxidate
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 not/forbid
+ok 8 - partial removal
 
-expecting success of 7501.59 'sign off (1)': 
+expecting success of 7502.9 'sign off': 
 
-	echo 1 >positive &&
+	>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 &&
+	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 bc9880b] thank you
+[main cc1232b] thank you
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 positive
-ok 59 - sign off (1)
-
-expecting success of 7501.60 'sign off (2)': 
+ok 9 - sign off
 
-	echo 2 >positive &&
-	git add positive &&
-	existing="Signed-off-by: Watch This <watchthis@example.com>" &&
-	git commit -s -m "thank you
+expecting success of 7502.10 'commit --trailer with "="': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-$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 &&
+	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 606eba8] thank you
+[main c563787] hello
  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': 
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 10 - commit --trailer with "="
 
-	echo 3 >positive &&
-	git add positive &&
-	alt="Alt-RFC-822-Header: Value" &&
-	git commit -s -m "welcome
+expecting success of 7502.11 'commit --trailer with -c and "replace" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-$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 &&
+	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 bfa2f49] welcome
+[main 9c665b9] hello
  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': 
+ 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
 
-	echo 4 >positive &&
-	git add positive &&
-	alt="fixed: 34" &&
-	git commit -s -m "welcome
+expecting success of 7502.12 'commit --trailer with -c and "add" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-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 &&
+	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 05c38a1] welcome
+[main c0ed76d] hello
  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 &&
+ 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
 
-	echo 6 >positive &&
-	git add positive &&
-	git -c "trailer.Myfooter.ifexists=add" commit -s -m "subject
+expecting success of 7502.13 'commit --trailer with -c and "donothing" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-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 &&
+	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 9a8e5e8] subject
+[main 2dad5db] hello
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 953c0bc] subject
+ 1 file changed, 1 insertion(+)
+[main 86cc013] hello
  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
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 13 - commit --trailer with -c and "donothing" as ifexists
 
-		body
-		---
-		these dashes confuse the parser!
+expecting success of 7502.14 'commit --trailer with -c and "addIfDifferent" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	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
-	# should be a noop, since we already signed
-	git commit --allow-empty --signoff -F expected &&
-	git log -1 --pretty=format:%B >actual &&
+	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 b62c51f] subject
+[main bacbe07] hello
  Author: A U Thor <author@example.com>
-ok 64 - signoff not confused by ---
+ 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 7501.65 'multiple -m': 
+expecting success of 7502.15 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	>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 &&
+	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 467af9a] one
+[main 5b19760] hello
  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
+ 1 file changed, 1 insertion(+)
+[main ea6f7b2] hello
  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': 
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 15 - commit --trailer with -c and "addIfDifferentNeighbor" as ifexists
 
-	git commit --allow-empty -m "forced empty" &&
-	git cat-file commit HEAD >commit &&
-	grep forced commit
+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 0d75235] forced empty
+[main 6edd712] hello
  Author: A U Thor <author@example.com>
-forced empty
-ok 69 - same tree (single parent) --allow-empty
+ 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 7501.70 'same tree (merge and amend merge)': 
+expecting success of 7502.17 'commit --trailer with -c and "start" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	git checkout -b side HEAD^ &&
-	echo zero >zero &&
-	git add zero &&
-	git commit -m "add zero" &&
-	git checkout main &&
+	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
 
-	git merge -s ours side -m "empty ok" &&
-	git diff HEAD^ HEAD >actual &&
-	test_must_be_empty 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
 
-	git commit --amend -m "empty really ok" &&
-	git diff HEAD^ HEAD >actual &&
-	test_must_be_empty actual
+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
 
-Switched to a new branch 'side'
-[side d8cd779] add zero
+[main 3a4a38a] hello
  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
+[main 30c3647] hello
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
-ok 70 - same tree (merge and amend merge)
+ 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 7501.71 'amend using the message from another commit': 
+expecting success of 7502.19 'commit --trailer with -c and "before" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	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 &&
+	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
 
-
-HEAD is now at 44c65f1 empty really ok
-[main 7a687e6] old commit
- Author: A U Thor <author@example.com>
-[main e73fb50] new commit
+[main e5407b4] hello
  Author: A U Thor <author@example.com>
-[main e29d4f8] old commit
+ 1 file changed, 1 insertion(+)
+[main 2e57a8f] hello
  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
+ 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 7501.72 'amend using the message from a commit named with tag': 
+expecting success of 7502.20 'commit --trailer with -c and "donothing" as ifmissing': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	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 &&
+	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
 
-
-HEAD is now at e29d4f8 old commit
-[main a5814b1] old commit
- Author: A U Thor <author@example.com>
-[main 18cb5ca] new commit
+[main 4b3be69] hello
  Author: A U Thor <author@example.com>
-[main 8a9a45e] old commit
+ 1 file changed, 1 insertion(+)
+[main e71943e] hello
  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': 
+ 1 file changed, 1 insertion(+)
+ok 20 - commit --trailer with -c and "donothing" as ifmissing
 
-	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"
+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 2767bb7] foo
+[main 8576769] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main 96004d0] new foo
+[main 3741b21] hello
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
+ Date: Thu Apr 7 15:22:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 73 - amend can copy notes
+ok 21 - commit --trailer with -c and "add" as ifmissing
 
-expecting success of 7501.74 'commit a file whose name is a dash': 
-	git reset --hard &&
-	test_write_lines 1 2 3 4 5 >./- &&
-	git add ./- &&
-	test_tick &&
-	git commit -m "add dash" >output </dev/null &&
-	test_grep " changed, 5 insertions" output
+expecting success of 7502.22 'commit --trailer with -c ack.key ': 
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		hello
 
-HEAD is now at 96004d0 new foo
- 1 file changed, 5 insertions(+)
-ok 74 - commit a file whose name is a dash
+		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
 
-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 &&
+[main 5789976] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 22 - commit --trailer with -c ack.key 
+
+expecting success of 7502.23 'commit --trailer with -c and ":=#" as separators': 
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		I hate bug
+
+		Bug #42
+	EOF
+	git -c trailer.separators=":=#" \
+		-c trailer.bug.key="Bug #" \
+		commit --trailer "bug = 42" -m "I hate bug" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
 	test_cmp expected actual
 
-Switched to a new branch 'orphan'
-[orphan (root-commit) 9d2da19] --only on unborn branch
+[main 6e78fd4] I hate bug
  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
+ok 23 - commit --trailer with -c and ":=#" as separators
 
-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."
+expecting success of 7502.24 'commit --trailer with -c and command': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-[orphan adcd2ff] Initial commit
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Mentored-by: C4 E4
+	Reported-by: A U Thor <author@example.com>
+	EOF
+	git -c trailer.report.key="Reported-by: " \
+		-c trailer.report.ifexists="replace" \
+		-c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \
+		git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \
+		commit --trailer "report = author" --amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 6b1e5e9] hello
  Author: A U Thor <author@example.com>
- 8 files changed, 15 insertions(+)
- create mode 100644 -
- create mode 100644 baz
- create mode 100644 elif
- create mode 100644 file
- create mode 100644 foo.t
- create mode 100644 negative
- create mode 100644 positive
- create mode 100644 test-file
-[orphan d0112e6] commit 1
+ 1 file changed, 1 insertion(+)
+[main 336e96f] hello
  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
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 24 - commit --trailer with -c and command
+
+expecting success of 7502.25 'commit --trailer not confused by --- separator': 
+	cat >msg <<-\EOF &&
+	subject
+
+	body with dashes
+	---
+	in it
+	EOF
+	git commit --allow-empty --trailer="my-trailer: value" -F msg &&
+	{
+		cat msg &&
+		echo &&
+		echo "my-trailer: value"
+	} >expected &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 244a002] subject
  Author: A U Thor <author@example.com>
- 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)
+ok 25 - commit --trailer not confused by --- separator
 
-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
+expecting success of 7502.26 'commit --trailer with --verbose': 
+	cat >msg <<-\EOF &&
 	subject
 
-[branch-2 ff9dcf0] conflicts fixed from merge.
+	body
+	EOF
+	GIT_EDITOR=: git commit --edit -F msg --allow-empty \
+		--trailer="my-trailer: value" --verbose &&
+	{
+		cat msg &&
+		echo &&
+		echo "my-trailer: value"
+	} >expected &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 64da097] subject
  Author: A U Thor <author@example.com>
-ok 76 - --dry-run with conflicts fixed from a merge
+ok 26 - commit --trailer with --verbose
 
-expecting success of 7501.77 '--dry-run --short': 
-	>test-file &&
-	git add test-file &&
-	git commit --dry-run --short
+expecting success of 7502.27 'multiple -m': 
 
-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
+	>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"
 
-# passed all 77 test(s)
-1..77
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7500-commit-template-squash-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/.git/
-expecting success of 7500.1 'a basic commit in an empty tree should succeed': 
-	echo content > foo &&
-	git add foo &&
-	git commit -m "initial commit"
 
-[master (root-commit) 02efb91] initial commit
+[main a7c1b01] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-ok 1 - a basic commit in an empty tree should succeed
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 negative
+ok 27 - multiple -m
 
-expecting success of 7500.2 'nonexistent template file should return error': 
-	echo changes >> foo &&
-	git add foo &&
-	(
-		GIT_EDITOR="echo hello >\"\$1\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit --template "$PWD"/notexist
-	)
+expecting success of 7502.28 'verbose': 
 
-fatal: could not read '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
-ok 2 - nonexistent template file should return error
+	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
 
-expecting success of 7500.3 'nonexistent template file in config should return error': 
-	test_config commit.template "$PWD"/notexist &&
-	(
-		GIT_EDITOR="echo hello >\"\$1\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit
-	)
 
-fatal: could not read '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
-ok 3 - nonexistent template file in config should return error
+ok 28 - verbose
 
-expecting success of 7500.4 'unedited template should not commit': 
-	echo "template line" > "$TEMPLATE" &&
-	test_must_fail git commit --template "$TEMPLATE"
+expecting success of 7502.29 'verbose respects diff config': 
 
-Aborting commit; you did not edit the message.
-ok 4 - unedited template should not commit
+	test_config diff.noprefix true &&
+	git status -v >actual &&
+	grep "diff --git negative negative" actual
 
-expecting success of 7500.5 'unedited template with comments should not commit': 
-	echo "# comment in template" >> "$TEMPLATE" &&
-	test_must_fail git commit --template "$TEMPLATE"
+diff --git negative negative
+ok 29 - verbose respects diff config
 
-Aborting commit; you did not edit the message.
-ok 5 - unedited template with comments should not commit
+expecting success of 7502.30 'prepare file with comment line and trailing newlines': 
+	printf "%s" "$mesg_with_comment_and_newlines" >expect
 
-expecting success of 7500.6 'a Signed-off-by line by itself should not commit': 
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-signed-off &&
-		test_must_fail git commit --template "$TEMPLATE"
-	)
+ok 30 - prepare file with comment line and trailing newlines
 
-Aborting commit; you did not edit the message.
-ok 6 - a Signed-off-by line by itself should not commit
+expecting success of 7502.31 'cleanup commit messages (verbatim option,-t)': 
 
-expecting success of 7500.7 'adding comments to a template should not commit': 
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-comments &&
-		test_must_fail git commit --template "$TEMPLATE"
-	)
+	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
 
-Aborting commit; you did not edit the message.
-ok 7 - adding comments to a template should not commit
 
-expecting success of 7500.8 'adding real content to a template should commit': 
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit --template "$TEMPLATE"
-	) &&
-	commit_msg_is "template linecommit message"
+[main 8914337] # text
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 31 - cleanup commit messages (verbatim option,-t)
 
-[master 0439be9] template line
+expecting success of 7502.32 'cleanup commit messages (verbatim option,-F)': 
+
+	echo >>negative &&
+	git commit --cleanup=verbatim -F expect -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 50317d6] # text
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 8 - adding real content to a template should commit
+ok 32 - cleanup commit messages (verbatim option,-F)
 
-expecting success of 7500.9 '-t option should be short for --template': 
-	echo "short template" > "$TEMPLATE" &&
-	echo "new content" >> foo &&
-	git add foo &&
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit -t "$TEMPLATE"
-	) &&
-	commit_msg_is "short templatecommit message"
+expecting success of 7502.33 'cleanup commit messages (verbatim option,-m)': 
 
-[master e42593e] short template
+	echo >>negative &&
+	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 3ead1ca] # text
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 9 - -t option should be short for --template
+ok 33 - cleanup commit messages (verbatim option,-m)
 
-expecting success of 7500.10 'config-specified template should commit': 
-	echo "new template" > "$TEMPLATE" &&
-	test_config commit.template "$TEMPLATE" &&
-	echo "more content" >> foo &&
-	git add foo &&
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit
-	) &&
-	commit_msg_is "new templatecommit message"
+expecting success of 7502.34 'cleanup commit messages (whitespace option,-F)': 
 
-[master 811561e] new template
+	echo >>negative &&
+	test_write_lines "" "# text" "" >text &&
+	echo "# text" >expect &&
+	git commit --cleanup=whitespace -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 77206d3] # text
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 10 - config-specified template should commit
+ok 34 - cleanup commit messages (whitespace option,-F)
 
-expecting success of 7500.11 'explicit commit message should override template': 
-	echo "still more content" >> foo &&
-	git add foo &&
-	GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-content git commit --template "$TEMPLATE" \
-		-m "command line msg" &&
-	commit_msg_is "command line msg"
+expecting success of 7502.35 'cleanup commit messages (scissors option,-F,-e)': 
 
-[master d8cbf96] command line msg
+	echo >>negative &&
+	cat >text <<-\EOF &&
+
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	# ------------------------ >8 ------------------------
+	to be removed
+	# ------------------------ >8 ------------------------
+	to be removed, too
+	EOF
+
+	cat >expect <<-\EOF &&
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	EOF
+	git commit --cleanup=scissors -e -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+[main e047c4e] # to be kept
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 11 - explicit commit message should override template
+ok 35 - cleanup commit messages (scissors option,-F,-e)
 
-expecting success of 7500.12 'commit message from file should override template': 
-	echo "content galore" >> foo &&
-	git add foo &&
-	echo "standard input msg" |
-	(
-		test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-		git commit --template "$TEMPLATE" --file -
-	) &&
-	commit_msg_is "standard input msg"
+expecting success of 7502.36 'cleanup commit messages (scissors option,-F,-e, scissors on first line)': 
 
-[master 65e5eb1] standard input msg
+	echo >>negative &&
+	cat >text <<-\EOF &&
+	# ------------------------ >8 ------------------------
+	to be removed
+	EOF
+	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_must_be_empty actual
+
+[main 5e5571b] 
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 12 - commit message from file should override template
+ok 36 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
 
-expecting success of 7500.13 'commit message from template with whitespace issue': 
-	echo "content galore" >>foo &&
-	git add foo &&
-	GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
-	git commit --template "$TEMPLATE" &&
-	commit_msg_is "commit message"
+expecting success of 7502.37 'cleanup commit messages (strip option,-F)': 
 
-[master 5e66887] commit message
+	echo >>negative &&
+	test_write_lines "" "# text" "sample" "" >text &&
+	echo sample >expect &&
+	git commit --cleanup=strip -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 5968d26] sample
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 13 - commit message from template with whitespace issue
-
-expecting success of 7500.14 'using alternate GIT_INDEX_FILE (1)': 
+ok 37 - cleanup commit messages (strip option,-F)
 
-	cp .git/index saved-index &&
-	(
-		echo some new content >file &&
-	        GIT_INDEX_FILE=.git/another_index &&
-		export GIT_INDEX_FILE &&
-		git add file &&
-		git commit -m "commit using another index" &&
-		git diff-index --exit-code HEAD &&
-		git diff-files --exit-code
-	) &&
-	cmp .git/index saved-index >/dev/null
+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
 
-[master 7c961fb] commit using another index
+[main 6ab3315] sample
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 7 deletions(-)
- create mode 100644 file
- delete mode 100644 foo
-ok 14 - using alternate GIT_INDEX_FILE (1)
+ 1 file changed, 1 insertion(+)
+ok 38 - cleanup commit messages (strip option,-F,-e)
 
-expecting success of 7500.15 'using alternate GIT_INDEX_FILE (2)': 
+expecting success of 7502.39 'cleanup commit messages (strip option,-F,-e): output': 
+	test_cmp expect actual
 
-	cp .git/index saved-index &&
-	(
-		rm -f .git/no-such-index &&
-		GIT_INDEX_FILE=.git/no-such-index &&
-		export GIT_INDEX_FILE &&
-		git commit -m "commit using nonexistent index" &&
-		test -z "$(git ls-files)" &&
-		test -z "$(git ls-tree HEAD)"
+ok 39 - cleanup commit messages (strip option,-F,-e): output
 
-	) &&
-	cmp .git/index saved-index >/dev/null
+expecting success of 7502.40 'cleanup commit message (fail on invalid cleanup mode option)': 
+	test_must_fail git commit --cleanup=non-existent
 
-[master 4e95e06] commit using nonexistent index
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-ok 15 - using alternate GIT_INDEX_FILE (2)
+fatal: Invalid cleanup mode non-existent
+ok 40 - cleanup commit message (fail on invalid cleanup mode option)
 
-expecting success of 7500.16 '--signoff': 
-	echo "yet another content *narf*" >> foo &&
-	echo "zort" | git commit -s -F - foo &&
-	git cat-file commit HEAD | sed "1,/^\$/d" > output &&
-	test_cmp expect output
+expecting success of 7502.41 'cleanup commit message (fail on invalid cleanup mode configuration)': 
+	test_must_fail git -c commit.cleanup=non-existent commit
 
-[master 5b1a0f3] zort
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 foo
-ok 16 - --signoff
+fatal: Invalid cleanup mode non-existent
+ok 41 - cleanup commit message (fail on invalid cleanup mode configuration)
 
-expecting success of 7500.17 'commit message from file (1)': 
-	mkdir subdir &&
-	echo "Log in top directory" >log &&
-	echo "Log in sub directory" >subdir/log &&
+expecting success of 7502.42 'cleanup commit message (no config and no option uses default)': 
+	echo content >>file &&
+	git add file &&
 	(
-		cd subdir &&
-		git commit --allow-empty -F log
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --no-status
 	) &&
-	commit_msg_is "Log in sub directory"
+	commit_msg_is "commit message"
 
-[master 101c1bd] Log in sub directory
+[main 06a0f0b] commit message
  Author: A U Thor <author@example.com>
-ok 17 - commit message from file (1)
+ 1 file changed, 1 insertion(+)
+ok 42 - cleanup commit message (no config and no option uses default)
 
-expecting success of 7500.18 'commit message from file (2)': 
-	rm -f log &&
-	echo "Log in sub directory" >subdir/log &&
+expecting success of 7502.43 'cleanup commit message (option overrides default)': 
+	echo content >>file &&
+	git add file &&
 	(
-		cd subdir &&
-		git commit --allow-empty -F log
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --cleanup=whitespace --no-status
 	) &&
-	commit_msg_is "Log in sub directory"
+	commit_msg_is "commit message # comment"
 
-[master 83046dc] Log in sub directory
+[main 8348171] commit message # comment
  Author: A U Thor <author@example.com>
-ok 18 - commit message from file (2)
+ 1 file changed, 1 insertion(+)
+ok 43 - cleanup commit message (option overrides default)
 
-expecting success of 7500.19 'commit message from stdin': 
+expecting success of 7502.44 'cleanup commit message (config overrides default)': 
+	echo content >>file &&
+	git add file &&
 	(
-		cd subdir &&
-		echo "Log with foo word" | git commit --allow-empty -F -
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --no-status
 	) &&
-	commit_msg_is "Log with foo word"
+	commit_msg_is "commit message # comment"
 
-[master 2f170f9] Log with foo word
+[main c4a33b1] commit message # comment
  Author: A U Thor <author@example.com>
-ok 19 - commit message from stdin
+ 1 file changed, 1 insertion(+)
+ok 44 - cleanup commit message (config overrides default)
 
-expecting success of 7500.20 'commit -F overrides -t': 
+expecting success of 7502.45 'cleanup commit message (option overrides config)': 
+	echo content >>file &&
+	git add file &&
 	(
-		cd subdir &&
-		echo "-F log" > f.log &&
-		echo "-t template" > t.template &&
-		git commit --allow-empty -F f.log -t t.template
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --cleanup=default
 	) &&
-	commit_msg_is "-F log"
-
-[master df55417] -F log
- Author: A U Thor <author@example.com>
-ok 20 - commit -F overrides -t
-
-expecting success of 7500.21 'Commit without message is allowed with --allow-empty-message': 
-	echo "more content" >>foo &&
-	git add foo &&
-	>empty &&
-	git commit --allow-empty-message <empty &&
-	commit_msg_is "" &&
-	git tag empty-message-commit
+	commit_msg_is "commit message"
 
-[master 5cf7fec] 
+[main 7b9798a] commit message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 21 - Commit without message is allowed with --allow-empty-message
-
-expecting success of 7500.22 'Commit without message is no-no without --allow-empty-message': 
-	echo "more content" >>foo &&
-	git add foo &&
-	>empty &&
-	test_must_fail git commit <empty
-
-Aborting commit due to empty commit message.
-ok 22 - Commit without message is no-no without --allow-empty-message
-
-expecting success of 7500.23 'Commit a message with --allow-empty-message': 
-	echo "even more content" >>foo &&
-	git add foo &&
-	git commit --allow-empty-message -m"hello there" &&
-	commit_msg_is "hello there"
-
-[master 1a05b50] hello there
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 23 - Commit a message with --allow-empty-message
+ok 45 - cleanup commit message (option overrides config)
 
-expecting success of 7500.24 'commit -C empty respects --allow-empty-message': 
-	echo more >>foo &&
-	git add foo &&
-	test_must_fail git commit -C empty-message-commit &&
-	git commit -C empty-message-commit --allow-empty-message &&
-	commit_msg_is ""
+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"
 
-Aborting commit due to empty commit message.
-[master 7c3a153] 
+[main f675c53] message #comment
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
-ok 24 - commit -C empty respects --allow-empty-message
+ok 46 - cleanup commit message (default, -m)
 
-expecting success of 7500.25 'commit --fixup provides correct one-line commit message': 
-	commit_for_rebase_autosquash_setup &&
-	EDITOR="echo ignored >>" git commit --fixup HEAD~1 &&
-	commit_msg_is "fixup! target message subject line"
+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 9b5b399] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 5b2adcc] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 77c550c] fixup! target message subject line
+[main 8e56e6c] message #comment
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 25 - commit --fixup provides correct one-line commit message
-
-expecting success of 7500.26 'commit --fixup -m"something" -m"extra"': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --fixup HEAD~1 -m"something" -m"extra" &&
-	commit_msg_is "fixup! target message subject linesomething
+ok 47 - cleanup commit message (whitespace option, -m)
 
-extra"
+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"
 
-[master d870198] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4134eb8] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d256be7] fixup! target message subject line
+[main 7207f92] message #comment
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 26 - commit --fixup -m"something" -m"extra"
+ok 48 - cleanup commit message (whitespace config, -m)
 
-expecting success of 7500.27 'commit --fixup --edit': 
-	commit_for_rebase_autosquash_setup &&
-	EDITOR="printf \"something\nextra\" >>" git commit --fixup HEAD~1 --edit &&
-	commit_msg_is "fixup! target message subject linesomething
-extra"
+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 68474d9] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d9cd24a] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b813bdf] fixup! target message subject line
+[main 96a295c] sample
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 27 - commit --fixup --edit
+# Author:    A U Thor <author@example.com>
+ok 49 - message shows author when it is not equal to committer
 
-expecting success of 7500.28 'commit --fixup=amend: creates amend! commit': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
+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
 
-	$(get_commit_msg HEAD~)
+[main 1d86a4b] foo
+ Author: A U Thor <author@example.com>
+ Date: Sat Jan 2 03:04:05 2010 +0000
+# Date:      Sat Jan 2 03:04:05 2010 +0000
+ok 50 - message shows date when it is explicitly set
 
-	edited
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=amend:HEAD~
-	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual
+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 25d4b87] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 49d2e45] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 6a95a22] amend! target message subject line
+[main 215259a] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 28 - commit --fixup=amend: creates amend! commit
+ok 51 - message does not have multiple scissors lines
 
-expecting success of 7500.29 '--fixup=amend: --only ignores staged changes': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
+checking prerequisite: AUTOIDENT
 
-	$(get_commit_msg HEAD~)
+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
 
-	edited
-	EOF
+)
+second user <pbuilder2@codethink03-arm64.debian.net> 1112912533 -0700
+prerequisite AUTOIDENT ok
+expecting success of 7502.52 'message shows committer when it is automatic': 
+
+	echo >>negative &&
 	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=amend:HEAD~ --only
+		sane_unset GIT_COMMITTER_EMAIL &&
+		sane_unset GIT_COMMITTER_NAME &&
+		git commit -e -m "sample" -a
 	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual &&
-	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
-	test_cmp_rev HEAD@{1} HEAD^ &&
-	test_expect_code 1 git diff --cached --exit-code &&
-	git cat-file blob :foo >actual &&
-	test_cmp foo actual
+	# 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
 
-[master 495438c] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master edaae07] intermediate commit
+[main 0675a12] sample
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 948c995] amend! target message subject line
- Author: A U Thor <author@example.com>
-diff --git a/foo b/foo
-index 42c2cbb..b6c6366 100644
---- a/foo
-+++ b/foo
-@@ -24,3 +24,4 @@ second content line
- third content line
- first content line
- second content line
-+third content line
-ok 29 - --fixup=amend: --only ignores staged changes
+ Committer: second user <pbuilder2@codethink03-arm64.debian.net>
+Your name and email address were configured automatically based
+on your username and hostname. Please check that they are accurate.
+You can suppress this message by setting them explicitly. Run the
+following command and follow the instructions in your editor to edit
+your configuration file:
 
-expecting success of 7500.30 '--fixup=reword: ignores staged changes': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
+    git config --global --edit
 
-	$(get_commit_msg HEAD~)
+After doing this, you may fix the identity used for this commit with:
 
-	edited
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=reword:HEAD~
-	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual &&
-	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
-	test_cmp_rev HEAD@{1} HEAD^ &&
-	test_expect_code 1 git diff --cached --exit-code &&
-	git cat-file blob :foo >actual &&
-	test_cmp foo actual
+    git commit --amend --reset-author
 
-[master ed4d665] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 218b136] intermediate commit
- Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master ee78bdc] amend! target message subject line
- Author: A U Thor <author@example.com>
-diff --git a/foo b/foo
-index 0b75f14..a67f15d 100644
---- a/foo
-+++ b/foo
-@@ -27,3 +27,4 @@ second content line
- third content line
- first content line
- second content line
-+third content line
-ok 30 - --fixup=reword: ignores staged changes
+# Committer: second user <pbuilder2@codethink03-arm64.debian.net>
+ok 52 - message shows committer when it is automatic
 
-expecting success of 7500.31 '--fixup=reword: error out with -m option': 
-	commit_for_rebase_autosquash_setup &&
-	echo "fatal: options '-m' and '--fixup:reword' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=reword:HEAD~ -m "reword commit message" 2>actual &&
-	test_cmp expect actual
+checking prerequisite: FAIL_PREREQS
 
-[master 9d96c85] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 5b2f7bf] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 31 - --fixup=reword: error out with -m option
+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 7500.32 '--fixup=amend: error out with -m option': 
-	commit_for_rebase_autosquash_setup &&
-	echo "fatal: options '-m' and '--fixup:amend' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=amend:HEAD~ -m "amend commit message" 2>actual &&
-	test_cmp expect actual
+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"
 
-[master a94321d] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 7600d55] intermediate commit
+[main 03c9a0d] tick
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 32 - --fixup=amend: error out with -m option
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+ok 54 - do not fire editor if -m <msg> was given
 
-expecting success of 7500.33 'consecutive amend! commits remove amend! line from commit msg body': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! amend! $(git log -1 --format=%s HEAD~)
+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"
 
-	$(get_commit_msg HEAD~)
+[main 21c3a22] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 55 - do not fire editor if -m "" was given
 
-	edited 1
+expecting success of 7502.56 'do not fire editor in the presence of conflicts': 
 
-	edited 2
-	EOF
-	echo "reword new commit message" >actual &&
+	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 &&
 	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited 1" \
-			git commit --fixup=reword:HEAD~ &&
-		FAKE_COMMIT_AMEND="edited 2" \
-			git commit --fixup=reword:HEAD
+		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit
 	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual
+	test "$(cat .git/result)" = "editor not started"
 
-[master 2a99715] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 550158e] intermediate commit
+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 a5d128b] add g
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 38fd587] amend! target message subject line
+ create mode 100644 g
+[main ea8832a] modify g and add h
  Author: A U Thor <author@example.com>
-[master 1a502bb] amend! amend! target message subject line
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 h
+Switched to branch 'second'
+[second d528946] second
  Author: A U Thor <author@example.com>
-ok 33 - consecutive amend! commits remove amend! line from commit msg body
-
-expecting success of 7500.34 'deny to create amend! commit if its commit msg body is empty': 
-	commit_for_rebase_autosquash_setup &&
-	echo "Aborting commit due to empty commit message body." >expected &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_COMMIT_MESSAGE="amend! target message subject line" \
-			git commit --fixup=amend:HEAD~ 2>actual
-	) &&
-	test_cmp expected actual
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging g
+CONFLICT (content): Merge conflict in g
+error: could not apply ea8832a... modify g and add h
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: Disable this message with "git config set advice.mergeConflict false"
+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
 
-[master c428437] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master ac86728] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 34 - deny to create amend! commit if its commit msg body is empty
+expecting success of 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 7500.35 'amend! commit allows empty commit msg body with --allow-empty-message': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE="amend! target message subject line" \
-			git commit --fixup=amend:HEAD~ --allow-empty-message &&
-		get_commit_msg HEAD >actual
-	) &&
-	test_cmp expected actual
+Terminated
+ok 57 - a SIGTERM should break locks
 
-[master d75d1dc] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 95b8327] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master a8cf642] amend! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 35 - amend! commit allows empty commit msg body with --allow-empty-message
+expecting success of 7502.58 'Hand committing of a redundant merge removes dups': 
 
-expecting success of 7500.36 '--fixup=reword: incompatible with --all': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --all 2>actual &&
-		test_cmp expect actual
-	
-ok 36 - --fixup=reword: incompatible with --all
+	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 7500.37 '--fixup=reword: incompatible with --include': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --include 2>actual &&
-		test_cmp expect actual
-	
-ok 37 - --fixup=reword: incompatible with --include
 
-expecting success of 7500.38 '--fixup=reword: incompatible with --only': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --only 2>actual &&
-		test_cmp expect actual
-	
-ok 38 - --fixup=reword: incompatible with --only
+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 2468f01] Merge branch 'main' into second
+ Author: A U Thor <author@example.com>
+ok 58 - Hand committing of a redundant merge removes dups
 
-expecting success of 7500.39 '--fixup=reword: incompatible with --interactive': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --interactive 2>actual &&
-		test_cmp expect actual
-	
-ok 39 - --fixup=reword: incompatible with --interactive
+expecting success of 7502.59 'A single-liner subject with a token plus colon is not a footer': 
 
-expecting success of 7500.40 '--fixup=reword: incompatible with --patch': 
-		echo 'fatal: reword option of '\''--fixup'\'' and' 			''\''--patch/--interactive/--all/--include/--only'\' 			'cannot be used together' >expect &&
-		test_must_fail git commit --fixup=reword:HEAD~ --patch 2>actual &&
-		test_cmp expect actual
-	
-ok 40 - --fixup=reword: incompatible with --patch
+	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 7500.41 '--fixup=reword: give error with pathsec': 
-	commit_for_rebase_autosquash_setup &&
-	echo "fatal: reword option of '--fixup' and path 'foo' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=reword:HEAD~ -- foo 2>actual &&
-	test_cmp expect actual
 
-[master c3507b6] target message subject line
+HEAD is now at 2468f01 Merge branch 'main' into second
+[second df053ce] hello: kitty
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f054bdc] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 41 - --fixup=reword: give error with pathsec
+ok 59 - A single-liner subject with a token plus colon is not a footer
 
-expecting success of 7500.42 '--fixup=reword: -F give error message': 
-	echo "fatal: options '-F' and '--fixup' cannot be used together" >expect &&
-	test_must_fail git commit --fixup=reword:HEAD~ -F msg  2>actual &&
-	test_cmp expect actual
+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 &&
 
-ok 42 - --fixup=reword: -F give error message
 
-expecting success of 7500.43 'commit --squash works with -F': 
-	commit_for_rebase_autosquash_setup &&
-	echo "log message from file" >msgfile &&
-	git commit --squash HEAD~1 -F msgfile  &&
-	commit_msg_is "squash! target message subject linelog message from file"
+	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
 
-[master 21cad69] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 2bfb665] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master bc37c4c] squash! target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 43 - commit --squash works with -F
+	EOF
+	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual
 
-expecting success of 7500.44 'commit --squash works with -m': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --squash HEAD~1 -m "foo bar\nbaz" &&
-	commit_msg_is "squash! target message subject linefoo bar\nbaz"
+[second f9d121f] Signed-off-by: C O Mitter <committer@example.com>
+ Author: A U Thor <author@example.com>
+ok 60 - commit -s places sob on third line after two empty lines
 
-[master 34d018d] target message subject line
+expecting success of 7502.61 'commit': 
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at f9d121f Signed-off-by: C O Mitter <committer@example.com>
+[second 3813bc4] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 9280558] intermediate commit
+# Changes to be committed:
+ok 61 - commit
+
+expecting success of 7502.62 'commit --status': 
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 3813bc4 message
+[second e6a02f5] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 74b4402] squash! target message subject line
+# Changes to be committed:
+ok 62 - commit --status
+
+expecting success of 7502.63 'commit --no-status': 
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at e6a02f5 message
+[second 16d518b] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 44 - commit --squash works with -m
-
-expecting success of 7500.45 'commit --squash works with -C': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --squash HEAD~1 -C HEAD &&
-	commit_msg_is "squash! target message subject lineintermediate commit"
+ok 63 - commit --no-status
 
-[master 6ba9d60] target message subject line
+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 16d518b message
+[second 2d4249b] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master a1fa052] intermediate commit
+# Changes to be committed:
+ok 64 - commit with commit.status = yes
+
+expecting success of 7502.65 'commit with commit.status = no': 
+		test_config commit.status no &&
+		try_commit "" &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 2d4249b message
+[second 12cf520] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 3059308] squash! target message subject line
+ok 65 - commit with commit.status = no
+
+expecting success of 7502.66 'commit --status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 12cf520 message
+[second c57db69] message
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
-ok 45 - commit --squash works with -C
-
-expecting success of 7500.46 'commit --squash works with -c': 
-	commit_for_rebase_autosquash_setup &&
-	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
-	git commit --squash HEAD~1 -c HEAD &&
-	commit_msg_is "squash! target message subject lineedited commit"
+# Changes to be committed:
+ok 66 - commit --status with commit.status = yes
 
-[master 2cb0c38] target message subject line
+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 c57db69 message
+[second 3ecb9d5] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 81a0468] intermediate commit
+ok 67 - commit --no-status with commit.status = yes
+
+expecting success of 7502.68 'commit --status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 3ecb9d5 message
+[second 657ba0f] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 9792f72] squash! target message subject line
+# Changes to be committed:
+ok 68 - commit --status with commit.status = no
+
+expecting success of 7502.69 'commit --no-status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 657ba0f message
+[second 4461cef] message
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
-ok 46 - commit --squash works with -c
-
-expecting success of 7500.47 'commit --squash works with -C for same commit': 
-	commit_for_rebase_autosquash_setup &&
-	git commit --squash HEAD -C HEAD &&
-	commit_msg_is "squash! intermediate commit"
+ok 69 - commit --no-status with commit.status = no
 
-[master fcc9597] target message subject line
+expecting success of 7502.70 'commit': 
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 4461cef message
+[second d9b12a7] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 3fba3a1] intermediate commit
+## Custom template
+# Changes to be committed:
+ok 70 - commit
+
+expecting success of 7502.71 'commit --status': 
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at d9b12a7 message
+[second da08401] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master b6827cd] squash! intermediate commit
+## Custom template
+# Changes to be committed:
+ok 71 - commit --status
+
+expecting success of 7502.72 'commit --no-status': 
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at da08401 message
+[second 087323d] message
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
-ok 47 - commit --squash works with -C for same commit
-
-expecting success of 7500.48 'commit --squash works with -c for same commit': 
-	commit_for_rebase_autosquash_setup &&
-	test_set_editor "$TEST_DIRECTORY"/t7500/edit-content &&
-	git commit --squash HEAD -c HEAD &&
-	commit_msg_is "squash! edited commit"
+## Custom template
+ok 72 - commit --no-status
 
-[master 35e184e] target message subject line
+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 087323d message
+[second c3c4df0] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 328d91f] intermediate commit
+## Custom template
+# Changes to be committed:
+ok 73 - commit with commit.status = yes
+
+expecting success of 7502.74 'commit with commit.status = no': 
+		test_config commit.status no &&
+		try_commit "" &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at c3c4df0 message
+[second e4faddd] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master d7c0314] squash! edited commit
+## Custom template
+ok 74 - commit with commit.status = no
+
+expecting success of 7502.75 'commit --status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at e4faddd message
+[second 6983ae0] message
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
-ok 48 - commit --squash works with -c for same commit
-
-expecting success of 7500.49 'commit --squash works with editor': 
-	commit_for_rebase_autosquash_setup &&
-	test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
-	git commit --squash HEAD~1 &&
-	commit_msg_is "squash! target message subject linecommit message"
+## Custom template
+# Changes to be committed:
+ok 75 - commit --status with commit.status = yes
 
-[master acfdcf4] target message subject line
+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 6983ae0 message
+[second 8edccfa] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 5a82cf8] intermediate commit
+## Custom template
+ok 76 - commit --no-status with commit.status = yes
+
+expecting success of 7502.77 'commit --status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 8edccfa message
+[second 4885316] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8042530] squash! target message subject line
+## Custom template
+# Changes to be committed:
+ok 77 - commit --status with commit.status = no
+
+expecting success of 7502.78 'commit --no-status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 4885316 message
+[second 66dc741] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 49 - commit --squash works with editor
-
-expecting success of 7500.50 'invalid message options when using --fixup': 
-	echo changes >>foo &&
-	echo "message" >log &&
-	git add foo &&
-	test_must_fail git commit --fixup HEAD~1 --squash HEAD~2 &&
-	test_must_fail git commit --fixup HEAD~1 -C HEAD~2 &&
-	test_must_fail git commit --fixup HEAD~1 -c HEAD~2 &&
-	test_must_fail git commit --fixup HEAD~1 -F log
-
-fatal: options '--squash' and '--fixup' cannot be used together
-fatal: options '-C' and '--fixup' cannot be used together
-fatal: options '-c' and '--fixup' cannot be used together
-fatal: options '-F' and '--fixup' cannot be used together
-ok 50 - invalid message options when using --fixup
+## Custom template
+ok 78 - commit --no-status with commit.status = no
 
-expecting success of 7500.51 'new line found before status message in commit template': 
-	git checkout -b commit-template-check &&
-	git reset --hard HEAD &&
-	touch commit-template-check &&
-	git add commit-template-check &&
-	GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
-	test_cmp expected-template editor-input
+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
 
-Switched to a new branch 'commit-template-check'
-HEAD is now at 8042530 squash! target message subject line
-[commit-template-check c1e58ac] 
+HEAD is now at 66dc741 message
+[second cc9232a] message ## Custom template
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 commit-template-check
-ok 51 - new line found before status message in commit template
-
-expecting success of 7500.52 'setup empty commit with unstaged rename and copy': 
-	test_create_repo unstaged_rename_and_copy &&
-	(
-		cd unstaged_rename_and_copy &&
-
-		echo content >orig &&
-		git add orig &&
-		test_commit orig &&
+ 1 file changed, 1 insertion(+)
+## Custom template
+; Changes to be committed:
+ok 79 - commit --status with custom comment character
 
-		cp orig new_copy &&
-		mv orig new_rename &&
-		git add -N new_copy new_rename
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7500-commit-template-squash-signoff/unstaged_rename_and_copy/.git/
-[master (root-commit) bac0952] orig
+[second 97b4720] #foo
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 orig
- create mode 100644 orig.t
-ok 52 - setup empty commit with unstaged rename and copy
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[second 25ccda4] message #foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+; Changes to be committed:
+ok 80 - switch core.commentchar
 
-expecting success of 7500.53 'check commit with unstaged rename and copy': 
+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 &&
 	(
-		cd unstaged_rename_and_copy &&
-
-		test_must_fail git -c diff.renames=copy commit
+		test_set_editor .git/FAKE_EDITOR &&
+		test_must_fail git -c core.commentChar=auto commit --amend
 	)
 
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	copied:     orig -> new_copy
-	renamed:    orig -> new_rename
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 53 - check commit with unstaged rename and copy
-
-expecting success of 7500.54 'commit without staging files fails and displays hints': 
-	echo "initial" >file &&
-	git add file &&
-	git commit -m initial &&
-	echo "changes" >>file &&
-	test_must_fail git commit -m update >actual &&
-	test_grep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
-
-[commit-template-check cfa8638] initial
+[second 9e9febc] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 54 - commit without staging files fails and displays hints
+ 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 54 test(s)
-1..54
+# passed all 81 test(s)
+1..81
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t6438-submodule-directory-file-conflicts.sh ***
@@ -471899,1063 +474922,6 @@
 1..56
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
-expecting success of 7503.1 'root commit': 
-	echo "root" >file &&
-	git add file &&
-	git commit -m "zeroth" &&
-	git checkout -b side &&
-	echo "foo" >foo &&
-	git add foo &&
-	git commit -m "make it non-ff" &&
-	git branch side-orig side &&
-	git checkout main
-
-[main (root-commit) 0e29351] zeroth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'side'
-[side f4a0fae] make it non-ff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Switched to branch 'main'
-ok 1 - root commit
-
-expecting success of 7503.2 'setup conflicting branches': 
-	test_when_finished "git checkout main" &&
-	git checkout -b conflicting-a main &&
-	echo a >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-a &&
-	git checkout -b conflicting-b main &&
-	echo b >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-b
-
-Switched to a new branch 'conflicting-a'
-[conflicting-a 3f25523] conflicting-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflicting
-Switched to a new branch 'conflicting-b'
-[conflicting-b 8c264fe] conflicting-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflicting
-Switched to branch 'main'
-ok 2 - setup conflicting branches
-
-expecting success of 7503.3 'with no hook': 
-	test_when_finished "rm -f actual_hooks" &&
-	echo "foo" >file &&
-	git add file &&
-	git commit -m "first" &&
-	test_path_is_missing actual_hooks
-
-[main e0ed36d] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - with no hook
-
-expecting success of 7503.4 'with no hook (merge)': 
-	test_when_finished "rm -f actual_hooks" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 4 - with no hook (merge)
-
-expecting success of 7503.5 '--no-verify with no hook': 
-	test_when_finished "rm -f actual_hooks" &&
-	echo "bar" >file &&
-	git add file &&
-	git commit --no-verify -m "bar" &&
-	test_path_is_missing actual_hooks
-
-[main 9b1e6a8] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - --no-verify with no hook
-
-expecting success of 7503.6 '--no-verify with no hook (merge)': 
-	test_when_finished "rm -f actual_hooks" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 6 - --no-verify with no hook (merge)
-
-expecting success of 7503.7 'with succeeding hook': 
-	setup_success_hook "pre-commit" &&
-	echo "more" >>file &&
-	git add file &&
-	git commit -m "more" &&
-	test_cmp expected_hooks actual_hooks
-
-[main 7901543] more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 7 - with succeeding hook
-
-expecting success of 7503.8 'with succeeding hook (merge)': 
-	setup_success_hook "pre-merge-commit" &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_cmp expected_hooks actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-ok 8 - with succeeding hook (merge)
-
-expecting success of 7503.9 'automatic merge fails; both hooks are available': 
-	setup_success_hook "pre-commit" &&
-	setup_success_hook "pre-merge-commit" &&
-
-	git checkout conflicting-a &&
-	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
-	test_path_is_missing actual_hooks &&
-
-	echo "pre-commit" >expected_hooks &&
-	echo a+b >conflicting &&
-	git add conflicting &&
-	git commit -m "resolve conflict" &&
-	test_cmp expected_hooks actual_hooks
-
-Switched to branch 'conflicting-a'
-Auto-merging conflicting
-CONFLICT (add/add): Merge conflict in conflicting
-Automatic merge failed; fix conflicts and then commit the result.
-[conflicting-a ff0069b] resolve conflict
- Author: A U Thor <author@example.com>
-ok 9 - automatic merge fails; both hooks are available
-
-expecting success of 7503.10 '--no-verify with succeeding hook': 
-	setup_success_hook "pre-commit" &&
-	echo "even more" >>file &&
-	git add file &&
-	git commit --no-verify -m "even more" &&
-	test_path_is_missing actual_hooks
-
-[conflicting-a 79fc96c] even more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 10 - --no-verify with succeeding hook
-
-expecting success of 7503.11 '--no-verify with succeeding hook (merge)': 
-	setup_success_hook "pre-merge-commit" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 11 - --no-verify with succeeding hook (merge)
-
-expecting success of 7503.12 'with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	test_when_finished "rm -f expected_hooks" &&
-	echo "pre-commit-failing-hook" >expected_hooks &&
-
-	echo "another" >>file &&
-	git add file &&
-	test_must_fail git commit -m "another" &&
-	test_cmp expected_hooks actual_hooks
-
-ok 12 - with failing hook
-
-expecting success of 7503.13 '--no-verify with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	echo "stuff" >>file &&
-	git add file &&
-	git commit --no-verify -m "stuff" &&
-	test_path_is_missing actual_hooks
-
-[main 9073eff] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 13 - --no-verify with failing hook
-
-expecting success of 7503.14 'with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
-	echo "pre-merge-commit-failing-hook" >expected_hooks &&
-	git checkout side &&
-	test_must_fail git merge -m "merge main" main &&
-	git checkout main &&
-	test_cmp expected_hooks actual_hooks
-
-Switched to branch 'side'
-Not committing merge; use 'git commit' to complete the merge.
-Switched to branch 'main'
-ok 14 - with failing hook (merge)
-
-expecting success of 7503.15 '--no-verify with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
-
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 15 - --no-verify with failing hook (merge)
-
-expecting success of 7503.16 'with non-executable hook': 
-	setup_non_exec_hook "pre-commit" &&
-	echo "content" >>file &&
-	git add file &&
-	git commit -m "content" &&
-	test_path_is_missing actual_hooks
-
-hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config set advice.ignoredHook false`.
-[main be1df3a] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 16 - with non-executable hook
-
-expecting success of 7503.17 '--no-verify with non-executable hook': 
-	setup_non_exec_hook "pre-commit" &&
-	echo "more content" >>file &&
-	git add file &&
-	git commit --no-verify -m "more content" &&
-	test_path_is_missing actual_hooks
-
-[main dd373ff] more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 17 - --no-verify with non-executable hook
-
-expecting success of 7503.18 'with non-executable hook (merge)': 
-	setup_non_exec_hook "pre-merge" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 18 - with non-executable hook (merge)
-
-expecting success of 7503.19 '--no-verify with non-executable hook (merge)': 
-	setup_non_exec_hook "pre-merge" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 19 - --no-verify with non-executable hook (merge)
-
-expecting success of 7503.20 'with hook requiring GIT_PREFIX': 
-	test_when_finished "rm -rf actual_hooks success" &&
-	setup_require_prefix_hook &&
-	echo "more content" >>file &&
-	git add file &&
-	mkdir success &&
-	(
-		cd success &&
-		git commit -m "hook requires GIT_PREFIX = success/"
-	) &&
-	test_cmp expected_hooks actual_hooks
-
-[main 91e0a75] hook requires GIT_PREFIX = success/
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 20 - with hook requiring GIT_PREFIX
-
-expecting success of 7503.21 'with failing hook requiring GIT_PREFIX': 
-	test_when_finished "rm -rf actual_hooks fail" &&
-	setup_require_prefix_hook &&
-	echo "more content" >>file &&
-	git add file &&
-	mkdir fail &&
-	(
-		cd fail &&
-		test_must_fail git commit -m "hook must fail"
-	) &&
-	git checkout -- file &&
-	test_cmp expected_hooks actual_hooks
-
-ok 21 - with failing hook requiring GIT_PREFIX
-
-expecting success of 7503.22 'check the author in hook': 
-	setup_require_author_hook &&
-	cat >expected_hooks <<-EOF &&
-	check-author
-	check-author
-	check-author
-	EOF
-	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
-	(
-		GIT_AUTHOR_NAME="New Author" &&
-		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
-		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-		git commit --allow-empty -m "by new.author via env" &&
-		git show -s
-	) &&
-	git commit --author="New Author <newauthor@example.com>" \
-		--allow-empty -m "by new.author via command line" &&
-	git show -s &&
-	test_cmp expected_hooks actual_hooks
-
-[main 1b3a79e] by new.author via env
- Author: New Author <newauthor@example.com>
- 1 file changed, 1 insertion(+)
-commit 1b3a79eec1cf60fc72bbc0d27901d153c90e4abe
-Author: New Author <newauthor@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    by new.author via env
-[main 155e737] by new.author via command line
- Author: New Author <newauthor@example.com>
-commit 155e73716852370372b22eca0576dacb5016aa2e
-Author: New Author <newauthor@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    by new.author via command line
-ok 22 - check the author in hook
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7504-commit-msg-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7504-commit-msg-hook/.git/
-expecting success of 7504.1 'with no hook': 
-
-	echo "foo" > file &&
-	git add file &&
-	git commit -m "first"
-
-
-[main (root-commit) d6ab80b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - with no hook
-
-expecting success of 7504.2 'with no hook (editor)': 
-
-	echo "more foo" >> file &&
-	git add file &&
-	echo "more foo" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
-
-
-[main 8164a21] more foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 2 - with no hook (editor)
-
-expecting success of 7504.3 '--no-verify with no hook': 
-
-	echo "bar" > file &&
-	git add file &&
-	git commit --no-verify -m "bar"
-
-
-[main 854c7e2] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 3 - --no-verify with no hook
-
-expecting success of 7504.4 '--no-verify with no hook (editor)': 
-
-	echo "more bar" > file &&
-	git add file &&
-	echo "more bar" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[main 0b79d34] more bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - --no-verify with no hook (editor)
-
-expecting success of 7504.5 'setup: commit-msg hook that always succeeds': 
-	test_hook --setup commit-msg <<-\EOF
-	exit 0
-	EOF
-
-ok 5 - setup: commit-msg hook that always succeeds
-
-expecting success of 7504.6 'with succeeding hook': 
-
-	echo "more" >> file &&
-	git add file &&
-	git commit -m "more"
-
-
-[main 329307f] more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 6 - with succeeding hook
-
-expecting success of 7504.7 'with succeeding hook (editor)': 
-
-	echo "more more" >> file &&
-	git add file &&
-	echo "more more" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
-
-
-[main 1c57244] more more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 7 - with succeeding hook (editor)
-
-expecting success of 7504.8 '--no-verify with succeeding hook': 
-
-	echo "even more" >> file &&
-	git add file &&
-	git commit --no-verify -m "even more"
-
-
-[main f6c9c8b] even more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - --no-verify with succeeding hook
-
-expecting success of 7504.9 '--no-verify with succeeding hook (editor)': 
-
-	echo "even more more" >> file &&
-	git add file &&
-	echo "even more more" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[main 64f8392] even more more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 9 - --no-verify with succeeding hook (editor)
-
-expecting success of 7504.10 'setup: commit-msg hook that always fails': 
-	test_hook --clobber commit-msg <<-\EOF
-	exit 1
-	EOF
-
-ok 10 - setup: commit-msg hook that always fails
-
-expecting success of 7504.11 'with failing hook': 
-
-	echo "another" >> file &&
-	git add file &&
-	test_must_fail git commit -m "another"
-
-
-ok 11 - with failing hook
-
-expecting success of 7504.12 'with failing hook (editor)': 
-
-	echo "more another" >> file &&
-	git add file &&
-	echo "more another" > FAKE_MSG &&
-	! (GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit)
-
-
-ok 12 - with failing hook (editor)
-
-expecting success of 7504.13 '--no-verify with failing hook': 
-
-	echo "stuff" >> file &&
-	git add file &&
-	git commit --no-verify -m "stuff"
-
-
-[main 95dce17] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-ok 13 - --no-verify with failing hook
-
-expecting success of 7504.14 '-n followed by --verify with failing hook': 
-
-	echo "even more" >> file &&
-	git add file &&
-	test_must_fail git commit -n --verify -m "even more"
-
-
-ok 14 - -n followed by --verify with failing hook
-
-expecting success of 7504.15 '--no-verify with failing hook (editor)': 
-
-	echo "more stuff" >> file &&
-	git add file &&
-	echo "more stuff" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[main 254c35b] more stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 15 - --no-verify with failing hook (editor)
-
-expecting success of 7504.16 'merge fails with failing hook': 
-
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout --orphan newbranch &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	test_must_fail git merge --allow-unrelated-histories main &&
-	commit_msg_is "in-side-branch" # HEAD before merge
-
-
-Switched to a new branch 'newbranch'
-[newbranch (root-commit) 73906b9] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-error: Your local changes to the following files would be overwritten by merge:
-  file
-Merge with strategy ort failed.
-Switched to branch 'main'
-Deleted branch newbranch (was 73906b9).
-ok 16 - merge fails with failing hook
-
-expecting success of 7504.17 'merge bypasses failing hook with --no-verify': 
-
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout --orphan newbranch &&
-	git rm -f file &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify --allow-unrelated-histories main &&
-	commit_msg_is "Merge branch 'main' into newbranch"
-
-Switched to a new branch 'newbranch'
-rm 'file'
-[newbranch (root-commit) 73906b9] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-Merge made by the 'ort' strategy.
- file | 10 ++++++++++
- 1 file changed, 10 insertions(+)
- create mode 100644 file
-Switched to branch 'main'
-Deleted branch newbranch (was d8333d0).
-ok 17 - merge bypasses failing hook with --no-verify
-
-expecting success of 7504.18 'setup: commit-msg hook made non-executable': 
-	git_dir="$(git rev-parse --git-dir)" &&
-	chmod -x "$git_dir/hooks/commit-msg"
-
-ok 18 - setup: commit-msg hook made non-executable
-
-expecting success of 7504.19 'with non-executable hook': 
-
-	echo "content" >file &&
-	git add file &&
-	git commit -m "content"
-
-
-hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config set advice.ignoredHook false`.
-[main 89fb8ae] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 10 deletions(-)
-ok 19 - with non-executable hook
-
-expecting success of 7504.20 'with non-executable hook (editor)': 
-
-	echo "content again" >> file &&
-	git add file &&
-	echo "content again" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -m "content again"
-
-
-hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config set advice.ignoredHook false`.
-[main 888e6c6] content again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 20 - with non-executable hook (editor)
-
-expecting success of 7504.21 '--no-verify with non-executable hook': 
-
-	echo "more content" >> file &&
-	git add file &&
-	git commit --no-verify -m "more content"
-
-
-[main 7569859] more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 21 - --no-verify with non-executable hook
-
-expecting success of 7504.22 '--no-verify with non-executable hook (editor)': 
-
-	echo "even more content" >> file &&
-	git add file &&
-	echo "even more content" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[main 275f9c1] even more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 22 - --no-verify with non-executable hook (editor)
-
-expecting success of 7504.23 'setup: commit-msg hook that edits the commit message': 
-	test_hook --clobber commit-msg <<-\EOF
-	echo "new message" >"$1"
-	exit 0
-	EOF
-
-ok 23 - setup: commit-msg hook that edits the commit message
-
-expecting success of 7504.24 'hook edits commit message': 
-
-	echo "additional" >> file &&
-	git add file &&
-	git commit -m "additional" &&
-	commit_msg_is "new message"
-
-
-[main fe8ba48] new message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 24 - hook edits commit message
-
-expecting success of 7504.25 'hook edits commit message (editor)': 
-
-	echo "additional content" >> file &&
-	git add file &&
-	echo "additional content" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
-	commit_msg_is "new message"
-
-
-[main 01f87e3] new message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 25 - hook edits commit message (editor)
-
-expecting success of 7504.26 'hook doesn't edit commit message': 
-
-	echo "plus" >> file &&
-	git add file &&
-	git commit --no-verify -m "plus" &&
-	commit_msg_is "plus"
-
-
-[main b89da1b] plus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 26 - hook doesn't edit commit message
-
-expecting success of 7504.27 'hook doesn't edit commit message (editor)': 
-
-	echo "more plus" >> file &&
-	git add file &&
-	echo "more plus" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
-	commit_msg_is "more plus"
-
-[main f4fdd67] more plus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 27 - hook doesn't edit commit message (editor)
-
-expecting success of 7504.28 'hook called in git-merge picks up commit message': 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout --orphan newbranch &&
-	git rm -f file &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --allow-unrelated-histories main &&
-	commit_msg_is "new message"
-
-Switched to a new branch 'newbranch'
-rm 'file'
-[newbranch (root-commit) 73906b9] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-Merge made by the 'ort' strategy.
- file | 8 ++++++++
- 1 file changed, 8 insertions(+)
- create mode 100644 file
-Switched to branch 'main'
-Deleted branch newbranch (was 8eb8126).
-ok 28 - hook called in git-merge picks up commit message
-
-checking known breakage of 7504.29 'merge --continue remembers --no-verify': 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f main" &&
-	git checkout main &&
-	echo a >file2 &&
-	git add file2 &&
-	git commit --no-verify -m "add file2 to main" &&
-	git checkout -b newbranch main^ &&
-	echo b >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify -m not-rewritten-by-hook main &&
-	# resolve conflict:
-	echo c >file2 &&
-	git add file2 &&
-	git merge --continue &&
-	commit_msg_is not-rewritten-by-hook
-
-Already on 'main'
-[main 4c03054] add file2 to main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Switched to a new branch 'newbranch'
-[newbranch 7295afc] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Automatic merge failed; fix conflicts and then commit the result.
-Switched to branch 'main'
-Deleted branch newbranch (was 7295afc).
-not ok 29 - merge --continue remembers --no-verify # TODO known breakage
-
-expecting success of 7504.30 'hook is called for reword during `rebase -i`': 
-
-	GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ &&
-	commit_msg_is "new message"
-
-
-Rebasing (1/1)
[detached HEAD 7d30ea0] new message
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Successfully rebased and updated refs/heads/main.
-ok 30 - hook is called for reword during `rebase -i`
-
-# still have 1 known breakage(s)
-# passed all remaining 29 test(s)
-1..30
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7509-commit-authorship.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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(+)
-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
-
-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 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
-
-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 12 - --reset-author with CHERRY_PICK_HEAD
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7510-signed-commit.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7510-signed-commit/.git/
 checking prerequisite: GPG
@@ -473141,596 +475107,281 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7507-commit-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t7509-commit-authorship.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-[master aa8777f] subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - second commit
+	message_body Initial >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 7507.4 'verbose diff is stripped out': 
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
+[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
 
-[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 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 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
+	message_body Initial >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
 
-[master aa8777f] subject
+[master 0381fd2] Initial Commit
  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
+ 1 file changed, 1 insertion(+)
+ok 2 - -C option copies only the message with --reset-author
 
-[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 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
 
-expecting success of 7507.7 'diff in message is retained with -v': 
-	git commit --amend -F diff -v &&
-	check_message diff
+[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
 
-[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 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 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
+	message_body Initial >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+[master d241f1c] Initial Commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
+ok 4 - -c option copies only the message with --reset-author
 
-# 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 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 &&
 
-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
+	echo "amend test" >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
 
+Note: switching to 'Initial'.
 
-; 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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 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
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-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
+  git switch -c <new-branch-name>
 
-expecting success of 7507.11 'status does not verbose without --verbose': 
-	git status >actual &&
-	! grep "^diff --git" actual
+Or undo this operation with:
 
-ok 11 - status does not verbose without --verbose
+  git switch -
 
-expecting success of 7507.12 'setup -v -v': 
-	echo dirty >file
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 12 - setup -v -v
+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 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 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
 
-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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
+  7318ebc amend test
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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 branch <new-branch-name> 7318ebc
 
-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
+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:
 
-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
+  488af46 Initial Commit
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 488af46
 
-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
+HEAD is now at 6c1fd11 Initial Commit
+M	foo
+ok 6 - --amend option with empty author
 
-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 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 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
+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:
 
-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
+  1dcf28c Initial 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
-	
-[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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 1dcf28c
 
-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
+HEAD is now at 6c1fd11 Initial Commit
+M	foo
+ok 7 - --amend option with missing author
 
-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 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 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
+	echo "Changed again" >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
 
-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
+HEAD is now at 6c1fd11 Initial Commit
+M	foo
+[detached HEAD 16b5be6] Changed again
  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, 4 insertions(+)
+ create mode 100644 foo
+ok 8 - --reset-author makes the commit ours even with --amend option
 
-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 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>"
 
-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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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
+  16b5be6 Changed again
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 16b5be6
 
-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
+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 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 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
 
-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
+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 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 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 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
+	echo "This is a MERGE_MSG" >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
 
-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
+[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 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 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
 
-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
+[detached HEAD 9a09dbe] cherry-pick 2
  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
+ 1 file changed, 1 insertion(+)
+ok 12 - --reset-author with CHERRY_PICK_HEAD
 
-# passed all 45 test(s)
-1..45
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7511-status-index.sh ***
@@ -474915,1007 +476566,717 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7003-filter-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/.git/
-expecting success of 7003.1 'setup': 
-	test_commit A &&
-	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
-	test_commit --notick B &&
-	git checkout -b branch B &&
-	test_commit D &&
-	mkdir dir &&
-	test_commit dir/D &&
-	test_commit E &&
-	git checkout main &&
-	test_commit C &&
-	git checkout branch &&
-	git merge C &&
-	git tag F &&
-	test_commit G &&
-	test_commit H
+*** t7514-commit-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7514-commit-patch/.git/
+expecting success of 7514.1 'setup (initial)': 
+	echo line1 >file &&
+	git add file &&
+	git commit -m commit1
 
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main e86e545] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'branch'
-[branch bd662c1] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch 3abb9b5] dir/D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/D.t
-[branch 48ac83b] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'main'
-[main 0e63577] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'branch'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[branch 3c39262] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[branch 110eac9] H
+[master (root-commit) 8d800e1] commit1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H.t
-ok 1 - setup
-
-expecting success of 7003.2 'rewrite identically': 
-	git filter-branch branch
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/branch' is unchanged
-ok 2 - rewrite identically
-
-expecting success of 7003.3 'result is really identical': 
-	test $H = $(git rev-parse HEAD)
-
-ok 3 - result is really identical
-
-expecting success of 7003.4 'rewrite bare repository identically': 
-	(git config core.bare true && cd .git &&
-	 git filter-branch branch > filter-output 2>&1 &&
-	! grep fatal filter-output)
-
-ok 4 - rewrite bare repository identically
-
-expecting success of 7003.5 'result is really identical': 
-	test $H = $(git rev-parse HEAD)
-
-ok 5 - result is really identical
+ create mode 100644 file
+ok 1 - setup (initial)
 
-expecting success of 7003.6 'correct GIT_DIR while using -d': 
-	mkdir drepo &&
-	( cd drepo &&
-	git init &&
-	test_commit drepo &&
-	git filter-branch -d "$TRASHDIR/dfoo" \
-		--index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
-	) &&
-	grep drepo "$TRASHDIR/backup-refs"
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/drepo/.git/
-[main (root-commit) 9f96758] drepo
+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(+)
- create mode 100644 drepo.t
-
Rewrite 9f9675864b1443cf5a1e281c740a8ba331951fba (1/1) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-9f9675864b1443cf5a1e281c740a8ba331951fba commit	refs/tags/drepo
-ok 6 - correct GIT_DIR while using -d
+ok 2 - edit hunk "commit -p -m message"
 
-expecting success of 7003.7 'tree-filter works with -d': 
-	git init drepo-tree &&
-	(
-		cd drepo-tree &&
-		test_commit one &&
-		git filter-branch -d "$TRASHDIR/dfoo" \
-			--tree-filter "echo changed >one.t" &&
-		echo changed >expect &&
-		git cat-file blob HEAD:one.t >actual &&
-		test_cmp expect actual &&
-		test_cmp one.t actual
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/drepo-tree/.git/
-[main (root-commit) d944c64] one
+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(+)
- create mode 100644 one.t
-
Rewrite d944c643197c4e8b1e89974e6d9ba85df421b65d (1/1) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 7 - tree-filter works with -d
-
-expecting success of 7003.8 'Fail if commit filter fails': 
-	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    could not write rewritten commit
-ok 8 - Fail if commit filter fails
-
-expecting success of 7003.9 'rewrite, renaming a specific file': 
-	git filter-branch -f --tree-filter "mv D.t doh || :" HEAD
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (7/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (7/9) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 9 - rewrite, renaming a specific file
-
-expecting success of 7003.10 'test that the file was renamed': 
-	test D = "$(git show HEAD:doh --)" &&
-	! test -f D.t &&
-	test -f doh &&
-	test D = "$(cat doh)"
-
-ok 10 - test that the file was renamed
-
-expecting success of 7003.11 'rewrite, renaming a specific directory': 
-	git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (9/9) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 11 - rewrite, renaming a specific directory
-
-expecting success of 7003.12 'test that the directory was renamed': 
-	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
-	! test -d dir &&
-	test -d diroh &&
-	! test -d diroh/dir &&
-	test -f diroh/D.t &&
-	test dir/D = "$(cat diroh/D.t)"
-
-ok 12 - test that the directory was renamed
-
-expecting success of 7003.13 'populate --state-branch': 
-	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
-
-Branch state does not exist. Will create
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-Saving rewrite state to state
-ok 13 - populate --state-branch
-
-expecting success of 7003.14 'using --state-branch to skip already rewritten commits': 
-	test_when_finished git reset --hard $V &&
-	git reset --hard $V &&
-	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD &&
-	test_cmp_rev $W HEAD
-
-HEAD is now at 8a3423e H
-Populating map from state (62b9c9fa908324bba33ac79ad962e765fd9a3958)
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-Saving rewrite state to state
-HEAD is now at 8a3423e H
-ok 14 - using --state-branch to skip already rewritten commits
-
-expecting success of 7003.15 'rewrite one branch, keeping a side branch': 
-	git branch modD oldD &&
-	git filter-branch -f --tree-filter "mv B.t boh || :" D..modD
-
-
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/2) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/modD' was rewritten
-ok 15 - rewrite one branch, keeping a side branch
-
-expecting success of 7003.16 'common ancestor is still common (unchanged)': 
-	test "$(git merge-base modD D)" = "$(git rev-parse B)"
-
-ok 16 - common ancestor is still common (unchanged)
+ok 3 - edit hunk "commit --dry-run -p -m message"
 
-expecting success of 7003.17 'filter subdirectory only': 
-	mkdir subdir &&
-	touch subdir/new &&
-	git add subdir/new &&
-	test_tick &&
-	git commit -m "subdir" &&
-	echo H > A.t &&
-	test_tick &&
-	git commit -m "not subdir" A.t &&
-	echo A > subdir/new &&
-	test_tick &&
-	git commit -m "again subdir" subdir/new &&
-	git rm A.t &&
-	test_tick &&
-	git commit -m "again not subdir" &&
-	git branch sub &&
-	git branch sub-earlier HEAD~2 &&
-	git filter-branch -f --subdirectory-filter subdir \
-		refs/heads/sub refs/heads/sub-earlier
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7507-commit-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7507-commit-verbose/.git/
+expecting success of 7507.1 'setup': 
+	echo content >file &&
+	git add file &&
+	git commit -F message
 
-[branch bb8f80d] subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subdir/new
-[branch 5bae69c] not subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch 140072e] again subdir
+[master (root-commit) 5621fbe] subject
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-rm 'A.t'
-[branch ead226b] again not subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A.t
-
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (2/2) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/sub' was rewritten
-Ref 'refs/heads/sub-earlier' was rewritten
-ok 17 - filter subdirectory only
-
-expecting success of 7003.18 'subdirectory filter result looks okay': 
-	test 2 = $(git rev-list sub | wc -l) &&
-	git show sub:new &&
-	test_must_fail git show sub:subdir &&
-	git show sub-earlier:new &&
-	test_must_fail git show sub-earlier:subdir
-
-A
-fatal: path 'subdir' exists on disk, but not in 'sub'
-fatal: path 'subdir' exists on disk, but not in 'sub-earlier'
-ok 18 - subdirectory filter result looks okay
+ create mode 100644 file
+ok 1 - setup
 
-expecting success of 7003.19 'more setup': 
-	git checkout main &&
-	mkdir subdir &&
-	echo A > subdir/new &&
-	git add subdir/new &&
-	test_tick &&
-	git commit -m "subdir on main" subdir/new &&
-	git rm A.t &&
-	test_tick &&
-	git commit -m "again subdir on main" &&
-	git merge branch
+expecting success of 7507.2 'initial commit shows verbose diff': 
+	git commit --amend -v &&
+	test_line_count = 1 out
 
-Switched to branch 'main'
-[main cb42fbf] subdir on main
+[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 subdir/new
-rm 'A.t'
-[main a1f80b9] again subdir on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A.t
-Merge made by the 'ort' strategy.
- E.t       | 1 +
- G.t       | 1 +
- H.t       | 1 +
- diroh/D.t | 1 +
- doh       | 1 +
- 5 files changed, 5 insertions(+)
- create mode 100644 E.t
- create mode 100644 G.t
- create mode 100644 H.t
- create mode 100644 diroh/D.t
- create mode 100644 doh
-ok 19 - more setup
-
-expecting success of 7003.20 'use index-filter to move into a subdirectory': 
-	git branch directorymoved &&
-	git filter-branch -f --index-filter \
-		 "git ls-files -s | sed \"s-	-&newsubdir/-\" |
-	          GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
-			git update-index --index-info &&
-		  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
-	git diff --exit-code HEAD directorymoved:newsubdir
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/16) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/16) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/16) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/16) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (8/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (10/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (10/16) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (10/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (10/16) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (10/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (10/16) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/directorymoved' was rewritten
-ok 20 - use index-filter to move into a subdirectory
-
-expecting success of 7003.21 'stops when msg filter fails': 
-	old=$(git rev-parse HEAD) &&
-	test_must_fail git filter-branch -f --msg-filter false HEAD &&
-	test $old = $(git rev-parse HEAD) &&
-	rm -rf .git-rewrite
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    msg filter failed: false
-ok 21 - stops when msg filter fails
-
-expecting success of 7003.22 'author information is preserved': 
-	: > i &&
-	git add i &&
-	test_tick &&
-	GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
-	git branch preserved-author &&
-	(sane_unset GIT_AUTHOR_NAME &&
-	 git filter-branch -f --msg-filter "cat; \
-			test \$GIT_COMMIT != $(git rev-parse main) || \
-			echo Hallo" \
-		preserved-author) &&
-	git rev-list --author="B V Uips" preserved-author >actual &&
-	test_line_count = 1 actual
-
-[main 7da14ef] bvuips
- Author: B V Uips <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 i
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/17) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/17) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/17) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/17) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/17) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (8/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (10/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/17) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (12/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/17) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (16/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (17/17) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/preserved-author' was rewritten
-ok 22 - author information is preserved
+ create mode 100644 file
+ok 2 - initial commit shows verbose diff
 
-expecting success of 7003.23 'remove a certain author's commits': 
-	echo i > i &&
-	test_tick &&
-	git commit -m i i &&
-	git branch removed-author &&
-	git filter-branch -f --commit-filter "\
-		if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
-		then\
-			skip_commit \"\$@\";
-		else\
-			git commit-tree \"\$@\";\
-		fi" removed-author &&
-	cnt1=$(git rev-list main | wc -l) &&
-	cnt2=$(git rev-list removed-author | wc -l) &&
-	test $cnt1 -eq $(($cnt2 + 1)) &&
-	git rev-list --author="B V Uips" removed-author >actual &&
-	test_line_count = 0 actual
+expecting success of 7507.3 'second commit': 
+	echo content modified >file &&
+	git add file &&
+	git commit -F message
 
-[main 0261af1] i
+[master aa8777f] subject
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/18) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/18) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/18) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (13/18) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/removed-author' was rewritten
-ok 23 - remove a certain author's commits
-
-expecting success of 7003.24 'barf on invalid name': 
-	test_must_fail git filter-branch -f main xy-problem &&
-	test_must_fail git filter-branch -f HEAD^
-
-fatal: ambiguous argument 'xy-problem': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-You must specify a ref to rewrite.
-ok 24 - barf on invalid name
-
-expecting success of 7003.25 '"map" works in commit filter': 
-	git filter-branch -f --commit-filter "\
-		parent=\$(git rev-parse \$GIT_COMMIT^) &&
-		mapped=\$(map \$parent) &&
-		actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
-		test \$mapped = \$actual &&
-		git commit-tree \"\$@\";" main~2..main &&
-	git rev-parse --verify main
-
-
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (2/2) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-0261af146239dd954a19d76ae2a417dd3af8b791
-ok 25 - "map" works in commit filter
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - second commit
 
-expecting success of 7003.26 'Name needing quotes': 
+expecting success of 7507.4 'verbose diff is stripped out': 
+	git commit --amend -v &&
+	check_message message &&
+	test_line_count = 1 out
 
-	git checkout -b rerere A &&
-	mkdir foo &&
-	name="れれれ" &&
-	>foo/$name &&
-	git add foo &&
-	git commit -m "Adding a file" &&
-	git filter-branch --tree-filter "rm -fr foo" &&
-	test_must_fail git ls-files --error-unmatch "foo/$name" &&
-	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
+[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
 
-Switched to a new branch 'rerere'
-[rerere 1d45e88] Adding a file
+[master aa8777f] subject
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 "foo/\343\202\214\343\202\214\343\202\214"
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1d45e8854f1dd5452938be2dedb173087134c05c (2/2) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rerere' was rewritten
-error: pathspec 'foo/れれれ' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 26 - Name needing quotes
+ 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 7003.27 'Subdirectory filter with disappearing trees': 
-	git reset --hard &&
-	git checkout main &&
+expecting success of 7507.6 'diff in message is retained without -v': 
+	git commit --amend -F diff &&
+	check_message diff
 
-	mkdir foo &&
-	touch foo/bar &&
-	git add foo &&
-	test_tick &&
-	git commit -m "Adding foo" &&
+[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
 
-	git rm -r foo &&
-	test_tick &&
-	git commit -m "Removing foo" &&
+expecting success of 7507.7 'diff in message is retained with -v': 
+	git commit --amend -F diff -v &&
+	check_message diff
 
-	mkdir foo &&
-	touch foo/bar &&
-	git add foo &&
-	test_tick &&
-	git commit -m "Re-adding foo" &&
+[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
 
-	git filter-branch -f --subdirectory-filter foo &&
-	git rev-list main >actual &&
-	test_line_count = 3 actual
+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
 
-HEAD is now at 643bd56 Adding a file
-Switched to branch 'main'
-[main f7eadb2] Adding foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/bar
-rm 'foo/bar'
-[main ee48524] Removing foo
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7507-commit-verbose/sub'...
+done.
+[master 2f750a4] sub added
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 foo/bar
-[main 14fe8c6] Re-adding foo
+ 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, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/bar
-
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 27 - Subdirectory filter with disappearing trees
-
-expecting success of 7003.28 'Tag name filtering retains tag message': 
-	git tag -m atag T &&
-	git cat-file tag T > expect &&
-	git filter-branch -f --tag-name-filter cat &&
-	git cat-file tag T > actual &&
-	test_cmp expect actual
+ 1 file changed, 1 insertion(+)
 
-
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-ok 28 - Tag name filtering retains tag message
+# 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 7003.29 'Tag name filtering strips gpg signature': 
-	sha1=$(git rev-parse HEAD) &&
-	sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
-	git update-ref "refs/tags/S" "$sha1t" &&
-	echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
-	git filter-branch -f --tag-name-filter cat &&
-	git cat-file tag S > actual &&
-	test_cmp expect actual
+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
 
-
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-S -> S (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-gpg signature stripped from tag object 5e10caf7d74c3ace8930aa1d5449d4d0ceb2e9e0
-T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-ok 29 - Tag name filtering strips gpg signature
 
-checking prerequisite: GPG
+; 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
 
-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 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
 
-	# 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
+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
 
-)
-prerequisite GPG not satisfied
-ok 30 # skip Filtering retains message of gpg signed commit (missing GPG)
+expecting success of 7507.11 'status does not verbose without --verbose': 
+	git status >actual &&
+	! grep "^diff --git" actual
 
-expecting success of 7003.31 'Tag name filtering allows slashes in tag names': 
-	git tag -m tag-with-slash X/1 &&
-	git cat-file tag X/1 | sed -e s,X/1,X/2, > expect &&
-	git filter-branch -f --tag-name-filter "echo X/2" &&
-	git cat-file tag X/2 > actual &&
-	test_cmp expect actual
+ok 11 - status does not verbose without --verbose
 
-
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-S -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-T -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-X/1 -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-ok 31 - Tag name filtering allows slashes in tag names
+expecting success of 7507.12 'setup -v -v': 
+	echo dirty >file
 
-expecting success of 7003.32 'setup --prune-empty comparisons': 
-	git checkout --orphan main-no-a &&
-	git rm -rf . &&
-	unset test_tick &&
-	test_tick &&
-	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
-	test_commit --notick B B.t B Bx &&
-	git checkout -b branch-no-a Bx &&
-	test_commit D D.t D Dx &&
-	mkdir dir &&
-	test_commit dir/D dir/D.t dir/D dir/Dx &&
-	test_commit E E.t E Ex &&
-	git checkout main-no-a &&
-	test_commit C C.t C Cx &&
-	git checkout branch-no-a &&
-	git merge Cx -m "Merge tag 'C' into branch" &&
-	git tag Fx &&
-	test_commit G G.t G Gx &&
-	test_commit H H.t H Hx &&
-	git checkout branch
+ok 12 - setup -v -v
 
-Switched to a new branch 'main-no-a'
-rm 'bar'
-[main-no-a (root-commit) 8d95d31] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'branch-no-a'
-[branch-no-a 2d0b6b2] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch-no-a 6b73242] dir/D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/D.t
-[branch-no-a 6e45985] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'main-no-a'
-[main-no-a 5a68040] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'branch-no-a'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[branch-no-a f0368e4] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[branch-no-a 00fc75b] H
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-Switched to branch 'branch'
-ok 32 - setup --prune-empty comparisons
-
-expecting success of 7003.33 'Prune empty commits': 
-	git rev-list HEAD > expect &&
-	test_commit to_remove &&
-	git filter-branch -f --index-filter "git update-index --remove to_remove.t" --prune-empty HEAD &&
-	git rev-list HEAD > actual &&
-	test_cmp expect actual
+ 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
 
-[branch 219a992] to_remove
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove.t
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (8/14) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (8/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (8/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (8/14) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (8/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (8/14) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 33 - Prune empty commits
-
-expecting success of 7003.34 'prune empty collapsed merges': 
-	test_config merge.ff false &&
-	git rev-list HEAD >expect &&
-	test_commit to_remove_2 &&
-	git reset --hard HEAD^ &&
-	test_merge non-ff to_remove_2 &&
-	git filter-branch -f --index-filter "git update-index --remove to_remove_2.t" --prune-empty HEAD &&
-	git rev-list HEAD >actual &&
-	test_cmp expect actual
+ 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
 
-[branch cb86908] to_remove_2
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove_2.t
-HEAD is now at ead226b again not subdir
-Merge made by the 'ort' strategy.
- to_remove_2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove_2.t
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/15) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/15) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/15) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (12/15) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/15) (0 seconds passed, remaining 0 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (14/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (15/15) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 34 - prune empty collapsed merges
-
-expecting success of 7003.35 'prune empty works even without index/tree filters': 
-	git rev-list HEAD >expect &&
-	git commit --allow-empty -m empty &&
-	git filter-branch -f --prune-empty HEAD &&
-	git rev-list HEAD >actual &&
-	test_cmp expect actual
+ 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
 
-[branch 5b6cb84] empty
+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>
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (13/14) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 35 - prune empty works even without index/tree filters
-
-expecting success of 7003.36 '--prune-empty is able to prune root commit': 
-	git rev-list branch-no-a >expect &&
-	git branch testing H &&
-	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
-	git rev-list testing >actual &&
-	git branch -D testing &&
-	test_cmp expect actual
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (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) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/testing' was rewritten
-Deleted branch testing (was 00fc75b).
-ok 36 - --prune-empty is able to prune root commit
-
-expecting success of 7003.37 '--prune-empty is able to prune entire branch': 
-	git branch prune-entire B &&
-	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire &&
-	test_must_fail git rev-parse refs/heads/prune-entire &&
-	test_must_fail git reflog exists refs/heads/prune-entire
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/2) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/prune-entire' was deleted
-fatal: ambiguous argument 'refs/heads/prune-entire': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/prune-entire
-ok 37 - --prune-empty is able to prune entire branch
-
-expecting success of 7003.38 '--remap-to-ancestor with filename filters': 
-	git checkout main &&
-	git reset --hard A &&
-	test_commit add-foo foo 1 &&
-	git branch moved-foo &&
-	test_commit add-bar bar a &&
-	git branch invariant &&
-	orig_invariant=$(git rev-parse invariant) &&
-	git branch moved-bar &&
-	test_commit change-foo foo 2 &&
-	git filter-branch -f --remap-to-ancestor \
-		moved-foo moved-bar A..main \
-		-- -- foo &&
-	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
-	test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
-	test $orig_invariant = $(git rev-parse invariant)
+ 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
 
-Switched to branch 'main'
-HEAD is now at 0ddfaf1 A
-[main 7d21991] add-foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 2ff770b] add-bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main b2d4813] change-foo
+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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
Rewrite 7d219912875c3b539add35fdb1e3d70e5572ca7c (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite b2d4813d3ebe523582008cb287d933f8c14917be (2/2) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/moved-foo' is unchanged
-Ref 'refs/heads/moved-bar' was rewritten
-Ref 'refs/heads/main' was rewritten
-ok 38 - --remap-to-ancestor with filename filters
-
-expecting success of 7003.39 'automatic remapping to ancestor with filename filters': 
-	git checkout main &&
-	git reset --hard A &&
-	test_commit add-foo2 foo 1 &&
-	git branch moved-foo2 &&
-	test_commit add-bar2 bar a &&
-	git branch invariant2 &&
-	orig_invariant=$(git rev-parse invariant2) &&
-	git branch moved-bar2 &&
-	test_commit change-foo2 foo 2 &&
-	git filter-branch -f \
-		moved-foo2 moved-bar2 A..main \
-		-- -- foo &&
-	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
-	test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
-	test $orig_invariant = $(git rev-parse invariant2)
+ 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
 
-Already on 'main'
-HEAD is now at 0ddfaf1 A
-[main 59b5b5a] add-foo2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 20d4afa] add-bar2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 1fe7e14] change-foo2
+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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
Rewrite 59b5b5af49738cc3e3cc6618c173c3d768334f67 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fe7e1483a7337eb5fecbd426d19506d3422d75d (2/2) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/moved-foo2' is unchanged
-Ref 'refs/heads/moved-bar2' was rewritten
-Ref 'refs/heads/main' was rewritten
-ok 39 - automatic remapping to ancestor with filename filters
-
-expecting success of 7003.40 'setup submodule': 
-	rm -fr ?* .git &&
-	git init &&
-	test_commit file &&
-	mkdir submod &&
-	submodurl="$PWD/submod" &&
-	( cd submod &&
-	  git init &&
-	  test_commit file-in-submod ) &&
-	git submodule add "$submodurl" &&
-	git commit -m "added submodule" &&
-	test_commit add-file &&
-	( cd submod && test_commit add-in-submodule ) &&
-	git add submod &&
-	git commit -m "changed submodule" &&
-	git branch original HEAD
+ 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/.git/
-[main (root-commit) cc5d755] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/submod/.git/
-[main (root-commit) bd0b946] file-in-submod
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-in-submod.t
-Adding existing repo at 'submod' to the index
-[main 3d58487] added submodule
+ 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 submod
-[main 4f94460] add-file
+ 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-file.t
-[main bf0f869] add-in-submodule
+ 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-in-submodule.t
-[main 54b66e3] changed submodule
+ 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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 40 - setup submodule
+ 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 7003.41 'rewrite submodule with another content': 
-	git filter-branch --tree-filter "test -d submod && {
-					 rm -rf submod &&
-					 git rm -rf --quiet submod &&
-					 mkdir submod &&
-					 : > submod/file
-					 } || :" HEAD &&
-	test $orig_head != $(git show-ref --hash --head HEAD)
+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
 
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d58487dc2bc74efe95846c05e329af261baa409 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 4f94460a4c513ed158d2dc144eedb202083e2d26 (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 54b66e3651cbef75b54f247c0009cc1c5138bd21 (4/4) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-warning: unable to rmdir 'submod': Directory not empty
-ok 41 - rewrite submodule with another content
+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 7003.42 'replace submodule revision': 
-	invalid=$(test_oid numeric) &&
-	git reset --hard original &&
-	git filter-branch -f --tree-filter \
-	    "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
-	     then git update-index --cacheinfo 160000 $invalid submod
-	     fi" HEAD &&
-	test $orig_head != $(git show-ref --hash --head HEAD)
+expecting success of 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
 
-HEAD is now at 54b66e3 changed submodule
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d58487dc2bc74efe95846c05e329af261baa409 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 4f94460a4c513ed158d2dc144eedb202083e2d26 (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 54b66e3651cbef75b54f247c0009cc1c5138bd21 (4/4) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 42 - replace submodule revision
+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 7003.43 'filter commit message without trailing newline': 
-	git reset --hard original &&
-	commit=$(printf "no newline" | git commit-tree HEAD^{tree}) &&
-	git update-ref refs/heads/no-newline $commit &&
-	git filter-branch -f refs/heads/no-newline &&
-	echo $commit >expect &&
-	git rev-parse refs/heads/no-newline >actual &&
-	test_cmp expect actual
+expecting success of 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
 
-HEAD is now at 54b66e3 changed submodule
-
Rewrite 3ebdf9829a386ecf4d79fcf1f3f9a9a47e0c1ff2 (1/1) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/no-newline' is unchanged
-ok 43 - filter commit message without trailing newline
+expecting success of 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 7003.44 'tree-filter deals with object name vs pathname ambiguity': 
-	test_when_finished "git reset --hard original" &&
-	ambiguous=$(git rev-list -1 HEAD) &&
-	git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
-	git show HEAD:$ambiguous
+expecting success of 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
 
-
Rewrite 54b66e3651cbef75b54f247c0009cc1c5138bd21 (1/1) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-file
-HEAD is now at 54b66e3 changed submodule
-ok 44 - tree-filter deals with object name vs pathname ambiguity
+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 7003.45 'rewrite repository including refs that point at non-commit object': 
-	test_when_finished "git reset --hard original" &&
-	tree=$(git rev-parse HEAD^{tree}) &&
-	test_when_finished "git replace -d $tree" &&
-	echo A >new &&
-	git add new &&
-	new_tree=$(git write-tree) &&
-	git replace $tree $new_tree &&
-	git tag -a -m "tag to a tree" treetag $new_tree &&
-	git reset --hard HEAD &&
-	git filter-branch -f -- --all >filter-output 2>&1 &&
-	! grep fatal filter-output
+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
 
-HEAD is now at 54b66e3 changed submodule
-Deleted replace ref '4734e3b76b75923e0a764f6997d823ee9bcf3799'
-HEAD is now at 54b66e3 changed submodule
-ok 45 - rewrite repository including refs that point at non-commit object
+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 7003.46 'filter-branch handles ref deletion': 
-	git switch --orphan empty-commit &&
-	git commit --allow-empty -m "empty commit" &&
-	git tag empty &&
-	git branch to-delete &&
-	git filter-branch -f --prune-empty to-delete >out 2>&1 &&
-	grep "to-delete.*was deleted" out &&
-	test_must_fail git rev-parse --verify to-delete
+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
 
-warning: unable to rmdir 'submod': Directory not empty
-Switched to a new branch 'empty-commit'
-[empty-commit (root-commit) dfb35d9] empty 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
+	
+[master 2f750a4] sub added
  Author: A U Thor <author@example.com>
-Ref 'refs/heads/to-delete' was deleted
-fatal: Needed a single revision
-ok 46 - filter-branch handles ref deletion
+ 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 7003.47 'filter-branch handles ref rewrite': 
-	git checkout empty &&
-	test_commit to-drop &&
-	git branch rewrite &&
-	git filter-branch -f \
-		--index-filter "git rm --ignore-unmatch --cached to-drop.t" \
-		 rewrite >out 2>&1 &&
-	grep "rewrite.*was rewritten" out &&
-	! grep -i warning out &&
-	git diff-tree empty rewrite
+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
 
-Note: switching to 'empty'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at dfb35d9 empty commit
-[detached HEAD 01ece84] to-drop
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-drop.t
-Ref 'refs/heads/rewrite' was rewritten
-ok 47 - filter-branch handles ref rewrite
+ 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 7003.48 'filter-branch handles ancestor rewrite': 
-	test_commit to-exclude &&
-	git branch ancestor &&
-	git filter-branch -f ancestor -- :^to-exclude.t >out 2>&1 &&
-	grep "ancestor.*was rewritten" out &&
-	! grep -i warning out &&
-	git diff-tree HEAD^ ancestor
+expecting success of 7507.45 'status ignores commit.verbose=true': 
+	git -c commit.verbose=true status >actual &&
+	! grep "^diff --git actual"
 
-[detached HEAD 07a3627] to-exclude
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-exclude.t
-Ref 'refs/heads/ancestor' was rewritten
-ok 48 - filter-branch handles ancestor rewrite
+ok 45 - status ignores commit.verbose=true
 
-# passed all 48 test(s)
-1..48
+# passed all 45 test(s)
+1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7514-commit-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7514-commit-patch/.git/
-expecting success of 7514.1 'setup (initial)': 
-	echo line1 >file &&
-	git add file &&
-	git commit -m commit1
+*** t7515-status-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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) 8d800e1] commit1
+[master (root-commit) 1048606] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup (initial)
+ 2 files changed, 2 insertions(+)
+ create mode 100644 dir/file1
+ create mode 100644 dir/file2
+ok 1 - setup
 
-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
+checking prerequisite: SYMLINKS
 
-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"
+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 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
+)
+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
 
-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
+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>
- 1 file changed, 1 insertion(+)
-ok 3 - edit hunk "commit --dry-run -p -m message"
+ 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
@@ -476449,72 +477810,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7515-status-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7506-status-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7506-status-submodule/.git/
 expecting success of 7506.1 'setup': 
@@ -477076,1422 +478371,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7502-commit-porcelain.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7502-commit-porcelain/.git/
-expecting success of 7502.1 'output summary format': 
-
-	echo new >file1 &&
-	git add file1 &&
-	check_summary_oneline "root-commit" "initial" &&
-
-	echo change >>file1 &&
-	git add file1
-
-ok 1 - output summary format
-
-expecting success of 7502.2 'output summary format: root-commit': 
-	check_summary_oneline "" "a change"
-
-ok 2 - output summary format: root-commit
-
-expecting success of 7502.3 'output summary format for commit with an empty diff': 
-
-	check_summary_oneline "" "empty" "--allow-empty"
-
-ok 3 - output summary format for commit with an empty diff
-
-expecting success of 7502.4 'output summary format for merges': 
-
-	git checkout -b recursive-base &&
-	test_commit base file1 &&
-
-	git checkout -b recursive-a recursive-base &&
-	test_commit commit-a file1 &&
-
-	git checkout -b recursive-b recursive-base &&
-	test_commit commit-b file1 &&
-
-	# conflict
-	git checkout recursive-a &&
-	test_must_fail git merge recursive-b &&
-	# resolve the conflict
-	echo commit-a >file1 &&
-	git add file1 &&
-	check_summary_oneline "" "Merge"
-
-Switched to a new branch 'recursive-base'
-[recursive-base e6f945f] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-Switched to a new branch 'recursive-a'
-[recursive-a 9300328] commit-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'recursive-b'
-[recursive-b 2f9e083] commit-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'recursive-a'
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - output summary format for merges
-
-expecting success of 7502.5 'the basics': 
-
-	output_tests_cleanup &&
-
-	echo doing partial >"commit is" &&
-	mkdir not &&
-	echo very much encouraged but we should >not/forbid &&
-	git add "commit is" not &&
-	echo update added "commit is" file >"commit is" &&
-	echo also update another >not/forbid &&
-	test_tick &&
-	git commit -a -m "initial with -a" &&
-
-	git cat-file blob HEAD:"commit is" >current.1 &&
-	git cat-file blob HEAD:not/forbid >current.2 &&
-
-	cmp current.1 "commit is" &&
-	cmp current.2 not/forbid
-
-
-Switched to branch 'main'
-rm 'file1'
-[main 34ca441] cleanup
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 file1
-[main 8a2203d] initial with -a
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 commit is
- create mode 100644 not/forbid
-ok 5 - the basics
-
-expecting success of 7502.6 'partial': 
-
-	echo another >"commit is" &&
-	echo another >not/forbid &&
-	test_tick &&
-	git commit -m "partial commit to handle a file" "commit is" &&
-
-	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
-	test "$changed" = "commit is"
-
-
-[main 3302250] partial commit to handle a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - partial
-
-expecting success of 7502.7 'partial modification in a subdirectory': 
-
-	test_tick &&
-	git commit -m "partial commit to subdirectory" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid"
-
-
-[main 742b3a6] partial commit to subdirectory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - partial modification in a subdirectory
-
-expecting success of 7502.8 'partial removal': 
-
-	git rm not/forbid &&
-	git commit -m "partial commit to remove not/forbid" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid" &&
-	remain=$(git ls-tree -r --name-only HEAD) &&
-	test "$remain" = "commit is"
-
-
-rm 'not/forbid'
-[main 09fd303] partial commit to remove not/forbid
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 not/forbid
-ok 8 - partial removal
-
-expecting success of 7502.9 'sign off': 
-
-	>positive &&
-	git add positive &&
-	git commit -s -m "thank you" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -ne "s/Signed-off-by: //p" commit.msg >actual &&
-	git var GIT_COMMITTER_IDENT >ident &&
-	sed -e "s/>.*/>/" ident >expected &&
-	test_cmp expected actual
-
-
-[main cc1232b] thank you
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 positive
-ok 9 - sign off
-
-expecting success of 7502.10 'commit --trailer with "="': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main c563787] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 10 - commit --trailer with "="
-
-expecting success of 7502.11 'commit --trailer with -c and "replace" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C3 E3
-	EOF
-	git -c trailer.ifexists="replace" \
-		commit --trailer "Mentored-by: C4 E4" \
-		 --trailer "Helped-by: C3 E3" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 9c665b9] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 743970c] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 11 - commit --trailer with -c and "replace" as ifexists
-
-expecting success of 7502.12 'commit --trailer with -c and "add" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.ifexists="add" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C4 E4" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main c0ed76d] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3065ecb] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 12 - commit --trailer with -c and "add" as ifexists
-
-expecting success of 7502.13 'commit --trailer with -c and "donothing" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reviewed-by: C6 E6
-	EOF
-	git -c trailer.ifexists="donothing" \
-		commit --trailer "Mentored-by: C5 E5" \
-		--trailer "Reviewed-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 2dad5db] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 86cc013] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 13 - commit --trailer with -c and "donothing" as ifexists
-
-expecting success of 7502.14 'commit --trailer with -c and "addIfDifferent" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Mentored-by: C5 E5
-	EOF
-	git -c trailer.ifexists="addIfDifferent" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C5 E5" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main bacbe07] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 9b53fef] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 14 - commit --trailer with -c and "addIfDifferent" as ifexists
-
-expecting success of 7502.15 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	EOF
-	git -c trailer.ifexists="addIfDifferentNeighbor" \
-		commit --trailer "Mentored-by: C4 E4" \
-		--trailer "Reported-by: C3 E3" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 5b19760] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main ea6f7b2] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 15 - commit --trailer with -c and "addIfDifferentNeighbor" as ifexists
-
-expecting success of 7502.16 'commit --trailer with -c and "end" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="end" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C4 E4" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 6edd712] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main abac1a7] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 16 - commit --trailer with -c and "end" as where
-
-expecting success of 7502.17 'commit --trailer with -c and "start" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C1 E1
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="start" \
-		commit --trailer "Signed-off-by: C O Mitter <committer@example.com>" \
-		--trailer "Signed-off-by: C1 E1" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 49719a0] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3210bcd] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 17 - commit --trailer with -c and "start" as where
-
-expecting success of 7502.18 'commit --trailer with -c and "after" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Mentored-by: C5 E5
-	EOF
-	git -c trailer.where="after" \
-		commit --trailer "Mentored-by: C4 E4" \
-		--trailer "Mentored-by: C5 E5" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 3a4a38a] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 30c3647] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 18 - commit --trailer with -c and "after" as where
-
-expecting success of 7502.19 'commit --trailer with -c and "before" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C2 E2
-	Mentored-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="before" \
-		commit --trailer "Mentored-by: C3 E3" \
-		--trailer "Mentored-by: C2 E2" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main e5407b4] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 2e57a8f] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 19 - commit --trailer with -c and "before" as where
-
-expecting success of 7502.20 'commit --trailer with -c and "donothing" as ifmissing': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C5 E5
-	EOF
-	git -c trailer.ifmissing="donothing" \
-		commit --trailer "Helped-by: C5 E5" \
-		--trailer "Based-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 4b3be69] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main e71943e] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 20 - commit --trailer with -c and "donothing" as ifmissing
-
-expecting success of 7502.21 'commit --trailer with -c and "add" as ifmissing': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C5 E5
-	Based-by: C6 E6
-	EOF
-	git -c trailer.ifmissing="add" \
-		commit --trailer "Helped-by: C5 E5" \
-		--trailer "Based-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 8576769] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3741b21] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 21 - commit --trailer with -c and "add" as ifmissing
-
-expecting success of 7502.22 'commit --trailer with -c ack.key ': 
-	echo "fun" >>file1 &&
-	git add file1 &&
-	cat >expected <<-\EOF &&
-		hello
-
-		Acked-by: Peff
-	EOF
-	git -c trailer.ack.key="Acked-by" \
-		commit --trailer "ack = Peff" -m "hello" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 5789976] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 22 - commit --trailer with -c ack.key 
-
-expecting success of 7502.23 'commit --trailer with -c and ":=#" as separators': 
-	echo "fun" >>file1 &&
-	git add file1 &&
-	cat >expected <<-\EOF &&
-		I hate bug
-
-		Bug #42
-	EOF
-	git -c trailer.separators=":=#" \
-		-c trailer.bug.key="Bug #" \
-		commit --trailer "bug = 42" -m "I hate bug" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 6e78fd4] I hate bug
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 23 - commit --trailer with -c and ":=#" as separators
-
-expecting success of 7502.24 'commit --trailer with -c and command': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Mentored-by: C4 E4
-	Reported-by: A U Thor <author@example.com>
-	EOF
-	git -c trailer.report.key="Reported-by: " \
-		-c trailer.report.ifexists="replace" \
-		-c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \
-		git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \
-		commit --trailer "report = author" --amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 6b1e5e9] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 336e96f] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 24 - commit --trailer with -c and command
-
-expecting success of 7502.25 'commit --trailer not confused by --- separator': 
-	cat >msg <<-\EOF &&
-	subject
-
-	body with dashes
-	---
-	in it
-	EOF
-	git commit --allow-empty --trailer="my-trailer: value" -F msg &&
-	{
-		cat msg &&
-		echo &&
-		echo "my-trailer: value"
-	} >expected &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 244a002] subject
- Author: A U Thor <author@example.com>
-ok 25 - commit --trailer not confused by --- separator
-
-expecting success of 7502.26 'commit --trailer with --verbose': 
-	cat >msg <<-\EOF &&
-	subject
-
-	body
-	EOF
-	GIT_EDITOR=: git commit --edit -F msg --allow-empty \
-		--trailer="my-trailer: value" --verbose &&
-	{
-		cat msg &&
-		echo &&
-		echo "my-trailer: value"
-	} >expected &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 64da097] subject
- Author: A U Thor <author@example.com>
-ok 26 - commit --trailer with --verbose
-
-expecting success of 7502.27 'multiple -m': 
-
-	>negative &&
-	git add negative &&
-	git commit -m "one" -m "two" -m "three" &&
-	actual=$(git cat-file commit HEAD >tmp && sed -e "1,/^\$/d" tmp && rm tmp) &&
-	expected=$(test_write_lines "one" "" "two" "" "three") &&
-	test "z$actual" = "z$expected"
-
-
-[main a7c1b01] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 negative
-ok 27 - multiple -m
-
-expecting success of 7502.28 'verbose': 
-
-	echo minus >negative &&
-	git add negative &&
-	git status -v >raw &&
-	sed -ne "/^diff --git /p" raw >actual &&
-	echo "diff --git a/negative b/negative" >expect &&
-	test_cmp expect actual
-
-
-ok 28 - verbose
-
-expecting success of 7502.29 'verbose respects diff config': 
-
-	test_config diff.noprefix true &&
-	git status -v >actual &&
-	grep "diff --git negative negative" actual
-
-diff --git negative negative
-ok 29 - verbose respects diff config
-
-expecting success of 7502.30 'prepare file with comment line and trailing newlines': 
-	printf "%s" "$mesg_with_comment_and_newlines" >expect
-
-ok 30 - prepare file with comment line and trailing newlines
-
-expecting success of 7502.31 'cleanup commit messages (verbatim option,-t)': 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim --no-status -t expect -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 8914337] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 31 - cleanup commit messages (verbatim option,-t)
-
-expecting success of 7502.32 'cleanup commit messages (verbatim option,-F)': 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim -F expect -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 50317d6] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 32 - cleanup commit messages (verbatim option,-F)
-
-expecting success of 7502.33 'cleanup commit messages (verbatim option,-m)': 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 3ead1ca] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 33 - cleanup commit messages (verbatim option,-m)
-
-expecting success of 7502.34 'cleanup commit messages (whitespace option,-F)': 
-
-	echo >>negative &&
-	test_write_lines "" "# text" "" >text &&
-	echo "# text" >expect &&
-	git commit --cleanup=whitespace -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 77206d3] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 34 - cleanup commit messages (whitespace option,-F)
-
-expecting success of 7502.35 'cleanup commit messages (scissors option,-F,-e)': 
-
-	echo >>negative &&
-	cat >text <<-\EOF &&
-
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	# ------------------------ >8 ------------------------
-	to be removed
-	# ------------------------ >8 ------------------------
-	to be removed, too
-	EOF
-
-	cat >expect <<-\EOF &&
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	EOF
-	git commit --cleanup=scissors -e -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-[main e047c4e] # to be kept
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 35 - cleanup commit messages (scissors option,-F,-e)
-
-expecting success of 7502.36 'cleanup commit messages (scissors option,-F,-e, scissors on first line)': 
-
-	echo >>negative &&
-	cat >text <<-\EOF &&
-	# ------------------------ >8 ------------------------
-	to be removed
-	EOF
-	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_must_be_empty actual
-
-[main 5e5571b] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 36 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
-
-expecting success of 7502.37 'cleanup commit messages (strip option,-F)': 
-
-	echo >>negative &&
-	test_write_lines "" "# text" "sample" "" >text &&
-	echo sample >expect &&
-	git commit --cleanup=strip -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 5968d26] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 37 - cleanup commit messages (strip option,-F)
-
-expecting success of 7502.38 'cleanup commit messages (strip option,-F,-e)': 
-
-	echo >>negative &&
-	test_write_lines "" "sample" "" >text &&
-	git commit -e -F text -a &&
-	head -n 4 .git/COMMIT_EDITMSG >actual
-
-[main 6ab3315] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 38 - cleanup commit messages (strip option,-F,-e)
-
-expecting success of 7502.39 'cleanup commit messages (strip option,-F,-e): output': 
-	test_cmp expect actual
-
-ok 39 - cleanup commit messages (strip option,-F,-e): output
-
-expecting success of 7502.40 'cleanup commit message (fail on invalid cleanup mode option)': 
-	test_must_fail git commit --cleanup=non-existent
-
-fatal: Invalid cleanup mode non-existent
-ok 40 - cleanup commit message (fail on invalid cleanup mode option)
-
-expecting success of 7502.41 'cleanup commit message (fail on invalid cleanup mode configuration)': 
-	test_must_fail git -c commit.cleanup=non-existent commit
-
-fatal: Invalid cleanup mode non-existent
-ok 41 - cleanup commit message (fail on invalid cleanup mode configuration)
-
-expecting success of 7502.42 'cleanup commit message (no config and no option uses default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --no-status
-	) &&
-	commit_msg_is "commit message"
-
-[main 06a0f0b] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 42 - cleanup commit message (no config and no option uses default)
-
-expecting success of 7502.43 'cleanup commit message (option overrides default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --cleanup=whitespace --no-status
-	) &&
-	commit_msg_is "commit message # comment"
-
-[main 8348171] commit message # comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 43 - cleanup commit message (option overrides default)
-
-expecting success of 7502.44 'cleanup commit message (config overrides default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --no-status
-	) &&
-	commit_msg_is "commit message # comment"
-
-[main c4a33b1] commit message # comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 44 - cleanup commit message (config overrides default)
-
-expecting success of 7502.45 'cleanup commit message (option overrides config)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --cleanup=default
-	) &&
-	commit_msg_is "commit message"
-
-[main 7b9798a] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 45 - cleanup commit message (option overrides config)
-
-expecting success of 7502.46 'cleanup commit message (default, -m)': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[main f675c53] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 46 - cleanup commit message (default, -m)
-
-expecting success of 7502.47 'cleanup commit message (whitespace option, -m)': 
-	echo content >>file &&
-	git add file &&
-	git commit --cleanup=whitespace --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[main 8e56e6c] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 47 - cleanup commit message (whitespace option, -m)
-
-expecting success of 7502.48 'cleanup commit message (whitespace config, -m)': 
-	echo content >>file &&
-	git add file &&
-	git -c commit.cleanup=whitespace commit --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[main 7207f92] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 48 - cleanup commit message (whitespace config, -m)
-
-expecting success of 7502.49 'message shows author when it is not equal to committer': 
-	echo >>negative &&
-	git commit -e -m "sample" -a &&
-	test_grep \
-	  "^# Author: *A U Thor <author@example.com>\$" \
-	  .git/COMMIT_EDITMSG
-
-[main 96a295c] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Author:    A U Thor <author@example.com>
-ok 49 - message shows author when it is not equal to committer
-
-expecting success of 7502.50 'message shows date when it is explicitly set': 
-	git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
-	test_grep \
-	  "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
-	  .git/COMMIT_EDITMSG
-
-[main 1d86a4b] foo
- Author: A U Thor <author@example.com>
- Date: Sat Jan 2 03:04:05 2010 +0000
-# Date:      Sat Jan 2 03:04:05 2010 +0000
-ok 50 - message shows date when it is explicitly set
-
-expecting success of 7502.51 'message does not have multiple scissors lines': 
-	git commit --cleanup=scissors -v --allow-empty -e -m foo &&
-	test $(grep -c -e "--- >8 ---" .git/COMMIT_EDITMSG) -eq 1
-
-[main 215259a] foo
- Author: A U Thor <author@example.com>
-ok 51 - message does not have multiple scissors lines
-
-checking prerequisite: AUTOIDENT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
-	sane_unset GIT_AUTHOR_NAME &&
-	sane_unset GIT_AUTHOR_EMAIL &&
-	git var GIT_AUTHOR_IDENT
-
-)
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink04-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 52 # skip message shows committer when it is automatic (missing AUTOIDENT)
-
-checking prerequisite: FAIL_PREREQS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-		test_bool_env GIT_TEST_FAIL_PREREQS false
-	
-)
-prerequisite FAIL_PREREQS not satisfied
-expecting success of 7502.53 'do not fire editor when committer is bogus': 
-	>.git/result &&
-
-	echo >>negative &&
-	(
-		sane_unset GIT_COMMITTER_EMAIL &&
-		sane_unset GIT_COMMITTER_NAME &&
-		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit -e -m sample -a
-	) &&
-	test_must_be_empty .git/result
-
-Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink04-arm64.debian.net>) not allowed
-ok 53 - do not fire editor when committer is bogus
-
-expecting success of 7502.54 'do not fire editor if -m <msg> was given': 
-	echo tick >file &&
-	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
-	test "$(cat .git/result)" = "editor not started"
-
-[main d97654e] tick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 20 deletions(-)
-ok 54 - do not fire editor if -m <msg> was given
-
-expecting success of 7502.55 'do not fire editor if -m "" was given': 
-	echo tock >file &&
-	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \
-	 git commit -m "" --allow-empty-message) &&
-	test "$(cat .git/result)" = "editor not started"
-
-[main 84f6bcc] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 55 - do not fire editor if -m "" was given
-
-expecting success of 7502.56 'do not fire editor in the presence of conflicts': 
-
-	git clean -f &&
-	echo f >g &&
-	git add g &&
-	git commit -m "add g" &&
-	git branch second &&
-	echo main >g &&
-	echo g >h &&
-	git add g h &&
-	git commit -m "modify g and add h" &&
-	git checkout second &&
-	echo second >g &&
-	git add g &&
-	git commit -m second &&
-	# Must fail due to conflict
-	test_must_fail git cherry-pick -n main &&
-	echo "editor not started" >.git/result &&
-	(
-		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit
-	) &&
-	test "$(cat .git/result)" = "editor not started"
-
-Removing act
-Removing actual
-Removing commit.msg
-Removing commit_msg_is.actual
-Removing commit_msg_is.expect
-Removing current.1
-Removing current.2
-Removing exp
-Removing expect
-Removing expected
-Removing ident
-Removing msg
-Removing raw
-Removing text
-[main 133e0fd] add g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g
-[main 6488bdd] modify g and add h
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 h
-Switched to branch 'second'
-M	negative
-[second 42e48b3] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging g
-CONFLICT (content): Merge conflict in g
-error: could not apply 6488bdd... modify g and add h
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: Disable this message with "git config set advice.mergeConflict false"
-error: Committing is not possible because you have unmerged files.
-hint: Fix them up in the work tree, and then use 'git add/rm <file>'
-hint: as appropriate to mark resolution and make a commit.
-fatal: Exiting because of an unresolved conflict.
-U	g
-ok 56 - do not fire editor in the presence of conflicts
-
-expecting success of 7502.57 'a SIGTERM should break locks': 
-	echo >>negative &&
-	! "$SHELL_PATH" -c '
-	  echo kill -TERM $$ >>.git/FAKE_EDITOR
-	  GIT_EDITOR=.git/FAKE_EDITOR
-	  export GIT_EDITOR
-	  exec git commit -a' &&
-	test ! -f .git/index.lock
-
-Terminated
-ok 57 - a SIGTERM should break locks
-
-expecting success of 7502.58 'Hand committing of a redundant merge removes dups': 
-
-	git rev-parse second main >expect &&
-	test_must_fail git merge second main &&
-	git checkout main g &&
-	EDITOR=: git commit -a &&
-	git cat-file commit HEAD >raw &&
-	sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
-	test_cmp expect actual
-
-
-Auto-merging g
-CONFLICT (content): Merge conflict in g
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 890ab14
-[second 287266c] Merge branch 'main' into second
- Author: A U Thor <author@example.com>
-ok 58 - Hand committing of a redundant merge removes dups
-
-expecting success of 7502.59 'A single-liner subject with a token plus colon is not a footer': 
-
-	git reset --hard &&
-	git commit -s -m "hello: kitty" --allow-empty &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_line_count = 3 actual
-
-
-HEAD is now at 287266c Merge branch 'main' into second
-[second 8c7277e] hello: kitty
- Author: A U Thor <author@example.com>
-ok 59 - A single-liner subject with a token plus colon is not a footer
-
-expecting success of 7502.60 'commit -s places sob on third line after two empty lines': 
-	git commit -s --allow-empty --allow-empty-message &&
-	cat <<-EOF >expect &&
-
-
-	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-
-	EOF
-	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
-	test_cmp expect actual
-
-[second 56e2ef7] Signed-off-by: C O Mitter <committer@example.com>
- Author: A U Thor <author@example.com>
-ok 60 - commit -s places sob on third line after two empty lines
-
-expecting success of 7502.61 'commit': 
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 56e2ef7 Signed-off-by: C O Mitter <committer@example.com>
-[second 7d4c5ba] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 61 - commit
-
-expecting success of 7502.62 'commit --status': 
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 7d4c5ba message
-[second 24b9005] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 62 - commit --status
-
-expecting success of 7502.63 'commit --no-status': 
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 24b9005 message
-[second 6f35a31] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 63 - commit --no-status
-
-expecting success of 7502.64 'commit with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 6f35a31 message
-[second fb0e1b7] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 64 - commit with commit.status = yes
-
-expecting success of 7502.65 'commit with commit.status = no': 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at fb0e1b7 message
-[second 19f43d6] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 65 - commit with commit.status = no
-
-expecting success of 7502.66 'commit --status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 19f43d6 message
-[second a6956b4] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 66 - commit --status with commit.status = yes
-
-expecting success of 7502.67 'commit --no-status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at a6956b4 message
-[second 3388dc5] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 67 - commit --no-status with commit.status = yes
-
-expecting success of 7502.68 'commit --status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 3388dc5 message
-[second 517e0b4] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 68 - commit --status with commit.status = no
-
-expecting success of 7502.69 'commit --no-status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 517e0b4 message
-[second 2ee1433] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 69 - commit --no-status with commit.status = no
-
-expecting success of 7502.70 'commit': 
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 2ee1433 message
-[second 2e8ac9b] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 70 - commit
-
-expecting success of 7502.71 'commit --status': 
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 2e8ac9b message
-[second baeb21a] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 71 - commit --status
-
-expecting success of 7502.72 'commit --no-status': 
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at baeb21a message
-[second c2fe270] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 72 - commit --no-status
-
-expecting success of 7502.73 'commit with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at c2fe270 message
-[second 34e9ff1] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 73 - commit with commit.status = yes
-
-expecting success of 7502.74 'commit with commit.status = no': 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 34e9ff1 message
-[second 76b6c0d] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 74 - commit with commit.status = no
-
-expecting success of 7502.75 'commit --status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 76b6c0d message
-[second f761932] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 75 - commit --status with commit.status = yes
-
-expecting success of 7502.76 'commit --no-status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at f761932 message
-[second 69efec9] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 76 - commit --no-status with commit.status = yes
-
-expecting success of 7502.77 'commit --status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 69efec9 message
-[second 8d9fa13] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 77 - commit --status with commit.status = no
-
-expecting success of 7502.78 'commit --no-status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 8d9fa13 message
-[second 32b4909] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 78 - commit --no-status with commit.status = no
-
-expecting success of 7502.79 'commit --status with custom comment character': 
-	test_config core.commentchar ";" &&
-	try_commit --status &&
-	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
-
-HEAD is now at 32b4909 message
-[second 8e6fd00] message ## Custom template
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-; Changes to be committed:
-ok 79 - commit --status with custom comment character
-
-expecting success of 7502.80 'switch core.commentchar': 
-	test_commit "#foo" foo &&
-	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
-	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
-
-[second 0f719bb] #foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[second e03ca23] message #foo
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-; Changes to be committed:
-ok 80 - switch core.commentchar
-
-expecting success of 7502.81 'switch core.commentchar but out of options': 
-	cat >text <<\EOF &&
-# 1
-; 2
-@ 3
-! 4
-$ 5
-% 6
-^ 7
-& 8
-| 9
-: 10
-EOF
-	git commit --amend -F text &&
-	(
-		test_set_editor .git/FAKE_EDITOR &&
-		test_must_fail git -c core.commentChar=auto commit --amend
-	)
-
-[second cbf85e8] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: unable to select a comment character that is not used
-in the current commit message
-ok 81 - switch core.commentchar but out of options
-
-# passed all 81 test(s)
-1..81
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7518-ident-corner-cases.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7518-ident-corner-cases/.git/
 expecting success of 7518.1 'empty name and missing email': 
@@ -478643,6 +478522,260 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7517-per-repo-email.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7517-per-repo-email/.git/
+expecting success of 7517.1 'setup a likely user.useConfigOnly use case': 
+	# we want to make sure a reflog is written, since that needs
+	# a non-strict ident. So be sure we have an actual commit.
+	test_commit foo &&
+
+	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
+	git config user.name "test" &&
+	git config --global user.useConfigOnly true
+
+[main (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - setup a likely user.useConfigOnly use case
+
+expecting success of 7517.2 'fails committing if clone email is not set': 
+	test_must_fail git commit --allow-empty -m msg
+
+Author identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 2 - fails committing if clone email is not set
+
+expecting success of 7517.3 'fails committing if clone email is not set, but EMAIL set': 
+	test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg
+
+Author identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 3 - fails committing if clone email is not set, but EMAIL set
+
+expecting success of 7517.4 'succeeds committing if clone email is set': 
+	test_config user.email "test@ok.com" &&
+	git commit --allow-empty -m msg
+
+[main f3d9b79] msg
+ok 4 - succeeds committing if clone email is set
+
+expecting success of 7517.5 'succeeds cloning if global email is not set': 
+	git clone . clone
+
+Cloning into 'clone'...
+done.
+ok 5 - succeeds cloning if global email is not set
+
+expecting success of 7517.6 'set up rebase scenarios': 
+	# temporarily enable an actual ident for this setup
+	test_config user.email foo@example.com &&
+	test_commit new &&
+	git branch side-without-commit HEAD^ &&
+	git checkout -b side-with-commit HEAD^ &&
+	test_commit side
+
+[main a31892e] new
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Switched to a new branch 'side-with-commit'
+[side-with-commit 1946d3f] side
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side.t
+ok 6 - set up rebase scenarios
+
+expecting success of 7517.7 'fast-forward rebase does not care about ident': 
+	git checkout -B tmp side-without-commit &&
+	git rebase main
+
+Switched to a new branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 7 - fast-forward rebase does not care about ident
+
+expecting success of 7517.8 'non-fast-forward rebase refuses to write commits': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -B tmp side-with-commit &&
+	test_must_fail git rebase main
+
+Reset branch 'tmp'
+Rebasing (1/1)
Committer identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 8 - non-fast-forward rebase refuses to write commits
+
+expecting success of 7517.9 'fast-forward rebase does not care about ident (interactive)': 
+	git checkout -B tmp side-without-commit &&
+	git rebase -i main
+
+Reset branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 9 - fast-forward rebase does not care about ident (interactive)
+
+expecting success of 7517.10 'non-fast-forward rebase refuses to write commits (interactive)': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -B tmp side-with-commit &&
+	test_must_fail git rebase -i main
+
+Reset branch 'tmp'
+Rebasing (1/1)
Committer identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 10 - non-fast-forward rebase refuses to write commits (interactive)
+
+expecting success of 7517.11 'noop interactive rebase does not care about ident': 
+	git checkout -B tmp side-with-commit &&
+	git rebase -i HEAD^
+
+Reset branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 11 - noop interactive rebase does not care about ident
+
+expecting success of 7517.12 'author.name overrides user.name': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config author.name author &&
+	test_commit author-name-override-user &&
+	echo author user@example.com > expected-author &&
+	echo user user@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp 52999d1] author-name-override-user
+ Author: author <user@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 author-name-override-user.t
+ok 12 - author.name overrides user.name
+
+expecting success of 7517.13 'author.email overrides user.email': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config author.email author@example.com &&
+	test_commit author-email-override-user &&
+	echo user author@example.com > expected-author &&
+	echo user user@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp e6f53d6] author-email-override-user
+ Author: user <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 author-email-override-user.t
+ok 13 - author.email overrides user.email
+
+expecting success of 7517.14 'committer.name overrides user.name': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config committer.name committer &&
+	test_commit committer-name-override-user &&
+	echo user user@example.com > expected-author &&
+	echo committer user@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp bdc357a] committer-name-override-user
+ Author: user <user@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 committer-name-override-user.t
+ok 14 - committer.name overrides user.name
+
+expecting success of 7517.15 'committer.email overrides user.email': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config committer.email committer@example.com &&
+	test_commit committer-email-override-user &&
+	echo user user@example.com > expected-author &&
+	echo user committer@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp de2310d] committer-email-override-user
+ Author: user <user@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 committer-email-override-user.t
+ok 15 - committer.email overrides user.email
+
+expecting success of 7517.16 'author and committer environment variables override config settings': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config author.name author &&
+	test_config author.email author@example.com &&
+	test_config committer.name committer &&
+	test_config committer.email committer@example.com &&
+	GIT_AUTHOR_NAME=env_author && export GIT_AUTHOR_NAME &&
+	GIT_AUTHOR_EMAIL=env_author@example.com && export GIT_AUTHOR_EMAIL &&
+	GIT_COMMITTER_NAME=env_commit && export GIT_COMMITTER_NAME &&
+	GIT_COMMITTER_EMAIL=env_commit@example.com && export GIT_COMMITTER_EMAIL &&
+	test_commit env-override-conf &&
+	echo env_author env_author@example.com > expected-author &&
+	echo env_commit env_commit@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp 9b4fdf4] env-override-conf
+ Author: env_author <env_author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 env-override-conf.t
+ok 16 - author and committer environment variables override config settings
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7521-ignored-mode.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7521-ignored-mode/.git/
 expecting success of 7521.1 'setup initial commit and ignore file': 
@@ -478997,379 +479130,125 @@
 	new file:   renamed
 ok 3 - status --no-renames
 
-expecting success of 7525.4 'status.renames inherits from diff.renames false': 
-	git -c diff.renames=false status >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 4 - status.renames inherits from diff.renames false
-
-expecting success of 7525.5 'status.renames inherits from diff.renames true': 
-	git -c diff.renames=true status >actual &&
-	test_grep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 5 - status.renames inherits from diff.renames true
-
-expecting success of 7525.6 'status.renames overrides diff.renames false': 
-	git -c diff.renames=true -c status.renames=false status >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 6 - status.renames overrides diff.renames false
-
-expecting success of 7525.7 'status.renames overrides from diff.renames true': 
-	git -c diff.renames=false -c status.renames=true status >actual &&
-	test_grep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 7 - status.renames overrides from diff.renames true
-
-expecting success of 7525.8 'status status.renames=false': 
-	git -c status.renames=false status >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 8 - status status.renames=false
-
-expecting success of 7525.9 'status status.renames=true': 
-	git -c status.renames=true status >actual &&
-	test_grep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 9 - status status.renames=true
-
-expecting success of 7525.10 'commit honors status.renames=false': 
-	git -c status.renames=false commit --dry-run >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 10 - commit honors status.renames=false
-
-expecting success of 7525.11 'commit honors status.renames=true': 
-	git -c status.renames=true commit --dry-run >actual &&
-	test_grep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 11 - commit honors status.renames=true
-
-expecting success of 7525.12 'status config overridden': 
-	git -c status.renames=true status --no-renames >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 12 - status config overridden
-
-expecting success of 7525.13 'status score=100%': 
-	git status -M=100% >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual &&
-
-	git status --find-renames=100% >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-	deleted:    original
-	new file:   renamed
-ok 13 - status score=100%
-
-expecting success of 7525.14 'status score=01%': 
-	git status -M=01% >actual &&
-	test_grep "renamed:" actual &&
-
-	git status --find-renames=01% >actual &&
-	test_grep "renamed:" actual
-
-	renamed:    original -> renamed
-	renamed:    original -> renamed
-ok 14 - status score=01%
-
-expecting success of 7525.15 'copies not overridden by find-renames': 
-	cp renamed copy &&
-	git add copy &&
-
-	git -c status.renames=copies status -M=01% >actual &&
-	test_grep "copied:" actual &&
-	test_grep "renamed:" actual &&
-
-	git -c status.renames=copies status --find-renames=01% >actual &&
-	test_grep "copied:" actual &&
-	test_grep "renamed:" actual
-
-	copied:     original -> copy
-	renamed:    original -> renamed
-	copied:     original -> copy
-	renamed:    original -> renamed
-ok 15 - copies not overridden by find-renames
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7517-per-repo-email.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7517-per-repo-email/.git/
-expecting success of 7517.1 'setup a likely user.useConfigOnly use case': 
-	# we want to make sure a reflog is written, since that needs
-	# a non-strict ident. So be sure we have an actual commit.
-	test_commit foo &&
-
-	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
-	git config user.name "test" &&
-	git config --global user.useConfigOnly true
-
-[main (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - setup a likely user.useConfigOnly use case
-
-expecting success of 7517.2 'fails committing if clone email is not set': 
-	test_must_fail git commit --allow-empty -m msg
-
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 2 - fails committing if clone email is not set
-
-expecting success of 7517.3 'fails committing if clone email is not set, but EMAIL set': 
-	test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg
-
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 3 - fails committing if clone email is not set, but EMAIL set
-
-expecting success of 7517.4 'succeeds committing if clone email is set': 
-	test_config user.email "test@ok.com" &&
-	git commit --allow-empty -m msg
-
-[main f3d9b79] msg
-ok 4 - succeeds committing if clone email is set
-
-expecting success of 7517.5 'succeeds cloning if global email is not set': 
-	git clone . clone
-
-Cloning into 'clone'...
-done.
-ok 5 - succeeds cloning if global email is not set
-
-expecting success of 7517.6 'set up rebase scenarios': 
-	# temporarily enable an actual ident for this setup
-	test_config user.email foo@example.com &&
-	test_commit new &&
-	git branch side-without-commit HEAD^ &&
-	git checkout -b side-with-commit HEAD^ &&
-	test_commit side
-
-[main a31892e] new
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Switched to a new branch 'side-with-commit'
-[side-with-commit 1946d3f] side
- 1 file changed, 1 insertion(+)
- create mode 100644 side.t
-ok 6 - set up rebase scenarios
-
-expecting success of 7517.7 'fast-forward rebase does not care about ident': 
-	git checkout -B tmp side-without-commit &&
-	git rebase main
-
-Switched to a new branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 7 - fast-forward rebase does not care about ident
-
-expecting success of 7517.8 'non-fast-forward rebase refuses to write commits': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase main
+expecting success of 7525.4 'status.renames inherits from diff.renames false': 
+	git -c diff.renames=false status >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-Reset branch 'tmp'
-Rebasing (1/1)
Committer identity unknown
+	deleted:    original
+	new file:   renamed
+ok 4 - status.renames inherits from diff.renames false
 
-*** Please tell me who you are.
+expecting success of 7525.5 'status.renames inherits from diff.renames true': 
+	git -c diff.renames=true status >actual &&
+	test_grep "renamed:" actual
 
-Run
+	renamed:    original -> renamed
+ok 5 - status.renames inherits from diff.renames true
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+expecting success of 7525.6 'status.renames overrides diff.renames false': 
+	git -c diff.renames=true -c status.renames=false status >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+	deleted:    original
+	new file:   renamed
+ok 6 - status.renames overrides diff.renames false
 
-fatal: no email was given and auto-detection is disabled
-ok 8 - non-fast-forward rebase refuses to write commits
+expecting success of 7525.7 'status.renames overrides from diff.renames true': 
+	git -c diff.renames=false -c status.renames=true status >actual &&
+	test_grep "renamed:" actual
 
-expecting success of 7517.9 'fast-forward rebase does not care about ident (interactive)': 
-	git checkout -B tmp side-without-commit &&
-	git rebase -i main
+	renamed:    original -> renamed
+ok 7 - status.renames overrides from diff.renames true
 
-Reset branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 9 - fast-forward rebase does not care about ident (interactive)
+expecting success of 7525.8 'status status.renames=false': 
+	git -c status.renames=false status >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-expecting success of 7517.10 'non-fast-forward rebase refuses to write commits (interactive)': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase -i main
+	deleted:    original
+	new file:   renamed
+ok 8 - status status.renames=false
 
-Reset branch 'tmp'
-Rebasing (1/1)
Committer identity unknown
+expecting success of 7525.9 'status status.renames=true': 
+	git -c status.renames=true status >actual &&
+	test_grep "renamed:" actual
 
-*** Please tell me who you are.
+	renamed:    original -> renamed
+ok 9 - status status.renames=true
 
-Run
+expecting success of 7525.10 'commit honors status.renames=false': 
+	git -c status.renames=false commit --dry-run >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+	deleted:    original
+	new file:   renamed
+ok 10 - commit honors status.renames=false
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+expecting success of 7525.11 'commit honors status.renames=true': 
+	git -c status.renames=true commit --dry-run >actual &&
+	test_grep "renamed:" actual
 
-fatal: no email was given and auto-detection is disabled
-ok 10 - non-fast-forward rebase refuses to write commits (interactive)
+	renamed:    original -> renamed
+ok 11 - commit honors status.renames=true
 
-expecting success of 7517.11 'noop interactive rebase does not care about ident': 
-	git checkout -B tmp side-with-commit &&
-	git rebase -i HEAD^
+expecting success of 7525.12 'status config overridden': 
+	git -c status.renames=true status --no-renames >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-Reset branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 11 - noop interactive rebase does not care about ident
+	deleted:    original
+	new file:   renamed
+ok 12 - status config overridden
 
-expecting success of 7517.12 'author.name overrides user.name': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config author.name author &&
-	test_commit author-name-override-user &&
-	echo author user@example.com > expected-author &&
-	echo user user@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
+expecting success of 7525.13 'status score=100%': 
+	git status -M=100% >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual &&
 
-[tmp 52999d1] author-name-override-user
- Author: author <user@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 author-name-override-user.t
-ok 12 - author.name overrides user.name
+	git status --find-renames=100% >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-expecting success of 7517.13 'author.email overrides user.email': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config author.email author@example.com &&
-	test_commit author-email-override-user &&
-	echo user author@example.com > expected-author &&
-	echo user user@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
+	deleted:    original
+	new file:   renamed
+	deleted:    original
+	new file:   renamed
+ok 13 - status score=100%
 
-[tmp e6f53d6] author-email-override-user
- Author: user <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 author-email-override-user.t
-ok 13 - author.email overrides user.email
+expecting success of 7525.14 'status score=01%': 
+	git status -M=01% >actual &&
+	test_grep "renamed:" actual &&
 
-expecting success of 7517.14 'committer.name overrides user.name': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config committer.name committer &&
-	test_commit committer-name-override-user &&
-	echo user user@example.com > expected-author &&
-	echo committer user@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
+	git status --find-renames=01% >actual &&
+	test_grep "renamed:" actual
 
-[tmp bdc357a] committer-name-override-user
- Author: user <user@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 committer-name-override-user.t
-ok 14 - committer.name overrides user.name
+	renamed:    original -> renamed
+	renamed:    original -> renamed
+ok 14 - status score=01%
 
-expecting success of 7517.15 'committer.email overrides user.email': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config committer.email committer@example.com &&
-	test_commit committer-email-override-user &&
-	echo user user@example.com > expected-author &&
-	echo user committer@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
+expecting success of 7525.15 'copies not overridden by find-renames': 
+	cp renamed copy &&
+	git add copy &&
 
-[tmp de2310d] committer-email-override-user
- Author: user <user@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 committer-email-override-user.t
-ok 15 - committer.email overrides user.email
+	git -c status.renames=copies status -M=01% >actual &&
+	test_grep "copied:" actual &&
+	test_grep "renamed:" actual &&
 
-expecting success of 7517.16 'author and committer environment variables override config settings': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config author.name author &&
-	test_config author.email author@example.com &&
-	test_config committer.name committer &&
-	test_config committer.email committer@example.com &&
-	GIT_AUTHOR_NAME=env_author && export GIT_AUTHOR_NAME &&
-	GIT_AUTHOR_EMAIL=env_author@example.com && export GIT_AUTHOR_EMAIL &&
-	GIT_COMMITTER_NAME=env_commit && export GIT_COMMITTER_NAME &&
-	GIT_COMMITTER_EMAIL=env_commit@example.com && export GIT_COMMITTER_EMAIL &&
-	test_commit env-override-conf &&
-	echo env_author env_author@example.com > expected-author &&
-	echo env_commit env_commit@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
+	git -c status.renames=copies status --find-renames=01% >actual &&
+	test_grep "copied:" actual &&
+	test_grep "renamed:" actual
 
-[tmp 9b4fdf4] env-override-conf
- Author: env_author <env_author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 env-override-conf.t
-ok 16 - author and committer environment variables override config settings
+	copied:     original -> copy
+	renamed:    original -> renamed
+	copied:     original -> copy
+	renamed:    original -> renamed
+ok 15 - copies not overridden by find-renames
 
-# passed all 16 test(s)
-1..16
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7527-builtin-fsmonitor.sh ***
@@ -480063,154 +479942,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7604-merge-custom-message.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7512-status-help.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7512-status-help/.git/
 expecting success of 7512.1 'prepare for conflicts': 
@@ -482082,6 +481813,1891 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7519-status-fsmonitor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/.git/
+expecting success of 7519.1 'incompatible bare repo': 
+	test_when_finished "rm -rf ./bare-clone actual expect" &&
+	git init --bare bare-clone &&
+
+	test_must_fail \
+		git -C ./bare-clone -c core.fsmonitor=foo \
+			update-index --fsmonitor 2>actual &&
+	grep "bare repository .* is incompatible with fsmonitor" actual &&
+
+	test_must_fail \
+		git -C ./bare-clone -c core.fsmonitor=true \
+			update-index --fsmonitor 2>actual &&
+	grep "bare repository .* is incompatible with fsmonitor" actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/bare-clone/
+fatal: bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
+fatal: bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
+ok 1 - incompatible bare repo
+
+checking prerequisite: FSMONITOR_DAEMON
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+	git version --build-options >output &&
+	grep "feature: fsmonitor--daemon" output
+
+)
+prerequisite FSMONITOR_DAEMON not satisfied
+ok 2 # skip run fsmonitor-daemon in bare repo (missing FSMONITOR_DAEMON)
+
+ok 3 # skip run fsmonitor-daemon in virtual repo (missing FSMONITOR_DAEMON,MINGW of MINGW,FSMONITOR_DAEMON)
+
+expecting success of 7519.4 'setup': 
+	: >tracked &&
+	: >modified &&
+	mkdir dir1 &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
+	mkdir dir2 &&
+	: >dir2/tracked &&
+	: >dir2/modified &&
+	git -c core.fsmonitor= add . &&
+	git -c core.fsmonitor= commit -m initial &&
+	git config core.fsmonitor .git/hooks/fsmonitor-test &&
+	cat >.gitignore <<-\EOF
+	.gitignore
+	expect*
+	actual*
+	marker*
+	trace2*
+	EOF
+
+[master (root-commit) 1851a93] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/modified
+ create mode 100644 dir2/tracked
+ create mode 100644 modified
+ create mode 100644 tracked
+ok 4 - setup
+
+expecting success of 7519.5 'fsmonitor extension is off by default': 
+	test-tool dump-fsmonitor >actual &&
+	grep "^no fsmonitor" actual
+
+no fsmonitor
+ok 5 - fsmonitor extension is off by default
+
+expecting success of 7519.6 'update-index --fsmonitor" adds the fsmonitor extension': 
+	git update-index --fsmonitor &&
+	test-tool dump-fsmonitor >actual &&
+	grep "^fsmonitor last update" actual
+
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fsmonitor last update 1773495362865174440
+ok 6 - update-index --fsmonitor" adds the fsmonitor extension
+
+expecting success of 7519.7 'update-index --no-fsmonitor" removes the fsmonitor extension': 
+	git update-index --no-fsmonitor &&
+	test-tool dump-fsmonitor >actual &&
+	grep "^no fsmonitor" actual
+
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+warning: core.fsmonitor is set; remove it if you really want to disable fsmonitor
+no fsmonitor
+ok 7 - update-index --no-fsmonitor" removes the fsmonitor extension
+
+expecting success of 7519.8 'update-index --fsmonitor-valid" sets the fsmonitor valid bit': 
+	test_hook fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
+	git update-index --fsmonitor &&
+	git update-index --fsmonitor-valid dir1/modified &&
+	git update-index --fsmonitor-valid dir2/modified &&
+	git update-index --fsmonitor-valid modified &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 8 - update-index --fsmonitor-valid" sets the fsmonitor valid bit
+
+expecting success of 7519.9 'update-index --no-fsmonitor-valid" clears the fsmonitor valid bit': 
+	git update-index --no-fsmonitor-valid dir1/modified &&
+	git update-index --no-fsmonitor-valid dir2/modified &&
+	git update-index --no-fsmonitor-valid modified &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
+ok 9 - update-index --no-fsmonitor-valid" clears the fsmonitor valid bit
+
+expecting success of 7519.10 'all files returned by integration script get flagged as invalid': 
+	write_integration_script &&
+	dirty_repo &&
+	git update-index --fsmonitor &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 10 - all files returned by integration script get flagged as invalid
+
+expecting success of 7519.11 'newly added files are marked valid': 
+	test_hook --setup --clobber fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
+	git add new &&
+	git add dir1/new &&
+	git add dir2/new &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 11 - newly added files are marked valid
+
+expecting success of 7519.12 'all unmodified files get marked valid': 
+	# modified files result in update-index returning 1
+	test_must_fail git update-index --refresh --force-write-index &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+dir1/modified: needs update
+dir2/modified: needs update
+modified: needs update
+ok 12 - all unmodified files get marked valid
+
+expecting success of 7519.13 '*only* files returned by the integration script get flagged as invalid': 
+	test_hook --clobber fsmonitor-test<<-\EOF &&
+	printf "last_update_token\0"
+	printf "dir1/modified\0"
+	EOF
+	clean_repo &&
+	git update-index --refresh --force-write-index &&
+	echo 1 >modified &&
+	echo 2 >dir1/modified &&
+	echo 3 >dir2/modified &&
+	test_must_fail git update-index --refresh --force-write-index &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+dir1/modified: needs update
+ok 13 - *only* files returned by the integration script get flagged as invalid
+
+expecting success of 7519.14 'refresh_index() invalidates fsmonitor cache': 
+	clean_repo &&
+	dirty_repo &&
+	write_integration_script &&
+	git add . &&
+	test_hook --clobber fsmonitor-test<<-\EOF &&
+	EOF
+	git commit -m "to reset" &&
+	git reset HEAD~1 &&
+	git status >actual &&
+	git -c core.fsmonitor= status >expect &&
+	test_cmp expect actual
+
+HEAD is now at 1851a93 initial
+warning: Empty last update token.
+[master 6edcb70] to reset
+ Author: A U Thor <author@example.com>
+ 9 files changed, 6 insertions(+)
+ create mode 100644 dir1/new
+ create mode 100644 dir1/untracked
+ create mode 100644 dir2/new
+ create mode 100644 dir2/untracked
+ create mode 100644 new
+ create mode 100644 untracked
+warning: Empty last update token.
+Unstaged changes after reset:
+M	dir1/modified
+M	dir2/modified
+M	modified
+warning: Empty last update token.
+ok 14 - refresh_index() invalidates fsmonitor cache
+
+expecting success of 7519.15 'setup preloadIndex to false': 
+		git config core.preloadIndex $preload_val &&
+		if test $preload_val = true
+		then
+			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
+		else
+			sane_unset GIT_TEST_PRELOAD_INDEX
+		fi
+	
+ok 15 - setup preloadIndex to false
+
+checking prerequisite: UNTRACKED_CACHE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+	{ git update-index --test-untracked-cache; ret=$?; } &&
+	test $ret -ne 1
+
+)
+warning: Empty last update token.
+Testing mtime in '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor' ...... OK
+prerequisite UNTRACKED_CACHE ok
+expecting success of 7519.16 'setup untracked cache to false': 
+			git config core.untrackedcache $uc_val
+		
+ok 16 - setup untracked cache to false
+
+expecting success of 7519.17 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 17 - compare status with and without fsmonitor
+
+expecting success of 7519.18 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+Untracked files:
+ok 18 - status doesn't detect unreported modifications
+
+expecting success of 7519.19 'setup untracked cache to true': 
+			git config core.untrackedcache $uc_val
+		
+ok 19 - setup untracked cache to true
+
+expecting success of 7519.20 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 20 - compare status with and without fsmonitor
+
+expecting success of 7519.21 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+ok 21 - status doesn't detect unreported modifications
+
+expecting success of 7519.22 'setup preloadIndex to true': 
+		git config core.preloadIndex $preload_val &&
+		if test $preload_val = true
+		then
+			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
+		else
+			sane_unset GIT_TEST_PRELOAD_INDEX
+		fi
+	
+ok 22 - setup preloadIndex to true
+
+expecting success of 7519.23 'setup untracked cache to false': 
+			git config core.untrackedcache $uc_val
+		
+ok 23 - setup untracked cache to false
+
+expecting success of 7519.24 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 24 - compare status with and without fsmonitor
+
+expecting success of 7519.25 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+Untracked files:
+ok 25 - status doesn't detect unreported modifications
+
+expecting success of 7519.26 'setup untracked cache to true': 
+			git config core.untrackedcache $uc_val
+		
+ok 26 - setup untracked cache to true
+
+expecting success of 7519.27 'compare status with and without fsmonitor': 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_cmp expect actual
+		
+HEAD is now at 1851a93 initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 27 - compare status with and without fsmonitor
+
+expecting success of 7519.28 'status doesn't detect unreported modifications': 
+			test_hook --clobber fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_grep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_grep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_grep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1851a93 initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+ok 28 - status doesn't detect unreported modifications
+
+expecting success of 7519.29 'splitting the index results in the same state': 
+	write_integration_script &&
+	dirty_repo &&
+	git update-index --fsmonitor  &&
+	git ls-files -f >expect &&
+	test-tool dump-fsmonitor >&2 && echo &&
+	git update-index --fsmonitor --split-index &&
+	test-tool dump-fsmonitor >&2 && echo &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+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': 
+	test_create_repo dot-git &&
+	(
+		cd dot-git &&
+		: >tracked &&
+		test-tool chmtime =-60 tracked &&
+		: >modified &&
+		test-tool chmtime =-60 modified &&
+		mkdir dir1 &&
+		: >dir1/tracked &&
+		test-tool chmtime =-60 dir1/tracked &&
+		: >dir1/modified &&
+		test-tool chmtime =-60 dir1/modified &&
+		mkdir dir2 &&
+		: >dir2/tracked &&
+		test-tool chmtime =-60 dir2/tracked &&
+		: >dir2/modified &&
+		test-tool chmtime =-60 dir2/modified &&
+		write_integration_script &&
+		git config core.fsmonitor .git/hooks/fsmonitor-test &&
+		git update-index --untracked-cache &&
+		git update-index --fsmonitor &&
+		git status &&
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-before" \
+		git status &&
+		test-tool dump-untracked-cache >../before
+	) &&
+	cat >>dot-git/.git/hooks/fsmonitor-test <<-\EOF &&
+	printf ".git\0"
+	printf ".git/index\0"
+	printf "dir1/.git\0"
+	printf "dir1/.git/index\0"
+	EOF
+	(
+		cd dot-git &&
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-after" \
+		git status &&
+		test-tool dump-untracked-cache >../after
+	) &&
+	grep "directory-invalidation" trace-before | cut -d"|" -f 9 >>before &&
+	grep "directory-invalidation" trace-after  | cut -d"|" -f 9 >>after &&
+	# UNTR extension unchanged, dir invalidation count unchanged
+	test_cmp before after
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/dot-git/.git/
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/
+	dir2/
+	modified
+	tracked
+
+nothing added to commit but untracked files present (use "git add" to track)
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/
+	dir2/
+	modified
+	tracked
+
+nothing added to commit but untracked files present (use "git add" to track)
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/
+	dir2/
+	modified
+	tracked
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 30 - ignore .git changes when invalidating UNTR
+
+expecting success of 7519.31 'discard_index() also discards fsmonitor info': 
+	test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
+	test_might_fail git update-index --refresh &&
+	test-tool read-cache --print-and-refresh=tracked 2 >actual &&
+	printf "tracked is%s up to date\n" "" " not" >expect &&
+	test_cmp expect actual
+
+dir1/modified: needs update
+dir2/modified: needs update
+modified: needs update
+ok 31 - discard_index() also discards fsmonitor info
+
+expecting success of 7519.32 'status succeeds after staging/unstaging': 
+	test_create_repo fsmonitor-stage-unstage &&
+	(
+		cd fsmonitor-stage-unstage &&
+		test_commit initial &&
+		git update-index --fsmonitor &&
+		removed=$(test_seq 1 100 | sed "s/^/z/") &&
+		touch $removed &&
+		git add $removed &&
+		git config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-env" &&
+		FSMONITOR_LIST="$removed" git restore -S $removed &&
+		FSMONITOR_LIST="$removed" git status
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/fsmonitor-stage-unstage/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+warning: core.fsmonitor is unset; set it if you really want to enable fsmonitor
+Unsupported core.fsmonitor hook version.
+Unsupported core.fsmonitor hook version.
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	z1
+	z10
+	z100
+	z11
+	z12
+	z13
+	z14
+	z15
+	z16
+	z17
+	z18
+	z19
+	z2
+	z20
+	z21
+	z22
+	z23
+	z24
+	z25
+	z26
+	z27
+	z28
+	z29
+	z3
+	z30
+	z31
+	z32
+	z33
+	z34
+	z35
+	z36
+	z37
+	z38
+	z39
+	z4
+	z40
+	z41
+	z42
+	z43
+	z44
+	z45
+	z46
+	z47
+	z48
+	z49
+	z5
+	z50
+	z51
+	z52
+	z53
+	z54
+	z55
+	z56
+	z57
+	z58
+	z59
+	z6
+	z60
+	z61
+	z62
+	z63
+	z64
+	z65
+	z66
+	z67
+	z68
+	z69
+	z7
+	z70
+	z71
+	z72
+	z73
+	z74
+	z75
+	z76
+	z77
+	z78
+	z79
+	z8
+	z80
+	z81
+	z82
+	z83
+	z84
+	z85
+	z86
+	z87
+	z88
+	z89
+	z9
+	z90
+	z91
+	z92
+	z93
+	z94
+	z95
+	z96
+	z97
+	z98
+	z99
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 32 - status succeeds after staging/unstaging
+
+expecting success of 7519.33 'status succeeds with sparse index': 
+	(
+		sane_unset GIT_TEST_SPLIT_INDEX &&
+
+		git clone . full &&
+		git clone --sparse . sparse &&
+		git -C sparse sparse-checkout init --cone --sparse-index &&
+		git -C sparse sparse-checkout set dir1 dir2 &&
+
+		test_hook --clobber fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+		EOF
+		git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+		git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+		check_sparse_index_behavior ! &&
+
+		test_hook --clobber fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+			printf "dir1/modified\0"
+		EOF
+		check_sparse_index_behavior ! &&
+
+		git -C sparse sparse-checkout add dir1a &&
+
+		for repo in full sparse
+		do
+			cp -r $repo/dir1 $repo/dir1a &&
+			git -C $repo add dir1a &&
+			git -C $repo commit -m "add dir1a" || return 1
+		done &&
+		git -C sparse sparse-checkout set dir1 dir2 &&
+
+		# This one modifies outside the sparse-checkout definition
+		# and hence we expect to expand the sparse-index.
+		test_hook --clobber fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+			printf "dir1a/modified\0"
+		EOF
+		check_sparse_index_behavior
+	)
+
+Cloning into 'full'...
+done.
+Cloning into 'sparse'...
+done.
+{"event":"region_enter","sid":"20260314T133615.269889Z-H5c947e1c-P0005e2de","thread":"main","time":"2026-03-14T13:36:15.270704Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260314T133615.269889Z-H5c947e1c-P0005e2de","thread":"main","time":"2026-03-14T13:36:15.279245Z","file":"fsmonitor.c","line":186,"t_rel":0.008540,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20260314T133615.528333Z-H5c947e1c-P0005e3ca","thread":"main","time":"2026-03-14T13:36:15.529056Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260314T133615.528333Z-H5c947e1c-P0005e3ca","thread":"main","time":"2026-03-14T13:36:15.539315Z","file":"fsmonitor.c","line":186,"t_rel":0.010259,"nesting":1,"category":"fsm_hook","label":"query"}
+[master 1279bb5] add dir1a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir1a/modified
+ create mode 100644 dir1a/tracked
+[master 1279bb5] add dir1a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir1a/modified
+ create mode 100644 dir1a/tracked
+hint: The sparse index is expanding to a full index, a slow operation.
+hint: Your working directory likely has contents that are outside of
+hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
+hint: see your sparse-checkout definition and compare it to your working
+hint: directory contents. Running 'git clean' may assist in this cleanup.
+hint: Disable this message with "git config set advice.sparseIndexExpanded false"
+{"event":"region_enter","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.177821Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.226715Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.178372Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000551,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.226761Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000045,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.152877Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.201576Z","file":"fsmonitor.c","line":176,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.177628Z","file":"fsmonitor.c","line":186,"t_rel":0.024751,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20260314T133616.152168Z-H5c947e1c-P0005e5fe","thread":"main","time":"2026-03-14T13:36:16.225639Z","file":"fsmonitor.c","line":186,"t_rel":0.024062,"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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7604-merge-custom-message.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7003-filter-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/.git/
+expecting success of 7003.1 'setup': 
+	test_commit A &&
+	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
+	test_commit --notick B &&
+	git checkout -b branch B &&
+	test_commit D &&
+	mkdir dir &&
+	test_commit dir/D &&
+	test_commit E &&
+	git checkout main &&
+	test_commit C &&
+	git checkout branch &&
+	git merge C &&
+	git tag F &&
+	test_commit G &&
+	test_commit H
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main e86e545] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'branch'
+[branch bd662c1] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch 3abb9b5] dir/D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/D.t
+[branch 48ac83b] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'main'
+[main 0e63577] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'branch'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[branch 3c39262] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+[branch 110eac9] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+ok 1 - setup
+
+expecting success of 7003.2 'rewrite identically': 
+	git filter-branch branch
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (1 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/branch' is unchanged
+ok 2 - rewrite identically
+
+expecting success of 7003.3 'result is really identical': 
+	test $H = $(git rev-parse HEAD)
+
+ok 3 - result is really identical
+
+expecting success of 7003.4 'rewrite bare repository identically': 
+	(git config core.bare true && cd .git &&
+	 git filter-branch branch > filter-output 2>&1 &&
+	! grep fatal filter-output)
+
+ok 4 - rewrite bare repository identically
+
+expecting success of 7003.5 'result is really identical': 
+	test $H = $(git rev-parse HEAD)
+
+ok 5 - result is really identical
+
+expecting success of 7003.6 'correct GIT_DIR while using -d': 
+	mkdir drepo &&
+	( cd drepo &&
+	git init &&
+	test_commit drepo &&
+	git filter-branch -d "$TRASHDIR/dfoo" \
+		--index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
+	) &&
+	grep drepo "$TRASHDIR/backup-refs"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/drepo/.git/
+[main (root-commit) 9f96758] drepo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 drepo.t
+
Rewrite 9f9675864b1443cf5a1e281c740a8ba331951fba (1/1) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+9f9675864b1443cf5a1e281c740a8ba331951fba commit	refs/tags/drepo
+ok 6 - correct GIT_DIR while using -d
+
+expecting success of 7003.7 'tree-filter works with -d': 
+	git init drepo-tree &&
+	(
+		cd drepo-tree &&
+		test_commit one &&
+		git filter-branch -d "$TRASHDIR/dfoo" \
+			--tree-filter "echo changed >one.t" &&
+		echo changed >expect &&
+		git cat-file blob HEAD:one.t >actual &&
+		test_cmp expect actual &&
+		test_cmp one.t actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/drepo-tree/.git/
+[main (root-commit) d944c64] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+
Rewrite d944c643197c4e8b1e89974e6d9ba85df421b65d (1/1) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+ok 7 - tree-filter works with -d
+
+expecting success of 7003.8 'Fail if commit filter fails': 
+	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    could not write rewritten commit
+ok 8 - Fail if commit filter fails
+
+expecting success of 7003.9 'rewrite, renaming a specific file': 
+	git filter-branch -f --tree-filter "mv D.t doh || :" HEAD
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (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)    mv: cannot stat 'D.t': No such file or directory
+
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/branch' was rewritten
+ok 9 - rewrite, renaming a specific file
+
+expecting success of 7003.10 'test that the file was renamed': 
+	test D = "$(git show HEAD:doh --)" &&
+	! test -f D.t &&
+	test -f doh &&
+	test D = "$(cat doh)"
+
+ok 10 - test that the file was renamed
+
+expecting success of 7003.11 'rewrite, renaming a specific directory': 
+	git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (1 seconds passed, remaining 2 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/9) (1 seconds passed, remaining 2 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (7/9) (2 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (7/9) (2 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (7/9) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 11 - rewrite, renaming a specific directory
+
+expecting success of 7003.12 'test that the directory was renamed': 
+	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
+	! test -d dir &&
+	test -d diroh &&
+	! test -d diroh/dir &&
+	test -f diroh/D.t &&
+	test dir/D = "$(cat diroh/D.t)"
+
+ok 12 - test that the directory was renamed
+
+expecting success of 7003.13 'populate --state-branch': 
+	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
+
+Branch state does not exist. Will create
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+Saving rewrite state to state
+ok 13 - populate --state-branch
+
+expecting success of 7003.14 'using --state-branch to skip already rewritten commits': 
+	test_when_finished git reset --hard $V &&
+	git reset --hard $V &&
+	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD &&
+	test_cmp_rev $W HEAD
+
+HEAD is now at 8a3423e H
+Populating map from state (62b9c9fa908324bba33ac79ad962e765fd9a3958)
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+Saving rewrite state to state
+HEAD is now at 8a3423e H
+ok 14 - using --state-branch to skip already rewritten commits
+
+expecting success of 7003.15 'rewrite one branch, keeping a side branch': 
+	git branch modD oldD &&
+	git filter-branch -f --tree-filter "mv B.t boh || :" D..modD
+
+
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/modD' was rewritten
+ok 15 - rewrite one branch, keeping a side branch
+
+expecting success of 7003.16 'common ancestor is still common (unchanged)': 
+	test "$(git merge-base modD D)" = "$(git rev-parse B)"
+
+ok 16 - common ancestor is still common (unchanged)
+
+expecting success of 7003.17 'filter subdirectory only': 
+	mkdir subdir &&
+	touch subdir/new &&
+	git add subdir/new &&
+	test_tick &&
+	git commit -m "subdir" &&
+	echo H > A.t &&
+	test_tick &&
+	git commit -m "not subdir" A.t &&
+	echo A > subdir/new &&
+	test_tick &&
+	git commit -m "again subdir" subdir/new &&
+	git rm A.t &&
+	test_tick &&
+	git commit -m "again not subdir" &&
+	git branch sub &&
+	git branch sub-earlier HEAD~2 &&
+	git filter-branch -f --subdirectory-filter subdir \
+		refs/heads/sub refs/heads/sub-earlier
+
+[branch bb8f80d] subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 subdir/new
+[branch 5bae69c] not subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch 140072e] again subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+rm 'A.t'
+[branch ead226b] again not subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A.t
+
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/sub' was rewritten
+Ref 'refs/heads/sub-earlier' was rewritten
+ok 17 - filter subdirectory only
+
+expecting success of 7003.18 'subdirectory filter result looks okay': 
+	test 2 = $(git rev-list sub | wc -l) &&
+	git show sub:new &&
+	test_must_fail git show sub:subdir &&
+	git show sub-earlier:new &&
+	test_must_fail git show sub-earlier:subdir
+
+A
+fatal: path 'subdir' exists on disk, but not in 'sub'
+fatal: path 'subdir' exists on disk, but not in 'sub-earlier'
+ok 18 - subdirectory filter result looks okay
+
+expecting success of 7003.19 'more setup': 
+	git checkout main &&
+	mkdir subdir &&
+	echo A > subdir/new &&
+	git add subdir/new &&
+	test_tick &&
+	git commit -m "subdir on main" subdir/new &&
+	git rm A.t &&
+	test_tick &&
+	git commit -m "again subdir on main" &&
+	git merge branch
+
+Switched to branch 'main'
+[main cb42fbf] subdir on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/new
+rm 'A.t'
+[main a1f80b9] again subdir on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A.t
+Merge made by the 'ort' strategy.
+ E.t       | 1 +
+ G.t       | 1 +
+ H.t       | 1 +
+ diroh/D.t | 1 +
+ doh       | 1 +
+ 5 files changed, 5 insertions(+)
+ create mode 100644 E.t
+ create mode 100644 G.t
+ create mode 100644 H.t
+ create mode 100644 diroh/D.t
+ create mode 100644 doh
+ok 19 - more setup
+
+expecting success of 7003.20 'use index-filter to move into a subdirectory': 
+	git branch directorymoved &&
+	git filter-branch -f --index-filter \
+		 "git ls-files -s | sed \"s-	-&newsubdir/-\" |
+	          GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
+			git update-index --index-info &&
+		  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
+	git diff --exit-code HEAD directorymoved:newsubdir
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/16) (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) (2 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (9/16) (2 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/16) (2 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/16) (2 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/16) (2 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/16) (3 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (14/16) (3 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (14/16) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/directorymoved' was rewritten
+ok 20 - use index-filter to move into a subdirectory
+
+expecting success of 7003.21 'stops when msg filter fails': 
+	old=$(git rev-parse HEAD) &&
+	test_must_fail git filter-branch -f --msg-filter false HEAD &&
+	test $old = $(git rev-parse HEAD) &&
+	rm -rf .git-rewrite
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    msg filter failed: false
+ok 21 - stops when msg filter fails
+
+expecting success of 7003.22 'author information is preserved': 
+	: > i &&
+	git add i &&
+	test_tick &&
+	GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
+	git branch preserved-author &&
+	(sane_unset GIT_AUTHOR_NAME &&
+	 git filter-branch -f --msg-filter "cat; \
+			test \$GIT_COMMIT != $(git rev-parse main) || \
+			echo Hallo" \
+		preserved-author) &&
+	git rev-list --author="B V Uips" preserved-author >actual &&
+	test_line_count = 1 actual
+
+[main 7da14ef] bvuips
+ Author: B V Uips <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 i
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/17) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/17) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/17) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/17) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/17) (2 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/17) (2 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (15/17) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/preserved-author' was rewritten
+ok 22 - author information is preserved
+
+expecting success of 7003.23 'remove a certain author's commits': 
+	echo i > i &&
+	test_tick &&
+	git commit -m i i &&
+	git branch removed-author &&
+	git filter-branch -f --commit-filter "\
+		if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
+		then\
+			skip_commit \"\$@\";
+		else\
+			git commit-tree \"\$@\";\
+		fi" removed-author &&
+	cnt1=$(git rev-list main | wc -l) &&
+	cnt2=$(git rev-list removed-author | wc -l) &&
+	test $cnt1 -eq $(($cnt2 + 1)) &&
+	git rev-list --author="B V Uips" removed-author >actual &&
+	test_line_count = 0 actual
+
+[main 0261af1] i
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/18) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/18) (1 seconds passed, remaining 8 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (2/18) (1 seconds passed, remaining 8 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (2/18) (1 seconds passed, remaining 8 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (5/18) (1 seconds passed, remaining 2 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (5/18) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/18) (3 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (11/18) (3 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/18) (3 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/18) (3 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (15/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (15/18) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/removed-author' was rewritten
+ok 23 - remove a certain author's commits
+
+expecting success of 7003.24 'barf on invalid name': 
+	test_must_fail git filter-branch -f main xy-problem &&
+	test_must_fail git filter-branch -f HEAD^
+
+fatal: ambiguous argument 'xy-problem': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+You must specify a ref to rewrite.
+ok 24 - barf on invalid name
+
+expecting success of 7003.25 '"map" works in commit filter': 
+	git filter-branch -f --commit-filter "\
+		parent=\$(git rev-parse \$GIT_COMMIT^) &&
+		mapped=\$(map \$parent) &&
+		actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
+		test \$mapped = \$actual &&
+		git commit-tree \"\$@\";" main~2..main &&
+	git rev-parse --verify main
+
+
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (2/2) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+0261af146239dd954a19d76ae2a417dd3af8b791
+ok 25 - "map" works in commit filter
+
+expecting success of 7003.26 'Name needing quotes': 
+
+	git checkout -b rerere A &&
+	mkdir foo &&
+	name="れれれ" &&
+	>foo/$name &&
+	git add foo &&
+	git commit -m "Adding a file" &&
+	git filter-branch --tree-filter "rm -fr foo" &&
+	test_must_fail git ls-files --error-unmatch "foo/$name" &&
+	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
+
+
+Switched to a new branch 'rerere'
+[rerere 1d45e88] Adding a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 "foo/\343\202\214\343\202\214\343\202\214"
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1d45e8854f1dd5452938be2dedb173087134c05c (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rerere' was rewritten
+error: pathspec 'foo/れれれ' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 26 - Name needing quotes
+
+expecting success of 7003.27 'Subdirectory filter with disappearing trees': 
+	git reset --hard &&
+	git checkout main &&
+
+	mkdir foo &&
+	touch foo/bar &&
+	git add foo &&
+	test_tick &&
+	git commit -m "Adding foo" &&
+
+	git rm -r foo &&
+	test_tick &&
+	git commit -m "Removing foo" &&
+
+	mkdir foo &&
+	touch foo/bar &&
+	git add foo &&
+	test_tick &&
+	git commit -m "Re-adding foo" &&
+
+	git filter-branch -f --subdirectory-filter foo &&
+	git rev-list main >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at 643bd56 Adding a file
+Switched to branch 'main'
+[main f7eadb2] Adding foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/bar
+rm 'foo/bar'
+[main ee48524] Removing foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 foo/bar
+[main 14fe8c6] Re-adding foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/bar
+
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (3/3) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+ok 27 - Subdirectory filter with disappearing trees
+
+expecting success of 7003.28 'Tag name filtering retains tag message': 
+	git tag -m atag T &&
+	git cat-file tag T > expect &&
+	git filter-branch -f --tag-name-filter cat &&
+	git cat-file tag T > actual &&
+	test_cmp expect actual
+
+
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+ok 28 - Tag name filtering retains tag message
+
+expecting success of 7003.29 'Tag name filtering strips gpg signature': 
+	sha1=$(git rev-parse HEAD) &&
+	sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
+	git update-ref "refs/tags/S" "$sha1t" &&
+	echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
+	git filter-branch -f --tag-name-filter cat &&
+	git cat-file tag S > actual &&
+	test_cmp expect actual
+
+
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+S -> S (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+gpg signature stripped from tag object 5e10caf7d74c3ace8930aa1d5449d4d0ceb2e9e0
+T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+ok 29 - Tag name filtering strips gpg signature
+
+checking prerequisite: GPG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG not satisfied
+ok 30 # skip Filtering retains message of gpg signed commit (missing GPG)
+
+expecting success of 7003.31 'Tag name filtering allows slashes in tag names': 
+	git tag -m tag-with-slash X/1 &&
+	git cat-file tag X/1 | sed -e s,X/1,X/2, > expect &&
+	git filter-branch -f --tag-name-filter "echo X/2" &&
+	git cat-file tag X/2 > actual &&
+	test_cmp expect actual
+
+
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+S -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+T -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+X/1 -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+ok 31 - Tag name filtering allows slashes in tag names
+
+expecting success of 7003.32 'setup --prune-empty comparisons': 
+	git checkout --orphan main-no-a &&
+	git rm -rf . &&
+	unset test_tick &&
+	test_tick &&
+	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
+	test_commit --notick B B.t B Bx &&
+	git checkout -b branch-no-a Bx &&
+	test_commit D D.t D Dx &&
+	mkdir dir &&
+	test_commit dir/D dir/D.t dir/D dir/Dx &&
+	test_commit E E.t E Ex &&
+	git checkout main-no-a &&
+	test_commit C C.t C Cx &&
+	git checkout branch-no-a &&
+	git merge Cx -m "Merge tag 'C' into branch" &&
+	git tag Fx &&
+	test_commit G G.t G Gx &&
+	test_commit H H.t H Hx &&
+	git checkout branch
+
+Switched to a new branch 'main-no-a'
+rm 'bar'
+[main-no-a (root-commit) 8d95d31] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'branch-no-a'
+[branch-no-a 2d0b6b2] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch-no-a 6b73242] dir/D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/D.t
+[branch-no-a 6e45985] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'main-no-a'
+[main-no-a 5a68040] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'branch-no-a'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[branch-no-a f0368e4] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+[branch-no-a 00fc75b] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+Switched to branch 'branch'
+ok 32 - setup --prune-empty comparisons
+
+expecting success of 7003.33 'Prune empty commits': 
+	git rev-list HEAD > expect &&
+	test_commit to_remove &&
+	git filter-branch -f --index-filter "git update-index --remove to_remove.t" --prune-empty HEAD &&
+	git rev-list HEAD > actual &&
+	test_cmp expect actual
+
+[branch 219a992] to_remove
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_remove.t
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (1 seconds passed, remaining 6 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/14) (1 seconds passed, remaining 6 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/14) (1 seconds passed, remaining 6 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (3 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/14) (3 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/14) (3 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (11/14) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 33 - Prune empty commits
+
+expecting success of 7003.34 'prune empty collapsed merges': 
+	test_config merge.ff false &&
+	git rev-list HEAD >expect &&
+	test_commit to_remove_2 &&
+	git reset --hard HEAD^ &&
+	test_merge non-ff to_remove_2 &&
+	git filter-branch -f --index-filter "git update-index --remove to_remove_2.t" --prune-empty HEAD &&
+	git rev-list HEAD >actual &&
+	test_cmp expect actual
+
+[branch cb86908] to_remove_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_remove_2.t
+HEAD is now at ead226b again not subdir
+Merge made by the 'ort' strategy.
+ to_remove_2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_remove_2.t
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/15) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/15) (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)    
+Ref 'refs/heads/branch' was rewritten
+ok 34 - prune empty collapsed merges
+
+expecting success of 7003.35 'prune empty works even without index/tree filters': 
+	git rev-list HEAD >expect &&
+	git commit --allow-empty -m empty &&
+	git filter-branch -f --prune-empty HEAD &&
+	git rev-list HEAD >actual &&
+	test_cmp expect actual
+
+[branch 5b6cb84] empty
+ Author: A U Thor <author@example.com>
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (11/14) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 35 - prune empty works even without index/tree filters
+
+expecting success of 7003.36 '--prune-empty is able to prune root commit': 
+	git rev-list branch-no-a >expect &&
+	git branch testing H &&
+	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
+	git rev-list testing >actual &&
+	git branch -D testing &&
+	test_cmp expect actual
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/testing' was rewritten
+Deleted branch testing (was 00fc75b).
+ok 36 - --prune-empty is able to prune root commit
+
+expecting success of 7003.37 '--prune-empty is able to prune entire branch': 
+	git branch prune-entire B &&
+	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire &&
+	test_must_fail git rev-parse refs/heads/prune-entire &&
+	test_must_fail git reflog exists refs/heads/prune-entire
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/prune-entire' was deleted
+fatal: ambiguous argument 'refs/heads/prune-entire': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/prune-entire
+ok 37 - --prune-empty is able to prune entire branch
+
+expecting success of 7003.38 '--remap-to-ancestor with filename filters': 
+	git checkout main &&
+	git reset --hard A &&
+	test_commit add-foo foo 1 &&
+	git branch moved-foo &&
+	test_commit add-bar bar a &&
+	git branch invariant &&
+	orig_invariant=$(git rev-parse invariant) &&
+	git branch moved-bar &&
+	test_commit change-foo foo 2 &&
+	git filter-branch -f --remap-to-ancestor \
+		moved-foo moved-bar A..main \
+		-- -- foo &&
+	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
+	test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
+	test $orig_invariant = $(git rev-parse invariant)
+
+Switched to branch 'main'
+HEAD is now at 0ddfaf1 A
+[main 7d21991] add-foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main 2ff770b] add-bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main b2d4813] change-foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
Rewrite 7d219912875c3b539add35fdb1e3d70e5572ca7c (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite b2d4813d3ebe523582008cb287d933f8c14917be (2/2) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/moved-foo' is unchanged
+Ref 'refs/heads/moved-bar' was rewritten
+Ref 'refs/heads/main' was rewritten
+ok 38 - --remap-to-ancestor with filename filters
+
+expecting success of 7003.39 'automatic remapping to ancestor with filename filters': 
+	git checkout main &&
+	git reset --hard A &&
+	test_commit add-foo2 foo 1 &&
+	git branch moved-foo2 &&
+	test_commit add-bar2 bar a &&
+	git branch invariant2 &&
+	orig_invariant=$(git rev-parse invariant2) &&
+	git branch moved-bar2 &&
+	test_commit change-foo2 foo 2 &&
+	git filter-branch -f \
+		moved-foo2 moved-bar2 A..main \
+		-- -- foo &&
+	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
+	test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
+	test $orig_invariant = $(git rev-parse invariant2)
+
+Already on 'main'
+HEAD is now at 0ddfaf1 A
+[main 59b5b5a] add-foo2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main 20d4afa] add-bar2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main 1fe7e14] change-foo2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
Rewrite 59b5b5af49738cc3e3cc6618c173c3d768334f67 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fe7e1483a7337eb5fecbd426d19506d3422d75d (2/2) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/moved-foo2' is unchanged
+Ref 'refs/heads/moved-bar2' was rewritten
+Ref 'refs/heads/main' was rewritten
+ok 39 - automatic remapping to ancestor with filename filters
+
+expecting success of 7003.40 'setup submodule': 
+	rm -fr ?* .git &&
+	git init &&
+	test_commit file &&
+	mkdir submod &&
+	submodurl="$PWD/submod" &&
+	( cd submod &&
+	  git init &&
+	  test_commit file-in-submod ) &&
+	git submodule add "$submodurl" &&
+	git commit -m "added submodule" &&
+	test_commit add-file &&
+	( cd submod && test_commit add-in-submodule ) &&
+	git add submod &&
+	git commit -m "changed submodule" &&
+	git branch original HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/.git/
+[main (root-commit) cc5d755] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7003-filter-branch/submod/.git/
+[main (root-commit) bd0b946] file-in-submod
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-in-submod.t
+Adding existing repo at 'submod' to the index
+[main 3d58487] added submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submod
+[main 4f94460] add-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-file.t
+[main bf0f869] add-in-submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-in-submodule.t
+[main 54b66e3] changed submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 40 - setup submodule
+
+expecting success of 7003.41 'rewrite submodule with another content': 
+	git filter-branch --tree-filter "test -d submod && {
+					 rm -rf submod &&
+					 git rm -rf --quiet submod &&
+					 mkdir submod &&
+					 : > submod/file
+					 } || :" HEAD &&
+	test $orig_head != $(git show-ref --hash --head HEAD)
+
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d58487dc2bc74efe95846c05e329af261baa409 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 4f94460a4c513ed158d2dc144eedb202083e2d26 (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 54b66e3651cbef75b54f247c0009cc1c5138bd21 (4/4) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+warning: unable to rmdir 'submod': Directory not empty
+ok 41 - rewrite submodule with another content
+
+expecting success of 7003.42 'replace submodule revision': 
+	invalid=$(test_oid numeric) &&
+	git reset --hard original &&
+	git filter-branch -f --tree-filter \
+	    "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
+	     then git update-index --cacheinfo 160000 $invalid submod
+	     fi" HEAD &&
+	test $orig_head != $(git show-ref --hash --head HEAD)
+
+HEAD is now at 54b66e3 changed submodule
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d58487dc2bc74efe95846c05e329af261baa409 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 4f94460a4c513ed158d2dc144eedb202083e2d26 (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 54b66e3651cbef75b54f247c0009cc1c5138bd21 (4/4) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+ok 42 - replace submodule revision
+
+expecting success of 7003.43 'filter commit message without trailing newline': 
+	git reset --hard original &&
+	commit=$(printf "no newline" | git commit-tree HEAD^{tree}) &&
+	git update-ref refs/heads/no-newline $commit &&
+	git filter-branch -f refs/heads/no-newline &&
+	echo $commit >expect &&
+	git rev-parse refs/heads/no-newline >actual &&
+	test_cmp expect actual
+
+HEAD is now at 54b66e3 changed submodule
+
Rewrite 3ebdf9829a386ecf4d79fcf1f3f9a9a47e0c1ff2 (1/1) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/no-newline' is unchanged
+ok 43 - filter commit message without trailing newline
+
+expecting success of 7003.44 'tree-filter deals with object name vs pathname ambiguity': 
+	test_when_finished "git reset --hard original" &&
+	ambiguous=$(git rev-list -1 HEAD) &&
+	git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
+	git show HEAD:$ambiguous
+
+
Rewrite 54b66e3651cbef75b54f247c0009cc1c5138bd21 (1/1) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+file
+HEAD is now at 54b66e3 changed submodule
+ok 44 - tree-filter deals with object name vs pathname ambiguity
+
+expecting success of 7003.45 'rewrite repository including refs that point at non-commit object': 
+	test_when_finished "git reset --hard original" &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	test_when_finished "git replace -d $tree" &&
+	echo A >new &&
+	git add new &&
+	new_tree=$(git write-tree) &&
+	git replace $tree $new_tree &&
+	git tag -a -m "tag to a tree" treetag $new_tree &&
+	git reset --hard HEAD &&
+	git filter-branch -f -- --all >filter-output 2>&1 &&
+	! grep fatal filter-output
+
+HEAD is now at 54b66e3 changed submodule
+Deleted replace ref '4734e3b76b75923e0a764f6997d823ee9bcf3799'
+HEAD is now at 54b66e3 changed submodule
+ok 45 - rewrite repository including refs that point at non-commit object
+
+expecting success of 7003.46 'filter-branch handles ref deletion': 
+	git switch --orphan empty-commit &&
+	git commit --allow-empty -m "empty commit" &&
+	git tag empty &&
+	git branch to-delete &&
+	git filter-branch -f --prune-empty to-delete >out 2>&1 &&
+	grep "to-delete.*was deleted" out &&
+	test_must_fail git rev-parse --verify to-delete
+
+warning: unable to rmdir 'submod': Directory not empty
+Switched to a new branch 'empty-commit'
+[empty-commit (root-commit) dfb35d9] empty commit
+ Author: A U Thor <author@example.com>
+Ref 'refs/heads/to-delete' was deleted
+fatal: Needed a single revision
+ok 46 - filter-branch handles ref deletion
+
+expecting success of 7003.47 'filter-branch handles ref rewrite': 
+	git checkout empty &&
+	test_commit to-drop &&
+	git branch rewrite &&
+	git filter-branch -f \
+		--index-filter "git rm --ignore-unmatch --cached to-drop.t" \
+		 rewrite >out 2>&1 &&
+	grep "rewrite.*was rewritten" out &&
+	! grep -i warning out &&
+	git diff-tree empty rewrite
+
+Note: switching to 'empty'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at dfb35d9 empty commit
+[detached HEAD 01ece84] to-drop
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-drop.t
+Ref 'refs/heads/rewrite' was rewritten
+ok 47 - filter-branch handles ref rewrite
+
+expecting success of 7003.48 'filter-branch handles ancestor rewrite': 
+	test_commit to-exclude &&
+	git branch ancestor &&
+	git filter-branch -f ancestor -- :^to-exclude.t >out 2>&1 &&
+	grep "ancestor.*was rewritten" out &&
+	! grep -i warning out &&
+	git diff-tree HEAD^ ancestor
+
+[detached HEAD 07a3627] to-exclude
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-exclude.t
+Ref 'refs/heads/ancestor' was rewritten
+ok 48 - filter-branch handles ancestor rewrite
+
+# passed all 48 test(s)
+1..48
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7605-merge-resolve.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7605-merge-resolve/.git/
 expecting success of 7605.1 'setup': 
@@ -482190,6 +483806,180 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7607-merge-state.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7607-merge-state/.git/
+expecting success of 7607.1 'Ensure we restore original state if no merge strategy handles it': 
+	test_commit --no-tag "Initial" base base &&
+
+	for b in branch1 branch2 branch3
+	do
+		git checkout -b $b main &&
+		test_commit --no-tag "Change on $b" base $b || return 1
+	done &&
+
+	git checkout branch1 &&
+	# This is a merge that octopus cannot handle.  Note, that it does not
+	# just hit conflicts, it completely fails and says that it cannot
+	# handle this type of merge.
+	test_expect_code 2 git merge branch2 branch3 >output 2>&1 &&
+	grep "fatal: merge program failed" output &&
+	grep "Should not be doing an octopus" output &&
+
+	# Make sure we did not leave stray changes around when no appropriate
+	# merge strategy was found
+	git diff --exit-code --name-status &&
+	test_path_is_missing .git/MERGE_HEAD
+
+[main (root-commit) 9d985b8] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base
+Switched to a new branch 'branch1'
+[branch1 8246e40] Change on branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch2'
+[branch2 34744a5] Change on branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch3'
+[branch3 efa3c31] Change on branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'branch1'
+fatal: merge program failed
+Should not be doing an octopus.
+ok 1 - Ensure we restore original state if no merge strategy handles it
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7606-merge-custom.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7606-merge-custom/.git/
+expecting success of 7606.1 'set up custom strategy': 
+	cat >git-merge-theirs <<-EOF &&
+	#!$SHELL_PATH
+	eval git read-tree --reset -u \\\$\$#
+	EOF
+
+	chmod +x git-merge-theirs &&
+	PATH=.:$PATH &&
+	export PATH
+
+ok 1 - set up custom strategy
+
+expecting success of 7606.2 'setup': 
+	test_commit c0 c0.c &&
+	test_commit c1 c1.c &&
+	git reset --keep c0 &&
+	echo c1c1 >c1.c &&
+	git add c1.c &&
+	test_commit c2 c2.c &&
+	git reset --keep c0 &&
+	test_commit c3 c3.c
+
+[master (root-commit) 934056f] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 7b51d7c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+[master f06910a] c2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c1.c
+ create mode 100644 c2.c
+[master 934e277] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+ok 2 - setup
+
+expecting success of 7606.3 'merge c2 with a custom strategy': 
+	git reset --hard c1 &&
+
+	git rev-parse c1 >head.old &&
+	git rev-parse c2 >second-parent.expected &&
+	git rev-parse c2^{tree} >tree.expected &&
+	git merge -s theirs c2 &&
+
+	git rev-parse HEAD >head.new &&
+	git rev-parse HEAD^1 >first-parent &&
+	git rev-parse HEAD^2 >second-parent &&
+	git rev-parse HEAD^{tree} >tree &&
+	git update-index --refresh &&
+	git diff --exit-code &&
+	git diff --exit-code c2 HEAD &&
+	git diff --exit-code c2 &&
+
+	! test_cmp head.old head.new &&
+	test_cmp head.old first-parent &&
+	test_cmp second-parent.expected second-parent &&
+	test_cmp tree.expected tree &&
+	test -f c0.c &&
+	grep c1c1 c1.c &&
+	test -f c2.c
+
+HEAD is now at 7b51d7c c1
+Merge made by the 'theirs' strategy.
+ c1.c | 2 +-
+ c2.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 c2.c
+--- head.old	2026-03-14 13:36:18.062677808 +0000
++++ head.new	2026-03-14 13:36:18.190677808 +0000
+@@ -1 +1 @@
+-7b51d7cdbd54b8c470d864639e1136d88ce718ef
++5127482d58f03334905cdbe3564c8d092aa56dbe
+c1c1
+ok 3 - merge c2 with a custom strategy
+
+expecting success of 7606.4 'trivial merge with custom strategy': 
+	git reset --hard c1 &&
+
+	git rev-parse c1 >head.old &&
+	git rev-parse c3 >second-parent.expected &&
+	git rev-parse c3^{tree} >tree.expected &&
+	git merge -s theirs c3 &&
+
+	git rev-parse HEAD >head.new &&
+	git rev-parse HEAD^1 >first-parent &&
+	git rev-parse HEAD^2 >second-parent &&
+	git rev-parse HEAD^{tree} >tree &&
+	git update-index --refresh &&
+	git diff --exit-code &&
+	git diff --exit-code c3 HEAD &&
+	git diff --exit-code c3 &&
+
+	! test_cmp head.old head.new &&
+	test_cmp head.old first-parent &&
+	test_cmp second-parent.expected second-parent &&
+	test_cmp tree.expected tree &&
+	test -f c0.c &&
+	! test -e c1.c &&
+	test -f c3.c
+
+HEAD is now at 7b51d7c c1
+Merge made by the 'theirs' strategy.
+ c1.c | 1 -
+ c3.c | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 c1.c
+ create mode 100644 c3.c
+--- head.old	2026-03-14 13:36:18.442677808 +0000
++++ head.new	2026-03-14 13:36:18.606677808 +0000
+@@ -1 +1 @@
+-7b51d7cdbd54b8c470d864639e1136d88ce718ef
++f5f2abda42595469639ae786a37808202e35dcf0
+ok 4 - trivial merge with custom strategy
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7602-merge-octopus-many.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7602-merge-octopus-many/.git/
 expecting success of 7602.1 'setup': 
@@ -482513,1340 +484303,685 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7607-merge-state.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7607-merge-state/.git/
-expecting success of 7607.1 'Ensure we restore original state if no merge strategy handles it': 
-	test_commit --no-tag "Initial" base base &&
-
-	for b in branch1 branch2 branch3
-	do
-		git checkout -b $b main &&
-		test_commit --no-tag "Change on $b" base $b || return 1
-	done &&
-
-	git checkout branch1 &&
-	# This is a merge that octopus cannot handle.  Note, that it does not
-	# just hit conflicts, it completely fails and says that it cannot
-	# handle this type of merge.
-	test_expect_code 2 git merge branch2 branch3 >output 2>&1 &&
-	grep "fatal: merge program failed" output &&
-	grep "Should not be doing an octopus" output &&
-
-	# Make sure we did not leave stray changes around when no appropriate
-	# merge strategy was found
-	git diff --exit-code --name-status &&
-	test_path_is_missing .git/MERGE_HEAD
+*** t7608-merge-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7608-merge-messages/.git/
+expecting success of 7608.1 'merge local branch': 
+	test_commit main-1 &&
+	git checkout -b local-branch &&
+	test_commit branch-1 &&
+	git checkout main &&
+	test_commit main-2 &&
+	git merge local-branch &&
+	check_oneline "Merge branch Qlocal-branchQ"
 
-[main (root-commit) 9d985b8] Initial
+[main (root-commit) 8ad97f7] main-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base
-Switched to a new branch 'branch1'
-[branch1 8246e40] Change on branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch2'
-[branch2 34744a5] Change on branch2
+ create mode 100644 main-1.t
+Switched to a new branch 'local-branch'
+[local-branch 7bd44c4] branch-1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch3'
-[branch3 efa3c31] Change on branch3
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch-1.t
+Switched to branch 'main'
+[main 9b0bdc1] main-2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'branch1'
-fatal: merge program failed
-Should not be doing an octopus.
-ok 1 - Ensure we restore original state if no merge strategy handles it
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7606-merge-custom.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7606-merge-custom/.git/
-expecting success of 7606.1 'set up custom strategy': 
-	cat >git-merge-theirs <<-EOF &&
-	#!$SHELL_PATH
-	eval git read-tree --reset -u \\\$\$#
-	EOF
-
-	chmod +x git-merge-theirs &&
-	PATH=.:$PATH &&
-	export PATH
-
-ok 1 - set up custom strategy
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-2.t
+Merge made by the 'ort' strategy.
+ branch-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch-1.t
+ok 1 - merge local branch
 
-expecting success of 7606.2 'setup': 
-	test_commit c0 c0.c &&
-	test_commit c1 c1.c &&
-	git reset --keep c0 &&
-	echo c1c1 >c1.c &&
-	git add c1.c &&
-	test_commit c2 c2.c &&
-	git reset --keep c0 &&
-	test_commit c3 c3.c
+expecting success of 7608.2 'merge octopus branches': 
+	git checkout -b octopus-a main &&
+	test_commit octopus-1 &&
+	git checkout -b octopus-b main &&
+	test_commit octopus-2 &&
+	git checkout main &&
+	git merge octopus-a octopus-b &&
+	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
 
-[master (root-commit) 934056f] c0
+Switched to a new branch 'octopus-a'
+[octopus-a d4e293f] octopus-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 7b51d7c] c1
+ create mode 100644 octopus-1.t
+Switched to a new branch 'octopus-b'
+[octopus-b fd085cf] octopus-2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-[master f06910a] c2
- Author: A U Thor <author@example.com>
+ create mode 100644 octopus-2.t
+Switched to branch 'main'
+Fast-forwarding to: octopus-a
+Trying simple merge with octopus-b
+Merge made by the 'octopus' strategy.
+ octopus-1.t | 1 +
+ octopus-2.t | 1 +
  2 files changed, 2 insertions(+)
- create mode 100644 c1.c
- create mode 100644 c2.c
-[master 934e277] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-ok 2 - setup
-
-expecting success of 7606.3 'merge c2 with a custom strategy': 
-	git reset --hard c1 &&
-
-	git rev-parse c1 >head.old &&
-	git rev-parse c2 >second-parent.expected &&
-	git rev-parse c2^{tree} >tree.expected &&
-	git merge -s theirs c2 &&
-
-	git rev-parse HEAD >head.new &&
-	git rev-parse HEAD^1 >first-parent &&
-	git rev-parse HEAD^2 >second-parent &&
-	git rev-parse HEAD^{tree} >tree &&
-	git update-index --refresh &&
-	git diff --exit-code &&
-	git diff --exit-code c2 HEAD &&
-	git diff --exit-code c2 &&
-
-	! test_cmp head.old head.new &&
-	test_cmp head.old first-parent &&
-	test_cmp second-parent.expected second-parent &&
-	test_cmp tree.expected tree &&
-	test -f c0.c &&
-	grep c1c1 c1.c &&
-	test -f c2.c
+ create mode 100644 octopus-1.t
+ create mode 100644 octopus-2.t
+ok 2 - merge octopus branches
 
-HEAD is now at 7b51d7c c1
-Merge made by the 'theirs' strategy.
- c1.c | 2 +-
- c2.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 c2.c
---- head.old	2025-02-09 06:55:18.266185630 +0000
-+++ head.new	2025-02-09 06:55:18.298185834 +0000
-@@ -1 +1 @@
--7b51d7cdbd54b8c470d864639e1136d88ce718ef
-+5127482d58f03334905cdbe3564c8d092aa56dbe
-c1c1
-ok 3 - merge c2 with a custom strategy
+expecting success of 7608.3 'merge tag': 
+	git checkout -b tag-branch main &&
+	test_commit tag-1 &&
+	git checkout main &&
+	test_commit main-3 &&
+	git merge tag-1 &&
+	check_oneline "Merge tag Qtag-1Q"
 
-expecting success of 7606.4 'trivial merge with custom strategy': 
-	git reset --hard c1 &&
+Switched to a new branch 'tag-branch'
+[tag-branch 6757378] tag-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tag-1.t
+Switched to branch 'main'
+[main a5de04f] main-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-3.t
+Merge made by the 'ort' strategy.
+ tag-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tag-1.t
+ok 3 - merge tag
 
-	git rev-parse c1 >head.old &&
-	git rev-parse c3 >second-parent.expected &&
-	git rev-parse c3^{tree} >tree.expected &&
-	git merge -s theirs c3 &&
+expecting success of 7608.4 'ambiguous tag': 
+	git checkout -b ambiguous main &&
+	test_commit ambiguous &&
+	git checkout main &&
+	test_commit main-4 &&
+	git merge ambiguous &&
+	check_oneline "Merge tag QambiguousQ"
 
-	git rev-parse HEAD >head.new &&
-	git rev-parse HEAD^1 >first-parent &&
-	git rev-parse HEAD^2 >second-parent &&
-	git rev-parse HEAD^{tree} >tree &&
-	git update-index --refresh &&
-	git diff --exit-code &&
-	git diff --exit-code c3 HEAD &&
-	git diff --exit-code c3 &&
+Switched to a new branch 'ambiguous'
+[ambiguous ab5df7f] ambiguous
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ambiguous.t
+Switched to branch 'main'
+[main f5d97b7] main-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-4.t
+warning: refname 'ambiguous' is ambiguous.
+warning: refname 'ambiguous' is ambiguous.
+Merge made by the 'ort' strategy.
+ ambiguous.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ambiguous.t
+ok 4 - ambiguous tag
 
-	! test_cmp head.old head.new &&
-	test_cmp head.old first-parent &&
-	test_cmp second-parent.expected second-parent &&
-	test_cmp tree.expected tree &&
-	test -f c0.c &&
-	! test -e c1.c &&
-	test -f c3.c
+expecting success of 7608.5 'remote-tracking branch': 
+	git checkout -b remote main &&
+	test_commit remote-1 &&
+	git update-ref refs/remotes/origin/main remote &&
+	git checkout main &&
+	test_commit main-5 &&
+	git merge origin/main &&
+	check_oneline "Merge remote-tracking branch Qorigin/mainQ"
 
-HEAD is now at 7b51d7c c1
-Merge made by the 'theirs' strategy.
- c1.c | 1 -
- c3.c | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 c1.c
- create mode 100644 c3.c
---- head.old	2025-02-09 06:55:18.338186089 +0000
-+++ head.new	2025-02-09 06:55:18.362186241 +0000
-@@ -1 +1 @@
--7b51d7cdbd54b8c470d864639e1136d88ce718ef
-+f5f2abda42595469639ae786a37808202e35dcf0
-ok 4 - trivial merge with custom strategy
+Switched to a new branch 'remote'
+[remote 52036b0] remote-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 remote-1.t
+Switched to branch 'main'
+[main 25894a3] main-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-5.t
+Merge made by the 'ort' strategy.
+ remote-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 remote-1.t
+ok 5 - remote-tracking branch
 
-# passed all 4 test(s)
-1..4
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7063-status-untracked-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7063-status-untracked-cache/.git/
-checking prerequisite: UNTRACKED_CACHE
+*** t7612-merge-verify-signatures.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7612-merge-verify-signatures/.git/
+checking prerequisite: GPG
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
 (
-	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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
 
-A  done/one
-A  one
-A  two
-?? dthree/
-?? dtwo/
-?? three
-ok 14 - repopulate untracked cache for -unormal
+	# 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 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
+)
+prerequisite GPG not satisfied
+ok 1 # skip create signed commits (missing GPG)
 
+ok 2 # skip merge unsigned commit with verification (missing GPG)
 
-ok 15 - modify in root directory, one dir invalidation
+ok 3 # skip merge unsigned commit with merge.verifySignatures=true (missing GPG)
 
-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 4 # skip merge commit with bad signature with verification (missing GPG)
 
-ok 16 - verify untracked cache dump
+ok 5 # skip merge commit with bad signature with merge.verifySignatures=true (missing GPG)
 
-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 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 17 - new .gitignore invalidates recursively
+ok 8 # skip merge commit with untrusted signature with verification and low minTrustLevel (missing GPG)
 
-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 9 # skip merge commit with untrusted signature with merge.verifySignatures=true (missing GPG)
 
-ok 18 - verify untracked cache dump
+ok 10 # skip merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel (missing GPG)
 
-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 11 # skip merge signed commit with verification (missing GPG)
 
-ok 19 - new info/exclude invalidates everything
+ok 12 # skip merge signed commit with merge.verifySignatures=true (missing GPG)
 
-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 13 # skip merge commit with bad signature without verification (missing GPG)
 
-ok 20 - verify untracked cache dump
+ok 14 # skip merge commit with bad signature with merge.verifySignatures=false (missing GPG)
 
-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
+ok 15 # skip merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures (missing GPG)
 
-rm 'two'
-ok 21 - move two from tracked to untracked
+ok 16 # skip merge unsigned commit into unborn branch (missing GPG)
 
-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
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7615-diff-algo-with-mergy-operations.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7615-diff-algo-with-mergy-operations/.git/
+expecting success of 7615.1 'setup': 
+	cp "$TEST_DIRECTORY"/t7615/base.c file.c &&
+	git add file.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	cp "$TEST_DIRECTORY"/t7615/ours.c file.c &&
+	git add file.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	cp "$TEST_DIRECTORY"/t7615/theirs.c file.c &&
+	git add file.c &&
+	git commit -m c2 &&
+	git tag c2
 
-ok 22 - status after the move
+[master (root-commit) 2c9f7f3] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 17 insertions(+)
+ create mode 100644 file.c
+[master 4e619f0] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+HEAD is now at 2c9f7f3 c0
+[master fffaeb5] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
 
-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
+expecting success of 7615.2 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm': 
+	git reset --hard c1 &&
+	test_must_fail git merge -s recursive c2
 
-ok 23 - verify untracked cache dump
+HEAD is now at 4e619f0 c1
+Merging:
+4e619f0 c1
+virtual c2
+found 1 common ancestor:
+2c9f7f3 c0
+Auto-merging file.c
+CONFLICT (content): Merge conflict in file.c
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm
 
-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
+expecting success of 7615.3 'merge c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram': 
+	git reset --hard c1 &&
+	git merge --strategy recursive -Xdiff-algorithm=histogram c2
 
-ok 24 - move two from untracked to tracked
+HEAD is now at 4e619f0 c1
+Merging:
+4e619f0 c1
+virtual c2
+found 1 common ancestor:
+2c9f7f3 c0
+Auto-merging file.c
+Merge made by the 'recursive' strategy.
+ file.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 3 - merge c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram
 
-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
+expecting success of 7615.4 'merge c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram': 
+	git reset --hard c1 &&
+	git config diff.algorithm histogram &&
+	git merge --strategy recursive c2
 
-ok 25 - status after the move
+HEAD is now at 4e619f0 c1
+Merging:
+4e619f0 c1
+virtual c2
+found 1 common ancestor:
+2c9f7f3 c0
+Auto-merging file.c
+Merge made by the 'recursive' strategy.
+ file.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 4 - merge c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram
 
-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
+expecting success of 7615.5 'cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm': 
+	git reset --hard c1 &&
+	test_must_fail git cherry-pick -s recursive c2
 
-ok 26 - verify untracked cache dump
+HEAD is now at 4e619f0 c1
+fatal: bad revision 'recursive'
+ok 5 - cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm
 
-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"
+expecting success of 7615.6 'cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram': 
+	git reset --hard c1 &&
+	git cherry-pick --strategy recursive -Xdiff-algorithm=histogram c2
 
-[main (root-commit) 2d55d32] first commit
+HEAD is now at 4e619f0 c1
+Auto-merging file.c
+[master 07529b3] c2
  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
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 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 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
+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 28 - status after commit
+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
 
-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
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7614-merge-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7614-merge-signoff/.git/
+expecting success of 7614.1 'setup': 
+	test_setup
 
-ok 29 - untracked cache correct after commit
+[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 7063.30 'set up sparse checkout': 
-	echo "done/[a-z]*" >.git/info/sparse-checkout &&
-	test_config core.sparsecheckout true &&
+expecting success of 7614.2 'git merge --signoff adds a sign-off line': 
 	git checkout main &&
-	git update-index --force-untracked-cache &&
-	git status --porcelain >/dev/null && # prime the cache
-	test_path_is_missing done/.gitignore &&
-	test_path_is_file done/one
-
-Already on 'main'
-ok 30 - set up sparse checkout
-
-expecting success of 7063.31 'create/modify files, some of which are gitignored': 
-	echo two bis >done/two &&
-	echo three >done/three && # three is gitignored
-	echo four >done/four && # four is gitignored at a higher level
-	echo five >done/five && # five is not gitignored
-	test-tool chmtime =-180 done/two done/three done/four done/five done &&
-	# we need to ensure that the root dir is touched (in the past);
-	test-tool chmtime =-180 . &&
-	sync_mtime
-
-ok 31 - create/modify files, some of which are gitignored
-
-expecting success of 7063.32 'test sparse status with untracked cache': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:1
- ....directory-invalidation:2
- ....opendir:2
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 32 - test sparse status with untracked cache
-
-expecting success of 7063.33 'untracked cache correct after status': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $(test_oid done) recurse valid
-five
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 33 - untracked cache correct after status
-
-expecting success of 7063.34 'test sparse status again with untracked cache': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 34 - test sparse status again with untracked cache
-
-expecting success of 7063.35 'set up for test of subdir and sparse checkouts': 
-	mkdir done/sub &&
-	mkdir done/sub/sub &&
-	echo "sub" > done/sub/sub/file &&
-	test-tool chmtime =-120 done/sub/sub/file done/sub/sub done/sub done
-
-ok 35 - set up for test of subdir and sparse checkouts
-
-expecting success of 7063.36 'test sparse status with untracked cache and subdir': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? done/sub/
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:2
- ....gitignore-invalidation:0
- ....directory-invalidation:1
- ....opendir:3
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 36 - test sparse status with untracked cache and subdir
-
-expecting success of 7063.37 'verify untracked cache dump (sparse/subdirs)': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect-from-test-dump <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $(test_oid done) recurse valid
-five
-sub/
-/done/sub/ $ZERO_OID recurse check_only valid
-sub/
-/done/sub/sub/ $ZERO_OID recurse check_only valid
-file
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect-from-test-dump ../actual
-
-ok 37 - verify untracked cache dump (sparse/subdirs)
-
-expecting success of 7063.38 'test sparse status again with untracked cache and subdir': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 38 - test sparse status again with untracked cache and subdir
-
-expecting success of 7063.39 'move entry in subdir from untracked to cached': 
-	git add dtwo/two &&
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-A  dtwo/two
-?? .gitignore
-?? done/five
-?? done/sub/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual
-
-ok 39 - move entry in subdir from untracked to cached
-
-expecting success of 7063.40 'move entry in subdir from cached to untracked': 
-	git rm --cached dtwo/two &&
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? done/sub/
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual
-
-rm 'dtwo/two'
-ok 40 - move entry in subdir from cached to untracked
-
-expecting success of 7063.41 '--no-untracked-cache removes the cache': 
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	echo "no untracked cache" >../expect-no-uc &&
-	test_cmp ../expect-no-uc ../actual
-
-ok 41 - --no-untracked-cache removes the cache
-
-expecting success of 7063.42 'git status does not change anything': 
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 42 - git status does not change anything
-
-expecting success of 7063.43 'setting core.untrackedCache to true and using git status creates the cache': 
-	git config core.untrackedCache true &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 43 - setting core.untrackedCache to true and using git status creates the cache
-
-expecting success of 7063.44 'using --no-untracked-cache does not fail when core.untrackedCache is true': 
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual
-
-warning: core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache
-ok 44 - using --no-untracked-cache does not fail when core.untrackedCache is true
-
-expecting success of 7063.45 'setting core.untrackedCache to false and using git status removes the cache': 
-	git config core.untrackedCache false &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 45 - setting core.untrackedCache to false and using git status removes the cache
-
-expecting success of 7063.46 'using --untracked-cache does not fail when core.untrackedCache is false': 
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual
-
-warning: core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache
-ok 46 - using --untracked-cache does not fail when core.untrackedCache is false
-
-expecting success of 7063.47 'setting core.untrackedCache to keep': 
-	git config core.untrackedCache keep &&
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual &&
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git update-index --force-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 47 - setting core.untrackedCache to keep
-
-expecting success of 7063.48 'test ident field is working': 
-	mkdir ../other_worktree &&
-	cp -R done dthree dtwo four three ../other_worktree &&
-	GIT_WORK_TREE=../other_worktree git status 2>../err &&
-	echo "warning: untracked cache is disabled on this system or location" >../expect &&
-	test_cmp ../expect ../err
+	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
 
-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
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	done/five
-	done/four
-	done/sub/
-	dtwo/
-	four
+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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 48 - test ident field is working
+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 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 &&
+expecting success of 7614.4 'git merge --no-signoff flag cancels --signoff flag': 
 	git checkout main &&
-	test-tool dump-untracked-cache >../after &&
-	test_cmp ../before ../after
+	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
 
-[main 9462075] empty
- Author: A U Thor <author@example.com>
-Switched to a new branch 'other_branch'
-[other_branch b773b8a] test
+Switched to branch 'main'
+[main 6807046] main-branch-4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 test.t
-Switched to branch 'main'
-M	done/two
-Already on 'main'
-M	done/two
-ok 49 - untracked cache survives a checkout
+ create mode 100644 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
 
-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
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7611-merge-abort.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7611-merge-abort/.git/
+expecting success of 7611.1 'setup': 
+	# Create the above repo
+	echo foo > foo &&
+	echo bar > bar &&
+	echo baz > baz &&
+	git add foo bar baz &&
+	git commit -m initial &&
+	echo bazz > baz &&
+	git commit -a -m "second" &&
+	git checkout -b conflict_branch HEAD^ &&
+	echo barf > bar &&
+	echo bazf > baz &&
+	git commit -a -m "conflict" &&
+	git checkout -b clean_branch HEAD^ &&
+	echo bart > bar &&
+	git commit -a -m "clean" &&
+	git checkout main
 
-[main 527fa0b] commit
+[main (root-commit) a2f18f2] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 bar
+ create mode 100644 baz
+ create mode 100644 foo
+[main 9b32786] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 50 - untracked cache survives a commit
-
-expecting success of 7063.51 'teardown worktree': 
-	cd ..
-
-ok 51 - teardown worktree
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7063.52 'setup worktree for symlink test': 
-	git init worktree-symlink &&
-	cd worktree-symlink &&
-	git config core.untrackedCache true &&
-	mkdir one two &&
-	touch one/file two/file &&
-	git add one/file two/file &&
-	git commit -m"first commit" &&
-	git rm -rf one &&
-	ln -s two one &&
-	git add one &&
-	git commit -m"second commit"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7063-status-untracked-cache/worktree-symlink/.git/
-[main (root-commit) 294fddc] first commit
+Switched to a new branch 'conflict_branch'
+[conflict_branch 98f9ce9] conflict
  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
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'clean_branch'
+[clean_branch e1014b4] clean
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 one
- delete mode 100644 one/file
-ok 52 - setup worktree for symlink test
-
-expecting success of 7063.53 '"status" after symlink replacement should be clean with UC=true': 
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	status_is_clean
-
-Note: switching to 'HEAD~'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 1 - setup
 
-  git switch -
+expecting success of 7611.2 'fails without MERGE_HEAD (unstarted merge)': 
+	test_must_fail git merge --abort 2>output &&
+	test_grep MERGE_HEAD output
 
-Turn off this advice by setting config variable advice.detachedHead to false
+fatal: There is no merge to abort (MERGE_HEAD missing).
+ok 2 - fails without MERGE_HEAD (unstarted merge)
 
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 53 - "status" after symlink replacement should be clean with UC=true
+expecting success of 7611.3 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity': 
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)"
 
-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
+ok 3 - fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity
 
-Note: switching to 'HEAD~'.
+expecting success of 7611.4 'fails without MERGE_HEAD (completed merge)': 
+	git merge clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	# Merge successfully completed
+	post_merge_head="$(git rev-parse HEAD)" &&
+	test_must_fail git merge --abort 2>output &&
+	test_grep MERGE_HEAD output
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Merge made by the 'ort' strategy.
+ bar | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: There is no merge to abort (MERGE_HEAD missing).
+ok 4 - fails without MERGE_HEAD (completed merge)
 
-If you want to 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 7611.5 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity': 
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$post_merge_head" = "$(git rev-parse HEAD)"
 
-  git switch -c <new-branch-name>
+ok 5 - fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity
 
-Or undo this operation with:
+expecting success of 7611.6 'Forget previous merge': 
+	git reset --hard "$pre_merge_head"
 
-  git switch -
+HEAD is now at 9b32786 second
+ok 6 - Forget previous merge
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7611.7 'Abort after --no-commit': 
+	# Redo merge, but stop before creating merge commit
+	git merge --no-commit clean_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort non-conflicting merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --staged)"
 
-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
+Automatic merge went well; stopped before committing as requested
+ok 7 - Abort after --no-commit
 
-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 7611.8 'Abort after conflicts': 
+	# Create conflicting merge
+	test_must_fail git merge conflict_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort conflicting merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --staged)"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+Auto-merging baz
+CONFLICT (content): Merge conflict in baz
+Automatic merge failed; fix conflicts and then commit the result.
+ok 8 - Abort after conflicts
 
-expecting success of 7063.56 '"status" after file replacement should be clean with UC=true': 
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	test-tool dump-untracked-cache >../actual &&
-	grep -F "recurse valid" ../actual >../actual.grep &&
-	cat >../expect.grep <<EOF &&
-/ $ZERO_OID recurse valid
-/two/ $ZERO_OID recurse valid
-EOF
-	status_is_clean &&
-	test_cmp ../expect.grep ../actual.grep
+expecting success of 7611.9 'Clean merge with dirty index fails': 
+	echo xyzzy >> foo &&
+	git add foo &&
+	git diff --staged > expect &&
+	test_must_fail git merge clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	git diff --staged > actual &&
+	test_cmp expect actual
 
-Note: switching to 'HEAD~'.
+error: Your local changes to the following files would be overwritten by merge:
+  foo
+Merge with strategy ort failed.
+ok 9 - Clean merge with dirty index fails
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 7611.10 'Conflicting merge with dirty index fails': 
+	test_must_fail git merge conflict_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	git diff --staged > actual &&
+	test_cmp expect actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+error: Your local changes to the following files would be overwritten by merge:
+  foo
+Merge with strategy ort failed.
+ok 10 - Conflicting merge with dirty index fails
 
-  git switch -c <new-branch-name>
+expecting success of 7611.11 'Reset index (but preserve worktree changes)': 
+	git reset "$pre_merge_head" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-Or undo this operation with:
+Unstaged changes after reset:
+M	foo
+ok 11 - Reset index (but preserve worktree changes)
 
-  git switch -
+expecting success of 7611.12 'Abort clean merge with non-conflicting dirty worktree': 
+	git merge --no-commit clean_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Automatic merge went well; stopped before committing as requested
+ok 12 - Abort clean merge with non-conflicting dirty worktree
 
-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 7611.13 'Abort conflicting merge with non-conflicting dirty worktree': 
+	test_must_fail git merge conflict_branch &&
+	test_path_is_file .git/MERGE_HEAD &&
+	# Abort merge
+	git merge --abort &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-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
+Auto-merging baz
+CONFLICT (content): Merge conflict in baz
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - Abort conflicting merge with non-conflicting dirty worktree
 
-Note: switching to 'HEAD~'.
+expecting success of 7611.14 'Reset worktree changes': 
+	git reset --hard "$pre_merge_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.
+HEAD is now at 9b32786 second
+ok 14 - Reset worktree changes
 
-If you want to 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 7611.15 'Fail clean merge with conflicting dirty worktree': 
+	echo xyzzy >> bar &&
+	git diff > expect &&
+	test_must_fail git merge --no-commit clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-  git switch -c <new-branch-name>
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 15 - Fail clean merge with conflicting dirty worktree
 
-Or undo this operation with:
+expecting success of 7611.16 'Fail conflicting merge with conflicting dirty worktree': 
+	test_must_fail git merge conflict_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-  git switch -
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 16 - Fail conflicting merge with conflicting dirty worktree
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7611.17 'Reset worktree changes': 
+	git reset --hard "$pre_merge_head"
 
-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
+HEAD is now at 9b32786 second
+ok 17 - Reset worktree changes
 
-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 7611.18 'Fail clean merge with matching dirty worktree': 
+	echo bart > bar &&
+	git diff > expect &&
+	test_must_fail git merge --no-commit clean_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/emptyrepo/.git/
-4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 58 - empty repo (no index) and core.untrackedCache
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 18 - Fail clean merge with matching dirty worktree
 
-# passed all 58 test(s)
-1..58
+expecting success of 7611.19 'Fail conflicting merge with matching dirty worktree': 
+	echo barf > bar &&
+	git diff > expect &&
+	test_must_fail git merge conflict_branch &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
+
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 19 - Fail conflicting merge with matching dirty worktree
+
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7513-interpret-trailers.sh ***
@@ -485963,144 +487098,1203 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7608-merge-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7608-merge-messages/.git/
-expecting success of 7608.1 'merge local branch': 
-	test_commit main-1 &&
-	git checkout -b local-branch &&
-	test_commit branch-1 &&
-	git checkout main &&
-	test_commit main-2 &&
-	git merge local-branch &&
-	check_oneline "Merge branch Qlocal-branchQ"
+*** t7702-repack-cyclic-alternate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-[main (root-commit) 8ad97f7] main-1
+[master (root-commit) 9b08673] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 1 - setup
+
+expecting success of 7702.2 're-packing repository with itself as alternate': 
+	git repack -adl &&
+	git fsck
+
+ok 2 - re-packing repository with itself as alternate
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7601-merge-pull-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7601-merge-pull-config/.git/
+expecting success of 7601.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 >c3.c &&
+	git add c3.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 main-1.t
-Switched to a new branch 'local-branch'
-[local-branch 7bd44c4] branch-1
+ create mode 100644 c0.c
+[master 429abf0] c1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-Switched to branch 'main'
-[main 9b0bdc1] main-2
+ create mode 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 main-2.t
+ 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
+ok 1 - setup
+
+expecting success of 7601.2 'pull.rebase not set, ff possible': 
+	git reset --hard c0 &&
+	git pull . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at e4f5a3c c0
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 2 - pull.rebase not set, ff possible
+
+expecting success of 7601.3 'pull.rebase not set and pull.ff=true': 
+	git reset --hard c0 &&
+	test_config pull.ff true &&
+	git pull . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at e4f5a3c c0
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 3 - pull.rebase not set and pull.ff=true
+
+expecting success of 7601.4 'pull.rebase not set and pull.ff=false': 
+	git reset --hard c0 &&
+	test_config pull.ff false &&
+	git pull . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at e4f5a3c c0
 Merge made by the 'ort' strategy.
- branch-1.t | 1 +
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-ok 1 - merge local branch
+ create mode 100644 c1.c
+ok 4 - pull.rebase not set and pull.ff=false
 
-expecting success of 7608.2 'merge octopus branches': 
-	git checkout -b octopus-a main &&
-	test_commit octopus-1 &&
-	git checkout -b octopus-b main &&
-	test_commit octopus-2 &&
-	git checkout main &&
-	git merge octopus-a octopus-b &&
-	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
+expecting success of 7601.5 'pull.rebase not set and pull.ff=only': 
+	git reset --hard c0 &&
+	test_config pull.ff only &&
+	git pull . c1 2>err &&
+	test_grep ! "You have divergent branches" err
 
-Switched to a new branch 'octopus-a'
-[octopus-a d4e293f] octopus-1
- Author: A U Thor <author@example.com>
+HEAD is now at e4f5a3c c0
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 octopus-1.t
-Switched to a new branch 'octopus-b'
-[octopus-b fd085cf] octopus-2
- Author: A U Thor <author@example.com>
+ create mode 100644 c1.c
+ok 5 - pull.rebase not set and pull.ff=only
+
+expecting success of 7601.6 'pull.rebase not set and --rebase given': 
+	git reset --hard c0 &&
+	git pull --rebase . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at e4f5a3c c0
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 octopus-2.t
-Switched to branch 'main'
-Fast-forwarding to: octopus-a
-Trying simple merge with octopus-b
-Merge made by the 'octopus' strategy.
- octopus-1.t | 1 +
- octopus-2.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 octopus-1.t
- create mode 100644 octopus-2.t
-ok 2 - merge octopus branches
+ create mode 100644 c1.c
+ok 6 - pull.rebase not set and --rebase given
 
-expecting success of 7608.3 'merge tag': 
-	git checkout -b tag-branch main &&
-	test_commit tag-1 &&
-	git checkout main &&
-	test_commit main-3 &&
-	git merge tag-1 &&
-	check_oneline "Merge tag Qtag-1Q"
+expecting success of 7601.7 'pull.rebase not set and --no-rebase given': 
+	git reset --hard c0 &&
+	git pull --no-rebase . c1 2>err &&
+	test_grep ! "You have divergent branches" err
 
-Switched to a new branch 'tag-branch'
-[tag-branch 6757378] tag-1
- Author: A U Thor <author@example.com>
+HEAD is now at e4f5a3c c0
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 tag-1.t
-Switched to branch 'main'
-[main a5de04f] main-3
- Author: A U Thor <author@example.com>
+ create mode 100644 c1.c
+ok 7 - pull.rebase not set and --no-rebase given
+
+expecting success of 7601.8 'pull.rebase not set and --ff given': 
+	git reset --hard c0 &&
+	git pull --ff . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at e4f5a3c c0
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 main-3.t
+ create mode 100644 c1.c
+ok 8 - pull.rebase not set and --ff given
+
+expecting success of 7601.9 'pull.rebase not set and --no-ff given': 
+	git reset --hard c0 &&
+	git pull --no-ff . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at e4f5a3c c0
 Merge made by the 'ort' strategy.
- tag-1.t | 1 +
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 tag-1.t
-ok 3 - merge tag
+ create mode 100644 c1.c
+ok 9 - pull.rebase not set and --no-ff given
 
-expecting success of 7608.4 'ambiguous tag': 
-	git checkout -b ambiguous main &&
-	test_commit ambiguous &&
-	git checkout main &&
-	test_commit main-4 &&
-	git merge ambiguous &&
-	check_oneline "Merge tag QambiguousQ"
+expecting success of 7601.10 'pull.rebase not set and --ff-only given': 
+	git reset --hard c0 &&
+	git pull --ff-only . c1 2>err &&
+	test_grep ! "You have divergent branches" err
 
-Switched to a new branch 'ambiguous'
-[ambiguous ab5df7f] ambiguous
- Author: A U Thor <author@example.com>
+HEAD is now at e4f5a3c c0
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 ambiguous.t
-Switched to branch 'main'
-[main f5d97b7] main-4
- Author: A U Thor <author@example.com>
+ create mode 100644 c1.c
+ok 10 - pull.rebase not set and --ff-only given
+
+expecting success of 7601.11 'pull.rebase not set (not-fast-forward)': 
+	git reset --hard c2 &&
+	test_must_fail git -c color.advice=always pull . c1 2>err &&
+	test_decode_color <err >decoded &&
+	test_grep "<YELLOW>hint: " decoded &&
+	test_grep "You have divergent branches" decoded
+
+HEAD is now at 028ea41 c2
+<YELLOW>hint: You have divergent branches and need to specify how to reconcile them.<RESET>
+<YELLOW>hint: You can do so by running one of the following commands sometime before<RESET>
+<YELLOW>hint: your next pull:<RESET>
+<YELLOW>hint:   git config pull.rebase false  # merge<RESET>
+<YELLOW>hint:   git config pull.rebase true   # rebase<RESET>
+<YELLOW>hint:   git config pull.ff only       # fast-forward only<RESET>
+<YELLOW>hint: You can replace "git config" with "git config --global" to set a default<RESET>
+<YELLOW>hint: preference for all repositories. You can also pass --rebase, --no-rebase,<RESET>
+<YELLOW>hint: or --ff-only on the command line to override the configured default per<RESET>
+<YELLOW>hint: invocation.<RESET>
+<YELLOW>hint: You have divergent branches and need to specify how to reconcile them.<RESET>
+ok 11 - pull.rebase not set (not-fast-forward)
+
+expecting success of 7601.12 'pull.rebase not set and pull.ff=true (not-fast-forward)': 
+	git reset --hard c2 &&
+	test_config pull.ff true &&
+	git pull . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 main-4.t
-warning: refname 'ambiguous' is ambiguous.
-warning: refname 'ambiguous' is ambiguous.
+ create mode 100644 c1.c
+ok 12 - pull.rebase not set and pull.ff=true (not-fast-forward)
+
+expecting success of 7601.13 'pull.rebase not set and pull.ff=false (not-fast-forward)': 
+	git reset --hard c2 &&
+	test_config pull.ff false &&
+	git pull . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
 Merge made by the 'ort' strategy.
- ambiguous.t | 1 +
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 ambiguous.t
-ok 4 - ambiguous tag
+ create mode 100644 c1.c
+ok 13 - pull.rebase not set and pull.ff=false (not-fast-forward)
 
-expecting success of 7608.5 'remote-tracking branch': 
-	git checkout -b remote main &&
-	test_commit remote-1 &&
-	git update-ref refs/remotes/origin/main remote &&
+expecting success of 7601.14 'pull.rebase not set and pull.ff=only (not-fast-forward)': 
+	git reset --hard c2 &&
+	test_config pull.ff only &&
+	test_must_fail git pull . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
+ok 14 - pull.rebase not set and pull.ff=only (not-fast-forward)
+
+expecting success of 7601.15 'pull.rebase not set and --rebase given (not-fast-forward)': 
+	git reset --hard c2 &&
+	git pull --rebase . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
+ok 15 - pull.rebase not set and --rebase given (not-fast-forward)
+
+expecting success of 7601.16 'pull.rebase not set and --no-rebase given (not-fast-forward)': 
+	git reset --hard c2 &&
+	git pull --no-rebase . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 16 - pull.rebase not set and --no-rebase given (not-fast-forward)
+
+expecting success of 7601.17 'pull.rebase not set and --ff given (not-fast-forward)': 
+	git reset --hard c2 &&
+	git pull --ff . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 17 - pull.rebase not set and --ff given (not-fast-forward)
+
+expecting success of 7601.18 'pull.rebase not set and --no-ff given (not-fast-forward)': 
+	git reset --hard c2 &&
+	git pull --no-ff . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 18 - pull.rebase not set and --no-ff given (not-fast-forward)
+
+expecting success of 7601.19 'pull.rebase not set and --ff-only given (not-fast-forward)': 
+	git reset --hard c2 &&
+	test_must_fail git pull --ff-only . c1 2>err &&
+	test_grep ! "You have divergent branches" err
+
+HEAD is now at 028ea41 c2
+ok 19 - pull.rebase not set and --ff-only given (not-fast-forward)
+
+expecting success of 7601.20 '--ff-only overrides --rebase': 
+	test_attempts_fast_forward pull --rebase --ff-only
+
+HEAD is now at 028ea41 c2
+fatal: Not possible to fast-forward, aborting.
+ok 20 - --ff-only overrides --rebase
+
+expecting success of 7601.21 '--ff-only overrides --rebase even if first': 
+	test_attempts_fast_forward pull --ff-only --rebase
+
+HEAD is now at 028ea41 c2
+fatal: Not possible to fast-forward, aborting.
+ok 21 - --ff-only overrides --rebase even if first
+
+expecting success of 7601.22 '--ff-only overrides --no-rebase': 
+	test_attempts_fast_forward pull --ff-only --no-rebase
+
+HEAD is now at 028ea41 c2
+fatal: Not possible to fast-forward, aborting.
+ok 22 - --ff-only overrides --no-rebase
+
+expecting success of 7601.23 'pull.ff=only overrides pull.rebase=true': 
+	test_attempts_fast_forward -c pull.ff=only -c pull.rebase=true pull
+
+HEAD is now at 028ea41 c2
+fatal: Not possible to fast-forward, aborting.
+ok 23 - pull.ff=only overrides pull.rebase=true
+
+expecting success of 7601.24 'pull.ff=only overrides pull.rebase=false': 
+	test_attempts_fast_forward -c pull.ff=only -c pull.rebase=false pull
+
+HEAD is now at 028ea41 c2
+fatal: Not possible to fast-forward, aborting.
+ok 24 - pull.ff=only overrides pull.rebase=false
+
+expecting success of 7601.25 '--rebase overrides --no-ff': 
+	test_does_rebase pull --rebase --no-ff
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 25 - --rebase overrides --no-ff
+
+expecting success of 7601.26 '--rebase overrides --ff': 
+	test_does_rebase pull --rebase --ff
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 26 - --rebase overrides --ff
+
+expecting success of 7601.27 '--rebase fast-forwards when possible': 
+	test_does_fast_forward pull --rebase --ff
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 27 - --rebase fast-forwards when possible
+
+expecting success of 7601.28 'pull.rebase=true overrides pull.ff=false': 
+	test_does_rebase -c pull.rebase=true -c pull.ff=false pull
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 28 - pull.rebase=true overrides pull.ff=false
+
+expecting success of 7601.29 'pull.rebase=true overrides pull.ff=true': 
+	test_does_rebase -c pull.rebase=true -c pull.ff=true pull
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 29 - pull.rebase=true overrides pull.ff=true
+
+expecting success of 7601.30 '--ff-only takes precedence over pull.rebase=true': 
+	test_attempts_fast_forward -c pull.rebase=true pull --ff-only
+
+HEAD is now at 028ea41 c2
+fatal: Not possible to fast-forward, aborting.
+ok 30 - --ff-only takes precedence over pull.rebase=true
+
+expecting success of 7601.31 '--ff-only takes precedence over pull.rebase=false': 
+	test_attempts_fast_forward -c pull.rebase=false pull --ff-only
+
+HEAD is now at 028ea41 c2
+fatal: Not possible to fast-forward, aborting.
+ok 31 - --ff-only takes precedence over pull.rebase=false
+
+expecting success of 7601.32 '--no-rebase takes precedence over pull.ff=only': 
+	test_falls_back_to_full_merge -c pull.ff=only pull --no-rebase
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 32 - --no-rebase takes precedence over pull.ff=only
+
+expecting success of 7601.33 '--rebase takes precedence over pull.ff=only': 
+	test_does_rebase -c pull.ff=only pull --rebase
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 33 - --rebase takes precedence over pull.ff=only
+
+expecting success of 7601.34 '--rebase overrides pull.ff=true': 
+	test_does_rebase -c pull.ff=true pull --rebase
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 34 - --rebase overrides pull.ff=true
+
+expecting success of 7601.35 '--rebase overrides pull.ff=false': 
+	test_does_rebase -c pull.ff=false pull --rebase
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 35 - --rebase overrides pull.ff=false
+
+expecting success of 7601.36 '--rebase overrides pull.ff unset': 
+	test_does_rebase pull --rebase
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 36 - --rebase overrides pull.ff unset
+
+expecting success of 7601.37 '--no-rebase works with --no-ff': 
+	test_does_merge_when_ff_possible pull --no-rebase --no-ff
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 37 - --no-rebase works with --no-ff
+
+expecting success of 7601.38 '--no-rebase works with --ff': 
+	test_does_fast_forward pull --no-rebase --ff
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 38 - --no-rebase works with --ff
+
+expecting success of 7601.39 '--no-rebase does ff if pull.ff unset': 
+	test_does_fast_forward pull --no-rebase
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 39 - --no-rebase does ff if pull.ff unset
+
+expecting success of 7601.40 '--no-rebase heeds pull.ff=true': 
+	test_does_fast_forward -c pull.ff=true pull --no-rebase
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 40 - --no-rebase heeds pull.ff=true
+
+expecting success of 7601.41 '--no-rebase heeds pull.ff=false': 
+	test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 41 - --no-rebase heeds pull.ff=false
+
+expecting success of 7601.42 'pull.rebase=true and --no-ff': 
+	test_does_rebase -c pull.rebase=true pull --no-ff
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 42 - pull.rebase=true and --no-ff
+
+expecting success of 7601.43 'pull.rebase=true and --ff': 
+	test_does_rebase -c pull.rebase=true pull --ff
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 43 - pull.rebase=true and --ff
+
+expecting success of 7601.44 'pull.rebase=false and --no-ff': 
+	test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 44 - pull.rebase=false and --no-ff
+
+expecting success of 7601.45 'pull.rebase=false and --ff, ff possible': 
+	test_does_fast_forward -c pull.rebase=false pull --ff
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 45 - pull.rebase=false and --ff, ff possible
+
+expecting success of 7601.46 'pull.rebase=false and --ff, ff not possible': 
+	test_falls_back_to_full_merge -c pull.rebase=false pull --ff
+
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 46 - pull.rebase=false and --ff, ff not possible
+
+expecting success of 7601.47 'Multiple heads warns about inability to fast forward': 
+	git reset --hard c1 &&
+	test_must_fail git pull . c2 c3 2>err &&
+	test_grep "You have divergent branches" err
+
+HEAD is now at 429abf0 c1
+hint: You have divergent branches and need to specify how to reconcile them.
+ok 47 - Multiple heads warns about inability to fast forward
+
+expecting success of 7601.48 'Multiple can never be fast forwarded': 
+	git reset --hard c0 &&
+	test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
+	test_grep ! "You have divergent branches" err &&
+	# In addition to calling out "cannot fast-forward", we very much
+	# want the "multiple branches" piece to be called out to users.
+	test_grep "Cannot fast-forward to multiple branches" err
+
+HEAD is now at e4f5a3c c0
+fatal: Cannot fast-forward to multiple branches.
+ok 48 - Multiple can never be fast forwarded
+
+expecting success of 7601.49 'Cannot rebase with multiple heads': 
+	git reset --hard c0 &&
+	test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
+	test_grep ! "You have divergent branches" err &&
+	test_grep "Cannot rebase onto multiple branches." err
+
+HEAD is now at e4f5a3c c0
+fatal: Cannot rebase onto multiple branches.
+ok 49 - Cannot rebase with multiple heads
+
+expecting success of 7601.50 'merge c1 with c2': 
+	git reset --hard c1 &&
+	test_path_is_file c0.c &&
+	test_path_is_file c1.c &&
+	test_path_is_missing c2.c &&
+	test_path_is_missing c3.c &&
+	git merge c2 &&
+	test_path_is_file c1.c &&
+	test_path_is_file c2.c
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 50 - merge c1 with c2
+
+expecting success of 7601.51 'fast-forward pull succeeds with "true" in pull.ff': 
+	git reset --hard c0 &&
+	test_config pull.ff true &&
+	git pull . c1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 51 - fast-forward pull succeeds with "true" in pull.ff
+
+expecting success of 7601.52 'pull.ff=true overrides merge.ff=false': 
+	git reset --hard c0 &&
+	test_config merge.ff false &&
+	test_config pull.ff true &&
+	git pull . c1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 52 - pull.ff=true overrides merge.ff=false
+
+expecting success of 7601.53 'fast-forward pull creates merge with "false" in pull.ff': 
+	git reset --hard c0 &&
+	test_config pull.ff false &&
+	git pull . c1 &&
+	test "$(git rev-parse HEAD^1)" = "$(git rev-parse c0)" &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)"
+
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 53 - fast-forward pull creates merge with "false" in pull.ff
+
+expecting success of 7601.54 'pull prevents non-fast-forward with "only" in pull.ff': 
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	test_must_fail git pull . c3
+
+HEAD is now at 429abf0 c1
+From .
+ * tag               c3         -> FETCH_HEAD
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config set advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+ok 54 - pull prevents non-fast-forward with "only" in pull.ff
+
+expecting success of 7601.55 'already-up-to-date pull succeeds with unspecified pull.ff': 
+	git reset --hard c1 &&
+	git pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+
+HEAD is now at 429abf0 c1
+From .
+ * tag               c0         -> FETCH_HEAD
+Already up to date.
+ok 55 - already-up-to-date pull succeeds with unspecified pull.ff
+
+expecting success of 7601.56 'already-up-to-date pull succeeds with "only" in pull.ff': 
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	git pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+
+HEAD is now at 429abf0 c1
+From .
+ * tag               c0         -> FETCH_HEAD
+Already up to date.
+ok 56 - already-up-to-date pull succeeds with "only" in pull.ff
+
+expecting success of 7601.57 'already-up-to-date pull/rebase succeeds with "only" in pull.ff': 
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	git -c pull.rebase=true pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+
+HEAD is now at 429abf0 c1
+From .
+ * tag               c0         -> FETCH_HEAD
+Already up to date.
+ok 57 - already-up-to-date pull/rebase succeeds with "only" in pull.ff
+
+expecting success of 7601.58 'merge c1 with c2 (ours in pull.twohead)': 
+	git reset --hard c1 &&
+	git config pull.twohead ours &&
+	git merge c2 &&
+	test_path_is_file c1.c &&
+	test_path_is_missing c2.c
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ours' strategy.
+ok 58 - merge c1 with c2 (ours in pull.twohead)
+
+expecting success of 7601.59 'merge c1 with c2 and c3 (recursive in pull.octopus)': 
+	git reset --hard c1 &&
+	git config pull.octopus "recursive" &&
+	test_must_fail git merge c2 c3 &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD)"
+
+HEAD is now at 429abf0 c1
+error: Not handling anything other than two heads merge.
+Merge with strategy ort failed.
+ok 59 - merge c1 with c2 and c3 (recursive in pull.octopus)
+
+expecting success of 7601.60 'merge c1 with c2 and c3 (recursive and octopus in pull.octopus)': 
+	git reset --hard c1 &&
+	git config pull.octopus "recursive octopus" &&
+	git merge c2 c3 &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
+	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
+	test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
+	git diff --exit-code &&
+	test_path_is_file c0.c &&
+	test_path_is_file c1.c &&
+	test_path_is_file c2.c &&
+	test_path_is_file c3.c
+
+HEAD is now at 429abf0 c1
+error: Not handling anything other than two heads merge.
+Trying merge strategy ort...
+Rewinding the tree to pristine...
+Trying merge strategy octopus...
+Trying simple merge with c2
+Trying simple merge with c3
+Merge made by the 'octopus' strategy.
+ c2.c | 1 +
+ c3.c | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ok 60 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus)
+
+expecting success of 7601.61 'setup conflicted merge': 
+	git reset --hard c0 &&
+	echo A >conflict.c &&
+	git add conflict.c &&
+	echo contents >foo.c &&
+	git add foo.c &&
+	git commit -m c4 &&
+	git tag c4 &&
+	echo B >conflict.c &&
+	git add conflict.c &&
+	git mv foo.c bar.c &&
+	git commit -m c5 &&
+	git tag c5 &&
+	git reset --hard c4 &&
+	echo C >conflict.c &&
+	git add conflict.c &&
+	echo secondline >> foo.c &&
+	git add foo.c &&
+	git commit -m c6 &&
+	git tag c6
+
+HEAD is now at e4f5a3c c0
+[master fc941b1] c4
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 conflict.c
+ create mode 100644 foo.c
+[master 085299c] c5
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename foo.c => bar.c (100%)
+HEAD is now at fc941b1 c4
+[master cad9e93] c6
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 61 - setup conflicted merge
+
+expecting success of 7601.62 'merge picks up the best result': 
+	git config --unset-all pull.twohead &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s resolve c6 &&
+	resolve_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s recursive c6 &&
+	recursive_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s recursive -s resolve c6 &&
+	auto_count=$(conflict_count) &&
+	test $auto_count = $recursive_count &&
+	test $auto_count != $resolve_count
+
+HEAD is now at 085299c c5
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Trying merge strategy ort...
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Rewinding the tree to pristine...
+Trying merge strategy resolve...
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Rewinding the tree to pristine...
+Using the ort strategy to prepare resolving by hand.
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+ok 62 - merge picks up the best result
+
+expecting success of 7601.63 'merge picks up the best result (from config)': 
+	git config pull.twohead "recursive resolve" &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s resolve c6 &&
+	resolve_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s recursive c6 &&
+	recursive_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge c6 &&
+	auto_count=$(conflict_count) &&
+	test $auto_count = $recursive_count &&
+	test $auto_count != $resolve_count
+
+HEAD is now at 085299c c5
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Trying merge strategy ort...
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Rewinding the tree to pristine...
+Trying merge strategy resolve...
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Rewinding the tree to pristine...
+Using the ort strategy to prepare resolving by hand.
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+ok 63 - merge picks up the best result (from config)
+
+expecting success of 7601.64 'merge errors out on invalid strategy': 
+	git config pull.twohead "foobar" &&
+	git reset --hard c5 &&
+	test_must_fail git merge c6
+
+HEAD is now at 085299c c5
+Could not find merge strategy 'foobar'.
+Available strategies are: octopus ours recursive resolve subtree.
+ok 64 - merge errors out on invalid strategy
+
+expecting success of 7601.65 'merge errors out on invalid strategy': 
+	git config --unset-all pull.twohead &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s "resolve recursive" c6
+
+HEAD is now at 085299c c5
+Could not find merge strategy 'resolve recursive'.
+Available strategies are: octopus ours recursive resolve subtree.
+ok 65 - merge errors out on invalid strategy
+
+# passed all 65 test(s)
+1..65
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7701-repack-unpack-unreachable.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7701-repack-unpack-unreachable/.git/
+expecting success of 7701.1 '-A with -d option leaves unreachable objects unpacked': 
+	echo content > file1 &&
+	git add . &&
+	test_tick &&
+	git commit -m initial_commit &&
+	# create a transient branch with unique content
+	git checkout -b transient_branch &&
+	echo more content >> file1 &&
+	# record the objects created in the database for file, commit, tree
+	fsha1=$(git hash-object file1) &&
+	test_tick &&
+	git commit -a -m more_content &&
+	csha1=$(git rev-parse HEAD^{commit}) &&
+	tsha1=$(git rev-parse HEAD^{tree}) &&
 	git checkout main &&
-	test_commit main-5 &&
-	git merge origin/main &&
-	check_oneline "Merge remote-tracking branch Qorigin/mainQ"
+	echo even more content >> file1 &&
+	test_tick &&
+	git commit -a -m even_more_content &&
+	# delete the transient branch
+	git branch -D transient_branch &&
+	# pack the repo
+	git repack -A -d -l &&
+	# verify objects are packed in repository
+	test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
+		   grep -E "^($fsha1|$csha1|$tsha1) " |
+		   sort | uniq | wc -l) &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1 &&
+	# now expire the reflog, while keeping reachable ones but expiring
+	# unreachables immediately
+	test_tick &&
+	sometimeago=$(( $test_tick - 10000 )) &&
+	git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
+	# and repack
+	git repack -A -d -l &&
+	# verify objects are retained unpacked
+	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
+		   grep -E "^($fsha1|$csha1|$tsha1) " |
+		   sort | uniq | wc -l) &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1
 
-Switched to a new branch 'remote'
-[remote 52036b0] remote-1
+[main (root-commit) 5236a77] initial_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'transient_branch'
+[transient_branch 24d3dd6] more_content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 remote-1.t
 Switched to branch 'main'
-[main 25894a3] main-5
+[main 934cb86] even_more_content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 main-5.t
-Merge made by the 'ort' strategy.
- remote-1.t | 1 +
+Deleted branch transient_branch (was 24d3dd6).
+content
+more content
+commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    more_content
+
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
+
+file1
+content
+more content
+commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    more_content
+
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
+
+file1
+ok 1 - -A with -d option leaves unreachable objects unpacked
+
+expecting success of 7701.2 '-A without -d option leaves unreachable objects packed': 
+	fsha1path=$(echo "$fsha1" | sed -e "s|\(..\)|\1/|") &&
+	fsha1path=".git/objects/$fsha1path" &&
+	csha1path=$(echo "$csha1" | sed -e "s|\(..\)|\1/|") &&
+	csha1path=".git/objects/$csha1path" &&
+	tsha1path=$(echo "$tsha1" | sed -e "s|\(..\)|\1/|") &&
+	tsha1path=".git/objects/$tsha1path" &&
+	git branch transient_branch $csha1 &&
+	git repack -a -d -l &&
+	test ! -f "$fsha1path" &&
+	test ! -f "$csha1path" &&
+	test ! -f "$tsha1path" &&
+	test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) &&
+	packfile=$(ls .git/objects/pack/pack-*.pack) &&
+	git branch -D transient_branch &&
+	test_tick &&
+	git repack -A -l &&
+	test ! -f "$fsha1path" &&
+	test ! -f "$csha1path" &&
+	test ! -f "$tsha1path" &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1
+
+Deleted branch transient_branch (was 24d3dd6).
+content
+more content
+commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    more_content
+
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
+
+file1
+ok 2 - -A without -d option leaves unreachable objects packed
+
+expecting success of 7701.3 'unpacked objects receive timestamp of pack file': 
+	tmppack=".git/objects/pack/tmp_pack" &&
+	ln "$packfile" "$tmppack" &&
+	git repack -A -l -d &&
+	test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
+		> mtimes &&
+	compare_mtimes < mtimes
+
+ok 3 - unpacked objects receive timestamp of pack file
+
+expecting success of 7701.4 'do not bother loosening old objects': 
+	obj1=$(echo one | git hash-object -w --stdin) &&
+	obj2=$(echo two | git hash-object -w --stdin) &&
+	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
+	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
+	git prune-packed &&
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
+	git repack -A -d --unpack-unreachable=1.hour.ago &&
+	git cat-file -p $obj1 &&
+	test_must_fail git cat-file -p $obj2
+
+one
+two
+one
+fatal: Not a valid object name f719efd430d52bcfc8566a43b2eb655688d38871
+ok 4 - do not bother loosening old objects
+
+expecting success of 7701.5 'gc.recentObjectsHook': 
+	obj1=$(echo one | git hash-object -w --stdin) &&
+	obj2=$(echo two | git hash-object -w --stdin) &&
+	obj3=$(echo three | git hash-object -w --stdin) &&
+	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
+	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
+	pack3=$(echo $obj3 | git pack-objects .git/objects/pack/pack) &&
+	git prune-packed &&
+
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	git cat-file -p $obj3 &&
+
+	# make an unreachable annotated tag object to ensure we rescue objects
+	# which are reachable from non-pruned unreachable objects
+	obj2_tag="$(git mktag <<-EOF
+	object $obj2
+	type blob
+	tag obj2-tag
+	tagger T A Gger <tagger@example.com> 1234567890 -0000
+	EOF
+	)" &&
+
+	obj2_tag_pack="$(echo $obj2_tag | git pack-objects .git/objects/pack/pack)" &&
+	git prune-packed &&
+
+	write_script precious-objects <<-EOF &&
+	echo $obj2_tag
+	EOF
+	git config gc.recentObjectsHook ./precious-objects &&
+
+	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
+	test-tool chmtime =-86400 .git/objects/pack/pack-$pack3.pack &&
+	test-tool chmtime =-86400 .git/objects/pack/pack-$obj2_tag_pack.pack &&
+	git repack -A -d --unpack-unreachable=1.hour.ago &&
+
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	git cat-file -p $obj2_tag &&
+	test_must_fail git cat-file -p $obj3
+
+one
+two
+three
+one
+two
+object f719efd430d52bcfc8566a43b2eb655688d38871
+type blob
+tag obj2-tag
+tagger T A Gger <tagger@example.com> 1234567890 -0000
+fatal: Not a valid object name 2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
+ok 5 - gc.recentObjectsHook
+
+expecting success of 7701.6 'keep packed objects found only in index': 
+	echo my-unique-content >file &&
+	git add file &&
+	git commit -m "make it reachable" &&
+	git gc &&
+	git reset HEAD^ &&
+	git reflog expire --expire=now --all &&
+	git add file &&
+	test-tool chmtime =-86400 .git/objects/pack/* &&
+	git gc --prune=1.hour.ago &&
+	git cat-file blob :file
+
+[main 73784a1] make it reachable
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 remote-1.t
-ok 5 - remote-tracking branch
+ create mode 100644 file
+my-unique-content
+ok 6 - keep packed objects found only in index
 
-# passed all 5 test(s)
-1..5
+expecting success of 7701.7 'repack -k keeps unreachable packed objects': 
+	# create packed-but-unreachable object
+	sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
+	pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
+	git prune-packed &&
+
+	# -k should keep it
+	git repack -adk &&
+	git cat-file -p $sha1 &&
+
+	# and double check that without -k it would have been removed
+	git repack -ad &&
+	test_must_fail git cat-file -p $sha1
+
+unreachable-packed
+fatal: Not a valid object name bdf1d55da464c8ffc31aa0891954caf1baf216e8
+ok 7 - repack -k keeps unreachable packed objects
+
+expecting success of 7701.8 'repack -k packs unreachable loose objects': 
+	# create loose unreachable object
+	sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
+	objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
+	test_path_is_file $objpath &&
+
+	# and confirm that the loose object goes away, but we can
+	# still access it (ergo, it is packed)
+	git repack -adk &&
+	test_path_is_missing $objpath &&
+	git cat-file -p $sha1
+
+would-be-deleted-loose
+ok 8 - repack -k packs unreachable loose objects
+
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7406-submodule-update.sh ***
@@ -488157,1744 +490351,200 @@
 1..68
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7612-merge-verify-signatures.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7614-merge-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7615-diff-algo-with-mergy-operations.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7615-diff-algo-with-mergy-operations/.git/
-expecting success of 7615.1 'setup': 
-	cp "$TEST_DIRECTORY"/t7615/base.c file.c &&
-	git add file.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	cp "$TEST_DIRECTORY"/t7615/ours.c file.c &&
-	git add file.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	cp "$TEST_DIRECTORY"/t7615/theirs.c file.c &&
-	git add file.c &&
-	git commit -m c2 &&
-	git tag c2
-
-[master (root-commit) 2c9f7f3] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 17 insertions(+)
- create mode 100644 file.c
-[master 4e619f0] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+), 8 deletions(-)
-HEAD is now at 2c9f7f3 c0
-[master fffaeb5] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
-
-expecting success of 7615.2 'merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm': 
-	git reset --hard c1 &&
-	test_must_fail git merge -s recursive c2
-
-HEAD is now at 4e619f0 c1
-Merging:
-4e619f0 c1
-virtual c2
-found 1 common ancestor:
-2c9f7f3 c0
-Auto-merging file.c
-CONFLICT (content): Merge conflict in file.c
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - merge c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm
-
-expecting success of 7615.3 'merge c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram': 
-	git reset --hard c1 &&
-	git merge --strategy recursive -Xdiff-algorithm=histogram c2
-
-HEAD is now at 4e619f0 c1
-Merging:
-4e619f0 c1
-virtual c2
-found 1 common ancestor:
-2c9f7f3 c0
-Auto-merging file.c
-Merge made by the 'recursive' strategy.
- file.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 3 - merge c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram
-
-expecting success of 7615.4 'merge c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram': 
-	git reset --hard c1 &&
-	git config diff.algorithm histogram &&
-	git merge --strategy recursive c2
-
-HEAD is now at 4e619f0 c1
-Merging:
-4e619f0 c1
-virtual c2
-found 1 common ancestor:
-2c9f7f3 c0
-Auto-merging file.c
-Merge made by the 'recursive' strategy.
- file.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 4 - merge c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram
-
-expecting success of 7615.5 'cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm': 
-	git reset --hard c1 &&
-	test_must_fail git cherry-pick -s recursive c2
-
-HEAD is now at 4e619f0 c1
-fatal: bad revision 'recursive'
-ok 5 - cherry-pick c2 to c1 with recursive merge strategy fails with the current default myers diff algorithm
-
-expecting success of 7615.6 'cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram': 
-	git reset --hard c1 &&
-	git cherry-pick --strategy recursive -Xdiff-algorithm=histogram 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 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7611-merge-abort.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7611-merge-abort/.git/
-expecting success of 7611.1 'setup': 
-	# Create the above repo
-	echo foo > foo &&
-	echo bar > bar &&
-	echo baz > baz &&
-	git add foo bar baz &&
-	git commit -m initial &&
-	echo bazz > baz &&
-	git commit -a -m "second" &&
-	git checkout -b conflict_branch HEAD^ &&
-	echo barf > bar &&
-	echo bazf > baz &&
-	git commit -a -m "conflict" &&
-	git checkout -b clean_branch HEAD^ &&
-	echo bart > bar &&
-	git commit -a -m "clean" &&
-	git checkout main
-
-[main (root-commit) a2f18f2] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 bar
- create mode 100644 baz
- create mode 100644 foo
-[main 9b32786] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflict_branch'
-[conflict_branch 98f9ce9] conflict
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'clean_branch'
-[clean_branch e1014b4] clean
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 7611.2 'fails without MERGE_HEAD (unstarted merge)': 
-	test_must_fail git merge --abort 2>output &&
-	test_grep MERGE_HEAD output
-
-fatal: There is no merge to abort (MERGE_HEAD missing).
-ok 2 - fails without MERGE_HEAD (unstarted merge)
-
-expecting success of 7611.3 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity': 
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)"
-
-ok 3 - fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity
-
-expecting success of 7611.4 'fails without MERGE_HEAD (completed merge)': 
-	git merge clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	# Merge successfully completed
-	post_merge_head="$(git rev-parse HEAD)" &&
-	test_must_fail git merge --abort 2>output &&
-	test_grep MERGE_HEAD output
-
-Merge made by the 'ort' strategy.
- bar | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: There is no merge to abort (MERGE_HEAD missing).
-ok 4 - fails without MERGE_HEAD (completed merge)
-
-expecting success of 7611.5 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity': 
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$post_merge_head" = "$(git rev-parse HEAD)"
-
-ok 5 - fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity
-
-expecting success of 7611.6 'Forget previous merge': 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 9b32786 second
-ok 6 - Forget previous merge
-
-expecting success of 7611.7 'Abort after --no-commit': 
-	# Redo merge, but stop before creating merge commit
-	git merge --no-commit clean_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort non-conflicting merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	test -z "$(git diff --staged)"
-
-Automatic merge went well; stopped before committing as requested
-ok 7 - Abort after --no-commit
-
-expecting success of 7611.8 'Abort after conflicts': 
-	# Create conflicting merge
-	test_must_fail git merge conflict_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort conflicting merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	test -z "$(git diff --staged)"
-
-Auto-merging baz
-CONFLICT (content): Merge conflict in baz
-Automatic merge failed; fix conflicts and then commit the result.
-ok 8 - Abort after conflicts
-
-expecting success of 7611.9 'Clean merge with dirty index fails': 
-	echo xyzzy >> foo &&
-	git add foo &&
-	git diff --staged > expect &&
-	test_must_fail git merge clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	git diff --staged > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-  foo
-Merge with strategy ort failed.
-ok 9 - Clean merge with dirty index fails
-
-expecting success of 7611.10 'Conflicting merge with dirty index fails': 
-	test_must_fail git merge conflict_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff)" &&
-	git diff --staged > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-  foo
-Merge with strategy ort failed.
-ok 10 - Conflicting merge with dirty index fails
-
-expecting success of 7611.11 'Reset index (but preserve worktree changes)': 
-	git reset "$pre_merge_head" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-Unstaged changes after reset:
-M	foo
-ok 11 - Reset index (but preserve worktree changes)
-
-expecting success of 7611.12 'Abort clean merge with non-conflicting dirty worktree': 
-	git merge --no-commit clean_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-Automatic merge went well; stopped before committing as requested
-ok 12 - Abort clean merge with non-conflicting dirty worktree
-
-expecting success of 7611.13 'Abort conflicting merge with non-conflicting dirty worktree': 
-	test_must_fail git merge conflict_branch &&
-	test_path_is_file .git/MERGE_HEAD &&
-	# Abort merge
-	git merge --abort &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-Auto-merging baz
-CONFLICT (content): Merge conflict in baz
-Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - Abort conflicting merge with non-conflicting dirty worktree
-
-expecting success of 7611.14 'Reset worktree changes': 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 9b32786 second
-ok 14 - Reset worktree changes
-
-expecting success of 7611.15 'Fail clean merge with conflicting dirty worktree': 
-	echo xyzzy >> bar &&
-	git diff > expect &&
-	test_must_fail git merge --no-commit clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 15 - Fail clean merge with conflicting dirty worktree
-
-expecting success of 7611.16 'Fail conflicting merge with conflicting dirty worktree': 
-	test_must_fail git merge conflict_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 16 - Fail conflicting merge with conflicting dirty worktree
+*** t7811-grep-open.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7811-grep-open/.git/
+expecting success of 7811.1 'determine default pager': 
+	test_might_fail git config --unset core.pager &&
+	less=$(
+		sane_unset PAGER GIT_PAGER &&
+		git var GIT_PAGER
+	) &&
+	test -n "$less"
 
-expecting success of 7611.17 'Reset worktree changes': 
-	git reset --hard "$pre_merge_head"
+ok 1 - determine default pager
 
-HEAD is now at 9b32786 second
-ok 17 - Reset worktree changes
+expecting success of 7811.2 'setup': 
+	test_commit initial grep.h "
+enum grep_pat_token {
+	GREP_PATTERN,
+	GREP_PATTERN_HEAD,
+	GREP_PATTERN_BODY,
+	GREP_AND,
+	GREP_OPEN_PAREN,
+	GREP_CLOSE_PAREN,
+	GREP_NOT,
+	GREP_OR,
+};" &&
 
-expecting success of 7611.18 'Fail clean merge with matching dirty worktree': 
-	echo bart > bar &&
-	git diff > expect &&
-	test_must_fail git merge --no-commit clean_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
+	test_commit add-user revision.c "
+	}
+	if (seen_dashdash)
+		read_pathspec_from_stdin(revs, &sb, prune);
+	strbuf_release(&sb);
+}
 
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 18 - Fail clean merge with matching dirty worktree
+static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
+{
+	append_grep_pattern(&revs->grep_filter, ptn, \"command line\", 0, what);
+" &&
 
-expecting success of 7611.19 'Fail conflicting merge with matching dirty worktree': 
-	echo barf > bar &&
-	git diff > expect &&
-	test_must_fail git merge conflict_branch &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
+	mkdir subdir &&
+	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
 
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 19 - Fail conflicting merge with matching dirty worktree
+	test_commit uninteresting unrelated "hello, world" &&
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7702-repack-cyclic-alternate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	echo GREP_PATTERN >untracked
 
-[master (root-commit) 9b08673] 1
+[master (root-commit) 6a780d2] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 1 - setup
-
-expecting success of 7702.2 're-packing repository with itself as alternate': 
-	git repack -adl &&
-	git fsck
-
-ok 2 - re-packing repository with itself as alternate
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7701-repack-unpack-unreachable.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7701-repack-unpack-unreachable/.git/
-expecting success of 7701.1 '-A with -d option leaves unreachable objects unpacked': 
-	echo content > file1 &&
-	git add . &&
-	test_tick &&
-	git commit -m initial_commit &&
-	# create a transient branch with unique content
-	git checkout -b transient_branch &&
-	echo more content >> file1 &&
-	# record the objects created in the database for file, commit, tree
-	fsha1=$(git hash-object file1) &&
-	test_tick &&
-	git commit -a -m more_content &&
-	csha1=$(git rev-parse HEAD^{commit}) &&
-	tsha1=$(git rev-parse HEAD^{tree}) &&
-	git checkout main &&
-	echo even more content >> file1 &&
-	test_tick &&
-	git commit -a -m even_more_content &&
-	# delete the transient branch
-	git branch -D transient_branch &&
-	# pack the repo
-	git repack -A -d -l &&
-	# verify objects are packed in repository
-	test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		   grep -E "^($fsha1|$csha1|$tsha1) " |
-		   sort | uniq | wc -l) &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1 &&
-	# now expire the reflog, while keeping reachable ones but expiring
-	# unreachables immediately
-	test_tick &&
-	sometimeago=$(( $test_tick - 10000 )) &&
-	git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
-	# and repack
-	git repack -A -d -l &&
-	# verify objects are retained unpacked
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		   grep -E "^($fsha1|$csha1|$tsha1) " |
-		   sort | uniq | wc -l) &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1
-
-[main (root-commit) 5236a77] initial_commit
+ 1 file changed, 11 insertions(+)
+ create mode 100644 grep.h
+[master 7eeae3c] add-user
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'transient_branch'
-[transient_branch 24d3dd6] more_content
+ 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(+)
-Switched to branch 'main'
-[main 934cb86] even_more_content
+ create mode 100644 subdir/grep.c
+[master cd972f3] uninteresting
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Deleted branch transient_branch (was 24d3dd6).
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-ok 1 - -A with -d option leaves unreachable objects unpacked
-
-expecting success of 7701.2 '-A without -d option leaves unreachable objects packed': 
-	fsha1path=$(echo "$fsha1" | sed -e "s|\(..\)|\1/|") &&
-	fsha1path=".git/objects/$fsha1path" &&
-	csha1path=$(echo "$csha1" | sed -e "s|\(..\)|\1/|") &&
-	csha1path=".git/objects/$csha1path" &&
-	tsha1path=$(echo "$tsha1" | sed -e "s|\(..\)|\1/|") &&
-	tsha1path=".git/objects/$tsha1path" &&
-	git branch transient_branch $csha1 &&
-	git repack -a -d -l &&
-	test ! -f "$fsha1path" &&
-	test ! -f "$csha1path" &&
-	test ! -f "$tsha1path" &&
-	test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) &&
-	packfile=$(ls .git/objects/pack/pack-*.pack) &&
-	git branch -D transient_branch &&
-	test_tick &&
-	git repack -A -l &&
-	test ! -f "$fsha1path" &&
-	test ! -f "$csha1path" &&
-	test ! -f "$tsha1path" &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1
-
-Deleted branch transient_branch (was 24d3dd6).
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-ok 2 - -A without -d option leaves unreachable objects packed
-
-expecting success of 7701.3 'unpacked objects receive timestamp of pack file': 
-	tmppack=".git/objects/pack/tmp_pack" &&
-	ln "$packfile" "$tmppack" &&
-	git repack -A -l -d &&
-	test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
-		> mtimes &&
-	compare_mtimes < mtimes
-
-ok 3 - unpacked objects receive timestamp of pack file
-
-expecting success of 7701.4 'do not bother loosening old objects': 
-	obj1=$(echo one | git hash-object -w --stdin) &&
-	obj2=$(echo two | git hash-object -w --stdin) &&
-	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
-	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
-	git repack -A -d --unpack-unreachable=1.hour.ago &&
-	git cat-file -p $obj1 &&
-	test_must_fail git cat-file -p $obj2
-
-one
-two
-one
-fatal: Not a valid object name f719efd430d52bcfc8566a43b2eb655688d38871
-ok 4 - do not bother loosening old objects
-
-expecting success of 7701.5 'gc.recentObjectsHook': 
-	obj1=$(echo one | git hash-object -w --stdin) &&
-	obj2=$(echo two | git hash-object -w --stdin) &&
-	obj3=$(echo three | git hash-object -w --stdin) &&
-	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
-	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
-	pack3=$(echo $obj3 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	git cat-file -p $obj3 &&
+ create mode 100644 unrelated
+ok 2 - setup
 
-	# make an unreachable annotated tag object to ensure we rescue objects
-	# which are reachable from non-pruned unreachable objects
-	obj2_tag="$(git mktag <<-EOF
-	object $obj2
-	type blob
-	tag obj2-tag
-	tagger T A Gger <tagger@example.com> 1234567890 -0000
+expecting success of 7811.3 'git grep -O': 
+	cat >$less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >pager-args
 	EOF
-	)" &&
-
-	obj2_tag_pack="$(echo $obj2_tag | git pack-objects .git/objects/pack/pack)" &&
-	git prune-packed &&
-
-	write_script precious-objects <<-EOF &&
-	echo $obj2_tag
+	chmod +x $less &&
+	cat >expect.less <<-\EOF &&
+	+/*GREP_PATTERN
+	grep.h
 	EOF
-	git config gc.recentObjectsHook ./precious-objects &&
-
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack3.pack &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$obj2_tag_pack.pack &&
-	git repack -A -d --unpack-unreachable=1.hour.ago &&
-
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	git cat-file -p $obj2_tag &&
-	test_must_fail git cat-file -p $obj3
-
-one
-two
-three
-one
-two
-object f719efd430d52bcfc8566a43b2eb655688d38871
-type blob
-tag obj2-tag
-tagger T A Gger <tagger@example.com> 1234567890 -0000
-fatal: Not a valid object name 2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
-ok 5 - gc.recentObjectsHook
-
-expecting success of 7701.6 'keep packed objects found only in index': 
-	echo my-unique-content >file &&
-	git add file &&
-	git commit -m "make it reachable" &&
-	git gc &&
-	git reset HEAD^ &&
-	git reflog expire --expire=now --all &&
-	git add file &&
-	test-tool chmtime =-86400 .git/objects/pack/* &&
-	git gc --prune=1.hour.ago &&
-	git cat-file blob :file
-
-[main 73784a1] make it reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-my-unique-content
-ok 6 - keep packed objects found only in index
-
-expecting success of 7701.7 'repack -k keeps unreachable packed objects': 
-	# create packed-but-unreachable object
-	sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
-	pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-
-	# -k should keep it
-	git repack -adk &&
-	git cat-file -p $sha1 &&
-
-	# and double check that without -k it would have been removed
-	git repack -ad &&
-	test_must_fail git cat-file -p $sha1
-
-unreachable-packed
-fatal: Not a valid object name bdf1d55da464c8ffc31aa0891954caf1baf216e8
-ok 7 - repack -k keeps unreachable packed objects
-
-expecting success of 7701.8 'repack -k packs unreachable loose objects': 
-	# create loose unreachable object
-	sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
-	objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
-	test_path_is_file $objpath &&
-
-	# and confirm that the loose object goes away, but we can
-	# still access it (ergo, it is packed)
-	git repack -adk &&
-	test_path_is_missing $objpath &&
-	git cat-file -p $sha1
-
-would-be-deleted-loose
-ok 8 - repack -k packs unreachable loose objects
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7601-merge-pull-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7601-merge-pull-config/.git/
-expecting success of 7601.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 >c3.c &&
-	git add c3.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 c0f42ec] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-ok 1 - setup
-
-expecting success of 7601.2 'pull.rebase not set, ff possible': 
-	git reset --hard c0 &&
-	git pull . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 2 - pull.rebase not set, ff possible
-
-expecting success of 7601.3 'pull.rebase not set and pull.ff=true': 
-	git reset --hard c0 &&
-	test_config pull.ff true &&
-	git pull . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 3 - pull.rebase not set and pull.ff=true
-
-expecting success of 7601.4 'pull.rebase not set and pull.ff=false': 
-	git reset --hard c0 &&
-	test_config pull.ff false &&
-	git pull . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 4 - pull.rebase not set and pull.ff=false
-
-expecting success of 7601.5 'pull.rebase not set and pull.ff=only': 
-	git reset --hard c0 &&
-	test_config pull.ff only &&
-	git pull . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 5 - pull.rebase not set and pull.ff=only
-
-expecting success of 7601.6 'pull.rebase not set and --rebase given': 
-	git reset --hard c0 &&
-	git pull --rebase . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 6 - pull.rebase not set and --rebase given
-
-expecting success of 7601.7 'pull.rebase not set and --no-rebase given': 
-	git reset --hard c0 &&
-	git pull --no-rebase . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 7 - pull.rebase not set and --no-rebase given
-
-expecting success of 7601.8 'pull.rebase not set and --ff given': 
-	git reset --hard c0 &&
-	git pull --ff . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 8 - pull.rebase not set and --ff given
-
-expecting success of 7601.9 'pull.rebase not set and --no-ff given': 
-	git reset --hard c0 &&
-	git pull --no-ff . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 9 - pull.rebase not set and --no-ff given
-
-expecting success of 7601.10 'pull.rebase not set and --ff-only given': 
-	git reset --hard c0 &&
-	git pull --ff-only . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at e4f5a3c c0
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 10 - pull.rebase not set and --ff-only given
-
-expecting success of 7601.11 'pull.rebase not set (not-fast-forward)': 
-	git reset --hard c2 &&
-	test_must_fail git -c color.advice=always pull . c1 2>err &&
-	test_decode_color <err >decoded &&
-	test_grep "<YELLOW>hint: " decoded &&
-	test_grep "You have divergent branches" decoded
-
-HEAD is now at 028ea41 c2
-<YELLOW>hint: You have divergent branches and need to specify how to reconcile them.<RESET>
-<YELLOW>hint: You can do so by running one of the following commands sometime before<RESET>
-<YELLOW>hint: your next pull:<RESET>
-<YELLOW>hint:   git config pull.rebase false  # merge<RESET>
-<YELLOW>hint:   git config pull.rebase true   # rebase<RESET>
-<YELLOW>hint:   git config pull.ff only       # fast-forward only<RESET>
-<YELLOW>hint: You can replace "git config" with "git config --global" to set a default<RESET>
-<YELLOW>hint: preference for all repositories. You can also pass --rebase, --no-rebase,<RESET>
-<YELLOW>hint: or --ff-only on the command line to override the configured default per<RESET>
-<YELLOW>hint: invocation.<RESET>
-<YELLOW>hint: You have divergent branches and need to specify how to reconcile them.<RESET>
-ok 11 - pull.rebase not set (not-fast-forward)
-
-expecting success of 7601.12 'pull.rebase not set and pull.ff=true (not-fast-forward)': 
-	git reset --hard c2 &&
-	test_config pull.ff true &&
-	git pull . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 12 - pull.rebase not set and pull.ff=true (not-fast-forward)
-
-expecting success of 7601.13 'pull.rebase not set and pull.ff=false (not-fast-forward)': 
-	git reset --hard c2 &&
-	test_config pull.ff false &&
-	git pull . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 13 - pull.rebase not set and pull.ff=false (not-fast-forward)
-
-expecting success of 7601.14 'pull.rebase not set and pull.ff=only (not-fast-forward)': 
-	git reset --hard c2 &&
-	test_config pull.ff only &&
-	test_must_fail git pull . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-ok 14 - pull.rebase not set and pull.ff=only (not-fast-forward)
-
-expecting success of 7601.15 'pull.rebase not set and --rebase given (not-fast-forward)': 
-	git reset --hard c2 &&
-	git pull --rebase . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-ok 15 - pull.rebase not set and --rebase given (not-fast-forward)
-
-expecting success of 7601.16 'pull.rebase not set and --no-rebase given (not-fast-forward)': 
-	git reset --hard c2 &&
-	git pull --no-rebase . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 16 - pull.rebase not set and --no-rebase given (not-fast-forward)
-
-expecting success of 7601.17 'pull.rebase not set and --ff given (not-fast-forward)': 
-	git reset --hard c2 &&
-	git pull --ff . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 17 - pull.rebase not set and --ff given (not-fast-forward)
-
-expecting success of 7601.18 'pull.rebase not set and --no-ff given (not-fast-forward)': 
-	git reset --hard c2 &&
-	git pull --no-ff . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 18 - pull.rebase not set and --no-ff given (not-fast-forward)
-
-expecting success of 7601.19 'pull.rebase not set and --ff-only given (not-fast-forward)': 
-	git reset --hard c2 &&
-	test_must_fail git pull --ff-only . c1 2>err &&
-	test_grep ! "You have divergent branches" err
-
-HEAD is now at 028ea41 c2
-ok 19 - pull.rebase not set and --ff-only given (not-fast-forward)
-
-expecting success of 7601.20 '--ff-only overrides --rebase': 
-	test_attempts_fast_forward pull --rebase --ff-only
-
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 20 - --ff-only overrides --rebase
-
-expecting success of 7601.21 '--ff-only overrides --rebase even if first': 
-	test_attempts_fast_forward pull --ff-only --rebase
-
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 21 - --ff-only overrides --rebase even if first
-
-expecting success of 7601.22 '--ff-only overrides --no-rebase': 
-	test_attempts_fast_forward pull --ff-only --no-rebase
-
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 22 - --ff-only overrides --no-rebase
-
-expecting success of 7601.23 'pull.ff=only overrides pull.rebase=true': 
-	test_attempts_fast_forward -c pull.ff=only -c pull.rebase=true pull
-
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 23 - pull.ff=only overrides pull.rebase=true
-
-expecting success of 7601.24 'pull.ff=only overrides pull.rebase=false': 
-	test_attempts_fast_forward -c pull.ff=only -c pull.rebase=false pull
-
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 24 - pull.ff=only overrides pull.rebase=false
-
-expecting success of 7601.25 '--rebase overrides --no-ff': 
-	test_does_rebase pull --rebase --no-ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 25 - --rebase overrides --no-ff
-
-expecting success of 7601.26 '--rebase overrides --ff': 
-	test_does_rebase pull --rebase --ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 26 - --rebase overrides --ff
-
-expecting success of 7601.27 '--rebase fast-forwards when possible': 
-	test_does_fast_forward pull --rebase --ff
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 27 - --rebase fast-forwards when possible
-
-expecting success of 7601.28 'pull.rebase=true overrides pull.ff=false': 
-	test_does_rebase -c pull.rebase=true -c pull.ff=false pull
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 28 - pull.rebase=true overrides pull.ff=false
-
-expecting success of 7601.29 'pull.rebase=true overrides pull.ff=true': 
-	test_does_rebase -c pull.rebase=true -c pull.ff=true pull
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 29 - pull.rebase=true overrides pull.ff=true
-
-expecting success of 7601.30 '--ff-only takes precedence over pull.rebase=true': 
-	test_attempts_fast_forward -c pull.rebase=true pull --ff-only
-
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 30 - --ff-only takes precedence over pull.rebase=true
-
-expecting success of 7601.31 '--ff-only takes precedence over pull.rebase=false': 
-	test_attempts_fast_forward -c pull.rebase=false pull --ff-only
-
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 31 - --ff-only takes precedence over pull.rebase=false
-
-expecting success of 7601.32 '--no-rebase takes precedence over pull.ff=only': 
-	test_falls_back_to_full_merge -c pull.ff=only pull --no-rebase
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 32 - --no-rebase takes precedence over pull.ff=only
-
-expecting success of 7601.33 '--rebase takes precedence over pull.ff=only': 
-	test_does_rebase -c pull.ff=only pull --rebase
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 33 - --rebase takes precedence over pull.ff=only
-
-expecting success of 7601.34 '--rebase overrides pull.ff=true': 
-	test_does_rebase -c pull.ff=true pull --rebase
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 34 - --rebase overrides pull.ff=true
-
-expecting success of 7601.35 '--rebase overrides pull.ff=false': 
-	test_does_rebase -c pull.ff=false pull --rebase
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 35 - --rebase overrides pull.ff=false
-
-expecting success of 7601.36 '--rebase overrides pull.ff unset': 
-	test_does_rebase pull --rebase
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 36 - --rebase overrides pull.ff unset
-
-expecting success of 7601.37 '--no-rebase works with --no-ff': 
-	test_does_merge_when_ff_possible pull --no-rebase --no-ff
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 37 - --no-rebase works with --no-ff
-
-expecting success of 7601.38 '--no-rebase works with --ff': 
-	test_does_fast_forward pull --no-rebase --ff
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 38 - --no-rebase works with --ff
-
-expecting success of 7601.39 '--no-rebase does ff if pull.ff unset': 
-	test_does_fast_forward pull --no-rebase
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 39 - --no-rebase does ff if pull.ff unset
-
-expecting success of 7601.40 '--no-rebase heeds pull.ff=true': 
-	test_does_fast_forward -c pull.ff=true pull --no-rebase
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 40 - --no-rebase heeds pull.ff=true
-
-expecting success of 7601.41 '--no-rebase heeds pull.ff=false': 
-	test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 41 - --no-rebase heeds pull.ff=false
-
-expecting success of 7601.42 'pull.rebase=true and --no-ff': 
-	test_does_rebase -c pull.rebase=true pull --no-ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 42 - pull.rebase=true and --no-ff
-
-expecting success of 7601.43 'pull.rebase=true and --ff': 
-	test_does_rebase -c pull.rebase=true pull --ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 43 - pull.rebase=true and --ff
-
-expecting success of 7601.44 'pull.rebase=false and --no-ff': 
-	test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 44 - pull.rebase=false and --no-ff
-
-expecting success of 7601.45 'pull.rebase=false and --ff, ff possible': 
-	test_does_fast_forward -c pull.rebase=false pull --ff
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 45 - pull.rebase=false and --ff, ff possible
-
-expecting success of 7601.46 'pull.rebase=false and --ff, ff not possible': 
-	test_falls_back_to_full_merge -c pull.rebase=false pull --ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 46 - pull.rebase=false and --ff, ff not possible
-
-expecting success of 7601.47 'Multiple heads warns about inability to fast forward': 
-	git reset --hard c1 &&
-	test_must_fail git pull . c2 c3 2>err &&
-	test_grep "You have divergent branches" err
-
-HEAD is now at 429abf0 c1
-hint: You have divergent branches and need to specify how to reconcile them.
-ok 47 - Multiple heads warns about inability to fast forward
-
-expecting success of 7601.48 'Multiple can never be fast forwarded': 
-	git reset --hard c0 &&
-	test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
-	test_grep ! "You have divergent branches" err &&
-	# In addition to calling out "cannot fast-forward", we very much
-	# want the "multiple branches" piece to be called out to users.
-	test_grep "Cannot fast-forward to multiple branches" err
-
-HEAD is now at e4f5a3c c0
-fatal: Cannot fast-forward to multiple branches.
-ok 48 - Multiple can never be fast forwarded
-
-expecting success of 7601.49 'Cannot rebase with multiple heads': 
-	git reset --hard c0 &&
-	test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
-	test_grep ! "You have divergent branches" err &&
-	test_grep "Cannot rebase onto multiple branches." err
-
-HEAD is now at e4f5a3c c0
-fatal: Cannot rebase onto multiple branches.
-ok 49 - Cannot rebase with multiple heads
-
-expecting success of 7601.50 'merge c1 with c2': 
-	git reset --hard c1 &&
-	test_path_is_file c0.c &&
-	test_path_is_file c1.c &&
-	test_path_is_missing c2.c &&
-	test_path_is_missing c3.c &&
-	git merge c2 &&
-	test_path_is_file c1.c &&
-	test_path_is_file c2.c
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 50 - merge c1 with c2
-
-expecting success of 7601.51 'fast-forward pull succeeds with "true" in pull.ff': 
-	git reset --hard c0 &&
-	test_config pull.ff true &&
-	git pull . c1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 51 - fast-forward pull succeeds with "true" in pull.ff
-
-expecting success of 7601.52 'pull.ff=true overrides merge.ff=false': 
-	git reset --hard c0 &&
-	test_config merge.ff false &&
-	test_config pull.ff true &&
-	git pull . c1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 52 - pull.ff=true overrides merge.ff=false
-
-expecting success of 7601.53 'fast-forward pull creates merge with "false" in pull.ff': 
-	git reset --hard c0 &&
-	test_config pull.ff false &&
-	git pull . c1 &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse c0)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)"
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 53 - fast-forward pull creates merge with "false" in pull.ff
-
-expecting success of 7601.54 'pull prevents non-fast-forward with "only" in pull.ff': 
-	git reset --hard c1 &&
-	test_config pull.ff only &&
-	test_must_fail git pull . c3
-
-HEAD is now at 429abf0 c1
-From .
- * tag               c3         -> FETCH_HEAD
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config set advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-ok 54 - pull prevents non-fast-forward with "only" in pull.ff
-
-expecting success of 7601.55 'already-up-to-date pull succeeds with unspecified pull.ff': 
-	git reset --hard c1 &&
-	git pull . c0 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+	echo grep.h >expect.notless &&
 
-HEAD is now at 429abf0 c1
-From .
- * tag               c0         -> FETCH_HEAD
-Already up to date.
-ok 55 - already-up-to-date pull succeeds with unspecified pull.ff
+	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
+	{
+		test_cmp expect.less pager-args ||
+		test_cmp expect.notless pager-args
+	} &&
+	test_must_be_empty out
 
-expecting success of 7601.56 'already-up-to-date pull succeeds with "only" in pull.ff': 
-	git reset --hard c1 &&
-	test_config pull.ff only &&
-	git pull . c0 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+--- expect.less	2026-03-14 13:36:30.558677808 +0000
++++ pager-args	2026-03-14 13:36:30.590677808 +0000
+@@ -1,2 +1 @@
+-+/*GREP_PATTERN
+ grep.h
+ok 3 - git grep -O
 
-HEAD is now at 429abf0 c1
-From .
- * tag               c0         -> FETCH_HEAD
-Already up to date.
-ok 56 - already-up-to-date pull succeeds with "only" in pull.ff
+expecting success of 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
 
-expecting success of 7601.57 'already-up-to-date pull/rebase succeeds with "only" in pull.ff': 
-	git reset --hard c1 &&
-	test_config pull.ff only &&
-	git -c pull.rebase=true pull . c0 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+fatal: --open-files-in-pager only works on the worktree
+ok 4 - git grep -O --cached
 
-HEAD is now at 429abf0 c1
-From .
- * tag               c0         -> FETCH_HEAD
-Already up to date.
-ok 57 - already-up-to-date pull/rebase succeeds with "only" in pull.ff
+expecting success of 7811.5 'git grep -O --no-index': 
+	rm -f expect.less pager-args out &&
+	cat >expect <<-\EOF &&
+	grep.h
+	untracked
+	EOF
 
-expecting success of 7601.58 'merge c1 with c2 (ours in pull.twohead)': 
-	git reset --hard c1 &&
-	git config pull.twohead ours &&
-	git merge c2 &&
-	test_path_is_file c1.c &&
-	test_path_is_missing c2.c
+	(
+		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
 
-HEAD is now at 429abf0 c1
-Merge made by the 'ours' strategy.
-ok 58 - merge c1 with c2 (ours in pull.twohead)
+ok 5 - git grep -O --no-index
 
-expecting success of 7601.59 'merge c1 with c2 and c3 (recursive in pull.octopus)': 
-	git reset --hard c1 &&
-	git config pull.octopus "recursive" &&
-	test_must_fail git merge c2 c3 &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD)"
+expecting success of 7811.6 'setup: fake "less"': 
+	cat >less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >actual
+	EOF
+	chmod +x less
 
-HEAD is now at 429abf0 c1
-error: Not handling anything other than two heads merge.
-Merge with strategy ort failed.
-ok 59 - merge c1 with c2 and c3 (recursive in pull.octopus)
+ok 6 - setup: fake "less"
 
-expecting success of 7601.60 'merge c1 with c2 and c3 (recursive and octopus in pull.octopus)': 
-	git reset --hard c1 &&
-	git config pull.octopus "recursive octopus" &&
-	git merge c2 c3 &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
-	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
-	test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
-	git diff --exit-code &&
-	test_path_is_file c0.c &&
-	test_path_is_file c1.c &&
-	test_path_is_file c2.c &&
-	test_path_is_file c3.c
+expecting success of 7811.7 'git grep -O jumps to line in less': 
+	cat >expect <<-\EOF &&
+	+/*GREP_PATTERN
+	grep.h
+	EOF
 
-HEAD is now at 429abf0 c1
-error: Not handling anything other than two heads merge.
-Trying merge strategy ort...
-Rewinding the tree to pristine...
-Trying merge strategy octopus...
-Trying simple merge with c2
-Trying simple merge with c3
-Merge made by the 'octopus' strategy.
- c2.c | 1 +
- c3.c | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 c2.c
- create mode 100644 c3.c
-ok 60 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus)
+	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
+	test_cmp expect actual &&
+	test_must_be_empty out &&
 
-expecting success of 7601.61 'setup conflicted merge': 
-	git reset --hard c0 &&
-	echo A >conflict.c &&
-	git add conflict.c &&
-	echo contents >foo.c &&
-	git add foo.c &&
-	git commit -m c4 &&
-	git tag c4 &&
-	echo B >conflict.c &&
-	git add conflict.c &&
-	git mv foo.c bar.c &&
-	git commit -m c5 &&
-	git tag c5 &&
-	git reset --hard c4 &&
-	echo C >conflict.c &&
-	git add conflict.c &&
-	echo secondline >> foo.c &&
-	git add foo.c &&
-	git commit -m c6 &&
-	git tag c6
+	git grep -O./less GREP_PATTERN >out2 &&
+	test_cmp expect actual &&
+	test_must_be_empty out2
 
-HEAD is now at e4f5a3c c0
-[master fc941b1] c4
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 conflict.c
- create mode 100644 foo.c
-[master 085299c] c5
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename foo.c => bar.c (100%)
-HEAD is now at fc941b1 c4
-[master cad9e93] c6
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 61 - setup conflicted merge
+ok 7 - git grep -O jumps to line in less
 
-expecting success of 7601.62 'merge picks up the best result': 
-	git config --unset-all pull.twohead &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s resolve c6 &&
-	resolve_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s recursive c6 &&
-	recursive_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s recursive -s resolve c6 &&
-	auto_count=$(conflict_count) &&
-	test $auto_count = $recursive_count &&
-	test $auto_count != $resolve_count
+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
 
-HEAD is now at 085299c c5
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Trying merge strategy ort...
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Rewinding the tree to pristine...
-Trying merge strategy resolve...
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Rewinding the tree to pristine...
-Using the ort strategy to prepare resolving by hand.
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-ok 62 - merge picks up the best result
+	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
 
-expecting success of 7601.63 'merge picks up the best result (from config)': 
-	git config pull.twohead "recursive resolve" &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s resolve c6 &&
-	resolve_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s recursive c6 &&
-	recursive_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge c6 &&
-	auto_count=$(conflict_count) &&
-	test $auto_count = $recursive_count &&
-	test $auto_count != $resolve_count
+HEAD is now at cd972f3 uninteresting
+ok 8 - modified file
 
-HEAD is now at 085299c c5
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Trying merge strategy ort...
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Rewinding the tree to pristine...
-Trying merge strategy resolve...
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Rewinding the tree to pristine...
-Using the ort strategy to prepare resolving by hand.
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-ok 63 - merge picks up the best result (from config)
+expecting success of 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
 
-expecting success of 7601.64 'merge errors out on invalid strategy': 
-	git config pull.twohead "foobar" &&
-	git reset --hard c5 &&
-	test_must_fail git merge c6
+ok 9 - copes with color settings
 
-HEAD is now at 085299c c5
-Could not find merge strategy 'foobar'.
-Available strategies are: octopus ours recursive resolve subtree.
-ok 64 - merge errors out on invalid strategy
+expecting success of 7811.10 'run from subdir': 
+	rm -f actual &&
+	echo grep.c >expect &&
 
-expecting success of 7601.65 'merge errors out on invalid strategy': 
-	git config --unset-all pull.twohead &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s "resolve recursive" c6
+	(
+		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
 
-HEAD is now at 085299c c5
-Could not find merge strategy 'resolve recursive'.
-Available strategies are: octopus ours recursive resolve subtree.
-ok 65 - merge errors out on invalid strategy
+ok 10 - run from subdir
 
-# passed all 65 test(s)
-1..65
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7600-merge.sh ***
@@ -491777,8 +492427,8 @@
 CONFLICT (content): Merge conflict in base.t
 Recorded preimage for 'base.t'
 Automatic merge failed; fix conflicts and then commit the result.
---- rerere.after	2025-02-09 06:55:20.382199094 +0000
-+++ rerere.before	2025-02-09 06:55:20.378199069 +0000
+--- rerere.after	2026-03-14 13:36:32.642677808 +0000
++++ rerere.before	2026-03-14 13:36:32.594677808 +0000
 @@ -0,0 +1 @@
 +base.t
 ok 77 - merge --quit
@@ -492748,8 +493398,8 @@
 
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)
---- shared-objects	2025-02-09 06:55:20.338198814 +0000
-+++ member-objects	2025-02-09 06:55:20.346198865 +0000
+--- shared-objects	2026-03-14 13:36:32.122677808 +0000
++++ member-objects	2026-03-14 13:36:32.162677808 +0000
 @@ -1,3 +1,3 @@
 -04646a23dde207060dc8a802fc9bd5d3c2c976bd
 -a0054e492840f572e48a3cb791d2e083afaf08f6
@@ -492847,202 +493497,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7811-grep-open.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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-02-09 06:55:20.598200468 +0000
-+++ pager-args	2025-02-09 06:55:20.606200519 +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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7813-grep-icase-iso.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7813-grep-icase-iso/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -493242,2158 +493696,4174 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7400-submodule-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/
-expecting success of 7400.1 'setup - enable local submodules': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup - enable local submodules
+*** t7704-repack-cruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/.git/
+expecting success of 7704.1 '--expire-to stores pruned objects (now)': 
+	git init expire-to-now &&
+	(
+		cd expire-to-now &&
 
-expecting success of 7400.2 'submodule usage: -h': 
-	git submodule -h >out 2>err &&
-	grep "^usage: git submodule" out &&
-	test_must_be_empty err
+		git branch -M main &&
 
-usage: git submodule [--quiet] [--cached]
-ok 2 - submodule usage: -h
+		test_commit base &&
 
-expecting success of 7400.3 'submodule usage: --recursive': 
-	test_expect_code 1 git submodule --recursive >out 2>err &&
-	grep "^usage: git submodule" err &&
-	test_must_be_empty out
+		git checkout -b cruft &&
+		test_commit --no-tag cruft &&
 
-usage: git submodule [--quiet] [--cached]
-ok 3 - submodule usage: --recursive
+		git rev-list --objects --no-object-names main..cruft >moved.raw &&
+		sort moved.raw >moved.want &&
 
-expecting success of 7400.4 'submodule usage: status --': 
-	test_expect_code 1 git submodule -- &&
-	test_expect_code 1 git submodule --end-of-options
+		git rev-list --all --objects --no-object-names >expect.raw &&
+		sort expect.raw >expect &&
 
-usage: git submodule [--quiet] [--cached]
-   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
-   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] init [--] [<path>...]
-   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
-   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
-   or: git submodule [--quiet] set-url [--] <path> <newurl>
-   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
-   or: git submodule [--quiet] foreach [--recursive] <command>
-   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
-usage: git submodule [--quiet] [--cached]
-   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
-   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] init [--] [<path>...]
-   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
-   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
-   or: git submodule [--quiet] set-url [--] <path> <newurl>
-   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
-   or: git submodule [--quiet] foreach [--recursive] <command>
-   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
-ok 4 - submodule usage: status --
+		git checkout main &&
+		git branch -D cruft &&
+		git reflog expire --all --expire=all &&
 
-expecting success of 7400.5 'submodule usage: status --quiet': 
-		git submodule $opt &&
-		git submodule status $opt &&
-		git submodule $opt status
-	
-ok 5 - submodule usage: status --quiet
+		git init --bare expired.git &&
+		git repack -d \
+			--cruft --cruft-expiration="now" \
+			--expire-to="expired.git/objects/pack/pack" &&
 
-expecting success of 7400.6 'submodule usage: status --cached': 
-		git submodule $opt &&
-		git submodule status $opt &&
-		git submodule $opt status
-	
-ok 6 - submodule usage: status --cached
+		expired="$(ls expired.git/objects/pack/pack-*.idx)" &&
+		test_path_is_file "${expired%.idx}.mtimes" &&
 
-expecting success of 7400.7 'submodule deinit works on empty repository': 
-	git submodule deinit --all
+		# Since the `--cruft-expiration` is "now", the effective
+		# behavior is to move _all_ unreachable objects out to
+		# the location in `--expire-to`.
+		git show-index <$expired >expired.raw &&
+		cut -d" " -f2 expired.raw | sort >expired.objects &&
+		git rev-list --all --objects --no-object-names \
+			>remaining.objects &&
 
-ok 7 - submodule deinit works on empty repository
+		# ...in other words, the combined contents of this
+		# repository and expired.git should be the same as the
+		# set of objects we started with.
+		sort expired.objects remaining.objects >actual &&
+		test_cmp expect actual &&
 
-expecting success of 7400.8 'setup - initial commit': 
-	>t &&
-	git add t &&
-	git commit -m "initial commit" &&
-	git branch initial
+		# The "moved" objects (i.e., those in expired.git)
+		# should be the same as the cruft objects which were
+		# expired in the previous step.
+		test_cmp moved.want expired.objects
+	)
 
-[main (root-commit) 8f98e77] initial commit
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-now/.git/
+[main (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-ok 8 - setup - initial commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'cruft'
+[cruft 7b73700] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+Switched to branch 'main'
+Deleted branch cruft (was 7b73700).
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-now/expired.git/
+ok 1 - --expire-to stores pruned objects (now)
 
-expecting success of 7400.9 'submodule init aborts on missing .gitmodules file': 
-	test_when_finished "git update-index --remove sub" &&
-	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
-	# missing the .gitmodules file here
-	test_must_fail git submodule init 2>actual &&
-	test_grep "No url found for submodule path" actual
+expecting success of 7704.2 '--expire-to stores pruned objects (5.minutes.ago)': 
+	git init expire-to-5.minutes.ago &&
+	(
+		cd expire-to-5.minutes.ago &&
 
-fatal: No url found for submodule path 'sub' in .gitmodules
-ok 9 - submodule init aborts on missing .gitmodules file
+		git branch -M main &&
 
-expecting success of 7400.10 'submodule update aborts on missing .gitmodules file': 
-	test_when_finished "git update-index --remove sub" &&
-	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
-	# missing the .gitmodules file here
-	git submodule update sub 2>actual &&
-	test_grep "Submodule path .sub. not initialized" actual
+		test_commit base &&
 
-Submodule path 'sub' not initialized
-ok 10 - submodule update aborts on missing .gitmodules file
+		# Create two classes of unreachable objects, one which
+		# is older than 5 minutes (stale), and another which is
+		# newer (recent).
+		for kind in stale recent
+		do
+			git checkout -b $kind main &&
+			test_commit --no-tag $kind || return 1
+		done &&
 
-expecting success of 7400.11 'submodule update aborts on missing gitmodules url': 
-	test_when_finished "git update-index --remove sub" &&
-	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
-	test_when_finished "rm -f .gitmodules" &&
-	git config -f .gitmodules submodule.s.path sub &&
-	test_must_fail git submodule init
+		git rev-list --objects --no-object-names main..stale >in &&
+		stale="$(git pack-objects $objdir/pack/pack <in)" &&
+		mtime="$(test-tool chmtime --get =-600 $objdir/pack/pack-$stale.pack)" &&
 
-fatal: No url found for submodule path 'sub' in .gitmodules
-ok 11 - submodule update aborts on missing gitmodules url
+		# expect holds the set of objects we expect to find in
+		# this repository after repacking
+		git rev-list --objects --no-object-names recent >expect.raw &&
+		sort expect.raw >expect &&
 
-expecting success of 7400.12 'add aborts on repository with no commits': 
-	cat >expect <<-\EOF &&
-	fatal: 'repo-no-commits' does not have a commit checked out
-	EOF
-	git init repo-no-commits &&
-	test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
-	test_cmp expect actual
+		# moved.want holds the set of objects we expect to find
+		# in expired.git
+		git rev-list --objects --no-object-names main..stale >out &&
+		sort out >moved.want &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo-no-commits/.git/
-ok 12 - add aborts on repository with no commits
+		git checkout main &&
+		git branch -D stale recent &&
+		git reflog expire --all --expire=all &&
+		git prune-packed &&
 
-expecting success of 7400.13 'status should ignore inner git repo when not added': 
-	rm -fr inner &&
-	mkdir inner &&
-	(
-		cd inner &&
-		git init &&
-		>t &&
-		git add t &&
-		git commit -m "initial"
-	) &&
-	test_must_fail git submodule status inner 2>output.err &&
-	rm -fr inner &&
-	test_grep "^error: .*did not match any file(s) known to git" output.err
+		git init --bare expired.git &&
+		git repack -d \
+			--cruft --cruft-expiration=5.minutes.ago \
+			--expire-to="expired.git/objects/pack/pack" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/inner/.git/
-[main (root-commit) 0ce53a8] initial
+		# Some of the remaining objects in this repository are
+		# unreachable, so use `cat-file --batch-all-objects`
+		# instead of `rev-list` to get their names
+		git cat-file --batch-all-objects --batch-check="%(objectname)" \
+			>remaining.objects &&
+		sort remaining.objects >actual &&
+		test_cmp expect actual &&
+
+		(
+			cd expired.git &&
+
+			expired="$(ls objects/pack/pack-*.mtimes)" &&
+			test-tool pack-mtimes $(basename $expired) >out &&
+			cut -d" " -f1 out | sort >../moved.got &&
+
+			# Ensure that there are as many objects with the
+			# expected mtime as were moved to expired.git.
+			#
+			# In other words, ensure that the recorded
+			# mtimes of any moved objects was written
+			# correctly.
+			grep " $mtime$" out >matching &&
+			test_line_count = $(wc -l <../moved.want) matching
+		) &&
+		test_cmp moved.want moved.got
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/.git/
+[main (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-error: pathspec 'inner' did not match any file(s) known to git
-ok 13 - status should ignore inner git repo when not added
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'stale'
+[stale aad0965] stale
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 stale.t
+Switched to a new branch 'recent'
+[recent 52849af] recent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 recent.t
+Switched to branch 'main'
+Deleted branch stale (was aad0965).
+Deleted branch recent (was 52849af).
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/expired.git/
+ok 2 - --expire-to stores pruned objects (5.minutes.ago)
 
-expecting success of 7400.14 'setup - repository in init subdirectory': 
-	mkdir init &&
+expecting success of 7704.3 '--max-cruft-size creates new packs when above threshold': 
+	git init max-cruft-size-large &&
 	(
-		cd init &&
-		git init &&
-		echo a >a &&
-		git add a &&
-		git commit -m "submodule commit 1" &&
-		git tag -a -m "rev-1" rev-1
+		cd max-cruft-size-large &&
+		test_commit base &&
+
+		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
+		git repack --cruft -d &&
+		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
+
+		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
+		git repack --cruft -d --max-cruft-size=1M &&
+		cruft_bar="$(ls $packdir/pack-*.mtimes | grep -v $cruft_foo)" &&
+
+		test-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
+		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
+
+		grep "^$foo" foo.objects &&
+		test_line_count = 1 foo.objects &&
+		grep "^$bar" bar.objects &&
+		test_line_count = 1 bar.objects
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init/.git/
-[main (root-commit) 36aca32] submodule commit 1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-large/.git/
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 14 - setup - repository in init subdirectory
+ create mode 100644 base.t
+4f336f3df31054eabc05ac05f98bc024c8e05423 1773495387
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1773495388
+ok 3 - --max-cruft-size creates new packs when above threshold
 
-expecting success of 7400.15 'setup - commit with gitlink': 
-	echo a >a &&
-	echo z >z &&
-	git add a init z &&
-	git commit -m "super commit 1"
+expecting success of 7704.4 '--max-cruft-size combines existing packs when below threshold': 
+	git init max-cruft-size-small &&
+	(
+		cd max-cruft-size-small &&
+		test_commit base &&
 
-warning: adding embedded git repository: init
-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> init
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached init
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main 23ad8e1] super commit 1
+		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
+		git repack --cruft -d &&
+
+		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
+		git repack --cruft -d --max-cruft-size=10M &&
+
+		cruft=$(ls $packdir/pack-*.mtimes) &&
+		test-tool pack-mtimes $(basename "$cruft") >cruft.objects &&
+
+		grep "^$foo" cruft.objects &&
+		grep "^$bar" cruft.objects &&
+		test_line_count = 2 cruft.objects
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-small/.git/
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a
- create mode 160000 init
- create mode 100644 z
-ok 15 - setup - commit with gitlink
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+4f336f3df31054eabc05ac05f98bc024c8e05423 1773495388
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1773495389
+ok 4 - --max-cruft-size combines existing packs when below threshold
 
-expecting success of 7400.16 'setup - hide init subdirectory': 
-	mv init .subrepo
+expecting success of 7704.5 '--max-cruft-size combines smaller packs first': 
+	git init max-cruft-size-consume-small &&
+	(
+		cd max-cruft-size-consume-small &&
 
-ok 16 - setup - hide init subdirectory
+		test_commit base &&
+		git repack -ad &&
 
-expecting success of 7400.17 'setup - repository to add submodules to': 
-	git init addtest &&
-	git init addtest-ignore
+		cruft_foo="$(generate_cruft_pack foo 524288)" &&    # 0.5 MiB
+		cruft_bar="$(generate_cruft_pack bar 524288)" &&    # 0.5 MiB
+		cruft_baz="$(generate_cruft_pack baz 1048576)" &&   # 1.0 MiB
+		cruft_quux="$(generate_cruft_pack quux 1572864)" && # 1.5 MiB
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest-ignore/.git/
-ok 17 - setup - repository to add submodules to
+		test-tool pack-mtimes "$(basename $cruft_foo)" >expect.raw &&
+		test-tool pack-mtimes "$(basename $cruft_bar)" >>expect.raw &&
+		sort expect.raw >expect.objects &&
 
-expecting success of 7400.18 'submodule add': 
-	echo "refs/heads/main" >expect &&
+		# repacking with `--max-cruft-size=2M` should combine
+		# both 0.5 MiB packs together, instead of, say, one of
+		# the 0.5 MiB packs with the 1.0 MiB pack
+		ls $packdir/pack-*.mtimes | sort >cruft.before &&
+		git repack -d --cruft --max-cruft-size=2M &&
+		ls $packdir/pack-*.mtimes | sort >cruft.after &&
 
-	(
-		cd addtest &&
-		git submodule add -q "$submodurl" submod >actual &&
-		test_must_be_empty actual &&
-		echo "gitdir: ../.git/modules/submod" >expect &&
-		test_cmp expect submod/.git &&
-		(
-			cd submod &&
-			git config core.worktree >actual &&
-			echo "../../../submod" >expect &&
-			test_cmp expect actual &&
-			rm -f actual expect
-		) &&
-		git submodule init
-	) &&
+		comm -13 cruft.before cruft.after >cruft.new &&
+		comm -23 cruft.before cruft.after >cruft.removed &&
 
-	rm -f heads head untracked &&
-	inspect addtest/submod ../.. &&
-	test_cmp expect heads &&
-	test_cmp expect head &&
-	test_must_be_empty untracked
+		test_line_count = 1 cruft.new &&
+		test_line_count = 2 cruft.removed &&
 
-ok 18 - submodule add
+		# the two smaller packs should be rolled up first
+		printf "%s\n" $cruft_foo $cruft_bar | sort >expect.removed &&
+		test_cmp expect.removed cruft.removed &&
 
-expecting success of 7400.19 'submodule add (absolute path)': 
-	test_when_finished "git reset --hard" &&
-	git submodule add "$submodurl" "$submodurl/add-abs"
+		# ...and contain the set of objects rolled up
+		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
+		sort actual.raw >actual.objects &&
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/add-abs'...
-done.
-warning: unable to rmdir 'add-abs': Directory not empty
-HEAD is now at 23ad8e1 super commit 1
-ok 19 - submodule add (absolute path)
+		test_cmp expect.objects actual.objects
+	)
 
-expecting success of 7400.20 'setup parent and one repository': 
-	test_create_repo parent &&
-	test_commit -C parent one
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-consume-small/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 5 - --max-cruft-size combines smaller packs first
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/parent/.git/
-[main (root-commit) d79ce16] one
+expecting success of 7704.6 'setup --max-cruft-size with freshened objects': 
+	git init max-cruft-size-freshen &&
+	(
+		cd max-cruft-size-freshen &&
+
+		test_commit base &&
+		git repack -ad &&
+
+		foo="$(generate_random_blob foo 64)" &&
+		test-tool chmtime --get -10000 \
+			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
+
+		git repack --cruft -d &&
+
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-freshen/.git/
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 20 - setup parent and one repository
+ create mode 100644 base.t
+ok 6 - setup --max-cruft-size with freshened objects
 
-expecting success of 7400.21 'redirected submodule add does not show progress': 
-	git -C addtest submodule add "file://$submodurl/parent" submod-redirected \
-		2>err &&
-	! grep % err &&
-	test_grep ! "Checking connectivity" err
+expecting success of 7704.7 '--max-cruft-size with freshened objects (loose)': 
+	(
+		cd max-cruft-size-freshen &&
 
-ok 21 - redirected submodule add does not show progress
+		# regenerate the object, setting its mtime to be more recent
+		foo="$(generate_random_blob foo 64)" &&
+		test-tool chmtime --get -100 \
+			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
 
-expecting success of 7400.22 'redirected submodule add --progress does show progress': 
-	git -C addtest submodule add --progress "file://$submodurl/parent" \
-		submod-redirected-progress 2>err && \
-	grep % err
+		git repack --cruft -d &&
 
-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 22 - redirected submodule add --progress does show progress
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect &&
+		test_cmp expect actual
+	)
 
-expecting success of 7400.23 'submodule add to .gitignored path fails': 
+ok 7 - --max-cruft-size with freshened objects (loose)
+
+expecting success of 7704.8 '--max-cruft-size with freshened objects (packed)': 
 	(
-		cd addtest-ignore &&
-		cat <<-\EOF >expect &&
-		The following paths are ignored by one of your .gitignore files:
-		submod
-		hint: Use -f if you really want to add them.
-		hint: Disable this message with "git config set advice.addIgnoredFile false"
-		EOF
-		# Does not use test_commit due to the ignore
-		echo "*" > .gitignore &&
-		git add --force .gitignore &&
-		git commit -m"Ignore everything" &&
-		! git submodule add "$submodurl" submod >actual 2>&1 &&
+		cd max-cruft-size-freshen &&
+
+		# regenerate the object and store it in a packfile,
+		# setting its mtime to be more recent
+		#
+		# store it alongside another cruft object so that we
+		# do not create an identical copy of the existing
+		# cruft pack (which contains $foo).
+		foo="$(generate_random_blob foo 64)" &&
+		bar="$(generate_random_blob bar 64)" &&
+		foo_pack="$(printf "%s\n" $foo $bar | git pack-objects $packdir/pack)" &&
+		git prune-packed &&
+
+		test-tool chmtime --get -10 \
+			"$packdir/pack-$foo_pack.pack" >foo.mtime &&
+
+		git repack --cruft -d &&
+
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect.raw &&
+		echo "$bar $(cat foo.mtime)" >>expect.raw &&
+		sort expect.raw >expect &&
 		test_cmp expect actual
 	)
 
-[main (root-commit) 29c0beb] Ignore everything
+ok 8 - --max-cruft-size with freshened objects (packed)
+
+expecting success of 7704.9 '--max-cruft-size with pruning': 
+	git init max-cruft-size-prune &&
+	(
+		cd max-cruft-size-prune &&
+
+		test_commit base &&
+		foo="$(generate_random_blob foo $((1024*1024)))" &&
+		bar="$(generate_random_blob bar $((1024*1024)))" &&
+		baz="$(generate_random_blob baz $((1024*1024)))" &&
+
+		test-tool chmtime -10000 "$objdir/$(test_oid_to_path "$foo")" &&
+
+		git repack -d --cruft --max-cruft-size=1M &&
+
+		# backdate the mtimes of all cruft packs to validate
+		# that they were rewritten as a result of pruning
+		ls $packdir/pack-*.mtimes | sort >cruft.before &&
+		for cruft in $(cat cruft.before)
+		do
+			mtime="$(test-tool chmtime --get -10000 "$cruft")" &&
+			echo $cruft $mtime >>mtimes || return 1
+		done &&
+
+		# repack (and prune) with a --max-cruft-size to ensure
+		# that we appropriately split the resulting set of packs
+		git repack -d --cruft --max-cruft-size=1M \
+			--cruft-expiration=1000.seconds.ago &&
+		ls $packdir/pack-*.mtimes | sort >cruft.after &&
+
+		for cruft in $(cat cruft.after)
+		do
+			old_mtime="$(grep $cruft mtimes | cut -d" " -f2)" &&
+			new_mtime="$(test-tool chmtime --get $cruft)" &&
+			test $old_mtime -lt $new_mtime || return 1
+		done &&
+
+		test_line_count = 3 cruft.before &&
+		test_line_count = 2 cruft.after &&
+		test_must_fail git cat-file -e $foo &&
+		git cat-file -e $bar &&
+		git cat-file -e $baz
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-prune/.git/
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 .gitignore
-ok 23 - submodule add to .gitignored path fails
+ create mode 100644 base.t
+ok 9 - --max-cruft-size with pruning
 
-expecting success of 7400.24 'submodule add to .gitignored path with --force': 
+expecting success of 7704.10 '--max-cruft-size ignores non-local packs': 
+	repo="max-cruft-size-non-local" &&
+	git init $repo &&
 	(
-		cd addtest-ignore &&
-		git submodule add --force "$submodurl" submod
+		cd $repo &&
+		test_commit base &&
+		generate_random_blob foo 64 &&
+		git repack --cruft -d
+	) &&
+
+	git clone --reference=$repo $repo $repo-alt &&
+	(
+		cd $repo-alt &&
+
+		test_commit other &&
+		generate_random_blob bar 64 &&
+
+		# ensure that we do not attempt to pick up packs from
+		# the non-alternated repository, which would result in a
+		# crash
+		git repack --cruft --max-cruft-size=1M -d
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-non-local/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+54e90c3729eb77c2e36713e4c8ffddb3d282a270
+Cloning into 'max-cruft-size-non-local-alt'...
+done.
+[master c5d7d1d] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+38614f4581a1b39849954e788ae9d75096235951
+ok 10 - --max-cruft-size ignores non-local packs
+
+expecting success of 7704.11 'reachable packs are preferred over cruft ones': 
+	repo="cruft-preferred-packs" &&
+	git init "$repo" &&
+	(
+		cd "$repo" &&
+
+		# This test needs to exercise careful control over when a MIDX
+		# is and is not written. Unset the corresponding TEST variable
+		# accordingly.
+		sane_unset GIT_TEST_MULTI_PACK_INDEX &&
+
+		test_commit base &&
+		test_commit --no-tag cruft &&
+
+		non_cruft="$(echo base | git pack-objects --revs $packdir/pack)" &&
+		# Write a cruft pack which both (a) sorts ahead of the non-cruft
+		# pack in lexical order, and (b) has an older mtime to appease
+		# the MIDX preferred pack selection routine.
+		cruft="$(echo pack-$non_cruft.pack | git pack-objects --cruft $packdir/pack-A)" &&
+		test-tool chmtime -1000 $packdir/pack-A-$cruft.pack &&
+
+		test_commit other &&
+		git repack -d &&
+
+		git repack --geometric 2 -d --write-midx --write-bitmap-index &&
+
+		# After repacking, there are two packs left: one reachable one
+		# (which is the result of combining both of the existing two
+		# non-cruft packs), and one cruft pack.
+		find .git/objects/pack -type f -name "*.pack" >packs &&
+		test_line_count = 2 packs &&
+
+		# Make sure that the pack we just wrote is marked as preferred,
+		# not the cruft one.
+		pack="$(test-tool read-midx --preferred-pack $objdir)" &&
+		test_path_is_missing "$packdir/$(basename "$pack" ".idx").mtimes"
 	)
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest-ignore/submod'...
-done.
-ok 24 - submodule add to .gitignored path with --force
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/cruft-preferred-packs/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 7b73700] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+[master be186e2] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+ok 11 - reachable packs are preferred over cruft ones
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7815-grep-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7815-grep-binary/.git/
+expecting success of 7815.1 'setup': 
+	echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
+	git add a &&
+	git commit -m.
+
+[master (root-commit) 8fc33fb] .
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 1 - setup
+
+expecting success of 7815.2 'git grep ina a': 
+	echo Binary file a matches >expect &&
+	git grep ina a >actual &&
+	test_cmp expect actual
+
+ok 2 - git grep ina a
+
+expecting success of 7815.3 'git grep -ah ina a': 
+	git grep -ah ina a >actual &&
+	test_cmp a actual
+
+ok 3 - git grep -ah ina a
+
+expecting success of 7815.4 'git grep -I ina a': 
+	test_must_fail git grep -I ina a >actual &&
+	test_must_be_empty actual
+
+ok 4 - git grep -I ina a
+
+expecting success of 7815.5 'git grep -c ina a': 
+	echo a:1 >expect &&
+	git grep -c ina a >actual &&
+	test_cmp expect actual
+
+ok 5 - git grep -c ina a
 
-expecting success of 7400.25 'submodule add to path with tracked content fails': 
-	(
-		cd addtest &&
-		echo "fatal: 'dir-tracked' already exists in the index" >expect &&
-		mkdir dir-tracked &&
-		test_commit foo dir-tracked/bar &&
-		test_must_fail git submodule add "$submodurl" dir-tracked >actual 2>&1 &&
-		test_cmp expect actual
-	)
+expecting success of 7815.6 'git grep -l ina a': 
+	echo a >expect &&
+	git grep -l ina a >actual &&
+	test_cmp expect actual
 
-[main (root-commit) 3a7133b] foo
- Author: A U Thor <author@example.com>
- 5 files changed, 13 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 dir-tracked/bar
- create mode 160000 submod
- create mode 160000 submod-redirected
- create mode 160000 submod-redirected-progress
-ok 25 - submodule add to path with tracked content fails
+ok 6 - git grep -l ina a
 
-expecting success of 7400.26 'submodule add to reconfigure existing submodule with --force': 
-	(
-		cd addtest-ignore &&
-		bogus_url="$(pwd)/bogus-url" &&
-		git submodule add --force "$bogus_url" submod &&
-		git submodule add --force -b initial "$submodurl" submod-branch &&
-		test "$bogus_url" = "$(git config -f .gitmodules submodule.submod.url)" &&
-		test "$bogus_url" = "$(git config submodule.submod.url)" &&
-		# Restore the url
-		git submodule add --force "$submodurl" submod &&
-		test "$submodurl" = "$(git config -f .gitmodules submodule.submod.url)" &&
-		test "$submodurl" = "$(git config submodule.submod.url)"
-	)
+expecting success of 7815.7 'git grep -L bar a': 
+	echo a >expect &&
+	git grep -L bar a >actual &&
+	test_cmp expect actual
 
-Adding existing repo at 'submod' to the index
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest-ignore/submod-branch'...
-done.
-Adding existing repo at 'submod' to the index
-ok 26 - submodule add to reconfigure existing submodule with --force
+ok 7 - git grep -L bar a
 
-expecting success of 7400.27 'submodule add relays add --dry-run stderr': 
-	test_when_finished "rm -rf addtest/.git/index.lock" &&
-	(
-		cd addtest &&
-		: >.git/index.lock &&
-		! git submodule add "$submodurl" sub-while-locked 2>output.err &&
-		test_grep "^fatal: .*index\.lock" output.err &&
-		test_path_is_missing sub-while-locked
-	)
+expecting success of 7815.8 'git grep -q ina a': 
+	git grep -q ina a >actual &&
+	test_must_be_empty actual
 
-fatal: Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/.git/index.lock': File exists.
-ok 27 - submodule add relays add --dry-run stderr
+ok 8 - git grep -q ina a
 
-expecting success of 7400.28 'submodule add --branch': 
-	echo "refs/heads/initial" >expect-head &&
-	cat <<-\EOF >expect-heads &&
-	refs/heads/initial
-	refs/heads/main
-	EOF
+expecting success of 7815.9 'git grep -F ile a': 
+	git grep -F ile a
 
-	(
-		cd addtest &&
-		git submodule add -b initial "$submodurl" submod-branch &&
-		test "initial" = "$(git config -f .gitmodules submodule.submod-branch.branch)" &&
-		git submodule init
-	) &&
+Binary file a matches
+ok 9 - git grep -F ile a
 
-	rm -f heads head untracked &&
-	inspect addtest/submod-branch ../.. &&
-	test_cmp expect-heads heads &&
-	test_cmp expect-head head &&
-	test_must_be_empty untracked
+expecting success of 7815.10 'git grep -Fi iLE a': 
+	git grep -Fi iLE a
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/submod-branch'...
-done.
-ok 28 - submodule add --branch
+Binary file a matches
+ok 10 - git grep -Fi iLE a
 
-expecting success of 7400.29 'submodule add with ./ in path': 
-	echo "refs/heads/main" >expect &&
+expecting success of 7815.11 'git grep ile a': 
+	git grep ile a
 
-	(
-		cd addtest &&
-		git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
-		git submodule init
-	) &&
+Binary file a matches
+ok 11 - git grep ile a
 
-	rm -f heads head untracked &&
-	inspect addtest/dotsubmod/frotz ../../.. &&
-	test_cmp expect heads &&
-	test_cmp expect head &&
-	test_must_be_empty untracked
+checking known breakage of 7815.12 'git grep .fi a': 
+	git grep .fi a
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/dotsubmod/frotz'...
-done.
-ok 29 - submodule add with ./ in path
+not ok 12 - git grep .fi a # TODO known breakage
 
-expecting success of 7400.30 'submodule add with /././ in path': 
-	echo "refs/heads/main" >expect &&
+expecting success of 7815.13 'grep respects binary diff attribute': 
+	echo text >t &&
+	git add t &&
+	echo t:text >expect &&
+	git grep text t >actual &&
+	test_cmp expect actual &&
+	echo "t -diff" >.gitattributes &&
+	echo "Binary file t matches" >expect &&
+	git grep text t >actual &&
+	test_cmp expect actual
 
-	(
-		cd addtest &&
-		git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ &&
-		git submodule init
-	) &&
+ok 13 - grep respects binary diff attribute
 
-	rm -f heads head untracked &&
-	inspect addtest/dotslashdotsubmod/frotz ../../.. &&
-	test_cmp expect heads &&
-	test_cmp expect head &&
-	test_must_be_empty untracked
+expecting success of 7815.14 'grep --cached respects binary diff attribute': 
+	git grep --cached text t >actual &&
+	test_cmp expect actual
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/dotslashdotsubmod/frotz'...
-done.
-ok 30 - submodule add with /././ in path
+ok 14 - grep --cached respects binary diff attribute
 
-expecting success of 7400.31 'submodule add with // in path': 
-	echo "refs/heads/main" >expect &&
+expecting success of 7815.15 'grep --cached respects binary diff attribute (2)': 
+	git add .gitattributes &&
+	rm .gitattributes &&
+	git grep --cached text t >actual &&
+	test_when_finished "git rm --cached .gitattributes" &&
+	test_when_finished "git checkout .gitattributes" &&
+	test_cmp expect actual
 
-	(
-		cd addtest &&
-		git submodule add "$submodurl" slashslashsubmod///frotz// &&
-		git submodule init
-	) &&
+Updated 1 path from the index
+rm '.gitattributes'
+ok 15 - grep --cached respects binary diff attribute (2)
 
-	rm -f heads head untracked &&
-	inspect addtest/slashslashsubmod/frotz ../../.. &&
-	test_cmp expect heads &&
-	test_cmp expect head &&
-	test_must_be_empty untracked
+expecting success of 7815.16 'grep revision respects binary diff attribute': 
+	git commit -m new &&
+	echo "Binary file HEAD:t matches" >expect &&
+	git grep text HEAD -- t >actual &&
+	test_when_finished "git reset HEAD^" &&
+	test_cmp expect actual
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/slashslashsubmod/frotz'...
-done.
-ok 31 - submodule add with // in path
+[master 7e398e6] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+ok 16 - grep revision respects binary diff attribute
 
-expecting success of 7400.32 'submodule add with /.. in path': 
-	echo "refs/heads/main" >expect &&
+expecting success of 7815.17 'grep respects not-binary diff attribute': 
+	echo binQary | q_to_nul >b &&
+	git add b &&
+	echo "Binary file b matches" >expect &&
+	git grep bin b >actual &&
+	test_cmp expect actual &&
+	echo "b diff" >.gitattributes &&
+	echo "b:binQary" >expect &&
+	git grep bin b >actual.raw &&
+	nul_to_q <actual.raw >actual &&
+	test_cmp expect actual
 
-	(
-		cd addtest &&
-		git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&
-		git submodule init
-	) &&
+ok 17 - grep respects not-binary diff attribute
 
-	rm -f heads head untracked &&
-	inspect addtest/realsubmod ../.. &&
-	test_cmp expect heads &&
-	test_cmp expect head &&
-	test_must_be_empty untracked
+expecting success of 7815.18 'setup textconv filters': 
+	echo a diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/realsubmod'...
-done.
-ok 32 - submodule add with /.. in path
+ok 18 - setup textconv filters
 
-expecting success of 7400.33 'submodule add with ./, /.. and // in path': 
-	echo "refs/heads/main" >expect &&
+expecting success of 7815.19 'grep does not honor textconv': 
+	test_must_fail git grep Qfile
 
-	(
-		cd addtest &&
-		git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&
-		git submodule init
-	) &&
+ok 19 - grep does not honor textconv
 
-	rm -f heads head untracked &&
-	inspect addtest/realsubmod2 ../.. &&
-	test_cmp expect heads &&
-	test_cmp expect head &&
-	test_must_be_empty untracked
+expecting success of 7815.20 'grep --textconv honors textconv': 
+	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
+	git grep --textconv Qfile >actual &&
+	test_cmp expect actual
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/realsubmod2'...
-done.
-ok 33 - submodule add with ./, /.. and // in path
+ok 20 - grep --textconv honors textconv
 
-expecting success of 7400.34 'submodule add with \\ in path': 
-	test_when_finished "rm -rf parent sub\\with\\backslash" &&
+expecting success of 7815.21 'grep --no-textconv does not honor textconv': 
+	test_must_fail git grep --no-textconv Qfile
 
-	# Initialize a repo with a backslash in its name
-	git init sub\\with\\backslash &&
-	touch sub\\with\\backslash/empty.file &&
-	git -C sub\\with\\backslash add empty.file &&
-	git -C sub\\with\\backslash commit -m "Added empty.file" &&
+ok 21 - grep --no-textconv does not honor textconv
 
-	# Add that repository as a submodule
-	git init parent &&
-	git -C parent submodule add ../sub\\with\\backslash
+expecting success of 7815.22 'grep --textconv blob honors textconv': 
+	echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
+	git grep --textconv Qfile HEAD:a >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub\with\backslash/.git/
-[main (root-commit) a129325] Added empty.file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty.file
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/parent/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/parent/sub\with\backslash'...
-done.
-ok 34 - submodule add with \\ in path
+ok 22 - grep --textconv blob honors textconv
 
-expecting success of 7400.35 'submodule add in subdirectory': 
-	echo "refs/heads/main" >expect &&
+# still have 1 known breakage(s)
+# passed all remaining 21 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7817-grep-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7817-grep-sparse-checkout/.git/
+expecting success of 7817.1 'setup': 
+	echo "text" >a &&
+	echo "text" >b &&
+	mkdir dir &&
+	echo "text" >dir/c &&
 
-	mkdir addtest/sub &&
+	git init sub &&
 	(
-		cd addtest/sub &&
-		git submodule add "$submodurl" ../realsubmod3 &&
-		git submodule init
+		cd sub &&
+		mkdir A B &&
+		echo "text" >A/a &&
+		echo "text" >B/b &&
+		git add A B &&
+		git commit -m sub &&
+		git sparse-checkout init --cone &&
+		git sparse-checkout set B
 	) &&
 
-	rm -f heads head untracked &&
-	inspect addtest/realsubmod3 ../.. &&
-	test_cmp expect heads &&
-	test_cmp expect head &&
-	test_must_be_empty untracked
-
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/realsubmod3'...
-done.
-ok 35 - submodule add in subdirectory
-
-expecting success of 7400.36 'submodule add in subdirectory with relative path should fail': 
+	git init sub2 &&
 	(
-		cd addtest/sub &&
-		test_must_fail git submodule add ../../ submod3 2>../../output.err
+		cd sub2 &&
+		echo "text" >a &&
+		git add a &&
+		git commit -m sub2
 	) &&
-	test_grep toplevel output.err
 
-fatal: Relative path can only be used from the toplevel of the working tree
-ok 36 - submodule add in subdirectory with relative path should fail
+	git submodule add ./sub &&
+	git submodule add ./sub2 &&
+	git add a b dir &&
+	git commit -m super &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set "/*" "!b" "!/*/" "sub" &&
 
-expecting success of 7400.37 'setup - add an example entry to .gitmodules': 
-	git config --file=.gitmodules submodule.example.url git://example.com/init.git
+	git tag -am tag-to-commit tag-to-commit HEAD &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	git tag -am tag-to-tree tag-to-tree $tree &&
 
-ok 37 - setup - add an example entry to .gitmodules
+	test_path_is_missing b &&
+	test_path_is_missing dir &&
+	test_path_is_missing sub/A &&
+	test_path_is_file a &&
+	test_path_is_file sub/B/b &&
+	test_path_is_file sub2/a &&
+	git branch -m main
 
-expecting success of 7400.38 'status should fail for unmapped paths': 
-	test_must_fail git submodule status
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7817-grep-sparse-checkout/sub/.git/
+[master (root-commit) e98dfe7] sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 A/a
+ create mode 100644 B/b
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7817-grep-sparse-checkout/sub2/.git/
+[master (root-commit) 4767315] sub2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Adding existing repo at 'sub' to the index
+Adding existing repo at 'sub2' to the index
+[master (root-commit) 26900e7] super
+ Author: A U Thor <author@example.com>
+ 6 files changed, 11 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 dir/c
+ create mode 160000 sub
+ create mode 160000 sub2
+warning: unable to rmdir 'sub': Directory not empty
+warning: unable to rmdir 'sub2': Directory not empty
+warning: pass a leading slash before paths such as 'sub' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+warning: unable to rmdir 'sub2': Directory not empty
+ok 1 - setup
 
-fatal: no submodule mapping found in .gitmodules for path 'init'
-ok 38 - status should fail for unmapped paths
+expecting success of 7817.2 'working tree grep honors sparse checkout': 
+	cat >expect <<-EOF &&
+	a:text
+	b:new-text
+	EOF
+	test_when_finished "rm -f b" &&
+	echo "new-text" >b &&
+	git grep "text" >actual &&
+	test_cmp expect actual
 
-expecting success of 7400.39 'setup - map path in .gitmodules': 
-	cat <<\EOF >expect &&
-[submodule "example"]
-	url = git://example.com/init.git
-	path = init
-EOF
+ok 2 - working tree grep honors sparse checkout
 
-	git config --file=.gitmodules submodule.example.path init &&
+expecting success of 7817.3 'grep searches unmerged file despite not matching sparsity patterns': 
+	cat >expect <<-EOF &&
+	b:modified-b-in-branchX
+	b:modified-b-in-branchY
+	EOF
+	test_when_finished "test_might_fail git merge --abort && \
+			    git checkout main && git sparse-checkout init" &&
 
-	test_cmp expect .gitmodules
+	git sparse-checkout disable &&
+	git checkout -b branchY main &&
+	test_commit modified-b-in-branchY b &&
+	git checkout -b branchX main &&
+	test_commit modified-b-in-branchX b &&
 
-ok 39 - setup - map path in .gitmodules
+	git sparse-checkout init &&
+	test_path_is_missing b &&
+	test_must_fail git merge branchY &&
+	git grep "modified-b" >actual &&
+	test_cmp expect actual
 
-expecting success of 7400.40 'status should only print one line': 
-	git submodule status >lines &&
-	test_line_count = 1 lines
+Switched to a new branch 'branchY'
+[branchY 69623d1] modified-b-in-branchY
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branchX'
+[branchX 2555150] modified-b-in-branchX
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Automatic merge failed; fix conflicts and then commit the result.
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+Switched to branch 'main'
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 3 - grep searches unmerged file despite not matching sparsity patterns
 
-ok 40 - status should only print one line
+expecting success of 7817.4 'grep --cached searches entries with the SKIP_WORKTREE bit': 
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	EOF
+	git grep --cached "text" >actual &&
+	test_cmp expect actual
 
-expecting success of 7400.41 'status from subdirectory should have the same SHA1': 
-	test_when_finished "rmdir addtest/subdir" &&
-	(
-		cd addtest &&
-		mkdir subdir &&
-		git submodule status >output &&
-		awk "{print \$1}" <output >expect &&
-		cd subdir &&
-		git submodule status >../output &&
-		awk "{print \$1}" <../output >../actual &&
-		test_cmp ../expect ../actual &&
-		git -C ../submod checkout HEAD^ &&
-		git submodule status >../output &&
-		awk "{print \$1}" <../output >../actual2 &&
-		cd .. &&
-		git submodule status >output &&
-		awk "{print \$1}" <output >expect2 &&
-		test_cmp expect2 actual2 &&
-		! test_cmp actual actual2
-	)
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 4 - grep --cached searches entries with the SKIP_WORKTREE bit
 
-Note: switching to 'HEAD^'.
+expecting success of 7817.5 'grep --recurse-submodules honors sparse checkout in submodule': 
+	cat >expect <<-EOF &&
+	a:text
+	sub/B/b:text
+	sub2/a:text
+	EOF
+	git update-index --skip-worktree sub2 &&
+	git grep --recurse-submodules "text" >actual &&
+	test_cmp expect actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 5 - grep --recurse-submodules honors sparse checkout in submodule
 
-If you want to 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 7817.6 'grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit': 
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	sub/A/a:text
+	sub/B/b:text
+	sub2/a:text
+	EOF
+	git grep --recurse-submodules --cached "text" >actual &&
+	test_cmp expect actual
 
-  git switch -c <new-branch-name>
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 6 - grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit
 
-Or undo this operation with:
+expecting success of 7817.7 'working tree grep does not search the index with CE_VALID and SKIP_WORKTREE': 
+	cat >expect <<-EOF &&
+	a:text
+	EOF
+	test_when_finished "git update-index --no-assume-unchanged b" &&
+	git update-index --assume-unchanged b &&
+	git grep text >actual &&
+	test_cmp expect actual
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7817.8 'grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE': 
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	EOF
+	test_when_finished "git update-index --no-assume-unchanged b" &&
+	git update-index --assume-unchanged b &&
+	git grep --cached text >actual &&
+	test_cmp expect actual
 
-HEAD is now at 8f98e77 initial commit
---- actual	2025-02-09 06:55:11.874144960 +0000
-+++ actual2	2025-02-09 06:55:12.014145851 +0000
-@@ -4,7 +4,7 @@
- 23ad8e191a506339bc2aa0ae92a950f35303f38b
- 23ad8e191a506339bc2aa0ae92a950f35303f38b
- 23ad8e191a506339bc2aa0ae92a950f35303f38b
--23ad8e191a506339bc2aa0ae92a950f35303f38b
-++8f98e7791903e3a21e37e7c040acf7518da96e03
- 8f98e7791903e3a21e37e7c040acf7518da96e03
- d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
- d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-ok 41 - status from subdirectory should have the same SHA1
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 8 - grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE
 
-expecting success of 7400.42 'setup - fetch commit name from submodule': 
-	rev1=$(cd .subrepo && git rev-parse HEAD) &&
-	printf "rev1: %s\n" "$rev1" &&
-	test -n "$rev1"
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7700-repack.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/.git/
+expecting success of 7700.1 'objects in packs marked .keep are not repacked': 
+	echo content1 >file1 &&
+	echo content2 >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m initial_commit &&
+	# Create two packs
+	# The first pack will contain all of the objects except one
+	git rev-list --objects --all >objs &&
+	grep -v file2 objs | git pack-objects pack &&
+	# The second pack will contain the excluded object
+	packid=$(grep file2 objs | git pack-objects pack) &&
+	>pack-$packid.keep &&
+	git verify-pack -v pack-$packid.idx >packlist &&
+	oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
+	mv pack-* .git/objects/pack/ &&
+	git repack -A -d -l &&
+	git prune-packed &&
+	test_has_duplicate_object false
 
-rev1: 36aca326f3b39b6c280a410fa907ac252a2075c6
-ok 42 - setup - fetch commit name from submodule
+[master (root-commit) 3677360] initial_commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+647acebd8748a0656779e97a3d770aa9b59026ae
+ok 1 - objects in packs marked .keep are not repacked
 
-expecting success of 7400.43 'status should initially be "missing"': 
-	git submodule status >lines &&
-	grep "^-$rev1" lines
+expecting success of 7700.2 'writing bitmaps via command-line can duplicate .keep objects': 
+	# build on $oid, $packid, and .keep state from previous
+	git repack -Adbl &&
+	test_has_duplicate_object true
 
--36aca326f3b39b6c280a410fa907ac252a2075c6 init
-ok 43 - status should initially be "missing"
+637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
+DUPLICATE OBJECT FOUND
+ok 2 - writing bitmaps via command-line can duplicate .keep objects
 
-expecting success of 7400.44 'init should register submodule url in .git/config': 
-	echo git://example.com/init.git >expect &&
+expecting success of 7700.3 'writing bitmaps via config can duplicate .keep objects': 
+	# build on $oid, $packid, and .keep state from previous
+	git -c repack.writebitmaps=true repack -Adl &&
+	test_has_duplicate_object true
 
-	git submodule init &&
-	git config submodule.example.url >url &&
-	git config submodule.example.url ./.subrepo &&
+637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
+DUPLICATE OBJECT FOUND
+ok 3 - writing bitmaps via config can duplicate .keep objects
 
-	test_cmp expect url
+expecting success of 7700.4 'loose objects in alternate ODB are not repacked': 
+	mkdir alt_objects &&
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo content3 >file3 &&
+	oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
+	git add file3 &&
+	test_tick &&
+	git commit -m commit_file3 &&
+	git repack -a -d -l &&
+	git prune-packed &&
+	test_has_duplicate_object false
 
-Submodule 'example' (git://example.com/init.git) registered for path 'init'
-ok 44 - init should register submodule url in .git/config
+[master 6f105e6] commit_file3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+ok 4 - loose objects in alternate ODB are not repacked
 
-expecting success of 7400.45 'status should still be "missing" after initializing': 
-	rm -fr init &&
-	mkdir init &&
-	git submodule status >lines &&
-	rm -fr init &&
-	grep "^-$rev1" lines
+checking prerequisite: SYMLINKS
 
--36aca326f3b39b6c280a410fa907ac252a2075c6 init
-ok 45 - status should still be "missing" after initializing
+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 7400.46 'init should fail with unknown submodule': 
-	test_failure_with_unknown_submodule init
+)
+prerequisite SYMLINKS ok
+expecting success of 7700.5 '--local keeps packs when alternate is objectdir ': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo A &&
+	(
+		cd repo &&
+		git repack -a &&
+		ls .git/objects/pack/*.pack >../expect &&
+		ln -s objects .git/alt_objects &&
+		echo "$(pwd)/.git/alt_objects" >.git/objects/info/alternates &&
+		git repack -a -d -l &&
+		ls .git/objects/pack/*.pack >../actual
+	) &&
+	test_cmp expect actual
 
-error: pathspec 'no-such-submodule' did not match any file(s) known to git
-ok 46 - init should fail with unknown submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) a3899a0] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 5 - --local keeps packs when alternate is objectdir 
 
-expecting success of 7400.47 'update should fail with unknown submodule': 
-	test_failure_with_unknown_submodule update
+expecting success of 7700.6 '--local disables writing bitmaps when connected to alternate ODB': 
+	test_when_finished "rm -rf shared member" &&
 
-error: pathspec 'no-such-submodule' did not match any file(s) known to git
-ok 47 - update should fail with unknown submodule
+	git init shared &&
+	git clone --shared shared member &&
+	(
+		cd member &&
+		test_commit "object" &&
+		git repack -Adl --write-bitmap-index 2>err &&
+		cat >expect <<-EOF &&
+		warning: disabling bitmap writing, as some objects are not being packed
+		EOF
+		test_cmp expect err &&
+		test_path_is_missing .git/objects/pack-*.bitmap
+	)
 
-expecting success of 7400.48 'status should fail with unknown submodule': 
-	test_failure_with_unknown_submodule status
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/shared/.git/
+Cloning into 'member'...
+warning: You appear to have cloned an empty repository.
+done.
+[master (root-commit) c58cb10] object
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 object.t
+ok 6 - --local disables writing bitmaps when connected to alternate ODB
 
-error: pathspec 'no-such-submodule' did not match any file(s) known to git
-ok 48 - status should fail with unknown submodule
+expecting success of 7700.7 'packed obs in alt ODB are repacked even when local repo is packless': 
+	mkdir alt_objects/pack &&
+	mv .git/objects/pack/* alt_objects/pack &&
+	git repack -a &&
+	test_no_missing_in_packs
 
-expecting success of 7400.49 'sync should fail with unknown submodule': 
-	test_failure_with_unknown_submodule sync
+ok 7 - packed obs in alt ODB are repacked even when local repo is packless
 
-error: pathspec 'no-such-submodule' did not match any file(s) known to git
-ok 49 - sync should fail with unknown submodule
+expecting success of 7700.8 'packed obs in alt ODB are repacked when local repo has packs': 
+	rm -f .git/objects/pack/* &&
+	echo new_content >>file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m more_content &&
+	git repack &&
+	git repack -a -d &&
+	test_no_missing_in_packs
 
-expecting success of 7400.50 'update should fail when path is used by a file': 
-	echo hello >expect &&
+[master 0e4e267] more_content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - packed obs in alt ODB are repacked when local repo has packs
 
-	echo "hello" >init &&
-	test_must_fail git submodule update &&
+expecting success of 7700.9 'packed obs in alternate ODB kept pack are repacked': 
+	# swap the .keep so the commit object is in the pack with .keep
+	for p in alt_objects/pack/*.pack
+	do
+		base_name=$(basename $p .pack) &&
+		if test_path_is_file alt_objects/pack/$base_name.keep
+		then
+			rm alt_objects/pack/$base_name.keep
+		else
+			touch alt_objects/pack/$base_name.keep
+		fi || return 1
+	done &&
+	git repack -a -d &&
+	test_no_missing_in_packs
 
-	test_cmp expect init
+File alt_objects/pack/pack-09df7d90d739b5b997442ec62fb88ac0d68d7b68.keep doesn't exist
+ok 9 - packed obs in alternate ODB kept pack are repacked
 
-fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
-fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
-Failed to clone 'init'. Retry scheduled
-fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
-fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
-Failed to clone 'init' a second time, aborting
-ok 50 - update should fail when path is used by a file
+expecting success of 7700.10 'packed unreachable obs in alternate ODB are not loosened': 
+	rm -f alt_objects/pack/*.keep &&
+	mv .git/objects/pack/* alt_objects/pack/ &&
+	coid=$(git rev-parse HEAD^{commit}) &&
+	git reset --hard HEAD^ &&
+	test_tick &&
+	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
+	# The pack-objects call on the next line is equivalent to
+	# git repack -A -d without the call to prune-packed
+	git pack-objects --honor-pack-keep --non-empty --all --reflog \
+	    --unpack-unreachable </dev/null pack &&
+	rm -f .git/objects/pack/* &&
+	mv pack-* .git/objects/pack/ &&
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " packlist &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 
-expecting success of 7400.51 'update should fail when path is used by a nonempty directory': 
-	echo hello >expect &&
+HEAD is now at 6f105e6 commit_file3
+85f93d7925f6a606964869128f786c6de753b60c
+fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
+ok 10 - packed unreachable obs in alternate ODB are not loosened
 
-	rm -fr init &&
-	mkdir init &&
-	echo "hello" >init/a &&
+expecting success of 7700.11 'local packed unreachable obs that exist in alternate ODB are not loosened': 
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo "$coid" | git pack-objects --non-empty --all --reflog pack &&
+	rm -f .git/objects/pack/* &&
+	mv pack-* .git/objects/pack/ &&
+	# The pack-objects call on the next line is equivalent to
+	# git repack -A -d without the call to prune-packed
+	git pack-objects --honor-pack-keep --non-empty --all --reflog \
+	    --unpack-unreachable </dev/null pack &&
+	rm -f .git/objects/pack/* &&
+	mv pack-* .git/objects/pack/ &&
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 
-	test_must_fail git submodule update &&
+4f27fb8d5b73124b8c94f72b938bde9ae4f6999a
+85f93d7925f6a606964869128f786c6de753b60c
+fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
+ok 11 - local packed unreachable obs that exist in alternate ODB are not loosened
 
-	test_cmp expect init/a
+expecting success of 7700.12 'objects made unreachable by grafts only are kept': 
+	test_tick &&
+	git commit --allow-empty -m "commit 4" &&
+	H0=$(git rev-parse HEAD) &&
+	H1=$(git rev-parse HEAD^) &&
+	H2=$(git rev-parse HEAD^^) &&
+	echo "$H0 $H2" >.git/info/grafts &&
+	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
+	git repack -a -d &&
+	git cat-file -t $H1
 
-fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
-fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
-Failed to clone 'init'. Retry scheduled
-fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
-fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
-Failed to clone 'init' a second time, aborting
-ok 51 - update should fail when path is used by a nonempty directory
+[master 95a9e53] commit 4
+ Author: A U Thor <author@example.com>
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+commit
+ok 12 - objects made unreachable by grafts only are kept
 
-expecting success of 7400.52 'update should work when path is an empty dir': 
-	rm -fr init &&
-	rm -f head-sha1 &&
-	echo "$rev1" >expect &&
+expecting success of 7700.13 'repack --keep-pack': 
+	test_create_repo keep-pack &&
+	(
+		cd keep-pack &&
+		# avoid producing different packs due to delta/base choices
+		git config pack.window 0 &&
+		P1=$(commit_and_pack 1) &&
+		P2=$(commit_and_pack 2) &&
+		P3=$(commit_and_pack 3) &&
+		P4=$(commit_and_pack 4) &&
+		ls .git/objects/pack/*.pack >old-counts &&
+		test_line_count = 4 old-counts &&
+		git repack -a -d --keep-pack $P1 --keep-pack $P4 &&
+		ls .git/objects/pack/*.pack >new-counts &&
+		grep -q $P1 new-counts &&
+		grep -q $P4 new-counts &&
+		test_line_count = 3 new-counts &&
+		git fsck &&
 
-	mkdir init &&
-	git submodule update -q >update.out &&
-	test_must_be_empty update.out &&
+		P5=$(commit_and_pack --no-tag 5) &&
+		git reset --hard HEAD^ &&
+		git reflog expire --all --expire=all &&
+		rm -f ".git/objects/pack/${P5%.pack}.idx" &&
+		rm -f ".git/objects/info/commit-graph" &&
+		for from in $(find .git/objects/pack -type f -name "${P5%.pack}.*")
+		do
+			to="$(dirname "$from")/.tmp-1234-$(basename "$from")" &&
+			mv "$from" "$to" || return 1
+		done &&
 
-	inspect init &&
-	test_cmp expect head-sha1
+		# A .idx file without a .pack should not stop us from
+		# repacking what we can.
+		touch .git/objects/pack/pack-does-not-exist.idx &&
 
-fatal: ref HEAD is not a symbolic ref
-ok 52 - update should work when path is an empty dir
+		git repack --cruft -d --keep-pack $P1 --keep-pack $P4 &&
 
-expecting success of 7400.53 'status should be "up-to-date" after update': 
-	git submodule status >list &&
-	grep "^ $rev1" list
+		ls .git/objects/pack/*.pack >newer-counts &&
+		test_cmp new-counts newer-counts &&
+		git fsck
+	)
 
- 36aca326f3b39b6c280a410fa907ac252a2075c6 init (rev-1)
-ok 53 - status should be "up-to-date" after update
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/keep-pack/.git/
+[master (root-commit) c034eb4] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 97f32c4] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master b19c9f9] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master a9c77cf] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 0964b20] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+HEAD is now at a9c77cf 4
+ok 13 - repack --keep-pack
 
-expecting success of 7400.54 'status "up-to-date" from subdirectory': 
-	mkdir -p sub &&
+expecting success of 7700.14 'repacking fails when missing .pack actually means missing objects': 
+	test_create_repo idx-without-pack &&
 	(
-		cd sub &&
-		git submodule status >../list
-	) &&
-	grep "^ $rev1" list &&
-	grep "\\.\\./init" list
-
- 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
- 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
-ok 54 - status "up-to-date" from subdirectory
+		cd idx-without-pack &&
 
-expecting success of 7400.55 'status "up-to-date" from subdirectory with path': 
-	mkdir -p sub &&
-	(
-		cd sub &&
-		git submodule status ../init >../list
-	) &&
-	grep "^ $rev1" list &&
-	grep "\\.\\./init" list
+		# Avoid producing different packs due to delta/base choices
+		git config pack.window 0 &&
+		P1=$(commit_and_pack 1) &&
+		P2=$(commit_and_pack 2) &&
+		P3=$(commit_and_pack 3) &&
+		P4=$(commit_and_pack 4) &&
+		ls .git/objects/pack/*.pack >old-counts &&
+		test_line_count = 4 old-counts &&
 
- 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
- 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
-ok 55 - status "up-to-date" from subdirectory with path
+		# Remove one .pack file
+		rm .git/objects/pack/$P2 &&
 
-expecting success of 7400.56 'status should be "modified" after submodule commit': 
-	(
-		cd init &&
-		echo b >b &&
-		git add b &&
-		git commit -m "submodule commit 2"
-	) &&
+		ls .git/objects/pack/*.pack >before-pack-dir &&
 
-	rev2=$(cd init && git rev-parse HEAD) &&
-	test -n "$rev2" &&
-	git submodule status >list &&
+		test_must_fail git fsck &&
+		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git repack --cruft -d 2>err &&
+		grep "bad object" err &&
 
-	grep "^+$rev2" list
+		# Before failing, the repack did not modify the
+		# pack directory.
+		ls .git/objects/pack/*.pack >after-pack-dir &&
+		test_cmp before-pack-dir after-pack-dir
+	)
 
-[detached HEAD 8eafb57] submodule commit 2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/idx-without-pack/.git/
+[master (root-commit) c034eb4] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b
-+8eafb57b6146d899eeaa430c12864a09fcb0e7e1 init (rev-1-1-g8eafb57)
-ok 56 - status should be "modified" after submodule commit
-
-expecting success of 7400.57 '"submodule --cached" command forms should be identical': 
-	git submodule status --cached >expect &&
-
-	git submodule --cached >actual &&
-	test_cmp expect actual &&
+ create mode 100644 1.t
+[master 97f32c4] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master b19c9f9] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master a9c77cf] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+error: refs/tags/2: invalid sha1 pointer 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+broken link from  commit b19c9f990f8204f55aebfaadd643e918b14bd0de
+              to  commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+missing blob 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
+missing commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+fatal: bad object refs/tags/2
+ok 14 - repacking fails when missing .pack actually means missing objects
 
-	git submodule --cached status >actual &&
-	test_cmp expect actual
+expecting success of 7700.15 'bitmaps are created by default in bare repos': 
+	git clone --bare .git bare.git &&
+	rm -f bare.git/objects/pack/*.bitmap &&
+	git -C bare.git repack -ad &&
+	bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
+	test_path_is_file "$bitmap"
 
-ok 57 - "submodule --cached" command forms should be identical
+Cloning into bare repository 'bare.git'...
+done.
+ok 15 - bitmaps are created by default in bare repos
 
-expecting success of 7400.58 'the --cached sha1 should be rev1': 
-	git submodule --cached status >list &&
-	grep "^+$rev1" list
+expecting success of 7700.16 'incremental repack does not complain': 
+	git -C bare.git repack -q 2>repack.err &&
+	test_must_be_empty repack.err
 
-+36aca326f3b39b6c280a410fa907ac252a2075c6 init (rev-1)
-ok 58 - the --cached sha1 should be rev1
+ok 16 - incremental repack does not complain
 
-expecting success of 7400.59 'git diff should report the SHA1 of the new submodule commit': 
-	git diff >diff &&
-	grep "^+Subproject commit $rev2" diff
+expecting success of 7700.17 'bitmaps can be disabled on bare repos': 
+	git -c repack.writeBitmaps=false -C bare.git repack -ad &&
+	bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
+	test -z "$bitmap"
 
-+Subproject commit 8eafb57b6146d899eeaa430c12864a09fcb0e7e1
-ok 59 - git diff should report the SHA1 of the new submodule commit
+ls: cannot access 'bare.git/objects/pack/*.bitmap': No such file or directory
+ok 17 - bitmaps can be disabled on bare repos
 
-expecting success of 7400.60 'update should checkout rev1': 
-	rm -f head-sha1 &&
-	echo "$rev1" >expect &&
+expecting success of 7700.18 'no bitmaps created if .keep files present': 
+	pack=$(ls bare.git/objects/pack/*.pack) &&
+	test_path_is_file "$pack" &&
+	keep=${pack%.pack}.keep &&
+	test_when_finished "rm -f \"\$keep\"" &&
+	>"$keep" &&
+	git -C bare.git repack -ad 2>stderr &&
+	test_must_be_empty stderr &&
+	find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
+	test_must_be_empty actual
 
-	git submodule update init &&
-	inspect init &&
+Nothing new to pack.
+ok 18 - no bitmaps created if .keep files present
 
-	test_cmp expect head-sha1
+expecting success of 7700.19 'auto-bitmaps do not complain if unavailable': 
+	test_config -C bare.git pack.packSizeLimit 1M &&
+	blob=$(test-tool genrandom big $((1024*1024)) |
+	       git -C bare.git hash-object -w --stdin) &&
+	git -C bare.git update-ref refs/tags/big $blob &&
+	git -C bare.git repack -ad 2>stderr &&
+	test_must_be_empty stderr &&
+	find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
+	test_must_be_empty actual
 
-Submodule path 'init': checked out '36aca326f3b39b6c280a410fa907ac252a2075c6'
-fatal: ref HEAD is not a symbolic ref
-ok 60 - update should checkout rev1
+ok 19 - auto-bitmaps do not complain if unavailable
 
-expecting success of 7400.61 'status should be "up-to-date" after update': 
-	git submodule status >list &&
-	grep "^ $rev1" list
+expecting success of 7700.20 'repacking with a filter works': 
+	git -C bare.git repack -a -d &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
+	git -C bare.git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
+	test_stdout_line_count = 2 ls bare.git/objects/pack/*.pack &&
+	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
+	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
+	test "$commit_pack" != "$blob_pack" &&
+	tree_pack=$(test-tool -C bare.git find-pack -c 1 HEAD^{tree}) &&
+	test "$tree_pack" = "$commit_pack" &&
+	blob_pack2=$(test-tool -C bare.git find-pack -c 1 HEAD:file2) &&
+	test "$blob_pack2" = "$blob_pack"
 
- 36aca326f3b39b6c280a410fa907ac252a2075c6 init (rev-1)
-ok 61 - status should be "up-to-date" after update
+ok 20 - repacking with a filter works
 
-expecting success of 7400.62 'checkout superproject with subproject already present': 
-	git checkout initial &&
-	git checkout main
+expecting success of 7700.21 '--filter fails with --write-bitmap-index': 
+	test_must_fail git -C bare.git repack -a -d --write-bitmap-index --filter=blob:none
 
-warning: unable to rmdir 'init': Directory not empty
-Switched to branch 'initial'
-Switched to branch 'main'
-ok 62 - checkout superproject with subproject already present
+warning: Failed to write bitmap index. Packfile doesn't have full closure (object ac3e272b72bbf89def8657766b855d0656630ed4 is missing)
+fatal: failed to write bitmap index
+ok 21 - --filter fails with --write-bitmap-index
 
-expecting success of 7400.63 'apply submodule diff': 
-	git branch second &&
+expecting success of 7700.22 'repacking with two filters works': 
+	git init two-filters &&
 	(
-		cd init &&
-		echo s >s &&
-		git add s &&
-		git commit -m "change subproject"
+		cd two-filters &&
+		mkdir subdir &&
+		test_commit foo &&
+		test_commit subdir_bar subdir/bar &&
+		test_commit subdir_baz subdir/baz
 	) &&
-	git update-index --add init &&
-	git commit -m "change init" &&
-	git format-patch -1 --stdout >P.diff &&
-	git checkout second &&
-	git apply --index P.diff &&
+	git clone --no-local --bare two-filters two-filters.git &&
+	(
+		cd two-filters.git &&
+		test_stdout_line_count = 1 ls objects/pack/*.pack &&
+		git -c repack.writebitmaps=false repack -a -d \
+			--filter=blob:none --filter=tree:1 &&
+		test_stdout_line_count = 2 ls objects/pack/*.pack &&
+		commit_pack=$(test-tool find-pack -c 1 HEAD) &&
+		blob_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		root_tree_pack=$(test-tool find-pack -c 1 HEAD^{tree}) &&
+		subdir_tree_hash=$(git ls-tree --object-only HEAD -- subdir) &&
+		subdir_tree_pack=$(test-tool find-pack -c 1 "$subdir_tree_hash") &&
 
-	git diff --cached main >staged &&
-	test_must_be_empty staged
+		# Root tree and subdir tree are not in the same packfiles
+		test "$commit_pack" != "$blob_pack" &&
+		test "$commit_pack" = "$root_tree_pack" &&
+		test "$blob_pack" = "$subdir_tree_pack"
+	)
 
-[detached HEAD da28091] change subproject
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/two-filters/.git/
+[master (root-commit) 898d072] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 s
-[main cb68a4b] change init
+ create mode 100644 foo.t
+[master 4eb4067] subdir_bar
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'second'
-M	init
-warning: unable to rmdir 'init': Directory not empty
-ok 63 - apply submodule diff
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/bar
+[master 0e7eef3] subdir_baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/baz
+Cloning into bare repository 'two-filters.git'...
+ok 22 - repacking with two filters works
 
-expecting success of 7400.64 'update --init': 
-	mv init init2 &&
-	git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
-	git config --remove-section submodule.example &&
-	test_must_fail git config submodule.example.url &&
+expecting success of 7700.23 '--filter works with .keep packs': 
+	prepare_for_keep_packs &&
+	(
+		cd keep-packs.git &&
 
-	git submodule update init 2> update.out &&
-	test_grep "not initialized" update.out &&
-	test_must_fail git rev-parse --resolve-git-dir init/.git &&
+		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
+		head_pack=$(test-tool find-pack -c 1 HEAD) &&
 
-	git submodule update --init init &&
-	git rev-parse --resolve-git-dir init/.git
+		test "$foo_pack" != "$bar_pack" &&
+		test "$foo_pack" = "$head_pack" &&
 
-Submodule path 'init' not initialized
-fatal: not a gitdir 'init/.git'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/modules/example
-ok 64 - update --init
+		git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
 
-expecting success of 7400.65 'update --init from subdirectory': 
-	mv init init2 &&
-	git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
-	git config --remove-section submodule.example &&
-	test_must_fail git config submodule.example.url &&
+		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		bar_pack_1=$(test-tool find-pack -c 1 HEAD:bar.t) &&
+		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
 
-	mkdir -p sub &&
-	(
-		cd sub &&
-		git submodule update ../init 2>update.out &&
-		test_grep "not initialized" update.out &&
-		test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
+		# Object bar is still only in the old .keep pack
+		test "$foo_pack_1" != "$foo_pack" &&
+		test "$bar_pack_1" = "$bar_pack" &&
+		test "$head_pack_1" != "$head_pack" &&
 
-		git submodule update --init ../init
-	) &&
-	git rev-parse --resolve-git-dir init/.git
+		test "$foo_pack_1" != "$bar_pack_1" &&
+		test "$foo_pack_1" != "$head_pack_1" &&
+		test "$bar_pack_1" != "$head_pack_1"
+	)
 
-Submodule path '../init' not initialized
-fatal: not a gitdir '../init/.git'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path '../init'
-Submodule path '../init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/modules/example
-ok 65 - update --init from subdirectory
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/keep-packs/.git/
+[master (root-commit) 898d072] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 6cdf4f6] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+Cloning into bare repository 'keep-packs.git'...
+ab13c7a16ee24dc55b0123c11524c0f93444a00b
+ok 23 - --filter works with .keep packs
 
-expecting success of 7400.66 'do not add files from a submodule': 
+expecting success of 7700.24 '--filter works with --pack-kept-objects and .keep packs': 
+	rm -rf keep-packs keep-packs.git &&
+	prepare_for_keep_packs &&
+	(
+		cd keep-packs.git &&
 
-	git reset --hard &&
-	test_must_fail git add init/a
+		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
+		head_pack=$(test-tool find-pack -c 1 HEAD) &&
 
+		test "$foo_pack" != "$bar_pack" &&
+		test "$foo_pack" = "$head_pack" &&
 
-HEAD is now at 23ad8e1 super commit 1
-fatal: Pathspec 'init/a' is in submodule 'init'
-ok 66 - do not add files from a submodule
+		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
+			--pack-kept-objects &&
 
-expecting success of 7400.67 'gracefully add/reset submodule with a trailing slash': 
+		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		test-tool find-pack -c 2 HEAD:bar.t >bar_pack_1 &&
+		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
 
-	git reset --hard &&
-	git commit -m "commit subproject" init &&
-	(cd init &&
-	 echo b > a) &&
-	git add init/ &&
-	git diff --exit-code --cached init &&
-	commit=$(cd init &&
-	 git commit -m update a >/dev/null &&
-	 git rev-parse HEAD) &&
-	git add init/ &&
-	test_must_fail git diff --exit-code --cached init &&
-	test $commit = $(git ls-files --stage |
-		sed -n "s/^160000 \([^ ]*\).*/\1/p") &&
-	git reset init/ &&
-	git diff --exit-code --cached init
+		test "$foo_pack_1" != "$foo_pack" &&
+		test "$foo_pack_1" != "$bar_pack" &&
+		test "$head_pack_1" != "$head_pack" &&
 
+		# Object bar is in both the old .keep pack and the new
+		# pack that contained the filtered out objects
+		grep "$bar_pack" bar_pack_1 &&
+		grep "$foo_pack_1" bar_pack_1 &&
+		test "$foo_pack_1" != "$head_pack_1"
+	)
 
-HEAD is now at 23ad8e1 super commit 1
-[second 365536a] commit subproject
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/keep-packs/.git/
+[master (root-commit) 898d072] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/init b/init
-index da28091..cf4817b 160000
---- a/init
-+++ b/init
-@@ -1 +1 @@
--Subproject commit da28091fa1960864823ed381ef2a1c41222b8351
-+Subproject commit cf4817bea522d7a895a8f804894e1254c741baae
-Unstaged changes after reset:
-M	init
-ok 67 - gracefully add/reset submodule with a trailing slash
-
-expecting success of 7400.68 'ls-files gracefully handles trailing slash': 
-
-	test "init" = "$(git ls-files init/)"
-
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 6cdf4f6] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+Cloning into bare repository 'keep-packs.git'...
+ab13c7a16ee24dc55b0123c11524c0f93444a00b
+./objects/pack/pack-34a84b0f4b3b87454ca39e0a5c6995cbcd831e78.pack
+./objects/pack/pack-363177a6806037aa6bdc933b4c6cd4df16c8340f.pack
+ok 24 - --filter works with --pack-kept-objects and .keep packs
 
-ok 68 - ls-files gracefully handles trailing slash
+expecting success of 7700.25 '--filter-to stores filtered out objects': 
+	git -C bare.git repack -a -d &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
 
-expecting success of 7400.69 'moving to a commit without submodule does not leave empty dir': 
-	rm -rf init &&
-	mkdir init &&
-	git reset --hard &&
-	git checkout initial &&
-	test ! -d init &&
-	git checkout second
+	git init --bare filtered.git &&
+	git -C bare.git -c repack.writebitmaps=false repack -a -d \
+		--filter=blob:none \
+		--filter-to=../filtered.git/objects/pack/pack &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/pack-*.pack &&
+	test_stdout_line_count = 1 ls filtered.git/objects/pack/pack-*.pack &&
 
-HEAD is now at 365536a commit subproject
-Switched to branch 'initial'
-Switched to branch 'second'
-ok 69 - moving to a commit without submodule does not leave empty dir
+	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
+	blob_pack=$(test-tool -C bare.git find-pack -c 0 HEAD:file1) &&
+	blob_hash=$(git -C bare.git rev-parse HEAD:file1) &&
+	test -n "$blob_hash" &&
+	blob_pack=$(test-tool -C filtered.git find-pack -c 1 $blob_hash) &&
 
-expecting success of 7400.70 'submodule <invalid-subcommand> fails': 
-	test_must_fail git submodule no-such-subcommand
+	echo $(pwd)/filtered.git/objects >bare.git/objects/info/alternates &&
+	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
+	blob_content=$(git -C bare.git show $blob_hash) &&
+	test "$blob_content" = "content1"
 
-usage: git submodule [--quiet] [--cached]
-   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
-   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] init [--] [<path>...]
-   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
-   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
-   or: git submodule [--quiet] set-url [--] <path> <newurl>
-   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
-   or: git submodule [--quiet] foreach [--recursive] <command>
-   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
-   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
-ok 70 - submodule <invalid-subcommand> fails
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/filtered.git/
+ok 25 - --filter-to stores filtered out objects
 
-expecting success of 7400.71 'add submodules without specifying an explicit path': 
-	mkdir repo &&
+expecting success of 7700.26 '--filter works with --max-pack-size': 
+	rm -rf filtered.git &&
+	git init --bare filtered.git &&
+	git init max-pack-size &&
 	(
-		cd repo &&
-		git init &&
-		echo r >r &&
-		git add r &&
-		git commit -m "repo commit 1"
+		cd max-pack-size &&
+		test_commit base &&
+		# two blobs which exceed the maximum pack size
+		test-tool genrandom foo 1048576 >foo &&
+		git hash-object -w foo &&
+		test-tool genrandom bar 1048576 >bar &&
+		git hash-object -w bar &&
+		git add foo bar &&
+		git commit -m "adding foo and bar"
 	) &&
-	git clone --bare repo/ bare.git &&
+	git clone --no-local --bare max-pack-size max-pack-size.git &&
 	(
-		cd addtest &&
-		git submodule add "$submodurl/repo" &&
-		git config -f .gitmodules submodule.repo.path repo &&
-		git submodule add "$submodurl/bare.git" &&
-		git config -f .gitmodules submodule.bare.path bare
+		cd max-pack-size.git &&
+		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
+			--max-pack-size=1M \
+			--filter-to=../filtered.git/objects/pack/pack &&
+		echo $(cd .. && pwd)/filtered.git/objects >objects/info/alternates &&
+
+		# Check that the 3 blobs are in different packfiles in filtered.git
+		test_stdout_line_count = 3 ls ../filtered.git/objects/pack/pack-*.pack &&
+		test_stdout_line_count = 1 ls objects/pack/pack-*.pack &&
+		foo_pack=$(test-tool find-pack -c 1 HEAD:foo) &&
+		bar_pack=$(test-tool find-pack -c 1 HEAD:bar) &&
+		base_pack=$(test-tool find-pack -c 1 HEAD:base.t) &&
+		test "$foo_pack" != "$bar_pack" &&
+		test "$foo_pack" != "$base_pack" &&
+		test "$bar_pack" != "$base_pack" &&
+		for pack in "$foo_pack" "$bar_pack" "$base_pack"
+		do
+			case "$foo_pack" in */filtered.git/objects/pack/*) true ;; *) return 1 ;; esac
+		done
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo/.git/
-[main (root-commit) 0244caa] repo commit 1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/filtered.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/max-pack-size/.git/
+[master (root-commit) bf71f7c] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 r
-Cloning into bare repository 'bare.git'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/repo'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/bare'...
-done.
-ok 71 - add submodules without specifying an explicit path
+ create mode 100644 base.t
+4f336f3df31054eabc05ac05f98bc024c8e05423
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c
+[master 8791424] adding foo and bar
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 foo
+Cloning into bare repository 'max-pack-size.git'...
+ok 26 - --filter works with --max-pack-size
 
-expecting success of 7400.72 'add should fail when path is used by a file': 
+expecting success of 7700.27 'setup for --write-midx tests': 
+	git init midx &&
 	(
-		cd addtest &&
-		touch file &&
-		test_must_fail	git submodule add "$submodurl/repo" file
+		cd midx &&
+		git config core.multiPackIndex true &&
+
+		test_commit base
 	)
 
-fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/file' already exists and is not an empty directory.
-fatal: clone of '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/file' failed
-ok 72 - add should fail when path is used by a file
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/midx/.git/
+[master (root-commit) bf71f7c] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 27 - setup for --write-midx tests
 
-expecting success of 7400.73 'add should fail when path is used by an existing directory': 
+expecting success of 7700.28 '--write-midx unchanged': 
 	(
-		cd addtest &&
-		mkdir empty-dir &&
-		test_must_fail git submodule add "$submodurl/repo" empty-dir
-	)
+		cd midx &&
+		git repack &&
+		test_path_is_missing $midx &&
+		test_path_is_missing $midx-*.bitmap &&
 
-fatal: 'empty-dir' already exists and is not a valid git repo
-ok 73 - add should fail when path is used by an existing directory
+		git repack --write-midx &&
 
-expecting success of 7400.74 'use superproject as upstream when path is relative and no url is set there': 
-	(
-		cd addtest &&
-		git submodule add ../repo relative &&
-		test "$(git config -f .gitmodules submodule.relative.url)" = ../repo &&
-		git submodule sync relative &&
-		test "$(git config submodule.relative.url)" = "$submodurl/repo"
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
 	)
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/relative'...
-done.
-Synchronizing submodule url for 'relative'
-ok 74 - use superproject as upstream when path is relative and no url is set there
+Nothing new to pack.
+ok 28 - --write-midx unchanged
 
-expecting success of 7400.75 'set up for relative path tests': 
-	mkdir reltest &&
+expecting success of 7700.29 '--write-midx with a new pack': 
 	(
-		cd reltest &&
-		git init &&
-		mkdir sub &&
-		(
-			cd sub &&
-			git init &&
-			test_commit foo
-		) &&
-		git add sub &&
-		git config -f .gitmodules submodule.sub.path sub &&
-		git config -f .gitmodules submodule.sub.url ../subrepo &&
-		cp .git/config pristine-.git-config &&
-		cp .gitmodules pristine-.gitmodules
+		cd midx &&
+		test_commit loose &&
+
+		git repack --write-midx &&
+
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/reltest/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/reltest/sub/.git/
-[main (root-commit) 946e985] foo
+[master add4380] loose
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 75 - set up for relative path tests
+ create mode 100644 loose.t
+ok 29 - --write-midx with a new pack
 
-expecting success of 7400.76 '../subrepo works with URL - ssh://hostname/repo': 
+expecting success of 7700.30 '--write-midx with -b': 
 	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url ssh://hostname/repo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = ssh://hostname/subrepo
+		cd midx &&
+		git repack -mb &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-*.bitmap &&
+		test_midx_consistent $objdir
 	)
 
-Submodule 'sub' (ssh://hostname/subrepo) registered for path 'sub'
-ok 76 - ../subrepo works with URL - ssh://hostname/repo
+Nothing new to pack.
+ok 30 - --write-midx with -b
 
-expecting success of 7400.77 '../subrepo works with port-qualified URL - ssh://hostname:22/repo': 
+expecting success of 7700.31 '--write-midx with -d': 
 	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url ssh://hostname:22/repo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = ssh://hostname:22/subrepo
-	)
+		cd midx &&
+		test_commit repack &&
 
-Submodule 'sub' (ssh://hostname:22/subrepo) registered for path 'sub'
-ok 77 - ../subrepo works with port-qualified URL - ssh://hostname:22/repo
+		git repack -Ad --write-midx &&
 
-expecting success of 7400.78 '../subrepo path works with local path - //somewhere else/repo': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url "//somewhere else/repo" &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = "//somewhere else/subrepo"
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
 	)
 
-Submodule 'sub' (//somewhere else/subrepo) registered for path 'sub'
-ok 78 - ../subrepo path works with local path - //somewhere else/repo
+[master c5a8e1e] repack
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack.t
+ok 31 - --write-midx with -d
 
-expecting success of 7400.79 '../subrepo works with file URL - file:///tmp/repo': 
+expecting success of 7700.32 'cleans up MIDX when appropriate': 
 	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url file:///tmp/repo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = file:///tmp/subrepo
-	)
+		cd midx &&
 
-Submodule 'sub' (file:///tmp/subrepo) registered for path 'sub'
-ok 79 - ../subrepo works with file URL - file:///tmp/repo
+		test_commit repack-2 &&
+		git repack -Adb --write-midx &&
 
-expecting success of 7400.80 '../subrepo works with helper URL- helper:://hostname/repo': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url helper:://hostname/repo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = helper:://hostname/subrepo
-	)
+		checksum=$(midx_checksum $objdir) &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$checksum.bitmap &&
 
-Submodule 'sub' (helper:://hostname/subrepo) registered for path 'sub'
-ok 80 - ../subrepo works with helper URL- helper:://hostname/repo
+		test_commit repack-3 &&
+		git repack -Adb --write-midx &&
 
-expecting success of 7400.81 '../subrepo works with scp-style URL - user@host:repo': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		git config remote.origin.url user@host:repo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = user@host:subrepo
-	)
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-$checksum.bitmap &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-Submodule 'sub' (user@host:subrepo) registered for path 'sub'
-ok 81 - ../subrepo works with scp-style URL - user@host:repo
+		test_commit repack-4 &&
+		git repack -Adb &&
 
-expecting success of 7400.82 '../subrepo works with scp-style URL - user@host:path/to/repo': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url user@host:path/to/repo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = user@host:path/to/subrepo
+		find $objdir/pack -type f -name "multi-pack-index*" >files &&
+		test_must_be_empty files
 	)
 
-Submodule 'sub' (user@host:path/to/subrepo) registered for path 'sub'
-ok 82 - ../subrepo works with scp-style URL - user@host:path/to/repo
+[master 10c6ab2] repack-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack-2.t
+[master 789d6b0] repack-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack-3.t
+[master 97148f2] repack-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack-4.t
+ok 32 - cleans up MIDX when appropriate
 
-expecting success of 7400.83 '../subrepo works with relative local path - foo': 
+expecting success of 7700.33 '--write-midx with preferred bitmap tips': 
+	git init midx-preferred-tips &&
+	test_when_finished "rm -fr midx-preferred-tips" &&
 	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url foo &&
-		# actual: fails with an error
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = subrepo
-	)
+		cd midx-preferred-tips &&
 
-Submodule 'sub' (subrepo) registered for path 'sub'
-ok 83 - ../subrepo works with relative local path - foo
+		test_commit_bulk --message="%s" 103 &&
 
-expecting success of 7400.84 '../subrepo works with relative local path - foo/bar': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url foo/bar &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = foo/subrepo
-	)
+		git log --format="%H" >commits.raw &&
+		sort <commits.raw >commits &&
 
-Submodule 'sub' (foo/subrepo) registered for path 'sub'
-ok 84 - ../subrepo works with relative local path - foo/bar
+		git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
+		git update-ref --stdin <refs &&
 
-expecting success of 7400.85 '../subrepo works with relative local path - ./foo': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url ./foo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = subrepo
-	)
+		git repack --write-midx --write-bitmap-index &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-Submodule 'sub' (subrepo) registered for path 'sub'
-ok 85 - ../subrepo works with relative local path - ./foo
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >before &&
+		test_line_count = 1 before &&
 
-expecting success of 7400.86 '../subrepo works with relative local path - ./foo/bar': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url ./foo/bar &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = foo/subrepo
-	)
+		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+		rm -fr $midx &&
 
-Submodule 'sub' (foo/subrepo) registered for path 'sub'
-ok 86 - ../subrepo works with relative local path - ./foo/bar
+		# instead of constructing the snapshot ourselves (c.f., the test
+		# "write a bitmap with --refs-snapshot (preferred tips)" in
+		# t5326), mark the missing commit as preferred by adding it to
+		# the pack.preferBitmapTips configuration.
+		git for-each-ref --format="%(refname:rstrip=1)" \
+			--points-at="$(cat before)" >missing &&
+		git config pack.preferBitmapTips "$(cat missing)" &&
+		git repack --write-midx --write-bitmap-index &&
 
-expecting success of 7400.87 '../subrepo works with relative local path - ../foo': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url ../foo &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = ../subrepo
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >after &&
+
+		! test_cmp before after
 	)
 
-Submodule 'sub' (../subrepo) registered for path 'sub'
-ok 87 - ../subrepo works with relative local path - ../foo
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/midx-preferred-tips/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          309 (         0 duplicates                  )
+      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
+      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:            103
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26909 /      26909
+---------------------------------------------------------------------
 
-expecting success of 7400.88 '../subrepo works with relative local path - ../foo/bar': 
+Nothing new to pack.
+Nothing new to pack.
+--- before	2026-03-14 13:36:37.714677808 +0000
++++ after	2026-03-14 13:36:38.002677808 +0000
+@@ -1 +1 @@
+-8cd3b9bb7db0d633144114a81b7374e6a2b1b22c
++3d2725684b43b31e3b81e5070d1847c9f1e2cf00
+ok 33 - --write-midx with preferred bitmap tips
+
+expecting success of 7700.34 '--write-midx -b packs non-kept objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		git config remote.origin.url ../foo/bar &&
-		git submodule init &&
-		test "$(git config submodule.sub.url)" = ../foo/subrepo
-	)
+		cd repo &&
 
-Submodule 'sub' (../foo/subrepo) registered for path 'sub'
-ok 88 - ../subrepo works with relative local path - ../foo/bar
+		# Create a kept pack-file
+		test_commit base &&
+		git repack -ad &&
+		find $objdir/pack -name "*.idx" >before &&
+		test_line_count = 1 before &&
+		before_name=$(cat before) &&
+		>${before_name%.idx}.keep &&
 
-expecting success of 7400.89 '../bar/a/b/c works with relative local path - ../foo/bar.git': 
-	(
-		cd reltest &&
-		cp pristine-.git-config .git/config &&
-		cp pristine-.gitmodules .gitmodules &&
-		mkdir -p a/b/c &&
-		(cd a/b/c && git init && test_commit msg) &&
-		git config remote.origin.url ../foo/bar.git &&
-		git submodule add ../bar/a/b/c ./a/b/c &&
-		git submodule init &&
-		test "$(git config submodule.a/b/c.url)" = ../foo/bar/a/b/c
+		# Create a non-kept pack-file
+		test_commit other &&
+		git repack &&
+
+		# Create loose objects
+		test_commit loose &&
+
+		# Repack everything
+		git repack --write-midx -a -b -d &&
+
+		# There should be two pack-files now, the
+		# old, kept pack and the new, non-kept pack.
+		find $objdir/pack -name "*.idx" | sort >after &&
+		test_line_count = 2 after &&
+		find $objdir/pack -name "*.keep" >kept &&
+		kept_name=$(cat kept) &&
+		echo ${kept_name%.keep}.idx >kept-idx &&
+		test_cmp before kept-idx &&
+
+		# Get object list from the kept pack.
+		get_sorted_objects_from_pack before >old.objects &&
+
+		# Get object list from the one non-kept pack-file
+		comm -13 before after >new-pack &&
+		test_line_count = 1 new-pack &&
+		get_sorted_objects_from_pack new-pack >new.objects &&
+
+		# None of the objects in the new pack should
+		# exist within the kept pack.
+		comm -12 old.objects new.objects >shared.objects &&
+		test_must_be_empty shared.objects
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/reltest/a/b/c/.git/
-[main (root-commit) 11e1cd7] msg
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) bf71f7c] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 msg.t
-Adding existing repo at 'a/b/c' to the index
-Submodule 'sub' (../foo/subrepo) registered for path 'sub'
-ok 89 - ../bar/a/b/c works with relative local path - ../foo/bar.git
+ create mode 100644 base.t
+[master 29fd16f] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+[master abf480b] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 34 - --write-midx -b packs non-kept objects
 
-expecting success of 7400.90 'moving the superproject does not break submodules': 
-	(
-		cd addtest &&
-		git submodule status >expect
-	) &&
-	mv addtest addtest2 &&
+expecting success of 7700.35 '--write-midx removes stale pack-based bitmaps': 
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
-		cd addtest2 &&
-		git submodule status >actual &&
-		test_cmp expect actual
+		cd repo &&
+		test_commit base &&
+		git repack -Ab &&
+
+		pack_bitmap=$(ls $objdir/pack/pack-*.bitmap) &&
+		test_path_is_file "$pack_bitmap" &&
+
+		test_commit tip &&
+		git repack -bm &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+		test_path_is_missing $pack_bitmap
 	)
 
-ok 90 - moving the superproject does not break submodules
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) bf71f7c] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 80dd058] tip
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tip.t
+ok 35 - --write-midx removes stale pack-based bitmaps
 
-expecting success of 7400.91 'moving the submodule does not break the superproject': 
-	(
-		cd addtest2 &&
-		git submodule status
-	) >actual &&
-	sed -e "s/^ \([^ ]* repo\) .*/-\1/" <actual >expect &&
-	mv addtest2/repo addtest2/repo.bak &&
-	test_when_finished "mv addtest2/repo.bak addtest2/repo" &&
+expecting success of 7700.36 '--write-midx with --pack-kept-objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
-		cd addtest2 &&
-		git submodule status
-	) >actual &&
-	test_cmp expect actual
+		cd repo &&
 
-ok 91 - moving the submodule does not break the superproject
+		test_commit one &&
+		test_commit two &&
 
-expecting success of 7400.92 'submodule add --name allows to replace a submodule with another at the same path': 
-	(
-		cd addtest2 &&
-		(
-			cd repo &&
-			echo "$submodurl/repo" >expect &&
-			git config remote.origin.url >actual &&
-			test_cmp expect actual &&
-			echo "gitdir: ../.git/modules/repo" >expect &&
-			test_cmp expect .git
-		) &&
-		rm -rf repo &&
-		git rm repo &&
-		git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual &&
-		test_must_be_empty actual &&
-		echo "gitdir: ../.git/modules/submod" >expect &&
-		test_cmp expect submod/.git &&
-		(
-			cd repo &&
-			echo "$submodurl/bare.git" >expect &&
-			git config remote.origin.url >actual &&
-			test_cmp expect actual &&
-			echo "gitdir: ../.git/modules/repo_new" >expect &&
-			test_cmp expect .git
-		) &&
-		echo "repo" >expect &&
-		test_must_fail git config -f .gitmodules submodule.repo.path &&
-		git config -f .gitmodules submodule.repo_new.path >actual &&
-		test_cmp expect actual &&
-		echo "$submodurl/repo" >expect &&
-		test_must_fail git config -f .gitmodules submodule.repo.url &&
-		echo "$submodurl/bare.git" >expect &&
-		git config -f .gitmodules submodule.repo_new.url >actual &&
-		test_cmp expect actual &&
-		echo "$submodurl/repo" >expect &&
-		git config submodule.repo.url >actual &&
-		test_cmp expect actual &&
-		echo "$submodurl/bare.git" >expect &&
-		git config submodule.repo_new.url >actual &&
-		test_cmp expect actual
+		one="$(echo "one" | git pack-objects --revs $objdir/pack/pack)" &&
+		two="$(echo "one..two" | git pack-objects --revs $objdir/pack/pack)" &&
+
+		keep="$objdir/pack/pack-$one.keep" &&
+		touch "$keep" &&
+
+		git repack --write-midx --write-bitmap-index --geometric=2 -d \
+			--pack-kept-objects &&
+
+		test_path_is_file $keep &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
 	)
 
-rm 'repo'
-ok 92 - submodule add --name allows to replace a submodule with another at the same path
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) 06e07da] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 738d2f7] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 36 - --write-midx with --pack-kept-objects
 
-expecting success of 7400.93 'recursive relative submodules stay relative': 
-	test_when_finished "rm -rf super clone2 subsub sub3" &&
-	mkdir subsub &&
-	(
-		cd subsub &&
-		git init &&
-		>t &&
-		git add t &&
-		git commit -m "initial commit"
-	) &&
-	mkdir sub3 &&
-	(
-		cd sub3 &&
-		git init &&
-		>t &&
-		git add t &&
-		git commit -m "initial commit" &&
-		git submodule add ../subsub dirdir/subsub &&
-		git commit -m "add submodule subsub"
-	) &&
-	mkdir super &&
-	(
-		cd super &&
-		git init &&
-		>t &&
-		git add t &&
-		git commit -m "initial commit" &&
-		git submodule add ../sub3 &&
-		git commit -m "add submodule sub"
-	) &&
-	git clone super clone2 &&
-	(
-		cd clone2 &&
-		git submodule update --init --recursive &&
-		echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
-		echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
-	) &&
-	test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
-	test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
+checking prerequisite: TTY
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/subsub/.git/
-[main (root-commit) b53efa3] initial commit
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 7700.37 '--quiet disables progress': 
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git -C midx repack -ad --quiet --write-midx 2>stderr &&
+	test_must_be_empty stderr
+
+ok 37 - --quiet disables progress
+
+expecting success of 7700.38 'clean up .tmp-* packs on error': 
+	test_must_fail ok=sigpipe git \
+		-c repack.cruftwindow=bogus \
+		repack -ad --cruft &&
+	find $objdir/pack -name .tmp-* >tmpfiles &&
+	test_must_be_empty tmpfiles
+
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+error: option `window' expects a numerical value
+ok 38 - clean up .tmp-* packs on error
+
+expecting success of 7700.39 'repack -ad cleans up old .tmp-* packs': 
+	git rev-parse HEAD >input &&
+	git pack-objects $objdir/pack/.tmp-1234 <input &&
+	git repack -ad &&
+	find $objdir/pack -name .tmp-* >tmpfiles &&
+	test_must_be_empty tmpfiles
+
+e3eb4c912613cba004926473486638766e8cc44e
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 39 - repack -ad cleans up old .tmp-* packs
+
+expecting success of 7700.40 'setup for update-server-info': 
+	git init update-server-info &&
+	test_commit -C update-server-info message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/update-server-info/.git/
+[master (root-commit) c5363f9] message
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub3/.git/
-[main (root-commit) b53efa3] initial commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 message.t
+ok 40 - setup for update-server-info
+
+expecting success of 7700.41 'updates server info by default': 
+	test_server_info_cleanup &&
+	git -C update-server-info repack &&
+	test_server_info_present
+
+ok 41 - updates server info by default
+
+expecting success of 7700.42 '-n skips updating server info': 
+	test_server_info_cleanup &&
+	git -C update-server-info repack -n &&
+	test_server_info_missing
+
+Nothing new to pack.
+ok 42 - -n skips updating server info
+
+expecting success of 7700.43 'repack.updateServerInfo=true updates server info': 
+	test_server_info_cleanup &&
+	git -C update-server-info -c repack.updateServerInfo=true repack &&
+	test_server_info_present
+
+Nothing new to pack.
+ok 43 - repack.updateServerInfo=true updates server info
+
+expecting success of 7700.44 'repack.updateServerInfo=false skips updating server info': 
+	test_server_info_cleanup &&
+	git -C update-server-info -c repack.updateServerInfo=false repack &&
+	test_server_info_missing
+
+Nothing new to pack.
+ok 44 - repack.updateServerInfo=false skips updating server info
+
+expecting success of 7700.45 '-n overrides repack.updateServerInfo=true': 
+	test_server_info_cleanup &&
+	git -C update-server-info -c repack.updateServerInfo=true repack -n &&
+	test_server_info_missing
+
+Nothing new to pack.
+ok 45 - -n overrides repack.updateServerInfo=true
+
+# passed all 45 test(s)
+1..45
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7112-reset-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub3/dirdir/subsub'...
+ 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
 done.
-[main e6f2fcc] add submodule subsub
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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, 4 insertions(+)
+ 2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 dirdir/subsub
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/.git/
-[main (root-commit) b53efa3] initial commit
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/sub3'...
+ 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[main a307821] add submodule sub
+[add_nested_sub 8b3b335] add a nested submodule
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
+ 2 files changed, 5 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub3
-Cloning into 'clone2'...
-done.
-Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub3) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/clone2/sub3'...
+ 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.
-Submodule path 'sub3': checked out 'e6f2fcc279299766e5fd82861e01a38b63aaaf3b'
-Submodule 'dirdir/subsub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/subsub) registered for path 'sub3/dirdir/subsub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/clone2/sub3/dirdir/subsub'...
+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.
-Submodule path 'sub3/dirdir/subsub': checked out 'b53efa3ba7e36ac5829f9621027fbe0575deb58e'
-ok 93 - recursive relative submodules stay relative
+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 7400.94 'submodule add with an existing name fails unless forced': 
-	(
-		cd addtest2 &&
-		rm -rf repo &&
-		git rm repo &&
-		test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo &&
-		test ! -d repo &&
-		test_must_fail git config -f .gitmodules submodule.repo_new.path &&
-		test_must_fail git config -f .gitmodules submodule.repo_new.url &&
-		echo "$submodurl/bare.git" >expect &&
-		git config submodule.repo_new.url >actual &&
-		test_cmp expect actual &&
-		git submodule add -f -q --name repo_new "$submodurl/repo.git" repo &&
-		test -d repo &&
-		echo "repo" >expect &&
-		git config -f .gitmodules submodule.repo_new.path >actual &&
-		test_cmp expect actual &&
-		echo "$submodurl/repo.git" >expect &&
-		git config -f .gitmodules submodule.repo_new.url >actual &&
-		test_cmp expect actual &&
-		echo "$submodurl/repo.git" >expect &&
-		git config submodule.repo_new.url >actual &&
-		test_cmp expect actual
-	)
+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
 
-rm 'repo'
-fatal: A git directory for 'repo_new' is found locally with remote(s):
-  origin	/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/bare.git
-If you want to reuse this local git directory instead of cloning again from
-  /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo.git
-use the '--force' option. If the local git directory is not the correct repo
-or you are unsure what this means choose another name with the '--name' option.
-Reactivating local git directory for submodule 'repo_new'
-ok 94 - submodule add with an existing name fails unless forced
+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 7400.95 'set up a second submodule': 
-	git submodule add ./init2 example2 &&
-	git commit -m "submodule example2 added"
+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
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/example2'...
+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.
-[second b8be30a] submodule example2 added
- Author: A U Thor <author@example.com>
- 2 files changed, 7 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 example2
-ok 95 - set up a second submodule
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.96 'submodule deinit works on repository without submodules': 
-	test_when_finished "rm -rf newdirectory" &&
-	mkdir newdirectory &&
-	(
-		cd newdirectory &&
-		git init &&
-		>file &&
-		git add file &&
-		git commit -m "repo should not be empty" &&
-		git submodule deinit . &&
-		git submodule deinit --all
-	)
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/newdirectory/.git/
-[main (root-commit) 9bf0f79] repo should not be empty
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-ok 96 - submodule deinit works on repository without submodules
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 7400.97 'submodule deinit should remove the whole submodule section from .git/config': 
-	git config submodule.example.foo bar &&
-	git config submodule.example2.frotz nitfol &&
-	git submodule deinit init &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -n "$(git config --get-regexp "submodule\.example2\.")" &&
-	test -f example2/.git &&
-	rmdir init
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cleared directory 'init'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
-ok 97 - submodule deinit should remove the whole submodule section from .git/config
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.98 'submodule deinit should unset core.worktree': 
-	test_path_is_file .git/modules/example/config &&
-	test_must_fail git config -f .git/modules/example/config core.worktree
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 98 - submodule deinit should unset core.worktree
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.99 'submodule deinit from subdirectory': 
-	git submodule update --init &&
-	git config submodule.example.foo bar &&
-	mkdir -p sub &&
-	(
-		cd sub &&
-		git submodule deinit ../init >../output
-	) &&
-	test_grep "\\.\\./init" output &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -n "$(git config --get-regexp "submodule\.example2\.")" &&
-	test -f example2/.git &&
-	rmdir init
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Cleared directory '../init'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path '../init'
-ok 99 - submodule deinit from subdirectory
+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 7400.100 'submodule deinit . deinits all initialized submodules': 
-	git submodule update --init &&
-	git config submodule.example.foo bar &&
-	git config submodule.example2.frotz nitfol &&
-	test_must_fail git submodule deinit &&
-	git submodule deinit . >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	test_grep "Cleared directory .example2" actual &&
-	rmdir init example2
+expecting success of 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
 
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-fatal: Use '--all' if you really want to deinitialize all submodules
-Cleared directory 'init'
-Cleared directory 'example2'
-ok 100 - submodule deinit . deinits all initialized submodules
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
 
-expecting success of 7400.101 'submodule deinit --all deinits all initialized submodules': 
-	git submodule update --init &&
-	git config submodule.example.foo bar &&
-	git config submodule.example2.frotz nitfol &&
-	test_must_fail git submodule deinit &&
-	git submodule deinit --all >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	test_grep "Cleared directory .example2" actual &&
-	rmdir init example2
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-fatal: Use '--all' if you really want to deinitialize all submodules
-Cleared directory 'init'
-Cleared directory 'example2'
-ok 101 - submodule deinit --all deinits all initialized submodules
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.102 'submodule deinit deinits a submodule when its work tree is missing or empty': 
-	git submodule update --init &&
-	rm -rf init example2/* example2/.git &&
-	git submodule deinit init example2 >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
-	test_grep ! "Cleared directory .init" actual &&
-	test_grep "Cleared directory .example2" actual &&
-	rmdir init
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Cleared directory 'example2'
-ok 102 - submodule deinit deinits a submodule when its work tree is missing or empty
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.103 'submodule deinit fails when the submodule contains modifications unless forced': 
-	git submodule update --init &&
-	echo X >>init/s &&
-	test_must_fail git submodule deinit init &&
-	test -n "$(git config --get-regexp "submodule\.example\.")" &&
-	test -f example2/.git &&
-	git submodule deinit -f init >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init
+expecting success of 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
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-error: the following file has local modifications:
-    init
-(use --cached to keep the file, or -f to force removal)
-fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
-Cleared directory 'init'
-ok 103 - submodule deinit fails when the submodule contains modifications unless forced
+expecting success of 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 7400.104 'submodule deinit fails when the submodule contains untracked files unless forced': 
-	git submodule update --init &&
-	echo X >>init/untracked &&
-	test_must_fail git submodule deinit init &&
-	test -n "$(git config --get-regexp "submodule\.example\.")" &&
-	test -f example2/.git &&
-	git submodule deinit -f init >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init
+expecting success of 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
 
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-error: the following file has local modifications:
-    init
-(use --cached to keep the file, or -f to force removal)
-fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
-Cleared directory 'init'
-ok 104 - submodule deinit fails when the submodule contains untracked files unless forced
+expecting success of 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 7400.105 'submodule deinit fails when the submodule HEAD does not match unless forced': 
-	git submodule update --init &&
-	(
-		cd init &&
-		git checkout HEAD^
-	) &&
-	test_must_fail git submodule deinit init &&
-	test -n "$(git config --get-regexp "submodule\.example\.")" &&
-	test -f example2/.git &&
-	git submodule deinit -f init >actual &&
-	test -z "$(git config --get-regexp "submodule\.example\.")" &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init
+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
 
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-  da28091 change subproject
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
- git branch <new-branch-name> da28091
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-HEAD is now at 36aca32 submodule commit 1
-error: the following file has local modifications:
-    init
-(use --cached to keep the file, or -f to force removal)
-fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
-Cleared directory 'init'
-ok 105 - submodule deinit fails when the submodule HEAD does not match unless forced
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.106 'submodule deinit is silent when used on an uninitialized submodule': 
-	git submodule update --init &&
-	git submodule deinit init >actual &&
-	test_grep "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit init >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit . >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep "Submodule .example2. (.*) unregistered for path .example2" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit . >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
-	test_grep "Cleared directory .init" actual &&
-	git submodule deinit --all >actual &&
-	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
-	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
-	test_grep "Cleared directory .init" actual &&
-	rmdir init example2
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/./.subrepo
- * branch            da28091fa1960864823ed381ef2a1c41222b8351 -> FETCH_HEAD
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'init'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'init'
-Submodule 'example2' (./init2) unregistered for path 'example2'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'example2'
-warning: Could not unset core.worktree setting in submodule 'init'
-Cleared directory 'init'
-warning: Could not unset core.worktree setting in submodule 'example2'
-warning: Could not unset core.worktree setting in submodule 'init'
-Cleared directory 'init'
-ok 106 - submodule deinit is silent when used on an uninitialized submodule
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.107 'submodule deinit absorbs .git directory if .git is a directory': 
-	git submodule update --init &&
-	(
-		cd init &&
-		rm .git &&
-		mv ../.git/modules/example .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	git submodule deinit init &&
-	test_path_is_missing init/.git &&
-	test -z "$(git config --get-regexp "submodule\.example\.")"
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
-Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
-warning: Submodule work tree 'init' contains a .git directory. This will be replaced with a .git file by using absorbgitdirs.
-Migrating git directory of 'init' from
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/modules/example'
-Cleared directory 'init'
-Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
-ok 107 - submodule deinit absorbs .git directory if .git is a directory
+expecting success of 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 7400.108 'submodule with UTF-8 name': 
-	svname=$(printf "\303\245 \303\244\303\266") &&
-	mkdir "$svname" &&
-	(
-		cd "$svname" &&
-		git init &&
-		>sub &&
-		git add sub &&
-		git commit -m "init sub"
-	) &&
-	git submodule add ./"$svname" &&
-	git submodule >&2 &&
-	test -n "$(git submodule | grep "$svname")"
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/å äö/.git/
-[main (root-commit) ea6909a] init sub
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub
-Adding existing repo at 'å äö' to the index
- cf4817bea522d7a895a8f804894e1254c741baae example2 (rev-1-2-gcf4817b)
--da28091fa1960864823ed381ef2a1c41222b8351 init
- ea6909a6ccbadc034edc8c42d9d2b85a69afe610 å äö (heads/main)
-ok 108 - submodule with UTF-8 name
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.109 'submodule add clone shallow submodule': 
-	mkdir super &&
-	pwd=$(pwd) &&
-	(
-		cd super &&
-		git init &&
-		git submodule add --depth=1 file://"$pwd"/example2 submodule &&
+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 &&
-			test 1 = $(git log --oneline | wc -l)
+			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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/submodule'...
-ok 109 - submodule add clone shallow submodule
+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 7400.110 'setup superproject with submodules': 
-	git init sub1 &&
-	test_commit -C sub1 test &&
-	test_commit -C sub1 test2 &&
-	git init multisuper &&
-	git -C multisuper submodule add ../sub1 sub0 &&
-	git -C multisuper submodule add ../sub1 sub1 &&
-	git -C multisuper submodule add ../sub1 sub2 &&
-	git -C multisuper submodule add ../sub1 sub3 &&
-	git -C multisuper commit -m "add some submodules"
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1/.git/
-[main (root-commit) f9e7a82] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.t
-[main 71cddcb] test2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test2.t
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub0'...
+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.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub1'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub2'...
+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.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub3'...
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-[main (root-commit) a188ac0] add some submodules
- Author: A U Thor <author@example.com>
- 5 files changed, 16 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub0
- create mode 160000 sub1
- create mode 160000 sub2
- create mode 160000 sub3
-ok 110 - setup superproject with submodules
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.111 'submodule update --init with a specification': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	pwd=$(pwd) &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
-	git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'multisuper_clone'...
-Submodule 'sub1' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 111 - submodule update --init with a specification
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.112 'submodule update --init with submodule.active set': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	pwd=$(pwd) &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
-	git -C multisuper_clone config submodule.active "." &&
-	git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
-	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'multisuper_clone'...
-Submodule 'sub1' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 112 - submodule update --init with submodule.active set
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.113 'submodule update and setting submodule.<name>.active': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	pwd=$(pwd) &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
-	git -C multisuper_clone config --bool submodule.sub0.active "true" &&
-	git -C multisuper_clone config --bool submodule.sub1.active "false" &&
-	git -C multisuper_clone config --bool submodule.sub2.active "true" &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	cat >expect <<-\EOF &&
-	 sub0 (test2)
-	-sub1
-	 sub2 (test2)
-	-sub3
-	EOF
-	git -C multisuper_clone submodule update &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'multisuper_clone'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
-Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 113 - submodule update and setting submodule.<name>.active
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 7400.114 'clone active submodule without submodule url set': 
-	test_when_finished "rm -rf test/test" &&
-	mkdir test &&
-	# another dir breaks accidental relative paths still being correct
-	git clone file://"$pwd"/multisuper test/test &&
-	(
-		cd test/test &&
-		git config submodule.active "." &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-		# do not pass --init flag, as the submodule is already active:
-		git submodule update &&
-		git submodule status >actual_raw &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-		cut -d" " -f3- actual_raw >actual &&
-		cat >expect <<-\EOF &&
-		sub0 (test2)
-		sub1 (test2)
-		sub2 (test2)
-		sub3 (test2)
-		EOF
-		test_cmp expect actual
-	)
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'test/test'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub0'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub1'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub2'...
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub3'...
-Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 114 - clone active submodule without submodule url set
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.115 'update submodules without url set in .gitconfig': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	git clone file://"$pwd"/multisuper multisuper_clone &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git -C multisuper_clone submodule init &&
-	for s in sub0 sub1 sub2 sub3
-	do
-		key=submodule.$s.url &&
-		git -C multisuper_clone config --local --unset $key &&
-		git -C multisuper_clone config --file .gitmodules --unset $key || return 1
-	done &&
+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
 
-	test_must_fail git -C multisuper_clone submodule update 2>err &&
-	grep "cannot clone submodule .sub[0-3]. without a URL" err
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'multisuper_clone'...
-Submodule 'sub0' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
-Submodule 'sub1' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-fatal: cannot clone submodule 'sub0' without a URL
-ok 115 - update submodules without url set in .gitconfig
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.116 'clone --recurse-submodules with a pathspec works': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	cat >expected <<-\EOF &&
-	 sub0 (test2)
-	-sub1
-	-sub2
-	-sub3
-	EOF
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expected actual
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'multisuper_clone'...
+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.
-Submodule 'sub0' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 116 - clone --recurse-submodules with a pathspec works
+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 7400.117 'clone with multiple --recurse-submodules options': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	cat >expect <<-\EOF &&
-	-sub0
-	 sub1 (test2)
-	-sub2
-	 sub3 (test2)
-	EOF
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git clone --recurse-submodules="." \
-		  --recurse-submodules=":(exclude)sub0" \
-		  --recurse-submodules=":(exclude)sub2" \
-		  multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'multisuper_clone'...
+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.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+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.
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 117 - clone with multiple --recurse-submodules options
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7400.118 'clone and subsequent updates correctly auto-initialize submodules': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	cat <<-\EOF >expect &&
-	-sub0
-	 sub1 (test2)
-	-sub2
-	 sub3 (test2)
-	EOF
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	cat <<-\EOF >expect2 &&
-	-sub0
-	 sub1 (test2)
-	-sub2
-	 sub3 (test2)
-	-sub4
-	 sub5 (test2)
-	EOF
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 65 - git_test_func: modified submodule does not update submodule work tree
 
-	git clone --recurse-submodules="." \
-		  --recurse-submodules=":(exclude)sub0" \
-		  --recurse-submodules=":(exclude)sub2" \
-		  --recurse-submodules=":(exclude)sub4" \
-		  multisuper multisuper_clone &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect actual &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git -C multisuper submodule add ../sub1 sub4 &&
-	git -C multisuper submodule add ../sub1 sub5 &&
-	git -C multisuper commit -m "add more submodules" &&
-	# obtain the new superproject
-	git -C multisuper_clone pull &&
-	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
-	test_cmp expect2 actual
+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
 
-Cloning into 'multisuper_clone'...
+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.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub4'...
+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.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub5'...
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-[main 084f781] add more submodules
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 160000 sub4
- create mode 160000 sub5
-From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper
-   a188ac0..084f781  main       -> origin/main
-Could not access submodule 'sub5' at commit 084f781
-Updating a188ac0..084f781
-Fast-forward
- .gitmodules | 6 ++++++
- sub4        | 1 +
- sub5        | 1 +
- 3 files changed, 8 insertions(+)
- create mode 160000 sub4
- create mode 160000 sub5
-Submodule 'sub5' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-ok 118 - clone and subsequent updates correctly auto-initialize submodules
+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 7400.119 'init properly sets the config': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	git clone --recurse-submodules="." \
-		  --recurse-submodules=":(exclude)sub0" \
-		  multisuper multisuper_clone &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	git -C multisuper_clone submodule init -- sub0 sub1 &&
-	git -C multisuper_clone config --get submodule.sub0.active &&
-	test_must_fail git -C multisuper_clone config --get submodule.sub1.active
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-Cloning into 'multisuper_clone'...
+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.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
-Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
-Submodule 'sub4' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub4'
-Submodule 'sub5' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+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.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub4'...
+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.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub4': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
-Submodule 'sub0' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
-true
-ok 119 - init properly sets the config
+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 7400.120 'recursive clone respects -q': 
-	test_when_finished "rm -rf multisuper_clone" &&
-	git clone -q --recurse-submodules multisuper multisuper_clone >actual &&
-	test_must_be_empty actual
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-ok 120 - recursive clone respects -q
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-expecting success of 7400.121 '`submodule init` and `init.templateDir`': 
-	mkdir -p tmpl/hooks &&
-	write_script tmpl/hooks/post-checkout <<-EOF &&
-	echo HOOK-RUN >&2
-	echo I was here >hook.run
-	exit 1
-	EOF
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	test_config init.templateDir "$(pwd)/tmpl" &&
-	test_when_finished \
-		"git config --global --unset init.templateDir || true" &&
-	(
-		sane_unset GIT_TEMPLATE_DIR &&
-		NO_SET_GIT_TEMPLATE_DIR=t &&
-		export NO_SET_GIT_TEMPLATE_DIR &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-		git config --global init.templateDir "$(pwd)/tmpl" &&
-		test_must_fail git submodule \
-			add "$submodurl" sub-global 2>err &&
-		git config --global --unset init.templateDir &&
-		test_grep HOOK-RUN err &&
-		test_path_is_file sub-global/hook.run &&
+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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+HEAD is now at e6169bf Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 80 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-		git config init.templateDir "$(pwd)/tmpl" &&
-		git submodule add "$submodurl" sub-local 2>err &&
-		git config --unset init.templateDir &&
-		test_grep ! HOOK-RUN err &&
-		test_path_is_missing sub-local/hook.run
-	)
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-HOOK-RUN
-ok 121 - `submodule init` and `init.templateDir`
+expecting success of 7112.82 'git_test_func: added submodule does remove untracked unignored file with same name when forced': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 82 - git_test_func: added submodule does remove untracked unignored file with same name when forced
 
-# passed all 121 test(s)
-1..121
+# still have 12 known breakage(s)
+# passed all remaining 70 test(s)
+1..82
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7609-mergetool--lib.sh ***
@@ -495424,668 +497894,6 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7815-grep-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7815-grep-binary/.git/
-expecting success of 7815.1 'setup': 
-	echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
-	git add a &&
-	git commit -m.
-
-[master (root-commit) 8fc33fb] .
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 1 - setup
-
-expecting success of 7815.2 'git grep ina a': 
-	echo Binary file a matches >expect &&
-	git grep ina a >actual &&
-	test_cmp expect actual
-
-ok 2 - git grep ina a
-
-expecting success of 7815.3 'git grep -ah ina a': 
-	git grep -ah ina a >actual &&
-	test_cmp a actual
-
-ok 3 - git grep -ah ina a
-
-expecting success of 7815.4 'git grep -I ina a': 
-	test_must_fail git grep -I ina a >actual &&
-	test_must_be_empty actual
-
-ok 4 - git grep -I ina a
-
-expecting success of 7815.5 'git grep -c ina a': 
-	echo a:1 >expect &&
-	git grep -c ina a >actual &&
-	test_cmp expect actual
-
-ok 5 - git grep -c ina a
-
-expecting success of 7815.6 'git grep -l ina a': 
-	echo a >expect &&
-	git grep -l ina a >actual &&
-	test_cmp expect actual
-
-ok 6 - git grep -l ina a
-
-expecting success of 7815.7 'git grep -L bar a': 
-	echo a >expect &&
-	git grep -L bar a >actual &&
-	test_cmp expect actual
-
-ok 7 - git grep -L bar a
-
-expecting success of 7815.8 'git grep -q ina a': 
-	git grep -q ina a >actual &&
-	test_must_be_empty actual
-
-ok 8 - git grep -q ina a
-
-expecting success of 7815.9 'git grep -F ile a': 
-	git grep -F ile a
-
-Binary file a matches
-ok 9 - git grep -F ile a
-
-expecting success of 7815.10 'git grep -Fi iLE a': 
-	git grep -Fi iLE a
-
-Binary file a matches
-ok 10 - git grep -Fi iLE a
-
-expecting success of 7815.11 'git grep ile a': 
-	git grep ile a
-
-Binary file a matches
-ok 11 - git grep ile a
-
-checking known breakage of 7815.12 'git grep .fi a': 
-	git grep .fi a
-
-not ok 12 - git grep .fi a # TODO known breakage
-
-expecting success of 7815.13 'grep respects binary diff attribute': 
-	echo text >t &&
-	git add t &&
-	echo t:text >expect &&
-	git grep text t >actual &&
-	test_cmp expect actual &&
-	echo "t -diff" >.gitattributes &&
-	echo "Binary file t matches" >expect &&
-	git grep text t >actual &&
-	test_cmp expect actual
-
-ok 13 - grep respects binary diff attribute
-
-expecting success of 7815.14 'grep --cached respects binary diff attribute': 
-	git grep --cached text t >actual &&
-	test_cmp expect actual
-
-ok 14 - grep --cached respects binary diff attribute
-
-expecting success of 7815.15 'grep --cached respects binary diff attribute (2)': 
-	git add .gitattributes &&
-	rm .gitattributes &&
-	git grep --cached text t >actual &&
-	test_when_finished "git rm --cached .gitattributes" &&
-	test_when_finished "git checkout .gitattributes" &&
-	test_cmp expect actual
-
-Updated 1 path from the index
-rm '.gitattributes'
-ok 15 - grep --cached respects binary diff attribute (2)
-
-expecting success of 7815.16 'grep revision respects binary diff attribute': 
-	git commit -m new &&
-	echo "Binary file HEAD:t matches" >expect &&
-	git grep text HEAD -- t >actual &&
-	test_when_finished "git reset HEAD^" &&
-	test_cmp expect actual
-
-[master 7e398e6] new
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-ok 16 - grep revision respects binary diff attribute
-
-expecting success of 7815.17 'grep respects not-binary diff attribute': 
-	echo binQary | q_to_nul >b &&
-	git add b &&
-	echo "Binary file b matches" >expect &&
-	git grep bin b >actual &&
-	test_cmp expect actual &&
-	echo "b diff" >.gitattributes &&
-	echo "b:binQary" >expect &&
-	git grep bin b >actual.raw &&
-	nul_to_q <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 17 - grep respects not-binary diff attribute
-
-expecting success of 7815.18 'setup textconv filters': 
-	echo a diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
-
-ok 18 - setup textconv filters
-
-expecting success of 7815.19 'grep does not honor textconv': 
-	test_must_fail git grep Qfile
-
-ok 19 - grep does not honor textconv
-
-expecting success of 7815.20 'grep --textconv honors textconv': 
-	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile >actual &&
-	test_cmp expect actual
-
-ok 20 - grep --textconv honors textconv
-
-expecting success of 7815.21 'grep --no-textconv does not honor textconv': 
-	test_must_fail git grep --no-textconv Qfile
-
-ok 21 - grep --no-textconv does not honor textconv
-
-expecting success of 7815.22 'grep --textconv blob honors textconv': 
-	echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile HEAD:a >actual &&
-	test_cmp expect actual
-
-ok 22 - grep --textconv blob honors textconv
-
-# still have 1 known breakage(s)
-# passed all remaining 21 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7704-repack-cruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/.git/
-expecting success of 7704.1 '--expire-to stores pruned objects (now)': 
-	git init expire-to-now &&
-	(
-		cd expire-to-now &&
-
-		git branch -M main &&
-
-		test_commit base &&
-
-		git checkout -b cruft &&
-		test_commit --no-tag cruft &&
-
-		git rev-list --objects --no-object-names main..cruft >moved.raw &&
-		sort moved.raw >moved.want &&
-
-		git rev-list --all --objects --no-object-names >expect.raw &&
-		sort expect.raw >expect &&
-
-		git checkout main &&
-		git branch -D cruft &&
-		git reflog expire --all --expire=all &&
-
-		git init --bare expired.git &&
-		git repack -d \
-			--cruft --cruft-expiration="now" \
-			--expire-to="expired.git/objects/pack/pack" &&
-
-		expired="$(ls expired.git/objects/pack/pack-*.idx)" &&
-		test_path_is_file "${expired%.idx}.mtimes" &&
-
-		# Since the `--cruft-expiration` is "now", the effective
-		# behavior is to move _all_ unreachable objects out to
-		# the location in `--expire-to`.
-		git show-index <$expired >expired.raw &&
-		cut -d" " -f2 expired.raw | sort >expired.objects &&
-		git rev-list --all --objects --no-object-names \
-			>remaining.objects &&
-
-		# ...in other words, the combined contents of this
-		# repository and expired.git should be the same as the
-		# set of objects we started with.
-		sort expired.objects remaining.objects >actual &&
-		test_cmp expect actual &&
-
-		# The "moved" objects (i.e., those in expired.git)
-		# should be the same as the cruft objects which were
-		# expired in the previous step.
-		test_cmp moved.want expired.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-now/.git/
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'cruft'
-[cruft 7b73700] cruft
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-Switched to branch 'main'
-Deleted branch cruft (was 7b73700).
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-now/expired.git/
-ok 1 - --expire-to stores pruned objects (now)
-
-expecting success of 7704.2 '--expire-to stores pruned objects (5.minutes.ago)': 
-	git init expire-to-5.minutes.ago &&
-	(
-		cd expire-to-5.minutes.ago &&
-
-		git branch -M main &&
-
-		test_commit base &&
-
-		# Create two classes of unreachable objects, one which
-		# is older than 5 minutes (stale), and another which is
-		# newer (recent).
-		for kind in stale recent
-		do
-			git checkout -b $kind main &&
-			test_commit --no-tag $kind || return 1
-		done &&
-
-		git rev-list --objects --no-object-names main..stale >in &&
-		stale="$(git pack-objects $objdir/pack/pack <in)" &&
-		mtime="$(test-tool chmtime --get =-600 $objdir/pack/pack-$stale.pack)" &&
-
-		# expect holds the set of objects we expect to find in
-		# this repository after repacking
-		git rev-list --objects --no-object-names recent >expect.raw &&
-		sort expect.raw >expect &&
-
-		# moved.want holds the set of objects we expect to find
-		# in expired.git
-		git rev-list --objects --no-object-names main..stale >out &&
-		sort out >moved.want &&
-
-		git checkout main &&
-		git branch -D stale recent &&
-		git reflog expire --all --expire=all &&
-		git prune-packed &&
-
-		git init --bare expired.git &&
-		git repack -d \
-			--cruft --cruft-expiration=5.minutes.ago \
-			--expire-to="expired.git/objects/pack/pack" &&
-
-		# Some of the remaining objects in this repository are
-		# unreachable, so use `cat-file --batch-all-objects`
-		# instead of `rev-list` to get their names
-		git cat-file --batch-all-objects --batch-check="%(objectname)" \
-			>remaining.objects &&
-		sort remaining.objects >actual &&
-		test_cmp expect actual &&
-
-		(
-			cd expired.git &&
-
-			expired="$(ls objects/pack/pack-*.mtimes)" &&
-			test-tool pack-mtimes $(basename $expired) >out &&
-			cut -d" " -f1 out | sort >../moved.got &&
-
-			# Ensure that there are as many objects with the
-			# expected mtime as were moved to expired.git.
-			#
-			# In other words, ensure that the recorded
-			# mtimes of any moved objects was written
-			# correctly.
-			grep " $mtime$" out >matching &&
-			test_line_count = $(wc -l <../moved.want) matching
-		) &&
-		test_cmp moved.want moved.got
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/.git/
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'stale'
-[stale aad0965] stale
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 stale.t
-Switched to a new branch 'recent'
-[recent 52849af] recent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 recent.t
-Switched to branch 'main'
-Deleted branch stale (was aad0965).
-Deleted branch recent (was 52849af).
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/expired.git/
-ok 2 - --expire-to stores pruned objects (5.minutes.ago)
-
-expecting success of 7704.3 '--max-cruft-size creates new packs when above threshold': 
-	git init max-cruft-size-large &&
-	(
-		cd max-cruft-size-large &&
-		test_commit base &&
-
-		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
-		git repack --cruft -d &&
-		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
-
-		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
-		git repack --cruft -d --max-cruft-size=1M &&
-		cruft_bar="$(ls $packdir/pack-*.mtimes | grep -v $cruft_foo)" &&
-
-		test-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
-		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
-
-		grep "^$foo" foo.objects &&
-		test_line_count = 1 foo.objects &&
-		grep "^$bar" bar.objects &&
-		test_line_count = 1 bar.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-large/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1739084119
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1739084119
-ok 3 - --max-cruft-size creates new packs when above threshold
-
-expecting success of 7704.4 '--max-cruft-size combines existing packs when below threshold': 
-	git init max-cruft-size-small &&
-	(
-		cd max-cruft-size-small &&
-		test_commit base &&
-
-		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
-		git repack --cruft -d &&
-
-		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
-		git repack --cruft -d --max-cruft-size=10M &&
-
-		cruft=$(ls $packdir/pack-*.mtimes) &&
-		test-tool pack-mtimes $(basename "$cruft") >cruft.objects &&
-
-		grep "^$foo" cruft.objects &&
-		grep "^$bar" cruft.objects &&
-		test_line_count = 2 cruft.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-small/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1739084119
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1739084119
-ok 4 - --max-cruft-size combines existing packs when below threshold
-
-expecting success of 7704.5 '--max-cruft-size combines smaller packs first': 
-	git init max-cruft-size-consume-small &&
-	(
-		cd max-cruft-size-consume-small &&
-
-		test_commit base &&
-		git repack -ad &&
-
-		cruft_foo="$(generate_cruft_pack foo 524288)" &&    # 0.5 MiB
-		cruft_bar="$(generate_cruft_pack bar 524288)" &&    # 0.5 MiB
-		cruft_baz="$(generate_cruft_pack baz 1048576)" &&   # 1.0 MiB
-		cruft_quux="$(generate_cruft_pack quux 1572864)" && # 1.5 MiB
-
-		test-tool pack-mtimes "$(basename $cruft_foo)" >expect.raw &&
-		test-tool pack-mtimes "$(basename $cruft_bar)" >>expect.raw &&
-		sort expect.raw >expect.objects &&
-
-		# repacking with `--max-cruft-size=2M` should combine
-		# both 0.5 MiB packs together, instead of, say, one of
-		# the 0.5 MiB packs with the 1.0 MiB pack
-		ls $packdir/pack-*.mtimes | sort >cruft.before &&
-		git repack -d --cruft --max-cruft-size=2M &&
-		ls $packdir/pack-*.mtimes | sort >cruft.after &&
-
-		comm -13 cruft.before cruft.after >cruft.new &&
-		comm -23 cruft.before cruft.after >cruft.removed &&
-
-		test_line_count = 1 cruft.new &&
-		test_line_count = 2 cruft.removed &&
-
-		# the two smaller packs should be rolled up first
-		printf "%s\n" $cruft_foo $cruft_bar | sort >expect.removed &&
-		test_cmp expect.removed cruft.removed &&
-
-		# ...and contain the set of objects rolled up
-		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
-		sort actual.raw >actual.objects &&
-
-		test_cmp expect.objects actual.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-consume-small/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 5 - --max-cruft-size combines smaller packs first
-
-expecting success of 7704.6 'setup --max-cruft-size with freshened objects': 
-	git init max-cruft-size-freshen &&
-	(
-		cd max-cruft-size-freshen &&
-
-		test_commit base &&
-		git repack -ad &&
-
-		foo="$(generate_random_blob foo 64)" &&
-		test-tool chmtime --get -10000 \
-			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
-
-		git repack --cruft -d &&
-
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-freshen/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 6 - setup --max-cruft-size with freshened objects
-
-expecting success of 7704.7 '--max-cruft-size with freshened objects (loose)': 
-	(
-		cd max-cruft-size-freshen &&
-
-		# regenerate the object, setting its mtime to be more recent
-		foo="$(generate_random_blob foo 64)" &&
-		test-tool chmtime --get -100 \
-			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
-
-		git repack --cruft -d &&
-
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect &&
-		test_cmp expect actual
-	)
-
-ok 7 - --max-cruft-size with freshened objects (loose)
-
-expecting success of 7704.8 '--max-cruft-size with freshened objects (packed)': 
-	(
-		cd max-cruft-size-freshen &&
-
-		# regenerate the object and store it in a packfile,
-		# setting its mtime to be more recent
-		#
-		# store it alongside another cruft object so that we
-		# do not create an identical copy of the existing
-		# cruft pack (which contains $foo).
-		foo="$(generate_random_blob foo 64)" &&
-		bar="$(generate_random_blob bar 64)" &&
-		foo_pack="$(printf "%s\n" $foo $bar | git pack-objects $packdir/pack)" &&
-		git prune-packed &&
-
-		test-tool chmtime --get -10 \
-			"$packdir/pack-$foo_pack.pack" >foo.mtime &&
-
-		git repack --cruft -d &&
-
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect.raw &&
-		echo "$bar $(cat foo.mtime)" >>expect.raw &&
-		sort expect.raw >expect &&
-		test_cmp expect actual
-	)
-
-ok 8 - --max-cruft-size with freshened objects (packed)
-
-expecting success of 7704.9 '--max-cruft-size with pruning': 
-	git init max-cruft-size-prune &&
-	(
-		cd max-cruft-size-prune &&
-
-		test_commit base &&
-		foo="$(generate_random_blob foo $((1024*1024)))" &&
-		bar="$(generate_random_blob bar $((1024*1024)))" &&
-		baz="$(generate_random_blob baz $((1024*1024)))" &&
-
-		test-tool chmtime -10000 "$objdir/$(test_oid_to_path "$foo")" &&
-
-		git repack -d --cruft --max-cruft-size=1M &&
-
-		# backdate the mtimes of all cruft packs to validate
-		# that they were rewritten as a result of pruning
-		ls $packdir/pack-*.mtimes | sort >cruft.before &&
-		for cruft in $(cat cruft.before)
-		do
-			mtime="$(test-tool chmtime --get -10000 "$cruft")" &&
-			echo $cruft $mtime >>mtimes || return 1
-		done &&
-
-		# repack (and prune) with a --max-cruft-size to ensure
-		# that we appropriately split the resulting set of packs
-		git repack -d --cruft --max-cruft-size=1M \
-			--cruft-expiration=1000.seconds.ago &&
-		ls $packdir/pack-*.mtimes | sort >cruft.after &&
-
-		for cruft in $(cat cruft.after)
-		do
-			old_mtime="$(grep $cruft mtimes | cut -d" " -f2)" &&
-			new_mtime="$(test-tool chmtime --get $cruft)" &&
-			test $old_mtime -lt $new_mtime || return 1
-		done &&
-
-		test_line_count = 3 cruft.before &&
-		test_line_count = 2 cruft.after &&
-		test_must_fail git cat-file -e $foo &&
-		git cat-file -e $bar &&
-		git cat-file -e $baz
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-prune/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 9 - --max-cruft-size with pruning
-
-expecting success of 7704.10 '--max-cruft-size ignores non-local packs': 
-	repo="max-cruft-size-non-local" &&
-	git init $repo &&
-	(
-		cd $repo &&
-		test_commit base &&
-		generate_random_blob foo 64 &&
-		git repack --cruft -d
-	) &&
-
-	git clone --reference=$repo $repo $repo-alt &&
-	(
-		cd $repo-alt &&
-
-		test_commit other &&
-		generate_random_blob bar 64 &&
-
-		# ensure that we do not attempt to pick up packs from
-		# the non-alternated repository, which would result in a
-		# crash
-		git repack --cruft --max-cruft-size=1M -d
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/max-cruft-size-non-local/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-54e90c3729eb77c2e36713e4c8ffddb3d282a270
-Cloning into 'max-cruft-size-non-local-alt'...
-done.
-[master c5d7d1d] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-38614f4581a1b39849954e788ae9d75096235951
-ok 10 - --max-cruft-size ignores non-local packs
-
-expecting success of 7704.11 'reachable packs are preferred over cruft ones': 
-	repo="cruft-preferred-packs" &&
-	git init "$repo" &&
-	(
-		cd "$repo" &&
-
-		# This test needs to exercise careful control over when a MIDX
-		# is and is not written. Unset the corresponding TEST variable
-		# accordingly.
-		sane_unset GIT_TEST_MULTI_PACK_INDEX &&
-
-		test_commit base &&
-		test_commit --no-tag cruft &&
-
-		non_cruft="$(echo base | git pack-objects --revs $packdir/pack)" &&
-		# Write a cruft pack which both (a) sorts ahead of the non-cruft
-		# pack in lexical order, and (b) has an older mtime to appease
-		# the MIDX preferred pack selection routine.
-		cruft="$(echo pack-$non_cruft.pack | git pack-objects --cruft $packdir/pack-A)" &&
-		test-tool chmtime -1000 $packdir/pack-A-$cruft.pack &&
-
-		test_commit other &&
-		git repack -d &&
-
-		git repack --geometric 2 -d --write-midx --write-bitmap-index &&
-
-		# After repacking, there are two packs left: one reachable one
-		# (which is the result of combining both of the existing two
-		# non-cruft packs), and one cruft pack.
-		find .git/objects/pack -type f -name "*.pack" >packs &&
-		test_line_count = 2 packs &&
-
-		# Make sure that the pack we just wrote is marked as preferred,
-		# not the cruft one.
-		pack="$(test-tool read-midx --preferred-pack $objdir)" &&
-		test_path_is_missing "$packdir/$(basename "$pack" ".idx").mtimes"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7704-repack-cruft/cruft-preferred-packs/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 7b73700] cruft
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-[master be186e2] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-ok 11 - reachable packs are preferred over cruft ones
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7508-status.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7508-status/.git/
 expecting success of 7508.1 'status -h in broken repository': 
@@ -497626,8 +499434,8 @@
 	git -c status.branch=true status -s >actual &&
 	! test_cmp expected_nobranch actual
 
---- expected_nobranch	2025-02-09 06:55:19.610194182 +0000
-+++ actual	2025-02-09 06:55:19.618194233 +0000
+--- expected_nobranch	2026-03-14 13:36:34.106677808 +0000
++++ actual	2026-03-14 13:36:34.162677808 +0000
 @@ -1,2 +1,3 @@
 +## main...upstream [ahead 2, behind 2]
   M dir1/modified
@@ -497864,11 +499672,11 @@
 	dir2/untracked
 	untracked
 
---- .git/test-mtime-expect	2025-02-09 06:55:21.026203192 +0000
-+++ .git/test-mtime-actual	2025-02-09 06:55:21.026203192 +0000
+--- .git/test-mtime-expect	2026-03-14 13:36:46.894677808 +0000
++++ .git/test-mtime-actual	2026-03-14 13:36:46.914677808 +0000
 @@ -1 +1 @@
 -1234567890
-+1739084120
++1773495406
 ok 118 - --no-optional-locks prevents index update
 
 expecting success of 7508.119 'racy timestamps will be fixed for clean worktree': 
@@ -497912,11 +499720,11 @@
 	untracked
 
 nothing added to commit but untracked files present (use "git add" to track)
---- .git/test-mtime-expect	2025-02-09 06:55:21.214204388 +0000
-+++ .git/test-mtime-actual	2025-02-09 06:55:21.214204388 +0000
+--- .git/test-mtime-expect	2026-03-14 13:36:48.762677808 +0000
++++ .git/test-mtime-actual	2026-03-14 13:36:48.782677808 +0000
 @@ -1 +1 @@
 -1234567890
-+1739084121
++1773495407
 ok 119 - racy timestamps will be fixed for clean worktree
 
 expecting success of 7508.120 'racy timestamps will be fixed for dirty worktree': 
@@ -497958,11 +499766,11 @@
 	untracked
 
 no changes added to commit (use "git add" and/or "git commit -a")
---- .git/test-mtime-expect	2025-02-09 06:55:21.378205431 +0000
-+++ .git/test-mtime-actual	2025-02-09 06:55:21.382205457 +0000
+--- .git/test-mtime-expect	2026-03-14 13:36:50.390677808 +0000
++++ .git/test-mtime-actual	2026-03-14 13:36:50.410677808 +0000
 @@ -1 +1 @@
 -1234567890
-+1739084121
++1773495409
 ok 120 - racy timestamps will be fixed for dirty worktree
 
 expecting success of 7508.121 'setup slow status advice': 
@@ -498059,3638 +499867,1473 @@
 1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7700-repack.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/.git/
-expecting success of 7700.1 'objects in packs marked .keep are not repacked': 
-	echo content1 >file1 &&
-	echo content2 >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m initial_commit &&
-	# Create two packs
-	# The first pack will contain all of the objects except one
-	git rev-list --objects --all >objs &&
-	grep -v file2 objs | git pack-objects pack &&
-	# The second pack will contain the excluded object
-	packid=$(grep file2 objs | git pack-objects pack) &&
-	>pack-$packid.keep &&
-	git verify-pack -v pack-$packid.idx >packlist &&
-	oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
-	mv pack-* .git/objects/pack/ &&
-	git repack -A -d -l &&
-	git prune-packed &&
-	test_has_duplicate_object false
-
-[master (root-commit) 3677360] initial_commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-647acebd8748a0656779e97a3d770aa9b59026ae
-ok 1 - objects in packs marked .keep are not repacked
-
-expecting success of 7700.2 'writing bitmaps via command-line can duplicate .keep objects': 
-	# build on $oid, $packid, and .keep state from previous
-	git repack -Adbl &&
-	test_has_duplicate_object true
-
-637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
-DUPLICATE OBJECT FOUND
-ok 2 - writing bitmaps via command-line can duplicate .keep objects
-
-expecting success of 7700.3 'writing bitmaps via config can duplicate .keep objects': 
-	# build on $oid, $packid, and .keep state from previous
-	git -c repack.writebitmaps=true repack -Adl &&
-	test_has_duplicate_object true
-
-637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
-DUPLICATE OBJECT FOUND
-ok 3 - writing bitmaps via config can duplicate .keep objects
+*** t8001-annotate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8001-annotate/.git/
+expecting success of 8001.1 'setup A lines': 
+	echo "1A quick brown fox jumps over the" >file &&
+	echo "lazy dog" >>file &&
+	git add file &&
+	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
+	git commit -a -m "Initial."
 
-expecting success of 7700.4 'loose objects in alternate ODB are not repacked': 
-	mkdir alt_objects &&
-	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
-	echo content3 >file3 &&
-	oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
-	git add file3 &&
-	test_tick &&
-	git commit -m commit_file3 &&
-	git repack -a -d -l &&
-	git prune-packed &&
-	test_has_duplicate_object false
+[main (root-commit) 129283d] Initial.
+ Author: A <A@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+ok 1 - setup A lines
 
-[master 6f105e6] commit_file3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 4 - loose objects in alternate ODB are not repacked
+expecting success of 8001.2 'blame 1 author': 
+	check_count A 2
 
-checking prerequisite: SYMLINKS
+git annotate  file 
+Author A (expected 2, attributed 2) good
+ok 2 - blame 1 author
 
-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 8001.3 'blame working copy': 
+	test_when_finished "git restore file" &&
+	echo "1A quick brown fox jumps over the" >file &&
+	echo "another lazy dog" >>file &&
+	check_count A 1 "Not Committed Yet" 1
 
-)
-prerequisite SYMLINKS ok
-expecting success of 7700.5 '--local keeps packs when alternate is objectdir ': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo A &&
-	(
-		cd repo &&
-		git repack -a &&
-		ls .git/objects/pack/*.pack >../expect &&
-		ln -s objects .git/alt_objects &&
-		echo "$(pwd)/.git/alt_objects" >.git/objects/info/alternates &&
-		git repack -a -d -l &&
-		ls .git/objects/pack/*.pack >../actual
-	) &&
-	test_cmp expect actual
+git annotate  file 
+Author Not Committed Yet (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 3 - blame working copy
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) a3899a0] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 5 - --local keeps packs when alternate is objectdir 
+expecting success of 8001.4 'blame with --contents': 
+	check_count --contents=file A 2
 
-expecting success of 7700.6 '--local disables writing bitmaps when connected to alternate ODB': 
-	test_when_finished "rm -rf shared member" &&
+git annotate  --contents=file file 
+Author A (expected 2, attributed 2) good
+ok 4 - blame with --contents
 
-	git init shared &&
-	git clone --shared shared member &&
+expecting success of 8001.5 'blame with --contents in a bare repo': 
+	git clone --bare . bare-contents.git &&
 	(
-		cd member &&
-		test_commit "object" &&
-		git repack -Adl --write-bitmap-index 2>err &&
-		cat >expect <<-EOF &&
-		warning: disabling bitmap writing, as some objects are not being packed
-		EOF
-		test_cmp expect err &&
-		test_path_is_missing .git/objects/pack-*.bitmap
+		cd bare-contents.git &&
+		echo "1A quick brown fox jumps over the" >contents &&
+		check_count --contents=contents A 1
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/shared/.git/
-Cloning into 'member'...
-warning: You appear to have cloned an empty repository.
+Cloning into bare repository 'bare-contents.git'...
 done.
-[master (root-commit) c58cb10] object
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 object.t
-ok 6 - --local disables writing bitmaps when connected to alternate ODB
-
-expecting success of 7700.7 'packed obs in alt ODB are repacked even when local repo is packless': 
-	mkdir alt_objects/pack &&
-	mv .git/objects/pack/* alt_objects/pack &&
-	git repack -a &&
-	test_no_missing_in_packs
-
-ok 7 - packed obs in alt ODB are repacked even when local repo is packless
-
-expecting success of 7700.8 'packed obs in alt ODB are repacked when local repo has packs': 
-	rm -f .git/objects/pack/* &&
-	echo new_content >>file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m more_content &&
-	git repack &&
-	git repack -a -d &&
-	test_no_missing_in_packs
-
-[master 0e4e267] more_content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - packed obs in alt ODB are repacked when local repo has packs
-
-expecting success of 7700.9 'packed obs in alternate ODB kept pack are repacked': 
-	# swap the .keep so the commit object is in the pack with .keep
-	for p in alt_objects/pack/*.pack
-	do
-		base_name=$(basename $p .pack) &&
-		if test_path_is_file alt_objects/pack/$base_name.keep
-		then
-			rm alt_objects/pack/$base_name.keep
-		else
-			touch alt_objects/pack/$base_name.keep
-		fi || return 1
-	done &&
-	git repack -a -d &&
-	test_no_missing_in_packs
-
-File alt_objects/pack/pack-09df7d90d739b5b997442ec62fb88ac0d68d7b68.keep doesn't exist
-ok 9 - packed obs in alternate ODB kept pack are repacked
-
-expecting success of 7700.10 'packed unreachable obs in alternate ODB are not loosened': 
-	rm -f alt_objects/pack/*.keep &&
-	mv .git/objects/pack/* alt_objects/pack/ &&
-	coid=$(git rev-parse HEAD^{commit}) &&
-	git reset --hard HEAD^ &&
-	test_tick &&
-	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
-	# The pack-objects call on the next line is equivalent to
-	# git repack -A -d without the call to prune-packed
-	git pack-objects --honor-pack-keep --non-empty --all --reflog \
-	    --unpack-unreachable </dev/null pack &&
-	rm -f .git/objects/pack/* &&
-	mv pack-* .git/objects/pack/ &&
-	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
-	! grep "^$coid " packlist &&
-	echo >.git/objects/info/alternates &&
-	test_must_fail git show $coid
-
-HEAD is now at 6f105e6 commit_file3
-85f93d7925f6a606964869128f786c6de753b60c
-fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
-ok 10 - packed unreachable obs in alternate ODB are not loosened
-
-expecting success of 7700.11 'local packed unreachable obs that exist in alternate ODB are not loosened': 
-	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
-	echo "$coid" | git pack-objects --non-empty --all --reflog pack &&
-	rm -f .git/objects/pack/* &&
-	mv pack-* .git/objects/pack/ &&
-	# The pack-objects call on the next line is equivalent to
-	# git repack -A -d without the call to prune-packed
-	git pack-objects --honor-pack-keep --non-empty --all --reflog \
-	    --unpack-unreachable </dev/null pack &&
-	rm -f .git/objects/pack/* &&
-	mv pack-* .git/objects/pack/ &&
-	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
-	! grep "^$coid " &&
-	echo >.git/objects/info/alternates &&
-	test_must_fail git show $coid
-
-4f27fb8d5b73124b8c94f72b938bde9ae4f6999a
-85f93d7925f6a606964869128f786c6de753b60c
-fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
-ok 11 - local packed unreachable obs that exist in alternate ODB are not loosened
+git annotate  --contents=contents file 
+Author A (expected 1, attributed 1) good
+ok 5 - blame with --contents in a bare repo
 
-expecting success of 7700.12 'objects made unreachable by grafts only are kept': 
-	test_tick &&
-	git commit --allow-empty -m "commit 4" &&
-	H0=$(git rev-parse HEAD) &&
-	H1=$(git rev-parse HEAD^) &&
-	H2=$(git rev-parse HEAD^^) &&
-	echo "$H0 $H2" >.git/info/grafts &&
-	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
-	git repack -a -d &&
-	git cat-file -t $H1
+expecting success of 8001.6 'blame with --contents changed': 
+	echo "1A quick brown fox jumps over the" >contents &&
+	echo "another lazy dog" >>contents &&
+	check_count --contents=contents A 1 "External file (--contents)" 1
 
-[master 95a9e53] commit 4
- Author: A U Thor <author@example.com>
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-commit
-ok 12 - objects made unreachable by grafts only are kept
+git annotate  --contents=contents file 
+Author A (expected 1, attributed 1) good
+Author External file (--contents) (expected 1, attributed 1) good
+ok 6 - blame with --contents changed
 
-expecting success of 7700.13 'repack --keep-pack': 
-	test_create_repo keep-pack &&
+expecting success of 8001.7 'blame in a bare repo without starting commit': 
+	git clone --bare . bare.git &&
 	(
-		cd keep-pack &&
-		# avoid producing different packs due to delta/base choices
-		git config pack.window 0 &&
-		P1=$(commit_and_pack 1) &&
-		P2=$(commit_and_pack 2) &&
-		P3=$(commit_and_pack 3) &&
-		P4=$(commit_and_pack 4) &&
-		ls .git/objects/pack/*.pack >old-counts &&
-		test_line_count = 4 old-counts &&
-		git repack -a -d --keep-pack $P1 --keep-pack $P4 &&
-		ls .git/objects/pack/*.pack >new-counts &&
-		grep -q $P1 new-counts &&
-		grep -q $P4 new-counts &&
-		test_line_count = 3 new-counts &&
-		git fsck &&
+		cd bare.git &&
+		check_count A 2
+	)
 
-		P5=$(commit_and_pack --no-tag 5) &&
-		git reset --hard HEAD^ &&
-		git reflog expire --all --expire=all &&
-		rm -f ".git/objects/pack/${P5%.pack}.idx" &&
-		rm -f ".git/objects/info/commit-graph" &&
-		for from in $(find .git/objects/pack -type f -name "${P5%.pack}.*")
-		do
-			to="$(dirname "$from")/.tmp-1234-$(basename "$from")" &&
-			mv "$from" "$to" || return 1
-		done &&
+Cloning into bare repository 'bare.git'...
+done.
+git annotate  file 
+Author A (expected 2, attributed 2) good
+ok 7 - blame in a bare repo without starting commit
 
-		# A .idx file without a .pack should not stop us from
-		# repacking what we can.
-		touch .git/objects/pack/pack-does-not-exist.idx &&
+expecting success of 8001.8 'blame by tag objects': 
+	git tag -m "test tag" testTag &&
+	git tag -m "test tag #2" testTag2 testTag &&
+	check_count -h testTag A 2 &&
+	check_count -h testTag2 A 2
 
-		git repack --cruft -d --keep-pack $P1 --keep-pack $P4 &&
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f testTag2 testTag^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+git annotate  file testTag
+Author A (expected 2, attributed 2) good
+git annotate  file testTag2
+Author A (expected 2, attributed 2) good
+ok 8 - blame by tag objects
 
-		ls .git/objects/pack/*.pack >newer-counts &&
-		test_cmp new-counts newer-counts &&
-		git fsck
-	)
+expecting success of 8001.9 'setup B lines': 
+	echo "2A quick brown fox jumps over the" >>file &&
+	echo "lazy dog" >>file &&
+	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
+	git commit -a -m "Second."
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/keep-pack/.git/
-[master (root-commit) c034eb4] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 97f32c4] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master b19c9f9] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master a9c77cf] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 0964b20] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-HEAD is now at a9c77cf 4
-ok 13 - repack --keep-pack
+[main 7e31098] Second.
+ Author: B <B@test.git>
+ 1 file changed, 2 insertions(+)
+ok 9 - setup B lines
 
-expecting success of 7700.14 'repacking fails when missing .pack actually means missing objects': 
-	test_create_repo idx-without-pack &&
-	(
-		cd idx-without-pack &&
+expecting success of 8001.10 'blame 2 authors': 
+	check_count A 2 B 2
 
-		# Avoid producing different packs due to delta/base choices
-		git config pack.window 0 &&
-		P1=$(commit_and_pack 1) &&
-		P2=$(commit_and_pack 2) &&
-		P3=$(commit_and_pack 3) &&
-		P4=$(commit_and_pack 4) &&
-		ls .git/objects/pack/*.pack >old-counts &&
-		test_line_count = 4 old-counts &&
+git annotate  file 
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 10 - blame 2 authors
 
-		# Remove one .pack file
-		rm .git/objects/pack/$P2 &&
+expecting success of 8001.11 'blame with --contents and revision': 
+	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
 
-		ls .git/objects/pack/*.pack >before-pack-dir &&
+git annotate  --contents=file file testTag
+Author A (expected 2, attributed 2) good
+Author External file (--contents) (expected 2, attributed 2) good
+ok 11 - blame with --contents and revision
 
-		test_must_fail git fsck &&
-		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git repack --cruft -d 2>err &&
-		grep "bad object" err &&
+expecting success of 8001.12 'setup B1 lines (branch1)': 
+	git checkout -b branch1 main &&
+	echo "3A slow green fox jumps into the" >>file &&
+	echo "well." >>file &&
+	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
+	git commit -a -m "Branch1-1"
 
-		# Before failing, the repack did not modify the
-		# pack directory.
-		ls .git/objects/pack/*.pack >after-pack-dir &&
-		test_cmp before-pack-dir after-pack-dir
-	)
+Switched to a new branch 'branch1'
+[branch1 1b9b47a] Branch1-1
+ Author: B1 <B1@test.git>
+ 1 file changed, 2 insertions(+)
+ok 12 - setup B1 lines (branch1)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/idx-without-pack/.git/
-[master (root-commit) c034eb4] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 97f32c4] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master b19c9f9] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master a9c77cf] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-error: refs/tags/2: invalid sha1 pointer 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-broken link from  commit b19c9f990f8204f55aebfaadd643e918b14bd0de
-              to  commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-missing blob 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
-missing commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-fatal: bad object refs/tags/2
-ok 14 - repacking fails when missing .pack actually means missing objects
+expecting success of 8001.13 'blame 2 authors + 1 branch1 author': 
+	check_count A 2 B 2 B1 2
 
-expecting success of 7700.15 'bitmaps are created by default in bare repos': 
-	git clone --bare .git bare.git &&
-	rm -f bare.git/objects/pack/*.bitmap &&
-	git -C bare.git repack -ad &&
-	bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
-	test_path_is_file "$bitmap"
+git annotate  file 
+Author B1 (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 13 - blame 2 authors + 1 branch1 author
 
-Cloning into bare repository 'bare.git'...
-done.
-ok 15 - bitmaps are created by default in bare repos
+expecting success of 8001.14 'setup B2 lines (branch2)': 
+	git checkout -b branch2 main &&
+	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
+	git commit -a -m "Branch2-1"
 
-expecting success of 7700.16 'incremental repack does not complain': 
-	git -C bare.git repack -q 2>repack.err &&
-	test_must_be_empty repack.err
+Switched to a new branch 'branch2'
+[branch2 7d77deb] Branch2-1
+ Author: B2 <B2@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - setup B2 lines (branch2)
 
-ok 16 - incremental repack does not complain
+expecting success of 8001.15 'blame 2 authors + 1 branch2 author': 
+	check_count A 2 B 1 B2 1
 
-expecting success of 7700.17 'bitmaps can be disabled on bare repos': 
-	git -c repack.writeBitmaps=false -C bare.git repack -ad &&
-	bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
-	test -z "$bitmap"
+git annotate  file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+ok 15 - blame 2 authors + 1 branch2 author
 
-ls: cannot access 'bare.git/objects/pack/*.bitmap': No such file or directory
-ok 17 - bitmaps can be disabled on bare repos
+expecting success of 8001.16 'merge branch1 & branch2': 
+	git merge branch1
 
-expecting success of 7700.18 'no bitmaps created if .keep files present': 
-	pack=$(ls bare.git/objects/pack/*.pack) &&
-	test_path_is_file "$pack" &&
-	keep=${pack%.pack}.keep &&
-	test_when_finished "rm -f \"\$keep\"" &&
-	>"$keep" &&
-	git -C bare.git repack -ad 2>stderr &&
-	test_must_be_empty stderr &&
-	find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
-	test_must_be_empty actual
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 ++
+ 1 file changed, 2 insertions(+)
+ok 16 - merge branch1 & branch2
 
-Nothing new to pack.
-ok 18 - no bitmaps created if .keep files present
+expecting success of 8001.17 'blame 2 authors + 2 merged-in authors': 
+	check_count A 2 B 1 B1 2 B2 1
 
-expecting success of 7700.19 'auto-bitmaps do not complain if unavailable': 
-	test_config -C bare.git pack.packSizeLimit 1M &&
-	blob=$(test-tool genrandom big $((1024*1024)) |
-	       git -C bare.git hash-object -w --stdin) &&
-	git -C bare.git update-ref refs/tags/big $blob &&
-	git -C bare.git repack -ad 2>stderr &&
-	test_must_be_empty stderr &&
-	find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
-	test_must_be_empty actual
+git annotate  file 
+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 17 - blame 2 authors + 2 merged-in authors
 
-ok 19 - auto-bitmaps do not complain if unavailable
+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
 
-expecting success of 7700.20 'repacking with a filter works': 
-	git -C bare.git repack -a -d &&
-	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
-	git -C bare.git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
-	test_stdout_line_count = 2 ls bare.git/objects/pack/*.pack &&
-	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
-	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
-	test "$commit_pack" != "$blob_pack" &&
-	tree_pack=$(test-tool -C bare.git find-pack -c 1 HEAD^{tree}) &&
-	test "$tree_pack" = "$commit_pack" &&
-	blob_pack2=$(test-tool -C bare.git find-pack -c 1 HEAD:file2) &&
-	test "$blob_pack2" = "$blob_pack"
+git annotate  --first-parent file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author A U Thor (expected 2, attributed 2) good
+ok 18 - blame --first-parent blames merge for branch1
 
-ok 20 - repacking with a filter works
+expecting success of 8001.19 'blame ancestor': 
+	check_count -h main A 2 B 2
 
-expecting success of 7700.21 '--filter fails with --write-bitmap-index': 
-	test_must_fail git -C bare.git repack -a -d --write-bitmap-index --filter=blob:none
+git annotate  file main
+Author B (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+ok 19 - blame ancestor
 
-warning: Failed to write bitmap index. Packfile doesn't have full closure (object ac3e272b72bbf89def8657766b855d0656630ed4 is missing)
-fatal: failed to write bitmap index
-ok 21 - --filter fails with --write-bitmap-index
+expecting success of 8001.20 'blame great-ancestor': 
+	check_count -h main^ A 2
 
-expecting success of 7700.22 'repacking with two filters works': 
-	git init two-filters &&
-	(
-		cd two-filters &&
-		mkdir subdir &&
-		test_commit foo &&
-		test_commit subdir_bar subdir/bar &&
-		test_commit subdir_baz subdir/baz
-	) &&
-	git clone --no-local --bare two-filters two-filters.git &&
-	(
-		cd two-filters.git &&
-		test_stdout_line_count = 1 ls objects/pack/*.pack &&
-		git -c repack.writebitmaps=false repack -a -d \
-			--filter=blob:none --filter=tree:1 &&
-		test_stdout_line_count = 2 ls objects/pack/*.pack &&
-		commit_pack=$(test-tool find-pack -c 1 HEAD) &&
-		blob_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		root_tree_pack=$(test-tool find-pack -c 1 HEAD^{tree}) &&
-		subdir_tree_hash=$(git ls-tree --object-only HEAD -- subdir) &&
-		subdir_tree_pack=$(test-tool find-pack -c 1 "$subdir_tree_hash") &&
+git annotate  file main^
+Author A (expected 2, attributed 2) good
+ok 20 - blame great-ancestor
 
-		# Root tree and subdir tree are not in the same packfiles
-		test "$commit_pack" != "$blob_pack" &&
-		test "$commit_pack" = "$root_tree_pack" &&
-		test "$blob_pack" = "$subdir_tree_pack"
-	)
+expecting success of 8001.21 'setup evil merge': 
+	echo "evil merge." >>file &&
+	git commit -a --amend
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/two-filters/.git/
-[master (root-commit) 898d072] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 4eb4067] subdir_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/bar
-[master 0e7eef3] subdir_baz
+[branch2 c413b3e] Merge branch 'branch1' into branch2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/baz
-Cloning into bare repository 'two-filters.git'...
-ok 22 - repacking with two filters works
-
-expecting success of 7700.23 '--filter works with .keep packs': 
-	prepare_for_keep_packs &&
-	(
-		cd keep-packs.git &&
-
-		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
-		head_pack=$(test-tool find-pack -c 1 HEAD) &&
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ok 21 - setup evil merge
 
-		test "$foo_pack" != "$bar_pack" &&
-		test "$foo_pack" = "$head_pack" &&
+expecting success of 8001.22 'blame evil merge': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
-		git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
+git annotate  file 
+Author B1 (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 22 - blame evil merge
 
-		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		bar_pack_1=$(test-tool find-pack -c 1 HEAD:bar.t) &&
-		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
+expecting success of 8001.23 'blame huge graft': 
+	test_when_finished "git checkout branch2" &&
+	test_when_finished "rm -rf .git/info" &&
+	graft= &&
+	for i in 0 1 2
+	do
+		for j in 0 1 2 3 4 5 6 7 8 9
+		do
+			git checkout --orphan "$i$j" &&
+			printf "%s\n" "$i" "$j" >file &&
+			test_tick &&
+			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
+			git commit -a -m "$i$j" &&
+			commit=$(git rev-parse --verify HEAD) &&
+			graft="$graft$commit " || return 1
+		done
+	done &&
+	mkdir .git/info &&
+	printf "%s " $graft >.git/info/grafts &&
+	check_count -h 00 01 1 10 1
 
-		# Object bar is still only in the old .keep pack
-		test "$foo_pack_1" != "$foo_pack" &&
-		test "$bar_pack_1" = "$bar_pack" &&
-		test "$head_pack_1" != "$head_pack" &&
+Switched to a new branch '00'
+[00 (root-commit) e2c6177] 00
+ Author: 00 <00@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '01'
+[01 (root-commit) 0dbe04b] 01
+ Author: 01 <01@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '02'
+[02 (root-commit) 97fbca6] 02
+ Author: 02 <02@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '03'
+[03 (root-commit) 5cdbcd8] 03
+ Author: 03 <03@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '04'
+[04 (root-commit) 5a154cf] 04
+ Author: 04 <04@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '05'
+[05 (root-commit) a84e1de] 05
+ Author: 05 <05@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '06'
+[06 (root-commit) d4bea54] 06
+ Author: 06 <06@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '07'
+[07 (root-commit) 24ba6e8] 07
+ Author: 07 <07@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '08'
+[08 (root-commit) fe90088] 08
+ Author: 08 <08@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '09'
+[09 (root-commit) 773a2fb] 09
+ Author: 09 <09@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '10'
+[10 (root-commit) 80536e5] 10
+ Author: 10 <10@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '11'
+[11 (root-commit) 33c07c1] 11
+ Author: 11 <11@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '12'
+[12 (root-commit) ae7094b] 12
+ Author: 12 <12@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '13'
+[13 (root-commit) 19e767d] 13
+ Author: 13 <13@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '14'
+[14 (root-commit) f7159ac] 14
+ Author: 14 <14@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '15'
+[15 (root-commit) d95fecf] 15
+ Author: 15 <15@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '16'
+[16 (root-commit) d8bfdb9] 16
+ Author: 16 <16@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '17'
+[17 (root-commit) aa3f31e] 17
+ Author: 17 <17@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '18'
+[18 (root-commit) d76cb1d] 18
+ Author: 18 <18@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '19'
+[19 (root-commit) 95e03c5] 19
+ Author: 19 <19@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '20'
+[20 (root-commit) d40a964] 20
+ Author: 20 <20@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '21'
+[21 (root-commit) 6c3def2] 21
+ Author: 21 <21@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '22'
+[22 (root-commit) 78d2294] 22
+ Author: 22 <22@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '23'
+[23 (root-commit) 76a64d0] 23
+ Author: 23 <23@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '24'
+[24 (root-commit) 59f234a] 24
+ Author: 24 <24@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '25'
+[25 (root-commit) 26ac47a] 25
+ Author: 25 <25@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '26'
+[26 (root-commit) db7e855] 26
+ Author: 26 <26@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '27'
+[27 (root-commit) 279f565] 27
+ Author: 27 <27@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '28'
+[28 (root-commit) f691d9c] 28
+ Author: 28 <28@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '29'
+[29 (root-commit) c72134e] 29
+ Author: 29 <29@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+git annotate  file 00
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
+Switched to branch 'branch2'
+ok 23 - blame huge graft
 
-		test "$foo_pack_1" != "$bar_pack_1" &&
-		test "$foo_pack_1" != "$head_pack_1" &&
-		test "$bar_pack_1" != "$head_pack_1"
-	)
+expecting success of 8001.24 'setup incomplete line': 
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
+	git commit -a -m "Incomplete"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/keep-packs/.git/
-[master (root-commit) 898d072] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 6cdf4f6] bar
- Author: A U Thor <author@example.com>
+[branch2 565fef5] Incomplete
+ Author: C <C@test.git>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-Cloning into bare repository 'keep-packs.git'...
-ab13c7a16ee24dc55b0123c11524c0f93444a00b
-ok 23 - --filter works with .keep packs
+ok 24 - setup incomplete line
 
-expecting success of 7700.24 '--filter works with --pack-kept-objects and .keep packs': 
-	rm -rf keep-packs keep-packs.git &&
-	prepare_for_keep_packs &&
-	(
-		cd keep-packs.git &&
+expecting success of 8001.25 'blame incomplete line': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
 
-		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
-		head_pack=$(test-tool find-pack -c 1 HEAD) &&
+git annotate  file 
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 25 - blame incomplete line
 
-		test "$foo_pack" != "$bar_pack" &&
-		test "$foo_pack" = "$head_pack" &&
+expecting success of 8001.26 'setup edits': 
+	mv file file.orig &&
+	{
+		cat file.orig &&
+		echo
+	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
+	git commit -a -m "edit"
 
-		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
-			--pack-kept-objects &&
+[branch2 96588b8] edit
+ Author: D <D@test.git>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 26 - setup edits
 
-		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		test-tool find-pack -c 2 HEAD:bar.t >bar_pack_1 &&
-		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
+expecting success of 8001.27 'blame edits': 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
 
-		test "$foo_pack_1" != "$foo_pack" &&
-		test "$foo_pack_1" != "$bar_pack" &&
-		test "$head_pack_1" != "$head_pack" &&
+git annotate  file 
+Author B2 (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
+ok 27 - blame edits
 
-		# Object bar is in both the old .keep pack and the new
-		# pack that contained the filtered out objects
-		grep "$bar_pack" bar_pack_1 &&
-		grep "$foo_pack_1" bar_pack_1 &&
-		test "$foo_pack_1" != "$head_pack_1"
-	)
+expecting success of 8001.28 'setup obfuscated email': 
+	echo "No robots allowed" >file.new &&
+	cat file >>file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
+	git commit -a -m "norobots"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/keep-packs/.git/
-[master (root-commit) 898d072] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 6cdf4f6] bar
- Author: A U Thor <author@example.com>
+[branch2 04f7693] norobots
+ Author: E <E at test dot git>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-Cloning into bare repository 'keep-packs.git'...
-ab13c7a16ee24dc55b0123c11524c0f93444a00b
-./objects/pack/pack-34a84b0f4b3b87454ca39e0a5c6995cbcd831e78.pack
-./objects/pack/pack-363177a6806037aa6bdc933b4c6cd4df16c8340f.pack
-ok 24 - --filter works with --pack-kept-objects and .keep packs
-
-expecting success of 7700.25 '--filter-to stores filtered out objects': 
-	git -C bare.git repack -a -d &&
-	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
-
-	git init --bare filtered.git &&
-	git -C bare.git -c repack.writebitmaps=false repack -a -d \
-		--filter=blob:none \
-		--filter-to=../filtered.git/objects/pack/pack &&
-	test_stdout_line_count = 1 ls bare.git/objects/pack/pack-*.pack &&
-	test_stdout_line_count = 1 ls filtered.git/objects/pack/pack-*.pack &&
-
-	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
-	blob_pack=$(test-tool -C bare.git find-pack -c 0 HEAD:file1) &&
-	blob_hash=$(git -C bare.git rev-parse HEAD:file1) &&
-	test -n "$blob_hash" &&
-	blob_pack=$(test-tool -C filtered.git find-pack -c 1 $blob_hash) &&
-
-	echo $(pwd)/filtered.git/objects >bare.git/objects/info/alternates &&
-	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
-	blob_content=$(git -C bare.git show $blob_hash) &&
-	test "$blob_content" = "content1"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/filtered.git/
-ok 25 - --filter-to stores filtered out objects
+ok 28 - setup obfuscated email
 
-expecting success of 7700.26 '--filter works with --max-pack-size': 
-	rm -rf filtered.git &&
-	git init --bare filtered.git &&
-	git init max-pack-size &&
-	(
-		cd max-pack-size &&
-		test_commit base &&
-		# two blobs which exceed the maximum pack size
-		test-tool genrandom foo 1048576 >foo &&
-		git hash-object -w foo &&
-		test-tool genrandom bar 1048576 >bar &&
-		git hash-object -w bar &&
-		git add foo bar &&
-		git commit -m "adding foo and bar"
-	) &&
-	git clone --no-local --bare max-pack-size max-pack-size.git &&
-	(
-		cd max-pack-size.git &&
-		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
-			--max-pack-size=1M \
-			--filter-to=../filtered.git/objects/pack/pack &&
-		echo $(cd .. && pwd)/filtered.git/objects >objects/info/alternates &&
+expecting success of 8001.29 'blame obfuscated email': 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
-		# Check that the 3 blobs are in different packfiles in filtered.git
-		test_stdout_line_count = 3 ls ../filtered.git/objects/pack/pack-*.pack &&
-		test_stdout_line_count = 1 ls objects/pack/pack-*.pack &&
-		foo_pack=$(test-tool find-pack -c 1 HEAD:foo) &&
-		bar_pack=$(test-tool find-pack -c 1 HEAD:bar) &&
-		base_pack=$(test-tool find-pack -c 1 HEAD:base.t) &&
-		test "$foo_pack" != "$bar_pack" &&
-		test "$foo_pack" != "$base_pack" &&
-		test "$bar_pack" != "$base_pack" &&
-		for pack in "$foo_pack" "$bar_pack" "$base_pack"
-		do
-			case "$foo_pack" in */filtered.git/objects/pack/*) true ;; *) return 1 ;; esac
-		done
-	)
+git annotate  file 
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 29 - blame obfuscated email
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/filtered.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/max-pack-size/.git/
-[master (root-commit) bf71f7c] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c
-[master 8791424] adding foo and bar
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
- create mode 100644 foo
-Cloning into bare repository 'max-pack-size.git'...
-ok 26 - --filter works with --max-pack-size
+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
 
-expecting success of 7700.27 'setup for --write-midx tests': 
-	git init midx &&
-	(
-		cd midx &&
-		git config core.multiPackIndex true &&
+git annotate  -L1 file 
+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 D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 30 - blame -L 1 (all)
 
-		test_commit base
-	)
+expecting success of 8001.31 'blame -L , (all)': 
+	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/midx/.git/
-[master (root-commit) bf71f7c] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 27 - setup for --write-midx tests
+git annotate  -L, file 
+Author B (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 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
+ok 31 - blame -L , (all)
 
-expecting success of 7700.28 '--write-midx unchanged': 
-	(
-		cd midx &&
-		git repack &&
-		test_path_is_missing $midx &&
-		test_path_is_missing $midx-*.bitmap &&
+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 repack --write-midx &&
+git annotate  -L5 file 
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 32 - blame -L X (X to end)
 
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-*.bitmap &&
-		test_midx_consistent $objdir
-	)
+expecting success of 8001.33 'blame -L X, (X to end)': 
+	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
 
-Nothing new to pack.
-ok 28 - --write-midx unchanged
+git annotate  -L5, file 
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 33 - blame -L X, (X to end)
 
-expecting success of 7700.29 '--write-midx with a new pack': 
-	(
-		cd midx &&
-		test_commit loose &&
+expecting success of 8001.34 'blame -L ,Y (up to Y)': 
+	check_count -L,3 A 1 B2 1 E 1
 
-		git repack --write-midx &&
+git annotate  -L,3 file 
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 34 - blame -L ,Y (up to Y)
 
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-*.bitmap &&
-		test_midx_consistent $objdir
-	)
+expecting success of 8001.35 'blame -L X,X': 
+	check_count -L3,3 B2 1
 
-[master add4380] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 29 - --write-midx with a new pack
+git annotate  -L3,3 file 
+Author B2 (expected 1, attributed 1) good
+ok 35 - blame -L X,X
 
-expecting success of 7700.30 '--write-midx with -b': 
-	(
-		cd midx &&
-		git repack -mb &&
+expecting success of 8001.36 'blame -L X,Y': 
+	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
-		test_path_is_file $midx &&
-		test_path_is_file $midx-*.bitmap &&
-		test_midx_consistent $objdir
-	)
+git annotate  -L3,6 file 
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 36 - blame -L X,Y
 
-Nothing new to pack.
-ok 30 - --write-midx with -b
+expecting success of 8001.37 'blame -L Y,X (undocumented)': 
+	check_count -L6,3 B 1 B1 1 B2 1 D 1
 
-expecting success of 7700.31 '--write-midx with -d': 
-	(
-		cd midx &&
-		test_commit repack &&
+git annotate  -L6,3 file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 37 - blame -L Y,X (undocumented)
 
-		git repack -Ad --write-midx &&
+expecting success of 8001.38 'blame -L -X': 
+	test_must_fail $PROG -L-1 file
 
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-*.bitmap &&
-		test_midx_consistent $objdir
-	)
+fatal: -L invalid line number: -1
+ok 38 - blame -L -X
 
-[master c5a8e1e] repack
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack.t
-ok 31 - --write-midx with -d
+expecting success of 8001.39 'blame -L 0': 
+	test_must_fail $PROG -L0 file
 
-expecting success of 7700.32 'cleans up MIDX when appropriate': 
-	(
-		cd midx &&
+fatal: -L invalid line number: 0
+ok 39 - blame -L 0
 
-		test_commit repack-2 &&
-		git repack -Adb --write-midx &&
+expecting success of 8001.40 'blame -L ,0': 
+	test_must_fail $PROG -L,0 file
 
-		checksum=$(midx_checksum $objdir) &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$checksum.bitmap &&
+fatal: -L invalid line number: 0
+ok 40 - blame -L ,0
 
-		test_commit repack-3 &&
-		git repack -Adb --write-midx &&
+expecting success of 8001.41 'blame -L ,+0': 
+	test_must_fail $PROG -L,+0 file
 
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-$checksum.bitmap &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+fatal: -L invalid empty range
+ok 41 - blame -L ,+0
 
-		test_commit repack-4 &&
-		git repack -Adb &&
+expecting success of 8001.42 'blame -L X,+0': 
+	test_must_fail $PROG -L1,+0 file
 
-		find $objdir/pack -type f -name "multi-pack-index*" >files &&
-		test_must_be_empty files
-	)
+fatal: -L invalid empty range
+ok 42 - blame -L X,+0
 
-[master 10c6ab2] repack-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack-2.t
-[master 789d6b0] repack-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack-3.t
-[master 97148f2] repack-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack-4.t
-ok 32 - cleans up MIDX when appropriate
+expecting success of 8001.43 'blame -L X,+1': 
+	check_count -L3,+1 B2 1
 
-expecting success of 7700.33 '--write-midx with preferred bitmap tips': 
-	git init midx-preferred-tips &&
-	test_when_finished "rm -fr midx-preferred-tips" &&
-	(
-		cd midx-preferred-tips &&
+git annotate  -L3,+1 file 
+Author B2 (expected 1, attributed 1) good
+ok 43 - blame -L X,+1
 
-		test_commit_bulk --message="%s" 103 &&
+expecting success of 8001.44 'blame -L X,+N': 
+	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
-		git log --format="%H" >commits.raw &&
-		sort <commits.raw >commits &&
+git annotate  -L3,+4 file 
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 44 - blame -L X,+N
 
-		git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
-		git update-ref --stdin <refs &&
+expecting success of 8001.45 'blame -L ,-0': 
+	test_must_fail $PROG -L,-0 file
 
-		git repack --write-midx --write-bitmap-index &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+fatal: -L invalid empty range
+ok 45 - blame -L ,-0
 
-		test-tool bitmap list-commits | sort >bitmaps &&
-		comm -13 bitmaps commits >before &&
-		test_line_count = 1 before &&
+expecting success of 8001.46 'blame -L X,-0': 
+	test_must_fail $PROG -L1,-0 file
 
-		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-		rm -fr $midx &&
+fatal: -L invalid empty range
+ok 46 - blame -L X,-0
 
-		# instead of constructing the snapshot ourselves (c.f., the test
-		# "write a bitmap with --refs-snapshot (preferred tips)" in
-		# t5326), mark the missing commit as preferred by adding it to
-		# the pack.preferBitmapTips configuration.
-		git for-each-ref --format="%(refname:rstrip=1)" \
-			--points-at="$(cat before)" >missing &&
-		git config pack.preferBitmapTips "$(cat missing)" &&
-		git repack --write-midx --write-bitmap-index &&
+expecting success of 8001.47 'blame -L X,-1': 
+	check_count -L3,-1 B2 1
 
-		test-tool bitmap list-commits | sort >bitmaps &&
-		comm -13 bitmaps commits >after &&
+git annotate  -L3,-1 file 
+Author B2 (expected 1, attributed 1) good
+ok 47 - blame -L X,-1
 
-		! test_cmp before after
-	)
+expecting success of 8001.48 'blame -L X,-N': 
+	check_count -L6,-4 B 1 B1 1 B2 1 D 1
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/midx-preferred-tips/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          309 (         0 duplicates                  )
-      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
-      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:            103
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26909 /      26909
----------------------------------------------------------------------
+git annotate  -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
+ok 48 - blame -L X,-N
 
-Nothing new to pack.
-Nothing new to pack.
---- before	2025-02-09 06:55:21.098203650 +0000
-+++ after	2025-02-09 06:55:21.138203904 +0000
-@@ -1 +1 @@
--8cd3b9bb7db0d633144114a81b7374e6a2b1b22c
-+3d2725684b43b31e3b81e5070d1847c9f1e2cf00
-ok 33 - --write-midx with preferred bitmap tips
+expecting success of 8001.49 'blame -L /RE/ (RE to end)': 
+	check_count -L/evil/ C 1 "A U Thor" 1
 
-expecting success of 7700.34 '--write-midx -b packs non-kept objects': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+git annotate  -L/evil/ file 
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 49 - blame -L /RE/ (RE to end)
 
-		# Create a kept pack-file
-		test_commit base &&
-		git repack -ad &&
-		find $objdir/pack -name "*.idx" >before &&
-		test_line_count = 1 before &&
-		before_name=$(cat before) &&
-		>${before_name%.idx}.keep &&
+expecting success of 8001.50 'blame -L /RE/,/RE2/': 
+	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
 
-		# Create a non-kept pack-file
-		test_commit other &&
-		git repack &&
+git annotate  -L/robot/,/green/ file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 50 - blame -L /RE/,/RE2/
 
-		# Create loose objects
-		test_commit loose &&
+expecting success of 8001.51 'blame -L X,/RE/': 
+	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
 
-		# Repack everything
-		git repack --write-midx -a -b -d &&
+git annotate  -L5,/evil/ file 
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 51 - blame -L X,/RE/
 
-		# There should be two pack-files now, the
-		# old, kept pack and the new, non-kept pack.
-		find $objdir/pack -name "*.idx" | sort >after &&
-		test_line_count = 2 after &&
-		find $objdir/pack -name "*.keep" >kept &&
-		kept_name=$(cat kept) &&
-		echo ${kept_name%.keep}.idx >kept-idx &&
-		test_cmp before kept-idx &&
+expecting success of 8001.52 'blame -L /RE/,Y': 
+	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
 
-		# Get object list from the kept pack.
-		get_sorted_objects_from_pack before >old.objects &&
+git annotate  -L/99/,7 file 
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 52 - blame -L /RE/,Y
 
-		# Get object list from the one non-kept pack-file
-		comm -13 before after >new-pack &&
-		test_line_count = 1 new-pack &&
-		get_sorted_objects_from_pack new-pack >new.objects &&
+expecting success of 8001.53 'blame -L /RE/,+N': 
+	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
 
-		# None of the objects in the new pack should
-		# exist within the kept pack.
-		comm -12 old.objects new.objects >shared.objects &&
-		test_must_be_empty shared.objects
-	)
+git annotate  -L/99/,+3 file 
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 53 - blame -L /RE/,+N
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) bf71f7c] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 29fd16f] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-[master abf480b] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 34 - --write-midx -b packs non-kept objects
+expecting success of 8001.54 'blame -L /RE/,-N': 
+	check_count -L/99/,-3 B 1 B2 1 D 1
 
-expecting success of 7700.35 '--write-midx removes stale pack-based bitmaps': 
-	rm -fr repo &&
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-		test_commit base &&
-		git repack -Ab &&
+git annotate  -L/99/,-3 file 
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 54 - blame -L /RE/,-N
 
-		pack_bitmap=$(ls $objdir/pack/pack-*.bitmap) &&
-		test_path_is_file "$pack_bitmap" &&
+expecting success of 8001.55 'blame -L X (X == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n C 1
 
-		test_commit tip &&
-		git repack -bm &&
+git annotate  -L8 file 
+Author C (expected 1, attributed 1) good
+ok 55 - blame -L X (X == nlines)
 
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
-		test_path_is_missing $pack_bitmap
-	)
+expecting success of 8001.56 'blame -L X (X == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	test_must_fail $PROG -L$n file
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) bf71f7c] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 80dd058] tip
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tip.t
-ok 35 - --write-midx removes stale pack-based bitmaps
+fatal: file file has only 8 lines
+ok 56 - blame -L X (X == nlines + 1)
 
-expecting success of 7700.36 '--write-midx with --pack-kept-objects': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+expecting success of 8001.57 'blame -L X (X > nlines)': 
+	test_must_fail $PROG -L12345 file
 
-		test_commit one &&
-		test_commit two &&
+fatal: file file has only 8 lines
+ok 57 - blame -L X (X > nlines)
 
-		one="$(echo "one" | git pack-objects --revs $objdir/pack/pack)" &&
-		two="$(echo "one..two" | git pack-objects --revs $objdir/pack/pack)" &&
+expecting success of 8001.58 'blame -L ,Y (Y == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
-		keep="$objdir/pack/pack-$one.keep" &&
-		touch "$keep" &&
+git annotate  -L,8 file 
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 58 - blame -L ,Y (Y == nlines)
 
-		git repack --write-midx --write-bitmap-index --geometric=2 -d \
-			--pack-kept-objects &&
+expecting success of 8001.59 'blame -L ,Y (Y == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
-		test_path_is_file $keep &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	)
+git annotate  -L,9 file 
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 59 - blame -L ,Y (Y == nlines + 1)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) 06e07da] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 738d2f7] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 36 - --write-midx with --pack-kept-objects
+expecting success of 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
 
-checking prerequisite: TTY
+git annotate  -L,12345 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 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 E (expected 1, attributed 1) good
+ok 60 - blame -L ,Y (Y > nlines)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+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
 
-	# 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 annotate  -L2,3 -L6,7 file 
+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 61 - blame -L multiple (disjoint)
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+expecting success of 8001.62 'blame -L multiple (disjoint: unordered)': 
+	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
 
-)
-prerequisite TTY ok
-expecting success of 7700.37 '--quiet disables progress': 
-	test_terminal env GIT_PROGRESS_DELAY=0 \
-		git -C midx repack -ad --quiet --write-midx 2>stderr &&
-	test_must_be_empty stderr
+git annotate  -L6,7 -L2,3 file 
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 62 - blame -L multiple (disjoint: unordered)
 
-ok 37 - --quiet disables progress
+expecting success of 8001.63 'blame -L multiple (adjacent)': 
+	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
 
-expecting success of 7700.38 'clean up .tmp-* packs on error': 
-	test_must_fail ok=sigpipe git \
-		-c repack.cruftwindow=bogus \
-		repack -ad --cruft &&
-	find $objdir/pack -name .tmp-* >tmpfiles &&
-	test_must_be_empty tmpfiles
+git annotate  -L2,3 -L4,5 file 
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 63 - blame -L multiple (adjacent)
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-error: option `window' expects a numerical value
-ok 38 - clean up .tmp-* packs on error
+expecting success of 8001.64 'blame -L multiple (adjacent: unordered)': 
+	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
-expecting success of 7700.39 'repack -ad cleans up old .tmp-* packs': 
-	git rev-parse HEAD >input &&
-	git pack-objects $objdir/pack/.tmp-1234 <input &&
-	git repack -ad &&
-	find $objdir/pack -name .tmp-* >tmpfiles &&
-	test_must_be_empty tmpfiles
+git annotate  -L4,5 -L2,3 file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 64 - blame -L multiple (adjacent: unordered)
 
-e3eb4c912613cba004926473486638766e8cc44e
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 39 - repack -ad cleans up old .tmp-* packs
+expecting success of 8001.65 'blame -L multiple (overlapping)': 
+	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
 
-expecting success of 7700.40 'setup for update-server-info': 
-	git init update-server-info &&
-	test_commit -C update-server-info message
+git annotate  -L2,4 -L3,5 file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 65 - blame -L multiple (overlapping)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7700-repack/update-server-info/.git/
-[master (root-commit) c5363f9] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 message.t
-ok 40 - setup for update-server-info
+expecting success of 8001.66 'blame -L multiple (overlapping: unordered)': 
+	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
 
-expecting success of 7700.41 'updates server info by default': 
-	test_server_info_cleanup &&
-	git -C update-server-info repack &&
-	test_server_info_present
+git annotate  -L3,5 -L2,4 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 66 - blame -L multiple (overlapping: unordered)
 
-ok 41 - updates server info by default
+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
 
-expecting success of 7700.42 '-n skips updating server info': 
-	test_server_info_cleanup &&
-	git -C update-server-info repack -n &&
-	test_server_info_missing
+git annotate  -L2,8 -L3,5 file 
+Author A U Thor (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 C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 67 - blame -L multiple (superset/subset)
 
-Nothing new to pack.
-ok 42 - -n skips updating server info
+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
 
-expecting success of 7700.43 'repack.updateServerInfo=true updates server info': 
-	test_server_info_cleanup &&
-	git -C update-server-info -c repack.updateServerInfo=true repack &&
-	test_server_info_present
+git annotate  -L3,5 -L2,8 file 
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 68 - blame -L multiple (superset/subset: unordered)
 
-Nothing new to pack.
-ok 43 - repack.updateServerInfo=true updates server info
+expecting success of 8001.69 'blame -L /RE/ (relative)': 
+	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
-expecting success of 7700.44 'repack.updateServerInfo=false skips updating server info': 
-	test_server_info_cleanup &&
-	git -C update-server-info -c repack.updateServerInfo=false repack &&
-	test_server_info_missing
+git annotate  -L3,3 -L/fox/ file 
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 69 - blame -L /RE/ (relative)
 
-Nothing new to pack.
-ok 44 - repack.updateServerInfo=false skips updating server info
+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
 
-expecting success of 7700.45 '-n overrides repack.updateServerInfo=true': 
-	test_server_info_cleanup &&
-	git -C update-server-info -c repack.updateServerInfo=true repack -n &&
-	test_server_info_missing
+git annotate  -L/dog/ 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 B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 70 - blame -L /RE/ (relative: no preceding range)
 
-Nothing new to pack.
-ok 45 - -n overrides repack.updateServerInfo=true
+expecting success of 8001.71 'blame -L /RE/ (relative: adjacent)': 
+	check_count -L1,1 -L/dog/,+1 A 1 E 1
 
-# passed all 45 test(s)
-1..45
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7817-grep-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7817-grep-sparse-checkout/.git/
-expecting success of 7817.1 'setup': 
-	echo "text" >a &&
-	echo "text" >b &&
-	mkdir dir &&
-	echo "text" >dir/c &&
+git annotate  -L1,1 -L/dog/,+1 file 
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 71 - blame -L /RE/ (relative: adjacent)
 
-	git init sub &&
-	(
-		cd sub &&
-		mkdir A B &&
-		echo "text" >A/a &&
-		echo "text" >B/b &&
-		git add A B &&
-		git commit -m sub &&
-		git sparse-checkout init --cone &&
-		git sparse-checkout set B
-	) &&
+expecting success of 8001.72 'blame -L /RE/ (relative: not found)': 
+	test_must_fail $PROG -L4,4 -L/dog/ file
 
-	git init sub2 &&
-	(
-		cd sub2 &&
-		echo "text" >a &&
-		git add a &&
-		git commit -m sub2
-	) &&
+fatal: -L parameter 'dog' starting at line 5: No match
+ok 72 - blame -L /RE/ (relative: not found)
 
-	git submodule add ./sub &&
-	git submodule add ./sub2 &&
-	git add a b dir &&
-	git commit -m super &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set "/*" "!b" "!/*/" "sub" &&
+expecting success of 8001.73 'blame -L /RE/ (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L/$/ file
 
-	git tag -am tag-to-commit tag-to-commit HEAD &&
-	tree=$(git rev-parse HEAD^{tree}) &&
-	git tag -am tag-to-tree tag-to-tree $tree &&
+fatal: file file has only 8 lines
+ok 73 - blame -L /RE/ (relative: end-of-file)
 
-	test_path_is_missing b &&
-	test_path_is_missing dir &&
-	test_path_is_missing sub/A &&
-	test_path_is_file a &&
-	test_path_is_file sub/B/b &&
-	test_path_is_file sub2/a &&
-	git branch -m main
+expecting success of 8001.74 'blame -L ^/RE/ (absolute)': 
+	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7817-grep-sparse-checkout/sub/.git/
-[master (root-commit) e98dfe7] sub
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 A/a
- create mode 100644 B/b
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7817-grep-sparse-checkout/sub2/.git/
-[master (root-commit) 4767315] sub2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Adding existing repo at 'sub' to the index
-Adding existing repo at 'sub2' to the index
-[master (root-commit) 26900e7] super
- Author: A U Thor <author@example.com>
- 6 files changed, 11 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 a
- create mode 100644 b
- create mode 100644 dir/c
- create mode 160000 sub
- create mode 160000 sub2
-warning: unable to rmdir 'sub': Directory not empty
-warning: unable to rmdir 'sub2': Directory not empty
-warning: pass a leading slash before paths such as 'sub' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-warning: unable to rmdir 'sub2': Directory not empty
-ok 1 - setup
+git annotate  -L3,3 -L^/dog/,+2 file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 74 - blame -L ^/RE/ (absolute)
 
-expecting success of 7817.2 'working tree grep honors sparse checkout': 
-	cat >expect <<-EOF &&
-	a:text
-	b:new-text
-	EOF
-	test_when_finished "rm -f b" &&
-	echo "new-text" >b &&
-	git grep "text" >actual &&
-	test_cmp expect actual
+expecting success of 8001.75 'blame -L ^/RE/ (absolute: no preceding range)': 
+	check_count -L^/dog/,+2 A 1 B2 1
 
-ok 2 - working tree grep honors sparse checkout
+git annotate  -L^/dog/,+2 file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 75 - blame -L ^/RE/ (absolute: no preceding range)
 
-expecting success of 7817.3 'grep searches unmerged file despite not matching sparsity patterns': 
-	cat >expect <<-EOF &&
-	b:modified-b-in-branchX
-	b:modified-b-in-branchY
-	EOF
-	test_when_finished "test_might_fail git merge --abort && \
-			    git checkout main && git sparse-checkout init" &&
+expecting success of 8001.76 'blame -L ^/RE/ (absolute: not found)': 
+	test_must_fail $PROG -L4,4 -L^/tambourine/ file
 
-	git sparse-checkout disable &&
-	git checkout -b branchY main &&
-	test_commit modified-b-in-branchY b &&
-	git checkout -b branchX main &&
-	test_commit modified-b-in-branchX b &&
+fatal: -L parameter 'tambourine' starting at line 1: No match
+ok 76 - blame -L ^/RE/ (absolute: not found)
 
-	git sparse-checkout init &&
-	test_path_is_missing b &&
-	test_must_fail git merge branchY &&
-	git grep "modified-b" >actual &&
-	test_cmp expect actual
+expecting success of 8001.77 'blame -L ^/RE/ (absolute: end-of-file)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
 
-Switched to a new branch 'branchY'
-[branchY 69623d1] modified-b-in-branchY
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branchX'
-[branchX 2555150] modified-b-in-branchX
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Automatic merge failed; fix conflicts and then commit the result.
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-Switched to branch 'main'
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 3 - grep searches unmerged file despite not matching sparsity patterns
+git annotate  -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
+ok 77 - blame -L ^/RE/ (absolute: end-of-file)
 
-expecting success of 7817.4 'grep --cached searches entries with the SKIP_WORKTREE bit': 
-	cat >expect <<-EOF &&
-	a:text
-	b:text
-	dir/c:text
+expecting success of 8001.78 'setup -L :regex': 
+	tr Q "\\t" >hello.c <<-\EOF &&
+	int main(int argc, const char *argv[])
+	{
+	Qputs("hello");
+	}
 	EOF
-	git grep --cached "text" >actual &&
-	test_cmp expect actual
+	git add hello.c &&
+	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
+	git commit -m "hello" &&
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 4 - grep --cached searches entries with the SKIP_WORKTREE bit
+	mv hello.c hello.orig &&
+	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
+	tr Q "\\t" >hello.c &&
+	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
+	git commit -a -m "goodbye" &&
 
-expecting success of 7817.5 'grep --recurse-submodules honors sparse checkout in submodule': 
-	cat >expect <<-EOF &&
-	a:text
-	sub/B/b:text
-	sub2/a:text
+	mv hello.c hello.orig &&
+	echo "#include <stdio.h>" >hello.c &&
+	cat hello.orig >>hello.c &&
+	tr Q "\\t" >>hello.c <<-\EOF &&
+	void mail()
+	{
+	Qputs("mail");
+	}
 	EOF
-	git update-index --skip-worktree sub2 &&
-	git grep --recurse-submodules "text" >actual &&
-	test_cmp expect actual
+	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
+	git commit -a -m "mail"
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 5 - grep --recurse-submodules honors sparse checkout in submodule
+[branch2 f82005e] hello
+ Author: F <F@test.git>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 hello.c
+[branch2 edbab84] goodbye
+ Author: G <G@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 846166b] mail
+ Author: H <H@test.git>
+ 1 file changed, 5 insertions(+)
+ok 78 - setup -L :regex
 
-expecting success of 7817.6 'grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit': 
-	cat >expect <<-EOF &&
-	a:text
-	b:text
-	dir/c:text
-	sub/A/a:text
-	sub/B/b:text
-	sub2/a:text
-	EOF
-	git grep --recurse-submodules --cached "text" >actual &&
-	test_cmp expect actual
+expecting success of 8001.79 'blame -L :literal': 
+	check_count -f hello.c -L:main F 4 G 1
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 6 - grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit
+git annotate  -L:main hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 79 - blame -L :literal
 
-expecting success of 7817.7 'working tree grep does not search the index with CE_VALID and SKIP_WORKTREE': 
-	cat >expect <<-EOF &&
-	a:text
-	EOF
-	test_when_finished "git update-index --no-assume-unchanged b" &&
-	git update-index --assume-unchanged b &&
-	git grep text >actual &&
-	test_cmp expect actual
+expecting success of 8001.80 'blame -L :regex': 
+	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 7 - working tree grep does not search the index with CE_VALID and SKIP_WORKTREE
+git annotate  -L:m[a-z][a-z]l hello.c 
+Author H (expected 4, attributed 4) good
+ok 80 - blame -L :regex
 
-expecting success of 7817.8 'grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE': 
-	cat >expect <<-EOF &&
-	a:text
-	b:text
-	dir/c:text
-	EOF
-	test_when_finished "git update-index --no-assume-unchanged b" &&
-	git update-index --assume-unchanged b &&
-	git grep --cached text >actual &&
-	test_cmp expect actual
+expecting success of 8001.81 'blame -L :nomatch': 
+	test_must_fail $PROG -L:nomatch hello.c
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 8 - grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE
+fatal: -L parameter 'nomatch' starting at line 1: no match
+ok 81 - blame -L :nomatch
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8004-blame-with-conflicts.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8004-blame-with-conflicts/.git/
-expecting success of 8004.1 'setup first case': 
-	# Create the old file
-	echo "Old line" > file1 &&
-	git add file1 &&
-	git commit --author "Old Line <ol@localhost>" -m file1.a &&
+expecting success of 8001.82 'blame -L :RE (relative)': 
+	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
 
-	# Branch
-	git checkout -b foo &&
+git annotate  -L3,3 -L:ma.. hello.c 
+Author F (expected 1, attributed 1) good
+Author H (expected 4, attributed 4) good
+ok 82 - blame -L :RE (relative)
 
-	# Do an ugly move and change
-	git rm file1 &&
-	echo "New line ..."  > file2 &&
-	echo "... and more" >> file2 &&
-	git add file2 &&
-	git commit --author "U Gly <ug@localhost>" -m ugly &&
+expecting success of 8001.83 'blame -L :RE (relative: no preceding range)': 
+	check_count -f hello.c -L:ma.. F 4 G 1
 
-	# Back to main and change something
-	git checkout main &&
-	echo "
+git annotate  -L:ma.. hello.c 
+Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
+ok 83 - blame -L :RE (relative: no preceding range)
 
-bla" >> file1 &&
-	git commit --author "Old Line <ol@localhost>" -a -m file1.b &&
+expecting success of 8001.84 'blame -L :RE (relative: not found)': 
+	test_must_fail $PROG -L3,3 -L:tambourine hello.c
 
-	# Back to foo and merge main
-	git checkout foo &&
-	if git merge main; then
-		echo needed conflict here
-		exit 1
-	else
-		echo merge failed - resolving automatically
-	fi &&
-	echo "New line ...
-... and more
+fatal: -L parameter 'tambourine' starting at line 4: no match
+ok 84 - blame -L :RE (relative: not found)
 
-bla
-Even more" > file2 &&
-	git rm file1 &&
-	git commit --author "M Result <mr@localhost>" -a -m merged &&
+expecting success of 8001.85 'blame -L :RE (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L:main hello.c
 
-	# Back to main and change file1 again
-	git checkout main &&
-	sed s/bla/foo/ <file1 >X &&
-	rm file1 &&
-	mv X file1 &&
-	git commit --author "No Bla <nb@localhost>" -a -m replace &&
+fatal: -L parameter 'main' starting at line 11: no match
+ok 85 - blame -L :RE (relative: end-of-file)
 
-	# Try to merge into foo again
-	git checkout foo &&
-	if git merge main; then
-		echo needed conflict here
-		exit 1
-	else
-		echo merge failed - test is setup
-	fi
+expecting success of 8001.86 'blame -L ^:RE (absolute)': 
+	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
 
-[main (root-commit) a79605b] file1.a
- Author: Old Line <ol@localhost>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'foo'
-rm 'file1'
-[foo 8c5d0c4] ugly
- Author: U Gly <ug@localhost>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- delete mode 100644 file1
- create mode 100644 file2
-Switched to branch 'main'
-[main 7948d65] file1.b
- Author: Old Line <ol@localhost>
- 1 file changed, 3 insertions(+)
-Switched to branch 'foo'
-CONFLICT (modify/delete): file1 deleted in HEAD and modified in main.  Version main of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-merge failed - resolving automatically
-rm 'file1'
-[foo 0adbbaa] merged
- Author: M Result <mr@localhost>
-Switched to branch 'main'
-[main 93a049b] replace
- Author: No Bla <nb@localhost>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'foo'
-CONFLICT (modify/delete): file1 deleted in HEAD and modified in main.  Version main of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-merge failed - test is setup
-ok 1 - setup first case
+git annotate  -L3,3 -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 86 - blame -L ^:RE (absolute)
 
-expecting success of 8004.2 'blame runs on unconflicted file while other file has conflicts': 
-	git blame file2
+expecting success of 8001.87 'blame -L ^:RE (absolute: no preceding range)': 
+	check_count -f hello.c -L^:ma.. F 4 G 1
 
-8c5d0c45 (U Gly    2005-04-01 13:14:15 +0200 1) New line ...
-8c5d0c45 (U Gly    2005-04-01 13:14:15 +0200 2) ... and more
-0adbbaae (M Result 2005-04-01 13:14:15 +0200 3) 
-0adbbaae (M Result 2005-04-01 13:14:15 +0200 4) bla
-0adbbaae (M Result 2005-04-01 13:14:15 +0200 5) Even more
-ok 2 - blame runs on unconflicted file while other file has conflicts
+git annotate  -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 87 - blame -L ^:RE (absolute: no preceding range)
 
-expecting success of 8004.3 'blame does not crash with conflicted file in stages 1,3': 
-	git blame file1
+expecting success of 8001.88 'blame -L ^:RE (absolute: not found)': 
+	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
 
-^a79605b (Old Line 2005-04-01 13:14:15 +0200 1) Old line
-7948d659 (Old Line 2005-04-01 13:14:15 +0200 2) 
-7948d659 (Old Line 2005-04-01 13:14:15 +0200 3) 
-93a049bc (No Bla   2005-04-01 13:14:15 +0200 4) foo
-ok 3 - blame does not crash with conflicted file in stages 1,3
+fatal: -L parameter 'tambourine' starting at line 1: no match
+ok 88 - blame -L ^:RE (absolute: not found)
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7112-reset-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.89 'blame -L ^:RE (absolute: end-of-file)': 
+	n=$(printf "%d" $(wc -l <hello.c)) &&
+	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
 
-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
+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
+ok 89 - blame -L ^:RE (absolute: end-of-file)
 
-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 8001.90 'blame -L :funcname with userdiff driver': 
+	cat >file.template <<-\EOF &&
+	DO NOT MATCH THIS LINE
+	function RIGHT(a, b) result(c)
+	AS THE DEFAULT DRIVER WOULD
 
-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
+	integer, intent(in) :: ChangeMe
+	EOF
 
-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
+	fortran_file=file.f03 &&
+	test_when_finished "rm .gitattributes" &&
+	echo "$fortran_file diff=fortran" >.gitattributes &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	test_commit --author "A <A@test.git>" \
+		"add" "$fortran_file" \
+		"$(cat file.template)" &&
+	test_commit --author "B <B@test.git>" \
+		"change" "$fortran_file" \
+		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
+	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
+[branch2 6b1b7a1] add
+ Author: A <A@test.git>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file.f03
+[branch2 7caa17d] change
+ Author: B <B@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+git annotate  -L:RIGHT file.f03 
+Author A (expected 3, attributed 3) good
+Author B (expected 1, attributed 1) good
+ok 90 - blame -L :funcname with userdiff driver
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 8001.91 'setup incremental': 
+	(
+	GIT_AUTHOR_NAME=I &&
+	export GIT_AUTHOR_NAME &&
+	GIT_AUTHOR_EMAIL=I@test.git &&
+	export GIT_AUTHOR_EMAIL &&
+	>incremental &&
+	git add incremental &&
+	git commit -m "step 0" &&
+	printf "partial" >>incremental &&
+	git commit -a -m "step 0.5" &&
+	echo >>incremental &&
+	git commit -a -m "step 1"
+	)
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+[branch2 6c56eef] step 0
+ Author: I <I@test.git>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 incremental
+[branch2 c79b19e] step 0.5
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 f65a7a7] step 1
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 91 - setup incremental
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.92 'blame empty': 
+	check_count -h HEAD^^ -f incremental
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+git annotate  incremental HEAD^^
+ok 92 - blame empty
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.93 'blame -L 0 empty': 
+	test_must_fail $PROG -L0 incremental HEAD^^
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-fatal: ref HEAD is not a symbolic ref
-ok 13 - git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead
+fatal: -L invalid line number: 0
+ok 93 - blame -L 0 empty
 
-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 8001.94 'blame -L 1 empty': 
+	test_must_fail $PROG -L1 incremental HEAD^^
 
-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
+fatal: file incremental has only 0 lines
+ok 94 - blame -L 1 empty
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
+expecting success of 8001.95 'blame -L 2 empty': 
+	test_must_fail $PROG -L2 incremental HEAD^^
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+fatal: file incremental has only 0 lines
+ok 95 - blame -L 2 empty
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.96 'blame half': 
+	check_count -h HEAD^ -f incremental I 1
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+git annotate  incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 96 - blame half
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.97 'blame -L 0 half': 
+	test_must_fail $PROG -L0 incremental HEAD^
 
-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
+fatal: -L invalid line number: 0
+ok 97 - blame -L 0 half
 
-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 8001.98 'blame -L 1 half': 
+	check_count -h HEAD^ -f incremental -L1 I 1
 
-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
+git annotate  -L1 incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 98 - blame -L 1 half
 
-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 8001.99 'blame -L 2 half': 
+	test_must_fail $PROG -L2 incremental HEAD^
 
-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
+fatal: file incremental has only 1 line
+ok 99 - blame -L 2 half
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.100 'blame -L 3 half': 
+	test_must_fail $PROG -L3 incremental HEAD^
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+fatal: file incremental has only 1 line
+ok 100 - blame -L 3 half
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-ok 28 - git reset --hard --recurse-submodules: replace submodule with a file
+expecting success of 8001.101 'blame full': 
+	check_count -f incremental I 1
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+git annotate  incremental 
+Author I (expected 1, attributed 1) good
+ok 101 - blame full
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.102 'blame -L 0 full': 
+	test_must_fail $PROG -L0 incremental
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+fatal: -L invalid line number: 0
+ok 102 - blame -L 0 full
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.103 'blame -L 1 full': 
+	check_count -f incremental -L1 I 1
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+git annotate  -L1 incremental 
+Author I (expected 1, attributed 1) good
+ok 103 - blame -L 1 full
 
-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 8001.104 'blame -L 2 full': 
+	test_must_fail $PROG -L2 incremental
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+fatal: file incremental has only 1 line
+ok 104 - blame -L 2 full
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.105 'blame -L 3 full': 
+	test_must_fail $PROG -L3 incremental
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+fatal: file incremental has only 1 line
+ok 105 - blame -L 3 full
 
-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 8001.106 'blame -L': 
+	test_must_fail $PROG -L file
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+    <rev-opts> are documented in git-rev-list(1)
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+    --[no-]incremental    show blame entries as we find them, incrementally
+    -b                    do not show object names of boundary commits (Default: off)
+    --[no-]root           do not treat root commits as boundaries (Default: off)
+    --[no-]show-stats     show work cost statistics
+    --[no-]progress       force progress reporting
+    --[no-]score-debug    show output score for blame entries
+    -f, --[no-]show-name  show original filename (Default: auto)
+    -n, --[no-]show-number
+                          show original linenumber (Default: off)
+    -p, --[no-]porcelain  show in a format designed for machine consumption
+    --[no-]line-porcelain show porcelain format with per-line commit information
+    -c                    use the same output mode as git-annotate (Default: off)
+    -t                    show raw timestamp (Default: off)
+    -l                    show long commit SHA1 (Default: off)
+    -s                    suppress author name and timestamp (Default: off)
+    -e, --[no-]show-email show author email instead of name (Default: off)
+    -w                    ignore whitespace differences
+    --[no-]ignore-rev <rev>
+                          ignore <rev> when blaming
+    --[no-]ignore-revs-file <file>
+                          ignore revisions from <file>
+    --[no-]color-lines    color redundant metadata from previous line differently
+    --[no-]color-by-age   color lines by age
+    --[no-]minimal        spend extra cycles to find better match
+    -S <file>             use revisions from <file> instead of calling git-rev-list
+    --[no-]contents <file>
+                          use <file>'s contents as the final image
+    -C[<score>]           find line copies within and across files
+    -M[<score>]           find line movements within and across files
+    -L <range>            process only line range <start>,<end> or function :<funcname>
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 106 - blame -L
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.107 'blame -L X,+': 
+	test_must_fail $PROG -L1,+ file
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 107 - blame -L X,+
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.108 'blame -L X,-': 
+	test_must_fail $PROG -L1,- file
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 108 - blame -L X,-
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.109 'blame -L X (non-numeric X)': 
+	test_must_fail $PROG -LX file
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 109 - blame -L X (non-numeric X)
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.110 'blame -L X,Y (non-numeric Y)': 
+	test_must_fail $PROG -L1,Y file
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 110 - blame -L X,Y (non-numeric Y)
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.111 'blame -L X,+N (non-numeric N)': 
+	test_must_fail $PROG -L1,+N file
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 111 - blame -L X,+N (non-numeric N)
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.112 'blame -L X,-N (non-numeric N)': 
+	test_must_fail $PROG -L1,-N file
 
-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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 112 - blame -L X,-N (non-numeric N)
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.113 'blame -L ,^/RE/': 
+	test_must_fail $PROG -L1,^/99/ file
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 113 - blame -L ,^/RE/
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.114 'blame progress on a full file': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (10/10), done.
+	EOF
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress hello.c 2>stderr &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
 
-expecting success of 7112.60 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+846166ba (H 2005-04-07 15:42:13 -0700  1) #include <stdio.h>
+f82005e9 (F 2005-04-07 15:42:13 -0700  2) int main(int argc, const char *argv[])
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  7) void mail()
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 114 - blame progress on a full file
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.115 'blame progress on a single range': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (4/4), done.
+	EOF
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 hello.c 2>stderr &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+f82005e9 (F 2005-04-07 15:42:13 -0700 3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700 4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700 5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700 6) }
+ok 115 - blame progress on a single range
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.116 'blame progress on multiple ranges': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (7/7), done.
+	EOF
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
 
-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
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 116 - blame progress on multiple ranges
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8001.117 'annotate old revision': 
+	git annotate file main >actual &&
+	awk "{ print \$3; }" <actual >authors &&
+	test 2 = $(grep A <authors | wc -l) &&
+	test 2 = $(grep B <authors | wc -l)
 
-expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ok 117 - annotate old revision
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+# passed all 117 test(s)
+1..117
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t8004-blame-with-conflicts.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8004-blame-with-conflicts/.git/
+expecting success of 8004.1 'setup first case': 
+	# Create the old file
+	echo "Old line" > file1 &&
+	git add file1 &&
+	git commit --author "Old Line <ol@localhost>" -m file1.a &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	# Branch
+	git checkout -b foo &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	# Do an ugly move and change
+	git rm file1 &&
+	echo "New line ..."  > file2 &&
+	echo "... and more" >> file2 &&
+	git add file2 &&
+	git commit --author "U Gly <ug@localhost>" -m ugly &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	# Back to main and change something
+	git checkout main &&
+	echo "
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+bla" >> file1 &&
+	git commit --author "Old Line <ol@localhost>" -a -m file1.b &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	# Back to foo and merge main
+	git checkout foo &&
+	if git merge main; then
+		echo needed conflict here
+		exit 1
+	else
+		echo merge failed - resolving automatically
+	fi &&
+	echo "New line ...
+... and more
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+bla
+Even more" > file2 &&
+	git rm file1 &&
+	git commit --author "M Result <mr@localhost>" -a -m merged &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	# Back to main and change file1 again
+	git checkout main &&
+	sed s/bla/foo/ <file1 >X &&
+	rm file1 &&
+	mv X file1 &&
+	git commit --author "No Bla <nb@localhost>" -a -m replace &&
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+	# Try to merge into foo again
+	git checkout foo &&
+	if git merge main; then
+		echo needed conflict here
+		exit 1
+	else
+		echo merge failed - test is setup
+	fi
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+[main (root-commit) a79605b] file1.a
+ Author: Old Line <ol@localhost>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'foo'
+rm 'file1'
+[foo 8c5d0c4] ugly
+ Author: U Gly <ug@localhost>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ delete mode 100644 file1
+ create mode 100644 file2
+Switched to branch 'main'
+[main 7948d65] file1.b
+ Author: Old Line <ol@localhost>
+ 1 file changed, 3 insertions(+)
+Switched to branch 'foo'
+CONFLICT (modify/delete): file1 deleted in HEAD and modified in main.  Version main of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+merge failed - resolving automatically
+rm 'file1'
+[foo 0adbbaa] merged
+ Author: M Result <mr@localhost>
+Switched to branch 'main'
+[main 93a049b] replace
+ Author: No Bla <nb@localhost>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'foo'
+CONFLICT (modify/delete): file1 deleted in HEAD and modified in main.  Version main of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+merge failed - test is setup
+ok 1 - setup first case
 
-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.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8004.2 'blame runs on unconflicted file while other file has conflicts': 
+	git blame file2
 
-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
+8c5d0c45 (U Gly    2005-04-01 13:14:15 +0200 1) New line ...
+8c5d0c45 (U Gly    2005-04-01 13:14:15 +0200 2) ... and more
+0adbbaae (M Result 2005-04-01 13:14:15 +0200 3) 
+0adbbaae (M Result 2005-04-01 13:14:15 +0200 4) bla
+0adbbaae (M Result 2005-04-01 13:14:15 +0200 5) Even more
+ok 2 - blame runs on unconflicted file while other file has conflicts
 
-# still have 12 known breakage(s)
-# passed all remaining 70 test(s)
-1..82
+expecting success of 8004.3 'blame does not crash with conflicted file in stages 1,3': 
+	git blame file1
+
+^a79605b (Old Line 2005-04-01 13:14:15 +0200 1) Old line
+7948d659 (Old Line 2005-04-01 13:14:15 +0200 2) 
+7948d659 (Old Line 2005-04-01 13:14:15 +0200 3) 
+93a049bc (No Bla   2005-04-01 13:14:15 +0200 4) foo
+ok 3 - blame does not crash with conflicted file in stages 1,3
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t8005-blame-i18n.sh ***
@@ -502217,6 +501860,1628 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t8008-blame-formats.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t8002-blame.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8002-blame/.git/
+expecting success of 8002.1 'setup A lines': 
+	echo "1A quick brown fox jumps over the" >file &&
+	echo "lazy dog" >>file &&
+	git add file &&
+	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
+	git commit -a -m "Initial."
+
+[main (root-commit) 129283d] Initial.
+ Author: A <A@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+ok 1 - setup A lines
+
+expecting success of 8002.2 'blame 1 author': 
+	check_count A 2
+
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+ok 2 - blame 1 author
+
+expecting success of 8002.3 'blame working copy': 
+	test_when_finished "git restore file" &&
+	echo "1A quick brown fox jumps over the" >file &&
+	echo "another lazy dog" >>file &&
+	check_count A 1 "Not Committed Yet" 1
+
+git blame -c  file 
+Author Not Committed Yet (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 3 - blame working copy
+
+expecting success of 8002.4 'blame with --contents': 
+	check_count --contents=file A 2
+
+git blame -c  --contents=file file 
+Author A (expected 2, attributed 2) good
+ok 4 - blame with --contents
+
+expecting success of 8002.5 'blame with --contents in a bare repo': 
+	git clone --bare . bare-contents.git &&
+	(
+		cd bare-contents.git &&
+		echo "1A quick brown fox jumps over the" >contents &&
+		check_count --contents=contents A 1
+	)
+
+Cloning into bare repository 'bare-contents.git'...
+done.
+git blame -c  --contents=contents file 
+Author A (expected 1, attributed 1) good
+ok 5 - blame with --contents in a bare repo
+
+expecting success of 8002.6 'blame with --contents changed': 
+	echo "1A quick brown fox jumps over the" >contents &&
+	echo "another lazy dog" >>contents &&
+	check_count --contents=contents A 1 "External file (--contents)" 1
+
+git blame -c  --contents=contents file 
+Author External file (--contents) (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 6 - blame with --contents changed
+
+expecting success of 8002.7 'blame in a bare repo without starting commit': 
+	git clone --bare . bare.git &&
+	(
+		cd bare.git &&
+		check_count A 2
+	)
+
+Cloning into bare repository 'bare.git'...
+done.
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+ok 7 - blame in a bare repo without starting commit
+
+expecting success of 8002.8 'blame by tag objects': 
+	git tag -m "test tag" testTag &&
+	git tag -m "test tag #2" testTag2 testTag &&
+	check_count -h testTag A 2 &&
+	check_count -h testTag2 A 2
+
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f testTag2 testTag^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+git blame -c  file testTag
+Author A (expected 2, attributed 2) good
+git blame -c  file testTag2
+Author A (expected 2, attributed 2) good
+ok 8 - blame by tag objects
+
+expecting success of 8002.9 'setup B lines': 
+	echo "2A quick brown fox jumps over the" >>file &&
+	echo "lazy dog" >>file &&
+	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
+	git commit -a -m "Second."
+
+[main 7e31098] Second.
+ Author: B <B@test.git>
+ 1 file changed, 2 insertions(+)
+ok 9 - setup B lines
+
+expecting success of 8002.10 'blame 2 authors': 
+	check_count A 2 B 2
+
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 10 - blame 2 authors
+
+expecting success of 8002.11 'blame with --contents and revision': 
+	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
+
+git blame -c  --contents=file file testTag
+Author External file (--contents) (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+ok 11 - blame with --contents and revision
+
+expecting success of 8002.12 'setup B1 lines (branch1)': 
+	git checkout -b branch1 main &&
+	echo "3A slow green fox jumps into the" >>file &&
+	echo "well." >>file &&
+	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
+	git commit -a -m "Branch1-1"
+
+Switched to a new branch 'branch1'
+[branch1 1b9b47a] Branch1-1
+ Author: B1 <B1@test.git>
+ 1 file changed, 2 insertions(+)
+ok 12 - setup B1 lines (branch1)
+
+expecting success of 8002.13 'blame 2 authors + 1 branch1 author': 
+	check_count A 2 B 2 B1 2
+
+git blame -c  file 
+Author B1 (expected 2, attributed 2) good
+Author 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)': 
+	git checkout -b branch2 main &&
+	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
+	git commit -a -m "Branch2-1"
+
+Switched to a new branch 'branch2'
+[branch2 7d77deb] Branch2-1
+ Author: B2 <B2@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - setup B2 lines (branch2)
+
+expecting success of 8002.15 'blame 2 authors + 1 branch2 author': 
+	check_count A 2 B 1 B2 1
+
+git blame -c  file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+ok 15 - blame 2 authors + 1 branch2 author
+
+expecting success of 8002.16 'merge branch1 & branch2': 
+	git merge branch1
+
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 ++
+ 1 file changed, 2 insertions(+)
+ok 16 - merge branch1 & branch2
+
+expecting success of 8002.17 'blame 2 authors + 2 merged-in authors': 
+	check_count A 2 B 1 B1 2 B2 1
+
+git blame -c  file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+ok 17 - blame 2 authors + 2 merged-in authors
+
+expecting success of 8002.18 'blame --first-parent blames merge for branch1': 
+	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
+
+git blame -c  --first-parent file 
+Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
+ok 18 - blame --first-parent blames merge for branch1
+
+expecting success of 8002.19 'blame ancestor': 
+	check_count -h main A 2 B 2
+
+git blame -c  file main
+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': 
+	check_count -h main^ A 2
+
+git blame -c  file main^
+Author A (expected 2, attributed 2) good
+ok 20 - blame great-ancestor
+
+expecting success of 8002.21 'setup evil merge': 
+	echo "evil merge." >>file &&
+	git commit -a --amend
+
+[branch2 c413b3e] Merge branch 'branch1' into branch2
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ok 21 - setup evil merge
+
+expecting success of 8002.22 'blame evil merge': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
+
+git blame -c  file 
+Author 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 B2 (expected 1, attributed 1) good
+ok 22 - blame evil merge
+
+expecting success of 8002.23 'blame huge graft': 
+	test_when_finished "git checkout branch2" &&
+	test_when_finished "rm -rf .git/info" &&
+	graft= &&
+	for i in 0 1 2
+	do
+		for j in 0 1 2 3 4 5 6 7 8 9
+		do
+			git checkout --orphan "$i$j" &&
+			printf "%s\n" "$i" "$j" >file &&
+			test_tick &&
+			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
+			git commit -a -m "$i$j" &&
+			commit=$(git rev-parse --verify HEAD) &&
+			graft="$graft$commit " || return 1
+		done
+	done &&
+	mkdir .git/info &&
+	printf "%s " $graft >.git/info/grafts &&
+	check_count -h 00 01 1 10 1
+
+Switched to a new branch '00'
+[00 (root-commit) e2c6177] 00
+ Author: 00 <00@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '01'
+[01 (root-commit) 0dbe04b] 01
+ Author: 01 <01@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '02'
+[02 (root-commit) 97fbca6] 02
+ Author: 02 <02@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '03'
+[03 (root-commit) 5cdbcd8] 03
+ Author: 03 <03@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '04'
+[04 (root-commit) 5a154cf] 04
+ Author: 04 <04@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '05'
+[05 (root-commit) a84e1de] 05
+ Author: 05 <05@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '06'
+[06 (root-commit) d4bea54] 06
+ Author: 06 <06@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '07'
+[07 (root-commit) 24ba6e8] 07
+ Author: 07 <07@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '08'
+[08 (root-commit) fe90088] 08
+ Author: 08 <08@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '09'
+[09 (root-commit) 773a2fb] 09
+ Author: 09 <09@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '10'
+[10 (root-commit) 80536e5] 10
+ Author: 10 <10@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '11'
+[11 (root-commit) 33c07c1] 11
+ Author: 11 <11@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '12'
+[12 (root-commit) ae7094b] 12
+ Author: 12 <12@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '13'
+[13 (root-commit) 19e767d] 13
+ Author: 13 <13@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '14'
+[14 (root-commit) f7159ac] 14
+ Author: 14 <14@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '15'
+[15 (root-commit) d95fecf] 15
+ Author: 15 <15@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '16'
+[16 (root-commit) d8bfdb9] 16
+ Author: 16 <16@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '17'
+[17 (root-commit) aa3f31e] 17
+ Author: 17 <17@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '18'
+[18 (root-commit) d76cb1d] 18
+ Author: 18 <18@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '19'
+[19 (root-commit) 95e03c5] 19
+ Author: 19 <19@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '20'
+[20 (root-commit) d40a964] 20
+ Author: 20 <20@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '21'
+[21 (root-commit) 6c3def2] 21
+ Author: 21 <21@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '22'
+[22 (root-commit) 78d2294] 22
+ Author: 22 <22@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '23'
+[23 (root-commit) 76a64d0] 23
+ Author: 23 <23@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '24'
+[24 (root-commit) 59f234a] 24
+ Author: 24 <24@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '25'
+[25 (root-commit) 26ac47a] 25
+ Author: 25 <25@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '26'
+[26 (root-commit) db7e855] 26
+ Author: 26 <26@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '27'
+[27 (root-commit) 279f565] 27
+ Author: 27 <27@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '28'
+[28 (root-commit) f691d9c] 28
+ Author: 28 <28@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '29'
+[29 (root-commit) c72134e] 29
+ Author: 29 <29@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+git blame -c  file 00
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
+Switched to branch 'branch2'
+ok 23 - blame huge graft
+
+expecting success of 8002.24 'setup incomplete line': 
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
+	git commit -a -m "Incomplete"
+
+[branch2 565fef5] Incomplete
+ Author: C <C@test.git>
+ 1 file changed, 1 insertion(+)
+ok 24 - setup incomplete line
+
+expecting success of 8002.25 'blame incomplete line': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
+
+git blame -c  file 
+Author B1 (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 25 - blame incomplete line
+
+expecting success of 8002.26 'setup edits': 
+	mv file file.orig &&
+	{
+		cat file.orig &&
+		echo
+	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
+	git commit -a -m "edit"
+
+[branch2 96588b8] edit
+ Author: D <D@test.git>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 26 - setup edits
+
+expecting success of 8002.27 'blame edits': 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
+
+git blame -c  file 
+Author A U Thor (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 B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 27 - blame edits
+
+expecting success of 8002.28 'setup obfuscated email': 
+	echo "No robots allowed" >file.new &&
+	cat file >>file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
+	git commit -a -m "norobots"
+
+[branch2 04f7693] norobots
+ Author: E <E at test dot git>
+ 1 file changed, 1 insertion(+)
+ok 28 - setup obfuscated email
+
+expecting success of 8002.29 'blame obfuscated email': 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  file 
+Author B (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 29 - blame obfuscated email
+
+expecting success of 8002.30 'blame -L 1 (all)': 
+	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L1 file 
+Author B (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 30 - blame -L 1 (all)
+
+expecting success of 8002.31 'blame -L , (all)': 
+	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 B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (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 D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 32 - blame -L X (X to end)
+
+expecting success of 8002.33 'blame -L X, (X to end)': 
+	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L5, file 
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 33 - blame -L X, (X to end)
+
+expecting success of 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 E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 34 - blame -L ,Y (up to Y)
+
+expecting success of 8002.35 'blame -L X,X': 
+	check_count -L3,3 B2 1
+
+git blame -c  -L3,3 file 
+Author B2 (expected 1, attributed 1) good
+ok 35 - blame -L X,X
+
+expecting success of 8002.36 'blame -L X,Y': 
+	check_count -L3,6 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L3,6 file 
+Author 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 8002.37 'blame -L Y,X (undocumented)': 
+	check_count -L6,3 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L6,3 file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 37 - blame -L Y,X (undocumented)
+
+expecting success of 8002.38 'blame -L -X': 
+	test_must_fail $PROG -L-1 file
+
+fatal: -L invalid line number: -1
+ok 38 - blame -L -X
+
+expecting success of 8002.39 'blame -L 0': 
+	test_must_fail $PROG -L0 file
+
+fatal: -L invalid line number: 0
+ok 39 - blame -L 0
+
+expecting success of 8002.40 'blame -L ,0': 
+	test_must_fail $PROG -L,0 file
+
+fatal: -L invalid line number: 0
+ok 40 - blame -L ,0
+
+expecting success of 8002.41 'blame -L ,+0': 
+	test_must_fail $PROG -L,+0 file
+
+fatal: -L invalid empty range
+ok 41 - blame -L ,+0
+
+expecting success of 8002.42 'blame -L X,+0': 
+	test_must_fail $PROG -L1,+0 file
+
+fatal: -L invalid empty range
+ok 42 - blame -L X,+0
+
+expecting success of 8002.43 'blame -L X,+1': 
+	check_count -L3,+1 B2 1
+
+git blame -c  -L3,+1 file 
+Author B2 (expected 1, attributed 1) good
+ok 43 - blame -L X,+1
+
+expecting success of 8002.44 'blame -L X,+N': 
+	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L3,+4 file 
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 44 - blame -L X,+N
+
+expecting success of 8002.45 'blame -L ,-0': 
+	test_must_fail $PROG -L,-0 file
+
+fatal: -L invalid empty range
+ok 45 - blame -L ,-0
+
+expecting success of 8002.46 'blame -L X,-0': 
+	test_must_fail $PROG -L1,-0 file
+
+fatal: -L invalid empty range
+ok 46 - blame -L X,-0
+
+expecting success of 8002.47 'blame -L X,-1': 
+	check_count -L3,-1 B2 1
+
+git blame -c  -L3,-1 file 
+Author B2 (expected 1, attributed 1) good
+ok 47 - blame -L X,-1
+
+expecting success of 8002.48 'blame -L X,-N': 
+	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L6,-4 file 
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 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
+ok 49 - blame -L /RE/ (RE to end)
+
+expecting success of 8002.50 'blame -L /RE/,/RE2/': 
+	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+
+git blame -c  -L/robot/,/green/ file 
+Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 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
+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 B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 52 - blame -L /RE/,Y
+
+expecting success of 8002.53 'blame -L /RE/,+N': 
+	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+
+git blame -c  -L/99/,+3 file 
+Author 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 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 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)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n C 1
+
+git blame -c  -L8 file 
+Author C (expected 1, attributed 1) good
+ok 55 - blame -L X (X == nlines)
+
+expecting success of 8002.56 'blame -L X (X == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	test_must_fail $PROG -L$n file
+
+fatal: file file has only 8 lines
+ok 56 - blame -L X (X == nlines + 1)
+
+expecting success of 8002.57 'blame -L X (X > nlines)': 
+	test_must_fail $PROG -L12345 file
+
+fatal: file file has only 8 lines
+ok 57 - blame -L X (X > nlines)
+
+expecting success of 8002.58 'blame -L ,Y (Y == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,8 file 
+Author B1 (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 B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 58 - blame -L ,Y (Y == nlines)
+
+expecting success of 8002.59 'blame -L ,Y (Y == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,9 file 
+Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 59 - blame -L ,Y (Y == nlines + 1)
+
+expecting success of 8002.60 'blame -L ,Y (Y > nlines)': 
+	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,12345 file 
+Author B2 (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 A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 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 B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 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 B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 62 - blame -L multiple (disjoint: unordered)
+
+expecting success of 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 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 8002.64 'blame -L multiple (adjacent: unordered)': 
+	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
+
+git blame -c  -L4,5 -L2,3 file 
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 64 - blame -L multiple (adjacent: unordered)
+
+expecting success of 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 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 8002.66 'blame -L multiple (overlapping: unordered)': 
+	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
+
+git blame -c  -L3,5 -L2,4 file 
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 66 - blame -L multiple (overlapping: unordered)
+
+expecting success of 8002.67 'blame -L multiple (superset/subset)': 
+	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L2,8 -L3,5 file 
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 67 - blame -L multiple (superset/subset)
+
+expecting success of 8002.68 'blame -L multiple (superset/subset: unordered)': 
+	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L3,5 -L2,8 file 
+Author 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 A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 68 - blame -L multiple (superset/subset: unordered)
+
+expecting success of 8002.69 'blame -L /RE/ (relative)': 
+	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L3,3 -L/fox/ file 
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 69 - blame -L /RE/ (relative)
+
+expecting success of 8002.70 'blame -L /RE/ (relative: no preceding range)': 
+	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L/dog/ file 
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 70 - blame -L /RE/ (relative: no preceding range)
+
+expecting success of 8002.71 'blame -L /RE/ (relative: adjacent)': 
+	check_count -L1,1 -L/dog/,+1 A 1 E 1
+
+git blame -c  -L1,1 -L/dog/,+1 file 
+Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 71 - blame -L /RE/ (relative: adjacent)
+
+expecting success of 8002.72 'blame -L /RE/ (relative: not found)': 
+	test_must_fail $PROG -L4,4 -L/dog/ file
+
+fatal: -L parameter 'dog' starting at line 5: No match
+ok 72 - blame -L /RE/ (relative: not found)
+
+expecting success of 8002.73 'blame -L /RE/ (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L/$/ file
+
+fatal: file file has only 8 lines
+ok 73 - blame -L /RE/ (relative: end-of-file)
+
+expecting success of 8002.74 'blame -L ^/RE/ (absolute)': 
+	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+
+git blame -c  -L3,3 -L^/dog/,+2 file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 74 - blame -L ^/RE/ (absolute)
+
+expecting success of 8002.75 'blame -L ^/RE/ (absolute: no preceding range)': 
+	check_count -L^/dog/,+2 A 1 B2 1
+
+git blame -c  -L^/dog/,+2 file 
+Author 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)': 
+	test_must_fail $PROG -L4,4 -L^/tambourine/ file
+
+fatal: -L parameter 'tambourine' starting at line 1: No match
+ok 76 - blame -L ^/RE/ (absolute: not found)
+
+expecting success of 8002.77 'blame -L ^/RE/ (absolute: end-of-file)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
+
+git blame -c  -L8 -L^/$/,+2 file 
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 77 - blame -L ^/RE/ (absolute: end-of-file)
+
+expecting success of 8002.78 'setup -L :regex': 
+	tr Q "\\t" >hello.c <<-\EOF &&
+	int main(int argc, const char *argv[])
+	{
+	Qputs("hello");
+	}
+	EOF
+	git add hello.c &&
+	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
+	git commit -m "hello" &&
+
+	mv hello.c hello.orig &&
+	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
+	tr Q "\\t" >hello.c &&
+	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
+	git commit -a -m "goodbye" &&
+
+	mv hello.c hello.orig &&
+	echo "#include <stdio.h>" >hello.c &&
+	cat hello.orig >>hello.c &&
+	tr Q "\\t" >>hello.c <<-\EOF &&
+	void mail()
+	{
+	Qputs("mail");
+	}
+	EOF
+	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
+	git commit -a -m "mail"
+
+[branch2 f82005e] hello
+ Author: F <F@test.git>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 hello.c
+[branch2 edbab84] goodbye
+ Author: G <G@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 846166b] mail
+ Author: H <H@test.git>
+ 1 file changed, 5 insertions(+)
+ok 78 - setup -L :regex
+
+expecting success of 8002.79 'blame -L :literal': 
+	check_count -f hello.c -L:main F 4 G 1
+
+git blame -c  -L:main hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 79 - blame -L :literal
+
+expecting success of 8002.80 'blame -L :regex': 
+	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+
+git blame -c  -L:m[a-z][a-z]l hello.c 
+Author H (expected 4, attributed 4) good
+ok 80 - blame -L :regex
+
+expecting success of 8002.81 'blame -L :nomatch': 
+	test_must_fail $PROG -L:nomatch hello.c
+
+fatal: -L parameter 'nomatch' starting at line 1: no match
+ok 81 - blame -L :nomatch
+
+expecting success of 8002.82 'blame -L :RE (relative)': 
+	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+
+git blame -c  -L3,3 -L:ma.. hello.c 
+Author F (expected 1, attributed 1) good
+Author H (expected 4, attributed 4) good
+ok 82 - blame -L :RE (relative)
+
+expecting success of 8002.83 'blame -L :RE (relative: no preceding range)': 
+	check_count -f hello.c -L:ma.. F 4 G 1
+
+git blame -c  -L:ma.. hello.c 
+Author 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 8002.84 'blame -L :RE (relative: not found)': 
+	test_must_fail $PROG -L3,3 -L:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 4: no match
+ok 84 - blame -L :RE (relative: not found)
+
+expecting success of 8002.85 'blame -L :RE (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L:main hello.c
+
+fatal: -L parameter 'main' starting at line 11: no match
+ok 85 - blame -L :RE (relative: end-of-file)
+
+expecting success of 8002.86 'blame -L ^:RE (absolute)': 
+	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+
+git blame -c  -L3,3 -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 86 - blame -L ^:RE (absolute)
+
+expecting success of 8002.87 'blame -L ^:RE (absolute: no preceding range)': 
+	check_count -f hello.c -L^:ma.. F 4 G 1
+
+git blame -c  -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 87 - blame -L ^:RE (absolute: no preceding range)
+
+expecting success of 8002.88 'blame -L ^:RE (absolute: not found)': 
+	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 1: no match
+ok 88 - blame -L ^:RE (absolute: not found)
+
+expecting success of 8002.89 'blame -L ^:RE (absolute: end-of-file)': 
+	n=$(printf "%d" $(wc -l <hello.c)) &&
+	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
+
+git blame -c  -L10 -L^:ma.. hello.c 
+Author H (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
+ok 89 - blame -L ^:RE (absolute: end-of-file)
+
+expecting success of 8002.90 'blame -L :funcname with userdiff driver': 
+	cat >file.template <<-\EOF &&
+	DO NOT MATCH THIS LINE
+	function RIGHT(a, b) result(c)
+	AS THE DEFAULT DRIVER WOULD
+
+	integer, intent(in) :: ChangeMe
+	EOF
+
+	fortran_file=file.f03 &&
+	test_when_finished "rm .gitattributes" &&
+	echo "$fortran_file diff=fortran" >.gitattributes &&
+
+	test_commit --author "A <A@test.git>" \
+		"add" "$fortran_file" \
+		"$(cat file.template)" &&
+	test_commit --author "B <B@test.git>" \
+		"change" "$fortran_file" \
+		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
+	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
+
+[branch2 6b1b7a1] add
+ Author: A <A@test.git>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file.f03
+[branch2 7caa17d] change
+ Author: B <B@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+git blame -c  -L:RIGHT file.f03 
+Author B (expected 1, attributed 1) good
+Author A (expected 3, attributed 3) good
+ok 90 - blame -L :funcname with userdiff driver
+
+expecting success of 8002.91 'setup incremental': 
+	(
+	GIT_AUTHOR_NAME=I &&
+	export GIT_AUTHOR_NAME &&
+	GIT_AUTHOR_EMAIL=I@test.git &&
+	export GIT_AUTHOR_EMAIL &&
+	>incremental &&
+	git add incremental &&
+	git commit -m "step 0" &&
+	printf "partial" >>incremental &&
+	git commit -a -m "step 0.5" &&
+	echo >>incremental &&
+	git commit -a -m "step 1"
+	)
+
+[branch2 6c56eef] step 0
+ Author: I <I@test.git>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 incremental
+[branch2 c79b19e] step 0.5
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 f65a7a7] step 1
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 91 - setup incremental
+
+expecting success of 8002.92 'blame empty': 
+	check_count -h HEAD^^ -f incremental
+
+git blame -c  incremental HEAD^^
+ok 92 - blame empty
+
+expecting success of 8002.93 'blame -L 0 empty': 
+	test_must_fail $PROG -L0 incremental HEAD^^
+
+fatal: -L invalid line number: 0
+ok 93 - blame -L 0 empty
+
+expecting success of 8002.94 'blame -L 1 empty': 
+	test_must_fail $PROG -L1 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 94 - blame -L 1 empty
+
+expecting success of 8002.95 'blame -L 2 empty': 
+	test_must_fail $PROG -L2 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 95 - blame -L 2 empty
+
+expecting success of 8002.96 'blame half': 
+	check_count -h HEAD^ -f incremental I 1
+
+git blame -c  incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 96 - blame half
+
+expecting success of 8002.97 'blame -L 0 half': 
+	test_must_fail $PROG -L0 incremental HEAD^
+
+fatal: -L invalid line number: 0
+ok 97 - blame -L 0 half
+
+expecting success of 8002.98 'blame -L 1 half': 
+	check_count -h HEAD^ -f incremental -L1 I 1
+
+git blame -c  -L1 incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 98 - blame -L 1 half
+
+expecting success of 8002.99 'blame -L 2 half': 
+	test_must_fail $PROG -L2 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 99 - blame -L 2 half
+
+expecting success of 8002.100 'blame -L 3 half': 
+	test_must_fail $PROG -L3 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 100 - blame -L 3 half
+
+expecting success of 8002.101 'blame full': 
+	check_count -f incremental I 1
+
+git blame -c  incremental 
+Author I (expected 1, attributed 1) good
+ok 101 - blame full
+
+expecting success of 8002.102 'blame -L 0 full': 
+	test_must_fail $PROG -L0 incremental
+
+fatal: -L invalid line number: 0
+ok 102 - blame -L 0 full
+
+expecting success of 8002.103 'blame -L 1 full': 
+	check_count -f incremental -L1 I 1
+
+git blame -c  -L1 incremental 
+Author I (expected 1, attributed 1) good
+ok 103 - blame -L 1 full
+
+expecting success of 8002.104 'blame -L 2 full': 
+	test_must_fail $PROG -L2 incremental
+
+fatal: file incremental has only 1 line
+ok 104 - blame -L 2 full
+
+expecting success of 8002.105 'blame -L 3 full': 
+	test_must_fail $PROG -L3 incremental
+
+fatal: file incremental has only 1 line
+ok 105 - blame -L 3 full
+
+expecting success of 8002.106 'blame -L': 
+	test_must_fail $PROG -L file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+
+    <rev-opts> are documented in git-rev-list(1)
+
+    --[no-]incremental    show blame entries as we find them, incrementally
+    -b                    do not show object names of boundary commits (Default: off)
+    --[no-]root           do not treat root commits as boundaries (Default: off)
+    --[no-]show-stats     show work cost statistics
+    --[no-]progress       force progress reporting
+    --[no-]score-debug    show output score for blame entries
+    -f, --[no-]show-name  show original filename (Default: auto)
+    -n, --[no-]show-number
+                          show original linenumber (Default: off)
+    -p, --[no-]porcelain  show in a format designed for machine consumption
+    --[no-]line-porcelain show porcelain format with per-line commit information
+    -c                    use the same output mode as git-annotate (Default: off)
+    -t                    show raw timestamp (Default: off)
+    -l                    show long commit SHA1 (Default: off)
+    -s                    suppress author name and timestamp (Default: off)
+    -e, --[no-]show-email show author email instead of name (Default: off)
+    -w                    ignore whitespace differences
+    --[no-]ignore-rev <rev>
+                          ignore <rev> when blaming
+    --[no-]ignore-revs-file <file>
+                          ignore revisions from <file>
+    --[no-]color-lines    color redundant metadata from previous line differently
+    --[no-]color-by-age   color lines by age
+    --[no-]minimal        spend extra cycles to find better match
+    -S <file>             use revisions from <file> instead of calling git-rev-list
+    --[no-]contents <file>
+                          use <file>'s contents as the final image
+    -C[<score>]           find line copies within and across files
+    -M[<score>]           find line movements within and across files
+    -L <range>            process only line range <start>,<end> or function :<funcname>
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 106 - blame -L
+
+expecting success of 8002.107 'blame -L X,+': 
+	test_must_fail $PROG -L1,+ file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 107 - blame -L X,+
+
+expecting success of 8002.108 'blame -L X,-': 
+	test_must_fail $PROG -L1,- file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 108 - blame -L X,-
+
+expecting success of 8002.109 'blame -L X (non-numeric X)': 
+	test_must_fail $PROG -LX file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 109 - blame -L X (non-numeric X)
+
+expecting success of 8002.110 'blame -L X,Y (non-numeric Y)': 
+	test_must_fail $PROG -L1,Y file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 110 - blame -L X,Y (non-numeric Y)
+
+expecting success of 8002.111 'blame -L X,+N (non-numeric N)': 
+	test_must_fail $PROG -L1,+N file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 111 - blame -L X,+N (non-numeric N)
+
+expecting success of 8002.112 'blame -L X,-N (non-numeric N)': 
+	test_must_fail $PROG -L1,-N file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 112 - blame -L X,-N (non-numeric N)
+
+expecting success of 8002.113 'blame -L ,^/RE/': 
+	test_must_fail $PROG -L1,^/99/ file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 113 - blame -L ,^/RE/
+
+expecting success of 8002.114 'blame progress on a full file': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (10/10), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+846166ba (H 2005-04-07 15:42:13 -0700  1) #include <stdio.h>
+f82005e9 (F 2005-04-07 15:42:13 -0700  2) int main(int argc, const char *argv[])
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  7) void mail()
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 114 - blame progress on a full file
+
+expecting success of 8002.115 'blame progress on a single range': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (4/4), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+f82005e9 (F 2005-04-07 15:42:13 -0700 3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700 4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700 5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700 6) }
+ok 115 - blame progress on a single range
+
+expecting success of 8002.116 'blame progress on multiple ranges': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (7/7), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 116 - blame progress on multiple ranges
+
+expecting success of 8002.117 'setup': 
+	hexsz=$(test_oid hexsz)
+
+ok 117 - setup
+
+expecting success of 8002.118 'blame untracked file in empty repo': 
+	>untracked &&
+	test_must_fail git blame untracked
+
+fatal: no such path 'untracked' in HEAD
+ok 118 - blame untracked file in empty repo
+
+expecting success of 8002.119 'blame --show-email': 
+	check_count \
+		"<A@test.git>" 1 \
+		"<B@test.git>" 1 \
+		"<B1@test.git>" 1 \
+		"<B2@test.git>" 1 \
+		"<author@example.com>" 1 \
+		"<C@test.git>" 1 \
+		"<D@test.git>" 1 \
+		"<E at test dot git>" 1
+
+git blame -c -e  file 
+Author <A@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 <C@test.git> (expected 1, attributed 1) good
+Author <E at test dot git> (expected 1, attributed 1) good
+Author <B1@test.git> (expected 1, attributed 1) good
+Author <author@example.com> (expected 1, attributed 1) good
+Author <D@test.git> (expected 1, attributed 1) good
+ok 119 - blame --show-email
+
+expecting success of 8002.120 'setup showEmail tests': 
+	echo "bin: test number 1" >one &&
+	git add one &&
+	GIT_AUTHOR_NAME=name1 \
+	GIT_AUTHOR_EMAIL=email1@test.git \
+	git commit -m First --date="2010-01-01 01:00:00" &&
+	cat >expected_n <<-\EOF &&
+	(name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
+	EOF
+	cat >expected_e <<-\EOF
+	(<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
+	EOF
+
+[branch2 c39471f] First
+ Author: name1 <email1@test.git>
+ Date: Fri Jan 1 01:00:00 2010 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+ok 120 - setup showEmail tests
+
+expecting success of 8002.121 'blame with no options and no config': 
+	git blame one >blame &&
+	find_blame <blame >result &&
+	test_cmp expected_n result
+
+ok 121 - blame with no options and no config
+
+expecting success of 8002.122 'blame with showemail options': 
+	git blame --show-email one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_e result &&
+	git blame -e one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame3 &&
+	find_blame <blame3 >result &&
+	test_cmp expected_n result
+
+ok 122 - blame with showemail options
+
+expecting success of 8002.123 'blame with showEmail config false': 
+	git config blame.showEmail false &&
+	git blame one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_n result &&
+	git blame --show-email one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_e result &&
+	git blame -e one >blame3 &&
+	find_blame <blame3 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame4 &&
+	find_blame <blame4 >result &&
+	test_cmp expected_n result
+
+ok 123 - blame with showEmail config false
+
+expecting success of 8002.124 'blame with showEmail config true': 
+	git config blame.showEmail true &&
+	git blame one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_n result
+
+ok 124 - blame with showEmail config true
+
+expecting success of 8002.125 'set up abbrev tests': 
+	test_commit abbrev &&
+	sha1=$(git rev-parse --verify HEAD) &&
+	check_abbrev () {
+		expect=$1 && shift &&
+		echo $sha1 | cut -c 1-$expect >expect &&
+		git blame "$@" abbrev.t >actual &&
+		perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
+		test_cmp expect actual.sha
+	}
+
+[branch2 32e5f6f] abbrev
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abbrev.t
+ok 125 - set up abbrev tests
+
+expecting success of 8002.126 'blame --abbrev=<n> works': 
+	# non-boundary commits get +1 for alignment
+	check_abbrev 31 --abbrev=30 HEAD &&
+	check_abbrev 30 --abbrev=30 ^HEAD
+
+ok 126 - blame --abbrev=<n> works
+
+expecting success of 8002.127 'blame -l aligns regular and boundary commits': 
+	check_abbrev $hexsz         -l HEAD &&
+	check_abbrev $((hexsz - 1)) -l ^HEAD
+
+ok 127 - blame -l aligns regular and boundary commits
+
+expecting success of 8002.128 'blame --abbrev with full length behaves like -l': 
+	check_abbrev $hexsz         --abbrev=$hexsz HEAD &&
+	check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD
+
+ok 128 - blame --abbrev with full length behaves like -l
+
+expecting success of 8002.129 '--no-abbrev works like --abbrev with full length': 
+	check_abbrev $hexsz --no-abbrev
+
+ok 129 - --no-abbrev works like --abbrev with full length
+
+expecting success of 8002.130 '--exclude-promisor-objects does not BUG-crash': 
+	test_must_fail git blame --exclude-promisor-objects one
+
+error: unknown option `--exclude-promisor-objects'
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+
+    <rev-opts> are documented in git-rev-list(1)
+
+    --[no-]incremental    show blame entries as we find them, incrementally
+    -b                    do not show object names of boundary commits (Default: off)
+    --[no-]root           do not treat root commits as boundaries (Default: off)
+    --[no-]show-stats     show work cost statistics
+    --[no-]progress       force progress reporting
+    --[no-]score-debug    show output score for blame entries
+    -f, --[no-]show-name  show original filename (Default: auto)
+    -n, --[no-]show-number
+                          show original linenumber (Default: off)
+    -p, --[no-]porcelain  show in a format designed for machine consumption
+    --[no-]line-porcelain show porcelain format with per-line commit information
+    -c                    use the same output mode as git-annotate (Default: off)
+    -t                    show raw timestamp (Default: off)
+    -l                    show long commit SHA1 (Default: off)
+    -s                    suppress author name and timestamp (Default: off)
+    -e, --[no-]show-email show author email instead of name (Default: off)
+    -w                    ignore whitespace differences
+    --[no-]ignore-rev <rev>
+                          ignore <rev> when blaming
+    --[no-]ignore-revs-file <file>
+                          ignore revisions from <file>
+    --[no-]color-lines    color redundant metadata from previous line differently
+    --[no-]color-by-age   color lines by age
+    --[no-]minimal        spend extra cycles to find better match
+    -S <file>             use revisions from <file> instead of calling git-rev-list
+    --[no-]contents <file>
+                          use <file>'s contents as the final image
+    -C[<score>]           find line copies within and across files
+    -M[<score>]           find line movements within and across files
+    -L <range>            process only line range <start>,<end> or function :<funcname>
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 130 - --exclude-promisor-objects does not BUG-crash
+
+expecting success of 8002.131 'blame with uncommitted edits in partial clone does not crash': 
+	git init server &&
+	echo foo >server/file.txt &&
+	git -C server add file.txt &&
+	git -C server commit -m file &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	echo bar >>client/file.txt &&
+	git -C client blame file.txt
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8002-blame/server/.git/
+[main (root-commit) a09dc96] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.txt
+Cloning into 'client'...
+warning: filtering not recognized by server, ignoring
+^a09dc96 (A U Thor          2005-04-07 15:45:13 -0700 1) foo
+00000000 (Not Committed Yet 2026-03-14 13:36:55 +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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t8007-cat-file-textconv.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8007-cat-file-textconv/.git/
 expecting success of 8007.1 'setup ': 
@@ -502250,349 +503515,1020 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup 
 
-expecting success of 8007.2 'usage: <bad rev>': 
+expecting success of 8007.2 'usage: <bad rev>': 
+	cat >expect <<-\EOF &&
+	fatal: Not a valid object name HEAD2
+	EOF
+	test_must_fail git cat-file --textconv HEAD2 2>actual &&
+	test_cmp expect actual
+
+ok 2 - usage: <bad rev>
+
+expecting success of 8007.3 'usage: <bad rev>:<bad path>': 
+	cat >expect <<-\EOF &&
+	fatal: invalid object name 'HEAD2'.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
+	test_cmp expect actual
+
+ok 3 - usage: <bad rev>:<bad path>
+
+expecting success of 8007.4 'usage: <rev>:<bad path>': 
+	cat >expect <<-\EOF &&
+	fatal: path 'two.bin' does not exist in 'HEAD'
+	EOF
+	test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
+	test_cmp expect actual
+
+ok 4 - usage: <rev>:<bad path>
+
+expecting success of 8007.5 'usage: <rev> with no <path>': 
+	cat >expect <<-\EOF &&
+	fatal: <object>:<path> required, only <object> 'HEAD' given
+	EOF
+	test_must_fail git cat-file --textconv HEAD 2>actual &&
+	test_cmp expect actual
+
+ok 5 - usage: <rev> with no <path>
+
+expecting success of 8007.6 'usage: <bad rev>:<good (in HEAD) path>': 
+	cat >expect <<-\EOF &&
+	fatal: invalid object name 'HEAD2'.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
+	test_cmp expect actual
+
+ok 6 - usage: <bad rev>:<good (in HEAD) path>
+
+expecting success of 8007.7 'no filter specified': 
+	git cat-file --textconv :one.bin >result &&
+	test_cmp expected result
+
+ok 7 - no filter specified
+
+expecting success of 8007.8 'setup textconv filters': 
+	echo "*.bin diff=test" >.gitattributes &&
+	git config diff.test.textconv ./helper &&
+	git config diff.test.cachetextconv false
+
+ok 8 - setup textconv filters
+
+expecting success of 8007.9 'cat-file without --textconv': 
+	git cat-file blob :one.bin >result &&
+	test_cmp expected result
+
+ok 9 - cat-file without --textconv
+
+expecting success of 8007.10 'cat-file without --textconv on previous commit': 
+	git cat-file -p HEAD^:one.bin >result &&
+	test_cmp expected result
+
+ok 10 - cat-file without --textconv on previous commit
+
+expecting success of 8007.11 'cat-file --textconv on last commit': 
+	git cat-file --textconv :one.bin >result &&
+	test_cmp expected result
+
+ok 11 - cat-file --textconv on last commit
+
+expecting success of 8007.12 'cat-file --textconv on previous commit': 
+	git cat-file --textconv HEAD^:one.bin >result &&
+	test_cmp expected result
+
+ok 12 - cat-file --textconv on previous commit
+
+expecting success of 8007.13 'cat-file without --textconv (symlink)': 
+	printf "%s" "one.bin" >expected &&
+	git cat-file blob :symlink.bin >result &&
+	test_cmp expected result
+
+ok 13 - cat-file without --textconv (symlink)
+
+expecting success of 8007.14 'cat-file --textconv on index (symlink)': 
+	git cat-file --textconv :symlink.bin >result &&
+	test_cmp expected result
+
+ok 14 - cat-file --textconv on index (symlink)
+
+expecting success of 8007.15 'cat-file --textconv on HEAD (symlink)': 
+	git cat-file --textconv HEAD:symlink.bin >result &&
+	test_cmp expected result
+
+ok 15 - cat-file --textconv on HEAD (symlink)
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7814-grep-recurse-submodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/.git/
+expecting success of 7814.1 'setup directory structure and submodule': 
+	echo "(1|2)d(3|4)" >a &&
+	mkdir b &&
+	echo "(3|4)" >b/b &&
+	git add a b &&
+	git commit -m "add a and b" &&
+	test_tick &&
+	git init submodule &&
+	echo "(1|2)d(3|4)" >submodule/a &&
+	git -C submodule add a &&
+	git -C submodule commit -m "add a" &&
+	git submodule add ./submodule &&
+	git commit -m "added submodule" &&
+	test_tick
+
+[master (root-commit) 167e9ac] add a and b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b/b
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/submodule/.git/
+[master (root-commit) f764d75] add a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Adding existing repo at 'submodule' to the index
+[master 24c453d] added submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 1 - setup directory structure and submodule
+
+expecting success of 7814.2 'grep correctly finds patterns in a submodule': 
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	b/b:(3|4)
+	submodule/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 2 - grep correctly finds patterns in a submodule
+
+expecting success of 7814.3 'grep finds patterns in a submodule via config': 
+	test_config submodule.recurse true &&
+	# expect from previous test
+	git grep -e "(3|4)" >actual &&
+	test_cmp expect actual
+
+ok 3 - grep finds patterns in a submodule via config
+
+expecting success of 7814.4 'grep --no-recurse-submodules overrides config': 
+	test_config submodule.recurse true &&
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	b/b:(3|4)
+	EOF
+
+	git grep -e "(3|4)" --no-recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 4 - grep --no-recurse-submodules overrides config
+
+expecting success of 7814.5 'grep and basic pathspecs': 
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e. --recurse-submodules -- submodule >actual &&
+	test_cmp expect actual
+
+ok 5 - grep and basic pathspecs
+
+expecting success of 7814.6 'grep and nested submodules': 
+	git init submodule/sub &&
+	echo "(1|2)d(3|4)" >submodule/sub/a &&
+	git -C submodule/sub add a &&
+	git -C submodule/sub commit -m "add a" &&
+	test_tick &&
+	git -C submodule submodule add ./sub &&
+	git -C submodule add sub &&
+	git -C submodule commit -m "added sub" &&
+	test_tick &&
+	git add submodule &&
+	git commit -m "updated submodule" &&
+	test_tick &&
+
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	b/b:(3|4)
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/submodule/sub/.git/
+[master (root-commit) 0fb48cf] add a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Adding existing repo at 'sub' to the index
+[master d30b891] added sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[master bea0037] updated submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - grep and nested submodules
+
+expecting success of 7814.7 'grep and multiple patterns': 
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --and -e "(1|2)" --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 7 - grep and multiple patterns
+
+expecting success of 7814.8 'grep and multiple patterns': 
+	cat >expect <<-\EOF &&
+	b/b:(3|4)
+	EOF
+
+	git grep -e "(3|4)" --and --not -e "(1|2)" --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 8 - grep and multiple patterns
+
+expecting success of 7814.9 'basic grep tree': 
+	cat >expect <<-\EOF &&
+	HEAD:a:(1|2)d(3|4)
+	HEAD:b/b:(3|4)
+	HEAD:submodule/a:(1|2)d(3|4)
+	HEAD:submodule/sub/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules HEAD >actual &&
+	test_cmp expect actual
+
+ok 9 - basic grep tree
+
+expecting success of 7814.10 'grep tree HEAD^': 
+	cat >expect <<-\EOF &&
+	HEAD^:a:(1|2)d(3|4)
+	HEAD^:b/b:(3|4)
+	HEAD^:submodule/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules HEAD^ >actual &&
+	test_cmp expect actual
+
+ok 10 - grep tree HEAD^
+
+expecting success of 7814.11 'grep tree HEAD^^': 
+	cat >expect <<-\EOF &&
+	HEAD^^:a:(1|2)d(3|4)
+	HEAD^^:b/b:(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules HEAD^^ >actual &&
+	test_cmp expect actual
+
+ok 11 - grep tree HEAD^^
+
+expecting success of 7814.12 'grep tree and pathspecs': 
+	cat >expect <<-\EOF &&
+	HEAD:submodule/a:(1|2)d(3|4)
+	HEAD:submodule/sub/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules HEAD -- submodule >actual &&
+	test_cmp expect actual
+
+ok 12 - grep tree and pathspecs
+
+expecting success of 7814.13 'grep tree and pathspecs': 
+	cat >expect <<-\EOF &&
+	HEAD:submodule/a:(1|2)d(3|4)
+	HEAD:submodule/sub/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodule*a" >actual &&
+	test_cmp expect actual
+
+ok 13 - grep tree and pathspecs
+
+expecting success of 7814.14 'grep tree and more pathspecs': 
+	cat >expect <<-\EOF &&
+	HEAD:submodule/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul?/a" >actual &&
+	test_cmp expect actual
+
+ok 14 - grep tree and more pathspecs
+
+expecting success of 7814.15 'grep tree and more pathspecs': 
+	cat >expect <<-\EOF &&
+	HEAD:submodule/sub/a:(1|2)d(3|4)
+	EOF
+
+	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul*/sub/a" >actual &&
+	test_cmp expect actual
+
+ok 15 - grep tree and more pathspecs
+
+expecting success of 7814.16 'grep recurse submodule colon in name': 
+	git init parent &&
+	test_when_finished "rm -rf parent" &&
+	echo "(1|2)d(3|4)" >"parent/fi:le" &&
+	git -C parent add "fi:le" &&
+	git -C parent commit -m "add fi:le" &&
+	test_tick &&
+
+	git init "su:b" &&
+	test_when_finished "rm -rf su:b" &&
+	echo "(1|2)d(3|4)" >"su:b/fi:le" &&
+	git -C "su:b" add "fi:le" &&
+	git -C "su:b" commit -m "add fi:le" &&
+	test_tick &&
+
+	test_config_global protocol.file.allow always &&
+	git -C parent submodule add "../su:b" "su:b" &&
+	git -C parent commit -m "add submodule" &&
+	test_tick &&
+
+	cat >expect <<-\EOF &&
+	fi:le:(1|2)d(3|4)
+	su:b/fi:le:(1|2)d(3|4)
+	EOF
+	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	HEAD:fi:le:(1|2)d(3|4)
+	HEAD:su:b/fi:le:(1|2)d(3|4)
+	EOF
+	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
+[master (root-commit) 8149a31] add fi:le
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fi:le
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/su:b/.git/
+[master (root-commit) 94095b4] add fi:le
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fi:le
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/su:b'...
+done.
+[master bedaa45] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 su:b
+ok 16 - grep recurse submodule colon in name
+
+expecting success of 7814.17 'grep history with moved submoules': 
+	git init parent &&
+	test_when_finished "rm -rf parent" &&
+	echo "(1|2)d(3|4)" >parent/file &&
+	git -C parent add file &&
+	git -C parent commit -m "add file" &&
+	test_tick &&
+
+	git init sub &&
+	test_when_finished "rm -rf sub" &&
+	echo "(1|2)d(3|4)" >sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add file" &&
+	test_tick &&
+
+	test_config_global protocol.file.allow always &&
+	git -C parent submodule add ../sub dir/sub &&
+	git -C parent commit -m "add submodule" &&
+	test_tick &&
+
+	cat >expect <<-\EOF &&
+	dir/sub/file:(1|2)d(3|4)
+	file:(1|2)d(3|4)
+	EOF
+	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
+	test_cmp expect actual &&
+
+	git -C parent mv dir/sub sub-moved &&
+	git -C parent commit -m "moved submodule" &&
+	test_tick &&
+
+	cat >expect <<-\EOF &&
+	file:(1|2)d(3|4)
+	sub-moved/file:(1|2)d(3|4)
+	EOF
+	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	HEAD^:dir/sub/file:(1|2)d(3|4)
+	HEAD^:file:(1|2)d(3|4)
+	EOF
+	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD^ >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
+[master (root-commit) 1d01947] add file
+ 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.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
+[master (root-commit) cc4006b] add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/dir/sub'...
+done.
+[master 9f8bb21] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 dir/sub
+[master cc98e46] moved submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename dir/sub => sub-moved (100%)
+ok 17 - grep history with moved submoules
+
+expecting success of 7814.18 'grep using relative path': 
+	test_when_finished "rm -rf parent sub" &&
+	git init sub &&
+	echo "(1|2)d(3|4)" >sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add file" &&
+	test_tick &&
+
+	git init parent &&
+	echo "(1|2)d(3|4)" >parent/file &&
+	git -C parent add file &&
+	mkdir parent/src &&
+	echo "(1|2)d(3|4)" >parent/src/file2 &&
+	git -C parent add src/file2 &&
+	test_config_global protocol.file.allow always &&
+	git -C parent submodule add ../sub &&
+	git -C parent commit -m "add files and submodule" &&
+	test_tick &&
+
+	# From top works
+	cat >expect <<-\EOF &&
+	file:(1|2)d(3|4)
+	src/file2:(1|2)d(3|4)
+	sub/file:(1|2)d(3|4)
+	EOF
+	git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
+	test_cmp expect actual &&
+
+	# Relative path to top
+	cat >expect <<-\EOF &&
+	../file:(1|2)d(3|4)
+	file2:(1|2)d(3|4)
+	../sub/file:(1|2)d(3|4)
+	EOF
+	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- .. >actual &&
+	test_cmp expect actual &&
+
+	# Relative path to submodule
+	cat >expect <<-\EOF &&
+	../sub/file:(1|2)d(3|4)
+	EOF
+	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- ../sub >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
+[master (root-commit) 41913eb] add file
+ 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.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/sub'...
+done.
+[master (root-commit) 014e5fc] add files and submodule
+ Author: A U Thor <author@example.com>
+ 4 files changed, 6 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 file
+ create mode 100644 src/file2
+ create mode 160000 sub
+ok 18 - grep using relative path
+
+expecting success of 7814.19 'grep from a subdir': 
+	test_when_finished "rm -rf parent sub" &&
+	git init sub &&
+	echo "(1|2)d(3|4)" >sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add file" &&
+	test_tick &&
+
+	git init parent &&
+	mkdir parent/src &&
+	echo "(1|2)d(3|4)" >parent/src/file &&
+	git -C parent add src/file &&
+	test_config_global protocol.file.allow always &&
+	git -C parent submodule add ../sub src/sub &&
+	git -C parent submodule add ../sub sub &&
+	git -C parent commit -m "add files and submodules" &&
+	test_tick &&
+
+	# Verify grep from root works
+	cat >expect <<-\EOF &&
+	src/file:(1|2)d(3|4)
+	src/sub/file:(1|2)d(3|4)
+	sub/file:(1|2)d(3|4)
+	EOF
+	git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
+	test_cmp expect actual &&
+
+	# Verify grep from a subdir works
+	cat >expect <<-\EOF &&
+	file:(1|2)d(3|4)
+	sub/file:(1|2)d(3|4)
+	EOF
+	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
+[master (root-commit) 1a98ea2] add file
+ 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.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/src/sub'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/sub'...
+done.
+[master (root-commit) ca3476d] add files and submodules
+ Author: A U Thor <author@example.com>
+ 4 files changed, 9 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 src/file
+ create mode 160000 src/sub
+ create mode 160000 sub
+ok 19 - grep from a subdir
+
+expecting success of 7814.20 '--recurse-submodules and --untracked are incompatible': 
+		test_must_fail git grep -e. --recurse-submodules --untracked 2>actual &&
+		test_grep 'not supported with --recurse-submodules' actual
+	
+fatal: --untracked not supported with --recurse-submodules
+ok 20 - --recurse-submodules and --untracked are incompatible
+
+expecting success of 7814.21 'grep --recurse-submodules --no-index ignores --recurse-submodules': 
+	git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual &&
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
+	EOF
+	test_cmp expect actual
+
+ok 21 - grep --recurse-submodules --no-index ignores --recurse-submodules
+
+expecting success of 7814.22 'grep --recurse-submodules should pass the pattern type along': 
+	# Fixed
+	test_must_fail git grep -F --recurse-submodules -e "(.|.)[\d]" &&
+	test_must_fail git -c grep.patternType=fixed grep --recurse-submodules -e "(.|.)[\d]" &&
+
+	# Basic
+	git grep -G --recurse-submodules -e "(.|.)[\d]" >actual &&
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
+	EOF
+	test_cmp expect actual &&
+	git -c grep.patternType=basic grep --recurse-submodules -e "(.|.)[\d]" >actual &&
+	test_cmp expect actual &&
+
+	# Extended
+	git grep -E --recurse-submodules -e "(.|.)[\d]" >actual &&
+	cat >expect <<-\EOF &&
+	.gitmodules:[submodule "submodule"]
+	.gitmodules:	path = submodule
+	.gitmodules:	url = ./submodule
+	a:(1|2)d(3|4)
+	submodule/.gitmodules:[submodule "sub"]
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
+	EOF
+	test_cmp expect actual &&
+	git -c grep.patternType=extended grep --recurse-submodules -e "(.|.)[\d]" >actual &&
+	test_cmp expect actual &&
+	git -c grep.extendedRegexp=true grep --recurse-submodules -e "(.|.)[\d]" >actual &&
+	test_cmp expect actual &&
+
+	# Perl
+	if test_have_prereq PCRE
+	then
+		git grep -P --recurse-submodules -e "(.|.)[\d]" >actual &&
+		cat >expect <<-\EOF &&
+		a:(1|2)d(3|4)
+		b/b:(3|4)
+		submodule/a:(1|2)d(3|4)
+		submodule/sub/a:(1|2)d(3|4)
+		EOF
+		test_cmp expect actual &&
+		git -c grep.patternType=perl grep --recurse-submodules -e "(.|.)[\d]" >actual &&
+		test_cmp expect actual
+	fi
+
+ok 22 - grep --recurse-submodules should pass the pattern type along
+
+expecting success of 7814.23 'grep --recurse-submodules with submodules without .gitmodules in the working tree': 
+	test_when_finished "git -C submodule checkout .gitmodules" &&
+	rm submodule/.gitmodules &&
+	git grep --recurse-submodules -e "(.|.)[\d]" >actual &&
 	cat >expect <<-\EOF &&
-	fatal: Not a valid object name HEAD2
+	a:(1|2)d(3|4)
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
 	EOF
-	test_must_fail git cat-file --textconv HEAD2 2>actual &&
 	test_cmp expect actual
 
-ok 2 - usage: <bad rev>
+Updated 1 path from the index
+ok 23 - grep --recurse-submodules with submodules without .gitmodules in the working tree
 
-expecting success of 8007.3 'usage: <bad rev>:<bad path>': 
-	cat >expect <<-\EOF &&
-	fatal: invalid object name 'HEAD2'.
-	EOF
-	test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
+expecting success of 7814.24 'grep --recurse-submodules without --cached considers worktree modifications': 
+	reset_and_clean &&
+	echo "A modified line in submodule" >>submodule/a &&
+	echo "submodule/a:A modified line in submodule" >expect &&
+	git grep --recurse-submodules "A modified line in submodule" >actual &&
 	test_cmp expect actual
 
-ok 3 - usage: <bad rev>:<bad path>
+HEAD is now at bea0037 updated submodule
+Removing .gitconfig
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+ok 24 - grep --recurse-submodules without --cached considers worktree modifications
 
-expecting success of 8007.4 'usage: <rev>:<bad path>': 
-	cat >expect <<-\EOF &&
-	fatal: path 'two.bin' does not exist in 'HEAD'
-	EOF
-	test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
-	test_cmp expect actual
+expecting success of 7814.25 'grep --recurse-submodules with --cached ignores worktree modifications': 
+	reset_and_clean &&
+	echo "A modified line in submodule" >>submodule/a &&
+	test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
+	test_must_be_empty actual
 
-ok 4 - usage: <rev>:<bad path>
+HEAD is now at bea0037 updated submodule
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+ok 25 - grep --recurse-submodules with --cached ignores worktree modifications
+
+checking known breakage of 7814.26 'grep --textconv: superproject .gitattributes does not affect submodules': 
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >.gitattributes &&
 
-expecting success of 8007.5 'usage: <rev> with no <path>': 
 	cat >expect <<-\EOF &&
-	fatal: <object>:<path> required, only <object> 'HEAD' given
+	a:(1|2)x(3|4)
 	EOF
-	test_must_fail git cat-file --textconv HEAD 2>actual &&
+	git grep --textconv --recurse-submodules x >actual &&
 	test_cmp expect actual
 
-ok 5 - usage: <rev> with no <path>
+HEAD is now at bea0037 updated submodule
+Removing actual
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+--- expect	2026-03-14 13:36:45.458677808 +0000
++++ actual	2026-03-14 13:36:45.550677808 +0000
+@@ -1 +1,3 @@
+ a:(1|2)x(3|4)
++submodule/a:(1|2)x(3|4)
++submodule/sub/a:(1|2)x(3|4)
+not ok 26 - grep --textconv: superproject .gitattributes does not affect submodules # TODO known breakage
+
+checking known breakage of 7814.27 'grep --textconv: superproject .gitattributes (from index) does not affect submodules': 
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >.gitattributes &&
+	git add .gitattributes &&
+	rm .gitattributes &&
 
-expecting success of 8007.6 'usage: <bad rev>:<good (in HEAD) path>': 
 	cat >expect <<-\EOF &&
-	fatal: invalid object name 'HEAD2'.
+	a:(1|2)x(3|4)
 	EOF
-	test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
+	git grep --textconv --recurse-submodules x >actual &&
 	test_cmp expect actual
 
-ok 6 - usage: <bad rev>:<good (in HEAD) path>
+HEAD is now at bea0037 updated submodule
+Removing .gitattributes
+Removing .gitconfig
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+--- expect	2026-03-14 13:36:46.462677808 +0000
++++ actual	2026-03-14 13:36:46.546677808 +0000
+@@ -1 +1,3 @@
+ a:(1|2)x(3|4)
++submodule/a:(1|2)x(3|4)
++submodule/sub/a:(1|2)x(3|4)
+not ok 27 - grep --textconv: superproject .gitattributes (from index) does not affect submodules # TODO known breakage
 
-expecting success of 8007.7 'no filter specified': 
-	git cat-file --textconv :one.bin >result &&
-	test_cmp expected result
+checking known breakage of 7814.28 'grep --textconv: superproject .git/info/attributes does not affect submodules': 
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	super_info="$(git rev-parse --git-path info)" &&
+	super_attr="$super_info/attributes" &&
+	test_when_finished "rm -f \"$super_attr\"" &&
+	mkdir "$super_info" &&
+	echo "a diff=d2x" >"$super_attr" &&
 
-ok 7 - no filter specified
+	cat >expect <<-\EOF &&
+	a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
 
-expecting success of 8007.8 'setup textconv filters': 
-	echo "*.bin diff=test" >.gitattributes &&
-	git config diff.test.textconv ./helper &&
-	git config diff.test.cachetextconv false
+HEAD is now at bea0037 updated submodule
+Removing .gitconfig
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+--- expect	2026-03-14 13:36:47.570677808 +0000
++++ actual	2026-03-14 13:36:47.642677808 +0000
+@@ -1 +1,3 @@
+ a:(1|2)x(3|4)
++submodule/a:(1|2)x(3|4)
++submodule/sub/a:(1|2)x(3|4)
+not ok 28 - grep --textconv: superproject .git/info/attributes does not affect submodules # TODO known breakage
 
-ok 8 - setup textconv filters
+checking known breakage of 7814.29 'grep --textconv correctly reads submodule .gitattributes': 
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >submodule/.gitattributes &&
 
-expecting success of 8007.9 'cat-file without --textconv': 
-	git cat-file blob :one.bin >result &&
-	test_cmp expected result
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
 
-ok 9 - cat-file without --textconv
+HEAD is now at bea0037 updated submodule
+Removing .gitconfig
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+--- expect	2026-03-14 13:36:48.694677808 +0000
++++ actual	2026-03-14 13:36:48.742677808 +0000
+@@ -1 +1,2 @@
+ submodule/a:(1|2)x(3|4)
++submodule/sub/a:(1|2)x(3|4)
+not ok 29 - grep --textconv correctly reads submodule .gitattributes # TODO known breakage
 
-expecting success of 8007.10 'cat-file without --textconv on previous commit': 
-	git cat-file -p HEAD^:one.bin >result &&
-	test_cmp expected result
+checking known breakage of 7814.30 'grep --textconv correctly reads submodule .gitattributes (from index)': 
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >submodule/.gitattributes &&
+	git -C submodule add .gitattributes &&
+	rm submodule/.gitattributes &&
 
-ok 10 - cat-file without --textconv on previous commit
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
 
-expecting success of 8007.11 'cat-file --textconv on last commit': 
-	git cat-file --textconv :one.bin >result &&
-	test_cmp expected result
+HEAD is now at bea0037 updated submodule
+Removing .gitconfig
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Removing .gitattributes
+Entering 'submodule/sub'
+not ok 30 - grep --textconv correctly reads submodule .gitattributes (from index) # TODO known breakage
 
-ok 11 - cat-file --textconv on last commit
+checking known breakage of 7814.31 'grep --textconv correctly reads submodule .git/info/attributes': 
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
 
-expecting success of 8007.12 'cat-file --textconv on previous commit': 
-	git cat-file --textconv HEAD^:one.bin >result &&
-	test_cmp expected result
+	submodule_info="$(git -C submodule rev-parse --path-format=absolute --git-path info)" &&
+	submodule_attr="$submodule_info/attributes" &&
+	test_when_finished "rm -f \"$submodule_attr\"" &&
+	echo "a diff=d2x" >"$submodule_attr" &&
 
-ok 12 - cat-file --textconv on previous commit
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
 
-expecting success of 8007.13 'cat-file without --textconv (symlink)': 
-	printf "%s" "one.bin" >expected &&
-	git cat-file blob :symlink.bin >result &&
-	test_cmp expected result
+HEAD is now at bea0037 updated submodule
+Removing .gitconfig
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+not ok 31 - grep --textconv correctly reads submodule .git/info/attributes # TODO known breakage
 
-ok 13 - cat-file without --textconv (symlink)
+checking known breakage of 7814.32 'grep saves textconv cache in the appropriate repository': 
+	reset_and_clean &&
+	test_config_global diff.d2x_cached.textconv "sed -e \"s/d/x/\"" &&
+	test_config_global diff.d2x_cached.cachetextconv true &&
+	echo "a diff=d2x_cached" >submodule/.gitattributes &&
 
-expecting success of 8007.14 'cat-file --textconv on index (symlink)': 
-	git cat-file --textconv :symlink.bin >result &&
-	test_cmp expected result
+	# We only read/write to the textconv cache when grepping from an OID,
+	# as the working tree file might have modifications.
+	git grep --textconv --cached --recurse-submodules x &&
 
-ok 14 - cat-file --textconv on index (symlink)
+	super_textconv_cache="$(git rev-parse --git-path refs/notes/textconv/d2x_cached)" &&
+	sub_textconv_cache="$(git -C submodule rev-parse \
+			--path-format=absolute --git-path refs/notes/textconv/d2x_cached)" &&
+	test_path_is_missing "$super_textconv_cache" &&
+	test_path_is_file "$sub_textconv_cache"
 
-expecting success of 8007.15 'cat-file --textconv on HEAD (symlink)': 
-	git cat-file --textconv HEAD:symlink.bin >result &&
-	test_cmp expected result
+HEAD is now at bea0037 updated submodule
+Removing .gitconfig
+Removing actual
+Removing expect
+Entering 'submodule'
+HEAD is now at d30b891 added sub
+Entering 'submodule/sub'
+HEAD is now at 0fb48cf add a
+Entering 'submodule'
+Entering 'submodule/sub'
+submodule/a:(1|2)x(3|4)
+submodule/sub/a:(1|2)x(3|4)
+Path exists:
+-rw-r--r-- 1 pbuilder2 pbuilder2 41 Mar 14 13:36 .git/refs/notes/textconv/d2x_cached
+not ok 32 - grep saves textconv cache in the appropriate repository # TODO known breakage
 
-ok 15 - cat-file --textconv on HEAD (symlink)
+expecting success of 7814.33 'grep partially-cloned submodule': 
+	# Set up clean superproject and submodule for partial cloning.
+	test_config_global protocol.file.allow always &&
+	git init super &&
+	git init super/sub &&
+	(
+		cd super &&
+		test_commit --no-tag "Add file in superproject" \
+			super-file "Some content for super-file" &&
+		test_commit -C sub --no-tag "Add file in submodule" \
+			sub-file "Some content for sub-file" &&
+		git submodule add ./sub &&
+		git commit -m "Add other as submodule sub" &&
+		test_tick &&
+		test_commit -C sub --no-tag --append "Update file in submodule" \
+			sub-file "Some more content for sub-file" &&
+		git add sub &&
+		git commit -m "Update submodule" &&
+		test_tick &&
+		git config --local uploadpack.allowfilter 1 &&
+		git config --local uploadpack.allowanysha1inwant 1 &&
+		git -C sub config --local uploadpack.allowfilter 1 &&
+		git -C sub config --local uploadpack.allowanysha1inwant 1
+	) &&
+	# Clone the superproject & submodule, then make sure we can lazy-fetch submodule objects.
+	git clone --filter=blob:none --also-filter-submodules \
+		--recurse-submodules "file://$(pwd)/super" partial &&
+	(
+		cd partial &&
+		cat >expect <<-\EOF &&
+		HEAD^:sub/sub-file:Some content for sub-file
+		HEAD^:super-file:Some content for super-file
+		EOF
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8008-blame-formats.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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)"
+		GIT_TRACE2_EVENT="$(pwd)/trace2.log" git grep -e content \
+			--recurse-submodules HEAD^ >actual &&
+		test_cmp expect actual &&
+		# Verify that we actually fetched data from the promisor remote:
+		grep \"category\":\"promisor\",\"key\":\"fetch_count\",\"value\":\"1\" trace2.log
+	)
 
-[master (root-commit) baf5e0b] one
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/super/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/super/sub/.git/
+[master (root-commit) 1314e8e] Add file in superproject
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 8825379] two
+ create mode 100644 super-file
+[master (root-commit) 1851742] Add file in submodule
  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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8006-blame-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8006-blame-textconv/.git/
-expecting success of 8006.1 'setup ': 
-	echo "bin: test number 0" >zero.bin &&
-	echo "bin: test 1" >one.bin &&
-	echo "bin: test number 2" >two.bin &&
-	test_ln_s_add one.bin symlink.bin &&
-	git add . &&
-	GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
-	echo "bin: test 1 version 2" >one.bin &&
-	echo "bin: test number 2 version 2" >>two.bin &&
-	rm -f symlink.bin &&
-	test_ln_s_add two.bin symlink.bin &&
-	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 6a76d70] First
- Author: Number1 <author@example.com>
- Date: Fri Jan 1 18:00:00 2010 +0000
- 5 files changed, 7 insertions(+)
- create mode 100755 helper
- create mode 100644 one.bin
- create mode 120000 symlink.bin
- create mode 100644 two.bin
- create mode 100644 zero.bin
-[master 940e3a6] Second
- Author: Number2 <author@example.com>
- Date: Fri Jan 1 20:00:00 2010 +0000
- 3 files changed, 3 insertions(+), 2 deletions(-)
-ok 1 - setup 
-
-expecting success of 8006.2 'no filter specified': 
-	git blame one.bin >blame &&
-	find_blame Number2 <blame >result &&
-	test_cmp expected result
-
-ok 2 - no filter specified
-
-expecting success of 8006.3 'setup textconv filters': 
-	echo "*.bin diff=test" >.gitattributes &&
-	echo "zero.bin eol=crlf" >>.gitattributes &&
-	git config diff.test.textconv ./helper &&
-	git config diff.test.cachetextconv false
-
-ok 3 - setup textconv filters
-
-expecting success of 8006.4 'blame with --no-textconv': 
-	git blame --no-textconv one.bin >blame &&
-	find_blame <blame> result &&
-	test_cmp expected result
-
-ok 4 - blame with --no-textconv
-
-expecting success of 8006.5 'basic blame on last commit': 
-	git blame one.bin >blame &&
-	find_blame  <blame >result &&
-	test_cmp expected result
-
-ok 5 - basic blame on last commit
-
-expecting success of 8006.6 'blame --textconv going through revisions': 
-	git blame --textconv two.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
-
-ok 6 - blame --textconv going through revisions
-
-expecting success of 8006.7 'blame --textconv with local changes': 
-	test_when_finished "git checkout zero.bin" &&
-	printf "bin: updated number 0\015" >zero.bin &&
-	git blame --textconv zero.bin >blame &&
-	expect="(Not Committed Yet ....-..-.. ..:..:.. +0000 1)" &&
-	expect="$expect converted: updated number 0" &&
-	expr "$(find_blame <blame)" : "^$expect"
-
-75
-Updated 1 path from the index
-ok 7 - blame --textconv with local changes
-
-expecting success of 8006.8 'setup +cachetextconv': 
-	git config diff.test.cachetextconv true
-
-ok 8 - setup +cachetextconv
-
-expecting success of 8006.9 'blame --textconv works with textconvcache': 
-	git blame --textconv two.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result &&
-	git blame --textconv one.bin >blame &&
-	find_blame  <blame >result &&
-	test_cmp expected_one result
-
-ok 9 - blame --textconv works with textconvcache
-
-expecting success of 8006.10 'setup -cachetextconv': 
-	git config diff.test.cachetextconv false
-
-ok 10 - setup -cachetextconv
-
-expecting success of 8006.11 'make a new commit': 
-	echo "bin: test number 2 version 3" >>two.bin &&
-	GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00"
-
-[master 31ce4ac] Third
- Author: Number3 <author@example.com>
- Date: Fri Jan 1 22:00:00 2010 +0000
  1 file changed, 1 insertion(+)
-ok 11 - make a new commit
+ create mode 100644 sub-file
+Adding existing repo at 'sub' to the index
+[master dc86339] Add other as submodule sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[master 289fae0] Update file in submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master db027f1] Update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'partial'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/super/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/partial/sub'...
+Submodule path 'sub': checked out '289fae02a658deff257301016761eff04f091022'
+{"event":"data","sid":"20260314T133654.012369Z-H5c947e1c-P00068358","thread":"th01:unknown","time":"2026-03-14T13:36:54.065556Z","file":"promisor-remote.c","line":53,"repo":2,"t_abs":0.053431,"t_rel":0.015738,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
+ok 33 - grep partially-cloned submodule
 
-expecting success of 8006.12 'blame from previous revision': 
-	git blame HEAD^ two.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+expecting success of 7814.34 'check scope of core.useReplaceRefs': 
+	git init base &&
+	git init base/sub &&
 
-ok 12 - blame from previous revision
+	echo A >base/a &&
+	echo B >base/b &&
+	echo C >base/sub/c &&
+	echo D >base/sub/d &&
 
-expecting success of 8006.13 'blame with --no-textconv (on symlink)': 
-	git blame --no-textconv symlink.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+	git -C base/sub add c d &&
+	git -C base/sub commit -m "Add files" &&
 
-ok 13 - blame with --no-textconv (on symlink)
+	git -C base submodule add ./sub &&
+	git -C base add a b sub &&
+	git -C base commit -m "Add files and submodule" &&
 
-expecting success of 8006.14 'blame --textconv (on symlink)': 
-	git blame --textconv symlink.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+	A=$(git -C base rev-parse HEAD:a) &&
+	B=$(git -C base rev-parse HEAD:b) &&
+	C=$(git -C base/sub rev-parse HEAD:c) &&
+	D=$(git -C base/sub rev-parse HEAD:d) &&
 
-ok 14 - blame --textconv (on symlink)
+	git -C base replace $A $B &&
+	git -C base/sub replace $C $D &&
 
-expecting success of 8006.15 'make another new commit': 
-	cat >three.bin <<\EOF &&
-bin: test number 2
-bin: test number 2 version 2
-bin: test number 2 version 3
-bin: test number 3
-EOF
-	git add three.bin &&
-	GIT_AUTHOR_NAME=Number4 git commit -a -m Fourth --date="2010-01-01 23:00:00"
+	test_must_fail git -C base grep --cached --recurse-submodules A &&
+	test_must_fail git -C base grep --cached --recurse-submodules C &&
 
-[master edd8eae] Fourth
- Author: Number4 <author@example.com>
- Date: Fri Jan 1 23:00:00 2010 +0000
- 1 file changed, 4 insertions(+)
- create mode 100644 three.bin
-ok 15 - make another new commit
+	git -C base config core.useReplaceRefs false &&
+	git -C base grep --recurse-submodules A &&
+	test_must_fail git -C base grep --cached --recurse-submodules C &&
 
-expecting success of 8006.16 'blame on last commit (-C -C, symlink)': 
-	git blame -C -C three.bin >blame &&
-	find_blame <blame >result &&
-	cat >expected <<\EOF &&
-(Number1 2010-01-01 18:00:00 +0000 1) converted: test number 2
-(Number2 2010-01-01 20:00:00 +0000 2) converted: test number 2 version 2
-(Number3 2010-01-01 22:00:00 +0000 3) converted: test number 2 version 3
-(Number4 2010-01-01 23:00:00 +0000 4) converted: test number 3
-EOF
-	test_cmp expected result
+	git -C base/sub config core.useReplaceRefs false &&
+	git -C base grep --cached --recurse-submodules A &&
+	git -C base grep --cached --recurse-submodules C &&
 
-ok 16 - blame on last commit (-C -C, symlink)
+	git -C base config --unset core.useReplaceRefs &&
+	test_must_fail git -C base grep --cached --recurse-submodules A &&
+	git -C base grep --cached --recurse-submodules C
 
-# passed all 16 test(s)
-1..16
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/base/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/base/sub/.git/
+[master (root-commit) fb269c5] Add files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c
+ create mode 100644 d
+Adding existing repo at 'sub' to the index
+[master (root-commit) 958c44c] Add files and submodule
+ Author: A U Thor <author@example.com>
+ 4 files changed, 6 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 a
+ create mode 100644 b
+ create mode 160000 sub
+a:A
+a:A
+sub/c:C
+sub/c:C
+ok 34 - check scope of core.useReplaceRefs
+
+# still have 7 known breakage(s)
+# passed all remaining 27 test(s)
+1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t8009-blame-vs-topicbranches.sh ***
@@ -502656,244 +504592,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8010-cat-file-filters.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8011-blame-split-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7810-grep.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7810-grep/.git/
 expecting success of 7810.1 'setup': 
@@ -505547,2468 +507245,2569 @@
 1..263
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8013-blame-ignore-revs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t8006-blame-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8006-blame-textconv/.git/
+expecting success of 8006.1 'setup ': 
+	echo "bin: test number 0" >zero.bin &&
+	echo "bin: test 1" >one.bin &&
+	echo "bin: test number 2" >two.bin &&
+	test_ln_s_add one.bin symlink.bin &&
+	git add . &&
+	GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
+	echo "bin: test 1 version 2" >one.bin &&
+	echo "bin: test number 2 version 2" >>two.bin &&
+	rm -f symlink.bin &&
+	test_ln_s_add two.bin symlink.bin &&
+	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
 
-	git blame --line-porcelain file >blame_raw &&
+checking prerequisite: SYMLINKS
 
-	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 &&
+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
 
-	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
+)
+prerequisite SYMLINKS ok
+[master (root-commit) 6a76d70] First
+ Author: Number1 <author@example.com>
+ Date: Fri Jan 1 18:00:00 2010 +0000
+ 5 files changed, 7 insertions(+)
+ create mode 100755 helper
+ create mode 100644 one.bin
+ create mode 120000 symlink.bin
+ create mode 100644 two.bin
+ create mode 100644 zero.bin
+[master 940e3a6] Second
+ Author: Number2 <author@example.com>
+ Date: Fri Jan 1 20:00:00 2010 +0000
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ok 1 - setup 
 
-[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 8006.2 'no filter specified': 
+	git blame one.bin >blame &&
+	find_blame Number2 <blame >result &&
+	test_cmp expected result
 
-expecting success of 8013.2 'validate --ignore-rev': 
-	test_must_fail git blame --ignore-rev X^{tree} file
+ok 2 - no filter specified
 
-fatal: cannot find revision X^{tree} to ignore
-ok 2 - validate --ignore-rev
+expecting success of 8006.3 'setup textconv filters': 
+	echo "*.bin diff=test" >.gitattributes &&
+	echo "zero.bin eol=crlf" >>.gitattributes &&
+	git config diff.test.textconv ./helper &&
+	git config diff.test.cachetextconv false
 
-expecting success of 8013.3 'validate --ignore-revs-file': 
-	git rev-parse X^{tree} >ignore_x &&
-	git blame --ignore-revs-file ignore_x file
+ok 3 - setup textconv filters
 
-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 8006.4 'blame with --no-textconv': 
+	git blame --no-textconv one.bin >blame &&
+	find_blame <blame> result &&
+	test_cmp expected result
 
-expecting success of 8013.4 'ignore_rev_changing_lines (X)': 
-		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+ok 4 - blame with --no-textconv
 
-		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 &&
+expecting success of 8006.5 'basic blame on last commit': 
+	git blame one.bin >blame &&
+	find_blame  <blame >result &&
+	test_cmp expected result
 
-		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)
+ok 5 - basic blame on last commit
 
-expecting success of 8013.5 'ignore_rev_changing_lines (XT)': 
-		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+expecting success of 8006.6 'blame --textconv going through revisions': 
+	git blame --textconv two.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
 
-		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 &&
+ok 6 - blame --textconv going through revisions
 
-		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 8006.7 'blame --textconv with local changes': 
+	test_when_finished "git checkout zero.bin" &&
+	printf "bin: updated number 0\015" >zero.bin &&
+	git blame --textconv zero.bin >blame &&
+	expect="(Not Committed Yet ....-..-.. ..:..:.. +0000 1)" &&
+	expect="$expect converted: updated number 0" &&
+	expr "$(find_blame <blame)" : "^$expect"
 
-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 &&
+75
+Updated 1 path from the index
+ok 7 - blame --textconv with local changes
 
-	git rev-parse Y >expect &&
-	git blame --line-porcelain file --ignore-rev Y >blame_raw &&
+expecting success of 8006.8 'setup +cachetextconv': 
+	git config diff.test.cachetextconv true
 
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 3/s/ .*//p" blame_raw >actual &&
-	test_cmp expect actual &&
+ok 8 - setup +cachetextconv
 
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 4/s/ .*//p" blame_raw >actual &&
-	test_cmp expect actual
+expecting success of 8006.9 'blame --textconv works with textconvcache': 
+	git blame --textconv two.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result &&
+	git blame --textconv one.bin >blame &&
+	find_blame  <blame >result &&
+	test_cmp expected_one result
 
-[master e0d35d6] Y
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 2 deletions(-)
-ok 6 - ignore_rev_adding_unblamable_lines
+ok 9 - blame --textconv works with textconvcache
 
-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 &&
+expecting success of 8006.10 'setup -cachetextconv': 
+	git config diff.test.cachetextconv false
 
-	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 &&
+ok 10 - setup -cachetextconv
 
-	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
+expecting success of 8006.11 'make a new commit': 
+	echo "bin: test number 2 version 3" >>two.bin &&
+	GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00"
 
-ok 7 - ignore_revs_from_files
+[master 31ce4ac] Third
+ Author: Number3 <author@example.com>
+ Date: Fri Jan 1 22:00:00 2010 +0000
+ 1 file changed, 1 insertion(+)
+ok 11 - make a new commit
 
-expecting success of 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 &&
+expecting success of 8006.12 'blame from previous revision': 
+	git blame HEAD^ two.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
 
-	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 &&
+ok 12 - blame from previous revision
 
-	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
+expecting success of 8006.13 'blame with --no-textconv (on symlink)': 
+	git blame --no-textconv symlink.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
 
-ok 8 - ignore_revs_from_configs_and_files
+ok 13 - blame with --no-textconv (on symlink)
 
-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 &&
+expecting success of 8006.14 'blame --textconv (on symlink)': 
+	git blame --textconv symlink.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
 
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-	test_cmp expect actual &&
+ok 14 - blame --textconv (on symlink)
 
-	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 8006.15 'make another new commit': 
+	cat >three.bin <<\EOF &&
+bin: test number 2
+bin: test number 2 version 2
+bin: test number 2 version 3
+bin: test number 3
+EOF
+	git add three.bin &&
+	GIT_AUTHOR_NAME=Number4 git commit -a -m Fourth --date="2010-01-01 23:00:00"
 
-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 &&
+[master edd8eae] Fourth
+ Author: Number4 <author@example.com>
+ Date: Fri Jan 1 23:00:00 2010 +0000
+ 1 file changed, 4 insertions(+)
+ create mode 100644 three.bin
+ok 15 - make another new commit
 
-	test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
-	test_grep "could not open.*: NOFILE" err &&
+expecting success of 8006.16 'blame on last commit (-C -C, symlink)': 
+	git blame -C -C three.bin >blame &&
+	find_blame <blame >result &&
+	cat >expected <<\EOF &&
+(Number1 2010-01-01 18:00:00 +0000 1) converted: test number 2
+(Number2 2010-01-01 20:00:00 +0000 2) converted: test number 2 version 2
+(Number3 2010-01-01 22:00:00 +0000 3) converted: test number 2 version 3
+(Number4 2010-01-01 23:00:00 +0000 4) converted: test number 3
+EOF
+	test_cmp expected result
 
-	echo NOREV >ignore_norev &&
-	test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
-	test_grep "invalid object name: NOREV" err
+ok 16 - blame on last commit (-C -C, symlink)
 
-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
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t8010-cat-file-filters.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8010-cat-file-filters/.git/
+expecting success of 8010.1 'setup ': 
+	echo "*.txt eol=crlf diff=txt" >.gitattributes &&
+	echo "hello" | append_cr >world.txt &&
+	git add .gitattributes world.txt &&
+	test_tick &&
+	git commit -m "Initial commit"
 
-expecting success of 8013.11 'mark_unblamable_lines': 
-	git config --add blame.markUnblamableLines true &&
+[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 
 
-	git blame --ignore-rev Y file >blame_raw &&
-	echo "*" >expect &&
+expecting success of 8010.2 'no filters with `git show`': 
+	git show HEAD:world.txt >actual &&
+	! has_cr 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
+ok 2 - no filters with `git show`
 
-ok 11 - mark_unblamable_lines
+expecting success of 8010.3 'no filters with cat-file': 
+	git cat-file blob HEAD:world.txt >actual &&
+	! has_cr actual
 
-expecting success of 8013.12 'mark_ignored_lines': 
-	git config --add blame.markIgnoredLines true &&
+ok 3 - no filters with cat-file
 
-	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 8010.4 'cat-file --filters converts to worktree version': 
+	git cat-file --filters HEAD:world.txt >actual &&
+	has_cr actual
 
-	git blame --ignore-rev Z file >blame_raw &&
-	echo "?" >expect &&
+ok 4 - cat-file --filters converts to worktree version
 
-	sed -n "1p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
+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
 
-	sed -n "2p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
+ok 5 - cat-file --filters --path=<path> works
 
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	! test_cmp expect actual &&
+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)"
 
-	sed -n "4p" blame_raw | cut -c1 >actual &&
-	! test_cmp expect actual
+ok 6 - cat-file --textconv --path=<path> works
 
-[master d1e4550] Z
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
---- expect	2025-02-09 06:55:22.858214848 +0000
-+++ actual	2025-02-09 06:55:22.874214950 +0000
-@@ -1 +1 @@
--?
-+e
---- expect	2025-02-09 06:55:22.858214848 +0000
-+++ actual	2025-02-09 06:55:22.878214975 +0000
-@@ -1 +1 @@
--?
-+e
-ok 12 - mark_ignored_lines
+expecting success of 8010.7 '--path=<path> complains without --textconv/--filters': 
+	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
+	test_must_fail git cat-file --path=hello.txt blob $sha1 >actual 2>err &&
+	test_must_be_empty actual &&
+	grep "path.*needs.*filters" err
 
-expecting success of 8013.13 'mark_unblamable_lines_intermediate': 
-	git config --add blame.markUnblamableLines true &&
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 7 - --path=<path> complains without --textconv/--filters
 
-	git blame --ignore-rev Y file >blame_raw 2>stderr &&
-	echo "*" >expect &&
+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
 
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
+fatal: <object>:<path> required, only <object> 'HEAD' given
+fatal: <object>:<path> required, only <object> 'HEAD' given
+ok 8 - --textconv/--filters complain without path
 
-	sed -n "4p" blame_raw | cut -c1 >actual &&
+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 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 &&
+ok 9 - cat-file --textconv --batch works
 
-	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 &&
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t8011-blame-split-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
 
-	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 &&
+	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 &&
 
-	git blame file --ignore-rev B >blame_raw
+	cat one two >combined &&
+	git add combined &&
+	git rm one two &&
+	test_commit combined
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8013-blame-ignore-revs/.git/
-[master (root-commit) 0157998] A
+[master (root-commit) ad6b874] base
  Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 file
-[master a8e635b] B
+ 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>
- 1 file changed, 4 insertions(+)
-[master 3b3594b] C
+ 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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - ignored_chunk_negative_parent_size
+ 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 8013.15 'ignore_merge': 
-	rm -rf .git/ &&
-	git init &&
+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();
 
-	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 &&
+	sub flush {
+		return unless defined $hash;
+		if (defined $cache{$hash}) {
+			print "$cache{$hash}\n";
+		} else {
+			print "NONE\n";
+		}
+	}
+	EOF
 
-	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 &&
+ok 2 - setup simulated porcelain
 
-	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 8011.3 'generate --porcelain output': 
+		git blame --root -C --$output combined >output
+	
+ok 3 - generate --porcelain output
 
-	test_merge M B &&
-	git blame --line-porcelain file --ignore-rev M >blame_raw &&
+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
 
-	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 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
 
-	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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 8011.7 'generate --line-porcelain output': 
+		git blame --root -C --$output combined >output
+	
+ok 7 - generate --line-porcelain output
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8001-annotate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8001-annotate/.git/
-expecting success of 8001.1 'setup A lines': 
-	echo "1A quick brown fox jumps over the" >file &&
-	echo "lazy dog" >>file &&
-	git add file &&
-	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
-	git commit -a -m "Initial."
+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
 
-[main (root-commit) 129283d] Initial.
- Author: A <A@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-ok 1 - setup A lines
+expecting success of 8011.9 'line-porcelain output shows correct filenames': 
+		generate_expect >expect <<-\EOF &&
+		11 one
+		11 two
+		EOF
+		perl read-porcelain.pl filename <output >actual &&
+		test_cmp expect actual
+	
+ok 9 - line-porcelain output shows correct filenames
 
-expecting success of 8001.2 'blame 1 author': 
-	check_count A 2
+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
 
-git annotate  file 
-Author A (expected 2, attributed 2) good
-ok 2 - blame 1 author
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7400-submodule-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/
+expecting success of 7400.1 'setup - enable local submodules': 
+	git config --global protocol.file.allow always
 
-expecting success of 8001.3 'blame working copy': 
-	test_when_finished "git restore file" &&
-	echo "1A quick brown fox jumps over the" >file &&
-	echo "another lazy dog" >>file &&
-	check_count A 1 "Not Committed Yet" 1
+ok 1 - setup - enable local submodules
 
-git annotate  file 
-Author Not Committed Yet (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 3 - blame working copy
+expecting success of 7400.2 'submodule usage: -h': 
+	git submodule -h >out 2>err &&
+	grep "^usage: git submodule" out &&
+	test_must_be_empty err
 
-expecting success of 8001.4 'blame with --contents': 
-	check_count --contents=file A 2
+usage: git submodule [--quiet] [--cached]
+ok 2 - submodule usage: -h
 
-git annotate  --contents=file file 
-Author A (expected 2, attributed 2) good
-ok 4 - blame with --contents
+expecting success of 7400.3 'submodule usage: --recursive': 
+	test_expect_code 1 git submodule --recursive >out 2>err &&
+	grep "^usage: git submodule" err &&
+	test_must_be_empty out
 
-expecting success of 8001.5 'blame with --contents in a bare repo': 
-	git clone --bare . bare-contents.git &&
-	(
-		cd bare-contents.git &&
-		echo "1A quick brown fox jumps over the" >contents &&
-		check_count --contents=contents A 1
-	)
+usage: git submodule [--quiet] [--cached]
+ok 3 - submodule usage: --recursive
 
-Cloning into bare repository 'bare-contents.git'...
-done.
-git annotate  --contents=contents file 
-Author A (expected 1, attributed 1) good
-ok 5 - blame with --contents in a bare repo
+expecting success of 7400.4 'submodule usage: status --': 
+	test_expect_code 1 git submodule -- &&
+	test_expect_code 1 git submodule --end-of-options
 
-expecting success of 8001.6 'blame with --contents changed': 
-	echo "1A quick brown fox jumps over the" >contents &&
-	echo "another lazy dog" >>contents &&
-	check_count --contents=contents A 1 "External file (--contents)" 1
+usage: git submodule [--quiet] [--cached]
+   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
+   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] init [--] [<path>...]
+   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
+   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
+   or: git submodule [--quiet] set-url [--] <path> <newurl>
+   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
+   or: git submodule [--quiet] foreach [--recursive] <command>
+   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
+usage: git submodule [--quiet] [--cached]
+   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
+   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] init [--] [<path>...]
+   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
+   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
+   or: git submodule [--quiet] set-url [--] <path> <newurl>
+   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
+   or: git submodule [--quiet] foreach [--recursive] <command>
+   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
+ok 4 - submodule usage: status --
 
-git annotate  --contents=contents file 
-Author A (expected 1, attributed 1) good
-Author External file (--contents) (expected 1, attributed 1) good
-ok 6 - blame with --contents changed
+expecting success of 7400.5 'submodule usage: status --quiet': 
+		git submodule $opt &&
+		git submodule status $opt &&
+		git submodule $opt status
+	
+ok 5 - submodule usage: status --quiet
 
-expecting success of 8001.7 'blame in a bare repo without starting commit': 
-	git clone --bare . bare.git &&
-	(
-		cd bare.git &&
-		check_count A 2
-	)
+expecting success of 7400.6 'submodule usage: status --cached': 
+		git submodule $opt &&
+		git submodule status $opt &&
+		git submodule $opt status
+	
+ok 6 - submodule usage: status --cached
 
-Cloning into bare repository 'bare.git'...
-done.
-git annotate  file 
-Author A (expected 2, attributed 2) good
-ok 7 - blame in a bare repo without starting commit
+expecting success of 7400.7 'submodule deinit works on empty repository': 
+	git submodule deinit --all
 
-expecting success of 8001.8 'blame by tag objects': 
-	git tag -m "test tag" testTag &&
-	git tag -m "test tag #2" testTag2 testTag &&
-	check_count -h testTag A 2 &&
-	check_count -h testTag2 A 2
+ok 7 - submodule deinit works on empty repository
 
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f testTag2 testTag^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-git annotate  file testTag
-Author A (expected 2, attributed 2) good
-git annotate  file testTag2
-Author A (expected 2, attributed 2) good
-ok 8 - blame by tag objects
+expecting success of 7400.8 'setup - initial commit': 
+	>t &&
+	git add t &&
+	git commit -m "initial commit" &&
+	git branch initial
 
-expecting success of 8001.9 'setup B lines': 
-	echo "2A quick brown fox jumps over the" >>file &&
-	echo "lazy dog" >>file &&
-	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
-	git commit -a -m "Second."
+[main (root-commit) 8f98e77] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+ok 8 - setup - initial commit
 
-[main 7e31098] Second.
- Author: B <B@test.git>
- 1 file changed, 2 insertions(+)
-ok 9 - setup B lines
+expecting success of 7400.9 'submodule init aborts on missing .gitmodules file': 
+	test_when_finished "git update-index --remove sub" &&
+	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+	# missing the .gitmodules file here
+	test_must_fail git submodule init 2>actual &&
+	test_grep "No url found for submodule path" actual
 
-expecting success of 8001.10 'blame 2 authors': 
-	check_count A 2 B 2
+fatal: No url found for submodule path 'sub' in .gitmodules
+ok 9 - submodule init aborts on missing .gitmodules file
 
-git annotate  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
-ok 10 - blame 2 authors
+expecting success of 7400.10 'submodule update aborts on missing .gitmodules file': 
+	test_when_finished "git update-index --remove sub" &&
+	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+	# missing the .gitmodules file here
+	git submodule update sub 2>actual &&
+	test_grep "Submodule path .sub. not initialized" actual
 
-expecting success of 8001.11 'blame with --contents and revision': 
-	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
+Submodule path 'sub' not initialized
+ok 10 - submodule update aborts on missing .gitmodules file
 
-git annotate  --contents=file file testTag
-Author External file (--contents) (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 11 - blame with --contents and revision
+expecting success of 7400.11 'submodule update aborts on missing gitmodules url': 
+	test_when_finished "git update-index --remove sub" &&
+	git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
+	test_when_finished "rm -f .gitmodules" &&
+	git config -f .gitmodules submodule.s.path sub &&
+	test_must_fail git submodule init
 
-expecting success of 8001.12 'setup B1 lines (branch1)': 
-	git checkout -b branch1 main &&
-	echo "3A slow green fox jumps into the" >>file &&
-	echo "well." >>file &&
-	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
-	git commit -a -m "Branch1-1"
+fatal: No url found for submodule path 'sub' in .gitmodules
+ok 11 - submodule update aborts on missing gitmodules url
 
-Switched to a new branch 'branch1'
-[branch1 1b9b47a] Branch1-1
- Author: B1 <B1@test.git>
- 1 file changed, 2 insertions(+)
-ok 12 - setup B1 lines (branch1)
+expecting success of 7400.12 'add aborts on repository with no commits': 
+	cat >expect <<-\EOF &&
+	fatal: 'repo-no-commits' does not have a commit checked out
+	EOF
+	git init repo-no-commits &&
+	test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
+	test_cmp expect actual
 
-expecting success of 8001.13 'blame 2 authors + 1 branch1 author': 
-	check_count A 2 B 2 B1 2
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo-no-commits/.git/
+ok 12 - add aborts on repository with no commits
 
-git annotate  file 
-Author B (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 13 - blame 2 authors + 1 branch1 author
+expecting success of 7400.13 'status should ignore inner git repo when not added': 
+	rm -fr inner &&
+	mkdir inner &&
+	(
+		cd inner &&
+		git init &&
+		>t &&
+		git add t &&
+		git commit -m "initial"
+	) &&
+	test_must_fail git submodule status inner 2>output.err &&
+	rm -fr inner &&
+	test_grep "^error: .*did not match any file(s) known to git" output.err
 
-expecting success of 8001.14 'setup B2 lines (branch2)': 
-	git checkout -b branch2 main &&
-	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
-	git commit -a -m "Branch2-1"
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/inner/.git/
+[main (root-commit) 0ce53a8] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+error: pathspec 'inner' did not match any file(s) known to git
+ok 13 - status should ignore inner git repo when not added
 
-Switched to a new branch 'branch2'
-[branch2 7d77deb] Branch2-1
- Author: B2 <B2@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - setup B2 lines (branch2)
+expecting success of 7400.14 'setup - repository in init subdirectory': 
+	mkdir init &&
+	(
+		cd init &&
+		git init &&
+		echo a >a &&
+		git add a &&
+		git commit -m "submodule commit 1" &&
+		git tag -a -m "rev-1" rev-1
+	)
 
-expecting success of 8001.15 'blame 2 authors + 1 branch2 author': 
-	check_count A 2 B 1 B2 1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init/.git/
+[main (root-commit) 36aca32] submodule commit 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 14 - setup - repository in init subdirectory
 
-git annotate  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 15 - blame 2 authors + 1 branch2 author
+expecting success of 7400.15 'setup - commit with gitlink': 
+	echo a >a &&
+	echo z >z &&
+	git add a init z &&
+	git commit -m "super commit 1"
 
-expecting success of 8001.16 'merge branch1 & branch2': 
-	git merge branch1
+warning: adding embedded git repository: init
+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> init
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached init
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main 23ad8e1] super commit 1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a
+ create mode 160000 init
+ create mode 100644 z
+ok 15 - setup - commit with gitlink
 
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 ++
- 1 file changed, 2 insertions(+)
-ok 16 - merge branch1 & branch2
+expecting success of 7400.16 'setup - hide init subdirectory': 
+	mv init .subrepo
 
-expecting success of 8001.17 'blame 2 authors + 2 merged-in authors': 
-	check_count A 2 B 1 B1 2 B2 1
+ok 16 - setup - hide init subdirectory
 
-git annotate  file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
-ok 17 - blame 2 authors + 2 merged-in authors
+expecting success of 7400.17 'setup - repository to add submodules to': 
+	git init addtest &&
+	git init addtest-ignore
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest-ignore/.git/
+ok 17 - setup - repository to add submodules to
 
-git annotate  --first-parent file 
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-ok 18 - blame --first-parent blames merge for branch1
+expecting success of 7400.18 'submodule add': 
+	echo "refs/heads/main" >expect &&
 
-expecting success of 8001.19 'blame ancestor': 
-	check_count -h main A 2 B 2
+	(
+		cd addtest &&
+		git submodule add -q "$submodurl" submod >actual &&
+		test_must_be_empty actual &&
+		echo "gitdir: ../.git/modules/submod" >expect &&
+		test_cmp expect submod/.git &&
+		(
+			cd submod &&
+			git config core.worktree >actual &&
+			echo "../../../submod" >expect &&
+			test_cmp expect actual &&
+			rm -f actual expect
+		) &&
+		git submodule init
+	) &&
 
-git annotate  file main
-Author B (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 19 - blame ancestor
+	rm -f heads head untracked &&
+	inspect addtest/submod ../.. &&
+	test_cmp expect heads &&
+	test_cmp expect head &&
+	test_must_be_empty untracked
 
-expecting success of 8001.20 'blame great-ancestor': 
-	check_count -h main^ A 2
+ok 18 - submodule add
 
-git annotate  file main^
-Author A (expected 2, attributed 2) good
-ok 20 - blame great-ancestor
+expecting success of 7400.19 'submodule add (absolute path)': 
+	test_when_finished "git reset --hard" &&
+	git submodule add "$submodurl" "$submodurl/add-abs"
 
-expecting success of 8001.21 'setup evil merge': 
-	echo "evil merge." >>file &&
-	git commit -a --amend
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/add-abs'...
+done.
+warning: unable to rmdir 'add-abs': Directory not empty
+HEAD is now at 23ad8e1 super commit 1
+ok 19 - submodule add (absolute path)
 
-[branch2 c413b3e] Merge branch 'branch1' into branch2
+expecting success of 7400.20 'setup parent and one repository': 
+	test_create_repo parent &&
+	test_commit -C parent one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/parent/.git/
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-ok 21 - setup evil merge
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 20 - setup parent and one repository
 
-expecting success of 8001.22 'blame evil merge': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
+expecting success of 7400.21 'redirected submodule add does not show progress': 
+	git -C addtest submodule add "file://$submodurl/parent" submod-redirected \
+		2>err &&
+	! grep % err &&
+	test_grep ! "Checking connectivity" err
 
-git annotate  file 
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 22 - blame evil merge
+ok 21 - redirected submodule add does not show progress
 
-expecting success of 8001.23 'blame huge graft': 
-	test_when_finished "git checkout branch2" &&
-	test_when_finished "rm -rf .git/info" &&
-	graft= &&
-	for i in 0 1 2
-	do
-		for j in 0 1 2 3 4 5 6 7 8 9
-		do
-			git checkout --orphan "$i$j" &&
-			printf "%s\n" "$i" "$j" >file &&
-			test_tick &&
-			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
-			git commit -a -m "$i$j" &&
-			commit=$(git rev-parse --verify HEAD) &&
-			graft="$graft$commit " || return 1
-		done
-	done &&
-	mkdir .git/info &&
-	printf "%s " $graft >.git/info/grafts &&
-	check_count -h 00 01 1 10 1
+expecting success of 7400.22 'redirected submodule add --progress does show progress': 
+	git -C addtest submodule add --progress "file://$submodurl/parent" \
+		submod-redirected-progress 2>err && \
+	grep % err
 
-Switched to a new branch '00'
-[00 (root-commit) e2c6177] 00
- Author: 00 <00@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '01'
-[01 (root-commit) 0dbe04b] 01
- Author: 01 <01@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '02'
-[02 (root-commit) 97fbca6] 02
- Author: 02 <02@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '03'
-[03 (root-commit) 5cdbcd8] 03
- Author: 03 <03@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '04'
-[04 (root-commit) 5a154cf] 04
- Author: 04 <04@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '05'
-[05 (root-commit) a84e1de] 05
- Author: 05 <05@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '06'
-[06 (root-commit) d4bea54] 06
- Author: 06 <06@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '07'
-[07 (root-commit) 24ba6e8] 07
- Author: 07 <07@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '08'
-[08 (root-commit) fe90088] 08
- Author: 08 <08@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '09'
-[09 (root-commit) 773a2fb] 09
- Author: 09 <09@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '10'
-[10 (root-commit) 80536e5] 10
- Author: 10 <10@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '11'
-[11 (root-commit) 33c07c1] 11
- Author: 11 <11@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '12'
-[12 (root-commit) ae7094b] 12
- Author: 12 <12@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '13'
-[13 (root-commit) 19e767d] 13
- Author: 13 <13@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '14'
-[14 (root-commit) f7159ac] 14
- Author: 14 <14@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '15'
-[15 (root-commit) d95fecf] 15
- Author: 15 <15@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '16'
-[16 (root-commit) d8bfdb9] 16
- Author: 16 <16@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '17'
-[17 (root-commit) aa3f31e] 17
- Author: 17 <17@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '18'
-[18 (root-commit) d76cb1d] 18
- Author: 18 <18@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '19'
-[19 (root-commit) 95e03c5] 19
- Author: 19 <19@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '20'
-[20 (root-commit) d40a964] 20
- Author: 20 <20@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '21'
-[21 (root-commit) 6c3def2] 21
- Author: 21 <21@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '22'
-[22 (root-commit) 78d2294] 22
- Author: 22 <22@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '23'
-[23 (root-commit) 76a64d0] 23
- Author: 23 <23@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '24'
-[24 (root-commit) 59f234a] 24
- Author: 24 <24@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '25'
-[25 (root-commit) 26ac47a] 25
- Author: 25 <25@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '26'
-[26 (root-commit) db7e855] 26
- Author: 26 <26@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '27'
-[27 (root-commit) 279f565] 27
- Author: 27 <27@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '28'
-[28 (root-commit) f691d9c] 28
- Author: 28 <28@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '29'
-[29 (root-commit) c72134e] 29
- Author: 29 <29@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-git annotate  file 00
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-Author 01 (expected 1, attributed 1) good
-Author 10 (expected 1, attributed 1) good
-Switched to branch 'branch2'
-ok 23 - blame huge graft
+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 22 - redirected submodule add --progress does show progress
 
-expecting success of 8001.24 'setup incomplete line': 
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
-	git commit -a -m "Incomplete"
+expecting success of 7400.23 'submodule add to .gitignored path fails': 
+	(
+		cd addtest-ignore &&
+		cat <<-\EOF >expect &&
+		The following paths are ignored by one of your .gitignore files:
+		submod
+		hint: Use -f if you really want to add them.
+		hint: Disable this message with "git config set advice.addIgnoredFile false"
+		EOF
+		# Does not use test_commit due to the ignore
+		echo "*" > .gitignore &&
+		git add --force .gitignore &&
+		git commit -m"Ignore everything" &&
+		! git submodule add "$submodurl" submod >actual 2>&1 &&
+		test_cmp expect actual
+	)
 
-[branch2 565fef5] Incomplete
- Author: C <C@test.git>
+[main (root-commit) 29c0beb] Ignore everything
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 24 - setup incomplete line
+ create mode 100644 .gitignore
+ok 23 - submodule add to .gitignored path fails
 
-expecting success of 8001.25 'blame incomplete line': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
+expecting success of 7400.24 'submodule add to .gitignored path with --force': 
+	(
+		cd addtest-ignore &&
+		git submodule add --force "$submodurl" submod
+	)
 
-git annotate  file 
-Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-ok 25 - blame incomplete line
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest-ignore/submod'...
+done.
+ok 24 - submodule add to .gitignored path with --force
 
-expecting success of 8001.26 'setup edits': 
-	mv file file.orig &&
-	{
-		cat file.orig &&
-		echo
-	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
-	git commit -a -m "edit"
+expecting success of 7400.25 'submodule add to path with tracked content fails': 
+	(
+		cd addtest &&
+		echo "fatal: 'dir-tracked' already exists in the index" >expect &&
+		mkdir dir-tracked &&
+		test_commit foo dir-tracked/bar &&
+		test_must_fail git submodule add "$submodurl" dir-tracked >actual 2>&1 &&
+		test_cmp expect actual
+	)
 
-[branch2 96588b8] edit
- Author: D <D@test.git>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 26 - setup edits
+[main (root-commit) 3a7133b] foo
+ Author: A U Thor <author@example.com>
+ 5 files changed, 13 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 dir-tracked/bar
+ create mode 160000 submod
+ create mode 160000 submod-redirected
+ create mode 160000 submod-redirected-progress
+ok 25 - submodule add to path with tracked content fails
 
-expecting success of 8001.27 'blame edits': 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
+expecting success of 7400.26 'submodule add to reconfigure existing submodule with --force': 
+	(
+		cd addtest-ignore &&
+		bogus_url="$(pwd)/bogus-url" &&
+		git submodule add --force "$bogus_url" submod &&
+		git submodule add --force -b initial "$submodurl" submod-branch &&
+		test "$bogus_url" = "$(git config -f .gitmodules submodule.submod.url)" &&
+		test "$bogus_url" = "$(git config submodule.submod.url)" &&
+		# Restore the url
+		git submodule add --force "$submodurl" submod &&
+		test "$submodurl" = "$(git config -f .gitmodules submodule.submod.url)" &&
+		test "$submodurl" = "$(git config submodule.submod.url)"
+	)
 
-git annotate  file 
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 27 - blame edits
+Adding existing repo at 'submod' to the index
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest-ignore/submod-branch'...
+done.
+Adding existing repo at 'submod' to the index
+ok 26 - submodule add to reconfigure existing submodule with --force
 
-expecting success of 8001.28 'setup obfuscated email': 
-	echo "No robots allowed" >file.new &&
-	cat file >>file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
-	git commit -a -m "norobots"
+expecting success of 7400.27 'submodule add relays add --dry-run stderr': 
+	test_when_finished "rm -rf addtest/.git/index.lock" &&
+	(
+		cd addtest &&
+		: >.git/index.lock &&
+		! git submodule add "$submodurl" sub-while-locked 2>output.err &&
+		test_grep "^fatal: .*index\.lock" output.err &&
+		test_path_is_missing sub-while-locked
+	)
 
-[branch2 04f7693] norobots
- Author: E <E at test dot git>
- 1 file changed, 1 insertion(+)
-ok 28 - setup obfuscated email
+fatal: Unable to create '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/.git/index.lock': File exists.
+ok 27 - submodule add relays add --dry-run stderr
 
-expecting success of 8001.29 'blame obfuscated email': 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+expecting success of 7400.28 'submodule add --branch': 
+	echo "refs/heads/initial" >expect-head &&
+	cat <<-\EOF >expect-heads &&
+	refs/heads/initial
+	refs/heads/main
+	EOF
 
-git annotate  file 
-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 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 29 - blame obfuscated email
+	(
+		cd addtest &&
+		git submodule add -b initial "$submodurl" submod-branch &&
+		test "initial" = "$(git config -f .gitmodules submodule.submod-branch.branch)" &&
+		git submodule init
+	) &&
 
-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
+	rm -f heads head untracked &&
+	inspect addtest/submod-branch ../.. &&
+	test_cmp expect-heads heads &&
+	test_cmp expect-head head &&
+	test_must_be_empty untracked
 
-git annotate  -L1 file 
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author D (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 B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 30 - blame -L 1 (all)
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/submod-branch'...
+done.
+ok 28 - submodule add --branch
 
-expecting success of 8001.31 'blame -L , (all)': 
-	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+expecting success of 7400.29 'submodule add with ./ in path': 
+	echo "refs/heads/main" >expect &&
 
-git annotate  -L, file 
-Author E (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 A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 31 - blame -L , (all)
+	(
+		cd addtest &&
+		git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
+		git submodule init
+	) &&
 
-expecting success of 8001.32 'blame -L X (X to end)': 
-	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
+	rm -f heads head untracked &&
+	inspect addtest/dotsubmod/frotz ../../.. &&
+	test_cmp expect heads &&
+	test_cmp expect head &&
+	test_must_be_empty untracked
 
-git annotate  -L5 file 
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 32 - blame -L X (X to end)
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/dotsubmod/frotz'...
+done.
+ok 29 - submodule add with ./ in path
 
-expecting success of 8001.33 'blame -L X, (X to end)': 
-	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
+expecting success of 7400.30 'submodule add with /././ in path': 
+	echo "refs/heads/main" >expect &&
 
-git annotate  -L5, file 
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 33 - blame -L X, (X to end)
+	(
+		cd addtest &&
+		git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ &&
+		git submodule init
+	) &&
 
-expecting success of 8001.34 'blame -L ,Y (up to Y)': 
-	check_count -L,3 A 1 B2 1 E 1
+	rm -f heads head untracked &&
+	inspect addtest/dotslashdotsubmod/frotz ../../.. &&
+	test_cmp expect heads &&
+	test_cmp expect head &&
+	test_must_be_empty untracked
 
-git annotate  -L,3 file 
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 34 - blame -L ,Y (up to Y)
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/dotslashdotsubmod/frotz'...
+done.
+ok 30 - submodule add with /././ in path
 
-expecting success of 8001.35 'blame -L X,X': 
-	check_count -L3,3 B2 1
+expecting success of 7400.31 'submodule add with // in path': 
+	echo "refs/heads/main" >expect &&
 
-git annotate  -L3,3 file 
-Author B2 (expected 1, attributed 1) good
-ok 35 - blame -L X,X
+	(
+		cd addtest &&
+		git submodule add "$submodurl" slashslashsubmod///frotz// &&
+		git submodule init
+	) &&
 
-expecting success of 8001.36 'blame -L X,Y': 
-	check_count -L3,6 B 1 B1 1 B2 1 D 1
+	rm -f heads head untracked &&
+	inspect addtest/slashslashsubmod/frotz ../../.. &&
+	test_cmp expect heads &&
+	test_cmp expect head &&
+	test_must_be_empty untracked
 
-git annotate  -L3,6 file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 36 - blame -L X,Y
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/slashslashsubmod/frotz'...
+done.
+ok 31 - submodule add with // in path
 
-expecting success of 8001.37 'blame -L Y,X (undocumented)': 
-	check_count -L6,3 B 1 B1 1 B2 1 D 1
+expecting success of 7400.32 'submodule add with /.. in path': 
+	echo "refs/heads/main" >expect &&
 
-git annotate  -L6,3 file 
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 37 - blame -L Y,X (undocumented)
+	(
+		cd addtest &&
+		git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&
+		git submodule init
+	) &&
 
-expecting success of 8001.38 'blame -L -X': 
-	test_must_fail $PROG -L-1 file
+	rm -f heads head untracked &&
+	inspect addtest/realsubmod ../.. &&
+	test_cmp expect heads &&
+	test_cmp expect head &&
+	test_must_be_empty untracked
 
-fatal: -L invalid line number: -1
-ok 38 - blame -L -X
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/realsubmod'...
+done.
+ok 32 - submodule add with /.. in path
 
-expecting success of 8001.39 'blame -L 0': 
-	test_must_fail $PROG -L0 file
+expecting success of 7400.33 'submodule add with ./, /.. and // in path': 
+	echo "refs/heads/main" >expect &&
 
-fatal: -L invalid line number: 0
-ok 39 - blame -L 0
+	(
+		cd addtest &&
+		git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&
+		git submodule init
+	) &&
 
-expecting success of 8001.40 'blame -L ,0': 
-	test_must_fail $PROG -L,0 file
+	rm -f heads head untracked &&
+	inspect addtest/realsubmod2 ../.. &&
+	test_cmp expect heads &&
+	test_cmp expect head &&
+	test_must_be_empty untracked
 
-fatal: -L invalid line number: 0
-ok 40 - blame -L ,0
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/realsubmod2'...
+done.
+ok 33 - submodule add with ./, /.. and // in path
 
-expecting success of 8001.41 'blame -L ,+0': 
-	test_must_fail $PROG -L,+0 file
+expecting success of 7400.34 'submodule add with \\ in path': 
+	test_when_finished "rm -rf parent sub\\with\\backslash" &&
 
-fatal: -L invalid empty range
-ok 41 - blame -L ,+0
+	# Initialize a repo with a backslash in its name
+	git init sub\\with\\backslash &&
+	touch sub\\with\\backslash/empty.file &&
+	git -C sub\\with\\backslash add empty.file &&
+	git -C sub\\with\\backslash commit -m "Added empty.file" &&
 
-expecting success of 8001.42 'blame -L X,+0': 
-	test_must_fail $PROG -L1,+0 file
+	# Add that repository as a submodule
+	git init parent &&
+	git -C parent submodule add ../sub\\with\\backslash
 
-fatal: -L invalid empty range
-ok 42 - blame -L X,+0
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub\with\backslash/.git/
+[main (root-commit) a129325] Added empty.file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty.file
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/parent/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/parent/sub\with\backslash'...
+done.
+ok 34 - submodule add with \\ in path
 
-expecting success of 8001.43 'blame -L X,+1': 
-	check_count -L3,+1 B2 1
+expecting success of 7400.35 'submodule add in subdirectory': 
+	echo "refs/heads/main" >expect &&
 
-git annotate  -L3,+1 file 
-Author B2 (expected 1, attributed 1) good
-ok 43 - blame -L X,+1
+	mkdir addtest/sub &&
+	(
+		cd addtest/sub &&
+		git submodule add "$submodurl" ../realsubmod3 &&
+		git submodule init
+	) &&
 
-expecting success of 8001.44 'blame -L X,+N': 
-	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+	rm -f heads head untracked &&
+	inspect addtest/realsubmod3 ../.. &&
+	test_cmp expect heads &&
+	test_cmp expect head &&
+	test_must_be_empty untracked
 
-git annotate  -L3,+4 file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 44 - blame -L X,+N
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/realsubmod3'...
+done.
+ok 35 - submodule add in subdirectory
 
-expecting success of 8001.45 'blame -L ,-0': 
-	test_must_fail $PROG -L,-0 file
+expecting success of 7400.36 'submodule add in subdirectory with relative path should fail': 
+	(
+		cd addtest/sub &&
+		test_must_fail git submodule add ../../ submod3 2>../../output.err
+	) &&
+	test_grep toplevel output.err
 
-fatal: -L invalid empty range
-ok 45 - blame -L ,-0
+fatal: Relative path can only be used from the toplevel of the working tree
+ok 36 - submodule add in subdirectory with relative path should fail
 
-expecting success of 8001.46 'blame -L X,-0': 
-	test_must_fail $PROG -L1,-0 file
+expecting success of 7400.37 'setup - add an example entry to .gitmodules': 
+	git config --file=.gitmodules submodule.example.url git://example.com/init.git
 
-fatal: -L invalid empty range
-ok 46 - blame -L X,-0
+ok 37 - setup - add an example entry to .gitmodules
 
-expecting success of 8001.47 'blame -L X,-1': 
-	check_count -L3,-1 B2 1
+expecting success of 7400.38 'status should fail for unmapped paths': 
+	test_must_fail git submodule status
 
-git annotate  -L3,-1 file 
-Author B2 (expected 1, attributed 1) good
-ok 47 - blame -L X,-1
+fatal: no submodule mapping found in .gitmodules for path 'init'
+ok 38 - status should fail for unmapped paths
 
-expecting success of 8001.48 'blame -L X,-N': 
-	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+expecting success of 7400.39 'setup - map path in .gitmodules': 
+	cat <<\EOF >expect &&
+[submodule "example"]
+	url = git://example.com/init.git
+	path = init
+EOF
 
-git annotate  -L6,-4 file 
-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 48 - blame -L X,-N
+	git config --file=.gitmodules submodule.example.path init &&
 
-expecting success of 8001.49 'blame -L /RE/ (RE to end)': 
-	check_count -L/evil/ C 1 "A U Thor" 1
+	test_cmp expect .gitmodules
 
-git annotate  -L/evil/ file 
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 49 - blame -L /RE/ (RE to end)
+ok 39 - setup - map path in .gitmodules
 
-expecting success of 8001.50 'blame -L /RE/,/RE2/': 
-	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+expecting success of 7400.40 'status should only print one line': 
+	git submodule status >lines &&
+	test_line_count = 1 lines
 
-git annotate  -L/robot/,/green/ file 
-Author E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 50 - blame -L /RE/,/RE2/
+ok 40 - status should only print one line
 
-expecting success of 8001.51 'blame -L X,/RE/': 
-	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+expecting success of 7400.41 'status from subdirectory should have the same SHA1': 
+	test_when_finished "rmdir addtest/subdir" &&
+	(
+		cd addtest &&
+		mkdir subdir &&
+		git submodule status >output &&
+		awk "{print \$1}" <output >expect &&
+		cd subdir &&
+		git submodule status >../output &&
+		awk "{print \$1}" <../output >../actual &&
+		test_cmp ../expect ../actual &&
+		git -C ../submod checkout HEAD^ &&
+		git submodule status >../output &&
+		awk "{print \$1}" <../output >../actual2 &&
+		cd .. &&
+		git submodule status >output &&
+		awk "{print \$1}" <output >expect2 &&
+		test_cmp expect2 actual2 &&
+		! test_cmp actual actual2
+	)
 
-git annotate  -L5,/evil/ file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 51 - blame -L X,/RE/
+Note: switching to 'HEAD^'.
 
-expecting success of 8001.52 'blame -L /RE/,Y': 
-	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-git annotate  -L/99/,7 file 
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 52 - blame -L /RE/,Y
+If you want to 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 8001.53 'blame -L /RE/,+N': 
-	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+  git switch -c <new-branch-name>
 
-git annotate  -L/99/,+3 file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 53 - blame -L /RE/,+N
+Or undo this operation with:
 
-expecting success of 8001.54 'blame -L /RE/,-N': 
-	check_count -L/99/,-3 B 1 B2 1 D 1
+  git switch -
 
-git annotate  -L/99/,-3 file 
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 54 - blame -L /RE/,-N
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 8001.55 'blame -L X (X == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n C 1
+HEAD is now at 8f98e77 initial commit
+--- actual	2026-03-14 13:35:40.954677808 +0000
++++ actual2	2026-03-14 13:35:41.986677808 +0000
+@@ -4,7 +4,7 @@
+ 23ad8e191a506339bc2aa0ae92a950f35303f38b
+ 23ad8e191a506339bc2aa0ae92a950f35303f38b
+ 23ad8e191a506339bc2aa0ae92a950f35303f38b
+-23ad8e191a506339bc2aa0ae92a950f35303f38b
+++8f98e7791903e3a21e37e7c040acf7518da96e03
+ 8f98e7791903e3a21e37e7c040acf7518da96e03
+ d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+ d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+ok 41 - status from subdirectory should have the same SHA1
 
-git annotate  -L8 file 
-Author C (expected 1, attributed 1) good
-ok 55 - blame -L X (X == nlines)
+expecting success of 7400.42 'setup - fetch commit name from submodule': 
+	rev1=$(cd .subrepo && git rev-parse HEAD) &&
+	printf "rev1: %s\n" "$rev1" &&
+	test -n "$rev1"
 
-expecting success of 8001.56 'blame -L X (X == nlines + 1)': 
-	n=$(expr $(wc -l <file) + 2) &&
-	test_must_fail $PROG -L$n file
+rev1: 36aca326f3b39b6c280a410fa907ac252a2075c6
+ok 42 - setup - fetch commit name from submodule
 
-fatal: file file has only 8 lines
-ok 56 - blame -L X (X == nlines + 1)
+expecting success of 7400.43 'status should initially be "missing"': 
+	git submodule status >lines &&
+	grep "^-$rev1" lines
 
-expecting success of 8001.57 'blame -L X (X > nlines)': 
-	test_must_fail $PROG -L12345 file
+-36aca326f3b39b6c280a410fa907ac252a2075c6 init
+ok 43 - status should initially be "missing"
 
-fatal: file file has only 8 lines
-ok 57 - blame -L X (X > nlines)
+expecting success of 7400.44 'init should register submodule url in .git/config': 
+	echo git://example.com/init.git >expect &&
 
-expecting success of 8001.58 'blame -L ,Y (Y == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+	git submodule init &&
+	git config submodule.example.url >url &&
+	git config submodule.example.url ./.subrepo &&
 
-git annotate  -L,8 file 
-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
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 58 - blame -L ,Y (Y == nlines)
+	test_cmp expect url
 
-expecting success of 8001.59 'blame -L ,Y (Y == nlines + 1)': 
-	n=$(expr $(wc -l <file) + 2) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+Submodule 'example' (git://example.com/init.git) registered for path 'init'
+ok 44 - init should register submodule url in .git/config
 
-git annotate  -L,9 file 
-Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 59 - blame -L ,Y (Y == nlines + 1)
+expecting success of 7400.45 'status should still be "missing" after initializing': 
+	rm -fr init &&
+	mkdir init &&
+	git submodule status >lines &&
+	rm -fr init &&
+	grep "^-$rev1" lines
 
-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
+-36aca326f3b39b6c280a410fa907ac252a2075c6 init
+ok 45 - status should still be "missing" after initializing
 
-git annotate  -L,12345 file 
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 60 - blame -L ,Y (Y > nlines)
+expecting success of 7400.46 'init should fail with unknown submodule': 
+	test_failure_with_unknown_submodule init
 
-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
+error: pathspec 'no-such-submodule' did not match any file(s) known to git
+ok 46 - init should fail with unknown submodule
 
-git annotate  -L2,3 -L6,7 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 A (expected 1, attributed 1) good
-ok 61 - blame -L multiple (disjoint)
+expecting success of 7400.47 'update should fail with unknown submodule': 
+	test_failure_with_unknown_submodule update
 
-expecting success of 8001.62 'blame -L multiple (disjoint: unordered)': 
-	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
+error: pathspec 'no-such-submodule' did not match any file(s) known to git
+ok 47 - update should fail with unknown submodule
 
-git annotate  -L6,7 -L2,3 file 
-Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 62 - blame -L multiple (disjoint: unordered)
+expecting success of 7400.48 'status should fail with unknown submodule': 
+	test_failure_with_unknown_submodule status
 
-expecting success of 8001.63 'blame -L multiple (adjacent)': 
-	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
+error: pathspec 'no-such-submodule' did not match any file(s) known to git
+ok 48 - status should fail with unknown submodule
 
-git annotate  -L2,3 -L4,5 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 63 - blame -L multiple (adjacent)
+expecting success of 7400.49 'sync should fail with unknown submodule': 
+	test_failure_with_unknown_submodule sync
 
-expecting success of 8001.64 'blame -L multiple (adjacent: unordered)': 
-	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
+error: pathspec 'no-such-submodule' did not match any file(s) known to git
+ok 49 - sync should fail with unknown submodule
 
-git annotate  -L4,5 -L2,3 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 64 - blame -L multiple (adjacent: unordered)
+expecting success of 7400.50 'update should fail when path is used by a file': 
+	echo hello >expect &&
 
-expecting success of 8001.65 'blame -L multiple (overlapping)': 
-	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
+	echo "hello" >init &&
+	test_must_fail git submodule update &&
 
-git annotate  -L2,4 -L3,5 file 
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 65 - blame -L multiple (overlapping)
+	test_cmp expect init
 
-expecting success of 8001.66 'blame -L multiple (overlapping: unordered)': 
-	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
+fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
+fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
+Failed to clone 'init'. Retry scheduled
+fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
+fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
+Failed to clone 'init' a second time, aborting
+ok 50 - update should fail when path is used by a file
 
-git annotate  -L3,5 -L2,4 file 
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 66 - blame -L multiple (overlapping: unordered)
+expecting success of 7400.51 'update should fail when path is used by a nonempty directory': 
+	echo hello >expect &&
 
-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
+	rm -fr init &&
+	mkdir init &&
+	echo "hello" >init/a &&
 
-git annotate  -L2,8 -L3,5 file 
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (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
-ok 67 - blame -L multiple (superset/subset)
+	test_must_fail git submodule update &&
 
-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
+	test_cmp expect init/a
 
-git annotate  -L3,5 -L2,8 file 
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 68 - blame -L multiple (superset/subset: unordered)
+fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
+fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
+Failed to clone 'init'. Retry scheduled
+fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' already exists and is not an empty directory.
+fatal: clone of './.subrepo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init' failed
+Failed to clone 'init' a second time, aborting
+ok 51 - update should fail when path is used by a nonempty directory
 
-expecting success of 8001.69 'blame -L /RE/ (relative)': 
-	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
+expecting success of 7400.52 'update should work when path is an empty dir': 
+	rm -fr init &&
+	rm -f head-sha1 &&
+	echo "$rev1" >expect &&
 
-git annotate  -L3,3 -L/fox/ file 
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 69 - blame -L /RE/ (relative)
+	mkdir init &&
+	git submodule update -q >update.out &&
+	test_must_be_empty update.out &&
 
-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
+	inspect init &&
+	test_cmp expect head-sha1
 
-git annotate  -L/dog/ file 
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 70 - blame -L /RE/ (relative: no preceding range)
+fatal: ref HEAD is not a symbolic ref
+ok 52 - update should work when path is an empty dir
 
-expecting success of 8001.71 'blame -L /RE/ (relative: adjacent)': 
-	check_count -L1,1 -L/dog/,+1 A 1 E 1
+expecting success of 7400.53 'status should be "up-to-date" after update': 
+	git submodule status >list &&
+	grep "^ $rev1" list
 
-git annotate  -L1,1 -L/dog/,+1 file 
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 71 - blame -L /RE/ (relative: adjacent)
+ 36aca326f3b39b6c280a410fa907ac252a2075c6 init (rev-1)
+ok 53 - status should be "up-to-date" after update
 
-expecting success of 8001.72 'blame -L /RE/ (relative: not found)': 
-	test_must_fail $PROG -L4,4 -L/dog/ file
+expecting success of 7400.54 'status "up-to-date" from subdirectory': 
+	mkdir -p sub &&
+	(
+		cd sub &&
+		git submodule status >../list
+	) &&
+	grep "^ $rev1" list &&
+	grep "\\.\\./init" list
 
-fatal: -L parameter 'dog' starting at line 5: No match
-ok 72 - blame -L /RE/ (relative: not found)
+ 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
+ 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
+ok 54 - status "up-to-date" from subdirectory
 
-expecting success of 8001.73 'blame -L /RE/ (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L/$/ file
+expecting success of 7400.55 'status "up-to-date" from subdirectory with path': 
+	mkdir -p sub &&
+	(
+		cd sub &&
+		git submodule status ../init >../list
+	) &&
+	grep "^ $rev1" list &&
+	grep "\\.\\./init" list
 
-fatal: file file has only 8 lines
-ok 73 - blame -L /RE/ (relative: end-of-file)
+ 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
+ 36aca326f3b39b6c280a410fa907ac252a2075c6 ../init (rev-1)
+ok 55 - status "up-to-date" from subdirectory with path
 
-expecting success of 8001.74 'blame -L ^/RE/ (absolute)': 
-	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+expecting success of 7400.56 'status should be "modified" after submodule commit': 
+	(
+		cd init &&
+		echo b >b &&
+		git add b &&
+		git commit -m "submodule commit 2"
+	) &&
 
-git annotate  -L3,3 -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 74 - blame -L ^/RE/ (absolute)
+	rev2=$(cd init && git rev-parse HEAD) &&
+	test -n "$rev2" &&
+	git submodule status >list &&
 
-expecting success of 8001.75 'blame -L ^/RE/ (absolute: no preceding range)': 
-	check_count -L^/dog/,+2 A 1 B2 1
+	grep "^+$rev2" list
 
-git annotate  -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 75 - blame -L ^/RE/ (absolute: no preceding range)
+[detached HEAD 8eafb57] submodule commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
++8eafb57b6146d899eeaa430c12864a09fcb0e7e1 init (rev-1-1-g8eafb57)
+ok 56 - status should be "modified" after submodule commit
 
-expecting success of 8001.76 'blame -L ^/RE/ (absolute: not found)': 
-	test_must_fail $PROG -L4,4 -L^/tambourine/ file
+expecting success of 7400.57 '"submodule --cached" command forms should be identical': 
+	git submodule status --cached >expect &&
 
-fatal: -L parameter 'tambourine' starting at line 1: No match
-ok 76 - blame -L ^/RE/ (absolute: not found)
+	git submodule --cached >actual &&
+	test_cmp expect actual &&
 
-expecting success of 8001.77 'blame -L ^/RE/ (absolute: end-of-file)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
+	git submodule --cached status >actual &&
+	test_cmp expect actual
 
-git annotate  -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
-ok 77 - blame -L ^/RE/ (absolute: end-of-file)
+ok 57 - "submodule --cached" command forms should be identical
 
-expecting success of 8001.78 'setup -L :regex': 
-	tr Q "\\t" >hello.c <<-\EOF &&
-	int main(int argc, const char *argv[])
-	{
-	Qputs("hello");
-	}
-	EOF
-	git add hello.c &&
-	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
-	git commit -m "hello" &&
+expecting success of 7400.58 'the --cached sha1 should be rev1': 
+	git submodule --cached status >list &&
+	grep "^+$rev1" list
 
-	mv hello.c hello.orig &&
-	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
-	tr Q "\\t" >hello.c &&
-	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
-	git commit -a -m "goodbye" &&
++36aca326f3b39b6c280a410fa907ac252a2075c6 init (rev-1)
+ok 58 - the --cached sha1 should be rev1
 
-	mv hello.c hello.orig &&
-	echo "#include <stdio.h>" >hello.c &&
-	cat hello.orig >>hello.c &&
-	tr Q "\\t" >>hello.c <<-\EOF &&
-	void mail()
-	{
-	Qputs("mail");
-	}
-	EOF
-	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
-	git commit -a -m "mail"
+expecting success of 7400.59 'git diff should report the SHA1 of the new submodule commit': 
+	git diff >diff &&
+	grep "^+Subproject commit $rev2" diff
 
-[branch2 f82005e] hello
- Author: F <F@test.git>
- 1 file changed, 4 insertions(+)
- create mode 100644 hello.c
-[branch2 edbab84] goodbye
- Author: G <G@test.git>
- 1 file changed, 1 insertion(+)
-[branch2 846166b] mail
- Author: H <H@test.git>
- 1 file changed, 5 insertions(+)
-ok 78 - setup -L :regex
++Subproject commit 8eafb57b6146d899eeaa430c12864a09fcb0e7e1
+ok 59 - git diff should report the SHA1 of the new submodule commit
 
-expecting success of 8001.79 'blame -L :literal': 
-	check_count -f hello.c -L:main F 4 G 1
+expecting success of 7400.60 'update should checkout rev1': 
+	rm -f head-sha1 &&
+	echo "$rev1" >expect &&
 
-git annotate  -L:main hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 79 - blame -L :literal
+	git submodule update init &&
+	inspect init &&
 
-expecting success of 8001.80 'blame -L :regex': 
-	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+	test_cmp expect head-sha1
 
-git annotate  -L:m[a-z][a-z]l hello.c 
-Author H (expected 4, attributed 4) good
-ok 80 - blame -L :regex
+Submodule path 'init': checked out '36aca326f3b39b6c280a410fa907ac252a2075c6'
+fatal: ref HEAD is not a symbolic ref
+ok 60 - update should checkout rev1
 
-expecting success of 8001.81 'blame -L :nomatch': 
-	test_must_fail $PROG -L:nomatch hello.c
+expecting success of 7400.61 'status should be "up-to-date" after update': 
+	git submodule status >list &&
+	grep "^ $rev1" list
 
-fatal: -L parameter 'nomatch' starting at line 1: no match
-ok 81 - blame -L :nomatch
+ 36aca326f3b39b6c280a410fa907ac252a2075c6 init (rev-1)
+ok 61 - status should be "up-to-date" after update
 
-expecting success of 8001.82 'blame -L :RE (relative)': 
-	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+expecting success of 7400.62 'checkout superproject with subproject already present': 
+	git checkout initial &&
+	git checkout main
 
-git annotate  -L3,3 -L:ma.. hello.c 
-Author H (expected 4, attributed 4) good
-Author F (expected 1, attributed 1) good
-ok 82 - blame -L :RE (relative)
+warning: unable to rmdir 'init': Directory not empty
+Switched to branch 'initial'
+Switched to branch 'main'
+ok 62 - checkout superproject with subproject already present
 
-expecting success of 8001.83 'blame -L :RE (relative: no preceding range)': 
-	check_count -f hello.c -L:ma.. F 4 G 1
+expecting success of 7400.63 'apply submodule diff': 
+	git branch second &&
+	(
+		cd init &&
+		echo s >s &&
+		git add s &&
+		git commit -m "change subproject"
+	) &&
+	git update-index --add init &&
+	git commit -m "change init" &&
+	git format-patch -1 --stdout >P.diff &&
+	git checkout second &&
+	git apply --index P.diff &&
 
-git annotate  -L:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 83 - blame -L :RE (relative: no preceding range)
+	git diff --cached main >staged &&
+	test_must_be_empty staged
 
-expecting success of 8001.84 'blame -L :RE (relative: not found)': 
-	test_must_fail $PROG -L3,3 -L:tambourine hello.c
+[detached HEAD da28091] change subproject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 s
+[main cb68a4b] change init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'second'
+M	init
+warning: unable to rmdir 'init': Directory not empty
+ok 63 - apply submodule diff
 
-fatal: -L parameter 'tambourine' starting at line 4: no match
-ok 84 - blame -L :RE (relative: not found)
+expecting success of 7400.64 'update --init': 
+	mv init init2 &&
+	git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
+	git config --remove-section submodule.example &&
+	test_must_fail git config submodule.example.url &&
 
-expecting success of 8001.85 'blame -L :RE (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L:main hello.c
+	git submodule update init 2> update.out &&
+	test_grep "not initialized" update.out &&
+	test_must_fail git rev-parse --resolve-git-dir init/.git &&
 
-fatal: -L parameter 'main' starting at line 11: no match
-ok 85 - blame -L :RE (relative: end-of-file)
+	git submodule update --init init &&
+	git rev-parse --resolve-git-dir init/.git
 
-expecting success of 8001.86 'blame -L ^:RE (absolute)': 
-	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+Submodule path 'init' not initialized
+fatal: not a gitdir 'init/.git'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/modules/example
+ok 64 - update --init
 
-git annotate  -L3,3 -L^:ma.. hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 86 - blame -L ^:RE (absolute)
+expecting success of 7400.65 'update --init from subdirectory': 
+	mv init init2 &&
+	git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
+	git config --remove-section submodule.example &&
+	test_must_fail git config submodule.example.url &&
 
-expecting success of 8001.87 'blame -L ^:RE (absolute: no preceding range)': 
-	check_count -f hello.c -L^:ma.. F 4 G 1
+	mkdir -p sub &&
+	(
+		cd sub &&
+		git submodule update ../init 2>update.out &&
+		test_grep "not initialized" update.out &&
+		test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
 
-git annotate  -L^:ma.. hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 87 - blame -L ^:RE (absolute: no preceding range)
+		git submodule update --init ../init
+	) &&
+	git rev-parse --resolve-git-dir init/.git
 
-expecting success of 8001.88 'blame -L ^:RE (absolute: not found)': 
-	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
+Submodule path '../init' not initialized
+fatal: not a gitdir '../init/.git'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path '../init'
+Submodule path '../init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/modules/example
+ok 65 - update --init from subdirectory
 
-fatal: -L parameter 'tambourine' starting at line 1: no match
-ok 88 - blame -L ^:RE (absolute: not found)
+expecting success of 7400.66 'do not add files from a submodule': 
 
-expecting success of 8001.89 'blame -L ^:RE (absolute: end-of-file)': 
-	n=$(printf "%d" $(wc -l <hello.c)) &&
-	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
+	git reset --hard &&
+	test_must_fail git add init/a
 
-git annotate  -L10 -L^:ma.. hello.c 
-Author H (expected 1, attributed 1) good
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 89 - blame -L ^:RE (absolute: end-of-file)
 
-expecting success of 8001.90 'blame -L :funcname with userdiff driver': 
-	cat >file.template <<-\EOF &&
-	DO NOT MATCH THIS LINE
-	function RIGHT(a, b) result(c)
-	AS THE DEFAULT DRIVER WOULD
+HEAD is now at 23ad8e1 super commit 1
+fatal: Pathspec 'init/a' is in submodule 'init'
+ok 66 - do not add files from a submodule
 
-	integer, intent(in) :: ChangeMe
-	EOF
+expecting success of 7400.67 'gracefully add/reset submodule with a trailing slash': 
 
-	fortran_file=file.f03 &&
-	test_when_finished "rm .gitattributes" &&
-	echo "$fortran_file diff=fortran" >.gitattributes &&
+	git reset --hard &&
+	git commit -m "commit subproject" init &&
+	(cd init &&
+	 echo b > a) &&
+	git add init/ &&
+	git diff --exit-code --cached init &&
+	commit=$(cd init &&
+	 git commit -m update a >/dev/null &&
+	 git rev-parse HEAD) &&
+	git add init/ &&
+	test_must_fail git diff --exit-code --cached init &&
+	test $commit = $(git ls-files --stage |
+		sed -n "s/^160000 \([^ ]*\).*/\1/p") &&
+	git reset init/ &&
+	git diff --exit-code --cached init
 
-	test_commit --author "A <A@test.git>" \
-		"add" "$fortran_file" \
-		"$(cat file.template)" &&
-	test_commit --author "B <B@test.git>" \
-		"change" "$fortran_file" \
-		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
-	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
 
-[branch2 6b1b7a1] add
- Author: A <A@test.git>
- 1 file changed, 5 insertions(+)
- create mode 100644 file.f03
-[branch2 7caa17d] change
- Author: B <B@test.git>
+HEAD is now at 23ad8e1 super commit 1
+[second 365536a] commit subproject
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-git annotate  -L:RIGHT file.f03 
-Author A (expected 3, attributed 3) good
-Author B (expected 1, attributed 1) good
-ok 90 - blame -L :funcname with userdiff driver
+diff --git a/init b/init
+index da28091..cf4817b 160000
+--- a/init
++++ b/init
+@@ -1 +1 @@
+-Subproject commit da28091fa1960864823ed381ef2a1c41222b8351
++Subproject commit cf4817bea522d7a895a8f804894e1254c741baae
+Unstaged changes after reset:
+M	init
+ok 67 - gracefully add/reset submodule with a trailing slash
 
-expecting success of 8001.91 'setup incremental': 
+expecting success of 7400.68 'ls-files gracefully handles trailing slash': 
+
+	test "init" = "$(git ls-files init/)"
+
+
+ok 68 - ls-files gracefully handles trailing slash
+
+expecting success of 7400.69 'moving to a commit without submodule does not leave empty dir': 
+	rm -rf init &&
+	mkdir init &&
+	git reset --hard &&
+	git checkout initial &&
+	test ! -d init &&
+	git checkout second
+
+HEAD is now at 365536a commit subproject
+Switched to branch 'initial'
+Switched to branch 'second'
+ok 69 - moving to a commit without submodule does not leave empty dir
+
+expecting success of 7400.70 'submodule <invalid-subcommand> fails': 
+	test_must_fail git submodule no-such-subcommand
+
+usage: git submodule [--quiet] [--cached]
+   or: git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
+   or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] init [--] [<path>...]
+   or: git submodule [--quiet] deinit [-f|--force] (--all| [--] <path>...)
+   or: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+   or: git submodule [--quiet] set-branch (--default|--branch <branch>) [--] <path>
+   or: git submodule [--quiet] set-url [--] <path> <newurl>
+   or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
+   or: git submodule [--quiet] foreach [--recursive] <command>
+   or: git submodule [--quiet] sync [--recursive] [--] [<path>...]
+   or: git submodule [--quiet] absorbgitdirs [--] [<path>...]
+ok 70 - submodule <invalid-subcommand> fails
+
+expecting success of 7400.71 'add submodules without specifying an explicit path': 
+	mkdir repo &&
 	(
-	GIT_AUTHOR_NAME=I &&
-	export GIT_AUTHOR_NAME &&
-	GIT_AUTHOR_EMAIL=I@test.git &&
-	export GIT_AUTHOR_EMAIL &&
-	>incremental &&
-	git add incremental &&
-	git commit -m "step 0" &&
-	printf "partial" >>incremental &&
-	git commit -a -m "step 0.5" &&
-	echo >>incremental &&
-	git commit -a -m "step 1"
+		cd repo &&
+		git init &&
+		echo r >r &&
+		git add r &&
+		git commit -m "repo commit 1"
+	) &&
+	git clone --bare repo/ bare.git &&
+	(
+		cd addtest &&
+		git submodule add "$submodurl/repo" &&
+		git config -f .gitmodules submodule.repo.path repo &&
+		git submodule add "$submodurl/bare.git" &&
+		git config -f .gitmodules submodule.bare.path bare
 	)
 
-[branch2 6c56eef] step 0
- Author: I <I@test.git>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 incremental
-[branch2 c79b19e] step 0.5
- Author: I <I@test.git>
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo/.git/
+[main (root-commit) 0244caa] repo commit 1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[branch2 f65a7a7] step 1
- Author: I <I@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 91 - setup incremental
-
-expecting success of 8001.92 'blame empty': 
-	check_count -h HEAD^^ -f incremental
+ create mode 100644 r
+Cloning into bare repository 'bare.git'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/repo'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/bare'...
+done.
+ok 71 - add submodules without specifying an explicit path
 
-git annotate  incremental HEAD^^
-ok 92 - blame empty
+expecting success of 7400.72 'add should fail when path is used by a file': 
+	(
+		cd addtest &&
+		touch file &&
+		test_must_fail	git submodule add "$submodurl/repo" file
+	)
 
-expecting success of 8001.93 'blame -L 0 empty': 
-	test_must_fail $PROG -L0 incremental HEAD^^
+fatal: destination path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/file' already exists and is not an empty directory.
+fatal: clone of '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo' into submodule path '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/file' failed
+ok 72 - add should fail when path is used by a file
 
-fatal: -L invalid line number: 0
-ok 93 - blame -L 0 empty
+expecting success of 7400.73 'add should fail when path is used by an existing directory': 
+	(
+		cd addtest &&
+		mkdir empty-dir &&
+		test_must_fail git submodule add "$submodurl/repo" empty-dir
+	)
 
-expecting success of 8001.94 'blame -L 1 empty': 
-	test_must_fail $PROG -L1 incremental HEAD^^
+fatal: 'empty-dir' already exists and is not a valid git repo
+ok 73 - add should fail when path is used by an existing directory
 
-fatal: file incremental has only 0 lines
-ok 94 - blame -L 1 empty
+expecting success of 7400.74 'use superproject as upstream when path is relative and no url is set there': 
+	(
+		cd addtest &&
+		git submodule add ../repo relative &&
+		test "$(git config -f .gitmodules submodule.relative.url)" = ../repo &&
+		git submodule sync relative &&
+		test "$(git config submodule.relative.url)" = "$submodurl/repo"
+	)
 
-expecting success of 8001.95 'blame -L 2 empty': 
-	test_must_fail $PROG -L2 incremental HEAD^^
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/addtest/relative'...
+done.
+Synchronizing submodule url for 'relative'
+ok 74 - use superproject as upstream when path is relative and no url is set there
 
-fatal: file incremental has only 0 lines
-ok 95 - blame -L 2 empty
+expecting success of 7400.75 'set up for relative path tests': 
+	mkdir reltest &&
+	(
+		cd reltest &&
+		git init &&
+		mkdir sub &&
+		(
+			cd sub &&
+			git init &&
+			test_commit foo
+		) &&
+		git add sub &&
+		git config -f .gitmodules submodule.sub.path sub &&
+		git config -f .gitmodules submodule.sub.url ../subrepo &&
+		cp .git/config pristine-.git-config &&
+		cp .gitmodules pristine-.gitmodules
+	)
 
-expecting success of 8001.96 'blame half': 
-	check_count -h HEAD^ -f incremental I 1
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/reltest/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/reltest/sub/.git/
+[main (root-commit) 946e985] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 75 - set up for relative path tests
 
-git annotate  incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 96 - blame half
+expecting success of 7400.76 '../subrepo works with URL - ssh://hostname/repo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url ssh://hostname/repo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = ssh://hostname/subrepo
+	)
 
-expecting success of 8001.97 'blame -L 0 half': 
-	test_must_fail $PROG -L0 incremental HEAD^
+Submodule 'sub' (ssh://hostname/subrepo) registered for path 'sub'
+ok 76 - ../subrepo works with URL - ssh://hostname/repo
 
-fatal: -L invalid line number: 0
-ok 97 - blame -L 0 half
+expecting success of 7400.77 '../subrepo works with port-qualified URL - ssh://hostname:22/repo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url ssh://hostname:22/repo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = ssh://hostname:22/subrepo
+	)
 
-expecting success of 8001.98 'blame -L 1 half': 
-	check_count -h HEAD^ -f incremental -L1 I 1
+Submodule 'sub' (ssh://hostname:22/subrepo) registered for path 'sub'
+ok 77 - ../subrepo works with port-qualified URL - ssh://hostname:22/repo
 
-git annotate  -L1 incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 98 - blame -L 1 half
+expecting success of 7400.78 '../subrepo path works with local path - //somewhere else/repo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url "//somewhere else/repo" &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = "//somewhere else/subrepo"
+	)
 
-expecting success of 8001.99 'blame -L 2 half': 
-	test_must_fail $PROG -L2 incremental HEAD^
+Submodule 'sub' (//somewhere else/subrepo) registered for path 'sub'
+ok 78 - ../subrepo path works with local path - //somewhere else/repo
 
-fatal: file incremental has only 1 line
-ok 99 - blame -L 2 half
+expecting success of 7400.79 '../subrepo works with file URL - file:///tmp/repo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url file:///tmp/repo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = file:///tmp/subrepo
+	)
 
-expecting success of 8001.100 'blame -L 3 half': 
-	test_must_fail $PROG -L3 incremental HEAD^
+Submodule 'sub' (file:///tmp/subrepo) registered for path 'sub'
+ok 79 - ../subrepo works with file URL - file:///tmp/repo
 
-fatal: file incremental has only 1 line
-ok 100 - blame -L 3 half
+expecting success of 7400.80 '../subrepo works with helper URL- helper:://hostname/repo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url helper:://hostname/repo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = helper:://hostname/subrepo
+	)
 
-expecting success of 8001.101 'blame full': 
-	check_count -f incremental I 1
+Submodule 'sub' (helper:://hostname/subrepo) registered for path 'sub'
+ok 80 - ../subrepo works with helper URL- helper:://hostname/repo
 
-git annotate  incremental 
-Author I (expected 1, attributed 1) good
-ok 101 - blame full
+expecting success of 7400.81 '../subrepo works with scp-style URL - user@host:repo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		git config remote.origin.url user@host:repo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = user@host:subrepo
+	)
 
-expecting success of 8001.102 'blame -L 0 full': 
-	test_must_fail $PROG -L0 incremental
+Submodule 'sub' (user@host:subrepo) registered for path 'sub'
+ok 81 - ../subrepo works with scp-style URL - user@host:repo
 
-fatal: -L invalid line number: 0
-ok 102 - blame -L 0 full
+expecting success of 7400.82 '../subrepo works with scp-style URL - user@host:path/to/repo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url user@host:path/to/repo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = user@host:path/to/subrepo
+	)
 
-expecting success of 8001.103 'blame -L 1 full': 
-	check_count -f incremental -L1 I 1
+Submodule 'sub' (user@host:path/to/subrepo) registered for path 'sub'
+ok 82 - ../subrepo works with scp-style URL - user@host:path/to/repo
 
-git annotate  -L1 incremental 
-Author I (expected 1, attributed 1) good
-ok 103 - blame -L 1 full
+expecting success of 7400.83 '../subrepo works with relative local path - foo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url foo &&
+		# actual: fails with an error
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = subrepo
+	)
 
-expecting success of 8001.104 'blame -L 2 full': 
-	test_must_fail $PROG -L2 incremental
+Submodule 'sub' (subrepo) registered for path 'sub'
+ok 83 - ../subrepo works with relative local path - foo
 
-fatal: file incremental has only 1 line
-ok 104 - blame -L 2 full
+expecting success of 7400.84 '../subrepo works with relative local path - foo/bar': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url foo/bar &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = foo/subrepo
+	)
 
-expecting success of 8001.105 'blame -L 3 full': 
-	test_must_fail $PROG -L3 incremental
+Submodule 'sub' (foo/subrepo) registered for path 'sub'
+ok 84 - ../subrepo works with relative local path - foo/bar
 
-fatal: file incremental has only 1 line
-ok 105 - blame -L 3 full
+expecting success of 7400.85 '../subrepo works with relative local path - ./foo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url ./foo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = subrepo
+	)
 
-expecting success of 8001.106 'blame -L': 
-	test_must_fail $PROG -L file
+Submodule 'sub' (subrepo) registered for path 'sub'
+ok 85 - ../subrepo works with relative local path - ./foo
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+expecting success of 7400.86 '../subrepo works with relative local path - ./foo/bar': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url ./foo/bar &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = foo/subrepo
+	)
 
-    <rev-opts> are documented in git-rev-list(1)
+Submodule 'sub' (foo/subrepo) registered for path 'sub'
+ok 86 - ../subrepo works with relative local path - ./foo/bar
 
-    --[no-]incremental    show blame entries as we find them, incrementally
-    -b                    do not show object names of boundary commits (Default: off)
-    --[no-]root           do not treat root commits as boundaries (Default: off)
-    --[no-]show-stats     show work cost statistics
-    --[no-]progress       force progress reporting
-    --[no-]score-debug    show output score for blame entries
-    -f, --[no-]show-name  show original filename (Default: auto)
-    -n, --[no-]show-number
-                          show original linenumber (Default: off)
-    -p, --[no-]porcelain  show in a format designed for machine consumption
-    --[no-]line-porcelain show porcelain format with per-line commit information
-    -c                    use the same output mode as git-annotate (Default: off)
-    -t                    show raw timestamp (Default: off)
-    -l                    show long commit SHA1 (Default: off)
-    -s                    suppress author name and timestamp (Default: off)
-    -e, --[no-]show-email show author email instead of name (Default: off)
-    -w                    ignore whitespace differences
-    --[no-]ignore-rev <rev>
-                          ignore <rev> when blaming
-    --[no-]ignore-revs-file <file>
-                          ignore revisions from <file>
-    --[no-]color-lines    color redundant metadata from previous line differently
-    --[no-]color-by-age   color lines by age
-    --[no-]minimal        spend extra cycles to find better match
-    -S <file>             use revisions from <file> instead of calling git-rev-list
-    --[no-]contents <file>
-                          use <file>'s contents as the final image
-    -C[<score>]           find line copies within and across files
-    -M[<score>]           find line movements within and across files
-    -L <range>            process only line range <start>,<end> or function :<funcname>
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+expecting success of 7400.87 '../subrepo works with relative local path - ../foo': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url ../foo &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = ../subrepo
+	)
 
-ok 106 - blame -L
+Submodule 'sub' (../subrepo) registered for path 'sub'
+ok 87 - ../subrepo works with relative local path - ../foo
 
-expecting success of 8001.107 'blame -L X,+': 
-	test_must_fail $PROG -L1,+ file
+expecting success of 7400.88 '../subrepo works with relative local path - ../foo/bar': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		git config remote.origin.url ../foo/bar &&
+		git submodule init &&
+		test "$(git config submodule.sub.url)" = ../foo/subrepo
+	)
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 107 - blame -L X,+
+Submodule 'sub' (../foo/subrepo) registered for path 'sub'
+ok 88 - ../subrepo works with relative local path - ../foo/bar
 
-expecting success of 8001.108 'blame -L X,-': 
-	test_must_fail $PROG -L1,- file
+expecting success of 7400.89 '../bar/a/b/c works with relative local path - ../foo/bar.git': 
+	(
+		cd reltest &&
+		cp pristine-.git-config .git/config &&
+		cp pristine-.gitmodules .gitmodules &&
+		mkdir -p a/b/c &&
+		(cd a/b/c && git init && test_commit msg) &&
+		git config remote.origin.url ../foo/bar.git &&
+		git submodule add ../bar/a/b/c ./a/b/c &&
+		git submodule init &&
+		test "$(git config submodule.a/b/c.url)" = ../foo/bar/a/b/c
+	)
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 108 - blame -L X,-
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/reltest/a/b/c/.git/
+[main (root-commit) 11e1cd7] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 msg.t
+Adding existing repo at 'a/b/c' to the index
+Submodule 'sub' (../foo/subrepo) registered for path 'sub'
+ok 89 - ../bar/a/b/c works with relative local path - ../foo/bar.git
 
-expecting success of 8001.109 'blame -L X (non-numeric X)': 
-	test_must_fail $PROG -LX file
+expecting success of 7400.90 'moving the superproject does not break submodules': 
+	(
+		cd addtest &&
+		git submodule status >expect
+	) &&
+	mv addtest addtest2 &&
+	(
+		cd addtest2 &&
+		git submodule status >actual &&
+		test_cmp expect actual
+	)
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 109 - blame -L X (non-numeric X)
+ok 90 - moving the superproject does not break submodules
 
-expecting success of 8001.110 'blame -L X,Y (non-numeric Y)': 
-	test_must_fail $PROG -L1,Y file
+expecting success of 7400.91 'moving the submodule does not break the superproject': 
+	(
+		cd addtest2 &&
+		git submodule status
+	) >actual &&
+	sed -e "s/^ \([^ ]* repo\) .*/-\1/" <actual >expect &&
+	mv addtest2/repo addtest2/repo.bak &&
+	test_when_finished "mv addtest2/repo.bak addtest2/repo" &&
+	(
+		cd addtest2 &&
+		git submodule status
+	) >actual &&
+	test_cmp expect actual
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 110 - blame -L X,Y (non-numeric Y)
+ok 91 - moving the submodule does not break the superproject
 
-expecting success of 8001.111 'blame -L X,+N (non-numeric N)': 
-	test_must_fail $PROG -L1,+N file
+expecting success of 7400.92 'submodule add --name allows to replace a submodule with another at the same path': 
+	(
+		cd addtest2 &&
+		(
+			cd repo &&
+			echo "$submodurl/repo" >expect &&
+			git config remote.origin.url >actual &&
+			test_cmp expect actual &&
+			echo "gitdir: ../.git/modules/repo" >expect &&
+			test_cmp expect .git
+		) &&
+		rm -rf repo &&
+		git rm repo &&
+		git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual &&
+		test_must_be_empty actual &&
+		echo "gitdir: ../.git/modules/submod" >expect &&
+		test_cmp expect submod/.git &&
+		(
+			cd repo &&
+			echo "$submodurl/bare.git" >expect &&
+			git config remote.origin.url >actual &&
+			test_cmp expect actual &&
+			echo "gitdir: ../.git/modules/repo_new" >expect &&
+			test_cmp expect .git
+		) &&
+		echo "repo" >expect &&
+		test_must_fail git config -f .gitmodules submodule.repo.path &&
+		git config -f .gitmodules submodule.repo_new.path >actual &&
+		test_cmp expect actual &&
+		echo "$submodurl/repo" >expect &&
+		test_must_fail git config -f .gitmodules submodule.repo.url &&
+		echo "$submodurl/bare.git" >expect &&
+		git config -f .gitmodules submodule.repo_new.url >actual &&
+		test_cmp expect actual &&
+		echo "$submodurl/repo" >expect &&
+		git config submodule.repo.url >actual &&
+		test_cmp expect actual &&
+		echo "$submodurl/bare.git" >expect &&
+		git config submodule.repo_new.url >actual &&
+		test_cmp expect actual
+	)
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 111 - blame -L X,+N (non-numeric N)
+rm 'repo'
+ok 92 - submodule add --name allows to replace a submodule with another at the same path
 
-expecting success of 8001.112 'blame -L X,-N (non-numeric N)': 
-	test_must_fail $PROG -L1,-N file
+expecting success of 7400.93 'recursive relative submodules stay relative': 
+	test_when_finished "rm -rf super clone2 subsub sub3" &&
+	mkdir subsub &&
+	(
+		cd subsub &&
+		git init &&
+		>t &&
+		git add t &&
+		git commit -m "initial commit"
+	) &&
+	mkdir sub3 &&
+	(
+		cd sub3 &&
+		git init &&
+		>t &&
+		git add t &&
+		git commit -m "initial commit" &&
+		git submodule add ../subsub dirdir/subsub &&
+		git commit -m "add submodule subsub"
+	) &&
+	mkdir super &&
+	(
+		cd super &&
+		git init &&
+		>t &&
+		git add t &&
+		git commit -m "initial commit" &&
+		git submodule add ../sub3 &&
+		git commit -m "add submodule sub"
+	) &&
+	git clone super clone2 &&
+	(
+		cd clone2 &&
+		git submodule update --init --recursive &&
+		echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
+		echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
+	) &&
+	test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
+	test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 112 - blame -L X,-N (non-numeric N)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/subsub/.git/
+[main (root-commit) b53efa3] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub3/.git/
+[main (root-commit) b53efa3] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub3/dirdir/subsub'...
+done.
+[main e6f2fcc] add submodule subsub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 dirdir/subsub
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/.git/
+[main (root-commit) b53efa3] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/sub3'...
+done.
+[main a307821] add submodule sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub3
+Cloning into 'clone2'...
+done.
+Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub3) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/clone2/sub3'...
+done.
+Submodule path 'sub3': checked out 'e6f2fcc279299766e5fd82861e01a38b63aaaf3b'
+Submodule 'dirdir/subsub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/subsub) registered for path 'sub3/dirdir/subsub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/clone2/sub3/dirdir/subsub'...
+done.
+Submodule path 'sub3/dirdir/subsub': checked out 'b53efa3ba7e36ac5829f9621027fbe0575deb58e'
+ok 93 - recursive relative submodules stay relative
 
-expecting success of 8001.113 'blame -L ,^/RE/': 
-	test_must_fail $PROG -L1,^/99/ file
+expecting success of 7400.94 'submodule add with an existing name fails unless forced': 
+	(
+		cd addtest2 &&
+		rm -rf repo &&
+		git rm repo &&
+		test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo &&
+		test ! -d repo &&
+		test_must_fail git config -f .gitmodules submodule.repo_new.path &&
+		test_must_fail git config -f .gitmodules submodule.repo_new.url &&
+		echo "$submodurl/bare.git" >expect &&
+		git config submodule.repo_new.url >actual &&
+		test_cmp expect actual &&
+		git submodule add -f -q --name repo_new "$submodurl/repo.git" repo &&
+		test -d repo &&
+		echo "repo" >expect &&
+		git config -f .gitmodules submodule.repo_new.path >actual &&
+		test_cmp expect actual &&
+		echo "$submodurl/repo.git" >expect &&
+		git config -f .gitmodules submodule.repo_new.url >actual &&
+		test_cmp expect actual &&
+		echo "$submodurl/repo.git" >expect &&
+		git config submodule.repo_new.url >actual &&
+		test_cmp expect actual
+	)
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 113 - blame -L ,^/RE/
+rm 'repo'
+fatal: A git directory for 'repo_new' is found locally with remote(s):
+  origin	/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/bare.git
+If you want to reuse this local git directory instead of cloning again from
+  /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/repo.git
+use the '--force' option. If the local git directory is not the correct repo
+or you are unsure what this means choose another name with the '--name' option.
+Reactivating local git directory for submodule 'repo_new'
+ok 94 - submodule add with an existing name fails unless forced
 
-expecting success of 8001.114 'blame progress on a full file': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (10/10), done.
-	EOF
+expecting success of 7400.95 'set up a second submodule': 
+	git submodule add ./init2 example2 &&
+	git commit -m "submodule example2 added"
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress hello.c 2>stderr &&
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/example2'...
+done.
+[second b8be30a] submodule example2 added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 example2
+ok 95 - set up a second submodule
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+expecting success of 7400.96 'submodule deinit works on repository without submodules': 
+	test_when_finished "rm -rf newdirectory" &&
+	mkdir newdirectory &&
+	(
+		cd newdirectory &&
+		git init &&
+		>file &&
+		git add file &&
+		git commit -m "repo should not be empty" &&
+		git submodule deinit . &&
+		git submodule deinit --all
+	)
 
-846166ba (H 2005-04-07 15:42:13 -0700  1) #include <stdio.h>
-f82005e9 (F 2005-04-07 15:42:13 -0700  2) int main(int argc, const char *argv[])
-f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
-846166ba (H 2005-04-07 15:42:13 -0700  7) void mail()
-846166ba (H 2005-04-07 15:42:13 -0700  8) {
-846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
-846166ba (H 2005-04-07 15:42:13 -0700 10) }
-ok 114 - blame progress on a full file
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/newdirectory/.git/
+[main (root-commit) 9bf0f79] repo should not be empty
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+ok 96 - submodule deinit works on repository without submodules
 
-expecting success of 8001.115 'blame progress on a single range': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (4/4), done.
-	EOF
+expecting success of 7400.97 'submodule deinit should remove the whole submodule section from .git/config': 
+	git config submodule.example.foo bar &&
+	git config submodule.example2.frotz nitfol &&
+	git submodule deinit init &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -n "$(git config --get-regexp "submodule\.example2\.")" &&
+	test -f example2/.git &&
+	rmdir init
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 hello.c 2>stderr &&
+Cleared directory 'init'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
+ok 97 - submodule deinit should remove the whole submodule section from .git/config
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+expecting success of 7400.98 'submodule deinit should unset core.worktree': 
+	test_path_is_file .git/modules/example/config &&
+	test_must_fail git config -f .git/modules/example/config core.worktree
 
-f82005e9 (F 2005-04-07 15:42:13 -0700 3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700 4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700 5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700 6) }
-ok 115 - blame progress on a single range
+ok 98 - submodule deinit should unset core.worktree
 
-expecting success of 8001.116 'blame progress on multiple ranges': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (7/7), done.
-	EOF
+expecting success of 7400.99 'submodule deinit from subdirectory': 
+	git submodule update --init &&
+	git config submodule.example.foo bar &&
+	mkdir -p sub &&
+	(
+		cd sub &&
+		git submodule deinit ../init >../output
+	) &&
+	test_grep "\\.\\./init" output &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -n "$(git config --get-regexp "submodule\.example2\.")" &&
+	test -f example2/.git &&
+	rmdir init
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Cleared directory '../init'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path '../init'
+ok 99 - submodule deinit from subdirectory
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+expecting success of 7400.100 'submodule deinit . deinits all initialized submodules': 
+	git submodule update --init &&
+	git config submodule.example.foo bar &&
+	git config submodule.example2.frotz nitfol &&
+	test_must_fail git submodule deinit &&
+	git submodule deinit . >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	test_grep "Cleared directory .example2" actual &&
+	rmdir init example2
 
-f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
-846166ba (H 2005-04-07 15:42:13 -0700  8) {
-846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
-846166ba (H 2005-04-07 15:42:13 -0700 10) }
-ok 116 - blame progress on multiple ranges
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+fatal: Use '--all' if you really want to deinitialize all submodules
+Cleared directory 'init'
+Cleared directory 'example2'
+ok 100 - submodule deinit . deinits all initialized submodules
 
-expecting success of 8001.117 'annotate old revision': 
-	git annotate file main >actual &&
-	awk "{ print \$3; }" <actual >authors &&
-	test 2 = $(grep A <authors | wc -l) &&
-	test 2 = $(grep B <authors | wc -l)
+expecting success of 7400.101 'submodule deinit --all deinits all initialized submodules': 
+	git submodule update --init &&
+	git config submodule.example.foo bar &&
+	git config submodule.example2.frotz nitfol &&
+	test_must_fail git submodule deinit &&
+	git submodule deinit --all >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	test_grep "Cleared directory .example2" actual &&
+	rmdir init example2
 
-ok 117 - annotate old revision
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+fatal: Use '--all' if you really want to deinitialize all submodules
+Cleared directory 'init'
+Cleared directory 'example2'
+ok 101 - submodule deinit --all deinits all initialized submodules
 
-# passed all 117 test(s)
-1..117
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7519-status-fsmonitor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/.git/
-expecting success of 7519.1 'incompatible bare repo': 
-	test_when_finished "rm -rf ./bare-clone actual expect" &&
-	git init --bare bare-clone &&
+expecting success of 7400.102 'submodule deinit deinits a submodule when its work tree is missing or empty': 
+	git submodule update --init &&
+	rm -rf init example2/* example2/.git &&
+	git submodule deinit init example2 >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test -z "$(git config --get-regexp "submodule\.example2\.")" &&
+	test_grep ! "Cleared directory .init" actual &&
+	test_grep "Cleared directory .example2" actual &&
+	rmdir init
 
-	test_must_fail \
-		git -C ./bare-clone -c core.fsmonitor=foo \
-			update-index --fsmonitor 2>actual &&
-	grep "bare repository .* is incompatible with fsmonitor" actual &&
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Cleared directory 'example2'
+ok 102 - submodule deinit deinits a submodule when its work tree is missing or empty
 
-	test_must_fail \
-		git -C ./bare-clone -c core.fsmonitor=true \
-			update-index --fsmonitor 2>actual &&
-	grep "bare repository .* is incompatible with fsmonitor" actual
+expecting success of 7400.103 'submodule deinit fails when the submodule contains modifications unless forced': 
+	git submodule update --init &&
+	echo X >>init/s &&
+	test_must_fail git submodule deinit init &&
+	test -n "$(git config --get-regexp "submodule\.example\.")" &&
+	test -f example2/.git &&
+	git submodule deinit -f init >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/bare-clone/
-fatal: bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
-fatal: bare repository '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/bare-clone' is incompatible with fsmonitor
-ok 1 - incompatible bare repo
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+error: the following file has local modifications:
+    init
+(use --cached to keep the file, or -f to force removal)
+fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
+Cleared directory 'init'
+ok 103 - submodule deinit fails when the submodule contains modifications unless forced
 
-checking prerequisite: FSMONITOR_DAEMON
+expecting success of 7400.104 'submodule deinit fails when the submodule contains untracked files unless forced': 
+	git submodule update --init &&
+	echo X >>init/untracked &&
+	test_must_fail git submodule deinit init &&
+	test -n "$(git config --get-regexp "submodule\.example\.")" &&
+	test -f example2/.git &&
+	git submodule deinit -f init >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init
 
-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
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+error: the following file has local modifications:
+    init
+(use --cached to keep the file, or -f to force removal)
+fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
+Cleared directory 'init'
+ok 104 - submodule deinit fails when the submodule contains untracked files unless forced
 
-)
-prerequisite FSMONITOR_DAEMON not satisfied
-ok 2 # skip run fsmonitor-daemon in bare repo (missing FSMONITOR_DAEMON)
+expecting success of 7400.105 'submodule deinit fails when the submodule HEAD does not match unless forced': 
+	git submodule update --init &&
+	(
+		cd init &&
+		git checkout HEAD^
+	) &&
+	test_must_fail git submodule deinit init &&
+	test -n "$(git config --get-regexp "submodule\.example\.")" &&
+	test -f example2/.git &&
+	git submodule deinit -f init >actual &&
+	test -z "$(git config --get-regexp "submodule\.example\.")" &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init
 
-ok 3 # skip run fsmonitor-daemon in virtual repo (missing FSMONITOR_DAEMON,MINGW of MINGW,FSMONITOR_DAEMON)
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 7519.4 'setup': 
-	: >tracked &&
-	: >modified &&
-	mkdir dir1 &&
-	: >dir1/tracked &&
-	: >dir1/modified &&
-	mkdir dir2 &&
-	: >dir2/tracked &&
-	: >dir2/modified &&
-	git -c core.fsmonitor= add . &&
-	git -c core.fsmonitor= commit -m initial &&
-	git config core.fsmonitor .git/hooks/fsmonitor-test &&
-	cat >.gitignore <<-\EOF
-	.gitignore
-	expect*
-	actual*
-	marker*
-	trace2*
-	EOF
+  da28091 change subproject
 
-[master (root-commit) 1851a93] initial
- Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/modified
- create mode 100644 dir2/tracked
- create mode 100644 modified
- create mode 100644 tracked
-ok 4 - setup
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 7519.5 'fsmonitor extension is off by default': 
-	test-tool dump-fsmonitor >actual &&
-	grep "^no fsmonitor" actual
+ git branch <new-branch-name> da28091
 
-no fsmonitor
-ok 5 - fsmonitor extension is off by default
+HEAD is now at 36aca32 submodule commit 1
+error: the following file has local modifications:
+    init
+(use --cached to keep the file, or -f to force removal)
+fatal: Submodule work tree 'init' contains local modifications; use '-f' to discard them
+Cleared directory 'init'
+ok 105 - submodule deinit fails when the submodule HEAD does not match unless forced
 
-expecting success of 7519.6 'update-index --fsmonitor" adds the fsmonitor extension': 
-	git update-index --fsmonitor &&
-	test-tool dump-fsmonitor >actual &&
-	grep "^fsmonitor last update" actual
+expecting success of 7400.106 'submodule deinit is silent when used on an uninitialized submodule': 
+	git submodule update --init &&
+	git submodule deinit init >actual &&
+	test_grep "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit init >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit . >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep "Submodule .example2. (.*) unregistered for path .example2" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit . >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
+	test_grep "Cleared directory .init" actual &&
+	git submodule deinit --all >actual &&
+	test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+	test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
+	test_grep "Cleared directory .init" actual &&
+	rmdir init example2
 
-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 1739084116179922843
-ok 6 - update-index --fsmonitor" adds the fsmonitor extension
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/./.subrepo
+ * branch            da28091fa1960864823ed381ef2a1c41222b8351 -> FETCH_HEAD
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'init'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'init'
+Submodule 'example2' (./init2) unregistered for path 'example2'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'example2'
+warning: Could not unset core.worktree setting in submodule 'init'
+Cleared directory 'init'
+warning: Could not unset core.worktree setting in submodule 'example2'
+warning: Could not unset core.worktree setting in submodule 'init'
+Cleared directory 'init'
+ok 106 - submodule deinit is silent when used on an uninitialized submodule
 
-expecting success of 7519.7 'update-index --no-fsmonitor" removes the fsmonitor extension': 
-	git update-index --no-fsmonitor &&
-	test-tool dump-fsmonitor >actual &&
-	grep "^no fsmonitor" actual
+expecting success of 7400.107 'submodule deinit absorbs .git directory if .git is a directory': 
+	git submodule update --init &&
+	(
+		cd init &&
+		rm .git &&
+		mv ../.git/modules/example .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	git submodule deinit init &&
+	test_path_is_missing init/.git &&
+	test -z "$(git config --get-regexp "submodule\.example\.")"
 
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-warning: core.fsmonitor is set; remove it if you really want to disable fsmonitor
-no fsmonitor
-ok 7 - update-index --no-fsmonitor" removes the fsmonitor extension
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'example2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
+Submodule path 'example2': checked out 'cf4817bea522d7a895a8f804894e1254c741baae'
+Submodule path 'init': checked out 'da28091fa1960864823ed381ef2a1c41222b8351'
+warning: Submodule work tree 'init' contains a .git directory. This will be replaced with a .git file by using absorbgitdirs.
+Migrating git directory of 'init' from
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init/.git' to
+'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/.git/modules/example'
+Cleared directory 'init'
+Submodule 'example' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
+ok 107 - submodule deinit absorbs .git directory if .git is a directory
 
-expecting success of 7519.8 'update-index --fsmonitor-valid" sets the fsmonitor valid bit': 
-	test_hook fsmonitor-test<<-\EOF &&
-		printf "last_update_token\0"
-	EOF
-	git update-index --fsmonitor &&
-	git update-index --fsmonitor-valid dir1/modified &&
-	git update-index --fsmonitor-valid dir2/modified &&
-	git update-index --fsmonitor-valid modified &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+expecting success of 7400.108 'submodule with UTF-8 name': 
+	svname=$(printf "\303\245 \303\244\303\266") &&
+	mkdir "$svname" &&
+	(
+		cd "$svname" &&
+		git init &&
+		>sub &&
+		git add sub &&
+		git commit -m "init sub"
+	) &&
+	git submodule add ./"$svname" &&
+	git submodule >&2 &&
+	test -n "$(git submodule | grep "$svname")"
 
-ok 8 - update-index --fsmonitor-valid" sets the fsmonitor valid bit
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/å äö/.git/
+[main (root-commit) ea6909a] init sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub
+Adding existing repo at 'å äö' to the index
+ cf4817bea522d7a895a8f804894e1254c741baae example2 (rev-1-2-gcf4817b)
+-da28091fa1960864823ed381ef2a1c41222b8351 init
+ ea6909a6ccbadc034edc8c42d9d2b85a69afe610 å äö (heads/main)
+ok 108 - submodule with UTF-8 name
 
-expecting success of 7519.9 'update-index --no-fsmonitor-valid" clears the fsmonitor valid bit': 
-	git update-index --no-fsmonitor-valid dir1/modified &&
-	git update-index --no-fsmonitor-valid dir2/modified &&
-	git update-index --no-fsmonitor-valid modified &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+expecting success of 7400.109 'submodule add clone shallow submodule': 
+	mkdir super &&
+	pwd=$(pwd) &&
+	(
+		cd super &&
+		git init &&
+		git submodule add --depth=1 file://"$pwd"/example2 submodule &&
+		(
+			cd submodule &&
+			test 1 = $(git log --oneline | wc -l)
+		)
+	)
 
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-ok 9 - update-index --no-fsmonitor-valid" clears the fsmonitor valid bit
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/super/submodule'...
+ok 109 - submodule add clone shallow submodule
 
-expecting success of 7519.10 'all files returned by integration script get flagged as invalid': 
-	write_integration_script &&
-	dirty_repo &&
-	git update-index --fsmonitor &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+expecting success of 7400.110 'setup superproject with submodules': 
+	git init sub1 &&
+	test_commit -C sub1 test &&
+	test_commit -C sub1 test2 &&
+	git init multisuper &&
+	git -C multisuper submodule add ../sub1 sub0 &&
+	git -C multisuper submodule add ../sub1 sub1 &&
+	git -C multisuper submodule add ../sub1 sub2 &&
+	git -C multisuper submodule add ../sub1 sub3 &&
+	git -C multisuper commit -m "add some submodules"
 
-ok 10 - all files returned by integration script get flagged as invalid
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1/.git/
+[main (root-commit) f9e7a82] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.t
+[main 71cddcb] test2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test2.t
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/.git/
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub0'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub3'...
+done.
+[main (root-commit) a188ac0] add some submodules
+ Author: A U Thor <author@example.com>
+ 5 files changed, 16 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub0
+ create mode 160000 sub1
+ create mode 160000 sub2
+ create mode 160000 sub3
+ok 110 - setup superproject with submodules
 
-expecting success of 7519.11 'newly added files are marked valid': 
-	test_hook --setup --clobber fsmonitor-test<<-\EOF &&
-		printf "last_update_token\0"
-	EOF
-	git add new &&
-	git add dir1/new &&
-	git add dir2/new &&
-	git ls-files -f >actual &&
+expecting success of 7400.111 'submodule update --init with a specification': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	pwd=$(pwd) &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
+	git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 
-ok 11 - newly added files are marked valid
+Cloning into 'multisuper_clone'...
+Submodule 'sub1' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 111 - submodule update --init with a specification
 
-expecting success of 7519.12 'all unmodified files get marked valid': 
-	# modified files result in update-index returning 1
-	test_must_fail git update-index --refresh --force-write-index &&
-	git ls-files -f >actual &&
+expecting success of 7400.112 'submodule update --init with submodule.active set': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	pwd=$(pwd) &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
+	git -C multisuper_clone config submodule.active "." &&
+	git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
+	git -C multisuper_clone submodule update --init &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 
-dir1/modified: needs update
-dir2/modified: needs update
-modified: needs update
-ok 12 - all unmodified files get marked valid
-
-expecting success of 7519.13 '*only* files returned by the integration script get flagged as invalid': 
-	test_hook --clobber fsmonitor-test<<-\EOF &&
-	printf "last_update_token\0"
-	printf "dir1/modified\0"
-	EOF
-	clean_repo &&
-	git update-index --refresh --force-write-index &&
-	echo 1 >modified &&
-	echo 2 >dir1/modified &&
-	echo 3 >dir2/modified &&
-	test_must_fail git update-index --refresh --force-write-index &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+Cloning into 'multisuper_clone'...
+Submodule 'sub1' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 112 - submodule update --init with submodule.active set
 
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-dir1/modified: needs update
-ok 13 - *only* files returned by the integration script get flagged as invalid
+expecting success of 7400.113 'submodule update and setting submodule.<name>.active': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	pwd=$(pwd) &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
+	git -C multisuper_clone config --bool submodule.sub0.active "true" &&
+	git -C multisuper_clone config --bool submodule.sub1.active "false" &&
+	git -C multisuper_clone config --bool submodule.sub2.active "true" &&
 
-expecting success of 7519.14 'refresh_index() invalidates fsmonitor cache': 
-	clean_repo &&
-	dirty_repo &&
-	write_integration_script &&
-	git add . &&
-	test_hook --clobber fsmonitor-test<<-\EOF &&
+	cat >expect <<-\EOF &&
+	 sub0 (test2)
+	-sub1
+	 sub2 (test2)
+	-sub3
 	EOF
-	git commit -m "to reset" &&
-	git reset HEAD~1 &&
-	git status >actual &&
-	git -c core.fsmonitor= status >expect &&
+	git -C multisuper_clone submodule update &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 
-HEAD is now at 1851a93 initial
-warning: Empty last update token.
-[master 6edcb70] to reset
- Author: A U Thor <author@example.com>
- 9 files changed, 6 insertions(+)
- create mode 100644 dir1/new
- create mode 100644 dir1/untracked
- create mode 100644 dir2/new
- create mode 100644 dir2/untracked
- create mode 100644 new
- create mode 100644 untracked
-warning: Empty last update token.
-Unstaged changes after reset:
-M	dir1/modified
-M	dir2/modified
-M	modified
-warning: Empty last update token.
-ok 14 - refresh_index() invalidates fsmonitor cache
-
-expecting success of 7519.15 'setup preloadIndex to false': 
-		git config core.preloadIndex $preload_val &&
-		if test $preload_val = true
-		then
-			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
-		else
-			sane_unset GIT_TEST_PRELOAD_INDEX
-		fi
-	
-ok 15 - setup preloadIndex to false
-
-checking prerequisite: UNTRACKED_CACHE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-	{ git update-index --test-untracked-cache; ret=$?; } &&
-	test $ret -ne 1
-
-)
-warning: Empty last update token.
-Testing mtime in '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor' ...... OK
-prerequisite UNTRACKED_CACHE ok
-expecting success of 7519.16 'setup untracked cache to false': 
-			git config core.untrackedcache $uc_val
-		
-ok 16 - setup untracked cache to false
+Cloning into 'multisuper_clone'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 113 - submodule update and setting submodule.<name>.active
 
-expecting success of 7519.17 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 17 - compare status with and without fsmonitor
+expecting success of 7400.114 'clone active submodule without submodule url set': 
+	test_when_finished "rm -rf test/test" &&
+	mkdir test &&
+	# another dir breaks accidental relative paths still being correct
+	git clone file://"$pwd"/multisuper test/test &&
+	(
+		cd test/test &&
+		git config submodule.active "." &&
 
-expecting success of 7519.18 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-Untracked files:
-ok 18 - status doesn't detect unreported modifications
+		# do not pass --init flag, as the submodule is already active:
+		git submodule update &&
+		git submodule status >actual_raw &&
 
-expecting success of 7519.19 'setup untracked cache to true': 
-			git config core.untrackedcache $uc_val
-		
-ok 19 - setup untracked cache to true
+		cut -d" " -f3- actual_raw >actual &&
+		cat >expect <<-\EOF &&
+		sub0 (test2)
+		sub1 (test2)
+		sub2 (test2)
+		sub3 (test2)
+		EOF
+		test_cmp expect actual
+	)
 
-expecting success of 7519.20 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 20 - compare status with and without fsmonitor
+Cloning into 'test/test'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub0'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub1'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub2'...
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/test/test/sub3'...
+Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 114 - clone active submodule without submodule url set
 
-expecting success of 7519.21 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-ok 21 - status doesn't detect unreported modifications
+expecting success of 7400.115 'update submodules without url set in .gitconfig': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	git clone file://"$pwd"/multisuper multisuper_clone &&
 
-expecting success of 7519.22 'setup preloadIndex to true': 
-		git config core.preloadIndex $preload_val &&
-		if test $preload_val = true
-		then
-			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
-		else
-			sane_unset GIT_TEST_PRELOAD_INDEX
-		fi
-	
-ok 22 - setup preloadIndex to true
+	git -C multisuper_clone submodule init &&
+	for s in sub0 sub1 sub2 sub3
+	do
+		key=submodule.$s.url &&
+		git -C multisuper_clone config --local --unset $key &&
+		git -C multisuper_clone config --file .gitmodules --unset $key || return 1
+	done &&
 
-expecting success of 7519.23 'setup untracked cache to false': 
-			git config core.untrackedcache $uc_val
-		
-ok 23 - setup untracked cache to false
+	test_must_fail git -C multisuper_clone submodule update 2>err &&
+	grep "cannot clone submodule .sub[0-3]. without a URL" err
 
-expecting success of 7519.24 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 24 - compare status with and without fsmonitor
+Cloning into 'multisuper_clone'...
+Submodule 'sub0' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
+Submodule 'sub1' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+fatal: cannot clone submodule 'sub0' without a URL
+ok 115 - update submodules without url set in .gitconfig
 
-expecting success of 7519.25 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-Untracked files:
-ok 25 - status doesn't detect unreported modifications
+expecting success of 7400.116 'clone --recurse-submodules with a pathspec works': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	cat >expected <<-\EOF &&
+	 sub0 (test2)
+	-sub1
+	-sub2
+	-sub3
+	EOF
 
-expecting success of 7519.26 'setup untracked cache to true': 
-			git config core.untrackedcache $uc_val
-		
-ok 26 - setup untracked cache to true
+	git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expected actual
 
-expecting success of 7519.27 'compare status with and without fsmonitor': 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_cmp expect actual
-		
-HEAD is now at 1851a93 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 27 - compare status with and without fsmonitor
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub0' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub0'...
+done.
+Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 116 - clone --recurse-submodules with a pathspec works
 
-expecting success of 7519.28 'status doesn't detect unreported modifications': 
-			test_hook --clobber fsmonitor-test<<-\EOF &&
-			printf "last_update_token\0"
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_grep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_grep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_grep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 1851a93 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-ok 28 - status doesn't detect unreported modifications
+expecting success of 7400.117 'clone with multiple --recurse-submodules options': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	cat >expect <<-\EOF &&
+	-sub0
+	 sub1 (test2)
+	-sub2
+	 sub3 (test2)
+	EOF
 
-expecting success of 7519.29 'splitting the index results in the same state': 
-	write_integration_script &&
-	dirty_repo &&
-	git update-index --fsmonitor  &&
-	git ls-files -f >expect &&
-	test-tool dump-fsmonitor >&2 && echo &&
-	git update-index --fsmonitor --split-index &&
-	test-tool dump-fsmonitor >&2 && echo &&
-	git ls-files -f >actual &&
+	git clone --recurse-submodules="." \
+		  --recurse-submodules=":(exclude)sub0" \
+		  --recurse-submodules=":(exclude)sub2" \
+		  multisuper multisuper_clone &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 
-fsmonitor last update last_update_token
-------
-fsmonitor last update last_update_token
----
-ok 29 - splitting the index results in the same state
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+done.
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 117 - clone with multiple --recurse-submodules options
 
-expecting success of 7519.30 'ignore .git changes when invalidating UNTR': 
-	test_create_repo dot-git &&
-	(
-		cd dot-git &&
-		: >tracked &&
-		test-tool chmtime =-60 tracked &&
-		: >modified &&
-		test-tool chmtime =-60 modified &&
-		mkdir dir1 &&
-		: >dir1/tracked &&
-		test-tool chmtime =-60 dir1/tracked &&
-		: >dir1/modified &&
-		test-tool chmtime =-60 dir1/modified &&
-		mkdir dir2 &&
-		: >dir2/tracked &&
-		test-tool chmtime =-60 dir2/tracked &&
-		: >dir2/modified &&
-		test-tool chmtime =-60 dir2/modified &&
-		write_integration_script &&
-		git config core.fsmonitor .git/hooks/fsmonitor-test &&
-		git update-index --untracked-cache &&
-		git update-index --fsmonitor &&
-		git status &&
-		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-before" \
-		git status &&
-		test-tool dump-untracked-cache >../before
-	) &&
-	cat >>dot-git/.git/hooks/fsmonitor-test <<-\EOF &&
-	printf ".git\0"
-	printf ".git/index\0"
-	printf "dir1/.git\0"
-	printf "dir1/.git/index\0"
+expecting success of 7400.118 'clone and subsequent updates correctly auto-initialize submodules': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	cat <<-\EOF >expect &&
+	-sub0
+	 sub1 (test2)
+	-sub2
+	 sub3 (test2)
 	EOF
-	(
-		cd dot-git &&
-		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-after" \
-		git status &&
-		test-tool dump-untracked-cache >../after
-	) &&
-	grep "directory-invalidation" trace-before | cut -d"|" -f 9 >>before &&
-	grep "directory-invalidation" trace-after  | cut -d"|" -f 9 >>after &&
-	# UNTR extension unchanged, dir invalidation count unchanged
-	test_cmp before after
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/dot-git/.git/
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/
-	dir2/
-	modified
-	tracked
 
-nothing added to commit but untracked files present (use "git add" to track)
-On branch master
-
-No commits yet
+	cat <<-\EOF >expect2 &&
+	-sub0
+	 sub1 (test2)
+	-sub2
+	 sub3 (test2)
+	-sub4
+	 sub5 (test2)
+	EOF
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/
-	dir2/
-	modified
-	tracked
+	git clone --recurse-submodules="." \
+		  --recurse-submodules=":(exclude)sub0" \
+		  --recurse-submodules=":(exclude)sub2" \
+		  --recurse-submodules=":(exclude)sub4" \
+		  multisuper multisuper_clone &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-On branch master
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect actual &&
 
-No commits yet
+	git -C multisuper submodule add ../sub1 sub4 &&
+	git -C multisuper submodule add ../sub1 sub5 &&
+	git -C multisuper commit -m "add more submodules" &&
+	# obtain the new superproject
+	git -C multisuper_clone pull &&
+	git -C multisuper_clone submodule update --init &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
+	test_cmp expect2 actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/
-	dir2/
-	modified
-	tracked
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+done.
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub4'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper/sub5'...
+done.
+[main 084f781] add more submodules
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 160000 sub4
+ create mode 160000 sub5
+From /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper
+   a188ac0..084f781  main       -> origin/main
+Could not access submodule 'sub5' at commit 084f781
+Updating a188ac0..084f781
+Fast-forward
+ .gitmodules | 6 ++++++
+ sub4        | 1 +
+ sub5        | 1 +
+ 3 files changed, 8 insertions(+)
+ create mode 160000 sub4
+ create mode 160000 sub5
+Submodule 'sub5' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
+done.
+Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+ok 118 - clone and subsequent updates correctly auto-initialize submodules
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 30 - ignore .git changes when invalidating UNTR
+expecting success of 7400.119 'init properly sets the config': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	git clone --recurse-submodules="." \
+		  --recurse-submodules=":(exclude)sub0" \
+		  multisuper multisuper_clone &&
 
-expecting success of 7519.31 'discard_index() also discards fsmonitor info': 
-	test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
-	test_might_fail git update-index --refresh &&
-	test-tool read-cache --print-and-refresh=tracked 2 >actual &&
-	printf "tracked is%s up to date\n" "" " not" >expect &&
-	test_cmp expect actual
+	git -C multisuper_clone submodule init -- sub0 sub1 &&
+	git -C multisuper_clone config --get submodule.sub0.active &&
+	test_must_fail git -C multisuper_clone config --get submodule.sub1.active
 
-dir1/modified: needs update
-dir2/modified: needs update
-modified: needs update
-ok 31 - discard_index() also discards fsmonitor info
+Cloning into 'multisuper_clone'...
+done.
+Submodule 'sub1' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub1'
+Submodule 'sub2' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub2'
+Submodule 'sub3' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub3'
+Submodule 'sub4' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub4'
+Submodule 'sub5' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub5'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub2'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub3'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub4'...
+done.
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/multisuper_clone/sub5'...
+done.
+Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub3': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub4': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule path 'sub5': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
+Submodule 'sub0' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7400-submodule-basic/sub1) registered for path 'sub0'
+true
+ok 119 - init properly sets the config
 
-expecting success of 7519.32 'status succeeds after staging/unstaging': 
-	test_create_repo fsmonitor-stage-unstage &&
-	(
-		cd fsmonitor-stage-unstage &&
-		test_commit initial &&
-		git update-index --fsmonitor &&
-		removed=$(test_seq 1 100 | sed "s/^/z/") &&
-		touch $removed &&
-		git add $removed &&
-		git config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-env" &&
-		FSMONITOR_LIST="$removed" git restore -S $removed &&
-		FSMONITOR_LIST="$removed" git status
-	)
+expecting success of 7400.120 'recursive clone respects -q': 
+	test_when_finished "rm -rf multisuper_clone" &&
+	git clone -q --recurse-submodules multisuper multisuper_clone >actual &&
+	test_must_be_empty actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7519-status-fsmonitor/fsmonitor-stage-unstage/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-warning: core.fsmonitor is unset; set it if you really want to enable fsmonitor
-Unsupported core.fsmonitor hook version.
-Unsupported core.fsmonitor hook version.
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	z1
-	z10
-	z100
-	z11
-	z12
-	z13
-	z14
-	z15
-	z16
-	z17
-	z18
-	z19
-	z2
-	z20
-	z21
-	z22
-	z23
-	z24
-	z25
-	z26
-	z27
-	z28
-	z29
-	z3
-	z30
-	z31
-	z32
-	z33
-	z34
-	z35
-	z36
-	z37
-	z38
-	z39
-	z4
-	z40
-	z41
-	z42
-	z43
-	z44
-	z45
-	z46
-	z47
-	z48
-	z49
-	z5
-	z50
-	z51
-	z52
-	z53
-	z54
-	z55
-	z56
-	z57
-	z58
-	z59
-	z6
-	z60
-	z61
-	z62
-	z63
-	z64
-	z65
-	z66
-	z67
-	z68
-	z69
-	z7
-	z70
-	z71
-	z72
-	z73
-	z74
-	z75
-	z76
-	z77
-	z78
-	z79
-	z8
-	z80
-	z81
-	z82
-	z83
-	z84
-	z85
-	z86
-	z87
-	z88
-	z89
-	z9
-	z90
-	z91
-	z92
-	z93
-	z94
-	z95
-	z96
-	z97
-	z98
-	z99
+ok 120 - recursive clone respects -q
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 32 - status succeeds after staging/unstaging
+expecting success of 7400.121 '`submodule init` and `init.templateDir`': 
+	mkdir -p tmpl/hooks &&
+	write_script tmpl/hooks/post-checkout <<-EOF &&
+	echo HOOK-RUN >&2
+	echo I was here >hook.run
+	exit 1
+	EOF
 
-expecting success of 7519.33 'status succeeds with sparse index': 
+	test_config init.templateDir "$(pwd)/tmpl" &&
+	test_when_finished \
+		"git config --global --unset init.templateDir || true" &&
 	(
-		sane_unset GIT_TEST_SPLIT_INDEX &&
-
-		git clone . full &&
-		git clone --sparse . sparse &&
-		git -C sparse sparse-checkout init --cone --sparse-index &&
-		git -C sparse sparse-checkout set dir1 dir2 &&
-
-		test_hook --clobber fsmonitor-test <<-\EOF &&
-			printf "last_update_token\0"
-		EOF
-		git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
-		git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
-		check_sparse_index_behavior ! &&
-
-		test_hook --clobber fsmonitor-test <<-\EOF &&
-			printf "last_update_token\0"
-			printf "dir1/modified\0"
-		EOF
-		check_sparse_index_behavior ! &&
-
-		git -C sparse sparse-checkout add dir1a &&
+		sane_unset GIT_TEMPLATE_DIR &&
+		NO_SET_GIT_TEMPLATE_DIR=t &&
+		export NO_SET_GIT_TEMPLATE_DIR &&
 
-		for repo in full sparse
-		do
-			cp -r $repo/dir1 $repo/dir1a &&
-			git -C $repo add dir1a &&
-			git -C $repo commit -m "add dir1a" || return 1
-		done &&
-		git -C sparse sparse-checkout set dir1 dir2 &&
+		git config --global init.templateDir "$(pwd)/tmpl" &&
+		test_must_fail git submodule \
+			add "$submodurl" sub-global 2>err &&
+		git config --global --unset init.templateDir &&
+		test_grep HOOK-RUN err &&
+		test_path_is_file sub-global/hook.run &&
 
-		# This one modifies outside the sparse-checkout definition
-		# and hence we expect to expand the sparse-index.
-		test_hook --clobber fsmonitor-test <<-\EOF &&
-			printf "last_update_token\0"
-			printf "dir1a/modified\0"
-		EOF
-		check_sparse_index_behavior
+		git config init.templateDir "$(pwd)/tmpl" &&
+		git submodule add "$submodurl" sub-local 2>err &&
+		git config --unset init.templateDir &&
+		test_grep ! HOOK-RUN err &&
+		test_path_is_missing sub-local/hook.run
 	)
 
-Cloning into 'full'...
-done.
-Cloning into 'sparse'...
-done.
-{"event":"region_enter","sid":"20250209T065523.047163Z-Hcf858c9d-P001d8f47","thread":"main","time":"2025-02-09T06:55:23.047915Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250209T065523.047163Z-Hcf858c9d-P001d8f47","thread":"main","time":"2025-02-09T06:55:23.051404Z","file":"fsmonitor.c","line":186,"t_rel":0.003490,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20250209T065523.080278Z-Hcf858c9d-P001d9026","thread":"main","time":"2025-02-09T06:55:23.081051Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250209T065523.080278Z-Hcf858c9d-P001d9026","thread":"main","time":"2025-02-09T06:55:23.083209Z","file":"fsmonitor.c","line":186,"t_rel":0.002157,"nesting":1,"category":"fsm_hook","label":"query"}
-[master 1279bb5] add dir1a
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir1a/modified
- create mode 100644 dir1a/tracked
-[master 1279bb5] add dir1a
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir1a/modified
- create mode 100644 dir1a/tracked
-hint: The sparse index is expanding to a full index, a slow operation.
-hint: Your working directory likely has contents that are outside of
-hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
-hint: see your sparse-checkout definition and compare it to your working
-hint: directory contents. Running 'git clean' may assist in this cleanup.
-hint: Disable this message with "git config set advice.sparseIndexExpanded false"
-{"event":"region_enter","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.155381Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.159208Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.155961Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000580,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.159255Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000047,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.153798Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.156239Z","file":"fsmonitor.c","line":176,"nesting":2,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.155208Z","file":"fsmonitor.c","line":186,"t_rel":0.001409,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20250209T065523.152963Z-Hcf858c9d-P001d91ee","thread":"main","time":"2025-02-09T06:55:23.158041Z","file":"fsmonitor.c","line":186,"t_rel":0.001802,"nesting":2,"category":"fsm_hook","label":"query"}
-ok 33 - status succeeds with sparse index
+HOOK-RUN
+ok 121 - `submodule init` and `init.templateDir`
 
-# passed all 33 test(s)
-1..33
+# passed all 121 test(s)
+1..121
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7816-grep-binary-pattern.sh ***
@@ -508681,3831 +510480,595 @@
 fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
 ok 77 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>[ð]' a
 
-expecting success of 7816.78 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>[ð]' a': 
-			>stderr &&
-			printf 'æQ[ð]' | 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 78 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>[ð]' a
-
-expecting success of 7816.79 'LC_ALL='is_IS.utf8' git grep -P -f f  'æ<NUL>[ð]' a': 
-			printf 'æQ[ð]' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f  a
-		
-Binary file a matches
-ok 79 - LC_ALL='is_IS.utf8' git grep -P -f f  'æ<NUL>[ð]' a
-
-expecting success of 7816.80 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a': 
-			>stderr &&
-			printf '[æ]Qð' | 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 80 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a
-
-expecting success of 7816.81 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a': 
-			>stderr &&
-			printf '[æ]Qð' | 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 81 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a
-
-expecting success of 7816.82 'LC_ALL='is_IS.utf8' git grep -P -f f  '[æ]<NUL>ð' a': 
-			printf '[æ]Qð' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f  a
-		
-Binary file a matches
-ok 82 - LC_ALL='is_IS.utf8' git grep -P -f f  '[æ]<NUL>ð' a
-
-expecting success of 7816.83 '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 83 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.84 '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 84 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.85 '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 85 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.86 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a': 
-			>stderr &&
-			printf 'eQm.*cQ' | 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 86 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a
-
-expecting success of 7816.87 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a': 
-			>stderr &&
-			printf 'eQm.*cQ' | 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 87 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a
-
-expecting success of 7816.88 'LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m.*c<NUL>' a': 
-			printf 'eQm.*cQ' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f  a
-		
-Binary file a matches
-ok 88 - LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m.*c<NUL>' a
-
-expecting success of 7816.89 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a': 
-			>stderr &&
-			printf 'EQM.*cQ' | 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 89 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a
-
-expecting success of 7816.90 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a': 
-			>stderr &&
-			printf 'EQM.*cQ' | 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 90 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a
-
-expecting success of 7816.91 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M.*c<NUL>' a': 
-			printf 'EQM.*cQ' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f -i a
-		
-Binary file a matches
-ok 91 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M.*c<NUL>' a
-
-expecting success of 7816.92 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a': 
-			>stderr &&
-			printf 'eQm[*]c' | 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 92 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a
-
-expecting success of 7816.93 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a': 
-			>stderr &&
-			printf 'eQm[*]c' | 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 93 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a
-
-expecting success of 7816.94 'LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m[*]c' a': 
-			>stderr &&
-			printf 'eQm[*]c' | 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 94 - LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m[*]c' a
-
-expecting success of 7816.95 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a': 
-			>stderr &&
-			printf 'EQM[*]C' | 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 95 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a
-
-expecting success of 7816.96 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a': 
-			>stderr &&
-			printf 'EQM[*]C' | 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 96 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a
-
-expecting success of 7816.97 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M[*]C' a': 
-			>stderr &&
-			printf 'EQM[*]C' | 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 97 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M[*]C' a
-
-expecting success of 7816.98 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a': 
-			>stderr &&
-			printf 'NOMATCHQð' | 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 98 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a
-
-expecting success of 7816.99 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a': 
-			>stderr &&
-			printf 'NOMATCHQð' | 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 99 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a
-
-expecting success of 7816.100 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'NOMATCH<NUL>ð' a': 
-			>stderr &&
-			printf 'NOMATCHQð' | 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 100 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'NOMATCH<NUL>ð' a
-
-expecting success of 7816.101 '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 101 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>NOMATCH' a
-
-expecting success of 7816.102 '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 102 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>NOMATCH' a
-
-expecting success of 7816.103 '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 103 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Æ]<NUL>NOMATCH' a
-
-expecting success of 7816.104 '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 104 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[æ]<NUL>NOMATCH' a
-
-expecting success of 7816.105 '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 105 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[æ]<NUL>NOMATCH' a
-
-expecting success of 7816.106 '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 106 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[æ]<NUL>NOMATCH' a
-
-expecting success of 7816.107 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a': 
-			>stderr &&
-			printf 'yQ[f]' | 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 107 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
-
-expecting success of 7816.108 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a': 
-			>stderr &&
-			printf 'yQ[f]' | 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 108 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
-
-expecting success of 7816.109 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '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 -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 109 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>[f]' a
-
-expecting success of 7816.110 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a': 
-			>stderr &&
-			printf 'YQ[F]' | 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 110 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success of 7816.111 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a': 
-			>stderr &&
-			printf 'YQ[F]' | 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 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9002-column.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9003-help-autocorrect.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 status
-
-Cloning into bare repository 'bare.git'...
-done.
-Preparing worktree (new branch 'worktree')
-HEAD is now at b57823c a single log entry
-On branch worktree
-nothing to commit, working tree clean
-ok 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8002-blame.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8002-blame/.git/
-expecting success of 8002.1 'setup A lines': 
-	echo "1A quick brown fox jumps over the" >file &&
-	echo "lazy dog" >>file &&
-	git add file &&
-	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
-	git commit -a -m "Initial."
-
-[main (root-commit) 129283d] Initial.
- Author: A <A@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-ok 1 - setup A lines
-
-expecting success of 8002.2 'blame 1 author': 
-	check_count A 2
-
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-ok 2 - blame 1 author
-
-expecting success of 8002.3 'blame working copy': 
-	test_when_finished "git restore file" &&
-	echo "1A quick brown fox jumps over the" >file &&
-	echo "another lazy dog" >>file &&
-	check_count A 1 "Not Committed Yet" 1
-
-git blame -c  file 
-Author Not Committed Yet (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 3 - blame working copy
-
-expecting success of 8002.4 'blame with --contents': 
-	check_count --contents=file A 2
-
-git blame -c  --contents=file file 
-Author A (expected 2, attributed 2) good
-ok 4 - blame with --contents
-
-expecting success of 8002.5 'blame with --contents in a bare repo': 
-	git clone --bare . bare-contents.git &&
-	(
-		cd bare-contents.git &&
-		echo "1A quick brown fox jumps over the" >contents &&
-		check_count --contents=contents A 1
-	)
-
-Cloning into bare repository 'bare-contents.git'...
-done.
-git blame -c  --contents=contents file 
-Author A (expected 1, attributed 1) good
-ok 5 - blame with --contents in a bare repo
-
-expecting success of 8002.6 'blame with --contents changed': 
-	echo "1A quick brown fox jumps over the" >contents &&
-	echo "another lazy dog" >>contents &&
-	check_count --contents=contents A 1 "External file (--contents)" 1
-
-git blame -c  --contents=contents file 
-Author A (expected 1, attributed 1) good
-Author External file (--contents) (expected 1, attributed 1) good
-ok 6 - blame with --contents changed
-
-expecting success of 8002.7 'blame in a bare repo without starting commit': 
-	git clone --bare . bare.git &&
-	(
-		cd bare.git &&
-		check_count A 2
-	)
-
-Cloning into bare repository 'bare.git'...
-done.
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-ok 7 - blame in a bare repo without starting commit
-
-expecting success of 8002.8 'blame by tag objects': 
-	git tag -m "test tag" testTag &&
-	git tag -m "test tag #2" testTag2 testTag &&
-	check_count -h testTag A 2 &&
-	check_count -h testTag2 A 2
-
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f testTag2 testTag^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-git blame -c  file testTag
-Author A (expected 2, attributed 2) good
-git blame -c  file testTag2
-Author A (expected 2, attributed 2) good
-ok 8 - blame by tag objects
-
-expecting success of 8002.9 'setup B lines': 
-	echo "2A quick brown fox jumps over the" >>file &&
-	echo "lazy dog" >>file &&
-	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
-	git commit -a -m "Second."
-
-[main 7e31098] Second.
- Author: B <B@test.git>
- 1 file changed, 2 insertions(+)
-ok 9 - setup B lines
-
-expecting success of 8002.10 'blame 2 authors': 
-	check_count A 2 B 2
-
-git blame -c  file 
-Author B (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 10 - blame 2 authors
-
-expecting success of 8002.11 'blame with --contents and revision': 
-	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
-
-git blame -c  --contents=file file testTag
-Author A (expected 2, attributed 2) good
-Author External file (--contents) (expected 2, attributed 2) good
-ok 11 - blame with --contents and revision
-
-expecting success of 8002.12 'setup B1 lines (branch1)': 
-	git checkout -b branch1 main &&
-	echo "3A slow green fox jumps into the" >>file &&
-	echo "well." >>file &&
-	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
-	git commit -a -m "Branch1-1"
-
-Switched to a new branch 'branch1'
-[branch1 1b9b47a] Branch1-1
- Author: B1 <B1@test.git>
- 1 file changed, 2 insertions(+)
-ok 12 - setup B1 lines (branch1)
-
-expecting success of 8002.13 'blame 2 authors + 1 branch1 author': 
-	check_count A 2 B 2 B1 2
-
-git blame -c  file 
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
-ok 13 - blame 2 authors + 1 branch1 author
-
-expecting success of 8002.14 'setup B2 lines (branch2)': 
-	git checkout -b branch2 main &&
-	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
-	git commit -a -m "Branch2-1"
-
-Switched to a new branch 'branch2'
-[branch2 7d77deb] Branch2-1
- Author: B2 <B2@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - setup B2 lines (branch2)
-
-expecting success of 8002.15 'blame 2 authors + 1 branch2 author': 
-	check_count A 2 B 1 B2 1
-
-git blame -c  file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-ok 15 - blame 2 authors + 1 branch2 author
-
-expecting success of 8002.16 'merge branch1 & branch2': 
-	git merge branch1
-
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 ++
- 1 file changed, 2 insertions(+)
-ok 16 - merge branch1 & branch2
-
-expecting success of 8002.17 'blame 2 authors + 2 merged-in authors': 
-	check_count A 2 B 1 B1 2 B2 1
-
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 17 - blame 2 authors + 2 merged-in authors
-
-expecting success of 8002.18 'blame --first-parent blames merge for branch1': 
-	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
-
-git blame -c  --first-parent file 
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
-ok 18 - blame --first-parent blames merge for branch1
-
-expecting success of 8002.19 'blame ancestor': 
-	check_count -h main A 2 B 2
-
-git blame -c  file main
-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': 
-	check_count -h main^ A 2
-
-git blame -c  file main^
-Author A (expected 2, attributed 2) good
-ok 20 - blame great-ancestor
-
-expecting success of 8002.21 'setup evil merge': 
-	echo "evil merge." >>file &&
-	git commit -a --amend
-
-[branch2 c413b3e] Merge branch 'branch1' into branch2
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-ok 21 - setup evil merge
-
-expecting success of 8002.22 'blame evil merge': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
-
-git blame -c  file 
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 22 - blame evil merge
-
-expecting success of 8002.23 'blame huge graft': 
-	test_when_finished "git checkout branch2" &&
-	test_when_finished "rm -rf .git/info" &&
-	graft= &&
-	for i in 0 1 2
-	do
-		for j in 0 1 2 3 4 5 6 7 8 9
-		do
-			git checkout --orphan "$i$j" &&
-			printf "%s\n" "$i" "$j" >file &&
-			test_tick &&
-			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
-			git commit -a -m "$i$j" &&
-			commit=$(git rev-parse --verify HEAD) &&
-			graft="$graft$commit " || return 1
-		done
-	done &&
-	mkdir .git/info &&
-	printf "%s " $graft >.git/info/grafts &&
-	check_count -h 00 01 1 10 1
-
-Switched to a new branch '00'
-[00 (root-commit) e2c6177] 00
- Author: 00 <00@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '01'
-[01 (root-commit) 0dbe04b] 01
- Author: 01 <01@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '02'
-[02 (root-commit) 97fbca6] 02
- Author: 02 <02@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '03'
-[03 (root-commit) 5cdbcd8] 03
- Author: 03 <03@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '04'
-[04 (root-commit) 5a154cf] 04
- Author: 04 <04@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '05'
-[05 (root-commit) a84e1de] 05
- Author: 05 <05@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '06'
-[06 (root-commit) d4bea54] 06
- Author: 06 <06@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '07'
-[07 (root-commit) 24ba6e8] 07
- Author: 07 <07@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '08'
-[08 (root-commit) fe90088] 08
- Author: 08 <08@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '09'
-[09 (root-commit) 773a2fb] 09
- Author: 09 <09@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '10'
-[10 (root-commit) 80536e5] 10
- Author: 10 <10@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '11'
-[11 (root-commit) 33c07c1] 11
- Author: 11 <11@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '12'
-[12 (root-commit) ae7094b] 12
- Author: 12 <12@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '13'
-[13 (root-commit) 19e767d] 13
- Author: 13 <13@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '14'
-[14 (root-commit) f7159ac] 14
- Author: 14 <14@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '15'
-[15 (root-commit) d95fecf] 15
- Author: 15 <15@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '16'
-[16 (root-commit) d8bfdb9] 16
- Author: 16 <16@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '17'
-[17 (root-commit) aa3f31e] 17
- Author: 17 <17@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '18'
-[18 (root-commit) d76cb1d] 18
- Author: 18 <18@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '19'
-[19 (root-commit) 95e03c5] 19
- Author: 19 <19@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '20'
-[20 (root-commit) d40a964] 20
- Author: 20 <20@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '21'
-[21 (root-commit) 6c3def2] 21
- Author: 21 <21@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '22'
-[22 (root-commit) 78d2294] 22
- Author: 22 <22@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '23'
-[23 (root-commit) 76a64d0] 23
- Author: 23 <23@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '24'
-[24 (root-commit) 59f234a] 24
- Author: 24 <24@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '25'
-[25 (root-commit) 26ac47a] 25
- Author: 25 <25@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '26'
-[26 (root-commit) db7e855] 26
- Author: 26 <26@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '27'
-[27 (root-commit) 279f565] 27
- Author: 27 <27@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '28'
-[28 (root-commit) f691d9c] 28
- Author: 28 <28@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '29'
-[29 (root-commit) c72134e] 29
- Author: 29 <29@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-git blame -c  file 00
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-Author 01 (expected 1, attributed 1) good
-Author 10 (expected 1, attributed 1) good
-Switched to branch 'branch2'
-ok 23 - blame huge graft
-
-expecting success of 8002.24 'setup incomplete line': 
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
-	git commit -a -m "Incomplete"
-
-[branch2 565fef5] Incomplete
- Author: C <C@test.git>
- 1 file changed, 1 insertion(+)
-ok 24 - setup incomplete line
-
-expecting success of 8002.25 'blame incomplete line': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
-
-git blame -c  file 
-Author C (expected 1, attributed 1) good
-Author A U Thor (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
-Author B1 (expected 2, attributed 2) good
-ok 25 - blame incomplete line
-
-expecting success of 8002.26 'setup edits': 
-	mv file file.orig &&
-	{
-		cat file.orig &&
-		echo
-	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
-	git commit -a -m "edit"
-
-[branch2 96588b8] edit
- Author: D <D@test.git>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 26 - setup edits
-
-expecting success of 8002.27 'blame edits': 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
-
-git blame -c  file 
-Author A (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
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 27 - blame edits
-
-expecting success of 8002.28 'setup obfuscated email': 
-	echo "No robots allowed" >file.new &&
-	cat file >>file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
-	git commit -a -m "norobots"
-
-[branch2 04f7693] norobots
- Author: E <E at test dot git>
- 1 file changed, 1 insertion(+)
-ok 28 - setup obfuscated email
-
-expecting success of 8002.29 'blame obfuscated email': 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  file 
-Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (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 29 - blame obfuscated email
-
-expecting success of 8002.30 'blame -L 1 (all)': 
-	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L1 file 
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 30 - blame -L 1 (all)
-
-expecting success of 8002.31 'blame -L , (all)': 
-	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L, file 
-Author C (expected 1, attributed 1) good
-Author D (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 A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 31 - blame -L , (all)
-
-expecting success of 8002.32 'blame -L X (X to end)': 
-	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L5 file 
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 32 - blame -L X (X to end)
-
-expecting success of 8002.33 'blame -L X, (X to end)': 
-	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L5, file 
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 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 B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 34 - blame -L ,Y (up to Y)
-
-expecting success of 8002.35 'blame -L X,X': 
-	check_count -L3,3 B2 1
-
-git blame -c  -L3,3 file 
-Author B2 (expected 1, attributed 1) good
-ok 35 - blame -L X,X
-
-expecting success of 8002.36 'blame -L X,Y': 
-	check_count -L3,6 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L3,6 file 
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 36 - blame -L X,Y
-
-expecting success of 8002.37 'blame -L Y,X (undocumented)': 
-	check_count -L6,3 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L6,3 file 
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 37 - blame -L Y,X (undocumented)
-
-expecting success of 8002.38 'blame -L -X': 
-	test_must_fail $PROG -L-1 file
-
-fatal: -L invalid line number: -1
-ok 38 - blame -L -X
-
-expecting success of 8002.39 'blame -L 0': 
-	test_must_fail $PROG -L0 file
-
-fatal: -L invalid line number: 0
-ok 39 - blame -L 0
-
-expecting success of 8002.40 'blame -L ,0': 
-	test_must_fail $PROG -L,0 file
-
-fatal: -L invalid line number: 0
-ok 40 - blame -L ,0
-
-expecting success of 8002.41 'blame -L ,+0': 
-	test_must_fail $PROG -L,+0 file
-
-fatal: -L invalid empty range
-ok 41 - blame -L ,+0
-
-expecting success of 8002.42 'blame -L X,+0': 
-	test_must_fail $PROG -L1,+0 file
-
-fatal: -L invalid empty range
-ok 42 - blame -L X,+0
-
-expecting success of 8002.43 'blame -L X,+1': 
-	check_count -L3,+1 B2 1
-
-git blame -c  -L3,+1 file 
-Author B2 (expected 1, attributed 1) good
-ok 43 - blame -L X,+1
-
-expecting success of 8002.44 'blame -L X,+N': 
-	check_count -L3,+4 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L3,+4 file 
-Author 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 44 - blame -L X,+N
-
-expecting success of 8002.45 'blame -L ,-0': 
-	test_must_fail $PROG -L,-0 file
-
-fatal: -L invalid empty range
-ok 45 - blame -L ,-0
-
-expecting success of 8002.46 'blame -L X,-0': 
-	test_must_fail $PROG -L1,-0 file
-
-fatal: -L invalid empty range
-ok 46 - blame -L X,-0
-
-expecting success of 8002.47 'blame -L X,-1': 
-	check_count -L3,-1 B2 1
-
-git blame -c  -L3,-1 file 
-Author B2 (expected 1, attributed 1) good
-ok 47 - blame -L X,-1
-
-expecting success of 8002.48 'blame -L X,-N': 
-	check_count -L6,-4 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L6,-4 file 
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-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
-ok 49 - blame -L /RE/ (RE to end)
-
-expecting success of 8002.50 'blame -L /RE/,/RE2/': 
-	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
-
-git blame -c  -L/robot/,/green/ file 
-Author 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 B (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 B1 (expected 1, attributed 1) good
-Author D (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
-ok 52 - blame -L /RE/,Y
-
-expecting success of 8002.53 'blame -L /RE/,+N': 
-	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
-
-git blame -c  -L/99/,+3 file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 53 - blame -L /RE/,+N
-
-expecting success of 8002.54 'blame -L /RE/,-N': 
-	check_count -L/99/,-3 B 1 B2 1 D 1
-
-git blame -c  -L/99/,-3 file 
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 54 - blame -L /RE/,-N
-
-expecting success of 8002.55 'blame -L X (X == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n C 1
-
-git blame -c  -L8 file 
-Author C (expected 1, attributed 1) good
-ok 55 - blame -L X (X == nlines)
-
-expecting success of 8002.56 'blame -L X (X == nlines + 1)': 
-	n=$(expr $(wc -l <file) + 2) &&
-	test_must_fail $PROG -L$n file
-
-fatal: file file has only 8 lines
-ok 56 - blame -L X (X == nlines + 1)
-
-expecting success of 8002.57 'blame -L X (X > nlines)': 
-	test_must_fail $PROG -L12345 file
-
-fatal: file file has only 8 lines
-ok 57 - blame -L X (X > nlines)
-
-expecting success of 8002.58 'blame -L ,Y (Y == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L,8 file 
-Author D (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 A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 58 - blame -L ,Y (Y == nlines)
-
-expecting success of 8002.59 'blame -L ,Y (Y == nlines + 1)': 
-	n=$(expr $(wc -l <file) + 2) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L,9 file 
-Author E (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 A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 59 - blame -L ,Y (Y == nlines + 1)
-
-expecting success of 8002.60 'blame -L ,Y (Y > nlines)': 
-	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L,12345 file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 60 - blame -L ,Y (Y > nlines)
-
-expecting success of 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 B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-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 B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-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 B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 63 - blame -L multiple (adjacent)
-
-expecting success of 8002.64 'blame -L multiple (adjacent: unordered)': 
-	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
-
-git blame -c  -L4,5 -L2,3 file 
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 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 B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 65 - blame -L multiple (overlapping)
-
-expecting success of 8002.66 'blame -L multiple (overlapping: unordered)': 
-	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
-
-git blame -c  -L3,5 -L2,4 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 66 - blame -L multiple (overlapping: unordered)
-
-expecting success of 8002.67 'blame -L multiple (superset/subset)': 
-	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L2,8 -L3,5 file 
-Author A (expected 1, attributed 1) good
-Author 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
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 67 - blame -L multiple (superset/subset)
-
-expecting success of 8002.68 'blame -L multiple (superset/subset: unordered)': 
-	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L3,5 -L2,8 file 
-Author 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 B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 68 - blame -L multiple (superset/subset: unordered)
-
-expecting success of 8002.69 'blame -L /RE/ (relative)': 
-	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L3,3 -L/fox/ file 
-Author 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 C (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 U Thor (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 C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 70 - blame -L /RE/ (relative: no preceding range)
-
-expecting success of 8002.71 'blame -L /RE/ (relative: adjacent)': 
-	check_count -L1,1 -L/dog/,+1 A 1 E 1
-
-git blame -c  -L1,1 -L/dog/,+1 file 
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 71 - blame -L /RE/ (relative: adjacent)
-
-expecting success of 8002.72 'blame -L /RE/ (relative: not found)': 
-	test_must_fail $PROG -L4,4 -L/dog/ file
-
-fatal: -L parameter 'dog' starting at line 5: No match
-ok 72 - blame -L /RE/ (relative: not found)
-
-expecting success of 8002.73 'blame -L /RE/ (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L/$/ file
-
-fatal: file file has only 8 lines
-ok 73 - blame -L /RE/ (relative: end-of-file)
-
-expecting success of 8002.74 'blame -L ^/RE/ (absolute)': 
-	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
-
-git blame -c  -L3,3 -L^/dog/,+2 file 
-Author A (expected 1, attributed 1) good
-Author B2 (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 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)': 
-	test_must_fail $PROG -L4,4 -L^/tambourine/ file
-
-fatal: -L parameter 'tambourine' starting at line 1: No match
-ok 76 - blame -L ^/RE/ (absolute: not found)
-
-expecting success of 8002.77 'blame -L ^/RE/ (absolute: end-of-file)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
-
-git blame -c  -L8 -L^/$/,+2 file 
-Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 77 - blame -L ^/RE/ (absolute: end-of-file)
-
-expecting success of 8002.78 'setup -L :regex': 
-	tr Q "\\t" >hello.c <<-\EOF &&
-	int main(int argc, const char *argv[])
-	{
-	Qputs("hello");
-	}
-	EOF
-	git add hello.c &&
-	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
-	git commit -m "hello" &&
-
-	mv hello.c hello.orig &&
-	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
-	tr Q "\\t" >hello.c &&
-	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
-	git commit -a -m "goodbye" &&
-
-	mv hello.c hello.orig &&
-	echo "#include <stdio.h>" >hello.c &&
-	cat hello.orig >>hello.c &&
-	tr Q "\\t" >>hello.c <<-\EOF &&
-	void mail()
-	{
-	Qputs("mail");
-	}
-	EOF
-	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
-	git commit -a -m "mail"
-
-[branch2 f82005e] hello
- Author: F <F@test.git>
- 1 file changed, 4 insertions(+)
- create mode 100644 hello.c
-[branch2 edbab84] goodbye
- Author: G <G@test.git>
- 1 file changed, 1 insertion(+)
-[branch2 846166b] mail
- Author: H <H@test.git>
- 1 file changed, 5 insertions(+)
-ok 78 - setup -L :regex
-
-expecting success of 8002.79 'blame -L :literal': 
-	check_count -f hello.c -L:main F 4 G 1
-
-git blame -c  -L:main hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 79 - blame -L :literal
-
-expecting success of 8002.80 'blame -L :regex': 
-	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
-
-git blame -c  -L:m[a-z][a-z]l hello.c 
-Author H (expected 4, attributed 4) good
-ok 80 - blame -L :regex
-
-expecting success of 8002.81 'blame -L :nomatch': 
-	test_must_fail $PROG -L:nomatch hello.c
-
-fatal: -L parameter 'nomatch' starting at line 1: no match
-ok 81 - blame -L :nomatch
-
-expecting success of 8002.82 'blame -L :RE (relative)': 
-	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
-
-git blame -c  -L3,3 -L:ma.. hello.c 
-Author F (expected 1, attributed 1) good
-Author H (expected 4, attributed 4) good
-ok 82 - blame -L :RE (relative)
-
-expecting success of 8002.83 'blame -L :RE (relative: no preceding range)': 
-	check_count -f hello.c -L:ma.. F 4 G 1
-
-git blame -c  -L:ma.. hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 83 - blame -L :RE (relative: no preceding range)
-
-expecting success of 8002.84 'blame -L :RE (relative: not found)': 
-	test_must_fail $PROG -L3,3 -L:tambourine hello.c
-
-fatal: -L parameter 'tambourine' starting at line 4: no match
-ok 84 - blame -L :RE (relative: not found)
-
-expecting success of 8002.85 'blame -L :RE (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L:main hello.c
-
-fatal: -L parameter 'main' starting at line 11: no match
-ok 85 - blame -L :RE (relative: end-of-file)
-
-expecting success of 8002.86 'blame -L ^:RE (absolute)': 
-	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
-
-git blame -c  -L3,3 -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 86 - blame -L ^:RE (absolute)
-
-expecting success of 8002.87 'blame -L ^:RE (absolute: no preceding range)': 
-	check_count -f hello.c -L^:ma.. F 4 G 1
-
-git blame -c  -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 87 - blame -L ^:RE (absolute: no preceding range)
-
-expecting success of 8002.88 'blame -L ^:RE (absolute: not found)': 
-	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
-
-fatal: -L parameter 'tambourine' starting at line 1: no match
-ok 88 - blame -L ^:RE (absolute: not found)
-
-expecting success of 8002.89 'blame -L ^:RE (absolute: end-of-file)': 
-	n=$(printf "%d" $(wc -l <hello.c)) &&
-	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
-
-git blame -c  -L10 -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-Author H (expected 1, attributed 1) good
-ok 89 - blame -L ^:RE (absolute: end-of-file)
-
-expecting success of 8002.90 'blame -L :funcname with userdiff driver': 
-	cat >file.template <<-\EOF &&
-	DO NOT MATCH THIS LINE
-	function RIGHT(a, b) result(c)
-	AS THE DEFAULT DRIVER WOULD
-
-	integer, intent(in) :: ChangeMe
-	EOF
-
-	fortran_file=file.f03 &&
-	test_when_finished "rm .gitattributes" &&
-	echo "$fortran_file diff=fortran" >.gitattributes &&
-
-	test_commit --author "A <A@test.git>" \
-		"add" "$fortran_file" \
-		"$(cat file.template)" &&
-	test_commit --author "B <B@test.git>" \
-		"change" "$fortran_file" \
-		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
-	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
-
-[branch2 6b1b7a1] add
- Author: A <A@test.git>
- 1 file changed, 5 insertions(+)
- create mode 100644 file.f03
-[branch2 7caa17d] change
- Author: B <B@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-git blame -c  -L:RIGHT file.f03 
-Author A (expected 3, attributed 3) good
-Author B (expected 1, attributed 1) good
-ok 90 - blame -L :funcname with userdiff driver
-
-expecting success of 8002.91 'setup incremental': 
-	(
-	GIT_AUTHOR_NAME=I &&
-	export GIT_AUTHOR_NAME &&
-	GIT_AUTHOR_EMAIL=I@test.git &&
-	export GIT_AUTHOR_EMAIL &&
-	>incremental &&
-	git add incremental &&
-	git commit -m "step 0" &&
-	printf "partial" >>incremental &&
-	git commit -a -m "step 0.5" &&
-	echo >>incremental &&
-	git commit -a -m "step 1"
-	)
-
-[branch2 6c56eef] step 0
- Author: I <I@test.git>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 incremental
-[branch2 c79b19e] step 0.5
- Author: I <I@test.git>
- 1 file changed, 1 insertion(+)
-[branch2 f65a7a7] step 1
- Author: I <I@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 91 - setup incremental
-
-expecting success of 8002.92 'blame empty': 
-	check_count -h HEAD^^ -f incremental
-
-git blame -c  incremental HEAD^^
-ok 92 - blame empty
-
-expecting success of 8002.93 'blame -L 0 empty': 
-	test_must_fail $PROG -L0 incremental HEAD^^
-
-fatal: -L invalid line number: 0
-ok 93 - blame -L 0 empty
-
-expecting success of 8002.94 'blame -L 1 empty': 
-	test_must_fail $PROG -L1 incremental HEAD^^
-
-fatal: file incremental has only 0 lines
-ok 94 - blame -L 1 empty
-
-expecting success of 8002.95 'blame -L 2 empty': 
-	test_must_fail $PROG -L2 incremental HEAD^^
-
-fatal: file incremental has only 0 lines
-ok 95 - blame -L 2 empty
-
-expecting success of 8002.96 'blame half': 
-	check_count -h HEAD^ -f incremental I 1
-
-git blame -c  incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 96 - blame half
-
-expecting success of 8002.97 'blame -L 0 half': 
-	test_must_fail $PROG -L0 incremental HEAD^
-
-fatal: -L invalid line number: 0
-ok 97 - blame -L 0 half
-
-expecting success of 8002.98 'blame -L 1 half': 
-	check_count -h HEAD^ -f incremental -L1 I 1
-
-git blame -c  -L1 incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 98 - blame -L 1 half
-
-expecting success of 8002.99 'blame -L 2 half': 
-	test_must_fail $PROG -L2 incremental HEAD^
-
-fatal: file incremental has only 1 line
-ok 99 - blame -L 2 half
-
-expecting success of 8002.100 'blame -L 3 half': 
-	test_must_fail $PROG -L3 incremental HEAD^
-
-fatal: file incremental has only 1 line
-ok 100 - blame -L 3 half
-
-expecting success of 8002.101 'blame full': 
-	check_count -f incremental I 1
-
-git blame -c  incremental 
-Author I (expected 1, attributed 1) good
-ok 101 - blame full
-
-expecting success of 8002.102 'blame -L 0 full': 
-	test_must_fail $PROG -L0 incremental
-
-fatal: -L invalid line number: 0
-ok 102 - blame -L 0 full
-
-expecting success of 8002.103 'blame -L 1 full': 
-	check_count -f incremental -L1 I 1
-
-git blame -c  -L1 incremental 
-Author I (expected 1, attributed 1) good
-ok 103 - blame -L 1 full
-
-expecting success of 8002.104 'blame -L 2 full': 
-	test_must_fail $PROG -L2 incremental
-
-fatal: file incremental has only 1 line
-ok 104 - blame -L 2 full
-
-expecting success of 8002.105 'blame -L 3 full': 
-	test_must_fail $PROG -L3 incremental
-
-fatal: file incremental has only 1 line
-ok 105 - blame -L 3 full
-
-expecting success of 8002.106 'blame -L': 
-	test_must_fail $PROG -L file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-
-    <rev-opts> are documented in git-rev-list(1)
-
-    --[no-]incremental    show blame entries as we find them, incrementally
-    -b                    do not show object names of boundary commits (Default: off)
-    --[no-]root           do not treat root commits as boundaries (Default: off)
-    --[no-]show-stats     show work cost statistics
-    --[no-]progress       force progress reporting
-    --[no-]score-debug    show output score for blame entries
-    -f, --[no-]show-name  show original filename (Default: auto)
-    -n, --[no-]show-number
-                          show original linenumber (Default: off)
-    -p, --[no-]porcelain  show in a format designed for machine consumption
-    --[no-]line-porcelain show porcelain format with per-line commit information
-    -c                    use the same output mode as git-annotate (Default: off)
-    -t                    show raw timestamp (Default: off)
-    -l                    show long commit SHA1 (Default: off)
-    -s                    suppress author name and timestamp (Default: off)
-    -e, --[no-]show-email show author email instead of name (Default: off)
-    -w                    ignore whitespace differences
-    --[no-]ignore-rev <rev>
-                          ignore <rev> when blaming
-    --[no-]ignore-revs-file <file>
-                          ignore revisions from <file>
-    --[no-]color-lines    color redundant metadata from previous line differently
-    --[no-]color-by-age   color lines by age
-    --[no-]minimal        spend extra cycles to find better match
-    -S <file>             use revisions from <file> instead of calling git-rev-list
-    --[no-]contents <file>
-                          use <file>'s contents as the final image
-    -C[<score>]           find line copies within and across files
-    -M[<score>]           find line movements within and across files
-    -L <range>            process only line range <start>,<end> or function :<funcname>
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 106 - blame -L
-
-expecting success of 8002.107 'blame -L X,+': 
-	test_must_fail $PROG -L1,+ file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 107 - blame -L X,+
-
-expecting success of 8002.108 'blame -L X,-': 
-	test_must_fail $PROG -L1,- file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 108 - blame -L X,-
-
-expecting success of 8002.109 'blame -L X (non-numeric X)': 
-	test_must_fail $PROG -LX file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 109 - blame -L X (non-numeric X)
-
-expecting success of 8002.110 'blame -L X,Y (non-numeric Y)': 
-	test_must_fail $PROG -L1,Y file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 110 - blame -L X,Y (non-numeric Y)
-
-expecting success of 8002.111 'blame -L X,+N (non-numeric N)': 
-	test_must_fail $PROG -L1,+N file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 111 - blame -L X,+N (non-numeric N)
-
-expecting success of 8002.112 'blame -L X,-N (non-numeric N)': 
-	test_must_fail $PROG -L1,-N file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 112 - blame -L X,-N (non-numeric N)
-
-expecting success of 8002.113 'blame -L ,^/RE/': 
-	test_must_fail $PROG -L1,^/99/ file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 113 - blame -L ,^/RE/
-
-expecting success of 8002.114 'blame progress on a full file': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (10/10), done.
-	EOF
-
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress hello.c 2>stderr &&
-
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
-
-846166ba (H 2005-04-07 15:42:13 -0700  1) #include <stdio.h>
-f82005e9 (F 2005-04-07 15:42:13 -0700  2) int main(int argc, const char *argv[])
-f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
-846166ba (H 2005-04-07 15:42:13 -0700  7) void mail()
-846166ba (H 2005-04-07 15:42:13 -0700  8) {
-846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
-846166ba (H 2005-04-07 15:42:13 -0700 10) }
-ok 114 - blame progress on a full file
-
-expecting success of 8002.115 'blame progress on a single range': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (4/4), done.
-	EOF
-
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 hello.c 2>stderr &&
-
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
-
-f82005e9 (F 2005-04-07 15:42:13 -0700 3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700 4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700 5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700 6) }
-ok 115 - blame progress on a single range
-
-expecting success of 8002.116 'blame progress on multiple ranges': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (7/7), done.
-	EOF
-
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
-
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
-
-f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
-846166ba (H 2005-04-07 15:42:13 -0700  8) {
-846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
-846166ba (H 2005-04-07 15:42:13 -0700 10) }
-ok 116 - blame progress on multiple ranges
-
-expecting success of 8002.117 'setup': 
-	hexsz=$(test_oid hexsz)
-
-ok 117 - setup
-
-expecting success of 8002.118 'blame untracked file in empty repo': 
-	>untracked &&
-	test_must_fail git blame untracked
-
-fatal: no such path 'untracked' in HEAD
-ok 118 - blame untracked file in empty repo
-
-expecting success of 8002.119 'blame --show-email': 
-	check_count \
-		"<A@test.git>" 1 \
-		"<B@test.git>" 1 \
-		"<B1@test.git>" 1 \
-		"<B2@test.git>" 1 \
-		"<author@example.com>" 1 \
-		"<C@test.git>" 1 \
-		"<D@test.git>" 1 \
-		"<E at test dot git>" 1
-
-git blame -c -e  file 
-Author <B@test.git> (expected 1, attributed 1) good
-Author <author@example.com> (expected 1, attributed 1) good
-Author <B1@test.git> (expected 1, attributed 1) good
-Author <C@test.git> (expected 1, attributed 1) good
-Author <E at test dot git> (expected 1, attributed 1) good
-Author <B2@test.git> (expected 1, attributed 1) good
-Author <A@test.git> (expected 1, attributed 1) good
-Author <D@test.git> (expected 1, attributed 1) good
-ok 119 - blame --show-email
-
-expecting success of 8002.120 'setup showEmail tests': 
-	echo "bin: test number 1" >one &&
-	git add one &&
-	GIT_AUTHOR_NAME=name1 \
-	GIT_AUTHOR_EMAIL=email1@test.git \
-	git commit -m First --date="2010-01-01 01:00:00" &&
-	cat >expected_n <<-\EOF &&
-	(name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
-	EOF
-	cat >expected_e <<-\EOF
-	(<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
-	EOF
-
-[branch2 c39471f] First
- Author: name1 <email1@test.git>
- Date: Fri Jan 1 01:00:00 2010 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-ok 120 - setup showEmail tests
-
-expecting success of 8002.121 'blame with no options and no config': 
-	git blame one >blame &&
-	find_blame <blame >result &&
-	test_cmp expected_n result
-
-ok 121 - blame with no options and no config
-
-expecting success of 8002.122 'blame with showemail options': 
-	git blame --show-email one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_e result &&
-	git blame -e one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame3 &&
-	find_blame <blame3 >result &&
-	test_cmp expected_n result
-
-ok 122 - blame with showemail options
-
-expecting success of 8002.123 'blame with showEmail config false': 
-	git config blame.showEmail false &&
-	git blame one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_n result &&
-	git blame --show-email one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_e result &&
-	git blame -e one >blame3 &&
-	find_blame <blame3 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame4 &&
-	find_blame <blame4 >result &&
-	test_cmp expected_n result
-
-ok 123 - blame with showEmail config false
-
-expecting success of 8002.124 'blame with showEmail config true': 
-	git config blame.showEmail true &&
-	git blame one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_n result
-
-ok 124 - blame with showEmail config true
-
-expecting success of 8002.125 'set up abbrev tests': 
-	test_commit abbrev &&
-	sha1=$(git rev-parse --verify HEAD) &&
-	check_abbrev () {
-		expect=$1 && shift &&
-		echo $sha1 | cut -c 1-$expect >expect &&
-		git blame "$@" abbrev.t >actual &&
-		perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
-		test_cmp expect actual.sha
-	}
-
-[branch2 32e5f6f] abbrev
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abbrev.t
-ok 125 - set up abbrev tests
-
-expecting success of 8002.126 'blame --abbrev=<n> works': 
-	# non-boundary commits get +1 for alignment
-	check_abbrev 31 --abbrev=30 HEAD &&
-	check_abbrev 30 --abbrev=30 ^HEAD
-
-ok 126 - blame --abbrev=<n> works
-
-expecting success of 8002.127 'blame -l aligns regular and boundary commits': 
-	check_abbrev $hexsz         -l HEAD &&
-	check_abbrev $((hexsz - 1)) -l ^HEAD
-
-ok 127 - blame -l aligns regular and boundary commits
-
-expecting success of 8002.128 'blame --abbrev with full length behaves like -l': 
-	check_abbrev $hexsz         --abbrev=$hexsz HEAD &&
-	check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD
-
-ok 128 - blame --abbrev with full length behaves like -l
-
-expecting success of 8002.129 '--no-abbrev works like --abbrev with full length': 
-	check_abbrev $hexsz --no-abbrev
-
-ok 129 - --no-abbrev works like --abbrev with full length
-
-expecting success of 8002.130 '--exclude-promisor-objects does not BUG-crash': 
-	test_must_fail git blame --exclude-promisor-objects one
-
-error: unknown option `--exclude-promisor-objects'
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-
-    <rev-opts> are documented in git-rev-list(1)
-
-    --[no-]incremental    show blame entries as we find them, incrementally
-    -b                    do not show object names of boundary commits (Default: off)
-    --[no-]root           do not treat root commits as boundaries (Default: off)
-    --[no-]show-stats     show work cost statistics
-    --[no-]progress       force progress reporting
-    --[no-]score-debug    show output score for blame entries
-    -f, --[no-]show-name  show original filename (Default: auto)
-    -n, --[no-]show-number
-                          show original linenumber (Default: off)
-    -p, --[no-]porcelain  show in a format designed for machine consumption
-    --[no-]line-porcelain show porcelain format with per-line commit information
-    -c                    use the same output mode as git-annotate (Default: off)
-    -t                    show raw timestamp (Default: off)
-    -l                    show long commit SHA1 (Default: off)
-    -s                    suppress author name and timestamp (Default: off)
-    -e, --[no-]show-email show author email instead of name (Default: off)
-    -w                    ignore whitespace differences
-    --[no-]ignore-rev <rev>
-                          ignore <rev> when blaming
-    --[no-]ignore-revs-file <file>
-                          ignore revisions from <file>
-    --[no-]color-lines    color redundant metadata from previous line differently
-    --[no-]color-by-age   color lines by age
-    --[no-]minimal        spend extra cycles to find better match
-    -S <file>             use revisions from <file> instead of calling git-rev-list
-    --[no-]contents <file>
-                          use <file>'s contents as the final image
-    -C[<score>]           find line copies within and across files
-    -M[<score>]           find line movements within and across files
-    -L <range>            process only line range <start>,<end> or function :<funcname>
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 130 - --exclude-promisor-objects does not BUG-crash
-
-expecting success of 8002.131 'blame with uncommitted edits in partial clone does not crash': 
-	git init server &&
-	echo foo >server/file.txt &&
-	git -C server add file.txt &&
-	git -C server commit -m file &&
-
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	echo bar >>client/file.txt &&
-	git -C client blame file.txt
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8002-blame/server/.git/
-[main (root-commit) a09dc96] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.txt
-Cloning into 'client'...
-warning: filtering not recognized by server, ignoring
-^a09dc96 (A U Thor          2005-04-07 15:45:13 -0700 1) foo
-00000000 (Not Committed Yet 2025-02-09 06:55:23 +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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7814-grep-recurse-submodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/.git/
-expecting success of 7814.1 'setup directory structure and submodule': 
-	echo "(1|2)d(3|4)" >a &&
-	mkdir b &&
-	echo "(3|4)" >b/b &&
-	git add a b &&
-	git commit -m "add a and b" &&
-	test_tick &&
-	git init submodule &&
-	echo "(1|2)d(3|4)" >submodule/a &&
-	git -C submodule add a &&
-	git -C submodule commit -m "add a" &&
-	git submodule add ./submodule &&
-	git commit -m "added submodule" &&
-	test_tick
-
-[master (root-commit) 167e9ac] add a and b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b/b
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/submodule/.git/
-[master (root-commit) f764d75] add a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Adding existing repo at 'submodule' to the index
-[master 24c453d] added submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 1 - setup directory structure and submodule
-
-expecting success of 7814.2 'grep correctly finds patterns in a submodule': 
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	b/b:(3|4)
-	submodule/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 2 - grep correctly finds patterns in a submodule
-
-expecting success of 7814.3 'grep finds patterns in a submodule via config': 
-	test_config submodule.recurse true &&
-	# expect from previous test
-	git grep -e "(3|4)" >actual &&
-	test_cmp expect actual
-
-ok 3 - grep finds patterns in a submodule via config
-
-expecting success of 7814.4 'grep --no-recurse-submodules overrides config': 
-	test_config submodule.recurse true &&
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	b/b:(3|4)
-	EOF
-
-	git grep -e "(3|4)" --no-recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 4 - grep --no-recurse-submodules overrides config
-
-expecting success of 7814.5 'grep and basic pathspecs': 
-	cat >expect <<-\EOF &&
-	submodule/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e. --recurse-submodules -- submodule >actual &&
-	test_cmp expect actual
-
-ok 5 - grep and basic pathspecs
-
-expecting success of 7814.6 'grep and nested submodules': 
-	git init submodule/sub &&
-	echo "(1|2)d(3|4)" >submodule/sub/a &&
-	git -C submodule/sub add a &&
-	git -C submodule/sub commit -m "add a" &&
-	test_tick &&
-	git -C submodule submodule add ./sub &&
-	git -C submodule add sub &&
-	git -C submodule commit -m "added sub" &&
-	test_tick &&
-	git add submodule &&
-	git commit -m "updated submodule" &&
-	test_tick &&
-
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	b/b:(3|4)
-	submodule/a:(1|2)d(3|4)
-	submodule/sub/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/submodule/sub/.git/
-[master (root-commit) 0fb48cf] add a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Adding existing repo at 'sub' to the index
-[master d30b891] added sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[master bea0037] updated submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - grep and nested submodules
-
-expecting success of 7814.7 'grep and multiple patterns': 
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	submodule/a:(1|2)d(3|4)
-	submodule/sub/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --and -e "(1|2)" --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 7 - grep and multiple patterns
-
-expecting success of 7814.8 'grep and multiple patterns': 
-	cat >expect <<-\EOF &&
-	b/b:(3|4)
-	EOF
-
-	git grep -e "(3|4)" --and --not -e "(1|2)" --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 8 - grep and multiple patterns
-
-expecting success of 7814.9 'basic grep tree': 
-	cat >expect <<-\EOF &&
-	HEAD:a:(1|2)d(3|4)
-	HEAD:b/b:(3|4)
-	HEAD:submodule/a:(1|2)d(3|4)
-	HEAD:submodule/sub/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules HEAD >actual &&
-	test_cmp expect actual
-
-ok 9 - basic grep tree
-
-expecting success of 7814.10 'grep tree HEAD^': 
-	cat >expect <<-\EOF &&
-	HEAD^:a:(1|2)d(3|4)
-	HEAD^:b/b:(3|4)
-	HEAD^:submodule/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules HEAD^ >actual &&
-	test_cmp expect actual
-
-ok 10 - grep tree HEAD^
-
-expecting success of 7814.11 'grep tree HEAD^^': 
-	cat >expect <<-\EOF &&
-	HEAD^^:a:(1|2)d(3|4)
-	HEAD^^:b/b:(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules HEAD^^ >actual &&
-	test_cmp expect actual
-
-ok 11 - grep tree HEAD^^
-
-expecting success of 7814.12 'grep tree and pathspecs': 
-	cat >expect <<-\EOF &&
-	HEAD:submodule/a:(1|2)d(3|4)
-	HEAD:submodule/sub/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules HEAD -- submodule >actual &&
-	test_cmp expect actual
-
-ok 12 - grep tree and pathspecs
-
-expecting success of 7814.13 'grep tree and pathspecs': 
-	cat >expect <<-\EOF &&
-	HEAD:submodule/a:(1|2)d(3|4)
-	HEAD:submodule/sub/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodule*a" >actual &&
-	test_cmp expect actual
-
-ok 13 - grep tree and pathspecs
-
-expecting success of 7814.14 'grep tree and more pathspecs': 
-	cat >expect <<-\EOF &&
-	HEAD:submodule/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul?/a" >actual &&
-	test_cmp expect actual
-
-ok 14 - grep tree and more pathspecs
-
-expecting success of 7814.15 'grep tree and more pathspecs': 
-	cat >expect <<-\EOF &&
-	HEAD:submodule/sub/a:(1|2)d(3|4)
-	EOF
-
-	git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul*/sub/a" >actual &&
-	test_cmp expect actual
-
-ok 15 - grep tree and more pathspecs
-
-expecting success of 7814.16 'grep recurse submodule colon in name': 
-	git init parent &&
-	test_when_finished "rm -rf parent" &&
-	echo "(1|2)d(3|4)" >"parent/fi:le" &&
-	git -C parent add "fi:le" &&
-	git -C parent commit -m "add fi:le" &&
-	test_tick &&
-
-	git init "su:b" &&
-	test_when_finished "rm -rf su:b" &&
-	echo "(1|2)d(3|4)" >"su:b/fi:le" &&
-	git -C "su:b" add "fi:le" &&
-	git -C "su:b" commit -m "add fi:le" &&
-	test_tick &&
-
-	test_config_global protocol.file.allow always &&
-	git -C parent submodule add "../su:b" "su:b" &&
-	git -C parent commit -m "add submodule" &&
-	test_tick &&
-
-	cat >expect <<-\EOF &&
-	fi:le:(1|2)d(3|4)
-	su:b/fi:le:(1|2)d(3|4)
-	EOF
-	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	HEAD:fi:le:(1|2)d(3|4)
-	HEAD:su:b/fi:le:(1|2)d(3|4)
-	EOF
-	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-[master (root-commit) 8149a31] add fi:le
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fi:le
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/su:b/.git/
-[master (root-commit) 94095b4] add fi:le
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fi:le
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/su:b'...
-done.
-[master bedaa45] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 su:b
-ok 16 - grep recurse submodule colon in name
-
-expecting success of 7814.17 'grep history with moved submoules': 
-	git init parent &&
-	test_when_finished "rm -rf parent" &&
-	echo "(1|2)d(3|4)" >parent/file &&
-	git -C parent add file &&
-	git -C parent commit -m "add file" &&
-	test_tick &&
-
-	git init sub &&
-	test_when_finished "rm -rf sub" &&
-	echo "(1|2)d(3|4)" >sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add file" &&
-	test_tick &&
-
-	test_config_global protocol.file.allow always &&
-	git -C parent submodule add ../sub dir/sub &&
-	git -C parent commit -m "add submodule" &&
-	test_tick &&
-
-	cat >expect <<-\EOF &&
-	dir/sub/file:(1|2)d(3|4)
-	file:(1|2)d(3|4)
-	EOF
-	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
-	test_cmp expect actual &&
-
-	git -C parent mv dir/sub sub-moved &&
-	git -C parent commit -m "moved submodule" &&
-	test_tick &&
-
-	cat >expect <<-\EOF &&
-	file:(1|2)d(3|4)
-	sub-moved/file:(1|2)d(3|4)
-	EOF
-	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	HEAD^:dir/sub/file:(1|2)d(3|4)
-	HEAD^:file:(1|2)d(3|4)
-	EOF
-	git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD^ >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-[master (root-commit) 1d01947] add file
- 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.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
-[master (root-commit) cc4006b] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/dir/sub'...
-done.
-[master 9f8bb21] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 dir/sub
-[master cc98e46] moved submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename dir/sub => sub-moved (100%)
-ok 17 - grep history with moved submoules
-
-expecting success of 7814.18 'grep using relative path': 
-	test_when_finished "rm -rf parent sub" &&
-	git init sub &&
-	echo "(1|2)d(3|4)" >sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add file" &&
-	test_tick &&
-
-	git init parent &&
-	echo "(1|2)d(3|4)" >parent/file &&
-	git -C parent add file &&
-	mkdir parent/src &&
-	echo "(1|2)d(3|4)" >parent/src/file2 &&
-	git -C parent add src/file2 &&
-	test_config_global protocol.file.allow always &&
-	git -C parent submodule add ../sub &&
-	git -C parent commit -m "add files and submodule" &&
-	test_tick &&
-
-	# From top works
-	cat >expect <<-\EOF &&
-	file:(1|2)d(3|4)
-	src/file2:(1|2)d(3|4)
-	sub/file:(1|2)d(3|4)
-	EOF
-	git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
-	test_cmp expect actual &&
-
-	# Relative path to top
-	cat >expect <<-\EOF &&
-	../file:(1|2)d(3|4)
-	file2:(1|2)d(3|4)
-	../sub/file:(1|2)d(3|4)
-	EOF
-	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- .. >actual &&
-	test_cmp expect actual &&
-
-	# Relative path to submodule
-	cat >expect <<-\EOF &&
-	../sub/file:(1|2)d(3|4)
-	EOF
-	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- ../sub >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
-[master (root-commit) 41913eb] add file
- 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.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/sub'...
-done.
-[master (root-commit) 014e5fc] add files and submodule
- Author: A U Thor <author@example.com>
- 4 files changed, 6 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 file
- create mode 100644 src/file2
- create mode 160000 sub
-ok 18 - grep using relative path
-
-expecting success of 7814.19 'grep from a subdir': 
-	test_when_finished "rm -rf parent sub" &&
-	git init sub &&
-	echo "(1|2)d(3|4)" >sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add file" &&
-	test_tick &&
-
-	git init parent &&
-	mkdir parent/src &&
-	echo "(1|2)d(3|4)" >parent/src/file &&
-	git -C parent add src/file &&
-	test_config_global protocol.file.allow always &&
-	git -C parent submodule add ../sub src/sub &&
-	git -C parent submodule add ../sub sub &&
-	git -C parent commit -m "add files and submodules" &&
-	test_tick &&
-
-	# Verify grep from root works
-	cat >expect <<-\EOF &&
-	src/file:(1|2)d(3|4)
-	src/sub/file:(1|2)d(3|4)
-	sub/file:(1|2)d(3|4)
-	EOF
-	git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
-	test_cmp expect actual &&
-
-	# Verify grep from a subdir works
-	cat >expect <<-\EOF &&
-	file:(1|2)d(3|4)
-	sub/file:(1|2)d(3|4)
-	EOF
-	git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
-[master (root-commit) 1a98ea2] add file
- 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.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/src/sub'...
-done.
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/parent/sub'...
-done.
-[master (root-commit) ca3476d] add files and submodules
- Author: A U Thor <author@example.com>
- 4 files changed, 9 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 src/file
- create mode 160000 src/sub
- create mode 160000 sub
-ok 19 - grep from a subdir
-
-expecting success of 7814.20 '--recurse-submodules and --untracked are incompatible': 
-		test_must_fail git grep -e. --recurse-submodules --untracked 2>actual &&
-		test_grep 'not supported with --recurse-submodules' actual
-	
-fatal: --untracked not supported with --recurse-submodules
-ok 20 - --recurse-submodules and --untracked are incompatible
-
-expecting success of 7814.21 'grep --recurse-submodules --no-index ignores --recurse-submodules': 
-	git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual &&
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	submodule/a:(1|2)d(3|4)
-	submodule/sub/a:(1|2)d(3|4)
-	EOF
-	test_cmp expect actual
-
-ok 21 - grep --recurse-submodules --no-index ignores --recurse-submodules
-
-expecting success of 7814.22 'grep --recurse-submodules should pass the pattern type along': 
-	# Fixed
-	test_must_fail git grep -F --recurse-submodules -e "(.|.)[\d]" &&
-	test_must_fail git -c grep.patternType=fixed grep --recurse-submodules -e "(.|.)[\d]" &&
-
-	# Basic
-	git grep -G --recurse-submodules -e "(.|.)[\d]" >actual &&
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	submodule/a:(1|2)d(3|4)
-	submodule/sub/a:(1|2)d(3|4)
-	EOF
-	test_cmp expect actual &&
-	git -c grep.patternType=basic grep --recurse-submodules -e "(.|.)[\d]" >actual &&
-	test_cmp expect actual &&
-
-	# Extended
-	git grep -E --recurse-submodules -e "(.|.)[\d]" >actual &&
-	cat >expect <<-\EOF &&
-	.gitmodules:[submodule "submodule"]
-	.gitmodules:	path = submodule
-	.gitmodules:	url = ./submodule
-	a:(1|2)d(3|4)
-	submodule/.gitmodules:[submodule "sub"]
-	submodule/a:(1|2)d(3|4)
-	submodule/sub/a:(1|2)d(3|4)
-	EOF
-	test_cmp expect actual &&
-	git -c grep.patternType=extended grep --recurse-submodules -e "(.|.)[\d]" >actual &&
-	test_cmp expect actual &&
-	git -c grep.extendedRegexp=true grep --recurse-submodules -e "(.|.)[\d]" >actual &&
-	test_cmp expect actual &&
-
-	# Perl
-	if test_have_prereq PCRE
-	then
-		git grep -P --recurse-submodules -e "(.|.)[\d]" >actual &&
-		cat >expect <<-\EOF &&
-		a:(1|2)d(3|4)
-		b/b:(3|4)
-		submodule/a:(1|2)d(3|4)
-		submodule/sub/a:(1|2)d(3|4)
-		EOF
-		test_cmp expect actual &&
-		git -c grep.patternType=perl grep --recurse-submodules -e "(.|.)[\d]" >actual &&
-		test_cmp expect actual
-	fi
-
-ok 22 - grep --recurse-submodules should pass the pattern type along
-
-expecting success of 7814.23 'grep --recurse-submodules with submodules without .gitmodules in the working tree': 
-	test_when_finished "git -C submodule checkout .gitmodules" &&
-	rm submodule/.gitmodules &&
-	git grep --recurse-submodules -e "(.|.)[\d]" >actual &&
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	submodule/a:(1|2)d(3|4)
-	submodule/sub/a:(1|2)d(3|4)
-	EOF
-	test_cmp expect actual
-
-Updated 1 path from the index
-ok 23 - grep --recurse-submodules with submodules without .gitmodules in the working tree
-
-expecting success of 7814.24 'grep --recurse-submodules without --cached considers worktree modifications': 
-	reset_and_clean &&
-	echo "A modified line in submodule" >>submodule/a &&
-	echo "submodule/a:A modified line in submodule" >expect &&
-	git grep --recurse-submodules "A modified line in submodule" >actual &&
-	test_cmp expect actual
-
-HEAD is now at bea0037 updated submodule
-Removing .gitconfig
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
-ok 24 - grep --recurse-submodules without --cached considers worktree modifications
-
-expecting success of 7814.25 'grep --recurse-submodules with --cached ignores worktree modifications': 
-	reset_and_clean &&
-	echo "A modified line in submodule" >>submodule/a &&
-	test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
-	test_must_be_empty actual
-
-HEAD is now at bea0037 updated submodule
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
-ok 25 - grep --recurse-submodules with --cached ignores worktree modifications
-
-checking known breakage of 7814.26 'grep --textconv: superproject .gitattributes does not affect submodules': 
-	reset_and_clean &&
-	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
-	echo "a diff=d2x" >.gitattributes &&
-
-	cat >expect <<-\EOF &&
-	a:(1|2)x(3|4)
-	EOF
-	git grep --textconv --recurse-submodules x >actual &&
-	test_cmp expect actual
-
-HEAD is now at bea0037 updated submodule
-Removing actual
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
---- expect	2025-02-09 06:55:22.274211132 +0000
-+++ actual	2025-02-09 06:55:22.294211260 +0000
-@@ -1 +1,3 @@
- a:(1|2)x(3|4)
-+submodule/a:(1|2)x(3|4)
-+submodule/sub/a:(1|2)x(3|4)
-not ok 26 - grep --textconv: superproject .gitattributes does not affect submodules # TODO known breakage
-
-checking known breakage of 7814.27 'grep --textconv: superproject .gitattributes (from index) does not affect submodules': 
-	reset_and_clean &&
-	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
-	echo "a diff=d2x" >.gitattributes &&
-	git add .gitattributes &&
-	rm .gitattributes &&
-
-	cat >expect <<-\EOF &&
-	a:(1|2)x(3|4)
-	EOF
-	git grep --textconv --recurse-submodules x >actual &&
-	test_cmp expect actual
-
-HEAD is now at bea0037 updated submodule
-Removing .gitattributes
-Removing .gitconfig
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
---- expect	2025-02-09 06:55:22.414212023 +0000
-+++ actual	2025-02-09 06:55:22.430212125 +0000
-@@ -1 +1,3 @@
- a:(1|2)x(3|4)
-+submodule/a:(1|2)x(3|4)
-+submodule/sub/a:(1|2)x(3|4)
-not ok 27 - grep --textconv: superproject .gitattributes (from index) does not affect submodules # TODO known breakage
-
-checking known breakage of 7814.28 'grep --textconv: superproject .git/info/attributes does not affect submodules': 
-	reset_and_clean &&
-	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
-	super_info="$(git rev-parse --git-path info)" &&
-	super_attr="$super_info/attributes" &&
-	test_when_finished "rm -f \"$super_attr\"" &&
-	mkdir "$super_info" &&
-	echo "a diff=d2x" >"$super_attr" &&
-
-	cat >expect <<-\EOF &&
-	a:(1|2)x(3|4)
-	EOF
-	git grep --textconv --recurse-submodules x >actual &&
-	test_cmp expect actual
-
-HEAD is now at bea0037 updated submodule
-Removing .gitconfig
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
---- expect	2025-02-09 06:55:22.550212888 +0000
-+++ actual	2025-02-09 06:55:22.566212990 +0000
-@@ -1 +1,3 @@
- a:(1|2)x(3|4)
-+submodule/a:(1|2)x(3|4)
-+submodule/sub/a:(1|2)x(3|4)
-not ok 28 - grep --textconv: superproject .git/info/attributes does not affect submodules # TODO known breakage
+expecting success of 7816.78 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>[ð]' a': 
+			>stderr &&
+			printf 'æQ[ð]' | 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 78 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>[ð]' a
 
-checking known breakage of 7814.29 'grep --textconv correctly reads submodule .gitattributes': 
-	reset_and_clean &&
-	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
-	echo "a diff=d2x" >submodule/.gitattributes &&
+expecting success of 7816.79 'LC_ALL='is_IS.utf8' git grep -P -f f  'æ<NUL>[ð]' a': 
+			printf 'æQ[ð]' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f  a
+		
+Binary file a matches
+ok 79 - LC_ALL='is_IS.utf8' git grep -P -f f  'æ<NUL>[ð]' a
 
-	cat >expect <<-\EOF &&
-	submodule/a:(1|2)x(3|4)
-	EOF
-	git grep --textconv --recurse-submodules x >actual &&
-	test_cmp expect actual
+expecting success of 7816.80 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a': 
+			>stderr &&
+			printf '[æ]Qð' | 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 80 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a
 
-HEAD is now at bea0037 updated submodule
-Removing .gitconfig
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
---- expect	2025-02-09 06:55:22.710213906 +0000
-+++ actual	2025-02-09 06:55:22.722213983 +0000
-@@ -1 +1,2 @@
- submodule/a:(1|2)x(3|4)
-+submodule/sub/a:(1|2)x(3|4)
-not ok 29 - grep --textconv correctly reads submodule .gitattributes # TODO known breakage
+expecting success of 7816.81 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a': 
+			>stderr &&
+			printf '[æ]Qð' | 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 81 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[æ]<NUL>ð' a
 
-checking known breakage of 7814.30 'grep --textconv correctly reads submodule .gitattributes (from index)': 
-	reset_and_clean &&
-	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
-	echo "a diff=d2x" >submodule/.gitattributes &&
-	git -C submodule add .gitattributes &&
-	rm submodule/.gitattributes &&
+expecting success of 7816.82 'LC_ALL='is_IS.utf8' git grep -P -f f  '[æ]<NUL>ð' a': 
+			printf '[æ]Qð' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f  a
+		
+Binary file a matches
+ok 82 - LC_ALL='is_IS.utf8' git grep -P -f f  '[æ]<NUL>ð' a
 
-	cat >expect <<-\EOF &&
-	submodule/a:(1|2)x(3|4)
-	EOF
-	git grep --textconv --recurse-submodules x >actual &&
-	test_cmp expect actual
+expecting success of 7816.83 '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 83 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
 
-HEAD is now at bea0037 updated submodule
-Removing .gitconfig
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Removing .gitattributes
-Entering 'submodule/sub'
-not ok 30 - grep --textconv correctly reads submodule .gitattributes (from index) # TODO known breakage
+expecting success of 7816.84 '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 84 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
 
-checking known breakage of 7814.31 'grep --textconv correctly reads submodule .git/info/attributes': 
-	reset_and_clean &&
-	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+expecting success of 7816.85 '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 85 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
 
-	submodule_info="$(git -C submodule rev-parse --path-format=absolute --git-path info)" &&
-	submodule_attr="$submodule_info/attributes" &&
-	test_when_finished "rm -f \"$submodule_attr\"" &&
-	echo "a diff=d2x" >"$submodule_attr" &&
+expecting success of 7816.86 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a': 
+			>stderr &&
+			printf 'eQm.*cQ' | 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 86 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a
 
-	cat >expect <<-\EOF &&
-	submodule/a:(1|2)x(3|4)
-	EOF
-	git grep --textconv --recurse-submodules x >actual &&
-	test_cmp expect actual
+expecting success of 7816.87 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a': 
+			>stderr &&
+			printf 'eQm.*cQ' | 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 87 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m.*c<NUL>' a
 
-HEAD is now at bea0037 updated submodule
-Removing .gitconfig
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
-not ok 31 - grep --textconv correctly reads submodule .git/info/attributes # TODO known breakage
+expecting success of 7816.88 'LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m.*c<NUL>' a': 
+			printf 'eQm.*cQ' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f  a
+		
+Binary file a matches
+ok 88 - LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m.*c<NUL>' a
 
-checking known breakage of 7814.32 'grep saves textconv cache in the appropriate repository': 
-	reset_and_clean &&
-	test_config_global diff.d2x_cached.textconv "sed -e \"s/d/x/\"" &&
-	test_config_global diff.d2x_cached.cachetextconv true &&
-	echo "a diff=d2x_cached" >submodule/.gitattributes &&
+expecting success of 7816.89 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a': 
+			>stderr &&
+			printf 'EQM.*cQ' | 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 89 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a
 
-	# We only read/write to the textconv cache when grepping from an OID,
-	# as the working tree file might have modifications.
-	git grep --textconv --cached --recurse-submodules x &&
+expecting success of 7816.90 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a': 
+			>stderr &&
+			printf 'EQM.*cQ' | 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 90 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M.*c<NUL>' a
 
-	super_textconv_cache="$(git rev-parse --git-path refs/notes/textconv/d2x_cached)" &&
-	sub_textconv_cache="$(git -C submodule rev-parse \
-			--path-format=absolute --git-path refs/notes/textconv/d2x_cached)" &&
-	test_path_is_missing "$super_textconv_cache" &&
-	test_path_is_file "$sub_textconv_cache"
+expecting success of 7816.91 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M.*c<NUL>' a': 
+			printf 'EQM.*cQ' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f -i a
+		
+Binary file a matches
+ok 91 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M.*c<NUL>' a
 
-HEAD is now at bea0037 updated submodule
-Removing .gitconfig
-Removing actual
-Removing expect
-Entering 'submodule'
-HEAD is now at d30b891 added sub
-Entering 'submodule/sub'
-HEAD is now at 0fb48cf add a
-Entering 'submodule'
-Entering 'submodule/sub'
-submodule/a:(1|2)x(3|4)
-submodule/sub/a:(1|2)x(3|4)
-Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 41 Feb  9 06:55 .git/refs/notes/textconv/d2x_cached
-not ok 32 - grep saves textconv cache in the appropriate repository # TODO known breakage
+expecting success of 7816.92 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a': 
+			>stderr &&
+			printf 'eQm[*]c' | 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 92 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a
 
-expecting success of 7814.33 'grep partially-cloned submodule': 
-	# Set up clean superproject and submodule for partial cloning.
-	test_config_global protocol.file.allow always &&
-	git init super &&
-	git init super/sub &&
-	(
-		cd super &&
-		test_commit --no-tag "Add file in superproject" \
-			super-file "Some content for super-file" &&
-		test_commit -C sub --no-tag "Add file in submodule" \
-			sub-file "Some content for sub-file" &&
-		git submodule add ./sub &&
-		git commit -m "Add other as submodule sub" &&
-		test_tick &&
-		test_commit -C sub --no-tag --append "Update file in submodule" \
-			sub-file "Some more content for sub-file" &&
-		git add sub &&
-		git commit -m "Update submodule" &&
-		test_tick &&
-		git config --local uploadpack.allowfilter 1 &&
-		git config --local uploadpack.allowanysha1inwant 1 &&
-		git -C sub config --local uploadpack.allowfilter 1 &&
-		git -C sub config --local uploadpack.allowanysha1inwant 1
-	) &&
-	# Clone the superproject & submodule, then make sure we can lazy-fetch submodule objects.
-	git clone --filter=blob:none --also-filter-submodules \
-		--recurse-submodules "file://$(pwd)/super" partial &&
-	(
-		cd partial &&
-		cat >expect <<-\EOF &&
-		HEAD^:sub/sub-file:Some content for sub-file
-		HEAD^:super-file:Some content for super-file
-		EOF
+expecting success of 7816.93 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a': 
+			>stderr &&
+			printf 'eQm[*]c' | 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 93 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'e<NUL>m[*]c' a
 
-		GIT_TRACE2_EVENT="$(pwd)/trace2.log" git grep -e content \
-			--recurse-submodules HEAD^ >actual &&
-		test_cmp expect actual &&
-		# Verify that we actually fetched data from the promisor remote:
-		grep \"category\":\"promisor\",\"key\":\"fetch_count\",\"value\":\"1\" trace2.log
-	)
+expecting success of 7816.94 'LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m[*]c' a': 
+			>stderr &&
+			printf 'eQm[*]c' | 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 94 - LC_ALL='is_IS.utf8' git grep -P -f f  'e<NUL>m[*]c' a
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/super/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/super/sub/.git/
-[master (root-commit) 1314e8e] Add file in superproject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 super-file
-[master (root-commit) 1851742] Add file in submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub-file
-Adding existing repo at 'sub' to the index
-[master dc86339] Add other as submodule sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[master 289fae0] Update file in submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master db027f1] Update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'partial'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/super/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/partial/sub'...
-Submodule path 'sub': checked out '289fae02a658deff257301016761eff04f091022'
-{"event":"data","sid":"20250209T065523.426102Z-Hcf858c9d-P001d97b4","thread":"th01:unknown","time":"2025-02-09T06:55:23.431255Z","file":"promisor-remote.c","line":53,"repo":2,"t_abs":0.005413,"t_rel":0.002316,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
-ok 33 - grep partially-cloned submodule
+expecting success of 7816.95 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a': 
+			>stderr &&
+			printf 'EQM[*]C' | 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 95 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a
 
-expecting success of 7814.34 'check scope of core.useReplaceRefs': 
-	git init base &&
-	git init base/sub &&
+expecting success of 7816.96 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a': 
+			>stderr &&
+			printf 'EQM[*]C' | 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 96 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'E<NUL>M[*]C' a
 
-	echo A >base/a &&
-	echo B >base/b &&
-	echo C >base/sub/c &&
-	echo D >base/sub/d &&
+expecting success of 7816.97 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M[*]C' a': 
+			>stderr &&
+			printf 'EQM[*]C' | 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 97 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'E<NUL>M[*]C' a
 
-	git -C base/sub add c d &&
-	git -C base/sub commit -m "Add files" &&
+expecting success of 7816.98 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a': 
+			>stderr &&
+			printf 'NOMATCHQð' | 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 98 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a
 
-	git -C base submodule add ./sub &&
-	git -C base add a b sub &&
-	git -C base commit -m "Add files and submodule" &&
+expecting success of 7816.99 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a': 
+			>stderr &&
+			printf 'NOMATCHQð' | 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 99 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'NOMATCH<NUL>ð' a
 
-	A=$(git -C base rev-parse HEAD:a) &&
-	B=$(git -C base rev-parse HEAD:b) &&
-	C=$(git -C base/sub rev-parse HEAD:c) &&
-	D=$(git -C base/sub rev-parse HEAD:d) &&
+expecting success of 7816.100 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'NOMATCH<NUL>ð' a': 
+			>stderr &&
+			printf 'NOMATCHQð' | 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 100 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'NOMATCH<NUL>ð' a
 
-	git -C base replace $A $B &&
-	git -C base/sub replace $C $D &&
+expecting success of 7816.101 '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 101 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>NOMATCH' a
 
-	test_must_fail git -C base grep --cached --recurse-submodules A &&
-	test_must_fail git -C base grep --cached --recurse-submodules C &&
+expecting success of 7816.102 '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 102 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>NOMATCH' a
 
-	git -C base config core.useReplaceRefs false &&
-	git -C base grep --recurse-submodules A &&
-	test_must_fail git -C base grep --cached --recurse-submodules C &&
+expecting success of 7816.103 '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 103 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Æ]<NUL>NOMATCH' a
 
-	git -C base/sub config core.useReplaceRefs false &&
-	git -C base grep --cached --recurse-submodules A &&
-	git -C base grep --cached --recurse-submodules C &&
+expecting success of 7816.104 '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 104 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[æ]<NUL>NOMATCH' a
 
-	git -C base config --unset core.useReplaceRefs &&
-	test_must_fail git -C base grep --cached --recurse-submodules A &&
-	git -C base grep --cached --recurse-submodules C
+expecting success of 7816.105 '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 105 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[æ]<NUL>NOMATCH' a
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/base/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7814-grep-recurse-submodules/base/sub/.git/
-[master (root-commit) fb269c5] Add files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c
- create mode 100644 d
-Adding existing repo at 'sub' to the index
-[master (root-commit) 958c44c] Add files and submodule
- Author: A U Thor <author@example.com>
- 4 files changed, 6 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 a
- create mode 100644 b
- create mode 160000 sub
-a:A
-a:A
-sub/c:C
-sub/c:C
-ok 34 - check scope of core.useReplaceRefs
+expecting success of 7816.106 '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 106 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[æ]<NUL>NOMATCH' a
 
-# still have 7 known breakage(s)
-# passed all remaining 27 test(s)
-1..34
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t8014-blame-ignore-fuzzy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8014-blame-ignore-fuzzy/.git/
-expecting success of 8014.1 'setup': 
-	for i in $(test_seq 2 $last_test)
-	do
-		# Append each line in a separate commit to make it easy to
-		# check which original line the blame output relates to.
+expecting success of 7816.107 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a': 
+			>stderr &&
+			printf 'yQ[f]' | 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 107 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
 
-		line_count=0 &&
-		while IFS= read line
-		do
-			line_count=$((line_count+1)) &&
-			echo "$line" >>"$i" &&
-			git add "$i" &&
-			test_tick &&
-			GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count" || return 1
-		done <"a$i"
-	done &&
+expecting success of 7816.108 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a': 
+			>stderr &&
+			printf 'yQ[f]' | 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 108 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
 
-	for i in $(test_seq 2 $last_test)
-	do
-		# Overwrite the files with the final content.
-		cp b$i $i &&
-		git add $i || return 1
-	done &&
-	test_tick &&
+expecting success of 7816.109 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '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 -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 109 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>[f]' a
 
-	# Commit the final content all at once so it can all be
-	# referred to with the same commit ID.
-	GIT_AUTHOR_NAME=Final git commit -m Final &&
+expecting success of 7816.110 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a': 
+			>stderr &&
+			printf 'YQ[F]' | 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 110 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
 
-	IGNOREME=$(git rev-parse HEAD)
+expecting success of 7816.111 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a': 
+			>stderr &&
+			printf 'YQ[F]' | 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 111 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
 
-[master (root-commit) a459bb2] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2
-[master 455f594] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master ae356a5] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 986ba04] 4
- Author: 4 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 112fd1b] 5
- Author: 5 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 55cb950] 6
- Author: 6 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master fb44572] 7
- Author: 7 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 0193540] 8
- Author: 8 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 54573a7] 9
- Author: 9 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 2906ab9] 10
- Author: 10 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 993387a] 11
- Author: 11 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 5a378ed] 12
- Author: 12 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 07b780d] 13
- Author: 13 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 06d4280] 14
- Author: 14 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 83128e2] 15
- Author: 15 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master c7dc60e] 16
- Author: 16 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b64f9f3] 17
- Author: 17 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b2112c8] 18
- Author: 18 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 6de54b3] 19
- Author: 19 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master dd68dd4] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3
-[master ce31df2] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 843f64f] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 35030af] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4
-[master 953d34c] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 8e827ec] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 8c3589a] 4
- Author: 4 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 84cd02a] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5
-[master e94eb23] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 32c6f85] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master bf2d22c] 4
- Author: 4 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 2d1cc84] 5
- Author: 5 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 74b81ac] 6
- Author: 6 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 0854834] 7
- Author: 7 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4a530d1] 8
- Author: 8 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master ad63694] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6
-[master 7e3e3c7] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 8c39144] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 823725b] 4
- Author: 4 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 5728ada] 5
- Author: 5 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9c5745d] 6
- Author: 6 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 7ce3865] 7
- Author: 7 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9221615] 8
- Author: 8 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f7f2b1c] 9
- Author: 9 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master c156520] 10
- Author: 10 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b387727] 11
- Author: 11 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 3da1770] 12
- Author: 12 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9caa469] 13
- Author: 13 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 1449afa] 14
- Author: 14 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master eafda23] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7
-[master 83d236f] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 77d14eb] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8
-[master 860eb54] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 0b8c3b6] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4dbae56] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9
-[master 654f4f9] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 1194a28] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b071882] 4
- Author: 4 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d878653] 5
- Author: 5 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 04b3bcc] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10
-[master f574735] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master ecce56b] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master df40e26] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11
-[master dc03d7d] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b4f9f1c] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master fb77c6a] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12
-[master eab48da] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13
-[master 0adab8f] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 207a501] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master c6621c4] 4
- Author: 4 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 3134814] 5
- Author: 5 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 01c9204] Final
- Author: Final <author@example.com>
- 12 files changed, 53 insertions(+), 65 deletions(-)
-ok 1 - setup
+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 8014.2 'Regression test for partially overlapping search ranges': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 2 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected2 actual
-ok 2 - Regression test for partially overlapping search ranges
+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 8014.3 'Combine 3 lines into 2': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 3 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected3 actual
-ok 3 - Combine 3 lines into 2
+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 8014.4 'Add curly brackets': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 4 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected4 actual
-ok 4 - Add curly brackets
+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 8014.5 'Combine many lines and change case': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 5 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected5 actual
-ok 5 - Combine many lines and change case
+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 8014.6 'Rename and combine lines': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 6 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected6 actual
-ok 6 - Rename and combine lines
+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 8014.7 'Same line twice': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 7 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected7 actual
-ok 7 - Same line twice
+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 8014.8 'Enforce line order': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 8 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected8 actual
-ok 8 - Enforce line order
+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 8014.9 'Expand lines and rename variables': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 9 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected9 actual
-ok 9 - Expand lines and rename variables
+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 8014.10 'Two close matches versus one less close match': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 10 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected10 actual
-ok 10 - Two close matches versus one less close match
+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 8014.11 'Piggy in the middle': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 11 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected11 actual
-ok 11 - Piggy in the middle
+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 8014.12 'No trailing newline': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 12 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected12 actual
-ok 12 - No trailing newline
+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 8014.13 'Reorder includes': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 13 >output &&
-	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
-	test_cmp expected13 actual
-ok 13 - Reorder includes
+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 8014.14 'Diff chunks with no suspects': 
-	test_write_lines xy1 A B C xy1 >file &&
-	git add file &&
-	test_tick &&
-	GIT_AUTHOR_NAME=1 git commit -m 1 &&
+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
 
-	test_write_lines xy2 A B xy2 C xy2 >file &&
-	git add file &&
-	test_tick &&
-	GIT_AUTHOR_NAME=2 git commit -m 2 &&
-	REV_2=$(git rev-parse HEAD) &&
+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
 
-	test_write_lines xy3 A >file &&
-	git add file &&
-	test_tick &&
-	GIT_AUTHOR_NAME=3 git commit -m 3 &&
-	REV_3=$(git rev-parse HEAD) &&
+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
 
-	test_write_lines 1 1 >expected &&
+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
 
-	git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file >output &&
-	sed -e "$pick_author" output >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
 
-	test_cmp expected actual
-	
-[master c2d5eb7] 1
- Author: 1 <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 file
-[master 06b555d] 2
- Author: 2 <author@example.com>
- 1 file changed, 3 insertions(+), 2 deletions(-)
-[master a1483a3] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+), 5 deletions(-)
-ok 14 - Diff chunks with no suspects
+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 8014.15 'position matching': 
-	test_write_lines abc def >file2 &&
-	git add file2 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=1 git commit -m 1 &&
+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
 
-	test_write_lines abc def abc def >file2 &&
-	git add file2 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=2 git commit -m 2 &&
+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 abcx defx abcx defx >file2 &&
-	git add file2 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=3 git commit -m 3 &&
-	REV_3=$(git rev-parse HEAD) &&
+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 abcy defy abcx defx >file2 &&
-	git add file2 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=4 git commit -m 4 &&
-	REV_4=$(git rev-parse HEAD) &&
+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 1 1 2 2 >expected &&
+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 --ignore-rev $REV_3 --ignore-rev $REV_4 file2 >output &&
-	sed -e "$pick_author" output >actual &&
+expecting success of 7816.136 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 136 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a
 
-	test_cmp expected actual
-	
-[master 35116cb] 1
- Author: 1 <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 file2
-[master 2cf8ef0] 2
- Author: 2 <author@example.com>
- 1 file changed, 2 insertions(+)
-[master db13f6f] 3
- Author: 3 <author@example.com>
- 1 file changed, 4 insertions(+), 4 deletions(-)
-[master bf5dda1] 4
- Author: 4 <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 15 - position matching
+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 8014.16 'preserve order': 
-	test_write_lines bcde >file3 &&
-	git add file3 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=1 git commit -m 1 &&
+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 bcde fghij >file3 &&
-	git add file3 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=2 git commit -m 2 &&
+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 bcde fghij abcd >file3 &&
-	git add file3 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=3 git commit -m 3 &&
+expecting success of 7816.140 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 140 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
 
-	test_write_lines abcdx fghijx bcdex >file3 &&
-	git add file3 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=4 git commit -m 4 &&
-	REV_4=$(git rev-parse HEAD) &&
+expecting success of 7816.141 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 141 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
 
-	test_write_lines abcdx fghijy bcdex >file3 &&
-	git add file3 &&
-	test_tick &&
-	GIT_AUTHOR_NAME=5 git commit -m 5 &&
-	REV_5=$(git rev-parse HEAD) &&
+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
 
-	test_write_lines 1 2 3 >expected &&
+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
 
-	git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 >output &&
-	sed -e "$pick_author" output >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
 
-	test_cmp expected actual
-	
-[master 7405022] 1
- Author: 1 <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[master 83ccc7b] 2
- Author: 2 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 56aa8aa] 3
- Author: 3 <author@example.com>
- 1 file changed, 1 insertion(+)
-[master a6b3442] 4
- Author: 4 <author@example.com>
- 1 file changed, 3 insertions(+), 3 deletions(-)
-[master 9acf8a7] 5
- Author: 5 <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - preserve order
+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 16 test(s)
-1..16
+# passed all 145 test(s)
+1..145
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7900-maintenance.sh ***
@@ -512539,8 +511102,8 @@
 	test_subcommand git gc --no-quiet --no-detach <run-no-quiet.txt
 
 Nothing new to pack.
-{"event":"child_start","sid":"20250209T065521.402728Z-Hcf858c9d-P001d6173","thread":"main","time":"2025-02-09T06:55:21.403327Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20250209T065521.436484Z-Hcf858c9d-P001d6222","thread":"main","time":"2025-02-09T06:55:21.437058Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach"]}
+{"event":"child_start","sid":"20260314T133638.696133Z-H5c947e1c-P000643c4","thread":"main","time":"2026-03-14T13:36:38.696683Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260314T133638.956266Z-H5c947e1c-P000644ec","thread":"main","time":"2026-03-14T13:36:38.956844Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach"]}
 ok 2 - run [--auto|--quiet]
 
 expecting success of 7900.3 'maintenance.auto config option': 
@@ -512555,8 +511118,8 @@
 		commit --quiet --allow-empty -m 3 &&
 	test_subcommand ! git maintenance run --auto --quiet --detach <false
 
-{"event":"child_start","sid":"20250209T065521.480067Z-Hcf858c9d-P001d6333","thread":"main","time":"2025-02-09T06:55:21.482009Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
-{"event":"child_start","sid":"20250209T065521.489422Z-Hcf858c9d-P001d6383","thread":"main","time":"2025-02-09T06:55:21.491531Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260314T133639.328040Z-H5c947e1c-P000646c4","thread":"main","time":"2026-03-14T13:36:39.341959Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260314T133639.404273Z-H5c947e1c-P0006471c","thread":"main","time":"2026-03-14T13:36:39.415109Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
 ok 3 - maintenance.auto config option
 
 expecting success of 7900.4 'maintenance.autoDetach=true config option': 
@@ -512565,7 +511128,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":"20250209T065521.514028Z-Hcf858c9d-P001d6437","thread":"main","time":"2025-02-09T06:55:21.516053Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260314T133639.588707Z-H5c947e1c-P000647ed","thread":"main","time":"2026-03-14T13:36:39.598947Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
 ok 4 - maintenance.autoDetach=true config option
 
 expecting success of 7900.5 'maintenance.autoDetach=false config option': 
@@ -512574,7 +511137,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":"20250209T065521.539092Z-Hcf858c9d-P001d64fb","thread":"main","time":"2025-02-09T06:55:21.541290Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260314T133639.729324Z-H5c947e1c-P0006487f","thread":"main","time":"2026-03-14T13:36:39.739956Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
 ok 5 - maintenance.autoDetach=false config option
 
 expecting success of 7900.6 'gc.autoDetach=true config option': 
@@ -512583,7 +511146,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":"20250209T065521.558113Z-Hcf858c9d-P001d657c","thread":"main","time":"2025-02-09T06:55:21.560269Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20260314T133639.905800Z-H5c947e1c-P00064939","thread":"main","time":"2026-03-14T13:36:39.907833Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
 ok 6 - gc.autoDetach=true config option
 
 expecting success of 7900.7 'gc.autoDetach=false config option': 
@@ -512592,7 +511155,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":"20250209T065521.581228Z-Hcf858c9d-P001d663f","thread":"main","time":"2025-02-09T06:55:21.583664Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260314T133640.104570Z-H5c947e1c-P00064a31","thread":"main","time":"2026-03-14T13:36:40.117084Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
 ok 7 - gc.autoDetach=false config option
 
 expecting success of 7900.8 'maintenance.autoDetach overrides gc.autoDetach': 
@@ -512602,7 +511165,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":"20250209T065521.602929Z-Hcf858c9d-P001d66ef","thread":"main","time":"2025-02-09T06:55:21.605045Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260314T133640.276601Z-H5c947e1c-P00064ae4","thread":"main","time":"2026-03-14T13:36:40.285309Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
 ok 8 - maintenance.autoDetach overrides gc.autoDetach
 
 expecting success of 7900.9 'register uses XDG_CONFIG_HOME config if it exists': 
@@ -512661,7 +511224,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":"20250209T065521.675956Z-Hcf858c9d-P001d6924","thread":"main","time":"2025-02-09T06:55:21.676537Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133640.948273Z-H5c947e1c-P00064e25","thread":"main","time":"2026-03-14T13:36:40.948810Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
 ok 13 - maintenance.<task>.enabled
 
 expecting success of 7900.14 'run --task=<task>': 
@@ -512680,11 +511243,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":"20250209T065521.696046Z-Hcf858c9d-P001d69b5","thread":"main","time":"2025-02-09T06:55:21.696619Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20250209T065521.743116Z-Hcf858c9d-P001d6ae6","thread":"main","time":"2025-02-09T06:55:21.743692Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20250209T065521.687198Z-Hcf858c9d-P001d6975","thread":"main","time":"2025-02-09T06:55:21.687795Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065521.736015Z-Hcf858c9d-P001d6ab7","thread":"main","time":"2025-02-09T06:55:21.736599Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065521.743116Z-Hcf858c9d-P001d6ae6","thread":"main","time":"2025-02-09T06:55:21.776464Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133641.107477Z-H5c947e1c-P00064ec1","thread":"main","time":"2026-03-14T13:36:41.108076Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260314T133641.348014Z-H5c947e1c-P00064ffa","thread":"main","time":"2026-03-14T13:36:41.348547Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20260314T133641.057798Z-H5c947e1c-P00064ea0","thread":"main","time":"2026-03-14T13:36:41.058362Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133641.301152Z-H5c947e1c-P00064fc5","thread":"main","time":"2026-03-14T13:36:41.306686Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133641.348014Z-H5c947e1c-P00064ffa","thread":"main","time":"2026-03-14T13:36:41.533595Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
 ok 14 - run --task=<task>
 
 expecting success of 7900.15 'core.commitGraph=false prevents write process': 
@@ -512732,9 +511295,9 @@
  Author: A U Thor <author@example.com>
 [master 826111a] third
  Author: A U Thor <author@example.com>
-{"event":"child_start","sid":"20250209T065521.812761Z-Hcf858c9d-P001d6cac","thread":"main","time":"2025-02-09T06:55:21.813395Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065521.834658Z-Hcf858c9d-P001d6d69","thread":"main","time":"2025-02-09T06:55:21.835798Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065521.852222Z-Hcf858c9d-P001d6de5","thread":"main","time":"2025-02-09T06:55:21.853455Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133641.880061Z-H5c947e1c-P00065271","thread":"main","time":"2026-03-14T13:36:41.880648Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133642.016088Z-H5c947e1c-P0006530e","thread":"main","time":"2026-03-14T13:36:42.017159Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133642.136006Z-H5c947e1c-P0006537a","thread":"main","time":"2026-03-14T13:36:42.137119Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
 ok 16 - commit-graph auto condition
 
 expecting success of 7900.17 'run --task=bogus': 
@@ -512801,8 +511364,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-{"event":"child_start","sid":"20250209T065521.953418Z-Hcf858c9d-P001d711b","thread":"main","time":"2025-02-09T06:55:21.954072Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote1","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
-{"event":"child_start","sid":"20250209T065521.953418Z-Hcf858c9d-P001d711b","thread":"main","time":"2025-02-09T06:55:21.975331Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+{"event":"child_start","sid":"20260314T133642.875993Z-H5c947e1c-P00065649","thread":"main","time":"2026-03-14T13:36:42.876630Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote1","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+{"event":"child_start","sid":"20260314T133642.875993Z-H5c947e1c-P00065649","thread":"main","time":"2026-03-14T13:36:42.988467Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
 commit 3381d63412cf2a4c8ab1a7ad5eaba88b720e200c
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:14:13 2005 -0700
@@ -512955,7 +511518,7 @@
  * [new branch]      master     -> remote2/master
  * [new branch]      two        -> remote2/two
  * [new tag]         two        -> two
-{"event":"child_start","sid":"20250209T065522.069883Z-Hcf858c9d-P001d745b","thread":"main","time":"2025-02-09T06:55:22.070548Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+{"event":"child_start","sid":"20260314T133643.584359Z-H5c947e1c-P00065905","thread":"main","time":"2026-03-14T13:36:43.584968Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
 ok 20 - prefetch multiple remotes
 
 expecting success of 7900.21 'loose-objects task': 
@@ -513025,8 +511588,8 @@
 
 07163daad06a0119b0a241cf1882adae4f88fd56
 4e26d6d394bf76d04cf3ab6f994c0bcaaf1a0a2f
-{"event":"child_start","sid":"20250209T065522.196088Z-Hcf858c9d-P001d77f5","thread":"main","time":"2025-02-09T06:55:22.196881Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250209T065522.209528Z-Hcf858c9d-P001d784e","thread":"main","time":"2025-02-09T06:55:22.210363Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133644.571346Z-H5c947e1c-P00065d5e","thread":"main","time":"2026-03-14T13:36:44.572126Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133644.662969Z-H5c947e1c-P00065dd5","thread":"main","time":"2026-03-14T13:36:44.663725Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
 ok 22 - maintenance.loose-objects.auto
 
 expecting success of 7900.23 'incremental-repack task': 
@@ -513139,7 +511702,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
 2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20250209T065522.434284Z-Hcf858c9d-P001d7ed3","thread":"main","time":"2025-02-09T06:55:22.434999Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260314T133646.319471Z-H5c947e1c-P000665ff","thread":"main","time":"2026-03-14T13:36:46.320138Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 25 - maintenance.incremental-repack.auto
 
 expecting success of 7900.26 'maintenance.incremental-repack.auto (when config is unset)': 
@@ -513166,7 +511729,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
 2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20250209T065522.546885Z-Hcf858c9d-P001d8225","thread":"main","time":"2025-02-09T06:55:22.547589Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260314T133647.067682Z-H5c947e1c-P00066947","thread":"main","time":"2026-03-14T13:36:47.068395Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 26 - maintenance.incremental-repack.auto (when config is unset)
 
 expecting success of 7900.27 'pack-refs task': 
@@ -513178,7 +511741,7 @@
 		git maintenance run --task=pack-refs &&
 	test_subcommand git pack-refs --all --prune <pack-refs.txt
 
-{"event":"child_start","sid":"20250209T065522.591833Z-Hcf858c9d-P001d8359","thread":"main","time":"2025-02-09T06:55:22.592425Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20260314T133647.320239Z-H5c947e1c-P00066a56","thread":"main","time":"2026-03-14T13:36:47.320804Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
 ok 27 - pack-refs task
 
 expecting success of 7900.28 '--auto and --schedule incompatible': 
@@ -513224,12 +511787,12 @@
 		--no-progress <weekly.txt &&
 	test_subcommand git multi-pack-index write --no-progress <weekly.txt
 
-{"event":"child_start","sid":"20250209T065522.629568Z-Hcf858c9d-P001d8464","thread":"main","time":"2025-02-09T06:55:22.681271Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250209T065522.697954Z-Hcf858c9d-P001d861e","thread":"main","time":"2025-02-09T06:55:22.723344Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250209T065522.697954Z-Hcf858c9d-P001d861e","thread":"main","time":"2025-02-09T06:55:22.728353Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065522.741802Z-Hcf858c9d-P001d8755","thread":"main","time":"2025-02-09T06:55:22.764300Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250209T065522.741802Z-Hcf858c9d-P001d8755","thread":"main","time":"2025-02-09T06:55:22.787217Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065522.741802Z-Hcf858c9d-P001d8755","thread":"main","time":"2025-02-09T06:55:22.767743Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260314T133647.608840Z-H5c947e1c-P00066b9d","thread":"main","time":"2026-03-14T13:36:47.832187Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133648.004255Z-H5c947e1c-P00066d35","thread":"main","time":"2026-03-14T13:36:48.119979Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133648.004255Z-H5c947e1c-P00066d35","thread":"main","time":"2026-03-14T13:36:48.129277Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133648.281130Z-H5c947e1c-P00066e48","thread":"main","time":"2026-03-14T13:36:48.413594Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133648.281130Z-H5c947e1c-P00066e48","thread":"main","time":"2026-03-14T13:36:48.495977Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133648.281130Z-H5c947e1c-P00066e48","thread":"main","time":"2026-03-14T13:36:48.425928Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 30 - --schedule inheritance weekly -> daily -> hourly
 
 expecting success of 7900.31 'maintenance.strategy inheritance': 
@@ -513294,17 +511857,17 @@
 	test_subcommand ! git multi-pack-index write --no-progress \
 		<modified-daily.txt
 
-{"event":"child_start","sid":"20250209T065522.820542Z-Hcf858c9d-P001d8999","thread":"main","time":"2025-02-09T06:55:22.844458Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065522.851919Z-Hcf858c9d-P001d8a6b","thread":"main","time":"2025-02-09T06:55:22.886947Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065522.851919Z-Hcf858c9d-P001d8a6b","thread":"main","time":"2025-02-09T06:55:22.875526Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250209T065522.851919Z-Hcf858c9d-P001d8a6b","thread":"main","time":"2025-02-09T06:55:22.878765Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20250209T065522.892556Z-Hcf858c9d-P001d8b7c","thread":"main","time":"2025-02-09T06:55:22.948395Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065522.892556Z-Hcf858c9d-P001d8b7c","thread":"main","time":"2025-02-09T06:55:22.932766Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250209T065522.892556Z-Hcf858c9d-P001d8b7c","thread":"main","time":"2025-02-09T06:55:22.936648Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20250209T065522.892556Z-Hcf858c9d-P001d8b7c","thread":"main","time":"2025-02-09T06:55:22.951620Z","file":"run-command.c","line":734,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
-{"event":"child_start","sid":"20250209T065522.992536Z-Hcf858c9d-P001d8dfa","thread":"main","time":"2025-02-09T06:55:23.014417Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20250209T065523.022813Z-Hcf858c9d-P001d8eab","thread":"main","time":"2025-02-09T06:55:23.052110Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20250209T065523.022813Z-Hcf858c9d-P001d8eab","thread":"main","time":"2025-02-09T06:55:23.048032Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133648.733762Z-H5c947e1c-P00067008","thread":"main","time":"2026-03-14T13:36:48.882371Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133648.936298Z-H5c947e1c-P000670d2","thread":"main","time":"2026-03-14T13:36:49.104346Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133648.936298Z-H5c947e1c-P000670d2","thread":"main","time":"2026-03-14T13:36:49.066414Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133648.936298Z-H5c947e1c-P000670d2","thread":"main","time":"2026-03-14T13:36:49.076492Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260314T133649.144103Z-H5c947e1c-P0006719d","thread":"main","time":"2026-03-14T13:36:49.287616Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133649.144103Z-H5c947e1c-P0006719d","thread":"main","time":"2026-03-14T13:36:49.234449Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133649.144103Z-H5c947e1c-P0006719d","thread":"main","time":"2026-03-14T13:36:49.245160Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20260314T133649.144103Z-H5c947e1c-P0006719d","thread":"main","time":"2026-03-14T13:36:49.305602Z","file":"run-command.c","line":734,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20260314T133649.745427Z-H5c947e1c-P00067423","thread":"main","time":"2026-03-14T13:36:49.894025Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20260314T133649.942193Z-H5c947e1c-P0006750b","thread":"main","time":"2026-03-14T13:36:50.094210Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20260314T133649.942193Z-H5c947e1c-P0006750b","thread":"main","time":"2026-03-14T13:36:50.079564Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
 ok 31 - maintenance.strategy inheritance
 
 expecting success of 7900.32 'register and unregister': 
@@ -513631,9 +512194,9 @@
 	test_cmp expect args
 
 /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance
-/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance/.git/schedule_hourly_bZEYjg
-/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance/.git/schedule_daily_T2Ko84
-/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance/.git/schedule_weekly_nXp7ne
+/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance/.git/schedule_hourly_k5kwK5
+/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance/.git/schedule_daily_1Kb6Ix
+/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance/.git/schedule_weekly_j2TZgB
 /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7900-maintenance
 ok 45 - start and stop Windows maintenance
 
@@ -513690,7 +512253,7 @@
 	systemd-analyze verify /lib/systemd/system/basic.target
 
 )
-t7900-maintenance.sh: 7: eval: systemd-analyze: not found
+./test-lib.sh: line 1020: systemd-analyze: command not found
 prerequisite SYSTEMD_ANALYZE not satisfied
 ExecStart="/build/reproducible-path/git-2.48.0~rc1+next.20250101/git" --exec-path="/build/reproducible-path/git-2.48.0~rc1+next.20250101" -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.48.0~rc1+next.20250101/git" --exec-path="/build/reproducible-path/git-2.48.0~rc1+next.20250101" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
@@ -513857,8 +512420,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 something.t
-{"event":"region_enter","sid":"20250209T065524.042775Z-Hcf858c9d-P001d9ff6","thread":"main","time":"2025-02-09T06:55:24.043370Z","file":"builtin/gc.c","line":1454,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
-{"event":"region_leave","sid":"20250209T065524.042775Z-Hcf858c9d-P001d9ff6","thread":"main","time":"2025-02-09T06:55:24.043693Z","file":"builtin/gc.c","line":1456,"repo":1,"t_rel":0.000295,"nesting":1,"category":"maintenance","label":"detach"}
+{"event":"region_enter","sid":"20260314T133657.736154Z-H5c947e1c-P000690bb","thread":"main","time":"2026-03-14T13:36:57.736739Z","file":"builtin/gc.c","line":1454,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
+{"event":"region_leave","sid":"20260314T133657.736154Z-H5c947e1c-P000690bb","thread":"main","time":"2026-03-14T13:36:57.748099Z","file":"builtin/gc.c","line":1456,"repo":1,"t_rel":0.011326,"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': 
@@ -513903,6 +512466,1280 @@
 1..55
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9002-column.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9003-help-autocorrect.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 status
+
+Cloning into bare repository 'bare.git'...
+done.
+Preparing worktree (new branch 'worktree')
+HEAD is now at b57823c a single log entry
+On branch worktree
+nothing to commit, working tree clean
+ok 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t8013-blame-ignore-revs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8013-blame-ignore-revs/.git/
+expecting success of 8013.1 'setup': 
+	test_commit A file line1 &&
+
+	echo line2 >>file &&
+	git add file &&
+	test_tick &&
+	git commit -m B &&
+	git tag B &&
+
+	test_write_lines line-one line-two >file &&
+	git add file &&
+	test_tick &&
+	git commit -m X &&
+	git tag X &&
+	git tag -a -m "X (annotated)" XT &&
+
+	git blame --line-porcelain file >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse X >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse X >expect &&
+	test_cmp expect actual
+
+[master (root-commit) 6d1c9f2] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 5552443] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master abb9c4e] X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success of 8013.2 'validate --ignore-rev': 
+	test_must_fail git blame --ignore-rev X^{tree} file
+
+fatal: cannot find revision X^{tree} to ignore
+ok 2 - validate --ignore-rev
+
+expecting success of 8013.3 'validate --ignore-revs-file': 
+	git rev-parse X^{tree} >ignore_x &&
+	git blame --ignore-revs-file ignore_x file
+
+abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 1) line-one
+abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 2) line-two
+ok 3 - validate --ignore-revs-file
+
+expecting success of 8013.4 'ignore_rev_changing_lines (X)': 
+		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+		git rev-parse A >expect &&
+		test_cmp expect actual &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+		git rev-parse B >expect &&
+		test_cmp expect actual
+	
+ok 4 - ignore_rev_changing_lines (X)
+
+expecting success of 8013.5 'ignore_rev_changing_lines (XT)': 
+		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+		git rev-parse A >expect &&
+		test_cmp expect actual &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+		git rev-parse B >expect &&
+		test_cmp expect actual
+	
+ok 5 - ignore_rev_changing_lines (XT)
+
+expecting success of 8013.6 'ignore_rev_adding_unblamable_lines': 
+	test_write_lines line-one-change line-two-changed y3 y4 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m Y &&
+	git tag Y &&
+
+	git rev-parse Y >expect &&
+	git blame --line-porcelain file --ignore-rev Y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 3/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 4/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual
+
+[master e0d35d6] Y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+ok 6 - ignore_rev_adding_unblamable_lines
+
+expecting success of 8013.7 'ignore_revs_from_files': 
+	git rev-parse X >ignore_x &&
+	git rev-parse Y >ignore_y &&
+	git blame --line-porcelain file --ignore-revs-file ignore_x --ignore-revs-file ignore_y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse A >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual
+
+ok 7 - ignore_revs_from_files
+
+expecting success of 8013.8 'ignore_revs_from_configs_and_files': 
+	git config --add blame.ignoreRevsFile ignore_x &&
+	git blame --line-porcelain file --ignore-revs-file ignore_y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse A >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual
+
+ok 8 - ignore_revs_from_configs_and_files
+
+expecting success of 8013.9 'override_ignore_revs_file': 
+	git blame --line-porcelain file --ignore-revs-file "" --ignore-revs-file ignore_y >blame_raw &&
+	git rev-parse X >expect &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual
+	
+ok 9 - override_ignore_revs_file
+
+expecting success of 8013.10 'bad_files_and_revs': 
+	test_must_fail git blame file --ignore-rev NOREV 2>err &&
+	test_grep "cannot find revision NOREV to ignore" err &&
+
+	test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
+	test_grep "could not open.*: NOFILE" err &&
+
+	echo NOREV >ignore_norev &&
+	test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
+	test_grep "invalid object name: NOREV" err
+
+fatal: cannot find revision NOREV to ignore
+fatal: could not open object name list: NOFILE
+fatal: invalid object name: NOREV
+ok 10 - bad_files_and_revs
+
+expecting success of 8013.11 'mark_unblamable_lines': 
+	git config --add blame.markUnblamableLines true &&
+
+	git blame --ignore-rev Y file >blame_raw &&
+	echo "*" >expect &&
+
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual
+
+ok 11 - mark_unblamable_lines
+
+expecting success of 8013.12 'mark_ignored_lines': 
+	git config --add blame.markIgnoredLines true &&
+
+	test_write_lines line-one-Z line-two-Z y3 y4 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m Z &&
+	git tag Z &&
+
+	git blame --ignore-rev Z file >blame_raw &&
+	echo "?" >expect &&
+
+	sed -n "1p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "2p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	! test_cmp expect actual &&
+
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	! test_cmp expect actual
+
+[master d1e4550] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- expect	2026-03-14 13:36:58.558677808 +0000
++++ actual	2026-03-14 13:36:58.662677808 +0000
+@@ -1 +1 @@
+-?
++e
+--- expect	2026-03-14 13:36:58.558677808 +0000
++++ actual	2026-03-14 13:36:58.710677808 +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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9102-git-svn-deep-rmdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9102-git-svn-deep-rmdir/.git/
+expecting success of 9102.1 'initialize repo': 
+	mkdir import &&
+	(
+		cd import &&
+		mkdir -p deeply/nested/directory/number/1 &&
+		mkdir -p deeply/nested/directory/number/2 &&
+		echo foo >deeply/nested/directory/number/1/file &&
+		echo foo >deeply/nested/directory/number/2/another &&
+		svn_cmd import -m "import for git svn" . "$svnrepo"
+	)
+	
+Adding         deeply
+Adding         deeply/nested
+Adding         deeply/nested/directory
+Adding         deeply/nested/directory/number
+Adding         deeply/nested/directory/number/1
+Adding         deeply/nested/directory/number/1/file
+Adding         deeply/nested/directory/number/2
+Adding         deeply/nested/directory/number/2/another
+Committing transaction...
+Committed revision 1.
+ok 1 - initialize repo
+
+expecting success of 9102.2 'mirror via git svn': 
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	git checkout -f -b test-rmdir remotes/git-svn
+	
+	A	deeply/nested/directory/number/1/file
+	A	deeply/nested/directory/number/2/another
+r1 = e334f727630212cce91b16aec9bc69d4711f1399 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
+Switched to a new branch 'test-rmdir'
+ok 2 - mirror via git svn
+
+expecting success of 9102.3 'Try a commit on rmdir': 
+	git rm -f deeply/nested/directory/number/2/another &&
+	git commit -a -m "remove another" &&
+	git svn set-tree --rmdir HEAD &&
+	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
+	
+rm 'deeply/nested/directory/number/2/another'
+[test-rmdir d405538] remove another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 deeply/nested/directory/number/2/another
+	D	deeply/nested/directory/number/2/another
+	D+	deeply/nested/directory/number/2/
+	D	deeply/nested/directory/number/2/another
+	D	deeply/nested/directory/number/2/
+W: -empty_dir: deeply/nested/directory/number/2
+r2 = fc3fb6be974554fb54fe543c0615824c9caf7053 (refs/remotes/git-svn)
+Done committing 1 revisions to SVN
+deeply/nested/directory/number/1/
+deeply/nested/directory/number/1/file
+ok 3 - Try a commit on rmdir
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t8014-blame-ignore-fuzzy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8014-blame-ignore-fuzzy/.git/
+expecting success of 8014.1 'setup': 
+	for i in $(test_seq 2 $last_test)
+	do
+		# Append each line in a separate commit to make it easy to
+		# check which original line the blame output relates to.
+
+		line_count=0 &&
+		while IFS= read line
+		do
+			line_count=$((line_count+1)) &&
+			echo "$line" >>"$i" &&
+			git add "$i" &&
+			test_tick &&
+			GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count" || return 1
+		done <"a$i"
+	done &&
+
+	for i in $(test_seq 2 $last_test)
+	do
+		# Overwrite the files with the final content.
+		cp b$i $i &&
+		git add $i || return 1
+	done &&
+	test_tick &&
+
+	# Commit the final content all at once so it can all be
+	# referred to with the same commit ID.
+	GIT_AUTHOR_NAME=Final git commit -m Final &&
+
+	IGNOREME=$(git rev-parse HEAD)
+
+[master (root-commit) a459bb2] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2
+[master 455f594] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ae356a5] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 986ba04] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 112fd1b] 5
+ Author: 5 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 55cb950] 6
+ Author: 6 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master fb44572] 7
+ Author: 7 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 0193540] 8
+ Author: 8 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 54573a7] 9
+ Author: 9 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 2906ab9] 10
+ Author: 10 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 993387a] 11
+ Author: 11 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5a378ed] 12
+ Author: 12 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 07b780d] 13
+ Author: 13 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 06d4280] 14
+ Author: 14 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 83128e2] 15
+ Author: 15 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master c7dc60e] 16
+ Author: 16 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b64f9f3] 17
+ Author: 17 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b2112c8] 18
+ Author: 18 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 6de54b3] 19
+ Author: 19 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master dd68dd4] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3
+[master ce31df2] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 843f64f] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 35030af] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4
+[master 953d34c] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 8e827ec] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 8c3589a] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 84cd02a] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5
+[master e94eb23] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 32c6f85] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master bf2d22c] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 2d1cc84] 5
+ Author: 5 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 74b81ac] 6
+ Author: 6 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 0854834] 7
+ Author: 7 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 4a530d1] 8
+ Author: 8 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ad63694] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6
+[master 7e3e3c7] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 8c39144] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 823725b] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5728ada] 5
+ Author: 5 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9c5745d] 6
+ Author: 6 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 7ce3865] 7
+ Author: 7 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9221615] 8
+ Author: 8 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master f7f2b1c] 9
+ Author: 9 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master c156520] 10
+ Author: 10 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b387727] 11
+ Author: 11 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 3da1770] 12
+ Author: 12 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9caa469] 13
+ Author: 13 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 1449afa] 14
+ Author: 14 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master eafda23] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7
+[master 83d236f] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 77d14eb] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8
+[master 860eb54] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 0b8c3b6] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 4dbae56] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9
+[master 654f4f9] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 1194a28] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b071882] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d878653] 5
+ Author: 5 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 04b3bcc] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10
+[master f574735] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master ecce56b] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master df40e26] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11
+[master dc03d7d] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b4f9f1c] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master fb77c6a] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12
+[master eab48da] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13
+[master 0adab8f] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 207a501] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master c6621c4] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 3134814] 5
+ Author: 5 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 01c9204] Final
+ Author: Final <author@example.com>
+ 12 files changed, 53 insertions(+), 65 deletions(-)
+ok 1 - setup
+
+expecting success of 8014.2 'Regression test for partially overlapping search ranges': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 2 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected2 actual
+ok 2 - Regression test for partially overlapping search ranges
+
+expecting success of 8014.3 'Combine 3 lines into 2': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 3 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected3 actual
+ok 3 - Combine 3 lines into 2
+
+expecting success of 8014.4 'Add curly brackets': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 4 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected4 actual
+ok 4 - Add curly brackets
+
+expecting success of 8014.5 'Combine many lines and change case': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 5 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected5 actual
+ok 5 - Combine many lines and change case
+
+expecting success of 8014.6 'Rename and combine lines': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 6 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected6 actual
+ok 6 - Rename and combine lines
+
+expecting success of 8014.7 'Same line twice': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 7 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected7 actual
+ok 7 - Same line twice
+
+expecting success of 8014.8 'Enforce line order': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 8 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected8 actual
+ok 8 - Enforce line order
+
+expecting success of 8014.9 'Expand lines and rename variables': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 9 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected9 actual
+ok 9 - Expand lines and rename variables
+
+expecting success of 8014.10 'Two close matches versus one less close match': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 10 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected10 actual
+ok 10 - Two close matches versus one less close match
+
+expecting success of 8014.11 'Piggy in the middle': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 11 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected11 actual
+ok 11 - Piggy in the middle
+
+expecting success of 8014.12 'No trailing newline': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 12 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected12 actual
+ok 12 - No trailing newline
+
+expecting success of 8014.13 'Reorder includes': git blame -M9 --ignore-rev 01c9204ad215bac1f8b21a95bd806f4910e7e8b9 13 >output &&
+	sed -e "s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/" output >actual &&
+	test_cmp expected13 actual
+ok 13 - Reorder includes
+
+expecting success of 8014.14 'Diff chunks with no suspects': 
+	test_write_lines xy1 A B C xy1 >file &&
+	git add file &&
+	test_tick &&
+	GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+	test_write_lines xy2 A B xy2 C xy2 >file &&
+	git add file &&
+	test_tick &&
+	GIT_AUTHOR_NAME=2 git commit -m 2 &&
+	REV_2=$(git rev-parse HEAD) &&
+
+	test_write_lines xy3 A >file &&
+	git add file &&
+	test_tick &&
+	GIT_AUTHOR_NAME=3 git commit -m 3 &&
+	REV_3=$(git rev-parse HEAD) &&
+
+	test_write_lines 1 1 >expected &&
+
+	git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file >output &&
+	sed -e "$pick_author" output >actual &&
+
+	test_cmp expected actual
+	
+[master c2d5eb7] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file
+[master 06b555d] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+[master a1483a3] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+ok 14 - Diff chunks with no suspects
+
+expecting success of 8014.15 'position matching': 
+	test_write_lines abc def >file2 &&
+	git add file2 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+	test_write_lines abc def abc def >file2 &&
+	git add file2 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=2 git commit -m 2 &&
+
+	test_write_lines abcx defx abcx defx >file2 &&
+	git add file2 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=3 git commit -m 3 &&
+	REV_3=$(git rev-parse HEAD) &&
+
+	test_write_lines abcy defy abcx defx >file2 &&
+	git add file2 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=4 git commit -m 4 &&
+	REV_4=$(git rev-parse HEAD) &&
+
+	test_write_lines 1 1 2 2 >expected &&
+
+	git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 >output &&
+	sed -e "$pick_author" output >actual &&
+
+	test_cmp expected actual
+	
+[master 35116cb] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file2
+[master 2cf8ef0] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 2 insertions(+)
+[master db13f6f] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+[master bf5dda1] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 15 - position matching
+
+expecting success of 8014.16 'preserve order': 
+	test_write_lines bcde >file3 &&
+	git add file3 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=1 git commit -m 1 &&
+
+	test_write_lines bcde fghij >file3 &&
+	git add file3 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=2 git commit -m 2 &&
+
+	test_write_lines bcde fghij abcd >file3 &&
+	git add file3 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=3 git commit -m 3 &&
+
+	test_write_lines abcdx fghijx bcdex >file3 &&
+	git add file3 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=4 git commit -m 4 &&
+	REV_4=$(git rev-parse HEAD) &&
+
+	test_write_lines abcdx fghijy bcdex >file3 &&
+	git add file3 &&
+	test_tick &&
+	GIT_AUTHOR_NAME=5 git commit -m 5 &&
+	REV_5=$(git rev-parse HEAD) &&
+
+	test_write_lines 1 2 3 >expected &&
+
+	git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 >output &&
+	sed -e "$pick_author" output >actual &&
+
+	test_cmp expected actual
+	
+[master 7405022] 1
+ Author: 1 <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[master 83ccc7b] 2
+ Author: 2 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 56aa8aa] 3
+ Author: 3 <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master a6b3442] 4
+ Author: 4 <author@example.com>
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+[master 9acf8a7] 5
+ Author: 5 <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - preserve order
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9105-git-svn-commit-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
+	A	readme
+r3 = 31f73b48254e3b004f776f96cab3900c5b2473c5 (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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9103-git-svn-tracked-directory-removed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
+	A	README
+r1 = a8740474e71b12262430a778df8bd5376db053f5 (refs/remotes/origin/trunk)
+	D	README
+	A	FOLLOWME
+r3 = f6ddf594589caa6bea76e582e198208dc731ac5a (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 a874047 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t8012-blame-colors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t8012-blame-colors/.git/
 expecting success of 8012.1 'setup A lines': 
@@ -514012,8 +513849,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': 
@@ -514042,8 +513879,8 @@
 
 git blame -c  file 
 Author A (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
 Author B (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
 ok 13 - blame 2 authors + 1 branch1 author
 
 expecting success of 8012.14 'setup B2 lines (branch2)': 
@@ -514064,8 +513901,8 @@
 
 git blame -c  file 
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
 ok 15 - blame 2 authors + 1 branch2 author
 
 expecting success of 8012.16 'merge branch1 & branch2': 
@@ -514081,20 +513918,20 @@
 	check_count A 2 B 1 B1 2 B2 1
 
 git blame -c  file 
+Author A (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
 ok 17 - blame 2 authors + 2 merged-in authors
 
 expecting success of 8012.18 'blame --first-parent blames merge for branch1': 
 	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
 
 git blame -c  --first-parent file 
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 2, attributed 2) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8012.19 'blame ancestor': 
@@ -514126,10 +513963,10 @@
 
 git blame -c  file 
 Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 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 8012.23 'blame huge graft': 
@@ -514331,12 +514168,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 B1 (expected 2, attributed 2) good
+Author B2 (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 C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 ok 25 - blame incomplete line
 
 expecting success of 8012.26 'setup edits': 
@@ -514358,13 +514195,13 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
 
 git blame -c  file 
-Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8012.28 'setup obfuscated email': 
@@ -514383,28 +514220,28 @@
 	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 A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (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 B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author 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
 ok 30 - blame -L 1 (all)
 
 expecting success of 8012.31 'blame -L , (all)': 
@@ -514412,33 +514249,33 @@
 
 git blame -c  -L, file 
 Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 31 - blame -L , (all)
 
 expecting success of 8012.32 'blame -L X (X to end)': 
 	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L5 file 
-Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-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
+Author D (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 D (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)': 
@@ -514446,8 +514283,8 @@
 
 git blame -c  -L,3 file 
 Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8012.35 'blame -L X,X': 
@@ -514461,9 +514298,9 @@
 	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 B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 36 - blame -L X,Y
 
@@ -514471,9 +514308,9 @@
 	check_count -L6,3 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,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
 Author B1 (expected 1, attributed 1) good
 ok 37 - blame -L Y,X (undocumented)
 
@@ -514518,10 +514355,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,+4 file 
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
 expecting success of 8012.45 'blame -L ,-0': 
@@ -514547,29 +514384,29 @@
 	check_count -L6,-4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,-4 file 
+Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
 
 expecting success of 8012.49 'blame -L /RE/ (RE to end)': 
 	check_count -L/evil/ C 1 "A U Thor" 1
 
 git blame -c  -L/evil/ file 
-Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 49 - blame -L /RE/ (RE to end)
 
 expecting success of 8012.50 'blame -L /RE/,/RE2/': 
 	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
 
 git blame -c  -L/robot/,/green/ file 
-Author A (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 B (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 50 - blame -L /RE/,/RE2/
 
 expecting success of 8012.51 'blame -L X,/RE/': 
@@ -514585,27 +514422,27 @@
 	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,7 file 
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 52 - blame -L /RE/,Y
 
 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 A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 53 - blame -L /RE/,+N
 
 expecting success of 8012.54 'blame -L /RE/,-N': 
 	check_count -L/99/,-3 B 1 B2 1 D 1
 
 git blame -c  -L/99/,-3 file 
-Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 54 - blame -L /RE/,-N
 
 expecting success of 8012.55 'blame -L X (X == nlines)': 
@@ -514635,13 +514472,13 @@
 
 git blame -c  -L,8 file 
 Author E (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 B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8012.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -514649,57 +514486,57 @@
 	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 E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author 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 E (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 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 B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B (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 B1 (expected 1, attributed 1) good
+Author C (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 B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 61 - blame -L multiple (disjoint)
 
 expecting success of 8012.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 B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 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 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 63 - blame -L multiple (adjacent)
 
@@ -514707,19 +514544,19 @@
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git blame -c  -L4,5 -L2,3 file 
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 64 - blame -L multiple (adjacent: unordered)
 
 expecting success of 8012.65 'blame -L multiple (overlapping)': 
 	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,4 -L3,5 file 
-Author B (expected 1, attributed 1) good
 Author 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 65 - blame -L multiple (overlapping)
 
@@ -514727,9 +514564,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 B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
 
@@ -514737,13 +514574,13 @@
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L2,8 -L3,5 file 
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author B (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
-Author C (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 8012.68 'blame -L multiple (superset/subset: unordered)': 
@@ -514751,44 +514588,44 @@
 
 git blame -c  -L3,5 -L2,8 file 
 Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author 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 C (expected 1, attributed 1) good
+Author B2 (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 D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (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 C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 70 - blame -L /RE/ (relative: no preceding range)
 
 expecting success of 8012.71 'blame -L /RE/ (relative: adjacent)': 
 	check_count -L1,1 -L/dog/,+1 A 1 E 1
 
 git blame -c  -L1,1 -L/dog/,+1 file 
-Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 71 - blame -L /RE/ (relative: adjacent)
 
 expecting success of 8012.72 'blame -L /RE/ (relative: not found)': 
@@ -514880,8 +514717,8 @@
 	check_count -f hello.c -L:main F 4 G 1
 
 git blame -c  -L:main hello.c 
-Author F (expected 4, attributed 4) good
 Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
 ok 79 - blame -L :literal
 
 expecting success of 8012.80 'blame -L :regex': 
@@ -514901,8 +514738,8 @@
 	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
 
 git blame -c  -L3,3 -L:ma.. hello.c 
-Author F (expected 1, attributed 1) good
 Author H (expected 4, attributed 4) good
+Author F (expected 1, attributed 1) good
 ok 82 - blame -L :RE (relative)
 
 expecting success of 8012.83 'blame -L :RE (relative: no preceding range)': 
@@ -514952,8 +514789,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 H (expected 1, attributed 1) 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)
 
@@ -514986,8 +514823,8 @@
  Author: B <B@test.git>
  1 file changed, 1 insertion(+), 1 deletion(-)
 git blame -c  -L:RIGHT file.f03 
-Author A (expected 3, attributed 3) good
 Author B (expected 1, attributed 1) good
+Author A (expected 3, attributed 3) good
 ok 90 - blame -L :funcname with userdiff driver
 
 expecting success of 8012.91 'setup incremental': 
@@ -515288,78 +515125,95 @@
 	test_line_count = 1 colored &&
 	grep qfunc colored
 
-[branch2 eacab85] new commit
+[branch2 abec253] new commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-<CYAN>eacab852 (A U Thor 2025-02-09 06:55:24 +0000 11) <RESET>void qfunc();
+<CYAN>abec253a (A U Thor 2026-03-14 13:37:08 +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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9102-git-svn-deep-rmdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9102-git-svn-deep-rmdir/.git/
-expecting success of 9102.1 'initialize repo': 
-	mkdir import &&
-	(
-		cd import &&
-		mkdir -p deeply/nested/directory/number/1 &&
-		mkdir -p deeply/nested/directory/number/2 &&
-		echo foo >deeply/nested/directory/number/1/file &&
-		echo foo >deeply/nested/directory/number/2/another &&
-		svn_cmd import -m "import for git svn" . "$svnrepo"
-	)
+*** t9111-git-svn-use-svnsync-props.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9111-git-svn-use-svnsync-props/.git/
+expecting success of 9111.1 'load svnsync repo': 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
+	git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
+	git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
+	git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
+	git config svn.useSvnsyncProps true &&
+	git svn fetch --all
 	
-Adding         deeply
-Adding         deeply/nested
-Adding         deeply/nested/directory
-Adding         deeply/nested/directory/number
-Adding         deeply/nested/directory/number/1
-Adding         deeply/nested/directory/number/1/file
-Adding         deeply/nested/directory/number/2
-Adding         deeply/nested/directory/number/2/another
-Committing transaction...
-Committed revision 1.
-ok 1 - initialize repo
+Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
+	D	a/b/c/d/e/file
+	D	a/
+	A	file
+W: -empty_dir: dir/a
+r2 = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
+	A	zzz
+r1 = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
+	M	zzz
+r6 = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
+	A	d
+r9 = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
+	A	newdir/dir
+r10 = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
+	M	newdir/dir
+r11 = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
+	M	d
+r12 = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
+ok 1 - load svnsync repo
 
-expecting success of 9102.2 'mirror via git svn': 
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	git checkout -f -b test-rmdir remotes/git-svn
+expecting success of 9111.2 'verify metadata for /bar': 
+	git cat-file commit refs/remotes/bar >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~2 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~3 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~4 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~5 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
 	
-	A	deeply/nested/directory/number/1/file
-	A	deeply/nested/directory/number/2/another
-r1 = d4b08f66ad0a4d348220462682830219467f6448 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
-Switched to a new branch 'test-rmdir'
-ok 2 - mirror via git svn
+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 9102.3 'Try a commit on rmdir': 
-	git rm -f deeply/nested/directory/number/2/another &&
-	git commit -a -m "remove another" &&
-	git svn set-tree --rmdir HEAD &&
-	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
+expecting success of 9111.3 'verify metadata for /dir/a/b/c/d/e': 
+	git cat-file commit refs/remotes/e >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
 	
-rm 'deeply/nested/directory/number/2/another'
-[test-rmdir e8e4514] remove another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 deeply/nested/directory/number/2/another
-	D	deeply/nested/directory/number/2/another
-	D+	deeply/nested/directory/number/2/
-	D	deeply/nested/directory/number/2/another
-	D	deeply/nested/directory/number/2/
-W: -empty_dir: deeply/nested/directory/number/2
-r2 = 9446396d4c5533a78d696944a1fabb0211ad63cd (refs/remotes/git-svn)
-Done committing 1 revisions to SVN
-deeply/nested/directory/number/1/
-deeply/nested/directory/number/1/file
-ok 3 - Try a commit on rmdir
+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
 
-# passed all 3 test(s)
-1..3
+expecting success of 9111.4 'verify metadata for /dir': 
+	git cat-file commit refs/remotes/dir >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/dir~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+	
+git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 4 - verify metadata for /dir
+
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t7800-difftool.sh ***
@@ -515515,7 +515369,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
@@ -515588,7 +515442,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
@@ -516480,10 +516334,10 @@
 		test_cmp expect "$(cat tmpdir)/file"
 	)
 
-warning: both files modified: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7800-difftool/git-difftool.n7eT9e/right/file'.
+warning: both files modified: '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7800-difftool/git-difftool.MmSJqw/right/file'.
 warning: working tree file has been left.
 warning: 
-warning: temporary files exist in '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7800-difftool/git-difftool.n7eT9e'.
+warning: temporary files exist in '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7800-difftool/git-difftool.MmSJqw'.
 warning: you may want to cleanup or recover these.
 ok 84 - difftool --no-symlinks detects conflict 
 
@@ -516695,9 +516549,9 @@
 	git add -N intent-to-add &&
 	git difftool --dir-diff --extcmd ls
 
-/tmp/git-difftool.sWOb6e/left/:
+/tmp/git-difftool.C9VNqO/left/:
 
-/tmp/git-difftool.sWOb6e/right/:
+/tmp/git-difftool.C9VNqO/right/:
 intent-to-add
 HEAD is now at 8845cd2 initial
 ok 89 - add -N and difftool -d
@@ -516815,236 +516669,254 @@
 1..95
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9103-git-svn-tracked-directory-removed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9103-git-svn-tracked-directory-removed/.git/
-expecting success of 9103.1 'make history for tracking': 
+*** t9106-git-svn-commit-diff-clobber.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9106-git-svn-commit-diff-clobber/.git/
+expecting success of 9106.1 'initialize repo': 
 	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
+	(
+		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.
-A    trunk/README
+[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.
-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
+ok 2 - commit change from svn side
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
-	A	README
-r1 = 9686d005977433397f8da601c81d043cec56e269 (refs/remotes/origin/trunk)
-	D	README
-	A	FOLLOWME
-r3 = e51b22661e6218f29748c7196a60b5ab7003baa3 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9103-git-svn-tracked-directory-removed/svnrepo/trunk r3
-ok 2 - clone repo with git
+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 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)"
-	)
+[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.48.0~rc1+next.20250101/git-svn line 1546.
 
-HEAD is now at 9686d00 initial
-ok 3 - make sure r2 still has old file
+ok 3 - commit conflicting change from git
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9105-git-svn-commit-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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"
+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"
 	
-Adding         readme
-Committing transaction...
-Committed revision 1.
-[master (root-commit) ecebef3] initial
+HEAD is now at 8d59b1f initial
+[master 3494a8f] second line from svn
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 readme
-[master 32e6dbc] another
+[master 57507a0] third line from git
  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
+	M	file
+Committed r3
+ok 4 - commit complementing change from git
 
-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 &&
+expecting success of 9106.5 'dcommit fails to commit because of conflict': 
+	git svn init "$svnrepo" &&
 	git svn fetch &&
-	git svn commit-diff -r3 "$prev" "$head" &&
-	svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
-	cmp readme readme.2
+	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
 	
-Adding         import/readme
+	A	file
+r1 = a56a11a508d8212ce88399379885d5d48710ff0f (refs/remotes/git-svn)
+	M	file
+r2 = 122e0741f96d34c16377c822eb49e974ad57babc (refs/remotes/git-svn)
+	M	file
+r3 = 6abd89eeb8a5b2f589a84b930e860253ee27b4f1 (refs/remotes/git-svn)
+HEAD is now at 6abd89e third line from git
+A    t.svn/file
+Checked out revision 3.
+Sending        file
+Transmitting file data .done
 Committing transaction...
-Committed revision 3.
-Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
-	A	readme
-r3 = 539033353f146ff2835dc5214d6a57f51bf89fc2 (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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9112-git-svn-md5less-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+Committed revision 4.
+[master 1ec9b84] 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.48.0~rc1+next.20250101/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
 
-expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
-ok 2 - initialize git svn
+ERROR from SVN:
+Transaction is out of date: File '/file' is out of date
+W: 1ec9b84c5d28a42e50b4952d5de7e53d59df8c17 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.
 
-expecting success of 9112.3 'fetch revisions from svn': git svn fetch
-	A	md5less-file
-r1 = acab0e48d81e0faa5b547548a28b6e53b07999c6 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
-ok 3 - fetch revisions from svn
+ok 5 - dcommit fails to commit because of conflict
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9113-git-svn-dcommit-new-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9111-git-svn-use-svnsync-props.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9111-git-svn-use-svnsync-props/.git/
-expecting success of 9111.1 'load svnsync repo': 
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
-	git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
-	git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
-	git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
-	git config svn.useSvnsyncProps true &&
-	git svn fetch --all
+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 higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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)
-	D	a/b/c/d/e/file
-	D	a/
-	A	file
-W: -empty_dir: dir/a
-r2 = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
-	A	zzz
-r1 = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
-	M	zzz
-r6 = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
-	A	d
-r9 = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
-	A	newdir/dir
-r10 = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
-	M	newdir/dir
-r11 = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
-	M	d
-r12 = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
-ok 1 - load svnsync repo
+HEAD is now at 6abd89e third line from git
+[master 3f3970e] index merge
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master a418020] 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.48.0~rc1+next.20250101/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	A	file2
+Committed r5
+	M	file
+r4 = f43f4f3ca4d71193f2576a205033ba95474cce8b (refs/remotes/git-svn)
+	A	file2
+r5 = e2f847860835e85cb460acf5b65b243cc44e8212 (refs/remotes/git-svn)
+W: 3f3970e13942212b3471f92773d893e280f4b87d and refs/remotes/git-svn differ, using rebase:
+:100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
+warning: skipped previously applied commit 3f3970e
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+	M	file2
+Committed r6
+	M	file2
+r6 = f0b203ac231a5382119fa6bbf22f35e972c47fc8 (refs/remotes/git-svn)
+No changes between ce78c1b3ffb382a4979b3df00f6610a267c01b26 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 9111.2 'verify metadata for /bar': 
-	git cat-file commit refs/remotes/bar >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~2 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~3 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~4 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~5 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+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
 	
-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
+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 9111.3 'verify metadata for /dir/a/b/c/d/e': 
-	git cat-file commit refs/remotes/e >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+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
 	
-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
+HEAD is now at f0b203a more changes
+[master 70bc4fb] new file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-file
+[master 7ce0179] 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.48.0~rc1+next.20250101/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	A	new-file
+Committed r8
+	M	file
+r7 = 30c31e36fc720d21cf670d5ca8fb4d9a5a8e04f8 (refs/remotes/git-svn)
+	A	new-file
+r8 = 262b6b5b9ada27b05b1915373941788ff47d0b77 (refs/remotes/git-svn)
+W: 70bc4fb86284c2eda1a7ec9f2a2e3d26a59f1c1f and refs/remotes/git-svn differ, using rebase:
+:100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
+warning: skipped previously applied commit 70bc4fb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 7ce0179... clobber
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 7ce0179... clobber
+rebase refs/remotes/git-svn: command returned error: 1
 
-expecting success of 9111.4 'verify metadata for /dir': 
-	git cat-file commit refs/remotes/dir >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/dir~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+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 '262b6b5'.
+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
 	
-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
+[detached HEAD bb5d32e] 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.48.0~rc1+next.20250101/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	M	file
+Committed r9
+	M	file
+r9 = 6c57ec3c93e33551eda95a3db0329148397b4f01 (refs/remotes/git-svn)
+No changes between bb5d32eccffdd280467bf08efa780ffef9ee2d52 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 10 - resolve, continue the rebase and dcommit
 
-# passed all 4 test(s)
-1..4
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9108-git-svn-glob.sh ***
@@ -517145,22 +517017,22 @@
 	(required for this version (2.48.0.rc1.219.gb6b6757d772) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = 9dbbc9ed9f5d6b128ccd01423bac1fbba8be4233 (refs/remotes/trunk)
+r1 = b17cc03d8a178d9deea1ba4171d162ad2ac2c90b (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
-Found branch parent: (refs/remotes/branches/start) 9dbbc9ed9f5d6b128ccd01423bac1fbba8be4233
+Found branch parent: (refs/remotes/branches/start) b17cc03d8a178d9deea1ba4171d162ad2ac2c90b
 Following parent with do_switch
 Successfully followed parent
-r2 = 5116ee45b2b990f87e43d813659ba866684834e5 (refs/remotes/branches/start)
+r2 = 1df866e047b5c637ebe13efeab6eecaa2516259e (refs/remotes/branches/start)
 	M	readme
-r3 = e6a6fd1a7d40354bd4c7c09d98f93c5f8a0d1a7d (refs/remotes/branches/start)
+r3 = 24c7facc851acc0cf2f4365288efa6c3fad8c389 (refs/remotes/branches/start)
 branch_from: /branches/start => /branches/start/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) e6a6fd1a7d40354bd4c7c09d98f93c5f8a0d1a7d
+Found branch parent: (refs/remotes/tags/end) 24c7facc851acc0cf2f4365288efa6c3fad8c389
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = 0f5c78670616d717f4f60902ddaef956185b8b67 (refs/remotes/tags/end)
+r4 = f4c50c46a0cd54741c48411c87a1a6daf6aefe03 (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.
@@ -517202,26 +517074,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 74ea7e94217d67c9082fb88a2c007bc65b9f60ef (refs/remotes/two/trunk)
+r1 = 3c3d4765bd3b5540dd4180b0faa26084a316f990 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
-Found branch parent: (refs/remotes/two/branches/start) 74ea7e94217d67c9082fb88a2c007bc65b9f60ef
+Found branch parent: (refs/remotes/two/branches/start) 3c3d4765bd3b5540dd4180b0faa26084a316f990
 Following parent with do_switch
 Successfully followed parent
-r2 = 5dab41fe40ab416e5c37d6071b5aa111f33614e3 (refs/remotes/two/branches/start)
+r2 = 28ff9df1607402a3041c16c609dd12e5beff7759 (refs/remotes/two/branches/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = cd1b9cf22e2d443e7e2e1a358dd5c47783294210 (refs/remotes/two/branches/start)
+r3 = f827ff0a45390654daf9aba2817c0ed2a7c7c505 (refs/remotes/two/branches/start)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) cd1b9cf22e2d443e7e2e1a358dd5c47783294210
+Found branch parent: (refs/remotes/two/tags/end) f827ff0a45390654daf9aba2817c0ed2a7c7c505
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 3058a19874cbf33dd30db965e9ceb0cc85476b53 (refs/remotes/two/tags/end)
+r4 = 57f825f42a730609d33378da5f21d1c0081edfbd (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = e6be11e5ae725dcca3646b7826b6c426b186af42 (refs/remotes/two/tags/end)
+r5 = 363b5c09601cb19af9aea493ce83706a74ad0373 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = f52026270695885ac9bd030272657bcc85e070c5 (refs/remotes/two/tags/end)
+r6 = 5fd27c17ba5d77ddd082a6a176987fd5db341117 (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9108.3 'prepare test disallow multi-globs': 
@@ -517259,6 +517131,11 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9113-git-svn-dcommit-new-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9110-git-svn-use-svm-props.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9110-git-svn-use-svm-props/.git/
 expecting success of 9110.1 'load svm repo': 
@@ -517273,10 +517150,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-	A	a/b/c/d/e/file
-r9 (@1) = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
 	A	file
 r9 (@1) = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
+	A	a/b/c/d/e/file
+r9 (@1) = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
 	D	a/b/c/d/e/file
 	D	a/
 	A	file
@@ -517354,370 +517231,28 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9114-git-svn-dcommit-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 4d5edf5dffa8c60894b2096a30a4c6fe0c733878 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
-Switched to a new branch 'svn'
-Switched to a new branch 'merge'
-[merge 06a0f35] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new_file
-[merge 033e672] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[merge 48c6cb4] add some stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'svn'
-[svn 439a165] 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.48.0~rc1+next.20250101/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = 6ab7dc345d952ef3f5eb9a12a1ac53412da43f9e (refs/remotes/origin/trunk)
-	A	new_file
-	M	README
-Committed r3
-	M	README
-	A	new_file
-r3 = 2d21ed5a47754abde4fcfb9026d711017d8fb639 (refs/remotes/origin/trunk)
-No changes between a91296d7462d9891da67c83bdccfb2d5b4b1247f 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9106-git-svn-commit-diff-clobber.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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 = 157037dad04bc19db377343c1f98e22545318b0a (refs/remotes/git-svn)
-	M	file
-r2 = 748a554d027bea8301df2216dda7e8fd18a8853f (refs/remotes/git-svn)
-	M	file
-r3 = 453bb396cddf11caa1c48ff0ec3f2568763beb79 (refs/remotes/git-svn)
-HEAD is now at 453bb39 third line from git
-A    t.svn/file
-Checked out revision 3.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-[master d1ac1b2] 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.48.0~rc1+next.20250101/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: d1ac1b20029ec82cf8e355f1f0d2c65a8a538c5c 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 453bb39 third line from git
-[master 56c8251] index merge
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master 8182d79] 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.48.0~rc1+next.20250101/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	A	file2
-Committed r5
-	M	file
-r4 = bd57a1367a2b9a6f0afe471e1b6f58446eee9255 (refs/remotes/git-svn)
-	A	file2
-r5 = 7d80e49445e62ece1c22ccfae3ec2e584c69a623 (refs/remotes/git-svn)
-W: 56c82519aa5d64b6debbdccb71000ee77f9a74bc and refs/remotes/git-svn differ, using rebase:
-:100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
-warning: skipped previously applied commit 56c8251
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-	M	file2
-Committed r6
-	M	file2
-r6 = 6889cc847727f09c2128b21a69aeaebb49a7ad49 (refs/remotes/git-svn)
-No changes between 9f0ed7be46e0bffd5e54ab7a736c3ff682eb7ab8 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 6889cc8 more changes
-[master 18f49f8] new file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-file
-[master 8ccdf42] 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.48.0~rc1+next.20250101/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	A	new-file
-Committed r8
-	M	file
-r7 = 65998f57ecd88d3b2b3d1203c1c2eb033c22e3a2 (refs/remotes/git-svn)
-	A	new-file
-r8 = 0535ee21e19779c0c3e8338e8572a8f046252f80 (refs/remotes/git-svn)
-W: 18f49f81964297d287648d8354e1e7f0fa3a4ec6 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
-warning: skipped previously applied commit 18f49f8
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 8ccdf42... clobber
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 8ccdf42... clobber
-rebase refs/remotes/git-svn: command returned error: 1
+*** t9112-git-svn-md5less-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.
 
-ok 8 - multiple dcommit from git svn will not clobber svn
+------- Committed revision 1 >>>
 
-expecting success of 9106.9 'check that rebase really failed': 
-	git status >output &&
-	grep currently.rebasing output
+ok 1 - load svn dumpfile
 
-You are currently rebasing branch 'master' on '0535ee2'.
-ok 9 - check that rebase really failed
+expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
+ok 2 - initialize git svn
 
-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 3b64142] 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.48.0~rc1+next.20250101/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	M	file
-Committed r9
-	M	file
-r9 = 01717ac35aa56b1d269f6fb0770b551f5f1e7d0d (refs/remotes/git-svn)
-No changes between 3b641425a79fc1b46f0d96591c8154c57122700c and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 10 - resolve, continue the rebase and dcommit
+expecting success of 9112.3 'fetch revisions from svn': git svn fetch
+	A	md5less-file
+r1 = 419db8c248b47412748de0443ea108030d758817 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
+ok 3 - fetch revisions from svn
 
-# passed all 10 test(s)
-1..10
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9107-git-svn-migrate.sh ***
@@ -517764,7 +517299,7 @@
 	A	tags/0.2/README
 	A	tags/0.3/README
 	A	trunk/README
-r1 = faab4b6d5e9f9e1f66898ed994d77ffcca07f482 (refs/remotes/git-svn)
+r1 = ccadf82665ba7081d86c5c5b2caada499e990374 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
 ok 1 - setup old-looking metadata
@@ -517772,7 +517307,7 @@
 expecting success of 9107.2 'git-svn-HEAD is a real HEAD': 
 	git rev-parse --verify refs/heads/git-svn-HEAD^0
 
-faab4b6d5e9f9e1f66898ed994d77ffcca07f482
+ccadf82665ba7081d86c5c5b2caada499e990374
 ok 2 - git-svn-HEAD is a real HEAD
 
 expecting success of 9107.3 'initialize old-style (v0) git svn layout': 
@@ -517798,8 +517333,8 @@
  - .git/git-svn => .git/svn/git-svn
  - .git/svn/info => .git/svn/svn/info
 Done migrating from a git-svn v1 layout
-faab4b6d5e9f9e1f66898ed994d77ffcca07f482
-faab4b6d5e9f9e1f66898ed994d77ffcca07f482
+ccadf82665ba7081d86c5c5b2caada499e990374
+ccadf82665ba7081d86c5c5b2caada499e990374
 ok 3 - initialize old-style (v0) git svn layout
 
 expecting success of 9107.4 'initialize a multi-repository repo': 
@@ -517859,21 +517394,21 @@
 		done
 	done
 
-Rebuilding .git/svn/git-svn/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = faab4b6d5e9f9e1f66898ed994d77ffcca07f482
-Done rebuilding .git/svn/git-svn/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
+Rebuilding .git/svn/git-svn/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = ccadf82665ba7081d86c5c5b2caada499e990374
+Done rebuilding .git/svn/git-svn/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
 	A	README
-r1 = 48e8cb561bb77ad934ea8b0267389aec6b8083e4 (refs/remotes/origin/tags/0.3)
+r1 = 22ca31d8abfdce922fd3cf7d3a219773b104af37 (refs/remotes/origin/b)
 	A	README
-r1 = 51806830233cbe2f8e49581dcea3ae82275381f0 (refs/remotes/origin/trunk)
+r1 = d321806ce7e2e1a68f2b05def800371824534111 (refs/remotes/origin/a)
 	A	README
-r1 = 8b3942170deb07735fbe89dbe54dfa081f89bf42 (refs/remotes/origin/a)
+r1 = 8c753513ae908a73f887499fadbd46c05c3eb63d (refs/remotes/origin/tags/0.1)
 	A	README
-r1 = e916585383b4dc97e22f15a66085622de8763f84 (refs/remotes/origin/b)
+r1 = d8bba3e001be3ab05a68541f95cfc9c6bd656618 (refs/remotes/origin/trunk)
 	A	README
-r1 = b82a1ae588127381b30032117a03a424b3938d15 (refs/remotes/origin/tags/0.1)
+r1 = 8a81e398a7bc573e37196d35b3e2901b0bff5c54 (refs/remotes/origin/tags/0.3)
 	A	README
-r1 = c55433727007659efdc633411af4a73b5c659831 (refs/remotes/origin/tags/0.2)
+r1 = dd7341cdcff45c1516079b1935d3203d5ef4111a (refs/remotes/origin/tags/0.2)
 ok 5 - multi-fetch works on partial urls + paths
 
 expecting success of 9107.6 'migrate --minimize on old inited layout': 
@@ -517936,62 +517471,36 @@
 	test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
 	test -f "$expect"
 	
-Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = faab4b6d5e9f9e1f66898ed994d77ffcca07f482
-Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
-Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = 8b3942170deb07735fbe89dbe54dfa081f89bf42
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
-Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = e916585383b4dc97e22f15a66085622de8763f84
-Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
-Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = b82a1ae588127381b30032117a03a424b3938d15
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
-Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = c55433727007659efdc633411af4a73b5c659831
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
-Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = 48e8cb561bb77ad934ea8b0267389aec6b8083e4
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = 51806830233cbe2f8e49581dcea3ae82275381f0
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558 ...
-r1 = 51806830233cbe2f8e49581dcea3ae82275381f0
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.6b661d08-9ecf-4732-a86b-b0327b4cd558
+Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = ccadf82665ba7081d86c5c5b2caada499e990374
+Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
+Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = d321806ce7e2e1a68f2b05def800371824534111
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
+Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = 22ca31d8abfdce922fd3cf7d3a219773b104af37
+Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
+Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = 8c753513ae908a73f887499fadbd46c05c3eb63d
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
+Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = dd7341cdcff45c1516079b1935d3203d5ef4111a
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
+Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = 8a81e398a7bc573e37196d35b3e2901b0bff5c54
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = d8bba3e001be3ab05a68541f95cfc9c6bd656618
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345 ...
+r1 = d8bba3e001be3ab05a68541f95cfc9c6bd656618
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.eeda28d4-f034-4639-a361-097e3e2db345
 ok 7 - .rev_db auto-converted to .rev_map.UUID
 
 # passed all 7 test(s)
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9119-git-svn-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9121-git-svn-fetch-renamed-dir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 71da302691c841ed5a17062b0443ca5bfd4c4b99 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9101-git-svn-props.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9101-git-svn-props/.git/
 expecting success of 9101.1 'checkout working copy from svn': svn co "$svnrepo" test_wc
@@ -518052,13 +517561,13 @@
 	A	ne_cr
 	A	ne_crlf
 	A	ne_lf
-r1 = 556865060884eb44b4df467597da6b435c276f47 (refs/remotes/git-svn)
+r1 = b956d7cb73e62488c973779777823573bef85520 (refs/remotes/git-svn)
 	M	kw.c
-r2 = 292d89bd9dfd32a860a40f3c9547c0a78e3f52a2 (refs/remotes/git-svn)
+r2 = 92905bb11979c91727ba365c0e5324a4c092d905 (refs/remotes/git-svn)
 	M	kw.c
-r3 = f4e5fe03aff7a184e93d40fa8cf84595e7a3c914 (refs/remotes/git-svn)
+r3 = e80500d37e9df74c8b8b4e64a2aba23df282eaa8 (refs/remotes/git-svn)
 	M	kw.c
-r4 = d6fa0bdee5a7d945e2ef556a39b3d3fb27641557 (refs/remotes/git-svn)
+r4 = 7d198372f70b7682eed21dfd7193c57466f73e2b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9101-git-svn-props/svnrepo r4
 ok 4 - fetch revisions from svn
@@ -518069,16 +517578,16 @@
 	git svn set-tree remotes/git-svn..mybranch &&
 	git pull . remotes/git-svn
 Switched to a new branch 'mybranch'
-[mybranch 5895f84] test keywords ignoring
+[mybranch 2593f94] test keywords ignoring
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	kw.c
 	M	kw.c
-r5 = 88b9607a1baa9ecbb092326684513bbb6c507a3e (refs/remotes/git-svn)
+r5 = 51c60ce73ac31d0347296be76445c462c33799c5 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 5895f84..88b9607
+Updating 2593f94..51c60ce
 Fast-forward
 ok 5 - test svn:keywords ignoring
 
@@ -518111,10 +517620,10 @@
 	M	crlf
 	M	empty
 	M	ne_crlf
-r6 = 5e2313c8d9d8eda5ab86d33cbf820d7e743da3ae (refs/remotes/git-svn)
+r6 = d44adad2e0116af466f4c50be23c4ff88d233f62 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 88b9607..5e2313c
+Updating 51c60ce..d44adad
 Fast-forward
  crlf    | 3 +--
  ne_crlf | 3 +--
@@ -518182,10 +517691,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 = 1d61c70ed98ade4fb9f5bff115320f68e191afc5 (refs/remotes/git-svn)
+r7 = 488bc57d16a00329dbae7f1c085d3552fd576c72 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 5e2313c..1d61c70
+Updating d44adad..488bc57
 Fast-forward
  cr    | 4 +++-
  ne_cr | 4 +++-
@@ -518245,10 +517754,10 @@
 	grep gitignore ls_files_result | cmp - create-ignore-index.expect
 	
 	A	deeply/nested/directory/.keep
-r8 = 8526d3ee8107481621b5069c12378b829838460c (refs/remotes/git-svn)
+r8 = 09ee1cc432e989ad1f05609db060d9d02d2497a0 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 1d61c70..8526d3e
+Updating 488bc57..09ee1cc
 Fast-forward
  deeply/nested/directory/.keep | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
@@ -518285,6 +517794,127 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9119-git-svn-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9114-git-svn-dcommit-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 2a3489ecb6028fe6ad284c4994e38fcbc988a062 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
+Switched to a new branch 'svn'
+Switched to a new branch 'merge'
+[merge f314e2d] New file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new_file
+[merge 8218447] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[merge b457d12] add some stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'svn'
+[svn 8f42697] 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.48.0~rc1+next.20250101/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = c4238ce0c3a1a31942fc9b438e34217e5a61390a (refs/remotes/origin/trunk)
+	A	new_file
+	M	README
+Committed r3
+	M	README
+	A	new_file
+r3 = 67fc6d42ee49bc8f5656f55c4ed8d820d34ea01c (refs/remotes/origin/trunk)
+No changes between 401acd3792d3c2730b3ce687e92bfb9b8c1ee182 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9109-git-svn-multi-glob.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9109-git-svn-multi-glob/.git/
 expecting success of 9109.1 'test refspec globbing': 
@@ -518385,22 +518015,22 @@
 	(required for this version (2.48.0.rc1.219.gb6b6757d772) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = 5d33164cb70285a0dcc85753c208e97745ba1e87 (refs/remotes/trunk)
+r1 = 54162bd3fa1af7676e3dd6d193c08ba6c6274c16 (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
-Found branch parent: (refs/remotes/branches/v1/start) 5d33164cb70285a0dcc85753c208e97745ba1e87
+Found branch parent: (refs/remotes/branches/v1/start) 54162bd3fa1af7676e3dd6d193c08ba6c6274c16
 Following parent with do_switch
 Successfully followed parent
-r2 = a2ce365f5352588d87f0e664ca35dd7bcf8a1fa6 (refs/remotes/branches/v1/start)
+r2 = 09902a8832189254fa957252727b37f62cbad8af (refs/remotes/branches/v1/start)
 	M	readme
-r3 = cddb22dcb6ddcc1239b61f80785fdd38a7e46bd9 (refs/remotes/branches/v1/start)
+r3 = 7884f0735527f2648b8acc72993343bf37fca03d (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.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) cddb22dcb6ddcc1239b61f80785fdd38a7e46bd9
+Found branch parent: (refs/remotes/tags/end) 7884f0735527f2648b8acc72993343bf37fca03d
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = 9e98178a9e2aa1328d46e69f826100b362404ecb (refs/remotes/tags/end)
+r4 = 0ff771d00299b9e5fe31733f76be1f0ad1fb7b5b (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.
@@ -518442,26 +518072,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 1c74b9c5256d1cf4a67ad8aed7cc8b51387047b3 (refs/remotes/two/trunk)
+r1 = 585da12223b29f5cfad8df64d946a3fdce422e77 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/two/branches/v1/start) 1c74b9c5256d1cf4a67ad8aed7cc8b51387047b3
+Found branch parent: (refs/remotes/two/branches/v1/start) 585da12223b29f5cfad8df64d946a3fdce422e77
 Following parent with do_switch
 Successfully followed parent
-r2 = 8f21c3854e9524c850b4bac718cd4c6d597140a9 (refs/remotes/two/branches/v1/start)
+r2 = 5bd5b629deb482b1eb36a8cf56b4259ea4ca8d9e (refs/remotes/two/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 5fac3cd6b569d5f60ea958057d263104cd067957 (refs/remotes/two/branches/v1/start)
+r3 = 6d053c0faf88651ab03aded8d5edb6636f7bc15e (refs/remotes/two/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 5fac3cd6b569d5f60ea958057d263104cd067957
+Found branch parent: (refs/remotes/two/tags/end) 6d053c0faf88651ab03aded8d5edb6636f7bc15e
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 157e21dfc78a894fa45361a17b634aad5ff3e607 (refs/remotes/two/tags/end)
+r4 = 60790e125a452eccfdd9bf2beba1fc03af92e87b (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = 6728164fdba5f558b13b1b8f52573bb247e6db4a (refs/remotes/two/tags/end)
+r5 = 5c59baf4585d88ef1e04479dc2cd1dd7cb128fd1 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = 90b9193de36006d9beca624be71d886fab1aab0c (refs/remotes/two/tags/end)
+r6 = 4acdb6d64c753431eba76e862186a014139f5eca (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9109.3 'test another branch': 
@@ -518536,43 +518166,43 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 1c74b9c5256d1cf4a67ad8aed7cc8b51387047b3 (refs/remotes/four/trunk)
+r1 = 585da12223b29f5cfad8df64d946a3fdce422e77 (refs/remotes/four/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/four/branches/v1/start) 1c74b9c5256d1cf4a67ad8aed7cc8b51387047b3
+Found branch parent: (refs/remotes/four/branches/v1/start) 585da12223b29f5cfad8df64d946a3fdce422e77
 Following parent with do_switch
 Successfully followed parent
-r2 = 8f21c3854e9524c850b4bac718cd4c6d597140a9 (refs/remotes/four/branches/v1/start)
+r2 = 5bd5b629deb482b1eb36a8cf56b4259ea4ca8d9e (refs/remotes/four/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 5fac3cd6b569d5f60ea958057d263104cd067957 (refs/remotes/four/branches/v1/start)
+r3 = 6d053c0faf88651ab03aded8d5edb6636f7bc15e (refs/remotes/four/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/four/tags/end) 5fac3cd6b569d5f60ea958057d263104cd067957
+Found branch parent: (refs/remotes/four/tags/end) 6d053c0faf88651ab03aded8d5edb6636f7bc15e
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 157e21dfc78a894fa45361a17b634aad5ff3e607 (refs/remotes/four/tags/end)
+r4 = 60790e125a452eccfdd9bf2beba1fc03af92e87b (refs/remotes/four/tags/end)
 	M	src/b/readme
-r5 = 6728164fdba5f558b13b1b8f52573bb247e6db4a (refs/remotes/four/tags/end)
+r5 = 5c59baf4585d88ef1e04479dc2cd1dd7cb128fd1 (refs/remotes/four/tags/end)
 	M	src/b/readme
-r6 = 90b9193de36006d9beca624be71d886fab1aab0c (refs/remotes/four/tags/end)
+r6 = 4acdb6d64c753431eba76e862186a014139f5eca (refs/remotes/four/tags/end)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
-Found branch parent: (refs/remotes/four/branches/v2/start) 1c74b9c5256d1cf4a67ad8aed7cc8b51387047b3
+Found branch parent: (refs/remotes/four/branches/v2/start) 585da12223b29f5cfad8df64d946a3fdce422e77
 Following parent with do_switch
 Successfully followed parent
-r7 = 711544b2beb2e52ee19778bb97da794db81f625c (refs/remotes/four/branches/v2/start)
+r7 = 94ec8f85cdf9021f4fb486379c5fc050f13a44f6 (refs/remotes/four/branches/v2/start)
 	M	src/a/readme
 	M	src/b/readme
-r8 = 6608f3a3e534b8ef68445db9faa62bf421817276 (refs/remotes/four/branches/v2/start)
+r8 = c9ad47e5415b93bbe2456c3dfaf82c4c75e719a9 (refs/remotes/four/branches/v2/start)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
-Found branch parent: (refs/remotes/four/tags/next) 6608f3a3e534b8ef68445db9faa62bf421817276
+Found branch parent: (refs/remotes/four/tags/next) c9ad47e5415b93bbe2456c3dfaf82c4c75e719a9
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r9 = a0f9b755b93c359b005a940048bb5df06ddfcdcd (refs/remotes/four/tags/next)
+r9 = 527cdb2f48f7fcc186aa7776711b7c00fcb2b803 (refs/remotes/four/tags/next)
 	M	src/b/readme
-r10 = a5c15783e8a2263e192081c4492040170b533e2d (refs/remotes/four/tags/next)
+r10 = 483597a915291d0fd31b122624d28d5656be7e71 (refs/remotes/four/tags/next)
 ok 3 - test another branch
 
 expecting success of 9109.4 'prepare test disallow multiple globs': 
@@ -518610,6 +518240,27 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9121-git-svn-fetch-renamed-dir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 71da302691c841ed5a17062b0443ca5bfd4c4b99 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9123-git-svn-rebuild-with-rewriteroot.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9123-git-svn-rebuild-with-rewriteroot/.git/
 expecting success of 9123.1 'init, fetch and checkout repository': 
@@ -518618,7 +518269,7 @@
 	git checkout -b mybranch remotes/git-svn
 	
 	A	foo
-r1 = d6c10f6c1fd33c94f5d3be0d11d5cc902ffff431 (refs/remotes/git-svn)
+r1 = 208bab404c30a639a9b2a20861b46cc58ef52e9f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9123-git-svn-rebuild-with-rewriteroot/svnrepo r1
 Switched to a new branch 'mybranch'
@@ -518726,10 +518377,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9122-git-svn-author/work.git/.git/
 	A	file
-r1 = 817a2c20b0dbd8a5c7282d97c67235400e242af0 (refs/remotes/git-svn)
+r1 = 8e3a8ae00b4c8111f00bf54a597a8edcd8a46dec (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo r1
-[master 46dee68] second
+[master e0ee08e] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -518737,10 +518388,10 @@
 	M	file
 Committed r2
 	M	file
-r2 = 3826b222181e6abe705f056c1286e27233346b04 (refs/remotes/git-svn)
-No changes between 46dee68f526b14a0dd0f3d5c5d6ddbcbbaf70767 and refs/remotes/git-svn
+r2 = 5d8dad597f3594b448a7c814b26eeef5c943cbda (refs/remotes/git-svn)
+No changes between e0ee08e2ba3be6e95d52daf3f0e1cf3cd921595c and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master 052c395] third
+[master ae39ec2] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -518748,10 +518399,10 @@
 	M	file
 Committed r3
 	M	file
-r3 = 0dc1c47cbe6fa9ed5bbebde94b8d129382a23290 (refs/remotes/git-svn)
-No changes between 052c395a47f50a7bf84fa8ac6dee5256fe658848 and refs/remotes/git-svn
+r3 = c570cf376533fe4677592c720b7a75784b7f7548 (refs/remotes/git-svn)
+No changes between ae39ec2ec997dbb48a7b05ba106d26a54f7eb89c and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master 8052cd1] fourth
+[master f017877] fourth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -518759,44 +518410,44 @@
 	M	file
 Committed r4
 	M	file
-r4 = 5bde5c1967eea41a1dc1617539715c5fd4e505e3 (refs/remotes/git-svn)
-No changes between 8052cd1be57250d55779760b9f913de627c87ef1 and refs/remotes/git-svn
+r4 = 89a0372b6b81b570ef7361479f4437f1dce4b7e0 (refs/remotes/git-svn)
+No changes between f017877e7349488205187612b94d7068fd2ab619 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-commit 5bde5c1967eea41a1dc1617539715c5fd4e505e3
+commit 89a0372b6b81b570ef7361479f4437f1dce4b7e0
 Author: A U Thor <author@example.com>
-Date:   Sun Feb 9 06:55:35 2025 +0000
+Date:   Sat Mar 14 13:37:45 2026 +0000
 
     fourth
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@4 67ab949e-8a52-4b17-8567-9e906db5dd98
+    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@4 2bd17ede-af43-421f-bc18-8632c5672b5c
 
-commit 0dc1c47cbe6fa9ed5bbebde94b8d129382a23290
-Author: pbuilder1 <pbuilder1@67ab949e-8a52-4b17-8567-9e906db5dd98>
-Date:   Sun Feb 9 06:55:34 2025 +0000
+commit c570cf376533fe4677592c720b7a75784b7f7548
+Author: pbuilder2 <pbuilder2@2bd17ede-af43-421f-bc18-8632c5672b5c>
+Date:   Sat Mar 14 13:37:42 2026 +0000
 
     third
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@3 67ab949e-8a52-4b17-8567-9e906db5dd98
+    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@3 2bd17ede-af43-421f-bc18-8632c5672b5c
 
-commit 3826b222181e6abe705f056c1286e27233346b04
-Author: pbuilder1 <pbuilder1@67ab949e-8a52-4b17-8567-9e906db5dd98>
-Date:   Sun Feb 9 06:55:33 2025 +0000
+commit 5d8dad597f3594b448a7c814b26eeef5c943cbda
+Author: pbuilder2 <pbuilder2@2bd17ede-af43-421f-bc18-8632c5672b5c>
+Date:   Sat Mar 14 13:37:39 2026 +0000
 
     second
     
-    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@2 67ab949e-8a52-4b17-8567-9e906db5dd98
+    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@2 2bd17ede-af43-421f-bc18-8632c5672b5c
 
-commit 817a2c20b0dbd8a5c7282d97c67235400e242af0
-Author: pbuilder1 <pbuilder1@67ab949e-8a52-4b17-8567-9e906db5dd98>
-Date:   Sun Feb 9 06:55:31 2025 +0000
+commit 8e3a8ae00b4c8111f00bf54a597a8edcd8a46dec
+Author: pbuilder2 <pbuilder2@2bd17ede-af43-421f-bc18-8632c5672b5c>
+Date:   Sat Mar 14 13:37:33 2026 +0000
 
     first commit
     
-    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@1 67ab949e-8a52-4b17-8567-9e906db5dd98
+    git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9122-git-svn-author/svnrepo@1 2bd17ede-af43-421f-bc18-8632c5672b5c
     From: A U Thor <author@example.com>
     From: A U Thor <author@example.com>
 Author: A U Thor <author@example.com>
@@ -518876,51 +518527,51 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9118-git-svn-funky-branch-names/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo
 	A	foo
-r1 = 69ae57f291485254a9195cb5b4e4cb6852f415fa (refs/remotes/origin/trunk)
+r1 = 16cabfc690efe95598f1a08a903861ca6bccd016 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin, 1
-Found branch parent: (refs/remotes/origin/fun plugin) 69ae57f291485254a9195cb5b4e4cb6852f415fa
+Found branch parent: (refs/remotes/origin/fun plugin) 16cabfc690efe95598f1a08a903861ca6bccd016
 Following parent with do_switch
 Successfully followed parent
-r2 = 4a1bbdbf188aab5860e7cd9142cb48b9b6e01b72 (refs/remotes/origin/fun plugin)
+r2 = a7492dc347802d5e9b4a24345b6360ed241e6299 (refs/remotes/origin/fun plugin)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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!) 4a1bbdbf188aab5860e7cd9142cb48b9b6e01b72
+Found branch parent: (refs/remotes/origin/more fun plugin!) a7492dc347802d5e9b4a24345b6360ed241e6299
 Following parent with do_switch
 Successfully followed parent
-r3 = 065e0970269fc747b0b5e615b5f817ec69c5de19 (refs/remotes/origin/more fun plugin!)
+r3 = 3ade62f9cd0f44df365989adef7a97ff99ef5816 (refs/remotes/origin/more fun plugin!)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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)) 4a1bbdbf188aab5860e7cd9142cb48b9b6e01b72
+Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) a7492dc347802d5e9b4a24345b6360ed241e6299
 Following parent with do_switch
 Successfully followed parent
-r4 = 3950ca4fe0f5bf124b8d36f328630a6f64b18bb6 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+r4 = 47ec986fb726f0cb63d47438305d7f2d7c212174 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/.leading_dot, 4
-Found branch parent: (refs/remotes/origin/.leading_dot) 69ae57f291485254a9195cb5b4e4cb6852f415fa
+Found branch parent: (refs/remotes/origin/.leading_dot) 16cabfc690efe95598f1a08a903861ca6bccd016
 Following parent with do_switch
 Successfully followed parent
-r5 = de7f48d732887fda5a8fab62f612656de061c572 (refs/remotes/origin/.leading_dot)
+r5 = 2a8a90c38d8a1a6bb1efa4e51393f3a4b33ffc43 (refs/remotes/origin/.leading_dot)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dot., 5
-Found branch parent: (refs/remotes/origin/trailing_dot.) 69ae57f291485254a9195cb5b4e4cb6852f415fa
+Found branch parent: (refs/remotes/origin/trailing_dot.) 16cabfc690efe95598f1a08a903861ca6bccd016
 Following parent with do_switch
 Successfully followed parent
-r6 = 36bab9ec8fe50c0ba6980460b3b497d12c298def (refs/remotes/origin/trailing_dot.)
+r6 = 2bf84e58fdd260def63228be09cf9d1628f6ea4e (refs/remotes/origin/trailing_dot.)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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) 69ae57f291485254a9195cb5b4e4cb6852f415fa
+Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) 16cabfc690efe95598f1a08a903861ca6bccd016
 Following parent with do_switch
 Successfully followed parent
-r7 = 64bd1de1fed669b168e7ba00853eca9469fab791 (refs/remotes/origin/trailing_dotlock.lock)
+r7 = 571ae83dd70d78ffacc5b6332c2a15416e0096fc (refs/remotes/origin/trailing_dotlock.lock)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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) 69ae57f291485254a9195cb5b4e4cb6852f415fa
+Found branch parent: (refs/remotes/origin/not-a@{0}reflog) 16cabfc690efe95598f1a08a903861ca6bccd016
 Following parent with do_switch
 Successfully followed parent
-r8 = 04e6b5289e0b0b00ecc5ca1e3792344497b1501f (refs/remotes/origin/not-a@{0}reflog)
+r8 = 06bb061d8552483ca6baae3339dbe07529ba28a4 (refs/remotes/origin/not-a@{0}reflog)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk r1
-4a1bbdbf188aab5860e7cd9142cb48b9b6e01b72
-065e0970269fc747b0b5e615b5f817ec69c5de19
-3950ca4fe0f5bf124b8d36f328630a6f64b18bb6
-de7f48d732887fda5a8fab62f612656de061c572
-36bab9ec8fe50c0ba6980460b3b497d12c298def
-64bd1de1fed669b168e7ba00853eca9469fab791
-04e6b5289e0b0b00ecc5ca1e3792344497b1501f
+a7492dc347802d5e9b4a24345b6360ed241e6299
+3ade62f9cd0f44df365989adef7a97ff99ef5816
+47ec986fb726f0cb63d47438305d7f2d7c212174
+2a8a90c38d8a1a6bb1efa4e51393f3a4b33ffc43
+2bf84e58fdd260def63228be09cf9d1628f6ea4e
+571ae83dd70d78ffacc5b6332c2a15416e0096fc
+06bb061d8552483ca6baae3339dbe07529ba28a4
 ok 2 - test clone with funky branch names
 
 expecting success of 9118.3 'test dcommit to funky branch': 
@@ -518932,8 +518583,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 065e097 more fun!
-[master f80094f] hello
+HEAD is now at 3ade62f more fun!
+[master 69e6fb1] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -518941,8 +518592,8 @@
 	M	foo
 Committed r9
 	M	foo
-r9 = 8b1fb07f67a02f1b7e0a348b9a65dc0e898fe9c0 (refs/remotes/origin/more fun plugin!)
-No changes between f80094f952417120d9710609ca14c2363fd410ba and refs/remotes/origin/more%20fun%20plugin!
+r9 = 00ce6f1c4504720d027bf2ee57e14efcf0989cf4 (refs/remotes/origin/more fun plugin!)
+No changes between 69e6fb11ffe0dee0257e1fec25c0b480b4da450f and refs/remotes/origin/more%20fun%20plugin!
 Resetting to the latest refs/remotes/origin/more%20fun%20plugin!
 ok 3 - test dcommit to funky branch
 
@@ -518955,8 +518606,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 3950ca4 scary
-[master 4fffaaa] eep
+HEAD is now at 47ec986 scary
+[master ab83522] eep
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -518964,8 +518615,8 @@
 	M	foo
 Committed r10
 	M	foo
-r10 = 87358021ab1279e5f02248f57f0b5e921252c269 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
-No changes between 4fffaaabb1372e84d34dad7bf5eaf60191a2002a and refs/remotes/origin/Abo-Uebernahme%20(Bug%20#994)
+r10 = 0870e937b45ece2c059e786a2fefde7ced1c8323 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+No changes between ab835223e4dc8cab69c6dae36e37fe82c4751f4e 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
 
@@ -518978,8 +518629,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 64bd1de trailing .lock
-[master 18d35cc] bar
+HEAD is now at 571ae83 trailing .lock
+[master 9f9b7eb] bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -518987,8 +518638,8 @@
 	M	foo
 Committed r11
 	M	foo
-r11 = 92737e7c78296627733fd0932e957654c08f9a0c (refs/remotes/origin/trailing_dotlock.lock)
-No changes between 18d35ccaaf8e3162b154a35a5e84f1e5b25db1e1 and refs/remotes/origin/trailing_dotlock%2Elock
+r11 = d6edee4151b038b8e555f09801680bdb209d7297 (refs/remotes/origin/trailing_dotlock.lock)
+No changes between 9f9b7ebb3df38ed3f210d900b8aabc504c80f860 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
 
@@ -519006,181 +518657,6 @@
 1..0 # SKIP skip all tests in t9128
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9120-git-svn-clone-with-percent-escapes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
-	A	trunk/foo
-W: +empty_dir: branches
-W: +empty_dir: tags
-r1 = bdac842a131b36b111fa4133d101ff9eb349af3d (refs/remotes/git-svn)
-	A	branches/b/foo
-r2 = 49eb83ac4d28974d99908207e6c0dbdd6411d4fd (refs/remotes/git-svn)
-	A	tags/v1/foo
-r3 = dc6d8ba92767f0c3d01b3b18c9201ecebe19a5bc (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
-dc6d8ba92767f0c3d01b3b18c9201ecebe19a5bc
-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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = bd29ccb1ac616765692eb027a1546142b090a62e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bd29ccb1ac616765692eb027a1546142b090a62e
-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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
-	A	foo
-r1 = bd29ccb1ac616765692eb027a1546142b090a62e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bd29ccb1ac616765692eb027a1546142b090a62e
-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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = bd29ccb1ac616765692eb027a1546142b090a62e (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) bd29ccb1ac616765692eb027a1546142b090a62e
-Following parent with do_switch
-Successfully followed parent
-r2 = 60e9b1932a8fef2c76e2fe406275960b8a5c66c3 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) bd29ccb1ac616765692eb027a1546142b090a62e
-Following parent with do_switch
-Successfully followed parent
-r3 = f29a80e17f0856f753644d1714591186e48de030 (refs/remotes/origin/tags/v1)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bd29ccb1ac616765692eb027a1546142b090a62e
-60e9b1932a8fef2c76e2fe406275960b8a5c66c3
-f29a80e17f0856f753644d1714591186e48de030
-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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = bd29ccb1ac616765692eb027a1546142b090a62e (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) bd29ccb1ac616765692eb027a1546142b090a62e
-Following parent with do_switch
-Successfully followed parent
-r2 = 60e9b1932a8fef2c76e2fe406275960b8a5c66c3 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) bd29ccb1ac616765692eb027a1546142b090a62e
-Following parent with do_switch
-Successfully followed parent
-r3 = f29a80e17f0856f753644d1714591186e48de030 (refs/remotes/origin/tags/v1)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bd29ccb1ac616765692eb027a1546142b090a62e
-60e9b1932a8fef2c76e2fe406275960b8a5c66c3
-f29a80e17f0856f753644d1714591186e48de030
-ok 8 - test clone -s with unescaped space
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9124-git-svn-dcommit-auto-props.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9124-git-svn-dcommit-auto-props/.git/
 expecting success of 9124.1 'initialize git svn': 
@@ -519198,7 +518674,7 @@
 Committing transaction...
 Committed revision 1.
 	A	foo
-r1 = d1df7d6584fbb46190249a6ff44768b2636314c2 (refs/remotes/git-svn)
+r1 = 2a4e06cd29edb1bb577c55eab9cdce521247a79a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9124-git-svn-dcommit-auto-props/svnrepo r1
 ok 1 - initialize git svn
@@ -519217,7 +518693,7 @@
 	git commit -m "files for enabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master f33b647] files for enabled auto-props
+[master 5911ae9] files for enabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 bar
@@ -519232,8 +518708,8 @@
 	A	bar
 	A	exec1.sh
 	A	hello.txt
-r2 = d1571132e0789f3edf1176d3dd74a2507a6d5516 (refs/remotes/git-svn)
-No changes between f33b647683a53b42dc36be53e47887caee094026 and refs/remotes/git-svn
+r2 = 61c425a5cb23378d8b24ebda88936dea047f7e7f (refs/remotes/git-svn)
+No changes between 5911ae9525b3ba92ab0fd6cc96adb45f0203a78a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - add files matching auto-props
 
@@ -519250,7 +518726,7 @@
 	git commit -m "files for disabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master ecba25c] files for disabled auto-props
+[master c310cdb] files for disabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100755 exec2.sh
@@ -519265,8 +518741,8 @@
 	A	exec2.sh
 	A	world.txt
 	A	zot
-r3 = 0ed62ad7b4f58763582556fdeecd1885fc77f08c (refs/remotes/git-svn)
-No changes between ecba25cfe9431e5bfe34badf8a75163c268739a8 and refs/remotes/git-svn
+r3 = a4c006f56b73f2e8eb4c4c318150c738efd2c502 (refs/remotes/git-svn)
+No changes between c310cdbe43511db7397f2e044cc9f955f3a9259b and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - add files matching disabled auto-props
 
@@ -519335,7 +518811,7 @@
 		test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
 	)
 
-[master 2f832f9] foo => foo.sh
+[master f724ae6] foo => foo.sh
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename foo => foo.sh (100%)
@@ -519346,8 +518822,8 @@
 	D	foo
 	A	foo.sh
 W: -empty_dir: foo
-r4 = 737f44b04001a22fb1885409ffaccda7f975bc97 (refs/remotes/git-svn)
-No changes between 2f832f9e4466d96bc7383b122de818aeadf2876c and refs/remotes/git-svn
+r4 = 630de27667935f96d25734cac4d0b74f59e65c83 (refs/remotes/git-svn)
+No changes between f724ae6f17521a966f3d7b312a37e92d646e3fbe and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 D    foo
@@ -519359,6 +518835,181 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9120-git-svn-clone-with-percent-escapes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
+	A	trunk/foo
+W: +empty_dir: branches
+W: +empty_dir: tags
+r1 = 130d1673e1d411e497b5be7eedae924c9fd4f852 (refs/remotes/git-svn)
+	A	branches/b/foo
+r2 = 8e0c21455103d06e9133f572e61d5a7b587eaee3 (refs/remotes/git-svn)
+	A	tags/v1/foo
+r3 = 617c9c7fe49ecdc1192621a371c80872cf68cac9 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
+617c9c7fe49ecdc1192621a371c80872cf68cac9
+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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 7c07644b62a94846fc4fc134fb0054989bb4f52e (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+7c07644b62a94846fc4fc134fb0054989bb4f52e
+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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
+	A	foo
+r1 = 7c07644b62a94846fc4fc134fb0054989bb4f52e (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+7c07644b62a94846fc4fc134fb0054989bb4f52e
+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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 7c07644b62a94846fc4fc134fb0054989bb4f52e (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) 7c07644b62a94846fc4fc134fb0054989bb4f52e
+Following parent with do_switch
+Successfully followed parent
+r2 = 3103642726499fc999a05e766a04c1b5b6960772 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) 7c07644b62a94846fc4fc134fb0054989bb4f52e
+Following parent with do_switch
+Successfully followed parent
+r3 = 9ffa3325e4fd3d5944385084c672ba075b2052f1 (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+7c07644b62a94846fc4fc134fb0054989bb4f52e
+3103642726499fc999a05e766a04c1b5b6960772
+9ffa3325e4fd3d5944385084c672ba075b2052f1
+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.48.0~rc1+next.20250101/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 7c07644b62a94846fc4fc134fb0054989bb4f52e (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) 7c07644b62a94846fc4fc134fb0054989bb4f52e
+Following parent with do_switch
+Successfully followed parent
+r2 = 3103642726499fc999a05e766a04c1b5b6960772 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) 7c07644b62a94846fc4fc134fb0054989bb4f52e
+Following parent with do_switch
+Successfully followed parent
+r3 = 9ffa3325e4fd3d5944385084c672ba075b2052f1 (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+7c07644b62a94846fc4fc134fb0054989bb4f52e
+3103642726499fc999a05e766a04c1b5b6960772
+9ffa3325e4fd3d5944385084c672ba075b2052f1
+ok 8 - test clone -s with unescaped space
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9125-git-svn-multi-glob-branch-names.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9125-git-svn-multi-glob-branch-names/.git/
 expecting success of 9125.1 'setup svnrepo': 
@@ -519396,21 +519047,21 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
 	A	foo
-r1 = 6d14d762071acf81b583738cb916b97097c200eb (refs/remotes/origin/trunk)
+r1 = 783456272122f4afd61c2f676805ea8265bfaaeb (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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) 6d14d762071acf81b583738cb916b97097c200eb
+Found branch parent: (refs/remotes/origin/v14.1/beta) 783456272122f4afd61c2f676805ea8265bfaaeb
 Following parent with do_switch
 Successfully followed parent
-r2 = 1baf4b2f1eb1dda6629e5409094a745462cc93bc (refs/remotes/origin/v14.1/beta)
+r2 = 2f3d5cb1c1f8ece569ddace9e2fe69bf2c3ee7cd (refs/remotes/origin/v14.1/beta)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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) 1baf4b2f1eb1dda6629e5409094a745462cc93bc
+Found branch parent: (refs/remotes/origin/v14.1/gold) 2f3d5cb1c1f8ece569ddace9e2fe69bf2c3ee7cd
 Following parent with do_switch
 Successfully followed parent
-r3 = 1e8a078ac1890c349fead526185d4027884cd61d (refs/remotes/origin/v14.1/gold)
+r3 = 3d34da21dfd12149fcf2d867c541ef7288b3a63e (refs/remotes/origin/v14.1/gold)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
-1baf4b2f1eb1dda6629e5409094a745462cc93bc
-1e8a078ac1890c349fead526185d4027884cd61d
+2f3d5cb1c1f8ece569ddace9e2fe69bf2c3ee7cd
+3d34da21dfd12149fcf2d867c541ef7288b3a63e
 ok 2 - test clone with multi-glob in branch names
 
 expecting success of 9125.3 'test dcommit to multi-globbed branch': 
@@ -519421,8 +519072,8 @@
 	git svn dcommit
 	)
 	
-HEAD is now at 1e8a078 more fun!
-[master 95b7091] hello
+HEAD is now at 3d34da2 more fun!
+[master ac6b164] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -519430,8 +519081,8 @@
 	M	foo
 Committed r4
 	M	foo
-r4 = 059415e411b71401b2fb7e3baa373226ec924697 (refs/remotes/origin/v14.1/gold)
-No changes between 95b70910ecf2a346f62b963fa0cc6196c9b264e7 and refs/remotes/origin/v14.1/gold
+r4 = 0bdad4ded9ddda7702148f6e931463a1a78b64df (refs/remotes/origin/v14.1/gold)
+No changes between ac6b1646913793cc5d5d45e4a67759d0ea736724 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
 
@@ -519464,7 +519115,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = c24c65f8ff675f0765ee9c673401dd4987079cf9 (refs/remotes/git-svn)
+r1 = 7d48d4ebaf821cff8ff878a255111ab8d2f876ba (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 2 - basic clone
@@ -519478,7 +519129,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9117-git-svn-init-clone/target/.git/
 	A	foo
-r1 = c24c65f8ff675f0765ee9c673401dd4987079cf9 (refs/remotes/git-svn)
+r1 = 7d48d4ebaf821cff8ff878a255111ab8d2f876ba (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 3 - clone to target directory
@@ -519493,7 +519144,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9117-git-svn-init-clone/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = c24c65f8ff675f0765ee9c673401dd4987079cf9 (refs/remotes/origin/trunk)
+r1 = 7d48d4ebaf821cff8ff878a255111ab8d2f876ba (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 4 - clone with --stdlayout
@@ -519508,7 +519159,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9117-git-svn-init-clone/target/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = c24c65f8ff675f0765ee9c673401dd4987079cf9 (refs/remotes/origin/trunk)
+r1 = 7d48d4ebaf821cff8ff878a255111ab8d2f876ba (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 5 - clone to target directory with --stdlayout
@@ -519532,7 +519183,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = c24c65f8ff675f0765ee9c673401dd4987079cf9 (refs/remotes/git-svn)
+r1 = 7d48d4ebaf821cff8ff878a255111ab8d2f876ba (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/': 
@@ -519556,7 +519207,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = c24c65f8ff675f0765ee9c673401dd4987079cf9 (refs/remotes/origin/trunk)
+r1 = 7d48d4ebaf821cff8ff878a255111ab8d2f876ba (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': 
@@ -519580,7 +519231,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = c24c65f8ff675f0765ee9c673401dd4987079cf9 (refs/remotes/trunk)
+r1 = 7d48d4ebaf821cff8ff878a255111ab8d2f876ba (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': 
@@ -519785,12 +519436,12 @@
 	git svn fetch -r1:2
 
 	A	foo
-r1 = 928e4c92ea15e70abce276b8d1c3f8b3de5621eb (refs/remotes/origin/trunk)
+r1 = 4a8952daa81988c6cb06110bede150c4cb7bb343 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 928e4c92ea15e70abce276b8d1c3f8b3de5621eb
+Found branch parent: (refs/remotes/origin/a) 4a8952daa81988c6cb06110bede150c4cb7bb343
 Following parent with do_switch
 Successfully followed parent
-r2 = cf9c38a627d0fc0e407d57cd4350bad0b54ed8d8 (refs/remotes/origin/a)
+r2 = 30589d8bbf2f8d06024f1c5f01c83c7c8e50e5ba (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r1
 ok 2 - import an early SVN revision into git
@@ -519807,16 +519458,16 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9127-git-svn-partial-rebuild/mirror/.git/
 	A	foo
-r1 = 928e4c92ea15e70abce276b8d1c3f8b3de5621eb (refs/remotes/origin/trunk)
+r1 = 4a8952daa81988c6cb06110bede150c4cb7bb343 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 928e4c92ea15e70abce276b8d1c3f8b3de5621eb
+Found branch parent: (refs/remotes/origin/a) 4a8952daa81988c6cb06110bede150c4cb7bb343
 Following parent with do_switch
 Successfully followed parent
-r2 = cf9c38a627d0fc0e407d57cd4350bad0b54ed8d8 (refs/remotes/origin/a)
+r2 = 30589d8bbf2f8d06024f1c5f01c83c7c8e50e5ba (refs/remotes/origin/a)
 	M	foo
-r3 = c9e1721a14b33d47b16684ee9b54fb8f2d1f6ac4 (refs/remotes/origin/trunk)
+r3 = 004ee38b9d036cfa6bd65c99bd526c8776ac90c9 (refs/remotes/origin/trunk)
 	A	a
-r4 = 6bce46d0bf018db0086d5b49c9c7baa39c4f81cf (refs/remotes/origin/a)
+r4 = 9e25dacaafee3edee138daf120bc1eb239c0ad48 (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r3
 ok 3 - make full git mirror of SVN
@@ -519828,16 +519479,16 @@
 	git svn fetch
 
 From file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9127-git-svn-partial-rebuild/mirror/
-   cf9c38a..6bce46d  origin/a     -> origin/a
-   928e4c9..c9e1721  origin/trunk -> origin/trunk
-Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.1814af8f-66bc-4847-8d84-8c5b424abb61 ...
-Currently at 1 = 928e4c92ea15e70abce276b8d1c3f8b3de5621eb
-r3 = c9e1721a14b33d47b16684ee9b54fb8f2d1f6ac4
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.1814af8f-66bc-4847-8d84-8c5b424abb61
-Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.1814af8f-66bc-4847-8d84-8c5b424abb61 ...
-Currently at 2 = cf9c38a627d0fc0e407d57cd4350bad0b54ed8d8
-r4 = 6bce46d0bf018db0086d5b49c9c7baa39c4f81cf
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.1814af8f-66bc-4847-8d84-8c5b424abb61
+   30589d8..9e25dac  origin/a     -> origin/a
+   4a8952d..004ee38  origin/trunk -> origin/trunk
+Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.c11bd586-c25a-4bce-b58e-41ed6eed0fff ...
+Currently at 1 = 4a8952daa81988c6cb06110bede150c4cb7bb343
+r3 = 004ee38b9d036cfa6bd65c99bd526c8776ac90c9
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.c11bd586-c25a-4bce-b58e-41ed6eed0fff
+Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.c11bd586-c25a-4bce-b58e-41ed6eed0fff ...
+Currently at 2 = 30589d8bbf2f8d06024f1c5f01c83c7c8e50e5ba
+r4 = 9e25dacaafee3edee138daf120bc1eb239c0ad48
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.c11bd586-c25a-4bce-b58e-41ed6eed0fff
 ok 4 - fetch from git mirror and partial-rebuild
 
 # passed all 4 test(s)
@@ -519889,7 +519540,7 @@
 	A	#{bad_directory_name}/ foo
 Committed r2
 	A	#{bad_directory_name}/ foo
-r2 = 9d26637ebf6b104f48672dbad70122f362b83b63 (refs/remotes/git-svn)
+r2 = 579195e573b3020a3733f3d33a99dff74f41a47c (refs/remotes/git-svn)
 No changes between 88ce68e7c1b1122f99d847ec3c8a5ff3d8072b82 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - create file in existing ugly and empty dir
@@ -519899,7 +519550,7 @@
 	git commit -m "rename ugly file" &&
 	git svn dcommit
 	
-[master 6b6e1be] rename ugly file
+[master 1b40cf1] 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%)
@@ -519910,8 +519561,8 @@
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 0d27e1b66fdc40198007387e229884acedfcdd33 (refs/remotes/git-svn)
-No changes between 6b6e1be6231b608eb3f355de394f29aad0be2ee0 and refs/remotes/git-svn
+r3 = 0f38811d8bc257c347954180510d39a1dd4fd2a0 (refs/remotes/git-svn)
+No changes between 1b40cf1007b8f5f293d8c5cfe6fae7e115eb84ef and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 4 - rename ugly file
 
@@ -519925,7 +519576,7 @@
 	git commit -m "moved pretty file" &&
 	git svn dcommit
 	
-[master 81c6ed9] pretty :x
+[master dd1b51c] pretty :x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 pretty
@@ -519934,10 +519585,10 @@
 	A	pretty
 Committed r4
 	A	pretty
-r4 = b8492ae40f54020f038d04df3f8292a969e398e1 (refs/remotes/git-svn)
-No changes between 81c6ed9bfa4b36d3c23c129e2a1ec580dc3ba0af and refs/remotes/git-svn
+r4 = 23546def1c0660745ddd05e1be35ae39cc60982c (refs/remotes/git-svn)
+No changes between dd1b51c2353277d04c46d0638dfaad0478d3d592 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master 9bcdc8b] moved pretty file
+[master afe2d98] moved pretty file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename pretty => regular_dir_name/pretty (100%)
@@ -519948,8 +519599,8 @@
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = ade83f2297947745e5f9ec94b91c0ce01b59af65 (refs/remotes/git-svn)
-No changes between 9bcdc8bdbf10e77a39af14f6a08bddc03abec8e8 and refs/remotes/git-svn
+r5 = f031b8ebefc0d95c0974c16e399839c17522c8ee (refs/remotes/git-svn)
+No changes between afe2d98a3160038a74051ab953b396523c007f2d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - rename pretty file
 
@@ -519958,7 +519609,7 @@
 	git commit -m booboo &&
 	git svn dcommit
 	
-[master 493c71c] booboo
+[master ebb6dc1] 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%)
@@ -519969,8 +519620,8 @@
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 5075adfaa05d4220ac78a316f96009e9ca322fa2 (refs/remotes/git-svn)
-No changes between 493c71c5bf20cf82d9b6861c9b8eaac252d5945f and refs/remotes/git-svn
+r6 = 4e9a82d5313b2c2da84ff97e096d5f52d576d170 (refs/remotes/git-svn)
+No changes between ebb6dc1fab2cc46642926aba6f171c0595844620 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 6 - rename pretty file into ugly one
 
@@ -519983,11 +519634,11 @@
 	git commit -m plus_dir &&
 	git svn dcommit
 	
-[master 68214e9] plus
+[master 290893d] plus
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 +_+
-[master a7dc2f4] plus_dir
+[master 6da87c0] plus_dir
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename +_+ => gtk+/_+_ (100%)
@@ -519996,14 +519647,14 @@
 	A	+_+
 Committed r7
 	A	+_+
-r7 = 1857ff3bd010e97fd94e760d45564ce29d70b0c7 (refs/remotes/git-svn)
+r7 = e05c9f31cbbecee3666ac730aa6b74591bcf119d (refs/remotes/git-svn)
 	R	+_+ => gtk+/_+_
 Committed r8
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = 1252391ce5eb8ab20b4a4ed97173c03a31f70413 (refs/remotes/git-svn)
-No changes between a7dc2f4d43585418a1ecd5a9dce503a8a51e46c7 and refs/remotes/git-svn
+r8 = 9bdc060e8c3ffa55b453ab62e190723944d30ed0 (refs/remotes/git-svn)
+No changes between 6da87c073b20eff0d39d278e83462071a9966693 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 7 - add a file with plus signs
 
@@ -520026,33 +519677,33 @@
 W: +empty_dir: regular_dir_name
 r1 = e1ad2687407892e8698add37a1065b265521a350 (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ foo
-r2 = 9d26637ebf6b104f48672dbad70122f362b83b63 (refs/remotes/git-svn)
+r2 = 579195e573b3020a3733f3d33a99dff74f41a47c (refs/remotes/git-svn)
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 0d27e1b66fdc40198007387e229884acedfcdd33 (refs/remotes/git-svn)
+r3 = 0f38811d8bc257c347954180510d39a1dd4fd2a0 (refs/remotes/git-svn)
 	A	pretty
-r4 = b8492ae40f54020f038d04df3f8292a969e398e1 (refs/remotes/git-svn)
+r4 = 23546def1c0660745ddd05e1be35ae39cc60982c (refs/remotes/git-svn)
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = ade83f2297947745e5f9ec94b91c0ce01b59af65 (refs/remotes/git-svn)
+r5 = f031b8ebefc0d95c0974c16e399839c17522c8ee (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 5075adfaa05d4220ac78a316f96009e9ca322fa2 (refs/remotes/git-svn)
+r6 = 4e9a82d5313b2c2da84ff97e096d5f52d576d170 (refs/remotes/git-svn)
 	A	+_+
-r7 = 1857ff3bd010e97fd94e760d45564ce29d70b0c7 (refs/remotes/git-svn)
+r7 = e05c9f31cbbecee3666ac730aa6b74591bcf119d (refs/remotes/git-svn)
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = 1252391ce5eb8ab20b4a4ed97173c03a31f70413 (refs/remotes/git-svn)
+r8 = 9bdc060e8c3ffa55b453ab62e190723944d30ed0 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 7b936b8] test-rebase
+[master 40940c3] test-rebase
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase
@@ -520064,7 +519715,7 @@
 		git commit -m test-rebase-main &&
 		git svn dcommit
 	
-[master c531934] test-rebase-main
+[master fd74f26] test-rebase-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase-main
@@ -520073,8 +519724,8 @@
 	A	test-rebase-main
 Committed r9
 	A	test-rebase-main
-r9 = 7529ceacc76fc2364cdb5a97eec41124489b6f6c (refs/remotes/git-svn)
-No changes between c5319343d1d270fe4dc6a792d35b16976a5ba2d7 and refs/remotes/git-svn
+r9 = 89f0944fa396413cdab4564e4c150f9fdd4d7024 (refs/remotes/git-svn)
+No changes between fd74f26a6f95cddf51c41c4f64f2ad23be173d40 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 9 - make a commit to test rebase
 
@@ -520086,7 +519737,7 @@
 		test -e test-rebase
 	)
 	A	test-rebase-main
-r9 = 7529ceacc76fc2364cdb5a97eec41124489b6f6c (refs/remotes/git-svn)
+r9 = 89f0944fa396413cdab4564e4c150f9fdd4d7024 (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
 
@@ -520113,7 +519764,7 @@
 	git commit -m "neq" &&
 	git svn dcommit
 
-[master a2087b0] neq
+[master 42797bb] neq
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\202"
@@ -520122,8 +519773,8 @@
 	A	�‚
 Committed r10
 	A	�‚
-r10 = 3d40c0a63a000a4e1ddcc4b7e77e1ad0169c460d (refs/remotes/git-svn)
-No changes between a2087b0f0cda2d5ff4063d44822b85694d9f7e61 and refs/remotes/git-svn
+r10 = df7a06314e872c67430af71131001017b6bcf8db (refs/remotes/git-svn)
+No changes between 42797bbcee6b70b6bdf925252ecc3c31d9a6813e and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 11 - svn.pathnameencoding=cp932 new file on dcommit
 
@@ -520140,7 +519791,7 @@
 	git commit -m "inf rename" &&
 	git svn dcommit
 
-[master 767a790] inf
+[master 186d9b4] inf
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\207"
@@ -520149,10 +519800,10 @@
 	A	�‡
 Committed r11
 	A	�‡
-r11 = 0aebde47c299dfbdd92f55ec24a144c5e073e15a (refs/remotes/git-svn)
-No changes between 767a790fff142100189822d36e69fbb34a512354 and refs/remotes/git-svn
+r11 = 679cbdd2329005311e6e86d2aec92f1e2dc9195f (refs/remotes/git-svn)
+No changes between 186d9b4d3dd6b117a716d9e5f81b6feef6d27f12 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master eb99905] inf rename
+[master 3abd317] inf rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename "\201\207" => inf (100%)
@@ -520163,194 +519814,13 @@
 	D	�‡
 	A	inf
 W: -empty_dir: ∞
-r12 = d333f6166e9a28c6c9edc334e8134172043ed76c (refs/remotes/git-svn)
-No changes between eb9990578afbfaa164ce4672e1fbccb207752dda and refs/remotes/git-svn
+r12 = dc962bbba8d4a1dca37a8a1f8f5034a95cf814d4 (refs/remotes/git-svn)
+No changes between 3abd317163a1e07af8f21352d6004d31beaba607 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 12 - svn.pathnameencoding=cp932 rename on dcommit
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9131-git-svn-empty-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/.git/
-expecting success of 9131.1 'load svn dumpfile': 
-	svnadmin load "$rawsvnrepo" <<EOF
-SVN-fs-dump-format-version: 2
-
-UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
-
-Revision-number: 0
-Prop-content-length: 56
-Content-length: 56
-
-K 8
-svn:date
-V 27
-2008-11-26T07:17:27.590577Z
-PROPS-END
-
-Revision-number: 1
-Prop-content-length: 111
-Content-length: 111
-
-K 7
-svn:log
-V 4
-test
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-26T07:18:03.511836Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: add
-Prop-content-length: 33
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Content-length: 33
-
-K 11
-svn:special
-V 1
-*
-PROPS-END
-
-Revision-number: 2
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 13
-bar => doink
-
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-27T03:55:31.601672Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: change
-Text-content-length: 10
-Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
-Content-length: 10
-
-link doink
-
-EOF
-
-<<< Started new transaction, based on original revision 1
-     * editing path : bar ... done.
-
-------- Committed revision 1 >>>
-
-<<< Started new transaction, based on original revision 2
-     * editing path : bar ... done.
-
-------- Committed revision 2 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success of 9131.2 'clone using git svn': git svn clone -r1 "$svnrepo" x
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/x/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = ebb92e77042635001a1b5a2493c9db62b13b6091 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 2 - clone using git svn
-
-expecting success of 9131.3 'enable broken symlink workaround': (cd x && git config svn.brokenSymlinkWorkaround true)
-ok 3 - enable broken symlink workaround
-
-expecting success of 9131.4 '"bar" is an empty file': test_must_be_empty x/bar
-ok 4 - "bar" is an empty file
-
-expecting success of 9131.5 'get "bar" => symlink fix from svn': (cd x && git svn rebase)
-Scanning for empty symlinks, this may take a while if you have many empty files
-You may disable this with `git config svn.brokenSymlinkWorkaround false'.
-This may be done in a different terminal without restarting git svn
-	M	bar
-r2 = 6fef9b53ab8c53b994b338f312a6aad1ee8d07ab (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 5 - get "bar" => symlink fix from svn
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 9131.6 '"bar" becomes a symlink': test -h x/bar
-ok 6 - "bar" becomes a symlink
-
-expecting success of 9131.7 'clone using git svn': git svn clone -r1 "$svnrepo" y
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/y/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = ebb92e77042635001a1b5a2493c9db62b13b6091 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 7 - clone using git svn
-
-expecting success of 9131.8 'disable broken symlink workaround': (cd y && git config svn.brokenSymlinkWorkaround false)
-ok 8 - disable broken symlink workaround
-
-expecting success of 9131.9 '"bar" is an empty file': test_must_be_empty y/bar
-ok 9 - "bar" is an empty file
-
-expecting success of 9131.10 'get "bar" => symlink fix from svn': (cd y && git svn rebase)
-	M	bar
-r2 = 7b49c4c8944f68950c579dfd6948deea78557551 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 10 - get "bar" => symlink fix from svn
-
-expecting success of 9131.11 '"bar" does not become a symlink': ! test -L y/bar
-ok 11 - "bar" does not become a symlink
-
-expecting success of 9131.12 'clone using git svn': git svn clone -r1 "$svnrepo" z
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/z/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = ebb92e77042635001a1b5a2493c9db62b13b6091 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 12 - clone using git svn
-
-expecting success of 9131.13 '"bar" is an empty file': test_must_be_empty z/bar
-ok 13 - "bar" is an empty file
-
-expecting success of 9131.14 'get "bar" => symlink fix from svn': (cd z && git svn rebase)
-	M	bar
-r2 = 7b49c4c8944f68950c579dfd6948deea78557551 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 14 - get "bar" => symlink fix from svn
-
-expecting success of 9131.15 '"bar" does not become a symlink': ! test -L z/bar
-ok 15 - "bar" does not become a symlink
-
-# passed all 15 test(s)
-1..15
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9133-git-svn-nested-git-repo.sh ***
@@ -520375,22 +519845,13 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
 refs/heads/master
 A         .git
-A         .git/objects
-A         .git/objects/info
-A         .git/objects/pack
-A         .git/info
-A         .git/info/exclude
 A         .git/refs
-A         .git/refs/tags
 A         .git/refs/heads
+A         .git/refs/tags
 A         .git/a
 A         .git/HEAD
 A         .git/description
 A         .git/hooks
-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
@@ -520401,7 +519862,16 @@
 A         .git/hooks/fsmonitor-watchman.sample
 A         .git/hooks/push-to-checkout.sample
 A         .git/hooks/update.sample
+A         .git/hooks/pre-push.sample
+A         .git/hooks/post-update.sample
+A         .git/hooks/pre-rebase.sample
+A         .git/hooks/pre-receive.sample
 A         .git/config
+A         .git/objects
+A         .git/objects/info
+A         .git/objects/pack
+A         .git/info
+A         .git/info/exclude
 A         a
 Adding         .git
 Adding         .git/HEAD
@@ -520452,8 +519922,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
 	A	a
-r1 = 6df058a678c29e27f5afc955c1ff5db92b9773ff (refs/remotes/git-svn)
-r2 = c6640350a1565a5bba6e55b2d2767164dba4f6aa (refs/remotes/git-svn)
+r1 = fb04ed8419c14c6f45c8eb246b5e72ef3b738399 (refs/remotes/git-svn)
+r2 = 11b2bc86763d345fa24b3e82aefe4497d951ff84 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
 ok 2 - clone an SVN repo containing a git repo
@@ -520487,7 +519957,7 @@
 	)
 
 	M	a
-r3 = b060a13bb7c16950937a05e69579831edc2d1754 (refs/remotes/git-svn)
+r3 = 2a7cda44e3ffb9438824e04ad268fde2ea92fe0f (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 4 - update git svn-cloned repo
 
@@ -520519,12 +519989,12 @@
 A         .git/logs/HEAD
 A         .git/COMMIT_EDITMSG
 A  (bin)  .git/index
-A         .git/objects/42
-A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
 A         .git/objects/a3
 A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
 A         .git/objects/2c
 A  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
+A         .git/objects/42
+A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
 A         .git/refs/heads/master
 Adding         .git/COMMIT_EDITMSG
 Adding  (bin)  .git/index
@@ -520558,7 +520028,7 @@
 		rm expect
 	)
 
-r4 = 4437802fe6a52bdcc77d6b106c676654e99c8e8a (refs/remotes/git-svn)
+r4 = bae43fd07818f6608f4255f4200724885ee576cd (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo
 
@@ -520601,7 +520071,7 @@
 	)
 
 	M	a
-r5 = 85f153edc22450e1bcf823dffcdfb56a5008f430 (refs/remotes/git-svn)
+r5 = 3008daa6c6e6743de8e96f545ff217e723ccd70e (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 8 - update git svn-cloned repo again
 
@@ -520609,259 +520079,185 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9116-git-svn-log.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9116-git-svn-log/.git/
-expecting success of 9116.1 'setup repository and import': 
-	mkdir import &&
-	(
-		cd import &&
-		for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
-		do
-			mkdir -p $i &&
-			echo hello >>$i/README ||
-			exit 1
-		done &&
-		svn_cmd import -m test . "$svnrepo"
-	) &&
-	git svn init "$svnrepo" -T trunk -b branches -t tags &&
-	git svn fetch &&
-	git reset --hard origin/trunk &&
-	echo bye >> README &&
-	git commit -a -m bye &&
-	git svn dcommit &&
-	git reset --hard origin/a &&
-	echo why >> FEEDME &&
-	git update-index --add FEEDME &&
-	git commit -m feedme &&
-	git svn dcommit &&
-	git reset --hard origin/trunk &&
-	echo aye >> README &&
-	git commit -a -m aye &&
-	git svn dcommit &&
-	git reset --hard origin/b &&
-	echo spy >> README &&
-	git commit -a -m spy &&
-	echo try >> README &&
-	git commit -a -m try &&
-	git svn dcommit
-	
-Adding         branches
-Adding         branches/a
-Adding         branches/a/README
-Adding         branches/b
-Adding         branches/b/README
-Adding         tags
-Adding         tags/0.1
-Adding         tags/0.1/README
-Adding         tags/0.2
-Adding         tags/0.2/README
-Adding         tags/0.3
-Adding         tags/0.3/README
-Adding         trunk
-Adding         trunk/README
-Committing transaction...
-Committed revision 1.
-	A	README
-r1 = 24887b47a065690fccbb5c102e0272aac9a7e917 (refs/remotes/origin/tags/0.1)
-	A	README
-r1 = e8aba37cd1c0b2d56cd3fbf1a0a0a1cb7be85068 (refs/remotes/origin/b)
-	A	README
-r1 = c7709904e6ff56abf1c917fc782bb5a1e27622d8 (refs/remotes/origin/a)
-	A	README
-r1 = 8fef1d678298be673322eb83488698ce48c5dc9f (refs/remotes/origin/tags/0.3)
-	A	README
-r1 = ec9bd67e34cd946942979fe2e5fd04171adc4cf5 (refs/remotes/origin/trunk)
-	A	README
-r1 = 7ae5bbaa619041d0637408cc8c83ab7b6433dd7a (refs/remotes/origin/tags/0.2)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
-HEAD is now at ec9bd67 test
-[master c01b35a] bye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = 08ca86b39a7a3c5f1b9db3adcaf6521fd289a68e (refs/remotes/origin/trunk)
-No changes between c01b35ab6a06da82ff4f010cf7dbca2cea1381c2 and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at c770990 test
-[master 40caad2] feedme
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 FEEDME
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/a ...
-	A	FEEDME
-Committed r3
-	A	FEEDME
-r3 = 294a03defb80bb427b23702bae5e0d762fb90d68 (refs/remotes/origin/a)
-No changes between 40caad24b215a009bb1fc49d7068314b62f19e6b and refs/remotes/origin/a
-Resetting to the latest refs/remotes/origin/a
-HEAD is now at 08ca86b bye
-[master 20479e1] aye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
-	M	README
-Committed r4
-	M	README
-r4 = 07f8ca12f0a6efe486ec451257d3c0981f207cfe (refs/remotes/origin/trunk)
-No changes between 20479e1e7e5d941540b47f76fb3ead4e1e1d398a and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at e8aba37 test
-[master f79e299] spy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 80f6169] try
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/b ...
-	M	README
-Committed r5
-	M	README
-r5 = 568a07c19f14e23e8a921d71896dd5c1587b6e6b (refs/remotes/origin/b)
-	M	README
-Committed r6
-	M	README
-r6 = 2d6b10f229daf985d34ed4d74505d0dea2e5fccc (refs/remotes/origin/b)
-No changes between 80f61698f43a862514e4b8b162ecc9970055fadc and refs/remotes/origin/b
-Resetting to the latest refs/remotes/origin/b
-ok 1 - setup repository and import
+*** t9131-git-svn-empty-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/.git/
+expecting success of 9131.1 'load svn dumpfile': 
+	svnadmin load "$rawsvnrepo" <<EOF
+SVN-fs-dump-format-version: 2
 
-expecting success of 9116.2 'run log': 
-	git reset --hard origin/a &&
-	git svn log -r2 origin/trunk >out &&
-	grep ^r2 out &&
-	git svn log -r4 origin/trunk >out &&
-	grep ^r4 out &&
-	git svn log -r3 >out &&
-	grep ^r3 out
-	
-HEAD is now at 294a03d feedme
-r2 | pbuilder1 | 2025-02-09 06:55:31 +0000 (Sun, 09 Feb 2025) | 2 lines
-r4 | pbuilder1 | 2025-02-09 06:55:33 +0000 (Sun, 09 Feb 2025) | 2 lines
-r3 | pbuilder1 | 2025-02-09 06:55:32 +0000 (Sun, 09 Feb 2025) | 2 lines
-ok 2 - run log
+UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
 
-expecting success of 9116.3 'run log against a from trunk': 
-	git reset --hard origin/trunk &&
-	git svn log -r3 origin/a >out &&
-	grep ^r3 out
-	
-HEAD is now at 07f8ca1 aye
-r3 | pbuilder1 | 2025-02-09 06:55:32 +0000 (Sun, 09 Feb 2025) | 2 lines
-ok 3 - run log against a from trunk
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
 
-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 07f8ca1 aye
-ok 4 - test ascending revision range
+K 8
+svn:date
+V 27
+2008-11-26T07:17:27.590577Z
+PROPS-END
 
-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 07f8ca1 aye
-ok 5 - test ascending revision range with --show-commit
+Revision-number: 1
+Prop-content-length: 111
+Content-length: 111
 
-expecting success of 9116.6 'test ascending revision range with --show-commit (sha1)': 
-	git svn find-rev r1 >expected-range-r1-r2-r4-sha1 &&
-	git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 &&
-	git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 &&
-	git reset --hard origin/trunk &&
-	git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out &&
-	git rev-parse $(cat out) >actual &&
-	test_cmp expected-range-r1-r2-r4-sha1 actual
-	
-HEAD is now at 07f8ca1 aye
-ok 6 - test ascending revision range with --show-commit (sha1)
+K 7
+svn:log
+V 4
+test
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-26T07:18:03.511836Z
+PROPS-END
 
-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 07f8ca1 aye
-ok 7 - test descending revision range
+Node-path: bar
+Node-kind: file
+Node-action: add
+Prop-content-length: 33
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Content-length: 33
 
-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 07f8ca1 aye
-ok 8 - test ascending revision range with unreachable revision
+K 11
+svn:special
+V 1
+*
+PROPS-END
 
-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 07f8ca1 aye
-ok 9 - test descending revision range with unreachable revision
+Revision-number: 2
+Prop-content-length: 121
+Content-length: 121
 
-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 07f8ca1 aye
-ok 10 - test ascending revision range with unreachable upper boundary revision and 1 commit
+K 7
+svn:log
+V 13
+bar => doink
 
-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 07f8ca1 aye
-ok 11 - test descending revision range with unreachable upper boundary revision and 1 commit
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-27T03:55:31.601672Z
+PROPS-END
 
-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 07f8ca1 aye
-ok 12 - test ascending revision range with unreachable lower boundary revision and 1 commit
+Node-path: bar
+Node-kind: file
+Node-action: change
+Text-content-length: 10
+Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
+Content-length: 10
 
-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 07f8ca1 aye
-ok 13 - test descending revision range with unreachable lower boundary revision and 1 commit
+link doink
 
-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 07f8ca1 aye
-ok 14 - test ascending revision range with unreachable boundary revisions and no commits
+EOF
 
-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 07f8ca1 aye
-ok 15 - test descending revision range with unreachable boundary revisions and no commits
+<<< Started new transaction, based on original revision 1
+     * editing path : bar ... done.
 
-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 07f8ca1 aye
-ok 16 - test ascending revision range with unreachable boundary revisions and 1 commit
+------- Committed revision 1 >>>
 
-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 07f8ca1 aye
-ok 17 - test descending revision range with unreachable boundary revisions and 1 commit
+<<< Started new transaction, based on original revision 2
+     * editing path : bar ... done.
 
-# passed all 17 test(s)
-1..17
+------- Committed revision 2 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success of 9131.2 'clone using git svn': git svn clone -r1 "$svnrepo" x
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/x/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = ebb92e77042635001a1b5a2493c9db62b13b6091 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 2 - clone using git svn
+
+expecting success of 9131.3 'enable broken symlink workaround': (cd x && git config svn.brokenSymlinkWorkaround true)
+ok 3 - enable broken symlink workaround
+
+expecting success of 9131.4 '"bar" is an empty file': test_must_be_empty x/bar
+ok 4 - "bar" is an empty file
+
+expecting success of 9131.5 'get "bar" => symlink fix from svn': (cd x && git svn rebase)
+Scanning for empty symlinks, this may take a while if you have many empty files
+You may disable this with `git config svn.brokenSymlinkWorkaround false'.
+This may be done in a different terminal without restarting git svn
+	M	bar
+r2 = 6fef9b53ab8c53b994b338f312a6aad1ee8d07ab (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 5 - get "bar" => symlink fix from svn
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 9131.6 '"bar" becomes a symlink': test -h x/bar
+ok 6 - "bar" becomes a symlink
+
+expecting success of 9131.7 'clone using git svn': git svn clone -r1 "$svnrepo" y
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/y/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = ebb92e77042635001a1b5a2493c9db62b13b6091 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 7 - clone using git svn
+
+expecting success of 9131.8 'disable broken symlink workaround': (cd y && git config svn.brokenSymlinkWorkaround false)
+ok 8 - disable broken symlink workaround
+
+expecting success of 9131.9 '"bar" is an empty file': test_must_be_empty y/bar
+ok 9 - "bar" is an empty file
+
+expecting success of 9131.10 'get "bar" => symlink fix from svn': (cd y && git svn rebase)
+	M	bar
+r2 = 7b49c4c8944f68950c579dfd6948deea78557551 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 10 - get "bar" => symlink fix from svn
+
+expecting success of 9131.11 '"bar" does not become a symlink': ! test -L y/bar
+ok 11 - "bar" does not become a symlink
+
+expecting success of 9131.12 'clone using git svn': git svn clone -r1 "$svnrepo" z
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9131-git-svn-empty-symlink/z/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = ebb92e77042635001a1b5a2493c9db62b13b6091 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 12 - clone using git svn
+
+expecting success of 9131.13 '"bar" is an empty file': test_must_be_empty z/bar
+ok 13 - "bar" is an empty file
+
+expecting success of 9131.14 'get "bar" => symlink fix from svn': (cd z && git svn rebase)
+	M	bar
+r2 = 7b49c4c8944f68950c579dfd6948deea78557551 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 14 - get "bar" => symlink fix from svn
+
+expecting success of 9131.15 '"bar" does not become a symlink': ! test -L z/bar
+ok 15 - "bar" does not become a symlink
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9135-git-svn-moved-branch-empty-file.sh ***
@@ -520952,7 +520348,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
-r1 = 2f7a1d7fffeb762630ad8f45225aa4e77539b0a7 (refs/remotes/git-svn)
+r1 = 948c48ec33d33c0b53077d86e79f3fff5991de01 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -520965,7 +520361,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
-r2 = 7aa3f5db55979d04504c4f5fcc8644ed69c67839 (refs/remotes/git-svn)
+r2 = b7336ade78e17e423457ba448ef8428a5c96a7a2 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -520978,7 +520374,7 @@
 Committing transaction...
 Committed revision 3.
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
-r3 = e965c075721f868a9e61c808e9165fe27ba993dd (refs/remotes/git-svn)
+r3 = 7d92d519e108a7f330d0e1dce63d59926cf6fc14 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
 ok 3 - ISO-2022-JP setup
@@ -520997,7 +520393,7 @@
 	)
 	
 Switched to a new branch 't'
-[t b04fa39] ÄËÑÏÖ
+[t c0f2ed1] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -521017,7 +520413,7 @@
 	)
 	
 Switched to a new branch 't'
-[t e12dfa6] ¤Ï¤ì¤Ò¤Û¤Õ
+[t 5246d2c] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -521037,7 +520433,7 @@
 	)
 	
 Switched to a new branch 't'
-[t a944eae] $B$O$l$R$[$U(B
+[t 479ebb2] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -521058,10 +520454,10 @@
 	A	F
 Committed r4
 	A	F
-r4 = e0084ca9febe50f5b1115870f5d751b8f23f7b94 (refs/remotes/git-svn)
-No changes between b04fa390520b837054ee7b5defbcd7969db12793 and refs/remotes/git-svn
+r4 = bc4852c19840f1aee8c8e35d81d3e3a139eece2c (refs/remotes/git-svn)
+No changes between c0f2ed10b40aedef68e217036667c08c5656efd8 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 25d7688e-f4ac-46d9-9d14-6714c49a4922
+git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 dfb658dc-3783-4005-b32d-7c50e56e4c8e
 ok 7 - ISO8859-1 dcommit to svn
 
 expecting success of 9129.8 'eucJP dcommit to svn': 
@@ -521079,10 +520475,10 @@
 	A	F
 Committed r5
 	A	F
-r5 = 8dd2f79c6658225e53c6764eb5bcfd2be9acf5fa (refs/remotes/git-svn)
-No changes between e12dfa61fd6cf4572f1e43b77e04c67829ea9301 and refs/remotes/git-svn
+r5 = 847240fb348341bbe86a971764fa81e54221fc68 (refs/remotes/git-svn)
+No changes between 5246d2ca1c4d338de6dbcf0277628bc4ebc26986 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 25d7688e-f4ac-46d9-9d14-6714c49a4922
+git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 dfb658dc-3783-4005-b32d-7c50e56e4c8e
 ok 8 - eucJP dcommit to svn
 
 expecting success of 9129.9 'ISO-2022-JP dcommit to svn': 
@@ -521100,10 +520496,10 @@
 	A	F
 Committed r6
 	A	F
-r6 = 4382effbba65b7b07428eb4d89ef299192d956ce (refs/remotes/git-svn)
-No changes between a944eaee736222ec7755c7fef2bfa5f1d23daecc and refs/remotes/git-svn
+r6 = a1980dfd70e257a065562a055f4f6dc6f1fc474d (refs/remotes/git-svn)
+No changes between 479ebb2ceb5fe9a1e773127e69a4c66d2510bffc and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 25d7688e-f4ac-46d9-9d14-6714c49a4922
+git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 dfb658dc-3783-4005-b32d-7c50e56e4c8e
 ok 9 - ISO-2022-JP dcommit to svn
 
 expecting success of 9129.10 'ISO-8859-1 should match UTF-8 in svn': 
@@ -521134,6 +520530,333 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9116-git-svn-log.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9116-git-svn-log/.git/
+expecting success of 9116.1 'setup repository and import': 
+	mkdir import &&
+	(
+		cd import &&
+		for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
+		do
+			mkdir -p $i &&
+			echo hello >>$i/README ||
+			exit 1
+		done &&
+		svn_cmd import -m test . "$svnrepo"
+	) &&
+	git svn init "$svnrepo" -T trunk -b branches -t tags &&
+	git svn fetch &&
+	git reset --hard origin/trunk &&
+	echo bye >> README &&
+	git commit -a -m bye &&
+	git svn dcommit &&
+	git reset --hard origin/a &&
+	echo why >> FEEDME &&
+	git update-index --add FEEDME &&
+	git commit -m feedme &&
+	git svn dcommit &&
+	git reset --hard origin/trunk &&
+	echo aye >> README &&
+	git commit -a -m aye &&
+	git svn dcommit &&
+	git reset --hard origin/b &&
+	echo spy >> README &&
+	git commit -a -m spy &&
+	echo try >> README &&
+	git commit -a -m try &&
+	git svn dcommit
+	
+Adding         branches
+Adding         branches/a
+Adding         branches/a/README
+Adding         branches/b
+Adding         branches/b/README
+Adding         tags
+Adding         tags/0.1
+Adding         tags/0.1/README
+Adding         tags/0.2
+Adding         tags/0.2/README
+Adding         tags/0.3
+Adding         tags/0.3/README
+Adding         trunk
+Adding         trunk/README
+Committing transaction...
+Committed revision 1.
+	A	README
+r1 = 3108e6b54f8f423c758732b9baa843a4edbce28c (refs/remotes/origin/trunk)
+	A	README
+r1 = b3d4f1dba817ac04cdf539b873157d10ac723b2e (refs/remotes/origin/tags/0.1)
+	A	README
+r1 = 3d0b15bca3f3aa64361b58f15f45c353b409a033 (refs/remotes/origin/b)
+	A	README
+r1 = fe28f3d02fb5aa81502b107869383b1f4774dc93 (refs/remotes/origin/a)
+	A	README
+r1 = 944650efcc9ce861e6aaaea686255d45ecdca7e6 (refs/remotes/origin/tags/0.2)
+	A	README
+r1 = b168a7a6f630bc7fc66b64cbfe4082b273eea528 (refs/remotes/origin/tags/0.3)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
+HEAD is now at 3108e6b test
+[master 42dac69] bye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = 19000599c367b554747197f4996a4dcc0dbcab8f (refs/remotes/origin/trunk)
+No changes between 42dac6904bb74833d2fbf16280bbbf7a99d97e50 and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+HEAD is now at fe28f3d test
+[master eac2558] feedme
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FEEDME
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/a ...
+	A	FEEDME
+Committed r3
+	A	FEEDME
+r3 = a50e95836ba44a5131f0a7429bb87dabe7d77b40 (refs/remotes/origin/a)
+No changes between eac255892f1e141c10472bc36a07302dad475360 and refs/remotes/origin/a
+Resetting to the latest refs/remotes/origin/a
+HEAD is now at 1900059 bye
+[master 7d1e07f] aye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
+	M	README
+Committed r4
+	M	README
+r4 = c6d43995e5c2199fe01c499458099af99fb66743 (refs/remotes/origin/trunk)
+No changes between 7d1e07feb9109a78d8f84a27198159ef029306f6 and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+HEAD is now at 3d0b15b test
+[master f2a400c] spy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 82dee40] try
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/b ...
+	M	README
+Committed r5
+	M	README
+r5 = 59b8d324a6b3fae941211bece0fe81d248cd055c (refs/remotes/origin/b)
+	M	README
+Committed r6
+	M	README
+r6 = f8d9030943184ce399fd292f62245a3191137a21 (refs/remotes/origin/b)
+No changes between 82dee404a2540ddac6db3f0ad4fae983c7d5e5cd and refs/remotes/origin/b
+Resetting to the latest refs/remotes/origin/b
+ok 1 - setup repository and import
+
+expecting success of 9116.2 'run log': 
+	git reset --hard origin/a &&
+	git svn log -r2 origin/trunk >out &&
+	grep ^r2 out &&
+	git svn log -r4 origin/trunk >out &&
+	grep ^r4 out &&
+	git svn log -r3 >out &&
+	grep ^r3 out
+	
+HEAD is now at a50e958 feedme
+r2 | pbuilder2 | 2026-03-14 13:37:33 +0000 (Sat, 14 Mar 2026) | 2 lines
+r4 | pbuilder2 | 2026-03-14 13:37:39 +0000 (Sat, 14 Mar 2026) | 2 lines
+r3 | pbuilder2 | 2026-03-14 13:37:36 +0000 (Sat, 14 Mar 2026) | 2 lines
+ok 2 - run log
+
+expecting success of 9116.3 'run log against a from trunk': 
+	git reset --hard origin/trunk &&
+	git svn log -r3 origin/a >out &&
+	grep ^r3 out
+	
+HEAD is now at c6d4399 aye
+r3 | pbuilder2 | 2026-03-14 13:37:36 +0000 (Sat, 14 Mar 2026) | 2 lines
+ok 3 - run log against a from trunk
+
+expecting success of 9116.4 'test ascending revision range': 
+	git reset --hard origin/trunk &&
+	git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
+	
+HEAD is now at c6d4399 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 c6d4399 aye
+ok 5 - test ascending revision range with --show-commit
+
+expecting success of 9116.6 'test ascending revision range with --show-commit (sha1)': 
+	git svn find-rev r1 >expected-range-r1-r2-r4-sha1 &&
+	git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 &&
+	git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 &&
+	git reset --hard origin/trunk &&
+	git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out &&
+	git rev-parse $(cat out) >actual &&
+	test_cmp expected-range-r1-r2-r4-sha1 actual
+	
+HEAD is now at c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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 c6d4399 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9136-git-svn-recreated-branch-empty-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9136-git-svn-recreated-branch-empty-file/.git/
+expecting success of 9136.1 'load svn dumpfile': 
+	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9136/svn.dump"
+	
+<<< Started new transaction, based on original revision 1
+     * editing path : branches ... done.
+     * editing path : tags ... done.
+     * editing path : trunk ... done.
+     * editing path : trunk/file ... done.
+
+------- Committed revision 1 >>>
+
+<<< Started new transaction, based on original revision 2
+     * editing path : tags/1.0 ...COPIED... done.
+
+------- Committed revision 2 >>>
+
+<<< Started new transaction, based on original revision 3
+     * editing path : tags/1.0.1 ...COPIED... done.
+
+------- Committed revision 3 >>>
+
+<<< Started new transaction, based on original revision 4
+     * editing path : tags/1.0.1 ... done.
+
+------- Committed revision 4 >>>
+
+<<< Started new transaction, based on original revision 5
+     * editing path : branches/1.0 ...COPIED... done.
+
+------- Committed revision 5 >>>
+
+<<< Started new transaction, based on original revision 6
+     * editing path : tags/1.0.1 ...COPIED... done.
+
+------- Committed revision 6 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success of 9136.2 'clone using git svn': git svn clone -s "$svnrepo" x
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9136-git-svn-recreated-branch-empty-file/x/.git/
+	A	file
+r1 = 4600d085d4adf9d7d5e6d4d1bbf7d54cb15a3b5e (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0, 1
+Found branch parent: (refs/remotes/origin/tags/1.0) 4600d085d4adf9d7d5e6d4d1bbf7d54cb15a3b5e
+Following parent with do_switch
+Successfully followed parent
+r2 = 0a6d1aa3aae1dc40175540ea09b0297f3b27fdc7 (refs/remotes/origin/tags/1.0)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 2
+Found branch parent: (refs/remotes/origin/tags/1.0.1) 0a6d1aa3aae1dc40175540ea09b0297f3b27fdc7
+Following parent with do_switch
+Successfully followed parent
+r3 = 661e50d46f16c357173bea202bc61411a8119af9 (refs/remotes/origin/tags/1.0.1)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0, 4
+Found branch parent: (refs/remotes/origin/1.0) 0a6d1aa3aae1dc40175540ea09b0297f3b27fdc7
+Following parent with do_switch
+Successfully followed parent
+r5 = 80bfa899c82318192eaa751c75c4d44e5d8fa8dc (refs/remotes/origin/1.0)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 5
+Found branch parent: (refs/remotes/origin/tags/1.0.1) 80bfa899c82318192eaa751c75c4d44e5d8fa8dc
+Following parent with do_switch
+Successfully followed parent
+r6 = c9ef8779e6b17a3303d87f24e78aed28b124110d (refs/remotes/origin/tags/1.0.1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk r1
+ok 2 - clone using git svn
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9130-git-svn-authors-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9130-git-svn-authors-file/.git/
 expecting success of 9130.1 'setup svnrepo': 
@@ -521157,9 +520880,9 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9130-git-svn-authors-file/x/.git/
 W: +empty_dir: aa
-r1 = d80766b1497e6689ad8c913088fb129d65edb854 (refs/remotes/git-svn)
+r1 = e2907be1f2b78ca41bcb3f129561c2fedd633762 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 16e6a809ded9ff42884a2588bee881bf8f37a721 (refs/remotes/git-svn)
+r2 = c01298d62b85f9fa28974c22e9a454b63f344921 (refs/remotes/git-svn)
 W: +empty_dir: cc
 Author: cc not defined in svn-authors file
 
@@ -521176,8 +520899,8 @@
 		grep "^author AAAAAAA AAAAAAA <aa@example\.com> " actual
 	)
 	
-author BBBBBBB BBBBBBB <bb@example.com> 1739084137 +0000
-author AAAAAAA AAAAAAA <aa@example.com> 1739084137 +0000
+author BBBBBBB BBBBBBB <bb@example.com> 1773495472 +0000
+author AAAAAAA AAAAAAA <aa@example.com> 1773495472 +0000
 ok 3 - imported 2 revisions successfully
 
 expecting success of 9130.4 'continues to import once authors have been added': 
@@ -521193,17 +520916,17 @@
 	)
 	
 W: +empty_dir: cc
-r3 = 1349805419d05b126f7412539defd07ae751d073 (refs/remotes/git-svn)
+r3 = 2e04783e9b15626187c6f272f0d7f516f4950a96 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 5f98a568d819852d056adabdd13e05ab5ada939b (refs/remotes/git-svn)
+r4 = 94ae012ec1db7bc8c23f6f2a7342449e73b1a2c7 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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> 1739084137 +0000
-author CCCCCCC CCCCCCC <cc@example.com> 1739084137 +0000
+author DDDDDDD DDDDDDD <dd@example.com> 1773495472 +0000
+author CCCCCCC CCCCCCC <cc@example.com> 1773495472 +0000
 ok 4 - continues to import once authors have been added
 
 expecting success of 9130.5 'authors-file against globs': 
@@ -521220,7 +520943,7 @@
 Committed revision 5.
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9130-git-svn-authors-file/aa-work/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9130-git-svn-authors-file/svnrepo
-r5 = 33a99565190cd3f3f202ebf46cb83317e4dd7c5d (refs/remotes/origin/trunk)
+r5 = 9a37097bf46a9f41b7ce63d4790c022df44a7a6a (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa/trunk r5
 Committing transaction...
@@ -521234,7 +520957,7 @@
 expecting success of 9130.6 'fetch fails on ee': 
 	( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
 	
-r6 = 059ac41954ac8e5320cd1ea411a486366caed968 (refs/remotes/origin/bb)
+r6 = 1e7fdd45cfb238d00495916e8187c838dbb77fab (refs/remotes/origin/bb)
 Author: ee not defined in ../svn-authors file
 
 ok 6 - fetch fails on ee
@@ -521256,8 +520979,8 @@
 		test 8 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
 	)
 	
-r7 = f50302866df45f4aa44f7d67ff0241507114f664 (refs/remotes/origin/ee)
-r8 = b0169c021c9c7aaab04b5f9a75db9e468bdf5dac (refs/remotes/origin/cc)
+r7 = da6e050d9d911e41339c1c66fc8b862bdba0e63c (refs/remotes/origin/ee)
+r8 = 1e8bc4a5b763f6edf9d028ef28cf36cca5aa42c9 (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': 
@@ -521280,23 +521003,23 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9130-git-svn-authors-file/gitconfig.clone/.git/
 W: +empty_dir: aa
-r1 = d80766b1497e6689ad8c913088fb129d65edb854 (refs/remotes/git-svn)
+r1 = e2907be1f2b78ca41bcb3f129561c2fedd633762 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 16e6a809ded9ff42884a2588bee881bf8f37a721 (refs/remotes/git-svn)
+r2 = c01298d62b85f9fa28974c22e9a454b63f344921 (refs/remotes/git-svn)
 W: +empty_dir: cc
-r3 = 1349805419d05b126f7412539defd07ae751d073 (refs/remotes/git-svn)
+r3 = 2e04783e9b15626187c6f272f0d7f516f4950a96 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 5f98a568d819852d056adabdd13e05ab5ada939b (refs/remotes/git-svn)
+r4 = 94ae012ec1db7bc8c23f6f2a7342449e73b1a2c7 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches
 W: +empty_dir: aa/tags
 W: +empty_dir: aa/trunk
-r5 = 233fa07127116bdfff7e493153f8d6d594cb33f6 (refs/remotes/git-svn)
+r5 = 92840cc3775afe159649df6c98fc60e33589225b (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/bb
-r6 = e3dc4b309d33ee552c444ce29f95dfcad93fb15a (refs/remotes/git-svn)
+r6 = a409048b6e03dc2ba74fb5abc3354f0a4f7836e3 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/ee
-r7 = 4da7af14e5a80616974ece68bafedfe86e3587f0 (refs/remotes/git-svn)
+r7 = b84d7fe39a40386550eee682d6a79ecb759d3432 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/cc
-r8 = 6208621b6bccc3d352f338a3b2ac61f9389226c0 (refs/remotes/git-svn)
+r8 = 7de843d4be8644533d33be31f901d63018c02323 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r8
 creating empty directory: aa
@@ -521322,86 +521045,14 @@
 	
 Committing transaction...
 Committed revision 9.
-r9 = 1f6ae4c9c4ab7c8d3e9a142c6b013d0698eaf3bc (refs/remotes/origin/ff)
-author FFFFFFF FFFFFFF <> 1739084146 +0000
+r9 = 822ea38f5c08cdda2bd118ac91ba8764224592ff (refs/remotes/origin/ff)
+author FFFFFFF FFFFFFF <> 1773495493 +0000
 ok 10 - authors-file imported user without email
 
 # passed all 10 test(s)
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9136-git-svn-recreated-branch-empty-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9136-git-svn-recreated-branch-empty-file/.git/
-expecting success of 9136.1 'load svn dumpfile': 
-	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9136/svn.dump"
-	
-<<< Started new transaction, based on original revision 1
-     * editing path : branches ... done.
-     * editing path : tags ... done.
-     * editing path : trunk ... done.
-     * editing path : trunk/file ... done.
-
-------- Committed revision 1 >>>
-
-<<< Started new transaction, based on original revision 2
-     * editing path : tags/1.0 ...COPIED... done.
-
-------- Committed revision 2 >>>
-
-<<< Started new transaction, based on original revision 3
-     * editing path : tags/1.0.1 ...COPIED... done.
-
-------- Committed revision 3 >>>
-
-<<< Started new transaction, based on original revision 4
-     * editing path : tags/1.0.1 ... done.
-
-------- Committed revision 4 >>>
-
-<<< Started new transaction, based on original revision 5
-     * editing path : branches/1.0 ...COPIED... done.
-
-------- Committed revision 5 >>>
-
-<<< Started new transaction, based on original revision 6
-     * editing path : tags/1.0.1 ...COPIED... done.
-
-------- Committed revision 6 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success of 9136.2 'clone using git svn': git svn clone -s "$svnrepo" x
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9136-git-svn-recreated-branch-empty-file/x/.git/
-	A	file
-r1 = 4600d085d4adf9d7d5e6d4d1bbf7d54cb15a3b5e (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0, 1
-Found branch parent: (refs/remotes/origin/tags/1.0) 4600d085d4adf9d7d5e6d4d1bbf7d54cb15a3b5e
-Following parent with do_switch
-Successfully followed parent
-r2 = 0a6d1aa3aae1dc40175540ea09b0297f3b27fdc7 (refs/remotes/origin/tags/1.0)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 2
-Found branch parent: (refs/remotes/origin/tags/1.0.1) 0a6d1aa3aae1dc40175540ea09b0297f3b27fdc7
-Following parent with do_switch
-Successfully followed parent
-r3 = 661e50d46f16c357173bea202bc61411a8119af9 (refs/remotes/origin/tags/1.0.1)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0, 4
-Found branch parent: (refs/remotes/origin/1.0) 0a6d1aa3aae1dc40175540ea09b0297f3b27fdc7
-Following parent with do_switch
-Successfully followed parent
-r5 = 80bfa899c82318192eaa751c75c4d44e5d8fa8dc (refs/remotes/origin/1.0)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 5
-Found branch parent: (refs/remotes/origin/tags/1.0.1) 80bfa899c82318192eaa751c75c4d44e5d8fa8dc
-Following parent with do_switch
-Successfully followed parent
-r6 = c9ef8779e6b17a3303d87f24e78aed28b124110d (refs/remotes/origin/tags/1.0.1)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk r1
-ok 2 - clone using git svn
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9142-git-svn-shallow-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9142-git-svn-shallow-clone/.git/
 expecting success of 9142.1 'setup test repository': 
@@ -521435,7 +521086,7 @@
 	( cd g && git rev-parse --symbolic --verify HEAD )
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
-r1 = 70b1973626a2e63b914b6e8d4483250760a42ce1 (refs/remotes/git-svn)
+r1 = 4b80a74407f86ef1c4c2a6d209531b27630ce07b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
 HEAD
@@ -521461,7 +521112,7 @@
 Committing transaction...
 Committed revision 1.
 	A	file
-r1 = 8ee4330613b4aab411b1dffbb64e29558743315e (refs/remotes/git-svn)
+r1 = 203ef5f32466d00019a5589dabd0d7cd96d5ef68 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
 ok 1 - initialize repo
@@ -521494,11 +521145,11 @@
 	echo bye >> life &&
 	git commit -m bye-life life
 	
-[master 6f2cb78] hi-life
+[master 28cfac2] hi-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 life
-[master f542536] bye-life
+[master ec38acb] bye-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - some unrelated changes to git
@@ -521519,7 +521170,7 @@
 		test x"$(sed -n -e 58p < file)" = x5588 &&
 		test x"$(sed -n -e 61p < file)" = x6611
 	
-[master e144a93] 4 => 4444, 7 => 7777
+[master 64fc347] 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"
@@ -521527,24 +521178,24 @@
 	A	life
 Committed r3
 	M	file
-r2 = 54ed3640cac29bed7a3e2469a6dda02dd2a7ed4e (refs/remotes/git-svn)
+r2 = 3c044ae7bf7f36d5f8021eeeadfd59fcb6d3246b (refs/remotes/git-svn)
 	A	life
-r3 = 653586661cdd3557a9c391be0ca1f5694a73a2ac (refs/remotes/git-svn)
-W: 6f2cb7849e43c4b31143ee96145d005ba96e4d53 and refs/remotes/git-svn differ, using rebase:
+r3 = f2db39bc92de8b754fbae0cfd2a428ca459cbcac (refs/remotes/git-svn)
+W: 28cfac27ac4dbea17a98cd3594a4c2eb6550cf2b and refs/remotes/git-svn differ, using rebase:
 :100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
-warning: skipped previously applied commit 6f2cb78
+warning: skipped previously applied commit 28cfac2
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
 	M	life
 Committed r4
 	M	life
-r4 = 30d5319158aafbbf4f90a54edfb8e0e7a2e1b8ff (refs/remotes/git-svn)
+r4 = d865605f0fc3c4616e718cc691dd90e5e705b4cc (refs/remotes/git-svn)
 	M	file
 Committed r5
 	M	file
-r5 = 521719684120eb37a2ef3bb248684f77a7d46685 (refs/remotes/git-svn)
-No changes between 389b93dd0f67c76ee137a7bb14d2376197b0a089 and refs/remotes/git-svn
+r5 = 58f6174a8427540d4b29f4987490838f13a473dc (refs/remotes/git-svn)
+No changes between 51b936eb956f15246aee51258cfde1e98c4db1d1 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating 'tmp':
 U    tmp/file
@@ -521602,17 +521253,17 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9138-git-svn-authors-prog/x/.git/
 W: +empty_dir: aa
-r1 = b53e527731bf7c85f928af732235df761b8044b8 (refs/remotes/git-svn)
+r1 = 9e51408d76418e419612db81f2b305b06a928d9a (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = e51670817264b98478118cd750c773946330cc8a (refs/remotes/git-svn)
+r2 = a77a0c023e6ad82c85c31d300847125035925440 (refs/remotes/git-svn)
 W: +empty_dir: cc-sub
-r3 = 6c4637652254aebf7d40a51745d4265fa6d9ef20 (refs/remotes/git-svn)
+r3 = fb28e901feeb4a051912c9b85e1ae93ea39d012f (refs/remotes/git-svn)
 W: +empty_dir: dd-sub
-r4 = b8b08e99bceea08371b9927fdef7ccba0fa2b442 (refs/remotes/git-svn)
+r4 = e2f4e559febe22fdeb9c0b3fbbe4851a6f65eb92 (refs/remotes/git-svn)
 W: +empty_dir: ee-foo
-r5 = 62747c3e6edea84539d3f06c70d3cd0010953885 (refs/remotes/git-svn)
+r5 = ed35235a6ae3955b14852f1eb46cd07bb6bb7aaf (refs/remotes/git-svn)
 W: +empty_dir: ff
-r6 = 47ade246e57dea63f25cd91c88721565b7a7abf9 (refs/remotes/git-svn)
+r6 = 382a51f2bb8661cef4aed16c416571ce00e28297 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9138-git-svn-authors-prog/svnrepo r6
 creating empty directory: aa
@@ -521647,11 +521298,11 @@
 		grep "^author aa <aa@example\.com> " actual
 	)
 
-author ee-foo <ee-foo@example.com> 1739084145 +0000
-author dd <dd@sub.example.com> 1739084145 +0000
-author cc <cc@sub.example.com> 1739084145 +0000
-author bb <bb@example.com> 1739084145 +0000
-author aa <aa@example.com> 1739084145 +0000
+author ee-foo <ee-foo@example.com> 1773495490 +0000
+author dd <dd@sub.example.com> 1773495490 +0000
+author cc <cc@sub.example.com> 1773495490 +0000
+author bb <bb@example.com> 1773495490 +0000
+author aa <aa@example.com> 1773495489 +0000
 ok 5 - authors-prog ran correctly
 
 expecting success of 9138.6 'authors-file overrode authors-prog': 
@@ -521661,7 +521312,7 @@
 		grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
 	)
 
-author FFFFFFF FFFFFFF <fFf@other.example.com> 1739084145 +0000
+author FFFFFFF FFFFFFF <fFf@other.example.com> 1773495490 +0000
 ok 6 - authors-file overrode authors-prog
 
 expecting success of 9138.7 'authors-prog imported user without email': 
@@ -521676,8 +521327,8 @@
 Committing transaction...
 Committed revision 7.
 W: +empty_dir: gg
-r7 = 7da7ebea1f51d91920e5660c008eda100d0ec8b0 (refs/remotes/git-svn)
-author gg <> 1739084147 +0000
+r7 = b6bfbe30287ef86ffe1c6b5d483b14a57a445b14 (refs/remotes/git-svn)
+author gg <> 1773495495 +0000
 ok 7 - authors-prog imported user without email
 
 expecting success of 9138.8 'imported without authors-prog and authors-file': 
@@ -521694,8 +521345,8 @@
 Committing transaction...
 Committed revision 8.
 W: +empty_dir: hh
-r8 = 6952b00b980fabf3b9960b0b2f93bbc81038d893 (refs/remotes/git-svn)
-author hh <hh@8386fdcf-cbc1-47a5-aa9f-398a01f7beee> 1739084148 +0000
+r8 = 3938952178a80b3cd3bba0e5a6bf4b5a7f90eb6e (refs/remotes/git-svn)
+author hh <hh@50a04c51-59d2-4549-9dc6-1292ef19c97c> 1773495497 +0000
 ok 8 - imported without authors-prog and authors-file
 
 expecting success of 9138.9 'authors-prog handled special characters in username': 
@@ -521711,81 +521362,14 @@
 Committing transaction...
 Committed revision 9.
 W: +empty_dir: bad
-r9 = 1cc1905ba0bc3770bf232dad2f3676baec1ccf02 (refs/remotes/git-svn)
-author xyz; touch evil <xyz; touch evil@example.com> 1739084148 +0000
+r9 = 20dc46111717765a6de82690aee7d99700c9ba83 (refs/remotes/git-svn)
+author xyz; touch evil <xyz; touch evil@example.com> 1773495499 +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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9143-git-svn-gc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9143-git-svn-gc/.git/
-expecting success of 9143.1 'setup directories and test repo': 
-	mkdir import &&
-	mkdir tmp &&
-	echo "Sample text for Subversion repository." > import/test.txt &&
-	svn_cmd import -m "import for git svn" import "$svnrepo" > /dev/null
-	
-ok 1 - setup directories and test repo
-
-expecting success of 9143.2 'checkout working copy from svn': svn_cmd co "$svnrepo" test_wc
-A    test_wc/test.txt
-Checked out revision 1.
-ok 2 - checkout working copy from svn
-
-expecting success of 9143.3 'set some properties to create an unhandled.log file': 
-	(
-		cd test_wc &&
-		svn_cmd propset foo bar test.txt &&
-		svn_cmd commit -m "property set"
-	)
-property 'foo' set on 'test.txt'
-Sending        test.txt
-Committing transaction...
-Committed revision 2.
-ok 3 - set some properties to create an unhandled.log file
-
-expecting success of 9143.4 'Setup repo': git svn init "$svnrepo"
-ok 4 - Setup repo
-
-expecting success of 9143.5 'Fetch repo': git svn fetch
-	A	test.txt
-r1 = 492890815bdbf531885173a9635eec0d06a0e5ae (refs/remotes/git-svn)
-	M	test.txt
-r2 = 2d431780cf3d220961a70edb7fe55e6333f39070 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9143-git-svn-gc/svnrepo r2
-ok 5 - Fetch repo
-
-expecting success of 9143.6 'make backup copy of unhandled.log': 
-	 cp .git/svn/refs/remotes/git-svn/unhandled.log tmp
-	
-ok 6 - make backup copy of unhandled.log
-
-expecting success of 9143.7 'create leftover index': > .git/svn/refs/remotes/git-svn/index
-ok 7 - create leftover index
-
-expecting success of 9143.8 'git svn gc runs': git svn gc
-ok 8 - git svn gc runs
-
-expecting success of 9143.9 'git svn index removed': ! test -f .git/svn/refs/remotes/git-svn/index
-ok 9 - git svn index removed
-
-expecting success of 9143.10 'git svn gc produces a valid gzip file': 
-		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
-		
-ok 10 - git svn gc produces a valid gzip file
-
-expecting success of 9143.11 'git svn gc does not change unhandled.log files': 
-	 test_cmp .git/svn/refs/remotes/git-svn/unhandled.log tmp/unhandled.log
-	
-ok 11 - git svn gc does not change unhandled.log files
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9134-git-svn-ignore-paths.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9134-git-svn-ignore-paths/.git/
 expecting success of 9134.1 'setup test repository': 
@@ -521834,8 +521418,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = 9f79c43fa67125f8c314c61fc57aab48b9adfd1a (refs/remotes/git-svn)
-r2 = 13aeecf18d11df5a40cf14da212694870c67853b (refs/remotes/git-svn)
+r1 = 9fbaf9f7eb8ab356191acdfa095acbb2d0c97061 (refs/remotes/git-svn)
+r2 = 515af40ae65b66343629594055840cd671b41c44 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
 ok 2 - clone an SVN repository with ignored www directory
@@ -521850,8 +521434,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = 9f79c43fa67125f8c314c61fc57aab48b9adfd1a (refs/remotes/git-svn)
-r2 = 13aeecf18d11df5a40cf14da212694870c67853b (refs/remotes/git-svn)
+r1 = 9fbaf9f7eb8ab356191acdfa095acbb2d0c97061 (refs/remotes/git-svn)
+r2 = 515af40ae65b66343629594055840cd671b41c44 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with ignored www directory
@@ -521894,7 +521478,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = b2fe856c86d01fc94cd74cebdd64842eabb61eb8 (refs/remotes/git-svn)
+r3 = 565ee1d81252ab3a74179f92a28648a23908649a (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo (config ignore)
 
@@ -521909,7 +521493,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = b2fe856c86d01fc94cd74cebdd64842eabb61eb8 (refs/remotes/git-svn)
+r3 = 565ee1d81252ab3a74179f92a28648a23908649a (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 7 - update git svn-cloned repo (option ignore)
 
@@ -521941,7 +521525,7 @@
 		rm expect expect2
 	)
 
-r4 = 2c3aa2aee1418c1918d389f5fe5d6671ed9508e0 (refs/remotes/git-svn)
+r4 = af0d28521af7e361b42d9ae25322f31de671527e (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 9 - update git svn-cloned repo (config ignore)
 
@@ -521955,7 +521539,7 @@
 		rm expect expect2
 	)
 
-r4 = 2c3aa2aee1418c1918d389f5fe5d6671ed9508e0 (refs/remotes/git-svn)
+r4 = af0d28521af7e361b42d9ae25322f31de671527e (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - update git svn-cloned repo (option ignore)
 
@@ -521990,7 +521574,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 60722d0ff3e84d1f8d77f580b476e53b885e9b10 (refs/remotes/git-svn)
+r5 = 99ed6d0892d9e0a25d63e44c8785fe2245a4da16 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 12 - update git svn-cloned repo again (config ignore)
 
@@ -522005,7 +521589,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 60722d0ff3e84d1f8d77f580b476e53b885e9b10 (refs/remotes/git-svn)
+r5 = 99ed6d0892d9e0a25d63e44c8785fe2245a4da16 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 13 - update git svn-cloned repo again (option ignore)
 
@@ -522023,7 +521607,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
-r1 = ede9e4a67e1ceb5baa5eed114abff322e27e4cfc (refs/remotes/git-svn)
+r1 = c3dbaa6c11e6be974f6a89d64010dc3a1f0093ec (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -522036,7 +521620,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
-r2 = b5fc6db31ad2ae542c40ab3835411fa4fbbd073f (refs/remotes/git-svn)
+r2 = 3f9e87e175d25bdcb7840d35f1e6eacc4e06831e (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -522054,7 +521638,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 61b5b7e] ÄËÑÏÖ
+[t aa22330] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -522073,7 +521657,7 @@
 	)
 	
 Switched to a new branch 't'
-[t cac45bc] ¤Ï¤ì¤Ò¤Û¤Õ
+[t c389fab] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -522118,3198 +521702,71 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9145-git-svn-master-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9145-git-svn-master-branch/.git/
-expecting success of 9145.1 'setup test repository': 
-	mkdir i &&
-	> i/a &&
-	svn_cmd import -m trunk i "$svnrepo/trunk" &&
-	svn_cmd import -m b/a i "$svnrepo/branches/a" &&
-	svn_cmd import -m b/b i "$svnrepo/branches/b"
-
-Adding         i/a
-Committing transaction...
-Committed revision 1.
-Adding         i/a
-Committing transaction...
-Committed revision 2.
-Adding         i/a
-Committing transaction...
-Committed revision 3.
-ok 1 - setup test repository
-
-expecting success of 9145.2 'git svn clone --stdlayout sets up trunk as main': 
-	git svn clone -s "$svnrepo" g &&
-	(
-		cd g &&
-		test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \
-		     x$(git rev-parse --verify refs/heads/main^0)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9145-git-svn-master-branch/g/.git/
-	A	a
-r1 = 2424930d5d0cbbeccee9a63feb480ab606c8fe18 (refs/remotes/origin/trunk)
-	A	a
-r2 = ee5839517e6698a1aa90e02c9ceddf71a75449f6 (refs/remotes/origin/a)
-	A	a
-r3 = 7d6558862dcc5dc1e0b31ad88b9d15a95dad22fa (refs/remotes/origin/b)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9145-git-svn-master-branch/svnrepo/trunk r1
-ok 2 - git svn clone --stdlayout sets up trunk as main
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t7610-mergetool.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7610-mergetool/.git/
-expecting success of 7610.1 'setup': 
-	test_config rerere.enabled true &&
-	echo main >file1 &&
-	echo main spaced >"spaced name" &&
-	echo main file11 >file11 &&
-	echo main file12 >file12 &&
-	echo main file13 >file13 &&
-	echo main file14 >file14 &&
-	mkdir subdir &&
-	echo main sub >subdir/file3 &&
-	test_create_repo submod &&
-	(
-		cd submod &&
-		: >foo &&
-		git add foo &&
-		git commit -m "Add foo"
-	) &&
-	git submodule add file:///dev/null submod &&
-	git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
-	git commit -m "add initial versions" &&
-
-	git checkout -b branch1 main &&
-	git submodule update -N &&
-	echo branch1 change >file1 &&
-	echo branch1 newfile >file2 &&
-	echo branch1 spaced >"spaced name" &&
-	echo branch1 both added >both &&
-	echo branch1 change file11 >file11 &&
-	echo branch1 change file13 >file13 &&
-	echo branch1 sub >subdir/file3 &&
-	(
-		cd submod &&
-		echo branch1 submodule >bar &&
-		git add bar &&
-		git commit -m "Add bar on branch1" &&
-		git checkout -b submod-branch1
-	) &&
-	git add file1 "spaced name" file11 file13 file2 subdir/file3 submod &&
-	git add both &&
-	git rm file12 &&
-	git commit -m "branch1 changes" &&
-
-	git checkout -b delete-base branch1 &&
-	mkdir -p a/a &&
-	test_write_lines one two 3 4 >a/a/file.txt &&
-	git add a/a/file.txt &&
-	git commit -m"base file" &&
-	git checkout -b move-to-b delete-base &&
-	mkdir -p b/b &&
-	git mv a/a/file.txt b/b/file.txt &&
-	test_write_lines one two 4 >b/b/file.txt &&
-	git commit -a -m"move to b" &&
-	git checkout -b move-to-c delete-base &&
-	mkdir -p c/c &&
-	git mv a/a/file.txt c/c/file.txt &&
-	test_write_lines one two 3 >c/c/file.txt &&
-	git commit -a -m"move to c" &&
-
-	git checkout -b stash1 main &&
-	echo stash1 change file11 >file11 &&
-	git add file11 &&
-	git commit -m "stash1 changes" &&
-
-	git checkout -b stash2 main &&
-	echo stash2 change file11 >file11 &&
-	git add file11 &&
-	git commit -m "stash2 changes" &&
-
-	git checkout main &&
-	git submodule update -N &&
-	echo main updated >file1 &&
-	echo main new >file2 &&
-	echo main updated spaced >"spaced name" &&
-	echo main both added >both &&
-	echo main updated file12 >file12 &&
-	echo main updated file14 >file14 &&
-	echo main new sub >subdir/file3 &&
-	(
-		cd submod &&
-		echo main submodule >bar &&
-		git add bar &&
-		git commit -m "Add bar on main" &&
-		git checkout -b submod-main
-	) &&
-	git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
-	git add both &&
-	git rm file11 &&
-	git commit -m "main updates" &&
-
-	git clean -fdx &&
-	git checkout -b order-file-start main &&
-	echo start >a &&
-	echo start >b &&
-	git add a b &&
-	git commit -m start &&
-	git checkout -b order-file-side1 order-file-start &&
-	echo side1 >a &&
-	echo side1 >b &&
-	git add a b &&
-	git commit -m side1 &&
-	git checkout -b order-file-side2 order-file-start &&
-	echo side2 >a &&
-	echo side2 >b &&
-	git add a b &&
-	git commit -m side2 &&
-
-	git config merge.tool mytool &&
-	git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
-	git config mergetool.mytool.trustExitCode true &&
-	git config mergetool.mybase.cmd "cat \"\$BASE\" >\"\$MERGED\"" &&
-	git config mergetool.mybase.trustExitCode true
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7610-mergetool/submod/.git/
-[main (root-commit) d8b1d8e] Add foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-Adding existing repo at 'submod' to the index
-[main (root-commit) 8119935] add initial versions
- Author: A U Thor <author@example.com>
- 9 files changed, 11 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 file1
- create mode 100644 file11
- create mode 100644 file12
- create mode 100644 file13
- create mode 100644 file14
- create mode 100644 spaced name
- create mode 100644 subdir/file3
- create mode 160000 submod
-Switched to a new branch 'branch1'
-[main b5507ac] Add bar on branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'submod-branch1'
-rm 'file12'
-[branch1 b56897f] branch1 changes
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+), 7 deletions(-)
- create mode 100644 both
- delete mode 100644 file12
- create mode 100644 file2
-Switched to a new branch 'delete-base'
-[delete-base a20b9ac] base file
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 a/a/file.txt
-Switched to a new branch 'move-to-b'
-[move-to-b d173899] move to b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- rename {a/a => b/b}/file.txt (83%)
-Switched to a new branch 'move-to-c'
-[move-to-c 7baa014] move to c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- rename {a/a => c/c}/file.txt (83%)
-Switched to a new branch 'stash1'
-M	submod
-[stash1 7727624] stash1 changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'stash2'
-M	submod
-[stash2 3eeb9f3] stash2 changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-M	submod
-Submodule path 'submod': checked out 'd8b1d8e6424e753a8741ec5acadf448ece02afdc'
-[detached HEAD d1fea44] Add bar on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'submod-main'
-rm 'file11'
-[main 42ed12d] main updates
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+), 7 deletions(-)
- create mode 100644 both
- delete mode 100644 file11
- create mode 100644 file2
-Removing a/
-Switched to a new branch 'order-file-start'
-[order-file-start 8e07b42] start
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Switched to a new branch 'order-file-side1'
-[order-file-side1 072d66b] side1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'order-file-side2'
-[order-file-side2 50ba26c] side2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
-
-expecting success of 7610.2 'custom mergetool': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool both &&
-	yes "" | git mergetool file1 file1 &&
-	yes "" | git mergetool file2 "spaced name" &&
-	yes "" | git mergetool subdir/file3 &&
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "l" | git mergetool submod &&
-	echo "main updated" >expect &&
-	test_cmp expect file1 &&
-	echo "main new" >expect &&
-	test_cmp expect file2 &&
-	echo "main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test2'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test2 2c3a7d1] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 2c3a7d1 branch1 resolved with mergetool
-ok 2 - custom mergetool
-
-expecting success of 7610.3 'gui mergetool': 
-	test_config merge.guitool myguitool &&
-	test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
-	test_config mergetool.myguitool.trustExitCode true &&
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool --gui both &&
-	yes "" | git mergetool -g file1 file1 &&
-	yes "" | git mergetool --gui file2 "spaced name" &&
-	yes "" | git mergetool --gui subdir/file3 &&
-	yes "d" | git mergetool --gui file11 &&
-	yes "d" | git mergetool --gui file12 &&
-	yes "l" | git mergetool --gui submod &&
-	echo "gui main updated" >expect &&
-	test_cmp expect file1 &&
-	echo "gui main new" >expect &&
-	test_cmp expect file2 &&
-	echo "gui main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test3'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test3 531fc95] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 531fc95 branch1 resolved with mergetool
-ok 3 - gui mergetool
-
-expecting success of 7610.4 'gui mergetool without merge.guitool set falls back to merge.tool': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool --gui both &&
-	yes "" | git mergetool -g file1 file1 &&
-	yes "" | git mergetool --gui file2 "spaced name" &&
-	yes "" | git mergetool --gui subdir/file3 &&
-	yes "d" | git mergetool --gui file11 &&
-	yes "d" | git mergetool --gui file12 &&
-	yes "l" | git mergetool --gui submod &&
-	echo "main updated" >expect &&
-	test_cmp expect file1 &&
-	echo "main new" >expect &&
-	test_cmp expect file2 &&
-	echo "main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test4'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test4 2c3a7d1] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 2c3a7d1 branch1 resolved with mergetool
-ok 4 - gui mergetool without merge.guitool set falls back to merge.tool
-
-expecting success of 7610.5 'mergetool crlf': 
-	test_when_finished "git reset --hard" &&
-	# This test_config line must go after the above reset line so that
-	# core.autocrlf is unconfigured before reset runs.  (The
-	# test_config command uses test_when_finished internally and
-	# test_when_finished is LIFO.)
-	test_config core.autocrlf true &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge main &&
-	yes "" | git mergetool file1 &&
-	yes "" | git mergetool file2 &&
-	yes "" | git mergetool "spaced name" &&
-	yes "" | git mergetool both &&
-	yes "" | git mergetool subdir/file3 &&
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "r" | git mergetool submod &&
-	test "$(printf x | cat file1 -)" = "$(printf "main updated\r\nx")" &&
-	test "$(printf x | cat file2 -)" = "$(printf "main new\r\nx")" &&
-	test "$(printf x | cat subdir/file3 -)" = "$(printf "main new sub\r\nx")" &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool - autocrlf"
-
-Switched to a new branch 'test5'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-Merging:
-spaced name
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test5 2674795] branch1 resolved with mergetool - autocrlf
- Author: A U Thor <author@example.com>
-HEAD is now at 2674795 branch1 resolved with mergetool - autocrlf
-ok 5 - mergetool crlf
-
-expecting success of 7610.6 'mergetool in subdir': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "" | git mergetool file3 &&
-		echo "main new sub" >expect &&
-		test_cmp expect file3
-	)
-
-Switched to a new branch 'test6'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-HEAD is now at b56897f branch1 changes
-ok 6 - mergetool in subdir
-
-expecting success of 7610.7 'mergetool on file in parent dir': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "" | git mergetool file3 &&
-		yes "" | git mergetool ../file1 &&
-		yes "" | git mergetool ../file2 ../spaced\ name &&
-		yes "" | git mergetool ../both &&
-		yes "d" | git mergetool ../file11 &&
-		yes "d" | git mergetool ../file12 &&
-		yes "l" | git mergetool ../submod &&
-		echo "main updated" >expect &&
-		test_cmp expect ../file1 &&
-		echo "main new" >expect &&
-		test_cmp expect ../file2 &&
-		echo "branch1 submodule" >expect &&
-		test_cmp expect ../submod/bar &&
-		git commit -m "branch1 resolved with mergetool - subdir"
-	)
-
-Switched to a new branch 'test7'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test7 3b3d211] branch1 resolved with mergetool - subdir
- Author: A U Thor <author@example.com>
-HEAD is now at 3b3d211 branch1 resolved with mergetool - subdir
-ok 7 - mergetool on file in parent dir
-
-expecting success of 7610.8 'mergetool skips autoresolved': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "l" | git mergetool submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to a new branch 'test8'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file11
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-file12
-
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at b56897f branch1 changes
-ok 8 - mergetool skips autoresolved
-
-expecting success of 7610.9 'mergetool merges all from subdir (rerere disabled)': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config rerere.enabled false &&
-	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "r" | git mergetool ../submod &&
-		yes "d" "d" | git mergetool --no-prompt &&
-		echo "main updated" >expect &&
-		test_cmp expect ../file1 &&
-		echo "main new" >expect &&
-		test_cmp expect ../file2 &&
-		echo "main new sub" >expect &&
-		test_cmp expect file3 &&
-		( cd .. && git submodule update -N ) &&
-		echo "main submodule" >expect &&
-		test_cmp expect ../submod/bar &&
-		git commit -m "branch2 resolved by mergetool from subdir"
-	)
-
-Switched to a new branch 'test9'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
+*** t9143-git-svn-gc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9143-git-svn-gc/.git/
+expecting success of 9143.1 'setup directories and test repo': 
+	mkdir import &&
+	mkdir tmp &&
+	echo "Sample text for Subversion repository." > import/test.txt &&
+	svn_cmd import -m "import for git svn" import "$svnrepo" > /dev/null
+	
+ok 1 - setup directories and test repo
 
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-[test9 af143c6] branch2 resolved by mergetool from subdir
- Author: A U Thor <author@example.com>
-HEAD is now at af143c6 branch2 resolved by mergetool from subdir
-ok 9 - mergetool merges all from subdir (rerere disabled)
+expecting success of 9143.2 'checkout working copy from svn': svn_cmd co "$svnrepo" test_wc
+A    test_wc/test.txt
+Checked out revision 1.
+ok 2 - checkout working copy from svn
 
-expecting success of 7610.10 'mergetool merges all from subdir (rerere enabled)': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config rerere.enabled true &&
-	rm -rf .git/rr-cache &&
+expecting success of 9143.3 'set some properties to create an unhandled.log file': 
 	(
-		cd subdir &&
-		test_must_fail git merge main &&
-		yes "r" | git mergetool ../submod &&
-		yes "d" "d" | git mergetool --no-prompt &&
-		echo "main updated" >expect &&
-		test_cmp expect ../file1 &&
-		echo "main new" >expect &&
-		test_cmp expect ../file2 &&
-		echo "main new sub" >expect &&
-		test_cmp expect file3 &&
-		( cd .. && git submodule update -N ) &&
-		echo "main submodule" >expect &&
-		test_cmp expect ../submod/bar &&
-		git commit -m "branch2 resolved by mergetool from subdir"
+		cd test_wc &&
+		svn_cmd propset foo bar test.txt &&
+		svn_cmd commit -m "property set"
 	)
+property 'foo' set on 'test.txt'
+Sending        test.txt
+Committing transaction...
+Committed revision 2.
+ok 3 - set some properties to create an unhandled.log file
 
-Switched to a new branch 'test10'
-M	submod
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test10 af143c6] branch2 resolved by mergetool from subdir
- Author: A U Thor <author@example.com>
-HEAD is now at af143c6 branch2 resolved by mergetool from subdir
-ok 10 - mergetool merges all from subdir (rerere enabled)
-
-expecting success of 7610.11 'mergetool skips resolved paths when rerere is active': 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled true &&
-	rm -rf .git/rr-cache &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	yes "l" | git mergetool --no-prompt submod &&
-	yes "d" "d" | git mergetool --no-prompt &&
-	git submodule update -N &&
-	output="$(yes "n" | git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to a new branch 'test11'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-HEAD is now at b56897f branch1 changes
-ok 11 - mergetool skips resolved paths when rerere is active
-
-expecting success of 7610.12 'conflicted stash sets up rerere': 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled true &&
-	git checkout stash1 &&
-	echo "Conflicting stash content" >file11 &&
-	git stash &&
-
-	git checkout --detach stash2 &&
-	test_must_fail git stash apply &&
-
-	test -n "$(git ls-files -u)" &&
-	conflicts="$(git rerere remaining)" &&
-	test "$conflicts" = "file11" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" != "No files need merging" &&
-
-	git commit -am "save the stash resolution" &&
-
-	git reset --hard stash2 &&
-	test_must_fail git stash apply &&
-
-	test -n "$(git ls-files -u)" &&
-	conflicts="$(git rerere remaining)" &&
-	test -z "$conflicts" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to branch 'stash1'
-M	submod
-Saved working directory and index state WIP on stash1: 7727624 stash1 changes
-HEAD is now at 3eeb9f3 stash2 changes
-M	submod
-Merging Updated upstream with Stashed changes
-Auto-merging file11
-CONFLICT (content): Merge conflict in file11
-Recorded preimage for 'file11'
-HEAD detached at refs/heads/stash2
-Unmerged paths:
-  (use "git restore --staged <file>..." to unstage)
-  (use "git add <file>..." to mark resolution)
-	both modified:   file11
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   submod (new commits)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	both.orig
-	expect
-	file1.orig
-	file2.orig
-	spaced name.orig
-	subdir/expect
-	subdir/file3.orig
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Recorded resolution for 'file11'.
-[detached HEAD 22fbead] save the stash resolution
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at 3eeb9f3 stash2 changes
-Merging Updated upstream with Stashed changes
-Auto-merging file11
-CONFLICT (content): Merge conflict in file11
-Resolved 'file11' using previous resolution.
-HEAD detached at refs/heads/stash2
-Unmerged paths:
-  (use "git restore --staged <file>..." to unstage)
-  (use "git add <file>..." to mark resolution)
-	both modified:   file11
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   submod (new commits)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	both.orig
-	expect
-	file1.orig
-	file11.orig
-	file2.orig
-	spaced name.orig
-	subdir/expect
-	subdir/file3.orig
-
-no changes added to commit (use "git add" and/or "git commit -a")
-HEAD is now at 3eeb9f3 stash2 changes
-ok 12 - conflicted stash sets up rerere
-
-expecting success of 7610.13 'mergetool takes partial path': 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled false &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-
-	yes "" | git mergetool subdir &&
-
-	echo "main new sub" >expect &&
-	test_cmp expect subdir/file3
-
-Previous HEAD position was 3eeb9f3 stash2 changes
-Switched to a new branch 'test13'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-HEAD is now at b56897f branch1 changes
-ok 13 - mergetool takes partial path
-
-expecting success of 7610.14 'mergetool delete/delete conflict': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt &&
-	git reset --hard &&
-	test_must_fail git merge move-to-b &&
-	echo m | git mergetool a/a/file.txt &&
-	test -f b/b/file.txt &&
-	git reset --hard &&
-	test_must_fail git merge move-to-b &&
-	! echo a | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt
-
-Switched to a new branch 'test14'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-ok 14 - mergetool delete/delete conflict
-
-expecting success of 7610.15 'mergetool produces no errors when keepBackup is used': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepBackup true &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt 2>actual &&
-	test_must_be_empty actual &&
-	! test -d a
-
-Switched to a new branch 'test15'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-ok 15 - mergetool produces no errors when keepBackup is used
-
-expecting success of 7610.16 'mergetool honors tempfile config for deleted files': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepTemporaries false &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt &&
-	! test -d a
-
-Switched to a new branch 'test16'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
-ok 16 - mergetool honors tempfile config for deleted files
-
-expecting success of 7610.17 'mergetool keeps tempfiles when aborting delete/delete': 
-	test_when_finished "git reset --hard" &&
-	test_when_finished "git clean -fdx" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepTemporaries true &&
-	test_must_fail git merge move-to-b &&
-	! test_write_lines a n | git mergetool a/a/file.txt &&
-	test -d a/a &&
-	cat >expect <<-\EOF &&
-	file_BASE_.txt
-	file_LOCAL_.txt
-	file_REMOTE_.txt
-	EOF
-	ls -1 a/a | sed -e "s/[0-9]*//g" >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'test17'
-Auto-merging a/a/file.txt
-CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_1949117.txt
-Removing a/a/file_LOCAL_1949117.txt
-Removing a/a/file_REMOTE_1949117.txt
-Removing actual
-Removing both.orig
-Removing expect
-Removing file1.orig
-Removing file11.orig
-Removing file2.orig
-Removing spaced name.orig
-Removing subdir/expect
-Removing subdir/file3.orig
-HEAD is now at 7baa014 move to c
-ok 17 - mergetool keeps tempfiles when aborting delete/delete
-
-expecting success of 7610.18 'deleted vs modified submodule': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	git commit -m "Submodule deleted from branch" &&
-	git checkout -b test$test_count.a test$test_count &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "r" | git mergetool submod &&
-	rmdir submod && mv submod-movedaside submod &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module" &&
-
-	mv submod submod-movedaside &&
-	git checkout -b test$test_count.b test$test_count &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "l" | git mergetool submod &&
-	test ! -e submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by deleting module" &&
-
-	mv submod-movedaside submod &&
-	git checkout -b test$test_count.c main &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "r" | git mergetool submod &&
-	test ! -e submod &&
-	test -d submod.orig &&
-	git submodule update -N &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by deleting module" &&
-	mv submod.orig submod &&
-
-	git checkout -b test$test_count.d main &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "l" | git mergetool submod &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module"
-
-Switched to a new branch 'test18'
-rm 'submod'
-[test18 5815277] Submodule deleted from branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 160000 submod
-Switched to a new branch 'test18.a'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test18.a 699f6ba] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test18.b'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test18.b ba131d0] Merge resolved by deleting module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test18.c'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? [test18.c 79dacce] Merge resolved by deleting module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test18.d'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? [test18.d 84e5f25] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-HEAD is now at 84e5f25 Merge resolved by keeping module
-ok 18 - deleted vs modified submodule
-
-expecting success of 7610.19 'file vs modified submodule': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	echo not a submodule >submod &&
-	git add submod &&
-	git commit -m "Submodule path becomes file" &&
-	git checkout -b test$test_count.a branch1 &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "r" | git mergetool submod &&
-	rmdir submod && mv submod-movedaside submod &&
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module" &&
-
-	mv submod submod-movedaside &&
-	git checkout -b test$test_count.b test$test_count &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		yes "c" | git mergetool submod~HEAD &&
-		git rm submod &&
-		git mv submod~HEAD submod
-	else
-		yes "l" | git mergetool submod
-	fi &&
-	git submodule update -N &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping file" &&
-
-	git checkout -b test$test_count.c main &&
-	rmdir submod && mv submod-movedaside submod &&
-	test ! -e submod.orig &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		mv submod submod.orig &&
-		git rm --cached submod &&
-		yes "c" | git mergetool submod~test19 &&
-		git mv submod~test19 submod
-	else
-		yes "r" | git mergetool submod
-	fi &&
-	test -d submod.orig &&
-	git submodule update -N &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping file" &&
-
-	git checkout -b test$test_count.d main &&
-	rmdir submod && mv submod.orig submod &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
-	yes "" | git mergetool both &&
-	yes "d" | git mergetool file11 file12 &&
-	yes "l" | git mergetool submod &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		yes "d" | git mergetool submod~test19
-	fi &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module"
-
-Switched to a new branch 'test19'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-rm 'submod'
-[test19 51d579a] Submodule path becomes file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 160000 => 100644 submod
-Switched to a new branch 'test19.a'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod (not checked out)
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-[test19.a a22d630] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test19.b'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod~HEAD
-
-Deleted merge conflict for 'submod~HEAD':
-  {local}: created file
-  {remote}: deleted
-Use (c)reated or (d)eleted file, or (a)bort? rm 'submod'
-[test19.b 03808c9] Merge resolved by keeping file
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test19.c'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? rm 'submod'
-Merging:
-submod~test19
-
-Deleted merge conflict for 'submod~test19':
-  {local}: deleted
-  {remote}: created file
-Use (c)reated or (d)eleted file, or (a)bort? [test19.c d6fb010] Merge resolved by keeping file
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test19.d'
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file11
-file12
-
-Deleted merge conflict for 'file11':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-submod~test19
-
-Deleted merge conflict for 'submod~test19':
-  {local}: deleted
-  {remote}: created file
-Use (c)reated or (d)eleted file, or (a)bort? [test19.d 78b901a] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-HEAD is now at 78b901a Merge resolved by keeping module
-ok 19 - file vs modified submodule
-
-expecting success of 7610.20 'submodule in subdirectory': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_create_repo subdir_module &&
-		(
-		cd subdir_module &&
-		: >file15 &&
-		git add file15 &&
-		git commit -m "add initial versions"
-		)
-	) &&
-	test_when_finished "rm -rf subdir/subdir_module" &&
-	git submodule add file:///dev/null subdir/subdir_module &&
-	git add subdir/subdir_module &&
-	git commit -m "add submodule in subdirectory" &&
-
-	git checkout -b test$test_count.a test$test_count &&
-	git submodule update -N &&
-	(
-	cd subdir/subdir_module &&
-		git checkout -b super10.a &&
-		echo test$test_count.a >file15 &&
-		git add file15 &&
-		git commit -m "on branch 10.a"
-	) &&
-	git add subdir/subdir_module &&
-	git commit -m "change submodule in subdirectory on test$test_count.a" &&
-
-	git checkout -b test$test_count.b test$test_count &&
-	git submodule update -N &&
-	(
-		cd subdir/subdir_module &&
-		git checkout -b super10.b &&
-		echo test$test_count.b >file15 &&
-		git add file15 &&
-		git commit -m "on branch 10.b"
-	) &&
-	git add subdir/subdir_module &&
-	git commit -m "change submodule in subdirectory on test$test_count.b" &&
-
-	test_must_fail git merge test$test_count.a &&
-	(
-		cd subdir &&
-		yes "l" | git mergetool subdir_module
-	) &&
-	echo "test$test_count.b" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git submodule update -N &&
-	echo "test$test_count.b" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git reset --hard &&
-	git submodule update -N &&
-
-	test_must_fail git merge test$test_count.a &&
-	yes "r" | git mergetool subdir/subdir_module &&
-	echo "test$test_count.b" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git submodule update -N &&
-	echo "test$test_count.a" >expect &&
-	test_cmp expect subdir/subdir_module/file15 &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test20'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7610-mergetool/subdir/subdir_module/.git/
-[main (root-commit) 4026e0d] add initial versions
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file15
-Adding existing repo at 'subdir/subdir_module' to the index
-[test20 fa030bf] add submodule in subdirectory
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 subdir/subdir_module
-Switched to a new branch 'test20.a'
-Switched to a new branch 'super10.a'
-[super10.a e51e504] on branch 10.a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[test20.a 36380aa] change submodule in subdirectory on test20.a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'test20.b'
-M	subdir/subdir_module
-Submodule path 'subdir/subdir_module': checked out '4026e0d3f7d9c9cd867521d1177656769bfa2be1'
-Switched to a new branch 'super10.b'
-[super10.b e7cb421] on branch 10.b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[test20.b 6eae923] change submodule in subdirectory on test20.b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (subdir/subdir_module), and either merge commit e51e504
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add subdir/subdir_module
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule subdir/subdir_module
-CONFLICT (submodule): Merge conflict in subdir/subdir_module
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/subdir_module
-
-Submodule merge conflict for 'subdir/subdir_module':
-  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
-  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 6eae923 change submodule in subdirectory on test20.b
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (subdir/subdir_module), and either merge commit e51e504
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add subdir/subdir_module
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule subdir/subdir_module
-CONFLICT (submodule): Merge conflict in subdir/subdir_module
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/subdir_module
-
-Submodule merge conflict for 'subdir/subdir_module':
-  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
-  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'subdir/subdir_module': checked out 'e51e504244acbfadc9e7ea9868c3cced1088346d'
-[test20.b 9ad20f7] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 9ad20f7 branch1 resolved with mergetool
-ok 20 - submodule in subdirectory
-
-expecting success of 7610.21 'directory vs modified submodule': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	mkdir submod &&
-	echo not a submodule >submod/file16 &&
-	git add submod/file16 &&
-	git commit -m "Submodule path becomes directory" &&
-
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	yes "l" | git mergetool submod &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod/file16 &&
-	rm -rf submod.orig &&
-
-	git reset --hard &&
-	test_must_fail git merge main &&
-	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		yes "r" | git mergetool submod~main &&
-		git mv submod submod.orig &&
-		git mv submod~main submod
-	else
-		yes "r" | git mergetool submod
-	fi &&
-	test -d submod.orig &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod.orig/file16 &&
-	rm -r submod.orig &&
-	mv submod-movedaside/.git submod &&
-	( cd submod && git clean -f && git reset --hard ) &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git reset --hard &&
-	rm -rf submod-movedaside &&
-
-	git checkout -b test$test_count.c main &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	yes "l" | git mergetool submod &&
-	git submodule update -N &&
-	echo "main submodule" >expect &&
-	test_cmp expect submod/bar &&
-
-	git reset --hard &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
-	yes "r" | git mergetool submod &&
-	echo "not a submodule" >expect &&
-	test_cmp expect submod/file16 &&
-
-	git reset --hard main &&
-	( cd submod && git clean -f && git reset --hard ) &&
-	git submodule update -N
-
-Switched to a new branch 'test21'
-rm 'submod'
-[test21 b88b6e4] Submodule path becomes directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 submod
- create mode 100644 submod/file16
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
-CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-No files need merging
-HEAD is now at b88b6e4 Submodule path becomes directory
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
-CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod~main
-
-Submodule merge conflict for 'submod~main':
-  {local}: deleted
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? warning: Could not find section in .gitmodules where path=submod~main
-HEAD is now at b5507ac Add bar on branch1
-Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
-warning: unable to rmdir 'submod': Directory not empty
-HEAD is now at b88b6e4 Submodule path becomes directory
-Switched to a new branch 'test21.c'
-warning: unable to rmdir 'submod': Directory not empty
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
-CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-No files need merging
-Skipping unmerged submodule submod~HEAD
-HEAD is now at 42ed12d main updates
-warning: unable to rmdir 'submod': Directory not empty
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
-CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-No files need merging
-HEAD is now at 42ed12d main updates
-HEAD is now at d1fea44 Add bar on main
-HEAD is now at 42ed12d main updates
-ok 21 - directory vs modified submodule
-
-expecting success of 7610.22 'file with no base': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool mybase -- both &&
-	test_must_be_empty both
-
-Switched to a new branch 'test22'
-M	submod
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-HEAD is now at b56897f branch1 changes
-ok 22 - file with no base
-
-expecting success of 7610.23 'custom commands override built-ins': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
-	test_config mergetool.defaults.trustExitCode true &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool defaults -- both &&
-	echo main both added >expected &&
-	test_cmp expected both
-
-Switched to a new branch 'test23'
-M	submod
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-HEAD is now at b56897f branch1 changes
-ok 23 - custom commands override built-ins
-
-expecting success of 7610.24 'filenames seen by tools start with ./': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.writeToTemp false &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool myecho -- both >actual &&
-	grep ^\./both_LOCAL_ actual
-
-Switched to a new branch 'test24'
-M	submod
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-./both_LOCAL_1977033
-HEAD is now at b56897f branch1 changes
-ok 24 - filenames seen by tools start with ./
-
-checking prerequisite: MKTEMP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-MKTEMP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-MKTEMP" &&
-	tempdir=$(mktemp -d -t foo.XXXXXX) &&
-	test -d "$tempdir" &&
-	rmdir "$tempdir"
-
-)
-prerequisite MKTEMP ok
-expecting success of 7610.25 'temporary filenames are used with mergetool.writeToTemp': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.writeToTemp true &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge main &&
-	git mergetool --no-prompt --tool myecho -- both >actual &&
-	! grep ^\./both_LOCAL_ actual &&
-	grep /both_LOCAL_ actual
-
-Switched to a new branch 'test25'
-M	submod
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-/tmp/git-mergetool-K2TQcU/both_LOCAL_1977528
-HEAD is now at b56897f branch1 changes
-ok 25 - temporary filenames are used with mergetool.writeToTemp
-
-expecting success of 7610.26 'diff.orderFile configuration is honored': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count order-file-side2 &&
-	test_config diff.orderFile order-file &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	echo b >order-file &&
-	echo a >>order-file &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		b
-		a
-	EOF
-
-	# make sure "order-file" that is ambiguous between
-	# rev and path is understood correctly.
-	git branch order-file HEAD &&
-
-	git mergetool --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'test26'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 50ba26c side2
-ok 26 - diff.orderFile configuration is honored
-
-expecting success of 7610.27 'mergetool -Oorder-file is honored': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count order-file-side2 &&
-	test_config diff.orderFile order-file &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	echo b >order-file &&
-	echo a >>order-file &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		a
-		b
-	EOF
-	git mergetool -O/dev/null --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual &&
-	git reset --hard &&
-
-	git config --unset diff.orderFile &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		b
-		a
-	EOF
-	git mergetool -Oorder-file --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'test27'
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 50ba26c side2
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 50ba26c side2
-ok 27 - mergetool -Oorder-file is honored
-
-expecting success of 7610.28 'mergetool --tool-help shows recognized tools': 
-	# Check a few known tools are correctly shown
-	git mergetool --tool-help >mergetools &&
-	grep vimdiff mergetools &&
-	grep vimdiff3 mergetools &&
-	grep gvimdiff2 mergetools &&
-	grep araxis mergetools &&
-	grep xxdiff mergetools &&
-	grep meld mergetools
-
-		gvimdiff         Use gVim (requires a graphical session) with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
-		gvimdiff1        Use gVim (requires a graphical session) with a 2 panes layout (LOCAL and REMOTE)
-		gvimdiff2        Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		gvimdiff3        Use gVim (requires a graphical session) where only the MERGED file is shown
-		nvimdiff         Use Neovim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
-		nvimdiff1        Use Neovim with a 2 panes layout (LOCAL and REMOTE)
-		nvimdiff2        Use Neovim with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		nvimdiff3        Use Neovim where only the MERGED file is shown
-		vimdiff          Use Vim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)
-		vimdiff1         Use Vim with a 2 panes layout (LOCAL and REMOTE)
-		vimdiff2         Use Vim with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		vimdiff3         Use Vim where only the MERGED file is shown
-		gvimdiff3        Use gVim (requires a graphical session) where only the MERGED file is shown
-		nvimdiff3        Use Neovim where only the MERGED file is shown
-		vimdiff3         Use Vim where only the MERGED file is shown
-		gvimdiff2        Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
-		araxis           Use Araxis Merge (requires a graphical session)
-		xxdiff           Use xxdiff (requires a graphical session)
-		meld             Use Meld (requires a graphical session) with optional `auto merge` (see `git help mergetool`'s `CONFIGURATION` section)
-ok 28 - mergetool --tool-help shows recognized tools
-
-expecting success of 7610.29 'mergetool hideResolved': 
-	test_config mergetool.hideResolved true &&
-	test_when_finished "git reset --hard" &&
-	git checkout -b test${test_count}_b main &&
-	test_write_lines >file1 base "" a &&
-	git commit -a -m "base" &&
-	test_write_lines >file1 base "" c &&
-	git commit -a -m "remote update" &&
-	git checkout -b test${test_count}_a HEAD~ &&
-	test_write_lines >file1 local "" b &&
-	git commit -a -m "local update" &&
-	test_must_fail git merge test${test_count}_b &&
-	yes "" | git mergetool file1 &&
-	test_write_lines >expect local "" c &&
-	test_cmp expect file1 &&
-	git commit -m "test resolved with mergetool"
-
-Switched to a new branch 'test29_b'
-[test29_b b1eadc5] base
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 1 deletion(-)
-[test29_b 27f9bad] remote update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'test29_a'
-[test29_a a3aa5f2] local update
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Recorded preimage for 'file1'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Recorded resolution for 'file1'.
-[test29_a 90808e5] test resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 90808e5 test resolved with mergetool
-ok 29 - mergetool hideResolved
-
-expecting success of 7610.30 'mergetool with guiDefault': 
-	test_config merge.guitool myguitool &&
-	test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
-	test_config mergetool.myguitool.trustExitCode true &&
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge main &&
-
-	test_config mergetool.guiDefault auto &&
-	DISPLAY=SOMETHING && export DISPLAY &&
-	yes "" | git mergetool both &&
-	yes "" | git mergetool file1 file1 &&
-
-	DISPLAY= && export DISPLAY &&
-	yes "" | git mergetool file2 "spaced name" &&
-
-	test_config mergetool.guiDefault true &&
-	yes "" | git mergetool subdir/file3 &&
-
-	yes "d" | git mergetool file11 &&
-	yes "d" | git mergetool file12 &&
-	yes "l" | git mergetool submod &&
-
-	echo "gui main updated" >expect &&
-	test_cmp expect file1 &&
-
-	echo "main new" >expect &&
-	test_cmp expect file2 &&
-
-	echo "gui main new sub" >expect &&
-	test_cmp expect subdir/file3 &&
-
-	echo "branch1 submodule" >expect &&
-	test_cmp expect submod/bar &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test30'
-M	submod
-Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Merging:
-file2
-spaced name
-
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-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
+expecting success of 9143.4 'Setup repo': git svn init "$svnrepo"
+ok 4 - Setup repo
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
-  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
-Use (l)ocal or (r)emote, or (a)bort? [test30 a348a8f] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at a348a8f branch1 resolved with mergetool
-ok 30 - mergetool with guiDefault
+expecting success of 9143.5 'Fetch repo': git svn fetch
+	A	test.txt
+r1 = 8b702c96485574a3b1ddd549bff4ad3a1ad1eb0e (refs/remotes/git-svn)
+	M	test.txt
+r2 = dedf6d7f1af0bc4feaca76fc50034f598d03d1ef (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9143-git-svn-gc/svnrepo r2
+ok 5 - Fetch repo
 
-expecting success of 7610.31 'mergetool with non-existent tool': 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge main &&
-	yes "" | test_must_fail git mergetool --tool=absent >out 2>&1 &&
-	test_grep "mergetool.absent.cmd not set for tool" out
+expecting success of 9143.6 'make backup copy of unhandled.log': 
+	 cp .git/svn/refs/remotes/git-svn/unhandled.log tmp
+	
+ok 6 - make backup copy of unhandled.log
 
-Switched to a new branch 'test31'
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit d1fea44
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Failed to merge submodule submod
-CONFLICT (submodule): Merge conflict in submod
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-error: mergetool.absent.cmd not set for tool 'absent'
-HEAD is now at b56897f branch1 changes
-ok 31 - mergetool with non-existent tool
+expecting success of 9143.7 'create leftover index': > .git/svn/refs/remotes/git-svn/index
+ok 7 - create leftover index
 
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9144-git-svn-old-rev_map.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+expecting success of 9143.8 'git svn gc runs': git svn gc
+ok 8 - git svn gc runs
 
-Adding         i/a
-Committing transaction...
-Committed revision 1.
-	A	a
-r1 = 6cca6c777a163b37804105b991861286fd56fce8 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo r1
-ok 1 - setup test repository with old layout
+expecting success of 9143.9 'git svn index removed': ! test -f .git/svn/refs/remotes/git-svn/index
+ok 9 - git svn index removed
 
-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/
+expecting success of 9143.10 'git svn gc produces a valid gzip file': 
+		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
+		
+ok 10 - git svn gc produces a valid gzip file
 
-Adding         i/a
-Committing transaction...
-Committed revision 2.
-	A	b/a
-r2 = 79390d5c3cdecfe7cb8c34ff7f1886abd7fa8977 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-[master 378eecf] -
- 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.48.0~rc1+next.20250101/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
-	M	b/a
-Committed r3
-	M	b/a
-r3 = 4eaf9bc6341e972a0801f230cdcdbd2656700665 (refs/remotes/git-svn)
-No changes between 378eecf8d783e22ae64668ac4cf9001fdf425fe7 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 2 - old layout continues to work
+expecting success of 9143.11 'git svn gc does not change unhandled.log files': 
+	 test_cmp .git/svn/refs/remotes/git-svn/unhandled.log tmp/unhandled.log
+	
+ok 11 - git svn gc does not change unhandled.log files
 
-# passed all 2 test(s)
-1..2
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9100-git-svn-basic.sh ***
@@ -525587,7 +522044,7 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = cda2f7561c85bc2a8349a51a890047431b551475 (refs/remotes/git-svn)
+r1 = 7a8c487d06300dbd9e2c8060e4341a554d7bd3b1 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9100-git-svn-basic/svnrepo r1
 ok 4 - import an SVN revision into git
@@ -525619,7 +522076,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a
 Switched to a new branch 'mybranch'
-[mybranch dea71f1] try a deep --rmdir with a commit
+[mybranch 7423643] 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%)
@@ -525636,7 +522093,7 @@
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = deca55b6f6a9ded607d841165fb48e3c15c2a5e6 (refs/remotes/git-svn)
+r2 = 678468203d42518cb0b65ccae0a54d5d5473f8cb (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
@@ -525655,7 +522112,7 @@
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
 		remotes/git-svn..mybranch
 
-[mybranch 3e76044] detect node change from file to directory #1
+[mybranch 2b50011] 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%)
@@ -525675,7 +522132,7 @@
 		remotes/git-svn..mybranch2
 
 Switched to a new branch 'mybranch2'
-[mybranch2 66942e6] detect node change from directory to file #1
+[mybranch2 dec55ab] 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%)
@@ -525699,7 +522156,7 @@
 	test -e "$SVN_TREE"/bar/zzz/yyy
 
 Switched to a new branch 'mybranch3'
-[mybranch3 3092699] detect node change from file to directory #2
+[mybranch3 891ba89] 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
@@ -525708,7 +522165,7 @@
 	A	bar/zzz/yyy
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 02531d17e0cd68458b0f5f5241b17220a32fd090 (refs/remotes/git-svn)
+r3 = f1cb661e5c0659adb52f73f3211f5384a15af208 (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
@@ -525730,13 +522187,13 @@
 		remotes/git-svn..mybranch4
 
 Switched to a new branch 'mybranch4'
-[mybranch4 ba19cdc] detect node change from directory to file #2
+[mybranch4 09235cd] 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 'aaf0590b-2db9-4863-bbeb-f4c1329dfefb', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.48.0~rc1+next.20250101/perl/build/lib/Git/SVN.pm line 2079.
+Item already exists in filesystem: File already exists: filesystem '80dd92d6-ae4b-408c-b5a2-6d75fe64ddf1', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.48.0~rc1+next.20250101/perl/build/lib/Git/SVN.pm line 2079.
 
 ok 10 - detect node change from directory to file #2
 
@@ -525751,13 +522208,13 @@
 	svn_cmd up "$SVN_TREE" &&
 	test ! -x "$SVN_TREE"/exec.sh
 Switched to a new branch 'mybranch5'
-[mybranch5 65adfdf] remove executable bit from a file
+[mybranch5 5bfd2cd] 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 = 178620cb46326d392fabb55eb18572a3edb97179 (refs/remotes/git-svn)
+r4 = f799c91a7c26d954210f4a3b17c05d679d041b80 (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
@@ -525772,13 +522229,13 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/exec.sh
-[mybranch5 d5b00ce] add executable bit back file
+[mybranch5 7490a57] 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 = 76a45b0346f0326aeff9f70e9c2b48290ab3be33 (refs/remotes/git-svn)
+r5 = 66646854abc5f7bddade9e43332a77818d6defcf (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
@@ -525804,7 +522261,7 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -h "$SVN_TREE"/exec.sh
-[mybranch5 aa9b050] executable file becomes a symlink to file
+[mybranch5 01e9475] 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
@@ -525813,7 +522270,7 @@
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 75de50ee1396d28af22e5a989a4f27e45d28aa97 (refs/remotes/git-svn)
+r6 = 1c3501fd64fa777d65f16a198f658c6a8be607ee (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
@@ -525831,7 +522288,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/file &&
 	test -h "$SVN_TREE"/exec-2.sh
-[mybranch5 9e4097e] new symlink is added to a file that was also just made executable
+[mybranch5 3db65cc] 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
@@ -525840,7 +522297,7 @@
 	M	file
 	A	exec-2.sh
 	M	file
-r7 = 5888e24e42e8e49bba90ca1b078fa4f5d2943bb5 (refs/remotes/git-svn)
+r7 = fda1b4a1f0d7b3a1dbe7c25841ce2a2f08afcbd6 (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
@@ -525860,7 +522317,7 @@
 	test -f "$SVN_TREE"/exec-2.sh &&
 	test ! -h "$SVN_TREE"/exec-2.sh &&
 	test_cmp help "$SVN_TREE"/exec-2.sh
-[mybranch5 37f4983] modify a symlink to become a file
+[mybranch5 3ad8f02] 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
@@ -525869,7 +522326,7 @@
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 284370a3d1254d9dea9b1fe30c0d8a9bedd2ff96 (refs/remotes/git-svn)
+r8 = e083bce617fb9b0300260d15e60b8a27fd8e5836 (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
@@ -525882,12 +522339,12 @@
 	git update-index exec-2.sh &&
 	git commit -m 'éï�' &&
 	git svn set-tree HEAD
-[mybranch5 8fa7a4b] éï�
+[mybranch5 b562736] éï�
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	exec-2.sh
 	M	exec-2.sh
-r9 = 79a7ecf8c381f13db1c1067997171afc000f8e28 (refs/remotes/git-svn)
+r9 = 9eeb6c65fb6eeb0b2d5bbcde19c45b76ea6a5499 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 ok 16 - commit with UTF-8 message: locale: C.utf8
 
@@ -525902,33 +522359,33 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = cda2f7561c85bc2a8349a51a890047431b551475 (refs/remotes/alt)
+r1 = 7a8c487d06300dbd9e2c8060e4341a554d7bd3b1 (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 = c3c042091783adbf564e1d3559b29d42d1acaec0 (refs/remotes/alt)
+r2 = 37d5c6cf7319160e9ec7af745abddd5735192750 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 2e4d392f3870239a65090afae3f3ccdb8b782a1c (refs/remotes/alt)
+r3 = 014a0b2563286ad2ad12a7d695a47902a5de9538 (refs/remotes/alt)
 	M	exec.sh
-r4 = 7d772ea04177362f061f7684ba01ddffa1633cf6 (refs/remotes/alt)
+r4 = b9cdb22aaa994beedb0c168aae39f6cd6f598cef (refs/remotes/alt)
 	M	exec.sh
-r5 = fcc2f5b850bbea5f9046f182ea5b3eaf77cbf06c (refs/remotes/alt)
+r5 = 0c741e490ab8c11982499d4fac22a85782c6b5b6 (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 7a5d070c847f44a6ae6193946d89350ec85f7310 (refs/remotes/alt)
+r6 = 786bc9f0ac4b50596a5f90bdc3de45dab49c62f8 (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = 2fbfde45b51ad1d70a3cdf0b8dd263c9f1fe316f (refs/remotes/alt)
+r7 = e8ea61a58d0fbb29c1b35412acf548c3b550e2c8 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = ef1386131c168d530240e0dbadcced320740bf42 (refs/remotes/alt)
+r8 = e38b96053441e6566ae54180174504b094f639c5 (refs/remotes/alt)
 	M	exec-2.sh
-r9 = c3561baf73df728d4ab35e0b470db35c0a634f8d (refs/remotes/alt)
+r9 = 3b7ab28181d2ac9766e0b82bf721d90b5a14f702 (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': 
@@ -525995,16 +522452,16 @@
 	git branch -D my-bar
 	
 	A	zzz
-r1 = daa48712bd009029a3a104029a3f54e01d832191 (refs/remotes/bar)
+r1 = 2c04ae2f821610d28e3abbcbfaa700cebc6fdcf6 (refs/remotes/bar)
 	D	zzz
 	A	zzz/yyy
-r3 = 4f18c88ac13e6fdd60ab0fb580ed3a9dbb5fb964 (refs/remotes/bar)
+r3 = 6de9605cfa26d1d4102982892651276c0eb80918 (refs/remotes/bar)
 Switched to a new branch 'my-bar'
-[my-bar 4dfcca2] change 1
+[my-bar 2809b0e] change 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[my-bar f2aae92] change 2
+[my-bar 8bacca0] change 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -526012,14 +522469,14 @@
 	A	foo
 Committed r10
 	A	foo
-r10 = 7eebee3cec154977ded8db158d30f997b089035a (refs/remotes/bar)
-No changes between 4dfcca2039f3e7a6e55ac6bf89b5a95139d03559 and refs/remotes/bar
+r10 = 62b5ef4653c0717686ed143835eae16ae492c723 (refs/remotes/bar)
+No changes between 2809b0eacc709988a0f3e70b9a2f842452eaa136 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: 7eebee3cec154977ded8db158d30f997b089035a
+The rewritten commit is: 62b5ef4653c0717686ed143835eae16ae492c723
     change 1
 Switched to branch 'main'
-Deleted branch my-bar (was f2aae92).
+Deleted branch my-bar (was 8bacca0).
 ok 22 - dcommit $rev does not clobber current branch
 
 expecting success of 9100.23 'able to dcommit to a subdirectory': 
@@ -526043,9 +522500,9 @@
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
 	A	bar/foo
-r10 = 51f4156ae10f7dc832039dc9e15e256c580dea26 (refs/remotes/alt)
+r10 = 51eb098c8b2d7ab8f4e2afb4c573d0edfc22e861 (refs/remotes/alt)
 Switched to a new branch 'my-bar'
-[my-bar d96793b] /bar/d should be in the log
+[my-bar ee2b7a6] /bar/d should be in the log
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 d
@@ -526054,10 +522511,10 @@
 	A	d
 Committed r11
 	A	d
-r11 = 98c7d1a6e14700b6ef9fd7b077551153844fcf27 (refs/remotes/bar)
-No changes between d96793bec7ba8b5e6cef91dd1c6813c6b50253ae and refs/remotes/bar
+r11 = acd1e732dee91f89530d9c42d1bdfd5815a25f26 (refs/remotes/bar)
+No changes between ee2b7a684185ecf97b5bf6555fc94bfeea6f7c37 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar e2b7b0f] add a new directory
+[my-bar 390be75] add a new directory
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 newdir/dir
@@ -526066,10 +522523,10 @@
 	A	newdir/dir
 Committed r12
 	A	newdir/dir
-r12 = ba7f673963da87b11a8d12d49984671ede8da2f2 (refs/remotes/bar)
-No changes between e2b7b0f29e391707ab57b0376ce925173c072175 and refs/remotes/bar
+r12 = b20b9612b35dca5ef0598df06c105d0a3af7ea6e (refs/remotes/bar)
+No changes between 390be75b2fd7f9ca5bdd8933b98e998db2ad8b72 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar 256fac0] modify a file in new directory
+[my-bar 393ad06] 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"
@@ -526077,8 +522534,8 @@
 	M	newdir/dir
 Committed r13
 	M	newdir/dir
-r13 = 489e1a3781f16aab2afb761a69a12930c799c536 (refs/remotes/bar)
-No changes between 256fac0320285fe8cd76dae964c48e1481760e62 and refs/remotes/bar
+r13 = e40475ae5cae054be0e4743bd2fca2e9edd029d0 (refs/remotes/bar)
+No changes between 393ad066f301cd6a88e9907571e9026ceb75ead6 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 23 - able to dcommit to a subdirectory
 
@@ -526087,7 +522544,7 @@
 	test-tool chmtime =-60 foo &&
 	git svn dcommit
 
-[my-bar 97790bd] commit-new-file-foo2
+[my-bar bd01161] commit-new-file-foo2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo2
@@ -526096,8 +522553,8 @@
 	A	foo2
 Committed r14
 	A	foo2
-r14 = dbb80e6e5f66e2b6ab33031fd6d8da48684770e9 (refs/remotes/bar)
-No changes between 97790bddced589475bdc1769eb236abf34a3007b and refs/remotes/bar
+r14 = cb1728805173cf64a18a6139a39becdda3b5032a (refs/remotes/bar)
+No changes between bd01161667ed0f80a9bd2109ffa383bfea8d45a6 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 24 - dcommit should not fail with a touched file
 
@@ -526115,12 +522572,12 @@
 	git svn set-tree -i bar HEAD &&
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
-[my-bar 461d72a] update /bar/d
+[my-bar 67c7078] update /bar/d
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 	M	d
 	M	d
-r15 = b3328cc61b97234a4f4c6b5ef1c715ea2def3244 (refs/remotes/bar)
+r15 = cf5e2d13e0035211f50398a37c5ac375df5be9f0 (refs/remotes/bar)
 Done committing 1 revisions to SVN
 ok 26 - able to set-tree to a subdirectory
 
@@ -526138,105 +522595,203 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = cda2f7561c85bc2a8349a51a890047431b551475 (refs/remotes/alt)
+r1 = 7a8c487d06300dbd9e2c8060e4341a554d7bd3b1 (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 = c3c042091783adbf564e1d3559b29d42d1acaec0 (refs/remotes/alt)
+r2 = 37d5c6cf7319160e9ec7af745abddd5735192750 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 2e4d392f3870239a65090afae3f3ccdb8b782a1c (refs/remotes/alt)
+r3 = 014a0b2563286ad2ad12a7d695a47902a5de9538 (refs/remotes/alt)
 	M	exec.sh
-r4 = 7d772ea04177362f061f7684ba01ddffa1633cf6 (refs/remotes/alt)
+r4 = b9cdb22aaa994beedb0c168aae39f6cd6f598cef (refs/remotes/alt)
 	M	exec.sh
-r5 = fcc2f5b850bbea5f9046f182ea5b3eaf77cbf06c (refs/remotes/alt)
+r5 = 0c741e490ab8c11982499d4fac22a85782c6b5b6 (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 7a5d070c847f44a6ae6193946d89350ec85f7310 (refs/remotes/alt)
+r6 = 786bc9f0ac4b50596a5f90bdc3de45dab49c62f8 (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = 2fbfde45b51ad1d70a3cdf0b8dd263c9f1fe316f (refs/remotes/alt)
+r7 = e8ea61a58d0fbb29c1b35412acf548c3b550e2c8 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = ef1386131c168d530240e0dbadcced320740bf42 (refs/remotes/alt)
+r8 = e38b96053441e6566ae54180174504b094f639c5 (refs/remotes/alt)
 	M	exec-2.sh
-r9 = c3561baf73df728d4ab35e0b470db35c0a634f8d (refs/remotes/alt)
+r9 = 3b7ab28181d2ac9766e0b82bf721d90b5a14f702 (refs/remotes/alt)
 	A	bar/foo
-r10 = 51f4156ae10f7dc832039dc9e15e256c580dea26 (refs/remotes/alt)
+r10 = 51eb098c8b2d7ab8f4e2afb4c573d0edfc22e861 (refs/remotes/alt)
 	A	bar/d
-r11 = 563d8e9e1aef30796de85792777d2ce105b72dd2 (refs/remotes/alt)
+r11 = 964cdba2787023ecbe6e72795acf5d1145b27ccd (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = c295803e67454bbfaaa51a0dcb72473f435f840d (refs/remotes/alt)
+r12 = a5d6aceb9cc1b5be0fa835046c25fb118ccf32ff (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = 242179dce69286c49423b5a9ce940534c4e57b8d (refs/remotes/alt)
+r13 = 6c11b92847bcb5717fb952382e54d8ead750594e (refs/remotes/alt)
 	A	bar/foo2
-r14 = e1dcaa63c4da53704bdb571c8305c27438317591 (refs/remotes/alt)
+r14 = 0c2902fe43a756be89986487143a104d2e0ccf36 (refs/remotes/alt)
 	M	bar/d
-r15 = 46c37333e02dd5ca2413f848b69f5d2a5aefd951 (refs/remotes/alt)
+r15 = 266f06b8a22e3b39d0e19d4dae39c3c628a7cded (refs/remotes/alt)
 ok 27 - git-svn works in a bare repository
 
 expecting success of 9100.28 'git-svn works in a repository with a gitdir: link': 
 	mkdir worktree gitdir &&
 	( cd worktree &&
 	git svn init "$svnrepo" &&
-	git init --separate-git-dir ../gitdir &&
-	git svn fetch ) &&
-	rm -rf worktree gitdir
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9100-git-svn-basic/worktree/.git/
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9100-git-svn-basic/gitdir/
-	A	bar/zzz
-	A	dir/a/b/c/d/e/file
-	A	exec.sh
-	A	foo
-	A	foo.link
-r1 = cda2f7561c85bc2a8349a51a890047431b551475 (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 = c3c042091783adbf564e1d3559b29d42d1acaec0 (refs/remotes/alt)
-	D	bar/zzz
-	A	bar/zzz/yyy
-r3 = 2e4d392f3870239a65090afae3f3ccdb8b782a1c (refs/remotes/alt)
-	M	exec.sh
-r4 = 7d772ea04177362f061f7684ba01ddffa1633cf6 (refs/remotes/alt)
-	M	exec.sh
-r5 = fcc2f5b850bbea5f9046f182ea5b3eaf77cbf06c (refs/remotes/alt)
-	D	exec.sh
-	A	exec.sh
-W: -empty_dir: exec.sh
-r6 = 7a5d070c847f44a6ae6193946d89350ec85f7310 (refs/remotes/alt)
-	A	exec-2.sh
-	M	file
-r7 = 2fbfde45b51ad1d70a3cdf0b8dd263c9f1fe316f (refs/remotes/alt)
-	D	exec-2.sh
-	A	exec-2.sh
-W: -empty_dir: exec-2.sh
-r8 = ef1386131c168d530240e0dbadcced320740bf42 (refs/remotes/alt)
-	M	exec-2.sh
-r9 = c3561baf73df728d4ab35e0b470db35c0a634f8d (refs/remotes/alt)
-	A	bar/foo
-r10 = 51f4156ae10f7dc832039dc9e15e256c580dea26 (refs/remotes/alt)
-	A	bar/d
-r11 = 563d8e9e1aef30796de85792777d2ce105b72dd2 (refs/remotes/alt)
-	A	bar/newdir/dir
-r12 = c295803e67454bbfaaa51a0dcb72473f435f840d (refs/remotes/alt)
-	M	bar/newdir/dir
-r13 = 242179dce69286c49423b5a9ce940534c4e57b8d (refs/remotes/alt)
-	A	bar/foo2
-r14 = e1dcaa63c4da53704bdb571c8305c27438317591 (refs/remotes/alt)
-	M	bar/d
-r15 = 46c37333e02dd5ca2413f848b69f5d2a5aefd951 (refs/remotes/alt)
-ok 28 - git-svn works in a repository with a gitdir: link
+	git init --separate-git-dir ../gitdir &&
+	git svn fetch ) &&
+	rm -rf worktree gitdir
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9100-git-svn-basic/worktree/.git/
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9100-git-svn-basic/gitdir/
+	A	bar/zzz
+	A	dir/a/b/c/d/e/file
+	A	exec.sh
+	A	foo
+	A	foo.link
+r1 = 7a8c487d06300dbd9e2c8060e4341a554d7bd3b1 (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 = 37d5c6cf7319160e9ec7af745abddd5735192750 (refs/remotes/alt)
+	D	bar/zzz
+	A	bar/zzz/yyy
+r3 = 014a0b2563286ad2ad12a7d695a47902a5de9538 (refs/remotes/alt)
+	M	exec.sh
+r4 = b9cdb22aaa994beedb0c168aae39f6cd6f598cef (refs/remotes/alt)
+	M	exec.sh
+r5 = 0c741e490ab8c11982499d4fac22a85782c6b5b6 (refs/remotes/alt)
+	D	exec.sh
+	A	exec.sh
+W: -empty_dir: exec.sh
+r6 = 786bc9f0ac4b50596a5f90bdc3de45dab49c62f8 (refs/remotes/alt)
+	A	exec-2.sh
+	M	file
+r7 = e8ea61a58d0fbb29c1b35412acf548c3b550e2c8 (refs/remotes/alt)
+	D	exec-2.sh
+	A	exec-2.sh
+W: -empty_dir: exec-2.sh
+r8 = e38b96053441e6566ae54180174504b094f639c5 (refs/remotes/alt)
+	M	exec-2.sh
+r9 = 3b7ab28181d2ac9766e0b82bf721d90b5a14f702 (refs/remotes/alt)
+	A	bar/foo
+r10 = 51eb098c8b2d7ab8f4e2afb4c573d0edfc22e861 (refs/remotes/alt)
+	A	bar/d
+r11 = 964cdba2787023ecbe6e72795acf5d1145b27ccd (refs/remotes/alt)
+	A	bar/newdir/dir
+r12 = a5d6aceb9cc1b5be0fa835046c25fb118ccf32ff (refs/remotes/alt)
+	M	bar/newdir/dir
+r13 = 6c11b92847bcb5717fb952382e54d8ead750594e (refs/remotes/alt)
+	A	bar/foo2
+r14 = 0c2902fe43a756be89986487143a104d2e0ccf36 (refs/remotes/alt)
+	M	bar/d
+r15 = 266f06b8a22e3b39d0e19d4dae39c3c628a7cded (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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9145-git-svn-master-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9145-git-svn-master-branch/.git/
+expecting success of 9145.1 'setup test repository': 
+	mkdir i &&
+	> i/a &&
+	svn_cmd import -m trunk i "$svnrepo/trunk" &&
+	svn_cmd import -m b/a i "$svnrepo/branches/a" &&
+	svn_cmd import -m b/b i "$svnrepo/branches/b"
+
+Adding         i/a
+Committing transaction...
+Committed revision 1.
+Adding         i/a
+Committing transaction...
+Committed revision 2.
+Adding         i/a
+Committing transaction...
+Committed revision 3.
+ok 1 - setup test repository
+
+expecting success of 9145.2 'git svn clone --stdlayout sets up trunk as main': 
+	git svn clone -s "$svnrepo" g &&
+	(
+		cd g &&
+		test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \
+		     x$(git rev-parse --verify refs/heads/main^0)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9145-git-svn-master-branch/g/.git/
+	A	a
+r1 = 1533d32925c3cb74ac12f743e3a36cf679893aa4 (refs/remotes/origin/trunk)
+	A	a
+r2 = 5c021a854338a5335342cdfdf425c2072487080c (refs/remotes/origin/a)
+	A	a
+r3 = 853cff842837304021f5d540510ed7db51eac366 (refs/remotes/origin/b)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9145-git-svn-master-branch/svnrepo/trunk r1
+ok 2 - git svn clone --stdlayout sets up trunk as main
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9144-git-svn-old-rev_map.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-# passed all 28 test(s)
-1..28
+Adding         i/a
+Committing transaction...
+Committed revision 1.
+	A	a
+r1 = b4200c16f61be557670dfa8dead9174f5ac2ce39 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 3ca1db0576e0b447e237a5d4a01bb71a17ae65f2 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+[master 326a57e] -
+ 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.48.0~rc1+next.20250101/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
+	M	b/a
+Committed r3
+	M	b/a
+r3 = a73ceaadc29863d321917009ed08556bf08ab3f5 (refs/remotes/git-svn)
+No changes between 326a57e574a83b3bf3287066316b0d5e90dc9d91 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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9140-git-svn-reset.sh ***
@@ -526290,10 +522845,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9140-git-svn-reset/g/.git/
 	A	vis/vis.txt
-r1 = 6b32f283eeb6cbb23994c9461cba1f41d936bd55 (refs/remotes/git-svn)
-r2 = 6214b6db8e9656db1dab06ef2261adcbd56b5c73 (refs/remotes/git-svn)
+r1 = 5a3e68c0d7393c40864d12e653c94b77746ed08b (refs/remotes/git-svn)
+r2 = 7c47f6f698f518867100bccae57dd841f11b15a4 (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = 3278485e09f6905f82327a93bf33bd1d5129a167 (refs/remotes/git-svn)
+r3 = 54b31692fe58bf4fb61cffc9fa1f60a5762be9b7 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
 ok 2 - clone SVN repository with hidden directory
@@ -526321,7 +522876,7 @@
 	grep "not found in commit" errors &&
 	test_cmp expect expect2
 
-hid/hid.txt was not found in commit 3278485e09f6905f82327a93bf33bd1d5129a167 (r3)
+hid/hid.txt was not found in commit 54b31692fe58bf4fb61cffc9fa1f60a5762be9b7 (r3)
 ok 4 - fetch fails on modified hidden file
 
 expecting success of 9140.5 'reset unwinds back to r1': 
@@ -526331,7 +522886,7 @@
 	echo 1 >expect &&
 	test_cmp expect expect2
 
-r1 = 6b32f283eeb6cbb23994c9461cba1f41d936bd55 (refs/remotes/git-svn)
+r1 = 5a3e68c0d7393c40864d12e653c94b77746ed08b (refs/remotes/git-svn)
 ok 5 - reset unwinds back to r1
 
 expecting success of 9140.6 'refetch succeeds not ignoring any files': 
@@ -526342,14 +522897,14 @@
 	)
 
 Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
-rereading 6b32f283eeb6cbb23994c9461cba1f41d936bd55
+rereading 5a3e68c0d7393c40864d12e653c94b77746ed08b
 	A	hid/hid.txt
-r2 = e88d595cde8c7c4fda8ab472258b7ee54a588288 (refs/remotes/git-svn)
+r2 = 84780d5c261e00420520fbcda521b15092771c79 (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = 32abe2ae2f1c085f6afcef2c11b1d3f902d1d1ae (refs/remotes/git-svn)
+r3 = 865c6c0d95d96a322c06ace383d38b0d2f45f9ec (refs/remotes/git-svn)
 	M	hid/hid.txt
-r4 = f8f71ab6c02ea18626eac02b6b2314c14a7fe305 (refs/remotes/git-svn)
-warning: skipped previously applied commit 3278485
+r4 = cd34ff16a2f58a67829f0a340e4af783adc333db (refs/remotes/git-svn)
+warning: skipped previously applied commit 54b3169
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
@@ -526360,6 +522915,159 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9150-svk-mergetickets.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9150-svk-mergetickets/.git/
+expecting success of 9150.1 'load svk depot': 
+	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9150-svk-mergetickets/svnrepo' 	  < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9153-git-svn-rewrite-uuid.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9153-git-svn-rewrite-uuid/.git/
+expecting success of 9153.1 'load svn repo': 
+	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9153/svn.dump' &&
+	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
+	git svn fetch
+	
+	A	foo
+r1 = 6a7c0fe96ca6537577546e15b7b9f2a4a3d9ecf9 (refs/remotes/git-svn)
+	M	foo
+r2 = 8964a4f164c2b502d3833ed245b7335b9a51b996 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
+ok 1 - load svn repo
+
+expecting success of 9153.2 'verify uuid': 
+	git cat-file commit refs/remotes/git-svn~0 >actual &&
+	grep '^git-svn-id: .*@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual &&
+	git cat-file commit refs/remotes/git-svn~1 >actual &&
+	grep '^git-svn-id: .*@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual
+	
+git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+ok 2 - verify uuid
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9152-svn-empty-dirs-after-gc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9152-svn-empty-dirs-after-gc/.git/
+expecting success of 9152.1 'initialize repo': 
+	for i in a b c d d/e d/e/f "weird file name"
+	do
+		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
+	done
+
+Committing transaction...
+Committed revision 1.
+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 - initialize repo
+
+expecting success of 9152.2 'clone': git svn clone "$svnrepo" cloned
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
+W: +empty_dir: a
+r1 = 3ff6d30ca76694ed9a3f06e20e306e433572fefe (refs/remotes/git-svn)
+W: +empty_dir: b
+r2 = 4a7b3dbf10fe62b5d6faab0894b8103b3fd58316 (refs/remotes/git-svn)
+W: +empty_dir: c
+r3 = 9d291eb0663df18e95f58305bb6f492bb40ebc67 (refs/remotes/git-svn)
+W: +empty_dir: d
+r4 = 7349315d93354c1de8054b795f7e4ab1b416c8ac (refs/remotes/git-svn)
+W: +empty_dir: d/e
+r5 = 9312ff984822513a38deaf703ccf33d9a41d2339 (refs/remotes/git-svn)
+W: +empty_dir: d/e/f
+r6 = 78640e24210430cae4b0d1b5ea543acdf68f6a04 (refs/remotes/git-svn)
+W: +empty_dir: weird file name
+r7 = f8918d5f8ba8b1c28e5be119e41f898c664f039c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9152-svn-empty-dirs-after-gc/svnrepo r7
+creating empty directory: a
+creating empty directory: b
+creating empty directory: c
+creating empty directory: d
+creating empty directory: d/e
+creating empty directory: d/e/f
+creating empty directory: weird file name
+ok 2 - clone
+
+expecting success of 9152.3 'git svn gc runs': 
+	(
+		cd cloned &&
+		git svn gc
+	)
+
+ok 3 - git svn gc runs
+
+expecting success of 9152.4 'git svn mkdirs recreates empty directories after git svn gc': 
+	(
+		cd cloned &&
+		rm -r * &&
+		git svn mkdirs &&
+		for i in a b c d d/e d/e/f "weird file name"
+		do
+			if ! test -d "$i"
+			then
+				echo >&2 "$i does not exist" &&
+				exit 1
+			fi
+		done
+	)
+
+creating empty directory: a
+creating empty directory: b
+creating empty directory: c
+creating empty directory: d
+creating empty directory: d/e
+creating empty directory: d/e/f
+creating empty directory: weird file name
+ok 4 - git svn mkdirs recreates empty directories after git svn gc
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9001-send-email.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9001-send-email/.git/
 expecting success of 9001.1 'prepare reference tree': 
@@ -526437,8 +523145,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:23 +0000
-Message-ID: <20250209065523.1939355-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:36:59 +0000
+Message-ID: <20260314133659.431132-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526477,8 +523185,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:23 +0000
-Message-ID: <20250209065523.1939847-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:36:59 +0000
+Message-ID: <20260314133659.431486-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526519,8 +523227,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:23 +0000
-Message-ID: <20250209065523.1940289-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:00 +0000
+Message-ID: <20260314133700.431851-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526586,7 +523294,7 @@
  Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
  create mode 100644 cc-trailer.t
-/tmp/fS8slGIvse/0001-Test-Cc-trailers.patch
+/tmp/VE7hFz3QxO/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'
@@ -526606,8 +523314,8 @@
 	five@example.com,
 	six@example.com
 Subject: [PATCH] Test Cc: trailers.
-Date: Sun,  9 Feb 2025 06:55:23 +0000
-Message-ID: <20250209065523.1940761-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:00 +0000
+Message-ID: <20260314133700.432389-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526635,7 +523343,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" &&
 	test_cmp expected-cc commandline1
 
-/tmp/efmBuWsc52/0001-Second.patch
+/tmp/00punmAZOR/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'
@@ -526655,8 +523363,8 @@
 	five@example.com (open list:FOR THING (FOO/bar)),
 	six@example.com (open list)
 Subject: [PATCH] Second.
-Date: Sun,  9 Feb 2025 06:55:24 +0000
-Message-ID: <20250209065524.1941146-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:01 +0000
+Message-ID: <20260314133701.432680-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526718,8 +523426,8 @@
 From: A U Thor <author@example.com>
 To: nobody@example.com
 Subject: [PATCH] test suppress-cc.self unquoted-self_name_suppressed with name A U Thor email author@example.com
-Date: Sun,  9 Feb 2025 06:55:24 +0000
-Message-ID: <20250209065524.1941638-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:02 +0000
+Message-ID: <20260314133702.433256-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526746,8 +523454,8 @@
 From: "A U. Thor" <author@example.com>
 To: nobody@example.com
 Subject: [PATCH] test suppress-cc.self quoted-self_name_dot_suppressed with name A U. Thor email author@example.com
-Date: Sun,  9 Feb 2025 06:55:24 +0000
-Message-ID: <20250209065524.1942174-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:03 +0000
+Message-ID: <20260314133703.433721-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526774,8 +523482,8 @@
 From: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?= <odd_?=mail@example.com>
 To: nobody@example.com
 Subject: [PATCH] =?UTF-8?q?test=20suppress-cc.self=20quoted-non=5Fascii=5F?= =?UTF-8?q?self=5Fsuppressed=20with=20name=20F=C3=BC=C3=B1n=C3=BD=20N?= =?UTF-8?q?=C3=A2m=C3=A9=20email=20odd=5F=3F=3Dmail@example.com?=
-Date: Sun,  9 Feb 2025 06:55:24 +0000
-Message-ID: <20250209065524.1942633-1-odd_?=mail@example.com>
+Date: Sat, 14 Mar 2026 13:37:03 +0000
+Message-ID: <20260314133704.434296-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -526803,8 +523511,8 @@
 From: =?UTF-8?q?=C6=91=C3=BC=C3=B1n=C3=AD=C4=99=C5=99=20=E2=82=AC=2E=20N=C3=A2=E1=B9=81=C3=A9?= <odd_?=mail@example.com>
 To: nobody@example.com
 Subject: [PATCH] =?UTF-8?q?test=20suppress-cc.self=20quoted-long=5Fnon=5Fa?= =?UTF-8?q?scii=5Fself=5Fsuppressed=20with=20name=20=C6=91=C3=BC=C3=B1n?= =?UTF-8?q?=C3=AD=C4=99=C5=99=20=E2=82=AC.=20N=C3=A2=E1=B9=81=C3=A9=20emai?= =?UTF-8?q?l=20odd=5F=3F=3Dmail@example.com?=
-Date: Sun,  9 Feb 2025 06:55:24 +0000
-Message-ID: <20250209065524.1943113-1-odd_?=mail@example.com>
+Date: Sat, 14 Mar 2026 13:37:04 +0000
+Message-ID: <20260314133704.434927-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -526832,8 +523540,8 @@
 From: "A U. Thor" <author@example.com>
 To: nobody@example.com
 Subject: [PATCH] test suppress-cc.self unquoted-self_name_sanitized_suppressed with name "A U. Thor" email author@example.com
-Date: Sun,  9 Feb 2025 06:55:24 +0000
-Message-ID: <20250209065524.1943464-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:05 +0000
+Message-ID: <20260314133705.435419-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526885,8 +523593,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065525.1944023-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:06 +0000
+Message-ID: <20260314133706.436085-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <my-message-id@example.com>
 References: <my-message-id@example.com>
@@ -526909,38 +523617,44 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink04-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 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@codethink03-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.48.0~rc1+next.20250101/t/trash directory.t9001-send-email/fake.sendmail -i to@example.com author@example.com one@example.com two@example.com committer@example.com
+From: second user <pbuilder2@codethink03-arm64.debian.net>
+To: to@example.com
+Cc: A <author@example.com>,
+	One <one@example.com>,
+	two@example.com,
+	C O Mitter <committer@example.com>
+Subject: [PATCH 1/1] Second.
+Date: Sat, 14 Mar 2026 13:37:06 +0000
+Message-ID: <20260314133706.436443-1-pbuilder2@codethink03-arm64.debian.net>
+X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
+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 &&
@@ -526982,8 +523696,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065525.1944581-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:07 +0000
+Message-ID: <20260314133707.436795-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527021,8 +523735,8 @@
 	C O Mitter <committer@example.com>,
 	cccmd@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065525.1944871-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:08 +0000
+Message-ID: <20260314133708.437110-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527058,8 +523772,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065525.1945161-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:08 +0000
+Message-ID: <20260314133708.437425-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 X-Debbugs-CC: dummy@example.com
@@ -527097,8 +523811,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065525.1945388-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:09 +0000
+Message-ID: <20260314133709.437799-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527137,8 +523851,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065525.1945714-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:09 +0000
+Message-ID: <20260314133709.438170-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 X-Debbugs-CC: someone@example.com
@@ -527225,8 +523939,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1946262-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:10 +0000
+Message-ID: <20260314133710.438880-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527259,8 +523973,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1946514-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:11 +0000
+Message-ID: <20260314133711.439140-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527292,8 +524006,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065526.1946726-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:10 +0000
+Message-ID: <20260314133711.439454-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527312,11 +524026,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1946726-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:11 +0000
+Message-ID: <20260314133711.439454-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065526.1946726-1-nobody@example.com>
-References: <20250209065526.1946726-1-nobody@example.com>
+In-Reply-To: <20260314133711.439454-1-nobody@example.com>
+References: <20260314133711.439454-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -527347,8 +524061,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1946929-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:12 +0000
+Message-ID: <20260314133712.439744-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527382,8 +524096,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1947189-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:12 +0000
+Message-ID: <20260314133712.439976-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -527419,8 +524133,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1947433-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:12 +0000
+Message-ID: <20260314133713.440277-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -527453,8 +524167,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065526.1947643-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:12 +0000
+Message-ID: <20260314133713.440445-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527473,11 +524187,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1947643-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:13 +0000
+Message-ID: <20260314133713.440445-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065526.1947643-1-nobody@example.com>
-References: <20250209065526.1947643-1-nobody@example.com>
+In-Reply-To: <20260314133713.440445-1-nobody@example.com>
+References: <20260314133713.440445-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -527508,8 +524222,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065526.1947993-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:12 +0000
+Message-ID: <20260314133713.440754-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -527528,11 +524242,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065526.1947993-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:13 +0000
+Message-ID: <20260314133713.440754-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065526.1947993-1-nobody@example.com>
-References: <20250209065526.1947993-1-nobody@example.com>
+In-Reply-To: <20260314133713.440754-1-nobody@example.com>
+References: <20260314133713.440754-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -527563,8 +524277,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:25 +0000
-Message-ID: <20250209065527.1948182-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:13 +0000
+Message-ID: <20260314133714.441037-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -527583,11 +524297,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065527.1948182-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:14 +0000
+Message-ID: <20260314133714.441037-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065527.1948182-1-nobody@example.com>
-References: <20250209065527.1948182-1-nobody@example.com>
+In-Reply-To: <20260314133714.441037-1-nobody@example.com>
+References: <20260314133714.441037-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
 
@@ -527694,8 +524408,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065527.1949529-2-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:17 +0000
+Message-ID: <20260314133716.442520-2-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 X-test-header: v1.0
@@ -527732,8 +524446,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065527.1949861-2-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:18 +0000
+Message-ID: <20260314133717.442890-2-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527748,8 +524462,8 @@
 Cc: A <author@example.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH] Second.
-Date: Sun,  9 Feb 2025 06:55:29 +0000
-Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1739084123.git.committer@example.com>
+Date: Sat, 14 Mar 2026 13:37:19 +0000
+Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1773495417.git.committer@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <format>
 References: <format>
@@ -527783,8 +524497,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:27 +0000
-Message-ID: <20250209065527.1950194-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:18 +0000
+Message-ID: <20260314133718.443419-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -527817,8 +524531,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:27 +0000
-Message-ID: <20250209065527.1950428-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:18 +0000
+Message-ID: <20260314133718.443702-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527851,8 +524565,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065528.1950673-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:19 +0000
+Message-ID: <20260314133719.443973-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -527885,8 +524599,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065528.1950936-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:19 +0000
+Message-ID: <20260314133719.444283-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -527920,8 +524634,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065528.1951147-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:19 +0000
+Message-ID: <20260314133719.444569-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527953,8 +524667,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065528.1951462-1-author@example.com>
+Date: Sat, 14 Mar 2026 13:37:20 +0000
+Message-ID: <20260314133720.444833-1-author@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <To Example <to@example.com>
 References: <To Example <to@example.com>
@@ -528001,8 +524715,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065528.1951756-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:18 +0000
+Message-ID: <20260314133720.445118-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -528023,12 +524737,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:27 +0000
-Message-ID: <20250209065528.1951756-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:19 +0000
+Message-ID: <20260314133720.445118-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065528.1951756-1-nobody@example.com>
+In-Reply-To: <20260314133720.445118-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250209065528.1951756-1-nobody@example.com>
+ <20260314133720.445118-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528046,12 +524760,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065528.1951756-3-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:20 +0000
+Message-ID: <20260314133720.445118-3-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065528.1951756-1-nobody@example.com>
+In-Reply-To: <20260314133720.445118-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250209065528.1951756-1-nobody@example.com>
+ <20260314133720.445118-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528094,8 +524808,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:26 +0000
-Message-ID: <20250209065528.1952126-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:19 +0000
+Message-ID: <20260314133721.445595-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -528116,12 +524830,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:27 +0000
-Message-ID: <20250209065528.1952126-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:20 +0000
+Message-ID: <20260314133721.445595-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065528.1952126-1-nobody@example.com>
+In-Reply-To: <20260314133721.445595-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250209065528.1952126-1-nobody@example.com>
+ <20260314133721.445595-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528139,13 +524853,13 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:28 +0000
-Message-ID: <20250209065528.1952126-3-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:21 +0000
+Message-ID: <20260314133721.445595-3-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065528.1952126-2-nobody@example.com>
+In-Reply-To: <20260314133721.445595-2-nobody@example.com>
 References: <unique-message-id@example.com>
- <20250209065528.1952126-1-nobody@example.com>
- <20250209065528.1952126-2-nobody@example.com>
+ <20260314133721.445595-1-nobody@example.com>
+ <20260314133721.445595-2-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528199,8 +524913,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun,  9 Feb 2025 06:55:29 +0000
-Message-ID: <20250209065529.1952740-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:22 +0000
+Message-ID: <20260314133723.446475-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528219,11 +524933,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:30 +0000
-Message-ID: <20250209065529.1952740-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:23 +0000
+Message-ID: <20260314133723.446475-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065529.1952740-1-nobody@example.com>
-References: <20250209065529.1952740-1-nobody@example.com>
+In-Reply-To: <20260314133723.446475-1-nobody@example.com>
+References: <20260314133723.446475-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528625,8 +525339,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Sun,  9 Feb 2025 06:55:29 +0000
-Message-ID: <20250209065530.1957162-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:30 +0000
+Message-ID: <20260314133731.452016-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528648,8 +525362,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Sun,  9 Feb 2025 06:55:29 +0000
-Message-ID: <20250209065530.1957162-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:30 +0000
+Message-ID: <20260314133731.452016-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528661,11 +525375,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Sun,  9 Feb 2025 06:55:30 +0000
-Message-ID: <20250209065530.1957162-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:31 +0000
+Message-ID: <20260314133731.452016-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065530.1957162-1-nobody@example.com>
-References: <20250209065530.1957162-1-nobody@example.com>
+In-Reply-To: <20260314133731.452016-1-nobody@example.com>
+References: <20260314133731.452016-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528676,11 +525390,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Sun,  9 Feb 2025 06:55:30 +0000
-Message-ID: <20250209065530.1957162-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:31 +0000
+Message-ID: <20260314133731.452016-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065530.1957162-1-nobody@example.com>
-References: <20250209065530.1957162-1-nobody@example.com>
+In-Reply-To: <20260314133731.452016-1-nobody@example.com>
+References: <20260314133731.452016-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528711,8 +525425,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:31 +0000
-Message-ID: <20250209065531.1957386-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:32 +0000
+Message-ID: <20260314133732.452365-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528745,8 +525459,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:31 +0000
-Message-ID: <20250209065531.1957625-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:32 +0000
+Message-ID: <20260314133732.452648-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528777,8 +525491,8 @@
 Cc: A <author@example.com>,
 	=?UTF-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <utf8@example.com>
 Subject: [PATCH] Second.
-Date: Sun,  9 Feb 2025 06:55:31 +0000
-Message-ID: <20250209065531.1958019-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:33 +0000
+Message-ID: <20260314133733.452953-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528808,8 +525522,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun,  9 Feb 2025 06:55:31 +0000
-Message-ID: <20250209065531.1958307-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:33 +0000
+Message-ID: <20260314133733.453237-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -528829,11 +525543,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065531.1958307-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:34 +0000
+Message-ID: <20260314133733.453237-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065531.1958307-1-nobody@example.com>
-References: <20250209065531.1958307-1-nobody@example.com>
+In-Reply-To: <20260314133733.453237-1-nobody@example.com>
+References: <20260314133733.453237-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528871,8 +525585,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun,  9 Feb 2025 06:55:31 +0000
-Message-ID: <20250209065531.1958636-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:34 +0000
+Message-ID: <20260314133734.453643-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -528892,11 +525606,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065531.1958636-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:35 +0000
+Message-ID: <20260314133734.453643-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065531.1958636-1-nobody@example.com>
-References: <20250209065531.1958636-1-nobody@example.com>
+In-Reply-To: <20260314133734.453643-1-nobody@example.com>
+References: <20260314133734.453643-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528923,8 +525637,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Sun,  9 Feb 2025 06:55:31 +0000
-Message-ID: <20250209065531.1958902-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:35 +0000
+Message-ID: <20260314133735.454110-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -528944,11 +525658,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065531.1958902-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:36 +0000
+Message-ID: <20260314133735.454110-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065531.1958902-1-nobody@example.com>
-References: <20250209065531.1958902-1-nobody@example.com>
+In-Reply-To: <20260314133735.454110-1-nobody@example.com>
+References: <20260314133735.454110-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528986,8 +525700,8 @@
 To: nobody@example.com
 Cc: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?= <odd_?=mail@example.com>
 Subject: [PATCH] weird_author
-Date: Sun,  9 Feb 2025 06:55:31 +0000
-Message-ID: <20250209065531.1959303-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:35 +0000
+Message-ID: <20260314133735.454610-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -529028,8 +525742,8 @@
 To: nobody@example.com
 Cc: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?= <odd_?=mail@example.com>
 Subject: [PATCH] weird_sender
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065532.1959692-1-odd_?=mail@example.com>
+Date: Sat, 14 Mar 2026 13:37:36 +0000
+Message-ID: <20260314133736.455055-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -529122,8 +525836,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065532.1960399-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:37 +0000
+Message-ID: <20260314133738.455954-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -529143,11 +525857,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:33 +0000
-Message-ID: <20250209065532.1960399-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:38 +0000
+Message-ID: <20260314133738.455954-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065532.1960399-1-nobody@example.com>
-References: <20250209065532.1960399-1-nobody@example.com>
+In-Reply-To: <20260314133738.455954-1-nobody@example.com>
+References: <20260314133738.455954-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529178,8 +525892,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065532.1960747-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:38 +0000
+Message-ID: <20260314133738.456300-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -529199,11 +525913,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:33 +0000
-Message-ID: <20250209065532.1960747-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:39 +0000
+Message-ID: <20260314133738.456300-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065532.1960747-1-nobody@example.com>
-References: <20250209065532.1960747-1-nobody@example.com>
+In-Reply-To: <20260314133738.456300-1-nobody@example.com>
+References: <20260314133738.456300-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529235,8 +525949,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065532.1961042-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:39 +0000
+Message-ID: <20260314133739.456757-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -529256,11 +525970,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:33 +0000
-Message-ID: <20250209065532.1961042-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:40 +0000
+Message-ID: <20260314133739.456757-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065532.1961042-1-nobody@example.com>
-References: <20250209065532.1961042-1-nobody@example.com>
+In-Reply-To: <20260314133739.456757-1-nobody@example.com>
+References: <20260314133739.456757-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529288,8 +526002,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?iso-8859-2?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Sun,  9 Feb 2025 06:55:32 +0000
-Message-ID: <20250209065533.1961314-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:40 +0000
+Message-ID: <20260314133740.457345-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -529309,11 +526023,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun,  9 Feb 2025 06:55:33 +0000
-Message-ID: <20250209065533.1961314-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:37:41 +0000
+Message-ID: <20260314133740.457345-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065533.1961314-1-nobody@example.com>
-References: <20250209065533.1961314-1-nobody@example.com>
+In-Reply-To: <20260314133740.457345-1-nobody@example.com>
+References: <20260314133740.457345-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529386,7 +526100,7 @@
 		$patches $patches >stdout &&
 	grep "In-Reply-To: " stdout
 
-In-Reply-To: <20250209065533.1962425-1-nobody@example.com>
+In-Reply-To: <20260314133742.458774-1-nobody@example.com>
 ok 110 - threading but no chain-reply-to
 
 expecting success of 9001.111 'override in-reply-to if no threading': 
@@ -530474,6 +527188,7 @@
 	>actual-list &&
 	test_cmp expected-list actual-list
 
+./test-lib.sh: line 1024: 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': 
@@ -530622,7 +527337,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/iD1hecRbWF/0001-add-main.patch
+/tmp/osXXmcs2YR/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
@@ -530631,8 +527346,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:49 +0000
-Message-ID: <20250209065549.1983811-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:28 +0000
+Message-ID: <20260314133828.489350-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -530649,7 +527364,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/5k7ydievwv/0001-add-main.patch
+/tmp/gU7ytjwe2F/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
@@ -530658,8 +527373,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:49 +0000
-Message-ID: <20250209065549.1983983-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:29 +0000
+Message-ID: <20260314133829.489725-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -530676,7 +527391,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/WXG6qZpQOO/0001-add-main.patch
+/tmp/LIh6YF7PmE/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
@@ -530685,8 +527400,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:49 +0000
-Message-ID: <20250209065549.1984314-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:29 +0000
+Message-ID: <20260314133829.490088-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -530735,7 +527450,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Sun,  9 Feb 2025 06:55:48 +0000
+Date: Sat, 14 Mar 2026 13:38:29 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <replied.to@example.com>
@@ -530752,7 +527467,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Sun,  9 Feb 2025 06:55:49 +0000
+Date: Sat, 14 Mar 2026 13:38:30 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
@@ -530786,7 +527501,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Sun,  9 Feb 2025 06:55:49 +0000
+Date: Sat, 14 Mar 2026 13:38:29 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <cmdline.reply@example.com>
@@ -530803,7 +527518,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Sun,  9 Feb 2025 06:55:50 +0000
+Date: Sat, 14 Mar 2026 13:38:30 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 In-Reply-To: <cmdline.reply@example.com>
@@ -530865,8 +527580,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:51 +0000
-Message-ID: <20250209065550.1985359-2-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:32 +0000
+Message-ID: <20260314133831.491397-2-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -530896,10 +527611,10 @@
 		--validate -3 --cover-letter --force &&
 	test_cmp expect my-hooks.log
 
-/tmp/XtTRiLFWzq/0000-cover-letter.patch
-/tmp/XtTRiLFWzq/0001-Initial.patch
-/tmp/XtTRiLFWzq/0002-Second.patch
-/tmp/XtTRiLFWzq/0003-add-main.patch
+/tmp/7ZpbXXOyXg/0000-cover-letter.patch
+/tmp/7ZpbXXOyXg/0001-Initial.patch
+/tmp/7ZpbXXOyXg/0002-Second.patch
+/tmp/7ZpbXXOyXg/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.48.0~rc1+next.20250101/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com committer@example.com other@ex.com
@@ -530908,8 +527623,8 @@
 Cc: Somebody <somebody@ex.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 0/3] *** SUBJECT HERE ***
-Date: Sun,  9 Feb 2025 06:55:51 +0000
-Message-ID: <20250209065550.1985886-5-from@example.com>
+Date: Sat, 14 Mar 2026 13:38:33 +0000
+Message-ID: <20260314133832.492339-5-from@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -530923,11 +527638,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 1/3] Initial.
-Date: Sun,  9 Feb 2025 06:55:52 +0000
-Message-ID: <20250209065550.1985886-6-from@example.com>
+Date: Sat, 14 Mar 2026 13:38:34 +0000
+Message-ID: <20260314133832.492339-6-from@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065550.1985886-5-from@example.com>
-References: <20250209065550.1985886-5-from@example.com>
+In-Reply-To: <20260314133832.492339-5-from@example.com>
+References: <20260314133832.492339-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -530940,11 +527655,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 2/3] Second.
-Date: Sun,  9 Feb 2025 06:55:53 +0000
-Message-ID: <20250209065550.1985886-7-from@example.com>
+Date: Sat, 14 Mar 2026 13:38:35 +0000
+Message-ID: <20260314133832.492339-7-from@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065550.1985886-5-from@example.com>
-References: <20250209065550.1985886-5-from@example.com>
+In-Reply-To: <20260314133832.492339-5-from@example.com>
+References: <20260314133832.492339-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -530957,11 +527672,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH 3/3] add main
-Date: Sun,  9 Feb 2025 06:55:54 +0000
-Message-ID: <20250209065550.1985886-8-from@example.com>
+Date: Sat, 14 Mar 2026 13:38:36 +0000
+Message-ID: <20260314133832.492339-8-from@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065550.1985886-5-from@example.com>
-References: <20250209065550.1985886-5-from@example.com>
+In-Reply-To: <20260314133832.492339-5-from@example.com>
+References: <20260314133832.492339-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -530982,8 +527697,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:50 +0000
-Message-ID: <20250209065550.1986376-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:33 +0000
+Message-ID: <20260314133833.493108-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531005,8 +527720,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:50 +0000
-Message-ID: <20250209065550.1986376-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:33 +0000
+Message-ID: <20260314133833.493108-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531042,7 +527757,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/IScL6Df9Vw/0001-add-main.patch
+/tmp/k54aDP5opv/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.48.0~rc1+next.20250101/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -531051,8 +527766,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:51 +0000
-Message-ID: <20250209065551.1987070-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:34 +0000
+Message-ID: <20260314133834.494016-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531069,7 +527784,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/GMgwqz87ej/0001-add-main.patch
+/tmp/xEhEPnWn4u/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.48.0~rc1+next.20250101/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -531078,8 +527793,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:51 +0000
-Message-ID: <20250209065551.1987297-1-nobody@example.com>
+Date: Sat, 14 Mar 2026 13:38:35 +0000
+Message-ID: <20260314133835.494327-1-nobody@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531101,7 +527816,7 @@
 		HEAD^ &&
 	grep "From: edited-from@example.com" msgtxt1
 
-/tmp/VtRe2qiCOQ/0001-add-main.patch
+/tmp/Y2dH5LVBOQ/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:
@@ -531111,8 +527826,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:51 +0000
-Message-ID: <20250209065551.1987562-1-edited-from@example.com>
+Date: Sat, 14 Mar 2026 13:38:36 +0000
+Message-ID: <20260314133836.494741-1-edited-from@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531146,7 +527861,7 @@
 	grep -A1 "^To:" msgtxt2 >msgtxt2.to &&
 	test_cmp expect msgtxt2.to
 
-/tmp/wimeOy3Jb_/0001-add-main.patch
+/tmp/6WAzX42bOC/0001-add-main.patch
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com edited-to@example.com somebody@ex.com
 From: Example <from@example.com>
@@ -531154,8 +527869,8 @@
 	edited-to@example.com
 Cc: Somebody <somebody@ex.com>
 Subject: 
-Date: Sun,  9 Feb 2025 06:55:51 +0000
-Message-ID: <20250209065551.1987871-1-from@example.com>
+Date: Sat, 14 Mar 2026 13:38:36 +0000
+Message-ID: <20260314133836.495218-1-from@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531170,11 +527885,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun,  9 Feb 2025 06:55:52 +0000
-Message-ID: <20250209065551.1987871-2-from@example.com>
+Date: Sat, 14 Mar 2026 13:38:37 +0000
+Message-ID: <20260314133836.495218-2-from@example.com>
 X-Mailer: git-send-email 2.48.0.rc1.219.gb6b6757d772
-In-Reply-To: <20250209065551.1987871-1-from@example.com>
-References: <20250209065551.1987871-1-from@example.com>
+In-Reply-To: <20260314133836.495218-1-from@example.com>
+References: <20260314133836.495218-1-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -531185,1244 +527900,6 @@
 1..215
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9150-svk-mergetickets.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9150-svk-mergetickets/.git/
-expecting success of 9150.1 'load svk depot': 
-	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9150-svk-mergetickets/svnrepo' 	  < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9153-git-svn-rewrite-uuid.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9153-git-svn-rewrite-uuid/.git/
-expecting success of 9153.1 'load svn repo': 
-	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9153/svn.dump' &&
-	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = 6a7c0fe96ca6537577546e15b7b9f2a4a3d9ecf9 (refs/remotes/git-svn)
-	M	foo
-r2 = 8964a4f164c2b502d3833ed245b7335b9a51b996 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
-ok 1 - load svn repo
-
-expecting success of 9153.2 'verify uuid': 
-	git cat-file commit refs/remotes/git-svn~0 >actual &&
-	grep '^git-svn-id: .*@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual &&
-	git cat-file commit refs/remotes/git-svn~1 >actual &&
-	grep '^git-svn-id: .*@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual
-	
-git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-git-svn-id: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-ok 2 - verify uuid
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9152-svn-empty-dirs-after-gc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9152-svn-empty-dirs-after-gc/.git/
-expecting success of 9152.1 'initialize repo': 
-	for i in a b c d d/e d/e/f "weird file name"
-	do
-		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
-	done
-
-Committing transaction...
-Committed revision 1.
-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 - initialize repo
-
-expecting success of 9152.2 'clone': git svn clone "$svnrepo" cloned
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
-W: +empty_dir: a
-r1 = e99f1b3a131f71c8c2d41ee6b75d69734f095084 (refs/remotes/git-svn)
-W: +empty_dir: b
-r2 = 96e2d08f51b1857f3277242576416eea49216cc3 (refs/remotes/git-svn)
-W: +empty_dir: c
-r3 = 66f192df0aa8ef3fb9779bc087217d1ee400cd44 (refs/remotes/git-svn)
-W: +empty_dir: d
-r4 = ac2474312d3481df7e38341c70bd446839631b3f (refs/remotes/git-svn)
-W: +empty_dir: d/e
-r5 = 5393c348f2bcc95bafb6400f983336d90d290f9d (refs/remotes/git-svn)
-W: +empty_dir: d/e/f
-r6 = 9e6dee3e51517b34354812e933349e858604d03b (refs/remotes/git-svn)
-W: +empty_dir: weird file name
-r7 = d17bfa8c9b34faf64ef4822e7db660cf985cd78e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9152-svn-empty-dirs-after-gc/svnrepo r7
-creating empty directory: a
-creating empty directory: b
-creating empty directory: c
-creating empty directory: d
-creating empty directory: d/e
-creating empty directory: d/e/f
-creating empty directory: weird file name
-ok 2 - clone
-
-expecting success of 9152.3 'git svn gc runs': 
-	(
-		cd cloned &&
-		git svn gc
-	)
-
-ok 3 - git svn gc runs
-
-expecting success of 9152.4 'git svn mkdirs recreates empty directories after git svn gc': 
-	(
-		cd cloned &&
-		rm -r * &&
-		git svn mkdirs &&
-		for i in a b c d d/e d/e/f "weird file name"
-		do
-			if ! test -d "$i"
-			then
-				echo >&2 "$i does not exist" &&
-				exit 1
-			fi
-		done
-	)
-
-creating empty directory: a
-creating empty directory: b
-creating empty directory: c
-creating empty directory: d
-creating empty directory: d/e
-creating empty directory: d/e/f
-creating empty directory: weird file name
-ok 4 - git svn mkdirs recreates empty directories after git svn gc
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9156-git-svn-fetch-deleted-tag-2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/git_project/.git/
-	A	subdir1/file
-	A	subdir2/file
-	A	subdir3/file
-r1 = 5fa27c69f98dbb42c73c191997dba1418c786272 (refs/remotes/origin/trunk)
-	M	subdir1/file
-	M	subdir2/file
-	M	subdir3/file
-r2 = 343740658ad37d7e5bd5d2e741b21a5d87624082 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 5bdc85bc248bbbdcf6913ed1fe74bf6961ba41ea (refs/remotes/origin/tags/mytag@2)
-	M	file
-r2 = 124317ec9a1e4e2eb9839d98332923ec4d62443e (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag) 124317ec9a1e4e2eb9839d98332923ec4d62443e
-Following parent with do_switch
-Successfully followed parent
-r3 = 8efa66b90ede4f70e2705245987b1bba3b8f610e (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 4188eb19a00a4cd4315143ab2e0472143cb58027 (refs/remotes/origin/tags/mytag@2-)
-	M	file
-r2 = 0ad5b358bb2e177fd6742a5af4a570691d02f5c2 (refs/remotes/origin/tags/mytag@2-)
-Found branch parent: (refs/remotes/origin/tags/mytag) 0ad5b358bb2e177fd6742a5af4a570691d02f5c2
-Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
-rereading 0ad5b358bb2e177fd6742a5af4a570691d02f5c2
-Following parent with do_switch
-Successfully followed parent
-r5 = 657d9c8649595c789e56f8a0d30480898b8ad7c7 (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 0093a092fb6d7dffc5cbb90abd9ed102225865e0 (refs/remotes/origin/tags/mytag@2--)
-	M	file
-r2 = f9ec0930fbf2ac0307975a8026a114e0423ef94c (refs/remotes/origin/tags/mytag@2--)
-Found branch parent: (refs/remotes/origin/tags/mytag) f9ec0930fbf2ac0307975a8026a114e0423ef94c
-Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
-rereading f9ec0930fbf2ac0307975a8026a114e0423ef94c
-Following parent with do_switch
-Successfully followed parent
-r7 = c6769e6065d4a56379592f90fa37a3ad7e0997a9 (refs/remotes/origin/tags/mytag)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9155-git-svn-fetch-deleted-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
-	A	subdir/file
-r1 = a55cc9e907c4be2a898168a409542df4a3ac2b1a (refs/remotes/origin/trunk)
-r2 = b89cd4792cab44193475f8796e3b9b292025b7ce (refs/remotes/origin/mybranch)
-	A	trunk/subdir/file
-r3 = 3b2f5019949be48a4822e68c524f9bbcc8ff4fb5 (refs/remotes/origin/mybranch)
-	M	subdir/file
-r4 = 8b28c4bde3f68dddb45b2c8439b51f7de8bd263d (refs/remotes/origin/trunk)
-	M	trunk/subdir/file
-r5 = 35bad9343e66d914d629e5aee2f69a1f5071e653 (refs/remotes/origin/mybranch)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
-Initializing parent: refs/remotes/origin/tags/mytag@5
-	A	file
-r1 = 5ab7eca41b5e8f25b41765cb0287aebc682e6707 (refs/remotes/origin/tags/mytag@5)
-	M	file
-r4 = 54365b9dde31bb53d2858681bd66e46b3d5bbf5c (refs/remotes/origin/tags/mytag@5)
-Found branch parent: (refs/remotes/origin/tags/mytag) 54365b9dde31bb53d2858681bd66e46b3d5bbf5c
-Following parent with do_switch
-Successfully followed parent
-r6 = ff7777963d3386bd88c44775ca42485c83d7a706 (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 5ab7eca41b5e8f25b41765cb0287aebc682e6707 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag@5-) 5ab7eca41b5e8f25b41765cb0287aebc682e6707
-Following parent with do_switch
-Successfully followed parent
-r3 = d32083557df55da7b02eb5fbe11bee1b7044f050 (refs/remotes/origin/tags/mytag@5-)
-	M	file
-r5 = b199b1c0e671009f3568ee10197c181ed063f7f4 (refs/remotes/origin/tags/mytag@5-)
-Found branch parent: (refs/remotes/origin/tags/mytag) b199b1c0e671009f3568ee10197c181ed063f7f4
-Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
-rereading b199b1c0e671009f3568ee10197c181ed063f7f4
-Following parent with do_switch
-Successfully followed parent
-r8 = 22540cb2bd3ce3a2530fce6c0ea999c6285065bc (refs/remotes/origin/tags/mytag)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9148-git-svn-propset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9148-git-svn-propset/.git/
-expecting success of 9148.1 'setup propset via import': 
-	test_when_finished "rm -rf import" &&
-
-	foo_subdir2="subdir/subdir2/foo_subdir2" &&
-	mkdir -p import/subdir/subdir2 &&
-	(
-		cd import &&
-		# for "add props top level"
-		>foo &&
-		# for "add props relative"
-		>subdir/foo_subdir &&
-		# for "add props subdir"
-		>"$foo_subdir2" &&
-		svn_cmd import -m "import for git svn" . "$svnrepo"
-	)
-
-Adding         foo
-Adding         subdir
-Adding         subdir/foo_subdir
-Adding         subdir/subdir2
-Adding         subdir/subdir2/foo_subdir2
-Committing transaction...
-Committed revision 1.
-ok 1 - setup propset via import
-
-expecting success of 9148.2 'initialize git svn': 
-	git svn init "$svnrepo"
-	
-ok 2 - initialize git svn
-
-expecting success of 9148.3 'fetch revisions from svn': 
-	git svn fetch
-	
-	A	foo
-	A	subdir/foo_subdir
-	A	subdir/subdir2/foo_subdir2
-r1 = 8812aee8af9f2ab5a3e82d23ae3d8bda58de6977 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo r1
-ok 3 - fetch revisions from svn
-
-expecting success of 9148.4 'add props top level': 
-	set_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
-	rm -rf svn_project
-	
-[master 874b045] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	foo
-Committed r2
-	M	foo
-r2 = 958977474ee87d237acd9c55889fae07bf674123 (refs/remotes/git-svn)
-No changes between 874b045a66985e7a96ca4863c4d784d09aafcdd3 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 2.
-ok 4 - add props top level
-
-expecting success of 9148.5 'add multiple props': 
-	set_props "." "foo" \
-		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "." "foo" \
-		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
-	rm -rf svn_project
-	
-[master 772726d] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	foo
-Committed r3
-	M	foo
-r3 = cb7adf94f3fc79e8dfe3ae079c386de8162a2ba6 (refs/remotes/git-svn)
-No changes between 772726dc79e8340a466c5f7c7035faab74003ac6 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 3.
-ok 5 - add multiple props
-
-expecting success of 9148.6 'add props subdir': 
-	set_props "." "$foo_subdir2" svn:keywords "FreeBSD=%H" &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
-	rm -rf svn_project
-	
-[master 9beaa93] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	subdir/subdir2/foo_subdir2
-Committed r4
-	M	subdir/subdir2/foo_subdir2
-r4 = 2ffd09be98049c9fd72f64d128c9493aba685193 (refs/remotes/git-svn)
-No changes between 9beaa9347f012d15126708dacf4cde559cc45513 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 4.
-ok 6 - add props subdir
-
-expecting success of 9148.7 'add props relative': 
-	set_props "subdir/subdir2" "../foo_subdir" \
-		svn:keywords "FreeBSD=%H" &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "subdir/subdir2" "../foo_subdir" \
-		svn:keywords "FreeBSD=%H" &&
-	rm -rf svn_project
-	
-[master baca093] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	subdir/foo_subdir
-Committed r5
-	M	subdir/foo_subdir
-r5 = c78c7b8b8f8182cd5d48dbbd2f14d7e7558a342b (refs/remotes/git-svn)
-No changes between baca09339f6ff544feb3c1ed71a67aac1921cb2a and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 5.
-ok 7 - add props relative
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9157-git-svn-fetch-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9157-git-svn-fetch-merge/.git/
-expecting success of 9157.1 'initialize source svn repo': 
-	svn_cmd mkdir -m x "$svnrepo"/trunk &&
-	svn_cmd mkdir -m x "$svnrepo"/branches &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn add foo &&
-		svn commit -m "initial commit" &&
-		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
-		touch bar &&
-		svn add bar &&
-		svn commit -m x &&
-		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 &&
-		svn switch "$svnrepo"/branches/branch1 &&
-		touch baz &&
-		svn add baz &&
-		svn commit -m x &&
-		svn switch "$svnrepo"/trunk &&
-		svn merge "$svnrepo"/branches/branch1 &&
-		svn commit -m "merge" &&
-		svn switch "$svnrepo"/branches/branch1 &&
-		svn commit -m x &&
-		svn switch "$svnrepo"/branches/branch2 &&
-		svn merge "$svnrepo"/branches/branch1 &&
-		svn commit -m "merge branch1" &&
-		svn switch "$svnrepo"/trunk &&
-		svn merge "$svnrepo"/branches/branch2 &&
-		svn resolved baz &&
-		svn commit -m "merge branch2"
-	) &&
-	rm -rf "$SVN_TREE"
-
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Checked out revision 2.
-A         foo
-Adding         foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Committing transaction...
-Committed revision 4.
-A         bar
-Adding         bar
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Committing transaction...
-Committed revision 6.
-D    bar
-Updated to revision 6.
-A         baz
-Adding         baz
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-D    baz
-A    bar
-Updated to revision 7.
---- Merging r4 through r7 into '.':
-A    baz
---- Recording mergeinfo for merge of r4 through r7 into '.':
- U   .
-Sending        .
-Adding         baz
-Committing transaction...
-Committed revision 8.
-D    bar
- U   .
-Updated to revision 8.
-D    baz
-A    bar
-Updated to revision 8.
---- Merging r4 through r8 into '.':
-A    baz
---- Recording mergeinfo for merge of r4 through r8 into '.':
- U   .
-Sending        .
-Adding         baz
-Committing transaction...
-Committed revision 9.
- U   .
-Updated to revision 9.
---- Merging r6 through r9 into '.':
-   C baz
- G   .
---- Recording mergeinfo for merge of r6 through r9 into '.':
- G   .
-Searching tree conflict details for 'baz' in repository:
- done
-Summary of conflicts:
-  Tree conflicts: 1
-Resolved conflicted state of 'baz'
-Sending        .
-Committing transaction...
-Committed revision 10.
-ok 1 - initialize source svn repo
-
-expecting success of 9157.2 'clone svn repo': 
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-
-r1 = d9bb7959e5caa12ffb8a75d6221279aa4dd96c4b (refs/remotes/origin/trunk)
-	A	foo
-r3 = cec2c79fa30adbdf7c8139699152ac5009154535 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) cec2c79fa30adbdf7c8139699152ac5009154535
-Following parent with do_switch
-Successfully followed parent
-r4 = 48be15b70486ad611c6d8bff36c11641573a771d (refs/remotes/origin/branch1)
-	A	bar
-r5 = 973134a1a6e8310358173a43c2ae1dfebac9a883 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 973134a1a6e8310358173a43c2ae1dfebac9a883
-Following parent with do_switch
-Successfully followed parent
-r6 = b4834e71961b90efc95e9a2e19d40cbfb4673030 (refs/remotes/origin/branch2)
-	A	baz
-r7 = 69ece99bab8700cbcefa15380bd50a92fcdc48b4 (refs/remotes/origin/branch1)
-	A	baz
-Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-7): 69ece99bab8700cbcefa15380bd50a92fcdc48b4
-r8 = 6bdc3e0e1b8d84a69d45ac8147072b0f726bd5ed (refs/remotes/origin/trunk)
-	A	baz
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-8): 69ece99bab8700cbcefa15380bd50a92fcdc48b4
-r9 = 4fb2ccfff8b9849ae01297dbbca4f0751ad19418 (refs/remotes/origin/branch2)
-Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch2:6-9): 4fb2ccfff8b9849ae01297dbbca4f0751ad19418
-r10 = c8b58bbf0609845877eba452c13956595d3406e4 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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
-4fb2ccfff8b9849ae01297dbbca4f0751ad19418
-ok 3 - verify merge commit
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9158-git-svn-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = bd2495bc54523b76d6fd2cd511eacc9700754dff (refs/remotes/git-svn)
-	A	foo
-r2 = 64f4cc2a6f7dbd58dbc656b262150541c379f416 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 d871ffd] 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
-r3 = 9779abcee28c96f2d0d2be717edbcf4f7f273635 (refs/remotes/git-svn)
-No changes between d871ffd0cb1db1ebff4f623aaf917f4d3c3a2c9f 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 d3c51d5] 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
-Couldn't find revmap for file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
-r4 = 86f5b3bd7e9b16b228e7d316c8b9e57d1daa498b (refs/remotes/git-svn)
-No changes between d3c51d5649d605468dbdcba5f70c2a11ec6868e8 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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9147-git-svn-include-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9147-git-svn-include-paths/.git/
-expecting success of 9147.1 'setup test repository': 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		mkdir qqq www xxx &&
-		echo test_qqq > qqq/test_qqq.txt &&
-		echo test_www > www/test_www.txt &&
-		echo test_xxx > xxx/test_xxx.txt &&
-		svn_cmd add qqq &&
-		svn_cmd add www &&
-		svn_cmd add xxx &&
-		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
-A         xxx
-A         xxx/test_xxx.txt
-Adding         qqq
-Adding         qqq/test_qqq.txt
-Adding         www
-Adding         www/test_www.txt
-Adding         xxx
-Adding         xxx/test_xxx.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 9147.2 'clone an SVN repository with filter to include qqq directory': 
-	git svn clone --include-paths="qqq" "$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.48.0~rc1+next.20250101/t/trash directory.t9147-git-svn-include-paths/g/.git/
-	A	qqq/test_qqq.txt
-r1 = 4c94929051d721fbb7db55a21ccf0d29cd2f5e37 (refs/remotes/git-svn)
-r2 = 1a9c5ede1bd9e797dfa32ebd182b9175544cf7e3 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
-ok 2 - clone an SVN repository with filter to include qqq directory
-
-expecting success of 9147.3 'init+fetch an SVN repository with included qqq directory': 
-	git svn init "$svnrepo" c &&
-	( cd c && git svn fetch --include-paths="qqq" ) &&
-	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.48.0~rc1+next.20250101/t/trash directory.t9147-git-svn-include-paths/c/.git/
-	A	qqq/test_qqq.txt
-r1 = 4c94929051d721fbb7db55a21ccf0d29cd2f5e37 (refs/remotes/git-svn)
-r2 = 1a9c5ede1bd9e797dfa32ebd182b9175544cf7e3 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
-ok 3 - init+fetch an SVN repository with included qqq directory
-
-expecting success of 9147.4 'verify include-paths config saved by clone': 
-	(
-	    cd g &&
-	    git config --get svn-remote.svn.include-paths | grep qqq
-	)
-
-qqq
-ok 4 - verify include-paths config saved by clone
-
-expecting success of 9147.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 9147.6 'update git svn-cloned repo (config include)': 
-	(
-		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 = 14bd85c5998979ecc3dccf06e96085e983525eec (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 6 - update git svn-cloned repo (config include)
-
-expecting success of 9147.7 'update git svn-cloned repo (option include)': 
-	(
-		cd c &&
-		git svn rebase --include-paths="qqq" &&
-		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 = 14bd85c5998979ecc3dccf06e96085e983525eec (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 7 - update git svn-cloned repo (option include)
-
-expecting success of 9147.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 "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 9147.9 'update git svn-cloned repo (config include)': 
-	(
-		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 = 8cf36761ae4fcb55f5b5aa45500c053c1c9f5ec1 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 9 - update git svn-cloned repo (config include)
-
-expecting success of 9147.10 'update git svn-cloned repo (option include)': 
-	(
-		cd c &&
-		git svn rebase --include-paths="qqq" &&
-		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 = 8cf36761ae4fcb55f5b5aa45500c053c1c9f5ec1 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 10 - update git svn-cloned repo (option include)
-
-expecting success of 9147.11 'SVN-side change in and out of included qqq': 
-	(
-		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 included qqq
-
-expecting success of 9147.12 'update git svn-cloned repo again (config include)': 
-	(
-		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 = 4d19b299638a50db8072e88df1cd3ef1221296e5 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 12 - update git svn-cloned repo again (config include)
-
-expecting success of 9147.13 'update git svn-cloned repo again (option include)': 
-	(
-		cd c &&
-		git svn rebase --include-paths="qqq" &&
-		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 = 4d19b299638a50db8072e88df1cd3ef1221296e5 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 13 - update git svn-cloned repo again (option include)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9154-git-svn-fancy-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9154-git-svn-fancy-glob/.git/
-expecting success of 9154.1 'load svn repo': 
-	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9154/svn.dump' &&
-	git svn init --minimize-url -T trunk 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585 (refs/remotes/origin/trunk)
-	M	foo
-r6 = 0c79739614abf660245e8a3d463571dd23e2965f (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk r6
-ok 1 - load svn repo
-
-expecting success of 9154.2 'add red branch': 
-	git config svn-remote.svn.branches 'branches/{red}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	test_must_fail git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/red, 1
-Found branch parent: (refs/remotes/red) 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585
-Following parent with do_switch
-Successfully followed parent
-r2 = d047f9f553906432c5c26f50de89ca7592f87232 (refs/remotes/red)
-	M	foo
-r3 = 772a02a47b350d977cd6f784bb6dc2fd8d5023fe (refs/remotes/red)
-772a02a47b350d977cd6f784bb6dc2fd8d5023fe
-fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/green
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 2 - add red branch
-
-expecting success of 9154.3 'add gre branch': 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/{red,gre}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	test_must_fail git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-772a02a47b350d977cd6f784bb6dc2fd8d5023fe
-fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/green
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 3 - add gre branch
-
-expecting success of 9154.4 'add green branch': 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/green, 1
-Found branch parent: (refs/remotes/green) 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585
-Following parent with do_switch
-Successfully followed parent
-r2 = 4042c20c1e5b6f101d33acdf3f16bea6986c2cae (refs/remotes/green)
-	M	foo
-r4 = 9116bf27446303b83746ab6557df3e0e5fc179de (refs/remotes/green)
-772a02a47b350d977cd6f784bb6dc2fd8d5023fe
-9116bf27446303b83746ab6557df3e0e5fc179de
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 4 - add green branch
-
-expecting success of 9154.5 'add all branches': 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	git rev-parse refs/remotes/green &&
-	git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/blue, 1
-Found branch parent: (refs/remotes/blue) 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585
-Following parent with do_switch
-Successfully followed parent
-r2 = 5e0e7aea4b77317d8fec237a1303db83ce2ce0d4 (refs/remotes/blue)
-	M	foo
-r5 = 9a9d7d4b2d9e878f95e46bff6c0c9dc90333514b (refs/remotes/blue)
-772a02a47b350d977cd6f784bb6dc2fd8d5023fe
-9116bf27446303b83746ab6557df3e0e5fc179de
-9a9d7d4b2d9e878f95e46bff6c0c9dc90333514b
-ok 5 - add all branches
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9159-git-svn-no-parent-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 9a8641de3891310171490ef40f6e58c8df23af1a (refs/remotes/origin/trunk)
-	M	file.txt
-r2 = b20114ea05d911073e69590c096adb895eed768a (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 9a8641de3891310171490ef40f6e58c8df23af1a
-Following parent with do_switch
-Successfully followed parent
-r3 = 1c56bae208c9ce78a5dfc38cf6d35ca84fda7d32 (refs/remotes/origin/a)
-Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
-Found merge parent (/trunk:1-2): b20114ea05d911073e69590c096adb895eed768a
-r4 = 309880d293a34b1ebb04392240d4fa4db1a89168 (refs/remotes/origin/a)
-	A	file2.txt
-r5 = 2c8592f70a5f94fef77f9b789727a2653476d899 (refs/remotes/origin/b)
-	M	file2.txt
-r6 = b6eed42dff98c45a0b07f260f137084ac72c69f9 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
-Found branch parent: (refs/remotes/origin/c) 2c8592f70a5f94fef77f9b789727a2653476d899
-Following parent with do_switch
-Successfully followed parent
-r7 = 3c909b0c9c5bd738a8a0841283a5b60cc87cebfa (refs/remotes/origin/c)
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/b:5-6): b6eed42dff98c45a0b07f260f137084ac72c69f9
-r8 = 063e9af8394db89579f2fa2719275344eb83485a (refs/remotes/origin/c)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9167-git-svn-cmd-branch-subproject.sh ***
-skipping test t9167 altogether
-1..0 # SKIP skip all tests in t9167
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9104-git-svn-follow-parent.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9104-git-svn-follow-parent/.git/
 expecting success of 9104.1 'initialize repo': 
@@ -532484,14 +527961,14 @@
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
 Initializing parent: refs/remotes/thunk@2
 	A	readme
-r1 = 955da43d960ba9e50dafbbc152413f2814c287ad (refs/remotes/thunk@2)
+r1 = 0c369ff8312c7329a27972fb1c3cd03a5807aadf (refs/remotes/thunk@2)
 	M	readme
-r2 = 7013a1fdf45b8ea53fde431cdaa48da6549fed82 (refs/remotes/thunk@2)
-Found branch parent: (refs/remotes/thunk) 7013a1fdf45b8ea53fde431cdaa48da6549fed82
+r2 = 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2 (refs/remotes/thunk@2)
+Found branch parent: (refs/remotes/thunk) 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 5d3f8d4c16e0f5b2ae1f1624f7261a1541339759 (refs/remotes/thunk)
+r3 = 4ed0410157eec1261639ce264736e17d3b08ebb7 (refs/remotes/thunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk r3
 ok 2 - init and fetch a moved directory
@@ -532509,15 +527986,15 @@
 	test "$(sed -n -e "3p" actual)" = goodbye
 
 	A	readme
-r1 = 955da43d960ba9e50dafbbc152413f2814c287ad (refs/remotes/svn/trunk)
+r1 = 0c369ff8312c7329a27972fb1c3cd03a5807aadf (refs/remotes/svn/trunk)
 	M	readme
-r2 = 7013a1fdf45b8ea53fde431cdaa48da6549fed82 (refs/remotes/svn/trunk)
+r2 = 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2 (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 7013a1fdf45b8ea53fde431cdaa48da6549fed82
+Found branch parent: (refs/remotes/svn/thunk) 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 5d3f8d4c16e0f5b2ae1f1624f7261a1541339759 (refs/remotes/svn/thunk)
+r3 = 4ed0410157eec1261639ce264736e17d3b08ebb7 (refs/remotes/svn/thunk)
 ok 3 - init and fetch from one svn-remote
 
 expecting success of 9104.4 'follow deleted parent': 
@@ -532536,10 +528013,10 @@
 Committing transaction...
 Committed revision 4.
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 7013a1fdf45b8ea53fde431cdaa48da6549fed82
+Found branch parent: (refs/remotes/svn/junk) 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2
 Following parent with do_switch
 Successfully followed parent
-r4 = 37a849d71aa425f97ef8f6237519ee69106c1025 (refs/remotes/svn/junk)
+r4 = 5cc8246fbb433c60fdb1bdd87128c6db9dfbeddd (refs/remotes/svn/junk)
 ok 4 - follow deleted parent
 
 expecting success of 9104.5 'follow larger parent': 
@@ -532574,17 +528051,17 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	file
-r5 = 9ff20dee9dea070f2676634e66d309662fdca026 (refs/remotes/larger)
+r5 = 755f2b4f8d0f5147e03b5e6547900a93fc609953 (refs/remotes/larger)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 9ff20dee9dea070f2676634e66d309662fdca026
+Found branch parent: (refs/remotes/larger-parent) 755f2b4f8d0f5147e03b5e6547900a93fc609953
 Following parent with do_switch
 Successfully followed parent
-r6 = b1c43933022cf90632bfbcd8869b8194101b276d (refs/remotes/larger-parent)
-9ff20dee9dea070f2676634e66d309662fdca026
-b1c43933022cf90632bfbcd8869b8194101b276d
+r6 = 95d790a8574642d771b9237003cb5d9c293ca28e (refs/remotes/larger-parent)
+755f2b4f8d0f5147e03b5e6547900a93fc609953
+95d790a8574642d771b9237003cb5d9c293ca28e
 ok 5 - follow larger parent
 
 expecting success of 9104.6 'follow higher-level parent': 
@@ -532617,13 +528094,13 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 85f8056111e87efb7ffdd76f2270d834af260ba5 (refs/remotes/blob@9)
+r7 = 284755c9b5fbb21ad58ef0fc4665f14e0a249b3b (refs/remotes/blob@9)
 	A	hi
-r8 = ef59ad1daa7248b8e022831067c7abfdeaadc669 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) ef59ad1daa7248b8e022831067c7abfdeaadc669
+r8 = e377a814acacc22f9e280773fc99b1de3b1e2449 (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) e377a814acacc22f9e280773fc99b1de3b1e2449
 Following parent with do_switch
 Successfully followed parent
-r10 = df083bda7c24c9a5fc936aee47db26889850914a (refs/remotes/blob)
+r10 = 66e8f5c0e65d2c3c38f24d8e465de6ef4f32cc40 (refs/remotes/blob)
 ok 6 - follow higher-level parent
 
 expecting success of 9104.7 'follow deleted directory': 
@@ -532641,17 +528118,17 @@
 Committed revision 12.
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-r9 = 3713815297054ec7af3859b9bcc841e3eed0916f (refs/remotes/glob)
+r9 = 1a4ba4d644eb858f1e5ebe3792b45c7c65eb0f5b (refs/remotes/glob)
 	A	blob/hi
-r10 = 9392a41f87cf95a5a7503e6b2444da3a87d4a9b5 (refs/remotes/glob)
-	D	blob/hi
-	A	blob/bye
-W: -empty_dir: glob/blob/hi
-r11 = 8ebae1099e5ad6f1924e3f482521cc5fadcb3b72 (refs/remotes/glob)
+r10 = 4fb06bb30a0d3bc99836752845f8497645a0fd15 (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = 9055f3100ba7f57ffc6b00db50fa016a0a8bad36 (refs/remotes/blob)
+r11 = bf637d32a7723a95d2be9b23124c135631082835 (refs/remotes/blob)
+	D	blob/hi
+	A	blob/bye
+W: -empty_dir: glob/blob/hi
+r11 = 638674a2da0818c7e4449c6c651330e18f9ddd3c (refs/remotes/glob)
 ok 7 - follow deleted directory
 
 expecting success of 9104.8 'follow-parent avoids deleting relevant info': 
@@ -532753,12 +528230,12 @@
 	A	b.t
 	A	c.t
 	A	larger-parent
-r13 = 677249b09a5049537513b1b78b54ec42a3253bd4 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 677249b09a5049537513b1b78b54ec42a3253bd4
+r13 = 108ed5c5033b3e25c0ab9d5a298af5006aed8e4e (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 108ed5c5033b3e25c0ab9d5a298af5006aed8e4e
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = 308217df8d592cd764382f0950cc351ded2a0331 (refs/remotes/r9270-t)
+r14 = b833d5d56ecb4def6847fd8100076510346424e9 (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': 
@@ -532778,10 +528255,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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) 308217df8d592cd764382f0950cc351ded2a0331
+Found branch parent: (refs/remotes/r9270-d) b833d5d56ecb4def6847fd8100076510346424e9
 Following parent with do_switch
 Successfully followed parent
-r15 = 9004faa4e22428defd56db5f5afef3964f470aa7 (refs/remotes/r9270-d)
+r15 = 84d2db50eb12febc13f3e04aa211d9d3cfa80647 (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': 
@@ -532907,41 +528384,41 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = 5863865505a2952c10e099ffc6b49dda773a1677 (refs/remotes/stunk)
+r16 = bb68f2b2bc126232a53d29b705025c83e420cd45 (refs/remotes/stunk)
 	M	readme
-r17 = 73b64d01409988b9aaebd20b9ae824db89e9bcce (refs/remotes/stunk)
+r17 = 78cc162442870d8cdf8092affff3dc3d694a6b99 (refs/remotes/stunk)
 	M	readme
-r18 = 974681955693c5ff7dca2927d626853828317cf3 (refs/remotes/stunk)
+r18 = 2e1ca80f156ce68ba70eb2e590011d2fc663f0fe (refs/remotes/stunk)
 1+0 records in
 1+0 records out
-24 bytes copied, 2.764e-05 s, 868 kB/s
+24 bytes copied, 3.068e-05 s, 782 kB/s
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
 Initializing parent: refs/remotes/flunk@18
 	M	readme
-r17 = 73b64d01409988b9aaebd20b9ae824db89e9bcce (refs/remotes/flunk@18)
+r17 = 78cc162442870d8cdf8092affff3dc3d694a6b99 (refs/remotes/flunk@18)
 	M	readme
-r18 = 974681955693c5ff7dca2927d626853828317cf3 (refs/remotes/flunk@18)
-Found branch parent: (refs/remotes/flunk) 974681955693c5ff7dca2927d626853828317cf3
+r18 = 2e1ca80f156ce68ba70eb2e590011d2fc663f0fe (refs/remotes/flunk@18)
+Found branch parent: (refs/remotes/flunk) 2e1ca80f156ce68ba70eb2e590011d2fc663f0fe
 Following parent with do_switch
 Successfully followed parent
-r19 = e72c4e0419f842ef8e1f3fac8e8e91266b6588b5 (refs/remotes/flunk)
+r19 = b623b03e5fc728e12f3127ec62cc28994c7ebdf8 (refs/remotes/flunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = 5863865505a2952c10e099ffc6b49dda773a1677 (refs/remotes/stunk)
+r16 = bb68f2b2bc126232a53d29b705025c83e420cd45 (refs/remotes/stunk)
 	M	readme
-r17 = 73b64d01409988b9aaebd20b9ae824db89e9bcce (refs/remotes/stunk)
+r17 = 78cc162442870d8cdf8092affff3dc3d694a6b99 (refs/remotes/stunk)
 	M	readme
-r18 = 974681955693c5ff7dca2927d626853828317cf3 (refs/remotes/stunk)
+r18 = 2e1ca80f156ce68ba70eb2e590011d2fc663f0fe (refs/remotes/stunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 73b64d01409988b9aaebd20b9ae824db89e9bcce
+Found branch parent: (refs/remotes/flunked) 78cc162442870d8cdf8092affff3dc3d694a6b99
 Following parent with do_switch
 Successfully followed parent
-r20 = 00003a894cfc44e8d34832df00cf32fa1447903a (refs/remotes/flunked)
+r20 = 6c755e8234f0c6db97da1ff6696c4391ccd5555d (refs/remotes/flunked)
 ok 10 - follow-parent is atomic
 
 expecting success of 9104.11 'track multi-parent paths': 
@@ -532965,7 +528442,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 = eb7ad09f185b4a67f325523576ef8c2cda01cf2c (refs/remotes/glob@20)
+r13 = 039c34549a359c79f28dacf6b1477ad43b76f993 (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
@@ -532985,7 +528462,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 = d8c3647eeda1046acadd590c3c3c3bb2d79fe41d (refs/remotes/glob@20)
+r14 = c4a8ff72e828f43cb49e5f92ed05137c8022b498 (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -532996,13 +528473,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 = a20f6d0af12e73a13c291f8427d5cdf7af334efb (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) a20f6d0af12e73a13c291f8427d5cdf7af334efb
+r15 = 45a80f4b7045d748fefcb295a1df0e5932273f9e (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) 45a80f4b7045d748fefcb295a1df0e5932273f9e
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading a20f6d0af12e73a13c291f8427d5cdf7af334efb
+rereading 45a80f4b7045d748fefcb295a1df0e5932273f9e
 Following parent with do_switch
 Successfully followed parent
-r21 = 48fd620505c1d22311bdb6ad6a40a8965172e751 (refs/remotes/glob)
+r21 = f8bb6626698ba12710abcf269fcf85339609f304 (refs/remotes/glob)
 ok 11 - track multi-parent paths
 
 expecting success of 9104.12 'multi-fetch continues to work': 
@@ -533019,82 +528496,82 @@
 	git svn multi-fetch
 	
 	A	readme
-r1 = 955da43d960ba9e50dafbbc152413f2814c287ad (refs/remotes/svn/trunk)
+r1 = 0c369ff8312c7329a27972fb1c3cd03a5807aadf (refs/remotes/svn/trunk)
 	M	readme
-r2 = 7013a1fdf45b8ea53fde431cdaa48da6549fed82 (refs/remotes/svn/trunk)
+r2 = 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2 (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 7013a1fdf45b8ea53fde431cdaa48da6549fed82
+Found branch parent: (refs/remotes/svn/thunk) 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 5d3f8d4c16e0f5b2ae1f1624f7261a1541339759 (refs/remotes/svn/thunk)
+r3 = 4ed0410157eec1261639ce264736e17d3b08ebb7 (refs/remotes/svn/thunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 7013a1fdf45b8ea53fde431cdaa48da6549fed82
+Found branch parent: (refs/remotes/svn/junk) 6e09eef7a7bf71c843e01d1f2dfec0e2c031f3a2
 Following parent with do_switch
 Successfully followed parent
-r4 = 37a849d71aa425f97ef8f6237519ee69106c1025 (refs/remotes/svn/junk)
+r4 = 5cc8246fbb433c60fdb1bdd87128c6db9dfbeddd (refs/remotes/svn/junk)
 	A	file
-r5 = 9ff20dee9dea070f2676634e66d309662fdca026 (refs/remotes/larger)
+r5 = 755f2b4f8d0f5147e03b5e6547900a93fc609953 (refs/remotes/larger)
 branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 9ff20dee9dea070f2676634e66d309662fdca026
+Found branch parent: (refs/remotes/larger-parent) 755f2b4f8d0f5147e03b5e6547900a93fc609953
 Following parent with do_switch
 Successfully followed parent
-r6 = b1c43933022cf90632bfbcd8869b8194101b276d (refs/remotes/larger-parent)
-r9 = 3713815297054ec7af3859b9bcc841e3eed0916f (refs/remotes/glob)
+r6 = 95d790a8574642d771b9237003cb5d9c293ca28e (refs/remotes/larger-parent)
+r9 = 1a4ba4d644eb858f1e5ebe3792b45c7c65eb0f5b (refs/remotes/glob)
 	A	blob/hi
-r10 = 9392a41f87cf95a5a7503e6b2444da3a87d4a9b5 (refs/remotes/glob)
+r10 = 4fb06bb30a0d3bc99836752845f8497645a0fd15 (refs/remotes/glob)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 85f8056111e87efb7ffdd76f2270d834af260ba5 (refs/remotes/blob@9)
+r7 = 284755c9b5fbb21ad58ef0fc4665f14e0a249b3b (refs/remotes/blob@9)
 	A	hi
-r8 = ef59ad1daa7248b8e022831067c7abfdeaadc669 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) ef59ad1daa7248b8e022831067c7abfdeaadc669
+r8 = e377a814acacc22f9e280773fc99b1de3b1e2449 (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) e377a814acacc22f9e280773fc99b1de3b1e2449
 Following parent with do_switch
 Successfully followed parent
-r10 = df083bda7c24c9a5fc936aee47db26889850914a (refs/remotes/blob)
+r10 = 66e8f5c0e65d2c3c38f24d8e465de6ef4f32cc40 (refs/remotes/blob)
 	D	blob/hi
 	A	blob/bye
 W: -empty_dir: glob/blob/hi
-r11 = 8ebae1099e5ad6f1924e3f482521cc5fadcb3b72 (refs/remotes/glob)
+r11 = 638674a2da0818c7e4449c6c651330e18f9ddd3c (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = 9055f3100ba7f57ffc6b00db50fa016a0a8bad36 (refs/remotes/blob)
+r11 = bf637d32a7723a95d2be9b23124c135631082835 (refs/remotes/blob)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 677249b09a5049537513b1b78b54ec42a3253bd4 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 677249b09a5049537513b1b78b54ec42a3253bd4
+r13 = 108ed5c5033b3e25c0ab9d5a298af5006aed8e4e (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 108ed5c5033b3e25c0ab9d5a298af5006aed8e4e
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = 308217df8d592cd764382f0950cc351ded2a0331 (refs/remotes/r9270-t)
+r14 = b833d5d56ecb4def6847fd8100076510346424e9 (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.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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) 308217df8d592cd764382f0950cc351ded2a0331
+Found branch parent: (refs/remotes/r9270-d) b833d5d56ecb4def6847fd8100076510346424e9
 Following parent with do_switch
 Successfully followed parent
-r15 = 9004faa4e22428defd56db5f5afef3964f470aa7 (refs/remotes/r9270-d)
+r15 = 84d2db50eb12febc13f3e04aa211d9d3cfa80647 (refs/remotes/r9270-d)
 	A	readme
-r16 = 5863865505a2952c10e099ffc6b49dda773a1677 (refs/remotes/stunk)
+r16 = bb68f2b2bc126232a53d29b705025c83e420cd45 (refs/remotes/stunk)
 	M	readme
-r17 = 73b64d01409988b9aaebd20b9ae824db89e9bcce (refs/remotes/stunk)
+r17 = 78cc162442870d8cdf8092affff3dc3d694a6b99 (refs/remotes/stunk)
 	M	readme
-r18 = 974681955693c5ff7dca2927d626853828317cf3 (refs/remotes/stunk)
+r18 = 2e1ca80f156ce68ba70eb2e590011d2fc663f0fe (refs/remotes/stunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
-Found branch parent: (refs/remotes/flunk) 974681955693c5ff7dca2927d626853828317cf3
+Found branch parent: (refs/remotes/flunk) 2e1ca80f156ce68ba70eb2e590011d2fc663f0fe
 Following parent with do_switch
 Successfully followed parent
-r19 = e72c4e0419f842ef8e1f3fac8e8e91266b6588b5 (refs/remotes/flunk)
+r19 = b623b03e5fc728e12f3127ec62cc28994c7ebdf8 (refs/remotes/flunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 73b64d01409988b9aaebd20b9ae824db89e9bcce
+Found branch parent: (refs/remotes/flunked) 78cc162442870d8cdf8092affff3dc3d694a6b99
 Following parent with do_switch
 Successfully followed parent
-r20 = 00003a894cfc44e8d34832df00cf32fa1447903a (refs/remotes/flunked)
+r20 = 6c755e8234f0c6db97da1ff6696c4391ccd5555d (refs/remotes/flunked)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
 Initializing parent: refs/remotes/glob@20
 	A	trunk/readme
@@ -533107,7 +528584,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 = eb7ad09f185b4a67f325523576ef8c2cda01cf2c (refs/remotes/glob@20)
+r13 = 039c34549a359c79f28dacf6b1477ad43b76f993 (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
@@ -533127,7 +528604,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 = d8c3647eeda1046acadd590c3c3c3bb2d79fe41d (refs/remotes/glob@20)
+r14 = c4a8ff72e828f43cb49e5f92ed05137c8022b498 (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -533138,19 +528615,994 @@
 	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 = a20f6d0af12e73a13c291f8427d5cdf7af334efb (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) a20f6d0af12e73a13c291f8427d5cdf7af334efb
+r15 = 45a80f4b7045d748fefcb295a1df0e5932273f9e (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) 45a80f4b7045d748fefcb295a1df0e5932273f9e
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading a20f6d0af12e73a13c291f8427d5cdf7af334efb
+rereading 45a80f4b7045d748fefcb295a1df0e5932273f9e
 Following parent with do_switch
 Successfully followed parent
-r21 = 48fd620505c1d22311bdb6ad6a40a8965172e751 (refs/remotes/glob)
+r21 = f8bb6626698ba12710abcf269fcf85339609f304 (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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9148-git-svn-propset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9148-git-svn-propset/.git/
+expecting success of 9148.1 'setup propset via import': 
+	test_when_finished "rm -rf import" &&
+
+	foo_subdir2="subdir/subdir2/foo_subdir2" &&
+	mkdir -p import/subdir/subdir2 &&
+	(
+		cd import &&
+		# for "add props top level"
+		>foo &&
+		# for "add props relative"
+		>subdir/foo_subdir &&
+		# for "add props subdir"
+		>"$foo_subdir2" &&
+		svn_cmd import -m "import for git svn" . "$svnrepo"
+	)
+
+Adding         foo
+Adding         subdir
+Adding         subdir/foo_subdir
+Adding         subdir/subdir2
+Adding         subdir/subdir2/foo_subdir2
+Committing transaction...
+Committed revision 1.
+ok 1 - setup propset via import
+
+expecting success of 9148.2 'initialize git svn': 
+	git svn init "$svnrepo"
+	
+ok 2 - initialize git svn
+
+expecting success of 9148.3 'fetch revisions from svn': 
+	git svn fetch
+	
+	A	foo
+	A	subdir/foo_subdir
+	A	subdir/subdir2/foo_subdir2
+r1 = e948f02dae89ad206be190318053b080faa022b5 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo r1
+ok 3 - fetch revisions from svn
+
+expecting success of 9148.4 'add props top level': 
+	set_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
+	rm -rf svn_project
+	
+[master 2c9b584] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	foo
+Committed r2
+	M	foo
+r2 = fdb4368393868647abbed2be138a1be3b4da09cd (refs/remotes/git-svn)
+No changes between 2c9b5847c42b79313689ce298f832b68f4702e1c and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 2.
+ok 4 - add props top level
+
+expecting success of 9148.5 'add multiple props': 
+	set_props "." "foo" \
+		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "." "foo" \
+		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
+	rm -rf svn_project
+	
+[master c4ac5ff] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	foo
+Committed r3
+	M	foo
+r3 = 3951dab1cc31bac88467d1bbc10da16a8e233b0f (refs/remotes/git-svn)
+No changes between c4ac5ff654867f89b26749ac7350bbcdcefc0fcb and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 3.
+ok 5 - add multiple props
+
+expecting success of 9148.6 'add props subdir': 
+	set_props "." "$foo_subdir2" svn:keywords "FreeBSD=%H" &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
+	rm -rf svn_project
+	
+[master 66036fa] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	subdir/subdir2/foo_subdir2
+Committed r4
+	M	subdir/subdir2/foo_subdir2
+r4 = 8f858777c0fa1985831da97fbb7d2b261c113b22 (refs/remotes/git-svn)
+No changes between 66036fa0536cbec015570eed4dcdb9cccb8e72e1 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 4.
+ok 6 - add props subdir
+
+expecting success of 9148.7 'add props relative': 
+	set_props "subdir/subdir2" "../foo_subdir" \
+		svn:keywords "FreeBSD=%H" &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "subdir/subdir2" "../foo_subdir" \
+		svn:keywords "FreeBSD=%H" &&
+	rm -rf svn_project
+	
+[master 9efbf9e] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	subdir/foo_subdir
+Committed r5
+	M	subdir/foo_subdir
+r5 = 8c3b5167f1eb3332e69d8d11f2195f3886412877 (refs/remotes/git-svn)
+No changes between 9efbf9eee79572c397cb78666982c88ea8bddc9c and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 5.
+ok 7 - add props relative
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9155-git-svn-fetch-deleted-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
+	A	subdir/file
+r1 = d3cb12a47c66aae8df7a2f6c7b434fc6a26bb45e (refs/remotes/origin/trunk)
+r2 = 67c6596eccfc7c2d187d44cb618873a0575ee557 (refs/remotes/origin/mybranch)
+	A	trunk/subdir/file
+r3 = 297f95354f5a9818615a915b2fa3580365cb0e63 (refs/remotes/origin/mybranch)
+	M	subdir/file
+r4 = 44afaab5c5b476cdd213d879d106e5ee3167da76 (refs/remotes/origin/trunk)
+	M	trunk/subdir/file
+r5 = 95e7d38b232d235d7820c7328a62c0d04e7f8efd (refs/remotes/origin/mybranch)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
+Initializing parent: refs/remotes/origin/tags/mytag@5
+	A	file
+r1 = 3193808525e363f155420518ef63b7af8280085b (refs/remotes/origin/tags/mytag@5)
+	M	file
+r4 = 683d24b5a4a1f033737a8a47d7ad0df5f6ad144e (refs/remotes/origin/tags/mytag@5)
+Found branch parent: (refs/remotes/origin/tags/mytag) 683d24b5a4a1f033737a8a47d7ad0df5f6ad144e
+Following parent with do_switch
+Successfully followed parent
+r6 = bff7e2c3e624d0ce633e6e36482c0b0989ade400 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 3193808525e363f155420518ef63b7af8280085b (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag@5-) 3193808525e363f155420518ef63b7af8280085b
+Following parent with do_switch
+Successfully followed parent
+r3 = 05039b926503786b48252ec2865198cdea5b4029 (refs/remotes/origin/tags/mytag@5-)
+	M	file
+r5 = 8c37e25ec404344aafe4b37d633ed5e67672e50f (refs/remotes/origin/tags/mytag@5-)
+Found branch parent: (refs/remotes/origin/tags/mytag) 8c37e25ec404344aafe4b37d633ed5e67672e50f
+Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
+rereading 8c37e25ec404344aafe4b37d633ed5e67672e50f
+Following parent with do_switch
+Successfully followed parent
+r8 = 7b0af5f8b51a0844f3a68f5127192eca465866f4 (refs/remotes/origin/tags/mytag)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9156-git-svn-fetch-deleted-tag-2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/git_project/.git/
+	A	subdir1/file
+	A	subdir2/file
+	A	subdir3/file
+r1 = d4272b8429ffcd83de9cd7473d76f38210cc05f2 (refs/remotes/origin/trunk)
+	M	subdir1/file
+	M	subdir2/file
+	M	subdir3/file
+r2 = 1adc10a74c1ecc453769b5fc6a7350c04a267fda (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 8240c6a736f5d1a28915c62ec8f1182847677118 (refs/remotes/origin/tags/mytag@2)
+	M	file
+r2 = ee089a1eaf0aedb7dae2dbb088b2bafd4d679227 (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag) ee089a1eaf0aedb7dae2dbb088b2bafd4d679227
+Following parent with do_switch
+Successfully followed parent
+r3 = 13b870715e230779d42c17afc7ea895cc3405a12 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 1bb911eae6de2b616a41b076aacd0ae2cf873a55 (refs/remotes/origin/tags/mytag@2-)
+	M	file
+r2 = 239d3915c41ff639a481b2f491a173861702e9a8 (refs/remotes/origin/tags/mytag@2-)
+Found branch parent: (refs/remotes/origin/tags/mytag) 239d3915c41ff639a481b2f491a173861702e9a8
+Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
+rereading 239d3915c41ff639a481b2f491a173861702e9a8
+Following parent with do_switch
+Successfully followed parent
+r5 = 604e2797c6e3f041d486a433fc9d5e3f71d39287 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = e7160b05ac078d5bd4a759df59c4a733b76b2412 (refs/remotes/origin/tags/mytag@2--)
+	M	file
+r2 = 2886bc99423dfa043a67a0c7ef8df29400e19982 (refs/remotes/origin/tags/mytag@2--)
+Found branch parent: (refs/remotes/origin/tags/mytag) 2886bc99423dfa043a67a0c7ef8df29400e19982
+Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
+rereading 2886bc99423dfa043a67a0c7ef8df29400e19982
+Following parent with do_switch
+Successfully followed parent
+r7 = a75badfa36ec990c6111e3572673460a0b87bee1 (refs/remotes/origin/tags/mytag)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9147-git-svn-include-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9147-git-svn-include-paths/.git/
+expecting success of 9147.1 'setup test repository': 
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		mkdir qqq www xxx &&
+		echo test_qqq > qqq/test_qqq.txt &&
+		echo test_www > www/test_www.txt &&
+		echo test_xxx > xxx/test_xxx.txt &&
+		svn_cmd add qqq &&
+		svn_cmd add www &&
+		svn_cmd add xxx &&
+		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
+A         xxx
+A         xxx/test_xxx.txt
+Adding         qqq
+Adding         qqq/test_qqq.txt
+Adding         www
+Adding         www/test_www.txt
+Adding         xxx
+Adding         xxx/test_xxx.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 9147.2 'clone an SVN repository with filter to include qqq directory': 
+	git svn clone --include-paths="qqq" "$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.48.0~rc1+next.20250101/t/trash directory.t9147-git-svn-include-paths/g/.git/
+	A	qqq/test_qqq.txt
+r1 = 428bfa2e70e5172788eb5555bc59c4d4c97b5fca (refs/remotes/git-svn)
+r2 = 03a8346433d9ac30bcd58bd7093b86b2971fc6fb (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
+ok 2 - clone an SVN repository with filter to include qqq directory
+
+expecting success of 9147.3 'init+fetch an SVN repository with included qqq directory': 
+	git svn init "$svnrepo" c &&
+	( cd c && git svn fetch --include-paths="qqq" ) &&
+	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.48.0~rc1+next.20250101/t/trash directory.t9147-git-svn-include-paths/c/.git/
+	A	qqq/test_qqq.txt
+r1 = 428bfa2e70e5172788eb5555bc59c4d4c97b5fca (refs/remotes/git-svn)
+r2 = 03a8346433d9ac30bcd58bd7093b86b2971fc6fb (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
+ok 3 - init+fetch an SVN repository with included qqq directory
+
+expecting success of 9147.4 'verify include-paths config saved by clone': 
+	(
+	    cd g &&
+	    git config --get svn-remote.svn.include-paths | grep qqq
+	)
+
+qqq
+ok 4 - verify include-paths config saved by clone
+
+expecting success of 9147.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 9147.6 'update git svn-cloned repo (config include)': 
+	(
+		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 = 1116a360a411e88ab475d9dceb23e73007007982 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 6 - update git svn-cloned repo (config include)
+
+expecting success of 9147.7 'update git svn-cloned repo (option include)': 
+	(
+		cd c &&
+		git svn rebase --include-paths="qqq" &&
+		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 = 1116a360a411e88ab475d9dceb23e73007007982 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 7 - update git svn-cloned repo (option include)
+
+expecting success of 9147.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 "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 9147.9 'update git svn-cloned repo (config include)': 
+	(
+		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 = 72ef10ed513efd1c4b9b4518c33714e43702d636 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 9 - update git svn-cloned repo (config include)
+
+expecting success of 9147.10 'update git svn-cloned repo (option include)': 
+	(
+		cd c &&
+		git svn rebase --include-paths="qqq" &&
+		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 = 72ef10ed513efd1c4b9b4518c33714e43702d636 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 10 - update git svn-cloned repo (option include)
+
+expecting success of 9147.11 'SVN-side change in and out of included qqq': 
+	(
+		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 included qqq
+
+expecting success of 9147.12 'update git svn-cloned repo again (config include)': 
+	(
+		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 = 2d9024853f8e80ecbf5ff721e93463c3d4f2a64a (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 12 - update git svn-cloned repo again (config include)
+
+expecting success of 9147.13 'update git svn-cloned repo again (option include)': 
+	(
+		cd c &&
+		git svn rebase --include-paths="qqq" &&
+		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 = 2d9024853f8e80ecbf5ff721e93463c3d4f2a64a (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 13 - update git svn-cloned repo again (option include)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9154-git-svn-fancy-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9154-git-svn-fancy-glob/.git/
+expecting success of 9154.1 'load svn repo': 
+	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9154/svn.dump' &&
+	git svn init --minimize-url -T trunk 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' &&
+	git svn fetch
+	
+	A	foo
+r1 = 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585 (refs/remotes/origin/trunk)
+	M	foo
+r6 = 0c79739614abf660245e8a3d463571dd23e2965f (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk r6
+ok 1 - load svn repo
+
+expecting success of 9154.2 'add red branch': 
+	git config svn-remote.svn.branches 'branches/{red}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	test_must_fail git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/red, 1
+Found branch parent: (refs/remotes/red) 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585
+Following parent with do_switch
+Successfully followed parent
+r2 = d047f9f553906432c5c26f50de89ca7592f87232 (refs/remotes/red)
+	M	foo
+r3 = 772a02a47b350d977cd6f784bb6dc2fd8d5023fe (refs/remotes/red)
+772a02a47b350d977cd6f784bb6dc2fd8d5023fe
+fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/green
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 2 - add red branch
+
+expecting success of 9154.3 'add gre branch': 
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/{red,gre}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	test_must_fail git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+772a02a47b350d977cd6f784bb6dc2fd8d5023fe
+fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/green
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 3 - add gre branch
+
+expecting success of 9154.4 'add green branch': 
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/green, 1
+Found branch parent: (refs/remotes/green) 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585
+Following parent with do_switch
+Successfully followed parent
+r2 = 4042c20c1e5b6f101d33acdf3f16bea6986c2cae (refs/remotes/green)
+	M	foo
+r4 = 9116bf27446303b83746ab6557df3e0e5fc179de (refs/remotes/green)
+772a02a47b350d977cd6f784bb6dc2fd8d5023fe
+9116bf27446303b83746ab6557df3e0e5fc179de
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 4 - add green branch
+
+expecting success of 9154.5 'add all branches': 
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	git rev-parse refs/remotes/green &&
+	git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/blue, 1
+Found branch parent: (refs/remotes/blue) 09b5bb5ec23c3c3a0f6571ecc4a5c5929b3df585
+Following parent with do_switch
+Successfully followed parent
+r2 = 5e0e7aea4b77317d8fec237a1303db83ce2ce0d4 (refs/remotes/blue)
+	M	foo
+r5 = 9a9d7d4b2d9e878f95e46bff6c0c9dc90333514b (refs/remotes/blue)
+772a02a47b350d977cd6f784bb6dc2fd8d5023fe
+9116bf27446303b83746ab6557df3e0e5fc179de
+9a9d7d4b2d9e878f95e46bff6c0c9dc90333514b
+ok 5 - add all branches
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9158-git-svn-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 = 06b83ef389c764798e6929ed03ccac8b777d7425 (refs/remotes/git-svn)
+	A	foo
+r2 = 36f88afd91ddd361f491c082eacd06b41d6ef5c1 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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 91d8cdd] 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
+r3 = 100faf818d2ea573818a12d84450f485ebad25aa (refs/remotes/git-svn)
+No changes between 91d8cdd662de009b7b5722dde6480afb877e21d4 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 7a3662e] 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
+Couldn't find revmap for file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
+r4 = 3d4ee94aef39d89d4b8775d37278987c3d2f95d5 (refs/remotes/git-svn)
+No changes between 7a3662e9da141e3df18bf6cf07484da52c2aa65c 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9157-git-svn-fetch-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9157-git-svn-fetch-merge/.git/
+expecting success of 9157.1 'initialize source svn repo': 
+	svn_cmd mkdir -m x "$svnrepo"/trunk &&
+	svn_cmd mkdir -m x "$svnrepo"/branches &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		touch foo &&
+		svn add foo &&
+		svn commit -m "initial commit" &&
+		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
+		touch bar &&
+		svn add bar &&
+		svn commit -m x &&
+		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 &&
+		svn switch "$svnrepo"/branches/branch1 &&
+		touch baz &&
+		svn add baz &&
+		svn commit -m x &&
+		svn switch "$svnrepo"/trunk &&
+		svn merge "$svnrepo"/branches/branch1 &&
+		svn commit -m "merge" &&
+		svn switch "$svnrepo"/branches/branch1 &&
+		svn commit -m x &&
+		svn switch "$svnrepo"/branches/branch2 &&
+		svn merge "$svnrepo"/branches/branch1 &&
+		svn commit -m "merge branch1" &&
+		svn switch "$svnrepo"/trunk &&
+		svn merge "$svnrepo"/branches/branch2 &&
+		svn resolved baz &&
+		svn commit -m "merge branch2"
+	) &&
+	rm -rf "$SVN_TREE"
+
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Checked out revision 2.
+A         foo
+Adding         foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Committing transaction...
+Committed revision 4.
+A         bar
+Adding         bar
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Committing transaction...
+Committed revision 6.
+D    bar
+Updated to revision 6.
+A         baz
+Adding         baz
+Transmitting file data .done
+Committing transaction...
+Committed revision 7.
+D    baz
+A    bar
+Updated to revision 7.
+--- Merging r4 through r7 into '.':
+A    baz
+--- Recording mergeinfo for merge of r4 through r7 into '.':
+ U   .
+Sending        .
+Adding         baz
+Committing transaction...
+Committed revision 8.
+D    bar
+ U   .
+Updated to revision 8.
+D    baz
+A    bar
+Updated to revision 8.
+--- Merging r4 through r8 into '.':
+A    baz
+--- Recording mergeinfo for merge of r4 through r8 into '.':
+ U   .
+Sending        .
+Adding         baz
+Committing transaction...
+Committed revision 9.
+ U   .
+Updated to revision 9.
+--- Merging r6 through r9 into '.':
+   C baz
+ G   .
+--- Recording mergeinfo for merge of r6 through r9 into '.':
+ G   .
+Searching tree conflict details for 'baz' in repository:
+ done
+Summary of conflicts:
+  Tree conflicts: 1
+Resolved conflicted state of 'baz'
+Sending        .
+Committing transaction...
+Committed revision 10.
+ok 1 - initialize source svn repo
+
+expecting success of 9157.2 'clone svn repo': 
+	git svn init -s "$svnrepo" &&
+	git svn fetch
+
+r1 = 0f3dbd5a9508c2cd36694842f0dbe3b37e866b4a (refs/remotes/origin/trunk)
+	A	foo
+r3 = ea207c1ffd5d18a688e2dcb2f85fda4f56bb35ac (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) ea207c1ffd5d18a688e2dcb2f85fda4f56bb35ac
+Following parent with do_switch
+Successfully followed parent
+r4 = 8a86552638e6155a261526902416f680b92613e9 (refs/remotes/origin/branch1)
+	A	bar
+r5 = 53c2e1e89ada89cde2825d7d25ae7c20fe49f298 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
+Found branch parent: (refs/remotes/origin/branch2) 53c2e1e89ada89cde2825d7d25ae7c20fe49f298
+Following parent with do_switch
+Successfully followed parent
+r6 = 103417d7fcd4372153c52278c240d49c645faeeb (refs/remotes/origin/branch2)
+	A	baz
+r7 = 1f0ca4ff61bfcc56256733fd4db15d0efe616c14 (refs/remotes/origin/branch1)
+	A	baz
+Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-7): 1f0ca4ff61bfcc56256733fd4db15d0efe616c14
+r8 = 91eec94f27ec7fe0b32af7ea0e92a9603ba05dfb (refs/remotes/origin/trunk)
+	A	baz
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-8): 1f0ca4ff61bfcc56256733fd4db15d0efe616c14
+r9 = 8bba39e14cc4c14624640ec0fc0d4d6ec7a87b02 (refs/remotes/origin/branch2)
+Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
+Found merge parent (/branches/branch2:6-9): 8bba39e14cc4c14624640ec0fc0d4d6ec7a87b02
+r10 = 1981e85f7e77c55380395f72d7ac0492c0e5b0d6 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+8bba39e14cc4c14624640ec0fc0d4d6ec7a87b02
+ok 3 - verify merge commit
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9146-git-svn-empty-dirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9146-git-svn-empty-dirs/.git/
 expecting success of 9146.1 'initialize repo': 
@@ -533178,19 +529630,19 @@
 expecting success of 9146.2 'clone': git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9146-git-svn-empty-dirs/cloned/.git/
 W: +empty_dir: a
-r1 = 067cefa58d67bb62fd52948c0ce42aa336f4ab1d (refs/remotes/git-svn)
+r1 = 3563ed6dc6d3c6ae8783fcf0e380023f2900b542 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = e76ca7ac6dd78d5c4f345d922c69451d46c3fc01 (refs/remotes/git-svn)
+r2 = 8437ace07449ae16c95a30bf93ce916b14a1b4c3 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 626148b665b7706f8967e4548d6a5ba458251f0e (refs/remotes/git-svn)
+r3 = fadbbf7b44c31a033822d55b4e1f15d14184f079 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = 27c5d69581c72fcd56b8369891cd3148944d42b9 (refs/remotes/git-svn)
+r4 = 8c0fa947c3a163d1b5790e7d4acbaec59ae1a3c3 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = d81fe7e7bf8f90f0fbcd0c6945d837b8219651e6 (refs/remotes/git-svn)
+r5 = de8cdd8126901e0df1ba70df415f25b8aa900bf4 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = cb262e5d3a1d9a0cce8f5eefad7ca3c26483072c (refs/remotes/git-svn)
+r6 = e0d1d61eec23192228a86fe1bf9242fb00fc197a (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 0ab7883c9b46aefa540bf97a867d0ce77e706d39 (refs/remotes/git-svn)
+r7 = 8fc20d2c75a947a39b2a9b456026eb5eb3c3f651 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 creating empty directory: a
@@ -533227,19 +529679,19 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9146-git-svn-empty-dirs/cloned-no-mkdirs/.git/
 W: +empty_dir: a
-r1 = 067cefa58d67bb62fd52948c0ce42aa336f4ab1d (refs/remotes/git-svn)
+r1 = 3563ed6dc6d3c6ae8783fcf0e380023f2900b542 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = e76ca7ac6dd78d5c4f345d922c69451d46c3fc01 (refs/remotes/git-svn)
+r2 = 8437ace07449ae16c95a30bf93ce916b14a1b4c3 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 626148b665b7706f8967e4548d6a5ba458251f0e (refs/remotes/git-svn)
+r3 = fadbbf7b44c31a033822d55b4e1f15d14184f079 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = 27c5d69581c72fcd56b8369891cd3148944d42b9 (refs/remotes/git-svn)
+r4 = 8c0fa947c3a163d1b5790e7d4acbaec59ae1a3c3 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = d81fe7e7bf8f90f0fbcd0c6945d837b8219651e6 (refs/remotes/git-svn)
+r5 = de8cdd8126901e0df1ba70df415f25b8aa900bf4 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = cb262e5d3a1d9a0cce8f5eefad7ca3c26483072c (refs/remotes/git-svn)
+r6 = e0d1d61eec23192228a86fe1bf9242fb00fc197a (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 0ab7883c9b46aefa540bf97a867d0ce77e706d39 (refs/remotes/git-svn)
+r7 = 8fc20d2c75a947a39b2a9b456026eb5eb3c3f651 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 ok 4 - option automkdirs set to false
@@ -533256,7 +529708,7 @@
 	test_path_is_dir cloned/"! !"
 
 W: +empty_dir: ! !
-r8 = 829caed00b6378ced6c3dfa723c71affa24bdbbe (refs/remotes/git-svn)
+r8 = 9dc010527e0187ace349955dd1a6104458b98a1b (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: ! !
 ok 6 - git svn rebase creates empty directory
@@ -533324,11 +529776,11 @@
 
 expecting success of 9146.10 'clone trunk': git svn clone -s "$svnrepo" trunk
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9146-git-svn-empty-dirs/trunk/.git/
-r9 = 84a2098afaf646d171d080d784f3655b666d9e2b (refs/remotes/origin/trunk)
+r9 = b3fda0530a81a8805b7ca70c81ca0e6391106f75 (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/a
-r10 = 10d811da996f15eb0bf4101903628521cc974048 (refs/remotes/origin/trunk)
+r10 = 3ca473ebd2875ac16f205a938f635734163e2cbf (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/weird file name
-r11 = 75570c2bd7cd5db6226bfa57bd4fa74a5b84b933 (refs/remotes/origin/trunk)
+r11 = 32e32fac95169ac2b60db18b9f06ca39eaf54ee4 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo/trunk r11
 creating empty directory: a
@@ -533360,30 +529812,30 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9146-git-svn-empty-dirs/removed/.git/
 W: +empty_dir: a
-r1 = 067cefa58d67bb62fd52948c0ce42aa336f4ab1d (refs/remotes/git-svn)
+r1 = 3563ed6dc6d3c6ae8783fcf0e380023f2900b542 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = e76ca7ac6dd78d5c4f345d922c69451d46c3fc01 (refs/remotes/git-svn)
+r2 = 8437ace07449ae16c95a30bf93ce916b14a1b4c3 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 626148b665b7706f8967e4548d6a5ba458251f0e (refs/remotes/git-svn)
+r3 = fadbbf7b44c31a033822d55b4e1f15d14184f079 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = 27c5d69581c72fcd56b8369891cd3148944d42b9 (refs/remotes/git-svn)
+r4 = 8c0fa947c3a163d1b5790e7d4acbaec59ae1a3c3 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = d81fe7e7bf8f90f0fbcd0c6945d837b8219651e6 (refs/remotes/git-svn)
+r5 = de8cdd8126901e0df1ba70df415f25b8aa900bf4 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = cb262e5d3a1d9a0cce8f5eefad7ca3c26483072c (refs/remotes/git-svn)
+r6 = e0d1d61eec23192228a86fe1bf9242fb00fc197a (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 0ab7883c9b46aefa540bf97a867d0ce77e706d39 (refs/remotes/git-svn)
+r7 = 8fc20d2c75a947a39b2a9b456026eb5eb3c3f651 (refs/remotes/git-svn)
 W: +empty_dir: ! !
-r8 = 829caed00b6378ced6c3dfa723c71affa24bdbbe (refs/remotes/git-svn)
+r8 = 9dc010527e0187ace349955dd1a6104458b98a1b (refs/remotes/git-svn)
 W: +empty_dir: trunk
-r9 = 895b9bdaea961eade0fa312e1b1ac83fd0f1d11a (refs/remotes/git-svn)
+r9 = dd18ef896d55def54d395401b455096e94f156c1 (refs/remotes/git-svn)
 W: +empty_dir: trunk/a
-r10 = 47edf88e8c68891804a16898cedfed0bf1e0bcd6 (refs/remotes/git-svn)
+r10 = 8f3619fc14d39843f374cdcd34e490ac75b06948 (refs/remotes/git-svn)
 W: +empty_dir: trunk/weird file name
-r11 = d1eb185b824ed8c038bdae44792d80bcd1a57c4a (refs/remotes/git-svn)
+r11 = 8c1a2ed2392f16b917f6ef1ef14a3f80f5c9b9c7 (refs/remotes/git-svn)
 	D	d
 W: -empty_dir: d
-r12 = 2d7524c27b71d2004486d23b1395d977447bf2b0 (refs/remotes/git-svn)
+r12 = fb75d6fde8e587c4c108d4d822bdfcdb52e6ccd7 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r12
 creating empty directory: ! !
@@ -533417,9 +529869,9 @@
 
 Committing transaction...
 Committed revision 13.
-HEAD is now at 067cefa mkdir a
+HEAD is now at 3563ed6 mkdir a
 W: +empty_dir: gz
-r13 = 409c7fbf5aaa682eac22edcd095047cd7d6053c4 (refs/remotes/git-svn)
+r13 = a22ebdfae3f5dd2163dfbfe3d2b29b9d351eaf96 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: gz
 ok 14 - git svn gc-ed files work
@@ -533428,6 +529880,11 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9167-git-svn-cmd-branch-subproject.sh ***
+skipping test t9167 altogether
+1..0 # SKIP skip all tests in t9167
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9141-git-svn-multiple-branches.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9141-git-svn-multiple-branches/.git/
 expecting success of 9141.1 'setup svnrepo': 
@@ -533593,95 +530050,95 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9141-git-svn-multiple-branches/git_project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo
 	A	a.file
-r1 = 6b8161a84a373f3364fe212d65ce02759b24dcec (refs/remotes/origin/trunk)
+r1 = f3df151e8a81d8506561c770a4ef49d891fd67d5 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first, 1
-Found branch parent: (refs/remotes/origin/first) 6b8161a84a373f3364fe212d65ce02759b24dcec
+Found branch parent: (refs/remotes/origin/first) f3df151e8a81d8506561c770a4ef49d891fd67d5
 Following parent with do_switch
 Successfully followed parent
-r2 = 9d00a236058ab678d3ad0955249df89c6df6c7f7 (refs/remotes/origin/first)
+r2 = 3601535b82115fe3da4295987403305d9d33bbe6 (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/1.0, 2
-Found branch parent: (refs/remotes/origin/tags/1.0) 6b8161a84a373f3364fe212d65ce02759b24dcec
+Found branch parent: (refs/remotes/origin/tags/1.0) f3df151e8a81d8506561c770a4ef49d891fd67d5
 Following parent with do_switch
 Successfully followed parent
-r3 = a4e964b4e546fec7797c1dba02f4f19cff9dbeeb (refs/remotes/origin/tags/1.0)
+r3 = b91ffc907a7672252c4311cdb96a1249624bf79e (refs/remotes/origin/tags/1.0)
 	M	a.file
-r4 = 2ba98518d9bc4dd0e56799c17ac2732fb107917a (refs/remotes/origin/trunk)
+r4 = dbbd31394c17c91b39149ac7b64e9d9975e43717 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second, 4
-Found branch parent: (refs/remotes/origin/second) 2ba98518d9bc4dd0e56799c17ac2732fb107917a
+Found branch parent: (refs/remotes/origin/second) dbbd31394c17c91b39149ac7b64e9d9975e43717
 Following parent with do_switch
 Successfully followed parent
-r5 = efb6593bb8e40389e9fc672724620ddbc369982c (refs/remotes/origin/second)
+r5 = 93c88b99f599d40eb43eb3d90034d99d8a732485 (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/2.0, 5
-Found branch parent: (refs/remotes/origin/tags/2.0) 2ba98518d9bc4dd0e56799c17ac2732fb107917a
+Found branch parent: (refs/remotes/origin/tags/2.0) dbbd31394c17c91b39149ac7b64e9d9975e43717
 Following parent with do_switch
 Successfully followed parent
-r6 = 86ca2980f4ab7b7fca6a064e4941e5659010d7c7 (refs/remotes/origin/tags/2.0)
+r6 = e4c299814efc86beb9f127ca4f9c29868b155485 (refs/remotes/origin/tags/2.0)
 	M	a.file
-r7 = a78a270651461cc2c63d63cf2bdda9112fcf102f (refs/remotes/origin/trunk)
+r7 = a23048a86e83587955a6c1a90d6e485c51e3f9d0 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1, 7
-Found branch parent: (refs/remotes/origin/1) a78a270651461cc2c63d63cf2bdda9112fcf102f
+Found branch parent: (refs/remotes/origin/1) a23048a86e83587955a6c1a90d6e485c51e3f9d0
 Following parent with do_switch
 Successfully followed parent
-r8 = dfcea13c62230f07c28c17d5dde7a7d1f1fbba71 (refs/remotes/origin/1)
+r8 = 8e6f89aac14f1a9375024aaaaa5bad2ca2b197a0 (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/3.0, 8
-Found branch parent: (refs/remotes/origin/tags/3.0) a78a270651461cc2c63d63cf2bdda9112fcf102f
+Found branch parent: (refs/remotes/origin/tags/3.0) a23048a86e83587955a6c1a90d6e485c51e3f9d0
 Following parent with do_switch
 Successfully followed parent
-r9 = 16c6848f737305fd9d79d16b2eebffd7a5ab9337 (refs/remotes/origin/tags/3.0)
+r9 = 4e23d614abe39cce15c4072e99d375a7221b07ca (refs/remotes/origin/tags/3.0)
 	M	a.file
-r10 = 42dcf8be4d25865cb79be4cd5b4ce10bc5d346a4 (refs/remotes/origin/trunk)
+r10 = 8d7e3a1858f6f3e9ea209e20ac60387b43deaea5 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2, 10
-Found branch parent: (refs/remotes/origin/2) 42dcf8be4d25865cb79be4cd5b4ce10bc5d346a4
+Found branch parent: (refs/remotes/origin/2) 8d7e3a1858f6f3e9ea209e20ac60387b43deaea5
 Following parent with do_switch
 Successfully followed parent
-r11 = cf3e28a640462b044a16174f47620f68d722d517 (refs/remotes/origin/2)
+r11 = 417b6f8bbba7ed82d1669eae485861b685dbadd8 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/4.0, 11
-Found branch parent: (refs/remotes/origin/tags/4.0) 42dcf8be4d25865cb79be4cd5b4ce10bc5d346a4
+Found branch parent: (refs/remotes/origin/tags/4.0) 8d7e3a1858f6f3e9ea209e20ac60387b43deaea5
 Following parent with do_switch
 Successfully followed parent
-r12 = c792ba4dd98eb29d24afb8020cb842856eda3114 (refs/remotes/origin/tags/4.0)
+r12 = dd1fe51e2c29425502c7a8b1468a97e562fdda80 (refs/remotes/origin/tags/4.0)
 	M	a.file
-r13 = 8ab2c35f06bb0287c44a6f7a3eea307c2d11bd38 (refs/remotes/origin/first)
+r13 = c159b9b7ac08afeb17edea0f3be88821af12594a (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v5, 13
-Found branch parent: (refs/remotes/origin/tags/v5) 8ab2c35f06bb0287c44a6f7a3eea307c2d11bd38
+Found branch parent: (refs/remotes/origin/tags/v5) c159b9b7ac08afeb17edea0f3be88821af12594a
 Following parent with do_switch
 Successfully followed parent
-r14 = 481b0342251c088868d3d4fcd061b2b6537c85ac (refs/remotes/origin/tags/v5)
+r14 = a93e98663ed0ff4f4ab1216de65283a8b53049e6 (refs/remotes/origin/tags/v5)
 	M	a.file
-r15 = 79f32a9c3b6991cccdb3fa1ecb08c3cb01b86b9c (refs/remotes/origin/second)
+r15 = 3327cd2b251217a0f85f9b9033fdd3a848ec6020 (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v6, 15
-Found branch parent: (refs/remotes/origin/tags/v6) 79f32a9c3b6991cccdb3fa1ecb08c3cb01b86b9c
+Found branch parent: (refs/remotes/origin/tags/v6) 3327cd2b251217a0f85f9b9033fdd3a848ec6020
 Following parent with do_switch
 Successfully followed parent
-r16 = 9e1fc4e057fddcc354a4967fb8ce8b04d0a66893 (refs/remotes/origin/tags/v6)
+r16 = 817e480638ef5903a0265a2fa0a25c4f5f6225ae (refs/remotes/origin/tags/v6)
 	M	a.file
-r17 = 5e83e8fb1f99c4a2abbda5688a11f57f54db2727 (refs/remotes/origin/1)
+r17 = ea54da0ad79b8aaead5e01cd9b31f5500f1b7a84 (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v7, 17
-Found branch parent: (refs/remotes/origin/tags/v7) 5e83e8fb1f99c4a2abbda5688a11f57f54db2727
+Found branch parent: (refs/remotes/origin/tags/v7) ea54da0ad79b8aaead5e01cd9b31f5500f1b7a84
 Following parent with do_switch
 Successfully followed parent
-r18 = 5dc22176c98e4a20319953c8cb739b06041efe97 (refs/remotes/origin/tags/v7)
+r18 = 1afbccf46cd623c11c970fa7a0a311ff6948511f (refs/remotes/origin/tags/v7)
 	M	a.file
-r19 = 0a0a38b62e06590104c7ca423c33d1e0fa83a9a0 (refs/remotes/origin/2)
+r19 = ec27ba1d14bb149ee0278431024d45c9598c630e (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v8, 19
-Found branch parent: (refs/remotes/origin/tags/v8) 0a0a38b62e06590104c7ca423c33d1e0fa83a9a0
+Found branch parent: (refs/remotes/origin/tags/v8) ec27ba1d14bb149ee0278431024d45c9598c630e
 Following parent with do_switch
 Successfully followed parent
-r20 = cba224cbf1749823c550931fd55622e9ccfb9225 (refs/remotes/origin/tags/v8)
+r20 = 033dabdf5e06fc1ca99c8cff9a25c5178bebd846 (refs/remotes/origin/tags/v8)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk r10
-8ab2c35f06bb0287c44a6f7a3eea307c2d11bd38
-79f32a9c3b6991cccdb3fa1ecb08c3cb01b86b9c
-5e83e8fb1f99c4a2abbda5688a11f57f54db2727
-0a0a38b62e06590104c7ca423c33d1e0fa83a9a0
-a4e964b4e546fec7797c1dba02f4f19cff9dbeeb
-86ca2980f4ab7b7fca6a064e4941e5659010d7c7
-16c6848f737305fd9d79d16b2eebffd7a5ab9337
-c792ba4dd98eb29d24afb8020cb842856eda3114
-481b0342251c088868d3d4fcd061b2b6537c85ac
-9e1fc4e057fddcc354a4967fb8ce8b04d0a66893
-5dc22176c98e4a20319953c8cb739b06041efe97
-cba224cbf1749823c550931fd55622e9ccfb9225
+c159b9b7ac08afeb17edea0f3be88821af12594a
+3327cd2b251217a0f85f9b9033fdd3a848ec6020
+ea54da0ad79b8aaead5e01cd9b31f5500f1b7a84
+ec27ba1d14bb149ee0278431024d45c9598c630e
+b91ffc907a7672252c4311cdb96a1249624bf79e
+e4c299814efc86beb9f127ca4f9c29868b155485
+4e23d614abe39cce15c4072e99d375a7221b07ca
+dd1fe51e2c29425502c7a8b1468a97e562fdda80
+a93e98663ed0ff4f4ab1216de65283a8b53049e6
+817e480638ef5903a0265a2fa0a25c4f5f6225ae
+1afbccf46cd623c11c970fa7a0a311ff6948511f
+033dabdf5e06fc1ca99c8cff9a25c5178bebd846
 ok 2 - clone multiple branch and tag paths
 
 expecting success of 9141.3 'Multiple branch or tag paths require -d': 
@@ -533748,40 +530205,40 @@
 
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1, 10
-Found branch parent: (refs/remotes/origin/New1) 42dcf8be4d25865cb79be4cd5b4ce10bc5d346a4
+Found branch parent: (refs/remotes/origin/New1) 8d7e3a1858f6f3e9ea209e20ac60387b43deaea5
 Following parent with do_switch
 Successfully followed parent
-r21 = 3a79dd917a2e6eeeea389e8790f915eac3ce72a0 (refs/remotes/origin/New1)
+r21 = 99995b7915c7a956b9ec62e35bafd2213a4dff07 (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.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2, 10
-Found branch parent: (refs/remotes/origin/New2) 42dcf8be4d25865cb79be4cd5b4ce10bc5d346a4
+Found branch parent: (refs/remotes/origin/New2) 8d7e3a1858f6f3e9ea209e20ac60387b43deaea5
 Following parent with do_switch
 Successfully followed parent
-r22 = 497e986c5df26b81f6a661a94371dd2577525a2d (refs/remotes/origin/New2)
+r22 = cb9f736f4815332b90662b192ca9b28deda4f42e (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.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1, 10
-Found branch parent: (refs/remotes/origin/tags/Tag1) 42dcf8be4d25865cb79be4cd5b4ce10bc5d346a4
+Found branch parent: (refs/remotes/origin/tags/Tag1) 8d7e3a1858f6f3e9ea209e20ac60387b43deaea5
 Following parent with do_switch
 Successfully followed parent
-r23 = 17dc71049b12b25073680a706514279b1a714e60 (refs/remotes/origin/tags/Tag1)
+r23 = 305c095e9520dae369ba011083ee1f8c53eaf5e9 (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.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2, 10
-Found branch parent: (refs/remotes/origin/tags/Tag2) 42dcf8be4d25865cb79be4cd5b4ce10bc5d346a4
+Found branch parent: (refs/remotes/origin/tags/Tag2) 8d7e3a1858f6f3e9ea209e20ac60387b43deaea5
 Following parent with do_switch
 Successfully followed parent
-r24 = b6493e3854bbf984db47af93a60885cf084f2125 (refs/remotes/origin/tags/Tag2)
+r24 = a898aacd653264c5c7fb44d77867b58c9a7a78d5 (refs/remotes/origin/tags/Tag2)
 Updating '.':
 A    tags_B/Tag2
 A    tags_B/Tag2/a.file
@@ -533792,45 +530249,106 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9169-git-svn-dcommit-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 &&
+*** t9159-git-svn-no-parent-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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
-	)
-
+		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.
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
-W: +empty_dir: dir
-r1 = 1fe1b4f677c5a80f5d99ab59c820285799df2769 (refs/remotes/git-svn)
+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 = 1229d5b16ae01f66c881eaff23aa3dfca1c941b2 (refs/remotes/origin/trunk)
+	M	file.txt
+r2 = b9ba7ea596923787a9b2d3a0f0bbffc5269823d9 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
+Found branch parent: (refs/remotes/origin/a) 1229d5b16ae01f66c881eaff23aa3dfca1c941b2
+Following parent with do_switch
+Successfully followed parent
+r3 = 23ca32a8560ad69e36a474129579e7c7a27c7065 (refs/remotes/origin/a)
+Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
+Found merge parent (/trunk:1-2): b9ba7ea596923787a9b2d3a0f0bbffc5269823d9
+r4 = 41e9452edfeb72a3af71b997a5a16764a65668a1 (refs/remotes/origin/a)
+	A	file2.txt
+r5 = f4f46325b9bb9b087e7327e9d2176753eae99475 (refs/remotes/origin/b)
+	M	file2.txt
+r6 = cdaecf8215d4bce5c87648ed2acc8e671e257c52 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
+Found branch parent: (refs/remotes/origin/c) f4f46325b9bb9b087e7327e9d2176753eae99475
+Following parent with do_switch
+Successfully followed parent
+r7 = 05d16f7eb4a7549a84961d259f65d80c2bb43d0d (refs/remotes/origin/c)
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/branches/b:5-6): cdaecf8215d4bce5c87648ed2acc8e671e257c52
+r8 = a425af62336390a33bf50b255ce1ec717d3e8bb8 (refs/remotes/origin/c)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
-	A	foo
-Committed r2
-	A	foo
-r2 = a5f98400d018f47c92112e7b4dc2f4c91a31b53e (refs/remotes/git-svn)
-No changes between 68b4c771c3840f2060339becf24c0533f0f34dc5 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 1 - setup commit repository
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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
@@ -533908,29 +530426,29 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 9045247f6b7b435f7a9e172c58e9c4b0fea7fe33 (refs/remotes/origin/trunk)
+r1 = 2c3ac2aa17fb44feb49c67205b267b97ebabd719 (refs/remotes/origin/trunk)
 	A	foo
-r3 = ff246a7a189e232c9bd96e08c68eb74dfaa237c4 (refs/remotes/origin/trunk)
+r3 = e518be04f2dd15e27a41e46d142ed6cbfb356c43 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) ff246a7a189e232c9bd96e08c68eb74dfaa237c4
+Found branch parent: (refs/remotes/origin/branch1) e518be04f2dd15e27a41e46d142ed6cbfb356c43
 Following parent with do_switch
 Successfully followed parent
-r4 = d59658cb1b409bdb656aed8b1b6e9679bda3ce7e (refs/remotes/origin/branch1)
+r4 = 7501de4e9f8f2c5a34b39ef278ec978bae546757 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 7fa80e552520fd4f255b22f1192d1e10928a4333 (refs/remotes/origin/branch1)
+r5 = 4f911c72ccab45bf602d20f0f1561318719b4c56 (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 7fa80e552520fd4f255b22f1192d1e10928a4333
+Found branch parent: (refs/remotes/origin/branch2) 4f911c72ccab45bf602d20f0f1561318719b4c56
 Following parent with do_switch
 Successfully followed parent
-r6 = c843a59147734678714fe04e1ca43c455e997609 (refs/remotes/origin/branch2)
+r6 = 212a6a47bf8828195b8ac2691e6b3ec38504bf27 (refs/remotes/origin/branch2)
 	A	baz
-r7 = 188aa97a7a0e290c4ec285f81c9871acbc9bd5fa (refs/remotes/origin/branch2)
+r7 = 760fa70e7176b77098a6dea245f31875771cf073 (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): 7fa80e552520fd4f255b22f1192d1e10928a4333
-Found merge parent (/branches/branch2:6-7): 188aa97a7a0e290c4ec285f81c9871acbc9bd5fa
-r8 = eb52678eceb9fe13e27cc617680a4e3c2bbd9a00 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): 4f911c72ccab45bf602d20f0f1561318719b4c56
+Found merge parent (/branches/branch2:6-7): 760fa70e7176b77098a6dea245f31875771cf073
+r8 = ad450cedf1fcbe5e21b5b30ba5d9aab538aad731 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk r8
 ok 2 - clone svn repo
@@ -533945,6 +530463,285 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9169-git-svn-dcommit-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
+W: +empty_dir: dir
+r1 = 06acb5dda409b93c2c2227ea4d0e610a62ee1f79 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
+	A	foo
+Committed r2
+	A	foo
+r2 = ad350b54463f98e1ef697dcb067e425ec95dcd9c (refs/remotes/git-svn)
+No changes between fd782beca63aca30b5d5bfc353d94f1e3b9bfb3a 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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9151-svn-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9151-svn-mergeinfo/.git/
+expecting success of 9151.1 'load svn dump': 
+	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9151-svn-mergeinfo/svnrepo' 	  <'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9151/svn-mergeinfo.dump' &&
+	git svn init --minimize-url -R svnmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9151-svn-mergeinfo/svnrepo' &&
+	git svn fetch --all
+
+r1 = 7ed7a8721885457b4b334110ca70ed04c4f8166a (refs/remotes/origin/trunk)
+	A	Makefile
+r2 = 2d5fcce57cec73616f628fbaed5a49ef3d0e42de (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left, 1
+Found branch parent: (refs/remotes/origin/left) 7ed7a8721885457b4b334110ca70ed04c4f8166a
+Following parent with do_switch
+	A	Makefile
+Successfully followed parent
+r3 = f9ab6c8a604f40729e9b681bb3a1e867f9fa3ae8 (refs/remotes/origin/left)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/right, 1
+Found branch parent: (refs/remotes/origin/right) 7ed7a8721885457b4b334110ca70ed04c4f8166a
+Following parent with do_switch
+	A	Makefile
+Successfully followed parent
+r4 = ddaeba46f3443446ad10c8e9f9708015508a3b28 (refs/remotes/origin/right)
+	M	Makefile
+r5 = aec3f7b969e8f39a07d95041e1a0fa1084a62636 (refs/remotes/origin/left)
+	M	Makefile
+r6 = 4e8f83f1ab23aef5373017e90af34f1819af8cab (refs/remotes/origin/right)
+	M	Makefile
+r7 = 6bc3353f7fcec0c37010a59b688fa9d2584a744d (refs/remotes/origin/left)
+	M	Makefile
+r8 = 3126dfd1119e03e412157f726d08c90a3fd4d7d4 (refs/remotes/origin/left)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left-sub, 3
+Found branch parent: (refs/remotes/origin/left-sub) f9ab6c8a604f40729e9b681bb3a1e867f9fa3ae8
+Following parent with do_switch
+	M	Makefile
+Successfully followed parent
+r9 = 577c6d95762177126ca3068518ff8b75fcf0c25e (refs/remotes/origin/left-sub)
+	A	README
+r10 = 0f51792c59119f80d15583143eecc11a609f7f4b (refs/remotes/origin/left-sub)
+	M	Makefile
+Checking svn:mergeinfo changes since r2: 1 sources, 1 changed
+Found merge parent (/branches/left:2-10): 3126dfd1119e03e412157f726d08c90a3fd4d7d4
+r11 = 684711c1a28ba8ad47b8dbcc1fae523e6d7513a6 (refs/remotes/origin/trunk)
+	A	zlonk
+r12 = 48e21141201f46c911875b76b5656d8baac09a66 (refs/remotes/origin/left)
+	A	bang
+r13 = 2d65500a924079bcf2a63be861289fc72bc3e87f (refs/remotes/origin/right)
+	M	Makefile
+	A	bang
+Checking svn:mergeinfo changes since r11: 2 sources, 1 changed
+W: svn cherry-pick ignored (/branches/right:6-13) - missing 1 commit(s) (eg ddaeba46f3443446ad10c8e9f9708015508a3b28)
+r14 = 963722fb11bb2d08a6acd03123060441585c7d97 (refs/remotes/origin/trunk)
+Checking svn:mergeinfo changes since r14: 2 sources, 1 changed
+Found merge parent (/branches/right:2-14): 2d65500a924079bcf2a63be861289fc72bc3e87f
+r15 = 7a0288891e49f8f764fafb9c51e0da446284f6e3 (refs/remotes/origin/trunk)
+	A	urkkk
+r16 = acd76c6201c8a7f1ba7539daebe82128902deb28 (refs/remotes/origin/right)
+	A	vronk
+r17 = 3d987e350cb0b84c1a962f28322075148a4769f9 (refs/remotes/origin/trunk)
+	M	Makefile
+	A	bang
+	A	urkkk
+Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
+Found merge parent (/branches/right:2-17): acd76c6201c8a7f1ba7539daebe82128902deb28
+r18 = 33a71c4853e3bc75096416afb6b6a3f84317e11f (refs/remotes/origin/left-sub)
+	A	wham_eth
+r19 = c18b93e7676efb39156e30479f389f162e075937 (refs/remotes/origin/left-sub)
+	A	glurpp
+r20 = d3a5e11772cce14223736862eaae254c6361de52 (refs/remotes/origin/left)
+	A	wham_eth
+Checking svn:mergeinfo changes since r20: 1 sources, 1 changed
+W: svn cherry-pick ignored (/branches/left-sub:19) - missing 6 commit(s) (eg ddaeba46f3443446ad10c8e9f9708015508a3b28)
+r21 = 26f066648b9fbb8d41953f51720855ea7b504643 (refs/remotes/origin/left)
+	M	Makefile
+	A	README
+	A	bang
+	A	urkkk
+Checking svn:mergeinfo changes since r21: 2 sources, 2 changed
+Found merge parent (/branches/left-sub:4-19): c18b93e7676efb39156e30479f389f162e075937
+Found merge parent (/branches/right:2-17): acd76c6201c8a7f1ba7539daebe82128902deb28
+r22 = 873f392f3b5b995738db38ddb497e4133a1eabd6 (refs/remotes/origin/left)
+	A	README
+	A	glurpp
+	A	urkkk
+	A	wham_eth
+	A	zlonk
+Checking svn:mergeinfo changes since r17: 3 sources, 3 changed
+Found merge parent (/branches/left:2-22): 873f392f3b5b995738db38ddb497e4133a1eabd6
+Found merge parent (/branches/left-sub:4-19): c18b93e7676efb39156e30479f389f162e075937
+Found merge parent (/branches/right:2-17): acd76c6201c8a7f1ba7539daebe82128902deb28
+r23 = 10f41d438deef69896cd202a8dba696fccb1fc16 (refs/remotes/origin/trunk)
+Checking svn:mergeinfo changes since r23: 3 sources, 1 changed
+r24 = 8d72d496d3fd4fe5f56c4a458bb6b6bce8074ac3 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/b1, 24
+Found branch parent: (refs/remotes/origin/b1) 8d72d496d3fd4fe5f56c4a458bb6b6bce8074ac3
+Following parent with do_switch
+Successfully followed parent
+r25 = 9583bc1ca96e396c2e8a6afbe0d7677c952e76f9 (refs/remotes/origin/b1)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/b2, 25
+Found branch parent: (refs/remotes/origin/b2) 8d72d496d3fd4fe5f56c4a458bb6b6bce8074ac3
+Following parent with do_switch
+Successfully followed parent
+r26 = b956cd3ea8808cb0732e51412dec60ce5d4c66de (refs/remotes/origin/b2)
+	A	b2file
+r27 = 689fa6c27d1d57acd4f5e2ed3b78bfd3818cfa48 (refs/remotes/origin/b2)
+	A	b1file
+r28 = c65e9d2dd0f29cc8756c66041aafca5ae7b40c87 (refs/remotes/origin/b1)
+	A	b1file
+Checking svn:mergeinfo changes since r24: 4 sources, 1 changed
+Found merge parent (/branches/b1:25-28): c65e9d2dd0f29cc8756c66041aafca5ae7b40c87
+r29 = 8a70eced3c8b9eb56742bb2b8182d3363ef65c9c (refs/remotes/origin/trunk)
+	A	trunkfile
+r30 = 94dd10334175598f49a097035fcfba8563928048 (refs/remotes/origin/trunk)
+	A	b1file
+	A	trunkfile
+Checking svn:mergeinfo changes since r27: 5 sources, 2 changed
+Found merge parent (/branches/b1:25-28): c65e9d2dd0f29cc8756c66041aafca5ae7b40c87
+Found merge parent (/trunk:26-30): 94dd10334175598f49a097035fcfba8563928048
+r31 = a38a7b8623e016fc7fa3d8e86138d2ac45bf8a24 (refs/remotes/origin/b2)
+	A	b2file
+Checking svn:mergeinfo changes since r30: 5 sources, 1 changed
+Found merge parent (/branches/b2:26-31): a38a7b8623e016fc7fa3d8e86138d2ac45bf8a24
+r32 = 8357602aacc215884be1cae384e21f61dbe8a70f (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/f1, 32
+Found branch parent: (refs/remotes/origin/f1) 8357602aacc215884be1cae384e21f61dbe8a70f
+Following parent with do_switch
+	A	f1file
+Successfully followed parent
+r33 = f78f3a5d1e3b322462cb535cfa72092188e5b55f (refs/remotes/origin/f1)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/f2, 33
+Found branch parent: (refs/remotes/origin/f2) 8357602aacc215884be1cae384e21f61dbe8a70f
+Following parent with do_switch
+	A	f2file
+Successfully followed parent
+r34 = 1f35cafcf36f5273f266e0fdf53b2b0e5cae9932 (refs/remotes/origin/f2)
+	A	f1file
+	A	f2file
+Checking svn:mergeinfo changes since r32: 7 sources, 2 changed
+Found merge parent (/branches/f1:33-34): f78f3a5d1e3b322462cb535cfa72092188e5b55f
+Found merge parent (/branches/f2:34): 1f35cafcf36f5273f266e0fdf53b2b0e5cae9932
+r35 = 93881fcc99fb98b085dde9da85df5f471242a3d8 (refs/remotes/origin/trunk)
+	A	subdir/cowboy
+r36 = 71b29806ce50e7abcebc021bddd47ea9925b62d1 (refs/remotes/origin/left)
+	A	subdir/cowboy
+Checking svn:mergeinfo changes since r35: 7 sources, 1 changed
+Found merge parent (/branches/left:2-36): 71b29806ce50e7abcebc021bddd47ea9925b62d1
+r37 = a7818cc97d8d22845c6c4b16c4029f0a19580e17 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/partial, 37
+Initializing parent: refs/remotes/origin/partial@37
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk/subdir, 36
+Initializing parent: refs/remotes/origin/partial@36
+	A	cowboy
+r36 = 36ab2d3b9d077028fa3d659325ac8ca081e348bc (refs/remotes/origin/partial@36)
+Found branch parent: (refs/remotes/origin/partial@37) 36ab2d3b9d077028fa3d659325ac8ca081e348bc
+Following parent with do_switch
+Successfully followed parent
+r37 = 94ef88aa1ebfb64b5525f3aed8dd36d7ec63cecc (refs/remotes/origin/partial@37)
+Found branch parent: (refs/remotes/origin/partial) 94ef88aa1ebfb64b5525f3aed8dd36d7ec63cecc
+Following parent with do_switch
+Successfully followed parent
+r38 = 910f886650e45984540884fbce419222d5dbe772 (refs/remotes/origin/partial)
+	A	palindromes
+r39 = fdb537791ee8ba532e49c3d5a34a30feeb87bd59 (refs/remotes/origin/partial)
+	A	subdir/palindromes
+r40 = 90411e1b2118e11664e368a24a1eaa5e8749d150 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/tags/v1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/bugfix, 41
+Initializing parent: refs/remotes/origin/bugfix@41
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/tags/v1.0, 40
+Found branch parent: (refs/remotes/origin/bugfix@41) 90411e1b2118e11664e368a24a1eaa5e8749d150
+Following parent with do_switch
+Successfully followed parent
+r41 = f4522c2fc7b8b6ab30592330d961ed5321c3ddc7 (refs/remotes/origin/bugfix@41)
+Found branch parent: (refs/remotes/origin/bugfix) f4522c2fc7b8b6ab30592330d961ed5321c3ddc7
+Following parent with do_switch
+Successfully followed parent
+r42 = 21d184ac3dd2fcbc5f88a25abde26db37e05d6db (refs/remotes/origin/bugfix)
+	M	subdir/palindromes
+r43 = a671eec900764a4ab85a6166def3e0d30f1a2664 (refs/remotes/origin/bugfix)
+	M	subdir/palindromes
+Checking svn:mergeinfo changes since r40: 9 sources, 2 changed
+Couldn't find revmap for file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/tags/v1.0
+Found merge parent (/branches/bugfix:42-43): a671eec900764a4ab85a6166def3e0d30f1a2664
+r44 = a110dec28a4b152b394906b1303fbf19174f7d26 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk r44
+ok 1 - load svn dump
+
+expecting success of 9151.2 'all svn merges became git merge commits': 
+	git rev-list --all --no-merges --grep=Merge >unmarked &&
+	test_must_be_empty unmarked
+
+ok 2 - all svn merges became git merge commits
+
+expecting success of 9151.3 'cherry picks did not become git merge commits': 
+	git rev-list --all --merges --grep=Cherry >bad-cherries &&
+	test_must_be_empty bad-cherries
+
+ok 3 - cherry picks did not become git merge commits
+
+expecting success of 9151.4 'svn non-merge merge commits did not become git merge commits': 
+	git rev-list --all --merges --grep=non-merge >bad-non-merges &&
+	test_must_be_empty bad-non-merges
+
+ok 4 - svn non-merge merge commits did not become git merge commits
+
+expecting success of 9151.5 'commit made to merged branch is reachable from the merge': 
+	before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
+	merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
+	git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
+	test_must_be_empty not-reachable
+
+ok 5 - commit made to merged branch is reachable from the merge
+
+expecting success of 9151.6 'merging two branches in one commit is detected correctly': 
+	f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
+	f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
+	merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
+	git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
+	test_must_be_empty not-reachable
+
+ok 6 - merging two branches in one commit is detected correctly
+
+checking known breakage of 9151.7 'everything got merged in the end': 
+	git rev-list --all --not main >unmerged &&
+	test_must_be_empty unmerged
+
+fatal: ambiguous argument 'main': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+not ok 7 - everything got merged in the end # TODO known breakage
+
+# still have 1 known breakage(s)
+# passed all remaining 6 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9165-git-svn-fetch-merge-branch-of-branch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9165-git-svn-fetch-merge-branch-of-branch/.git/
 expecting success of 9165.1 'initialize source svn repo': 
@@ -534045,35 +530842,35 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 42677b3c0ff4f406f7aafe94f7fdaf50d6d97d10 (refs/remotes/origin/trunk)
+r1 = dec701610235d5094bda9331520f4cf6d96bf01c (refs/remotes/origin/trunk)
 	A	foo
-r3 = d628ece5a5462a18116806049282209dbe1ae9c6 (refs/remotes/origin/trunk)
+r3 = a825770b0f52db3be469dc0c4fbe08d70f284e63 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) d628ece5a5462a18116806049282209dbe1ae9c6
+Found branch parent: (refs/remotes/origin/branch1) a825770b0f52db3be469dc0c4fbe08d70f284e63
 Following parent with do_switch
 Successfully followed parent
-r4 = 3151f392872ce1e73e261ee9052ac32a159e53e5 (refs/remotes/origin/branch1)
+r4 = 207663f97179005208a191a1e37360719e976500 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 67738c1f82a367bc86eca07f6adf14b31ee3f694 (refs/remotes/origin/branch1)
+r5 = 4c35bb58f146e235922a9810eb76a330a807d0a6 (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 67738c1f82a367bc86eca07f6adf14b31ee3f694
+Found branch parent: (refs/remotes/origin/branch2) 4c35bb58f146e235922a9810eb76a330a807d0a6
 Following parent with do_switch
 Successfully followed parent
-r6 = 4471162551a30e8ecf368ab7f73ed04ea7ff4604 (refs/remotes/origin/branch2)
+r6 = 1741ed6074a6fc3573fc391579b878d93cd876a9 (refs/remotes/origin/branch2)
 	A	baz
-r7 = 0a7b900118413fee45ece13a944f1eae8748803d (refs/remotes/origin/branch2)
+r7 = ebf0b8c9da71da03b65bbd4cf9dedfa7cdae305d (refs/remotes/origin/branch2)
 	A	bar2
-r8 = 3f889524dfa577a2f0f970895e961af2bee774bd (refs/remotes/origin/trunk)
+r8 = 4b05f1c67ef238d826ef893327f6a5a681e993a5 (refs/remotes/origin/trunk)
 	A	bar2
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/trunk:4-8): 3f889524dfa577a2f0f970895e961af2bee774bd
-r9 = cd712815dcb19f567ccafbe9370970592cb3960e (refs/remotes/origin/branch2)
+Found merge parent (/trunk:4-8): 4b05f1c67ef238d826ef893327f6a5a681e993a5
+r9 = deafdcf6c73d5e58bf0af818a7476edecb71f841 (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): 67738c1f82a367bc86eca07f6adf14b31ee3f694
-Found merge parent (/branches/branch2:6-9): cd712815dcb19f567ccafbe9370970592cb3960e
-r10 = 7dabbf5b05f9786cb86639ee238357909af95d9a (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): 4c35bb58f146e235922a9810eb76a330a807d0a6
+Found merge parent (/branches/branch2:6-9): deafdcf6c73d5e58bf0af818a7476edecb71f841
+r10 = 2d830a8f22520ae2d2b9944b430c552313dac5ba (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
 ok 2 - clone svn repo
@@ -534205,43 +531002,43 @@
 	git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 6724c6f94f3f86cbb491150e8a504cc2c1fc9a79 (refs/remotes/git-svn)
+r1 = 19666384337f92be6e57c506ac6482c2026ab887 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = 79495d7853607de688de8b05fe267eeab15b2eee (refs/remotes/git-svn)
+r2 = 494103d0c89fb29e2fed3f4ee80068d85ac62965 (refs/remotes/git-svn)
 	D	4/.gitignore
 W: -empty_dir: 4/.gitignore
-r3 = 945a205ddbde70b8dadf8121c9e2c717644ebaae (refs/remotes/git-svn)
+r3 = c281ba9924a6c43b529b8f54bb5fa7dee33e9ad1 (refs/remotes/git-svn)
 	D	4/a/.gitignore
 W: -empty_dir: 4/a/.gitignore
-r4 = e6e702e4c848bae1d8ef72750bca2a2b8db9fd38 (refs/remotes/git-svn)
+r4 = eb8cc9ea26315d8989ec31754bd6fc18a2c0b87f (refs/remotes/git-svn)
 	D	4/a/b/.gitignore
 W: -empty_dir: 4/a/b/.gitignore
-r5 = d189231b12ccbe3445f26655129444e56f039808 (refs/remotes/git-svn)
+r5 = 912cd5beed242cfa838f91c56ede4ceae3caa422 (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 = fcb2dbdd272946aaeb6da0f88d0bf2395ab18f68 (refs/remotes/git-svn)
+r6 = 0cc5c7c27bc2b3d4a07e6cca22cf0b60f3779f6b (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 = 4311f87cb8d20815ae563d59fe24123554441176 (refs/remotes/git-svn)
+r7 = 2f84c6696558c2021b9a10fe5dec61b9a50d4e32 (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 = 279cb5e18a8514a0376ad44391a6295371ba8c96 (refs/remotes/git-svn)
+r8 = e161acc85cd4ca0ba90fa339266c9bd84c16a265 (refs/remotes/git-svn)
 	D	5/.gitignore
 	A	5/.placeholder
 	D	6/.gitignore
 W: -empty_dir: 5/.gitignore
 W: -empty_dir: 6/.gitignore
-r9 = 4777e23855b538130e18e08fbc4d856b8a748d96 (refs/remotes/git-svn)
+r9 = e6bd572b799f4155a07db92cc78a8c86f48d1aa6 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 ok 2 - clone svn repo with --preserve-empty-dirs
@@ -534291,7 +531088,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 4311f87 delete non-last entry in directory
+HEAD is now at 2f84c66 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': 
@@ -534302,40 +531099,40 @@
 	test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 6724c6f94f3f86cbb491150e8a504cc2c1fc9a79 (refs/remotes/git-svn)
+r1 = 19666384337f92be6e57c506ac6482c2026ab887 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = 42262c7434ef586dd35811666b0548afec299a2c (refs/remotes/git-svn)
+r2 = 30ccae376814d96d141d727834cfbe6590210d31 (refs/remotes/git-svn)
 	D	4/.placeholder
 W: -empty_dir: 4/.placeholder
-r3 = 38766a29fa6411281b97b2b41c996dfbfedaaa73 (refs/remotes/git-svn)
+r3 = dd3d50c59788416bff6095516e3c0ec65110fda6 (refs/remotes/git-svn)
 	D	4/a/.placeholder
 W: -empty_dir: 4/a/.placeholder
-r4 = 01dac7ba65d9ddd195894b8578136dd838b4110a (refs/remotes/git-svn)
+r4 = 734d41c9dd8c2582ba299fd1f68eff28bab56b8f (refs/remotes/git-svn)
 	D	4/a/b/.placeholder
 W: -empty_dir: 4/a/b/.placeholder
-r5 = f51ce82b39ddeb5f02daab8f2cb3c7c9b4ee9088 (refs/remotes/git-svn)
+r5 = 39c03da593135344613dff861320cbfe0a7ae8e9 (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 = 12f388e833307b894eb758fabdf51d6c7312c420 (refs/remotes/git-svn)
+r6 = 21beea2f7df25b2564f556e5962c3f3e414b574d (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 = 93530e2dc9e3e5b6f5ed48adc9eec7f91290e902 (refs/remotes/git-svn)
+r7 = 064cfa1564f29d6c8499f8c7056538c9460545e5 (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 = 82a52dfd5d563cb26658fe64d68ac32733e60367 (refs/remotes/git-svn)
+r8 = d2e887b2ebd4a8fbf351dd62eed30e016c5dafec (refs/remotes/git-svn)
 	A	5/.placeholder
 	D	6/.placeholder
-r9 = bb273f58ad76acf33dc66b19af1b3239a545fbc0 (refs/remotes/git-svn)
+r9 = d3089cff65035fd7db83336fe9e55508a7aade94 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 git-svn-repo/6/.placeholder/.placeholder
@@ -534399,7 +531196,7 @@
 	A	1/file1.txt
 	A	5/file1.txt
 W: -empty_dir: 1/.placeholder
-r10 = 35c99980807f06ce59a60bf651ae3d9c6f3d1a98 (refs/remotes/git-svn)
+r10 = 8281fa899d1f843a60b6fb77095129efe2dafc83 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - second set of svn commits and rebase
 
@@ -534423,6 +531220,731 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9163-git-svn-reset-clears-caches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9163-git-svn-reset-clears-caches/.git/
+expecting success of 9163.1 'initialize source svn repo': 
+	svn_cmd mkdir -m "create trunk" "$svnrepo"/trunk &&
+	svn_cmd mkdir -m "create branches" "$svnrepo/branches" &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		touch foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "a" &&
+		svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
+		svn_cmd switch "$svnrepo"/branches/branch1 &&
+		touch bar &&
+		svn_cmd add bar &&
+		svn_cmd commit -m b &&
+		svn_cmd switch "$svnrepo"/trunk &&
+		touch baz &&
+		svn_cmd add baz &&
+		svn_cmd commit -m c &&
+		svn_cmd up &&
+		svn_cmd merge "$svnrepo"/branches/branch1 &&
+		svn_cmd commit -m "m"
+	) &&
+	rm -rf "$SVN_TREE"
+
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Checked out revision 2.
+A         foo
+Adding         foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Committing transaction...
+Committed revision 4.
+At revision 4.
+A         bar
+Adding         bar
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+D    bar
+Updated to revision 5.
+A         baz
+Adding         baz
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+Updating '.':
+At revision 6.
+--- Merging r4 through r6 into '.':
+A    bar
+--- Recording mergeinfo for merge of r4 through r6 into '.':
+ U   .
+Sending        .
+Adding         bar
+Committing transaction...
+Committed revision 7.
+ok 1 - initialize source svn repo
+
+expecting success of 9163.2 'fetch to merge-base (a)': 
+	git svn init -s "$svnrepo" &&
+	git svn fetch --revision BASE:3
+
+r1 = 116b2ed47cac2c0484a3c435ffbc6be8b8a883a8 (refs/remotes/origin/trunk)
+	A	foo
+r3 = ac0bafc82376ca069a75a0db6a8ca2073a86d56a (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
+ok 2 - fetch to merge-base (a)
+
+expecting success of 9163.3 'rebase looses SVN merge (m)': 
+	git svn rebase &&
+	git svn fetch &&
+	test 1 = $(git cat-file -p main|grep parent|wc -l)
+
+	A	baz
+r6 = 910f180525112dd1af953dc3f13f210a31b800b1 (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.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
+r7 = 595cb6ff0b3f7942558fa54bf305d0bedacf832d (refs/remotes/origin/trunk)
+Successfully rebased and updated refs/heads/main.
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) ac0bafc82376ca069a75a0db6a8ca2073a86d56a
+Following parent with do_switch
+Successfully followed parent
+r4 = 5f4f7cf52d4b2b230707c6e786c3db53ab3649a1 (refs/remotes/origin/branch1)
+	A	bar
+r5 = 0d7ce1b0d7765ce12e73fcea1a59a6cff2bcdf2e (refs/remotes/origin/branch1)
+ok 3 - rebase looses SVN merge (m)
+
+expecting success of 9163.4 'reset and fetch gets the SVN merge (m) correctly': 
+	git svn reset -r 3 &&
+	git reset --hard origin/trunk &&
+	git svn fetch &&
+	test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
+
+r3 = ac0bafc82376ca069a75a0db6a8ca2073a86d56a (refs/remotes/origin/trunk)
+HEAD is now at ac0bafc a
+Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
+rereading ac0bafc82376ca069a75a0db6a8ca2073a86d56a
+	A	baz
+r6 = 910f180525112dd1af953dc3f13f210a31b800b1 (refs/remotes/origin/trunk)
+	A	bar
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-6): 0d7ce1b0d7765ce12e73fcea1a59a6cff2bcdf2e
+r7 = 96883099315b84ad468e1ebad1994681a30ef8a3 (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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9162-git-svn-dcommit-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
+r1 = 15f147bb6497a4f2edaeb4cb15af7c8f9371f5c1 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
+[master 36c0ba3] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+	A	foo
+Committed r2
+	A	foo
+r2 = b1fb58bc846db7dfb591d8f458a6b4e599778704 (refs/remotes/git-svn)
+No changes between 36c0ba305578e3fd761a8c04458dcc75c31372c1 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 74144b1] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 355e382] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 98cf3b2] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 74144b1850a118f956d7470dada20f0dbb19ef0d
+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 355e382a2e47864015be704dd21800029379281f
+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 98cf3b273b4e173dca635a0456fd696dc4037433
+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 = e5f13d2994306f527dc737c81b4fb190f7c39679 (refs/remotes/git-svn)
+	M	foo
+Committed r4
+	M	foo
+r4 = a637e7d734b246c596f3f5914fe3055dad9fe033 (refs/remotes/git-svn)
+	M	foo
+Committed r5
+	M	foo
+r5 = 834408abba3b79a3903c0297913761828812fe73 (refs/remotes/git-svn)
+No changes between 98cf3b273b4e173dca635a0456fd696dc4037433 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 15993e7] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master efc4d19] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 28e0a8b] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 15993e75a80ad2fe920c2ec03dbbb7445e9e4469
+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 efc4d19d5777e6f598a0d64116eb5a0244c9e851
+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 28e0a8b2cdc160b07295bca7a5500efd6ab2c778
+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 834408a 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 15993e7] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master efc4d19] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 28e0a8b] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 15993e75a80ad2fe920c2ec03dbbb7445e9e4469
+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 efc4d19d5777e6f598a0d64116eb5a0244c9e851
+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 834408a 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 15993e7] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master efc4d19] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 28e0a8b] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 15993e75a80ad2fe920c2ec03dbbb7445e9e4469
+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 = f15adb67338cc8f01c5e5d13b694d0475dc5a294 (refs/remotes/git-svn)
+	M	foo
+Committed r7
+	M	foo
+r7 = 43211914bba743f3c470107f4967dee5f551951c (refs/remotes/git-svn)
+	M	foo
+Committed r8
+	M	foo
+r8 = 6820713622317c3ebf72be8108cdbdf446e05b04 (refs/remotes/git-svn)
+No changes between 28e0a8b2cdc160b07295bca7a5500efd6ab2c778 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+HEAD is now at 6820713 change #3
+ok 5 - answers: all
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9302-fast-import-unpack-limit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9302-fast-import-unpack-limit/.git/
+expecting success of 9302.1 'create loose objects on import': 
+	test_tick &&
+	cat >input <<-INPUT_END &&
+	commit refs/heads/main
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	initial
+	COMMIT
+
+	done
+	INPUT_END
+
+	git -c fastimport.unpackLimit=2 fast-import --done <input &&
+	git fsck --no-progress &&
+	test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
+	test $(find .git/objects/pack -type f | wc -l) -eq 0
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            2 (         0 duplicates                  )
+      blobs  :            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:           1 (         1 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
+---------------------------------------------------------------------
+
+notice: HEAD points to an unborn branch (master)
+ok 1 - create loose objects on import
+
+expecting success of 9302.2 'bigger packs are preserved': 
+	test_tick &&
+	cat >input <<-INPUT_END &&
+	commit refs/heads/main
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	incremental should create a pack
+	COMMIT
+	from refs/heads/main^0
+
+	commit refs/heads/branch
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	branch
+	COMMIT
+
+	done
+	INPUT_END
+
+	git -c fastimport.unpackLimit=2 fast-import --done <input &&
+	git fsck --no-progress &&
+	test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
+	test $(find .git/objects/pack -type f | wc -l) -eq 2
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            3 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           2 (         2 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            =          4
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        329 /        329
+---------------------------------------------------------------------
+
+notice: HEAD points to an unborn branch (master)
+ok 2 - bigger packs are preserved
+
+expecting success of 9302.3 'lookups after checkpoint works': 
+	hello_id=$(echo hello | git hash-object --stdin -t blob) &&
+	id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
+	before=$(git rev-parse refs/heads/main^0) &&
+	(
+		cat <<-INPUT_END &&
+		blob
+		mark :1
+		data 6
+		hello
+
+		commit refs/heads/main
+		mark :2
+		committer $id
+		data <<COMMIT
+		checkpoint after this
+		COMMIT
+		from refs/heads/main^0
+		M 100644 :1 hello
+
+		# pre-checkpoint
+		cat-blob :1
+		cat-blob $hello_id
+		checkpoint
+		# post-checkpoint
+		cat-blob :1
+		cat-blob $hello_id
+		INPUT_END
+
+		n=0 &&
+		from=$before &&
+		while test x"$from" = x"$before"
+		do
+			if test $n -gt 30
+			then
+				echo >&2 "checkpoint did not update branch" &&
+				exit 1
+			else
+				n=$(($n + 1))
+			fi &&
+			sleep 1 &&
+			from=$(git rev-parse refs/heads/main^0)
+		done &&
+		cat <<-INPUT_END &&
+		commit refs/heads/main
+		committer $id
+		data <<COMMIT
+		make sure from "unpacked sha1 reference" works, too
+		COMMIT
+		from $from
+		INPUT_END
+		echo done
+	) | git -c fastimport.unpackLimit=100 fast-import --done &&
+	test $(find .git/objects/?? -type f | wc -l) -eq 6 &&
+	test $(find .git/objects/pack -type f | wc -l) -eq 2
+
+ce013625030ba8dba906f756967f9e9ca394464a blob 6
+hello
+
+ce013625030ba8dba906f756967f9e9ca394464a blob 6
+hello
+
+ce013625030ba8dba906f756967f9e9ca394464a blob 6
+hello
+
+ce013625030ba8dba906f756967f9e9ca394464a blob 6
+hello
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            4 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         2 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            =          5
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          1 /          2
+pack_report: pack_mapped              =        329 /        581
+---------------------------------------------------------------------
+
+ok 3 - lookups after checkpoint works
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9304-fast-import-marks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/.git/
+expecting success of 9304.1 'setup dump of basic history': 
+	test_commit one &&
+	git fast-export --export-marks=marks HEAD >dump
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup dump of basic history
+
+expecting success of 9304.2 'setup large marks file': 
+	# normally a marks file would have a lot of useful, unique
+	# marks. But for our purposes, just having a lot of nonsense
+	# ones is fine. Start at 1024 to avoid clashing with marks
+	# legitimately used in our tiny dump.
+	blob=$(git rev-parse HEAD:one.t) &&
+	for i in $(test_seq 1024 16384)
+	do
+		echo ":$i $blob" || return 1
+	done >>marks
+
+ok 2 - setup large marks file
+
+expecting success of 9304.3 'import with large marks file': 
+	git fast-import --import-marks=marks <dump
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         2 duplicates                  )
+      blobs  :            0 (         1 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         1 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:        1048576 (     15363 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 3 - import with large marks file
+
+expecting success of 9304.4 'setup dump with submodule': 
+	test_config_global protocol.file.allow always &&
+	git submodule add "$PWD" sub &&
+	git commit -m "add submodule" &&
+	git fast-export HEAD >dump
+
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/sub'...
+done.
+[master 07ad432] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 4 - setup dump with submodule
+
+expecting success of 9304.5 'setup submodule mapping with large id': 
+	old=$(git rev-parse HEAD:sub) &&
+	new=$(echo $old | sed s/./a/g) &&
+	echo ":12345 $old" >from &&
+	echo ":12345 $new" >to
+
+ok 5 - setup submodule mapping with large id
+
+expecting success of 9304.6 'import with submodule mapping': 
+	git init dst &&
+	git -C dst fast-import \
+		--rewrite-submodules-from=sub:../from \
+		--rewrite-submodules-to=sub:../to \
+		<dump &&
+	git -C dst rev-parse HEAD:sub >actual &&
+	echo "$new" >expect &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/dst/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          1 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
+---------------------------------------------------------------------
+
+ok 6 - import with submodule mapping
+
+expecting success of 9304.7 'paths adjusted for relative subdir': 
+	git init deep-dst &&
+	mkdir deep-dst/subdir &&
+	>deep-dst/subdir/empty-marks &&
+	git -C deep-dst/subdir fast-import \
+		--rewrite-submodules-from=sub:../../from \
+		--rewrite-submodules-to=sub:../../to \
+		--import-marks=empty-marks \
+		--export-marks=exported-marks \
+		--export-pack-edges=exported-edges \
+		<dump &&
+	# we do not bother checking resulting repo; we just care that nothing
+	# complained about failing to open files for reading, and that files
+	# for writing were created in the expected spot
+	test_path_is_file deep-dst/subdir/exported-marks &&
+	test_path_is_file deep-dst/subdir/exported-edges
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/deep-dst/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          1 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
+---------------------------------------------------------------------
+
+ok 7 - paths adjusted for relative subdir
+
+expecting success of 9304.8 'relative marks are not affected by subdir': 
+	git init deep-relative &&
+	mkdir deep-relative/subdir &&
+	git -C deep-relative/subdir fast-import \
+		--relative-marks \
+		--export-marks=exported-marks \
+		<dump &&
+	test_path_is_missing deep-relative/subdir/exported-marks &&
+	test_path_is_file deep-relative/.git/info/fast-import/exported-marks
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/deep-relative/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          1 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 (         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
+---------------------------------------------------------------------
+
+ok 8 - relative marks are not affected by subdir
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9211-scalar-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9211-scalar-clone/.git/
 expecting success of 9211.1 'set up repository to clone': 
@@ -534791,613 +532313,391 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9151-svn-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9151-svn-mergeinfo/.git/
-expecting success of 9151.1 'load svn dump': 
-	svnadmin load -q '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9151-svn-mergeinfo/svnrepo' 	  <'/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9151/svn-mergeinfo.dump' &&
-	git svn init --minimize-url -R svnmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9151-svn-mergeinfo/svnrepo' &&
-	git svn fetch --all
-
-r1 = 7ed7a8721885457b4b334110ca70ed04c4f8166a (refs/remotes/origin/trunk)
-	A	Makefile
-r2 = 2d5fcce57cec73616f628fbaed5a49ef3d0e42de (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left, 1
-Found branch parent: (refs/remotes/origin/left) 7ed7a8721885457b4b334110ca70ed04c4f8166a
-Following parent with do_switch
-	A	Makefile
-Successfully followed parent
-r3 = f9ab6c8a604f40729e9b681bb3a1e867f9fa3ae8 (refs/remotes/origin/left)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/right, 1
-Found branch parent: (refs/remotes/origin/right) 7ed7a8721885457b4b334110ca70ed04c4f8166a
-Following parent with do_switch
-	A	Makefile
-Successfully followed parent
-r4 = ddaeba46f3443446ad10c8e9f9708015508a3b28 (refs/remotes/origin/right)
-	M	Makefile
-r5 = aec3f7b969e8f39a07d95041e1a0fa1084a62636 (refs/remotes/origin/left)
-	M	Makefile
-r6 = 4e8f83f1ab23aef5373017e90af34f1819af8cab (refs/remotes/origin/right)
-	M	Makefile
-r7 = 6bc3353f7fcec0c37010a59b688fa9d2584a744d (refs/remotes/origin/left)
-	M	Makefile
-r8 = 3126dfd1119e03e412157f726d08c90a3fd4d7d4 (refs/remotes/origin/left)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left-sub, 3
-Found branch parent: (refs/remotes/origin/left-sub) f9ab6c8a604f40729e9b681bb3a1e867f9fa3ae8
-Following parent with do_switch
-	M	Makefile
-Successfully followed parent
-r9 = 577c6d95762177126ca3068518ff8b75fcf0c25e (refs/remotes/origin/left-sub)
-	A	README
-r10 = 0f51792c59119f80d15583143eecc11a609f7f4b (refs/remotes/origin/left-sub)
-	M	Makefile
-Checking svn:mergeinfo changes since r2: 1 sources, 1 changed
-Found merge parent (/branches/left:2-10): 3126dfd1119e03e412157f726d08c90a3fd4d7d4
-r11 = 684711c1a28ba8ad47b8dbcc1fae523e6d7513a6 (refs/remotes/origin/trunk)
-	A	zlonk
-r12 = 48e21141201f46c911875b76b5656d8baac09a66 (refs/remotes/origin/left)
-	A	bang
-r13 = 2d65500a924079bcf2a63be861289fc72bc3e87f (refs/remotes/origin/right)
-	M	Makefile
-	A	bang
-Checking svn:mergeinfo changes since r11: 2 sources, 1 changed
-W: svn cherry-pick ignored (/branches/right:6-13) - missing 1 commit(s) (eg ddaeba46f3443446ad10c8e9f9708015508a3b28)
-r14 = 963722fb11bb2d08a6acd03123060441585c7d97 (refs/remotes/origin/trunk)
-Checking svn:mergeinfo changes since r14: 2 sources, 1 changed
-Found merge parent (/branches/right:2-14): 2d65500a924079bcf2a63be861289fc72bc3e87f
-r15 = 7a0288891e49f8f764fafb9c51e0da446284f6e3 (refs/remotes/origin/trunk)
-	A	urkkk
-r16 = acd76c6201c8a7f1ba7539daebe82128902deb28 (refs/remotes/origin/right)
-	A	vronk
-r17 = 3d987e350cb0b84c1a962f28322075148a4769f9 (refs/remotes/origin/trunk)
-	M	Makefile
-	A	bang
-	A	urkkk
-Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
-Found merge parent (/branches/right:2-17): acd76c6201c8a7f1ba7539daebe82128902deb28
-r18 = 33a71c4853e3bc75096416afb6b6a3f84317e11f (refs/remotes/origin/left-sub)
-	A	wham_eth
-r19 = c18b93e7676efb39156e30479f389f162e075937 (refs/remotes/origin/left-sub)
-	A	glurpp
-r20 = d3a5e11772cce14223736862eaae254c6361de52 (refs/remotes/origin/left)
-	A	wham_eth
-Checking svn:mergeinfo changes since r20: 1 sources, 1 changed
-W: svn cherry-pick ignored (/branches/left-sub:19) - missing 6 commit(s) (eg ddaeba46f3443446ad10c8e9f9708015508a3b28)
-r21 = 26f066648b9fbb8d41953f51720855ea7b504643 (refs/remotes/origin/left)
-	M	Makefile
-	A	README
-	A	bang
-	A	urkkk
-Checking svn:mergeinfo changes since r21: 2 sources, 2 changed
-Found merge parent (/branches/left-sub:4-19): c18b93e7676efb39156e30479f389f162e075937
-Found merge parent (/branches/right:2-17): acd76c6201c8a7f1ba7539daebe82128902deb28
-r22 = 873f392f3b5b995738db38ddb497e4133a1eabd6 (refs/remotes/origin/left)
-	A	README
-	A	glurpp
-	A	urkkk
-	A	wham_eth
-	A	zlonk
-Checking svn:mergeinfo changes since r17: 3 sources, 3 changed
-Found merge parent (/branches/left:2-22): 873f392f3b5b995738db38ddb497e4133a1eabd6
-Found merge parent (/branches/left-sub:4-19): c18b93e7676efb39156e30479f389f162e075937
-Found merge parent (/branches/right:2-17): acd76c6201c8a7f1ba7539daebe82128902deb28
-r23 = 10f41d438deef69896cd202a8dba696fccb1fc16 (refs/remotes/origin/trunk)
-Checking svn:mergeinfo changes since r23: 3 sources, 1 changed
-r24 = 8d72d496d3fd4fe5f56c4a458bb6b6bce8074ac3 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/b1, 24
-Found branch parent: (refs/remotes/origin/b1) 8d72d496d3fd4fe5f56c4a458bb6b6bce8074ac3
-Following parent with do_switch
-Successfully followed parent
-r25 = 9583bc1ca96e396c2e8a6afbe0d7677c952e76f9 (refs/remotes/origin/b1)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/b2, 25
-Found branch parent: (refs/remotes/origin/b2) 8d72d496d3fd4fe5f56c4a458bb6b6bce8074ac3
-Following parent with do_switch
-Successfully followed parent
-r26 = b956cd3ea8808cb0732e51412dec60ce5d4c66de (refs/remotes/origin/b2)
-	A	b2file
-r27 = 689fa6c27d1d57acd4f5e2ed3b78bfd3818cfa48 (refs/remotes/origin/b2)
-	A	b1file
-r28 = c65e9d2dd0f29cc8756c66041aafca5ae7b40c87 (refs/remotes/origin/b1)
-	A	b1file
-Checking svn:mergeinfo changes since r24: 4 sources, 1 changed
-Found merge parent (/branches/b1:25-28): c65e9d2dd0f29cc8756c66041aafca5ae7b40c87
-r29 = 8a70eced3c8b9eb56742bb2b8182d3363ef65c9c (refs/remotes/origin/trunk)
-	A	trunkfile
-r30 = 94dd10334175598f49a097035fcfba8563928048 (refs/remotes/origin/trunk)
-	A	b1file
-	A	trunkfile
-Checking svn:mergeinfo changes since r27: 5 sources, 2 changed
-Found merge parent (/branches/b1:25-28): c65e9d2dd0f29cc8756c66041aafca5ae7b40c87
-Found merge parent (/trunk:26-30): 94dd10334175598f49a097035fcfba8563928048
-r31 = a38a7b8623e016fc7fa3d8e86138d2ac45bf8a24 (refs/remotes/origin/b2)
-	A	b2file
-Checking svn:mergeinfo changes since r30: 5 sources, 1 changed
-Found merge parent (/branches/b2:26-31): a38a7b8623e016fc7fa3d8e86138d2ac45bf8a24
-r32 = 8357602aacc215884be1cae384e21f61dbe8a70f (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/f1, 32
-Found branch parent: (refs/remotes/origin/f1) 8357602aacc215884be1cae384e21f61dbe8a70f
-Following parent with do_switch
-	A	f1file
-Successfully followed parent
-r33 = f78f3a5d1e3b322462cb535cfa72092188e5b55f (refs/remotes/origin/f1)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/f2, 33
-Found branch parent: (refs/remotes/origin/f2) 8357602aacc215884be1cae384e21f61dbe8a70f
-Following parent with do_switch
-	A	f2file
-Successfully followed parent
-r34 = 1f35cafcf36f5273f266e0fdf53b2b0e5cae9932 (refs/remotes/origin/f2)
-	A	f1file
-	A	f2file
-Checking svn:mergeinfo changes since r32: 7 sources, 2 changed
-Found merge parent (/branches/f1:33-34): f78f3a5d1e3b322462cb535cfa72092188e5b55f
-Found merge parent (/branches/f2:34): 1f35cafcf36f5273f266e0fdf53b2b0e5cae9932
-r35 = 93881fcc99fb98b085dde9da85df5f471242a3d8 (refs/remotes/origin/trunk)
-	A	subdir/cowboy
-r36 = 71b29806ce50e7abcebc021bddd47ea9925b62d1 (refs/remotes/origin/left)
-	A	subdir/cowboy
-Checking svn:mergeinfo changes since r35: 7 sources, 1 changed
-Found merge parent (/branches/left:2-36): 71b29806ce50e7abcebc021bddd47ea9925b62d1
-r37 = a7818cc97d8d22845c6c4b16c4029f0a19580e17 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/partial, 37
-Initializing parent: refs/remotes/origin/partial@37
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/left/subdir => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk/subdir, 36
-Initializing parent: refs/remotes/origin/partial@36
-	A	cowboy
-r36 = 36ab2d3b9d077028fa3d659325ac8ca081e348bc (refs/remotes/origin/partial@36)
-Found branch parent: (refs/remotes/origin/partial@37) 36ab2d3b9d077028fa3d659325ac8ca081e348bc
-Following parent with do_switch
-Successfully followed parent
-r37 = 94ef88aa1ebfb64b5525f3aed8dd36d7ec63cecc (refs/remotes/origin/partial@37)
-Found branch parent: (refs/remotes/origin/partial) 94ef88aa1ebfb64b5525f3aed8dd36d7ec63cecc
-Following parent with do_switch
-Successfully followed parent
-r38 = 910f886650e45984540884fbce419222d5dbe772 (refs/remotes/origin/partial)
-	A	palindromes
-r39 = fdb537791ee8ba532e49c3d5a34a30feeb87bd59 (refs/remotes/origin/partial)
-	A	subdir/palindromes
-r40 = 90411e1b2118e11664e368a24a1eaa5e8749d150 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/tags/v1.0 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/branches/bugfix, 41
-Initializing parent: refs/remotes/origin/bugfix@41
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/tags/v1.0, 40
-Found branch parent: (refs/remotes/origin/bugfix@41) 90411e1b2118e11664e368a24a1eaa5e8749d150
-Following parent with do_switch
-Successfully followed parent
-r41 = f4522c2fc7b8b6ab30592330d961ed5321c3ddc7 (refs/remotes/origin/bugfix@41)
-Found branch parent: (refs/remotes/origin/bugfix) f4522c2fc7b8b6ab30592330d961ed5321c3ddc7
-Following parent with do_switch
-Successfully followed parent
-r42 = 21d184ac3dd2fcbc5f88a25abde26db37e05d6db (refs/remotes/origin/bugfix)
-	M	subdir/palindromes
-r43 = a671eec900764a4ab85a6166def3e0d30f1a2664 (refs/remotes/origin/bugfix)
-	M	subdir/palindromes
-Checking svn:mergeinfo changes since r40: 9 sources, 2 changed
-Couldn't find revmap for file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/tags/v1.0
-Found merge parent (/branches/bugfix:42-43): a671eec900764a4ab85a6166def3e0d30f1a2664
-r44 = a110dec28a4b152b394906b1303fbf19174f7d26 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9151-svn-mergeinfo/svnrepo/trunk r44
-ok 1 - load svn dump
-
-expecting success of 9151.2 'all svn merges became git merge commits': 
-	git rev-list --all --no-merges --grep=Merge >unmarked &&
-	test_must_be_empty unmarked
-
-ok 2 - all svn merges became git merge commits
-
-expecting success of 9151.3 'cherry picks did not become git merge commits': 
-	git rev-list --all --merges --grep=Cherry >bad-cherries &&
-	test_must_be_empty bad-cherries
-
-ok 3 - cherry picks did not become git merge commits
-
-expecting success of 9151.4 'svn non-merge merge commits did not become git merge commits': 
-	git rev-list --all --merges --grep=non-merge >bad-non-merges &&
-	test_must_be_empty bad-non-merges
-
-ok 4 - svn non-merge merge commits did not become git merge commits
-
-expecting success of 9151.5 'commit made to merged branch is reachable from the merge': 
-	before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
-	merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
-	git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
-	test_must_be_empty not-reachable
-
-ok 5 - commit made to merged branch is reachable from the merge
-
-expecting success of 9151.6 'merging two branches in one commit is detected correctly': 
-	f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
-	f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
-	merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
-	git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
-	test_must_be_empty not-reachable
-
-ok 6 - merging two branches in one commit is detected correctly
-
-checking known breakage of 9151.7 'everything got merged in the end': 
-	git rev-list --all --not main >unmerged &&
-	test_must_be_empty unmerged
-
-fatal: ambiguous argument 'main': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-not ok 7 - everything got merged in the end # TODO known breakage
-
-# still have 1 known breakage(s)
-# passed all remaining 6 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9163-git-svn-reset-clears-caches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9163-git-svn-reset-clears-caches/.git/
-expecting success of 9163.1 'initialize source svn repo': 
-	svn_cmd mkdir -m "create trunk" "$svnrepo"/trunk &&
-	svn_cmd mkdir -m "create branches" "$svnrepo/branches" &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "a" &&
-		svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
-		svn_cmd switch "$svnrepo"/branches/branch1 &&
-		touch bar &&
-		svn_cmd add bar &&
-		svn_cmd commit -m b &&
-		svn_cmd switch "$svnrepo"/trunk &&
-		touch baz &&
-		svn_cmd add baz &&
-		svn_cmd commit -m c &&
-		svn_cmd up &&
-		svn_cmd merge "$svnrepo"/branches/branch1 &&
-		svn_cmd commit -m "m"
-	) &&
-	rm -rf "$SVN_TREE"
-
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Checked out revision 2.
-A         foo
-Adding         foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Committing transaction...
-Committed revision 4.
-At revision 4.
-A         bar
-Adding         bar
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-D    bar
-Updated to revision 5.
-A         baz
-Adding         baz
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-Updating '.':
-At revision 6.
---- Merging r4 through r6 into '.':
-A    bar
---- Recording mergeinfo for merge of r4 through r6 into '.':
- U   .
-Sending        .
-Adding         bar
-Committing transaction...
-Committed revision 7.
-ok 1 - initialize source svn repo
-
-expecting success of 9163.2 'fetch to merge-base (a)': 
-	git svn init -s "$svnrepo" &&
-	git svn fetch --revision BASE:3
-
-r1 = b25d9e7bba90e9d4df690f5e08efedff903731a6 (refs/remotes/origin/trunk)
-	A	foo
-r3 = f43c42fa5a1cd463d99ae889f01cafd597a15d05 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
-ok 2 - fetch to merge-base (a)
-
-expecting success of 9163.3 'rebase looses SVN merge (m)': 
-	git svn rebase &&
-	git svn fetch &&
-	test 1 = $(git cat-file -p main|grep parent|wc -l)
-
-	A	baz
-r6 = 71fe005d597b9a061b1bb77be9360fe26577e86b (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.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
-r7 = d3ddaff0fb32dd65376cbb704081928733c14acb (refs/remotes/origin/trunk)
-Successfully rebased and updated refs/heads/main.
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) f43c42fa5a1cd463d99ae889f01cafd597a15d05
-Following parent with do_switch
-Successfully followed parent
-r4 = ccd4654953e2155f2080fd322594e33ca44d3cd0 (refs/remotes/origin/branch1)
-	A	bar
-r5 = dde26ba1f2304d21b5ad5fbf39fb4bdc168c42d3 (refs/remotes/origin/branch1)
-ok 3 - rebase looses SVN merge (m)
-
-expecting success of 9163.4 'reset and fetch gets the SVN merge (m) correctly': 
-	git svn reset -r 3 &&
-	git reset --hard origin/trunk &&
-	git svn fetch &&
-	test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
-
-r3 = f43c42fa5a1cd463d99ae889f01cafd597a15d05 (refs/remotes/origin/trunk)
-HEAD is now at f43c42f a
-Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
-rereading f43c42fa5a1cd463d99ae889f01cafd597a15d05
-	A	baz
-r6 = 71fe005d597b9a061b1bb77be9360fe26577e86b (refs/remotes/origin/trunk)
-	A	bar
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-6): dde26ba1f2304d21b5ad5fbf39fb4bdc168c42d3
-r7 = 577e10b826e3d4ece9e297a9cb047a7ad1404db0 (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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9162-git-svn-dcommit-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t9303-fast-import-compression.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9303-fast-import-compression/.git/
+expecting success of 9303.1 'fast-import (packed) with -c core.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-Committing transaction...
-Committed revision 1.
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
-r1 = 00b4a4c58eb1620b3f5f82cbfb1abf96b9a34813 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
-[master 9e3490d] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-	A	foo
-Committed r2
-	A	foo
-r2 = e6ed9bda4542c0a18c58d3ec9de8c9f9e5e9bce5 (refs/remotes/git-svn)
-No changes between 9e3490dac0041bf500fae2d222486e3d40739e33 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 1 - initialize repo
+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
+---------------------------------------------------------------------
 
-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
+ok 1 - fast-import (packed) with -c core.compression=0
 
-y" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
-	)
+expecting success of 9303.2 'fast-import (packed) with -c core.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-[master 4e2ef06] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master db49d43] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master dbf6955] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 4e2ef06e92ea976d7d3df8756905a9b6dc090828
-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 db49d43fb7eb7a363ba02069aa3dee8e0a991f4b
-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 dbf69551621b257428b943592a23710e60be11f9
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    change #3
+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
+---------------------------------------------------------------------
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
-Committed r3
-	M	foo
-r3 = fb0f9d04eec517fc43401a99718543d2ebf003ce (refs/remotes/git-svn)
-	M	foo
-Committed r4
-	M	foo
-r4 = f15a1515f95cb2737753726a15ba496e0fcf52c3 (refs/remotes/git-svn)
-	M	foo
-Committed r5
-	M	foo
-r5 = ed549359ea3762f8dd1ce54e1851f1241ef51314 (refs/remotes/git-svn)
-No changes between dbf69551621b257428b943592a23710e60be11f9 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 2 - answers: y [\n] yes
+ok 2 - fast-import (packed) with -c core.compression=9
 
-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
-	)
+expecting success of 9303.3 'fast-import (packed) with -c core.compression=0 -c pack.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-[master 3b45730] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 7cc9a50] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f43d9f9] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 3b457306298d0acd2982bb5ad2efa0ac73bdab20
-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 7cc9a5075d74a106b9f2587e9fd74522609bea73
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    change #2
+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
+---------------------------------------------------------------------
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit f43d9f96f0fd10079adbe099b7e8fb5adf2f4f0c
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+ok 3 - fast-import (packed) with -c core.compression=0 -c pack.compression=0
 
-    change #3
+expecting success of 9303.4 'fast-import (packed) with -c core.compression=9 -c pack.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		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
+---------------------------------------------------------------------
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at ed54935 change #3
-ok 3 - answers: yes yes no
+ok 4 - fast-import (packed) with -c core.compression=9 -c pack.compression=0
 
-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
-	)
+expecting success of 9303.5 'fast-import (packed) with -c core.compression=0 -c pack.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-[master 3b45730] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 7cc9a50] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f43d9f9] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 3b457306298d0acd2982bb5ad2efa0ac73bdab20
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    change #1
+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
+---------------------------------------------------------------------
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 7cc9a5075d74a106b9f2587e9fd74522609bea73
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+ok 5 - fast-import (packed) with -c core.compression=0 -c pack.compression=9
 
-    change #2
+expecting success of 9303.6 'fast-import (packed) with -c core.compression=9 -c pack.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		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
+---------------------------------------------------------------------
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at ed54935 change #3
-ok 4 - answers: yes quit
+ok 6 - fast-import (packed) with -c core.compression=9 -c pack.compression=9
 
-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
-	)
+expecting success of 9303.7 'fast-import (packed) with -c pack.compression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
 	
-[master 3b45730] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 7cc9a50] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f43d9f9] 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.48.0~rc1+next.20250101/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 3b457306298d0acd2982bb5ad2efa0ac73bdab20
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+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
+---------------------------------------------------------------------
 
-    change #1
+ok 7 - fast-import (packed) with -c pack.compression=0
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
-Committed r6
-	M	foo
-r6 = 92ed3fa98baeaf98361cc078b7417878339ef760 (refs/remotes/git-svn)
-	M	foo
-Committed r7
-	M	foo
-r7 = 1560704628a60e4662ce84650ea3dec74fccd6a1 (refs/remotes/git-svn)
-	M	foo
-Committed r8
-	M	foo
-r8 = ce978d24f4067c50e975a026538e0f23a685e28f (refs/remotes/git-svn)
-No changes between f43d9f96f0fd10079adbe099b7e8fb5adf2f4f0c and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-HEAD is now at ce978d2 change #3
-ok 5 - answers: all
+expecting success of 9303.8 'fast-import (packed) with -c pack.compression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=0 $config &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
+		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
+---------------------------------------------------------------------
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9304-fast-import-marks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/.git/
-expecting success of 9304.1 'setup dump of basic history': 
-	test_commit one &&
-	git fast-export --export-marks=marks HEAD >dump
+ok 8 - fast-import (packed) with -c pack.compression=9
 
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup dump of basic history
+expecting success of 9303.9 'fast-import (loose) with -c core.compression=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
+---------------------------------------------------------------------
 
-expecting success of 9304.2 'setup large marks file': 
-	# normally a marks file would have a lot of useful, unique
-	# marks. But for our purposes, just having a lot of nonsense
-	# ones is fine. Start at 1024 to avoid clashing with marks
-	# legitimately used in our tiny dump.
-	blob=$(git rev-parse HEAD:one.t) &&
-	for i in $(test_seq 1024 16384)
-	do
-		echo ":$i $blob" || return 1
-	done >>marks
+ok 9 - fast-import (loose) with -c core.compression=0
 
-ok 2 - setup large marks file
+expecting success of 9303.10 'fast-import (loose) with -c core.compression=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
+---------------------------------------------------------------------
 
-expecting success of 9304.3 'import with large marks file': 
-	git fast-import --import-marks=marks <dump
+ok 10 - fast-import (loose) with -c core.compression=9
 
+expecting success of 9303.11 'fast-import (loose) with -c core.compression=0 -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 (         2 duplicates                  )
-      blobs  :            0 (         1 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         1 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:           1 (         1 loads     )
-      marks:        1048576 (     15363 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
+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
@@ -535409,55 +532709,103 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 3 - import with large marks file
-
-expecting success of 9304.4 'setup dump with submodule': 
-	test_config_global protocol.file.allow always &&
-	git submodule add "$PWD" sub &&
-	git commit -m "add submodule" &&
-	git fast-export HEAD >dump
+ok 11 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=0
 
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/sub'...
-done.
-[master 07ad432] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 4 - setup dump with submodule
+expecting success of 9303.12 'fast-import (loose) with -c core.compression=9 -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
+---------------------------------------------------------------------
 
-expecting success of 9304.5 'setup submodule mapping with large id': 
-	old=$(git rev-parse HEAD:sub) &&
-	new=$(echo $old | sed s/./a/g) &&
-	echo ":12345 $old" >from &&
-	echo ":12345 $new" >to
+ok 12 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=0
 
-ok 5 - setup submodule mapping with large id
+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
+---------------------------------------------------------------------
 
-expecting success of 9304.6 'import with submodule mapping': 
-	git init dst &&
-	git -C dst fast-import \
-		--rewrite-submodules-from=sub:../from \
-		--rewrite-submodules-to=sub:../to \
-		<dump &&
-	git -C dst rev-parse HEAD:sub >actual &&
-	echo "$new" >expect &&
-	test_cmp expect actual
+ok 13 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=9
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/dst/.git/
+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:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
-      commits:            2 (         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:           1 (         1 loads     )
-      marks:           1024 (         6 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
+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
@@ -535469,39 +532817,31 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 6 - import with submodule mapping
-
-expecting success of 9304.7 'paths adjusted for relative subdir': 
-	git init deep-dst &&
-	mkdir deep-dst/subdir &&
-	>deep-dst/subdir/empty-marks &&
-	git -C deep-dst/subdir fast-import \
-		--rewrite-submodules-from=sub:../../from \
-		--rewrite-submodules-to=sub:../../to \
-		--import-marks=empty-marks \
-		--export-marks=exported-marks \
-		--export-pack-edges=exported-edges \
-		<dump &&
-	# we do not bother checking resulting repo; we just care that nothing
-	# complained about failing to open files for reading, and that files
-	# for writing were created in the expected spot
-	test_path_is_file deep-dst/subdir/exported-marks &&
-	test_path_is_file deep-dst/subdir/exported-edges
+ok 14 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=9
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/deep-dst/.git/
+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:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
-      commits:            2 (         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:           1 (         1 loads     )
-      marks:           1024 (         6 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
+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
@@ -535513,32 +532853,31 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 7 - paths adjusted for relative subdir
-
-expecting success of 9304.8 'relative marks are not affected by subdir': 
-	git init deep-relative &&
-	mkdir deep-relative/subdir &&
-	git -C deep-relative/subdir fast-import \
-		--relative-marks \
-		--export-marks=exported-marks \
-		<dump &&
-	test_path_is_missing deep-relative/subdir/exported-marks &&
-	test_path_is_file deep-relative/.git/info/fast-import/exported-marks
+ok 15 - fast-import (loose) with -c core.loosecompression=0
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9304-fast-import-marks/deep-relative/.git/
+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:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
-      commits:            2 (         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:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
+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
@@ -535550,10 +532889,231 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 8 - relative marks are not affected by subdir
+ok 16 - fast-import (loose) with -c core.loosecompression=9
 
-# passed all 8 test(s)
-1..8
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9351-fast-export-anonymize.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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	2026-03-14 13:39:16.250677808 +0000
++++ committers	2026-03-14 13:39:16.310677808 +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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9210-scalar.sh ***
@@ -535842,7 +533402,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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":"20250209T065600.380973Z-Hcf858c9d-P001e96a9","thread":"main","time":"2025-02-09T06:56:00.403834Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
+{"event":"child_start","sid":"20260314T133910.116203Z-H5c947e1c-P0007e581","thread":"main","time":"2026-03-14T13:39:10.216603Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
 ok 12 - scalar clone --no-... opts
 
 expecting success of 9210.13 'scalar reconfigure': 
@@ -535859,10 +533419,10 @@
 	test_subcommand git maintenance start <reconfigure
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9210-scalar/one/src/.git/
-{"event":"child_start","sid":"20250209T065600.532501Z-Hcf858c9d-P001e985c","thread":"main","time":"2025-02-09T06:56:00.536603Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250209T065600.532501Z-Hcf858c9d-P001e985c","thread":"main","time":"2025-02-09T06:56:00.563779Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250209T065600.532501Z-Hcf858c9d-P001e985c","thread":"main","time":"2025-02-09T06:56:00.585783Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20250209T065600.532501Z-Hcf858c9d-P001e985c","thread":"main","time":"2025-02-09T06:56:00.603426Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260314T133911.227025Z-H5c947e1c-P0007e851","thread":"main","time":"2026-03-14T13:39:11.229321Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260314T133911.227025Z-H5c947e1c-P0007e851","thread":"main","time":"2026-03-14T13:39:11.395529Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260314T133911.227025Z-H5c947e1c-P0007e851","thread":"main","time":"2026-03-14T13:39:11.575164Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20260314T133911.227025Z-H5c947e1c-P0007e851","thread":"main","time":"2026-03-14T13:39:11.695244Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
 ok 13 - scalar reconfigure
 
 expecting success of 9210.14 'scalar reconfigure --all with includeIf.onbranch': 
@@ -536056,43 +533616,43 @@
  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.48.0~rc1+next.20250101/t/trash directory.t9210-scalar/cloned/src': 84.47 GiB (mount flags 0x1000)
-Archive:  /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20250209_065601.zip
+Available space on '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9210-scalar/cloned/src': 58.63 GiB (mount flags 0x1000)
+Archive:  /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20260314_133919.zip
  Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
 --------  ------  ------- ---- ---------- ----- --------  ----
-     460  Defl:N      276  40% 2025-02-09 06:56 1d36370d  diagnostics.log
-    1105  Defl:N      274  75% 2025-02-09 06:56 92f891e9  packs-local.txt
-     216  Defl:N      147  32% 2025-02-09 06:56 be5763cf  objects-local.txt
-       6  Stored        6   0% 2025-02-09 06:56 183bc9be  .git/COMMIT_EDITMSG
-     620  Defl:N      431  31% 2025-02-09 06:56 e70b633b  .git/index
-    1141  Defl:N      597  48% 2025-02-09 06:56 7cadd8f5  .git/config
-      25  Stored       25   0% 2025-02-09 06:56 7ce4afd6  .git/HEAD
-     479  Defl:N      192  60% 2025-02-09 06:56 13ac71e9  .git/FETCH_HEAD
-      57  Defl:N       39  32% 2025-02-09 06:56 795d289e  .git/config.worktree
-      73  Defl:N       63  14% 2025-02-09 06:56 1f078b37  .git/description
-     478  Defl:N      279  42% 2025-02-09 06:56 09f84f85  .git/hooks/applypatch-msg.sample
-     896  Defl:N      503  44% 2025-02-09 06:56 10caf8e9  .git/hooks/commit-msg.sample
-    4726  Defl:N     1814  62% 2025-02-09 06:56 793c7cef  .git/hooks/fsmonitor-watchman.sample
-     189  Defl:N      138  27% 2025-02-09 06:56 c0f70c9a  .git/hooks/post-update.sample
-     424  Defl:N      265  38% 2025-02-09 06:56 024cc0cf  .git/hooks/pre-applypatch.sample
-    1649  Defl:N      907  45% 2025-02-09 06:56 1b0e50ae  .git/hooks/pre-commit.sample
-     416  Defl:N      255  39% 2025-02-09 06:56 5ef33f44  .git/hooks/pre-merge-commit.sample
-    1492  Defl:N      744  50% 2025-02-09 06:56 303613ed  .git/hooks/prepare-commit-msg.sample
-    1374  Defl:N      701  49% 2025-02-09 06:56 f90a0f0f  .git/hooks/pre-push.sample
-    4898  Defl:N     2015  59% 2025-02-09 06:56 5158ec84  .git/hooks/pre-rebase.sample
-     544  Defl:N      329  40% 2025-02-09 06:56 96f8c492  .git/hooks/pre-receive.sample
-    2783  Defl:N     1254  55% 2025-02-09 06:56 f00806d3  .git/hooks/push-to-checkout.sample
-    2308  Defl:N      975  58% 2025-02-09 06:56 4b9edd4e  .git/hooks/sendemail-validate.sample
-    3650  Defl:N     1173  68% 2025-02-09 06:56 06fcf0d9  .git/hooks/update.sample
-       8  Stored        8   0% 2025-02-09 06:56 4cc141be  .git/info/sparse-checkout
-     240  Defl:N      173  28% 2025-02-09 06:56 21cd3d77  .git/info/exclude
-     323  Defl:N      168  48% 2025-02-09 06:56 dc297921  .git/logs/HEAD
-     319  Defl:N      164  49% 2025-02-09 06:56 51851cc6  .git/logs/refs/heads/parallel
-     140  Defl:N      100  29% 2025-02-09 06:56 7e602633  .git/logs/refs/remotes/origin/HEAD
-     183  Defl:N      131  28% 2025-02-09 06:56 403541c6  .git/logs/refs/remotes/origin/parallel
-      99  Defl:N       90   9% 2025-02-09 06:56 f1474096  .git/objects/info/alternates
+     460  Defl:N      277  40% 2026-03-14 13:39 f4ae394e  diagnostics.log
+    1105  Defl:N      274  75% 2026-03-14 13:39 92f891e9  packs-local.txt
+     216  Defl:N      147  32% 2026-03-14 13:39 be5763cf  objects-local.txt
+       6  Stored        6   0% 2026-03-14 13:39 183bc9be  .git/COMMIT_EDITMSG
+     620  Defl:N      433  30% 2026-03-14 13:39 9e77b16a  .git/index
+    1141  Defl:N      597  48% 2026-03-14 13:39 7cadd8f5  .git/config
+      25  Stored       25   0% 2026-03-14 13:39 7ce4afd6  .git/HEAD
+     479  Defl:N      192  60% 2026-03-14 13:39 13ac71e9  .git/FETCH_HEAD
+      57  Defl:N       39  32% 2026-03-14 13:39 795d289e  .git/config.worktree
+      73  Defl:N       63  14% 2026-03-14 13:39 1f078b37  .git/description
+     478  Defl:N      279  42% 2026-03-14 13:39 09f84f85  .git/hooks/applypatch-msg.sample
+     896  Defl:N      503  44% 2026-03-14 13:39 10caf8e9  .git/hooks/commit-msg.sample
+    4726  Defl:N     1814  62% 2026-03-14 13:39 793c7cef  .git/hooks/fsmonitor-watchman.sample
+     189  Defl:N      138  27% 2026-03-14 13:39 c0f70c9a  .git/hooks/post-update.sample
+     424  Defl:N      265  38% 2026-03-14 13:39 024cc0cf  .git/hooks/pre-applypatch.sample
+    1649  Defl:N      907  45% 2026-03-14 13:39 1b0e50ae  .git/hooks/pre-commit.sample
+     416  Defl:N      255  39% 2026-03-14 13:39 5ef33f44  .git/hooks/pre-merge-commit.sample
+    1492  Defl:N      744  50% 2026-03-14 13:39 303613ed  .git/hooks/prepare-commit-msg.sample
+    1374  Defl:N      701  49% 2026-03-14 13:39 f90a0f0f  .git/hooks/pre-push.sample
+    4898  Defl:N     2015  59% 2026-03-14 13:39 5158ec84  .git/hooks/pre-rebase.sample
+     544  Defl:N      329  40% 2026-03-14 13:39 96f8c492  .git/hooks/pre-receive.sample
+    2783  Defl:N     1254  55% 2026-03-14 13:39 f00806d3  .git/hooks/push-to-checkout.sample
+    2308  Defl:N      975  58% 2026-03-14 13:39 4b9edd4e  .git/hooks/sendemail-validate.sample
+    3650  Defl:N     1173  68% 2026-03-14 13:39 06fcf0d9  .git/hooks/update.sample
+       8  Stored        8   0% 2026-03-14 13:39 4cc141be  .git/info/sparse-checkout
+     240  Defl:N      173  28% 2026-03-14 13:39 21cd3d77  .git/info/exclude
+     323  Defl:N      168  48% 2026-03-14 13:39 dc297921  .git/logs/HEAD
+     319  Defl:N      164  49% 2026-03-14 13:39 51851cc6  .git/logs/refs/heads/parallel
+     140  Defl:N      100  29% 2026-03-14 13:39 7e602633  .git/logs/refs/remotes/origin/HEAD
+     183  Defl:N      131  28% 2026-03-14 13:39 403541c6  .git/logs/refs/remotes/origin/parallel
+      99  Defl:N       90   9% 2026-03-14 13:39 f1474096  .git/objects/info/alternates
 --------          -------  ---                            -------
-   31321            14236  55%                            31 files
+   31321            14239  55%                            31 files
 Contents of /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9210-scalar/.git/objects:
 Total: 3 loose objects
 ok 21 - scalar diagnose
@@ -536101,129 +533661,191 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9351-fast-export-anonymize.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+*** t9350-fast-export.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/.git/
+expecting success of 9350.1 'setup': 
 
-[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
+	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>
- 1 file changed, 1 insertion(+)
- create mode 100644 retain-me.t
-Switched to a new branch 'other'
-[other 7ff9039] subdir/bar
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 file0
+[main 300cb83] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/bar.t
-[other 1427cb1] subdir/xyzzy
+ 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(+)
- create mode 100644 subdir/xyzzy.t
-[other 73eb103] add gitlink
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'wer'
+[wer 708f3c9] sitzt
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ours' strategy.
+ok 1 - setup
 
-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
+expecting success of 9350.2 'fast-export | fast-import': 
 
-ok 2 - export anonymized stream
+	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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+---------------------------------------------------------------------
 
-expecting success of 9351.4 'stream contains user-specified names': 
-	grep retain-me stream &&
-	! grep should-not-appear stream &&
-	grep custom-name stream
+ok 2 - fast-export | fast-import
 
-reset refs/tags/retain-me
-commit refs/tags/ref3/custom-name
-ok 4 - stream contains user-specified names
+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
 
-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
+	EOF
+	test_cmp expected actual
 
-ok 5 - stream omits gitlink oids
+ok 3 - fast-export ^muss^{commit} muss
 
-expecting success of 9351.6 'stream retains other as refname': 
-	grep other stream
+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
 
-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 4 - fast-export --mark-tags ^muss^{commit} muss
 
-ok 7 - stream omits other refnames
+expecting success of 9350.5 'fast-export main~2..main': 
 
-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
+	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)
 
-ok 8 - stream omits identities
 
-expecting success of 9351.9 'stream omits tag message': 
-	! grep "annotated tag" stream
+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
+---------------------------------------------------------------------
 
-ok 9 - stream omits tag message
+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 9351.10 'import stream to new repository': 
-	git init new &&
-	cd new &&
-	git fast-import <../stream
+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))
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+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
@@ -536231,129 +533853,192 @@
 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
+ok 6 - fast-export --reference-excluded-parents main~2..main
 
-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)
+expecting success of 9350.7 'fast-export --show-original-ids': 
 
-ok 11 - result has two branches
+	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
 
-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 7 - fast-export --show-original-ids
 
-ok 12 - repo has original shape and timestamps
+expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
 
-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
+	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 13 - root tree has original shape
+ok 8 - fast-export --show-original-ids | git fast-import
 
-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
+expecting success of 9350.9 'reencoding iso-8859-7': 
 
-ok 14 - paths in subdir ended up in one tree
+	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)
 
-expecting success of 9351.15 'identical gitlinks got identical oid': 
-	awk "/commit/ { print \$3 }" <root | sort -u >commits &&
-	test_line_count = 1 commits
+[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
+---------------------------------------------------------------------
 
-ok 15 - identical gitlinks got identical oid
+Pi: π
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 9 - reencoding iso-8859-7
 
-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
+expecting success of 9350.10 'aborting on iso-8859-7': 
 
-ok 16 - all tags point to branch tip
+	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
 
-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
+[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
 
---- authors	2025-02-09 06:56:01.942463531 +0000
-+++ committers	2025-02-09 06:56:01.946463557 +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
+expecting success of 9350.11 'preserving iso-8859-7': 
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9302-fast-import-unpack-limit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9302-fast-import-unpack-limit/.git/
-expecting success of 9302.1 'create loose objects on import': 
-	test_tick &&
-	cat >input <<-INPUT_END &&
-	commit refs/heads/main
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data <<COMMIT
-	initial
-	COMMIT
+	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)
 
-	done
-	INPUT_END
+[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
+---------------------------------------------------------------------
 
-	git -c fastimport.unpackLimit=2 fast-import --done <input &&
-	git fsck --no-progress &&
-	test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
-	test $(find .git/objects/pack -type f | wc -l) -eq 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:            2 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+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 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -536365,42 +534050,103 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-notice: HEAD points to an unborn branch (master)
-ok 1 - create loose objects on import
+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 9302.2 'bigger packs are preserved': 
-	test_tick &&
-	cat >input <<-INPUT_END &&
-	commit refs/heads/main
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data <<COMMIT
-	incremental should create a pack
-	COMMIT
-	from refs/heads/main^0
+expecting success of 9350.13 'import/export-marks': 
 
-	commit refs/heads/branch
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data <<COMMIT
-	branch
-	COMMIT
+	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
 
-	done
-	INPUT_END
 
-	git -c fastimport.unpackLimit=2 fast-import --done <input &&
-	git fsck --no-progress &&
-	test $(find .git/objects/?? -type f | wc -l) -eq 2 &&
-	test $(find .git/objects/pack -type f | wc -l) -eq 2
+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:            3 (         0 duplicates                  )
+Total objects:            1 (         0 duplicates                  )
       blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           2 (         2 loads     )
+      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
@@ -536410,93 +534156,492 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize = 1073741824
 pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          4
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        329 /        329
+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
 ---------------------------------------------------------------------
 
-notice: HEAD points to an unborn branch (master)
-ok 2 - bigger packs are preserved
+ok 14 - set up faked signed tag
 
-expecting success of 9302.3 'lookups after checkpoint works': 
-	hello_id=$(echo hello | git hash-object --stdin -t blob) &&
-	id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
-	before=$(git rev-parse refs/heads/main^0) &&
+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 &&
 	(
-		cat <<-INPUT_END &&
-		blob
-		mark :1
-		data 6
-		hello
+		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
 
-		commit refs/heads/main
-		mark :2
-		committer $id
-		data <<COMMIT
-		checkpoint after this
-		COMMIT
-		from refs/heads/main^0
-		M 100644 :1 hello
 
-		# pre-checkpoint
-		cat-blob :1
-		cat-blob $hello_id
-		checkpoint
-		# post-checkpoint
-		cat-blob :1
-		cat-blob $hello_id
-		INPUT_END
+Switched to branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 1003335] 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 1b7adec] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - setup submodule
 
-		n=0 &&
-		from=$before &&
-		while test x"$from" = x"$before"
-		do
-			if test $n -gt 30
-			then
-				echo >&2 "checkpoint did not update branch" &&
-				exit 1
-			else
-				n=$(($n + 1))
-			fi &&
-			sleep 1 &&
-			from=$(git rev-parse refs/heads/main^0)
-		done &&
-		cat <<-INPUT_END &&
-		commit refs/heads/main
-		committer $id
-		data <<COMMIT
-		make sure from "unpacked sha1 reference" works, too
-		COMMIT
-		from $from
-		INPUT_END
-		echo done
-	) | git -c fastimport.unpackLimit=100 fast-import --done &&
-	test $(find .git/objects/?? -type f | wc -l) -eq 6 &&
-	test $(find .git/objects/pack -type f | wc -l) -eq 2
+expecting success of 9350.20 'submodule fast-export | fast-import': 
 
-ce013625030ba8dba906f756967f9e9ca394464a blob 6
-hello
+	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
 
-ce013625030ba8dba906f756967f9e9ca394464a blob 6
-hello
 
-ce013625030ba8dba906f756967f9e9ca394464a blob 6
-hello
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 /       1511
+---------------------------------------------------------------------
+
+Already on 'main'
+Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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))
 
-ce013625030ba8dba906f756967f9e9ca394464a blob 6
-hello
 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/new/.git/
+C file2 file4
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            4 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+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 /       1959
+---------------------------------------------------------------------
+
+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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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-14 13:39:19.226677808 +0000
++++ output	2026-03-14 13:39:19.262677808 +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.48.0~rc1+next.20250101/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:           1 (         1 loads     )
-      marks:           1024 (         2 unique    )
+Total branches:           6 (         2 loads     )
+      marks:           1024 (         4 unique    )
       atoms:              1
 Memory total:          2493 KiB
        pools:          2141 KiB
@@ -536505,35 +534650,58 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize = 1073741824
 pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          5
+pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          1 /          2
-pack_report: pack_mapped              =        329 /        581
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /        486
 ---------------------------------------------------------------------
 
-ok 3 - lookups after checkpoint works
+ok 32 - avoid corrupt stream with non-existent mark
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9303-fast-import-compression.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9303-fast-import-compression/.git/
-expecting success of 9303.1 'fast-import (packed) with -c core.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 9350.33 'full-tree re-shows unmodified files': 
+	git checkout -f simple &&
+	git fast-export --full-tree simple >actual &&
+	test $(grep -c file0 actual) -eq 3
+
+Already on 'simple'
+ok 33 - full-tree re-shows unmodified files
+
+expecting success of 9350.34 'set-up a few more tags for tag export tests': 
+	git checkout -f main &&
+	HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
+	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
+	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
+	git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
+	git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
+
+Switched to branch 'main'
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag tree_tag-obj^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+ok 34 - set-up a few more tags for tag export tests
+
+expecting success of 9350.35 'tree_tag': 
+	mkdir result &&
+	(cd result && git init) &&
+	git fast-export tree_tag > fe-stream &&
+	(cd result && git fast-import < ../fe-stream)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/result/.git/
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 1556f9f01d0b37a3d7973e1959b816d8188e3cdd,
+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)
@@ -536545,39 +534713,172 @@
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
+pack_report: core.packedGitWindowSize =          0
+pack_report: core.packedGitLimit      =          0
 pack_report: pack_used_ctr            =          0
 pack_report: pack_mmap_calls          =          0
 pack_report: pack_open_windows        =          0 /          0
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 1 - fast-import (packed) with -c core.compression=0
+ok 35 - tree_tag
 
-expecting success of 9303.2 'fast-import (packed) with -c core.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 9350.36 'tree_tag-obj': git fast-export tree_tag-obj
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 33a141f2e6b012d0239cadf5a469a1e8d5f8632b,
+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 33a141f2e6b012d0239cadf5a469a1e8d5f8632b,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag 2af5c2cd43137bb1d2e90dce5e62870fa434224c,
+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 33a141f2e6b012d0239cadf5a469a1e8d5f8632b,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag 035bec47b039ab554b084cb044726435cf172e71,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 38 - tag-obj_tag-obj
+
+expecting success of 9350.39 'handling tags of blobs': 
+	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
+	git fast-export blobtag >actual &&
+	cat >expect <<-EOF &&
+	blob
+	mark :1
+	data 9
+	die Luft
+
+	tag blobtag
+	from :1
+	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 14
+	Tag of a blob
+
+	EOF
+	test_cmp expect actual
+
+ok 39 - handling tags of blobs
+
+expecting success of 9350.40 'handling nested tags': 
+	git tag -a -m "This is a nested tag" nested muss &&
+	git fast-export --mark-tags nested >output &&
+	grep "^from $ZERO_OID$" output &&
+	grep "^tag nested$" output >tag_lines &&
+	test_line_count = 2 tag_lines
+
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f nested muss^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+from 0000000000000000000000000000000000000000
+ok 40 - handling nested tags
+
+expecting success of 9350.41 'directory becomes symlink': 
+	git init dirtosymlink &&
+	git init result &&
+	(
+		cd dirtosymlink &&
+		mkdir foo &&
+		mkdir bar &&
+		echo hello > foo/world &&
+		echo hello > bar/world &&
+		git add foo/world bar/world &&
+		git commit -q -mone &&
+		git rm -r foo &&
+		test_ln_s_add bar foo &&
+		git commit -q -mtwo
+	) &&
+	(
+		cd dirtosymlink &&
+		git fast-export main -- foo |
+		(cd ../result && git fast-import --quiet)
+	) &&
+	(cd result && git show main:foo)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/dirtosymlink/.git/
+Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/result/.git/
+rm 'foo/world'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+barok 41 - directory becomes symlink
+
+expecting success of 9350.42 'fast-export quotes pathnames': 
+	git init crazy-paths &&
+	test_config -C crazy-paths core.protectNTFS false &&
+	(cd crazy-paths &&
+	 blob=$(echo foo | git hash-object -w --stdin) &&
+	 git -c core.protectNTFS=false update-index --add \
+		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
+		--cacheinfo 100644 $blob "path with \"quote\"" \
+		--cacheinfo 100644 $blob "path with \\backslash" \
+		--cacheinfo 100644 $blob "path with space" &&
+	 git commit -m addition &&
+	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
+	 git read-tree --empty &&
+	 git update-index -z --index-info <index &&
+	 git commit -m rename &&
+	 git read-tree --empty &&
+	 git commit -m deletion &&
+	 git fast-export -M HEAD >export.out &&
+	 git rev-list HEAD >expect &&
+	 git init result &&
+	 cd result &&
+	 git -c core.protectNTFS=false fast-import <../export.out &&
+	 git rev-list HEAD >actual &&
+	 test_cmp ../expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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
@@ -536589,31 +534890,61 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 2 - fast-import (packed) with -c core.compression=9
+ok 42 - fast-export quotes pathnames
 
-expecting success of 9303.3 'fast-import (packed) with -c core.compression=0 -c pack.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 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.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/marks-test/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
+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 /       1511
+---------------------------------------------------------------------
+
+HEAD is now at 1b7adec second
+[main f4fdb0c] 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  :            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
@@ -536625,31 +534956,107 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 3 - fast-import (packed) with -c core.compression=0 -c pack.compression=0
+ok 43 - test bidirectionality
 
-expecting success of 9303.4 'fast-import (packed) with -c core.compression=9 -c pack.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 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 82f6f25] 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/dst/.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:            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:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              2
+Memory total:          2493 KiB
+       pools:          2141 KiB
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -536661,31 +535068,120 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 4 - fast-import (packed) with -c core.compression=9 -c pack.compression=0
+ok 49 - when using -C, do not declare copy when source of copy is also modified
 
-expecting success of 9303.5 'fast-import (packed) with -c core.compression=0 -c pack.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/first-parent/import/.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:           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:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
+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
@@ -536697,2141 +535193,4659 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 5 - fast-import (packed) with -c core.compression=0 -c pack.compression=9
+ok 51 - fast-export --first-parent outputs all revisions output by revision walk
+
+expecting success of 9350.52 'fast-export handles --end-of-options': 
+	git update-ref refs/heads/nodash HEAD &&
+	git update-ref refs/heads/--dashes HEAD &&
+	git fast-export --end-of-options nodash >expect &&
+	git fast-export --end-of-options --dashes >actual.raw &&
+	# fix up lines which mention the ref for comparison
+	sed s/--dashes/nodash/ <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 52 - fast-export handles --end-of-options
+
+# still have 1 known breakage(s)
+# passed all remaining 51 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9168-git-svn-partially-globbed-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9168-git-svn-partially-globbed-names/.git/
+expecting success of 9168.1 'prepare test refspec prefixed globbing': 
+	cat >expect.end <<EOF
+the end
+hi
+start a new branch
+initial
+EOF
+	
+ok 1 - prepare test refspec prefixed globbing
+
+expecting success of 9168.2 'test refspec prefixed globbing': 
+	mkdir -p trunk/src/a trunk/src/b trunk/doc &&
+	echo "hello world" >trunk/src/a/readme &&
+	echo "goodbye world" >trunk/src/b/readme &&
+	svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
+	svn_cmd co "$svnrepo" tmp &&
+	(
+		cd tmp &&
+		mkdir branches tags &&
+		svn_cmd add branches tags &&
+		svn_cmd cp trunk branches/b_start &&
+		svn_cmd commit -m "start a new branch" &&
+		svn_cmd up &&
+		echo "hi" >>branches/b_start/src/b/readme &&
+		poke branches/b_start/src/b/readme &&
+		echo "hey" >>branches/b_start/src/a/readme &&
+		poke branches/b_start/src/a/readme &&
+		svn_cmd commit -m "hi" &&
+		svn_cmd up &&
+		svn_cmd cp branches/b_start tags/t_end &&
+		echo "bye" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		echo "aye" >>tags/t_end/src/a/readme &&
+		poke tags/t_end/src/a/readme &&
+		svn_cmd commit -m "the end" &&
+		echo "byebye" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		svn_cmd commit -m "nothing to see here"
+	) &&
+	git config --add svn-remote.svn.url "$svnrepo" &&
+	git config --add svn-remote.svn.fetch \
+			 "trunk/src/a:refs/remotes/trunk" &&
+	git config --add svn-remote.svn.branches \
+			 "branches/b_*/src/a:refs/remotes/branches/b_*" &&
+	git config --add svn-remote.svn.tags\
+			 "tags/t_*/src/a:refs/remotes/tags/t_*" &&
+	git svn multi-fetch &&
+	git log --pretty=oneline refs/remotes/tags/t_end >actual &&
+	cut -d" " -f2- actual >output.end &&
+	test_cmp expect.end output.end &&
+	test "$(git rev-parse refs/remotes/tags/t_end~1)" = \
+		"$(git rev-parse refs/remotes/branches/b_start)" &&
+	test "$(git rev-parse refs/remotes/branches/b_start~2)" = \
+		"$(git rev-parse refs/remotes/trunk)" &&
+	test_must_fail git rev-parse refs/remotes/tags/t_end@3
+	
+Adding         trunk/doc
+Adding         trunk/src
+Adding         trunk/src/a
+Adding         trunk/src/a/readme
+Adding         trunk/src/b
+Adding         trunk/src/b/readme
+Committing transaction...
+Committed revision 1.
+A    tmp/trunk
+A    tmp/trunk/doc
+A    tmp/trunk/src
+A    tmp/trunk/src/a
+A    tmp/trunk/src/a/readme
+A    tmp/trunk/src/b
+A    tmp/trunk/src/b/readme
+Checked out revision 1.
+A         branches
+A         tags
+A         branches/b_start
+Adding         branches
+Adding         branches/b_start
+Adding         tags
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+Sending        branches/b_start/src/a/readme
+Sending        branches/b_start/src/b/readme
+Transmitting file data ..done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+A         tags/t_end
+Adding         tags/t_end
+Sending        tags/t_end/src/a/readme
+Sending        tags/t_end/src/b/readme
+Transmitting file data ..done
+Committing transaction...
+Committed revision 4.
+Sending        tags/t_end/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Migrating from a git-svn v1 layout...
+Data from a previous version of git-svn exists, but
+	.git/svn
+	(required for this version (2.48.0.rc1.219.gb6b6757d772) of git-svn) does not exist.
+Done migrating from a git-svn v1 layout
+	A	readme
+r1 = dff71f0f5f2a1d3276a890faa7045649319f2b7c (refs/remotes/trunk)
+branch_from: /trunk => /trunk/src/a
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
+Found branch parent: (refs/remotes/branches/b_start) dff71f0f5f2a1d3276a890faa7045649319f2b7c
+Following parent with do_switch
+Successfully followed parent
+r2 = 78988818347ac4d21ef4fa7544e29f8f14d2af96 (refs/remotes/branches/b_start)
+	M	readme
+r3 = 7eb21d5f0da5b91aac6f147991f141fe3dc24850 (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.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
+Found branch parent: (refs/remotes/tags/t_end) 7eb21d5f0da5b91aac6f147991f141fe3dc24850
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r4 = df1aa9ded83f5544870c6606faf35afd3440b365 (refs/remotes/tags/t_end)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a r1
+fatal: ambiguous argument 'refs/remotes/tags/t_end@3': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/tags/t_end@3
+ok 2 - test refspec prefixed globbing
+
+expecting success of 9168.3 'prepare test left-hand-side only prefixed globbing': 
+	echo try to try >expect.two &&
+	echo nothing to see here >>expect.two &&
+	cat expect.end >>expect.two
+	
+ok 3 - prepare test left-hand-side only prefixed globbing
+
+expecting success of 9168.4 'test left-hand-side only prefixed globbing': 
+	git config --add svn-remote.two.url "$svnrepo" &&
+	git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
+	git config --add svn-remote.two.branches \
+			 "branches/b_*:refs/remotes/two/branches/*" &&
+	git config --add svn-remote.two.tags \
+			 "tags/t_*:refs/remotes/two/tags/*" &&
+	(
+		cd tmp &&
+		echo "try try" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	git svn fetch two &&
+	git rev-list refs/remotes/two/tags/t_end >actual &&
+	test_line_count = 6 actual &&
+	git rev-list refs/remotes/two/branches/b_start >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/two/branches/b_start~2) = \
+	     $(git rev-parse refs/remotes/two/trunk) &&
+	test $(git rev-parse refs/remotes/two/tags/t_end~3) = \
+	     $(git rev-parse refs/remotes/two/branches/b_start) &&
+	git log --pretty=oneline refs/remotes/two/tags/t_end >actual &&
+	cut -d" " -f2- actual >output.two &&
+	test_cmp expect.two output.two
+	
+Sending        tags/t_end/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = b046a35eaaeefcb96091878811f7b8bd433636ee (refs/remotes/two/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
+Found branch parent: (refs/remotes/two/branches/b_start) b046a35eaaeefcb96091878811f7b8bd433636ee
+Following parent with do_switch
+Successfully followed parent
+r2 = d1e068e5f1074bd046e3deb68738785ce63c5cc0 (refs/remotes/two/branches/b_start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = 48be97d500a29fe6d14b6f1700c2413d5c47859d (refs/remotes/two/branches/b_start)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
+Found branch parent: (refs/remotes/two/tags/t_end) 48be97d500a29fe6d14b6f1700c2413d5c47859d
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 1e58eaea8d3d3c924d7e1b76bdfd0db01f950b99 (refs/remotes/two/tags/t_end)
+	M	src/b/readme
+r5 = 0a961a9d834b3e7ebb21c40e5776420f9fcfc788 (refs/remotes/two/tags/t_end)
+	M	src/b/readme
+r6 = da6b211884bfc7e4547bb31d89a486e49ddcb271 (refs/remotes/two/tags/t_end)
+ok 4 - test left-hand-side only prefixed globbing
+
+expecting success of 9168.5 'prepare test prefixed globs match just prefix': 
+	cat >expect.three <<EOF
+Tag commit to t_
+Branch commit to b_
+initial
+EOF
+	
+ok 5 - prepare test prefixed globs match just prefix
+
+expecting success of 9168.6 'test prefixed globs match just prefix': 
+	git config --add svn-remote.three.url "$svnrepo" &&
+	git config --add svn-remote.three.fetch \
+			 trunk:refs/remotes/three/trunk &&
+	git config --add svn-remote.three.branches \
+			 "branches/b_*:refs/remotes/three/branches/*" &&
+	git config --add svn-remote.three.tags \
+			 "tags/t_*:refs/remotes/three/tags/*" &&
+	(
+		cd tmp &&
+		svn_cmd cp trunk branches/b_ &&
+		echo "Branch commit to b_" >>branches/b_/src/a/readme &&
+		poke branches/b_/src/a/readme &&
+		svn_cmd commit -m "Branch commit to b_" &&
+		svn_cmd up && svn_cmd cp branches/b_ tags/t_ &&
+		echo "Tag commit to t_" >>tags/t_/src/a/readme &&
+		poke tags/t_/src/a/readme &&
+		svn_cmd commit -m "Tag commit to t_" &&
+		svn_cmd up
+	) &&
+	git svn fetch three &&
+	git rev-list refs/remotes/three/branches/b_ >actual &&
+	test_line_count = 2 actual &&
+	git rev-list refs/remotes/three/tags/t_ >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/three/branches/b_~1) = \
+	     $(git rev-parse refs/remotes/three/trunk) &&
+	test $(git rev-parse refs/remotes/three/tags/t_~1) = \
+	     $(git rev-parse refs/remotes/three/branches/b_) &&
+	git log --pretty=oneline refs/remotes/three/tags/t_ >actual &&
+	cut -d" " -f2- actual >output.three &&
+	test_cmp expect.three output.three
+	
+A         branches/b_
+Adding         branches/b_
+Sending        branches/b_/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 7.
+Updating '.':
+At revision 7.
+A         tags/t_
+Adding         tags/t_
+Sending        tags/t_/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 8.
+Updating '.':
+At revision 8.
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = b046a35eaaeefcb96091878811f7b8bd433636ee (refs/remotes/three/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
+Found branch parent: (refs/remotes/three/branches/b_start) b046a35eaaeefcb96091878811f7b8bd433636ee
+Following parent with do_switch
+Successfully followed parent
+r2 = d1e068e5f1074bd046e3deb68738785ce63c5cc0 (refs/remotes/three/branches/b_start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = 48be97d500a29fe6d14b6f1700c2413d5c47859d (refs/remotes/three/branches/b_start)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
+Found branch parent: (refs/remotes/three/tags/t_end) 48be97d500a29fe6d14b6f1700c2413d5c47859d
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 1e58eaea8d3d3c924d7e1b76bdfd0db01f950b99 (refs/remotes/three/tags/t_end)
+	M	src/b/readme
+r5 = 0a961a9d834b3e7ebb21c40e5776420f9fcfc788 (refs/remotes/three/tags/t_end)
+	M	src/b/readme
+r6 = da6b211884bfc7e4547bb31d89a486e49ddcb271 (refs/remotes/three/tags/t_end)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
+Found branch parent: (refs/remotes/three/branches/b_) b046a35eaaeefcb96091878811f7b8bd433636ee
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r7 = af9e06e302bb0f59ef8765d2846f09ed120dc53c (refs/remotes/three/branches/b_)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
+Found branch parent: (refs/remotes/three/tags/t_) af9e06e302bb0f59ef8765d2846f09ed120dc53c
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r8 = 02cb99550daf3fa05937612e2cadc7a0da4f9e21 (refs/remotes/three/tags/t_)
+ok 6 - test prefixed globs match just prefix
+
+expecting success of 9168.7 'prepare test disallow prefixed multi-globs': 
+cat >expect.four <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/b_*/t/*
+
+EOF
+	
+ok 7 - prepare test disallow prefixed multi-globs
+
+expecting success of 9168.8 'test disallow prefixed multi-globs': 
+	git config --add svn-remote.four.url "$svnrepo" &&
+	git config --add svn-remote.four.fetch \
+			 trunk:refs/remotes/four/trunk &&
+	git config --add svn-remote.four.branches \
+			 "branches/b_*/t/*:refs/remotes/four/branches/*" &&
+	git config --add svn-remote.four.tags \
+			 "tags/t_*/*:refs/remotes/four/tags/*" &&
+	(
+		cd tmp &&
+		echo "try try" >>tags/t_end/src/b/readme &&
+		poke tags/t_end/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	test_must_fail git svn fetch four 2>stderr.four &&
+	test_cmp expect.four stderr.four &&
+	git config --unset svn-remote.four.branches &&
+	git config --unset svn-remote.four.tags
+	
+Sending        tags/t_end/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 9.
+ok 8 - test disallow prefixed multi-globs
+
+expecting success of 9168.9 'prepare test globbing in the middle of the word': 
+	cat >expect.five <<EOF
+Tag commit to fghij
+Branch commit to abcde
+initial
+EOF
+	
+ok 9 - prepare test globbing in the middle of the word
+
+expecting success of 9168.10 'test globbing in the middle of the word': 
+	git config --add svn-remote.five.url "$svnrepo" &&
+	git config --add svn-remote.five.fetch \
+			 trunk:refs/remotes/five/trunk &&
+	git config --add svn-remote.five.branches \
+			 "branches/a*e:refs/remotes/five/branches/*" &&
+	git config --add svn-remote.five.tags \
+			 "tags/f*j:refs/remotes/five/tags/*" &&
+	(
+		cd tmp &&
+		svn_cmd cp trunk branches/abcde &&
+		echo "Branch commit to abcde" >>branches/abcde/src/a/readme &&
+		poke branches/b_/src/a/readme &&
+		svn_cmd commit -m "Branch commit to abcde" &&
+		svn_cmd up &&
+		svn_cmd cp branches/abcde tags/fghij &&
+		echo "Tag commit to fghij" >>tags/fghij/src/a/readme &&
+		poke tags/fghij/src/a/readme &&
+		svn_cmd commit -m "Tag commit to fghij" &&
+		svn_cmd up
+	) &&
+	git svn fetch five &&
+	git rev-list refs/remotes/five/branches/abcde >actual &&
+	test_line_count = 2 actual &&
+	git rev-list refs/remotes/five/tags/fghij >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/five/branches/abcde~1) = \
+	     $(git rev-parse refs/remotes/five/trunk) &&
+	test $(git rev-parse refs/remotes/five/tags/fghij~1) = \
+	     $(git rev-parse refs/remotes/five/branches/abcde) &&
+	git log --pretty=oneline refs/remotes/five/tags/fghij >actual &&
+	cut -d" " -f2- actual >output.five &&
+	test_cmp expect.five output.five
+	
+A         branches/abcde
+Adding         branches/abcde
+Sending        branches/abcde/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 10.
+Updating '.':
+At revision 10.
+A         tags/fghij
+Adding         tags/fghij
+Sending        tags/fghij/src/a/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 11.
+Updating '.':
+At revision 11.
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = b046a35eaaeefcb96091878811f7b8bd433636ee (refs/remotes/five/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
+Found branch parent: (refs/remotes/five/branches/abcde) b046a35eaaeefcb96091878811f7b8bd433636ee
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r10 = 3c30bd73c025fb2df82b6e7189b18d80caa364c0 (refs/remotes/five/branches/abcde)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
+Found branch parent: (refs/remotes/five/tags/fghij) 3c30bd73c025fb2df82b6e7189b18d80caa364c0
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r11 = 9f4a042f5e3722fa8651d009ab2754c412bec959 (refs/remotes/five/tags/fghij)
+ok 10 - test globbing in the middle of the word
+
+expecting success of 9168.11 'prepare test disallow multiple asterisks in one word': 
+	echo "Only one '*' is allowed in a pattern: 'a*c*e'" >expect.six &&
+	echo "" >>expect.six
+	
+ok 11 - prepare test disallow multiple asterisks in one word
+
+expecting success of 9168.12 'test disallow multiple asterisks in one word': 
+	git config --add svn-remote.six.url "$svnrepo" &&
+	git config --add svn-remote.six.fetch \
+			 trunk:refs/remotes/six/trunk &&
+	git config --add svn-remote.six.branches \
+			 "branches/a*c*e:refs/remotes/six/branches/*" &&
+	git config --add svn-remote.six.tags \
+			 "tags/f*h*j:refs/remotes/six/tags/*" &&
+	(
+		cd tmp &&
+		echo "try try" >>tags/fghij/src/b/readme &&
+		poke tags/fghij/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	test_must_fail git svn fetch six 2>stderr.six &&
+	test_cmp expect.six stderr.six
+	
+Sending        tags/fghij/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 12.
+ok 12 - test disallow multiple asterisks in one word
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9161-git-svn-mergeinfo-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' 	  < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9161/branches.dump' &&
+	git svn init --minimize-url -R svnmerge 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' &&
+	git svn fetch --all
+	
+r1 = 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1, 1
+Found branch parent: (refs/remotes/origin/svnb1) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
+Following parent with do_switch
+Successfully followed parent
+r2 = b80313133f79a5e24b1b654a5faac1b93f4c4db3 (refs/remotes/origin/svnb1)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2, 1
+Found branch parent: (refs/remotes/origin/svnb2) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
+Following parent with do_switch
+Successfully followed parent
+r3 = c050f59b4662544fbbe92e1708863cc6f05bb3d2 (refs/remotes/origin/svnb2)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb3, 1
+Found branch parent: (refs/remotes/origin/svnb3) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
+Following parent with do_switch
+Successfully followed parent
+r4 = 7b06ee846363596765dd84c46248f5bedc23981f (refs/remotes/origin/svnb3)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4, 1
+Found branch parent: (refs/remotes/origin/svnb4) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
+Following parent with do_switch
+Successfully followed parent
+r5 = c2069440a46804fcb122a4c54ac89c7a985c12be (refs/remotes/origin/svnb4)
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb5, 1
+Found branch parent: (refs/remotes/origin/svnb5) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
+Following parent with do_switch
+Successfully followed parent
+r6 = 17c0ea8d1711f65984a793738682e62b5f4933a2 (refs/remotes/origin/svnb5)
+	A	b1file
+r7 = f2faef36af6975fec0f09da97bf2720d3495caaa (refs/remotes/origin/svnb1)
+	A	b2file
+r8 = 673e7e36897c71819b57b9d9f0fa23a3387886d9 (refs/remotes/origin/svnb2)
+	A	b3file
+r9 = 57ddcd0f04fca70a11cbc0ee55843d3c335ab445 (refs/remotes/origin/svnb3)
+	A	b4file
+r10 = 9eb4d19c8ae6d2d05377386b1658233cfbb130b8 (refs/remotes/origin/svnb4)
+	A	b5file
+r11 = 55d0c51485de3ddc9842891fc4bdf00a7d251d10 (refs/remotes/origin/svnb5)
+	A	b5file
+Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
+Found merge parent (/branches/svnb5:6,11): 55d0c51485de3ddc9842891fc4bdf00a7d251d10
+r12 = 872c30bd0f07388cedd13e878ff579a67532de58 (refs/remotes/origin/svnb4)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk r1
+ok 1 - load svn dump
+
+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'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f2faef3 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.48.0~rc1+next.20250101/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): 673e7e36897c71819b57b9d9f0fa23a3387886d9
+r13 = 1cecaf75fea7e1390af1c2e170a072cf8e83caa8 (refs/remotes/origin/svnb1)
+No changes between 98d5f712734e2c1955a94560eeaec39060964afb and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 2 - propagate merge information
+
+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 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.48.0~rc1+next.20250101/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): 57ddcd0f04fca70a11cbc0ee55843d3c335ab445
+r14 = 248a4ce63ef81273da14df3d77f292bed0ed3ec4 (refs/remotes/origin/svnb1)
+No changes between 89fedeae029c4329649797a8739b217cf42fafa8 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 4 - merge another branch
+
+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 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.48.0~rc1+next.20250101/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): 872c30bd0f07388cedd13e878ff579a67532de58
+Found merge parent (/branches/svnb5:6,11): 55d0c51485de3ddc9842891fc4bdf00a7d251d10
+r15 = 457a19d5b254d7794eea2db70e7a1fa001a5efe4 (refs/remotes/origin/svnb1)
+No changes between 9c30b9501923925bd20937e6ac8f4f3a73ea13a8 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 6 - merge existing merge
+
+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 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 457a19d Merge remote-tracking branch 'origin/svnb4' into HEAD
+HEAD is now at 673e7e3 b2 commit
+[detached HEAD 22e026a] later b2 commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 newb2file
+[detached HEAD 4c49256] 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.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2 ...
+	A	newb2file
+Committed r16
+	A	newb2file
+r16 = 1f61b07f70c579155fcdc724c40cafdf7c6396ed (refs/remotes/origin/svnb2)
+	A	newb2file-2
+Committed r17
+	A	newb2file-2
+r17 = 8c641a8e6f114e671144c04d423ab87392c5082c (refs/remotes/origin/svnb2)
+No changes between 4c49256ec85847c662a4fc4d15c876062353fd51 and refs/remotes/origin/svnb2
+Resetting to the latest refs/remotes/origin/svnb2
+ok 8 - make further commits to branch
+
+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 8c641a8 later b2 commit 2
+HEAD is now at 457a19d 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.48.0~rc1+next.20250101/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): 8c641a8e6f114e671144c04d423ab87392c5082c
+r18 = 8341b7560e9e789176458489852de5c5f9fa88c6 (refs/remotes/origin/svnb1)
+No changes between 089b141e5e8cec68343e11ff2185c8a7866556cb and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 9 - second forward merge
+
+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 9161.11 'reintegration merge': 
+	git checkout origin/svnb4 &&
+	git merge --no-ff origin/svnb1 &&
+	git svn dcommit
+	
+Previous HEAD position was 8341b75 Merge remote-tracking branch 'origin/svnb2' into HEAD
+HEAD is now at 872c30b 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.48.0~rc1+next.20250101/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): 8341b7560e9e789176458489852de5c5f9fa88c6
+Found merge parent (/branches/svnb2:3,8,16-17): 8c641a8e6f114e671144c04d423ab87392c5082c
+Found merge parent (/branches/svnb3:4,9): 57ddcd0f04fca70a11cbc0ee55843d3c335ab445
+r19 = 71432a6f019feea4d73d7608fa42b039440eda04 (refs/remotes/origin/svnb4)
+No changes between 664597af8251d5dca6437251e2d4aa97d900a588 and refs/remotes/origin/svnb4
+Resetting to the latest refs/remotes/origin/svnb4
+ok 11 - reintegration merge
+
+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
+
+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 71432a6 Merge remote-tracking branch 'origin/svnb1' into HEAD
+HEAD is now at 8341b75 Merge remote-tracking branch 'origin/svnb2' into HEAD
+[detached HEAD 1d2c9aa] 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.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	anotherfile
+Committed r20
+	A	anotherfile
+r20 = 16ba995f8bb78b828f8f6ae447d584c989747bdd (refs/remotes/origin/svnb1)
+Committed r21
+No changes
+b29ba8ffb2eb992f6b0fc95e282ef5556a7be3a9~1 == b29ba8ffb2eb992f6b0fc95e282ef5556a7be3a9
+Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
+Found merge parent (/branches/svnb4:10-12,19): 71432a6f019feea4d73d7608fa42b039440eda04
+r21 = c7d88bafab8dc31fbc79982dde0e964a320afcb3 (refs/remotes/origin/svnb1)
+No changes between b29ba8ffb2eb992f6b0fc95e282ef5556a7be3a9 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
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t7610-mergetool.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7610-mergetool/.git/
+expecting success of 7610.1 'setup': 
+	test_config rerere.enabled true &&
+	echo main >file1 &&
+	echo main spaced >"spaced name" &&
+	echo main file11 >file11 &&
+	echo main file12 >file12 &&
+	echo main file13 >file13 &&
+	echo main file14 >file14 &&
+	mkdir subdir &&
+	echo main sub >subdir/file3 &&
+	test_create_repo submod &&
+	(
+		cd submod &&
+		: >foo &&
+		git add foo &&
+		git commit -m "Add foo"
+	) &&
+	git submodule add file:///dev/null submod &&
+	git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
+	git commit -m "add initial versions" &&
+
+	git checkout -b branch1 main &&
+	git submodule update -N &&
+	echo branch1 change >file1 &&
+	echo branch1 newfile >file2 &&
+	echo branch1 spaced >"spaced name" &&
+	echo branch1 both added >both &&
+	echo branch1 change file11 >file11 &&
+	echo branch1 change file13 >file13 &&
+	echo branch1 sub >subdir/file3 &&
+	(
+		cd submod &&
+		echo branch1 submodule >bar &&
+		git add bar &&
+		git commit -m "Add bar on branch1" &&
+		git checkout -b submod-branch1
+	) &&
+	git add file1 "spaced name" file11 file13 file2 subdir/file3 submod &&
+	git add both &&
+	git rm file12 &&
+	git commit -m "branch1 changes" &&
+
+	git checkout -b delete-base branch1 &&
+	mkdir -p a/a &&
+	test_write_lines one two 3 4 >a/a/file.txt &&
+	git add a/a/file.txt &&
+	git commit -m"base file" &&
+	git checkout -b move-to-b delete-base &&
+	mkdir -p b/b &&
+	git mv a/a/file.txt b/b/file.txt &&
+	test_write_lines one two 4 >b/b/file.txt &&
+	git commit -a -m"move to b" &&
+	git checkout -b move-to-c delete-base &&
+	mkdir -p c/c &&
+	git mv a/a/file.txt c/c/file.txt &&
+	test_write_lines one two 3 >c/c/file.txt &&
+	git commit -a -m"move to c" &&
+
+	git checkout -b stash1 main &&
+	echo stash1 change file11 >file11 &&
+	git add file11 &&
+	git commit -m "stash1 changes" &&
+
+	git checkout -b stash2 main &&
+	echo stash2 change file11 >file11 &&
+	git add file11 &&
+	git commit -m "stash2 changes" &&
+
+	git checkout main &&
+	git submodule update -N &&
+	echo main updated >file1 &&
+	echo main new >file2 &&
+	echo main updated spaced >"spaced name" &&
+	echo main both added >both &&
+	echo main updated file12 >file12 &&
+	echo main updated file14 >file14 &&
+	echo main new sub >subdir/file3 &&
+	(
+		cd submod &&
+		echo main submodule >bar &&
+		git add bar &&
+		git commit -m "Add bar on main" &&
+		git checkout -b submod-main
+	) &&
+	git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
+	git add both &&
+	git rm file11 &&
+	git commit -m "main updates" &&
+
+	git clean -fdx &&
+	git checkout -b order-file-start main &&
+	echo start >a &&
+	echo start >b &&
+	git add a b &&
+	git commit -m start &&
+	git checkout -b order-file-side1 order-file-start &&
+	echo side1 >a &&
+	echo side1 >b &&
+	git add a b &&
+	git commit -m side1 &&
+	git checkout -b order-file-side2 order-file-start &&
+	echo side2 >a &&
+	echo side2 >b &&
+	git add a b &&
+	git commit -m side2 &&
+
+	git config merge.tool mytool &&
+	git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
+	git config mergetool.mytool.trustExitCode true &&
+	git config mergetool.mybase.cmd "cat \"\$BASE\" >\"\$MERGED\"" &&
+	git config mergetool.mybase.trustExitCode true
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7610-mergetool/submod/.git/
+[main (root-commit) d8b1d8e] Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+Adding existing repo at 'submod' to the index
+[main (root-commit) 8119935] add initial versions
+ Author: A U Thor <author@example.com>
+ 9 files changed, 11 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 file1
+ create mode 100644 file11
+ create mode 100644 file12
+ create mode 100644 file13
+ create mode 100644 file14
+ create mode 100644 spaced name
+ create mode 100644 subdir/file3
+ create mode 160000 submod
+Switched to a new branch 'branch1'
+[main b5507ac] Add bar on branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'submod-branch1'
+rm 'file12'
+[branch1 b56897f] branch1 changes
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+), 7 deletions(-)
+ create mode 100644 both
+ delete mode 100644 file12
+ create mode 100644 file2
+Switched to a new branch 'delete-base'
+[delete-base a20b9ac] base file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 a/a/file.txt
+Switched to a new branch 'move-to-b'
+[move-to-b d173899] move to b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ rename {a/a => b/b}/file.txt (83%)
+Switched to a new branch 'move-to-c'
+[move-to-c 7baa014] move to c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ rename {a/a => c/c}/file.txt (83%)
+Switched to a new branch 'stash1'
+M	submod
+[stash1 7727624] stash1 changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'stash2'
+M	submod
+[stash2 3eeb9f3] stash2 changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+M	submod
+Submodule path 'submod': checked out 'd8b1d8e6424e753a8741ec5acadf448ece02afdc'
+[detached HEAD d1fea44] Add bar on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'submod-main'
+rm 'file11'
+[main 42ed12d] main updates
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+), 7 deletions(-)
+ create mode 100644 both
+ delete mode 100644 file11
+ create mode 100644 file2
+Removing a/
+Switched to a new branch 'order-file-start'
+[order-file-start 8e07b42] start
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Switched to a new branch 'order-file-side1'
+[order-file-side1 072d66b] side1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'order-file-side2'
+[order-file-side2 50ba26c] side2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success of 7610.2 'custom mergetool': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool both &&
+	yes "" | git mergetool file1 file1 &&
+	yes "" | git mergetool file2 "spaced name" &&
+	yes "" | git mergetool subdir/file3 &&
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "l" | git mergetool submod &&
+	echo "main updated" >expect &&
+	test_cmp expect file1 &&
+	echo "main new" >expect &&
+	test_cmp expect file2 &&
+	echo "main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test2'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test2 2c3a7d1] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 2c3a7d1 branch1 resolved with mergetool
+ok 2 - custom mergetool
+
+expecting success of 7610.3 'gui mergetool': 
+	test_config merge.guitool myguitool &&
+	test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
+	test_config mergetool.myguitool.trustExitCode true &&
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool --gui both &&
+	yes "" | git mergetool -g file1 file1 &&
+	yes "" | git mergetool --gui file2 "spaced name" &&
+	yes "" | git mergetool --gui subdir/file3 &&
+	yes "d" | git mergetool --gui file11 &&
+	yes "d" | git mergetool --gui file12 &&
+	yes "l" | git mergetool --gui submod &&
+	echo "gui main updated" >expect &&
+	test_cmp expect file1 &&
+	echo "gui main new" >expect &&
+	test_cmp expect file2 &&
+	echo "gui main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test3'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test3 531fc95] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 531fc95 branch1 resolved with mergetool
+ok 3 - gui mergetool
+
+expecting success of 7610.4 'gui mergetool without merge.guitool set falls back to merge.tool': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool --gui both &&
+	yes "" | git mergetool -g file1 file1 &&
+	yes "" | git mergetool --gui file2 "spaced name" &&
+	yes "" | git mergetool --gui subdir/file3 &&
+	yes "d" | git mergetool --gui file11 &&
+	yes "d" | git mergetool --gui file12 &&
+	yes "l" | git mergetool --gui submod &&
+	echo "main updated" >expect &&
+	test_cmp expect file1 &&
+	echo "main new" >expect &&
+	test_cmp expect file2 &&
+	echo "main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test4'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test4 2c3a7d1] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 2c3a7d1 branch1 resolved with mergetool
+ok 4 - gui mergetool without merge.guitool set falls back to merge.tool
+
+expecting success of 7610.5 'mergetool crlf': 
+	test_when_finished "git reset --hard" &&
+	# This test_config line must go after the above reset line so that
+	# core.autocrlf is unconfigured before reset runs.  (The
+	# test_config command uses test_when_finished internally and
+	# test_when_finished is LIFO.)
+	test_config core.autocrlf true &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge main &&
+	yes "" | git mergetool file1 &&
+	yes "" | git mergetool file2 &&
+	yes "" | git mergetool "spaced name" &&
+	yes "" | git mergetool both &&
+	yes "" | git mergetool subdir/file3 &&
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "r" | git mergetool submod &&
+	test "$(printf x | cat file1 -)" = "$(printf "main updated\r\nx")" &&
+	test "$(printf x | cat file2 -)" = "$(printf "main new\r\nx")" &&
+	test "$(printf x | cat subdir/file3 -)" = "$(printf "main new sub\r\nx")" &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool - autocrlf"
+
+Switched to a new branch 'test5'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+Merging:
+spaced name
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test5 2674795] branch1 resolved with mergetool - autocrlf
+ Author: A U Thor <author@example.com>
+HEAD is now at 2674795 branch1 resolved with mergetool - autocrlf
+ok 5 - mergetool crlf
+
+expecting success of 7610.6 'mergetool in subdir': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "" | git mergetool file3 &&
+		echo "main new sub" >expect &&
+		test_cmp expect file3
+	)
+
+Switched to a new branch 'test6'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+HEAD is now at b56897f branch1 changes
+ok 6 - mergetool in subdir
+
+expecting success of 7610.7 'mergetool on file in parent dir': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "" | git mergetool file3 &&
+		yes "" | git mergetool ../file1 &&
+		yes "" | git mergetool ../file2 ../spaced\ name &&
+		yes "" | git mergetool ../both &&
+		yes "d" | git mergetool ../file11 &&
+		yes "d" | git mergetool ../file12 &&
+		yes "l" | git mergetool ../submod &&
+		echo "main updated" >expect &&
+		test_cmp expect ../file1 &&
+		echo "main new" >expect &&
+		test_cmp expect ../file2 &&
+		echo "branch1 submodule" >expect &&
+		test_cmp expect ../submod/bar &&
+		git commit -m "branch1 resolved with mergetool - subdir"
+	)
+
+Switched to a new branch 'test7'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
+
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test7 3b3d211] branch1 resolved with mergetool - subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at 3b3d211 branch1 resolved with mergetool - subdir
+ok 7 - mergetool on file in parent dir
+
+expecting success of 7610.8 'mergetool skips autoresolved': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "l" | git mergetool submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
+
+Switched to a new branch 'test8'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file11
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
+
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at b56897f branch1 changes
+ok 8 - mergetool skips autoresolved
+
+expecting success of 7610.9 'mergetool merges all from subdir (rerere disabled)': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config rerere.enabled false &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "r" | git mergetool ../submod &&
+		yes "d" "d" | git mergetool --no-prompt &&
+		echo "main updated" >expect &&
+		test_cmp expect ../file1 &&
+		echo "main new" >expect &&
+		test_cmp expect ../file2 &&
+		echo "main new sub" >expect &&
+		test_cmp expect file3 &&
+		( cd .. && git submodule update -N ) &&
+		echo "main submodule" >expect &&
+		test_cmp expect ../submod/bar &&
+		git commit -m "branch2 resolved by mergetool from subdir"
+	)
+
+Switched to a new branch 'test9'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+[test9 af143c6] branch2 resolved by mergetool from subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at af143c6 branch2 resolved by mergetool from subdir
+ok 9 - mergetool merges all from subdir (rerere disabled)
+
+expecting success of 7610.10 'mergetool merges all from subdir (rerere enabled)': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config rerere.enabled true &&
+	rm -rf .git/rr-cache &&
+	(
+		cd subdir &&
+		test_must_fail git merge main &&
+		yes "r" | git mergetool ../submod &&
+		yes "d" "d" | git mergetool --no-prompt &&
+		echo "main updated" >expect &&
+		test_cmp expect ../file1 &&
+		echo "main new" >expect &&
+		test_cmp expect ../file2 &&
+		echo "main new sub" >expect &&
+		test_cmp expect file3 &&
+		( cd .. && git submodule update -N ) &&
+		echo "main submodule" >expect &&
+		test_cmp expect ../submod/bar &&
+		git commit -m "branch2 resolved by mergetool from subdir"
+	)
+
+Switched to a new branch 'test10'
+M	submod
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
 
-expecting success of 9303.6 'fast-import (packed) with -c core.compression=9 -c pack.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		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
----------------------------------------------------------------------
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-ok 6 - fast-import (packed) with -c core.compression=9 -c pack.compression=9
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-expecting success of 9303.7 'fast-import (packed) with -c pack.compression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		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
----------------------------------------------------------------------
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-ok 7 - fast-import (packed) with -c pack.compression=0
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test10 af143c6] branch2 resolved by mergetool from subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at af143c6 branch2 resolved by mergetool from subdir
+ok 10 - mergetool merges all from subdir (rerere enabled)
 
-expecting success of 9303.8 'fast-import (packed) with -c pack.compression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
-		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
----------------------------------------------------------------------
+expecting success of 7610.11 'mergetool skips resolved paths when rerere is active': 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled true &&
+	rm -rf .git/rr-cache &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	yes "l" | git mergetool --no-prompt submod &&
+	yes "d" "d" | git mergetool --no-prompt &&
+	git submodule update -N &&
+	output="$(yes "n" | git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
 
-ok 8 - fast-import (packed) with -c pack.compression=9
+Switched to a new branch 'test11'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
 
-expecting success of 9303.9 'fast-import (loose) with -c core.compression=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
----------------------------------------------------------------------
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
 
-ok 9 - fast-import (loose) with -c core.compression=0
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
 
-expecting success of 9303.10 'fast-import (loose) with -c core.compression=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
----------------------------------------------------------------------
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-ok 10 - fast-import (loose) with -c core.compression=9
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-expecting success of 9303.11 'fast-import (loose) with -c core.compression=0 -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
----------------------------------------------------------------------
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-ok 11 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=0
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+HEAD is now at b56897f branch1 changes
+ok 11 - mergetool skips resolved paths when rerere is active
 
-expecting success of 9303.12 'fast-import (loose) with -c core.compression=9 -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
----------------------------------------------------------------------
+expecting success of 7610.12 'conflicted stash sets up rerere': 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled true &&
+	git checkout stash1 &&
+	echo "Conflicting stash content" >file11 &&
+	git stash &&
 
-ok 12 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=0
+	git checkout --detach stash2 &&
+	test_must_fail git stash apply &&
 
-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
----------------------------------------------------------------------
+	test -n "$(git ls-files -u)" &&
+	conflicts="$(git rerere remaining)" &&
+	test "$conflicts" = "file11" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" != "No files need merging" &&
 
-ok 13 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=9
+	git commit -am "save the stash resolution" &&
 
-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
----------------------------------------------------------------------
+	git reset --hard stash2 &&
+	test_must_fail git stash apply &&
 
-ok 14 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=9
+	test -n "$(git ls-files -u)" &&
+	conflicts="$(git rerere remaining)" &&
+	test -z "$conflicts" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
 
-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
----------------------------------------------------------------------
+Switched to branch 'stash1'
+M	submod
+Saved working directory and index state WIP on stash1: 7727624 stash1 changes
+HEAD is now at 3eeb9f3 stash2 changes
+M	submod
+Merging Updated upstream with Stashed changes
+Auto-merging file11
+CONFLICT (content): Merge conflict in file11
+Recorded preimage for 'file11'
+HEAD detached at refs/heads/stash2
+Unmerged paths:
+  (use "git restore --staged <file>..." to unstage)
+  (use "git add <file>..." to mark resolution)
+	both modified:   file11
 
-ok 15 - fast-import (loose) with -c core.loosecompression=0
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   submod (new commits)
 
-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
----------------------------------------------------------------------
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	both.orig
+	expect
+	file1.orig
+	file2.orig
+	spaced name.orig
+	subdir/expect
+	subdir/file3.orig
 
-ok 16 - fast-import (loose) with -c core.loosecompression=9
+no changes added to commit (use "git add" and/or "git commit -a")
+Recorded resolution for 'file11'.
+[detached HEAD 22fbead] save the stash resolution
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at 3eeb9f3 stash2 changes
+Merging Updated upstream with Stashed changes
+Auto-merging file11
+CONFLICT (content): Merge conflict in file11
+Resolved 'file11' using previous resolution.
+HEAD detached at refs/heads/stash2
+Unmerged paths:
+  (use "git restore --staged <file>..." to unstage)
+  (use "git add <file>..." to mark resolution)
+	both modified:   file11
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9350-fast-export.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/.git/
-expecting success of 9350.1 'setup': 
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   submod (new commits)
 
-	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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	both.orig
+	expect
+	file1.orig
+	file11.orig
+	file2.orig
+	spaced name.orig
+	subdir/expect
+	subdir/file3.orig
 
+no changes added to commit (use "git add" and/or "git commit -a")
+HEAD is now at 3eeb9f3 stash2 changes
+ok 12 - conflicted stash sets up rerere
 
-[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 7610.13 'mergetool takes partial path': 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled false &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
 
-expecting success of 9350.2 'fast-export | fast-import': 
+	yes "" | git mergetool subdir &&
 
-	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
+	echo "main new sub" >expect &&
+	test_cmp expect subdir/file3
 
+Previous HEAD position was 3eeb9f3 stash2 changes
+Switched to a new branch 'test13'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/file3
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
----------------------------------------------------------------------
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+HEAD is now at b56897f branch1 changes
+ok 13 - mergetool takes partial path
 
-ok 2 - fast-export | fast-import
+expecting success of 7610.14 'mergetool delete/delete conflict': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt &&
+	! test -f a/a/file.txt &&
+	git reset --hard &&
+	test_must_fail git merge move-to-b &&
+	echo m | git mergetool a/a/file.txt &&
+	test -f b/b/file.txt &&
+	git reset --hard &&
+	test_must_fail git merge move-to-b &&
+	! echo a | git mergetool a/a/file.txt &&
+	! test -f a/a/file.txt
 
-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
+Switched to a new branch 'test14'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
 
-	EOF
-	test_cmp expected actual
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
 
-ok 3 - fast-export ^muss^{commit} muss
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
 
-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
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+ok 14 - mergetool delete/delete conflict
 
-	EOF
-	test_cmp expected actual
+expecting success of 7610.15 'mergetool produces no errors when keepBackup is used': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepBackup true &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt 2>actual &&
+	test_must_be_empty actual &&
+	! test -d a
 
-ok 4 - fast-export --mark-tags ^muss^{commit} muss
+Switched to a new branch 'test15'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
 
-expecting success of 9350.5 'fast-export main~2..main': 
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+ok 15 - mergetool produces no errors when keepBackup is used
 
-	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)
+expecting success of 7610.16 'mergetool honors tempfile config for deleted files': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepTemporaries false &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt &&
+	! test -d a
 
+Switched to a new branch 'test16'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
 
-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
----------------------------------------------------------------------
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 7baa014 move to c
+ok 16 - mergetool honors tempfile config for deleted files
 
-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 7610.17 'mergetool keeps tempfiles when aborting delete/delete': 
+	test_when_finished "git reset --hard" &&
+	test_when_finished "git clean -fdx" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepTemporaries true &&
+	test_must_fail git merge move-to-b &&
+	! test_write_lines a n | git mergetool a/a/file.txt &&
+	test -d a/a &&
+	cat >expect <<-\EOF &&
+	file_BASE_.txt
+	file_LOCAL_.txt
+	file_REMOTE_.txt
+	EOF
+	ls -1 a/a | sed -e "s/[0-9]*//g" >actual &&
+	test_cmp expect actual
 
-expecting success of 9350.6 'fast-export --reference-excluded-parents main~2..main': 
+Switched to a new branch 'test17'
+Auto-merging a/a/file.txt
+CONFLICT (rename/rename): a/a/file.txt renamed to c/c/file.txt in HEAD and to b/b/file.txt in move-to-b.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
 
-	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))
+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_456023.txt
+Removing a/a/file_LOCAL_456023.txt
+Removing a/a/file_REMOTE_456023.txt
+Removing actual
+Removing both.orig
+Removing expect
+Removing file1.orig
+Removing file11.orig
+Removing file2.orig
+Removing spaced name.orig
+Removing subdir/expect
+Removing subdir/file3.orig
+HEAD is now at 7baa014 move to c
+ok 17 - mergetool keeps tempfiles when aborting delete/delete
 
-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
----------------------------------------------------------------------
+expecting success of 7610.18 'deleted vs modified submodule': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	git commit -m "Submodule deleted from branch" &&
+	git checkout -b test$test_count.a test$test_count &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "r" | git mergetool submod &&
+	rmdir submod && mv submod-movedaside submod &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module" &&
 
-ok 6 - fast-export --reference-excluded-parents main~2..main
+	mv submod submod-movedaside &&
+	git checkout -b test$test_count.b test$test_count &&
+	git submodule update -N &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "l" | git mergetool submod &&
+	test ! -e submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by deleting module" &&
 
-expecting success of 9350.7 'fast-export --show-original-ids': 
+	mv submod-movedaside submod &&
+	git checkout -b test$test_count.c main &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "r" | git mergetool submod &&
+	test ! -e submod &&
+	test -d submod.orig &&
+	git submodule update -N &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by deleting module" &&
+	mv submod.orig submod &&
 
-	git 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
+	git checkout -b test$test_count.d main &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "l" | git mergetool submod &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module"
 
-ok 7 - fast-export --show-original-ids
+Switched to a new branch 'test18'
+rm 'submod'
+[test18 5815277] Submodule deleted from branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 160000 submod
+Switched to a new branch 'test18.a'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
-expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-	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)
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-ok 8 - fast-export --show-original-ids | git fast-import
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-expecting success of 9350.9 'reencoding iso-8859-7': 
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
-	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)
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-[wer 6941255] Pi: ð
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test18.a 699f6ba] Merge resolved by keeping module
  Author: A U Thor <author@example.com>
- 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
----------------------------------------------------------------------
+Switched to a new branch 'test18.b'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in HEAD and modified in main.  Version main of submod left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
-Pi: π
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 9 - reencoding iso-8859-7
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-expecting success of 9350.10 'aborting on iso-8859-7': 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-	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
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-[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
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
-expecting success of 9350.11 'preserving iso-8859-7': 
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-	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)
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
 
-[wer 6941255] Pi: ð
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test18.b ba131d0] Merge resolved by deleting module
  Author: A U Thor <author@example.com>
- 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
----------------------------------------------------------------------
+Switched to a new branch 'test18.c'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
-Pi: ð
-encoding iso-8859-7
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 11 - preserving iso-8859-7
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-expecting success of 9350.12 'encoding preserved if reencoding fails': 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-	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)
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-[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
----------------------------------------------------------------------
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
-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
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-expecting success of 9350.13 'import/export-marks': 
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
 
-	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
+Submodule merge conflict for 'submod':
+  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? [test18.c 79dacce] Merge resolved by deleting module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test18.d'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test18.  Version test18 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test18 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (modify/delete): submod deleted in test18 and modified in HEAD.  Version HEAD of submod left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-Switched to a new branch 'marks'
-blob
-mark :1
-data 8
-Wohlauf
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-blob
-mark :2
-data 9
-break it
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-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
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
-blob
-mark :4
-data 9
-die Luft
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-blob
-mark :5
-data 12
-geht frisch
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
 
-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
+Submodule merge conflict for 'submod':
+  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? [test18.d 84e5f25] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+HEAD is now at 84e5f25 Merge resolved by keeping module
+ok 18 - deleted vs modified submodule
 
-blob
-mark :7
-data 4
-und
+expecting success of 7610.19 'file vs modified submodule': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	echo not a submodule >submod &&
+	git add submod &&
+	git commit -m "Submodule path becomes file" &&
+	git checkout -b test$test_count.a branch1 &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "r" | git mergetool submod &&
+	rmdir submod && mv submod-movedaside submod &&
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module" &&
 
-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
+	mv submod submod-movedaside &&
+	git checkout -b test$test_count.b test$test_count &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		yes "c" | git mergetool submod~HEAD &&
+		git rm submod &&
+		git mv submod~HEAD submod
+	else
+		yes "l" | git mergetool submod
+	fi &&
+	git submodule update -N &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping file" &&
 
-[marks 00d551b] last commit
+	git checkout -b test$test_count.c main &&
+	rmdir submod && mv submod-movedaside submod &&
+	test ! -e submod.orig &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		mv submod submod.orig &&
+		git rm --cached submod &&
+		yes "c" | git mergetool submod~test19 &&
+		git mv submod~test19 submod
+	else
+		yes "r" | git mergetool submod
+	fi &&
+	test -d submod.orig &&
+	git submodule update -N &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping file" &&
+
+	git checkout -b test$test_count.d main &&
+	rmdir submod && mv submod.orig submod &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
+	yes "" | git mergetool both &&
+	yes "d" | git mergetool file11 file12 &&
+	yes "l" | git mergetool submod &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		yes "d" | git mergetool submod~test19
+	fi &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module"
+
+Switched to a new branch 'test19'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+rm 'submod'
+[test19 51d579a] Submodule path becomes file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - import/export-marks
+ mode change 160000 => 100644 submod
+Switched to a new branch 'test19.a'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod (not checked out)
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
-expecting success of 9350.14 'set up faked signed tag': 
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-	git fast-import <signed-tag-import
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-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
----------------------------------------------------------------------
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
-ok 14 - set up faked signed tag
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-expecting success of 9350.15 'signed-tags=abort': 
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
 
-	test_must_fail git fast-export --signed-tags=abort sign-your-name
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+[test19.a a22d630] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test19.b'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-fatal: encountered signed tag a3638f8ba890fd4c674f4a3c04947833ab5dcd43; use --signed-tags=<mode> to handle it
-blob
-mark :1
-data 8
-Wohlauf
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-blob
-mark :2
-data 9
-break it
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-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
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
-blob
-mark :4
-data 9
-die Luft
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-blob
-mark :5
-data 12
-geht frisch
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod~HEAD
 
-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
+Deleted merge conflict for 'submod~HEAD':
+  {local}: created file
+  {remote}: deleted
+Use (c)reated or (d)eleted file, or (a)bort? rm 'submod'
+[test19.b 03808c9] Merge resolved by keeping file
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test19.c'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
-blob
-mark :7
-data 4
-und
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
-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
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-blob
-mark :9
-data 7
-change
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-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
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
-ok 15 - signed-tags=abort
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-expecting success of 9350.16 'signed-tags=verbatim': 
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? rm 'submod'
+Merging:
+submod~test19
 
-	git fast-export --signed-tags=verbatim sign-your-name > output &&
-	grep PGP output
+Deleted merge conflict for 'submod~test19':
+  {local}: deleted
+  {remote}: created file
+Use (c)reated or (d)eleted file, or (a)bort? [test19.c d6fb010] Merge resolved by keeping file
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test19.d'
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19.  Version test19 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (distinct types): submod had different types on each side; renamed one of them so each can be recorded somewhere.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+file1
+file2
+spaced name
+subdir/file3
 
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
 
------BEGIN PGP SIGNATURE-----
------END PGP SIGNATURE-----
-ok 16 - signed-tags=verbatim
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-expecting success of 9350.17 'signed-tags=strip': 
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
 
-	git fast-export --signed-tags=strip sign-your-name > output &&
-	! grep PGP output
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+both
 
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file11
+file12
 
-ok 17 - signed-tags=strip
+Deleted merge conflict for 'file11':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
 
-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
+Submodule merge conflict for 'submod':
+  {local}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+submod~test19
 
-ok 18 - signed-tags=warn-strip
+Deleted merge conflict for 'submod~test19':
+  {local}: deleted
+  {remote}: created file
+Use (c)reated or (d)eleted file, or (a)bort? [test19.d 78b901a] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+HEAD is now at 78b901a Merge resolved by keeping module
+ok 19 - file vs modified submodule
 
-expecting success of 9350.19 'setup submodule': 
+expecting success of 7610.20 'submodule in subdirectory': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_create_repo subdir_module &&
+		(
+		cd subdir_module &&
+		: >file15 &&
+		git add file15 &&
+		git commit -m "add initial versions"
+		)
+	) &&
+	test_when_finished "rm -rf subdir/subdir_module" &&
+	git submodule add file:///dev/null subdir/subdir_module &&
+	git add subdir/subdir_module &&
+	git commit -m "add submodule in subdirectory" &&
 
-	test_config_global protocol.file.allow always &&
-	git checkout -f main &&
-	mkdir sub &&
+	git checkout -b test$test_count.a test$test_count &&
+	git submodule update -N &&
 	(
-		cd sub &&
-		git init  &&
-		echo test file > file &&
-		git add file &&
-		git commit -m sub_initial
+	cd subdir/subdir_module &&
+		git checkout -b super10.a &&
+		echo test$test_count.a >file15 &&
+		git add file15 &&
+		git commit -m "on branch 10.a"
 	) &&
-	git submodule add "$(pwd)/sub" sub &&
-	git commit -m initial &&
-	test_tick &&
+	git add subdir/subdir_module &&
+	git commit -m "change submodule in subdirectory on test$test_count.a" &&
+
+	git checkout -b test$test_count.b test$test_count &&
+	git submodule update -N &&
 	(
-		cd sub &&
-		echo more data >> file &&
-		git add file &&
-		git commit -m sub_second
+		cd subdir/subdir_module &&
+		git checkout -b super10.b &&
+		echo test$test_count.b >file15 &&
+		git add file15 &&
+		git commit -m "on branch 10.b"
 	) &&
-	git add sub &&
-	git commit -m second
+	git add subdir/subdir_module &&
+	git commit -m "change submodule in subdirectory on test$test_count.b" &&
+
+	test_must_fail git merge test$test_count.a &&
+	(
+		cd subdir &&
+		yes "l" | git mergetool subdir_module
+	) &&
+	echo "test$test_count.b" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git submodule update -N &&
+	echo "test$test_count.b" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git reset --hard &&
+	git submodule update -N &&
 
+	test_must_fail git merge test$test_count.a &&
+	yes "r" | git mergetool subdir/subdir_module &&
+	echo "test$test_count.b" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git submodule update -N &&
+	echo "test$test_count.a" >expect &&
+	test_cmp expect subdir/subdir_module/file15 &&
+	git commit -m "branch1 resolved with mergetool"
 
-Switched to branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/sub/.git/
-[main (root-commit) 075e849] sub_initial
+Switched to a new branch 'test20'
+M	submod
+Submodule path 'submod': checked out 'b5507ac155b8908404766fca6098138868c8e266'
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t7610-mergetool/subdir/subdir_module/.git/
+[main (root-commit) 4026e0d] add initial versions
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Adding existing repo at 'sub' to the index
-[main 1003335] initial
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file15
+Adding existing repo at 'subdir/subdir_module' to the index
+[test20 fa030bf] add submodule in subdirectory
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main 53da5af] sub_second
+ create mode 160000 subdir/subdir_module
+Switched to a new branch 'test20.a'
+Switched to a new branch 'super10.a'
+[super10.a e51e504] on branch 10.a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 1b7adec] second
+[test20.a 36380aa] change submodule in subdirectory on test20.a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - setup submodule
+Switched to a new branch 'test20.b'
+M	subdir/subdir_module
+Submodule path 'subdir/subdir_module': checked out '4026e0d3f7d9c9cd867521d1177656769bfa2be1'
+Switched to a new branch 'super10.b'
+[super10.b e7cb421] on branch 10.b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[test20.b 6eae923] change submodule in subdirectory on test20.b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (subdir/subdir_module), and either merge commit e51e504
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add subdir/subdir_module
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule subdir/subdir_module
+CONFLICT (submodule): Merge conflict in subdir/subdir_module
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/subdir_module
 
-expecting success of 9350.20 'submodule fast-export | fast-import': 
+Submodule merge conflict for 'subdir/subdir_module':
+  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
+  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 6eae923 change submodule in subdirectory on test20.b
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (subdir/subdir_module), and either merge commit e51e504
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add subdir/subdir_module
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule subdir/subdir_module
+CONFLICT (submodule): Merge conflict in subdir/subdir_module
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/subdir_module
 
-	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
+Submodule merge conflict for 'subdir/subdir_module':
+  {local}: submodule commit e7cb42147e351dde456e7d86fbe5ac89f43de679
+  {remote}: submodule commit e51e504244acbfadc9e7ea9868c3cced1088346d
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'subdir/subdir_module': checked out 'e51e504244acbfadc9e7ea9868c3cced1088346d'
+[test20.b 9ad20f7] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 9ad20f7 branch1 resolved with mergetool
+ok 20 - submodule in subdirectory
 
+expecting success of 7610.21 'directory vs modified submodule': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	mkdir submod &&
+	echo not a submodule >submod/file16 &&
+	git add submod/file16 &&
+	git commit -m "Submodule path becomes directory" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 /       1511
----------------------------------------------------------------------
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	yes "l" | git mergetool submod &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod/file16 &&
+	rm -rf submod.orig &&
 
-Already on 'main'
-Submodule 'sub' (/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/new/sub'...
-done.
-Submodule path 'sub': checked out '53da5af386a666416b61517c3f90dafe75821d2b'
-ok 20 - submodule fast-export | fast-import
+	git reset --hard &&
+	test_must_fail git merge main &&
+	test -n "$(git ls-files -u)" &&
+	test ! -e submod.orig &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		yes "r" | git mergetool submod~main &&
+		git mv submod submod.orig &&
+		git mv submod~main submod
+	else
+		yes "r" | git mergetool submod
+	fi &&
+	test -d submod.orig &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod.orig/file16 &&
+	rm -r submod.orig &&
+	mv submod-movedaside/.git submod &&
+	( cd submod && git clean -f && git reset --hard ) &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git reset --hard &&
+	rm -rf submod-movedaside &&
 
-expecting success of 9350.21 'setup copies': 
+	git checkout -b test$test_count.c main &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	yes "l" | git mergetool submod &&
+	git submodule update -N &&
+	echo "main submodule" >expect &&
+	test_cmp expect submod/bar &&
 
-	git 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
+	git reset --hard &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	test ! -e submod.orig &&
+	yes "r" | git mergetool submod &&
+	echo "not a submodule" >expect &&
+	test_cmp expect submod/file16 &&
 
+	git reset --hard main &&
+	( cd submod && git clean -f && git reset --hard ) &&
+	git submodule update -N
 
-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
+Switched to a new branch 'test21'
+rm 'submod'
+[test21 b88b6e4] Submodule path becomes directory
  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': 
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 submod
+ create mode 100644 submod/file16
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
+CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+No files need merging
+HEAD is now at b88b6e4 Submodule path becomes directory
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from main; moving it to submod~main instead.
+CONFLICT (modify/delete): submod~main deleted in HEAD and modified in main.  Version main of submod~main left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod~main
 
-	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))
+Submodule merge conflict for 'submod~main':
+  {local}: deleted
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? warning: Could not find section in .gitmodules where path=submod~main
+HEAD is now at b5507ac Add bar on branch1
+Submodule path 'submod': checked out 'd1fea44a66e64eaaa988fd26944c3d309b831631'
+warning: unable to rmdir 'submod': Directory not empty
+HEAD is now at b88b6e4 Submodule path becomes directory
+Switched to a new branch 'test21.c'
+warning: unable to rmdir 'submod': Directory not empty
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
+CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+No files need merging
+Skipping unmerged submodule submod~HEAD
+HEAD is now at 42ed12d main updates
+warning: unable to rmdir 'submod': Directory not empty
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test21.  Version test21 of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in test21 and modified in HEAD.  Version HEAD of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+CONFLICT (file/directory): directory in the way of submod from HEAD; moving it to submod~HEAD instead.
+CONFLICT (modify/delete): submod~HEAD deleted in test21 and modified in HEAD.  Version HEAD of submod~HEAD left in tree.
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+No files need merging
+HEAD is now at 42ed12d main updates
+HEAD is now at d1fea44 Add bar on main
+HEAD is now at 42ed12d main updates
+ok 21 - directory vs modified submodule
 
+expecting success of 7610.22 'file with no base': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge main &&
+	git mergetool --no-prompt --tool mybase -- both &&
+	test_must_be_empty both
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 /       1959
----------------------------------------------------------------------
+Switched to a new branch 'test22'
+M	submod
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
 
-ok 22 - fast-export -C -C | fast-import
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+HEAD is now at b56897f branch1 changes
+ok 22 - file with no base
 
-expecting success of 9350.23 'fast-export | fast-import when main is tagged': 
+expecting success of 7610.23 'custom commands override built-ins': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
+	test_config mergetool.defaults.trustExitCode true &&
+	test_must_fail git merge main &&
+	git mergetool --no-prompt --tool defaults -- both &&
+	echo main both added >expected &&
+	test_cmp expected both
 
-	git tag -m msg last &&
-	git fast-export -C -C --signed-tags=strip --all > output &&
-	test $(grep -c "^tag " output) = 3
+Switched to a new branch 'test23'
+M	submod
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
 
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+HEAD is now at b56897f branch1 changes
+ok 23 - custom commands override built-ins
 
-ok 23 - fast-export | fast-import when main is tagged
+expecting success of 7610.24 'filenames seen by tools start with ./': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.writeToTemp false &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	test_must_fail git merge main &&
+	git mergetool --no-prompt --tool myecho -- both >actual &&
+	grep ^\./both_LOCAL_ actual
 
-expecting success of 9350.24 'cope with tagger-less tags': 
+Switched to a new branch 'test24'
+M	submod
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+./both_LOCAL_511361
+HEAD is now at b56897f branch1 changes
+ok 24 - filenames seen by tools start with ./
 
-	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
+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"
 
-tagger Unspecified Tagger <unspecified-tagger> 0 +0000
-ok 24 - cope with tagger-less tags
+)
+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
 
-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"
-	)
+Switched to a new branch 'test25'
+M	submod
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+/tmp/git-mergetool-U2lWey/both_LOCAL_512279
+HEAD is now at b56897f branch1 changes
+ok 25 - temporary filenames are used with mergetool.writeToTemp
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 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
 
-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
-)
+	# make sure "order-file" that is ambiguous between
+	# rev and path is understood correctly.
+	git branch order-file HEAD &&
 
-ok 26 - dropping tag of filtered out object
+	git mergetool --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual
 
-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
-)
+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
 
-ok 27 - rewriting tag of filtered out object
+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 9350.28 'rewrite tag predating pathspecs to nothing': 
-	test_create_repo rewrite_tag_predating_pathspecs &&
-	(
-		cd rewrite_tag_predating_pathspecs &&
+	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
 
-		test_commit initial &&
+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
 
-		git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
+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
 
-		test_commit bar &&
+		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
 
-		git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
-		grep from.$ZERO_OID output
-	)
+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"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/rewrite_tag_predating_pathspecs/.git/
-[main (root-commit) f175d86] initial
+Switched to a new branch 'test29_b'
+[test29_b b1eadc5] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 3f8d6f0] bar
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+[test29_b 27f9bad] remote update
  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-02-09 06:56:02.538467323 +0000
-+++ output	2025-02-09 06:56:02.546467374 +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
+ 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, 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 &&
+ 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
 
-		test_commit important-path &&
+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
 
-		test_commit ignored &&
+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 &&
 
-		git branch A &&
-		git branch B &&
+	test_config mergetool.guiDefault auto &&
+	DISPLAY=SOMETHING && export DISPLAY &&
+	yes "" | git mergetool both &&
+	yes "" | git mergetool file1 file1 &&
 
-		echo foo >>important-path.t &&
-		git add important-path.t &&
-		test_commit more changes &&
+	DISPLAY= && export DISPLAY &&
+	yes "" | git mergetool file2 "spaced name" &&
 
-		git fast-export --all -- important-path.t | git fast-import --force
-	)
+	test_config mergetool.guiDefault true &&
+	yes "" | git mergetool subdir/file3 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
----------------------------------------------------------------------
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "l" | git mergetool submod &&
 
-ok 32 - avoid corrupt stream with non-existent mark
+	echo "gui main updated" >expect &&
+	test_cmp expect file1 &&
 
-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
+	echo "main new" >expect &&
+	test_cmp expect file2 &&
 
-Already on 'simple'
-ok 33 - full-tree re-shows unmodified files
+	echo "gui main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
 
-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
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
 
-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:
+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 tag -f tag-obj_tag tree_tag-obj^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
+hint:       git add submod
 hint:
-hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-ok 34 - set-up a few more tags for tag export tests
-
-expecting success of 9350.35 'tree_tag': 
-	mkdir result &&
-	(cd result && git init) &&
-	git fast-export tree_tag > fe-stream &&
-	(cd result && git fast-import < ../fe-stream)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/result/.git/
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 1556f9f01d0b37a3d7973e1959b816d8188e3cdd,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            0 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =          0
-pack_report: core.packedGitLimit      =          0
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
 
-ok 35 - tree_tag
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
 
-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 33a141f2e6b012d0239cadf5a469a1e8d5f8632b,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 36 - tree_tag-obj
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
 
-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 33a141f2e6b012d0239cadf5a469a1e8d5f8632b,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag 2af5c2cd43137bb1d2e90dce5e62870fa434224c,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 37 - tag-obj_tag
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-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 33a141f2e6b012d0239cadf5a469a1e8d5f8632b,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag 035bec47b039ab554b084cb044726435cf172e71,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 38 - tag-obj_tag-obj
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
 
-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
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
 
-	tag blobtag
-	from :1
-	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data 14
-	Tag of a blob
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
 
-	EOF
-	test_cmp expect actual
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
 
-ok 39 - handling tags of blobs
+Submodule merge conflict for 'submod':
+  {local}: submodule commit b5507ac155b8908404766fca6098138868c8e266
+  {remote}: submodule commit d1fea44a66e64eaaa988fd26944c3d309b831631
+Use (l)ocal or (r)emote, or (a)bort? [test30 a348a8f] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at a348a8f branch1 resolved with mergetool
+ok 30 - mergetool with guiDefault
 
-expecting success of 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
+expecting success of 7610.31 'mergetool with non-existent tool': 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge main &&
+	yes "" | test_must_fail git mergetool --tool=absent >out 2>&1 &&
+	test_grep "mergetool.absent.cmd not set for tool" out
 
-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:
+Switched to a new branch 'test31'
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit d1fea44
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
 hint:
-hint: 	git tag -f nested muss^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-from 0000000000000000000000000000000000000000
-ok 40 - handling nested tags
-
-expecting success of 9350.41 'directory becomes symlink': 
-	git init dirtosymlink &&
-	git init result &&
-	(
-		cd dirtosymlink &&
-		mkdir foo &&
-		mkdir bar &&
-		echo hello > foo/world &&
-		echo hello > bar/world &&
-		git add foo/world bar/world &&
-		git commit -q -mone &&
-		git rm -r foo &&
-		test_ln_s_add bar foo &&
-		git commit -q -mtwo
-	) &&
-	(
-		cd dirtosymlink &&
-		git fast-export main -- foo |
-		(cd ../result && git fast-import --quiet)
-	) &&
-	(cd result && git show main:foo)
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+CONFLICT (modify/delete): file11 deleted in main and modified in HEAD.  Version HEAD of file11 left in tree.
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in main.  Version main of file12 left in tree.
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Failed to merge submodule submod
+CONFLICT (submodule): Merge conflict in submod
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+error: mergetool.absent.cmd not set for tool 'absent'
+HEAD is now at b56897f branch1 changes
+ok 31 - mergetool with non-existent tool
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/dirtosymlink/.git/
-Reinitialized existing Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/result/.git/
-rm 'foo/world'
-checking prerequisite: SYMLINKS
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9200-git-cvsexportcommit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/.git/
+checking prerequisite: NOT_ROOT
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
 )
-prerequisite SYMLINKS ok
-barok 41 - directory becomes symlink
+prerequisite NOT_ROOT ok
+expecting success of 9200.1 'New file': 
+	mkdir A B C D E F &&
+	echo hello1 >A/newfile1.txt &&
+	echo hello2 >B/newfile2.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
+	git add A/newfile1.txt &&
+	git add B/newfile2.txt &&
+	git add C/newfile3.png &&
+	git add D/newfile4.png &&
+	git commit -a -m "Test: New file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.1/" &&
+	check_entries B "newfile2.txt/1.1/" &&
+	check_entries C "newfile3.png/1.1/-kb" &&
+	check_entries D "newfile4.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp B/newfile2.txt ../B/newfile2.txt &&
+	test_cmp C/newfile3.png ../C/newfile3.png &&
+	test_cmp D/newfile4.png ../D/newfile4.png
+	)
 
-expecting success of 9350.42 'fast-export quotes pathnames': 
-	git init crazy-paths &&
-	test_config -C crazy-paths core.protectNTFS false &&
-	(cd crazy-paths &&
-	 blob=$(echo foo | git hash-object -w --stdin) &&
-	 git -c core.protectNTFS=false update-index --add \
-		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
-		--cacheinfo 100644 $blob "path with \"quote\"" \
-		--cacheinfo 100644 $blob "path with \\backslash" \
-		--cacheinfo 100644 $blob "path with space" &&
-	 git commit -m addition &&
-	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
-	 git read-tree --empty &&
-	 git update-index -z --index-info <index &&
-	 git commit -m rename &&
-	 git read-tree --empty &&
-	 git commit -m deletion &&
-	 git fast-export -M HEAD >export.out &&
-	 git rev-list HEAD >expect &&
-	 git init result &&
-	 cd result &&
-	 git -c core.protectNTFS=false fast-import <../export.out &&
-	 git rev-list HEAD >actual &&
-	 test_cmp ../expect actual
+[master 288d750] Test: New file
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 A/newfile1.txt
+ create mode 100644 B/newfile2.txt
+ create mode 100644 C/newfile3.png
+ create mode 100644 D/newfile4.png
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A put under version control
+cvs add: scheduling file `A/newfile1.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `B/newfile2.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `C/newfile3.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `D/newfile4.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Test: New file
+Autocommit
+  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+initial revision: 1.1
+Committed successfully to CVS
+ok 1 - New file
+
+expecting success of 9200.2 'Remove two files, add two and update two': 
+	echo Hello1 >>A/newfile1.txt &&
+	rm -f B/newfile2.txt &&
+	rm -f C/newfile3.png &&
+	echo Hello5  >E/newfile5.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
+	git add E/newfile5.txt &&
+	git add F/newfile6.png &&
+	git commit -a -m "Test: Remove, add and update" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.2/" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "newfile4.png/1.2/-kb" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp D/newfile4.png ../D/newfile4.png &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9350-fast-export/crazy-paths/.git/
-[main (root-commit) deac6af] addition
+[master 69b0239] Test: Remove, add and update
  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
+ 5 files changed, 2 insertions(+), 1 deletion(-)
+ delete mode 100644 B/newfile2.txt
+ create mode 100644 E/newfile5.txt
+ rename C/newfile3.png => F/newfile6.png (100%)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E put under version control
+cvs add: scheduling file `E/newfile5.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `F/newfile6.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs remove: scheduling `B/newfile2.txt' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+cvs remove: scheduling `C/newfile3.png' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): Test: Remove, add and update
+Autocommit
+  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png' 'E/newfile5.txt' 'F/newfile6.png'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
+new revision: delete; previous revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
+new revision: delete; previous revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/newfile5.txt,v  <--  E/newfile5.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F/newfile6.png,v  <--  F/newfile6.png
+initial revision: 1.1
+Committed successfully to CVS
+ok 2 - Remove two files, add two and update two
+
+expecting success of 9200.3 'Fail to change binary more than one generation old': cat F/newfile6.png >>D/newfile4.png &&
+     git commit -a -m "generatiion 1" &&
+     cat F/newfile6.png >>D/newfile4.png &&
+     git commit -a -m "generation 2" &&
+     id=$(git rev-list --max-count=1 HEAD) &&
+     (cd "$CVSWORK" &&
+     test_must_fail git cvsexportcommit -c $id
+     )
+[master 70e0115] generatiion 1
  Author: A U Thor <author@example.com>
- 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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master d73a469] generation 2
  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.48.0~rc1+next.20250101/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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Checking if patch will apply
+Applying
+error: the patch applies to 'D/newfile4.png' (ac22ccbd3ee9f03a3b38249ac8efdbe96b5da2cd), which does not match the current contents.
+error: D/newfile4.png: patch does not apply
+cannot patch at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsexportcommit line 338.
+ok 3 - Fail to change binary more than one generation old
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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 /       1511
----------------------------------------------------------------------
+expecting success of 9200.4 'Remove only binary files': 
+	git reset --hard HEAD^^ &&
+	rm -f D/newfile4.png &&
+	git commit -a -m "test: remove only a binary file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.2/" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
 
-HEAD is now at 1b7adec second
-[main f4fdb0c] back in time
+HEAD is now at 69b0239 Test: Remove, add and update
+[master 2a45f53] test: remove only a binary file
  Author: A U Thor <author@example.com>
- 1 file changed, 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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 D/newfile4.png
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs remove: scheduling `D/newfile4.png' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): test: remove only a binary file
+Autocommit
+  cvs commit -F .msg 'D/newfile4.png'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+new revision: delete; previous revision: 1.2
+Committed successfully to CVS
+ok 4 - Remove only binary files
 
-expecting success of 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
+expecting success of 9200.5 'Remove only a text file': 
+	rm -f A/newfile1.txt &&
+	git commit -a -m "test: remove only a binary file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
 
-[main 82f6f25] bump
+[master fa834fd] test: remove only a binary file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 44 - avoid uninteresting refs
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 A/newfile1.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs remove: scheduling `A/newfile1.txt' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): test: remove only a binary file
+Autocommit
+  cvs commit -F .msg 'A/newfile1.txt'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+new revision: delete; previous revision: 1.2
+Committed successfully to CVS
+ok 5 - Remove only a text file
 
-expecting success of 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
+expecting success of 9200.6 'New file with spaces in file name': 
+	mkdir "G g" &&
+	echo ok then >"G g/with spaces.txt" &&
+	git add "G g/with spaces.txt" && \
+	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
+	git add "G g/with spaces.png" &&
+	git commit -a -m "With spaces" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
+	)
 
-ok 45 - refs are updated even if no commits need to be exported
+[master 7dad360] With spaces
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 G g/with spaces.png
+ create mode 100644 G g/with spaces.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g put under version control
+cvs add: scheduling file `G g/with spaces.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `G g/with spaces.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): With spaces
+Autocommit
+  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
+initial revision: 1.1
+Committed successfully to CVS
+ok 6 - New file with spaces in file name
 
-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
+expecting success of 9200.7 'Update file with spaces in file name': 
+	echo Ok then >>"G g/with spaces.txt" &&
+	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
+	git add "G g/with spaces.png" &&
+	git commit -a -m "Update with spaces" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
+	)
 
-ok 46 - use refspec
+[master 200512b] Update with spaces
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Commit to CVS
+Patch title (first comment line): Update with spaces
+Autocommit
+  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
+new revision: 1.2; previous revision: 1.1
+Committed successfully to CVS
+ok 7 - Update file with spaces in file name
 
-expecting success of 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
+expecting success of 9200.8 'File with non-ascii file name': 
+	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
+	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
+	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	git commit -a -m "Går det så går det" && \
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -v -c $id &&
+	check_entries \
+	"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
+	"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
+	)
 
-	EOF
-	test_cmp expected actual
+[master 2dba919] Går det så går det
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.png"
+ create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.txt"
+Applying to CVS commit 2dba9190cda577aa84017fec4349519cd1aadafb from parent 200512bccb19b444ac4f1e098c7d7d3578864bb4
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã… put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥ put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä put under version control
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö put under version control
+cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Går det så går det
+Autocommit
+  cvs commit -F .msg 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
+initial revision: 1.1
+Committed successfully to CVS
+ok 8 - File with non-ascii file name
 
-ok 47 - delete ref because entire history excluded
+expecting success of 9200.9 'Mismatching patch should fail': 
+	date >>"E/newfile5.txt" &&
+	git add "E/newfile5.txt" &&
+	git commit -a -m "Update one" &&
+	date >>"E/newfile5.txt" &&
+	git add "E/newfile5.txt" &&
+	git commit -a -m "Update two" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	test_must_fail git cvsexportcommit -c $id
+	)
 
-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
+[master e79ac11] Update one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 721cdad] Update two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Checking if patch will apply
+Applying
+error: patch failed: E/newfile5.txt:1
+error: E/newfile5.txt: patch does not apply
+cannot patch at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsexportcommit line 338.
+ok 9 - Mismatching patch should fail
 
-	EOF
-	test_cmp expected actual
+checking prerequisite: FILEMODE
 
-ok 48 - delete refspec
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+	test "$(git config --bool core.filemode)" = true
 
-expecting success of 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 &&
+)
+prerequisite FILEMODE ok
+expecting success of 9200.10 'Retain execute bit': 
+	mkdir G &&
+	echo executeon >G/on &&
+	chmod +x G/on &&
+	echo executeoff >G/off &&
+	git add G/on &&
+	git add G/off &&
+	git commit -a -m "Execute test" &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c HEAD &&
+	test -x G/on &&
+	! test -x G/off
+	)
 
-	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 &&
+[master fb976cc] Execute test
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 G/off
+ create mode 100755 G/on
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G put under version control
+cvs add: scheduling file `G/off' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `G/on' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Execute test
+Autocommit
+  cvs commit -F .msg 'G/off' 'G/on'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/off,v  <--  G/off
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/on,v  <--  G/on
+initial revision: 1.1
+Committed successfully to CVS
+ok 10 - Retain execute bit
 
-	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
+expecting success of 9200.11 '-w option should work with relative GIT_DIR': 
+	mkdir W &&
+	echo foobar >W/file1.txt &&
+	echo bazzle >W/file2.txt &&
+	git add W/file1.txt &&
+	git add W/file2.txt &&
+	git commit -m "More updates" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$GIT_DIR" &&
+	GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id &&
+	check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" &&
+	test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt &&
+	test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+[master dfde51b] More updates
  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.48.0~rc1+next.20250101/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
----------------------------------------------------------------------
+ create mode 100644 W/file1.txt
+ create mode 100644 W/file2.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W put under version control
+cvs add: scheduling file `W/file1.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `W/file2.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): More updates
+Autocommit
+  cvs commit -F .msg 'W/file1.txt' 'W/file2.txt'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file1.txt,v  <--  W/file1.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file2.txt,v  <--  W/file2.txt
+initial revision: 1.1
+Committed successfully to CVS
+ok 11 - -w option should work with relative GIT_DIR
 
-ok 49 - when using -C, do not declare copy when source of copy is also modified
+expecting success of 9200.12 'check files before directories': 
 
-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 Notes > release-notes &&
+	git add release-notes &&
+	git commit -m "Add release notes" release-notes &&
+	id=$(git rev-parse HEAD) &&
+	git cvsexportcommit -w "$CVSWORK" -c $id &&
 
-		echo ":1 $(git rev-parse HEAD^^)" >marks &&
-		git fast-export --import-marks=marks main >out &&
-		grep Yeah out
-	)
+	echo new > DS &&
+	echo new > E/DS &&
+	echo modified > release-notes &&
+	git add DS E/DS release-notes &&
+	git commit -m "Add two files with the same basename" &&
+	id=$(git rev-parse HEAD) &&
+	git cvsexportcommit -w "$CVSWORK" -c $id &&
+	check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" &&
+	check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" &&
+	test_cmp "$CVSWORK/DS" DS &&
+	test_cmp "$CVSWORK/E/DS" E/DS &&
+	test_cmp "$CVSWORK/release-notes" release-notes
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+
+[master c45861c] Add release notes
  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
+ create mode 100644 release-notes
+Checking if patch will apply
+cvs status: nothing known about `release-notes'
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: scheduling file `release-notes' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Add release notes
+Autocommit
+  cvs commit -F .msg 'release-notes'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
+initial revision: 1.1
+Committed successfully to CVS
+[master f726960] Add two files with the same basename
  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
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 DS
+ create mode 100644 E/DS
+Checking if patch will apply
+cvs status: nothing known about `DS'
+cvs status: nothing known about `E/DS'
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: scheduling file `DS' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `E/DS' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Add two files with the same basename
+Autocommit
+  cvs commit -F .msg 'DS' 'E/DS' 'release-notes'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/DS,v  <--  DS
+initial revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/DS,v  <--  E/DS
+initial revision: 1.1
+Committed successfully to CVS
+ok 12 - check files before directories
 
-expecting success of 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 &&
+expecting success of 9200.13 're-commit a removed filename which remains in CVS attic': 
+	(cd "$CVSWORK" &&
+	echo >attic_gremlin &&
+	cvs -Q add attic_gremlin &&
+	cvs -Q ci -m "added attic_gremlin" &&
+	rm attic_gremlin &&
+	cvs -Q rm attic_gremlin &&
+	cvs -Q ci -m "removed attic_gremlin") &&
 
-		git checkout -b topic2 &&
-		test_commit C &&
-		git checkout main &&
-		git merge --no-ff topic2 &&
+	echo > attic_gremlin &&
+	git add attic_gremlin &&
+	git commit -m "Added attic_gremlin" &&
+	git cvsexportcommit -w "$CVSWORK" -c HEAD &&
+	(cd "$CVSWORK" && cvs -Q update -d) &&
+	test -f "$CVSWORK/attic_gremlin"
 
-		test_commit D &&
+[master fb450ae] Added attic_gremlin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 attic_gremlin
+Checking if patch will apply
+Applying
+<stdin>:7: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: Re-adding file `attic_gremlin' after dead revision 1.2.
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Added attic_gremlin
+Autocommit
+  cvs commit -F .msg 'attic_gremlin'
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/attic_gremlin,v  <--  attic_gremlin
+new revision: 1.3; previous revision: 1.2
+Committed successfully to CVS
+ok 13 - re-commit a removed filename which remains in CVS attic
 
-		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 &&
+expecting success of 9200.14 'commit a file with leading spaces in the name': 
 
-		git init import &&
-		git -C import fast-import <first-parent-export &&
+	echo space > " space" &&
+	git add " space" &&
+	git commit -m "Add a file with a leading space" &&
+	id=$(git rev-parse HEAD) &&
+	git cvsexportcommit -w "$CVSWORK" -c $id &&
+	check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" &&
+	test_cmp "$CVSWORK/ space" " space"
 
-		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.48.0~rc1+next.20250101/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
+[master aaebf58] Add a file with a leading space
  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
+ create mode 100644  space
+Checking if patch will apply
+cvs status: nothing known about ` space'
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: scheduling file ` space' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Add a file with a leading space
+Autocommit
+  cvs commit -F .msg  space
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/ space,v  <--   space
+initial revision: 1.1
+Committed successfully to CVS
+ok 14 - commit a file with leading spaces in the name
+
+expecting success of 9200.15 'use the same checkout for Git and CVS': 
+
+	(mkdir shared &&
+	 cd shared &&
+	 sane_unset GIT_DIR &&
+	 cvs co . &&
+	 git init &&
+	 git add " space" &&
+	 git commit -m "fake initial commit" &&
+	 echo Hello >> " space" &&
+	 git commit -m "Another change" " space" &&
+	 git cvsexportcommit -W -p -u -c HEAD &&
+	 grep Hello " space" &&
+	 git diff-files)
+
+
+cvs checkout: Updating .
+U  space
+U DS
+U attic_gremlin
+U release-notes
+cvs checkout: Updating A
+cvs checkout: Updating B
+cvs checkout: Updating C
+cvs checkout: Updating CVSROOT
+U CVSROOT/checkoutlist
+U CVSROOT/commitinfo
+U CVSROOT/config
+U CVSROOT/cvswrappers
+U CVSROOT/loginfo
+U CVSROOT/modules
+U CVSROOT/notify
+U CVSROOT/postadmin
+U CVSROOT/postproxy
+U CVSROOT/posttag
+U CVSROOT/postwatch
+U CVSROOT/preproxy
+U CVSROOT/rcsinfo
+U CVSROOT/taginfo
+U CVSROOT/verifymsg
+cvs checkout: Updating D
+cvs checkout: Updating E
+U E/DS
+U E/newfile5.txt
+cvs checkout: Updating F
+U F/newfile6.png
+cvs checkout: Updating G
+U G/off
+U G/on
+cvs checkout: Updating G g
+U G g/with spaces.png
+U G g/with spaces.txt
+cvs checkout: Updating W
+U W/file1.txt
+U W/file2.txt
+cvs checkout: Updating Ã…
+cvs checkout: Updating Ã…/goo
+cvs checkout: Updating Ã…/goo/a
+cvs checkout: Updating Ã…/goo/a/b
+cvs checkout: Updating Ã…/goo/a/b/c
+cvs checkout: Updating Ã…/goo/a/b/c/d
+cvs checkout: Updating Ã…/goo/a/b/c/d/e
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥
+cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä
+cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö
+U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
+U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/shared/.git/
+[master (root-commit) 93a1e74] fake initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 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
+ create mode 100644  space
+[master 6935f1b] Another change
  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.48.0~rc1+next.20250101/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
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Commit to CVS
+Patch title (first comment line): Another change
+Autocommit
+  cvs commit -F .msg  space
+Committed successfully to CVS
+HEAD is now at 6935f1b Another change
+Hello
+ok 15 - use the same checkout for Git and CVS
 
-# still have 1 known breakage(s)
-# passed all remaining 51 test(s)
-1..52
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9501-gitweb-standalone-http-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9501-gitweb-standalone-http-status/.git/
-expecting success of 9501.1 'setup': 
-	test_commit 'SnapshotTests' 'i can has snapshot'
-
-[main (root-commit) cea0920] SnapshotTests
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 i can has snapshot
-ok 1 - setup
-
-expecting success of 9501.2 'snapshots: tgz only default format enabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
-    grep "Status: 200 OK" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tbz2" &&
-    grep "403 - Unsupported snapshot format" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=txz" &&
-    grep "403 - Snapshot format not allowed" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
-    grep "403 - Unsupported snapshot format" gitweb.output
-grep: gitweb.output: binary file matches
-403 - Unsupported snapshot format
-403 - Snapshot format not allowed
-403 - Unsupported snapshot format
-ok 2 - snapshots: tgz only default format enabled
-
-expecting success of 9501.3 'snapshots: all enabled in default, use default disabled value': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
-    grep "Status: 200 OK" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tbz2" &&
-    grep "Status: 200 OK" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=txz" &&
-    grep "403 - Snapshot format not allowed" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
-    grep "Status: 200 OK" gitweb.output
-grep: gitweb.output: binary file matches
-grep: gitweb.output: binary file matches
-403 - Snapshot format not allowed
-grep: gitweb.output: binary file matches
-ok 3 - snapshots: all enabled in default, use default disabled value
-
-expecting success of 9501.4 'snapshots: zip explicitly disabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
-    grep "403 - Snapshot format not allowed" gitweb.output
-403 - Snapshot format not allowed
-ok 4 - snapshots: zip explicitly disabled
+*** t9601-cvsimport-vendor-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9601-cvsimport-vendor-branch/.git/
+expecting success of 9601.1 'import a module with a vendor branch': 
 
-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
+	git cvsimport -C module-git module
 
-expecting success of 9501.6 'snapshots: good tree-ish id': 
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.output
 
-grep: gitweb.output: binary file matches
-ok 6 - snapshots: good tree-ish id
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.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 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
 
-404 - Object does not exist
-ok 7 - snapshots: bad tree-ish id
+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.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
+expecting success of 9601.4 'check a file that was imported once': 
 
-[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)
+	test_cmp_branch_file main imported-once.txt
 
-expecting success of 9501.9 'snapshots: good object id': 
-	ID=$(git rev-parse --verify HEAD) &&
-	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.output
 
-grep: gitweb.output: binary file matches
-ok 9 - snapshots: good object id
+ok 4 - check a file that was imported once
 
-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
+checking known breakage of 9601.5 'check a file that was imported twice': 
 
-404 - Object does not exist
-ok 10 - snapshots: bad object id
+	test_cmp_branch_file main imported-twice.txt
 
-expecting success of 9501.11 'modification: feed last-modified': 
-	gitweb_run "p=.git;a=atom;h=main" &&
-	grep "Status: 200 OK" gitweb.headers &&
-	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
 
-Status: 200 OK
-Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
-ok 11 - modification: feed last-modified
+--- module-cvs-main/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
++++ module-git/imported-twice.txt	2026-03-14 13:39:36.498677808 +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 9501.12 'modification: feed if-modified-since (modified)': 
-	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=atom;h=main" &&
-	grep "Status: 200 OK" gitweb.headers
+expecting success of 9601.6 'check a file that was imported then modified on HEAD': 
 
-Status: 200 OK
-ok 12 - modification: feed if-modified-since (modified)
+	test_cmp_branch_file main imported-modified.txt
 
-expecting success of 9501.13 'modification: feed if-modified-since (unmodified)': 
-	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=atom;h=main" &&
-	grep "Status: 304 Not Modified" gitweb.headers
 
-Status: 304 Not Modified
-ok 13 - modification: feed if-modified-since (unmodified)
+ok 6 - check a file that was imported then modified on HEAD
 
-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
+expecting success of 9601.7 'check a file that was imported, modified, then imported again': 
 
-Status: 200 OK
-Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
-ok 14 - modification: snapshot last-modified
+	test_cmp_branch_file main imported-modified-imported.txt
 
-expecting success of 9501.15 'modification: snapshot if-modified-since (modified)': 
-	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.headers
 
-Status: 200 OK
-ok 15 - modification: snapshot if-modified-since (modified)
+ok 7 - check a file that was imported, modified, then imported again
 
-expecting success of 9501.16 'modification: snapshot if-modified-since (unmodified)': 
-	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
-	grep "Status: 304 Not Modified" gitweb.headers
+expecting success of 9601.8 'check a file that was added to HEAD then imported': 
 
-Status: 304 Not Modified
-ok 16 - modification: snapshot if-modified-since (unmodified)
+	test_cmp_branch_file main added-imported.txt
 
-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 8 - check a file that was added to HEAD then imported
 
-expecting success of 9501.18 'load checking: load too high (default action)': 
-	gitweb_run "p=.git" &&
-	grep "Status: 503 Service Unavailable" gitweb.headers &&
-	grep "503 - The load average on the server is too high" gitweb.body
+expecting success of 9601.9 'a vendor branch whose tag has been removed': 
 
-Status: 503 Service Unavailable
-503 - The load average on the server is too high
-ok 18 - load checking: load too high (default action)
+	test_cmp_branch_file main imported-anonymously.txt
 
-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)
+ok 9 - a vendor branch whose tag has been removed
 
-# passed all 19 test(s)
-1..19
+# still have 1 known breakage(s)
+# passed all remaining 8 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9300-fast-import.sh ***
@@ -538870,7 +539884,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_2003678
+fast-import: dumping crash report to .git/fast_import_crash_513647
 ok 2 - truncated stream complains
 
 expecting success of 9300.3 'A: create pack from stdin': 
@@ -539364,7 +540378,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_2004509
+fast-import: dumping crash report to .git/fast_import_crash_515050
 ok 20 - B: fail on invalid blob sha1
 
 expecting success of 9300.21 'B: accept branch name "TEMP_TAG"': 
@@ -539472,7 +540486,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_2004850
+fast-import: dumping crash report to .git/fast_import_crash_515534
 ok 23 - B: reject invalid timezone
 
 expecting success of 9300.24 'B: accept invalid timezone with raw-permissive': 
@@ -539580,7 +540594,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_2005081
+fast-import: dumping crash report to .git/fast_import_crash_515953
 ok 26 - B: fail on invalid committer (1)
 
 expecting success of 9300.27 'B: fail on invalid committer (2)': 
@@ -539596,7 +540610,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_2005115
+fast-import: dumping crash report to .git/fast_import_crash_516025
 ok 27 - B: fail on invalid committer (2)
 
 expecting success of 9300.28 'B: fail on invalid committer (3)': 
@@ -539612,7 +540626,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_2005156
+fast-import: dumping crash report to .git/fast_import_crash_516093
 ok 28 - B: fail on invalid committer (3)
 
 expecting success of 9300.29 'B: fail on invalid committer (4)': 
@@ -539628,7 +540642,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_2005201
+fast-import: dumping crash report to .git/fast_import_crash_516170
 ok 29 - B: fail on invalid committer (4)
 
 expecting success of 9300.30 'B: fail on invalid committer (5)': 
@@ -539644,7 +540658,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_2005237
+fast-import: dumping crash report to .git/fast_import_crash_516234
 ok 30 - B: fail on invalid committer (5)
 
 expecting success of 9300.31 'B: fail on invalid file path of ..': 
@@ -539667,7 +540681,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '../invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_2005281
+fast-import: dumping crash report to .git/fast_import_crash_516300
 ok 31 - B: fail on invalid file path of ..
 
 expecting success of 9300.32 'B: fail on invalid file path of .': 
@@ -539697,7 +540711,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path './invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_2005314
+fast-import: dumping crash report to .git/fast_import_crash_516357
 ok 32 - B: fail on invalid file path of .
 
 ok 33 # skip B: fail on invalid file path of C: (missing WINDOWS)
@@ -539722,7 +540736,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '.git/invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_2005354
+fast-import: dumping crash report to .git/fast_import_crash_516436
 ok 34 - B: fail on invalid file path of .git
 
 expecting success of 9300.35 'B: fail on invalid file path of .gitmodules': 
@@ -539745,7 +540759,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '.gitmodules'
-fast-import: dumping crash report to .git/fast_import_crash_2005404
+fast-import: dumping crash report to .git/fast_import_crash_516498
 ok 35 - B: fail on invalid file path of .gitmodules
 
 expecting success of 9300.36 'C: incremental import create pack from stdin': 
@@ -539978,7 +540992,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_2006047
+fast-import: dumping crash report to .git/fast_import_crash_517469
 ok 46 - E: rfc2822 date, --date-format=raw
 
 expecting success of 9300.47 'E: rfc2822 date, --date-format=rfc2822': 
@@ -540377,7 +541391,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_2007160
+fast-import: dumping crash report to .git/fast_import_crash_518981
 ok 64 - J: tag must fail on empty branch
 
 expecting success of 9300.65 'K: reinit branch with from': 
@@ -540585,8 +541599,8 @@
 dangling commit ac2b62088fe0283163c00fa7856bcd0489cf30de
 dangling tag 3750af27267cae07dd3f8b7a9aac2291e374a66a
 dangling commit 45b12606bd487d1bc687864db7641b9bfd4ddcd0
-dangling tag 42d861d649a1b87eb8083ad1d94d9220ecf2c35f
 dangling commit c85b9f480bbc2f7616de78fc96c08204e0f5b70e
+dangling tag 42d861d649a1b87eb8083ad1d94d9220ecf2c35f
 dangling tag 56c14ce987117cf2e391ebef3dbab65e4c1ed202
 dangling commit d892dc32fa7a52ea3a397cfc4449e9df8a39becf
 dangling commit 5cdb3613534ced7561d4baa9c18f92e6f446501c
@@ -541493,7 +542507,7 @@
 	INPUT_END
 
 fatal: invalid path 'file3/'
-fast-import: dumping crash report to .git/fast_import_crash_2008806
+fast-import: dumping crash report to .git/fast_import_crash_521581
 ok 86 - N: reject foo/ syntax
 
 expecting success of 9300.87 'N: reject foo/ syntax in copy source': 
@@ -541509,7 +542523,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_2008819
+fast-import: dumping crash report to .git/fast_import_crash_521597
 ok 87 - N: reject foo/ syntax in copy source
 
 expecting success of 9300.88 'N: reject foo/ syntax in rename source': 
@@ -541525,7 +542539,7 @@
 	INPUT_END
 
 fatal: Path file2/ not in branch
-fast-import: dumping crash report to .git/fast_import_crash_2008884
+fast-import: dumping crash report to .git/fast_import_crash_521625
 ok 88 - N: reject foo/ syntax in rename source
 
 expecting success of 9300.89 'N: reject foo/ syntax in ls argument': 
@@ -541541,7 +542555,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_2008920
+fast-import: dumping crash report to .git/fast_import_crash_521654
 ok 89 - N: reject foo/ syntax in ls argument
 
 expecting success of 9300.90 'N: copy to root ("") by id and modify': 
@@ -542308,7 +543322,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       8512 /       8512
+pack_report: pack_mapped              =       8632 /       8632
 ---------------------------------------------------------------------
 
 Switched to branch 'subuse1'
@@ -542378,7 +543392,7 @@
 pack_report: pack_used_ctr            =          4
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 ok 102 - P: verbatim SHA gitlinks
@@ -542404,7 +543418,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_2010545
+fast-import: dumping crash report to .git/fast_import_crash_523802
 ok 103 - P: fail on inline gitlink
 
 expecting success of 9300.104 'P: fail on blob mark in gitlink': 
@@ -542431,7 +543445,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_2010559
+fast-import: dumping crash report to .git/fast_import_crash_523831
 ok 104 - P: fail on blob mark in gitlink
 
 expecting success of 9300.105 'Q: commit notes': 
@@ -542818,7 +543832,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_2011514
+fast-import: dumping crash report to .git/fast_import_crash_524797
 ok 126 - Q: deny note on empty branch
 
 expecting success of 9300.127 'R: abort on unsupported feature': 
@@ -542829,7 +543843,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_2011541
+fast-import: dumping crash report to .git/fast_import_crash_524822
 ok 127 - R: abort on unsupported feature
 
 expecting success of 9300.128 'R: supported feature is accepted': 
@@ -542876,7 +543890,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_2011558
+fast-import: dumping crash report to .git/fast_import_crash_524873
 ok 129 - R: abort on receiving feature after data command
 
 expecting success of 9300.130 'R: import-marks features forbidden by default': 
@@ -542887,9 +543901,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_2011569
+fast-import: dumping crash report to .git/fast_import_crash_524891
 fatal: feature 'import-marks-if-exists' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_2011578
+fast-import: dumping crash report to .git/fast_import_crash_524901
 ok 130 - R: import-marks features forbidden by default
 
 expecting success of 9300.131 'R: only one import-marks feature allowed per stream': 
@@ -542903,7 +543917,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_2011597
+fast-import: dumping crash report to .git/fast_import_crash_524930
 ok 131 - R: only one import-marks feature allowed per stream
 
 expecting success of 9300.132 'R: export-marks feature forbidden by default': 
@@ -542911,7 +543925,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_2011633
+fast-import: dumping crash report to .git/fast_import_crash_524957
 ok 132 - R: export-marks feature forbidden by default
 
 expecting success of 9300.133 'R: export-marks feature results in a marks file being created': 
@@ -543001,9 +544015,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_2011698
+fast-import: dumping crash report to .git/fast_import_crash_525053
 fatal: cannot read 'nonexistent.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_2011727
+fast-import: dumping crash report to .git/fast_import_crash_525078
 ok 135 - R: catch typo in marks file name
 
 expecting success of 9300.136 'R: import and output marks can be the same file': 
@@ -543090,7 +544104,7 @@
 	EOF
 
 fatal: cannot read 'io.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_2011823
+fast-import: dumping crash report to .git/fast_import_crash_525183
 ok 137 - R: --import-marks=foo --output-marks=foo to create foo fails
 
 expecting success of 9300.138 'R: --import-marks-if-exists': 
@@ -543307,7 +544321,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 ok 140 - R: import to output marks works without any content
@@ -543342,7 +544356,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 ok 141 - R: import marks prefers commandline marks file over the stream
@@ -543380,7 +544394,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 ok 142 - R: multiple --import-marks= should be honoured
@@ -543418,7 +544432,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 ok 143 - R: feature relative-marks should be honoured
@@ -543455,7 +544469,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 ok 144 - R: feature no-relative-marks should be honoured
@@ -543524,7 +544538,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_2012191
+fast-import: dumping crash report to .git/fast_import_crash_525736
 ok 147 - R: cat-blob-fd must be a nonnegative integer
 
 expecting success of 9300.148 'R: print old blob': 
@@ -543605,7 +544619,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 fast-import statistics:
@@ -543629,7 +544643,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8155 /       8155
+pack_report: pack_mapped              =       8442 /       8442
 ---------------------------------------------------------------------
 
 ok 149 - R: in-stream cat-blob-fd not respected
@@ -543826,7 +544840,7 @@
 pack_report: pack_used_ctr            =          2
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          1 /          2
-pack_report: pack_mapped              =       8155 /       8780
+pack_report: pack_mapped              =       8442 /       9067
 ---------------------------------------------------------------------
 
 ok 154 - R: print two blobs to stdout
@@ -544036,9 +545050,9 @@
 	test_must_fail git fast-import --done </dev/null
 
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_2012896
+fast-import: dumping crash report to .git/fast_import_crash_526759
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_2012909
+fast-import: dumping crash report to .git/fast_import_crash_526786
 ok 159 - R: feature done means terminating "done" is mandatory
 
 expecting success of 9300.160 'R: terminating "done" with trailing gibberish is ok': 
@@ -544160,14 +545174,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_2013037
+fast-import: dumping crash report to .git/fast_import_crash_526941
 ok 162 - R: die on unknown option
 
 expecting success of 9300.163 'R: unknown commandline options are rejected': \
 	test_must_fail git fast-import --non-existing-option < /dev/null
 
 fatal: unknown option --non-existing-option
-fast-import: dumping crash report to .git/fast_import_crash_2013056
+fast-import: dumping crash report to .git/fast_import_crash_526976
 ok 163 - R: unknown commandline options are rejected
 
 expecting success of 9300.164 'R: die on invalid option argument': 
@@ -544178,11 +545192,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_2013082
+fast-import: dumping crash report to .git/fast_import_crash_527004
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_2013099
+fast-import: dumping crash report to .git/fast_import_crash_527037
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_2013112
+fast-import: dumping crash report to .git/fast_import_crash_527052
 ok 164 - R: die on invalid option argument
 
 expecting success of 9300.165 'R: ignore non-git options': 
@@ -544233,7 +545247,7 @@
 	test_cmp expect io.marks
 
 fatal: object not found: 0000000000000000000000000000000000000000
-fast-import: dumping crash report to .git/fast_import_crash_2013153
+fast-import: dumping crash report to .git/fast_import_crash_527172
 ok 166 - R: corrupt lines do not mess marks file
 
 expecting success of 9300.167 'R: blob bigger than threshold': 
@@ -546722,7 +547736,7 @@
 
 cruft: progress foo
 cruft: progress bar
-Terminated
+./test-lib.sh: line 1019: wait: pid 531762 is not a child of this shell
 ok 244 - V: checkpoint helper does not get stuck with extra output
 
 expecting success of 9300.245 'V: checkpoint updates refs after reset': 
@@ -546736,7 +547750,7 @@
 	test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1019: wait: pid 531881 is not a child of this shell
 ok 245 - V: checkpoint updates refs after reset
 
 expecting success of 9300.246 'V: checkpoint updates refs and marks after commit': 
@@ -546757,7 +547771,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1019: wait: pid 532016 is not a child of this shell
 ok 246 - V: checkpoint updates refs and marks after commit
 
 expecting success of 9300.247 'V: checkpoint updates refs and marks after commit (no new objects)': 
@@ -546778,7 +547792,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1019: wait: pid 532180 is not a child of this shell
 ok 247 - V: checkpoint updates refs and marks after commit (no new objects)
 
 expecting success of 9300.248 'V: checkpoint updates tags after tag': 
@@ -546796,7 +547810,7 @@
 
 257d40767a41942fd4cbdd546e6183e743d96bbf refs/tags/Vtag
 114b4ec89664abe96ffe4873754fefc6aff6c1a2 refs/tags/Vtag^{}
-Terminated
+./test-lib.sh: line 1019: wait: pid 532320 is not a child of this shell
 ok 248 - V: checkpoint updates tags after tag
 
 expecting success of 9300.249 'W: get-mark & empty orphan commit with no newlines': 
@@ -546900,7 +547914,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_2016743
+fast-import: dumping crash report to .git/fast_import_crash_532515
 ok 252 - W: get-mark & empty orphan commit with erroneous third newline
 
 expecting success of 9300.253 'X: handling encoding': 
@@ -547059,1344 +548073,407 @@
 1..256
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9168-git-svn-partially-globbed-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9168-git-svn-partially-globbed-names/.git/
-expecting success of 9168.1 'prepare test refspec prefixed globbing': 
-	cat >expect.end <<EOF
-the end
-hi
-start a new branch
-initial
-EOF
-	
-ok 1 - prepare test refspec prefixed globbing
-
-expecting success of 9168.2 'test refspec prefixed globbing': 
-	mkdir -p trunk/src/a trunk/src/b trunk/doc &&
-	echo "hello world" >trunk/src/a/readme &&
-	echo "goodbye world" >trunk/src/b/readme &&
-	svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
-	svn_cmd co "$svnrepo" tmp &&
-	(
-		cd tmp &&
-		mkdir branches tags &&
-		svn_cmd add branches tags &&
-		svn_cmd cp trunk branches/b_start &&
-		svn_cmd commit -m "start a new branch" &&
-		svn_cmd up &&
-		echo "hi" >>branches/b_start/src/b/readme &&
-		poke branches/b_start/src/b/readme &&
-		echo "hey" >>branches/b_start/src/a/readme &&
-		poke branches/b_start/src/a/readme &&
-		svn_cmd commit -m "hi" &&
-		svn_cmd up &&
-		svn_cmd cp branches/b_start tags/t_end &&
-		echo "bye" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		echo "aye" >>tags/t_end/src/a/readme &&
-		poke tags/t_end/src/a/readme &&
-		svn_cmd commit -m "the end" &&
-		echo "byebye" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		svn_cmd commit -m "nothing to see here"
-	) &&
-	git config --add svn-remote.svn.url "$svnrepo" &&
-	git config --add svn-remote.svn.fetch \
-			 "trunk/src/a:refs/remotes/trunk" &&
-	git config --add svn-remote.svn.branches \
-			 "branches/b_*/src/a:refs/remotes/branches/b_*" &&
-	git config --add svn-remote.svn.tags\
-			 "tags/t_*/src/a:refs/remotes/tags/t_*" &&
-	git svn multi-fetch &&
-	git log --pretty=oneline refs/remotes/tags/t_end >actual &&
-	cut -d" " -f2- actual >output.end &&
-	test_cmp expect.end output.end &&
-	test "$(git rev-parse refs/remotes/tags/t_end~1)" = \
-		"$(git rev-parse refs/remotes/branches/b_start)" &&
-	test "$(git rev-parse refs/remotes/branches/b_start~2)" = \
-		"$(git rev-parse refs/remotes/trunk)" &&
-	test_must_fail git rev-parse refs/remotes/tags/t_end@3
-	
-Adding         trunk/doc
-Adding         trunk/src
-Adding         trunk/src/a
-Adding         trunk/src/a/readme
-Adding         trunk/src/b
-Adding         trunk/src/b/readme
-Committing transaction...
-Committed revision 1.
-A    tmp/trunk
-A    tmp/trunk/doc
-A    tmp/trunk/src
-A    tmp/trunk/src/a
-A    tmp/trunk/src/a/readme
-A    tmp/trunk/src/b
-A    tmp/trunk/src/b/readme
-Checked out revision 1.
-A         branches
-A         tags
-A         branches/b_start
-Adding         branches
-Adding         branches/b_start
-Adding         tags
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-Sending        branches/b_start/src/a/readme
-Sending        branches/b_start/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-A         tags/t_end
-Adding         tags/t_end
-Sending        tags/t_end/src/a/readme
-Sending        tags/t_end/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 4.
-Sending        tags/t_end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Migrating from a git-svn v1 layout...
-Data from a previous version of git-svn exists, but
-	.git/svn
-	(required for this version (2.48.0.rc1.219.gb6b6757d772) of git-svn) does not exist.
-Done migrating from a git-svn v1 layout
-	A	readme
-r1 = acb876dc1aef02b109a781f4560e6cb8a00fddbd (refs/remotes/trunk)
-branch_from: /trunk => /trunk/src/a
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
-Found branch parent: (refs/remotes/branches/b_start) acb876dc1aef02b109a781f4560e6cb8a00fddbd
-Following parent with do_switch
-Successfully followed parent
-r2 = 7521d702eed34ad6fb544ec67379154bbb3f11aa (refs/remotes/branches/b_start)
-	M	readme
-r3 = ecda1abe23fda50d34eee7a72a53c0d160d29f94 (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.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
-Found branch parent: (refs/remotes/tags/t_end) ecda1abe23fda50d34eee7a72a53c0d160d29f94
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r4 = 304c314427775760040cea3232289d3d8927d737 (refs/remotes/tags/t_end)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a r1
-fatal: ambiguous argument 'refs/remotes/tags/t_end@3': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/tags/t_end@3
-ok 2 - test refspec prefixed globbing
-
-expecting success of 9168.3 'prepare test left-hand-side only prefixed globbing': 
-	echo try to try >expect.two &&
-	echo nothing to see here >>expect.two &&
-	cat expect.end >>expect.two
-	
-ok 3 - prepare test left-hand-side only prefixed globbing
-
-expecting success of 9168.4 'test left-hand-side only prefixed globbing': 
-	git config --add svn-remote.two.url "$svnrepo" &&
-	git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
-	git config --add svn-remote.two.branches \
-			 "branches/b_*:refs/remotes/two/branches/*" &&
-	git config --add svn-remote.two.tags \
-			 "tags/t_*:refs/remotes/two/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	git svn fetch two &&
-	git rev-list refs/remotes/two/tags/t_end >actual &&
-	test_line_count = 6 actual &&
-	git rev-list refs/remotes/two/branches/b_start >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/two/branches/b_start~2) = \
-	     $(git rev-parse refs/remotes/two/trunk) &&
-	test $(git rev-parse refs/remotes/two/tags/t_end~3) = \
-	     $(git rev-parse refs/remotes/two/branches/b_start) &&
-	git log --pretty=oneline refs/remotes/two/tags/t_end >actual &&
-	cut -d" " -f2- actual >output.two &&
-	test_cmp expect.two output.two
-	
-Sending        tags/t_end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-	A	src/a/readme
-	A	src/b/readme
-W: +empty_dir: trunk/doc
-r1 = 143024776ff4fd22544d542870b6b5faedc66871 (refs/remotes/two/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/two/branches/b_start) 143024776ff4fd22544d542870b6b5faedc66871
-Following parent with do_switch
-Successfully followed parent
-r2 = acf79bb21f64f4d0990fe6efee56e79fb9c85555 (refs/remotes/two/branches/b_start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = ccbbbc77651c5a9e6e68e643168bc1fdd3dcd1ad (refs/remotes/two/branches/b_start)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/two/tags/t_end) ccbbbc77651c5a9e6e68e643168bc1fdd3dcd1ad
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 0efb9762756d68c525f4175bf8dadcde7bb98f04 (refs/remotes/two/tags/t_end)
-	M	src/b/readme
-r5 = 2a2406dc8beaf31f6f5234bc411ac6669dea9e7d (refs/remotes/two/tags/t_end)
-	M	src/b/readme
-r6 = 1ec7fcec1bae48aac9d5d3a23521e90508383fd5 (refs/remotes/two/tags/t_end)
-ok 4 - test left-hand-side only prefixed globbing
-
-expecting success of 9168.5 'prepare test prefixed globs match just prefix': 
-	cat >expect.three <<EOF
-Tag commit to t_
-Branch commit to b_
-initial
-EOF
-	
-ok 5 - prepare test prefixed globs match just prefix
-
-expecting success of 9168.6 'test prefixed globs match just prefix': 
-	git config --add svn-remote.three.url "$svnrepo" &&
-	git config --add svn-remote.three.fetch \
-			 trunk:refs/remotes/three/trunk &&
-	git config --add svn-remote.three.branches \
-			 "branches/b_*:refs/remotes/three/branches/*" &&
-	git config --add svn-remote.three.tags \
-			 "tags/t_*:refs/remotes/three/tags/*" &&
-	(
-		cd tmp &&
-		svn_cmd cp trunk branches/b_ &&
-		echo "Branch commit to b_" >>branches/b_/src/a/readme &&
-		poke branches/b_/src/a/readme &&
-		svn_cmd commit -m "Branch commit to b_" &&
-		svn_cmd up && svn_cmd cp branches/b_ tags/t_ &&
-		echo "Tag commit to t_" >>tags/t_/src/a/readme &&
-		poke tags/t_/src/a/readme &&
-		svn_cmd commit -m "Tag commit to t_" &&
-		svn_cmd up
-	) &&
-	git svn fetch three &&
-	git rev-list refs/remotes/three/branches/b_ >actual &&
-	test_line_count = 2 actual &&
-	git rev-list refs/remotes/three/tags/t_ >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/three/branches/b_~1) = \
-	     $(git rev-parse refs/remotes/three/trunk) &&
-	test $(git rev-parse refs/remotes/three/tags/t_~1) = \
-	     $(git rev-parse refs/remotes/three/branches/b_) &&
-	git log --pretty=oneline refs/remotes/three/tags/t_ >actual &&
-	cut -d" " -f2- actual >output.three &&
-	test_cmp expect.three output.three
-	
-A         branches/b_
-Adding         branches/b_
-Sending        branches/b_/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-Updating '.':
-At revision 7.
-A         tags/t_
-Adding         tags/t_
-Sending        tags/t_/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 8.
-Updating '.':
-At revision 8.
-	A	src/a/readme
-	A	src/b/readme
-W: +empty_dir: trunk/doc
-r1 = 143024776ff4fd22544d542870b6b5faedc66871 (refs/remotes/three/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/three/branches/b_start) 143024776ff4fd22544d542870b6b5faedc66871
-Following parent with do_switch
-Successfully followed parent
-r2 = acf79bb21f64f4d0990fe6efee56e79fb9c85555 (refs/remotes/three/branches/b_start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = ccbbbc77651c5a9e6e68e643168bc1fdd3dcd1ad (refs/remotes/three/branches/b_start)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/three/tags/t_end) ccbbbc77651c5a9e6e68e643168bc1fdd3dcd1ad
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 0efb9762756d68c525f4175bf8dadcde7bb98f04 (refs/remotes/three/tags/t_end)
-	M	src/b/readme
-r5 = 2a2406dc8beaf31f6f5234bc411ac6669dea9e7d (refs/remotes/three/tags/t_end)
-	M	src/b/readme
-r6 = 1ec7fcec1bae48aac9d5d3a23521e90508383fd5 (refs/remotes/three/tags/t_end)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
-Found branch parent: (refs/remotes/three/branches/b_) 143024776ff4fd22544d542870b6b5faedc66871
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r7 = 5ac800c4b6d90100f1e303964d4d845155f8c525 (refs/remotes/three/branches/b_)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
-Found branch parent: (refs/remotes/three/tags/t_) 5ac800c4b6d90100f1e303964d4d845155f8c525
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r8 = ee871dca68625c02cf815620f7e8f2e37321dac2 (refs/remotes/three/tags/t_)
-ok 6 - test prefixed globs match just prefix
-
-expecting success of 9168.7 'prepare test disallow prefixed multi-globs': 
-cat >expect.four <<EOF
-Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/b_*/t/*
-
-EOF
-	
-ok 7 - prepare test disallow prefixed multi-globs
-
-expecting success of 9168.8 'test disallow prefixed multi-globs': 
-	git config --add svn-remote.four.url "$svnrepo" &&
-	git config --add svn-remote.four.fetch \
-			 trunk:refs/remotes/four/trunk &&
-	git config --add svn-remote.four.branches \
-			 "branches/b_*/t/*:refs/remotes/four/branches/*" &&
-	git config --add svn-remote.four.tags \
-			 "tags/t_*/*:refs/remotes/four/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >>tags/t_end/src/b/readme &&
-		poke tags/t_end/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	test_must_fail git svn fetch four 2>stderr.four &&
-	test_cmp expect.four stderr.four &&
-	git config --unset svn-remote.four.branches &&
-	git config --unset svn-remote.four.tags
-	
-Sending        tags/t_end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 9.
-ok 8 - test disallow prefixed multi-globs
-
-expecting success of 9168.9 'prepare test globbing in the middle of the word': 
-	cat >expect.five <<EOF
-Tag commit to fghij
-Branch commit to abcde
-initial
-EOF
-	
-ok 9 - prepare test globbing in the middle of the word
-
-expecting success of 9168.10 'test globbing in the middle of the word': 
-	git config --add svn-remote.five.url "$svnrepo" &&
-	git config --add svn-remote.five.fetch \
-			 trunk:refs/remotes/five/trunk &&
-	git config --add svn-remote.five.branches \
-			 "branches/a*e:refs/remotes/five/branches/*" &&
-	git config --add svn-remote.five.tags \
-			 "tags/f*j:refs/remotes/five/tags/*" &&
-	(
-		cd tmp &&
-		svn_cmd cp trunk branches/abcde &&
-		echo "Branch commit to abcde" >>branches/abcde/src/a/readme &&
-		poke branches/b_/src/a/readme &&
-		svn_cmd commit -m "Branch commit to abcde" &&
-		svn_cmd up &&
-		svn_cmd cp branches/abcde tags/fghij &&
-		echo "Tag commit to fghij" >>tags/fghij/src/a/readme &&
-		poke tags/fghij/src/a/readme &&
-		svn_cmd commit -m "Tag commit to fghij" &&
-		svn_cmd up
-	) &&
-	git svn fetch five &&
-	git rev-list refs/remotes/five/branches/abcde >actual &&
-	test_line_count = 2 actual &&
-	git rev-list refs/remotes/five/tags/fghij >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/five/branches/abcde~1) = \
-	     $(git rev-parse refs/remotes/five/trunk) &&
-	test $(git rev-parse refs/remotes/five/tags/fghij~1) = \
-	     $(git rev-parse refs/remotes/five/branches/abcde) &&
-	git log --pretty=oneline refs/remotes/five/tags/fghij >actual &&
-	cut -d" " -f2- actual >output.five &&
-	test_cmp expect.five output.five
-	
-A         branches/abcde
-Adding         branches/abcde
-Sending        branches/abcde/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 10.
-Updating '.':
-At revision 10.
-A         tags/fghij
-Adding         tags/fghij
-Sending        tags/fghij/src/a/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 11.
-Updating '.':
-At revision 11.
-	A	src/a/readme
-	A	src/b/readme
-W: +empty_dir: trunk/doc
-r1 = 143024776ff4fd22544d542870b6b5faedc66871 (refs/remotes/five/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
-Found branch parent: (refs/remotes/five/branches/abcde) 143024776ff4fd22544d542870b6b5faedc66871
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r10 = ccd09e43196ca6da22196ea00f501d4d186f1bb2 (refs/remotes/five/branches/abcde)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
-Found branch parent: (refs/remotes/five/tags/fghij) ccd09e43196ca6da22196ea00f501d4d186f1bb2
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r11 = 8ba8fe085a0b92bc4badaa84d57f8d93debfae03 (refs/remotes/five/tags/fghij)
-ok 10 - test globbing in the middle of the word
-
-expecting success of 9168.11 'prepare test disallow multiple asterisks in one word': 
-	echo "Only one '*' is allowed in a pattern: 'a*c*e'" >expect.six &&
-	echo "" >>expect.six
-	
-ok 11 - prepare test disallow multiple asterisks in one word
-
-expecting success of 9168.12 'test disallow multiple asterisks in one word': 
-	git config --add svn-remote.six.url "$svnrepo" &&
-	git config --add svn-remote.six.fetch \
-			 trunk:refs/remotes/six/trunk &&
-	git config --add svn-remote.six.branches \
-			 "branches/a*c*e:refs/remotes/six/branches/*" &&
-	git config --add svn-remote.six.tags \
-			 "tags/f*h*j:refs/remotes/six/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >>tags/fghij/src/b/readme &&
-		poke tags/fghij/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	test_must_fail git svn fetch six 2>stderr.six &&
-	test_cmp expect.six stderr.six
-	
-Sending        tags/fghij/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 12.
-ok 12 - test disallow multiple asterisks in one word
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9301-fast-import-notes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9301-fast-import-notes/.git/
-expecting success of 9301.1 'set up main branch': 
-
-	git fast-import <input &&
-	git whatchanged main
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           17 (         0 duplicates                  )
-      blobs  :            7 (         0 duplicates          0 deltas of          6 attempts)
-      trees  :            6 (         0 duplicates          3 deltas of          4 attempts)
-      commits:            4 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              4
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-commit 9a93771a958bca801f51ff270bc677be08b70970
-Author: C O Mitter <committer@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    fourth commit
-
-:100755 100755 3c9b917 98d1b63 M	bar
-
-commit dbe3ab44992634d04709231cc00251483e46cff8
-Author: C O Mitter <committer@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    third commit
-
-:100644 100644 215df20 634bd2b M	foo
+*** t9501-gitweb-standalone-http-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9501-gitweb-standalone-http-status/.git/
+expecting success of 9501.1 'setup': 
+	test_commit 'SnapshotTests' 'i can has snapshot'
 
-commit bcc89d2db5d163929b6fbd169c2559b47a076acb
-Author: C O Mitter <committer@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+[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
 
-    second commit
+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
 
-:100644 100755 532386d be960bf M	baz/xyzzy
-:100644 100644 df023b2 215df20 M	foo
+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
 
-commit 49f8b007d515fc33aed8245ee498753d4270cc78
-Author: C O Mitter <committer@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+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
 
-    first commit
+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
 
-:000000 100755 0000000 3c9b917 A	bar
-:000000 100644 0000000 532386d A	baz/xyzzy
-:000000 100644 0000000 df023b2 A	foo
-ok 1 - set up main branch
+expecting success of 9501.6 'snapshots: good tree-ish id': 
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
+	grep "Status: 200 OK" gitweb.output
 
-expecting success of 9301.2 'add notes with simple M command': 
+grep: gitweb.output: binary file matches
+ok 6 - snapshots: good tree-ish id
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
-	test_cmp expect actual
+expecting success of 9501.7 'snapshots: bad tree-ish id': 
+	gitweb_run "p=.git;a=snapshot;h=frizzumFrazzum;sf=tgz" &&
+	grep "404 - Object does not exist" gitweb.output
 
+404 - Object does not exist
+ok 7 - snapshots: bad tree-ish id
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            4 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              2
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
+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
 
-ok 2 - add notes with simple M command
+[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 9301.3 'add notes with simple N command': 
+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
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
-	test_cmp expect actual
+grep: gitweb.output: binary file matches
+ok 9 - snapshots: good object id
 
+expecting success of 9501.10 'snapshots: bad object id': 
+	gitweb_run "p=.git;a=snapshot;h=abcdef01234;sf=tgz" &&
+	grep "404 - Object does not exist" gitweb.output
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            4 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          1 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:              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
----------------------------------------------------------------------
+404 - Object does not exist
+ok 10 - snapshots: bad object id
 
-ok 3 - add notes with simple N command
+expecting success of 9501.11 'modification: feed last-modified': 
+	gitweb_run "p=.git;a=atom;h=main" &&
+	grep "Status: 200 OK" gitweb.headers &&
+	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
 
-expecting success of 9301.4 'update existing notes with N command': 
+Status: 200 OK
+Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
+ok 11 - modification: feed last-modified
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
-	test_cmp expect actual
+expecting success of 9501.12 'modification: feed if-modified-since (modified)': 
+	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
+	export HTTP_IF_MODIFIED_SINCE &&
+	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
+	gitweb_run "p=.git;a=atom;h=main" &&
+	grep "Status: 200 OK" gitweb.headers
 
+Status: 200 OK
+ok 12 - modification: feed if-modified-since (modified)
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            4 (         0 duplicates          0 deltas of          3 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:              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
----------------------------------------------------------------------
+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 4 - update existing notes with N command
+Status: 304 Not Modified
+ok 13 - modification: feed if-modified-since (unmodified)
 
-expecting success of 9301.5 'add concatenation notes with M command': 
+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
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
-	test_cmp expect actual
+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
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           12 (         0 duplicates                  )
-      blobs  :            7 (         0 duplicates          0 deltas of          6 attempts)
-      trees  :            4 (         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:             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
----------------------------------------------------------------------
+Status: 200 OK
+ok 15 - modification: snapshot if-modified-since (modified)
 
-ok 5 - add concatenation notes with M command
+expecting success of 9501.16 'modification: snapshot if-modified-since (unmodified)': 
+	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
+	export HTTP_IF_MODIFIED_SINCE &&
+	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
+	grep "Status: 304 Not Modified" gitweb.headers
 
-expecting success of 9301.6 'verify that deleteall also removes notes': 
+Status: 304 Not Modified
+ok 16 - modification: snapshot if-modified-since (unmodified)
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
-	test_cmp expect actual
+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
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            2 (         0 duplicates                  )
-      blobs  :            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:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              6
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
+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
 
-ok 6 - verify that deleteall also removes notes
+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 9301.7 'verify that later N commands override earlier M commands': 
+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
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
-	test_cmp expect actual
+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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9600-cvsimport.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9600-cvsimport/.git/
+checking prerequisite: NOT_ROOT
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            4 (         0 duplicates          0 deltas of          3 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              2
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-ok 7 - verify that later N commands override earlier M commands
+)
+prerequisite NOT_ROOT ok
+expecting success of 9600.1 'setup cvsroot environment': 
+	CVSROOT=$(pwd)/cvsroot &&
+	export CVSROOT
 
-expecting success of 9301.8 'add lots of commits and notes': 
+ok 1 - setup cvsroot environment
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/many_notes git log refs/heads/many_commits |
-	    grep "^    " > actual &&
-	test_cmp expect actual
+expecting success of 9600.2 'setup cvsroot': $CVS init
+ok 2 - setup cvsroot
 
+expecting success of 9600.3 'setup a cvs module': 
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:         1813 (         0 duplicates                  )
-      blobs  :          803 (         0 duplicates        392 deltas of        695 attempts)
-      trees  :          608 (         0 duplicates          2 deltas of        401 attempts)
-      commits:          402 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           2 (         2 loads     )
-      marks:           1024 (       400 unique    )
-      atoms:            864
-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            =          4
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =     129374 /     129374
----------------------------------------------------------------------
+	mkdir "$CVSROOT/module" &&
+	$CVS co -d module-cvs module &&
+	(cd module-cvs &&
+	cat <<EOF >o_fortuna &&
+O Fortuna
+velut luna
+statu variabilis,
 
-ok 8 - add lots of commits and notes
+semper crescis
+aut decrescis;
+vita detestabilis
 
-expecting success of 9301.9 'verify that lots of notes trigger a fanout scheme': 
-	hexsz=$(test_oid hexsz) &&
+nunc obdurat
+et tunc curat
+ludo mentis aciem,
 
-	# None of the entries in the top-level notes tree should be a full SHA1
-	git ls-tree --name-only refs/notes/many_notes |
-	while read path
-	do
-		if test $(expr length "$path") -ge $hexsz
-		then
-			return 1
-		fi
-	done
+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
+	)
 
-ok 9 - verify that lots of notes trigger a fanout scheme
+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.48.0~rc1+next.20250101/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 9301.10 'verify that importing a notes tree respects the fanout scheme': 
-	git fast-import <input &&
+expecting success of 9600.4 'import a trivial module': 
 
-	# None of the entries in the top-level notes tree should be a full SHA1
-	git ls-tree --name-only refs/notes/other_notes |
-	while read path
-	do
-		if test $(expr length "$path") -ge $hexsz
-		then
-			return 1
-		fi
-	done
+	git cvsimport -a -R -z 0 -C module-git module &&
+	test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            2 (      1818 duplicates                  )
-      blobs  :            0 (       805 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (       611 duplicates          0 deltas of          0 attempts)
-      commits:            2 (       402 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           4 (         4 loads     )
-      marks:           1024 (       400 unique    )
-      atoms:            864
-Memory total:          2587 KiB
-       pools:          2235 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =        212
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =     129374 /     129374
----------------------------------------------------------------------
 
-ok 10 - verify that importing a notes tree respects the fanout scheme
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9600-cvsimport/module-git/.git/
+ok 4 - import a trivial module
 
-expecting success of 9301.11 'verify that non-notes are untouched by a fanout change': 
+expecting success of 9600.5 'pack refs': (cd module-git && git gc)
+ok 5 - pack refs
 
-	git cat-file -p refs/notes/many_notes:foobar/non-note.txt > actual &&
-	test_cmp expect_non-note1 actual &&
-	git cat-file -p refs/notes/many_notes:deadbeef > actual &&
-	test_cmp expect_non-note2 actual &&
-	git cat-file -p refs/notes/many_notes:de/adbeef > actual &&
-	test_cmp expect_non-note3 actual
+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 11 - verify that non-notes are untouched by a fanout change
+ok 6 - initial import has correct .git/cvs-revisions
 
-expecting success of 9301.12 'change a few existing notes': 
+expecting success of 9600.7 'update cvs module': 
+	(cd module-cvs &&
+	cat <<EOF >o_fortuna &&
+O Fortune,
+like the moon
+you are changeable,
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/many_notes git log -n3 refs/heads/many_commits |
-	    grep "^    " > actual &&
-	test_cmp expect actual
+ever waxing
+and waning;
+hateful life
 
+first oppresses
+and then soothes
+as fancy takes it;
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            8 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          2 deltas of          2 attempts)
-      trees  :            4 (         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:            608
-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            =        216
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =     129374 /     129374
----------------------------------------------------------------------
+poverty
+and power
+it melts them like ice.
+EOF
+	cat <<EOF >message &&
+translate to English
 
-ok 12 - change a few existing notes
+My Latin is terrible.
+EOF
+	$CVS commit -F message
+	)
 
-expecting success of 9301.13 'verify that changing notes respect existing fanout': 
+cvs commit: Examining .
+/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
 
-	# None of the entries in the top-level notes tree should be a full SHA1
-	git ls-tree --name-only refs/notes/many_notes |
-	while read path
-	do
-		if test $(expr length "$path") -ge $hexsz
-		then
-			return 1
-		fi
-	done
+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
 
-ok 13 - verify that changing notes respect existing fanout
 
-expecting success of 9301.14 'remove lots of notes': 
+Updating c94fd87..b722253
+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
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/many_notes git log refs/heads/many_commits |
-	    grep "^    " > actual &&
-	test_cmp expect actual
+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
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         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:            618
-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            =        593
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =     129374 /     129374
----------------------------------------------------------------------
+ok 9 - update has correct .git/cvs-revisions
 
-ok 14 - remove lots of notes
+expecting success of 9600.10 'update cvs module': 
 
-expecting success of 9301.15 'verify that removing notes trigger fanout consolidation': 
-	# All entries in the top-level notes tree should be a full SHA1
-	git ls-tree --name-only -r refs/notes/many_notes |
-	while read path
-	do
-		# Explicitly ignore the non-note paths
-		test "$path" = "foobar/non-note.txt" && continue
-		test "$path" = "deadbeef" && continue
-		test "$path" = "de/adbeef" && continue
+	(cd module-cvs &&
+		echo 1 >tick &&
+		$CVS add tick &&
+		$CVS commit -m 1
+	)
 
-		if test $(expr length "$path") -ne $hexsz
-		then
-			return 1
-		fi
-	done
+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.48.0~rc1+next.20250101/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': 
 
-ok 15 - verify that removing notes trigger fanout consolidation
+	(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
 
-expecting success of 9301.16 'verify that non-notes are untouched by a fanout change': 
 
-	git cat-file -p refs/notes/many_notes:foobar/non-note.txt > actual &&
-	test_cmp expect_non-note1 actual &&
-	git cat-file -p refs/notes/many_notes:deadbeef > actual &&
-	test_cmp expect_non-note2 actual &&
-	git cat-file -p refs/notes/many_notes:de/adbeef > actual &&
-	test_cmp expect_non-note3 actual
+Updating b722253..1962aad
+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': 
 
-ok 16 - verify that non-notes are untouched by a fanout change
+	(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
 
-expecting success of 9301.17 'add notes to 16 commits in each of 10 refs': 
+ok 12 - second update has correct .git/cvs-revisions
 
-	git fast-import --active-branches=5 <input &&
-	GIT_NOTES_REF=refs/notes/more_notes_1 git log refs/heads/more_commits |
-	    grep "^    " > actual &&
-	test_cmp expect actual
+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
+	)
 
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           46 (       282 duplicates                  )
-      blobs  :            8 (       248 duplicates          0 deltas of          7 attempts)
-      trees  :            2 (        34 duplicates          1 deltas of          1 attempts)
-      commits:           36 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:          11 (        21 loads     )
-      marks:           1024 (        16 unique    )
-      atoms:             17
-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          =         10
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       6351
----------------------------------------------------------------------
 
-ok 17 - add notes to 16 commits in each of 10 refs
+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.48.0~rc1+next.20250101/t/trash directory.t9600-cvsimport/import-from-wt/.git/
+ok 13 - import from a CVS working tree
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9601-cvsimport-vendor-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9601-cvsimport-vendor-branch/.git/
-expecting success of 9601.1 'import a module with a vendor branch': 
+expecting success of 9600.14 'no .git/cvs-revisions created by default': 
 
-	git cvsimport -C module-git module
+	! test -e import-from-wt/.git/cvs-revisions
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9601-cvsimport-vendor-branch/module-git/.git/
-Skipping #CVSPS_NO_BRANCH
-ok 1 - import a module with a vendor branch
+ok 14 - no .git/cvs-revisions created by default
 
-expecting success of 9601.2 'check HEAD out of cvs repository': test_cvs_co main
+expecting success of 9600.15 'test entire HEAD': test_cmp_branch_tree 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
+U module-cvs-main/o_fortuna
+U module-cvs-main/tick
 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-02-09 06:56:06.958495447 +0000
-@@ -1 +1 @@
--This is vtag-2 (on vbranchA) of imported-twice.txt.
-+This is vtag-1 (on vbranchA) of imported-twice.txt.
-not ok 5 - check a file that was imported twice # TODO known breakage
-
-expecting success of 9601.6 'check a file that was imported then modified on HEAD': 
-
-	test_cmp_branch_file main imported-modified.txt
-
-
-ok 6 - check a file that was imported then modified on HEAD
-
-expecting success of 9601.7 'check a file that was imported, modified, then imported again': 
-
-	test_cmp_branch_file main imported-modified-imported.txt
-
-
-ok 7 - check a file that was imported, modified, then imported again
-
-expecting success of 9601.8 'check a file that was added to HEAD then imported': 
-
-	test_cmp_branch_file main added-imported.txt
-
-
-ok 8 - check a file that was added to HEAD then imported
-
-expecting success of 9601.9 'a vendor branch whose tag has been removed': 
-
-	test_cmp_branch_file main imported-anonymously.txt
-
-
-ok 9 - a vendor branch whose tag has been removed
-
-# still have 1 known breakage(s)
-# passed all remaining 8 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9161-git-svn-mergeinfo-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' 	  < '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/t9161/branches.dump' &&
-	git svn init --minimize-url -R svnmerge 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' &&
-	git svn fetch --all
-	
-r1 = 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1, 1
-Found branch parent: (refs/remotes/origin/svnb1) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
-Following parent with do_switch
-Successfully followed parent
-r2 = b80313133f79a5e24b1b654a5faac1b93f4c4db3 (refs/remotes/origin/svnb1)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2, 1
-Found branch parent: (refs/remotes/origin/svnb2) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
-Following parent with do_switch
-Successfully followed parent
-r3 = c050f59b4662544fbbe92e1708863cc6f05bb3d2 (refs/remotes/origin/svnb2)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb3, 1
-Found branch parent: (refs/remotes/origin/svnb3) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
-Following parent with do_switch
-Successfully followed parent
-r4 = 7b06ee846363596765dd84c46248f5bedc23981f (refs/remotes/origin/svnb3)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4, 1
-Found branch parent: (refs/remotes/origin/svnb4) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
-Following parent with do_switch
-Successfully followed parent
-r5 = c2069440a46804fcb122a4c54ac89c7a985c12be (refs/remotes/origin/svnb4)
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb5, 1
-Found branch parent: (refs/remotes/origin/svnb5) 08fd5d7bfc82658c58a95f63f76ae5b9d24ec427
-Following parent with do_switch
-Successfully followed parent
-r6 = 17c0ea8d1711f65984a793738682e62b5f4933a2 (refs/remotes/origin/svnb5)
-	A	b1file
-r7 = f2faef36af6975fec0f09da97bf2720d3495caaa (refs/remotes/origin/svnb1)
-	A	b2file
-r8 = 673e7e36897c71819b57b9d9f0fa23a3387886d9 (refs/remotes/origin/svnb2)
-	A	b3file
-r9 = 57ddcd0f04fca70a11cbc0ee55843d3c335ab445 (refs/remotes/origin/svnb3)
-	A	b4file
-r10 = 9eb4d19c8ae6d2d05377386b1658233cfbb130b8 (refs/remotes/origin/svnb4)
-	A	b5file
-r11 = 55d0c51485de3ddc9842891fc4bdf00a7d251d10 (refs/remotes/origin/svnb5)
-	A	b5file
-Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
-Found merge parent (/branches/svnb5:6,11): 55d0c51485de3ddc9842891fc4bdf00a7d251d10
-r12 = 872c30bd0f07388cedd13e878ff579a67532de58 (refs/remotes/origin/svnb4)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk r1
-ok 1 - load svn dump
-
-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'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at f2faef3 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.48.0~rc1+next.20250101/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): 673e7e36897c71819b57b9d9f0fa23a3387886d9
-r13 = a43b98e173dea4833137168bcf2790c98bdfabc6 (refs/remotes/origin/svnb1)
-No changes between 98d5f712734e2c1955a94560eeaec39060964afb and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 2 - propagate merge information
-
-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 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.48.0~rc1+next.20250101/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): 57ddcd0f04fca70a11cbc0ee55843d3c335ab445
-r14 = 882a385aad1da8f573ea8ac01d9c08ea80448550 (refs/remotes/origin/svnb1)
-No changes between ef76ad891fc61394f06d4e8510e5e4aae2615ccd and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 4 - merge another branch
-
-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 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.48.0~rc1+next.20250101/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): 872c30bd0f07388cedd13e878ff579a67532de58
-Found merge parent (/branches/svnb5:6,11): 55d0c51485de3ddc9842891fc4bdf00a7d251d10
-r15 = 7f25552259073cf966a0b5e515565df31d44b565 (refs/remotes/origin/svnb1)
-No changes between e997d957f651679b8b73f26a669b152f25784453 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 6 - merge existing merge
-
-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 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 7f25552 Merge remote-tracking branch 'origin/svnb4' into HEAD
-HEAD is now at 673e7e3 b2 commit
-[detached HEAD 22e026a] later b2 commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 newb2file
-[detached HEAD 4c49256] 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.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2 ...
-	A	newb2file
-Committed r16
-	A	newb2file
-r16 = 237ff4f30a0eb890e4dcfb43c634c538dff73add (refs/remotes/origin/svnb2)
-	A	newb2file-2
-Committed r17
-	A	newb2file-2
-r17 = c6aa8fecc120d4aa77752461614012f8a4508da0 (refs/remotes/origin/svnb2)
-No changes between 4c49256ec85847c662a4fc4d15c876062353fd51 and refs/remotes/origin/svnb2
-Resetting to the latest refs/remotes/origin/svnb2
-ok 8 - make further commits to branch
-
-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 c6aa8fe later b2 commit 2
-HEAD is now at 7f25552 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.48.0~rc1+next.20250101/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): c6aa8fecc120d4aa77752461614012f8a4508da0
-r18 = f62e91000cb411d050ff9bf8155420302b550f04 (refs/remotes/origin/svnb1)
-No changes between 05f1e7c9cdd4f38188ed64bba9aea15e2e6f1c41 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 9 - second forward merge
-
-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 9161.11 'reintegration merge': 
-	git checkout origin/svnb4 &&
-	git merge --no-ff origin/svnb1 &&
-	git svn dcommit
-	
-Previous HEAD position was f62e910 Merge remote-tracking branch 'origin/svnb2' into HEAD
-HEAD is now at 872c30b 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.48.0~rc1+next.20250101/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): f62e91000cb411d050ff9bf8155420302b550f04
-Found merge parent (/branches/svnb2:3,8,16-17): c6aa8fecc120d4aa77752461614012f8a4508da0
-Found merge parent (/branches/svnb3:4,9): 57ddcd0f04fca70a11cbc0ee55843d3c335ab445
-r19 = 6e4475d03a1d8a1679f5fb18d984185cc9003225 (refs/remotes/origin/svnb4)
-No changes between 0d68ef0a2108d32edb469958367ce0f208f04a89 and refs/remotes/origin/svnb4
-Resetting to the latest refs/remotes/origin/svnb4
-ok 11 - reintegration merge
-
-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
-
-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 6e4475d Merge remote-tracking branch 'origin/svnb1' into HEAD
-HEAD is now at f62e910 Merge remote-tracking branch 'origin/svnb2' into HEAD
-[detached HEAD 6ea2ca2] 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.48.0~rc1+next.20250101/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	anotherfile
-Committed r20
-	A	anotherfile
-r20 = 20c067d329e5cc9c9f2f0819c53a0799e4c22a97 (refs/remotes/origin/svnb1)
-Committed r21
-No changes
-7792133b1577916415d3938f8d1fc3244d7ccda2~1 == 7792133b1577916415d3938f8d1fc3244d7ccda2
-Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
-Found merge parent (/branches/svnb4:10-12,19): 6e4475d03a1d8a1679f5fb18d984185cc9003225
-r21 = 94e53e608af62e3d809103ba18a7ca364354aeac (refs/remotes/origin/svnb1)
-No changes between 7792133b1577916415d3938f8d1fc3244d7ccda2 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 13 - dcommit a merge at the top of a stack
+ok 15 - test entire HEAD
 
-# passed all 13 test(s)
-1..13
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9603-cvsimport-patchsets.sh ***
@@ -548421,8 +548498,8 @@
 	test_cmp expect-A actual-A
 
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
---- expect-main	2025-02-09 06:56:07.354497967 +0000
-+++ actual-main	2025-02-09 06:56:07.354497967 +0000
+--- expect-main	2026-03-14 13:39:41.198677808 +0000
++++ actual-main	2026-03-14 13:39:41.198677808 +0000
 @@ -1,4 +1,4 @@
  Rev 4
  Rev 3
@@ -548443,6 +548520,14 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9803-git-p4-shell-metachars.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9700-perl-git.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9700-perl-git/.git/
 checking prerequisite: PERL_TEST_MORE
@@ -548571,12 +548656,463 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9803-git-p4-shell-metachars.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
+*** t9164-git-svn-dcommit-concurrent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/.git/
+expecting success of 9164.1 'setup svn repository': 
+	svn_cmd checkout "$svnrepo" work.svn &&
+	(
+		cd work.svn &&
+		echo >file && echo > auto_updated_file &&
+		svn_cmd add file auto_updated_file &&
+		svn_cmd commit -m "initial commit"
+	) &&
+	svn_cmd checkout "$svnrepo" work-auto-commits.svn
+
+Checked out revision 0.
+A         file
+A         auto_updated_file
+Adding         auto_updated_file
+Adding         file
+Transmitting file data ..done
+Committing transaction...
+Committed revision 1.
+A    work-auto-commits.svn/auto_updated_file
+A    work-auto-commits.svn/file
+Checked out revision 1.
+ok 1 - setup svn repository
+
+expecting success of 9164.2 'check if post-commit hook creates a concurrent commit': 
+	setup_hook post-commit 1 &&
+	(
+		cd work.svn &&
+		cp auto_updated_file au_file_saved &&
+		echo 1 >> file &&
+		svn_cmd commit -m "changing file" &&
+		svn_cmd up &&
+		! test_cmp auto_updated_file au_file_saved
+	)
+
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+U    auto_updated_file
+Updated to revision 3.
+--- auto_updated_file	2026-03-14 13:38:51.382677808 +0000
++++ au_file_saved	2026-03-14 13:38:51.014677808 +0000
+@@ -1,2 +1 @@
+ 
+-505529
+ok 2 - check if post-commit hook creates a concurrent commit
+
+expecting success of 9164.3 'check if pre-commit hook fails': 
+	setup_hook pre-commit 2 &&
+	(
+		cd work.svn &&
+		echo 2 >> file &&
+		svn_cmd commit -m "changing file once again" &&
+		echo 3 >> file &&
+		! svn_cmd commit -m "this commit should fail" &&
+		svn_cmd revert file
+	)
+
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+svn: E165001: Commit failed (details follow):
+svn: E165001: Commit blocked by pre-commit hook (exit code 1) with no output.
+Reverted 'file'
+ok 3 - check if pre-commit hook fails
+
+expecting success of 9164.4 'dcommit error handling': 
+	setup_hook pre-commit 2 &&
+	next_N && git svn clone "$svnrepo" work$N.git &&
+	(
+		cd work$N.git &&
+		echo 1 >> file && git commit -am "commit change $N.1" &&
+		echo 2 >> file && git commit -am "commit change $N.2" &&
+		echo 3 >> file && git commit -am "commit change $N.3" &&
+		# should fail to dcommit 2nd and 3rd change
+		# but still should leave the repository in reasonable state
+		test_must_fail git svn dcommit &&
+		git update-index --refresh &&
+		git show HEAD~2   | grep -q git-svn-id &&
+		! git show HEAD~1 | grep -q git-svn-id &&
+		! git show HEAD   | grep -q git-svn-id
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = 0f8e0994a21586bd0e4c9229c4964eafab01a447 (refs/remotes/git-svn)
+	M	file
+r2 = 3bd14845d23b58d1c00e9e89da44d09cc5523264 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = f490af6eb47961d52dc24dd423e94c5f1d624695 (refs/remotes/git-svn)
+	M	file
+r4 = 72fd49639aa5539e3030dbc2e16c2458b564d111 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
+[master c66c22b] commit change 1.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 1cfe3fd] commit change 1.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 19c0beb] commit change 1.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.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	file
+Committed r5
+	M	file
+r5 = bf470340285556f870d430233c75fb4ea7cd6e35 (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: 19c0bebead7297699937350252dbe153835720b6 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
+warning: skipped previously applied commit c66c22b
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
+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 4 - dcommit error handling
+
+expecting success of 9164.5 'dcommit concurrent change in non-changed file': 
+	setup_hook post-commit 2 &&
+	next_N && git svn clone "$svnrepo" work$N.git &&
+	(
+		cd work$N.git &&
+		echo 1 >> file && git commit -am "commit change $N.1" &&
+		echo 2 >> file && git commit -am "commit change $N.2" &&
+		echo 3 >> file && git commit -am "commit change $N.3" &&
+		# should rebase and leave the repository in reasonable state
+		git svn dcommit &&
+		git update-index --refresh &&
+		check_contents &&
+		git show HEAD~3 | grep -q git-svn-id &&
+		git show HEAD~2 | grep -q git-svn-id &&
+		git show HEAD~1 | grep -q auto-committing &&
+		git show HEAD   | grep -q git-svn-id
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = 0f8e0994a21586bd0e4c9229c4964eafab01a447 (refs/remotes/git-svn)
+	M	file
+r2 = 3bd14845d23b58d1c00e9e89da44d09cc5523264 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = f490af6eb47961d52dc24dd423e94c5f1d624695 (refs/remotes/git-svn)
+	M	file
+r4 = 72fd49639aa5539e3030dbc2e16c2458b564d111 (refs/remotes/git-svn)
+	M	file
+r5 = bf470340285556f870d430233c75fb4ea7cd6e35 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
+[master 1a053c6] commit change 2.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b559f7a] commit change 2.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master f40dbe2] commit change 2.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.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	file
+Committed r6
+	M	file
+r6 = b686f1bc506baf8eb55f46e18640901da5b7ddb3 (refs/remotes/git-svn)
+	M	file
+Committed r7
+	M	file
+r7 = a60e597ddcbe658da37ff6b8c6302e6e17492d86 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = e6f88d00616d43389cc5ba42ccacd9171da3e87e (refs/remotes/git-svn)
+W: b559f7a0bf93ea1ce22fba5ee106f66142cc784c and refs/remotes/git-svn differ, using rebase:
+:100644 100644 c58b174d2d36c6255b8c80ec2efe6739bfe7bd61 21d5b0742e630f03b94a354827e6ee1beaf855b2 M	auto_updated_file
+warning: skipped previously applied commit 1a053c6
+warning: skipped previously applied commit b559f7a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+	M	file
+Committed r9
+	M	file
+r9 = e250a382be7fddd7cdd8db90b212c206513c3e88 (refs/remotes/git-svn)
+No changes between 592205dae9a92d0aa35e5836be9adf207fe23349 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+Updating '.':
+U    file
+U    auto_updated_file
+Updated to revision 9.
+ok 5 - dcommit concurrent change in non-changed file
+
+expecting success of 9164.6 'dcommit concurrent non-conflicting change': 
+	setup_hook post-commit 2 &&
+	next_N && git svn clone "$svnrepo" work$N.git &&
+	(
+		cd work$N.git &&
+		cat file >> auto_updated_file &&
+			git commit -am "commit change $N.1" &&
+		delete_first_line auto_updated_file &&
+			git commit -am "commit change $N.2" &&
+		delete_first_line auto_updated_file &&
+			git commit -am "commit change $N.3" &&
+		# should rebase and leave the repository in reasonable state
+		git svn dcommit &&
+		git update-index --refresh &&
+		check_contents &&
+		git show HEAD~3 | grep -q git-svn-id &&
+		git show HEAD~2 | grep -q git-svn-id &&
+		git show HEAD~1 | grep -q auto-committing &&
+		git show HEAD   | grep -q git-svn-id
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = 0f8e0994a21586bd0e4c9229c4964eafab01a447 (refs/remotes/git-svn)
+	M	file
+r2 = 3bd14845d23b58d1c00e9e89da44d09cc5523264 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = f490af6eb47961d52dc24dd423e94c5f1d624695 (refs/remotes/git-svn)
+	M	file
+r4 = 72fd49639aa5539e3030dbc2e16c2458b564d111 (refs/remotes/git-svn)
+	M	file
+r5 = bf470340285556f870d430233c75fb4ea7cd6e35 (refs/remotes/git-svn)
+	M	file
+r6 = b686f1bc506baf8eb55f46e18640901da5b7ddb3 (refs/remotes/git-svn)
+	M	file
+r7 = a60e597ddcbe658da37ff6b8c6302e6e17492d86 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = e6f88d00616d43389cc5ba42ccacd9171da3e87e (refs/remotes/git-svn)
+	M	file
+r9 = e250a382be7fddd7cdd8db90b212c206513c3e88 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
+[master 13f4a27] commit change 3.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+[master 7a01b96] commit change 3.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master 85a15b4] commit change 3.3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	auto_updated_file
+Committed r10
+	M	auto_updated_file
+r10 = df86f4a09502f500a3da624fb4e1b24e1e782229 (refs/remotes/git-svn)
+	M	auto_updated_file
+Committed r11
+	M	auto_updated_file
+r11 = b9aa90fc95f46f81dce38daafbfb9b6dbd1848d0 (refs/remotes/git-svn)
+	M	auto_updated_file
+r12 = 3c86c1b0f7b19c8e7a967b21c2315dc5801350a0 (refs/remotes/git-svn)
+W: 7a01b966785bfca89cc9f2b96a13246e1305da2c and refs/remotes/git-svn differ, using rebase:
+:100644 100644 a6fae26ebf46c9fcdf9e01efd035f3e5df93144f 21ede32bfa18145e368bec962700fec11f923abe M	auto_updated_file
+warning: skipped previously applied commit 13f4a27
+warning: skipped previously applied commit 7a01b96
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+	M	auto_updated_file
+Committed r13
+	M	auto_updated_file
+r13 = 3caeb992ee46daab7ba84e31f715f0373fee068a (refs/remotes/git-svn)
+No changes between 18209839173bac761ddab1a975989544855b592a and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+Updating '.':
+U    auto_updated_file
+Updated to revision 13.
+ok 6 - dcommit concurrent non-conflicting change
+
+expecting success of 9164.7 'dcommit --no-rebase concurrent non-conflicting change': 
+	setup_hook post-commit 2 &&
+	next_N && git svn clone "$svnrepo" work$N.git &&
+	(
+		cd work$N.git &&
+		cat file >> auto_updated_file &&
+			git commit -am "commit change $N.1" &&
+		delete_first_line auto_updated_file &&
+			git commit -am "commit change $N.2" &&
+		delete_first_line auto_updated_file &&
+			git commit -am "commit change $N.3" &&
+		# should fail as rebase is needed
+		test_must_fail git svn dcommit --no-rebase &&
+		# but should leave HEAD unchanged
+		git update-index --refresh &&
+		! git show HEAD~2 | grep -q git-svn-id &&
+		! git show HEAD~1 | grep -q git-svn-id &&
+		! git show HEAD   | grep -q git-svn-id
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = 0f8e0994a21586bd0e4c9229c4964eafab01a447 (refs/remotes/git-svn)
+	M	file
+r2 = 3bd14845d23b58d1c00e9e89da44d09cc5523264 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = f490af6eb47961d52dc24dd423e94c5f1d624695 (refs/remotes/git-svn)
+	M	file
+r4 = 72fd49639aa5539e3030dbc2e16c2458b564d111 (refs/remotes/git-svn)
+	M	file
+r5 = bf470340285556f870d430233c75fb4ea7cd6e35 (refs/remotes/git-svn)
+	M	file
+r6 = b686f1bc506baf8eb55f46e18640901da5b7ddb3 (refs/remotes/git-svn)
+	M	file
+r7 = a60e597ddcbe658da37ff6b8c6302e6e17492d86 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = e6f88d00616d43389cc5ba42ccacd9171da3e87e (refs/remotes/git-svn)
+	M	file
+r9 = e250a382be7fddd7cdd8db90b212c206513c3e88 (refs/remotes/git-svn)
+	M	auto_updated_file
+r10 = df86f4a09502f500a3da624fb4e1b24e1e782229 (refs/remotes/git-svn)
+	M	auto_updated_file
+r11 = b9aa90fc95f46f81dce38daafbfb9b6dbd1848d0 (refs/remotes/git-svn)
+	M	auto_updated_file
+r12 = 3c86c1b0f7b19c8e7a967b21c2315dc5801350a0 (refs/remotes/git-svn)
+	M	auto_updated_file
+r13 = 3caeb992ee46daab7ba84e31f715f0373fee068a (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
+[master e80e0fb] commit change 4.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+[master 2d94fca] commit change 4.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master a96e2e8] commit change 4.3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+Attempting to commit more than one change while --no-rebase is enabled.
+If these changes depend on each other, re-running without --no-rebase may be required. at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-svn line 879.
+	M	auto_updated_file
+Committed r14
+	M	auto_updated_file
+r14 = 5baec42330e06e78b923da46f61f16c65d05d083 (refs/remotes/git-svn)
+	M	auto_updated_file
+Committed r15
+	M	auto_updated_file
+r15 = c4033abe853204cd9d6a967bd93e7bbbf21f683f (refs/remotes/git-svn)
+	M	auto_updated_file
+r16 = 82aee01362ccea0f153651ec6721c54f2ce63e7f (refs/remotes/git-svn)
+
+ERROR from SVN:
+Transaction is out of date: File '/auto_updated_file' is out of date
+ERROR: Not all changes have been committed into SVN.
+Please see the above messages for details.
+
+ok 7 - dcommit --no-rebase concurrent non-conflicting change
+
+expecting success of 9164.8 'dcommit fails on concurrent conflicting change': 
+	setup_hook post-commit 1 &&
+	next_N && git svn clone "$svnrepo" work$N.git &&
+	(
+		cd work$N.git &&
+		echo a >> file &&
+			git commit -am "commit change $N.1" &&
+		echo b >> auto_updated_file &&
+			git commit -am "commit change $N.2" &&
+		echo c >> auto_updated_file &&
+			git commit -am "commit change $N.3" &&
+		test_must_fail git svn dcommit && # rebase should fail
+		test_must_fail git update-index --refresh
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = 0f8e0994a21586bd0e4c9229c4964eafab01a447 (refs/remotes/git-svn)
+	M	file
+r2 = 3bd14845d23b58d1c00e9e89da44d09cc5523264 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = f490af6eb47961d52dc24dd423e94c5f1d624695 (refs/remotes/git-svn)
+	M	file
+r4 = 72fd49639aa5539e3030dbc2e16c2458b564d111 (refs/remotes/git-svn)
+	M	file
+r5 = bf470340285556f870d430233c75fb4ea7cd6e35 (refs/remotes/git-svn)
+	M	file
+r6 = b686f1bc506baf8eb55f46e18640901da5b7ddb3 (refs/remotes/git-svn)
+	M	file
+r7 = a60e597ddcbe658da37ff6b8c6302e6e17492d86 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = e6f88d00616d43389cc5ba42ccacd9171da3e87e (refs/remotes/git-svn)
+	M	file
+r9 = e250a382be7fddd7cdd8db90b212c206513c3e88 (refs/remotes/git-svn)
+	M	auto_updated_file
+r10 = df86f4a09502f500a3da624fb4e1b24e1e782229 (refs/remotes/git-svn)
+	M	auto_updated_file
+r11 = b9aa90fc95f46f81dce38daafbfb9b6dbd1848d0 (refs/remotes/git-svn)
+	M	auto_updated_file
+r12 = 3c86c1b0f7b19c8e7a967b21c2315dc5801350a0 (refs/remotes/git-svn)
+	M	auto_updated_file
+r13 = 3caeb992ee46daab7ba84e31f715f0373fee068a (refs/remotes/git-svn)
+	M	auto_updated_file
+r14 = 5baec42330e06e78b923da46f61f16c65d05d083 (refs/remotes/git-svn)
+	M	auto_updated_file
+r15 = c4033abe853204cd9d6a967bd93e7bbbf21f683f (refs/remotes/git-svn)
+	M	auto_updated_file
+r16 = 82aee01362ccea0f153651ec6721c54f2ce63e7f (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
+[master 6150c63] commit change 5.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 8cab220] commit change 5.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 79478f2] commit change 5.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.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	file
+Committed r17
+	M	file
+r17 = 1f56fe64029b23e0da5f45c6e7d634035ddc4cb4 (refs/remotes/git-svn)
+	M	auto_updated_file
+r18 = 4a1bd325b79926233318437d774f3067a2394967 (refs/remotes/git-svn)
+W: 6150c63b51d9a30be9fa1eaa5f12eac6ed9dc06d and refs/remotes/git-svn differ, using rebase:
+:100644 100644 a715b1cccc7f904ffa8ffabafb7a0e0329eccddc 8d0ac84b7b87c666cce3277a8c77a46bff0a5804 M	auto_updated_file
+warning: skipped previously applied commit 6150c63
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Auto-merging auto_updated_file
+CONFLICT (content): Merge conflict in auto_updated_file
+error: could not apply 8cab220... commit change 5.2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 8cab220... commit change 5.2
+rebase refs/remotes/git-svn: command returned error: 1
+
+auto_updated_file: needs merge
+ok 8 - dcommit fails on concurrent conflicting change
+
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9804-git-p4-label.sh ***
@@ -548599,6 +549135,14 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9502-gitweb-standalone-parse-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9502-gitweb-standalone-parse-output/.git/
 expecting success of 9502.1 'setup': 
@@ -548780,32 +549324,32 @@
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">19 years ago</td>
+<td><i>second user</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">19 years ago</td>
+<td><i>second user</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">19 years ago</td>
+<td><i>second user</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">19 years ago</td>
+<td><i>second user</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>
@@ -548862,32 +549406,32 @@
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">19 years ago</td>
+<td><i>second user</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">19 years ago</td>
+<td><i>second user</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">19 years ago</td>
+<td><i>second user</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">19 years ago</td>
+<td><i>second user</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>
@@ -548976,23 +549520,15 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9812-git-p4-wildcards.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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9813-git-p4-preserve-users.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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
@@ -549008,66 +549544,6 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9819-git-p4-case-folding.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9818-git-p4-block.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9820-git-p4-editor-handling.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9821-git-p4-path-variations.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9604-cvsimport-timestamps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9604-cvsimport-timestamps/.git/
 checking prerequisite: POSIX_TIMEZONE
@@ -549164,7 +549640,952 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9832-unshelve.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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9819-git-p4-case-folding.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9820-git-p4-editor-handling.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9821-git-p4-path-variations.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9602-cvsimport-branches-tags.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9602-cvsimport-branches-tags/.git/
+expecting success of 9602.1 'import module': 
+
+	git cvsimport -C module-git module
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
+ok 1 - import module
+
+expecting success of 9602.2 'test branch main': 
+
+	test_cmp_branch_tree main
+
+
+cvs checkout: Updating module-cvs-main
+U module-cvs-main/default
+cvs checkout: Updating module-cvs-main/sub1
+U module-cvs-main/sub1/default
+cvs checkout: Updating module-cvs-main/sub1/subsubA
+U module-cvs-main/sub1/subsubA/default
+cvs checkout: Updating module-cvs-main/sub1/subsubB
+U module-cvs-main/sub1/subsubB/default
+cvs checkout: Updating module-cvs-main/sub2
+U module-cvs-main/sub2/default
+cvs checkout: Updating module-cvs-main/sub2/subsubA
+U module-cvs-main/sub2/subsubA/default
+cvs checkout: Updating module-cvs-main/sub3
+U module-cvs-main/sub3/default
+Already on 'main'
+ok 2 - test branch main
+
+expecting success of 9602.3 'test branch vendorbranch': 
+
+	test_cmp_branch_tree vendorbranch
+
+
+cvs checkout: Updating module-cvs-vendorbranch
+U module-cvs-vendorbranch/default
+cvs checkout: Updating module-cvs-vendorbranch/sub1
+U module-cvs-vendorbranch/sub1/default
+cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubA
+U module-cvs-vendorbranch/sub1/subsubA/default
+cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubB
+U module-cvs-vendorbranch/sub1/subsubB/default
+cvs checkout: Updating module-cvs-vendorbranch/sub2
+U module-cvs-vendorbranch/sub2/default
+cvs checkout: Updating module-cvs-vendorbranch/sub2/subsubA
+U module-cvs-vendorbranch/sub2/subsubA/default
+cvs checkout: Updating module-cvs-vendorbranch/sub3
+U module-cvs-vendorbranch/sub3/default
+Switched to branch 'vendorbranch'
+ok 3 - test branch vendorbranch
+
+checking known breakage of 9602.4 'test branch B_FROM_INITIALS': 
+
+	test_cmp_branch_tree B_FROM_INITIALS
+
+
+cvs checkout: Updating module-cvs-B_FROM_INITIALS
+U module-cvs-B_FROM_INITIALS/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1
+U module-cvs-B_FROM_INITIALS/sub1/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubA
+U module-cvs-B_FROM_INITIALS/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubB
+U module-cvs-B_FROM_INITIALS/sub1/subsubB/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2
+U module-cvs-B_FROM_INITIALS/sub2/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2/subsubA
+U module-cvs-B_FROM_INITIALS/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub3
+U module-cvs-B_FROM_INITIALS/sub3/default
+error: pathspec 'B_FROM_INITIALS' did not match any file(s) known to git
+not ok 4 - test branch B_FROM_INITIALS # TODO known breakage
+
+checking known breakage of 9602.5 'test branch B_FROM_INITIALS_BUT_ONE': 
+
+	test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
+
+
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE
+U module-cvs-B_FROM_INITIALS_BUT_ONE/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubB
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub3
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub3/default
+error: pathspec 'B_FROM_INITIALS_BUT_ONE' did not match any file(s) known to git
+not ok 5 - test branch B_FROM_INITIALS_BUT_ONE # TODO known breakage
+
+checking known breakage of 9602.6 'test branch B_MIXED': 
+
+	test_cmp_branch_tree B_MIXED
+
+
+cvs checkout: Updating module-cvs-B_MIXED
+U module-cvs-B_MIXED/default
+cvs checkout: Updating module-cvs-B_MIXED/sub1
+U module-cvs-B_MIXED/sub1/default
+cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubA
+U module-cvs-B_MIXED/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubB
+U module-cvs-B_MIXED/sub1/subsubB/default
+cvs checkout: Updating module-cvs-B_MIXED/sub2
+U module-cvs-B_MIXED/sub2/branch_B_MIXED_only
+U module-cvs-B_MIXED/sub2/default
+cvs checkout: Updating module-cvs-B_MIXED/sub2/subsubA
+U module-cvs-B_MIXED/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_MIXED/sub3
+U module-cvs-B_MIXED/sub3/default
+Switched to branch 'B_MIXED'
+--- module-cvs-B_MIXED/./sub3/default	2003-05-23 00:15:26.000000000 +0000
++++ module-git/./sub3/default	2026-03-14 13:39:45.054677808 +0000
+@@ -3,3 +3,5 @@
+ Every directory in the `proj' project has a file named `default'.
+ 
+ This line was added by the first commit (affecting two files).
++
++This line was added in the second commit (affecting all 7 files).
+not ok 6 - test branch B_MIXED # TODO known breakage
+
+expecting success of 9602.7 'test branch B_SPLIT': 
+
+	test_cmp_branch_tree B_SPLIT
+
+
+cvs checkout: Updating module-cvs-B_SPLIT
+U module-cvs-B_SPLIT/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub1
+U module-cvs-B_SPLIT/sub1/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubA
+U module-cvs-B_SPLIT/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubB
+U module-cvs-B_SPLIT/sub1/subsubB/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub2
+U module-cvs-B_SPLIT/sub2/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub2/subsubA
+U module-cvs-B_SPLIT/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub3
+U module-cvs-B_SPLIT/sub3/default
+Switched to branch 'B_SPLIT'
+ok 7 - test branch B_SPLIT
+
+checking known breakage of 9602.8 'test tag vendortag': 
+
+	test_cmp_branch_tree vendortag
+
+
+cvs checkout: Updating module-cvs-vendortag
+U module-cvs-vendortag/default
+cvs checkout: Updating module-cvs-vendortag/sub1
+U module-cvs-vendortag/sub1/default
+cvs checkout: Updating module-cvs-vendortag/sub1/subsubA
+U module-cvs-vendortag/sub1/subsubA/default
+cvs checkout: Updating module-cvs-vendortag/sub1/subsubB
+U module-cvs-vendortag/sub1/subsubB/default
+cvs checkout: Updating module-cvs-vendortag/sub2
+U module-cvs-vendortag/sub2/default
+cvs checkout: Updating module-cvs-vendortag/sub2/subsubA
+U module-cvs-vendortag/sub2/subsubA/default
+cvs checkout: Updating module-cvs-vendortag/sub3
+U module-cvs-vendortag/sub3/default
+error: pathspec 'vendortag' did not match any file(s) known to git
+not ok 8 - test tag vendortag # TODO known breakage
+
+expecting success of 9602.9 'test tag T_ALL_INITIAL_FILES': 
+
+	test_cmp_branch_tree T_ALL_INITIAL_FILES
+
+
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES
+U module-cvs-T_ALL_INITIAL_FILES/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1
+U module-cvs-T_ALL_INITIAL_FILES/sub1/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA
+U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB
+U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2
+U module-cvs-T_ALL_INITIAL_FILES/sub2/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA
+U module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub3
+U module-cvs-T_ALL_INITIAL_FILES/sub3/default
+Note: switching to 'T_ALL_INITIAL_FILES'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at e9bb65d Initial import.
+ok 9 - test tag T_ALL_INITIAL_FILES
+
+checking known breakage of 9602.10 'test tag T_ALL_INITIAL_FILES_BUT_ONE': 
+
+	test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
+
+
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubB
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3/default
+error: pathspec 'T_ALL_INITIAL_FILES_BUT_ONE' did not match any file(s) known to git
+not ok 10 - test tag T_ALL_INITIAL_FILES_BUT_ONE # TODO known breakage
+
+checking known breakage of 9602.11 'test tag T_MIXED': 
+
+	test_cmp_branch_tree T_MIXED
+
+
+cvs checkout: Updating module-cvs-T_MIXED
+U module-cvs-T_MIXED/default
+cvs checkout: Updating module-cvs-T_MIXED/sub1
+U module-cvs-T_MIXED/sub1/default
+cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubA
+U module-cvs-T_MIXED/sub1/subsubA/default
+cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubB
+U module-cvs-T_MIXED/sub1/subsubB/default
+cvs checkout: Updating module-cvs-T_MIXED/sub2
+U module-cvs-T_MIXED/sub2/default
+cvs checkout: Updating module-cvs-T_MIXED/sub2/subsubA
+U module-cvs-T_MIXED/sub2/subsubA/default
+cvs checkout: Updating module-cvs-T_MIXED/sub3
+U module-cvs-T_MIXED/sub3/default
+Previous HEAD position was e9bb65d Initial import.
+HEAD is now at d875d54 Second commit to proj, affecting all 7 files.
+--- module-cvs-T_MIXED/./sub2/subsubA/default	2003-05-22 23:20:19.000000000 +0000
++++ module-git/./sub2/subsubA/default	2026-03-14 13:39:50.042677808 +0000
+@@ -1,3 +1,5 @@
+ This is sub2/subsub2/default.
+ 
+ Every directory in the `proj' project has a file named `default'.
++
++This line was added in the second commit (affecting all 7 files).
+not ok 11 - test tag T_MIXED # TODO known breakage
+
+# still have 6 known breakage(s)
+# passed all remaining 5 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9400-git-cvsserver-server.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9400-git-cvsserver-server/.git/
+expecting success of 9400.1 'setup': 
+  git config push.default matching &&
+  echo >empty &&
+  git add empty &&
+  git commit -q -m "First Commit" &&
+  mkdir secondroot &&
+  ( cd secondroot &&
+  git init &&
+  touch secondrootfile &&
+  git add secondrootfile &&
+  git commit -m "second root") &&
+  git fetch secondroot main &&
+  git merge --allow-unrelated-histories FETCH_HEAD &&
+  git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
+  GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
+  GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
+  GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
+  echo "cvsuser:$PWDHASH" >"$SERVERDIR/auth.db"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9400-git-cvsserver-server/secondroot/.git/
+[main (root-commit) 0fe3a5e] second root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 secondrootfile
+From secondroot
+ * branch            main       -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ secondrootfile | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 secondrootfile
+ok 1 - setup
+
+expecting success of 9400.2 'basic checkout': 
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork main &&
+	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
+	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"
+
+U cvswork/empty
+U cvswork/secondrootfile
+ok 2 - basic checkout
+
+expecting success of 9400.3 'pserver authentication': 
+	git-cvsserver pserver <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 3 - pserver authentication
+
+expecting success of 9400.4 'pserver authentication failure (non-anonymous user)': 
+	if git-cvsserver pserver <request-git >log 2>&1
+	then
+	    false
+	else
+	    true
+	fi &&
+	sed -ne \$p log | grep "^I HATE YOU\$"
+
+I HATE YOU
+ok 4 - pserver authentication failure (non-anonymous user)
+
+expecting success of 9400.5 'pserver authentication success (non-anonymous user with password)': 
+	git-cvsserver pserver <login-git-ok >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 5 - pserver authentication success (non-anonymous user with password)
+
+expecting success of 9400.6 'pserver authentication (login)': 
+	git-cvsserver pserver <login-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 6 - pserver authentication (login)
+
+expecting success of 9400.7 'pserver authentication failure (login/non-anonymous user)': 
+	if git-cvsserver pserver <login-git >log 2>&1
+	then
+	    false
+	else
+	    true
+	fi &&
+	sed -ne \$p log | grep "^I HATE YOU\$"
+
+I HATE YOU
+ok 7 - pserver authentication failure (login/non-anonymous user)
+
+expecting success of 9400.8 'req_Root failure (relative pathname)': 
+	if git-cvsserver pserver <request-relative >log 2>&1
+	then
+		echo unexpected success
+		false
+	else
+		true
+	fi &&
+	tail log | grep "^error 1 Root must be an absolute pathname$"
+
+error 1 Root must be an absolute pathname
+ok 8 - req_Root failure (relative pathname)
+
+expecting success of 9400.9 'req_Root failure (conflicting roots)': 
+	git-cvsserver pserver <request-conflict >log 2>&1 &&
+	tail log | grep "^error 1 Conflicting roots specified$"
+
+error 1 Conflicting roots specified
+ok 9 - req_Root failure (conflicting roots)
+
+expecting success of 9400.10 'req_Root (strict paths)': 
+	git-cvsserver --strict-paths pserver "$SERVERDIR" <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 10 - req_Root (strict paths)
+
+expecting success of 9400.11 'req_Root failure (strict-paths)': 
+	! git-cvsserver --strict-paths pserver "$WORKDIR" <request-anonymous >log 2>&1
+
+ok 11 - req_Root failure (strict-paths)
+
+expecting success of 9400.12 'req_Root (w/o strict-paths)': 
+	git-cvsserver pserver "$WORKDIR/" <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 12 - req_Root (w/o strict-paths)
+
+expecting success of 9400.13 'req_Root failure (w/o strict-paths)': 
+	! git-cvsserver pserver "$WORKDIR/gitcvs" <request-anonymous >log 2>&1
+
+ok 13 - req_Root failure (w/o strict-paths)
+
+expecting success of 9400.14 'req_Root (base-path)': 
+	git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 14 - req_Root (base-path)
+
+expecting success of 9400.15 'req_Root failure (base-path)': 
+	! git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" <request-anonymous >log 2>&1
+
+ok 15 - req_Root failure (base-path)
+
+expecting success of 9400.16 'req_Root (export-all)': 
+	git-cvsserver --export-all pserver "$WORKDIR" <request-anonymous >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 16 - req_Root (export-all)
+
+expecting success of 9400.17 'req_Root failure (export-all w/o directory list)': 
+	! (git-cvsserver --export-all pserver <request-anonymous >log 2>&1 || false)
+ok 17 - req_Root failure (export-all w/o directory list)
+
+expecting success of 9400.18 'req_Root (everything together)': 
+	git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
+	sed -ne \$p log | grep "^I LOVE YOU\$"
+
+I LOVE YOU
+ok 18 - req_Root (everything together)
+
+expecting success of 9400.19 'gitcvs.enabled = false': GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
+   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
+   then
+     echo unexpected cvs success
+     false
+   else
+     true
+   fi &&
+   grep "GITCVS emulation disabled" cvs.log &&
+   test ! -d cvswork2
+GITCVS emulation disabled
+ok 19 - gitcvs.enabled = false
+
+expecting success of 9400.20 'gitcvs.ext.enabled = true': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+	test_cmp cvswork cvswork2
+
+Common subdirectories: cvswork/CVS and cvswork2/CVS
+ok 20 - gitcvs.ext.enabled = true
+
+expecting success of 9400.21 'gitcvs.ext.enabled = false': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
+	if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
+	then
+		echo unexpected cvs success
+		false
+	else
+		true
+	fi &&
+	grep "GITCVS emulation disabled" cvs.log &&
+	test ! -d cvswork2
+
+GITCVS emulation disabled
+ok 21 - gitcvs.ext.enabled = false
+
+expecting success of 9400.22 'gitcvs.dbname': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+	test_cmp cvswork cvswork2 &&
+	test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
+	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"
+
+Common subdirectories: cvswork/CVS and cvswork2/CVS
+ok 22 - gitcvs.dbname
+
+expecting success of 9400.23 'gitcvs.ext.dbname': 
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
+	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+	test_cmp cvswork cvswork2 &&
+	test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
+	test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
+	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"
+
+Common subdirectories: cvswork/CVS and cvswork2/CVS
+ok 23 - gitcvs.ext.dbname
+
+expecting success of 9400.24 'cvs update (create new file)': 
+	echo testfile1 >testfile1 &&
+	git add testfile1 &&
+	git commit -q -m "Add testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
+	test_cmp testfile1 ../testfile1
+
+To gitcvs.git
+   4ea9390..3c6a419  main -> main
+U testfile1
+ok 24 - cvs update (create new file)
+
+expecting success of 9400.25 'cvs update (update existing file)': 
+	echo line 2 >>testfile1 &&
+	git add testfile1 &&
+	git commit -q -m "Append to testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
+	test_cmp testfile1 ../testfile1
+
+To gitcvs.git
+   3c6a419..696e081  main -> main
+U testfile1
+ok 25 - cvs update (update existing file)
+
+checking known breakage of 9400.26 'cvs update w/o -d doesn't create subdir (TODO)': 
+	mkdir test &&
+	echo >test/empty &&
+	git add test &&
+	git commit -q -m "Single Subdirectory" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test ! -d test
+
+To gitcvs.git
+   696e081..33879bd  main -> main
+U test/empty
+not ok 26 - cvs update w/o -d doesn't create subdir (TODO) # TODO known breakage
+
+expecting success of 9400.27 'cvs update (subdirectories)': 
+	(for dir in A A/B A/B/C A/D E; do
+		mkdir $dir &&
+		echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")"  &&
+		git add $dir || exit 1
+	done) &&
+	git commit -q -m "deep sub directory structure" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update -d &&
+	(for dir in A A/B A/B/C A/D E; do
+		filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
+		if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
+			test_cmp "$dir/$filename" "../$dir/$filename"; then
+		:
+		else
+			exit 1
+		fi
+	done)
+
+To gitcvs.git
+   33879bd..9436d83  main -> main
+U A/file_in_A
+U E/file_in_E
+U A/B/file_in_A B
+U A/D/file_in_A D
+U A/B/C/file_in_A B C
+ok 27 - cvs update (subdirectories)
+
+expecting success of 9400.28 'cvs update (delete file)': 
+	git rm testfile1 &&
+	git commit -q -m "Remove testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test -z "$(grep testfile1 CVS/Entries)" &&
+	test ! -f testfile1
+
+rm 'testfile1'
+To gitcvs.git
+   9436d83..09366c6  main -> main
+cvs update: `testfile1' is no longer in the repository
+ok 28 - cvs update (delete file)
+
+expecting success of 9400.29 'cvs update (re-add deleted file)': 
+	echo readded testfile >testfile1 &&
+	git add testfile1 &&
+	git commit -q -m "Re-Add testfile1" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
+	test_cmp testfile1 ../testfile1
+
+To gitcvs.git
+   09366c6..8ea0549  main -> main
+U testfile1
+ok 29 - cvs update (re-add deleted file)
+
+expecting success of 9400.30 'cvs update (merge)': 
+	echo Line 0 >expected &&
+	for i in 1 2 3 4 5 6 7
+	do
+		echo Line $i >>merge &&
+		echo Line $i >>expected || return 1
+	done &&
+	echo Line 8 >>expected &&
+	git add merge &&
+	git commit -q -m "Merge test (pre-merge)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
+	test_cmp merge ../merge &&
+	( echo Line 0 && cat merge ) >merge.tmp &&
+	mv merge.tmp merge &&
+	cd "$WORKDIR" &&
+	echo Line 8 >>merge &&
+	git add merge &&
+	git commit -q -m "Merge test (merge)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	sleep 1 && touch merge &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test_cmp merge ../expected
+
+To gitcvs.git
+   8ea0549..f31ee25  main -> main
+U merge
+To gitcvs.git
+   f31ee25..792463d  main -> main
+Merging differences between 1.1 and 1.2 into merge
+M merge
+ok 30 - cvs update (merge)
+
+expecting success of 9400.31 'cvs update (conflict merge)': 
+	( echo LINE 0 && cat merge ) >merge.tmp &&
+	mv merge.tmp merge &&
+	git add merge &&
+	git commit -q -m "Merge test (conflict)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test_cmp merge ../expected.C
+
+To gitcvs.git
+   792463d..ba02484  main -> main
+Merging differences between 1.2 and 1.3 into merge
+cvs update: conflicts found in merge
+C merge
+ok 31 - cvs update (conflict merge)
+
+expecting success of 9400.32 'cvs update (-C)': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs -Q update -C &&
+	test_cmp merge ../merge
+
+U empty
+U merge
+U secondrootfile
+U testfile1
+U A/file_in_A
+U E/file_in_E
+U test/empty
+U A/B/file_in_A B
+U A/D/file_in_A D
+U A/B/C/file_in_A B C
+ok 32 - cvs update (-C)
+
+expecting success of 9400.33 'cvs update (merge no-op)': 
+	echo Line 9 >>merge &&
+	cp merge cvswork/merge &&
+	git add merge &&
+	git commit -q -m "Merge test (no-op)" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	sleep 1 && touch merge &&
+	GIT_CONFIG="$git_config" cvs -Q update &&
+	test_cmp merge ../merge
+
+To gitcvs.git
+   ba02484..2f86a26  main -> main
+Merging differences between 1.3 and 1.4 into merge
+M merge
+ok 33 - cvs update (merge no-op)
+
+expecting success of 9400.34 'cvs update (-p)': 
+	touch really-empty &&
+	echo Line 1 > no-lf &&
+	printf "Line 2" >> no-lf &&
+	git add really-empty no-lf &&
+	git commit -q -m "Update -p test" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs update &&
+	for i in merge no-lf empty really-empty; do
+		GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
+		test_cmp $i.out ../$i || return 1
+	done
+
+To gitcvs.git
+   2f86a26..9cef819  main -> main
+cvs update: Updating .
+M merge
+U no-lf
+U really-empty
+cvs update: Updating A
+cvs update: Updating E
+cvs update: Updating test
+cvs update: Updating A/B
+cvs update: Updating A/D
+cvs update: Updating A/B/C
+ok 34 - cvs update (-p)
+
+expecting success of 9400.35 'cvs update (module list supports packed refs)': 
+	GIT_DIR="$SERVERDIR" git pack-refs --all &&
+	GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
+	grep "cvs update: New directory \`main'" < out
+
+cvs update: New directory `main'
+ok 35 - cvs update (module list supports packed refs)
+
+expecting success of 9400.36 'cvs status': 
+	mkdir status.dir &&
+	echo Line > status.dir/status.file &&
+	echo Line > status.file &&
+	git add status.dir status.file &&
+	git commit -q -m "Status test" &&
+	git push gitcvs.git >/dev/null &&
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs update &&
+	GIT_CONFIG="$git_config" cvs status | grep "^File: status.file" >../out &&
+	test_line_count = 2 ../out
+
+To gitcvs.git
+   9cef819..590c22f  main -> main
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
+cvs update: Updating .
+cvs update: `empty.out' is no longer in the repository
+M merge
+cvs update: `merge.out' is no longer in the repository
+cvs update: `no-lf.out' is no longer in the repository
+cvs update: `really-empty.out' is no longer in the repository
+U status.file
+cvs update: Updating A
+cvs update: Updating E
+cvs update: Updating status.dir
+U status.dir/status.file
+cvs update: Updating test
+cvs update: Updating A/B
+cvs update: Updating A/D
+cvs update: Updating A/B/C
+ok 36 - cvs status
+
+expecting success of 9400.37 'cvs status (nonrecursive)': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs status -l | grep "^File: status.file" >../out &&
+	test_line_count = 1 ../out
+
+ok 37 - cvs status (nonrecursive)
+
+expecting success of 9400.38 'cvs status (no subdirs in header)': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs status | grep ^File: >../out &&
+	! grep / <../out
+
+ok 38 - cvs status (no subdirs in header)
+
+expecting success of 9400.39 'cvs co -c (shows module database)': 
+	GIT_CONFIG="$git_config" cvs co -c > out &&
+	grep "^main[	 ][ 	]*main$" <out &&
+	! grep -v "^main[	 ][ 	]*main$" <out
+
+main	main
+ok 39 - cvs co -c (shows module database)
+
+expecting success of 9400.40 'cvs log': 
+	cd cvswork &&
+	test x"$expectStat" = x"0" &&
+	GIT_CONFIG="$git_config" cvs log merge >../out &&
+sed -e "s%2[0-9][0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]%__DATE__%" ../out > ../actual &&
+	test_cmp ../expect ../actual
+
+ok 40 - cvs log
+
+expecting success of 9400.41 'cvs annotate': 
+	cd cvswork &&
+	GIT_CONFIG="$git_config" cvs annotate merge >../out &&
+	sed -e "s/ .*//" ../out >../actual &&
+	printf "1.%d\n" 3 1 1 1 1 1 1 1 2 4 >../expect &&
+	test_cmp ../expect ../actual
+
+Annotations for merge
+***************
+ok 41 - cvs annotate
+
+expecting success of 9400.42 'create remote-cvs helper': 
+	write_script remote-cvs <<-\EOF
+	exec git shell -c "cvs server"
+	EOF
+
+ok 42 - create remote-cvs helper
+
+expecting success of 9400.43 'cvs server does not run with vanilla git-shell': 
+	(
+		cd cvswork &&
+		CVS_SERVER=$WORKDIR/remote-cvs &&
+		export CVS_SERVER &&
+		! cvs log merge
+	)
+
+fatal: unrecognized command 'cvs server'
+cvs [log aborted]: end of file from server (consult above messages if any)
+ok 43 - cvs server does not run with vanilla git-shell
+
+expecting success of 9400.44 'configure git shell to run cvs server': 
+	mkdir "$HOME"/git-shell-commands &&
+
+	write_script "$HOME"/git-shell-commands/cvs <<-\EOF &&
+	if ! test $# = 1 && test "$1" = "server"
+	then
+		echo >&2 "git-cvsserver only handles \"server\""
+		exit 1
+	fi
+	exec git cvsserver server
+	EOF
+
+	# Should not be used, but part of the recommended setup
+	write_script "$HOME"/git-shell-commands/no-interactive-login <<-\EOF
+	echo Interactive login forbidden
+	EOF
+
+ok 44 - configure git shell to run cvs server
+
+expecting success of 9400.45 'cvs server can run with recommended config': 
+	(
+		cd cvswork &&
+		CVS_SERVER=$WORKDIR/remote-cvs &&
+		export CVS_SERVER &&
+		cvs log merge
+	)
+
+
+RCS file: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9400-git-cvsserver-server/gitcvs.git/main/merge,v
+Working file: merge
+head: 1.4
+branch:
+locks: strict
+access list:
+symbolic names:
+keyword substitution: kv
+total revisions: 4;	selected revisions: 4
+description:
+----------------------------
+revision 1.4
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+
+Merge test (no-op)
+ 
+----------------------------
+revision 1.3
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+
+Merge test (conflict)
+ 
+----------------------------
+revision 1.2
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+
+Merge test (merge)
+ 
+----------------------------
+revision 1.1
+date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+
+Merge test (pre-merge)
+ 
+=============================================================================
+ok 45 - cvs server can run with recommended config
+
+# still have 1 known breakage(s)
+# passed all remaining 44 test(s)
+1..45
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
@@ -549172,6 +550593,10 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9832-unshelve.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/t'
@@ -549231,6 +550656,355 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9401-git-cvsserver-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9401-git-cvsserver-crlf/.git/
+expecting success of 9401.1 'setup': 
+    git config push.default matching &&
+    echo "Simple text file" >textfile.c &&
+    echo "File with embedded NUL: Q <- there" | q_to_nul > binfile.bin &&
+    mkdir subdir &&
+    echo "Another text file" > subdir/file.h &&
+    echo "Another binary: Q (this time CR)" | q_to_cr > subdir/withCr.bin &&
+    echo "Mixed up NUL, but marked text: Q <- there" | q_to_nul > mixedUp.c &&
+    echo "Unspecified" > subdir/unspecified.other &&
+    echo "/*.bin -crlf" > .gitattributes &&
+    echo "/*.c crlf" >> .gitattributes &&
+    echo "subdir/*.bin -crlf" >> .gitattributes &&
+    echo "subdir/*.c crlf" >> .gitattributes &&
+    echo "subdir/file.h crlf" >> .gitattributes &&
+    git add .gitattributes textfile.c binfile.bin mixedUp.c subdir/* &&
+    git commit -q -m "First Commit" &&
+    git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
+    GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
+
+ok 1 - setup
+
+expecting success of 9401.2 'cvs co (default crlf)': 
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    test x"$(grep /-k cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
+
+ok 2 - cvs co (default crlf)
+
+expecting success of 9401.3 'cvs co (allbinary)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c -kb &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes -kb &&
+    marked_as cvswork mixedUp.c -kb &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h -kb &&
+    marked_as cvswork/subdir unspecified.other -kb
+
+ok 3 - cvs co (allbinary)
+
+expecting success of 9401.4 'cvs co (use attributes/allbinary)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes -kb &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other -kb
+
+ok 4 - cvs co (use attributes/allbinary)
+
+expecting success of 9401.5 'cvs co (use attributes)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other ""
+
+ok 5 - cvs co (use attributes)
+
+expecting success of 9401.6 'adding files': 
+    (cd cvswork &&
+    (cd subdir &&
+    echo "more text" > src.c &&
+    GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
+    marked_as . src.c "" &&
+    echo "pseudo-binary" > temp.bin
+    ) &&
+    GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
+    marked_as subdir temp.bin "-kb" &&
+    cd subdir &&
+    GIT_CONFIG="$git_config" cvs -Q ci -m "adding files" >cvs.log 2>&1 &&
+    marked_as . temp.bin "-kb" &&
+    marked_as . src.c ""
+    )
+
+ok 6 - adding files
+
+expecting success of 9401.7 'updating': 
+    git pull gitcvs.git &&
+    echo "hi" >subdir/newfile.bin &&
+    echo "junk" >subdir/file.h &&
+    echo "hi" >subdir/newfile.c &&
+    echo "hello" >>binfile.bin &&
+    git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin &&
+    git commit -q -m "Add and change some files" &&
+    git push gitcvs.git >/dev/null &&
+    (cd cvswork &&
+    GIT_CONFIG="$git_config" cvs -Q update
+    ) &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin -kb &&
+    marked_as cvswork/subdir newfile.c "" &&
+    echo "File with embedded NUL: Q <- there" | q_to_nul > tmpExpect1 &&
+    echo "hello" >> tmpExpect1 &&
+    cmp cvswork/binfile.bin tmpExpect1
+
+From gitcvs
+ * branch            HEAD       -> FETCH_HEAD
+Updating 9796767..6d431cd
+Fast-forward
+ subdir/src.c    | 1 +
+ subdir/temp.bin | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 subdir/src.c
+ create mode 100644 subdir/temp.bin
+To gitcvs.git
+   6d431cd..faca8d4  main -> main
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
+U binfile.bin
+cvs update: `cvs.log' is no longer in the repository
+cvs update: `subdir/cvs.log' is no longer in the repository
+U subdir/file.h
+U subdir/newfile.bin
+U subdir/newfile.c
+ok 7 - updating
+
+expecting success of 9401.8 'cvs co (use attributes/guess)': 
+    GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin -kb &&
+    marked_as cvswork/subdir newfile.c ""
+
+ok 8 - cvs co (use attributes/guess)
+
+expecting success of 9401.9 'setup multi-line files': 
+    ( echo "line 1" &&
+      echo "line 2" &&
+      echo "line 3" &&
+      echo "line 4 with NUL: Q <-" ) | q_to_nul > multiline.c &&
+    git add multiline.c &&
+    ( echo "line 1" &&
+      echo "line 2" &&
+      echo "line 3" &&
+      echo "line 4" ) | q_to_nul > multilineTxt.c &&
+    git add multilineTxt.c &&
+    git commit -q -m "multiline files" &&
+    git push gitcvs.git >/dev/null
+
+To gitcvs.git
+   faca8d4..509c7f1  main -> main
+ok 9 - setup multi-line files
+
+expecting success of 9401.10 'cvs co (guess)': 
+    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c -kb &&
+    marked_as cvswork multiline.c -kb &&
+    marked_as cvswork multilineTxt.c "" &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h "" &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin "" &&
+    marked_as cvswork/subdir newfile.c ""
+
+ok 10 - cvs co (guess)
+
+expecting success of 9401.11 'cvs co another copy (guess)': 
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
+    marked_as cvswork2 textfile.c "" &&
+    marked_as cvswork2 binfile.bin -kb &&
+    marked_as cvswork2 .gitattributes "" &&
+    marked_as cvswork2 mixedUp.c -kb &&
+    marked_as cvswork2 multiline.c -kb &&
+    marked_as cvswork2 multilineTxt.c "" &&
+    marked_as cvswork2/subdir withCr.bin -kb &&
+    marked_as cvswork2/subdir file.h "" &&
+    marked_as cvswork2/subdir unspecified.other "" &&
+    marked_as cvswork2/subdir newfile.bin "" &&
+    marked_as cvswork2/subdir newfile.c ""
+
+ok 11 - cvs co another copy (guess)
+
+expecting success of 9401.12 'cvs status - sticky options': 
+    check_status_options cvswork2 textfile.c "" &&
+    check_status_options cvswork2 binfile.bin -kb &&
+    check_status_options cvswork2 .gitattributes "" &&
+    check_status_options cvswork2 mixedUp.c -kb &&
+    check_status_options cvswork2 multiline.c -kb &&
+    check_status_options cvswork2 multilineTxt.c "" &&
+    check_status_options cvswork2/subdir withCr.bin -kb &&
+    check_status_options cvswork2 subdir/withCr.bin -kb &&
+    check_status_options cvswork2/subdir file.h "" &&
+    check_status_options cvswork2 subdir/file.h "" &&
+    check_status_options cvswork2/subdir unspecified.other "" &&
+    check_status_options cvswork2/subdir newfile.bin "" &&
+    check_status_options cvswork2/subdir newfile.c ""
+
+ok 12 - cvs status - sticky options
+
+expecting success of 9401.13 'add text (guess)': 
+    (cd cvswork &&
+    echo "simpleText" > simpleText.c &&
+    GIT_CONFIG="$git_config" cvs -Q add simpleText.c
+    ) &&
+    marked_as cvswork simpleText.c ""
+
+cvs add: scheduling file `simpleText.c' for addition
+cvs add: use `cvs commit' to add this file permanently
+ok 13 - add text (guess)
+
+expecting success of 9401.14 'add bin (guess)': 
+    (cd cvswork &&
+    echo "simpleBin: NUL: Q <- there" | q_to_nul > simpleBin.bin &&
+    GIT_CONFIG="$git_config" cvs -Q add simpleBin.bin
+    ) &&
+    marked_as cvswork simpleBin.bin -kb
+
+cvs add: scheduling file `simpleBin.bin' for addition
+cvs add: use `cvs commit' to add this file permanently
+ok 14 - add bin (guess)
+
+expecting success of 9401.15 'remove files (guess)': 
+    (cd cvswork &&
+    GIT_CONFIG="$git_config" cvs -Q rm -f subdir/file.h &&
+    (cd subdir &&
+    GIT_CONFIG="$git_config" cvs -Q rm -f withCr.bin
+    )) &&
+    marked_as cvswork/subdir withCr.bin -kb &&
+    marked_as cvswork/subdir file.h ""
+
+cvs remove: scheduling `subdir/file.h' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+cvs remove: scheduling `subdir/withCr.bin' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+ok 15 - remove files (guess)
+
+expecting success of 9401.16 'cvs ci (guess)': 
+    (cd cvswork &&
+    GIT_CONFIG="$git_config" cvs -Q ci -m "add/rm files" >cvs.log 2>&1
+    ) &&
+    marked_as cvswork textfile.c "" &&
+    marked_as cvswork binfile.bin -kb &&
+    marked_as cvswork .gitattributes "" &&
+    marked_as cvswork mixedUp.c -kb &&
+    marked_as cvswork multiline.c -kb &&
+    marked_as cvswork multilineTxt.c "" &&
+    not_present cvswork/subdir withCr.bin &&
+    not_present cvswork/subdir file.h &&
+    marked_as cvswork/subdir unspecified.other "" &&
+    marked_as cvswork/subdir newfile.bin "" &&
+    marked_as cvswork/subdir newfile.c "" &&
+    marked_as cvswork simpleBin.bin -kb &&
+    marked_as cvswork simpleText.c ""
+
+ok 16 - cvs ci (guess)
+
+expecting success of 9401.17 'update subdir of other copy (guess)': 
+    (cd cvswork2/subdir &&
+    GIT_CONFIG="$git_config" cvs -Q update
+    ) &&
+    marked_as cvswork2 textfile.c "" &&
+    marked_as cvswork2 binfile.bin -kb &&
+    marked_as cvswork2 .gitattributes "" &&
+    marked_as cvswork2 mixedUp.c -kb &&
+    marked_as cvswork2 multiline.c -kb &&
+    marked_as cvswork2 multilineTxt.c "" &&
+    not_present cvswork2/subdir withCr.bin &&
+    not_present cvswork2/subdir file.h &&
+    marked_as cvswork2/subdir unspecified.other "" &&
+    marked_as cvswork2/subdir newfile.bin "" &&
+    marked_as cvswork2/subdir newfile.c "" &&
+    not_present cvswork2 simpleBin.bin &&
+    not_present cvswork2 simpleText.c
+
+cvs update: `subdir/file.h' is no longer in the repository
+cvs update: `subdir/withCr.bin' is no longer in the repository
+ok 17 - update subdir of other copy (guess)
+
+expecting success of 9401.18 'update/merge full other copy (guess)': 
+    git pull gitcvs.git main &&
+    sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
+    mv ml.temp multilineTxt.c &&
+    git add multilineTxt.c &&
+    git commit -q -m "modify multiline file" >> "${WORKDIR}/marked.log" &&
+    git push gitcvs.git >/dev/null &&
+    (cd cvswork2 &&
+    sed "s/1/replaced_1/" < multilineTxt.c > ml.temp &&
+    mv ml.temp multilineTxt.c &&
+    GIT_CONFIG="$git_config" cvs update > cvs.log 2>&1
+    ) &&
+    marked_as cvswork2 textfile.c "" &&
+    marked_as cvswork2 binfile.bin -kb &&
+    marked_as cvswork2 .gitattributes "" &&
+    marked_as cvswork2 mixedUp.c -kb &&
+    marked_as cvswork2 multiline.c -kb &&
+    marked_as cvswork2 multilineTxt.c "" &&
+    not_present cvswork2/subdir withCr.bin &&
+    not_present cvswork2/subdir file.h &&
+    marked_as cvswork2/subdir unspecified.other "" &&
+    marked_as cvswork2/subdir newfile.bin "" &&
+    marked_as cvswork2/subdir newfile.c "" &&
+    marked_as cvswork2 simpleBin.bin -kb &&
+    marked_as cvswork2 simpleText.c "" &&
+    echo "line replaced_1" > tmpExpect2 &&
+    echo "line 2" >> tmpExpect2 &&
+    echo "line replaced_3" >> tmpExpect2 &&
+    echo "line 4" | q_to_nul >> tmpExpect2 &&
+    cmp cvswork2/multilineTxt.c tmpExpect2
+
+From gitcvs
+ * branch            main       -> FETCH_HEAD
+Updating 509c7f1..11562e1
+Fast-forward
+ simpleBin.bin     | Bin 0 -> 27 bytes
+ simpleText.c      |   1 +
+ subdir/file.h     |   1 -
+ subdir/withCr.bin |   1 -
+ 4 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 simpleBin.bin
+ create mode 100644 simpleText.c
+ delete mode 100644 subdir/file.h
+ delete mode 100644 subdir/withCr.bin
+To gitcvs.git
+   11562e1..e3c7165  main -> main
+ok 18 - update/merge full other copy (guess)
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9901-git-web--browse.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9901-git-web--browse/.git/
 expecting success of 9901.1 'URL with an ampersand in it': 
@@ -549283,681 +551057,522 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9164-git-svn-dcommit-concurrent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/.git/
-expecting success of 9164.1 'setup svn repository': 
-	svn_cmd checkout "$svnrepo" work.svn &&
-	(
-		cd work.svn &&
-		echo >file && echo > auto_updated_file &&
-		svn_cmd add file auto_updated_file &&
-		svn_cmd commit -m "initial commit"
-	) &&
-	svn_cmd checkout "$svnrepo" work-auto-commits.svn
+*** t9301-fast-import-notes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9301-fast-import-notes/.git/
+expecting success of 9301.1 'set up main branch': 
 
-Checked out revision 0.
-A         file
-A         auto_updated_file
-Adding         auto_updated_file
-Adding         file
-Transmitting file data ..done
-Committing transaction...
-Committed revision 1.
-A    work-auto-commits.svn/auto_updated_file
-A    work-auto-commits.svn/file
-Checked out revision 1.
-ok 1 - setup svn repository
+	git fast-import <input &&
+	git whatchanged main
 
-expecting success of 9164.2 'check if post-commit hook creates a concurrent commit': 
-	setup_hook post-commit 1 &&
-	(
-		cd work.svn &&
-		cp auto_updated_file au_file_saved &&
-		echo 1 >> file &&
-		svn_cmd commit -m "changing file" &&
-		svn_cmd up &&
-		! test_cmp auto_updated_file au_file_saved
-	)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           17 (         0 duplicates                  )
+      blobs  :            7 (         0 duplicates          0 deltas of          6 attempts)
+      trees  :            6 (         0 duplicates          3 deltas of          4 attempts)
+      commits:            4 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              4
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-U    auto_updated_file
-Updated to revision 3.
---- auto_updated_file	2025-02-09 06:55:56.906431488 +0000
-+++ au_file_saved	2025-02-09 06:55:56.794430775 +0000
-@@ -1,2 +1 @@
- 
--1996961
-ok 2 - check if post-commit hook creates a concurrent commit
+commit 9a93771a958bca801f51ff270bc677be08b70970
+Author: C O Mitter <committer@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 9164.3 'check if pre-commit hook fails': 
-	setup_hook pre-commit 2 &&
-	(
-		cd work.svn &&
-		echo 2 >> file &&
-		svn_cmd commit -m "changing file once again" &&
-		echo 3 >> file &&
-		! svn_cmd commit -m "this commit should fail" &&
-		svn_cmd revert file
-	)
+    fourth commit
 
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-svn: E165001: Commit failed (details follow):
-svn: E165001: Commit blocked by pre-commit hook (exit code 1) with no output.
-Reverted 'file'
-ok 3 - check if pre-commit hook fails
+:100755 100755 3c9b917 98d1b63 M	bar
 
-expecting success of 9164.4 'dcommit error handling': 
-	setup_hook pre-commit 2 &&
-	next_N && git svn clone "$svnrepo" work$N.git &&
-	(
-		cd work$N.git &&
-		echo 1 >> file && git commit -am "commit change $N.1" &&
-		echo 2 >> file && git commit -am "commit change $N.2" &&
-		echo 3 >> file && git commit -am "commit change $N.3" &&
-		# should fail to dcommit 2nd and 3rd change
-		# but still should leave the repository in reasonable state
-		test_must_fail git svn dcommit &&
-		git update-index --refresh &&
-		git show HEAD~2   | grep -q git-svn-id &&
-		! git show HEAD~1 | grep -q git-svn-id &&
-		! git show HEAD   | grep -q git-svn-id
-	)
+commit dbe3ab44992634d04709231cc00251483e46cff8
+Author: C O Mitter <committer@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 177e96bb6b808b052f1cc1f4b5bc99678914f562 (refs/remotes/git-svn)
-	M	file
-r2 = d760ffc48e2cd13e01d24d0f96c6b6b871e84e58 (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = a08501d2a942ebf7538af17c308b7d8779e5524f (refs/remotes/git-svn)
-	M	file
-r4 = 0c121a5fc8ad141abe22837ce5121d67daae6946 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
-[master f40d283] commit change 1.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 35342b3] commit change 1.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 870419c] commit change 1.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.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	file
-Committed r5
-	M	file
-r5 = 86399b531d59273a765c686a8cde699b841fb1c5 (refs/remotes/git-svn)
-	M	file
+    third commit
 
-ERROR from SVN:
-A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with no output.
-W: 870419c3c1afda8d7750996c13e7807d9ffc92ae and refs/remotes/git-svn differ, using rebase:
-:100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
-warning: skipped previously applied commit f40d283
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
-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.
+:100644 100644 215df20 634bd2b M	foo
 
-ok 4 - dcommit error handling
+commit bcc89d2db5d163929b6fbd169c2559b47a076acb
+Author: C O Mitter <committer@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 9164.5 'dcommit concurrent change in non-changed file': 
-	setup_hook post-commit 2 &&
-	next_N && git svn clone "$svnrepo" work$N.git &&
-	(
-		cd work$N.git &&
-		echo 1 >> file && git commit -am "commit change $N.1" &&
-		echo 2 >> file && git commit -am "commit change $N.2" &&
-		echo 3 >> file && git commit -am "commit change $N.3" &&
-		# should rebase and leave the repository in reasonable state
-		git svn dcommit &&
-		git update-index --refresh &&
-		check_contents &&
-		git show HEAD~3 | grep -q git-svn-id &&
-		git show HEAD~2 | grep -q git-svn-id &&
-		git show HEAD~1 | grep -q auto-committing &&
-		git show HEAD   | grep -q git-svn-id
-	)
+    second commit
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 177e96bb6b808b052f1cc1f4b5bc99678914f562 (refs/remotes/git-svn)
-	M	file
-r2 = d760ffc48e2cd13e01d24d0f96c6b6b871e84e58 (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = a08501d2a942ebf7538af17c308b7d8779e5524f (refs/remotes/git-svn)
-	M	file
-r4 = 0c121a5fc8ad141abe22837ce5121d67daae6946 (refs/remotes/git-svn)
-	M	file
-r5 = 86399b531d59273a765c686a8cde699b841fb1c5 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
-[master d834b85] commit change 2.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master a24a256] commit change 2.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 2332b8d] commit change 2.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.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	file
-Committed r6
-	M	file
-r6 = f5284689358f6cf32305733dd9d12ef931408c69 (refs/remotes/git-svn)
-	M	file
-Committed r7
-	M	file
-r7 = 0f810f49d0054e37b976b95d5eb6dd20fbe50f91 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 1dad633f7f00b0df81a023c1c1d3af7f3a32526f (refs/remotes/git-svn)
-W: a24a256060ce5a085a45b8e6770e1b7fe57b98c4 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 7c703df338191341d58a31829e93dd4dbfd711b3 d27e5abb2c3d3fd214aeeaf6020ef9681e18b348 M	auto_updated_file
-warning: skipped previously applied commit d834b85
-warning: skipped previously applied commit a24a256
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-	M	file
-Committed r9
-	M	file
-r9 = 6b0de15c0b1183f5d56b73142523dc439ee8339e (refs/remotes/git-svn)
-No changes between 9545f4e1c2554d2dd7dcea3dee3c60bfd0f331a5 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-Updating '.':
-U    file
-U    auto_updated_file
-Updated to revision 9.
-ok 5 - dcommit concurrent change in non-changed file
+:100644 100755 532386d be960bf M	baz/xyzzy
+:100644 100644 df023b2 215df20 M	foo
 
-expecting success of 9164.6 'dcommit concurrent non-conflicting change': 
-	setup_hook post-commit 2 &&
-	next_N && git svn clone "$svnrepo" work$N.git &&
-	(
-		cd work$N.git &&
-		cat file >> auto_updated_file &&
-			git commit -am "commit change $N.1" &&
-		delete_first_line auto_updated_file &&
-			git commit -am "commit change $N.2" &&
-		delete_first_line auto_updated_file &&
-			git commit -am "commit change $N.3" &&
-		# should rebase and leave the repository in reasonable state
-		git svn dcommit &&
-		git update-index --refresh &&
-		check_contents &&
-		git show HEAD~3 | grep -q git-svn-id &&
-		git show HEAD~2 | grep -q git-svn-id &&
-		git show HEAD~1 | grep -q auto-committing &&
-		git show HEAD   | grep -q git-svn-id
-	)
+commit 49f8b007d515fc33aed8245ee498753d4270cc78
+Author: C O Mitter <committer@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 177e96bb6b808b052f1cc1f4b5bc99678914f562 (refs/remotes/git-svn)
-	M	file
-r2 = d760ffc48e2cd13e01d24d0f96c6b6b871e84e58 (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = a08501d2a942ebf7538af17c308b7d8779e5524f (refs/remotes/git-svn)
-	M	file
-r4 = 0c121a5fc8ad141abe22837ce5121d67daae6946 (refs/remotes/git-svn)
-	M	file
-r5 = 86399b531d59273a765c686a8cde699b841fb1c5 (refs/remotes/git-svn)
-	M	file
-r6 = f5284689358f6cf32305733dd9d12ef931408c69 (refs/remotes/git-svn)
-	M	file
-r7 = 0f810f49d0054e37b976b95d5eb6dd20fbe50f91 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 1dad633f7f00b0df81a023c1c1d3af7f3a32526f (refs/remotes/git-svn)
-	M	file
-r9 = 6b0de15c0b1183f5d56b73142523dc439ee8339e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
-[master 9bf2caf] commit change 3.1
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-[master caf2e4e] commit change 3.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master 158909f] commit change 3.3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	auto_updated_file
-Committed r10
-	M	auto_updated_file
-r10 = 23a598cb0c7e180a31dda556cdb9ad4a25099f05 (refs/remotes/git-svn)
-	M	auto_updated_file
-Committed r11
-	M	auto_updated_file
-r11 = a6ac55c5af816520eb4545a3d6f0f9788ef8e411 (refs/remotes/git-svn)
-	M	auto_updated_file
-r12 = 9801c975046ddbe803ca35cdefa99267635c8926 (refs/remotes/git-svn)
-W: caf2e4e7d4a34d3de8c589636186dd257337fc70 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 10d49f9e842ff75fce5005ca836776df344183cb 2354e748cccad45fa1bd8ad31f857833bb6521ed M	auto_updated_file
-warning: skipped previously applied commit 9bf2caf
-warning: skipped previously applied commit caf2e4e
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-	M	auto_updated_file
-Committed r13
-	M	auto_updated_file
-r13 = d591a5192f36f7ba924a529788de75f18ff205ad (refs/remotes/git-svn)
-No changes between 7945d25297acbd85e770150cfc0d14ff577b20f4 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-Updating '.':
-U    auto_updated_file
-Updated to revision 13.
-ok 6 - dcommit concurrent non-conflicting change
+    first commit
 
-expecting success of 9164.7 'dcommit --no-rebase concurrent non-conflicting change': 
-	setup_hook post-commit 2 &&
-	next_N && git svn clone "$svnrepo" work$N.git &&
-	(
-		cd work$N.git &&
-		cat file >> auto_updated_file &&
-			git commit -am "commit change $N.1" &&
-		delete_first_line auto_updated_file &&
-			git commit -am "commit change $N.2" &&
-		delete_first_line auto_updated_file &&
-			git commit -am "commit change $N.3" &&
-		# should fail as rebase is needed
-		test_must_fail git svn dcommit --no-rebase &&
-		# but should leave HEAD unchanged
-		git update-index --refresh &&
-		! git show HEAD~2 | grep -q git-svn-id &&
-		! git show HEAD~1 | grep -q git-svn-id &&
-		! git show HEAD   | grep -q git-svn-id
-	)
+:000000 100755 0000000 3c9b917 A	bar
+:000000 100644 0000000 532386d A	baz/xyzzy
+:000000 100644 0000000 df023b2 A	foo
+ok 1 - set up main branch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 177e96bb6b808b052f1cc1f4b5bc99678914f562 (refs/remotes/git-svn)
-	M	file
-r2 = d760ffc48e2cd13e01d24d0f96c6b6b871e84e58 (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = a08501d2a942ebf7538af17c308b7d8779e5524f (refs/remotes/git-svn)
-	M	file
-r4 = 0c121a5fc8ad141abe22837ce5121d67daae6946 (refs/remotes/git-svn)
-	M	file
-r5 = 86399b531d59273a765c686a8cde699b841fb1c5 (refs/remotes/git-svn)
-	M	file
-r6 = f5284689358f6cf32305733dd9d12ef931408c69 (refs/remotes/git-svn)
-	M	file
-r7 = 0f810f49d0054e37b976b95d5eb6dd20fbe50f91 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 1dad633f7f00b0df81a023c1c1d3af7f3a32526f (refs/remotes/git-svn)
-	M	file
-r9 = 6b0de15c0b1183f5d56b73142523dc439ee8339e (refs/remotes/git-svn)
-	M	auto_updated_file
-r10 = 23a598cb0c7e180a31dda556cdb9ad4a25099f05 (refs/remotes/git-svn)
-	M	auto_updated_file
-r11 = a6ac55c5af816520eb4545a3d6f0f9788ef8e411 (refs/remotes/git-svn)
-	M	auto_updated_file
-r12 = 9801c975046ddbe803ca35cdefa99267635c8926 (refs/remotes/git-svn)
-	M	auto_updated_file
-r13 = d591a5192f36f7ba924a529788de75f18ff205ad (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
-[master fd5b8e1] commit change 4.1
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-[master 5411318] commit change 4.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master 7d19d56] commit change 4.3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-Attempting to commit more than one change while --no-rebase is enabled.
-If these changes depend on each other, re-running without --no-rebase may be required. at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-svn line 879.
-	M	auto_updated_file
-Committed r14
-	M	auto_updated_file
-r14 = d3eed94f9a855fb300d978aee0de65b69664251c (refs/remotes/git-svn)
-	M	auto_updated_file
-Committed r15
-	M	auto_updated_file
-r15 = 469840130f9d3af5d954b7b55433787a5e7ab25e (refs/remotes/git-svn)
-	M	auto_updated_file
-r16 = cdd29eab13caea4cdd19e894363e2ff4128c45d6 (refs/remotes/git-svn)
+expecting success of 9301.2 'add notes with simple M command': 
 
-ERROR from SVN:
-Transaction is out of date: File '/auto_updated_file' is out of date
-ERROR: Not all changes have been committed into SVN.
-Please see the above messages for details.
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
 
-ok 7 - dcommit --no-rebase concurrent non-conflicting change
 
-expecting success of 9164.8 'dcommit fails on concurrent conflicting change': 
-	setup_hook post-commit 1 &&
-	next_N && git svn clone "$svnrepo" work$N.git &&
-	(
-		cd work$N.git &&
-		echo a >> file &&
-			git commit -am "commit change $N.1" &&
-		echo b >> auto_updated_file &&
-			git commit -am "commit change $N.2" &&
-		echo c >> auto_updated_file &&
-			git commit -am "commit change $N.3" &&
-		test_must_fail git svn dcommit && # rebase should fail
-		test_must_fail git update-index --refresh
-	)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            4 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          1 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              2
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 177e96bb6b808b052f1cc1f4b5bc99678914f562 (refs/remotes/git-svn)
-	M	file
-r2 = d760ffc48e2cd13e01d24d0f96c6b6b871e84e58 (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = a08501d2a942ebf7538af17c308b7d8779e5524f (refs/remotes/git-svn)
-	M	file
-r4 = 0c121a5fc8ad141abe22837ce5121d67daae6946 (refs/remotes/git-svn)
-	M	file
-r5 = 86399b531d59273a765c686a8cde699b841fb1c5 (refs/remotes/git-svn)
-	M	file
-r6 = f5284689358f6cf32305733dd9d12ef931408c69 (refs/remotes/git-svn)
-	M	file
-r7 = 0f810f49d0054e37b976b95d5eb6dd20fbe50f91 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 1dad633f7f00b0df81a023c1c1d3af7f3a32526f (refs/remotes/git-svn)
-	M	file
-r9 = 6b0de15c0b1183f5d56b73142523dc439ee8339e (refs/remotes/git-svn)
-	M	auto_updated_file
-r10 = 23a598cb0c7e180a31dda556cdb9ad4a25099f05 (refs/remotes/git-svn)
-	M	auto_updated_file
-r11 = a6ac55c5af816520eb4545a3d6f0f9788ef8e411 (refs/remotes/git-svn)
-	M	auto_updated_file
-r12 = 9801c975046ddbe803ca35cdefa99267635c8926 (refs/remotes/git-svn)
-	M	auto_updated_file
-r13 = d591a5192f36f7ba924a529788de75f18ff205ad (refs/remotes/git-svn)
-	M	auto_updated_file
-r14 = d3eed94f9a855fb300d978aee0de65b69664251c (refs/remotes/git-svn)
-	M	auto_updated_file
-r15 = 469840130f9d3af5d954b7b55433787a5e7ab25e (refs/remotes/git-svn)
-	M	auto_updated_file
-r16 = cdd29eab13caea4cdd19e894363e2ff4128c45d6 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
-[master ec208c0] commit change 5.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f868265] commit change 5.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 2acccb8] commit change 5.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.48.0~rc1+next.20250101/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	file
-Committed r17
-	M	file
-r17 = 959bc8391ee8e3da78f1e4cb3b9bb3447d4a620d (refs/remotes/git-svn)
-	M	auto_updated_file
-r18 = 86e511b4c63f5679b10dc54e8bd6902c36683b2a (refs/remotes/git-svn)
-W: ec208c076c43e7dab53984ab4da71335da574b30 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 2da0114ba22c04b8a3dc0acd42fedde219ee32e9 309c9f4062ba132a4a4e60128612362f63ae6ad1 M	auto_updated_file
-warning: skipped previously applied commit ec208c0
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Auto-merging auto_updated_file
-CONFLICT (content): Merge conflict in auto_updated_file
-error: could not apply f868265... commit change 5.2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply f868265... commit change 5.2
-rebase refs/remotes/git-svn: command returned error: 1
+ok 2 - add notes with simple M command
 
-auto_updated_file: needs merge
-ok 8 - dcommit fails on concurrent conflicting change
+expecting success of 9301.3 'add notes with simple N command': 
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9600-cvsimport.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9600-cvsimport/.git/
-checking prerequisite: NOT_ROOT
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            4 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          1 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:              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 3 - add notes with simple N command
+
+expecting success of 9301.4 'update existing notes with N command': 
+
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            4 (         0 duplicates          0 deltas of          3 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:              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 4 - update existing notes with N command
+
+expecting success of 9301.5 'add concatenation notes with M command': 
+
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           12 (         0 duplicates                  )
+      blobs  :            7 (         0 duplicates          0 deltas of          6 attempts)
+      trees  :            4 (         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:             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
+---------------------------------------------------------------------
+
+ok 5 - add concatenation notes with M command
+
+expecting success of 9301.6 'verify that deleteall also removes notes': 
+
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
 
-)
-prerequisite NOT_ROOT ok
-expecting success of 9600.1 'setup cvsroot environment': 
-	CVSROOT=$(pwd)/cvsroot &&
-	export CVSROOT
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            2 (         0 duplicates                  )
+      blobs  :            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:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              6
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-ok 1 - setup cvsroot environment
+ok 6 - verify that deleteall also removes notes
 
-expecting success of 9600.2 'setup cvsroot': $CVS init
-ok 2 - setup cvsroot
+expecting success of 9301.7 'verify that later N commands override earlier M commands': 
 
-expecting success of 9600.3 'setup a cvs module': 
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
 
-	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
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            4 (         0 duplicates          0 deltas of          3 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              2
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-nunc obdurat
-et tunc curat
-ludo mentis aciem,
+ok 7 - verify that later N commands override earlier M commands
 
-egestatem,
-potestatem
-dissolvit ut glaciem.
-EOF
-	$CVS add o_fortuna &&
-	cat <<EOF >message &&
-add "O Fortuna" lyrics
+expecting success of 9301.8 'add lots of commits and notes': 
 
-These public domain lyrics make an excellent sample text.
-EOF
-	$CVS commit -F message
-	)
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/many_notes git log refs/heads/many_commits |
+	    grep "^    " > actual &&
+	test_cmp expect actual
 
-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.48.0~rc1+next.20250101/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': 
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:         1813 (         0 duplicates                  )
+      blobs  :          803 (         0 duplicates        392 deltas of        695 attempts)
+      trees  :          608 (         0 duplicates          2 deltas of        401 attempts)
+      commits:          402 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           2 (         2 loads     )
+      marks:           1024 (       400 unique    )
+      atoms:            864
+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            =          4
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
+---------------------------------------------------------------------
 
-	git cvsimport -a -R -z 0 -C module-git module &&
-	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ok 8 - add lots of commits and notes
 
+expecting success of 9301.9 'verify that lots of notes trigger a fanout scheme': 
+	hexsz=$(test_oid hexsz) &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9600-cvsimport/module-git/.git/
-ok 4 - import a trivial module
+	# None of the entries in the top-level notes tree should be a full SHA1
+	git ls-tree --name-only refs/notes/many_notes |
+	while read path
+	do
+		if test $(expr length "$path") -ge $hexsz
+		then
+			return 1
+		fi
+	done
 
-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': 
+ok 9 - verify that lots of notes trigger a fanout scheme
 
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
+expecting success of 9301.10 'verify that importing a notes tree respects the fanout scheme': 
+	git fast-import <input &&
 
-ok 6 - initial import has correct .git/cvs-revisions
+	# None of the entries in the top-level notes tree should be a full SHA1
+	git ls-tree --name-only refs/notes/other_notes |
+	while read path
+	do
+		if test $(expr length "$path") -ge $hexsz
+		then
+			return 1
+		fi
+	done
 
-expecting success of 9600.7 'update cvs module': 
-	(cd module-cvs &&
-	cat <<EOF >o_fortuna &&
-O Fortune,
-like the moon
-you are changeable,
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            2 (      1818 duplicates                  )
+      blobs  :            0 (       805 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (       611 duplicates          0 deltas of          0 attempts)
+      commits:            2 (       402 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           4 (         4 loads     )
+      marks:           1024 (       400 unique    )
+      atoms:            864
+Memory total:          2587 KiB
+       pools:          2235 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =        212
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
+---------------------------------------------------------------------
 
-ever waxing
-and waning;
-hateful life
+ok 10 - verify that importing a notes tree respects the fanout scheme
 
-first oppresses
-and then soothes
-as fancy takes it;
+expecting success of 9301.11 'verify that non-notes are untouched by a fanout change': 
 
-poverty
-and power
-it melts them like ice.
-EOF
-	cat <<EOF >message &&
-translate to English
+	git cat-file -p refs/notes/many_notes:foobar/non-note.txt > actual &&
+	test_cmp expect_non-note1 actual &&
+	git cat-file -p refs/notes/many_notes:deadbeef > actual &&
+	test_cmp expect_non-note2 actual &&
+	git cat-file -p refs/notes/many_notes:de/adbeef > actual &&
+	test_cmp expect_non-note3 actual
 
-My Latin is terrible.
-EOF
-	$CVS commit -F message
-	)
 
-cvs commit: Examining .
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/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
+ok 11 - verify that non-notes are untouched by a fanout change
 
-expecting success of 9600.8 'update git module': 
+expecting success of 9301.12 'change a few existing notes': 
 
-	(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
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/many_notes git log -n3 refs/heads/many_commits |
+	    grep "^    " > actual &&
+	test_cmp expect actual
 
 
-Updating e30ffff..3673b0c
-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
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            8 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          2 deltas of          2 attempts)
+      trees  :            4 (         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:            608
+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            =        216
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
+---------------------------------------------------------------------
 
-expecting success of 9600.9 'update has correct .git/cvs-revisions': 
+ok 12 - change a few existing notes
 
-	(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
+expecting success of 9301.13 'verify that changing notes respect existing fanout': 
 
-ok 9 - update has correct .git/cvs-revisions
+	# None of the entries in the top-level notes tree should be a full SHA1
+	git ls-tree --name-only refs/notes/many_notes |
+	while read path
+	do
+		if test $(expr length "$path") -ge $hexsz
+		then
+			return 1
+		fi
+	done
 
-expecting success of 9600.10 'update cvs module': 
 
-	(cd module-cvs &&
-		echo 1 >tick &&
-		$CVS add tick &&
-		$CVS commit -m 1
-	)
+ok 13 - verify that changing notes respect existing fanout
 
-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.48.0~rc1+next.20250101/t/trash directory.t9600-cvsimport/cvsroot/module/tick,v  <--  tick
-initial revision: 1.1
-ok 10 - update cvs module
+expecting success of 9301.14 'remove lots of notes': 
 
-expecting success of 9600.11 'cvsimport.module config works': 
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/many_notes git log refs/heads/many_commits |
+	    grep "^    " > actual &&
+	test_cmp expect actual
 
-	(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
 
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            3 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         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:            618
+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            =        593
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
+---------------------------------------------------------------------
 
-Updating 3673b0c..2e94a2d
-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
+ok 14 - remove lots of notes
 
-expecting success of 9600.12 'second update has correct .git/cvs-revisions': 
+expecting success of 9301.15 'verify that removing notes trigger fanout consolidation': 
+	# All entries in the top-level notes tree should be a full SHA1
+	git ls-tree --name-only -r refs/notes/many_notes |
+	while read path
+	do
+		# Explicitly ignore the non-note paths
+		test "$path" = "foobar/non-note.txt" && continue
+		test "$path" = "deadbeef" && continue
+		test "$path" = "de/adbeef" && continue
 
-	(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
+		if test $(expr length "$path") -ne $hexsz
+		then
+			return 1
+		fi
+	done
 
-ok 12 - second update has correct .git/cvs-revisions
 
-expecting success of 9600.13 'import from a CVS working tree': 
+ok 15 - verify that removing notes trigger fanout consolidation
 
-	$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
-	)
+expecting success of 9301.16 'verify that non-notes are untouched by a fanout change': 
 
+	git cat-file -p refs/notes/many_notes:foobar/non-note.txt > actual &&
+	test_cmp expect_non-note1 actual &&
+	git cat-file -p refs/notes/many_notes:deadbeef > actual &&
+	test_cmp expect_non-note2 actual &&
+	git cat-file -p refs/notes/many_notes:de/adbeef > actual &&
+	test_cmp expect_non-note3 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.48.0~rc1+next.20250101/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': 
+ok 16 - verify that non-notes are untouched by a fanout change
 
-	! test -e import-from-wt/.git/cvs-revisions
+expecting success of 9301.17 'add notes to 16 commits in each of 10 refs': 
 
+	git fast-import --active-branches=5 <input &&
+	GIT_NOTES_REF=refs/notes/more_notes_1 git log refs/heads/more_commits |
+	    grep "^    " > actual &&
+	test_cmp expect actual
 
-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
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           46 (       282 duplicates                  )
+      blobs  :            8 (       248 duplicates          0 deltas of          7 attempts)
+      trees  :            2 (        34 duplicates          1 deltas of          1 attempts)
+      commits:           36 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:          11 (        21 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:             17
+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          =         10
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       6351
+---------------------------------------------------------------------
 
-# passed all 15 test(s)
-1..15
+ok 17 - add notes to 16 commits in each of 10 refs
+
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9903-bash-prompt.sh ***
@@ -551082,272 +552697,1276 @@
 1..67
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9602-cvsimport-branches-tags.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9602-cvsimport-branches-tags/.git/
-expecting success of 9602.1 'import module': 
+*** t9500-gitweb-standalone-no-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9500-gitweb-standalone-no-errors/.git/
+expecting success of 9500.1 'no commits: projects_list (implicit)': gitweb_run
+ok 1 - no commits: projects_list (implicit)
 
-	git cvsimport -C module-git module
+expecting success of 9500.2 'no commits: projects_index': gitweb_run "a=project_index"
+ok 2 - no commits: projects_index
 
+expecting success of 9500.3 'no commits: .git summary (implicit)': gitweb_run "p=.git"
+ok 3 - no commits: .git summary (implicit)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
-ok 1 - import module
+expecting success of 9500.4 'no commits: .git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
+ok 4 - no commits: .git commit (implicit HEAD)
 
-expecting success of 9602.2 'test branch main': 
+expecting success of 9500.5 'no commits: .git commitdiff (implicit HEAD)': gitweb_run "p=.git;a=commitdiff"
+ok 5 - no commits: .git commitdiff (implicit HEAD)
 
-	test_cmp_branch_tree main
+expecting success of 9500.6 'no commits: .git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
+ok 6 - no commits: .git tree (implicit HEAD)
 
+expecting success of 9500.7 'no commits: .git heads': gitweb_run "p=.git;a=heads"
+ok 7 - no commits: .git heads
 
-cvs checkout: Updating module-cvs-main
-U module-cvs-main/default
-cvs checkout: Updating module-cvs-main/sub1
-U module-cvs-main/sub1/default
-cvs checkout: Updating module-cvs-main/sub1/subsubA
-U module-cvs-main/sub1/subsubA/default
-cvs checkout: Updating module-cvs-main/sub1/subsubB
-U module-cvs-main/sub1/subsubB/default
-cvs checkout: Updating module-cvs-main/sub2
-U module-cvs-main/sub2/default
-cvs checkout: Updating module-cvs-main/sub2/subsubA
-U module-cvs-main/sub2/subsubA/default
-cvs checkout: Updating module-cvs-main/sub3
-U module-cvs-main/sub3/default
+expecting success of 9500.8 'no commits: .git tags': gitweb_run "p=.git;a=tags"
+ok 8 - no commits: .git tags
+
+expecting success of 9500.9 'Make initial commit': echo "Not an empty file." >file &&
+	 git add file &&
+	 git commit -a -m "Initial commit." &&
+	 git branch b
+[main (root-commit) f6e1c08] Initial commit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 9 - Make initial commit
+
+expecting success of 9500.10 'projects_list (implicit)': gitweb_run
+ok 10 - projects_list (implicit)
+
+expecting success of 9500.11 'projects_index': gitweb_run "a=project_index"
+ok 11 - projects_index
+
+expecting success of 9500.12 '.git summary (implicit)': gitweb_run "p=.git"
+ok 12 - .git summary (implicit)
+
+expecting success of 9500.13 '.git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
+ok 13 - .git commit (implicit HEAD)
+
+expecting success of 9500.14 '.git commitdiff (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff"
+ok 14 - .git commitdiff (implicit HEAD, root commit)
+
+expecting success of 9500.15 '.git commitdiff_plain (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff_plain"
+ok 15 - .git commitdiff_plain (implicit HEAD, root commit)
+
+expecting success of 9500.16 '.git commit (HEAD)': gitweb_run "p=.git;a=commit;h=HEAD"
+ok 16 - .git commit (HEAD)
+
+expecting success of 9500.17 '.git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
+ok 17 - .git tree (implicit HEAD)
+
+expecting success of 9500.18 '.git blob (file)': gitweb_run "p=.git;a=blob;f=file"
+ok 18 - .git blob (file)
+
+expecting success of 9500.19 '.git blob_plain (file)': gitweb_run "p=.git;a=blob_plain;f=file"
+ok 19 - .git blob_plain (file)
+
+expecting success of 9500.20 '.git commit (non-existent)': gitweb_run "p=.git;a=commit;h=non-existent"
+ok 20 - .git commit (non-existent)
+
+expecting success of 9500.21 '.git commitdiff (non-existent)': gitweb_run "p=.git;a=commitdiff;h=non-existent"
+ok 21 - .git commitdiff (non-existent)
+
+expecting success of 9500.22 '.git commitdiff (non-existent vs HEAD)': gitweb_run "p=.git;a=commitdiff;hp=non-existent;h=HEAD"
+ok 22 - .git commitdiff (non-existent vs HEAD)
+
+expecting success of 9500.23 '.git tree (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tree;h=0000000000000000000000000000000000000000"
+ok 23 - .git tree (0000000000000000000000000000000000000000)
+
+expecting success of 9500.24 '.git tag (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tag;h=0000000000000000000000000000000000000000"
+ok 24 - .git tag (0000000000000000000000000000000000000000)
+
+expecting success of 9500.25 '.git blob (non-existent)': gitweb_run "p=.git;a=blob;f=non-existent"
+ok 25 - .git blob (non-existent)
+
+expecting success of 9500.26 '.git blob_plain (non-existent)': gitweb_run "p=.git;a=blob_plain;f=non-existent"
+ok 26 - .git blob_plain (non-existent)
+
+expecting success of 9500.27 'commitdiff(0): root': gitweb_run "p=.git;a=commitdiff"
+ok 27 - commitdiff(0): root
+
+expecting success of 9500.28 'commitdiff(0): file added': echo "New file" >new_file &&
+	 git add new_file &&
+	 git commit -a -m "File added." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main aef3daf] File added.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new_file
+ok 28 - commitdiff(0): file added
+
+expecting success of 9500.29 'commitdiff(0): mode change': test_chmod +x new_file &&
+	 git commit -a -m "Mode changed." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main 4d63074] Mode changed.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 new_file
+ok 29 - commitdiff(0): mode change
+
+expecting success of 9500.30 'commitdiff(0): file renamed': git mv new_file renamed_file &&
+	 git commit -a -m "File renamed." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main c3af6e3] File renamed.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename new_file => renamed_file (100%)
+ok 30 - commitdiff(0): file renamed
+
+expecting success of 9500.31 'commitdiff(0): file to symlink': rm renamed_file &&
+	 test_ln_s_add file renamed_file &&
+	 git commit -a -m "File to symlink." &&
+	 gitweb_run "p=.git;a=commitdiff"
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[main 9d683f7] File to symlink.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100755 => 120000 renamed_file
+ok 31 - commitdiff(0): file to symlink
+
+expecting success of 9500.32 'commitdiff(0): file deleted': git rm renamed_file &&
+	 rm -f renamed_file &&
+	 git commit -a -m "File removed." &&
+	 gitweb_run "p=.git;a=commitdiff"
+rm 'renamed_file'
+[main a32c3dd] File removed.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 120000 renamed_file
+ok 32 - commitdiff(0): file deleted
+
+expecting success of 9500.33 'commitdiff(0): file copied / new file': cp file file2 &&
+	 git add file2 &&
+	 git commit -a -m "File copied." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main 13afdf6] File copied.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 33 - commitdiff(0): file copied / new file
+
+expecting success of 9500.34 'commitdiff(0): mode change and modified': echo "New line" >>file2 &&
+	 test_chmod +x file2 &&
+	 git commit -a -m "Mode change and modification." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main b2fe804] Mode change and modification.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ mode change 100644 => 100755 file2
+ok 34 - commitdiff(0): mode change and modified
+
+expecting success of 9500.35 'commitdiff(0): renamed and modified': cat >file2<<EOF &&
+Dominus regit me,
+et nihil mihi deerit.
+In loco pascuae ibi me collocavit,
+super aquam refectionis educavit me;
+animam meam convertit,
+deduxit me super semitas jusitiae,
+propter nomen suum.
+EOF
+	 git commit -a -m "File added." &&
+	 git mv file2 file3 &&
+	 echo "Propter nomen suum." >>file3 &&
+	 git commit -a -m "File rename and modification." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main ce1348f] File added.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+[main 763e503] File rename and modification.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename file2 => file3 (90%)
+ok 35 - commitdiff(0): renamed and modified
+
+expecting success of 9500.36 'commitdiff(0): renamed, mode change and modified': git mv file3 file2 &&
+	 echo "Propter nomen suum." >>file2 &&
+	 test_chmod +x file2 &&
+	 git commit -a -m "File rename, mode change and modification." &&
+	 gitweb_run "p=.git;a=commitdiff"
+[main 54200a9] File rename, mode change and modification.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename file3 => file2 (91%)
+ok 36 - commitdiff(0): renamed, mode change and modified
+
+expecting success of 9500.37 'setup typechange commits': 
+	echo "hello world" >foo &&
+	echo "hi planet" >bar &&
+	git update-index --add foo bar &&
+	git commit -m initial &&
+	git branch initial &&
+	rm -f foo &&
+	test_ln_s_add bar foo &&
+	git commit -m "foo symlinked to bar" &&
+	git branch foo-symlinked-to-bar &&
+	rm -f foo &&
+	echo "how far is the sun?" >foo &&
+	git update-index foo &&
+	git commit -m "foo back to file" &&
+	git branch foo-back-to-file &&
+	rm -f foo &&
+	git update-index --remove foo &&
+	mkdir foo &&
+	echo "if only I knew" >foo/baz &&
+	git update-index --add foo/baz &&
+	git commit -m "foo becomes a directory" &&
+	git branch "foo-becomes-a-directory" &&
+	echo "hello world" >foo/baz &&
+	git update-index foo/baz &&
+	git commit -m "foo/baz is the original foo" &&
+	git branch foo-baz-renamed-from-foo
+	
+[main 1c15952] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+[main fc2bb47] foo symlinked to bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 120000 foo
+[main 4ac81f8] foo back to file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 120000 => 100644 foo
+[main e02950a] foo becomes a directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 foo
+ create mode 100644 foo/baz
+[main 758ecec] foo/baz is the original foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 37 - setup typechange commits
+
+expecting success of 9500.38 'commitdiff(2): file renamed from foo to foo/baz': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-baz-renamed-from-foo"
+ok 38 - commitdiff(2): file renamed from foo to foo/baz
+
+expecting success of 9500.39 'commitdiff(2): file renamed from foo/baz to foo': gitweb_run "p=.git;a=commitdiff;hp=foo-baz-renamed-from-foo;h=initial"
+ok 39 - commitdiff(2): file renamed from foo/baz to foo
+
+expecting success of 9500.40 'commitdiff(2): directory becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=initial"
+ok 40 - commitdiff(2): directory becomes file
+
+expecting success of 9500.41 'commitdiff(2): file becomes directory': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-becomes-a-directory"
+ok 41 - commitdiff(2): file becomes directory
+
+expecting success of 9500.42 'commitdiff(2): file becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-symlinked-to-bar"
+ok 42 - commitdiff(2): file becomes symlink
+
+expecting success of 9500.43 'commitdiff(2): symlink becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-back-to-file"
+ok 43 - commitdiff(2): symlink becomes file
+
+expecting success of 9500.44 'commitdiff(2): symlink becomes directory': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-becomes-a-directory"
+ok 44 - commitdiff(2): symlink becomes directory
+
+expecting success of 9500.45 'commitdiff(2): directory becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=foo-symlinked-to-bar"
+ok 45 - commitdiff(2): directory becomes symlink
+
+expecting success of 9500.46 'setup incomplete lines': 
+	cat >file<<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	CHANGE_ME
+	EOF
+	git commit -a -m "Preparing for incomplete lines" &&
+	echo "incomplete" | tr -d "\\012" >>file &&
+	git commit -a -m "Add incomplete line" &&
+	git tag incomplete_lines_add &&
+	sed -e s/CHANGE_ME/change_me/ <file >file+ &&
+	mv -f file+ file &&
+	git commit -a -m "Incomplete context line" &&
+	git tag incomplete_lines_ctx &&
+	echo "Dominus regit me," >file &&
+	echo "incomplete line" | tr -d "\\012" >>file &&
+	git commit -a -m "Change incomplete line" &&
+	git tag incomplete_lines_chg &&
+	echo "Dominus regit me," >file &&
+	git commit -a -m "Remove incomplete line" &&
+	git tag incomplete_lines_rem
+
+[main 726d325] Preparing for incomplete lines
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+[main 5ece9db] Add incomplete line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 7182367] Incomplete context line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 19ad71b] Change incomplete line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+[main 08fef32] Remove incomplete line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ok 46 - setup incomplete lines
+
+expecting success of 9500.47 'commitdiff(1): addition of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add"
+
+ok 47 - commitdiff(1): addition of incomplete line
+
+expecting success of 9500.48 'commitdiff(1): incomplete line as context line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx"
+
+ok 48 - commitdiff(1): incomplete line as context line
+
+expecting success of 9500.49 'commitdiff(1): change incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg"
+
+ok 49 - commitdiff(1): change incomplete line
+
+expecting success of 9500.50 'commitdiff(1): removal of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem"
+
+ok 50 - commitdiff(1): removal of incomplete line
+
+expecting success of 9500.51 'Create a merge': git checkout b &&
+	 echo "Branch" >>b &&
+	 git add b &&
+	 git commit -a -m "On branch" &&
+	 git checkout main &&
+	 git merge b &&
+	 git tag merge_commit
+Switched to branch 'b'
+[b 3f8100f] On branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ b | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+ok 51 - Create a merge
+
+expecting success of 9500.52 'commit(0): merge commit': gitweb_run "p=.git;a=commit"
+ok 52 - commit(0): merge commit
+
+expecting success of 9500.53 'commitdiff(0): merge commit': gitweb_run "p=.git;a=commitdiff"
+ok 53 - commitdiff(0): merge commit
+
+expecting success of 9500.54 'Prepare large commit': git checkout b &&
+	 echo "To be changed" >01-change &&
+	 echo "To be renamed" >02-pure-rename-from &&
+	 echo "To be deleted" >03-delete &&
+	 echo "To be renamed and changed" >04-rename-from &&
+	 echo "To have mode changed" >05-mode-change &&
+	 echo "File to symlink" >06-file-or-symlink &&
+	 echo "To be changed and have mode changed" >07-change-mode-change &&
+	 git add 0* &&
+	 git commit -a -m "Prepare large commit" &&
+	 echo "Changed" >01-change &&
+	 git mv 02-pure-rename-from 02-pure-rename-to &&
+	 git rm 03-delete && rm -f 03-delete &&
+	 echo "A new file" >03-new &&
+	 git add 03-new &&
+	 git mv 04-rename-from 04-rename-to &&
+	 echo "Changed" >>04-rename-to &&
+	 test_chmod +x 05-mode-change &&
+	 rm -f 06-file-or-symlink &&
+	 test_ln_s_add 01-change 06-file-or-symlink &&
+	 echo "Changed and have mode changed" >07-change-mode-change &&
+	 test_chmod +x 07-change-mode-change &&
+	 git commit -a -m "Large commit" &&
+	 git checkout main
+Switched to branch 'b'
+[b 42d1b13] Prepare large commit
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 01-change
+ create mode 100644 02-pure-rename-from
+ create mode 100644 03-delete
+ create mode 100644 04-rename-from
+ create mode 100644 05-mode-change
+ create mode 100644 06-file-or-symlink
+ create mode 100644 07-change-mode-change
+rm '03-delete'
+[b a99c658] Large commit
+ Author: A U Thor <author@example.com>
+ 8 files changed, 5 insertions(+), 4 deletions(-)
+ rename 02-pure-rename-from => 02-pure-rename-to (100%)
+ delete mode 100644 03-delete
+ create mode 100644 03-new
+ rename 04-rename-from => 04-rename-to (76%)
+ mode change 100644 => 100755 05-mode-change
+ mode change 100644 => 120000 06-file-or-symlink
+ mode change 100644 => 100755 07-change-mode-change
+Switched to branch 'main'
+ok 54 - Prepare large commit
+
+expecting success of 9500.55 'commit(1): large commit': gitweb_run "p=.git;a=commit;h=b"
+ok 55 - commit(1): large commit
+
+expecting success of 9500.56 'commitdiff(1): large commit': gitweb_run "p=.git;a=commitdiff;h=b"
+ok 56 - commitdiff(1): large commit
+
+expecting success of 9500.57 'side-by-side: addition of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add;ds=sidebyside"
+
+ok 57 - side-by-side: addition of incomplete line
+
+expecting success of 9500.58 'side-by-side: incomplete line as context line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx;ds=sidebyside"
+
+ok 58 - side-by-side: incomplete line as context line
+
+expecting success of 9500.59 'side-by-side: changed incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg;ds=sidebyside"
+
+ok 59 - side-by-side: changed incomplete line
+
+expecting success of 9500.60 'side-by-side: removal of incomplete line': 
+	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem;ds=sidebyside"
+
+ok 60 - side-by-side: removal of incomplete line
+
+expecting success of 9500.61 'side-by-side: merge commit': 
+	gitweb_run "p=.git;a=commitdiff;h=merge_commit;ds=sidebyside"
+
+ok 61 - side-by-side: merge commit
+
+expecting success of 9500.62 'tags: list of different types of tags': git checkout main &&
+	 git tag -a -m "Tag commit object" tag-commit HEAD &&
+	 git tag -a -m "" tag-commit-nomessage HEAD &&
+	 git tag -a -m "Tag tag object" tag-tag tag-commit &&
+	 git tag -a -m "Tag tree object" tag-tree HEAD^{tree} &&
+	 git tag -a -m "Tag blob object" tag-blob HEAD:file &&
+	 git tag lightweight/tag-commit HEAD &&
+	 git tag lightweight/tag-tag tag-commit &&
+	 git tag lightweight/tag-tree HEAD^{tree} &&
+	 git tag lightweight/tag-blob HEAD:file &&
+	 gitweb_run "p=.git;a=tags"
 Already on 'main'
-ok 2 - test 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-tag tag-commit^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+ok 62 - tags: list of different types of tags
 
-expecting success of 9602.3 'test branch vendorbranch': 
+expecting success of 9500.63 'tag: Tag to commit object': gitweb_run "p=.git;a=tag;h=tag-commit"
+ok 63 - tag: Tag to commit object
 
-	test_cmp_branch_tree vendorbranch
+expecting success of 9500.64 'tag: on lightweight tag (invalid)': gitweb_run "p=.git;a=tag;h=lightweight/tag-commit"
+ok 64 - tag: on lightweight tag (invalid)
 
+expecting success of 9500.65 'logs: log (implicit HEAD)': gitweb_run "p=.git;a=log"
+ok 65 - logs: log (implicit HEAD)
 
-cvs checkout: Updating module-cvs-vendorbranch
-U module-cvs-vendorbranch/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1
-U module-cvs-vendorbranch/sub1/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubA
-U module-cvs-vendorbranch/sub1/subsubA/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubB
-U module-cvs-vendorbranch/sub1/subsubB/default
-cvs checkout: Updating module-cvs-vendorbranch/sub2
-U module-cvs-vendorbranch/sub2/default
-cvs checkout: Updating module-cvs-vendorbranch/sub2/subsubA
-U module-cvs-vendorbranch/sub2/subsubA/default
-cvs checkout: Updating module-cvs-vendorbranch/sub3
-U module-cvs-vendorbranch/sub3/default
-Switched to branch 'vendorbranch'
-ok 3 - test branch vendorbranch
+expecting success of 9500.66 'logs: shortlog (implicit HEAD)': gitweb_run "p=.git;a=shortlog"
+ok 66 - logs: shortlog (implicit HEAD)
 
-checking known breakage of 9602.4 'test branch B_FROM_INITIALS': 
+expecting success of 9500.67 'logs: history (implicit HEAD, file)': gitweb_run "p=.git;a=history;f=file"
+ok 67 - logs: history (implicit HEAD, file)
 
-	test_cmp_branch_tree B_FROM_INITIALS
+expecting success of 9500.68 'logs: history (implicit HEAD, non-existent file)': gitweb_run "p=.git;a=history;f=non-existent"
+ok 68 - logs: history (implicit HEAD, non-existent file)
 
+expecting success of 9500.69 'logs: history (implicit HEAD, deleted file)': git checkout main &&
+	 echo "to be deleted" >deleted_file &&
+	 git add deleted_file &&
+	 git commit -m "Add file to be deleted" &&
+	 git rm deleted_file &&
+	 git commit -m "Delete file" &&
+	 gitweb_run "p=.git;a=history;f=deleted_file"
+Already on 'main'
+[main 0b30cc4] Add file to be deleted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deleted_file
+rm 'deleted_file'
+[main 07aeaf6] Delete file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 deleted_file
+ok 69 - logs: history (implicit HEAD, deleted file)
 
-cvs checkout: Updating module-cvs-B_FROM_INITIALS
-U module-cvs-B_FROM_INITIALS/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1
-U module-cvs-B_FROM_INITIALS/sub1/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubA
-U module-cvs-B_FROM_INITIALS/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubB
-U module-cvs-B_FROM_INITIALS/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2
-U module-cvs-B_FROM_INITIALS/sub2/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2/subsubA
-U module-cvs-B_FROM_INITIALS/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub3
-U module-cvs-B_FROM_INITIALS/sub3/default
-error: pathspec 'B_FROM_INITIALS' did not match any file(s) known to git
-not ok 4 - test branch B_FROM_INITIALS # TODO known breakage
+expecting success of 9500.70 'path_info: project': gitweb_run "" "/.git"
+ok 70 - path_info: project
 
-checking known breakage of 9602.5 'test branch B_FROM_INITIALS_BUT_ONE': 
+expecting success of 9500.71 'path_info: project/branch': gitweb_run "" "/.git/b"
+ok 71 - path_info: project/branch
 
-	test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
+expecting success of 9500.72 'path_info: project/branch:file': gitweb_run "" "/.git/main:file"
+ok 72 - path_info: project/branch:file
 
+expecting success of 9500.73 'path_info: project/branch:dir/': gitweb_run "" "/.git/main:foo/"
+ok 73 - path_info: project/branch:dir/
 
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE
-U module-cvs-B_FROM_INITIALS_BUT_ONE/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubB
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub3
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub3/default
-error: pathspec 'B_FROM_INITIALS_BUT_ONE' did not match any file(s) known to git
-not ok 5 - test branch B_FROM_INITIALS_BUT_ONE # TODO known breakage
+expecting success of 9500.74 'path_info: project/branch (non-existent)': gitweb_run "" "/.git/non-existent"
+ok 74 - path_info: project/branch (non-existent)
 
-checking known breakage of 9602.6 'test branch B_MIXED': 
+expecting success of 9500.75 'path_info: project/branch:filename (non-existent branch)': gitweb_run "" "/.git/non-existent:non-existent"
+ok 75 - path_info: project/branch:filename (non-existent branch)
 
-	test_cmp_branch_tree B_MIXED
+expecting success of 9500.76 'path_info: project/branch:file (non-existent)': gitweb_run "" "/.git/main:non-existent"
+ok 76 - path_info: project/branch:file (non-existent)
 
+expecting success of 9500.77 'path_info: project/branch:dir/ (non-existent)': gitweb_run "" "/.git/main:non-existent/"
+ok 77 - path_info: project/branch:dir/ (non-existent)
 
-cvs checkout: Updating module-cvs-B_MIXED
-U module-cvs-B_MIXED/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1
-U module-cvs-B_MIXED/sub1/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubA
-U module-cvs-B_MIXED/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubB
-U module-cvs-B_MIXED/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_MIXED/sub2
-U module-cvs-B_MIXED/sub2/branch_B_MIXED_only
-U module-cvs-B_MIXED/sub2/default
-cvs checkout: Updating module-cvs-B_MIXED/sub2/subsubA
-U module-cvs-B_MIXED/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_MIXED/sub3
-U module-cvs-B_MIXED/sub3/default
-Switched to branch 'B_MIXED'
---- module-cvs-B_MIXED/./sub3/default	2003-05-23 00:15:26.000000000 +0000
-+++ module-git/./sub3/default	2025-02-09 06:56:12.026527694 +0000
-@@ -3,3 +3,5 @@
- Every directory in the `proj' project has a file named `default'.
- 
- This line was added by the first commit (affecting two files).
-+
-+This line was added in the second commit (affecting all 7 files).
-not ok 6 - test branch B_MIXED # TODO known breakage
+expecting success of 9500.78 'path_info: project/branch:/file': gitweb_run "" "/.git/main:/file"
+ok 78 - path_info: project/branch:/file
 
-expecting success of 9602.7 'test branch B_SPLIT': 
+expecting success of 9500.79 'path_info: project/:/file (implicit HEAD)': gitweb_run "" "/.git/:/file"
+ok 79 - path_info: project/:/file (implicit HEAD)
 
-	test_cmp_branch_tree B_SPLIT
+expecting success of 9500.80 'path_info: project/:/ (implicit HEAD, top tree)': gitweb_run "" "/.git/:/"
+ok 80 - path_info: project/:/ (implicit HEAD, top tree)
 
+expecting success of 9500.81 'feeds: OPML': gitweb_run "a=opml"
+ok 81 - feeds: OPML
 
-cvs checkout: Updating module-cvs-B_SPLIT
-U module-cvs-B_SPLIT/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1
-U module-cvs-B_SPLIT/sub1/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubA
-U module-cvs-B_SPLIT/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubB
-U module-cvs-B_SPLIT/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub2
-U module-cvs-B_SPLIT/sub2/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub2/subsubA
-U module-cvs-B_SPLIT/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub3
-U module-cvs-B_SPLIT/sub3/default
-Switched to branch 'B_SPLIT'
-ok 7 - test branch B_SPLIT
+expecting success of 9500.82 'feed: RSS': gitweb_run "p=.git;a=rss"
+ok 82 - feed: RSS
 
-checking known breakage of 9602.8 'test tag vendortag': 
+expecting success of 9500.83 'feed: Atom': gitweb_run "p=.git;a=atom"
+ok 83 - feed: Atom
 
-	test_cmp_branch_tree vendortag
+expecting success of 9500.84 'encode(commit): utf8': . "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
+	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
+	 echo "UTF-8" >>file &&
+	 git add file &&
+	 git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
+	 gitweb_run "p=.git;a=commit"
+[main 18589a2] ÄËÑ�Ö
+ Author: �éí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 84 - encode(commit): utf8
 
+expecting success of 9500.85 'encode(commit): iso-8859-1': . "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
+	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
+	 echo "ISO-8859-1" >>file &&
+	 git add file &&
+	 test_config i18n.commitencoding ISO-8859-1 &&
+	 git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
+	 gitweb_run "p=.git;a=commit"
+[main c6c3c80] ÄËÑ�Ö
+ Author: Áéí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 85 - encode(commit): iso-8859-1
 
-cvs checkout: Updating module-cvs-vendortag
-U module-cvs-vendortag/default
-cvs checkout: Updating module-cvs-vendortag/sub1
-U module-cvs-vendortag/sub1/default
-cvs checkout: Updating module-cvs-vendortag/sub1/subsubA
-U module-cvs-vendortag/sub1/subsubA/default
-cvs checkout: Updating module-cvs-vendortag/sub1/subsubB
-U module-cvs-vendortag/sub1/subsubB/default
-cvs checkout: Updating module-cvs-vendortag/sub2
-U module-cvs-vendortag/sub2/default
-cvs checkout: Updating module-cvs-vendortag/sub2/subsubA
-U module-cvs-vendortag/sub2/subsubA/default
-cvs checkout: Updating module-cvs-vendortag/sub3
-U module-cvs-vendortag/sub3/default
-error: pathspec 'vendortag' did not match any file(s) known to git
-not ok 8 - test tag vendortag # TODO known breakage
+expecting success of 9500.86 'encode(log): utf-8 and iso-8859-1': gitweb_run "p=.git;a=log"
+ok 86 - encode(log): utf-8 and iso-8859-1
 
-expecting success of 9602.9 'test tag T_ALL_INITIAL_FILES': 
+expecting success of 9500.87 'opt: log --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
+ok 87 - opt: log --no-merges
 
-	test_cmp_branch_tree T_ALL_INITIAL_FILES
+expecting success of 9500.88 'opt: atom --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
+ok 88 - opt: atom --no-merges
 
+expecting success of 9500.89 'opt: "file" history --no-merges': gitweb_run "p=.git;a=history;f=file;opt=--no-merges"
+ok 89 - opt: "file" history --no-merges
 
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES
-U module-cvs-T_ALL_INITIAL_FILES/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1
-U module-cvs-T_ALL_INITIAL_FILES/sub1/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA
-U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB
-U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2
-U module-cvs-T_ALL_INITIAL_FILES/sub2/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA
-U module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub3
-U module-cvs-T_ALL_INITIAL_FILES/sub3/default
-Note: switching to 'T_ALL_INITIAL_FILES'.
+expecting success of 9500.90 'opt: log --no-such-option (invalid option)': gitweb_run "p=.git;a=log;opt=--no-such-option"
+ok 90 - opt: log --no-such-option (invalid option)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 9500.91 'opt: tree --no-merges (invalid option for action)': gitweb_run "p=.git;a=tree;opt=--no-merges"
+ok 91 - opt: tree --no-merges (invalid option for action)
 
-If you want to 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 9500.92 'URL: no project URLs, no base URL': gitweb_run "p=.git;a=summary"
+ok 92 - URL: no project URLs, no base URL
 
-  git switch -c <new-branch-name>
+expecting success of 9500.93 'URL: project URLs via gitweb.url': git config --add gitweb.url git://example.com/git/trash.git &&
+        git config --add gitweb.url http://example.com/git/trash.git &&
+        gitweb_run "p=.git;a=summary"
+ok 93 - URL: project URLs via gitweb.url
 
-Or undo this operation with:
+expecting success of 9500.94 'URL: project URLs via cloneurl file': gitweb_run "p=.git;a=summary"
+ok 94 - URL: project URLs via cloneurl file
 
-  git switch -
+expecting success of 9500.95 'config override: projects list (implicit)': gitweb_run
+ok 95 - config override: projects list (implicit)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 9500.96 'config override: tree view, features not overridden in repo config': gitweb_run "p=.git;a=tree"
+ok 96 - config override: tree view, features not overridden in repo config
 
-HEAD is now at e9bb65d Initial import.
-ok 9 - test tag T_ALL_INITIAL_FILES
+expecting success of 9500.97 'config override: tree view, features disabled in repo config': git config gitweb.blame no &&
+	 git config gitweb.snapshot none &&
+	 git config gitweb.avatar gravatar &&
+	 gitweb_run "p=.git;a=tree"
+ok 97 - config override: tree view, features disabled in repo config
 
-checking known breakage of 9602.10 'test tag T_ALL_INITIAL_FILES_BUT_ONE': 
+expecting success of 9500.98 'config override: tree view, features enabled in repo config (1)': git config gitweb.blame yes &&
+	 git config gitweb.snapshot "zip,tgz, tbz2" &&
+	 gitweb_run "p=.git;a=tree"
+ok 98 - config override: tree view, features enabled in repo config (1)
 
-	test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
+expecting success of 9500.99 'setup': 
+	version=$(git config core.repositoryformatversion) &&
+	algo=$(test_might_fail git config extensions.objectformat) &&
+	refstorage=$(test_might_fail git config extensions.refstorage) &&
+	cat >.git/config <<-\EOF &&
+	# testing noval and alternate separator
+	[gitweb]
+		blame
+		snapshot = zip tgz
+	EOF
+	git config core.repositoryformatversion "$version" &&
+	if test -n "$algo"
+	then
+		git config extensions.objectformat "$algo"
+	fi &&
+	if test -n "$refstorage"
+	then
+		git config extensions.refstorage "$refstorage"
+	fi
 
+ok 99 - setup
 
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubB
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3/default
-error: pathspec 'T_ALL_INITIAL_FILES_BUT_ONE' did not match any file(s) known to git
-not ok 10 - test tag T_ALL_INITIAL_FILES_BUT_ONE # TODO known breakage
+expecting success of 9500.100 'config override: tree view, features enabled in repo config (2)': gitweb_run "p=.git;a=tree"
+ok 100 - config override: tree view, features enabled in repo config (2)
 
-checking known breakage of 9602.11 'test tag T_MIXED': 
+expecting success of 9500.101 'search: preparation': echo "1st MATCH" >>file &&
+	 echo "2nd MATCH" >>file &&
+	 echo "MATCH" >>bar &&
+	 git add file bar &&
+	 git commit -m "Added MATCH word"
+[main 13113e4] Added MATCH word
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ok 101 - search: preparation
 
-	test_cmp_branch_tree T_MIXED
+expecting success of 9500.102 'search: commit author': gitweb_run "p=.git;a=search;h=HEAD;st=author;s=A+U+Thor"
+ok 102 - search: commit author
 
+expecting success of 9500.103 'search: commit message': gitweb_run "p=.git;a=search;h=HEAD;st=commitr;s=MATCH"
+ok 103 - search: commit message
 
-cvs checkout: Updating module-cvs-T_MIXED
-U module-cvs-T_MIXED/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1
-U module-cvs-T_MIXED/sub1/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubA
-U module-cvs-T_MIXED/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubB
-U module-cvs-T_MIXED/sub1/subsubB/default
-cvs checkout: Updating module-cvs-T_MIXED/sub2
-U module-cvs-T_MIXED/sub2/default
-cvs checkout: Updating module-cvs-T_MIXED/sub2/subsubA
-U module-cvs-T_MIXED/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_MIXED/sub3
-U module-cvs-T_MIXED/sub3/default
-Previous HEAD position was e9bb65d Initial import.
-HEAD is now at d875d54 Second commit to proj, affecting all 7 files.
---- module-cvs-T_MIXED/./sub2/subsubA/default	2003-05-22 23:20:19.000000000 +0000
-+++ module-git/./sub2/subsubA/default	2025-02-09 06:56:17.026559508 +0000
-@@ -1,3 +1,5 @@
- This is sub2/subsub2/default.
- 
- Every directory in the `proj' project has a file named `default'.
-+
-+This line was added in the second commit (affecting all 7 files).
-not ok 11 - test tag T_MIXED # TODO known breakage
+expecting success of 9500.104 'search: grep': gitweb_run "p=.git;a=search;h=HEAD;st=grep;s=MATCH"
+ok 104 - search: grep
 
-# still have 6 known breakage(s)
-# passed all remaining 5 test(s)
-1..11
+expecting success of 9500.105 'search: pickaxe': gitweb_run "p=.git;a=search;h=HEAD;st=pickaxe;s=MATCH"
+ok 105 - search: pickaxe
+
+expecting success of 9500.106 'search: projects': gitweb_run "a=project_list;s=.git"
+ok 106 - search: projects
+
+expecting success of 9500.107 'README.html with non-ASCII characters (utf-8)': echo "<b>UTF-8 example:</b><br />" >.git/README.html &&
+	 cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html &&
+	 gitweb_run "p=.git;a=summary"
+ok 107 - README.html with non-ASCII characters (utf-8)
+
+Skipping syntax highlighting tests: 'highlight' not found
+ok 108 # skip syntax highlighting (no highlight, unknown syntax) (missing HIGHLIGHT)
+
+ok 109 # skip syntax highlighting (highlighted, shell script) (missing HIGHLIGHT)
+
+ok 110 # skip syntax highlighting (highlighter language autodetection) (missing HIGHLIGHT)
+
+expecting success of 9500.111 'forks: prepare': git init --bare foo.git &&
+	 git --git-dir=foo.git --work-tree=. add file &&
+	 git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
+	 echo "foo" >foo.git/description &&
+	 mkdir -p foo &&
+	 (cd foo &&
+	  git clone --shared --bare ../foo.git foo-forked.git &&
+	  echo "fork of foo" >foo-forked.git/description)
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9500-gitweb-standalone-no-errors/foo.git/
+[main (root-commit) cae743e] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file
+Cloning into bare repository 'foo-forked.git'...
+done.
+ok 111 - forks: prepare
+
+expecting success of 9500.112 'forks: projects list': gitweb_run
+ok 112 - forks: projects list
+
+expecting success of 9500.113 'forks: forks action': gitweb_run "p=foo.git;a=forks"
+ok 113 - forks: forks action
+
+expecting success of 9500.114 'ctags: tag cloud in projects list': mkdir .git/ctags &&
+	 echo "2" >.git/ctags/foo &&
+	 echo "1" >.git/ctags/bar &&
+	gitweb_run
+ok 114 - ctags: tag cloud in projects list
+
+expecting success of 9500.115 'ctags: search projects by existing tag': gitweb_run "by_tag=foo"
+ok 115 - ctags: search projects by existing tag
+
+expecting success of 9500.116 'ctags: search projects by non existent tag': gitweb_run "by_tag=non-existent"
+ok 116 - ctags: search projects by non existent tag
+
+expecting success of 9500.117 'ctags: malformed tag weights': mkdir -p .git/ctags &&
+	 echo "not-a-number" >.git/ctags/nan &&
+	 echo "not-a-number-2" >.git/ctags/nan2 &&
+	 echo "0.1" >.git/ctags/floating-point &&
+	 gitweb_run
+ok 117 - ctags: malformed tag weights
+
+expecting success of 9500.118 'categories: projects list, only default category': echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
+	 gitweb_run
+ok 118 - categories: projects list, only default category
+
+expecting success of 9500.119 'unborn HEAD: "summary" page (with "heads" subview)': {
+		git checkout orphan_branch ||
+		git checkout --orphan orphan_branch
+	 } &&
+	 test_when_finished "git checkout main" &&
+	 gitweb_run "p=.git;a=summary"
+error: pathspec 'orphan_branch' did not match any file(s) known to git
+Switched to a new branch 'orphan_branch'
+Switched to branch 'main'
+ok 119 - unborn HEAD: "summary" page (with "heads" subview)
+
+# passed all 119 test(s)
+1..119
+make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
+*** t9402-git-cvsserver-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9402-git-cvsserver-refs/.git/
+expecting success of 9402.1 'setup v1, b1': 
+	echo "Simple text file" >textfile.c &&
+	echo "t2" >t2 &&
+	mkdir adir &&
+	echo "adir/afile line1" >adir/afile &&
+	echo "adir/afile line2" >>adir/afile &&
+	echo "adir/afile line3" >>adir/afile &&
+	echo "adir/afile line4" >>adir/afile &&
+	echo "adir/a2file" >>adir/a2file &&
+	mkdir adir/bdir &&
+	echo "adir/bdir/bfile line 1" >adir/bdir/bfile &&
+	echo "adir/bdir/bfile line 2" >>adir/bdir/bfile &&
+	echo "adir/bdir/b2file" >adir/bdir/b2file &&
+	git add textfile.c t2 adir &&
+	git commit -q -m "First Commit (v1)" &&
+	git tag v1 &&
+	git branch b1 &&
+	git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
+
+ok 1 - setup v1, b1
+
+expecting success of 9402.2 'cvs co v1': 
+	cvs -f -Q co -r v1 -d cvswork main >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 2 - cvs co v1
+
+expecting success of 9402.3 'cvs co b1': 
+	cvs -f co -r b1 -d cvswork main >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 3 - cvs co b1
+
+expecting success of 9402.4 'cvs co b1 [cvswork3]': 
+	cvs -f co -r b1 -d cvswork3 main >cvs.log 2>&1 &&
+	check_start_tree cvswork3 &&
+	check_file cvswork3 textfile.c v1 &&
+	check_file cvswork3 t2 v1 &&
+	check_file cvswork3 adir/afile v1 &&
+	check_file cvswork3 adir/a2file v1 &&
+	check_file cvswork3 adir/bdir/bfile v1 &&
+	check_file cvswork3 adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork3 v1
+
+ok 4 - cvs co b1 [cvswork3]
+
+expecting success of 9402.5 'edit cvswork3 and save diff': 
+	(
+		cd cvswork3 &&
+		sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
+		mv -f adir/afileNEW adir/afile &&
+		echo "afile5" >adir/afile5 &&
+		rm t2 &&
+		cvs -f add adir/afile5 &&
+		cvs -f rm t2 &&
+		! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
+	)
+
+cvs add: scheduling file `adir/afile5' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs remove: scheduling `t2' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+ok 5 - edit cvswork3 and save diff
+
+expecting success of 9402.6 'setup v1.2 on b1': 
+	git checkout b1 &&
+	echo "new v1.2" >t3 &&
+	rm t2 &&
+	sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
+	mv -f adir/afileNEW adir/afile &&
+	rm adir/a2file &&
+	echo "a3file" >>adir/a3file &&
+	echo "bfile line 3" >>adir/bdir/bfile &&
+	rm adir/bdir/b2file &&
+	echo "b3file" >adir/bdir/b3file &&
+	mkdir cdir &&
+	echo "cdir/cfile" >cdir/cfile &&
+	git add -A cdir adir t3 t2 &&
+	git commit -q -m "v1.2" &&
+	git tag v1.2 &&
+	git push --tags gitcvs.git b1:b1
+
+Switched to branch 'b1'
+To gitcvs.git
+   a445389..5630bb8  b1 -> b1
+ * [new tag]         v1.2 -> v1.2
+ok 6 - setup v1.2 on b1
+
+expecting success of 9402.7 'cvs -f up (on b1 adir)': 
+	( cd cvswork/adir && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_end_tree cvswork
+
+ok 7 - cvs -f up (on b1 adir)
+
+expecting success of 9402.8 'cvs up (on b1 /)': 
+	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_tree cvswork
+
+ok 8 - cvs up (on b1 /)
+
+expecting success of 9402.9 'cvs up (on b1 /) (again; check CVS/Tag files)': 
+	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_tree cvswork
+
+ok 9 - cvs up (on b1 /) (again; check CVS/Tag files)
+
+expecting success of 9402.10 'cvs up -r v1': 
+	( cd cvswork && cvs -f up -r v1 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 10 - cvs up -r v1
+
+expecting success of 9402.11 'cvs up': 
+	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 11 - cvs up
+
+expecting success of 9402.12 'cvs up (again; check CVS/Tag files)': 
+	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 12 - cvs up (again; check CVS/Tag files)
+
+expecting success of 9402.13 'setup simple b2': 
+	git branch b2 v1 &&
+	git push --tags gitcvs.git b2:b2
+
+To gitcvs.git
+ * [new branch]      b2 -> b2
+ok 13 - setup simple b2
+
+expecting success of 9402.14 'cvs co b2 [into cvswork2]': 
+	cvs -f co -r b2 -d cvswork2 main >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 14 - cvs co b2 [into cvswork2]
+
+expecting success of 9402.15 'root dir edit [cvswork2]': 
+	(
+		cd cvswork2 && echo "Line 2" >>textfile.c &&
+		! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
+		cvs -f commit -m "edit textfile.c" textfile.c
+	) >cvsEdit1.log 2>&1
+
+ok 15 - root dir edit [cvswork2]
+
+expecting success of 9402.16 'root dir rm file [cvswork2]': 
+	(
+		cd cvswork2 &&
+		cvs -f rm -f t2 &&
+		cvs -f diff -u >../cvsEdit2-empty.diff &&
+		! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
+		cvs -f commit -m "rm t2"
+	) >cvsEdit2.log 2>&1
+
+ok 16 - root dir rm file [cvswork2]
+
+expecting success of 9402.17 'subdir edit/add/rm files [cvswork2]': 
+	(
+		cd cvswork2 &&
+		sed -e "s/line 1/line 1 (v2)/" adir/bdir/bfile >adir/bdir/bfileNEW &&
+		mv -f adir/bdir/bfileNEW adir/bdir/bfile &&
+		rm adir/bdir/b2file &&
+		cd adir &&
+		cvs -f rm bdir/b2file &&
+		echo "4th file" >bdir/b4file &&
+		cvs -f add bdir/b4file &&
+		! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
+		git fetch gitcvs.git b2:b2 &&
+		(
+		  cd .. &&
+		  ! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
+		  ! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
+		) &&
+		cvs -f commit -m "various add/rm/edit"
+	) >cvs.log 2>&1
+
+ok 17 - subdir edit/add/rm files [cvswork2]
+
+expecting success of 9402.18 'validate result of edits [cvswork2]': 
+	git fetch gitcvs.git b2:b2 &&
+	git tag v2 b2 &&
+	git push --tags gitcvs.git b2:b2 &&
+	check_start_tree cvswork2 &&
+	check_file cvswork2 textfile.c v2 &&
+	check_file cvswork2 adir/afile v2 &&
+	check_file cvswork2 adir/a2file v2 &&
+	check_file cvswork2 adir/bdir/bfile v2 &&
+	check_file cvswork2 adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork2 v2
+
+From gitcvs
+   8bc3df8..2f22978  b2         -> b2
+To gitcvs.git
+ * [new tag]         v2 -> v2
+ok 18 - validate result of edits [cvswork2]
+
+expecting success of 9402.19 'validate basic diffs saved during above cvswork2 edits': 
+	test $(grep Index: cvsEdit1.diff | wc -l) = 1 &&
+	test_must_be_empty cvsEdit2-empty.diff &&
+	test $(grep Index: cvsEdit2-N.diff | wc -l) = 1 &&
+	test $(grep Index: cvsEdit3.diff | wc -l) = 3 &&
+	rm -rf diffSandbox &&
+	git clone -q -n . diffSandbox &&
+	(
+		cd diffSandbox &&
+		git checkout v1 &&
+		git apply -p0 --index <"$WORKDIR/cvsEdit1.diff" &&
+		git apply -p0 --index <"$WORKDIR/cvsEdit2-N.diff" &&
+		git apply -p0 --directory=adir --index <"$WORKDIR/cvsEdit3.diff" &&
+		git diff --exit-code v2
+	) >"check_diff_apply.out" 2>&1
+
+ok 19 - validate basic diffs saved during above cvswork2 edits
+
+expecting success of 9402.20 'validate v1.2 diff saved during last cvswork2 edit': 
+	test $(grep Index: cvsEdit3-v1.2.diff | wc -l) = 9 &&
+	check_diff cvsEdit3-v1.2.diff v1.2 v2
+
+ok 20 - validate v1.2 diff saved during last cvswork2 edit
+
+expecting success of 9402.21 'validate v1.2 v1 diff saved during last cvswork2 edit': 
+	test $(grep Index: cvsEdit3-v1.2-v1.diff | wc -l) = 9 &&
+	check_diff cvsEdit3-v1.2-v1.diff v1.2 v1
+
+ok 21 - validate v1.2 v1 diff saved during last cvswork2 edit
+
+expecting success of 9402.22 'cvs up [cvswork2]': 
+	( cd cvswork2 && cvs -f up ) >cvs.log 2>&1 &&
+	check_start_tree cvswork2 &&
+	check_file cvswork2 textfile.c v2 &&
+	check_file cvswork2 adir/afile v2 &&
+	check_file cvswork2 adir/a2file v2 &&
+	check_file cvswork2 adir/bdir/bfile v2 &&
+	check_file cvswork2 adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork2 v2
+
+ok 22 - cvs up [cvswork2]
+
+expecting success of 9402.23 'cvs up -r b2 [back to cvswork]': 
+	( cd cvswork && cvs -f up -r b2 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v2 &&
+	check_file cvswork adir/afile v2 &&
+	check_file cvswork adir/a2file v2 &&
+	check_file cvswork adir/bdir/bfile v2 &&
+	check_file cvswork adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork v2
+
+ok 23 - cvs up -r b2 [back to cvswork]
+
+expecting success of 9402.24 'cvs up -r b1': 
+	( cd cvswork && cvs -f up -r b1 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_full_tree cvswork v1.2
+
+ok 24 - cvs up -r b1
+
+expecting success of 9402.25 'cvs up -A': 
+	( cd cvswork && cvs -f up -A ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork v1
+
+ok 25 - cvs up -A
+
+expecting success of 9402.26 'cvs up (check CVS/Tag files)': 
+	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork v1
+
+ok 26 - cvs up (check CVS/Tag files)
+
+expecting success of 9402.27 'cvs up -r heads/b1': 
+	( cd cvswork && cvs -f up -r heads/b1 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_full_tree cvswork v1.2
+
+ok 27 - cvs up -r heads/b1
+
+expecting success of 9402.28 'cvs up -r heads_-s-b2 (cvsserver escape mechanism)': 
+	( cd cvswork && cvs -f up -r heads_-s-b2 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v2 &&
+	check_file cvswork adir/afile v2 &&
+	check_file cvswork adir/a2file v2 &&
+	check_file cvswork adir/bdir/bfile v2 &&
+	check_file cvswork adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork v2
+
+ok 28 - cvs up -r heads_-s-b2 (cvsserver escape mechanism)
+
+expecting success of 9402.29 'cvs up -r $(git rev-parse v1)': 
+	test -n "$v1hash" &&
+	( cd cvswork && cvs -f up -r "$v1hash" ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork v1
+
+ok 29 - cvs up -r $(git rev-parse v1)
+
+expecting success of 9402.30 'cvs diff -r v1 -u': 
+	( cd cvswork && cvs -f diff -r v1 -u >../cvsDiff.out 2>../cvs.log ) &&
+	test_must_be_empty cvsDiff.out &&
+	test_must_be_empty cvs.log
+
+ok 30 - cvs diff -r v1 -u
+
+expecting success of 9402.31 'cvs diff -N -r v2 -u': 
+	( cd cvswork && ! cvs -f diff -N -r v2 -u >../cvsDiff.out 2>../cvs.log ) &&
+	test_must_be_empty cvs.log &&
+	test -s cvsDiff.out &&
+	check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1
+
+ok 31 - cvs diff -N -r v2 -u
+
+expecting success of 9402.32 'cvs diff -N -r v2 -r v1.2': 
+	( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u >../cvsDiff.out 2>../cvs.log ) &&
+	test_must_be_empty cvs.log &&
+	test -s cvsDiff.out &&
+	check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1
+
+ok 32 - cvs diff -N -r v2 -r v1.2
+
+expecting success of 9402.33 'apply early [cvswork3] diff to b3': 
+	git clone -q . gitwork3 &&
+	(
+		cd gitwork3 &&
+		git checkout -b b3 v1 &&
+		git apply -p0 --index <"$WORKDIR/cvswork3edit.diff" &&
+		git commit -m "cvswork3 edits applied"
+	) &&
+	git fetch gitwork3 b3:b3 &&
+	git tag v3 b3
+
+Switched to a new branch 'b3'
+[b3 e1226ee] cvswork3 edits applied
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 adir/afile5
+ delete mode 100644 t2
+From gitwork3
+ * [new branch]      b3         -> b3
+ok 33 - apply early [cvswork3] diff to b3
+
+expecting success of 9402.34 'check [cvswork3] diff': 
+	( cd cvswork3 && ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" 2>../cvs.log ) &&
+	test_must_be_empty cvs.log &&
+	test -s cvsDiff.out &&
+	test $(grep Index: cvsDiff.out | wc -l) = 3 &&
+	test_cmp cvsDiff.out cvswork3edit.diff &&
+	check_diff cvsDiff.out v1 v3 >check_diff.out 2>&1
+
+ok 34 - check [cvswork3] diff
+
+expecting success of 9402.35 'merge early [cvswork3] b3 with b1': 
+	( cd gitwork3 && git merge -m "message" b1 ) &&
+	git fetch gitwork3 b3:b3 &&
+	git tag v3merged b3 &&
+	git push --tags gitcvs.git b3:b3
+
+Auto-merging adir/afile
+Merge made by the 'ort' strategy.
+ adir/a2file      | 1 -
+ adir/a3file      | 1 +
+ adir/afile       | 2 +-
+ adir/bdir/b2file | 1 -
+ adir/bdir/b3file | 1 +
+ adir/bdir/bfile  | 1 +
+ cdir/cfile       | 1 +
+ t3               | 1 +
+ 8 files changed, 6 insertions(+), 3 deletions(-)
+ delete mode 100644 adir/a2file
+ create mode 100644 adir/a3file
+ delete mode 100644 adir/bdir/b2file
+ create mode 100644 adir/bdir/b3file
+ create mode 100644 cdir/cfile
+ create mode 100644 t3
+From gitwork3
+   e1226ee..21f047c  b3         -> b3
+To gitcvs.git
+ * [new branch]      b3 -> b3
+ * [new tag]         v3 -> v3
+ * [new tag]         v3merged -> v3merged
+ok 35 - merge early [cvswork3] b3 with b1
+
+expecting success of 9402.36 'cvs up dirty [cvswork3]': 
+	(
+		cd cvswork3 &&
+		cvs -f up &&
+		! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out"
+	) >cvs.log 2>&1 &&
+	test -s cvsDiff.out &&
+	test $(grep Index: cvsDiff.out | wc -l) = 2 &&
+	check_start_tree cvswork3 &&
+	check_file cvswork3 textfile.c v3merged &&
+	check_file cvswork3 t3 v3merged &&
+	check_file cvswork3 adir/afile v3merged &&
+	check_file cvswork3 adir/a3file v3merged &&
+	check_file cvswork3 adir/afile5 v3merged &&
+	check_file cvswork3 adir/bdir/bfile v3merged &&
+	check_file cvswork3 adir/bdir/b3file v3merged &&
+	check_file cvswork3 cdir/cfile v3merged &&
+	check_end_full_tree cvswork3 v3merged
+
+ok 36 - cvs up dirty [cvswork3]
+
+expecting success of 9402.37 'cvs commit [cvswork3]': 
+	(
+		cd cvswork3 &&
+		cvs -f commit -m "dirty sandbox after auto-merge"
+	) >cvs.log 2>&1 &&
+	check_start_tree cvswork3 &&
+	check_file cvswork3 textfile.c v3merged &&
+	check_file cvswork3 t3 v3merged &&
+	check_file cvswork3 adir/afile v3merged &&
+	check_file cvswork3 adir/a3file v3merged &&
+	check_file cvswork3 adir/afile5 v3merged &&
+	check_file cvswork3 adir/bdir/bfile v3merged &&
+	check_file cvswork3 adir/bdir/b3file v3merged &&
+	check_file cvswork3 cdir/cfile v3merged &&
+	check_end_full_tree cvswork3 v3merged &&
+	git fetch gitcvs.git b3:b4 &&
+	git tag v4.1 b4 &&
+	git diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1
+
+From gitcvs
+ * [new branch]      b3         -> b4
+ok 37 - cvs commit [cvswork3]
+
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 *** t9902-completion.sh ***
@@ -553319,4364 +555938,1403 @@
 	other/HEAD Z
 	other/branch-in-other Z
 	other/main-in-other Z
-	EOF
-
-ok 144 - git switch - with -c, complete all references
-
-expecting success of 9902.145 'git switch - with -C, complete all references': 
-	test_completion "git switch -C new-branch " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 145 - git switch - with -C, complete all references
-
-expecting success of 9902.146 'git switch - with -c and --track, complete all references': 
-	test_completion "git switch -c new-branch --track " <<-EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 146 - git switch - with -c and --track, complete all references
-
-expecting success of 9902.147 'git switch - with -C and --track, complete all references': 
-	test_completion "git switch -C new-branch --track " <<-EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 147 - git switch - with -C and --track, complete all references
-
-expecting success of 9902.148 'git switch - with -c and --no-track, complete all references': 
-	test_completion "git switch -c new-branch --no-track " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 148 - git switch - with -c and --no-track, complete all references
-
-expecting success of 9902.149 'git switch - with -C and --no-track, complete all references': 
-	test_completion "git switch -C new-branch --no-track " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 149 - git switch - with -C and --no-track, complete all references
-
-expecting success of 9902.150 'git checkout - with -b, complete all references': 
-	test_completion "git checkout -b new-branch " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 150 - git checkout - with -b, complete all references
-
-expecting success of 9902.151 'git checkout - with -B, complete all references': 
-	test_completion "git checkout -B new-branch " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 151 - git checkout - with -B, complete all references
-
-expecting success of 9902.152 'git checkout - with -b and --track, complete all references': 
-	test_completion "git checkout -b new-branch --track " <<-EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 152 - git checkout - with -b and --track, complete all references
-
-expecting success of 9902.153 'git checkout - with -B and --track, complete all references': 
-	test_completion "git checkout -B new-branch --track " <<-EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 153 - git checkout - with -B and --track, complete all references
-
-expecting success of 9902.154 'git checkout - with -b and --no-track, complete all references': 
-	test_completion "git checkout -b new-branch --no-track " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 154 - git checkout - with -b and --no-track, complete all references
-
-expecting success of 9902.155 'git checkout - with -B and --no-track, complete all references': 
-	test_completion "git checkout -B new-branch --no-track " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 155 - git checkout - with -B and --no-track, complete all references
-
-expecting success of 9902.156 'git switch - for -c, complete local branches and unique remote branches': 
-	test_completion "git switch -c " <<-\EOF
-	HEAD Z
-	branch-in-other Z
-	main Z
-	main-in-other Z
-	matching-branch Z
-	EOF
-
-ok 156 - git switch - for -c, complete local branches and unique remote branches
-
-expecting success of 9902.157 'git switch - for -C, complete local branches and unique remote branches': 
-	test_completion "git switch -C " <<-\EOF
-	HEAD Z
-	branch-in-other Z
-	main Z
-	main-in-other Z
-	matching-branch Z
-	EOF
-
-ok 157 - git switch - for -C, complete local branches and unique remote branches
-
-expecting success of 9902.158 'git switch - for -c with --no-guess, complete local branches only': 
-	test_completion "git switch --no-guess -c " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 158 - git switch - for -c with --no-guess, complete local branches only
-
-expecting success of 9902.159 'git switch - for -C with --no-guess, complete local branches only': 
-	test_completion "git switch --no-guess -C " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 159 - git switch - for -C with --no-guess, complete local branches only
-
-expecting success of 9902.160 'git switch - for -c with --no-track, complete local branches only': 
-	test_completion "git switch --no-track -c " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 160 - git switch - for -c with --no-track, complete local branches only
-
-expecting success of 9902.161 'git switch - for -C with --no-track, complete local branches only': 
-	test_completion "git switch --no-track -C " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 161 - git switch - for -C with --no-track, complete local branches only
-
-expecting success of 9902.162 'git checkout - for -b, complete local branches and unique remote branches': 
-	test_completion "git checkout -b " <<-\EOF
-	HEAD Z
-	branch-in-other Z
-	main Z
-	main-in-other Z
-	matching-branch Z
-	EOF
-
-ok 162 - git checkout - for -b, complete local branches and unique remote branches
-
-expecting success of 9902.163 'git checkout - for -B, complete local branches and unique remote branches': 
-	test_completion "git checkout -B " <<-\EOF
-	HEAD Z
-	branch-in-other Z
-	main Z
-	main-in-other Z
-	matching-branch Z
-	EOF
-
-ok 163 - git checkout - for -B, complete local branches and unique remote branches
-
-expecting success of 9902.164 'git checkout - for -b with --no-guess, complete local branches only': 
-	test_completion "git checkout --no-guess -b " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 164 - git checkout - for -b with --no-guess, complete local branches only
-
-expecting success of 9902.165 'git checkout - for -B with --no-guess, complete local branches only': 
-	test_completion "git checkout --no-guess -B " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 165 - git checkout - for -B with --no-guess, complete local branches only
-
-expecting success of 9902.166 'git checkout - for -b with --no-track, complete local branches only': 
-	test_completion "git checkout --no-track -b " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 166 - git checkout - for -b with --no-track, complete local branches only
-
-expecting success of 9902.167 'git checkout - for -B with --no-track, complete local branches only': 
-	test_completion "git checkout --no-track -B " <<-\EOF
-	main Z
-	matching-branch Z
-	EOF
-
-ok 167 - git checkout - for -B with --no-track, complete local branches only
-
-expecting success of 9902.168 'git switch - with --orphan completes local branch names and unique remote branch names': 
-	test_completion "git switch --orphan " <<-\EOF
-	HEAD Z
-	branch-in-other Z
-	main Z
-	main-in-other Z
-	matching-branch Z
-	EOF
-
-ok 168 - git switch - with --orphan completes local branch names and unique remote branch names
-
-expecting success of 9902.169 'git switch - --orphan with branch already provided completes nothing else': 
-	test_completion "git switch --orphan main " <<-\EOF
-
-	EOF
-
-ok 169 - git switch - --orphan with branch already provided completes nothing else
-
-expecting success of 9902.170 'git checkout - with --orphan completes local branch names and unique remote branch names': 
-	test_completion "git checkout --orphan " <<-\EOF
-	HEAD Z
-	branch-in-other Z
-	main Z
-	main-in-other Z
-	matching-branch Z
-	EOF
-
-ok 170 - git checkout - with --orphan completes local branch names and unique remote branch names
-
-expecting success of 9902.171 'git checkout - --orphan with branch already provided completes local refs for a start-point': 
-	test_completion "git checkout --orphan main " <<-\EOF
-	HEAD Z
-	main Z
-	matching-branch Z
-	matching-tag Z
-	other/HEAD Z
-	other/branch-in-other Z
-	other/main-in-other Z
-	EOF
-
-ok 171 - git checkout - --orphan with branch already provided completes local refs for a start-point
-
-expecting success of 9902.172 'git restore completes modified files': 
-	test_commit A a.file &&
-	echo B >a.file &&
-	test_completion "git restore a." <<-\EOF
-	a.file
-	EOF
-
-[main 063945d] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.file
-ok 172 - git restore completes modified files
-
-expecting success of 9902.173 'teardown after ref completion': 
-	git branch -d matching-branch &&
-	git tag -d matching-tag &&
-	git remote remove other
-
-Deleted branch matching-branch (was 8b2b4f6).
-Deleted tag 'matching-tag' (was 8b2b4f6)
-ok 173 - teardown after ref completion
-
-expecting success of 9902.174 'setup for path completion tests': 
-	mkdir simple-dir \
-	      "spaces in dir" \
-	      árvíztűrő &&
-	touch simple-dir/simple-file \
-	      "spaces in dir/spaces in file" \
-	      "árvíztűrő/Сайн �ваарай" &&
-	if test_have_prereq !MINGW &&
-	   mkdir BS\\dir \
-		 separatorsindir &&
-	   touch BS\\dir/DQ\"file \
-		 separatorsindir/sepinfile
-	then
-		test_set_prereq FUNNIERNAMES
-	else
-		rm -rf BS\\dir separatorsindir
-	fi
-
-ok 174 - setup for path completion tests
-
-expecting success of 9902.175 '__git_complete_index_file - simple': 
-	test_path_completion simple simple-dir &&  # Bash is supposed to
-						   # add the trailing /.
-	test_path_completion simple-dir/simple simple-dir/simple-file
-
-ok 175 - __git_complete_index_file - simple
-
-expecting success of 9902.176 '__git_complete_index_file - escaped characters on cmdline': 
-	test_path_completion spac "spaces in dir" &&  # Bash will turn this
-						      # into "spaces\ in\ dir"
-	test_path_completion "spaces\\ i" \
-			     "spaces in dir" &&
-	test_path_completion "spaces\\ in\\ dir/s" \
-			     "spaces in dir/spaces in file" &&
-	test_path_completion "spaces\\ in\\ dir/spaces\\ i" \
-			     "spaces in dir/spaces in file"
-
-ok 176 - __git_complete_index_file - escaped characters on cmdline
-
-expecting success of 9902.177 '__git_complete_index_file - quoted characters on cmdline': 
-	# Testing with an opening but without a corresponding closing
-	# double quote is important.
-	test_path_completion \"spac "spaces in dir" &&
-	test_path_completion "\"spaces i" \
-			     "spaces in dir" &&
-	test_path_completion "\"spaces in dir/s" \
-			     "spaces in dir/spaces in file" &&
-	test_path_completion "\"spaces in dir/spaces i" \
-			     "spaces in dir/spaces in file"
-
-ok 177 - __git_complete_index_file - quoted characters on cmdline
-
-expecting success of 9902.178 '__git_complete_index_file - UTF-8 in ls-files output': 
-	test_path_completion á árvíztűrő &&
-	test_path_completion árvíztűrő/С "árvíztűrő/Сайн �ваарай"
-
-ok 178 - __git_complete_index_file - UTF-8 in ls-files output
-
-expecting success of 9902.179 '__git_complete_index_file - C-style escapes in ls-files output': 
-	test_path_completion BS \
-			     BS\\dir &&
-	test_path_completion BS\\\\d \
-			     BS\\dir &&
-	test_path_completion BS\\\\dir/DQ \
-			     BS\\dir/DQ\"file &&
-	test_path_completion BS\\\\dir/DQ\\\"f \
-			     BS\\dir/DQ\"file
-
-ok 179 - __git_complete_index_file - C-style escapes in ls-files output
-
-expecting success of 9902.180 '__git_complete_index_file - \nnn-escaped characters in ls-files output': 
-	test_path_completion sep separatorsindir &&
-	test_path_completion separatorsi \
-			     separatorsindir &&
-	test_path_completion separatorsindir/sep \
-			     separatorsindir/sepinfile &&
-	test_path_completion separatorsindir/sepi \
-			     separatorsindir/sepinfile
-
-ok 180 - __git_complete_index_file - \nnn-escaped characters in ls-files output
-
-expecting success of 9902.181 '__git_complete_index_file - removing repeated quoted path components': 
-	test_when_finished rm -r repeated-quoted &&
-	mkdir repeated-quoted &&      # A directory whose name in itself
-				      # would not be quoted ...
-	>repeated-quoted/0-file &&
-	>repeated-quoted/1\"file &&   # ... but here the file makes the
-				      # dirname quoted ...
-	>repeated-quoted/2-file &&
-	>repeated-quoted/3\"file &&   # ... and here, too.
-
-	# Still, we shold only list the directory name only once.
-	test_path_completion repeated repeated-quoted
-
-ok 181 - __git_complete_index_file - removing repeated quoted path components
-
-expecting success of 9902.182 'teardown after path completion tests': 
-	rm -rf simple-dir "spaces in dir" árvíztűrő \
-	       BS\\dir separatorsindir
-
-ok 182 - teardown after path completion tests
-
-expecting success of 9902.183 '__git_find_on_cmdline - single match': 
-	echo list >expect &&
-	(
-		words=(git command --opt list) &&
-		cword=${#words[@]} &&
-		__git_cmd_idx=1 &&
-		__git_find_on_cmdline "add list remove" >actual
-	) &&
-	test_cmp expect actual
-
-ok 183 - __git_find_on_cmdline - single match
-
-expecting success of 9902.184 '__git_find_on_cmdline - multiple matches': 
-	echo remove >expect &&
-	(
-		words=(git command -o --opt remove list add) &&
-		cword=${#words[@]} &&
-		__git_cmd_idx=1 &&
-		__git_find_on_cmdline "add list remove" >actual
-	) &&
-	test_cmp expect actual
-
-ok 184 - __git_find_on_cmdline - multiple matches
-
-expecting success of 9902.185 '__git_find_on_cmdline - no match': 
-	(
-		words=(git command --opt branch) &&
-		cword=${#words[@]} &&
-		__git_cmd_idx=1 &&
-		__git_find_on_cmdline "add list remove" >actual
-	) &&
-	test_must_be_empty actual
-
-ok 185 - __git_find_on_cmdline - no match
-
-expecting success of 9902.186 '__git_find_on_cmdline - single match with index': 
-	echo "3 list" >expect &&
-	(
-		words=(git command --opt list) &&
-		cword=${#words[@]} &&
-		__git_cmd_idx=1 &&
-		__git_find_on_cmdline --show-idx "add list remove" >actual
-	) &&
-	test_cmp expect actual
-
-ok 186 - __git_find_on_cmdline - single match with index
-
-expecting success of 9902.187 '__git_find_on_cmdline - multiple matches with index': 
-	echo "4 remove" >expect &&
-	(
-		words=(git command -o --opt remove list add) &&
-		cword=${#words[@]} &&
-		__git_cmd_idx=1 &&
-		__git_find_on_cmdline --show-idx "add list remove" >actual
-	) &&
-	test_cmp expect actual
-
-ok 187 - __git_find_on_cmdline - multiple matches with index
-
-expecting success of 9902.188 '__git_find_on_cmdline - no match with index': 
-	(
-		words=(git command --opt branch) &&
-		cword=${#words[@]} &&
-		__git_cmd_idx=1 &&
-		__git_find_on_cmdline --show-idx "add list remove" >actual
-	) &&
-	test_must_be_empty actual
-
-ok 188 - __git_find_on_cmdline - no match with index
-
-expecting success of 9902.189 '__git_find_on_cmdline - ignores matches before command with index': 
-	echo "6 remove" >expect &&
-	(
-		words=(git -C remove command -o --opt remove list add) &&
-		cword=${#words[@]} &&
-		__git_cmd_idx=3 &&
-		__git_find_on_cmdline --show-idx "add list remove" >actual
-	) &&
-	test_cmp expect actual
-
-ok 189 - __git_find_on_cmdline - ignores matches before command with index
-
-expecting success of 9902.190 '__git_get_config_variables': 
-	cat >expect <<-EOF &&
-	name-1
-	name-2
-	EOF
-	test_config interesting.name-1 good &&
-	test_config interesting.name-2 good &&
-	test_config subsection.interesting.name-3 bad &&
-	__git_get_config_variables interesting >actual &&
-	test_cmp expect actual
-
-ok 190 - __git_get_config_variables
-
-expecting success of 9902.191 '__git_pretty_aliases': 
-	cat >expect <<-EOF &&
-	author
-	hash
-	EOF
-	test_config pretty.author "%an %ae" &&
-	test_config pretty.hash %H &&
-	__git_pretty_aliases >actual &&
-	test_cmp expect actual
-
-ok 191 - __git_pretty_aliases
-
-expecting success of 9902.192 'basic': 
-	run_completion "git " &&
-	# built-in
-	grep -q "^add \$" out &&
-	# script
-	grep -q "^rebase \$" out &&
-	# plumbing
-	! grep -q "^ls-files \$" out &&
-
-	run_completion "git r" &&
-	! grep -q -v "^r" out
-
-ok 192 - basic
-
-expecting success of 9902.193 'double dash "git" itself': 
-	test_completion "git --" <<-\EOF
-	--paginate Z
-	--no-pager Z
-	--git-dir=
-	--bare Z
-	--version Z
-	--exec-path Z
-	--exec-path=
-	--html-path Z
-	--man-path Z
-	--info-path Z
-	--work-tree=
-	--namespace=
-	--no-replace-objects Z
-	--help Z
-	EOF
-
-ok 193 - double dash "git" itself
-
-expecting success of 9902.194 'double dash "git checkout"': 
-	test_completion "git checkout --" <<-\EOF
-	--quiet Z
-	--detach Z
-	--track Z
-	--orphan=Z
-	--ours Z
-	--theirs Z
-	--merge Z
-	--conflict=Z
-	--patch Z
-	--ignore-skip-worktree-bits Z
-	--ignore-other-worktrees Z
-	--recurse-submodules Z
-	--progress Z
-	--guess Z
-	--no-guess Z
-	--no-... Z
-	--overlay Z
-	--pathspec-file-nul Z
-	--pathspec-from-file=Z
-	EOF
-
-ok 194 - double dash "git checkout"
-
-expecting success of 9902.195 'general options': 
-	test_completion "git --ver" "--version " &&
-	test_completion "git --hel" "--help " &&
-	test_completion "git --exe" <<-\EOF &&
-	--exec-path Z
-	--exec-path=
-	EOF
-	test_completion "git --htm" "--html-path " &&
-	test_completion "git --pag" "--paginate " &&
-	test_completion "git --no-p" "--no-pager " &&
-	test_completion "git --git" "--git-dir=" &&
-	test_completion "git --wor" "--work-tree=" &&
-	test_completion "git --nam" "--namespace=" &&
-	test_completion "git --bar" "--bare " &&
-	test_completion "git --inf" "--info-path " &&
-	test_completion "git --no-r" "--no-replace-objects "
-
-ok 195 - general options
-
-expecting success of 9902.196 'general options plus command': 
-	test_completion "git --version check" "checkout " &&
-	test_completion "git --paginate check" "checkout " &&
-	test_completion "git --git-dir=foo check" "checkout " &&
-	test_completion "git --bare check" "checkout " &&
-	test_completion "git --exec-path=foo check" "checkout " &&
-	test_completion "git --html-path check" "checkout " &&
-	test_completion "git --no-pager check" "checkout " &&
-	test_completion "git --work-tree=foo check" "checkout " &&
-	test_completion "git --namespace=foo check" "checkout " &&
-	test_completion "git --paginate check" "checkout " &&
-	test_completion "git --info-path check" "checkout " &&
-	test_completion "git --no-replace-objects check" "checkout " &&
-	test_completion "git --git-dir some/path check" "checkout " &&
-	test_completion "git -c conf.var=value check" "checkout " &&
-	test_completion "git -C some/path check" "checkout " &&
-	test_completion "git --work-tree some/path check" "checkout " &&
-	test_completion "git --namespace name/space check" "checkout "
-
-ok 196 - general options plus command
-
-expecting success of 9902.197 'git --help completion': 
-	test_completion "git --help ad" "add " &&
-	test_completion "git --help core" "core-tutorial "
-
-ok 197 - git --help completion
-
-expecting success of 9902.198 'completion.commands removes multiple commands': 
-	test_config completion.commands "-cherry -mergetool" &&
-	git --list-cmds=list-mainporcelain,list-complete,config >out &&
-	! grep -E "^(cherry|mergetool)$" out
-
-ok 198 - completion.commands removes multiple commands
-
-expecting success of 9902.199 'setup for integration tests': 
-	echo content >file1 &&
-	echo more >file2 &&
-	git add file1 file2 &&
-	git commit -m one &&
-	git branch mybranch &&
-	git tag mytag
-
-[main ba57d3b] one
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-ok 199 - setup for integration tests
-
-expecting success of 9902.200 'checkout completes ref names': 
-	test_completion "git checkout m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 200 - checkout completes ref names
-
-expecting success of 9902.201 'checkout does not match ref names of a different case': 
-	test_completion "git checkout M" ""
-
-ok 201 - checkout does not match ref names of a different case
-
-expecting success of 9902.202 'checkout matches case insensitively with GIT_COMPLETION_IGNORE_CASE': 
-	(
-		GIT_COMPLETION_IGNORE_CASE=1 &&
-		test_completion "git checkout M" <<-\EOF
-		main Z
-		mybranch Z
-		mytag Z
-		EOF
-	)
-
-ok 202 - checkout matches case insensitively with GIT_COMPLETION_IGNORE_CASE
-
-expecting success of 9902.203 'checkout completes pseudo refs': 
-	test_completion "git checkout H" <<-\EOF
-	HEAD Z
-	EOF
-
-ok 203 - checkout completes pseudo refs
-
-expecting success of 9902.204 'checkout completes pseudo refs case insensitively with GIT_COMPLETION_IGNORE_CASE': 
-	(
-		GIT_COMPLETION_IGNORE_CASE=1 &&
-		test_completion "git checkout h" <<-\EOF
-		HEAD Z
-		EOF
-	)
-
-ok 204 - checkout completes pseudo refs case insensitively with GIT_COMPLETION_IGNORE_CASE
-
-expecting success of 9902.205 'git -C <path> checkout uses the right repo': 
-	test_completion "git -C subdir -C subsubdir -C .. -C ../otherrepo checkout b" <<-\EOF
-	branch-in-other Z
-	EOF
-
-ok 205 - git -C <path> checkout uses the right repo
-
-expecting success of 9902.206 'show completes all refs': 
-	test_completion "git show m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 206 - show completes all refs
-
-expecting success of 9902.207 '<ref>: completes paths': 
-	test_completion "git show mytag:f" <<-\EOF
-	file1Z
-	file2Z
-	EOF
-
-ok 207 - <ref>: completes paths
-
-expecting success of 9902.208 'complete tree filename with spaces': 
-	echo content >"name with spaces" &&
-	git add "name with spaces" &&
-	git commit -m spaces &&
-	test_completion "git show HEAD:nam" <<-\EOF
-	name with spacesZ
-	EOF
-
-[main 2beda4a] spaces
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 name with spaces
-ok 208 - complete tree filename with spaces
-
-expecting success of 9902.209 'complete tree filename with metacharacters': 
-	echo content >"name with \${meta}" &&
-	git add "name with \${meta}" &&
-	git commit -m meta &&
-	test_completion "git show HEAD:nam" <<-\EOF
-	name with ${meta}Z
-	name with spacesZ
-	EOF
-
-[main 8f0e0ea] meta
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 name with ${meta}
-ok 209 - complete tree filename with metacharacters
-
-expecting success of 9902.210 'symbolic-ref completes builtin options': 
-	test_completion "git symbolic-ref --d" <<-\EOF
-	--delete Z
-	EOF
-
-ok 210 - symbolic-ref completes builtin options
-
-expecting success of 9902.211 'symbolic-ref completes short ref names': 
-	test_completion "git symbolic-ref foo m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 211 - symbolic-ref completes short ref names
-
-expecting success of 9902.212 'symbolic-ref completes full ref names': 
-	test_completion "git symbolic-ref foo refs/" <<-\EOF
-	refs/heads/main Z
-	refs/heads/mybranch Z
-	refs/tags/mytag Z
-	refs/tags/A Z
-	EOF
-
-ok 212 - symbolic-ref completes full ref names
-
-expecting success of 9902.213 'send-email': 
-	test_completion "git send-email --cov" <<-\EOF &&
-	--cover-from-description=Z
-	--cover-letter Z
-	EOF
-	test_completion "git send-email --val" <<-\EOF &&
-	--validate Z
-	EOF
-	test_completion "git send-email ma" "main "
-
-ok 213 - send-email
-
-expecting success of 9902.214 'complete files': 
-	git init tmp && cd tmp &&
-	test_when_finished "cd .. && rm -rf tmp" &&
-
-	echo "expected" > .gitignore &&
-	echo "out" >> .gitignore &&
-	echo "out_sorted" >> .gitignore &&
-
-	git add .gitignore &&
-	test_completion "git commit " ".gitignore" &&
-
-	git commit -m ignore &&
-
-	touch new &&
-	test_completion "git add " "new" &&
-
-	git add new &&
-	git commit -a -m new &&
-	test_completion "git add " "" &&
-
-	git mv new modified &&
-	echo modify > modified &&
-	test_completion "git add " "modified" &&
-
-	mkdir -p some/deep &&
-	touch some/deep/path &&
-	test_completion "git add some/" "some/deep" &&
-	git clean -f some &&
-
-	touch untracked &&
-
-	: TODO .gitignore should not be here &&
-	test_completion "git rm " <<-\EOF &&
-	.gitignore
-	modified
-	EOF
-
-	test_completion "git clean " "untracked" &&
-
-	: TODO .gitignore should not be here &&
-	test_completion "git mv " <<-\EOF &&
-	.gitignore
-	modified
-	EOF
-
-	mkdir dir &&
-	touch dir/file-in-dir &&
-	git add dir/file-in-dir &&
-	git commit -m dir &&
-
-	mkdir untracked-dir &&
-
-	: TODO .gitignore should not be here &&
-	test_completion "git mv modified " <<-\EOF &&
-	.gitignore
-	dir
-	modified
-	untracked
-	untracked-dir
-	EOF
-
-	test_completion "git commit " "modified" &&
-
-	: TODO .gitignore should not be here &&
-	test_completion "git ls-files " <<-\EOF &&
-	.gitignore
-	dir
-	modified
-	EOF
-
-	touch momified &&
-	test_completion "git add mom" "momified"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/tmp/.git/
-[master (root-commit) 75715ad] ignore
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 .gitignore
-[master f8c1ce7] new
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 new
-Removing some/
-[master c399545] dir
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename new => dir/file-in-dir (100%)
- create mode 100644 modified
-ok 214 - complete files
-
-expecting success of 9902.215 'simple alias': 
-	test_config alias.co checkout &&
-	test_completion "git co m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 215 - simple alias
-
-expecting success of 9902.216 'recursive alias': 
-	test_config alias.co checkout &&
-	test_config alias.cod "co --detached" &&
-	test_completion "git cod m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 216 - recursive alias
-
-expecting success of 9902.217 'completion uses <cmd> completion for alias: !sh -c 'git <cmd> ...'': 
-	test_config alias.co "!sh -c 'git checkout ...'" &&
-	test_completion "git co m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 217 - completion uses <cmd> completion for alias: !sh -c 'git <cmd> ...'
-
-expecting success of 9902.218 'completion uses <cmd> completion for alias: !f () { VAR=val git <cmd> ... }': 
-	test_config alias.co "!f () { VAR=val git checkout ... ; } f" &&
-	test_completion "git co m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 218 - completion uses <cmd> completion for alias: !f () { VAR=val git <cmd> ... }
-
-expecting success of 9902.219 'completion used <cmd> completion for alias: !f() { : git <cmd> ; ... }': 
-	test_config alias.co "!f() { : git checkout ; if ... } f" &&
-	test_completion "git co m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 219 - completion used <cmd> completion for alias: !f() { : git <cmd> ; ... }
-
-expecting success of 9902.220 'completion used <cmd> completion for alias: !f() { : <cmd> ; ... }': 
-	test_config alias.co "!f() { : checkout ; if ... } f" &&
-	test_completion "git co m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 220 - completion used <cmd> completion for alias: !f() { : <cmd> ; ... }
-
-expecting success of 9902.221 'completion used <cmd> completion for alias: !f() { : <cmd>; ... }': 
-	test_config alias.co "!f() { : checkout; if ... } f" &&
-	test_completion "git co m" <<-\EOF
-	main Z
-	mybranch Z
-	mytag Z
-	EOF
-
-ok 221 - completion used <cmd> completion for alias: !f() { : <cmd>; ... }
-
-expecting success of 9902.222 'completion without explicit _git_xxx function': 
-	test_completion "git version --" <<-\EOF
-	--build-options Z
-	--no-build-options Z
-	EOF
-
-ok 222 - completion without explicit _git_xxx function
-
-checking known breakage of 9902.223 'complete with tilde expansion': 
-	git init tmp && cd tmp &&
-	test_when_finished "cd .. && rm -rf tmp" &&
-
-	touch ~/tmp/file &&
-
-	test_completion "git add ~/tmp/" "~/tmp/file"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/tmp/.git/
---- expected	2025-02-09 06:56:17.810564497 +0000
-+++ out_sorted	2025-02-09 06:56:17.826564599 +0000
-@@ -1 +1 @@
--~/tmp/file
-+
-not ok 223 - complete with tilde expansion # TODO known breakage
-
-expecting success of 9902.224 'setup other remote for remote reference completion': 
-	git remote add other otherrepo &&
-	git fetch other
-
-From otherrepo
- * [new branch]      branch-in-other -> other/branch-in-other
- * [new branch]      main-in-other   -> other/main-in-other
- * [new tag]         tag-in-other    -> tag-in-other
-ok 224 - setup other remote for remote reference completion
-
-expecting success of 9902.225 '__git_complete_remote_or_refspec - push -d other': 
-		sed -e "s/Z$//" >expected <<-EOF &&
-		main-in-other Z
-		EOF
-		(
-			words=(git push -d other ma) &&
-			cword=${#words[@]} cur=${words[cword-1]} &&
-			__git_cmd_idx=1 &&
-			__git_complete_remote_or_refspec &&
-			print_comp
-		) &&
-		test_cmp expected out
-	
-ok 225 - __git_complete_remote_or_refspec - push -d other
-
-checking known breakage of 9902.226 '__git_complete_remote_or_refspec - push other -d': 
-		sed -e "s/Z$//" >expected <<-EOF &&
-		main-in-other Z
-		EOF
-		(
-			words=(git push other -d ma) &&
-			cword=${#words[@]} cur=${words[cword-1]} &&
-			__git_cmd_idx=1 &&
-			__git_complete_remote_or_refspec &&
-			print_comp
-		) &&
-		test_cmp expected out
-	
---- expected	2025-02-09 06:56:17.910565133 +0000
-+++ out	2025-02-09 06:56:17.922565209 +0000
-@@ -1 +1 @@
--main-in-other 
-+main 
-not ok 226 - __git_complete_remote_or_refspec - push other -d # TODO known breakage
-
-expecting success of 9902.227 '__git_complete_remote_or_refspec - push --delete other': 
-		sed -e "s/Z$//" >expected <<-EOF &&
-		main-in-other Z
-		EOF
-		(
-			words=(git push --delete other ma) &&
-			cword=${#words[@]} cur=${words[cword-1]} &&
-			__git_cmd_idx=1 &&
-			__git_complete_remote_or_refspec &&
-			print_comp
-		) &&
-		test_cmp expected out
-	
-ok 227 - __git_complete_remote_or_refspec - push --delete other
-
-checking known breakage of 9902.228 '__git_complete_remote_or_refspec - push other --delete': 
-		sed -e "s/Z$//" >expected <<-EOF &&
-		main-in-other Z
-		EOF
-		(
-			words=(git push other --delete ma) &&
-			cword=${#words[@]} cur=${words[cword-1]} &&
-			__git_cmd_idx=1 &&
-			__git_complete_remote_or_refspec &&
-			print_comp
-		) &&
-		test_cmp expected out
-	
---- expected	2025-02-09 06:56:17.962565464 +0000
-+++ out	2025-02-09 06:56:17.974565540 +0000
-@@ -1 +1 @@
--main-in-other 
-+main 
-not ok 228 - __git_complete_remote_or_refspec - push other --delete # TODO known breakage
-
-expecting success of 9902.229 'git config subcommand': 
-	test_completion "git config " <<-\EOF
-	edit Z
-	get Z
-	list Z
-	remove-section Z
-	rename-section Z
-	set Z
-	unset Z
-	EOF
-
-ok 229 - git config subcommand
-
-expecting success of 9902.230 'git config subcommand options': 
-	test_completion "git config get --show-" <<-\EOF
-	--show-names Z
-	--show-origin Z
-	--show-scope Z
-	EOF
-
-ok 230 - git config subcommand options
-
-expecting success of 9902.231 'git config get': 
-	test_when_finished "rm -f cfgfile" &&
-	git config set --file cfgfile foo.bar baz &&
-	test_completion "git config get --file cfgfile foo." <<-\EOF
-	foo.bar Z
-	EOF
-
-ok 231 - git config get
-
-expecting success of 9902.232 'git config set - section': 
-	test_completion "git config set br" <<-\EOF
-	branch.Z
-	browser.Z
-	EOF
-
-ok 232 - git config set - section
-
-expecting success of 9902.233 'git config set - section include, includeIf': 
-	test_completion "git config set inclu" <<-\EOF
-	include.Z
-	includeIf.Z
-	EOF
-
-ok 233 - git config set - section include, includeIf
-
-expecting success of 9902.234 'git config set - variable name': 
-	test_completion "git config set log.d" <<-\EOF
-	log.date Z
-	log.decorate Z
-	log.diffMerges Z
-	EOF
-
-ok 234 - git config set - variable name
-
-expecting success of 9902.235 'git config set - variable name include': 
-	test_completion "git config set include.p" <<-\EOF
-	include.path Z
-	EOF
-
-ok 235 - git config set - variable name include
-
-expecting success of 9902.236 'setup for git config submodule tests': 
-	test_create_repo sub &&
-	test_commit -C sub initial &&
-	git submodule add ./sub
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/sub/.git/
-[master (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Adding existing repo at 'sub' to the index
-ok 236 - setup for git config submodule tests
-
-expecting success of 9902.237 'git config set - variable name - submodule and __git_compute_first_level_config_vars_for_section': 
-	test_completion "git config set submodule." <<-\EOF
-	submodule.active Z
-	submodule.alternateErrorStrategy Z
-	submodule.alternateLocation Z
-	submodule.fetchJobs Z
-	submodule.propagateBranches Z
-	submodule.recurse Z
-	submodule.sub.Z
-	EOF
-
-ok 237 - git config set - variable name - submodule and __git_compute_first_level_config_vars_for_section
-
-expecting success of 9902.238 'git config set - variable name - __git_compute_second_level_config_vars_for_section': 
-	test_completion "git config set submodule.sub." <<-\EOF
-	submodule.sub.url Z
-	submodule.sub.update Z
-	submodule.sub.branch Z
-	submodule.sub.fetchRecurseSubmodules Z
-	submodule.sub.ignore Z
-	submodule.sub.active Z
-	EOF
-
-ok 238 - git config set - variable name - __git_compute_second_level_config_vars_for_section
-
-expecting success of 9902.239 'git config set - value': 
-	test_completion "git config set color.pager " <<-\EOF
-	false Z
-	true Z
-	EOF
-
-ok 239 - git config set - value
-
-expecting success of 9902.240 'git -c - section': 
-	test_completion "git -c br" <<-\EOF
-	branch.Z
-	browser.Z
-	EOF
-
-ok 240 - git -c - section
-
-expecting success of 9902.241 'git -c - variable name': 
-	test_completion "git -c log.d" <<-\EOF
-	log.date=Z
-	log.decorate=Z
-	log.diffMerges=Z
-	EOF
-
-ok 241 - git -c - variable name
-
-expecting success of 9902.242 'git -c - value': 
-	test_completion "git -c color.pager=" <<-\EOF
-	false Z
-	true Z
-	EOF
-
-ok 242 - git -c - value
-
-expecting success of 9902.243 'git clone --config= - section': 
-	test_completion "git clone --config=br" <<-\EOF
-	branch.Z
-	browser.Z
-	EOF
-
-ok 243 - git clone --config= - section
-
-expecting success of 9902.244 'git clone --config= - variable name': 
-	test_completion "git clone --config=log.d" <<-\EOF
-	log.date=Z
-	log.decorate=Z
-	log.diffMerges=Z
-	EOF
-
-ok 244 - git clone --config= - variable name
-
-expecting success of 9902.245 'git clone --config= - value': 
-	test_completion "git clone --config=color.pager=" <<-\EOF
-	false Z
-	true Z
-	EOF
-
-ok 245 - git clone --config= - value
-
-expecting success of 9902.246 'git reflog show': 
-	test_when_finished "git checkout - && git branch -d shown" &&
-	git checkout -b shown &&
-	test_completion "git reflog sho" <<-\EOF &&
-	show Z
-	shown Z
-	EOF
-	test_completion "git reflog show sho" "shown " &&
-	test_completion "git reflog shown sho" "shown " &&
-	test_completion "git reflog --unt" "--until=" &&
-	test_completion "git reflog show --unt" "--until=" &&
-	test_completion "git reflog shown --unt" "--until="
-
-Switched to a new branch 'shown'
-Switched to branch 'main'
-A	.gitmodules
-M	a.file
-A	sub
-Deleted branch shown (was 8f0e0ea).
-ok 246 - git reflog show
-
-expecting success of 9902.247 'options with value': 
-	test_completion "git merge -X diff-algorithm=" <<-\EOF
-
-	EOF
-
-ok 247 - options with value
-
-expecting success of 9902.248 'sourcing the completion script clears cached commands': 
-	(
-		__git_compute_all_commands &&
-		test -n "$__git_all_commands" &&
-		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-		test -z "$__git_all_commands"
-	)
-
-ok 248 - sourcing the completion script clears cached commands
-
-expecting success of 9902.249 'sourcing the completion script clears cached merge strategies': 
-	(
-		__git_compute_merge_strategies &&
-		test -n "$__git_merge_strategies" &&
-		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-		test -z "$__git_merge_strategies"
-	)
-
-ok 249 - sourcing the completion script clears cached merge strategies
-
-expecting success of 9902.250 'sourcing the completion script clears cached --options': 
-	(
-		__gitcomp_builtin checkout &&
-		test -n "$__gitcomp_builtin_checkout" &&
-		__gitcomp_builtin notes_edit &&
-		test -n "$__gitcomp_builtin_notes_edit" &&
-		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-		test -z "$__gitcomp_builtin_checkout" &&
-		test -z "$__gitcomp_builtin_notes_edit"
-	)
-
-ok 250 - sourcing the completion script clears cached --options
-
-expecting success of 9902.251 'option aliases are not shown by default': 
-	test_completion "git clone --recurs" "--recurse-submodules "
-
-ok 251 - option aliases are not shown by default
-
-expecting success of 9902.252 'option aliases are shown with GIT_COMPLETION_SHOW_ALL': 
-	(
-		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-		GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL &&
-		test_completion "git clone --recurs" <<-\EOF
-		--recurse-submodules Z
-		--recursive Z
-		EOF
-	)
-
-ok 252 - option aliases are shown with GIT_COMPLETION_SHOW_ALL
-
-expecting success of 9902.253 'plumbing commands are excluded without GIT_COMPLETION_SHOW_ALL_COMMANDS': 
-	(
-		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-		sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
-
-		# Just mainporcelain, not plumbing commands
-		run_completion "git c" &&
-		grep checkout out &&
-		! grep cat-file out
-	)
-
-checkout 
-ok 253 - plumbing commands are excluded without GIT_COMPLETION_SHOW_ALL_COMMANDS
-
-expecting success of 9902.254 'all commands are shown with GIT_COMPLETION_SHOW_ALL_COMMANDS (also main non-builtin)': 
-	(
-		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-		GIT_COMPLETION_SHOW_ALL_COMMANDS=1 &&
-		export GIT_COMPLETION_SHOW_ALL_COMMANDS &&
-		sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
-
-		# Both mainporcelain and plumbing commands
-		run_completion "git c" &&
-		grep checkout out &&
-		grep cat-file out &&
-
-		# Check "gitk", a "main" command, but not a built-in + more plumbing
-		run_completion "git g" &&
-		grep gitk out &&
-		grep get-tar-commit-id out
-	)
-
-checkout 
-checkout-index 
-checkout 
-cat-file 
-gitk 
-get-tar-commit-id 
-ok 254 - all commands are shown with GIT_COMPLETION_SHOW_ALL_COMMANDS (also main non-builtin)
-
-expecting success of 9902.255 '__git_complete': 
-	unset -f __git_wrap__git_main &&
-
-	__git_complete foo __git_main &&
-	__git_have_func __git_wrap__git_main &&
-	unset -f __git_wrap__git_main &&
-
-	__git_complete gf _git_fetch &&
-	__git_have_func __git_wrap_git_fetch &&
-
-	__git_complete foo git &&
-	__git_have_func __git_wrap__git_main &&
-	unset -f __git_wrap__git_main &&
-
-	__git_complete gd git_diff &&
-	__git_have_func __git_wrap_git_diff &&
-
-	test_must_fail __git_complete ga missing
-
-ERROR: could not find function 'missing'
-ok 255 - __git_complete
-
-expecting success of 9902.256 '__git_pseudoref_exists': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		sane_unset __git_repo_path &&
-
-		# HEAD should exist, even if it points to an unborn branch.
-		__git_pseudoref_exists HEAD >output 2>&1 &&
-		test_must_be_empty output &&
-
-		# HEAD points to an existing branch, so it should exist.
-		test_commit A &&
-		__git_pseudoref_exists HEAD >output 2>&1 &&
-		test_must_be_empty output &&
-
-		# CHERRY_PICK_HEAD does not exist, so the existence check should fail.
-		! __git_pseudoref_exists CHERRY_PICK_HEAD >output 2>&1 &&
-		test_must_be_empty output &&
-
-		# CHERRY_PICK_HEAD points to a commit, so it should exist.
-		git update-ref CHERRY_PICK_HEAD A &&
-		__git_pseudoref_exists CHERRY_PICK_HEAD >output 2>&1 &&
-		test_must_be_empty output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/repo/.git/
-[master (root-commit) a3899a0] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 256 - __git_pseudoref_exists
-
-# still have 3 known breakage(s)
-# passed all remaining 253 test(s)
-1..256
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9401-git-cvsserver-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9401-git-cvsserver-crlf/.git/
-expecting success of 9401.1 'setup': 
-    git config push.default matching &&
-    echo "Simple text file" >textfile.c &&
-    echo "File with embedded NUL: Q <- there" | q_to_nul > binfile.bin &&
-    mkdir subdir &&
-    echo "Another text file" > subdir/file.h &&
-    echo "Another binary: Q (this time CR)" | q_to_cr > subdir/withCr.bin &&
-    echo "Mixed up NUL, but marked text: Q <- there" | q_to_nul > mixedUp.c &&
-    echo "Unspecified" > subdir/unspecified.other &&
-    echo "/*.bin -crlf" > .gitattributes &&
-    echo "/*.c crlf" >> .gitattributes &&
-    echo "subdir/*.bin -crlf" >> .gitattributes &&
-    echo "subdir/*.c crlf" >> .gitattributes &&
-    echo "subdir/file.h crlf" >> .gitattributes &&
-    git add .gitattributes textfile.c binfile.bin mixedUp.c subdir/* &&
-    git commit -q -m "First Commit" &&
-    git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-    GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
-
-ok 1 - setup
-
-expecting success of 9401.2 'cvs co (default crlf)': 
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    test x"$(grep /-k cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
-
-ok 2 - cvs co (default crlf)
-
-expecting success of 9401.3 'cvs co (allbinary)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c -kb &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes -kb &&
-    marked_as cvswork mixedUp.c -kb &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h -kb &&
-    marked_as cvswork/subdir unspecified.other -kb
-
-ok 3 - cvs co (allbinary)
-
-expecting success of 9401.4 'cvs co (use attributes/allbinary)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes -kb &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other -kb
-
-ok 4 - cvs co (use attributes/allbinary)
-
-expecting success of 9401.5 'cvs co (use attributes)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other ""
-
-ok 5 - cvs co (use attributes)
-
-expecting success of 9401.6 'adding files': 
-    (cd cvswork &&
-    (cd subdir &&
-    echo "more text" > src.c &&
-    GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
-    marked_as . src.c "" &&
-    echo "pseudo-binary" > temp.bin
-    ) &&
-    GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
-    marked_as subdir temp.bin "-kb" &&
-    cd subdir &&
-    GIT_CONFIG="$git_config" cvs -Q ci -m "adding files" >cvs.log 2>&1 &&
-    marked_as . temp.bin "-kb" &&
-    marked_as . src.c ""
-    )
-
-ok 6 - adding files
-
-expecting success of 9401.7 'updating': 
-    git pull gitcvs.git &&
-    echo "hi" >subdir/newfile.bin &&
-    echo "junk" >subdir/file.h &&
-    echo "hi" >subdir/newfile.c &&
-    echo "hello" >>binfile.bin &&
-    git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin &&
-    git commit -q -m "Add and change some files" &&
-    git push gitcvs.git >/dev/null &&
-    (cd cvswork &&
-    GIT_CONFIG="$git_config" cvs -Q update
-    ) &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin -kb &&
-    marked_as cvswork/subdir newfile.c "" &&
-    echo "File with embedded NUL: Q <- there" | q_to_nul > tmpExpect1 &&
-    echo "hello" >> tmpExpect1 &&
-    cmp cvswork/binfile.bin tmpExpect1
-
-From gitcvs
- * branch            HEAD       -> FETCH_HEAD
-Updating 9796767..6d431cd
-Fast-forward
- subdir/src.c    | 1 +
- subdir/temp.bin | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 subdir/src.c
- create mode 100644 subdir/temp.bin
-To gitcvs.git
-   6d431cd..faca8d4  main -> main
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
-U binfile.bin
-cvs update: `cvs.log' is no longer in the repository
-cvs update: `subdir/cvs.log' is no longer in the repository
-U subdir/file.h
-U subdir/newfile.bin
-U subdir/newfile.c
-ok 7 - updating
-
-expecting success of 9401.8 'cvs co (use attributes/guess)': 
-    GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin -kb &&
-    marked_as cvswork/subdir newfile.c ""
-
-ok 8 - cvs co (use attributes/guess)
-
-expecting success of 9401.9 'setup multi-line files': 
-    ( echo "line 1" &&
-      echo "line 2" &&
-      echo "line 3" &&
-      echo "line 4 with NUL: Q <-" ) | q_to_nul > multiline.c &&
-    git add multiline.c &&
-    ( echo "line 1" &&
-      echo "line 2" &&
-      echo "line 3" &&
-      echo "line 4" ) | q_to_nul > multilineTxt.c &&
-    git add multilineTxt.c &&
-    git commit -q -m "multiline files" &&
-    git push gitcvs.git >/dev/null
-
-To gitcvs.git
-   faca8d4..509c7f1  main -> main
-ok 9 - setup multi-line files
-
-expecting success of 9401.10 'cvs co (guess)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c -kb &&
-    marked_as cvswork multiline.c -kb &&
-    marked_as cvswork multilineTxt.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin "" &&
-    marked_as cvswork/subdir newfile.c ""
-
-ok 10 - cvs co (guess)
-
-expecting success of 9401.11 'cvs co another copy (guess)': 
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-    marked_as cvswork2 textfile.c "" &&
-    marked_as cvswork2 binfile.bin -kb &&
-    marked_as cvswork2 .gitattributes "" &&
-    marked_as cvswork2 mixedUp.c -kb &&
-    marked_as cvswork2 multiline.c -kb &&
-    marked_as cvswork2 multilineTxt.c "" &&
-    marked_as cvswork2/subdir withCr.bin -kb &&
-    marked_as cvswork2/subdir file.h "" &&
-    marked_as cvswork2/subdir unspecified.other "" &&
-    marked_as cvswork2/subdir newfile.bin "" &&
-    marked_as cvswork2/subdir newfile.c ""
-
-ok 11 - cvs co another copy (guess)
-
-expecting success of 9401.12 'cvs status - sticky options': 
-    check_status_options cvswork2 textfile.c "" &&
-    check_status_options cvswork2 binfile.bin -kb &&
-    check_status_options cvswork2 .gitattributes "" &&
-    check_status_options cvswork2 mixedUp.c -kb &&
-    check_status_options cvswork2 multiline.c -kb &&
-    check_status_options cvswork2 multilineTxt.c "" &&
-    check_status_options cvswork2/subdir withCr.bin -kb &&
-    check_status_options cvswork2 subdir/withCr.bin -kb &&
-    check_status_options cvswork2/subdir file.h "" &&
-    check_status_options cvswork2 subdir/file.h "" &&
-    check_status_options cvswork2/subdir unspecified.other "" &&
-    check_status_options cvswork2/subdir newfile.bin "" &&
-    check_status_options cvswork2/subdir newfile.c ""
-
-ok 12 - cvs status - sticky options
-
-expecting success of 9401.13 'add text (guess)': 
-    (cd cvswork &&
-    echo "simpleText" > simpleText.c &&
-    GIT_CONFIG="$git_config" cvs -Q add simpleText.c
-    ) &&
-    marked_as cvswork simpleText.c ""
-
-cvs add: scheduling file `simpleText.c' for addition
-cvs add: use `cvs commit' to add this file permanently
-ok 13 - add text (guess)
-
-expecting success of 9401.14 'add bin (guess)': 
-    (cd cvswork &&
-    echo "simpleBin: NUL: Q <- there" | q_to_nul > simpleBin.bin &&
-    GIT_CONFIG="$git_config" cvs -Q add simpleBin.bin
-    ) &&
-    marked_as cvswork simpleBin.bin -kb
-
-cvs add: scheduling file `simpleBin.bin' for addition
-cvs add: use `cvs commit' to add this file permanently
-ok 14 - add bin (guess)
-
-expecting success of 9401.15 'remove files (guess)': 
-    (cd cvswork &&
-    GIT_CONFIG="$git_config" cvs -Q rm -f subdir/file.h &&
-    (cd subdir &&
-    GIT_CONFIG="$git_config" cvs -Q rm -f withCr.bin
-    )) &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h ""
-
-cvs remove: scheduling `subdir/file.h' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-cvs remove: scheduling `subdir/withCr.bin' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-ok 15 - remove files (guess)
-
-expecting success of 9401.16 'cvs ci (guess)': 
-    (cd cvswork &&
-    GIT_CONFIG="$git_config" cvs -Q ci -m "add/rm files" >cvs.log 2>&1
-    ) &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c -kb &&
-    marked_as cvswork multiline.c -kb &&
-    marked_as cvswork multilineTxt.c "" &&
-    not_present cvswork/subdir withCr.bin &&
-    not_present cvswork/subdir file.h &&
-    marked_as cvswork/subdir unspecified.other "" &&
-    marked_as cvswork/subdir newfile.bin "" &&
-    marked_as cvswork/subdir newfile.c "" &&
-    marked_as cvswork simpleBin.bin -kb &&
-    marked_as cvswork simpleText.c ""
-
-ok 16 - cvs ci (guess)
-
-expecting success of 9401.17 'update subdir of other copy (guess)': 
-    (cd cvswork2/subdir &&
-    GIT_CONFIG="$git_config" cvs -Q update
-    ) &&
-    marked_as cvswork2 textfile.c "" &&
-    marked_as cvswork2 binfile.bin -kb &&
-    marked_as cvswork2 .gitattributes "" &&
-    marked_as cvswork2 mixedUp.c -kb &&
-    marked_as cvswork2 multiline.c -kb &&
-    marked_as cvswork2 multilineTxt.c "" &&
-    not_present cvswork2/subdir withCr.bin &&
-    not_present cvswork2/subdir file.h &&
-    marked_as cvswork2/subdir unspecified.other "" &&
-    marked_as cvswork2/subdir newfile.bin "" &&
-    marked_as cvswork2/subdir newfile.c "" &&
-    not_present cvswork2 simpleBin.bin &&
-    not_present cvswork2 simpleText.c
-
-cvs update: `subdir/file.h' is no longer in the repository
-cvs update: `subdir/withCr.bin' is no longer in the repository
-ok 17 - update subdir of other copy (guess)
-
-expecting success of 9401.18 'update/merge full other copy (guess)': 
-    git pull gitcvs.git main &&
-    sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
-    mv ml.temp multilineTxt.c &&
-    git add multilineTxt.c &&
-    git commit -q -m "modify multiline file" >> "${WORKDIR}/marked.log" &&
-    git push gitcvs.git >/dev/null &&
-    (cd cvswork2 &&
-    sed "s/1/replaced_1/" < multilineTxt.c > ml.temp &&
-    mv ml.temp multilineTxt.c &&
-    GIT_CONFIG="$git_config" cvs update > cvs.log 2>&1
-    ) &&
-    marked_as cvswork2 textfile.c "" &&
-    marked_as cvswork2 binfile.bin -kb &&
-    marked_as cvswork2 .gitattributes "" &&
-    marked_as cvswork2 mixedUp.c -kb &&
-    marked_as cvswork2 multiline.c -kb &&
-    marked_as cvswork2 multilineTxt.c "" &&
-    not_present cvswork2/subdir withCr.bin &&
-    not_present cvswork2/subdir file.h &&
-    marked_as cvswork2/subdir unspecified.other "" &&
-    marked_as cvswork2/subdir newfile.bin "" &&
-    marked_as cvswork2/subdir newfile.c "" &&
-    marked_as cvswork2 simpleBin.bin -kb &&
-    marked_as cvswork2 simpleText.c "" &&
-    echo "line replaced_1" > tmpExpect2 &&
-    echo "line 2" >> tmpExpect2 &&
-    echo "line replaced_3" >> tmpExpect2 &&
-    echo "line 4" | q_to_nul >> tmpExpect2 &&
-    cmp cvswork2/multilineTxt.c tmpExpect2
-
-From gitcvs
- * branch            main       -> FETCH_HEAD
-Updating 509c7f1..11562e1
-Fast-forward
- simpleBin.bin     | Bin 0 -> 27 bytes
- simpleText.c      |   1 +
- subdir/file.h     |   1 -
- subdir/withCr.bin |   1 -
- 4 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 simpleBin.bin
- create mode 100644 simpleText.c
- delete mode 100644 subdir/file.h
- delete mode 100644 subdir/withCr.bin
-To gitcvs.git
-   11562e1..e3c7165  main -> main
-ok 18 - update/merge full other copy (guess)
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9500-gitweb-standalone-no-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9500-gitweb-standalone-no-errors/.git/
-expecting success of 9500.1 'no commits: projects_list (implicit)': gitweb_run
-ok 1 - no commits: projects_list (implicit)
-
-expecting success of 9500.2 'no commits: projects_index': gitweb_run "a=project_index"
-ok 2 - no commits: projects_index
-
-expecting success of 9500.3 'no commits: .git summary (implicit)': gitweb_run "p=.git"
-ok 3 - no commits: .git summary (implicit)
-
-expecting success of 9500.4 'no commits: .git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
-ok 4 - no commits: .git commit (implicit HEAD)
-
-expecting success of 9500.5 'no commits: .git commitdiff (implicit HEAD)': gitweb_run "p=.git;a=commitdiff"
-ok 5 - no commits: .git commitdiff (implicit HEAD)
-
-expecting success of 9500.6 'no commits: .git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
-ok 6 - no commits: .git tree (implicit HEAD)
-
-expecting success of 9500.7 'no commits: .git heads': gitweb_run "p=.git;a=heads"
-ok 7 - no commits: .git heads
-
-expecting success of 9500.8 'no commits: .git tags': gitweb_run "p=.git;a=tags"
-ok 8 - no commits: .git tags
-
-expecting success of 9500.9 'Make initial commit': echo "Not an empty file." >file &&
-	 git add file &&
-	 git commit -a -m "Initial commit." &&
-	 git branch b
-[main (root-commit) f6e1c08] Initial commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 9 - Make initial commit
-
-expecting success of 9500.10 'projects_list (implicit)': gitweb_run
-ok 10 - projects_list (implicit)
-
-expecting success of 9500.11 'projects_index': gitweb_run "a=project_index"
-ok 11 - projects_index
-
-expecting success of 9500.12 '.git summary (implicit)': gitweb_run "p=.git"
-ok 12 - .git summary (implicit)
-
-expecting success of 9500.13 '.git commit (implicit HEAD)': gitweb_run "p=.git;a=commit"
-ok 13 - .git commit (implicit HEAD)
-
-expecting success of 9500.14 '.git commitdiff (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff"
-ok 14 - .git commitdiff (implicit HEAD, root commit)
-
-expecting success of 9500.15 '.git commitdiff_plain (implicit HEAD, root commit)': gitweb_run "p=.git;a=commitdiff_plain"
-ok 15 - .git commitdiff_plain (implicit HEAD, root commit)
-
-expecting success of 9500.16 '.git commit (HEAD)': gitweb_run "p=.git;a=commit;h=HEAD"
-ok 16 - .git commit (HEAD)
-
-expecting success of 9500.17 '.git tree (implicit HEAD)': gitweb_run "p=.git;a=tree"
-ok 17 - .git tree (implicit HEAD)
-
-expecting success of 9500.18 '.git blob (file)': gitweb_run "p=.git;a=blob;f=file"
-ok 18 - .git blob (file)
-
-expecting success of 9500.19 '.git blob_plain (file)': gitweb_run "p=.git;a=blob_plain;f=file"
-ok 19 - .git blob_plain (file)
-
-expecting success of 9500.20 '.git commit (non-existent)': gitweb_run "p=.git;a=commit;h=non-existent"
-ok 20 - .git commit (non-existent)
-
-expecting success of 9500.21 '.git commitdiff (non-existent)': gitweb_run "p=.git;a=commitdiff;h=non-existent"
-ok 21 - .git commitdiff (non-existent)
-
-expecting success of 9500.22 '.git commitdiff (non-existent vs HEAD)': gitweb_run "p=.git;a=commitdiff;hp=non-existent;h=HEAD"
-ok 22 - .git commitdiff (non-existent vs HEAD)
-
-expecting success of 9500.23 '.git tree (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tree;h=0000000000000000000000000000000000000000"
-ok 23 - .git tree (0000000000000000000000000000000000000000)
-
-expecting success of 9500.24 '.git tag (0000000000000000000000000000000000000000)': gitweb_run "p=.git;a=tag;h=0000000000000000000000000000000000000000"
-ok 24 - .git tag (0000000000000000000000000000000000000000)
-
-expecting success of 9500.25 '.git blob (non-existent)': gitweb_run "p=.git;a=blob;f=non-existent"
-ok 25 - .git blob (non-existent)
-
-expecting success of 9500.26 '.git blob_plain (non-existent)': gitweb_run "p=.git;a=blob_plain;f=non-existent"
-ok 26 - .git blob_plain (non-existent)
-
-expecting success of 9500.27 'commitdiff(0): root': gitweb_run "p=.git;a=commitdiff"
-ok 27 - commitdiff(0): root
-
-expecting success of 9500.28 'commitdiff(0): file added': echo "New file" >new_file &&
-	 git add new_file &&
-	 git commit -a -m "File added." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main aef3daf] File added.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new_file
-ok 28 - commitdiff(0): file added
-
-expecting success of 9500.29 'commitdiff(0): mode change': test_chmod +x new_file &&
-	 git commit -a -m "Mode changed." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main 4d63074] Mode changed.
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 new_file
-ok 29 - commitdiff(0): mode change
-
-expecting success of 9500.30 'commitdiff(0): file renamed': git mv new_file renamed_file &&
-	 git commit -a -m "File renamed." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main c3af6e3] File renamed.
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename new_file => renamed_file (100%)
-ok 30 - commitdiff(0): file renamed
-
-expecting success of 9500.31 'commitdiff(0): file to symlink': rm renamed_file &&
-	 test_ln_s_add file renamed_file &&
-	 git commit -a -m "File to symlink." &&
-	 gitweb_run "p=.git;a=commitdiff"
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[main 9d683f7] File to symlink.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100755 => 120000 renamed_file
-ok 31 - commitdiff(0): file to symlink
-
-expecting success of 9500.32 'commitdiff(0): file deleted': git rm renamed_file &&
-	 rm -f renamed_file &&
-	 git commit -a -m "File removed." &&
-	 gitweb_run "p=.git;a=commitdiff"
-rm 'renamed_file'
-[main a32c3dd] File removed.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 120000 renamed_file
-ok 32 - commitdiff(0): file deleted
-
-expecting success of 9500.33 'commitdiff(0): file copied / new file': cp file file2 &&
-	 git add file2 &&
-	 git commit -a -m "File copied." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main 13afdf6] File copied.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 33 - commitdiff(0): file copied / new file
-
-expecting success of 9500.34 'commitdiff(0): mode change and modified': echo "New line" >>file2 &&
-	 test_chmod +x file2 &&
-	 git commit -a -m "Mode change and modification." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main b2fe804] Mode change and modification.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- mode change 100644 => 100755 file2
-ok 34 - commitdiff(0): mode change and modified
-
-expecting success of 9500.35 'commitdiff(0): renamed and modified': cat >file2<<EOF &&
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-	 git commit -a -m "File added." &&
-	 git mv file2 file3 &&
-	 echo "Propter nomen suum." >>file3 &&
-	 git commit -a -m "File rename and modification." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main ce1348f] File added.
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+), 2 deletions(-)
-[main 763e503] File rename and modification.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename file2 => file3 (90%)
-ok 35 - commitdiff(0): renamed and modified
-
-expecting success of 9500.36 'commitdiff(0): renamed, mode change and modified': git mv file3 file2 &&
-	 echo "Propter nomen suum." >>file2 &&
-	 test_chmod +x file2 &&
-	 git commit -a -m "File rename, mode change and modification." &&
-	 gitweb_run "p=.git;a=commitdiff"
-[main 54200a9] File rename, mode change and modification.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename file3 => file2 (91%)
-ok 36 - commitdiff(0): renamed, mode change and modified
-
-expecting success of 9500.37 'setup typechange commits': 
-	echo "hello world" >foo &&
-	echo "hi planet" >bar &&
-	git update-index --add foo bar &&
-	git commit -m initial &&
-	git branch initial &&
-	rm -f foo &&
-	test_ln_s_add bar foo &&
-	git commit -m "foo symlinked to bar" &&
-	git branch foo-symlinked-to-bar &&
-	rm -f foo &&
-	echo "how far is the sun?" >foo &&
-	git update-index foo &&
-	git commit -m "foo back to file" &&
-	git branch foo-back-to-file &&
-	rm -f foo &&
-	git update-index --remove foo &&
-	mkdir foo &&
-	echo "if only I knew" >foo/baz &&
-	git update-index --add foo/baz &&
-	git commit -m "foo becomes a directory" &&
-	git branch "foo-becomes-a-directory" &&
-	echo "hello world" >foo/baz &&
-	git update-index foo/baz &&
-	git commit -m "foo/baz is the original foo" &&
-	git branch foo-baz-renamed-from-foo
-	
-[main 1c15952] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-[main fc2bb47] foo symlinked to bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100644 => 120000 foo
-[main 4ac81f8] foo back to file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 120000 => 100644 foo
-[main e02950a] foo becomes a directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 foo
- create mode 100644 foo/baz
-[main 758ecec] foo/baz is the original foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 37 - setup typechange commits
-
-expecting success of 9500.38 'commitdiff(2): file renamed from foo to foo/baz': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-baz-renamed-from-foo"
-ok 38 - commitdiff(2): file renamed from foo to foo/baz
-
-expecting success of 9500.39 'commitdiff(2): file renamed from foo/baz to foo': gitweb_run "p=.git;a=commitdiff;hp=foo-baz-renamed-from-foo;h=initial"
-ok 39 - commitdiff(2): file renamed from foo/baz to foo
-
-expecting success of 9500.40 'commitdiff(2): directory becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=initial"
-ok 40 - commitdiff(2): directory becomes file
-
-expecting success of 9500.41 'commitdiff(2): file becomes directory': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-becomes-a-directory"
-ok 41 - commitdiff(2): file becomes directory
-
-expecting success of 9500.42 'commitdiff(2): file becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=initial;h=foo-symlinked-to-bar"
-ok 42 - commitdiff(2): file becomes symlink
-
-expecting success of 9500.43 'commitdiff(2): symlink becomes file': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-back-to-file"
-ok 43 - commitdiff(2): symlink becomes file
-
-expecting success of 9500.44 'commitdiff(2): symlink becomes directory': gitweb_run "p=.git;a=commitdiff;hp=foo-symlinked-to-bar;h=foo-becomes-a-directory"
-ok 44 - commitdiff(2): symlink becomes directory
-
-expecting success of 9500.45 'commitdiff(2): directory becomes symlink': gitweb_run "p=.git;a=commitdiff;hp=foo-becomes-a-directory;h=foo-symlinked-to-bar"
-ok 45 - commitdiff(2): directory becomes symlink
-
-expecting success of 9500.46 'setup incomplete lines': 
-	cat >file<<-\EOF &&
-	Dominus regit me,
-	et nihil mihi deerit.
-	In loco pascuae ibi me collocavit,
-	super aquam refectionis educavit me;
-	animam meam convertit,
-	deduxit me super semitas jusitiae,
-	propter nomen suum.
-	CHANGE_ME
-	EOF
-	git commit -a -m "Preparing for incomplete lines" &&
-	echo "incomplete" | tr -d "\\012" >>file &&
-	git commit -a -m "Add incomplete line" &&
-	git tag incomplete_lines_add &&
-	sed -e s/CHANGE_ME/change_me/ <file >file+ &&
-	mv -f file+ file &&
-	git commit -a -m "Incomplete context line" &&
-	git tag incomplete_lines_ctx &&
-	echo "Dominus regit me," >file &&
-	echo "incomplete line" | tr -d "\\012" >>file &&
-	git commit -a -m "Change incomplete line" &&
-	git tag incomplete_lines_chg &&
-	echo "Dominus regit me," >file &&
-	git commit -a -m "Remove incomplete line" &&
-	git tag incomplete_lines_rem
-
-[main 726d325] Preparing for incomplete lines
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+), 1 deletion(-)
-[main 5ece9db] Add incomplete line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 7182367] Incomplete context line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 19ad71b] Change incomplete line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 8 deletions(-)
-[main 08fef32] Remove incomplete line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-ok 46 - setup incomplete lines
-
-expecting success of 9500.47 'commitdiff(1): addition of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add"
-
-ok 47 - commitdiff(1): addition of incomplete line
-
-expecting success of 9500.48 'commitdiff(1): incomplete line as context line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx"
-
-ok 48 - commitdiff(1): incomplete line as context line
-
-expecting success of 9500.49 'commitdiff(1): change incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg"
-
-ok 49 - commitdiff(1): change incomplete line
-
-expecting success of 9500.50 'commitdiff(1): removal of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem"
-
-ok 50 - commitdiff(1): removal of incomplete line
-
-expecting success of 9500.51 'Create a merge': git checkout b &&
-	 echo "Branch" >>b &&
-	 git add b &&
-	 git commit -a -m "On branch" &&
-	 git checkout main &&
-	 git merge b &&
-	 git tag merge_commit
-Switched to branch 'b'
-[b 3f8100f] On branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- b | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-ok 51 - Create a merge
-
-expecting success of 9500.52 'commit(0): merge commit': gitweb_run "p=.git;a=commit"
-ok 52 - commit(0): merge commit
-
-expecting success of 9500.53 'commitdiff(0): merge commit': gitweb_run "p=.git;a=commitdiff"
-ok 53 - commitdiff(0): merge commit
-
-expecting success of 9500.54 'Prepare large commit': git checkout b &&
-	 echo "To be changed" >01-change &&
-	 echo "To be renamed" >02-pure-rename-from &&
-	 echo "To be deleted" >03-delete &&
-	 echo "To be renamed and changed" >04-rename-from &&
-	 echo "To have mode changed" >05-mode-change &&
-	 echo "File to symlink" >06-file-or-symlink &&
-	 echo "To be changed and have mode changed" >07-change-mode-change &&
-	 git add 0* &&
-	 git commit -a -m "Prepare large commit" &&
-	 echo "Changed" >01-change &&
-	 git mv 02-pure-rename-from 02-pure-rename-to &&
-	 git rm 03-delete && rm -f 03-delete &&
-	 echo "A new file" >03-new &&
-	 git add 03-new &&
-	 git mv 04-rename-from 04-rename-to &&
-	 echo "Changed" >>04-rename-to &&
-	 test_chmod +x 05-mode-change &&
-	 rm -f 06-file-or-symlink &&
-	 test_ln_s_add 01-change 06-file-or-symlink &&
-	 echo "Changed and have mode changed" >07-change-mode-change &&
-	 test_chmod +x 07-change-mode-change &&
-	 git commit -a -m "Large commit" &&
-	 git checkout main
-Switched to branch 'b'
-[b 42d1b13] Prepare large commit
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 01-change
- create mode 100644 02-pure-rename-from
- create mode 100644 03-delete
- create mode 100644 04-rename-from
- create mode 100644 05-mode-change
- create mode 100644 06-file-or-symlink
- create mode 100644 07-change-mode-change
-rm '03-delete'
-[b a99c658] Large commit
- Author: A U Thor <author@example.com>
- 8 files changed, 5 insertions(+), 4 deletions(-)
- rename 02-pure-rename-from => 02-pure-rename-to (100%)
- delete mode 100644 03-delete
- create mode 100644 03-new
- rename 04-rename-from => 04-rename-to (76%)
- mode change 100644 => 100755 05-mode-change
- mode change 100644 => 120000 06-file-or-symlink
- mode change 100644 => 100755 07-change-mode-change
-Switched to branch 'main'
-ok 54 - Prepare large commit
-
-expecting success of 9500.55 'commit(1): large commit': gitweb_run "p=.git;a=commit;h=b"
-ok 55 - commit(1): large commit
-
-expecting success of 9500.56 'commitdiff(1): large commit': gitweb_run "p=.git;a=commitdiff;h=b"
-ok 56 - commitdiff(1): large commit
-
-expecting success of 9500.57 'side-by-side: addition of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_add;ds=sidebyside"
-
-ok 57 - side-by-side: addition of incomplete line
-
-expecting success of 9500.58 'side-by-side: incomplete line as context line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_ctx;ds=sidebyside"
-
-ok 58 - side-by-side: incomplete line as context line
-
-expecting success of 9500.59 'side-by-side: changed incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_chg;ds=sidebyside"
-
-ok 59 - side-by-side: changed incomplete line
-
-expecting success of 9500.60 'side-by-side: removal of incomplete line': 
-	gitweb_run "p=.git;a=commitdiff;h=incomplete_lines_rem;ds=sidebyside"
-
-ok 60 - side-by-side: removal of incomplete line
-
-expecting success of 9500.61 'side-by-side: merge commit': 
-	gitweb_run "p=.git;a=commitdiff;h=merge_commit;ds=sidebyside"
-
-ok 61 - side-by-side: merge commit
-
-expecting success of 9500.62 'tags: list of different types of tags': git checkout main &&
-	 git tag -a -m "Tag commit object" tag-commit HEAD &&
-	 git tag -a -m "" tag-commit-nomessage HEAD &&
-	 git tag -a -m "Tag tag object" tag-tag tag-commit &&
-	 git tag -a -m "Tag tree object" tag-tree HEAD^{tree} &&
-	 git tag -a -m "Tag blob object" tag-blob HEAD:file &&
-	 git tag lightweight/tag-commit HEAD &&
-	 git tag lightweight/tag-tag tag-commit &&
-	 git tag lightweight/tag-tree HEAD^{tree} &&
-	 git tag lightweight/tag-blob HEAD:file &&
-	 gitweb_run "p=.git;a=tags"
-Already on 'main'
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f tag-tag tag-commit^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-ok 62 - tags: list of different types of tags
-
-expecting success of 9500.63 'tag: Tag to commit object': gitweb_run "p=.git;a=tag;h=tag-commit"
-ok 63 - tag: Tag to commit object
-
-expecting success of 9500.64 'tag: on lightweight tag (invalid)': gitweb_run "p=.git;a=tag;h=lightweight/tag-commit"
-ok 64 - tag: on lightweight tag (invalid)
-
-expecting success of 9500.65 'logs: log (implicit HEAD)': gitweb_run "p=.git;a=log"
-ok 65 - logs: log (implicit HEAD)
-
-expecting success of 9500.66 'logs: shortlog (implicit HEAD)': gitweb_run "p=.git;a=shortlog"
-ok 66 - logs: shortlog (implicit HEAD)
-
-expecting success of 9500.67 'logs: history (implicit HEAD, file)': gitweb_run "p=.git;a=history;f=file"
-ok 67 - logs: history (implicit HEAD, file)
-
-expecting success of 9500.68 'logs: history (implicit HEAD, non-existent file)': gitweb_run "p=.git;a=history;f=non-existent"
-ok 68 - logs: history (implicit HEAD, non-existent file)
-
-expecting success of 9500.69 'logs: history (implicit HEAD, deleted file)': git checkout main &&
-	 echo "to be deleted" >deleted_file &&
-	 git add deleted_file &&
-	 git commit -m "Add file to be deleted" &&
-	 git rm deleted_file &&
-	 git commit -m "Delete file" &&
-	 gitweb_run "p=.git;a=history;f=deleted_file"
-Already on 'main'
-[main 0b30cc4] Add file to be deleted
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deleted_file
-rm 'deleted_file'
-[main 07aeaf6] Delete file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 deleted_file
-ok 69 - logs: history (implicit HEAD, deleted file)
-
-expecting success of 9500.70 'path_info: project': gitweb_run "" "/.git"
-ok 70 - path_info: project
-
-expecting success of 9500.71 'path_info: project/branch': gitweb_run "" "/.git/b"
-ok 71 - path_info: project/branch
-
-expecting success of 9500.72 'path_info: project/branch:file': gitweb_run "" "/.git/main:file"
-ok 72 - path_info: project/branch:file
-
-expecting success of 9500.73 'path_info: project/branch:dir/': gitweb_run "" "/.git/main:foo/"
-ok 73 - path_info: project/branch:dir/
+	EOF
 
-expecting success of 9500.74 'path_info: project/branch (non-existent)': gitweb_run "" "/.git/non-existent"
-ok 74 - path_info: project/branch (non-existent)
+ok 144 - git switch - with -c, complete all references
 
-expecting success of 9500.75 'path_info: project/branch:filename (non-existent branch)': gitweb_run "" "/.git/non-existent:non-existent"
-ok 75 - path_info: project/branch:filename (non-existent branch)
+expecting success of 9902.145 'git switch - with -C, complete all references': 
+	test_completion "git switch -C new-branch " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.76 'path_info: project/branch:file (non-existent)': gitweb_run "" "/.git/main:non-existent"
-ok 76 - path_info: project/branch:file (non-existent)
+ok 145 - git switch - with -C, complete all references
 
-expecting success of 9500.77 'path_info: project/branch:dir/ (non-existent)': gitweb_run "" "/.git/main:non-existent/"
-ok 77 - path_info: project/branch:dir/ (non-existent)
+expecting success of 9902.146 'git switch - with -c and --track, complete all references': 
+	test_completion "git switch -c new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.78 'path_info: project/branch:/file': gitweb_run "" "/.git/main:/file"
-ok 78 - path_info: project/branch:/file
+ok 146 - git switch - with -c and --track, complete all references
 
-expecting success of 9500.79 'path_info: project/:/file (implicit HEAD)': gitweb_run "" "/.git/:/file"
-ok 79 - path_info: project/:/file (implicit HEAD)
+expecting success of 9902.147 'git switch - with -C and --track, complete all references': 
+	test_completion "git switch -C new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.80 'path_info: project/:/ (implicit HEAD, top tree)': gitweb_run "" "/.git/:/"
-ok 80 - path_info: project/:/ (implicit HEAD, top tree)
+ok 147 - git switch - with -C and --track, complete all references
 
-expecting success of 9500.81 'feeds: OPML': gitweb_run "a=opml"
-ok 81 - feeds: OPML
+expecting success of 9902.148 'git switch - with -c and --no-track, complete all references': 
+	test_completion "git switch -c new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.82 'feed: RSS': gitweb_run "p=.git;a=rss"
-ok 82 - feed: RSS
+ok 148 - git switch - with -c and --no-track, complete all references
 
-expecting success of 9500.83 'feed: Atom': gitweb_run "p=.git;a=atom"
-ok 83 - feed: Atom
+expecting success of 9902.149 'git switch - with -C and --no-track, complete all references': 
+	test_completion "git switch -C new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.84 'encode(commit): utf8': . "$TEST_DIRECTORY"/t3901/utf8.txt &&
-	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
-	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
-	 echo "UTF-8" >>file &&
-	 git add file &&
-	 git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
-	 gitweb_run "p=.git;a=commit"
-[main 18589a2] ÄËÑ�Ö
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 84 - encode(commit): utf8
+ok 149 - git switch - with -C and --no-track, complete all references
 
-expecting success of 9500.85 'encode(commit): iso-8859-1': . "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
-	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
-	 echo "ISO-8859-1" >>file &&
-	 git add file &&
-	 test_config i18n.commitencoding ISO-8859-1 &&
-	 git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
-	 gitweb_run "p=.git;a=commit"
-[main c6c3c80] ÄËÑ�Ö
- Author: Áéí óú <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 85 - encode(commit): iso-8859-1
+expecting success of 9902.150 'git checkout - with -b, complete all references': 
+	test_completion "git checkout -b new-branch " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.86 'encode(log): utf-8 and iso-8859-1': gitweb_run "p=.git;a=log"
-ok 86 - encode(log): utf-8 and iso-8859-1
+ok 150 - git checkout - with -b, complete all references
 
-expecting success of 9500.87 'opt: log --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
-ok 87 - opt: log --no-merges
+expecting success of 9902.151 'git checkout - with -B, complete all references': 
+	test_completion "git checkout -B new-branch " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.88 'opt: atom --no-merges': gitweb_run "p=.git;a=log;opt=--no-merges"
-ok 88 - opt: atom --no-merges
+ok 151 - git checkout - with -B, complete all references
 
-expecting success of 9500.89 'opt: "file" history --no-merges': gitweb_run "p=.git;a=history;f=file;opt=--no-merges"
-ok 89 - opt: "file" history --no-merges
+expecting success of 9902.152 'git checkout - with -b and --track, complete all references': 
+	test_completion "git checkout -b new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.90 'opt: log --no-such-option (invalid option)': gitweb_run "p=.git;a=log;opt=--no-such-option"
-ok 90 - opt: log --no-such-option (invalid option)
+ok 152 - git checkout - with -b and --track, complete all references
 
-expecting success of 9500.91 'opt: tree --no-merges (invalid option for action)': gitweb_run "p=.git;a=tree;opt=--no-merges"
-ok 91 - opt: tree --no-merges (invalid option for action)
+expecting success of 9902.153 'git checkout - with -B and --track, complete all references': 
+	test_completion "git checkout -B new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.92 'URL: no project URLs, no base URL': gitweb_run "p=.git;a=summary"
-ok 92 - URL: no project URLs, no base URL
+ok 153 - git checkout - with -B and --track, complete all references
 
-expecting success of 9500.93 'URL: project URLs via gitweb.url': git config --add gitweb.url git://example.com/git/trash.git &&
-        git config --add gitweb.url http://example.com/git/trash.git &&
-        gitweb_run "p=.git;a=summary"
-ok 93 - URL: project URLs via gitweb.url
+expecting success of 9902.154 'git checkout - with -b and --no-track, complete all references': 
+	test_completion "git checkout -b new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.94 'URL: project URLs via cloneurl file': gitweb_run "p=.git;a=summary"
-ok 94 - URL: project URLs via cloneurl file
+ok 154 - git checkout - with -b and --no-track, complete all references
 
-expecting success of 9500.95 'config override: projects list (implicit)': gitweb_run
-ok 95 - config override: projects list (implicit)
+expecting success of 9902.155 'git checkout - with -B and --no-track, complete all references': 
+	test_completion "git checkout -B new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-expecting success of 9500.96 'config override: tree view, features not overridden in repo config': gitweb_run "p=.git;a=tree"
-ok 96 - config override: tree view, features not overridden in repo config
+ok 155 - git checkout - with -B and --no-track, complete all references
 
-expecting success of 9500.97 'config override: tree view, features disabled in repo config': git config gitweb.blame no &&
-	 git config gitweb.snapshot none &&
-	 git config gitweb.avatar gravatar &&
-	 gitweb_run "p=.git;a=tree"
-ok 97 - config override: tree view, features disabled in repo config
+expecting success of 9902.156 'git switch - for -c, complete local branches and unique remote branches': 
+	test_completion "git switch -c " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.98 'config override: tree view, features enabled in repo config (1)': git config gitweb.blame yes &&
-	 git config gitweb.snapshot "zip,tgz, tbz2" &&
-	 gitweb_run "p=.git;a=tree"
-ok 98 - config override: tree view, features enabled in repo config (1)
+ok 156 - git switch - for -c, complete local branches and unique remote branches
 
-expecting success of 9500.99 'setup': 
-	version=$(git config core.repositoryformatversion) &&
-	algo=$(test_might_fail git config extensions.objectformat) &&
-	refstorage=$(test_might_fail git config extensions.refstorage) &&
-	cat >.git/config <<-\EOF &&
-	# testing noval and alternate separator
-	[gitweb]
-		blame
-		snapshot = zip tgz
+expecting success of 9902.157 'git switch - for -C, complete local branches and unique remote branches': 
+	test_completion "git switch -C " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
 	EOF
-	git config core.repositoryformatversion "$version" &&
-	if test -n "$algo"
-	then
-		git config extensions.objectformat "$algo"
-	fi &&
-	if test -n "$refstorage"
-	then
-		git config extensions.refstorage "$refstorage"
-	fi
-
-ok 99 - setup
 
-expecting success of 9500.100 'config override: tree view, features enabled in repo config (2)': gitweb_run "p=.git;a=tree"
-ok 100 - config override: tree view, features enabled in repo config (2)
+ok 157 - git switch - for -C, complete local branches and unique remote branches
 
-expecting success of 9500.101 'search: preparation': echo "1st MATCH" >>file &&
-	 echo "2nd MATCH" >>file &&
-	 echo "MATCH" >>bar &&
-	 git add file bar &&
-	 git commit -m "Added MATCH word"
-[main 13113e4] Added MATCH word
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
-ok 101 - search: preparation
+expecting success of 9902.158 'git switch - for -c with --no-guess, complete local branches only': 
+	test_completion "git switch --no-guess -c " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.102 'search: commit author': gitweb_run "p=.git;a=search;h=HEAD;st=author;s=A+U+Thor"
-ok 102 - search: commit author
+ok 158 - git switch - for -c with --no-guess, complete local branches only
 
-expecting success of 9500.103 'search: commit message': gitweb_run "p=.git;a=search;h=HEAD;st=commitr;s=MATCH"
-ok 103 - search: commit message
+expecting success of 9902.159 'git switch - for -C with --no-guess, complete local branches only': 
+	test_completion "git switch --no-guess -C " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.104 'search: grep': gitweb_run "p=.git;a=search;h=HEAD;st=grep;s=MATCH"
-ok 104 - search: grep
+ok 159 - git switch - for -C with --no-guess, complete local branches only
 
-expecting success of 9500.105 'search: pickaxe': gitweb_run "p=.git;a=search;h=HEAD;st=pickaxe;s=MATCH"
-ok 105 - search: pickaxe
+expecting success of 9902.160 'git switch - for -c with --no-track, complete local branches only': 
+	test_completion "git switch --no-track -c " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.106 'search: projects': gitweb_run "a=project_list;s=.git"
-ok 106 - search: projects
+ok 160 - git switch - for -c with --no-track, complete local branches only
 
-expecting success of 9500.107 'README.html with non-ASCII characters (utf-8)': echo "<b>UTF-8 example:</b><br />" >.git/README.html &&
-	 cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html &&
-	 gitweb_run "p=.git;a=summary"
-ok 107 - README.html with non-ASCII characters (utf-8)
+expecting success of 9902.161 'git switch - for -C with --no-track, complete local branches only': 
+	test_completion "git switch --no-track -C " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-Skipping syntax highlighting tests: 'highlight' not found
-ok 108 # skip syntax highlighting (no highlight, unknown syntax) (missing HIGHLIGHT)
+ok 161 - git switch - for -C with --no-track, complete local branches only
 
-ok 109 # skip syntax highlighting (highlighted, shell script) (missing HIGHLIGHT)
+expecting success of 9902.162 'git checkout - for -b, complete local branches and unique remote branches': 
+	test_completion "git checkout -b " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
 
-ok 110 # skip syntax highlighting (highlighter language autodetection) (missing HIGHLIGHT)
+ok 162 - git checkout - for -b, complete local branches and unique remote branches
 
-expecting success of 9500.111 'forks: prepare': git init --bare foo.git &&
-	 git --git-dir=foo.git --work-tree=. add file &&
-	 git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
-	 echo "foo" >foo.git/description &&
-	 mkdir -p foo &&
-	 (cd foo &&
-	  git clone --shared --bare ../foo.git foo-forked.git &&
-	  echo "fork of foo" >foo-forked.git/description)
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9500-gitweb-standalone-no-errors/foo.git/
-[main (root-commit) cae743e] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 file
-Cloning into bare repository 'foo-forked.git'...
-done.
-ok 111 - forks: prepare
+expecting success of 9902.163 'git checkout - for -B, complete local branches and unique remote branches': 
+	test_completion "git checkout -B " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.112 'forks: projects list': gitweb_run
-ok 112 - forks: projects list
+ok 163 - git checkout - for -B, complete local branches and unique remote branches
 
-expecting success of 9500.113 'forks: forks action': gitweb_run "p=foo.git;a=forks"
-ok 113 - forks: forks action
+expecting success of 9902.164 'git checkout - for -b with --no-guess, complete local branches only': 
+	test_completion "git checkout --no-guess -b " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.114 'ctags: tag cloud in projects list': mkdir .git/ctags &&
-	 echo "2" >.git/ctags/foo &&
-	 echo "1" >.git/ctags/bar &&
-	gitweb_run
-ok 114 - ctags: tag cloud in projects list
+ok 164 - git checkout - for -b with --no-guess, complete local branches only
 
-expecting success of 9500.115 'ctags: search projects by existing tag': gitweb_run "by_tag=foo"
-ok 115 - ctags: search projects by existing tag
+expecting success of 9902.165 'git checkout - for -B with --no-guess, complete local branches only': 
+	test_completion "git checkout --no-guess -B " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.116 'ctags: search projects by non existent tag': gitweb_run "by_tag=non-existent"
-ok 116 - ctags: search projects by non existent tag
+ok 165 - git checkout - for -B with --no-guess, complete local branches only
 
-expecting success of 9500.117 'ctags: malformed tag weights': mkdir -p .git/ctags &&
-	 echo "not-a-number" >.git/ctags/nan &&
-	 echo "not-a-number-2" >.git/ctags/nan2 &&
-	 echo "0.1" >.git/ctags/floating-point &&
-	 gitweb_run
-ok 117 - ctags: malformed tag weights
+expecting success of 9902.166 'git checkout - for -b with --no-track, complete local branches only': 
+	test_completion "git checkout --no-track -b " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-expecting success of 9500.118 'categories: projects list, only default category': echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
-	 gitweb_run
-ok 118 - categories: projects list, only default category
+ok 166 - git checkout - for -b with --no-track, complete local branches only
 
-expecting success of 9500.119 'unborn HEAD: "summary" page (with "heads" subview)': {
-		git checkout orphan_branch ||
-		git checkout --orphan orphan_branch
-	 } &&
-	 test_when_finished "git checkout main" &&
-	 gitweb_run "p=.git;a=summary"
-error: pathspec 'orphan_branch' did not match any file(s) known to git
-Switched to a new branch 'orphan_branch'
-Switched to branch 'main'
-ok 119 - unborn HEAD: "summary" page (with "heads" subview)
+expecting success of 9902.167 'git checkout - for -B with --no-track, complete local branches only': 
+	test_completion "git checkout --no-track -B " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
 
-# passed all 119 test(s)
-1..119
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9400-git-cvsserver-server.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9400-git-cvsserver-server/.git/
-expecting success of 9400.1 'setup': 
-  git config push.default matching &&
-  echo >empty &&
-  git add empty &&
-  git commit -q -m "First Commit" &&
-  mkdir secondroot &&
-  ( cd secondroot &&
-  git init &&
-  touch secondrootfile &&
-  git add secondrootfile &&
-  git commit -m "second root") &&
-  git fetch secondroot main &&
-  git merge --allow-unrelated-histories FETCH_HEAD &&
-  git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
-  GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-  GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
-  GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
-  echo "cvsuser:$PWDHASH" >"$SERVERDIR/auth.db"
+ok 167 - git checkout - for -B with --no-track, complete local branches only
 
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9400-git-cvsserver-server/secondroot/.git/
-[main (root-commit) 0fe3a5e] second root
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 secondrootfile
-From secondroot
- * branch            main       -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- secondrootfile | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 secondrootfile
-ok 1 - setup
+expecting success of 9902.168 'git switch - with --orphan completes local branch names and unique remote branch names': 
+	test_completion "git switch --orphan " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
 
-expecting success of 9400.2 'basic checkout': 
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork main &&
-	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
-	test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"
+ok 168 - git switch - with --orphan completes local branch names and unique remote branch names
 
-U cvswork/empty
-U cvswork/secondrootfile
-ok 2 - basic checkout
+expecting success of 9902.169 'git switch - --orphan with branch already provided completes nothing else': 
+	test_completion "git switch --orphan main " <<-\EOF
 
-expecting success of 9400.3 'pserver authentication': 
-	git-cvsserver pserver <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+	EOF
 
-I LOVE YOU
-ok 3 - pserver authentication
+ok 169 - git switch - --orphan with branch already provided completes nothing else
 
-expecting success of 9400.4 'pserver authentication failure (non-anonymous user)': 
-	if git-cvsserver pserver <request-git >log 2>&1
-	then
-	    false
-	else
-	    true
-	fi &&
-	sed -ne \$p log | grep "^I HATE YOU\$"
+expecting success of 9902.170 'git checkout - with --orphan completes local branch names and unique remote branch names': 
+	test_completion "git checkout --orphan " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
 
-I HATE YOU
-ok 4 - pserver authentication failure (non-anonymous user)
+ok 170 - git checkout - with --orphan completes local branch names and unique remote branch names
 
-expecting success of 9400.5 'pserver authentication success (non-anonymous user with password)': 
-	git-cvsserver pserver <login-git-ok >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9902.171 'git checkout - --orphan with branch already provided completes local refs for a start-point': 
+	test_completion "git checkout --orphan main " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/HEAD Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
 
-I LOVE YOU
-ok 5 - pserver authentication success (non-anonymous user with password)
+ok 171 - git checkout - --orphan with branch already provided completes local refs for a start-point
 
-expecting success of 9400.6 'pserver authentication (login)': 
-	git-cvsserver pserver <login-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9902.172 'git restore completes modified files': 
+	test_commit A a.file &&
+	echo B >a.file &&
+	test_completion "git restore a." <<-\EOF
+	a.file
+	EOF
 
-I LOVE YOU
-ok 6 - pserver authentication (login)
+[main 063945d] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.file
+ok 172 - git restore completes modified files
 
-expecting success of 9400.7 'pserver authentication failure (login/non-anonymous user)': 
-	if git-cvsserver pserver <login-git >log 2>&1
-	then
-	    false
-	else
-	    true
-	fi &&
-	sed -ne \$p log | grep "^I HATE YOU\$"
+expecting success of 9902.173 'teardown after ref completion': 
+	git branch -d matching-branch &&
+	git tag -d matching-tag &&
+	git remote remove other
 
-I HATE YOU
-ok 7 - pserver authentication failure (login/non-anonymous user)
+Deleted branch matching-branch (was 8b2b4f6).
+Deleted tag 'matching-tag' (was 8b2b4f6)
+ok 173 - teardown after ref completion
 
-expecting success of 9400.8 'req_Root failure (relative pathname)': 
-	if git-cvsserver pserver <request-relative >log 2>&1
+expecting success of 9902.174 'setup for path completion tests': 
+	mkdir simple-dir \
+	      "spaces in dir" \
+	      árvíztűrő &&
+	touch simple-dir/simple-file \
+	      "spaces in dir/spaces in file" \
+	      "árvíztűrő/Сайн �ваарай" &&
+	if test_have_prereq !MINGW &&
+	   mkdir BS\\dir \
+		 separatorsindir &&
+	   touch BS\\dir/DQ\"file \
+		 separatorsindir/sepinfile
 	then
-		echo unexpected success
-		false
+		test_set_prereq FUNNIERNAMES
 	else
-		true
-	fi &&
-	tail log | grep "^error 1 Root must be an absolute pathname$"
+		rm -rf BS\\dir separatorsindir
+	fi
 
-error 1 Root must be an absolute pathname
-ok 8 - req_Root failure (relative pathname)
+ok 174 - setup for path completion tests
 
-expecting success of 9400.9 'req_Root failure (conflicting roots)': 
-	git-cvsserver pserver <request-conflict >log 2>&1 &&
-	tail log | grep "^error 1 Conflicting roots specified$"
+expecting success of 9902.175 '__git_complete_index_file - simple': 
+	test_path_completion simple simple-dir &&  # Bash is supposed to
+						   # add the trailing /.
+	test_path_completion simple-dir/simple simple-dir/simple-file
 
-error 1 Conflicting roots specified
-ok 9 - req_Root failure (conflicting roots)
+ok 175 - __git_complete_index_file - simple
 
-expecting success of 9400.10 'req_Root (strict paths)': 
-	git-cvsserver --strict-paths pserver "$SERVERDIR" <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9902.176 '__git_complete_index_file - escaped characters on cmdline': 
+	test_path_completion spac "spaces in dir" &&  # Bash will turn this
+						      # into "spaces\ in\ dir"
+	test_path_completion "spaces\\ i" \
+			     "spaces in dir" &&
+	test_path_completion "spaces\\ in\\ dir/s" \
+			     "spaces in dir/spaces in file" &&
+	test_path_completion "spaces\\ in\\ dir/spaces\\ i" \
+			     "spaces in dir/spaces in file"
 
-I LOVE YOU
-ok 10 - req_Root (strict paths)
+ok 176 - __git_complete_index_file - escaped characters on cmdline
 
-expecting success of 9400.11 'req_Root failure (strict-paths)': 
-	! git-cvsserver --strict-paths pserver "$WORKDIR" <request-anonymous >log 2>&1
+expecting success of 9902.177 '__git_complete_index_file - quoted characters on cmdline': 
+	# Testing with an opening but without a corresponding closing
+	# double quote is important.
+	test_path_completion \"spac "spaces in dir" &&
+	test_path_completion "\"spaces i" \
+			     "spaces in dir" &&
+	test_path_completion "\"spaces in dir/s" \
+			     "spaces in dir/spaces in file" &&
+	test_path_completion "\"spaces in dir/spaces i" \
+			     "spaces in dir/spaces in file"
 
-ok 11 - req_Root failure (strict-paths)
+ok 177 - __git_complete_index_file - quoted characters on cmdline
 
-expecting success of 9400.12 'req_Root (w/o strict-paths)': 
-	git-cvsserver pserver "$WORKDIR/" <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9902.178 '__git_complete_index_file - UTF-8 in ls-files output': 
+	test_path_completion á árvíztűrő &&
+	test_path_completion árvíztűrő/С "árvíztűrő/Сайн �ваарай"
 
-I LOVE YOU
-ok 12 - req_Root (w/o strict-paths)
+ok 178 - __git_complete_index_file - UTF-8 in ls-files output
 
-expecting success of 9400.13 'req_Root failure (w/o strict-paths)': 
-	! git-cvsserver pserver "$WORKDIR/gitcvs" <request-anonymous >log 2>&1
+expecting success of 9902.179 '__git_complete_index_file - C-style escapes in ls-files output': 
+	test_path_completion BS \
+			     BS\\dir &&
+	test_path_completion BS\\\\d \
+			     BS\\dir &&
+	test_path_completion BS\\\\dir/DQ \
+			     BS\\dir/DQ\"file &&
+	test_path_completion BS\\\\dir/DQ\\\"f \
+			     BS\\dir/DQ\"file
 
-ok 13 - req_Root failure (w/o strict-paths)
+ok 179 - __git_complete_index_file - C-style escapes in ls-files output
 
-expecting success of 9400.14 'req_Root (base-path)': 
-	git-cvsserver --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9902.180 '__git_complete_index_file - \nnn-escaped characters in ls-files output': 
+	test_path_completion sep separatorsindir &&
+	test_path_completion separatorsi \
+			     separatorsindir &&
+	test_path_completion separatorsindir/sep \
+			     separatorsindir/sepinfile &&
+	test_path_completion separatorsindir/sepi \
+			     separatorsindir/sepinfile
 
-I LOVE YOU
-ok 14 - req_Root (base-path)
+ok 180 - __git_complete_index_file - \nnn-escaped characters in ls-files output
 
-expecting success of 9400.15 'req_Root failure (base-path)': 
-	! git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" <request-anonymous >log 2>&1
+expecting success of 9902.181 '__git_complete_index_file - removing repeated quoted path components': 
+	test_when_finished rm -r repeated-quoted &&
+	mkdir repeated-quoted &&      # A directory whose name in itself
+				      # would not be quoted ...
+	>repeated-quoted/0-file &&
+	>repeated-quoted/1\"file &&   # ... but here the file makes the
+				      # dirname quoted ...
+	>repeated-quoted/2-file &&
+	>repeated-quoted/3\"file &&   # ... and here, too.
 
-ok 15 - req_Root failure (base-path)
+	# Still, we shold only list the directory name only once.
+	test_path_completion repeated repeated-quoted
 
-expecting success of 9400.16 'req_Root (export-all)': 
-	git-cvsserver --export-all pserver "$WORKDIR" <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+ok 181 - __git_complete_index_file - removing repeated quoted path components
 
-I LOVE YOU
-ok 16 - req_Root (export-all)
+expecting success of 9902.182 'teardown after path completion tests': 
+	rm -rf simple-dir "spaces in dir" árvíztűrő \
+	       BS\\dir separatorsindir
 
-expecting success of 9400.17 'req_Root failure (export-all w/o directory list)': 
-	! (git-cvsserver --export-all pserver <request-anonymous >log 2>&1 || false)
-ok 17 - req_Root failure (export-all w/o directory list)
+ok 182 - teardown after path completion tests
 
-expecting success of 9400.18 'req_Root (everything together)': 
-	git-cvsserver --export-all --strict-paths --base-path "$WORKDIR/" pserver "$SERVERDIR" <request-base >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 9902.183 '__git_find_on_cmdline - single match': 
+	echo list >expect &&
+	(
+		words=(git command --opt list) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_cmp expect actual
 
-I LOVE YOU
-ok 18 - req_Root (everything together)
+ok 183 - __git_find_on_cmdline - single match
 
-expecting success of 9400.19 'gitcvs.enabled = false': GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
-   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
-   then
-     echo unexpected cvs success
-     false
-   else
-     true
-   fi &&
-   grep "GITCVS emulation disabled" cvs.log &&
-   test ! -d cvswork2
-GITCVS emulation disabled
-ok 19 - gitcvs.enabled = false
+expecting success of 9902.184 '__git_find_on_cmdline - multiple matches': 
+	echo remove >expect &&
+	(
+		words=(git command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_cmp expect actual
 
-expecting success of 9400.20 'gitcvs.ext.enabled = true': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2
+ok 184 - __git_find_on_cmdline - multiple matches
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 20 - gitcvs.ext.enabled = true
+expecting success of 9902.185 '__git_find_on_cmdline - no match': 
+	(
+		words=(git command --opt branch) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_must_be_empty actual
 
-expecting success of 9400.21 'gitcvs.ext.enabled = false': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-	if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
-	then
-		echo unexpected cvs success
-		false
-	else
-		true
-	fi &&
-	grep "GITCVS emulation disabled" cvs.log &&
-	test ! -d cvswork2
+ok 185 - __git_find_on_cmdline - no match
 
-GITCVS emulation disabled
-ok 21 - gitcvs.ext.enabled = false
+expecting success of 9902.186 '__git_find_on_cmdline - single match with index': 
+	echo "3 list" >expect &&
+	(
+		words=(git command --opt list) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
 
-expecting success of 9400.22 'gitcvs.dbname': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2 &&
-	test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
-	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"
+ok 186 - __git_find_on_cmdline - single match with index
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 22 - gitcvs.dbname
+expecting success of 9902.187 '__git_find_on_cmdline - multiple matches with index': 
+	echo "4 remove" >expect &&
+	(
+		words=(git command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
 
-expecting success of 9400.23 'gitcvs.ext.dbname': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2 &&
-	test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
-	test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
-	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"
+ok 187 - __git_find_on_cmdline - multiple matches with index
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 23 - gitcvs.ext.dbname
+expecting success of 9902.188 '__git_find_on_cmdline - no match with index': 
+	(
+		words=(git command --opt branch) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_must_be_empty actual
 
-expecting success of 9400.24 'cvs update (create new file)': 
-	echo testfile1 >testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Add testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
-	test_cmp testfile1 ../testfile1
+ok 188 - __git_find_on_cmdline - no match with index
 
-To gitcvs.git
-   4ea9390..3c6a419  main -> main
-U testfile1
-ok 24 - cvs update (create new file)
+expecting success of 9902.189 '__git_find_on_cmdline - ignores matches before command with index': 
+	echo "6 remove" >expect &&
+	(
+		words=(git -C remove command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=3 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
 
-expecting success of 9400.25 'cvs update (update existing file)': 
-	echo line 2 >>testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Append to testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
-	test_cmp testfile1 ../testfile1
+ok 189 - __git_find_on_cmdline - ignores matches before command with index
 
-To gitcvs.git
-   3c6a419..696e081  main -> main
-U testfile1
-ok 25 - cvs update (update existing file)
+expecting success of 9902.190 '__git_get_config_variables': 
+	cat >expect <<-EOF &&
+	name-1
+	name-2
+	EOF
+	test_config interesting.name-1 good &&
+	test_config interesting.name-2 good &&
+	test_config subsection.interesting.name-3 bad &&
+	__git_get_config_variables interesting >actual &&
+	test_cmp expect actual
 
-checking known breakage of 9400.26 'cvs update w/o -d doesn't create subdir (TODO)': 
-	mkdir test &&
-	echo >test/empty &&
-	git add test &&
-	git commit -q -m "Single Subdirectory" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test ! -d test
+ok 190 - __git_get_config_variables
 
-To gitcvs.git
-   696e081..33879bd  main -> main
-U test/empty
-not ok 26 - cvs update w/o -d doesn't create subdir (TODO) # TODO known breakage
+expecting success of 9902.191 '__git_pretty_aliases': 
+	cat >expect <<-EOF &&
+	author
+	hash
+	EOF
+	test_config pretty.author "%an %ae" &&
+	test_config pretty.hash %H &&
+	__git_pretty_aliases >actual &&
+	test_cmp expect actual
 
-expecting success of 9400.27 'cvs update (subdirectories)': 
-	(for dir in A A/B A/B/C A/D E; do
-		mkdir $dir &&
-		echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")"  &&
-		git add $dir || exit 1
-	done) &&
-	git commit -q -m "deep sub directory structure" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update -d &&
-	(for dir in A A/B A/B/C A/D E; do
-		filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
-		if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
-			test_cmp "$dir/$filename" "../$dir/$filename"; then
-		:
-		else
-			exit 1
-		fi
-	done)
+ok 191 - __git_pretty_aliases
 
-To gitcvs.git
-   33879bd..9436d83  main -> main
-U A/file_in_A
-U E/file_in_E
-U A/B/file_in_A B
-U A/D/file_in_A D
-U A/B/C/file_in_A B C
-ok 27 - cvs update (subdirectories)
+expecting success of 9902.192 'basic': 
+	run_completion "git " &&
+	# built-in
+	grep -q "^add \$" out &&
+	# script
+	grep -q "^rebase \$" out &&
+	# plumbing
+	! grep -q "^ls-files \$" out &&
 
-expecting success of 9400.28 'cvs update (delete file)': 
-	git rm testfile1 &&
-	git commit -q -m "Remove testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test -z "$(grep testfile1 CVS/Entries)" &&
-	test ! -f testfile1
+	run_completion "git r" &&
+	! grep -q -v "^r" out
 
-rm 'testfile1'
-To gitcvs.git
-   9436d83..09366c6  main -> main
-cvs update: `testfile1' is no longer in the repository
-ok 28 - cvs update (delete file)
+ok 192 - basic
 
-expecting success of 9400.29 'cvs update (re-add deleted file)': 
-	echo readded testfile >testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Re-Add testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
-	test_cmp testfile1 ../testfile1
+expecting success of 9902.193 'double dash "git" itself': 
+	test_completion "git --" <<-\EOF
+	--paginate Z
+	--no-pager Z
+	--git-dir=
+	--bare Z
+	--version Z
+	--exec-path Z
+	--exec-path=
+	--html-path Z
+	--man-path Z
+	--info-path Z
+	--work-tree=
+	--namespace=
+	--no-replace-objects Z
+	--help Z
+	EOF
 
-To gitcvs.git
-   09366c6..8ea0549  main -> main
-U testfile1
-ok 29 - cvs update (re-add deleted file)
+ok 193 - double dash "git" itself
 
-expecting success of 9400.30 'cvs update (merge)': 
-	echo Line 0 >expected &&
-	for i in 1 2 3 4 5 6 7
-	do
-		echo Line $i >>merge &&
-		echo Line $i >>expected || return 1
-	done &&
-	echo Line 8 >>expected &&
-	git add merge &&
-	git commit -q -m "Merge test (pre-merge)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
-	test_cmp merge ../merge &&
-	( echo Line 0 && cat merge ) >merge.tmp &&
-	mv merge.tmp merge &&
-	cd "$WORKDIR" &&
-	echo Line 8 >>merge &&
-	git add merge &&
-	git commit -q -m "Merge test (merge)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	sleep 1 && touch merge &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test_cmp merge ../expected
+expecting success of 9902.194 'double dash "git checkout"': 
+	test_completion "git checkout --" <<-\EOF
+	--quiet Z
+	--detach Z
+	--track Z
+	--orphan=Z
+	--ours Z
+	--theirs Z
+	--merge Z
+	--conflict=Z
+	--patch Z
+	--ignore-skip-worktree-bits Z
+	--ignore-other-worktrees Z
+	--recurse-submodules Z
+	--progress Z
+	--guess Z
+	--no-guess Z
+	--no-... Z
+	--overlay Z
+	--pathspec-file-nul Z
+	--pathspec-from-file=Z
+	EOF
 
-To gitcvs.git
-   8ea0549..f31ee25  main -> main
-U merge
-To gitcvs.git
-   f31ee25..792463d  main -> main
-Merging differences between 1.1 and 1.2 into merge
-M merge
-ok 30 - cvs update (merge)
+ok 194 - double dash "git checkout"
 
-expecting success of 9400.31 'cvs update (conflict merge)': 
-	( echo LINE 0 && cat merge ) >merge.tmp &&
-	mv merge.tmp merge &&
-	git add merge &&
-	git commit -q -m "Merge test (conflict)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test_cmp merge ../expected.C
+expecting success of 9902.195 'general options': 
+	test_completion "git --ver" "--version " &&
+	test_completion "git --hel" "--help " &&
+	test_completion "git --exe" <<-\EOF &&
+	--exec-path Z
+	--exec-path=
+	EOF
+	test_completion "git --htm" "--html-path " &&
+	test_completion "git --pag" "--paginate " &&
+	test_completion "git --no-p" "--no-pager " &&
+	test_completion "git --git" "--git-dir=" &&
+	test_completion "git --wor" "--work-tree=" &&
+	test_completion "git --nam" "--namespace=" &&
+	test_completion "git --bar" "--bare " &&
+	test_completion "git --inf" "--info-path " &&
+	test_completion "git --no-r" "--no-replace-objects "
 
-To gitcvs.git
-   792463d..ba02484  main -> main
-Merging differences between 1.2 and 1.3 into merge
-cvs update: conflicts found in merge
-C merge
-ok 31 - cvs update (conflict merge)
+ok 195 - general options
 
-expecting success of 9400.32 'cvs update (-C)': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update -C &&
-	test_cmp merge ../merge
+expecting success of 9902.196 'general options plus command': 
+	test_completion "git --version check" "checkout " &&
+	test_completion "git --paginate check" "checkout " &&
+	test_completion "git --git-dir=foo check" "checkout " &&
+	test_completion "git --bare check" "checkout " &&
+	test_completion "git --exec-path=foo check" "checkout " &&
+	test_completion "git --html-path check" "checkout " &&
+	test_completion "git --no-pager check" "checkout " &&
+	test_completion "git --work-tree=foo check" "checkout " &&
+	test_completion "git --namespace=foo check" "checkout " &&
+	test_completion "git --paginate check" "checkout " &&
+	test_completion "git --info-path check" "checkout " &&
+	test_completion "git --no-replace-objects check" "checkout " &&
+	test_completion "git --git-dir some/path check" "checkout " &&
+	test_completion "git -c conf.var=value check" "checkout " &&
+	test_completion "git -C some/path check" "checkout " &&
+	test_completion "git --work-tree some/path check" "checkout " &&
+	test_completion "git --namespace name/space check" "checkout "
 
-U empty
-U merge
-U secondrootfile
-U testfile1
-U A/file_in_A
-U E/file_in_E
-U test/empty
-U A/B/file_in_A B
-U A/D/file_in_A D
-U A/B/C/file_in_A B C
-ok 32 - cvs update (-C)
+ok 196 - general options plus command
 
-expecting success of 9400.33 'cvs update (merge no-op)': 
-	echo Line 9 >>merge &&
-	cp merge cvswork/merge &&
-	git add merge &&
-	git commit -q -m "Merge test (no-op)" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	sleep 1 && touch merge &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test_cmp merge ../merge
+expecting success of 9902.197 'git --help completion': 
+	test_completion "git --help ad" "add " &&
+	test_completion "git --help core" "core-tutorial "
 
-To gitcvs.git
-   ba02484..2f86a26  main -> main
-Merging differences between 1.3 and 1.4 into merge
-M merge
-ok 33 - cvs update (merge no-op)
+ok 197 - git --help completion
 
-expecting success of 9400.34 'cvs update (-p)': 
-	touch really-empty &&
-	echo Line 1 > no-lf &&
-	printf "Line 2" >> no-lf &&
-	git add really-empty no-lf &&
-	git commit -q -m "Update -p test" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs update &&
-	for i in merge no-lf empty really-empty; do
-		GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out &&
-		test_cmp $i.out ../$i || return 1
-	done
+expecting success of 9902.198 'completion.commands removes multiple commands': 
+	test_config completion.commands "-cherry -mergetool" &&
+	git --list-cmds=list-mainporcelain,list-complete,config >out &&
+	! grep -E "^(cherry|mergetool)$" out
 
-To gitcvs.git
-   2f86a26..9cef819  main -> main
-cvs update: Updating .
-M merge
-U no-lf
-U really-empty
-cvs update: Updating A
-cvs update: Updating E
-cvs update: Updating test
-cvs update: Updating A/B
-cvs update: Updating A/D
-cvs update: Updating A/B/C
-ok 34 - cvs update (-p)
+ok 198 - completion.commands removes multiple commands
 
-expecting success of 9400.35 'cvs update (module list supports packed refs)': 
-	GIT_DIR="$SERVERDIR" git pack-refs --all &&
-	GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
-	grep "cvs update: New directory \`main'" < out
+expecting success of 9902.199 'setup for integration tests': 
+	echo content >file1 &&
+	echo more >file2 &&
+	git add file1 file2 &&
+	git commit -m one &&
+	git branch mybranch &&
+	git tag mytag
 
-cvs update: New directory `main'
-ok 35 - cvs update (module list supports packed refs)
+[main ba57d3b] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ok 199 - setup for integration tests
 
-expecting success of 9400.36 'cvs status': 
-	mkdir status.dir &&
-	echo Line > status.dir/status.file &&
-	echo Line > status.file &&
-	git add status.dir status.file &&
-	git commit -q -m "Status test" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs update &&
-	GIT_CONFIG="$git_config" cvs status | grep "^File: status.file" >../out &&
-	test_line_count = 2 ../out
+expecting success of 9902.200 'checkout completes ref names': 
+	test_completion "git checkout m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-To gitcvs.git
-   9cef819..590c22f  main -> main
-cvs update: Updating .
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
-cvs update: `empty.out' is no longer in the repository
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
-M merge
-cvs update: `merge.out' is no longer in the repository
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
-cvs update: `no-lf.out' is no longer in the repository
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsserver line 1312.
-cvs update: `really-empty.out' is no longer in the repository
-U status.file
-cvs update: Updating A
-cvs update: Updating E
-cvs update: Updating status.dir
-U status.dir/status.file
-cvs update: Updating test
-cvs update: Updating A/B
-cvs update: Updating A/D
-cvs update: Updating A/B/C
-ok 36 - cvs status
+ok 200 - checkout completes ref names
 
-expecting success of 9400.37 'cvs status (nonrecursive)': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs status -l | grep "^File: status.file" >../out &&
-	test_line_count = 1 ../out
+expecting success of 9902.201 'checkout does not match ref names of a different case': 
+	test_completion "git checkout M" ""
 
-ok 37 - cvs status (nonrecursive)
+ok 201 - checkout does not match ref names of a different case
 
-expecting success of 9400.38 'cvs status (no subdirs in header)': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs status | grep ^File: >../out &&
-	! grep / <../out
+expecting success of 9902.202 'checkout matches case insensitively with GIT_COMPLETION_IGNORE_CASE': 
+	(
+		GIT_COMPLETION_IGNORE_CASE=1 &&
+		test_completion "git checkout M" <<-\EOF
+		main Z
+		mybranch Z
+		mytag Z
+		EOF
+	)
 
-ok 38 - cvs status (no subdirs in header)
+ok 202 - checkout matches case insensitively with GIT_COMPLETION_IGNORE_CASE
 
-expecting success of 9400.39 'cvs co -c (shows module database)': 
-	GIT_CONFIG="$git_config" cvs co -c > out &&
-	grep "^main[	 ][ 	]*main$" <out &&
-	! grep -v "^main[	 ][ 	]*main$" <out
+expecting success of 9902.203 'checkout completes pseudo refs': 
+	test_completion "git checkout H" <<-\EOF
+	HEAD Z
+	EOF
 
-main	main
-ok 39 - cvs co -c (shows module database)
+ok 203 - checkout completes pseudo refs
 
-expecting success of 9400.40 'cvs log': 
-	cd cvswork &&
-	test x"$expectStat" = x"0" &&
-	GIT_CONFIG="$git_config" cvs log merge >../out &&
-sed -e "s%2[0-9][0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]%__DATE__%" ../out > ../actual &&
-	test_cmp ../expect ../actual
+expecting success of 9902.204 'checkout completes pseudo refs case insensitively with GIT_COMPLETION_IGNORE_CASE': 
+	(
+		GIT_COMPLETION_IGNORE_CASE=1 &&
+		test_completion "git checkout h" <<-\EOF
+		HEAD Z
+		EOF
+	)
 
-ok 40 - cvs log
+ok 204 - checkout completes pseudo refs case insensitively with GIT_COMPLETION_IGNORE_CASE
 
-expecting success of 9400.41 'cvs annotate': 
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs annotate merge >../out &&
-	sed -e "s/ .*//" ../out >../actual &&
-	printf "1.%d\n" 3 1 1 1 1 1 1 1 2 4 >../expect &&
-	test_cmp ../expect ../actual
+expecting success of 9902.205 'git -C <path> checkout uses the right repo': 
+	test_completion "git -C subdir -C subsubdir -C .. -C ../otherrepo checkout b" <<-\EOF
+	branch-in-other Z
+	EOF
 
-Annotations for merge
-***************
-ok 41 - cvs annotate
+ok 205 - git -C <path> checkout uses the right repo
 
-expecting success of 9400.42 'create remote-cvs helper': 
-	write_script remote-cvs <<-\EOF
-	exec git shell -c "cvs server"
+expecting success of 9902.206 'show completes all refs': 
+	test_completion "git show m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
 	EOF
 
-ok 42 - create remote-cvs helper
-
-expecting success of 9400.43 'cvs server does not run with vanilla git-shell': 
-	(
-		cd cvswork &&
-		CVS_SERVER=$WORKDIR/remote-cvs &&
-		export CVS_SERVER &&
-		! cvs log merge
-	)
+ok 206 - show completes all refs
 
-fatal: unrecognized command 'cvs server'
-cvs [log aborted]: end of file from server (consult above messages if any)
-ok 43 - cvs server does not run with vanilla git-shell
+expecting success of 9902.207 '<ref>: completes paths': 
+	test_completion "git show mytag:f" <<-\EOF
+	file1Z
+	file2Z
+	EOF
 
-expecting success of 9400.44 'configure git shell to run cvs server': 
-	mkdir "$HOME"/git-shell-commands &&
+ok 207 - <ref>: completes paths
 
-	write_script "$HOME"/git-shell-commands/cvs <<-\EOF &&
-	if ! test $# = 1 && test "$1" = "server"
-	then
-		echo >&2 "git-cvsserver only handles \"server\""
-		exit 1
-	fi
-	exec git cvsserver server
+expecting success of 9902.208 'complete tree filename with spaces': 
+	echo content >"name with spaces" &&
+	git add "name with spaces" &&
+	git commit -m spaces &&
+	test_completion "git show HEAD:nam" <<-\EOF
+	name with spacesZ
 	EOF
 
-	# Should not be used, but part of the recommended setup
-	write_script "$HOME"/git-shell-commands/no-interactive-login <<-\EOF
-	echo Interactive login forbidden
+[main 2beda4a] spaces
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 name with spaces
+ok 208 - complete tree filename with spaces
+
+expecting success of 9902.209 'complete tree filename with metacharacters': 
+	echo content >"name with \${meta}" &&
+	git add "name with \${meta}" &&
+	git commit -m meta &&
+	test_completion "git show HEAD:nam" <<-\EOF
+	name with ${meta}Z
+	name with spacesZ
 	EOF
 
-ok 44 - configure git shell to run cvs server
+[main 8f0e0ea] meta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 name with ${meta}
+ok 209 - complete tree filename with metacharacters
 
-expecting success of 9400.45 'cvs server can run with recommended config': 
-	(
-		cd cvswork &&
-		CVS_SERVER=$WORKDIR/remote-cvs &&
-		export CVS_SERVER &&
-		cvs log merge
-	)
+expecting success of 9902.210 'symbolic-ref completes builtin options': 
+	test_completion "git symbolic-ref --d" <<-\EOF
+	--delete Z
+	EOF
 
+ok 210 - symbolic-ref completes builtin options
 
-RCS file: /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9400-git-cvsserver-server/gitcvs.git/main/merge,v
-Working file: merge
-head: 1.4
-branch:
-locks: strict
-access list:
-symbolic names:
-keyword substitution: kv
-total revisions: 4;	selected revisions: 4
-description:
-----------------------------
-revision 1.4
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+expecting success of 9902.211 'symbolic-ref completes short ref names': 
+	test_completion "git symbolic-ref foo m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-Merge test (no-op)
- 
-----------------------------
-revision 1.3
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+ok 211 - symbolic-ref completes short ref names
 
-Merge test (conflict)
- 
-----------------------------
-revision 1.2
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+expecting success of 9902.212 'symbolic-ref completes full ref names': 
+	test_completion "git symbolic-ref foo refs/" <<-\EOF
+	refs/heads/main Z
+	refs/heads/mybranch Z
+	refs/tags/mytag Z
+	refs/tags/A Z
+	EOF
 
-Merge test (merge)
- 
-----------------------------
-revision 1.1
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+ok 212 - symbolic-ref completes full ref names
 
-Merge test (pre-merge)
- 
-=============================================================================
-ok 45 - cvs server can run with recommended config
+expecting success of 9902.213 'send-email': 
+	test_completion "git send-email --cov" <<-\EOF &&
+	--cover-from-description=Z
+	--cover-letter Z
+	EOF
+	test_completion "git send-email --val" <<-\EOF &&
+	--validate Z
+	EOF
+	test_completion "git send-email ma" "main "
 
-# still have 1 known breakage(s)
-# passed all remaining 44 test(s)
-1..45
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9200-git-cvsexportcommit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/.git/
-checking prerequisite: NOT_ROOT
+ok 213 - send-email
 
-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 9902.214 'complete files': 
+	git init tmp && cd tmp &&
+	test_when_finished "cd .. && rm -rf tmp" &&
 
-)
-prerequisite NOT_ROOT ok
-expecting success of 9200.1 'New file': 
-	mkdir A B C D E F &&
-	echo hello1 >A/newfile1.txt &&
-	echo hello2 >B/newfile2.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
-	git add A/newfile1.txt &&
-	git add B/newfile2.txt &&
-	git add C/newfile3.png &&
-	git add D/newfile4.png &&
-	git commit -a -m "Test: New file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.1/" &&
-	check_entries B "newfile2.txt/1.1/" &&
-	check_entries C "newfile3.png/1.1/-kb" &&
-	check_entries D "newfile4.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp B/newfile2.txt ../B/newfile2.txt &&
-	test_cmp C/newfile3.png ../C/newfile3.png &&
-	test_cmp D/newfile4.png ../D/newfile4.png
-	)
+	echo "expected" > .gitignore &&
+	echo "out" >> .gitignore &&
+	echo "out_sorted" >> .gitignore &&
 
-[master 288d750] Test: New file
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 A/newfile1.txt
- create mode 100644 B/newfile2.txt
- create mode 100644 C/newfile3.png
- create mode 100644 D/newfile4.png
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A put under version control
-cvs add: scheduling file `A/newfile1.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `B/newfile2.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `C/newfile3.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `D/newfile4.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Test: New file
-Autocommit
-  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-initial revision: 1.1
-Committed successfully to CVS
-ok 1 - New file
+	git add .gitignore &&
+	test_completion "git commit " ".gitignore" &&
 
-expecting success of 9200.2 'Remove two files, add two and update two': 
-	echo Hello1 >>A/newfile1.txt &&
-	rm -f B/newfile2.txt &&
-	rm -f C/newfile3.png &&
-	echo Hello5  >E/newfile5.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
-	git add E/newfile5.txt &&
-	git add F/newfile6.png &&
-	git commit -a -m "Test: Remove, add and update" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.2/" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "newfile4.png/1.2/-kb" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp D/newfile4.png ../D/newfile4.png &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
+	git commit -m ignore &&
 
-[master 69b0239] Test: Remove, add and update
- Author: A U Thor <author@example.com>
- 5 files changed, 2 insertions(+), 1 deletion(-)
- delete mode 100644 B/newfile2.txt
- create mode 100644 E/newfile5.txt
- rename C/newfile3.png => F/newfile6.png (100%)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E put under version control
-cvs add: scheduling file `E/newfile5.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `F/newfile6.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs remove: scheduling `B/newfile2.txt' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-cvs remove: scheduling `C/newfile3.png' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): Test: Remove, add and update
-Autocommit
-  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png' 'E/newfile5.txt' 'F/newfile6.png'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
-new revision: delete; previous revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
-new revision: delete; previous revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/newfile5.txt,v  <--  E/newfile5.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F/newfile6.png,v  <--  F/newfile6.png
-initial revision: 1.1
-Committed successfully to CVS
-ok 2 - Remove two files, add two and update two
+	touch new &&
+	test_completion "git add " "new" &&
 
-expecting success of 9200.3 'Fail to change binary more than one generation old': cat F/newfile6.png >>D/newfile4.png &&
-     git commit -a -m "generatiion 1" &&
-     cat F/newfile6.png >>D/newfile4.png &&
-     git commit -a -m "generation 2" &&
-     id=$(git rev-list --max-count=1 HEAD) &&
-     (cd "$CVSWORK" &&
-     test_must_fail git cvsexportcommit -c $id
-     )
-[master 70e0115] generatiion 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master d73a469] generation 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Checking if patch will apply
-Applying
-error: the patch applies to 'D/newfile4.png' (ac22ccbd3ee9f03a3b38249ac8efdbe96b5da2cd), which does not match the current contents.
-error: D/newfile4.png: patch does not apply
-cannot patch at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsexportcommit line 338.
-ok 3 - Fail to change binary more than one generation old
+	git add new &&
+	git commit -a -m new &&
+	test_completion "git add " "" &&
 
-expecting success of 9200.4 'Remove only binary files': 
-	git reset --hard HEAD^^ &&
-	rm -f D/newfile4.png &&
-	git commit -a -m "test: remove only a binary file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.2/" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
+	git mv new modified &&
+	echo modify > modified &&
+	test_completion "git add " "modified" &&
 
-HEAD is now at 69b0239 Test: Remove, add and update
-[master 2a45f53] test: remove only a binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 D/newfile4.png
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs remove: scheduling `D/newfile4.png' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): test: remove only a binary file
-Autocommit
-  cvs commit -F .msg 'D/newfile4.png'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-new revision: delete; previous revision: 1.2
-Committed successfully to CVS
-ok 4 - Remove only binary files
+	mkdir -p some/deep &&
+	touch some/deep/path &&
+	test_completion "git add some/" "some/deep" &&
+	git clean -f some &&
 
-expecting success of 9200.5 'Remove only a text file': 
-	rm -f A/newfile1.txt &&
-	git commit -a -m "test: remove only a binary file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
+	touch untracked &&
 
-[master fa834fd] test: remove only a binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 A/newfile1.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs remove: scheduling `A/newfile1.txt' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): test: remove only a binary file
-Autocommit
-  cvs commit -F .msg 'A/newfile1.txt'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-new revision: delete; previous revision: 1.2
-Committed successfully to CVS
-ok 5 - Remove only a text file
+	: TODO .gitignore should not be here &&
+	test_completion "git rm " <<-\EOF &&
+	.gitignore
+	modified
+	EOF
 
-expecting success of 9200.6 'New file with spaces in file name': 
-	mkdir "G g" &&
-	echo ok then >"G g/with spaces.txt" &&
-	git add "G g/with spaces.txt" && \
-	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
-	git add "G g/with spaces.png" &&
-	git commit -a -m "With spaces" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
-	)
+	test_completion "git clean " "untracked" &&
 
-[master 7dad360] With spaces
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 G g/with spaces.png
- create mode 100644 G g/with spaces.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g put under version control
-cvs add: scheduling file `G g/with spaces.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `G g/with spaces.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): With spaces
-Autocommit
-  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
-initial revision: 1.1
-Committed successfully to CVS
-ok 6 - New file with spaces in file name
+	: TODO .gitignore should not be here &&
+	test_completion "git mv " <<-\EOF &&
+	.gitignore
+	modified
+	EOF
 
-expecting success of 9200.7 'Update file with spaces in file name': 
-	echo Ok then >>"G g/with spaces.txt" &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
-	git add "G g/with spaces.png" &&
-	git commit -a -m "Update with spaces" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
-	)
+	mkdir dir &&
+	touch dir/file-in-dir &&
+	git add dir/file-in-dir &&
+	git commit -m dir &&
 
-[master 200512b] Update with spaces
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Commit to CVS
-Patch title (first comment line): Update with spaces
-Autocommit
-  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
-new revision: 1.2; previous revision: 1.1
-Committed successfully to CVS
-ok 7 - Update file with spaces in file name
+	mkdir untracked-dir &&
 
-expecting success of 9200.8 'File with non-ascii file name': 
-	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
-	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
-	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
-	git commit -a -m "Går det så går det" && \
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -v -c $id &&
-	check_entries \
-	"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
-	"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
-	)
+	: TODO .gitignore should not be here &&
+	test_completion "git mv modified " <<-\EOF &&
+	.gitignore
+	dir
+	modified
+	untracked
+	untracked-dir
+	EOF
 
-[master 2dba919] Går det så går det
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.png"
- create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.txt"
-Applying to CVS commit 2dba9190cda577aa84017fec4349519cd1aadafb from parent 200512bccb19b444ac4f1e098c7d7d3578864bb4
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã… put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥ put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä put under version control
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö put under version control
-cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Går det så går det
-Autocommit
-  cvs commit -F .msg 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
-initial revision: 1.1
-Committed successfully to CVS
-ok 8 - File with non-ascii file name
+	test_completion "git commit " "modified" &&
 
-expecting success of 9200.9 'Mismatching patch should fail': 
-	date >>"E/newfile5.txt" &&
-	git add "E/newfile5.txt" &&
-	git commit -a -m "Update one" &&
-	date >>"E/newfile5.txt" &&
-	git add "E/newfile5.txt" &&
-	git commit -a -m "Update two" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	test_must_fail git cvsexportcommit -c $id
-	)
+	: TODO .gitignore should not be here &&
+	test_completion "git ls-files " <<-\EOF &&
+	.gitignore
+	dir
+	modified
+	EOF
+
+	touch momified &&
+	test_completion "git add mom" "momified"
 
-[master 116af3c] Update one
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/tmp/.git/
+[master (root-commit) 75715ad] ignore
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 3a188b1] Update two
+ 1 file changed, 3 insertions(+)
+ create mode 100644 .gitignore
+[master f8c1ce7] new
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-error: patch failed: E/newfile5.txt:1
-error: E/newfile5.txt: patch does not apply
-cannot patch at /build/reproducible-path/git-2.48.0~rc1+next.20250101/git-cvsexportcommit line 338.
-ok 9 - Mismatching patch should fail
-
-checking prerequisite: FILEMODE
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 new
+Removing some/
+[master c399545] dir
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename new => dir/file-in-dir (100%)
+ create mode 100644 modified
+ok 214 - complete files
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
+expecting success of 9902.215 'simple alias': 
+	test_config alias.co checkout &&
+	test_completion "git co m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-)
-prerequisite FILEMODE ok
-expecting success of 9200.10 'Retain execute bit': 
-	mkdir G &&
-	echo executeon >G/on &&
-	chmod +x G/on &&
-	echo executeoff >G/off &&
-	git add G/on &&
-	git add G/off &&
-	git commit -a -m "Execute test" &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c HEAD &&
-	test -x G/on &&
-	! test -x G/off
-	)
+ok 215 - simple alias
 
-[master 285c074] Execute test
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 G/off
- create mode 100755 G/on
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G put under version control
-cvs add: scheduling file `G/off' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `G/on' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Execute test
-Autocommit
-  cvs commit -F .msg 'G/off' 'G/on'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/off,v  <--  G/off
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/on,v  <--  G/on
-initial revision: 1.1
-Committed successfully to CVS
-ok 10 - Retain execute bit
+expecting success of 9902.216 'recursive alias': 
+	test_config alias.co checkout &&
+	test_config alias.cod "co --detached" &&
+	test_completion "git cod m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-expecting success of 9200.11 '-w option should work with relative GIT_DIR': 
-	mkdir W &&
-	echo foobar >W/file1.txt &&
-	echo bazzle >W/file2.txt &&
-	git add W/file1.txt &&
-	git add W/file2.txt &&
-	git commit -m "More updates" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$GIT_DIR" &&
-	GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id &&
-	check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" &&
-	test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt &&
-	test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
-	)
+ok 216 - recursive alias
 
-[master cb88fd3] More updates
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 W/file1.txt
- create mode 100644 W/file2.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W put under version control
-cvs add: scheduling file `W/file1.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `W/file2.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): More updates
-Autocommit
-  cvs commit -F .msg 'W/file1.txt' 'W/file2.txt'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file1.txt,v  <--  W/file1.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file2.txt,v  <--  W/file2.txt
-initial revision: 1.1
-Committed successfully to CVS
-ok 11 - -w option should work with relative GIT_DIR
+expecting success of 9902.217 'completion uses <cmd> completion for alias: !sh -c 'git <cmd> ...'': 
+	test_config alias.co "!sh -c 'git checkout ...'" &&
+	test_completion "git co m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-expecting success of 9200.12 'check files before directories': 
+ok 217 - completion uses <cmd> completion for alias: !sh -c 'git <cmd> ...'
 
-	echo Notes > release-notes &&
-	git add release-notes &&
-	git commit -m "Add release notes" release-notes &&
-	id=$(git rev-parse HEAD) &&
-	git cvsexportcommit -w "$CVSWORK" -c $id &&
+expecting success of 9902.218 'completion uses <cmd> completion for alias: !f () { VAR=val git <cmd> ... }': 
+	test_config alias.co "!f () { VAR=val git checkout ... ; } f" &&
+	test_completion "git co m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-	echo new > DS &&
-	echo new > E/DS &&
-	echo modified > release-notes &&
-	git add DS E/DS release-notes &&
-	git commit -m "Add two files with the same basename" &&
-	id=$(git rev-parse HEAD) &&
-	git cvsexportcommit -w "$CVSWORK" -c $id &&
-	check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" &&
-	check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" &&
-	test_cmp "$CVSWORK/DS" DS &&
-	test_cmp "$CVSWORK/E/DS" E/DS &&
-	test_cmp "$CVSWORK/release-notes" release-notes
+ok 218 - completion uses <cmd> completion for alias: !f () { VAR=val git <cmd> ... }
 
+expecting success of 9902.219 'completion used <cmd> completion for alias: !f() { : git <cmd> ; ... }': 
+	test_config alias.co "!f() { : git checkout ; if ... } f" &&
+	test_completion "git co m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-[master 35c4a6a] Add release notes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 release-notes
-Checking if patch will apply
-cvs status: nothing known about `release-notes'
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: scheduling file `release-notes' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Add release notes
-Autocommit
-  cvs commit -F .msg 'release-notes'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
-initial revision: 1.1
-Committed successfully to CVS
-[master c59396b] 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'
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: scheduling file `DS' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `E/DS' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Add two files with the same basename
-Autocommit
-  cvs commit -F .msg 'DS' 'E/DS' 'release-notes'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/DS,v  <--  DS
-initial revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/DS,v  <--  E/DS
-initial revision: 1.1
-Committed successfully to CVS
-ok 12 - check files before directories
+ok 219 - completion used <cmd> completion for alias: !f() { : git <cmd> ; ... }
 
-expecting success of 9200.13 're-commit a removed filename which remains in CVS attic': 
-	(cd "$CVSWORK" &&
-	echo >attic_gremlin &&
-	cvs -Q add attic_gremlin &&
-	cvs -Q ci -m "added attic_gremlin" &&
-	rm attic_gremlin &&
-	cvs -Q rm attic_gremlin &&
-	cvs -Q ci -m "removed attic_gremlin") &&
+expecting success of 9902.220 'completion used <cmd> completion for alias: !f() { : <cmd> ; ... }': 
+	test_config alias.co "!f() { : checkout ; if ... } f" &&
+	test_completion "git co m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-	echo > attic_gremlin &&
-	git add attic_gremlin &&
-	git commit -m "Added attic_gremlin" &&
-	git cvsexportcommit -w "$CVSWORK" -c HEAD &&
-	(cd "$CVSWORK" && cvs -Q update -d) &&
-	test -f "$CVSWORK/attic_gremlin"
+ok 220 - completion used <cmd> completion for alias: !f() { : <cmd> ; ... }
 
-[master 11e2672] Added attic_gremlin
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 attic_gremlin
-Checking if patch will apply
-Applying
-<stdin>:7: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: Re-adding file `attic_gremlin' after dead revision 1.2.
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Added attic_gremlin
-Autocommit
-  cvs commit -F .msg 'attic_gremlin'
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/attic_gremlin,v  <--  attic_gremlin
-new revision: 1.3; previous revision: 1.2
-Committed successfully to CVS
-ok 13 - re-commit a removed filename which remains in CVS attic
+expecting success of 9902.221 'completion used <cmd> completion for alias: !f() { : <cmd>; ... }': 
+	test_config alias.co "!f() { : checkout; if ... } f" &&
+	test_completion "git co m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
 
-expecting success of 9200.14 'commit a file with leading spaces in the name': 
+ok 221 - completion used <cmd> completion for alias: !f() { : <cmd>; ... }
 
-	echo space > " space" &&
-	git add " space" &&
-	git commit -m "Add a file with a leading space" &&
-	id=$(git rev-parse HEAD) &&
-	git cvsexportcommit -w "$CVSWORK" -c $id &&
-	check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" &&
-	test_cmp "$CVSWORK/ space" " space"
+expecting success of 9902.222 'completion without explicit _git_xxx function': 
+	test_completion "git version --" <<-\EOF
+	--build-options Z
+	--no-build-options Z
+	EOF
 
+ok 222 - completion without explicit _git_xxx function
 
-[master a50075d] Add a file with a leading space
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644  space
-Checking if patch will apply
-cvs status: nothing known about ` space'
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: scheduling file ` space' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Add a file with a leading space
-Autocommit
-  cvs commit -F .msg  space
-/build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/ space,v  <--   space
-initial revision: 1.1
-Committed successfully to CVS
-ok 14 - commit a file with leading spaces in the name
+checking known breakage of 9902.223 'complete with tilde expansion': 
+	git init tmp && cd tmp &&
+	test_when_finished "cd .. && rm -rf tmp" &&
 
-expecting success of 9200.15 'use the same checkout for Git and CVS': 
+	touch ~/tmp/file &&
 
-	(mkdir shared &&
-	 cd shared &&
-	 sane_unset GIT_DIR &&
-	 cvs co . &&
-	 git init &&
-	 git add " space" &&
-	 git commit -m "fake initial commit" &&
-	 echo Hello >> " space" &&
-	 git commit -m "Another change" " space" &&
-	 git cvsexportcommit -W -p -u -c HEAD &&
-	 grep Hello " space" &&
-	 git diff-files)
+	test_completion "git add ~/tmp/" "~/tmp/file"
 
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/tmp/.git/
+--- expected	2026-03-14 13:40:36.310677808 +0000
++++ out_sorted	2026-03-14 13:40:36.382677808 +0000
+@@ -1 +1 @@
+-~/tmp/file
++
+not ok 223 - complete with tilde expansion # TODO known breakage
 
-cvs checkout: Updating .
-U  space
-U DS
-U attic_gremlin
-U release-notes
-cvs checkout: Updating A
-cvs checkout: Updating B
-cvs checkout: Updating C
-cvs checkout: Updating CVSROOT
-U CVSROOT/checkoutlist
-U CVSROOT/commitinfo
-U CVSROOT/config
-U CVSROOT/cvswrappers
-U CVSROOT/loginfo
-U CVSROOT/modules
-U CVSROOT/notify
-U CVSROOT/postadmin
-U CVSROOT/postproxy
-U CVSROOT/posttag
-U CVSROOT/postwatch
-U CVSROOT/preproxy
-U CVSROOT/rcsinfo
-U CVSROOT/taginfo
-U CVSROOT/verifymsg
-cvs checkout: Updating D
-cvs checkout: Updating E
-U E/DS
-U E/newfile5.txt
-cvs checkout: Updating F
-U F/newfile6.png
-cvs checkout: Updating G
-U G/off
-U G/on
-cvs checkout: Updating G g
-U G g/with spaces.png
-U G g/with spaces.txt
-cvs checkout: Updating W
-U W/file1.txt
-U W/file2.txt
-cvs checkout: Updating Ã…
-cvs checkout: Updating Ã…/goo
-cvs checkout: Updating Ã…/goo/a
-cvs checkout: Updating Ã…/goo/a/b
-cvs checkout: Updating Ã…/goo/a/b/c
-cvs checkout: Updating Ã…/goo/a/b/c/d
-cvs checkout: Updating Ã…/goo/a/b/c/d/e
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥
-cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä
-cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö
-U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
-U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9200-git-cvsexportcommit/shared/.git/
-[master (root-commit) 93a1e74] fake initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644  space
-[master 6935f1b] Another change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Commit to CVS
-Patch title (first comment line): Another change
-Autocommit
-  cvs commit -F .msg  space
-Committed successfully to CVS
-HEAD is now at 6935f1b Another change
-Hello
-ok 15 - use the same checkout for Git and CVS
+expecting success of 9902.224 'setup other remote for remote reference completion': 
+	git remote add other otherrepo &&
+	git fetch other
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
-*** t9402-git-cvsserver-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9402-git-cvsserver-refs/.git/
-expecting success of 9402.1 'setup v1, b1': 
-	echo "Simple text file" >textfile.c &&
-	echo "t2" >t2 &&
-	mkdir adir &&
-	echo "adir/afile line1" >adir/afile &&
-	echo "adir/afile line2" >>adir/afile &&
-	echo "adir/afile line3" >>adir/afile &&
-	echo "adir/afile line4" >>adir/afile &&
-	echo "adir/a2file" >>adir/a2file &&
-	mkdir adir/bdir &&
-	echo "adir/bdir/bfile line 1" >adir/bdir/bfile &&
-	echo "adir/bdir/bfile line 2" >>adir/bdir/bfile &&
-	echo "adir/bdir/b2file" >adir/bdir/b2file &&
-	git add textfile.c t2 adir &&
-	git commit -q -m "First Commit (v1)" &&
-	git tag v1 &&
-	git branch b1 &&
-	git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
+From otherrepo
+ * [new branch]      branch-in-other -> other/branch-in-other
+ * [new branch]      main-in-other   -> other/main-in-other
+ * [new tag]         tag-in-other    -> tag-in-other
+ok 224 - setup other remote for remote reference completion
 
-ok 1 - setup v1, b1
+expecting success of 9902.225 '__git_complete_remote_or_refspec - push -d other': 
+		sed -e "s/Z$//" >expected <<-EOF &&
+		main-in-other Z
+		EOF
+		(
+			words=(git push -d other ma) &&
+			cword=${#words[@]} cur=${words[cword-1]} &&
+			__git_cmd_idx=1 &&
+			__git_complete_remote_or_refspec &&
+			print_comp
+		) &&
+		test_cmp expected out
+	
+ok 225 - __git_complete_remote_or_refspec - push -d other
 
-expecting success of 9402.2 'cvs co v1': 
-	cvs -f -Q co -r v1 -d cvswork main >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
+checking known breakage of 9902.226 '__git_complete_remote_or_refspec - push other -d': 
+		sed -e "s/Z$//" >expected <<-EOF &&
+		main-in-other Z
+		EOF
+		(
+			words=(git push other -d ma) &&
+			cword=${#words[@]} cur=${words[cword-1]} &&
+			__git_cmd_idx=1 &&
+			__git_complete_remote_or_refspec &&
+			print_comp
+		) &&
+		test_cmp expected out
+	
+--- expected	2026-03-14 13:40:36.782677808 +0000
++++ out	2026-03-14 13:40:36.846677808 +0000
+@@ -1 +1 @@
+-main-in-other 
++main 
+not ok 226 - __git_complete_remote_or_refspec - push other -d # TODO known breakage
 
-ok 2 - cvs co v1
+expecting success of 9902.227 '__git_complete_remote_or_refspec - push --delete other': 
+		sed -e "s/Z$//" >expected <<-EOF &&
+		main-in-other Z
+		EOF
+		(
+			words=(git push --delete other ma) &&
+			cword=${#words[@]} cur=${words[cword-1]} &&
+			__git_cmd_idx=1 &&
+			__git_complete_remote_or_refspec &&
+			print_comp
+		) &&
+		test_cmp expected out
+	
+ok 227 - __git_complete_remote_or_refspec - push --delete other
 
-expecting success of 9402.3 'cvs co b1': 
-	cvs -f co -r b1 -d cvswork main >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
+checking known breakage of 9902.228 '__git_complete_remote_or_refspec - push other --delete': 
+		sed -e "s/Z$//" >expected <<-EOF &&
+		main-in-other Z
+		EOF
+		(
+			words=(git push other --delete ma) &&
+			cword=${#words[@]} cur=${words[cword-1]} &&
+			__git_cmd_idx=1 &&
+			__git_complete_remote_or_refspec &&
+			print_comp
+		) &&
+		test_cmp expected out
+	
+--- expected	2026-03-14 13:40:37.066677808 +0000
++++ out	2026-03-14 13:40:37.118677808 +0000
+@@ -1 +1 @@
+-main-in-other 
++main 
+not ok 228 - __git_complete_remote_or_refspec - push other --delete # TODO known breakage
 
-ok 3 - cvs co b1
+expecting success of 9902.229 'git config subcommand': 
+	test_completion "git config " <<-\EOF
+	edit Z
+	get Z
+	list Z
+	remove-section Z
+	rename-section Z
+	set Z
+	unset Z
+	EOF
 
-expecting success of 9402.4 'cvs co b1 [cvswork3]': 
-	cvs -f co -r b1 -d cvswork3 main >cvs.log 2>&1 &&
-	check_start_tree cvswork3 &&
-	check_file cvswork3 textfile.c v1 &&
-	check_file cvswork3 t2 v1 &&
-	check_file cvswork3 adir/afile v1 &&
-	check_file cvswork3 adir/a2file v1 &&
-	check_file cvswork3 adir/bdir/bfile v1 &&
-	check_file cvswork3 adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork3 v1
+ok 229 - git config subcommand
 
-ok 4 - cvs co b1 [cvswork3]
+expecting success of 9902.230 'git config subcommand options': 
+	test_completion "git config get --show-" <<-\EOF
+	--show-names Z
+	--show-origin Z
+	--show-scope Z
+	EOF
 
-expecting success of 9402.5 'edit cvswork3 and save diff': 
-	(
-		cd cvswork3 &&
-		sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
-		mv -f adir/afileNEW adir/afile &&
-		echo "afile5" >adir/afile5 &&
-		rm t2 &&
-		cvs -f add adir/afile5 &&
-		cvs -f rm t2 &&
-		! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
-	)
+ok 230 - git config subcommand options
 
-cvs add: scheduling file `adir/afile5' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs remove: scheduling `t2' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-ok 5 - edit cvswork3 and save diff
+expecting success of 9902.231 'git config get': 
+	test_when_finished "rm -f cfgfile" &&
+	git config set --file cfgfile foo.bar baz &&
+	test_completion "git config get --file cfgfile foo." <<-\EOF
+	foo.bar Z
+	EOF
 
-expecting success of 9402.6 'setup v1.2 on b1': 
-	git checkout b1 &&
-	echo "new v1.2" >t3 &&
-	rm t2 &&
-	sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
-	mv -f adir/afileNEW adir/afile &&
-	rm adir/a2file &&
-	echo "a3file" >>adir/a3file &&
-	echo "bfile line 3" >>adir/bdir/bfile &&
-	rm adir/bdir/b2file &&
-	echo "b3file" >adir/bdir/b3file &&
-	mkdir cdir &&
-	echo "cdir/cfile" >cdir/cfile &&
-	git add -A cdir adir t3 t2 &&
-	git commit -q -m "v1.2" &&
-	git tag v1.2 &&
-	git push --tags gitcvs.git b1:b1
+ok 231 - git config get
 
-Switched to branch 'b1'
-To gitcvs.git
-   a445389..5630bb8  b1 -> b1
- * [new tag]         v1.2 -> v1.2
-ok 6 - setup v1.2 on b1
+expecting success of 9902.232 'git config set - section': 
+	test_completion "git config set br" <<-\EOF
+	branch.Z
+	browser.Z
+	EOF
 
-expecting success of 9402.7 'cvs -f up (on b1 adir)': 
-	( cd cvswork/adir && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_end_tree cvswork
+ok 232 - git config set - section
 
-ok 7 - cvs -f up (on b1 adir)
+expecting success of 9902.233 'git config set - section include, includeIf': 
+	test_completion "git config set inclu" <<-\EOF
+	include.Z
+	includeIf.Z
+	EOF
 
-expecting success of 9402.8 'cvs up (on b1 /)': 
-	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_tree cvswork
+ok 233 - git config set - section include, includeIf
 
-ok 8 - cvs up (on b1 /)
+expecting success of 9902.234 'git config set - variable name': 
+	test_completion "git config set log.d" <<-\EOF
+	log.date Z
+	log.decorate Z
+	log.diffMerges Z
+	EOF
 
-expecting success of 9402.9 'cvs up (on b1 /) (again; check CVS/Tag files)': 
-	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_tree cvswork
+ok 234 - git config set - variable name
 
-ok 9 - cvs up (on b1 /) (again; check CVS/Tag files)
+expecting success of 9902.235 'git config set - variable name include': 
+	test_completion "git config set include.p" <<-\EOF
+	include.path Z
+	EOF
 
-expecting success of 9402.10 'cvs up -r v1': 
-	( cd cvswork && cvs -f up -r v1 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
+ok 235 - git config set - variable name include
 
-ok 10 - cvs up -r v1
+expecting success of 9902.236 'setup for git config submodule tests': 
+	test_create_repo sub &&
+	test_commit -C sub initial &&
+	git submodule add ./sub
 
-expecting success of 9402.11 'cvs up': 
-	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/sub/.git/
+[master (root-commit) 5e30013] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Adding existing repo at 'sub' to the index
+ok 236 - setup for git config submodule tests
 
-ok 11 - cvs up
+expecting success of 9902.237 'git config set - variable name - submodule and __git_compute_first_level_config_vars_for_section': 
+	test_completion "git config set submodule." <<-\EOF
+	submodule.active Z
+	submodule.alternateErrorStrategy Z
+	submodule.alternateLocation Z
+	submodule.fetchJobs Z
+	submodule.propagateBranches Z
+	submodule.recurse Z
+	submodule.sub.Z
+	EOF
 
-expecting success of 9402.12 'cvs up (again; check CVS/Tag files)': 
-	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
+ok 237 - git config set - variable name - submodule and __git_compute_first_level_config_vars_for_section
 
-ok 12 - cvs up (again; check CVS/Tag files)
+expecting success of 9902.238 'git config set - variable name - __git_compute_second_level_config_vars_for_section': 
+	test_completion "git config set submodule.sub." <<-\EOF
+	submodule.sub.url Z
+	submodule.sub.update Z
+	submodule.sub.branch Z
+	submodule.sub.fetchRecurseSubmodules Z
+	submodule.sub.ignore Z
+	submodule.sub.active Z
+	EOF
 
-expecting success of 9402.13 'setup simple b2': 
-	git branch b2 v1 &&
-	git push --tags gitcvs.git b2:b2
+ok 238 - git config set - variable name - __git_compute_second_level_config_vars_for_section
 
-To gitcvs.git
- * [new branch]      b2 -> b2
-ok 13 - setup simple b2
+expecting success of 9902.239 'git config set - value': 
+	test_completion "git config set color.pager " <<-\EOF
+	false Z
+	true Z
+	EOF
 
-expecting success of 9402.14 'cvs co b2 [into cvswork2]': 
-	cvs -f co -r b2 -d cvswork2 main >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
+ok 239 - git config set - value
 
-ok 14 - cvs co b2 [into cvswork2]
+expecting success of 9902.240 'git -c - section': 
+	test_completion "git -c br" <<-\EOF
+	branch.Z
+	browser.Z
+	EOF
 
-expecting success of 9402.15 'root dir edit [cvswork2]': 
-	(
-		cd cvswork2 && echo "Line 2" >>textfile.c &&
-		! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
-		cvs -f commit -m "edit textfile.c" textfile.c
-	) >cvsEdit1.log 2>&1
+ok 240 - git -c - section
 
-ok 15 - root dir edit [cvswork2]
+expecting success of 9902.241 'git -c - variable name': 
+	test_completion "git -c log.d" <<-\EOF
+	log.date=Z
+	log.decorate=Z
+	log.diffMerges=Z
+	EOF
 
-expecting success of 9402.16 'root dir rm file [cvswork2]': 
-	(
-		cd cvswork2 &&
-		cvs -f rm -f t2 &&
-		cvs -f diff -u >../cvsEdit2-empty.diff &&
-		! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
-		cvs -f commit -m "rm t2"
-	) >cvsEdit2.log 2>&1
+ok 241 - git -c - variable name
 
-ok 16 - root dir rm file [cvswork2]
+expecting success of 9902.242 'git -c - value': 
+	test_completion "git -c color.pager=" <<-\EOF
+	false Z
+	true Z
+	EOF
 
-expecting success of 9402.17 'subdir edit/add/rm files [cvswork2]': 
-	(
-		cd cvswork2 &&
-		sed -e "s/line 1/line 1 (v2)/" adir/bdir/bfile >adir/bdir/bfileNEW &&
-		mv -f adir/bdir/bfileNEW adir/bdir/bfile &&
-		rm adir/bdir/b2file &&
-		cd adir &&
-		cvs -f rm bdir/b2file &&
-		echo "4th file" >bdir/b4file &&
-		cvs -f add bdir/b4file &&
-		! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
-		git fetch gitcvs.git b2:b2 &&
-		(
-		  cd .. &&
-		  ! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
-		  ! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
-		) &&
-		cvs -f commit -m "various add/rm/edit"
-	) >cvs.log 2>&1
+ok 242 - git -c - value
 
-ok 17 - subdir edit/add/rm files [cvswork2]
+expecting success of 9902.243 'git clone --config= - section': 
+	test_completion "git clone --config=br" <<-\EOF
+	branch.Z
+	browser.Z
+	EOF
 
-expecting success of 9402.18 'validate result of edits [cvswork2]': 
-	git fetch gitcvs.git b2:b2 &&
-	git tag v2 b2 &&
-	git push --tags gitcvs.git b2:b2 &&
-	check_start_tree cvswork2 &&
-	check_file cvswork2 textfile.c v2 &&
-	check_file cvswork2 adir/afile v2 &&
-	check_file cvswork2 adir/a2file v2 &&
-	check_file cvswork2 adir/bdir/bfile v2 &&
-	check_file cvswork2 adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork2 v2
+ok 243 - git clone --config= - section
 
-From gitcvs
-   8bc3df8..2f22978  b2         -> b2
-To gitcvs.git
- * [new tag]         v2 -> v2
-ok 18 - validate result of edits [cvswork2]
+expecting success of 9902.244 'git clone --config= - variable name': 
+	test_completion "git clone --config=log.d" <<-\EOF
+	log.date=Z
+	log.decorate=Z
+	log.diffMerges=Z
+	EOF
 
-expecting success of 9402.19 'validate basic diffs saved during above cvswork2 edits': 
-	test $(grep Index: cvsEdit1.diff | wc -l) = 1 &&
-	test_must_be_empty cvsEdit2-empty.diff &&
-	test $(grep Index: cvsEdit2-N.diff | wc -l) = 1 &&
-	test $(grep Index: cvsEdit3.diff | wc -l) = 3 &&
-	rm -rf diffSandbox &&
-	git clone -q -n . diffSandbox &&
-	(
-		cd diffSandbox &&
-		git checkout v1 &&
-		git apply -p0 --index <"$WORKDIR/cvsEdit1.diff" &&
-		git apply -p0 --index <"$WORKDIR/cvsEdit2-N.diff" &&
-		git apply -p0 --directory=adir --index <"$WORKDIR/cvsEdit3.diff" &&
-		git diff --exit-code v2
-	) >"check_diff_apply.out" 2>&1
+ok 244 - git clone --config= - variable name
 
-ok 19 - validate basic diffs saved during above cvswork2 edits
+expecting success of 9902.245 'git clone --config= - value': 
+	test_completion "git clone --config=color.pager=" <<-\EOF
+	false Z
+	true Z
+	EOF
 
-expecting success of 9402.20 'validate v1.2 diff saved during last cvswork2 edit': 
-	test $(grep Index: cvsEdit3-v1.2.diff | wc -l) = 9 &&
-	check_diff cvsEdit3-v1.2.diff v1.2 v2
+ok 245 - git clone --config= - value
 
-ok 20 - validate v1.2 diff saved during last cvswork2 edit
+expecting success of 9902.246 'git reflog show': 
+	test_when_finished "git checkout - && git branch -d shown" &&
+	git checkout -b shown &&
+	test_completion "git reflog sho" <<-\EOF &&
+	show Z
+	shown Z
+	EOF
+	test_completion "git reflog show sho" "shown " &&
+	test_completion "git reflog shown sho" "shown " &&
+	test_completion "git reflog --unt" "--until=" &&
+	test_completion "git reflog show --unt" "--until=" &&
+	test_completion "git reflog shown --unt" "--until="
 
-expecting success of 9402.21 'validate v1.2 v1 diff saved during last cvswork2 edit': 
-	test $(grep Index: cvsEdit3-v1.2-v1.diff | wc -l) = 9 &&
-	check_diff cvsEdit3-v1.2-v1.diff v1.2 v1
+Switched to a new branch 'shown'
+Switched to branch 'main'
+A	.gitmodules
+M	a.file
+A	sub
+Deleted branch shown (was 8f0e0ea).
+ok 246 - git reflog show
 
-ok 21 - validate v1.2 v1 diff saved during last cvswork2 edit
+expecting success of 9902.247 'options with value': 
+	test_completion "git merge -X diff-algorithm=" <<-\EOF
 
-expecting success of 9402.22 'cvs up [cvswork2]': 
-	( cd cvswork2 && cvs -f up ) >cvs.log 2>&1 &&
-	check_start_tree cvswork2 &&
-	check_file cvswork2 textfile.c v2 &&
-	check_file cvswork2 adir/afile v2 &&
-	check_file cvswork2 adir/a2file v2 &&
-	check_file cvswork2 adir/bdir/bfile v2 &&
-	check_file cvswork2 adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork2 v2
+	EOF
 
-ok 22 - cvs up [cvswork2]
+ok 247 - options with value
 
-expecting success of 9402.23 'cvs up -r b2 [back to cvswork]': 
-	( cd cvswork && cvs -f up -r b2 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v2 &&
-	check_file cvswork adir/afile v2 &&
-	check_file cvswork adir/a2file v2 &&
-	check_file cvswork adir/bdir/bfile v2 &&
-	check_file cvswork adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork v2
+expecting success of 9902.248 'sourcing the completion script clears cached commands': 
+	(
+		__git_compute_all_commands &&
+		test -n "$__git_all_commands" &&
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		test -z "$__git_all_commands"
+	)
 
-ok 23 - cvs up -r b2 [back to cvswork]
+ok 248 - sourcing the completion script clears cached commands
 
-expecting success of 9402.24 'cvs up -r b1': 
-	( cd cvswork && cvs -f up -r b1 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_full_tree cvswork v1.2
+expecting success of 9902.249 'sourcing the completion script clears cached merge strategies': 
+	(
+		__git_compute_merge_strategies &&
+		test -n "$__git_merge_strategies" &&
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		test -z "$__git_merge_strategies"
+	)
 
-ok 24 - cvs up -r b1
+ok 249 - sourcing the completion script clears cached merge strategies
 
-expecting success of 9402.25 'cvs up -A': 
-	( cd cvswork && cvs -f up -A ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork v1
+expecting success of 9902.250 'sourcing the completion script clears cached --options': 
+	(
+		__gitcomp_builtin checkout &&
+		test -n "$__gitcomp_builtin_checkout" &&
+		__gitcomp_builtin notes_edit &&
+		test -n "$__gitcomp_builtin_notes_edit" &&
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		test -z "$__gitcomp_builtin_checkout" &&
+		test -z "$__gitcomp_builtin_notes_edit"
+	)
 
-ok 25 - cvs up -A
+ok 250 - sourcing the completion script clears cached --options
 
-expecting success of 9402.26 'cvs up (check CVS/Tag files)': 
-	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork v1
+expecting success of 9902.251 'option aliases are not shown by default': 
+	test_completion "git clone --recurs" "--recurse-submodules "
 
-ok 26 - cvs up (check CVS/Tag files)
+ok 251 - option aliases are not shown by default
 
-expecting success of 9402.27 'cvs up -r heads/b1': 
-	( cd cvswork && cvs -f up -r heads/b1 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_full_tree cvswork v1.2
+expecting success of 9902.252 'option aliases are shown with GIT_COMPLETION_SHOW_ALL': 
+	(
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL &&
+		test_completion "git clone --recurs" <<-\EOF
+		--recurse-submodules Z
+		--recursive Z
+		EOF
+	)
 
-ok 27 - cvs up -r heads/b1
+ok 252 - option aliases are shown with GIT_COMPLETION_SHOW_ALL
 
-expecting success of 9402.28 'cvs up -r heads_-s-b2 (cvsserver escape mechanism)': 
-	( cd cvswork && cvs -f up -r heads_-s-b2 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v2 &&
-	check_file cvswork adir/afile v2 &&
-	check_file cvswork adir/a2file v2 &&
-	check_file cvswork adir/bdir/bfile v2 &&
-	check_file cvswork adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork v2
+expecting success of 9902.253 'plumbing commands are excluded without GIT_COMPLETION_SHOW_ALL_COMMANDS': 
+	(
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
 
-ok 28 - cvs up -r heads_-s-b2 (cvsserver escape mechanism)
+		# Just mainporcelain, not plumbing commands
+		run_completion "git c" &&
+		grep checkout out &&
+		! grep cat-file out
+	)
 
-expecting success of 9402.29 'cvs up -r $(git rev-parse v1)': 
-	test -n "$v1hash" &&
-	( cd cvswork && cvs -f up -r "$v1hash" ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork v1
+checkout 
+ok 253 - plumbing commands are excluded without GIT_COMPLETION_SHOW_ALL_COMMANDS
 
-ok 29 - cvs up -r $(git rev-parse v1)
+expecting success of 9902.254 'all commands are shown with GIT_COMPLETION_SHOW_ALL_COMMANDS (also main non-builtin)': 
+	(
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		GIT_COMPLETION_SHOW_ALL_COMMANDS=1 &&
+		export GIT_COMPLETION_SHOW_ALL_COMMANDS &&
+		sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
 
-expecting success of 9402.30 'cvs diff -r v1 -u': 
-	( cd cvswork && cvs -f diff -r v1 -u >../cvsDiff.out 2>../cvs.log ) &&
-	test_must_be_empty cvsDiff.out &&
-	test_must_be_empty cvs.log
+		# Both mainporcelain and plumbing commands
+		run_completion "git c" &&
+		grep checkout out &&
+		grep cat-file out &&
 
-ok 30 - cvs diff -r v1 -u
+		# Check "gitk", a "main" command, but not a built-in + more plumbing
+		run_completion "git g" &&
+		grep gitk out &&
+		grep get-tar-commit-id out
+	)
 
-expecting success of 9402.31 'cvs diff -N -r v2 -u': 
-	( cd cvswork && ! cvs -f diff -N -r v2 -u >../cvsDiff.out 2>../cvs.log ) &&
-	test_must_be_empty cvs.log &&
-	test -s cvsDiff.out &&
-	check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1
+checkout 
+checkout-index 
+checkout 
+cat-file 
+gitk 
+get-tar-commit-id 
+ok 254 - all commands are shown with GIT_COMPLETION_SHOW_ALL_COMMANDS (also main non-builtin)
 
-ok 31 - cvs diff -N -r v2 -u
+expecting success of 9902.255 '__git_complete': 
+	unset -f __git_wrap__git_main &&
 
-expecting success of 9402.32 'cvs diff -N -r v2 -r v1.2': 
-	( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u >../cvsDiff.out 2>../cvs.log ) &&
-	test_must_be_empty cvs.log &&
-	test -s cvsDiff.out &&
-	check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1
+	__git_complete foo __git_main &&
+	__git_have_func __git_wrap__git_main &&
+	unset -f __git_wrap__git_main &&
 
-ok 32 - cvs diff -N -r v2 -r v1.2
+	__git_complete gf _git_fetch &&
+	__git_have_func __git_wrap_git_fetch &&
 
-expecting success of 9402.33 'apply early [cvswork3] diff to b3': 
-	git clone -q . gitwork3 &&
-	(
-		cd gitwork3 &&
-		git checkout -b b3 v1 &&
-		git apply -p0 --index <"$WORKDIR/cvswork3edit.diff" &&
-		git commit -m "cvswork3 edits applied"
-	) &&
-	git fetch gitwork3 b3:b3 &&
-	git tag v3 b3
+	__git_complete foo git &&
+	__git_have_func __git_wrap__git_main &&
+	unset -f __git_wrap__git_main &&
 
-Switched to a new branch 'b3'
-[b3 e1226ee] cvswork3 edits applied
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 adir/afile5
- delete mode 100644 t2
-From gitwork3
- * [new branch]      b3         -> b3
-ok 33 - apply early [cvswork3] diff to b3
+	__git_complete gd git_diff &&
+	__git_have_func __git_wrap_git_diff &&
 
-expecting success of 9402.34 'check [cvswork3] diff': 
-	( cd cvswork3 && ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" 2>../cvs.log ) &&
-	test_must_be_empty cvs.log &&
-	test -s cvsDiff.out &&
-	test $(grep Index: cvsDiff.out | wc -l) = 3 &&
-	test_cmp cvsDiff.out cvswork3edit.diff &&
-	check_diff cvsDiff.out v1 v3 >check_diff.out 2>&1
+	test_must_fail __git_complete ga missing
 
-ok 34 - check [cvswork3] diff
+ERROR: could not find function 'missing'
+ok 255 - __git_complete
 
-expecting success of 9402.35 'merge early [cvswork3] b3 with b1': 
-	( cd gitwork3 && git merge -m "message" b1 ) &&
-	git fetch gitwork3 b3:b3 &&
-	git tag v3merged b3 &&
-	git push --tags gitcvs.git b3:b3
+expecting success of 9902.256 '__git_pseudoref_exists': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+		sane_unset __git_repo_path &&
 
-Auto-merging adir/afile
-Merge made by the 'ort' strategy.
- adir/a2file      | 1 -
- adir/a3file      | 1 +
- adir/afile       | 2 +-
- adir/bdir/b2file | 1 -
- adir/bdir/b3file | 1 +
- adir/bdir/bfile  | 1 +
- cdir/cfile       | 1 +
- t3               | 1 +
- 8 files changed, 6 insertions(+), 3 deletions(-)
- delete mode 100644 adir/a2file
- create mode 100644 adir/a3file
- delete mode 100644 adir/bdir/b2file
- create mode 100644 adir/bdir/b3file
- create mode 100644 cdir/cfile
- create mode 100644 t3
-From gitwork3
-   e1226ee..21f047c  b3         -> b3
-To gitcvs.git
- * [new branch]      b3 -> b3
- * [new tag]         v3 -> v3
- * [new tag]         v3merged -> v3merged
-ok 35 - merge early [cvswork3] b3 with b1
+		# HEAD should exist, even if it points to an unborn branch.
+		__git_pseudoref_exists HEAD >output 2>&1 &&
+		test_must_be_empty output &&
 
-expecting success of 9402.36 'cvs up dirty [cvswork3]': 
-	(
-		cd cvswork3 &&
-		cvs -f up &&
-		! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out"
-	) >cvs.log 2>&1 &&
-	test -s cvsDiff.out &&
-	test $(grep Index: cvsDiff.out | wc -l) = 2 &&
-	check_start_tree cvswork3 &&
-	check_file cvswork3 textfile.c v3merged &&
-	check_file cvswork3 t3 v3merged &&
-	check_file cvswork3 adir/afile v3merged &&
-	check_file cvswork3 adir/a3file v3merged &&
-	check_file cvswork3 adir/afile5 v3merged &&
-	check_file cvswork3 adir/bdir/bfile v3merged &&
-	check_file cvswork3 adir/bdir/b3file v3merged &&
-	check_file cvswork3 cdir/cfile v3merged &&
-	check_end_full_tree cvswork3 v3merged
+		# HEAD points to an existing branch, so it should exist.
+		test_commit A &&
+		__git_pseudoref_exists HEAD >output 2>&1 &&
+		test_must_be_empty output &&
 
-ok 36 - cvs up dirty [cvswork3]
+		# CHERRY_PICK_HEAD does not exist, so the existence check should fail.
+		! __git_pseudoref_exists CHERRY_PICK_HEAD >output 2>&1 &&
+		test_must_be_empty output &&
 
-expecting success of 9402.37 'cvs commit [cvswork3]': 
-	(
-		cd cvswork3 &&
-		cvs -f commit -m "dirty sandbox after auto-merge"
-	) >cvs.log 2>&1 &&
-	check_start_tree cvswork3 &&
-	check_file cvswork3 textfile.c v3merged &&
-	check_file cvswork3 t3 v3merged &&
-	check_file cvswork3 adir/afile v3merged &&
-	check_file cvswork3 adir/a3file v3merged &&
-	check_file cvswork3 adir/afile5 v3merged &&
-	check_file cvswork3 adir/bdir/bfile v3merged &&
-	check_file cvswork3 adir/bdir/b3file v3merged &&
-	check_file cvswork3 cdir/cfile v3merged &&
-	check_end_full_tree cvswork3 v3merged &&
-	git fetch gitcvs.git b3:b4 &&
-	git tag v4.1 b4 &&
-	git diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1
+		# CHERRY_PICK_HEAD points to a commit, so it should exist.
+		git update-ref CHERRY_PICK_HEAD A &&
+		__git_pseudoref_exists CHERRY_PICK_HEAD >output 2>&1 &&
+		test_must_be_empty output
+	)
 
-From gitcvs
- * [new branch]      b3         -> b4
-ok 37 - cvs commit [cvswork3]
+Initialized empty Git repository in /build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash directory.t9902-completion/repo/.git/
+[master (root-commit) a3899a0] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 256 - __git_pseudoref_exists
 
-# passed all 37 test(s)
-1..37
+# still have 3 known breakage(s)
+# passed all remaining 253 test(s)
+1..256
 make[4]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/t'
 /usr/bin/make aggregate-results
 make[5]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/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 30309
+success 30308
 failed  0
 broken  278
 total   31106
@@ -557738,9 +557396,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 5f94607ca38dbaaa8f005b8441c94a9efb4f30df (refs/remotes/origin/trunk)
+r1 = 8657addc286f9d00eb4d5208119c5d5fd6a7baa1 (refs/remotes/origin/trunk)
 	M	foo
-r2 = 11a9646d244c3748be150ffd54725c2a8f2694ee (refs/remotes/origin/trunk)
+r2 = e7377925aa01c9e6c027a06d324dfce205bb5d95 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project r2
 Note: switching to 'remotes/origin/trunk'.
@@ -557760,7 +557418,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 11a9646 updated trunk
+HEAD is now at e737792 updated trunk
 ok 2 - import into git
 
 expecting success of 9167.3 'git svn branch tests': 
@@ -557779,40 +557437,40 @@
 Creating parent folder file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a ...
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project, 2
-Found branch parent: (refs/remotes/origin/a) 11a9646d244c3748be150ffd54725c2a8f2694ee
+Found branch parent: (refs/remotes/origin/a) e7377925aa01c9e6c027a06d324dfce205bb5d95
 Following parent with do_switch
 Successfully followed parent
-r4 = a8a03c861f252df74fb8802fc49b11365425fc8f (refs/remotes/origin/a)
+r4 = 1ee6e3ec0db539727f787bb7ebee6edca08a9250 (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1 ...
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) 11a9646d244c3748be150ffd54725c2a8f2694ee
+Found branch parent: (refs/remotes/origin/tags/tag1) e7377925aa01c9e6c027a06d324dfce205bb5d95
 Following parent with do_switch
 Successfully followed parent
-r6 = 1e33b366a5048e1d5b428ad3713dbb036d390118 (refs/remotes/origin/tags/tag1)
+r6 = a602c2952524656dfbc708011d212452832bb32a (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2 ...
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) 11a9646d244c3748be150ffd54725c2a8f2694ee
+Found branch parent: (refs/remotes/origin/tags/tag2) e7377925aa01c9e6c027a06d324dfce205bb5d95
 Following parent with do_switch
 Successfully followed parent
-r8 = 8a47b93863bcf5e35c202c76af873b24a062d965 (refs/remotes/origin/tags/tag2)
+r8 = a608bc297a41ef35c5cde209f25fa0d16d4404c4 (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.48.0~rc1+next.20250101/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3 ...
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) 11a9646d244c3748be150ffd54725c2a8f2694ee
+Found branch parent: (refs/remotes/origin/tags/tag3) e7377925aa01c9e6c027a06d324dfce205bb5d95
 Following parent with do_switch
 Successfully followed parent
-r10 = 1cfc92039fd21a26fe6f2adabdca56602d6a2c43 (refs/remotes/origin/tags/tag3)
+r10 = f1789cb22fd46867b76d2cc82ad3008573dc273b (refs/remotes/origin/tags/tag3)
 ok 3 - git svn branch tests
 
 # passed all 3 test(s)
@@ -557854,9 +557512,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 58fb41f38e38a60040faa777f7e535b1b94f43d9 (refs/remotes/origin/trunk)
+r1 = 8ff699953d4fa7fac90e866d08d1540433231e1a (refs/remotes/origin/trunk)
 	M	foo
-r2 = 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562 (refs/remotes/origin/trunk)
+r2 = 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk r2
 Note: switching to 'remotes/origin/trunk'.
@@ -557876,7 +557534,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 8b6a0c8 updated trunk
+HEAD is now at 2a2d02f updated trunk
 ok 2 - import into git
 
 expecting success of 9128.3 'git svn branch tests': 
@@ -557904,16 +557562,16 @@
 
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a, 2
-Found branch parent: (refs/remotes/origin/a) 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562
+Found branch parent: (refs/remotes/origin/a) 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc
 Following parent with do_switch
 Successfully followed parent
-r3 = dfde13718d1b2dc74387acf701ff06d9c39c6431 (refs/remotes/origin/a)
+r3 = b60d348ad270f1ff2d81ecb5e533bf41a00f526c (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b, 2
-Found branch parent: (refs/remotes/origin/b) 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562
+Found branch parent: (refs/remotes/origin/b) 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc
 Following parent with do_switch
 Successfully followed parent
-r4 = 48120f93bc62c3ed169dc79b962fb9937b6b7348 (refs/remotes/origin/b)
+r4 = b35747fbaee55548d33076a80b88b670687289da (refs/remotes/origin/b)
 fatal: cannot rename the current branch while not on any
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/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.
@@ -557924,28 +557582,28 @@
 
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562
+Found branch parent: (refs/remotes/origin/tags/tag1) 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc
 Following parent with do_switch
 Successfully followed parent
-r5 = 663dd4ce1efeba72a91f1c086f427287edf7b94c (refs/remotes/origin/tags/tag1)
+r5 = 0bcdb37655ac214a05edc53327f9f65581133cc3 (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562
+Found branch parent: (refs/remotes/origin/tags/tag2) 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc
 Following parent with do_switch
 Successfully followed parent
-r6 = d9cc31147961c535ef129118204e420e1d274dbc (refs/remotes/origin/tags/tag2)
+r6 = 958d72159f4a437e897c51155e8f816ac20f4bb1 (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562
+Found branch parent: (refs/remotes/origin/tags/tag3) 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc
 Following parent with do_switch
 Successfully followed parent
-r7 = 09b3656c1efac478e9ac5e45fae53a23c8320a99 (refs/remotes/origin/tags/tag3)
+r7 = 3a6a5a9ed7114d07eea829c1f0ae1f6110c1ea88 (refs/remotes/origin/tags/tag3)
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4, 2
-Found branch parent: (refs/remotes/origin/tags/tag4) 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562
+Found branch parent: (refs/remotes/origin/tags/tag4) 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc
 Following parent with do_switch
 Successfully followed parent
-r8 = bec11923267f41965f8769a83b539053c9ef3f8b (refs/remotes/origin/tags/tag4)
+r8 = b0889afe16a33493ef0ea57e2cebe12748b37e05 (refs/remotes/origin/tags/tag4)
 tag name required
 
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag5...
@@ -558003,55 +557661,55 @@
 Committing transaction...
 Committed revision 9.
 Using higher level of URL: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo
-branch_from: /tags => /tags/tag1
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
-Found branch parent: (refs/remotes/mirror/tags/tag1) 663dd4ce1efeba72a91f1c086f427287edf7b94c
-Following parent with do_switch
-Successfully followed parent
-r9 = 37f77852c19e1c207119f3270d3903e767150b1b (refs/remotes/mirror/tags/tag1)
-branch_from: /tags => /tags/tag3
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
-Found branch parent: (refs/remotes/mirror/tags/tag3) 09b3656c1efac478e9ac5e45fae53a23c8320a99
+branch_from: /tags => /tags/tag4
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
+Found branch parent: (refs/remotes/mirror/tags/tag4) b0889afe16a33493ef0ea57e2cebe12748b37e05
 Following parent with do_switch
 Successfully followed parent
-r9 = fee379cee705eff8b554046caf7cd78f57f8fbce (refs/remotes/mirror/tags/tag3)
-branch_from: /branches => /branches/a
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
-Found branch parent: (refs/remotes/mirror/a) dfde13718d1b2dc74387acf701ff06d9c39c6431
+r9 = e3e13ce59aaab9cb988489e6e61caa4a9db80881 (refs/remotes/mirror/tags/tag4)
+branch_from: /tags => /tags/tag1
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
+Found branch parent: (refs/remotes/mirror/tags/tag1) 0bcdb37655ac214a05edc53327f9f65581133cc3
 Following parent with do_switch
 Successfully followed parent
-r9 = 6a00a5603b566b11990cec6c32f1886940ffae85 (refs/remotes/mirror/a)
-branch_from: /tags => /tags/tag4
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
-Found branch parent: (refs/remotes/mirror/tags/tag4) bec11923267f41965f8769a83b539053c9ef3f8b
+r9 = 31a66f669bb8636cab8210125e43000e59363b19 (refs/remotes/mirror/tags/tag1)
+branch_from: /branches => /branches/b
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
+Found branch parent: (refs/remotes/mirror/b) b35747fbaee55548d33076a80b88b670687289da
 Following parent with do_switch
 Successfully followed parent
-r9 = 3e50625c60fe98e1cc1f4b1b5c097cae744a5abe (refs/remotes/mirror/tags/tag4)
+r9 = ac06b6965544edcdca80218f02d3b25d95e2a84c (refs/remotes/mirror/b)
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
-Found branch parent: (refs/remotes/mirror/trunk) 8b6a0c8c2638f19b9aa0b5b0b8f1fd6a44446562
+Found branch parent: (refs/remotes/mirror/trunk) 2a2d02f07e82d6a835dd62359e25bcd35f15cdfc
 Following parent with do_switch
 Successfully followed parent
-r9 = cc16cded17a85740f1566541a6dda9061603a098 (refs/remotes/mirror/trunk)
-branch_from: /branches => /branches/b
-Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
-Found branch parent: (refs/remotes/mirror/b) 48120f93bc62c3ed169dc79b962fb9937b6b7348
+r9 = 306759d72e9523a9050a8987d978672fc8fd5fe6 (refs/remotes/mirror/trunk)
+branch_from: /tags => /tags/tag3
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
+Found branch parent: (refs/remotes/mirror/tags/tag3) 3a6a5a9ed7114d07eea829c1f0ae1f6110c1ea88
 Following parent with do_switch
 Successfully followed parent
-r9 = 916cc05850b76bb338af29fa07009a7e45e81166 (refs/remotes/mirror/b)
+r9 = 8a81b5cfc1fdf2186716fcda92b845ea3abba5ef (refs/remotes/mirror/tags/tag3)
 branch_from: /tags => /tags/tag2
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
-Found branch parent: (refs/remotes/mirror/tags/tag2) d9cc31147961c535ef129118204e420e1d274dbc
+Found branch parent: (refs/remotes/mirror/tags/tag2) 958d72159f4a437e897c51155e8f816ac20f4bb1
+Following parent with do_switch
+Successfully followed parent
+r9 = 3a25f2a0dc8a2c0c509bc3106a078b057a419659 (refs/remotes/mirror/tags/tag2)
+branch_from: /branches => /branches/a
+Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
+Found branch parent: (refs/remotes/mirror/a) b60d348ad270f1ff2d81ecb5e533bf41a00f526c
 Following parent with do_switch
 Successfully followed parent
-r9 = cf4e4864827874991103d8c242ab07466826b16b (refs/remotes/mirror/tags/tag2)
-Previous HEAD position was 8b6a0c8 updated trunk
-HEAD is now at cc16cde made mirror
+r9 = 6581d894f046e9042f64b365e3cfe7566e8cbb20 (refs/remotes/mirror/a)
+Previous HEAD position was 2a2d02f updated trunk
+HEAD is now at 306759d made mirror
 Copying file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk at r9 to file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d...
 Found possible branch point: file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk => file:///build/reproducible-path/git-2.48.0~rc1+next.20250101/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d, 9
-Found branch parent: (refs/remotes/mirror/d) cc16cded17a85740f1566541a6dda9061603a098
+Found branch parent: (refs/remotes/mirror/d) 306759d72e9523a9050a8987d978672fc8fd5fe6
 Following parent with do_switch
 Successfully followed parent
-r10 = 75a9763c5fdf95926b257a7e591007815730d06b (refs/remotes/mirror/d)
+r10 = 54d4c331d31769eac7165fd8833ff2dcb9229590 (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>...]'
@@ -561566,6 +561224,10 @@
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+./generate-script.sh "git-filter-branch.sh" "git-filter-branch+" ./GIT-BUILD-OPTIONS && \
+mv git-filter-branch+ git-filter-branch
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-merge-octopus.sh" "git-merge-octopus+" ./GIT-BUILD-OPTIONS && \
 mv git-merge-octopus+ git-merge-octopus
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -561578,34 +561240,30 @@
 mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-filter-branch.sh" "git-filter-branch+" ./GIT-BUILD-OPTIONS && \
-mv git-filter-branch+ git-filter-branch
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
-mv git-submodule+ git-submodule
+./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
+mv git-mergetool+ git-mergetool
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
-mv git-archimport+ git-archimport
+./generate-script.sh "git-quiltimport.sh" "git-quiltimport+" ./GIT-BUILD-OPTIONS && \
+mv git-quiltimport+ git-quiltimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-request-pull.sh" "git-request-pull+" ./GIT-BUILD-OPTIONS && \
 mv git-request-pull+ git-request-pull
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool+ git-mergetool
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-quiltimport.sh" "git-quiltimport+" ./GIT-BUILD-OPTIONS && \
-mv git-quiltimport+ git-quiltimport
+./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
+mv git-submodule+ git-submodule
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-web--browse.sh" "git-web--browse+" ./GIT-BUILD-OPTIONS && \
 mv git-web--browse+ git-web--browse
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-archimport.perl" "git-archimport+" && \
+mv git-archimport+ git-archimport
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsexportcommit.perl" "git-cvsexportcommit+" && \
 mv git-cvsexportcommit+ git-cvsexportcommit
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -561614,6 +561272,10 @@
 mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
+mv git-cvsserver+ git-cvsserver
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-send-email.perl" "git-send-email+" && \
 mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -561622,19 +561284,11 @@
 mv git-svn+ git-svn
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool--lib+ git-mergetool--lib
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-i18n+ git-sh-i18n
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsserver.perl" "git-cvsserver+" && \
-mv git-cvsserver+ git-cvsserver
+/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
+mv git-mergetool--lib+ git-mergetool--lib
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
@@ -561642,6 +561296,10 @@
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
+mv git-sh-i18n+ git-sh-i18n
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 ./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
 mv git-sh-setup+ git-sh-setup
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -561652,6 +561310,9 @@
 : no custom templates yet
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git.pm" "perl/build/lib/Git.pm"
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/I18N.pm" "perl/build/lib/Git/I18N.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
@@ -561661,16 +561322,13 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN.pm" "perl/build/lib/Git/LoadCPAN.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git.pm" "perl/build/lib/Git.pm"
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/Packet.pm" "perl/build/lib/Git/Packet.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Error.pm" "perl/build/lib/Git/LoadCPAN/Error.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN.pm" "perl/build/lib/Git/SVN.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN.pm" "perl/build/lib/Git/SVN.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Error.pm" "perl/build/lib/Git/LoadCPAN/Error.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Editor.pm" "perl/build/lib/Git/SVN/Editor.pm"
@@ -561824,6 +561482,9 @@
    debian/rules override_dh_auto_install-indep
 DESTDIR='/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp' /usr/bin/make install install-doc NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man htmldir=/usr/share/doc/git/html INSTALLDIRS=vendor SANE_TOOL_PATH= INSTALL=install TAR=tar NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 NO_PERL_CPAN_FALLBACKS=1 PYTHON_PATH=/usr/bin/python3 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.48.0~rc1+next.20250101=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-z,relro' HOST_CPU='aarch64' V=1 USE_LIBPCRE2=1
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+pod2man perl/Git.pm perl/build/man/man3/Git.3pm
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/gitweb'
 install -m 755 gitweb/gitweb.cgi '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/gitweb'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/gitweb/static'
@@ -561831,14 +561492,6 @@
 	'/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/gitweb/static'
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /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.48.0~rc1+next.20250101/templates'
-: no custom templates yet
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-pod2man perl/Git.pm perl/build/man/man3/Git.3pm
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/man/man3'
 (cd perl/build/man/man3 && tar cf - .) | \
@@ -561851,9 +561504,17 @@
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     * new asciidoc flags
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+/usr/bin/make -C gitk-git  all
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation/.."/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation/.."" "asciidoc.conf.in" "asciidoc.conf"
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+/usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
+: no custom templates yet
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/bin'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/lib/git-core'
@@ -561864,14 +561525,35 @@
 install git-cvsserver '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/bin'
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /usr/bin/make -C templates DESTDIR='/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp' install
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
 : no custom templates yet
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-core/templates'
 (cd blt && tar cf - .) | \
 (cd '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-core/templates' && umask 022 && tar xof -)
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/templates'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-archive.xml git-archive.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/lib/git-core/mergetools'
 install -m 644 mergetools/* '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/lib/git-core/mergetools'
@@ -561884,13 +561566,28 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /usr/bin/make -C gitk-git install
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-archive.xml git-archive.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/bin'
@@ -561900,55 +561597,55 @@
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/gitk-git'
 /usr/bin/make -C git-gui gitexecdir='/usr/lib/git-core' install
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 install -d -m 755 '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/lib/git-core' 
@@ -561962,196 +561659,193 @@
 install -m 644 po/bg.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/de.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/el.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/fr.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/hu.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/it.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ja.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/nb.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_br.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_pt.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ru.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/sv.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/vi.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/zh_cn.msg  '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/git-gui/lib/msgs' && true
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential.xml git-credential.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-daemon.xml git-daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-difftool.xml git-difftool.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential.xml git-credential.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-daemon.xml git-daemon.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-difftool.xml git-difftool.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-push.xml git-http-push.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-push.xml git-http-push.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mv.xml git-mv.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mv.xml git-mv.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 bindir=$(cd '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/bin' && pwd) && \
@@ -562200,91 +561894,52 @@
 done
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-p4.xml git-p4.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-reflog.xml git-reflog.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-refs.xml git-refs.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rerere.xml git-rerere.txt
@@ -562293,40 +561948,40 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-restore.xml git-restore.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-shell.xml git-shell.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-shell.xml git-shell.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-index.xml git-show-index.txt
@@ -562335,19 +561990,19 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
@@ -562362,7 +562017,10 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
@@ -562371,22 +562029,22 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
@@ -562395,31 +562053,31 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-version.xml git-version.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-version.xml git-version.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-write-tree.xml git-write-tree.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-write-tree.xml git-write-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
@@ -562431,19 +562089,19 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-index.xml gitformat-index.txt
@@ -562452,19 +562110,22 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitmodules.xml gitmodules.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitattributes.xml gitattributes.txt
@@ -562473,79 +562134,70 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git.xml git.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitpacking.xml gitpacking.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o giteveryday.xml giteveryday.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o giteveryday.xml giteveryday.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git.xml git.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitfaq.xml gitfaq.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitpacking.xml gitpacking.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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
+asciidoc -abuild_dir='/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -562557,40 +562209,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-archive.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-am.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-apply.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-add.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-blame.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-cat-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-ref-format.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-citool.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -562599,9 +562260,6 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-citool.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
@@ -562611,115 +562269,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-column.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-clone.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-store.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-commit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-store.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-credential-cache--daemon.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsimport.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsexportcommit.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-describe.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-cvsimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-fast-export.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-difftool.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fmt-merge-msg.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-fmt-merge-msg.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-filter-branch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-filter-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-repo.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsmonitor--daemon.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-get-tar-commit-id.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-gui.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-format-patch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-hash-object.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-http-fetch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -562728,97 +562389,94 @@
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-push.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-fetch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-push.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-instaweb.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-imap-send.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-config.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-mailinfo.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-base.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-base.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-log.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktag.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool--lib.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-mergetool--lib.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-merge.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-mv.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-notes.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-multi-pack-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -562827,106 +562485,103 @@
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-patch-id.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-quiltimport.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-receive-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-quiltimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reflog.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-receive-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pull.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reflog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-refs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-pull.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-push.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rebase.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replace.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-rm.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rm.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reset.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-replay.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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--envsubst.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-send-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-i18n.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-sh-setup.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-list.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -562938,13 +562593,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-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-stage.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sparse-checkout.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-shortlog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -562956,22 +562611,25 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-status.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-sparse-checkout.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-unpack-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-unpack-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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
@@ -562980,115 +562638,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-tag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-upload-archive.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-upload-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-var.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+xmlto -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.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-web--browse.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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-whatchanged.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-web--browse.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-worktree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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 gitk.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -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
+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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitignore.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitignore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 xmlto -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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+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.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+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.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcvs-migration.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrepository-layout.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitcredentials.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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
@@ -563100,13 +562761,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 giteveryday.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcredentials.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitpacking.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitfaq.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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
@@ -563115,27 +562776,24 @@
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitsubmodules.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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 gitrevisions.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 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.48.0~rc1+next.20250101/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-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.48.0~rc1+next.20250101/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 install -d -m 755 /build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/man/man1
 install -d -m 755 /build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/man/man5
 install -d -m 755 /build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/man/man7
@@ -563153,14 +562811,14 @@
 /usr/bin/make -C ../.. SCRIPT_PERL="contrib/mw-to-git//git-remote-mediawiki.perl contrib/mw-to-git//git-mw.perl" \
                 install-perl-script
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "contrib/mw-to-git//git-mw.perl" "contrib/mw-to-git//git-mw+" && \
-mv contrib/mw-to-git//git-mw+ contrib/mw-to-git//git-mw
-make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
-make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "contrib/mw-to-git//git-remote-mediawiki.perl" "contrib/mw-to-git//git-remote-mediawiki+" && \
 mv contrib/mw-to-git//git-remote-mediawiki+ contrib/mw-to-git//git-remote-mediawiki
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "contrib/mw-to-git//git-mw.perl" "contrib/mw-to-git//git-mw+" && \
+mv contrib/mw-to-git//git-mw+ contrib/mw-to-git//git-mw
+make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
+make[3]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 install contrib/mw-to-git//git-remote-mediawiki contrib/mw-to-git//git-mw '/build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/lib/git-core'
 make[3]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 test -z 'html' || \
@@ -563172,55 +562830,52 @@
     GEN asciidoc.conf
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-archimport.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-bugreport.html
+    ASCIIDOC git-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-archive.html
+    ASCIIDOC git-archimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-am.html
+    ASCIIDOC git-annotate.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-bisect.html
+    ASCIIDOC git-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-apply.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-annotate.html
+    ASCIIDOC git-am.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-blame.html
+    ASCIIDOC git-bisect.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-bundle.html
+    ASCIIDOC git-bugreport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-add.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-branch.html
+    ASCIIDOC git-blame.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-check-attr.html
+    ASCIIDOC git-cat-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-check-ignore.html
+    ASCIIDOC git-check-attr.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-check-mailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-cat-file.html
+    ASCIIDOC git-check-ignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-check-ref-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-cherry.html
+    ASCIIDOC git-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-checkout-index.html
@@ -563229,79 +562884,82 @@
     ASCIIDOC git-citool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-clean.html
+    ASCIIDOC git-cherry.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-cherry-pick.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-column.html
+    ASCIIDOC git-clean.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-commit-graph.html
+    ASCIIDOC git-credential-cache--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-credential-cache--daemon.html
+    ASCIIDOC git-count-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-checkout.html
+    ASCIIDOC git-column.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-commit-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-count-objects.html
+    ASCIIDOC git-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-credential-store.html
+    ASCIIDOC git-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-credential-cache.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-cvsexportcommit.html
+    ASCIIDOC git-credential-store.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-credential.html
+    ASCIIDOC git-cvsexportcommit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-diagnose.html
+    ASCIIDOC git-cvsimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-cvsimport.html
+    ASCIIDOC git-describe.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-daemon.html
+    ASCIIDOC git-credential.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-cvsserver.html
+    ASCIIDOC git-diagnose.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-describe.html
+    ASCIIDOC git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-difftool.html
+    ASCIIDOC git-cvsserver.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-fetch-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-difftool.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-fast-export.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-fmt-merge-msg.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-filter-branch.html
+    ASCIIDOC git-for-each-repo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-for-each-repo.html
+    ASCIIDOC git-filter-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-fsck-objects.html
@@ -563310,73 +562968,76 @@
     ASCIIDOC git-diff-files.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-fetch.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-for-each-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-diff-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-fsmonitor--daemon.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-get-tar-commit-id.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-fast-import.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-fsck.html
+    ASCIIDOC git-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-diff-tree.html
+    ASCIIDOC git-fsmonitor--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-gc.html
+    ASCIIDOC git-get-tar-commit-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-hash-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-gui.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-format-patch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-gui.html
+    ASCIIDOC git-diff-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-diff.html
+    ASCIIDOC git-fsck.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-grep.html
+    ASCIIDOC git-gc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-help.html
+    ASCIIDOC git-http-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-http-backend.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-http-fetch.html
+    ASCIIDOC git-diff.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-help.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-http-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-grep.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-init-db.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-index-pack.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-imap-send.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-instaweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-index-pack.html
+    ASCIIDOC git-ls-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-init.html
@@ -563385,7 +563046,7 @@
     ASCIIDOC git-mailsplit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-ls-remote.html
+    ASCIIDOC git-mailinfo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-interpret-trailers.html
@@ -563394,39 +563055,36 @@
     ASCIIDOC git-ls-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-mailinfo.html
+    ASCIIDOC git-ls-files.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-merge-one-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-merge-index.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-merge-base.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-merge-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-ls-files.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-maintenance.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-merge-tree.html
+    ASCIIDOC git-merge-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-mergetool--lib.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-mktag.html
+    ASCIIDOC git-merge-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-mktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-mktag.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-mv.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
@@ -563439,22 +563097,22 @@
     ASCIIDOC git-name-rev.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-merge.html
+    ASCIIDOC git-pack-redundant.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-pack-redundant.html
+    ASCIIDOC git-notes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-patch-id.html
+    ASCIIDOC git-pack-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-notes.html
+    ASCIIDOC git-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-pack-objects.html
+    ASCIIDOC git-patch-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-pack-refs.html
+    ASCIIDOC git-pack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-prune-packed.html
@@ -563469,19 +563127,16 @@
     ASCIIDOC git-quiltimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-receive-pack.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-range-diff.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-read-tree.html
+    ASCIIDOC git-reflog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-reflog.html
+    ASCIIDOC git-read-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-remote-ext.html
+    ASCIIDOC git-receive-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-refs.html
@@ -563493,79 +563148,82 @@
     ASCIIDOC git-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-push.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-remote.html
+    ASCIIDOC git-remote-ext.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-replace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-request-pull.html
+    ASCIIDOC git-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-repack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-request-pull.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-rerere.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-log.html
+    ASCIIDOC git-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-restore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-rebase.html
+    ASCIIDOC git-log.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-reset.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-sh-i18n--envsubst.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-revert.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-config.html
+    ASCIIDOC git-rm.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-send-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-sh-i18n--envsubst.html
+    ASCIIDOC git-sh-i18n.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-rm.html
+    ASCIIDOC git-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-sh-i18n.html
+    ASCIIDOC git-shell.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-replay.html
+    ASCIIDOC git-sh-setup.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-sh-setup.html
+    ASCIIDOC git-replay.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-shell.html
+    ASCIIDOC git-send-email.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-rev-parse.html
+    ASCIIDOC git-show-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-show-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-show-branch.html
+    ASCIIDOC git-rev-parse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-stage.html
+    ASCIIDOC git-show-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-send-email.html
+    ASCIIDOC git-stage.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-show-ref.html
+    ASCIIDOC git-sparse-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-stripspace.html
@@ -563574,43 +563232,40 @@
     ASCIIDOC git-stash.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-sparse-checkout.html
+    ASCIIDOC git-shortlog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-shortlog.html
+    ASCIIDOC git-symbolic-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-rev-list.html
+    ASCIIDOC git-switch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-status.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-symbolic-ref.html
+    ASCIIDOC git-rev-list.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-unpack-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-submodule.html
+    ASCIIDOC git-config.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-unpack-objects.html
+    ASCIIDOC git-submodule.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-switch.html
+    ASCIIDOC git-unpack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-update-server-info.html
+    ASCIIDOC git-upload-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-update-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-tag.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-upload-archive.html
+    ASCIIDOC git-update-server-info.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-upload-pack.html
@@ -563619,34 +563274,34 @@
     ASCIIDOC git-var.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-verify-commit.html
+    ASCIIDOC git-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-svn.html
+    ASCIIDOC git-verify-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-update-index.html
+    ASCIIDOC git-verify-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-verify-pack.html
+    ASCIIDOC git-update-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-version.html
+    ASCIIDOC git-verify-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-verify-tag.html
+    ASCIIDOC git-version.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-web--browse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-whatchanged.html
+    ASCIIDOC git-write-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-write-tree.html
+    ASCIIDOC git-whatchanged.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-show.html
+    ASCIIDOC git-svn.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitk.html
@@ -563655,6 +563310,9 @@
     ASCIIDOC scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC git-show.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitformat-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
@@ -563682,91 +563340,91 @@
     ASCIIDOC gitignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC gitformat-pack.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC githooks.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitattributes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitprotocol-capabilities.html
+    ASCIIDOC gitprotocol-common.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitformat-pack.html
+    ASCIIDOC gitprotocol-capabilities.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC githooks.html
+    ASCIIDOC gitprotocol-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitprotocol-common.html
+    ASCIIDOC gitcredentials.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitprotocol-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitprotocol-pack.html
+    ASCIIDOC gitcli.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitrepository-layout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitcli.html
+    ASCIIDOC gitcvs-migration.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitprotocol-v2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitcredentials.html
+    ASCIIDOC gitdiffcore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitcvs-migration.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitdiffcore.html
+    ASCIIDOC giteveryday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitnamespaces.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitweb.conf.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC giteveryday.html
+    ASCIIDOC gitfaq.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitpacking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitfaq.html
+    ASCIIDOC gitweb.conf.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitsubmodules.html
+    ASCIIDOC gittutorial-2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC howto-index.html
+    ASCIIDOC gitsubmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitrevisions.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitcore-tutorial.html
+    ASCIIDOC git-tools.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitremote-helpers.html
+    ASCIIDOC gitcore-tutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gittutorial-2.html
+    ASCIIDOC gitglossary.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC gitglossary.html
+    ASCIIDOC howto-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gitworkflows.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-tools.html
+    ASCIIDOC gitremote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC gittutorial.html
@@ -563793,10 +563451,13 @@
     ASCIIDOC howto/separating-topic-branches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC howto/recover-corrupted-blob-object.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC howto/setup-git-server-over-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC howto/recover-corrupted-blob-object.html
+    ASCIIDOC howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC howto/revert-a-faulty-merge.html
@@ -563805,97 +563466,94 @@
     ASCIIDOC howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC howto/rebuild-from-update-hook.html
+    ASCIIDOC howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC git-bisect-lk2009.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC howto/rebase-from-internal-branch.html
+    ASCIIDOC howto/coordinate-embargoed-releases.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/api-error-handling.html
+    ASCIIDOC howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC howto/keep-canonical-history-correct.html
+    ASCIIDOC technical/api-error-handling.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC technical/api-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC howto/maintain-git.html
+    ASCIIDOC technical/api-simple-ipc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC howto/coordinate-embargoed-releases.html
+    ASCIIDOC howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/api-simple-ipc.html
+    ASCIIDOC DecisionMaking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC ReviewingGuidelines.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC DecisionMaking.html
+    ASCIIDOC ToolsForGit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC technical/api-parse-options.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC ToolsForGit.html
+    ASCIIDOC technical/long-running-process-protocol.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
+    ASCIIDOC technical/bitmap-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC technical/build-systems.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/api-trace2.html
+    ASCIIDOC technical/multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/long-running-process-protocol.html
+    ASCIIDOC SubmittingPatches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC MyFirstObjectWalk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC SubmittingPatches.html
+    ASCIIDOC technical/hash-function-transition.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/bitmap-format.html
+    ASCIIDOC technical/api-trace2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC technical/bundle-uri.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/multi-pack-index.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC MyFirstContribution.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/hash-function-transition.html
+    ASCIIDOC technical/parallel-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/racy-git.html
+    ASCIIDOC technical/pack-heuristics.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/parallel-checkout.html
+    ASCIIDOC technical/scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/partial-clone.html
+    ASCIIDOC technical/send-pack-pipeline.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC technical/platform-support.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/scalar.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/pack-heuristics.html
+    ASCIIDOC technical/racy-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/send-pack-pipeline.html
+    ASCIIDOC technical/shallow.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC technical/shallow.html
+    ASCIIDOC technical/partial-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC technical/api-index.html
@@ -563904,10 +563562,10 @@
     ASCIIDOC technical/trivial-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC everyday.html
+    ASCIIDOC git-remote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
-    ASCIIDOC git-remote-helpers.html
+    ASCIIDOC everyday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/Documentation'
     ASCIIDOC technical/unit-tests.html
@@ -563929,10 +563587,6 @@
 /usr/bin/make -C ../../ GIT-VERSION-FILE
 make[3]: 'GIT-VERSION-FILE' is up to date.
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
-asciidoc -b docbook -d manpage -f ../../Documentation/asciidoc.conf \
-	-agit_version=2.48.0.rc1.219.gb6b6757d772  git-subtree.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
-make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
 asciidoc -b xhtml11 -d manpage -f ../../Documentation/asciidoc.conf \
 	-agit_version=2.48.0.rc1.219.gb6b6757d772  git-subtree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
@@ -563941,6 +563595,10 @@
 install -m 644 git-subtree.html /build/reproducible-path/git-2.48.0~rc1+next.20250101/debian/tmp/usr/share/doc/git/html
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
+asciidoc -b docbook -d manpage -f ../../Documentation/asciidoc.conf \
+	-agit_version=2.48.0.rc1.219.gb6b6757d772  git-subtree.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
+make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
 xmlto -m ../../Documentation/manpage-normal.xsl  man git-subtree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
 make[2]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101/contrib/subtree'
@@ -563998,25 +563656,25 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	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/zh_TW/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/bg/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ca/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/zh_TW/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/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/ru/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/sv/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/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
    debian/rules override_dh_compress
 make[1]: Entering directory '/build/reproducible-path/git-2.48.0~rc1+next.20250101'
 dh_compress -X.txt -Xcontrib
@@ -564032,26 +563690,26 @@
  diversion by libc6 to: /lib/ld-linux-aarch64.so.1.usr-is-merged
    dh_installdeb
    dh_gencontrol
+dpkg-gencontrol: warning: package git-mediawiki: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git: substitution variable ${perl:Depends} unused, but is defined
+dpkg-gencontrol: warning: package git-svn: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git-cvs: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git-email: substitution variable ${perl:Depends} unused, but is defined
-dpkg-gencontrol: warning: package git-svn: substitution variable ${perl:Depends} unused, but is defined
-dpkg-gencontrol: warning: package git-mediawiki: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git: substitution variable ${perl:Depends} unused, but is defined
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'git' in '../git_2.48.0~rc1+next.20250101-1_arm64.deb'.
-dpkg-deb: building package 'git-dbgsym' in '../git-dbgsym_2.48.0~rc1+next.20250101-1_arm64.deb'.
-dpkg-deb: building package 'git-man' in '../git-man_2.48.0~rc1+next.20250101-1_all.deb'.
-dpkg-deb: building package 'git-doc' in '../git-doc_2.48.0~rc1+next.20250101-1_all.deb'.
+dpkg-deb: building package 'gitweb' in '../gitweb_2.48.0~rc1+next.20250101-1_all.deb'.
+dpkg-deb: building package 'git-gui' in '../git-gui_2.48.0~rc1+next.20250101-1_all.deb'.
 dpkg-deb: building package 'git-cvs' in '../git-cvs_2.48.0~rc1+next.20250101-1_all.deb'.
+dpkg-deb: building package 'gitk' in '../gitk_2.48.0~rc1+next.20250101-1_all.deb'.
 dpkg-deb: building package 'git-svn' in '../git-svn_2.48.0~rc1+next.20250101-1_all.deb'.
-dpkg-deb: building package 'git-gui' in '../git-gui_2.48.0~rc1+next.20250101-1_all.deb'.
-dpkg-deb: building package 'git-mediawiki' in '../git-mediawiki_2.48.0~rc1+next.20250101-1_all.deb'.
 dpkg-deb: building package 'git-email' in '../git-email_2.48.0~rc1+next.20250101-1_all.deb'.
-dpkg-deb: building package 'gitk' in '../gitk_2.48.0~rc1+next.20250101-1_all.deb'.
+dpkg-deb: building package 'git' in '../git_2.48.0~rc1+next.20250101-1_arm64.deb'.
+dpkg-deb: building package 'git-mediawiki' in '../git-mediawiki_2.48.0~rc1+next.20250101-1_all.deb'.
+dpkg-deb: building package 'git-man' in '../git-man_2.48.0~rc1+next.20250101-1_all.deb'.
+dpkg-deb: building package 'git-doc' in '../git-doc_2.48.0~rc1+next.20250101-1_all.deb'.
 dpkg-deb: building package 'git-all' in '../git-all_2.48.0~rc1+next.20250101-1_all.deb'.
-dpkg-deb: building package 'gitweb' in '../gitweb_2.48.0~rc1+next.20250101-1_all.deb'.
+dpkg-deb: building package 'git-dbgsym' in '../git-dbgsym_2.48.0~rc1+next.20250101-1_arm64.deb'.
  dpkg-genbuildinfo --build=binary -O../git_2.48.0~rc1+next.20250101-1_arm64.buildinfo
  dpkg-genchanges --build=binary -O../git_2.48.0~rc1+next.20250101-1_arm64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -564059,12 +563717,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/3986920/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/3986920/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/1420282 and its subdirectories
-I: Current time: Sat Feb  8 18:59:06 -12 2025
-I: pbuilder-time-stamp: 1739084346
+I: removing directory /srv/workspace/pbuilder/3986920 and its subdirectories
+I: Current time: Sun Mar 15 03:51:28 +14 2026
+I: pbuilder-time-stamp: 1773496288